*** empty log message ***

5 files changed, 256 insertions, 3 deletions

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 a793ae3fde..fc031e4c65 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
@@ -348,6 +348,10 @@ boolean generateLocalVars(Method method, Class[] paramTypes, Class returnType) {
 			}
 			output("= NULL;");
 		} else {
+			ClassData classData = metaData.getMetaData(paramType);
+			if (classData.getFlag(Flags.FLAG_STRUCT)) {
+				output("struct ");
+			}
 			output(getClassName(paramType));
 			output(" _arg" + i);
 			if (paramData.getFlag(FLAG_INIT)) output("={0}");
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 8b4e4e6e74..9ecb28f470 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
@@ -156,18 +156,28 @@ void generateBlankMacros(Class clazz) {
 
 void generatePrototypes(Class clazz) {
 	String clazzName = getClassName(clazz);
+	ClassData classData = metaData.getMetaData(clazz);
 	output("void cache");
 	output(clazzName);
 	outputln("Fields(JNIEnv *env, jobject lpObject);");
+	if (classData.getFlag(Flags.FLAG_STRUCT)) {
+		output("struct ");
+	}
 	output(clazzName);
 	output(" *get");
 	output(clazzName);
 	output("Fields(JNIEnv *env, jobject lpObject, ");
+	if (classData.getFlag(Flags.FLAG_STRUCT)) {
+		output("struct ");
+	}
 	output(clazzName);
 	outputln(" *lpStruct);");
 	output("void set");
 	output(clazzName);
 	output("Fields(JNIEnv *env, jobject lpObject, ");
+	if (classData.getFlag(Flags.FLAG_STRUCT)) {
+		output("struct ");
+	}
 	output(clazzName);
 	outputln(" *lpStruct);");
 	output("#define ");
@@ -385,10 +395,17 @@ void generateGetFields(Class clazz) {
 
 void generateGetFunction(Class clazz) {
 	String clazzName = getClassName(clazz);
+	ClassData classData = metaData.getMetaData(clazz);
+	if (classData.getFlag(Flags.FLAG_STRUCT)) {
+		output("struct ");
+	}
 	output(clazzName);
 	output(" *get");
 	output(clazzName);
 	output("Fields(JNIEnv *env, jobject lpObject, ");
+	if (classData.getFlag(Flags.FLAG_STRUCT)) {
+		output("struct ");
+	}
 	output(clazzName);
 	outputln(" *lpStruct)");
 	outputln("{");
@@ -528,6 +545,10 @@ void generateSetFunction(Class clazz) {
 	output("void set");
 	output(clazzName);
 	output("Fields(JNIEnv *env, jobject lpObject, ");
+	ClassData classData = metaData.getMetaData(clazz);
+	if (classData.getFlag(Flags.FLAG_STRUCT)) {
+		output("struct ");
+	}
 	output(clazzName);
 	outputln(" *lpStruct)");
 	outputln("{");
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 fdafc29d7b..8d3ffddc50 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
@@ -13,6 +13,10 @@ org_eclipse_swt_internal_BidiUtil=flags=no_gen
 org_eclipse_swt_internal_C=
 C_PTR_sizeof=
 
+C_calloc=
+C_calloc_0=
+C_calloc_1=
+
 C_free=
 C_free_0=cast=(void *)
 
@@ -146,8 +150,6 @@ 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=
 
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
new file mode 100755
index 0000000000..7a86b56880
--- /dev/null
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.cocoa.OS.properties
@@ -0,0 +1,225 @@
+###############################################################################
+# 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
+###############################################################################
+org_eclipse_swt_internal_cocoa_NSApplication=flags=no_gen
+
+org_eclipse_swt_internal_cocoa_NSArray=
+
+org_eclipse_swt_internal_cocoa_NSAutoreleasePool=flags=no_gen
+
+org_eclipse_swt_internal_cocoa_NSObject=flags=no_gen
+NSObject_id=
+
+org_eclipse_swt_internal_cocoa_NSPoint=
+NSPoint_x=
+NSPoint_y=
+
+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_NSScreen=
+
+org_eclipse_swt_internal_cocoa_NSSize=
+NSSize_width=
+NSSize_height=
+
+org_eclipse_swt_internal_cocoa_NSString=
+
+org_eclipse_swt_internal_cocoa_NSWindow=flags=no_gen
+
+org_eclipse_swt_internal_cocoa_OS=
+OS_GetCurrentProcess=
+OS_GetCurrentProcess_0=cast=(ProcessSerialNumber *)
+
+OS_NSBitsPerPixelFromDepth=
+OS_NSBitsPerPixelFromDepth_0=
+
+OS_SetFrontProcess=
+OS_SetFrontProcess_0=cast=(ProcessSerialNumber *)
+
+OS_TransformProcessType=
+OS_TransformProcessType_0=cast=(ProcessSerialNumber *)
+OS_TransformProcessType_1=
+
+OS_class_addMethods=
+OS_class_addMethods_0=cast=(Class)
+OS_class_addMethods_1=cast=(struct objc_method_list*)
+
+OS_memmove__ILorg_eclipse_swt_internal_cocoa_objc_1class_2I=
+OS_memmove__ILorg_eclipse_swt_internal_cocoa_objc_1class_2I_0=cast=(void *),flags=no_in critical
+OS_memmove__ILorg_eclipse_swt_internal_cocoa_objc_1class_2I_1=cast=(const void *),flags=no_out critical
+OS_memmove__ILorg_eclipse_swt_internal_cocoa_objc_1class_2I_2=cast=(size_t)
+
+OS_memmove__ILorg_eclipse_swt_internal_cocoa_objc_1method_1list_2I=
+OS_memmove__ILorg_eclipse_swt_internal_cocoa_objc_1method_1list_2I_0=cast=(void *),flags=no_in critical
+OS_memmove__ILorg_eclipse_swt_internal_cocoa_objc_1method_1list_2I_1=cast=(const void *),flags=no_out critical
+OS_memmove__ILorg_eclipse_swt_internal_cocoa_objc_1method_1list_2I_2=cast=(size_t)
+
+OS_memmove__ILorg_eclipse_swt_internal_cocoa_objc_1method_2I=
+OS_memmove__ILorg_eclipse_swt_internal_cocoa_objc_1method_2I_0=cast=(void *),flags=no_in critical
+OS_memmove__ILorg_eclipse_swt_internal_cocoa_objc_1method_2I_1=cast=(const void *),flags=no_out critical
+OS_memmove__ILorg_eclipse_swt_internal_cocoa_objc_1method_2I_2=cast=(size_t)
+
+OS_memmove__Lorg_eclipse_swt_internal_cocoa_objc_1class_2II=
+OS_memmove__Lorg_eclipse_swt_internal_cocoa_objc_1class_2II_0=cast=(void *),flags=no_in critical
+OS_memmove__Lorg_eclipse_swt_internal_cocoa_objc_1class_2II_1=cast=(const void *),flags=no_out critical
+OS_memmove__Lorg_eclipse_swt_internal_cocoa_objc_1class_2II_2=cast=(size_t)
+
+OS_memmove__Lorg_eclipse_swt_internal_cocoa_objc_1method_1list_2II=
+OS_memmove__Lorg_eclipse_swt_internal_cocoa_objc_1method_1list_2II_0=cast=(void *),flags=no_in critical
+OS_memmove__Lorg_eclipse_swt_internal_cocoa_objc_1method_1list_2II_1=cast=(const void *),flags=no_out critical
+OS_memmove__Lorg_eclipse_swt_internal_cocoa_objc_1method_1list_2II_2=cast=(size_t)
+
+OS_objc_addClass=
+OS_objc_addClass_0=cast=(Class)
+
+OS_objc_getClass=
+OS_objc_getClass_0=cast=(const char *)
+
+OS_objc_lookUpClass=
+OS_objc_lookUpClass_0=cast=(const char *)
+
+OS_objc_1msgSend__II=
+OS_objc_1msgSend__II_0=cast=(id)
+OS_objc_1msgSend__II_1=cast=(SEL)
+
+OS_objc_1msgSend__IIF=flags=no_gen
+OS_objc_1msgSend__IIF_0=cast=(id)
+OS_objc_1msgSend__IIF_1=cast=(SEL)
+OS_objc_1msgSend__IIF_2=
+
+OS_objc_1msgSend__III=
+OS_objc_1msgSend__III_0=cast=(id)
+OS_objc_1msgSend__III_1=cast=(SEL)
+OS_objc_1msgSend__III_2=
+
+OS_objc_1msgSend__IIII=
+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=
+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=
+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__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2=
+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_NSRect_2I=
+OS_objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSRect_2I_0=cast=(id)
+OS_objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSRect_2I_1=cast=(SEL)
+OS_objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSRect_2I_2=
+OS_objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSRect_2I_3=flags=struct
+OS_objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSRect_2I_4=
+
+OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2=
+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=
+
+OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2I=
+OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2I_0=cast=(id)
+OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2I_1=cast=(SEL)
+OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2I_2=flags=struct
+OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2I_3=
+
+OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2=
+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_2I=
+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_2IIZ=
+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_NSSize_2=
+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__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_3IIIIIIIIIII=
+OS_objc_1msgSend__II_3IIIIIIIIIII_0=cast=(id)
+OS_objc_1msgSend__II_3IIIIIIIIIII_1=cast=SEL
+OS_objc_1msgSend__II_3IIIIIIIIIII_2=
+OS_objc_1msgSend__II_3IIIIIIIIIII_3=
+OS_objc_1msgSend__II_3IIIIIIIIIII_4=
+OS_objc_1msgSend__II_3IIIIIIIIIII_5=
+OS_objc_1msgSend__II_3IIIIIIIIIII_6=
+OS_objc_1msgSend__II_3IIIIIIIIIII_7=
+OS_objc_1msgSend__II_3IIIIIIIIIII_8=
+OS_objc_1msgSend__II_3IIIIIIIIIII_9=
+OS_objc_1msgSend__II_3IIIIIIIIIII_10=
+OS_objc_1msgSend__II_3IIIIIIIIIII_11=
+OS_objc_1msgSend__II_3IIIIIIIIIII_12=
+
+OS_objc_msgSend_stret=
+OS_objc_msgSend_stret_0=
+OS_objc_msgSend_stret_1=cast=(id)
+OS_objc_msgSend_stret_2=cast=SEL
+
+OS_sel_registerName=
+OS_sel_registerName_0=cast=(const char *)
+
+
+org_eclipse_swt_internal_cocoa_objc_1class=flags=struct
+objc_class_isa=cast=(struct objc_class*)
+objc_class_super_class=cast=(struct objc_class*)
+objc_class_name=cast=(const char *)
+objc_class_version=
+objc_class_info=
+objc_class_instance_size=
+objc_class_ivars=cast=(struct objc_ivar_list*)
+objc_class_methodLists=cast=(struct objc_method_list**)
+objc_class_cache=cast=(struct objc_cache*)
+objc_class_protocols=cast=(struct objc_protocol_list*)
+
+org_eclipse_swt_internal_cocoa_objc_1method=flags=struct
+objc_method_method_name=cast=(SEL)
+objc_method_method_types=cast=(char *)
+objc_method_method_imp=cast=(IMP)
+
+org_eclipse_swt_internal_cocoa_objc_1method_1list=flags=struct
+objc_method_list_obsolete=cast=(struct objc_method_list*)
+objc_method_list_method_count=
+
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.properties b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.properties
index 3a80a27e78..5034ff0ac8 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.properties
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.properties
@@ -49,4 +49,5 @@ org.eclipse.swt.internal.opengl.carbon.AGL,../org.eclipse.swt/Eclipse SWT OpenGL
 org.eclipse.swt.internal.C,../org.eclipse.swt/Eclipse SWT PI/common/library/,\
 org.eclipse.swt.internal.wpf.OS,../org.eclipse.swt/Eclipse SWT PI/wpf/library/,\
 org.eclipse.swt.internal.win32.Win32,../org.eclipse.swt/Eclipse SWT PI/wpf_win32/library/,\
-org.eclipse.swt.internal.cocoa.Cocoa,../org.eclipse.swt/Eclipse SWT PI/carbon/library/
+org.eclipse.swt.internal.cocoa.Cocoa,../org.eclipse.swt/Eclipse SWT PI/carbon/library/,\
+org.eclipse.swt.internal.cocoa.OS,../org.eclipse.swt/Eclipse SWT PI/cocoa/library/