diff options
839 files changed, 19595 insertions, 19595 deletions
diff --git a/bundles/org.eclipse.swt.tools/plugin.properties b/bundles/org.eclipse.swt.tools/plugin.properties index 3065bf1b0c..a7444a35e3 100644 --- a/bundles/org.eclipse.swt.tools/plugin.properties +++ b/bundles/org.eclipse.swt.tools/plugin.properties @@ -14,4 +14,4 @@ macViewName = Mac Generator spyViewName = SWT Spy sleakViewName = Sleak jniBuilderName = JNI Builder -enableCheck64Name = Report 64-bit Problems +enableCheck64Name = Report 32/64-bit Problems diff --git a/bundles/org.eclipse.swt.tools/src/org/eclipse/swt/tools/builders/Check64CompilationParticipant.java b/bundles/org.eclipse.swt.tools/src/org/eclipse/swt/tools/builders/Check64CompilationParticipant.java index f28a2accbb..4a01e75775 100644 --- a/bundles/org.eclipse.swt.tools/src/org/eclipse/swt/tools/builders/Check64CompilationParticipant.java +++ b/bundles/org.eclipse.swt.tools/src/org/eclipse/swt/tools/builders/Check64CompilationParticipant.java @@ -157,7 +157,7 @@ void createProblems(IJavaProject project, String root) throws CoreException { if (resource != null) { int start = Integer.parseInt(node.getAttribute("charStart")); int end = Integer.parseInt(node.getAttribute("charEnd")); - String message = "[64] " + ((Element)node.getElementsByTagName("message").item(0)).getAttribute("value"); + String message = "[32/64] " + ((Element)node.getElementsByTagName("message").item(0)).getAttribute("value"); IMarker marker = resource.createMarker(IJavaModelMarker.JAVA_MODEL_PROBLEM_MARKER); int severity = IMarker.SEVERITY_ERROR; marker.setAttributes( @@ -189,15 +189,15 @@ boolean replace(char[] source, char[] src, char[] dest) { boolean replace(char[] source) { boolean changed = false; - changed |= replace(source, INT_LONG, LONG_INT); - changed |= replace(source, INT_LONG_ARRAY, LONG_INT_ARRAY); - changed |= replace(source, FLOAT_DOUBLE, DOUBLE_FLOAT); - changed |= replace(source, FLOAT_DOUBLE_ARRAY, DOUBLE_FLOAT_ARRAY); + changed |= replace(source, LONG_INT, INT_LONG); + changed |= replace(source, LONG_INT_ARRAY, INT_LONG_ARRAY); + changed |= replace(source, DOUBLE_FLOAT, FLOAT_DOUBLE); + changed |= replace(source, DOUBLE_FLOAT_ARRAY, FLOAT_DOUBLE_ARRAY); if (!changed) { - changed |= replace(source, LONG_INT, INT_LONG); - changed |= replace(source, LONG_INT_ARRAY, INT_LONG_ARRAY); - changed |= replace(source, DOUBLE_FLOAT, FLOAT_DOUBLE); - changed |= replace(source, DOUBLE_FLOAT_ARRAY, FLOAT_DOUBLE_ARRAY); + changed |= replace(source, INT_LONG, LONG_INT); + changed |= replace(source, INT_LONG_ARRAY, LONG_INT_ARRAY); + changed |= replace(source, FLOAT_DOUBLE, DOUBLE_FLOAT); + changed |= replace(source, FLOAT_DOUBLE_ARRAY, DOUBLE_FLOAT_ARRAY); } return changed; } diff --git a/bundles/org.eclipse.swt/.classpath_cocoa b/bundles/org.eclipse.swt/.classpath_cocoa index dc8d373a7f..8ed1d226a6 100644 --- a/bundles/org.eclipse.swt/.classpath_cocoa +++ b/bundles/org.eclipse.swt/.classpath_cocoa @@ -11,7 +11,7 @@ <classpathentry kind="src" path="Eclipse SWT PI/common"/> <classpathentry kind="src" path="Eclipse SWT PI/cocoa"> <attributes> - <attribute value="org.eclipse.swt.cocoa.macosx" name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY"/> + <attribute value="org.eclipse.swt.cocoa.macosx.x86_64" name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY"/> </attributes> </classpathentry> <classpathentry kind="src" path="Eclipse SWT PI/common_j2se"/> diff --git a/bundles/org.eclipse.swt/.classpath_gtk b/bundles/org.eclipse.swt/.classpath_gtk index c1e7b943ae..babfb2899d 100644 --- a/bundles/org.eclipse.swt/.classpath_gtk +++ b/bundles/org.eclipse.swt/.classpath_gtk @@ -10,7 +10,7 @@ <classpathentry kind="src" path="Eclipse SWT/common_j2se"/> <classpathentry kind="src" path="Eclipse SWT PI/gtk"> <attributes> - <attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="org.eclipse.swt.gtk.linux.x86"/> + <attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="org.eclipse.swt.gtk.linux.x86_64"/> </attributes> </classpathentry> <classpathentry kind="src" path="Eclipse SWT PI/cairo"/> diff --git a/bundles/org.eclipse.swt/.classpath_gtk_j2me b/bundles/org.eclipse.swt/.classpath_gtk_j2me index c715d37dae..953add3587 100644 --- a/bundles/org.eclipse.swt/.classpath_gtk_j2me +++ b/bundles/org.eclipse.swt/.classpath_gtk_j2me @@ -10,7 +10,7 @@ <classpathentry kind="src" path="Eclipse SWT PI/common"/> <classpathentry kind="src" path="Eclipse SWT PI/gtk"> <attributes> - <attribute value="org.eclipse.swt.gtk.linux.x86" name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY"/> + <attribute value="org.eclipse.swt.gtk.linux.x86_64" name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY"/> </attributes> </classpathentry> <classpathentry kind="src" path="Eclipse SWT PI/common_j2me"/> diff --git a/bundles/org.eclipse.swt/.classpath_win32 b/bundles/org.eclipse.swt/.classpath_win32 index 376d93086d..c981b48520 100644 --- a/bundles/org.eclipse.swt/.classpath_win32 +++ b/bundles/org.eclipse.swt/.classpath_win32 @@ -7,7 +7,7 @@ <classpathentry kind="src" path="Eclipse SWT PI/common"/> <classpathentry kind="src" path="Eclipse SWT PI/win32"> <attributes> - <attribute value="org.eclipse.swt.win32.win32.x86" name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY"/> + <attribute value="org.eclipse.swt.win32.win32.x86_64" name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY"/> </attributes> </classpathentry> <classpathentry kind="src" path="Eclipse SWT PI/common_j2se"/> diff --git a/bundles/org.eclipse.swt/.classpath_win32_j2me b/bundles/org.eclipse.swt/.classpath_win32_j2me index 6708817916..37584b3c82 100644 --- a/bundles/org.eclipse.swt/.classpath_win32_j2me +++ b/bundles/org.eclipse.swt/.classpath_win32_j2me @@ -12,7 +12,7 @@ <classpathentry kind="src" path="Eclipse SWT Accessibility/common"/> <classpathentry kind="src" path="Eclipse SWT AWT/win32"> <attributes> - <attribute value="org.eclipse.swt.win32.win32.x86" name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY"/> + <attribute value="org.eclipse.swt.win32.win32.x86_64" name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY"/> </attributes> </classpathentry> <classpathentry kind="src" path="Eclipse SWT Drag and Drop/emulated"/> diff --git a/bundles/org.eclipse.swt/Eclipse SWT AWT/cocoa/org/eclipse/swt/awt/SWT_AWT.java b/bundles/org.eclipse.swt/Eclipse SWT AWT/cocoa/org/eclipse/swt/awt/SWT_AWT.java index 00ba391ca8..47065c2235 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT AWT/cocoa/org/eclipse/swt/awt/SWT_AWT.java +++ b/bundles/org.eclipse.swt/Eclipse SWT AWT/cocoa/org/eclipse/swt/awt/SWT_AWT.java @@ -52,7 +52,7 @@ public class SWT_AWT { static boolean loaded, swingInitialized; - static native final int /*long*/ getAWTHandle (Canvas canvas); + static native final long /*int*/ getAWTHandle (Canvas canvas); static synchronized void loadLibrary () { if (loaded) return; @@ -131,7 +131,7 @@ public static Frame new_Frame(final Composite parent) { SWT.error(SWT.ERROR_INVALID_ARGUMENT); } - final int /*long*/ handle = parent.view.id; + final long /*int*/ handle = parent.view.id; Class clazz = null; try { @@ -279,7 +279,7 @@ public static Frame new_Frame(final Composite parent) { public static Shell new_Shell(final Display display, final Canvas parent) { if (display == null) SWT.error (SWT.ERROR_NULL_ARGUMENT); if (parent == null) SWT.error (SWT.ERROR_NULL_ARGUMENT); - int /*long*/ handle = 0; + long /*int*/ handle = 0; try { loadLibrary (); diff --git a/bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/org/eclipse/swt/awt/SWT_AWT.java b/bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/org/eclipse/swt/awt/SWT_AWT.java index 5aec4a5379..83145d88e1 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/org/eclipse/swt/awt/SWT_AWT.java +++ b/bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/org/eclipse/swt/awt/SWT_AWT.java @@ -64,7 +64,7 @@ public class SWT_AWT { static boolean loaded, swingInitialized; -static native final int /*long*/ getAWTHandle (Object canvas); +static native final long /*int*/ getAWTHandle (Object canvas); static native final void setDebug (Frame canvas, boolean debug); static synchronized void loadLibrary () { @@ -152,7 +152,7 @@ public static Frame new_Frame (final Composite parent) { if ((parent.getStyle () & SWT.EMBEDDED) == 0) { SWT.error (SWT.ERROR_INVALID_ARGUMENT); } - int /*long*/ handle = parent.embeddedHandle; + long /*int*/ handle = parent.embeddedHandle; /* * Some JREs have implemented the embedded frame constructor to take an integer * and other JREs take a long. To handle this binary incompatibility, use @@ -200,9 +200,9 @@ public static Frame new_Frame (final Composite parent) { if (parent.isDisposed()) return; Shell shell = parent.getShell(); loadLibrary(); - int /*long*/ awtHandle = getAWTHandle(window); + long /*int*/ awtHandle = getAWTHandle(window); if (awtHandle == 0) return; - int /*long*/ xWindow; + long /*int*/ xWindow; if (OS.GTK_VERSION >= OS.VERSION(2, 14, 0)){ xWindow = OS.gdk_x11_drawable_get_xid(OS.gtk_widget_get_window(OS.gtk_widget_get_toplevel(shell.handle))); } else { @@ -305,7 +305,7 @@ public static Frame new_Frame (final Composite parent) { public static Shell new_Shell (final Display display, final Canvas parent) { if (display == null) SWT.error (SWT.ERROR_NULL_ARGUMENT); if (parent == null) SWT.error (SWT.ERROR_NULL_ARGUMENT); - int /*long*/ handle = 0; + long /*int*/ handle = 0; try { loadLibrary (); handle = getAWTHandle (parent); diff --git a/bundles/org.eclipse.swt/Eclipse SWT AWT/motif/org/eclipse/swt/awt/SWT_AWT.java b/bundles/org.eclipse.swt/Eclipse SWT AWT/motif/org/eclipse/swt/awt/SWT_AWT.java index f8e51f124c..1a9ffe9182 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT AWT/motif/org/eclipse/swt/awt/SWT_AWT.java +++ b/bundles/org.eclipse.swt/Eclipse SWT AWT/motif/org/eclipse/swt/awt/SWT_AWT.java @@ -64,7 +64,7 @@ public class SWT_AWT { static boolean loaded, swingInitialized; -static native final int /*long*/ getAWTHandle (Object canvas); +static native final long /*int*/ getAWTHandle (Object canvas); static native final void setDebug (Frame canvas, boolean debug); static synchronized void loadLibrary () { @@ -142,7 +142,7 @@ public static Frame new_Frame (final Composite parent) { if ((parent.getStyle () & SWT.EMBEDDED) == 0) { SWT.error (SWT.ERROR_INVALID_ARGUMENT); } - int /*long*/ handle = parent.embeddedHandle; + long /*int*/ handle = parent.embeddedHandle; /* * Some JREs have implemented the embedded frame constructor to take an integer * and other JREs take a long. To handle this binary incompatability, use @@ -292,7 +292,7 @@ public static Frame new_Frame (final Composite parent) { public static Shell new_Shell (final Display display, final Canvas parent) { if (display == null) SWT.error (SWT.ERROR_NULL_ARGUMENT); if (parent == null) SWT.error (SWT.ERROR_NULL_ARGUMENT); - int /*long*/ handle = 0; + long /*int*/ handle = 0; try { loadLibrary (); handle = getAWTHandle (parent); diff --git a/bundles/org.eclipse.swt/Eclipse SWT AWT/win32/org/eclipse/swt/awt/SWT_AWT.java b/bundles/org.eclipse.swt/Eclipse SWT AWT/win32/org/eclipse/swt/awt/SWT_AWT.java index 8d1d39d5e0..40c36a5b47 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT AWT/win32/org/eclipse/swt/awt/SWT_AWT.java +++ b/bundles/org.eclipse.swt/Eclipse SWT AWT/win32/org/eclipse/swt/awt/SWT_AWT.java @@ -62,7 +62,7 @@ public class SWT_AWT { static boolean loaded, swingInitialized; -static native final int /*long*/ getAWTHandle (Canvas canvas); +static native final long /*int*/ getAWTHandle (Canvas canvas); static synchronized void loadLibrary () { if (loaded) return; @@ -140,7 +140,7 @@ public static Frame new_Frame (final Composite parent) { if ((parent.getStyle () & SWT.EMBEDDED) == 0) { SWT.error (SWT.ERROR_INVALID_ARGUMENT); } - final int /*long*/ handle = parent.handle; + final long /*int*/ handle = parent.handle; final Frame[] result = new Frame[1]; final Throwable[] exception = new Throwable[1]; Runnable runnable = new Runnable () { @@ -365,7 +365,7 @@ public static Frame new_Frame (final Composite parent) { public static Shell new_Shell (final Display display, final Canvas parent) { if (display == null) SWT.error (SWT.ERROR_NULL_ARGUMENT); if (parent == null) SWT.error (SWT.ERROR_NULL_ARGUMENT); - int /*long*/ handle = 0; + long /*int*/ handle = 0; try { loadLibrary (); handle = getAWTHandle (parent); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/cocoa/org/eclipse/swt/accessibility/Accessible.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/cocoa/org/eclipse/swt/accessibility/Accessible.java index de614bcf19..4ce57e770f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/cocoa/org/eclipse/swt/accessibility/Accessible.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/cocoa/org/eclipse/swt/accessibility/Accessible.java @@ -143,7 +143,7 @@ public class Accessible { if (accessible.delegate != null) return accessible.delegate; if (accessible.control != null) { NSView view = accessible.control.view; - int /*long*/ handle = OS.objc_msgSend(view.id, OS.sel_accessibleHandle); + long /*int*/ handle = OS.objc_msgSend(view.id, OS.sel_accessibleHandle); return new id(handle); } return null; @@ -426,9 +426,9 @@ public class Accessible { accessibleAttributeListeners.addElement(listener); } - void addCGColor(float /*double*/ [] comps, NSMutableAttributedString inAttribString, NSString inAttribute, NSRange inRange) { - int /*long*/ cgColorSpace = OS.CGColorSpaceCreateDeviceRGB(); - int /*long*/ cgColor = OS.CGColorCreate(cgColorSpace, comps); + void addCGColor(double /*float*/ [] comps, NSMutableAttributedString inAttribString, NSString inAttribute, NSRange inRange) { + long /*int*/ cgColorSpace = OS.CGColorSpaceCreateDeviceRGB(); + long /*int*/ cgColor = OS.CGColorCreate(cgColorSpace, comps); OS.CGColorSpaceRelease(cgColorSpace); inAttribString.addAttribute(inAttribute, new id(cgColor), inRange); OS.CGColorRelease(cgColor); @@ -1592,7 +1592,7 @@ public class Accessible { fontInfoDict.setValue(familyName, OS.NSAccessibilityFontFamilyKey); NSString displayName = fontUsed.displayName(); fontInfoDict.setValue(displayName, OS.NSAccessibilityVisibleNameKey); - float /*double*/ fontSize = fontUsed.pointSize(); + double /*float*/ fontSize = fontUsed.pointSize(); fontInfoDict.setValue(NSNumber.numberWithDouble(fontSize), OS.NSAccessibilityFontSizeKey); attribString.addAttribute(OS.NSAccessibilityFontTextAttribute, fontInfoDict, attributeRange); @@ -3481,7 +3481,7 @@ public class Accessible { * * @noreference This method is not intended to be referenced by clients. */ - public int /*long*/ internal_addRelationAttributes(int /*long*/ defaultAttributes) { + public long /*int*/ internal_addRelationAttributes(long /*int*/ defaultAttributes) { NSArray attributes = new NSArray(defaultAttributes); NSMutableArray returnArray = NSMutableArray.arrayWithCapacity(attributes.count()); returnArray.addObjectsFromArray(attributes); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/cocoa/org/eclipse/swt/accessibility/SWTAccessibleDelegate.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/cocoa/org/eclipse/swt/accessibility/SWTAccessibleDelegate.java index 68d0bfd7fe..1b744ec591 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/cocoa/org/eclipse/swt/accessibility/SWTAccessibleDelegate.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/cocoa/org/eclipse/swt/accessibility/SWTAccessibleDelegate.java @@ -27,10 +27,10 @@ class SWTAccessibleDelegate extends NSObject { static final byte[] SWT_OBJECT = {'S', 'W', 'T', '_', 'O', 'B', 'J', 'E', 'C', 'T', '\0'}; static Callback accessible2Args, accessible3Args, accessible4Args; - static int /*long*/ proc2Args, proc3Args, proc4Args; + static long /*int*/ proc2Args, proc3Args, proc4Args; Accessible accessible; - int /*long*/ delegateJniRef; + long /*int*/ delegateJniRef; int childID; NSArray attributeNames = null; @@ -63,7 +63,7 @@ class SWTAccessibleDelegate extends NSObject { byte[] types = {'*','\0'}; int size = C.PTR_SIZEOF, align = C.PTR_SIZEOF == 4 ? 2 : 3; - int /*long*/ cls = OS.objc_allocateClassPair(OS.class_NSObject, className, 0); + long /*int*/ cls = OS.objc_allocateClassPair(OS.class_NSObject, className, 0); OS.class_addIvar(cls, SWT_OBJECT, size, (byte)align, types); // Add the NSAccessibility overrides @@ -172,7 +172,7 @@ class SWTAccessibleDelegate extends NSObject { return new NSArray(temp2.id); } - static int /*long*/ accessibleProc(int /*long*/ id, int /*long*/ sel) { + static long /*int*/ accessibleProc(long /*int*/ id, long /*int*/ sel) { SWTAccessibleDelegate swtAcc = getAccessibleDelegate(id); if (swtAcc == null) return 0; @@ -196,7 +196,7 @@ class SWTAccessibleDelegate extends NSObject { return 0; } - static int /*long*/ accessibleProc(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0) { + static long /*int*/ accessibleProc(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) { SWTAccessibleDelegate swtAcc = getAccessibleDelegate(id); if (swtAcc == null) return 0; @@ -224,7 +224,7 @@ class SWTAccessibleDelegate extends NSObject { return 0; } - static int /*long*/ accessibleProc(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1) { + static long /*int*/ accessibleProc(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1) { SWTAccessibleDelegate swtAcc = getAccessibleDelegate(id); if (swtAcc == null) return 0; @@ -242,9 +242,9 @@ class SWTAccessibleDelegate extends NSObject { return 0; } - static SWTAccessibleDelegate getAccessibleDelegate(int /*long*/ id) { + static SWTAccessibleDelegate getAccessibleDelegate(long /*int*/ id) { if (id == 0) return null; - int /*long*/ [] jniRef = new int /*long*/ [1]; + long /*int*/ [] jniRef = new long /*int*/ [1]; OS.object_getInstanceVariable(id, SWT_OBJECT, jniRef); if (jniRef[0] == 0) return null; return (SWTAccessibleDelegate)OS.JNIGetObject(jniRef[0]); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/Accessible.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/Accessible.java index 114bd1a926..4b0c5f66fe 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/Accessible.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/Accessible.java @@ -468,14 +468,14 @@ public class Accessible { return accessibleObject; } - int /*long*/ getControlHandle () { - int /*long*/ result = control.handle; + long /*int*/ getControlHandle () { + long /*int*/ result = control.handle; if (control instanceof Label) { - int /*long*/ list = OS.gtk_container_get_children (result); + long /*int*/ list = OS.gtk_container_get_children (result); if (list != 0) { - int /*long*/ temp = list; + long /*int*/ temp = list; while (temp != 0) { - int /*long*/ widget = OS.g_list_data( temp); + long /*int*/ widget = OS.g_list_data( temp); if (OS.GTK_VERSION >= OS.VERSION (2, 18, 0) ? OS.gtk_widget_get_visible (widget) : OS.GTK_WIDGET_VISIBLE (widget)) { result = widget; break; diff --git a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleFactory.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleFactory.java index 03e4031c06..585d12c352 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleFactory.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleFactory.java @@ -157,14 +157,14 @@ class AccessibleFactory { static final Callback InitValueIfaceCB; static final Callback GTypeInfo_base_init_factory; /* interface definitions */ - static final int /*long*/ ActionIfaceDefinition; - static final int /*long*/ ComponentIfaceDefinition; - static final int /*long*/ EditableTextIfaceDefinition; - static final int /*long*/ HypertextIfaceDefinition; - static final int /*long*/ SelectionIfaceDefinition; - static final int /*long*/ TableIfaceDefinition; - static final int /*long*/ TextIfaceDefinition; - static final int /*long*/ ValueIfaceDefinition; + static final long /*int*/ ActionIfaceDefinition; + static final long /*int*/ ComponentIfaceDefinition; + static final long /*int*/ EditableTextIfaceDefinition; + static final long /*int*/ HypertextIfaceDefinition; + static final long /*int*/ SelectionIfaceDefinition; + static final long /*int*/ TableIfaceDefinition; + static final long /*int*/ TextIfaceDefinition; + static final long /*int*/ ValueIfaceDefinition; static { AtkActionCB_do_action = newCallback (AccessibleObject.class, "atkAction_do_action", 2); //$NON-NLS-1$ AtkActionCB_get_n_actions = newCallback (AccessibleObject.class, "atkAction_get_n_actions", 1); //$NON-NLS-1$ @@ -301,15 +301,15 @@ class AccessibleFactory { return callback; } - static String getTypeName (int /*long*/ type) { - int /*long*/ typeName = OS.g_type_name (type); + static String getTypeName (long /*int*/ type) { + long /*int*/ typeName = OS.g_type_name (type); int widgetTypeNameLength = OS.strlen (typeName); byte[] buffer = new byte [widgetTypeNameLength]; OS.memmove (buffer, typeName, widgetTypeNameLength); return new String(Converter.mbcsToWcs(null, buffer)); } - static int /*long*/ getParentType (int /*long*/ widgetType) { + static long /*int*/ getParentType (long /*int*/ widgetType) { LONG type = null; while (widgetType != 0 && (type = (LONG)Factories.get(new LONG(widgetType))) == null) { widgetType = OS.g_type_parent (widgetType); @@ -318,14 +318,14 @@ class AccessibleFactory { return ((LONG)type).value; } - static int /*long*/ atkObjectFactory_create_accessible (int /*long*/ widget) { + static long /*int*/ atkObjectFactory_create_accessible (long /*int*/ widget) { Accessible accessible = (Accessible) Accessibles.get (new LONG (widget)); if (accessible == null) { /* * we don't care about this control, so create it with the parent's * type so that its accessibility callbacks will not pass though here */ - int /*long*/ result = OS.g_object_new (getParentType(OS.G_OBJECT_TYPE (widget)), 0); + long /*int*/ result = OS.g_object_new (getParentType(OS.G_OBJECT_TYPE (widget)), 0); ATK.atk_object_initialize (result, widget); return result; } @@ -333,10 +333,10 @@ class AccessibleFactory { if (accessible.accessibleObject != null) { return accessible.accessibleObject.handle; } - int /*long*/ widgetType = OS.G_OBJECT_TYPE (widget); - int /*long*/ parentType = getParentType (widgetType); + long /*int*/ widgetType = OS.G_OBJECT_TYPE (widget); + long /*int*/ parentType = getParentType (widgetType); if (parentType == 0) parentType = ATK.GTK_TYPE_ACCESSIBLE(); - int /*long*/ type = getType (getTypeName(widgetType), accessible, parentType, ACC.CHILDID_SELF); + long /*int*/ type = getType (getTypeName(widgetType), accessible, parentType, ACC.CHILDID_SELF); AccessibleObject object = new AccessibleObject (type, widget, accessible, false); accessible.accessibleObject = object; accessible.addRelations (); @@ -344,16 +344,16 @@ class AccessibleFactory { } static AccessibleObject createChildAccessible (Accessible accessible, int childId) { - int /*long*/ childType = getType (CHILD_TYPENAME, accessible, ATK.GTK_TYPE_ACCESSIBLE(), childId); + long /*int*/ childType = getType (CHILD_TYPENAME, accessible, ATK.GTK_TYPE_ACCESSIBLE(), childId); return new AccessibleObject(childType, 0, accessible, true); } static void createAccessible (Accessible accessible) { - int /*long*/ controlHandle = accessible.getControlHandle (); + long /*int*/ controlHandle = accessible.getControlHandle (); OS.gtk_widget_get_accessible(controlHandle); } - static int /*long*/ getType (String widgetTypeName, Accessible accessible, int /*long*/ parentType, int childId) { + static long /*int*/ getType (String widgetTypeName, Accessible accessible, long /*int*/ parentType, int childId) { AccessibleControlEvent event = new AccessibleControlEvent (accessible); event.childID = childId; Vector listeners = accessible.accessibleControlListeners; @@ -418,11 +418,11 @@ class AccessibleFactory { if (value) swtTypeName += "Value"; //$NON-NLS-1$ byte[] nameBytes = Converter.wcsToMbcs(null, swtTypeName, true); - int /*long*/ type = OS.g_type_from_name(nameBytes); + long /*int*/ type = OS.g_type_from_name(nameBytes); if (type == 0) { if (AccessibleObject.DEBUG) AccessibleObject.print("-->New Type=" + swtTypeName); //$NON-NLS-1$ /* define the type */ - int /*long*/ queryPtr = OS.g_malloc (GTypeQuery.sizeof); + long /*int*/ queryPtr = OS.g_malloc (GTypeQuery.sizeof); OS.g_type_query (parentType, queryPtr); GTypeQuery query = new GTypeQuery (); OS.memmove (query, queryPtr, GTypeQuery.sizeof); @@ -431,7 +431,7 @@ class AccessibleFactory { typeInfo.base_init = GTypeInfo_base_init_type.getAddress (); typeInfo.class_size = (short) query.class_size; typeInfo.instance_size = (short) query.instance_size; - int /*long*/ definition = OS.g_malloc (GTypeInfo.sizeof); + long /*int*/ definition = OS.g_malloc (GTypeInfo.sizeof); OS.memmove (definition, typeInfo, GTypeInfo.sizeof); type = OS.g_type_register_static (parentType, nameBytes, definition, 0); OS.g_type_add_interface_static (type, ATK.ATK_TYPE_COMPONENT(), ComponentIfaceDefinition); @@ -446,7 +446,7 @@ class AccessibleFactory { return type; } - static int /*long*/ gTypeInfo_base_init_factory (int /*long*/ klass) { + static long /*int*/ gTypeInfo_base_init_factory (long /*int*/ klass) { AtkObjectFactoryClass objectClass = new AtkObjectFactoryClass (); ATK.memmove (objectClass, klass); objectClass.create_accessible = AtkObjectFactoryCB_create_accessible.getAddress (); @@ -454,7 +454,7 @@ class AccessibleFactory { return 0; } - static int /*long*/ gTypeInfo_base_init_type (int /*long*/ klass) { + static long /*int*/ gTypeInfo_base_init_type (long /*int*/ klass) { AtkObjectClass objectClass = new AtkObjectClass (); ATK.memmove (objectClass, klass); objectClass.get_name = AtkObjectCB_get_name.getAddress (); @@ -466,7 +466,7 @@ class AccessibleFactory { objectClass.get_index_in_parent = AtkObjectCB_get_index_in_parent.getAddress (); objectClass.ref_child = AtkObjectCB_ref_child.getAddress (); objectClass.get_attributes = AtkObjectCB_get_attributes.getAddress (); - int /*long*/ gObjectClass = OS.G_OBJECT_CLASS (klass); + long /*int*/ gObjectClass = OS.G_OBJECT_CLASS (klass); GObjectClass objectClassStruct = new GObjectClass (); OS.memmove (objectClassStruct, gObjectClass); objectClassStruct.finalize = GObjectClass_finalize.getAddress (); @@ -475,7 +475,7 @@ class AccessibleFactory { return 0; } - static int /*long*/ initActionIfaceCB (int /*long*/ iface) { + static long /*int*/ initActionIfaceCB (long /*int*/ iface) { AtkActionIface inter = new AtkActionIface (); ATK.memmove (inter, iface); inter.do_action = AtkActionCB_do_action.getAddress (); @@ -487,7 +487,7 @@ class AccessibleFactory { return 0; } - static int /*long*/ initComponentIfaceCB (int /*long*/ iface) { + static long /*int*/ initComponentIfaceCB (long /*int*/ iface) { AtkComponentIface inter = new AtkComponentIface (); ATK.memmove (inter, iface); inter.get_extents = AtkComponentCB_get_extents.getAddress (); @@ -498,7 +498,7 @@ class AccessibleFactory { return 0; } - static int /*long*/ initEditableTextIfaceCB (int /*long*/ iface) { + static long /*int*/ initEditableTextIfaceCB (long /*int*/ iface) { AtkEditableTextIface inter = new AtkEditableTextIface (); ATK.memmove (inter, iface); inter.set_run_attributes = AtkEditableTextCB_set_run_attributes.getAddress (); @@ -512,7 +512,7 @@ class AccessibleFactory { return 0; } - static int /*long*/ initHypertextIfaceCB (int /*long*/ iface) { + static long /*int*/ initHypertextIfaceCB (long /*int*/ iface) { AtkHypertextIface inter = new AtkHypertextIface (); ATK.memmove (inter, iface); inter.get_link = AtkHypertextCB_get_link.getAddress (); @@ -522,7 +522,7 @@ class AccessibleFactory { return 0; } - static int /*long*/ initSelectionIfaceCB (int /*long*/ iface) { + static long /*int*/ initSelectionIfaceCB (long /*int*/ iface) { AtkSelectionIface inter = new AtkSelectionIface (); ATK.memmove (inter, iface); inter.is_child_selected = AtkSelectionCB_is_child_selected.getAddress (); @@ -531,7 +531,7 @@ class AccessibleFactory { return 0; } - static int /*long*/ initTableIfaceCB (int /*long*/ iface) { + static long /*int*/ initTableIfaceCB (long /*int*/ iface) { AtkTableIface inter = new AtkTableIface (); ATK.memmove (inter, iface); inter.ref_at = AtkTableCB_ref_at.getAddress(); @@ -561,7 +561,7 @@ class AccessibleFactory { return 0; } - static int /*long*/ initTextIfaceCB (int /*long*/ iface) { + static long /*int*/ initTextIfaceCB (long /*int*/ iface) { AtkTextIface inter = new AtkTextIface (); ATK.memmove (inter, iface); inter.get_range_extents = AtkTextCB_get_range_extents.getAddress (); @@ -586,7 +586,7 @@ class AccessibleFactory { return 0; } - static int /*long*/ initValueIfaceCB (int /*long*/ iface) { + static long /*int*/ initValueIfaceCB (long /*int*/ iface) { AtkValueIface inter = new AtkValueIface (); ATK.memmove (inter, iface); inter.get_current_value = AtkValueCB_get_current_value.getAddress (); @@ -598,10 +598,10 @@ class AccessibleFactory { } static void registerAccessible (Accessible accessible) { - int /*long*/ widget = accessible.getControlHandle (); - int /*long*/ widgetType = OS.G_OBJECT_TYPE (widget); - int /*long*/ registry = ATK.atk_get_default_registry (); - int /*long*/ factory = ATK.atk_registry_get_factory (registry, widgetType); + long /*int*/ widget = accessible.getControlHandle (); + long /*int*/ widgetType = OS.G_OBJECT_TYPE (widget); + long /*int*/ registry = ATK.atk_get_default_registry (); + long /*int*/ factory = ATK.atk_registry_get_factory (registry, widgetType); /* If NO_OP factory is registered then OS accessibility is not active */ if (ATK.ATK_IS_NO_OP_OBJECT_FACTORY(factory)) return; String name = FACTORY_TYPENAME + getTypeName(widgetType); @@ -613,10 +613,10 @@ class AccessibleFactory { typeInfo.base_init = GTypeInfo_base_init_factory.getAddress (); typeInfo.class_size = (short)ATK.AtkObjectFactoryClass_sizeof (); typeInfo.instance_size = (short)ATK.AtkObjectFactory_sizeof (); - int /*long*/ info = OS.g_malloc (GTypeInfo.sizeof); + long /*int*/ info = OS.g_malloc (GTypeInfo.sizeof); OS.memmove (info, typeInfo, GTypeInfo.sizeof); - int /*long*/ swtFactoryType = OS.g_type_register_static (ATK.ATK_TYPE_OBJECT_FACTORY(), factoryName, info, 0); - int /*long*/ parentType = ATK.atk_object_factory_get_accessible_type(factory); + long /*int*/ swtFactoryType = OS.g_type_register_static (ATK.ATK_TYPE_OBJECT_FACTORY(), factoryName, info, 0); + long /*int*/ parentType = ATK.atk_object_factory_get_accessible_type(factory); ATK.atk_registry_set_factory_type (registry, widgetType, swtFactoryType); Factories.put (new LONG (widgetType), new LONG (parentType)); } @@ -625,7 +625,7 @@ class AccessibleFactory { } static void unregisterAccessible (Accessible accessible) { - int /*long*/ widget = accessible.getControlHandle (); + long /*int*/ widget = accessible.getControlHandle (); Accessibles.remove (new LONG (widget)); if (AccessibleObject.DEBUG) AccessibleObject.print("-->Deregister=" + accessible.control + " " + widget); //$NON-NLS-1$ } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java index 0499c3ea4e..0e77b48472 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java @@ -21,7 +21,7 @@ import org.eclipse.swt.internal.accessibility.gtk.*; import org.eclipse.swt.internal.gtk.*; class AccessibleObject { - int /*long*/ handle; + long /*int*/ handle; int index = -1, id = ACC.CHILDID_SELF; Accessible accessible; AccessibleObject parent; @@ -32,10 +32,10 @@ class AccessibleObject { */ boolean isLightweight = false; - static int /*long*/ actionNamePtr = -1; - static int /*long*/ descriptionPtr = -1; - static int /*long*/ keybindingPtr = -1; - static int /*long*/ namePtr = -1; + static long /*int*/ actionNamePtr = -1; + static long /*int*/ descriptionPtr = -1; + static long /*int*/ keybindingPtr = -1; + static long /*int*/ namePtr = -1; static final Hashtable AccessibleObjects = new Hashtable (9); static final boolean DEBUG = Device.DEBUG; @@ -45,7 +45,7 @@ class AccessibleObject { COLUMN_ROLE = ATK.atk_role_register(Converter.wcsToMbcs(null, "column", true)); //$NON-NLS-1$ } - AccessibleObject (int /*long*/ type, int /*long*/ widget, Accessible accessible, boolean isLightweight) { + AccessibleObject (long /*int*/ type, long /*int*/ widget, Accessible accessible, boolean isLightweight) { super (); handle = ATK.g_object_new (type, 0); ATK.atk_object_initialize (handle, widget); @@ -59,7 +59,7 @@ class AccessibleObject { System.out.println (str); } - static AtkActionIface getActionIface (int /*long*/ atkObject) { + static AtkActionIface getActionIface (long /*int*/ atkObject) { if (ATK.g_type_is_a (OS.g_type_parent (OS.G_OBJECT_TYPE (atkObject)), ATK.ATK_TYPE_ACTION())) { AtkActionIface iface = new AtkActionIface (); ATK.memmove (iface, ATK.g_type_interface_peek_parent (ATK.ATK_ACTION_GET_IFACE (atkObject))); @@ -68,7 +68,7 @@ class AccessibleObject { return null; } - static int /*long*/ atkAction_do_action (int /*long*/ atkObject, int /*long*/ index) { + static long /*int*/ atkAction_do_action (long /*int*/ atkObject, long /*int*/ index) { if (DEBUG) print ("-->atkAction_do_action"); AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { @@ -85,7 +85,7 @@ class AccessibleObject { return ACC.OK.equals(event.result) ? 1 : 0; } } - int /*long*/ parentResult = 0; + long /*int*/ parentResult = 0; AtkActionIface iface = getActionIface (atkObject); if (iface != null && iface.do_action != 0) { parentResult = ATK.call (iface.do_action, atkObject, index); @@ -93,7 +93,7 @@ class AccessibleObject { return parentResult; } - static int /*long*/ atkAction_get_n_actions (int /*long*/ atkObject) { + static long /*int*/ atkAction_get_n_actions (long /*int*/ atkObject) { if (DEBUG) print ("-->atkAction_get_n_actions"); AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { @@ -109,7 +109,7 @@ class AccessibleObject { return event.count; } } - int /*long*/ parentResult = 0; + long /*int*/ parentResult = 0; AtkActionIface iface = getActionIface (atkObject); if (iface != null && iface.get_n_actions != 0) { parentResult = ATK.call (iface.get_n_actions, atkObject); @@ -117,7 +117,7 @@ class AccessibleObject { return parentResult; } - static int /*long*/ atkAction_get_description (int /*long*/ atkObject, int /*long*/ index) { + static long /*int*/ atkAction_get_description (long /*int*/ atkObject, long /*int*/ index) { if (DEBUG) print ("-->atkAction_get_description"); AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { @@ -136,7 +136,7 @@ class AccessibleObject { return descriptionPtr = getStringPtr (event.result); } } - int /*long*/ parentResult = 0; + long /*int*/ parentResult = 0; AtkActionIface iface = getActionIface (atkObject); if (iface != null && iface.get_description != 0) { parentResult = ATK.call (iface.get_description, atkObject, index); @@ -144,10 +144,10 @@ class AccessibleObject { return parentResult; } - static int /*long*/ atkAction_get_keybinding (int /*long*/ atkObject, int /*long*/ index) { + static long /*int*/ atkAction_get_keybinding (long /*int*/ atkObject, long /*int*/ index) { if (DEBUG) print ("-->atkAction_get_keybinding"); AccessibleObject object = getAccessibleObject (atkObject); - int /*long*/ parentResult = 0; + long /*int*/ parentResult = 0; AtkActionIface iface = getActionIface (atkObject); if (iface != null && iface.get_keybinding != 0) { parentResult = ATK.call (iface.get_keybinding, atkObject, index); @@ -187,10 +187,10 @@ class AccessibleObject { return parentResult; } - static int /*long*/ atkAction_get_name (int /*long*/ atkObject, int /*long*/ index) { + static long /*int*/ atkAction_get_name (long /*int*/ atkObject, long /*int*/ index) { if (DEBUG) print ("-->atkAction_get_name"); AccessibleObject object = getAccessibleObject (atkObject); - int /*long*/ parentResult = 0; + long /*int*/ parentResult = 0; AtkActionIface iface = getActionIface (atkObject); if (iface != null && iface.get_name != 0) { parentResult = ATK.call (iface.get_name, atkObject, index); @@ -232,7 +232,7 @@ class AccessibleObject { return parentResult; } - static AtkComponentIface getComponentIface (int /*long*/ atkObject) { + static AtkComponentIface getComponentIface (long /*int*/ atkObject) { if (ATK.g_type_is_a (OS.g_type_parent (OS.G_OBJECT_TYPE (atkObject)), ATK.ATK_TYPE_COMPONENT())) { AtkComponentIface iface = new AtkComponentIface (); ATK.memmove (iface, ATK.g_type_interface_peek_parent (ATK.ATK_COMPONENT_GET_IFACE (atkObject))); @@ -241,7 +241,7 @@ class AccessibleObject { return null; } - static int /*long*/ atkComponent_get_extents (int /*long*/ atkObject, int /*long*/ x, int /*long*/ y, int /*long*/ width, int /*long*/ height, int /*long*/ coord_type) { + static long /*int*/ atkComponent_get_extents (long /*int*/ atkObject, long /*int*/ x, long /*int*/ y, long /*int*/ width, long /*int*/ height, long /*int*/ coord_type) { if (DEBUG) print ("-->atkComponent_get_extents: " + atkObject); AccessibleObject object = getAccessibleObject (atkObject); OS.memmove (x, new int[] {0}, 4); @@ -291,7 +291,7 @@ class AccessibleObject { return 0; } - static int /*long*/ atkComponent_get_position (int /*long*/ atkObject, int /*long*/ x, int /*long*/ y, int /*long*/ coord_type) { + static long /*int*/ atkComponent_get_position (long /*int*/ atkObject, long /*int*/ x, long /*int*/ y, long /*int*/ coord_type) { if (DEBUG) print ("-->atkComponent_get_position, object: " + atkObject + " x: " + x + " y: " + y + " coord: " + coord_type); AccessibleObject object = getAccessibleObject (atkObject); OS.memmove (x, new int[] {0}, 4); @@ -332,7 +332,7 @@ class AccessibleObject { return 0; } - static int /*long*/ atkComponent_get_size (int /*long*/ atkObject, int /*long*/ width, int /*long*/ height, int /*long*/ coord_type) { + static long /*int*/ atkComponent_get_size (long /*int*/ atkObject, long /*int*/ width, long /*int*/ height, long /*int*/ coord_type) { if (DEBUG) print ("-->atkComponent_get_size"); AccessibleObject object = getAccessibleObject (atkObject); OS.memmove (width, new int[] {0}, 4); @@ -363,7 +363,7 @@ class AccessibleObject { return 0; } - static int /*long*/ atkComponent_ref_accessible_at_point (int /*long*/ atkObject, int /*long*/ x, int /*long*/ y, int /*long*/ coord_type) { + static long /*int*/ atkComponent_ref_accessible_at_point (long /*int*/ atkObject, long /*int*/ x, long /*int*/ y, long /*int*/ coord_type) { if (DEBUG) print ("-->atkComponent_ref_accessible_at_point: " + atkObject + " " + x + "," + y); AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { @@ -392,7 +392,7 @@ class AccessibleObject { } } } - int /*long*/ parentResult = 0; + long /*int*/ parentResult = 0; AtkComponentIface iface = getComponentIface (atkObject); if (iface != null && iface.ref_accessible_at_point != 0) { parentResult = ATK.call (iface.ref_accessible_at_point, atkObject, x, y, coord_type); @@ -401,7 +401,7 @@ class AccessibleObject { } - static AtkEditableTextIface getEditableTextIface (int /*long*/ atkObject) { + static AtkEditableTextIface getEditableTextIface (long /*int*/ atkObject) { if (ATK.g_type_is_a (OS.g_type_parent (OS.G_OBJECT_TYPE (atkObject)), ATK.ATK_TYPE_EDITABLE_TEXT())) { AtkEditableTextIface iface = new AtkEditableTextIface (); ATK.memmove (iface, ATK.g_type_interface_peek_parent (ATK.ATK_EDITABLE_TEXT_GET_IFACE (atkObject))); @@ -411,7 +411,7 @@ class AccessibleObject { } // gboolean atk_editable_text_set_run_attributes(AtkEditableText *text, AtkAttributeSet *attrib_set, gint start_offset, gint end_offset); - static int /*long*/ atkEditableText_set_run_attributes (int /*long*/ atkObject, int /*long*/ attrib_set, int /*long*/ start_offset, int /*long*/ end_offset) { + static long /*int*/ atkEditableText_set_run_attributes (long /*int*/ atkObject, long /*int*/ attrib_set, long /*int*/ start_offset, long /*int*/ end_offset) { if (DEBUG) print ("-->atkEditableText_set_run_attributes"); AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { @@ -420,14 +420,14 @@ class AccessibleObject { int length = listeners.size(); if (length > 0) { Display display = accessible.control.getDisplay(); - int /*long*/ fontDesc = OS.pango_font_description_new (); + long /*int*/ fontDesc = OS.pango_font_description_new (); boolean createFont = false; TextStyle style = new TextStyle(); String [] attributes = new String [0]; - int /*long*/ current = attrib_set; + long /*int*/ current = attrib_set; int listLength = OS.g_slist_length (attrib_set); for (int i = 0; i < listLength; i++) { - int /*long*/ attrPtr = OS.g_slist_data (current); + long /*int*/ attrPtr = OS.g_slist_data (current); if (attrPtr != 0) { AtkAttribute attr = new AtkAttribute(); ATK.memmove(attr, attrPtr, AtkAttribute.sizeof); @@ -550,7 +550,7 @@ class AccessibleObject { return ACC.OK.equals(event.result) ? 1 : 0; } } - int /*long*/ parentResult = 0; + long /*int*/ parentResult = 0; AtkEditableTextIface iface = getEditableTextIface (atkObject); if (iface != null && iface.set_run_attributes != 0) { parentResult = ATK.call (iface.set_run_attributes, atkObject, attrib_set, start_offset, end_offset); @@ -576,7 +576,7 @@ class AccessibleObject { } // void atk_editable_text_set_text_contents (AtkEditableText *text, const gchar *string); - static int /*long*/ atkEditableText_set_text_contents (int /*long*/ atkObject, int /*long*/ string) { + static long /*int*/ atkEditableText_set_text_contents (long /*int*/ atkObject, long /*int*/ string) { if (DEBUG) print ("-->atkEditableText_set_text_contents"); AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { @@ -596,7 +596,7 @@ class AccessibleObject { return ACC.OK.equals(event.result) ? 1 : 0; } } - int /*long*/ parentResult = 0; + long /*int*/ parentResult = 0; AtkEditableTextIface iface = getEditableTextIface (atkObject); if (iface != null && iface.set_text_contents != 0) { parentResult = ATK.call (iface.set_text_contents, atkObject, string); @@ -605,7 +605,7 @@ class AccessibleObject { } // void atk_editable_text_insert_text (AtkEditableText *text, const gchar *string, gint length, gint *position); - static int /*long*/ atkEditableText_insert_text (int /*long*/ atkObject, int /*long*/ string, int /*long*/ string_length, int /*long*/ position) { + static long /*int*/ atkEditableText_insert_text (long /*int*/ atkObject, long /*int*/ string, long /*int*/ string_length, long /*int*/ position) { if (DEBUG) print ("-->atkEditableText_insert_text"); AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { @@ -625,7 +625,7 @@ class AccessibleObject { return ACC.OK.equals(event.result) ? 1 : 0; } } - int /*long*/ parentResult = 0; + long /*int*/ parentResult = 0; AtkEditableTextIface iface = getEditableTextIface (atkObject); if (iface != null && iface.insert_text != 0) { parentResult = ATK.call (iface.insert_text, atkObject, string, string_length, position); @@ -634,7 +634,7 @@ class AccessibleObject { } // void atk_editable_text_copy_text (AtkEditableText *text, gint start_pos, gint end_pos); - static int /*long*/ atkEditableText_copy_text(int /*long*/ atkObject, int /*long*/ start_pos, int /*long*/ end_pos) { + static long /*int*/ atkEditableText_copy_text(long /*int*/ atkObject, long /*int*/ start_pos, long /*int*/ end_pos) { if (DEBUG) print ("-->atkEditableText_copy_text"); AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { @@ -652,7 +652,7 @@ class AccessibleObject { return ACC.OK.equals(event.result) ? 1 : 0; } } - int /*long*/ parentResult = 0; + long /*int*/ parentResult = 0; AtkEditableTextIface iface = getEditableTextIface (atkObject); if (iface != null && iface.copy_text != 0) { parentResult = ATK.call (iface.copy_text, atkObject, start_pos, end_pos); @@ -661,7 +661,7 @@ class AccessibleObject { } // void atk_editable_text_cut_text (AtkEditableText *text, gint start_pos, gint end_pos); - static int /*long*/ atkEditableText_cut_text (int /*long*/ atkObject, int /*long*/ start_pos, int /*long*/ end_pos) { + static long /*int*/ atkEditableText_cut_text (long /*int*/ atkObject, long /*int*/ start_pos, long /*int*/ end_pos) { if (DEBUG) print ("-->atkEditableText_cut_text"); AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { @@ -679,7 +679,7 @@ class AccessibleObject { return ACC.OK.equals(event.result) ? 1 : 0; } } - int /*long*/ parentResult = 0; + long /*int*/ parentResult = 0; AtkEditableTextIface iface = getEditableTextIface (atkObject); if (iface != null && iface.cut_text != 0) { parentResult = ATK.call (iface.cut_text, atkObject, start_pos, end_pos); @@ -688,7 +688,7 @@ class AccessibleObject { } // void atk_editable_text_delete_text (AtkEditableText *text, gint start_pos, gint end_pos); - static int /*long*/ atkEditableText_delete_text (int /*long*/ atkObject, int /*long*/ start_pos, int /*long*/ end_pos) { + static long /*int*/ atkEditableText_delete_text (long /*int*/ atkObject, long /*int*/ start_pos, long /*int*/ end_pos) { if (DEBUG) print ("-->atkEditableText_delete_text"); AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { @@ -707,7 +707,7 @@ class AccessibleObject { return ACC.OK.equals(event.result) ? 1 : 0; } } - int /*long*/ parentResult = 0; + long /*int*/ parentResult = 0; AtkEditableTextIface iface = getEditableTextIface (atkObject); if (iface != null && iface.delete_text != 0) { parentResult = ATK.call (iface.delete_text, atkObject, start_pos, end_pos); @@ -716,7 +716,7 @@ class AccessibleObject { } // void atk_editable_text_paste_text (AtkEditableText *text, gint position); - static int /*long*/ atkEditableText_paste_text (int /*long*/ atkObject, int /*long*/ position) { + static long /*int*/ atkEditableText_paste_text (long /*int*/ atkObject, long /*int*/ position) { if (DEBUG) print ("-->atkEditableText_paste_text"); AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { @@ -733,7 +733,7 @@ class AccessibleObject { return ACC.OK.equals(event.result) ? 1 : 0; } } - int /*long*/ parentResult = 0; + long /*int*/ parentResult = 0; AtkEditableTextIface iface = getEditableTextIface (atkObject); if (iface != null && iface.paste_text != 0) { parentResult = ATK.call (iface.paste_text, atkObject, position); @@ -741,7 +741,7 @@ class AccessibleObject { return parentResult; } - static AtkHypertextIface getHypertextIface (int /*long*/ atkObject) { + static AtkHypertextIface getHypertextIface (long /*int*/ atkObject) { if (ATK.g_type_is_a (OS.g_type_parent (OS.G_OBJECT_TYPE (atkObject)), ATK.ATK_TYPE_HYPERTEXT())) { AtkHypertextIface iface = new AtkHypertextIface (); ATK.memmove (iface, ATK.g_type_interface_peek_parent (ATK.ATK_HYPERTEXT_GET_IFACE (atkObject))); @@ -750,7 +750,7 @@ class AccessibleObject { return null; } - static int /*long*/ atkHypertext_get_link (int /*long*/ atkObject, int /*long*/ link_index) { + static long /*int*/ atkHypertext_get_link (long /*int*/ atkObject, long /*int*/ link_index) { if (DEBUG) print ("-->atkHypertext_get_link"); AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { @@ -768,7 +768,7 @@ class AccessibleObject { return result != null ? result.getAccessibleObject().handle : 0; } } - int /*long*/ parentResult = 0; + long /*int*/ parentResult = 0; AtkHypertextIface iface = getHypertextIface (atkObject); if (iface != null && iface.get_link != 0) { parentResult = ATK.call (iface.get_link, atkObject, link_index); @@ -776,7 +776,7 @@ class AccessibleObject { return parentResult; } - static int /*long*/ atkHypertext_get_n_links (int /*long*/ atkObject) { + static long /*int*/ atkHypertext_get_n_links (long /*int*/ atkObject) { if (DEBUG) print ("-->atkHypertext_get_n_links"); AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { @@ -792,7 +792,7 @@ class AccessibleObject { return event.count; } } - int /*long*/ parentResult = 0; + long /*int*/ parentResult = 0; AtkHypertextIface iface = getHypertextIface (atkObject); if (iface != null && iface.get_n_links != 0) { parentResult = ATK.call (iface.get_n_links, atkObject); @@ -800,7 +800,7 @@ class AccessibleObject { return parentResult; } - static int /*long*/ atkHypertext_get_link_index (int /*long*/ atkObject, int /*long*/ char_index) { + static long /*int*/ atkHypertext_get_link_index (long /*int*/ atkObject, long /*int*/ char_index) { if (DEBUG) print ("-->atkHypertext_get_link_index"); AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { @@ -818,7 +818,7 @@ class AccessibleObject { return event.index; } } - int /*long*/ parentResult = 0; + long /*int*/ parentResult = 0; AtkHypertextIface iface = getHypertextIface (atkObject); if (iface != null && iface.get_link_index != 0) { parentResult = ATK.call (iface.get_link_index, atkObject, char_index); @@ -826,16 +826,16 @@ class AccessibleObject { return parentResult; } - static AtkObjectClass getObjectClass (int /*long*/ atkObject) { + static AtkObjectClass getObjectClass (long /*int*/ atkObject) { AtkObjectClass objectClass = new AtkObjectClass (); ATK.memmove (objectClass, ATK.g_type_class_peek (OS.g_type_parent (OS.G_OBJECT_TYPE (atkObject)))); return objectClass; } - static int /*long*/ atkObject_get_description (int /*long*/ atkObject) { + static long /*int*/ atkObject_get_description (long /*int*/ atkObject) { if (DEBUG) print ("-->atkObject_get_description: " + atkObject); AccessibleObject object = getAccessibleObject (atkObject); - int /*long*/ parentResult = 0; + long /*int*/ parentResult = 0; AtkObjectClass objectClass = getObjectClass (atkObject); if (objectClass.get_description != 0) { parentResult = ATK.call (objectClass.get_description, atkObject); @@ -861,10 +861,10 @@ class AccessibleObject { return parentResult; } - static int /*long*/ atkObject_get_attributes (int /*long*/ atkObject) { + static long /*int*/ atkObject_get_attributes (long /*int*/ atkObject) { if (DEBUG) print ("-->atkObject_get_attributes: " + atkObject); AccessibleObject object = getAccessibleObject (atkObject); - int /*long*/ parentResult = 0; + long /*int*/ parentResult = 0; AtkObjectClass objectClass = getObjectClass (atkObject); if (objectClass.get_attributes != 0) { parentResult = ATK.call (objectClass.get_attributes, atkObject); @@ -882,48 +882,48 @@ class AccessibleObject { } AtkAttribute attr = new AtkAttribute(); if (event.leftMargin != -1) { - int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); + long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_LEFT_MARGIN)); attr.value = getStringPtr (String.valueOf(event.leftMargin)); ATK.memmove(attrPtr, attr, AtkAttribute.sizeof); parentResult = OS.g_slist_append(parentResult, attrPtr); } if (event.rightMargin != -1) { - int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); + long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_RIGHT_MARGIN)); attr.value = getStringPtr (String.valueOf(event.rightMargin)); ATK.memmove(attrPtr, attr, AtkAttribute.sizeof); parentResult = OS.g_slist_append(parentResult, attrPtr); } if (event.topMargin != -1) { - int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); + long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); attr.name = getStringPtr ("top-margin"); //$NON-NLS-1$ attr.value = getStringPtr (String.valueOf(event.topMargin)); ATK.memmove(attrPtr, attr, AtkAttribute.sizeof); parentResult = OS.g_slist_append(parentResult, attrPtr); } if (event.bottomMargin != -1) { - int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); + long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); attr.name = getStringPtr ("bottom-margin"); //$NON-NLS-1$ attr.value = getStringPtr (String.valueOf(event.bottomMargin)); ATK.memmove(attrPtr, attr, AtkAttribute.sizeof); parentResult = OS.g_slist_append(parentResult, attrPtr); } if (event.indent != -1) { - int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); + long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_INDENT)); attr.value = getStringPtr (String.valueOf(event.indent)); ATK.memmove(attrPtr, attr, AtkAttribute.sizeof); parentResult = OS.g_slist_append(parentResult, attrPtr); } if (event.justify) { - int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); + long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_JUSTIFICATION)); attr.value = getStringPtr ("fill"); //$NON-NLS-1$ ATK.memmove(attrPtr, attr, AtkAttribute.sizeof); parentResult = OS.g_slist_append(parentResult, attrPtr); } else if (event.alignment != -1) { - int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); + long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_JUSTIFICATION)); String str = "left"; //$NON-NLS-1$ switch (event.alignment) { @@ -939,7 +939,7 @@ class AccessibleObject { if (event.attributes != null) { int end = event.attributes.length / 2 * 2; for (int i = 0; i < end; i+= 2) { - int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); + long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); attr.name = getStringPtr (event.attributes[i]); attr.value = getStringPtr (event.attributes[i + 1]); ATK.memmove(attrPtr, attr, AtkAttribute.sizeof); @@ -951,10 +951,10 @@ class AccessibleObject { return parentResult; } - static int /*long*/ atkObject_get_name (int /*long*/ atkObject) { + static long /*int*/ atkObject_get_name (long /*int*/ atkObject) { if (DEBUG) print ("-->atkObject_get_name: " + atkObject); AccessibleObject object = getAccessibleObject (atkObject); - int /*long*/ parentResult = 0; + long /*int*/ parentResult = 0; AtkObjectClass objectClass = getObjectClass (atkObject); if (objectClass.get_name != 0) { parentResult = ATK.call (objectClass.get_name, atkObject); @@ -980,10 +980,10 @@ class AccessibleObject { return parentResult; } - static int /*long*/ atkObject_get_n_children (int /*long*/ atkObject) { + static long /*int*/ atkObject_get_n_children (long /*int*/ atkObject) { if (DEBUG) print ("-->atkObject_get_n_children: " + atkObject); AccessibleObject object = getAccessibleObject (atkObject); - int /*long*/ parentResult = 0; + long /*int*/ parentResult = 0; AtkObjectClass objectClass = getObjectClass (atkObject); if (objectClass.get_n_children != 0) { parentResult = ATK.call (objectClass.get_n_children, atkObject); @@ -1007,7 +1007,7 @@ class AccessibleObject { return parentResult; } - static int /*long*/ atkObject_get_index_in_parent (int /*long*/ atkObject) { + static long /*int*/ atkObject_get_index_in_parent (long /*int*/ atkObject) { if (DEBUG) print ("-->atkObject_get_index_in_parent: " + atkObject); AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { @@ -1031,12 +1031,12 @@ class AccessibleObject { } AtkObjectClass objectClass = getObjectClass (atkObject); if (objectClass.get_index_in_parent == 0) return 0; - int /*long*/ result = ATK.call (objectClass.get_index_in_parent, atkObject); + long /*int*/ result = ATK.call (objectClass.get_index_in_parent, atkObject); if (DEBUG) print ("---*> " + result); return result; } - static int /*long*/ atkObject_get_parent (int /*long*/ atkObject) { + static long /*int*/ atkObject_get_parent (long /*int*/ atkObject) { if (DEBUG) print ("-->atkObject_get_parent: " + atkObject); AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { @@ -1047,12 +1047,12 @@ class AccessibleObject { } AtkObjectClass objectClass = getObjectClass (atkObject); if (objectClass.get_parent == 0) return 0; - int /*long*/ parentResult = ATK.call (objectClass.get_parent, atkObject); + long /*int*/ parentResult = ATK.call (objectClass.get_parent, atkObject); if (DEBUG) print ("---> " + parentResult); return parentResult; } - static int /*long*/ atkObject_get_role (int /*long*/ atkObject) { + static long /*int*/ atkObject_get_role (long /*int*/ atkObject) { if (DEBUG) print ("-->atkObject_get_role: " + atkObject); AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { @@ -1132,7 +1132,7 @@ class AccessibleObject { return ATK.call (objectClass.get_role, atkObject); } - static int /*long*/ atkObject_ref_child (int /*long*/ atkObject, int /*long*/ index) { + static long /*int*/ atkObject_ref_child (long /*int*/ atkObject, long /*int*/ index) { if (DEBUG) print ("-->atkObject_ref_child: " + index + " of: " + atkObject); AccessibleObject object = getAccessibleObject (atkObject); if (object != null && object.id == ACC.CHILDID_SELF) { @@ -1165,10 +1165,10 @@ class AccessibleObject { return ATK.call (objectClass.ref_child, atkObject, index); } - static int /*long*/ atkObject_ref_state_set (int /*long*/ atkObject) { + static long /*int*/ atkObject_ref_state_set (long /*int*/ atkObject) { if (DEBUG) print ("-->atkObject_ref_state_set: " + atkObject); AccessibleObject object = getAccessibleObject (atkObject); - int /*long*/ parentResult = 0; + long /*int*/ parentResult = 0; AtkObjectClass objectClass = getObjectClass (atkObject); if (objectClass.ref_state_set != 0) { parentResult = ATK.call (objectClass.ref_state_set, atkObject); @@ -1178,7 +1178,7 @@ class AccessibleObject { Vector listeners = accessible.accessibleControlListeners; int length = listeners.size(); if (length > 0) { - int /*long*/ set = parentResult; + long /*int*/ set = parentResult; AccessibleControlEvent event = new AccessibleControlEvent (accessible); event.childID = object.id; event.detail = -1; @@ -1218,7 +1218,7 @@ class AccessibleObject { return parentResult; } - static AtkSelectionIface getSelectionIface (int /*long*/ atkObject) { + static AtkSelectionIface getSelectionIface (long /*int*/ atkObject) { if (ATK.g_type_is_a (OS.g_type_parent (OS.G_OBJECT_TYPE (atkObject)), ATK.ATK_TYPE_SELECTION())) { AtkSelectionIface iface = new AtkSelectionIface (); ATK.memmove (iface, ATK.g_type_interface_peek_parent (ATK.ATK_SELECTION_GET_IFACE (atkObject))); @@ -1227,10 +1227,10 @@ class AccessibleObject { return null; } - static int /*long*/ atkSelection_is_child_selected (int /*long*/ atkObject, int /*long*/ index) { + static long /*int*/ atkSelection_is_child_selected (long /*int*/ atkObject, long /*int*/ index) { if (DEBUG) print ("-->atkSelection_is_child_selected"); AccessibleObject object = getAccessibleObject (atkObject); - int /*long*/ parentResult = 0; + long /*int*/ parentResult = 0; AtkSelectionIface iface = getSelectionIface (atkObject); if (iface != null && iface.is_child_selected != 0) { parentResult = ATK.call (iface.is_child_selected, atkObject, index); @@ -1256,10 +1256,10 @@ class AccessibleObject { return parentResult; } - static int /*long*/ atkSelection_ref_selection (int /*long*/ atkObject, int /*long*/ index) { + static long /*int*/ atkSelection_ref_selection (long /*int*/ atkObject, long /*int*/ index) { if (DEBUG) print ("-->atkSelection_ref_selection"); AccessibleObject object = getAccessibleObject (atkObject); - int /*long*/ parentResult = 0; + long /*int*/ parentResult = 0; AtkSelectionIface iface = getSelectionIface (atkObject); if (iface != null && iface.ref_selection != 0) { parentResult = ATK.call (iface.ref_selection, atkObject, index); @@ -1286,7 +1286,7 @@ class AccessibleObject { return parentResult; } - static AtkTableIface getTableIface (int /*long*/ atkObject) { + static AtkTableIface getTableIface (long /*int*/ atkObject) { if (ATK.g_type_is_a (OS.g_type_parent (OS.G_OBJECT_TYPE (atkObject)), ATK.ATK_TYPE_TABLE())) { AtkTableIface iface = new AtkTableIface (); ATK.memmove (iface, ATK.g_type_interface_peek_parent (ATK.ATK_TABLE_GET_IFACE (atkObject))); @@ -1295,7 +1295,7 @@ class AccessibleObject { return null; } - static int /*long*/ atkTable_ref_at (int /*long*/ atkObject, int /*long*/ row, int /*long*/ column) { + static long /*int*/ atkTable_ref_at (long /*int*/ atkObject, long /*int*/ row, long /*int*/ column) { if (DEBUG) print ("-->atkTable_ref_at"); AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { @@ -1318,7 +1318,7 @@ class AccessibleObject { } } } - int /*long*/ parentResult = 0; + long /*int*/ parentResult = 0; AtkTableIface iface = getTableIface (atkObject); if (iface != null && iface.ref_at != 0) { parentResult = ATK.call (iface.ref_at, atkObject, row, column); @@ -1326,7 +1326,7 @@ class AccessibleObject { return parentResult; } - static int /*long*/ atkTable_get_index_at (int /*long*/ atkObject, int /*long*/ row, int /*long*/ column) { + static long /*int*/ atkTable_get_index_at (long /*int*/ atkObject, long /*int*/ row, long /*int*/ column) { if (DEBUG) print ("-->atkTable_get_index_at"); AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { @@ -1351,7 +1351,7 @@ class AccessibleObject { return row * event.count + column; } } - int /*long*/ parentResult = 0; + long /*int*/ parentResult = 0; AtkTableIface iface = getTableIface (atkObject); if (iface != null && iface.get_index_at != 0) { parentResult = ATK.call (iface.get_index_at, atkObject, row, column); @@ -1359,7 +1359,7 @@ class AccessibleObject { return parentResult; } - static int /*long*/ atkTable_get_column_at_index (int /*long*/ atkObject, int /*long*/ index) { + static long /*int*/ atkTable_get_column_at_index (long /*int*/ atkObject, long /*int*/ index) { if (DEBUG) print ("-->atkTable_get_column_at_index: " + atkObject + " " + index); AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { @@ -1372,12 +1372,12 @@ class AccessibleObject { AccessibleTableListener listener = (AccessibleTableListener) listeners.elementAt(i); listener.getColumnCount(event); } - int /*long*/ result = event.count == 0 ? -1 : index % event.count; + long /*int*/ result = event.count == 0 ? -1 : index % event.count; if (DEBUG) print ("---> " + result); return result; } } - int /*long*/ parentResult = 0; + long /*int*/ parentResult = 0; AtkTableIface iface = getTableIface (atkObject); if (iface != null && iface.get_column_at_index != 0) { parentResult = ATK.call (iface.get_column_at_index, atkObject, index); @@ -1385,7 +1385,7 @@ class AccessibleObject { return parentResult; } - static int /*long*/ atkTable_get_row_at_index (int /*long*/ atkObject, int /*long*/ index) { + static long /*int*/ atkTable_get_row_at_index (long /*int*/ atkObject, long /*int*/ index) { if (DEBUG) print ("-->atkTable_get_row_at_index: " + atkObject + " " + index); AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { @@ -1398,12 +1398,12 @@ class AccessibleObject { AccessibleTableListener listener = (AccessibleTableListener) listeners.elementAt(i); listener.getColumnCount(event); } - int /*long*/ result = event.count == 0 ? -1 : index / event.count; + long /*int*/ result = event.count == 0 ? -1 : index / event.count; if (DEBUG) print ("---> " + result); return result; } } - int /*long*/ parentResult = 0; + long /*int*/ parentResult = 0; AtkTableIface iface = getTableIface (atkObject); if (iface != null && iface.get_row_at_index != 0) { parentResult = ATK.call (iface.get_row_at_index, atkObject, index); @@ -1411,10 +1411,10 @@ class AccessibleObject { return parentResult; } - static int /*long*/ atkTable_get_n_columns (int /*long*/ atkObject) { + static long /*int*/ atkTable_get_n_columns (long /*int*/ atkObject) { if (DEBUG) print ("-->atkTable_get_n_columns"); AccessibleObject object = getAccessibleObject (atkObject); - int /*long*/ parentResult = 0; + long /*int*/ parentResult = 0; AtkTableIface iface = getTableIface (atkObject); if (iface != null && iface.get_n_columns != 0) { parentResult = ATK.call (iface.get_n_columns, atkObject); @@ -1436,10 +1436,10 @@ class AccessibleObject { return parentResult; } - static int /*long*/ atkTable_get_n_rows (int /*long*/ atkObject) { + static long /*int*/ atkTable_get_n_rows (long /*int*/ atkObject) { if (DEBUG) print ("-->atkTable_get_n_rows"); AccessibleObject object = getAccessibleObject (atkObject); - int /*long*/ parentResult = 0; + long /*int*/ parentResult = 0; AtkTableIface iface = getTableIface (atkObject); if (iface != null && iface.get_n_rows != 0) { parentResult = ATK.call (iface.get_n_rows, atkObject); @@ -1461,10 +1461,10 @@ class AccessibleObject { return parentResult; } - static int /*long*/ atkTable_get_column_extent_at (int /*long*/ atkObject, int /*long*/ row, int /*long*/ column) { + static long /*int*/ atkTable_get_column_extent_at (long /*int*/ atkObject, long /*int*/ row, long /*int*/ column) { if (DEBUG) print ("-->atkTable_get_column_extent_at"); AccessibleObject object = getAccessibleObject (atkObject); - int /*long*/ parentResult = 0; + long /*int*/ parentResult = 0; AtkTableIface iface = getTableIface (atkObject); if (iface != null && iface.get_column_extent_at != 0) { parentResult = ATK.call (iface.get_column_extent_at, atkObject, row, column); @@ -1500,10 +1500,10 @@ class AccessibleObject { return parentResult; } - static int /*long*/ atkTable_get_row_extent_at (int /*long*/ atkObject, int /*long*/ row, int /*long*/ column) { + static long /*int*/ atkTable_get_row_extent_at (long /*int*/ atkObject, long /*int*/ row, long /*int*/ column) { if (DEBUG) print ("-->atkTable_get_row_extent_at"); AccessibleObject object = getAccessibleObject (atkObject); - int /*long*/ parentResult = 0; + long /*int*/ parentResult = 0; AtkTableIface iface = getTableIface (atkObject); if (iface != null && iface.get_row_extent_at != 0) { parentResult = ATK.call (iface.get_row_extent_at, atkObject, row, column); @@ -1539,7 +1539,7 @@ class AccessibleObject { return parentResult; } - static int /*long*/ atkTable_get_caption (int /*long*/ atkObject) { + static long /*int*/ atkTable_get_caption (long /*int*/ atkObject) { if (DEBUG) print ("-->atkTable_get_caption"); AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { @@ -1556,7 +1556,7 @@ class AccessibleObject { if (result != null) return result.getAccessibleObject().handle; } } - int /*long*/ parentResult = 0; + long /*int*/ parentResult = 0; AtkTableIface iface = getTableIface (atkObject); if (iface != null && iface.get_caption != 0) { parentResult = ATK.call (iface.get_caption, atkObject); @@ -1564,7 +1564,7 @@ class AccessibleObject { return parentResult; } - static int /*long*/ atkTable_get_summary (int /*long*/ atkObject) { + static long /*int*/ atkTable_get_summary (long /*int*/ atkObject) { if (DEBUG) print ("-->atkTable_get_summary"); AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { @@ -1581,7 +1581,7 @@ class AccessibleObject { if (result != null) return result.getAccessibleObject().handle; } } - int /*long*/ parentResult = 0; + long /*int*/ parentResult = 0; AtkTableIface iface = getTableIface (atkObject); if (iface != null && iface.get_summary != 0) { parentResult = ATK.call (iface.get_summary, atkObject); @@ -1589,10 +1589,10 @@ class AccessibleObject { return parentResult; } - static int /*long*/ atkTable_get_column_description (int /*long*/ atkObject, int /*long*/ column) { + static long /*int*/ atkTable_get_column_description (long /*int*/ atkObject, long /*int*/ column) { if (DEBUG) print ("-->atkTable_get_column_description"); AccessibleObject object = getAccessibleObject (atkObject); - int /*long*/ parentResult = 0; + long /*int*/ parentResult = 0; AtkTableIface iface = getTableIface (atkObject); if (iface != null && iface.get_column_description != 0) { parentResult = ATK.call (iface.get_column_description, atkObject, column); @@ -1617,7 +1617,7 @@ class AccessibleObject { return parentResult; } - static int /*long*/ atkTable_get_column_header (int /*long*/ atkObject, int /*long*/ column) { + static long /*int*/ atkTable_get_column_header (long /*int*/ atkObject, long /*int*/ column) { if (DEBUG) print ("-->atkTable_get_column_header"); AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { @@ -1638,7 +1638,7 @@ class AccessibleObject { } } } - int /*long*/ parentResult = 0; + long /*int*/ parentResult = 0; AtkTableIface iface = getTableIface (atkObject); if (iface != null && iface.get_column_header != 0) { parentResult = ATK.call (iface.get_column_header, atkObject, column); @@ -1646,10 +1646,10 @@ class AccessibleObject { return parentResult; } - static int /*long*/ atkTable_get_row_description (int /*long*/ atkObject, int /*long*/ row) { + static long /*int*/ atkTable_get_row_description (long /*int*/ atkObject, long /*int*/ row) { if (DEBUG) print ("-->atkTable_get_row_description"); AccessibleObject object = getAccessibleObject (atkObject); - int /*long*/ parentResult = 0; + long /*int*/ parentResult = 0; AtkTableIface iface = getTableIface (atkObject); if (iface != null && iface.get_row_description != 0) { parentResult = ATK.call (iface.get_row_description, atkObject, row); @@ -1674,7 +1674,7 @@ class AccessibleObject { return parentResult; } - static int /*long*/ atkTable_get_row_header (int /*long*/ atkObject, int /*long*/ row) { + static long /*int*/ atkTable_get_row_header (long /*int*/ atkObject, long /*int*/ row) { if (DEBUG) print ("-->atkTable_get_row_header"); AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { @@ -1695,7 +1695,7 @@ class AccessibleObject { } } } - int /*long*/ parentResult = 0; + long /*int*/ parentResult = 0; AtkTableIface iface = getTableIface (atkObject); if (iface != null && iface.get_row_header != 0) { parentResult = ATK.call (iface.get_row_header, atkObject, row); @@ -1703,7 +1703,7 @@ class AccessibleObject { return parentResult; } - static int /*long*/ atkTable_get_selected_columns (int /*long*/ atkObject, int /*long*/ selected) { + static long /*int*/ atkTable_get_selected_columns (long /*int*/ atkObject, long /*int*/ selected) { if (DEBUG) print ("-->atkTable_get_selected_columns"); AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { @@ -1717,13 +1717,13 @@ class AccessibleObject { listener.getSelectedColumns(event); } int count = event.selected != null ? event.selected.length : 0; - int /*long*/ result = OS.g_malloc(count * 4); + long /*int*/ result = OS.g_malloc(count * 4); if (event.selected != null) OS.memmove(result, event.selected, count * 4); - if (selected != 0) OS.memmove(selected, new int /*long*/[]{result}, C.PTR_SIZEOF); + if (selected != 0) OS.memmove(selected, new long /*int*/[]{result}, C.PTR_SIZEOF); return count; } } - int /*long*/ parentResult = 0; + long /*int*/ parentResult = 0; AtkTableIface iface = getTableIface (atkObject); if (iface != null && iface.get_selected_columns != 0) { parentResult = ATK.call (iface.get_selected_columns, atkObject, selected); @@ -1731,7 +1731,7 @@ class AccessibleObject { return parentResult; } - static int /*long*/ atkTable_get_selected_rows (int /*long*/ atkObject, int /*long*/ selected) { + static long /*int*/ atkTable_get_selected_rows (long /*int*/ atkObject, long /*int*/ selected) { if (DEBUG) print ("-->atkTable_get_selected_rows"); AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { @@ -1745,13 +1745,13 @@ class AccessibleObject { listener.getSelectedRows(event); } int count = event.selected != null ? event.selected.length : 0; - int /*long*/ result = OS.g_malloc(count * 4); + long /*int*/ result = OS.g_malloc(count * 4); if (event.selected != null) OS.memmove(result, event.selected, count * 4); - if (selected != 0) OS.memmove(selected, new int /*long*/[]{result}, C.PTR_SIZEOF); + if (selected != 0) OS.memmove(selected, new long /*int*/[]{result}, C.PTR_SIZEOF); return count; } } - int /*long*/ parentResult = 0; + long /*int*/ parentResult = 0; AtkTableIface iface = getTableIface (atkObject); if (iface != null && iface.get_selected_rows != 0) { parentResult = ATK.call (iface.get_selected_rows, atkObject, selected); @@ -1759,10 +1759,10 @@ class AccessibleObject { return parentResult; } - static int /*long*/ atkTable_is_column_selected (int /*long*/ atkObject, int /*long*/ column) { + static long /*int*/ atkTable_is_column_selected (long /*int*/ atkObject, long /*int*/ column) { if (DEBUG) print ("-->atkTable_is_column_selected"); AccessibleObject object = getAccessibleObject (atkObject); - int /*long*/ parentResult = 0; + long /*int*/ parentResult = 0; AtkTableIface iface = getTableIface (atkObject); if (iface != null && iface.is_column_selected != 0) { parentResult = ATK.call (iface.is_column_selected, atkObject, column); @@ -1785,10 +1785,10 @@ class AccessibleObject { return parentResult; } - static int /*long*/ atkTable_is_row_selected (int /*long*/ atkObject, int /*long*/ row) { + static long /*int*/ atkTable_is_row_selected (long /*int*/ atkObject, long /*int*/ row) { if (DEBUG) print ("-->atkTable_is_row_selected"); AccessibleObject object = getAccessibleObject (atkObject); - int /*long*/ parentResult = 0; + long /*int*/ parentResult = 0; AtkTableIface iface = getTableIface (atkObject); if (iface != null && iface.is_row_selected != 0) { parentResult = ATK.call (iface.is_row_selected, atkObject, row); @@ -1811,10 +1811,10 @@ class AccessibleObject { return parentResult; } - static int /*long*/ atkTable_is_selected (int /*long*/ atkObject, int /*long*/ row, int /*long*/ column) { + static long /*int*/ atkTable_is_selected (long /*int*/ atkObject, long /*int*/ row, long /*int*/ column) { if (DEBUG) print ("-->atkTable_is_selected"); AccessibleObject object = getAccessibleObject (atkObject); - int /*long*/ parentResult = 0; + long /*int*/ parentResult = 0; AtkTableIface iface = getTableIface (atkObject); if (iface != null && iface.is_selected != 0) { parentResult = ATK.call (iface.is_selected, atkObject, row, column); @@ -1850,7 +1850,7 @@ class AccessibleObject { return parentResult; } - static int /*long*/ atkTable_add_row_selection (int /*long*/ atkObject, int /*long*/ row) { + static long /*int*/ atkTable_add_row_selection (long /*int*/ atkObject, long /*int*/ row) { if (DEBUG) print ("-->atkTable_add_row_selection"); AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { @@ -1867,7 +1867,7 @@ class AccessibleObject { return ACC.OK.equals(event.result) ? 1 : 0; } } - int /*long*/ parentResult = 0; + long /*int*/ parentResult = 0; AtkTableIface iface = getTableIface (atkObject); if (iface != null && iface.add_row_selection != 0) { parentResult = ATK.call (iface.add_row_selection, atkObject, row); @@ -1875,7 +1875,7 @@ class AccessibleObject { return parentResult; } - static int /*long*/ atkTable_remove_row_selection (int /*long*/ atkObject, int /*long*/ row) { + static long /*int*/ atkTable_remove_row_selection (long /*int*/ atkObject, long /*int*/ row) { if (DEBUG) print ("-->atkTable_remove_row_selection"); AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { @@ -1892,7 +1892,7 @@ class AccessibleObject { return ACC.OK.equals(event.result) ? 1 : 0; } } - int /*long*/ parentResult = 0; + long /*int*/ parentResult = 0; AtkTableIface iface = getTableIface (atkObject); if (iface != null && iface.remove_row_selection != 0) { parentResult = ATK.call (iface.remove_row_selection, atkObject, row); @@ -1900,7 +1900,7 @@ class AccessibleObject { return parentResult; } - static int /*long*/ atkTable_add_column_selection (int /*long*/ atkObject, int /*long*/ column) { + static long /*int*/ atkTable_add_column_selection (long /*int*/ atkObject, long /*int*/ column) { if (DEBUG) print ("-->atkTable_add_column_selection"); AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { @@ -1917,7 +1917,7 @@ class AccessibleObject { return ACC.OK.equals(event.result) ? 1 : 0; } } - int /*long*/ parentResult = 0; + long /*int*/ parentResult = 0; AtkTableIface iface = getTableIface (atkObject); if (iface != null && iface.add_column_selection != 0) { parentResult = ATK.call (iface.add_column_selection, atkObject, column); @@ -1925,7 +1925,7 @@ class AccessibleObject { return parentResult; } - static int /*long*/ atkTable_remove_column_selection (int /*long*/ atkObject, int /*long*/ column) { + static long /*int*/ atkTable_remove_column_selection (long /*int*/ atkObject, long /*int*/ column) { if (DEBUG) print ("-->atkTable_remove_column_selection"); AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { @@ -1942,7 +1942,7 @@ class AccessibleObject { return ACC.OK.equals(event.result) ? 1 : 0; } } - int /*long*/ parentResult = 0; + long /*int*/ parentResult = 0; AtkTableIface iface = getTableIface (atkObject); if (iface != null && iface.remove_column_selection != 0) { parentResult = ATK.call (iface.remove_column_selection, atkObject, column); @@ -1950,7 +1950,7 @@ class AccessibleObject { return parentResult; } - static AtkTextIface getTextIface (int /*long*/ atkObject) { + static AtkTextIface getTextIface (long /*int*/ atkObject) { if (ATK.g_type_is_a (OS.g_type_parent (OS.G_OBJECT_TYPE (atkObject)), ATK.ATK_TYPE_TEXT())) { AtkTextIface iface = new AtkTextIface (); ATK.memmove (iface, ATK.g_type_interface_peek_parent (ATK.ATK_TEXT_GET_IFACE (atkObject))); @@ -1959,7 +1959,7 @@ class AccessibleObject { return null; } - static int /*long*/ atkText_get_character_extents (int /*long*/ atkObject, int /*long*/ offset, int /*long*/ x, int /*long*/ y, int /*long*/ width, int /*long*/ height, int /*long*/ coords) { + static long /*int*/ atkText_get_character_extents (long /*int*/ atkObject, long /*int*/ offset, long /*int*/ x, long /*int*/ y, long /*int*/ width, long /*int*/ height, long /*int*/ coords) { if (DEBUG) print ("-->atkText_get_character_extents"); AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { @@ -1994,21 +1994,21 @@ class AccessibleObject { return 0; } - static String getString (int /*long*/ strPtr) { + static String getString (long /*int*/ strPtr) { int length = OS.strlen (strPtr); byte [] buffer = new byte [length]; OS.memmove (buffer, strPtr, length); return new String (Converter.mbcsToWcs (null, buffer)); } - static int /*long*/ getStringPtr (String str) { + static long /*int*/ getStringPtr (String str) { byte [] buffer = Converter.wcsToMbcs(null, str != null ? str : "", true); - int /*long*/ ptr = OS.g_malloc(buffer.length); + long /*int*/ ptr = OS.g_malloc(buffer.length); OS.memmove(ptr, buffer, buffer.length); return ptr; } - static int /*long*/ atkText_get_range_extents (int /*long*/ atkObject, int /*long*/ start_offset, int /*long*/ end_offset, int /*long*/ coord_type, int /*long*/ rect) { + static long /*int*/ atkText_get_range_extents (long /*int*/ atkObject, long /*int*/ start_offset, long /*int*/ end_offset, long /*int*/ coord_type, long /*int*/ rect) { if (DEBUG) print ("-->atkText_get_range_extents"); AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { @@ -2045,7 +2045,7 @@ class AccessibleObject { return 0; } - static int /*long*/ atkText_get_run_attributes (int /*long*/ atkObject, int /*long*/ offset, int /*long*/ start_offset, int /*long*/ end_offset) { + static long /*int*/ atkText_get_run_attributes (long /*int*/ atkObject, long /*int*/ offset, long /*int*/ start_offset, long /*int*/ end_offset) { if (DEBUG) print ("-->atkText_get_run_attributes"); AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { @@ -2062,18 +2062,18 @@ class AccessibleObject { OS.memmove (start_offset, new int []{event.start}, 4); OS.memmove (end_offset, new int []{event.end}, 4); TextStyle style = event.textStyle; - int /*long*/ result = 0; + long /*int*/ result = 0; AtkAttribute attr = new AtkAttribute(); if (style != null) { if (style.rise != 0) { - int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); + long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_RISE)); attr.value = getStringPtr (String.valueOf(style.rise)); ATK.memmove(attrPtr, attr, AtkAttribute.sizeof); result = OS.g_slist_append(result, attrPtr); } if (style.underline) { - int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); + long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_UNDERLINE)); String str = "none"; //$NON-NLS-1$ switch (style.underlineStyle) { @@ -2087,7 +2087,7 @@ class AccessibleObject { result = OS.g_slist_append(result, attrPtr); } if (style.strikeout) { - int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); + long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_STRIKETHROUGH)); attr.value = getStringPtr ("1"); ATK.memmove(attrPtr, attr, AtkAttribute.sizeof); @@ -2096,7 +2096,7 @@ class AccessibleObject { Font font = style.font; if (font != null && !font.isDisposed()) { //TODO language and direction - int /*long*/ attrPtr; + long /*int*/ attrPtr; attrPtr = OS.g_malloc(AtkAttribute.sizeof); attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_FAMILY_NAME)); attr.value = ATK.g_strdup (OS.pango_font_description_get_family (font.handle)); @@ -2135,7 +2135,7 @@ class AccessibleObject { } Color color = style.foreground; if (color != null && !color.isDisposed()) { - int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); + long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_FG_COLOR)); attr.value = getStringPtr ((color.handle.red & 0xFFFF) + "," + (color.handle.blue & 0xFFFF) + "," + (color.handle.blue & 0xFFFF)); //$NON-NLS-1$ //$NON-NLS-2$ ATK.memmove(attrPtr, attr, AtkAttribute.sizeof); @@ -2143,7 +2143,7 @@ class AccessibleObject { } color = style.background; if (color != null && !color.isDisposed()) { - int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); + long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_BG_COLOR)); attr.value = getStringPtr ((color.handle.red & 0xFFFF) + "," + (color.handle.blue & 0xFFFF) + "," + (color.handle.blue & 0xFFFF)); //$NON-NLS-1$ //$NON-NLS-2$ ATK.memmove(attrPtr, attr, AtkAttribute.sizeof); @@ -2153,7 +2153,7 @@ class AccessibleObject { if (event.attributes != null) { int end = event.attributes.length / 2 * 2; for (int i = 0; i < end; i+= 2) { - int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); + long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof); attr.name = getStringPtr (event.attributes[i]); attr.value = getStringPtr (event.attributes[i + 1]); ATK.memmove(attrPtr, attr, AtkAttribute.sizeof); @@ -2163,7 +2163,7 @@ class AccessibleObject { return result; } } - int /*long*/ parentResult = 0; + long /*int*/ parentResult = 0; AtkTextIface iface = getTextIface (atkObject); if (iface != null && iface.get_run_attributes != 0) { parentResult = ATK.call (iface.get_run_attributes, atkObject, offset, start_offset, end_offset); @@ -2171,7 +2171,7 @@ class AccessibleObject { return parentResult; } - static int /*long*/ atkText_get_offset_at_point (int /*long*/ atkObject, int /*long*/ x, int /*long*/ y, int /*long*/ coords) { + static long /*int*/ atkText_get_offset_at_point (long /*int*/ atkObject, long /*int*/ x, long /*int*/ y, long /*int*/ coords) { if (DEBUG) print ("-->atkText_get_offset_at_point"); AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { @@ -2195,7 +2195,7 @@ class AccessibleObject { return event.offset; } } - int /*long*/ parentResult = 0; + long /*int*/ parentResult = 0; AtkTextIface iface = getTextIface (atkObject); if (iface != null && iface.get_offset_at_point != 0) { parentResult = ATK.call (iface.get_offset_at_point, atkObject, x, y, coords); @@ -2203,7 +2203,7 @@ class AccessibleObject { return parentResult; } - static int /*long*/ atkText_add_selection (int /*long*/ atkObject, int /*long*/ start_offset, int /*long*/ end_offset) { + static long /*int*/ atkText_add_selection (long /*int*/ atkObject, long /*int*/ start_offset, long /*int*/ end_offset) { if (DEBUG) print ("-->atkText_add_selection"); AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { @@ -2221,7 +2221,7 @@ class AccessibleObject { return ACC.OK.equals(event.result) ? 1 : 0; } } - int /*long*/ parentResult = 0; + long /*int*/ parentResult = 0; AtkTextIface iface = getTextIface (atkObject); if (iface != null && iface.add_selection != 0) { parentResult = ATK.call (iface.add_selection, atkObject, start_offset, end_offset); @@ -2229,7 +2229,7 @@ class AccessibleObject { return parentResult; } - static int /*long*/ atkText_remove_selection (int /*long*/ atkObject, int /*long*/ selection_num) { + static long /*int*/ atkText_remove_selection (long /*int*/ atkObject, long /*int*/ selection_num) { if (DEBUG) print ("-->atkText_remove_selection"); AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { @@ -2246,7 +2246,7 @@ class AccessibleObject { return ACC.OK.equals(event.result) ? 1 : 0; } } - int /*long*/ parentResult = 0; + long /*int*/ parentResult = 0; AtkTextIface iface = getTextIface (atkObject); if (iface != null && iface.remove_selection != 0) { parentResult = ATK.call (iface.remove_selection, atkObject, selection_num); @@ -2254,7 +2254,7 @@ class AccessibleObject { return parentResult; } - static int /*long*/ atkText_set_caret_offset (int /*long*/ atkObject, int /*long*/ offset) { + static long /*int*/ atkText_set_caret_offset (long /*int*/ atkObject, long /*int*/ offset) { if (DEBUG) print ("-->atkText_set_caret_offset"); AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { @@ -2278,7 +2278,7 @@ class AccessibleObject { return 0; } - static int /*long*/ atkText_set_selection (int /*long*/ atkObject, int /*long*/ selection_num, int /*long*/ start_offset, int /*long*/ end_offset) { + static long /*int*/ atkText_set_selection (long /*int*/ atkObject, long /*int*/ selection_num, long /*int*/ start_offset, long /*int*/ end_offset) { if (DEBUG) print ("-->atkText_set_selection"); AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { @@ -2297,7 +2297,7 @@ class AccessibleObject { return ACC.OK.equals(event.result) ? 1 : 0; } } - int /*long*/ parentResult = 0; + long /*int*/ parentResult = 0; AtkTextIface iface = getTextIface (atkObject); if (iface != null && iface.set_selection != 0) { parentResult = ATK.call (iface.set_selection, atkObject, selection_num, start_offset, end_offset); @@ -2305,10 +2305,10 @@ class AccessibleObject { return parentResult; } - static int /*long*/ atkText_get_caret_offset (int /*long*/ atkObject) { + static long /*int*/ atkText_get_caret_offset (long /*int*/ atkObject) { if (DEBUG) print ("-->atkText_get_caret_offset"); AccessibleObject object = getAccessibleObject (atkObject); - int /*long*/ parentResult = 0; + long /*int*/ parentResult = 0; AtkTextIface iface = getTextIface (atkObject); if (iface != null && iface.get_caret_offset != 0) { parentResult = ATK.call (iface.get_caret_offset, atkObject); @@ -2341,7 +2341,7 @@ class AccessibleObject { return parentResult; } - static int /*long*/ atkText_get_bounded_ranges (int /*long*/ atkObject, int /*long*/ rect, int /*long*/ coord_type, int /*long*/ x_clip_type, int /*long*/ y_clip_type) { + static long /*int*/ atkText_get_bounded_ranges (long /*int*/ atkObject, long /*int*/ rect, long /*int*/ coord_type, long /*int*/ x_clip_type, long /*int*/ y_clip_type) { if (DEBUG) print ("-->atkText_get_bounded_ranges"); AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { @@ -2362,7 +2362,7 @@ class AccessibleObject { } int [] ranges = event.ranges; int size = ranges == null ? 1 : ranges.length / 2; - int /*long*/ result = OS.malloc(size * AtkTextRange.sizeof); + long /*int*/ result = OS.malloc(size * AtkTextRange.sizeof); AtkTextRange range = new AtkTextRange(); for (int j = 0, end = (ranges != null ? ranges.length / 2 : 1); j < end; j++) { if (ranges != null) { @@ -2394,7 +2394,7 @@ class AccessibleObject { return result; } } - int /*long*/ parentResult = 0; + long /*int*/ parentResult = 0; AtkTextIface iface = getTextIface (atkObject); if (iface != null && iface.get_bounded_ranges != 0) { parentResult = ATK.call (iface.get_bounded_ranges, atkObject); @@ -2402,7 +2402,7 @@ class AccessibleObject { return parentResult; } - static int /*long*/ atkText_get_character_at_offset (int /*long*/ atkObject, int /*long*/ offset) { + static long /*int*/ atkText_get_character_at_offset (long /*int*/ atkObject, long /*int*/ offset) { if (DEBUG) print ("-->atkText_get_character_at_offset"); AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { @@ -2431,7 +2431,7 @@ class AccessibleObject { return 0; } - static int /*long*/ atkText_get_character_count (int /*long*/ atkObject) { + static long /*int*/ atkText_get_character_count (long /*int*/ atkObject) { if (DEBUG) print ("-->atkText_get_character_count"); AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { @@ -2456,7 +2456,7 @@ class AccessibleObject { return 0; } - static int /*long*/ atkText_get_n_selections (int /*long*/ atkObject) { + static long /*int*/ atkText_get_n_selections (long /*int*/ atkObject) { if (DEBUG) print ("-->atkText_get_n_selections"); AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { @@ -2483,7 +2483,7 @@ class AccessibleObject { if (event.length > 0) return 1; } } - int /*long*/ parentResult = 0; + long /*int*/ parentResult = 0; AtkTextIface iface = getTextIface (atkObject); if (iface != null && iface.get_n_selections != 0) { parentResult = ATK.call (iface.get_n_selections, atkObject); @@ -2491,10 +2491,10 @@ class AccessibleObject { return parentResult; } - static int /*long*/ atkText_get_selection (int /*long*/ atkObject, int /*long*/ selection_num, int /*long*/ start_offset, int /*long*/ end_offset) { + static long /*int*/ atkText_get_selection (long /*int*/ atkObject, long /*int*/ selection_num, long /*int*/ start_offset, long /*int*/ end_offset) { if (DEBUG) print ("-->atkText_get_selection"); AccessibleObject object = getAccessibleObject (atkObject); - int /*long*/ parentResult = 0; + long /*int*/ parentResult = 0; OS.memmove (start_offset, new int[] {0}, 4); OS.memmove (end_offset, new int[] {0}, 4); AtkTextIface iface = getTextIface (atkObject); @@ -2560,7 +2560,7 @@ class AccessibleObject { return parentResult; } - static int /*long*/ atkText_get_text (int /*long*/ atkObject, int /*long*/ start_offset, int /*long*/ end_offset) { + static long /*int*/ atkText_get_text (long /*int*/ atkObject, long /*int*/ start_offset, long /*int*/ end_offset) { if (DEBUG) print ("-->atkText_get_text: " + atkObject + " " + start_offset + "," + end_offset); AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { @@ -2597,7 +2597,7 @@ class AccessibleObject { return 0; } - static int /*long*/ atkText_get_text_after_offset (int /*long*/ atkObject, int /*long*/ offset_value, int /*long*/ boundary_type, int /*long*/ start_offset, int /*long*/ end_offset) { + static long /*int*/ atkText_get_text_after_offset (long /*int*/ atkObject, long /*int*/ offset_value, long /*int*/ boundary_type, long /*int*/ start_offset, long /*int*/ end_offset) { if (DEBUG) print ("-->atkText_get_text_after_offset"); AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { @@ -2605,7 +2605,7 @@ class AccessibleObject { Vector listeners = accessible.accessibleTextExtendedListeners; int length = listeners.size(); if (length > 0) { - int /*long*/ charCount = atkText_get_character_count (atkObject); + long /*int*/ charCount = atkText_get_character_count (atkObject); AccessibleTextEvent event = new AccessibleTextEvent(accessible); event.start = event.end = (int)/*64*/offset_value; event.count = 1; @@ -2845,7 +2845,7 @@ class AccessibleObject { return 0; } - static int /*long*/ atkText_get_text_at_offset (int /*long*/ atkObject, int /*long*/ offset_value, int /*long*/ boundary_type, int /*long*/ start_offset, int /*long*/ end_offset) { + static long /*int*/ atkText_get_text_at_offset (long /*int*/ atkObject, long /*int*/ offset_value, long /*int*/ boundary_type, long /*int*/ start_offset, long /*int*/ end_offset) { if (DEBUG) print ("-->atkText_get_text_at_offset: " + offset_value + " start: " + start_offset + " end: " + end_offset); AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { @@ -2853,7 +2853,7 @@ class AccessibleObject { Vector listeners = accessible.accessibleTextExtendedListeners; int length = listeners.size(); if (length > 0) { - int /*long*/ charCount = atkText_get_character_count (atkObject); + long /*int*/ charCount = atkText_get_character_count (atkObject); AccessibleTextEvent event = new AccessibleTextEvent(accessible); event.start = event.end = (int)/*64*/offset_value; event.count = 0; @@ -3036,7 +3036,7 @@ class AccessibleObject { return 0; } - static int /*long*/ atkText_get_text_before_offset (int /*long*/ atkObject, int /*long*/ offset_value, int /*long*/ boundary_type, int /*long*/ start_offset, int /*long*/ end_offset) { + static long /*int*/ atkText_get_text_before_offset (long /*int*/ atkObject, long /*int*/ offset_value, long /*int*/ boundary_type, long /*int*/ start_offset, long /*int*/ end_offset) { if (DEBUG) print ("-->atkText_get_text_before_offset"); AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { @@ -3044,7 +3044,7 @@ class AccessibleObject { Vector listeners = accessible.accessibleTextExtendedListeners; int length = listeners.size(); if (length > 0) { - int /*long*/ charCount = atkText_get_character_count (atkObject); + long /*int*/ charCount = atkText_get_character_count (atkObject); AccessibleTextEvent event = new AccessibleTextEvent(accessible); event.start = event.end = (int)/*64*/offset_value; event.count = -1; @@ -3232,7 +3232,7 @@ class AccessibleObject { return 0; } - static void setGValue (int /*long*/ value, Number number) { + static void setGValue (long /*int*/ value, Number number) { if (number == null) return; if (OS.G_VALUE_TYPE(value) != 0) OS.g_value_unset(value); if (number instanceof Double) { @@ -3250,8 +3250,8 @@ class AccessibleObject { } } - static Number getGValue (int /*long*/ value) { - int /*long*/ type = OS.G_VALUE_TYPE(value); + static Number getGValue (long /*int*/ value) { + long /*int*/ type = OS.G_VALUE_TYPE(value); if (type == 0) return null; if (type == OS.G_TYPE_DOUBLE()) return new Double(OS.g_value_get_double(value)); if (type == OS.G_TYPE_FLOAT()) return new Float(OS.g_value_get_float(value)); @@ -3259,7 +3259,7 @@ class AccessibleObject { return new Integer(OS.g_value_get_int(value)); } - static AtkValueIface getValueIface (int /*long*/ atkObject) { + static AtkValueIface getValueIface (long /*int*/ atkObject) { if (ATK.g_type_is_a (OS.g_type_parent (OS.G_OBJECT_TYPE (atkObject)), ATK.ATK_TYPE_VALUE())) { AtkValueIface iface = new AtkValueIface (); ATK.memmove (iface, ATK.g_type_interface_peek_parent (ATK.ATK_VALUE_GET_IFACE (atkObject))); @@ -3267,7 +3267,7 @@ class AccessibleObject { } return null; } - static int /*long*/ atkValue_get_current_value (int /*long*/ atkObject, int /*long*/ value) { + static long /*int*/ atkValue_get_current_value (long /*int*/ atkObject, long /*int*/ value) { if (DEBUG) print ("-->atkValue_get_current_value"); AccessibleObject object = getAccessibleObject (atkObject); AtkValueIface iface = getValueIface (atkObject); @@ -3291,7 +3291,7 @@ class AccessibleObject { return 0; } - static int /*long*/ atkValue_get_maximum_value (int /*long*/ atkObject, int /*long*/ value) { + static long /*int*/ atkValue_get_maximum_value (long /*int*/ atkObject, long /*int*/ value) { if (DEBUG) print ("-->atkValue_get_maximum_value"); AccessibleObject object = getAccessibleObject (atkObject); AtkValueIface iface = getValueIface (atkObject); @@ -3315,7 +3315,7 @@ class AccessibleObject { return 0; } - static int /*long*/ atkValue_get_minimum_value (int /*long*/ atkObject, int /*long*/ value) { + static long /*int*/ atkValue_get_minimum_value (long /*int*/ atkObject, long /*int*/ value) { if (DEBUG) print ("-->atkValue_get_minimum_value"); AccessibleObject object = getAccessibleObject (atkObject); AtkValueIface iface = getValueIface (atkObject); @@ -3339,7 +3339,7 @@ class AccessibleObject { return 0; } - static int /*long*/ atkValue_set_current_value (int /*long*/ atkObject, int /*long*/ value) { + static long /*int*/ atkValue_set_current_value (long /*int*/ atkObject, long /*int*/ value) { if (DEBUG) print ("-->atkValue_set_current_value"); AccessibleObject object = getAccessibleObject (atkObject); if (object != null) { @@ -3356,7 +3356,7 @@ class AccessibleObject { return event.value != null ? 1 : 0; } } - int /*long*/ parentResult = 0; + long /*int*/ parentResult = 0; AtkValueIface iface = getValueIface (atkObject); if (iface != null && iface.set_current_value != 0) { parentResult = ATK.call (iface.set_current_value, atkObject, value); @@ -3364,7 +3364,7 @@ class AccessibleObject { return parentResult; } - static AccessibleObject getAccessibleObject (int /*long*/ atkObject) { + static AccessibleObject getAccessibleObject (long /*int*/ atkObject) { AccessibleObject object = (AccessibleObject)AccessibleObjects.get (new LONG (atkObject)); if (object == null) return null; if (object.accessible == null) return null; @@ -3397,9 +3397,9 @@ class AccessibleObject { String parentText = ""; //$NON-NLS-1$ AtkTextIface iface = getTextIface (handle); if (iface != null && iface.get_character_count != 0) { - int /*long*/ characterCount = ATK.call (iface.get_character_count, handle); + long /*int*/ characterCount = ATK.call (iface.get_character_count, handle); if (characterCount > 0 && iface.get_text != 0) { - int /*long*/ parentResult = ATK.call (iface.get_text, handle, 0, characterCount); + long /*int*/ parentResult = ATK.call (iface.get_text, handle, 0, characterCount); if (parentResult != 0) { parentText = getString (parentResult); OS.g_free(parentResult); @@ -3418,10 +3418,10 @@ class AccessibleObject { return null; } - static int /*long*/ gObjectClass_finalize (int /*long*/ atkObject) { + static long /*int*/ gObjectClass_finalize (long /*int*/ atkObject) { if (DEBUG) print ("-->gObjectClass_finalize: " + atkObject); - int /*long*/ superType = ATK.g_type_class_peek_parent (ATK.G_OBJECT_GET_CLASS (atkObject)); - int /*long*/ gObjectClass = ATK.G_OBJECT_CLASS (superType); + long /*int*/ superType = ATK.g_type_class_peek_parent (ATK.G_OBJECT_GET_CLASS (atkObject)); + long /*int*/ gObjectClass = ATK.G_OBJECT_CLASS (superType); GObjectClass objectClassStruct = new GObjectClass (); ATK.memmove (objectClassStruct, gObjectClass); ATK.call (objectClassStruct.finalize, atkObject); @@ -3461,8 +3461,8 @@ class AccessibleObject { ATK.memmove (gtkAccessible, object.handle); } if (gtkAccessible.widget == 0) return; - int /*long*/ topLevel = ATK.gtk_widget_get_toplevel (gtkAccessible.widget); - int /*long*/ window; + long /*int*/ topLevel = ATK.gtk_widget_get_toplevel (gtkAccessible.widget); + long /*int*/ window; if (OS.GTK_VERSION >= OS.VERSION(2, 14, 0)){ window = OS.gtk_widget_get_window (topLevel); } else { diff --git a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Accessible.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Accessible.java index 52c1efd6d8..3ee3e263fe 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Accessible.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Accessible.java @@ -115,7 +115,7 @@ public class Accessible { Accessible(Control control) { this.control = control; - int /*long*/[] ppvObject = new int /*long*/[1]; + long /*int*/[] ppvObject = new long /*int*/[1]; /* CreateStdAccessibleObject([in] hwnd, [in] idObject, [in] riidInterface, [out] ppvObject). * AddRef has already been called on ppvObject by the callee and must be released by the caller. */ @@ -130,7 +130,7 @@ public class Accessible { AddRef(); } - Accessible(Accessible parent, int /*long*/ iaccessible_address) { + Accessible(Accessible parent, long /*int*/ iaccessible_address) { this(parent); iaccessible = new IAccessible(iaccessible_address); } @@ -142,44 +142,44 @@ public class Accessible { void createIAccessible() { objIAccessible = new COMObject(new int[] {2,0,0,1,3,5,8,1,1,2,2,2,2,2,2,2,3,2,1,1,2,2,5,3,3,1,2,2}) { - public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);} - public int /*long*/ method1(int /*long*/[] args) {return AddRef();} - public int /*long*/ method2(int /*long*/[] args) {return Release();} + public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long /*int*/ method2(long /*int*/[] args) {return Release();} // method3 GetTypeInfoCount - not implemented // method4 GetTypeInfo - not implemented // method5 GetIDsOfNames - not implemented // method6 Invoke - not implemented - public int /*long*/ method7(int /*long*/[] args) {return get_accParent(args[0]);} - public int /*long*/ method8(int /*long*/[] args) {return get_accChildCount(args[0]);} - public int /*long*/ method9(int /*long*/[] args) {return get_accChild(args[0], args[1]);} - public int /*long*/ method10(int /*long*/[] args) {return get_accName(args[0], args[1]);} - public int /*long*/ method11(int /*long*/[] args) {return get_accValue(args[0], args[1]);} - public int /*long*/ method12(int /*long*/[] args) {return get_accDescription(args[0], args[1]);} - public int /*long*/ method13(int /*long*/[] args) {return get_accRole(args[0], args[1]);} - public int /*long*/ method14(int /*long*/[] args) {return get_accState(args[0], args[1]);} - public int /*long*/ method15(int /*long*/[] args) {return get_accHelp(args[0], args[1]);} - public int /*long*/ method16(int /*long*/[] args) {return get_accHelpTopic(args[0], args[1], args[2]);} - public int /*long*/ method17(int /*long*/[] args) {return get_accKeyboardShortcut(args[0], args[1]);} - public int /*long*/ method18(int /*long*/[] args) {return get_accFocus(args[0]);} - public int /*long*/ method19(int /*long*/[] args) {return get_accSelection(args[0]);} - public int /*long*/ method20(int /*long*/[] args) {return get_accDefaultAction(args[0], args[1]);} - public int /*long*/ method21(int /*long*/[] args) {return accSelect((int)/*64*/args[0], args[1]);} - public int /*long*/ method22(int /*long*/[] args) {return accLocation(args[0], args[1], args[2], args[3], args[4]);} - public int /*long*/ method23(int /*long*/[] args) {return accNavigate((int)/*64*/args[0], args[1], args[2]);} - public int /*long*/ method24(int /*long*/[] args) {return accHitTest((int)/*64*/args[0], (int)/*64*/args[1], args[2]);} - public int /*long*/ method25(int /*long*/[] args) {return accDoDefaultAction(args[0]);} - public int /*long*/ method26(int /*long*/[] args) {return put_accName(args[0], args[1]);} - public int /*long*/ method27(int /*long*/[] args) {return put_accValue(args[0], args[1]);} + public long /*int*/ method7(long /*int*/[] args) {return get_accParent(args[0]);} + public long /*int*/ method8(long /*int*/[] args) {return get_accChildCount(args[0]);} + public long /*int*/ method9(long /*int*/[] args) {return get_accChild(args[0], args[1]);} + public long /*int*/ method10(long /*int*/[] args) {return get_accName(args[0], args[1]);} + public long /*int*/ method11(long /*int*/[] args) {return get_accValue(args[0], args[1]);} + public long /*int*/ method12(long /*int*/[] args) {return get_accDescription(args[0], args[1]);} + public long /*int*/ method13(long /*int*/[] args) {return get_accRole(args[0], args[1]);} + public long /*int*/ method14(long /*int*/[] args) {return get_accState(args[0], args[1]);} + public long /*int*/ method15(long /*int*/[] args) {return get_accHelp(args[0], args[1]);} + public long /*int*/ method16(long /*int*/[] args) {return get_accHelpTopic(args[0], args[1], args[2]);} + public long /*int*/ method17(long /*int*/[] args) {return get_accKeyboardShortcut(args[0], args[1]);} + public long /*int*/ method18(long /*int*/[] args) {return get_accFocus(args[0]);} + public long /*int*/ method19(long /*int*/[] args) {return get_accSelection(args[0]);} + public long /*int*/ method20(long /*int*/[] args) {return get_accDefaultAction(args[0], args[1]);} + public long /*int*/ method21(long /*int*/[] args) {return accSelect((int)/*64*/args[0], args[1]);} + public long /*int*/ method22(long /*int*/[] args) {return accLocation(args[0], args[1], args[2], args[3], args[4]);} + public long /*int*/ method23(long /*int*/[] args) {return accNavigate((int)/*64*/args[0], args[1], args[2]);} + public long /*int*/ method24(long /*int*/[] args) {return accHitTest((int)/*64*/args[0], (int)/*64*/args[1], args[2]);} + public long /*int*/ method25(long /*int*/[] args) {return accDoDefaultAction(args[0]);} + public long /*int*/ method26(long /*int*/[] args) {return put_accName(args[0], args[1]);} + public long /*int*/ method27(long /*int*/[] args) {return put_accValue(args[0], args[1]);} }; /* If the callback takes a struct parameter (for example, a VARIANT), * then create a custom callback that dereferences the struct and * passes a pointer to the original callback. */ - int /*long*/ ppVtable = objIAccessible.ppVtable; - int /*long*/[] pVtable = new int /*long*/[1]; + long /*int*/ ppVtable = objIAccessible.ppVtable; + long /*int*/[] pVtable = new long /*int*/[1]; COM.MoveMemory(pVtable, ppVtable, OS.PTR_SIZEOF); - int /*long*/[] funcs = new int /*long*/[28]; + long /*int*/[] funcs = new long /*int*/[28]; COM.MoveMemory(funcs, pVtable[0], OS.PTR_SIZEOF * funcs.length); funcs[9] = COM.get_accChild_CALLBACK(funcs[9]); funcs[10] = COM.get_accName_CALLBACK(funcs[10]); @@ -202,9 +202,9 @@ public class Accessible { void createIAccessible2() { objIAccessible2 = new COMObject(new int[] {2,0,0,/*IA>>*/1,3,5,8,1,1,2,2,2,2,2,2,2,3,2,1,1,2,2,5,3,3,1,2,2,/*<<IA*/1,2,3,1,1,3,3,1,1,1,1,3,3,1,1,1,1,1}) { - public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);} - public int /*long*/ method1(int /*long*/[] args) {return AddRef();} - public int /*long*/ method2(int /*long*/[] args) {return Release();} + public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long /*int*/ method2(long /*int*/[] args) {return Release();} /* * Even though the IA2 spec says "AT's should not rely on IA inheritance", @@ -214,57 +214,57 @@ public class Accessible { // method4 GetTypeInfo - not implemented // method5 GetIDsOfNames - not implemented // method6 Invoke - not implemented - public int /*long*/ method7(int /*long*/[] args) {return get_accParent(args[0]);} - public int /*long*/ method8(int /*long*/[] args) {return get_accChildCount(args[0]);} - public int /*long*/ method9(int /*long*/[] args) {return get_accChild(args[0], args[1]);} - public int /*long*/ method10(int /*long*/[] args) {return get_accName(args[0], args[1]);} - public int /*long*/ method11(int /*long*/[] args) {return get_accValue(args[0], args[1]);} - public int /*long*/ method12(int /*long*/[] args) {return get_accDescription(args[0], args[1]);} - public int /*long*/ method13(int /*long*/[] args) {return get_accRole(args[0], args[1]);} - public int /*long*/ method14(int /*long*/[] args) {return get_accState(args[0], args[1]);} - public int /*long*/ method15(int /*long*/[] args) {return get_accHelp(args[0], args[1]);} - public int /*long*/ method16(int /*long*/[] args) {return get_accHelpTopic(args[0], args[1], args[2]);} - public int /*long*/ method17(int /*long*/[] args) {return get_accKeyboardShortcut(args[0], args[1]);} - public int /*long*/ method18(int /*long*/[] args) {return get_accFocus(args[0]);} - public int /*long*/ method19(int /*long*/[] args) {return get_accSelection(args[0]);} - public int /*long*/ method20(int /*long*/[] args) {return get_accDefaultAction(args[0], args[1]);} - public int /*long*/ method21(int /*long*/[] args) {return accSelect((int)/*64*/args[0], args[1]);} - public int /*long*/ method22(int /*long*/[] args) {return accLocation(args[0], args[1], args[2], args[3], args[4]);} - public int /*long*/ method23(int /*long*/[] args) {return accNavigate((int)/*64*/args[0], args[1], args[2]);} - public int /*long*/ method24(int /*long*/[] args) {return accHitTest((int)/*64*/args[0], (int)/*64*/args[1], args[2]);} - public int /*long*/ method25(int /*long*/[] args) {return accDoDefaultAction(args[0]);} - public int /*long*/ method26(int /*long*/[] args) {return put_accName(args[0], args[1]);} - public int /*long*/ method27(int /*long*/[] args) {return put_accValue(args[0], args[1]);} + public long /*int*/ method7(long /*int*/[] args) {return get_accParent(args[0]);} + public long /*int*/ method8(long /*int*/[] args) {return get_accChildCount(args[0]);} + public long /*int*/ method9(long /*int*/[] args) {return get_accChild(args[0], args[1]);} + public long /*int*/ method10(long /*int*/[] args) {return get_accName(args[0], args[1]);} + public long /*int*/ method11(long /*int*/[] args) {return get_accValue(args[0], args[1]);} + public long /*int*/ method12(long /*int*/[] args) {return get_accDescription(args[0], args[1]);} + public long /*int*/ method13(long /*int*/[] args) {return get_accRole(args[0], args[1]);} + public long /*int*/ method14(long /*int*/[] args) {return get_accState(args[0], args[1]);} + public long /*int*/ method15(long /*int*/[] args) {return get_accHelp(args[0], args[1]);} + public long /*int*/ method16(long /*int*/[] args) {return get_accHelpTopic(args[0], args[1], args[2]);} + public long /*int*/ method17(long /*int*/[] args) {return get_accKeyboardShortcut(args[0], args[1]);} + public long /*int*/ method18(long /*int*/[] args) {return get_accFocus(args[0]);} + public long /*int*/ method19(long /*int*/[] args) {return get_accSelection(args[0]);} + public long /*int*/ method20(long /*int*/[] args) {return get_accDefaultAction(args[0], args[1]);} + public long /*int*/ method21(long /*int*/[] args) {return accSelect((int)/*64*/args[0], args[1]);} + public long /*int*/ method22(long /*int*/[] args) {return accLocation(args[0], args[1], args[2], args[3], args[4]);} + public long /*int*/ method23(long /*int*/[] args) {return accNavigate((int)/*64*/args[0], args[1], args[2]);} + public long /*int*/ method24(long /*int*/[] args) {return accHitTest((int)/*64*/args[0], (int)/*64*/args[1], args[2]);} + public long /*int*/ method25(long /*int*/[] args) {return accDoDefaultAction(args[0]);} + public long /*int*/ method26(long /*int*/[] args) {return put_accName(args[0], args[1]);} + public long /*int*/ method27(long /*int*/[] args) {return put_accValue(args[0], args[1]);} // IAccessible2 methods - public int /*long*/ method28(int /*long*/[] args) {return get_nRelations(args[0]);} - public int /*long*/ method29(int /*long*/[] args) {return get_relation((int)/*64*/args[0], args[1]);} - public int /*long*/ method30(int /*long*/[] args) {return get_relations((int)/*64*/args[0], args[1], args[2]);} - public int /*long*/ method31(int /*long*/[] args) {return get_role(args[0]);} - public int /*long*/ method32(int /*long*/[] args) {return scrollTo((int)/*64*/args[0]);} - public int /*long*/ method33(int /*long*/[] args) {return scrollToPoint((int)/*64*/args[0], (int)/*64*/args[1], (int)/*64*/args[2]);} - public int /*long*/ method34(int /*long*/[] args) {return get_groupPosition(args[0], args[1], args[2]);} - public int /*long*/ method35(int /*long*/[] args) {return get_states(args[0]);} - public int /*long*/ method36(int /*long*/[] args) {return get_extendedRole(args[0]);} - public int /*long*/ method37(int /*long*/[] args) {return get_localizedExtendedRole(args[0]);} - public int /*long*/ method38(int /*long*/[] args) {return get_nExtendedStates(args[0]);} - public int /*long*/ method39(int /*long*/[] args) {return get_extendedStates((int)/*64*/args[0], args[1], args[2]);} - public int /*long*/ method40(int /*long*/[] args) {return get_localizedExtendedStates((int)/*64*/args[0], args[1], args[2]);} - public int /*long*/ method41(int /*long*/[] args) {return get_uniqueID(args[0]);} - public int /*long*/ method42(int /*long*/[] args) {return get_windowHandle(args[0]);} - public int /*long*/ method43(int /*long*/[] args) {return get_indexInParent(args[0]);} - public int /*long*/ method44(int /*long*/[] args) {return get_locale(args[0]);} - public int /*long*/ method45(int /*long*/[] args) {return get_attributes(args[0]);} + public long /*int*/ method28(long /*int*/[] args) {return get_nRelations(args[0]);} + public long /*int*/ method29(long /*int*/[] args) {return get_relation((int)/*64*/args[0], args[1]);} + public long /*int*/ method30(long /*int*/[] args) {return get_relations((int)/*64*/args[0], args[1], args[2]);} + public long /*int*/ method31(long /*int*/[] args) {return get_role(args[0]);} + public long /*int*/ method32(long /*int*/[] args) {return scrollTo((int)/*64*/args[0]);} + public long /*int*/ method33(long /*int*/[] args) {return scrollToPoint((int)/*64*/args[0], (int)/*64*/args[1], (int)/*64*/args[2]);} + public long /*int*/ method34(long /*int*/[] args) {return get_groupPosition(args[0], args[1], args[2]);} + public long /*int*/ method35(long /*int*/[] args) {return get_states(args[0]);} + public long /*int*/ method36(long /*int*/[] args) {return get_extendedRole(args[0]);} + public long /*int*/ method37(long /*int*/[] args) {return get_localizedExtendedRole(args[0]);} + public long /*int*/ method38(long /*int*/[] args) {return get_nExtendedStates(args[0]);} + public long /*int*/ method39(long /*int*/[] args) {return get_extendedStates((int)/*64*/args[0], args[1], args[2]);} + public long /*int*/ method40(long /*int*/[] args) {return get_localizedExtendedStates((int)/*64*/args[0], args[1], args[2]);} + public long /*int*/ method41(long /*int*/[] args) {return get_uniqueID(args[0]);} + public long /*int*/ method42(long /*int*/[] args) {return get_windowHandle(args[0]);} + public long /*int*/ method43(long /*int*/[] args) {return get_indexInParent(args[0]);} + public long /*int*/ method44(long /*int*/[] args) {return get_locale(args[0]);} + public long /*int*/ method45(long /*int*/[] args) {return get_attributes(args[0]);} }; /* If the callback takes a struct parameter (for example, a VARIANT), * then create a custom callback that dereferences the struct and * passes a pointer to the original callback. */ - int /*long*/ ppVtable = objIAccessible2.ppVtable; - int /*long*/[] pVtable = new int /*long*/[1]; + long /*int*/ ppVtable = objIAccessible2.ppVtable; + long /*int*/[] pVtable = new long /*int*/[1]; COM.MoveMemory(pVtable, ppVtable, OS.PTR_SIZEOF); - int /*long*/[] funcs = new int /*long*/[28]; + long /*int*/[] funcs = new long /*int*/[28]; COM.MoveMemory(funcs, pVtable[0], OS.PTR_SIZEOF * funcs.length); funcs[9] = COM.get_accChild_CALLBACK(funcs[9]); funcs[10] = COM.get_accName_CALLBACK(funcs[10]); @@ -287,209 +287,209 @@ public class Accessible { void createIAccessibleAction() { objIAccessibleAction = new COMObject(new int[] {2,0,0,1,1,2,4,2,2}) { - public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);} - public int /*long*/ method1(int /*long*/[] args) {return AddRef();} - public int /*long*/ method2(int /*long*/[] args) {return Release();} - public int /*long*/ method3(int /*long*/[] args) {return get_nActions(args[0]);} - public int /*long*/ method4(int /*long*/[] args) {return doAction((int)/*64*/args[0]);} - public int /*long*/ method5(int /*long*/[] args) {return get_description((int)/*64*/args[0], args[1]);} - public int /*long*/ method6(int /*long*/[] args) {return get_keyBinding((int)/*64*/args[0], (int)/*64*/args[1], args[2], args[3]);} - public int /*long*/ method7(int /*long*/[] args) {return get_name((int)/*64*/args[0], args[1]);} - public int /*long*/ method8(int /*long*/[] args) {return get_localizedName((int)/*64*/args[0], args[1]);} + public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long /*int*/ method3(long /*int*/[] args) {return get_nActions(args[0]);} + public long /*int*/ method4(long /*int*/[] args) {return doAction((int)/*64*/args[0]);} + public long /*int*/ method5(long /*int*/[] args) {return get_description((int)/*64*/args[0], args[1]);} + public long /*int*/ method6(long /*int*/[] args) {return get_keyBinding((int)/*64*/args[0], (int)/*64*/args[1], args[2], args[3]);} + public long /*int*/ method7(long /*int*/[] args) {return get_name((int)/*64*/args[0], args[1]);} + public long /*int*/ method8(long /*int*/[] args) {return get_localizedName((int)/*64*/args[0], args[1]);} }; } void createIAccessibleApplication() { objIAccessibleApplication = new COMObject(new int[] {2,0,0,1,1,1,1}) { - public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);} - public int /*long*/ method1(int /*long*/[] args) {return AddRef();} - public int /*long*/ method2(int /*long*/[] args) {return Release();} - public int /*long*/ method3(int /*long*/[] args) {return get_appName(args[0]);} - public int /*long*/ method4(int /*long*/[] args) {return get_appVersion(args[0]);} - public int /*long*/ method5(int /*long*/[] args) {return get_toolkitName(args[0]);} - public int /*long*/ method6(int /*long*/[] args) {return get_toolkitVersion(args[0]);} + public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long /*int*/ method3(long /*int*/[] args) {return get_appName(args[0]);} + public long /*int*/ method4(long /*int*/[] args) {return get_appVersion(args[0]);} + public long /*int*/ method5(long /*int*/[] args) {return get_toolkitName(args[0]);} + public long /*int*/ method6(long /*int*/[] args) {return get_toolkitVersion(args[0]);} }; } // This method is intentionally commented. We are not providing IAccessibleComponent at this time. // void createIAccessibleComponent() { // objIAccessibleComponent = new COMObject(new int[] {2,0,0,2,1,1}) { -// public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);} -// public int /*long*/ method1(int /*long*/[] args) {return AddRef();} -// public int /*long*/ method2(int /*long*/[] args) {return Release();} -// public int /*long*/ method3(int /*long*/[] args) {return get_locationInParent(args[0], args[1]);} -// public int /*long*/ method4(int /*long*/[] args) {return get_foreground(args[0]);} -// public int /*long*/ method5(int /*long*/[] args) {return get_background(args[0]);} +// public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} +// public long /*int*/ method1(long /*int*/[] args) {return AddRef();} +// public long /*int*/ method2(long /*int*/[] args) {return Release();} +// public long /*int*/ method3(long /*int*/[] args) {return get_locationInParent(args[0], args[1]);} +// public long /*int*/ method4(long /*int*/[] args) {return get_foreground(args[0]);} +// public long /*int*/ method5(long /*int*/[] args) {return get_background(args[0]);} // }; // } void createIAccessibleEditableText() { objIAccessibleEditableText = new COMObject(new int[] {2,0,0,2,2,2,2,1,3,3}) { - public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);} - public int /*long*/ method1(int /*long*/[] args) {return AddRef();} - public int /*long*/ method2(int /*long*/[] args) {return Release();} - public int /*long*/ method3(int /*long*/[] args) {return copyText((int)/*64*/args[0], (int)/*64*/args[1]);} - public int /*long*/ method4(int /*long*/[] args) {return deleteText((int)/*64*/args[0], (int)/*64*/args[1]);} - public int /*long*/ method5(int /*long*/[] args) {return insertText((int)/*64*/args[0], args[1]);} - public int /*long*/ method6(int /*long*/[] args) {return cutText((int)/*64*/args[0], (int)/*64*/args[1]);} - public int /*long*/ method7(int /*long*/[] args) {return pasteText((int)/*64*/args[0]);} - public int /*long*/ method8(int /*long*/[] args) {return replaceText((int)/*64*/args[0], (int)/*64*/args[1], args[2]);} - public int /*long*/ method9(int /*long*/[] args) {return setAttributes((int)/*64*/args[0], (int)/*64*/args[1], args[2]);} + public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long /*int*/ method3(long /*int*/[] args) {return copyText((int)/*64*/args[0], (int)/*64*/args[1]);} + public long /*int*/ method4(long /*int*/[] args) {return deleteText((int)/*64*/args[0], (int)/*64*/args[1]);} + public long /*int*/ method5(long /*int*/[] args) {return insertText((int)/*64*/args[0], args[1]);} + public long /*int*/ method6(long /*int*/[] args) {return cutText((int)/*64*/args[0], (int)/*64*/args[1]);} + public long /*int*/ method7(long /*int*/[] args) {return pasteText((int)/*64*/args[0]);} + public long /*int*/ method8(long /*int*/[] args) {return replaceText((int)/*64*/args[0], (int)/*64*/args[1], args[2]);} + public long /*int*/ method9(long /*int*/[] args) {return setAttributes((int)/*64*/args[0], (int)/*64*/args[1], args[2]);} }; } void createIAccessibleHyperlink() { objIAccessibleHyperlink = new COMObject(new int[] {2,0,0,/*IAA>>*/1,1,2,4,2,2,/*<<IAA*/2,2,1,1,1}) { - public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);} - public int /*long*/ method1(int /*long*/[] args) {return AddRef();} - public int /*long*/ method2(int /*long*/[] args) {return Release();} + public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long /*int*/ method2(long /*int*/[] args) {return Release();} // IAccessibleAction - public int /*long*/ method3(int /*long*/[] args) {return get_nActions(args[0]);} - public int /*long*/ method4(int /*long*/[] args) {return doAction((int)/*64*/args[0]);} - public int /*long*/ method5(int /*long*/[] args) {return get_description((int)/*64*/args[0], args[1]);} - public int /*long*/ method6(int /*long*/[] args) {return get_keyBinding((int)/*64*/args[0], (int)/*64*/args[1], args[2], args[3]);} - public int /*long*/ method7(int /*long*/[] args) {return get_name((int)/*64*/args[0], args[1]);} - public int /*long*/ method8(int /*long*/[] args) {return get_localizedName((int)/*64*/args[0], args[1]);} + public long /*int*/ method3(long /*int*/[] args) {return get_nActions(args[0]);} + public long /*int*/ method4(long /*int*/[] args) {return doAction((int)/*64*/args[0]);} + public long /*int*/ method5(long /*int*/[] args) {return get_description((int)/*64*/args[0], args[1]);} + public long /*int*/ method6(long /*int*/[] args) {return get_keyBinding((int)/*64*/args[0], (int)/*64*/args[1], args[2], args[3]);} + public long /*int*/ method7(long /*int*/[] args) {return get_name((int)/*64*/args[0], args[1]);} + public long /*int*/ method8(long /*int*/[] args) {return get_localizedName((int)/*64*/args[0], args[1]);} // IAccessibleHyperlink - public int /*long*/ method9(int /*long*/[] args) {return get_anchor((int)/*64*/args[0], args[1]);} - public int /*long*/ method10(int /*long*/[] args) {return get_anchorTarget((int)/*64*/args[0], args[1]);} - public int /*long*/ method11(int /*long*/[] args) {return get_startIndex(args[0]);} - public int /*long*/ method12(int /*long*/[] args) {return get_endIndex(args[0]);} - public int /*long*/ method13(int /*long*/[] args) {return get_valid(args[0]);} + public long /*int*/ method9(long /*int*/[] args) {return get_anchor((int)/*64*/args[0], args[1]);} + public long /*int*/ method10(long /*int*/[] args) {return get_anchorTarget((int)/*64*/args[0], args[1]);} + public long /*int*/ method11(long /*int*/[] args) {return get_startIndex(args[0]);} + public long /*int*/ method12(long /*int*/[] args) {return get_endIndex(args[0]);} + public long /*int*/ method13(long /*int*/[] args) {return get_valid(args[0]);} }; } void createIAccessibleHypertext() { objIAccessibleHypertext = new COMObject(new int[] {2,0,0,/*IAT>>*/2,4,1,6,1,4,3,3,5,5,5,1,1,3,1,3,5,1,1,/*<<IAT*/1,2,2}) { - public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);} - public int /*long*/ method1(int /*long*/[] args) {return AddRef();} - public int /*long*/ method2(int /*long*/[] args) {return Release();} + public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long /*int*/ method2(long /*int*/[] args) {return Release();} // IAccessibleText - public int /*long*/ method3(int /*long*/[] args) {return addSelection((int)/*64*/args[0], (int)/*64*/args[1]);} - public int /*long*/ method4(int /*long*/[] args) {return get_attributes((int)/*64*/args[0], args[1], args[2], args[3]);} - public int /*long*/ method5(int /*long*/[] args) {return get_caretOffset(args[0]);} - public int /*long*/ method6(int /*long*/[] args) {return get_characterExtents((int)/*64*/args[0], (int)/*64*/args[1], args[2], args[3], args[4], args[5]);} - public int /*long*/ method7(int /*long*/[] args) {return get_nSelections(args[0]);} - public int /*long*/ method8(int /*long*/[] args) {return get_offsetAtPoint((int)/*64*/args[0], (int)/*64*/args[1], (int)/*64*/args[2], args[3]);} - public int /*long*/ method9(int /*long*/[] args) {return get_selection((int)/*64*/args[0], args[1], args[2]);} - public int /*long*/ method10(int /*long*/[] args) {return get_text((int)/*64*/args[0], (int)/*64*/args[1], args[2]);} - public int /*long*/ method11(int /*long*/[] args) {return get_textBeforeOffset((int)/*64*/args[0], (int)/*64*/args[1], args[2], args[3], args[4]);} - public int /*long*/ method12(int /*long*/[] args) {return get_textAfterOffset((int)/*64*/args[0], (int)/*64*/args[1], args[2], args[3], args[4]);} - public int /*long*/ method13(int /*long*/[] args) {return get_textAtOffset((int)/*64*/args[0], (int)/*64*/args[1], args[2], args[3], args[4]);} - public int /*long*/ method14(int /*long*/[] args) {return removeSelection((int)/*64*/args[0]);} - public int /*long*/ method15(int /*long*/[] args) {return setCaretOffset((int)/*64*/args[0]);} - public int /*long*/ method16(int /*long*/[] args) {return setSelection((int)/*64*/args[0], (int)/*64*/args[1], (int)/*64*/args[2]);} - public int /*long*/ method17(int /*long*/[] args) {return get_nCharacters(args[0]);} - public int /*long*/ method18(int /*long*/[] args) {return scrollSubstringTo((int)/*64*/args[0], (int)/*64*/args[1], (int)/*64*/args[2]);} - public int /*long*/ method19(int /*long*/[] args) {return scrollSubstringToPoint((int)/*64*/args[0], (int)/*64*/args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4]);} - public int /*long*/ method20(int /*long*/[] args) {return get_newText(args[0]);} - public int /*long*/ method21(int /*long*/[] args) {return get_oldText(args[0]);} + public long /*int*/ method3(long /*int*/[] args) {return addSelection((int)/*64*/args[0], (int)/*64*/args[1]);} + public long /*int*/ method4(long /*int*/[] args) {return get_attributes((int)/*64*/args[0], args[1], args[2], args[3]);} + public long /*int*/ method5(long /*int*/[] args) {return get_caretOffset(args[0]);} + public long /*int*/ method6(long /*int*/[] args) {return get_characterExtents((int)/*64*/args[0], (int)/*64*/args[1], args[2], args[3], args[4], args[5]);} + public long /*int*/ method7(long /*int*/[] args) {return get_nSelections(args[0]);} + public long /*int*/ method8(long /*int*/[] args) {return get_offsetAtPoint((int)/*64*/args[0], (int)/*64*/args[1], (int)/*64*/args[2], args[3]);} + public long /*int*/ method9(long /*int*/[] args) {return get_selection((int)/*64*/args[0], args[1], args[2]);} + public long /*int*/ method10(long /*int*/[] args) {return get_text((int)/*64*/args[0], (int)/*64*/args[1], args[2]);} + public long /*int*/ method11(long /*int*/[] args) {return get_textBeforeOffset((int)/*64*/args[0], (int)/*64*/args[1], args[2], args[3], args[4]);} + public long /*int*/ method12(long /*int*/[] args) {return get_textAfterOffset((int)/*64*/args[0], (int)/*64*/args[1], args[2], args[3], args[4]);} + public long /*int*/ method13(long /*int*/[] args) {return get_textAtOffset((int)/*64*/args[0], (int)/*64*/args[1], args[2], args[3], args[4]);} + public long /*int*/ method14(long /*int*/[] args) {return removeSelection((int)/*64*/args[0]);} + public long /*int*/ method15(long /*int*/[] args) {return setCaretOffset((int)/*64*/args[0]);} + public long /*int*/ method16(long /*int*/[] args) {return setSelection((int)/*64*/args[0], (int)/*64*/args[1], (int)/*64*/args[2]);} + public long /*int*/ method17(long /*int*/[] args) {return get_nCharacters(args[0]);} + public long /*int*/ method18(long /*int*/[] args) {return scrollSubstringTo((int)/*64*/args[0], (int)/*64*/args[1], (int)/*64*/args[2]);} + public long /*int*/ method19(long /*int*/[] args) {return scrollSubstringToPoint((int)/*64*/args[0], (int)/*64*/args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4]);} + public long /*int*/ method20(long /*int*/[] args) {return get_newText(args[0]);} + public long /*int*/ method21(long /*int*/[] args) {return get_oldText(args[0]);} // IAccessibleHypertext - public int /*long*/ method22(int /*long*/[] args) {return get_nHyperlinks(args[0]);} - public int /*long*/ method23(int /*long*/[] args) {return get_hyperlink((int)/*64*/args[0], args[1]);} - public int /*long*/ method24(int /*long*/[] args) {return get_hyperlinkIndex((int)/*64*/args[0], args[1]);} + public long /*int*/ method22(long /*int*/[] args) {return get_nHyperlinks(args[0]);} + public long /*int*/ method23(long /*int*/[] args) {return get_hyperlink((int)/*64*/args[0], args[1]);} + public long /*int*/ method24(long /*int*/[] args) {return get_hyperlinkIndex((int)/*64*/args[0], args[1]);} }; } // This method is intentionally commented. We are not providing IAccessibleImage at this time. // void createIAccessibleImage() { // objIAccessibleImage = new COMObject(new int[] {2,0,0,1,3,2}) { -// public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);} -// public int /*long*/ method1(int /*long*/[] args) {return AddRef();} -// public int /*long*/ method2(int /*long*/[] args) {return Release();} -// public int /*long*/ method3(int /*long*/[] args) {return get_description(args[0]);} -// public int /*long*/ method4(int /*long*/[] args) {return get_imagePosition((int)/*64*/args[0], args[1], args[2]);} -// public int /*long*/ method5(int /*long*/[] args) {return get_imageSize(args[0], args[1]);} +// public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} +// public long /*int*/ method1(long /*int*/[] args) {return AddRef();} +// public long /*int*/ method2(long /*int*/[] args) {return Release();} +// public long /*int*/ method3(long /*int*/[] args) {return get_description(args[0]);} +// public long /*int*/ method4(long /*int*/[] args) {return get_imagePosition((int)/*64*/args[0], args[1], args[2]);} +// public long /*int*/ method5(long /*int*/[] args) {return get_imageSize(args[0], args[1]);} // }; // } void createIAccessibleTable2() { objIAccessibleTable2 = new COMObject(new int[] {2,0,0,3,1,2,1,1,1,1,1,2,2,2,2,1,2,2,1,1,1,1,1}) { - public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);} - public int /*long*/ method1(int /*long*/[] args) {return AddRef();} - public int /*long*/ method2(int /*long*/[] args) {return Release();} - public int /*long*/ method3(int /*long*/[] args) {return get_cellAt((int)/*64*/args[0], (int)/*64*/args[1], args[2]);} - public int /*long*/ method4(int /*long*/[] args) {return get_caption(args[0]);} - public int /*long*/ method5(int /*long*/[] args) {return get_columnDescription((int)/*64*/args[0], args[1]);} - public int /*long*/ method6(int /*long*/[] args) {return get_nColumns(args[0]);} - public int /*long*/ method7(int /*long*/[] args) {return get_nRows(args[0]);} - public int /*long*/ method8(int /*long*/[] args) {return get_nSelectedCells(args[0]);} - public int /*long*/ method9(int /*long*/[] args) {return get_nSelectedColumns(args[0]);} - public int /*long*/ method10(int /*long*/[] args) {return get_nSelectedRows(args[0]);} - public int /*long*/ method11(int /*long*/[] args) {return get_rowDescription((int)/*64*/args[0], args[1]);} - public int /*long*/ method12(int /*long*/[] args) {return get_selectedCells(args[0], args[1]);} - public int /*long*/ method13(int /*long*/[] args) {return get_selectedColumns(args[0], args[1]);} - public int /*long*/ method14(int /*long*/[] args) {return get_selectedRows(args[0], args[1]);} - public int /*long*/ method15(int /*long*/[] args) {return get_summary(args[0]);} - public int /*long*/ method16(int /*long*/[] args) {return get_isColumnSelected((int)/*64*/args[0], args[1]);} - public int /*long*/ method17(int /*long*/[] args) {return get_isRowSelected((int)/*64*/args[0], args[1]);} - public int /*long*/ method18(int /*long*/[] args) {return selectRow((int)/*64*/args[0]);} - public int /*long*/ method19(int /*long*/[] args) {return selectColumn((int)/*64*/args[0]);} - public int /*long*/ method20(int /*long*/[] args) {return unselectRow((int)/*64*/args[0]);} - public int /*long*/ method21(int /*long*/[] args) {return unselectColumn((int)/*64*/args[0]);} - public int /*long*/ method22(int /*long*/[] args) {return get_modelChange(args[0]);} + public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long /*int*/ method3(long /*int*/[] args) {return get_cellAt((int)/*64*/args[0], (int)/*64*/args[1], args[2]);} + public long /*int*/ method4(long /*int*/[] args) {return get_caption(args[0]);} + public long /*int*/ method5(long /*int*/[] args) {return get_columnDescription((int)/*64*/args[0], args[1]);} + public long /*int*/ method6(long /*int*/[] args) {return get_nColumns(args[0]);} + public long /*int*/ method7(long /*int*/[] args) {return get_nRows(args[0]);} + public long /*int*/ method8(long /*int*/[] args) {return get_nSelectedCells(args[0]);} + public long /*int*/ method9(long /*int*/[] args) {return get_nSelectedColumns(args[0]);} + public long /*int*/ method10(long /*int*/[] args) {return get_nSelectedRows(args[0]);} + public long /*int*/ method11(long /*int*/[] args) {return get_rowDescription((int)/*64*/args[0], args[1]);} + public long /*int*/ method12(long /*int*/[] args) {return get_selectedCells(args[0], args[1]);} + public long /*int*/ method13(long /*int*/[] args) {return get_selectedColumns(args[0], args[1]);} + public long /*int*/ method14(long /*int*/[] args) {return get_selectedRows(args[0], args[1]);} + public long /*int*/ method15(long /*int*/[] args) {return get_summary(args[0]);} + public long /*int*/ method16(long /*int*/[] args) {return get_isColumnSelected((int)/*64*/args[0], args[1]);} + public long /*int*/ method17(long /*int*/[] args) {return get_isRowSelected((int)/*64*/args[0], args[1]);} + public long /*int*/ method18(long /*int*/[] args) {return selectRow((int)/*64*/args[0]);} + public long /*int*/ method19(long /*int*/[] args) {return selectColumn((int)/*64*/args[0]);} + public long /*int*/ method20(long /*int*/[] args) {return unselectRow((int)/*64*/args[0]);} + public long /*int*/ method21(long /*int*/[] args) {return unselectColumn((int)/*64*/args[0]);} + public long /*int*/ method22(long /*int*/[] args) {return get_modelChange(args[0]);} }; } void createIAccessibleTableCell() { objIAccessibleTableCell = new COMObject(new int[] {2,0,0,1,2,1,1,2,1,1,5,1}) { - public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);} - public int /*long*/ method1(int /*long*/[] args) {return AddRef();} - public int /*long*/ method2(int /*long*/[] args) {return Release();} - public int /*long*/ method3(int /*long*/[] args) {return get_columnExtent(args[0]);} - public int /*long*/ method4(int /*long*/[] args) {return get_columnHeaderCells(args[0], args[1]);} - public int /*long*/ method5(int /*long*/[] args) {return get_columnIndex(args[0]);} - public int /*long*/ method6(int /*long*/[] args) {return get_rowExtent(args[0]);} - public int /*long*/ method7(int /*long*/[] args) {return get_rowHeaderCells(args[0], args[1]);} - public int /*long*/ method8(int /*long*/[] args) {return get_rowIndex(args[0]);} - public int /*long*/ method9(int /*long*/[] args) {return get_isSelected(args[0]);} - public int /*long*/ method10(int /*long*/[] args) {return get_rowColumnExtents(args[0], args[1], args[2], args[3], args[4]);} - public int /*long*/ method11(int /*long*/[] args) {return get_table(args[0]);} + public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long /*int*/ method3(long /*int*/[] args) {return get_columnExtent(args[0]);} + public long /*int*/ method4(long /*int*/[] args) {return get_columnHeaderCells(args[0], args[1]);} + public long /*int*/ method5(long /*int*/[] args) {return get_columnIndex(args[0]);} + public long /*int*/ method6(long /*int*/[] args) {return get_rowExtent(args[0]);} + public long /*int*/ method7(long /*int*/[] args) {return get_rowHeaderCells(args[0], args[1]);} + public long /*int*/ method8(long /*int*/[] args) {return get_rowIndex(args[0]);} + public long /*int*/ method9(long /*int*/[] args) {return get_isSelected(args[0]);} + public long /*int*/ method10(long /*int*/[] args) {return get_rowColumnExtents(args[0], args[1], args[2], args[3], args[4]);} + public long /*int*/ method11(long /*int*/[] args) {return get_table(args[0]);} }; } void createIAccessibleText() { objIAccessibleText = new COMObject(new int[] {2,0,0,2,4,1,6,1,4,3,3,5,5,5,1,1,3,1,3,5,1,1}) { - public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);} - public int /*long*/ method1(int /*long*/[] args) {return AddRef();} - public int /*long*/ method2(int /*long*/[] args) {return Release();} - public int /*long*/ method3(int /*long*/[] args) {return addSelection((int)/*64*/args[0], (int)/*64*/args[1]);} - public int /*long*/ method4(int /*long*/[] args) {return get_attributes((int)/*64*/args[0], args[1], args[2], args[3]);} - public int /*long*/ method5(int /*long*/[] args) {return get_caretOffset(args[0]);} - public int /*long*/ method6(int /*long*/[] args) {return get_characterExtents((int)/*64*/args[0], (int)/*64*/args[1], args[2], args[3], args[4], args[5]);} - public int /*long*/ method7(int /*long*/[] args) {return get_nSelections(args[0]);} - public int /*long*/ method8(int /*long*/[] args) {return get_offsetAtPoint((int)/*64*/args[0], (int)/*64*/args[1], (int)/*64*/args[2], args[3]);} - public int /*long*/ method9(int /*long*/[] args) {return get_selection((int)/*64*/args[0], args[1], args[2]);} - public int /*long*/ method10(int /*long*/[] args) {return get_text((int)/*64*/args[0], (int)/*64*/args[1], args[2]);} - public int /*long*/ method11(int /*long*/[] args) {return get_textBeforeOffset((int)/*64*/args[0], (int)/*64*/args[1], args[2], args[3], args[4]);} - public int /*long*/ method12(int /*long*/[] args) {return get_textAfterOffset((int)/*64*/args[0], (int)/*64*/args[1], args[2], args[3], args[4]);} - public int /*long*/ method13(int /*long*/[] args) {return get_textAtOffset((int)/*64*/args[0], (int)/*64*/args[1], args[2], args[3], args[4]);} - public int /*long*/ method14(int /*long*/[] args) {return removeSelection((int)/*64*/args[0]);} - public int /*long*/ method15(int /*long*/[] args) {return setCaretOffset((int)/*64*/args[0]);} - public int /*long*/ method16(int /*long*/[] args) {return setSelection((int)/*64*/args[0], (int)/*64*/args[1], (int)/*64*/args[2]);} - public int /*long*/ method17(int /*long*/[] args) {return get_nCharacters(args[0]);} - public int /*long*/ method18(int /*long*/[] args) {return scrollSubstringTo((int)/*64*/args[0], (int)/*64*/args[1], (int)/*64*/args[2]);} - public int /*long*/ method19(int /*long*/[] args) {return scrollSubstringToPoint((int)/*64*/args[0], (int)/*64*/args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4]);} - public int /*long*/ method20(int /*long*/[] args) {return get_newText(args[0]);} - public int /*long*/ method21(int /*long*/[] args) {return get_oldText(args[0]);} + public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long /*int*/ method3(long /*int*/[] args) {return addSelection((int)/*64*/args[0], (int)/*64*/args[1]);} + public long /*int*/ method4(long /*int*/[] args) {return get_attributes((int)/*64*/args[0], args[1], args[2], args[3]);} + public long /*int*/ method5(long /*int*/[] args) {return get_caretOffset(args[0]);} + public long /*int*/ method6(long /*int*/[] args) {return get_characterExtents((int)/*64*/args[0], (int)/*64*/args[1], args[2], args[3], args[4], args[5]);} + public long /*int*/ method7(long /*int*/[] args) {return get_nSelections(args[0]);} + public long /*int*/ method8(long /*int*/[] args) {return get_offsetAtPoint((int)/*64*/args[0], (int)/*64*/args[1], (int)/*64*/args[2], args[3]);} + public long /*int*/ method9(long /*int*/[] args) {return get_selection((int)/*64*/args[0], args[1], args[2]);} + public long /*int*/ method10(long /*int*/[] args) {return get_text((int)/*64*/args[0], (int)/*64*/args[1], args[2]);} + public long /*int*/ method11(long /*int*/[] args) {return get_textBeforeOffset((int)/*64*/args[0], (int)/*64*/args[1], args[2], args[3], args[4]);} + public long /*int*/ method12(long /*int*/[] args) {return get_textAfterOffset((int)/*64*/args[0], (int)/*64*/args[1], args[2], args[3], args[4]);} + public long /*int*/ method13(long /*int*/[] args) {return get_textAtOffset((int)/*64*/args[0], (int)/*64*/args[1], args[2], args[3], args[4]);} + public long /*int*/ method14(long /*int*/[] args) {return removeSelection((int)/*64*/args[0]);} + public long /*int*/ method15(long /*int*/[] args) {return setCaretOffset((int)/*64*/args[0]);} + public long /*int*/ method16(long /*int*/[] args) {return setSelection((int)/*64*/args[0], (int)/*64*/args[1], (int)/*64*/args[2]);} + public long /*int*/ method17(long /*int*/[] args) {return get_nCharacters(args[0]);} + public long /*int*/ method18(long /*int*/[] args) {return scrollSubstringTo((int)/*64*/args[0], (int)/*64*/args[1], (int)/*64*/args[2]);} + public long /*int*/ method19(long /*int*/[] args) {return scrollSubstringToPoint((int)/*64*/args[0], (int)/*64*/args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4]);} + public long /*int*/ method20(long /*int*/[] args) {return get_newText(args[0]);} + public long /*int*/ method21(long /*int*/[] args) {return get_oldText(args[0]);} }; } void createIAccessibleValue() { objIAccessibleValue = new COMObject(new int[] {2,0,0,1,1,1,1}) { - public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);} - public int /*long*/ method1(int /*long*/[] args) {return AddRef();} - public int /*long*/ method2(int /*long*/[] args) {return Release();} - public int /*long*/ method3(int /*long*/[] args) {return get_currentValue(args[0]);} - public int /*long*/ method4(int /*long*/[] args) {return setCurrentValue(args[0]);} - public int /*long*/ method5(int /*long*/[] args) {return get_maximumValue(args[0]);} - public int /*long*/ method6(int /*long*/[] args) {return get_minimumValue(args[0]);} + public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long /*int*/ method3(long /*int*/[] args) {return get_currentValue(args[0]);} + public long /*int*/ method4(long /*int*/[] args) {return setCurrentValue(args[0]);} + public long /*int*/ method5(long /*int*/[] args) {return get_maximumValue(args[0]);} + public long /*int*/ method6(long /*int*/[] args) {return get_minimumValue(args[0]);} }; /* Dereference VARIANT struct parameters. */ - int /*long*/ ppVtable = objIAccessibleValue.ppVtable; - int /*long*/[] pVtable = new int /*long*/[1]; + long /*int*/ ppVtable = objIAccessibleValue.ppVtable; + long /*int*/[] pVtable = new long /*int*/[1]; COM.MoveMemory(pVtable, ppVtable, OS.PTR_SIZEOF); - int /*long*/[] funcs = new int /*long*/[7]; + long /*int*/[] funcs = new long /*int*/[7]; COM.MoveMemory(funcs, pVtable[0], OS.PTR_SIZEOF * funcs.length); funcs[4] = COM.CALLBACK_setCurrentValue(funcs[4]); COM.MoveMemory(pVtable[0], funcs, OS.PTR_SIZEOF * funcs.length); @@ -497,22 +497,22 @@ public class Accessible { void createIEnumVARIANT() { objIEnumVARIANT = new COMObject(new int[] {2,0,0,3,1,0,1}) { - public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);} - public int /*long*/ method1(int /*long*/[] args) {return AddRef();} - public int /*long*/ method2(int /*long*/[] args) {return Release();} - public int /*long*/ method3(int /*long*/[] args) {return Next((int)/*64*/args[0], args[1], args[2]);} - public int /*long*/ method4(int /*long*/[] args) {return Skip((int)/*64*/args[0]);} - public int /*long*/ method5(int /*long*/[] args) {return Reset();} - public int /*long*/ method6(int /*long*/[] args) {return Clone(args[0]);} + public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long /*int*/ method3(long /*int*/[] args) {return Next((int)/*64*/args[0], args[1], args[2]);} + public long /*int*/ method4(long /*int*/[] args) {return Skip((int)/*64*/args[0]);} + public long /*int*/ method5(long /*int*/[] args) {return Reset();} + public long /*int*/ method6(long /*int*/[] args) {return Clone(args[0]);} }; } void createIServiceProvider() { objIServiceProvider = new COMObject(new int[] {2,0,0,3}) { - public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);} - public int /*long*/ method1(int /*long*/[] args) {return AddRef();} - public int /*long*/ method2(int /*long*/[] args) {return Release();} - public int /*long*/ method3(int /*long*/[] args) {return QueryService(args[0], args[1], args[2]);} + public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long /*int*/ method3(long /*int*/[] args) {return QueryService(args[0], args[1], args[2]);} }; } @@ -852,7 +852,7 @@ public class Accessible { parent = null; } - int /*long*/ getAddress() { + long /*int*/ getAddress() { /* The address of an Accessible is the address of its IAccessible COMObject. */ if (objIAccessible == null) createIAccessible(); return objIAccessible.getAddress(); @@ -904,7 +904,7 @@ public class Accessible { * * @noreference This method is not intended to be referenced by clients. */ - public int /*long*/ internal_WM_GETOBJECT (int /*long*/ wParam, int /*long*/ lParam) { + public long /*int*/ internal_WM_GETOBJECT (long /*int*/ wParam, long /*int*/ lParam) { if (objIAccessible == null) return 0; if ((int)/*64*/lParam == COM.OBJID_CLIENT) { /* LresultFromObject([in] riid, [in] wParam, [in] pAcc) @@ -1524,13 +1524,13 @@ public class Accessible { * Ownership of ppvObject transfers from callee to caller so reference count on ppvObject * must be incremented before returning. Caller is responsible for releasing ppvObject. */ - int QueryInterface(int /*long*/ iid, int /*long*/ ppvObject) { - COM.MoveMemory(ppvObject, new int /*long*/[] { 0 }, OS.PTR_SIZEOF); + int QueryInterface(long /*int*/ iid, long /*int*/ ppvObject) { + COM.MoveMemory(ppvObject, new long /*int*/[] { 0 }, OS.PTR_SIZEOF); GUID guid = new GUID(); COM.MoveMemory(guid, iid, GUID.sizeof); if (COM.IsEqualGUID(guid, COM.IIDIUnknown)) { - COM.MoveMemory(ppvObject, new int /*long*/[] { getAddress() }, OS.PTR_SIZEOF); + COM.MoveMemory(ppvObject, new long /*int*/[] { getAddress() }, OS.PTR_SIZEOF); AddRef(); if (DEBUG) print(this + ".QueryInterface guid=" + guidString(guid) + " returning " + getAddress() + hresult(COM.S_OK)); return COM.S_OK; @@ -1538,7 +1538,7 @@ public class Accessible { if (COM.IsEqualGUID(guid, COM.IIDIDispatch) || COM.IsEqualGUID(guid, COM.IIDIAccessible)) { if (objIAccessible == null) createIAccessible(); - COM.MoveMemory(ppvObject, new int /*long*/[] { objIAccessible.getAddress() }, OS.PTR_SIZEOF); + COM.MoveMemory(ppvObject, new long /*int*/[] { objIAccessible.getAddress() }, OS.PTR_SIZEOF); AddRef(); if (DEBUG) print(this + ".QueryInterface guid=" + guidString(guid) + " returning " + objIAccessible.getAddress() + hresult(COM.S_OK)); return COM.S_OK; @@ -1546,7 +1546,7 @@ public class Accessible { if (COM.IsEqualGUID(guid, COM.IIDIEnumVARIANT)) { if (objIEnumVARIANT == null) createIEnumVARIANT(); - COM.MoveMemory(ppvObject, new int /*long*/[] { objIEnumVARIANT.getAddress() }, OS.PTR_SIZEOF); + COM.MoveMemory(ppvObject, new long /*int*/[] { objIEnumVARIANT.getAddress() }, OS.PTR_SIZEOF); AddRef(); enumIndex = 0; if (DEBUG) print(this + ".QueryInterface guid=" + guidString(guid) + " returning " + objIEnumVARIANT.getAddress() + hresult(COM.S_OK)); @@ -1561,7 +1561,7 @@ public class Accessible { accessibleValueListeners.size() > 0 || getRelationCount() > 0 || (control instanceof Button && ((control.getStyle() & SWT.RADIO) != 0))) { if (objIServiceProvider == null) createIServiceProvider(); - COM.MoveMemory(ppvObject, new int /*long*/[] { objIServiceProvider.getAddress() }, OS.PTR_SIZEOF); + COM.MoveMemory(ppvObject, new long /*int*/[] { objIServiceProvider.getAddress() }, OS.PTR_SIZEOF); AddRef(); if (DEBUG) print(this + ".QueryInterface guid=" + guidString(guid) + " returning " + objIServiceProvider.getAddress() + hresult(COM.S_OK)); return COM.S_OK; @@ -1578,7 +1578,7 @@ public class Accessible { if (iaccessible != null) { /* Forward any other GUIDs to the OS proxy. */ - int /*long*/[] ppv = new int /*long*/[1]; + long /*int*/[] ppv = new long /*int*/[1]; code = iaccessible.QueryInterface(guid, ppv); COM.MoveMemory(ppvObject, ppv, OS.PTR_SIZEOF); if (DEBUG) if (interesting(guid)) print("QueryInterface guid=" + guidString(guid) + " returning super" + hresult(code)); @@ -1669,8 +1669,8 @@ public class Accessible { } /* QueryService([in] guidService, [in] riid, [out] ppvObject) */ - int QueryService(int /*long*/ guidService, int /*long*/ riid, int /*long*/ ppvObject) { - COM.MoveMemory(ppvObject, new int /*long*/[] { 0 }, OS.PTR_SIZEOF); + int QueryService(long /*int*/ guidService, long /*int*/ riid, long /*int*/ ppvObject) { + COM.MoveMemory(ppvObject, new long /*int*/[] { 0 }, OS.PTR_SIZEOF); GUID service = new GUID(); COM.MoveMemory(service, guidService, GUID.sizeof); GUID guid = new GUID(); @@ -1680,7 +1680,7 @@ public class Accessible { if (COM.IsEqualGUID(guid, COM.IIDIUnknown) || COM.IsEqualGUID(guid, COM.IIDIDispatch) | COM.IsEqualGUID(guid, COM.IIDIAccessible)) { if (objIAccessible == null) createIAccessible(); if (DEBUG) print(this + ".QueryService service=" + guidString(service) + " guid=" + guidString(guid) + " returning " + objIAccessible.getAddress() + hresult(COM.S_OK)); - COM.MoveMemory(ppvObject, new int /*long*/[] { objIAccessible.getAddress() }, OS.PTR_SIZEOF); + COM.MoveMemory(ppvObject, new long /*int*/[] { objIAccessible.getAddress() }, OS.PTR_SIZEOF); AddRef(); return COM.S_OK; } @@ -1701,11 +1701,11 @@ public class Accessible { if (iaccessible != null) { /* Forward any other GUIDs to the OS proxy. */ - int /*long*/ [] ppv = new int /*long*/ [1]; + long /*int*/ [] ppv = new long /*int*/ [1]; int code = iaccessible.QueryInterface(COM.IIDIServiceProvider, ppv); if (code == COM.S_OK) { IServiceProvider iserviceProvider = new IServiceProvider(ppv[0]); - int /*long*/ [] ppvx = new int /*long*/ [1]; + long /*int*/ [] ppvx = new long /*int*/ [1]; code = iserviceProvider.QueryService(service, guid, ppvx); COM.MoveMemory(ppvObject, ppvx, OS.PTR_SIZEOF); if (DEBUG) if (interesting(service) && interesting(guid)) print("QueryService service=" + guidString(service) + " guid=" + guidString(guid) + " returning super" + hresult(code)); @@ -1717,7 +1717,7 @@ public class Accessible { return COM.E_NOINTERFACE; } - int queryAccessible2Interfaces(GUID guid, int /*long*/ ppvObject) { + int queryAccessible2Interfaces(GUID guid, long /*int*/ ppvObject) { if (COM.IsEqualGUID(guid, COM.IIDIAccessible2)) { if (accessibleActionListeners.size() > 0 || accessibleAttributeListeners.size() > 0 || accessibleHyperlinkListeners.size() > 0 || accessibleTableListeners.size() > 0 || @@ -1725,7 +1725,7 @@ public class Accessible { accessibleValueListeners.size() > 0 || getRelationCount() > 0 || (control instanceof Button && ((control.getStyle() & SWT.RADIO) != 0))) { if (objIAccessible2 == null) createIAccessible2(); - COM.MoveMemory(ppvObject, new int /*long*/[] { objIAccessible2.getAddress() }, OS.PTR_SIZEOF); + COM.MoveMemory(ppvObject, new long /*int*/[] { objIAccessible2.getAddress() }, OS.PTR_SIZEOF); AddRef(); return COM.S_OK; } @@ -1735,7 +1735,7 @@ public class Accessible { if (COM.IsEqualGUID(guid, COM.IIDIAccessibleAction)) { if (accessibleActionListeners.size() > 0) { if (objIAccessibleAction == null) createIAccessibleAction(); - COM.MoveMemory(ppvObject, new int /*long*/[] { objIAccessibleAction.getAddress() }, OS.PTR_SIZEOF); + COM.MoveMemory(ppvObject, new long /*int*/[] { objIAccessibleAction.getAddress() }, OS.PTR_SIZEOF); AddRef(); return COM.S_OK; } @@ -1744,7 +1744,7 @@ public class Accessible { if (COM.IsEqualGUID(guid, COM.IIDIAccessibleApplication)) { if (objIAccessibleApplication == null) createIAccessibleApplication(); - COM.MoveMemory(ppvObject, new int /*long*/[] { objIAccessibleApplication.getAddress() }, OS.PTR_SIZEOF); + COM.MoveMemory(ppvObject, new long /*int*/[] { objIAccessibleApplication.getAddress() }, OS.PTR_SIZEOF); AddRef(); return COM.S_OK; } @@ -1753,7 +1753,7 @@ public class Accessible { // The following lines are intentionally commented. We are not supporting IAccessibleComponent at this time. // if (accessibleControlListeners.size() > 0) { // TO DO: can we reduce the scope of this somehow? // if (objIAccessibleComponent == null) createIAccessibleComponent(); -// COM.MoveMemory(ppvObject, new int /*long*/[] { objIAccessibleComponent.getAddress() }, OS.PTR_SIZEOF); +// COM.MoveMemory(ppvObject, new long /*int*/[] { objIAccessibleComponent.getAddress() }, OS.PTR_SIZEOF); // AddRef(); // return COM.S_OK; // } @@ -1763,7 +1763,7 @@ public class Accessible { if (COM.IsEqualGUID(guid, COM.IIDIAccessibleEditableText)) { if (accessibleEditableTextListeners.size() > 0) { if (objIAccessibleEditableText == null) createIAccessibleEditableText(); - COM.MoveMemory(ppvObject, new int /*long*/[] { objIAccessibleEditableText.getAddress() }, OS.PTR_SIZEOF); + COM.MoveMemory(ppvObject, new long /*int*/[] { objIAccessibleEditableText.getAddress() }, OS.PTR_SIZEOF); AddRef(); return COM.S_OK; } @@ -1773,7 +1773,7 @@ public class Accessible { if (COM.IsEqualGUID(guid, COM.IIDIAccessibleHyperlink)) { if (accessibleHyperlinkListeners.size() > 0) { if (objIAccessibleHyperlink == null) createIAccessibleHyperlink(); - COM.MoveMemory(ppvObject, new int /*long*/[] { objIAccessibleHyperlink.getAddress() }, OS.PTR_SIZEOF); + COM.MoveMemory(ppvObject, new long /*int*/[] { objIAccessibleHyperlink.getAddress() }, OS.PTR_SIZEOF); AddRef(); return COM.S_OK; } @@ -1783,7 +1783,7 @@ public class Accessible { if (COM.IsEqualGUID(guid, COM.IIDIAccessibleHypertext)) { if (accessibleTextExtendedListeners.size() > 0) { if (objIAccessibleHypertext == null) createIAccessibleHypertext(); - COM.MoveMemory(ppvObject, new int /*long*/[] { objIAccessibleHypertext.getAddress() }, OS.PTR_SIZEOF); + COM.MoveMemory(ppvObject, new long /*int*/[] { objIAccessibleHypertext.getAddress() }, OS.PTR_SIZEOF); AddRef(); return COM.S_OK; } @@ -1794,7 +1794,7 @@ public class Accessible { // The following lines are intentionally commented. We are not supporting IAccessibleImage at this time. // if (getRole() == ACC.ROLE_GRAPHIC && (accessibleListeners.size() > 0 || accessibleControlListeners.size() > 0)) { // if (objIAccessibleImage == null) createIAccessibleImage(); -// COM.MoveMemory(ppvObject, new int /*long*/[] { objIAccessibleImage.getAddress() }, OS.PTR_SIZEOF); +// COM.MoveMemory(ppvObject, new long /*int*/[] { objIAccessibleImage.getAddress() }, OS.PTR_SIZEOF); // AddRef(); // return COM.S_OK; // } @@ -1809,7 +1809,7 @@ public class Accessible { if (COM.IsEqualGUID(guid, COM.IIDIAccessibleTable2)) { if (accessibleTableListeners.size() > 0) { if (objIAccessibleTable2 == null) createIAccessibleTable2(); - COM.MoveMemory(ppvObject, new int /*long*/[] { objIAccessibleTable2.getAddress() }, OS.PTR_SIZEOF); + COM.MoveMemory(ppvObject, new long /*int*/[] { objIAccessibleTable2.getAddress() }, OS.PTR_SIZEOF); AddRef(); return COM.S_OK; } @@ -1819,7 +1819,7 @@ public class Accessible { if (COM.IsEqualGUID(guid, COM.IIDIAccessibleTableCell)) { if (accessibleTableCellListeners.size() > 0) { if (objIAccessibleTableCell == null) createIAccessibleTableCell(); - COM.MoveMemory(ppvObject, new int /*long*/[] { objIAccessibleTableCell.getAddress() }, OS.PTR_SIZEOF); + COM.MoveMemory(ppvObject, new long /*int*/[] { objIAccessibleTableCell.getAddress() }, OS.PTR_SIZEOF); AddRef(); return COM.S_OK; } @@ -1829,7 +1829,7 @@ public class Accessible { if (COM.IsEqualGUID(guid, COM.IIDIAccessibleText)) { if (accessibleTextExtendedListeners.size() > 0 /* || accessibleAttributeListeners.size() > 0*/) { if (objIAccessibleText == null) createIAccessibleText(); - COM.MoveMemory(ppvObject, new int /*long*/[] { objIAccessibleText.getAddress() }, OS.PTR_SIZEOF); + COM.MoveMemory(ppvObject, new long /*int*/[] { objIAccessibleText.getAddress() }, OS.PTR_SIZEOF); AddRef(); return COM.S_OK; } @@ -1839,7 +1839,7 @@ public class Accessible { if (COM.IsEqualGUID(guid, COM.IIDIAccessibleValue)) { if (accessibleValueListeners.size() > 0) { if (objIAccessibleValue == null) createIAccessibleValue(); - COM.MoveMemory(ppvObject, new int /*long*/[] { objIAccessibleValue.getAddress() }, OS.PTR_SIZEOF); + COM.MoveMemory(ppvObject, new long /*int*/[] { objIAccessibleValue.getAddress() }, OS.PTR_SIZEOF); AddRef(); return COM.S_OK; } @@ -1850,7 +1850,7 @@ public class Accessible { } /* IAccessible::accDoDefaultAction([in] varChild) */ - int accDoDefaultAction(int /*long*/ varChild) { + int accDoDefaultAction(long /*int*/ varChild) { if (DEBUG) print(this + ".IAccessible::accDoDefaultAction"); if (accessibleActionListeners.size() > 0) { VARIANT v = getVARIANT(varChild); @@ -1867,9 +1867,9 @@ public class Accessible { } /* IAccessible::accHitTest([in] xLeft, [in] yTop, [out] pvarChild) */ - int accHitTest(int xLeft, int yTop, int /*long*/ pvarChild) { + int accHitTest(int xLeft, int yTop, long /*int*/ pvarChild) { int osChild = ACC.CHILDID_NONE; - int /*long*/ osChildObject = 0; + long /*int*/ osChildObject = 0; if (iaccessible != null) { /* Get the default child at point (left, top) from the OS. */ int code = iaccessible.accHitTest(xLeft, yTop, pvarChild); @@ -1919,7 +1919,7 @@ public class Accessible { } /* IAccessible::accLocation([out] pxLeft, [out] pyTop, [out] pcxWidth, [out] pcyHeight, [in] varChild) */ - int accLocation(int /*long*/ pxLeft, int /*long*/ pyTop, int /*long*/ pcxWidth, int /*long*/ pcyHeight, int /*long*/ varChild) { + int accLocation(long /*int*/ pxLeft, long /*int*/ pyTop, long /*int*/ pcxWidth, long /*int*/ pcyHeight, long /*int*/ varChild) { VARIANT v = getVARIANT(varChild); if (v.vt != COM.VT_I4) return COM.E_INVALIDARG; int osLeft = 0, osTop = 0, osWidth = 0, osHeight = 0; @@ -1960,7 +1960,7 @@ public class Accessible { } /* IAccessible::accNavigate([in] navDir, [in] varStart, [out] pvarEndUpAt) */ - int accNavigate(int navDir, int /*long*/ varStart, int /*long*/ pvarEndUpAt) { + int accNavigate(int navDir, long /*int*/ varStart, long /*int*/ pvarEndUpAt) { if (DEBUG) print(this + ".IAccessible::accNavigate"); /* MSAA: "The accNavigate method is deprecated and should not be used." */ int code = COM.DISP_E_MEMBERNOTFOUND; @@ -1975,7 +1975,7 @@ public class Accessible { // TODO: Consider supporting this in future. /* IAccessible::accSelect([in] flagsSelect, [in] varChild) */ - int accSelect(int flagsSelect, int /*long*/ varChild) { + int accSelect(int flagsSelect, long /*int*/ varChild) { int code = COM.DISP_E_MEMBERNOTFOUND; if (iaccessible != null) { /* Currently, we don't expose this as API. Forward to the proxy. */ @@ -1990,13 +1990,13 @@ public class Accessible { * Ownership of ppdispChild transfers from callee to caller so reference count on ppdispChild * must be incremented before returning. The caller is responsible for releasing ppdispChild. */ - int get_accChild(int /*long*/ varChild, int /*long*/ ppdispChild) { + int get_accChild(long /*int*/ varChild, long /*int*/ ppdispChild) { VARIANT v = getVARIANT(varChild); if (v.vt != COM.VT_I4) return COM.E_INVALIDARG; if (v.lVal == COM.CHILDID_SELF) { if (DEBUG) print(this + ".IAccessible::get_accChild(" + v.lVal + ") returning " + getAddress() + hresult(COM.S_OK)); AddRef(); - COM.MoveMemory(ppdispChild, new int /*long*/[] { getAddress() }, OS.PTR_SIZEOF); + COM.MoveMemory(ppdispChild, new long /*int*/[] { getAddress() }, OS.PTR_SIZEOF); return COM.S_OK; } final int childID = osToChildID(v.lVal); @@ -2010,7 +2010,7 @@ public class Accessible { ToolBar toolBar = (ToolBar) control; final ToolItem item = toolBar.getItem(childID); if (item != null && (item.getStyle() & SWT.DROP_DOWN) != 0) { - int /*long*/[] addr = new int /*long*/[1]; + long /*int*/[] addr = new long /*int*/[1]; COM.MoveMemory(addr, ppdispChild, OS.PTR_SIZEOF); boolean found = false; for (int i = 0; i < children.size(); i++) { @@ -2068,7 +2068,7 @@ public class Accessible { if (accessible != null) { if (DEBUG) print(this + ".IAccessible::get_accChild(" + v.lVal + ") returning " + accessible.getAddress() + hresult(COM.S_OK)); accessible.AddRef(); - COM.MoveMemory(ppdispChild, new int /*long*/[] { accessible.getAddress() }, OS.PTR_SIZEOF); + COM.MoveMemory(ppdispChild, new long /*int*/[] { accessible.getAddress() }, OS.PTR_SIZEOF); return COM.S_OK; } if (DEBUG) print(this + ".IAccessible::get_accChild(" + v.lVal + ") returning from super" + hresult(code)); @@ -2076,7 +2076,7 @@ public class Accessible { } /* IAccessible::get_accChildCount([out] pcountChildren) */ - int get_accChildCount(int /*long*/ pcountChildren) { + int get_accChildCount(long /*int*/ pcountChildren) { int osChildCount = 0; if (iaccessible != null) { /* Get the default child count from the OS. */ @@ -2105,7 +2105,7 @@ public class Accessible { } /* IAccessible::get_accDefaultAction([in] varChild, [out] pszDefaultAction) */ - int get_accDefaultAction(int /*long*/ varChild, int /*long*/ pszDefaultAction) { + int get_accDefaultAction(long /*int*/ varChild, long /*int*/ pszDefaultAction) { if (DEBUG) print(this + ".IAccessible::get_accDefaultAction"); VARIANT v = getVARIANT(varChild); if (v.vt != COM.VT_I4) return COM.E_INVALIDARG; @@ -2117,7 +2117,7 @@ public class Accessible { if (code == COM.E_INVALIDARG) code = COM.S_FALSE; // proxy doesn't know about app childID if (accessibleControlListeners.size() == 0) return code; if (code == COM.S_OK) { - int /*long*/[] pDefaultAction = new int /*long*/[1]; + long /*int*/[] pDefaultAction = new long /*int*/[1]; COM.MoveMemory(pDefaultAction, pszDefaultAction, OS.PTR_SIZEOF); int size = COM.SysStringByteLen(pDefaultAction[0]); if (size > 0) { @@ -2145,7 +2145,7 @@ public class Accessible { } /* IAccessible::get_accDescription([in] varChild, [out] pszDescription) */ - int get_accDescription(int /*long*/ varChild, int /*long*/ pszDescription) { + int get_accDescription(long /*int*/ varChild, long /*int*/ pszDescription) { if (DEBUG) print(this + ".IAccessible::get_accDescription"); /* * MSAA: "The accDescription property is not supported in the transition to @@ -2168,7 +2168,7 @@ public class Accessible { // TEMPORARY CODE - process tree even if there are no apps listening if (accessibleListeners.size() == 0 && !(control instanceof Tree)) return code; if (code == COM.S_OK) { - int /*long*/[] pDescription = new int /*long*/[1]; + long /*int*/[] pDescription = new long /*int*/[1]; COM.MoveMemory(pDescription, pszDescription, OS.PTR_SIZEOF); int size = COM.SysStringByteLen(pDescription[0]); if (size > 0) { @@ -2192,7 +2192,7 @@ public class Accessible { Tree tree = (Tree) control; int columnCount = tree.getColumnCount (); if (columnCount > 1) { - int /*long*/ hwnd = control.handle, hItem = 0; + long /*int*/ hwnd = control.handle, hItem = 0; if (OS.COMCTL32_MAJOR >= 6) { hItem = OS.SendMessage (hwnd, OS.TVM_MAPACCIDTOHTREEITEM, v.lVal, 0); } else { @@ -2224,7 +2224,7 @@ public class Accessible { * Ownership of pvarChild transfers from callee to caller so reference count on pvarChild * must be incremented before returning. The caller is responsible for releasing pvarChild. */ - int get_accFocus(int /*long*/ pvarChild) { + int get_accFocus(long /*int*/ pvarChild) { int osChild = ACC.CHILDID_NONE; if (iaccessible != null) { /* Get the default focus child from the OS. */ @@ -2272,7 +2272,7 @@ public class Accessible { } /* IAccessible::get_accHelp([in] varChild, [out] pszHelp) */ - int get_accHelp(int /*long*/ varChild, int /*long*/ pszHelp) { + int get_accHelp(long /*int*/ varChild, long /*int*/ pszHelp) { if (DEBUG) print(this + ".IAccessible::get_accHelp"); VARIANT v = getVARIANT(varChild); if (v.vt != COM.VT_I4) return COM.E_INVALIDARG; @@ -2284,7 +2284,7 @@ public class Accessible { if (code == COM.E_INVALIDARG) code = COM.S_FALSE; // proxy doesn't know about app childID if (accessibleListeners.size() == 0) return code; if (code == COM.S_OK) { - int /*long*/[] pHelp = new int /*long*/[1]; + long /*int*/[] pHelp = new long /*int*/[1]; COM.MoveMemory(pHelp, pszHelp, OS.PTR_SIZEOF); int size = COM.SysStringByteLen(pHelp[0]); if (size > 0) { @@ -2309,7 +2309,7 @@ public class Accessible { } /* IAccessible::get_accHelpTopic([out] pszHelpFile, [in] varChild, [out] pidTopic) */ - int get_accHelpTopic(int /*long*/ pszHelpFile, int /*long*/ varChild, int /*long*/ pidTopic) { + int get_accHelpTopic(long /*int*/ pszHelpFile, long /*int*/ varChild, long /*int*/ pidTopic) { if (DEBUG) print(this + ".IAccessible::get_accHelpTopic"); /* MSAA: "The accHelpTopic property is deprecated and should not be used." */ int code = COM.DISP_E_MEMBERNOTFOUND; @@ -2323,7 +2323,7 @@ public class Accessible { } /* IAccessible::get_accKeyboardShortcut([in] varChild, [out] pszKeyboardShortcut) */ - int get_accKeyboardShortcut(int /*long*/ varChild, int /*long*/ pszKeyboardShortcut) { + int get_accKeyboardShortcut(long /*int*/ varChild, long /*int*/ pszKeyboardShortcut) { if (DEBUG) print(this + ".IAccessible::get_accKeyboardShortcut"); VARIANT v = getVARIANT(varChild); if (v.vt != COM.VT_I4) return COM.E_INVALIDARG; @@ -2336,7 +2336,7 @@ public class Accessible { /* Process TabFolder even if there are no apps listening. */ if (accessibleListeners.size() == 0 && !(control instanceof TabFolder)) return code; if (code == COM.S_OK) { - int /*long*/[] pKeyboardShortcut = new int /*long*/[1]; + long /*int*/[] pKeyboardShortcut = new long /*int*/[1]; COM.MoveMemory(pKeyboardShortcut, pszKeyboardShortcut, OS.PTR_SIZEOF); int size = COM.SysStringByteLen(pKeyboardShortcut[0]); if (size > 0) { @@ -2365,7 +2365,7 @@ public class Accessible { } /* IAccessible::get_accName([in] varChild, [out] pszName) */ - int get_accName(int /*long*/ varChild, int /*long*/ pszName) { + int get_accName(long /*int*/ varChild, long /*int*/ pszName) { VARIANT v = getVARIANT(varChild); if (v.vt != COM.VT_I4) return COM.E_INVALIDARG; int code = COM.S_FALSE; @@ -2374,7 +2374,7 @@ public class Accessible { /* Get the default name from the OS. */ code = iaccessible.get_accName(varChild, pszName); if (code == COM.S_OK) { - int /*long*/[] pName = new int /*long*/[1]; + long /*int*/[] pName = new long /*int*/[1]; COM.MoveMemory(pName, pszName, OS.PTR_SIZEOF); int size = COM.SysStringByteLen(pName[0]); if (size > 0) { @@ -2418,7 +2418,7 @@ public class Accessible { * Ownership of ppdispParent transfers from callee to caller so reference count on ppdispParent * must be incremented before returning. The caller is responsible for releasing ppdispParent. */ - int get_accParent(int /*long*/ ppdispParent) { + int get_accParent(long /*int*/ ppdispParent) { int code = COM.DISP_E_MEMBERNOTFOUND; if (iaccessible != null) { /* Currently, we don't expose this as API. Forward to the proxy. */ @@ -2427,7 +2427,7 @@ public class Accessible { if (parent != null) { /* For lightweight accessibles, return the accessible's parent. */ parent.AddRef(); - COM.MoveMemory(ppdispParent, new int /*long*/[] { parent.getAddress() }, OS.PTR_SIZEOF); + COM.MoveMemory(ppdispParent, new long /*int*/[] { parent.getAddress() }, OS.PTR_SIZEOF); code = COM.S_OK; } if (DEBUG) print(this + ".IAccessible::get_accParent() returning" + (parent != null ? " " + parent.getAddress() : " from super") + hresult(code)); @@ -2435,7 +2435,7 @@ public class Accessible { } /* IAccessible::get_accRole([in] varChild, [out] pvarRole) */ - int get_accRole(int /*long*/ varChild, int /*long*/ pvarRole) { + int get_accRole(long /*int*/ varChild, long /*int*/ pvarRole) { VARIANT v = getVARIANT(varChild); if (v.vt != COM.VT_I4) return COM.E_INVALIDARG; int osRole = COM.ROLE_SYSTEM_CLIENT; @@ -2470,10 +2470,10 @@ public class Accessible { * Ownership of pvarChildren transfers from callee to caller so reference count on pvarChildren * must be incremented before returning. The caller is responsible for releasing pvarChildren. */ - int get_accSelection(int /*long*/ pvarChildren) { + int get_accSelection(long /*int*/ pvarChildren) { if (DEBUG) print(this + ".IAccessible::get_accSelection"); int osChild = ACC.CHILDID_NONE; - int /*long*/ osChildObject = 0; + long /*int*/ osChildObject = 0; if (iaccessible != null) { /* Get the default selection from the OS. */ int code = iaccessible.get_accSelection(pvarChildren); @@ -2525,7 +2525,7 @@ public class Accessible { } /* IAccessible::get_accState([in] varChild, [out] pvarState) */ - int get_accState(int /*long*/ varChild, int /*long*/ pvarState) { + int get_accState(long /*int*/ varChild, long /*int*/ pvarState) { VARIANT v = getVARIANT(varChild); if (v.vt != COM.VT_I4) return COM.E_INVALIDARG; int osState = 0; @@ -2547,7 +2547,7 @@ public class Accessible { * images, so we need to determine if the item state is 'checked'. */ if (v.lVal != COM.CHILDID_SELF) { if (control instanceof Tree && (control.getStyle() & SWT.CHECK) != 0) { - int /*long*/ hwnd = control.handle; + long /*int*/ hwnd = control.handle; TVITEM tvItem = new TVITEM (); tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_STATE; tvItem.stateMask = OS.TVIS_STATEIMAGEMASK; @@ -2556,7 +2556,7 @@ public class Accessible { } else { tvItem.hItem = v.lVal; } - int /*long*/ result = OS.SendMessage (hwnd, OS.TVM_GETITEM, 0, tvItem); + long /*int*/ result = OS.SendMessage (hwnd, OS.TVM_GETITEM, 0, tvItem); boolean checked = (result != 0) && (((tvItem.state >> 12) & 1) == 0); if (checked) event.detail |= ACC.STATE_CHECKED; grayed = tvItem.state >> 12 > 2; @@ -2585,7 +2585,7 @@ public class Accessible { } /* IAccessible::get_accValue([in] varChild, [out] pszValue) */ - int get_accValue(int /*long*/ varChild, int /*long*/ pszValue) { + int get_accValue(long /*int*/ varChild, long /*int*/ pszValue) { VARIANT v = getVARIANT(varChild); if (v.vt != COM.VT_I4) return COM.E_INVALIDARG; int code = COM.DISP_E_MEMBERNOTFOUND; @@ -2594,7 +2594,7 @@ public class Accessible { /* Get the default value string from the OS. */ code = iaccessible.get_accValue(varChild, pszValue); if (code == COM.S_OK) { - int /*long*/[] pValue = new int /*long*/[1]; + long /*int*/[] pValue = new long /*int*/[1]; COM.MoveMemory(pValue, pszValue, OS.PTR_SIZEOF); int size = COM.SysStringByteLen(pValue[0]); if (size > 0) { @@ -2635,13 +2635,13 @@ public class Accessible { } /* put_accName([in] varChild, [in] szName) */ - int put_accName(int /*long*/ varChild, int /*long*/ szName) { + int put_accName(long /*int*/ varChild, long /*int*/ szName) { /* MSAA: "The IAccessible::put_accName method is no longer supported. Servers should return E_NOTIMPL." */ return COM.E_NOTIMPL; } /* put_accValue([in] varChild, [in] szValue) */ - int put_accValue(int /*long*/ varChild, int /*long*/ szValue) { + int put_accValue(long /*int*/ varChild, long /*int*/ szValue) { /* MSAA: this method is supported for some UI elements (usually edit controls). */ VARIANT v = getVARIANT(varChild); if (v.vt != COM.VT_I4) return COM.E_INVALIDARG; @@ -2688,13 +2688,13 @@ public class Accessible { * Ownership of rgvar transfers from callee to caller so reference count on rgvar * must be incremented before returning. The caller is responsible for releasing rgvar. */ - int Next(int celt, int /*long*/ rgvar, int /*long*/ pceltFetched) { + int Next(int celt, long /*int*/ rgvar, long /*int*/ pceltFetched) { if (DEBUG) print(this + ".IEnumVARIANT::Next"); /* If there are no listeners, query the proxy for * its IEnumVariant, and get the Next items from it. */ if (iaccessible != null && accessibleControlListeners.size() == 0) { - int /*long*/[] ppvObject = new int /*long*/[1]; + long /*int*/[] ppvObject = new long /*int*/[1]; int code = iaccessible.QueryInterface(COM.IIDIEnumVARIANT, ppvObject); if (code != COM.S_OK) return code; IEnumVARIANT ienumvariant = new IEnumVARIANT(ppvObject[0]); @@ -2762,7 +2762,7 @@ public class Accessible { * for its IEnumVariant, and tell it to Skip. */ if (iaccessible != null && accessibleControlListeners.size() == 0) { - int /*long*/[] ppvObject = new int /*long*/[1]; + long /*int*/[] ppvObject = new long /*int*/[1]; int code = iaccessible.QueryInterface(COM.IIDIEnumVARIANT, ppvObject); if (code != COM.S_OK) return code; IEnumVARIANT ienumvariant = new IEnumVARIANT(ppvObject[0]); @@ -2787,7 +2787,7 @@ public class Accessible { * for its IEnumVariant, and tell it to Reset. */ if (iaccessible != null && accessibleControlListeners.size() == 0) { - int /*long*/[] ppvObject = new int /*long*/[1]; + long /*int*/[] ppvObject = new long /*int*/[1]; int code = (int)/*64*/iaccessible.QueryInterface(COM.IIDIEnumVARIANT, ppvObject); if (code != COM.S_OK) return code; IEnumVARIANT ienumvariant = new IEnumVARIANT(ppvObject[0]); @@ -2804,17 +2804,17 @@ public class Accessible { * Ownership of ppEnum transfers from callee to caller so reference count on ppEnum * must be incremented before returning. The caller is responsible for releasing ppEnum. */ - int Clone(int /*long*/ ppEnum) { + int Clone(long /*int*/ ppEnum) { if (DEBUG) print(this + ".IEnumVARIANT::Clone"); /* If there are no listeners, query the proxy for * its IEnumVariant, and get the Clone from it. */ if (iaccessible != null && accessibleControlListeners.size() == 0) { - int /*long*/[] ppvObject = new int /*long*/[1]; + long /*int*/[] ppvObject = new long /*int*/[1]; int code = iaccessible.QueryInterface(COM.IIDIEnumVARIANT, ppvObject); if (code != COM.S_OK) return code; IEnumVARIANT ienumvariant = new IEnumVARIANT(ppvObject[0]); - int /*long*/ [] pEnum = new int /*long*/ [1]; + long /*int*/ [] pEnum = new long /*int*/ [1]; code = ienumvariant.Clone(pEnum); ienumvariant.Release(); COM.MoveMemory(ppEnum, pEnum, OS.PTR_SIZEOF); @@ -2822,13 +2822,13 @@ public class Accessible { } if (ppEnum == 0) return COM.E_INVALIDARG; - COM.MoveMemory(ppEnum, new int /*long*/[] { objIEnumVARIANT.getAddress() }, OS.PTR_SIZEOF); + COM.MoveMemory(ppEnum, new long /*int*/[] { objIEnumVARIANT.getAddress() }, OS.PTR_SIZEOF); AddRef(); return COM.S_OK; } /* IAccessible2::get_nRelations([out] pNRelations) */ - int get_nRelations(int /*long*/ pNRelations) { + int get_nRelations(long /*int*/ pNRelations) { int count = getRelationCount(); if (DEBUG) print(this + ".IAccessible2::get_nRelations returning " + count + hresult(COM.S_OK)); COM.MoveMemory(pNRelations, new int [] { count }, 4); @@ -2836,7 +2836,7 @@ public class Accessible { } /* IAccessible2::get_relation([in] relationIndex, [out] ppRelation) */ - int get_relation(int relationIndex, int /*long*/ ppRelation) { + int get_relation(int relationIndex, long /*int*/ ppRelation) { int i = -1; for (int type = 0; type < MAX_RELATION_TYPES; type++) { Relation relation = (Relation)relations[type]; @@ -2844,7 +2844,7 @@ public class Accessible { if (i == relationIndex) { if (DEBUG) print(this + ".IAccessible2::get_relation(" + relationIndex + ") returning " + relation.getAddress() + hresult(COM.S_OK)); relation.AddRef(); - COM.MoveMemory(ppRelation, new int /*long*/[] { relation.getAddress() }, OS.PTR_SIZEOF); + COM.MoveMemory(ppRelation, new long /*int*/[] { relation.getAddress() }, OS.PTR_SIZEOF); return COM.S_OK; } } @@ -2853,14 +2853,14 @@ public class Accessible { } /* IAccessible2::get_relations([in] maxRelations, [out] ppRelations, [out] pNRelations) */ - int get_relations(int maxRelations, int /*long*/ ppRelations, int /*long*/ pNRelations) { + int get_relations(int maxRelations, long /*int*/ ppRelations, long /*int*/ pNRelations) { int count = 0; for (int type = 0; type < MAX_RELATION_TYPES; type++) { if (count == maxRelations) break; Relation relation = (Relation)relations[type]; if (relation != null) { relation.AddRef(); - COM.MoveMemory(ppRelations + count * OS.PTR_SIZEOF, new int /*long*/[] { relation.getAddress() }, OS.PTR_SIZEOF); + COM.MoveMemory(ppRelations + count * OS.PTR_SIZEOF, new long /*int*/[] { relation.getAddress() }, OS.PTR_SIZEOF); count++; } } @@ -2870,7 +2870,7 @@ public class Accessible { } /* IAccessible2::get_role([out] pRole) */ - int get_role(int /*long*/ pRole) { + int get_role(long /*int*/ pRole) { int role = getRole(); if (role == 0) role = getDefaultRole(); if (DEBUG) print(this + ".IAccessible2::get_role() returning " + getRoleString(role) + hresult(COM.S_OK)); @@ -2893,7 +2893,7 @@ public class Accessible { } /* IAccessible2::get_groupPosition([out] pGroupLevel, [out] pSimilarItemsInGroup, [out] pPositionInGroup) */ - int get_groupPosition(int /*long*/ pGroupLevel, int /*long*/ pSimilarItemsInGroup, int /*long*/ pPositionInGroup) { + int get_groupPosition(long /*int*/ pGroupLevel, long /*int*/ pSimilarItemsInGroup, long /*int*/ pPositionInGroup) { // TODO: handle where possible - maybe add AccessibleGroup later //get the role //if it has role tree, then the level is the value else 0 (for N/A) @@ -2925,7 +2925,7 @@ public class Accessible { } /* IAccessible2::get_states([out] pStates) */ - int get_states(int /*long*/ pStates) { + int get_states(long /*int*/ pStates) { AccessibleControlEvent event = new AccessibleControlEvent(this); event.childID = ACC.CHILDID_SELF; for (int i = 0; i < accessibleControlListeners.size(); i++) { @@ -2954,28 +2954,28 @@ public class Accessible { } /* IAccessible2::get_extendedRole([out] pbstrExtendedRole) */ - int get_extendedRole(int /*long*/ pbstrExtendedRole) { + int get_extendedRole(long /*int*/ pbstrExtendedRole) { /* This feature is not supported. */ setString(pbstrExtendedRole, null); return COM.S_FALSE; } /* IAccessible2::get_localizedExtendedRole([out] pbstrLocalizedExtendedRole) */ - int get_localizedExtendedRole(int /*long*/ pbstrLocalizedExtendedRole) { + int get_localizedExtendedRole(long /*int*/ pbstrLocalizedExtendedRole) { /* This feature is not supported. */ setString(pbstrLocalizedExtendedRole, null); return COM.S_FALSE; } /* IAccessible2::get_nExtendedStates([out] pNExtendedStates) */ - int get_nExtendedStates(int /*long*/ pNExtendedStates) { + int get_nExtendedStates(long /*int*/ pNExtendedStates) { /* This feature is not supported. */ COM.MoveMemory(pNExtendedStates, new int [] { 0 }, 4); return COM.S_OK; } /* IAccessible2::get_extendedStates([in] maxExtendedStates, [out] ppbstrExtendedStates, [out] pNExtendedStates) */ - int get_extendedStates(int maxExtendedStates, int /*long*/ ppbstrExtendedStates, int /*long*/ pNExtendedStates) { + int get_extendedStates(int maxExtendedStates, long /*int*/ ppbstrExtendedStates, long /*int*/ pNExtendedStates) { /* This feature is not supported. */ setString(ppbstrExtendedStates, null); COM.MoveMemory(pNExtendedStates, new int [] { 0 }, 4); @@ -2983,7 +2983,7 @@ public class Accessible { } /* IAccessible2::get_localizedExtendedStates([in] maxLocalizedExtendedStates, [out] ppbstrLocalizedExtendedStates, [out] pNLocalizedExtendedStates) */ - int get_localizedExtendedStates(int maxLocalizedExtendedStates, int /*long*/ ppbstrLocalizedExtendedStates, int /*long*/ pNLocalizedExtendedStates) { + int get_localizedExtendedStates(int maxLocalizedExtendedStates, long /*int*/ ppbstrLocalizedExtendedStates, long /*int*/ pNLocalizedExtendedStates) { /* This feature is not supported. */ setString(ppbstrLocalizedExtendedStates, null); COM.MoveMemory(pNLocalizedExtendedStates, new int [] { 0 }, 4); @@ -2991,22 +2991,22 @@ public class Accessible { } /* IAccessible2::get_uniqueID([out] pUniqueID) */ - int get_uniqueID(int /*long*/ pUniqueID) { + int get_uniqueID(long /*int*/ pUniqueID) { if (uniqueID == -1) uniqueID = UniqueID--; if (DEBUG) print(this + ".IAccessible2::get_uniqueID returning " + uniqueID + hresult(COM.S_OK)); - COM.MoveMemory(pUniqueID, new int /*long*/ [] { uniqueID }, 4); + COM.MoveMemory(pUniqueID, new long /*int*/ [] { uniqueID }, 4); return COM.S_OK; } /* IAccessible2::get_windowHandle([out] pWindowHandle) */ - int get_windowHandle(int /*long*/ pWindowHandle) { + int get_windowHandle(long /*int*/ pWindowHandle) { if (DEBUG) print(this + ".IAccessible2::get_windowHandle returning " + control.handle + hresult(COM.S_OK)); - COM.MoveMemory(pWindowHandle, new int /*long*/ [] { control.handle }, OS.PTR_SIZEOF); + COM.MoveMemory(pWindowHandle, new long /*int*/ [] { control.handle }, OS.PTR_SIZEOF); return COM.S_OK; } /* IAccessible2::get_indexInParent([out] pIndexInParent) */ - int get_indexInParent(int /*long*/ pIndexInParent) { + int get_indexInParent(long /*int*/ pIndexInParent) { AccessibleControlEvent event = new AccessibleControlEvent(this); event.childID = ACC.CHILDID_CHILD_INDEX; event.detail = -1; @@ -3024,20 +3024,20 @@ public class Accessible { // */ // // TODO: finish this. See also get_groupPosition // this won't work because VARIANT.sizeof isn't big enough on 64-bit machines. - // just create an int /*long*/ [] ppdispParent - it's not a variant anyhow... -// int /*long*/ ppdispParent = OS.GlobalAlloc (OS.GMEM_FIXED | OS.GMEM_ZEROINIT, VARIANT.sizeof); + // just create an long /*int*/ [] ppdispParent - it's not a variant anyhow... +// long /*int*/ ppdispParent = OS.GlobalAlloc (OS.GMEM_FIXED | OS.GMEM_ZEROINIT, VARIANT.sizeof); // int code = get_accParent(ppdispParent); // if (code == COM.S_OK) { // VARIANT v = getVARIANT(ppdispParent); // if (v.vt == COM.VT_DISPATCH) { // IAccessible accParent = new IAccessible(v.lVal); -// int /*long*/ pcountChildren = OS.GlobalAlloc (OS.GMEM_FIXED | OS.GMEM_ZEROINIT, 4); +// long /*int*/ pcountChildren = OS.GlobalAlloc (OS.GMEM_FIXED | OS.GMEM_ZEROINIT, 4); // code = accParent.get_accChildCount(pcountChildren); // if (code == COM.S_OK) { // int [] childCount = new int[1]; // OS.MoveMemory(childCount, pcountChildren, 4); // int[] pcObtained = new int[1]; -// int /*long*/ rgVarChildren = OS.GlobalAlloc (OS.GMEM_FIXED | OS.GMEM_ZEROINIT, VARIANT.sizeof * childCount[0]); +// long /*int*/ rgVarChildren = OS.GlobalAlloc (OS.GMEM_FIXED | OS.GMEM_ZEROINIT, VARIANT.sizeof * childCount[0]); // System.out.println("Asking for AccessibleChildren"); // code = COM.AccessibleChildren(accParent.getAddress(), 0, childCount[0], rgVarChildren, pcObtained); // if (code == COM.S_OK) { @@ -3066,28 +3066,28 @@ public class Accessible { } /* IAccessible2::get_locale([out] pLocale) */ - int get_locale(int /*long*/ pLocale) { + int get_locale(long /*int*/ pLocale) { /* Return the default locale for the JVM. */ Locale locale = Locale.getDefault(); char[] data = (locale.getLanguage()+"\0").toCharArray(); - int /*long*/ ptr = COM.SysAllocString(data); - COM.MoveMemory(pLocale, new int /*long*/[] {ptr}, OS.PTR_SIZEOF); + long /*int*/ ptr = COM.SysAllocString(data); + COM.MoveMemory(pLocale, new long /*int*/[] {ptr}, OS.PTR_SIZEOF); data = (locale.getCountry()+"\0").toCharArray(); ptr = COM.SysAllocString(data); - COM.MoveMemory(pLocale + OS.PTR_SIZEOF, new int /*long*/[] {ptr}, OS.PTR_SIZEOF); + COM.MoveMemory(pLocale + OS.PTR_SIZEOF, new long /*int*/[] {ptr}, OS.PTR_SIZEOF); data = (locale.getVariant()+"\0").toCharArray(); ptr = COM.SysAllocString(data); - COM.MoveMemory(pLocale + 2 * OS.PTR_SIZEOF, new int /*long*/[] {ptr}, OS.PTR_SIZEOF); + COM.MoveMemory(pLocale + 2 * OS.PTR_SIZEOF, new long /*int*/[] {ptr}, OS.PTR_SIZEOF); if (DEBUG) print(this + ".IAccessible2::get_locale() returning" + hresult(COM.S_OK)); return COM.S_OK; } /* IAccessible2::get_attributes([out] pbstrAttributes) */ - int get_attributes(int /*long*/ pbstrAttributes) { + int get_attributes(long /*int*/ pbstrAttributes) { AccessibleAttributeEvent event = new AccessibleAttributeEvent(this); for (int i = 0; i < accessibleAttributeListeners.size(); i++) { AccessibleAttributeListener listener = (AccessibleAttributeListener) accessibleAttributeListeners.elementAt(i); @@ -3123,7 +3123,7 @@ public class Accessible { } /* IAccessibleAction::get_nActions([out] pNActions) */ - int get_nActions(int /*long*/ pNActions) { + int get_nActions(long /*int*/ pNActions) { AccessibleActionEvent event = new AccessibleActionEvent(this); for (int i = 0; i < accessibleActionListeners.size(); i++) { AccessibleActionListener listener = (AccessibleActionListener) accessibleActionListeners.elementAt(i); @@ -3148,7 +3148,7 @@ public class Accessible { } /* IAccessibleAction::get_description([in] actionIndex, [out] pbstrDescription) */ - int get_description(int actionIndex, int /*long*/ pbstrDescription) { + int get_description(int actionIndex, long /*int*/ pbstrDescription) { AccessibleActionEvent event = new AccessibleActionEvent(this); event.index = actionIndex; for (int i = 0; i < accessibleActionListeners.size(); i++) { @@ -3162,7 +3162,7 @@ public class Accessible { } /* IAccessibleAction::get_keyBinding([in] actionIndex, [in] nMaxBindings, [out] ppbstrKeyBindings, [out] pNBindings) */ - int get_keyBinding(int actionIndex, int nMaxBindings, int /*long*/ ppbstrKeyBindings, int /*long*/ pNBindings) { + int get_keyBinding(int actionIndex, int nMaxBindings, long /*int*/ ppbstrKeyBindings, long /*int*/ pNBindings) { AccessibleActionEvent event = new AccessibleActionEvent(this); event.index = actionIndex; for (int i = 0; i < accessibleActionListeners.size(); i++) { @@ -3194,7 +3194,7 @@ public class Accessible { } /* IAccessibleAction::get_name([in] actionIndex, [out] pbstrName) */ - int get_name(int actionIndex, int /*long*/ pbstrName) { + int get_name(int actionIndex, long /*int*/ pbstrName) { AccessibleActionEvent event = new AccessibleActionEvent(this); event.index = actionIndex; event.localized = false; @@ -3212,7 +3212,7 @@ public class Accessible { } /* IAccessibleAction::get_localizedName([in] actionIndex, [out] pbstrLocalizedName) */ - int get_localizedName(int actionIndex, int /*long*/ pbstrLocalizedName) { + int get_localizedName(int actionIndex, long /*int*/ pbstrLocalizedName) { AccessibleActionEvent event = new AccessibleActionEvent(this); event.index = actionIndex; event.localized = true; @@ -3230,7 +3230,7 @@ public class Accessible { } /* IAccessibleApplication::get_appName([out] pbstrName) */ - int get_appName(int /*long*/ pbstrName) { + int get_appName(long /*int*/ pbstrName) { String appName = Display.getAppName(); if (DEBUG) print(this + ".IAccessibleApplication::get_appName() returning " + appName + hresult(appName == null || appName.length() == 0 ? COM.S_FALSE : COM.S_OK)); if (appName == null || appName.length() == 0) { @@ -3242,7 +3242,7 @@ public class Accessible { } /* IAccessibleApplication::get_appVersion([out] pbstrVersion) */ - int get_appVersion(int /*long*/ pbstrVersion) { + int get_appVersion(long /*int*/ pbstrVersion) { String appVersion = Display.getAppVersion(); if (DEBUG) print(this + ".IAccessibleApplication::get_appVersion() returning" + appVersion + hresult(appVersion == null || appVersion.length() == 0 ? COM.S_FALSE : COM.S_OK)); if (appVersion == null || appVersion.length() == 0) { @@ -3254,7 +3254,7 @@ public class Accessible { } /* IAccessibleApplication::get_toolkitName([out] pbstrName) */ - int get_toolkitName(int /*long*/ pbstrName) { + int get_toolkitName(long /*int*/ pbstrName) { String toolkitName = "SWT"; if (DEBUG) print(this + ".IAccessibleApplication::get_toolkitName() returning" + toolkitName + hresult(COM.S_OK)); setString(pbstrName, toolkitName); @@ -3262,7 +3262,7 @@ public class Accessible { } /* IAccessibleApplication::get_toolkitVersion([out] pbstrVersion) */ - int get_toolkitVersion(int /*long*/ pbstrVersion) { + int get_toolkitVersion(long /*int*/ pbstrVersion) { String toolkitVersion = "" + SWT.getVersion(); //$NON-NLS-1$ if (DEBUG) print(this + ".IAccessibleApplication::get_toolkitVersion() returning" + toolkitVersion + hresult(COM.S_OK)); setString(pbstrVersion, toolkitVersion); @@ -3271,7 +3271,7 @@ public class Accessible { // The following 3 method are intentionally commented. We are not providing IAccessibleComponent at this time. // /* IAccessibleComponent::get_locationInParent([out] pX, [out] pY) */ -// int get_locationInParent(int /*long*/ pX, int /*long*/ pY) { +// int get_locationInParent(long /*int*/ pX, long /*int*/ pY) { // if (DEBUG) print(this + ".IAccessibleComponent::get_locationInParent"); // // TO DO: support transparently (hard for lightweight parents - screen vs. parent coords) // AccessibleControlEvent event = new AccessibleControlEvent(this); @@ -3285,7 +3285,7 @@ public class Accessible { // } // // /* IAccessibleComponent::get_foreground([out] pForeground) */ -// int get_foreground(int /*long*/ pForeground) { +// int get_foreground(long /*int*/ pForeground) { // Color color = control.getForeground(); // if (DEBUG) print(this + ".IAccessibleComponent::get_foreground returning " + color.handle); // COM.MoveMemory(pForeground, new int [] { color.handle }, 4); @@ -3293,7 +3293,7 @@ public class Accessible { // } // // /* IAccessibleComponent::get_background([out] pBackground) */ -// int get_background(int /*long*/ pBackground) { +// int get_background(long /*int*/ pBackground) { // Color color = control.getBackground(); // if (DEBUG) print(this + ".IAccessibleComponent::get_background returning " + color.handle); // COM.MoveMemory(pBackground, new int [] { color.handle }, 4); @@ -3330,7 +3330,7 @@ public class Accessible { } /* IAccessibleEditableText::insertText([in] offset, [in] pbstrText) */ - int insertText(int offset, int /*long*/ pbstrText) { + int insertText(int offset, long /*int*/ pbstrText) { if (DEBUG) print(this + ".IAccessibleEditableText::insertText, offset=" + offset + ", pbstrText=" + pbstrText); AccessibleEditableTextEvent event = new AccessibleEditableTextEvent(this); event.start = offset == COM.IA2_TEXT_OFFSET_LENGTH ? getCharacterCount() : offset; @@ -3373,7 +3373,7 @@ public class Accessible { } /* IAccessibleEditableText::replaceText([in] startOffset, [in] endOffset, [in] pbstrText) */ - int replaceText(int startOffset, int endOffset, int /*long*/ pbstrText) { + int replaceText(int startOffset, int endOffset, long /*int*/ pbstrText) { if (DEBUG) print(this + ".IAccessibleEditableText::replaceText, start=" + startOffset + ", end=" + endOffset + ", pbstrText=" + pbstrText); AccessibleEditableTextEvent event = new AccessibleEditableTextEvent(this); event.start = startOffset == COM.IA2_TEXT_OFFSET_LENGTH ? getCharacterCount() : startOffset; @@ -3388,7 +3388,7 @@ public class Accessible { } /* IAccessibleEditableText::setAttributes([in] startOffset, [in] endOffset, [in] pbstrAttributes) */ - int setAttributes(int startOffset, int endOffset, int /*long*/ pbstrAttributes) { + int setAttributes(int startOffset, int endOffset, long /*int*/ pbstrAttributes) { if (DEBUG) print(this + ".IAccessibleEditableText::setAttributes, start=" + startOffset + ", end=" + endOffset + ", pbstrAttributes=" + pbstrAttributes); AccessibleTextAttributeEvent event = new AccessibleTextAttributeEvent(this); String string = getString(pbstrAttributes); @@ -3496,7 +3496,7 @@ public class Accessible { } /* IAccessibleHyperlink::get_anchor([in] index, [out] pAnchor) */ - int get_anchor(int index, int /*long*/ pAnchor) { + int get_anchor(int index, long /*int*/ pAnchor) { if (DEBUG) print(this + ".IAccessibleHyperlink::get_anchor"); AccessibleHyperlinkEvent event = new AccessibleHyperlinkEvent(this); event.index = index; @@ -3516,7 +3516,7 @@ public class Accessible { } /* IAccessibleHyperlink::get_anchorTarget([in] index, [out] pAnchorTarget) */ - int get_anchorTarget(int index, int /*long*/ pAnchorTarget) { + int get_anchorTarget(int index, long /*int*/ pAnchorTarget) { if (DEBUG) print(this + ".IAccessibleHyperlink::get_anchorTarget"); AccessibleHyperlinkEvent event = new AccessibleHyperlinkEvent(this); event.index = index; @@ -3536,7 +3536,7 @@ public class Accessible { } /* IAccessibleHyperlink::get_startIndex([out] pIndex) */ - int get_startIndex(int /*long*/ pIndex) { + int get_startIndex(long /*int*/ pIndex) { if (DEBUG) print(this + ".IAccessibleHyperlink::get_startIndex"); AccessibleHyperlinkEvent event = new AccessibleHyperlinkEvent(this); for (int i = 0; i < accessibleHyperlinkListeners.size(); i++) { @@ -3548,7 +3548,7 @@ public class Accessible { } /* IAccessibleHyperlink::get_endIndex([out] pIndex) */ - int get_endIndex(int /*long*/ pIndex) { + int get_endIndex(long /*int*/ pIndex) { if (DEBUG) print(this + ".IAccessibleHyperlink::get_endIndex"); AccessibleHyperlinkEvent event = new AccessibleHyperlinkEvent(this); for (int i = 0; i < accessibleHyperlinkListeners.size(); i++) { @@ -3560,13 +3560,13 @@ public class Accessible { } /* IAccessibleHyperlink::get_valid([out] pValid) */ - int get_valid(int /*long*/ pValid) { + int get_valid(long /*int*/ pValid) { /* Deprecated. */ return COM.E_NOTIMPL; } /* IAccessibleHypertext::get_nHyperlinks([out] pHyperlinkCount) */ - int get_nHyperlinks(int /*long*/ pHyperlinkCount) { + int get_nHyperlinks(long /*int*/ pHyperlinkCount) { if (DEBUG) print(this + ".IAccessibleHypertext::get_nHyperlinks"); AccessibleTextEvent event = new AccessibleTextEvent(this); for (int i = 0; i < accessibleTextExtendedListeners.size(); i++) { @@ -3578,7 +3578,7 @@ public class Accessible { } /* IAccessibleHypertext::get_hyperlink([in] index, [out] ppHyperlink) */ - int get_hyperlink(int index, int /*long*/ ppHyperlink) { + int get_hyperlink(int index, long /*int*/ ppHyperlink) { if (DEBUG) print(this + ".IAccessibleHypertext::get_hyperlink"); AccessibleTextEvent event = new AccessibleTextEvent(this); event.index = index; @@ -3592,12 +3592,12 @@ public class Accessible { return COM.E_INVALIDARG; } accessible.AddRef(); - COM.MoveMemory(ppHyperlink, new int /*long*/[] { accessible.getAddress() }, OS.PTR_SIZEOF); + COM.MoveMemory(ppHyperlink, new long /*int*/[] { accessible.getAddress() }, OS.PTR_SIZEOF); return COM.S_OK; } /* IAccessibleHypertext::get_hyperlinkIndex([in] charIndex, [out] pHyperlinkIndex) */ - int get_hyperlinkIndex(int charIndex, int /*long*/ pHyperlinkIndex) { + int get_hyperlinkIndex(int charIndex, long /*int*/ pHyperlinkIndex) { if (DEBUG) print(this + ".IAccessibleHypertext::get_hyperlinkIndex"); AccessibleTextEvent event = new AccessibleTextEvent(this); event.offset = charIndex; @@ -3613,7 +3613,7 @@ public class Accessible { // The following 3 method are intentionally commented. We are not providing IAccessibleImage at this time. // /* IAccessibleImage::get_description([out] pbstrDescription) */ -// int get_description(int /*long*/ pbstrDescription) { +// int get_description(long /*int*/ pbstrDescription) { // if (DEBUG) print(this + ".IAccessibleImage::get_description"); // // TO DO: Does it make sense to just reuse description? // AccessibleEvent event = new AccessibleEvent(this); @@ -3628,7 +3628,7 @@ public class Accessible { // } // // /* IAccessibleImage::get_imagePosition([in] coordinateType, [out] pX, [out] pY) */ -// int get_imagePosition(int coordinateType, int /*long*/ pX, int /*long*/ pY) { +// int get_imagePosition(int coordinateType, long /*int*/ pX, long /*int*/ pY) { // if (DEBUG) print(this + ".IAccessibleImage::get_imagePosition"); // // TO DO: does it make sense to just reuse getLocation? // AccessibleControlEvent event = new AccessibleControlEvent(this); @@ -3643,7 +3643,7 @@ public class Accessible { // } // // /* IAccessibleImage::get_imageSize([out] pHeight, [out] pWidth) */ -// int get_imageSize(int /*long*/ pHeight, int /*long*/ pWidth) { +// int get_imageSize(long /*int*/ pHeight, long /*int*/ pWidth) { // if (DEBUG) print(this + ".IAccessibleImage::get_imageSize"); // // TO DO: does it make sense to just reuse getLocation? // AccessibleControlEvent event = new AccessibleControlEvent(this); @@ -3657,7 +3657,7 @@ public class Accessible { // } /* IAccessibleTable2::get_cellAt([in] row, [in] column, [out] ppCell) */ - int get_cellAt(int row, int column, int /*long*/ ppCell) { + int get_cellAt(int row, int column, long /*int*/ ppCell) { AccessibleTableEvent event = new AccessibleTableEvent(this); event.row = row; event.column = column; @@ -3669,12 +3669,12 @@ public class Accessible { if (DEBUG) print(this + ".IAccessibleTable2::get_cellAt(row=" + row + ", column=" + column + ") returning " + accessible); if (accessible == null) return COM.E_INVALIDARG; accessible.AddRef(); - COM.MoveMemory(ppCell, new int /*long*/[] { accessible.getAddress() }, OS.PTR_SIZEOF); + COM.MoveMemory(ppCell, new long /*int*/[] { accessible.getAddress() }, OS.PTR_SIZEOF); return COM.S_OK; } /* IAccessibleTable2::get_caption([out] ppAccessible) */ - int get_caption(int /*long*/ ppAccessible) { + int get_caption(long /*int*/ ppAccessible) { AccessibleTableEvent event = new AccessibleTableEvent(this); for (int i = 0; i < accessibleTableListeners.size(); i++) { AccessibleTableListener listener = (AccessibleTableListener) accessibleTableListeners.elementAt(i); @@ -3683,16 +3683,16 @@ public class Accessible { Accessible accessible = event.accessible; if (DEBUG) print(this + ".IAccessibleTable2::get_caption() returning " + accessible); if (accessible == null) { - COM.MoveMemory(ppAccessible, new int /*long*/[] { 0 }, OS.PTR_SIZEOF); + COM.MoveMemory(ppAccessible, new long /*int*/[] { 0 }, OS.PTR_SIZEOF); return COM.S_FALSE; } accessible.AddRef(); - COM.MoveMemory(ppAccessible, new int /*long*/[] { accessible.getAddress() }, OS.PTR_SIZEOF); + COM.MoveMemory(ppAccessible, new long /*int*/[] { accessible.getAddress() }, OS.PTR_SIZEOF); return COM.S_OK; } /* IAccessibleTable2::get_columnDescription([in] column, [out] pbstrDescription) */ - int get_columnDescription(int column, int /*long*/ pbstrDescription) { + int get_columnDescription(int column, long /*int*/ pbstrDescription) { AccessibleTableEvent event = new AccessibleTableEvent(this); event.column = column; for (int i = 0; i < accessibleTableListeners.size(); i++) { @@ -3706,7 +3706,7 @@ public class Accessible { } /* IAccessibleTable2::get_nColumns([out] pColumnCount) */ - int get_nColumns(int /*long*/ pColumnCount) { + int get_nColumns(long /*int*/ pColumnCount) { AccessibleTableEvent event = new AccessibleTableEvent(this); for (int i = 0; i < accessibleTableListeners.size(); i++) { AccessibleTableListener listener = (AccessibleTableListener) accessibleTableListeners.elementAt(i); @@ -3718,7 +3718,7 @@ public class Accessible { } /* IAccessibleTable2::get_nRows([out] pRowCount) */ - int get_nRows(int /*long*/ pRowCount) { + int get_nRows(long /*int*/ pRowCount) { AccessibleTableEvent event = new AccessibleTableEvent(this); for (int i = 0; i < accessibleTableListeners.size(); i++) { AccessibleTableListener listener = (AccessibleTableListener) accessibleTableListeners.elementAt(i); @@ -3730,7 +3730,7 @@ public class Accessible { } /* IAccessibleTable2::get_nSelectedCells([out] pCellCount) */ - int get_nSelectedCells(int /*long*/ pCellCount) { + int get_nSelectedCells(long /*int*/ pCellCount) { AccessibleTableEvent event = new AccessibleTableEvent(this); for (int i = 0; i < accessibleTableListeners.size(); i++) { AccessibleTableListener listener = (AccessibleTableListener) accessibleTableListeners.elementAt(i); @@ -3742,7 +3742,7 @@ public class Accessible { } /* IAccessibleTable2::get_nSelectedColumns([out] pColumnCount) */ - int get_nSelectedColumns(int /*long*/ pColumnCount) { + int get_nSelectedColumns(long /*int*/ pColumnCount) { AccessibleTableEvent event = new AccessibleTableEvent(this); for (int i = 0; i < accessibleTableListeners.size(); i++) { AccessibleTableListener listener = (AccessibleTableListener) accessibleTableListeners.elementAt(i); @@ -3754,7 +3754,7 @@ public class Accessible { } /* IAccessibleTable2::get_nSelectedRows([out] pRowCount) */ - int get_nSelectedRows(int /*long*/ pRowCount) { + int get_nSelectedRows(long /*int*/ pRowCount) { AccessibleTableEvent event = new AccessibleTableEvent(this); for (int i = 0; i < accessibleTableListeners.size(); i++) { AccessibleTableListener listener = (AccessibleTableListener) accessibleTableListeners.elementAt(i); @@ -3766,7 +3766,7 @@ public class Accessible { } /* IAccessibleTable2::get_rowDescription([in] row, [out] pbstrDescription) */ - int get_rowDescription(int row, int /*long*/ pbstrDescription) { + int get_rowDescription(int row, long /*int*/ pbstrDescription) { AccessibleTableEvent event = new AccessibleTableEvent(this); event.row = row; for (int i = 0; i < accessibleTableListeners.size(); i++) { @@ -3780,7 +3780,7 @@ public class Accessible { } /* IAccessibleTable2::get_selectedCells([out] ppCells, [out] pNSelectedCells) */ - int get_selectedCells(int /*long*/ ppCells, int /*long*/ pNSelectedCells) { + int get_selectedCells(long /*int*/ ppCells, long /*int*/ pNSelectedCells) { AccessibleTableEvent event = new AccessibleTableEvent(this); for (int i = 0; i < accessibleTableListeners.size(); i++) { AccessibleTableListener listener = (AccessibleTableListener) accessibleTableListeners.elementAt(i); @@ -3788,28 +3788,28 @@ public class Accessible { } if (DEBUG) print(this + ".IAccessibleTable2::get_selectedCells() returning " + (event.accessibles == null ? "null" : "accessibles[" + event.accessibles.length + "]")); if (event.accessibles == null || event.accessibles.length == 0) { - COM.MoveMemory(ppCells, new int /*long*/[] { 0 }, OS.PTR_SIZEOF); + COM.MoveMemory(ppCells, new long /*int*/[] { 0 }, OS.PTR_SIZEOF); COM.MoveMemory(pNSelectedCells, new int [] { 0 }, 4); return COM.S_FALSE; } int length = event.accessibles.length; - int /*long*/ pv = COM.CoTaskMemAlloc(length * OS.PTR_SIZEOF); + long /*int*/ pv = COM.CoTaskMemAlloc(length * OS.PTR_SIZEOF); int count = 0; for (int i = 0; i < length; i++) { Accessible accessible = event.accessibles[i]; if (accessible != null) { accessible.AddRef(); - COM.MoveMemory(pv + i * OS.PTR_SIZEOF, new int /*long*/[] { accessible.getAddress() }, OS.PTR_SIZEOF); + COM.MoveMemory(pv + i * OS.PTR_SIZEOF, new long /*int*/[] { accessible.getAddress() }, OS.PTR_SIZEOF); count++; } } - COM.MoveMemory(ppCells, new int /*long*/ [] { pv }, OS.PTR_SIZEOF); + COM.MoveMemory(ppCells, new long /*int*/ [] { pv }, OS.PTR_SIZEOF); COM.MoveMemory(pNSelectedCells, new int [] { count }, 4); return COM.S_OK; } /* IAccessibleTable2::get_selectedColumns([out] ppSelectedColumns, [out] pNColumns) */ - int get_selectedColumns(int /*long*/ ppSelectedColumns, int /*long*/ pNColumns) { + int get_selectedColumns(long /*int*/ ppSelectedColumns, long /*int*/ pNColumns) { AccessibleTableEvent event = new AccessibleTableEvent(this); for (int i = 0; i < accessibleTableListeners.size(); i++) { AccessibleTableListener listener = (AccessibleTableListener) accessibleTableListeners.elementAt(i); @@ -3818,19 +3818,19 @@ public class Accessible { int count = event.selected == null ? 0 : event.selected.length; if (DEBUG) print(this + ".IAccessibleTable2::get_selectedColumns() returning " + (count == 0 ? "null" : "selected[" + count + "]")); if (count == 0) { - COM.MoveMemory(ppSelectedColumns, new int /*long*/[] { 0 }, OS.PTR_SIZEOF); + COM.MoveMemory(ppSelectedColumns, new long /*int*/[] { 0 }, OS.PTR_SIZEOF); COM.MoveMemory(pNColumns, new int [] { 0 }, 4); return COM.S_FALSE; } - int /*long*/ pv = COM.CoTaskMemAlloc(count * 4); + long /*int*/ pv = COM.CoTaskMemAlloc(count * 4); COM.MoveMemory(pv, event.selected, count * 4); - COM.MoveMemory(ppSelectedColumns, new int /*long*/ [] { pv }, OS.PTR_SIZEOF); + COM.MoveMemory(ppSelectedColumns, new long /*int*/ [] { pv }, OS.PTR_SIZEOF); COM.MoveMemory(pNColumns, new int [] { count }, 4); return COM.S_OK; } /* IAccessibleTable2::get_selectedRows([out] ppSelectedRows, [out] pNRows) */ - int get_selectedRows(int /*long*/ ppSelectedRows, int /*long*/ pNRows) { + int get_selectedRows(long /*int*/ ppSelectedRows, long /*int*/ pNRows) { AccessibleTableEvent event = new AccessibleTableEvent(this); for (int i = 0; i < accessibleTableListeners.size(); i++) { AccessibleTableListener listener = (AccessibleTableListener) accessibleTableListeners.elementAt(i); @@ -3839,19 +3839,19 @@ public class Accessible { int count = event.selected == null ? 0 : event.selected.length; if (DEBUG) print(this + ".IAccessibleTable2::get_selectedRows() returning " + (count == 0 ? "null" : "selected[" + count + "]")); if (count == 0) { - COM.MoveMemory(ppSelectedRows, new int /*long*/[] { 0 }, OS.PTR_SIZEOF); + COM.MoveMemory(ppSelectedRows, new long /*int*/[] { 0 }, OS.PTR_SIZEOF); COM.MoveMemory(pNRows, new int [] { 0 }, 4); return COM.S_FALSE; } - int /*long*/ pv = COM.CoTaskMemAlloc(count * 4); + long /*int*/ pv = COM.CoTaskMemAlloc(count * 4); COM.MoveMemory(pv, event.selected, count * 4); - COM.MoveMemory(ppSelectedRows, new int /*long*/ [] { pv }, OS.PTR_SIZEOF); + COM.MoveMemory(ppSelectedRows, new long /*int*/ [] { pv }, OS.PTR_SIZEOF); COM.MoveMemory(pNRows, new int [] { count }, 4); return COM.S_OK; } /* IAccessibleTable2::get_summary([out] ppAccessible) */ - int get_summary(int /*long*/ ppAccessible) { + int get_summary(long /*int*/ ppAccessible) { AccessibleTableEvent event = new AccessibleTableEvent(this); for (int i = 0; i < accessibleTableListeners.size(); i++) { AccessibleTableListener listener = (AccessibleTableListener) accessibleTableListeners.elementAt(i); @@ -3860,16 +3860,16 @@ public class Accessible { Accessible accessible = event.accessible; if (DEBUG) print(this + ".IAccessibleTable2::get_summary() returning " + accessible); if (accessible == null) { - COM.MoveMemory(ppAccessible, new int /*long*/[] { 0 }, OS.PTR_SIZEOF); + COM.MoveMemory(ppAccessible, new long /*int*/[] { 0 }, OS.PTR_SIZEOF); return COM.S_FALSE; } accessible.AddRef(); - COM.MoveMemory(ppAccessible, new int /*long*/[] { accessible.getAddress() }, OS.PTR_SIZEOF); + COM.MoveMemory(ppAccessible, new long /*int*/[] { accessible.getAddress() }, OS.PTR_SIZEOF); return COM.S_OK; } /* IAccessibleTable2::get_isColumnSelected([in] column, [out] pIsSelected) */ - int get_isColumnSelected(int column, int /*long*/ pIsSelected) { + int get_isColumnSelected(int column, long /*int*/ pIsSelected) { AccessibleTableEvent event = new AccessibleTableEvent(this); event.column = column; for (int i = 0; i < accessibleTableListeners.size(); i++) { @@ -3882,7 +3882,7 @@ public class Accessible { } /* IAccessibleTable2::get_isRowSelected([in] row, [out] pIsSelected) */ - int get_isRowSelected(int row, int /*long*/ pIsSelected) { + int get_isRowSelected(int row, long /*int*/ pIsSelected) { AccessibleTableEvent event = new AccessibleTableEvent(this); event.row = row; for (int i = 0; i < accessibleTableListeners.size(); i++) { @@ -3947,10 +3947,10 @@ public class Accessible { } /* IAccessibleTable2::get_modelChange([out] pModelChange) */ - int get_modelChange(int /*long*/ pModelChange) { + int get_modelChange(long /*int*/ pModelChange) { if (DEBUG) print(this + ".IAccessibleTable2::get_modelChange() returning " + (tableChange == null ? "null" : "tableChange=" + tableChange[0] + ", " + tableChange[1] + ", " + tableChange[2] + ", " + tableChange[3])); if (tableChange == null) { - COM.MoveMemory(pModelChange, new int /*long*/ [] { 0 }, OS.PTR_SIZEOF); + COM.MoveMemory(pModelChange, new long /*int*/ [] { 0 }, OS.PTR_SIZEOF); return COM.S_FALSE; } COM.MoveMemory(pModelChange, tableChange, tableChange.length * 4); @@ -3958,7 +3958,7 @@ public class Accessible { } /* IAccessibleTableCell::get_columnExtent([out] pNColumnsSpanned) */ - int get_columnExtent(int /*long*/ pNColumnsSpanned) { + int get_columnExtent(long /*int*/ pNColumnsSpanned) { AccessibleTableCellEvent event = new AccessibleTableCellEvent(this); for (int i = 0; i < accessibleTableCellListeners.size(); i++) { AccessibleTableCellListener listener = (AccessibleTableCellListener) accessibleTableCellListeners.elementAt(i); @@ -3970,7 +3970,7 @@ public class Accessible { } /* IAccessibleTableCell::get_columnHeaderCells([out] ppCellAccessibles, [out] pNColumnHeaderCells) */ - int get_columnHeaderCells(int /*long*/ ppCellAccessibles, int /*long*/ pNColumnHeaderCells) { + int get_columnHeaderCells(long /*int*/ ppCellAccessibles, long /*int*/ pNColumnHeaderCells) { AccessibleTableCellEvent event = new AccessibleTableCellEvent(this); for (int i = 0; i < accessibleTableCellListeners.size(); i++) { AccessibleTableCellListener listener = (AccessibleTableCellListener) accessibleTableCellListeners.elementAt(i); @@ -3978,28 +3978,28 @@ public class Accessible { } if (DEBUG) print(this + ".IAccessibleTableCell::get_columnHeaderCells() returning " + (event.accessibles == null ? "null" : "accessibles[" + event.accessibles.length + "]")); if (event.accessibles == null || event.accessibles.length == 0) { - COM.MoveMemory(ppCellAccessibles, new int /*long*/[] { 0 }, OS.PTR_SIZEOF); + COM.MoveMemory(ppCellAccessibles, new long /*int*/[] { 0 }, OS.PTR_SIZEOF); COM.MoveMemory(pNColumnHeaderCells, new int [] { 0 }, 4); return COM.S_FALSE; } int length = event.accessibles.length; - int /*long*/ pv = COM.CoTaskMemAlloc(length * OS.PTR_SIZEOF); + long /*int*/ pv = COM.CoTaskMemAlloc(length * OS.PTR_SIZEOF); int count = 0; for (int i = 0; i < length; i++) { Accessible accessible = event.accessibles[i]; if (accessible != null) { accessible.AddRef(); - COM.MoveMemory(pv + i * OS.PTR_SIZEOF, new int /*long*/[] { accessible.getAddress() }, OS.PTR_SIZEOF); + COM.MoveMemory(pv + i * OS.PTR_SIZEOF, new long /*int*/[] { accessible.getAddress() }, OS.PTR_SIZEOF); count++; } } - COM.MoveMemory(ppCellAccessibles, new int /*long*/ [] { pv }, OS.PTR_SIZEOF); + COM.MoveMemory(ppCellAccessibles, new long /*int*/ [] { pv }, OS.PTR_SIZEOF); COM.MoveMemory(pNColumnHeaderCells, new int [] { count }, 4); return COM.S_OK; } /* IAccessibleTableCell::get_columnIndex([out] pColumnIndex) */ - int get_columnIndex(int /*long*/ pColumnIndex) { + int get_columnIndex(long /*int*/ pColumnIndex) { AccessibleTableCellEvent event = new AccessibleTableCellEvent(this); for (int i = 0; i < accessibleTableCellListeners.size(); i++) { AccessibleTableCellListener listener = (AccessibleTableCellListener) accessibleTableCellListeners.elementAt(i); @@ -4011,7 +4011,7 @@ public class Accessible { } /* IAccessibleTableCell::get_rowExtent([out] pNRowsSpanned) */ - int get_rowExtent(int /*long*/ pNRowsSpanned) { + int get_rowExtent(long /*int*/ pNRowsSpanned) { AccessibleTableCellEvent event = new AccessibleTableCellEvent(this); for (int i = 0; i < accessibleTableCellListeners.size(); i++) { AccessibleTableCellListener listener = (AccessibleTableCellListener) accessibleTableCellListeners.elementAt(i); @@ -4023,7 +4023,7 @@ public class Accessible { } /* IAccessibleTableCell::get_rowHeaderCells([out] ppCellAccessibles, [out] pNRowHeaderCells) */ - int get_rowHeaderCells(int /*long*/ ppCellAccessibles, int /*long*/ pNRowHeaderCells) { + int get_rowHeaderCells(long /*int*/ ppCellAccessibles, long /*int*/ pNRowHeaderCells) { AccessibleTableCellEvent event = new AccessibleTableCellEvent(this); for (int i = 0; i < accessibleTableCellListeners.size(); i++) { AccessibleTableCellListener listener = (AccessibleTableCellListener) accessibleTableCellListeners.elementAt(i); @@ -4031,28 +4031,28 @@ public class Accessible { } if (DEBUG) print(this + ".IAccessibleTableCell::get_rowHeaderCells() returning " + (event.accessibles == null ? "null" : "accessibles[" + event.accessibles.length + "]")); if (event.accessibles == null || event.accessibles.length == 0) { - COM.MoveMemory(ppCellAccessibles, new int /*long*/[] { 0 }, OS.PTR_SIZEOF); + COM.MoveMemory(ppCellAccessibles, new long /*int*/[] { 0 }, OS.PTR_SIZEOF); COM.MoveMemory(pNRowHeaderCells, new int [] { 0 }, 4); return COM.S_FALSE; } int length = event.accessibles.length; - int /*long*/ pv = COM.CoTaskMemAlloc(length * OS.PTR_SIZEOF); + long /*int*/ pv = COM.CoTaskMemAlloc(length * OS.PTR_SIZEOF); int count = 0; for (int i = 0; i < length; i++) { Accessible accessible = event.accessibles[i]; if (accessible != null) { accessible.AddRef(); - COM.MoveMemory(pv + i * OS.PTR_SIZEOF, new int /*long*/[] { accessible.getAddress() }, OS.PTR_SIZEOF); + COM.MoveMemory(pv + i * OS.PTR_SIZEOF, new long /*int*/[] { accessible.getAddress() }, OS.PTR_SIZEOF); count++; } } - COM.MoveMemory(ppCellAccessibles, new int /*long*/ [] { pv }, OS.PTR_SIZEOF); + COM.MoveMemory(ppCellAccessibles, new long /*int*/ [] { pv }, OS.PTR_SIZEOF); COM.MoveMemory(pNRowHeaderCells, new int [] { count }, 4); return COM.S_OK; } /* IAccessibleTableCell::get_rowIndex([out] pRowIndex) */ - int get_rowIndex(int /*long*/ pRowIndex) { + int get_rowIndex(long /*int*/ pRowIndex) { AccessibleTableCellEvent event = new AccessibleTableCellEvent(this); for (int i = 0; i < accessibleTableCellListeners.size(); i++) { AccessibleTableCellListener listener = (AccessibleTableCellListener) accessibleTableCellListeners.elementAt(i); @@ -4064,7 +4064,7 @@ public class Accessible { } /* IAccessibleTableCell::get_isSelected([out] pIsSelected) */ - int get_isSelected(int /*long*/ pIsSelected) { + int get_isSelected(long /*int*/ pIsSelected) { AccessibleTableCellEvent event = new AccessibleTableCellEvent(this); for (int i = 0; i < accessibleTableCellListeners.size(); i++) { AccessibleTableCellListener listener = (AccessibleTableCellListener) accessibleTableCellListeners.elementAt(i); @@ -4076,7 +4076,7 @@ public class Accessible { } /* IAccessibleTableCell::get_rowColumnExtents([out] pRow, [out] pColumn, [out] pRowExtents, [out] pColumnExtents, [out] pIsSelected) */ - int get_rowColumnExtents(int /*long*/ pRow, int /*long*/ pColumn, int /*long*/ pRowExtents, int /*long*/ pColumnExtents, int /*long*/ pIsSelected) { + int get_rowColumnExtents(long /*int*/ pRow, long /*int*/ pColumn, long /*int*/ pRowExtents, long /*int*/ pColumnExtents, long /*int*/ pIsSelected) { if (DEBUG) print(this + ".IAccessibleTableCell::get_rowColumnExtents"); // TODO: should we implement this? It is just a convenience function. return COM.DISP_E_MEMBERNOTFOUND; @@ -4093,7 +4093,7 @@ public class Accessible { } /* IAccessibleTableCell::get_table([out] ppTable) */ - int get_table(int /*long*/ ppTable) { + int get_table(long /*int*/ ppTable) { AccessibleTableCellEvent event = new AccessibleTableCellEvent(this); for (int i = 0; i < accessibleTableCellListeners.size(); i++) { AccessibleTableCellListener listener = (AccessibleTableCellListener) accessibleTableCellListeners.elementAt(i); @@ -4103,11 +4103,11 @@ public class Accessible { if (DEBUG) print(this + ".IAccessibleTableCell::get_table() returning " + accessible); if (accessible == null) { // TODO: This is not supposed to return S_FALSE. We need to lookup the table role parent and return that. - COM.MoveMemory(ppTable, new int /*long*/[] { 0 }, OS.PTR_SIZEOF); + COM.MoveMemory(ppTable, new long /*int*/[] { 0 }, OS.PTR_SIZEOF); return COM.S_FALSE; } accessible.AddRef(); - COM.MoveMemory(ppTable, new int /*long*/[] { accessible.getAddress() }, OS.PTR_SIZEOF); + COM.MoveMemory(ppTable, new long /*int*/[] { accessible.getAddress() }, OS.PTR_SIZEOF); return COM.S_OK; } @@ -4126,7 +4126,7 @@ public class Accessible { } /* IAccessibleText::get_attributes([in] offset, [out] pStartOffset, [out] pEndOffset, [out] pbstrTextAttributes) */ - int get_attributes(int offset, int /*long*/ pStartOffset, int /*long*/ pEndOffset, int /*long*/ pbstrTextAttributes) { + int get_attributes(int offset, long /*int*/ pStartOffset, long /*int*/ pEndOffset, long /*int*/ pbstrTextAttributes) { AccessibleTextAttributeEvent event = new AccessibleTextAttributeEvent(this); event.offset = offset == COM.IA2_TEXT_OFFSET_LENGTH ? getCharacterCount() : offset; for (int i = 0; i < accessibleAttributeListeners.size(); i++) { @@ -4187,7 +4187,7 @@ public class Accessible { } /* IAccessibleText::get_caretOffset([out] pOffset) */ - int get_caretOffset(int /*long*/ pOffset) { + int get_caretOffset(long /*int*/ pOffset) { int offset = getCaretOffset(); if (DEBUG) print(this + ".IAccessibleText::get_caretOffset returning " + offset + hresult(offset == -1 ? COM.S_FALSE : COM.S_OK)); COM.MoveMemory(pOffset, new int [] { offset }, 4); @@ -4196,7 +4196,7 @@ public class Accessible { } /* IAccessibleText::get_characterExtents([in] offset, [in] coordType, [out] pX, [out] pY, [out] pWidth, [out] pHeight) */ - int get_characterExtents(int offset, int coordType, int /*long*/ pX, int /*long*/ pY, int /*long*/ pWidth, int /*long*/ pHeight) { + int get_characterExtents(int offset, int coordType, long /*int*/ pX, long /*int*/ pY, long /*int*/ pWidth, long /*int*/ pHeight) { int length = getCharacterCount(); AccessibleTextEvent event = new AccessibleTextEvent(this); event.start = offset == COM.IA2_TEXT_OFFSET_LENGTH ? length : offset < 0 ? 0 : offset; @@ -4216,7 +4216,7 @@ public class Accessible { } /* IAccessibleText::get_nSelections([out] pNSelections) */ - int get_nSelections(int /*long*/ pNSelections) { + int get_nSelections(long /*int*/ pNSelections) { AccessibleTextEvent event = new AccessibleTextEvent(this); event.count = -1; for (int i = 0; i < accessibleTextExtendedListeners.size(); i++) { @@ -4239,7 +4239,7 @@ public class Accessible { } /* IAccessibleText::get_offsetAtPoint([in] x, [in] y, [in] coordType, [out] pOffset) */ - int get_offsetAtPoint(int x, int y, int coordType, int /*long*/ pOffset) { + int get_offsetAtPoint(int x, int y, int coordType, long /*int*/ pOffset) { AccessibleTextEvent event = new AccessibleTextEvent(this); event.x = x; event.y = y; @@ -4259,7 +4259,7 @@ public class Accessible { } /* IAccessibleText::get_selection([in] selectionIndex, [out] pStartOffset, [out] pEndOffset) */ - int get_selection(int selectionIndex, int /*long*/ pStartOffset, int /*long*/ pEndOffset) { + int get_selection(int selectionIndex, long /*int*/ pStartOffset, long /*int*/ pEndOffset) { AccessibleTextEvent event = new AccessibleTextEvent(this); event.index = selectionIndex; event.start = -1; @@ -4291,7 +4291,7 @@ public class Accessible { } /* IAccessibleText::get_text([in] startOffset, [in] endOffset, [out] pbstrText) */ - int get_text(int startOffset, int endOffset, int /*long*/ pbstrText) { + int get_text(int startOffset, int endOffset, long /*int*/ pbstrText) { AccessibleTextEvent event = new AccessibleTextEvent(this); event.start = startOffset == COM.IA2_TEXT_OFFSET_LENGTH ? getCharacterCount() : startOffset; event.end = endOffset == COM.IA2_TEXT_OFFSET_LENGTH ? getCharacterCount() : endOffset; @@ -4327,7 +4327,7 @@ public class Accessible { } /* IAccessibleText::get_textBeforeOffset([in] offset, [in] boundaryType, [out] pStartOffset, [out] pEndOffset, [out] pbstrText) */ - int get_textBeforeOffset(int offset, int boundaryType, int /*long*/ pStartOffset, int /*long*/ pEndOffset, int /*long*/ pbstrText) { + int get_textBeforeOffset(int offset, int boundaryType, long /*int*/ pStartOffset, long /*int*/ pEndOffset, long /*int*/ pbstrText) { AccessibleTextEvent event = new AccessibleTextEvent(this); int charCount = getCharacterCount(); event.start = offset == COM.IA2_TEXT_OFFSET_LENGTH ? charCount : offset == COM.IA2_TEXT_OFFSET_CARET ? getCaretOffset() : offset; @@ -4380,7 +4380,7 @@ public class Accessible { } /* IAccessibleText::get_textAfterOffset([in] offset, [in] boundaryType, [out] pStartOffset, [out] pEndOffset, [out] pbstrText) */ - int get_textAfterOffset(int offset, int boundaryType, int /*long*/ pStartOffset, int /*long*/ pEndOffset, int /*long*/ pbstrText) { + int get_textAfterOffset(int offset, int boundaryType, long /*int*/ pStartOffset, long /*int*/ pEndOffset, long /*int*/ pbstrText) { AccessibleTextEvent event = new AccessibleTextEvent(this); int charCount = getCharacterCount(); event.start = offset == COM.IA2_TEXT_OFFSET_LENGTH ? charCount : offset == COM.IA2_TEXT_OFFSET_CARET ? getCaretOffset() : offset; @@ -4433,7 +4433,7 @@ public class Accessible { } /* IAccessibleText::get_textAtOffset([in] offset, [in] boundaryType, [out] pStartOffset, [out] pEndOffset, [out] pbstrText) */ - int get_textAtOffset(int offset, int boundaryType, int /*long*/ pStartOffset, int /*long*/ pEndOffset, int /*long*/ pbstrText) { + int get_textAtOffset(int offset, int boundaryType, long /*int*/ pStartOffset, long /*int*/ pEndOffset, long /*int*/ pbstrText) { AccessibleTextEvent event = new AccessibleTextEvent(this); int charCount = getCharacterCount(); event.start = offset == COM.IA2_TEXT_OFFSET_LENGTH ? charCount : offset == COM.IA2_TEXT_OFFSET_CARET ? getCaretOffset() : offset; @@ -4534,7 +4534,7 @@ public class Accessible { } /* IAccessibleText::get_nCharacters([out] pNCharacters) */ - int get_nCharacters(int /*long*/ pNCharacters) { + int get_nCharacters(long /*int*/ pNCharacters) { int count = getCharacterCount(); COM.MoveMemory(pNCharacters, new int [] { count }, 4); if (DEBUG) print(this + ".IAccessibleText::get_nCharacters returning " + count); @@ -4582,7 +4582,7 @@ public class Accessible { } /* IAccessibleText::get_newText([out] pNewText) */ - int get_newText(int /*long*/ pNewText) { + int get_newText(long /*int*/ pNewText) { if (DEBUG) print(this + ".IAccessibleText::get_newText"); String text = null; int start = 0; @@ -4600,7 +4600,7 @@ public class Accessible { } /* IAccessibleText::get_oldText([out] pOldText) */ - int get_oldText(int /*long*/ pOldText) { + int get_oldText(long /*int*/ pOldText) { if (DEBUG) print(this + ".IAccessibleText::get_oldText"); String text = null; int start = 0; @@ -4618,7 +4618,7 @@ public class Accessible { } /* IAccessibleValue::get_currentValue([out] pCurrentValue) */ - int get_currentValue(int /*long*/ pCurrentValue) { + int get_currentValue(long /*int*/ pCurrentValue) { AccessibleValueEvent event = new AccessibleValueEvent(this); for (int i = 0; i < accessibleValueListeners.size(); i++) { AccessibleValueListener listener = (AccessibleValueListener) accessibleValueListeners.elementAt(i); @@ -4630,7 +4630,7 @@ public class Accessible { } /* IAccessibleValue::setCurrentValue([in] value) */ - int setCurrentValue(int /*long*/ value) { + int setCurrentValue(long /*int*/ value) { if (DEBUG) print(this + ".IAccessibleValue::setCurrentValue"); AccessibleValueEvent event = new AccessibleValueEvent(this); event.value = getNumberVARIANT(value); @@ -4643,7 +4643,7 @@ public class Accessible { } /* IAccessibleValue::get_maximumValue([out] pMaximumValue) */ - int get_maximumValue(int /*long*/ pMaximumValue) { + int get_maximumValue(long /*int*/ pMaximumValue) { AccessibleValueEvent event = new AccessibleValueEvent(this); for (int i = 0; i < accessibleValueListeners.size(); i++) { AccessibleValueListener listener = (AccessibleValueListener) accessibleValueListeners.elementAt(i); @@ -4655,7 +4655,7 @@ public class Accessible { } /* IAccessibleValue::get_minimumValue([out] pMinimumValue) */ - int get_minimumValue(int /*long*/ pMinimumValue) { + int get_minimumValue(long /*int*/ pMinimumValue) { AccessibleValueEvent event = new AccessibleValueEvent(this); for (int i = 0; i < accessibleValueListeners.size(); i++) { AccessibleValueListener listener = (AccessibleValueListener) accessibleValueListeners.elementAt(i); @@ -4953,9 +4953,9 @@ public class Accessible { role = COM.ROLE_SYSTEM_CLIENT; if (iaccessible != null) { /* Get the default role from the OS. */ - int /*long*/ varChild = OS.GlobalAlloc (OS.GMEM_FIXED | OS.GMEM_ZEROINIT, VARIANT.sizeof); + long /*int*/ varChild = OS.GlobalAlloc (OS.GMEM_FIXED | OS.GMEM_ZEROINIT, VARIANT.sizeof); setIntVARIANT(varChild, COM.VT_I4, COM.CHILDID_SELF); - int /*long*/ pvarRole = OS.GlobalAlloc (OS.GMEM_FIXED | OS.GMEM_ZEROINIT, VARIANT.sizeof); + long /*int*/ pvarRole = OS.GlobalAlloc (OS.GMEM_FIXED | OS.GMEM_ZEROINIT, VARIANT.sizeof); int code = iaccessible.get_accRole(varChild, pvarRole); if (code == COM.S_OK) { VARIANT v = getVARIANT(pvarRole); @@ -4967,8 +4967,8 @@ public class Accessible { return role; } - String getString(int /*long*/ psz) { - int /*long*/ [] ptr = new int /*long*/ [1]; + String getString(long /*int*/ psz) { + long /*int*/ [] ptr = new long /*int*/ [1]; OS.MoveMemory (ptr, psz, OS.PTR_SIZEOF); int size = COM.SysStringByteLen(ptr [0]); if (size == 0) return ""; @@ -4977,34 +4977,34 @@ public class Accessible { return new String (buffer); } - VARIANT getVARIANT(int /*long*/ variant) { + VARIANT getVARIANT(long /*int*/ variant) { VARIANT v = new VARIANT(); COM.MoveMemory(v, variant, VARIANT.sizeof); return v; } - Number getNumberVARIANT(int /*long*/ variant) { + Number getNumberVARIANT(long /*int*/ variant) { VARIANT v = new VARIANT(); COM.MoveMemory(v, variant, VARIANT.sizeof); if (v.vt == COM.VT_I8) return new Long(v.lVal); // TODO: Fix this - v.lVal is an int - don't use struct return new Integer(v.lVal); } - void setIntVARIANT(int /*long*/ variant, short vt, int lVal) { + void setIntVARIANT(long /*int*/ variant, short vt, int lVal) { if (vt == COM.VT_I4 || vt == COM.VT_EMPTY) { COM.MoveMemory(variant, new short[] { vt }, 2); COM.MoveMemory(variant + 8, new int[] { lVal }, 4); } } - void setPtrVARIANT(int /*long*/ variant, short vt, int /*long*/ lVal) { + void setPtrVARIANT(long /*int*/ variant, short vt, long /*int*/ lVal) { if (vt == COM.VT_DISPATCH || vt == COM.VT_UNKNOWN) { COM.MoveMemory(variant, new short[] { vt }, 2); - COM.MoveMemory(variant + 8, new int /*long*/ [] { lVal }, OS.PTR_SIZEOF); + COM.MoveMemory(variant + 8, new long /*int*/ [] { lVal }, OS.PTR_SIZEOF); } } - void setNumberVARIANT(int /*long*/ variant, Number number) { + void setNumberVARIANT(long /*int*/ variant, Number number) { if (number == null) { COM.MoveMemory(variant, new short[] { COM.VT_EMPTY }, 2); COM.MoveMemory(variant + 8, new int[] { 0 }, 4); @@ -5023,23 +5023,23 @@ public class Accessible { } } - void setString(int /*long*/ psz, String string) { - int /*long*/ ptr = 0; + void setString(long /*int*/ psz, String string) { + long /*int*/ ptr = 0; if (string != null) { char[] data = (string + "\0").toCharArray(); ptr = COM.SysAllocString(data); } - COM.MoveMemory(psz, new int /*long*/ [] { ptr }, OS.PTR_SIZEOF); + COM.MoveMemory(psz, new long /*int*/ [] { ptr }, OS.PTR_SIZEOF); } - void setStringVARIANT(int /*long*/ variant, String string) { - int /*long*/ ptr = 0; + void setStringVARIANT(long /*int*/ variant, String string) { + long /*int*/ ptr = 0; if (string != null) { char[] data = (string + "\0").toCharArray(); ptr = COM.SysAllocString(data); } COM.MoveMemory(variant, new short[] { ptr == 0 ? COM.VT_EMPTY : COM.VT_BSTR }, 2); - COM.MoveMemory(variant + 8, new int /*long*/ [] { ptr }, OS.PTR_SIZEOF); + COM.MoveMemory(variant + 8, new long /*int*/ [] { ptr }, OS.PTR_SIZEOF); } /* checkWidget was copied from Widget, and rewritten to work in this package */ diff --git a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Relation.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Relation.java index 1e72c7a987..d286fbb358 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Relation.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Relation.java @@ -62,7 +62,7 @@ class Relation { AddRef(); } - int /*long*/ getAddress() { + long /*int*/ getAddress() { /* The address of a Relation is the address of its IAccessibleRelation COMObject. */ if (objIAccessibleRelation == null) createIAccessibleRelation(); return objIAccessibleRelation.getAddress(); @@ -70,14 +70,14 @@ class Relation { void createIAccessibleRelation() { objIAccessibleRelation = new COMObject(new int[] {2,0,0,1,1,1,2,3}) { - public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);} - public int /*long*/ method1(int /*long*/[] args) {return AddRef();} - public int /*long*/ method2(int /*long*/[] args) {return Release();} - public int /*long*/ method3(int /*long*/[] args) {return get_relationType(args[0]);} - public int /*long*/ method4(int /*long*/[] args) {return get_localizedRelationType(args[0]);} - public int /*long*/ method5(int /*long*/[] args) {return get_nTargets(args[0]);} - public int /*long*/ method6(int /*long*/[] args) {return get_target((int)/*64*/args[0], args[1]);} - public int /*long*/ method7(int /*long*/[] args) {return get_targets((int)/*64*/args[0], args[1], args[2]);} + public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long /*int*/ method3(long /*int*/[] args) {return get_relationType(args[0]);} + public long /*int*/ method4(long /*int*/[] args) {return get_localizedRelationType(args[0]);} + public long /*int*/ method5(long /*int*/[] args) {return get_nTargets(args[0]);} + public long /*int*/ method6(long /*int*/[] args) {return get_target((int)/*64*/args[0], args[1]);} + public long /*int*/ method7(long /*int*/[] args) {return get_targets((int)/*64*/args[0], args[1], args[2]);} }; } @@ -85,12 +85,12 @@ class Relation { * Ownership of ppvObject transfers from callee to caller so reference count on ppvObject * must be incremented before returning. Caller is responsible for releasing ppvObject. */ - int QueryInterface(int /*long*/ iid, int /*long*/ ppvObject) { + int QueryInterface(long /*int*/ iid, long /*int*/ ppvObject) { GUID guid = new GUID(); COM.MoveMemory(guid, iid, GUID.sizeof); if (COM.IsEqualGUID(guid, COM.IIDIUnknown) || COM.IsEqualGUID(guid, COM.IIDIAccessibleRelation)) { - COM.MoveMemory(ppvObject, new int /*long*/[] { getAddress() }, OS.PTR_SIZEOF); + COM.MoveMemory(ppvObject, new long /*int*/[] { getAddress() }, OS.PTR_SIZEOF); AddRef(); return COM.S_OK; } @@ -115,39 +115,39 @@ class Relation { } /* IAccessibleRelation::get_relationType([out] pbstrRelationType) */ - int get_relationType(int /*long*/ pbstrRelationType) { + int get_relationType(long /*int*/ pbstrRelationType) { setString(pbstrRelationType, relationTypeString[type]); return COM.S_OK; } /* IAccessibleRelation::get_localizedRelationType([out] pbstrLocalizedRelationType) */ - int get_localizedRelationType(int /*long*/ pbstrLocalizedRelationType) { + int get_localizedRelationType(long /*int*/ pbstrLocalizedRelationType) { setString(pbstrLocalizedRelationType, localizedRelationTypeString[type]); return COM.S_OK; } /* IAccessibleRelation::get_nTargets([out] pNTargets) */ - int get_nTargets(int /*long*/ pNTargets) { + int get_nTargets(long /*int*/ pNTargets) { COM.MoveMemory(pNTargets, new int [] { targets.length }, 4); return COM.S_OK; } /* IAccessibleRelation::get_target([in] targetIndex, [out] ppTarget) */ - int get_target(int targetIndex, int /*long*/ ppTarget) { + int get_target(int targetIndex, long /*int*/ ppTarget) { if (targetIndex < 0 || targetIndex >= targets.length) return COM.E_INVALIDARG; Accessible target = targets[targetIndex]; target.AddRef(); - COM.MoveMemory(ppTarget, new int /*long*/[] { target.getAddress() }, OS.PTR_SIZEOF); + COM.MoveMemory(ppTarget, new long /*int*/[] { target.getAddress() }, OS.PTR_SIZEOF); return COM.S_OK; } /* IAccessibleRelation::get_targets([in] maxTargets, [out] ppTargets, [out] pNTargets) */ - int get_targets(int maxTargets, int /*long*/ ppTargets, int /*long*/ pNTargets) { + int get_targets(int maxTargets, long /*int*/ ppTargets, long /*int*/ pNTargets) { int count = Math.min(targets.length, maxTargets); for (int i = 0; i < count; i++) { Accessible target = targets[i]; target.AddRef(); - COM.MoveMemory(ppTargets + i * OS.PTR_SIZEOF, new int /*long*/[] { target.getAddress() }, OS.PTR_SIZEOF); + COM.MoveMemory(ppTargets + i * OS.PTR_SIZEOF, new long /*int*/[] { target.getAddress() }, OS.PTR_SIZEOF); } COM.MoveMemory(pNTargets, new int [] { count }, 4); return COM.S_OK; @@ -185,9 +185,9 @@ class Relation { } // setString copied from Accessible class - void setString(int /*long*/ psz, String string) { + void setString(long /*int*/ psz, String string) { char[] data = (string + "\0").toCharArray(); - int /*long*/ ptr = COM.SysAllocString(data); - COM.MoveMemory(psz, new int /*long*/ [] { ptr }, OS.PTR_SIZEOF); + long /*int*/ ptr = COM.SysAllocString(data); + COM.MoveMemory(psz, new long /*int*/ [] { ptr }, OS.PTR_SIZEOF); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/IE.java b/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/IE.java index 890781fad3..45d1bb4e31 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/IE.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/IE.java @@ -34,7 +34,7 @@ class IE extends WebBrowser { Point location; Point size; boolean addressBar = true, menuBar = true, statusBar = true, toolBar = true; - int /*long*/ globalDispatch; + long /*int*/ globalDispatch; String html, lastNavigateURL, uncRedirect; Object[] pendingText, pendingUrl; int style, lastKeyCode, lastCharCode; @@ -193,7 +193,7 @@ class IE extends WebBrowser { * features that can be enabled. */ TCHAR key = new TCHAR (0, "Software\\Microsoft\\Internet Explorer", true); //$NON-NLS-1$ - int /*long*/ [] phkResult = new int /*long*/ [1]; + long /*int*/ [] phkResult = new long /*int*/ [1]; if (OS.RegOpenKeyEx (OS.HKEY_LOCAL_MACHINE, key, 0, OS.KEY_READ, phkResult) == 0) { int [] lpcbData = new int [1]; TCHAR buffer = new TCHAR (0, "Version", true); //$NON-NLS-1$ @@ -229,7 +229,7 @@ class IE extends WebBrowser { * will be embedded to explicitly specify Shell.Explorer.2. */ key = new TCHAR (0, "Shell.Explorer\\CLSID", true); //$NON-NLS-1$ - phkResult = new int /*long*/ [1]; + phkResult = new long /*int*/ [1]; if (OS.RegOpenKeyEx (OS.HKEY_CLASSES_ROOT, key, 0, OS.KEY_READ, phkResult) == 0) { int [] lpcbData = new int [1]; int result = OS.RegQueryValueEx (phkResult [0], null, 0, null, (TCHAR) null, lpcbData); @@ -241,7 +241,7 @@ class IE extends WebBrowser { if (clsid.equals (CLSID_SHELLEXPLORER1)) { /* Shell.Explorer.1 is the default, ensure that Shell.Explorer.2 is available */ key = new TCHAR (0, "Shell.Explorer.2", true); //$NON-NLS-1$ - int /*long*/ [] phkResult2 = new int /*long*/ [1]; + long /*int*/ [] phkResult2 = new long /*int*/ [1]; if (OS.RegOpenKeyEx (OS.HKEY_CLASSES_ROOT, key, 0, OS.KEY_READ, phkResult2) == 0) { /* specify that Shell.Explorer.2 is to be used */ OS.RegCloseKey (phkResult2 [0]); @@ -297,7 +297,7 @@ public void create(Composite parent, int style) { } if (version != -1) { - int /*long*/[] key = new int /*long*/[1]; + long /*int*/[] key = new long /*int*/[1]; final TCHAR subkey = new TCHAR(0, "Software\\Microsoft\\Internet Explorer\\Main\\FeatureControl\\FEATURE_BROWSER_EMULATION", true); //$NON-NLS-1$ if (OS.RegCreateKeyEx(OS.HKEY_CURRENT_USER, subkey, 0, null, OS.REG_OPTION_VOLATILE, OS.KEY_WRITE | OS.KEY_QUERY_VALUE, 0, key, null) == 0) { TCHAR lpszFile = new TCHAR(0, OS.MAX_PATH); @@ -310,7 +310,7 @@ public void create(Composite parent, int style) { if (OS.RegSetValueEx(key[0], lpValueName, 0, OS.REG_DWORD, new int[] {version}, 4) == 0) { parent.getDisplay().addListener(SWT.Dispose, new Listener() { public void handleEvent(Event event) { - int /*long*/[] key = new int /*long*/[1]; + long /*int*/[] key = new long /*int*/[1]; if (OS.RegOpenKeyEx(OS.HKEY_CURRENT_USER, subkey, 0, OS.KEY_WRITE, key) == 0) { OS.RegDeleteValue(key[0], lpValueName); } @@ -457,7 +457,7 @@ public void create(Composite parent, int style) { if (uncRedirect.equals(url) || (uncRedirect.startsWith(url) && uncRedirect.indexOf('\\', 2) == url.length())) { Variant cancel = event.arguments[6]; if (cancel != null) { - int /*long*/ pCancel = cancel.getByRef(); + long /*int*/ pCancel = cancel.getByRef(); COM.MoveMemory(pCancel, new short[] {COM.VARIANT_FALSE}, 2); } break; @@ -491,7 +491,7 @@ public void create(Composite parent, int style) { if (url.startsWith(PROTOCOL_FILE) && _getUrl().startsWith(ABOUT_BLANK) && untrustedText) { Variant cancel = event.arguments[6]; if (cancel != null) { - int /*long*/ pCancel = cancel.getByRef(); + long /*int*/ pCancel = cancel.getByRef(); COM.MoveMemory(pCancel, new short[] {COM.VARIANT_TRUE}, 2); } break; @@ -508,7 +508,7 @@ public void create(Composite parent, int style) { boolean doit = newEvent.doit && !browser.isDisposed(); Variant cancel = event.arguments[6]; if (cancel != null) { - int /*long*/ pCancel = cancel.getByRef(); + long /*int*/ pCancel = cancel.getByRef(); COM.MoveMemory(pCancel, new short[] {doit ? COM.VARIANT_FALSE : COM.VARIANT_TRUE}, 2); } if (doit) { @@ -769,7 +769,7 @@ public void create(Composite parent, int style) { final String host = url.substring(0, index); Variant cancel = event.arguments[4]; if (cancel != null) { - int /*long*/ pCancel = cancel.getByRef(); + long /*int*/ pCancel = cancel.getByRef(); COM.MoveMemory(pCancel, new short[] {COM.VARIANT_TRUE}, 2); } browser.getDisplay().asyncExec(new Runnable() { @@ -796,7 +796,7 @@ public void create(Composite parent, int style) { } case NewWindow2: { Variant cancel = event.arguments[1]; - int /*long*/ pCancel = cancel.getByRef(); + long /*int*/ pCancel = cancel.getByRef(); WindowEvent newEvent = new WindowEvent(browser); newEvent.display = browser.getDisplay(); newEvent.widget = browser; @@ -821,8 +821,8 @@ public void create(Composite parent, int style) { Variant variant = new Variant(browser.auto); IDispatch iDispatch = variant.getDispatch(); Variant ppDisp = event.arguments[0]; - int /*long*/ byref = ppDisp.getByRef(); - if (byref != 0) COM.MoveMemory(byref, new int /*long*/[] {iDispatch.getAddress()}, OS.PTR_SIZEOF); + long /*int*/ byref = ppDisp.getByRef(); + if (byref != 0) COM.MoveMemory(byref, new long /*int*/[] {iDispatch.getAddress()}, OS.PTR_SIZEOF); /* * This code is intentionally commented. A Variant constructed from an * OleAutomation object does not increase its reference count. The IDispatch @@ -978,7 +978,7 @@ public void create(Composite parent, int style) { } }); Variant cancel = event.arguments[1]; - int /*long*/ pCancel = cancel.getByRef(); + long /*int*/ pCancel = cancel.getByRef(); Variant arg1 = event.arguments[0]; boolean isChildWindow = arg1.getBoolean(); COM.MoveMemory(pCancel, new short[]{isChildWindow ? COM.VARIANT_FALSE : COM.VARIANT_TRUE}, 2); @@ -1112,12 +1112,12 @@ static Variant createSafeArray(String string) { /* Create a pointer and copy the data into it */ byte[] bytes = string.getBytes(); int length = bytes.length; - int /*long*/ pvData = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, length); + long /*int*/ pvData = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, length); C.memmove(pvData, bytes, length); int cElements1 = length; /* Create a SAFEARRAY in memory */ - int /*long*/ pSafeArray = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, SAFEARRAY.sizeof); + long /*int*/ pSafeArray = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, SAFEARRAY.sizeof); SAFEARRAY safeArray = new SAFEARRAY(); safeArray.cDims = 1; safeArray.fFeatures = OS.FADF_FIXEDSIZE; @@ -1129,10 +1129,10 @@ static Variant createSafeArray(String string) { OS.MoveMemory (pSafeArray, safeArray, SAFEARRAY.sizeof); /* Return a Variant that holds the SAFEARRAY */ - int /*long*/ pVariant = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, Variant.sizeof); + long /*int*/ pVariant = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, Variant.sizeof); short vt = (short)(OLE.VT_ARRAY | OLE.VT_UI1); OS.MoveMemory(pVariant, new short[] {vt}, 2); - OS.MoveMemory(pVariant + 8, new int /*long*/[] {pSafeArray}, C.PTR_SIZEOF); + OS.MoveMemory(pVariant + 8, new long /*int*/[] {pSafeArray}, C.PTR_SIZEOF); return new Variant(pVariant, (short)(OLE.VT_BYREF | OLE.VT_VARIANT)); } @@ -1356,11 +1356,11 @@ void setHTML (String string) { * prepend the UTF-8 Byte Order Mark signature to the data. */ byte[] UTF8BOM = {(byte)0xEF, (byte)0xBB, (byte)0xBF}; - int /*long*/ hGlobal = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, UTF8BOM.length + byteCount); + long /*int*/ hGlobal = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, UTF8BOM.length + byteCount); if (hGlobal != 0) { OS.MoveMemory(hGlobal, UTF8BOM, UTF8BOM.length); OS.WideCharToMultiByte(OS.CP_UTF8, 0, chars, charCount, hGlobal + UTF8BOM.length, byteCount, null, null); - int /*long*/ [] ppstm = new int /*long*/ [1]; + long /*int*/ [] ppstm = new long /*int*/ [1]; /* * CreateStreamOnHGlobal is called with the flag fDeleteOnRelease. * If the call succeeds the buffer hGlobal is freed automatically @@ -1371,7 +1371,7 @@ void setHTML (String string) { int[] rgdispid = auto.getIDsOfNames(new String[] {PROPERTY_DOCUMENT}); Variant pVarResult = auto.getProperty(rgdispid[0]); IDispatch dispatchDocument = pVarResult.getDispatch(); - int /*long*/ [] ppvObject = new int /*long*/ [1]; + long /*int*/ [] ppvObject = new long /*int*/ [1]; int result = dispatchDocument.QueryInterface(COM.IIDIPersistStreamInit, ppvObject); if (result == OS.S_OK) { IPersistStreamInit persistStreamInit = new IPersistStreamInit(ppvObject[0]); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/WebSite.java b/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/WebSite.java index c86e21076b..d823a5457c 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/WebSite.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/WebSite.java @@ -41,31 +41,31 @@ public WebSite(Composite parent, int style, String progId) { protected void createCOMInterfaces () { super.createCOMInterfaces(); iDocHostUIHandler = new COMObject(new int[]{2, 0, 0, 4, 1, 5, 0, 0, 1, 1, 1, 3, 3, 2, 2, 1, 3, 2}){ - public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);} - public int /*long*/ method1(int /*long*/[] args) {return AddRef();} - public int /*long*/ method2(int /*long*/[] args) {return Release();} - public int /*long*/ method3(int /*long*/[] args) {return ShowContextMenu((int)/*64*/args[0], args[1], args[2], args[3]);} - public int /*long*/ method4(int /*long*/[] args) {return GetHostInfo(args[0]);} - public int /*long*/ method5(int /*long*/[] args) {return ShowUI((int)/*64*/args[0], args[1], args[2], args[3], args[4]);} - public int /*long*/ method6(int /*long*/[] args) {return HideUI();} - public int /*long*/ method7(int /*long*/[] args) {return UpdateUI();} - public int /*long*/ method8(int /*long*/[] args) {return EnableModeless((int)/*64*/args[0]);} - public int /*long*/ method9(int /*long*/[] args) {return OnDocWindowActivate((int)/*64*/args[0]);} - public int /*long*/ method10(int /*long*/[] args) {return OnFrameWindowActivate((int)/*64*/args[0]);} - public int /*long*/ method11(int /*long*/[] args) {return ResizeBorder(args[0], args[1], (int)/*64*/args[2]);} - public int /*long*/ method12(int /*long*/[] args) {return TranslateAccelerator(args[0], args[1], (int)/*64*/args[2]);} - public int /*long*/ method13(int /*long*/[] args) {return GetOptionKeyPath(args[0], (int)/*64*/args[1]);} - public int /*long*/ method14(int /*long*/[] args) {return GetDropTarget(args[0], args[1]);} - public int /*long*/ method15(int /*long*/[] args) {return GetExternal(args[0]);} - public int /*long*/ method16(int /*long*/[] args) {return TranslateUrl((int)/*64*/args[0], args[1], args[2]);} - public int /*long*/ method17(int /*long*/[] args) {return FilterDataObject(args[0], args[1]);} + public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long /*int*/ method3(long /*int*/[] args) {return ShowContextMenu((int)/*64*/args[0], args[1], args[2], args[3]);} + public long /*int*/ method4(long /*int*/[] args) {return GetHostInfo(args[0]);} + public long /*int*/ method5(long /*int*/[] args) {return ShowUI((int)/*64*/args[0], args[1], args[2], args[3], args[4]);} + public long /*int*/ method6(long /*int*/[] args) {return HideUI();} + public long /*int*/ method7(long /*int*/[] args) {return UpdateUI();} + public long /*int*/ method8(long /*int*/[] args) {return EnableModeless((int)/*64*/args[0]);} + public long /*int*/ method9(long /*int*/[] args) {return OnDocWindowActivate((int)/*64*/args[0]);} + public long /*int*/ method10(long /*int*/[] args) {return OnFrameWindowActivate((int)/*64*/args[0]);} + public long /*int*/ method11(long /*int*/[] args) {return ResizeBorder(args[0], args[1], (int)/*64*/args[2]);} + public long /*int*/ method12(long /*int*/[] args) {return TranslateAccelerator(args[0], args[1], (int)/*64*/args[2]);} + public long /*int*/ method13(long /*int*/[] args) {return GetOptionKeyPath(args[0], (int)/*64*/args[1]);} + public long /*int*/ method14(long /*int*/[] args) {return GetDropTarget(args[0], args[1]);} + public long /*int*/ method15(long /*int*/[] args) {return GetExternal(args[0]);} + public long /*int*/ method16(long /*int*/[] args) {return TranslateUrl((int)/*64*/args[0], args[1], args[2]);} + public long /*int*/ method17(long /*int*/[] args) {return FilterDataObject(args[0], args[1]);} }; iDocHostShowUI = new COMObject(new int[]{2, 0, 0, 7, C.PTR_SIZEOF == 4 ? 7 : 6}){ - public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);} - public int /*long*/ method1(int /*long*/[] args) {return AddRef();} - public int /*long*/ method2(int /*long*/[] args) {return Release();} - public int /*long*/ method3(int /*long*/[] args) {return ShowMessage(args[0], args[1], args[2], (int)/*64*/args[3], args[4], (int)/*64*/args[5], args[6]);} - public int /*long*/ method4(int /*long*/[] args) { + public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long /*int*/ method3(long /*int*/[] args) {return ShowMessage(args[0], args[1], args[2], (int)/*64*/args[3], args[4], (int)/*64*/args[5], args[6]);} + public long /*int*/ method4(long /*int*/[] args) { if (args.length == 7) { return ShowHelp(args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4], (int)/*64*/args[5], args[6]); } else { @@ -74,39 +74,39 @@ protected void createCOMInterfaces () { } }; iServiceProvider = new COMObject(new int[]{2, 0, 0, 3}){ - public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);} - public int /*long*/ method1(int /*long*/[] args) {return AddRef();} - public int /*long*/ method2(int /*long*/[] args) {return Release();} - public int /*long*/ method3(int /*long*/[] args) {return QueryService(args[0], args[1], args[2]);} + public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long /*int*/ method3(long /*int*/[] args) {return QueryService(args[0], args[1], args[2]);} }; iInternetSecurityManager = new COMObject(new int[]{2, 0, 0, 1, 1, 3, 4, 8, 7, 3, 3}){ - public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);} - public int /*long*/ method1(int /*long*/[] args) {return AddRef();} - public int /*long*/ method2(int /*long*/[] args) {return Release();} - public int /*long*/ method3(int /*long*/[] args) {return SetSecuritySite(args[0]);} - public int /*long*/ method4(int /*long*/[] args) {return GetSecuritySite(args[0]);} - public int /*long*/ method5(int /*long*/[] args) {return MapUrlToZone(args[0], args[1], (int)/*64*/args[2]);} - public int /*long*/ method6(int /*long*/[] args) {return GetSecurityId(args[0], args[1], args[2], args[3]);} - public int /*long*/ method7(int /*long*/[] args) {return ProcessUrlAction(args[0], (int)/*64*/args[1], args[2], (int)/*64*/args[3], args[4], (int)/*64*/args[5], (int)/*64*/args[6], (int)/*64*/args[7]);} - public int /*long*/ method8(int /*long*/[] args) {return QueryCustomPolicy(args[0], args[1], args[2], args[3], args[4], (int)/*64*/args[5], (int)/*64*/args[6]);} - public int /*long*/ method9(int /*long*/[] args) {return SetZoneMapping((int)/*64*/args[0], args[1], (int)/*64*/args[2]);} - public int /*long*/ method10(int /*long*/[] args) {return GetZoneMappings((int)/*64*/args[0], args[1], (int)/*64*/args[2]);} + public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long /*int*/ method3(long /*int*/[] args) {return SetSecuritySite(args[0]);} + public long /*int*/ method4(long /*int*/[] args) {return GetSecuritySite(args[0]);} + public long /*int*/ method5(long /*int*/[] args) {return MapUrlToZone(args[0], args[1], (int)/*64*/args[2]);} + public long /*int*/ method6(long /*int*/[] args) {return GetSecurityId(args[0], args[1], args[2], args[3]);} + public long /*int*/ method7(long /*int*/[] args) {return ProcessUrlAction(args[0], (int)/*64*/args[1], args[2], (int)/*64*/args[3], args[4], (int)/*64*/args[5], (int)/*64*/args[6], (int)/*64*/args[7]);} + public long /*int*/ method8(long /*int*/[] args) {return QueryCustomPolicy(args[0], args[1], args[2], args[3], args[4], (int)/*64*/args[5], (int)/*64*/args[6]);} + public long /*int*/ method9(long /*int*/[] args) {return SetZoneMapping((int)/*64*/args[0], args[1], (int)/*64*/args[2]);} + public long /*int*/ method10(long /*int*/[] args) {return GetZoneMappings((int)/*64*/args[0], args[1], (int)/*64*/args[2]);} }; iOleCommandTarget = new COMObject(new int[]{2, 0, 0, 4, 5}) { - public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);} - public int /*long*/ method1(int /*long*/[] args) {return AddRef();} - public int /*long*/ method2(int /*long*/[] args) {return Release();} - public int /*long*/ method3(int /*long*/[] args) {return QueryStatus(args[0], (int)/*64*/args[1], args[2], args[3]);} - public int /*long*/ method4(int /*long*/[] args) {return Exec(args[0], (int)/*64*/args[1], (int)/*64*/args[2], args[3], args[4]);} + public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long /*int*/ method3(long /*int*/[] args) {return QueryStatus(args[0], (int)/*64*/args[1], args[2], args[3]);} + public long /*int*/ method4(long /*int*/[] args) {return Exec(args[0], (int)/*64*/args[1], (int)/*64*/args[2], args[3], args[4]);} }; iAuthenticate = new COMObject(new int[]{2, 0, 0, 3}){ - public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);} - public int /*long*/ method1(int /*long*/[] args) {return AddRef();} - public int /*long*/ method2(int /*long*/[] args) {return Release();} - public int /*long*/ method3(int /*long*/[] args) {return Authenticate(args[0], args[1], args[2]);} + public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long /*int*/ method3(long /*int*/[] args) {return Authenticate(args[0], args[1], args[2]);} }; iDispatch = new COMObject (new int[] {2, 0, 0, 1, 3, 5, 8}) { - public int /*long*/ method0 (int /*long*/[] args) { + public long /*int*/ method0 (long /*int*/[] args) { /* * IDispatch check must be done here instead of in the shared QueryInterface * implementation, to avoid answering the superclass's IDispatch implementation @@ -115,18 +115,18 @@ protected void createCOMInterfaces () { GUID guid = new GUID (); COM.MoveMemory (guid, args[0], GUID.sizeof); if (COM.IsEqualGUID (guid, COM.IIDIDispatch)) { - COM.MoveMemory (args[1], new int /*long*/[] {iDispatch.getAddress ()}, OS.PTR_SIZEOF); + COM.MoveMemory (args[1], new long /*int*/[] {iDispatch.getAddress ()}, OS.PTR_SIZEOF); AddRef (); return COM.S_OK; } return QueryInterface (args[0], args[1]); } - public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();} - public int /*long*/ method2 (int /*long*/[] args) {return Release ();} - public int /*long*/ method3 (int /*long*/[] args) {return GetTypeInfoCount (args[0]);} - public int /*long*/ method4 (int /*long*/[] args) {return GetTypeInfo ((int)/*64*/args[0], (int)/*64*/args[1], args[2]);} - public int /*long*/ method5 (int /*long*/[] args) {return GetIDsOfNames ((int)/*64*/args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], args[4]);} - public int /*long*/ method6 (int /*long*/[] args) {return Invoke ((int)/*64*/args[0], (int)/*64*/args[1], (int)/*64*/args[2], (int)/*64*/args[3], args[4], args[5], args[6], args[7]);} + public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();} + public long /*int*/ method2 (long /*int*/[] args) {return Release ();} + public long /*int*/ method3 (long /*int*/[] args) {return GetTypeInfoCount (args[0]);} + public long /*int*/ method4 (long /*int*/[] args) {return GetTypeInfo ((int)/*64*/args[0], (int)/*64*/args[1], args[2]);} + public long /*int*/ method5 (long /*int*/[] args) {return GetIDsOfNames ((int)/*64*/args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], args[4]);} + public long /*int*/ method6 (long /*int*/[] args) {return Invoke ((int)/*64*/args[0], (int)/*64*/args[1], (int)/*64*/args[2], (int)/*64*/args[3], args[4], args[5], args[6], args[7]);} }; } @@ -167,38 +167,38 @@ protected int AddRef() { return super.AddRef(); } -protected int QueryInterface(int /*long*/ riid, int /*long*/ ppvObject) { +protected int QueryInterface(long /*int*/ riid, long /*int*/ ppvObject) { int result = super.QueryInterface(riid, ppvObject); if (result == COM.S_OK) return result; if (riid == 0 || ppvObject == 0) return COM.E_INVALIDARG; GUID guid = new GUID(); COM.MoveMemory(guid, riid, GUID.sizeof); if (COM.IsEqualGUID(guid, COM.IIDIDocHostUIHandler)) { - COM.MoveMemory(ppvObject, new int /*long*/[] {iDocHostUIHandler.getAddress()}, OS.PTR_SIZEOF); + COM.MoveMemory(ppvObject, new long /*int*/[] {iDocHostUIHandler.getAddress()}, OS.PTR_SIZEOF); AddRef(); return COM.S_OK; } if (COM.IsEqualGUID(guid, COM.IIDIDocHostShowUI)) { - COM.MoveMemory(ppvObject, new int /*long*/[] {iDocHostShowUI.getAddress()}, OS.PTR_SIZEOF); + COM.MoveMemory(ppvObject, new long /*int*/[] {iDocHostShowUI.getAddress()}, OS.PTR_SIZEOF); AddRef(); return COM.S_OK; } if (COM.IsEqualGUID(guid, COM.IIDIServiceProvider)) { - COM.MoveMemory(ppvObject, new int /*long*/[] {iServiceProvider.getAddress()}, OS.PTR_SIZEOF); + COM.MoveMemory(ppvObject, new long /*int*/[] {iServiceProvider.getAddress()}, OS.PTR_SIZEOF); AddRef(); return COM.S_OK; } if (COM.IsEqualGUID(guid, COM.IIDIInternetSecurityManager)) { - COM.MoveMemory(ppvObject, new int /*long*/[] {iInternetSecurityManager.getAddress()}, OS.PTR_SIZEOF); + COM.MoveMemory(ppvObject, new long /*int*/[] {iInternetSecurityManager.getAddress()}, OS.PTR_SIZEOF); AddRef(); return COM.S_OK; } if (COM.IsEqualGUID(guid, COM.IIDIOleCommandTarget)) { - COM.MoveMemory(ppvObject, new int /*long*/[] {iOleCommandTarget.getAddress()}, OS.PTR_SIZEOF); + COM.MoveMemory(ppvObject, new long /*int*/[] {iOleCommandTarget.getAddress()}, OS.PTR_SIZEOF); AddRef(); return COM.S_OK; } - COM.MoveMemory(ppvObject, new int /*long*/[] {0}, OS.PTR_SIZEOF); + COM.MoveMemory(ppvObject, new long /*int*/[] {0}, OS.PTR_SIZEOF); return COM.E_NOINTERFACE; } @@ -208,21 +208,21 @@ int EnableModeless(int EnableModeless) { return COM.E_NOTIMPL; } -int FilterDataObject(int /*long*/ pDO, int /*long*/ ppDORet) { +int FilterDataObject(long /*int*/ pDO, long /*int*/ ppDORet) { return COM.E_NOTIMPL; } -int GetDropTarget(int /*long*/ pDropTarget, int /*long*/ ppDropTarget) { +int GetDropTarget(long /*int*/ pDropTarget, long /*int*/ ppDropTarget) { return COM.E_NOTIMPL; } -int GetExternal(int /*long*/ ppDispatch) { - OS.MoveMemory (ppDispatch, new int /*long*/[] {iDispatch.getAddress()}, C.PTR_SIZEOF); +int GetExternal(long /*int*/ ppDispatch) { + OS.MoveMemory (ppDispatch, new long /*int*/[] {iDispatch.getAddress()}, C.PTR_SIZEOF); AddRef (); return COM.S_OK; } -int GetHostInfo(int /*long*/ pInfo) { +int GetHostInfo(long /*int*/ pInfo) { int info = IE.DOCHOSTUIFLAG_THEME; IE browser = (IE)((Browser)getParent().getParent()).webBrowser; if ((browser.style & SWT.BORDER) == 0) info |= IE.DOCHOSTUIFLAG_NO3DOUTERBORDER; @@ -233,7 +233,7 @@ int GetHostInfo(int /*long*/ pInfo) { return COM.S_OK; } -int GetOptionKeyPath(int /*long*/ pchKey, int dw) { +int GetOptionKeyPath(long /*int*/ pchKey, int dw) { return COM.E_NOTIMPL; } @@ -254,11 +254,11 @@ protected int Release() { return super.Release(); } -int ResizeBorder(int /*long*/ prcBorder, int /*long*/ pUIWindow, int fFrameWindow) { +int ResizeBorder(long /*int*/ prcBorder, long /*int*/ pUIWindow, int fFrameWindow) { return COM.E_NOTIMPL; } -int ShowContextMenu(int dwID, int /*long*/ ppt, int /*long*/ pcmdtReserved, int /*long*/ pdispReserved) { +int ShowContextMenu(int dwID, long /*int*/ ppt, long /*int*/ pcmdtReserved, long /*int*/ pdispReserved) { Browser browser = (Browser)getParent().getParent(); Event event = new Event(); POINT pt = new POINT(); @@ -279,11 +279,11 @@ int ShowContextMenu(int dwID, int /*long*/ ppt, int /*long*/ pcmdtReserved, int return COM.S_FALSE; } -int ShowUI(int dwID, int /*long*/ pActiveObject, int /*long*/ pCommandTarget, int /*long*/ pFrame, int /*long*/ pDoc) { +int ShowUI(int dwID, long /*int*/ pActiveObject, long /*int*/ pCommandTarget, long /*int*/ pFrame, long /*int*/ pDoc) { return COM.S_FALSE; } -int TranslateAccelerator(int /*long*/ lpMsg, int /*long*/ pguidCmdGroup, int nCmdID) { +int TranslateAccelerator(long /*int*/ lpMsg, long /*int*/ pguidCmdGroup, int nCmdID) { /* * Feature in Internet Explorer. By default the embedded Internet Explorer control runs * the Internet Explorer shortcuts (e.g. Ctrl+F for Find). This overrides the shortcuts @@ -293,8 +293,8 @@ int TranslateAccelerator(int /*long*/ lpMsg, int /*long*/ pguidCmdGroup, int nCm Menu menubar = getShell().getMenuBar(); if (menubar != null && !menubar.isDisposed() && menubar.isEnabled()) { Shell shell = menubar.getShell(); - int /*long*/ hwnd = shell.handle; - int /*long*/ hAccel = OS.SendMessage(hwnd, OS.WM_APP+1, 0, 0); + long /*int*/ hwnd = shell.handle; + long /*int*/ hAccel = OS.SendMessage(hwnd, OS.WM_APP+1, 0, 0); if (hAccel != 0) { MSG msg = new MSG(); OS.MoveMemory(msg, lpMsg, MSG.sizeof); @@ -419,7 +419,7 @@ int TranslateAccelerator(int /*long*/ lpMsg, int /*long*/ pguidCmdGroup, int nCm return result; } -int TranslateUrl(int dwTranslate, int /*long*/ pchURLIn, int /*long*/ ppchURLOut) { +int TranslateUrl(int dwTranslate, long /*int*/ pchURLIn, long /*int*/ ppchURLOut) { return COM.E_NOTIMPL; } @@ -429,13 +429,13 @@ int UpdateUI() { /* IDocHostShowUI */ -int ShowMessage(int /*long*/ hwnd, int /*long*/ lpstrText, int /*long*/ lpstrCaption, int dwType, int /*long*/ lpstrHelpFile, int dwHelpContext, int /*long*/ plResult) { +int ShowMessage(long /*int*/ hwnd, long /*int*/ lpstrText, long /*int*/ lpstrCaption, int dwType, long /*int*/ lpstrHelpFile, int dwHelpContext, long /*int*/ plResult) { boolean ignore = ignoreNextMessage || ignoreAllMessages; ignoreNextMessage = false; return ignore ? COM.S_OK : COM.S_FALSE; } -int ShowHelp_64(int /*long*/ hwnd, int /*long*/ pszHelpFile, int uCommand, int dwData, long pt, int /*long*/ pDispatchObjectHit) { +int ShowHelp_64(long /*int*/ hwnd, long /*int*/ pszHelpFile, int uCommand, int dwData, long pt, long /*int*/ pDispatchObjectHit) { POINT point = new POINT(); OS.MoveMemory(point, new long[]{pt}, 8); return ShowHelp(hwnd, pszHelpFile, uCommand, dwData, point.x, point.y, pDispatchObjectHit); @@ -446,7 +446,7 @@ int ShowHelp_64(int /*long*/ hwnd, int /*long*/ pszHelpFile, int uCommand, int d * ptMouse_x and ptMouse_y. Otherwise the Browser crashes when the user presses F1 to invoke * the help. */ -int ShowHelp(int /*long*/ hwnd, int /*long*/ pszHelpFile, int uCommand, int dwData, int ptMouse_x, int ptMouse_y, int /*long*/ pDispatchObjectHit) { +int ShowHelp(long /*int*/ hwnd, long /*int*/ pszHelpFile, int uCommand, int dwData, int ptMouse_x, int ptMouse_y, long /*int*/ pDispatchObjectHit) { Browser browser = (Browser)getParent().getParent(); Event event = new Event(); event.type = SWT.Help; @@ -467,35 +467,35 @@ int ShowHelp(int /*long*/ hwnd, int /*long*/ pszHelpFile, int uCommand, int dwDa /* IServiceProvider */ -int QueryService(int /*long*/ guidService, int /*long*/ riid, int /*long*/ ppvObject) { +int QueryService(long /*int*/ guidService, long /*int*/ riid, long /*int*/ ppvObject) { if (riid == 0 || ppvObject == 0) return COM.E_INVALIDARG; GUID guid = new GUID(); COM.MoveMemory(guid, riid, GUID.sizeof); if (COM.IsEqualGUID(guid, COM.IIDIInternetSecurityManager)) { - COM.MoveMemory(ppvObject, new int /*long*/[] {iInternetSecurityManager.getAddress()}, OS.PTR_SIZEOF); + COM.MoveMemory(ppvObject, new long /*int*/[] {iInternetSecurityManager.getAddress()}, OS.PTR_SIZEOF); AddRef(); return COM.S_OK; } if (COM.IsEqualGUID(guid, COM.IIDIAuthenticate)) { - COM.MoveMemory(ppvObject, new int /*long*/[] {iAuthenticate.getAddress()}, OS.PTR_SIZEOF); + COM.MoveMemory(ppvObject, new long /*int*/[] {iAuthenticate.getAddress()}, OS.PTR_SIZEOF); AddRef(); return COM.S_OK; } - COM.MoveMemory(ppvObject, new int /*long*/[] {0}, OS.PTR_SIZEOF); + COM.MoveMemory(ppvObject, new long /*int*/[] {0}, OS.PTR_SIZEOF); return COM.E_NOINTERFACE; } /* IInternetSecurityManager */ -int SetSecuritySite(int /*long*/ pSite) { +int SetSecuritySite(long /*int*/ pSite) { return IE.INET_E_DEFAULT_ACTION; } -int GetSecuritySite(int /*long*/ ppSite) { +int GetSecuritySite(long /*int*/ ppSite) { return IE.INET_E_DEFAULT_ACTION; } -int MapUrlToZone(int /*long*/ pwszUrl, int /*long*/ pdwZone, int dwFlags) { +int MapUrlToZone(long /*int*/ pwszUrl, long /*int*/ pdwZone, int dwFlags) { /* * Feature in IE. HTML rendered in memory does not enable local links * but the same HTML document loaded through a local file is permitted @@ -514,11 +514,11 @@ int MapUrlToZone(int /*long*/ pwszUrl, int /*long*/ pdwZone, int dwFlags) { return IE.INET_E_DEFAULT_ACTION; } -int GetSecurityId(int /*long*/ pwszUrl, int /*long*/ pbSecurityId, int /*long*/ pcbSecurityId, int /*long*/ dwReserved) { +int GetSecurityId(long /*int*/ pwszUrl, long /*int*/ pbSecurityId, long /*int*/ pcbSecurityId, long /*int*/ dwReserved) { return IE.INET_E_DEFAULT_ACTION; } -int ProcessUrlAction(int /*long*/ pwszUrl, int dwAction, int /*long*/ pPolicy, int cbPolicy, int /*long*/ pContext, int cbContext, int dwFlags, int dwReserved) { +int ProcessUrlAction(long /*int*/ pwszUrl, int dwAction, long /*int*/ pPolicy, int cbPolicy, long /*int*/ pContext, int cbContext, int dwFlags, int dwReserved) { ignoreNextMessage = false; /* @@ -602,24 +602,24 @@ boolean canExecuteApplets () { return canExecuteApplets.booleanValue (); } -int QueryCustomPolicy(int /*long*/ pwszUrl, int /*long*/ guidKey, int /*long*/ ppPolicy, int /*long*/ pcbPolicy, int /*long*/ pContext, int cbContext, int dwReserved) { +int QueryCustomPolicy(long /*int*/ pwszUrl, long /*int*/ guidKey, long /*int*/ ppPolicy, long /*int*/ pcbPolicy, long /*int*/ pContext, int cbContext, int dwReserved) { return IE.INET_E_DEFAULT_ACTION; } -int SetZoneMapping(int dwZone, int /*long*/ lpszPattern, int dwFlags) { +int SetZoneMapping(int dwZone, long /*int*/ lpszPattern, int dwFlags) { return IE.INET_E_DEFAULT_ACTION; } -int GetZoneMappings(int dwZone, int /*long*/ ppenumString, int dwFlags) { +int GetZoneMappings(int dwZone, long /*int*/ ppenumString, int dwFlags) { return COM.E_NOTIMPL; } /* IOleCommandTarget */ -int QueryStatus(int /*long*/ pguidCmdGroup, int cCmds, int /*long*/ prgCmds, int /*long*/ pCmdText) { +int QueryStatus(long /*int*/ pguidCmdGroup, int cCmds, long /*int*/ prgCmds, long /*int*/ pCmdText) { return COM.E_NOTSUPPORTED; } -int Exec(int /*long*/ pguidCmdGroup, int nCmdID, int nCmdExecOpt, int /*long*/ pvaIn, int /*long*/ pvaOut) { +int Exec(long /*int*/ pguidCmdGroup, int nCmdID, int nCmdExecOpt, long /*int*/ pvaIn, long /*int*/ pvaOut) { if (pguidCmdGroup != 0) { GUID guid = new GUID(); COM.MoveMemory(guid, pguidCmdGroup, GUID.sizeof); @@ -648,7 +648,7 @@ int Exec(int /*long*/ pguidCmdGroup, int nCmdID, int nCmdExecOpt, int /*long*/ p /* IAuthenticate */ -int Authenticate (int /*long*/ hwnd, int /*long*/ szUsername, int /*long*/ szPassword) { +int Authenticate (long /*int*/ hwnd, long /*int*/ szUsername, long /*int*/ szPassword) { IE browser = (IE)((Browser)getParent ().getParent ()).webBrowser; for (int i = 0; i < browser.authenticationListeners.length; i++) { AuthenticationEvent event = new AuthenticationEvent (browser.browser); @@ -658,37 +658,37 @@ int Authenticate (int /*long*/ hwnd, int /*long*/ szUsername, int /*long*/ szPas if (event.user != null && event.password != null) { TCHAR user = new TCHAR (0, event.user, true); int size = user.length () * TCHAR.sizeof; - int /*long*/ userPtr = COM.CoTaskMemAlloc (size); + long /*int*/ userPtr = COM.CoTaskMemAlloc (size); OS.MoveMemory (userPtr, user, size); TCHAR password = new TCHAR (0, event.password, true); size = password.length () * TCHAR.sizeof; - int /*long*/ passwordPtr = COM.CoTaskMemAlloc (size); + long /*int*/ passwordPtr = COM.CoTaskMemAlloc (size); OS.MoveMemory (passwordPtr, password, size); - C.memmove (hwnd, new int /*long*/[] {0}, C.PTR_SIZEOF); - C.memmove (szUsername, new int /*long*/[] {userPtr}, C.PTR_SIZEOF); - C.memmove (szPassword, new int /*long*/[] {passwordPtr}, C.PTR_SIZEOF); + C.memmove (hwnd, new long /*int*/[] {0}, C.PTR_SIZEOF); + C.memmove (szUsername, new long /*int*/[] {userPtr}, C.PTR_SIZEOF); + C.memmove (szPassword, new long /*int*/[] {passwordPtr}, C.PTR_SIZEOF); return COM.S_OK; } } /* no listener handled the challenge, so defer to the native dialog */ - C.memmove (hwnd, new int /*long*/[] {getShell().handle}, C.PTR_SIZEOF); + C.memmove (hwnd, new long /*int*/[] {getShell().handle}, C.PTR_SIZEOF); return COM.S_OK; } /* IDispatch */ -int GetTypeInfoCount (int /*long*/ pctinfo) { +int GetTypeInfoCount (long /*int*/ pctinfo) { C.memmove (pctinfo, new int[] {0}, 4); return COM.S_OK; } -int GetTypeInfo (int iTInfo, int lcid, int /*long*/ ppTInfo) { +int GetTypeInfo (int iTInfo, int lcid, long /*int*/ ppTInfo) { return COM.S_OK; } -int GetIDsOfNames (int riid, int /*long*/ rgszNames, int cNames, int lcid, int /*long*/ rgDispId) { - int /*long*/[] ptr = new int /*long*/[1]; +int GetIDsOfNames (int riid, long /*int*/ rgszNames, int cNames, int lcid, long /*int*/ rgDispId) { + long /*int*/[] ptr = new long /*int*/[1]; OS.MoveMemory (ptr, rgszNames, C.PTR_SIZEOF); int length = OS.wcslen (ptr[0]); char[] buffer = new char[length]; @@ -710,12 +710,12 @@ int GetIDsOfNames (int riid, int /*long*/ rgszNames, int cNames, int lcid, int / return result; } -int Invoke (int dispIdMember, int /*long*/ riid, int lcid, int dwFlags, int /*long*/ pDispParams, int /*long*/ pVarResult, int /*long*/ pExcepInfo, int /*long*/ pArgErr) { +int Invoke (int dispIdMember, long /*int*/ riid, int lcid, int dwFlags, long /*int*/ pDispParams, long /*int*/ pVarResult, long /*int*/ pExcepInfo, long /*int*/ pArgErr) { IE ie = (IE)((Browser)getParent ().getParent ()).webBrowser; Hashtable functions = ie.functions; if (functions == null) { if (pVarResult != 0) { - COM.MoveMemory (pVarResult, new int /*long*/[] {0}, C.PTR_SIZEOF); + COM.MoveMemory (pVarResult, new long /*int*/[] {0}, C.PTR_SIZEOF); } return COM.S_OK; } @@ -724,17 +724,17 @@ int Invoke (int dispIdMember, int /*long*/ riid, int lcid, int dwFlags, int /*lo COM.MoveMemory (dispParams, pDispParams, DISPPARAMS.sizeof); if (dispParams.cArgs != 3) { if (pVarResult != 0) { - COM.MoveMemory (pVarResult, new int /*long*/[] {0}, C.PTR_SIZEOF); + COM.MoveMemory (pVarResult, new long /*int*/[] {0}, C.PTR_SIZEOF); } return COM.S_OK; } - int /*long*/ ptr = dispParams.rgvarg + 2 * Variant.sizeof; + long /*int*/ ptr = dispParams.rgvarg + 2 * Variant.sizeof; Variant variant = Variant.win32_new (ptr); if (variant.getType () != COM.VT_I4) { variant.dispose (); if (pVarResult != 0) { - COM.MoveMemory (pVarResult, new int /*long*/[] {0}, C.PTR_SIZEOF); + COM.MoveMemory (pVarResult, new long /*int*/[] {0}, C.PTR_SIZEOF); } return COM.S_OK; } @@ -742,7 +742,7 @@ int Invoke (int dispIdMember, int /*long*/ riid, int lcid, int dwFlags, int /*lo variant.dispose (); if (index <= 0) { if (pVarResult != 0) { - COM.MoveMemory (pVarResult, new int /*long*/[] {0}, C.PTR_SIZEOF); + COM.MoveMemory (pVarResult, new long /*int*/[] {0}, C.PTR_SIZEOF); } return COM.S_OK; } @@ -753,7 +753,7 @@ int Invoke (int dispIdMember, int /*long*/ riid, int lcid, int dwFlags, int /*lo if (type != COM.VT_BSTR) { variant.dispose (); if (pVarResult != 0) { - COM.MoveMemory (pVarResult, new int /*long*/[] {0}, C.PTR_SIZEOF); + COM.MoveMemory (pVarResult, new long /*int*/[] {0}, C.PTR_SIZEOF); } return COM.S_OK; } @@ -911,14 +911,14 @@ Variant convertToJS (Object value) { Variant arrayType = ihtmlWindow2.getProperty (rgdispid[0]); ihtmlWindow2.dispose (); IDispatch arrayTypeDispatch = arrayType.getDispatch (); - int /*long*/[] result = new int /*long*/[1]; + long /*int*/[] result = new long /*int*/[1]; int rc = arrayTypeDispatch.QueryInterface (COM.IIDIDispatchEx, result); arrayType.dispose (); if (rc != COM.S_OK) return new Variant (); IDispatchEx arrayTypeDispatchEx = new IDispatchEx (result[0]); result[0] = 0; - int /*long*/ resultPtr = OS.GlobalAlloc (OS.GMEM_FIXED | OS.GMEM_ZEROINIT, VARIANT.sizeof); + long /*int*/ resultPtr = OS.GlobalAlloc (OS.GMEM_FIXED | OS.GMEM_ZEROINIT, VARIANT.sizeof); DISPPARAMS params = new DISPPARAMS (); rc = arrayTypeDispatchEx.InvokeEx (COM.DISPID_VALUE, COM.LOCALE_USER_DEFAULT, COM.DISPATCH_CONSTRUCT, params, resultPtr, null, 0); if (rc != COM.S_OK) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/DragSource.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/DragSource.java index 28d0696e46..04f7e2efef 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/DragSource.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/DragSource.java @@ -105,7 +105,7 @@ public class DragSource extends Widget { static Callback dragSource2Args, dragSource3Args, dragSource4Args, dragSource5Args, dragSource6Args; static final byte[] SWT_OBJECT = {'S', 'W', 'T', '_', 'O', 'B', 'J', 'E', 'C', 'T', '\0'}; - static int /*long*/ proc2 = 0, proc3 = 0, proc4 = 0, proc5 = 0, proc6 = 0; + static long /*int*/ proc2 = 0, proc3 = 0, proc4 = 0, proc5 = 0, proc6 = 0; NSString paths[]; boolean exist[]; @@ -135,10 +135,10 @@ public class DragSource extends Widget { proc6 = dragSource6Args.getAddress(); if (proc6 == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS); - int /*long*/ cls = OS.objc_allocateClassPair(OS.class_NSObject, className, 0); + long /*int*/ cls = OS.objc_allocateClassPair(OS.class_NSObject, className, 0); OS.class_addIvar(cls, SWT_OBJECT, size, (byte)align, types); - int /*long*/ draggedImage_endedAt_operationProc = OS.CALLBACK_draggedImage_endedAt_operation_(proc5); + long /*int*/ draggedImage_endedAt_operationProc = OS.CALLBACK_draggedImage_endedAt_operation_(proc5); // Add the NSDraggingSource callbacks OS.class_addMethod(cls, OS.sel_draggingSourceOperationMaskForLocal_, proc3, "@:I"); @@ -163,7 +163,7 @@ public class DragSource extends Widget { static final String DEFAULT_DRAG_SOURCE_EFFECT = "DEFAULT_DRAG_SOURCE_EFFECT"; //$NON-NLS-1$ - private int /*long*/ delegateJniRef; + private long /*int*/ delegateJniRef; private Point dragOffset; /** @@ -249,17 +249,17 @@ public DragSource(Control control, int style) { // Tables and trees already implement dragging, so we need to override their drag methods instead of creating a dragging source. if (control instanceof Tree || control instanceof Table) { - int /*long*/ cls = OS.object_getClass(control.view.id); + long /*int*/ cls = OS.object_getClass(control.view.id); if (cls == 0) { DND.error(DND.ERROR_CANNOT_INIT_DRAG); } // If we already added it, no need to do it again. - int /*long*/ procPtr = OS.class_getMethodImplementation(cls, OS.sel_draggingSourceOperationMaskForLocal_); + long /*int*/ procPtr = OS.class_getMethodImplementation(cls, OS.sel_draggingSourceOperationMaskForLocal_); if (procPtr == proc3) return; - int /*long*/ draggedImage_endedAt_operationProc = OS.CALLBACK_draggedImage_endedAt_operation_(proc5); + long /*int*/ draggedImage_endedAt_operationProc = OS.CALLBACK_draggedImage_endedAt_operation_(proc5); // Add the NSDraggingSource overrides. OS.class_addMethod(cls, OS.sel_draggingSourceOperationMaskForLocal_, proc3, "@:I"); @@ -312,21 +312,21 @@ public void addDragListener(DragSourceListener listener) { addListener (DND.DragEnd, typedListener); } -void dndCallSuper(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, NSPoint arg1, int /*long*/ arg2) { +void dndCallSuper(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, NSPoint arg1, long /*int*/ arg2) { objc_super super_struct = new objc_super(); super_struct.receiver = id; super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass); OS.objc_msgSendSuper(super_struct, sel, arg0, arg1, arg2); } -void dndCallSuper(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1) { +void dndCallSuper(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1) { objc_super super_struct = new objc_super(); super_struct.receiver = id; super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass); OS.objc_msgSendSuper(super_struct, sel, arg0, arg1); } -int /*long*/ dndCallSuperObject(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3) { +long /*int*/ dndCallSuperObject(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3) { objc_super super_struct = new objc_super(); super_struct.receiver = id; super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass); @@ -413,13 +413,13 @@ void dragOutlineViewStart(Event dragDetectEvent) { dragOffset = new Point(event.offsetX, event.offsetY); } -void draggedImage_beganAt(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1) { +void draggedImage_beganAt(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1) { if (new NSObject(id).isKindOfClass(OS.class_NSTableView)) { dndCallSuper(id, sel, arg0, arg1); } } -void draggedImage_endedAt_operation(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, NSPoint arg1, int /*long*/ arg2) { +void draggedImage_endedAt_operation(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, NSPoint arg1, long /*int*/ arg2) { int swtOperation = osOpToOp(arg2); NSFileManager fileManager = NSFileManager.defaultManager(); if (paths != null) { @@ -452,7 +452,7 @@ void draggedImage_endedAt_operation(int /*long*/ id, int /*long*/ sel, int /*lon } } -int /*long*/ dragImageForRowsWithIndexes_tableColumns_event_offset(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3) { +long /*int*/ dragImageForRowsWithIndexes_tableColumns_event_offset(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3) { if (dragImageFromListener != null) { NSPoint point = new NSPoint(); point.x = dragOffset.x; @@ -467,12 +467,12 @@ int /*long*/ dragImageForRowsWithIndexes_tableColumns_event_offset(int /*long*/ /** * Cocoa NSDraggingSource implementations */ -int /*long*/ draggingSourceOperationMaskForLocal(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0) { +long /*int*/ draggingSourceOperationMaskForLocal(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) { // Drag operations are same for local or remote drags. return dragOperations; } -static int /*long*/ dragSourceProc(int /*long*/ id, int /*long*/ sel) { +static long /*int*/ dragSourceProc(long /*int*/ id, long /*int*/ sel) { Display display = Display.findDisplay(Thread.currentThread()); if (display == null || display.isDisposed()) return 0; Widget widget = display.findWidget(id); @@ -494,7 +494,7 @@ static int /*long*/ dragSourceProc(int /*long*/ id, int /*long*/ sel) { return 0; } -static int /*long*/ dragSourceProc(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0) { +static long /*int*/ dragSourceProc(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) { Display display = Display.findDisplay(Thread.currentThread()); if (display == null || display.isDisposed()) return 0; Widget widget = display.findWidget(id); @@ -516,7 +516,7 @@ static int /*long*/ dragSourceProc(int /*long*/ id, int /*long*/ sel, int /*long return 0; } -static int /*long*/ dragSourceProc(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1) { +static long /*int*/ dragSourceProc(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1) { Display display = Display.findDisplay(Thread.currentThread()); if (display == null || display.isDisposed()) return 0; Widget widget = display.findWidget(id); @@ -540,7 +540,7 @@ static int /*long*/ dragSourceProc(int /*long*/ id, int /*long*/ sel, int /*long return 0; } -static int /*long*/ dragSourceProc(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2) { +static long /*int*/ dragSourceProc(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2) { Display display = Display.findDisplay(Thread.currentThread()); if (display == null || display.isDisposed()) return 0; Widget widget = display.findWidget(id); @@ -564,7 +564,7 @@ static int /*long*/ dragSourceProc(int /*long*/ id, int /*long*/ sel, int /*long return 0; } -static int /*long*/ dragSourceProc(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3) { +static long /*int*/ dragSourceProc(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3) { Display display = Display.findDisplay(Thread.currentThread()); if (display == null || display.isDisposed()) return 0; Widget widget = display.findWidget(id); @@ -658,7 +658,7 @@ public Transfer[] getTransfer(){ /** * We always want the modifier keys to potentially update the drag. */ -boolean ignoreModifierKeysWhileDragging(int /*long*/ id, int /*long*/ sel) { +boolean ignoreModifierKeysWhileDragging(long /*int*/ id, long /*int*/ sel) { return false; } @@ -701,7 +701,7 @@ int opToOsOp(int operation) { return osOperation; } -int osOpToOp(int /*long*/ osOperation){ +int osOpToOp(long /*int*/ osOperation){ int operation = 0; if ((osOperation & OS.NSDragOperationCopy) != 0){ operation |= DND.DROP_COPY; @@ -721,7 +721,7 @@ int osOpToOp(int /*long*/ osOperation){ return operation; } -void pasteboard_provideDataForType(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1) { +void pasteboard_provideDataForType(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1) { NSPasteboard pasteboard = new NSPasteboard(arg0); NSString dataType = new NSString(arg1); if (pasteboard == null || dataType == null) return; diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/DropTarget.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/DropTarget.java index 3c1026ccd3..6383d896df 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/DropTarget.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/DropTarget.java @@ -77,7 +77,7 @@ import org.eclipse.swt.widgets.*; public class DropTarget extends Widget { static Callback dropTarget2Args, dropTarget3Args, dropTarget6Args; - static int /*long*/ proc2Args, proc3Args, proc6Args; + static long /*int*/ proc2Args, proc3Args, proc6Args; static { Class clazz = DropTarget.class; @@ -119,27 +119,27 @@ void addDragHandlers() { // the types with the Control's NSView and AppKit will call the methods in the protocol // when a drag goes over the view. - int /*long*/ cls = OS.object_getClass(control.view.id); + long /*int*/ cls = OS.object_getClass(control.view.id); if (cls == 0) { DND.error(DND.ERROR_CANNOT_INIT_DROP); } // If we already added it, no need to do it again. - int /*long*/ procPtr = OS.class_getMethodImplementation(cls, OS.sel_draggingEntered_); + long /*int*/ procPtr = OS.class_getMethodImplementation(cls, OS.sel_draggingEntered_); if (procPtr == proc3Args) return; addDragHandlers(cls); // If the content view can be image view, then add the dragging methods to image view too. // This is used by Label so that dragging can work even when the Label has an image set on it. - int /*long*/ imageView = 0; + long /*int*/ imageView = 0; if ((imageView = OS.objc_msgSend(control.view.id, OS.sel_getImageView)) != 0) { cls = OS.object_getClass(imageView); addDragHandlers(cls); } } -void addDragHandlers (int /*long*/ cls) { +void addDragHandlers (long /*int*/ cls) { // Add the NSDraggingDestination callbacks OS.class_addMethod(cls, OS.sel_draggingEntered_, proc3Args, "@:@"); OS.class_addMethod(cls, OS.sel_draggingUpdated_, proc3Args, "@:@"); @@ -201,7 +201,7 @@ public void addDropListener(DropTargetListener listener) { addListener (DND.DropAccept, typedListener); } -int /*long*/ dndCallSuper (int /*long*/ id, int /*long*/ sel, int /*long*/ arg0) { +long /*int*/ dndCallSuper (long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) { objc_super super_struct = new objc_super(); super_struct.receiver = id; super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass); @@ -221,7 +221,7 @@ protected void checkSubclass () { } } -int draggingEntered(int /*long*/ id, int /*long*/ sel, NSObject sender) { +int draggingEntered(long /*int*/ id, long /*int*/ sel, NSObject sender) { if (sender == null) return OS.NSDragOperationNone; DNDEvent event = new DNDEvent(); @@ -272,7 +272,7 @@ int draggingEntered(int /*long*/ id, int /*long*/ sel, NSObject sender) { return opToOsOp(selectedOperation); } -void draggingExited(int /*long*/ id, int /*long*/ sel, NSObject sender) { +void draggingExited(long /*int*/ id, long /*int*/ sel, NSObject sender) { clearDropNotAllowed(); if (keyOperation == -1) return; keyOperation = -1; @@ -288,7 +288,7 @@ void draggingExited(int /*long*/ id, int /*long*/ sel, NSObject sender) { } } -int draggingUpdated(int /*long*/ id, int /*long*/ sel, NSObject sender) { +int draggingUpdated(long /*int*/ id, long /*int*/ sel, NSObject sender) { if (sender == null) return OS.NSDragOperationNone; int oldKeyOperation = keyOperation; @@ -417,7 +417,7 @@ public DropTarget(Control control, int style) { addDragHandlers(); } -static int /*long*/ dropTargetProc(int /*long*/ id, int /*long*/ sel) { +static long /*int*/ dropTargetProc(long /*int*/ id, long /*int*/ sel) { Display display = Display.findDisplay(Thread.currentThread()); if (display == null || display.isDisposed()) return 0; Widget widget = display.findWidget(id); @@ -432,7 +432,7 @@ static int /*long*/ dropTargetProc(int /*long*/ id, int /*long*/ sel) { return 0; } -static int /*long*/ dropTargetProc(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0) { +static long /*int*/ dropTargetProc(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) { Display display = Display.findDisplay(Thread.currentThread()); if (display == null || display.isDisposed()) return 0; Widget widget = display.findWidget(id); @@ -457,7 +457,7 @@ static int /*long*/ dropTargetProc(int /*long*/ id, int /*long*/ sel, int /*long return 0; } -static int /*long*/ dropTargetProc(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3) { +static long /*int*/ dropTargetProc(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3) { Display display = Display.findDisplay(Thread.currentThread()); if (display == null || display.isDisposed()) return 0; Widget widget = display.findWidget(id); @@ -549,7 +549,7 @@ int getOperationFromKeyState() { // correct Cocoa behavior. Control + Option or Command is NSDragOperationGeneric, // or DND.DROP_DEFAULT in the SWT. NSEvent currEvent = NSApplication.sharedApplication().currentEvent(); - int /*long*/ modifiers = currEvent.modifierFlags(); + long /*int*/ modifiers = currEvent.modifierFlags(); boolean option = (modifiers & OS.NSAlternateKeyMask) == OS.NSAlternateKeyMask; boolean control = (modifiers & OS.NSControlKeyMask) == OS.NSControlKeyMask; if (control && option) return DND.DROP_DEFAULT; @@ -598,7 +598,7 @@ int opToOsOp(int operation) { return osOperation; } -int osOpToOp(int /*long*/ osOperation){ +int osOpToOp(long /*int*/ osOperation){ int operation = 0; if ((osOperation & OS.NSDragOperationCopy) != 0){ operation |= DND.DROP_COPY; @@ -732,7 +732,7 @@ boolean drop(NSObject sender) { return (selectedOperation != DND.DROP_NONE); } -boolean performDragOperation(int /*long*/ id, int /*long*/ sel, NSObject sender) { +boolean performDragOperation(long /*int*/ id, long /*int*/ sel, NSObject sender) { if (new NSObject(id).isKindOfClass(OS.class_NSTableView)) { return dndCallSuper(id, sel, sender.id) != 0; } @@ -740,11 +740,11 @@ boolean performDragOperation(int /*long*/ id, int /*long*/ sel, NSObject sender) return drop (sender); } -boolean outlineView_acceptDrop_item_childIndex(int /*long*/ id, int /*long*/ sel, int /*long*/ outlineView, int /*long*/ info, int /*long*/ item, int /*long*/ index) { +boolean outlineView_acceptDrop_item_childIndex(long /*int*/ id, long /*int*/ sel, long /*int*/ outlineView, long /*int*/ info, long /*int*/ item, long /*int*/ index) { return drop(new NSObject(info)); } -int /*long*/ outlineView_validateDrop_proposedItem_proposedChildIndex(int /*long*/ id, int /*long*/ sel, int /*long*/ outlineView, int /*long*/ info, int /*long*/ item, int /*long*/ index) { +long /*int*/ outlineView_validateDrop_proposedItem_proposedChildIndex(long /*int*/ id, long /*int*/ sel, long /*int*/ outlineView, long /*int*/ info, long /*int*/ item, long /*int*/ index) { //TODO expansion animation and auto collapse not working because of outlineView:shouldExpandItem: NSOutlineView widget = new NSOutlineView(outlineView); NSObject sender = new NSObject(info); @@ -825,7 +825,7 @@ boolean setEventData(NSObject draggingState, DNDEvent event) { // get allowed operations int style = getStyle(); - int /*long*/ allowedActions = draggingState.draggingSourceOperationMask(); + long /*int*/ allowedActions = draggingState.draggingSourceOperationMask(); int operations = osOpToOp(allowedActions) & style; if (operations == DND.DROP_NONE) return false; @@ -846,7 +846,7 @@ boolean setEventData(NSObject draggingState, DNDEvent event) { NSArray draggedTypes = dragPBoard.types(); if (draggedTypes == null) return false; - int /*long*/ draggedTypeCount = draggedTypes.count(); + long /*int*/ draggedTypeCount = draggedTypes.count(); TransferData[] dataTypes = new TransferData[(int)draggedTypeCount]; int index = -1; @@ -952,16 +952,16 @@ void clearDropNotAllowed() { } } -boolean tableView_acceptDrop_row_dropOperation(int /*long*/ id, int /*long*/ sel, int /*long*/ tableView, int /*long*/ info, int /*long*/ row, int /*long*/ operation) { +boolean tableView_acceptDrop_row_dropOperation(long /*int*/ id, long /*int*/ sel, long /*int*/ tableView, long /*int*/ info, long /*int*/ row, long /*int*/ operation) { return drop(new NSObject(info)); } -int tableView_validateDrop_proposedRow_proposedDropOperation(int /*long*/ id, int /*long*/ sel, int /*long*/ tableView, int /*long*/ info, int /*long*/ row, int /*long*/ operation) { +int tableView_validateDrop_proposedRow_proposedDropOperation(long /*int*/ id, long /*int*/ sel, long /*int*/ tableView, long /*int*/ info, long /*int*/ row, long /*int*/ operation) { NSTableView widget = new NSTableView(tableView); NSObject sender = new NSObject(info); NSPoint pt = sender.draggingLocation(); pt = widget.convertPoint_fromView_(pt, null); - int /*long*/ hitRow = widget.rowAtPoint(pt); + long /*int*/ hitRow = widget.rowAtPoint(pt); if (0 <= hitRow && hitRow < widget.numberOfRows()) { if (feedback == 0) { widget.setDropRow(-1, OS.NSTableViewDropOn); @@ -982,7 +982,7 @@ int tableView_validateDrop_proposedRow_proposedDropOperation(int /*long*/ id, in } // By returning true we get draggingUpdated messages even when the mouse isn't moving. -boolean wantsPeriodicDraggingUpdates(int /*long*/ id, int /*long*/ sel) { +boolean wantsPeriodicDraggingUpdates(long /*int*/ id, long /*int*/ sel) { return true; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/TableDragSourceEffect.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/TableDragSourceEffect.java index 6d2bcdbc7b..a49c8c27c7 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/TableDragSourceEffect.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/TableDragSourceEffect.java @@ -79,7 +79,7 @@ public class TableDragSourceEffect extends DragSourceEffect { if (dragSourceImage != null) dragSourceImage.dispose(); dragSourceImage = null; NSPoint point = new NSPoint(); - int /*long*/ ptr = OS.malloc(NSPoint.sizeof); + long /*int*/ ptr = OS.malloc(NSPoint.sizeof); OS.memmove(ptr, point, NSPoint.sizeof); NSEvent nsEvent = NSApplication.sharedApplication().currentEvent(); NSTableView widget = (NSTableView)control.view; diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/TreeDragSourceEffect.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/TreeDragSourceEffect.java index f3f85a9b4e..43fff72ec2 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/TreeDragSourceEffect.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/TreeDragSourceEffect.java @@ -78,7 +78,7 @@ public class TreeDragSourceEffect extends DragSourceEffect { if (dragSourceImage != null) dragSourceImage.dispose(); dragSourceImage = null; NSPoint point = new NSPoint(); - int /*long*/ ptr = OS.malloc(NSPoint.sizeof); + long /*int*/ ptr = OS.malloc(NSPoint.sizeof); OS.memmove(ptr, point, NSPoint.sizeof); NSEvent nsEvent = NSApplication.sharedApplication().currentEvent(); NSTableView widget = (NSTableView)control.view; diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ByteArrayTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ByteArrayTransfer.java index 6620e7491a..e8baa38ac0 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ByteArrayTransfer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ByteArrayTransfer.java @@ -155,7 +155,7 @@ protected void javaToNative (Object object, TransferData transferData) { } byte[] buffer = (byte[])object; if (buffer.length == 0) return; - int /*long*/ pValue = OS.g_malloc(buffer.length); + long /*int*/ pValue = OS.g_malloc(buffer.length); if (pValue == 0) return; OS.memmove(pValue, buffer, buffer.length); transferData.length = buffer.length; diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/Clipboard.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/Clipboard.java index 541830fd9e..7b3f563481 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/Clipboard.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/Clipboard.java @@ -32,14 +32,14 @@ public class Clipboard { private Display display; - static int /*long*/ GTKCLIPBOARD; - static int /*long*/ GTKPRIMARYCLIPBOARD; - private static int /*long*/ TARGET; + static long /*int*/ GTKCLIPBOARD; + static long /*int*/ GTKPRIMARYCLIPBOARD; + private static long /*int*/ TARGET; static { GTKCLIPBOARD = OS.gtk_clipboard_get(OS.GDK_NONE); byte[] buffer = Converter.wcsToMbcs(null, "PRIMARY", true); - int /*long*/ primary = OS.gdk_atom_intern(buffer, false); + long /*int*/ primary = OS.gdk_atom_intern(buffer, false); GTKPRIMARYCLIPBOARD = OS.gtk_clipboard_get(primary); buffer = Converter.wcsToMbcs(null, "TARGETS", true); TARGET = OS.gdk_atom_intern(buffer, false); @@ -287,7 +287,7 @@ public Object getContents(Transfer transfer) { public Object getContents(Transfer transfer, int clipboards) { checkWidget(); if (transfer == null) DND.error(SWT.ERROR_NULL_ARGUMENT); - int /*long*/ selection_data = 0; + long /*int*/ selection_data = 0; int[] typeIds = transfer.getTypeIds(); for (int i = 0; i < typeIds.length; i++) { if ((clipboards & DND.CLIPBOARD) != 0) { @@ -563,7 +563,7 @@ public String[] getAvailableTypeNames() { String[] result = new String[types1.length + types2.length]; int count = 0; for (int i = 0; i < types1.length; i++) { - int /*long*/ pName = OS.gdk_atom_name(types1[i]); + long /*int*/ pName = OS.gdk_atom_name(types1[i]); if (pName == 0) { continue; } @@ -573,7 +573,7 @@ public String[] getAvailableTypeNames() { result[count++] = "GTKCLIPBOARD "+new String (Converter.mbcsToWcs (null, buffer)); } for (int i = 0; i < types2.length; i++) { - int /*long*/ pName = OS.gdk_atom_name(types2[i]); + long /*int*/ pName = OS.gdk_atom_name(types2[i]); if (pName == 0) { continue; } @@ -592,7 +592,7 @@ public String[] getAvailableTypeNames() { private int[] getAvailablePrimaryTypes() { int[] types = new int[0]; - int /*long*/ selection_data = gtk_clipboard_wait_for_contents(GTKPRIMARYCLIPBOARD, TARGET); + long /*int*/ selection_data = gtk_clipboard_wait_for_contents(GTKPRIMARYCLIPBOARD, TARGET); /* * This call to gdk_threads_leave() is a temporary work around * to avoid deadlocks when gdk_threads_init() is called by native @@ -616,7 +616,7 @@ private int[] getAvailablePrimaryTypes() { } private int[] getAvailableClipboardTypes () { int[] types = new int[0]; - int /*long*/ selection_data = gtk_clipboard_wait_for_contents(GTKCLIPBOARD, TARGET); + long /*int*/ selection_data = gtk_clipboard_wait_for_contents(GTKCLIPBOARD, TARGET); /* * This call to gdk_threads_leave() is a temporary work around * to avoid deadlocks when gdk_threads_init() is called by native @@ -639,11 +639,11 @@ private int[] getAvailableClipboardTypes () { return types; } -int /*long*/ gtk_clipboard_wait_for_contents(int /*long*/ clipboard, int /*long*/ target) { +long /*int*/ gtk_clipboard_wait_for_contents(long /*int*/ clipboard, long /*int*/ target) { String key = "org.eclipse.swt.internal.gtk.dispatchEvent"; Display display = this.display; display.setData(key, new int[]{OS.GDK_PROPERTY_NOTIFY, OS.GDK_SELECTION_CLEAR, OS.GDK_SELECTION_REQUEST, OS.GDK_SELECTION_NOTIFY}); - int /*long*/ selection_data = OS.gtk_clipboard_wait_for_contents(clipboard, target); + long /*int*/ selection_data = OS.gtk_clipboard_wait_for_contents(clipboard, target); display.setData(key, null); return selection_data; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ClipboardProxy.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ClipboardProxy.java index c03768faab..b68c23e1a5 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ClipboardProxy.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ClipboardProxy.java @@ -30,7 +30,7 @@ class ClipboardProxy { Object[] primaryClipboardData; Transfer[] primaryClipboardDataTypes; - int /*long*/ clipboardOwner = OS.gtk_window_new(0); + long /*int*/ clipboardOwner = OS.gtk_window_new(0); Display display; Clipboard activeClipboard = null; Clipboard activePrimaryClipboard = null; @@ -72,7 +72,7 @@ void clear (Clipboard owner, int clipboards) { } } -int /*long*/ clearFunc(int /*long*/ clipboard,int /*long*/ user_data_or_owner){ +long /*int*/ clearFunc(long /*int*/ clipboard,long /*int*/ user_data_or_owner){ if (clipboard == Clipboard.GTKCLIPBOARD) { activeClipboard = null; clipboardData = null; @@ -119,7 +119,7 @@ void dispose () { * This function provides the data to the clipboard on request. * When this clipboard is disposed, the data will no longer be available. */ -int /*long*/ getFunc(int /*long*/ clipboard, int /*long*/ selection_data, int /*long*/ info, int /*long*/ user_data_or_owner){ +long /*int*/ getFunc(long /*int*/ clipboard, long /*int*/ selection_data, long /*int*/ info, long /*int*/ user_data_or_owner){ if (selection_data == 0) return 0; GtkSelectionData selectionData = new GtkSelectionData(); OS.memmove(selectionData, selection_data, GtkSelectionData.sizeof); @@ -146,7 +146,7 @@ int /*long*/ getFunc(int /*long*/ clipboard, int /*long*/ selection_data, int /* boolean setData(Clipboard owner, Object[] data, Transfer[] dataTypes, int clipboards) { GtkTargetEntry[] entries = new GtkTargetEntry [0]; - int /*long*/ pTargetsList = 0; + long /*int*/ pTargetsList = 0; try { for (int i = 0; i < dataTypes.length; i++) { Transfer transfer = dataTypes[i]; @@ -156,7 +156,7 @@ boolean setData(Clipboard owner, Object[] data, Transfer[] dataTypes, int clipbo GtkTargetEntry entry = new GtkTargetEntry(); entry.info = typeIds[j]; byte[] buffer = Converter.wcsToMbcs(null, typeNames[j], true); - int /*long*/ pName = OS.g_malloc(buffer.length); + long /*int*/ pName = OS.g_malloc(buffer.length); OS.memmove(pName, buffer, buffer.length); entry.target = pName; GtkTargetEntry[] tmp = new GtkTargetEntry [entries.length + 1]; @@ -175,8 +175,8 @@ boolean setData(Clipboard owner, Object[] data, Transfer[] dataTypes, int clipbo if ((clipboards & DND.CLIPBOARD) != 0) { clipboardData = data; clipboardDataTypes = dataTypes; - int /*long*/ getFuncProc = getFunc.getAddress(); - int /*long*/ clearFuncProc = clearFunc.getAddress(); + long /*int*/ getFuncProc = getFunc.getAddress(); + long /*int*/ clearFuncProc = clearFunc.getAddress(); /* * Feature in GTK. When the contents are set again, clipboard_set_with_data() * invokes clearFunc and then, getFunc is not sequentially called. @@ -198,8 +198,8 @@ boolean setData(Clipboard owner, Object[] data, Transfer[] dataTypes, int clipbo if ((clipboards & DND.SELECTION_CLIPBOARD) != 0) { primaryClipboardData = data; primaryClipboardDataTypes = dataTypes; - int /*long*/ getFuncProc = getFunc.getAddress(); - int /*long*/ clearFuncProc = clearFunc.getAddress(); + long /*int*/ getFuncProc = getFunc.getAddress(); + long /*int*/ clearFuncProc = clearFunc.getAddress(); if (!OS.gtk_clipboard_set_with_owner (Clipboard.GTKPRIMARYCLIPBOARD, pTargetsList, entries.length, getFuncProc, clearFuncProc, clipboardOwner)) { return false; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/DragSource.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/DragSource.java index 87113a3fcc..f2c713ec68 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/DragSource.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/DragSource.java @@ -106,7 +106,7 @@ public class DragSource extends Widget { Transfer[] transferAgents = new Transfer[0]; DragSourceEffect dragEffect; - int /*long*/ targetList; + long /*int*/ targetList; //workaround - remember action performed for DragEnd boolean moveData = false; @@ -207,28 +207,28 @@ static int checkStyle (int style) { return style; } -static int /*long*/ DragDataDelete(int /*long*/ widget, int /*long*/ context){ +static long /*int*/ DragDataDelete(long /*int*/ widget, long /*int*/ context){ DragSource source = FindDragSource(widget); if (source == null) return 0; source.dragDataDelete(widget, context); return 0; } -static int /*long*/ DragEnd(int /*long*/ widget, int /*long*/ context){ +static long /*int*/ DragEnd(long /*int*/ widget, long /*int*/ context){ DragSource source = FindDragSource(widget); if (source == null) return 0; source.dragEnd(widget, context); return 0; } -static int /*long*/ DragGetData(int /*long*/ widget, int /*long*/ context, int /*long*/ selection_data, int /*long*/ info, int /*long*/ time){ +static long /*int*/ DragGetData(long /*int*/ widget, long /*int*/ context, long /*int*/ selection_data, long /*int*/ info, long /*int*/ time){ DragSource source = FindDragSource(widget); if (source == null) return 0; source.dragGetData(widget, context, selection_data, (int)/*64*/info, (int)/*64*/time); return 0; } -static DragSource FindDragSource(int /*long*/ handle) { +static DragSource FindDragSource(long /*int*/ handle) { Display display = Display.findDisplay(Thread.currentThread()); if (display == null || display.isDisposed()) return null; Widget widget = display.findWidget(handle); @@ -297,15 +297,15 @@ void drag(Event dragEvent) { int actions = opToOsOp(getStyle()); Image image = event.image; - int /*long*/ context = OS.gtk_drag_begin(control.handle, targetList, actions, 1, 0); + long /*int*/ context = OS.gtk_drag_begin(control.handle, targetList, actions, 1, 0); if (context != 0 && image != null) { - int /*long*/ pixbuf = ImageList.createPixbuf(image); + long /*int*/ pixbuf = ImageList.createPixbuf(image); OS.gtk_drag_set_icon_pixbuf(context, pixbuf, 0, 0); OS.g_object_unref(pixbuf); } } -void dragEnd(int /*long*/ widget, int /*long*/ context){ +void dragEnd(long /*int*/ widget, long /*int*/ context){ /* * Bug in GTK. If a drag is initiated using gtk_drag_begin and the * mouse is released immediately, the mouse and keyboard remain @@ -341,7 +341,7 @@ void dragEnd(int /*long*/ widget, int /*long*/ context){ moveData = false; } -void dragGetData(int /*long*/ widget, int /*long*/ context, int /*long*/ selection_data, int info, int time){ +void dragGetData(long /*int*/ widget, long /*int*/ context, long /*int*/ selection_data, int info, int time){ if (selection_data == 0) return; GtkSelectionData gtkSelectionData = new GtkSelectionData(); OS.memmove(gtkSelectionData, selection_data, GtkSelectionData.sizeof); @@ -376,7 +376,7 @@ void dragGetData(int /*long*/ widget, int /*long*/ context, int /*long*/ selecti return; } -void dragDataDelete(int /*long*/ widget, int /*long*/ context){ +void dragDataDelete(long /*int*/ widget, long /*int*/ context){ moveData = true; } @@ -564,7 +564,7 @@ public void setTransfer(Transfer[] transferAgents){ } } - int /*long*/ pTargets = OS.g_malloc(targets.length * GtkTargetEntry.sizeof); + long /*int*/ pTargets = OS.g_malloc(targets.length * GtkTargetEntry.sizeof); for (int i = 0; i < targets.length; i++) { OS.memmove(pTargets + i*GtkTargetEntry.sizeof, targets[i], GtkTargetEntry.sizeof); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/DropTarget.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/DropTarget.java index eeb43d3019..ba9ced6489 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/DropTarget.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/DropTarget.java @@ -245,33 +245,33 @@ static int checkStyle (int style) { return style; } -static int /*long*/ Drag_Data_Received ( int /*long*/ widget, int /*long*/ context, int /*long*/ x, int /*long*/ y, int /*long*/ data, int /*long*/ info, int /*long*/ time){ +static long /*int*/ Drag_Data_Received ( long /*int*/ widget, long /*int*/ context, long /*int*/ x, long /*int*/ y, long /*int*/ data, long /*int*/ info, long /*int*/ time){ DropTarget target = FindDropTarget(widget); if (target == null) return 0; target.drag_data_received (widget, context, (int)/*64*/x, (int)/*64*/y, data, (int)/*64*/info, (int)/*64*/time); return 0; } -static int /*long*/ Drag_Drop(int /*long*/ widget, int /*long*/ context, int /*long*/ x, int /*long*/ y, int /*long*/ time) { +static long /*int*/ Drag_Drop(long /*int*/ widget, long /*int*/ context, long /*int*/ x, long /*int*/ y, long /*int*/ time) { DropTarget target = FindDropTarget(widget); if (target == null) return 0; return target.drag_drop (widget, context, (int)/*64*/x, (int)/*64*/y, (int)/*64*/time) ? 1 : 0; } -static int /*long*/ Drag_Leave ( int /*long*/ widget, int /*long*/ context, int /*long*/ time){ +static long /*int*/ Drag_Leave ( long /*int*/ widget, long /*int*/ context, long /*int*/ time){ DropTarget target = FindDropTarget(widget); if (target == null) return 0; target.drag_leave (widget, context, (int)/*64*/time); return 0; } -static int /*long*/ Drag_Motion ( int /*long*/ widget, int /*long*/ context, int /*long*/ x, int /*long*/ y, int /*long*/ time){ +static long /*int*/ Drag_Motion ( long /*int*/ widget, long /*int*/ context, long /*int*/ x, long /*int*/ y, long /*int*/ time){ DropTarget target = FindDropTarget(widget); if (target == null) return 0; return target.drag_motion (widget, context, (int)/*64*/x, (int)/*64*/y, (int)/*64*/time) ? 1 : 0; } -static DropTarget FindDropTarget(int /*long*/ handle) { +static DropTarget FindDropTarget(long /*int*/ handle) { Display display = Display.findDisplay(Thread.currentThread()); if (display == null || display.isDisposed()) return null; Widget widget = display.findWidget(handle); @@ -332,7 +332,7 @@ protected void checkSubclass () { } } -void drag_data_received ( int /*long*/ widget, int /*long*/ context, int x, int y, int /*long*/ data, int info, int time){ +void drag_data_received ( long /*int*/ widget, long /*int*/ context, int x, int y, long /*int*/ data, int info, int time){ DNDEvent event = new DNDEvent(); if (data == 0 || !setEventData(context, x, y, time, event)) { keyOperation = -1; @@ -380,7 +380,7 @@ void drag_data_received ( int /*long*/ widget, int /*long*/ context, int x, int return; } -boolean drag_drop(int /*long*/ widget, int /*long*/ context, int x, int y, int time) { +boolean drag_drop(long /*int*/ widget, long /*int*/ context, int x, int y, int time) { DNDEvent event = new DNDEvent(); if (!setEventData(context, x, y, time, event)) { keyOperation = -1; @@ -417,7 +417,7 @@ boolean drag_drop(int /*long*/ widget, int /*long*/ context, int x, int y, int t return true; } -void drag_leave ( int /*long*/ widget, int /*long*/ context, int time){ +void drag_leave ( long /*int*/ widget, long /*int*/ context, int time){ updateDragOverHover(0, null); if (keyOperation == -1) return; @@ -430,7 +430,7 @@ void drag_leave ( int /*long*/ widget, int /*long*/ context, int time){ notifyListeners(DND.DragLeave, event); } -boolean drag_motion ( int /*long*/ widget, int /*long*/ context, int x, int y, int time){ +boolean drag_motion ( long /*int*/ widget, long /*int*/ context, int x, int y, int time){ int oldKeyOperation = keyOperation; /* @@ -694,7 +694,7 @@ public void setTransfer(Transfer[] transferAgents){ } } - int /*long*/ pTargets = OS.g_malloc(targets.length * GtkTargetEntry.sizeof); + long /*int*/ pTargets = OS.g_malloc(targets.length * GtkTargetEntry.sizeof); for (int i = 0; i < targets.length; i++) { OS.memmove(pTargets + i*GtkTargetEntry.sizeof, targets[i], GtkTargetEntry.sizeof); } @@ -702,7 +702,7 @@ public void setTransfer(Transfer[] transferAgents){ int actions = opToOsOp(getStyle()); if (control instanceof Combo) { if ((control.getStyle() & SWT.READ_ONLY) == 0) { - int /*long*/ entryHandle = OS.gtk_bin_get_child (control.handle); + long /*int*/ entryHandle = OS.gtk_bin_get_child (control.handle); if (entryHandle != 0) { OS.gtk_drag_dest_unset(entryHandle); } @@ -728,7 +728,7 @@ public void setDropTargetEffect(DropTargetEffect effect) { dropEffect = effect; } -boolean setEventData(int /*long*/ context, int x, int y, int time, DNDEvent event) { +boolean setEventData(long /*int*/ context, int x, int y, int time, DNDEvent event) { if (context == 0) return false; GdkDragContext dragContext = new GdkDragContext(); OS.memmove(dragContext, context, GdkDragContext.sizeof); @@ -754,7 +754,7 @@ boolean setEventData(int /*long*/ context, int x, int y, int time, DNDEvent even int length = OS.g_list_length(dragContext.targets); TransferData[] dataTypes = new TransferData[0]; for (int i = 0; i < length; i++) { - int /*long*/ pData = OS.g_list_nth(dragContext.targets, i); + long /*int*/ pData = OS.g_list_nth(dragContext.targets, i); GtkTargetPair gtkTargetPair = new GtkTargetPair(); OS.memmove(gtkTargetPair, pData, GtkTargetPair.sizeof); TransferData data = new TransferData(); @@ -771,7 +771,7 @@ boolean setEventData(int /*long*/ context, int x, int y, int time, DNDEvent even } } if (dataTypes.length == 0) return false; - int /*long*/ window; + long /*int*/ window; if (OS.GTK_VERSION >= OS.VERSION(2, 14, 0)){ window = OS.gtk_widget_get_window (control.handle); } else { diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/FileTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/FileTransfer.java index 57958316ea..c8d716fc35 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/FileTransfer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/FileTransfer.java @@ -85,13 +85,13 @@ public void javaToNative(Object object, TransferData transferData) { if (length == 0) continue; char[] chars = new char[length]; string.getChars(0, length, chars, 0); - int /*long*/[] error = new int /*long*/[1]; - int /*long*/ utf8Ptr = OS.g_utf16_to_utf8(chars, chars.length, null, null, error); + long /*int*/[] error = new long /*int*/[1]; + long /*int*/ utf8Ptr = OS.g_utf16_to_utf8(chars, chars.length, null, null, error); if (error[0] != 0 || utf8Ptr == 0) continue; - int /*long*/ localePtr = OS.g_filename_from_utf8(utf8Ptr, -1, null, null, error); + long /*int*/ localePtr = OS.g_filename_from_utf8(utf8Ptr, -1, null, null, error); OS.g_free(utf8Ptr); if (error[0] != 0 || localePtr == 0) continue; - int /*long*/ uriPtr = OS.g_filename_to_uri(localePtr, 0, error); + long /*int*/ uriPtr = OS.g_filename_to_uri(localePtr, 0, error); OS.g_free(localePtr); if (error[0] != 0 || uriPtr == 0) continue; length = OS.strlen(uriPtr); @@ -111,7 +111,7 @@ public void javaToNative(Object object, TransferData transferData) { buffer = newBuffer; } if (buffer.length == 0) return; - int /*long*/ ptr = OS.g_malloc(buffer.length+1); + long /*int*/ ptr = OS.g_malloc(buffer.length+1); OS.memset(ptr, '\0', buffer.length+1); OS.memmove(ptr, buffer, buffer.length); transferData.pValue = ptr; @@ -137,7 +137,7 @@ public Object nativeToJava(TransferData transferData) { OS.memmove(temp, transferData.pValue, length); boolean gnomeList = transferData.type == GNOME_LIST_ID; int sepLength = gnomeList ? 1 : 2; - int /*long*/[] files = new int /*long*/[0]; + long /*int*/[] files = new long /*int*/[0]; int offset = 0; for (int i = 0; i < temp.length - 1; i++) { boolean terminator = gnomeList ? temp[i] == '\n' : temp[i] == '\r' && temp[i+1] == '\n'; @@ -145,11 +145,11 @@ public Object nativeToJava(TransferData transferData) { if (!(gnomeList && offset == 0)) { /* The content of the first line in a gnome-list is always either 'copy' or 'cut' */ int size = i - offset; - int /*long*/ file = OS.g_malloc(size + 1); + long /*int*/ file = OS.g_malloc(size + 1); byte[] fileBuffer = new byte[size + 1]; System.arraycopy(temp, offset, fileBuffer, 0, size); OS.memmove(file, fileBuffer, size + 1); - int /*long*/[] newFiles = new int /*long*/[files.length + 1]; + long /*int*/[] newFiles = new long /*int*/[files.length + 1]; System.arraycopy(files, 0, newFiles, 0, files.length); newFiles[files.length] = file; files = newFiles; @@ -159,27 +159,27 @@ public Object nativeToJava(TransferData transferData) { } if (offset < temp.length - sepLength) { int size = temp.length - offset; - int /*long*/ file = OS.g_malloc(size + 1); + long /*int*/ file = OS.g_malloc(size + 1); byte[] fileBuffer = new byte[size + 1]; System.arraycopy(temp, offset, fileBuffer, 0, size); OS.memmove(file, fileBuffer, size + 1); - int /*long*/[] newFiles = new int /*long*/[files.length + 1]; + long /*int*/[] newFiles = new long /*int*/[files.length + 1]; System.arraycopy(files, 0, newFiles, 0, files.length); newFiles[files.length] = file; files = newFiles; } String[] fileNames = new String[0]; for (int i = 0; i < files.length; i++) { - int /*long*/[] error = new int /*long*/[1]; - int /*long*/ localePtr = OS.g_filename_from_uri(files[i], null, error); + long /*int*/[] error = new long /*int*/[1]; + long /*int*/ localePtr = OS.g_filename_from_uri(files[i], null, error); OS.g_free(files[i]); if (error[0] != 0 || localePtr == 0) continue; - int /*long*/ utf8Ptr = OS.g_filename_to_utf8(localePtr, -1, null, null, null); + long /*int*/ utf8Ptr = OS.g_filename_to_utf8(localePtr, -1, null, null, null); if (utf8Ptr == 0) utf8Ptr = OS.g_filename_display_name (localePtr); if (localePtr != utf8Ptr) OS.g_free (localePtr); if (utf8Ptr == 0) continue; - int /*long*/[] items_written = new int /*long*/[1]; - int /*long*/ utf16Ptr = OS.g_utf8_to_utf16(utf8Ptr, -1, null, items_written, null); + long /*int*/[] items_written = new long /*int*/[1]; + long /*int*/ utf16Ptr = OS.g_utf8_to_utf16(utf8Ptr, -1, null, items_written, null); OS.g_free(utf8Ptr); if (utf16Ptr == 0) continue; length = (int)/*64*/items_written[0]; diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/HTMLTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/HTMLTransfer.java index cd7465f614..0fa1abfb54 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/HTMLTransfer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/HTMLTransfer.java @@ -64,7 +64,7 @@ public void javaToNative (Object object, TransferData transferData){ String string = (String)object; byte[] utf8 = Converter.wcsToMbcs(null, string, true); int byteCount = utf8.length; - int /*long*/ pValue = OS.g_malloc(byteCount); + long /*int*/ pValue = OS.g_malloc(byteCount); if (pValue == 0) return; OS.memmove(pValue, utf8, byteCount); transferData.length = byteCount; diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ImageTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ImageTransfer.java index ffc92bbe10..ffa0b07bf6 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ImageTransfer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ImageTransfer.java @@ -89,7 +89,7 @@ public void javaToNative(Object object, TransferData transferData) { ImageData imgData = (ImageData)object; if (imgData == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); Image image = new Image(Display.getCurrent(), imgData); - int /*long*/ pixbuf = ImageList.createPixbuf(image); + long /*int*/ pixbuf = ImageList.createPixbuf(image); if (pixbuf != 0) { String typeStr = ""; if (transferData.type == JPEG_ID) typeStr = "jpeg"; @@ -104,8 +104,8 @@ public void javaToNative(Object object, TransferData transferData) { else if (transferData.type == XPM_ID) typeStr = "xpm"; else if (transferData.type == XV_ID) typeStr = "xv"; byte[] type = Converter.wcsToMbcs(null, typeStr , true); - int /*long*/ [] buffer = new int /*long*/ [1]; - int /*long*/ [] len = new int /*long*/ [1]; + long /*int*/ [] buffer = new long /*int*/ [1]; + long /*int*/ [] len = new long /*int*/ [1]; if (type == null) return; OS.gdk_pixbuf_save_to_bufferv(pixbuf, buffer, len, type, null, null, null); OS.g_object_unref(pixbuf); @@ -130,11 +130,11 @@ public void javaToNative(Object object, TransferData transferData) { public Object nativeToJava(TransferData transferData) { ImageData imgData = null; if (transferData.length > 0) { - int /*long*/ loader = OS.gdk_pixbuf_loader_new(); + long /*int*/ loader = OS.gdk_pixbuf_loader_new(); try { OS.gdk_pixbuf_loader_write(loader, transferData.pValue, transferData.length, null); OS.gdk_pixbuf_loader_close(loader, null); - int /*long*/ pixbuf = OS.gdk_pixbuf_loader_get_pixbuf(loader); + long /*int*/ pixbuf = OS.gdk_pixbuf_loader_get_pixbuf(loader); if (pixbuf != 0) { Image img = Image.gtk_new_from_pixbuf(Display.getCurrent(), SWT.BITMAP, pixbuf); imgData = img.getImageData(); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/RTFTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/RTFTransfer.java index 74aae33125..98284e6ff9 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/RTFTransfer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/RTFTransfer.java @@ -65,7 +65,7 @@ public void javaToNative (Object object, TransferData transferData){ } String string = (String)object; byte [] buffer = Converter.wcsToMbcs (null, string, true); - int /*long*/ pValue = OS.g_malloc(buffer.length); + long /*int*/ pValue = OS.g_malloc(buffer.length); if (pValue == 0) return; OS.memmove(pValue, buffer, buffer.length); transferData.length = buffer.length - 1; diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TableDragSourceEffect.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TableDragSourceEffect.java index 0eb7b5caee..e5917f79f7 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TableDragSourceEffect.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TableDragSourceEffect.java @@ -88,27 +88,27 @@ public class TableDragSourceEffect extends DragSourceEffect { * in versions smaller than 2.2.4 if the model is NULL. The fix is * to give a valid pointer instead. */ - int /*long*/ handle = table.handle; - int /*long*/ selection = OS.gtk_tree_view_get_selection (handle); - int /*long*/ [] model = OS.GTK_VERSION < OS.VERSION (2, 2, 4) ? new int /*long*/ [1] : null; - int /*long*/ list = OS.gtk_tree_selection_get_selected_rows (selection, model); + long /*int*/ handle = table.handle; + long /*int*/ selection = OS.gtk_tree_view_get_selection (handle); + long /*int*/ [] model = OS.GTK_VERSION < OS.VERSION (2, 2, 4) ? new long /*int*/ [1] : null; + long /*int*/ list = OS.gtk_tree_selection_get_selected_rows (selection, model); if (list == 0) return null; int count = Math.min(10, OS.g_list_length (list)); Display display = table.getDisplay(); if (count == 1) { - int /*long*/ path = OS.g_list_nth_data (list, 0); - int /*long*/ pixmap = OS.gtk_tree_view_create_row_drag_icon(handle, path); + long /*int*/ path = OS.g_list_nth_data (list, 0); + long /*int*/ pixmap = OS.gtk_tree_view_create_row_drag_icon(handle, path); dragSourceImage = Image.gtk_new(display, SWT.ICON, pixmap, 0); OS.gtk_tree_path_free (path); } else { int width = 0, height = 0; int[] w = new int[1], h = new int[1]; int[] yy = new int[count], hh = new int[count]; - int /*long*/ [] pixmaps = new int /*long*/ [count]; + long /*int*/ [] pixmaps = new long /*int*/ [count]; GdkRectangle rect = new GdkRectangle (); for (int i=0; i<count; i++) { - int /*long*/ path = OS.g_list_nth_data (list, i); + long /*int*/ path = OS.g_list_nth_data (list, i); OS.gtk_tree_view_get_cell_area (handle, path, 0, rect); pixmaps[i] = OS.gtk_tree_view_create_row_drag_icon(handle, path); if (OS.GTK_VERSION >= OS.VERSION(2, 24, 0)) { @@ -122,10 +122,10 @@ public class TableDragSourceEffect extends DragSourceEffect { hh[i] = h[0]; OS.gtk_tree_path_free (path); } - int /*long*/ source = OS.gdk_pixmap_new(OS.gdk_get_default_root_window(), width, height, -1); - int /*long*/ gcSource = OS.gdk_gc_new(source); - int /*long*/ mask = OS.gdk_pixmap_new(OS.gdk_get_default_root_window(), width, height, 1); - int /*long*/ gcMask = OS.gdk_gc_new(mask); + long /*int*/ source = OS.gdk_pixmap_new(OS.gdk_get_default_root_window(), width, height, -1); + long /*int*/ gcSource = OS.gdk_gc_new(source); + long /*int*/ mask = OS.gdk_pixmap_new(OS.gdk_get_default_root_window(), width, height, 1); + long /*int*/ gcMask = OS.gdk_gc_new(mask); GdkColor color = new GdkColor(); color.pixel = 0; OS.gdk_gc_set_foreground(gcMask, color); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TableDropTargetEffect.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TableDropTargetEffect.java index dc8113624e..58710ce6a1 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TableDropTargetEffect.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TableDropTargetEffect.java @@ -102,7 +102,7 @@ public class TableDropTargetEffect extends DropTargetEffect { */ public void dragLeave(DropTargetEvent event) { Table table = (Table) control; - int /*long*/ handle = table.handle; + long /*int*/ handle = table.handle; OS.gtk_tree_view_set_drag_dest_row(handle, 0, OS.GTK_TREE_VIEW_DROP_BEFORE); scrollBeginTime = 0; @@ -128,15 +128,15 @@ public class TableDropTargetEffect extends DropTargetEffect { */ public void dragOver(DropTargetEvent event) { Table table = (Table) control; - int /*long*/ handle = table.handle; + long /*int*/ handle = table.handle; int effect = checkEffect(event.feedback); Point coordinates = new Point(event.x, event.y); coordinates = table.toControl(coordinates); - int /*long*/ [] path = new int /*long*/ [1]; + long /*int*/ [] path = new long /*int*/ [1]; OS.gtk_tree_view_get_path_at_pos (handle, coordinates.x, coordinates.y, path, null, null, null); int index = -1; if (path[0] != 0) { - int /*long*/ indices = OS.gtk_tree_path_get_indices (path[0]); + long /*int*/ indices = OS.gtk_tree_path_get_indices (path[0]); if (indices != 0) { int[] temp = new int[1]; OS.memmove (temp, indices, 4); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TextTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TextTransfer.java index 6e2a842c06..96b77d0b0a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TextTransfer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TextTransfer.java @@ -72,9 +72,9 @@ public void javaToNative (Object object, TransferData transferData) { String string = (String)object; byte[] utf8 = Converter.wcsToMbcs (null, string, true); if (transferData.type == COMPOUND_TEXT_ID) { - int /*long*/[] encoding = new int /*long*/[1]; + long /*int*/[] encoding = new long /*int*/[1]; int[] format = new int[1]; - int /*long*/[] ctext = new int /*long*/[1]; + long /*int*/[] ctext = new long /*int*/[1]; int[] length = new int[1]; boolean result; if (OS.GTK_VERSION >= OS.VERSION(2, 24, 0)) { @@ -90,7 +90,7 @@ public void javaToNative (Object object, TransferData transferData) { transferData.result = 1; } if (transferData.type == UTF8_STRING_ID) { - int /*long*/ pValue = OS.g_malloc(utf8.length); + long /*int*/ pValue = OS.g_malloc(utf8.length); if (pValue == 0) return; OS.memmove(pValue, utf8, utf8.length); transferData.type = UTF8_STRING_ID; @@ -100,7 +100,7 @@ public void javaToNative (Object object, TransferData transferData) { transferData.result = 1; } if (transferData.type == STRING_ID) { - int /*long*/ string_target = OS.gdk_utf8_to_string_target(utf8); + long /*int*/ string_target = OS.gdk_utf8_to_string_target(utf8); if (string_target == 0) return; transferData.type = STRING_ID; transferData.format = 8; @@ -121,10 +121,10 @@ public void javaToNative (Object object, TransferData transferData) { */ public Object nativeToJava(TransferData transferData){ if (!isSupportedType(transferData) || transferData.pValue == 0) return null; - int /*long*/[] list = new int /*long*/[1]; + long /*int*/[] list = new long /*int*/[1]; int count = OS.gdk_text_property_to_utf8_list_for_display(OS.gdk_display_get_default(), transferData.type, transferData.format, transferData.pValue, transferData.length, list); if (count == 0) return null; - int /*long*/[] ptr = new int /*long*/[1]; + long /*int*/[] ptr = new long /*int*/[1]; OS.memmove(ptr, list[0], OS.PTR_SIZEOF); int length = OS.strlen(ptr[0]); byte[] utf8 = new byte[length]; diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TransferData.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TransferData.java index dc8fcfbe03..efd2f5546a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TransferData.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TransferData.java @@ -40,7 +40,7 @@ public class TransferData { * * @noreference This field is not intended to be referenced by clients. */ - public int /*long*/ type; + public long /*int*/ type; /** * Specifies the number of units in pValue. @@ -86,7 +86,7 @@ public class TransferData { * * @noreference This field is not intended to be referenced by clients. */ - public int /*long*/ pValue; + public long /*int*/ pValue; /** * The result field contains the result of converting a diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TreeDragSourceEffect.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TreeDragSourceEffect.java index 5be5ddad9a..a4f51d4504 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TreeDragSourceEffect.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TreeDragSourceEffect.java @@ -87,27 +87,27 @@ public class TreeDragSourceEffect extends DragSourceEffect { * in versions smaller than 2.2.4 if the model is NULL. The fix is * to give a valid pointer instead. */ - int /*long*/ handle = tree.handle; - int /*long*/ selection = OS.gtk_tree_view_get_selection (handle); - int /*long*/ [] model = OS.GTK_VERSION < OS.VERSION (2, 2, 4) ? new int /*long*/ [1] : null; - int /*long*/ list = OS.gtk_tree_selection_get_selected_rows (selection, model); + long /*int*/ handle = tree.handle; + long /*int*/ selection = OS.gtk_tree_view_get_selection (handle); + long /*int*/ [] model = OS.GTK_VERSION < OS.VERSION (2, 2, 4) ? new long /*int*/ [1] : null; + long /*int*/ list = OS.gtk_tree_selection_get_selected_rows (selection, model); if (list == 0) return null; int count = Math.min(10, OS.g_list_length (list)); Display display = tree.getDisplay(); if (count == 1) { - int /*long*/ path = OS.g_list_nth_data (list, 0); - int /*long*/ pixmap = OS.gtk_tree_view_create_row_drag_icon(handle, path); + long /*int*/ path = OS.g_list_nth_data (list, 0); + long /*int*/ pixmap = OS.gtk_tree_view_create_row_drag_icon(handle, path); dragSourceImage = Image.gtk_new(display, SWT.ICON, pixmap, 0); OS.gtk_tree_path_free (path); } else { int width = 0, height = 0; int[] w = new int[1], h = new int[1]; int[] yy = new int[count], hh = new int[count]; - int /*long*/ [] pixmaps = new int /*long*/ [count]; + long /*int*/ [] pixmaps = new long /*int*/ [count]; GdkRectangle rect = new GdkRectangle (); for (int i=0; i<count; i++) { - int /*long*/ path = OS.g_list_nth_data (list, i); + long /*int*/ path = OS.g_list_nth_data (list, i); OS.gtk_tree_view_get_cell_area (handle, path, 0, rect); pixmaps[i] = OS.gtk_tree_view_create_row_drag_icon(handle, path); if (OS.GTK_VERSION >= OS.VERSION(2, 24, 0)) { @@ -121,10 +121,10 @@ public class TreeDragSourceEffect extends DragSourceEffect { hh[i] = h[0]; OS.gtk_tree_path_free (path); } - int /*long*/ source = OS.gdk_pixmap_new(OS.gdk_get_default_root_window(), width, height, -1); - int /*long*/ gcSource = OS.gdk_gc_new(source); - int /*long*/ mask = OS.gdk_pixmap_new(OS.gdk_get_default_root_window(), width, height, 1); - int /*long*/ gcMask = OS.gdk_gc_new(mask); + long /*int*/ source = OS.gdk_pixmap_new(OS.gdk_get_default_root_window(), width, height, -1); + long /*int*/ gcSource = OS.gdk_gc_new(source); + long /*int*/ mask = OS.gdk_pixmap_new(OS.gdk_get_default_root_window(), width, height, 1); + long /*int*/ gcMask = OS.gdk_gc_new(mask); GdkColor color = new GdkColor(); color.pixel = 0; OS.gdk_gc_set_foreground(gcMask, color); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TreeDropTargetEffect.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TreeDropTargetEffect.java index c7c5fd0ef9..b48787fc84 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TreeDropTargetEffect.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TreeDropTargetEffect.java @@ -111,7 +111,7 @@ public class TreeDropTargetEffect extends DropTargetEffect { */ public void dragLeave(DropTargetEvent event) { Tree tree = (Tree) control; - int /*long*/ handle = tree.handle; + long /*int*/ handle = tree.handle; OS.gtk_tree_view_set_drag_dest_row(handle, 0, OS.GTK_TREE_VIEW_DROP_BEFORE); scrollBeginTime = 0; @@ -142,14 +142,14 @@ public class TreeDropTargetEffect extends DropTargetEffect { Tree tree = (Tree) control; int effect = checkEffect(event.feedback); - int /*long*/ handle = tree.handle; + long /*int*/ handle = tree.handle; Point coordinates = new Point(event.x, event.y); coordinates = tree.toControl(coordinates); - int /*long*/ [] path = new int /*long*/ [1]; + long /*int*/ [] path = new long /*int*/ [1]; OS.gtk_tree_view_get_path_at_pos (handle, coordinates.x, coordinates.y, path, null, null, null); int index = -1; if (path[0] != 0) { - int /*long*/ indices = OS.gtk_tree_path_get_indices(path[0]); + long /*int*/ indices = OS.gtk_tree_path_get_indices(path[0]); if (indices != 0) { int depth = OS.gtk_tree_path_get_depth(path[0]); int[] temp = new int[depth]; diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/URLTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/URLTransfer.java index 63226b1416..7e872fbeb0 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/URLTransfer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/URLTransfer.java @@ -66,7 +66,7 @@ public void javaToNative (Object object, TransferData transferData){ char [] chars = new char[charCount +1]; string.getChars(0, charCount , chars, 0); int byteCount = chars.length*2; - int /*long*/ pValue = OS.g_malloc(byteCount); + long /*int*/ pValue = OS.g_malloc(byteCount); if (pValue == 0) return; OS.memmove(pValue, chars, byteCount); transferData.length = byteCount; diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/ByteArrayTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/ByteArrayTransfer.java index d33f8815ae..40fe5bccc0 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/ByteArrayTransfer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/ByteArrayTransfer.java @@ -166,7 +166,7 @@ protected void javaToNative (Object object, TransferData transferData) { // The caller of this method must release the data when it is done with it. byte[] data = (byte[])object; int size = data.length; - int /*long*/ newPtr = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, size); + long /*int*/ newPtr = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, size); OS.MoveMemory(newPtr, data, size); transferData.stgmedium = new STGMEDIUM(); transferData.stgmedium.tymed = COM.TYMED_HGLOBAL; @@ -196,10 +196,10 @@ protected Object nativeToJava(TransferData transferData) { transferData.result = getData(data, formatetc, stgmedium); data.Release(); if (transferData.result != COM.S_OK) return null; - int /*long*/ hMem = stgmedium.unionField; + long /*int*/ hMem = stgmedium.unionField; int size = OS.GlobalSize(hMem); byte[] buffer = new byte[size]; - int /*long*/ ptr = OS.GlobalLock(hMem); + long /*int*/ ptr = OS.GlobalLock(hMem); OS.MoveMemory(buffer, ptr, size); OS.GlobalUnlock(hMem); OS.GlobalFree(hMem); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/Clipboard.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/Clipboard.java index 913d7d839e..5567b2d88c 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/Clipboard.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/Clipboard.java @@ -315,7 +315,7 @@ public Object getContents(Transfer transfer, int clipboards) { * the clipboard, use PeekMessage() to enable cross thread * message sends. */ - int /*long*/[] ppv = new int /*long*/[1]; + long /*int*/[] ppv = new long /*int*/[1]; int retryCount = 0; /* OleGetClipboard([out] ppDataObject). * AddRef has already been called on ppDataObject by the callee and must be released by the caller. @@ -517,15 +517,15 @@ private int AddRef() { private void createCOMInterfaces() { // register each of the interfaces that this object implements iDataObject = new COMObject(new int[]{2, 0, 0, 2, 2, 1, 2, 3, 2, 4, 1, 1}){ - public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);} - public int /*long*/ method1(int /*long*/[] args) {return AddRef();} - public int /*long*/ method2(int /*long*/[] args) {return Release();} - public int /*long*/ method3(int /*long*/[] args) {return GetData(args[0], args[1]);} + public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long /*int*/ method3(long /*int*/[] args) {return GetData(args[0], args[1]);} // method4 GetDataHere - not implemented - public int /*long*/ method5(int /*long*/[] args) {return QueryGetData(args[0]);} + public long /*int*/ method5(long /*int*/[] args) {return QueryGetData(args[0]);} // method6 GetCanonicalFormatEtc - not implemented // method7 SetData - not implemented - public int /*long*/ method8(int /*long*/[] args) {return EnumFormatEtc((int)/*64*/args[0], args[1]);} + public long /*int*/ method8(long /*int*/[] args) {return EnumFormatEtc((int)/*64*/args[0], args[1]);} // method9 DAdvise - not implemented // method10 DUnadvise - not implemented // method11 EnumDAdvise - not implemented @@ -541,7 +541,7 @@ private void disposeCOMInterfaces() { * Ownership of ppenumFormatetc transfers from callee to caller so reference count on ppenumFormatetc * must be incremented before returning. Caller is responsible for releasing ppenumFormatetc. */ -private int EnumFormatEtc(int dwDirection, int /*long*/ ppenumFormatetc) { +private int EnumFormatEtc(int dwDirection, long /*int*/ ppenumFormatetc) { // only allow getting of data - SetData is not currently supported if (dwDirection == COM.DATADIR_SET) return COM.E_NOTIMPL; // what types have been registered? @@ -567,10 +567,10 @@ private int EnumFormatEtc(int dwDirection, int /*long*/ ppenumFormatetc) { dropeffect.tymed = COM.TYMED_HGLOBAL; formats[formats.length -1] = dropeffect; enumFORMATETC.setFormats(formats); - OS.MoveMemory(ppenumFormatetc, new int /*long*/[] {enumFORMATETC.getAddress()}, OS.PTR_SIZEOF); + OS.MoveMemory(ppenumFormatetc, new long /*int*/[] {enumFORMATETC.getAddress()}, OS.PTR_SIZEOF); return COM.S_OK; } -private int GetData(int /*long*/ pFormatetc, int /*long*/ pmedium) { +private int GetData(long /*int*/ pFormatetc, long /*int*/ pmedium) { /* Called by a data consumer to obtain data from a source data object. The GetData method renders the data described in the specified FORMATETC structure and transfers it through the specified STGMEDIUM structure. @@ -612,7 +612,7 @@ private int GetData(int /*long*/ pFormatetc, int /*long*/ pmedium) { return transferData.result; } -private int QueryGetData(int /*long*/ pFormatetc) { +private int QueryGetData(long /*int*/ pFormatetc) { if (transferAgents == null) return COM.E_FAIL; TransferData transferData = new TransferData(); transferData.formatetc = new FORMATETC(); @@ -631,16 +631,16 @@ private int QueryGetData(int /*long*/ pFormatetc) { * Ownership of ppvObject transfers from callee to caller so reference count on ppvObject * must be incremented before returning. Caller is responsible for releasing ppvObject. */ -private int QueryInterface(int /*long*/ riid, int /*long*/ ppvObject) { +private int QueryInterface(long /*int*/ riid, long /*int*/ ppvObject) { if (riid == 0 || ppvObject == 0) return COM.E_INVALIDARG; GUID guid = new GUID(); COM.MoveMemory(guid, riid, GUID.sizeof); if (COM.IsEqualGUID(guid, COM.IIDIUnknown) || COM.IsEqualGUID(guid, COM.IIDIDataObject) ) { - OS.MoveMemory(ppvObject, new int /*long*/[] {iDataObject.getAddress()}, OS.PTR_SIZEOF); + OS.MoveMemory(ppvObject, new long /*int*/[] {iDataObject.getAddress()}, OS.PTR_SIZEOF); AddRef(); return COM.S_OK; } - OS.MoveMemory(ppvObject, new int /*long*/[] {0}, OS.PTR_SIZEOF); + OS.MoveMemory(ppvObject, new long /*int*/[] {0}, OS.PTR_SIZEOF); return COM.E_NOINTERFACE; } private int Release() { @@ -765,13 +765,13 @@ public String[] getAvailableTypeNames() { private FORMATETC[] _getAvailableTypes() { FORMATETC[] types = new FORMATETC[0]; - int /*long*/[] ppv = new int /*long*/[1]; + long /*int*/[] ppv = new long /*int*/[1]; /* OleGetClipboard([out] ppDataObject). * AddRef has already been called on ppDataObject by the callee and must be released by the caller. */ if (COM.OleGetClipboard(ppv) != COM.S_OK) return types; IDataObject dataObject = new IDataObject(ppv[0]); - int /*long*/[] ppFormatetc = new int /*long*/[1]; + long /*int*/[] ppFormatetc = new long /*int*/[1]; /* EnumFormatEtc([in] dwDirection, [out] ppenumFormatetc) * AddRef has already been called on ppenumFormatetc by the callee and must be released by the caller. */ @@ -780,7 +780,7 @@ private FORMATETC[] _getAvailableTypes() { if (rc != COM.S_OK)return types; IEnumFORMATETC enumFormatetc = new IEnumFORMATETC(ppFormatetc[0]); // Loop over enumerator and save any types that match what we are looking for - int /*long*/ rgelt = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, FORMATETC.sizeof); + long /*int*/ rgelt = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, FORMATETC.sizeof); int[] pceltFetched = new int[1]; enumFormatetc.Reset(); while (enumFormatetc.Next(1, rgelt, pceltFetched) == COM.S_OK && pceltFetched[0] == 1) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DragSource.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DragSource.java index 4e83e954f1..592b959aed 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DragSource.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DragSource.java @@ -107,7 +107,7 @@ public class DragSource extends Widget { Transfer[] transferAgents = new Transfer[0]; DragSourceEffect dragEffect; Composite topControl; - int /*long*/ hwndDrag; + long /*int*/ hwndDrag; // ole interfaces COMObject iDropSource; @@ -245,23 +245,23 @@ private int AddRef() { private void createCOMInterfaces() { // register each of the interfaces that this object implements iDropSource = new COMObject(new int[]{2, 0, 0, 2, 1}){ - public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);} - public int /*long*/ method1(int /*long*/[] args) {return AddRef();} - public int /*long*/ method2(int /*long*/[] args) {return Release();} - public int /*long*/ method3(int /*long*/[] args) {return QueryContinueDrag((int)/*64*/args[0], (int)/*64*/args[1]);} - public int /*long*/ method4(int /*long*/[] args) {return GiveFeedback((int)/*64*/args[0]);} + public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long /*int*/ method3(long /*int*/[] args) {return QueryContinueDrag((int)/*64*/args[0], (int)/*64*/args[1]);} + public long /*int*/ method4(long /*int*/[] args) {return GiveFeedback((int)/*64*/args[0]);} }; iDataObject = new COMObject(new int[]{2, 0, 0, 2, 2, 1, 2, 3, 2, 4, 1, 1}){ - public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);} - public int /*long*/ method1(int /*long*/[] args) {return AddRef();} - public int /*long*/ method2(int /*long*/[] args) {return Release();} - public int /*long*/ method3(int /*long*/[] args) {return GetData(args[0], args[1]);} + public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long /*int*/ method3(long /*int*/[] args) {return GetData(args[0], args[1]);} // method4 GetDataHere - not implemented - public int /*long*/ method5(int /*long*/[] args) {return QueryGetData(args[0]);} + public long /*int*/ method5(long /*int*/[] args) {return QueryGetData(args[0]);} // method6 GetCanonicalFormatEtc - not implemented - public int /*long*/ method7(int /*long*/[] args) {return SetData(args[0], args[1], (int)/*64*/args[2]);} - public int /*long*/ method8(int /*long*/[] args) {return EnumFormatEtc((int)/*64*/args[0], args[1]);} + public long /*int*/ method7(long /*int*/[] args) {return SetData(args[0], args[1], (int)/*64*/args[2]);} + public long /*int*/ method8(long /*int*/[] args) {return EnumFormatEtc((int)/*64*/args[0], args[1]);} // method9 DAdvise - not implemented // method10 DUnadvise - not implemented // method11 EnumDAdvise - not implemented @@ -394,7 +394,7 @@ private void drag(Event dragEvent) { * Ownership of ppenumFormatetc transfers from callee to caller so reference count on ppenumFormatetc * must be incremented before returning. Caller is responsible for releasing ppenumFormatetc. */ -private int EnumFormatEtc(int dwDirection, int /*long*/ ppenumFormatetc) { +private int EnumFormatEtc(int dwDirection, long /*int*/ ppenumFormatetc) { // only allow getting of data - SetData is not currently supported if (dwDirection == COM.DATADIR_SET) return COM.E_NOTIMPL; @@ -420,7 +420,7 @@ private int EnumFormatEtc(int dwDirection, int /*long*/ ppenumFormatetc) { } enumFORMATETC.setFormats(formats); - OS.MoveMemory(ppenumFormatetc, new int /*long*/[] {enumFORMATETC.getAddress()}, OS.PTR_SIZEOF); + OS.MoveMemory(ppenumFormatetc, new long /*int*/[] {enumFORMATETC.getAddress()}, OS.PTR_SIZEOF); return COM.S_OK; } /** @@ -433,7 +433,7 @@ public Control getControl() { return control; } -private int GetData(int /*long*/ pFormatetc, int /*long*/ pmedium) { +private int GetData(long /*int*/ pFormatetc, long /*int*/ pmedium) { /* Called by a data consumer to obtain data from a source data object. The GetData method renders the data described in the specified FORMATETC structure and transfers it through the specified STGMEDIUM structure. @@ -608,7 +608,7 @@ private int osToOp(int osOperation){ return operation; } -private int QueryGetData(int /*long*/ pFormatetc) { +private int QueryGetData(long /*int*/ pFormatetc) { if (transferAgents == null) return COM.E_FAIL; TransferData transferData = new TransferData(); transferData.formatetc = new FORMATETC(); @@ -629,25 +629,25 @@ private int QueryGetData(int /*long*/ pFormatetc) { * Ownership of ppvObject transfers from callee to caller so reference count on ppvObject * must be incremented before returning. Caller is responsible for releasing ppvObject. */ -private int QueryInterface(int /*long*/ riid, int /*long*/ ppvObject) { +private int QueryInterface(long /*int*/ riid, long /*int*/ ppvObject) { if (riid == 0 || ppvObject == 0) return COM.E_INVALIDARG; GUID guid = new GUID(); COM.MoveMemory(guid, riid, GUID.sizeof); if (COM.IsEqualGUID(guid, COM.IIDIUnknown) || COM.IsEqualGUID(guid, COM.IIDIDropSource)) { - OS.MoveMemory(ppvObject, new int /*long*/[] {iDropSource.getAddress()}, OS.PTR_SIZEOF); + OS.MoveMemory(ppvObject, new long /*int*/[] {iDropSource.getAddress()}, OS.PTR_SIZEOF); AddRef(); return COM.S_OK; } if (COM.IsEqualGUID(guid, COM.IIDIDataObject) ) { - OS.MoveMemory(ppvObject, new int /*long*/[] {iDataObject.getAddress()}, OS.PTR_SIZEOF); + OS.MoveMemory(ppvObject, new long /*int*/[] {iDataObject.getAddress()}, OS.PTR_SIZEOF); AddRef(); return COM.S_OK; } - OS.MoveMemory(ppvObject, new int /*long*/[] {0}, OS.PTR_SIZEOF); + OS.MoveMemory(ppvObject, new long /*int*/[] {0}, OS.PTR_SIZEOF); return COM.E_NOINTERFACE; } @@ -687,7 +687,7 @@ public void removeDragListener(DragSourceListener listener) { removeListener(DND.DragEnd, listener); } -private int SetData(int /*long*/ pFormatetc, int /*long*/ pmedium, int fRelease) { +private int SetData(long /*int*/ pFormatetc, long /*int*/ pmedium, int fRelease) { if (pFormatetc == 0 || pmedium == 0) return COM.E_INVALIDARG; FORMATETC formatetc = new FORMATETC(); COM.MoveMemory(formatetc, pFormatetc, FORMATETC.sizeof); @@ -695,7 +695,7 @@ private int SetData(int /*long*/ pFormatetc, int /*long*/ pmedium, int fRelease) STGMEDIUM stgmedium = new STGMEDIUM(); COM.MoveMemory(stgmedium, pmedium,STGMEDIUM.sizeof); //TODO - this should be GlobalLock() - int /*long*/[] ptrEffect = new int /*long*/[1]; + long /*int*/[] ptrEffect = new long /*int*/[1]; OS.MoveMemory(ptrEffect, stgmedium.unionField, OS.PTR_SIZEOF); int[] effect = new int[1]; OS.MoveMemory(effect, ptrEffect[0], 4); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DropTarget.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DropTarget.java index fe7785ec2e..1cb6c67392 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DropTarget.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DropTarget.java @@ -235,25 +235,25 @@ void createCOMInterfaces() { // register each of the interfaces that this object implements boolean is32 = C.PTR_SIZEOF == 4; iDropTarget = new COMObject(new int[]{2, 0, 0, is32 ? 5 : 4, is32 ? 4 : 3, 0, is32 ? 5 : 4}){ - public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);} - public int /*long*/ method1(int /*long*/[] args) {return AddRef();} - public int /*long*/ method2(int /*long*/[] args) {return Release();} - public int /*long*/ method3(int /*long*/[] args) { + public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long /*int*/ method3(long /*int*/[] args) { if (args.length == 5) { return DragEnter(args[0], (int)/*64*/args[1], (int)/*64*/args[2], (int)/*64*/args[3], args[4]); } else { return DragEnter_64(args[0], (int)/*64*/args[1], args[2], args[3]); } } - public int /*long*/ method4(int /*long*/[] args) { + public long /*int*/ method4(long /*int*/[] args) { if (args.length == 4) { return DragOver((int)/*64*/args[0], (int)/*64*/args[1], (int)/*64*/args[2], args[3]); } else { return DragOver_64((int)/*64*/args[0], args[1], args[2]); } } - public int /*long*/ method5(int /*long*/[] args) {return DragLeave();} - public int /*long*/ method6(int /*long*/[] args) { + public long /*int*/ method5(long /*int*/[] args) {return DragLeave();} + public long /*int*/ method6(long /*int*/[] args) { if (args.length == 5) { return Drop(args[0], (int)/*64*/args[1], (int)/*64*/args[2], (int)/*64*/args[3], args[4]); } else { @@ -269,13 +269,13 @@ void disposeCOMInterfaces() { iDropTarget = null; } -int DragEnter_64(int /*long*/ pDataObject, int grfKeyState, long pt, int /*long*/ pdwEffect) { +int DragEnter_64(long /*int*/ pDataObject, int grfKeyState, long pt, long /*int*/ pdwEffect) { POINT point = new POINT(); OS.MoveMemory(point, new long[]{pt}, 8); return DragEnter(pDataObject, grfKeyState, point.x, point.y, pdwEffect); } -int DragEnter(int /*long*/ pDataObject, int grfKeyState, int pt_x, int pt_y, int /*long*/ pdwEffect) { +int DragEnter(long /*int*/ pDataObject, int grfKeyState, int pt_x, int pt_y, long /*int*/ pdwEffect) { selectedDataType = null; selectedOperation = DND.DROP_NONE; if (iDataObject != null) iDataObject.Release(); @@ -334,13 +334,13 @@ int DragLeave() { return COM.S_OK; } -int DragOver_64(int grfKeyState, long pt, int /*lon |