diff options
| author | Grant Gayed <ggayed> | 2007-07-10 15:48:09 +0000 |
|---|---|---|
| committer | Grant Gayed <ggayed> | 2007-07-10 15:48:09 +0000 |
| commit | ee543bcb83fee603dbf808a397bfdb1dd9d1075a (patch) | |
| tree | a1aa553baf59df75b3aa7808883d68f1acbb0ef4 | |
| parent | ef390566d4164ae7a1f970e53f45de12a5265cf6 (diff) | |
| download | eclipse.platform.swt-ee543bcb83fee603dbf808a397bfdb1dd9d1075a.tar.gz eclipse.platform.swt-ee543bcb83fee603dbf808a397bfdb1dd9d1075a.tar.xz eclipse.platform.swt-ee543bcb83fee603dbf808a397bfdb1dd9d1075a.zip | |
57151 - [64] 64 bit support needed for Windows XP 64-Bit EditionafterInitialReleaseOfWindows64
129 files changed, 4113 insertions, 3743 deletions
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.ole.win32.COM.properties b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.ole.win32.COM.properties index 86256a9456..6678daae9a 100644 --- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.ole.win32.COM.properties +++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.ole.win32.COM.properties @@ -76,6 +76,8 @@ COM_DoDragDrop_1=cast=IDropSource * COM_DoDragDrop_2= COM_DoDragDrop_3= +COM_ELEMDESC_sizeof= + COM_EXCEPINFO_sizeof= COM_FORMATETC_sizeof= @@ -314,6 +316,8 @@ COM_SysStringByteLen_0=cast=(BSTR) COM_TYPEATTR_sizeof= +COM_TYPEDESC_sizeof= + COM_VARDESC_sizeof= COM_VARIANT_sizeof= diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.win32.OS.properties b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.win32.OS.properties index 2595fa98f0..61eb991940 100644 --- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.win32.OS.properties +++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.win32.OS.properties @@ -591,6 +591,13 @@ NMTOOLBAR_top=accessor=rcButton.top,flags=no_wince NMTOOLBAR_right=accessor=rcButton.right,flags=no_wince NMTOOLBAR_bottom=accessor=rcButton.bottom,flags=no_wince +org_eclipse_swt_internal_win32_NMTREEVIEW= +NMTREEVIEW_hdr= +NMTREEVIEW_action= +NMTREEVIEW_itemOld= +NMTREEVIEW_itemNew= +NMTREEVIEW_ptDrag= + org_eclipse_swt_internal_win32_NMTTDISPINFO= NMTTDISPINFO_lpszText=cast=(void *) NMTTDISPINFO_hinst=cast=(HINSTANCE) @@ -3080,6 +3087,11 @@ OS_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTOOLBAR_2II_0=cast=(PVOID),flag OS_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTOOLBAR_2II_1=cast=(CONST VOID *) OS_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTOOLBAR_2II_2= +OS_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTREEVIEW_2II= +OS_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTREEVIEW_2II_0=cast=(PVOID),flags=no_in +OS_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTREEVIEW_2II_1=cast=(CONST VOID *) +OS_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTREEVIEW_2II_2= + OS_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2II= OS_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2II_0=cast=(PVOID),flags=no_in OS_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2II_1=cast=(CONST VOID *) @@ -3125,6 +3137,11 @@ OS_MoveMemory__Lorg_eclipse_swt_internal_win32_POINT_2II_0=cast=PVOID,flags=no_i OS_MoveMemory__Lorg_eclipse_swt_internal_win32_POINT_2II_1=cast=CONST VOID * OS_MoveMemory__Lorg_eclipse_swt_internal_win32_POINT_2II_2= +OS_MoveMemory__Lorg_eclipse_swt_internal_win32_POINT_2_3JI= +OS_MoveMemory__Lorg_eclipse_swt_internal_win32_POINT_2_3JI_0=cast=PVOID,flags=no_in +OS_MoveMemory__Lorg_eclipse_swt_internal_win32_POINT_2_3JI_1=cast=CONST VOID *,flags=no_out critical +OS_MoveMemory__Lorg_eclipse_swt_internal_win32_POINT_2_3JI_2= + OS_MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2_3II= OS_MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2_3II_0= OS_MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2_3II_1= @@ -3272,6 +3289,8 @@ OS_NMTBHOTITEM_sizeof= OS_NMTOOLBAR_sizeof= +OS_NMTREEVIEW_sizeof= + OS_NMTTDISPINFOA_sizeof= OS_NMTTDISPINFOW_sizeof= diff --git a/bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/library/swt_awt.c b/bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/library/swt_awt.c index ff5c83e9a4..eac8751e57 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/library/swt_awt.c +++ b/bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/library/swt_awt.c @@ -9,19 +9,20 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ +#include "swt.h" #include "jawt_md.h" #define SWT_AWT_NATIVE(func) Java_org_eclipse_swt_awt_SWT_1AWT_##func #ifndef NO_getAWTHandle -JNIEXPORT jint JNICALL SWT_AWT_NATIVE(getAWTHandle) +JNIEXPORT SWT_PTR JNICALL SWT_AWT_NATIVE(getAWTHandle) (JNIEnv *env, jclass that, jobject canvas) { JAWT awt; JAWT_DrawingSurface* ds; JAWT_DrawingSurfaceInfo* dsi; JAWT_X11DrawingSurfaceInfo* dsi_x11; - jint result = 0; + SWT_PTR result = 0; jint lock; awt.version = JAWT_VERSION_1_3; @@ -32,7 +33,7 @@ JNIEXPORT jint JNICALL SWT_AWT_NATIVE(getAWTHandle) if ((lock & JAWT_LOCK_ERROR) == 0) { dsi = ds->GetDrawingSurfaceInfo(ds); dsi_x11 = (JAWT_X11DrawingSurfaceInfo*)dsi->platformInfo; - result = (jint)dsi_x11->drawable; + result = (SWT_PTR)dsi_x11->drawable; ds->FreeDrawingSurfaceInfo(dsi); ds->Unlock(ds); } 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 981905b7ba..0d6a48e74d 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 @@ static synchronized void loadLibrary () { if (loaded) return; loaded = true; /* - * Note that the jawt library is loaded explicitily + * Note that the jawt library is loaded explicitly * because it cannot be found by the library loader. * All exceptions are caught because the library may * have been loaded already. @@ -148,7 +148,7 @@ public static Frame new_Frame (final Composite parent) { int /*long*/ 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 + * and other JREs take a long. To handle this binary incompatibility, use * reflection to create the embedded frame. */ Class clazz = null; diff --git a/bundles/org.eclipse.swt/Eclipse SWT AWT/win32/library/swt_awt.c b/bundles/org.eclipse.swt/Eclipse SWT AWT/win32/library/swt_awt.c index c202eb3435..e7fc1a31ee 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT AWT/win32/library/swt_awt.c +++ b/bundles/org.eclipse.swt/Eclipse SWT AWT/win32/library/swt_awt.c @@ -9,19 +9,20 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ +#include "swt.h" #include "jawt_md.h" #define SWT_AWT_NATIVE(func) Java_org_eclipse_swt_awt_SWT_1AWT_##func #ifndef NO_getAWTHandle -JNIEXPORT jint JNICALL SWT_AWT_NATIVE(getAWTHandle) +JNIEXPORT SWT_PTR JNICALL SWT_AWT_NATIVE(getAWTHandle) (JNIEnv *env, jclass that, jobject canvas) { JAWT awt; JAWT_DrawingSurface* ds; JAWT_DrawingSurfaceInfo* dsi; JAWT_Win32DrawingSurfaceInfo* dsi_win; - jint result = 0; + SWT_PTR result = 0; jint lock; awt.version = JAWT_VERSION_1_3; @@ -32,7 +33,7 @@ JNIEXPORT jint JNICALL SWT_AWT_NATIVE(getAWTHandle) if ((lock & JAWT_LOCK_ERROR) == 0) { dsi = ds->GetDrawingSurfaceInfo(ds); dsi_win = (JAWT_Win32DrawingSurfaceInfo*)dsi->platformInfo; - result = (jint)dsi_win->hwnd; + result = (SWT_PTR)dsi_win->hwnd; ds->FreeDrawingSurfaceInfo(dsi); ds->Unlock(ds); } 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 b8787c8231..7a171ee689 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 @@ -16,19 +16,19 @@ import java.lang.reflect.Method; /* SWT Imports */ import org.eclipse.swt.*; +import org.eclipse.swt.internal.*; import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Event; -import org.eclipse.swt.internal.*; /* AWT Imports */ +import java.awt.Dimension; import java.awt.EventQueue; import java.awt.Canvas; import java.awt.Frame; -import java.awt.Dimension; import java.awt.Toolkit; import java.awt.event.ComponentAdapter; import java.awt.event.ComponentEvent; @@ -55,9 +55,9 @@ public class SWT_AWT { */ static String EMBEDDED_FRAME_KEY = "org.eclipse.swt.awt.SWT_AWT.embeddedFrame"; - static boolean loaded, swingInitialized; +static boolean loaded, swingInitialized; -static native final int getAWTHandle (Canvas canvas); +static native final int /*long*/ getAWTHandle (Canvas canvas); static synchronized void loadLibrary () { if (loaded) return; @@ -135,7 +135,7 @@ public static Frame new_Frame (final Composite parent) { if ((parent.getStyle () & SWT.EMBEDDED) == 0) { SWT.error (SWT.ERROR_INVALID_ARGUMENT); } - int handle = parent.handle; + int /*long*/ handle = parent.handle; /* * Some JREs have implemented the embedded frame constructor to take an integer * and other JREs take a long. To handle this binary incompatibility, use @@ -148,23 +148,20 @@ public static Frame new_Frame (final Composite parent) { } catch (Throwable e) { SWT.error (SWT.ERROR_NOT_IMPLEMENTED, e); } + initializeSwing (); + Object value = null; Constructor constructor = null; try { - constructor = clazz.getConstructor (new Class [] {int.class}); + constructor = clazz.getConstructor (new Class [] {int.class, boolean.class}); + value = constructor.newInstance (new Object [] {new Integer ((int)/*64*/handle), Boolean.TRUE}); } catch (Throwable e1) { try { - constructor = clazz.getConstructor (new Class [] {long.class}); + constructor = clazz.getConstructor (new Class [] {long.class, boolean.class}); + value = constructor.newInstance (new Object [] {new Long (handle), Boolean.TRUE}); } catch (Throwable e2) { SWT.error (SWT.ERROR_NOT_IMPLEMENTED, e2); } } - initializeSwing (); - Object value = null; - try { - value = constructor.newInstance (new Object [] {new Integer (handle)}); - } catch (Throwable e) { - SWT.error (SWT.ERROR_NOT_IMPLEMENTED, e); - } final Frame frame = (Frame) value; /* * This is necessary to make lightweight components @@ -303,7 +300,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 handle = 0; + int /*long*/ handle = 0; try { loadLibrary (); handle = getAWTHandle (parent); 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 1f222e35de..19d2a42a96 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 @@ -121,8 +121,8 @@ public class Accessible { 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)args[0], args[1], args[2]);} - public int /*long*/ method4(int /*long*/[] args) {return Skip((int)args[0]);} + 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]);} }; @@ -532,6 +532,7 @@ public class Accessible { if (childID == ACC.CHILDID_NONE) { return iaccessible.accHitTest(xLeft, yTop, pvarChild); } + //TODO - use VARIANT structure COM.MoveMemory(pvarChild, new short[] { COM.VT_I4 }, 2); COM.MoveMemory(pvarChild + 8, new int[] { childIDToOs(childID) }, 4); return COM.S_OK; @@ -558,7 +559,7 @@ public class Accessible { } AccessibleControlEvent event = new AccessibleControlEvent(this); - event.childID = osToChildID((int)/*64*/v.lVal); + event.childID = osToChildID(v.lVal); event.x = osLeft; event.y = osTop; event.width = osWidth; @@ -606,7 +607,7 @@ public class Accessible { } AccessibleControlEvent event = new AccessibleControlEvent(this); - event.childID = osToChildID((int)/*64*/v.lVal); + event.childID = osToChildID(v.lVal); for (int i = 0; i < accessibleControlListeners.size(); i++) { AccessibleControlListener listener = (AccessibleControlListener) accessibleControlListeners.elementAt(i); listener.getChild(event); @@ -668,7 +669,7 @@ public class Accessible { } AccessibleControlEvent event = new AccessibleControlEvent(this); - event.childID = osToChildID((int)/*64*/v.lVal); + event.childID = osToChildID(v.lVal); event.result = osDefaultAction; for (int i = 0; i < accessibleControlListeners.size(); i++) { AccessibleControlListener listener = (AccessibleControlListener) accessibleControlListeners.elementAt(i); @@ -705,7 +706,7 @@ public class Accessible { } AccessibleEvent event = new AccessibleEvent(this); - event.childID = osToChildID((int)/*64*/v.lVal); + event.childID = osToChildID(v.lVal); event.result = osDescription; // TEMPORARY CODE @@ -758,6 +759,7 @@ public class Accessible { int code = iaccessible.get_accFocus(pvarChild); if (accessibleControlListeners.size() == 0) return code; if (code == COM.S_OK) { + //TODO - use VARIANT structure short[] pvt = new short[1]; COM.MoveMemory(pvt, pvarChild, 2); if (pvt[0] == COM.VT_I4) { @@ -819,7 +821,7 @@ public class Accessible { } AccessibleEvent event = new AccessibleEvent(this); - event.childID = osToChildID((int)/*64*/v.lVal); + event.childID = osToChildID(v.lVal); event.result = osHelp; for (int i = 0; i < accessibleListeners.size(); i++) { AccessibleListener listener = (AccessibleListener) accessibleListeners.elementAt(i); @@ -863,7 +865,7 @@ public class Accessible { } AccessibleEvent event = new AccessibleEvent(this); - event.childID = osToChildID((int)/*64*/v.lVal); + event.childID = osToChildID(v.lVal); event.result = osKeyboardShortcut; for (int i = 0; i < accessibleListeners.size(); i++) { AccessibleListener listener = (AccessibleListener) accessibleListeners.elementAt(i); @@ -899,7 +901,7 @@ public class Accessible { } AccessibleEvent event = new AccessibleEvent(this); - event.childID = osToChildID((int)/*64*/v.lVal); + event.childID = osToChildID(v.lVal); event.result = osName; for (int i = 0; i < accessibleListeners.size(); i++) { AccessibleListener listener = (AccessibleListener) accessibleListeners.elementAt(i); @@ -935,6 +937,7 @@ public class Accessible { // TEMPORARY CODE - process tree and table even if there are no apps listening if (accessibleControlListeners.size() == 0 && !(control instanceof Tree || control instanceof Table)) return code; if (code == COM.S_OK) { + //TODO - use VARIANT structure short[] pvt = new short[1]; COM.MoveMemory(pvt, pvarRole, 2); if (pvt[0] == COM.VT_I4) { @@ -945,7 +948,7 @@ public class Accessible { } AccessibleControlEvent event = new AccessibleControlEvent(this); - event.childID = osToChildID((int)/*64*/v.lVal); + event.childID = osToChildID(v.lVal); event.detail = osToRole(osRole); // TEMPORARY CODE /* Currently our checkbox table and tree are emulated using state mask @@ -977,6 +980,7 @@ public class Accessible { int code = iaccessible.get_accSelection(pvarChildren); if (accessibleControlListeners.size() == 0) return code; if (code == COM.S_OK) { + //TODO - use VARIANT structure short[] pvt = new short[1]; COM.MoveMemory(pvt, pvarChildren, 2); if (pvt[0] == COM.VT_I4) { @@ -1037,6 +1041,7 @@ public class Accessible { // TEMPORARY CODE - process tree and table even if there are no apps listening if (accessibleControlListeners.size() == 0 && !(control instanceof Tree || control instanceof Table)) return code; if (code == COM.S_OK) { + //TODO - use VARIANT structure short[] pvt = new short[1]; COM.MoveMemory(pvt, pvarState, 2); if (pvt[0] == COM.VT_I4) { @@ -1047,7 +1052,7 @@ public class Accessible { } AccessibleControlEvent event = new AccessibleControlEvent(this); - event.childID = osToChildID((int)/*64*/v.lVal); + event.childID = osToChildID(v.lVal); event.detail = osToState(osState); // TEMPORARY CODE /* Currently our checkbox table and tree are emulated using state mask @@ -1107,7 +1112,7 @@ public class Accessible { } AccessibleControlEvent event = new AccessibleControlEvent(this); - event.childID = osToChildID((int)/*64*/v.lVal); + event.childID = osToChildID(v.lVal); event.result = osValue; for (int i = 0; i < accessibleControlListeners.size(); i++) { AccessibleControlListener listener = (AccessibleControlListener) accessibleControlListeners.elementAt(i); @@ -1199,13 +1204,14 @@ public class Accessible { Object nextItem = nextItems[i]; if (nextItem instanceof Integer) { int item = ((Integer) nextItem).intValue(); - COM.MoveMemory(rgvar + i * 16, new short[] { COM.VT_I4 }, 2); - COM.MoveMemory(rgvar + i * 16 + 8, new int[] { item }, 4); + //TODO - use VARIANT struct + COM.MoveMemory(rgvar + i * VARIANT.sizeof, new short[] { COM.VT_I4 }, 2); + COM.MoveMemory(rgvar + i * VARIANT.sizeof + 8, new int[] { item }, 4); } else { Accessible accessible = (Accessible) nextItem; accessible.AddRef(); - COM.MoveMemory(rgvar + i * 16, new short[] { COM.VT_DISPATCH }, 2); - COM.MoveMemory(rgvar + i * 16 + 8, new int /*long*/[] { accessible.objIAccessible.getAddress() }, OS.PTR_SIZEOF); + COM.MoveMemory(rgvar + i * VARIANT.sizeof, new short[] { COM.VT_DISPATCH }, 2); + COM.MoveMemory(rgvar + i * VARIANT.sizeof + 8, new int /*long*/[] { accessible.objIAccessible.getAddress() }, OS.PTR_SIZEOF); } } if (pceltFetched != 0) @@ -1274,10 +1280,10 @@ public class Accessible { int code = iaccessible.QueryInterface(COM.IIDIEnumVARIANT, ppvObject); if (code != COM.S_OK) return code; IEnumVARIANT ienumvariant = new IEnumVARIANT(ppvObject[0]); - int[] pEnum = new int[1]; + int /*long*/ [] pEnum = new int /*long*/ [1]; code = ienumvariant.Clone(pEnum); ienumvariant.Release(); - COM.MoveMemory(ppEnum, pEnum, 4); + COM.MoveMemory(ppEnum, pEnum, OS.PTR_SIZEOF); return code; } 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 72b4d934b3..2c58801efa 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 @@ -29,7 +29,7 @@ class IE extends WebBrowser { Point size; boolean addressBar = true, menuBar = true, statusBar = true, toolBar = true; int info; - int globalDispatch; + int /*long*/ globalDispatch; String html; static final int BeforeNavigate2 = 0xfa; @@ -116,7 +116,7 @@ public void create(Composite parent, int style) { */ String progId = "Shell.Explorer"; //$NON-NLS-1$ TCHAR key = new TCHAR (0, "Shell.Explorer\\CLSID", true); //$NON-NLS-1$ - int [] phkResult = new int [1]; + int /*long*/ [] phkResult = new int /*long*/ [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); @@ -128,7 +128,7 @@ public void create(Composite parent, int style) { 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 [] phkResult2 = new int [1]; + int /*long*/ [] phkResult2 = new int /*long*/ [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]); @@ -207,7 +207,7 @@ public void create(Composite parent, int style) { } Variant cancel = event.arguments[6]; if (cancel != null) { - int pCancel = cancel.getByRef(); + int /*long*/ pCancel = cancel.getByRef(); COM.MoveMemory(pCancel, new short[]{newEvent.doit ? COM.VARIANT_FALSE : COM.VARIANT_TRUE}, 2); } break; @@ -247,11 +247,11 @@ public void create(Composite parent, int style) { * prepend the UTF-8 Byte Order Mark signature to the data. */ byte[] UTF8BOM = {(byte)0xEF, (byte)0xBB, (byte)0xBF}; - int hGlobal = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, UTF8BOM.length + byteCount); + int /*long*/ 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[] ppstm = new int[1]; + int /*long*/ [] ppstm = new int /*long*/ [1]; /* * Note. CreateStreamOnHGlobal is called with the flag fDeleteOnRelease. * If the call succeeds the buffer hGlobal is freed automatically @@ -262,7 +262,7 @@ public void create(Composite parent, int style) { int[] rgdispid = auto.getIDsOfNames(new String[] {"Document"}); //$NON-NLS-1$ Variant pVarResult = auto.getProperty(rgdispid[0]); IDispatch dispatchDocument = pVarResult.getDispatch(); - int[] ppvObject = new int[1]; + int /*long*/ [] ppvObject = new int /*long*/ [1]; int result = dispatchDocument.QueryInterface(COM.IIDIPersistStreamInit, ppvObject); if (result == OS.S_OK) { IPersistStreamInit persistStreamInit = new IPersistStreamInit(ppvObject[0]); @@ -352,7 +352,7 @@ public void create(Composite parent, int style) { } case NewWindow2: { Variant cancel = event.arguments[1]; - int pCancel = cancel.getByRef(); + int /*long*/ pCancel = cancel.getByRef(); WindowEvent newEvent = new WindowEvent(browser); newEvent.display = browser.getDisplay(); newEvent.widget = browser; @@ -369,8 +369,8 @@ public void create(Composite parent, int style) { Variant variant = new Variant(browser.auto); IDispatch iDispatch = variant.getDispatch(); Variant ppDisp = event.arguments[0]; - int byref = ppDisp.getByRef(); - if (byref != 0) COM.MoveMemory(byref, new int[] {iDispatch.getAddress()}, 4); + int /*long*/ byref = ppDisp.getByRef(); + if (byref != 0) COM.MoveMemory(byref, new int /*long*/[] {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 @@ -512,7 +512,7 @@ public void create(Composite parent, int style) { } }); Variant cancel = event.arguments[1]; - int pCancel = cancel.getByRef(); + int /*long*/ 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); 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 73776ca747..0a29e7680a 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 @@ -11,6 +11,7 @@ package org.eclipse.swt.browser; import org.eclipse.swt.*; +import org.eclipse.swt.internal.C; import org.eclipse.swt.internal.ole.win32.*; import org.eclipse.swt.ole.win32.*; import org.eclipse.swt.widgets.*; @@ -33,57 +34,63 @@ 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 method0(int[] args) {return QueryInterface(args[0], args[1]);} - public int method1(int[] args) {return AddRef();} - public int method2(int[] args) {return Release();} - public int method3(int[] args) {return ShowContextMenu(args[0], args[1], args[2], args[3]);} - public int method4(int[] args) {return GetHostInfo(args[0]);} - public int method5(int[] args) {return ShowUI(args[0], args[1], args[2], args[3], args[4]);} - public int method6(int[] args) {return HideUI();} - public int method7(int[] args) {return UpdateUI();} - public int method8(int[] args) {return EnableModeless(args[0]);} - public int method9(int[] args) {return OnDocWindowActivate(args[0]);} - public int method10(int[] args) {return OnFrameWindowActivate(args[0]);} - public int method11(int[] args) {return ResizeBorder(args[0], args[1], args[2]);} - public int method12(int[] args) {return TranslateAccelerator(args[0], args[1], args[2]);} - public int method13(int[] args) {return GetOptionKeyPath(args[0], args[1]);} - public int method14(int[] args) {return GetDropTarget(args[0], args[1]);} - public int method15(int[] args) {return GetExternal(args[0]);} - public int method16(int[] args) {return TranslateUrl(args[0], args[1], args[2]);} - public int method17(int[] args) {return FilterDataObject(args[0], args[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 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]);} }; - iDocHostShowUI = new COMObject(new int[]{2, 0, 0, 7, 7}){ - public int method0(int[] args) {return QueryInterface(args[0], args[1]);} - public int method1(int[] args) {return AddRef();} - public int method2(int[] args) {return Release();} - public int method3(int[] args) {return ShowMessage(args[0], args[1], args[2], args[3], args[4], args[5], args[6]);} - public int method4(int[] args) {return ShowHelp(args[0], args[1], args[2], args[3], args[4], args[5], args[6]);} + 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) { + 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 { + return ShowHelp_64(args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], args[4], args[5]); + } + } }; iServiceProvider = new COMObject(new int[]{2, 0, 0, 3}){ - public int method0(int[] args) {return QueryInterface(args[0], args[1]);} - public int method1(int[] args) {return AddRef();} - public int method2(int[] args) {return Release();} - public int method3(int[] args) {return QueryService(args[0], args[1], args[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 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 method0(int[] args) {return QueryInterface(args[0], args[1]);} - public int method1(int[] args) {return AddRef();} - public int method2(int[] args) {return Release();} - public int method3(int[] args) {return SetSecuritySite(args[0]);} - public int method4(int[] args) {return GetSecuritySite(args[0]);} - public int method5(int[] args) {return MapUrlToZone(args[0], args[1], args[2]);} - public int method6(int[] args) {return GetSecurityId(args[0], args[1], args[2], args[3]);} - public int method7(int[] args) {return ProcessUrlAction(args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7]);} - public int method8(int[] args) {return QueryCustomPolicy(args[0], args[1], args[2], args[3], args[4], args[5], args[6]);} - public int method9(int[] args) {return SetZoneMapping(args[0], args[1], args[2]);} - public int method10(int[] args) {return GetZoneMappings(args[0], args[1], args[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 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]);} }; iOleCommandTarget = new COMObject(new int[]{2, 0, 0, 4, 5}) { - public int method0(int[] args) {return QueryInterface(args[0], args[1]);} - public int method1(int[] args) {return AddRef();} - public int method2(int[] args) {return Release();} - public int method3(int[] args) {return QueryStatus(args[0], args[1], args[2], args[3]);} - public int method4(int[] args) {return Exec(args[0], args[1], args[2], args[3], args[4]);} + public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);} + public int /*long*/ method1(int /*long*/[] args) {return AddRef();} + public int /*long*/ method2(int /*long*/[] args) {return Release();} + public int /*long*/ method3(int /*long*/[] args) {return 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]);} }; } @@ -116,38 +123,38 @@ protected int AddRef() { return super.AddRef(); } -protected int QueryInterface(int riid, int ppvObject) { +protected int QueryInterface(int /*long*/ riid, int /*long*/ 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[] {iDocHostUIHandler.getAddress()}, 4); + COM.MoveMemory(ppvObject, new int /*long*/[] {iDocHostUIHandler.getAddress()}, OS.PTR_SIZEOF); AddRef(); return COM.S_OK; } if (COM.IsEqualGUID(guid, COM.IIDIDocHostShowUI)) { - COM.MoveMemory(ppvObject, new int[] {iDocHostShowUI.getAddress()}, 4); + COM.MoveMemory(ppvObject, new int /*long*/[] {iDocHostShowUI.getAddress()}, OS.PTR_SIZEOF); AddRef(); return COM.S_OK; } if (COM.IsEqualGUID(guid, COM.IIDIServiceProvider)) { - COM.MoveMemory(ppvObject, new int[] {iServiceProvider.getAddress()}, 4); + COM.MoveMemory(ppvObject, new int /*long*/[] {iServiceProvider.getAddress()}, OS.PTR_SIZEOF); AddRef(); return COM.S_OK; } if (COM.IsEqualGUID(guid, COM.IIDIInternetSecurityManager)) { - COM.MoveMemory(ppvObject, new int[] {iInternetSecurityManager.getAddress()}, 4); + COM.MoveMemory(ppvObject, new int /*long*/[] {iInternetSecurityManager.getAddress()}, OS.PTR_SIZEOF); AddRef(); return COM.S_OK; } if (COM.IsEqualGUID(guid, COM.IIDIOleCommandTarget)) { - COM.MoveMemory(ppvObject, new int[] {iOleCommandTarget.getAddress()}, 4); + COM.MoveMemory(ppvObject, new int /*long*/[] {iOleCommandTarget.getAddress()}, OS.PTR_SIZEOF); AddRef(); return COM.S_OK; } - COM.MoveMemory(ppvObject, new int[] {0}, 4); + COM.MoveMemory(ppvObject, new int /*long*/[] {0}, OS.PTR_SIZEOF); return COM.E_NOINTERFACE; } @@ -157,26 +164,27 @@ int EnableModeless(int EnableModeless) { return COM.E_NOTIMPL; } -int FilterDataObject(int pDO, int ppDORet) { +int FilterDataObject(int /*long*/ pDO, int /*long*/ ppDORet) { return COM.E_NOTIMPL; } -int GetDropTarget(int pDropTarget, int ppDropTarget) { +int GetDropTarget(int /*long*/ pDropTarget, int /*long*/ ppDropTarget) { return COM.E_NOTIMPL; } -int GetExternal(int ppDispatch) { - OS.MoveMemory(ppDispatch, new int[] {0}, 4); +int GetExternal(int /*long*/ ppDispatch) { + OS.MoveMemory(ppDispatch, new int /*long*/ [] {0}, OS.PTR_SIZEOF); return COM.S_FALSE; } -int GetHostInfo(int pInfo) { +int GetHostInfo(int /*long*/ pInfo) { IE browser = (IE)((Browser)getParent().getParent()).webBrowser; + //TODO - use DOCHOSTUIINFO structure OS.MoveMemory(pInfo + 4, new int[] {browser.info}, 4); return COM.S_OK; } -int GetOptionKeyPath(int pchKey, int dw) { +int GetOptionKeyPath(int /*long*/ pchKey, int dw) { return COM.E_NOTIMPL; } @@ -197,11 +205,11 @@ protected int Release() { return super.Release(); } -int ResizeBorder(int prcBorder, int pUIWindow, int fFrameWindow) { +int ResizeBorder(int /*long*/ prcBorder, int /*long*/ pUIWindow, int fFrameWindow) { return COM.E_NOTIMPL; } -int ShowContextMenu(int dwID, int ppt, int pcmdtReserved, int pdispReserved) { +int ShowContextMenu(int dwID, int /*long*/ ppt, int /*long*/ pcmdtReserved, int /*long*/ pdispReserved) { Browser browser = (Browser)getParent().getParent(); Event event = new Event(); POINT pt = new POINT(); @@ -222,11 +230,11 @@ int ShowContextMenu(int dwID, int ppt, int pcmdtReserved, int pdispReserved) { return COM.S_FALSE; } -int ShowUI(int dwID, int pActiveObject, int pCommandTarget, int pFrame, int pDoc) { +int ShowUI(int dwID, int /*long*/ pActiveObject, int /*long*/ pCommandTarget, int /*long*/ pFrame, int /*long*/ pDoc) { return COM.S_FALSE; } -int TranslateAccelerator(int lpMsg, int pguidCmdGroup, int nCmdID) { +int TranslateAccelerator(int /*long*/ lpMsg, int /*long*/ pguidCmdGroup, int nCmdID) { /* * Feature on Internet Explorer. By default the embedded Internet Explorer control runs * the Internet Explorer shortcuts (e.g. F5 for refresh). This overrides the shortcuts @@ -236,8 +244,8 @@ int TranslateAccelerator(int lpMsg, int pguidCmdGroup, int nCmdID) { Menu menubar = getShell().getMenuBar(); if (menubar != null && !menubar.isDisposed() && menubar.isEnabled()) { Shell shell = menubar.getShell(); - int hwnd = shell.handle; - int hAccel = OS.SendMessage(hwnd, OS.WM_APP+1, 0, 0); + int /*long*/ hwnd = shell.handle; + int /*long*/ hAccel = OS.SendMessage(hwnd, OS.WM_APP+1, 0, 0); if (hAccel != 0) { MSG msg = new MSG(); OS.MoveMemory(msg, lpMsg, MSG.sizeof); @@ -257,7 +265,7 @@ int TranslateAccelerator(int lpMsg, int pguidCmdGroup, int nCmdID) { MSG msg = new MSG(); OS.MoveMemory(msg, lpMsg, MSG.sizeof); if (msg.message == OS.WM_KEYDOWN) { - switch (msg.wParam) { + switch ((int)/*64*/msg.wParam) { case OS.VK_N: case OS.VK_O: if (OS.GetKeyState (OS.VK_CONTROL) < 0) { @@ -283,7 +291,7 @@ int TranslateAccelerator(int lpMsg, int pguidCmdGroup, int nCmdID) { return result; } -int TranslateUrl(int dwTranslate, int pchURLIn, int ppchURLOut) { +int TranslateUrl(int dwTranslate, int /*long*/ pchURLIn, int /*long*/ ppchURLOut) { return COM.E_NOTIMPL; } @@ -293,7 +301,7 @@ int UpdateUI() { /* IDocHostShowUI */ -int ShowMessage(int hwnd, int lpstrText, int lpstrCaption, int dwType, int lpstrHelpFile, int dwHelpContext, int plResult) { +int ShowMessage(int /*long*/ hwnd, int /*long*/ lpstrText, int /*long*/ lpstrCaption, int dwType, int /*long*/ lpstrHelpFile, int dwHelpContext, int /*long*/ plResult) { /* * Feature on IE. When IE navigates to a website that contains an ActiveX that is prevented from * being executed, IE displays a message "Your current security settings prohibit running ActiveX @@ -306,7 +314,7 @@ int ShowMessage(int hwnd, int lpstrText, int lpstrCaption, int dwType, int lpstr int IDS_MESSAGE_BOX_CAPTION = 8033; if (lpstrText != 0) { TCHAR lpLibFileName = new TCHAR (0, "SHDOCLC.DLL", true); //$NON-NLS-1$ - int hModule = OS.LoadLibrary(lpLibFileName); + int /*long*/ hModule = OS.LoadLibrary(lpLibFileName); if (hModule != 0) { /* * Note. lpstrText is a LPOLESTR, i.e. a null terminated unicode string LPWSTR, i.e. a WCHAR*. @@ -334,12 +342,18 @@ int ShowMessage(int hwnd, int lpstrText, int lpstrCaption, int dwType, int lpstr return COM.S_FALSE; } +int ShowHelp_64(int /*long*/ hwnd, int /*long*/ pszHelpFile, int uCommand, int dwData, long pt, int /*long*/ pDispatchObjectHit) { + POINT point = new POINT(); + OS.MoveMemory(point, new long[]{pt}, 8); + return ShowHelp(hwnd, pszHelpFile, uCommand, dwData, point.x, point.y, pDispatchObjectHit); +} + /* Note. One of the arguments of ShowHelp is a POINT struct and not a pointer to a POINT struct. Because * of the way Callback gets int parameters from a va_list of C arguments 2 integer arguments must be declared, * ptMouse_x and ptMouse_y. Otherwise the Browser crashes when the user presses F1 to invoke * the help. */ -int ShowHelp(int hwnd, int pszHelpFile, int uCommand, int dwData, int ptMouse_x, int ptMouse_y, int pDispatchObjectHit) { +int ShowHelp(int /*long*/ hwnd, int /*long*/ pszHelpFile, int uCommand, int dwData, int ptMouse_x, int ptMouse_y, int /*long*/ pDispatchObjectHit) { Browser browser = (Browser)getParent().getParent(); Event event = new Event(); event.type = SWT.Help; @@ -360,30 +374,30 @@ int ShowHelp(int hwnd, int pszHelpFile, int uCommand, int dwData, int ptMouse_x, /* IServiceProvider */ -int QueryService(int guidService, int riid, int ppvObject) { +int QueryService(int /*long*/ guidService, int /*long*/ riid, int /*long*/ 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[] {iInternetSecurityManager.getAddress()}, 4); + COM.MoveMemory(ppvObject, new int /*long*/[] {iInternetSecurityManager.getAddress()}, OS.PTR_SIZEOF); AddRef(); return COM.S_OK; } - COM.MoveMemory(ppvObject, new int[] {0}, 4); + COM.MoveMemory(ppvObject, new int /*long*/[] {0}, OS.PTR_SIZEOF); return COM.E_NOINTERFACE; } /* IInternetSecurityManager */ -int SetSecuritySite(int pSite) { +int SetSecuritySite(int /*long*/ pSite) { return IE.INET_E_DEFAULT_ACTION; } -int GetSecuritySite(int ppSite) { +int GetSecuritySite(int /*long*/ ppSite) { return IE.INET_E_DEFAULT_ACTION; } -int MapUrlToZone(int pwszUrl, int pdwZone, int dwFlags) { +int MapUrlToZone(int /*long*/ pwszUrl, int /*long*/ pdwZone, int dwFlags) { /* * Feature in IE 6 sp1. HTML rendered in memory * does not enable local links but the exact same @@ -396,11 +410,11 @@ int MapUrlToZone(int pwszUrl, int pdwZone, int dwFlags) { return COM.S_OK; } -int GetSecurityId(int pwszUrl, int pbSecurityId, int pcbSecurityId, int dwReserved) { +int GetSecurityId(int /*long*/ pwszUrl, int /*long*/ pbSecurityId, int /*long*/ pcbSecurityId, int /*long*/ dwReserved) { return IE.INET_E_DEFAULT_ACTION; } -int ProcessUrlAction(int pwszUrl, int dwAction, int pPolicy, int cbPolicy, int pContext, int cbContext, int dwFlags, int dwReserved) { +int ProcessUrlAction(int /*long*/ pwszUrl, int dwAction, int /*long*/ pPolicy, int cbPolicy, int /*long*/ pContext, int cbContext, int dwFlags, int dwReserved) { /* * Feature in IE 6 sp1. HTML rendered in memory * containing an OBJECT tag referring to a local file @@ -444,24 +458,24 @@ int ProcessUrlAction(int pwszUrl, int dwAction, int pPolicy, int cbPolicy, int p return policy == IE.URLPOLICY_ALLOW ? COM.S_OK : COM.S_FALSE; } -int QueryCustomPolicy(int pwszUrl, int guidKey, int ppPolicy, int pcbPolicy, int pContext, int cbContext, int dwReserved) { +int QueryCustomPolicy(int /*long*/ pwszUrl, int /*long*/ guidKey, int /*long*/ ppPolicy, int /*long*/ pcbPolicy, int /*long*/ pContext, int cbContext, int dwReserved) { return IE.INET_E_DEFAULT_ACTION; } -int SetZoneMapping(int dwZone, int lpszPattern, int dwFlags) { +int SetZoneMapping(int dwZone, int /*long*/ lpszPattern, int dwFlags) { return IE.INET_E_DEFAULT_ACTION; } -int GetZoneMappings(int dwZone, int ppenumString, int dwFlags) { +int GetZoneMappings(int dwZone, int /*long*/ ppenumString, int dwFlags) { return COM.E_NOTIMPL; } /* IOleCommandTarget */ -int QueryStatus(int pguidCmdGroup, int cCmds, int prgCmds, int pCmdText) { +int QueryStatus(int /*long*/ pguidCmdGroup, int cCmds, int /*long*/ prgCmds, int /*long*/ pCmdText) { return COM.E_NOTSUPPORTED; } -int Exec(int pguidCmdGroup, int nCmdID, int nCmdExecOpt, int pvaIn, int pvaOut) { +int Exec(int /*long*/ pguidCmdGroup, int nCmdID, int nCmdExecOpt, int /*long*/ pvaIn, int /*long*/ pvaOut) { if (pguidCmdGroup != 0) { GUID guid = new GUID(); COM.MoveMemory(guid, pguidCmdGroup, GUID.sizeof); 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 bed769108f..040f460632 100755 --- 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 newPtr = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, size); + int /*long*/ 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; @@ -198,10 +198,10 @@ protected Object nativeToJava(TransferData transferData) { transferData.result = data.GetData(formatetc, stgmedium); data.Release(); if (transferData.result != COM.S_OK) return null; - int hMem = stgmedium.unionField; + int /*long*/ hMem = stgmedium.unionField; int size = OS.GlobalSize(hMem); byte[] buffer = new byte[size]; - int ptr = OS.GlobalLock(hMem); + int /*long*/ 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 ff1a925d5b..57e7493c9e 100755 --- 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 @@ -309,7 +309,7 @@ public Object getContents(Transfer transfer, int clipboards) { * the clipboard, use PeekMessage() to enable cross thread * message sends. */ - int[] ppv = new int[1]; + int /*long*/[] ppv = new int /*long*/[1]; int retryCount = 0; /* OleGetClipboard([out] ppDataObject). * AddRef has already been called on ppDataObject by the callee and must be released by the caller. @@ -511,15 +511,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 method0(int[] args) {return QueryInterface(args[0], args[1]);} - public int method1(int[] args) {return AddRef();} - public int method2(int[] args) {return Release();} - public int method3(int[] args) {return GetData(args[0], args[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]);} // method4 GetDataHere - not implemented - public int method5(int[] args) {return QueryGetData(args[0]);} + public int /*long*/ method5(int /*long*/[] args) {return QueryGetData(args[0]);} // method6 GetCanonicalFormatEtc - not implemented // method7 SetData - not implemented - public int method8(int[] args) {return EnumFormatEtc(args[0], args[1]);} + public int /*long*/ method8(int /*long*/[] args) {return EnumFormatEtc((int)/*64*/args[0], args[1]);} // method9 DAdvise - not implemented // method10 DUnadvise - not implemented // method11 EnumDAdvise - not implemented @@ -535,7 +535,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 ppenumFormatetc) { +private int EnumFormatEtc(int dwDirection, int /*long*/ 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? @@ -561,10 +561,10 @@ private int EnumFormatEtc(int dwDirection, int ppenumFormatetc) { dropeffect.tymed = COM.TYMED_HGLOBAL; formats[formats.length -1] = dropeffect; enumFORMATETC.setFormats(formats); - OS.MoveMemory(ppenumFormatetc, new int[] {enumFORMATETC.getAddress()}, 4); + OS.MoveMemory(ppenumFormatetc, new int /*long*/[] {enumFORMATETC.getAddress()}, OS.PTR_SIZEOF); return COM.S_OK; } -private int GetData(int pFormatetc, int pmedium) { +private int GetData(int /*long*/ pFormatetc, int /*long*/ 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. @@ -585,6 +585,7 @@ private int GetData(int pFormatetc, int pmedium) { STGMEDIUM stgmedium = new STGMEDIUM(); stgmedium.tymed = COM.TYMED_HGLOBAL; stgmedium.unionField = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, 4); + //TODO - should call GlobalLock OS.MoveMemory(stgmedium.unionField, new int[] {COM.DROPEFFECT_COPY}, 4); stgmedium.pUnkForRelease = 0; COM.MoveMemory(pmedium, stgmedium, STGMEDIUM.sizeof); @@ -605,7 +606,7 @@ private int GetData(int pFormatetc, int pmedium) { return transferData.result; } -private int QueryGetData(int pFormatetc) { +private int QueryGetData(int /*long*/ pFormatetc) { if (transferAgents == null) return COM.E_FAIL; TransferData transferData = new TransferData(); transferData.formatetc = new FORMATETC(); @@ -624,16 +625,16 @@ private int QueryGetData(int 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 riid, int ppvObject) { +private int QueryInterface(int /*long*/ riid, int /*long*/ 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[] {iDataObject.getAddress()}, 4); + OS.MoveMemory(ppvObject, new int /*long*/[] {iDataObject.getAddress()}, OS.PTR_SIZEOF); AddRef(); return COM.S_OK; } - OS.MoveMemory(ppvObject, new int[] {0}, 4); + OS.MoveMemory(ppvObject, new int /*long*/[] {0}, OS.PTR_SIZEOF); return COM.E_NOINTERFACE; } private int Release() { @@ -756,13 +757,13 @@ public String[] getAvailableTypeNames() { private FORMATETC[] _getAvailableTypes() { FORMATETC[] types = new FORMATETC[0]; - int[] ppv = new int[1]; + int /*long*/[] ppv = new int /*long*/[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[] ppFormatetc = new int[1]; + int /*long*/[] ppFormatetc = new int /*long*/[1]; /* EnumFormatEtc([in] dwDirection, [out] ppenumFormatetc) * AddRef has already been called on ppenumFormatetc by the callee and must be released by the caller. */ @@ -771,7 +772,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 rgelt = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, FORMATETC.sizeof); + int /*long*/ 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 5aea5271e0..79e1e3d817 100755 --- 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 @@ -238,23 +238,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 method0(int[] args) {return QueryInterface(args[0], args[1]);} - public int method1(int[] args) {return AddRef();} - public int method2(int[] args) {return Release();} - public int method3(int[] args) {return QueryContinueDrag(args[0], args[1]);} - public int method4(int[] args) {return GiveFeedback(args[0]);} + public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);} + public int /*long*/ method1(int /*long*/[] args) {return AddRef();} + public int /*long*/ method2(int /*long*/[] args) {return Release();} + public int /*long*/ method3(int /*long*/[] args) {return QueryContinueDrag((int)/*64*/args[0], (int)/*64*/args[1]);} + public int /*long*/ method4(int /*long*/[] 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 method0(int[] args) {return QueryInterface(args[0], args[1]);} - public int method1(int[] args) {return AddRef();} - public int method2(int[] args) {return Release();} - public int method3(int[] args) {return GetData(args[0], args[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]);} // method4 GetDataHere - not implemented - public int method5(int[] args) {return QueryGetData(args[0]);} + public int /*long*/ method5(int /*long*/[] args) {return QueryGetData(args[0]);} // method6 GetCanonicalFormatEtc - not implemented - public int method7(int[] args) {return SetData(args[0], args[1], args[2]);} - public int method8(int[] args) {return EnumFormatEtc(args[0], args[1]);} + 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]);} // method9 DAdvise - not implemented // method10 DUnadvise - not implemented // method11 EnumDAdvise - not implemented @@ -348,7 +348,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 ppenumFormatetc) { +private int EnumFormatEtc(int dwDirection, int /*long*/ ppenumFormatetc) { // only allow getting of data - SetData is not currently supported if (dwDirection == COM.DATADIR_SET) return COM.E_NOTIMPL; @@ -374,7 +374,7 @@ private int EnumFormatEtc(int dwDirection, int ppenumFormatetc) { } enumFORMATETC.setFormats(formats); - OS.MoveMemory(ppenumFormatetc, new int[] {enumFORMATETC.getAddress()}, 4); + OS.MoveMemory(ppenumFormatetc, new int /*long*/[] {enumFORMATETC.getAddress()}, OS.PTR_SIZEOF); return COM.S_OK; } /** @@ -387,7 +387,7 @@ public Control getControl() { return control; } -private int GetData(int pFormatetc, int pmedium) { +private int GetData(int /*long*/ pFormatetc, int /*long*/ 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. @@ -520,7 +520,7 @@ private int osToOp(int osOperation){ return operation; } -private int QueryGetData(int pFormatetc) { +private int QueryGetData(int /*long*/ pFormatetc) { if (transferAgents == null) return COM.E_FAIL; TransferData transferData = new TransferData(); transferData.formatetc = new FORMATETC(); @@ -541,25 +541,25 @@ private int QueryGetData(int 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 riid, int ppvObject) { +private int QueryInterface(int /*long*/ riid, int /*long*/ 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[] {iDropSource.getAddress()}, 4); + OS.MoveMemory(ppvObject, new int /*long*/[] {iDropSource.getAddress()}, OS.PTR_SIZEOF); AddRef(); return COM.S_OK; } if (COM.IsEqualGUID(guid, COM.IIDIDataObject) ) { - OS.MoveMemory(ppvObject, new int[] {iDataObject.getAddress()}, 4); + OS.MoveMemory(ppvObject, new int /*long*/[] {iDataObject.getAddress()}, OS.PTR_SIZEOF); AddRef(); return COM.S_OK; } - OS.MoveMemory(ppvObject, new int[] {0}, 4); + OS.MoveMemory(ppvObject, new int /*long*/[] {0}, OS.PTR_SIZEOF); return COM.E_NOINTERFACE; } @@ -596,17 +596,18 @@ public void removeDragListener(DragSourceListener listener) { removeListener(DND.DragEnd, listener); } -private int SetData(int pFormatetc, int pmedium, int fRelease) { +private int SetData(int /*long*/ pFormatetc, int /*long*/ pmedium, int fRelease) { if (pFormatetc == 0 || pmedium == 0) return COM.E_INVALIDARG; FORMATETC formatetc = new FORMATETC(); COM.MoveMemory(formatetc, pFormatetc, FORMATETC.sizeof); if (formatetc.cfFormat == CFSTR_PERFORMEDDROPEFFECT && formatetc.tymed == COM.TYMED_HGLOBAL) { STGMEDIUM stgmedium = new STGMEDIUM(); COM.MoveMemory(stgmedium, pmedium,STGMEDIUM.sizeof); - int[] ptrEffect = new int[1]; - OS.MoveMemory(ptrEffect, stgmedium.unionField,4); + //TODO - this should be GlobalLock() + int /*long*/[] ptrEffect = new int /*long*/[1]; + OS.MoveMemory(ptrEffect, stgmedium.unionField, OS.PTR_SIZEOF); int[] effect = new int[1]; - OS.MoveMemory(effect, ptrEffect[0],4); + OS.MoveMemory(effect, ptrEffect[0], 4); dataEffect = osToOp(effect[0]); } if (fRelease == 1) { 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 70f2dfd6b5..2a01c876f2 100755 --- 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 @@ -12,6 +12,7 @@ package org.eclipse.swt.dnd; import org.eclipse.swt.*; import org.eclipse.swt.widgets.*; +import org.eclipse.swt.internal.*; import org.eclipse.swt.internal.ole.win32.*; import org.eclipse.swt.internal.win32.*; @@ -227,16 +228,34 @@ protected void checkSubclass () { void createCOMInterfaces() { // register each of the interfaces that this object implements - iDropTarget = new COMObject(new int[]{2, 0, 0, 5, 4, 0, 5}){ - public int method0(int[] args) {return QueryInterface(args[0], args[1]);} - public int method1(int[] args) {return AddRef();} - public int method2(int[] args) {return Release();} - public int method3(int[] args) {return DragEnter(args[0], args[1], args[2], args[3], args[4]);} - public int method4(int[] args) {return DragOver(args[0], args[1], args[2], args[3]);} - public int method5(int[] args) {return DragLeave();} - public int method6(int[] args) {return Drop(args[0], args[1], args[2], args[3], args[4]);} + 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) { + 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) { + 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) { + if (args.length == 5) { + return Drop(args[0], (int)/*64*/args[1], (int)/*64*/args[2], (int)/*64*/args[3], args[4]); + } else { + return Drop_64(args[0], (int)/*64*/args[1], args[2], args[3]); + } + } }; - } void disposeCOMInterfaces() { @@ -245,7 +264,13 @@ void disposeCOMInterfaces() { iDropTarget = null; } -int DragEnter(int pDataObject, int grfKeyState, int pt_x, int pt_y, int pdwEffect) { +int DragEnter_64(int /*long*/ pDataObject, int grfKeyState, long pt, int /*long*/ 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) { selectedDataType = null; selectedOperation = DND.DROP_NONE; if (iDataObject != null) iDataObject.Release(); @@ -304,7 +329,13 @@ int DragLeave() { return COM.S_OK; } -int DragOver(int grfKeyState, int pt_x, int pt_y, int pdwEffect) { +int DragOver_64(int grfKeyState, long pt, int /*long*/ pdwEffect) { + POINT point = new POINT(); + OS.MoveMemory(point, new long[]{pt}, 8); + return DragOver(grfKeyState, point.x, point.y, pdwEffect); +} + +int DragOver(int grfKeyState, int pt_x, int pt_y, int /*long*/ pdwEffect) { if (iDataObject == null) return COM.S_FALSE; int oldKeyOperation = keyOperation; @@ -350,7 +381,13 @@ int DragOver(int grfKeyState, int pt_x, int pt_y, int pdwEffect) { return COM.S_OK; } -int Drop(int pDataObject, int grfKeyState, int pt_x, int pt_y, int pdwEffect) { +int Drop_64(int /*long*/ pDataObject, int grfKeyState, long pt, int /*long*/ pdwEffect) { + POINT point = new POINT(); + OS.MoveMemory(point, new long[]{pt}, 8); + return Drop(pDataObject, grfKeyState, point.x, point.y, pdwEffect); +} + +int Drop(int /*long*/ pDataObject, int grfKeyState, int pt_x, int pt_y, int /*long*/ pdwEffect) { DNDEvent event = new DNDEvent(); event.widget = this; event.time = OS.GetMessageTime(); @@ -522,19 +559,19 @@ int osToOp(int osOperation){ * 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 riid, int ppvObject) { +int QueryInterface(int /*long*/ riid, int /*long*/ 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.IIDIDropTarget)) { - OS.MoveMemory(ppvObject, new int[] {iDropTarget.getAddress()}, 4); + COM.MoveMemory(ppvObject, new int /*long*/[] {iDropTarget.getAddress()}, OS.PTR_SIZEOF); AddRef(); return COM.S_OK; } - OS.MoveMemory(ppvObject, new int[] {0}, 4); + COM.MoveMemory(ppvObject, new int /*long*/[] {0}, OS.PTR_SIZEOF); return COM.E_NOINTERFACE; } @@ -551,7 +588,7 @@ int Release() { void refresh() { if (control == null || control.isDisposed()) return; - int handle = control.handle; + int /*long*/ handle = control.handle; RECT lpRect = new RECT(); if (OS.GetUpdateRect(handle, lpRect, false)) { OS.ImageList_DragShowNolock(false); @@ -600,7 +637,7 @@ public void setDropTargetEffect(DropTargetEffect effect) { dropEffect = effect; } -boolean setEventData(DNDEvent event, int pDataObject, int grfKeyState, int pt_x, int pt_y, int pdwEffect) { +boolean setEventData(DNDEvent event, int /*long*/ pDataObject, int grfKeyState, int pt_x, int pt_y, int /*long*/ pdwEffect) { if (pDataObject == 0 || pdwEffect == 0) return false; // get allowed operations @@ -626,14 +663,14 @@ boolean setEventData(DNDEvent event, int pDataObject, int grfKeyState, int pt_x, IDataObject dataObject = new IDataObject(pDataObject); dataObject.AddRef(); try { - int[] address = new int[1]; + int /*long*/[] address = new int /*long*/[1]; if (dataObject.EnumFormatEtc(COM.DATADIR_GET, address) != COM.S_OK) { return false; } IEnumFORMATETC enumFormatetc = new IEnumFORMATETC(address[0]); try { // Loop over enumerator and save any types that match what we are looking for - int rgelt = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, FORMATETC.sizeof); + int /*long*/ rgelt = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, FORMATETC.sizeof); try { int[] pceltFetched = new int[1]; enumFormatetc.Reset(); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/FileTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/FileTransfer.java index 6aceeeb1ae..bd354f50bf 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/FileTransfer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/FileTransfer.java @@ -81,7 +81,7 @@ public void javaToNative(Object object, TransferData transferData) { // Allocate the memory because the caller (DropTarget) has not handed it in // The caller of this method must release the data when it is done with it. int byteCount = buffer.length() * TCHAR.sizeof; - int newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, DROPFILES.sizeof + byteCount); + int /*long*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, DROPFILES.sizeof + byteCount); OS.MoveMemory(newPtr, dropfiles, DROPFILES.sizeof); OS.MoveMemory(newPtr + DROPFILES.sizeof, buffer, byteCount); transferData.stgmedium = new STGMEDIUM(); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/HTMLTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/HTMLTransfer.java index 7c7c592cd2..5f6eca10df 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/HTMLTransfer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/HTMLTransfer.java @@ -105,7 +105,7 @@ public void javaToNative (Object object, TransferData transferData){ chars = new char[count + 1]; buffer.getChars(0, count, chars, 0); cchMultiByte = OS.WideCharToMultiByte(codePage, 0, chars, -1, null, 0, null, null); - int lpMultiByteStr = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, cchMultiByte); + int /*long*/ lpMultiByteStr = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, cchMultiByte); OS.WideCharToMultiByte(codePage, 0, chars, -1, lpMultiByteStr, cchMultiByte, null, null); transferData.stgmedium = new STGMEDIUM(); transferData.stgmedium.tymed = COM.TYMED_HGLOBAL; @@ -135,10 +135,10 @@ public Object nativeToJava(TransferData transferData){ transferData.result = data.GetData(formatetc, stgmedium); data.Release(); if (transferData.result != COM.S_OK) return null; - int hMem = stgmedium.unionField; + int /*long*/ hMem = stgmedium.unionField; try { - int lpMultiByteStr = OS.GlobalLock(hMem); + int /*long*/ lpMultiByteStr = OS.GlobalLock(hMem); if (lpMultiByteStr == 0) return null; try { int codePage = OS.GetACP(); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/OleEnumFORMATETC.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/OleEnumFORMATETC.java index 07482f75f7..eddb16b27b 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/OleEnumFORMATETC.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/OleEnumFORMATETC.java @@ -10,6 +10,7 @@ *******************************************************************************/ package org.eclipse.swt.dnd; +import org.eclipse.swt.internal.win32.*; import org.eclipse.swt.internal.ole.win32.*; final class OleEnumFORMATETC { @@ -34,17 +35,17 @@ int AddRef() { private void createCOMInterfaces() { // register each of the interfaces that this object implements iUnknown = new COMObject(new int[] {2, 0, 0}){ - public int method0(int[] args) {return QueryInterface(args[0], args[1]);} - public int method1(int[] args) {return AddRef();} - public int method2(int[] args) {return Release();} + 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();} }; iEnumFORMATETC = new COMObject(new int[] {2, 0, 0, 3, 1, 0, 1}){ - public int method0(int[] args) {return QueryInterface(args[0], args[1]);} - public int method1(int[] args) {return AddRef();} - public int method2(int[] args) {return Release();} - public int method3(int[] args) {return Next(args[0], args[1], args[2]);} - public int method4(int[] args) {return Skip(args[0]);} - public int method5(int[] args) {return Reset();} + 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();} // method6 Clone - not implemented }; } @@ -58,7 +59,7 @@ private void disposeCOMInterfaces() { iEnumFORMATETC.dispose(); iEnumFORMATETC = null; } -int getAddress() { +int /*long*/ getAddress() { return iEnumFORMATETC.getAddress(); } private FORMATETC[] getNextItems(int numItems){ @@ -77,7 +78,7 @@ private FORMATETC[] getNextItems(int numItems){ return items; } -private int Next(int celt, int rgelt, int pceltFetched) { +private int Next(int celt, int /*long*/ rgelt, int /*long*/ pceltFetched) { /* Retrieves the next celt items in the enumeration sequence. If there are fewer than the requested number of elements left in the sequence, it retrieves the remaining elements. @@ -107,7 +108,7 @@ private int Next(int celt, int rgelt, int pceltFetched) { } return COM.S_FALSE; } -private int QueryInterface(int riid, int ppvObject) { +private int QueryInterface(int /*long*/ riid, int /*long*/ ppvObject) { if (riid == 0 || ppvObject == 0) return COM.E_NOINTERFACE; @@ -115,16 +116,16 @@ private int QueryInterface(int riid, int ppvObject) { COM.MoveMemory(guid, riid, GUID.sizeof); if (COM.IsEqualGUID(guid, COM.IIDIUnknown)) { - COM.MoveMemory(ppvObject, new int[] {iUnknown.getAddress()}, 4); + COM.MoveMemory(ppvObject, new int /*long*/[] {iUnknown.getAddress()}, OS.PTR_SIZEOF); AddRef(); return COM.S_OK; } if (COM.IsEqualGUID(guid, COM.IIDIEnumFORMATETC)) { - COM.MoveMemory(ppvObject, new int[] {iEnumFORMATETC.getAddress()}, 4); + COM.MoveMemory(ppvObject, new int /*long*/[] {iEnumFORMATETC.getAddress()}, OS.PTR_SIZEOF); AddRef(); return COM.S_OK; } - COM.MoveMemory(ppvObject, new int[] {0}, 4); + COM.MoveMemory(ppvObject, new int /*long*/[] {0}, OS.PTR_SIZEOF); return COM.E_NOINTERFACE; } int Release() { diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/RTFTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/RTFTransfer.java index 38e6053277..368a1c6d76 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/RTFTransfer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/RTFTransfer.java @@ -68,7 +68,7 @@ public void javaToNative (Object object, TransferData transferData){ transferData.result = COM.DV_E_STGMEDIUM; return; } - int lpMultiByteStr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, cchMultiByte); + int /*long*/ lpMultiByteStr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, cchMultiByte); OS.WideCharToMultiByte(codePage, 0, chars, -1, lpMultiByteStr, cchMultiByte, null, null); transferData.stgmedium = new STGMEDIUM(); transferData.stgmedium.tymed = COM.TYMED_HGLOBAL; @@ -98,9 +98,9 @@ public Object nativeToJava(TransferData transferData){ transferData.result = data.GetData(formatetc, stgmedium); data.Release(); if (transferData.result != COM.S_OK) return null; - int hMem = stgmedium.unionField; + int /*long*/ hMem = stgmedium.unionField; try { - int lpMultiByteStr = OS.GlobalLock(hMem); + int /*long*/ lpMultiByteStr = OS.GlobalLock(hMem); if (lpMultiByteStr == 0) return null; try { int codePage = OS.GetACP(); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TableDragSourceEffect.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TableDragSourceEffect.java index a134b2628e..c545b4b367 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TableDragSourceEffect.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TableDragSourceEffect.java @@ -80,27 +80,27 @@ public class TableDragSourceEffect extends DragSourceEffect { Table table = (Table) control; TableItem[] selection = table.getSelection(); if (selection.length == 0) return null; - int tableImageList = OS.SendMessage (table.handle, OS.LVM_GETIMAGELIST, OS.LVSIL_SMALL, 0); + int /*long*/ tableImageList = OS.SendMessage (table.handle, OS.LVM_GETIMAGELIST, OS.LVSIL_SMALL, 0); if (tableImageList != 0) { int count = Math.min(selection.length, 10); Rectangle bounds = selection[0].getBounds(0); for (int i = 1; i < count; i++) { bounds = bounds.union(selection[i].getBounds(0)); } - int hDC = OS.GetDC(0); - int hDC1 = OS.CreateCompatibleDC(hDC); - int bitmap = OS.CreateCompatibleBitmap(hDC, bounds.width, bounds.height); - int hOldBitmap = OS.SelectObject(hDC1, bitmap); + int /*long*/ hDC = OS.GetDC(0); + int /*long*/ hDC1 = OS.CreateCompatibleDC(hDC); + int /*long*/ bitmap = OS.CreateCompatibleBitmap(hDC, bounds.width, bounds.height); + int /*long*/ hOldBitmap = OS.SelectObject(hDC1, bitmap); RECT rect = new RECT(); rect.right = bounds.width; rect.bottom = bounds.height; - int hBrush = OS.GetStockObject(OS.WHITE_BRUSH); + int /*long*/ hBrush = OS.GetStockObject(OS.WHITE_BRUSH); OS.FillRect(hDC1, rect, hBrush); for (int i = 0; i < count; i++) { TableItem selected = selection[i]; Rectangle cell = selected.getBounds(0); POINT pt = new POINT(); - int imageList = OS.SendMessage (table.handle, OS.LVM_CREATEDRAGIMAGE, table.indexOf(selected), pt); + int /*long*/ imageList = OS.SendMessage (table.handle, OS.LVM_CREATEDRAGIMAGE, table.indexOf(selected), pt); OS.ImageList_Draw(imageList, 0, hDC1, cell.x - bounds.x, cell.y - bounds.y, OS.ILD_SELECTED); OS.ImageList_Destroy(imageList); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TableDropTargetEffect.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TableDropTargetEffect.java index 04e2f9c4bf..5e16a41269 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TableDropTargetEffect.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TableDropTargetEffect.java @@ -103,7 +103,7 @@ public class TableDropTargetEffect extends DropTargetEffect { */ public void dragLeave(DropTargetEvent event) { Table table = (Table) control; - int handle = table.handle; + int /*long*/ handle = table.handle; if (dropHighlight != null) { LVITEM lvItem = new LVITEM (); lvItem.stateMask = OS.LVIS_DROPHILITED; @@ -134,7 +134,7 @@ public class TableDropTargetEffect extends DropTargetEffect { public void dragOver(DropTargetEvent event) { Table table = (Table) getControl(); int effect = checkEffect(event.feedback); - int handle = table.handle; + int /*long*/ handle = table.handle; Point coordinates = new Point(event.x, event.y); coordinates = table.toControl(coordinates); LVHITTESTINFO pinfo = new LVHITTESTINFO(); @@ -147,8 +147,8 @@ public class TableDropTargetEffect extends DropTargetEffect { } else { if (pinfo.iItem != -1 && scrollIndex == pinfo.iItem && scrollBeginTime != 0) { if (System.currentTimeMillis() >= scrollBeginTime) { - int top = Math.max (0, OS.SendMessage (handle, OS.LVM_GETTOPINDEX, 0, 0)); - int count = OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + int top = Math.max (0, (int)/*64*/OS.SendMessage (handle, OS.LVM_GETTOPINDEX, 0, 0)); + int count = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); int index = (scrollIndex - 1 < top) ? Math.max(0, scrollIndex - 1) : Math.min(count - 1, scrollIndex + 1); boolean scroll = true; if (pinfo.iItem == top) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TextTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TextTransfer.java index 44380f1e69..7e79d54662 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TextTransfer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TextTransfer.java @@ -68,7 +68,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 newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, byteCount); + int /*long*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, byteCount); OS.MoveMemory(newPtr, chars, byteCount); transferData.stgmedium = new STGMEDIUM(); transferData.stgmedium.tymed = COM.TYMED_HGLOBAL; @@ -88,7 +88,7 @@ public void javaToNative (Object object, TransferData transferData){ transferData.result = COM.DV_E_STGMEDIUM; return; } - int lpMultiByteStr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, cchMultiByte); + int /*long*/ lpMultiByteStr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, cchMultiByte); OS.WideCharToMultiByte(codePage, 0, chars, -1, lpMultiByteStr, cchMultiByte, null, null); transferData.stgmedium = new STGMEDIUM(); transferData.stgmedium.tymed = COM.TYMED_HGLOBAL; @@ -121,7 +121,7 @@ public Object nativeToJava(TransferData transferData){ transferData.result = data.GetData(formatetc, stgmedium); data.Release(); if (transferData.result != COM.S_OK) return null; - int hMem = stgmedium.unionField; + int /*long*/ hMem = stgmedium.unionField; try { switch (transferData.type) { case CF_UNICODETEXTID: { @@ -129,7 +129,7 @@ public Object nativeToJava(TransferData transferData){ int size = OS.GlobalSize(hMem) / 2 * 2; if (size == 0) return null; char[] chars = new char[size/2]; - int ptr = OS.GlobalLock(hMem); + int /*long*/ ptr = OS.GlobalLock(hMem); if (ptr == 0) return null; try { OS.MoveMemory(chars, ptr, size); @@ -146,7 +146,7 @@ public Object nativeToJava(TransferData transferData){ } } case CF_TEXTID: { - int lpMultiByteStr = OS.GlobalLock(hMem); + int /*long*/ lpMultiByteStr = OS.GlobalLock(hMem); if (lpMultiByteStr == 0) return null; try { int codePage = OS.GetACP(); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TransferData.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TransferData.java index eb8019c20f..6770c9c51f 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TransferData.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TransferData.java @@ -92,7 +92,7 @@ public class TransferData { * platforms and should never be accessed from application code. * </p> */ - public int pIDataObject; + public int /*long*/ pIDataObject; static boolean sameType(TransferData data1, TransferData data2) { if (data1 == data2) return true; diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TreeDragSourceEffect.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TreeDragSourceEffect.java index 0beb423819..819e7766cf 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TreeDragSourceEffect.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TreeDragSourceEffect.java @@ -79,26 +79,26 @@ public class TreeDragSourceEffect extends DragSourceEffect { Tree tree = (Tree) control; TreeItem[] selection = tree.getSelection(); if (selection.length == 0) return null; - int treeImageList = OS.SendMessage (tree.handle, OS.TVM_GETIMAGELIST, OS.TVSIL_NORMAL, 0); + int /*long*/ treeImageList = OS.SendMessage (tree.handle, OS.TVM_GETIMAGELIST, OS.TVSIL_NORMAL, 0); if (treeImageList != 0) { int count = Math.min(selection.length, 10); Rectangle bounds = selection[0].getBounds(0); for (int i = 1; i < count; i++) { bounds = bounds.union(selection[i].getBounds(0)); } - int hDC = OS.GetDC(0); - int hDC1 = OS.CreateCompatibleDC(hDC); - int bitmap = OS.CreateCompatibleBitmap(hDC, bounds.width, bounds.height); - int hOldBitmap = OS.SelectObject(hDC1, bitmap); + int /*long*/ hDC = OS.GetDC(0); + int /*long*/ hDC1 = OS.CreateCompatibleDC(hDC); + int /*long*/ bitmap = OS.CreateCompatibleBitmap(hDC, bounds.width, bounds.height); + int /*long*/ hOldBitmap = OS.SelectObject(hDC1, bitmap); RECT rect = new RECT(); rect.right = bounds.width; rect.bottom = bounds.height; - int hBrush = OS.GetStockObject(OS.WHITE_BRUSH); + int /*long*/ hBrush = OS.GetStockObject(OS.WHITE_BRUSH); OS.FillRect(hDC1, rect, hBrush); for (int i = 0; i < count; i++) { TreeItem selected = selection[i]; Rectangle cell = selected.getBounds(0); - int imageList = OS.SendMessage(tree.handle, OS.TVM_CREATEDRAGIMAGE, 0, selected.handle); + int /*long*/ imageList = OS.SendMessage(tree.handle, OS.TVM_CREATEDRAGIMAGE, 0, selected.handle); OS.ImageList_Draw(imageList, 0, hDC1, cell.x - bounds.x, cell.y - bounds.y, OS.ILD_SELECTED); OS.ImageList_Destroy(imageList); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TreeDropTargetEffect.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TreeDropTargetEffect.java index 91d10af731..84e0353ca3 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TreeDropTargetEffect.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TreeDropTargetEffect.java @@ -50,10 +50,10 @@ public class TreeDropTargetEffect extends DropTargetEffect { static final int SCROLL_HYSTERESIS = 200; // milli seconds static final int EXPAND_HYSTERESIS = 1000; // milli seconds - int dropIndex; - int scrollIndex; + int /*long*/ dropIndex; + int /*long*/ scrollIndex; long scrollBeginTime; - int expandIndex; + int /*long*/ expandIndex; long expandBeginTime; TreeItem insertItem; boolean insertBefore; @@ -114,7 +114,7 @@ public class TreeDropTargetEffect extends DropTargetEffect { */ public void dragLeave(DropTargetEvent event) { Tree tree = (Tree) control; - int handle = tree.handle; + int /*long*/ handle = tree.handle; if (dropIndex != -1) { TVITEM tvItem = new TVITEM (); tvItem.hItem = dropIndex; @@ -155,22 +155,22 @@ public class TreeDropTargetEffect extends DropTargetEffect { public void dragOver(DropTargetEvent event) { Tree tree = (Tree) getControl(); int effect = checkEffect(event.feedback); - int handle = tree.handle; + int /*long*/ handle = tree.handle; Point coordinates = new Point(event.x, event.y); coordinates = tree.toControl(coordinates); TVHITTESTINFO lpht = new TVHITTESTINFO (); lpht.x = coordinates.x; lpht.y = coordinates.y; OS.SendMessage (handle, OS.TVM_HITTEST, 0, lpht); - int hItem = lpht.hItem; + int /*long*/ hItem = lpht.hItem; if ((effect & DND.FEEDBACK_SCROLL) == 0) { scrollBeginTime = 0; scrollIndex = -1; } else { if (hItem != -1 && scrollIndex == hItem && scrollBeginTime != 0) { if (System.currentTimeMillis() >= scrollBeginTime) { - int topItem = OS.SendMessage(handle, OS.TVM_GETNEXTITEM, OS.TVGN_FIRSTVISIBLE, 0); - int nextItem = OS.SendMessage(handle, OS.TVM_GETNEXTITEM, hItem == topItem ? OS.TVGN_PREVIOUSVISIBLE : OS.TVGN_NEXTVISIBLE, hItem); + int /*long*/ topItem = OS.SendMessage(handle, OS.TVM_GETNEXTITEM, OS.TVGN_FIRSTVISIBLE, 0); + int /*long*/ nextItem = OS.SendMessage(handle, OS.TVM_GETNEXTITEM, hItem == topItem ? OS.TVGN_PREVIOUSVISIBLE : OS.TVGN_NEXTVISIBLE, hItem); boolean scroll = true; if (hItem == topItem) { scroll = nextItem != 0; diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/URLTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/URLTransfer.java index dd3e731320..b897be07f4 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/URLTransfer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/URLTransfer.java @@ -74,7 +74,7 @@ public void javaToNative (Object object, TransferData transferData){ transferData.result = COM.DV_E_STGMEDIUM; return; } - int lpMultiByteStr = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, cchMultiByte); + int /*long*/ lpMultiByteStr = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, cchMultiByte); OS.WideCharToMultiByte(codePage, 0, chars, -1, lpMultiByteStr, cchMultiByte, null, null); transferData.stgmedium = new STGMEDIUM(); transferData.stgmedium.tymed = COM.TYMED_HGLOBAL; @@ -104,9 +104,9 @@ public Object nativeToJava(TransferData transferData){ transferData.result = data.GetData(formatetc, stgmedium); data.Release(); if (transferData.result != COM.S_OK) return null; - int hMem = stgmedium.unionField; + int /*long*/ hMem = stgmedium.unionField; try { - int lpMultiByteStr = OS.GlobalLock(hMem); + int /*long*/ lpMultiByteStr = OS.GlobalLock(hMem); if (lpMultiByteStr == 0) return null; try { int codePage = OS.GetACP(); diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/COMObject.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/COMObject.java index a955910d47..943cb3318e 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/COMObject.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/COMObject.java @@ -18,7 +18,7 @@ import org.eclipse.swt.internal.win32.*; public class COMObject { - public int ppVtable; + public int /*long*/ ppVtable; static private final int MAX_ARG_COUNT = 12; static private final int MAX_VTABLE_LENGTH = 80; @@ -26,7 +26,7 @@ public class COMObject { static private Hashtable ObjectMap = new Hashtable(); public COMObject(int[] argCounts) { - int[] callbackAddresses = new int[argCounts.length]; + int /*long*/[] callbackAddresses = new int /*long*/[argCounts.length]; synchronized (Callbacks) { for (int i = 0, length = argCounts.length; i < length; i++){ if ((Callbacks[i][argCounts[i]]) == null) { @@ -37,11 +37,11 @@ public COMObject(int[] argCounts) { } } - int pVtable = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, 4 * argCounts.length); - COM.MoveMemory(pVtable, callbackAddresses, 4 * argCounts.length); - ppVtable = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, 4); - COM.MoveMemory(ppVtable, new int[] {pVtable}, 4); - ObjectMap.put(new Integer(ppVtable), this); + int /*long*/ pVtable = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, OS.PTR_SIZEOF * argCounts.length); + COM.MoveMemory(pVtable, callbackAddresses, OS.PTR_SIZEOF * argCounts.length); + ppVtable = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, OS.PTR_SIZEOF); + COM.MoveMemory(ppVtable, new int /*long*/[] {pVtable}, OS.PTR_SIZEOF); + ObjectMap.put(new LONG(ppVtable), this); } public static GUID IIDFromString(String lpsz) { @@ -55,979 +55,979 @@ public static GUID IIDFromString(String lpsz) { return null; } -static int callback0(int[] callbackArgs) { +static int /*long*/ callback0(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method0(args); } -static int callback1(int[] callbackArgs) { +static int /*long*/ callback1(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method1(args); } -static int callback2(int[] callbackArgs) { +static int /*long*/ callback2(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method2(args); } -static int callback3(int[] callbackArgs) { +static int /*long*/ callback3(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method3(args); } -static int callback4(int[] callbackArgs) { +static int /*long*/ callback4(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method4(args); } -static int callback5(int[] callbackArgs) { +static int /*long*/ callback5(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method5(args); } -static int callback6(int[] callbackArgs) { +static int /*long*/ callback6(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method6(args); } -static int callback7(int[] callbackArgs) { +static int /*long*/ callback7(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method7(args); } -static int callback8(int[] callbackArgs) { +static int /*long*/ callback8(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method8(args); } -static int callback9(int[] callbackArgs) { +static int /*long*/ callback9(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method9(args); } -static int callback10(int[] callbackArgs) { +static int /*long*/ callback10(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method10(args); } -static int callback11(int[] callbackArgs) { +static int /*long*/ callback11(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method11(args); } -static int callback12(int[] callbackArgs) { +static int /*long*/ callback12(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method12(args); } -static int callback13(int[] callbackArgs) { +static int /*long*/ callback13(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method13(args); } -static int callback14(int[] callbackArgs) { +static int /*long*/ callback14(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method14(args); } -static int callback15(int[] callbackArgs) { +static int /*long*/ callback15(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method15(args); } -static int callback16(int[] callbackArgs) { +static int /*long*/ callback16(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method16(args); } -static int callback17(int[] callbackArgs) { +static int /*long*/ callback17(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method17(args); } -static int callback18(int[] callbackArgs) { +static int /*long*/ callback18(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method18(args); } -static int callback19(int[] callbackArgs) { +static int /*long*/ callback19(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method19(args); } -static int callback20(int[] callbackArgs) { +static int /*long*/ callback20(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method20(args); } -static int callback21(int[] callbackArgs) { +static int /*long*/ callback21(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method21(args); } -static int callback22(int[] callbackArgs) { +static int /*long*/ callback22(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method22(args); } -static int callback23(int[] callbackArgs) { +static int /*long*/ callback23(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method23(args); } -static int callback24(int[] callbackArgs) { +static int /*long*/ callback24(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method24(args); } -static int callback25(int[] callbackArgs) { +static int /*long*/ callback25(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method25(args); } -static int callback26(int[] callbackArgs) { +static int /*long*/ callback26(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method26(args); } -static int callback27(int[] callbackArgs) { +static int /*long*/ callback27(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method27(args); } -static int callback28(int[] callbackArgs) { +static int /*long*/ callback28(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method28(args); } -static int callback29(int[] callbackArgs) { +static int /*long*/ callback29(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method29(args); } -static int callback30(int[] callbackArgs) { +static int /*long*/ callback30(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method30(args); } -static int callback31(int[] callbackArgs) { +static int /*long*/ callback31(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method31(args); } -static int callback32(int[] callbackArgs) { +static int /*long*/ callback32(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method32(args); } -static int callback33(int[] callbackArgs) { +static int /*long*/ callback33(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method33(args); } -static int callback34(int[] callbackArgs) { +static int /*long*/ callback34(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method34(args); } -static int callback35(int[] callbackArgs) { +static int /*long*/ callback35(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method35(args); } -static int callback36(int[] callbackArgs) { +static int /*long*/ callback36(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method36(args); } -static int callback37(int[] callbackArgs) { +static int /*long*/ callback37(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method37(args); } -static int callback38(int[] callbackArgs) { +static int /*long*/ callback38(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method38(args); } -static int callback39(int[] callbackArgs) { +static int /*long*/ callback39(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method39(args); } -static int callback40(int[] callbackArgs) { +static int /*long*/ callback40(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method40(args); } -static int callback41(int[] callbackArgs) { +static int /*long*/ callback41(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method41(args); } -static int callback42(int[] callbackArgs) { +static int /*long*/ callback42(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method42(args); } -static int callback43(int[] callbackArgs) { +static int /*long*/ callback43(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method43(args); } -static int callback44(int[] callbackArgs) { +static int /*long*/ callback44(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method44(args); } -static int callback45(int[] callbackArgs) { +static int /*long*/ callback45(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method45(args); } -static int callback46(int[] callbackArgs) { +static int /*long*/ callback46(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method46(args); } -static int callback47(int[] callbackArgs) { +static int /*long*/ callback47(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method47(args); } -static int callback48(int[] callbackArgs) { +static int /*long*/ callback48(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method48(args); } -static int callback49(int[] callbackArgs) { +static int /*long*/ callback49(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method49(args); } -static int callback50(int[] callbackArgs) { +static int /*long*/ callback50(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method50(args); } -static int callback51(int[] callbackArgs) { +static int /*long*/ callback51(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method51(args); } -static int callback52(int[] callbackArgs) { +static int /*long*/ callback52(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method52(args); } -static int callback53(int[] callbackArgs) { +static int /*long*/ callback53(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method53(args); } -static int callback54(int[] callbackArgs) { +static int /*long*/ callback54(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method54(args); } -static int callback55(int[] callbackArgs) { +static int /*long*/ callback55(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method55(args); } -static int callback56(int[] callbackArgs) { +static int /*long*/ callback56(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method56(args); } -static int callback57(int[] callbackArgs) { +static int /*long*/ callback57(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method57(args); } -static int callback58(int[] callbackArgs) { +static int /*long*/ callback58(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method58(args); } -static int callback59(int[] callbackArgs) { +static int /*long*/ callback59(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method59(args); } -static int callback60(int[] callbackArgs) { +static int /*long*/ callback60(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method60(args); } -static int callback61(int[] callbackArgs) { +static int /*long*/ callback61(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method61(args); } -static int callback62(int[] callbackArgs) { +static int /*long*/ callback62(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method62(args); } -static int callback63(int[] callbackArgs) { +static int /*long*/ callback63(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method63(args); } -static int callback64(int[] callbackArgs) { +static int /*long*/ callback64(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method64(args); } -static int callback65(int[] callbackArgs) { +static int /*long*/ callback65(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method65(args); } -static int callback66(int[] callbackArgs) { +static int /*long*/ callback66(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method66(args); } -static int callback67(int[] callbackArgs) { +static int /*long*/ callback67(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method67(args); } -static int callback68(int[] callbackArgs) { +static int /*long*/ callback68(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method68(args); } -static int callback69(int[] callbackArgs) { +static int /*long*/ callback69(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method69(args); } -static int callback70(int[] callbackArgs) { +static int /*long*/ callback70(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method70(args); } -static int callback71(int[] callbackArgs) { +static int /*long*/ callback71(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method71(args); } -static int callback72(int[] callbackArgs) { +static int /*long*/ callback72(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method72(args); } -static int callback73(int[] callbackArgs) { +static int /*long*/ callback73(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method73(args); } -static int callback74(int[] callbackArgs) { +static int /*long*/ callback74(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method74(args); } -static int callback75(int[] callbackArgs) { +static int /*long*/ callback75(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method75(args); } -static int callback76(int[] callbackArgs) { +static int /*long*/ callback76(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method76(args); } -static int callback77(int[] callbackArgs) { +static int /*long*/ callback77(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method77(args); } -static int callback78(int[] callbackArgs) { +static int /*long*/ callback78(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method78(args); } -static int callback79(int[] callbackArgs) { +static int /*long*/ callback79(int /*long*/[] callbackArgs) { // find the object on which this call was invoked - int address = callbackArgs[0]; - Object object = ObjectMap.get(new Integer(address)); + int /*long*/ address = callbackArgs[0]; + Object object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - int[] args = new int[callbackArgs.length - 1]; + int /*long*/[] args = new int /*long*/[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return ((COMObject) object).method79(args); } public void dispose() { // free the memory for this reference - int[] pVtable = new int[1]; - OS.MoveMemory(pVtable, ppVtable, 4); + int /*long*/[] pVtable = new int /*long*/[1]; + OS.MoveMemory(pVtable, ppVtable, OS.PTR_SIZEOF); OS.GlobalFree(pVtable[0]); OS.GlobalFree(ppVtable); // remove this ppVtable from the list - ObjectMap.remove(new Integer(ppVtable)); + ObjectMap.remove(new LONG(ppVtable)); ppVtable = 0; } -public int getAddress () { +public int /*long*/ getAddress () { return ppVtable; } -public int method0(int[] args) { +public int /*long*/ method0(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method1(int[] args) { +public int /*long*/ method1(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method2(int[] args) { +public int /*long*/ method2(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method3(int[] args) { +public int /*long*/ method3(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method4(int[] args) { +public int /*long*/ method4(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method5(int[] args) { +public int /*long*/ method5(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method6(int[] args) { +public int /*long*/ method6(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method7(int[] args) { +public int /*long*/ method7(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method8(int[] args) { +public int /*long*/ method8(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method9(int[] args) { +public int /*long*/ method9(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method10(int[] args) { +public int /*long*/ method10(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method11(int[] args) { +public int /*long*/ method11(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method12(int[] args) { +public int /*long*/ method12(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method13(int[] args) { +public int /*long*/ method13(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method14(int[] args) { +public int /*long*/ method14(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method15(int[] args) { +public int /*long*/ method15(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method16(int[] args) { +public int /*long*/ method16(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method17(int[] args) { +public int /*long*/ method17(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method18(int[] args) { +public int /*long*/ method18(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method19(int[] args) { +public int /*long*/ method19(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method20(int[] args) { +public int /*long*/ method20(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method21(int[] args) { +public int /*long*/ method21(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method22(int[] args) { +public int /*long*/ method22(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method23(int[] args) { +public int /*long*/ method23(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method24(int[] args) { +public int /*long*/ method24(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method25(int[] args) { +public int /*long*/ method25(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method26(int[] args) { +public int /*long*/ method26(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method27(int[] args) { +public int /*long*/ method27(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method28(int[] args) { +public int /*long*/ method28(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method29(int[] args) { +public int /*long*/ method29(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method30(int[] args) { +public int /*long*/ method30(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method31(int[] args) { +public int /*long*/ method31(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method32(int[] args) { +public int /*long*/ method32(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method33(int[] args) { +public int /*long*/ method33(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method34(int[] args) { +public int /*long*/ method34(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method35(int[] args) { +public int /*long*/ method35(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method36(int[] args) { +public int /*long*/ method36(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method37(int[] args) { +public int /*long*/ method37(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method38(int[] args) { +public int /*long*/ method38(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method39(int[] args) { +public int /*long*/ method39(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method40(int[] args) { +public int /*long*/ method40(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method41(int[] args) { +public int /*long*/ method41(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method42(int[] args) { +public int /*long*/ method42(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method43(int[] args) { +public int /*long*/ method43(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method44(int[] args) { +public int /*long*/ method44(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method45(int[] args) { +public int /*long*/ method45(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method46(int[] args) { +public int /*long*/ method46(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method47(int[] args) { +public int /*long*/ method47(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method48(int[] args) { +public int /*long*/ method48(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method49(int[] args) { +public int /*long*/ method49(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method50(int[] args) { +public int /*long*/ method50(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method51(int[] args) { +public int /*long*/ method51(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method52(int[] args) { +public int /*long*/ method52(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method53(int[] args) { +public int /*long*/ method53(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method54(int[] args) { +public int /*long*/ method54(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method55(int[] args) { +public int /*long*/ method55(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method56(int[] args) { +public int /*long*/ method56(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method57(int[] args) { +public int /*long*/ method57(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method58(int[] args) { +public int /*long*/ method58(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method59(int[] args) { +public int /*long*/ method59(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method60(int[] args) { +public int /*long*/ method60(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method61(int[] args) { +public int /*long*/ method61(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method62(int[] args) { +public int /*long*/ method62(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method63(int[] args) { +public int /*long*/ method63(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method64(int[] args) { +public int /*long*/ method64(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method65(int[] args) { +public int /*long*/ method65(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method66(int[] args) { +public int /*long*/ method66(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method67(int[] args) { +public int /*long*/ method67(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method68(int[] args) { +public int /*long*/ method68(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method69(int[] args) { +public int /*long*/ method69(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method70(int[] args) { +public int /*long*/ method70(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method71(int[] args) { +public int /*long*/ method71(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method72(int[] args) { +public int /*long*/ method72(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method73(int[] args) { +public int /*long*/ method73(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method74(int[] args) { +public int /*long*/ method74(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method75(int[] args) { +public int /*long*/ method75(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method76(int[] args) { +public int /*long*/ method76(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method77(int[] args) { +public int /*long*/ method77(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method78(int[] args) { +public int /*long*/ method78(int /*long*/[] args) { return COM.E_NOTIMPL; } -public int method79(int[] args) { +public int /*long*/ method79(int /*long*/[] args) { return COM.E_NOTIMPL; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OLE.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OLE.java index d24c330ee5..bb29d26cd3 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OLE.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OLE.java @@ -390,7 +390,7 @@ public static String findProgramID (String extension) { return ""; //$NON-NLS-1$ } static String getKeyValue (TCHAR key) { - int [] phkResult = new int [1]; + int /*long*/ [] phkResult = new int /*long*/ [1]; if (OS.RegOpenKeyEx (OS.HKEY_CLASSES_ROOT, key, 0, OS.KEY_READ, phkResult) != 0) { return null; } @@ -413,7 +413,7 @@ static String getKeyValue (TCHAR key) { return result; } private static boolean getKeyExists (TCHAR key) { - int [] phkResult = new int [1]; + int /*long*/ [] phkResult = new int /*long*/ [1]; if (OS.RegOpenKeyEx (OS.HKEY_CLASSES_ROOT, key, 0, OS.KEY_READ, phkResult) != 0) { return false; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleAutomation.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleAutomation.java index 45be4ccb60..5d9fdae8d5 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleAutomation.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleAutomation.java @@ -89,7 +89,7 @@ OleAutomation(IDispatch idispatch) { objIDispatch = idispatch; objIDispatch.AddRef(); - int[] ppv = new int[1]; + int /*long*/[] ppv = new int /*long*/[1]; int result = objIDispatch.GetTypeInfo(0, COM.LOCALE_USER_DEFAULT, ppv); if (result == OLE.S_OK) { objITypeInfo = new ITypeInfo(ppv[0]); @@ -110,7 +110,7 @@ OleAutomation(IDispatch idispatch) { if (clientSite == null) OLE.error(OLE.ERROR_INVALID_INTERFACE_ADDRESS); objIDispatch = clientSite.getAutomationObject(); - int[] ppv = new int[1]; + int /*long*/[] ppv = new int /*long*/[1]; int result = objIDispatch.GetTypeInfo(0, COM.LOCALE_USER_DEFAULT, ppv); if (result == OLE.S_OK) { objITypeInfo = new ITypeInfo(ppv[0]); @@ -136,7 +136,7 @@ public void dispose() { objITypeInfo = null; } -int getAddress() { +int /*long*/ getAddress() { return objIDispatch.getAddress(); } public String getHelpFile(int dispId) { @@ -155,7 +155,7 @@ public String getDocumentation(int dispId) { } public OlePropertyDescription getPropertyDescription(int index) { if (objITypeInfo == null) return null; - int[] ppVarDesc = new int[1]; + int /*long*/[] ppVarDesc = new int /*long*/[1]; int rc = objITypeInfo.GetVarDesc(index, ppVarDesc); if (rc != OLE.S_OK) return null; VARDESC vardesc = new VARDESC(); @@ -167,7 +167,7 @@ public OlePropertyDescription getPropertyDescription(int index) { data.type = vardesc.elemdescVar_tdesc_vt; if (data.type == OLE.VT_PTR) { short[] vt = new short[1]; - COM.MoveMemory(vt, vardesc.elemdescVar_tdesc_union + 4, 2); + COM.MoveMemory(vt, vardesc.elemdescVar_tdesc_union + OS.PTR_SIZEOF, 2); data.type = vt[0]; } data.flags = vardesc.wVarFlags; @@ -180,7 +180,7 @@ public OlePropertyDescription getPropertyDescription(int index) { } public OleFunctionDescription getFunctionDescription(int index) { if (objITypeInfo == null) return null; - int[] ppFuncDesc = new int[1]; + int /*long*/[] ppFuncDesc = new int /*long*/[1]; int rc = objITypeInfo.GetFuncDesc(index, ppFuncDesc); if (rc != OLE.S_OK) return null; FUNCDESC funcdesc = new FUNCDESC(); @@ -207,25 +207,26 @@ public OleFunctionDescription getFunctionDescription(int index) { if (names.length > i + 1) { data.args[i].name = names[i + 1]; } + //TODO 0- use structures short[] vt = new short[1]; - COM.MoveMemory(vt, funcdesc.lprgelemdescParam + i * 16 + 4, 2); + COM.MoveMemory(vt, funcdesc.lprgelemdescParam + i * COM.ELEMDESC_sizeof() + OS.PTR_SIZEOF, 2); if (vt[0] == OLE.VT_PTR) { - int[] pTypedesc = new int[1]; - COM.MoveMemory(pTypedesc, funcdesc.lprgelemdescParam + i * 16, 4); + int /*long*/ [] pTypedesc = new int /*long*/ [1]; + COM.MoveMemory(pTypedesc, funcdesc.lprgelemdescParam + i * COM.ELEMDESC_sizeof(), OS.PTR_SIZEOF); short[] vt2 = new short[1]; - COM.MoveMemory(vt2, pTypedesc[0] + 4, 2); + COM.MoveMemory(vt2, pTypedesc[0] + OS.PTR_SIZEOF, 2); vt[0] = (short)(vt2[0] | COM.VT_BYREF); } data.args[i].type = vt[0]; short[] wParamFlags = new short[1]; - COM.MoveMemory(wParamFlags, funcdesc.lprgelemdescParam + i * 16 + 12, 2); + COM.MoveMemory(wParamFlags, funcdesc.lprgelemdescParam + i * COM.ELEMDESC_sizeof() + COM.TYPEDESC_sizeof () + OS.PTR_SIZEOF, 2); data.args[i].flags = wParamFlags[0]; } data.returnType = funcdesc.elemdescFunc_tdesc_vt; if (data.returnType == OLE.VT_PTR) { short[] vt = new short[1]; - COM.MoveMemory(vt, funcdesc.elemdescFunc_tdesc_union + 4, 2); + COM.MoveMemory(vt, funcdesc.elemdescFunc_tdesc_union + OS.PTR_SIZEOF, 2); data.returnType = vt[0]; } @@ -234,7 +235,7 @@ public OleFunctionDescription getFunctionDescription(int index) { } public TYPEATTR getTypeInfoAttributes() { if (objITypeInfo == null) return null; - int[] ppTypeAttr = new int[1]; + int /*long*/ [] ppTypeAttr = new int /*long*/ [1]; int rc = objITypeInfo.GetTypeAttr(ppTypeAttr); if (rc != OLE.S_OK) return null; TYPEATTR typeattr = new TYPEATTR(); @@ -407,11 +408,11 @@ private int invoke(int dispIdMember, int wFlags, Variant[] rgvarg, int[] rgdispi // store arguments in rgvarg if (rgvarg != null && rgvarg.length > 0) { pDispParams.cArgs = rgvarg.length; - pDispParams.rgvarg = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, Variant.sizeof * rgvarg.length); + pDispParams.rgvarg = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, VARIANT.sizeof * rgvarg.length); int offset = 0; for (int i = rgvarg.length - 1; i >= 0 ; i--) { rgvarg[i].getData(pDispParams.rgvarg + offset); - offset += Variant.sizeof; + offset += VARIANT.sizeof; } } @@ -429,8 +430,8 @@ private int invoke(int dispIdMember, int wFlags, Variant[] rgvarg, int[] rgdispi // invoke the method EXCEPINFO excepInfo = new EXCEPINFO(); int[] pArgErr = new int[1]; - int pVarResultAddress = 0; - if (pVarResult != null) pVarResultAddress = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, Variant.sizeof); + int /*long*/ pVarResultAddress = 0; + if (pVarResult != null) pVarResultAddress = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, VARIANT.sizeof); int result = objIDispatch.Invoke(dispIdMember, new GUID(), COM.LOCALE_USER_DEFAULT, wFlags, pDispParams, pVarResultAddress, excepInfo, pArgErr); if (pVarResultAddress != 0){ @@ -447,7 +448,7 @@ private int invoke(int dispIdMember, int wFlags, Variant[] rgvarg, int[] rgdispi int offset = 0; for (int i = 0, length = rgvarg.length; i < length; i++){ COM.VariantClear(pDispParams.rgvarg + offset); - offset += Variant.sizeof; + offset += VARIANT.sizeof; } OS.GlobalFree(pDispParams.rgvarg); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleClientSite.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleClientSite.java index 2020ec53af..a8fd4f969d 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleClientSite.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleClientSite.java @@ -15,6 +15,7 @@ import java.io.FileOutputStream; import java.io.FileInputStream; import java.io.IOException; import org.eclipse.swt.*; +import org.eclipse.swt.internal.C; import org.eclipse.swt.internal.Compatibility; import org.eclipse.swt.internal.ole.win32.*; import org.eclipse.swt.graphics.*; @@ -185,7 +186,7 @@ public OleClientSite(Composite parent, int style, File file) { tempStorage = createTempStorage(); // Create ole object with storage object - int[] address = new int[1]; + int /*long*/[] address = new int /*long*/[1]; result = COM.OleCreateFromFile(appClsid, fileName, COM.IIDIUnknown, COM.OLERENDER_DRAW, null, 0, tempStorage.getAddress(), address); if (result != COM.S_OK) OLE.error(OLE.ERROR_CANNOT_CREATE_OBJECT, result); @@ -235,7 +236,7 @@ public OleClientSite(Composite parent, int style, String progId) { tempStorage = createTempStorage(); // Create ole object with storage object - int[] address = new int[1]; + int /*long*/[] address = new int /*long*/[1]; int result = COM.OleCreate(appClsid, COM.IIDIUnknown, COM.OLERENDER_DRAW, null, 0, tempStorage.getAddress(), address); if (result != COM.S_OK) OLE.error(OLE.ERROR_CANNOT_CREATE_OBJECT, result); @@ -297,7 +298,7 @@ public OleClientSite(Composite parent, int style, String progId, File file) { // Using the same application that created file, therefore, use default mechanism. tempStorage = createTempStorage(); // Create ole object with storage object - int[] address = new int[1]; + int /*long*/[] address = new int /*long*/[1]; int result = COM.OleCreateFromFile(appClsid, fileName, COM.IIDIUnknown, COM.OLERENDER_DRAW, null, 0, tempStorage.getAddress(), address); if (result != COM.S_OK) OLE.error(OLE.ERROR_CANNOT_CREATE_OBJECT, result); objIUnknown = new IUnknown(address[0]); @@ -305,14 +306,14 @@ public OleClientSite(Composite parent, int style, String progId, File file) { // Not using the same application that created file, therefore, copy from original file to a new storage file IStorage storage = null; if (COM.StgIsStorageFile(fileName) == COM.S_OK) { - int[] address = new int[1]; + int /*long*/[] address = new int /*long*/[1]; int mode = COM.STGM_READ | COM.STGM_TRANSACTED | COM.STGM_SHARE_EXCLUSIVE; int result = COM.StgOpenStorage(fileName, 0, mode, 0, 0, address); //Does an AddRef if successful if (result != COM.S_OK) OLE.error(OLE.ERROR_CANNOT_OPEN_FILE, result); storage = new IStorage(address[0]); } else { // Original file is not a Storage file so copy contents to a stream in a new storage file - int[] address = new int[1]; + int /*long*/[] address = new int /*long*/[1]; int mode = COM.STGM_READWRITE | COM.STGM_DIRECT | COM.STGM_SHARE_EXCLUSIVE | COM.STGM_CREATE; int result = COM.StgCreateDocfile(null, mode | COM.STGM_DELETEONRELEASE, 0, address); // Increments ref count if successful if (result != COM.S_OK) OLE.error(OLE.ERROR_CANNOT_OPEN_FILE, result); @@ -323,7 +324,7 @@ public OleClientSite(Composite parent, int style, String progId, File file) { String streamName = "CONTENTS"; //$NON-NLS-1$ GUID wordGUID = getClassID(WORDPROGID); if (wordGUID != null && COM.IsEqualGUID(appClsid, wordGUID)) streamName = "WordDocument"; //$NON-NLS-1$ - address = new int[1]; + address = new int /*long*/[1]; result = storage.CreateStream(streamName, mode, 0, 0, address); // Increments ref count if successful if (result != COM.S_OK) { storage.Release(); @@ -337,7 +338,7 @@ public OleClientSite(Composite parent, int style, String progId, File file) { byte[] buffer = new byte[increment]; int count = 0; while((count = fileInput.read(buffer)) > 0){ - int pv = COM.CoTaskMemAlloc(count); + int /*long*/ pv = COM.CoTaskMemAlloc(count); OS.MoveMemory(pv, buffer, count); result = stream.Write(pv, count, null) ; COM.CoTaskMemFree(pv); @@ -366,12 +367,12 @@ public OleClientSite(Composite parent, int style, String progId, File file) { if (result != COM.S_OK) OLE.error(OLE.ERROR_CANNOT_OPEN_FILE, result); // create ole client - int[] ppv = new int[1]; + int /*long*/[] ppv = new int /*long*/[1]; result = COM.CoCreateInstance(appClsid, 0, COM.CLSCTX_INPROC_HANDLER | COM.CLSCTX_INPROC_SERVER, COM.IIDIUnknown, ppv); if (result != COM.S_OK) OLE.error(OLE.ERROR_CANNOT_CREATE_OBJECT, result); objIUnknown = new IUnknown(ppv[0]); // get the persistent storage of the ole client - ppv = new int[1]; + ppv = new int /*long*/[1]; result = objIUnknown.QueryInterface(COM.IIDIPersistStorage, ppv); if (result != COM.S_OK) OLE.error(OLE.ERROR_CANNOT_CREATE_OBJECT, result); IPersistStorage iPersistStorage = new IPersistStorage(ppv[0]); @@ -394,7 +395,7 @@ public OleClientSite(Composite parent, int style, String progId, File file) { } protected void addObjectReferences() { // - int[] ppvObject = new int[1]; + int /*long*/[] ppvObject = new int /*long*/[1]; if (objIUnknown.QueryInterface(COM.IIDIPersist, ppvObject) == COM.S_OK) { IPersist objIPersist = new IPersist(ppvObject[0]); GUID tempid = new GUID(); @@ -404,7 +405,7 @@ protected void addObjectReferences() { } // - ppvObject = new int[1]; + ppvObject = new int /*long*/[1]; int result = objIUnknown.QueryInterface(COM.IIDIViewObject2, ppvObject); if (result != COM.S_OK) OLE.error(OLE.ERROR_INTERFACE_NOT_FOUND, result); @@ -412,7 +413,7 @@ protected void addObjectReferences() { objIViewObject2.SetAdvise(aspect, 0, iAdviseSink.getAddress()); // - ppvObject = new int[1]; + ppvObject = new int /*long*/[1]; result = objIUnknown.QueryInterface(COM.IIDIOleObject, ppvObject); if (result != COM.S_OK) OLE.error(OLE.ERROR_INTERFACE_NOT_FOUND, result); @@ -426,10 +427,10 @@ protected void addObjectReferences() { COM.OleSetContainedObject(objIUnknown.getAddress(), true); // Is OLE object linked or embedded? - ppvObject = new int[1]; + ppvObject = new int /*long*/[1]; if (objIUnknown.QueryInterface(COM.IIDIOleLink, ppvObject) == COM.S_OK) { IOleLink objIOleLink = new IOleLink(ppvObject[0]); - int[] ppmk = new int[1]; + int /*long*/[] ppmk = new int /*long*/[1]; if (objIOleLink.GetSourceMoniker(ppmk) == COM.S_OK) { IMoniker objIMoniker = new IMoniker(ppmk[0]); objIMoniker.Release(); @@ -457,61 +458,67 @@ private int ContextSensitiveHelp(int fEnterMode) { protected void createCOMInterfaces() { iUnknown = new COMObject(new int[]{2, 0, 0}){ - public int method0(int[] args) {return QueryInterface(args[0], args[1]);} - public int method1(int[] args) {return AddRef();} - public int method2(int[] args) {return Release();} + 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();} }; iOleClientSite = new COMObject(new int[]{2, 0, 0, 0, 3, 1, 0, 1, 0}){ - public int method0(int[] args) {return QueryInterface(args[0], args[1]);} - public int method1(int[] args) {return AddRef();} - public int method2(int[] args) {return Release();} - public int method3(int[] args) {return SaveObject();} + 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 SaveObject();} // method4 GetMoniker - not implemented - public int method5(int[] args) {return GetContainer(args[0]);} - public int method6(int[] args) {return ShowObject();} - public int method7(int[] args) {return OnShowWindow(args[0]);} + public int /*long*/ method5(int /*long*/[] args) {return GetContainer(args[0]);} + public int /*long*/ method6(int /*long*/[] args) {return ShowObject();} + public int /*long*/ method7(int /*long*/[] args) {return OnShowWindow((int)/*64*/args[0]);} // method8 RequestNewObjectLayout - not implemented }; iAdviseSink = new COMObject(new int[]{2, 0, 0, 2, 2, 1, 0, 0}){ - public int method0(int[] args) {return QueryInterface(args[0], args[1]);} - public int method1(int[] args) {return AddRef();} - public int method2(int[] args) {return Release();} - public int method3(int[] args) {return OnDataChange(args[0], args[1]);} - public int method4(int[] args) {return OnViewChange(args[0], args[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 OnDataChange(args[0], args[1]);} + public int /*long*/ method4(int /*long*/[] args) {return OnViewChange((int)/*64*/args[0], (int)/*64*/args[1]);} //method5 OnRename - not implemented - public int method6(int[] args) {OnSave();return 0;} - public int method7(int[] args) {return OnClose();} + public int /*long*/ method6(int /*long*/[] args) {OnSave();return 0;} + public int /*long*/ method7(int /*long*/[] args) {return OnClose();} }; - iOleInPlaceSite = new COMObject(new int[]{2, 0, 0, 1, 1, 0, 0, 0, 5, 1, 1, 0, 0, 0, 1}){ - public int method0(int[] args) {return QueryInterface(args[0], args[1]);} - public int method1(int[] args) {return AddRef();} - public int method2(int[] args) {return Release();} - public int method3(int[] args) {return GetWindow(args[0]);} - public int method4(int[] args) {return ContextSensitiveHelp(args[0]);} - public int method5(int[] args) {return CanInPlaceActivate();} - public int method6(int[] args) {return OnInPlaceActivate();} - public int method7(int[] args) {return OnUIActivate();} - public int method8(int[] args) {return GetWindowContext(args[0], args[1], args[2], args[3], args[4]);} - public int method9(int[] args) {return Scroll(args[0]);} - public int method10(int[] args) {return OnUIDeactivate(args[0]);} - public int method11(int[] args) {return OnInPlaceDeactivate();} + iOleInPlaceSite = new COMObject(new int[]{2, 0, 0, 1, 1, 0, 0, 0, 5, C.PTR_SIZEOF == 4 ? 2 : 1, 1, 0, 0, 0, 1}){ + public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);} + public int /*long*/ method1(int /*long*/[] args) {return AddRef();} + public int /*long*/ method2(int /*long*/[] args) {return Release();} + public int /*long*/ method3(int /*long*/[] args) {return GetWindow(args[0]);} + public int /*long*/ method4(int /*long*/[] args) {return ContextSensitiveHelp((int)/*64*/args[0]);} + public int /*long*/ method5(int /*long*/[] args) {return CanInPlaceActivate();} + public int /*long*/ method6(int /*long*/[] args) {return OnInPlaceActivate();} + public int /*long*/ method7(int /*long*/[] args) {return OnUIActivate();} + public int /*long*/ method8(int /*long*/[] args) {return GetWindowContext(args[0], args[1], args[2], args[3], args[4]);} + public int /*long*/ method9(int /*long*/[] args) { + if (args.length == 2) { + return Scroll((int)/*64*/args[0], (int)/*64*/args[1]); + } else { + return Scroll_64(args[0]); + } + } + public int /*long*/ method10(int /*long*/[] args) {return OnUIDeactivate((int)/*64*/args[0]);} + public int /*long*/ method11(int /*long*/[] args) {return OnInPlaceDeactivate();} // method12 DiscardUndoState - not implemented // method13 DeactivateAndUndoChange - not implemented - public int method14(int[] args) {return OnPosRectChange(args[0]);} + public int /*long*/ method14(int /*long*/[] args) {return OnPosRectChange(args[0]);} }; iOleDocumentSite = new COMObject(new int[]{2, 0, 0, 1}){ - public int method0(int[] args) {return QueryInterface(args[0], args[1]);} - public int method1(int[] args) {return AddRef();} - public int method2(int[] args) {return Release();} - public int method3(int[] args) {return ActivateMe(args[0]);} + public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);} + public int /*long*/ method1(int /*long*/[] args) {return AddRef();} + public int /*long*/ method2(int /*long*/[] args) {return Release();} + public int /*long*/ method3(int /*long*/[] args) {return ActivateMe(args[0]);} }; } protected IStorage createTempStorage() { - int[] tempStorage = new int[1]; + int /*long*/[] tempStorage = new int /*long*/[1]; int grfMode = COM.STGM_READWRITE | COM.STGM_SHARE_EXCLUSIVE | COM.STGM_DELETEONRELEASE; int result = COM.StgCreateDocfile(null, grfMode, 0, tempStorage); if (result != COM.S_OK) OLE.error(OLE.ERROR_CANNOT_CREATE_FILE, result); @@ -601,20 +608,20 @@ public int doVerb(int verb) { public int exec(int cmdID, int options, Variant in, Variant out) { if (objIOleCommandTarget == null) { - int[] address = new int[1]; + int /*long*/[] address = new int /*long*/[1]; if (objIUnknown.QueryInterface(COM.IIDIOleCommandTarget, address) != COM.S_OK) return OLE.ERROR_INTERFACE_NOT_FOUND; objIOleCommandTarget = new IOleCommandTarget(address[0]); } - int inAddress = 0; + int /*long*/ inAddress = 0; if (in != null){ - inAddress = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, Variant.sizeof); + inAddress = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, VARIANT.sizeof); in.getData(inAddress); } - int outAddress = 0; + int /*long*/ outAddress = 0; if (out != null){ - outAddress = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, Variant.sizeof); + outAddress = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, VARIANT.sizeof); out.getData(outAddress); } @@ -633,7 +640,7 @@ public int exec(int cmdID, int options, Variant in, Variant out) { return result; } IDispatch getAutomationObject() { - int[] ppvObject = new int[1]; + int /*long*/[] ppvObject = new int /*long*/[1]; if (objIUnknown.QueryInterface(COM.IIDIDispatch, ppvObject) != COM.S_OK) return null; return new IDispatch(ppvObject[0]); @@ -655,13 +662,13 @@ protected GUID getClassID(String clientName) { } return guid; } -private int GetContainer(int ppContainer) { +private int GetContainer(int /*long*/ ppContainer) { /* Simple containers that do not support links to their embedded * objects probably do not need to implement this method. Instead, * they can return E_NOINTERFACE and set ppContainer to NULL. */ if (ppContainer != 0) - COM.MoveMemory(ppContainer, new int[]{0}, 4); + COM.MoveMemory(ppContainer, new int /*long*/[]{0}, OS.PTR_SIZEOF); return COM.E_NOINTERFACE; } private SIZE getExtent() { @@ -686,11 +693,11 @@ public Rectangle getIndent() { */ public String getProgramID(){ if (appClsid != null){ - int[] lplpszProgID = new int[1]; + int /*long*/[] lplpszProgID = new int /*long*/[1]; if (COM.ProgIDFromCLSID(appClsid, lplpszProgID) == COM.S_OK) { - int hMem = lplpszProgID[0]; + int /*long*/ hMem = lplpszProgID[0]; int length = OS.GlobalSize(hMem); - int ptr = OS.GlobalLock(hMem); + int /*long*/ ptr = OS.GlobalLock(hMem); char[] buffer = new char[length]; COM.MoveMemory(buffer, ptr, length); OS.GlobalUnlock(hMem); @@ -704,9 +711,9 @@ public String getProgramID(){ } return null; } -int ActivateMe(int pViewToActivate) { +int ActivateMe(int /*long*/ pViewToActivate) { if (pViewToActivate == 0) { - int[] ppvObject = new int[1]; + int /*long*/[] ppvObject = new int /*long*/[1]; if (objIUnknown.QueryInterface(COM.IIDIOleDocument, ppvObject) != COM.S_OK) return COM.E_FAIL; IOleDocument objOleDocument = new IOleDocument(ppvObject[0]); if (objOleDocument.CreateView(iOleInPlaceSite.getAddress(), 0, 0, ppvObject) != COM.S_OK) return COM.E_FAIL; @@ -723,16 +730,16 @@ int ActivateMe(int pViewToActivate) { objDocumentView.Show(1);//TRUE return COM.S_OK; } -protected int GetWindow(int phwnd) { +protected int GetWindow(int /*long*/ phwnd) { if (phwnd == 0) return COM.E_INVALIDARG; if (frame == null) { - COM.MoveMemory(phwnd, new int[] {0}, 4); + COM.MoveMemory(phwnd, new int /*long*/[] {0}, OS.PTR_SIZEOF); return COM.E_NOTIMPL; } // Copy the Window's handle into the memory passed in - COM.MoveMemory(phwnd, new int[] {frame.handle}, 4); + COM.MoveMemory(phwnd, new int /*long*/[] {frame.handle}, OS.PTR_SIZEOF); return COM.S_OK; } RECT getRect() { @@ -745,17 +752,17 @@ RECT getRect() { rect.bottom = location.y + area.height - borderWidths.top - borderWidths.bottom; return rect; } -private int GetWindowContext(int ppFrame, int ppDoc, int lprcPosRect, int lprcClipRect, int lpFrameInfo) { +private int GetWindowContext(int /*long*/ ppFrame, int /*long*/ ppDoc, int /*long*/ lprcPosRect, int /*long*/ lprcClipRect, int /*long*/ lpFrameInfo) { if (frame == null || ppFrame == 0) return COM.E_NOTIMPL; // fill in frame handle - int iOleInPlaceFrame = frame.getIOleInPlaceFrame(); - COM.MoveMemory(ppFrame, new int[] {iOleInPlaceFrame}, 4); + int /*long*/ iOleInPlaceFrame = frame.getIOleInPlaceFrame(); + COM.MoveMemory(ppFrame, new int /*long*/[] {iOleInPlaceFrame}, OS.PTR_SIZEOF); frame.AddRef(); // null out document handle - if (ppDoc != 0) COM.MoveMemory(ppDoc, new int[] {0}, 4); + if (ppDoc != 0) COM.MoveMemory(ppDoc, new int /*long*/[] {0}, OS.PTR_SIZEOF); // fill in position and clipping info RECT rect = getRect(); @@ -770,10 +777,10 @@ private int GetWindowContext(int ppFrame, int ppDoc, int lprcPosRect, int lprcCl Shell shell = getShell(); Menu menubar = shell.getMenuBar(); if (menubar != null && !menubar.isDisposed()) { - int hwnd = shell.handle; - int cAccel = OS.SendMessage(hwnd, OS.WM_APP, 0, 0); + int /*long*/ hwnd = shell.handle; + int cAccel = (int)/*64*/OS.SendMessage(hwnd, OS.WM_APP, 0, 0); if (cAccel != 0) { - int hAccel = OS.SendMessage(hwnd, OS.WM_APP+1, 0, 0); + int /*long*/ hAccel = OS.SendMessage(hwnd, OS.WM_APP+1, 0, 0); if (hAccel != 0) { frameInfo.cAccelEntries = cAccel; frameInfo.haccel = hAccel; @@ -792,7 +799,7 @@ public boolean isDirty() { */ // Get access to the persistent storage mechanism - int[] address = new int[1]; + int /*long*/[] address = new int /*long*/[1]; if (objIOleObject.QueryInterface(COM.IIDIPersistFile, address) != COM.S_OK) return true; IPersistStorage permStorage = new IPersistStorage(address[0]); @@ -804,9 +811,9 @@ public boolean isDirty() { } public boolean isFocusControl () { checkWidget (); - int focusHwnd = OS.GetFocus(); + int /*long*/ focusHwnd = OS.GetFocus(); if (objIOleInPlaceObject == null) return (handle == focusHwnd); - int[] phwnd = new int[1]; + int /*long*/[] phwnd = new int /*long*/[1]; objIOleInPlaceObject.GetWindow(phwnd); while (focusHwnd != 0) { if (phwnd[0] == focusHwnd) return true; @@ -817,7 +824,7 @@ public boolean isFocusControl () { private int OnClose() { return COM.S_OK; } -private int OnDataChange(int pFormatetc, int pStgmed) { +private int OnDataChange(int /*long*/ pFormatetc, int /*long*/ pStgmed) { return COM.S_OK; } private void onDispose(Event e) { @@ -845,7 +852,7 @@ void onFocusIn(Event e) { if (state != STATE_UIACTIVE) doVerb(OLE.OLEIVERB_SHOW); if (objIOleInPlaceObject == null) return; if (isFocusControl()) return; - int[] phwnd = new int[1]; + int /*long*/[] phwnd = new int /*long*/[1]; objIOleInPlaceObject.GetWindow(phwnd); if (phwnd[0] == 0) return; OS.SetFocus(phwnd[0]); @@ -857,7 +864,7 @@ private int OnInPlaceActivate() { frame.setCurrentDocument(this); if (objIOleObject == null) return COM.S_OK; - int[] ppvObject = new int[1]; + int /*long*/[] ppvObject = new int /*long*/[1]; if (objIOleObject.QueryInterface(COM.IIDIOleInPlaceObject, ppvObject) == COM.S_OK) { objIOleInPlaceObject = new IOleInPlaceObject(ppvObject[0]); } @@ -874,7 +881,7 @@ private int OnInPlaceDeactivate() { } return COM.S_OK; } -private int OnPosRectChange(int lprcPosRect) { +private int OnPosRectChange(int /*long*/ lprcPosRect) { Point size = getSize(); setExtent(size.x, size.y); return COM.S_OK; @@ -892,7 +899,7 @@ private void onPaint(Event e) { rect.top = area.y; rect.bottom = area.y + size.cy; } - int pArea = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, RECT.sizeof); + int /*long*/ pArea = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, RECT.sizeof); OS.MoveMemory(pArea, rect, RECT.sizeof); COM.OleDraw(objIUnknown.getAddress(), aspect, e.gc.handle, pArea); OS.GlobalFree(pArea); @@ -915,7 +922,7 @@ private int OnShowWindow(int fShow) { private int OnUIActivate() { if (objIOleInPlaceObject == null) return COM.E_FAIL; state = STATE_UIACTIVE; - int[] phwnd = new int[1]; + int /*long*/[] phwnd = new int /*long*/[1]; if (objIOleInPlaceObject.GetWindow(phwnd) == COM.S_OK) { OS.SetWindowPos(phwnd[0], OS.HWND_TOP, 0, 0, 0, 0, OS.SWP_NOSIZE | OS.SWP_NOMOVE); } @@ -935,7 +942,7 @@ private int OnUIDeactivate(int fUndoable) { if (menubar == null || menubar.isDisposed()) return COM.S_OK; - int shellHandle = shell.handle; + int /*long*/ shellHandle = shell.handle; OS.SetMenu(shellHandle, menubar.handle); return COM.OleSetMenuDescriptor(0, shellHandle, 0, 0, 0); } @@ -955,7 +962,7 @@ private void onTraverse(Event event) { private int OnViewChange(int dwAspect, int lindex) { return COM.S_OK; } -protected int QueryInterface(int riid, int ppvObject) { +protected int QueryInterface(int /*long*/ riid, int /*long*/ ppvObject) { if (riid == 0 || ppvObject == 0) return COM.E_NOINTERFACE; @@ -963,34 +970,34 @@ protected int QueryInterface(int riid, int ppvObject) { COM.MoveMemory(guid, riid, GUID.sizeof); if (COM.IsEqualGUID(guid, COM.IIDIUnknown)) { - COM.MoveMemory(ppvObject, new int[] {iUnknown.getAddress()}, 4); + COM.MoveMemory(ppvObject, new int /*long*/[] {iUnknown.getAddress()}, OS.PTR_SIZEOF); AddRef(); return COM.S_OK; } if (COM.IsEqualGUID(guid, COM.IIDIAdviseSink)) { - COM.MoveMemory(ppvObject, new int[] {iAdviseSink.getAddress()}, 4); + COM.MoveMemory(ppvObject, new int /*long*/[] {iAdviseSink.getAddress()}, OS.PTR_SIZEOF); AddRef(); return COM.S_OK; } if (COM.IsEqualGUID(guid, COM.IIDIOleClientSite)) { - COM.MoveMemory(ppvObject, new int[] {iOleClientSite.getAddress()}, 4); + COM.MoveMemory(ppvObject, new int /*long*/[] {iOleClientSite.getAddress()}, OS.PTR_SIZEOF); AddRef(); return COM.S_OK; } if (COM.IsEqualGUID(guid, COM.IIDIOleInPlaceSite)) { - COM.MoveMemory(ppvObject, new int[] {iOleInPlaceSite.getAddress()}, 4); + COM.MoveMemory(ppvObject, new int /*long*/[] {iOleInPlaceSite.getAddress()}, OS.PTR_SIZEOF); AddRef(); return COM.S_OK; } if (COM.IsEqualGUID(guid, COM.IIDIOleDocumentSite )) { String progID = getProgramID(); if (!progID.startsWith("PowerPoint")) { //$NON-NLS-1$ - COM.MoveMemory(ppvObject, new int[] {iOleDocumentSite.getAddress()}, 4); + COM.MoveMemory(ppvObject, new int /*long*/[] {iOleDocumentSite.getAddress()}, OS.PTR_SIZEOF); AddRef(); return COM.S_OK; } } - COM.MoveMemory(ppvObject, new int[] {0}, 4); + COM.MoveMemory(ppvObject, new int /*long*/[] {0}, OS.PTR_SIZEOF); return COM.E_NOINTERFACE; } /** @@ -1008,7 +1015,7 @@ protected int QueryInterface(int riid, int ppvObject) { public int queryStatus(int cmd) { if (objIOleCommandTarget == null) { - int[] address = new int[1]; + int /*long*/[] address = new int /*long*/[1]; if (objIUnknown.QueryInterface(COM.IIDIOleCommandTarget, address) != COM.S_OK) return 0; objIOleCommandTarget = new IOleCommandTarget(address[0]); @@ -1070,7 +1077,7 @@ public boolean save(File file, boolean includeOleInfo) { return saveToStorageFile(file); return saveToTraditionalFile(file); } -private boolean saveFromContents(int address, File file) { +private boolean saveFromContents(int /*long*/ address, File file) { boolean success = false; @@ -1081,7 +1088,7 @@ private boolean saveFromContents(int address, File file) { FileOutputStream writer = new FileOutputStream(file); int increment = 1024 * 4; - int pv = COM.CoTaskMemAlloc(increment); + int /*long*/ pv = COM.CoTaskMemAlloc(increment); int[] pcbWritten = new int[1]; while (tempContents.Read(pv, increment, pcbWritten) == COM.S_OK && pcbWritten[0] > 0) { byte[] buffer = new byte[ pcbWritten[0]]; @@ -1101,7 +1108,7 @@ private boolean saveFromContents(int address, File file) { return success; } -private boolean saveFromOle10Native(int address, File file) { +private boolean saveFromOle10Native(int /*long*/ address, File file) { boolean success = false; @@ -1110,7 +1117,7 @@ private boolean saveFromOle10Native(int address, File file) { // The "\1Ole10Native" stream contains a DWORD header whose value is the length // of the native data that follows. - int pv = COM.CoTaskMemAlloc(4); + int /*long*/ pv = COM.CoTaskMemAlloc(4); int[] size = new int[1]; int rc = tempContents.Read(pv, 4, null); OS.MoveMemory(size, pv, 4); @@ -1166,11 +1173,11 @@ private boolean saveToStorageFile(File file) { if (!updateStorage()) return false; // get access to the persistent storage mechanism - int[] address = new int[1]; + int /*long*/[] address = new int /*long*/[1]; if (objIOleObject.QueryInterface(COM.IIDIPersistStorage, address) != COM.S_OK) return false; IPersistStorage permStorage = new IPersistStorage(address[0]); try { - address = new int[1]; + address = new int /*long*/[1]; char[] path = (file.getAbsolutePath()+"\0").toCharArray(); int mode = COM.STGM_TRANSACTED | COM.STGM_READWRITE | COM.STGM_SHARE_EXCLUSIVE | COM.STGM_CREATE; int result = COM.StgCreateDocfile(path, mode, 0, address); //Does an AddRef if successful @@ -1209,7 +1216,7 @@ private boolean saveToTraditionalFile(File file) { if (!updateStorage()) return false; - int[] address = new int[1]; + int /*long*/[] address = new int /*long*/[1]; // Look for a CONTENTS stream if (tempStorage.OpenStream("CONTENTS", 0, COM.STGM_DIRECT | COM.STGM_READ | COM.STGM_SHARE_EXCLUSIVE, 0, address) == COM.S_OK) //$NON-NLS-1$ return saveFromContents(address[0], file); @@ -1220,7 +1227,10 @@ private boolean saveToTraditionalFile(File file) { return false; } -private int Scroll(int scrollExtant) { +private int Scroll_64(int /*long*/ scrollExtent) { + return COM.S_OK; +} +private int Scroll(int scrollExtent_cx, int scrollExtent_cy) { return COM.S_OK; } void setBorderSpace(RECT newBorderwidth) { @@ -1289,7 +1299,7 @@ private int ShowObject() { public void showProperties(String title) { // Get the Property Page information from the OLE Object - int[] ppvObject = new int[1]; + int /*long*/[] ppvObject = new int /*long*/[1]; if (objIUnknown.QueryInterface(COM.IIDISpecifyPropertyPages, ppvObject) != COM.S_OK) return; ISpecifyPropertyPages objISPP = new ISpecifyPropertyPages(ppvObject[0]); CAUUID caGUID = new CAUUID(); @@ -1303,7 +1313,7 @@ public void showProperties(String title) { chTitle = new char[title.length()]; title.getChars(0, title.length(), chTitle, 0); } - result = COM.OleCreatePropertyFrame(frame.handle, 10, 10, chTitle, 1, new int[] {objIUnknown.getAddress()}, caGUID.cElems, caGUID.pElems, COM.LOCALE_USER_DEFAULT, 0, 0); + result = COM.OleCreatePropertyFrame(frame.handle, 10, 10, chTitle, 1, new int /*long*/[] {objIUnknown.getAddress()}, caGUID.cElems, caGUID.pElems, COM.LOCALE_USER_DEFAULT, 0, 0); // free the property page information COM.CoTaskMemFree(caGUID.pElems); @@ -1312,7 +1322,7 @@ private boolean updateStorage() { if (tempStorage == null) return false; - int[] ppv = new int[1]; + int /*long*/[] ppv = new int /*long*/[1]; if (objIUnknown.QueryInterface(COM.IIDIPersistStorage, ppv) != COM.S_OK) return false; IPersistStorage iPersistStorage = new IPersistStorage(ppv[0]); @@ -1334,7 +1344,7 @@ private SIZE xFormHimetricToPixels(SIZE aSize) { // Return a new Size which is the pixel transformation of a // size in HIMETRIC units. - int hDC = OS.GetDC(0); + int /*long*/ hDC = OS.GetDC(0); int xppi = OS.GetDeviceCaps(hDC, 88); // logical pixels/inch in x int yppi = OS.GetDeviceCaps(hDC, 90); // logical pixels/inch in y OS.ReleaseDC(0, hDC); @@ -1349,7 +1359,7 @@ private SIZE xFormPixelsToHimetric(SIZE aSize) { // Return a new size which is the HIMETRIC transformation of a // size in pixel units. - int hDC = OS.GetDC(0); + int /*long*/ hDC = OS.GetDC(0); int xppi = OS.GetDeviceCaps(hDC, 88); // logical pixels/inch in x int yppi = OS.GetDeviceCaps(hDC, 90); // logical pixels/inch in y OS.ReleaseDC(0, hDC); diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleControlSite.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleControlSite.java index bbd32c4f0c..a7a102d9f3 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleControlSite.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleControlSite.java @@ -51,7 +51,7 @@ public class OleControlSite extends OleClientSite // supporting Event Sink attributes private OleEventSink[] oleEventSink = new OleEventSink[0]; private GUID[] oleEventSinkGUID = new GUID[0]; - private int[] oleEventSinkIUnknown = new int[0]; + private int /*long*/[] oleEventSinkIUnknown = new int /*long*/[0]; // supporting information for the Control COM object private CONTROLINFO currentControlInfo; @@ -91,14 +91,14 @@ public OleControlSite(Composite parent, int style, String progId) { appClsid = getClassID(progId); if (appClsid == null) OLE.error(OLE.ERROR_INVALID_CLASSID); - int licinfo = getLicenseInfo(appClsid); + int /*long*/ licinfo = getLicenseInfo(appClsid); if (licinfo == 0) { // Open a storage object tempStorage = createTempStorage(); // Create ole object with storage object - int[] address = new int[1]; + int /*long*/[] address = new int /*long*/[1]; int result = COM.OleCreate(appClsid, COM.IIDIUnknown, COM.OLERENDER_DRAW, null, 0, tempStorage.getAddress(), address); if (result != COM.S_OK) OLE.error(OLE.ERROR_CANNOT_CREATE_OBJECT, result); @@ -107,7 +107,7 @@ public OleControlSite(Composite parent, int style, String progId) { } else { // Prepare the ClassFactory - int[] ppvObject = new int[1]; + int /*long*/[] ppvObject = new int /*long*/[1]; try { int result = COM.CoGetClassObject(appClsid, COM.CLSCTX_INPROC_HANDLER | COM.CLSCTX_INPROC_SERVER, 0, COM.IIDIClassFactory2, ppvObject); if (result != COM.S_OK) { @@ -115,7 +115,7 @@ public OleControlSite(Composite parent, int style, String progId) { } IClassFactory2 classFactory = new IClassFactory2(ppvObject[0]); // Create Com Object - ppvObject = new int[1]; + ppvObject = new int /*long*/[1]; result = classFactory.CreateInstanceLic(0, 0, COM.IIDIUnknown, licinfo, ppvObject); classFactory.Release(); if (result != COM.S_OK) @@ -127,7 +127,7 @@ public OleControlSite(Composite parent, int style, String progId) { objIUnknown = new IUnknown(ppvObject[0]); // Prepare a storage medium - ppvObject = new int[1]; + ppvObject = new int /*long*/[1]; if (objIUnknown.QueryInterface(COM.IIDIPersistStorage, ppvObject) == COM.S_OK) { IPersistStorage persist = new IPersistStorage(ppvObject[0]); tempStorage = createTempStorage(); @@ -172,7 +172,7 @@ public void addEventListener(int eventID, OleListener listener) { } static GUID getDefaultEventSinkGUID(IUnknown unknown) { // get Event Sink I/F from IProvideClassInfo2 - int[] ppvObject = new int[1]; + int /*long*/[] ppvObject = new int /*long*/[1]; if (unknown.QueryInterface(COM.IIDIProvideClassInfo2, ppvObject) == COM.S_OK) { IProvideClassInfo2 pci2 = new IProvideClassInfo2(ppvObject[0]); GUID riid = new GUID(); @@ -184,14 +184,14 @@ static GUID getDefaultEventSinkGUID(IUnknown unknown) { // get Event Sink I/F from IProvideClassInfo if (unknown.QueryInterface(COM.IIDIProvideClassInfo, ppvObject) == COM.S_OK) { IProvideClassInfo pci = new IProvideClassInfo(ppvObject[0]); - int[] ppTI = new int[1]; - int[] ppEI = new int[1]; + int /*long*/[] ppTI = new int /*long*/[1]; + int /*long*/[] ppEI = new int /*long*/[1]; int result = pci.GetClassInfo(ppTI); pci.Release(); if (result == COM.S_OK && ppTI[0] != 0) { ITypeInfo classInfo = new ITypeInfo(ppTI[0]); - int[] ppTypeAttr = new int[1]; + int /*long*/[] ppTypeAttr = new int /*long*/[1]; result = classInfo.GetTypeAttr(ppTypeAttr); if (result == COM.S_OK && ppTypeAttr[0] != 0) { TYPEATTR typeAttribute = new TYPEATTR(); @@ -216,7 +216,7 @@ static GUID getDefaultEventSinkGUID(IUnknown unknown) { if (ppEI[0] != 0) { ITypeInfo eventInfo = new ITypeInfo(ppEI[0]); - ppTypeAttr = new int[1]; + ppTypeAttr = new int /*long*/[1]; result = eventInfo.GetTypeAttr(ppTypeAttr); GUID riid = null; if (result == COM.S_OK && ppTypeAttr[0] != 0) { @@ -247,7 +247,7 @@ static GUID getDefaultEventSinkGUID(IUnknown unknown) { */ public void addEventListener(OleAutomation automation, int eventID, OleListener listener) { if (listener == null || automation == null) OLE.error (SWT.ERROR_NULL_ARGUMENT); - int address = automation.getAddress(); + int /*long*/ address = automation.getAddress(); IUnknown unknown = new IUnknown(address); GUID riid = getDefaultEventSinkGUID(unknown); if (riid != null) { @@ -271,7 +271,7 @@ public void addEventListener(OleAutomation automation, int eventID, OleListener */ public void addEventListener(OleAutomation automation, String eventSinkId, int eventID, OleListener listener) { if (listener == null || automation == null || eventSinkId == null) OLE.error (SWT.ERROR_NULL_ARGUMENT); - int address = automation.getAddress(); + int /*long*/ address = automation.getAddress(); if (address == 0) return; char[] buffer = (eventSinkId +"\0").toCharArray(); GUID guid = new GUID(); @@ -279,7 +279,7 @@ public void addEventListener(OleAutomation automation, String eventSinkId, int e addEventListener(address, guid, eventID, listener); } -void addEventListener(int iunknown, GUID guid, int eventID, OleListener listener) { +void addEventListener(int /*long*/ iunknown, GUID guid, int eventID, OleListener listener) { if (listener == null || iunknown == 0 || guid == null) OLE.error (SWT.ERROR_NULL_ARGUMENT); // have we connected to this kind of event sink before? int index = -1; @@ -297,7 +297,7 @@ void addEventListener(int iunknown, GUID guid, int eventID, OleListener listener int oldLength = oleEventSink.length; OleEventSink[] newOleEventSink = new OleEventSink[oldLength + 1]; GUID[] newOleEventSinkGUID = new GUID[oldLength + 1]; - int[] newOleEventSinkIUnknown = new int[oldLength + 1]; + int /*long*/[] newOleEventSinkIUnknown = new int /*long*/[oldLength + 1]; System.arraycopy(oleEventSink, 0, newOleEventSink, 0, oldLength); System.arraycopy(oleEventSinkGUID, 0, newOleEventSinkGUID, 0, oldLength); System.arraycopy(oleEventSinkIUnknown, 0, newOleEventSinkIUnknown, 0, oldLength); @@ -322,7 +322,7 @@ protected void addObjectReferences() { connectPropertyChangeSink(); // Get access to the Control object - int[] ppvObject = new int[1]; + int /*long*/[] ppvObject = new int /*long*/[1]; if (objIUnknown.QueryInterface(COM.IIDIOleControl, ppvObject) == COM.S_OK) { IOleControl objIOleControl = new IOleControl(ppvObject[0]); // ask the control for its info in case users @@ -357,26 +357,26 @@ protected void createCOMInterfaces () { // register each of the interfaces that this object implements iOleControlSite = new COMObject(new int[]{2, 0, 0, 0, 1, 1, 3, 2, 1, 0}){ - public int method0(int[] args) {return QueryInterface(args[0], args[1]);} - public int method1(int[] args) {return AddRef();} - public int method2(int[] args) {return Release();} - public int method3(int[] args) {return OnControlInfoChanged();} + 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 OnControlInfoChanged();} // method4 LockInPlaceActive - not implemented // method5 GetExtendedControl - not implemented // method6 TransformCoords - not implemented // method7 Translate Accelerator - not implemented - public int method8(int[] args) {return OnFocus(args[0]);} + public int /*long*/ method8(int /*long*/[] args) {return OnFocus((int)/*64*/args[0]);} // method9 ShowPropertyFrame - not implemented }; iDispatch = new COMObject(new int[]{2, 0, 0, 1, 3, 5, 8}){ - public int method0(int[] args) {return QueryInterface(args[0], args[1]);} - public int method1(int[] args) {return AddRef();} - public int method2(int[] args) {return Release();} + 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();} // method3 GetTypeInfoCount - not implemented // method4 GetTypeInfo - not implemented // method5 GetIDsOfNames - not implemented - public int method6(int[] args) {return Invoke(args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7]);} + public int /*long*/ method6(int /*long*/[] args) {return Invoke((int)/*64*/args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], args[4], args[5], args[6], args[7]);} }; } private void disconnectEventSinks() { @@ -388,7 +388,7 @@ private void disconnectEventSinks() { } oleEventSink = new OleEventSink[0]; oleEventSinkGUID = new GUID[0]; - oleEventSinkIUnknown = new int[0]; + oleEventSinkIUnknown = new int /*long*/[0]; } private void disconnectPropertyChangeSink() { @@ -472,8 +472,8 @@ public Color getForeground () { return super.getForeground(); } -protected int getLicenseInfo(GUID clsid) { - int[] ppvObject = new int[1]; +protected int /*long*/ getLicenseInfo(GUID clsid) { + int /*long*/[] ppvObject = new int /*long*/[1]; if (COM.CoGetClassObject(clsid, COM.CLSCTX_INPROC_HANDLER | COM.CLSCTX_INPROC_SERVER, 0, COM.IIDIClassFactory2, ppvObject) != COM.S_OK) { return 0; @@ -484,7 +484,7 @@ protected int getLicenseInfo(GUID clsid) { classFactory.Release(); return 0; } - int[] pBstrKey = new int[1]; + int /*long*/[] pBstrKey = new int /*long*/[1]; if (licinfo != null && licinfo.fRuntimeKeyAvail) { if (classFactory.RequestLicKey(0, pBstrKey) == COM.S_OK) { classFactory.Release(); @@ -509,22 +509,22 @@ public Variant getSiteProperty(int dispId){ } return null; } -protected int GetWindow(int phwnd) { +protected int GetWindow(int /*long*/ phwnd) { if (phwnd == 0) return COM.E_INVALIDARG; if (frame == null) { - COM.MoveMemory(phwnd, new int[] {0}, 4); + COM.MoveMemory(phwnd, new int /*long*/[] {0}, OS.PTR_SIZEOF); return COM.E_NOTIMPL; } // Copy the Window's handle into the memory passed in - COM.MoveMemory(phwnd, new int[] {handle}, 4); + COM.MoveMemory(phwnd, new int /*long*/[] {handle}, OS.PTR_SIZEOF); return COM.S_OK; } -private int Invoke(int dispIdMember, int riid, int lcid, int dwFlags, int pDispParams, int pVarResult, int pExcepInfo, int pArgErr) { +private int Invoke(int dispIdMember, int /*long*/ riid, int lcid, int dwFlags, int /*long*/ pDispParams, int /*long*/ pVarResult, int /*long*/ pExcepInfo, int /*long*/ pArgErr) { if (pVarResult == 0 || dwFlags != COM.DISPATCH_PROPERTYGET) { - if (pExcepInfo != 0) COM.MoveMemory(pExcepInfo, new int[] {0}, 4); + if (pExcepInfo != 0) COM.MoveMemory(pExcepInfo, new int /*long*/ [] {0}, OS.PTR_SIZEOF); if (pArgErr != 0) COM.MoveMemory(pArgErr, new int[] {0}, 4); return COM.DISP_E_MEMBERNOTFOUND; } @@ -538,8 +538,8 @@ private int Invoke(int dispIdMember, int riid, int lcid, int dwFlags, int pDispP case COM.DISPID_AMBIENT_SUPPORTSMNEMONICS : case COM.DISPID_AMBIENT_SHOWGRABHANDLES : case COM.DISPID_AMBIENT_SHOWHATCHING : - if (pVarResult != 0) COM.MoveMemory(pVarResult, new int[] {0}, 4); - if (pExcepInfo != 0) COM.MoveMemory(pExcepInfo, new int[] {0}, 4); + if (pVarResult != 0) COM.MoveMemory(pVarResult, new int /*long*/ [] {0}, OS.PTR_SIZEOF); + if (pExcepInfo != 0) COM.MoveMemory(pExcepInfo, new int /*long*/ [] {0}, OS.PTR_SIZEOF); if (pArgErr != 0) COM.MoveMemory(pArgErr, new int[] {0}, 4); return COM.S_FALSE; @@ -551,20 +551,20 @@ private int Invoke(int dispIdMember, int riid, int lcid, int dwFlags, int pDispP case COM.DISPID_AMBIENT_LOCALEID : case COM.DISPID_AMBIENT_SILENT : case COM.DISPID_AMBIENT_MESSAGEREFLECT : - if (pVarResult != 0) COM.MoveMemory(pVarResult, new int[] {0}, 4); - if (pExcepInfo != 0) COM.MoveMemory(pExcepInfo, new int[] {0}, 4); + if (pVarResult != 0) COM.MoveMemory(pVarResult, new int /*long*/ [] {0}, OS.PTR_SIZEOF); + if (pExcepInfo != 0) COM.MoveMemory(pExcepInfo, new int /*long*/ [] {0}, OS.PTR_SIZEOF); if (pArgErr != 0) COM.MoveMemory(pArgErr, new int[] {0}, 4); return COM.E_NOTIMPL; default : - if (pVarResult != 0) COM.MoveMemory(pVarResult, new int[] {0}, 4); - if (pExcepInfo != 0) COM.MoveMemory(pExcepInfo, new int[] {0}, 4); + if (pVarResult != 0) COM.MoveMemory(pVarResult, new int /*long*/ [] {0}, OS.PTR_SIZEOF); + if (pExcepInfo != 0) COM.MoveMemory(pExcepInfo,new int /*long*/ [] {0}, OS.PTR_SIZEOF); if (pArgErr != 0) COM.MoveMemory(pArgErr, new int[] {0}, 4); return COM.DISP_E_MEMBERNOTFOUND; } } private int OnControlInfoChanged() { - int[] ppvObject = new int[1]; + int /*long*/[] ppvObject = new int /*long*/[1]; if (objIUnknown.QueryInterface(COM.IIDIOleControl, ppvObject) == COM.S_OK) { IOleControl objIOleControl = new IOleControl(ppvObject[0]); // ask the control for its info in case users @@ -579,7 +579,7 @@ void onFocusIn(Event e) { if (objIOleInPlaceObject == null) return; doVerb(OLE.OLEIVERB_UIACTIVATE); if (isFocusControl()) return; - int[] phwnd = new int[1]; + int /*long*/[] phwnd = new int /*long*/[1]; objIOleInPlaceObject.GetWindow(phwnd); if (phwnd[0] == 0) return; OS.SetFocus(phwnd[0]); @@ -632,7 +632,7 @@ protected int OnUIDeactivate(int fUndoable) { state = STATE_INPLACEACTIVE; return COM.S_OK; } -protected int QueryInterface(int riid, int ppvObject) { +protected int QueryInterface(int /*long*/ riid, int /*long*/ ppvObject) { int result = super.QueryInterface(riid, ppvObject); if (result == COM.S_OK) return result; @@ -641,16 +641,16 @@ protected int QueryInterface(int riid, int ppvObject) { GUID guid = new GUID(); COM.MoveMemory(guid, riid, GUID.sizeof); if (COM.IsEqualGUID(guid, COM.IIDIOleControlSite)) { - COM.MoveMemory(ppvObject, new int[] {iOleControlSite.getAddress()}, 4); + COM.MoveMemory(ppvObject, new int /*long*/[] {iOleControlSite.getAddress()}, OS.PTR_SIZEOF); AddRef(); return COM.S_OK; } if (COM.IsEqualGUID(guid, COM.IIDIDispatch)) { - COM.MoveMemory(ppvObject, new int[] {iDispatch.getAddress()}, 4); + COM.MoveMemory(ppvObject, new int /*long*/[] {iDispatch.getAddress()}, OS.PTR_SIZEOF); AddRef(); return COM.S_OK; } - COM.MoveMemory(ppvObject, new int[] {0}, 4); + COM.MoveMemory(ppvObject, new int /*long*/[] {0}, OS.PTR_SIZEOF); return COM.E_NOINTERFACE; } protected int Release() { @@ -733,14 +733,14 @@ public void removeEventListener(OleAutomation automation, GUID guid, int eventID public void removeEventListener(OleAutomation automation, int eventID, OleListener listener) { checkWidget(); if (automation == null || listener == null) SWT.error (SWT.ERROR_NULL_ARGUMENT); - int address = automation.getAddress(); + int /*long*/ address = automation.getAddress(); IUnknown unknown = new IUnknown(address); GUID riid = getDefaultEventSinkGUID(unknown); if (riid != null) { removeEventListener(address, riid, eventID, listener); } } -void removeEventListener(int iunknown, GUID guid, int eventID, OleListener listener) { +void removeEventListener(int /*long*/ iunknown, GUID guid, int eventID, OleListener listener) { if (listener == null || guid == null) SWT.error (SWT.ERROR_NULL_ARGUMENT); for (int i = 0; i < oleEventSink.length; i++) { if (COM.IsEqualGUID(oleEventSinkGUID[i], guid)) { @@ -754,7 +754,7 @@ void removeEventListener(int iunknown, GUID guid, int eventID, OleListener liste if (oldLength == 1) { oleEventSink = new OleEventSink[0]; oleEventSinkGUID = new GUID[0]; - oleEventSinkIUnknown = new int[0]; + oleEventSinkIUnknown = new int /*long*/[0]; } else { OleEventSink[] newOleEventSink = new OleEventSink[oldLength - 1]; System.arraycopy(oleEventSink, 0, newOleEventSink, 0, i); @@ -766,7 +766,7 @@ void removeEventListener(int iunknown, GUID guid, int eventID, OleListener liste System.arraycopy(oleEventSinkGUID, i + 1, newOleEventSinkGUID, i, oldLength - i - 1); oleEventSinkGUID = newOleEventSinkGUID; - int[] newOleEventSinkIUnknown = new int[oldLength - 1]; + int /*long*/[] newOleEventSinkIUnknown = new int /*long*/[oldLength - 1]; System.arraycopy(oleEventSinkIUnknown, 0, newOleEventSinkIUnknown, 0, i); System.arraycopy(oleEventSinkIUnknown, i + 1, newOleEventSinkIUnknown, i, oldLength - i - 1); oleEventSinkIUnknown = newOleEventSinkIUnknown; diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleEventSink.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleEventSink.java index 957c6d6a3b..3d172d506a 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleEventSink.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleEventSink.java @@ -11,6 +11,7 @@ package org.eclipse.swt.ole.win32; import org.eclipse.swt.*; +import org.eclipse.swt.internal.win32.*; import org.eclipse.swt.internal.ole.win32.*; final class OleEventSink @@ -26,7 +27,7 @@ final class OleEventSink private OleEventTable eventTable; -OleEventSink(OleControlSite widget, int iUnknown, GUID riid) { +OleEventSink(OleControlSite widget, int /*long*/ iUnknown, GUID riid) { this.widget = widget; this.eventGuid = riid; @@ -36,10 +37,10 @@ OleEventSink(OleControlSite widget, int iUnknown, GUID riid) { } void connect () { - int[] ppvObject = new int[1]; + int /*long*/[] ppvObject = new int /*long*/[1]; if (objIUnknown.QueryInterface(COM.IIDIConnectionPointContainer, ppvObject) == COM.S_OK) { IConnectionPointContainer cpc = new IConnectionPointContainer(ppvObject[0]); - int[] ppCP = new int[1]; + int /*long*/[] ppCP = new int /*long*/[1]; if (cpc.FindConnectionPoint(eventGuid, ppCP) == COM.S_OK) { IConnectionPoint cp = new IConnectionPoint(ppCP[0]); int[] pCookie = new int[1]; @@ -61,19 +62,19 @@ int AddRef() { } private void createCOMInterfaces() { iDispatch = new COMObject(new int[]{2, 0, 0, 1, 3, 4, 8}){ - public int method0(int[] args) {return QueryInterface(args[0], args[1]);} - public int method1(int[] args) {return AddRef();} - public int method2(int[] args) {return Release();} + 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();} // method3 GetTypeInfoCount - not implemented // method4 GetTypeInfo - not implemented // method5 GetIDsOfNames - not implemented - public int method6(int[] args) {return Invoke(args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7]);} + public int /*long*/ method6(int /*long*/[] args) {return Invoke((int)/*64*/args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], args[4], args[5], args[6], args[7]);} }; } void disconnect() { // disconnect event sink if (eventCookie != 0 && objIUnknown != null) { - int[] ppvObject = new int[1]; + int /*long*/[] ppvObject = new int /*long*/[1]; if (objIUnknown.QueryInterface(COM.IIDIConnectionPointContainer, ppvObject) == COM.S_OK) { IConnectionPointContainer cpc = new IConnectionPointContainer(ppvObject[0]); if (cpc.FindConnectionPoint(eventGuid, ppvObject) == COM.S_OK) { @@ -93,7 +94,7 @@ private void disposeCOMInterfaces() { iDispatch = null; } -private int Invoke(int dispIdMember, int riid, int lcid, int dwFlags, int pDispParams, int pVarResult, int pExcepInfo, int pArgErr) +private int Invoke(int dispIdMember, int /*long*/ riid, int lcid, int dwFlags, int /*long*/ pDispParams, int /*long*/ pVarResult, int /*long*/ pExcepInfo, int /*long*/ pArgErr) { if (eventTable == null || !eventTable.hooks(dispIdMember)) return COM.S_OK; @@ -104,8 +105,8 @@ private int Invoke(int dispIdMember, int riid, int lcid, int dwFlags, int pDispP DISPPARAMS dispParams = new DISPPARAMS(); COM.MoveMemory(dispParams, pDispParams, DISPPARAMS.sizeof); eventInfo = new Variant[dispParams.cArgs]; - int size = Variant.sizeof; - int offset = (dispParams.cArgs - 1) * size; + int size = VARIANT.sizeof; + int /*long*/ offset = (dispParams.cArgs - 1) * size; for (int j = 0; j < dispParams.cArgs; j++){ eventInfo[j] = new Variant(); @@ -143,7 +144,7 @@ private void notifyListener (int eventType, OleEvent event) { event.widget = widget; eventTable.sendEvent (event); } -private int QueryInterface(int riid, int ppvObject) { +private int QueryInterface(int /*long*/ riid, int /*long*/ ppvObject) { if (riid == 0 || ppvObject == 0) return COM.E_INVALIDARG; @@ -152,12 +153,12 @@ private int QueryInterface(int riid, int ppvObject) { if ( COM.IsEqualGUID(guid, COM.IIDIUnknown) || COM.IsEqualGUID(guid, COM.IIDIDispatch) || COM.IsEqualGUID(guid, eventGuid)) { - COM.MoveMemory(ppvObject, new int[] {iDispatch.getAddress()}, 4); + COM.MoveMemory(ppvObject, new int /*long*/[] {iDispatch.getAddress()}, OS.PTR_SIZEOF); AddRef(); return OLE.S_OK; } - COM.MoveMemory(ppvObject, new int[] {0}, 4); + COM.MoveMemory(ppvObject, new int /*long*/[] {0}, OS.PTR_SIZEOF); return COM.E_NOINTERFACE; } int Release() { diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleFrame.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleFrame.java index 33868e213e..8064d73493 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleFrame.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleFrame.java @@ -130,9 +130,9 @@ private static void initCheckFocus (final Display display) { public void run() { if (lastFocus[0] instanceof OleClientSite && !lastFocus[0].isDisposed()) { // ignore popup menus and dialogs - int hwnd = OS.GetFocus(); + int /*long*/ hwnd = OS.GetFocus(); while (hwnd != 0) { - int ownerHwnd = OS.GetWindow(hwnd, OS.GW_OWNER); + int /*long*/ ownerHwnd = OS.GetWindow(hwnd, OS.GW_OWNER); if (ownerHwnd != 0) { display.timerExec(time, timer[0]); return; @@ -165,15 +165,15 @@ private static void initCheckFocus (final Display display) { private static void initMsgHook(Display display) { if (display.getData(HHOOK) != null) return; final Callback callback = new Callback(OleFrame.class, "getMsgProc", 3); //$NON-NLS-1$ - int address = callback.getAddress(); + int /*long*/ address = callback.getAddress(); if (address == 0) SWT.error(SWT.ERROR_NO_MORE_CALLBACKS); int threadId = OS.GetCurrentThreadId(); - final int hHook = OS.SetWindowsHookEx(OS.WH_GETMESSAGE, address, 0, threadId); + final int /*long*/ hHook = OS.SetWindowsHookEx(OS.WH_GETMESSAGE, address, 0, threadId); if (hHook == 0) { callback.dispose(); return; } - display.setData(HHOOK, new Integer(hHook)); + display.setData(HHOOK, new LONG(hHook)); display.setData(HHOOKMSG, new MSG()); display.disposeExec(new Runnable() { public void run() { @@ -182,13 +182,13 @@ private static void initMsgHook(Display display) { } }); } -static int getMsgProc(int code, int wParam, int lParam) { +static int /*long*/ getMsgProc(int /*long*/ code, int /*long*/ wParam, int /*long*/ lParam) { Display display = Display.getCurrent(); if (display == null) return 0; - Integer hHook = (Integer)display.getData(HHOOK); + LONG hHook = (LONG)display.getData(HHOOK); if (hHook == null) return 0; if (code < 0) { - return OS.CallNextHookEx(hHook.intValue(), code, wParam, lParam); + return OS.CallNextHookEx(hHook.value, (int)/*64*/code, wParam, lParam); } MSG msg = (MSG)display.getData(HHOOKMSG); OS.MoveMemory(msg, lParam, MSG.sizeof); @@ -196,7 +196,7 @@ static int getMsgProc(int code, int wParam, int lParam) { if (OS.WM_KEYFIRST <= message && message <= OS.WM_KEYLAST) { if (display != null) { Widget widget = null; - int hwnd = msg.hwnd; + int /*long*/ hwnd = msg.hwnd; while (hwnd != 0) { widget = display.findWidget (hwnd); if (widget != null) break; @@ -224,7 +224,7 @@ static int getMsgProc(int code, int wParam, int lParam) { case OS.WM_KEYDOWN: case OS.WM_SYSKEYDOWN: { if (!OS.IsWinCE) { - switch (msg.wParam) { + switch ((int)/*64*/msg.wParam) { case OS.VK_SHIFT: case OS.VK_MENU: case OS.VK_CONTROL: @@ -238,7 +238,7 @@ static int getMsgProc(int code, int wParam, int lParam) { * Windows NT is bit 32 while the high bit on Windows 95 is bit 16. * They should both be bit 32. The fix is to test the right bit. */ - int mapKey = OS.MapVirtualKey (msg.wParam, 2); + int mapKey = OS.MapVirtualKey ((int)/*64*/msg.wParam, 2); if (mapKey != 0) { accentKey = (mapKey & (OS.IsWinNT ? 0x80000000 : 0x8000)) != 0; if (!accentKey) { @@ -265,7 +265,7 @@ static int getMsgProc(int code, int wParam, int lParam) { } /* Allow OleClientSite to process key events before activeX control */ if (!consumed && !accentKey && !ignoreNextKey) { - int hwndOld = msg.hwnd; + int /*long*/ hwndOld = msg.hwnd; msg.hwnd = site.handle; consumed = OS.DispatchMessage (msg) == 1; msg.hwnd = hwndOld; @@ -273,7 +273,7 @@ static int getMsgProc(int code, int wParam, int lParam) { switch (msg.message) { case OS.WM_KEYDOWN: case OS.WM_SYSKEYDOWN: { - switch (msg.wParam) { + switch ((int)/*64*/msg.wParam) { case OS.VK_SHIFT: case OS.VK_MENU: case OS.VK_CONTROL: @@ -301,7 +301,7 @@ static int getMsgProc(int code, int wParam, int lParam) { } } } - return OS.CallNextHookEx(hHook.intValue(), code, wParam, lParam); + return OS.CallNextHookEx(hHook.value, (int)/*64*/code, wParam, lParam); } /** * Increment the count of references to this instance @@ -318,27 +318,27 @@ private int ContextSensitiveHelp(int fEnterMode) { private void createCOMInterfaces() { // Create each of the interfaces that this object implements iUnknown = new COMObject(new int[]{2, 0, 0}){ - public int method0(int[] args) {return QueryInterface(args[0], args[1]);} - public int method1(int[] args) {return AddRef();} - public int method2(int[] args) {return Release();} + 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();} }; iOleInPlaceFrame = new COMObject(new int[]{2, 0, 0, 1, 1, 1, 1, 1, 2, 2, 3, 1, 1, 1, 2}){ - public int method0(int[] args) {return QueryInterface(args[0], args[1]);} - public int method1(int[] args) {return AddRef();} - public int method2(int[] args) {return Release();} - public int method3(int[] args) {return GetWindow(args[0]);} - public int method4(int[] args) {return ContextSensitiveHelp(args[0]);} - public int method5(int[] args) {return GetBorder(args[0]);} - public int method6(int[] args) {return RequestBorderSpace(args[0]);} - public int method7(int[] args) {return SetBorderSpace(args[0]);} - public int method8(int[] args) {return SetActiveObject(args[0], args[1]);} - public int method9(int[] args) {return InsertMenus(args[0], args[1]);} - public int method10(int[] args) {return SetMenu(args[0], args[1], args[2]);} - public int method11(int[] args) {return RemoveMenus(args[0]);} + public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);} + public int /*long*/ method1(int /*long*/[] args) {return AddRef();} + public int /*long*/ method2(int /*long*/[] args) {return Release();} + public int /*long*/ method3(int /*long*/[] args) {return GetWindow(args[0]);} + public int /*long*/ method4(int /*long*/[] args) {return ContextSensitiveHelp((int)/*64*/args[0]);} + public int /*long*/ method5(int /*long*/[] args) {return GetBorder(args[0]);} + public int /*long*/ method6(int /*long*/[] args) {return RequestBorderSpace(args[0]);} + public int /*long*/ method7(int /*long*/[] args) {return SetBorderSpace(args[0]);} + public int /*long*/ method8(int /*long*/[] args) {return SetActiveObject(args[0], args[1]);} + public int /*long*/ method9(int /*long*/[] args) {return InsertMenus(args[0], args[1]);} + public int /*long*/ method10(int /*long*/[] args) {return SetMenu(args[0], args[1], args[2]);} + public int /*long*/ method11(int /*long*/[] args) {return RemoveMenus(args[0]);} // method12 SetStatusText - not implemented // method13 EnableModeless - not implemented - public int method14(int[] args) {return TranslateAccelerator(args[0], args[1]);} + public int /*long*/ method14(int /*long*/[] args) {return TranslateAccelerator(args[0], (int)/*64*/args[1]);} }; } private void disposeCOMInterfaces () { @@ -351,7 +351,7 @@ private void disposeCOMInterfaces () { iOleInPlaceFrame.dispose(); iOleInPlaceFrame = null; } -private int GetBorder(int lprectBorder) { +private int GetBorder(int /*long*/ lprectBorder) { /* The IOleInPlaceUIWindow::GetBorder function, when called on a document or frame window object, returns the outer rectangle (relative to the window) where the object can put @@ -400,11 +400,12 @@ public MenuItem[] getContainerMenus(){ public MenuItem[] getFileMenus(){ return fileMenuItems; } -int getIOleInPlaceFrame() { +int /*long*/ getIOleInPlaceFrame() { return iOleInPlaceFrame.getAddress(); } -private int getMenuItemID(int hMenu, int index) { - int id = 0; +//TODO - should ids be long +private int /*long*/ getMenuItemID(int /*long*/ hMenu, int index) { + int /*long*/ id = 0; MENUITEMINFO lpmii = new MENUITEMINFO(); lpmii.cbSize = MENUITEMINFO.sizeof; lpmii.fMask = OS.MIIM_STATE | OS.MIIM_SUBMENU | OS.MIIM_ID; @@ -416,9 +417,9 @@ private int getMenuItemID(int hMenu, int index) { } return id; } -private int GetWindow(int phwnd) { +private int GetWindow(int /*long*/ phwnd) { if (phwnd != 0) { - COM.MoveMemory(phwnd, new int[] {handle}, 4); + COM.MoveMemory(phwnd, new int /*long*/[] {handle}, OS.PTR_SIZEOF); } return COM.S_OK; } @@ -440,22 +441,22 @@ private int GetWindow(int phwnd) { public MenuItem[] getWindowMenus(){ return windowMenuItems; } -private int InsertMenus(int hmenuShared, int lpMenuWidths) { +private int InsertMenus(int /*long*/ hmenuShared, int /*long*/ lpMenuWidths) { // locate menu bar Menu menubar = getShell().getMenuBar(); if (menubar == null || menubar.isDisposed()) { COM.MoveMemory(lpMenuWidths, new int[] {0}, 4); return COM.S_OK; } - int hMenu = menubar.handle; + int /*long*/ hMenu = menubar.handle; // Create a holder for menu information. This will be passed down to // the OS and the OS will fill in the requested information for each menu. MENUITEMINFO lpmii = new MENUITEMINFO(); - int hHeap = OS.GetProcessHeap(); + int /*long*/ hHeap = OS.GetProcessHeap(); int cch = 128; int byteCount = cch * TCHAR.sizeof; - int pszText = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, byteCount); + int /*long*/ pszText = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, byteCount); lpmii.cbSize = MENUITEMINFO.sizeof; lpmii.fMask = OS.MIIM_STATE | OS.MIIM_ID | OS.MIIM_TYPE | OS.MIIM_SUBMENU | OS.MIIM_DATA; lpmii.dwTypeData = pszText; @@ -577,19 +578,19 @@ private void onResize(Event e) { objIOleInPlaceActiveObject.ResizeBorder(lpRect, iOleInPlaceFrame.getAddress(), true); } } -private int QueryInterface(int riid, int ppvObject) { +private int QueryInterface(int /*long*/ riid, int /*long*/ ppvObject) { // implements IUnknown, IOleInPlaceFrame, IOleContainer, IOleInPlaceUIWindow 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.IIDIOleInPlaceFrame) ) { - COM.MoveMemory(ppvObject, new int[] {iOleInPlaceFrame.getAddress()}, 4); + COM.MoveMemory(ppvObject, new int /*long*/ [] {iOleInPlaceFrame.getAddress()}, OS.PTR_SIZEOF); AddRef(); return COM.S_OK; } - COM.MoveMemory(ppvObject, new int[] {0}, 4); + COM.MoveMemory(ppvObject, new int /*long*/ [] {0}, OS.PTR_SIZEOF); return COM.E_NOINTERFACE; } /** @@ -611,12 +612,12 @@ private void releaseObjectInterfaces() { } objIOleInPlaceActiveObject = null; } -private int RemoveMenus(int hmenuShared) { +private int RemoveMenus(int /*long*/ hmenuShared) { Menu menubar = getShell().getMenuBar(); if (menubar == null || menubar.isDisposed()) return COM.S_FALSE; - int hMenu = menubar.handle; + int /*long*/ hMenu = menubar.handle; Vector ids = new Vector(); if (this.fileMenuItems != null) { @@ -625,8 +626,8 @@ private int RemoveMenus(int hmenuShared) { if (item != null && !item.isDisposed()) { int index = item.getParent().indexOf(item); // get Id from original menubar - int id = getMenuItemID(hMenu, index); - ids.addElement(new Integer(id)); + int /*long*/ id = getMenuItemID(hMenu, index); + ids.addElement(new LONG(id)); } } } @@ -635,8 +636,8 @@ private int RemoveMenus(int hmenuShared) { MenuItem item = this.containerMenuItems[i]; if (item != null && !item.isDisposed()) { int index = item.getParent().indexOf(item); - int id = getMenuItemID(hMenu, index); - ids.addElement(new Integer(id)); + int /*long*/ id = getMenuItemID(hMenu, index); + ids.addElement(new LONG(id)); } } } @@ -645,24 +646,24 @@ private int RemoveMenus(int hmenuShared) { MenuItem item = this.windowMenuItems[i]; if (item != null && !item.isDisposed()) { int index = item.getParent().indexOf(item); - int id = getMenuItemID(hMenu, index); - ids.addElement(new Integer(id)); + int /*long*/ id = getMenuItemID(hMenu, index); + ids.addElement(new LONG(id)); } } } int index = OS.GetMenuItemCount(hmenuShared) - 1; for (int i = index; i >= 0; i--) { - int id = getMenuItemID(hmenuShared, i); - if (ids.contains(new Integer(id))){ + int /*long*/ id = getMenuItemID(hmenuShared, i); + if (ids.contains(new LONG(id))){ OS.RemoveMenu(hmenuShared, i, OS.MF_BYPOSITION); } } return COM.S_OK; } -private int RequestBorderSpace(int pborderwidths) { +private int RequestBorderSpace(int /*long*/ pborderwidths) { return COM.S_OK; } -int SetActiveObject(int pActiveObject, int pszObjName) { +int SetActiveObject(int /*long*/ pActiveObject, int /*long*/ pszObjName) { if (objIOleInPlaceActiveObject != null) { objIOleInPlaceActiveObject.Release(); objIOleInPlaceActiveObject = null; @@ -674,7 +675,7 @@ int SetActiveObject(int pActiveObject, int pszObjName) { return COM.S_OK; } -private int SetBorderSpace(int pborderwidths) { +private int SetBorderSpace(int /*long*/ pborderwidths) { // A Control/Document can : // Use its own toolbars, requesting border space of a specific size, or, // Use no toolbars, but force the container to remove its toolbars by passing a @@ -742,8 +743,8 @@ void setCurrentDocument(OleClientSite doc) { public void setFileMenus(MenuItem[] fileMenus){ fileMenuItems = fileMenus; } -private int SetMenu(int hmenuShared, int holemenu, int hwndActiveObject) { - int inPlaceActiveObject = 0; +private int SetMenu(int /*long*/ hmenuShared, int /*long*/ holemenu, int /*long*/ hwndActiveObject) { + int /*long*/ inPlaceActiveObject = 0; if (objIOleInPlaceActiveObject != null) inPlaceActiveObject = objIOleInPlaceActiveObject.getAddress(); @@ -752,7 +753,7 @@ private int SetMenu(int hmenuShared, int holemenu, int hwndActiveObject) { return COM.OleSetMenuDescriptor(0, getShell().handle, hwndActiveObject, iOleInPlaceFrame.getAddress(), inPlaceActiveObject); } - int handle = menubar.getShell().handle; + int /*long*/ handle = menubar.getShell().handle; if (hmenuShared == 0 && holemenu == 0) { // re-instate the original menu - this occurs on deactivation @@ -790,14 +791,14 @@ private boolean translateOleAccelerator(MSG msg) { int result = objIOleInPlaceActiveObject.TranslateAccelerator(msg); return (result != COM.S_FALSE && result != COM.E_NOTIMPL); } -private int TranslateAccelerator(int lpmsg, int wID){ +private int TranslateAccelerator(int /*long*/ lpmsg, int wID){ Menu menubar = getShell().getMenuBar(); if (menubar == null || menubar.isDisposed() || !menubar.isEnabled()) return COM.S_FALSE; if (wID < 0) return COM.S_FALSE; Shell shell = menubar.getShell(); - int hwnd = shell.handle; - int hAccel = OS.SendMessage(hwnd, OS.WM_APP+1, 0, 0); + int /*long*/ hwnd = shell.handle; + int /*long*/ hAccel = OS.SendMessage(hwnd, OS.WM_APP+1, 0, 0); if (hAccel == 0) return COM.S_FALSE; MSG msg = new MSG(); diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OlePropertyChangeSink.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OlePropertyChangeSink.java index 329a9fc15a..134bad1416 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OlePropertyChangeSink.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OlePropertyChangeSink.java @@ -12,6 +12,7 @@ package org.eclipse.swt.ole.win32; import org.eclipse.swt.internal.ole.win32.*; +import org.eclipse.swt.internal.win32.*; import org.eclipse.swt.*; final class OlePropertyChangeSink { @@ -46,7 +47,7 @@ int AddRef() { void connect(IUnknown objIUnknown) { // Set up property change notification sink - int[] ppvObject = new int[1]; + int /*long*/[] ppvObject = new int /*long*/[1]; if (objIUnknown.QueryInterface(COM.IIDIConnectionPointContainer, ppvObject) == COM.S_OK) { IConnectionPointContainer cpc = new IConnectionPointContainer(ppvObject[0]); if (cpc.FindConnectionPoint(COM.IIDIPropertyNotifySink, ppvObject) == COM.S_OK) { @@ -63,24 +64,24 @@ void connect(IUnknown objIUnknown) { private void createCOMInterfaces() { // register each of the interfaces that this object implements iUnknown = new COMObject(new int[]{2, 0, 0}){ - public int method0(int[] args) {return QueryInterface(args[0], args[1]);} - public int method1(int[] args) {return AddRef();} - public int method2(int[] args) {return Release();} + 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();} }; iPropertyNotifySink = new COMObject(new int[]{2, 0, 0, 1, 1}){ - public int method0(int[] args) {return QueryInterface(args[0], args[1]);} - public int method1(int[] args) {return AddRef();} - public int method2(int[] args) {return Release();} - public int method3(int[] args) {return OnChanged(args[0]);} - public int method4(int[] args) {return OnRequestEdit(args[0]);} + public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);} + public int /*long*/ method1(int /*long*/[] args) {return AddRef();} + public int /*long*/ method2(int /*long*/[] args) {return Release();} + public int /*long*/ method3(int /*long*/[] args) {return OnChanged((int)/*64*/args[0]);} + public int /*long*/ method4(int /*long*/[] args) {return OnRequestEdit((int)/*64*/args[0]);} }; } void disconnect(IUnknown objIUnknown) { // disconnect property notification sink if (propertyCookie != 0 && objIUnknown != null) { - int[] ppvObject = new int[1]; + int /*long*/[] ppvObject = new int /*long*/[1]; if (objIUnknown.QueryInterface(COM.IIDIConnectionPointContainer, ppvObject) == COM.S_OK) { IConnectionPointContainer cpc = new IConnectionPointContainer(ppvObject[0]); if (cpc.FindConnectionPoint(COM.IIDIPropertyNotifySink, ppvObject) == COM.S_OK) { @@ -139,22 +140,22 @@ private int OnRequestEdit(int dispID) { notifyListener(dispID,event); return (event.doit) ? COM.S_OK : COM.S_FALSE; } -private int QueryInterface(int riid, int ppvObject) { +private int QueryInterface(int /*long*/ riid, int /*long*/ 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.MoveMemory(ppvObject, new int[] {iUnknown.getAddress()}, 4); + COM.MoveMemory(ppvObject, new int /*long*/[] {iUnknown.getAddress()}, OS.PTR_SIZEOF); AddRef(); return COM.S_OK; } if (COM.IsEqualGUID(guid, COM.IIDIPropertyNotifySink)) { - COM.MoveMemory(ppvObject, new int[] {iPropertyNotifySink.getAddress()}, 4); + COM.MoveMemory(ppvObject, new int /*long*/[] {iPropertyNotifySink.getAddress()}, OS.PTR_SIZEOF); AddRef(); return COM.S_OK; } - COM.MoveMemory(ppvObject, new int[] {0}, 4); + COM.MoveMemory(ppvObject, new int /*long*/[] {0}, OS.PTR_SIZEOF); return COM.E_NOINTERFACE; } int Release() { diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/Variant.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/Variant.java index d0c7d377ed..e118ff03af 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/Variant.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/Variant.java @@ -23,14 +23,6 @@ import org.eclipse.swt.internal.win32.*; */ public final class Variant { - /** - * A variant always takes up 16 bytes, no matter what you - * store in it. Objects, strings, and arrays are not physically - * stored in the Variant; in these cases, four bytes of the - * Variant are used to hold either an object reference, or a - * pointer to the string or array. The actual data are stored elsewhere. - */ - public static final int sizeof = 16; private short type; // OLE.VT_* type private boolean booleanData; @@ -42,7 +34,7 @@ public final class Variant private float floatData; private double doubleData; private String stringData; - private int byRefPtr; + private int /*long*/ byRefPtr; private IDispatch dispatchData; private IUnknown unknownData; @@ -62,7 +54,7 @@ public final class Variant * * @since 3.3 */ -public static void win32_copy (int pVarDest, Variant varSrc) { +public static void win32_copy (int /*long*/ pVarDest, Variant varSrc) { varSrc.getData (pVarDest); } @@ -83,7 +75,7 @@ public static void win32_copy (int pVarDest, Variant varSrc) { * * @since 3.3 */ -public static Variant win32_new (int pVariant) { +public static Variant win32_new (int /*long*/ pVariant) { Variant variant = new Variant (); variant.setData (pVariant); return variant; @@ -141,7 +133,7 @@ public Variant(double val) { * @param byRefType the type of the data being transferred such as OLE.VT_BSTR | OLE.VT_BYREF * */ -public Variant(int ptr, short byRefType) { +public Variant(int /*long*/ ptr, short byRefType) { type = byRefType; byRefPtr = ptr; } @@ -268,8 +260,8 @@ public OleAutomation getAutomation() { return new OleAutomation(dispatchData); } // try to coerce the value to the desired type - int oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); - int newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + int /*long*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, VARIANT.sizeof); + int /*long*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, VARIANT.sizeof); try { getData(oldPtr); int result = COM.VariantChangeType(newPtr, oldPtr, (short) 0, COM.VT_DISPATCH); @@ -311,8 +303,8 @@ public IDispatch getDispatch() { return dispatchData; } // try to coerce the value to the desired type - int oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); - int newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + int /*long*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, VARIANT.sizeof); + int /*long*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, VARIANT.sizeof); try { getData(oldPtr); int result = COM.VariantChangeType(newPtr, oldPtr, (short) 0, COM.VT_DISPATCH); @@ -353,8 +345,8 @@ public boolean getBoolean() { } // try to coerce the value to the desired type - int oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); - int newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + int /*long*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, VARIANT.sizeof); + int /*long*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, VARIANT.sizeof); try { getData(oldPtr); int result = COM.VariantChangeType(newPtr, oldPtr, (short) 0, COM.VT_BOOL); @@ -378,7 +370,7 @@ public boolean getBoolean() { * @return a pointer to the referenced data represented by this Variant or 0 * */ -public int getByRef() { +public int /*long*/ getByRef() { if (type == COM.VT_EMPTY) { OLE.error(OLE.ERROR_CANNOT_CHANGE_VARIANT_TYPE, -1); } @@ -411,8 +403,8 @@ public byte getByte() { } // try to coerce the value to the desired type - int oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); - int newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + int /*long*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, VARIANT.sizeof); + int /*long*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, VARIANT.sizeof); try { getData(oldPtr); int result = COM.VariantChangeType(newPtr, oldPtr, (short) 0, COM.VT_I1); @@ -451,8 +443,8 @@ public char getChar() { } // try to coerce the value to the desired type - int oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); - int newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + int /*long*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, VARIANT.sizeof); + int /*long*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, VARIANT.sizeof); try { getData(oldPtr); int result = COM.VariantChangeType(newPtr, oldPtr, (short) 0, COM.VT_UI2); @@ -468,14 +460,15 @@ public char getChar() { OS.GlobalFree(newPtr); } } -void getData(int pData){ +void getData(int /*long*/ pData){ if (pData == 0) OLE.error(OLE.ERROR_OUT_OF_MEMORY); COM.VariantInit(pData); if ((type & COM.VT_BYREF) == COM.VT_BYREF) { + //TODO - use VARIANT structure COM.MoveMemory(pData, new short[] {type}, 2); - COM.MoveMemory(pData + 8, new int[]{byRefPtr}, 4); + COM.MoveMemory(pData + 8, new int /*long*/[]{byRefPtr}, OS.PTR_SIZEOF); return; } @@ -486,7 +479,7 @@ void getData(int pData){ break; case COM.VT_BOOL : COM.MoveMemory(pData, new short[] {type}, 2); - COM.MoveMemory(pData + 8, new int[]{(booleanData) ? COM.VARIANT_TRUE : COM.VARIANT_FALSE}, 2); + COM.MoveMemory(pData + 8, new short[]{(booleanData) ? COM.VARIANT_TRUE : COM.VARIANT_FALSE}, 2); break; case COM.VT_I1 : COM.MoveMemory(pData, new short[] {type}, 2); @@ -519,18 +512,18 @@ void getData(int pData){ case COM.VT_DISPATCH : dispatchData.AddRef(); COM.MoveMemory(pData, new short[] {type}, 2); - COM.MoveMemory(pData + 8, new int[]{dispatchData.getAddress()}, 4); + COM.MoveMemory(pData + 8, new int /*long*/[]{dispatchData.getAddress()}, OS.PTR_SIZEOF); break; case COM.VT_UNKNOWN : unknownData.AddRef(); COM.MoveMemory(pData, new short[] {type}, 2); - COM.MoveMemory(pData + 8, new int[]{unknownData.getAddress()}, 4); + COM.MoveMemory(pData + 8, new int /*long*/[]{unknownData.getAddress()}, OS.PTR_SIZEOF); break; case COM.VT_BSTR : COM.MoveMemory(pData, new short[] {type}, 2); char[] data = (stringData+"\0").toCharArray(); - int ptr = COM.SysAllocString(data); - COM.MoveMemory(pData + 8, new int[] {ptr}, 4); + int /*long*/ ptr = COM.SysAllocString(data); + COM.MoveMemory(pData + 8, new int /*long*/[] {ptr}, OS.PTR_SIZEOF); break; default : @@ -560,8 +553,8 @@ public double getDouble() { } // try to coerce the value to the desired type - int oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); - int newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + int /*long*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, VARIANT.sizeof); + int /*long*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, VARIANT.sizeof); try { getData(oldPtr); int result = COM.VariantChangeType(newPtr, oldPtr, (short) 0, COM.VT_R8); @@ -599,8 +592,8 @@ public float getFloat() { } // try to coerce the value to the desired type - int oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); - int newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + int /*long*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, VARIANT.sizeof); + int /*long*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, VARIANT.sizeof); try { getData(oldPtr); int result = COM.VariantChangeType(newPtr, oldPtr, (short) 0, COM.VT_R4); @@ -638,8 +631,8 @@ public int getInt() { } // try to coerce the value to the desired type - int oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); - int newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + int /*long*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, VARIANT.sizeof); + int /*long*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, VARIANT.sizeof); try { getData(oldPtr); int result = COM.VariantChangeType(newPtr, oldPtr, (short) 0, COM.VT_I4); @@ -678,8 +671,8 @@ public long getLong() { } // try to coerce the value to the desired type - int oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); - int newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + int /*long*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, VARIANT.sizeof); + int /*long*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, VARIANT.sizeof); try { getData(oldPtr); int result = COM.VariantChangeType(newPtr, oldPtr, (short) 0, COM.VT_I8); @@ -716,8 +709,8 @@ public short getShort() { } // try to coerce the value to the desired type - int oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); - int newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + int /*long*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, VARIANT.sizeof); + int /*long*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, VARIANT.sizeof); try { getData(oldPtr); int result = COM.VariantChangeType(newPtr, oldPtr, (short) 0, COM.VT_I2); @@ -755,8 +748,8 @@ public String getString() { } // try to coerce the value to the desired type - int oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); - int newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + int /*long*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, VARIANT.sizeof); + int /*long*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, VARIANT.sizeof); try { getData(oldPtr); int result = COM.VariantChangeType(newPtr, oldPtr, (short) 0, COM.VT_BSTR); @@ -809,8 +802,8 @@ public IUnknown getUnknown() { } // try to coerce the value to the desired type - int oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); - int newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + int /*long*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, VARIANT.sizeof); + int /*long*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, VARIANT.sizeof); try { getData(oldPtr); int result = COM.VariantChangeType(newPtr, oldPtr, (short) 0, COM.VT_UNKNOWN); @@ -876,11 +869,11 @@ public void setByRef(float val) { * * @since 2.1 */ -public void setByRef(int val) { +public void setByRef(int /*long*/ val) { if ((type & COM.VT_BYREF) == 0 || (type & COM.VT_I4) == 0) { OLE.error(OLE.ERROR_CANNOT_CHANGE_VARIANT_TYPE); } - COM.MoveMemory(byRefPtr, new int[]{val}, 4); + COM.MoveMemory(byRefPtr, new int /*long*/[]{val}, OS.PTR_SIZEOF); } /** * Update the by reference value of this variant with a new short value. @@ -900,16 +893,17 @@ public void setByRef(short val) { COM.MoveMemory(byRefPtr, new short[]{val}, 2); } -void setData(int pData){ +void setData(int /*long*/ pData){ if (pData == 0) OLE.error(OLE.ERROR_INVALID_ARGUMENT); + //TODO - use VARIANT structure short[] dataType = new short[1]; COM.MoveMemory(dataType, pData, 2); type = dataType[0]; if ((type & COM.VT_BYREF) == COM.VT_BYREF) { - int[] newByRefPtr = new int[1]; - OS.MoveMemory(newByRefPtr, pData + 8, 4); + int /*long*/[] newByRefPtr = new int /*long*/[1]; + OS.MoveMemory(newByRefPtr, pData + 8, OS.PTR_SIZEOF); byRefPtr = newByRefPtr[0]; return; } @@ -959,8 +953,8 @@ void setData(int pData){ doubleData = newDoubleData[0]; break; case COM.VT_DISPATCH : { - int[] ppvObject = new int[1]; - OS.MoveMemory(ppvObject, pData + 8, 4); + int /*long*/[] ppvObject = new int /*long*/[1]; + OS.MoveMemory(ppvObject, pData + 8, OS.PTR_SIZEOF); if (ppvObject[0] == 0) { type = COM.VT_EMPTY; break; @@ -970,8 +964,8 @@ void setData(int pData){ break; } case COM.VT_UNKNOWN : { - int[] ppvObject = new int[1]; - OS.MoveMemory(ppvObject, pData + 8, 4); + int /*long*/[] ppvObject = new int /*long*/[1]; + OS.MoveMemory(ppvObject, pData + 8, OS.PTR_SIZEOF); if (ppvObject[0] == 0) { type = COM.VT_EMPTY; break; @@ -982,8 +976,8 @@ void setData(int pData){ } case COM.VT_BSTR : // get the address of the memory in which the string resides - int[] hMem = new int[1]; - OS.MoveMemory(hMem, pData + 8, 4); + int /*long*/[] hMem = new int /*long*/[1]; + OS.MoveMemory(hMem, pData + 8, OS.PTR_SIZEOF); if (hMem[0] == 0) { type = COM.VT_EMPTY; break; @@ -1003,7 +997,7 @@ void setData(int pData){ default : // try coercing it into one of the known forms - int newPData = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, Variant.sizeof); + int /*long*/ newPData = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, VARIANT.sizeof); if (COM.VariantChangeType(newPData, pData, (short) 0, COM.VT_R4) == COM.S_OK) { setData(newPData); } else if (COM.VariantChangeType(newPData, pData, (short) 0, COM.VT_I4) == COM.S_OK) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/org/eclipse/swt/internal/opengl/win32/WGL.java b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/org/eclipse/swt/internal/opengl/win32/WGL.java index f93088fe72..c11f810d1c 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/org/eclipse/swt/internal/opengl/win32/WGL.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/org/eclipse/swt/internal/opengl/win32/WGL.java @@ -98,23 +98,23 @@ public class WGL extends Platform { public static final int PFD_DOUBLEBUFFER_DONTCARE = 0x40000000; public static final int PFD_STEREO_DONTCARE = 0x80000000; -public static final native int ChoosePixelFormat(int hdc, PIXELFORMATDESCRIPTOR ppfd); -public static final native int DescribePixelFormat(int hdc, int iPixelFormat, int nBytes, PIXELFORMATDESCRIPTOR ppfd); -public static final native int GetPixelFormat(int hdc); -public static final native boolean SetPixelFormat(int hdc, int iPixelFormat, PIXELFORMATDESCRIPTOR ppfd); -public static final native boolean SwapBuffers(int hdc); -public static final native boolean wglCopyContext(int hglrcSrc, int hglrcDst, int mask); -public static final native int wglCreateContext(int hdc); -public static final native int wglCreateLayerContext(int hdc, int iLayerPlane); -public static final native boolean wglDeleteContext(int hglrc); -public static final native int wglGetCurrentContext(); -public static final native int wglGetCurrentDC(); -public static final native int wglGetProcAddress(byte[] lpszProc); -public static final native boolean wglMakeCurrent(int hdc, int hglrc); -public static final native boolean wglShareLists(int hglrc1, int hglrc2); -public static final native boolean wglDescribeLayerPlane(int hdc, int iPixelFormat, int iLayerPlane, int nBytes, LAYERPLANEDESCRIPTOR plpd); -public static final native int wglSetLayerPaletteEntries(int hdc, int iLayerPlane, int iStart, int cEntries, int[] pcr); -public static final native int wglGetLayerPaletteEntries(int hdc, int iLayerPlane, int iStart, int cEntries, int[] pcr); -public static final native boolean wglRealizeLayerPalette(int hdc, int iLayerPlane, boolean bRealize); -public static final native boolean wglSwapLayerBuffers(int hdc, int fuPlanes); +public static final native int ChoosePixelFormat(int /*long*/ hdc, PIXELFORMATDESCRIPTOR ppfd); +public static final native int DescribePixelFormat(int /*long*/ hdc, int iPixelFormat, int nBytes, PIXELFORMATDESCRIPTOR ppfd); +public static final native int GetPixelFormat(int /*long*/ hdc); +public static final native boolean SetPixelFormat(int /*long*/ hdc, int iPixelFormat, PIXELFORMATDESCRIPTOR ppfd); +public static final native boolean SwapBuffers(int /*long*/ hdc); +public static final native boolean wglCopyContext(int /*long*/ hglrcSrc, int /*long*/ hglrcDst, int mask); +public static final native int /*long*/ wglCreateContext(int /*long*/ hdc); +public static final native int /*long*/ wglCreateLayerContext(int /*long*/ hdc, int iLayerPlane); +public static final native boolean wglDeleteContext(int /*long*/ hglrc); +public static final native int /*long*/ wglGetCurrentContext(); +public static final native int /*long*/ wglGetCurrentDC(); +public static final native int /*long*/ wglGetProcAddress(byte[] lpszProc); +public static final native boolean wglMakeCurrent(int /*long*/ hdc, int /*long*/ hglrc); +public static final native boolean wglShareLists(int /*long*/ hglrc1, int /*long*/ hglrc2); +public static final native boolean wglDescribeLayerPlane(int /*long*/ hdc, int iPixelFormat, int iLayerPlane, int nBytes, LAYERPLANEDESCRIPTOR plpd); +public static final native int wglSetLayerPaletteEntries(int /*long*/ hdc, int iLayerPlane, int iStart, int cEntries, int[] pcr); +public static final native int wglGetLayerPaletteEntries(int /*long*/ hdc, int iLayerPlane, int iStart, int cEntries, int[] pcr); +public static final native boolean wglRealizeLayerPalette(int /*long*/ hdc, int iLayerPlane, boolean bRealize); +public static final native boolean wglSwapLayerBuffers(int /*long*/ hdc, int fuPlanes); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/org/eclipse/swt/opengl/GLCanvas.java b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/org/eclipse/swt/opengl/GLCanvas.java index 98dc73639f..f5a644b6df 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/org/eclipse/swt/opengl/GLCanvas.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/org/eclipse/swt/opengl/GLCanvas.java @@ -22,7 +22,7 @@ import org.eclipse.swt.internal.opengl.win32.*; */ public class GLCanvas extends Canvas { - int context; + int /*long*/ context; int pixelFormat; /** @@ -71,7 +71,7 @@ public GLCanvas (Composite parent, int style, GLData data) { // wglAttrib [pos++] = data.samples; // } - int hDC = OS.GetDC (handle); + int /*long*/ hDC = OS.GetDC (handle); pixelFormat = WGL.ChoosePixelFormat (hDC, pfd); if (pixelFormat == 0 || !WGL.SetPixelFormat (hDC, pixelFormat, pfd)) { OS.ReleaseDC (handle, hDC); @@ -113,7 +113,7 @@ public GLData getGLData () { GLData data = new GLData (); PIXELFORMATDESCRIPTOR pfd = new PIXELFORMATDESCRIPTOR (); pfd.nSize = (short) PIXELFORMATDESCRIPTOR.sizeof; - int hDC = OS.GetDC (handle); + int /*long*/ hDC = OS.GetDC (handle); WGL.DescribePixelFormat (hDC, pixelFormat, PIXELFORMATDESCRIPTOR.sizeof, pfd); OS.ReleaseDC (handle, hDC); data.doubleBuffer = (pfd.dwFlags & WGL.PFD_DOUBLEBUFFER) != 0; @@ -159,7 +159,7 @@ public boolean isCurrent () { public void setCurrent () { checkWidget (); if (WGL.wglGetCurrentContext () == context) return; - int hDC = OS.GetDC (handle); + int /*long*/ hDC = OS.GetDC (handle); WGL.wglMakeCurrent (hDC, context); OS.ReleaseDC (handle, hDC); } @@ -174,7 +174,7 @@ public void setCurrent () { */ public void swapBuffers () { checkWidget (); - int hDC = OS.GetDC (handle); + int /*long*/ hDC = OS.GetDC (handle); WGL.SwapBuffers (hDC); OS.ReleaseDC (handle, hDC); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com.c index 1a0bb766a1..c1c66c420f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com.c @@ -287,6 +287,18 @@ fail: } #endif +#ifndef NO_ELEMDESC_1sizeof +JNIEXPORT jint JNICALL COM_NATIVE(ELEMDESC_1sizeof) + (JNIEnv *env, jclass that) +{ + jint rc = 0; + COM_NATIVE_ENTER(env, that, ELEMDESC_1sizeof_FUNC); + rc = (jint)ELEMDESC_sizeof(); + COM_NATIVE_EXIT(env, that, ELEMDESC_1sizeof_FUNC); + return rc; +} +#endif + #ifndef NO_EXCEPINFO_1sizeof JNIEXPORT jint JNICALL COM_NATIVE(EXCEPINFO_1sizeof) (JNIEnv *env, jclass that) @@ -1096,6 +1108,18 @@ JNIEXPORT jint JNICALL COM_NATIVE(TYPEATTR_1sizeof) } #endif +#ifndef NO_TYPEDESC_1sizeof +JNIEXPORT jint JNICALL COM_NATIVE(TYPEDESC_1sizeof) + (JNIEnv *env, jclass that) +{ + jint rc = 0; + COM_NATIVE_ENTER(env, that, TYPEDESC_1sizeof_FUNC); + rc = (jint)TYPEDESC_sizeof(); + COM_NATIVE_EXIT(env, that, TYPEDESC_1sizeof_FUNC); + return rc; +} +#endif + #ifndef NO_VARDESC_1sizeof JNIEXPORT jint JNICALL COM_NATIVE(VARDESC_1sizeof) (JNIEnv *env, jclass that) diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_custom.h b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_custom.h index 0991d1764b..386e4dc685 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_custom.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_custom.h @@ -9,6 +9,10 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ +/* Special sizeof's */ +#define ELEMDESC_sizeof() sizeof(ELEMDESC) +#define TYPEDESC_sizeof() sizeof(TYPEDESC) + /* Libraries for dynamic loaded functions */ #define AccessibleObjectFromWindow_LIB "oleacc.dll" #define CreateStdAccessibleObject_LIB "oleacc.dll" diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_stats.c index c18901c34a..7d9c32ff99 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_stats.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_stats.c @@ -14,8 +14,8 @@ #ifdef NATIVE_STATS -int COM_nativeFunctionCount = 152; -int COM_nativeFunctionCallCount[152]; +int COM_nativeFunctionCount = 154; +int COM_nativeFunctionCallCount[154]; char * COM_nativeFunctionNames[] = { "AccessibleObjectFromWindow", "CAUUID_1sizeof", @@ -33,6 +33,7 @@ char * COM_nativeFunctionNames[] = { "DISPPARAMS_1sizeof", "DVTARGETDEVICE_1sizeof", "DoDragDrop", + "ELEMDESC_1sizeof", "EXCEPINFO_1sizeof", "FORMATETC_1sizeof", "FUNCDESC_1sizeof", @@ -88,6 +89,7 @@ char * COM_nativeFunctionNames[] = { "SysFreeString", "SysStringByteLen", "TYPEATTR_1sizeof", + "TYPEDESC_1sizeof", "VARDESC_1sizeof", "VARIANT_1sizeof", "VariantChangeType", diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_stats.h index ca35bf3a5e..ab7a930649 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_stats.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_stats.h @@ -41,6 +41,7 @@ typedef enum { DISPPARAMS_1sizeof_FUNC, DVTARGETDEVICE_1sizeof_FUNC, DoDragDrop_FUNC, + ELEMDESC_1sizeof_FUNC, EXCEPINFO_1sizeof_FUNC, FORMATETC_1sizeof_FUNC, FUNCDESC_1sizeof_FUNC, @@ -96,6 +97,7 @@ typedef enum { SysFreeString_FUNC, SysStringByteLen_FUNC, TYPEATTR_1sizeof_FUNC, + TYPEDESC_1sizeof_FUNC, VARDESC_1sizeof_FUNC, VARIANT_1sizeof_FUNC, VariantChangeType_FUNC, diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_custom.cpp b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_custom.cpp index 26c6e9ff93..84ad6a02e7 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_custom.cpp +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_custom.cpp @@ -213,13 +213,13 @@ fail: #endif #ifndef NO_GraphicsPath_1new___3I_3BII -JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1new___3I_3BII) +JNIEXPORT SWT_PTR JNICALL Gdip_NATIVE(GraphicsPath_1new___3I_3BII) (JNIEnv *env, jclass that, jintArray arg0, jbyteArray arg1, jint arg2, jint arg3) { Point *points = NULL; jint *lparg0=NULL; jbyte *lparg1=NULL; - jint rc = 0; + SWT_PTR rc = 0; Gdip_NATIVE_ENTER(env, that, GraphicsPath_1new___3I_3BII_FUNC); if (arg0) if ((lparg0 = env->GetIntArrayElements(arg0, NULL)) == NULL) goto fail; if (lparg0) { @@ -231,7 +231,7 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1new___3I_3BII) } } if (arg1) if ((lparg1 = env->GetByteArrayElements(arg1, NULL)) == NULL) goto fail; - rc = (jint)new GraphicsPath(points, (BYTE *)lparg1, arg2, (FillMode)arg3); + rc = (SWT_PTR)new GraphicsPath(points, (BYTE *)lparg1, arg2, (FillMode)arg3); fail: if (arg1 && lparg1) env->ReleaseByteArrayElements(arg1, lparg1, 0); if (lparg0 && points) delete points; diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/javaw.exe.manifest b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/javaw.exe.manifest index 5e7beab28c..7fc7a03da2 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/javaw.exe.manifest +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/javaw.exe.manifest @@ -1 +1 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?><assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"><assemblyIdentity version="1.0.0.0" processorArchitecture="X86" name="SWT.javaw" type="win32"/><description>Standard Widget Toolkit</description><dependency><dependentAssembly><assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="X86" publicKeyToken="6595b64144ccf1df" language="*"/></dependentAssembly></dependency></assembly>
\ No newline at end of file +<?xml version="1.0" encoding="UTF-8" standalone="yes"?><assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"><assemblyIdentity version="1.0.0.0" processorArchitecture="*" name="SWT.javaw" type="win32"/><description>Standard Widget Toolkit</description><dependency><dependentAssembly><assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"/></dependentAssembly></dependency></assembly>
\ No newline at end of file diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.c index 43a1920d12..7d9205c122 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.c @@ -8632,6 +8632,20 @@ fail: } #endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTREEVIEW_2II +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTREEVIEW_2II) + (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2) +{ + NMTREEVIEW _arg0, *lparg0=NULL; + OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTREEVIEW_2II_FUNC); + if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; + MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); +fail: + if (arg0 && lparg0) setNMTREEVIEWFields(env, arg0, lparg0); + OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTREEVIEW_2II_FUNC); +} +#endif + #ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2II JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2II) (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2) @@ -8758,6 +8772,37 @@ fail: } #endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_POINT_2_3JI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_POINT_2_3JI) + (JNIEnv *env, jclass that, jobject arg0, jlongArray arg1, jint arg2) +{ + POINT _arg0, *lparg0=NULL; + jlong *lparg1=NULL; + OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_POINT_2_3JI_FUNC); + if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; +#ifdef JNI_VERSION_1_2 + if (IS_JNI_1_2) { + if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail; + } else +#endif + { + if (arg1) if ((lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL)) == NULL) goto fail; + } + MoveMemory((PVOID)lparg0, (CONST VOID *)lparg1, arg2); +fail: +#ifdef JNI_VERSION_1_2 + if (IS_JNI_1_2) { + if (arg1 && lparg1) (*env)->ReleasePrimitiveArrayCritical(env, arg1, lparg1, JNI_ABORT); + } else +#endif + { + if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, JNI_ABORT); + } + if (arg0 && lparg0) setPOINTFields(env, arg0, lparg0); + OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_POINT_2_3JI_FUNC); +} +#endif + #ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2_3II JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2_3II) (JNIEnv *env, jclass that, jobject arg0, jintArray arg1, jint arg2) @@ -9400,6 +9445,18 @@ JNIEXPORT jint JNICALL OS_NATIVE(NMTOOLBAR_1sizeof) } #endif +#ifndef NO_NMTREEVIEW_1sizeof +JNIEXPORT jint JNICALL OS_NATIVE(NMTREEVIEW_1sizeof) + (JNIEnv *env, jclass that) +{ + jint rc = 0; + OS_NATIVE_ENTER(env, that, NMTREEVIEW_1sizeof_FUNC); + rc = (jint)NMTREEVIEW_sizeof(); + OS_NATIVE_EXIT(env, that, NMTREEVIEW_1sizeof_FUNC); + return rc; +} +#endif + #ifndef NO_NMTTDISPINFOA_1sizeof JNIEXPORT jint JNICALL OS_NATIVE(NMTTDISPINFOA_1sizeof) (JNIEnv *env, jclass that) diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_custom.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_custom.c index 0c1b6429a3..efc8ff9ae5 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_custom.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_custom.c @@ -78,20 +78,24 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(IsSP) } #endif +#if (!defined(NO_SendMessageW__II_3I_3I) && !defined(SWT_PTR_SIZE_64)) || (!defined(SendMessageW__JI_3I_3I) && defined(SWT_PTR_SIZE_64)) #ifdef SWT_PTR_SIZE_64 -#define SendMessageW__II_3I_3I SendMessageW__JI_3J_3J -#define SendMessageW__II_3I_3I_FUNC SendMessageW__JI_3J_3J_FUNC -#endif -#ifndef NO_SendMessageW__II_3I_3I +JNIEXPORT SWT_PTR JNICALL OS_NATIVE(SendMessageW__JI_3I_3I) +#else JNIEXPORT SWT_PTR JNICALL OS_NATIVE(SendMessageW__II_3I_3I) - (JNIEnv *env, jclass that, SWT_PTR arg0, jint arg1, SWT_PTRArray arg2, SWT_PTRArray arg3) +#endif + (JNIEnv *env, jclass that, SWT_PTR arg0, jint arg1, jintArray arg2, jintArray arg3) { - SWT_PTR *lparg2=NULL; - SWT_PTR *lparg3=NULL; + jint *lparg2=NULL; + jint *lparg3=NULL; SWT_PTR rc; +#ifdef SWT_PTR_SIZE_64 + OS_NATIVE_ENTER(env, that, SendMessageW__JI_3I_3I_FUNC) +#else OS_NATIVE_ENTER(env, that, SendMessageW__II_3I_3I_FUNC) - if (arg2) if ((lparg2 = (*env)->GetSWT_PTRArrayElements(env, arg2, NULL)) == NULL) goto fail; - if (arg3) if ((lparg3 = (*env)->GetSWT_PTRArrayElements(env, arg3, NULL)) == NULL) goto fail; +#endif + if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail; + if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail; #ifdef _WIN32_WCE /* * Bug on WinCE. SendMessage can fail (return 0) when being passed references @@ -102,7 +106,7 @@ JNIEXPORT SWT_PTR JNICALL OS_NATIVE(SendMessageW__II_3I_3I) switch (arg1) { case EM_GETSEL: case CB_GETEDITSEL: { - SWT_PTR wParam = 0, lParam = 0; + jint wParam = 0, lParam = 0; SWT_PTR *lpwParam = NULL, *lplParam = NULL; if (lparg2 != NULL) lpwParam = &wParam; if (lparg3 != NULL) lplParam = &lParam; @@ -118,9 +122,13 @@ JNIEXPORT SWT_PTR JNICALL OS_NATIVE(SendMessageW__II_3I_3I) rc = (SWT_PTR)SendMessageW((HWND)arg0, arg1, (WPARAM)lparg2, (LPARAM)lparg3); #endif fail: - if (arg2 && lparg2) (*env)->ReleaseSWT_PTRArrayElements(env, arg2, lparg2, 0); - if (arg3 && lparg3) (*env)->ReleaseSWT_PTRArrayElements(env, arg3, lparg3, 0); + if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0); + if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0); +#ifdef SWT_PTR_SIZE_64 + OS_NATIVE_EXIT(env, that, SendMessageW__JI_3I_3I_FUNC) +#else OS_NATIVE_EXIT(env, that, SendMessageW__II_3I_3I_FUNC) +#endif return rc; } #endif diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.c index bbef408988..ab0e1c00e6 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.c @@ -14,8 +14,8 @@ #ifdef NATIVE_STATS -int OS_nativeFunctionCount = 883; -int OS_nativeFunctionCallCount[883]; +int OS_nativeFunctionCount = 886; +int OS_nativeFunctionCallCount[886]; char * OS_nativeFunctionNames[] = { "ACCEL_1sizeof", "ACTCTX_1sizeof", @@ -544,6 +544,7 @@ char * OS_nativeFunctionNames[] = { "MoveMemory__Lorg_eclipse_swt_internal_win32_NMRGINFO_2II", "MoveMemory__Lorg_eclipse_swt_internal_win32_NMTBHOTITEM_2II", "MoveMemory__Lorg_eclipse_swt_internal_win32_NMTOOLBAR_2II", + "MoveMemory__Lorg_eclipse_swt_internal_win32_NMTREEVIEW_2II", "MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2II", "MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2II", "MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2II", @@ -553,6 +554,7 @@ char * OS_nativeFunctionNames[] = { "MoveMemory__Lorg_eclipse_swt_internal_win32_OFNOTIFY_2II", "MoveMemory__Lorg_eclipse_swt_internal_win32_OPENFILENAME_2II", "MoveMemory__Lorg_eclipse_swt_internal_win32_POINT_2II", + "MoveMemory__Lorg_eclipse_swt_internal_win32_POINT_2_3JI", "MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2_3II", "MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1ITEM_2II", "MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1LOGATTR_2II", @@ -589,6 +591,7 @@ char * OS_nativeFunctionNames[] = { "NMRGINFO_1sizeof", "NMTBHOTITEM_1sizeof", "NMTOOLBAR_1sizeof", + "NMTREEVIEW_1sizeof", "NMTTDISPINFOA_1sizeof", "NMTTDISPINFOW_1sizeof", "NMTVCUSTOMDRAW_1sizeof", diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.h index 42928e3383..e0a8cdb435 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.h @@ -552,6 +552,7 @@ typedef enum { MoveMemory__Lorg_eclipse_swt_internal_win32_NMRGINFO_2II_FUNC, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTBHOTITEM_2II_FUNC, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTOOLBAR_2II_FUNC, + MoveMemory__Lorg_eclipse_swt_internal_win32_NMTREEVIEW_2II_FUNC, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2II_FUNC, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2II_FUNC, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2II_FUNC, @@ -561,6 +562,7 @@ typedef enum { MoveMemory__Lorg_eclipse_swt_internal_win32_OFNOTIFY_2II_FUNC, MoveMemory__Lorg_eclipse_swt_internal_win32_OPENFILENAME_2II_FUNC, MoveMemory__Lorg_eclipse_swt_internal_win32_POINT_2II_FUNC, + MoveMemory__Lorg_eclipse_swt_internal_win32_POINT_2_3JI_FUNC, MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2_3II_FUNC, MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1ITEM_2II_FUNC, MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1LOGATTR_2II_FUNC, @@ -597,6 +599,7 @@ typedef enum { NMRGINFO_1sizeof_FUNC, NMTBHOTITEM_1sizeof_FUNC, NMTOOLBAR_1sizeof_FUNC, + NMTREEVIEW_1sizeof_FUNC, NMTTDISPINFOA_1sizeof_FUNC, NMTTDISPINFOW_1sizeof_FUNC, NMTVCUSTOMDRAW_1sizeof_FUNC, diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_structs.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_structs.c index ea55c2c5a6..1cfe0561f8 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_structs.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_structs.c @@ -3394,6 +3394,73 @@ void setNMTOOLBARFields(JNIEnv *env, jobject lpObject, NMTOOLBAR *lpStruct) } #endif +#ifndef NO_NMTREEVIEW +typedef struct NMTREEVIEW_FID_CACHE { + int cached; + jclass clazz; + jfieldID hdr, action, itemOld, itemNew, ptDrag; +} NMTREEVIEW_FID_CACHE; + +NMTREEVIEW_FID_CACHE NMTREEVIEWFc; + +void cacheNMTREEVIEWFields(JNIEnv *env, jobject lpObject) +{ + if (NMTREEVIEWFc.cached) return; + NMTREEVIEWFc.clazz = (*env)->GetObjectClass(env, lpObject); + NMTREEVIEWFc.hdr = (*env)->GetFieldID(env, NMTREEVIEWFc.clazz, "hdr", "Lorg/eclipse/swt/internal/win32/NMHDR;"); + NMTREEVIEWFc.action = (*env)->GetFieldID(env, NMTREEVIEWFc.clazz, "action", "I"); + NMTREEVIEWFc.itemOld = (*env)->GetFieldID(env, NMTREEVIEWFc.clazz, "itemOld", "Lorg/eclipse/swt/internal/win32/TVITEM;"); + NMTREEVIEWFc.itemNew = (*env)->GetFieldID(env, NMTREEVIEWFc.clazz, "itemNew", "Lorg/eclipse/swt/internal/win32/TVITEM;"); + NMTREEVIEWFc.ptDrag = (*env)->GetFieldID(env, NMTREEVIEWFc.clazz, "ptDrag", "Lorg/eclipse/swt/internal/win32/POINT;"); + NMTREEVIEWFc.cached = 1; +} + +NMTREEVIEW *getNMTREEVIEWFields(JNIEnv *env, jobject lpObject, NMTREEVIEW *lpStruct) +{ + if (!NMTREEVIEWFc.cached) cacheNMTREEVIEWFields(env, lpObject); + { + jobject lpObject1 = (*env)->GetObjectField(env, lpObject, NMTREEVIEWFc.hdr); + if (lpObject1 != NULL) getNMHDRFields(env, lpObject1, &lpStruct->hdr); + } + lpStruct->action = (*env)->GetIntField(env, lpObject, NMTREEVIEWFc.action); + { + jobject lpObject1 = (*env)->GetObjectField(env, lpObject, NMTREEVIEWFc.itemOld); + if (lpObject1 != NULL) getTVITEMFields(env, lpObject1, &lpStruct->itemOld); + } + { + jobject lpObject1 = (*env)->GetObjectField(env, lpObject, NMTREEVIEWFc.itemNew); + if (lpObject1 != NULL) getTVITEMFields(env, lpObject1, &lpStruct->itemNew); + } + { + jobject lpObject1 = (*env)->GetObjectField(env, lpObject, NMTREEVIEWFc.ptDrag); + if (lpObject1 != NULL) getPOINTFields(env, lpObject1, &lpStruct->ptDrag); + } + return lpStruct; +} + +void setNMTREEVIEWFields(JNIEnv *env, jobject lpObject, NMTREEVIEW *lpStruct) +{ + if (!NMTREEVIEWFc.cached) cacheNMTREEVIEWFields(env, lpObject); + { + jobject lpObject1 = (*env)->GetObjectField(env, lpObject, NMTREEVIEWFc.hdr); + if (lpObject1 != NULL) setNMHDRFields(env, lpObject1, &lpStruct->hdr); + } + (*env)->SetIntField(env, lpObject, NMTREEVIEWFc.action, (jint)lpStruct->action); + { + jobject lpObject1 = (*env)->GetObjectField(env, lpObject, NMTREEVIEWFc.itemOld); + if (lpObject1 != NULL) setTVITEMFields(env, lpObject1, &lpStruct->itemOld); + } + { + jobject lpObject1 = (*env)->GetObjectField(env, lpObject, NMTREEVIEWFc.itemNew); + if (lpObject1 != NULL) setTVITEMFields(env, lpObject1, &lpStruct->itemNew); + } + { + jobject lpObject1 = (*env)->GetObjectField(env, lpObject, NMTREEVIEWFc.ptDrag); + if (lpObject1 != NULL) setPOINTFields(env, lpObject1, &lpStruct->ptDrag); + } +} +#endif + #ifndef NO_NMTTDISPINFO typedef struct NMTTDISPINFO_FID_CACHE { int cached; diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_structs.h b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_structs.h index 34baf615c9..f6be789ca8 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_structs.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_structs.h @@ -779,6 +779,18 @@ void setNMTOOLBARFields(JNIEnv *env, jobject lpObject, NMTOOLBAR *lpStruct); #define NMTOOLBAR_sizeof() 0 #endif +#ifndef NO_NMTREEVIEW +void cacheNMTREEVIEWFields(JNIEnv *env, jobject lpObject); +NMTREEVIEW *getNMTREEVIEWFields(JNIEnv *env, jobject lpObject, NMTREEVIEW *lpStruct); +void setNMTREEVIEWFields(JNIEnv *env, jobject lpObject, NMTREEVIEW *lpStruct); +#define NMTREEVIEW_sizeof() sizeof(NMTREEVIEW) +#else +#define cacheNMTREEVIEWFields(a,b) +#define getNMTREEVIEWFields(a,b,c) NULL +#define setNMTREEVIEWFields(a,b,c) +#define NMTREEVIEW_sizeof() 0 +#endif + #ifndef NO_NMTTDISPINFO void cacheNMTTDISPINFOFields(JNIEnv *env, jobject lpObject); NMTTDISPINFO *getNMTTDISPINFOFields(JNIEnv *env, jobject lpObject, NMTTDISPINFO *lpStruct); diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COM.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COM.java index ccb284d053..c1cddf6406 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COM.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COM.java @@ -679,6 +679,7 @@ public static final native int CONTROLINFO_sizeof(); public static final native int COSERVERINFO_sizeof(); public static final native int DISPPARAMS_sizeof(); public static final native int DVTARGETDEVICE_sizeof(); +public static final native int ELEMDESC_sizeof(); public static final native int EXCEPINFO_sizeof(); public static final native int FORMATETC_sizeof(); public static final native int FUNCDESC_sizeof(); @@ -689,6 +690,7 @@ public static final native int OLEINPLACEFRAMEINFO_sizeof(); public static final native int STATSTG_sizeof(); public static final native int STGMEDIUM_sizeof(); public static final native int TYPEATTR_sizeof(); +public static final native int TYPEDESC_sizeof(); public static final native int VARDESC_sizeof(); public static final native int VARIANT_sizeof(); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/VARDESC.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/VARDESC.java index 491558bd6b..a249e88e1b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/VARDESC.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/VARDESC.java @@ -13,7 +13,7 @@ package org.eclipse.swt.internal.ole.win32; public class VARDESC { public int memid; public int /*long*/ lpstrSchema; - public int /*long*/ oInst; + public int oInst; // ELEMDESC elemdescVar // TYPEDESC elemdescVar.tdesc public int /*long*/ elemdescVar_tdesc_union; diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/VARIANT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/VARIANT.java index 1f5f1b857f..7b4eea65b1 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/VARIANT.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/VARIANT.java @@ -15,6 +15,6 @@ public class VARIANT { public short wReserved1; public short wReserved2; public short wReserved3; - public int /*long*/ lVal; + public int lVal; public static final int sizeof = COM.VARIANT_sizeof(); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTREEVIEW.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTREEVIEW.java new file mode 100644 index 0000000000..36cae17462 --- /dev/null +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTREEVIEW.java @@ -0,0 +1,20 @@ +/******************************************************************************* + * Copyright (c) 2000, 2007 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * IBM Corporation - initial API and implementation + *******************************************************************************/ +package org.eclipse.swt.internal.win32; + +public class NMTREEVIEW { + public NMHDR hdr = new NMHDR (); + public int action; + public TVITEM itemOld = new TVITEM (); + public TVITEM itemNew = new TVITEM (); + public POINT ptDrag = new POINT (); + public static final int sizeof = OS.NMTREEVIEW_sizeof (); +} diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java index d69f390ce7..51e4676ae7 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java @@ -1705,10 +1705,10 @@ public class OS extends C { public static final int TVIS_EXPANDED = 0x20; public static final int TVIS_SELECTED = 0x2; public static final int TVIS_STATEIMAGEMASK = 0xf000; - public static final int TVI_FIRST = 0xffff0001; - public static final int TVI_LAST = 0xffff0002; - public static final int TVI_ROOT = 0xffff0000; - public static final int TVI_SORT = 0xFFFF0003; + public static final int /*long*/ TVI_FIRST = -0x0FFFF; + public static final int /*long*/ TVI_LAST = -0x0FFFE; + public static final int /*long*/ TVI_ROOT = -0x10000; + public static final int /*long*/ TVI_SORT = -0x0FFFD; public static final int TVM_CREATEDRAGIMAGE = TV_FIRST + 18; public static final int TVM_DELETEITEM = 0x1101; public static final int TVM_ENSUREVISIBLE = 0x1114; @@ -2090,6 +2090,7 @@ public static final native int NMREBARCHEVRON_sizeof (); public static final native int NMREBARCHILDSIZE_sizeof (); public static final native int NMRGINFO_sizeof (); public static final native int NMTBHOTITEM_sizeof (); +public static final native int NMTREEVIEW_sizeof (); public static final native int NMTOOLBAR_sizeof (); public static final native int NMTTDISPINFOA_sizeof (); public static final native int NMTTDISPINFOW_sizeof (); @@ -2161,7 +2162,7 @@ public static final int /*long*/ AddFontResourceEx (TCHAR lpszFilename, int fl, return AddFontResourceExA (lpszFilename1, fl, pdv); } -public static final int /*long*/ AssocQueryString(int flags, int str, TCHAR pszAssoc, TCHAR pszExtra, TCHAR pszOut, int[] pcchOut) { +public static final int AssocQueryString(int flags, int str, TCHAR pszAssoc, TCHAR pszExtra, TCHAR pszOut, int[] pcchOut) { if (IsUnicode) { char [] pszAssoc1 = pszAssoc == null ? null : pszAssoc.chars; char [] pszExtra1 = pszExtra == null ? null : pszExtra.chars; @@ -2352,7 +2353,7 @@ public static final int /*long*/ FindWindow (TCHAR lpClassName, TCHAR lpWindowNa return FindWindowA (lpClassName1, lpWindowName1); } -public static final int FormatMessage (int dwFlags, int /*long*/ lpSource, int dwMessageId, int dwLanguageId, int[] lpBuffer, int nSize, int /*long*/ Arguments) { +public static final int FormatMessage (int dwFlags, int /*long*/ lpSource, int dwMessageId, int dwLanguageId, int /*long*/ [] lpBuffer, int nSize, int /*long*/ Arguments) { if (IsUnicode) { return FormatMessageW (dwFlags, lpSource, dwMessageId, dwLanguageId, lpBuffer, nSize, Arguments); } @@ -3193,7 +3194,7 @@ public static final native int /*long*/ CreateFontIndirectA (LOGFONTA lplf); public static final native int /*long*/ CreateIconIndirect (ICONINFO lplf); public static final native int /*long*/ CreateMenu (); public static final native int /*long*/ CreatePalette (byte[] logPalette); -public static final native int /*long*/ CreatePatternBrush (int /*long*/ colorRef); +public static final native int /*long*/ CreatePatternBrush (int /*long*/ hbmp); public static final native int /*long*/ CreatePen (int fnPenStyle, int nWidth, int crColor); public static final native int /*long*/ CreatePolygonRgn(int[] lppt, int cPoints, int fnPolyFillMode); public static final native int /*long*/ CreatePopupMenu (); @@ -3276,8 +3277,8 @@ public static final native int FillRect (int /*long*/ hDC, RECT lprc, int /*long public static final native boolean FillPath (int /*long*/ hdc); public static final native int /*long*/ FindWindowA (byte [] lpClassName, byte [] lpWindowName); public static final native int /*long*/ FindWindowW (char [] lpClassName, char [] lpWindowName); -public static final native int FormatMessageA (int dwFlags, int /*long*/ lpSource, int dwMessageId, int dwLanguageId, int[] lpBuffer, int nSize, int /*long*/ Arguments); -public static final native int FormatMessageW (int dwFlags, int /*long*/ lpSource, int dwMessageId, int dwLanguageId, int[] lpBuffer, int nSize, int /*long*/ Arguments); +public static final native int FormatMessageA (int dwFlags, int /*long*/ lpSource, int dwMessageId, int dwLanguageId, int /*long*/ [] lpBuffer, int nSize, int /*long*/ Arguments); +public static final native int FormatMessageW (int dwFlags, int /*long*/ lpSource, int dwMessageId, int dwLanguageId, int /*long*/ [] lpBuffer, int nSize, int /*long*/ Arguments); public static final native boolean FreeLibrary (int /*long*/ hLibModule); public static final native int GdiSetBatchLimit (int dwLimit); public static final native int GET_WHEEL_DELTA_WPARAM(int /*long*/ wParam); @@ -3443,7 +3444,7 @@ public static final native int GetWindowTextW (int /*long*/ hWnd, char [] lpStri public static final native int GetWindowTextA (int /*long*/ hWnd, byte [] lpString, int nMaxCount); public static final native int GetWindowTextLengthW (int /*long*/ hWnd); public static final native int GetWindowTextLengthA (int /*long*/ hWnd); -public static final native int GetWindowTheme (int /*long*/ hWnd); +public static final native int /*long*/ GetWindowTheme (int /*long*/ hWnd); public static final native int GetWindowThreadProcessId (int /*long*/ hWnd, int [] lpdwProcessId); public static final native boolean GetWorldTransform (int /*long*/ hdc, float[] lpXform); public static final native int GlobalAddAtomW (char [] lpString); @@ -3521,7 +3522,7 @@ public static final native boolean IsWindowEnabled (int /*long*/ hWnd); public static final native boolean IsWindowVisible (int /*long*/ hWnd); public static final native boolean IsZoomed (int /*long*/ hWnd); public static final native boolean KillTimer (int /*long*/ hWnd, int /*long*/ uIDEvent); -public static final native int LOWORD(int /*long*/ l); +public static final native int LOWORD (int /*long*/ l); public static final native boolean LineTo (int /*long*/ hdc, int x1, int x2); public static final native int /*long*/ LoadBitmapW (int /*long*/ hInstance, int /*long*/ lpBitmapName); public static final native int /*long*/ LoadBitmapA (int /*long*/ hInstance, int /*long*/ lpBitmapName); @@ -3588,11 +3589,13 @@ public static final native void MoveMemory (MINMAXINFO Destination, int /*long*/ public static final native void MoveMemory (OFNOTIFY Destination, int /*long*/ Source, int Length); public static final native void MoveMemory (OPENFILENAME Destination, int /*long*/ Source, int Length); public static final native void MoveMemory (POINT Destination, int /*long*/ Source, int Length); +public static final native void MoveMemory (POINT Destination, long[] Source, int Length); public static final native void MoveMemory (NMHDR Destination, int /*long*/ Source, int Length); public static final native void MoveMemory (NMRGINFO Destination, int /*long*/ Source, int Length); public static final native void MoveMemory (NMCUSTOMDRAW Destination, int /*long*/ Source, int Length); public static final native void MoveMemory (NMLVCUSTOMDRAW Destination, int /*long*/ Source, int Length); public static final native void MoveMemory (NMTBHOTITEM Destination, int /*long*/ Source, int Length); +public static final native void MoveMemory (NMTREEVIEW Destination, int /*long*/ Source, int Length); public static final native void MoveMemory (NMTVCUSTOMDRAW Destination, int /*long*/ Source, int Length); public static final native void MoveMemory (NMTVITEMCHANGE Destination, int /*long*/ Source, int Length); public static final native void MoveMemory (NMUPDOWN Destination, int /*long*/ Source, int Length); @@ -3708,7 +3711,7 @@ public static final native int SelectClipRgn (int /*long*/ hdc, int /*long*/ hrg public static final native int /*long*/ SelectObject (int /*long*/ hDC, int /*long*/ HGDIObj); public static final native int /*long*/ SelectPalette (int /*long*/ hDC, int /*long*/ hpal, boolean bForceBackground); public static final native int SendInput (int nInputs, int /*long*/ pInputs, int cbSize); -public static final native int /*long*/ SendMessageW (int /*long*/ hWnd, int Msg, int [] wParam, int [] lParam); +public static final native int /*long*/ SendMessageW (int /*long*/ hWnd, int Msg, int [] wParam, int [] lParam); public static final native int /*long*/ SendMessageW (int /*long*/ hWnd, int Msg, int /*long*/ [] wParam, int /*long*/ lParam); public static final native int /*long*/ SendMessageW (int /*long*/ hWnd, int Msg, int /*long*/ wParam, char [] lParam); public static final native int /*long*/ SendMessageW (int /*long*/ hWnd, int Msg, int /*long*/ wParam, int [] lParam); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Printing/win32/org/eclipse/swt/printing/PrintDialog.java b/bundles/org.eclipse.swt/Eclipse SWT Printing/win32/org/eclipse/swt/printing/PrintDialog.java index cdf17dd4ec..7e2361de09 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT Printing/win32/org/eclipse/swt/printing/PrintDialog.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Printing/win32/org/eclipse/swt/printing/PrintDialog.java @@ -261,10 +261,10 @@ public PrinterData open() { if (success) { /* Get driver and device from the DEVNAMES struct */ - int hMem = pd.hDevNames; + int /*long*/ hMem = pd.hDevNames; /* Ensure size is a multiple of 2 bytes on UNICODE platforms */ int size = OS.GlobalSize(hMem) / TCHAR.sizeof * TCHAR.sizeof; - int ptr = OS.GlobalLock(hMem); + int /*long*/ ptr = OS.GlobalLock(hMem); short[] offsets = new short[4]; OS.MoveMemory(offsets, ptr, 2 * offsets.length); TCHAR buffer = new TCHAR(0, size); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Printing/win32/org/eclipse/swt/printing/Printer.java b/bundles/org.eclipse.swt/Eclipse SWT Printing/win32/org/eclipse/swt/printing/Printer.java index ea9ff718f5..df0a90e553 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT Printing/win32/org/eclipse/swt/printing/Printer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Printing/win32/org/eclipse/swt/printing/Printer.java @@ -46,7 +46,7 @@ public final class Printer extends Device { * platforms and should never be accessed from application code. * </p> */ - public int handle; + public int /*long*/ handle; /** * the printer data describing this printer @@ -207,9 +207,9 @@ protected void create(DeviceData deviceData) { /* Use the character encoding for the default locale */ TCHAR driver = new TCHAR(0, data.driver, true); TCHAR device = new TCHAR(0, data.name, true); - int lpInitData = 0; + int /*long*/ lpInitData = 0; byte buffer [] = data.otherData; - int hHeap = OS.GetProcessHeap(); + int /*long*/ hHeap = OS.GetProcessHeap(); if (buffer != null && buffer.length != 0) { /* If user setup info from a print dialog was specified, restore the DEVMODE struct. */ lpInitData = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, buffer.length); @@ -233,7 +233,7 @@ protected void create(DeviceData deviceData) { * @param data the platform specific GC data * @return the platform specific GC handle */ -public int internal_new_GC(GCData data) { +public int /*long*/ internal_new_GC(GCData data) { if (handle == 0) SWT.error(SWT.ERROR_NO_HANDLES); if (data != null) { if (isGCCreated) SWT.error(SWT.ERROR_INVALID_ARGUMENT); @@ -263,7 +263,7 @@ public int internal_new_GC(GCData data) { * @param hDC the platform specific GC handle * @param data the platform specific GC data */ -public void internal_dispose_GC(int hDC, GCData data) { +public void internal_dispose_GC(int /*long*/ hDC, GCData data) { if (data != null) isGCCreated = false; } @@ -292,8 +292,8 @@ public boolean startJob(String jobName) { checkDevice(); DOCINFO di = new DOCINFO(); di.cbSize = DOCINFO.sizeof; - int hHeap = OS.GetProcessHeap(); - int lpszDocName = 0; + int /*long*/ hHeap = OS.GetProcessHeap(); + int /*long*/ lpszDocName = 0; if (jobName != null && jobName.length() != 0) { /* Use the character encoding for the default locale */ TCHAR buffer = new TCHAR(0, jobName, true); @@ -302,7 +302,7 @@ public boolean startJob(String jobName) { OS.MoveMemory(lpszDocName, buffer, byteCount); di.lpszDocName = lpszDocName; } - int lpszOutput = 0; + int /*long*/ lpszOutput = 0; if (data.printToFile && data.fileName != null) { /* Use the character encoding for the default locale */ TCHAR buffer = new TCHAR(0, data.fileName, true); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Program/win32/org/eclipse/swt/program/Program.java b/bundles/org.eclipse.swt/Eclipse SWT Program/win32/org/eclipse/swt/program/Program.java index 32a3bf1543..1c5d446623 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT Program/win32/org/eclipse/swt/program/Program.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Program/win32/org/eclipse/swt/program/Program.java @@ -79,7 +79,7 @@ public static Program findProgram (String extension) { TCHAR key = new TCHAR (0, extension, true); Program program = null; if (OS.IsWinCE) { - int [] phkResult = new int [1]; + int /*long*/ [] phkResult = new int /*long*/ [1]; if (OS.RegOpenKeyEx (OS.HKEY_CLASSES_ROOT, key, 0, OS.KEY_READ, phkResult) != 0) { return null; } @@ -148,7 +148,7 @@ public static String [] getExtensions () { static String getKeyValue (String string, boolean expand) { /* Use the character encoding for the default locale */ TCHAR key = new TCHAR (0, string, true); - int [] phkResult = new int [1]; + int /*long*/ [] phkResult = new int /*long*/ [1]; if (OS.RegOpenKeyEx (OS.HKEY_CLASSES_ROOT, key, 0, OS.KEY_READ, phkResult) != 0) { return null; } @@ -263,10 +263,10 @@ public static boolean launch (String fileName) { if (fileName == null) SWT.error (SWT.ERROR_NULL_ARGUMENT); /* Use the character encoding for the default locale */ - int hHeap = OS.GetProcessHeap (); + int /*long*/ hHeap = OS.GetProcessHeap (); TCHAR buffer = new TCHAR (0, fileName, true); int byteCount = buffer.length () * TCHAR.sizeof; - int lpFile = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); + int /*long*/ lpFile = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); OS.MoveMemory (lpFile, buffer, byteCount); SHELLEXECUTEINFO info = new SHELLEXECUTEINFO (); info.cbSize = SHELLEXECUTEINFO.sizeof; @@ -307,11 +307,11 @@ public boolean execute (String fileName) { } if (append) fileName = " \"" + fileName + "\""; String commandLine = prefix + fileName + suffix; - int hHeap = OS.GetProcessHeap (); + int /*long*/ hHeap = OS.GetProcessHeap (); /* Use the character encoding for the default locale */ TCHAR buffer = new TCHAR (0, commandLine, true); int byteCount = buffer.length () * TCHAR.sizeof; - int lpCommandLine = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); + int /*long*/ lpCommandLine = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); OS.MoveMemory (lpCommandLine, buffer, byteCount); STARTUPINFO lpStartupInfo = new STARTUPINFO (); lpStartupInfo.cb = STARTUPINFO.sizeof; @@ -355,7 +355,7 @@ public ImageData getImageData () { } /* Use the character encoding for the default locale */ TCHAR lpszFile = new TCHAR (0, fileName, true); - int [] phiconSmall = new int[1], phiconLarge = null; + int /*long*/ [] phiconSmall = new int /*long*/[1], phiconLarge = null; OS.ExtractIconEx (lpszFile, nIconIndex, phiconLarge, phiconSmall, 1); if (phiconSmall [0] == 0) return null; Image image = Image.win32_new (null, SWT.ICON, phiconSmall [0]); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ButtonDrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ButtonDrawData.java index 57ba4afaef..a6a533701b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ButtonDrawData.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ButtonDrawData.java @@ -57,7 +57,7 @@ int[] getPartId(int part) { void draw(Theme theme, GC gc, Rectangle bounds) { if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) { //TODO - arrow and toggle - int hTheme = OS.OpenThemeData(0, getClassId()); + int /*long*/ hTheme = OS.OpenThemeData(0, getClassId()); RECT rect = new RECT (); rect.left = bounds.x; rect.right = bounds.x + bounds.width; @@ -90,7 +90,7 @@ void draw(Theme theme, GC gc, Rectangle bounds) { int hit(Theme theme, Point position, Rectangle bounds) { if (!(OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ())) return DrawData.WIDGET_NOWHERE; if (!bounds.contains(position)) return DrawData.WIDGET_NOWHERE; - int hTheme = OS.OpenThemeData(0, getClassId()); + int /*long*/ hTheme = OS.OpenThemeData(0, getClassId()); RECT rect = new RECT (); rect.left = bounds.x; rect.right = bounds.x + bounds.width; diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ComboDrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ComboDrawData.java index e968fd6b6b..053395c5a7 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ComboDrawData.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ComboDrawData.java @@ -21,7 +21,7 @@ public ComboDrawData() { void draw(Theme theme, GC gc, Rectangle bounds) { if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) { - int hTheme = OS.OpenThemeData(0, EDIT); + int /*long*/ hTheme = OS.OpenThemeData(0, EDIT); RECT rect = new RECT (); rect.left = bounds.x; rect.right = bounds.x + bounds.width; @@ -81,7 +81,7 @@ int[] getPartId(int part) { int hit(Theme theme, Point position, Rectangle bounds) { if (!(OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ())) return DrawData.WIDGET_NOWHERE; if (!bounds.contains(position)) return DrawData.WIDGET_NOWHERE; - int hTheme = OS.OpenThemeData(0, EDIT); + int /*long*/ hTheme = OS.OpenThemeData(0, EDIT); int[] part = getPartId(DrawData.WIDGET_WHOLE); int iPartId = part[0]; int iStateId = part[1]; diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/DrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/DrawData.java index 975dd22b0b..ee1b7a6c95 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/DrawData.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/DrawData.java @@ -89,7 +89,7 @@ void draw(Theme theme, GC gc, Rectangle bounds) { void drawImage(Theme theme, Image image, GC gc, Rectangle bounds) { if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) { -// int hTheme = OS.OpenThemeData(0, getClassId()); +// int /*long*/ hTheme = OS.OpenThemeData(0, getClassId()); // RECT rect = new RECT (); // rect.left = bounds.x; // rect.right = bounds.x + bounds.width; @@ -109,7 +109,7 @@ void drawImage(Theme theme, Image image, GC gc, Rectangle bounds) { void drawText(Theme theme, String text, int flags, GC gc, Rectangle bounds) { if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) { - int hTheme = OS.OpenThemeData(0, getClassId()); + int /*long*/ hTheme = OS.OpenThemeData(0, getClassId()); char[] chars = new char[text.length()]; text.getChars(0, chars.length, chars, 0); int textFlags = OS.DT_SINGLELINE; @@ -150,7 +150,7 @@ int hit(Theme theme, Point position, Rectangle bounds) { Rectangle measureText(Theme theme, String text, int flags, GC gc, Rectangle bounds) { if (!(OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ())) return new Rectangle(0, 0, 0, 0); - int hTheme = OS.OpenThemeData(0, getClassId()); + int /*long*/ hTheme = OS.OpenThemeData(0, getClassId()); char[] chars = new char[text.length()]; text.getChars(0, chars.length, chars, 0); //TODO - constant for VCENTER and flags diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ExpanderDrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ExpanderDrawData.java index 057bc42745..e4f8e0368d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ExpanderDrawData.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ExpanderDrawData.java @@ -22,7 +22,7 @@ public ExpanderDrawData() { void draw(Theme theme, GC gc, Rectangle bounds) { if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) { - int hTheme = OS.OpenThemeData(0, getClassId()); + int /*long*/ hTheme = OS.OpenThemeData(0, getClassId()); int iStateId = OS.GLPS_CLOSED; if ((this.style & SWT.DOWN) != 0) iStateId = OS.GLPS_OPENED; SIZE size = new SIZE(); @@ -51,7 +51,7 @@ int[] getPartId(int part) { int hit(Theme theme, Point position, Rectangle bounds) { if (!(OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ())) return DrawData.WIDGET_NOWHERE; if (!bounds.contains(position)) return DrawData.WIDGET_NOWHERE; - int hTheme = OS.OpenThemeData(0, getClassId()); + int /*long*/ hTheme = OS.OpenThemeData(0, getClassId()); SIZE size = new SIZE(); int[] part = getPartId(DrawData.WIDGET_WHOLE); OS.GetThemePartSize(hTheme, 0, part[0], part[1], null, OS.TS_TRUE, size); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/GroupDrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/GroupDrawData.java index 31b7460001..83ceb60da7 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/GroupDrawData.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/GroupDrawData.java @@ -26,7 +26,7 @@ static final int GROUP_HEADER_X = 9; static final int GROUP_HEADER_PAD = 2; void draw(Theme theme, GC gc, Rectangle bounds) { if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) { - int hTheme = OS.OpenThemeData(0, getClassId()); + int /*long*/ hTheme = OS.OpenThemeData(0, getClassId()); RECT rect = new RECT (); rect.left = bounds.x; rect.right = bounds.x + bounds.width; diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ProgressBarDrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ProgressBarDrawData.java index 857500d4ae..cb3304597a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ProgressBarDrawData.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ProgressBarDrawData.java @@ -22,7 +22,7 @@ public ProgressBarDrawData() { void draw(Theme theme, GC gc, Rectangle bounds) { if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) { - int hTheme = OS.OpenThemeData(0, getClassId()); + int /*long*/ hTheme = OS.OpenThemeData(0, getClassId()); RECT rect = new RECT (); rect.left = bounds.x; rect.right = rect.left + bounds.width; diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ScaleDrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ScaleDrawData.java index 15156c4082..594f3092c1 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ScaleDrawData.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ScaleDrawData.java @@ -32,7 +32,7 @@ void draw(Theme theme, GC gc, Rectangle bounds) { int maximum = this.maximum; int selection = this.selection; int pageIncrement = this.pageIncrement; - int hTheme = OS.OpenThemeData(0, getClassId()); + int /*long*/ hTheme = OS.OpenThemeData(0, getClassId()); RECT rect = new RECT (); rect.left = bounds.x; rect.right = rect.left + bounds.width; diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ScrollBarDrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ScrollBarDrawData.java index 713d8dc4c3..0bc7978864 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ScrollBarDrawData.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ScrollBarDrawData.java @@ -25,7 +25,7 @@ public ScrollBarDrawData() { void draw(Theme theme, GC gc, Rectangle bounds) { if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) { - int hTheme = OS.OpenThemeData(0, getClassId()); + int /*long*/ hTheme = OS.OpenThemeData(0, getClassId()); RECT rect = new RECT (); if ((style & SWT.VERTICAL) != 0) { int width = OS.GetThemeSysSize(hTheme, OS.SM_CXVSCROLL); @@ -159,7 +159,7 @@ int[] getPartId(int part) { Rectangle getBounds(int part, Rectangle bounds) { if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) { - int hTheme = OS.OpenThemeData(0, getClassId()); + int /*long*/ hTheme = OS.OpenThemeData(0, getClassId()); if ((style & SWT.VERTICAL) != 0) { int width = OS.GetThemeSysSize(hTheme, OS.SM_CXVSCROLL); int totalWidth = bounds.height - 2 * width; @@ -187,7 +187,7 @@ Rectangle getBounds(int part, Rectangle bounds) { int getSelection(Point position, Rectangle bounds) { if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) { - int hTheme = OS.OpenThemeData(0, getClassId()); + int /*long*/ hTheme = OS.OpenThemeData(0, getClassId()); if ((style & SWT.VERTICAL) != 0) { int width = OS.GetThemeSysSize(hTheme, OS.SM_CXVSCROLL); int totalWidth = bounds.height - 2 * width; @@ -205,7 +205,7 @@ int getSelection(Point position, Rectangle bounds) { int hit(Theme theme, Point position, Rectangle bounds) { if (!(OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ())) return -1; - int hTheme = OS.OpenThemeData(0, getClassId()); + int /*long*/ hTheme = OS.OpenThemeData(0, getClassId()); //TODO - should we take a GC? int hDC = 0; RECT rect = new RECT (); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/TabFolderDrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/TabFolderDrawData.java index e59e7111c6..e152c16504 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/TabFolderDrawData.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/TabFolderDrawData.java @@ -31,7 +31,7 @@ public TabFolderDrawData() { void draw(Theme theme, GC gc, Rectangle bounds) { if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) { - int hTheme = OS.OpenThemeData(0, getClassId()); + int /*long*/ hTheme = OS.OpenThemeData(0, getClassId()); RECT rect = new RECT (); rect.left = bounds.x; rect.right = bounds.x + bounds.width; diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/TabItemDrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/TabItemDrawData.java index 589c15f198..2b42d77ec3 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/TabItemDrawData.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/TabItemDrawData.java @@ -28,7 +28,7 @@ public TabItemDrawData() { Rectangle computeTrim(Theme theme, GC gc) { if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) { - int hTheme = OS.OpenThemeData(0, getClassId()); + int /*long*/ hTheme = OS.OpenThemeData(0, getClassId()); int x = clientArea.x, y = clientArea.y, width = clientArea.width, height = clientArea.height; if ((style & SWT.LEFT) != 0) { x -= TABITEM_INSET; @@ -56,7 +56,7 @@ Rectangle computeTrim(Theme theme, GC gc) { void draw(Theme theme, GC gc, Rectangle bounds) { if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) { int state = this.state[DrawData.WIDGET_WHOLE]; - int hTheme = OS.OpenThemeData(0, getClassId()); + int /*long*/ hTheme = OS.OpenThemeData(0, getClassId()); int x = bounds.x, y = bounds.y, width = bounds.width, height = bounds.height; if ((position & SWT.LEFT) != 0) { x += TABITEM_INSET; diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ToolItemDrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ToolItemDrawData.java index 7124c12871..2c0cff8d66 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ToolItemDrawData.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ToolItemDrawData.java @@ -26,7 +26,7 @@ public ToolItemDrawData() { Rectangle computeTrim(Theme theme, GC gc) { if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) { - int hTheme = OS.OpenThemeData(0, getClassId()); + int /*long*/ hTheme = OS.OpenThemeData(0, getClassId()); RECT rect = new RECT (); rect.left = clientArea.x; rect.right = clientArea.x + clientArea.width; @@ -54,7 +54,7 @@ Rectangle computeTrim(Theme theme, GC gc) { void draw(Theme theme, GC gc, Rectangle bounds) { if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) { - int hTheme = OS.OpenThemeData(0, getClassId()); + int /*long*/ hTheme = OS.OpenThemeData(0, getClassId()); RECT rect = new RECT (); rect.left = bounds.x; rect.right = bounds.x + bounds.width; @@ -137,7 +137,7 @@ int[] getPartId(int part) { int hit(Theme theme, Point position, Rectangle bounds) { if (!(OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ())) return DrawData.WIDGET_NOWHERE; if (!bounds.contains(position)) return DrawData.WIDGET_NOWHERE; - int hTheme = OS.OpenThemeData(0, getClassId()); + int /*long*/ hTheme = OS.OpenThemeData(0, getClassId()); try { RECT rect = new RECT (); rect.left = bounds.x; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/Monitor.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/Monitor.java index aa29db1ab1..311d05923b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/Monitor.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/Monitor.java @@ -20,7 +20,7 @@ import org.eclipse.swt.graphics.*; * @since 3.0 */ public final class Monitor { - int handle; + int /*long*/ handle; int x, y, width, height; int clientX, clientY, clientWidth, clientHeight; @@ -78,7 +78,7 @@ public Rectangle getClientArea () { * @see #equals(Object) */ public int hashCode () { - return handle; + return (int)/*64*/handle; } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Color.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Color.java index 253eda0720..23de2c22d1 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Color.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Color.java @@ -125,7 +125,7 @@ public void dispose() { * If the reference count reaches 0, the slot may * be reused when another color is allocated. */ - int hPal = device.hPalette; + int /*long*/ hPal = device.hPalette; if (hPal != 0) { int index = OS.GetNearestPaletteIndex(hPal, handle); int[] colorRefCount = device.colorRefCount; @@ -248,7 +248,7 @@ void init(Device device, int red, int green, int blue) { handle = (red & 0xFF) | ((green & 0xFF) << 8) | ((blue & 0xFF) << 16); /* If this is not a palette-based device, return */ - int hPal = device.hPalette; + int /*long*/ hPal = device.hPalette; if (hPal == 0) return; int[] colorRefCount = device.colorRefCount; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Cursor.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Cursor.java index 5c8a96acd4..6fdf07f5a5 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Cursor.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Cursor.java @@ -51,7 +51,7 @@ public final class Cursor extends Resource { * platforms and should never be accessed from application code. * </p> */ - public int handle; + public int /*long*/ handle; boolean isIcon; @@ -184,7 +184,7 @@ public Cursor(Device device, int style) { if (device == null) device = Device.getDevice(); if (device == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); this.device = device; - int lpCursorName = 0; + int /*long*/ lpCursorName = 0; switch (style) { case SWT.CURSOR_HAND: lpCursorName = OS.IDC_HAND; break; case SWT.CURSOR_ARROW: lpCursorName = OS.IDC_ARROW; break; @@ -220,7 +220,7 @@ public Cursor(Device device, int style) { int width = OS.GetSystemMetrics(OS.SM_CXCURSOR); int height = OS.GetSystemMetrics(OS.SM_CYCURSOR); if (width == 32 && height == 32) { - int hInst = OS.GetModuleHandle(null); + int /*long*/ hInst = OS.GetModuleHandle(null); if (OS.IsWinCE) SWT.error(SWT.ERROR_NOT_IMPLEMENTED); handle = OS.CreateCursor(hInst, 5, 0, 32, 32, HAND_SOURCE, HAND_MASK); @@ -290,7 +290,7 @@ public Cursor(Device device, ImageData source, ImageData mask, int hotspotX, int byte[] maskData = ImageData.convertPad(mask.data, mask.width, mask.height, mask.depth, mask.scanlinePad, 2); /* Create the cursor */ - int hInst = OS.GetModuleHandle(null); + int /*long*/ hInst = OS.GetModuleHandle(null); if (OS.IsWinCE) SWT.error (SWT.ERROR_NOT_IMPLEMENTED); handle = OS.CreateCursor(hInst, hotspotX, hotspotY, source.width, source.height, sourceData, maskData); if (handle == 0) SWT.error(SWT.ERROR_NO_HANDLES); @@ -335,9 +335,9 @@ public Cursor(Device device, ImageData source, int hotspotX, int hotspotY) { SWT.error(SWT.ERROR_INVALID_ARGUMENT); } ImageData mask = source.getTransparencyMask(); - int[] result = Image.init(device, null, source, mask); - int hBitmap = result[0]; - int hMask = result[1]; + int /*long*/ [] result = Image.init(device, null, source, mask); + int /*long*/ hBitmap = result[0]; + int /*long*/ hMask = result[1]; /* Create the icon */ ICONINFO info = new ICONINFO(); info.fIcon = false; @@ -421,7 +421,7 @@ public boolean equals (Object object) { * @see #equals */ public int hashCode () { - return handle; + return (int)/*64*/handle; } /** diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Device.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Device.java index 030106f71b..a7aba8caa2 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Device.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Device.java @@ -41,11 +41,11 @@ public abstract class Device implements Drawable { * platforms and should never be accessed from application code. * </p> */ - public int hPalette = 0; + public int /*long*/ hPalette = 0; int [] colorRefCount; /* System Font */ - int systemFont; + int /*long*/ systemFont; /* Font Enumeration */ int nFonts = 256; @@ -54,10 +54,10 @@ public abstract class Device implements Drawable { int[] pixels; /* Scripts */ - int [] scripts; + int /*long*/ [] scripts; /* Advanced Graphics */ - int [] gdipToken; + int /*long*/ [] gdipToken; boolean disposed; @@ -166,7 +166,7 @@ void checkGDIP() { if (OS.IsWinCE) SWT.error(SWT.ERROR_NOT_IMPLEMENTED); int oldErrorMode = OS.SetErrorMode (OS.SEM_FAILCRITICALERRORS); try { - int [] token = new int [1]; + int /*long*/ [] token = new int /*long*/ [1]; GdiplusStartupInput input = new GdiplusStartupInput (); input.GdiplusVersion = 1; if (Gdip.GdiplusStartup (token, input, 0) == 0) { @@ -198,14 +198,14 @@ protected void create (DeviceData data) { } int computePixels(float height) { - int hDC = internal_new_GC (null); + int /*long*/ hDC = internal_new_GC (null); int pixels = -(int)(0.5f + (height * OS.GetDeviceCaps(hDC, OS.LOGPIXELSY) / 72f)); internal_dispose_GC (hDC, null); return pixels; } -float computePoints(LOGFONT logFont, int hFont) { - int hDC = internal_new_GC (null); +float computePoints(LOGFONT logFont, int /*long*/ hFont) { + int /*long*/ hDC = internal_new_GC (null); int logPixelsY = OS.GetDeviceCaps(hDC, OS.LOGPIXELSY); int pixels = 0; if (logFont.lfHeight > 0) { @@ -216,7 +216,7 @@ float computePoints(LOGFONT logFont, int hFont) { * height of a font in points does not include the internal leading, * we must subtract the internal leading, which requires a TEXTMETRIC. */ - int oldFont = OS.SelectObject(hDC, hFont); + int /*long*/ oldFont = OS.SelectObject(hDC, hFont); TEXTMETRIC lptm = OS.IsUnicode ? (TEXTMETRIC)new TEXTMETRICW() : new TEXTMETRICA(); OS.GetTextMetrics(hDC, lptm); OS.SelectObject(hDC, oldFont); @@ -277,8 +277,8 @@ void dispose_Object (Object object) { } } -int EnumFontFamProc (int lpelfe, int lpntme, int FontType, int lParam) { - boolean isScalable = (FontType & OS.RASTER_FONTTYPE) == 0; +int /*long*/ EnumFontFamProc (int /*long*/ lpelfe, int /*long*/ lpntme, int /*long*/ FontType, int /*long*/ lParam) { + boolean isScalable = ((int)/*64*/FontType & OS.RASTER_FONTTYPE) == 0; boolean scalable = lParam == 1; if (isScalable == scalable) { /* Add the log font to the list of log fonts */ @@ -324,7 +324,7 @@ int EnumFontFamProc (int lpelfe, int lpntme, int FontType, int lParam) { */ public Rectangle getBounds () { checkDevice (); - int hDC = internal_new_GC (null); + int /*long*/ hDC = internal_new_GC (null); int width = OS.GetDeviceCaps (hDC, OS.HORZRES); int height = OS.GetDeviceCaps (hDC, OS.VERTRES); internal_dispose_GC (hDC, null); @@ -397,7 +397,7 @@ public Rectangle getClientArea () { */ public int getDepth () { checkDevice (); - int hDC = internal_new_GC (null); + int /*long*/ hDC = internal_new_GC (null); int bits = OS.GetDeviceCaps (hDC, OS.BITSPIXEL); int planes = OS.GetDeviceCaps (hDC, OS.PLANES); internal_dispose_GC (hDC, null); @@ -417,7 +417,7 @@ public int getDepth () { */ public Point getDPI () { checkDevice (); - int hDC = internal_new_GC (null); + int /*long*/ hDC = internal_new_GC (null); int dpiX = OS.GetDeviceCaps (hDC, OS.LOGPIXELSX); int dpiY = OS.GetDeviceCaps (hDC, OS.LOGPIXELSY); internal_dispose_GC (hDC, null); @@ -442,7 +442,7 @@ public FontData [] getFontList (String faceName, boolean scalable) { /* Create the callback */ Callback callback = new Callback (this, "EnumFontFamProc", 4); //$NON-NLS-1$ - int lpEnumFontFamProc = callback.getAddress (); + int /*long*/ lpEnumFontFamProc = callback.getAddress (); if (lpEnumFontFamProc == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS); /* Initialize the instance variables */ @@ -456,7 +456,7 @@ public FontData [] getFontList (String faceName, boolean scalable) { /* Enumerate */ int offset = 0; - int hDC = internal_new_GC (null); + int /*long*/ hDC = internal_new_GC (null); if (faceName == null) { /* The user did not specify a face name, so they want all versions of all available face names */ OS.EnumFontFamilies (hDC, null, lpEnumFontFamProc, scalable ? 1 : 0); @@ -527,7 +527,7 @@ String getLastError () { String getLastErrorText () { int error = OS.GetLastError(); if (error == 0) return ""; //$NON-NLS-1$ - int[] buffer = new int[1]; + int /*long*/ [] buffer = new int /*long*/ [1]; int dwFlags = OS.FORMAT_MESSAGE_ALLOCATE_BUFFER | OS.FORMAT_MESSAGE_FROM_SYSTEM | OS.FORMAT_MESSAGE_IGNORE_INSERTS; int length = OS.FormatMessage(dwFlags, 0, error, OS.LANG_USER_DEFAULT, buffer, 0, 0); if (length == 0) return " [GetLastError=0x" + Integer.toHexString(error) + "]"; //$NON-NLS-1$ //$NON-NLS-2$ @@ -601,7 +601,7 @@ public Color getSystemColor (int id) { */ public Font getSystemFont () { checkDevice (); - int hFont = OS.GetStockObject (OS.SYSTEM_FONT); + int /*long*/ hFont = OS.GetStockObject (OS.SYSTEM_FONT); return Font.win32_new (this, hFont); } @@ -640,18 +640,18 @@ protected void init () { /* Initialize scripts list */ if (!OS.IsWinCE) { - int [] ppSp = new int [1]; + int /*long*/ [] ppSp = new int /*long*/ [1]; int [] piNumScripts = new int [1]; OS.ScriptGetProperties (ppSp, piNumScripts); - scripts = new int [piNumScripts [0]]; - OS.MoveMemory (scripts, ppSp [0], scripts.length * 4); + scripts = new int /*long*/ [piNumScripts [0]]; + OS.MoveMemory (scripts, ppSp [0], scripts.length * OS.PTR_SIZEOF); } /* * If we're not on a device which supports palettes, * don't create one. */ - int hDC = internal_new_GC (null); + int /*long*/ hDC = internal_new_GC (null); int rc = OS.GetDeviceCaps (hDC, OS.RASTERCAPS); int bits = OS.GetDeviceCaps (hDC, OS.BITSPIXEL); int planes = OS.GetDeviceCaps (hDC, OS.PLANES); @@ -723,7 +723,7 @@ protected void init () { * @param data the platform specific GC data * @return the platform specific GC handle */ -public abstract int internal_new_GC (GCData data); +public abstract int /*long*/ internal_new_GC (GCData data); /** * Invokes platform specific functionality to dispose a GC handle. @@ -738,7 +738,7 @@ public abstract int internal_new_GC (GCData data); * @param hDC the platform specific GC handle * @param data the platform specific GC data */ -public abstract void internal_dispose_GC (int hDC, GCData data); +public abstract void /*long*/ internal_dispose_GC (int /*long*/ hDC, GCData data); /** * Returns <code>true</code> if the device has been disposed, diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Font.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Font.java index e80f1cae54..6aace60fd1 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Font.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Font.java @@ -40,7 +40,7 @@ public final class Font extends Resource { * platforms and should never be accessed from application code. * </p> */ - public int handle; + public int /*long*/ handle; /** * Prevents uninitialized instances from being created outside the package. @@ -207,7 +207,7 @@ public FontData[] getFontData() { * @see #equals */ public int hashCode () { - return handle; + return (int)/*64*/handle; } void init (Device device, FontData fd) { @@ -260,7 +260,7 @@ public String toString () { * @param handle the handle for the font * @return a new font object containing the specified device and handle */ -public static Font win32_new(Device device, int handle) { +public static Font win32_new(Device device, int /*long*/ handle) { if (device == null) device = Device.getDevice(); Font font = new Font(); font.handle = handle; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/FontData.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/FontData.java index 7e18de3cab..f184e66986 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/FontData.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/FontData.java @@ -316,7 +316,7 @@ public boolean equals (Object object) { getName().equals(fd.getName()); } -int EnumLocalesProc(int lpLocaleString) { +int /*long*/ EnumLocalesProc(int /*long*/ lpLocaleString) { /* Get the locale ID */ int length = 8; @@ -525,7 +525,7 @@ public void setLocale(String locale) { data.lfCharSet = (byte)OS.DEFAULT_CHARSET; } else { Callback callback = new Callback (this, "EnumLocalesProc", 1); //$NON-NLS-1$ - int lpEnumLocalesProc = callback.getAddress (); + int /*long*/ lpEnumLocalesProc = callback.getAddress (); if (lpEnumLocalesProc == 0) SWT.error(SWT.ERROR_NO_MORE_CALLBACKS); OS.EnumSystemLocales(lpEnumLocalesProc, OS.LCID_SUPPORTED); callback.dispose (); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java index 44d8aee4d9..e1b63979af 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java @@ -58,7 +58,7 @@ public final class GC extends Resource { * platforms and should never be accessed from application code. * </p> */ - public int handle; + public int /*long*/ handle; Drawable drawable; GCData data; @@ -150,7 +150,7 @@ public GC(Drawable drawable, int style) { if (drawable == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); GCData data = new GCData (); data.style = checkStyle(style); - int hDC = drawable.internal_new_GC(data); + int /*long*/ hDC = drawable.internal_new_GC(data); Device device = data.device; if (device == null) device = Device.getDevice(); if (device == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); @@ -169,14 +169,14 @@ void checkGC(int mask) { if ((state & mask) == mask) return; state = (state ^ mask) & mask; data.state |= mask; - int gdipGraphics = data.gdipGraphics; + int /*long*/ gdipGraphics = data.gdipGraphics; if (gdipGraphics != 0) { - int pen = data.gdipPen; + int /*long*/ pen = data.gdipPen; float width = data.lineWidth; if ((state & FOREGROUND) != 0 || (pen == 0 && (state & (LINE_WIDTH | LINE_STYLE | LINE_MITERLIMIT | LINE_JOIN | LINE_CAP)) != 0)) { if (data.gdipFgBrush != 0) Gdip.SolidBrush_delete(data.gdipFgBrush); data.gdipFgBrush = 0; - int brush; + int /*long*/ brush; Pattern pattern = data.foregroundPattern; if (pattern != null) { brush = pattern.handle; @@ -192,7 +192,7 @@ void checkGC(int mask) { } else { int foreground = data.foreground; int rgb = ((foreground >> 16) & 0xFF) | (foreground & 0xFF00) | ((foreground & 0xFF) << 16); - int color = Gdip.Color_new(data.alpha << 24 | rgb); + int /*long*/ color = Gdip.Color_new(data.alpha << 24 | rgb); if (color == 0) SWT.error(SWT.ERROR_NO_HANDLES); brush = Gdip.SolidBrush_new(color); if (brush == 0) SWT.error(SWT.ERROR_NO_HANDLES); @@ -272,7 +272,7 @@ void checkGC(int mask) { if ((data.style & SWT.MIRRORED) != 0) { switch (Gdip.Brush_GetType(data.gdipBrush)) { case Gdip.BrushTypeTextureFill: - int brush = Gdip.Brush_Clone(data.gdipBrush); + int /*long*/ brush = Gdip.Brush_Clone(data.gdipBrush); if (brush == 0) SWT.error(SWT.ERROR_NO_HANDLES); Gdip.TextureBrush_ScaleTransform(brush, -1, 1, Gdip.MatrixOrderPrepend); data.gdipBrush = data.gdipBgBrush = brush; @@ -281,9 +281,9 @@ void checkGC(int mask) { } else { int background = data.background; int rgb = ((background >> 16) & 0xFF) | (background & 0xFF00) | ((background & 0xFF) << 16); - int color = Gdip.Color_new(data.alpha << 24 | rgb); + int /*long*/ color = Gdip.Color_new(data.alpha << 24 | rgb); if (color == 0) SWT.error(SWT.ERROR_NO_HANDLES); - int brush = Gdip.SolidBrush_new(color); + int /*long*/ brush = Gdip.SolidBrush_new(color); if (brush == 0) SWT.error(SWT.ERROR_NO_HANDLES); Gdip.Color_delete(color); data.gdipBrush = data.gdipBgBrush = brush; @@ -291,13 +291,13 @@ void checkGC(int mask) { } if ((state & FONT) != 0) { OS.SelectObject(handle, data.hFont); - int font = createGdipFont(handle, data.hFont); + int /*long*/ font = createGdipFont(handle, data.hFont); if (data.gdipFont != 0) Gdip.Font_delete(data.gdipFont); data.gdipFont = font; } if ((state & DRAW_OFFSET) != 0) { data.gdipXOffset = data.gdipYOffset = 0; - int matrix = Gdip.Matrix_new(1, 0, 0, 1, 0, 0); + int /*long*/ matrix = Gdip.Matrix_new(1, 0, 0, 1, 0, 0); float[] elements = new float[6]; Gdip.Graphics_GetTransform(gdipGraphics, matrix); Gdip.Matrix_GetElements(matrix, elements); @@ -360,7 +360,7 @@ void checkGC(int mask) { * PS_SOLID for pens wider than 1 pixel created with CreatePen(). The fix * is to use ExtCreatePen() instead. */ - int newPen; + int /*long*/ newPen; if (OS.IsWinCE || (width == 0 && lineStyle != OS.PS_USERSTYLE) || style == 0) { newPen = OS.CreatePen(style & OS.PS_STYLE_MASK, width, color); } else { @@ -383,7 +383,7 @@ void checkGC(int mask) { data.state &= ~PEN; } if ((state & BACKGROUND) != 0) { - int newBrush = OS.CreateSolidBrush(data.background); + int /*long*/ newBrush = OS.CreateSolidBrush(data.background); OS.SelectObject(handle, newBrush); data.state |= BRUSH; data.state &= ~NULL_BRUSH; @@ -430,8 +430,8 @@ public void copyArea(Image image, int x, int y) { /* Copy the bitmap area */ Rectangle rect = image.getBounds(); - int memHdc = OS.CreateCompatibleDC(handle); - int hOldBitmap = OS.SelectObject(memHdc, image.handle); + int /*long*/ memHdc = OS.CreateCompatibleDC(handle); + int /*long*/ hOldBitmap = OS.SelectObject(memHdc, image.handle); OS.BitBlt(memHdc, 0, 0, rect.width, rect.height, handle, x, y, OS.SRCCOPY); OS.SelectObject(memHdc, hOldBitmap); OS.DeleteDC(memHdc); @@ -481,12 +481,12 @@ public void copyArea(int srcX, int srcY, int width, int height, int destX, int d * Feature in WinCE. The function WindowFromDC is not part of the * WinCE SDK. The fix is to remember the HWND. */ - int hwnd = data.hwnd; + int /*long*/ hwnd = data.hwnd; if (hwnd == 0) { OS.BitBlt(handle, destX, destY, width, height, handle, srcX, srcY, OS.SRCCOPY); } else { RECT lprcClip = null; - int hrgn = OS.CreateRectRgn(0, 0, 0, 0); + int /*long*/ hrgn = OS.CreateRectRgn(0, 0, 0, 0); if (OS.GetClipRgn(handle, hrgn) == 1) { lprcClip = new RECT(); OS.GetRgnBox(hrgn, lprcClip); @@ -528,8 +528,8 @@ public void copyArea(int srcX, int srcY, int width, int height, int destX, int d } } -static int createGdipFont(int hDC, int hFont) { - int font = Gdip.Font_new(hDC, hFont); +static int /*long*/ createGdipFont(int /*long*/ hDC, int /*long*/ hFont) { + int /*long*/ font = Gdip.Font_new(hDC, hFont); if (font == 0) SWT.error(SWT.ERROR_NO_HANDLES); if (!Gdip.Font_IsAvailable(font)) { Gdip.Font_delete(font); @@ -564,7 +564,7 @@ static int createGdipFont(int hDC, int hFont) { return font; } -static void destroyGdipBrush(int brush) { +static void destroyGdipBrush(int /*long*/ brush) { int type = Gdip.Brush_GetType(brush); switch (type) { case Gdip.BrushTypeSolidColor: @@ -614,7 +614,7 @@ public void dispose() { * This will ensure that we have not left a bitmap * selected in it when we delete the HDC. */ - int hNullBitmap = data.hNullBitmap; + int /*long*/ hNullBitmap = data.hNullBitmap; if (hNullBitmap != 0) { OS.SelectObject(handle, hNullBitmap); data.hNullBitmap = 0; @@ -687,15 +687,15 @@ public void drawArc (int x, int y, int width, int height, int startAngle, int ar height = -height; } if (width == 0 || height == 0 || arcAngle == 0) return; - int gdipGraphics = data.gdipGraphics; + int /*long*/ gdipGraphics = data.gdipGraphics; if (gdipGraphics != 0) { Gdip.Graphics_TranslateTransform(gdipGraphics, data.gdipXOffset, data.gdipYOffset, Gdip.MatrixOrderPrepend); if (width == height) { Gdip.Graphics_DrawArc(gdipGraphics, data.gdipPen, x, y, width, height, -startAngle, -arcAngle); } else { - int path = Gdip.GraphicsPath_new(Gdip.FillModeAlternate); + int /*long*/ path = Gdip.GraphicsPath_new(Gdip.FillModeAlternate); if (path == 0) SWT.error(SWT.ERROR_NO_HANDLES); - int matrix = Gdip.Matrix_new(width, 0, 0, height, x, y); + int /*long*/ matrix = Gdip.Matrix_new(width, 0, 0, height, x, y); if (matrix == 0) SWT.error(SWT.ERROR_NO_HANDLES); Gdip.GraphicsPath_AddArc(path, 0, 0, 1, 1, -startAngle, -arcAngle); Gdip.GraphicsPath_Transform(path, matrix); @@ -776,12 +776,13 @@ public void drawArc (int x, int y, int width, int height, int startAngle, int ar public void drawFocus (int x, int y, int width, int height) { if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); if ((data.uiState & OS.UISF_HIDEFOCUS) != 0) return; - int hdc = handle, state = 0; - int gdipGraphics = data.gdipGraphics; + int /*long*/ hdc = handle; + int state = 0; + int /*long*/ gdipGraphics = data.gdipGraphics; if (gdipGraphics != 0) { - int clipRgn = 0; + int /*long*/ clipRgn = 0; Gdip.Graphics_SetPixelOffsetMode(gdipGraphics, Gdip.PixelOffsetModeNone); - int rgn = Gdip.Region_new(); + int /*long*/ rgn = Gdip.Region_new(); if (rgn == 0) SWT.error(SWT.ERROR_NO_HANDLES); Gdip.Graphics_GetClip(gdipGraphics, rgn); if (!Gdip.Region_IsInfinite(rgn, gdipGraphics)) { @@ -790,7 +791,7 @@ public void drawFocus (int x, int y, int width, int height) { Gdip.Region_delete(rgn); Gdip.Graphics_SetPixelOffsetMode(gdipGraphics, Gdip.PixelOffsetModeHalf); float[] lpXform = null; - int matrix = Gdip.Matrix_new(1, 0, 0, 1, 0, 0); + int /*long*/ matrix = Gdip.Matrix_new(1, 0, 0, 1, 0, 0); if (matrix == 0) SWT.error(SWT.ERROR_NO_HANDLES); Gdip.Graphics_GetTransform(gdipGraphics, matrix); if (!Gdip.Matrix_IsIdentity(matrix)) { @@ -892,8 +893,8 @@ public void drawImage(Image image, int srcX, int srcY, int srcWidth, int srcHeig void drawImage(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight, int destX, int destY, int destWidth, int destHeight, boolean simple) { if (data.gdipGraphics != 0) { //TODO - cache bitmap - int[] gdipImage = srcImage.createGdipImage(); - int img = gdipImage[0]; + int /*long*/ [] gdipImage = srcImage.createGdipImage(); + int /*long*/ img = gdipImage[0]; int imgWidth = Gdip.Image_GetWidth(img); int imgHeight = Gdip.Image_GetHeight(img); if (simple) { @@ -916,7 +917,7 @@ void drawImage(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight, * Note that if the wrap mode is not WrapModeTileFlipXY, the scaled image * is translucent around the borders. */ - int attrib = Gdip.ImageAttributes_new(); + int /*long*/ attrib = Gdip.ImageAttributes_new(); Gdip.ImageAttributes_SetWrapMode(attrib, Gdip.WrapModeTileFlipXY); if (data.alpha != 0xFF) { float[] matrix = new float[]{ @@ -941,7 +942,7 @@ void drawImage(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight, Gdip.ImageAttributes_delete(attrib); Gdip.Bitmap_delete(img); if (gdipImage[1] != 0) { - int hHeap = OS.GetProcessHeap (); + int /*long*/ hHeap = OS.GetProcessHeap (); OS.HeapFree(hHeap, 0, gdipImage[1]); } return; @@ -999,7 +1000,7 @@ void drawIcon(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight, i } /* Get the icon width and height */ - int hBitmap = srcIconInfo.hbmColor; + int /*long*/ hBitmap = srcIconInfo.hbmColor; if (hBitmap == 0) hBitmap = srcIconInfo.hbmMask; BITMAP bm = new BITMAP(); OS.GetObject(hBitmap, BITMAP.sizeof, bm); @@ -1028,20 +1029,20 @@ void drawIcon(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight, i /* Create the icon info and HDC's */ ICONINFO newIconInfo = new ICONINFO(); newIconInfo.fIcon = true; - int srcHdc = OS.CreateCompatibleDC(handle); - int dstHdc = OS.CreateCompatibleDC(handle); + int /*long*/ srcHdc = OS.CreateCompatibleDC(handle); + int /*long*/ dstHdc = OS.CreateCompatibleDC(handle); /* Blt the color bitmap */ int srcColorY = srcY; - int srcColor = srcIconInfo.hbmColor; + int /*long*/ srcColor = srcIconInfo.hbmColor; if (srcColor == 0) { srcColor = srcIconInfo.hbmMask; srcColorY += iconHeight; } - int oldSrcBitmap = OS.SelectObject(srcHdc, srcColor); + int /*long*/ oldSrcBitmap = OS.SelectObject(srcHdc, srcColor); newIconInfo.hbmColor = OS.CreateCompatibleBitmap(srcHdc, destWidth, destHeight); if (newIconInfo.hbmColor == 0) SWT.error(SWT.ERROR_NO_HANDLES); - int oldDestBitmap = OS.SelectObject(dstHdc, newIconInfo.hbmColor); + int /*long*/ oldDestBitmap = OS.SelectObject(dstHdc, newIconInfo.hbmColor); boolean stretch = !simple && (srcWidth != destWidth || srcHeight != destHeight); if (stretch) { if (!OS.IsWinCE) OS.SetStretchBltMode(dstHdc, OS.COLORONCOLOR); @@ -1070,7 +1071,7 @@ void drawIcon(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight, i } else { OS.SelectObject(srcHdc, oldSrcBitmap); OS.SelectObject(dstHdc, oldDestBitmap); - int hIcon = OS.CreateIconIndirect(newIconInfo); + int /*long*/ hIcon = OS.CreateIconIndirect(newIconInfo); if (hIcon == 0) SWT.error(SWT.ERROR_NO_HANDLES); if (offsetX != 0 || offsetY != 0) OS.SetWindowOrgEx(handle, 0, 0, null); OS.DrawIconEx(handle, destX - offsetX, destY - offsetY, hIcon, destWidth, destHeight, 0, 0, flags); @@ -1130,7 +1131,7 @@ void drawBitmap(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight, drawBitmap(srcImage, srcX, srcY, srcWidth, srcHeight, destX, destY, destWidth, destHeight, simple, bm, imgWidth, imgHeight); } if (mustRestore) { - int hOldBitmap = OS.SelectObject(memGC.handle, srcImage.handle); + int /*long*/ hOldBitmap = OS.SelectObject(memGC.handle, srcImage.handle); memGC.data.hNullBitmap = hOldBitmap; } } @@ -1146,16 +1147,16 @@ void drawBitmapAlpha(Image srcImage, int srcX, int srcY, int srcWidth, int srcHe if (OS.IsWinNT && OS.WIN32_VERSION >= OS.VERSION(4, 10)) { BLENDFUNCTION blend = new BLENDFUNCTION(); blend.BlendOp = OS.AC_SRC_OVER; - int srcHdc = OS.CreateCompatibleDC(handle); - int oldSrcBitmap = OS.SelectObject(srcHdc, srcImage.handle); + int /*long*/ srcHdc = OS.CreateCompatibleDC(handle); + int /*long*/ oldSrcBitmap = OS.SelectObject(srcHdc, srcImage.handle); if (srcImage.alpha != -1) { blend.SourceConstantAlpha = (byte)srcImage.alpha; OS.AlphaBlend(handle, destX, destY, destWidth, destHeight, srcHdc, srcX, srcY, srcWidth, srcHeight, blend); } else { - int memDib = Image.createDIB(srcWidth, srcHeight, 32); + int /*long*/ memDib = Image.createDIB(srcWidth, srcHeight, 32); if (memDib == 0) SWT.error(SWT.ERROR_NO_HANDLES); - int memHdc = OS.CreateCompatibleDC(handle); - int oldMemBitmap = OS.SelectObject(memHdc, memDib); + int /*long*/ memHdc = OS.CreateCompatibleDC(handle); + int /*long*/ oldMemBitmap = OS.SelectObject(memHdc, memDib); BITMAP dibBM = new BITMAP(); OS.GetObject(memDib, BITMAP.sizeof, dibBM); OS.BitBlt(memHdc, 0, 0, srcWidth, srcHeight, srcHdc, srcX, srcY, OS.SRCCOPY); @@ -1217,12 +1218,12 @@ void drawBitmapAlpha(Image srcImage, int srcX, int srcY, int srcWidth, int srcHe srcHeight = Math.max(1, sy2 - sy1); /* Create resources */ - int srcHdc = OS.CreateCompatibleDC(handle); - int oldSrcBitmap = OS.SelectObject(srcHdc, srcImage.handle); - int memHdc = OS.CreateCompatibleDC(handle); - int memDib = Image.createDIB(Math.max(srcWidth, destWidth), Math.max(srcHeight, destHeight), 32); + int /*long*/ srcHdc = OS.CreateCompatibleDC(handle); + int /*long*/ oldSrcBitmap = OS.SelectObject(srcHdc, srcImage.handle); + int /*long*/ memHdc = OS.CreateCompatibleDC(handle); + int /*long*/ memDib = Image.createDIB(Math.max(srcWidth, destWidth), Math.max(srcHeight, destHeight), 32); if (memDib == 0) SWT.error(SWT.ERROR_NO_HANDLES); - int oldMemBitmap = OS.SelectObject(memHdc, memDib); + int /*long*/ oldMemBitmap = OS.SelectObject(memHdc, memDib); BITMAP dibBM = new BITMAP(); OS.GetObject(memDib, BITMAP.sizeof, dibBM); @@ -1266,10 +1267,10 @@ void drawBitmapAlpha(Image srcImage, int srcX, int srcY, int srcWidth, int srcHe * source and destination HDCs are the same. */ if ((OS.IsWinCE && (destWidth > srcWidth || destHeight > srcHeight)) || (!OS.IsWinNT && !OS.IsWinCE)) { - int tempHdc = OS.CreateCompatibleDC(handle); - int tempDib = Image.createDIB(destWidth, destHeight, 32); + int /*long*/ tempHdc = OS.CreateCompatibleDC(handle); + int /*long*/ tempDib = Image.createDIB(destWidth, destHeight, 32); if (tempDib == 0) SWT.error(SWT.ERROR_NO_HANDLES); - int oldTempBitmap = OS.SelectObject(tempHdc, tempDib); + int /*long*/ oldTempBitmap = OS.SelectObject(tempHdc, tempDib); if (!simple && (srcWidth != destWidth || srcHeight != destHeight)) { if (!OS.IsWinCE) OS.SetStretchBltMode(memHdc, OS.COLORONCOLOR); OS.StretchBlt(tempHdc, 0, 0, destWidth, destHeight, memHdc, 0, 0, srcWidth, srcHeight, OS.SRCCOPY); @@ -1316,13 +1317,13 @@ void drawBitmapAlpha(Image srcImage, int srcX, int srcY, int srcWidth, int srcHe OS.DeleteDC(srcHdc); } -void drawBitmapTransparentByClipping(int srcHdc, int maskHdc, int srcX, int srcY, int srcWidth, int srcHeight, int destX, int destY, int destWidth, int destHeight, boolean simple, int imgWidth, int imgHeight) { +void drawBitmapTransparentByClipping(int /*long*/ srcHdc, int /*long*/ maskHdc, int srcX, int srcY, int srcWidth, int srcHeight, int destX, int destY, int destWidth, int destHeight, boolean simple, int imgWidth, int imgHeight) { /* Create a clipping region from the mask */ - int rgn = OS.CreateRectRgn(0, 0, 0, 0); + int /*long*/ rgn = OS.CreateRectRgn(0, 0, 0, 0); for (int y=0; y<imgHeight; y++) { for (int x=0; x<imgWidth; x++) { if (OS.GetPixel(maskHdc, x, y) == 0) { - int tempRgn = OS.CreateRectRgn(x, y, x+1, y+1); + int /*long*/ tempRgn = OS.CreateRectRgn(x, y, x+1, y+1); OS.CombineRgn(rgn, rgn, tempRgn, OS.RGN_OR); OS.DeleteObject(tempRgn); } @@ -1334,12 +1335,12 @@ void drawBitmapTransparentByClipping(int srcHdc, int maskHdc, int srcX, int srcY int[] lpRgnData = new int[nBytes / 4]; OS.GetRegionData (rgn, nBytes, lpRgnData); float[] lpXform = new float[] {(float)destWidth/srcWidth, 0, 0, (float)destHeight/srcHeight, 0, 0}; - int tmpRgn = OS.ExtCreateRegion(lpXform, nBytes, lpRgnData); + int /*long*/ tmpRgn = OS.ExtCreateRegion(lpXform, nBytes, lpRgnData); OS.DeleteObject(rgn); rgn = tmpRgn; } OS.OffsetRgn(rgn, destX, destY); - int clip = OS.CreateRectRgn(0, 0, 0, 0); + int /*long*/ clip = OS.CreateRectRgn(0, 0, 0, 0); int result = OS.GetClipRgn(handle, clip); if (result == 1) OS.CombineRgn(rgn, rgn, clip, OS.RGN_AND); OS.SelectClipRgn(handle, rgn); @@ -1364,16 +1365,17 @@ void drawBitmapTransparentByClipping(int srcHdc, int maskHdc, int srcX, int srcY OS.DeleteObject(rgn); } -void drawBitmapMask(Image srcImage, int srcColor, int srcMask, int srcX, int srcY, int srcWidth, int srcHeight, int destX, int destY, int destWidth, int destHeight, boolean simple, int imgWidth, int imgHeight, boolean offscreen) { +void drawBitmapMask(Image srcImage, int /*long*/ srcColor, int /*long*/ srcMask, int srcX, int srcY, int srcWidth, int srcHeight, int destX, int destY, int destWidth, int destHeight, boolean simple, int imgWidth, int imgHeight, boolean offscreen) { int srcColorY = srcY; if (srcColor == 0) { srcColor = srcMask; srcColorY += imgHeight; } - int srcHdc = OS.CreateCompatibleDC(handle); - int oldSrcBitmap = OS.SelectObject(srcHdc, srcColor); - int destHdc = handle, x = destX, y = destY; - int tempHdc = 0, tempBitmap = 0, oldTempBitmap = 0; + int /*long*/ srcHdc = OS.CreateCompatibleDC(handle); + int /*long*/ oldSrcBitmap = OS.SelectObject(srcHdc, srcColor); + int /*long*/ destHdc = handle; + int x = destX, y = destY; + int /*long*/ tempHdc = 0, tempBitmap = 0, oldTempBitmap = 0; int oldBkColor = 0, oldTextColor = 0; if (offscreen) { tempHdc = OS.CreateCompatibleDC(handle); @@ -1421,9 +1423,9 @@ void drawBitmapTransparent(Image srcImage, int srcX, int srcY, int srcWidth, int /* Find the RGB values for the transparent pixel. */ int transBlue = 0, transGreen = 0, transRed = 0; boolean isDib = bm.bmBits != 0; - int hBitmap = srcImage.handle; - int srcHdc = OS.CreateCompatibleDC(handle); - int oldSrcBitmap = OS.SelectObject(srcHdc, hBitmap); + int /*long*/ hBitmap = srcImage.handle; + int /*long*/ srcHdc = OS.CreateCompatibleDC(handle); + int /*long*/ oldSrcBitmap = OS.SelectObject(srcHdc, hBitmap); byte[] originalColors = null; if (bm.bmBitsPixel <= 8) { if (isDib) { @@ -1522,9 +1524,9 @@ void drawBitmapTransparent(Image srcImage, int srcX, int srcY, int srcWidth, int OS.SetStretchBltMode(handle, mode); } else { /* Create the mask for the source image */ - int maskHdc = OS.CreateCompatibleDC(handle); - int maskBitmap = OS.CreateBitmap(imgWidth, imgHeight, 1, 1, null); - int oldMaskBitmap = OS.SelectObject(maskHdc, maskBitmap); + int /*long*/ maskHdc = OS.CreateCompatibleDC(handle); + int /*long*/ maskBitmap = OS.CreateBitmap(imgWidth, imgHeight, 1, 1, null); + int /*long*/ oldMaskBitmap = OS.SelectObject(maskHdc, maskBitmap); OS.SetBkColor(srcHdc, transparentColor); OS.BitBlt(maskHdc, 0, 0, imgWidth, imgHeight, srcHdc, 0, 0, OS.SRCCOPY); if (originalColors != null) OS.SetDIBColorTable(srcHdc, 0, 1 << bm.bmBitsPixel, originalColors); @@ -1534,9 +1536,9 @@ void drawBitmapTransparent(Image srcImage, int srcX, int srcY, int srcWidth, int drawBitmapTransparentByClipping(srcHdc, maskHdc, srcX, srcY, srcWidth, srcHeight, destX, destY, destWidth, destHeight, simple, imgWidth, imgHeight); } else { /* Draw the source bitmap transparently using invert/and mask/invert */ - int tempHdc = OS.CreateCompatibleDC(handle); - int tempBitmap = OS.CreateCompatibleBitmap(handle, destWidth, destHeight); - int oldTempBitmap = OS.SelectObject(tempHdc, tempBitmap); + int /*long*/ tempHdc = OS.CreateCompatibleDC(handle); + int /*long*/ tempBitmap = OS.CreateCompatibleBitmap(handle, destWidth, destHeight); + int /*long*/ oldTempBitmap = OS.SelectObject(tempHdc, tempBitmap); OS.BitBlt(tempHdc, 0, 0, destWidth, destHeight, handle, destX, destY, OS.SRCCOPY); if (!simple && (srcWidth != destWidth || srcHeight != destHeight)) { if (!OS.IsWinCE) OS.SetStretchBltMode(tempHdc, OS.COLORONCOLOR); @@ -1563,8 +1565,8 @@ void drawBitmapTransparent(Image srcImage, int srcX, int srcY, int srcWidth, int } void drawBitmap(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight, int destX, int destY, int destWidth, int destHeight, boolean simple, BITMAP bm, int imgWidth, int imgHeight) { - int srcHdc = OS.CreateCompatibleDC(handle); - int oldSrcBitmap = OS.SelectObject(srcHdc, srcImage.handle); + int /*long*/ srcHdc = OS.CreateCompatibleDC(handle); + int /*long*/ oldSrcBitmap = OS.SelectObject(srcHdc, srcImage.handle); int rop2 = 0; if (!OS.IsWinCE) { rop2 = OS.GetROP2(handle); @@ -1601,7 +1603,7 @@ void drawBitmap(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight, public void drawLine (int x1, int y1, int x2, int y2) { if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); checkGC(DRAW); - int gdipGraphics = data.gdipGraphics; + int /*long*/ gdipGraphics = data.gdipGraphics; if (gdipGraphics != 0) { Gdip.Graphics_TranslateTransform(gdipGraphics, data.gdipXOffset, data.gdipYOffset, Gdip.MatrixOrderPrepend); Gdip.Graphics_DrawLine(gdipGraphics, data.gdipPen, x1, y1, x2, y2); @@ -1650,7 +1652,7 @@ public void drawLine (int x1, int y1, int x2, int y2) { public void drawOval (int x, int y, int width, int height) { if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); checkGC(DRAW); - int gdipGraphics = data.gdipGraphics; + int /*long*/ gdipGraphics = data.gdipGraphics; if (gdipGraphics != 0) { Gdip.Graphics_TranslateTransform(gdipGraphics, data.gdipXOffset, data.gdipYOffset, Gdip.MatrixOrderPrepend); Gdip.Graphics_DrawEllipse(gdipGraphics, data.gdipPen, x, y, width, height); @@ -1692,7 +1694,7 @@ public void drawPath (Path path) { if (path.handle == 0) SWT.error(SWT.ERROR_INVALID_ARGUMENT); initGdip(); checkGC(DRAW); - int gdipGraphics = data.gdipGraphics; + int /*long*/ gdipGraphics = data.gdipGraphics; Gdip.Graphics_TranslateTransform(gdipGraphics, data.gdipXOffset, data.gdipYOffset, Gdip.MatrixOrderPrepend); Gdip.Graphics_DrawPath(gdipGraphics, data.gdipPen, path.handle); Gdip.Graphics_TranslateTransform(gdipGraphics, -data.gdipXOffset, -data.gdipYOffset, Gdip.MatrixOrderPrepend); @@ -1746,7 +1748,7 @@ public void drawPolygon(int[] pointArray) { if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); if (pointArray == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); checkGC(DRAW); - int gdipGraphics = data.gdipGraphics; + int /*long*/ gdipGraphics = data.gdipGraphics; if (gdipGraphics != 0) { Gdip.Graphics_TranslateTransform(gdipGraphics, data.gdipXOffset, data.gdipYOffset, Gdip.MatrixOrderPrepend); Gdip.Graphics_DrawPolygon(gdipGraphics, data.gdipPen, pointArray, pointArray.length / 2); @@ -1791,7 +1793,7 @@ public void drawPolyline(int[] pointArray) { if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); if (pointArray == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); checkGC(DRAW); - int gdipGraphics = data.gdipGraphics; + int /*long*/ gdipGraphics = data.gdipGraphics; if (gdipGraphics != 0) { Gdip.Graphics_TranslateTransform(gdipGraphics, data.gdipXOffset, data.gdipYOffset, Gdip.MatrixOrderPrepend); Gdip.Graphics_DrawLines(gdipGraphics, data.gdipPen, pointArray, pointArray.length / 2); @@ -1839,7 +1841,7 @@ public void drawPolyline(int[] pointArray) { public void drawRectangle (int x, int y, int width, int height) { if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); checkGC(DRAW); - int gdipGraphics = data.gdipGraphics; + int /*long*/ gdipGraphics = data.gdipGraphics; if (gdipGraphics != 0) { Gdip.Graphics_TranslateTransform(gdipGraphics, data.gdipXOffset, data.gdipYOffset, Gdip.MatrixOrderPrepend); Gdip.Graphics_DrawRectangle(gdipGraphics, data.gdipPen, x, y, width, height); @@ -1957,7 +1959,7 @@ public void drawRoundRectangle (int x, int y, int width, int height, int arcWidt } } -void drawRoundRectangleGdip (int gdipGraphics, int pen, int x, int y, int width, int height, int arcWidth, int arcHeight) { +void drawRoundRectangleGdip (int /*long*/ gdipGraphics, int /*long*/ pen, int x, int y, int width, int height, int arcWidth, int arcHeight) { int nx = x; int ny = y; int nw = width; @@ -1979,7 +1981,7 @@ void drawRoundRectangleGdip (int gdipGraphics, int pen, int x, int y, int width, nah = 0 - nah; Gdip.Graphics_TranslateTransform(gdipGraphics, data.gdipXOffset, data.gdipYOffset, Gdip.MatrixOrderPrepend); - int path = Gdip.GraphicsPath_new(Gdip.FillModeAlternate); + int /*long*/ path = Gdip.GraphicsPath_new(Gdip.FillModeAlternate); if (path == 0) SWT.error(SWT.ERROR_NO_HANDLES); if (nw > naw) { if (nh > nah) { @@ -2055,11 +2057,11 @@ public void drawString (String string, int x, int y, boolean isTransparent) { if (length == 0) return; char[] buffer = new char [length]; string.getChars(0, length, buffer, 0); - int gdipGraphics = data.gdipGraphics; + int /*long*/ gdipGraphics = data.gdipGraphics; if (gdipGraphics != 0) { checkGC(FONT | FOREGROUND | (isTransparent ? 0 : BACKGROUND)); PointF pt = new PointF(); - int format = Gdip.StringFormat_Clone(Gdip.StringFormat_GenericTypographic()); + int /*long*/ format = Gdip.StringFormat_Clone(Gdip.StringFormat_GenericTypographic()); int formatFlags = Gdip.StringFormat_GetFormatFlags(format) | Gdip.StringFormatFlagsMeasureTrailingSpaces; if ((data.style & SWT.MIRRORED) != 0) formatFlags |= Gdip.StringFormatFlagsDirectionRightToLeft; Gdip.StringFormat_SetFormatFlags(format, formatFlags); @@ -2068,7 +2070,8 @@ public void drawString (String string, int x, int y, boolean isTransparent) { Gdip.Graphics_MeasureString(gdipGraphics, buffer, length, data.gdipFont, pt, format, bounds); Gdip.Graphics_FillRectangle(gdipGraphics, data.gdipBrush, x, y, Math.round(bounds.Width), Math.round(bounds.Height)); } - int gstate = 0, brush = getFgBrush(); + int gstate = 0; + int /*long*/ brush = getFgBrush(); if ((data.style & SWT.MIRRORED) != 0) { switch (Gdip.Brush_GetType(brush)) { case Gdip.BrushTypeLinearGradient: @@ -2136,10 +2139,10 @@ public void drawString (String string, int x, int y, boolean isTransparent) { OS.GetTextExtentPoint32W(handle, buffer, length, size); } int width = size.cx, height = size.cy; - int hBitmap = OS.CreateCompatibleBitmap(handle, width, height); + int /*long*/ hBitmap = OS.CreateCompatibleBitmap(handle, width, height); if (hBitmap == 0) SWT.error(SWT.ERROR_NO_HANDLES); - int memDC = OS.CreateCompatibleDC(handle); - int hOldBitmap = OS.SelectObject(memDC, hBitmap); + int /*long*/ memDC = OS.CreateCompatibleDC(handle); + int /*long*/ hOldBitmap = OS.SelectObject(memDC, hBitmap); OS.PatBlt(memDC, 0, 0, width, height, OS.BLACKNESS); OS.SetBkMode(memDC, OS.TRANSPARENT); OS.SetTextColor(memDC, foreground); @@ -2245,14 +2248,14 @@ public void drawText (String string, int x, int y, int flags) { if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); if (string == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); if (string.length() == 0) return; - int gdipGraphics = data.gdipGraphics; + int /*long*/ gdipGraphics = data.gdipGraphics; if (gdipGraphics != 0) { checkGC(FONT | FOREGROUND | ((flags & SWT.DRAW_TRANSPARENT) != 0 ? 0 : BACKGROUND)); int length = string.length(); char[] buffer = new char [length]; string.getChars(0, length, buffer, 0); PointF pt = new PointF(); - int format = Gdip.StringFormat_Clone(Gdip.StringFormat_GenericTypographic()); + int /*long*/ format = Gdip.StringFormat_Clone(Gdip.StringFormat_GenericTypographic()); int formatFlags = Gdip.StringFormat_GetFormatFlags(format) | Gdip.StringFormatFlagsMeasureTrailingSpaces; if ((data.style & SWT.MIRRORED) != 0) formatFlags |= Gdip.StringFormatFlagsDirectionRightToLeft; Gdip.StringFormat_SetFormatFlags(format, formatFlags); @@ -2266,7 +2269,8 @@ public void drawText (String string, int x, int y, int flags) { Gdip.Graphics_MeasureString(gdipGraphics, buffer, length, data.gdipFont, pt, format, bounds); Gdip.Graphics_FillRectangle(gdipGraphics, data.gdipBrush, x, y, Math.round(bounds.Width), Math.round(bounds.Height)); } - int gstate = 0, brush = getFgBrush(); + int gstate = 0; + int /*long*/ brush = getFgBrush(); if ((data.style & SWT.MIRRORED) != 0) { switch (Gdip.Brush_GetType(brush)) { case Gdip.BrushTypeLinearGradient: @@ -2339,10 +2343,10 @@ public void drawText (String string, int x, int y, int flags) { OS.DrawText(handle, buffer, buffer.length(), rect, uFormat | OS.DT_CALCRECT); int width = rect.right - rect.left; int height = rect.bottom - rect.top; - int hBitmap = OS.CreateCompatibleBitmap(handle, width, height); + int /*long*/ hBitmap = OS.CreateCompatibleBitmap(handle, width, height); if (hBitmap == 0) SWT.error(SWT.ERROR_NO_HANDLES); - int memDC = OS.CreateCompatibleDC(handle); - int hOldBitmap = OS.SelectObject(memDC, hBitmap); + int /*long*/ memDC = OS.CreateCompatibleDC(handle); + int /*long*/ hOldBitmap = OS.SelectObject(memDC, hBitmap); OS.PatBlt(memDC, 0, 0, width, height, OS.BLACKNESS); OS.SetBkMode(memDC, OS.TRANSPARENT); OS.SetTextColor(memDC, foreground); @@ -2421,7 +2425,7 @@ public void fillArc (int x, int y, int width, int height, int startAngle, int ar height = -height; } if (width == 0 || height == 0 || arcAngle == 0) return; - int gdipGraphics = data.gdipGraphics; + int /*long*/ gdipGraphics = data.gdipGraphics; if (gdipGraphics != 0) { if (width == height) { Gdip.Graphics_FillPie(gdipGraphics, data.gdipBrush, x, y, width, height, -startAngle, -arcAngle); @@ -2552,12 +2556,12 @@ public void fillGradientRectangle(int x, int y, int width, int height, boolean v p2.Y = p1.Y; } int rgb = ((fromRGB.red & 0xFF) << 16) | ((fromRGB.green & 0xFF) << 8) | (fromRGB.blue & 0xFF); - int fromGpColor = Gdip.Color_new(data.alpha << 24 | rgb); + int /*long*/ fromGpColor = Gdip.Color_new(data.alpha << 24 | rgb); if (fromGpColor == 0) SWT.error(SWT.ERROR_NO_HANDLES); rgb = ((toRGB.red & 0xFF) << 16) | ((toRGB.green & 0xFF) << 8) | (toRGB.blue & 0xFF); - int toGpColor = Gdip.Color_new(data.alpha << 24 | rgb); + int /*long*/ toGpColor = Gdip.Color_new(data.alpha << 24 | rgb); if (toGpColor == 0) SWT.error(SWT.ERROR_NO_HANDLES); - int brush = Gdip.LinearGradientBrush_new(p1, p2, fromGpColor, toGpColor); + int /*long*/ brush = Gdip.LinearGradientBrush_new(p1, p2, fromGpColor, toGpColor); Gdip.Graphics_FillRectangle(data.gdipGraphics, brush, x, y, width, height); Gdip.LinearGradientBrush_delete(brush); Gdip.Color_delete(fromGpColor); @@ -2581,10 +2585,10 @@ public void fillGradientRectangle(int x, int y, int width, int height, boolean v rop2 = OS.GetROP2(handle); } if (OS.IsWinNT && rop2 != OS.R2_XORPEN && OS.GetDeviceCaps(handle, OS.TECHNOLOGY) != OS.DT_RASPRINTER) { - final int hHeap = OS.GetProcessHeap(); - final int pMesh = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, GRADIENT_RECT.sizeof + TRIVERTEX.sizeof * 2); + final int /*long*/ hHeap = OS.GetProcessHeap(); + final int /*long*/ pMesh = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, GRADIENT_RECT.sizeof + TRIVERTEX.sizeof * 2); if (pMesh == 0) SWT.error(SWT.ERROR_NO_HANDLES); - final int pVertex = pMesh + GRADIENT_RECT.sizeof; + final int /*long*/ pVertex = pMesh + GRADIENT_RECT.sizeof; GRADIENT_RECT gradientRect = new GRADIENT_RECT(); gradientRect.UpperLeft = 0; @@ -2803,7 +2807,7 @@ public void fillRoundRectangle (int x, int y, int width, int height, int arcWidt OS.RoundRect(handle, x,y,x+width+1,y+height+1,arcWidth, arcHeight); } -void fillRoundRectangleGdip (int gdipGraphics, int brush, int x, int y, int width, int height, int arcWidth, int arcHeight) { +void fillRoundRectangleGdip (int /*long*/ gdipGraphics, int /*long*/ brush, int x, int y, int width, int height, int arcWidth, int arcHeight) { int nx = x; int ny = y; int nw = width; @@ -2824,7 +2828,7 @@ void fillRoundRectangleGdip (int gdipGraphics, int brush, int x, int y, int widt if (nah < 0) nah = 0 - nah; - int path = Gdip.GraphicsPath_new(Gdip.FillModeAlternate); + int /*long*/ path = Gdip.GraphicsPath_new(Gdip.FillModeAlternate); if (path == 0) SWT.error(SWT.ERROR_NO_HANDLES); if (nw > naw) { if (nh > nah) { @@ -2857,7 +2861,7 @@ void flush () { * underline HDC. This is done by calling GetHDC() * followed by ReleaseHDC(). */ - int hdc = Gdip.Graphics_GetHDC(data.gdipGraphics); + int /*long*/ hdc = Gdip.Graphics_GetHDC(data.gdipGraphics); Gdip.Graphics_ReleaseHDC(data.gdipGraphics, hdc); } } @@ -3060,7 +3064,7 @@ public int getCharWidth(char ch) { */ public Rectangle getClipping() { if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); - int gdipGraphics = data.gdipGraphics; + int /*long*/ gdipGraphics = data.gdipGraphics; if (gdipGraphics != 0) { Rect rect = new Rect(); Gdip.Graphics_SetPixelOffsetMode(gdipGraphics, Gdip.PixelOffsetModeNone); @@ -3091,9 +3095,9 @@ public void getClipping (Region region) { if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); if (region == null) SWT.error (SWT.ERROR_NULL_ARGUMENT); if (region.isDisposed()) SWT.error (SWT.ERROR_INVALID_ARGUMENT); - int gdipGraphics = data.gdipGraphics; + int /*long*/ gdipGraphics = data.gdipGraphics; if (gdipGraphics != 0) { - int rgn = Gdip.Region_new(); + int /*long*/ rgn = Gdip.Region_new(); Gdip.Graphics_GetClip(data.gdipGraphics, rgn); if (Gdip.Region_IsInfinite(rgn, gdipGraphics)) { Rect rect = new Rect(); @@ -3102,11 +3106,11 @@ public void getClipping (Region region) { Gdip.Graphics_SetPixelOffsetMode(gdipGraphics, Gdip.PixelOffsetModeHalf); OS.SetRectRgn(region.handle, rect.X, rect.Y, rect.X + rect.Width, rect.Y + rect.Height); } else { - int matrix = Gdip.Matrix_new(1, 0, 0, 1, 0, 0); - int identity = Gdip.Matrix_new(1, 0, 0, 1, 0, 0); + int /*long*/ matrix = Gdip.Matrix_new(1, 0, 0, 1, 0, 0); + int /*long*/ identity = Gdip.Matrix_new(1, 0, 0, 1, 0, 0); Gdip.Graphics_GetTransform(gdipGraphics, matrix); Gdip.Graphics_SetTransform(gdipGraphics, identity); - int hRgn = Gdip.Region_GetHRGN(rgn, data.gdipGraphics); + int /*long*/ hRgn = Gdip.Region_GetHRGN(rgn, data.gdipGraphics); Gdip.Graphics_SetTransform(gdipGraphics, matrix); Gdip.Matrix_delete(identity); Gdip.Matrix_delete(matrix); @@ -3127,22 +3131,22 @@ public void getClipping (Region region) { OS.OffsetRgn (region.handle, pt.x, pt.y); } if (!OS.IsWinCE) { - int metaRgn = OS.CreateRectRgn (0, 0, 0, 0); + int /*long*/ metaRgn = OS.CreateRectRgn (0, 0, 0, 0); if (OS.GetMetaRgn (handle, metaRgn) != 0) { OS.OffsetRgn (metaRgn, pt.x, pt.y); OS.CombineRgn (region.handle, metaRgn, region.handle, OS.RGN_AND); } OS.DeleteObject(metaRgn); - int hwnd = data.hwnd; + int /*long*/ hwnd = data.hwnd; if (hwnd != 0 && data.ps != null) { - int sysRgn = OS.CreateRectRgn (0, 0, 0, 0); + int /*long*/ sysRgn = OS.CreateRectRgn (0, 0, 0, 0); if (OS.GetRandomRgn (handle, sysRgn, OS.SYSRGN) == 1) { if (OS.WIN32_VERSION >= OS.VERSION(4, 10)) { if ((OS.GetLayout(handle) & OS.LAYOUT_RTL) != 0) { int nBytes = OS.GetRegionData (sysRgn, 0, null); int [] lpRgnData = new int [nBytes / 4]; OS.GetRegionData (sysRgn, nBytes, lpRgnData); - int newSysRgn = OS.ExtCreateRegion(new float [] {-1, 0, 0, 1, 0, 0}, nBytes, lpRgnData); + int /*long*/ newSysRgn = OS.ExtCreateRegion(new float [] {-1, 0, 0, 1, 0, 0}, nBytes, lpRgnData); OS.DeleteObject(sysRgn); sysRgn = newSysRgn; } @@ -3166,7 +3170,7 @@ int getCodePage () { return lpCs[1]; } -int getFgBrush() { +int /*long*/ getFgBrush() { return data.foregroundPattern != null ? data.foregroundPattern.handle : data.gdipFgBrush; } @@ -3499,10 +3503,10 @@ public void getTransform(Transform transform) { if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); if (transform == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); if (transform.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT); - int gdipGraphics = data.gdipGraphics; + int /*long*/ gdipGraphics = data.gdipGraphics; if (gdipGraphics != 0) { Gdip.Graphics_GetTransform(gdipGraphics, transform.handle); - int identity = identity(); + int /*long*/ identity = identity(); Gdip.Matrix_Invert(identity); Gdip.Matrix_Multiply(transform.handle, identity, Gdip.MatrixOrderAppend); Gdip.Matrix_delete(identity); @@ -3539,7 +3543,7 @@ public boolean getXORMode() { void initGdip() { data.device.checkGDIP(); - int gdipGraphics = data.gdipGraphics; + int /*long*/ gdipGraphics = data.gdipGraphics; if (gdipGraphics != 0) return; /* * Feature in GDI+. The GDI+ clipping set with Graphics->SetClip() @@ -3548,7 +3552,7 @@ void initGdip() { * cannot be reset. The fix is to clear the clipping before * the GDI+ graphics is created and reset it afterwards. */ - int hRgn = OS.CreateRectRgn(0, 0, 0, 0); + int /*long*/ hRgn = OS.CreateRectRgn(0, 0, 0, 0); int result = OS.GetClipRgn(handle, hRgn); if (!OS.IsWinCE) { POINT pt = new POINT (); @@ -3573,7 +3577,7 @@ void initGdip() { Gdip.Graphics_SetPageUnit(gdipGraphics, Gdip.UnitPixel); Gdip.Graphics_SetPixelOffsetMode(gdipGraphics, Gdip.PixelOffsetModeHalf); if ((data.style & SWT.MIRRORED) != 0) { - int matrix = identity(); + int /*long*/ matrix = identity(); Gdip.Graphics_SetTransform(gdipGraphics, matrix); Gdip.Matrix_delete(matrix); } @@ -3592,7 +3596,7 @@ void initGdip() { } } -int identity() { +int /*long*/ identity() { if ((data.style & SWT.MIRRORED) != 0) { int width = 0; Image image = data.image; @@ -3612,7 +3616,7 @@ int identity() { return Gdip.Matrix_new(1, 0, 0, 1, 0, 0); } -void init(Drawable drawable, GCData data, int hDC) { +void init(Drawable drawable, GCData data, int /*long*/ hDC) { int foreground = data.foreground; if (foreground != -1) { data.state &= ~(FOREGROUND | FOREGROUND_TEXT | PEN); @@ -3626,13 +3630,13 @@ void init(Drawable drawable, GCData data, int hDC) { data.background = OS.GetBkColor(hDC); } data.state &= ~(NULL_BRUSH | NULL_PEN); - int hFont = data.hFont; + int /*long*/ hFont = data.hFont; if (hFont != 0) { data.state &= ~FONT; } else { hFont = OS.GetCurrentObject(hDC, OS.OBJ_FONT); } - int hPalette = data.device.hPalette; + int /*long*/ hPalette = data.device.hPalette; if (hPalette != 0) { OS.SelectPalette(hDC, hPalette, true); OS.RealizePalette(hDC); @@ -3673,7 +3677,7 @@ void init(Drawable drawable, GCData data, int hDC) { * @see #equals */ public int hashCode () { - return handle; + return (int)/*64*/handle; } /** @@ -3692,7 +3696,7 @@ public int hashCode () { */ public boolean isClipped() { if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); - int region = OS.CreateRectRgn(0, 0, 0, 0); + int /*long*/ region = OS.CreateRectRgn(0, 0, 0, 0); int result = OS.GetClipRgn(handle, region); OS.DeleteObject(region); return result > 0; @@ -3712,7 +3716,7 @@ public boolean isDisposed() { return handle == 0; } -float measureSpace(int font, int format) { +float measureSpace(int /*long*/ font, int /*long*/ format) { PointF pt = new PointF(); RectF bounds = new RectF(); Gdip.Graphics_MeasureString(data.gdipGraphics, new char[]{' '}, 1, font, pt, format, bounds); @@ -3915,12 +3919,12 @@ public void setBackgroundPattern (Pattern pattern) { data.state &= ~BACKGROUND; } -void setClipping(int clipRgn) { - int hRgn = clipRgn; - int gdipGraphics = data.gdipGraphics; +void setClipping(int /*long*/ clipRgn) { + int /*long*/ hRgn = clipRgn; + int /*long*/ gdipGraphics = data.gdipGraphics; if (gdipGraphics != 0) { if (hRgn != 0) { - int region = Gdip.Region_new(hRgn); + int /*long*/ region = Gdip.Region_new(hRgn); Gdip.Graphics_SetClip(gdipGraphics, region, Gdip.CombineModeReplace); Gdip.Region_delete(region); } else { @@ -3959,7 +3963,7 @@ void setClipping(int clipRgn) { */ public void setClipping (int x, int y, int width, int height) { if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); - int hRgn = OS.CreateRectRgn(x, y, x + width, y + height); + int /*long*/ hRgn = OS.CreateRectRgn(x, y, x + width, y + height); setClipping(hRgn); OS.DeleteObject(hRgn); } @@ -4588,7 +4592,7 @@ public void setTransform(Transform transform) { if (transform != null && transform.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT); if (data.gdipGraphics == 0 && transform == null) return; initGdip(); - int identity = identity(); + int /*long*/ identity = identity(); if (transform != null) { Gdip.Matrix_Multiply(identity, transform.handle, Gdip.MatrixOrderPrepend); } @@ -4631,7 +4635,7 @@ public Point stringExtent(String string) { } else { buffer = new char[]{' '}; } - int format = Gdip.StringFormat_Clone(Gdip.StringFormat_GenericTypographic()); + int /*long*/ format = Gdip.StringFormat_Clone(Gdip.StringFormat_GenericTypographic()); int formatFlags = Gdip.StringFormat_GetFormatFlags(format) | Gdip.StringFormatFlagsMeasureTrailingSpaces; if ((data.style & SWT.MIRRORED) != 0) formatFlags |= Gdip.StringFormatFlagsDirectionRightToLeft; Gdip.StringFormat_SetFormatFlags(format, formatFlags); @@ -4722,7 +4726,7 @@ public Point textExtent(String string, int flags) { } else { buffer = new char[]{' '}; } - int format = Gdip.StringFormat_Clone(Gdip.StringFormat_GenericTypographic()); + int /*long*/ format = Gdip.StringFormat_Clone(Gdip.StringFormat_GenericTypographic()); int formatFlags = Gdip.StringFormat_GetFormatFlags(format) | Gdip.StringFormatFlagsMeasureTrailingSpaces; if ((data.style & SWT.MIRRORED) != 0) formatFlags |= Gdip.StringFormatFlagsDirectionRightToLeft; Gdip.StringFormat_SetFormatFlags(format, formatFlags); @@ -4777,7 +4781,7 @@ public String toString () { */ public static GC win32_new(Drawable drawable, GCData data) { GC gc = new GC(); - int hDC = drawable.internal_new_GC(data); + int /*long*/ hDC = drawable.internal_new_GC(data); gc.device = data.device; gc.init(drawable, data, hDC); return gc; @@ -4798,7 +4802,7 @@ public static GC win32_new(Drawable drawable, GCData data) { * * @return a new <code>GC</code> */ -public static GC win32_new(int hDC, GCData data) { +public static GC win32_new(int /*long*/ hDC, GCData data) { GC gc = new GC(); gc.device = data.device; gc.init(null, data, hDC); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GCData.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GCData.java index 7d5c5053c3..07bfd21999 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GCData.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GCData.java @@ -30,7 +30,7 @@ public final class GCData { public int style, state = -1; public int foreground = -1; public int background = -1; - public int hFont; + public int /*long*/ hFont; public Pattern foregroundPattern; public Pattern backgroundPattern; public int lineStyle = SWT.LINE_SOLID; @@ -44,17 +44,17 @@ public final class GCData { public int uiState = 0; public Image image; - public int hPen, hOldPen; - public int hBrush, hOldBrush; - public int hNullBitmap; - public int hwnd; + public int /*long*/ hPen, hOldPen; + public int /*long*/ hBrush, hOldBrush; + public int /*long*/ hNullBitmap; + public int /*long*/ hwnd; public PAINTSTRUCT ps; public int layout = -1; - public int gdipGraphics; - public int gdipPen; - public int gdipBrush; - public int gdipFgBrush; - public int gdipBgBrush; - public int gdipFont; + public int /*long*/ gdipGraphics; + public int /*long*/ gdipPen; + public int /*long*/ gdipBrush; + public int /*long*/ gdipFgBrush; + public int /*long*/ gdipBgBrush; + public int /*long*/ gdipFont; public float gdipXOffset, gdipYOffset; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Image.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Image.java index 71c11048b7..7efd65be52 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Image.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Image.java @@ -89,7 +89,7 @@ public final class Image extends Resource implements Drawable { * platforms and should never be accessed from application code. * </p> */ - public int handle; + public int /*long*/ handle; /** * specifies the transparent pixel @@ -219,17 +219,17 @@ public Image(Device device, Image srcImage, int flag) { switch (type) { case SWT.BITMAP: /* Get the HDC for the device */ - int hDC = device.internal_new_GC(null); + int /*long*/ hDC = device.internal_new_GC(null); /* Copy the bitmap */ - int hdcSource = OS.CreateCompatibleDC(hDC); - int hdcDest = OS.CreateCompatibleDC(hDC); - int hOldSrc = OS.SelectObject(hdcSource, srcImage.handle); + int /*long*/ hdcSource = OS.CreateCompatibleDC(hDC); + int /*long*/ hdcDest = OS.CreateCompatibleDC(hDC); + int /*long*/ hOldSrc = OS.SelectObject(hdcSource, srcImage.handle); BITMAP bm = new BITMAP(); OS.GetObject(srcImage.handle, BITMAP.sizeof, bm); handle = OS.CreateCompatibleBitmap(hdcSource, rect.width, bm.bmBits != 0 ? -rect.height : rect.height); if (handle == 0) SWT.error(SWT.ERROR_NO_HANDLES); - int hOldDest = OS.SelectObject(hdcDest, handle); + int /*long*/ hOldDest = OS.SelectObject(hdcDest, handle); OS.BitBlt(hdcDest, 0, 0, rect.width, rect.height, hdcSource, 0, 0, OS.SRCCOPY); OS.SelectObject(hdcSource, hOldSrc); OS.SelectObject(hdcDest, hOldDest); @@ -583,14 +583,14 @@ public Image (Device device, String filename) { int length = filename.length(); char[] chars = new char[length+1]; filename.getChars(0, length, chars, 0); - int bitmap = Gdip.Bitmap_new(chars, false); + int /*long*/ bitmap = Gdip.Bitmap_new(chars, false); if (bitmap != 0) { int error = SWT.ERROR_NO_HANDLES; int status = Gdip.Image_GetLastStatus(bitmap); if (status == 0) { if (filename.toLowerCase().endsWith(".ico")) { this.type = SWT.ICON; - int[] hicon = new int[1]; + int /*long*/[] hicon = new int /*long*/[1]; Gdip.Bitmap_GetHICON(bitmap, hicon); this.handle = hicon[0]; } else { @@ -621,10 +621,10 @@ public Image (Device device, String filename) { * This performs better than getting the bits with Bitmap.LockBits(), * but it cannot be used when there is transparency. */ - int hDC = device.internal_new_GC(null); - int srcHDC = OS.CreateCompatibleDC(hDC); - int oldSrcBitmap = OS.SelectObject(srcHDC, this.handle); - int graphics = Gdip.Graphics_new(srcHDC); + int /*long*/ hDC = device.internal_new_GC(null); + int /*long*/ srcHDC = OS.CreateCompatibleDC(hDC); + int /*long*/ oldSrcBitmap = OS.SelectObject(srcHDC, this.handle); + int /*long*/ graphics = Gdip.Graphics_new(srcHDC); if (graphics != 0) { Rect rect = new Rect(); rect.Width = width; @@ -641,13 +641,13 @@ public Image (Device device, String filename) { OS.DeleteDC(srcHDC); device.internal_dispose_GC(hDC, null); } else { - int lockedBitmapData = Gdip.BitmapData_new(); + int /*long*/ lockedBitmapData = Gdip.BitmapData_new(); if (lockedBitmapData != 0) { Gdip.Bitmap_LockBits(bitmap, 0, 0, pixelFormat, lockedBitmapData); BitmapData bitmapData = new BitmapData(); Gdip.MoveMemory(bitmapData, lockedBitmapData); int stride = bitmapData.Stride; - int pixels = bitmapData.Scan0; + int /*long*/ pixels = bitmapData.Scan0; int depth = 0, scanlinePad = 4, transparentPixel = -1; switch (bitmapData.PixelFormat) { case Gdip.PixelFormat1bppIndexed: depth = 1; break; @@ -667,8 +667,8 @@ public Image (Device device, String filename) { case Gdip.PixelFormat4bppIndexed: case Gdip.PixelFormat8bppIndexed: int paletteSize = Gdip.Image_GetPaletteSize(bitmap); - int hHeap = OS.GetProcessHeap(); - int palette = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, paletteSize); + int /*long*/ hHeap = OS.GetProcessHeap(); + int /*long*/ palette = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, paletteSize); if (palette == 0) SWT.error(SWT.ERROR_NO_HANDLES); Gdip.Image_GetPalette(bitmap, palette, paletteSize); ColorPalette colorPalette = new ColorPalette(); @@ -734,7 +734,7 @@ public Image (Device device, String filename) { * Create a DIB from a DDB without using GetDIBits. Note that * the DDB should not be selected into a HDC. */ -int createDIBFromDDB(int hDC, int hBitmap, int width, int height) { +int /*long*/ createDIBFromDDB(int /*long*/ hDC, int /*long*/ hBitmap, int width, int height) { /* Determine the DDB depth */ int bits = OS.GetDeviceCaps (hDC, OS.BITSPIXEL); @@ -825,15 +825,15 @@ int createDIBFromDDB(int hDC, int hBitmap, int width, int height) { offset += 4; } } - int[] pBits = new int[1]; - int hDib = OS.CreateDIBSection(0, bmi, OS.DIB_RGB_COLORS, pBits, 0, 0); + int /*long*/[] pBits = new int /*long*/[1]; + int /*long*/ hDib = OS.CreateDIBSection(0, bmi, OS.DIB_RGB_COLORS, pBits, 0, 0); if (hDib == 0) SWT.error(SWT.ERROR_NO_HANDLES); /* Bitblt DDB into DIB */ - int hdcSource = OS.CreateCompatibleDC(hDC); - int hdcDest = OS.CreateCompatibleDC(hDC); - int hOldSrc = OS.SelectObject(hdcSource, hBitmap); - int hOldDest = OS.SelectObject(hdcDest, hDib); + int /*long*/ hdcSource = OS.CreateCompatibleDC(hDC); + int /*long*/ hdcDest = OS.CreateCompatibleDC(hDC); + int /*long*/ hOldSrc = OS.SelectObject(hdcSource, hBitmap); + int /*long*/ hOldDest = OS.SelectObject(hdcDest, hDib); OS.BitBlt(hdcDest, 0, 0, width, height, hdcSource, 0, 0, OS.SRCCOPY); OS.SelectObject(hdcSource, hOldSrc); OS.SelectObject(hdcDest, hOldDest); @@ -843,7 +843,7 @@ int createDIBFromDDB(int hDC, int hBitmap, int width, int height) { return hDib; } -int[] createGdipImage() { +int /*long*/ [] createGdipImage() { switch (type) { case SWT.BITMAP: { if (alpha != -1 || alphaData != null || transparentPixel != -1) { @@ -851,13 +851,13 @@ int[] createGdipImage() { OS.GetObject(handle, BITMAP.sizeof, bm); int imgWidth = bm.bmWidth; int imgHeight = bm.bmHeight; - int hDC = device.internal_new_GC(null); - int srcHdc = OS.CreateCompatibleDC(hDC); - int oldSrcBitmap = OS.SelectObject(srcHdc, handle); - int memHdc = OS.CreateCompatibleDC(hDC); - int memDib = createDIB(imgWidth, imgHeight, 32); + int /*long*/ hDC = device.internal_new_GC(null); + int /*long*/ srcHdc = OS.CreateCompatibleDC(hDC); + int /*long*/ oldSrcBitmap = OS.SelectObject(srcHdc, handle); + int /*long*/ memHdc = OS.CreateCompatibleDC(hDC); + int /*long*/ memDib = createDIB(imgWidth, imgHeight, 32); if (memDib == 0) SWT.error(SWT.ERROR_NO_HANDLES); - int oldMemBitmap = OS.SelectObject(memHdc, memDib); + int /*long*/ oldMemBitmap = OS.SelectObject(memHdc, memDib); BITMAP dibBM = new BITMAP(); OS.GetObject(memDib, BITMAP.sizeof, dibBM); int sizeInBytes = dibBM.bmWidthBytes * dibBM.bmHeight; @@ -933,13 +933,13 @@ int[] createGdipImage() { } } } - int hHeap = OS.GetProcessHeap(); - int pixels = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, srcData.length); + int /*long*/ hHeap = OS.GetProcessHeap(); + int /*long*/ pixels = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, srcData.length); if (pixels == 0) SWT.error(SWT.ERROR_NO_HANDLES); OS.MoveMemory(pixels, srcData, sizeInBytes); - return new int[]{Gdip.Bitmap_new(imgWidth, imgHeight, dibBM.bmWidthBytes, Gdip.PixelFormat32bppARGB, pixels), pixels}; + return new int /*long*/ []{Gdip.Bitmap_new(imgWidth, imgHeight, dibBM.bmWidthBytes, Gdip.PixelFormat32bppARGB, pixels), pixels}; } - return new int[]{Gdip.Bitmap_new(handle, 0), 0}; + return new int /*long*/ []{Gdip.Bitmap_new(handle, 0), 0}; } case SWT.ICON: { /* @@ -953,21 +953,21 @@ int[] createGdipImage() { } else { OS.GetIconInfo(handle, iconInfo); } - int hBitmap = iconInfo.hbmColor; + int /*long*/ hBitmap = iconInfo.hbmColor; if (hBitmap == 0) hBitmap = iconInfo.hbmMask; BITMAP bm = new BITMAP(); OS.GetObject(hBitmap, BITMAP.sizeof, bm); int imgWidth = bm.bmWidth; int imgHeight = hBitmap == iconInfo.hbmMask ? bm.bmHeight / 2 : bm.bmHeight; - int img = 0, pixels = 0; + int /*long*/ img = 0, pixels = 0; if (imgWidth > imgHeight) { - int hDC = device.internal_new_GC(null); - int srcHdc = OS.CreateCompatibleDC(hDC); - int oldSrcBitmap = OS.SelectObject(srcHdc, hBitmap); - int memHdc = OS.CreateCompatibleDC(hDC); - int memDib = createDIB(imgWidth, imgHeight, 32); + int /*long*/ hDC = device.internal_new_GC(null); + int /*long*/ srcHdc = OS.CreateCompatibleDC(hDC); + int /*long*/ oldSrcBitmap = OS.SelectObject(srcHdc, hBitmap); + int /*long*/ memHdc = OS.CreateCompatibleDC(hDC); + int /*long*/ memDib = createDIB(imgWidth, imgHeight, 32); if (memDib == 0) SWT.error(SWT.ERROR_NO_HANDLES); - int oldMemBitmap = OS.SelectObject(memHdc, memDib); + int /*long*/ oldMemBitmap = OS.SelectObject(memHdc, memDib); BITMAP dibBM = new BITMAP(); OS.GetObject(memDib, BITMAP.sizeof, dibBM); OS.BitBlt(memHdc, 0, 0, imgWidth, imgHeight, srcHdc, 0, hBitmap == iconInfo.hbmMask ? imgHeight : 0, OS.SRCCOPY); @@ -990,7 +990,7 @@ int[] createGdipImage() { OS.SelectObject(srcHdc, oldSrcBitmap); OS.DeleteObject(srcHdc); device.internal_dispose_GC(hDC, null); - int hHeap = OS.GetProcessHeap(); + int /*long*/ hHeap = OS.GetProcessHeap(); pixels = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, srcData.length); if (pixels == 0) SWT.error(SWT.ERROR_NO_HANDLES); OS.MoveMemory(pixels, srcData, srcData.length); @@ -1000,7 +1000,7 @@ int[] createGdipImage() { } if (iconInfo.hbmColor != 0) OS.DeleteObject(iconInfo.hbmColor); if (iconInfo.hbmMask != 0) OS.DeleteObject(iconInfo.hbmMask); - return new int[]{img, pixels}; + return new int /*long*/ []{img, pixels}; } default: SWT.error(SWT.ERROR_INVALID_IMAGE); } @@ -1068,13 +1068,13 @@ public Color getBackground() { if (transparentPixel == -1) return null; /* Get the HDC for the device */ - int hDC = device.internal_new_GC(null); + int /*long*/ hDC = device.internal_new_GC(null); /* Compute the background color */ BITMAP bm = new BITMAP(); OS.GetObject(handle, BITMAP.sizeof, bm); - int hdcMem = OS.CreateCompatibleDC(hDC); - int hOldObject = OS.SelectObject(hdcMem, handle); + int /*long*/ hdcMem = OS.CreateCompatibleDC(hDC); + int /*long*/ hOldObject = OS.SelectObject(hdcMem, handle); int red = 0, green = 0, blue = 0; if (bm.bmBitsPixel <= 8) { if (OS.IsWinCE) { @@ -1154,7 +1154,7 @@ public Rectangle getBounds() { } else { ICONINFO info = new ICONINFO(); OS.GetIconInfo(handle, info); - int hBitmap = info.hbmColor; + int /*long*/ hBitmap = info.hbmColor; if (hBitmap == 0) hBitmap = info.hbmMask; bm = new BITMAP(); OS.GetObject(hBitmap, BITMAP.sizeof, bm); @@ -1194,7 +1194,7 @@ public ImageData getImageData() { if (OS.IsWinCE) SWT.error(SWT.ERROR_NOT_IMPLEMENTED); OS.GetIconInfo(handle, info); /* Get the basic BITMAP information */ - int hBitmap = info.hbmColor; + int /*long*/ hBitmap = info.hbmColor; if (hBitmap == 0) hBitmap = info.hbmMask; bm = new BITMAP(); OS.GetObject(hBitmap, BITMAP.sizeof, bm); @@ -1216,15 +1216,15 @@ public ImageData getImageData() { OS.MoveMemory(bmi, bmiHeader, BITMAPINFOHEADER.sizeof); /* Get the HDC for the device */ - int hDC = device.internal_new_GC(null); + int /*long*/ hDC = device.internal_new_GC(null); /* Create the DC and select the bitmap */ - int hBitmapDC = OS.CreateCompatibleDC(hDC); - int hOldBitmap = OS.SelectObject(hBitmapDC, hBitmap); + int /*long*/ hBitmapDC = OS.CreateCompatibleDC(hDC); + int /*long*/ hOldBitmap = OS.SelectObject(hBitmapDC, hBitmap); /* Select the palette if necessary */ - int oldPalette = 0; + int /*long*/ oldPalette = 0; if (depth <= 8) { - int hPalette = device.hPalette; + int /*long*/ hPalette = device.hPalette; if (hPalette != 0) { oldPalette = OS.SelectPalette(hBitmapDC, hPalette, false); OS.RealizePalette(hBitmapDC); @@ -1239,8 +1239,8 @@ public ImageData getImageData() { imageSize = bmiHeader.biSizeImage; byte[] data = new byte[imageSize]; /* Get the bitmap data */ - int hHeap = OS.GetProcessHeap(); - int lpvBits = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, imageSize); + int /*long*/ hHeap = OS.GetProcessHeap(); + int /*long*/ lpvBits = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, imageSize); if (lpvBits == 0) SWT.error(SWT.ERROR_NO_HANDLES); if (OS.IsWinCE) SWT.error(SWT.ERROR_NOT_IMPLEMENTED); OS.GetDIBits(hBitmapDC, hBitmap, 0, height, lpvBits, bmi, OS.DIB_RGB_COLORS); @@ -1297,7 +1297,7 @@ public ImageData getImageData() { OS.MoveMemory(bmiHeader, bmi, BITMAPINFOHEADER.sizeof); imageSize = bmiHeader.biSizeImage; maskData = new byte[imageSize]; - int lpvMaskBits = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, imageSize); + int /*long*/ lpvMaskBits = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, imageSize); if (lpvMaskBits == 0) SWT.error(SWT.ERROR_NO_HANDLES); if (OS.IsWinCE) SWT.error(SWT.ERROR_NOT_IMPLEMENTED); OS.GetDIBits(hBitmapDC, info.hbmMask, 0, height, lpvMaskBits, bmi, OS.DIB_RGB_COLORS); @@ -1346,14 +1346,14 @@ public ImageData getImageData() { /* Find out whether this is a DIB or a DDB. */ boolean isDib = (bm.bmBits != 0); /* Get the HDC for the device */ - int hDC = device.internal_new_GC(null); + int /*long*/ hDC = device.internal_new_GC(null); /* * Feature in WinCE. GetDIBits is not available in WinCE. The * workaround is to create a temporary DIB from the DDB and use * the bmBits field of DIBSECTION to retrieve the image data. */ - int handle = this.handle; + int /*long*/ handle = this.handle; if (OS.IsWinCE) { if (!isDib) { boolean mustRestore = false; @@ -1368,7 +1368,7 @@ public ImageData getImageData() { } handle = createDIBFromDDB(hDC, this.handle, width, height); if (mustRestore) { - int hOldBitmap = OS.SelectObject(memGC.handle, this.handle); + int /*long*/ hOldBitmap = OS.SelectObject(memGC.handle, this.handle); memGC.data.hNullBitmap = hOldBitmap; } isDib = true; @@ -1404,12 +1404,12 @@ public ImageData getImageData() { } /* Create the DC and select the bitmap */ - int hBitmapDC = OS.CreateCompatibleDC(hDC); - int hOldBitmap = OS.SelectObject(hBitmapDC, handle); + int /*long*/ hBitmapDC = OS.CreateCompatibleDC(hDC); + int /*long*/ hOldBitmap = OS.SelectObject(hBitmapDC, handle); /* Select the palette if necessary */ - int oldPalette = 0; + int /*long*/ oldPalette = 0; if (!isDib && depth <= 8) { - int hPalette = device.hPalette; + int /*long*/ hPalette = device.hPalette; if (hPalette != 0) { oldPalette = OS.SelectPalette(hBitmapDC, hPalette, false); OS.RealizePalette(hBitmapDC); @@ -1436,8 +1436,8 @@ public ImageData getImageData() { OS.MoveMemory(data, bm.bmBits, imageSize); } } else { - int hHeap = OS.GetProcessHeap(); - int lpvBits = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, imageSize); + int /*long*/ hHeap = OS.GetProcessHeap(); + int /*long*/ lpvBits = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, imageSize); if (lpvBits == 0) SWT.error(SWT.ERROR_NO_HANDLES); if (OS.IsWinCE) SWT.error(SWT.ERROR_NOT_IMPLEMENTED); OS.GetDIBits(hBitmapDC, handle, 0, height, lpvBits, bmi, OS.DIB_RGB_COLORS); @@ -1542,7 +1542,7 @@ public ImageData getImageData() { * @see #equals */ public int hashCode () { - return handle; + return (int)/*64*/handle; } void init(Device device, int width, int height) { @@ -1551,7 +1551,7 @@ void init(Device device, int width, int height) { } this.device = device; type = SWT.BITMAP; - int hDC = device.internal_new_GC(null); + int /*long*/ hDC = device.internal_new_GC(null); handle = OS.CreateCompatibleBitmap(hDC, width, height); /* * Feature in Windows. CreateCompatibleBitmap() may fail @@ -1566,8 +1566,8 @@ void init(Device device, int width, int height) { handle = createDIB(width, height, depth); } if (handle != 0) { - int memDC = OS.CreateCompatibleDC(hDC); - int hOldBitmap = OS.SelectObject(memDC, handle); + int /*long*/ memDC = OS.CreateCompatibleDC(hDC); + int /*long*/ hOldBitmap = OS.SelectObject(memDC, handle); OS.PatBlt(memDC, 0, 0, width, height, OS.PATCOPY); OS.SelectObject(memDC, hOldBitmap); OS.DeleteDC(memDC); @@ -1578,7 +1578,7 @@ void init(Device device, int width, int height) { } } -static int createDIB(int width, int height, int depth) { +static int /*long*/ createDIB(int width, int height, int depth) { BITMAPINFOHEADER bmiHeader = new BITMAPINFOHEADER(); bmiHeader.biSize = BITMAPINFOHEADER.sizeof; bmiHeader.biWidth = width; @@ -1610,7 +1610,7 @@ static int createDIB(int width, int height, int depth) { bmi[offset + 11] = (byte)((blueMask & 0xFF) >> 0); } - int[] pBits = new int[1]; + int /*long*/[] pBits = new int /*long*/[1]; return OS.CreateDIBSection(0, bmi, OS.DIB_RGB_COLORS, pBits, 0, 0); } @@ -1626,12 +1626,12 @@ static int createDIB(int width, int height, int depth) { * if the regular GetIconInfo had been used. */ static void GetIconInfo(Image image, ICONINFO info) { - int[] result = init(image.device, null, image.data); + int /*long*/ [] result = init(image.device, null, image.data); info.hbmColor = result[0]; info.hbmMask = result[1]; } -static int[] init(Device device, Image image, ImageData i) { +static int /*long*/ [] init(Device device, Image image, ImageData i) { if (image != null) image.device = device; /* @@ -1789,8 +1789,8 @@ static int[] init(Device device, Image image, ImageData i) { offset += 4; } } - int[] pBits = new int[1]; - int hDib = OS.CreateDIBSection(0, bmi, OS.DIB_RGB_COLORS, pBits, 0, 0); + int /*long*/[] pBits = new int /*long*/[1]; + int /*long*/ hDib = OS.CreateDIBSection(0, bmi, OS.DIB_RGB_COLORS, pBits, 0, 0); if (hDib == 0) SWT.error(SWT.ERROR_NO_HANDLES); /* In case of a scanline pad other than 4, do the work to convert it */ byte[] data = i.data; @@ -1799,17 +1799,17 @@ static int[] init(Device device, Image image, ImageData i) { } OS.MoveMemory(pBits[0], data, data.length); - int[] result = null; + int /*long*/ [] result = null; if (i.getTransparencyType() == SWT.TRANSPARENCY_MASK) { /* Get the HDC for the device */ - int hDC = device.internal_new_GC(null); + int /*long*/ hDC = device.internal_new_GC(null); /* Create the color bitmap */ - int hdcSrc = OS.CreateCompatibleDC(hDC); + int /*long*/ hdcSrc = OS.CreateCompatibleDC(hDC); OS.SelectObject(hdcSrc, hDib); - int hBitmap = OS.CreateCompatibleBitmap(hDC, i.width, i.height); + int /*long*/ hBitmap = OS.CreateCompatibleBitmap(hDC, i.width, i.height); if (hBitmap == 0) SWT.error(SWT.ERROR_NO_HANDLES); - int hdcDest = OS.CreateCompatibleDC(hDC); + int /*long*/ hdcDest = OS.CreateCompatibleDC(hDC); OS.SelectObject(hdcDest, hBitmap); OS.BitBlt(hdcDest, 0, 0, i.width, i.height, hdcSrc, 0, 0, OS.SRCCOPY); @@ -1818,7 +1818,7 @@ static int[] init(Device device, Image image, ImageData i) { /* Create the mask. Windows requires icon masks to have a scanline pad of 2. */ byte[] maskData = ImageData.convertPad(i.maskData, i.width, i.height, 1, i.maskPad, 2); - int hMask = OS.CreateBitmap(i.width, i.height, 1, 1, maskData); + int /*long*/ hMask = OS.CreateBitmap(i.width, i.height, 1, 1, maskData); if (hMask == 0) SWT.error(SWT.ERROR_NO_HANDLES); OS.SelectObject(hdcSrc, hMask); OS.PatBlt(hdcSrc, 0, 0, i.width, i.height, OS.DSTINVERT); @@ -1827,14 +1827,14 @@ static int[] init(Device device, Image image, ImageData i) { OS.DeleteObject(hDib); if (image == null) { - result = new int[]{hBitmap, hMask}; + result = new int /*long*/ []{hBitmap, hMask}; } else { /* Create the icon */ ICONINFO info = new ICONINFO(); info.fIcon = true; info.hbmColor = hBitmap; info.hbmMask = hMask; - int hIcon = OS.CreateIconIndirect(info); + int /*long*/ hIcon = OS.CreateIconIndirect(info); if (hIcon == 0) SWT.error(SWT.ERROR_NO_HANDLES); OS.DeleteObject(hBitmap); OS.DeleteObject(hMask); @@ -1844,7 +1844,7 @@ static int[] init(Device device, Image image, ImageData i) { } } else { if (image == null) { - result = new int[]{hDib}; + result = new int /*long*/ []{hDib}; } else { image.handle = hDib; image.type = SWT.BITMAP; @@ -1862,7 +1862,7 @@ static int[] init(Device device, Image image, ImageData i) { return result; } -static int[] init(Device device, Image image, ImageData source, ImageData mask) { +static int /*long*/ [] init(Device device, Image image, ImageData source, ImageData mask) { /* Create a temporary image and locate the black pixel */ ImageData imageData; int blackIndex = 0; @@ -1953,7 +1953,7 @@ void init(Device device, ImageData i) { * @param data the platform specific GC data * @return the platform specific GC handle */ -public int internal_new_GC (GCData data) { +public int /*long*/ internal_new_GC (GCData data) { if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); /* * Create a new GC that can draw into the image. @@ -1964,8 +1964,8 @@ public int internal_new_GC (GCData data) { } /* Create a compatible HDC for the device */ - int hDC = device.internal_new_GC(null); - int imageDC = OS.CreateCompatibleDC(hDC); + int /*long*/ hDC = device.internal_new_GC(null); + int /*long*/ imageDC = OS.CreateCompatibleDC(hDC); device.internal_dispose_GC(hDC, null); if (imageDC == 0) SWT.error(SWT.ERROR_NO_HANDLES); @@ -1997,7 +1997,7 @@ public int internal_new_GC (GCData data) { * @param hDC the platform specific GC handle * @param data the platform specific GC data */ -public void internal_dispose_GC (int hDC, GCData data) { +public void internal_dispose_GC (int /*long*/ hDC, GCData data) { OS.DeleteDC(hDC); } @@ -2060,12 +2060,12 @@ public void setBackground(Color color) { if (transparentPixel == -1) return; /* Get the HDC for the device */ - int hDC = device.internal_new_GC(null); + int /*long*/ hDC = device.internal_new_GC(null); /* Change the background color in the image */ BITMAP bm = new BITMAP(); OS.GetObject(handle, BITMAP.sizeof, bm); - int hdcMem = OS.CreateCompatibleDC(hDC); + int /*long*/ hdcMem = OS.CreateCompatibleDC(hDC); OS.SelectObject(hdcMem, handle); int maxColors = 1 << bm.bmBitsPixel; byte[] colors = new byte[maxColors * 4]; @@ -2109,7 +2109,7 @@ public String toString () { * @param handle the OS handle for the image * @return a new image object containing the specified device, type and handle */ -public static Image win32_new(Device device, int type, int handle) { +public static Image win32_new(Device device, int type, int /*long*/ handle) { if (device == null) device = Device.getDevice(); Image image = new Image(); image.type = type; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Path.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Path.java index c63c5d6f7a..ee9538cf68 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Path.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Path.java @@ -43,7 +43,7 @@ public class Path extends Resource { * platforms and should never be accessed from application code. * </p> */ - public int handle; + public int /*long*/ handle; PointF currentPoint = new PointF(), startPoint = new PointF(); @@ -122,9 +122,9 @@ public void addArc(float x, float y, float width, float height, float startAngle if (width == height) { Gdip.GraphicsPath_AddArc(handle, x, y, width, height, -startAngle, -arcAngle); } else { - int path = Gdip.GraphicsPath_new(Gdip.FillModeAlternate); + int /*long*/ path = Gdip.GraphicsPath_new(Gdip.FillModeAlternate); if (path == 0) SWT.error(SWT.ERROR_NO_HANDLES); - int matrix = Gdip.Matrix_new(width, 0, 0, height, x, y); + int /*long*/ matrix = Gdip.Matrix_new(width, 0, 0, height, x, y); if (matrix == 0) SWT.error(SWT.ERROR_NO_HANDLES); Gdip.GraphicsPath_AddArc(path, 0, 0, 1, 1, -startAngle, -arcAngle); Gdip.GraphicsPath_Transform(path, matrix); @@ -206,12 +206,12 @@ public void addString(String string, float x, float y, Font font) { int length = string.length(); char[] buffer = new char[length]; string.getChars(0, length, buffer, 0); - int hDC = device.internal_new_GC(null); - int gdipFont = GC.createGdipFont(hDC, font.handle); + int /*long*/ hDC = device.internal_new_GC(null); + int /*long*/ gdipFont = GC.createGdipFont(hDC, font.handle); PointF point = new PointF(); point.X = x - (Gdip.Font_GetSize(gdipFont) / 6); point.Y = y; - int family = Gdip.FontFamily_new(); + int /*long*/ family = Gdip.FontFamily_new(); Gdip.Font_GetFamily(gdipFont, family); int style = Gdip.Font_GetStyle(gdipFont); float size = Gdip.Font_GetSize(gdipFont); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Pattern.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Pattern.java index 54e27595da..4afb34460a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Pattern.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Pattern.java @@ -41,7 +41,7 @@ public class Pattern extends Resource { * platforms and should never be accessed from application code. * </p> */ - public int handle; + public int /*long*/ handle; /** * Constructs a new Pattern given an image. Drawing with the resulting @@ -75,14 +75,14 @@ public Pattern(Device device, Image image) { if (image.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT); this.device = device; device.checkGDIP(); - int[] gdipImage = image.createGdipImage(); - int img = gdipImage[0]; + int /*long*/[] gdipImage = image.createGdipImage(); + int /*long*/ img = gdipImage[0]; int width = Gdip.Image_GetWidth(img); int height = Gdip.Image_GetHeight(img); handle = Gdip.TextureBrush_new(img, Gdip.WrapModeTile, 0, 0, width, height); Gdip.Bitmap_delete(img); if (gdipImage[1] != 0) { - int hHeap = OS.GetProcessHeap (); + int /*long*/ hHeap = OS.GetProcessHeap (); OS.HeapFree(hHeap, 0, gdipImage[1]); } if (handle == 0) SWT.error(SWT.ERROR_NO_HANDLES); @@ -172,14 +172,14 @@ public Pattern(Device device, float x1, float y1, float x2, float y2, Color colo device.checkGDIP(); int colorRef1 = color1.handle; int rgb = ((colorRef1 >> 16) & 0xFF) | (colorRef1 & 0xFF00) | ((colorRef1 & 0xFF) << 16); - int foreColor = Gdip.Color_new((alpha1 & 0xFF) << 24 | rgb); + int /*long*/ foreColor = Gdip.Color_new((alpha1 & 0xFF) << 24 | rgb); if (x1 == x2 && y1 == y2) { handle = Gdip.SolidBrush_new(foreColor); if (handle == 0) SWT.error(SWT.ERROR_NO_HANDLES); } else { int colorRef2 = color2.handle; rgb = ((colorRef2 >> 16) & 0xFF) | (colorRef2 & 0xFF00) | ((colorRef2 & 0xFF) << 16); - int backColor = Gdip.Color_new((alpha2 & 0xFF) << 24 | rgb); + int /*long*/ backColor = Gdip.Color_new((alpha2 & 0xFF) << 24 | rgb); PointF p1 = new PointF(); p1.X = x1; p1.Y = y1; @@ -193,8 +193,8 @@ public Pattern(Device device, float x1, float y1, float x2, float y2, Color colo int r = (int)(((colorRef1 & 0xFF) >> 0) * 0.5f + ((colorRef2 & 0xFF) >> 0) * 0.5f); int g = (int)(((colorRef1 & 0xFF00) >> 8) * 0.5f + ((colorRef2 & 0xFF00) >> 8) * 0.5f); int b = (int)(((colorRef1 & 0xFF0000) >> 16) * 0.5f + ((colorRef2 & 0xFF0000) >> 16) * 0.5f); - int midColor = Gdip.Color_new(a << 24 | r << 16 | g << 8 | b); - Gdip.LinearGradientBrush_SetInterpolationColors(handle, new int[]{foreColor, midColor, backColor}, new float[]{0, 0.5f, 1}, 3); + int /*long*/ midColor = Gdip.Color_new(a << 24 | r << 16 | g << 8 | b); + Gdip.LinearGradientBrush_SetInterpolationColors(handle, new int /*long*/ []{foreColor, midColor, backColor}, new float[]{0, 0.5f, 1}, 3); Gdip.Color_delete(midColor); } Gdip.Color_delete(backColor); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Region.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Region.java index 5e5ae6f17d..a19b526633 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Region.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Region.java @@ -37,7 +37,7 @@ public final class Region extends Resource { * platforms and should never be accessed from application code. * </p> */ - public int handle; + public int /*long*/ handle; /** * Constructs a new empty region. @@ -109,7 +109,7 @@ public void add (int[] pointArray) { if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); if (pointArray == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); if (OS.IsWinCE) SWT.error(SWT.ERROR_NOT_IMPLEMENTED); - int polyRgn = OS.CreatePolygonRgn(pointArray, pointArray.length / 2, OS.ALTERNATE); + int /*long*/ polyRgn = OS.CreatePolygonRgn(pointArray, pointArray.length / 2, OS.ALTERNATE); OS.CombineRgn (handle, handle, polyRgn, OS.RGN_OR); OS.DeleteObject (polyRgn); } @@ -155,7 +155,7 @@ public void add (Rectangle rect) { public void add (int x, int y, int width, int height) { if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); if (width < 0 || height < 0) SWT.error(SWT.ERROR_INVALID_ARGUMENT); - int rectRgn = OS.CreateRectRgn (x, y, x + width, y + height); + int /*long*/ rectRgn = OS.CreateRectRgn (x, y, x + width, y + height); OS.CombineRgn (handle, handle, rectRgn, OS.RGN_OR); OS.DeleteObject (rectRgn); } @@ -283,7 +283,7 @@ public Rectangle getBounds() { * @see #equals */ public int hashCode () { - return handle; + return (int)/*64*/handle; } /** @@ -329,7 +329,7 @@ public void intersect (Rectangle rect) { public void intersect (int x, int y, int width, int height) { if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); if (width < 0 || height < 0) SWT.error(SWT.ERROR_INVALID_ARGUMENT); - int rectRgn = OS.CreateRectRgn (x, y, x + width, y + height); + int /*long*/ rectRgn = OS.CreateRectRgn (x, y, x + width, y + height); OS.CombineRgn (handle, handle, rectRgn, OS.RGN_AND); OS.DeleteObject (rectRgn); } @@ -457,7 +457,7 @@ public void subtract (int[] pointArray) { if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); if (pointArray == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); if (OS.IsWinCE) SWT.error(SWT.ERROR_NOT_IMPLEMENTED); - int polyRgn = OS.CreatePolygonRgn(pointArray, pointArray.length / 2, OS.ALTERNATE); + int /*long*/ polyRgn = OS.CreatePolygonRgn(pointArray, pointArray.length / 2, OS.ALTERNATE); OS.CombineRgn (handle, handle, polyRgn, OS.RGN_DIFF); OS.DeleteObject (polyRgn); } @@ -505,7 +505,7 @@ public void subtract (Rectangle rect) { public void subtract (int x, int y, int width, int height) { if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); if (width < 0 || height < 0) SWT.error(SWT.ERROR_INVALID_ARGUMENT); - int rectRgn = OS.CreateRectRgn (x, y, x + width, y + height); + int /*long*/ rectRgn = OS.CreateRectRgn (x, y, x + width, y + height); OS.CombineRgn (handle, handle, rectRgn, OS.RGN_DIFF); OS.DeleteObject (rectRgn); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/TextLayout.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/TextLayout.java index 47760ade9a..e68795a651 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/TextLayout.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/TextLayout.java @@ -47,7 +47,7 @@ public final class TextLayout extends Resource { StyleItem[] allRuns; StyleItem[][] runs; int[] lineOffset, lineY, lineWidth; - int mLangFontLink2; + int /*long*/ mLangFontLink2; static final char LTR_MARK = '\u200E', RTL_MARK = '\u200F'; static final int SCRIPT_VISATTR_SIZEOF = 2; @@ -66,17 +66,17 @@ public final class TextLayout extends Resource { /*Script cache and analysis */ SCRIPT_ANALYSIS analysis; - int psc = 0; + int /*long*/ psc = 0; /*Shape info (malloc when the run is shaped) */ - int glyphs; + int /*long*/ glyphs; int glyphCount; - int clusters; - int visAttrs; + int /*long*/ clusters; + int /*long*/ visAttrs; /*Place info (malloc when the run is placed) */ - int advances; - int goffsets; + int /*long*/ advances; + int /*long*/ goffsets; int width; int ascent; int descent; @@ -84,15 +84,15 @@ public final class TextLayout extends Resource { int x; /* Justify info (malloc during computeRuns) */ - int justify; + int /*long*/ justify; /* ScriptBreak */ - int psla; + int /*long*/ psla; - int fallbackFont; + int /*long*/ fallbackFont; void free() { - int hHeap = OS.GetProcessHeap(); + int /*long*/ hHeap = OS.GetProcessHeap(); if (psc != 0) { OS.ScriptFreeCache (psc); OS.HeapFree(hHeap, 0, psc); @@ -167,7 +167,7 @@ public TextLayout (Device device) { styles[0] = new StyleItem(); styles[1] = new StyleItem(); text = ""; //$NON-NLS-1$ - int[] ppv = new int[1]; + int /*long*/[] ppv = new int /*long*/[1]; OS.OleInitialize(0); if (OS.CoCreateInstance(CLSID_CMultiLanguage, 0, OS.CLSCTX_INPROC_SERVER, IID_IMLangFontLink2, ppv) == OS.S_OK) { mLangFontLink2 = ppv[0]; @@ -179,13 +179,13 @@ void breakRun(StyleItem run) { if (run.psla != 0) return; char[] chars = new char[run.length]; segmentsText.getChars(run.start, run.start + run.length, chars, 0); - int hHeap = OS.GetProcessHeap(); + int /*long*/ hHeap = OS.GetProcessHeap(); run.psla = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, SCRIPT_LOGATTR.sizeof * chars.length); if (run.psla == 0) SWT.error(SWT.ERROR_NO_HANDLES); OS.ScriptBreak(chars, chars.length, run.analysis, run.psla); } -void checkItem (int hDC, StyleItem item) { +void checkItem (int /*long*/ hDC, StyleItem item) { if (item.fallbackFont != 0) { /* * Feature in Windows. The fallback font returned by the MLang service @@ -213,8 +213,8 @@ void checkLayout () { */ void computeRuns (GC gc) { if (runs != null) return; - int hDC = gc != null ? gc.handle : device.internal_new_GC(null); - int srcHdc = OS.CreateCompatibleDC(hDC); + int /*long*/ hDC = gc != null ? gc.handle : device.internal_new_GC(null); + int /*long*/ srcHdc = OS.CreateCompatibleDC(hDC); allRuns = itemize(); for (int i=0; i<allRuns.length - 1; i++) { StyleItem run = allRuns[i]; @@ -390,7 +390,7 @@ void computeRuns (GC gc) { lineWidth += indent; } } - int hHeap = OS.GetProcessHeap(); + int /*long*/ hHeap = OS.GetProcessHeap(); int newLineWidth = 0; for (int j = 0; j < runs[line].length; j++) { StyleItem item = runs[line][j]; @@ -537,21 +537,21 @@ public void draw (GC gc, int x, int y, int selectionStart, int selectionEnd, Col if (selectionBackground != null && selectionBackground.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT); int length = text.length(); if (length == 0 && flags == 0) return; - int hdc = gc.handle; + int /*long*/ hdc = gc.handle; Rectangle clip = gc.getClipping(); GCData data = gc.data; - int gdipGraphics = data.gdipGraphics; + int /*long*/ gdipGraphics = data.gdipGraphics; int foreground = data.foreground; int alpha = data.alpha; boolean gdip = gdipGraphics != 0 && (alpha != 0xFF || data.foregroundPattern != null); - int clipRgn = 0; + int /*long*/ clipRgn = 0; float[] lpXform = null; Rect gdipRect = new Rect(); if (gdipGraphics != 0 && !gdip) { - int matrix = Gdip.Matrix_new(1, 0, 0, 1, 0, 0); + int /*long*/ matrix = Gdip.Matrix_new(1, 0, 0, 1, 0, 0); if (matrix == 0) SWT.error(SWT.ERROR_NO_HANDLES); Gdip.Graphics_GetTransform(gdipGraphics, matrix); - int identity = gc.identity(); + int /*long*/ identity = gc.identity(); Gdip.Matrix_Invert(identity); Gdip.Matrix_Multiply(matrix, identity, Gdip.MatrixOrderAppend); Gdip.Matrix_delete(identity); @@ -565,7 +565,7 @@ public void draw (GC gc, int x, int y, int selectionStart, int selectionEnd, Col lpXform = null; } else { Gdip.Graphics_SetPixelOffsetMode(gdipGraphics, Gdip.PixelOffsetModeNone); - int rgn = Gdip.Region_new(); + int /*long*/ rgn = Gdip.Region_new(); Gdip.Graphics_GetClip(gdipGraphics, rgn); if (!Gdip.Region_IsInfinite(rgn, gdipGraphics)) { clipRgn = Gdip.Region_GetHRGN(rgn, gdipGraphics); @@ -575,7 +575,8 @@ public void draw (GC gc, int x, int y, int selectionStart, int selectionEnd, Col hdc = Gdip.Graphics_GetHDC(gdipGraphics); } } - int foregroundBrush = 0, state = 0; + int /*long*/ foregroundBrush = 0; + int state = 0; if (gdip) { gc.checkGC(GC.FOREGROUND); foregroundBrush = gc.getFgBrush(); @@ -603,12 +604,12 @@ public void draw (GC gc, int x, int y, int selectionStart, int selectionEnd, Col selectionEnd = translateOffset(selectionEnd); } RECT rect = new RECT(); - int selBrush = 0, selPen = 0, selBrushFg = 0; + int /*long*/ selBrush = 0, selPen = 0, selBrushFg = 0; if (hasSelection || (flags & SWT.LAST_LINE_SELECTION) != 0) { if (gdip) { int bg = selectionBackground.handle; int argb = ((alpha & 0xFF) << 24) | ((bg >> 16) & 0xFF) | (bg & 0xFF00) | ((bg & 0xFF) << 16); - int color = Gdip.Color_new(argb); + int /*long*/ color = Gdip.Color_new(argb); selBrush = Gdip.SolidBrush_new(color); Gdip.Color_delete(color); int fg = selectionForeground.handle; @@ -687,14 +688,14 @@ public void draw (GC gc, int x, int y, int selectionStart, int selectionEnd, Col int drawRunY = drawY + (baseline - run.ascent); if (gdip) { int argb = ((alpha & 0xFF) << 24) | ((bg >> 16) & 0xFF) | (bg & 0xFF00) | ((bg & 0xFF) << 16); - int color = Gdip.Color_new(argb); - int brush = Gdip.SolidBrush_new(color); + int /*long*/ color = Gdip.Color_new(argb); + int /*long*/ brush = Gdip.SolidBrush_new(color); Gdip.Graphics_FillRectangle(gdipGraphics, brush, drawX, drawRunY, run.width, run.ascent + run.descent); Gdip.Color_delete(color); Gdip.SolidBrush_delete(brush); } else { - int hBrush = OS.CreateSolidBrush (bg); - int oldBrush = OS.SelectObject(hdc, hBrush); + int /*long*/ hBrush = OS.CreateSolidBrush (bg); + int /*long*/ oldBrush = OS.SelectObject(hdc, hBrush); OS.PatBlt(hdc, drawX, drawRunY, run.width, run.ascent + run.descent, OS.PATCOPY); OS.SelectObject(hdc, oldBrush); OS.DeleteObject(hBrush); @@ -707,7 +708,7 @@ public void draw (GC gc, int x, int y, int selectionStart, int selectionEnd, Col int cChars = run.length; int gGlyphs = run.glyphCount; int[] piX = new int[1]; - int advances = run.justify != 0 ? run.justify : run.advances; + int /*long*/ advances = run.justify != 0 ? run.justify : run.advances; OS.ScriptCPtoX(selStart, false, cChars, gGlyphs, run.clusters, run.visAttrs, advances, run.analysis, piX); int runX = (orientation & SWT.RIGHT_TO_LEFT) != 0 ? run.width - piX[0] : piX[0]; rect.left = drawX + runX; @@ -747,7 +748,7 @@ public void draw (GC gc, int x, int y, int selectionStart, int selectionEnd, Col int cChars = run.length; int gGlyphs = run.glyphCount; int[] piX = new int[1]; - int advances = run.justify != 0 ? run.justify : run.advances; + int /*long*/ advances = run.justify != 0 ? run.justify : run.advances; OS.ScriptCPtoX(selStart, false, cChars, gGlyphs, run.clusters, run.visAttrs, advances, run.analysis, piX); int runX = (orientation & SWT.RIGHT_TO_LEFT) != 0 ? run.width - piX[0] : piX[0]; rect.left = drawX + runX; @@ -776,16 +777,16 @@ public void draw (GC gc, int x, int y, int selectionStart, int selectionEnd, Col if ((type & OS.PT_CLOSEFIGURE) != 0) newType |= Gdip.PathPointTypeCloseSubpath; types[typeIndex] = (byte)newType; } - int path = Gdip.GraphicsPath_new(points, types, count, Gdip.FillModeAlternate); + int /*long*/ path = Gdip.GraphicsPath_new(points, types, count, Gdip.FillModeAlternate); if (path == 0) SWT.error(SWT.ERROR_NO_HANDLES); - int brush = foregroundBrush; + int /*long*/ brush = foregroundBrush; if (fullSelection) { brush = selBrushFg; } else { if (run.style != null && run.style.foreground != null) { int fg = run.style.foreground.handle; int argb = ((alpha & 0xFF) << 24) | ((fg >> 16) & 0xFF) | (fg & 0xFF00) | ((fg & 0xFF) << 16); - int color = Gdip.Color_new(argb); + int /*long*/ color = Gdip.Color_new(argb); brush = Gdip.SolidBrush_new(color); Gdip.Color_delete(color); } @@ -822,7 +823,7 @@ public void draw (GC gc, int x, int y, int selectionStart, int selectionEnd, Col } Gdip.Graphics_SetSmoothingMode(gdipGraphics, antialias); if (run.style != null && (run.style.underline || run.style.strikeout)) { - int newPen = hasSelection ? selPen : Gdip.Pen_new(brush, 1); + int /*long*/ newPen = hasSelection ? selPen : Gdip.Pen_new(brush, 1); Gdip.Graphics_SetPixelOffsetMode(gdipGraphics, Gdip.PixelOffsetModeNone); if (run.style.underline) { int underlineY = drawY + baseline + 1 - run.style.rise; @@ -868,8 +869,8 @@ public void draw (GC gc, int x, int y, int selectionStart, int selectionEnd, Col OS.SetTextColor(hdc, fg); OS.ScriptTextOut(hdc, run.psc, drawX + offset, drawRunY, 0, null, run.analysis , 0, 0, run.glyphs, run.glyphCount, run.advances, run.justify, run.goffsets); if (run.style != null && (run.style.underline || run.style.strikeout)) { - int newPen = hasSelection && fg == selectionForeground.handle ? selPen : OS.CreatePen(OS.PS_SOLID, 1, fg); - int oldPen = OS.SelectObject(hdc, newPen); + int /*long*/ newPen = hasSelection && fg == selectionForeground.handle ? selPen : OS.CreatePen(OS.PS_SOLID, 1, fg); + int /*long*/ oldPen = OS.SelectObject(hdc, newPen); if (run.style.underline) { int underlineY = drawY + baseline + 1 - run.style.rise; OS.MoveToEx(hdc, drawX, underlineY, 0); @@ -887,7 +888,7 @@ public void draw (GC gc, int x, int y, int selectionStart, int selectionEnd, Col OS.SetTextColor(hdc, selectionForeground.handle); OS.ScriptTextOut(hdc, run.psc, drawX + offset, drawRunY, OS.ETO_CLIPPED, rect, run.analysis , 0, 0, run.glyphs, run.glyphCount, run.advances, run.justify, run.goffsets); if (run.style != null && (run.style.underline || run.style.strikeout)) { - int oldPen = OS.SelectObject(hdc, selPen); + int /*long*/ oldPen = OS.SelectObject(hdc, selPen); if (run.style.underline) { int underlineY = drawY + baseline + 1 - run.style.rise; OS.MoveToEx(hdc, rect.left, underlineY, 0); @@ -1029,7 +1030,7 @@ public Rectangle getBounds (int start, int end) { cx = metrics.width * (start - run.start); } else if (!run.tab) { int[] piX = new int[1]; - int advances = run.justify != 0 ? run.justify : run.advances; + int /*long*/ advances = run.justify != 0 ? run.justify : run.advances; OS.ScriptCPtoX(start - run.start, false, run.length, run.glyphCount, run.clusters, run.visAttrs, advances, run.analysis, piX); cx = isRTL ? run.width - piX[0] : piX[0]; } @@ -1046,7 +1047,7 @@ public Rectangle getBounds (int start, int end) { cx = metrics.width * (end - run.start + 1); } else if (!run.tab) { int[] piX = new int[1]; - int advances = run.justify != 0 ? run.justify : run.advances; + int /*long*/ advances = run.justify != 0 ? run.justify : run.advances; OS.ScriptCPtoX(end - run.start, true, run.length, run.glyphCount, run.clusters, run.visAttrs, advances, run.analysis, piX); cx = isRTL ? run.width - piX[0] : piX[0]; } @@ -1134,7 +1135,7 @@ public boolean getJustify () { return justify; } -int getItemFont (StyleItem item) { +int /*long*/ getItemFont (StyleItem item) { if (item.fallbackFont != 0) return item.fallbackFont; if (item.style != null && item.style.font != null) { return item.style.font.handle; @@ -1288,8 +1289,8 @@ public FontMetrics getLineMetrics (int lineIndex) { checkLayout(); computeRuns(null); if (!(0 <= lineIndex && lineIndex < runs.length)) SWT.error(SWT.ERROR_INVALID_RANGE); - int hDC = device.internal_new_GC(null); - int srcHdc = OS.CreateCompatibleDC(hDC); + int /*long*/ hDC = device.internal_new_GC(null); + int /*long*/ srcHdc = OS.CreateCompatibleDC(hDC); TEXTMETRIC lptm = OS.IsUnicode ? (TEXTMETRIC)new TEXTMETRICW() : new TEXTMETRICA(); OS.SelectObject(srcHdc, font != null ? font.handle : device.systemFont); OS.GetTextMetrics(srcHdc, lptm); @@ -1389,7 +1390,7 @@ public Point getLocation (int offset, boolean trailing) { int cChars = run.length; int gGlyphs = run.glyphCount; int[] piX = new int[1]; - int advances = run.justify != 0 ? run.justify : run.advances; + int /*long*/ advances = run.justify != 0 ? run.justify : run.advances; OS.ScriptCPtoX(runOffset, trailing, cChars, gGlyphs, run.clusters, run.visAttrs, advances, run.analysis, piX); if ((orientation & SWT.RIGHT_TO_LEFT) != 0) { result = new Point(width + (run.width - piX[0]), lineY[line]); @@ -1594,7 +1595,7 @@ public int getOffset (int x, int y, int[] trailing) { if ((orientation & SWT.RIGHT_TO_LEFT) != 0) { xRun = run.width - xRun; } - int advances = run.justify != 0 ? run.justify : run.advances; + int /*long*/ advances = run.justify != 0 ? run.justify : run.advances; OS.ScriptXtoCP(xRun, cChars, cGlyphs, run.clusters, run.visAttrs, advances, run.analysis, piCP, piTrailing); if (trailing != null) trailing[0] = piTrailing[0]; return untranslateOffset(run.start + piCP[0]); @@ -1862,8 +1863,8 @@ StyleItem[] itemize () { OS.ScriptApplyDigitSubstitution(psds, scriptControl, scriptState); } - int hHeap = OS.GetProcessHeap(); - int pItems = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, MAX_ITEM * SCRIPT_ITEM.sizeof); + int /*long*/ hHeap = OS.GetProcessHeap(); + int /*long*/ pItems = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, MAX_ITEM * SCRIPT_ITEM.sizeof); if (pItems == 0) SWT.error(SWT.ERROR_NO_HANDLES); int[] pcItems = new int[1]; char[] chars = new char[length]; @@ -1879,7 +1880,7 @@ StyleItem[] itemize () { /* * Merge styles ranges and script items */ -StyleItem[] merge (int items, int itemCount) { +StyleItem[] merge (int /*long*/ items, int itemCount) { int count = 0, start = 0, end = segmentsText.length(), itemIndex = 0, styleIndex = 0; StyleItem[] runs = new StyleItem[itemCount + styles.length]; SCRIPT_ITEM scriptItem = new SCRIPT_ITEM(); @@ -2348,7 +2349,7 @@ public void setWidth (int width) { this.wrapWidth = width; } -boolean shape (int hdc, StyleItem run, char[] chars, int[] glyphCount, int maxGlyphs) { +boolean shape (int /*long*/ hdc, StyleItem run, char[] chars, int[] glyphCount, int maxGlyphs) { int hr = OS.ScriptShape(hdc, run.psc, chars, chars.length, maxGlyphs, run.analysis, run.glyphs, run.clusters, run.visAttrs, glyphCount); run.glyphCount = glyphCount[0]; if (hr != OS.USP_E_SCRIPT_NOT_IN_FONT) { @@ -2366,7 +2367,7 @@ boolean shape (int hdc, StyleItem run, char[] chars, int[] glyphCount, int maxGl if (run.psc != 0) { OS.ScriptFreeCache(run.psc); glyphCount[0] = 0; - OS.MoveMemory(run.psc, glyphCount, 4); + OS.MoveMemory(run.psc, new int /*long*/ [1], OS.PTR_SIZEOF); } run.glyphCount = 0; return false; @@ -2375,19 +2376,19 @@ boolean shape (int hdc, StyleItem run, char[] chars, int[] glyphCount, int maxGl /* * Generate glyphs for one Run. */ -void shape (final int hdc, final StyleItem run) { +void shape (final int /*long*/ hdc, final StyleItem run) { int[] buffer = new int[1]; char[] chars = new char[run.length]; segmentsText.getChars(run.start, run.start + run.length, chars, 0); int maxGlyphs = (chars.length * 3 / 2) + 16; - int hHeap = OS.GetProcessHeap(); + int /*long*/ hHeap = OS.GetProcessHeap(); run.glyphs = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, maxGlyphs * 2); if (run.glyphs == 0) SWT.error(SWT.ERROR_NO_HANDLES); run.clusters = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, maxGlyphs * 2); if (run.clusters == 0) SWT.error(SWT.ERROR_NO_HANDLES); run.visAttrs = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, maxGlyphs * SCRIPT_VISATTR_SIZEOF); if (run.visAttrs == 0) SWT.error(SWT.ERROR_NO_HANDLES); - run.psc = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, 4); + run.psc = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, OS.PTR_SIZEOF); if (run.psc == 0) SWT.error(SWT.ERROR_NO_HANDLES); if (!shape(hdc, run, chars, buffer, maxGlyphs)) { if (mLangFontLink2 != 0) { @@ -2395,10 +2396,10 @@ void shape (final int hdc, final StyleItem run) { int[] cchCodePages = new int[1]; /* GetStrCodePages() */ OS.VtblCall(4, mLangFontLink2, chars, chars.length, 0, dwCodePages, cchCodePages); - int[] hNewFont = new int[1]; + int /*long*/[] hNewFont = new int /*long*/[1]; /* MapFont() */ if (OS.VtblCall(10, mLangFontLink2, hdc, dwCodePages[0], chars[0], hNewFont) == OS.S_OK) { - int hFont = OS.SelectObject(hdc, hNewFont[0]); + int /*long*/ hFont = OS.SelectObject(hdc, hNewFont[0]); if (shape(hdc, run, chars, buffer, maxGlyphs)) { run.fallbackFont = hNewFont[0]; } else { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Transform.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Transform.java index 754e09e65e..6dffdf0a9f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Transform.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Transform.java @@ -40,7 +40,7 @@ public class Transform extends Resource { * platforms and should never be accessed from application code. * </p> */ - public int handle; + public int /*long*/ handle; /** * Constructs a new identity Transform. diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/BidiUtil.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/BidiUtil.java index b9a28bf906..ae57b31f8c 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/BidiUtil.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/BidiUtil.java @@ -104,19 +104,19 @@ public class BidiUtil { * @param runnable the code that should be executed when a keyboard language change * occurs */ -public static void addLanguageListener (int hwnd, Runnable runnable) { - languageMap.put(new Integer(hwnd), runnable); +public static void addLanguageListener (int /*long*/ hwnd, Runnable runnable) { + languageMap.put(new LONG(hwnd), runnable); subclass(hwnd); } /** * Proc used for OS.EnumSystemLanguageGroups call during isBidiPlatform test. */ -static int EnumSystemLanguageGroupsProc(int lpLangGrpId, int lpLangGrpIdString, int lpLangGrpName, int options, int lParam) { - if (lpLangGrpId == OS.LGRPID_HEBREW) { +static int /*long*/ EnumSystemLanguageGroupsProc(int /*long*/ lpLangGrpId, int /*long*/ lpLangGrpIdString, int /*long*/ lpLangGrpName, int /*long*/ options, int /*long*/ lParam) { + if ((int)/*64*/lpLangGrpId == OS.LGRPID_HEBREW) { isBidiPlatform = 1; return 0; } - if (lpLangGrpId == OS.LGRPID_ARABIC) { + if ((int)/*64*/lpLangGrpId == OS.LGRPID_ARABIC) { isBidiPlatform = 1; return 0; } @@ -167,7 +167,7 @@ public static void drawGlyphs(GC gc, char[] renderBuffer, int[] renderDx, int x, */ public static char[] getRenderInfo(GC gc, String text, int[] order, byte[] classBuffer, int[] dx, int flags, int [] offsets) { int fontLanguageInfo = OS.GetFontLanguageInfo(gc.handle); - int hHeap = OS.GetProcessHeap(); + int /*long*/ hHeap = OS.GetProcessHeap(); int[] lpCs = new int[8]; int cs = OS.GetTextCharset(gc.handle); boolean isRightOriented = false; @@ -183,10 +183,10 @@ public static char[] getRenderInfo(GC gc, String text, int[] order, byte[] class GCP_RESULTS result = new GCP_RESULTS(); result.lStructSize = GCP_RESULTS.sizeof; result.nGlyphs = byteCount; - int lpOrder = result.lpOrder = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, byteCount * 4); - int lpDx = result.lpDx = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, byteCount * 4); - int lpClass = result.lpClass = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, byteCount); - int lpGlyphs = result.lpGlyphs = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, byteCount * 2); + int /*long*/ lpOrder = result.lpOrder = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, byteCount * 4); + int /*long*/ lpDx = result.lpDx = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, byteCount * 4); + int /*long*/ lpClass = result.lpClass = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, byteCount); + int /*long*/ lpGlyphs = result.lpGlyphs = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, byteCount * 2); // set required dwFlags int dwFlags = 0; @@ -300,7 +300,7 @@ public static char[] getRenderInfo(GC gc, String text, int[] order, byte[] class */ public static void getOrderInfo(GC gc, String text, int[] order, byte[] classBuffer, int flags, int [] offsets) { int fontLanguageInfo = OS.GetFontLanguageInfo(gc.handle); - int hHeap = OS.GetProcessHeap(); + int /*long*/ hHeap = OS.GetProcessHeap(); int[] lpCs = new int[8]; int cs = OS.GetTextCharset(gc.handle); OS.TranslateCharsetInfo(cs, lpCs, OS.TCI_SRCCHARSET); @@ -314,8 +314,8 @@ public static void getOrderInfo(GC gc, String text, int[] order, byte[] classBuf GCP_RESULTS result = new GCP_RESULTS(); result.lStructSize = GCP_RESULTS.sizeof; result.nGlyphs = byteCount; - int lpOrder = result.lpOrder = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, byteCount * 4); - int lpClass = result.lpClass = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, byteCount); + int /*long*/ lpOrder = result.lpOrder = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, byteCount * 4); + int /*long*/ lpClass = result.lpClass = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, byteCount); // set required dwFlags, these values will affect how the text gets rendered and // ordered @@ -402,7 +402,7 @@ public static int getFontBidiAttributes(GC gc) { * KEYBOARD_NON_BIDI) */ public static int getKeyboardLanguage() { - int layout = OS.GetKeyboardLayout(0); + int /*long*/ layout = OS.GetKeyboardLayout(0); int langID = OS.PRIMARYLANGID(OS.LOWORD(layout)); if (langID == LANG_HEBREW) return KEYBOARD_BIDI; if (langID == LANG_ARABIC) return KEYBOARD_BIDI; @@ -415,11 +415,11 @@ public static int getKeyboardLanguage() { * * @return integer array with an entry for each installed language */ -static int[] getKeyboardLanguageList() { +static int /*long*/[] getKeyboardLanguageList() { int maxSize = 10; - int[] tempList = new int[maxSize]; + int /*long*/[] tempList = new int /*long*/[maxSize]; int size = OS.GetKeyboardLayoutList(maxSize, tempList); - int[] list = new int[size]; + int /*long*/[] list = new int /*long*/[size]; System.arraycopy(tempList, 0, list, 0, size); return list; } @@ -450,7 +450,7 @@ public static boolean isBidiPlatform() { Callback callback = null; try { callback = new Callback (Class.forName (CLASS_NAME), "EnumSystemLanguageGroupsProc", 5); //$NON-NLS-1$ - int lpEnumSystemLanguageGroupsProc = callback.getAddress (); + int /*long*/ lpEnumSystemLanguageGroupsProc = callback.getAddress (); if (lpEnumSystemLanguageGroupsProc == 0) SWT.error(SWT.ERROR_NO_MORE_CALLBACKS); OS.EnumSystemLanguageGroups(lpEnumSystemLanguageGroupsProc, OS.LGRPID_INSTALLED, 0); callback.dispose (); @@ -474,7 +474,7 @@ public static boolean isBidiPlatform() { * @return true if bidi is supported, false otherwise. */ public static boolean isKeyboardBidi() { - int[] list = getKeyboardLanguageList(); + int /*long*/[] list = getKeyboardLanguageList(); for (int i=0; i<list.length; i++) { int id = OS.PRIMARYLANGID(OS.LOWORD(list[i])); if ((id == LANG_ARABIC) || (id == LANG_HEBREW)) { @@ -489,8 +489,8 @@ public static boolean isKeyboardBidi() { * * @param hwnd the handle of the Control that is listening for keyboard language changes */ -public static void removeLanguageListener (int hwnd) { - languageMap.remove(new Integer(hwnd)); +public static void removeLanguageListener (int /*long*/ hwnd) { + languageMap.remove(new LONG(hwnd)); unsubclass(hwnd); } /** @@ -508,7 +508,7 @@ public static void setKeyboardLanguage(int language) { if (language == KEYBOARD_BIDI) { // get the list of active languages - int[] list = getKeyboardLanguageList(); + int /*long*/[] list = getKeyboardLanguageList(); // set to first bidi language for (int i=0; i<list.length; i++) { int id = OS.PRIMARYLANGID(OS.LOWORD(list[i])); @@ -519,7 +519,7 @@ public static void setKeyboardLanguage(int language) { } } else { // get the list of active languages - int[] list = getKeyboardLanguageList(); + int /*long*/[] list = getKeyboardLanguageList(); // set to the first non-bidi language (anything not // Hebrew or Arabic) for (int i=0; i<list.length; i++) { @@ -541,7 +541,7 @@ public static void setKeyboardLanguage(int language) { * @return true if the orientation was changed, false if the orientation * could not be changed */ -public static boolean setOrientation (int hwnd, int orientation) { +public static boolean setOrientation (int /*long*/ hwnd, int orientation) { if (OS.IsWinCE) return false; if (OS.WIN32_VERSION < OS.VERSION(4, 10)) return false; int bits = OS.GetWindowLong (hwnd, OS.GWL_EXSTYLE); @@ -558,12 +558,12 @@ public static boolean setOrientation (int hwnd, int orientation) { * * @param hwnd control to override the window proc of */ -static void subclass(int hwnd) { - Integer key = new Integer(hwnd); +static void subclass(int /*long*/ hwnd) { + LONG key = new LONG(hwnd); if (oldProcMap.get(key) == null) { - int oldProc = OS.GetWindowLong(hwnd, OS.GWL_WNDPROC); - oldProcMap.put(key, new Integer(oldProc)); - OS.SetWindowLong(hwnd, OS.GWL_WNDPROC, callback.getAddress()); + int /*long*/ oldProc = OS.GetWindowLongPtr(hwnd, OS.GWLP_WNDPROC); + oldProcMap.put(key, new LONG(oldProc)); + OS.SetWindowLongPtr(hwnd, OS.GWLP_WNDPROC, callback.getAddress()); } } /** @@ -618,12 +618,12 @@ static void translateOrder(int[] orderArray, int glyphCount, boolean isRightOrie * * @param hwnd control to remove the window proc override for */ -static void unsubclass(int hwnd) { - Integer key = new Integer(hwnd); +static void unsubclass(int /*long*/ hwnd) { + LONG key = new LONG(hwnd); if (languageMap.get(key) == null && keyMap.get(key) == null) { - Integer proc = (Integer) oldProcMap.remove(key); + LONG proc = (LONG) oldProcMap.remove(key); if (proc == null) return; - OS.SetWindowLong(hwnd, OS.GWL_WNDPROC, proc.intValue()); + OS.SetWindowLongPtr(hwnd, OS.GWLP_WNDPROC, proc.value); } } /** @@ -635,16 +635,16 @@ static void unsubclass(int hwnd) { * change event * @param msg window message */ -static int windowProc (int hwnd, int msg, int wParam, int lParam) { - Integer key = new Integer (hwnd); - switch (msg) { +static int /*long*/ windowProc (int /*long*/ hwnd, int /*long*/ msg, int /*long*/ wParam, int /*long*/ lParam) { + LONG key = new LONG (hwnd); + switch ((int)/*64*/msg) { case 0x51 /*OS.WM_INPUTLANGCHANGE*/: Runnable runnable = (Runnable) languageMap.get (key); if (runnable != null) runnable.run (); break; } - Integer oldProc = (Integer)oldProcMap.get(key); - return OS.CallWindowProc (oldProc.intValue(), hwnd, msg, wParam, lParam); + LONG oldProc = (LONG)oldProcMap.get(key); + return OS.CallWindowProc (oldProc.value, hwnd, (int)/*64*/msg, wParam, lParam); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/ImageList.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/ImageList.java index dfb0c24785..e82f7285e8 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/ImageList.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/ImageList.java @@ -16,7 +16,8 @@ import org.eclipse.swt.*; import org.eclipse.swt.graphics.*; public class ImageList { - int handle, style, refCount; + int /*long*/ handle; + int style, refCount; Image [] images; public ImageList (int style) { @@ -28,7 +29,7 @@ public ImageList (int style) { if (OS.COMCTL32_MAJOR >= 6) { flags |= OS.ILC_COLOR32; } else { - int hDC = OS.GetDC (0); + int /*long*/ hDC = OS.GetDC (0); int bits = OS.GetDeviceCaps (hDC, OS.BITSPIXEL); int planes = OS.GetDeviceCaps (hDC, OS.PLANES); OS.ReleaseDC (0, hDC); @@ -76,13 +77,13 @@ public int addRef() { return ++refCount; } -int copyBitmap (int hImage, int width, int height) { +int /*long*/ copyBitmap (int /*long*/ hImage, int width, int height) { BITMAP bm = new BITMAP (); OS.GetObject (hImage, BITMAP.sizeof, bm); - int hDC = OS.GetDC (0); - int hdc1 = OS.CreateCompatibleDC (hDC); + int /*long*/ hDC = OS.GetDC (0); + int /*long*/ hdc1 = OS.CreateCompatibleDC (hDC); OS.SelectObject (hdc1, hImage); - int hdc2 = OS.CreateCompatibleDC (hDC); + int /*long*/ hdc2 = OS.CreateCompatibleDC (hDC); /* * Feature in Windows. If a bitmap has a 32-bit depth and any * pixel has an alpha value different than zero, common controls @@ -93,7 +94,7 @@ int copyBitmap (int hImage, int width, int height) { * remove the alpha channel of opaque images by down sampling * it to 24-bit depth. */ - int hBitmap; + int /*long*/ hBitmap; if (bm.bmBitsPixel == 32 && OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) { BITMAPINFOHEADER bmiHeader = new BITMAPINFOHEADER(); bmiHeader.biSize = BITMAPINFOHEADER.sizeof; @@ -125,7 +126,7 @@ int copyBitmap (int hImage, int width, int height) { bmi[offset + 10] = (byte)((blueMask & 0xFF00) >> 8); bmi[offset + 11] = (byte)((blueMask & 0xFF) >> 0); } - int[] pBits = new int[1]; + int /*long*/[] pBits = new int /*long*/[1]; hBitmap = OS.CreateDIBSection(0, bmi, OS.DIB_RGB_COLORS, pBits, 0, 0); } else { hBitmap = OS.CreateCompatibleBitmap (hDC, width, height); @@ -143,23 +144,23 @@ int copyBitmap (int hImage, int width, int height) { return hBitmap; } -int copyIcon (int hImage, int width, int height) { +int /*long*/ copyIcon (int /*long*/ hImage, int width, int height) { if (OS.IsWinCE) SWT.error(SWT.ERROR_NOT_IMPLEMENTED); - int hIcon = OS.CopyImage (hImage, OS.IMAGE_ICON, width, height, 0); + int /*long*/ hIcon = OS.CopyImage (hImage, OS.IMAGE_ICON, width, height, 0); return hIcon != 0 ? hIcon : hImage; } -int copyWithAlpha (int hBitmap, int background, byte[] alphaData, int destWidth, int destHeight) { +int /*long*/ copyWithAlpha (int /*long*/ hBitmap, int background, byte[] alphaData, int destWidth, int destHeight) { BITMAP bm = new BITMAP (); OS.GetObject (hBitmap, BITMAP.sizeof, bm); int srcWidth = bm.bmWidth; int srcHeight = bm.bmHeight; /* Create resources */ - int hdc = OS.GetDC (0); - int srcHdc = OS.CreateCompatibleDC (hdc); - int oldSrcBitmap = OS.SelectObject (srcHdc, hBitmap); - int memHdc = OS.CreateCompatibleDC (hdc); + int /*long*/ hdc = OS.GetDC (0); + int /*long*/ srcHdc = OS.CreateCompatibleDC (hdc); + int /*long*/ oldSrcBitmap = OS.SelectObject (srcHdc, hBitmap); + int /*long*/ memHdc = OS.CreateCompatibleDC (hdc); BITMAPINFOHEADER bmiHeader = new BITMAPINFOHEADER (); bmiHeader.biSize = BITMAPINFOHEADER.sizeof; bmiHeader.biWidth = srcWidth; @@ -169,10 +170,10 @@ int copyWithAlpha (int hBitmap, int background, byte[] alphaData, int destWidth, bmiHeader.biCompression = OS.BI_RGB; byte [] bmi = new byte[BITMAPINFOHEADER.sizeof]; OS.MoveMemory (bmi, bmiHeader, BITMAPINFOHEADER.sizeof); - int [] pBits = new int [1]; - int memDib = OS.CreateDIBSection (0, bmi, OS.DIB_RGB_COLORS, pBits, 0, 0); + int /*long*/ [] pBits = new int /*long*/ [1]; + int /*long*/ memDib = OS.CreateDIBSection (0, bmi, OS.DIB_RGB_COLORS, pBits, 0, 0); if (memDib == 0) SWT.error (SWT.ERROR_NO_HANDLES); - int oldMemBitmap = OS.SelectObject (memHdc, memDib); + int /*long*/ oldMemBitmap = OS.SelectObject (memHdc, memDib); BITMAP dibBM = new BITMAP (); OS.GetObject (memDib, BITMAP.sizeof, dibBM); @@ -221,10 +222,10 @@ int copyWithAlpha (int hBitmap, int background, byte[] alphaData, int destWidth, bmiHeader2.biCompression = OS.BI_RGB; byte [] bmi2 = new byte[BITMAPINFOHEADER.sizeof]; OS.MoveMemory (bmi2, bmiHeader2, BITMAPINFOHEADER.sizeof); - int [] pBits2 = new int [1]; - int memDib2 = OS.CreateDIBSection (0, bmi2, OS.DIB_RGB_COLORS, pBits2, 0, 0); - int memHdc2 = OS.CreateCompatibleDC (hdc); - int oldMemBitmap2 = OS.SelectObject (memHdc2, memDib2); + int /*long*/ [] pBits2 = new int /*long*/ [1]; + int /*long*/ memDib2 = OS.CreateDIBSection (0, bmi2, OS.DIB_RGB_COLORS, pBits2, 0, 0); + int /*long*/ memHdc2 = OS.CreateCompatibleDC (hdc); + int /*long*/ oldMemBitmap2 = OS.SelectObject (memHdc2, memDib2); if (!OS.IsWinCE) OS.SetStretchBltMode(memHdc2, OS.COLORONCOLOR); OS.StretchBlt (memHdc2, 0, 0, destWidth, destHeight, memHdc, 0, 0, srcWidth, srcHeight, OS.SRCCOPY); OS.SelectObject (memHdc2, oldMemBitmap2); @@ -243,7 +244,7 @@ int copyWithAlpha (int hBitmap, int background, byte[] alphaData, int destWidth, return memDib; } -int createMaskFromAlpha (ImageData data, int destWidth, int destHeight) { +int /*long*/ createMaskFromAlpha (ImageData data, int destWidth, int destHeight) { int srcWidth = data.width; int srcHeight = data.height; ImageData mask = ImageData.internal_new (srcWidth, srcHeight, 1, @@ -255,13 +256,13 @@ int createMaskFromAlpha (ImageData data, int destWidth, int destHeight) { mask.setPixel (x, y, (data.alphaData [ap++] & 0xff) <= 127 ? 1 : 0); } } - int hMask = OS.CreateBitmap (srcWidth, srcHeight, 1, 1, mask.data); + int /*long*/ hMask = OS.CreateBitmap (srcWidth, srcHeight, 1, 1, mask.data); if (srcWidth != destWidth || srcHeight != destHeight) { - int hdc = OS.GetDC (0); - int hdc1 = OS.CreateCompatibleDC (hdc); + int /*long*/ hdc = OS.GetDC (0); + int /*long*/ hdc1 = OS.CreateCompatibleDC (hdc); OS.SelectObject (hdc1, hMask); - int hdc2 = OS.CreateCompatibleDC (hdc); - int hMask2 = OS.CreateBitmap (destWidth, destHeight, 1, 1, null); + int /*long*/ hdc2 = OS.CreateCompatibleDC (hdc); + int /*long*/ hMask2 = OS.CreateBitmap (destWidth, destHeight, 1, 1, null); OS.SelectObject (hdc2, hMask2); if (!OS.IsWinCE) OS.SetStretchBltMode(hdc2, OS.COLORONCOLOR); OS.StretchBlt (hdc2, 0, 0, destWidth, destHeight, hdc1, 0, 0, srcWidth, srcHeight, OS.SRCCOPY); @@ -274,14 +275,14 @@ int createMaskFromAlpha (ImageData data, int destWidth, int destHeight) { return hMask; } -int createMask (int hBitmap, int destWidth, int destHeight, int background, int transparentPixel) { +int /*long*/ createMask (int /*long*/ hBitmap, int destWidth, int destHeight, int background, int transparentPixel) { BITMAP bm = new BITMAP (); OS.GetObject (hBitmap, BITMAP.sizeof, bm); int srcWidth = bm.bmWidth; int srcHeight = bm.bmHeight; - int hMask = OS.CreateBitmap (destWidth, destHeight, 1, 1, null); - int hDC = OS.GetDC (0); - int hdc1 = OS.CreateCompatibleDC (hDC); + int /*long*/ hMask = OS.CreateBitmap (destWidth, destHeight, 1, 1, null); + int /*long*/ hDC = OS.GetDC (0); + int /*long*/ hdc1 = OS.CreateCompatibleDC (hDC); if (background != -1) { OS.SelectObject (hdc1, hBitmap); @@ -311,7 +312,7 @@ int createMask (int hBitmap, int destWidth, int destHeight, int background, int OS.SetBkColor (hdc1, background); } - int hdc2 = OS.CreateCompatibleDC (hDC); + int /*long*/ hdc2 = OS.CreateCompatibleDC (hDC); OS.SelectObject (hdc2, hMask); if (destWidth != srcWidth || destHeight != srcHeight) { if (!OS.IsWinCE) OS.SetStretchBltMode (hdc2, OS.COLORONCOLOR); @@ -324,7 +325,7 @@ int createMask (int hBitmap, int destWidth, int destHeight, int background, int /* Put back the original palette */ if (originalColors != null) OS.SetDIBColorTable(hdc1, 0, 1 << bm.bmBitsPixel, originalColors); } else { - int hOldBitmap = OS.SelectObject (hdc1, hMask); + int /*long*/ hOldBitmap = OS.SelectObject (hdc1, hMask); OS.PatBlt (hdc1, 0, 0, destWidth, destHeight, OS.BLACKNESS); OS.SelectObject (hdc1, hOldBitmap); } @@ -347,7 +348,7 @@ public int getStyle () { return style; } -public int getHandle () { +public int /*long*/ getHandle () { return handle; } @@ -388,7 +389,7 @@ public int removeRef() { } void set (int index, Image image, int count) { - int hImage = image.handle; + int /*long*/ hImage = image.handle; int [] cx = new int [1], cy = new int [1]; OS.ImageList_GetIconSize (handle, cx, cy); switch (image.type) { @@ -396,7 +397,7 @@ void set (int index, Image image, int count) { /* * Note that the image size has to match the image list icon size. */ - int hBitmap = 0, hMask = 0; + int /*long*/ hBitmap = 0, hMask = 0; ImageData data = image.getImageData (); switch (data.getTransparencyType ()) { case SWT.TRANSPARENCY_ALPHA: @@ -434,7 +435,7 @@ void set (int index, Image image, int count) { if (OS.IsWinCE) { OS.ImageList_ReplaceIcon (handle, index == count ? -1 : index, hImage); } else { - int hIcon = copyIcon (hImage, cx [0], cy [0]); + int /*long*/ hIcon = copyIcon (hImage, cx [0], cy [0]); OS.ImageList_ReplaceIcon (handle, index == count ? -1 : index, hIcon); OS.DestroyIcon (hIcon); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Button.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Button.java index c7a40c57e6..58dfbadfe9 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Button.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Button.java @@ -50,10 +50,10 @@ public class Button extends Control { static final int CHECK_WIDTH, CHECK_HEIGHT; static final int ICON_WIDTH = 128, ICON_HEIGHT = 128; static final boolean COMMAND_LINK = false; - static final int ButtonProc; + static final int /*long*/ ButtonProc; static final TCHAR ButtonClass = new TCHAR (0, "BUTTON", true); static { - int hBitmap = OS.LoadBitmap (0, OS.OBM_CHECKBOXES); + int /*long*/ hBitmap = OS.LoadBitmap (0, OS.OBM_CHECKBOXES); if (hBitmap == 0) { CHECK_WIDTH = OS.GetSystemMetrics (OS.IsWinCE ? OS.SM_CXSMICON : OS.SM_CXVSCROLL); CHECK_HEIGHT = OS.GetSystemMetrics (OS.IsWinCE ? OS.SM_CYSMICON : OS.SM_CYVSCROLL); @@ -158,7 +158,8 @@ void _setImage (Image image) { } else { if (image2 != null) image2.dispose (); image2 = null; - int hImage = 0, imageBits = 0, fImageType = 0; + int /*long*/ hImage = 0; + int imageBits = 0, fImageType = 0; if (image != null) { switch (image.type) { case SWT.BITMAP: { @@ -208,14 +209,14 @@ void _setImage (Image image) { if ((style & SWT.RIGHT_TO_LEFT) != 0) { if (!OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (4, 10)) { Rectangle rect = image.getBounds (); - int hDC = OS.GetDC (handle); - int dstHdc = OS.CreateCompatibleDC (hDC); - int hBitmap = OS.CreateCompatibleBitmap (hDC, rect.width, rect.height); - int oldBitmap = OS.SelectObject (dstHdc, hBitmap); + int /*long*/ hDC = OS.GetDC (handle); + int /*long*/ dstHdc = OS.CreateCompatibleDC (hDC); + int /*long*/ hBitmap = OS.CreateCompatibleBitmap (hDC, rect.width, rect.height); + int /*long*/ oldBitmap = OS.SelectObject (dstHdc, hBitmap); OS.SetLayout (dstHdc, OS.LAYOUT_RTL); if (fImageType == OS.IMAGE_BITMAP) { - int srcHdc = OS.CreateCompatibleDC (hDC); - int oldSrcBitmap = OS.SelectObject (srcHdc, hImage); + int /*long*/ srcHdc = OS.CreateCompatibleDC (hDC); + int /*long*/ oldSrcBitmap = OS.SelectObject (srcHdc, hImage); OS.SetLayout (dstHdc, 0); OS.BitBlt (dstHdc, 0, 0, rect.width, rect.height, srcHdc, 0, 0, OS.SRCCOPY); OS.SelectObject (srcHdc, oldSrcBitmap); @@ -223,8 +224,8 @@ void _setImage (Image image) { } else { Control control = findBackgroundControl (); if (control == null) control = this; - int newBrush = OS.CreateSolidBrush (control.getBackgroundPixel ()); - int oldBrush = OS.SelectObject (dstHdc, newBrush); + int /*long*/ newBrush = OS.CreateSolidBrush (control.getBackgroundPixel ()); + int /*long*/ oldBrush = OS.SelectObject (dstHdc, newBrush); OS.PatBlt (dstHdc, 0, 0, rect.width, rect.height, OS.PATCOPY); OS.DrawIconEx (dstHdc, 0, 0, hImage, 0, 0, 0, 0, OS.DI_NORMAL); OS.SelectObject (dstHdc, oldBrush); @@ -325,7 +326,7 @@ public void addSelectionListener (SelectionListener listener) { addListener (SWT.DefaultSelection,typedListener); } -int callWindowProc (int hwnd, int msg, int wParam, int lParam) { +int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) { if (handle == 0) return 0; return OS.CallWindowProc (ButtonProc, hwnd, msg, wParam, lParam); } @@ -364,9 +365,9 @@ int computeLeftMargin () { if (image != null && text.length () != 0) { Rectangle bounds = image.getBounds (); margin += bounds.width + MARGIN * 2; - int oldFont = 0; - int hDC = OS.GetDC (handle); - int newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); + int /*long*/ oldFont = 0; + int /*long*/ hDC = OS.GetDC (handle); + int /*long*/ newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont); TCHAR buffer = new TCHAR (getCodePage (), text, true); RECT rect = new RECT (); @@ -433,9 +434,9 @@ public Point computeSize (int wHint, int hHint, boolean changed) { } } if (hasText) { - int oldFont = 0; - int hDC = OS.GetDC (handle); - int newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); + int /*long*/ oldFont = 0; + int /*long*/ hDC = OS.GetDC (handle); + int /*long*/ newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont); TEXTMETRIC lptm = OS.IsUnicode ? (TEXTMETRIC) new TEXTMETRICW () : new TEXTMETRICA (); OS.GetTextMetrics (hDC, lptm); @@ -649,7 +650,7 @@ String getNameText () { public boolean getSelection () { checkWidget (); if ((style & (SWT.CHECK | SWT.RADIO | SWT.TOGGLE)) == 0) return false; - int state = OS.SendMessage (handle, OS.BM_GETCHECK, 0, 0); + int /*long*/ state = OS.SendMessage (handle, OS.BM_GETCHECK, 0, 0); return (state & OS.BST_CHECKED) != 0; } @@ -816,7 +817,7 @@ public void setAlignment (int alignment) { void setDefault (boolean value) { if ((style & SWT.PUSH) == 0) return; - int hwndShell = menuShell ().handle; + int /*long*/ hwndShell = menuShell ().handle; int bits = OS.GetWindowLong (handle, OS.GWL_STYLE); if (value) { bits |= OS.BS_DEFPUSHBUTTON; @@ -1027,7 +1028,7 @@ TCHAR windowClass () { return ButtonClass; } -int windowProc () { +int /*long*/ windowProc () { return ButtonProc; } @@ -1054,7 +1055,7 @@ LRESULT WM_ERASEBKGND (int wParam, int lParam) { return result; } -LRESULT WM_GETDLGCODE (int wParam, int lParam) { +LRESULT WM_GETDLGCODE (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_GETDLGCODE (wParam, lParam); if (result != null) return result; if ((style & SWT.ARROW) != 0) { @@ -1063,7 +1064,7 @@ LRESULT WM_GETDLGCODE (int wParam, int lParam) { return result; } -LRESULT WM_KILLFOCUS (int wParam, int lParam) { +LRESULT WM_KILLFOCUS (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_KILLFOCUS (wParam, lParam); if ((style & SWT.PUSH) != 0 && getDefault ()) { menuShell ().setDefaultButton (null, false); @@ -1071,17 +1072,17 @@ LRESULT WM_KILLFOCUS (int wParam, int lParam) { return result; } -LRESULT WM_LBUTTONDOWN (int wParam, int lParam) { +LRESULT WM_LBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) { if (ignoreMouse) return null; return super.WM_LBUTTONDOWN (wParam, lParam); } -LRESULT WM_LBUTTONUP (int wParam, int lParam) { +LRESULT WM_LBUTTONUP (int /*long*/ wParam, int /*long*/ lParam) { if (ignoreMouse) return null; return super.WM_LBUTTONUP (wParam, lParam); } -LRESULT WM_SETFOCUS (int wParam, int lParam) { +LRESULT WM_SETFOCUS (int /*long*/ wParam, int /*long*/ lParam) { /* * Feature in Windows. When Windows sets focus to * a radio button, it sets the WM_TABSTOP style. @@ -1102,7 +1103,7 @@ LRESULT WM_SETFOCUS (int wParam, int lParam) { return result; } -LRESULT WM_SIZE (int wParam, int lParam) { +LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_SIZE (wParam, lParam); if (result != null) return result; if (OS.COMCTL32_MAJOR >= 6) { @@ -1120,14 +1121,14 @@ LRESULT WM_SIZE (int wParam, int lParam) { return result; } -LRESULT WM_SYSCOLORCHANGE (int wParam, int lParam) { +LRESULT WM_SYSCOLORCHANGE (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_SYSCOLORCHANGE (wParam, lParam); if (result != null) return result; if (image2 != null) _setImage (image); return result; } -LRESULT WM_UPDATEUISTATE (int wParam, int lParam) { +LRESULT WM_UPDATEUISTATE (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_UPDATEUISTATE (wParam, lParam); if (result != null) return result; /* @@ -1154,7 +1155,7 @@ LRESULT WM_UPDATEUISTATE (int wParam, int lParam) { } if (redraw) { OS.InvalidateRect (handle, null, false); - int code = OS.DefWindowProc (handle, OS.WM_UPDATEUISTATE, wParam, lParam); + int /*long*/ code = OS.DefWindowProc (handle, OS.WM_UPDATEUISTATE, wParam, lParam); return new LRESULT (code); } } @@ -1162,7 +1163,7 @@ LRESULT WM_UPDATEUISTATE (int wParam, int lParam) { return result; } -LRESULT wmCommandChild (int wParam, int lParam) { +LRESULT wmCommandChild (int /*long*/ wParam, int /*long*/ lParam) { int code = OS.HIWORD (wParam); switch (code) { case OS.BN_CLICKED: @@ -1183,7 +1184,7 @@ LRESULT wmCommandChild (int wParam, int lParam) { return super.wmCommandChild (wParam, lParam); } -LRESULT wmColorChild (int wParam, int lParam) { +LRESULT wmColorChild (int /*long*/ wParam, int /*long*/ lParam) { /* * Bug in Windows. For some reason, the HBRUSH that * is returned from WM_CTRLCOLOR is misaligned when @@ -1204,7 +1205,7 @@ LRESULT wmColorChild (int wParam, int lParam) { return result; } -LRESULT wmDrawChild (int wParam, int lParam) { +LRESULT wmDrawChild (int /*long*/ wParam, int /*long*/ lParam) { if ((style & SWT.ARROW) == 0) return super.wmDrawChild (wParam, lParam); DRAWITEMSTRUCT struct = new DRAWITEMSTRUCT (); OS.MoveMemory (struct, lParam, DRAWITEMSTRUCT.sizeof); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Canvas.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Canvas.java index 7298c53fa2..20f61fa6a6 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Canvas.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Canvas.java @@ -80,7 +80,7 @@ void clearArea (int x, int y, int width, int height) { if (OS.IsWindowVisible (handle)) { RECT rect = new RECT (); OS.SetRect (rect, x, y, x + width, y + height); - int hDC = OS.GetDCEx (handle, 0, OS.DCX_CACHE | OS.DCX_CLIPCHILDREN | OS.DCX_CLIPSIBLINGS); + int /*long*/ hDC = OS.GetDCEx (handle, 0, OS.DCX_CACHE | OS.DCX_CLIPCHILDREN | OS.DCX_CLIPSIBLINGS); drawBackground (hDC, rect); OS.ReleaseDC (handle, hDC); } @@ -144,7 +144,7 @@ public void drawBackground (GC gc, int x, int y, int width, int height) { if (gc.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT); RECT rect = new RECT (); OS.SetRect (rect, x, y, x + width, y + height); - int hDC = gc.handle; + int /*long*/ hDC = gc.handle; int pixel = background == -1 ? gc.getBackground ().handle : -1; drawBackground (hDC, rect, pixel); } @@ -278,7 +278,7 @@ public void setFont (Font font) { super.setFont (font); } -int windowProc (int hwnd, int msg, int wParam, int lParam) { +int /*long*/ windowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) { if (msg == Display.SWT_RESTORECARET) { if ((state & CANVAS) != 0) { if (caret != null) { @@ -291,7 +291,7 @@ int windowProc (int hwnd, int msg, int wParam, int lParam) { return super.windowProc (hwnd, msg, wParam, lParam); } -LRESULT WM_IME_COMPOSITION (int wParam, int lParam) { +LRESULT WM_IME_COMPOSITION (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_IME_COMPOSITION (wParam, lParam); /* * Bug in Windows. On Korean Windows XP, the IME window @@ -313,7 +313,7 @@ LRESULT WM_IME_COMPOSITION (int wParam, int lParam) { lpCompForm.dwStyle = OS.CFS_POINT; lpCompForm.x = ptCurrentPos.x; lpCompForm.y = ptCurrentPos.y; - int hIMC = OS.ImmGetContext (handle); + int /*long*/ hIMC = OS.ImmGetContext (handle); OS.ImmSetCompositionWindow (hIMC, lpCompForm); OS.ImmReleaseContext (handle, hIMC); } @@ -324,7 +324,7 @@ LRESULT WM_IME_COMPOSITION (int wParam, int lParam) { return result; } -LRESULT WM_INPUTLANGCHANGE (int wParam, int lParam) { +LRESULT WM_INPUTLANGCHANGE (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_INPUTLANGCHANGE (wParam, lParam); if (caret != null && caret.isFocusCaret ()) { caret.setIMEFont (); @@ -333,25 +333,25 @@ LRESULT WM_INPUTLANGCHANGE (int wParam, int lParam) { return result; } -LRESULT WM_KILLFOCUS (int wParam, int lParam) { +LRESULT WM_KILLFOCUS (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_KILLFOCUS (wParam, lParam); if (caret != null) caret.killFocus (); return result; } -LRESULT WM_SETFOCUS (int wParam, int lParam) { +LRESULT WM_SETFOCUS (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_SETFOCUS (wParam, lParam); if (caret != null) caret.setFocus (); return result; } -LRESULT WM_SIZE (int wParam, int lParam) { +LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_SIZE (wParam, lParam); if (caret != null && caret.isFocusCaret ()) caret.resizeIME (); return result; } -LRESULT WM_WINDOWPOSCHANGED (int wParam, int lParam) { +LRESULT WM_WINDOWPOSCHANGED (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_WINDOWPOSCHANGED (wParam, lParam); if (result != null) return result; /* @@ -366,7 +366,7 @@ LRESULT WM_WINDOWPOSCHANGED (int wParam, int lParam) { return result; } -LRESULT WM_WINDOWPOSCHANGING (int wParam, int lParam) { +LRESULT WM_WINDOWPOSCHANGING (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_WINDOWPOSCHANGING (wParam, lParam); if (result != null) return result; /* diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Caret.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Caret.java index f5ae930e3f..6698835877 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Caret.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Caret.java @@ -80,10 +80,10 @@ void createWidget () { } } -int defaultFont () { - int hwnd = parent.handle; - int hwndIME = OS.ImmGetDefaultIMEWnd (hwnd); - int hFont = 0; +int /*long*/ defaultFont () { + int /*long*/ hwnd = parent.handle; + int /*long*/ hwndIME = OS.ImmGetDefaultIMEWnd (hwnd); + int /*long*/ hFont = 0; if (hwndIME != 0) { hFont = OS.SendMessage (hwndIME, OS.WM_GETFONT, 0, 0); } @@ -127,7 +127,7 @@ public Rectangle getBounds () { public Font getFont () { checkWidget(); if (font == null) { - int hFont = defaultFont (); + int /*long*/ hFont = defaultFont (); return Font.win32_new (display, hFont); } return font; @@ -262,7 +262,7 @@ void resizeIME () { if (!OS.IsDBLocale) return; POINT ptCurrentPos = new POINT (); if (!OS.GetCaretPos (ptCurrentPos)) return; - int hwnd = parent.handle; + int /*long*/ hwnd = parent.handle; RECT rect = new RECT (); OS.GetClientRect (hwnd, rect); COMPOSITIONFORM lpCompForm = new COMPOSITIONFORM (); @@ -273,7 +273,7 @@ void resizeIME () { lpCompForm.right = rect.right; lpCompForm.top = rect.top; lpCompForm.bottom = rect.bottom; - int hIMC = OS.ImmGetContext (hwnd); + int /*long*/ hIMC = OS.ImmGetContext (hwnd); OS.ImmSetCompositionWindow (hIMC, lpCompForm); OS.ImmReleaseContext (hwnd, hIMC); } @@ -293,9 +293,9 @@ void releaseWidget () { void resize () { resized = false; - int hwnd = parent.handle; + int /*long*/ hwnd = parent.handle; OS.DestroyCaret (); - int hBitmap = image != null ? image.handle : 0; + int /*long*/ hBitmap = image != null ? image.handle : 0; OS.CreateCaret (hwnd, hBitmap, width, height); OS.SetCaretPos (x, y); OS.ShowCaret (hwnd); @@ -305,8 +305,8 @@ void resize () { void restoreIMEFont () { if (!OS.IsDBLocale) return; if (oldFont == null) return; - int hwnd = parent.handle; - int hIMC = OS.ImmGetContext (hwnd); + int /*long*/ hwnd = parent.handle; + int /*long*/ hIMC = OS.ImmGetContext (hwnd); OS.ImmSetCompositionFont (hIMC, oldFont); OS.ImmReleaseContext (hwnd, hIMC); oldFont = null; @@ -363,8 +363,8 @@ public void setBounds (Rectangle rect) { } void setFocus () { - int hwnd = parent.handle; - int hBitmap = 0; + int /*long*/ hwnd = parent.handle; + int /*long*/ hBitmap = 0; if (image != null) hBitmap = image.handle; OS.CreateCaret (hwnd, hBitmap, width, height); move (); @@ -422,11 +422,11 @@ public void setImage (Image image) { void setIMEFont () { if (!OS.IsDBLocale) return; - int hFont = 0; + int /*long*/ hFont = 0; if (font != null) hFont = font.handle; if (hFont == 0) hFont = defaultFont (); - int hwnd = parent.handle; - int hIMC = OS.ImmGetContext (hwnd); + int /*long*/ hwnd = parent.handle; + int /*long*/ hIMC = OS.ImmGetContext (hwnd); /* Save the current IME font */ if (oldFont == null) { oldFont = OS.IsUnicode ? (LOGFONT) new LOGFONTW () : new LOGFONTA (); @@ -537,7 +537,7 @@ public void setVisible (boolean visible) { checkWidget(); if (visible == isVisible) return; isVisible = visible; - int hwnd = parent.handle; + int /*long*/ hwnd = parent.handle; if (OS.GetFocus () != hwnd) return; if (!isVisible) { OS.HideCaret (hwnd); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ColorDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ColorDialog.java index 6e3392959a..038445de42 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ColorDialog.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ColorDialog.java @@ -90,8 +90,8 @@ public ColorDialog (Shell parent, int style) { checkSubclass (); } -int CCHookProc (int hdlg, int uiMsg, int lParam, int lpData) { - switch (uiMsg) { +int /*long*/ CCHookProc (int /*long*/ hdlg, int /*long*/ uiMsg, int /*long*/ lParam, int /*long*/ lpData) { + switch ((int)/*64*/uiMsg) { case OS.WM_INITDIALOG: { RECT rect = new RECT (); OS.GetWindowRect (hdlg, rect); @@ -149,17 +149,17 @@ public RGB getRGB () { public RGB open () { /* Get the owner HWND for the dialog */ - int hwndOwner = parent.handle; + int /*long*/ hwndOwner = parent.handle; /* Create the CCHookProc */ Callback callback = new Callback (this, "CCHookProc", 4); //$NON-NLS-1$ - int lpfnHook = callback.getAddress (); + int /*long*/ lpfnHook = callback.getAddress (); if (lpfnHook == 0) SWT.error(SWT.ERROR_NO_MORE_CALLBACKS); /* Allocate the Custom Colors */ display = parent.display; if (display.lpCustColors == 0) { - int hHeap = OS.GetProcessHeap (); + int /*long*/ hHeap = OS.GetProcessHeap (); display.lpCustColors = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, 16 * 4); } @@ -221,6 +221,7 @@ public RGB open () { */ // if (hwndOwner != 0) OS.UpdateWindow (hwndOwner); + display = null; if (!success) return null; return rgb; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Combo.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Combo.java index 378c235859..d0b7744e46 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Combo.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Combo.java @@ -55,8 +55,8 @@ import org.eclipse.swt.events.*; public class Combo extends Composite { boolean noSelection, ignoreDefaultSelection, ignoreCharacter, ignoreModify; - int cbtHook, scrollWidth, visibleCount = 5; - + int scrollWidth, visibleCount = 5; + int /*long*/ cbtHook; /** * the operating system limit for the number of characters * that the text field in an instance of this class can hold @@ -80,9 +80,9 @@ public class Combo extends Composite { */ static final int CBID_LIST = 1000; static final int CBID_EDIT = 1001; - static /*final*/ int EditProc, ListProc; + static /*final*/ int /*long*/ EditProc, ListProc; - static final int ComboProc; + static final int /*long*/ ComboProc; static final TCHAR ComboClass = new TCHAR (0, "COMBOBOX", true); static { WNDCLASS lpWndClass = new WNDCLASS (); @@ -146,7 +146,7 @@ public void add (String string) { checkWidget (); if (string == null) error (SWT.ERROR_NULL_ARGUMENT); TCHAR buffer = new TCHAR (getCodePage (), string, true); - int result = OS.SendMessage (handle, OS.CB_ADDSTRING, 0, buffer); + int result = (int)/*64*/OS.SendMessage (handle, OS.CB_ADDSTRING, 0, buffer); if (result == OS.CB_ERR) error (SWT.ERROR_ITEM_NOT_ADDED); if (result == OS.CB_ERRSPACE) error (SWT.ERROR_ITEM_NOT_ADDED); if ((style & SWT.H_SCROLL) != 0) setScrollWidth (buffer, true); @@ -178,12 +178,12 @@ public void add (String string) { public void add (String string, int index) { checkWidget (); if (string == null) error (SWT.ERROR_NULL_ARGUMENT); - int count = OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); if (!(0 <= index && index <= count)) { error (SWT.ERROR_INVALID_RANGE); } TCHAR buffer = new TCHAR (getCodePage (), string, true); - int result = OS.SendMessage (handle, OS.CB_INSERTSTRING, index, buffer); + int result = (int)/*64*/OS.SendMessage (handle, OS.CB_INSERTSTRING, index, buffer); if (result == OS.CB_ERRSPACE || result == OS.CB_ERR) { error (SWT.ERROR_ITEM_NOT_ADDED); } @@ -276,24 +276,24 @@ public void addVerifyListener (VerifyListener listener) { addListener (SWT.Verify, typedListener); } -int callWindowProc (int hwnd, int msg, int wParam, int lParam) { +int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) { if (handle == 0) return 0; if (hwnd == handle) { return OS.CallWindowProc (ComboProc, hwnd, msg, wParam, lParam); } - int hwndText = OS.GetDlgItem (handle, CBID_EDIT); + int /*long*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT); if (hwnd == hwndText) { return OS.CallWindowProc (EditProc, hwnd, msg, wParam, lParam); } - int hwndList = OS.GetDlgItem (handle, CBID_LIST); + int /*long*/ hwndList = OS.GetDlgItem (handle, CBID_LIST); if (hwnd == hwndList) { return OS.CallWindowProc (ListProc, hwnd, msg, wParam, lParam); } return OS.DefWindowProc (hwnd, msg, wParam, lParam); } -int CBTProc (int nCode, int wParam, int lParam) { - if (nCode == OS.HCBT_CREATEWND) { +int /*long*/ CBTProc (int /*long*/ nCode, int /*long*/ wParam, int /*long*/ lParam) { + if ((int)/*64*/nCode == OS.HCBT_CREATEWND) { TCHAR buffer = new TCHAR (0, 128); OS.GetClassName (wParam, buffer, buffer.length ()); String className = buffer.toString (0, buffer.strlen ()); @@ -302,10 +302,10 @@ int CBTProc (int nCode, int wParam, int lParam) { OS.SetWindowLong (wParam, OS.GWL_STYLE, bits & ~OS.ES_NOHIDESEL); } } - return OS.CallNextHookEx (cbtHook, nCode, wParam, lParam); + return OS.CallNextHookEx (cbtHook, (int)/*64*/nCode, wParam, lParam); } -boolean checkHandle (int hwnd) { +boolean checkHandle (int /*long*/ hwnd) { return hwnd == handle || hwnd == OS.GetDlgItem (handle, CBID_EDIT) || hwnd == OS.GetDlgItem (handle, CBID_LIST); } @@ -367,11 +367,11 @@ public Point computeSize (int wHint, int hHint, boolean changed) { checkWidget (); int width = 0, height = 0; if (wHint == SWT.DEFAULT) { - int newFont, oldFont = 0; - int hDC = OS.GetDC (handle); + int /*long*/ newFont, oldFont = 0; + int /*long*/ hDC = OS.GetDC (handle); newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont); - int count = OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); RECT rect = new RECT (); int flags = OS.DT_CALCRECT | OS.DT_NOPREFIX; if ((style & SWT.READ_ONLY) == 0) flags |= OS.DT_EDITCONTROL; @@ -385,10 +385,10 @@ public Point computeSize (int wHint, int hHint, boolean changed) { width = Math.max (width, scrollWidth); } else { for (int i=0; i<count; i++) { - length = OS.SendMessage (handle, OS.CB_GETLBTEXTLEN, i, 0); + length = (int)/*64*/OS.SendMessage (handle, OS.CB_GETLBTEXTLEN, i, 0); if (length != OS.CB_ERR) { if (length + 1 > buffer.length ()) buffer = new TCHAR (cp, length + 1); - int result = OS.SendMessage (handle, OS.CB_GETLBTEXT, i, buffer); + int result = (int)/*64*/OS.SendMessage (handle, OS.CB_GETLBTEXT, i, buffer); if (result != OS.CB_ERR) { OS.DrawText (hDC, buffer, length, rect, flags); width = Math.max (width, rect.right - rect.left); @@ -401,8 +401,8 @@ public Point computeSize (int wHint, int hHint, boolean changed) { } if (hHint == SWT.DEFAULT) { if ((style & SWT.SIMPLE) != 0) { - int count = OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); - int itemHeight = OS.SendMessage (handle, OS.CB_GETITEMHEIGHT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); + int itemHeight = (int)/*64*/OS.SendMessage (handle, OS.CB_GETITEMHEIGHT, 0, 0); height = count * itemHeight; } } @@ -413,9 +413,9 @@ public Point computeSize (int wHint, int hHint, boolean changed) { if ((style & SWT.READ_ONLY) != 0) { width += 8; } else { - int hwndText = OS.GetDlgItem (handle, CBID_EDIT); + int /*long*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT); if (hwndText != 0) { - int margins = OS.SendMessage (hwndText, OS.EM_GETMARGINS, 0, 0); + int /*long*/ margins = OS.SendMessage (hwndText, OS.EM_GETMARGINS, 0, 0); int marginWidth = OS.LOWORD (margins) + OS.HIWORD (margins); width += marginWidth + 3; } @@ -428,7 +428,7 @@ public Point computeSize (int wHint, int hHint, boolean changed) { } else { int border = OS.GetSystemMetrics (OS.SM_CXEDGE); width += OS.GetSystemMetrics (OS.SM_CXVSCROLL) + border * 2; - int textHeight = OS.SendMessage (handle, OS.CB_GETITEMHEIGHT, -1, 0); + int textHeight = (int)/*64*/OS.SendMessage (handle, OS.CB_GETITEMHEIGHT, -1, 0); if ((style & SWT.DROP_DOWN) != 0) { height = textHeight + 6; } else { @@ -475,7 +475,7 @@ void createHandle () { } else { int threadId = OS.GetCurrentThreadId (); Callback cbtCallback = new Callback (this, "CBTProc", 3); //$NON-NLS-1$ - int cbtProc = cbtCallback.getAddress (); + int /*long*/ cbtProc = cbtCallback.getAddress (); if (cbtProc == 0) error (SWT.ERROR_NO_MORE_CALLBACKS); cbtHook = OS.SetWindowsHookEx (OS.WH_CBT, cbtProc, 0, threadId); super.createHandle (); @@ -486,13 +486,13 @@ void createHandle () { state &= ~(CANVAS | THEME_BACKGROUND); /* Get the text and list window procs */ - int hwndText = OS.GetDlgItem (handle, CBID_EDIT); + int /*long*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT); if (hwndText != 0 && EditProc == 0) { - EditProc = OS.GetWindowLong (hwndText, OS.GWL_WNDPROC); + EditProc = OS.GetWindowLongPtr (hwndText, OS.GWLP_WNDPROC); } - int hwndList = OS.GetDlgItem (handle, CBID_LIST); + int /*long*/ hwndList = OS.GetDlgItem (handle, CBID_LIST); if (hwndList != 0 && ListProc == 0) { - ListProc = OS.GetWindowLong (hwndList, OS.GWL_WNDPROC); + ListProc = OS.GetWindowLongPtr (hwndList, OS.GWLP_WNDPROC); } /* @@ -534,9 +534,9 @@ int defaultBackground () { void deregister () { super.deregister (); - int hwndText = OS.GetDlgItem (handle, CBID_EDIT); + int /*long*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT); if (hwndText != 0) display.removeControl (hwndText); - int hwndList = OS.GetDlgItem (handle, CBID_LIST); + int /*long*/ hwndList = OS.GetDlgItem (handle, CBID_LIST); if (hwndList != 0) display.removeControl (hwndList); } @@ -554,7 +554,7 @@ void deregister () { */ public void deselect (int index) { checkWidget (); - int selection = OS.SendMessage (handle, OS.CB_GETCURSEL, 0, 0); + int selection = (int)/*64*/OS.SendMessage (handle, OS.CB_GETCURSEL, 0, 0); if (index != selection) return; OS.SendMessage (handle, OS.CB_SETCURSEL, -1, 0); sendEvent (SWT.Modify); @@ -582,14 +582,14 @@ public void deselectAll () { // widget could be disposed at this point } -boolean dragDetect (int hwnd, int x, int y, boolean filter, boolean [] detect, boolean [] consume) { +boolean dragDetect (int /*long*/ hwnd, int x, int y, boolean filter, boolean [] detect, boolean [] consume) { if (filter && (style & SWT.READ_ONLY) == 0) { - int hwndText = OS.GetDlgItem (handle, CBID_EDIT); + int /*long*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT); if (hwndText != 0) { int [] start = new int [1], end = new int [1]; OS.SendMessage (handle, OS.CB_GETEDITSEL, start, end); if (start [0] != end [0]) { - int lParam = OS.MAKELPARAM (x, y); + int /*long*/ lParam = OS.MAKELPARAM (x, y); int position = OS.LOWORD (OS.SendMessage (hwndText, OS.EM_CHARFROMPOS, 0, lParam)); if (start [0] <= position && position < end [0]) { if (super.dragDetect (hwnd, x, y, filter, detect, consume)) { @@ -622,13 +622,13 @@ boolean dragDetect (int hwnd, int x, int y, boolean filter, boolean [] detect, b */ public String getItem (int index) { checkWidget (); - int length = OS.SendMessage (handle, OS.CB_GETLBTEXTLEN, index, 0); + int length = (int)/*64*/OS.SendMessage (handle, OS.CB_GETLBTEXTLEN, index, 0); if (length != OS.CB_ERR) { TCHAR buffer = new TCHAR (getCodePage (), length + 1); - int result = OS.SendMessage (handle, OS.CB_GETLBTEXT, index, buffer); + int result = (int)/*64*/OS.SendMessage (handle, OS.CB_GETLBTEXT, index, buffer); if (result != OS.CB_ERR) return buffer.toString (0, length); } - int count = OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); if (0 <= index && index < count) error (SWT.ERROR_CANNOT_GET_ITEM); error (SWT.ERROR_INVALID_RANGE); return ""; @@ -646,7 +646,7 @@ public String getItem (int index) { */ public int getItemCount () { checkWidget (); - int count = OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); if (count == OS.CB_ERR) error (SWT.ERROR_CANNOT_GET_COUNT); return count; } @@ -664,7 +664,7 @@ public int getItemCount () { */ public int getItemHeight () { checkWidget (); - int result = OS.SendMessage (handle, OS.CB_GETITEMHEIGHT, 0, 0); + int result = (int)/*64*/OS.SendMessage (handle, OS.CB_GETITEMHEIGHT, 0, 0); if (result == OS.CB_ERR) error (SWT.ERROR_CANNOT_GET_ITEM_HEIGHT); return result; } @@ -788,7 +788,7 @@ public Point getSelection () { public int getSelectionIndex () { checkWidget (); if (noSelection) return -1; - return OS.SendMessage (handle, OS.CB_GETCURSEL, 0, 0); + return (int)/*64*/OS.SendMessage (handle, OS.CB_GETCURSEL, 0, 0); } /** @@ -829,7 +829,7 @@ public int getTextHeight () { if (((style & SWT.SIMPLE) == 0) && !OS.IsWinCE && OS.GetComboBoxInfo (handle, pcbi)) { return (pcbi.buttonBottom - pcbi.buttonTop) + pcbi.buttonTop * 2; } - int result = OS.SendMessage (handle, OS.CB_GETITEMHEIGHT, -1, 0); + int result = (int)/*64*/OS.SendMessage (handle, OS.CB_GETITEMHEIGHT, -1, 0); if (result == OS.CB_ERR) error (SWT.ERROR_CANNOT_GET_ITEM_HEIGHT); return (style & SWT.DROP_DOWN) != 0 ? result + 6 : result + 10; } @@ -851,9 +851,9 @@ public int getTextHeight () { */ public int getTextLimit () { checkWidget (); - int hwndText = OS.GetDlgItem (handle, CBID_EDIT); + int /*long*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT); if (hwndText == 0) return LIMIT; - return OS.SendMessage (hwndText, OS.EM_GETLIMITTEXT, 0, 0) & 0x7FFFFFFF; + return (int)/*64*/OS.SendMessage (hwndText, OS.EM_GETLIMITTEXT, 0, 0) & 0x7FFFFFFF; } /** @@ -879,12 +879,12 @@ public int getVisibleItemCount () { } boolean hasFocus () { - int hwndFocus = OS.GetFocus (); + int /*long*/ hwndFocus = OS.GetFocus (); if (hwndFocus == handle) return true; if (hwndFocus == 0) return false; - int hwndText = OS.GetDlgItem (handle, CBID_EDIT); + int /*long*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT); if (hwndFocus == hwndText) return true; - int hwndList = OS.GetDlgItem (handle, CBID_LIST); + int /*long*/ hwndList = OS.GetDlgItem (handle, CBID_LIST); if (hwndFocus == hwndList) return true; return false; } @@ -948,12 +948,12 @@ public int indexOf (String string, int start) { } /* Use CB_FINDSTRINGEXACT to search for the item */ - int count = OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); if (!(0 <= start && start < count)) return -1; int index = start - 1, last = 0; TCHAR buffer = new TCHAR (getCodePage (), string, true); do { - index = OS.SendMessage (handle, OS.CB_FINDSTRINGEXACT, last = index, buffer); + index = (int)/*64*/OS.SendMessage (handle, OS.CB_FINDSTRINGEXACT, last = index, buffer); if (index == OS.CB_ERR || index <= last) return -1; } while (!string.equals (getItem (index))); return index; @@ -962,7 +962,7 @@ public int indexOf (String string, int start) { int mbcsToWcsPos (int mbcsPos) { if (mbcsPos <= 0) return 0; if (OS.IsUnicode) return mbcsPos; - int hwndText = OS.GetDlgItem (handle, CBID_EDIT); + int /*long*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT); if (hwndText == 0) return mbcsPos; int mbcsSize = OS.GetWindowTextLengthA (hwndText); if (mbcsSize == 0) return 0; @@ -994,9 +994,9 @@ public void paste () { void register () { super.register (); - int hwndText = OS.GetDlgItem (handle, CBID_EDIT); + int /*long*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT); if (hwndText != 0) display.addControl (hwndText, this); - int hwndList = OS.GetDlgItem (handle, CBID_LIST); + int /*long*/ hwndList = OS.GetDlgItem (handle, CBID_LIST); if (hwndList != 0) display.addControl (hwndList, this); } @@ -1022,24 +1022,24 @@ public void remove (int index) { void remove (int index, boolean notify) { TCHAR buffer = null; if ((style & SWT.H_SCROLL) != 0) { - int length = OS.SendMessage (handle, OS.CB_GETLBTEXTLEN, index, 0); + int length = (int)/*64*/OS.SendMessage (handle, OS.CB_GETLBTEXTLEN, index, 0); if (length == OS.CB_ERR) { - int count = OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); if (0 <= index && index < count) error (SWT.ERROR_ITEM_NOT_REMOVED); error (SWT.ERROR_INVALID_RANGE); } buffer = new TCHAR (getCodePage (), length + 1); - int result = OS.SendMessage (handle, OS.CB_GETLBTEXT, index, buffer); + int result = (int)/*64*/OS.SendMessage (handle, OS.CB_GETLBTEXT, index, buffer); if (result == OS.CB_ERR) { - int count = OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); if (0 <= index && index < count) error (SWT.ERROR_ITEM_NOT_REMOVED); error (SWT.ERROR_INVALID_RANGE); } } int length = OS.GetWindowTextLength (handle); - int code = OS.SendMessage (handle, OS.CB_DELETESTRING, index, 0); + int code = (int)/*64*/OS.SendMessage (handle, OS.CB_DELETESTRING, index, 0); if (code == OS.CB_ERR) { - int count = OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); if (0 <= index && index < count) error (SWT.ERROR_ITEM_NOT_REMOVED); error (SWT.ERROR_INVALID_RANGE); } @@ -1056,7 +1056,7 @@ void remove (int index, boolean notify) { * force a redraw. */ if ((style & SWT.READ_ONLY) != 0) { - int count = OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); if (count == 0) OS.InvalidateRect (handle, null, true); } } @@ -1080,13 +1080,14 @@ void remove (int index, boolean notify) { public void remove (int start, int end) { checkWidget (); if (start > end) return; - int count = OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); if (!(0 <= start && start <= end && end < count)) { error (SWT.ERROR_INVALID_RANGE); } int textLength = OS.GetWindowTextLength (handle); RECT rect = null; - int hDC = 0, oldFont = 0, newFont = 0, newWidth = 0; + int /*long*/ hDC = 0, oldFont = 0, newFont = 0; + int newWidth = 0; if ((style & SWT.H_SCROLL) != 0) { rect = new RECT (); hDC = OS.GetDC (handle); @@ -1098,13 +1099,13 @@ public void remove (int start, int end) { for (int i=start; i<=end; i++) { TCHAR buffer = null; if ((style & SWT.H_SCROLL) != 0) { - int length = OS.SendMessage (handle, OS.CB_GETLBTEXTLEN, start, 0); + int length = (int)/*64*/OS.SendMessage (handle, OS.CB_GETLBTEXTLEN, start, 0); if (length == OS.CB_ERR) break; buffer = new TCHAR (cp, length + 1); - int result = OS.SendMessage (handle, OS.CB_GETLBTEXT, start, buffer); + int result = (int)/*64*/OS.SendMessage (handle, OS.CB_GETLBTEXT, start, buffer); if (result == OS.CB_ERR) break; } - int result = OS.SendMessage (handle, OS.CB_DELETESTRING, start, 0); + int result = (int)/*64*/OS.SendMessage (handle, OS.CB_DELETESTRING, start, 0); if (result == OS.CB_ERR) error (SWT.ERROR_ITEM_NOT_REMOVED); if ((style & SWT.H_SCROLL) != 0) { OS.DrawText (hDC, buffer, -1, rect, flags); @@ -1128,7 +1129,7 @@ public void remove (int start, int end) { * force a redraw. */ if ((style & SWT.READ_ONLY) != 0) { - count = OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); + count = (int)/*64*/OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); if (count == 0) OS.InvalidateRect (handle, null, true); } } @@ -1249,7 +1250,7 @@ public void removeVerifyListener (VerifyListener listener) { eventTable.unhook (SWT.Verify, listener); } -boolean sendKeyEvent (int type, int msg, int wParam, int lParam, Event event) { +boolean sendKeyEvent (int type, int msg, int /*long*/ wParam, int /*long*/ lParam, Event event) { if (!super.sendKeyEvent (type, msg, wParam, lParam, event)) { return false; } @@ -1287,7 +1288,7 @@ boolean sendKeyEvent (int type, int msg, int wParam, int lParam, Event event) { /* Verify the character */ String oldText = ""; int [] start = new int [1], end = new int [1]; - int hwndText = OS.GetDlgItem (handle, CBID_EDIT); + int /*long*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT); if (hwndText == 0) return true; OS.SendMessage (hwndText, OS.EM_GETSEL, start, end); switch (key) { @@ -1348,10 +1349,10 @@ boolean sendKeyEvent (int type, int msg, int wParam, int lParam, Event event) { */ public void select (int index) { checkWidget (); - int count = OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); if (0 <= index && index < count) { - int selection = OS.SendMessage (handle, OS.CB_GETCURSEL, 0, 0); - int code = OS.SendMessage (handle, OS.CB_SETCURSEL, index, 0); + int selection = (int)/*64*/OS.SendMessage (handle, OS.CB_GETCURSEL, 0, 0); + int code = (int)/*64*/OS.SendMessage (handle, OS.CB_SETCURSEL, index, 0); if (code != OS.CB_ERR && code != selection) { sendEvent (SWT.Modify); // widget could be disposed at this point @@ -1359,19 +1360,19 @@ public void select (int index) { } } -void setBackgroundImage (int hBitmap) { +void setBackgroundImage (int /*long*/ hBitmap) { super.setBackgroundImage (hBitmap); - int hwndText = OS.GetDlgItem (handle, CBID_EDIT); + int /*long*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT); if (hwndText != 0) OS.InvalidateRect (hwndText, null, true); - int hwndList = OS.GetDlgItem (handle, CBID_LIST); + int /*long*/ hwndList = OS.GetDlgItem (handle, CBID_LIST); if (hwndList != 0) OS.InvalidateRect (hwndList, null, true); } void setBackgroundPixel (int pixel) { super.setBackgroundPixel (pixel); - int hwndText = OS.GetDlgItem (handle, CBID_EDIT); + int /*long*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT); if (hwndText != 0) OS.InvalidateRect (hwndText, null, true); - int hwndList = OS.GetDlgItem (handle, CBID_LIST); + int /*long*/ hwndList = OS.GetDlgItem (handle, CBID_LIST); if (hwndList != 0) OS.InvalidateRect (hwndList, null, true); } @@ -1430,9 +1431,9 @@ public void setFont (Font font) { void setForegroundPixel (int pixel) { super.setForegroundPixel (pixel); - int hwndText = OS.GetDlgItem (handle, CBID_EDIT); + int /*long*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT); if (hwndText != 0) OS.InvalidateRect (hwndText, null, true); - int hwndList = OS.GetDlgItem (handle, CBID_LIST); + int /*long*/ hwndList = OS.GetDlgItem (handle, CBID_LIST); if (hwndList != 0) OS.InvalidateRect (hwndList, null, true); } @@ -1483,7 +1484,8 @@ public void setItems (String [] items) { if (items [i] == null) error (SWT.ERROR_INVALID_ARGUMENT); } RECT rect = null; - int hDC = 0, oldFont = 0, newFont = 0, newWidth = 0; + int /*long*/ hDC = 0, oldFont = 0, newFont = 0; + int newWidth = 0; if ((style & SWT.H_SCROLL) != 0) { rect = new RECT (); hDC = OS.GetDC (handle); @@ -1496,7 +1498,7 @@ public void setItems (String [] items) { for (int i=0; i<items.length; i++) { String string = items [i]; TCHAR buffer = new TCHAR (codePage, string, true); - int code = OS.SendMessage (handle, OS.CB_ADDSTRING, 0, buffer); + int code = (int)/*64*/OS.SendMessage (handle, OS.CB_ADDSTRING, 0, buffer); if (code == OS.CB_ERR) error (SWT.ERROR_ITEM_NOT_ADDED); if (code == OS.CB_ERRSPACE) error (SWT.ERROR_ITEM_NOT_ADDED); if ((style & SWT.H_SCROLL) != 0) { @@ -1568,7 +1570,7 @@ public void setOrientation (int orientation) { bits &= ~OS.WS_EX_LAYOUTRTL; } OS.SetWindowLong (handle, OS.GWL_EXSTYLE, bits); - int hwndText = 0, hwndList = 0; + int /*long*/ hwndText = 0, hwndList = 0; COMBOBOXINFO pcbi = new COMBOBOXINFO (); pcbi.cbSize = COMBOBOXINFO.sizeof; if (OS.GetComboBoxInfo (handle, pcbi)) { @@ -1620,18 +1622,18 @@ public void setOrientation (int orientation) { void setScrollWidth () { int newWidth = 0; RECT rect = new RECT (); - int newFont, oldFont = 0; - int hDC = OS.GetDC (handle); + int /*long*/ newFont, oldFont = 0; + int /*long*/ hDC = OS.GetDC (handle); newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont); int cp = getCodePage (); - int count = OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); int flags = OS.DT_CALCRECT | OS.DT_SINGLELINE | OS.DT_NOPREFIX; for (int i=0; i<count; i++) { - int length = OS.SendMessage (handle, OS.CB_GETLBTEXTLEN, i, 0); + int length = (int)/*64*/OS.SendMessage (handle, OS.CB_GETLBTEXTLEN, i, 0); if (length != OS.CB_ERR) { TCHAR buffer = new TCHAR (cp, length + 1); - int result = OS.SendMessage (handle, OS.CB_GETLBTEXT, i, buffer); + int result = (int)/*64*/OS.SendMessage (handle, OS.CB_GETLBTEXT, i, buffer); if (result != OS.CB_ERR) { OS.DrawText (hDC, buffer, -1, rect, flags); newWidth = Math.max (newWidth, rect.right - rect.left); @@ -1650,7 +1652,7 @@ void setScrollWidth (int scrollWidth) { return; } boolean scroll = false; - int count = OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); if (count > 3) { int maxWidth = 0; if (OS.IsWinCE || OS.WIN32_VERSION < OS.VERSION (4, 10)) { @@ -1658,7 +1660,7 @@ void setScrollWidth (int scrollWidth) { OS.SystemParametersInfo (OS.SPI_GETWORKAREA, 0, rect, 0); maxWidth = (rect.right - rect.left) / 4; } else { - int hmonitor = OS.MonitorFromWindow (handle, OS.MONITOR_DEFAULTTONEAREST); + int /*long*/ hmonitor = OS.MonitorFromWindow (handle, OS.MONITOR_DEFAULTTONEAREST); MONITORINFO lpmi = new MONITORINFO (); lpmi.cbSize = MONITORINFO.sizeof; OS.GetMonitorInfo (hmonitor, lpmi); @@ -1678,8 +1680,8 @@ void setScrollWidth (int scrollWidth) { void setScrollWidth (TCHAR buffer, boolean grow) { RECT rect = new RECT (); - int newFont, oldFont = 0; - int hDC = OS.GetDC (handle); + int /*long*/ newFont, oldFont = 0; + int /*long*/ hDC = OS.GetDC (handle); newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont); int flags = OS.DT_CALCRECT | OS.DT_SINGLELINE | OS.DT_NOPREFIX; @@ -1723,7 +1725,7 @@ public void setSelection (Point selection) { start = wcsToMbcsPos (start); end = wcsToMbcsPos (end); } - int bits = OS.MAKELPARAM (start, end); + int /*long*/ bits = OS.MAKELPARAM (start, end); OS.SendMessage (handle, OS.CB_SETEDITSEL, 0, bits); } @@ -1757,9 +1759,9 @@ public void setText (String string) { return; } int limit = LIMIT; - int hwndText = OS.GetDlgItem (handle, CBID_EDIT); + int /*long*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT); if (hwndText != 0) { - limit = OS.SendMessage (hwndText, OS.EM_GETLIMITTEXT, 0, 0); + limit = (int)/*64*/OS.SendMessage (hwndText, OS.EM_GETLIMITTEXT, 0, 0) & 0x7FFFFFFF; } if (string.length () > limit) string = string.substring (0, limit); TCHAR buffer = new TCHAR (getCodePage (), string, true); @@ -1796,8 +1798,8 @@ public void setTextLimit (int limit) { } void setToolTipText (Shell shell, String string) { - int hwndText = OS.GetDlgItem (handle, CBID_EDIT); - int hwndList = OS.GetDlgItem (handle, CBID_LIST); + int /*long*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT); + int /*long*/ hwndList = OS.GetDlgItem (handle, CBID_LIST); if (hwndText != 0) shell.setToolTipText (hwndText, string); if (hwndList != 0) shell.setToolTipText (hwndList, string); shell.setToolTipText (handle, string); @@ -1835,14 +1837,14 @@ public void setVisibleItemCount (int count) { void subclass () { super.subclass (); - int newProc = display.windowProc; - int hwndText = OS.GetDlgItem (handle, CBID_EDIT); + int /*long*/ newProc = display.windowProc; + int /*long*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT); if (hwndText != 0) { - OS.SetWindowLong (hwndText, OS.GWL_WNDPROC, newProc); + OS.SetWindowLongPtr (hwndText, OS.GWLP_WNDPROC, newProc); } - int hwndList = OS.GetDlgItem (handle, CBID_LIST); + int /*long*/ hwndList = OS.GetDlgItem (handle, CBID_LIST); if (hwndList != 0) { - OS.SetWindowLong (hwndList, OS.GWL_WNDPROC, newProc); + OS.SetWindowLongPtr (hwndList, OS.GWLP_WNDPROC, newProc); } } @@ -1852,7 +1854,7 @@ boolean translateTraversal (MSG msg) { * to select an item in the list and escape to close * the combo box. */ - switch (msg.wParam) { + switch ((int)/*64*/(msg.wParam)) { case OS.VK_RETURN: case OS.VK_ESCAPE: if ((style & SWT.DROP_DOWN) != 0) { @@ -1886,13 +1888,13 @@ boolean traverseReturn () { void unsubclass () { super.unsubclass (); - int hwndText = OS.GetDlgItem (handle, CBID_EDIT); + int /*long*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT); if (hwndText != 0 && EditProc != 0) { - OS.SetWindowLong (hwndText, OS.GWL_WNDPROC, EditProc); + OS.SetWindowLongPtr (hwndText, OS.GWLP_WNDPROC, EditProc); } - int hwndList = OS.GetDlgItem (handle, CBID_LIST); + int /*long*/ hwndList = OS.GetDlgItem (handle, CBID_LIST); if (hwndList != 0 && ListProc != 0) { - OS.SetWindowLong (hwndList, OS.GWL_WNDPROC, ListProc); + OS.SetWindowLongPtr (hwndList, OS.GWLP_WNDPROC, ListProc); } } @@ -1924,7 +1926,7 @@ String verifyText (String string, int start, int end, Event keyEvent) { int wcsToMbcsPos (int wcsPos) { if (wcsPos <= 0) return 0; if (OS.IsUnicode) return wcsPos; - int hwndText = OS.GetDlgItem (handle, CBID_EDIT); + int /*long*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT); if (hwndText == 0) return wcsPos; int mbcsSize = OS.GetWindowTextLengthA (hwndText); if (mbcsSize == 0) return 0; @@ -1954,15 +1956,15 @@ TCHAR windowClass () { return ComboClass; } -int windowProc () { +int /*long*/ windowProc () { return ComboProc; } -int windowProc (int hwnd, int msg, int wParam, int lParam) { +int /*long*/ windowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) { if (handle == 0) return 0; if (hwnd != handle) { - int hwndText = OS.GetDlgItem (handle, CBID_EDIT); - int hwndList = OS.GetDlgItem (handle, CBID_LIST); + int /*long*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT); + int /*long*/ hwndList = OS.GetDlgItem (handle, CBID_LIST); if ((hwndText != 0 && hwnd == hwndText) || (hwndList != 0 && hwnd == hwndList)) { LRESULT result = null; switch (msg) { @@ -2024,7 +2026,7 @@ int windowProc (int hwnd, int msg, int wParam, int lParam) { newText = ""; } else { if (0 <= wParam && wParam < getItemCount ()) { - newText = getItem (wParam); + newText = getItem ((int)/*64*/wParam); } } if (newText != null && !newText.equals (oldText)) { @@ -2045,16 +2047,16 @@ int windowProc (int hwnd, int msg, int wParam, int lParam) { return super.windowProc (hwnd, msg, wParam, lParam); } -LRESULT WM_CTLCOLOR (int wParam, int lParam) { +LRESULT WM_CTLCOLOR (int /*long*/ wParam, int /*long*/ lParam) { return wmColorChild (wParam, lParam); } -LRESULT WM_GETDLGCODE (int wParam, int lParam) { - int code = callWindowProc (handle, OS.WM_GETDLGCODE, wParam, lParam); +LRESULT WM_GETDLGCODE (int /*long*/ wParam, int /*long*/ lParam) { + int /*long*/ code = callWindowProc (handle, OS.WM_GETDLGCODE, wParam, lParam); return new LRESULT (code | OS.DLGC_WANTARROWS); } -LRESULT WM_KILLFOCUS (int wParam, int lParam) { +LRESULT WM_KILLFOCUS (int /*long*/ wParam, int /*long*/ lParam) { /* * Bug in Windows. When a combo box that is read only * is disposed in CBN_KILLFOCUS, Windows segment faults. @@ -2074,7 +2076,7 @@ LRESULT WM_KILLFOCUS (int wParam, int lParam) { return null; } -LRESULT WM_LBUTTONDOWN (int wParam, int lParam) { +LRESULT WM_LBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) { /* * Feature in Windows. When an editable combo box is dropped * down and the text in the entry field partially matches an @@ -2082,11 +2084,11 @@ LRESULT WM_LBUTTONDOWN (int wParam, int lParam) { * WM_COMMAND with CBN_SELCHANGE. The fix is to detect that * the selection has changed and issue the notification. */ - int oldSelection = OS.SendMessage (handle, OS.CB_GETCURSEL, 0, 0); + int oldSelection = (int)/*64*/OS.SendMessage (handle, OS.CB_GETCURSEL, 0, 0); LRESULT result = super.WM_LBUTTONDOWN (wParam, lParam); if (result == LRESULT.ZERO) return result; if ((style & SWT.READ_ONLY) == 0) { - int newSelection = OS.SendMessage (handle, OS.CB_GETCURSEL, 0, 0); + int newSelection = (int)/*64*/OS.SendMessage (handle, OS.CB_GETCURSEL, 0, 0); if (oldSelection != newSelection) { sendEvent (SWT.Modify); if (isDisposed ()) return LRESULT.ZERO; @@ -2097,7 +2099,7 @@ LRESULT WM_LBUTTONDOWN (int wParam, int lParam) { return result; } -LRESULT WM_SETFOCUS (int wParam, int lParam) { +LRESULT WM_SETFOCUS (int /*long*/ wParam, int /*long*/ lParam) { /* * Return NULL - Focus notification is * done by WM_COMMAND with CBN_SETFOCUS. @@ -2105,7 +2107,7 @@ LRESULT WM_SETFOCUS (int wParam, int lParam) { return null; } -LRESULT WM_SIZE (int wParam, int lParam) { +LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) { /* * Bug in Windows. If the combo box has the CBS_SIMPLE style, * the list portion of the combo box is not redrawn when the @@ -2116,9 +2118,9 @@ LRESULT WM_SIZE (int wParam, int lParam) { LRESULT result = super.WM_SIZE (wParam, lParam); if (OS.IsWindowVisible (handle)) { if (OS.IsWinCE) { - int hwndText = OS.GetDlgItem (handle, CBID_EDIT); + int /*long*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT); if (hwndText != 0) OS.InvalidateRect (hwndText, null, true); - int hwndList = OS.GetDlgItem (handle, CBID_LIST); + int /*long*/ hwndList = OS.GetDlgItem (handle, CBID_LIST); if (hwndList != 0) OS.InvalidateRect (hwndList, null, true); } else { int uFlags = OS.RDW_ERASE | OS.RDW_INVALIDATE | OS.RDW_ALLCHILDREN; @@ -2139,7 +2141,7 @@ LRESULT WM_SIZE (int wParam, int lParam) { if ((style & SWT.READ_ONLY) != 0) { result = super.WM_SIZE (wParam, lParam); } else { - int index = OS.SendMessage (handle, OS.CB_GETCURSEL, 0, 0); + int index = (int)/*64*/OS.SendMessage (handle, OS.CB_GETCURSEL, 0, 0); boolean redraw = false; TCHAR buffer = null; int [] start = null, end = null; @@ -2165,7 +2167,7 @@ LRESULT WM_SIZE (int wParam, int lParam) { if (isDisposed ()) return result; if (buffer != null) { OS.SetWindowText (handle, buffer); - int bits = OS.MAKELPARAM (start [0], end [0]); + int /*long*/ bits = OS.MAKELPARAM (start [0], end [0]); OS.SendMessage (handle, OS.CB_SETEDITSEL, 0, bits); if (redraw) setRedraw (true); } @@ -2180,7 +2182,7 @@ LRESULT WM_SIZE (int wParam, int lParam) { return result; } -LRESULT wmChar (int hwnd, int wParam, int lParam) { +LRESULT wmChar (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) { if (ignoreCharacter) return null; LRESULT result = super.wmChar (hwnd, wParam, lParam); if (result != null) return result; @@ -2194,7 +2196,7 @@ LRESULT wmChar (int hwnd, int wParam, int lParam) { * NOTE: This only happens when the drop down list * is not visible. */ - switch (wParam) { + switch ((int)/*64*/wParam) { case SWT.TAB: return LRESULT.ZERO; case SWT.CR: if (!ignoreDefaultSelection) postEvent (SWT.DefaultSelection); @@ -2210,7 +2212,7 @@ LRESULT wmChar (int hwnd, int wParam, int lParam) { return result; } -LRESULT wmClipboard (int hwndText, int msg, int wParam, int lParam) { +LRESULT wmClipboard (int /*long*/ hwndText, int msg, int /*long*/ wParam, int /*long*/ lParam) { if ((style & SWT.READ_ONLY) != 0) return null; if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return null; boolean call = false; @@ -2268,11 +2270,11 @@ LRESULT wmClipboard (int hwndText, int msg, int wParam, int lParam) { } TCHAR buffer = new TCHAR (getCodePage (), newText, true); if (msg == OS.WM_SETTEXT) { - int hHeap = OS.GetProcessHeap (); + int /*long*/ hHeap = OS.GetProcessHeap (); int byteCount = buffer.length () * TCHAR.sizeof; - int pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); + int /*long*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); OS.MoveMemory (pszText, buffer, byteCount); - int code = OS.CallWindowProc (EditProc, hwndText, msg, wParam, pszText); + int /*long*/ code = OS.CallWindowProc (EditProc, hwndText, msg, wParam, pszText); OS.HeapFree (hHeap, 0, pszText); return new LRESULT (code); } else { @@ -2284,7 +2286,7 @@ LRESULT wmClipboard (int hwndText, int msg, int wParam, int lParam) { return null; } -LRESULT wmCommandChild (int wParam, int lParam) { +LRESULT wmCommandChild (int /*long*/ wParam, int /*long*/ lParam) { int code = OS.HIWORD (wParam); switch (code) { case OS.CBN_EDITCHANGE: @@ -2313,7 +2315,7 @@ LRESULT wmCommandChild (int wParam, int lParam) { * match the list selection. The fix is to force the text field * to match the list selection by re-selecting the list item. */ - int index = OS.SendMessage (handle, OS.CB_GETCURSEL, 0, 0); + int index = (int)/*64*/OS.SendMessage (handle, OS.CB_GETCURSEL, 0, 0); if (index != OS.CB_ERR) { OS.SendMessage (handle, OS.CB_SETCURSEL, index, 0); } @@ -2349,12 +2351,12 @@ LRESULT wmCommandChild (int wParam, int lParam) { return super.wmCommandChild (wParam, lParam); } -LRESULT wmIMEChar (int hwnd, int wParam, int lParam) { +LRESULT wmIMEChar (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) { /* Process a DBCS character */ Display display = this.display; display.lastKey = 0; - display.lastAscii = wParam; + display.lastAscii = (int)/*64*/wParam; display.lastVirtual = display.lastNull = display.lastDead = false; if (!sendKeyEvent (SWT.KeyDown, OS.WM_IME_CHAR, wParam, lParam)) { return LRESULT.ZERO; @@ -2368,7 +2370,7 @@ LRESULT wmIMEChar (int hwnd, int wParam, int lParam) { * them to the application. */ ignoreCharacter = true; - int result = callWindowProc (hwnd, OS.WM_IME_CHAR, wParam, lParam); + int /*long*/ result = callWindowProc (hwnd, OS.WM_IME_CHAR, wParam, lParam); MSG msg = new MSG (); int flags = OS.PM_REMOVE | OS.PM_NOYIELD | OS.PM_QS_INPUT | OS.PM_QS_POSTMESSAGE; while (OS.PeekMessage (msg, hwnd, OS.WM_CHAR, OS.WM_CHAR, flags)) { @@ -2383,7 +2385,7 @@ LRESULT wmIMEChar (int hwnd, int wParam, int lParam) { return new LRESULT (result); } -LRESULT wmKeyDown (int hwnd, int wParam, int lParam) { +LRESULT wmKeyDown (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) { if (ignoreCharacter) return null; LRESULT result = super.wmKeyDown (hwnd, wParam, lParam); if (result != null) return result; @@ -2398,7 +2400,7 @@ LRESULT wmKeyDown (int hwnd, int wParam, int lParam) { return result; } -LRESULT wmSysKeyDown (int hwnd, int wParam, int lParam) { +LRESULT wmSysKeyDown (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) { /* * Feature in Windows. When an editable combo box is dropped * down using Alt+Down and the text in the entry field partially @@ -2406,13 +2408,13 @@ LRESULT wmSysKeyDown (int hwnd, int wParam, int lParam) { * send WM_COMMAND with CBN_SELCHANGE. The fix is to detect that * the selection has changed and issue the notification. */ - int oldSelection = OS.SendMessage (handle, OS.CB_GETCURSEL, 0, 0); + int oldSelection = (int)/*64*/OS.SendMessage (handle, OS.CB_GETCURSEL, 0, 0); LRESULT result = super.wmSysKeyDown (hwnd, wParam, lParam); if (result != null) return result; if ((style & SWT.READ_ONLY) == 0) { if (wParam == OS.VK_DOWN) { - int code = callWindowProc (hwnd, OS.WM_SYSKEYDOWN, wParam, lParam); - int newSelection = OS.SendMessage (handle, OS.CB_GETCURSEL, 0, 0); + int /*long*/ code = callWindowProc (hwnd, OS.WM_SYSKEYDOWN, wParam, lParam); + int newSelection = (int)/*64*/OS.SendMessage (handle, OS.CB_GETCURSEL, 0, 0); if (oldSelection != newSelection) { sendEvent (SWT.Modify); if (isDisposed ()) return LRESULT.ZERO; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Composite.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Composite.java index f36e09b19c..cfe6cae3cb 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Composite.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Composite.java @@ -48,7 +48,7 @@ import org.eclipse.swt.graphics.*; public class Composite extends Scrollable { Layout layout; - int font; + int /*long*/ font; WINDOWPOS [] lpwp; Control [] tabList; int layoutCount, backgroundMode; @@ -95,7 +95,7 @@ public Composite (Composite parent, int style) { Control [] _getChildren () { int count = 0; - int hwndChild = OS.GetWindow (handle, OS.GW_CHILD); + int /*long*/ hwndChild = OS.GetWindow (handle, OS.GW_CHILD); if (hwndChild == 0) return new Control [0]; while (hwndChild != 0) { count++; @@ -344,7 +344,7 @@ int getChildrenCount () { * non-registered children. */ int count = 0; - int hwndChild = OS.GetWindow (handle, OS.GW_CHILD); + int /*long*/ hwndChild = OS.GetWindow (handle, OS.GW_CHILD); while (hwndChild != 0) { count++; hwndChild = OS.GetWindow (hwndChild, OS.GW_HWNDNEXT); @@ -668,7 +668,7 @@ void releaseChildren (boolean destroy) { void releaseWidget () { super.releaseWidget (); if ((state & CANVAS) != 0 && (style & SWT.EMBEDDED) != 0) { - int hwndChild = OS.GetWindow (handle, OS.GW_CHILD); + int /*long*/ hwndChild = OS.GetWindow (handle, OS.GW_CHILD); if (hwndChild != 0) { int threadId = OS.GetWindowThreadProcessId (hwndChild, null); if (threadId != OS.GetCurrentThreadId ()) { @@ -700,7 +700,7 @@ void resizeChildren () { boolean resizeChildren (boolean defer, WINDOWPOS [] pwp) { if (pwp == null) return true; - int hdwp = 0; + int /*long*/ hdwp = 0; if (defer) { hdwp = OS.BeginDeferWindowPos (pwp.length); if (hdwp == 0) return false; @@ -730,7 +730,7 @@ boolean resizeChildren (boolean defer, WINDOWPOS [] pwp) { return true; } -void resizeEmbeddedHandle(int embeddedHandle, int width, int height) { +void resizeEmbeddedHandle(int /*long*/ embeddedHandle, int width, int height) { if (embeddedHandle == 0) return; int [] processID = new int [1]; int threadId = OS.GetWindowThreadProcessId (embeddedHandle, processID); @@ -959,7 +959,7 @@ boolean translateMnemonic (Event event, Control control) { boolean translateTraversal (MSG msg) { if ((state & CANVAS) != 0 ) { if ((style & SWT.EMBEDDED) != 0) return false; - switch (msg.wParam) { + switch ((int)/*64*/msg.wParam) { case OS.VK_UP: case OS.VK_LEFT: case OS.VK_DOWN: @@ -1039,7 +1039,7 @@ int widgetStyle () { return super.widgetStyle () | OS.WS_CLIPCHILDREN; } -LRESULT WM_ERASEBKGND (int wParam, int lParam) { +LRESULT WM_ERASEBKGND (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_ERASEBKGND (wParam, lParam); if (result != null) return result; if ((state & CANVAS) != 0) { @@ -1049,7 +1049,7 @@ LRESULT WM_ERASEBKGND (int wParam, int lParam) { return result; } -LRESULT WM_GETDLGCODE (int wParam, int lParam) { +LRESULT WM_GETDLGCODE (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_GETDLGCODE (wParam, lParam); if (result != null) return result; if ((state & CANVAS) != 0) { @@ -1064,16 +1064,16 @@ LRESULT WM_GETDLGCODE (int wParam, int lParam) { return result; } -LRESULT WM_GETFONT (int wParam, int lParam) { +LRESULT WM_GETFONT (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_GETFONT (wParam, lParam); if (result != null) return result; - int code = callWindowProc (handle, OS.WM_GETFONT, wParam, lParam); + int /*long*/ code = callWindowProc (handle, OS.WM_GETFONT, wParam, lParam); if (code != 0) return new LRESULT (code); if (font == 0) font = defaultFont (); return new LRESULT (font); } -LRESULT WM_LBUTTONDOWN (int wParam, int lParam) { +LRESULT WM_LBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_LBUTTONDOWN (wParam, lParam); if (result == LRESULT.ZERO) return result; @@ -1086,7 +1086,7 @@ LRESULT WM_LBUTTONDOWN (int wParam, int lParam) { return result; } -LRESULT WM_NCPAINT (int wParam, int lParam) { +LRESULT WM_NCPAINT (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_NCPAINT (wParam, lParam); if (result != null) return result; if ((state & CANVAS) != 0) { @@ -1095,7 +1095,7 @@ LRESULT WM_NCPAINT (int wParam, int lParam) { return result; } -LRESULT WM_PARENTNOTIFY (int wParam, int lParam) { +LRESULT WM_PARENTNOTIFY (int /*long*/ wParam, int /*long*/ lParam) { if ((state & CANVAS) != 0 && (style & SWT.EMBEDDED) != 0) { if (OS.LOWORD (wParam) == OS.WM_CREATE) { RECT rect = new RECT (); @@ -1106,7 +1106,7 @@ LRESULT WM_PARENTNOTIFY (int wParam, int lParam) { return super.WM_PARENTNOTIFY (wParam, lParam); } -LRESULT WM_PAINT (int wParam, int lParam) { +LRESULT WM_PAINT (int /*long*/ wParam, int /*long*/ lParam) { if ((state & CANVAS) == 0 || (state & FOREIGN_HANDLE) != 0) { return super.WM_PAINT (wParam, lParam); } @@ -1133,15 +1133,15 @@ LRESULT WM_PAINT (int wParam, int lParam) { } } if (bufferedPaint) { - int hDC = OS.BeginPaint (handle, ps); + int /*long*/ hDC = OS.BeginPaint (handle, ps); int width = ps.right - ps.left; int height = ps.bottom - ps.top; if (width != 0 && height != 0) { - int [] phdc = new int [1]; + int /*long*/ [] phdc = new int /*long*/ [1]; int flags = OS.BPBF_COMPATIBLEBITMAP; RECT prcTarget = new RECT (); OS.SetRect (prcTarget, ps.left, ps.top, ps.right, ps.bottom); - int hBufferedPaint = OS.BeginBufferedPaint (hDC, prcTarget, flags, null, phdc); + int /*long*/ hBufferedPaint = OS.BeginBufferedPaint (hDC, prcTarget, flags, null, phdc); GCData data = new GCData (); if ((OS.GetLayout (hDC) & OS.LAYOUT_RTL) != 0) { data.style = SWT.RIGHT_TO_LEFT | SWT.MIRRORED; @@ -1154,7 +1154,7 @@ LRESULT WM_PAINT (int wParam, int lParam) { if (control == null) control = this; data.background = control.getBackgroundPixel (); data.hFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); - data.uiState = OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); + data.uiState = (int)/*64*/OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); if ((style & SWT.NO_BACKGROUND) != 0) { /* This code is intentionally commented because it may be slow to copy bits from the screen */ //paintGC.copyArea (image, ps.left, ps.top); @@ -1184,7 +1184,7 @@ LRESULT WM_PAINT (int wParam, int lParam) { GC gc = GC.win32_new (this, data); /* Get the system region for the paint HDC */ - int sysRgn = 0; + int /*long*/ sysRgn = 0; if ((style & (SWT.NO_MERGE_PAINTS | SWT.DOUBLE_BUFFERED)) != 0) { sysRgn = OS.CreateRectRgn (0, 0, 0, 0); if (OS.GetRandomRgn (gc.handle, sysRgn, OS.SYSRGN) == 1) { @@ -1193,7 +1193,7 @@ LRESULT WM_PAINT (int wParam, int lParam) { int nBytes = OS.GetRegionData (sysRgn, 0, null); int [] lpRgnData = new int [nBytes / 4]; OS.GetRegionData (sysRgn, nBytes, lpRgnData); - int newSysRgn = OS.ExtCreateRegion (new float [] {-1, 0, 0, 1, 0, 0}, nBytes, lpRgnData); + int /*long*/ newSysRgn = OS.ExtCreateRegion (new float [] {-1, 0, 0, 1, 0, 0}, nBytes, lpRgnData); OS.DeleteObject (sysRgn); sysRgn = newSysRgn; } @@ -1284,7 +1284,7 @@ LRESULT WM_PAINT (int wParam, int lParam) { gc.dispose (); } } else { - int hDC = OS.BeginPaint (handle, ps); + int /*long*/ hDC = OS.BeginPaint (handle, ps); if ((style & SWT.NO_BACKGROUND) == 0) { RECT rect = new RECT (); OS.SetRect (rect, ps.left, ps.top, ps.right, ps.bottom); @@ -1310,7 +1310,7 @@ LRESULT WM_PAINT (int wParam, int lParam) { return LRESULT.ZERO; } -LRESULT WM_PRINTCLIENT (int wParam, int lParam) { +LRESULT WM_PRINTCLIENT (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_PRINTCLIENT (wParam, lParam); if (result != null) return result; if ((state & CANVAS) != 0) { @@ -1329,7 +1329,7 @@ LRESULT WM_PRINTCLIENT (int wParam, int lParam) { if (control == null) control = this; data.background = control.getBackgroundPixel (); data.hFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); - data.uiState = OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); + data.uiState = (int)/*64*/OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); GC gc = GC.win32_new (wParam, data); Event event = new Event (); event.gc = gc; @@ -1346,12 +1346,12 @@ LRESULT WM_PRINTCLIENT (int wParam, int lParam) { return result; } -LRESULT WM_SETFONT (int wParam, int lParam) { +LRESULT WM_SETFONT (int /*long*/ wParam, int /*long*/ lParam) { if (lParam != 0) OS.InvalidateRect (handle, null, true); return super.WM_SETFONT (font = wParam, lParam); } -LRESULT WM_SIZE (int wParam, int lParam) { +LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) { /* Begin deferred window positioning */ setResizeChildren (false); @@ -1395,10 +1395,10 @@ LRESULT WM_SIZE (int wParam, int lParam) { return result; } -LRESULT WM_SYSCOLORCHANGE (int wParam, int lParam) { +LRESULT WM_SYSCOLORCHANGE (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_SYSCOLORCHANGE (wParam, lParam); if (result != null) return result; - int hwndChild = OS.GetWindow (handle, OS.GW_CHILD); + int /*long*/ hwndChild = OS.GetWindow (handle, OS.GW_CHILD); while (hwndChild != 0) { OS.SendMessage (hwndChild, OS.WM_SYSCOLORCHANGE, 0, 0); hwndChild = OS.GetWindow (hwndChild, OS.GW_HWNDNEXT); @@ -1406,7 +1406,7 @@ LRESULT WM_SYSCOLORCHANGE (int wParam, int lParam) { return result; } -LRESULT WM_SYSCOMMAND (int wParam, int lParam) { +LRESULT WM_SYSCOMMAND (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_SYSCOMMAND (wParam, lParam); if (result != null) return result; @@ -1426,13 +1426,13 @@ LRESULT WM_SYSCOMMAND (int wParam, int lParam) { * redraw the non-client area. */ if (!OS.IsWinCE) { - int cmd = wParam & 0xFFF0; + int cmd = (int)/*64*/wParam & 0xFFF0; switch (cmd) { case OS.SC_HSCROLL: case OS.SC_VSCROLL: boolean showHBar = horizontalBar != null && horizontalBar.getVisible (); boolean showVBar = verticalBar != null && verticalBar.getVisible (); - int code = callWindowProc (handle, OS.WM_SYSCOMMAND, wParam, lParam); + int /*long*/ code = callWindowProc (handle, OS.WM_SYSCOMMAND, wParam, lParam); if ((showHBar != (horizontalBar != null && horizontalBar.getVisible ())) || (showVBar != (verticalBar != null && verticalBar.getVisible ()))) { int flags = OS.RDW_FRAME | OS.RDW_INVALIDATE | OS.RDW_UPDATENOW; @@ -1446,23 +1446,23 @@ LRESULT WM_SYSCOMMAND (int wParam, int lParam) { return result; } -LRESULT WM_UPDATEUISTATE (int wParam, int lParam) { +LRESULT WM_UPDATEUISTATE (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_UPDATEUISTATE (wParam, lParam); if (result != null) return result; if ((state & CANVAS) != 0) OS.InvalidateRect (handle, null, false); return result; } -LRESULT wmNCPaint (int hwnd, int wParam, int lParam) { +LRESULT wmNCPaint (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) { if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) { int bits1 = OS.GetWindowLong (hwnd, OS.GWL_EXSTYLE); if ((bits1 & OS.WS_EX_CLIENTEDGE) != 0) { - int code = 0; + int /*long*/ code = 0; int bits2 = OS.GetWindowLong (hwnd, OS.GWL_STYLE); if ((bits2 & (OS.WS_HSCROLL | OS.WS_VSCROLL)) != 0) { code = callWindowProc (hwnd, OS.WM_NCPAINT, wParam, lParam); } - int hDC = OS.GetWindowDC (hwnd); + int /*long*/ hDC = OS.GetWindowDC (hwnd); RECT rect = new RECT (); OS.GetWindowRect (hwnd, rect); rect.right -= rect.left; @@ -1478,7 +1478,7 @@ LRESULT wmNCPaint (int hwnd, int wParam, int lParam) { return null; } -LRESULT wmNotify (NMHDR hdr, int wParam, int lParam) { +LRESULT wmNotify (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) { if (!OS.IsWinCE) { switch (hdr.code) { /* @@ -1504,7 +1504,7 @@ LRESULT wmNotify (NMHDR hdr, int wParam, int lParam) { * check if the parent is already on top and neither set or clear * the topmost status of the tool tip. */ - int hwndParent = hdr.hwndFrom; + int /*long*/ hwndParent = hdr.hwndFrom; do { hwndParent = OS.GetParent (hwndParent); if (hwndParent == 0) break; @@ -1514,7 +1514,7 @@ LRESULT wmNotify (NMHDR hdr, int wParam, int lParam) { if (hwndParent != 0) break; display.lockActiveWindow = true; int flags = OS.SWP_NOACTIVATE | OS.SWP_NOMOVE | OS.SWP_NOSIZE; - int hwndInsertAfter = hdr.code == OS.TTN_SHOW ? OS.HWND_TOPMOST : OS.HWND_NOTOPMOST; + int /*long*/ hwndInsertAfter = hdr.code == OS.TTN_SHOW ? OS.HWND_TOPMOST : OS.HWND_NOTOPMOST; SetWindowPos (hdr.hwndFrom, hwndInsertAfter, 0, 0, 0, 0, flags); display.lockActiveWindow = false; break; @@ -1553,7 +1553,7 @@ LRESULT wmNotify (NMHDR hdr, int wParam, int lParam) { * Ensure that the orientation of the tool tip matches * the orientation of the control. */ - int hwnd = hdr.idFrom; + int /*long*/ hwnd = hdr.idFrom; if (hwnd != 0 && ((lpnmtdi.uFlags & OS.TTF_IDISHWND) != 0)) { Control control = display.getControl (hwnd); if (control != null) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Control.java index d5e0a742cc..f65da4bd58 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Control.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Control.java @@ -47,7 +47,7 @@ public abstract class Control extends Widget implements Drawable { * platforms and should never be accessed from application code. * </p> */ - public int handle; + public int /*long*/ handle; Composite parent; Cursor cursor; Menu menu; @@ -433,7 +433,7 @@ public void addTraverseListener (TraverseListener listener) { addListener (SWT.Traverse,typedListener); } -int borderHandle () { +int /*long*/ borderHandle () { return handle; } @@ -470,7 +470,7 @@ void checkBuffered () { style &= ~SWT.DOUBLE_BUFFERED; } -boolean checkHandle (int hwnd) { +boolean checkHandle (int /*long*/ hwnd) { return hwnd == handle; } @@ -588,7 +588,7 @@ Control [] computeTabList () { } void createHandle () { - int hwndParent = widgetParent (); + int /*long*/ hwndParent = widgetParent (); handle = OS.CreateWindowEx ( widgetExtStyle (), windowClass (), @@ -602,10 +602,10 @@ void createHandle () { if (handle == 0) error (SWT.ERROR_NO_HANDLES); int bits = OS.GetWindowLong (handle, OS.GWL_STYLE); if ((bits & OS.WS_CHILD) != 0) { - OS.SetWindowLong (handle, OS.GWL_ID, handle); + OS.SetWindowLongPtr (handle, OS.GWLP_ID, handle); } if (OS.IsDBLocale && hwndParent != 0) { - int hIMC = OS.ImmGetContext (hwndParent); + int /*long*/ hIMC = OS.ImmGetContext (hwndParent); OS.ImmAssociateContext (handle, hIMC); OS.ImmReleaseContext (hwndParent, hIMC); } @@ -633,7 +633,7 @@ int defaultBackground () { return OS.GetSysColor (OS.COLOR_BTNFACE); } -int defaultFont () { +int /*long*/ defaultFont () { return display.getSystemFont ().handle; } @@ -646,7 +646,7 @@ void deregister () { } void destroyWidget () { - int hwnd = topHandle (); + int /*long*/ hwnd = topHandle (); releaseHandle (); if (hwnd != 0) { OS.DestroyWindow (hwnd); @@ -774,7 +774,7 @@ boolean dragDetect (int button, int count, int stateMask, int x, int y) { if ((stateMask & SWT.BUTTON3) != 0) wParam |= OS.MK_RBUTTON; if ((stateMask & SWT.BUTTON4) != 0) wParam |= OS.MK_XBUTTON1; if ((stateMask & SWT.BUTTON5) != 0) wParam |= OS.MK_XBUTTON2; - int lParam = OS.MAKELPARAM (x, y); + int /*long*/ lParam = OS.MAKELPARAM (x, y); OS.SendMessage (handle, OS.WM_LBUTTONUP, wParam, lParam); } return false; @@ -782,17 +782,17 @@ boolean dragDetect (int button, int count, int stateMask, int x, int y) { return sendDragEvent (button, stateMask, x, y); } -void drawBackground (int hDC) { +void drawBackground (int /*long*/ hDC) { RECT rect = new RECT (); OS.GetClientRect (handle, rect); drawBackground (hDC, rect); } -void drawBackground (int hDC, RECT rect) { +void drawBackground (int /*long*/ hDC, RECT rect) { drawBackground (hDC, rect, -1); } -void drawBackground (int hDC, RECT rect, int pixel) { +void drawBackground (int /*long*/ hDC, RECT rect, int pixel) { Control control = findBackgroundControl (); if (control != null) { if (control.backgroundImage != null) { @@ -816,21 +816,21 @@ void drawBackground (int hDC, RECT rect, int pixel) { fillBackground (hDC, pixel, rect); } -void drawImageBackground (int hDC, int hwnd, int hBitmap, RECT rect) { +void drawImageBackground (int /*long*/ hDC, int /*long*/ hwnd, int /*long*/ hBitmap, RECT rect) { RECT rect2 = new RECT (); OS.GetClientRect (hwnd, rect2); OS.MapWindowPoints (hwnd, handle, rect2, 2); - int hBrush = findBrush (hBitmap, OS.BS_PATTERN); + int /*long*/ hBrush = findBrush (hBitmap, OS.BS_PATTERN); POINT lpPoint = new POINT (); OS.GetWindowOrgEx (hDC, lpPoint); OS.SetBrushOrgEx (hDC, -rect2.left - lpPoint.x, -rect2.top - lpPoint.y, lpPoint); - int hOldBrush = OS.SelectObject (hDC, hBrush); + int /*long*/ hOldBrush = OS.SelectObject (hDC, hBrush); OS.PatBlt (hDC, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, OS.PATCOPY); OS.SetBrushOrgEx (hDC, lpPoint.x, lpPoint.y, null); OS.SelectObject (hDC, hOldBrush); } -void drawThemeBackground (int hDC, int hwnd, RECT rect) { +void drawThemeBackground (int /*long*/ hDC, int /*long*/ hwnd, RECT rect) { /* Do nothing */ } @@ -842,9 +842,9 @@ void enableWidget (boolean enabled) { OS.EnableWindow (handle, enabled); } -void fillBackground (int hDC, int pixel, RECT rect) { +void fillBackground (int /*long*/ hDC, int pixel, RECT rect) { if (rect.left > rect.right || rect.top > rect.bottom) return; - int hPalette = display.hPalette; + int /*long*/ hPalette = display.hPalette; if (hPalette != 0) { OS.SelectPalette (hDC, hPalette, false); OS.RealizePalette (hDC); @@ -852,7 +852,7 @@ void fillBackground (int hDC, int pixel, RECT rect) { OS.FillRect (hDC, rect, findBrush (pixel, OS.BS_SOLID)); } -void fillImageBackground (int hDC, Control control, RECT rect) { +void fillImageBackground (int /*long*/ hDC, Control control, RECT rect) { if (rect.left > rect.right || rect.top > rect.bottom) return; if (control != null) { Image image = control.backgroundImage; @@ -862,7 +862,7 @@ void fillImageBackground (int hDC, Control control, RECT rect) { } } -void fillThemeBackground (int hDC, Control control, RECT rect) { +void fillThemeBackground (int /*long*/ hDC, Control control, RECT rect) { if (rect.left > rect.right || rect.top > rect.bottom) return; if (control != null) { control.drawThemeBackground (hDC, handle, rect); @@ -874,7 +874,7 @@ Control findBackgroundControl () { return (state & PARENT_BACKGROUND) != 0 ? parent.findBackgroundControl () : null; } -int findBrush (int value, int lbStyle) { +int /*long*/ findBrush (int /*long*/ value, int lbStyle) { return parent.findBrush (value, lbStyle); } @@ -1065,7 +1065,7 @@ int getBackgroundPixel () { */ public int getBorderWidth () { checkWidget (); - int borderHandle = borderHandle (); + int /*long*/ borderHandle = borderHandle (); int bits1 = OS.GetWindowLong (borderHandle, OS.GWL_EXSTYLE); if ((bits1 & OS.WS_EX_CLIENTEDGE) != 0) return OS.GetSystemMetrics (OS.SM_CXEDGE); if ((bits1 & OS.WS_EX_STATICEDGE) != 0) return OS.GetSystemMetrics (OS.SM_CXBORDER); @@ -1092,7 +1092,7 @@ public Rectangle getBounds () { forceResize (); RECT rect = new RECT (); OS.GetWindowRect (topHandle (), rect); - int hwndParent = parent == null ? 0 : parent.handle; + int /*long*/ hwndParent = parent == null ? 0 : parent.handle; OS.MapWindowPoints (0, hwndParent, rect, 2); int width = rect.right - rect.left; int height = rect.bottom - rect.top; @@ -1101,7 +1101,7 @@ public Rectangle getBounds () { int getCodePage () { if (OS.IsUnicode) return OS.CP_ACP; - int hFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); + int /*long*/ hFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); LOGFONT logFont = OS.IsUnicode ? (LOGFONT) new LOGFONTW () : new LOGFONTA (); OS.GetObject (hFont, LOGFONT.sizeof, logFont); int cs = logFont.lfCharSet & 0xFF; @@ -1115,11 +1115,11 @@ int getCodePage () { String getClipboardText () { String string = ""; if (OS.OpenClipboard (0)) { - int hMem = OS.GetClipboardData (OS.IsUnicode ? OS.CF_UNICODETEXT : OS.CF_TEXT); + int /*long*/ hMem = OS.GetClipboardData (OS.IsUnicode ? OS.CF_UNICODETEXT : OS.CF_TEXT); if (hMem != 0) { /* Ensure byteCount is a multiple of 2 bytes on UNICODE platforms */ int byteCount = OS.GlobalSize (hMem) / TCHAR.sizeof * TCHAR.sizeof; - int ptr = OS.GlobalLock (hMem); + int /*long*/ ptr = OS.GlobalLock (hMem); if (ptr != 0) { /* Use the character encoding for the default locale */ TCHAR buffer = new TCHAR (0, byteCount / TCHAR.sizeof); @@ -1202,7 +1202,7 @@ public boolean getEnabled () { */ public Font getFont () { checkWidget (); - int hFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); + int /*long*/ hFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); if (hFont == 0) hFont = defaultFont (); return Font.win32_new (display, hFont); } @@ -1259,7 +1259,7 @@ public Point getLocation () { forceResize (); RECT rect = new RECT (); OS.GetWindowRect (topHandle (), rect); - int hwndParent = parent == null ? 0 : parent.handle; + int /*long*/ hwndParent = parent == null ? 0 : parent.handle; OS.MapWindowPoints (0, hwndParent, rect, 2); return new Point (rect.left, rect.top); } @@ -1296,7 +1296,7 @@ public Monitor getMonitor () { if (OS.IsWinCE || OS.WIN32_VERSION < OS.VERSION (4, 10)) { return display.getPrimaryMonitor (); } - int hmonitor = OS.MonitorFromWindow (handle, OS.MONITOR_DEFAULTTONEAREST); + int /*long*/ hmonitor = OS.MonitorFromWindow (handle, OS.MONITOR_DEFAULTTONEAREST); MONITORINFO lpmi = new MONITORINFO (); lpmi.cbSize = MONITORINFO.sizeof; OS.GetMonitorInfo (hmonitor, lpmi); @@ -1444,7 +1444,7 @@ boolean hasFocus () { * then this control is considered to have focus * even though it does not have focus in Windows. */ - int hwndFocus = OS.GetFocus (); + int /*long*/ hwndFocus = OS.GetFocus (); while (hwndFocus != 0) { if (hwndFocus == handle) return true; if (display.getControl (hwndFocus) != null) { @@ -1468,12 +1468,12 @@ boolean hasFocus () { * @param data the platform specific GC data * @return the platform specific GC handle */ -public int internal_new_GC (GCData data) { +public int /*long*/ internal_new_GC (GCData data) { checkWidget(); - int hwnd = handle; + int /*long*/ hwnd = handle; if (data != null && data.hwnd != 0) hwnd = data.hwnd; if (data != null) data.hwnd = hwnd; - int hDC = 0; + int /*long*/ hDC = 0; if (data == null || data.ps == null) { hDC = OS.GetDC (hwnd); } else { @@ -1504,7 +1504,7 @@ public int internal_new_GC (GCData data) { int background = control.getBackgroundPixel (); if (background != OS.GetBkColor (hDC)) data.background = background; data.hFont = OS.SendMessage (hwnd, OS.WM_GETFONT, 0, 0); - data.uiState = OS.SendMessage (hwnd, OS.WM_QUERYUISTATE, 0, 0); + data.uiState = (int)/*64*/OS.SendMessage (hwnd, OS.WM_QUERYUISTATE, 0, 0); } return hDC; } @@ -1522,9 +1522,9 @@ public int internal_new_GC (GCData data) { * @param hDC the platform specific GC handle * @param data the platform specific GC data */ -public void internal_dispose_GC (int hDC, GCData data) { +public void internal_dispose_GC (int /*long*/ hDC, GCData data) { checkWidget (); - int hwnd = handle; + int /*long*/ hwnd = handle; if (data != null && data.hwnd != 0) { hwnd = data.hwnd; } @@ -1652,7 +1652,7 @@ boolean isShowing () { */ // if (!OS.IsWindowVisible (handle)) return false; // int flags = OS.DCX_CACHE | OS.DCX_CLIPCHILDREN | OS.DCX_CLIPSIBLINGS; -// int hDC = OS.GetDCEx (handle, 0, flags); +// int /*long*/ hDC = OS.GetDCEx (handle, 0, flags); // int result = OS.GetClipBox (hDC, new RECT ()); // OS.ReleaseDC (handle, hDC); // return result != OS.NULLREGION; @@ -1678,7 +1678,7 @@ boolean isTabItem () { } int bits = OS.GetWindowLong (handle, OS.GWL_STYLE); if ((bits & OS.WS_TABSTOP) != 0) return false; - int code = OS.SendMessage (handle, OS.WM_GETDLGCODE, 0, 0); + int /*long*/ code = OS.SendMessage (handle, OS.WM_GETDLGCODE, 0, 0); if ((code & OS.DLGC_STATIC) != 0) return false; if ((code & OS.DLGC_WANTALLKEYS) != 0) return false; if ((code & OS.DLGC_WANTARROWS) != 0) return false; @@ -1706,7 +1706,7 @@ public boolean isVisible () { return getVisible () && parent.isVisible (); } -void mapEvent (int hwnd, Event event) { +void mapEvent (int /*long*/ hwnd, Event event) { if (hwnd != handle) { POINT point = new POINT (); point.x = event.x; @@ -1755,11 +1755,11 @@ boolean mnemonicMatch (char key) { */ public void moveAbove (Control control) { checkWidget (); - int topHandle = topHandle (), hwndAbove = OS.HWND_TOP; + int /*long*/ topHandle = topHandle (), hwndAbove = OS.HWND_TOP; if (control != null) { if (control.isDisposed ()) error(SWT.ERROR_INVALID_ARGUMENT); if (parent != control.parent) return; - int hwnd = control.topHandle (); + int /*long*/ hwnd = control.topHandle (); if (hwnd == 0 || hwnd == topHandle) return; hwndAbove = OS.GetWindow (hwnd, OS.GW_HWNDPREV); /* @@ -1799,7 +1799,7 @@ public void moveAbove (Control control) { */ public void moveBelow (Control control) { checkWidget (); - int topHandle = topHandle (), hwndAbove = OS.HWND_BOTTOM; + int /*long*/ topHandle = topHandle (), hwndAbove = OS.HWND_BOTTOM; if (control != null) { if (control.isDisposed ()) error(SWT.ERROR_INVALID_ARGUMENT); if (parent != control.parent) return; @@ -1823,7 +1823,7 @@ public void moveBelow (Control control) { * this case and do nothing because the control is already * at the bottom. */ - int hwndParent = parent.handle, hwnd = hwndParent; + int /*long*/ hwndParent = parent.handle, hwnd = hwndParent; hwndAbove = OS.GetWindow (hwnd, OS.GW_HWNDPREV); while (hwndAbove != 0 && hwndAbove != hwnd) { if (OS.GetWindow (hwndAbove, OS.GW_OWNER) == hwndParent) break; @@ -2328,7 +2328,7 @@ public void removeTraverseListener(TraverseListener listener) { } void showWidget (boolean visible) { - int topHandle = topHandle (); + int /*long*/ topHandle = topHandle (); OS.ShowWindow (topHandle, visible ? OS.SW_SHOW : OS.SW_HIDE); if (handle != topHandle) OS.ShowWindow (handle, visible ? OS.SW_SHOW : OS.SW_HIDE); } @@ -2452,7 +2452,7 @@ public void setBackgroundImage (Image image) { updateBackgroundImage (); } -void setBackgroundImage (int hBitmap) { +void setBackgroundImage (int /*long*/ hBitmap) { if (OS.IsWinCE) { OS.InvalidateRect (handle, null, true); } else { @@ -2504,7 +2504,7 @@ void setBounds (int x, int y, int width, int height, int flags) { } void setBounds (int x, int y, int width, int height, int flags, boolean defer) { - int topHandle = topHandle (); + int /*long*/ topHandle = topHandle (); if (defer && parent != null) { forceResize (); if (OS.GetWindow (handle, OS.GW_CHILD) == 0) { @@ -2592,7 +2592,7 @@ public void setCapture (boolean capture) { } void setCursor () { - int lParam = OS.MAKELPARAM (OS.HTCLIENT, OS.WM_MOUSEMOVE); + int /*long*/ lParam = OS.MAKELPARAM (OS.HTCLIENT, OS.WM_MOUSEMOVE); OS.SendMessage (handle, OS.WM_SETCURSOR, handle, lParam); } @@ -2620,15 +2620,15 @@ public void setCursor (Cursor cursor) { if (cursor != null && cursor.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT); this.cursor = cursor; if (OS.IsWinCE) { - int hCursor = cursor != null ? cursor.handle : 0; + int /*long*/ hCursor = cursor != null ? cursor.handle : 0; OS.SetCursor (hCursor); return; } - int hwndCursor = OS.GetCapture (); + int /*long*/ hwndCursor = OS.GetCapture (); if (hwndCursor == 0) { POINT pt = new POINT (); if (!OS.GetCursorPos (pt)) return; - int hwnd = hwndCursor = OS.WindowFromPoint (pt); + int /*long*/ hwnd = hwndCursor = OS.WindowFromPoint (pt); while (hwnd != 0 && hwnd != handle) { hwnd = OS.GetParent (hwnd); } @@ -2640,7 +2640,7 @@ public void setCursor (Cursor cursor) { } void setDefaultFont () { - int hFont = display.getSystemFont ().handle; + int /*long*/ hFont = display.getSystemFont ().handle; OS.SendMessage (handle, OS.WM_SETFONT, hFont, 0); } @@ -2744,7 +2744,7 @@ public boolean setFocus () { */ public void setFont (Font font) { checkWidget (); - int hFont = 0; + int /*long*/ hFont = 0; if (font != null) { if (font.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT); hFont = font.handle; @@ -2936,7 +2936,7 @@ public void setRedraw (boolean redraw) { } if (redraw) { if (--drawCount == 0) { - int topHandle = topHandle (); + int /*long*/ topHandle = topHandle (); OS.SendMessage (topHandle, OS.WM_SETREDRAW, 1, 0); if (handle != topHandle) OS.SendMessage (handle, OS.WM_SETREDRAW, 1, 0); if ((state & HIDDEN) != 0) { @@ -2955,7 +2955,7 @@ public void setRedraw (boolean redraw) { } } else { if (drawCount++ == 0) { - int topHandle = topHandle (); + int /*long*/ topHandle = topHandle (); OS.SendMessage (topHandle, OS.WM_SETREDRAW, 0, 0); if (handle != topHandle) OS.SendMessage (handle, OS.WM_SETREDRAW, 0, 0); } @@ -3116,10 +3116,10 @@ void sort (int [] items) { } void subclass () { - int oldProc = windowProc (); - int newProc = display.windowProc; + int /*long*/ oldProc = windowProc (); + int /*long*/ newProc = display.windowProc; if (oldProc == newProc) return; - OS.SetWindowLong (handle, OS.GWL_WNDPROC, newProc); + OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, newProc); } /** @@ -3214,7 +3214,7 @@ public Point toDisplay (Point point) { return toDisplay (point.x, point.y); } -int topHandle () { +int /*long*/ topHandle () { return handle; } @@ -3231,15 +3231,15 @@ boolean translateMnemonic (Event event, Control control) { boolean translateMnemonic (MSG msg) { if (msg.wParam < 0x20) return false; - int hwnd = msg.hwnd; + int /*long*/ hwnd = msg.hwnd; if (OS.GetKeyState (OS.VK_MENU) >= 0) { - int code = OS.SendMessage (hwnd, OS.WM_GETDLGCODE, 0, 0); + int /*long*/ code = OS.SendMessage (hwnd, OS.WM_GETDLGCODE, 0, 0); if ((code & OS.DLGC_WANTALLKEYS) != 0) return false; if ((code & OS.DLGC_BUTTON) == 0) return false; } Decorations shell = menuShell (); if (shell.isVisible () && shell.isEnabled ()) { - display.lastAscii = msg.wParam; + display.lastAscii = (int)/*64*/msg.wParam; display.lastNull = display.lastDead = false; Event event = new Event (); event.detail = SWT.TRAVERSE_MNEMONIC; @@ -3251,8 +3251,8 @@ boolean translateMnemonic (MSG msg) { } boolean translateTraversal (MSG msg) { - int hwnd = msg.hwnd; - int key = msg.wParam; + int /*long*/ hwnd = msg.hwnd; + int key = (int)/*64*/msg.wParam; if (key == OS.VK_MENU) { OS.SendMessage (hwnd, OS.WM_CHANGEUISTATE, OS.UIS_INITIALIZE, 0); return false; @@ -3265,7 +3265,7 @@ boolean translateTraversal (MSG msg) { case OS.VK_ESCAPE: { all = true; lastAscii = 27; - int code = OS.SendMessage (hwnd, OS.WM_GETDLGCODE, 0, 0); + int /*long*/ code = OS.SendMessage (hwnd, OS.WM_GETDLGCODE, 0, 0); if ((code & OS.DLGC_WANTALLKEYS) != 0) { /* * Use DLGC_HASSETSEL to determine that the control @@ -3282,7 +3282,7 @@ boolean translateTraversal (MSG msg) { case OS.VK_RETURN: { all = true; lastAscii = '\r'; - int code = OS.SendMessage (hwnd, OS.WM_GETDLGCODE, 0, 0); + int /*long*/ code = OS.SendMessage (hwnd, OS.WM_GETDLGCODE, 0, 0); if ((code & OS.DLGC_WANTALLKEYS) != 0) doit = false; detail = SWT.TRAVERSE_RETURN; break; @@ -3290,7 +3290,7 @@ boolean translateTraversal (MSG msg) { case OS.VK_TAB: { lastAscii = '\t'; boolean next = OS.GetKeyState (OS.VK_SHIFT) >= 0; - int code = OS.SendMessage (hwnd, OS.WM_GETDLGCODE, 0, 0); + int /*long*/ code = OS.SendMessage (hwnd, OS.WM_GETDLGCODE, 0, 0); if ((code & (OS.DLGC_WANTTAB | OS.DLGC_WANTALLKEYS)) != 0) { /* * Use DLGC_HASSETSEL to determine that the control is a @@ -3327,7 +3327,7 @@ boolean translateTraversal (MSG msg) { if (key == OS.VK_LEFT || key == OS.VK_RIGHT) return false; } lastVirtual = true; - int code = OS.SendMessage (hwnd, OS.WM_GETDLGCODE, 0, 0); + int /*long*/ code = OS.SendMessage (hwnd, OS.WM_GETDLGCODE, 0, 0); if ((code & (OS.DLGC_WANTARROWS /*| OS.DLGC_WANTALLKEYS*/)) != 0) doit = false; boolean next = key == OS.VK_DOWN || key == OS.VK_RIGHT; detail = next ? SWT.TRAVERSE_ARROW_NEXT : SWT.TRAVERSE_ARROW_PREVIOUS; @@ -3338,7 +3338,7 @@ boolean translateTraversal (MSG msg) { all = true; lastVirtual = true; if (OS.GetKeyState (OS.VK_CONTROL) >= 0) return false; - int code = OS.SendMessage (hwnd, OS.WM_GETDLGCODE, 0, 0); + int /*long*/ code = OS.SendMessage (hwnd, OS.WM_GETDLGCODE, 0, 0); if ((code & OS.DLGC_WANTALLKEYS) != 0) { /* * Use DLGC_HASSETSEL to determine that the control is a @@ -3497,10 +3497,10 @@ boolean traverseReturn () { } void unsubclass () { - int newProc = windowProc (); - int oldProc = display.windowProc; + int /*long*/ newProc = windowProc (); + int /*long*/ oldProc = display.windowProc; if (oldProc == newProc) return; - OS.SetWindowLong (handle, OS.GWL_WNDPROC, newProc); + OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, newProc); } /** @@ -3595,7 +3595,7 @@ int widgetExtStyle () { return bits; } -int widgetParent () { +int /*long*/ widgetParent () { return parent.handle; } @@ -3652,7 +3652,7 @@ public boolean setParent (Composite parent) { Menu [] menus = oldShell.findMenus (this); fixChildren (newShell, oldShell, newDecorations, oldDecorations, menus); } - int topHandle = topHandle (); + int /*long*/ topHandle = topHandle (); if (OS.SetParent (topHandle, parent.handle) == 0) return false; this.parent = parent; int flags = OS.SWP_NOSIZE | OS.SWP_NOMOVE | OS.SWP_NOACTIVATE; @@ -3662,9 +3662,9 @@ public boolean setParent (Composite parent) { abstract TCHAR windowClass (); -abstract int windowProc (); +abstract int /*long*/ windowProc (); -int windowProc (int hwnd, int msg, int wParam, int lParam) { +int /*long*/ windowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = null; switch (msg) { case OS.WM_ACTIVATE: result = WM_ACTIVATE (wParam, lParam); break; @@ -3760,27 +3760,27 @@ int windowProc (int hwnd, int msg, int wParam, int lParam) { return callWindowProc (hwnd, msg, wParam, lParam); } -LRESULT WM_ACTIVATE (int wParam, int lParam) { +LRESULT WM_ACTIVATE (int /*long*/ wParam, int /*long*/ lParam) { return null; } -LRESULT WM_CAPTURECHANGED (int wParam, int lParam) { +LRESULT WM_CAPTURECHANGED (int /*long*/ wParam, int /*long*/ lParam) { return wmCaptureChanged (handle, wParam, lParam); } -LRESULT WM_CHAR (int wParam, int lParam) { +LRESULT WM_CHAR (int /*long*/ wParam, int /*long*/ lParam) { return wmChar (handle, wParam, lParam); } -LRESULT WM_CLEAR (int wParam, int lParam) { +LRESULT WM_CLEAR (int /*long*/ wParam, int /*long*/ lParam) { return null; } -LRESULT WM_CLOSE (int wParam, int lParam) { +LRESULT WM_CLOSE (int /*long*/ wParam, int /*long*/ lParam) { return null; } -LRESULT WM_COMMAND (int wParam, int lParam) { +LRESULT WM_COMMAND (int /*long*/ wParam, int /*long*/ lParam) { /* * When the WM_COMMAND message is sent from a * menu, the HWND parameter in LPARAM is zero. @@ -3801,12 +3801,12 @@ LRESULT WM_COMMAND (int wParam, int lParam) { return control.wmCommandChild (wParam, lParam); } -LRESULT WM_CONTEXTMENU (int wParam, int lParam) { +LRESULT WM_CONTEXTMENU (int /*long*/ wParam, int /*long*/ lParam) { return wmContextMenu (handle, wParam, lParam); } -LRESULT WM_CTLCOLOR (int wParam, int lParam) { - int hPalette = display.hPalette; +LRESULT WM_CTLCOLOR (int /*long*/ wParam, int /*long*/ lParam) { + int /*long*/ hPalette = display.hPalette; if (hPalette != 0) { OS.SelectPalette (wParam, hPalette, false); OS.RealizePalette (wParam); @@ -3816,15 +3816,15 @@ LRESULT WM_CTLCOLOR (int wParam, int lParam) { return control.wmColorChild (wParam, lParam); } -LRESULT WM_CUT (int wParam, int lParam) { +LRESULT WM_CUT (int /*long*/ wParam, int /*long*/ lParam) { return null; } -LRESULT WM_DESTROY (int wParam, int lParam) { +LRESULT WM_DESTROY (int /*long*/ wParam, int /*long*/ lParam) { return null; } -LRESULT WM_DRAWITEM (int wParam, int lParam) { +LRESULT WM_DRAWITEM (int /*long*/ wParam, int /*long*/ lParam) { DRAWITEMSTRUCT struct = new DRAWITEMSTRUCT (); OS.MoveMemory (struct, lParam, DRAWITEMSTRUCT.sizeof); if (struct.CtlType == OS.ODT_MENU) { @@ -3837,15 +3837,15 @@ LRESULT WM_DRAWITEM (int wParam, int lParam) { return control.wmDrawChild (wParam, lParam); } -LRESULT WM_ENDSESSION (int wParam, int lParam) { +LRESULT WM_ENDSESSION (int /*long*/ wParam, int /*long*/ lParam) { return null; } -LRESULT WM_ENTERIDLE (int wParam, int lParam) { +LRESULT WM_ENTERIDLE (int /*long*/ wParam, int /*long*/ lParam) { return null; } -LRESULT WM_ERASEBKGND (int wParam, int lParam) { +LRESULT WM_ERASEBKGND (int /*long*/ wParam, int /*long*/ lParam) { if ((state & DRAW_BACKGROUND) != 0) { if (findImageControl () != null) return LRESULT.ONE; } @@ -3857,31 +3857,31 @@ LRESULT WM_ERASEBKGND (int wParam, int lParam) { return null; } -LRESULT WM_GETDLGCODE (int wParam, int lParam) { +LRESULT WM_GETDLGCODE (int /*long*/ wParam, int /*long*/ lParam) { return null; } -LRESULT WM_GETFONT (int wParam, int lParam) { +LRESULT WM_GETFONT (int /*long*/ wParam, int /*long*/ lParam) { return null; } -LRESULT WM_GETOBJECT (int wParam, int lParam) { +LRESULT WM_GETOBJECT (int /*long*/ wParam, int /*long*/ lParam) { if (accessible != null) { - int result = accessible.internal_WM_GETOBJECT (wParam, lParam); + int /*long*/ result = accessible.internal_WM_GETOBJECT (wParam, lParam); if (result != 0) return new LRESULT (result); } return null; } -LRESULT WM_GETMINMAXINFO (int wParam, int lParam) { +LRESULT WM_GETMINMAXINFO (int /*long*/ wParam, int /*long*/ lParam) { return null; } -LRESULT WM_HOTKEY (int wParam, int lParam) { +LRESULT WM_HOTKEY (int /*long*/ wParam, int /*long*/ lParam) { return null; } -LRESULT WM_HELP (int wParam, int lParam) { +LRESULT WM_HELP (int /*long*/ wParam, int /*long*/ lParam) { if (OS.IsWinCE) return null; HELPINFO lphi = new HELPINFO (); OS.MoveMemory (lphi, lParam, HELPINFO.sizeof); @@ -3898,7 +3898,7 @@ LRESULT WM_HELP (int wParam, int lParam) { if (menu.hooks (SWT.Help)) widget = menu; } if (widget != null) { - int hwndShell = shell.handle; + int /*long*/ hwndShell = shell.handle; OS.SendMessage (hwndShell, OS.WM_CANCELMODE, 0, 0); widget.postEvent (SWT.Help); return LRESULT.ONE; @@ -3913,21 +3913,21 @@ LRESULT WM_HELP (int wParam, int lParam) { return null; } -LRESULT WM_HSCROLL (int wParam, int lParam) { +LRESULT WM_HSCROLL (int /*long*/ wParam, int /*long*/ lParam) { Control control = display.getControl (lParam); if (control == null) return null; return control.wmScrollChild (wParam, lParam); } -LRESULT WM_IME_CHAR (int wParam, int lParam) { +LRESULT WM_IME_CHAR (int /*long*/ wParam, int /*long*/ lParam) { return wmIMEChar (handle, wParam, lParam); } -LRESULT WM_IME_COMPOSITION (int wParam, int lParam) { +LRESULT WM_IME_COMPOSITION (int /*long*/ wParam, int /*long*/ lParam) { return null; } -LRESULT WM_INITMENUPOPUP (int wParam, int lParam) { +LRESULT WM_INITMENUPOPUP (int /*long*/ wParam, int /*long*/ lParam) { /* Ignore WM_INITMENUPOPUP for an accelerator */ if (display.accelKeyHit) return null; @@ -3984,47 +3984,47 @@ LRESULT WM_INITMENUPOPUP (int wParam, int lParam) { return null; } -LRESULT WM_INPUTLANGCHANGE (int wParam, int lParam) { +LRESULT WM_INPUTLANGCHANGE (int /*long*/ wParam, int /*long*/ lParam) { return null; } -LRESULT WM_KEYDOWN (int wParam, int lParam) { +LRESULT WM_KEYDOWN (int /*long*/ wParam, int /*long*/ lParam) { return wmKeyDown (handle, wParam, lParam); } -LRESULT WM_KEYUP (int wParam, int lParam) { +LRESULT WM_KEYUP (int /*long*/ wParam, int /*long*/ lParam) { return wmKeyUp (handle, wParam, lParam); } -LRESULT WM_KILLFOCUS (int wParam, int lParam) { +LRESULT WM_KILLFOCUS (int /*long*/ wParam, int /*long*/ lParam) { return wmKillFocus (handle, wParam, lParam); } -LRESULT WM_LBUTTONDBLCLK (int wParam, int lParam) { +LRESULT WM_LBUTTONDBLCLK (int /*long*/ wParam, int /*long*/ lParam) { return wmLButtonDblClk (handle, wParam, lParam); } -LRESULT WM_LBUTTONDOWN (int wParam, int lParam) { +LRESULT WM_LBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) { return wmLButtonDown (handle, wParam, lParam); } -LRESULT WM_LBUTTONUP (int wParam, int lParam) { +LRESULT WM_LBUTTONUP (int /*long*/ wParam, int /*long*/ lParam) { return wmLButtonUp (handle, wParam, lParam); } -LRESULT WM_MBUTTONDBLCLK (int wParam, int lParam) { +LRESULT WM_MBUTTONDBLCLK (int /*long*/ wParam, int /*long*/ lParam) { return wmMButtonDblClk (handle, wParam, lParam); } -LRESULT WM_MBUTTONDOWN (int wParam, int lParam) { +LRESULT WM_MBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) { return wmMButtonDown (handle, wParam, lParam); } -LRESULT WM_MBUTTONUP (int wParam, int lParam) { +LRESULT WM_MBUTTONUP (int /*long*/ wParam, int /*long*/ lParam) { return wmMButtonUp (handle, wParam, lParam); } -LRESULT WM_MEASUREITEM (int wParam, int lParam) { +LRESULT WM_MEASUREITEM (int /*long*/ wParam, int /*long*/ lParam) { MEASUREITEMSTRUCT struct = new MEASUREITEMSTRUCT (); OS.MoveMemory (struct, lParam, MEASUREITEMSTRUCT.sizeof); if (struct.CtlType == OS.ODT_MENU) { @@ -4032,13 +4032,13 @@ LRESULT WM_MEASUREITEM (int wParam, int lParam) { if (item == null) return null; return item.wmMeasureChild (wParam, lParam); } - int hwnd = OS.GetDlgItem (handle, struct.CtlID); + int /*long*/ hwnd = OS.GetDlgItem (handle, struct.CtlID); Control control = display.getControl (hwnd); if (control == null) return null; return control.wmMeasureChild (wParam, lParam); } -LRESULT WM_MENUCHAR (int wParam, int lParam) { +LRESULT WM_MENUCHAR (int /*long*/ wParam, int /*long*/ lParam) { /* * Feature in Windows. When the user types Alt+<key> * and <key> does not match a mnemonic in the System @@ -4055,7 +4055,7 @@ LRESULT WM_MENUCHAR (int wParam, int lParam) { return null; } -LRESULT WM_MENUSELECT (int wParam, int lParam) { +LRESULT WM_MENUSELECT (int /*long*/ wParam, int /*long*/ lParam) { int code = OS.HIWORD (wParam); Shell shell = getShell (); if (code == 0xFFFF && lParam == 0) { @@ -4150,28 +4150,28 @@ LRESULT WM_MENUSELECT (int wParam, int lParam) { return null; } -LRESULT WM_MOUSEACTIVATE (int wParam, int lParam) { +LRESULT WM_MOUSEACTIVATE (int /*long*/ wParam, int /*long*/ lParam) { return null; } -LRESULT WM_MOUSEHOVER (int wParam, int lParam) { +LRESULT WM_MOUSEHOVER (int /*long*/ wParam, int /*long*/ lParam) { return wmMouseHover (handle, wParam, lParam); } -LRESULT WM_MOUSELEAVE (int wParam, int lParam) { +LRESULT WM_MOUSELEAVE (int /*long*/ wParam, int /*long*/ lParam) { if (OS.COMCTL32_MAJOR >= 6) getShell ().fixToolTip (); return wmMouseLeave (handle, wParam, lParam); } -LRESULT WM_MOUSEMOVE (int wParam, int lParam) { +LRESULT WM_MOUSEMOVE (int /*long*/ wParam, int /*long*/ lParam) { return wmMouseMove (handle, wParam, lParam); } -LRESULT WM_MOUSEWHEEL (int wParam, int lParam) { +LRESULT WM_MOUSEWHEEL (int /*long*/ wParam, int /*long*/ lParam) { return wmMouseWheel (handle, wParam, lParam); } -LRESULT WM_MOVE (int wParam, int lParam) { +LRESULT WM_MOVE (int /*long*/ wParam, int /*long*/ lParam) { if (findImageControl () != null) { if (this != getShell ()) redrawChildren (); } else { @@ -4188,83 +4188,83 @@ LRESULT WM_MOVE (int wParam, int lParam) { return null; } -LRESULT WM_NCACTIVATE (int wParam, int lParam) { +LRESULT WM_NCACTIVATE (int /*long*/ wParam, int /*long*/ lParam) { return null; } -LRESULT WM_NCCALCSIZE (int wParam, int lParam) { +LRESULT WM_NCCALCSIZE (int /*long*/ wParam, int /*long*/ lParam) { return null; } -LRESULT WM_NCHITTEST (int wParam, int lParam) { +LRESULT WM_NCHITTEST (int /*long*/ wParam, int /*long*/ lParam) { if (!OS.IsWindowEnabled (handle)) return null; if (!isActive ()) return new LRESULT (OS.HTTRANSPARENT); return null; } -LRESULT WM_NCLBUTTONDOWN (int wParam, int lParam) { +LRESULT WM_NCLBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) { return null; } -LRESULT WM_NCPAINT (int wParam, int lParam) { +LRESULT WM_NCPAINT (int /*long*/ wParam, int /*long*/ lParam) { return null; } -LRESULT WM_NOTIFY (int wParam, int lParam) { +LRESULT WM_NOTIFY (int /*long*/ wParam, int /*long*/ lParam) { NMHDR hdr = new NMHDR (); OS.MoveMemory (hdr, lParam, NMHDR.sizeof); return wmNotify (hdr, wParam, lParam); } -LRESULT WM_PAINT (int wParam, int lParam) { +LRESULT WM_PAINT (int /*long*/ wParam, int /*long*/ lParam) { return super.wmPaint (handle, wParam, lParam); } -LRESULT WM_PALETTECHANGED (int wParam, int lParam) { +LRESULT WM_PALETTECHANGED (int /*long*/ wParam, int /*long*/ lParam) { return null; } -LRESULT WM_PARENTNOTIFY (int wParam, int lParam) { +LRESULT WM_PARENTNOTIFY (int /*long*/ wParam, int /*long*/ lParam) { return null; } -LRESULT WM_PASTE (int wParam, int lParam) { +LRESULT WM_PASTE (int /*long*/ wParam, int /*long*/ lParam) { return null; } -LRESULT WM_PRINT (int wParam, int lParam) { +LRESULT WM_PRINT (int /*long*/ wParam, int /*long*/ lParam) { return wmPrint (handle, wParam, lParam); } -LRESULT WM_PRINTCLIENT (int wParam, int lParam) { +LRESULT WM_PRINTCLIENT (int /*long*/ wParam, int /*long*/ lParam) { return null; } -LRESULT WM_QUERYENDSESSION (int wParam, int lParam) { +LRESULT WM_QUERYENDSESSION (int /*long*/ wParam, int /*long*/ lParam) { return null; } -LRESULT WM_QUERYNEWPALETTE (int wParam, int lParam) { +LRESULT WM_QUERYNEWPALETTE (int /*long*/ wParam, int /*long*/ lParam) { return null; } -LRESULT WM_QUERYOPEN (int wParam, int lParam) { +LRESULT WM_QUERYOPEN (int /*long*/ wParam, int /*long*/ lParam) { return null; } -LRESULT WM_RBUTTONDBLCLK (int wParam, int lParam) { +LRESULT WM_RBUTTONDBLCLK (int /*long*/ wParam, int /*long*/ lParam) { return wmRButtonDblClk (handle, wParam, lParam); } -LRESULT WM_RBUTTONDOWN (int wParam, int lParam) { +LRESULT WM_RBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) { return wmRButtonDown (handle, wParam, lParam); } -LRESULT WM_RBUTTONUP (int wParam, int lParam) { +LRESULT WM_RBUTTONUP (int /*long*/ wParam, int /*long*/ lParam) { return wmRButtonUp (handle, wParam, lParam); } -LRESULT WM_SETCURSOR (int wParam, int lParam) { +LRESULT WM_SETCURSOR (int /*long*/ wParam, int /*long*/ lParam) { int hitTest = (short) OS.LOWORD (lParam); if (hitTest == OS.HTCLIENT) { Control control = display.getControl (wParam); @@ -4278,41 +4278,41 @@ LRESULT WM_SETCURSOR (int wParam, int lParam) { return null; } -LRESULT WM_SETFOCUS (int wParam, int lParam) { +LRESULT WM_SETFOCUS (int /*long*/ wParam, int /*long*/ lParam) { return wmSetFocus (handle, wParam, lParam); } -LRESULT WM_SETTINGCHANGE (int wParam, int lParam) { +LRESULT WM_SETTINGCHANGE (int /*long*/ wParam, int /*long*/ lParam) { return null; } -LRESULT WM_SETFONT (int wParam, int lParam) { +LRESULT WM_SETFONT (int /*long*/ wParam, int /*long*/ lParam) { return null; } -LRESULT WM_SETREDRAW (int wParam, int lParam) { +LRESULT WM_SETREDRAW (int /*long*/ wParam, int /*long*/ lParam) { return null; } -LRESULT WM_SHOWWINDOW (int wParam, int lParam) { +LRESULT WM_SHOWWINDOW (int /*long*/ wParam, int /*long*/ lParam) { return null; } -LRESULT WM_SIZE (int wParam, int lParam) { +LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) { sendEvent (SWT.Resize); // widget could be disposed at this point return null; } -LRESULT WM_SYSCHAR (int wParam, int lParam) { +LRESULT WM_SYSCHAR (int /*long*/ wParam, int /*long*/ lParam) { return wmSysChar (handle, wParam, lParam); } -LRESULT WM_SYSCOLORCHANGE (int wParam, int lParam) { +LRESULT WM_SYSCOLORCHANGE (int /*long*/ wParam, int /*long*/ lParam) { return null; } -LRESULT WM_SYSCOMMAND (int wParam, int lParam) { +LRESULT WM_SYSCOMMAND (int /*long*/ wParam, int /*long*/ lParam) { /* * Check to see if the command is a system command or * a user menu item that was added to the System menu. @@ -4331,10 +4331,10 @@ LRESULT WM_SYSCOMMAND (int wParam, int lParam) { } /* Process the System Command */ - int cmd = wParam & 0xFFF0; + int cmd = (int)/*64*/wParam & 0xFFF0; switch (cmd) { case OS.SC_CLOSE: - int hwndShell = menuShell ().handle; + int /*long*/ hwndShell = menuShell ().handle; int bits = OS.GetWindowLong (hwndShell, OS.GWL_STYLE); if ((bits & OS.WS_SYSMENU) == 0) return LRESULT.ZERO; break; @@ -4384,7 +4384,7 @@ LRESULT WM_SYSCOMMAND (int wParam, int lParam) { Decorations shell = menuShell (); Menu menu = shell.getMenuBar (); if (menu != null) { - char key = Display.mbcsToWcs (lParam); + char key = Display.mbcsToWcs ((int)/*64*/lParam); if (key != 0) { key = Character.toUpperCase (key); MenuItem [] items = menu.getItems (); @@ -4427,37 +4427,37 @@ LRESULT WM_SYSCOMMAND (int wParam, int lParam) { return null; } -LRESULT WM_SYSKEYDOWN (int wParam, int lParam) { +LRESULT WM_SYSKEYDOWN (int /*long*/ wParam, int /*long*/ lParam) { return wmSysKeyDown (handle, wParam, lParam); } -LRESULT WM_SYSKEYUP (int wParam, int lParam) { +LRESULT WM_SYSKEYUP (int /*long*/ wParam, int /*long*/ lParam) { return wmSysKeyUp (handle, wParam, lParam); } -LRESULT WM_TIMER (int wParam, int lParam) { +LRESULT WM_TIMER (int /*long*/ wParam, int /*long*/ lParam) { return null; } -LRESULT WM_UNDO (int wParam, int lParam) { +LRESULT WM_UNDO (int /*long*/ wParam, int /*long*/ lParam) { return null; } -LRESULT WM_UPDATEUISTATE (int wParam, int lParam) { +LRESULT WM_UPDATEUISTATE (int /*long*/ wParam, int /*long*/ lParam) { return null; } -LRESULT WM_VSCROLL (int wParam, int lParam) { +LRESULT WM_VSCROLL (int /*long*/ wParam, int /*long*/ lParam) { Control control = display.getControl (lParam); if (control == null) return null; return control.wmScrollChild (wParam, lParam); } -LRESULT WM_WINDOWPOSCHANGED (int wParam, int lParam) { +LRESULT WM_WINDOWPOSCHANGED (int /*long*/ wParam, int /*long*/ lParam) { return null; } -LRESULT WM_WINDOWPOSCHANGING (int wParam, int lParam) { +LRESULT WM_WINDOWPOSCHANGING (int /*long*/ wParam, int /*long*/ lParam) { /* * Bug in Windows. When WM_SETREDRAW is used to turn off drawing * for a control and the control is moved or resized, Windows does @@ -4472,7 +4472,7 @@ LRESULT WM_WINDOWPOSCHANGING (int wParam, int lParam) { if ((lpwp.flags & OS.SWP_NOMOVE) == 0 || (lpwp.flags & OS.SWP_NOSIZE) == 0) { RECT rect = new RECT (); OS.GetWindowRect (topHandle (), rect); - int hwndParent = parent == null ? 0 : parent.handle; + int /*long*/ hwndParent = parent == null ? 0 : parent.handle; OS.MapWindowPoints (0, hwndParent, rect, 2); OS.InvalidateRect (hwndParent, rect, true); } @@ -4481,19 +4481,19 @@ LRESULT WM_WINDOWPOSCHANGING (int wParam, int lParam) { return null; } -LRESULT WM_XBUTTONDBLCLK (int wParam, int lParam) { +LRESULT WM_XBUTTONDBLCLK (int /*long*/ wParam, int /*long*/ lParam) { return wmXButtonDblClk (handle, wParam, lParam); } -LRESULT WM_XBUTTONDOWN (int wParam, int lParam) { +LRESULT WM_XBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) { return wmXButtonDown (handle, wParam, lParam); } -LRESULT WM_XBUTTONUP (int wParam, int lParam) { +LRESULT WM_XBUTTONUP (int /*long*/ wParam, int /*long*/ lParam) { return wmXButtonUp (handle, wParam, lParam); } -LRESULT wmColorChild (int wParam, int lParam) { +LRESULT wmColorChild (int /*long*/ wParam, int /*long*/ lParam) { Control control = findBackgroundControl (); if (control == null) { if ((state & THEME_BACKGROUND) != 0) { @@ -4520,15 +4520,15 @@ LRESULT wmColorChild (int wParam, int lParam) { if (control.backgroundImage != null) { RECT rect = new RECT (); OS.GetClientRect (handle, rect); - int hwnd = control.handle; - int hBitmap = control.backgroundImage.handle; + int /*long*/ hwnd = control.handle; + int /*long*/ hBitmap = control.backgroundImage.handle; OS.MapWindowPoints (handle, hwnd, rect, 2); POINT lpPoint = new POINT (); OS.GetWindowOrgEx (wParam, lpPoint); OS.SetBrushOrgEx (wParam, -rect.left - lpPoint.x, -rect.top - lpPoint.y, lpPoint); - int hBrush = findBrush (hBitmap, OS.BS_PATTERN); + int /*long*/ hBrush = findBrush (hBitmap, OS.BS_PATTERN); if ((state & DRAW_BACKGROUND) != 0) { - int hOldBrush = OS.SelectObject (wParam, hBrush); + int /*long*/ hOldBrush = OS.SelectObject (wParam, hBrush); OS.MapWindowPoints (hwnd, handle, rect, 2); OS.PatBlt (wParam, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, OS.PATCOPY); OS.SelectObject (wParam, hOldBrush); @@ -4536,40 +4536,40 @@ LRESULT wmColorChild (int wParam, int lParam) { OS.SetBkMode (wParam, OS.TRANSPARENT); return new LRESULT (hBrush); } - int hBrush = findBrush (backPixel, OS.BS_SOLID); + int /*long*/ hBrush = findBrush (backPixel, OS.BS_SOLID); if ((state & DRAW_BACKGROUND) != 0) { RECT rect = new RECT (); OS.GetClientRect (handle, rect); - int hOldBrush = OS.SelectObject (wParam, hBrush); + int /*long*/ hOldBrush = OS.SelectObject (wParam, hBrush); OS.PatBlt (wParam, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, OS.PATCOPY); OS.SelectObject (wParam, hOldBrush); } return new LRESULT (hBrush); } -LRESULT wmCommandChild (int wParam, int lParam) { +LRESULT wmCommandChild (int /*long*/ wParam, int /*long*/ lParam) { return null; } -LRESULT wmDrawChild (int wParam, int lParam) { +LRESULT wmDrawChild (int /*long*/ wParam, int /*long*/ lParam) { return null; } -LRESULT wmMeasureChild (int wParam, int lParam) { +LRESULT wmMeasureChild (int /*long*/ wParam, int /*long*/ lParam) { return null; } -LRESULT wmNotify (NMHDR hdr, int wParam, int lParam) { +LRESULT wmNotify (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) { Control control = display.getControl (hdr.hwndFrom); if (control == null) return null; return control.wmNotifyChild (hdr, wParam, lParam); } -LRESULT wmNotifyChild (NMHDR hdr, int wParam, int lParam) { +LRESULT wmNotifyChild (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) { return null; } -LRESULT wmScrollChild (int wParam, int lParam) { +LRESULT wmScrollChild (int /*long*/ wParam, int /*long*/ lParam) { return null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolBar.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolBar.java index 39efb3bf39..adefc96176 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolBar.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolBar.java @@ -44,7 +44,7 @@ public class CoolBar extends Composite { CoolItem [] originalItems; boolean locked; boolean ignoreResize; - static final int ReBarProc; + static final int /*long*/ ReBarProc; static final TCHAR ReBarClass = new TCHAR (0, OS.REBARCLASSNAME, true); static { INITCOMMONCONTROLSEX icex = new INITCOMMONCONTROLSEX (); @@ -110,7 +110,7 @@ public CoolBar (Composite parent, int style) { } } -int callWindowProc (int hwnd, int msg, int wParam, int lParam) { +int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) { if (handle == 0) return 0; return OS.CallWindowProc (ReBarProc, hwnd, msg, wParam, lParam); } @@ -137,7 +137,7 @@ public Point computeSize (int wHint, int hHint, boolean changed) { int border = getBorderWidth (); int newWidth = wHint == SWT.DEFAULT ? 0x3FFF : wHint + (border * 2); int newHeight = hHint == SWT.DEFAULT ? 0x3FFF : hHint + (border * 2); - int count = OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0); if (count != 0) { ignoreResize = true; boolean redraw = false; @@ -216,12 +216,12 @@ void createHandle () { * The control will not destroy a font that it did not * create. */ - int hFont = OS.GetStockObject (OS.SYSTEM_FONT); + int /*long*/ hFont = OS.GetStockObject (OS.SYSTEM_FONT); OS.SendMessage (handle, OS.WM_SETFONT, hFont, 0); } void createItem (CoolItem item, int index) { - int count = OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0); if (!(0 <= index && index <= count)) error (SWT.ERROR_INVALID_RANGE); int id = 0; while (id < items.length && items [id] != null) id++; @@ -230,8 +230,8 @@ void createItem (CoolItem item, int index) { System.arraycopy (items, 0, newItems, 0, items.length); items = newItems; } - int hHeap = OS.GetProcessHeap (); - int lpText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, TCHAR.sizeof); + int /*long*/ hHeap = OS.GetProcessHeap (); + int /*long*/ lpText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, TCHAR.sizeof); REBARBANDINFO rbBand = new REBARBANDINFO (); rbBand.cbSize = REBARBANDINFO.sizeof; rbBand.fMask = OS.RBBIM_TEXT | OS.RBBIM_STYLE | OS.RBBIM_ID; @@ -295,8 +295,8 @@ void createWidget () { } void destroyItem (CoolItem item) { - int index = OS.SendMessage (handle, OS.RB_IDTOINDEX, item.id, 0); - int count = OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0); + int index = (int)/*64*/OS.SendMessage (handle, OS.RB_IDTOINDEX, item.id, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0); if (count != 0) { int lastIndex = getLastIndexOfRow (index); if (index == lastIndex) { @@ -360,7 +360,7 @@ void destroyItem (CoolItem item) { originalItems = newOriginals; } -void drawThemeBackground (int hDC, int hwnd, RECT rect) { +void drawThemeBackground (int /*long*/ hDC, int /*long*/ hwnd, RECT rect) { if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) { if (background == -1 && (style & SWT.FLAT) != 0) { Control control = findBackgroundControl (); @@ -437,7 +437,7 @@ int getMargin (int index) { */ public CoolItem getItem (int index) { checkWidget (); - int count = OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0); if (!(0 <= index && index < count)) error (SWT.ERROR_INVALID_RANGE); REBARBANDINFO rbBand = new REBARBANDINFO (); rbBand.cbSize = REBARBANDINFO.sizeof; @@ -458,7 +458,7 @@ public CoolItem getItem (int index) { */ public int getItemCount () { checkWidget (); - return OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0); + return (int)/*64*/OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0); } /** @@ -484,7 +484,7 @@ public int getItemCount () { */ public int [] getItemOrder () { checkWidget (); - int count = OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0); int [] indices = new int [count]; REBARBANDINFO rbBand = new REBARBANDINFO (); rbBand.cbSize = REBARBANDINFO.sizeof; @@ -521,7 +521,7 @@ public int [] getItemOrder () { */ public CoolItem [] getItems () { checkWidget (); - int count = OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0); CoolItem [] result = new CoolItem [count]; REBARBANDINFO rbBand = new REBARBANDINFO (); rbBand.cbSize = REBARBANDINFO.sizeof; @@ -547,7 +547,7 @@ public CoolItem [] getItems () { */ public Point [] getItemSizes () { checkWidget (); - int count = OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0); Point [] sizes = new Point [count]; REBARBANDINFO rbBand = new REBARBANDINFO (); rbBand.cbSize = REBARBANDINFO.sizeof; @@ -574,7 +574,7 @@ public Point [] getItemSizes () { } int getLastIndexOfRow (int index) { - int count = OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0); if (count == 0) return -1; REBARBANDINFO rbBand = new REBARBANDINFO (); rbBand.cbSize = REBARBANDINFO.sizeof; @@ -589,7 +589,7 @@ int getLastIndexOfRow (int index) { } boolean isLastItemOfRow (int index) { - int count = OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0); if (index + 1 == count) return true; REBARBANDINFO rbBand = new REBARBANDINFO (); rbBand.cbSize = REBARBANDINFO.sizeof; @@ -664,7 +664,7 @@ public int indexOf (CoolItem item) { checkWidget (); if (item == null) error (SWT.ERROR_NULL_ARGUMENT); if (item.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT); - return OS.SendMessage (handle, OS.RB_IDTOINDEX, item.id, 0); + return (int)/*64*/OS.SendMessage (handle, OS.RB_IDTOINDEX, item.id, 0); } void resizeToPreferredWidth (int index) { @@ -673,7 +673,7 @@ void resizeToPreferredWidth (int index) { * with an index out of range, Windows GP's. The * fix is to ensure the index is in range. */ - int count = OS.SendMessage(handle, OS.RB_GETBANDCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage(handle, OS.RB_GETBANDCOUNT, 0, 0); if (0 <= index && index < count) { REBARBANDINFO rbBand = new REBARBANDINFO(); rbBand.cbSize = REBARBANDINFO.sizeof; @@ -722,7 +722,7 @@ void removeControl (Control control) { void setBackgroundPixel (int pixel) { if (pixel == -1) pixel = defaultBackground (); OS.SendMessage (handle, OS.RB_SETBKCOLOR, 0, pixel); - setItemColors (OS.SendMessage (handle, OS.RB_GETTEXTCOLOR, 0, 0), pixel); + setItemColors ((int)/*64*/OS.SendMessage (handle, OS.RB_GETTEXTCOLOR, 0, 0), pixel); /* * Feature in Windows. For some reason, Windows * does not fully erase the coolbar area and coolbar @@ -741,11 +741,11 @@ void setBackgroundPixel (int pixel) { void setForegroundPixel (int pixel) { if (pixel == -1) pixel = defaultForeground (); OS.SendMessage (handle, OS.RB_SETTEXTCOLOR, 0, pixel); - setItemColors (pixel, OS.SendMessage (handle, OS.RB_GETBKCOLOR, 0, 0)); + setItemColors (pixel, (int)/*64*/OS.SendMessage (handle, OS.RB_GETBKCOLOR, 0, 0)); } void setItemColors (int foreColor, int backColor) { - int count = OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0); REBARBANDINFO rbBand = new REBARBANDINFO (); rbBand.cbSize = REBARBANDINFO.sizeof; rbBand.fMask = OS.RBBIM_COLORS; @@ -817,7 +817,7 @@ public void setItemLayout (int [] itemOrder, int [] wrapIndices, Point [] sizes) */ void setItemOrder (int [] itemOrder) { if (itemOrder == null) error (SWT.ERROR_NULL_ARGUMENT); - int itemCount = OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0); + int itemCount = (int)/*64*/OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0); if (itemOrder.length != itemCount) error (SWT.ERROR_INVALID_ARGUMENT); /* Ensure that itemOrder does not contain any duplicates. */ @@ -833,7 +833,7 @@ void setItemOrder (int [] itemOrder) { rbBand.cbSize = REBARBANDINFO.sizeof; for (int i=0; i<itemOrder.length; i++) { int id = originalItems [itemOrder [i]].id; - int index = OS.SendMessage (handle, OS.RB_IDTOINDEX, id, 0); + int index = (int)/*64*/OS.SendMessage (handle, OS.RB_IDTOINDEX, id, 0); if (index != i) { int lastItemSrcRow = getLastIndexOfRow (index); int lastItemDstRow = getLastIndexOfRow (i); @@ -876,7 +876,7 @@ void setItemOrder (int [] itemOrder) { */ void setItemSizes (Point [] sizes) { if (sizes == null) error (SWT.ERROR_NULL_ARGUMENT); - int count = OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0); if (sizes.length != count) error (SWT.ERROR_INVALID_ARGUMENT); REBARBANDINFO rbBand = new REBARBANDINFO (); rbBand.cbSize = REBARBANDINFO.sizeof; @@ -903,7 +903,7 @@ void setItemSizes (Point [] sizes) { public void setLocked (boolean locked) { checkWidget (); this.locked = locked; - int count = OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0); REBARBANDINFO rbBand = new REBARBANDINFO (); rbBand.cbSize = REBARBANDINFO.sizeof; rbBand.fMask = OS.RBBIM_STYLE; @@ -974,11 +974,11 @@ TCHAR windowClass () { return ReBarClass; } -int windowProc () { +int /*long*/ windowProc () { return ReBarProc; } -LRESULT WM_COMMAND (int wParam, int lParam) { +LRESULT WM_COMMAND (int /*long*/ wParam, int /*long*/ lParam) { /* * Feature in Windows. When the coolbar window * proc processes WM_COMMAND, it forwards this @@ -1002,7 +1002,7 @@ LRESULT WM_COMMAND (int wParam, int lParam) { return LRESULT.ZERO; } -LRESULT WM_ERASEBKGND (int wParam, int lParam) { +LRESULT WM_ERASEBKGND (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_ERASEBKGND (wParam, lParam); /* * Feature in Windows. For some reason, Windows @@ -1024,7 +1024,7 @@ LRESULT WM_ERASEBKGND (int wParam, int lParam) { return result; } -LRESULT WM_NOTIFY (int wParam, int lParam) { +LRESULT WM_NOTIFY (int /*long*/ wParam, int /*long*/ lParam) { /* * Feature in Windows. When the cool bar window * proc processes WM_NOTIFY, it forwards this @@ -1048,7 +1048,7 @@ LRESULT WM_NOTIFY (int wParam, int lParam) { return LRESULT.ZERO; } -LRESULT WM_SETREDRAW (int wParam, int lParam) { +LRESULT WM_SETREDRAW (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_SETREDRAW (wParam, lParam); if (result != null) return result; /* @@ -1072,7 +1072,7 @@ LRESULT WM_SETREDRAW (int wParam, int lParam) { */ if (OS.COMCTL32_MAJOR >= 6) return LRESULT.ZERO; Rectangle rect = getBounds (); - int code = callWindowProc (handle, OS.WM_SETREDRAW, wParam, lParam); + int /*long*/ code = callWindowProc (handle, OS.WM_SETREDRAW, wParam, lParam); OS.DefWindowProc (handle, OS.WM_SETREDRAW, wParam, lParam); if (!rect.equals (getBounds ())) { parent.redraw (rect.x, rect.y, rect.width, rect.height, true); @@ -1080,9 +1080,9 @@ LRESULT WM_SETREDRAW (int wParam, int lParam) { return new LRESULT (code); } -LRESULT WM_SIZE (int wParam, int lParam) { +LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) { if (ignoreResize) { - int code = callWindowProc (handle, OS.WM_SIZE, wParam, lParam); + int /*long*/ code = callWindowProc (handle, OS.WM_SIZE, wParam, lParam); if (code == 0) return LRESULT.ZERO; return new LRESULT (code); } @@ -1095,7 +1095,7 @@ LRESULT WM_SIZE (int wParam, int lParam) { return super.WM_SIZE (wParam, lParam); } -LRESULT wmNotifyChild (NMHDR hdr, int wParam, int lParam) { +LRESULT wmNotifyChild (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) { switch (hdr.code) { case OS.RBN_BEGINDRAG: { int pos = OS.GetMessagePos (); @@ -1133,7 +1133,7 @@ LRESULT wmNotifyChild (NMHDR hdr, int wParam, int lParam) { if (!ignoreResize) { Point size = getSize (); int border = getBorderWidth (); - int barHeight = OS.SendMessage (handle, OS.RB_GETBARHEIGHT, 0, 0); + int barHeight = (int)/*64*/OS.SendMessage (handle, OS.RB_GETBARHEIGHT, 0, 0); if ((style & SWT.VERTICAL) != 0) { setSize (barHeight + 2 * border, size.y); } else { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolItem.java index 7b550f8776..b9df5bc2d6 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolItem.java @@ -215,7 +215,7 @@ public Rectangle getBounds () { checkWidget (); int index = parent.indexOf (this); if (index == -1) return new Rectangle (0, 0, 0, 0); - int hwnd = parent.handle; + int /*long*/ hwnd = parent.handle; RECT rect = new RECT (); OS.SendMessage (hwnd, OS.RB_GETRECT, index, rect); if (OS.COMCTL32_MAJOR >= 6) { @@ -239,7 +239,7 @@ Rectangle getClientArea () { checkWidget (); int index = parent.indexOf (this); if (index == -1) return new Rectangle (0, 0, 0, 0); - int hwnd = parent.handle; + int /*long*/ hwnd = parent.handle; RECT insetRect = new RECT (); OS.SendMessage (hwnd, OS.RB_GETBANDBORDERS, index, insetRect); RECT rect = new RECT (); @@ -327,8 +327,8 @@ public void setControl (Control control) { this.control = null; } Control oldControl = this.control, newControl = control; - int hwnd = parent.handle; - int hwndChild = newControl != null ? control.topHandle () : 0; + int /*long*/ hwnd = parent.handle; + int /*long*/ hwndChild = newControl != null ? control.topHandle () : 0; REBARBANDINFO rbBand = new REBARBANDINFO (); rbBand.cbSize = REBARBANDINFO.sizeof; rbBand.fMask = OS.RBBIM_CHILD; @@ -341,7 +341,7 @@ public void setControl (Control control) { * moves the new child to the top of the Z-order. The fix is * to save and restore the visibility and Z-order. */ - int hwndAbove = 0; + int /*long*/ hwndAbove = 0; if (newControl != null) { hwndAbove = OS.GetWindow (hwndChild, OS.GW_HWNDPREV); } @@ -372,7 +372,7 @@ public Point getPreferredSize () { checkWidget (); int index = parent.indexOf (this); if (index == -1) return new Point (0, 0); - int hwnd = parent.handle; + int /*long*/ hwnd = parent.handle; REBARBANDINFO rbBand = new REBARBANDINFO (); rbBand.cbSize = REBARBANDINFO.sizeof; rbBand.fMask = OS.RBBIM_CHILDSIZE | OS.RBBIM_IDEALSIZE; @@ -402,7 +402,7 @@ public void setPreferredSize (int width, int height) { width = Math.max (0, width); height = Math.max (0, height); ideal = true; - int hwnd = parent.handle; + int /*long*/ hwnd = parent.handle; int cxIdeal, cyMaxChild; if ((parent.style & SWT.VERTICAL) != 0) { cxIdeal = Math.max (0, height - parent.getMargin (index)); @@ -462,7 +462,7 @@ public Point getSize() { checkWidget (); int index = parent.indexOf (this); if (index == -1) new Point (0, 0); - int hwnd = parent.handle; + int /*long*/ hwnd = parent.handle; RECT rect = new RECT (); OS.SendMessage (hwnd, OS.RB_GETRECT, index, rect); if (OS.COMCTL32_MAJOR >= 6) { @@ -504,7 +504,7 @@ public void setSize (int width, int height) { if (index == -1) return; width = Math.max (0, width); height = Math.max (0, height); - int hwnd = parent.handle; + int /*long*/ hwnd = parent.handle; int cx, cyChild, cxIdeal; if ((parent.style & SWT.VERTICAL) != 0) { cx = height; @@ -583,7 +583,7 @@ public Point getMinimumSize () { checkWidget (); int index = parent.indexOf (this); if (index == -1) return new Point (0, 0); - int hwnd = parent.handle; + int /*long*/ hwnd = parent.handle; REBARBANDINFO rbBand = new REBARBANDINFO (); rbBand.cbSize = REBARBANDINFO.sizeof; rbBand.fMask = OS.RBBIM_CHILDSIZE; @@ -615,7 +615,7 @@ public void setMinimumSize (int width, int height) { width = Math.max (0, width); height = Math.max (0, height); minimum = true; - int hwnd = parent.handle; + int /*long*/ hwnd = parent.handle; int cxMinChild, cyMinChild; if ((parent.style & SWT.VERTICAL) != 0) { cxMinChild = height; @@ -661,7 +661,7 @@ public void setMinimumSize (Point size) { boolean getWrap() { int index = parent.indexOf (this); - int hwnd = parent.handle; + int /*long*/ hwnd = parent.handle; REBARBANDINFO rbBand = new REBARBANDINFO (); rbBand.cbSize = REBARBANDINFO.sizeof; rbBand.fMask = OS.RBBIM_STYLE; @@ -671,7 +671,7 @@ boolean getWrap() { void setWrap(boolean wrap) { int index = parent.indexOf (this); - int hwnd = parent.handle; + int /*long*/ hwnd = parent.handle; REBARBANDINFO rbBand = new REBARBANDINFO (); rbBand.cbSize = REBARBANDINFO.sizeof; rbBand.fMask = OS.RBBIM_STYLE; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/DateTime.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/DateTime.java index 2306e331c0..e5885c761f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/DateTime.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/DateTime.java @@ -44,9 +44,9 @@ import org.eclipse.swt.graphics.*; */ public class DateTime extends Composite { - static final int DateTimeProc; + static final int /*long*/ DateTimeProc; static final TCHAR DateTimeClass = new TCHAR (0, OS.DATETIMEPICK_CLASS, true); - static final int CalendarProc; + static final int /*long*/ CalendarProc; static final TCHAR CalendarClass = new TCHAR (0, OS.MONTHCAL_CLASS, true); static { INITCOMMONCONTROLSEX icex = new INITCOMMONCONTROLSEX (); @@ -150,7 +150,7 @@ public void addSelectionListener (SelectionListener listener) { addListener (SWT.DefaultSelection, typedListener); } -int callWindowProc (int hwnd, int msg, int wParam, int lParam) { +int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) { if (handle == 0) return 0; return OS.CallWindowProc (windowProc (), hwnd, msg, wParam, lParam); } @@ -183,8 +183,8 @@ public Point computeSize (int wHint, int hHint, boolean changed) { height = rect.bottom; } else { TCHAR buffer = new TCHAR (getCodePage (), 128); - int newFont, oldFont = 0; - int hDC = OS.GetDC (handle); + int /*long*/ newFont, oldFont = 0; + int /*long*/ hDC = OS.GetDC (handle); newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont); RECT rect = new RECT (); @@ -764,11 +764,11 @@ TCHAR windowClass () { return (style & SWT.CALENDAR) != 0 ? CalendarClass : DateTimeClass; } -int windowProc () { +int /*long*/ windowProc () { return (style & SWT.CALENDAR) != 0 ? CalendarProc : DateTimeProc; } -LRESULT wmNotifyChild (NMHDR hdr, int wParam, int lParam) { +LRESULT wmNotifyChild (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) { switch (hdr.code) { case OS.MCN_SELCHANGE: //SENT WHEN YOU SET IT? case OS.DTN_DATETIMECHANGE: diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Decorations.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Decorations.java index 7f3a62a544..9d0852af35 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Decorations.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Decorations.java @@ -100,7 +100,8 @@ public class Decorations extends Canvas { Menu [] menus; Control savedFocus; Button defaultButton, saveDefault; - int swFlags, hAccel, nAccel; + int swFlags, nAccel; + int /*long*/ hAccel; boolean moved, resized, opened; int oldX = OS.CW_USEDEFAULT, oldY = OS.CW_USEDEFAULT; int oldWidth = OS.CW_USEDEFAULT, oldHeight = OS.CW_USEDEFAULT; @@ -167,7 +168,7 @@ void _setMaximized (boolean maximized) { if (OS.IsPPC) { /* Leave space for the menu bar */ if (menuBar != null) { - int hwndCB = menuBar.hwndCB; + int /*long*/ hwndCB = menuBar.hwndCB; RECT rectCB = new RECT (); OS.GetWindowRect (hwndCB, rectCB); height -= rectCB.bottom - rectCB.top; @@ -291,7 +292,7 @@ protected void checkSubclass () { if (!isValidSubclass ()) error (SWT.ERROR_INVALID_SUBCLASS); } -int callWindowProc (int hwnd, int msg, int wParam, int lParam) { +int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) { if (handle == 0) return 0; return OS.DefMDIChildProc (hwnd, msg, wParam, lParam); } @@ -427,7 +428,7 @@ void createHandle () { */ if ((state & FOREIGN_HANDLE) == 0) { if (!OS.IsWinCE) { - int hIcon = OS.LoadIcon (0, OS.IDI_APPLICATION); + int /*long*/ hIcon = OS.LoadIcon (0, OS.IDI_APPLICATION); OS.SendMessage (handle, OS.WM_SETICON, OS.ICON_SMALL, hIcon); } } @@ -457,7 +458,7 @@ public void dispose () { super.dispose (); } -Menu findMenu (int hMenu) { +Menu findMenu (int /*long*/ hMenu) { if (menus == null) return null; for (int i=0; i<menus.length; i++) { Menu menu = menus [i]; @@ -513,7 +514,7 @@ public Rectangle getClientArea () { if (OS.IsHPC) { Rectangle rect = super.getClientArea (); if (menuBar != null) { - int hwndCB = menuBar.hwndCB; + int /*long*/ hwndCB = menuBar.hwndCB; int height = OS.CommandBar_Height (hwndCB); rect.y += height; rect.height = Math.max (0, rect.height - height); @@ -961,7 +962,7 @@ void setImages (Image image, Image [] images) { if (smallImage != null) smallImage.dispose (); if (largeImage != null) largeImage.dispose (); smallImage = largeImage = null; - int hSmallIcon = 0, hLargeIcon = 0; + int /*long*/ hSmallIcon = 0, hLargeIcon = 0; Image smallIcon = null, largeIcon = null; if (image != null) { smallIcon = largeIcon = image; @@ -1162,7 +1163,7 @@ public void setMenuBar (Menu menu) { } else { if (menu != null) display.removeBar (menu); menuBar = menu; - int hMenu = menuBar != null ? menuBar.handle: 0; + int /*long*/ hMenu = menuBar != null ? menuBar.handle: 0; OS.SetMenu (handle, hMenu); } destroyAccelerators (); @@ -1206,7 +1207,7 @@ void setParent () { * undocumented and possibly dangerous Windows * feature. */ - int hwndParent = parent.handle; + int /*long*/ hwndParent = parent.handle; display.lockActiveWindow = true; OS.SetParent (handle, hwndParent); if (!OS.IsWindowVisible (hwndParent)) { @@ -1215,7 +1216,7 @@ void setParent () { int bits = OS.GetWindowLong (handle, OS.GWL_STYLE); bits &= ~OS.WS_CHILD; OS.SetWindowLong (handle, OS.GWL_STYLE, bits | OS.WS_POPUP); - OS.SetWindowLong (handle, OS.GWL_ID, 0); + OS.SetWindowLongPtr (handle, OS.GWLP_ID, 0); int flags = OS.SWP_NOSIZE | OS.SWP_NOMOVE | OS.SWP_NOACTIVATE; SetWindowPos (handle, OS.HWND_BOTTOM, 0, 0, 0, 0, flags); display.lockActiveWindow = false; @@ -1278,7 +1279,7 @@ void setSavedFocus (Control control) { void setSystemMenu () { if (OS.IsWinCE) return; - int hMenu = OS.GetSystemMenu (handle, false); + int /*long*/ hMenu = OS.GetSystemMenu (handle, false); if (hMenu == 0) return; int oldCount = OS.GetMenuItemCount (hMenu); if ((style & SWT.RESIZE) == 0) { @@ -1355,7 +1356,7 @@ public void setVisible (boolean visible) { if (isDisposed ()) return; if (OS.IsHPC) { if (menuBar != null) { - int hwndCB = menuBar.hwndCB; + int /*long*/ hwndCB = menuBar.hwndCB; OS.CommandBar_DrawMenuBar (hwndCB, 0); } } @@ -1454,13 +1455,13 @@ boolean translateMenuAccelerator (MSG msg) { boolean translateMDIAccelerator (MSG msg) { if (!(this instanceof Shell)) { Shell shell = getShell (); - int hwndMDIClient = shell.hwndMDIClient; + int /*long*/ hwndMDIClient = shell.hwndMDIClient; if (hwndMDIClient != 0 && OS.TranslateMDISysAccel (hwndMDIClient, msg)) { return true; } if (msg.message == OS.WM_KEYDOWN) { if (OS.GetKeyState (OS.VK_CONTROL) >= 0) return false; - switch (msg.wParam) { + switch ((int)/*64*/(msg.wParam)) { case OS.VK_F4: OS.PostMessage (handle, OS.WM_CLOSE, 0, 0); return true; @@ -1470,7 +1471,7 @@ boolean translateMDIAccelerator (MSG msg) { return false; } if (msg.message == OS.WM_SYSKEYDOWN) { - switch (msg.wParam) { + switch ((int)/*64*/(msg.wParam)) { case OS.VK_F4: OS.PostMessage (shell.handle, OS.WM_CLOSE, 0, 0); return true; @@ -1532,7 +1533,7 @@ int widgetExtStyle () { return bits; } -int widgetParent () { +int /*long*/ widgetParent () { Shell shell = getShell (); return shell.hwndMDIClient (); } @@ -1574,7 +1575,7 @@ int widgetStyle () { return bits; } -int windowProc (int hwnd, int msg, int wParam, int lParam) { +int /*long*/ windowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) { switch (msg) { case Display.SWT_GETACCEL: case Display.SWT_GETACCELCOUNT: @@ -1584,7 +1585,7 @@ int windowProc (int hwnd, int msg, int wParam, int lParam) { return super.windowProc (hwnd, msg, wParam, lParam); } -LRESULT WM_ACTIVATE (int wParam, int lParam) { +LRESULT WM_ACTIVATE (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_ACTIVATE (wParam, lParam); if (result != null) return result; /* @@ -1645,14 +1646,14 @@ LRESULT WM_ACTIVATE (int wParam, int lParam) { return result; } -LRESULT WM_CLOSE (int wParam, int lParam) { +LRESULT WM_CLOSE (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_CLOSE (wParam, lParam); if (result != null) return result; if (isEnabled () && isActive ()) closeWidget (); return LRESULT.ZERO; } -LRESULT WM_HOTKEY (int wParam, int lParam) { +LRESULT WM_HOTKEY (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_HOTKEY (wParam, lParam); if (result != null) return result; if (OS.IsSP) { @@ -1678,13 +1679,13 @@ LRESULT WM_HOTKEY (int wParam, int lParam) { return result; } -LRESULT WM_KILLFOCUS (int wParam, int lParam) { +LRESULT WM_KILLFOCUS (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_KILLFOCUS (wParam, lParam); saveFocus (); return result; } -LRESULT WM_MOVE (int wParam, int lParam) { +LRESULT WM_MOVE (int /*long*/ wParam, int /*long*/ lParam) { if (moved) { Point location = getLocation (); if (location.x == oldX && location.y == oldY) { @@ -1696,7 +1697,7 @@ LRESULT WM_MOVE (int wParam, int lParam) { return super.WM_MOVE (wParam, lParam); } -LRESULT WM_NCACTIVATE (int wParam, int lParam) { +LRESULT WM_NCACTIVATE (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_NCACTIVATE (wParam, lParam); if (result != null) return result; if (wParam == 0) { @@ -1716,13 +1717,13 @@ LRESULT WM_NCACTIVATE (int wParam, int lParam) { } } if (!(this instanceof Shell)) { - int hwndShell = getShell().handle; + int /*long*/ hwndShell = getShell().handle; OS.SendMessage (hwndShell, OS.WM_NCACTIVATE, wParam, lParam); } return result; } -LRESULT WM_QUERYOPEN (int wParam, int lParam) { +LRESULT WM_QUERYOPEN (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_QUERYOPEN (wParam, lParam); if (result != null) return result; sendEvent (SWT.Deiconify); @@ -1730,18 +1731,18 @@ LRESULT WM_QUERYOPEN (int wParam, int lParam) { return result; } -LRESULT WM_SETFOCUS (int wParam, int lParam) { +LRESULT WM_SETFOCUS (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_SETFOCUS (wParam, lParam); if (savedFocus != this) restoreFocus (); return result; } -LRESULT WM_SIZE (int wParam, int lParam) { +LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = null; boolean changed = true; if (resized) { int newWidth = 0, newHeight = 0; - switch (wParam) { + switch ((int)/*64*/wParam) { case OS.SIZE_RESTORED: case OS.SIZE_MAXIMIZED: newWidth = OS.LOWORD (lParam); @@ -1770,11 +1771,11 @@ LRESULT WM_SIZE (int wParam, int lParam) { return result; } -LRESULT WM_SYSCOMMAND (int wParam, int lParam) { +LRESULT WM_SYSCOMMAND (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_SYSCOMMAND (wParam, lParam); if (result != null) return result; if (!(this instanceof Shell)) { - int cmd = wParam & 0xFFF0; + int cmd = (int)/*64*/wParam & 0xFFF0; switch (cmd) { case OS.SC_CLOSE: { OS.PostMessage (handle, OS.WM_CLOSE, 0, 0); @@ -1789,7 +1790,7 @@ LRESULT WM_SYSCOMMAND (int wParam, int lParam) { return result; } -LRESULT WM_WINDOWPOSCHANGING (int wParam, int lParam) { +LRESULT WM_WINDOWPOSCHANGING (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_WINDOWPOSCHANGING (wParam, lParam); if (result != null) return result; if (display.lockActiveWindow) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/DirectoryDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/DirectoryDialog.java index f5c9239a84..81aae1e3e7 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/DirectoryDialog.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/DirectoryDialog.java @@ -80,8 +80,8 @@ public DirectoryDialog (Shell parent, int style) { checkSubclass (); } -int BrowseCallbackProc (int hwnd, int uMsg, int lParam, int lpData) { - switch (uMsg) { +int /*long*/ BrowseCallbackProc (int /*long*/ hwnd, int /*long*/ uMsg, int /*long*/ lParam, int /*long*/ lpData) { + switch ((int)/*64*/uMsg) { case OS.BFFM_INITIALIZED: if (filterPath != null && filterPath.length () != 0) { /* Use the character encoding for the default locale */ @@ -145,14 +145,14 @@ public String getMessage () { public String open () { if (OS.IsWinCE) SWT.error (SWT.ERROR_NOT_IMPLEMENTED); - int hHeap = OS.GetProcessHeap (); + int /*long*/ hHeap = OS.GetProcessHeap (); /* Get the owner HWND for the dialog */ - int hwndOwner = 0; + int /*long*/ hwndOwner = 0; if (parent != null) hwndOwner = parent.handle; /* Copy the message to OS memory */ - int lpszTitle = 0; + int /*long*/ lpszTitle = 0; if (message.length () != 0) { String string = message; if (string.indexOf ('&') != -1) { @@ -175,7 +175,7 @@ public String open () { /* Create the BrowseCallbackProc */ Callback callback = new Callback (this, "BrowseCallbackProc", 4); //$NON-NLS-1$ - int lpfn = callback.getAddress (); + int /*long*/ lpfn = callback.getAddress (); if (lpfn == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS); /* Make the parent shell be temporary modal */ @@ -224,7 +224,7 @@ public String open () { */ boolean oldRunMessages = display.runMessages; if (OS.COMCTL32_MAJOR < 6) display.runMessages = false; - int lpItemIdList = OS.SHBrowseForFolder (lpbi); + int /*long*/ lpItemIdList = OS.SHBrowseForFolder (lpbi); if (OS.COMCTL32_MAJOR < 6) display.runMessages = oldRunMessages; OS.SetErrorMode (oldErrorMode); @@ -250,7 +250,7 @@ public String open () { if (lpszTitle != 0) OS.HeapFree (hHeap, 0, lpszTitle); /* Free the pointer to the ITEMIDLIST */ - int [] ppMalloc = new int [1]; + int /*long*/ [] ppMalloc = new int /*long*/ [1]; if (OS.SHGetMalloc (ppMalloc) == OS.S_OK) { /* void Free (struct IMalloc *this, void *pv); */ OS.VtblCall (5, ppMalloc [0], lpItemIdList); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java index 88ee10dc6c..0d79b3c95f 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java @@ -109,7 +109,8 @@ public class Display extends Device { /* Windows and Events */ Event [] eventQueue; Callback windowCallback; - int windowProc, threadId; + int /*long*/ windowProc; + int threadId; TCHAR windowClass, windowShadowClass; static int WindowClassCount; static final String WindowName = "SWT_Window"; //$NON-NLS-1$ @@ -117,9 +118,10 @@ public class Display extends Device { EventTable eventTable, filterTable; /* Widget Table */ + int freeSlot; int [] indexTable; Control lastControl, lastGetControl; - int freeSlot, lastHwnd, lastGetHwnd; + int /*long*/ lastHwnd, lastGetHwnd; Control [] controlTable; static final int GROW_SIZE = 1024; static final int SWT_OBJECT_INDEX; @@ -143,7 +145,7 @@ public class Display extends Device { } /* XP Themes */ - int hButtonTheme, hEditTheme, hExplorerBarTheme, hScrollBarTheme, hTabTheme; + int /*long*/ hButtonTheme, hEditTheme, hExplorerBarTheme, hScrollBarTheme, hTabTheme; static final char [] BUTTON = new char [] {'B', 'U', 'T', 'T', 'O', 'N', 0}; static final char [] EDIT = new char [] {'E', 'D', 'I', 'T', 0}; static final char [] EXPLORER = new char [] {'E', 'X', 'P', 'L', 'O', 'R', 'E', 'R', 0}; @@ -172,18 +174,18 @@ public class Display extends Device { /* Filter Hook */ Callback msgFilterCallback; - int msgFilterProc, filterHook; + int /*long*/ msgFilterProc, filterHook; MSG hookMsg = new MSG (); boolean runDragDrop = true; /* Idle Hook */ Callback foregroundIdleCallback; - int foregroundIdleProc, idleHook; + int /*long*/ foregroundIdleProc, idleHook; /* Message Hook and Embedding */ boolean ignoreNextKey; Callback getMsgCallback, embeddedCallback; - int getMsgProc, msgHook, embeddedHwnd, embeddedProc; + int /*long*/ getMsgProc, msgHook, embeddedHwnd, embeddedProc; static final String AWT_WINDOW_CLASS = "SunAwtWindow"; static final short [] ACCENTS = new short [] {'~', '`', '\'', '^', '"'}; @@ -201,15 +203,16 @@ public class Display extends Device { int nextTrayId; /* Timers */ - int [] timerIds; + int /*long*/ [] timerIds; Runnable [] timerList; - int nextTimerId = SETTINGS_ID + 1; - static final int SETTINGS_ID = 100; + int /*long*/ nextTimerId = SETTINGS_ID + 1; + static final int /*long*/ SETTINGS_ID = 100; static final int SETTINGS_DELAY = 2000; /* Keyboard and Mouse */ RECT clickRect; - int clickCount, lastTime, lastButton, lastClickHwnd; + int clickCount, lastTime, lastButton; + int /*long*/ lastClickHwnd; int lastKey, lastAscii, lastMouse; boolean lastVirtual, lastNull, lastDead; byte [] keyboard = new byte [256]; @@ -226,7 +229,7 @@ public class Display extends Device { /* Message Only Window */ Callback messageCallback; - int hwndMessage, messageProc; + int /*long*/ hwndMessage, messageProc; /* System Resources */ LOGFONT lfSystemFont; @@ -240,7 +243,7 @@ public class Display extends Device { ImageList[] imageList, toolImageList, toolHotImageList, toolDisabledImageList; /* Custom Colors for ChooseColor */ - int lpCustColors; + int /*long*/ lpCustColors; /* Sort Indicators */ Image upArrow, downArrow; @@ -453,7 +456,7 @@ void addBar (Menu menu) { bars [index] = menu; } -void addControl (int handle, Control control) { +void addControl (int /*long*/ handle, Control control) { if (handle == 0) return; if (freeSlot == -1) { int length = (freeSlot = indexTable.length) + GROW_SIZE; @@ -469,7 +472,7 @@ void addControl (int handle, Control control) { if (USE_PROPERTY) { OS.SetProp (handle, SWT_OBJECT_INDEX, freeSlot + 1); } else { - OS.SetWindowLong (handle, OS.GWL_USERDATA, freeSlot + 1); + OS.SetWindowLongPtr (handle, OS.GWLP_USERDATA, freeSlot + 1); } int oldSlot = freeSlot; freeSlot = indexTable [oldSlot]; @@ -741,8 +744,9 @@ protected void create (DeviceData data) { void createDisplay (DeviceData data) { } -static int create32bitDIB (Image image) { - int transparentPixel = -1, alpha = -1, hMask = 0, hBitmap = 0; +static int /*long*/ create32bitDIB (Image image) { + int transparentPixel = -1, alpha = -1; + int /*long*/ hMask = 0, hBitmap = 0; byte[] alphaData = null; switch (image.type) { case SWT.ICON: @@ -763,10 +767,10 @@ static int create32bitDIB (Image image) { OS.GetObject (hBitmap, BITMAP.sizeof, bm); int imgWidth = bm.bmWidth; int imgHeight = bm.bmHeight; - int hDC = OS.GetDC (0); - int srcHdc = OS.CreateCompatibleDC (hDC); - int oldSrcBitmap = OS.SelectObject (srcHdc, hBitmap); - int memHdc = OS.CreateCompatibleDC (hDC); + int /*long*/ hDC = OS.GetDC (0); + int /*long*/ srcHdc = OS.CreateCompatibleDC (hDC); + int /*long*/ oldSrcBitmap = OS.SelectObject (srcHdc, hBitmap); + int /*long*/ memHdc = OS.CreateCompatibleDC (hDC); BITMAPINFOHEADER bmiHeader = new BITMAPINFOHEADER (); bmiHeader.biSize = BITMAPINFOHEADER.sizeof; bmiHeader.biWidth = imgWidth; @@ -776,10 +780,10 @@ static int create32bitDIB (Image image) { bmiHeader.biCompression = OS.BI_RGB; byte [] bmi = new byte [BITMAPINFOHEADER.sizeof]; OS.MoveMemory (bmi, bmiHeader, BITMAPINFOHEADER.sizeof); - int [] pBits = new int [1]; - int memDib = OS.CreateDIBSection (0, bmi, OS.DIB_RGB_COLORS, pBits, 0, 0); + int /*long*/ [] pBits = new int /*long*/ [1]; + int /*long*/ memDib = OS.CreateDIBSection (0, bmi, OS.DIB_RGB_COLORS, pBits, 0, 0); if (memDib == 0) SWT.error (SWT.ERROR_NO_HANDLES); - int oldMemBitmap = OS.SelectObject (memHdc, memDib); + int /*long*/ oldMemBitmap = OS.SelectObject (memHdc, memDib); BITMAP dibBM = new BITMAP (); OS.GetObject (memDib, BITMAP.sizeof, dibBM); int sizeInBytes = dibBM.bmWidthBytes * dibBM.bmHeight; @@ -871,16 +875,15 @@ static int create32bitDIB (Image image) { if (hMask != 0) OS.DeleteObject (hMask); return memDib; } - -static int create32bitDIB (int hBitmap, int alpha, byte [] alphaData, int transparentPixel) { +static int /*long*/ create32bitDIB (int /*long*/ hBitmap, int alpha, byte [] alphaData, int transparentPixel) { BITMAP bm = new BITMAP (); OS.GetObject (hBitmap, BITMAP.sizeof, bm); int imgWidth = bm.bmWidth; int imgHeight = bm.bmHeight; - int hDC = OS.GetDC (0); - int srcHdc = OS.CreateCompatibleDC (hDC); - int oldSrcBitmap = OS.SelectObject (srcHdc, hBitmap); - int memHdc = OS.CreateCompatibleDC (hDC); + int /*long*/ hDC = OS.GetDC (0); + int /*long*/ srcHdc = OS.CreateCompatibleDC (hDC); + int /*long*/ oldSrcBitmap = OS.SelectObject (srcHdc, hBitmap); + int /*long*/ memHdc = OS.CreateCompatibleDC (hDC); BITMAPINFOHEADER bmiHeader = new BITMAPINFOHEADER (); bmiHeader.biSize = BITMAPINFOHEADER.sizeof; bmiHeader.biWidth = imgWidth; @@ -890,10 +893,10 @@ static int create32bitDIB (int hBitmap, int alpha, byte [] alphaData, int transp bmiHeader.biCompression = OS.BI_RGB; byte [] bmi = new byte [BITMAPINFOHEADER.sizeof]; OS.MoveMemory (bmi, bmiHeader, BITMAPINFOHEADER.sizeof); - int [] pBits = new int [1]; - int memDib = OS.CreateDIBSection (0, bmi, OS.DIB_RGB_COLORS, pBits, 0, 0); + int /*long*/ [] pBits = new int /*long*/ [1]; + int /*long*/ memDib = OS.CreateDIBSection (0, bmi, OS.DIB_RGB_COLORS, pBits, 0, 0); if (memDib == 0) SWT.error (SWT.ERROR_NO_HANDLES); - int oldMemBitmap = OS.SelectObject (memHdc, memDib); + int /*long*/ oldMemBitmap = OS.SelectObject (memHdc, memDib); BITMAP dibBM = new BITMAP (); OS.GetObject (memDib, BITMAP.sizeof, dibBM); int sizeInBytes = dibBM.bmWidthBytes * dibBM.bmHeight; @@ -971,9 +974,9 @@ static Image createIcon (Image image) { return new Image (device, data, mask); } int width = data.width, height = data.height; - int hMask, hBitmap; - int hDC = device.internal_new_GC (null); - int dstHdc = OS.CreateCompatibleDC (hDC), oldDstBitmap; + int /*long*/ hMask, hBitmap; + int /*long*/ hDC = device.internal_new_GC (null); + int /*long*/ dstHdc = OS.CreateCompatibleDC (hDC), oldDstBitmap; if (!OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (5, 1)) { hBitmap = Display.create32bitDIB (image.handle, data.alpha, data.alphaData, data.transparentPixel); hMask = OS.CreateBitmap (width, height, 1, 1, null); @@ -984,8 +987,8 @@ static Image createIcon (Image image) { /* Icons need black pixels where the mask is transparent */ hBitmap = OS.CreateCompatibleBitmap (hDC, width, height); oldDstBitmap = OS.SelectObject (dstHdc, hBitmap); - int srcHdc = OS.CreateCompatibleDC (hDC); - int oldSrcBitmap = OS.SelectObject (srcHdc, image.handle); + int /*long*/ srcHdc = OS.CreateCompatibleDC (hDC); + int /*long*/ oldSrcBitmap = OS.SelectObject (srcHdc, image.handle); OS.PatBlt (dstHdc, 0, 0, width, height, OS.BLACKNESS); OS.BitBlt (dstHdc, 0, 0, width, height, srcHdc, 0, 0, OS.SRCINVERT); OS.SelectObject (srcHdc, hMask); @@ -1002,14 +1005,14 @@ static Image createIcon (Image image) { info.fIcon = true; info.hbmColor = hBitmap; info.hbmMask = hMask; - int hIcon = OS.CreateIconIndirect (info); + int /*long*/ hIcon = OS.CreateIconIndirect (info); if (hIcon == 0) SWT.error(SWT.ERROR_NO_HANDLES); OS.DeleteObject (hBitmap); OS.DeleteObject (hMask); return Image.win32_new (device, SWT.ICON, hIcon); } -static int createMaskFromAlpha (ImageData data, int destWidth, int destHeight) { +static int /*long*/ createMaskFromAlpha (ImageData data, int destWidth, int destHeight) { int srcWidth = data.width; int srcHeight = data.height; ImageData mask = ImageData.internal_new (srcWidth, srcHeight, 1, @@ -1021,13 +1024,13 @@ static int createMaskFromAlpha (ImageData data, int destWidth, int destHeight) { mask.setPixel (x, y, (data.alphaData [ap++] & 0xff) <= 127 ? 1 : 0); } } - int hMask = OS.CreateBitmap (srcWidth, srcHeight, 1, 1, mask.data); + int /*long*/ hMask = OS.CreateBitmap (srcWidth, srcHeight, 1, 1, mask.data); if (srcWidth != destWidth || srcHeight != destHeight) { - int hdc = OS.GetDC (0); - int hdc1 = OS.CreateCompatibleDC (hdc); + int /*long*/ hdc = OS.GetDC (0); + int /*long*/ hdc1 = OS.CreateCompatibleDC (hdc); OS.SelectObject (hdc1, hMask); - int hdc2 = OS.CreateCompatibleDC (hdc); - int hMask2 = OS.CreateBitmap (destWidth, destHeight, 1, 1, null); + int /*long*/ hdc2 = OS.CreateCompatibleDC (hdc); + int /*long*/ hMask2 = OS.CreateBitmap (destWidth, destHeight, 1, 1, null); OS.SelectObject (hdc2, hMask2); if (!OS.IsWinCE) OS.SetStretchBltMode(hdc2, OS.COLORONCOLOR); OS.StretchBlt (hdc2, 0, 0, destWidth, destHeight, hdc1, 0, 0, srcWidth, srcHeight, OS.SRCCOPY); @@ -1102,14 +1105,14 @@ void drawMenuBars () { bars = null; } -int embeddedProc (int hwnd, int msg, int wParam, int lParam) { - switch (msg) { +int /*long*/ embeddedProc (int /*long*/ hwnd, int /*long*/ msg, int /*long*/ wParam, int /*long*/ lParam) { + switch ((int)/*64*/msg) { case SWT_KEYMSG: { MSG keyMsg = new MSG (); OS.MoveMemory (keyMsg, lParam, MSG.sizeof); OS.TranslateMessage (keyMsg); OS.DispatchMessage (keyMsg); - int hHeap = OS.GetProcessHeap (); + int /*long*/ hHeap = OS.GetProcessHeap (); OS.HeapFree (hHeap, 0, lParam); break; } @@ -1122,7 +1125,7 @@ int embeddedProc (int hwnd, int msg, int wParam, int lParam) { break; } } - return OS.DefWindowProc (hwnd, msg, wParam, lParam); + return OS.DefWindowProc (hwnd, (int)/*64*/msg, wParam, lParam); } /** @@ -1162,9 +1165,9 @@ boolean filterMessage (MSG msg) { return false; } -Control findControl (int handle) { +Control findControl (int /*long*/ handle) { if (handle == 0) return null; - int hwndOwner = 0; + int /*long*/ hwndOwner = 0; do { Control control = getControl (handle); if (control != null) return control; @@ -1192,7 +1195,7 @@ Control findControl (int handle) { * <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li> * </ul> */ -public Widget findWidget (int handle) { +public Widget findWidget (int /*long*/ handle) { checkDevice (); return getControl (handle); } @@ -1219,8 +1222,9 @@ public Widget findWidget (int handle) { * * @since 3.1 */ -public Widget findWidget (int handle, int id) { +public Widget findWidget (int /*long*/ handle, int /*long*/ id) { checkDevice (); + //TODO - should ids be long Control control = getControl (handle); return control != null ? control.findItem (id) : null; } @@ -1242,15 +1246,16 @@ public Widget findWidget (int handle, int id) { * * @since 3.3 */ -public Widget findWidget (Widget widget, int id) { +public Widget findWidget (Widget widget, int /*long*/ id) { checkDevice (); + //TODO - should ids be long if (widget instanceof Control) { return findWidget (((Control) widget).handle, id); } return null; } -int foregroundIdleProc (int code, int wParam, int lParam) { +int /*long*/ foregroundIdleProc (int /*long*/ code, int /*long*/ wParam, int /*long*/ lParam) { if (runMessages) { if (code >= 0) { if (getMessageCount () != 0) { @@ -1261,7 +1266,7 @@ int foregroundIdleProc (int code, int wParam, int lParam) { } } } - return OS.CallNextHookEx (idleHook, code, wParam, lParam); + return OS.CallNextHookEx (idleHook, (int)/*64*/code, wParam, lParam); } /** @@ -1337,7 +1342,7 @@ public static synchronized Display getCurrent () { return findDisplay (Thread.currentThread ()); } -int getClickCount (int type, int button, int hwnd, int lParam) { +int getClickCount (int type, int button, int /*long*/ hwnd, int /*long*/ lParam) { switch (type) { case SWT.MouseDown: int doubleClick = OS.GetDoubleClickTime (); @@ -1395,7 +1400,7 @@ public Rectangle getClientArea () { return new Rectangle (x, y, width, height); } -Control getControl (int handle) { +Control getControl (int /*long*/ handle) { if (handle == 0) return null; if (lastControl != null && lastHwnd == handle) { return lastControl; @@ -1405,9 +1410,9 @@ Control getControl (int handle) { } int index; if (USE_PROPERTY) { - index = OS.GetProp (handle, SWT_OBJECT_INDEX) - 1; + index = (int)/*64*/OS.GetProp (handle, SWT_OBJECT_INDEX) - 1; } else { - index = OS.GetWindowLong (handle, OS.GWL_USERDATA) - 1; + index = (int)/*64*/OS.GetWindowLongPtr (handle, OS.GWLP_USERDATA) - 1; } if (0 <= index && index < controlTable.length) { Control control = controlTable [index]; @@ -1693,7 +1698,7 @@ public int getIconDepth () { /* Use the character encoding for the default locale */ TCHAR buffer1 = new TCHAR (0, "Control Panel\\Desktop\\WindowMetrics", true); //$NON-NLS-1$ - int [] phkResult = new int [1]; + int /*long*/ [] phkResult = new int /*long*/ [1]; int result = OS.RegOpenKeyEx (OS.HKEY_CURRENT_USER, buffer1, 0, OS.KEY_READ, phkResult); if (result != 0) return 4; int depth = 4; @@ -1861,9 +1866,10 @@ int getLastEventTime () { return OS.IsWinCE ? OS.GetTickCount () : OS.GetMessageTime (); } -MenuItem getMenuItem (int id) { +//TODO - should ids be long +MenuItem getMenuItem (int /*long*/ _id) { if (items == null) return null; - id = id - ID_START; + int id = (int)/*64*/_id - ID_START; if (0 <= id && id < items.length) return items [id]; return null; } @@ -1902,7 +1908,7 @@ public Monitor [] getMonitors () { } monitors = new Monitor [4]; Callback callback = new Callback (this, "monitorEnumProc", 4); //$NON-NLS-1$ - int lpfnEnum = callback.getAddress (); + int /*long*/ lpfnEnum = callback.getAddress (); if (lpfnEnum == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS); OS.EnumDisplayMonitors (0, null, lpfnEnum, 0); callback.dispose (); @@ -1913,9 +1919,9 @@ public Monitor [] getMonitors () { return result; } -int getMsgProc (int code, int wParam, int lParam) { +int /*long*/ getMsgProc (int /*long*/ code, int /*long*/ wParam, int /*long*/ lParam) { if (embeddedHwnd == 0) { - int hInstance = OS.GetModuleHandle (null); + int /*long*/ hInstance = OS.GetModuleHandle (null); embeddedHwnd = OS.CreateWindowEx (0, windowClass, null, @@ -1928,7 +1934,7 @@ int getMsgProc (int code, int wParam, int lParam) { embeddedCallback = new Callback (this, "embeddedProc", 4); //$NON-NLS-1$ embeddedProc = embeddedCallback.getAddress (); if (embeddedProc == 0) error (SWT.ERROR_NO_MORE_CALLBACKS); - OS.SetWindowLong (embeddedHwnd, OS.GWL_WNDPROC, embeddedProc); + OS.SetWindowLongPtr (embeddedHwnd, OS.GWLP_WNDPROC, embeddedProc); } if (code >= 0 && wParam != OS.PM_NOREMOVE) { MSG msg = new MSG (); @@ -1940,8 +1946,8 @@ int getMsgProc (int code, int wParam, int lParam) { case OS.WM_SYSKEYUP: { Control control = findControl (msg.hwnd); if (control != null) { - int hHeap = OS.GetProcessHeap (); - int keyMsg = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, MSG.sizeof); + int /*long*/ hHeap = OS.GetProcessHeap (); + int /*long*/ keyMsg = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, MSG.sizeof); OS.MoveMemory (keyMsg, msg, MSG.sizeof); OS.PostMessage (hwndMessage, SWT_KEYMSG, wParam, keyMsg); msg.message = OS.WM_NULL; @@ -1950,7 +1956,7 @@ int getMsgProc (int code, int wParam, int lParam) { } } } - return OS.CallNextHookEx (msgHook, code, wParam, lParam); + return OS.CallNextHookEx (msgHook, (int)/*64*/code, wParam, lParam); } /** @@ -1978,7 +1984,7 @@ public Monitor getPrimaryMonitor () { } monitors = new Monitor [4]; Callback callback = new Callback (this, "monitorEnumProc", 4); //$NON-NLS-1$ - int lpfnEnum = callback.getAddress (); + int /*long*/ lpfnEnum = callback.getAddress (); if (lpfnEnum == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS); OS.EnumDisplayMonitors (0, null, lpfnEnum, 0); callback.dispose (); @@ -2234,7 +2240,7 @@ public Cursor getSystemCursor (int id) { public Font getSystemFont () { checkDevice (); if (systemFont != null) return systemFont; - int hFont = 0; + int /*long*/ hFont = 0; if (!OS.IsWinCE) { NONCLIENTMETRICS info = OS.IsUnicode ? (NONCLIENTMETRICS) new NONCLIENTMETRICSW () : new NONCLIENTMETRICSA (); info.cbSize = NONCLIENTMETRICS.sizeof; @@ -2280,23 +2286,23 @@ public Image getSystemImage (int id) { switch (id) { case SWT.ICON_ERROR: { if (errorImage != null) return errorImage; - int hIcon = OS.LoadImage (0, OS.OIC_HAND, OS.IMAGE_ICON, 0, 0, OS.LR_SHARED); + int /*long*/ hIcon = OS.LoadImage (0, OS.OIC_HAND, OS.IMAGE_ICON, 0, 0, OS.LR_SHARED); return errorImage = Image.win32_new (this, SWT.ICON, hIcon); } case SWT.ICON_WORKING: case SWT.ICON_INFORMATION: { if (infoImage != null) return infoImage; - int hIcon = OS.LoadImage (0, OS.OIC_INFORMATION, OS.IMAGE_ICON, 0, 0, OS.LR_SHARED); + int /*long*/ hIcon = OS.LoadImage (0, OS.OIC_INFORMATION, OS.IMAGE_ICON, 0, 0, OS.LR_SHARED); return infoImage = Image.win32_new (this, SWT.ICON, hIcon); } case SWT.ICON_QUESTION: { if (questionImage != null) return questionImage; - int hIcon = OS.LoadImage (0, OS.OIC_QUES, OS.IMAGE_ICON, 0, 0, OS.LR_SHARED); + int /*long*/ hIcon = OS.LoadImage (0, OS.OIC_QUES, OS.IMAGE_ICON, 0, 0, OS.LR_SHARED); return questionImage = Image.win32_new (this, SWT.ICON, hIcon); } case SWT.ICON_WARNING: { if (warningIcon != null) return warningIcon; - int hIcon = OS.LoadImage (0, OS.OIC_BANG, OS.IMAGE_ICON, 0, 0, OS.LR_SHARED); + int /*long*/ hIcon = OS.LoadImage (0, OS.OIC_BANG, OS.IMAGE_ICON, 0, 0, OS.LR_SHARED); return warningIcon = Image.win32_new (this, SWT.ICON, hIcon); } } @@ -2336,27 +2342,27 @@ public Thread getThread () { return thread; } -int hButtonTheme () { +int /*long*/ hButtonTheme () { if (hButtonTheme != 0) return hButtonTheme; return hButtonTheme = OS.OpenThemeData (hwndMessage, BUTTON); } -int hEditTheme () { +int /*long*/ hEditTheme () { if (hEditTheme != 0) return hEditTheme; return hEditTheme = OS.OpenThemeData (hwndMessage, EDIT); } -int hExplorerBarTheme () { +int /*long*/ hExplorerBarTheme () { if (hExplorerBarTheme != 0) return hExplorerBarTheme; return hExplorerBarTheme = OS.OpenThemeData (hwndMessage, EXPLORERBAR); } -int hScrollBarTheme () { +int /*long*/ hScrollBarTheme () { if (hScrollBarTheme != 0) return hScrollBarTheme; return hScrollBarTheme = OS.OpenThemeData (hwndMessage, SCROLLBAR); } -int hTabTheme () { +int /*long*/ hTabTheme () { if (hTabTheme != 0) return hTabTheme; return hTabTheme = OS.OpenThemeData (hwndMessage, TAB); } @@ -2381,9 +2387,9 @@ int hTabTheme () { * <li>ERROR_NO_HANDLES if a handle could not be obtained for gc creation</li> * </ul> */ -public int internal_new_GC (GCData data) { +public int /*long*/ internal_new_GC (GCData data) { if (isDisposed()) SWT.error(SWT.ERROR_DEVICE_DISPOSED); - int hDC = OS.GetDC (0); + int /*long*/ hDC = OS.GetDC (0); if (hDC == 0) SWT.error (SWT.ERROR_NO_HANDLES); if (data != null) { int mask = SWT.LEFT_TO_RIGHT | SWT.RIGHT_TO_LEFT; @@ -2424,8 +2430,8 @@ protected void init () { WindowClassCount++; /* Register the SWT window class */ - int hHeap = OS.GetProcessHeap (); - int hInstance = OS.GetModuleHandle (null); + int /*long*/ hHeap = OS.GetProcessHeap (); + int /*long*/ hInstance = OS.GetModuleHandle (null); WNDCLASS lpWndClass = new WNDCLASS (); lpWndClass.hInstance = hInstance; lpWndClass.lpfnWndProc = windowProc; @@ -2458,7 +2464,7 @@ protected void init () { messageCallback = new Callback (this, "messageProc", 4); //$NON-NLS-1$ messageProc = messageCallback.getAddress (); if (messageProc == 0) error (SWT.ERROR_NO_MORE_CALLBACKS); - OS.SetWindowLong (hwndMessage, OS.GWL_WNDPROC, messageProc); + OS.SetWindowLongPtr (hwndMessage, OS.GWLP_WNDPROC, messageProc); /* Create the filter hook */ if (!OS.IsWinCE) { @@ -2508,7 +2514,7 @@ protected void init () { * @param hDC the platform specific GC handle * @param data the platform specific GC data */ -public void internal_dispose_GC (int hDC, GCData data) { +public void internal_dispose_GC (int /*long*/ hDC, GCData data) { OS.ReleaseDC (0, hDC); } @@ -2518,7 +2524,7 @@ boolean isXMouseActive () { */ boolean xMouseActive = false; TCHAR key = new TCHAR (0, "Control Panel\\Desktop", true); //$NON-NLS-1$ - int [] phKey = new int [1]; + int /*long*/ [] phKey = new int /*long*/ [1]; int result = OS.RegOpenKeyEx (OS.HKEY_CURRENT_USER, key, 0, OS.KEY_READ, phKey); if (result == 0) { TCHAR lpValueName = new TCHAR (0, "UserPreferencesMask", true); //$NON-NLS-1$ @@ -2617,8 +2623,8 @@ public Point map (Control from, Control to, int x, int y) { if (from != null && from.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT); if (to != null && to.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT); if (from == to) return new Point (x, y); - int hwndFrom = from != null ? from.handle : 0; - int hwndTo = to != null ? to.handle : 0; + int /*long*/ hwndFrom = from != null ? from.handle : 0; + int /*long*/ hwndTo = to != null ? to.handle : 0; POINT point = new POINT (); point.x = x; point.y = y; @@ -2711,8 +2717,8 @@ public Rectangle map (Control from, Control to, int x, int y, int width, int hei if (from != null && from.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT); if (to != null && to.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT); if (from == to) return new Rectangle (x, y, width, height); - int hwndFrom = from != null ? from.handle : 0; - int hwndTo = to != null ? to.handle : 0; + int /*long*/ hwndFrom = from != null ? from.handle : 0; + int /*long*/ hwndTo = to != null ? to.handle : 0; RECT rect = new RECT (); rect.left = x; rect.top = y; @@ -2763,8 +2769,8 @@ static char mbcsToWcs (int ch, int codePage) { return unicode [0]; } -int messageProc (int hwnd, int msg, int wParam, int lParam) { - switch (msg) { +int /*long*/ messageProc (int /*long*/ hwnd, int /*long*/ msg, int /*long*/ wParam, int /*long*/ lParam) { + switch ((int)/*64*/msg) { case SWT_RUNASYNC: { if (runMessagesInIdle) runAsyncMessages (false); break; @@ -2789,7 +2795,7 @@ int messageProc (int hwnd, int msg, int wParam, int lParam) { case OS.WM_KEYDOWN: case OS.WM_SYSKEYDOWN: { if (!OS.IsWinCE) { - switch (keyMsg.wParam) { + switch ((int)/*64*/keyMsg.wParam) { case OS.VK_SHIFT: case OS.VK_MENU: case OS.VK_CONTROL: @@ -2803,7 +2809,7 @@ int messageProc (int hwnd, int msg, int wParam, int lParam) { * Windows NT is bit 32 while the high bit on Windows 95 is bit 16. * They should both be bit 32. The fix is to test the right bit. */ - int mapKey = OS.MapVirtualKey (keyMsg.wParam, 2); + int mapKey = OS.MapVirtualKey ((int)/*64*/keyMsg.wParam, 2); if (mapKey != 0) { accentKey = (mapKey & (OS.IsWinNT ? 0x80000000 : 0x8000)) != 0; if (!accentKey) { @@ -2841,7 +2847,7 @@ int messageProc (int hwnd, int msg, int wParam, int lParam) { switch (keyMsg.message) { case OS.WM_KEYDOWN: case OS.WM_SYSKEYDOWN: { - switch (keyMsg.wParam) { + switch ((int)/*64*/keyMsg.wParam) { case OS.VK_SHIFT: case OS.VK_MENU: case OS.VK_CONTROL: @@ -2858,7 +2864,7 @@ int messageProc (int hwnd, int msg, int wParam, int lParam) { } } if (consumed) { - int hHeap = OS.GetProcessHeap (); + int /*long*/ hHeap = OS.GetProcessHeap (); OS.HeapFree (hHeap, 0, lParam); } else { OS.PostMessage (embeddedHwnd, SWT_KEYMSG, wParam, lParam); @@ -2871,7 +2877,7 @@ int messageProc (int hwnd, int msg, int wParam, int lParam) { for (int i=0; i<items.length; i++) { TrayItem item = items [i]; if (item != null && item.id == wParam) { - return item.messageProc (hwnd, msg, wParam, lParam); + return item.messageProc (hwnd, (int)/*64*/msg, wParam, lParam); } } } @@ -2902,12 +2908,12 @@ int messageProc (int hwnd, int msg, int wParam, int lParam) { if (modalDialogShell != null && modalDialogShell.isDisposed ()) modalDialogShell = null; Shell modal = modalDialogShell != null ? modalDialogShell : getModalShell (); if (modal != null) { - int hwndModal = modal.handle; + int /*long*/ hwndModal = modal.handle; if (OS.IsWindowEnabled (hwndModal)) { modal.bringToTop (); if (modal.isDisposed ()) break; } - int hwndPopup = OS.GetLastActivePopup (hwndModal); + int /*long*/ hwndPopup = OS.GetLastActivePopup (hwndModal); if (hwndPopup != 0 && hwndPopup != modal.handle) { if (getControl (hwndPopup) == null) { if (OS.IsWindowEnabled (hwndPopup)) { @@ -2939,7 +2945,7 @@ int messageProc (int hwnd, int msg, int wParam, int lParam) { break; } case OS.WM_SETTINGCHANGE: { - switch (wParam) { + switch ((int)/*64*/wParam) { case 0: case 1: case OS.SPI_SETHIGHCONTRAST: @@ -2968,7 +2974,7 @@ int messageProc (int hwnd, int msg, int wParam, int lParam) { break; } default: { - if (msg == SWT_TASKBARCREATED) { + if ((int)/*64*/msg == SWT_TASKBARCREATED) { if (tray != null) { TrayItem [] items = tray.items; for (int i=0; i<items.length; i++) { @@ -2979,10 +2985,10 @@ int messageProc (int hwnd, int msg, int wParam, int lParam) { } } } - return OS.DefWindowProc (hwnd, msg, wParam, lParam); + return OS.DefWindowProc (hwnd, (int)/*64*/msg, wParam, lParam); } -int monitorEnumProc (int hmonitor, int hdc, int lprcMonitor, int dwData) { +int /*long*/ monitorEnumProc (int /*long*/ hmonitor, int /*long*/ hdc, int /*long*/ lprcMonitor, int /*long*/ dwData) { if (monitorCount >= monitors.length) { Monitor[] newMonitors = new Monitor [monitors.length + 4]; System.arraycopy (monitors, 0, newMonitors, 0, monitors.length); @@ -3005,8 +3011,8 @@ int monitorEnumProc (int hmonitor, int hdc, int lprcMonitor, int dwData) { return 1; } -int msgFilterProc (int code, int wParam, int lParam) { - switch (code) { +int /*long*/ msgFilterProc (int /*long*/ code, int /*long*/ wParam, int /*long*/ lParam) { + switch ((int)/*64*/code) { case OS.MSGF_COMMCTRL_BEGINDRAG: { if (!runDragDrop) { OS.MoveMemory (hookMsg, lParam, MSG.sizeof); @@ -3044,7 +3050,7 @@ int msgFilterProc (int code, int wParam, int lParam) { break; } } - return OS.CallNextHookEx (filterHook, code, wParam, lParam); + return OS.CallNextHookEx (filterHook, (int)/*64*/code, wParam, lParam); } int numpadKey (int key) { @@ -3157,10 +3163,11 @@ public boolean post (Event event) { } } inputs.dwFlags = type == SWT.KeyUp ? OS.KEYEVENTF_KEYUP : 0; - int hHeap = OS.GetProcessHeap (); - int pInputs = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, INPUT.sizeof); + int /*long*/ hHeap = OS.GetProcessHeap (); + int /*long*/ pInputs = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, INPUT.sizeof); OS.MoveMemory(pInputs, new int[] {OS.INPUT_KEYBOARD}, 4); - OS.MoveMemory (pInputs + 4, inputs, KEYBDINPUT.sizeof); + //TODO - DWORD type of INPUT structure aligned to 8 bytes on 64 bit + OS.MoveMemory (pInputs + OS.PTR_SIZEOF, inputs, KEYBDINPUT.sizeof); boolean result = OS.SendInput (1, pInputs, INPUT.sizeof) != 0; OS.HeapFree (hHeap, 0, pInputs); return result; @@ -3221,10 +3228,11 @@ public boolean post (Event event) { } } } - int hHeap = OS.GetProcessHeap (); - int pInputs = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, INPUT.sizeof); + int /*long*/ hHeap = OS.GetProcessHeap (); + int /*long*/ pInputs = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, INPUT.sizeof); OS.MoveMemory(pInputs, new int[] {OS.INPUT_MOUSE}, 4); - OS.MoveMemory (pInputs + 4, inputs, MOUSEINPUT.sizeof); + //TODO - DWORD type of INPUT structure aligned to 8 bytes on 64 bit + OS.MoveMemory (pInputs + OS.PTR_SIZEOF, inputs, MOUSEINPUT.sizeof); boolean result = OS.SendInput (1, pInputs, INPUT.sizeof) != 0; OS.HeapFree (hHeap, 0, pInputs); return result; @@ -3401,8 +3409,8 @@ void releaseDisplay () { messageProc = 0; /* Unregister the SWT window class */ - int hHeap = OS.GetProcessHeap (); - int hInstance = OS.GetModuleHandle (null); + int /*long*/ hHeap = OS.GetProcessHeap (); + int /*long*/ hInstance = OS.GetModuleHandle (null); OS.UnregisterClass (windowClass, hInstance); /* Unregister the SWT drop shadow window class */ @@ -3617,15 +3625,15 @@ void removeBar (Menu menu) { } } -Control removeControl (int handle) { +Control removeControl (int /*long*/ handle) { if (handle == 0) return null; lastControl = lastGetControl = null; Control control = null; int index; if (USE_PROPERTY) { - index = OS.RemoveProp (handle, SWT_OBJECT_INDEX) - 1; + index = (int)/*64*/OS.RemoveProp (handle, SWT_OBJECT_INDEX) - 1; } else { - index = OS.GetWindowLong (handle, OS.GWL_USERDATA) - 1; + index = (int)/*64*/OS.GetWindowLongPtr (handle, OS.GWLP_USERDATA) - 1; } if (0 <= index && index < controlTable.length) { control = controlTable [index]; @@ -3633,7 +3641,7 @@ Control removeControl (int handle) { indexTable [index] = freeSlot; freeSlot = index; if (!USE_PROPERTY) { - OS.SetWindowLong (handle, OS.GWL_USERDATA, 0); + OS.SetWindowLongPtr (handle, OS.GWLP_USERDATA, 0); } } return control; @@ -3732,7 +3740,7 @@ void runSettings () { } } -boolean runTimer (int id) { +boolean runTimer (int /*long*/ id) { if (timerList != null && timerIds != null) { int index = 0; while (index <timerIds.length) { @@ -4125,13 +4133,13 @@ public void timerExec (int milliseconds, Runnable runnable) { checkDevice (); if (runnable == null) error (SWT.ERROR_NULL_ARGUMENT); if (timerList == null) timerList = new Runnable [4]; - if (timerIds == null) timerIds = new int [4]; + if (timerIds == null) timerIds = new int /*long*/ [4]; int index = 0; while (index < timerList.length) { if (timerList [index] == runnable) break; index++; } - int timerId = 0; + int /*long*/ timerId = 0; if (index != timerList.length) { timerId = timerIds [index]; if (milliseconds < 0) { @@ -4152,12 +4160,12 @@ public void timerExec (int milliseconds, Runnable runnable) { Runnable [] newTimerList = new Runnable [timerList.length + 4]; System.arraycopy (timerList, 0, newTimerList, 0, timerList.length); timerList = newTimerList; - int [] newTimerIds = new int [timerIds.length + 4]; + int /*long*/ [] newTimerIds = new int /*long*/ [timerIds.length + 4]; System.arraycopy (timerIds, 0, newTimerIds, 0, timerIds.length); timerIds = newTimerIds; } } - int newTimerID = OS.SetTimer (hwndMessage, timerId, milliseconds, 0); + int /*long*/ newTimerID = OS.SetTimer (hwndMessage, timerId, milliseconds, 0); if (newTimerID != 0) { timerList [index] = runnable; timerIds [index] = newTimerID; @@ -4190,7 +4198,7 @@ boolean translateMnemonic (MSG msg, Control control) { boolean translateTraversal (MSG msg, Control control) { switch (msg.message) { case OS.WM_KEYDOWN: - switch (msg.wParam) { + switch ((int)/*64*/msg.wParam) { case OS.VK_RETURN: case OS.VK_ESCAPE: case OS.VK_TAB: @@ -4204,7 +4212,7 @@ boolean translateTraversal (MSG msg, Control control) { } break; case OS.WM_SYSKEYDOWN: - switch (msg.wParam) { + switch ((int)/*64*/msg.wParam) { case OS.VK_MENU: return control.translateTraversal (msg); } @@ -4325,7 +4333,7 @@ static int wcsToMbcs (char ch) { return wcsToMbcs (ch, 0); } -int windowProc (int hwnd, int msg, int wParam, int lParam) { +int /*long*/ windowProc (int /*long*/ hwnd, int /*long*/ msg, int /*long*/ wParam, int /*long*/ lParam) { /* * Bug in Adobe Reader 7.0. For some reason, when Adobe * Reader 7.0 is deactivated from within Internet Explorer, @@ -4339,7 +4347,7 @@ int windowProc (int hwnd, int msg, int wParam, int lParam) { * consecutive WM_NCHITTEST messages to the same control without * another message (normally WM_SETCURSOR) in between. */ - if (msg == OS.WM_NCHITTEST) { + if ((int)/*64*/msg == OS.WM_NCHITTEST) { if (hitCount++ >= 1024) { try {Thread.sleep (1);} catch (Throwable t) {} } @@ -4347,23 +4355,23 @@ int windowProc (int hwnd, int msg, int wParam, int lParam) { hitCount = 0; } if (lastControl != null && lastHwnd == hwnd) { - return lastControl.windowProc (hwnd, msg, wParam, lParam); + return lastControl.windowProc (hwnd, (int)/*64*/msg, wParam, lParam); } int index; if (USE_PROPERTY) { - index = OS.GetProp (hwnd, SWT_OBJECT_INDEX) - 1; + index = (int)/*64*/OS.GetProp (hwnd, SWT_OBJECT_INDEX) - 1; } else { - index = OS.GetWindowLong (hwnd, OS.GWL_USERDATA) - 1; + index = (int)/*64*/OS.GetWindowLongPtr (hwnd, OS.GWLP_USERDATA) - 1; } if (0 <= index && index < controlTable.length) { Control control = controlTable [index]; if (control != null) { lastHwnd = hwnd; lastControl = control; - return control.windowProc (hwnd, msg, wParam, lParam); + return control.windowProc (hwnd, (int)/*64*/msg, wParam, lParam); } } - return OS.DefWindowProc (hwnd, msg, wParam, lParam); + return OS.DefWindowProc (hwnd, (int)/*64*/msg, wParam, lParam); } static String withCrLf (String string) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ExpandBar.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ExpandBar.java index f0daea556f..e871c6bd45 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ExpandBar.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ExpandBar.java @@ -45,7 +45,7 @@ public class ExpandBar extends Composite { ExpandItem focusItem; int spacing = 4; int yCurrentScroll; - int hFont; + int /*long*/ hFont; /** @@ -106,7 +106,7 @@ public void addExpandListener (ExpandListener listener) { addListener (SWT.Collapse, typedListener); } -int callWindowProc (int hwnd, int msg, int wParam, int lParam) { +int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) { if (handle == 0) return 0; return OS.DefWindowProc (hwnd, msg, wParam, lParam); } @@ -125,12 +125,12 @@ public Point computeSize (int wHint, int hHint, boolean changed) { int height = 0, width = 0; if (wHint == SWT.DEFAULT || hHint == SWT.DEFAULT) { if (itemCount > 0) { - int hDC = OS.GetDC (handle); - int hTheme = 0; + int /*long*/ hDC = OS.GetDC (handle); + int /*long*/ hTheme = 0; if (isAppThemed ()) { hTheme = display.hExplorerBarTheme (); } - int hCurrentFont = 0, oldFont = 0; + int /*long*/ hCurrentFont = 0, oldFont = 0; if (hTheme == 0) { if (hFont != 0) { hCurrentFont = hFont; @@ -232,7 +232,7 @@ void destroyItem (ExpandItem item) { layoutItems (index, true); } -void drawThemeBackground (int hDC, int hwnd, RECT rect) { +void drawThemeBackground (int /*long*/ hDC, int /*long*/ hwnd, RECT rect) { RECT rect2 = new RECT (); OS.GetClientRect (handle, rect2); OS.MapWindowPoints (handle, hwnd, rect2, 2); @@ -240,7 +240,7 @@ void drawThemeBackground (int hDC, int hwnd, RECT rect) { } void drawWidget (GC gc, RECT clipRect) { - int hTheme = 0; + int /*long*/ hTheme = 0; if (isAppThemed ()) { hTheme = display.hExplorerBarTheme (); } @@ -253,10 +253,10 @@ void drawWidget (GC gc, RECT clipRect) { } boolean drawFocus = false; if (handle == OS.GetFocus ()) { - int uiState = OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); + int uiState = (int)/*64*/OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); drawFocus = (uiState & OS.UISF_HIDEFOCUS) == 0; } - int hCaptionFont = 0, oldFont = 0; + int /*long*/ hCaptionFont = 0, oldFont = 0; if (hTheme == 0) { if (!OS.IsWinCE && hFont == 0) { NONCLIENTMETRICS info = OS.IsUnicode ? (NONCLIENTMETRICS) new NONCLIENTMETRICSW () : new NONCLIENTMETRICSA (); @@ -292,8 +292,8 @@ Control findThemeControl () { int getBandHeight () { if (hFont == 0) return ExpandItem.CHEVRON_SIZE; - int hDC = OS.GetDC (handle); - int oldHFont = OS.SelectObject (hDC, hFont); + int /*long*/ hDC = OS.GetDC (handle); + int /*long*/ oldHFont = OS.SelectObject (hDC, hFont); TEXTMETRIC lptm = OS.IsUnicode ? (TEXTMETRIC)new TEXTMETRICW() : new TEXTMETRICA(); OS.GetTextMetrics (hDC, lptm); OS.SelectObject (hDC, oldHFont); @@ -555,15 +555,15 @@ TCHAR windowClass () { return display.windowClass; } -int windowProc () { +int /*long*/ windowProc () { return display.windowProc; } -LRESULT WM_KEYDOWN (int wParam, int lParam) { +LRESULT WM_KEYDOWN (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_KEYDOWN (wParam, lParam); if (result != null) return result; if (focusItem == null) return result; - switch (wParam) { + switch ((int)/*64*/wParam) { case OS.VK_SPACE: case OS.VK_RETURN: Event event = new Event (); @@ -596,13 +596,13 @@ LRESULT WM_KEYDOWN (int wParam, int lParam) { return result; } -LRESULT WM_KILLFOCUS (int wParam, int lParam) { +LRESULT WM_KILLFOCUS (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_KILLFOCUS (wParam, lParam); if (focusItem != null) focusItem.redraw (true); return result; } -LRESULT WM_LBUTTONDOWN (int wParam, int lParam) { +LRESULT WM_LBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_LBUTTONDOWN (wParam, lParam); if (result == LRESULT.ZERO) return result; int x = OS.GET_X_LPARAM (lParam); @@ -621,7 +621,7 @@ LRESULT WM_LBUTTONDOWN (int wParam, int lParam) { return result; } -LRESULT WM_LBUTTONUP (int wParam, int lParam) { +LRESULT WM_LBUTTONUP (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_LBUTTONUP (wParam, lParam); if (result == LRESULT.ZERO) return result; if (focusItem == null) return result; @@ -652,7 +652,7 @@ LRESULT WM_MOUSELEAVE (int wParam, int lParam) { return result; } -LRESULT WM_MOUSEMOVE (int wParam, int lParam) { +LRESULT WM_MOUSEMOVE (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_MOUSEMOVE (wParam, lParam); if (result == LRESULT.ZERO) return result; int x = OS.GET_X_LPARAM (lParam); @@ -668,7 +668,7 @@ LRESULT WM_MOUSEMOVE (int wParam, int lParam) { return result; } -LRESULT WM_PAINT (int wParam, int lParam) { +LRESULT WM_PAINT (int /*long*/ wParam, int /*long*/ lParam) { PAINTSTRUCT ps = new PAINTSTRUCT (); GCData data = new GCData (); data.ps = ps; @@ -697,7 +697,7 @@ LRESULT WM_PAINT (int wParam, int lParam) { return LRESULT.ZERO; } -LRESULT WM_PRINTCLIENT (int wParam, int lParam) { +LRESULT WM_PRINTCLIENT (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_PRINTCLIENT (wParam, lParam); RECT rect = new RECT (); OS.GetClientRect (handle, rect); @@ -710,7 +710,7 @@ LRESULT WM_PRINTCLIENT (int wParam, int lParam) { return result; } -LRESULT WM_SETCURSOR (int wParam, int lParam) { +LRESULT WM_SETCURSOR (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_SETCURSOR (wParam, lParam); if (result != null) return result; int hitTest = (short) OS.LOWORD (lParam); @@ -718,7 +718,7 @@ LRESULT WM_SETCURSOR (int wParam, int lParam) { for (int i = 0; i < itemCount; i++) { ExpandItem item = items [i]; if (item.hover) { - int hCursor = OS.LoadCursor (0, OS.IDC_HAND); + int /*long*/ hCursor = OS.LoadCursor (0, OS.IDC_HAND); OS.SetCursor (hCursor); return LRESULT.ONE; } @@ -727,13 +727,13 @@ LRESULT WM_SETCURSOR (int wParam, int lParam) { return result; } -LRESULT WM_SETFOCUS (int wParam, int lParam) { +LRESULT WM_SETFOCUS (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_SETFOCUS (wParam, lParam); if (focusItem != null) focusItem.redraw (true); return result; } -LRESULT WM_SIZE (int wParam, int lParam) { +LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_SIZE (wParam, lParam); RECT rect = new RECT (); OS.GetClientRect (handle, rect); @@ -747,7 +747,7 @@ LRESULT WM_SIZE (int wParam, int lParam) { return result; } -LRESULT wmScroll (ScrollBar bar, boolean update, int hwnd, int msg, int wParam, int lParam) { +LRESULT wmScroll (ScrollBar bar, boolean update, int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.wmScroll (bar, true, hwnd, msg, wParam, lParam); SCROLLINFO info = new SCROLLINFO (); info.cbSize = SCROLLINFO.sizeof; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ExpandItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ExpandItem.java index 75fcf1d5d4..bf156e1862 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ExpandItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ExpandItem.java @@ -114,16 +114,16 @@ static ExpandBar checkNull (ExpandBar control) { return control; } -private void drawChevron (int hDC, RECT rect) { - int oldBrush = OS.SelectObject (hDC, OS.GetSysColorBrush (OS.COLOR_BTNFACE)); +private void drawChevron (int /*long*/ hDC, RECT rect) { + int /*long*/ oldBrush = OS.SelectObject (hDC, OS.GetSysColorBrush (OS.COLOR_BTNFACE)); OS.PatBlt (hDC, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, OS.PATCOPY); OS.SelectObject (hDC, oldBrush); rect.left += 4; rect.top += 4; rect.right -= 4; rect.bottom -= 4; - int hPen = OS.CreatePen (OS.PS_SOLID, 1, parent.foreground); - int oldPen = OS.SelectObject (hDC, hPen); + int /*long*/ hPen = OS.CreatePen (OS.PS_SOLID, 1, parent.foreground); + int /*long*/ oldPen = OS.SelectObject (hDC, hPen); int [] polyline1, polyline2; if (expanded) { int px = rect.left + 5; @@ -149,8 +149,8 @@ private void drawChevron (int hDC, RECT rect) { OS.Polyline (hDC, polyline1, polyline1.length / 2); OS.Polyline (hDC, polyline2, polyline2.length / 2); if (hover) { - int whitePen = OS.CreatePen (OS.PS_SOLID, 1, OS.GetSysColor (OS.COLOR_3DHILIGHT)); - int darkGrayPen = OS.CreatePen (OS.PS_SOLID, 1, OS.GetSysColor (OS.COLOR_3DSHADOW)); + int /*long*/ whitePen = OS.CreatePen (OS.PS_SOLID, 1, OS.GetSysColor (OS.COLOR_3DHILIGHT)); + int /*long*/ darkGrayPen = OS.CreatePen (OS.PS_SOLID, 1, OS.GetSysColor (OS.COLOR_3DSHADOW)); OS.SelectObject (hDC, whitePen); int [] points1 = { rect.left, rect.bottom, @@ -172,15 +172,15 @@ private void drawChevron (int hDC, RECT rect) { OS.DeleteObject (hPen); } -void drawItem (GC gc, int hTheme, RECT clipRect, boolean drawFocus) { - int hDC = gc.handle; +void drawItem (GC gc, int /*long*/ hTheme, RECT clipRect, boolean drawFocus) { + int /*long*/ hDC = gc.handle; int headerHeight = parent.getBandHeight (); RECT rect = new RECT (); OS.SetRect (rect, x, y, x + width, y + headerHeight); if (hTheme != 0) { OS.DrawThemeBackground (hTheme, hDC, OS.EBP_NORMALGROUPHEAD, 0, rect, clipRect); } else { - int oldBrush = OS.SelectObject (hDC, OS.GetSysColorBrush (OS.COLOR_BTNFACE)); + int /*long*/ oldBrush = OS.SelectObject (hDC, OS.GetSysColorBrush (OS.COLOR_BTNFACE)); OS.PatBlt (hDC, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, OS.PATCOPY); OS.SelectObject (hDC, oldBrush); } @@ -221,8 +221,8 @@ void drawItem (GC gc, int hTheme, RECT clipRect, boolean drawFocus) { } if (expanded) { if (!parent.isAppThemed ()) { - int pen = OS.CreatePen (OS.PS_SOLID, 1, OS.GetSysColor (OS.COLOR_BTNFACE)); - int oldPen = OS.SelectObject (hDC, pen); + int /*long*/ pen = OS.CreatePen (OS.PS_SOLID, 1, OS.GetSysColor (OS.COLOR_BTNFACE)); + int /*long*/ oldPen = OS.SelectObject (hDC, pen); int [] points = { x, y + headerHeight, x, y + headerHeight + height, @@ -317,7 +317,7 @@ public ExpandBar getParent () { return parent; } -int getPreferredWidth (int hTheme, int hDC) { +int getPreferredWidth (int /*long*/ hTheme, int /*long*/ hDC) { int width = ExpandItem.TEXT_INSET * 2 + ExpandItem.CHEVRON_SIZE; if (image != null) { width += ExpandItem.TEXT_INSET + imageWidth; @@ -341,7 +341,7 @@ boolean isHover (int x, int y) { } void redraw (boolean all) { - int parentHandle = parent.handle; + int /*long*/ parentHandle = parent.handle; int headerHeight = parent.getBandHeight (); RECT rect = new RECT (); int left = all ? x : x + width - headerHeight; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/FileDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/FileDialog.java index 2a265e7673..46560474f9 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/FileDialog.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/FileDialog.java @@ -140,20 +140,20 @@ public String getFilterPath () { return filterPath; } -int OFNHookProc (int hdlg, int uiMsg, int wParam, int lParam) { - switch (uiMsg) { +int OFNHookProc (int /*long*/ hdlg, int /*long*/ uiMsg, int /*long*/ wParam, int /*long*/ lParam) { + switch ((int)/*64*/uiMsg) { case OS.WM_NOTIFY: OFNOTIFY ofn = new OFNOTIFY (); OS.MoveMemory (ofn, lParam, OFNOTIFY.sizeof); if (ofn.code == OS.CDN_SELCHANGE) { - int lResult = OS.SendMessage (ofn.hwndFrom, OS.CDM_GETSPEC, 0, 0); + int lResult = (int)/*64*/OS.SendMessage (ofn.hwndFrom, OS.CDM_GETSPEC, 0, 0); if (lResult > 0) { lResult += OS.MAX_PATH; OPENFILENAME lpofn = new OPENFILENAME (); OS.MoveMemory (lpofn, ofn.lpOFN, OPENFILENAME.sizeof); if (lpofn.nMaxFile < lResult) { - int hHeap = OS.GetProcessHeap (); - int lpstrFile = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, lResult * TCHAR.sizeof); + int /*long*/ hHeap = OS.GetProcessHeap (); + int /*long*/ lpstrFile = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, lResult * TCHAR.sizeof); if (lpstrFile != 0) { if (lpofn.lpstrFile != 0) OS.HeapFree (hHeap, 0, lpofn.lpstrFile); lpofn.lpstrFile = lpstrFile; @@ -181,10 +181,10 @@ int OFNHookProc (int hdlg, int uiMsg, int wParam, int lParam) { * </ul> */ public String open () { - int hHeap = OS.GetProcessHeap (); + int /*long*/ hHeap = OS.GetProcessHeap (); /* Get the owner HWND for the dialog */ - int hwndOwner = 0; + int /*long*/ hwndOwner = 0; if (parent != null) hwndOwner = parent.handle; /* Convert the title and copy it into lpstrTitle */ @@ -192,7 +192,7 @@ public String open () { /* Use the character encoding for the default locale */ TCHAR buffer3 = new TCHAR (0, title, true); int byteCount3 = buffer3.length () * TCHAR.sizeof; - int lpstrTitle = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount3); + int /*long*/ lpstrTitle = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount3); OS.MoveMemory (lpstrTitle, buffer3, byteCount3); /* Compute filters and copy into lpstrFilter */ @@ -210,7 +210,7 @@ public String open () { /* Use the character encoding for the default locale */ TCHAR buffer4 = new TCHAR (0, strFilter, true); int byteCount4 = buffer4.length () * TCHAR.sizeof; - int lpstrFilter = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount4); + int /*long*/ lpstrFilter = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount4); OS.MoveMemory (lpstrFilter, buffer4, byteCount4); /* Convert the fileName and filterName to C strings */ @@ -225,7 +225,7 @@ public String open () { int nMaxFile = OS.MAX_PATH; if ((style & SWT.MULTI) != 0) nMaxFile = Math.max (nMaxFile, BUFFER_SIZE); int byteCount = nMaxFile * TCHAR.sizeof; - int lpstrFile = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); + int /*long*/ lpstrFile = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); int byteCountFile = Math.min (name.length () * TCHAR.sizeof, byteCount - TCHAR.sizeof); OS.MoveMemory (lpstrFile, name, byteCountFile); @@ -237,7 +237,7 @@ public String open () { /* Use the character encoding for the default locale */ TCHAR path = new TCHAR (0, filterPath.replace ('/', '\\'), true); int byteCount5 = OS.MAX_PATH * TCHAR.sizeof; - int lpstrInitialDir = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount5); + int /*long*/ lpstrInitialDir = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount5); int byteCountDir = Math.min (path.length () * TCHAR.sizeof, byteCount5 - TCHAR.sizeof); OS.MoveMemory (lpstrInitialDir, path, byteCountDir); @@ -250,7 +250,7 @@ public String open () { struct.Flags |= OS.OFN_ALLOWMULTISELECT | OS.OFN_EXPLORER; if (!OS.IsWinCE && USE_HOOK) { callback = new Callback (this, "OFNHookProc", 4); //$NON-NLS-1$ - int lpfnHook = callback.getAddress (); + int /*long*/ lpfnHook = callback.getAddress (); if (lpfnHook == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS); struct.lpfnHook = lpfnHook; struct.Flags |= OS.OFN_ENABLEHOOK; @@ -270,7 +270,7 @@ public String open () { * empty, Windows uses the current value of the filter * extension at the time that the dialog is closed. */ - int lpstrDefExt = 0; + int /*long*/ lpstrDefExt = 0; boolean save = (style & SWT.SAVE) != 0; if (save) { lpstrDefExt = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, TCHAR.sizeof); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/FontDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/FontDialog.java index 50b5cdd8cc..982375c920 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/FontDialog.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/FontDialog.java @@ -134,20 +134,20 @@ public FontData open () { if (OS.IsWinCE) SWT.error (SWT.ERROR_NOT_IMPLEMENTED); /* Get the owner HWND for the dialog */ - int hwndOwner = 0; + int /*long*/ hwndOwner = 0; if (parent != null) hwndOwner = parent.handle; /* Open the dialog */ - int hHeap = OS.GetProcessHeap (); + int /*long*/ hHeap = OS.GetProcessHeap (); CHOOSEFONT lpcf = new CHOOSEFONT (); lpcf.lStructSize = CHOOSEFONT.sizeof; lpcf.hwndOwner = hwndOwner; lpcf.Flags = OS.CF_SCREENFONTS | OS.CF_EFFECTS; - int lpLogFont = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, LOGFONT.sizeof); + int /*long*/ lpLogFont = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, LOGFONT.sizeof); if (fontData != null && fontData.data != null) { LOGFONT logFont = fontData.data; int lfHeight = logFont.lfHeight; - int hDC = OS.GetDC (0); + int /*long*/ hDC = OS.GetDC (0); int pixels = -(int)(0.5f + (fontData.height * OS.GetDeviceCaps(hDC, OS.LOGPIXELSY) / 72)); OS.ReleaseDC (0, hDC); logFont.lfHeight = pixels; @@ -189,7 +189,7 @@ public FontData open () { * This will not work on multiple screens or * for printing. Should use DC for the proper device. */ - int hDC = OS.GetDC(0); + int /*long*/ hDC = OS.GetDC(0); int logPixelsY = OS.GetDeviceCaps(hDC, OS.LOGPIXELSY); int pixels = 0; if (logFont.lfHeight > 0) { @@ -201,8 +201,8 @@ public FontData open () { * we must subtract the internal leading, which requires a TEXTMETRIC, * which in turn requires font creation. */ - int hFont = OS.CreateFontIndirect(logFont); - int oldFont = OS.SelectObject(hDC, hFont); + int /*long*/ hFont = OS.CreateFontIndirect(logFont); + int /*long*/ oldFont = OS.SelectObject(hDC, hFont); TEXTMETRIC lptm = OS.IsUnicode ? (TEXTMETRIC) new TEXTMETRICW () : new TEXTMETRICA (); OS.GetTextMetrics(hDC, lptm); OS.SelectObject(hDC, oldFont); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Group.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Group.java index e8f7d673c2..db98fd9ebb 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Group.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Group.java @@ -39,7 +39,7 @@ import org.eclipse.swt.graphics.*; public class Group extends Composite { String text = ""; static final int CLIENT_INSET = 3; - static final int GroupProc; + static final int /*long*/ GroupProc; static final TCHAR GroupClass = new TCHAR (0, OS.IsWinCE ? "BUTTON" : "SWT_GROUP", true); static { /* @@ -63,13 +63,13 @@ public class Group extends Composite { TCHAR WC_BUTTON = new TCHAR (0, "BUTTON", true); OS.GetClassInfo (0, WC_BUTTON, lpWndClass); GroupProc = lpWndClass.lpfnWndProc; - int hInstance = OS.GetModuleHandle (null); + int /*long*/ hInstance = OS.GetModuleHandle (null); if (!OS.GetClassInfo (hInstance, GroupClass, lpWndClass)) { - int hHeap = OS.GetProcessHeap (); + int /*long*/ hHeap = OS.GetProcessHeap (); lpWndClass.hInstance = hInstance; lpWndClass.style &= ~(OS.CS_HREDRAW | OS.CS_VREDRAW); int byteCount = GroupClass.length () * TCHAR.sizeof; - int lpszClassName = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); + int /*long*/ lpszClassName = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); OS.MoveMemory (lpszClassName, GroupClass, byteCount); lpWndClass.lpszClassName = lpszClassName; OS.RegisterClass (lpWndClass); @@ -114,7 +114,7 @@ public Group (Composite parent, int style) { super (parent, checkStyle (style)); } -int callWindowProc (int hwnd, int msg, int wParam, int lParam) { +int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) { if (handle == 0) return 0; /* * Feature in Windows. When the user clicks on the group @@ -168,8 +168,8 @@ public Point computeSize (int wHint, int hHint, boolean changed) { * client area, pad the width so the text is not clipped. */ TCHAR buffer = new TCHAR (getCodePage (), string, true); - int newFont, oldFont = 0; - int hDC = OS.GetDC (handle); + int /*long*/ newFont, oldFont = 0; + int /*long*/ hDC = OS.GetDC (handle); newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont); RECT rect = new RECT (); @@ -185,8 +185,8 @@ public Point computeSize (int wHint, int hHint, boolean changed) { public Rectangle computeTrim (int x, int y, int width, int height) { checkWidget (); Rectangle trim = super.computeTrim (x, y, width, height); - int newFont, oldFont = 0; - int hDC = OS.GetDC (handle); + int /*long*/ newFont, oldFont = 0; + int /*long*/ hDC = OS.GetDC (handle); newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont); TEXTMETRIC tm = OS.IsUnicode ? (TEXTMETRIC) new TEXTMETRICW () : new TEXTMETRICA (); @@ -227,8 +227,8 @@ public Rectangle getClientArea () { forceResize (); RECT rect = new RECT (); OS.GetClientRect (handle, rect); - int newFont, oldFont = 0; - int hDC = OS.GetDC (handle); + int /*long*/ newFont, oldFont = 0; + int /*long*/ hDC = OS.GetDC (handle); newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont); TEXTMETRIC tm = OS.IsUnicode ? (TEXTMETRIC) new TEXTMETRICW () : new TEXTMETRICA (); @@ -348,11 +348,11 @@ TCHAR windowClass () { return GroupClass; } -int windowProc () { +int /*long*/ windowProc () { return GroupProc; } -LRESULT WM_ERASEBKGND (int wParam, int lParam) { +LRESULT WM_ERASEBKGND (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_ERASEBKGND (wParam, lParam); if (result != null) return result; /* @@ -364,7 +364,7 @@ LRESULT WM_ERASEBKGND (int wParam, int lParam) { return LRESULT.ONE; } -LRESULT WM_NCHITTEST (int wParam, int lParam) { +LRESULT WM_NCHITTEST (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_NCHITTEST (wParam, lParam); if (result != null) return result; /* @@ -376,12 +376,12 @@ LRESULT WM_NCHITTEST (int wParam, int lParam) { * allow children, answer HTCLIENT to allow mouse messages * to be delivered to the children. */ - int code = callWindowProc (handle, OS.WM_NCHITTEST, wParam, lParam); + int /*long*/ code = callWindowProc (handle, OS.WM_NCHITTEST, wParam, lParam); if (code == OS.HTTRANSPARENT) code = OS.HTCLIENT; return new LRESULT (code); } -LRESULT WM_MOUSEMOVE (int wParam, int lParam) { +LRESULT WM_MOUSEMOVE (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_MOUSEMOVE (wParam, lParam); if (result != null) return result; /* @@ -393,7 +393,7 @@ LRESULT WM_MOUSEMOVE (int wParam, int lParam) { return LRESULT.ZERO; } -LRESULT WM_PRINTCLIENT (int wParam, int lParam) { +LRESULT WM_PRINTCLIENT (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_PRINTCLIENT (wParam, lParam); if (result != null) return result; /* @@ -408,14 +408,14 @@ LRESULT WM_PRINTCLIENT (int wParam, int lParam) { */ if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) { int nSavedDC = OS.SaveDC (wParam); - int code = callWindowProc (handle, OS.WM_PRINTCLIENT, wParam, lParam); + int /*long*/ code = callWindowProc (handle, OS.WM_PRINTCLIENT, wParam, lParam); OS.RestoreDC (wParam, nSavedDC); return new LRESULT (code); } return result; } -LRESULT WM_UPDATEUISTATE (int wParam, int lParam) { +LRESULT WM_UPDATEUISTATE (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_UPDATEUISTATE (wParam, lParam); if (result != null) return result; /* @@ -437,13 +437,13 @@ LRESULT WM_UPDATEUISTATE (int wParam, int lParam) { } if (redraw) { OS.InvalidateRect (handle, null, false); - int code = OS.DefWindowProc (handle, OS.WM_UPDATEUISTATE, wParam, lParam); + int /*long*/ code = OS.DefWindowProc (handle, OS.WM_UPDATEUISTATE, wParam, lParam); return new LRESULT (code); } return result; } -LRESULT WM_WINDOWPOSCHANGING (int wParam, int lParam) { +LRESULT WM_WINDOWPOSCHANGING (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_WINDOWPOSCHANGING (wParam, lParam); if (result != null) return result; /* diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Label.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Label.java index 78a654c6d8..769727fbe2 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Label.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Label.java @@ -42,7 +42,7 @@ public class Label extends Control { Image image; static final int MARGIN = 4; static final boolean IMAGE_AND_TEXT = false; - static final int LabelProc; + static final int /*long*/ LabelProc; static final TCHAR LabelClass = new TCHAR (0, "STATIC", true); static { WNDCLASS lpWndClass = new WNDCLASS (); @@ -91,7 +91,7 @@ public Label (Composite parent, int style) { super (parent, checkStyle (style)); } -int callWindowProc (int hwnd, int msg, int wParam, int lParam) { +int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) { if (handle == 0) return 0; return OS.CallWindowProc (LabelProc, hwnd, msg, wParam, lParam); } @@ -136,9 +136,9 @@ public Point computeSize (int wHint, int hHint, boolean changed) { } } if (drawText) { - int hDC = OS.GetDC (handle); - int newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); - int oldFont = OS.SelectObject (hDC, newFont); + int /*long*/ hDC = OS.GetDC (handle); + int /*long*/ newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); + int /*long*/ oldFont = OS.SelectObject (hDC, newFont); int length = OS.GetWindowTextLength (handle); if (length == 0) { TEXTMETRIC tm = OS.IsUnicode ? (TEXTMETRIC) new TEXTMETRICW () : new TEXTMETRICA (); @@ -425,11 +425,11 @@ TCHAR windowClass () { return LabelClass; } -int windowProc () { +int /*long*/ windowProc () { return LabelProc; } -LRESULT WM_ERASEBKGND (int wParam, int lParam) { +LRESULT WM_ERASEBKGND (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_ERASEBKGND (wParam, lParam); if (result != null) return result; int bits = OS.GetWindowLong (handle, OS.GWL_STYLE); @@ -453,7 +453,7 @@ LRESULT WM_ERASEBKGND (int wParam, int lParam) { return result; } -LRESULT WM_SIZE (int wParam, int lParam) { +LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_SIZE (wParam, lParam); if (isDisposed ()) return result; if ((style & SWT.SEPARATOR) != 0) { @@ -479,7 +479,7 @@ LRESULT WM_SIZE (int wParam, int lParam) { return result; } -LRESULT WM_UPDATEUISTATE (int wParam, int lParam) { +LRESULT WM_UPDATEUISTATE (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_UPDATEUISTATE (wParam, lParam); /* * Feature in Windows. When WM_UPDATEUISTATE is sent to @@ -499,13 +499,13 @@ LRESULT WM_UPDATEUISTATE (int wParam, int lParam) { } if (redraw) { OS.InvalidateRect (handle, null, false); - int code = OS.DefWindowProc (handle, OS.WM_UPDATEUISTATE, wParam, lParam); + int /*long*/ code = OS.DefWindowProc (handle, OS.WM_UPDATEUISTATE, wParam, lParam); return new LRESULT (code); } return result; } -LRESULT wmColorChild (int wParam, int lParam) { +LRESULT wmColorChild (int /*long*/ wParam, int /*long*/ lParam) { /* * Bug in Windows. For some reason, the HBRUSH that * is returned from WM_CTRLCOLOR is misaligned when @@ -527,7 +527,7 @@ LRESULT wmColorChild (int wParam, int lParam) { return result; } -LRESULT WM_PAINT (int wParam, int lParam) { +LRESULT WM_PAINT (int /*long*/ wParam, int /*long*/ lParam) { if (OS.IsWinCE) { boolean drawImage = image != null; boolean drawSeparator = (style & SWT.SEPARATOR) != 0 && (style & SWT.SHADOW_NONE) == 0; @@ -591,7 +591,7 @@ LRESULT WM_PAINT (int wParam, int lParam) { return super.WM_PAINT(wParam, lParam); } -LRESULT wmDrawChild (int wParam, int lParam) { +LRESULT wmDrawChild (int /*long*/ wParam, int /*long*/ lParam) { DRAWITEMSTRUCT struct = new DRAWITEMSTRUCT (); OS.MoveMemory (struct, lParam, DRAWITEMSTRUCT.sizeof); drawBackground (struct.hDC); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Link.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Link.java index 9ed931e8cc..431c44d5ca 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Link.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Link.java @@ -42,9 +42,9 @@ public class Link extends Control { String [] ids; int [] mnemonics; int focusIndex, mouseDownIndex; - int font; + int /*long*/ font; static final RGB LINK_FOREGROUND = new RGB (0, 51, 153); - static final int LinkProc; + static final int /*long*/ LinkProc; static final TCHAR LinkClass = new TCHAR (0, OS.WC_LINK, true); static { if (OS.COMCTL32_MAJOR >= 6) { @@ -119,7 +119,7 @@ public void addSelectionListener (SelectionListener listener) { addListener (SWT.DefaultSelection, typedListener); } -int callWindowProc (int hwnd, int msg, int wParam, int lParam) { +int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) { if (handle == 0) return 0; if (LinkProc != 0) return OS.CallWindowProc (LinkProc, hwnd, msg, wParam, lParam); return OS.DefWindowProc (hwnd, msg, wParam, lParam); @@ -131,9 +131,9 @@ public Point computeSize (int wHint, int hHint, boolean changed) { if (hHint != SWT.DEFAULT && hHint < 0) hHint = 0; int width, height; if (OS.COMCTL32_MAJOR >= 6) { - int hDC = OS.GetDC (handle); - int newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); - int oldFont = OS.SelectObject (hDC, newFont); + int /*long*/ hDC = OS.GetDC (handle); + int /*long*/ newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); + int /*long*/ oldFont = OS.SelectObject (hDC, newFont); TCHAR buffer = new TCHAR (getCodePage (), parse (text), false); RECT rect = new RECT (); int flags = OS.DT_CALCRECT | OS.DT_NOPREFIX; @@ -623,16 +623,16 @@ TCHAR windowClass () { return OS.COMCTL32_MAJOR >= 6 ? LinkClass : display.windowClass; } -int windowProc () { +int /*long*/ windowProc () { return LinkProc != 0 ? LinkProc : display.windowProc; } -LRESULT WM_CHAR (int wParam, int lParam) { +LRESULT WM_CHAR (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_CHAR (wParam, lParam); if (result != null) return result; if (OS.COMCTL32_MAJOR < 6) { if (focusIndex == -1) return result; - switch (wParam) { + switch ((int)/*64*/wParam) { case ' ': case SWT.CR: Event event = new Event (); @@ -655,7 +655,7 @@ LRESULT WM_CHAR (int wParam, int lParam) { break; } } else { - switch (wParam) { + switch ((int)/*64*/wParam) { case ' ': case SWT.CR: case SWT.TAB: @@ -665,7 +665,7 @@ LRESULT WM_CHAR (int wParam, int lParam) { * This allows the application to cancel an operation that is normally * performed in WM_KEYDOWN from WM_CHAR. */ - int code = callWindowProc (handle, OS.WM_KEYDOWN, wParam, lParam); + int /*long*/ code = callWindowProc (handle, OS.WM_KEYDOWN, wParam, lParam); return new LRESULT (code); } @@ -673,10 +673,11 @@ LRESULT WM_CHAR (int wParam, int lParam) { return result; } -LRESULT WM_GETDLGCODE (int wParam, int lParam) { +LRESULT WM_GETDLGCODE (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_GETDLGCODE (wParam, lParam); if (result != null) return result; - int index, count, code = 0; + int index, count; + int /*long*/ code = 0; if (OS.COMCTL32_MAJOR >= 6) { LITEM item = new LITEM (); item.mask = OS.LIF_ITEMINDEX | OS.LIF_STATE; @@ -707,20 +708,20 @@ LRESULT WM_GETDLGCODE (int wParam, int lParam) { return result; } -LRESULT WM_GETFONT (int wParam, int lParam) { +LRESULT WM_GETFONT (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_GETFONT (wParam, lParam); if (result != null) return result; - int code = callWindowProc (handle, OS.WM_GETFONT, wParam, lParam); + int /*long*/ code = callWindowProc (handle, OS.WM_GETFONT, wParam, lParam); if (code != 0) return new LRESULT (code); if (font == 0) font = defaultFont (); return new LRESULT (font); } -LRESULT WM_KEYDOWN (int wParam, int lParam) { +LRESULT WM_KEYDOWN (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_KEYDOWN (wParam, lParam); if (result != null) return result; if (OS.COMCTL32_MAJOR >= 6) { - switch (wParam) { + switch ((int)/*64*/wParam) { case OS.VK_SPACE: case OS.VK_RETURN: case OS.VK_TAB: @@ -736,13 +737,13 @@ LRESULT WM_KEYDOWN (int wParam, int lParam) { return result; } -LRESULT WM_KILLFOCUS (int wParam, int lParam) { +LRESULT WM_KILLFOCUS (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_KILLFOCUS (wParam, lParam); if (OS.COMCTL32_MAJOR < 6) redraw (); return result; } -LRESULT WM_LBUTTONDOWN (int wParam, int lParam) { +LRESULT WM_LBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_LBUTTONDOWN (wParam, lParam); if (result == LRESULT.ZERO) return result; if (OS.COMCTL32_MAJOR < 6) { @@ -780,7 +781,7 @@ LRESULT WM_LBUTTONDOWN (int wParam, int lParam) { return result; } -LRESULT WM_LBUTTONUP (int wParam, int lParam) { +LRESULT WM_LBUTTONUP (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_LBUTTONUP (wParam, lParam); if (result == LRESULT.ZERO) return result; if (OS.COMCTL32_MAJOR < 6) { @@ -802,7 +803,7 @@ LRESULT WM_LBUTTONUP (int wParam, int lParam) { return result; } -LRESULT WM_MOUSEMOVE (int wParam, int lParam) { +LRESULT WM_MOUSEMOVE (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_MOUSEMOVE (wParam, lParam); if (OS.COMCTL32_MAJOR < 6) { int x = OS.GET_X_LPARAM (lParam); @@ -837,7 +838,7 @@ LRESULT WM_MOUSEMOVE (int wParam, int lParam) { return result; } -LRESULT WM_PAINT (int wParam, int lParam) { +LRESULT WM_PAINT (int /*long*/ wParam, int /*long*/ lParam) { if (OS.COMCTL32_MAJOR >= 6) { return super.WM_PAINT (wParam, lParam); } @@ -859,7 +860,7 @@ LRESULT WM_PAINT (int wParam, int lParam) { return LRESULT.ZERO; } -LRESULT WM_PRINTCLIENT (int wParam, int lParam) { +LRESULT WM_PRINTCLIENT (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_PRINTCLIENT (wParam, lParam); if (OS.COMCTL32_MAJOR < 6) { RECT rect = new RECT (); @@ -874,13 +875,13 @@ LRESULT WM_PRINTCLIENT (int wParam, int lParam) { return result; } -LRESULT WM_SETFOCUS (int wParam, int lParam) { +LRESULT WM_SETFOCUS (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_SETFOCUS (wParam, lParam); if (OS.COMCTL32_MAJOR < 6) redraw (); return result; } -LRESULT WM_SETFONT (int wParam, int lParam) { +LRESULT WM_SETFONT (int /*long*/ wParam, int /*long*/ lParam) { if (OS.COMCTL32_MAJOR < 6) { layout.setFont (Font.win32_new (display, wParam)); } @@ -888,7 +889,7 @@ LRESULT WM_SETFONT (int wParam, int lParam) { return super.WM_SETFONT (font = wParam, lParam); } -LRESULT WM_SIZE (int wParam, int lParam) { +LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_SIZE (wParam, lParam); if (OS.COMCTL32_MAJOR < 6) { RECT rect = new RECT (); @@ -899,7 +900,7 @@ LRESULT WM_SIZE (int wParam, int lParam) { return result; } -LRESULT wmColorChild (int wParam, int lParam) { +LRESULT wmColorChild (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.wmColorChild (wParam, lParam); /* * Feature in Windows. When a SysLink is disabled, it does @@ -912,7 +913,7 @@ LRESULT wmColorChild (int wParam, int lParam) { if (result == null) { int backPixel = getBackgroundPixel (); OS.SetBkColor (wParam, backPixel); - int hBrush = findBrush (backPixel, OS.BS_SOLID); + int /*long*/ hBrush = findBrush (backPixel, OS.BS_SOLID); return new LRESULT (hBrush); } } @@ -920,7 +921,7 @@ LRESULT wmColorChild (int wParam, int lParam) { return result; } -LRESULT wmNotifyChild (NMHDR hdr, int wParam, int lParam) { +LRESULT wmNotifyChild (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) { if (OS.COMCTL32_MAJOR >= 6) { switch (hdr.code) { case OS.NM_RETURN: diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/List.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/List.java index f35c9378b6..b05a6b044f 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/List.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/List.java @@ -36,7 +36,7 @@ import org.eclipse.swt.events.*; public class List extends Scrollable { static final int INSET = 3; - static final int ListProc; + static final int /*long*/ ListProc; static final TCHAR ListClass = new TCHAR (0, "LISTBOX", true); static { WNDCLASS lpWndClass = new WNDCLASS (); @@ -95,7 +95,7 @@ public void add (String string) { checkWidget (); if (string == null) error (SWT.ERROR_NULL_ARGUMENT); TCHAR buffer = new TCHAR (getCodePage (), string, true); - int result = OS.SendMessage (handle, OS.LB_ADDSTRING, 0, buffer); + int result = (int)/*64*/OS.SendMessage (handle, OS.LB_ADDSTRING, 0, buffer); if (result == OS.LB_ERR) error (SWT.ERROR_ITEM_NOT_ADDED); if (result == OS.LB_ERRSPACE) error (SWT.ERROR_ITEM_NOT_ADDED); if ((style & SWT.H_SCROLL) != 0) setScrollWidth (buffer, true); @@ -128,10 +128,10 @@ public void add (String string, int index) { if (string == null) error (SWT.ERROR_NULL_ARGUMENT); if (index == -1) error (SWT.ERROR_INVALID_RANGE); TCHAR buffer = new TCHAR (getCodePage (), string, true); - int result = OS.SendMessage (handle, OS.LB_INSERTSTRING, index, buffer); + int result = (int)/*64*/OS.SendMessage (handle, OS.LB_INSERTSTRING, index, buffer); if (result == OS.LB_ERRSPACE) error (SWT.ERROR_ITEM_NOT_ADDED); if (result == OS.LB_ERR) { - int count = OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); if (0 <= index && index <= count) { error (SWT.ERROR_ITEM_NOT_ADDED); } else { @@ -173,7 +173,7 @@ public void addSelectionListener(SelectionListener listener) { addListener (SWT.DefaultSelection,typedListener); } -int callWindowProc (int hwnd, int msg, int wParam, int lParam) { +int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) { if (handle == 0) return 0; return OS.CallWindowProc (ListProc, hwnd, msg, wParam, lParam); } @@ -187,12 +187,12 @@ public Point computeSize (int wHint, int hHint, boolean changed) { int width = 0, height = 0; if (wHint == SWT.DEFAULT) { if ((style & SWT.H_SCROLL) != 0) { - width = OS.SendMessage (handle, OS.LB_GETHORIZONTALEXTENT, 0, 0); + width = (int)/*64*/OS.SendMessage (handle, OS.LB_GETHORIZONTALEXTENT, 0, 0); width -= INSET; } else { - int count = OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); - int newFont, oldFont = 0; - int hDC = OS.GetDC (handle); + int count = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); + int /*long*/ newFont, oldFont = 0; + int /*long*/ hDC = OS.GetDC (handle); newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont); RECT rect = new RECT (); @@ -200,12 +200,12 @@ public Point computeSize (int wHint, int hHint, boolean changed) { int cp = getCodePage (); TCHAR buffer = new TCHAR (cp, 64 + 1); for (int i=0; i<count; i++) { - int length = OS.SendMessage (handle, OS.LB_GETTEXTLEN, i, 0); + int length = (int)/*64*/OS.SendMessage (handle, OS.LB_GETTEXTLEN, i, 0); if (length != OS.LB_ERR) { if (length + 1 > buffer.length ()) { buffer = new TCHAR (cp, length + 1); } - int result = OS.SendMessage (handle, OS.LB_GETTEXT, i, buffer); + int result = (int)/*64*/OS.SendMessage (handle, OS.LB_GETTEXT, i, buffer); if (result != OS.LB_ERR) { OS.DrawText (hDC, buffer, length, rect, flags); width = Math.max (width, rect.right - rect.left); @@ -217,8 +217,8 @@ public Point computeSize (int wHint, int hHint, boolean changed) { } } if (hHint == SWT.DEFAULT) { - int count = OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); - int itemHeight = OS.SendMessage (handle, OS.LB_GETITEMHEIGHT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); + int itemHeight = (int)/*64*/OS.SendMessage (handle, OS.LB_GETITEMHEIGHT, 0, 0); height = count * itemHeight; } if (width == 0) width = DEFAULT_WIDTH; @@ -263,7 +263,7 @@ public void deselect (int [] indices) { if (indices == null) error (SWT.ERROR_NULL_ARGUMENT); if (indices.length == 0) return; if ((style & SWT.SINGLE) != 0) { - int oldIndex = OS.SendMessage (handle, OS.LB_GETCURSEL, 0, 0); + int oldIndex = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCURSEL, 0, 0); if (oldIndex == OS.LB_ERR) return; for (int i=0; i<indices.length; i++) { if (oldIndex == indices [i]) { @@ -297,7 +297,7 @@ public void deselect (int index) { checkWidget (); if (index == -1) return; if ((style & SWT.SINGLE) != 0) { - int oldIndex = OS.SendMessage (handle, OS.LB_GETCURSEL, 0, 0); + int oldIndex = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCURSEL, 0, 0); if (oldIndex == OS.LB_ERR) return; if (oldIndex == index) OS.SendMessage (handle, OS.LB_SETCURSEL, -1, 0); return; @@ -324,7 +324,7 @@ public void deselect (int start, int end) { checkWidget (); if (start > end) return; if ((style & SWT.SINGLE) != 0) { - int oldIndex = OS.SendMessage (handle, OS.LB_GETCURSEL, 0, 0); + int oldIndex = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCURSEL, 0, 0); if (oldIndex == OS.LB_ERR) return; if (start <= oldIndex && oldIndex <= end) { OS.SendMessage (handle, OS.LB_SETCURSEL, -1, 0); @@ -337,7 +337,7 @@ public void deselect (int start, int end) { * start = end, LB_SELITEMRANGEEX deselects the * item. */ - int count = OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); if (start < 0 && end < 0) return; if (start >= count && end >= count) return; start = Math.min (count - 1, Math.max (0, start)); @@ -375,9 +375,9 @@ public void deselectAll () { */ public int getFocusIndex () { checkWidget (); - int result = OS.SendMessage (handle, OS.LB_GETCARETINDEX, 0, 0); + int result = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCARETINDEX, 0, 0); if (result == 0) { - int count = OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); if (count == 0) return -1; } return result; @@ -400,13 +400,13 @@ public int getFocusIndex () { */ public String getItem (int index) { checkWidget (); - int length = OS.SendMessage (handle, OS.LB_GETTEXTLEN, index, 0); + int length = (int)/*64*/OS.SendMessage (handle, OS.LB_GETTEXTLEN, index, 0); if (length != OS.LB_ERR) { TCHAR buffer = new TCHAR (getCodePage (), length + 1); - int result = OS.SendMessage (handle, OS.LB_GETTEXT, index, buffer); + int result = (int)/*64*/OS.SendMessage (handle, OS.LB_GETTEXT, index, buffer); if (result != OS.LB_ERR) return buffer.toString (0, length); } - int count = OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); if (0 <= index && index < count) error (SWT.ERROR_CANNOT_GET_ITEM); error (SWT.ERROR_INVALID_RANGE); return ""; @@ -424,7 +424,7 @@ public String getItem (int index) { */ public int getItemCount () { checkWidget (); - int result = OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); + int result = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); if (result == OS.LB_ERR) error (SWT.ERROR_CANNOT_GET_COUNT); return result; } @@ -442,7 +442,7 @@ public int getItemCount () { */ public int getItemHeight () { checkWidget (); - int result = OS.SendMessage (handle, OS.LB_GETITEMHEIGHT, 0, 0); + int result = (int)/*64*/OS.SendMessage (handle, OS.LB_GETITEMHEIGHT, 0, 0); if (result == OS.LB_ERR) error (SWT.ERROR_CANNOT_GET_ITEM_HEIGHT); return result; } @@ -510,11 +510,11 @@ public String [] getSelection () { public int getSelectionCount () { checkWidget (); if ((style & SWT.SINGLE) != 0) { - int result = OS.SendMessage (handle, OS.LB_GETCURSEL, 0, 0); + int result = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCURSEL, 0, 0); if (result == OS.LB_ERR) return 0; return 1; } - int result = OS.SendMessage (handle, OS.LB_GETSELCOUNT, 0, 0); + int result = (int)/*64*/OS.SendMessage (handle, OS.LB_GETSELCOUNT, 0, 0); if (result == OS.LB_ERR) error (SWT.ERROR_CANNOT_GET_COUNT); return result; } @@ -533,17 +533,17 @@ public int getSelectionCount () { public int getSelectionIndex () { checkWidget (); if ((style & SWT.SINGLE) != 0) { - return OS.SendMessage (handle, OS.LB_GETCURSEL, 0, 0); + return (int)/*64*/OS.SendMessage (handle, OS.LB_GETCURSEL, 0, 0); } - int count = OS.SendMessage (handle, OS.LB_GETSELCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.LB_GETSELCOUNT, 0, 0); if (count == OS.LB_ERR) error (SWT.ERROR_CANNOT_GET_SELECTION); if (count == 0) return -1; - int index = OS.SendMessage (handle, OS.LB_GETCARETINDEX, 0, 0); - int result = OS.SendMessage (handle, OS.LB_GETSEL, index, 0); + int index = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCARETINDEX, 0, 0); + int result = (int)/*64*/OS.SendMessage (handle, OS.LB_GETSEL, index, 0); if (result == OS.LB_ERR) error (SWT.ERROR_CANNOT_GET_SELECTION); if (result != 0) return index; - int [] buffer = new int [1]; - result = OS.SendMessage (handle, OS.LB_GETSELITEMS, 1, buffer); + int [] buffer = new int[1]; + result = (int)/*64*/OS.SendMessage (handle, OS.LB_GETSELITEMS, 1, buffer); if (result != 1) error (SWT.ERROR_CANNOT_GET_SELECTION); return buffer [0]; } @@ -567,14 +567,14 @@ public int getSelectionIndex () { public int [] getSelectionIndices () { checkWidget (); if ((style & SWT.SINGLE) != 0) { - int result = OS.SendMessage (handle, OS.LB_GETCURSEL, 0, 0); + int result = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCURSEL, 0, 0); if (result == OS.LB_ERR) return new int [0]; return new int [] {result}; } - int length = OS.SendMessage (handle, OS.LB_GETSELCOUNT, 0, 0); + int length = (int)/*64*/OS.SendMessage (handle, OS.LB_GETSELCOUNT, 0, 0); if (length == OS.LB_ERR) error (SWT.ERROR_CANNOT_GET_SELECTION); int [] indices = new int [length]; - int result = OS.SendMessage (handle, OS.LB_GETSELITEMS, length, indices); + int result = (int)/*64*/OS.SendMessage (handle, OS.LB_GETSELITEMS, length, indices); if (result != length) error (SWT.ERROR_CANNOT_GET_SELECTION); return indices; } @@ -593,7 +593,7 @@ public int [] getSelectionIndices () { */ public int getTopIndex () { checkWidget (); - return OS.SendMessage (handle, OS.LB_GETTOPINDEX, 0, 0); + return (int)/*64*/OS.SendMessage (handle, OS.LB_GETTOPINDEX, 0, 0); } /** @@ -657,12 +657,12 @@ public int indexOf (String string, int start) { } /* Use LB_FINDSTRINGEXACT to search for the item */ - int count = OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); if (!(0 <= start && start < count)) return -1; int index = start - 1, last; TCHAR buffer = new TCHAR (getCodePage (), string, true); do { - index = OS.SendMessage (handle, OS.LB_FINDSTRINGEXACT, last = index, buffer); + index = (int)/*64*/OS.SendMessage (handle, OS.LB_FINDSTRINGEXACT, last = index, buffer); if (index == OS.LB_ERR || index <= last) return -1; } while (!string.equals (getItem (index))); return index; @@ -683,7 +683,7 @@ public int indexOf (String string, int start) { */ public boolean isSelected (int index) { checkWidget (); - int result = OS.SendMessage (handle, OS.LB_GETSEL, index, 0); + int result = (int)/*64*/OS.SendMessage (handle, OS.LB_GETSEL, index, 0); return (result != 0) && (result != OS.LB_ERR); } @@ -710,13 +710,14 @@ public void remove (int [] indices) { System.arraycopy (indices, 0, newIndices, 0, indices.length); sort (newIndices); int start = newIndices [newIndices.length - 1], end = newIndices [0]; - int count = OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); if (!(0 <= start && start <= end && end < count)) { error (SWT.ERROR_INVALID_RANGE); } - int topIndex = OS.SendMessage (handle, OS.LB_GETTOPINDEX, 0, 0); + int topIndex = (int)/*64*/OS.SendMessage (handle, OS.LB_GETTOPINDEX, 0, 0); RECT rect = null; - int hDC = 0, oldFont = 0, newFont = 0, newWidth = 0; + int /*long*/ hDC = 0, oldFont = 0, newFont = 0; + int newWidth = 0; if ((style & SWT.H_SCROLL) != 0) { rect = new RECT (); hDC = OS.GetDC (handle); @@ -730,13 +731,13 @@ public void remove (int [] indices) { if (index != last) { TCHAR buffer = null; if ((style & SWT.H_SCROLL) != 0) { - int length = OS.SendMessage (handle, OS.LB_GETTEXTLEN, index, 0); + int length = (int)/*64*/OS.SendMessage (handle, OS.LB_GETTEXTLEN, index, 0); if (length == OS.LB_ERR) break; buffer = new TCHAR (cp, length + 1); - int result = OS.SendMessage (handle, OS.LB_GETTEXT, index, buffer); + int result = (int)/*64*/OS.SendMessage (handle, OS.LB_GETTEXT, index, buffer); if (result == OS.LB_ERR) break; } - int result = OS.SendMessage (handle, OS.LB_DELETESTRING, index, 0); + int result = (int)/*64*/OS.SendMessage (handle, OS.LB_DELETESTRING, index, 0); if (result == OS.LB_ERR) break; if ((style & SWT.H_SCROLL) != 0) { int flags = OS.DT_CALCRECT | OS.DT_SINGLELINE | OS.DT_NOPREFIX; @@ -778,24 +779,24 @@ public void remove (int index) { checkWidget (); TCHAR buffer = null; if ((style & SWT.H_SCROLL) != 0) { - int length = OS.SendMessage (handle, OS.LB_GETTEXTLEN, index, 0); + int length = (int)/*64*/OS.SendMessage (handle, OS.LB_GETTEXTLEN, index, 0); if (length == OS.LB_ERR) { - int count = OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); if (0 <= index && index < count) error (SWT.ERROR_ITEM_NOT_REMOVED); error (SWT.ERROR_INVALID_RANGE); } buffer = new TCHAR (getCodePage (), length + 1); - int result = OS.SendMessage (handle, OS.LB_GETTEXT, index, buffer); + int result = (int)/*64*/OS.SendMessage (handle, OS.LB_GETTEXT, index, buffer); if (result == OS.LB_ERR) { - int count = OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); if (0 <= index && index < count) error (SWT.ERROR_ITEM_NOT_REMOVED); error (SWT.ERROR_INVALID_RANGE); } } - int topIndex = OS.SendMessage (handle, OS.LB_GETTOPINDEX, 0, 0); - int result = OS.SendMessage (handle, OS.LB_DELETESTRING, index, 0); + int topIndex = (int)/*64*/OS.SendMessage (handle, OS.LB_GETTOPINDEX, 0, 0); + int result = (int)/*64*/OS.SendMessage (handle, OS.LB_DELETESTRING, index, 0); if (result == OS.LB_ERR) { - int count = OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); if (0 <= index && index < count) error (SWT.ERROR_ITEM_NOT_REMOVED); error (SWT.ERROR_INVALID_RANGE); } @@ -824,7 +825,7 @@ public void remove (int index) { public void remove (int start, int end) { checkWidget (); if (start > end) return; - int count = OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); if (!(0 <= start && start <= end && end < count)) { error (SWT.ERROR_INVALID_RANGE); } @@ -832,9 +833,10 @@ public void remove (int start, int end) { removeAll (); return; } - int topIndex = OS.SendMessage (handle, OS.LB_GETTOPINDEX, 0, 0); + int topIndex = (int)/*64*/OS.SendMessage (handle, OS.LB_GETTOPINDEX, 0, 0); RECT rect = null; - int hDC = 0, oldFont = 0, newFont = 0, newWidth = 0; + int /*long*/ hDC = 0, oldFont = 0, newFont = 0; + int newWidth = 0; if ((style & SWT.H_SCROLL) != 0) { rect = new RECT (); hDC = OS.GetDC (handle); @@ -847,13 +849,13 @@ public void remove (int start, int end) { while (index <= end) { TCHAR buffer = null; if ((style & SWT.H_SCROLL) != 0) { - int length = OS.SendMessage (handle, OS.LB_GETTEXTLEN, start, 0); + int length = (int)/*64*/OS.SendMessage (handle, OS.LB_GETTEXTLEN, start, 0); if (length == OS.LB_ERR) break; buffer = new TCHAR (cp, length + 1); - int result = OS.SendMessage (handle, OS.LB_GETTEXT, start, buffer); + int result = (int)/*64*/OS.SendMessage (handle, OS.LB_GETTEXT, start, buffer); if (result == OS.LB_ERR) break; } - int result = OS.SendMessage (handle, OS.LB_DELETESTRING, start, 0); + int result = (int)/*64*/OS.SendMessage (handle, OS.LB_DELETESTRING, start, 0); if (result == OS.LB_ERR) break; if ((style & SWT.H_SCROLL) != 0) { OS.DrawText (hDC, buffer, -1, rect, flags); @@ -999,7 +1001,7 @@ public void select (int index) { void select (int index, boolean scroll) { if (index < 0) return; - int count = OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); if (index >= count) return; if (scroll) { if ((style & SWT.SINGLE) != 0) { @@ -1009,7 +1011,7 @@ void select (int index, boolean scroll) { } return; } - int topIndex = OS.SendMessage (handle, OS.LB_GETTOPINDEX, 0, 0); + int topIndex = (int)/*64*/OS.SendMessage (handle, OS.LB_GETTOPINDEX, 0, 0); RECT itemRect = new RECT (), selectedRect = null; OS.SendMessage (handle, OS.LB_GETITEMRECT, index, itemRect); boolean redraw = drawCount == 0 && OS.IsWindowVisible (handle); @@ -1019,14 +1021,14 @@ void select (int index, boolean scroll) { } int focusIndex = -1; if ((style & SWT.SINGLE) != 0) { - int oldIndex = OS.SendMessage (handle, OS.LB_GETCURSEL, 0, 0); + int oldIndex = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCURSEL, 0, 0); if (oldIndex != -1) { selectedRect = new RECT (); OS.SendMessage (handle, OS.LB_GETITEMRECT, oldIndex, selectedRect); } OS.SendMessage (handle, OS.LB_SETCURSEL, index, 0); } else { - focusIndex = OS.SendMessage (handle, OS.LB_GETCARETINDEX, 0, 0); + focusIndex = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCARETINDEX, 0, 0); OS.SendMessage (handle, OS.LB_SETSEL, 1, index); } if ((style & SWT.MULTI) != 0) { @@ -1070,7 +1072,7 @@ void select (int index, boolean scroll) { public void select (int start, int end) { checkWidget (); if (end < 0 || start > end || ((style & SWT.SINGLE) != 0 && start != end)) return; - int count = OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); if (count == 0 || start >= count) return; start = Math.max (0, start); end = Math.min (end, count - 1); @@ -1112,7 +1114,7 @@ public void selectAll () { void setFocusIndex (int index) { // checkWidget (); - int count = OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); if (!(0 <= index && index < count)) return; OS.SendMessage (handle, OS.LB_SETCARETINDEX, index, 0); } @@ -1170,14 +1172,15 @@ public void setItems (String [] items) { for (int i=0; i<items.length; i++) { if (items [i] == null) error (SWT.ERROR_INVALID_ARGUMENT); } - int oldProc = OS.GetWindowLong (handle, OS.GWL_WNDPROC); - OS.SetWindowLong (handle, OS.GWL_WNDPROC, ListProc); + int /*long*/ oldProc = OS.GetWindowLongPtr (handle, OS.GWLP_WNDPROC); + OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, ListProc); boolean redraw = drawCount == 0 && OS.IsWindowVisible (handle); if (redraw) { OS.SendMessage (handle, OS.WM_SETREDRAW, 0, 0); } RECT rect = null; - int hDC = 0, oldFont = 0, newFont = 0, newWidth = 0; + int /*long*/ hDC = 0, oldFont = 0, newFont = 0; + int newWidth = 0; if ((style & SWT.H_SCROLL) != 0) { rect = new RECT (); hDC = OS.GetDC (handle); @@ -1193,7 +1196,7 @@ public void setItems (String [] items) { while (index < length) { String string = items [index]; TCHAR buffer = new TCHAR (cp, string, true); - int result = OS.SendMessage (handle, OS.LB_ADDSTRING, 0, buffer); + int result = (int)/*64*/OS.SendMessage (handle, OS.LB_ADDSTRING, 0, buffer); if (result == OS.LB_ERR || result == OS.LB_ERRSPACE) break; if ((style & SWT.H_SCROLL) != 0) { int flags = OS.DT_CALCRECT | OS.DT_SINGLELINE | OS.DT_NOPREFIX; @@ -1220,25 +1223,25 @@ public void setItems (String [] items) { // int flags = OS.RDW_ERASE | OS.RDW_FRAME | OS.RDW_INVALIDATE; // OS.RedrawWindow (handle, null, 0, flags); } - OS.SetWindowLong (handle, OS.GWL_WNDPROC, oldProc); + OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, oldProc); if (index < items.length) error (SWT.ERROR_ITEM_NOT_ADDED); } void setScrollWidth () { int newWidth = 0; RECT rect = new RECT (); - int newFont, oldFont = 0; - int hDC = OS.GetDC (handle); + int /*long*/ newFont, oldFont = 0; + int /*long*/ hDC = OS.GetDC (handle); newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont); int cp = getCodePage (); - int count = OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); int flags = OS.DT_CALCRECT | OS.DT_SINGLELINE | OS.DT_NOPREFIX; for (int i=0; i<count; i++) { - int length = OS.SendMessage (handle, OS.LB_GETTEXTLEN, i, 0); + int length = (int)/*64*/OS.SendMessage (handle, OS.LB_GETTEXTLEN, i, 0); if (length != OS.LB_ERR) { TCHAR buffer = new TCHAR (cp, length + 1); - int result = OS.SendMessage (handle, OS.LB_GETTEXT, i, buffer); + int result = (int)/*64*/OS.SendMessage (handle, OS.LB_GETTEXT, i, buffer); if (result != OS.LB_ERR) { OS.DrawText (hDC, buffer, -1, rect, flags); newWidth = Math.max (newWidth, rect.right - rect.left); @@ -1252,8 +1255,8 @@ void setScrollWidth () { void setScrollWidth (TCHAR buffer, boolean grow) { RECT rect = new RECT (); - int newFont, oldFont = 0; - int hDC = OS.GetDC (handle); + int /*long*/ newFont, oldFont = 0; + int /*long*/ hDC = OS.GetDC (handle); newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont); int flags = OS.DT_CALCRECT | OS.DT_SINGLELINE | OS.DT_NOPREFIX; @@ -1265,7 +1268,7 @@ void setScrollWidth (TCHAR buffer, boolean grow) { void setScrollWidth (int newWidth, boolean grow) { newWidth += INSET; - int width = OS.SendMessage (handle, OS.LB_GETHORIZONTALEXTENT, 0, 0); + int width = (int)/*64*/OS.SendMessage (handle, OS.LB_GETHORIZONTALEXTENT, 0, 0); if (grow) { if (newWidth <= width) return; OS.SendMessage (handle, OS.LB_SETHORIZONTALEXTENT, newWidth, 0); @@ -1409,7 +1412,7 @@ public void setSelection (int start, int end) { checkWidget (); deselectAll (); if (end < 0 || start > end || ((style & SWT.SINGLE) != 0 && start != end)) return; - int count = OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); if (count == 0 || start >= count) return; start = Math.max (0, start); end = Math.min (end, count - 1); @@ -1435,9 +1438,9 @@ public void setSelection (int start, int end) { */ public void setTopIndex (int index) { checkWidget (); - int result = OS.SendMessage (handle, OS.LB_SETTOPINDEX, index, 0); + int result = (int)/*64*/OS.SendMessage (handle, OS.LB_SETTOPINDEX, index, 0); if (result == OS.LB_ERR) { - int count = OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); index = Math.min (count - 1, Math.max (0, index)); OS.SendMessage (handle, OS.LB_SETTOPINDEX, index, 0); } @@ -1457,21 +1460,21 @@ public void showSelection () { checkWidget (); int index; if ((style & SWT.SINGLE) != 0) { - index = OS.SendMessage (handle, OS.LB_GETCURSEL, 0, 0); + index = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCURSEL, 0, 0); } else { int [] indices = new int [1]; - int result = OS.SendMessage (handle, OS.LB_GETSELITEMS, 1, indices); + int result = (int)/*64*/OS.SendMessage (handle, OS.LB_GETSELITEMS, 1, indices); index = indices [0]; if (result != 1) index = -1; } if (index == -1) return; - int count = OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); if (count == 0) return; - int height = OS.SendMessage (handle, OS.LB_GETITEMHEIGHT, 0, 0); + int height = (int)/*64*/OS.SendMessage (handle, OS.LB_GETITEMHEIGHT, 0, 0); forceResize (); RECT rect = new RECT (); OS.GetClientRect (handle, rect); - int topIndex = OS.SendMessage (handle, OS.LB_GETTOPINDEX, 0, 0); + int topIndex = (int)/*64*/OS.SendMessage (handle, OS.LB_GETTOPINDEX, 0, 0); int visibleCount = Math.max (rect.bottom / height, 1); int bottomIndex = Math.min (topIndex + visibleCount, count) - 1; if (topIndex <= index && index <= bottomIndex) return; @@ -1493,11 +1496,11 @@ TCHAR windowClass () { return ListClass; } -int windowProc () { +int /*long*/ windowProc () { return ListProc; } -LRESULT WM_SIZE (int wParam, int lParam) { +LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) { /* * Bug in Windows. If the top index is changed while the * list is being resized, Windows does not redraw properly @@ -1510,7 +1513,7 @@ LRESULT WM_SIZE (int wParam, int lParam) { * is to redraw the control when the horizontal scroll bar is * not at the beginning. */ - int oldIndex = OS.SendMessage (handle, OS.LB_GETTOPINDEX, 0, 0); + int oldIndex = (int)/*64*/OS.SendMessage (handle, OS.LB_GETTOPINDEX, 0, 0); LRESULT result = super.WM_SIZE (wParam, lParam); if (!isDisposed ()) { SCROLLINFO info = new SCROLLINFO (); @@ -1519,13 +1522,13 @@ LRESULT WM_SIZE (int wParam, int lParam) { if (OS.GetScrollInfo (handle, OS.SB_HORZ, info)) { if (info.nPos != 0) OS.InvalidateRect (handle, null, true); } - int newIndex = OS.SendMessage (handle, OS.LB_GETTOPINDEX, 0, 0); + int newIndex = (int)/*64*/OS.SendMessage (handle, OS.LB_GETTOPINDEX, 0, 0); if (oldIndex != newIndex) OS.InvalidateRect (handle, null, true); } return result; } -LRESULT wmCommandChild (int wParam, int lParam) { +LRESULT wmCommandChild (int /*long*/ wParam, int /*long*/ lParam) { int code = OS.HIWORD (wParam); switch (code) { case OS.LBN_SELCHANGE: diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Menu.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Menu.java index ba79d579b3..3a46babb3c 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Menu.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Menu.java @@ -46,9 +46,11 @@ public class Menu extends Widget { * platforms and should never be accessed from application code. * </p> */ - public int handle; + public int /*long*/ handle; - int x, y, hBrush, hwndCB, id0, id1; + int x, y; + int /*long*/ hBrush, hwndCB; + int id0, id1; int foreground = -1, background = -1; Image backgroundImage; boolean hasLocation; @@ -173,7 +175,7 @@ public Menu (MenuItem parentItem) { this (checkNull (parentItem).parent); } -Menu (Decorations parent, int style, int handle) { +Menu (Decorations parent, int style, int /*long*/ handle) { super (parent, checkStyle (style)); this.parent = parent; this.handle = handle; @@ -197,7 +199,7 @@ Menu (Decorations parent, int style, int handle) { void _setVisible (boolean visible) { if ((style & (SWT.BAR | SWT.DROP_DOWN)) != 0) return; - int hwndParent = parent.handle; + int /*long*/ hwndParent = parent.handle; if (visible) { int flags = OS.TPM_LEFTBUTTON; if (OS.GetKeyState (OS.VK_LBUTTON) >= 0) flags |= OS.TPM_RIGHTBUTTON; @@ -310,7 +312,7 @@ void createHandle () { if (handle != 0) return; if ((style & SWT.BAR) != 0) { if (OS.IsPPC) { - int hwndShell = parent.handle; + int /*long*/ hwndShell = parent.handle; SHMENUBARINFO mbi = new SHMENUBARINFO (); mbi.cbSize = SHMENUBARINFO.sizeof; mbi.hwndParent = hwndShell; @@ -367,7 +369,7 @@ void createHandle () { /* Set first item */ if (nToolBarId == ID_SPMM || nToolBarId == ID_SPMB) { - int hMenu = OS.SendMessage (hwndCB, OS.SHCMBM_GETSUBMENU, 0, ID_SPSOFTKEY0); + int /*long*/ hMenu = OS.SendMessage (hwndCB, OS.SHCMBM_GETSUBMENU, 0, ID_SPSOFTKEY0); /* Remove the item from the resource file */ OS.RemoveMenu (hMenu, 0, OS.MF_BYPOSITION); Menu menu = new Menu (parent, SWT.DROP_DOWN, hMenu); @@ -380,7 +382,7 @@ void createHandle () { /* Set second item */ if (nToolBarId == ID_SPMM || nToolBarId == ID_SPBM) { - int hMenu = OS.SendMessage (hwndCB, OS.SHCMBM_GETSUBMENU, 0, ID_SPSOFTKEY1); + int /*long*/ hMenu = OS.SendMessage (hwndCB, OS.SHCMBM_GETSUBMENU, 0, ID_SPSOFTKEY1); OS.RemoveMenu (hMenu, 0, OS.MF_BYPOSITION); Menu menu = new Menu (parent, SWT.DROP_DOWN, hMenu); item = new MenuItem (this, menu, SWT.CASCADE, 1); @@ -396,14 +398,14 @@ void createHandle () { * a result, Shell on WinCE SP must use the class Dialog. */ int dwMask = OS.SHMBOF_NODEFAULT | OS.SHMBOF_NOTIFY; - int lParam = OS.MAKELPARAM (dwMask, dwMask); + int /*long*/ lParam = OS.MAKELPARAM (dwMask, dwMask); OS.SendMessage (hwndCB, OS.SHCMBM_OVERRIDEKEY, OS.VK_ESCAPE, lParam); return; } handle = OS.CreateMenu (); if (handle == 0) error (SWT.ERROR_NO_HANDLES); if (OS.IsHPC) { - int hwndShell = parent.handle; + int /*long*/ hwndShell = parent.handle; hwndCB = OS.CommandBar_Create (OS.GetModuleHandle (null), hwndShell, 1); if (hwndCB == 0) error (SWT.ERROR_NO_HANDLES); OS.CommandBar_Show (hwndCB, false); @@ -467,15 +469,16 @@ void createItem (MenuItem item, int index) { * becomes unexpectedly disabled. The fix is to insert a * space. */ - int hHeap = OS.GetProcessHeap (); + int /*long*/ hHeap = OS.GetProcessHeap (); TCHAR buffer = new TCHAR (0, " ", true); int byteCount = buffer.length () * TCHAR.sizeof; - int pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); + int /*long*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); OS.MoveMemory (pszText, buffer, byteCount); MENUITEMINFO info = new MENUITEMINFO (); info.cbSize = MENUITEMINFO.sizeof; info.fMask = OS.MIIM_ID | OS.MIIM_TYPE | OS.MIIM_DATA; - info.wID = info.dwItemData = item.id; + info.wID = item.id; + info.dwItemData = item.id; info.fType = item.widgetStyle (); info.dwTypeData = pszText; success = OS.InsertMenuItem (handle, index, true, info); @@ -528,11 +531,11 @@ void destroyItem (MenuItem item) { redraw(); return; } - int index = OS.SendMessage (hwndCB, OS.TB_COMMANDTOINDEX, item.id, 0); + int index = (int)/*64*/OS.SendMessage (hwndCB, OS.TB_COMMANDTOINDEX, item.id, 0); if (OS.SendMessage (hwndCB, OS.TB_DELETEBUTTON, index, 0) == 0) { error (SWT.ERROR_ITEM_NOT_REMOVED); } - int count = OS.SendMessage (hwndCB, OS.TB_BUTTONCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (hwndCB, OS.TB_BUTTONCOUNT, 0, 0); if (count == 0) { if (imageList != null) { OS.SendMessage (handle, OS.TB_SETIMAGELIST, 0, 0); @@ -565,7 +568,7 @@ void destroyItem (MenuItem item) { } void destroyWidget () { - int hMenu = handle, hCB = hwndCB; + int /*long*/ hMenu = handle, hCB = hwndCB; releaseHandle (); if (OS.IsWinCE && hCB != 0) { OS.CommandBar_Destroy (hCB); @@ -645,7 +648,7 @@ void fixMenus (Decorations newParent) { if (parent.menuBar != this) { return new Rectangle (0, 0, 0, 0); } - int hwndShell = parent.handle; + int /*long*/ hwndShell = parent.handle; MENUBARINFO info = new MENUBARINFO (); info.cbSize = MENUBARINFO.sizeof; if (OS.GetMenuBarInfo (hwndShell, OS.OBJID_MENU, 0, info)) { @@ -749,11 +752,11 @@ public boolean getEnabled () { */ public MenuItem getItem (int index) { checkWidget (); - int id = 0; + int /*long*/ id = 0; if ((OS.IsPPC || OS.IsSP) && hwndCB != 0) { if (OS.IsPPC) { TBBUTTON lpButton = new TBBUTTON (); - int result = OS.SendMessage (hwndCB, OS.TB_GETBUTTON, index, lpButton); + int /*long*/ result = OS.SendMessage (hwndCB, OS.TB_GETBUTTON, index, lpButton); if (result == 0) error (SWT.ERROR_CANNOT_GET_ITEM); id = lpButton.idCommand; } @@ -813,7 +816,7 @@ public MenuItem [] getItems () { result[1] = display.getMenuItem (id1); return result; } - int count = OS.SendMessage (hwndCB, OS.TB_BUTTONCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (hwndCB, OS.TB_BUTTONCOUNT, 0, 0); TBBUTTON lpButton = new TBBUTTON (); MenuItem [] result = new MenuItem [count]; for (int i=0; i<count; i++) { @@ -844,10 +847,10 @@ public MenuItem [] getItems () { return result; } -int GetMenuItemCount (int handle) { +int GetMenuItemCount (int /*long*/ handle) { if (OS.IsWinCE) { if ((OS.IsPPC || OS.IsSP) && hwndCB != 0) { - return OS.IsSP ? 2 : OS.SendMessage (hwndCB, OS.TB_BUTTONCOUNT, 0, 0); + return OS.IsSP ? 2 : (int)/*64*/OS.SendMessage (hwndCB, OS.TB_BUTTONCOUNT, 0, 0); } int count = 0; MENUITEMINFO info = new MENUITEMINFO (); @@ -984,7 +987,7 @@ int imageIndex (Image image) { Rectangle bounds = image.getBounds (); imageList = display.getImageList (style & SWT.RIGHT_TO_LEFT, bounds.width, bounds.height); int index = imageList.add (image); - int hImageList = imageList.getHandle (); + int /*long*/ hImageList = imageList.getHandle (); OS.SendMessage (hwndCB, OS.TB_SETIMAGELIST, 0, hImageList); return index; } @@ -1021,7 +1024,7 @@ public int indexOf (MenuItem item) { if (item.parent != this) return -1; if ((OS.IsPPC || OS.IsSP) && hwndCB != 0) { if (OS.IsPPC) { - return OS.SendMessage (hwndCB, OS.TB_COMMANDTOINDEX, item.id, 0); + return (int)/*64*/OS.SendMessage (hwndCB, OS.TB_COMMANDTOINDEX, item.id, 0); } if (OS.IsSP) { if (item.id == id0) return 0; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MenuItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MenuItem.java index 59e6d70364..ec1551fe03 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MenuItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MenuItem.java @@ -35,7 +35,8 @@ import org.eclipse.swt.events.*; public class MenuItem extends Item { Menu parent, menu; - int hBitmap, id, accelerator; + int /*long*/ hBitmap; + int id, accelerator; /* * Feature in Windows. On Windows 98, it is necessary * to add 4 pixels to the width of the image or the image @@ -324,7 +325,7 @@ public int getAccelerator () { if (shell.menuBar != parent) { return new Rectangle (0, 0, 0, 0); } - int hwndShell = shell.handle; + int /*long*/ hwndShell = shell.handle; MENUBARINFO info1 = new MENUBARINFO (); info1.cbSize = MENUBARINFO.sizeof; if (!OS.GetMenuBarInfo (hwndShell, OS.OBJID_MENU, 1, info1)) { @@ -341,7 +342,7 @@ public int getAccelerator () { int height = info2.bottom - info2.top; return new Rectangle (x, y, width, height); } else { - int hMenu = parent.handle; + int /*long*/ hMenu = parent.handle; RECT rect1 = new RECT (); if (!OS.GetMenuItemRect (0, hMenu, 0, rect1)) { return new Rectangle (0, 0, 0, 0); @@ -376,14 +377,14 @@ public int getAccelerator () { public boolean getEnabled () { checkWidget (); if ((OS.IsPPC || OS.IsSP) && parent.hwndCB != 0) { - int hwndCB = parent.hwndCB; + int /*long*/ hwndCB = parent.hwndCB; TBBUTTONINFO info = new TBBUTTONINFO (); info.cbSize = TBBUTTONINFO.sizeof; info.dwMask = OS.TBIF_STATE; OS.SendMessage (hwndCB, OS.TB_GETBUTTONINFO, id, info); return (info.fsState & OS.TBSTATE_ENABLED) != 0; } - int hMenu = parent.handle; + int /*long*/ hMenu = parent.handle; MENUITEMINFO info = new MENUITEMINFO (); info.cbSize = MENUITEMINFO.sizeof; info.fMask = OS.MIIM_STATE; @@ -456,7 +457,7 @@ public boolean getSelection () { checkWidget (); if ((style & (SWT.CHECK | SWT.RADIO)) == 0) return false; if ((OS.IsPPC || OS.IsSP) && parent.hwndCB != 0) return false; - int hMenu = parent.handle; + int /*long*/ hMenu = parent.handle; MENUITEMINFO info = new MENUITEMINFO (); info.cbSize = MENUITEMINFO.sizeof; info.fMask = OS.MIIM_STATE; @@ -641,7 +642,7 @@ public void setAccelerator (int accelerator) { public void setEnabled (boolean enabled) { checkWidget (); if ((OS.IsPPC || OS.IsSP) && parent.hwndCB != 0) { - int hwndCB = parent.hwndCB; + int /*long*/ hwndCB = parent.hwndCB; TBBUTTONINFO info = new TBBUTTONINFO (); info.cbSize = TBBUTTONINFO.sizeof; info.dwMask = OS.TBIF_STATE; @@ -650,7 +651,7 @@ public void setEnabled (boolean enabled) { if (enabled) info.fsState |= OS.TBSTATE_ENABLED; OS.SendMessage (hwndCB, OS.TB_SETBUTTONINFO, id, info); } else { - int hMenu = parent.handle; + int /*long*/ hMenu = parent.handle; if (OS.IsWinCE) { int index = parent.indexOf (this); if (index == -1) return; @@ -711,7 +712,7 @@ public void setImage (Image image) { super.setImage (image); if (OS.IsWinCE) { if ((OS.IsPPC || OS.IsSP) && parent.hwndCB != 0) { - int hwndCB = parent.hwndCB; + int /*long*/ hwndCB = parent.hwndCB; TBBUTTONINFO info = new TBBUTTONINFO (); info.cbSize = TBBUTTONINFO.sizeof; info.dwMask = OS.TBIF_IMAGE; @@ -734,7 +735,7 @@ public void setImage (Image image) { info.hbmpItem = OS.HBMMENU_CALLBACK; } } - int hMenu = parent.handle; + int /*long*/ hMenu = parent.handle; OS.SetMenuItemInfo (hMenu, id, false, info); parent.redraw (); } @@ -790,8 +791,8 @@ public void setMenu (Menu menu) { /* Assign the new menu in the OS */ if ((OS.IsPPC || OS.IsSP) && parent.hwndCB != 0) { if (OS.IsPPC) { - int hwndCB = parent.hwndCB; - int hMenu = menu == null ? 0 : menu.handle; + int /*long*/ hwndCB = parent.hwndCB; + int /*long*/ hMenu = menu == null ? 0 : menu.handle; OS.SendMessage (hwndCB, OS.SHCMBM_SETSUBMENU, id, hMenu); } if (OS.IsSP) error (SWT.ERROR_CANNOT_SET_MENU); @@ -804,7 +805,7 @@ public void setMenu (Menu menu) { * remove the item with RemoveMenu () which does not destroy * the submenu and then insert the item with InsertMenuItem (). */ - int hMenu = parent.handle; + int /*long*/ hMenu = parent.handle; MENUITEMINFO info = new MENUITEMINFO (); info.cbSize = MENUITEMINFO.sizeof; info.fMask = OS.MIIM_DATA; @@ -835,9 +836,9 @@ public void setMenu (Menu menu) { } int cch = 128; - int hHeap = OS.GetProcessHeap (); + int /*long*/ hHeap = OS.GetProcessHeap (); int byteCount = cch * TCHAR.sizeof; - int pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); + int /*long*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); info.fMask = OS.MIIM_STATE | OS.MIIM_ID | OS.MIIM_TYPE | OS.MIIM_DATA; info.dwTypeData = pszText; info.cch = cch; @@ -856,7 +857,7 @@ public void setMenu (Menu menu) { * the item, SetMenuItemInfo() to set the string and EnableMenuItem() * and CheckMenuItem() to set the state. */ - int uIDNewItem = id; + int /*long*/ uIDNewItem = id; int uFlags = OS.MF_BYPOSITION; if (menu != null) { uFlags |= OS.MF_POPUP; @@ -929,7 +930,7 @@ public void setSelection (boolean selected) { checkWidget (); if ((style & (SWT.CHECK | SWT.RADIO)) == 0) return; if ((OS.IsPPC || OS.IsSP) && parent.hwndCB != 0) return; - int hMenu = parent.handle; + int /*long*/ hMenu = parent.handle; if (OS.IsWinCE) { int index = parent.indexOf (this); if (index == -1) return; @@ -1004,8 +1005,8 @@ public void setText (String string) { if ((style & SWT.SEPARATOR) != 0) return; if (text.equals (string)) return; super.setText (string); - int hHeap = OS.GetProcessHeap (); - int pszText = 0; + int /*long*/ hHeap = OS.GetProcessHeap (); + int /*long*/ pszText = 0; boolean success = false; if ((OS.IsPPC || OS.IsSP) && parent.hwndCB != 0) { /* @@ -1029,7 +1030,7 @@ public void setText (String string) { int byteCount = buffer.length () * TCHAR.sizeof; pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); OS.MoveMemory (pszText, buffer, byteCount); - int hwndCB = parent.hwndCB; + int /*long*/ hwndCB = parent.hwndCB; TBBUTTONINFO info2 = new TBBUTTONINFO (); info2.cbSize = TBBUTTONINFO.sizeof; info2.dwMask = OS.TBIF_TEXT; @@ -1038,7 +1039,7 @@ public void setText (String string) { } else { MENUITEMINFO info = new MENUITEMINFO (); info.cbSize = MENUITEMINFO.sizeof; - int hMenu = parent.handle; + int /*long*/ hMenu = parent.handle; /* * Bug in Windows 2000. For some reason, when MIIM_TYPE is set @@ -1106,7 +1107,7 @@ int widgetStyle () { return bits | OS.MFT_STRING; } -LRESULT wmCommandChild (int wParam, int lParam) { +LRESULT wmCommandChild (int /*long*/ wParam, int /*long*/ lParam) { if ((style & SWT.CHECK) != 0) { setSelection (!getSelection ()); } else { @@ -1124,7 +1125,7 @@ LRESULT wmCommandChild (int wParam, int lParam) { return null; } -LRESULT wmDrawChild (int wParam, int lParam) { +LRESULT wmDrawChild (int /*long*/ wParam, int /*long*/ lParam) { DRAWITEMSTRUCT struct = new DRAWITEMSTRUCT (); OS.MoveMemory (struct, lParam, DRAWITEMSTRUCT.sizeof); if (image != null) { @@ -1147,7 +1148,7 @@ LRESULT wmDrawChild (int wParam, int lParam) { return null; } -LRESULT wmMeasureChild (int wParam, int lParam) { +LRESULT wmMeasureChild (int /*long*/ wParam, int /*long*/ lParam) { MEASUREITEMSTRUCT struct = new MEASUREITEMSTRUCT (); OS.MoveMemory (struct, lParam, MEASUREITEMSTRUCT.sizeof); int width = 0, height = 0; @@ -1169,7 +1170,7 @@ LRESULT wmMeasureChild (int wParam, int lParam) { MENUINFO lpcmi = new MENUINFO (); lpcmi.cbSize = MENUINFO.sizeof; lpcmi.fMask = OS.MIM_STYLE; - int hMenu = parent.handle; + int /*long*/ hMenu = parent.handle; OS.GetMenuInfo (hMenu, lpcmi); if ((lpcmi.dwStyle & OS.MNS_CHECKORBMP) == 0) { MenuItem [] items = parent.getItems (); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MessageBox.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MessageBox.java index c8ef322c0d..73c3d7272e 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MessageBox.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MessageBox.java @@ -175,7 +175,7 @@ public int open () { * anyway and not rely on MB_MODAL to work by making the * parent be temporarily modal. */ - int hwndOwner = parent != null ? parent.handle : 0; + int /*long*/ hwndOwner = parent != null ? parent.handle : 0; Shell oldModal = null; Display display = null; if ((bits & OS.MB_TASKMODAL) != 0) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ProgressBar.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ProgressBar.java index 67740c3246..ac6824801e 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ProgressBar.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ProgressBar.java @@ -36,7 +36,7 @@ public class ProgressBar extends Control { static final int DELAY = 100; static final int TIMER_ID = 100; static final int MINIMUM_WIDTH = 100; - static final int ProgressBarProc; + static final int /*long*/ ProgressBarProc; static final TCHAR ProgressBarClass = new TCHAR (0, OS.PROGRESS_CLASS, true); static { WNDCLASS lpWndClass = new WNDCLASS (); @@ -59,13 +59,13 @@ public class ProgressBar extends Control { * code, other than SWT, could create a control with * this class name, and fail unexpectedly. */ - int hInstance = OS.GetModuleHandle (null); - int hHeap = OS.GetProcessHeap (); + int /*long*/ hInstance = OS.GetModuleHandle (null); + int /*long*/ hHeap = OS.GetProcessHeap (); lpWndClass.hInstance = hInstance; lpWndClass.style &= ~OS.CS_GLOBALCLASS; lpWndClass.style |= OS.CS_DBLCLKS; int byteCount = ProgressBarClass.length () * TCHAR.sizeof; - int lpszClassName = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); + int /*long*/ lpszClassName = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); OS.MoveMemory (lpszClassName, ProgressBarClass, byteCount); lpWndClass.lpszClassName = lpszClassName; OS.RegisterClass (lpWndClass); @@ -106,7 +106,7 @@ public ProgressBar (Composite parent, int style) { super (parent, checkStyle (style)); } -int callWindowProc (int hwnd, int msg, int wParam, int lParam) { +int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) { if (handle == 0) return 0; return OS.CallWindowProc (ProgressBarProc, hwnd, msg, wParam, lParam); } @@ -153,7 +153,7 @@ int defaultForeground () { */ public int getMaximum () { checkWidget (); - return OS.SendMessage (handle, OS.PBM_GETRANGE, 0, 0); + return (int)/*64*/OS.SendMessage (handle, OS.PBM_GETRANGE, 0, 0); } /** @@ -168,7 +168,7 @@ public int getMaximum () { */ public int getMinimum () { checkWidget (); - return OS.SendMessage (handle, OS.PBM_GETRANGE, 1, 0); + return (int)/*64*/OS.SendMessage (handle, OS.PBM_GETRANGE, 1, 0); } /** @@ -183,7 +183,7 @@ public int getMinimum () { */ public int getSelection () { checkWidget (); - return OS.SendMessage (handle, OS.PBM_GETPOS, 0, 0); + return (int)/*64*/OS.SendMessage (handle, OS.PBM_GETPOS, 0, 0); } void releaseWidget () { @@ -238,7 +238,7 @@ void setForegroundPixel (int pixel) { */ public void setMaximum (int value) { checkWidget (); - int minimum = OS.SendMessage (handle, OS.PBM_GETRANGE, 1, 0); + int minimum = (int)/*64*/OS.SendMessage (handle, OS.PBM_GETRANGE, 1, 0); if (0 <= minimum && minimum < value) { OS.SendMessage (handle, OS.PBM_SETRANGE32, minimum, value); } @@ -259,7 +259,7 @@ public void setMaximum (int value) { */ public void setMinimum (int value) { checkWidget (); - int maximum = OS.SendMessage (handle, OS.PBM_GETRANGE, 0, 0); + int maximum = (int)/*64*/OS.SendMessage (handle, OS.PBM_GETRANGE, 0, 0); if (0 <= value && value < maximum) { OS.SendMessage (handle, OS.PBM_SETRANGE32, value, maximum); } @@ -294,11 +294,11 @@ TCHAR windowClass () { return ProgressBarClass; } -int windowProc () { +int /*long*/ windowProc () { return ProgressBarProc; } -LRESULT WM_GETDLGCODE (int wParam, int lParam) { +LRESULT WM_GETDLGCODE (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_GETDLGCODE (wParam, lParam); if (result != null) return result; /* @@ -313,7 +313,7 @@ LRESULT WM_GETDLGCODE (int wParam, int lParam) { return new LRESULT (OS.DLGC_STATIC); } -LRESULT WM_SIZE (int wParam, int lParam) { +LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_SIZE (wParam, lParam); if (result != null) return result; /* @@ -349,7 +349,7 @@ LRESULT WM_SIZE (int wParam, int lParam) { return result; } -LRESULT WM_TIMER (int wParam, int lParam) { +LRESULT WM_TIMER (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_TIMER (wParam, lParam); if (result != null) return result; if ((style & SWT.INDETERMINATE) != 0) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Sash.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Sash.java index 2157186482..2259233a13 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Sash.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Sash.java @@ -105,7 +105,7 @@ public void addSelectionListener (SelectionListener listener) { addListener (SWT.DefaultSelection,typedListener); } -int callWindowProc (int hwnd, int msg, int wParam, int lParam) { +int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) { if (handle == 0) return 0; return OS.DefWindowProc (hwnd, msg, wParam, lParam); } @@ -135,12 +135,12 @@ public Point computeSize (int wHint, int hHint, boolean changed) { void drawBand (int x, int y, int width, int height) { if ((style & SWT.SMOOTH) != 0) return; - int hwndTrack = parent.handle; + int /*long*/ hwndTrack = parent.handle; byte [] bits = {-86, 0, 85, 0, -86, 0, 85, 0, -86, 0, 85, 0, -86, 0, 85, 0}; - int stippleBitmap = OS.CreateBitmap (8, 8, 1, 1, bits); - int stippleBrush = OS.CreatePatternBrush (stippleBitmap); - int hDC = OS.GetDCEx (hwndTrack, 0, OS.DCX_CACHE); - int oldBrush = OS.SelectObject (hDC, stippleBrush); + int /*long*/ stippleBitmap = OS.CreateBitmap (8, 8, 1, 1, bits); + int /*long*/ stippleBrush = OS.CreatePatternBrush (stippleBitmap); + int /*long*/ hDC = OS.GetDCEx (hwndTrack, 0, OS.DCX_CACHE); + int /*long*/ oldBrush = OS.SelectObject (hDC, stippleBrush); OS.PatBlt (hDC, x, y, width, height, OS.PATINVERT); OS.SelectObject (hDC, oldBrush); OS.ReleaseDC (hwndTrack, hDC); @@ -177,20 +177,20 @@ TCHAR windowClass () { return display.windowClass; } -int windowProc () { +int /*long*/ windowProc () { return display.windowProc; } -LRESULT WM_ERASEBKGND (int wParam, int lParam) { +LRESULT WM_ERASEBKGND (int /*long*/ wParam, int /*long*/ lParam) { super.WM_ERASEBKGND (wParam, lParam); drawBackground (wParam); return LRESULT.ONE; } -LRESULT WM_KEYDOWN (int wParam, int lParam) { +LRESULT WM_KEYDOWN (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_KEYDOWN (wParam, lParam); if (result != null) return result; - switch (wParam) { + switch ((int)/*64*/wParam) { case OS.VK_LEFT: case OS.VK_RIGHT: case OS.VK_UP: @@ -207,7 +207,7 @@ LRESULT WM_KEYDOWN (int wParam, int lParam) { if (wParam == OS.VK_LEFT || wParam == OS.VK_RIGHT) break; pt.y = wParam == OS.VK_UP ? -step : step; } - int hwndTrack = parent.handle; + int /*long*/ hwndTrack = parent.handle; OS.MapWindowPoints (handle, hwndTrack, pt, 1); RECT rect = new RECT (), clientRect = new RECT (); OS.GetWindowRect (handle, rect); @@ -253,16 +253,16 @@ LRESULT WM_KEYDOWN (int wParam, int lParam) { return result; } -LRESULT WM_GETDLGCODE (int wParam, int lParam) { +LRESULT WM_GETDLGCODE (int /*long*/ wParam, int /*long*/ lParam) { return new LRESULT (OS.DLGC_STATIC); } -LRESULT WM_LBUTTONDOWN (int wParam, int lParam) { +LRESULT WM_LBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_LBUTTONDOWN (wParam, lParam); if (result == LRESULT.ZERO) return result; /* Compute the banding rectangle */ - int hwndTrack = parent.handle; + int /*long*/ hwndTrack = parent.handle; POINT pt = new POINT (); OS.POINTSTOPOINT (pt, lParam); RECT rect = new RECT (); @@ -310,7 +310,7 @@ LRESULT WM_LBUTTONDOWN (int wParam, int lParam) { return result; } -LRESULT WM_LBUTTONUP (int wParam, int lParam) { +LRESULT WM_LBUTTONUP (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_LBUTTONUP (wParam, lParam); if (result == LRESULT.ZERO) return result; @@ -340,7 +340,7 @@ LRESULT WM_LBUTTONUP (int wParam, int lParam) { return result; } -LRESULT WM_MOUSEMOVE (int wParam, int lParam) { +LRESULT WM_MOUSEMOVE (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_MOUSEMOVE (wParam, lParam); if (result != null) return result; if (!dragging || (wParam & OS.MK_LBUTTON) == 0) return result; @@ -348,7 +348,7 @@ LRESULT WM_MOUSEMOVE (int wParam, int lParam) { /* Compute the banding rectangle */ POINT pt = new POINT (); OS.POINTSTOPOINT (pt, lParam); - int hwndTrack = parent.handle; + int /*long*/ hwndTrack = parent.handle; OS.MapWindowPoints (handle, hwndTrack, pt, 1); RECT rect = new RECT (), clientRect = new RECT (); OS.GetWindowRect (handle, rect); @@ -395,12 +395,12 @@ LRESULT WM_MOUSEMOVE (int wParam, int lParam) { return result; } -LRESULT WM_SETCURSOR (int wParam, int lParam) { +LRESULT WM_SETCURSOR (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_SETCURSOR (wParam, lParam); if (result != null) return result; int hitTest = (short) OS.LOWORD (lParam); if (hitTest == OS.HTCLIENT) { - int hCursor = 0; + int /*long*/ hCursor = 0; if ((style & SWT.HORIZONTAL) != 0) { hCursor = OS.LoadCursor (0, OS.IDC_SIZENS); } else { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Scale.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Scale.java index 38d399f72d..3d205f0391 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Scale.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Scale.java @@ -37,7 +37,7 @@ import org.eclipse.swt.events.*; public class Scale extends Control { boolean ignoreResize; - static final int TrackBarProc; + static final int /*long*/ TrackBarProc; static final TCHAR TrackBarClass = new TCHAR (0, OS.TRACKBAR_CLASS, true); static { WNDCLASS lpWndClass = new WNDCLASS (); @@ -60,13 +60,13 @@ public class Scale extends Control { * code, other than SWT, could create a control with * this class name, and fail unexpectedly. */ - int hInstance = OS.GetModuleHandle (null); - int hHeap = OS.GetProcessHeap (); + int /*long*/ hInstance = OS.GetModuleHandle (null); + int /*long*/ hHeap = OS.GetProcessHeap (); lpWndClass.hInstance = hInstance; lpWndClass.style &= ~OS.CS_GLOBALCLASS; lpWndClass.style |= OS.CS_DBLCLKS; int byteCount = TrackBarClass.length () * TCHAR.sizeof; - int lpszClassName = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); + int /*long*/ lpszClassName = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); OS.MoveMemory (lpszClassName, TrackBarClass, byteCount); lpWndClass.lpszClassName = lpszClassName; OS.RegisterClass (lpWndClass); @@ -137,7 +137,7 @@ public void addSelectionListener(SelectionListener listener) { addListener (SWT.DefaultSelection,typedListener); } -int callWindowProc (int hwnd, int msg, int wParam, int lParam) { +int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) { if (handle == 0) return 0; return OS.CallWindowProc (TrackBarProc, hwnd, msg, wParam, lParam); } @@ -192,7 +192,7 @@ int defaultForeground () { */ public int getIncrement () { checkWidget (); - return OS.SendMessage (handle, OS.TBM_GETLINESIZE, 0, 0); + return (int)/*64*/OS.SendMessage (handle, OS.TBM_GETLINESIZE, 0, 0); } /** @@ -207,7 +207,7 @@ public int getIncrement () { */ public int getMaximum () { checkWidget (); - return OS.SendMessage (handle, OS.TBM_GETRANGEMAX, 0, 0); + return (int)/*64*/OS.SendMessage (handle, OS.TBM_GETRANGEMAX, 0, 0); } /** @@ -222,7 +222,7 @@ public int getMaximum () { */ public int getMinimum () { checkWidget (); - return OS.SendMessage (handle, OS.TBM_GETRANGEMIN, 0, 0); + return (int)OS.SendMessage (handle, OS.TBM_GETRANGEMIN, 0, 0); } /** @@ -239,7 +239,7 @@ public int getMinimum () { */ public int getPageIncrement () { checkWidget (); - return OS.SendMessage (handle, OS.TBM_GETPAGESIZE, 0, 0); + return (int)/*64*/OS.SendMessage (handle, OS.TBM_GETPAGESIZE, 0, 0); } /** @@ -254,7 +254,7 @@ public int getPageIncrement () { */ public int getSelection () { checkWidget (); - return OS.SendMessage (handle, OS.TBM_GETPOS, 0, 0); + return (int)/*64*/OS.SendMessage (handle, OS.TBM_GETPOS, 0, 0); } /** @@ -282,7 +282,7 @@ public void removeSelectionListener(SelectionListener listener) { eventTable.unhook (SWT.DefaultSelection,listener); } -void setBackgroundImage (int hImage) { +void setBackgroundImage (int /*long*/ hImage) { super.setBackgroundImage (hImage); /* * Bug in Windows. Changing the background color of the Scale @@ -324,8 +324,8 @@ void setBackgroundPixel (int pixel) { public void setIncrement (int increment) { checkWidget (); if (increment < 1) return; - int minimum = OS.SendMessage (handle, OS.TBM_GETRANGEMIN, 0, 0); - int maximum = OS.SendMessage (handle, OS.TBM_GETRANGEMAX, 0, 0); + int minimum = (int)/*64*/OS.SendMessage (handle, OS.TBM_GETRANGEMIN, 0, 0); + int maximum = (int)/*64*/OS.SendMessage (handle, OS.TBM_GETRANGEMAX, 0, 0); if (increment > maximum - minimum) return; OS.SendMessage (handle, OS.TBM_SETLINESIZE, 0, increment); } @@ -345,7 +345,7 @@ public void setIncrement (int increment) { */ public void setMaximum (int value) { checkWidget (); - int minimum = OS.SendMessage (handle, OS.TBM_GETRANGEMIN, 0, 0); + int minimum = (int)/*64*/OS.SendMessage (handle, OS.TBM_GETRANGEMIN, 0, 0); if (0 <= minimum && minimum < value) { OS.SendMessage (handle, OS.TBM_SETRANGEMAX, 1, value); } @@ -366,7 +366,7 @@ public void setMaximum (int value) { */ public void setMinimum (int value) { checkWidget (); - int maximum = OS.SendMessage (handle, OS.TBM_GETRANGEMAX, 0, 0); + int maximum = (int)/*64*/OS.SendMessage (handle, OS.TBM_GETRANGEMAX, 0, 0); if (0 <= value && value < maximum) { OS.SendMessage (handle, OS.TBM_SETRANGEMIN, 1, value); } @@ -388,8 +388,8 @@ public void setMinimum (int value) { public void setPageIncrement (int pageIncrement) { checkWidget (); if (pageIncrement < 1) return; - int minimum = OS.SendMessage (handle, OS.TBM_GETRANGEMIN, 0, 0); - int maximum = OS.SendMessage (handle, OS.TBM_GETRANGEMAX, 0, 0); + int minimum = (int)/*64*/OS.SendMessage (handle, OS.TBM_GETRANGEMIN, 0, 0); + int maximum = (int)/*64*/OS.SendMessage (handle, OS.TBM_GETRANGEMAX, 0, 0); if (pageIncrement > maximum - minimum) return; OS.SendMessage (handle, OS.TBM_SETPAGESIZE, 0, pageIncrement); OS.SendMessage (handle, OS.TBM_SETTICFREQ, pageIncrement, 0); @@ -421,11 +421,11 @@ TCHAR windowClass () { return TrackBarClass; } -int windowProc () { +int /*long*/ windowProc () { return TrackBarProc; } -LRESULT WM_PAINT (int wParam, int lParam) { +LRESULT WM_PAINT (int /*long*/ wParam, int /*long*/ lParam) { /* * Bug in Windows. For some reason, when WM_CTLCOLORSTATIC * is used to implement transparency and returns a NULL brush, @@ -457,12 +457,12 @@ LRESULT WM_PAINT (int wParam, int lParam) { return super.WM_PAINT (wParam, lParam); } -LRESULT WM_SIZE (int wParam, int lParam) { +LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) { if (ignoreResize) return null; return super.WM_SIZE (wParam, lParam); } -LRESULT wmScrollChild (int wParam, int lParam) { +LRESULT wmScrollChild (int /*long*/ wParam, int /*long*/ lParam) { /* Do nothing when scrolling is ending */ int code = OS.LOWORD (wParam); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ScrollBar.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ScrollBar.java index c0d2fed795..f9b83efe30 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ScrollBar.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ScrollBar.java @@ -179,7 +179,8 @@ void createWidget () { } void destroyWidget () { - int hwnd = hwndScrollBar (), type = scrollBarType (); + int /*long*/ hwnd = hwndScrollBar (); + int type = scrollBarType (); if (OS.IsWinCE) { SCROLLINFO info = new SCROLLINFO (); info.cbSize = SCROLLINFO.sizeof; @@ -264,7 +265,7 @@ public int getMaximum () { SCROLLINFO info = new SCROLLINFO (); info.cbSize = SCROLLINFO.sizeof; info.fMask = OS.SIF_RANGE; - int hwnd = hwndScrollBar (); + int /*long*/ hwnd = hwndScrollBar (); int type = scrollBarType (); OS.GetScrollInfo (hwnd, type, info); return info.nMax; @@ -285,7 +286,7 @@ public int getMinimum () { SCROLLINFO info = new SCROLLINFO (); info.cbSize = SCROLLINFO.sizeof; info.fMask = OS.SIF_RANGE; - int hwnd = hwndScrollBar (); + int /*long*/ hwnd = hwndScrollBar (); int type = scrollBarType (); OS.GetScrollInfo (hwnd, type, info); return info.nMin; @@ -338,7 +339,7 @@ public int getSelection () { SCROLLINFO info = new SCROLLINFO (); info.cbSize = SCROLLINFO.sizeof; info.fMask = OS.SIF_POS; - int hwnd = hwndScrollBar (); + int /*long*/ hwnd = hwndScrollBar (); int type = scrollBarType (); OS.GetScrollInfo (hwnd, type, info); return info.nPos; @@ -391,7 +392,7 @@ public int getThumb () { SCROLLINFO info = new SCROLLINFO (); info.cbSize = SCROLLINFO.sizeof; info.fMask = OS.SIF_PAGE; - int hwnd = hwndScrollBar (); + int /*long*/ hwnd = hwndScrollBar (); int type = scrollBarType (); OS.GetScrollInfo (hwnd, type, info); if (info.nPage != 0) --info.nPage; @@ -420,7 +421,7 @@ public boolean getVisible () { return (state & HIDDEN) == 0; } -int hwndScrollBar () { +int /*long*/ hwndScrollBar () { return parent.scrolledHandle (); } @@ -524,7 +525,8 @@ public void setEnabled (boolean enabled) { */ // if (OS.IsWinCE) error (SWT.ERROR_NOT_IMPLEMENTED); if (!OS.IsWinCE) { - int hwnd = hwndScrollBar (), type = scrollBarType (); + int /*long*/ hwnd = hwndScrollBar (); + int type = scrollBarType (); int flags = enabled ? OS.ESB_ENABLE_BOTH : OS.ESB_DISABLE_BOTH; OS.EnableScrollBar (hwnd, type, flags); if (enabled) { @@ -572,7 +574,8 @@ public void setMaximum (int value) { if (value < 0) return; SCROLLINFO info = new SCROLLINFO (); info.cbSize = SCROLLINFO.sizeof; - int hwnd = hwndScrollBar (), type = scrollBarType (); + int /*long*/ hwnd = hwndScrollBar (); + int type = scrollBarType (); info.fMask = OS.SIF_RANGE | OS.SIF_DISABLENOSCROLL; OS.GetScrollInfo (hwnd, type, info); if (value - info.nMin - info.nPage < 1) return; @@ -598,7 +601,8 @@ public void setMinimum (int value) { if (value < 0) return; SCROLLINFO info = new SCROLLINFO (); info.cbSize = SCROLLINFO.sizeof; - int hwnd = hwndScrollBar (), type = scrollBarType (); + int /*long*/ hwnd = hwndScrollBar (); + int type = scrollBarType (); info.fMask = OS.SIF_RANGE | OS.SIF_DISABLENOSCROLL; OS.GetScrollInfo (hwnd, type, info); if (info.nMax - value - info.nPage < 1) return; @@ -625,7 +629,7 @@ public void setPageIncrement (int value) { pageIncrement = value; } -boolean SetScrollInfo (int hwnd, int flags, SCROLLINFO info, boolean fRedraw) { +boolean SetScrollInfo (int /*long*/ hwnd, int flags, SCROLLINFO info, boolean fRedraw) { /* * Bug in Windows. For some reason, when SetScrollInfo() * is used with SIF_POS and the scroll bar is hidden, @@ -704,7 +708,8 @@ public void setSelection (int selection) { checkWidget(); SCROLLINFO info = new SCROLLINFO (); info.cbSize = SCROLLINFO.sizeof; - int hwnd = hwndScrollBar (), type = scrollBarType (); + int /*long*/ hwnd = hwndScrollBar (); + int type = scrollBarType (); info.fMask = OS.SIF_POS; info.nPos = selection; SetScrollInfo (hwnd, type, info, true); @@ -729,7 +734,8 @@ public void setThumb (int value) { if (value < 1) return; SCROLLINFO info = new SCROLLINFO (); info.cbSize = SCROLLINFO.sizeof; - int hwnd = hwndScrollBar (), type = scrollBarType (); + int /*long*/ hwnd = hwndScrollBar (); + int type = scrollBarType (); info.fMask = OS.SIF_PAGE | OS.SIF_RANGE | OS.SIF_DISABLENOSCROLL; OS.GetScrollInfo (hwnd, type, info); info.nPage = value; @@ -775,7 +781,8 @@ public void setValues (int selection, int minimum, int maximum, int thumb, int i info.nMax = maximum; info.nPage = thumb; if (info.nPage != 0) info.nPage++; - int hwnd = hwndScrollBar (), type = scrollBarType (); + int /*long*/ hwnd = hwndScrollBar (); + int type = scrollBarType (); SetScrollInfo (hwnd, type, info, true); } @@ -808,7 +815,8 @@ public void setVisible (boolean visible) { if (OS.IsWinCE) { SCROLLINFO info = new SCROLLINFO (); info.cbSize = SCROLLINFO.sizeof; - int hwnd = hwndScrollBar (), type = scrollBarType (); + int /*long*/ hwnd = hwndScrollBar (); + int type = scrollBarType (); info.fMask = OS.SIF_RANGE | OS.SIF_PAGE; if (visible) info.fMask |= OS.SIF_DISABLENOSCROLL; OS.GetScrollInfo (hwnd, type, info); @@ -844,7 +852,8 @@ public void setVisible (boolean visible) { * of the scroll bar will get the correct value. */ state = visible ? state & ~HIDDEN : state | HIDDEN; - int hwnd = hwndScrollBar (), type = scrollBarType (); + int /*long*/ hwnd = hwndScrollBar (); + int type = scrollBarType (); if (OS.ShowScrollBar (hwnd, type, visible)) { /* * Bug in Windows. For some reason, when the widget @@ -873,7 +882,7 @@ public void setVisible (boolean visible) { } } -LRESULT wmScrollChild (int wParam, int lParam) { +LRESULT wmScrollChild (int /*long*/ wParam, int /*long*/ lParam) { /* Do nothing when scrolling is ending */ int code = OS.LOWORD (wParam); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Scrollable.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Scrollable.java index 13f901cd5d..9b71942dcd 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Scrollable.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Scrollable.java @@ -72,7 +72,7 @@ public Scrollable (Composite parent, int style) { super (parent, style); } -int callWindowProc (int hwnd, int msg, int wParam, int lParam) { +int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) { if (handle == 0) return 0; return OS.DefWindowProc (hwnd, msg, wParam, lParam); } @@ -106,7 +106,7 @@ int callWindowProc (int hwnd, int msg, int wParam, int lParam) { */ public Rectangle computeTrim (int x, int y, int width, int height) { checkWidget (); - int scrolledHandle = scrolledHandle (); + int /*long*/ scrolledHandle = scrolledHandle (); RECT rect = new RECT (); OS.SetRect (rect, x, y, x + width, y + height); int bits1 = OS.GetWindowLong (scrolledHandle, OS.GWL_STYLE); @@ -151,7 +151,7 @@ public Rectangle getClientArea () { checkWidget (); forceResize (); RECT rect = new RECT (); - int scrolledHandle = scrolledHandle (); + int /*long*/ scrolledHandle = scrolledHandle (); OS.GetClientRect (scrolledHandle, rect); int x = rect.left, y = rect.top; int width = rect.right - rect.left; @@ -209,7 +209,7 @@ void releaseChildren (boolean destroy) { super.releaseChildren (destroy); } -int scrolledHandle () { +int /*long*/ scrolledHandle () { return handle; } @@ -238,11 +238,11 @@ TCHAR windowClass () { return display.windowClass; } -int windowProc () { +int /*long*/ windowProc () { return display.windowProc; } -LRESULT WM_HSCROLL (int wParam, int lParam) { +LRESULT WM_HSCROLL (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_HSCROLL (wParam, lParam); if (result != null) return result; @@ -259,7 +259,7 @@ LRESULT WM_HSCROLL (int wParam, int lParam) { return result; } -LRESULT WM_MOUSEWHEEL (int wParam, int lParam) { +LRESULT WM_MOUSEWHEEL (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_MOUSEWHEEL (wParam, lParam); if (result != null) return result; @@ -308,7 +308,7 @@ LRESULT WM_MOUSEWHEEL (int wParam, int lParam) { */ int vPosition = verticalBar == null ? 0 : verticalBar.getSelection (); int hPosition = horizontalBar == null ? 0 : horizontalBar.getSelection (); - int code = callWindowProc (handle, OS.WM_MOUSEWHEEL, wParam, lParam); + int /*long*/ code = callWindowProc (handle, OS.WM_MOUSEWHEEL, wParam, lParam); if (verticalBar != null) { int position = verticalBar.getSelection (); if (position != vPosition) { @@ -328,15 +328,15 @@ LRESULT WM_MOUSEWHEEL (int wParam, int lParam) { return new LRESULT (code); } -LRESULT WM_SIZE (int wParam, int lParam) { - int code = callWindowProc (handle, OS.WM_SIZE, wParam, lParam); +LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) { + int /*long*/ code = callWindowProc (handle, OS.WM_SIZE, wParam, lParam); super.WM_SIZE (wParam, lParam); // widget may be disposed at this point if (code == 0) return LRESULT.ZERO; return new LRESULT (code); } -LRESULT WM_VSCROLL (int wParam, int lParam) { +LRESULT WM_VSCROLL (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_VSCROLL (wParam, lParam); if (result != null) return result; /* @@ -352,7 +352,7 @@ LRESULT WM_VSCROLL (int wParam, int lParam) { return result; } -LRESULT wmScroll (ScrollBar bar, boolean update, int hwnd, int msg, int wParam, int lParam) { +LRESULT wmScroll (ScrollBar bar, boolean update, int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = null; if (update) { int type = msg == OS.WM_HSCROLL ? OS.SB_HORZ : OS.SB_VERT; @@ -397,7 +397,7 @@ LRESULT wmScroll (ScrollBar bar, boolean update, int hwnd, int msg, int wParam, } OS.SetScrollInfo (hwnd, type, info, true); } else { - int code = callWindowProc (hwnd, msg, wParam, lParam); + int /*long*/ code = callWindowProc (hwnd, msg, wParam, lParam); result = code == 0 ? LRESULT.ZERO : new LRESULT (code); } bar.wmScrollChild (wParam, lParam); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Shell.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Shell.java index 4224633475..2851f3b17f 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Shell.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Shell.java @@ -115,18 +115,18 @@ import org.eclipse.swt.events.*; public class Shell extends Decorations { Menu activeMenu; ToolTip [] toolTips; - int hIMC, hwndMDIClient, lpstrTip, toolTipHandle, balloonTipHandle; + int /*long*/ hIMC, hwndMDIClient, lpstrTip, toolTipHandle, balloonTipHandle; int minWidth = SWT.DEFAULT, minHeight = SWT.DEFAULT; - int [] brushes; + int /*long*/ [] brushes; boolean showWithParent; String toolTitle, balloonTitle; - int toolIcon, balloonIcon; - int windowProc; + int /*long*/ toolIcon, balloonIcon; + int /*long*/ windowProc; Control lastActive, lockToolTipControl; SHACTIVATEINFO psai; Region region; - static /*final*/ int ToolTipProc; - static final int DialogProc; + static /*final*/ int /*long*/ ToolTipProc; + static final int /*long*/ DialogProc; static final TCHAR DialogClass = new TCHAR (0, OS.IsWinCE ? "Dialog" : "#32770", true); final static int [] SYSTEM_COLORS = { OS.COLOR_BTNFACE, @@ -265,7 +265,7 @@ public Shell (Display display, int style) { this (display, null, style, 0, false); } -Shell (Display display, Shell parent, int style, int handle, boolean embedded) { +Shell (Display display, Shell parent, int style, int /*long*/ handle, boolean embedded) { super (); checkSubclass (); if (display == null) display = Display.getCurrent (); @@ -377,11 +377,11 @@ public Shell (Shell parent, int style) { * @param handle the handle for the shell * @return a new shell object containing the specified display and handle */ -public static Shell win32_new (Display display, int handle) { +public static Shell win32_new (Display display, int /*long*/ handle) { return new Shell (display, null, SWT.NO_TRIM, handle, true); } -public static Shell internal_new (Display display, int handle) { +public static Shell internal_new (Display display, int /*long*/ handle) { return new Shell (display, null, SWT.NO_TRIM, handle, false); } @@ -425,12 +425,12 @@ public void addShellListener (ShellListener listener) { addListener (SWT.Deactivate, typedListener); } -int balloonTipHandle () { +int /*long*/ balloonTipHandle () { if (balloonTipHandle == 0) createBalloonTipHandle (); return balloonTipHandle; } -int callWindowProc (int hwnd, int msg, int wParam, int lParam) { +int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) { if (handle == 0) return 0; if (hwnd == toolTipHandle || hwnd == balloonTipHandle) { return OS.CallWindowProc (ToolTipProc, hwnd, msg, wParam, lParam); @@ -489,7 +489,7 @@ void createBalloonTipHandle () { null); if (balloonTipHandle == 0) error (SWT.ERROR_NO_HANDLES); if (ToolTipProc == 0) { - ToolTipProc = OS.GetWindowLong (balloonTipHandle, OS.GWL_WNDPROC); + ToolTipProc = OS.GetWindowLongPtr (balloonTipHandle, OS.GWLP_WNDPROC); } /* * Feature in Windows. Despite the fact that the @@ -500,7 +500,7 @@ void createBalloonTipHandle () { */ OS.SendMessage (balloonTipHandle, OS.TTM_SETMAXTIPWIDTH, 0, 0x7FFF); display.addControl (balloonTipHandle, this); - OS.SetWindowLong (balloonTipHandle, OS.GWL_WNDPROC, display.windowProc); + OS.SetWindowLongPtr (balloonTipHandle, OS.GWLP_WNDPROC, display.windowProc); } void createHandle () { @@ -597,7 +597,7 @@ void createToolTipHandle () { null); if (toolTipHandle == 0) error (SWT.ERROR_NO_HANDLES); if (ToolTipProc == 0) { - ToolTipProc = OS.GetWindowLong (toolTipHandle, OS.GWL_WNDPROC); + ToolTipProc = OS.GetWindowLongPtr (toolTipHandle, OS.GWLP_WNDPROC); } /* * Feature in Windows. Despite the fact that the @@ -608,7 +608,7 @@ void createToolTipHandle () { */ OS.SendMessage (toolTipHandle, OS.TTM_SETMAXTIPWIDTH, 0, 0x7FFF); display.addControl (toolTipHandle, this); - OS.SetWindowLong (toolTipHandle, OS.GWL_WNDPROC, display.windowProc); + OS.SetWindowLongPtr (toolTipHandle, OS.GWLP_WNDPROC, display.windowProc); } void deregister () { @@ -668,7 +668,7 @@ void enableWidget (boolean enabled) { } } -int findBrush (int value, int lbStyle) { +int /*long*/ findBrush (int /*long*/ value, int lbStyle) { if (lbStyle == OS.BS_SOLID) { for (int i=0; i<SYSTEM_COLORS.length; i++) { if (value == OS.GetSysColor (SYSTEM_COLORS [i])) { @@ -676,10 +676,10 @@ int findBrush (int value, int lbStyle) { } } } - if (brushes == null) brushes = new int [BRUSHES_SIZE]; + if (brushes == null) brushes = new int /*long*/ [BRUSHES_SIZE]; LOGBRUSH logBrush = new LOGBRUSH (); for (int i=0; i<brushes.length; i++) { - int hBrush = brushes [i]; + int /*long*/ hBrush = brushes [i]; if (hBrush == 0) break; OS.GetObject (hBrush, LOGBRUSH.sizeof, logBrush); switch (logBrush.lbStyle) { @@ -696,12 +696,12 @@ int findBrush (int value, int lbStyle) { } } int length = brushes.length; - int hBrush = brushes [--length]; + int /*long*/ hBrush = brushes [--length]; if (hBrush != 0) OS.DeleteObject (hBrush); System.arraycopy (brushes, 0, brushes, 1, length); switch (lbStyle) { case OS.BS_SOLID: - hBrush = OS.CreateSolidBrush (value); + hBrush = OS.CreateSolidBrush ((int)/*64*/value); break; case OS.BS_PATTERN: hBrush = OS.CreatePatternBrush (value); @@ -722,9 +722,10 @@ Control findThemeControl () { return null; } -ToolTip findToolTip (int id) { +//TODO - should ids be long +ToolTip findToolTip (int /*long*/ _id) { if (toolTips == null) return null; - id = id - Display.ID_START; + int id = (int)/*64*/_id - Display.ID_START; return 0 <= id && id < toolTips.length ? toolTips [id] : null; } @@ -738,7 +739,7 @@ void fixActiveShell () { * application). The fix is to activate the disabled parent * shell before disposing or hiding the active shell. */ - int hwndParent = OS.GetParent (handle); + int /*long*/ hwndParent = OS.GetParent (handle); if (hwndParent != 0 && handle == OS.GetActiveWindow ()) { if (!OS.IsWindowEnabled (hwndParent) && OS.IsWindowVisible (hwndParent)) { OS.SetActiveWindow (hwndParent); @@ -836,7 +837,7 @@ ToolTip getCurrentToolTip () { return null; } -ToolTip getCurrentToolTip (int hwndToolTip) { +ToolTip getCurrentToolTip (int /*long*/ hwndToolTip) { if (hwndToolTip == 0) return null; if (OS.SendMessage (hwndToolTip, OS.TTM_GETCURRENTTOOL, 0, 0) != 0) { TOOLINFO lpti = new TOOLINFO (); @@ -873,7 +874,7 @@ public boolean getEnabled () { public int getImeInputMode () { checkWidget (); if (!OS.IsDBLocale) return 0; - int hIMC = OS.ImmGetContext (handle); + int /*long*/ hIMC = OS.ImmGetContext (handle); int [] lpfdwConversion = new int [1], lpfdwSentence = new int [1]; boolean open = OS.ImmGetOpenStatus (hIMC); if (open) open = OS.ImmGetConversionStatus (hIMC, lpfdwConversion, lpfdwSentence); @@ -1022,7 +1023,7 @@ public boolean isVisible () { return getVisible (); } -int hwndMDIClient () { +int /*long*/ hwndMDIClient () { if (hwndMDIClient == 0) { int widgetStyle = OS.MDIS_ALLCHILDSTYLES | OS.WS_CHILD | OS.WS_CLIPCHILDREN | OS.WS_CLIPSIBLINGS; hwndMDIClient = OS.CreateWindowEx ( @@ -1149,7 +1150,7 @@ void releaseWidget () { activeMenu = null; display.clearModal (this); if (lpstrTip != 0) { - int hHeap = OS.GetProcessHeap (); + int /*long*/ hHeap = OS.GetProcessHeap (); OS.HeapFree (hHeap, 0, lpstrTip); } lpstrTip = 0; @@ -1196,9 +1197,9 @@ public void removeShellListener (ShellListener listener) { eventTable.unhook (SWT.Deactivate, listener); } -LRESULT selectPalette (int hPalette) { - int hDC = OS.GetDC (handle); - int hOld = OS.SelectPalette (hDC, hPalette, false); +LRESULT selectPalette (int /*long*/ hPalette) { + int /*long*/ hDC = OS.GetDC (handle); + int /*long*/ hOld = OS.SelectPalette (hDC, hPalette, false); int result = OS.RealizePalette (hDC); if (result > 0) { OS.InvalidateRect (handle, null, true); @@ -1308,7 +1309,7 @@ public void setImeInputMode (int mode) { checkWidget (); if (!OS.IsDBLocale) return; boolean imeOn = mode != SWT.NONE && mode != SWT.ROMAN; - int hIMC = OS.ImmGetContext (handle); + int /*long*/ hIMC = OS.ImmGetContext (handle); OS.ImmSetOpenStatus (hIMC, imeOn); if (imeOn) { int [] lpfdwConversion = new int [1], lpfdwSentence = new int [1]; @@ -1406,7 +1407,7 @@ public void setMinimumSize (Point size) { } void setItemEnabled (int cmd, boolean enabled) { - int hMenu = OS.GetSystemMenu (handle, false); + int /*long*/ hMenu = OS.GetSystemMenu (handle, false); if (hMenu == 0) return; int flags = OS.MF_ENABLED; if (!enabled) flags = OS.MF_DISABLED | OS.MF_GRAYED; @@ -1441,7 +1442,7 @@ public void setRegion (Region region) { checkWidget (); if ((style & SWT.NO_TRIM) == 0) return; if (region != null && region.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT); - int hRegion = 0; + int /*long*/ hRegion = 0; if (region != null) { hRegion = OS.CreateRectRgn (0, 0, 0, 0); OS.CombineRgn (hRegion, region.handle, hRegion, OS.RGN_OR); @@ -1450,13 +1451,13 @@ public void setRegion (Region region) { this.region = region; } -void setToolTipText (int hwnd, String text) { +void setToolTipText (int /*long*/ hwnd, String text) { if (OS.IsWinCE) return; TOOLINFO lpti = new TOOLINFO (); lpti.cbSize = TOOLINFO.sizeof; lpti.hwnd = handle; lpti.uId = hwnd; - int hwndToolTip = toolTipHandle (); + int /*long*/ hwndToolTip = toolTipHandle (); if (text == null) { OS.SendMessage (hwndToolTip, OS.TTM_DELTOOL, 0, lpti); } else { @@ -1478,7 +1479,7 @@ void setToolTipText (NMTTDISPINFO lpnmtdi, byte [] buffer) { * shell trimmings. */ if (!hasCursor ()) return; - int hHeap = OS.GetProcessHeap (); + int /*long*/ hHeap = OS.GetProcessHeap (); if (lpstrTip != 0) OS.HeapFree (hHeap, 0, lpstrTip); int byteCount = buffer.length; lpstrTip = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); @@ -1494,7 +1495,7 @@ void setToolTipText (NMTTDISPINFO lpnmtdi, char [] buffer) { * shell trimmings. */ if (!hasCursor ()) return; - int hHeap = OS.GetProcessHeap (); + int /*long*/ hHeap = OS.GetProcessHeap (); if (lpstrTip != 0) OS.HeapFree (hHeap, 0, lpstrTip); int byteCount = buffer.length * 2; lpstrTip = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); @@ -1502,7 +1503,7 @@ void setToolTipText (NMTTDISPINFO lpnmtdi, char [] buffer) { lpnmtdi.lpszText = lpstrTip; } -void setToolTipTitle (int hwndToolTip, String text, int icon) { +void setToolTipTitle (int /*long*/ hwndToolTip, String text, int icon) { /* * Bug in Windows. For some reason, when TTM_SETTITLE * is used to set the title of a tool tip, Windows leaks @@ -1571,7 +1572,7 @@ public void setVisible (boolean visible) { bringToTop (); if (isDisposed ()) return; } - int hwndShell = OS.GetActiveWindow (); + int /*long*/ hwndShell = OS.GetActiveWindow (); if (hwndShell == 0) { if (parent != null) hwndShell = parent.handle; } @@ -1608,17 +1609,17 @@ public void setVisible (boolean visible) { void subclass () { super.subclass (); if (ToolTipProc != 0) { - int newProc = display.windowProc; + int /*long*/ newProc = display.windowProc; if (toolTipHandle != 0) { - OS.SetWindowLong (toolTipHandle, OS.GWL_WNDPROC, newProc); + OS.SetWindowLongPtr (toolTipHandle, OS.GWLP_WNDPROC, newProc); } if (balloonTipHandle != 0) { - OS.SetWindowLong (balloonTipHandle, OS.GWL_WNDPROC, newProc); + OS.SetWindowLongPtr (balloonTipHandle, OS.GWLP_WNDPROC, newProc); } } } -int toolTipHandle () { +int /*long*/ toolTipHandle () { if (toolTipHandle == 0) createToolTipHandle (); return toolTipHandle; } @@ -1640,10 +1641,10 @@ void unsubclass () { super.unsubclass (); if (ToolTipProc != 0) { if (toolTipHandle != 0) { - OS.SetWindowLong (toolTipHandle, OS.GWL_WNDPROC, ToolTipProc); + OS.SetWindowLongPtr (toolTipHandle, OS.GWLP_WNDPROC, ToolTipProc); } if (toolTipHandle != 0) { - OS.SetWindowLong (toolTipHandle, OS.GWL_WNDPROC, ToolTipProc); + OS.SetWindowLongPtr (toolTipHandle, OS.GWLP_WNDPROC, ToolTipProc); } } } @@ -1660,7 +1661,7 @@ CREATESTRUCT widgetCreateStruct () { return null; } -int widgetParent () { +int /*long*/ widgetParent () { if (handle != 0) return handle; return parent != null ? parent.handle : 0; } @@ -1717,7 +1718,7 @@ TCHAR windowClass () { return parent != null ? DialogClass : super.windowClass (); } -int windowProc () { +int /*long*/ windowProc () { if (windowProc != 0) return windowProc; if (OS.IsSP) return DialogProc; if ((style & SWT.TOOL) != 0) { @@ -1727,7 +1728,7 @@ int windowProc () { return parent != null ? DialogProc : super.windowProc (); } -int windowProc (int hwnd, int msg, int wParam, int lParam) { +int /*long*/ windowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) { if (handle == 0) return 0; if (hwnd == toolTipHandle || hwnd == balloonTipHandle) { switch (msg) { @@ -1792,7 +1793,7 @@ int widgetStyle () { return bits | OS.WS_OVERLAPPED | OS.WS_CAPTION; } -LRESULT WM_ACTIVATE (int wParam, int lParam) { +LRESULT WM_ACTIVATE (int /*long*/ wParam, int /*long*/ lParam) { if (OS.IsPPC) { /* * Note: this does not work when we get WM_ACTIVATE prior @@ -1800,7 +1801,7 @@ LRESULT WM_ACTIVATE (int wParam, int lParam) { */ if (hooks (SWT.HardKeyDown) || hooks (SWT.HardKeyUp)) { int fActive = OS.LOWORD (wParam); - int hwnd = fActive != 0 ? handle : 0; + int /*long*/ hwnd = fActive != 0 ? handle : 0; for (int bVk=OS.VK_APP1; bVk<=OS.VK_APP6; bVk++) { OS.SHSetAppKeyWndAssoc ((byte) bVk, hwnd); } @@ -1840,7 +1841,7 @@ LRESULT WM_ACTIVATE (int wParam, int lParam) { return parent != null ? LRESULT.ZERO : result; } -LRESULT WM_COMMAND (int wParam, int lParam) { +LRESULT WM_COMMAND (int /*long*/ wParam, int /*long*/ lParam) { if (OS.IsPPC) { /* * Note in WinCE PPC: Close the Shell when the "Done Button" has @@ -1865,12 +1866,12 @@ LRESULT WM_COMMAND (int wParam, int lParam) { */ if (OS.IsPPC || OS.IsSP) { if (menuBar != null) { - int hwndCB = menuBar.hwndCB; + int /*long*/ hwndCB = menuBar.hwndCB; if (lParam != 0 && hwndCB != 0) { if (lParam == hwndCB) { return super.WM_COMMAND (wParam, 0); } else { - int hwndChild = OS.GetWindow (hwndCB, OS.GW_CHILD); + int /*long*/ hwndChild = OS.GetWindow (hwndCB, OS.GW_CHILD); if (lParam == hwndChild) return super.WM_COMMAND (wParam, 0); } } @@ -1879,7 +1880,7 @@ LRESULT WM_COMMAND (int wParam, int lParam) { return super.WM_COMMAND (wParam, lParam); } -LRESULT WM_DESTROY (int wParam, int lParam) { +LRESULT WM_DESTROY (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_DESTROY (wParam, lParam); /* * When the shell is a WS_CHILD window of a non-SWT @@ -1895,7 +1896,7 @@ LRESULT WM_DESTROY (int wParam, int lParam) { return result; } -LRESULT WM_ERASEBKGND (int wParam, int lParam) { +LRESULT WM_ERASEBKGND (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_ERASEBKGND (wParam, lParam); if (result != null) return result; /* @@ -1913,7 +1914,7 @@ LRESULT WM_ERASEBKGND (int wParam, int lParam) { return result; } -LRESULT WM_ENTERIDLE (int wParam, int lParam) { +LRESULT WM_ENTERIDLE (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_ENTERIDLE (wParam, lParam); if (result != null) return result; if (OS.IsWinCE && display.runMessages) { @@ -1922,7 +1923,7 @@ LRESULT WM_ENTERIDLE (int wParam, int lParam) { return result; } -LRESULT WM_GETMINMAXINFO (int wParam, int lParam) { +LRESULT WM_GETMINMAXINFO (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_GETMINMAXINFO (wParam, lParam); if (result != null) return result; if (minWidth != SWT.DEFAULT || minHeight != SWT.DEFAULT) { @@ -1936,7 +1937,7 @@ LRESULT WM_GETMINMAXINFO (int wParam, int lParam) { return result; } -LRESULT WM_MOUSEACTIVATE (int wParam, int lParam) { +LRESULT WM_MOUSEACTIVATE (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_MOUSEACTIVATE (wParam, lParam); if (result != null) return result; @@ -1990,7 +1991,7 @@ LRESULT WM_MOUSEACTIVATE (int wParam, int lParam) { int pos = OS.GetMessagePos (); OS.POINTSTOPOINT (pt, pos); } - int hwnd = OS.WindowFromPoint (pt); + int /*long*/ hwnd = OS.WindowFromPoint (pt); if (hwnd == 0) return null; Control control = display.findControl (hwnd); @@ -2015,7 +2016,7 @@ LRESULT WM_MOUSEACTIVATE (int wParam, int lParam) { return null; } -LRESULT WM_MOVE (int wParam, int lParam) { +LRESULT WM_MOVE (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_MOVE (wParam, lParam); if (result != null) return result; ToolTip tip = getCurrentToolTip (); @@ -2023,7 +2024,7 @@ LRESULT WM_MOVE (int wParam, int lParam) { return result; } -LRESULT WM_NCACTIVATE (int wParam, int lParam) { +LRESULT WM_NCACTIVATE (int /*long*/ wParam, int /*long*/ lParam) { Display display = this.display; LRESULT result = super.WM_NCACTIVATE (wParam, lParam); if (display.isXMouseActive ()) { @@ -2039,23 +2040,23 @@ LRESULT WM_NCACTIVATE (int wParam, int lParam) { return result; } -LRESULT WM_NCHITTEST (int wParam, int lParam) { +LRESULT WM_NCHITTEST (int /*long*/ wParam, int /*long*/ lParam) { if (!OS.IsWindowEnabled (handle)) return null; if (!isEnabled () || !isActive ()) { if (!Display.TrimEnabled) return new LRESULT (OS.HTNOWHERE); - int hittest = callWindowProc (handle, OS.WM_NCHITTEST, wParam, lParam); + int /*long*/ hittest = callWindowProc (handle, OS.WM_NCHITTEST, wParam, lParam); if (hittest == OS.HTCLIENT || hittest == OS.HTMENU) hittest = OS.HTBORDER; return new LRESULT (hittest); } if (menuBar != null && !menuBar.getEnabled ()) { - int hittest = callWindowProc (handle, OS.WM_NCHITTEST, wParam, lParam); + int /*long*/ hittest = callWindowProc (handle, OS.WM_NCHITTEST, wParam, lParam); if (hittest == OS.HTMENU) hittest = OS.HTBORDER; return new LRESULT (hittest); } return null; } -LRESULT WM_NCLBUTTONDOWN (int wParam, int lParam) { +LRESULT WM_NCLBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_NCLBUTTONDOWN (wParam, lParam); if (result != null) return result; /* @@ -2067,11 +2068,11 @@ LRESULT WM_NCLBUTTONDOWN (int wParam, int lParam) { */ if (!display.ignoreRestoreFocus) return result; Display display = this.display; - int hwndActive = 0; + int /*long*/ hwndActive = 0; boolean fixActive = OS.IsWin95 && display.lastHittest == OS.HTCAPTION; if (fixActive) hwndActive = OS.SetActiveWindow (handle); display.lockActiveWindow = true; - int code = callWindowProc (handle, OS.WM_NCLBUTTONDOWN, wParam, lParam); + int /*long*/ code = callWindowProc (handle, OS.WM_NCLBUTTONDOWN, wParam, lParam); display.lockActiveWindow = false; if (fixActive) OS.SetActiveWindow (hwndActive); Control focusControl = display.lastHittestControl; @@ -2083,21 +2084,21 @@ LRESULT WM_NCLBUTTONDOWN (int wParam, int lParam) { return new LRESULT (code); } -LRESULT WM_PALETTECHANGED (int wParam, int lParam) { +LRESULT WM_PALETTECHANGED (int /*long*/ wParam, int /*long*/ lParam) { if (wParam != handle) { - int hPalette = display.hPalette; + int /*long*/ hPalette = display.hPalette; if (hPalette != 0) return selectPalette (hPalette); } return super.WM_PALETTECHANGED (wParam, lParam); } -LRESULT WM_QUERYNEWPALETTE (int wParam, int lParam) { - int hPalette = display.hPalette; +LRESULT WM_QUERYNEWPALETTE (int /*long*/ wParam, int /*long*/ lParam) { + int /*long*/ hPalette = display.hPalette; if (hPalette != 0) return selectPalette (hPalette); return super.WM_QUERYNEWPALETTE (wParam, lParam); } -LRESULT WM_SETCURSOR (int wParam, int lParam) { +LRESULT WM_SETCURSOR (int /*long*/ wParam, int /*long*/ lParam) { /* * Feature in Windows. When the shell is disabled * by a Windows standard dialog (like a MessageBox @@ -2111,7 +2112,7 @@ LRESULT WM_SETCURSOR (int wParam, int lParam) { if (!Display.TrimEnabled) { Shell modalShell = display.getModalShell (); if (modalShell != null && !isActive ()) { - int hwndModal = modalShell.handle; + int /*long*/ hwndModal = modalShell.handle; if (OS.IsWindowEnabled (hwndModal)) { OS.SetActiveWindow (hwndModal); } @@ -2119,7 +2120,7 @@ LRESULT WM_SETCURSOR (int wParam, int lParam) { } if (!OS.IsWindowEnabled (handle)) { if (!OS.IsWinCE) { - int hwndPopup = OS.GetLastActivePopup (handle); + int /*long*/ hwndPopup = OS.GetLastActivePopup (handle); if (hwndPopup != 0 && hwndPopup != handle) { if (display.getControl (hwndPopup) == null) { if (OS.IsWindowEnabled (hwndPopup)) { @@ -2169,7 +2170,7 @@ LRESULT WM_SETCURSOR (int wParam, int lParam) { return super.WM_SETCURSOR (wParam, lParam); } -LRESULT WM_SETTINGCHANGE (int wParam, int lParam) { +LRESULT WM_SETTINGCHANGE (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_SETTINGCHANGE (wParam, lParam); if (result != null) return result; if (OS.IsPPC) { @@ -2194,7 +2195,7 @@ LRESULT WM_SETTINGCHANGE (int wParam, int lParam) { return result; } -LRESULT WM_SHOWWINDOW (int wParam, int lParam) { +LRESULT WM_SHOWWINDOW (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_SHOWWINDOW (wParam, lParam); if (result != null) return result; /* @@ -2216,7 +2217,7 @@ LRESULT WM_SHOWWINDOW (int wParam, int lParam) { return result; } -LRESULT WM_SYSCOMMAND (int wParam, int lParam) { +LRESULT WM_SYSCOMMAND (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_SYSCOMMAND (wParam, lParam); if (result != null) return result; /* @@ -2237,7 +2238,7 @@ LRESULT WM_SYSCOMMAND (int wParam, int lParam) { * this at this time. */ if (OS.IsWinNT) { - int cmd = wParam & 0xFFF0; + int cmd = (int)/*64*/wParam & 0xFFF0; switch (cmd) { case OS.SC_MINIMIZE: long memory = Runtime.getRuntime ().totalMemory (); @@ -2250,7 +2251,7 @@ LRESULT WM_SYSCOMMAND (int wParam, int lParam) { return result; } -LRESULT WM_WINDOWPOSCHANGING (int wParam, int lParam) { +LRESULT WM_WINDOWPOSCHANGING (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_WINDOWPOSCHANGING (wParam,lParam); if (result != null) return result; WINDOWPOS lpwp = new WINDOWPOS (); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Slider.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Slider.java index ee0ac6a443..0acfd3f309 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Slider.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Slider.java @@ -67,7 +67,7 @@ import org.eclipse.swt.events.*; public class Slider extends Control { int increment, pageIncrement; boolean ignoreFocus; - static final int ScrollBarProc; + static final int /*long*/ ScrollBarProc; static final TCHAR ScrollBarClass = new TCHAR (0, "SCROLLBAR", true); static { WNDCLASS lpWndClass = new WNDCLASS (); @@ -148,7 +148,7 @@ public void addSelectionListener (SelectionListener listener) { addListener (SWT.DefaultSelection,typedListener); } -int callWindowProc (int hwnd, int msg, int wParam, int lParam) { +int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) { if (handle == 0) return 0; /* * Feature in Windows. Windows runs a modal message @@ -470,7 +470,7 @@ public void setPageIncrement (int value) { pageIncrement = value; } -boolean SetScrollInfo (int hwnd, int flags, SCROLLINFO info, boolean fRedraw) { +boolean SetScrollInfo (int /*long*/ hwnd, int flags, SCROLLINFO info, boolean fRedraw) { /* * Feature in Windows. Using SIF_DISABLENOSCROLL, * SetScrollInfo () can change enabled and disabled @@ -619,11 +619,11 @@ TCHAR windowClass () { return ScrollBarClass; } -int windowProc () { +int /*long*/ windowProc () { return ScrollBarProc; } -LRESULT WM_KEYDOWN (int wParam, int lParam) { +LRESULT WM_KEYDOWN (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_KEYDOWN (wParam, lParam); if (result != null) return result; if ((style & SWT.VERTICAL) != 0) return result; @@ -637,11 +637,11 @@ LRESULT WM_KEYDOWN (int wParam, int lParam) { * in the operating system. */ if ((style & SWT.MIRRORED) != 0) { - switch (wParam) { + switch ((int)/*64*/wParam) { case OS.VK_LEFT: case OS.VK_RIGHT: { int key = wParam == OS.VK_LEFT ? OS.VK_RIGHT : OS.VK_LEFT; - int code = callWindowProc (handle, OS.WM_KEYDOWN, key, lParam); + int /*long*/ code = callWindowProc (handle, OS.WM_KEYDOWN, key, lParam); return new LRESULT (code); } } @@ -649,7 +649,7 @@ LRESULT WM_KEYDOWN (int wParam, int lParam) { return result; } -LRESULT WM_LBUTTONDBLCLK (int wParam, int lParam) { +LRESULT WM_LBUTTONDBLCLK (int /*long*/ wParam, int /*long*/ lParam) { /* * Feature in Windows. Windows uses the WS_TABSTOP * style for the scroll bar to decide that focus @@ -682,7 +682,7 @@ LRESULT WM_LBUTTONDBLCLK (int wParam, int lParam) { return result; } -LRESULT WM_LBUTTONDOWN (int wParam, int lParam) { +LRESULT WM_LBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) { /* * Feature in Windows. Windows uses the WS_TABSTOP * style for the scroll bar to decide that focus @@ -715,12 +715,12 @@ LRESULT WM_LBUTTONDOWN (int wParam, int lParam) { return result; } -LRESULT WM_SETFOCUS (int wParam, int lParam) { +LRESULT WM_SETFOCUS (int /*long*/ wParam, int /*long*/ lParam) { if (ignoreFocus) return null; return super.WM_SETFOCUS (wParam, lParam); } -LRESULT wmScrollChild (int wParam, int lParam) { +LRESULT wmScrollChild (int /*long*/ wParam, int /*long*/ lParam) { /* Do nothing when scrolling is ending */ int code = OS.LOWORD (wParam); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Spinner.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Spinner.java index 83ce114ca4..ebdd71f729 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Spinner.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Spinner.java @@ -37,12 +37,12 @@ import org.eclipse.swt.events.*; * @since 3.1 */ public class Spinner extends Composite { - int hwndText, hwndUpDown; + int /*long*/ hwndText, hwndUpDown; boolean ignoreModify; int pageIncrement, digits; - static final int EditProc; + static final int /*long*/ EditProc; static final TCHAR EditClass = new TCHAR (0, "EDIT", true); - static final int UpDownProc; + static final int /*long*/ UpDownProc; static final TCHAR UpDownClass = new TCHAR (0, OS.UPDOWN_CLASS, true); static { WNDCLASS lpWndClass = new WNDCLASS (); @@ -85,7 +85,7 @@ public Spinner (Composite parent, int style) { super (parent, checkStyle (style)); } -int callWindowProc (int hwnd, int msg, int wParam, int lParam) { +int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) { if (handle == 0) return 0; if (hwnd == hwndText) { return OS.CallWindowProc (EditProc, hwnd, msg, wParam, lParam); @@ -107,7 +107,7 @@ static int checkStyle (int style) { return style & ~(SWT.H_SCROLL | SWT.V_SCROLL); } -boolean checkHandle (int hwnd) { +boolean checkHandle (int /*long*/ hwnd) { return hwnd == handle || hwnd == hwndText || hwnd == hwndUpDown; } @@ -118,7 +118,7 @@ protected void checkSubclass () { void createHandle () { super.createHandle (); state &= ~(CANVAS | THEME_BACKGROUND); - int hInstance = OS.GetModuleHandle (null); + int /*long*/ hInstance = OS.GetModuleHandle (null); int textExStyle = (style & SWT.BORDER) != 0 ? OS.WS_EX_CLIENTEDGE : 0; int textStyle = OS.WS_CHILD | OS.WS_VISIBLE | OS.ES_AUTOHSCROLL | OS.WS_CLIPSIBLINGS; if ((style & SWT.READ_ONLY) != 0) textStyle |= OS.ES_READONLY; @@ -136,7 +136,7 @@ void createHandle () { hInstance, null); if (hwndText == 0) error (SWT.ERROR_NO_HANDLES); - OS.SetWindowLong (hwndText, OS.GWL_ID, hwndText); + OS.SetWindowLongPtr (hwndText, OS.GWLP_ID, hwndText); int upDownStyle = OS.WS_CHILD | OS.WS_VISIBLE | OS.UDS_AUTOBUDDY; if ((style & SWT.WRAP) != 0) upDownStyle |= OS.UDS_WRAP; if ((style & SWT.BORDER) != 0) { @@ -159,9 +159,9 @@ void createHandle () { if (hwndUpDown == 0) error (SWT.ERROR_NO_HANDLES); int flags = OS.SWP_NOSIZE | OS.SWP_NOMOVE | OS.SWP_NOACTIVATE; SetWindowPos (hwndText, hwndUpDown, 0, 0, 0, 0, flags); - OS.SetWindowLong (hwndUpDown, OS.GWL_ID, hwndUpDown); + OS.SetWindowLongPtr (hwndUpDown, OS.GWLP_ID, hwndUpDown); if (OS.IsDBLocale) { - int hIMC = OS.ImmGetContext (handle); + int /*long*/ hIMC = OS.ImmGetContext (handle); OS.ImmAssociateContext (hwndText, hIMC); OS.ImmAssociateContext (hwndUpDown, hIMC); OS.ImmReleaseContext (handle, hIMC); @@ -258,7 +258,7 @@ void addVerifyListener (VerifyListener listener) { addListener (SWT.Verify, typedListener); } -int borderHandle () { +int /*long*/ borderHandle () { return hwndText; } @@ -266,8 +266,8 @@ public Point computeSize (int wHint, int hHint, boolean changed) { checkWidget (); int width = 0, height = 0; if (wHint == SWT.DEFAULT || hHint == SWT.DEFAULT) { - int newFont, oldFont = 0; - int hDC = OS.GetDC (hwndText); + int /*long*/ newFont, oldFont = 0; + int /*long*/ hDC = OS.GetDC (hwndText); newFont = OS.SendMessage (hwndText, OS.WM_GETFONT, 0, 0); if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont); TEXTMETRIC tm = OS.IsUnicode ? (TEXTMETRIC) new TEXTMETRICW () : new TEXTMETRICA (); @@ -328,7 +328,7 @@ public Rectangle computeTrim (int x, int y, int width, int height) { * the single-line text widget in an editable combo * box. */ - int margins = OS.SendMessage (hwndText, OS.EM_GETMARGINS, 0, 0); + int /*long*/ margins = OS.SendMessage (hwndText, OS.EM_GETMARGINS, 0, 0); x -= OS.LOWORD (margins); width += OS.LOWORD (margins) + OS.HIWORD (margins); if ((style & SWT.BORDER) != 0) { @@ -392,7 +392,7 @@ void deregister () { } boolean hasFocus () { - int hwndFocus = OS.GetFocus (); + int /*long*/ hwndFocus = OS.GetFocus (); if (hwndFocus == handle) return true; if (hwndFocus == hwndText) return true; if (hwndFocus == hwndUpDown) return true; @@ -503,7 +503,7 @@ public int getSelection () { if (OS.IsWinCE) { return OS.LOWORD (OS.SendMessage (hwndUpDown, OS.UDM_GETPOS, 0, 0)); } else { - return OS.SendMessage (hwndUpDown, OS.UDM_GETPOS32, 0, 0); + return (int)/*64*/OS.SendMessage (hwndUpDown, OS.UDM_GETPOS32, 0, 0); } } @@ -659,7 +659,7 @@ void removeVerifyListener (VerifyListener listener) { eventTable.unhook (SWT.Verify, listener); } -boolean sendKeyEvent (int type, int msg, int wParam, int lParam, Event event) { +boolean sendKeyEvent (int type, int msg, int /*long*/ wParam, int /*long*/ lParam, Event event) { if (!super.sendKeyEvent (type, msg, wParam, lParam, event)) { return false; } @@ -742,7 +742,7 @@ boolean sendKeyEvent (int type, int msg, int wParam, int lParam, Event event) { return false; } -void setBackgroundImage (int hBitmap) { +void setBackgroundImage (int /*long*/ hBitmap) { super.setBackgroundImage (hBitmap); OS.InvalidateRect (hwndText, null, true); } @@ -781,7 +781,7 @@ public void setDigits (int value) { if (OS.IsWinCE) { pos = OS.LOWORD (OS.SendMessage (hwndUpDown, OS.UDM_GETPOS, 0, 0)); } else { - pos = OS.SendMessage (hwndUpDown, OS.UDM_GETPOS32, 0, 0); + pos = (int)/*64*/OS.SendMessage (hwndUpDown, OS.UDM_GETPOS32, 0, 0); } setSelection (pos, false, true, false); } @@ -806,14 +806,14 @@ void setForegroundPixel (int pixel) { public void setIncrement (int value) { checkWidget (); if (value < 1) return; - int hHeap = OS.GetProcessHeap (); - int count = OS.SendMessage (hwndUpDown, OS.UDM_GETACCEL, 0, (UDACCEL)null); - int udaccels = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, UDACCEL.sizeof * count); + int /*long*/ hHeap = OS.GetProcessHeap (); + int count = (int)/*64*/OS.SendMessage (hwndUpDown, OS.UDM_GETACCEL, 0, (UDACCEL)null); + int /*long*/ udaccels = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, UDACCEL.sizeof * count); OS.SendMessage (hwndUpDown, OS.UDM_GETACCEL, count, udaccels); int first = -1; UDACCEL udaccel = new UDACCEL (); for (int i = 0; i < count; i++) { - int offset = udaccels + (i * UDACCEL.sizeof); + int /*long*/ offset = udaccels + (i * UDACCEL.sizeof); OS.MoveMemory (udaccel, offset, UDACCEL.sizeof); if (first == -1) first = udaccel.nInc; udaccel.nInc = udaccel.nInc * value / first; @@ -846,7 +846,7 @@ public void setMaximum (int value) { if (OS.IsWinCE) { pos = OS.LOWORD (OS.SendMessage (hwndUpDown, OS.UDM_GETPOS, 0, 0)); } else { - pos = OS.SendMessage (hwndUpDown, OS.UDM_GETPOS32, 0, 0); + pos = (int)/*64*/OS.SendMessage (hwndUpDown, OS.UDM_GETPOS32, 0, 0); } OS.SendMessage (hwndUpDown , OS.UDM_SETRANGE32, min [0], value); if (pos > value) setSelection (value, true, true, false); @@ -875,7 +875,7 @@ public void setMinimum (int value) { if (OS.IsWinCE) { pos = OS.LOWORD (OS.SendMessage (hwndUpDown, OS.UDM_GETPOS, 0, 0)); } else { - pos = OS.SendMessage (hwndUpDown, OS.UDM_GETPOS32, 0, 0); + pos = (int)/*64*/OS.SendMessage (hwndUpDown, OS.UDM_GETPOS32, 0, 0); } OS.SendMessage (hwndUpDown , OS.UDM_SETRANGE32, value, max [0]); if (pos < value) setSelection (value, true, true, false); @@ -998,15 +998,15 @@ public void setValues (int selection, int minimum, int maximum, int digits, int void subclass () { super.subclass (); - int newProc = display.windowProc; - OS.SetWindowLong (hwndText, OS.GWL_WNDPROC, newProc); - OS.SetWindowLong (hwndUpDown, OS.GWL_WNDPROC, newProc); + int /*long*/ newProc = display.windowProc; + OS.SetWindowLongPtr (hwndText, OS.GWLP_WNDPROC, newProc); + OS.SetWindowLongPtr (hwndUpDown, OS.GWLP_WNDPROC, newProc); } void unsubclass () { super.unsubclass (); - OS.SetWindowLong (hwndText, OS.GWL_WNDPROC, EditProc); - OS.SetWindowLong (hwndUpDown, OS.GWL_WNDPROC, UpDownProc); + OS.SetWindowLongPtr (hwndText, OS.GWLP_WNDPROC, EditProc); + OS.SetWindowLongPtr (hwndUpDown, OS.GWLP_WNDPROC, UpDownProc); } String verifyText (String string, int start, int end, Event keyEvent) { @@ -1046,7 +1046,7 @@ int widgetExtStyle () { return super.widgetExtStyle () & ~OS.WS_EX_CLIENTEDGE; } -int windowProc (int hwnd, int msg, int wParam, int lParam) { +int /*long*/ windowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) { if (hwnd == hwndText || hwnd == hwndUpDown) { LRESULT result = null; switch (msg) { @@ -1106,29 +1106,29 @@ int windowProc (int hwnd, int msg, int wParam, int lParam) { return super.windowProc (hwnd, msg, wParam, lParam); } -LRESULT WM_ERASEBKGND (int wParam, int lParam) { +LRESULT WM_ERASEBKGND (int /*long*/ wParam, int /*long*/ lParam) { super.WM_ERASEBKGND (wParam, lParam); drawBackground (wParam); return LRESULT.ONE; } -LRESULT WM_KILLFOCUS (int wParam, int lParam) { +LRESULT WM_KILLFOCUS (int /*long*/ wParam, int /*long*/ lParam) { return null; } -LRESULT WM_SETFOCUS (int wParam, int lParam) { +LRESULT WM_SETFOCUS (int /*long*/ wParam, int /*long*/ lParam) { OS.SetFocus (hwndText); return null; } -LRESULT WM_SETFONT (int wParam, int lParam) { +LRESULT WM_SETFONT (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_SETFONT (wParam, lParam); if (result != null) return result; OS.SendMessage (hwndText, OS.WM_SETFONT, wParam, lParam); return result; } -LRESULT WM_SIZE (int wParam, int lParam) { +LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_SIZE (wParam, lParam); if (isDisposed ()) return result; int width = OS.LOWORD (lParam), height = OS.HIWORD (lParam); @@ -1141,7 +1141,7 @@ LRESULT WM_SIZE (int wParam, int lParam) { return result; } -LRESULT wmChar (int hwnd, int wParam, int lParam) { +LRESULT wmChar (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.wmChar (hwnd, wParam, lParam); if (result != null) return result; /* @@ -1151,7 +1151,7 @@ LRESULT wmChar (int hwnd, int wParam, int lParam) { * The fix is to look for these keys and not call * the window proc. */ - switch (wParam) { + switch ((int)/*64*/wParam) { case SWT.CR: postEvent (SWT.DefaultSelection); // FALL THROUGH @@ -1161,7 +1161,7 @@ LRESULT wmChar (int hwnd, int wParam, int lParam) { return result; } -LRESULT wmClipboard (int hwndText, int msg, int wParam, int lParam) { +LRESULT wmClipboard (int /*long*/ hwndText, int msg, int /*long*/ wParam, int /*long*/ lParam) { if ((style & SWT.READ_ONLY) != 0) return null; // if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return null; boolean call = false; @@ -1211,11 +1211,11 @@ LRESULT wmClipboard (int hwndText, int msg, int wParam, int lParam) { } TCHAR buffer = new TCHAR (getCodePage (), newText, true); if (msg == OS.WM_SETTEXT) { - int hHeap = OS.GetProcessHeap (); + int /*long*/ hHeap = OS.GetProcessHeap (); int byteCount = buffer.length () * TCHAR.sizeof; - int pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); + int /*long*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); OS.MoveMemory (pszText, buffer, byteCount); - int code = OS.CallWindowProc (EditProc, hwndText, msg, wParam, pszText); + int /*long*/ code = OS.CallWindowProc (EditProc, hwndText, msg, wParam, pszText); OS.HeapFree (hHeap, 0, pszText); return new LRESULT (code); } else { @@ -1227,7 +1227,7 @@ LRESULT wmClipboard (int hwndText, int msg, int wParam, int lParam) { return null; } -LRESULT wmCommandChild (int wParam, int lParam) { +LRESULT wmCommandChild (int /*long*/ wParam, int /*long*/ lParam) { int code = OS.HIWORD (wParam); switch (code) { case OS.EN_CHANGE: @@ -1238,7 +1238,7 @@ LRESULT wmCommandChild (int wParam, int lParam) { if (OS.IsWinCE) { pos = OS.LOWORD (OS.SendMessage (hwndUpDown, OS.UDM_GETPOS, 0, 0)); } else { - pos = OS.SendMessage (hwndUpDown, OS.UDM_GETPOS32, 0, 0); + pos = (int)/*64*/OS.SendMessage (hwndUpDown, OS.UDM_GETPOS32, 0, 0); } if (pos != value) setSelection (value, true, false, true); } @@ -1249,7 +1249,7 @@ LRESULT wmCommandChild (int wParam, int lParam) { return super.wmCommandChild (wParam, lParam); } -LRESULT wmKeyDown (int hwnd, int wParam, int lParam) { +LRESULT wmKeyDown (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.wmKeyDown (hwnd, wParam, lParam); if (result != null) return result; @@ -1257,7 +1257,7 @@ LRESULT wmKeyDown (int hwnd, int wParam, int lParam) { UDACCEL udaccel = new UDACCEL (); OS.SendMessage (hwndUpDown, OS.UDM_GETACCEL, 1, udaccel); int delta = 0; - switch (wParam) { + switch ((int)/*64*/wParam) { case OS.VK_UP: delta = udaccel.nInc; break; case OS.VK_DOWN: delta = -udaccel.nInc; break; case OS.VK_PRIOR: delta = pageIncrement; break; @@ -1269,7 +1269,7 @@ LRESULT wmKeyDown (int hwnd, int wParam, int lParam) { if (OS.IsWinCE) { value = OS.LOWORD (OS.SendMessage (hwndUpDown, OS.UDM_GETPOS, 0, 0)); } else { - value = OS.SendMessage (hwndUpDown, OS.UDM_GETPOS32, 0, 0); + value = (int)/*64*/OS.SendMessage (hwndUpDown, OS.UDM_GETPOS32, 0, 0); } } int newValue = value + delta; @@ -1284,7 +1284,7 @@ LRESULT wmKeyDown (int hwnd, int wParam, int lParam) { } /* Stop the edit control from moving the caret */ - switch (wParam) { + switch ((int)/*64*/wParam) { case OS.VK_UP: case OS.VK_DOWN: return LRESULT.ZERO; @@ -1292,20 +1292,20 @@ LRESULT wmKeyDown (int hwnd, int wParam, int lParam) { return result; } -LRESULT wmKillFocus (int hwnd, int wParam, int lParam) { +LRESULT wmKillFocus (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) { int value = getSelectionText (); if (value == -1) { if (OS.IsWinCE) { value = OS.LOWORD (OS.SendMessage (hwndUpDown, OS.UDM_GETPOS, 0, 0)); } else { - value = OS.SendMessage (hwndUpDown, OS.UDM_GETPOS32, 0, 0); + value = (int)/*64*/OS.SendMessage (hwndUpDown, OS.UDM_GETPOS32, 0, 0); } setSelection (value, false, true, false); } return super.wmKillFocus (hwnd, wParam, lParam); } -LRESULT wmNotifyChild (NMHDR hdr, int wParam, int lParam) { +LRESULT wmNotifyChild (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) { switch (hdr.code) { case OS.UDN_DELTAPOS: NMUPDOWN lpnmud = new NMUPDOWN (); @@ -1334,7 +1334,7 @@ LRESULT wmNotifyChild (NMHDR hdr, int wParam, int lParam) { return super.wmNotifyChild (hdr, wParam, lParam); } -LRESULT wmScrollChild (int wParam, int lParam) { +LRESULT wmScrollChild (int /*long*/ wParam, int /*long*/ lParam) { int code = OS.LOWORD (wParam); switch (code) { case OS.SB_THUMBPOSITION: diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabFolder.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabFolder.java index cc0a67e193..38819c85fd 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabFolder.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabFolder.java @@ -45,7 +45,7 @@ import org.eclipse.swt.events.*; public class TabFolder extends Composite { TabItem [] items; ImageList imageList; - static final int TabFolderProc; + static final int /*long*/ TabFolderProc; static final TCHAR TabFolderClass = new TCHAR (0, OS.WC_TABCONTROL, true); /* @@ -78,12 +78,12 @@ public class TabFolder extends Composite { * code, other than SWT, could create a control with * this class name, and fail unexpectedly. */ - int hInstance = OS.GetModuleHandle (null); - int hHeap = OS.GetProcessHeap (); + int /*long*/ hInstance = OS.GetModuleHandle (null); + int /*long*/ hHeap = OS.GetProcessHeap (); lpWndClass.hInstance = hInstance; lpWndClass.style &= ~(OS.CS_HREDRAW | OS.CS_VREDRAW | OS.CS_GLOBALCLASS); int byteCount = TabFolderClass.length () * TCHAR.sizeof; - int lpszClassName = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); + int /*long*/ lpszClassName = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); OS.MoveMemory (lpszClassName, TabFolderClass, byteCount); lpWndClass.lpszClassName = lpszClassName; OS.RegisterClass (lpWndClass); @@ -154,7 +154,7 @@ public void addSelectionListener(SelectionListener listener) { addListener(SWT.DefaultSelection,typedListener); } -int callWindowProc (int hwnd, int msg, int wParam, int lParam) { +int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) { if (handle == 0) return 0; return OS.CallWindowProc (TabFolderProc, hwnd, msg, wParam, lParam); } @@ -189,7 +189,7 @@ public Point computeSize (int wHint, int hHint, boolean changed) { RECT insetRect = new RECT (), itemRect = new RECT (); OS.SendMessage (handle, OS.TCM_ADJUSTRECT, 0, insetRect); int width = insetRect.left - insetRect.right; - int count = OS.SendMessage (handle, OS.TCM_GETITEMCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.TCM_GETITEMCOUNT, 0, 0); if (count != 0) { OS.SendMessage (handle, OS.TCM_GETITEMRECT, count - 1, itemRect); width = Math.max (width, itemRect.right - insetRect.right); @@ -218,7 +218,7 @@ public Rectangle computeTrim (int x, int y, int width, int height) { } void createItem (TabItem item, int index) { - int count = OS.SendMessage (handle, OS.TCM_GETITEMCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.TCM_GETITEMCOUNT, 0, 0); if (!(0 <= index && index <= count)) error (SWT.ERROR_INVALID_RANGE); if (count == items.length) { TabItem [] newItems = new TabItem [items.length + 4]; @@ -261,7 +261,7 @@ void createHandle () { * is set. The fix is to set TTM_SETMAXTIPWIDTH to * a large value. */ - int hwndToolTip = OS.SendMessage (handle, OS.TCM_GETTOOLTIPS, 0, 0); + int /*long*/ hwndToolTip = OS.SendMessage (handle, OS.TCM_GETTOOLTIPS, 0, 0); OS.SendMessage (hwndToolTip, OS.TTM_SETMAXTIPWIDTH, 0, 0x7FFF); } @@ -271,14 +271,14 @@ void createWidget () { } void destroyItem (TabItem item) { - int count = OS.SendMessage (handle, OS.TCM_GETITEMCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.TCM_GETITEMCOUNT, 0, 0); int index = 0; while (index < count) { if (items [index] == item) break; index++; } if (index == count) return; - int selectionIndex = OS.SendMessage (handle, OS.TCM_GETCURSEL, 0, 0); + int selectionIndex = (int)/*64*/OS.SendMessage (handle, OS.TCM_GETCURSEL, 0, 0); if (OS.SendMessage (handle, OS.TCM_DELETEITEM, index, 0) == 0) { error (SWT.ERROR_ITEM_NOT_REMOVED); } @@ -297,7 +297,7 @@ void destroyItem (TabItem item) { } } -void drawThemeBackground (int hDC, int hwnd, RECT rect) { +void drawThemeBackground (int /*long*/ hDC, int /*long*/ hwnd, RECT rect) { RECT rect2 = new RECT (); OS.GetClientRect (handle, rect2); OS.MapWindowPoints (handle, hwnd, rect2, 2); @@ -339,7 +339,7 @@ public Rectangle getClientArea () { */ public TabItem getItem (int index) { checkWidget (); - int count = OS.SendMessage (handle, OS.TCM_GETITEMCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.TCM_GETITEMCOUNT, 0, 0); if (!(0 <= index && index < count)) error (SWT.ERROR_INVALID_RANGE); return items [index]; } @@ -356,7 +356,7 @@ public TabItem getItem (int index) { */ public int getItemCount () { checkWidget (); - return OS.SendMessage (handle, OS.TCM_GETITEMCOUNT, 0, 0); + return (int)/*64*/OS.SendMessage (handle, OS.TCM_GETITEMCOUNT, 0, 0); } /** @@ -377,7 +377,7 @@ public int getItemCount () { */ public TabItem [] getItems () { checkWidget (); - int count = OS.SendMessage (handle, OS.TCM_GETITEMCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.TCM_GETITEMCOUNT, 0, 0); TabItem [] result = new TabItem [count]; System.arraycopy (items, 0, result, 0, count); return result; @@ -401,7 +401,7 @@ public TabItem [] getItems () { */ public TabItem [] getSelection () { checkWidget (); - int index = OS.SendMessage (handle, OS.TCM_GETCURSEL, 0, 0); + int index = (int)/*64*/OS.SendMessage (handle, OS.TCM_GETCURSEL, 0, 0); if (index == -1) return new TabItem [0]; return new TabItem [] {items [index]}; } @@ -419,7 +419,7 @@ public TabItem [] getSelection () { */ public int getSelectionIndex () { checkWidget (); - return OS.SendMessage (handle, OS.TCM_GETCURSEL, 0, 0); + return (int)/*64*/OS.SendMessage (handle, OS.TCM_GETCURSEL, 0, 0); } int imageIndex (Image image) { @@ -428,7 +428,7 @@ int imageIndex (Image image) { Rectangle bounds = image.getBounds (); imageList = display.getImageList (style & SWT.RIGHT_TO_LEFT, bounds.width, bounds.height); int index = imageList.add (image); - int hImageList = imageList.getHandle (); + int /*long*/ hImageList = imageList.getHandle (); OS.SendMessage (handle, OS.TCM_SETIMAGELIST, 0, hImageList); return index; } @@ -461,7 +461,7 @@ int imageIndex (Image image) { public int indexOf (TabItem item) { checkWidget (); if (item == null) error (SWT.ERROR_NULL_ARGUMENT); - int count = OS.SendMessage (handle, OS.TCM_GETITEMCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.TCM_GETITEMCOUNT, 0, 0); for (int i=0; i<count; i++) { if (items [i] == item) return i; } @@ -474,7 +474,7 @@ Point minimumSize (int wHint, int hHint, boolean flushCache) { for (int i=0; i<children.length; i++) { Control child = children [i]; int index = 0; - int count = OS.SendMessage (handle, OS.TCM_GETITEMCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.TCM_GETITEMCOUNT, 0, 0); while (index < count) { if (items [index].control == child) break; index++; @@ -523,7 +523,7 @@ boolean mnemonicMatch (char key) { void releaseChildren (boolean destroy) { if (items != null) { - int count = OS.SendMessage (handle, OS.TCM_GETITEMCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.TCM_GETITEMCOUNT, 0, 0); for (int i=0; i<count; i++) { TabItem item = items [i]; if (item != null && !item.isDisposed ()) { @@ -546,7 +546,7 @@ void releaseWidget () { void removeControl (Control control) { super.removeControl (control); - int count = OS.SendMessage (handle, OS.TCM_GETITEMCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.TCM_GETITEMCOUNT, 0, 0); for (int i=0; i<count; i++) { TabItem item = items [i]; if (item.control == control) item.setControl (null); @@ -636,7 +636,7 @@ public void setFont (Font font) { Rectangle newRect = getClientArea (); if (!oldRect.equals (newRect)) { sendResize (); - int index = OS.SendMessage (handle, OS.TCM_GETCURSEL, 0, 0); + int index = (int)/*64*/OS.SendMessage (handle, OS.TCM_GETCURSEL, 0, 0); if (index != -1) { TabItem item = items [index]; Control control = item.control; @@ -662,13 +662,13 @@ public void setFont (Font font) { */ public void setSelection (int index) { checkWidget (); - int count = OS.SendMessage (handle, OS.TCM_GETITEMCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.TCM_GETITEMCOUNT, 0, 0); if (!(0 <= index && index < count)) return; setSelection (index, false); } void setSelection (int index, boolean notify) { - int oldIndex = OS.SendMessage (handle, OS.TCM_GETCURSEL, 0, 0); + int oldIndex = (int)/*64*/OS.SendMessage (handle, OS.TCM_GETCURSEL, 0, 0); if (oldIndex == index) return; if (oldIndex != -1) { TabItem item = items [oldIndex]; @@ -678,7 +678,7 @@ void setSelection (int index, boolean notify) { } } OS.SendMessage (handle, OS.TCM_SETCURSEL, index, 0); - int newIndex = OS.SendMessage (handle, OS.TCM_GETCURSEL, 0, 0); + int newIndex = (int)/*64*/OS.SendMessage (handle, OS.TCM_GETCURSEL, 0, 0); if (newIndex != -1) { TabItem item = items [newIndex]; Control control = item.control; @@ -698,8 +698,9 @@ String toolTipText (NMTTDISPINFO hdr) { if ((hdr.uFlags & OS.TTF_IDISHWND) != 0) { return null; } - int index = hdr.idFrom; - int hwndToolTip = OS.SendMessage (handle, OS.TCM_GETTOOLTIPS, 0, 0); + //TODO - should ids be long + int index = (int)/*64*/hdr.idFrom; + int /*long*/ hwndToolTip = OS.SendMessage (handle, OS.TCM_GETTOOLTIPS, 0, 0); if (hwndToolTip == hdr.hwndFrom) { if (toolTipText != null) return ""; if (0 <= index && index < items.length) { @@ -746,11 +747,11 @@ TCHAR windowClass () { return TabFolderClass; } -int windowProc () { +int /*long*/ windowProc () { return TabFolderProc; } -LRESULT WM_GETDLGCODE (int wParam, int lParam) { +LRESULT WM_GETDLGCODE (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_GETDLGCODE (wParam, lParam); /* * Return DLGC_BUTTON so that mnemonics will be @@ -761,7 +762,7 @@ LRESULT WM_GETDLGCODE (int wParam, int lParam) { return new LRESULT (OS.DLGC_BUTTON); } -LRESULT WM_MOUSELEAVE (int wParam, int lParam) { +LRESULT WM_MOUSELEAVE (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_MOUSELEAVE (wParam, lParam); if (result != null) return result; /* @@ -778,7 +779,7 @@ LRESULT WM_MOUSELEAVE (int wParam, int lParam) { if (OS.COMCTL32_MAJOR >= 6) { TOOLINFO lpti = new TOOLINFO (); lpti.cbSize = TOOLINFO.sizeof; - int hwndToolTip = OS.SendMessage (handle, OS.TCM_GETTOOLTIPS, 0, 0); + int /*long*/ hwndToolTip = OS.SendMessage (handle, OS.TCM_GETTOOLTIPS, 0, 0); if (OS.SendMessage (hwndToolTip, OS.TTM_GETCURRENTTOOL, 0, lpti) != 0) { if ((lpti.uFlags & OS.TTF_IDISHWND) == 0) { OS.SendMessage (hwndToolTip, OS.TTM_DELTOOL, 0, lpti); @@ -789,7 +790,7 @@ LRESULT WM_MOUSELEAVE (int wParam, int lParam) { return result; } -LRESULT WM_NCHITTEST (int wParam, int lParam) { +LRESULT WM_NCHITTEST (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_NCHITTEST (wParam, lParam); if (result != null) return result; /* @@ -804,11 +805,11 @@ LRESULT WM_NCHITTEST (int wParam, int lParam) { * default window proc that returns HTCLIENT when * the mouse is in the client area. */ - int hittest = OS.DefWindowProc (handle, OS.WM_NCHITTEST, wParam, lParam); + int /*long*/ hittest = OS.DefWindowProc (handle, OS.WM_NCHITTEST, wParam, lParam); return new LRESULT (hittest); } -LRESULT WM_NOTIFY (int wParam, int lParam) { +LRESULT WM_NOTIFY (int /*long*/ wParam, int /*long*/ lParam) { /* * Feature in Windows. When the tab folder window * proc processes WM_NOTIFY, it forwards this @@ -832,7 +833,7 @@ LRESULT WM_NOTIFY (int wParam, int lParam) { return LRESULT.ZERO; } -LRESULT WM_PARENTNOTIFY (int wParam, int lParam) { +LRESULT WM_PARENTNOTIFY (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_PARENTNOTIFY (wParam, lParam); if (result != null) return result; /* @@ -850,7 +851,8 @@ LRESULT WM_PARENTNOTIFY (int wParam, int lParam) { int code = OS.LOWORD (wParam); switch (code) { case OS.WM_CREATE: { - int id = OS.HIWORD (wParam), hwnd = lParam; + int id = OS.HIWORD (wParam); + int /*long*/ hwnd = lParam; if (id == ID_UPDOWN) { int bits = OS.GetWindowLong (hwnd, OS.GWL_EXSTYLE); OS.SetWindowLong (hwnd, OS.GWL_EXSTYLE, bits | OS.WS_EX_LAYOUTRTL); @@ -862,7 +864,7 @@ LRESULT WM_PARENTNOTIFY (int wParam, int lParam) { return result; } -LRESULT WM_SIZE (int wParam, int lParam) { +LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_SIZE (wParam, lParam); /* * It is possible (but unlikely), that application @@ -872,7 +874,7 @@ LRESULT WM_SIZE (int wParam, int lParam) { * WM_SIZE message. */ if (isDisposed ()) return result; - int index = OS.SendMessage (handle, OS.TCM_GETCURSEL, 0, 0); + int index = (int)/*64*/OS.SendMessage (handle, OS.TCM_GETCURSEL, 0, 0); if (index != -1) { TabItem item = items [index]; Control control = item.control; @@ -883,7 +885,7 @@ LRESULT WM_SIZE (int wParam, int lParam) { return result; } -LRESULT WM_WINDOWPOSCHANGING (int wParam, int lParam) { +LRESULT WM_WINDOWPOSCHANGING (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_WINDOWPOSCHANGING (wParam, lParam); if (result != null) return result; if (!OS.IsWindowVisible (handle)) return result; @@ -932,13 +934,13 @@ LRESULT WM_WINDOWPOSCHANGING (int wParam, int lParam) { return result; } -LRESULT wmNotifyChild (NMHDR hdr, int wParam, int lParam) { +LRESULT wmNotifyChild (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) { int code = hdr.code; switch (code) { case OS.TCN_SELCHANGE: case OS.TCN_SELCHANGING: TabItem item = null; - int index = OS.SendMessage (handle, OS.TCM_GETCURSEL, 0, 0); + int index = (int)/*64*/OS.SendMessage (handle, OS.TCM_GETCURSEL, 0, 0); if (index != -1) item = items [index]; if (item != null) { Control control = item.control; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabItem.java index 040584bf2e..2228bb80f9 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabItem.java @@ -128,11 +128,11 @@ void _setText (int index, String string) { if (j < i) string = new String (text, 0, j); } } - int hwnd = parent.handle; - int hHeap = OS.GetProcessHeap (); + int /*long*/ hwnd = parent.handle; + int /*long*/ hHeap = OS.GetProcessHeap (); TCHAR buffer = new TCHAR (parent.getCodePage (), string, true); int byteCount = buffer.length () * TCHAR.sizeof; - int pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); + int /*long*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); OS.MoveMemory (pszText, buffer, byteCount); TCITEM tcItem = new TCITEM (); tcItem.mask = OS.TCIF_TEXT; @@ -270,7 +270,7 @@ public void setImage (Image image) { if (OS.COMCTL32_MAJOR >= 6) { if (text.indexOf ('&') != -1) _setText (index, text); } - int hwnd = parent.handle; + int /*long*/ hwnd = parent.handle; TCITEM tcItem = new TCITEM (); tcItem.mask = OS.TCIF_IMAGE; tcItem.iImage = parent.imageIndex (image); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java index 11e12adf8a..90d8620b46 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java @@ -74,8 +74,9 @@ public class Table extends Composite { boolean ignoreCustomDraw, ignoreDrawForeground, ignoreDrawBackground, ignoreDrawFocus, ignoreDrawSelection, ignoreDrawHot; boolean customDraw, dragStarted, explorerTheme, firstColumnImage, fixScrollWidth, tipRequested, wasSelected, wasResized; boolean ignoreActivate, ignoreSelect, ignoreShrink, ignoreResize, ignoreColumnMove, ignoreColumnResize; - int headerToolTipHandle, itemHeight, lastIndexOf, lastWidth, sortDirection, resizeCount, selectionForeground, hotIndex; - static /*final*/ int HeaderProc; + int /*long*/ headerToolTipHandle; + int itemHeight, lastIndexOf, lastWidth, sortDirection, resizeCount, selectionForeground, hotIndex; + static /*final*/ int /*long*/ HeaderProc; static final int INSET = 4; static final int GRID_WIDTH = 1; static final int SORT_WIDTH = 10; @@ -84,7 +85,7 @@ public class Table extends Composite { static final int VISTA_EXTRA = 2; static final int EXPLORER_EXTRA = 2; static final boolean EXPLORER_THEME = true; - static final int TableProc; + static final int /*long*/ TableProc; static final TCHAR TableClass = new TCHAR (0, OS.WC_LISTVIEW, true); static { WNDCLASS lpWndClass = new WNDCLASS (); @@ -185,11 +186,11 @@ public void addSelectionListener (SelectionListener listener) { addListener (SWT.DefaultSelection,typedListener); } -int callWindowProc (int hwnd, int msg, int wParam, int lParam) { +int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) { return callWindowProc (hwnd, msg, wParam, lParam, false); } -int callWindowProc (int hwnd, int msg, int wParam, int lParam, boolean forceSelect) { +int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam, boolean forceSelect) { if (handle == 0) return 0; if (handle != hwnd) { return OS.CallWindowProc (HeaderProc, hwnd, msg, wParam, lParam); @@ -251,19 +252,19 @@ int callWindowProc (int hwnd, int msg, int wParam, int lParam, boolean forceSele case OS.WM_SETFONT: case OS.WM_TIMER: { if (findImageControl () != null) { - topIndex = OS.SendMessage (handle, OS.LVM_GETTOPINDEX, 0, 0); + topIndex = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETTOPINDEX, 0, 0); } } } boolean oldSelected = wasSelected; if (checkSelection) wasSelected = false; if (checkActivate) ignoreActivate = true; - int code = OS.CallWindowProc (TableProc, hwnd, msg, wParam, lParam); + int /*long*/ code = OS.CallWindowProc (TableProc, hwnd, msg, wParam, lParam); if (checkActivate) ignoreActivate = false; if (checkSelection) { if (wasSelected || forceSelect) { Event event = new Event (); - int index = OS.SendMessage (handle, OS.LVM_GETNEXTITEM, -1, OS.LVNI_FOCUSED); + int index = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETNEXTITEM, -1, OS.LVNI_FOCUSED); if (index != -1) event.item = _getItem (index); postEvent (SWT.Selection, event); } @@ -290,7 +291,7 @@ int callWindowProc (int hwnd, int msg, int wParam, int lParam, boolean forceSele if (redraw) { OS.DefWindowProc (handle, OS.WM_SETREDRAW, 1, 0); OS.InvalidateRect (handle, null, true); - int hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); + int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); if (hwndHeader != 0) OS.InvalidateRect (hwndHeader, null, true); } //FALL THROUGH @@ -339,8 +340,8 @@ static int checkStyle (int style) { return checkBits (style, SWT.SINGLE, SWT.MULTI, 0, 0, 0, 0); } -LRESULT CDDS_ITEMPOSTPAINT (NMLVCUSTOMDRAW nmcd, int wParam, int lParam) { - int hDC = nmcd.hdc; +LRESULT CDDS_ITEMPOSTPAINT (NMLVCUSTOMDRAW nmcd, int /*long*/ wParam, int /*long*/ lParam) { + int /*long*/ hDC = nmcd.hdc; if (explorerTheme && !ignoreCustomDraw) { hotIndex = -1; if (hooks (SWT.EraseItem) && nmcd.left != nmcd.right) { @@ -363,20 +364,20 @@ LRESULT CDDS_ITEMPOSTPAINT (NMLVCUSTOMDRAW nmcd, int wParam, int lParam) { if (OS.IsWindowVisible (handle) && OS.IsWindowEnabled (handle)) { if (!explorerTheme && (style & SWT.FULL_SELECTION) != 0) { if (OS.SendMessage (handle, OS.LVM_GETBKCOLOR, 0, 0) == OS.CLR_NONE) { - int dwExStyle = OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); + int dwExStyle = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); if ((dwExStyle & OS.LVS_EX_FULLROWSELECT) == 0) { // if ((nmcd.uItemState & OS.CDIS_FOCUS) != 0) { if (OS.SendMessage (handle, OS.LVM_GETNEXTITEM, -1, OS.LVNI_FOCUSED) == nmcd.dwItemSpec) { if (handle == OS.GetFocus ()) { - int uiState = OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); + int uiState = (int)/*64*/OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); if ((uiState & OS.UISF_HIDEFOCUS) == 0) { RECT rect = new RECT (); rect.left = OS.LVIR_BOUNDS; boolean oldIgnore = ignoreCustomDraw; ignoreCustomDraw = true; OS.SendMessage (handle, OS. LVM_GETITEMRECT, nmcd.dwItemSpec, rect); - int hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); - int index = OS.SendMessage (hwndHeader, OS.HDM_ORDERTOINDEX, 0, 0); + int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); + int index = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_ORDERTOINDEX, 0, 0); RECT itemRect = new RECT (); if (index == 0) { itemRect.left = OS.LVIR_LABEL; @@ -400,7 +401,7 @@ LRESULT CDDS_ITEMPOSTPAINT (NMLVCUSTOMDRAW nmcd, int wParam, int lParam) { return null; } -LRESULT CDDS_ITEMPREPAINT (NMLVCUSTOMDRAW nmcd, int wParam, int lParam) { +LRESULT CDDS_ITEMPREPAINT (NMLVCUSTOMDRAW nmcd, int /*long*/ wParam, int /*long*/ lParam) { /* * Bug in Windows. When the table has the extended style * LVS_EX_FULLROWSELECT and LVM_SETBKCOLOR is used with @@ -417,7 +418,7 @@ LRESULT CDDS_ITEMPREPAINT (NMLVCUSTOMDRAW nmcd, int wParam, int lParam) { if (OS.IsWindowVisible (handle) && OS.IsWindowEnabled (handle)) { if (!explorerTheme && (style & SWT.FULL_SELECTION) != 0) { if (OS.SendMessage (handle, OS.LVM_GETBKCOLOR, 0, 0) == OS.CLR_NONE) { - int dwExStyle = OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); + int dwExStyle = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); if ((dwExStyle & OS.LVS_EX_FULLROWSELECT) == 0) { if ((nmcd.uItemState & OS.CDIS_FOCUS) != 0) { nmcd.uItemState &= ~OS.CDIS_FOCUS; @@ -429,10 +430,10 @@ LRESULT CDDS_ITEMPREPAINT (NMLVCUSTOMDRAW nmcd, int wParam, int lParam) { } } if (explorerTheme && !ignoreCustomDraw) { - hotIndex = (nmcd.uItemState & OS.CDIS_HOT) != 0 ? nmcd.dwItemSpec : -1; + hotIndex = (nmcd.uItemState & OS.CDIS_HOT) != 0 ? (int)/*64*/nmcd.dwItemSpec : -1; if (hooks (SWT.EraseItem) && nmcd.left != nmcd.right) { OS.SaveDC (nmcd.hdc); - int hrgn = OS.CreateRectRgn (0, 0, 0, 0); + int /*long*/ hrgn = OS.CreateRectRgn (0, 0, 0, 0); OS.SelectClipRgn (nmcd.hdc, hrgn); OS.DeleteObject (hrgn); } @@ -440,7 +441,7 @@ LRESULT CDDS_ITEMPREPAINT (NMLVCUSTOMDRAW nmcd, int wParam, int lParam) { return new LRESULT (OS.CDRF_NOTIFYSUBITEMDRAW | OS.CDRF_NOTIFYPOSTPAINT); } -LRESULT CDDS_POSTPAINT (NMLVCUSTOMDRAW nmcd, int wParam, int lParam) { +LRESULT CDDS_POSTPAINT (NMLVCUSTOMDRAW nmcd, int /*long*/ wParam, int /*long*/ lParam) { if (ignoreCustomDraw) return null; /* * Bug in Windows. When the table has the extended style @@ -453,7 +454,7 @@ LRESULT CDDS_POSTPAINT (NMLVCUSTOMDRAW nmcd, int wParam, int lParam) { if (--customCount == 0 && OS.IsWindowVisible (handle)) { if (!explorerTheme && (style & SWT.FULL_SELECTION) != 0) { if (OS.SendMessage (handle, OS.LVM_GETBKCOLOR, 0, 0) == OS.CLR_NONE) { - int dwExStyle = OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); + int dwExStyle = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); if ((dwExStyle & OS.LVS_EX_FULLROWSELECT) == 0) { int bits = OS.LVS_EX_FULLROWSELECT; if (OS.IsWinCE) { @@ -463,7 +464,7 @@ LRESULT CDDS_POSTPAINT (NMLVCUSTOMDRAW nmcd, int wParam, int lParam) { OS.ValidateRect (handle, null); if (damaged) OS.InvalidateRect (handle, rect, true); } else { - int rgn = OS.CreateRectRgn (0, 0, 0, 0); + int /*long*/ rgn = OS.CreateRectRgn (0, 0, 0, 0); int result = OS.GetUpdateRgn (handle, rgn, true); OS.SendMessage (handle, OS.LVM_SETEXTENDEDLISTVIEWSTYLE, bits, bits); OS.ValidateRect (handle, null); @@ -477,7 +478,7 @@ LRESULT CDDS_POSTPAINT (NMLVCUSTOMDRAW nmcd, int wParam, int lParam) { return null; } -LRESULT CDDS_PREPAINT (NMLVCUSTOMDRAW nmcd, int wParam, int lParam) { +LRESULT CDDS_PREPAINT (NMLVCUSTOMDRAW nmcd, int /*long*/ wParam, int /*long*/ lParam) { if (ignoreCustomDraw) { return new LRESULT (OS.CDRF_NOTIFYITEMDRAW | OS.CDRF_NOTIFYPOSTPAINT); } @@ -492,7 +493,7 @@ LRESULT CDDS_PREPAINT (NMLVCUSTOMDRAW nmcd, int wParam, int lParam) { if (customCount++ == 0 && OS.IsWindowVisible (handle)) { if (!explorerTheme && (style & SWT.FULL_SELECTION) != 0) { if (OS.SendMessage (handle, OS.LVM_GETBKCOLOR, 0, 0) == OS.CLR_NONE) { - int dwExStyle = OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); + int dwExStyle = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); if ((dwExStyle & OS.LVS_EX_FULLROWSELECT) != 0) { int bits = OS.LVS_EX_FULLROWSELECT; if (OS.IsWinCE) { @@ -502,7 +503,7 @@ LRESULT CDDS_PREPAINT (NMLVCUSTOMDRAW nmcd, int wParam, int lParam) { OS.ValidateRect (handle, null); if (damaged) OS.InvalidateRect (handle, rect, true); } else { - int rgn = OS.CreateRectRgn (0, 0, 0, 0); + int /*long*/ rgn = OS.CreateRectRgn (0, 0, 0, 0); int result = OS.GetUpdateRgn (handle, rgn, true); OS.SendMessage (handle, OS.LVM_SETEXTENDEDLISTVIEWSTYLE, bits, 0); OS.ValidateRect (handle, null); @@ -522,7 +523,7 @@ LRESULT CDDS_PREPAINT (NMLVCUSTOMDRAW nmcd, int wParam, int lParam) { * The fix is to draw the background using custom draw. */ if (explorerTheme && columnCount == 0) { - int hDC = nmcd.hdc; + int /*long*/ hDC = nmcd.hdc; RECT rect = new RECT (); OS.SetRect (rect, nmcd.left, nmcd.top, nmcd.right, nmcd.bottom); if (OS.IsWindowEnabled (handle) || findImageControl () != null) { @@ -553,7 +554,7 @@ LRESULT CDDS_PREPAINT (NMLVCUSTOMDRAW nmcd, int wParam, int lParam) { int clrSortBk = getSortColumnPixel (); RECT columnRect = new RECT (), headerRect = new RECT (); OS.GetClientRect (handle, columnRect); - int hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); + int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); if (OS.SendMessage (hwndHeader, OS.HDM_GETITEMRECT, index, headerRect) != 0) { OS.MapWindowPoints (hwndHeader, handle, headerRect, 2); columnRect.left = headerRect.left; @@ -573,10 +574,10 @@ LRESULT CDDS_PREPAINT (NMLVCUSTOMDRAW nmcd, int wParam, int lParam) { return new LRESULT (OS.CDRF_NOTIFYITEMDRAW | OS.CDRF_NOTIFYPOSTPAINT); } -LRESULT CDDS_SUBITEMPOSTPAINT (NMLVCUSTOMDRAW nmcd, int wParam, int lParam) { +LRESULT CDDS_SUBITEMPOSTPAINT (NMLVCUSTOMDRAW nmcd, int /*long*/ wParam, int /*long*/ lParam) { if (ignoreCustomDraw) return null; if (nmcd.left == nmcd.right) return new LRESULT (OS.CDRF_DODEFAULT); - int hDC = nmcd.hdc; + int /*long*/ hDC = nmcd.hdc; if (ignoreDrawForeground) OS.RestoreDC (hDC, -1); if (OS.IsWindowVisible (handle)) { /* @@ -588,10 +589,11 @@ LRESULT CDDS_SUBITEMPOSTPAINT (NMLVCUSTOMDRAW nmcd, int wParam, int lParam) { if (OS.SendMessage (handle, OS.LVM_GETBKCOLOR, 0, 0) != OS.CLR_NONE) { if ((sortDirection & (SWT.UP | SWT.DOWN)) != 0) { if (sortColumn != null && !sortColumn.isDisposed ()) { - int oldColumn = OS.SendMessage (handle, OS.LVM_GETSELECTEDCOLUMN, 0, 0); + int oldColumn = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETSELECTEDCOLUMN, 0, 0); if (oldColumn == -1) { int newColumn = indexOf (sortColumn); - int result = 0, rgn = 0; + int result = 0; + int /*long*/ rgn = 0; if (!OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (6, 0)) { rgn = OS.CreateRectRgn (0, 0, 0, 0); result = OS.GetUpdateRgn (handle, rgn, true); @@ -607,7 +609,7 @@ LRESULT CDDS_SUBITEMPOSTPAINT (NMLVCUSTOMDRAW nmcd, int wParam, int lParam) { } } if (hooks (SWT.PaintItem)) { - TableItem item = _getItem (nmcd.dwItemSpec); + TableItem item = _getItem ((int)/*64*/nmcd.dwItemSpec); sendPaintItemEvent (item, nmcd); //widget could be disposed at this point } @@ -615,8 +617,8 @@ LRESULT CDDS_SUBITEMPOSTPAINT (NMLVCUSTOMDRAW nmcd, int wParam, int lParam) { return null; } -LRESULT CDDS_SUBITEMPREPAINT (NMLVCUSTOMDRAW nmcd, int wParam, int lParam) { - int hDC = nmcd.hdc; +LRESULT CDDS_SUBITEMPREPAINT (NMLVCUSTOMDRAW nmcd, int /*long*/ wParam, int /*long*/ lParam) { + int /*long*/ hDC = nmcd.hdc; if (explorerTheme && !ignoreCustomDraw && hooks (SWT.EraseItem) && (nmcd.left != nmcd.right)) { OS.RestoreDC (hDC, -1); } @@ -628,9 +630,9 @@ LRESULT CDDS_SUBITEMPREPAINT (NMLVCUSTOMDRAW nmcd, int wParam, int lParam) { * has been added to the array. The fix is to check for * null. */ - TableItem item = _getItem (nmcd.dwItemSpec); + TableItem item = _getItem ((int)/*64*/nmcd.dwItemSpec); if (item == null) return null; - int hFont = item.cellFont != null ? item.cellFont [nmcd.iSubItem] : -1; + int /*long*/ hFont = item.cellFont != null ? item.cellFont [nmcd.iSubItem] : -1; if (hFont == -1) hFont = item.font; if (hFont != -1) OS.SelectObject (hDC, hFont); if (ignoreCustomDraw || (nmcd.left == nmcd.right)) { @@ -641,7 +643,7 @@ LRESULT CDDS_SUBITEMPREPAINT (NMLVCUSTOMDRAW nmcd, int wParam, int lParam) { ignoreDrawForeground = ignoreDrawSelection = ignoreDrawFocus = ignoreDrawBackground = false; if (OS.IsWindowVisible (handle)) { if (hooks (SWT.MeasureItem)) { - sendMeasureItemEvent (item, nmcd.dwItemSpec, nmcd.iSubItem, nmcd.hdc); + sendMeasureItemEvent (item, (int)/*64*/nmcd.dwItemSpec, nmcd.iSubItem, nmcd.hdc); if (isDisposed () || item.isDisposed ()) return null; } if (hooks (SWT.EraseItem)) { @@ -666,7 +668,7 @@ LRESULT CDDS_SUBITEMPREPAINT (NMLVCUSTOMDRAW nmcd, int wParam, int lParam) { */ if (OS.IsWindowVisible (handle) && OS.IsWindowEnabled (handle)) { if (!explorerTheme && !ignoreDrawSelection && (style & SWT.FULL_SELECTION) != 0) { - int bits = OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); + int bits = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); if ((bits & OS.LVS_EX_FULLROWSELECT) == 0) { /* * Bug in Windows. For some reason, CDIS_SELECTED always set, @@ -676,8 +678,8 @@ LRESULT CDDS_SUBITEMPREPAINT (NMLVCUSTOMDRAW nmcd, int wParam, int lParam) { LVITEM lvItem = new LVITEM (); lvItem.mask = OS.LVIF_STATE; lvItem.stateMask = OS.LVIS_SELECTED; - lvItem.iItem = nmcd.dwItemSpec; - int result = OS.SendMessage (handle, OS.LVM_GETITEM, 0, lvItem); + lvItem.iItem = (int)/*64*/nmcd.dwItemSpec; + int /*long*/ result = OS.SendMessage (handle, OS.LVM_GETITEM, 0, lvItem); if ((result != 0 && (lvItem.state & OS.LVIS_SELECTED) != 0)) { int clrSelection = -1; if (nmcd.iSubItem == 0) { @@ -699,7 +701,7 @@ LRESULT CDDS_SUBITEMPREPAINT (NMLVCUSTOMDRAW nmcd, int wParam, int lParam) { } } if (clrSelection != -1) { - RECT rect = item.getBounds (nmcd.dwItemSpec, nmcd.iSubItem, true, nmcd.iSubItem != 0, true, false, hDC); + RECT rect = item.getBounds ((int)/*64*/nmcd.dwItemSpec, nmcd.iSubItem, true, nmcd.iSubItem != 0, true, false, hDC); fillBackground (hDC, clrSelection, rect); } } @@ -717,8 +719,8 @@ LRESULT CDDS_SUBITEMPREPAINT (NMLVCUSTOMDRAW nmcd, int wParam, int lParam) { boolean hasAttributes = true; if (hFont == -1 && clrText == -1 && clrTextBk == -1) { if (item.cellForeground == null && item.cellBackground == null && item.cellFont == null) { - int hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); - int count = OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); + int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); + int count = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); if (count == 1) hasAttributes = false; } } @@ -754,9 +756,10 @@ LRESULT CDDS_SUBITEMPREPAINT (NMLVCUSTOMDRAW nmcd, int wParam, int lParam) { * in CDDS_SUBITEMPOSTPAINT. */ if (clrTextBk != -1) { - int oldColumn = OS.SendMessage (handle, OS.LVM_GETSELECTEDCOLUMN, 0, 0); + int oldColumn = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETSELECTEDCOLUMN, 0, 0); if (oldColumn != -1 && oldColumn == nmcd.iSubItem) { - int result = 0, rgn = 0; + int result = 0; + int /*long*/ rgn = 0; if (!OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (6, 0)) { rgn = OS.CreateRectRgn (0, 0, 0, 0); result = OS.GetUpdateRgn (handle, rgn, true); @@ -821,7 +824,7 @@ boolean checkData (TableItem item, int index, boolean redraw) { return true; } -boolean checkHandle (int hwnd) { +boolean checkHandle (int /*long*/ hwnd) { if (hwnd == handle) return true; return hwnd == OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); } @@ -853,7 +856,7 @@ protected void checkSubclass () { */ public void clear (int index) { checkWidget (); - int count = OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); if (!(0 <= index && index < count)) error (SWT.ERROR_INVALID_RANGE); TableItem item = items [index]; if (item != null) { @@ -910,7 +913,7 @@ public void clear (int index) { public void clear (int start, int end) { checkWidget (); if (start > end) return; - int count = OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); if (!(0 <= start && start <= end && end < count)) { error (SWT.ERROR_INVALID_RANGE); } @@ -985,7 +988,7 @@ public void clear (int [] indices) { checkWidget (); if (indices == null) error (SWT.ERROR_NULL_ARGUMENT); if (indices.length == 0) return; - int count = OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); for (int i=0; i<indices.length; i++) { if (!(0 <= indices [i] && indices [i] < count)) { error (SWT.ERROR_INVALID_RANGE); @@ -1050,7 +1053,7 @@ public void clearAll () { checkWidget (); LVITEM lvItem = null; boolean cleared = false; - int count = OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); for (int i=0; i<count; i++) { TableItem item = items [i]; if (item != null) { @@ -1114,7 +1117,7 @@ public Point computeSize (int wHint, int hHint, boolean changed) { // OS.ReleaseDC (handle, hDC); // } // } - int hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); + int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); RECT rect = new RECT (); OS.GetWindowRect (hwndHeader, rect); int height = rect.bottom - rect.top; @@ -1123,18 +1126,18 @@ public Point computeSize (int wHint, int hHint, boolean changed) { bits |= wHint & 0xFFFF; } else { int width = 0; - int count = OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); for (int i=0; i<count; i++) { width += OS.SendMessage (handle, OS.LVM_GETCOLUMNWIDTH, i, 0); } bits |= width & 0xFFFF; } - int result = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, -1, OS.MAKELPARAM (bits, 0xFFFF)); + int /*long*/ result = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, -1, OS.MAKELPARAM (bits, 0xFFFF)); int width = OS.LOWORD (result); - int empty = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 0, 0); - int oneItem = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 1, 0); + int /*long*/ empty = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 0, 0); + int /*long*/ oneItem = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 1, 0); int itemHeight = OS.HIWORD (oneItem) - OS.HIWORD (empty); - height += OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0) * itemHeight; + height += (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0) * itemHeight; if (width == 0) width = DEFAULT_WIDTH; if (height == 0) height = DEFAULT_HEIGHT; if (wHint != SWT.DEFAULT) width = wHint; @@ -1164,8 +1167,8 @@ void createHandle () { /* Get the header window proc */ if (HeaderProc == 0) { - int hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); - HeaderProc = OS.GetWindowLong (hwndHeader, OS.GWL_WNDPROC); + int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); + HeaderProc = OS.GetWindowLongPtr (hwndHeader, OS.GWLP_WNDPROC); } /* @@ -1194,8 +1197,8 @@ void createHandle () { /* Set the checkbox image list */ if ((style & SWT.CHECK) != 0) { - int empty = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 0, 0); - int oneItem = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 1, 0); + int /*long*/ empty = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 0, 0); + int /*long*/ oneItem = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 1, 0); int width = OS.HIWORD (oneItem) - OS.HIWORD (empty), height = width; setCheckboxImageList (width, height, false); OS.SendMessage (handle, OS. LVM_SETCALLBACKMASK, OS.LVIS_STATEIMAGEMASK, 0); @@ -1213,7 +1216,7 @@ void createHandle () { * The control will not destroy a font that it did not * create. */ - int hFont = OS.GetStockObject (OS.SYSTEM_FONT); + int /*long*/ hFont = OS.GetStockObject (OS.SYSTEM_FONT); OS.SendMessage (handle, OS.WM_SETFONT, hFont, 0); /* @@ -1225,8 +1228,8 @@ void createHandle () { */ LVCOLUMN lvColumn = new LVCOLUMN (); lvColumn.mask = OS.LVCF_TEXT | OS.LVCF_WIDTH; - int hHeap = OS.GetProcessHeap (); - int pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, TCHAR.sizeof); + int /*long*/ hHeap = OS.GetProcessHeap (); + int /*long*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, TCHAR.sizeof); lvColumn.pszText = pszText; OS.SendMessage (handle, OS.LVM_INSERTCOLUMN, 0, lvColumn); OS.HeapFree (hHeap, 0, pszText); @@ -1249,7 +1252,7 @@ void createHandle () { */ if (OS.WIN32_VERSION < OS.VERSION (4, 10)) return; if ((style & SWT.RIGHT_TO_LEFT) != 0) { - int hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); + int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); int bits2 = OS.GetWindowLong (hwndHeader, OS.GWL_EXSTYLE); OS.SetWindowLong (hwndHeader, OS.GWL_EXSTYLE, bits2 | OS.WS_EX_LAYOUTRTL); } @@ -1281,7 +1284,7 @@ void createHeaderToolTips () { void createItem (TableColumn column, int index) { if (!(0 <= index && index <= columnCount)) error (SWT.ERROR_INVALID_RANGE); - int oldColumn = OS.SendMessage (handle, OS.LVM_GETSELECTEDCOLUMN, 0, 0); + int oldColumn = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETSELECTEDCOLUMN, 0, 0); if (oldColumn >= index) { OS.SendMessage (handle, OS.LVM_SETSELECTEDCOLUMN, oldColumn + 1, 0); } @@ -1290,7 +1293,7 @@ void createItem (TableColumn column, int index) { System.arraycopy (columns, 0, newColumns, 0, columns.length); columns = newColumns; } - int itemCount = OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + int itemCount = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); for (int i=0; i<itemCount; i++) { TableItem item = items [i]; if (item != null) { @@ -1339,8 +1342,8 @@ void createItem (TableColumn column, int index) { item.cellForeground = temp; } if (item.cellFont != null) { - int [] cellFont = item.cellFont; - int [] temp = new int [columnCount + 1]; + int /*long*/ [] cellFont = item.cellFont; + int /*long*/ [] temp = new int /*long*/ [columnCount + 1]; System.arraycopy (cellFont, 0, temp, 0, index); System.arraycopy (cellFont, index, temp, index + 1, columnCount - index); temp [index] = -1; @@ -1372,9 +1375,9 @@ void createItem (TableColumn column, int index) { OS.SendMessage (handle, OS.LVM_GETCOLUMN, 1, lvColumn); int width = lvColumn.cx; int cchTextMax = 1024; - int hHeap = OS.GetProcessHeap (); + int /*long*/ hHeap = OS.GetProcessHeap (); int byteCount = cchTextMax * TCHAR.sizeof; - int pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); + int /*long*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); lvColumn.mask = OS.LVCF_TEXT | OS.LVCF_IMAGE | OS.LVCF_WIDTH | OS.LVCF_FMT; lvColumn.pszText = pszText; lvColumn.cchTextMax = cchTextMax; @@ -1416,7 +1419,7 @@ void createItem (TableColumn column, int index) { /* Add the tool tip item for the header */ if (headerToolTipHandle != 0) { RECT rect = new RECT (); - int hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); + int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); if (OS.SendMessage (hwndHeader, OS.HDM_GETITEMRECT, index, rect) != 0) { TOOLINFO lpti = new TOOLINFO (); lpti.cbSize = TOOLINFO.sizeof; @@ -1434,7 +1437,7 @@ void createItem (TableColumn column, int index) { } void createItem (TableItem item, int index) { - int count = OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); if (!(0 <= index && index <= count)) error (SWT.ERROR_INVALID_RANGE); if (count == items.length) { /* @@ -1468,7 +1471,7 @@ void createItem (TableItem item, int index) { /* Insert the item */ setDeferResize (true); ignoreSelect = ignoreShrink = true; - int result = OS.SendMessage (handle, OS.LVM_INSERTITEM, 0, lvItem); + int result = (int)/*64*/OS.SendMessage (handle, OS.LVM_INSERTITEM, 0, lvItem); ignoreSelect = ignoreShrink = false; if (result == -1) error (SWT.ERROR_ITEM_NOT_ADDED); System.arraycopy (items, index, items, index + 1, count - index); @@ -1492,7 +1495,7 @@ int defaultBackground () { void deregister () { super.deregister (); - int hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); + int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); if (hwndHeader != 0) display.removeControl (hwndHeader); } @@ -1575,7 +1578,7 @@ public void deselect (int index) { */ public void deselect (int start, int end) { checkWidget (); - int count = OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); if (start == 0 && end == count - 1) { deselectAll (); } else { @@ -1618,7 +1621,7 @@ void destroyItem (TableColumn column) { if (columns [index] == column) break; index++; } - int oldColumn = OS.SendMessage (handle, OS.LVM_GETSELECTEDCOLUMN, 0, 0); + int oldColumn = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETSELECTEDCOLUMN, 0, 0); if (oldColumn == index) { OS.SendMessage (handle, OS.LVM_SETSELECTEDCOLUMN, -1, 0); } else { @@ -1640,9 +1643,9 @@ void destroyItem (TableColumn column) { if (columnCount > 1) { index = 1; int cchTextMax = 1024; - int hHeap = OS.GetProcessHeap (); + int /*long*/ hHeap = OS.GetProcessHeap (); int byteCount = cchTextMax * TCHAR.sizeof; - int pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); + int /*long*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); LVCOLUMN lvColumn = new LVCOLUMN (); lvColumn.mask = OS.LVCF_TEXT | OS.LVCF_IMAGE | OS.LVCF_WIDTH | OS.LVCF_FMT; lvColumn.pszText = pszText; @@ -1653,8 +1656,8 @@ void destroyItem (TableColumn column) { OS.SendMessage (handle, OS.LVM_SETCOLUMN, 0, lvColumn); if (pszText != 0) OS.HeapFree (hHeap, 0, pszText); } else { - int hHeap = OS.GetProcessHeap (); - int pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, TCHAR.sizeof); + int /*long*/ hHeap = OS.GetProcessHeap (); + int /*long*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, TCHAR.sizeof); LVCOLUMN lvColumn = new LVCOLUMN (); lvColumn.mask = OS.LVCF_TEXT | OS.LVCF_IMAGE | OS.LVCF_WIDTH | OS.LVCF_FMT; lvColumn.pszText = pszText; @@ -1666,7 +1669,7 @@ void destroyItem (TableColumn column) { HDITEM hdItem = new HDITEM (); hdItem.mask = OS.HDI_FORMAT; hdItem.fmt = OS.HDF_LEFT; - int hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); + int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); OS.SendMessage (hwndHeader, OS.HDM_SETITEM, index, hdItem); } } @@ -1675,7 +1678,7 @@ void destroyItem (TableColumn column) { lvItem.mask = OS.LVIF_TEXT | OS.LVIF_IMAGE; lvItem.pszText = OS.LPSTR_TEXTCALLBACK; lvItem.iImage = OS.I_IMAGECALLBACK; - int itemCount = OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + int itemCount = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); for (int i=0; i<itemCount; i++) { lvItem.iItem = i; OS.SendMessage (handle, OS.LVM_SETITEM, 0, lvItem); @@ -1690,7 +1693,7 @@ void destroyItem (TableColumn column) { if (first) index = 0; System.arraycopy (columns, index + 1, columns, index, --columnCount - index); columns [columnCount] = null; - int itemCount = OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + int itemCount = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); for (int i=0; i<itemCount; i++) { TableItem item = items [i]; if (item != null) { @@ -1738,8 +1741,8 @@ void destroyItem (TableColumn column) { item.cellForeground = temp; } if (item.cellFont != null) { - int [] cellFont = item.cellFont; - int [] temp = new int [columnCount]; + int /*long*/ [] cellFont = item.cellFont; + int /*long*/ [] temp = new int /*long*/ [columnCount]; System.arraycopy (cellFont, 0, temp, 0, index); System.arraycopy (cellFont, index + 1, temp, index, columnCount - index); item.cellFont = temp; @@ -1809,7 +1812,7 @@ void destroyItem (TableColumn column) { } void destroyItem (TableItem item) { - int count = OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); int index = 0; while (index < count) { if (items [index] == item) break; @@ -1818,7 +1821,7 @@ void destroyItem (TableItem item) { if (index == count) return; setDeferResize (true); ignoreSelect = ignoreShrink = true; - int code = OS.SendMessage (handle, OS.LVM_DELETEITEM, index, 0); + int /*long*/ code = OS.SendMessage (handle, OS.LVM_DELETEITEM, index, 0); ignoreSelect = ignoreShrink = false; if (code == 0) error (SWT.ERROR_ITEM_NOT_REMOVED); System.arraycopy (items, index + 1, items, index, --count - index); @@ -1835,11 +1838,11 @@ void fixCheckboxImageList (boolean fixScroll) { * the state image list to be the same size as the image list. */ if ((style & SWT.CHECK) == 0) return; - int hImageList = OS.SendMessage (handle, OS.LVM_GETIMAGELIST, OS.LVSIL_SMALL, 0); + int /*long*/ hImageList = OS.SendMessage (handle, OS.LVM_GETIMAGELIST, OS.LVSIL_SMALL, 0); if (hImageList == 0) return; int [] cx = new int [1], cy = new int [1]; OS.ImageList_GetIconSize (hImageList, cx, cy); - int hStateList = OS.SendMessage (handle, OS.LVM_GETIMAGELIST, OS.LVSIL_STATE, 0); + int /*long*/ hStateList = OS.SendMessage (handle, OS.LVM_GETIMAGELIST, OS.LVSIL_STATE, 0); if (hStateList == 0) return; int [] stateCx = new int [1], stateCy = new int [1]; OS.ImageList_GetIconSize (hStateList, stateCx, stateCy); @@ -1849,7 +1852,7 @@ void fixCheckboxImageList (boolean fixScroll) { void fixCheckboxImageListColor (boolean fixScroll) { if ((style & SWT.CHECK) == 0) return; - int hStateList = OS.SendMessage (handle, OS.LVM_GETIMAGELIST, OS.LVSIL_STATE, 0); + int /*long*/ hStateList = OS.SendMessage (handle, OS.LVM_GETIMAGELIST, OS.LVSIL_STATE, 0); if (hStateList == 0) return; int [] cx = new int [1], cy = new int [1]; OS.ImageList_GetIconSize (hStateList, cx, cy); @@ -1870,7 +1873,7 @@ void fixItemHeight (boolean fixScroll) { */ if (itemHeight != -1) return; if (OS.COMCTL32_VERSION >= OS.VERSION (5, 80)) return; - int bits = OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); + int bits = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); if ((bits & OS.LVS_EX_GRIDLINES) == 0) return; bits = OS.GetWindowLong (handle, OS.GWL_STYLE); if ((bits & OS.LVS_NOCOLUMNHEADER) != 0) return; @@ -1888,18 +1891,18 @@ void fixItemHeight (boolean fixScroll) { setRedraw (false); setTopIndex (0); } - int hOldList = OS.SendMessage (handle, OS.LVM_GETIMAGELIST, OS.LVSIL_SMALL, 0); + int /*long*/ hOldList = OS.SendMessage (handle, OS.LVM_GETIMAGELIST, OS.LVSIL_SMALL, 0); if (hOldList != 0) return; - int hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); + int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); RECT rect = new RECT (); OS.GetWindowRect (hwndHeader, rect); int height = rect.bottom - rect.top - 1; - int hImageList = OS.ImageList_Create (1, height, 0, 0, 0); + int /*long*/ hImageList = OS.ImageList_Create (1, height, 0, 0, 0); OS.SendMessage (handle, OS.LVM_SETIMAGELIST, OS.LVSIL_SMALL, hImageList); fixCheckboxImageList (false); OS.SendMessage (handle, OS.LVM_SETIMAGELIST, OS.LVSIL_SMALL, 0); if (headerImageList != null) { - int hHeaderImageList = headerImageList.getHandle (); + int /*long*/ hHeaderImageList = headerImageList.getHandle (); OS.SendMessage (hwndHeader, OS.HDM_SETIMAGELIST, 0, hHeaderImageList); } OS.ImageList_Destroy (hImageList); @@ -2033,7 +2036,7 @@ public TableColumn [] getColumns () { int getFocusIndex () { // checkWidget (); - return OS.SendMessage (handle, OS.LVM_GETNEXTITEM, -1, OS.LVNI_FOCUSED); + return (int)/*64*/OS.SendMessage (handle, OS.LVM_GETNEXTITEM, -1, OS.LVNI_FOCUSED); } /** @@ -2065,7 +2068,7 @@ public int getGridLineWidth () { */ public int getHeaderHeight () { checkWidget (); - int hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); + int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); if (hwndHeader == 0) return 0; RECT rect = new RECT (); OS.GetWindowRect (hwndHeader, rect); @@ -2112,7 +2115,7 @@ public boolean getHeaderVisible () { */ public TableItem getItem (int index) { checkWidget (); - int count = OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); if (!(0 <= index && index < count)) error (SWT.ERROR_INVALID_RANGE); return _getItem (index); } @@ -2158,7 +2161,7 @@ public TableItem getItem (Point point) { if (pinfo.iItem == 0) { int bits = OS.GetWindowLong (handle, OS.GWL_STYLE); if ((bits & OS.LVS_NOCOLUMNHEADER) == 0) { - int hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); + int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); if (hwndHeader != 0) { RECT rect = new RECT (); OS.GetWindowRect (hwndHeader, rect); @@ -2187,7 +2190,7 @@ public TableItem getItem (Point point) { */ public int getItemCount () { checkWidget (); - return OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + return (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); } /** @@ -2203,8 +2206,8 @@ public int getItemCount () { */ public int getItemHeight () { checkWidget (); - int empty = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 0, 0); - int oneItem = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 1, 0); + int /*long*/ empty = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 0, 0); + int /*long*/ oneItem = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 1, 0); return OS.HIWORD (oneItem) - OS.HIWORD (empty); } @@ -2226,7 +2229,7 @@ public int getItemHeight () { */ public TableItem [] getItems () { checkWidget (); - int count = OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); TableItem [] result = new TableItem [count]; if ((style & SWT.VIRTUAL) != 0) { for (int i=0; i<count; i++) { @@ -2257,7 +2260,7 @@ public TableItem [] getItems () { */ public boolean getLinesVisible () { checkWidget (); - int bits = OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); + int bits = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); return (bits & OS.LVS_EX_GRIDLINES) != 0; } @@ -2279,9 +2282,9 @@ public boolean getLinesVisible () { */ public TableItem [] getSelection () { checkWidget (); - int i = -1, j = 0, count = OS.SendMessage (handle, OS.LVM_GETSELECTEDCOUNT, 0, 0); + int i = -1, j = 0, count = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETSELECTEDCOUNT, 0, 0); TableItem [] result = new TableItem [count]; - while ((i = OS.SendMessage (handle, OS.LVM_GETNEXTITEM, i, OS.LVNI_SELECTED)) != -1) { + while ((i = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETNEXTITEM, i, OS.LVNI_SELECTED)) != -1) { result [j++] = _getItem (i); } return result; @@ -2299,7 +2302,7 @@ public TableItem [] getSelection () { */ public int getSelectionCount () { checkWidget (); - return OS.SendMessage (handle, OS.LVM_GETSELECTEDCOUNT, 0, 0); + return (int)/*64*/OS.SendMessage (handle, OS.LVM_GETSELECTEDCOUNT, 0, 0); } /** @@ -2315,11 +2318,11 @@ public int getSelectionCount () { */ public int getSelectionIndex () { checkWidget (); - int focusIndex = OS.SendMessage (handle, OS.LVM_GETNEXTITEM, -1, OS.LVNI_FOCUSED); - int selectedIndex = OS.SendMessage (handle, OS.LVM_GETNEXTITEM, -1, OS.LVNI_SELECTED); + int focusIndex = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETNEXTITEM, -1, OS.LVNI_FOCUSED); + int selectedIndex = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETNEXTITEM, -1, OS.LVNI_SELECTED); if (focusIndex == selectedIndex) return selectedIndex; int i = -1; - while ((i = OS.SendMessage (handle, OS.LVM_GETNEXTITEM, i, OS.LVNI_SELECTED)) != -1) { + while ((i = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETNEXTITEM, i, OS.LVNI_SELECTED)) != -1) { if (i == focusIndex) return i; } return selectedIndex; @@ -2343,9 +2346,9 @@ public int getSelectionIndex () { */ public int [] getSelectionIndices () { checkWidget (); - int i = -1, j = 0, count = OS.SendMessage (handle, OS.LVM_GETSELECTEDCOUNT, 0, 0); + int i = -1, j = 0, count = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETSELECTEDCOUNT, 0, 0); int [] result = new int [count]; - while ((i = OS.SendMessage (handle, OS.LVM_GETNEXTITEM, i, OS.LVNI_SELECTED)) != -1) { + while ((i = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETNEXTITEM, i, OS.LVNI_SELECTED)) != -1) { result [j++] = i; } return result; @@ -2430,12 +2433,12 @@ public int getTopIndex () { * is displaying blank lines at the top of the controls. The * fix is to check for a negative number and return zero instead. */ - return Math.max (0, OS.SendMessage (handle, OS.LVM_GETTOPINDEX, 0, 0)); + return Math.max (0, (int)/*64*/OS.SendMessage (handle, OS.LVM_GETTOPINDEX, 0, 0)); } boolean hasChildren () { - int hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); - int hwndChild = OS.GetWindow (handle, OS.GW_CHILD); + int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); + int /*long*/ hwndChild = OS.GetWindow (handle, OS.GW_CHILD); while (hwndChild != 0) { if (hwndChild != hwndHeader) return true; hwndChild = OS.GetWindow (hwndChild, OS.GW_HWNDNEXT); @@ -2455,7 +2458,7 @@ int imageIndex (Image image, int column) { imageList = display.getImageList (style & SWT.RIGHT_TO_LEFT, bounds.width, bounds.height); int index = imageList.indexOf (image); if (index == -1) index = imageList.add (image); - int hImageList = imageList.getHandle (); + int /*long*/ hImageList = imageList.getHandle (); /* * Bug in Windows. Making any change to an item that * changes the item height of a table while the table @@ -2472,8 +2475,8 @@ int imageIndex (Image image, int column) { } OS.SendMessage (handle, OS.LVM_SETIMAGELIST, OS.LVSIL_SMALL, hImageList); if (headerImageList != null) { - int hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); - int hHeaderImageList = headerImageList.getHandle (); + int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); + int /*long*/ hHeaderImageList = headerImageList.getHandle (); OS.SendMessage (hwndHeader, OS.HDM_SETIMAGELIST, 0, hHeaderImageList); } fixCheckboxImageList (false); @@ -2496,8 +2499,8 @@ int imageIndexHeader (Image image) { headerImageList = display.getImageList (style & SWT.RIGHT_TO_LEFT, bounds.width, bounds.height); int index = headerImageList.indexOf (image); if (index == -1) index = headerImageList.add (image); - int hImageList = headerImageList.getHandle (); - int hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); + int /*long*/ hImageList = headerImageList.getHandle (); + int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); OS.SendMessage (hwndHeader, OS.HDM_SETIMAGELIST, 0, hImageList); return index; } @@ -2552,7 +2555,7 @@ public int indexOf (TableColumn column) { public int indexOf (TableItem item) { checkWidget (); if (item == null) error (SWT.ERROR_NULL_ARGUMENT); - int count = OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); if (1 <= lastIndexOf && lastIndexOf < count - 1) { if (items [lastIndexOf] == item) return lastIndexOf; if (items [lastIndexOf + 1] == item) return ++lastIndexOf; @@ -2589,19 +2592,19 @@ public boolean isSelected (int index) { lvItem.mask = OS.LVIF_STATE; lvItem.stateMask = OS.LVIS_SELECTED; lvItem.iItem = index; - int result = OS.SendMessage (handle, OS.LVM_GETITEM, 0, lvItem); + int /*long*/ result = OS.SendMessage (handle, OS.LVM_GETITEM, 0, lvItem); return (result != 0) && ((lvItem.state & OS.LVIS_SELECTED) != 0); } void register () { super.register (); - int hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); + int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); if (hwndHeader != 0) display.addControl (hwndHeader, this); } void releaseChildren (boolean destroy) { if (items != null) { - int itemCount = OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + int itemCount = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); /* * Feature in Windows 98. When there are a large number * of columns and items in a table (>1000) where each @@ -2654,12 +2657,12 @@ void releaseWidget () { display.releaseImageList (imageList); } if (headerImageList != null) { - int hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); + int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); OS.SendMessage (hwndHeader, OS.HDM_SETIMAGELIST, 0, 0); display.releaseImageList (headerImageList); } imageList = headerImageList = null; - int hStateList = OS.SendMessage (handle, OS.LVM_GETIMAGELIST, OS.LVSIL_STATE, 0); + int /*long*/ hStateList = OS.SendMessage (handle, OS.LVM_GETIMAGELIST, OS.LVSIL_STATE, 0); OS.SendMessage (handle, OS.LVM_SETIMAGELIST, OS.LVSIL_STATE, 0); if (hStateList != 0) OS.ImageList_Destroy (hStateList); if (headerToolTipHandle != 0) OS.DestroyWindow (headerToolTipHandle); @@ -2689,7 +2692,7 @@ public void remove (int [] indices) { System.arraycopy (indices, 0, newIndices, 0, indices.length); sort (newIndices); int start = newIndices [newIndices.length - 1], end = newIndices [0]; - int count = OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); if (!(0 <= start && start <= end && end < count)) { error (SWT.ERROR_INVALID_RANGE); } @@ -2701,7 +2704,7 @@ public void remove (int [] indices) { TableItem item = items [index]; if (item != null && !item.isDisposed ()) item.release (false); ignoreSelect = ignoreShrink = true; - int code = OS.SendMessage (handle, OS.LVM_DELETEITEM, index, 0); + int /*long*/ code = OS.SendMessage (handle, OS.LVM_DELETEITEM, index, 0); ignoreSelect = ignoreShrink = false; if (code == 0) error (SWT.ERROR_ITEM_NOT_REMOVED); System.arraycopy (items, index + 1, items, index, --count - index); @@ -2729,13 +2732,13 @@ public void remove (int [] indices) { */ public void remove (int index) { checkWidget (); - int count = OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); if (!(0 <= index && index < count)) error (SWT.ERROR_INVALID_RANGE); TableItem item = items [index]; if (item != null && !item.isDisposed ()) item.release (false); setDeferResize (true); ignoreSelect = ignoreShrink = true; - int code = OS.SendMessage (handle, OS.LVM_DELETEITEM, index, 0); + int /*long*/ code = OS.SendMessage (handle, OS.LVM_DELETEITEM, index, 0); ignoreSelect = ignoreShrink = false; if (code == 0) error (SWT.ERROR_ITEM_NOT_REMOVED); System.arraycopy (items, index + 1, items, index, --count - index); @@ -2763,7 +2766,7 @@ public void remove (int index) { public void remove (int start, int end) { checkWidget (); if (start > end) return; - int count = OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); if (!(0 <= start && start <= end && end < count)) { error (SWT.ERROR_INVALID_RANGE); } @@ -2776,7 +2779,7 @@ public void remove (int start, int end) { TableItem item = items [index]; if (item != null && !item.isDisposed ()) item.release (false); ignoreSelect = ignoreShrink = true; - int code = OS.SendMessage (handle, OS.LVM_DELETEITEM, start, 0); + int /*long*/ code = OS.SendMessage (handle, OS.LVM_DELETEITEM, start, 0); ignoreSelect = ignoreShrink = false; if (code == 0) break; index++; @@ -2804,7 +2807,7 @@ public void remove (int start, int end) { */ public void removeAll () { checkWidget (); - int itemCount = OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + int itemCount = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); for (int i=0; i<itemCount; i++) { TableItem item = items [i]; if (item != null && !item.isDisposed ()) item.release (false); @@ -2830,7 +2833,7 @@ public void removeAll () { int index = itemCount - 1; while (index >= 0) { ignoreSelect = ignoreShrink = true; - int code = OS.SendMessage (handle, OS.LVM_DELETEITEM, index, 0); + int /*long*/ code = OS.SendMessage (handle, OS.LVM_DELETEITEM, index, 0); ignoreSelect = ignoreShrink = false; if (code == 0) break; --index; @@ -2849,7 +2852,7 @@ public void removeAll () { if (index != -1) error (SWT.ERROR_ITEM_NOT_REMOVED); } else { ignoreSelect = ignoreShrink = true; - int code = OS.SendMessage (handle, OS.LVM_DELETEALLITEMS, 0, 0); + int /*long*/ code = OS.SendMessage (handle, OS.LVM_DELETEALLITEMS, 0, 0); ignoreSelect = ignoreShrink = false; if (code == 0) error (SWT.ERROR_ITEM_NOT_REMOVED); } @@ -2979,7 +2982,7 @@ public void select (int index) { public void select (int start, int end) { checkWidget (); if (end < 0 || start > end || ((style & SWT.SINGLE) != 0 && start != end)) return; - int count = OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); if (count == 0 || start >= count) return; start = Math.max (0, start); end = Math.min (end, count - 1); @@ -3024,9 +3027,9 @@ public void selectAll () { ignoreSelect = false; } -void sendEraseItemEvent (TableItem item, NMLVCUSTOMDRAW nmcd, int lParam) { - int hDC = nmcd.hdc; - int hFont = item.cellFont != null ? item.cellFont [nmcd.iSubItem] : -1; +void sendEraseItemEvent (TableItem item, NMLVCUSTOMDRAW nmcd, int /*long*/ lParam) { + int /*long*/ hDC = nmcd.hdc; + int /*long*/ hFont = item.cellFont != null ? item.cellFont [nmcd.iSubItem] : -1; if (hFont == -1) hFont = item.font; int clrText = item.cellForeground != null ? item.cellForeground [nmcd.iSubItem] : -1; if (clrText == -1) clrText = item.foreground; @@ -3050,8 +3053,8 @@ void sendEraseItemEvent (TableItem item, NMLVCUSTOMDRAW nmcd, int lParam) { LVITEM lvItem = new LVITEM (); lvItem.mask = OS.LVIF_STATE; lvItem.stateMask = OS.LVIS_SELECTED; - lvItem.iItem = nmcd.dwItemSpec; - int result = OS.SendMessage (handle, OS.LVM_GETITEM, 0, lvItem); + lvItem.iItem = (int)/*64*/nmcd.dwItemSpec; + int /*long*/ result = OS.SendMessage (handle, OS.LVM_GETITEM, 0, lvItem); boolean selected = (result != 0 && (lvItem.state & OS.LVIS_SELECTED) != 0); GCData data = new GCData (); data.device = display; @@ -3097,10 +3100,10 @@ void sendEraseItemEvent (TableItem item, NMLVCUSTOMDRAW nmcd, int lParam) { if (selected) clrSelectionBk = data.background; } data.hFont = hFont; - data.uiState = OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); + data.uiState = (int)/*64*/OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); int nSavedDC = OS.SaveDC (hDC); GC gc = GC.win32_new (hDC, data); - RECT cellRect = item.getBounds (nmcd.dwItemSpec, nmcd.iSubItem, true, true, true, true, hDC); + RECT cellRect = item.getBounds ((int)/*64*/nmcd.dwItemSpec, nmcd.iSubItem, true, true, true, true, hDC); Event event = new Event (); event.item = item; event.gc = gc; @@ -3110,7 +3113,7 @@ void sendEraseItemEvent (TableItem item, NMLVCUSTOMDRAW nmcd, int lParam) { if (OS.SendMessage (handle, OS.LVM_GETNEXTITEM, -1, OS.LVNI_FOCUSED) == nmcd.dwItemSpec) { if (nmcd.iSubItem == 0 || (style & SWT.FULL_SELECTION) != 0) { if (handle == OS.GetFocus ()) { - int uiState = OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); + int uiState = (int)/*64*/OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); if ((uiState & OS.UISF_HIDEFOCUS) == 0) event.detail |= SWT.FOCUSED; } } @@ -3157,11 +3160,11 @@ void sendEraseItemEvent (TableItem item, NMLVCUSTOMDRAW nmcd, int lParam) { nmcd.uItemState &= ~OS.CDIS_FOCUS; OS.MoveMemory (lParam, nmcd, NMLVCUSTOMDRAW.sizeof); } - int hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); + int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); boolean firstColumn = nmcd.iSubItem == OS.SendMessage (hwndHeader, OS.HDM_ORDERTOINDEX, 0, 0); if (ignoreDrawForeground && ignoreDrawHot) { if (!ignoreDrawBackground && drawBackground) { - RECT backgroundRect = item.getBounds (nmcd.dwItemSpec, nmcd.iSubItem, true, false, true, false, hDC); + RECT backgroundRect = item.getBounds ((int)/*64*/nmcd.dwItemSpec, nmcd.iSubItem, true, false, true, false, hDC); fillBackground (hDC, clrTextBk, backgroundRect); } } @@ -3173,8 +3176,8 @@ void sendEraseItemEvent (TableItem item, NMLVCUSTOMDRAW nmcd, int lParam) { RECT rect = new RECT (); OS.SetRect (rect, nmcd.left, nmcd.top, nmcd.right, nmcd.bottom); if ((style & SWT.FULL_SELECTION) != 0) { - int count = OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); - int index = OS.SendMessage (hwndHeader, OS.HDM_ORDERTOINDEX, count - 1, 0); + int count = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); + int index = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_ORDERTOINDEX, count - 1, 0); RECT headerRect = new RECT (); OS.SendMessage (hwndHeader, OS.HDM_GETITEMRECT, index, headerRect); OS.MapWindowPoints (hwndHeader, handle, headerRect, 2); @@ -3186,27 +3189,27 @@ void sendEraseItemEvent (TableItem item, NMLVCUSTOMDRAW nmcd, int lParam) { rect.right += EXPLORER_EXTRA; pClipRect.right += EXPLORER_EXTRA; } - int hTheme = OS.OpenThemeData (handle, Display.LISTVIEW); + int /*long*/ hTheme = OS.OpenThemeData (handle, Display.LISTVIEW); int iStateId = selected ? OS.LISS_SELECTED : OS.LISS_HOT; if (OS.GetFocus () != handle && selected && !hot) iStateId = OS.LISS_SELECTEDNOTFOCUS; OS.DrawThemeBackground (hTheme, hDC, OS.LVP_LISTITEM, iStateId, rect, pClipRect); OS.CloseThemeData (hTheme); } else { boolean fullText = ((style & SWT.FULL_SELECTION) != 0 || !firstColumn); - RECT textRect = item.getBounds (nmcd.dwItemSpec, nmcd.iSubItem, true, false, fullText, false, hDC); + RECT textRect = item.getBounds ((int)/*64*/nmcd.dwItemSpec, nmcd.iSubItem, true, false, fullText, false, hDC); fillBackground (hDC, clrSelectionBk, textRect); } } if (ignoreDrawForeground) { - RECT clipRect = item.getBounds (nmcd.dwItemSpec, nmcd.iSubItem, true, true, true, false, hDC); + RECT clipRect = item.getBounds ((int)/*64*/nmcd.dwItemSpec, nmcd.iSubItem, true, true, true, false, hDC); OS.SaveDC (hDC); OS.SelectClipRgn (hDC, 0); OS.ExcludeClipRect (hDC, clipRect.left, clipRect.top, clipRect.right, clipRect.bottom); } } -Event sendMeasureItemEvent (TableItem item, int row, int column, int hDC) { - int hFont = item.cellFont != null ? item.cellFont [column] : -1; +Event sendMeasureItemEvent (TableItem item, int row, int column, int /*long*/ hDC) { + int /*long*/ hFont = item.cellFont != null ? item.cellFont [column] : -1; if (hFont == -1) hFont = item.font; GCData data = new GCData (); data.device = display; @@ -3228,7 +3231,7 @@ Event sendMeasureItemEvent (TableItem item, int row, int column, int hDC) { OS.RestoreDC (hDC, nSavedDC); if (!isDisposed () && !item.isDisposed ()) { if (columnCount == 0) { - int width = OS.SendMessage (handle, OS.LVM_GETCOLUMNWIDTH, 0, 0); + int width = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETCOLUMNWIDTH, 0, 0); if (event.x + event.width > width) { OS.SendMessage (handle, OS.LVM_SETCOLUMNWIDTH, 0, event.x + event.width); } @@ -3238,7 +3241,7 @@ Event sendMeasureItemEvent (TableItem item, int row, int column, int hDC) { return event; } -LRESULT sendMouseDownEvent (int type, int button, int msg, int wParam, int lParam) { +LRESULT sendMouseDownEvent (int type, int button, int msg, int /*long*/ wParam, int /*long*/ lParam) { /* * Feature in Windows. Inside WM_LBUTTONDOWN and WM_RBUTTONDOWN, * the widget starts a modal loop to determine if the user wants @@ -3300,7 +3303,7 @@ LRESULT sendMouseDownEvent (int type, int button, int msg, int wParam, int lPara * it as selected. */ boolean forceSelect = false; - int count = OS.SendMessage (handle, OS.LVM_GETSELECTEDCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETSELECTEDCOUNT, 0, 0); if (count == 1 && pinfo.iItem != -1) { LVITEM lvItem = new LVITEM (); lvItem.mask = OS.LVIF_STATE; @@ -3325,7 +3328,7 @@ LRESULT sendMouseDownEvent (int type, int button, int msg, int wParam, int lPara dragDetect = pinfo.iItem == -1 || (pinfo.flags & flags) == 0; } if (!dragDetect) display.runDragDrop = false; - int code = callWindowProc (handle, msg, wParam, lParam, forceSelect); + int /*long*/ code = callWindowProc (handle, msg, wParam, lParam, forceSelect); if (!dragDetect) display.runDragDrop = true; if (dragStarted || !dragDetect) { if (!display.captureChanged && !isDisposed ()) { @@ -3346,10 +3349,10 @@ LRESULT sendMouseDownEvent (int type, int button, int msg, int wParam, int lPara } void sendPaintItemEvent (TableItem item, NMLVCUSTOMDRAW nmcd) { - int hDC = nmcd.hdc; + int /*long*/ hDC = nmcd.hdc; GCData data = new GCData (); data.device = display; - int hFont = item.cellFont != null ? item.cellFont [nmcd.iSubItem] : -1; + int /*long*/ hFont = item.cellFont != null ? item.cellFont [nmcd.iSubItem] : -1; if (hFont == -1) hFont = item.font; data.hFont = hFont; /* @@ -3360,8 +3363,8 @@ void sendPaintItemEvent (TableItem item, NMLVCUSTOMDRAW nmcd) { LVITEM lvItem = new LVITEM (); lvItem.mask = OS.LVIF_STATE; lvItem.stateMask = OS.LVIS_SELECTED; - lvItem.iItem = nmcd.dwItemSpec; - int result = OS.SendMessage (handle, OS.LVM_GETITEM, 0, lvItem); + lvItem.iItem = (int)/*64*/nmcd.dwItemSpec; + int /*long*/ result = OS.SendMessage (handle, OS.LVM_GETITEM, 0, lvItem); boolean selected = result != 0 && (lvItem.state & OS.LVIS_SELECTED) != 0; boolean drawSelected = false, drawBackground = false, drawHot = false; if (nmcd.iSubItem == 0 || (style & SWT.FULL_SELECTION) != 0) { @@ -3412,10 +3415,10 @@ void sendPaintItemEvent (TableItem item, NMLVCUSTOMDRAW nmcd) { data.foreground = OS.GetSysColor (OS.COLOR_GRAYTEXT); data.background = OS.GetSysColor (OS.COLOR_3DFACE); } - data.uiState = OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); + data.uiState = (int)/*64*/OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); int nSavedDC = OS.SaveDC (hDC); GC gc = GC.win32_new (hDC, data); - RECT itemRect = item.getBounds (nmcd.dwItemSpec, nmcd.iSubItem, true, true, false, false, hDC); + RECT itemRect = item.getBounds ((int)/*64*/nmcd.dwItemSpec, nmcd.iSubItem, true, true, false, false, hDC); Event event = new Event (); event.item = item; event.gc = gc; @@ -3425,7 +3428,7 @@ void sendPaintItemEvent (TableItem item, NMLVCUSTOMDRAW nmcd) { if (OS.SendMessage (handle, OS.LVM_GETNEXTITEM, -1, OS.LVNI_FOCUSED) == nmcd.dwItemSpec) { if (nmcd.iSubItem == 0 || (style & SWT.FULL_SELECTION) != 0) { if (handle == OS.GetFocus ()) { - int uiState = OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); + int uiState = (int)/*64*/OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); if ((uiState & OS.UISF_HIDEFOCUS) == 0) event.detail |= SWT.FOCUSED; } } @@ -3437,7 +3440,7 @@ void sendPaintItemEvent (TableItem item, NMLVCUSTOMDRAW nmcd) { event.y = itemRect.top; event.width = itemRect.right - itemRect.left; event.height = itemRect.bottom - itemRect.top; - RECT cellRect = item.getBounds (nmcd.dwItemSpec, nmcd.iSubItem, true, true, true, true, hDC); + RECT cellRect = item.getBounds ((int)/*64*/nmcd.dwItemSpec, nmcd.iSubItem, true, true, true, true, hDC); int cellWidth = cellRect.right - cellRect.left; int cellHeight = cellRect.bottom - cellRect.top; gc.setClipping (cellRect.left, cellRect.top, cellWidth, cellHeight); @@ -3447,7 +3450,7 @@ void sendPaintItemEvent (TableItem item, NMLVCUSTOMDRAW nmcd) { OS.RestoreDC (hDC, nSavedDC); } -void setBackgroundImage (int hBitmap) { +void setBackgroundImage (int /*long*/ hBitmap) { super.setBackgroundImage (hBitmap); if (!customDraw) setBackgroundTransparent (hBitmap != 0); } @@ -3456,7 +3459,7 @@ void setBackgroundPixel (int newPixel) { if (!customDraw) { if (findImageControl () != null) return; if (newPixel == -1) newPixel = defaultBackground (); - int oldPixel = OS.SendMessage (handle, OS.LVM_GETBKCOLOR, 0, 0); + int oldPixel = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETBKCOLOR, 0, 0); if (oldPixel != newPixel) { OS.SendMessage (handle, OS.LVM_SETBKCOLOR, 0, newPixel); OS.SendMessage (handle, OS.LVM_SETTEXTBKCOLOR, 0, newPixel); @@ -3486,7 +3489,7 @@ void setBackgroundTransparent (boolean transparent) { * other custom drawing. The fix is to clear the selected * column. */ - int oldPixel = OS.SendMessage (handle, OS.LVM_GETBKCOLOR, 0, 0); + int oldPixel = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETBKCOLOR, 0, 0); if (transparent) { if (oldPixel != OS.CLR_NONE) { /* @@ -3600,7 +3603,7 @@ void setBounds (int x, int y, int width, int height, int flags, boolean defer) { public void setColumnOrder (int [] order) { checkWidget (); if (order == null) error (SWT.ERROR_NULL_ARGUMENT); - int hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); + int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); if (columnCount == 0) { if (order.length != 0) error (SWT.ERROR_INVALID_ARGUMENT); return; @@ -3670,7 +3673,7 @@ void setDeferResize (boolean defer) { if (--drawCount == 0 /*&& OS.IsWindowVisible (handle)*/) { OS.DefWindowProc (handle, OS.WM_SETREDRAW, 1, 0); if (OS.IsWinCE) { - int hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); + int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); if (hwndHeader != 0) OS.InvalidateRect (hwndHeader, null, true); OS.InvalidateRect (handle, null, true); } else { @@ -3700,7 +3703,7 @@ void setCheckboxImageList (int width, int height, boolean fixScroll) { if (OS.IsWinCE) { flags |= OS.ILC_COLOR; } else { - int hDC = OS.GetDC (handle); + int /*long*/ hDC = OS.GetDC (handle); int bits = OS.GetDeviceCaps (hDC, OS.BITSPIXEL); int planes = OS.GetDeviceCaps (hDC, OS.PLANES); OS.ReleaseDC (handle, hDC); @@ -3716,11 +3719,11 @@ void setCheckboxImageList (int width, int height, boolean fixScroll) { } if ((style & SWT.RIGHT_TO_LEFT) != 0) flags |= OS.ILC_MIRROR; if (OS.COMCTL32_MAJOR < 6 || !OS.IsAppThemed ()) flags |= OS.ILC_MASK; - int hStateList = OS.ImageList_Create (width, height, flags, count, count); - int hDC = OS.GetDC (handle); - int memDC = OS.CreateCompatibleDC (hDC); - int hBitmap = OS.CreateCompatibleBitmap (hDC, width * count, height); - int hOldBitmap = OS.SelectObject (memDC, hBitmap); + int /*long*/ hStateList = OS.ImageList_Create (width, height, flags, count, count); + int /*long*/ hDC = OS.GetDC (handle); + int /*long*/ memDC = OS.CreateCompatibleDC (hDC); + int /*long*/ hBitmap = OS.CreateCompatibleBitmap (hDC, width * count, height); + int /*long*/ hOldBitmap = OS.SelectObject (memDC, hBitmap); RECT rect = new RECT (); OS.SetRect (rect, 0, 0, width * count, height); int clrBackground; @@ -3734,10 +3737,10 @@ void setCheckboxImageList (int width, int height, boolean fixScroll) { clrBackground = 0x0200FF00; } } - int hBrush = OS.CreateSolidBrush (clrBackground); + int /*long*/ hBrush = OS.CreateSolidBrush (clrBackground); OS.FillRect (memDC, rect, hBrush); OS.DeleteObject (hBrush); - int oldFont = OS.SelectObject (hDC, defaultFont ()); + int /*long*/ oldFont = OS.SelectObject (hDC, defaultFont ()); TEXTMETRIC tm = OS.IsUnicode ? (TEXTMETRIC) new TEXTMETRICW () : new TEXTMETRICA (); OS.GetTextMetrics (hDC, tm); OS.SelectObject (hDC, oldFont); @@ -3746,7 +3749,7 @@ void setCheckboxImageList (int width, int height, boolean fixScroll) { int left = (width - itemWidth) / 2, top = (height - itemHeight) / 2 + 1; OS.SetRect (rect, left, top, left + itemWidth, top + itemHeight); if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) { - int hTheme = display.hButtonTheme (); + int /*long*/ hTheme = display.hButtonTheme (); OS.DrawThemeBackground (hTheme, memDC, OS.BP_CHECKBOX, OS.CBS_UNCHECKEDNORMAL, rect, null); rect.left += width; rect.right += width; OS.DrawThemeBackground (hTheme, memDC, OS.BP_CHECKBOX, OS.CBS_CHECKEDNORMAL, rect, null); @@ -3786,7 +3789,7 @@ void setCheckboxImageList (int width, int height, boolean fixScroll) { setRedraw (false); setTopIndex (0); } - int hOldStateList = OS.SendMessage (handle, OS.LVM_GETIMAGELIST, OS.LVSIL_STATE, 0); + int /*long*/ hOldStateList = OS.SendMessage (handle, OS.LVM_GETIMAGELIST, OS.LVSIL_STATE, 0); OS.SendMessage (handle, OS.LVM_SETIMAGELIST, OS.LVSIL_STATE, hStateList); if (hOldStateList != 0) OS.ImageList_Destroy (hOldStateList); /* @@ -3796,7 +3799,7 @@ void setCheckboxImageList (int width, int height, boolean fixScroll) { * LVSIL_SMALL image list. */ if (!OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (6, 0)) { - int hImageList = OS.SendMessage (handle, OS.LVM_GETIMAGELIST, OS.LVSIL_SMALL, 0); + int /*long*/ hImageList = OS.SendMessage (handle, OS.LVM_GETIMAGELIST, OS.LVSIL_SMALL, 0); OS.SendMessage (handle, OS.LVM_SETIMAGELIST, OS.LVSIL_SMALL, hImageList); } if (fixScroll && topIndex != 0) { @@ -3857,7 +3860,7 @@ public void setFont (Font font) { * to be redrawn but not the column headers. The fix is * to force a redraw of the column headers. */ - int hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); + int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); OS.InvalidateRect (hwndHeader, null, true); } @@ -3923,7 +3926,7 @@ public void setHeaderVisible (boolean show) { setTopIndex (0); } if (show) { - int bits = OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); + int bits = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); if ((bits & OS.LVS_EX_GRIDLINES) != 0) fixItemHeight (false); } setTopIndex (oldIndex); @@ -3948,7 +3951,7 @@ public void setHeaderVisible (boolean show) { public void setItemCount (int count) { checkWidget (); count = Math.max (0, count); - int itemCount = OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + int itemCount = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); if (count == itemCount) return; setDeferResize (true); boolean isVirtual = (style & SWT.VIRTUAL) != 0; @@ -3959,7 +3962,7 @@ public void setItemCount (int count) { if (item != null && !item.isDisposed ()) item.release (false); if (!isVirtual) { ignoreSelect = ignoreShrink = true; - int code = OS.SendMessage (handle, OS.LVM_DELETEITEM, count, 0); + int /*long*/ code = OS.SendMessage (handle, OS.LVM_DELETEITEM, count, 0); ignoreSelect = ignoreShrink = false; if (code == 0) break; } @@ -4015,7 +4018,7 @@ void setItemHeight (boolean fixScroll) { * WM_SETFONT which recomputes and assigns the default item * height. */ - int hFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); + int /*long*/ hFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); OS.SendMessage (handle, OS.WM_SETFONT, hFont, 0); } else { /* @@ -4135,7 +4138,7 @@ public void setRedraw (boolean redraw) { */ setDeferResize (true); OS.SendMessage (handle, OS.WM_SETREDRAW, 1, 0); - int hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); + int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); if (hwndHeader != 0) OS.SendMessage (hwndHeader, OS.WM_SETREDRAW, 1, 0); if ((state & HIDDEN) != 0) { state &= ~HIDDEN; @@ -4156,7 +4159,7 @@ public void setRedraw (boolean redraw) { } else { if (drawCount++ == 0) { OS.SendMessage (handle, OS.WM_SETREDRAW, 0, 0); - int hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); + int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); if (hwndHeader != 0) OS.SendMessage (hwndHeader, OS.WM_SETREDRAW, 0, 0); /* @@ -4193,10 +4196,10 @@ boolean setScrollWidth (TableItem item, boolean force) { */ if (columnCount == 0) { int newWidth = 0, imageIndent = 0, index = 0; - int itemCount = OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + int itemCount = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); while (index < itemCount) { String string = null; - int font = -1; + int /*long*/ font = -1; if (item != null) { string = item.text; imageIndent = Math.max (imageIndent, item.imageIndent); @@ -4213,8 +4216,8 @@ boolean setScrollWidth (TableItem item, boolean force) { } if (string != null && string.length () != 0) { if (font != -1) { - int hDC = OS.GetDC (handle); - int oldFont = OS.SelectObject (hDC, font); + int /*long*/ hDC = OS.GetDC (handle); + int /*long*/ oldFont = OS.SelectObject (hDC, font); int flags = OS.DT_CALCRECT | OS.DT_SINGLELINE | OS.DT_NOPREFIX; TCHAR buffer = new TCHAR (getCodePage (), string, false); RECT rect = new RECT (); @@ -4224,7 +4227,7 @@ boolean setScrollWidth (TableItem item, boolean force) { newWidth = Math.max (newWidth, rect.right - rect.left); } else { TCHAR buffer = new TCHAR (getCodePage (), string, true); - newWidth = Math.max (newWidth, OS.SendMessage (handle, OS.LVM_GETSTRINGWIDTH, 0, buffer)); + newWidth = Math.max (newWidth, (int)/*64*/OS.SendMessage (handle, OS.LVM_GETSTRINGWIDTH, 0, buffer)); } } if (item != null) break; @@ -4242,15 +4245,15 @@ boolean setScrollWidth (TableItem item, boolean force) { */ if (newWidth == 0) { TCHAR buffer = new TCHAR (getCodePage (), " ", true); - newWidth = Math.max (newWidth, OS.SendMessage (handle, OS.LVM_GETSTRINGWIDTH, 0, buffer)); + newWidth = Math.max (newWidth, (int)/*64*/OS.SendMessage (handle, OS.LVM_GETSTRINGWIDTH, 0, buffer)); } - int hStateList = OS.SendMessage (handle, OS.LVM_GETIMAGELIST, OS.LVSIL_STATE, 0); + int /*long*/ hStateList = OS.SendMessage (handle, OS.LVM_GETIMAGELIST, OS.LVSIL_STATE, 0); if (hStateList != 0) { int [] cx = new int [1], cy = new int [1]; OS.ImageList_GetIconSize (hStateList, cx, cy); newWidth += cx [0] + INSET; } - int hImageList = OS.SendMessage (handle, OS.LVM_GETIMAGELIST, OS.LVSIL_SMALL, 0); + int /*long*/ hImageList = OS.SendMessage (handle, OS.LVM_GETIMAGELIST, OS.LVSIL_SMALL, 0); if (hImageList != 0) { int [] cx = new int [1], cy = new int [1]; OS.ImageList_GetIconSize (hImageList, cx, cy); @@ -4269,7 +4272,7 @@ boolean setScrollWidth (TableItem item, boolean force) { newWidth++; } newWidth += INSET * 2; - int oldWidth = OS.SendMessage (handle, OS.LVM_GETCOLUMNWIDTH, 0, 0); + int oldWidth = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETCOLUMNWIDTH, 0, 0); if (!OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (6, 0)) { newWidth += VISTA_EXTRA; } @@ -4289,7 +4292,7 @@ boolean setScrollWidth (TableItem item, boolean force) { if (redraw) { OS.DefWindowProc (handle, OS.WM_SETREDRAW, 1, 0); if (OS.IsWinCE) { - int hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); + int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); if (hwndHeader != 0) OS.InvalidateRect (hwndHeader, null, true); OS.InvalidateRect (handle, null, true); } else { @@ -4452,7 +4455,7 @@ public void setSelection (int start, int end) { checkWidget (); deselectAll (); if (end < 0 || start > end || ((style & SWT.SINGLE) != 0 && start != end)) return; - int count = OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); if (count == 0 || start >= count) return; start = Math.max (0, start); end = Math.min (end, count - 1); @@ -4513,7 +4516,7 @@ public void setSortDirection (int direction) { } void setSubImagesVisible (boolean visible) { - int dwExStyle = OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); + int dwExStyle = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); if ((dwExStyle & OS.LVS_EX_SUBITEMIMAGES) != 0 == visible) return; int bits = visible ? OS.LVS_EX_SUBITEMIMAGES : 0; OS.SendMessage (handle, OS.LVM_SETEXTENDEDLISTVIEWSTYLE, OS.LVS_EX_SUBITEMIMAGES, bits); @@ -4530,12 +4533,12 @@ void setTableEmpty () { * Windows to reserve the smallest possible space when an image * list is removed. */ - int hImageList = OS.ImageList_Create (1, 1, 0, 0, 0); + int /*long*/ hImageList = OS.ImageList_Create (1, 1, 0, 0, 0); OS.SendMessage (handle, OS.LVM_SETIMAGELIST, OS.LVSIL_SMALL, hImageList); OS.SendMessage (handle, OS.LVM_SETIMAGELIST, OS.LVSIL_SMALL, 0); if (headerImageList != null) { - int hHeaderImageList = headerImageList.getHandle (); - int hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); + int /*long*/ hHeaderImageList = headerImageList.getHandle (); + int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); OS.SendMessage (hwndHeader, OS.HDM_SETIMAGELIST, 0, hHeaderImageList); } OS.ImageList_Destroy (hImageList); @@ -4573,7 +4576,7 @@ void setTableEmpty () { */ public void setTopIndex (int index) { checkWidget (); - int topIndex = OS.SendMessage (handle, OS.LVM_GETTOPINDEX, 0, 0); + int topIndex = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETTOPINDEX, 0, 0); if (index == topIndex) return; /* @@ -4667,7 +4670,7 @@ public void showColumn (TableColumn column) { OS.SendMessage (handle, OS.LVM_GETSUBITEMRECT, -1, itemRect); ignoreCustomDraw = false; itemRect.right = itemRect.left; - int width = OS.SendMessage (handle, OS.LVM_GETCOLUMNWIDTH, 0, 0); + int width = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETCOLUMNWIDTH, 0, 0); itemRect.left = itemRect.right - width; } else { itemRect.top = index; @@ -4683,7 +4686,7 @@ public void showColumn (TableColumn column) { * get the new scroll position and redraw the new area. */ int oldPos = 0; - int bits = OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); + int bits = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); if ((bits & OS.LVS_EX_GRIDLINES) != 0) { SCROLLINFO info = new SCROLLINFO (); info.cbSize = SCROLLINFO.sizeof; @@ -4792,7 +4795,7 @@ public void showItem (TableItem item) { */ public void showSelection () { checkWidget (); - int index = OS.SendMessage (handle, OS.LVM_GETNEXTITEM, -1, OS.LVNI_SELECTED); + int index = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETNEXTITEM, -1, OS.LVNI_SELECTED); if (index != -1) showItem (index); } @@ -4819,13 +4822,13 @@ public void showSelection () { void subclass () { super.subclass (); if (HeaderProc != 0) { - int hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); - OS.SetWindowLong (hwndHeader, OS.GWL_WNDPROC, display.windowProc); + int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); + OS.SetWindowLongPtr (hwndHeader, OS.GWLP_WNDPROC, display.windowProc); } } String toolTipText (NMTTDISPINFO hdr) { - int hwndToolTip = OS.SendMessage (handle, OS.LVM_GETTOOLTIPS, 0, 0); + int /*long*/ hwndToolTip = OS.SendMessage (handle, OS.LVM_GETTOOLTIPS, 0, 0); if (hwndToolTip == hdr.hwndFrom && toolTipText != null) return ""; //$NON-NLS-1$ if (headerToolTipHandle == hdr.hwndFrom) { for (int i=0; i<columnCount; i++) { @@ -4839,8 +4842,8 @@ String toolTipText (NMTTDISPINFO hdr) { void unsubclass () { super.unsubclass (); if (HeaderProc != 0) { - int hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); - OS.SetWindowLong (hwndHeader, OS.GWL_WNDPROC, HeaderProc); + int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); + OS.SetWindowLongPtr (hwndHeader, OS.GWLP_WNDPROC, HeaderProc); } } @@ -4857,23 +4860,23 @@ void update (boolean all) { * NOTE: The header tooltip can subclass the header proc so the * current proc must be restored or header tooltips stop working. */ - int oldHeaderProc = 0, oldTableProc = 0; - int hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); + int /*long*/ oldHeaderProc = 0, oldTableProc = 0; + int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); boolean fixSubclass = !hasChildren () && !hooks (SWT.Paint) && !filters (SWT.Paint); if (fixSubclass) { - oldTableProc = OS.SetWindowLong (handle, OS.GWL_WNDPROC, TableProc); - oldHeaderProc = OS.SetWindowLong (hwndHeader, OS.GWL_WNDPROC, HeaderProc); + oldTableProc = OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, TableProc); + oldHeaderProc = OS.SetWindowLongPtr (hwndHeader, OS.GWLP_WNDPROC, HeaderProc); } super.update (all); if (fixSubclass) { - OS.SetWindowLong (handle, OS.GWL_WNDPROC, oldTableProc); - OS.SetWindowLong (hwndHeader, OS.GWL_WNDPROC, oldHeaderProc); + OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, oldTableProc); + OS.SetWindowLongPtr (hwndHeader, OS.GWLP_WNDPROC, oldHeaderProc); } } void updateHeaderToolTips () { if (headerToolTipHandle == 0) return; - int hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); + int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); RECT rect = new RECT (); TOOLINFO lpti = new TOOLINFO (); lpti.cbSize = TOOLINFO.sizeof; @@ -4935,11 +4938,11 @@ TCHAR windowClass () { return TableClass; } -int windowProc () { +int /*long*/ windowProc () { return TableProc; } -int windowProc (int hwnd, int msg, int wParam, int lParam) { +int /*long*/ windowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) { if (handle == 0) return 0; if (hwnd != handle) { switch (msg) { @@ -4965,7 +4968,7 @@ int windowProc (int hwnd, int msg, int wParam, int lParam) { */ if (OS.COMCTL32_MAJOR < 6) { if (lParam != 0) { - int hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); + int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); if (lParam != hwndHeader) OS.InvalidateRect (hwndHeader, null, true); } } @@ -5006,8 +5009,8 @@ int windowProc (int hwnd, int msg, int wParam, int lParam) { OS.ScreenToClient (hwnd, pt); pinfo.x = pt.x; pinfo.y = pt.y; - int hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); - int index = OS.SendMessage (hwndHeader, OS.HDM_HITTEST, 0, pinfo); + int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); + int index = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_HITTEST, 0, pinfo); if (0 <= index && index < columnCount && !columns [index].resizable) { if ((pinfo.flags & (OS.HHT_ONDIVIDER | OS.HHT_ONDIVOPEN)) != 0) { OS.SetCursor (OS.LoadCursor (0, OS.IDC_ARROW)); @@ -5024,13 +5027,13 @@ int windowProc (int hwnd, int msg, int wParam, int lParam) { return super.windowProc (hwnd, msg, wParam, lParam); } -LRESULT WM_CHAR (int wParam, int lParam) { +LRESULT WM_CHAR (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_CHAR (wParam, lParam); if (result != null) return result; - switch (wParam) { + switch ((int)/*64*/wParam) { case ' ': if ((style & SWT.CHECK) != 0) { - int index = OS.SendMessage (handle, OS.LVM_GETNEXTITEM, -1, OS.LVNI_FOCUSED); + int index = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETNEXTITEM, -1, OS.LVNI_FOCUSED); if (index != -1) { TableItem item = _getItem (index); item.setChecked (!item.getChecked (), true); @@ -5045,7 +5048,7 @@ LRESULT WM_CHAR (int wParam, int lParam) { * This allows the application to cancel an operation that is normally * performed in WM_KEYDOWN from WM_CHAR. */ - int code = callWindowProc (handle, OS.WM_KEYDOWN, wParam, lParam); + int /*long*/ code = callWindowProc (handle, OS.WM_KEYDOWN, wParam, lParam); return new LRESULT (code); case SWT.CR: /* @@ -5055,7 +5058,7 @@ LRESULT WM_CHAR (int wParam, int lParam) { * event will fail. The fix is to ignore LVN_ITEMACTIVATE when it is * caused by WM_KEYDOWN and send SWT.DefaultSelection from WM_CHAR. */ - int index = OS.SendMessage (handle, OS.LVM_GETNEXTITEM, -1, OS.LVNI_FOCUSED); + int index = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETNEXTITEM, -1, OS.LVNI_FOCUSED); if (index != -1) { Event event = new Event (); event.item = _getItem (index); @@ -5066,7 +5069,7 @@ LRESULT WM_CHAR (int wParam, int lParam) { return result; } -LRESULT WM_CONTEXTMENU (int wParam, int lParam) { +LRESULT WM_CONTEXTMENU (int /*long*/ wParam, int /*long*/ lParam) { /* * Feature in Windows. For some reason, when the right * mouse button is pressed over an item, Windows sends @@ -5083,19 +5086,19 @@ LRESULT WM_CONTEXTMENU (int wParam, int lParam) { return super.WM_CONTEXTMENU (wParam, lParam); } -LRESULT WM_ERASEBKGND (int wParam, int lParam) { +LRESULT WM_ERASEBKGND (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_ERASEBKGND (wParam, lParam); if (findImageControl () != null) return LRESULT.ONE; if (OS.COMCTL32_MAJOR < 6) { if ((style & SWT.DOUBLE_BUFFERED) != 0) { - int bits = OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); + int bits = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); if ((bits & OS.LVS_EX_DOUBLEBUFFER) == 0) return LRESULT.ONE; } } return result; } -LRESULT WM_GETOBJECT (int wParam, int lParam) { +LRESULT WM_GETOBJECT (int /*long*/ wParam, int /*long*/ lParam) { /* * Ensure that there is an accessible object created for this * control because support for checked item accessibility is @@ -5107,10 +5110,10 @@ LRESULT WM_GETOBJECT (int wParam, int lParam) { return super.WM_GETOBJECT (wParam, lParam); } -LRESULT WM_KEYDOWN (int wParam, int lParam) { +LRESULT WM_KEYDOWN (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_KEYDOWN (wParam, lParam); if (result != null) return result; - switch (wParam) { + switch ((int)/*64*/wParam) { case OS.VK_SPACE: /* * Ensure that the window proc does not process VK_SPACE @@ -5153,18 +5156,18 @@ LRESULT WM_KEYDOWN (int wParam, int lParam) { * NOTE: The header tooltip can subclass the header proc so the * current proc must be restored or header tooltips stop working. */ - int oldHeaderProc = 0, oldTableProc = 0; - int hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); + int /*long*/ oldHeaderProc = 0, oldTableProc = 0; + int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); boolean fixSubclass = !hasChildren () && !hooks (SWT.Paint) && !filters (SWT.Paint); if (fixSubclass) { - oldTableProc = OS.SetWindowLong (handle, OS.GWL_WNDPROC, TableProc); - oldHeaderProc = OS.SetWindowLong (hwndHeader, OS.GWL_WNDPROC, HeaderProc); + oldTableProc = OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, TableProc); + oldHeaderProc = OS.SetWindowLongPtr (hwndHeader, OS.GWLP_WNDPROC, HeaderProc); } - int code = callWindowProc (handle, OS.WM_KEYDOWN, wParam, lParam); + int /*long*/ code = callWindowProc (handle, OS.WM_KEYDOWN, wParam, lParam); result = code == 0 ? LRESULT.ZERO : new LRESULT (code); if (fixSubclass) { - OS.SetWindowLong (handle, OS.GWL_WNDPROC, oldTableProc); - OS.SetWindowLong (hwndHeader, OS.GWL_WNDPROC, oldHeaderProc); + OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, oldTableProc); + OS.SetWindowLongPtr (hwndHeader, OS.GWLP_WNDPROC, oldHeaderProc); } //FALL THROUGH case OS.VK_UP: @@ -5175,7 +5178,7 @@ LRESULT WM_KEYDOWN (int wParam, int lParam) { return result; } -LRESULT WM_KILLFOCUS (int wParam, int lParam) { +LRESULT WM_KILLFOCUS (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_KILLFOCUS (wParam, lParam); /* * Bug in Windows. When focus is lost, Windows does not @@ -5189,7 +5192,7 @@ LRESULT WM_KILLFOCUS (int wParam, int lParam) { return result; } -LRESULT WM_LBUTTONDBLCLK (int wParam, int lParam) { +LRESULT WM_LBUTTONDBLCLK (int /*long*/ wParam, int /*long*/ lParam) { /* * Feature in Windows. When the user selects outside of @@ -5201,7 +5204,7 @@ LRESULT WM_LBUTTONDBLCLK (int wParam, int lParam) { LVHITTESTINFO pinfo = new LVHITTESTINFO (); pinfo.x = OS.GET_X_LPARAM (lParam); pinfo.y = OS.GET_Y_LPARAM (lParam); - int index = OS.SendMessage (handle, OS.LVM_HITTEST, 0, pinfo); + int index = (int)/*64*/OS.SendMessage (handle, OS.LVM_HITTEST, 0, pinfo); Display display = this.display; display.captureChanged = false; sendMouseEvent (SWT.MouseDown, 1, handle, OS.WM_LBUTTONDOWN, wParam, lParam); @@ -5237,7 +5240,7 @@ LRESULT WM_LBUTTONDBLCLK (int wParam, int lParam) { return LRESULT.ZERO; } -LRESULT WM_LBUTTONDOWN (int wParam, int lParam) { +LRESULT WM_LBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) { /* * Feature in Windows. For some reason, capturing * the mouse after processing the mouse event for the @@ -5261,7 +5264,7 @@ LRESULT WM_LBUTTONDOWN (int wParam, int lParam) { * the correct way to determine that the user has selected * the check box, equality is needed. */ - int index = OS.SendMessage (handle, OS.LVM_HITTEST, 0, pinfo); + int index = (int)/*64*/OS.SendMessage (handle, OS.LVM_HITTEST, 0, pinfo); if (index != -1 && pinfo.flags == OS.LVHT_ONITEMSTATEICON) { TableItem item = _getItem (index); item.setChecked (!item.getChecked (), true); @@ -5273,7 +5276,7 @@ LRESULT WM_LBUTTONDOWN (int wParam, int lParam) { return result; } -LRESULT WM_MOUSEHOVER (int wParam, int lParam) { +LRESULT WM_MOUSEHOVER (int /*long*/ wParam, int /*long*/ lParam) { /* * Feature in Windows. Despite the fact that hot * tracking is not enabled, the hot tracking code @@ -5282,16 +5285,16 @@ LRESULT WM_MOUSEHOVER (int wParam, int lParam) { * avoid calling the window proc. */ LRESULT result = super.WM_MOUSEHOVER (wParam, lParam); - int bits = OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); + int bits = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); int mask = OS.LVS_EX_ONECLICKACTIVATE | OS.LVS_EX_TRACKSELECT | OS.LVS_EX_TWOCLICKACTIVATE; if ((bits & mask) != 0) return result; return LRESULT.ZERO; } -LRESULT WM_PAINT (int wParam, int lParam) { +LRESULT WM_PAINT (int /*long*/ wParam, int /*long*/ lParam) { if (!ignoreShrink) { /* Resize the item array to match the item count */ - int count = OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); if (items.length > 4 && items.length - count > 3) { int length = Math.max (4, (count + 3) / 4 * 4); TableItem [] newItems = new TableItem [length]; @@ -5302,10 +5305,10 @@ LRESULT WM_PAINT (int wParam, int lParam) { if (fixScrollWidth) setScrollWidth (null, true); if (OS.COMCTL32_MAJOR < 6) { if ((style & SWT.DOUBLE_BUFFERED) != 0 || findImageControl () != null) { - int bits = OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); + int bits = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); if ((bits & OS.LVS_EX_DOUBLEBUFFER) == 0) { GC gc = null; - int paintDC = 0; + int /*long*/ paintDC = 0; PAINTSTRUCT ps = new PAINTSTRUCT (); boolean hooksPaint = hooks (SWT.Paint); if (hooksPaint) { @@ -5320,12 +5323,12 @@ LRESULT WM_PAINT (int wParam, int lParam) { int width = ps.right - ps.left; int height = ps.bottom - ps.top; if (width != 0 && height != 0) { - int hDC = OS.CreateCompatibleDC (paintDC); + int /*long*/ hDC = OS.CreateCompatibleDC (paintDC); POINT lpPoint1 = new POINT (), lpPoint2 = new POINT (); OS.SetWindowOrgEx (hDC, ps.left, ps.top, lpPoint1); OS.SetBrushOrgEx (hDC, ps.left, ps.top, lpPoint2); - int hBitmap = OS.CreateCompatibleBitmap (paintDC, width, height); - int hOldBitmap = OS.SelectObject (hDC, hBitmap); + int /*long*/ hBitmap = OS.CreateCompatibleBitmap (paintDC, width, height); + int /*long*/ hOldBitmap = OS.SelectObject (hDC, hBitmap); if (OS.SendMessage (handle, OS.LVM_GETBKCOLOR, 0, 0) != OS.CLR_NONE) { RECT rect = new RECT (); OS.SetRect (rect, ps.left, ps.top, ps.right, ps.bottom); @@ -5362,7 +5365,7 @@ LRESULT WM_PAINT (int wParam, int lParam) { return super.WM_PAINT (wParam, lParam); } -LRESULT WM_RBUTTONDBLCLK (int wParam, int lParam) { +LRESULT WM_RBUTTONDBLCLK (int /*long*/ wParam, int /*long*/ lParam) { /* * Feature in Windows. When the user selects outside of * a table item, Windows deselects all the items, even @@ -5386,7 +5389,7 @@ LRESULT WM_RBUTTONDBLCLK (int wParam, int lParam) { return LRESULT.ZERO; } -LRESULT WM_RBUTTONDOWN (int wParam, int lParam) { +LRESULT WM_RBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) { /* * Feature in Windows. For some reason, capturing * the mouse after processing the mouse event for the @@ -5397,7 +5400,7 @@ LRESULT WM_RBUTTONDOWN (int wParam, int lParam) { return sendMouseDownEvent (SWT.MouseDown, 3, OS.WM_RBUTTONDOWN, wParam, lParam); } -LRESULT WM_SETFOCUS (int wParam, int lParam) { +LRESULT WM_SETFOCUS (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_SETFOCUS (wParam, lParam); /* * Bug in Windows. When focus is gained after the @@ -5418,9 +5421,9 @@ LRESULT WM_SETFOCUS (int wParam, int lParam) { * no selected item. The fix to make the first item * be the focus item. */ - int count = OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); if (count == 0) return result; - int index = OS.SendMessage (handle, OS.LVM_GETNEXTITEM, -1, OS.LVNI_FOCUSED); + int index = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETNEXTITEM, -1, OS.LVNI_FOCUSED); if (index == -1) { LVITEM lvItem = new LVITEM (); lvItem.state = OS.LVIS_FOCUSED; @@ -5432,7 +5435,7 @@ LRESULT WM_SETFOCUS (int wParam, int lParam) { return result; } -LRESULT WM_SETFONT (int wParam, int lParam) { +LRESULT WM_SETFONT (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_SETFONT (wParam, lParam); if (result != null) return result; @@ -5447,7 +5450,7 @@ LRESULT WM_SETFONT (int wParam, int lParam) { * the header so that all that is necessary here is to * set the default first. */ - int hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); + int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); OS.SendMessage (hwndHeader, OS.WM_SETFONT, 0, lParam); if (headerToolTipHandle != 0) { @@ -5456,7 +5459,7 @@ LRESULT WM_SETFONT (int wParam, int lParam) { return result; } -LRESULT WM_SIZE (int wParam, int lParam) { +LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) { if (ignoreResize) return null; if (hooks (SWT.EraseItem) || hooks (SWT.PaintItem)) { OS.InvalidateRect (handle, null, true); @@ -5468,7 +5471,7 @@ LRESULT WM_SIZE (int wParam, int lParam) { return super.WM_SIZE (wParam, lParam); } -LRESULT WM_SYSCOLORCHANGE (int wParam, int lParam) { +LRESULT WM_SYSCOLORCHANGE (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_SYSCOLORCHANGE (wParam, lParam); if (result != null) return result; if (findBackgroundControl () == null) { @@ -5481,7 +5484,7 @@ LRESULT WM_SYSCOLORCHANGE (int wParam, int lParam) { return result; } -LRESULT WM_HSCROLL (int wParam, int lParam) { +LRESULT WM_HSCROLL (int /*long*/ wParam, int /*long*/ lParam) { /* * Bug in Windows. When a table that is drawing grid lines * is slowly scrolled horizontally to the left, the table does @@ -5490,7 +5493,7 @@ LRESULT WM_HSCROLL (int wParam, int lParam) { * get the new scroll position and redraw the new area. */ int oldPos = 0; - int bits = OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); + int bits = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); if ((bits & OS.LVS_EX_GRIDLINES) != 0) { SCROLLINFO info = new SCROLLINFO (); info.cbSize = SCROLLINFO.sizeof; @@ -5510,17 +5513,17 @@ LRESULT WM_HSCROLL (int wParam, int lParam) { * NOTE: The header tooltip can subclass the header proc so the * current proc must be restored or header tooltips stop working. */ - int oldHeaderProc = 0, oldTableProc = 0; - int hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); + int /*long*/ oldHeaderProc = 0, oldTableProc = 0; + int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); boolean fixSubclass = !hasChildren () && !hooks (SWT.Paint) && !filters (SWT.Paint); if (fixSubclass) { - oldTableProc = OS.SetWindowLong (handle, OS.GWL_WNDPROC, TableProc); - oldHeaderProc = OS.SetWindowLong (hwndHeader, OS.GWL_WNDPROC, HeaderProc); + oldTableProc = OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, TableProc); + oldHeaderProc = OS.SetWindowLongPtr (hwndHeader, OS.GWLP_WNDPROC, HeaderProc); } LRESULT result = super.WM_HSCROLL (wParam, lParam); if (fixSubclass) { - OS.SetWindowLong (handle, OS.GWL_WNDPROC, oldTableProc); - OS.SetWindowLong (hwndHeader, OS.GWL_WNDPROC, oldHeaderProc); + OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, oldTableProc); + OS.SetWindowLongPtr (hwndHeader, OS.GWLP_WNDPROC, oldHeaderProc); } /* @@ -5546,7 +5549,7 @@ LRESULT WM_HSCROLL (int wParam, int lParam) { return result; } -LRESULT WM_VSCROLL (int wParam, int lParam) { +LRESULT WM_VSCROLL (int /*long*/ wParam, int /*long*/ lParam) { /* * When there are many columns in a table, scrolling performance * can be improved by temporarily unsubclassing the window proc @@ -5558,17 +5561,17 @@ LRESULT WM_VSCROLL (int wParam, int lParam) { * NOTE: The header tooltip can subclass the header proc so the * current proc must be restored or header tooltips stop working. */ - int oldHeaderProc = 0, oldTableProc = 0; - int hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); + int /*long*/ oldHeaderProc = 0, oldTableProc = 0; + int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); boolean fixSubclass = !hasChildren () && !hooks (SWT.Paint) && !filters (SWT.Paint); if (fixSubclass) { - oldTableProc = OS.SetWindowLong (handle, OS.GWL_WNDPROC, TableProc); - oldHeaderProc = OS.SetWindowLong (hwndHeader, OS.GWL_WNDPROC, HeaderProc); + oldTableProc = OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, TableProc); + oldHeaderProc = OS.SetWindowLongPtr (hwndHeader, OS.GWLP_WNDPROC, HeaderProc); } LRESULT result = super.WM_VSCROLL (wParam, lParam); if (fixSubclass) { - OS.SetWindowLong (handle, OS.GWL_WNDPROC, oldTableProc); - OS.SetWindowLong (hwndHeader, OS.GWL_WNDPROC, oldHeaderProc); + OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, oldTableProc); + OS.SetWindowLongPtr (hwndHeader, OS.GWLP_WNDPROC, oldHeaderProc); } /* @@ -5577,7 +5580,7 @@ LRESULT WM_VSCROLL (int wParam, int lParam) { * table does not redraw the grid lines for newly exposed items. * The fix is to invalidate the items. */ - int bits = OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); + int bits = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); if ((bits & OS.LVS_EX_GRIDLINES) != 0) { int code = OS.LOWORD (wParam); switch (code) { @@ -5595,8 +5598,8 @@ LRESULT WM_VSCROLL (int wParam, int lParam) { RECT clientRect = new RECT (); OS.GetClientRect (handle, clientRect); clientRect.top += headerHeight; - int empty = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 0, 0); - int oneItem = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 1, 0); + int /*long*/ empty = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 0, 0); + int /*long*/ oneItem = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 1, 0); int itemHeight = OS.HIWORD (oneItem) - OS.HIWORD (empty); if (code == OS.SB_LINEDOWN) { clientRect.top = clientRect.bottom - itemHeight - GRID_WIDTH; @@ -5614,12 +5617,12 @@ LRESULT WM_VSCROLL (int wParam, int lParam) { return result; } -LRESULT wmMeasureChild (int wParam, int lParam) { +LRESULT wmMeasureChild (int /*long*/ wParam, int /*long*/ lParam) { MEASUREITEMSTRUCT struct = new MEASUREITEMSTRUCT (); OS.MoveMemory (struct, lParam, MEASUREITEMSTRUCT.sizeof); if (itemHeight == -1) { - int empty = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 0, 0); - int oneItem = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 1, 0); + int /*long*/ empty = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 0, 0); + int /*long*/ oneItem = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 1, 0); struct.itemHeight = OS.HIWORD (oneItem) - OS.HIWORD (empty); } else { struct.itemHeight = itemHeight; @@ -5628,8 +5631,8 @@ LRESULT wmMeasureChild (int wParam, int lParam) { return null; } -LRESULT wmNotify (NMHDR hdr, int wParam, int lParam) { - int hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); +LRESULT wmNotify (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) { + int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); if (hdr.hwndFrom == hwndHeader) { /* * Feature in Windows. On NT, the automatically created @@ -5688,7 +5691,7 @@ LRESULT wmNotify (NMHDR hdr, int wParam, int lParam) { } case OS.HDN_BEGINDRAG: { if (ignoreColumnMove) return LRESULT.ONE; - int bits = OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); + int bits = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); if ((bits & OS.LVS_EX_HEADERDRAGDROP) == 0) break; if (columnCount == 0) return LRESULT.ONE; NMHEADER phdn = new NMHEADER (); @@ -5703,7 +5706,7 @@ LRESULT wmNotify (NMHDR hdr, int wParam, int lParam) { break; } case OS.HDN_ENDDRAG: { - int bits = OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); + int bits = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); if ((bits & OS.LVS_EX_HEADERDRAGDROP) == 0) break; NMHEADER phdn = new NMHEADER (); OS.MoveMemory (phdn, lParam, NMHEADER.sizeof); @@ -5744,9 +5747,9 @@ LRESULT wmNotify (NMHDR hdr, int wParam, int lParam) { * lines are not redrawn. The fix is to detect the case and force * a redraw of the first column. */ - int width = OS.SendMessage (handle, OS.LVM_GETCOLUMNWIDTH, 0, 0); + int width = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETCOLUMNWIDTH, 0, 0); if (lastWidth == 0 && width > 0) { - int bits = OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); + int bits = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); if ((bits & OS.LVS_EX_GRIDLINES) != 0) { RECT rect = new RECT (); OS.GetClientRect (handle, rect); @@ -5810,7 +5813,7 @@ LRESULT wmNotify (NMHDR hdr, int wParam, int lParam) { case OS.TTN_GETDISPINFOA: case OS.TTN_GETDISPINFOW: { tipRequested = true; - int code = callWindowProc (handle, OS.WM_NOTIFY, wParam, lParam); + int /*long*/ code = callWindowProc (handle, OS.WM_NOTIFY, wParam, lParam); tipRequested = false; return new LRESULT (code); } @@ -5818,7 +5821,7 @@ LRESULT wmNotify (NMHDR hdr, int wParam, int lParam) { return result; } -LRESULT wmNotifyChild (NMHDR hdr, int wParam, int lParam) { +LRESULT wmNotifyChild (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) { switch (hdr.code) { case OS.LVN_ODFINDITEMA: case OS.LVN_ODFINDITEMW: { @@ -5964,7 +5967,7 @@ LRESULT wmNotifyChild (NMHDR hdr, int wParam, int lParam) { break; } case OS.NM_CUSTOMDRAW: { - int hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); + int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); if (hdr.hwndFrom == hwndHeader) break; if (!customDraw && findImageControl () == null) { /* @@ -6048,8 +6051,8 @@ LRESULT wmNotifyChild (NMHDR hdr, int wParam, int lParam) { } } if (hooks (SWT.EraseItem) || hooks (SWT.PaintItem)) { - int hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); - int count = OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); + int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); + int count = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); if (count != 0) { forceResize (); RECT rect = new RECT (); @@ -6063,7 +6066,7 @@ LRESULT wmNotifyChild (NMHDR hdr, int wParam, int lParam) { OS.SendMessage (handle, OS. LVM_GETITEMRECT, pnmlv.iItem, itemRect); ignoreCustomDraw = false; RECT headerRect = new RECT (); - int index = OS.SendMessage (hwndHeader, OS.HDM_ORDERTOINDEX, count - 1, 0); + int index = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_ORDERTOINDEX, count - 1, 0); OS.SendMessage (hwndHeader, OS.HDM_GETITEMRECT, index, headerRect); OS.MapWindowPoints (hwndHeader, handle, headerRect, 2); rect.left = headerRect.right; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableColumn.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableColumn.java index 2b04c97919..e476918410 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableColumn.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableColumn.java @@ -301,8 +301,8 @@ public int getWidth () { checkWidget (); int index = parent.indexOf (this); if (index == -1) return 0; - int hwnd = parent.handle; - return OS.SendMessage (hwnd, OS.LVM_GETCOLUMNWIDTH, index, 0); + int /*long*/ hwnd = parent.handle; + return (int)/*64*/OS.SendMessage (hwnd, OS.LVM_GETCOLUMNWIDTH, index, 0); } /** @@ -320,10 +320,10 @@ public void pack () { checkWidget (); int index = parent.indexOf (this); if (index == -1) return; - int hwnd = parent.handle; - int oldWidth = OS.SendMessage (hwnd, OS.LVM_GETCOLUMNWIDTH, index, 0); + int /*long*/ hwnd = parent.handle; + int oldWidth = (int)/*64*/OS.SendMessage (hwnd, OS.LVM_GETCOLUMNWIDTH, index, 0); TCHAR buffer = new TCHAR (parent.getCodePage (), text, true); - int headerWidth = OS.SendMessage (hwnd, OS.LVM_GETSTRINGWIDTH, 0, buffer) + Table.HEADER_MARGIN; + int headerWidth = (int)/*64*/OS.SendMessage (hwnd, OS.LVM_GETSTRINGWIDTH, 0, buffer) + Table.HEADER_MARGIN; if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) headerWidth += Table.HEADER_EXTRA; boolean hasHeaderImage = false; if (image != null || parent.sortColumn == this) { @@ -344,8 +344,8 @@ public void pack () { } int margin = 0; if (OS.COMCTL32_VERSION >= OS.VERSION (5, 80)) { - int hwndHeader = OS.SendMessage (hwnd, OS.LVM_GETHEADER, 0, 0); - margin = OS.SendMessage (hwndHeader, OS.HDM_GETBITMAPMARGIN, 0, 0); + int /*long*/ hwndHeader = OS.SendMessage (hwnd, OS.LVM_GETHEADER, 0, 0); + margin = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_GETBITMAPMARGIN, 0, 0); } else { margin = OS.GetSystemMetrics (OS.SM_CXEDGE) * 3; } @@ -362,17 +362,17 @@ public void pack () { */ if ((index == 0 && !parent.firstColumnImage) || parent.hooks (SWT.MeasureItem)) { RECT headerRect = new RECT (); - int hwndHeader = OS.SendMessage (hwnd, OS.LVM_GETHEADER, 0, 0); + int /*long*/ hwndHeader = OS.SendMessage (hwnd, OS.LVM_GETHEADER, 0, 0); OS.SendMessage (hwndHeader, OS.HDM_GETITEMRECT, index, headerRect); OS.MapWindowPoints (hwndHeader, hwnd, headerRect, 2); - int hDC = OS.GetDC (hwnd); - int oldFont = 0, newFont = OS.SendMessage (hwnd, OS.WM_GETFONT, 0, 0); + int /*long*/ hDC = OS.GetDC (hwnd); + int /*long*/ oldFont = 0, newFont = OS.SendMessage (hwnd, OS.WM_GETFONT, 0, 0); if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont); - int count = OS.SendMessage (hwnd, OS.LVM_GETITEMCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (hwnd, OS.LVM_GETITEMCOUNT, 0, 0); for (int i=0; i<count; i++) { TableItem item = parent.items [i]; if (item != null) { - int hFont = item.cellFont != null ? item.cellFont [index] : -1; + int /*long*/ hFont = item.cellFont != null ? item.cellFont [index] : -1; if (hFont == -1) hFont = item.font; if (hFont != -1) hFont = OS.SelectObject (hDC, hFont); Event event = parent.sendMeasureItemEvent (item, i, index, hDC); @@ -386,7 +386,7 @@ public void pack () { OS.SendMessage (hwnd, OS.LVM_SETCOLUMNWIDTH, index, columnWidth); } else { OS.SendMessage (hwnd, OS.LVM_SETCOLUMNWIDTH, index, OS.LVSCW_AUTOSIZE); - columnWidth = OS.SendMessage (hwnd, OS.LVM_GETCOLUMNWIDTH, index, 0); + columnWidth = (int)/*64*/OS.SendMessage (hwnd, OS.LVM_GETCOLUMNWIDTH, index, 0); if (index == 0) { /* * Bug in Windows. When LVM_SETCOLUMNWIDTH is used with LVSCW_AUTOSIZE @@ -403,7 +403,7 @@ public void pack () { * width by the width of the image list. */ if ((parent.style & SWT.CHECK) != 0) { - int hStateList = OS.SendMessage (hwnd, OS.LVM_GETIMAGELIST, OS.LVSIL_STATE, 0); + int /*long*/ hStateList = OS.SendMessage (hwnd, OS.LVM_GETIMAGELIST, OS.LVSIL_STATE, 0); if (hStateList != 0) { int [] cx = new int [1], cy = new int [1]; OS.ImageList_GetIconSize (hStateList, cx, cy); @@ -444,7 +444,7 @@ public void pack () { } } parent.ignoreColumnResize = false; - int newWidth = OS.SendMessage (hwnd, OS.LVM_GETCOLUMNWIDTH, index, 0); + int newWidth = (int)/*64*/OS.SendMessage (hwnd, OS.LVM_GETCOLUMNWIDTH, index, 0); if (oldWidth != newWidth) { updateToolTip (index); sendEvent (SWT.Resize); @@ -544,7 +544,7 @@ public void setAlignment (int alignment) { if (index == -1 || index == 0) return; style &= ~(SWT.LEFT | SWT.RIGHT | SWT.CENTER); style |= alignment & (SWT.LEFT | SWT.RIGHT | SWT.CENTER); - int hwnd = parent.handle; + int /*long*/ hwnd = parent.handle; LVCOLUMN lvColumn = new LVCOLUMN (); lvColumn.mask = OS.LVCF_FMT | OS.LVCF_IMAGE; OS.SendMessage (hwnd, OS.LVM_GETCOLUMN, index, lvColumn); @@ -565,7 +565,7 @@ public void setAlignment (int alignment) { parent.forceResize (); RECT rect = new RECT (), headerRect = new RECT (); OS.GetClientRect (hwnd, rect); - int hwndHeader = OS.SendMessage (hwnd, OS.LVM_GETHEADER, 0, 0); + int /*long*/ hwndHeader = OS.SendMessage (hwnd, OS.LVM_GETHEADER, 0, 0); OS.SendMessage (hwndHeader, OS.HDM_GETITEMRECT, index, headerRect); OS.MapWindowPoints (hwndHeader, hwnd, headerRect, 2); rect.left = headerRect.left; @@ -588,9 +588,9 @@ public void setImage (Image image) { void setImage (Image image, boolean sort, boolean right) { int index = parent.indexOf (this); if (index == -1) return; - int hwnd = parent.handle; + int /*long*/ hwnd = parent.handle; if (OS.COMCTL32_MAJOR < 6) { - int hwndHeader = OS.SendMessage (hwnd, OS.LVM_GETHEADER, 0, 0); + int /*long*/ hwndHeader = OS.SendMessage (hwnd, OS.LVM_GETHEADER, 0, 0); HDITEM hdItem = new HDITEM (); hdItem.mask = OS.HDI_FORMAT | OS.HDI_IMAGE | OS.HDI_BITMAP; OS.SendMessage (hwndHeader, OS.HDM_GETITEM, index, hdItem); @@ -678,8 +678,8 @@ void setSortDirection (int direction) { if (OS.COMCTL32_MAJOR >= 6) { int index = parent.indexOf (this); if (index == -1) return; - int hwnd = parent.handle; - int hwndHeader = OS.SendMessage (hwnd, OS.LVM_GETHEADER, 0, 0); + int /*long*/ hwnd = parent.handle; + int /*long*/ hwndHeader = OS.SendMessage (hwnd, OS.LVM_GETHEADER, 0, 0); HDITEM hdItem = new HDITEM (); hdItem.mask = OS.HDI_FORMAT | OS.HDI_IMAGE; OS.SendMessage (hwndHeader, OS.HDM_GETITEM, index, hdItem); @@ -721,7 +721,7 @@ void setSortDirection (int direction) { RECT rect = new RECT (); OS.GetClientRect (hwnd, rect); if (OS.SendMessage (hwnd, OS.LVM_GETBKCOLOR, 0, 0) != OS.CLR_NONE) { - int oldColumn = OS.SendMessage (hwnd, OS.LVM_GETSELECTEDCOLUMN, 0, 0); + int oldColumn = (int)/*64*/OS.SendMessage (hwnd, OS.LVM_GETSELECTEDCOLUMN, 0, 0); int newColumn = direction == SWT.NONE ? -1 : index; OS.SendMessage (hwnd, OS.LVM_SETSELECTEDCOLUMN, newColumn, 0); RECT headerRect = new RECT (); @@ -769,7 +769,7 @@ public void setText (String string) { * text does not draw. The fix is to query and then * set the alignment. */ - int hwnd = parent.handle; + int /*long*/ hwnd = parent.handle; LVCOLUMN lvColumn = new LVCOLUMN (); lvColumn.mask = OS.LVCF_FMT; OS.SendMessage (hwnd, OS.LVM_GETCOLUMN, index, lvColumn); @@ -782,14 +782,14 @@ public void setText (String string) { * mnemonic characters and replace doubled mnemonics * with spaces. */ - int hHeap = OS.GetProcessHeap (); + int /*long*/ hHeap = OS.GetProcessHeap (); TCHAR buffer = new TCHAR (parent.getCodePage (), fixMnemonic (string), true); int byteCount = buffer.length () * TCHAR.sizeof; - int pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); + int /*long*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); OS.MoveMemory (pszText, buffer, byteCount); lvColumn.mask |= OS.LVCF_TEXT; lvColumn.pszText = pszText; - int result = OS.SendMessage (hwnd, OS.LVM_SETCOLUMN, index, lvColumn); + int /*long*/ result = OS.SendMessage (hwnd, OS.LVM_SETCOLUMN, index, lvColumn); if (pszText != 0) OS.HeapFree (hHeap, 0, pszText); if (result == 0) error (SWT.ERROR_CANNOT_SET_TEXT); } @@ -810,7 +810,7 @@ public void setText (String string) { public void setToolTipText (String string) { checkWidget(); toolTipText = string; - int hwndHeaderToolTip = parent.headerToolTipHandle; + int /*long*/ hwndHeaderToolTip = parent.headerToolTipHandle; if (hwndHeaderToolTip == 0) { parent.createHeaderToolTips (); parent.updateHeaderToolTips (); @@ -832,15 +832,15 @@ public void setWidth (int width) { if (width < 0) return; int index = parent.indexOf (this); if (index == -1) return; - int hwnd = parent.handle; + int /*long*/ hwnd = parent.handle; OS.SendMessage (hwnd, OS.LVM_SETCOLUMNWIDTH, index, width); } void updateToolTip (int index) { - int hwndHeaderToolTip = parent.headerToolTipHandle; + int /*long*/ hwndHeaderToolTip = parent.headerToolTipHandle; if (hwndHeaderToolTip != 0) { - int hwnd = parent.handle; - int hwndHeader = OS.SendMessage (hwnd, OS.LVM_GETHEADER, 0, 0); + int /*long*/ hwnd = parent.handle; + int /*long*/ hwndHeader = OS.SendMessage (hwnd, OS.LVM_GETHEADER, 0, 0); RECT rect = new RECT (); if (OS.SendMessage (hwndHeader, OS.HDM_GETITEMRECT, index, rect) != 0) { TOOLINFO lpti = new TOOLINFO (); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableItem.java index 8b23dd8131..caa793d73f 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableItem.java @@ -34,8 +34,10 @@ public class TableItem extends Item { String [] strings; Image [] images; boolean checked, grayed, cached; - int imageIndent, background = -1, foreground = -1, font = -1; - int [] cellBackground, cellForeground, cellFont; + int imageIndent, background = -1, foreground = -1; + int /*long*/ font = -1; + int [] cellBackground, cellForeground; + int /*long*/[] cellFont; /** * Constructs a new instance of this class given its parent @@ -129,8 +131,10 @@ void clear () { images = null; imageIndent = 0; checked = grayed = false; - background = foreground = font = -1; - cellBackground = cellForeground = cellFont = null; + font = -1; + background = foreground = -1; + cellFont = null; + cellBackground = cellForeground = null; if ((parent.style & SWT.VIRTUAL) != 0) cached = false; } @@ -229,7 +233,7 @@ RECT getBounds (int row, int column, boolean getText, boolean getImage, boolean return getBounds (row, column, getText, getImage, fullText, false, 0); } -RECT getBounds (int row, int column, boolean getText, boolean getImage, boolean fullText, boolean fullImage, int hDC) { +RECT getBounds (int row, int column, boolean getText, boolean getImage, boolean fullText, boolean fullImage, int /*long*/ hDC) { if (!getText && !getImage) return new RECT (); int columnCount = parent.getColumnCount (); if (!(0 <= column && column < Math.max (1, columnCount))) { @@ -237,25 +241,25 @@ RECT getBounds (int row, int column, boolean getText, boolean getImage, boolean } if (parent.fixScrollWidth) parent.setScrollWidth (null, true); RECT rect = new RECT (); - int hwnd = parent.handle; - int bits = OS.SendMessage (hwnd, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); + int /*long*/ hwnd = parent.handle; + int bits = (int)/*64*/OS.SendMessage (hwnd, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); if (column == 0 && (bits & OS.LVS_EX_FULLROWSELECT) == 0) { if (parent.explorerTheme) { rect.left = OS.LVIR_ICON; parent.ignoreCustomDraw = true; - int code = OS.SendMessage (hwnd, OS. LVM_GETITEMRECT, row, rect); + int /*long*/ code = OS.SendMessage (hwnd, OS. LVM_GETITEMRECT, row, rect); parent.ignoreCustomDraw = false; if (code == 0) return new RECT (); if (getText) { int width = 0; - int hFont = cellFont != null ? cellFont [column] : -1; + int /*long*/ hFont = cellFont != null ? cellFont [column] : -1; if (hFont == -1) hFont = font; if (hFont == -1 && hDC == 0) { TCHAR buffer = new TCHAR (parent.getCodePage (), text, true); - width = OS.SendMessage (hwnd, OS.LVM_GETSTRINGWIDTH, 0, buffer); + width = (int)/*64*/OS.SendMessage (hwnd, OS.LVM_GETSTRINGWIDTH, 0, buffer); } else { TCHAR buffer = new TCHAR (parent.getCodePage (), text, false); - int textDC = hDC != 0 ? hDC : OS.GetDC (hwnd), oldFont = -1; + int /*long*/ textDC = hDC != 0 ? hDC : OS.GetDC (hwnd), oldFont = -1; if (hDC == 0) { if (hFont == -1) hFont = OS.SendMessage (hwnd, OS.WM_GETFONT, 0, 0); oldFont = OS.SelectObject (textDC, hFont); @@ -276,7 +280,7 @@ RECT getBounds (int row, int column, boolean getText, boolean getImage, boolean if (getText) { rect.left = OS.LVIR_SELECTBOUNDS; parent.ignoreCustomDraw = true; - int code = OS.SendMessage (hwnd, OS.LVM_GETITEMRECT, row, rect); + int /*long*/ code = OS.SendMessage (hwnd, OS.LVM_GETITEMRECT, row, rect); parent.ignoreCustomDraw = false; if (code == 0) return new RECT (); if (!getImage) { @@ -290,14 +294,14 @@ RECT getBounds (int row, int column, boolean getText, boolean getImage, boolean } else { rect.left = OS.LVIR_ICON; parent.ignoreCustomDraw = true; - int code = OS.SendMessage (hwnd, OS.LVM_GETITEMRECT, row, rect); + int /*long*/ code = OS.SendMessage (hwnd, OS.LVM_GETITEMRECT, row, rect); parent.ignoreCustomDraw = false; if (code == 0) return new RECT (); } } if (fullText || fullImage) { RECT headerRect = new RECT (); - int hwndHeader = OS.SendMessage (hwnd, OS.LVM_GETHEADER, 0, 0); + int /*long*/ hwndHeader = OS.SendMessage (hwnd, OS.LVM_GETHEADER, 0, 0); OS.SendMessage (hwndHeader, OS.HDM_GETITEMRECT, 0, headerRect); OS.MapWindowPoints (hwndHeader, hwnd, headerRect, 2); if (getText && fullText) rect.right = headerRect.right; @@ -321,7 +325,7 @@ RECT getBounds (int row, int column, boolean getText, boolean getImage, boolean */ rect.left = getText ? OS.LVIR_LABEL : OS.LVIR_ICON; parent.ignoreCustomDraw = true; - int code = OS.SendMessage (hwnd, OS. LVM_GETSUBITEMRECT, row, rect); + int /*long*/ code = OS.SendMessage (hwnd, OS. LVM_GETSUBITEMRECT, row, rect); parent.ignoreCustomDraw = false; if (code == 0) return new RECT (); /* @@ -355,7 +359,7 @@ RECT getBounds (int row, int column, boolean getText, boolean getImage, boolean } if (column == 0 && fullImage) { RECT headerRect = new RECT (); - int hwndHeader = OS.SendMessage (hwnd, OS.LVM_GETHEADER, 0, 0); + int /*long*/ hwndHeader = OS.SendMessage (hwnd, OS.LVM_GETHEADER, 0, 0); OS.SendMessage (hwndHeader, OS.HDM_GETITEMRECT, 0, headerRect); OS.MapWindowPoints (hwndHeader, hwnd, headerRect, 2); rect.left = headerRect.left; @@ -363,7 +367,7 @@ RECT getBounds (int row, int column, boolean getText, boolean getImage, boolean } else { rect.left = OS.LVIR_ICON; parent.ignoreCustomDraw = true; - int code = OS.SendMessage (hwnd, OS. LVM_GETSUBITEMRECT, row, rect); + int /*long*/ code = OS.SendMessage (hwnd, OS. LVM_GETSUBITEMRECT, row, rect); parent.ignoreCustomDraw = false; if (code == 0) return new RECT (); if (!hasImage) rect.right = rect.left; @@ -450,7 +454,7 @@ public Font getFont (int index) { if (!parent.checkData (this, true)) error (SWT.ERROR_WIDGET_DISPOSED); int count = Math.max (1, parent.getColumnCount ()); if (0 > index || index > count -1) return getFont (); - int hFont = (cellFont != null) ? cellFont [index] : font; + int /*long*/ hFont = (cellFont != null) ? cellFont [index] : font; return hFont == -1 ? getFont () : Font.win32_new (display, hFont); } @@ -669,7 +673,7 @@ public Rectangle getTextBounds (int index) { void redraw () { if (parent.currentItem == this || parent.drawCount != 0) return; - int hwnd = parent.handle; + int /*long*/ hwnd = parent.handle; if (!OS.IsWindowVisible (hwnd)) return; int index = parent.indexOf (this); if (index == -1) return; @@ -678,7 +682,7 @@ void redraw () { void redraw (int column, boolean drawText, boolean drawImage) { if (parent.currentItem == this || parent.drawCount != 0) return; - int hwnd = parent.handle; + int /*long*/ hwnd = parent.handle; if (!OS.IsWindowVisible (hwnd)) return; int index = parent.indexOf (this); if (index == -1) return; @@ -695,7 +699,8 @@ void releaseWidget () { super.releaseWidget (); strings = null; images = null; - cellBackground = cellForeground = cellFont = null; + cellFont = null; + cellBackground = cellForeground = null; } /** @@ -825,7 +830,7 @@ public void setFont (Font font){ if (font != null && font.isDisposed ()) { SWT.error (SWT.ERROR_INVALID_ARGUMENT); } - int hFont = -1; + int /*long*/ hFont = -1; if (font != null) { parent.setCustomDraw (true); hFont = font.handle; @@ -847,7 +852,7 @@ public void setFont (Font font){ if ((parent.style & SWT.VIRTUAL) == 0 && cached) { int itemIndex = parent.indexOf (this); if (itemIndex != -1) { - int hwnd = parent.handle; + int /*long*/ hwnd = parent.handle; LVITEM lvItem = new LVITEM (); lvItem.mask = OS.LVIF_TEXT; lvItem.iItem = itemIndex; @@ -886,13 +891,13 @@ public void setFont (int index, Font font) { } int count = Math.max (1, parent.getColumnCount ()); if (0 > index || index > count - 1) return; - int hFont = -1; + int /*long*/ hFont = -1; if (font != null) { parent.setCustomDraw (true); hFont = font.handle; } if (cellFont == null) { - cellFont = new int [count]; + cellFont = new int /*long*/ [count]; for (int i = 0; i < count; i++) { cellFont [i] = -1; } @@ -915,7 +920,7 @@ public void setFont (int index, Font font) { if ((parent.style & SWT.VIRTUAL) == 0 && cached) { int itemIndex = parent.indexOf (this); if (itemIndex != -1) { - int hwnd = parent.handle; + int /*long*/ hwnd = parent.handle; LVITEM lvItem = new LVITEM (); lvItem.mask = OS.LVIF_TEXT; lvItem.iItem = itemIndex; @@ -1124,7 +1129,7 @@ public void setImageIndent (int indent) { } else { int index = parent.indexOf (this); if (index != -1) { - int hwnd = parent.handle; + int /*long*/ hwnd = parent.handle; LVITEM lvItem = new LVITEM (); lvItem.mask = OS.LVIF_INDENT; lvItem.iItem = index; @@ -1205,7 +1210,7 @@ public void setText (int index, String string) { if ((parent.style & SWT.VIRTUAL) == 0 && cached) { int itemIndex = parent.indexOf (this); if (itemIndex != -1) { - int hwnd = parent.handle; + int /*long*/ hwnd = parent.handle; LVITEM lvItem = new LVITEM (); lvItem.mask = OS.LVIF_TEXT; lvItem.iItem = itemIndex; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Text.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Text.java index a30387bc2b..cf25949200 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Text.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Text.java @@ -70,7 +70,7 @@ public class Text extends Scrollable { DELIMITER = "\r\n"; } - static final int EditProc; + static final int /*long*/ EditProc; static final TCHAR EditClass = new TCHAR (0, "EDIT", true); static { WNDCLASS lpWndClass = new WNDCLASS (); @@ -79,7 +79,7 @@ public class Text extends Scrollable { /* * This code is intentionally commented. */ -// int hwndText = OS.CreateWindowEx (0, +// int /*long*/ hwndText = OS.CreateWindowEx (0, // EditClass, // null, // OS.WS_OVERLAPPED | OS.ES_PASSWORD, @@ -128,7 +128,7 @@ public Text (Composite parent, int style) { super (parent, checkStyle (style)); } -int callWindowProc (int hwnd, int msg, int wParam, int lParam) { +int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) { if (handle == 0) return 0; return OS.CallWindowProc (EditProc, hwnd, msg, wParam, lParam); } @@ -325,13 +325,13 @@ public Point computeSize (int wHint, int hHint, boolean changed) { checkWidget (); int height = 0, width = 0; if (wHint == SWT.DEFAULT || hHint == SWT.DEFAULT) { - int newFont, oldFont = 0; - int hDC = OS.GetDC (handle); + int /*long*/ newFont, oldFont = 0; + int /*long*/ hDC = OS.GetDC (handle); newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont); TEXTMETRIC tm = OS.IsUnicode ? (TEXTMETRIC) new TEXTMETRICW () : new TEXTMETRICA (); OS.GetTextMetrics (hDC, tm); - int count = (style & SWT.SINGLE) != 0 ? 1 : OS.SendMessage (handle, OS.EM_GETLINECOUNT, 0, 0); + int count = (style & SWT.SINGLE) != 0 ? 1 : (int)/*64*/OS.SendMessage (handle, OS.EM_GETLINECOUNT, 0, 0); height = count * tm.tmHeight; RECT rect = new RECT (); int flags = OS.DT_CALCRECT | OS.DT_EDITCONTROL | OS.DT_NOPREFIX; @@ -384,7 +384,7 @@ public Rectangle computeTrim (int x, int y, int width, int height) { * the single-line text widget in an editable combo * box. */ - int margins = OS.SendMessage(handle, OS.EM_GETMARGINS, 0, 0); + int /*long*/ margins = OS.SendMessage(handle, OS.EM_GETMARGINS, 0, 0); rect.x -= OS.LOWORD (margins); rect.width += OS.LOWORD (margins) + OS.HIWORD (margins); if ((style & SWT.H_SCROLL) != 0) rect.width++; @@ -444,12 +444,12 @@ int defaultBackground () { return OS.GetSysColor ((bits & OS.ES_READONLY) != 0 ? OS.COLOR_3DFACE : OS.COLOR_WINDOW); } -boolean dragDetect (int hwnd, int x, int y, boolean filter, boolean [] detect, boolean [] consume) { +boolean dragDetect (int /*long*/ hwnd, int x, int y, boolean filter, boolean [] detect, boolean [] consume) { if (filter) { int [] start = new int [1], end = new int [1]; OS.SendMessage (handle, OS.EM_GETSEL, start, end); if (start [0] != end [0]) { - int lParam = OS.MAKELPARAM (x, y); + int /*long*/ lParam = OS.MAKELPARAM (x, y); int position = OS.LOWORD (OS.SendMessage (handle, OS.EM_CHARFROMPOS, 0, lParam)); if (start [0] <= position && position < end [0]) { if (super.dragDetect (hwnd, x, y, filter, detect, consume)) { @@ -545,7 +545,7 @@ public int getBorderWidth () { */ public int getCaretLineNumber () { checkWidget (); - return OS.SendMessage (handle, OS.EM_LINEFROMCHAR, -1, 0); + return (int)/*64*/OS.SendMessage (handle, OS.EM_LINEFROMCHAR, -1, 0); } /** @@ -576,7 +576,7 @@ public Point getCaretLocation () { * pixel coordinates (0,0). */ int position = getCaretPosition (); - int caretPos = OS.SendMessage (handle, OS.EM_POSFROMCHAR, position, 0); + int /*long*/ caretPos = OS.SendMessage (handle, OS.EM_POSFROMCHAR, position, 0); if (caretPos == -1) { caretPos = 0; if (position >= OS.GetWindowTextLength (handle)) { @@ -637,8 +637,8 @@ public int getCaretPosition () { */ int caret = start [0]; if (start [0] != end [0]) { - int startLine = OS.SendMessage (handle, OS.EM_LINEFROMCHAR, start [0], 0); - int endLine = OS.SendMessage (handle, OS.EM_LINEFROMCHAR, end [0], 0); + int startLine = (int)/*64*/OS.SendMessage (handle, OS.EM_LINEFROMCHAR, start [0], 0); + int endLine = (int)/*64*/OS.SendMessage (handle, OS.EM_LINEFROMCHAR, end [0], 0); if (startLine == endLine) { if (!OS.IsWinCE) { int idThread = OS.GetWindowThreadProcessId (handle, null); @@ -648,9 +648,9 @@ public int getCaretPosition () { if (lpgui.hwndCaret == handle || lpgui.hwndCaret == 0) { POINT ptCurrentPos = new POINT (); if (OS.GetCaretPos (ptCurrentPos)) { - int endPos = OS.SendMessage (handle, OS.EM_POSFROMCHAR, end [0], 0); + int /*long*/ endPos = OS.SendMessage (handle, OS.EM_POSFROMCHAR, end [0], 0); if (endPos == -1) { - int startPos = OS.SendMessage (handle, OS.EM_POSFROMCHAR, start [0], 0); + int /*long*/ startPos = OS.SendMessage (handle, OS.EM_POSFROMCHAR, start [0], 0); int startX = OS.GET_X_LPARAM (startPos); if (ptCurrentPos.x > startX) caret = end [0]; } else { @@ -662,8 +662,8 @@ public int getCaretPosition () { } } } else { - int caretPos = OS.SendMessage (handle, OS.EM_LINEINDEX, -1, 0); - int caretLine = OS.SendMessage (handle, OS.EM_LINEFROMCHAR, caretPos, 0); + int caretPos = (int)/*64*/OS.SendMessage (handle, OS.EM_LINEINDEX, -1, 0); + int caretLine = (int)/*64*/OS.SendMessage (handle, OS.EM_LINEFROMCHAR, caretPos, 0); if (caretLine == endLine) caret = end [0]; } } @@ -760,7 +760,7 @@ public boolean getEditable () { */ public int getLineCount () { checkWidget (); - return OS.SendMessage (handle, OS.EM_GETLINECOUNT, 0, 0); + return (int)/*64*/OS.SendMessage (handle, OS.EM_GETLINECOUNT, 0, 0); } /** @@ -792,8 +792,8 @@ public String getLineDelimiter () { */ public int getLineHeight () { checkWidget (); - int newFont, oldFont = 0; - int hDC = OS.GetDC (handle); + int /*long*/ newFont, oldFont = 0; + int /*long*/ hDC = OS.GetDC (handle); newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont); TEXTMETRIC tm = OS.IsUnicode ? (TEXTMETRIC) new TEXTMETRICW () : new TEXTMETRICA (); @@ -866,7 +866,7 @@ public String getMessage () { /*public*/ int getPosition (Point point) { checkWidget(); if (point == null) error (SWT.ERROR_NULL_ARGUMENT); - int lParam = OS.MAKELPARAM (point.x, point.y); + int /*long*/ lParam = OS.MAKELPARAM (point.x, point.y); int position = OS.LOWORD (OS.SendMessage (handle, OS.EM_CHARFROMPOS, 0, lParam)); if (!OS.IsUnicode && OS.IsDBLocale) position = mbcsToWcsPos (position); return position; @@ -960,10 +960,10 @@ public int getTabs () { } int getTabWidth (int tabs) { - int oldFont = 0; + int /*long*/ oldFont = 0; RECT rect = new RECT (); - int hDC = OS.GetDC (handle); - int newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); + int /*long*/ hDC = OS.GetDC (handle); + int /*long*/ newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont); int flags = OS.DT_CALCRECT | OS.DT_SINGLELINE | OS.DT_NOPREFIX; TCHAR SPACE = new TCHAR (getCodePage (), " ", false); @@ -1047,7 +1047,7 @@ public String getText (int start, int end) { */ public int getTextLimit () { checkWidget (); - return OS.SendMessage (handle, OS.EM_GETLIMITTEXT, 0, 0) & 0x7FFFFFFF; + return (int)/*64*/OS.SendMessage (handle, OS.EM_GETLIMITTEXT, 0, 0) & 0x7FFFFFFF; } /** @@ -1067,7 +1067,7 @@ public int getTextLimit () { public int getTopIndex () { checkWidget (); if ((style & SWT.SINGLE) != 0) return 0; - return OS.SendMessage (handle, OS.EM_GETFIRSTVISIBLELINE, 0, 0); + return (int)/*64*/OS.SendMessage (handle, OS.EM_GETFIRSTVISIBLELINE, 0, 0); } /** @@ -1098,7 +1098,7 @@ public int getTopPixel () { * of Rich Edit return zero. */ int [] buffer = new int [2]; - int code = OS.SendMessage (handle, OS.EM_GETSCROLLPOS, 0, buffer); + int /*long*/ code = OS.SendMessage (handle, OS.EM_GETSCROLLPOS, 0, buffer); if (code == 1) return buffer [1]; return getTopIndex () * getLineHeight (); } @@ -1154,11 +1154,11 @@ int mbcsToWcsPos (int mbcsPos) { byte [] buffer = new byte [128]; String delimiter = getLineDelimiter(); int delimiterSize = delimiter.length (); - int count = OS.SendMessageA (handle, OS.EM_GETLINECOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessageA (handle, OS.EM_GETLINECOUNT, 0, 0); for (int line=0; line<count; line++) { int wcsSize = 0; - int linePos = OS.SendMessageA (handle, OS.EM_LINEINDEX, line, 0); - int mbcsSize = OS.SendMessageA (handle, OS.EM_LINELENGTH, linePos, 0); + int linePos = (int)/*64*/OS.SendMessageA (handle, OS.EM_LINEINDEX, line, 0); + int mbcsSize = (int)/*64*/OS.SendMessageA (handle, OS.EM_LINELENGTH, linePos, 0); if (mbcsSize != 0) { if (mbcsSize + delimiterSize > buffer.length) { buffer = new byte [mbcsSize + delimiterSize]; @@ -1166,7 +1166,7 @@ int mbcsToWcsPos (int mbcsPos) { //ENDIAN buffer [0] = (byte) (mbcsSize & 0xFF); buffer [1] = (byte) (mbcsSize >> 8); - mbcsSize = OS.SendMessageA (handle, OS.EM_GETLINE, line, buffer); + mbcsSize = (int)/*64*/OS.SendMessageA (handle, OS.EM_GETLINE, line, buffer); wcsSize = OS.MultiByteToWideChar (cp, OS.MB_PRECOMPOSED, buffer, mbcsSize, null, 0); } if (line - 1 != count) { @@ -1295,7 +1295,7 @@ public void selectAll () { OS.SendMessage (handle, OS.EM_SETSEL, 0, -1); } -boolean sendKeyEvent (int type, int msg, int wParam, int lParam, Event event) { +boolean sendKeyEvent (int type, int msg, int /*long*/ wParam, int /*long*/ lParam, Event event) { if (!super.sendKeyEvent (type, msg, wParam, lParam, event)) { return false; } @@ -1342,7 +1342,7 @@ boolean sendKeyEvent (int type, int msg, int wParam, int lParam, Event event) { case 0x08: /* Bs */ if (start [0] == end [0]) { if (start [0] == 0) return true; - int lineStart = OS.SendMessage (handle, OS.EM_LINEINDEX, -1, 0); + int lineStart = (int)/*64*/OS.SendMessage (handle, OS.EM_LINEINDEX, -1, 0); if (start [0] == lineStart) { start [0] = start [0] - DELIMITER.length (); } else { @@ -1361,8 +1361,8 @@ boolean sendKeyEvent (int type, int msg, int wParam, int lParam, Event event) { if (start [0] == end [0]) { int length = OS.GetWindowTextLength (handle); if (start [0] == length) return true; - int line = OS.SendMessage (handle, OS.EM_LINEFROMCHAR, end [0], 0); - int lineStart = OS.SendMessage (handle, OS.EM_LINEINDEX, line + 1, 0); + int line = (int)/*64*/OS.SendMessage (handle, OS.EM_LINEFROMCHAR, end [0], 0); + int lineStart = (int)/*64*/OS.SendMessage (handle, OS.EM_LINEINDEX, line + 1, 0); if (end [0] == lineStart - DELIMITER.length ()) { end [0] = end [0] + DELIMITER.length (); } else { @@ -1428,7 +1428,7 @@ void setBounds (int x, int y, int width, int height, int flags) { if ((flags & OS.SWP_NOSIZE) == 0 && width != 0) { RECT rect = new RECT (); OS.GetWindowRect (handle, rect); - int margins = OS.SendMessage (handle, OS.EM_GETMARGINS, 0, 0); + int /*long*/ margins = OS.SendMessage (handle, OS.EM_GETMARGINS, 0, 0); int marginWidth = OS.LOWORD (margins) + OS.HIWORD (margins); if (rect.right - rect.left <= marginWidth) { int [] start = new int [1], end = new int [1]; @@ -1798,7 +1798,7 @@ public void setText (String string) { string = verifyText (string, 0, length, null); if (string == null) return; } - int limit = OS.SendMessage (handle, OS.EM_GETLIMITTEXT, 0, 0) & 0x7FFFFFFF; + int limit = (int)/*64*/OS.SendMessage (handle, OS.EM_GETLIMITTEXT, 0, 0) & 0x7FFFFFFF; if (string.length () > limit) string = string.substring (0, limit); TCHAR buffer = new TCHAR (getCodePage (), string, true); OS.SetWindowText (handle, buffer); @@ -1861,9 +1861,9 @@ public void setTextLimit (int limit) { public void setTopIndex (int index) { checkWidget (); if ((style & SWT.SINGLE) != 0) return; - int count = OS.SendMessage (handle, OS.EM_GETLINECOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.EM_GETLINECOUNT, 0, 0); index = Math.min (Math.max (index, 0), count - 1); - int topIndex = OS.SendMessage (handle, OS.EM_GETFIRSTVISIBLELINE, 0, 0); + int topIndex = (int)/*64*/OS.SendMessage (handle, OS.EM_GETFIRSTVISIBLELINE, 0, 0); OS.SendMessage (handle, OS.EM_LINESCROLL, 0, index - topIndex); } @@ -1919,11 +1919,11 @@ int wcsToMbcsPos (int wcsPos) { byte [] buffer = new byte [128]; String delimiter = getLineDelimiter (); int delimiterSize = delimiter.length (); - int count = OS.SendMessageA (handle, OS.EM_GETLINECOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessageA (handle, OS.EM_GETLINECOUNT, 0, 0); for (int line=0; line<count; line++) { int wcsSize = 0; - int linePos = OS.SendMessageA (handle, OS.EM_LINEINDEX, line, 0); - int mbcsSize = OS.SendMessageA (handle, OS.EM_LINELENGTH, linePos, 0); + int linePos = (int)/*64*/OS.SendMessageA (handle, OS.EM_LINEINDEX, line, 0); + int mbcsSize = (int)/*64*/OS.SendMessageA (handle, OS.EM_LINELENGTH, linePos, 0); if (mbcsSize != 0) { if (mbcsSize + delimiterSize > buffer.length) { buffer = new byte [mbcsSize + delimiterSize]; @@ -1931,7 +1931,7 @@ int wcsToMbcsPos (int wcsPos) { //ENDIAN buffer [0] = (byte) (mbcsSize & 0xFF); buffer [1] = (byte) (mbcsSize >> 8); - mbcsSize = OS.SendMessageA (handle, OS.EM_GETLINE, line, buffer); + mbcsSize = (int)/*64*/OS.SendMessageA (handle, OS.EM_GETLINE, line, buffer); wcsSize = OS.MultiByteToWideChar (cp, OS.MB_PRECOMPOSED, buffer, mbcsSize, null, 0); } if (line - 1 != count) { @@ -1992,11 +1992,11 @@ TCHAR windowClass () { return EditClass; } -int windowProc () { +int /*long*/ windowProc () { return EditProc; } -int windowProc (int hwnd, int msg, int wParam, int lParam) { +int /*long*/ windowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) { if (msg == OS.EM_UNDO) { int bits = OS.GetWindowLong (handle, OS.GWL_STYLE); if ((bits & OS.ES_MULTILINE) == 0) { @@ -2013,7 +2013,7 @@ int windowProc (int hwnd, int msg, int wParam, int lParam) { return super.windowProc (hwnd, msg, wParam, lParam); } -LRESULT WM_CHAR (int wParam, int lParam) { +LRESULT WM_CHAR (int /*long*/ wParam, int /*long*/ lParam) { if (ignoreCharacter) return null; LRESULT result = super.WM_CHAR (wParam, lParam); if (result != null) return result; @@ -2025,7 +2025,7 @@ LRESULT WM_CHAR (int wParam, int lParam) { * is inserted into the control. The fix is to detect * this case and not call the window proc. */ - switch (wParam) { + switch ((int)/*64*/wParam) { case SWT.DEL: if (OS.GetKeyState (OS.VK_CONTROL) < 0) { return LRESULT.ZERO; @@ -2040,7 +2040,7 @@ LRESULT WM_CHAR (int wParam, int lParam) { * the window proc. */ if ((style & SWT.SINGLE) != 0) { - switch (wParam) { + switch ((int)/*64*/wParam) { case SWT.CR: postEvent (SWT.DefaultSelection); // FALL THROUGH @@ -2051,19 +2051,19 @@ LRESULT WM_CHAR (int wParam, int lParam) { return result; } -LRESULT WM_CLEAR (int wParam, int lParam) { +LRESULT WM_CLEAR (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_CLEAR (wParam, lParam); if (result != null) return result; return wmClipboard (OS.WM_CLEAR, wParam, lParam); } -LRESULT WM_CUT (int wParam, int lParam) { +LRESULT WM_CUT (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_CUT (wParam, lParam); if (result != null) return result; return wmClipboard (OS.WM_CUT, wParam, lParam); } -LRESULT WM_ERASEBKGND (int wParam, int lParam) { +LRESULT WM_ERASEBKGND (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_ERASEBKGND (wParam, lParam); if ((style & SWT.READ_ONLY) != 0) { if ((style & (SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL)) == 0) { @@ -2089,7 +2089,7 @@ LRESULT WM_ERASEBKGND (int wParam, int lParam) { return result; } -LRESULT WM_GETDLGCODE (int wParam, int lParam) { +LRESULT WM_GETDLGCODE (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_GETDLGCODE (wParam, lParam); if (result != null) return result; @@ -2115,19 +2115,19 @@ LRESULT WM_GETDLGCODE (int wParam, int lParam) { * so DLGC_WANTARROWS should not be cleared. */ if ((style & SWT.READ_ONLY) != 0) { - int code = callWindowProc (handle, OS.WM_GETDLGCODE, wParam, lParam); + int /*long*/ code = callWindowProc (handle, OS.WM_GETDLGCODE, wParam, lParam); code &= ~(OS.DLGC_WANTALLKEYS | OS.DLGC_WANTTAB); return new LRESULT (code); } return null; } -LRESULT WM_IME_CHAR (int wParam, int lParam) { +LRESULT WM_IME_CHAR (int /*long*/ wParam, int /*long*/ lParam) { /* Process a DBCS character */ Display display = this.display; display.lastKey = 0; - display.lastAscii = wParam; + display.lastAscii = (int)/*64*/wParam; display.lastVirtual = display.lastNull = display.lastDead = false; if (!sendKeyEvent (SWT.KeyDown, OS.WM_IME_CHAR, wParam, lParam)) { return LRESULT.ZERO; @@ -2141,7 +2141,7 @@ LRESULT WM_IME_CHAR (int wParam, int lParam) { * them to the application. */ ignoreCharacter = true; - int result = callWindowProc (handle, OS.WM_IME_CHAR, wParam, lParam); + int /*long*/ result = callWindowProc (handle, OS.WM_IME_CHAR, wParam, lParam); MSG msg = new MSG (); int flags = OS.PM_REMOVE | OS.PM_NOYIELD | OS.PM_QS_INPUT | OS.PM_QS_POSTMESSAGE; while (OS.PeekMessage (msg, handle, OS.WM_CHAR, OS.WM_CHAR, flags)) { @@ -2156,7 +2156,7 @@ LRESULT WM_IME_CHAR (int wParam, int lParam) { return new LRESULT (result); } -LRESULT WM_LBUTTONDBLCLK (int wParam, int lParam) { +LRESULT WM_LBUTTONDBLCLK (int /*long*/ wParam, int /*long*/ lParam) { /* * Prevent Windows from processing WM_LBUTTONDBLCLK * when double clicking behavior is disabled by not @@ -2187,14 +2187,14 @@ LRESULT WM_LBUTTONDBLCLK (int wParam, int lParam) { if (start [0] == end [0]) { int length = OS.GetWindowTextLength (handle); if (length == start [0]) { - int code = OS.SendMessage (handle, OS.EM_LINELENGTH, length, 0); + int code = (int)/*64*/OS.SendMessage (handle, OS.EM_LINELENGTH, length, 0); if (code == 0) return LRESULT.ZERO; } } return result; } -LRESULT WM_LBUTTONDOWN (int wParam, int lParam) { +LRESULT WM_LBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) { if (OS.IsPPC) { LRESULT result = null; Display display = this.display; @@ -2238,19 +2238,19 @@ LRESULT WM_LBUTTONDOWN (int wParam, int lParam) { return super.WM_LBUTTONDOWN (wParam, lParam); } -LRESULT WM_PASTE (int wParam, int lParam) { +LRESULT WM_PASTE (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_PASTE (wParam, lParam); if (result != null) return result; return wmClipboard (OS.WM_PASTE, wParam, lParam); } -LRESULT WM_UNDO (int wParam, int lParam) { +LRESULT WM_UNDO (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_UNDO (wParam, lParam); if (result != null) return result; return wmClipboard (OS.WM_UNDO, wParam, lParam); } -LRESULT wmClipboard (int msg, int wParam, int lParam) { +LRESULT wmClipboard (int msg, int /*long*/ wParam, int /*long*/ lParam) { if ((style & SWT.READ_ONLY) != 0) return null; if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return null; boolean call = false; @@ -2326,7 +2326,7 @@ LRESULT wmClipboard (int msg, int wParam, int lParam) { return null; } -LRESULT wmColorChild (int wParam, int lParam) { +LRESULT wmColorChild (int /*long*/ wParam, int /*long*/ lParam) { if ((style & SWT.READ_ONLY) != 0) { if ((style & (SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL)) == 0) { int bits = OS.GetWindowLong (handle, OS.GWL_STYLE); @@ -2351,7 +2351,7 @@ LRESULT wmColorChild (int wParam, int lParam) { return super.wmColorChild (wParam, lParam); } -LRESULT wmCommandChild (int wParam, int lParam) { +LRESULT wmCommandChild (int /*long*/ wParam, int /*long*/ lParam) { int code = OS.HIWORD (wParam); switch (code) { case OS.EN_CHANGE: diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolBar.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolBar.java index 4683a999c4..1501beb0bf 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolBar.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolBar.java @@ -44,7 +44,7 @@ public class ToolBar extends Composite { ToolItem [] items; boolean ignoreResize, ignoreMouse; ImageList imageList, disabledImageList, hotImageList; - static final int ToolBarProc; + static final int /*long*/ ToolBarProc; static final TCHAR ToolBarClass = new TCHAR (0, OS.TOOLBARCLASSNAME, true); static { WNDCLASS lpWndClass = new WNDCLASS (); @@ -133,7 +133,7 @@ public ToolBar (Composite parent, int style) { } } -int callWindowProc (int hwnd, int msg, int wParam, int lParam) { +int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) { if (handle == 0) return 0; /* * Bug in Windows. For some reason, during the processing @@ -185,7 +185,7 @@ public Point computeSize (int wHint, int hHint, boolean changed) { if ((style & SWT.VERTICAL) != 0) { RECT rect = new RECT (); TBBUTTON lpButton = new TBBUTTON (); - int count = OS.SendMessage (handle, OS.TB_BUTTONCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.TB_BUTTONCOUNT, 0, 0); for (int i=0; i<count; i++) { OS.SendMessage (handle, OS.TB_GETITEMRECT, i, rect); height = Math.max (height, rect.bottom); @@ -213,7 +213,7 @@ public Point computeSize (int wHint, int hHint, boolean changed) { if (redraw) OS.UpdateWindow (handle); int flags = OS.SWP_NOACTIVATE | OS.SWP_NOMOVE | OS.SWP_NOREDRAW | OS.SWP_NOZORDER; SetWindowPos (handle, 0, 0, 0, newWidth, newHeight, flags); - int count = OS.SendMessage (handle, OS.TB_BUTTONCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.TB_BUTTONCOUNT, 0, 0); if (count != 0) { RECT rect = new RECT (); OS.SendMessage (handle, OS.TB_GETITEMRECT, count - 1, rect); @@ -283,7 +283,7 @@ void createHandle () { * bar currently sets this value to 300 so it is not * necessary to set TTM_SETMAXTIPWIDTH. */ -// int hwndToolTip = OS.SendMessage (handle, OS.TB_GETTOOLTIPS, 0, 0); +// int /*long*/ hwndToolTip = OS.SendMessage (handle, OS.TB_GETTOOLTIPS, 0, 0); // OS.SendMessage (hwndToolTip, OS.TTM_SETMAXTIPWIDTH, 0, 0x7FFF); /* @@ -298,7 +298,7 @@ void createHandle () { * The control will not destroy a font that it did not * create. */ - int hFont = OS.GetStockObject (OS.SYSTEM_FONT); + int /*long*/ hFont = OS.GetStockObject (OS.SYSTEM_FONT); OS.SendMessage (handle, OS.WM_SETFONT, hFont, 0); /* Set the button struct, bitmap and button sizes */ @@ -313,7 +313,7 @@ void createHandle () { } void createItem (ToolItem item, int index) { - int count = OS.SendMessage (handle, OS.TB_BUTTONCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.TB_BUTTONCOUNT, 0, 0); if (!(0 <= index && index <= count)) error (SWT.ERROR_INVALID_RANGE); int id = 0; while (id < items.length && items [id] != null) id++; @@ -364,7 +364,7 @@ void destroyItem (ToolItem item) { TBBUTTONINFO info = new TBBUTTONINFO (); info.cbSize = TBBUTTONINFO.sizeof; info.dwMask = OS.TBIF_IMAGE | OS.TBIF_STYLE; - int index = OS.SendMessage (handle, OS.TB_GETBUTTONINFO, item.id, info); + int index = (int)/*64*/OS.SendMessage (handle, OS.TB_GETBUTTONINFO, item.id, info); /* * Feature in Windows. For some reason, a tool item that has * the style BTNS_SEP does not return I_IMAGENONE when queried @@ -384,7 +384,7 @@ void destroyItem (ToolItem item) { if (item.id == lastFocusId) lastFocusId = -1; items [item.id] = null; item.id = -1; - int count = OS.SendMessage (handle, OS.TB_BUTTONCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.TB_BUTTONCOUNT, 0, 0); if (count == 0) { if (imageList != null) { OS.SendMessage (handle, OS.TB_SETIMAGELIST, 0, 0); @@ -458,10 +458,10 @@ ImageList getImageList () { */ public ToolItem getItem (int index) { checkWidget (); - int count = OS.SendMessage (handle, OS.TB_BUTTONCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.TB_BUTTONCOUNT, 0, 0); if (!(0 <= index && index < count)) error (SWT.ERROR_INVALID_RANGE); TBBUTTON lpButton = new TBBUTTON (); - int result = OS.SendMessage (handle, OS.TB_GETBUTTON, index, lpButton); + int /*long*/ result = OS.SendMessage (handle, OS.TB_GETBUTTON, index, lpButton); if (result == 0) error (SWT.ERROR_CANNOT_GET_ITEM); return items [lpButton.idCommand]; } @@ -505,7 +505,7 @@ public ToolItem getItem (Point point) { */ public int getItemCount () { checkWidget (); - return OS.SendMessage (handle, OS.TB_BUTTONCOUNT, 0, 0); + return (int)/*64*/OS.SendMessage (handle, OS.TB_BUTTONCOUNT, 0, 0); } /** @@ -526,7 +526,7 @@ public int getItemCount () { */ public ToolItem [] getItems () { checkWidget (); - int count = OS.SendMessage (handle, OS.TB_BUTTONCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.TB_BUTTONCOUNT, 0, 0); TBBUTTON lpButton = new TBBUTTON (); ToolItem [] result = new ToolItem [count]; for (int i=0; i<count; i++) { @@ -552,9 +552,9 @@ public ToolItem [] getItems () { public int getRowCount () { checkWidget (); if ((style & SWT.VERTICAL) != 0) { - return OS.SendMessage (handle, OS.TB_BUTTONCOUNT, 0, 0); + return (int)/*64*/OS.SendMessage (handle, OS.TB_BUTTONCOUNT, 0, 0); } - return OS.SendMessage (handle, OS.TB_GETROWS, 0, 0); + return (int)/*64*/OS.SendMessage (handle, OS.TB_GETROWS, 0, 0); } /** @@ -579,7 +579,7 @@ public int indexOf (ToolItem item) { checkWidget (); if (item == null) error (SWT.ERROR_NULL_ARGUMENT); if (item.isDisposed()) error(SWT.ERROR_INVALID_ARGUMENT); - return OS.SendMessage (handle, OS.TB_COMMANDTOINDEX, item.id, 0); + return (int)/*64*/OS.SendMessage (handle, OS.TB_COMMANDTOINDEX, item.id, 0); } void layoutItems () { @@ -622,7 +622,7 @@ void layoutItems () { * the tool items. The fix is to use WM_SETFONT to force * the tool bar to redraw and lay out. */ - int hFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); + int /*long*/ hFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); OS.SendMessage (handle, OS.WM_SETFONT, hFont, 0); setDropDownItems (true); } @@ -642,7 +642,7 @@ void layoutItems () { TBBUTTONINFO info = new TBBUTTONINFO (); info.cbSize = TBBUTTONINFO.sizeof; info.dwMask = OS.TBIF_SIZE; - int size = OS.SendMessage (handle, OS.TB_GETBUTTONSIZE, 0, 0); + int /*long*/ size = OS.SendMessage (handle, OS.TB_GETBUTTONSIZE, 0, 0); info.cx = (short) OS.LOWORD (size); int index = 0; while (index < items.length) { @@ -651,7 +651,7 @@ void layoutItems () { index++; } if (index < items.length) { - int padding = OS.SendMessage (handle, OS.TB_GETPADDING, 0, 0); + int /*long*/ padding = OS.SendMessage (handle, OS.TB_GETPADDING, 0, 0); info.cx += OS.LOWORD (padding) * 2; } for (int i=0; i<items.length; i++) { @@ -674,7 +674,7 @@ boolean mnemonicHit (char ch) { return false; } if ((style & SWT.FLAT) != 0 && !setTabGroupFocus ()) return false; - int index = OS.SendMessage (handle, OS.TB_COMMANDTOINDEX, id [0], 0); + int index = (int)/*64*/OS.SendMessage (handle, OS.TB_COMMANDTOINDEX, id [0], 0); if (index == -1) return false; OS.SendMessage (handle, OS.TB_SETHOTITEM, index, 0); items [id [0]].click (false); @@ -693,7 +693,7 @@ boolean mnemonicMatch (char ch) { * undocumented and unwanted. The fix is to ensure that the tool item * contains a mnemonic when TB_MAPACCELERATOR returns true. */ - int index = OS.SendMessage (handle, OS.TB_COMMANDTOINDEX, id [0], 0); + int index = (int)/*64*/OS.SendMessage (handle, OS.TB_COMMANDTOINDEX, id [0], 0); if (index == -1) return false; return findMnemonic (items [id [0]].text) != '\0'; } @@ -738,7 +738,7 @@ void removeControl (Control control) { } } -void setBackgroundImage (int hBitmap) { +void setBackgroundImage (int /*long*/ hBitmap) { super.setBackgroundImage (hBitmap); setBackgroundTransparent (hBitmap != 0); } @@ -842,7 +842,7 @@ void setDropDownItems (boolean set) { void setDisabledImageList (ImageList imageList) { if (disabledImageList == imageList) return; - int hImageList = 0; + int /*long*/ hImageList = 0; if ((disabledImageList = imageList) != null) { hImageList = disabledImageList.getHandle (); } @@ -878,7 +878,7 @@ public void setFont (Font font) { void setHotImageList (ImageList imageList) { if (hotImageList == imageList) return; - int hImageList = 0; + int /*long*/ hImageList = 0; if ((hotImageList = imageList) != null) { hImageList = hotImageList.getHandle (); } @@ -889,7 +889,7 @@ void setHotImageList (ImageList imageList) { void setImageList (ImageList imageList) { if (this.imageList == imageList) return; - int hImageList = 0; + int /*long*/ hImageList = 0; if ((this.imageList = imageList) != null) { hImageList = imageList.getHandle (); } @@ -972,8 +972,8 @@ String toolTipText (NMTTDISPINFO hdr) { * provide the string, causing no tool tip to be displayed. */ if (!hasCursor ()) return ""; //$NON-NLS-1$ - int index = hdr.idFrom; - int hwndToolTip = OS.SendMessage (handle, OS.TB_GETTOOLTIPS, 0, 0); + int index = (int)/*64*/hdr.idFrom; + int /*long*/ hwndToolTip = OS.SendMessage (handle, OS.TB_GETTOOLTIPS, 0, 0); if (hwndToolTip == hdr.hwndFrom) { if (toolTipText != null) return ""; //$NON-NLS-1$ if (0 <= index && index < items.length) { @@ -1013,11 +1013,11 @@ TCHAR windowClass () { return ToolBarClass; } -int windowProc () { +int /*long*/ windowProc () { return ToolBarProc; } -LRESULT WM_CAPTURECHANGED (int wParam, int lParam) { +LRESULT WM_CAPTURECHANGED (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_CAPTURECHANGED (wParam, lParam); if (result != null) return result; /* @@ -1028,7 +1028,7 @@ LRESULT WM_CAPTURECHANGED (int wParam, int lParam) { for (int i=0; i<items.length; i++) { ToolItem item = items [i]; if (item != null) { - int fsState = OS.SendMessage (handle, OS.TB_GETSTATE, item.id, 0); + int fsState = (int)/*64*/OS.SendMessage (handle, OS.TB_GETSTATE, item.id, 0); if ((fsState & OS.TBSTATE_PRESSED) != 0) { fsState &= ~OS.TBSTATE_PRESSED; OS.SendMessage (handle, OS.TB_SETSTATE, item.id, fsState); @@ -1038,15 +1038,15 @@ LRESULT WM_CAPTURECHANGED (int wParam, int lParam) { return result; } -LRESULT WM_CHAR (int wParam, int lParam) { +LRESULT WM_CHAR (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_CHAR (wParam, lParam); if (result != null) return result; - switch (wParam) { + switch ((int)/*64*/wParam) { case ' ': - int index = OS.SendMessage (handle, OS.TB_GETHOTITEM, 0, 0); + int index = (int)/*64*/OS.SendMessage (handle, OS.TB_GETHOTITEM, 0, 0); if (index != -1) { TBBUTTON lpButton = new TBBUTTON (); - int code = OS.SendMessage (handle, OS.TB_GETBUTTON, index, lpButton); + int /*long*/ code = OS.SendMessage (handle, OS.TB_GETBUTTON, index, lpButton); if (code != 0) { items [lpButton.idCommand].click (false); return LRESULT.ZERO; @@ -1056,7 +1056,7 @@ LRESULT WM_CHAR (int wParam, int lParam) { return result; } -LRESULT WM_COMMAND (int wParam, int lParam) { +LRESULT WM_COMMAND (int /*long*/ wParam, int /*long*/ lParam) { /* * Feature in Windows. When the toolbar window * proc processes WM_COMMAND, it forwards this @@ -1080,7 +1080,7 @@ LRESULT WM_COMMAND (int wParam, int lParam) { return LRESULT.ZERO; } -LRESULT WM_ERASEBKGND (int wParam, int lParam) { +LRESULT WM_ERASEBKGND (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_ERASEBKGND (wParam, lParam); /* * Bug in Windows. For some reason, NM_CUSTOMDRAW with @@ -1097,7 +1097,7 @@ LRESULT WM_ERASEBKGND (int wParam, int lParam) { return result; } -LRESULT WM_GETDLGCODE (int wParam, int lParam) { +LRESULT WM_GETDLGCODE (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_GETDLGCODE (wParam, lParam); /* * Return DLGC_BUTTON so that mnemonics will be @@ -1108,10 +1108,10 @@ LRESULT WM_GETDLGCODE (int wParam, int lParam) { return new LRESULT (OS.DLGC_BUTTON); } -LRESULT WM_KEYDOWN (int wParam, int lParam) { +LRESULT WM_KEYDOWN (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_KEYDOWN (wParam, lParam); if (result != null) return result; - switch (wParam) { + switch ((int)/*64*/wParam) { case OS.VK_SPACE: /* * Ensure that the window proc does not process VK_SPACE @@ -1123,25 +1123,25 @@ LRESULT WM_KEYDOWN (int wParam, int lParam) { return result; } -LRESULT WM_KILLFOCUS (int wParam, int lParam) { - int index = OS.SendMessage (handle, OS.TB_GETHOTITEM, 0, 0); +LRESULT WM_KILLFOCUS (int /*long*/ wParam, int /*long*/ lParam) { + int index = (int)/*64*/OS.SendMessage (handle, OS.TB_GETHOTITEM, 0, 0); TBBUTTON lpButton = new TBBUTTON (); - int code = OS.SendMessage (handle, OS.TB_GETBUTTON, index, lpButton); + int /*long*/ code = OS.SendMessage (handle, OS.TB_GETBUTTON, index, lpButton); if (code != 0) lastFocusId = lpButton.idCommand; return super.WM_KILLFOCUS (wParam, lParam); } -LRESULT WM_LBUTTONDOWN (int wParam, int lParam) { +LRESULT WM_LBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) { if (ignoreMouse) return null; return super.WM_LBUTTONDOWN (wParam, lParam); } -LRESULT WM_LBUTTONUP (int wParam, int lParam) { +LRESULT WM_LBUTTONUP (int /*long*/ wParam, int /*long*/ lParam) { if (ignoreMouse) return null; return super.WM_LBUTTONUP (wParam, lParam); } -LRESULT WM_MOUSELEAVE (int wParam, int lParam) { +LRESULT WM_MOUSELEAVE (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_MOUSELEAVE (wParam, lParam); if (result != null) return result; /* @@ -1158,7 +1158,7 @@ LRESULT WM_MOUSELEAVE (int wParam, int lParam) { if (OS.COMCTL32_MAJOR >= 6) { TOOLINFO lpti = new TOOLINFO (); lpti.cbSize = TOOLINFO.sizeof; - int hwndToolTip = OS.SendMessage (handle, OS.TB_GETTOOLTIPS, 0, 0); + int /*long*/ hwndToolTip = OS.SendMessage (handle, OS.TB_GETTOOLTIPS, 0, 0); if (OS.SendMessage (hwndToolTip, OS.TTM_GETCURRENTTOOL, 0, lpti) != 0) { if ((lpti.uFlags & OS.TTF_IDISHWND) == 0) { OS.SendMessage (hwndToolTip, OS.TTM_DELTOOL, 0, lpti); @@ -1169,7 +1169,7 @@ LRESULT WM_MOUSELEAVE (int wParam, int lParam) { return result; } -LRESULT WM_NOTIFY (int wParam, int lParam) { +LRESULT WM_NOTIFY (int /*long*/ wParam, int /*long*/ lParam) { /* * Feature in Windows. When the toolbar window * proc processes WM_NOTIFY, it forwards this @@ -1193,18 +1193,18 @@ LRESULT WM_NOTIFY (int wParam, int lParam) { return LRESULT.ZERO; } -LRESULT WM_SETFOCUS (int wParam, int lParam) { +LRESULT WM_SETFOCUS (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_SETFOCUS (wParam, lParam); if (lastFocusId != -1 && handle == OS.GetFocus ()) { - int index = OS.SendMessage (handle, OS.TB_COMMANDTOINDEX, lastFocusId, 0); + int index = (int)/*64*/OS.SendMessage (handle, OS.TB_COMMANDTOINDEX, lastFocusId, 0); OS.SendMessage (handle, OS.TB_SETHOTITEM, index, 0); } return result; } -LRESULT WM_SIZE (int wParam, int lParam) { +LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) { if (ignoreResize) { - int code = callWindowProc (handle, OS.WM_SIZE, wParam, lParam); + int /*long*/ code = callWindowProc (handle, OS.WM_SIZE, wParam, lParam); if (code == 0) return LRESULT.ZERO; return new LRESULT (code); } @@ -1225,14 +1225,14 @@ LRESULT WM_SIZE (int wParam, int lParam) { OS.GetWindowRect (handle, windowRect); int index = 0, border = getBorderWidth () * 2; RECT rect = new RECT (); - int count = OS.SendMessage (handle, OS.TB_BUTTONCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.TB_BUTTONCOUNT, 0, 0); while (index < count) { OS.SendMessage (handle, OS.TB_GETITEMRECT, index, rect); OS.MapWindowPoints (handle, 0, rect, 2); if (rect.right > windowRect.right - border * 2) break; index++; } - int bits = OS.SendMessage (handle, OS.TB_GETEXTENDEDSTYLE, 0, 0); + int bits = (int)/*64*/OS.SendMessage (handle, OS.TB_GETEXTENDEDSTYLE, 0, 0); if (index == count) { bits |= OS.TBSTYLE_EX_HIDECLIPPEDBUTTONS; } else { @@ -1244,7 +1244,7 @@ LRESULT WM_SIZE (int wParam, int lParam) { return result; } -LRESULT WM_WINDOWPOSCHANGING (int wParam, int lParam) { +LRESULT WM_WINDOWPOSCHANGING (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_WINDOWPOSCHANGING (wParam, lParam); if (result != null) return result; if (ignoreResize) return result; @@ -1286,13 +1286,13 @@ LRESULT WM_WINDOWPOSCHANGING (int wParam, int lParam) { return result; } -LRESULT wmCommandChild (int wParam, int lParam) { +LRESULT wmCommandChild (int /*long*/ wParam, int /*long*/ lParam) { ToolItem child = items [OS.LOWORD (wParam)]; if (child == null) return null; return child.wmCommandChild (wParam, lParam); } -LRESULT wmNotifyChild (NMHDR hdr, int wParam, int lParam) { +LRESULT wmNotifyChild (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) { switch (hdr.code) { case OS.TBN_DROPDOWN: NMTOOLBAR lpnmtb = new NMTOOLBAR (); @@ -1301,7 +1301,7 @@ LRESULT wmNotifyChild (NMHDR hdr, int wParam, int lParam) { if (child != null) { Event event = new Event (); event.detail = SWT.ARROW; - int index = OS.SendMessage (handle, OS.TB_COMMANDTOINDEX, lpnmtb.iItem, 0); + int index = (int)/*64*/OS.SendMessage (handle, OS.TB_COMMANDTOINDEX, lpnmtb.iItem, 0); RECT rect = new RECT (); OS.SendMessage (handle, OS.TB_GETITEMRECT, index, rect); event.x = rect.left; @@ -1349,7 +1349,7 @@ LRESULT wmNotifyChild (NMHDR hdr, int wParam, int lParam) { case OS.HICF_ARROWKEYS: RECT client = new RECT (); OS.GetClientRect (handle, client); - int index = OS.SendMessage (handle, OS.TB_COMMANDTOINDEX, lpnmhi.idNew, 0); + int index = (int)/*64*/OS.SendMessage (handle, OS.TB_COMMANDTOINDEX, lpnmhi.idNew, 0); RECT rect = new RECT (); OS.SendMessage (handle, OS.TB_GETITEMRECT, index, rect); if (rect.right > client.right || rect.bottom > client.bottom) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolItem.java index f80579d9c3..7276b32709 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolItem.java @@ -165,12 +165,12 @@ protected void checkSubclass () { } void click (boolean dropDown) { - int hwnd = parent.handle; + int /*long*/ hwnd = parent.handle; if (OS.GetKeyState (OS.VK_LBUTTON) < 0) return; - int index = OS.SendMessage (hwnd, OS.TB_COMMANDTOINDEX, id, 0); + int index = (int)/*64*/OS.SendMessage (hwnd, OS.TB_COMMANDTOINDEX, id, 0); RECT rect = new RECT (); OS.SendMessage (hwnd, OS.TB_GETITEMRECT, index, rect); - int hotIndex = OS.SendMessage (hwnd, OS.TB_GETHOTITEM, 0, 0); + int hotIndex = (int)/*64*/OS.SendMessage (hwnd, OS.TB_GETHOTITEM, 0, 0); /* * In order to emulate all the processing that @@ -180,7 +180,7 @@ void click (boolean dropDown) { * properly. */ int y = rect.top + (rect.bottom - rect.top) / 2; - int lParam = OS.MAKELPARAM (dropDown ? rect.right - 1 : rect.left, y); + int /*long*/ lParam = OS.MAKELPARAM (dropDown ? rect.right - 1 : rect.left, y); parent.ignoreMouse = true; OS.SendMessage (hwnd, OS.WM_LBUTTONDOWN, 0, lParam); OS.SendMessage (hwnd, OS.WM_LBUTTONUP, 0, lParam); @@ -209,8 +209,8 @@ void destroyWidget () { */ public Rectangle getBounds () { checkWidget(); - int hwnd = parent.handle; - int index = OS.SendMessage (hwnd, OS.TB_COMMANDTOINDEX, id, 0); + int /*long*/ hwnd = parent.handle; + int index = (int)/*64*/OS.SendMessage (hwnd, OS.TB_COMMANDTOINDEX, id, 0); RECT rect = new RECT (); OS.SendMessage (hwnd, OS.TB_GETITEMRECT, index, rect); int width = rect.right - rect.left; @@ -273,8 +273,8 @@ public boolean getEnabled () { if ((style & SWT.SEPARATOR) != 0) { return (state & DISABLED) == 0; } - int hwnd = parent.handle; - int fsState = OS.SendMessage (hwnd, OS.TB_GETSTATE, id, 0); + int /*long*/ hwnd = parent.handle; + int /*long*/ fsState = OS.SendMessage (hwnd, OS.TB_GETSTATE, id, 0); return (fsState & OS.TBSTATE_ENABLED) != 0; } @@ -332,8 +332,8 @@ public ToolBar getParent () { public boolean getSelection () { checkWidget(); if ((style & (SWT.CHECK | SWT.RADIO)) == 0) return false; - int hwnd = parent.handle; - int fsState = OS.SendMessage (hwnd, OS.TB_GETSTATE, id, 0); + int /*long*/ hwnd = parent.handle; + int /*long*/ fsState = OS.SendMessage (hwnd, OS.TB_GETSTATE, id, 0); return (fsState & OS.TBSTATE_CHECKED) != 0; } @@ -364,8 +364,8 @@ public String getToolTipText () { */ public int getWidth () { checkWidget(); - int hwnd = parent.handle; - int index = OS.SendMessage (hwnd, OS.TB_COMMANDTOINDEX, id, 0); + int /*long*/ hwnd = parent.handle; + int index = (int)/*64*/OS.SendMessage (hwnd, OS.TB_COMMANDTOINDEX, id, 0); RECT rect = new RECT (); OS.SendMessage (hwnd, OS.TB_GETITEMRECT, index, rect); return rect.right - rect.left; @@ -411,7 +411,7 @@ void releaseImages () { TBBUTTONINFO info = new TBBUTTONINFO (); info.cbSize = TBBUTTONINFO.sizeof; info.dwMask = OS.TBIF_IMAGE | OS.TBIF_STYLE; - int hwnd = parent.handle; + int /*long*/ hwnd = parent.handle; OS.SendMessage (hwnd, OS.TB_GETBUTTONINFO, id, info); /* * Feature in Windows. For some reason, a tool item that has @@ -527,7 +527,7 @@ public void setControl (Control control) { */ if ((parent.style & (SWT.WRAP | SWT.VERTICAL)) != 0) { boolean changed = false; - int hwnd = parent.handle; + int /*long*/ hwnd = parent.handle; TBBUTTONINFO info = new TBBUTTONINFO (); info.cbSize = TBBUTTONINFO.sizeof; info.dwMask = OS.TBIF_STYLE | OS.TBIF_STATE; @@ -590,8 +590,8 @@ public void setControl (Control control) { */ public void setEnabled (boolean enabled) { checkWidget(); - int hwnd = parent.handle; - int fsState = OS.SendMessage (hwnd, OS.TB_GETSTATE, id, 0); + int /*long*/ hwnd = parent.handle; + int fsState = (int)/*64*/OS.SendMessage (hwnd, OS.TB_GETSTATE, id, 0); /* * Feature in Windows. When TB_SETSTATE is used to set the * state of a tool item, the item redraws even when the state @@ -697,8 +697,8 @@ boolean setRadioSelection (boolean value) { public void setSelection (boolean selected) { checkWidget(); if ((style & (SWT.CHECK | SWT.RADIO)) == 0) return; - int hwnd = parent.handle; - int fsState = OS.SendMessage (hwnd, OS.TB_GETSTATE, id, 0); + int /*long*/ hwnd = parent.handle; + int fsState = (int)/*64*/OS.SendMessage (hwnd, OS.TB_GETSTATE, id, 0); /* * Feature in Windows. When TB_SETSTATE is used to set the * state of a tool item, the item redraws even when the state @@ -761,12 +761,12 @@ public void setText (String string) { if ((style & SWT.SEPARATOR) != 0) return; if (string.equals (text)) return; super.setText (string); - int hwnd = parent.handle; + int /*long*/ hwnd = parent.handle; TBBUTTONINFO info = new TBBUTTONINFO (); info.cbSize = TBBUTTONINFO.sizeof; info.dwMask = OS.TBIF_TEXT | OS.TBIF_STYLE; info.fsStyle = (byte) (widgetStyle () | OS.BTNS_AUTOSIZE); - int hHeap = OS.GetProcessHeap (), pszText = 0; + int /*long*/ hHeap = OS.GetProcessHeap (), pszText = 0; if (string.length () != 0) { info.fsStyle |= OS.BTNS_SHOWTEXT; TCHAR buffer = new TCHAR (parent.getCodePage (), string, true); @@ -787,7 +787,7 @@ public void setText (String string) { * the tool bar to redraw and layout. */ parent.setDropDownItems (false); - int hFont = OS.SendMessage (hwnd, OS.WM_GETFONT, 0, 0); + int /*long*/ hFont = OS.SendMessage (hwnd, OS.WM_GETFONT, 0, 0); OS.SendMessage (hwnd, OS.WM_SETFONT, hFont, 0); parent.setDropDownItems (true); parent.layoutItems (); @@ -823,7 +823,7 @@ public void setWidth (int width) { checkWidget(); if ((style & SWT.SEPARATOR) == 0) return; if (width < 0) return; - int hwnd = parent.handle; + int /*long*/ hwnd = parent.handle; TBBUTTONINFO info = new TBBUTTONINFO (); info.cbSize = TBBUTTONINFO.sizeof; info.dwMask = OS.TBIF_SIZE; @@ -834,7 +834,7 @@ public void setWidth (int width) { void updateImages (boolean enabled) { if ((style & SWT.SEPARATOR) != 0) return; - int hwnd = parent.handle; + int /*long*/ hwnd = parent.handle; TBBUTTONINFO info = new TBBUTTONINFO (); info.cbSize = TBBUTTONINFO.sizeof; info.dwMask = OS.TBIF_IMAGE; @@ -943,7 +943,7 @@ int widgetStyle () { return OS.BTNS_BUTTON; } -LRESULT wmCommandChild (int wParam, int lParam) { +LRESULT wmCommandChild (int /*long*/ wParam, int /*long*/ lParam) { if ((style & SWT.RADIO) != 0) { if ((parent.getStyle () & SWT.NO_RADIO_GROUP) == 0) { selectRadio (); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolTip.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolTip.java index fc1f0db49b..7551cba125 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolTip.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolTip.java @@ -210,7 +210,7 @@ public boolean getVisible () { checkWidget(); if (OS.IsWinCE) return false; if (item != null) return visible; - int hwndToolTip = hwndToolTip (); + int /*long*/ hwndToolTip = hwndToolTip (); if (OS.SendMessage (hwndToolTip, OS.TTM_GETCURRENTTOOL, 0, 0) != 0) { TOOLINFO lpti = new TOOLINFO (); lpti.cbSize = TOOLINFO.sizeof; @@ -221,7 +221,7 @@ public boolean getVisible () { return false; } -int hwndToolTip () { +int /*long*/ hwndToolTip () { return (style & SWT.BALLOON) != 0 ? parent.balloonTipHandle () : parent.toolTipHandle (); } @@ -256,7 +256,7 @@ void releaseWidget () { super.releaseWidget (); if (item == null) { if (autoHide) { - int hwndToolTip = hwndToolTip (); + int /*long*/ hwndToolTip = hwndToolTip (); if (OS.SendMessage (hwndToolTip, OS.TTM_GETCURRENTTOOL, 0, 0) != 0) { TOOLINFO lpti = new TOOLINFO (); lpti.cbSize = TOOLINFO.sizeof; @@ -438,12 +438,12 @@ public void setVisible (boolean visible) { if (OS.IsWinCE) return; if (visible == getVisible ()) return; if (item == null) { - int hwnd = parent.handle; + int /*long*/ hwnd = parent.handle; TOOLINFO lpti = new TOOLINFO (); lpti.cbSize = TOOLINFO.sizeof; lpti.uId = id; lpti.hwnd = hwnd; - int hwndToolTip = hwndToolTip (); + int /*long*/ hwndToolTip = hwndToolTip (); Shell shell = parent.getShell (); if (text.length () != 0) { int icon = OS.TTI_NONE; @@ -460,7 +460,7 @@ public void setVisible (boolean visible) { OS.SystemParametersInfo (OS.SPI_GETWORKAREA, 0, rect, 0); maxWidth = (rect.right - rect.left) / 4; } else { - int hmonitor = OS.MonitorFromWindow (hwnd, OS.MONITOR_DEFAULTTONEAREST); + int /*long*/ hmonitor = OS.MonitorFromWindow (hwnd, OS.MONITOR_DEFAULTTONEAREST); MONITORINFO lpmi = new MONITORINFO (); lpmi.cbSize = MONITORINFO.sizeof; OS.GetMonitorInfo (hmonitor, lpmi); @@ -476,7 +476,7 @@ public void setVisible (boolean visible) { nY = pt.y; } } - int lParam = OS.MAKELPARAM (nX, nY); + int /*long*/ lParam = OS.MAKELPARAM (nX, nY); OS.SendMessage (hwndToolTip, OS.TTM_TRACKPOSITION, 0, lParam); /* @@ -492,7 +492,7 @@ public void setVisible (boolean visible) { OS.GetClientRect (hwnd, rect); OS.MapWindowPoints (hwnd, 0, rect, 2); if (!OS.PtInRect (rect, pt)) { - int hCursor = OS.GetCursor (); + int /*long*/ hCursor = OS.GetCursor (); OS.SetCursor (0); OS.SetCursorPos (rect.left, rect.top); OS.SendMessage (hwndToolTip, OS.TTM_TRACKACTIVATE, 1, lpti); @@ -502,7 +502,7 @@ public void setVisible (boolean visible) { OS.SendMessage (hwndToolTip, OS.TTM_TRACKACTIVATE, 1, lpti); } - int time = OS.SendMessage (hwndToolTip, OS.TTM_GETDELAYTIME, OS.TTDT_AUTOPOP, 0); + int time = (int)/*64*/OS.SendMessage (hwndToolTip, OS.TTM_GETDELAYTIME, OS.TTDT_AUTOPOP, 0); OS.SetTimer (hwndToolTip, TIMER_ID, time, 0); } else { OS.SendMessage (hwndToolTip, OS.TTM_TRACKACTIVATE, 0, lpti); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tracker.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tracker.java index ae4709daad..1b4da1e80c 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tracker.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tracker.java @@ -41,9 +41,11 @@ public class Tracker extends Widget { boolean tracking, cancelled, stippled; Rectangle [] rectangles = new Rectangle [0], proportions = rectangles; Rectangle bounds; - int resizeCursor, clientCursor, cursorOrientation = SWT.NONE; + int /*long*/ resizeCursor, clientCursor; + int cursorOrientation = SWT.NONE; boolean inEvent = false; - int hwndTransparent, oldProc, oldX, oldY; + int /*long*/ hwndTransparent, oldProc; + int oldX, oldY; /* * The following values mirror step sizes on Windows @@ -237,7 +239,7 @@ Point adjustResizeCursor () { * the appropriate resize cursor. */ if (clientCursor == 0) { - int newCursor = 0; + int /*long*/ newCursor = 0; switch (cursorOrientation) { case SWT.UP: newCursor = OS.LoadCursor (0, OS.IDC_SIZENS); @@ -359,10 +361,10 @@ void drawRectangles (Rectangle [] rects, boolean stippled) { return; } int bandWidth = 1; - int hwndTrack = OS.GetDesktopWindow (); + int /*long*/ hwndTrack = OS.GetDesktopWindow (); if (parent != null) hwndTrack = parent.handle; - int hDC = OS.GetDCEx (hwndTrack, 0, OS.DCX_CACHE); - int hBitmap = 0, hBrush = 0, oldBrush = 0; + int /*long*/ hDC = OS.GetDCEx (hwndTrack, 0, OS.DCX_CACHE); + int /*long*/ hBitmap = 0, hBrush = 0, oldBrush = 0; if (stippled) { bandWidth = 3; byte [] bits = {-86, 0, 85, 0, -86, 0, 85, 0, -86, 0, 85, 0, -86, 0, 85, 0}; @@ -489,11 +491,11 @@ public boolean open () { 0, OS.GetModuleHandle (null), null); - oldProc = OS.GetWindowLong (hwndTransparent, OS.GWL_WNDPROC); + oldProc = OS.GetWindowLongPtr (hwndTransparent, OS.GWLP_WNDPROC); newProc = new Callback (this, "transparentProc", 4); //$NON-NLS-1$ - int newProcAddress = newProc.getAddress (); + int /*long*/ newProcAddress = newProc.getAddress (); if (newProcAddress == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS); - OS.SetWindowLong (hwndTransparent, OS.GWL_WNDPROC, newProcAddress); + OS.SetWindowLongPtr (hwndTransparent, OS.GWLP_WNDPROC, newProcAddress); if (isVista) { OS.SetLayeredWindowAttributes (hwndTransparent, 0xFFFFFF, (byte)0xFF, OS.LWA_COLORKEY | OS.LWA_ALPHA); } @@ -815,8 +817,8 @@ public void setStippled (boolean stippled) { this.stippled = stippled; } -int transparentProc (int hwnd, int msg, int wParam, int lParam) { - switch (msg) { +int /*long*/ transparentProc (int /*long*/ hwnd, int /*long*/ msg, int /*long*/ wParam, int /*long*/ lParam) { + switch ((int)/*64*/msg) { /* * We typically do not want to answer that the transparent window is * transparent to hits since doing so negates the effect of having it @@ -842,9 +844,9 @@ int transparentProc (int hwnd, int msg, int wParam, int lParam) { case OS.WM_PAINT: if (parent == null && !OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (6, 0)) { PAINTSTRUCT ps = new PAINTSTRUCT(); - int hDC = OS.BeginPaint (hwnd, ps); - int hBitmap = 0, hBrush = 0, oldBrush = 0; - int transparentBrush = OS.CreateSolidBrush(0xFFFFFF); + int /*long*/ hDC = OS.BeginPaint (hwnd, ps); + int /*long*/ hBitmap = 0, hBrush = 0, oldBrush = 0; + int /*long*/ transparentBrush = OS.CreateSolidBrush(0xFFFFFF); oldBrush = OS.SelectObject (hDC, transparentBrush); OS.PatBlt (hDC, ps.left, ps.top, ps.right - ps.left, ps.bottom - ps.top, OS.PATCOPY); OS.SelectObject (hDC, oldBrush); @@ -877,7 +879,7 @@ int transparentProc (int hwnd, int msg, int wParam, int lParam) { return 0; } } - return OS.CallWindowProc (oldProc, hwnd, msg, wParam, lParam); + return OS.CallWindowProc (oldProc, hwnd, (int)/*64*/msg, wParam, lParam); } void update () { @@ -891,13 +893,13 @@ void update () { } } -LRESULT wmKeyDown (int hwnd, int wParam, int lParam) { +LRESULT wmKeyDown (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.wmKeyDown (hwnd, wParam, lParam); if (result != null) return result; boolean isMirrored = parent != null && (parent.style & SWT.MIRRORED) != 0; int stepSize = OS.GetKeyState (OS.VK_CONTROL) < 0 ? STEPSIZE_SMALL : STEPSIZE_LARGE; int xChange = 0, yChange = 0; - switch (wParam) { + switch ((int)/*64*/wParam) { case OS.VK_ESCAPE: cancelled = true; tracking = false; @@ -1025,7 +1027,7 @@ LRESULT wmKeyDown (int hwnd, int wParam, int lParam) { return result; } -LRESULT wmSysKeyDown (int hwnd, int wParam, int lParam) { +LRESULT wmSysKeyDown (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.wmSysKeyDown (hwnd, wParam, lParam); if (result != null) return result; cancelled = true; @@ -1033,7 +1035,7 @@ LRESULT wmSysKeyDown (int hwnd, int wParam, int lParam) { return result; } -LRESULT wmMouse (int message, int wParam, int lParam) { +LRESULT wmMouse (int message, int /*long*/ wParam, int /*long*/ lParam) { boolean isMirrored = parent != null && (parent.style & SWT.MIRRORED) != 0; int newPos = OS.GetMessagePos (); int newX = OS.GET_X_LPARAM (newPos); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TrayItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TrayItem.java index 0dbd29e70a..4cdd400817 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TrayItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TrayItem.java @@ -223,7 +223,7 @@ public boolean getVisible () { return visible; } -int messageProc (int hwnd, int msg, int wParam, int lParam) { +int /*long*/ messageProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) { /* * Feature in Windows. When the user clicks on the tray * icon, another application may be the foreground window. @@ -235,7 +235,7 @@ int messageProc (int hwnd, int msg, int wParam, int lParam) { * menu is not hidden. The fix is to force the tray icon * message window to the foreground when sending an event. */ - switch (lParam) { + switch ((int)/*64*/lParam) { case OS.WM_LBUTTONDOWN: if (hooks (SWT.Selection)) { OS.SetForegroundWindow (hwnd); @@ -395,7 +395,7 @@ public void setImage (Image image) { super.setImage (image); if (image2 != null) image2.dispose (); image2 = null; - int hIcon = 0; + int /*long*/ hIcon = 0; Image icon = image; if (icon != null) { switch (icon.type) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java index fdf20ba6b4..54f005f489 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java @@ -75,15 +75,18 @@ public class Tree extends Composite { ImageList imageList, headerImageList; TreeItem currentItem; TreeColumn sortColumn; - int hwndParent, hwndHeader, hAnchor, hInsert, lastID, hSelect; - int hFirstIndexOf, hLastIndexOf, lastIndexOf, itemCount, sortDirection; + int /*long*/ hwndParent, hwndHeader, hAnchor, hInsert, hSelect; + int lastID; + int /*long*/ hFirstIndexOf, hLastIndexOf; + int lastIndexOf, itemCount, sortDirection; boolean dragStarted, gestureCompleted, insertAfter, shrink, ignoreShrink; boolean ignoreSelect, ignoreExpand, ignoreDeselect, ignoreResize; boolean lockSelection, oldSelected, newSelected, ignoreColumnMove; boolean linesVisible, customDraw, printClient, painted, ignoreItemHeight; boolean ignoreCustomDraw, ignoreDrawForeground, ignoreDrawBackground, ignoreDrawFocus; boolean ignoreDrawSelection, ignoreDrawHot, ignoreFullSelection, explorerTheme; - int scrollWidth, itemToolTipHandle, headerToolTipHandle, selectionForeground; + int scrollWidth, selectionForeground; + int /*long*/ headerToolTipHandle, itemToolTipHandle; static final int INSET = 3; static final int GRID_WIDTH = 1; static final int SORT_WIDTH = 10; @@ -92,9 +95,9 @@ public class Tree extends Composite { static final int INCREMENT = 5; static final int EXPLORER_EXTRA = 2; static final boolean EXPLORER_THEME = true; - static final int TreeProc; + static final int /*long*/ TreeProc; static final TCHAR TreeClass = new TCHAR (0, OS.WC_TREEVIEW, true); - static final int HeaderProc; + static final int /*long*/ HeaderProc; static final TCHAR HeaderClass = new TCHAR (0, OS.WC_HEADER, true); static { WNDCLASS lpWndClass = new WNDCLASS (); @@ -193,7 +196,7 @@ void _addListener (int eventType, Listener listener) { * scroll bar. The fix is to check for this case and * explicitly hide the scroll bar. */ - int count = OS.SendMessage (handle, OS.TVM_GETCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETCOUNT, 0, 0); if (count != 0 && (bits & OS.TVS_NOHSCROLL) != 0) { if (!OS.IsWinCE) OS.ShowScrollBar (handle, OS.SB_HORZ, false); } @@ -203,7 +206,7 @@ void _addListener (int eventType, Listener listener) { } } -TreeItem _getItem (int hItem) { +TreeItem _getItem (int /*long*/ hItem) { TVITEM tvItem = new TVITEM (); tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_PARAM; tvItem.hItem = hItem; @@ -213,13 +216,15 @@ TreeItem _getItem (int hItem) { return null; } -TreeItem _getItem (int hItem, int id) { +//TODO - should ids be long +TreeItem _getItem (int /*long*/ hItem, int /*long*/ _id) { + int id = (int)/*64*/_id; if ((style & SWT.VIRTUAL) == 0) return items [id]; return id != -1 ? items [id] : new TreeItem (this, SWT.NONE, -1, -1, hItem); } void _setBackgroundPixel (int newPixel) { - int oldPixel = OS.SendMessage (handle, OS.TVM_GETBKCOLOR, 0, 0); + int oldPixel = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETBKCOLOR, 0, 0); if (oldPixel != newPixel) { /* * Bug in Windows. When TVM_SETBKCOLOR is used more @@ -242,7 +247,7 @@ void _setBackgroundPixel (int newPixel) { * animation draws badly. The fix is to clear the effect. */ if (explorerTheme) { - int bits2 = OS.SendMessage (handle, OS.TVM_GETEXTENDEDSTYLE, 0, 0); + int bits2 = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETEXTENDEDSTYLE, 0, 0); if (newPixel == -1 && findImageControl () == null) { bits2 |= OS.TVS_EX_FADEINOUTEXPANDOS; } else { @@ -318,14 +323,14 @@ public void addTreeListener(TreeListener listener) { addListener (SWT.Collapse, typedListener); } -int borderHandle () { +int /*long*/ borderHandle () { return hwndParent != 0 ? hwndParent : handle; } -LRESULT CDDS_ITEMPOSTPAINT (NMTVCUSTOMDRAW nmcd, int wParam, int lParam) { +LRESULT CDDS_ITEMPOSTPAINT (NMTVCUSTOMDRAW nmcd, int /*long*/ wParam, int /*long*/ lParam) { if (ignoreCustomDraw) return null; if (nmcd.left == nmcd.right) return new LRESULT (OS.CDRF_DODEFAULT); - int hDC = nmcd.hdc; + int /*long*/ hDC = nmcd.hdc; OS.RestoreDC (hDC, -1); TreeItem item = getItem (nmcd); @@ -377,7 +382,7 @@ LRESULT CDDS_ITEMPOSTPAINT (NMTVCUSTOMDRAW nmcd, int wParam, int lParam) { OS.GetClientRect (scrolledHandle (), clientRect); if (hwndHeader != 0) { OS.MapWindowPoints (hwndParent, handle, clientRect, 2); - count = OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); + count = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); if (count != 0) { order = new int [count]; OS.SendMessage (hwndHeader, OS.HDM_GETORDERARRAY, count, order); @@ -442,7 +447,7 @@ LRESULT CDDS_ITEMPOSTPAINT (NMTVCUSTOMDRAW nmcd, int wParam, int lParam) { } } draw = false; - int hTheme = OS.OpenThemeData (handle, Display.TREEVIEW); + int /*long*/ hTheme = OS.OpenThemeData (handle, Display.TREEVIEW); int iStateId = selected ? OS.TREIS_SELECTED : OS.TREIS_HOT; if (OS.GetFocus () != handle && selected && !hot) iStateId = OS.TREIS_SELECTEDNOTFOCUS; OS.DrawThemeBackground (hTheme, hDC, OS.TVP_TREEITEM, iStateId, pRect, pClipRect); @@ -459,7 +464,7 @@ LRESULT CDDS_ITEMPOSTPAINT (NMTVCUSTOMDRAW nmcd, int wParam, int lParam) { pRect.right += EXPLORER_EXTRA; pClipRect.left -= EXPLORER_EXTRA; pClipRect.right += EXPLORER_EXTRA; - int hTheme = OS.OpenThemeData (handle, Display.TREEVIEW); + int /*long*/ hTheme = OS.OpenThemeData (handle, Display.TREEVIEW); int iStateId = selected ? OS.TREIS_SELECTED : OS.TREIS_HOT; if (OS.GetFocus () != handle && selected && !hot) iStateId = OS.TREIS_SELECTEDNOTFOCUS; OS.DrawThemeBackground (hTheme, hDC, OS.TVP_TREEITEM, iStateId, pRect, pClipRect); @@ -528,7 +533,7 @@ LRESULT CDDS_ITEMPOSTPAINT (NMTVCUSTOMDRAW nmcd, int wParam, int lParam) { backgroundRect = rect; } int clrText = -1, clrTextBk = -1; - int hFont = item.cellFont != null ? item.cellFont [index] : -1; + int /*long*/ hFont = item.cellFont != null ? item.cellFont [index] : -1; if (hFont == -1) hFont = item.font; if (selectionForeground != -1) clrText = selectionForeground; if (OS.IsWindowEnabled (handle)) { @@ -605,7 +610,7 @@ LRESULT CDDS_ITEMPOSTPAINT (NMTVCUSTOMDRAW nmcd, int wParam, int lParam) { if (clrTextBk != -1) data.background = clrTextBk; } data.hFont = hFont; - data.uiState = OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); + data.uiState = (int)/*64*/OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); GC gc = GC.win32_new (hDC, data); Event event = new Event (); event.item = item; @@ -620,7 +625,7 @@ LRESULT CDDS_ITEMPOSTPAINT (NMTVCUSTOMDRAW nmcd, int wParam, int lParam) { //if ((nmcd.uItemState & OS.CDIS_FOCUS) != 0) { if (OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0) == nmcd.dwItemSpec) { if (handle == OS.GetFocus ()) { - int uiState = OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); + int uiState = (int)/*64*/OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); if ((uiState & OS.UISF_HIDEFOCUS) == 0) event.detail |= SWT.FOCUSED; } } @@ -692,7 +697,7 @@ LRESULT CDDS_ITEMPOSTPAINT (NMTVCUSTOMDRAW nmcd, int wParam, int lParam) { backgroundRect = selectionRect; } } - int hTheme = OS.OpenThemeData (handle, Display.TREEVIEW); + int /*long*/ hTheme = OS.OpenThemeData (handle, Display.TREEVIEW); int iStateId = selected ? OS.TREIS_SELECTED : OS.TREIS_HOT; if (OS.GetFocus () != handle && selected && !hot) iStateId = OS.TREIS_SELECTEDNOTFOCUS; OS.DrawThemeBackground (hTheme, hDC, OS.TVP_TREEITEM, iStateId, pRect, backgroundRect); @@ -821,7 +826,7 @@ LRESULT CDDS_ITEMPOSTPAINT (NMTVCUSTOMDRAW nmcd, int wParam, int lParam) { if (clrText != -1) data.foreground = clrText; if (clrTextBk != -1) data.background = clrTextBk; } - data.uiState = OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); + data.uiState = (int)/*64*/OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); GC gc = GC.win32_new (hDC, data); Event event = new Event (); event.item = item; @@ -838,7 +843,7 @@ LRESULT CDDS_ITEMPOSTPAINT (NMTVCUSTOMDRAW nmcd, int wParam, int lParam) { if (OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0) == nmcd.dwItemSpec) { if (i == 0 /*nmcd.iSubItem == 0*/ || (style & SWT.FULL_SELECTION) != 0) { if (handle == OS.GetFocus ()) { - int uiState = OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); + int uiState = (int)/*64*/OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); if ((uiState & OS.UISF_HIDEFOCUS) == 0) event.detail |= SWT.FOCUSED; } } @@ -881,9 +886,9 @@ LRESULT CDDS_ITEMPOSTPAINT (NMTVCUSTOMDRAW nmcd, int wParam, int lParam) { } if (!explorerTheme) { if (handle == OS.GetFocus ()) { - int uiState = OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); + int uiState = (int)/*64*/OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); if ((uiState & OS.UISF_HIDEFOCUS) == 0) { - int hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); + int /*long*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); if (hItem == item.handle) { if (!ignoreDrawFocus && findImageControl () != null) { if ((style & SWT.FULL_SELECTION) != 0) { @@ -904,7 +909,7 @@ LRESULT CDDS_ITEMPOSTPAINT (NMTVCUSTOMDRAW nmcd, int wParam, int lParam) { } OS.DrawFocusRect (hDC, focusRect); } else { - int index = OS.SendMessage (hwndHeader, OS.HDM_ORDERTOINDEX, 0, 0); + int index = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_ORDERTOINDEX, 0, 0); RECT focusRect = item.getBounds (index, true, false, false, false, false, hDC); RECT clipRect = item.getBounds (index, true, false, false, false, true, hDC); OS.IntersectClipRect (hDC, clipRect.left, clipRect.top, clipRect.right, clipRect.bottom); @@ -919,7 +924,7 @@ LRESULT CDDS_ITEMPOSTPAINT (NMTVCUSTOMDRAW nmcd, int wParam, int lParam) { return new LRESULT (OS.CDRF_DODEFAULT); } -LRESULT CDDS_ITEMPREPAINT (NMTVCUSTOMDRAW nmcd, int wParam, int lParam) { +LRESULT CDDS_ITEMPREPAINT (NMTVCUSTOMDRAW nmcd, int /*long*/ wParam, int /*long*/ lParam) { /* * Even when custom draw is being ignored, the font needs * to be selected into the HDC so that the item bounds are @@ -937,9 +942,9 @@ LRESULT CDDS_ITEMPREPAINT (NMTVCUSTOMDRAW nmcd, int wParam, int lParam) { * COMCTL32.DLL, */ if (item == null) return null; - int hDC = nmcd.hdc; - int index = hwndHeader != 0 ? OS.SendMessage (hwndHeader, OS.HDM_ORDERTOINDEX, 0, 0) : 0; - int hFont = item.cellFont != null ? item.cellFont [index] : -1; + int /*long*/ hDC = nmcd.hdc; + int index = hwndHeader != 0 ? (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_ORDERTOINDEX, 0, 0) : 0; + int /*long*/ hFont = item.cellFont != null ? item.cellFont [index] : -1; if (hFont == -1) hFont = item.font; if (hFont != -1) OS.SelectObject (hDC, hFont); if (ignoreCustomDraw || nmcd.left == nmcd.right) { @@ -948,7 +953,7 @@ LRESULT CDDS_ITEMPREPAINT (NMTVCUSTOMDRAW nmcd, int wParam, int lParam) { int count = 0; RECT clipRect = null; if (hwndHeader != 0) { - count = OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); + count = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); if (count != 0) { boolean clip = !printClient; if (!OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (6, 0)) { @@ -1048,7 +1053,7 @@ LRESULT CDDS_ITEMPREPAINT (NMTVCUSTOMDRAW nmcd, int wParam, int lParam) { if (clrText != -1) data.foreground = clrText; if (clrTextBk != -1) data.background = clrTextBk; } - data.uiState = OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); + data.uiState = (int)/*64*/OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); if (hFont != -1) data.hFont = hFont; GC gc = GC.win32_new (hDC, data); Event event = new Event (); @@ -1063,7 +1068,7 @@ LRESULT CDDS_ITEMPREPAINT (NMTVCUSTOMDRAW nmcd, int wParam, int lParam) { //if ((nmcd.uItemState & OS.CDIS_FOCUS) != 0) { if (OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0) == nmcd.dwItemSpec) { if (handle == OS.GetFocus ()) { - int uiState = OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); + int uiState = (int)/*64*/OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); if ((uiState & OS.UISF_HIDEFOCUS) == 0) event.detail |= SWT.FOCUSED; } } @@ -1311,7 +1316,7 @@ LRESULT CDDS_ITEMPREPAINT (NMTVCUSTOMDRAW nmcd, int wParam, int lParam) { } OS.SaveDC (hDC); if (clipRect != null) { - int hRgn = OS.CreateRectRgn (clipRect.left, clipRect.top, clipRect.right, clipRect.bottom); + int /*long*/ hRgn = OS.CreateRectRgn (clipRect.left, clipRect.top, clipRect.right, clipRect.bottom); POINT lpPoint = new POINT (); OS.GetWindowOrgEx (hDC, lpPoint); OS.OffsetRgn (hRgn, -lpPoint.x, -lpPoint.y); @@ -1321,7 +1326,7 @@ LRESULT CDDS_ITEMPREPAINT (NMTVCUSTOMDRAW nmcd, int wParam, int lParam) { return result; } -LRESULT CDDS_POSTPAINT (NMTVCUSTOMDRAW nmcd, int wParam, int lParam) { +LRESULT CDDS_POSTPAINT (NMTVCUSTOMDRAW nmcd, int /*long*/ wParam, int /*long*/ lParam) { if (ignoreCustomDraw) return null; if (OS.IsWindowVisible (handle)) { if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) { @@ -1346,7 +1351,7 @@ LRESULT CDDS_POSTPAINT (NMTVCUSTOMDRAW nmcd, int wParam, int lParam) { * NOTE: This problem only happens on Vista during * WM_NOTIFY with NM_CUSTOMDRAW and CDDS_POSTPAINT. */ - int hItem = 0; + int /*long*/ hItem = 0; if (!OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (6, 0)) { hItem = getBottomItem (); } else { @@ -1370,15 +1375,15 @@ LRESULT CDDS_POSTPAINT (NMTVCUSTOMDRAW nmcd, int wParam, int lParam) { } } if (linesVisible) { - int hDC = nmcd.hdc; + int /*long*/ hDC = nmcd.hdc; if (hwndHeader != 0) { int x = 0; RECT rect = new RECT (); HDITEM hdItem = new HDITEM (); hdItem.mask = OS.HDI_WIDTH; - int count = OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); for (int i=0; i<count; i++) { - int index = OS.SendMessage (hwndHeader, OS.HDM_ORDERTOINDEX, i, 0); + int index = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_ORDERTOINDEX, i, 0); OS.SendMessage (hwndHeader, OS.HDM_GETITEM, index, hdItem); OS.SetRect (rect, x, nmcd.top, x + hdItem.cxy, nmcd.bottom); OS.DrawEdge (hDC, rect, OS.BDR_SUNKENINNER, OS.BF_RIGHT); @@ -1403,7 +1408,7 @@ LRESULT CDDS_POSTPAINT (NMTVCUSTOMDRAW nmcd, int wParam, int lParam) { * NOTE: This problem only happens on Vista during * WM_NOTIFY with NM_CUSTOMDRAW and CDDS_POSTPAINT. */ - int hItem = 0; + int /*long*/ hItem = 0; if (!OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (6, 0)) { hItem = getBottomItem (); } else { @@ -1415,7 +1420,7 @@ LRESULT CDDS_POSTPAINT (NMTVCUSTOMDRAW nmcd, int wParam, int lParam) { } } if (height == 0) { - height = OS.SendMessage (handle, OS.TVM_GETITEMHEIGHT, 0, 0); + height = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETITEMHEIGHT, 0, 0); OS.GetClientRect (handle, rect); OS.SetRect (rect, rect.left, rect.top, rect.right, rect.top + height); OS.DrawEdge (hDC, rect, OS.BDR_SUNKENINNER, OS.BF_BOTTOM); @@ -1430,7 +1435,7 @@ LRESULT CDDS_POSTPAINT (NMTVCUSTOMDRAW nmcd, int wParam, int lParam) { return new LRESULT (OS.CDRF_DODEFAULT); } -LRESULT CDDS_PREPAINT (NMTVCUSTOMDRAW nmcd, int wParam, int lParam) { +LRESULT CDDS_PREPAINT (NMTVCUSTOMDRAW nmcd, int /*long*/ wParam, int /*long*/ lParam) { if (explorerTheme) { if ((OS.IsWindowEnabled (handle) && hooks (SWT.EraseItem)) || findImageControl () != null) { RECT rect = new RECT (); @@ -1441,7 +1446,7 @@ LRESULT CDDS_PREPAINT (NMTVCUSTOMDRAW nmcd, int wParam, int lParam) { return new LRESULT (OS.CDRF_NOTIFYITEMDRAW | OS.CDRF_NOTIFYPOSTPAINT); } -int callWindowProc (int hwnd, int msg, int wParam, int lParam) { +int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) { if (handle == 0) return 0; if (hwndParent != 0 && hwnd == hwndParent) { return OS.DefWindowProc (hwnd, msg, wParam, lParam); @@ -1460,7 +1465,7 @@ int callWindowProc (int hwnd, int msg, int wParam, int lParam) { * only the focus is assigned. */ if ((style & SWT.SINGLE) != 0) break; - int hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); + int /*long*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); if (hItem == 0) { hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_FIRSTVISIBLE, 0); if (hItem != 0) { @@ -1481,7 +1486,7 @@ int callWindowProc (int hwnd, int msg, int wParam, int lParam) { break; } } - int hItem = 0; + int /*long*/ hItem = 0; boolean redraw = false; switch (msg) { /* Keyboard messages */ @@ -1535,7 +1540,7 @@ int callWindowProc (int hwnd, int msg, int wParam, int lParam) { break; } } - int code = OS.CallWindowProc (TreeProc, hwnd, msg, wParam, lParam); + int /*long*/ code = OS.CallWindowProc (TreeProc, hwnd, msg, wParam, lParam); switch (msg) { /* Keyboard messages */ case OS.WM_KEYDOWN: @@ -1609,7 +1614,7 @@ void checkBuffered () { } if (EXPLORER_THEME) { if (!OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (6, 0)) { - int exStyle = OS.SendMessage (handle, OS.TVM_GETEXTENDEDSTYLE, 0, 0); + int exStyle = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETEXTENDEDSTYLE, 0, 0); if ((exStyle & OS.TVS_EX_DOUBLEBUFFER) != 0) style |= SWT.DOUBLE_BUFFERED; } } @@ -1639,11 +1644,11 @@ boolean checkData (TreeItem item, int index, boolean redraw) { return true; } -boolean checkHandle (int hwnd) { +boolean checkHandle (int /*long*/ hwnd) { return hwnd == handle || (hwndParent != 0 && hwnd == hwndParent) || (hwndHeader != 0 && hwnd == hwndHeader); } -boolean checkScroll (int hItem) { +boolean checkScroll (int /*long*/ hItem) { /* * Feature in Windows. If redraw is turned off using WM_SETREDRAW * and a tree item that is not a child of the first root is selected or @@ -1656,8 +1661,8 @@ boolean checkScroll (int hItem) { * callers of this method. */ if (drawCount == 0) return false; - int hRoot = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); - int hParent = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_PARENT, hItem); + int /*long*/ hRoot = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); + int /*long*/ hParent = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_PARENT, hItem); while (hParent != hRoot && hParent != 0) { hParent = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_PARENT, hParent); } @@ -1693,7 +1698,7 @@ protected void checkSubclass () { */ public void clear (int index, boolean all) { checkWidget (); - int hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); + int /*long*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); if (hItem == 0) error (SWT.ERROR_INVALID_RANGE); hItem = findItem (hItem, index); if (hItem == 0) error (SWT.ERROR_INVALID_RANGE); @@ -1706,11 +1711,11 @@ public void clear (int index, boolean all) { } } -void clear (int hItem, TVITEM tvItem) { +void clear (int /*long*/ hItem, TVITEM tvItem) { tvItem.hItem = hItem; TreeItem item = null; if (OS.SendMessage (handle, OS.TVM_GETITEM, 0, tvItem) != 0) { - item = tvItem.lParam != -1 ? items [tvItem.lParam] : null; + item = tvItem.lParam != -1 ? items [(int)/*64*/tvItem.lParam] : null; } if (item != null) { item.clear (); @@ -1739,25 +1744,26 @@ void clear (int hItem, TVITEM tvItem) { */ public void clearAll (boolean all) { checkWidget (); - int hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); + int /*long*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); if (hItem == 0) return; TVITEM tvItem = new TVITEM (); tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_PARAM; clearAll (hItem, tvItem, all); } -void clearAll (int hItem, TVITEM tvItem, boolean all) { +void clearAll (int /*long*/ hItem, TVITEM tvItem, boolean all) { while (hItem != 0) { clear (hItem, tvItem); - int hFirstItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, hItem); + int /*long*/ hFirstItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, hItem); if (all) clearAll (hFirstItem, tvItem, all); hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXT, hItem); } } -int CompareFunc (int lParam1, int lParam2, int lParamSort) { - TreeItem item1 = items [lParam1], item2 = items [lParam2]; - String text1 = item1.getText (lParamSort), text2 = item2.getText (lParamSort); +//TODO - should ids be long +int /*long*/ CompareFunc (int /*long*/ lParam1, int /*long*/ lParam2, int /*long*/ lParamSort) { + TreeItem item1 = items [(int)/*64*/lParam1], item2 = items [(int)/*64*/lParam2]; + String text1 = item1.getText ((int)/*64*/lParamSort), text2 = item2.getText ((int)/*64*/lParamSort); return sortDirection == SWT.UP ? text1.compareTo (text2) : text2.compareTo (text1); } @@ -1767,7 +1773,7 @@ public Point computeSize (int wHint, int hHint, boolean changed) { if (hwndHeader != 0) { HDITEM hdItem = new HDITEM (); hdItem.mask = OS.HDI_WIDTH; - int count = OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); for (int i=0; i<count; i++) { OS.SendMessage (hwndHeader, OS.HDM_GETITEM, i, hdItem); width += hdItem.cxy; @@ -1777,7 +1783,7 @@ public Point computeSize (int wHint, int hHint, boolean changed) { height += rect.bottom - rect.top; } RECT rect = new RECT (); - int hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); + int /*long*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); while (hItem != 0) { if ((style & SWT.VIRTUAL) == 0 && !painted) { TVITEM tvItem = new TVITEM (); @@ -1863,7 +1869,7 @@ void createHandle () { * The control will not destroy a font that it did not * create. */ - int hFont = OS.GetStockObject (OS.SYSTEM_FONT); + int /*long*/ hFont = OS.GetStockObject (OS.SYSTEM_FONT); OS.SendMessage (handle, OS.WM_SETFONT, hFont, 0); } @@ -1893,7 +1899,7 @@ void createHeaderToolTips () { void createItem (TreeColumn column, int index) { if (hwndHeader == 0) createParent (); - int columnCount = OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); + int columnCount = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); if (!(0 <= index && index <= columnCount)) error (SWT.ERROR_INVALID_RANGE); if (columnCount == columns.length) { TreeColumn [] newColumns = new TreeColumn [columns.length + 4]; @@ -1948,8 +1954,8 @@ void createItem (TreeColumn column, int index) { item.cellForeground = temp; } if (item.cellFont != null) { - int [] cellFont = item.cellFont; - int [] temp = new int [columnCount + 1]; + int /*long*/ [] cellFont = item.cellFont; + int /*long*/ [] temp = new int /*long*/ [columnCount + 1]; System.arraycopy (cellFont, 0, temp, 0, index); System.arraycopy (cellFont, index, temp, index + 1, columnCount- index); temp [index] = -1; @@ -1966,8 +1972,8 @@ void createItem (TreeColumn column, int index) { * if is not possible to set the text at a later time. * The fix is to insert the item with an empty string. */ - int hHeap = OS.GetProcessHeap (); - int pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, TCHAR.sizeof); + int /*long*/ hHeap = OS.GetProcessHeap (); + int /*long*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, TCHAR.sizeof); HDITEM hdItem = new HDITEM (); hdItem.mask = OS.HDI_TEXT | OS.HDI_FORMAT; hdItem.pszText = pszText; @@ -1989,7 +1995,7 @@ void createItem (TreeColumn column, int index) { * scroll bar. The fix is to check for this case and * explicitly hide the scroll bar explicitly. */ - int count = OS.SendMessage (handle, OS.TVM_GETCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETCOUNT, 0, 0); if (count != 0) { if (!OS.IsWinCE) OS.ShowScrollBar (handle, OS.SB_HORZ, false); } @@ -2022,7 +2028,7 @@ void createItem (TreeColumn column, int index) { } } -void createItem (TreeItem item, int hParent, int hInsertAfter, int hItem) { +void createItem (TreeItem item, int /*long*/ hParent, int /*long*/ hInsertAfter, int /*long*/ hItem) { int id = -1; if (item != null) { id = lastID < items.length ? lastID : 0; @@ -2047,8 +2053,8 @@ void createItem (TreeItem item, int hParent, int hInsertAfter, int hItem) { } lastID = id + 1; } - int hNewItem = 0; - int hFirstItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, hParent); + int /*long*/ hNewItem = 0; + int /*long*/ hFirstItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, hParent); boolean fixParent = hFirstItem == 0; if (hItem == 0) { TVINSERTSTRUCT tvInsert = new TVINSERTSTRUCT (); @@ -2087,11 +2093,9 @@ void createItem (TreeItem item, int hParent, int hInsertAfter, int hItem) { items [id] = item; } if (hFirstItem == 0) { - switch (hInsertAfter) { - case OS.TVI_FIRST: - case OS.TVI_LAST: - hFirstIndexOf = hLastIndexOf = hFirstItem = hNewItem; - itemCount = lastIndexOf = 0; + if (hInsertAfter == OS.TVI_FIRST || hInsertAfter == OS.TVI_LAST) { + hFirstIndexOf = hLastIndexOf = hFirstItem = hNewItem; + itemCount = lastIndexOf = 0; } } if (hFirstItem == hFirstIndexOf && itemCount != -1) itemCount++; @@ -2129,7 +2133,7 @@ void createItem (TreeItem item, int hParent, int hInsertAfter, int hItem) { OS.OffsetRect (damageRect, 0, rect.bottom - rect.top); OS.InvalidateRect (handle, damageRect, true); } else { - int rgn = OS.CreateRectRgn (0, 0, 0, 0); + int /*long*/ rgn = OS.CreateRectRgn (0, 0, 0, 0); int result = OS.GetUpdateRgn (handle, rgn, true); if (result != OS.NULLREGION) { OS.OffsetRgn (rgn, 0, rect.bottom - rect.top); @@ -2202,7 +2206,7 @@ void createParent () { OS.GetModuleHandle (null), null); if (hwndParent == 0) error (SWT.ERROR_NO_HANDLES); - OS.SetWindowLong (hwndParent, OS.GWL_ID, hwndParent); + OS.SetWindowLongPtr (hwndParent, OS.GWLP_ID, hwndParent); int bits = 0; if (OS.WIN32_VERSION >= OS.VERSION (4, 10)) { bits |= OS.WS_EX_NOINHERITLAYOUT; @@ -2219,9 +2223,9 @@ void createParent () { OS.GetModuleHandle (null), null); if (hwndHeader == 0) error (SWT.ERROR_NO_HANDLES); - OS.SetWindowLong (hwndHeader, OS.GWL_ID, hwndHeader); + OS.SetWindowLongPtr (hwndHeader, OS.GWLP_ID, hwndHeader); if (OS.IsDBLocale) { - int hIMC = OS.ImmGetContext (handle); + int /*long*/ hIMC = OS.ImmGetContext (handle); OS.ImmAssociateContext (hwndParent, hIMC); OS.ImmAssociateContext (hwndHeader, hIMC); OS.ImmReleaseContext (handle, hIMC); @@ -2234,9 +2238,9 @@ void createParent () { // OS.SetWindowLong (handle, OS.GWL_EXSTYLE, oldExStyle); // } // } - int hFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); + int /*long*/ hFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); if (hFont != 0) OS.SendMessage (hwndHeader, OS.WM_SETFONT, hFont, 0); - int hwndInsertAfter = OS.GetWindow (handle, OS.GW_HWNDPREV); + int /*long*/ hwndInsertAfter = OS.GetWindow (handle, OS.GW_HWNDPREV); int flags = OS.SWP_NOSIZE | OS.SWP_NOMOVE | OS.SWP_NOACTIVATE; SetWindowPos (hwndParent, hwndInsertAfter, 0, 0, 0, 0, flags); SCROLLINFO info = new SCROLLINFO (); @@ -2253,7 +2257,7 @@ void createParent () { if ((oldStyle & OS.WS_VISIBLE) != 0) { OS.ShowWindow (hwndParent, OS.SW_SHOW); } - int hwndFocus = OS.GetFocus (); + int /*long*/ hwndFocus = OS.GetFocus (); if (hwndFocus == handle) OS.SetFocus (hwndParent); OS.SetParent (handle, hwndParent); if (hwndFocus == handle) OS.SetFocus (handle); @@ -2279,13 +2283,13 @@ void deregister () { if (hwndHeader != 0) display.removeControl (hwndHeader); } -void deselect (int hItem, TVITEM tvItem, int hIgnoreItem) { +void deselect (int /*long*/ hItem, TVITEM tvItem, int /*long*/ hIgnoreItem) { while (hItem != 0) { if (hItem != hIgnoreItem) { tvItem.hItem = hItem; OS.SendMessage (handle, OS.TVM_SETITEM, 0, tvItem); } - int hFirstItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, hItem); + int /*long*/ hFirstItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, hItem); deselect (hFirstItem, tvItem, hIgnoreItem); hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXT, hItem); } @@ -2305,16 +2309,16 @@ public void deselectAll () { tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_STATE; tvItem.stateMask = OS.TVIS_SELECTED; if ((style & SWT.SINGLE) != 0) { - int hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); + int /*long*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); if (hItem != 0) { tvItem.hItem = hItem; OS.SendMessage (handle, OS.TVM_SETITEM, 0, tvItem); } } else { - int oldProc = OS.GetWindowLong (handle, OS.GWL_WNDPROC); - OS.SetWindowLong (handle, OS.GWL_WNDPROC, TreeProc); + int /*long*/ oldProc = OS.GetWindowLongPtr (handle, OS.GWLP_WNDPROC); + OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, TreeProc); if ((style & SWT.VIRTUAL) != 0) { - int hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); + int /*long*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); deselect (hItem, tvItem, 0); } else { for (int i=0; i<items.length; i++) { @@ -2325,13 +2329,13 @@ public void deselectAll () { } } } - OS.SetWindowLong (handle, OS.GWL_WNDPROC, oldProc); + OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, oldProc); } } void destroyItem (TreeColumn column) { if (hwndHeader == 0) error (SWT.ERROR_ITEM_NOT_REMOVED); - int columnCount = OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); + int columnCount = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); int index = 0; while (index < columnCount) { if (columns [index] == column) break; @@ -2398,8 +2402,8 @@ void destroyItem (TreeColumn column) { item.cellForeground = temp; } if (item.cellFont != null) { - int [] cellFont = item.cellFont; - int [] temp = new int [columnCount]; + int /*long*/ [] cellFont = item.cellFont; + int /*long*/ [] temp = new int /*long*/ [columnCount]; System.arraycopy (cellFont, 0, temp, 0, index); System.arraycopy (cellFont, index + 1, temp, index, columnCount - index); item.cellFont = temp; @@ -2465,7 +2469,7 @@ void destroyItem (TreeColumn column) { } } -void destroyItem (TreeItem item, int hItem) { +void destroyItem (TreeItem item, int /*long*/ hItem) { hFirstIndexOf = hLastIndexOf = 0; itemCount = -1; /* @@ -2483,7 +2487,7 @@ void destroyItem (TreeItem item, int hItem) { * allowing application code to add or remove items during * this remove operation. */ - int hParent = 0; + int /*long*/ hParent = 0; boolean fixRedraw = false; if ((style & SWT.DOUBLE_BUFFERED) == 0) { if (drawCount == 0 && OS.IsWindowVisible (handle)) { @@ -2515,7 +2519,7 @@ void destroyItem (TreeItem item, int hItem) { * NOTE: This only happens on Vista. */ if (!OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (6, 0)) { - int hwndToolTip = OS.SendMessage (handle, OS.TVM_GETTOOLTIPS, 0, 0); + int /*long*/ hwndToolTip = OS.SendMessage (handle, OS.TVM_GETTOOLTIPS, 0, 0); if (hwndToolTip != 0) OS.SendMessage (hwndToolTip, OS.TTM_POP, 0 ,0); } @@ -2539,7 +2543,7 @@ void destroyItem (TreeItem item, int hItem) { } } } - int count = OS.SendMessage (handle, OS.TVM_GETCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETCOUNT, 0, 0); if (count == 0) { if (imageList != null) { OS.SendMessage (handle, OS.TVM_SETIMAGELIST, 0, 0); @@ -2606,7 +2610,7 @@ void enableWidget (boolean enabled) { updateFullSelection (); } -int findIndex (int hFirstItem, int hItem) { +int findIndex (int /*long*/ hFirstItem, int /*long*/ hItem) { if (hFirstItem == 0) return -1; if (hFirstItem == hFirstIndexOf) { if (hFirstIndexOf == hItem) { @@ -2614,12 +2618,12 @@ int findIndex (int hFirstItem, int hItem) { return lastIndexOf = 0; } if (hLastIndexOf == hItem) return lastIndexOf; - int hPrevItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_PREVIOUS, hLastIndexOf); + int /*long*/ hPrevItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_PREVIOUS, hLastIndexOf); if (hPrevItem == hItem) { hLastIndexOf = hPrevItem; return --lastIndexOf; } - int hNextItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXT, hLastIndexOf); + int /*long*/ hNextItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXT, hLastIndexOf); if (hNextItem == hItem) { hLastIndexOf = hNextItem; return ++lastIndexOf; @@ -2644,7 +2648,8 @@ int findIndex (int hFirstItem, int hItem) { } return -1; } - int index = 0, hNextItem = hFirstItem; + int index = 0; + int /*long*/ hNextItem = hFirstItem; while (hNextItem != 0 && hNextItem != hItem) { hNextItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXT, hNextItem); index++; @@ -2658,11 +2663,11 @@ int findIndex (int hFirstItem, int hItem) { return -1; } -Widget findItem (int hItem) { +Widget findItem (int /*long*/ hItem) { return _getItem (hItem); } -int findItem (int hFirstItem, int index) { +int /*long*/ findItem (int /*long*/ hFirstItem, int index) { if (hFirstItem == 0) return 0; if (hFirstItem == hFirstIndexOf) { if (index == 0) { @@ -2680,7 +2685,7 @@ int findItem (int hFirstItem, int index) { } if (index < lastIndexOf) { int previousIndex = lastIndexOf - 1; - int hPrevItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_PREVIOUS, hLastIndexOf); + int /*long*/ hPrevItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_PREVIOUS, hLastIndexOf); while (hPrevItem != 0 && index < previousIndex) { hPrevItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_PREVIOUS, hPrevItem); --previousIndex; @@ -2691,7 +2696,7 @@ int findItem (int hFirstItem, int index) { } } else { int nextIndex = lastIndexOf + 1; - int hNextItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXT, hLastIndexOf); + int /*long*/ hNextItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXT, hLastIndexOf); while (hNextItem != 0 && nextIndex < index) { hNextItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXT, hNextItem); nextIndex++; @@ -2703,7 +2708,8 @@ int findItem (int hFirstItem, int index) { } return 0; } - int nextIndex = 0, hNextItem = hFirstItem; + int nextIndex = 0; + int /*long*/ hNextItem = hFirstItem; while (hNextItem != 0 && nextIndex < index) { hNextItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXT, hNextItem); nextIndex++; @@ -2719,7 +2725,7 @@ int findItem (int hFirstItem, int index) { TreeItem getFocusItem () { // checkWidget (); - int hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); + int /*long*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); return hItem != 0 ? _getItem (hItem) : null; } @@ -2791,12 +2797,12 @@ Point getImageSize () { return new Point (0, getItemHeight ()); } -int getBottomItem () { - int hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_FIRSTVISIBLE, 0); +int /*long*/ getBottomItem () { + int /*long*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_FIRSTVISIBLE, 0); if (hItem == 0) return 0; - int index = 0, count = OS.SendMessage (handle, OS.TVM_GETVISIBLECOUNT, 0, 0); + int index = 0, count = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETVISIBLECOUNT, 0, 0); while (index < count) { - int hNextItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXTVISIBLE, hItem); + int /*long*/ hNextItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXTVISIBLE, hItem); if (hNextItem == 0) return hItem; hItem = hNextItem; index++; @@ -2836,7 +2842,7 @@ int getBottomItem () { public TreeColumn getColumn (int index) { checkWidget (); if (hwndHeader == 0) error (SWT.ERROR_INVALID_RANGE); - int count = OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); if (!(0 <= index && index < count)) error (SWT.ERROR_INVALID_RANGE); return columns [index]; } @@ -2860,7 +2866,7 @@ public TreeColumn getColumn (int index) { public int getColumnCount () { checkWidget (); if (hwndHeader == 0) return 0; - return OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); + return (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); } /** @@ -2894,7 +2900,7 @@ public int getColumnCount () { public int[] getColumnOrder () { checkWidget (); if (hwndHeader == 0) return new int [0]; - int count = OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); int [] order = new int [count]; OS.SendMessage (hwndHeader, OS.HDM_GETORDERARRAY, count, order); return order; @@ -2932,7 +2938,7 @@ public int[] getColumnOrder () { public TreeColumn [] getColumns () { checkWidget (); if (hwndHeader == 0) return new TreeColumn [0]; - int count = OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); TreeColumn [] result = new TreeColumn [count]; System.arraycopy (columns, 0, result, 0, count); return result; @@ -2958,9 +2964,9 @@ public TreeColumn [] getColumns () { public TreeItem getItem (int index) { checkWidget (); if (index < 0) error (SWT.ERROR_INVALID_RANGE); - int hFirstItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); + int /*long*/ hFirstItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); if (hFirstItem == 0) error (SWT.ERROR_INVALID_RANGE); - int hItem = findItem (hFirstItem, index); + int /*long*/ hItem = findItem (hFirstItem, index); if (hItem == 0) error (SWT.ERROR_INVALID_RANGE); return _getItem (hItem); } @@ -2974,7 +2980,7 @@ TreeItem getItem (NMTVCUSTOMDRAW nmcd) { * fix is to query the field from the item instead * of using the struct. */ - int id = nmcd.lItemlParam; + int /*long*/ id = nmcd.lItemlParam; if ((style & SWT.VIRTUAL) != 0) { if (id == -1) { TVITEM tvItem = new TVITEM (); @@ -3040,13 +3046,14 @@ public TreeItem getItem (Point point) { */ public int getItemCount () { checkWidget (); - int hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); + int /*long*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); if (hItem == 0) return 0; return getItemCount (hItem); } -int getItemCount (int hItem) { - int count = 0, hFirstItem = hItem; +int getItemCount (int /*long*/ hItem) { + int count = 0; + int /*long*/ hFirstItem = hItem; if (hItem == hFirstIndexOf) { if (itemCount != -1) return itemCount; hFirstItem = hLastIndexOf; @@ -3073,7 +3080,7 @@ int getItemCount (int hItem) { */ public int getItemHeight () { checkWidget (); - return OS.SendMessage (handle, OS.TVM_GETITEMHEIGHT, 0, 0); + return (int)/*64*/OS.SendMessage (handle, OS.TVM_GETITEMHEIGHT, 0, 0); } /** @@ -3095,13 +3102,14 @@ public int getItemHeight () { */ public TreeItem [] getItems () { checkWidget (); - int hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); + int /*long*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); if (hItem == 0) return new TreeItem [0]; return getItems (hItem); } -TreeItem [] getItems (int hTreeItem) { - int count = 0, hItem = hTreeItem; +TreeItem [] getItems (int /*long*/ hTreeItem) { + int count = 0; + int /*long*/ hItem = hTreeItem; while (hItem != 0) { hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXT, hItem); count++; @@ -3156,7 +3164,7 @@ public boolean getLinesVisible () { return linesVisible; } -int getNextSelection (int hItem, TVITEM tvItem) { +int /*long*/ getNextSelection (int /*long*/ hItem, TVITEM tvItem) { while (hItem != 0) { int state = 0; if (OS.IsWinCE) { @@ -3164,11 +3172,11 @@ int getNextSelection (int hItem, TVITEM tvItem) { OS.SendMessage (handle, OS.TVM_GETITEM, 0, tvItem); state = tvItem.state; } else { - state = OS.SendMessage (handle, OS.TVM_GETITEMSTATE, hItem, OS.TVIS_SELECTED); + state = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETITEMSTATE, hItem, OS.TVIS_SELECTED); } if ((state & OS.TVIS_SELECTED) != 0) return hItem; - int hFirstItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, hItem); - int hSelected = getNextSelection (hFirstItem, tvItem); + int /*long*/ hFirstItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, hItem); + int /*long*/ hSelected = getNextSelection (hFirstItem, tvItem); if (hSelected != 0) return hSelected; hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXT, hItem); } @@ -3192,7 +3200,7 @@ public TreeItem getParentItem () { return null; } -int getSelection (int hItem, TVITEM tvItem, TreeItem [] selection, int index, int count, boolean bigSelection, boolean all) { +int getSelection (int /*long*/ hItem, TVITEM tvItem, TreeItem [] selection, int index, int count, boolean bigSelection, boolean all) { while (hItem != 0) { if (OS.IsWinCE || bigSelection) { tvItem.hItem = hItem; @@ -3204,7 +3212,7 @@ int getSelection (int hItem, TVITEM tvItem, TreeItem [] selection, int index, in index++; } } else { - int state = OS.SendMessage (handle, OS.TVM_GETITEMSTATE, hItem, OS.TVIS_SELECTED); + int state = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETITEMSTATE, hItem, OS.TVIS_SELECTED); if ((state & OS.TVIS_SELECTED) != 0) { if (tvItem != null && selection != null && index < selection.length) { tvItem.hItem = hItem; @@ -3216,7 +3224,7 @@ int getSelection (int hItem, TVITEM tvItem, TreeItem [] selection, int index, in } if (index == count) break; if (all) { - int hFirstItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, hItem); + int /*long*/ hFirstItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, hItem); if ((index = getSelection (hFirstItem, tvItem, selection, index, count, bigSelection, all)) == count) { break; } @@ -3247,7 +3255,7 @@ int getSelection (int hItem, TVITEM tvItem, TreeItem [] selection, int index, in public TreeItem [] getSelection () { checkWidget (); if ((style & SWT.SINGLE) != 0) { - int hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); + int /*long*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); if (hItem == 0) return new TreeItem [0]; TVITEM tvItem = new TVITEM (); tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_PARAM | OS.TVIF_STATE; @@ -3258,12 +3266,12 @@ public TreeItem [] getSelection () { } int count = 0; TreeItem [] guess = new TreeItem [(style & SWT.VIRTUAL) != 0 ? 8 : 1]; - int oldProc = OS.GetWindowLong (handle, OS.GWL_WNDPROC); - OS.SetWindowLong (handle, OS.GWL_WNDPROC, TreeProc); + int /*long*/ oldProc = OS.GetWindowLongPtr (handle, OS.GWLP_WNDPROC); + OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, TreeProc); if ((style & SWT.VIRTUAL) != 0) { TVITEM tvItem = new TVITEM (); tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_PARAM | OS.TVIF_STATE; - int hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); + int /*long*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); count = getSelection (hItem, tvItem, guess, 0, -1, false, true); } else { TVITEM tvItem = null; @@ -3274,13 +3282,14 @@ public TreeItem [] getSelection () { for (int i=0; i<items.length; i++) { TreeItem item = items [i]; if (item != null) { - int hItem = item.handle, state = 0; + int /*long*/ hItem = item.handle; + int state = 0; if (OS.IsWinCE) { tvItem.hItem = hItem; OS.SendMessage (handle, OS.TVM_GETITEM, 0, tvItem); state = tvItem.state; } else { - state = OS.SendMessage (handle, OS.TVM_GETITEMSTATE, hItem, OS.TVIS_SELECTED); + state = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETITEMSTATE, hItem, OS.TVIS_SELECTED); } if ((state & OS.TVIS_SELECTED) != 0) { if (count < guess.length) guess [count] = item; @@ -3289,7 +3298,7 @@ public TreeItem [] getSelection () { } } } - OS.SetWindowLong (handle, OS.GWL_WNDPROC, oldProc); + OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, oldProc); if (count == 0) return new TreeItem [0]; if (count == guess.length) return guess; TreeItem [] result = new TreeItem [count]; @@ -3297,16 +3306,16 @@ public TreeItem [] getSelection () { System.arraycopy (guess, 0, result, 0, count); return result; } - OS.SetWindowLong (handle, OS.GWL_WNDPROC, TreeProc); + OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, TreeProc); TVITEM tvItem = new TVITEM (); tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_PARAM | OS.TVIF_STATE; - int hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); - int itemCount = OS.SendMessage (handle, OS.TVM_GETCOUNT, 0, 0); + int /*long*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); + int itemCount = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETCOUNT, 0, 0); boolean bigSelection = result.length > itemCount / 2; if (count != getSelection (hItem, tvItem, result, 0, count, bigSelection, false)) { getSelection (hItem, tvItem, result, 0, count, bigSelection, true); } - OS.SetWindowLong (handle, OS.GWL_WNDPROC, oldProc); + OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, oldProc); return result; } @@ -3323,7 +3332,7 @@ public TreeItem [] getSelection () { public int getSelectionCount () { checkWidget (); if ((style & SWT.SINGLE) != 0) { - int hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); + int /*long*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); if (hItem == 0) return 0; int state = 0; if (OS.IsWinCE) { @@ -3333,38 +3342,39 @@ public int getSelectionCount () { OS.SendMessage (handle, OS.TVM_GETITEM, 0, tvItem); state = tvItem.state; } else { - state = OS.SendMessage (handle, OS.TVM_GETITEMSTATE, hItem, OS.TVIS_SELECTED); + state = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETITEMSTATE, hItem, OS.TVIS_SELECTED); } return (state & OS.TVIS_SELECTED) == 0 ? 0 : 1; } int count = 0; - int oldProc = OS.GetWindowLong (handle, OS.GWL_WNDPROC); + int /*long*/ oldProc = OS.GetWindowLongPtr (handle, OS.GWLP_WNDPROC); TVITEM tvItem = null; if (OS.IsWinCE) { tvItem = new TVITEM (); tvItem.mask = OS.TVIF_STATE; } - OS.SetWindowLong (handle, OS.GWL_WNDPROC, TreeProc); + OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, TreeProc); if ((style & SWT.VIRTUAL) != 0) { - int hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); + int /*long*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); count = getSelection (hItem, tvItem, null, 0, -1, false, true); } else { for (int i=0; i<items.length; i++) { TreeItem item = items [i]; if (item != null) { - int hItem = item.handle, state = 0; + int /*long*/ hItem = item.handle; + int state = 0; if (OS.IsWinCE) { tvItem.hItem = hItem; OS.SendMessage (handle, OS.TVM_GETITEM, 0, tvItem); state = tvItem.state; } else { - state = OS.SendMessage (handle, OS.TVM_GETITEMSTATE, hItem, OS.TVIS_SELECTED); + state = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETITEMSTATE, hItem, OS.TVIS_SELECTED); } if ((state & OS.TVIS_SELECTED) != 0) count++; } } } - OS.SetWindowLong (handle, OS.GWL_WNDPROC, oldProc); + OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, oldProc); return count; } @@ -3443,7 +3453,7 @@ public int getSortDirection () { */ public TreeItem getTopItem () { checkWidget (); - int hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_FIRSTVISIBLE, 0); + int /*long*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_FIRSTVISIBLE, 0); return hItem != 0 ? _getItem (hItem) : null; } @@ -3456,8 +3466,8 @@ int imageIndex (Image image, int index) { int imageIndex = imageList.indexOf (image); if (imageIndex == -1) imageIndex = imageList.add (image); if (hwndHeader == 0 || OS.SendMessage (hwndHeader, OS.HDM_ORDERTOINDEX, 0, 0) == index) { - int hImageList = imageList.getHandle (); - int hOldImageList = OS.SendMessage (handle, OS.TVM_GETIMAGELIST, OS.TVSIL_NORMAL, 0); + int /*long*/ hImageList = imageList.getHandle (); + int /*long*/ hOldImageList = OS.SendMessage (handle, OS.TVM_GETIMAGELIST, OS.TVSIL_NORMAL, 0); if (hOldImageList != hImageList) { OS.SendMessage (handle, OS.TVM_SETIMAGELIST, OS.TVSIL_NORMAL, hImageList); updateScrollBar (); @@ -3473,7 +3483,7 @@ int imageIndexHeader (Image image) { headerImageList = display.getImageList (style & SWT.RIGHT_TO_LEFT, bounds.width, bounds.height); int index = headerImageList.indexOf (image); if (index == -1) index = headerImageList.add (image); - int hImageList = headerImageList.getHandle (); + int /*long*/ hImageList = headerImageList.getHandle (); if (hwndHeader != 0) { OS.SendMessage (hwndHeader, OS.HDM_SETIMAGELIST, 0, hImageList); } @@ -3509,7 +3519,7 @@ public int indexOf (TreeColumn column) { if (column == null) error (SWT.ERROR_NULL_ARGUMENT); if (column.isDisposed()) error(SWT.ERROR_INVALID_ARGUMENT); if (hwndHeader == 0) return -1; - int count = OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); for (int i=0; i<count; i++) { if (columns [i] == column) return i; } @@ -3540,7 +3550,7 @@ public int indexOf (TreeItem item) { checkWidget (); if (item == null) error (SWT.ERROR_NULL_ARGUMENT); if (item.isDisposed()) error(SWT.ERROR_INVALID_ARGUMENT); - int hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); + int /*long*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); return hItem == 0 ? -1 : findIndex (hItem, item.handle); } @@ -3610,7 +3620,7 @@ boolean isItemSelected (NMTVCUSTOMDRAW nmcd) { void redrawSelection () { if ((style & SWT.SINGLE) != 0) { - int hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); + int /*long*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); if (hItem != 0) { RECT rect = new RECT (); if (OS.TreeView_GetItemRect (handle, hItem, rect, false)) { @@ -3618,7 +3628,7 @@ void redrawSelection () { } } } else { - int hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_FIRSTVISIBLE, 0); + int /*long*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_FIRSTVISIBLE, 0); if (hItem != 0) { TVITEM tvItem = null; if (OS.IsWinCE) { @@ -3626,7 +3636,7 @@ void redrawSelection () { tvItem.mask = OS.TVIF_STATE; } RECT rect = new RECT (); - int index = 0, count = OS.SendMessage (handle, OS.TVM_GETVISIBLECOUNT, 0, 0); + int index = 0, count = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETVISIBLECOUNT, 0, 0); while (index < count && hItem != 0) { int state = 0; if (OS.IsWinCE) { @@ -3634,7 +3644,7 @@ void redrawSelection () { OS.SendMessage (handle, OS.TVM_GETITEM, 0, tvItem); state = tvItem.state; } else { - state = OS.SendMessage (handle, OS.TVM_GETITEMSTATE, hItem, OS.TVIS_SELECTED); + state = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETITEMSTATE, hItem, OS.TVIS_SELECTED); } if ((state & OS.TVIS_SELECTED) != 0) { if (OS.TreeView_GetItemRect (handle, hItem, rect, false)) { @@ -3654,23 +3664,23 @@ void register () { if (hwndHeader != 0) display.addControl (hwndHeader, this); } -void releaseItem (int hItem, TVITEM tvItem, boolean release) { +void releaseItem (int /*long*/ hItem, TVITEM tvItem, boolean release) { if (hItem == hAnchor) hAnchor = 0; if (hItem == hInsert) hInsert = 0; tvItem.hItem = hItem; if (OS.SendMessage (handle, OS.TVM_GETITEM, 0, tvItem) != 0) { if (tvItem.lParam != -1) { - if (tvItem.lParam < lastID) lastID = tvItem.lParam; + if (tvItem.lParam < lastID) lastID = (int)/*64*/tvItem.lParam; if (release) { - TreeItem item = items [tvItem.lParam]; + TreeItem item = items [(int)/*64*/tvItem.lParam]; if (item != null) item.release (false); } - items [tvItem.lParam] = null; + items [(int)/*64*/tvItem.lParam] = null; } } } -void releaseItems (int hItem, TVITEM tvItem) { +void releaseItems (int /*long*/ hItem, TVITEM tvItem) { hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, hItem); while (hItem != 0) { releaseItems (hItem, tvItem); @@ -3729,7 +3739,7 @@ void releaseWidget () { display.releaseImageList (headerImageList); } imageList = headerImageList = null; - int hStateList = OS.SendMessage (handle, OS.TVM_GETIMAGELIST, OS.TVSIL_STATE, 0); + int /*long*/ hStateList = OS.SendMessage (handle, OS.TVM_GETIMAGELIST, OS.TVSIL_STATE, 0); OS.SendMessage (handle, OS.TVM_SETIMAGELIST, OS.TVSIL_STATE, 0); if (hStateList != 0) OS.ImageList_Destroy (hStateList); if (itemToolTipHandle != 0) OS.DestroyWindow (itemToolTipHandle); @@ -3765,7 +3775,7 @@ public void removeAll () { boolean redraw = drawCount == 0 && OS.IsWindowVisible (handle); if (redraw) OS.DefWindowProc (handle, OS.WM_SETREDRAW, 0, 0); shrink = ignoreShrink = true; - int result = OS.SendMessage (handle, OS.TVM_DELETEITEM, 0, OS.TVI_ROOT); + int /*long*/ result = OS.SendMessage (handle, OS.TVM_DELETEITEM, 0, OS.TVI_ROOT); ignoreShrink = false; if (redraw) { OS.DefWindowProc (handle, OS.WM_SETREDRAW, 1, 0); @@ -3859,7 +3869,7 @@ public void removeTreeListener(TreeListener listener) { */ public void setInsertMark (TreeItem item, boolean before) { checkWidget (); - int hItem = 0; + int /*long*/ hItem = 0; if (item != null) { if (item.isDisposed()) error(SWT.ERROR_INVALID_ARGUMENT); hItem = item.handle; @@ -3884,11 +3894,11 @@ public void setInsertMark (TreeItem item, boolean before) { public void setItemCount (int count) { checkWidget (); count = Math.max (0, count); - int hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); + int /*long*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); setItemCount (count, OS.TVGN_ROOT, hItem); } -void setItemCount (int count, int hParent, int hItem) { +void setItemCount (int count, int /*long*/ hParent, int /*long*/ hItem) { boolean redraw = false; if (OS.SendMessage (handle, OS.TVM_GETCOUNT, 0, 0) == 0) { redraw = drawCount == 0 && OS.IsWindowVisible (handle); @@ -3905,7 +3915,7 @@ void setItemCount (int count, int hParent, int hItem) { tvItem.hItem = hItem; OS.SendMessage (handle, OS.TVM_GETITEM, 0, tvItem); hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXT, hItem); - TreeItem item = tvItem.lParam != -1 ? items [tvItem.lParam] : null; + TreeItem item = tvItem.lParam != -1 ? items [(int)/*64*/tvItem.lParam] : null; if (item != null && !item.isDisposed ()) { item.dispose (); } else { @@ -3978,17 +3988,17 @@ public void setLinesVisible (boolean show) { OS.InvalidateRect (handle, null, true); } -int scrolledHandle () { +int /*long*/ scrolledHandle () { if (hwndHeader == 0) return handle; - int count = OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); return count == 0 ? handle : hwndParent; } -void select (int hItem, TVITEM tvItem) { +void select (int /*long*/ hItem, TVITEM tvItem) { while (hItem != 0) { tvItem.hItem = hItem; OS.SendMessage (handle, OS.TVM_SETITEM, 0, tvItem); - int hFirstItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, hItem); + int /*long*/ hFirstItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, hItem); select (hFirstItem, tvItem); hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXT, hItem); } @@ -4012,10 +4022,10 @@ public void selectAll () { tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_STATE; tvItem.state = OS.TVIS_SELECTED; tvItem.stateMask = OS.TVIS_SELECTED; - int oldProc = OS.GetWindowLong (handle, OS.GWL_WNDPROC); - OS.SetWindowLong (handle, OS.GWL_WNDPROC, TreeProc); + int /*long*/ oldProc = OS.GetWindowLongPtr (handle, OS.GWLP_WNDPROC); + OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, TreeProc); if ((style & SWT.VIRTUAL) != 0) { - int hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); + int /*long*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); select (hItem, tvItem); } else { for (int i=0; i<items.length; i++) { @@ -4026,10 +4036,10 @@ public void selectAll () { } } } - OS.SetWindowLong (handle, OS.GWL_WNDPROC, oldProc); + OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, oldProc); } -void setBackgroundImage (int hBitmap) { +void setBackgroundImage (int /*long*/ hBitmap) { super.setBackgroundImage (hBitmap); if (hBitmap != 0) { /* @@ -4104,7 +4114,7 @@ void setBounds (int x, int y, int width, int height, int flags) { } super.setBounds (x, y, width, height, flags); if (fixSelection) { - int hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); + int /*long*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); if (hItem != 0) showItem (hItem); } } @@ -4120,7 +4130,7 @@ void setCursor () { * is IDC_ARROW. */ Cursor cursor = findCursor (); - int hCursor = cursor == null ? OS.LoadCursor (0, OS.IDC_ARROW) : cursor.handle; + int /*long*/ hCursor = cursor == null ? OS.LoadCursor (0, OS.IDC_ARROW) : cursor.handle; OS.SetCursor (hCursor); } @@ -4153,7 +4163,7 @@ public void setColumnOrder (int [] order) { if (order == null) error (SWT.ERROR_NULL_ARGUMENT); int count = 0; if (hwndHeader != 0) { - count = OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); + count = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); } if (count == 0) { if (order.length != 0) error (SWT.ERROR_INVALID_ARGUMENT); @@ -4205,7 +4215,7 @@ void setCheckboxImageList () { if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) { flags |= OS.ILC_COLOR32; } else { - int hDC = OS.GetDC (handle); + int /*long*/ hDC = OS.GetDC (handle); int bits = OS.GetDeviceCaps (hDC, OS.BITSPIXEL); int planes = OS.GetDeviceCaps (hDC, OS.PLANES); OS.ReleaseDC (handle, hDC); @@ -4222,12 +4232,12 @@ void setCheckboxImageList () { } } if ((style & SWT.RIGHT_TO_LEFT) != 0) flags |= OS.ILC_MIRROR; - int height = OS.SendMessage (handle, OS.TVM_GETITEMHEIGHT, 0, 0), width = height; - int hStateList = OS.ImageList_Create (width, height, flags, count, count); - int hDC = OS.GetDC (handle); - int memDC = OS.CreateCompatibleDC (hDC); - int hBitmap = OS.CreateCompatibleBitmap (hDC, width * count, height); - int hOldBitmap = OS.SelectObject (memDC, hBitmap); + int height = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETITEMHEIGHT, 0, 0), width = height; + int /*long*/ hStateList = OS.ImageList_Create (width, height, flags, count, count); + int /*long*/ hDC = OS.GetDC (handle); + int /*long*/ memDC = OS.CreateCompatibleDC (hDC); + int /*long*/ hBitmap = OS.CreateCompatibleBitmap (hDC, width * count, height); + int /*long*/ hOldBitmap = OS.SelectObject (memDC, hBitmap); RECT rect = new RECT (); OS.SetRect (rect, 0, 0, width * count, height); /* @@ -4247,10 +4257,10 @@ void setCheckboxImageList () { clrBackground = 0x0200FF00; } } - int hBrush = OS.CreateSolidBrush (clrBackground); + int /*long*/ hBrush = OS.CreateSolidBrush (clrBackground); OS.FillRect (memDC, rect, hBrush); OS.DeleteObject (hBrush); - int oldFont = OS.SelectObject (hDC, defaultFont ()); + int /*long*/ oldFont = OS.SelectObject (hDC, defaultFont ()); TEXTMETRIC tm = OS.IsUnicode ? (TEXTMETRIC) new TEXTMETRICW () : new TEXTMETRICA (); OS.GetTextMetrics (hDC, tm); OS.SelectObject (hDC, oldFont); @@ -4259,7 +4269,7 @@ void setCheckboxImageList () { int left = (width - itemWidth) / 2, top = (height - itemHeight) / 2 + 1; OS.SetRect (rect, left + width, top, left + width + itemWidth, top + itemHeight); if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) { - int hTheme = display.hButtonTheme (); + int /*long*/ hTheme = display.hButtonTheme (); OS.DrawThemeBackground (hTheme, memDC, OS.BP_CHECKBOX, OS.CBS_UNCHECKEDNORMAL, rect, null); rect.left += width; rect.right += width; OS.DrawThemeBackground (hTheme, memDC, OS.BP_CHECKBOX, OS.CBS_CHECKEDNORMAL, rect, null); @@ -4285,7 +4295,7 @@ void setCheckboxImageList () { OS.ImageList_AddMasked (hStateList, hBitmap, clrBackground); } OS.DeleteObject (hBitmap); - int hOldStateList = OS.SendMessage (handle, OS.TVM_GETIMAGELIST, OS.TVSIL_STATE, 0); + int /*long*/ hOldStateList = OS.SendMessage (handle, OS.TVM_GETIMAGELIST, OS.TVSIL_STATE, 0); OS.SendMessage (handle, OS.TVM_SETIMAGELIST, OS.TVSIL_STATE, hStateList); if (hOldStateList != 0) OS.ImageList_Destroy (hOldStateList); } @@ -4370,10 +4380,10 @@ public void setRedraw (boolean redraw) { * when redraw is turned on and there are no items in * the tree. */ - int hItem = 0; + int /*long*/ hItem = 0; if (redraw) { if (drawCount == 1) { - int count = OS.SendMessage (handle, OS.TVM_GETCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETCOUNT, 0, 0); if (count == 0) { TVINSERTSTRUCT tvInsert = new TVINSERTSTRUCT (); tvInsert.hInsertAfter = OS.TVI_FIRST; @@ -4397,7 +4407,7 @@ void setScrollWidth () { if (hwndHeader == 0 || hwndParent == 0) return; int width = 0; HDITEM hdItem = new HDITEM (); - int count = OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); for (int i=0; i<count; i++) { hdItem.mask = OS.HDI_WIDTH; OS.SendMessage (hwndHeader, OS.HDM_GETITEM, i, hdItem); @@ -4415,7 +4425,7 @@ void setScrollWidth (int width) { SCROLLINFO info = new SCROLLINFO (); info.cbSize = SCROLLINFO.sizeof; info.fMask = OS.SIF_RANGE | OS.SIF_PAGE; - int count = OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); if (count == 0 && width == 0) { OS.GetScrollInfo (hwndParent, OS.SB_HORZ, info); info.nPage = info.nMax + 1; @@ -4438,7 +4448,7 @@ void setScrollWidth (int width) { horizontalBar.setPageIncrement (info.nPage); } OS.GetClientRect (hwndParent, rect); - int hHeap = OS.GetProcessHeap (); + int /*long*/ hHeap = OS.GetProcessHeap (); HDLAYOUT playout = new HDLAYOUT (); playout.prc = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, RECT.sizeof); playout.pwpos = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, WINDOWPOS.sizeof); @@ -4459,7 +4469,7 @@ void setScrollWidth (int width) { ignoreResize = oldIgnore; } -void setSelection (int hItem, TVITEM tvItem, TreeItem [] selection) { +void setSelection (int /*long*/ hItem, TVITEM tvItem, TreeItem [] selection) { while (hItem != 0) { int index = 0; while (index < selection.length) { @@ -4480,7 +4490,7 @@ void setSelection (int hItem, TVITEM tvItem, TreeItem [] selection) { OS.SendMessage (handle, OS.TVM_SETITEM, 0, tvItem); } } - int hFirstItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, hItem); + int /*long*/ hFirstItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, hItem); setSelection (hFirstItem, tvItem, selection); hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXT, hItem); } @@ -4547,8 +4557,8 @@ public void setSelection (TreeItem [] items) { TreeItem item = items [0]; if (item != null) { if (item.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT); - int hOldItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); - int hNewItem = hAnchor = item.handle; + int /*long*/ hOldItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); + int /*long*/ hNewItem = hAnchor = item.handle; /* * Bug in Windows. When TVM_SELECTITEM is used to select and @@ -4572,7 +4582,7 @@ public void setSelection (TreeItem [] items) { ignoreSelect = false; if (OS.SendMessage (handle, OS.TVM_GETVISIBLECOUNT, 0, 0) == 0) { OS.SendMessage (handle, OS.TVM_SELECTITEM, OS.TVGN_FIRSTVISIBLE, hNewItem); - int hParent = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_PARENT, hNewItem); + int /*long*/ hParent = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_PARENT, hNewItem); if (hParent == 0) OS.SendMessage (handle, OS.WM_HSCROLL, OS.SB_TOP, 0); } if (fixScroll) { @@ -4603,10 +4613,10 @@ public void setSelection (TreeItem [] items) { TVITEM tvItem = new TVITEM (); tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_STATE; tvItem.stateMask = OS.TVIS_SELECTED; - int oldProc = OS.GetWindowLong (handle, OS.GWL_WNDPROC); - OS.SetWindowLong (handle, OS.GWL_WNDPROC, TreeProc); + int /*long*/ oldProc = OS.GetWindowLongPtr (handle, OS.GWLP_WNDPROC); + OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, TreeProc); if ((style & SWT.VIRTUAL) != 0) { - int hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); + int /*long*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); setSelection (hItem, tvItem, items); } else { for (int i=0; i<this.items.length; i++) { @@ -4633,7 +4643,7 @@ public void setSelection (TreeItem [] items) { } } } - OS.SetWindowLong (handle, OS.GWL_WNDPROC, oldProc); + OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, oldProc); } /** @@ -4711,8 +4721,8 @@ public void setTopItem (TreeItem item) { checkWidget (); if (item == null) SWT.error (SWT.ERROR_NULL_ARGUMENT); if (item.isDisposed ()) SWT.error (SWT.ERROR_INVALID_ARGUMENT); - int hItem = item.handle; - int hTopItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_FIRSTVISIBLE, 0); + int /*long*/ hItem = item.handle; + int /*long*/ hTopItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_FIRSTVISIBLE, 0); if (hItem == hTopItem) return; boolean fixScroll = checkScroll (hItem), redraw = false; if (fixScroll) { @@ -4723,7 +4733,7 @@ public void setTopItem (TreeItem item) { if (redraw) OS.DefWindowProc (handle, OS.WM_SETREDRAW, 0, 0); } OS.SendMessage (handle, OS.TVM_SELECTITEM, OS.TVGN_FIRSTVISIBLE, hItem); - int hParent = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_PARENT, hItem); + int /*long*/ hParent = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_PARENT, hItem); if (hParent == 0) OS.SendMessage (handle, OS.WM_HSCROLL, OS.SB_TOP, 0); if (fixScroll) { OS.DefWindowProc (handle, OS.WM_SETREDRAW, 1, 0); @@ -4737,7 +4747,7 @@ public void setTopItem (TreeItem item) { updateScrollBar (); } -void showItem (int hItem) { +void showItem (int /*long*/ hItem) { /* * Bug in Windows. When TVM_ENSUREVISIBLE is used to ensure * that an item is visible and the client area of the tree is @@ -4841,7 +4851,7 @@ public void showColumn (TreeColumn column) { if (column.parent != this) return; int index = indexOf (column); if (index == -1) return; - int count = OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); if (0 <= index && index < count) { if (hwndParent != 0) { forceResize (); @@ -4906,7 +4916,7 @@ public void showItem (TreeItem item) { */ public void showSelection () { checkWidget (); - int hItem = 0; + int /*long*/ hItem = 0; if ((style & SWT.SINGLE) != 0) { hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); if (hItem == 0) return; @@ -4918,19 +4928,19 @@ public void showSelection () { OS.SendMessage (handle, OS.TVM_GETITEM, 0, tvItem); state = tvItem.state; } else { - state = OS.SendMessage (handle, OS.TVM_GETITEMSTATE, hItem, OS.TVIS_SELECTED); + state = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETITEMSTATE, hItem, OS.TVIS_SELECTED); } if ((state & OS.TVIS_SELECTED) == 0) return; } else { - int oldProc = OS.GetWindowLong (handle, OS.GWL_WNDPROC); - OS.SetWindowLong (handle, OS.GWL_WNDPROC, TreeProc); + int /*long*/ oldProc = OS.GetWindowLongPtr (handle, OS.GWLP_WNDPROC); + OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, TreeProc); TVITEM tvItem = null; if (OS.IsWinCE) { tvItem = new TVITEM (); tvItem.mask = OS.TVIF_STATE; } if ((style & SWT.VIRTUAL) != 0) { - int hRoot = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); + int /*long*/ hRoot = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); hItem = getNextSelection (hRoot, tvItem); } else { //FIXME - this code expands first selected item it finds @@ -4944,7 +4954,7 @@ public void showSelection () { OS.SendMessage (handle, OS.TVM_GETITEM, 0, tvItem); state = tvItem.state; } else { - state = OS.SendMessage (handle, OS.TVM_GETITEMSTATE, item.handle, OS.TVIS_SELECTED); + state = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETITEMSTATE, item.handle, OS.TVIS_SELECTED); } if ((state & OS.TVIS_SELECTED) != 0) { hItem = item.handle; @@ -4954,7 +4964,7 @@ public void showSelection () { index++; } } - OS.SetWindowLong (handle, OS.GWL_WNDPROC, oldProc); + OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, oldProc); } if (hItem != 0) showItem (hItem); } @@ -4965,8 +4975,8 @@ public void showSelection () { sort (OS.TVI_ROOT, false); } -void sort (int hParent, boolean all) { - int itemCount = OS.SendMessage (handle, OS.TVM_GETCOUNT, 0, 0); +void sort (int /*long*/ hParent, boolean all) { + int itemCount = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETCOUNT, 0, 0); if (itemCount == 0 || itemCount == 1) return; hFirstIndexOf = hLastIndexOf = 0; itemCount = -1; @@ -4974,7 +4984,7 @@ void sort (int hParent, boolean all) { OS.SendMessage (handle, OS.TVM_SORTCHILDREN, all ? 1 : 0, hParent); } else { Callback compareCallback = new Callback (this, "CompareFunc", 3); - int lpfnCompare = compareCallback.getAddress (); + int /*long*/ lpfnCompare = compareCallback.getAddress (); TVSORTCB psort = new TVSORTCB (); psort.hParent = hParent; psort.lpfnCompare = lpfnCompare; @@ -4987,15 +4997,15 @@ void sort (int hParent, boolean all) { void subclass () { super.subclass (); if (hwndHeader != 0) { - OS.SetWindowLong (hwndHeader, OS.GWL_WNDPROC, display.windowProc); + OS.SetWindowLongPtr (hwndHeader, OS.GWLP_WNDPROC, display.windowProc); } } String toolTipText (NMTTDISPINFO hdr) { - int hwndToolTip = OS.SendMessage (handle, OS.TVM_GETTOOLTIPS, 0, 0); + int /*long*/ hwndToolTip = OS.SendMessage (handle, OS.TVM_GETTOOLTIPS, 0, 0); if (hwndToolTip == hdr.hwndFrom && toolTipText != null) return ""; //$NON-NLS-1$ if (headerToolTipHandle == hdr.hwndFrom) { - int count = OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); for (int i=0; i<count; i++) { TreeColumn column = columns [i]; if (column.id == hdr.idFrom) return column.toolTipText; @@ -5014,19 +5024,19 @@ String toolTipText (NMTTDISPINFO hdr) { lpht.y = pt.y; OS.SendMessage (handle, OS.TVM_HITTEST, 0, lpht); if (lpht.hItem != 0) { - int hDC = OS.GetDC (handle); - int oldFont = 0, newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); + int /*long*/ hDC = OS.GetDC (handle); + int /*long*/ oldFont = 0, newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont); RECT rect = new RECT (); OS.GetClientRect (hwndParent, rect); OS.MapWindowPoints (hwndParent, handle, rect, 2); TreeItem item = _getItem (lpht.hItem); String text = null; - int index = 0, count = Math.max (1, OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0)); + int index = 0, count = Math.max (1, (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0)); int [] order = new int [count]; OS.SendMessage (hwndHeader, OS.HDM_GETORDERARRAY, count, order); while (index < count) { - int hFont = item.cellFont != null ? item.cellFont [order [index]] : -1; + int /*long*/ hFont = item.cellFont != null ? item.cellFont [order [index]] : -1; if (hFont == -1) hFont = item.font; if (hFont != -1) hFont = OS.SelectObject (hDC, hFont); RECT cellRect = item.getBounds (order [index], true, false, true, false, true, hDC); @@ -5056,7 +5066,7 @@ String toolTipText (NMTTDISPINFO hdr) { return super.toolTipText (hdr); } -int topHandle () { +int /*long*/ topHandle () { return hwndParent != 0 ? hwndParent : handle; } @@ -5089,7 +5099,7 @@ void updateHeaderToolTips () { lpti.uFlags = OS.TTF_SUBCLASS; lpti.hwnd = hwndHeader; lpti.lpszText = OS.LPSTR_TEXTCALLBACK; - int count = OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); for (int i=0; i<count; i++) { TreeColumn column = columns [i]; if (OS.SendMessage (hwndHeader, OS.HDM_GETITEMRECT, i, rect) != 0) { @@ -5106,7 +5116,7 @@ void updateHeaderToolTips () { void updateImageList () { if (imageList == null) return; if (hwndHeader == 0) return; - int i = 0, index = OS.SendMessage (hwndHeader, OS.HDM_ORDERTOINDEX, 0, 0); + int i = 0, index = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_ORDERTOINDEX, 0, 0); while (i < items.length) { TreeItem item = items [i]; if (item != null) { @@ -5126,8 +5136,8 @@ void updateImageList () { * times, Windows does work making this operation slow. The fix * is to test for the same image list before setting the new one. */ - int hImageList = i == items.length ? 0 : imageList.getHandle (); - int hOldImageList = OS.SendMessage (handle, OS.TVM_GETIMAGELIST, OS.TVSIL_NORMAL, 0); + int /*long*/ hImageList = i == items.length ? 0 : imageList.getHandle (); + int /*long*/ hOldImageList = OS.SendMessage (handle, OS.TVM_GETIMAGELIST, OS.TVSIL_NORMAL, 0); if (hImageList != hOldImageList) { OS.SendMessage (handle, OS.TVM_SETIMAGELIST, OS.TVSIL_NORMAL, hImageList); } @@ -5148,12 +5158,12 @@ void updateImages () { void updateScrollBar () { if (hwndParent != 0) { - int columnCount = OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); + int columnCount = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); if (columnCount != 0 || scrollWidth != 0) { SCROLLINFO info = new SCROLLINFO (); info.cbSize = SCROLLINFO.sizeof; info.fMask = OS.SIF_ALL; - int itemCount = OS.SendMessage (handle, OS.TVM_GETCOUNT, 0, 0); + int itemCount = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETCOUNT, 0, 0); if (itemCount == 0) { OS.GetScrollInfo (hwndParent, OS.SB_VERT, info); info.nPage = info.nMax + 1; @@ -5170,7 +5180,7 @@ void updateScrollBar () { void unsubclass () { super.unsubclass (); if (hwndHeader != 0) { - OS.SetWindowLong (hwndHeader, OS.GWL_WNDPROC, HeaderProc); + OS.SetWindowLongPtr (hwndHeader, OS.GWLP_WNDPROC, HeaderProc); } } @@ -5194,11 +5204,11 @@ TCHAR windowClass () { return TreeClass; } -int windowProc () { +int /*long*/ windowProc () { return TreeProc; } -int windowProc (int hwnd, int msg, int wParam, int lParam) { +int /*long*/ windowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) { if (hwndHeader != 0 && hwnd == hwndHeader) { switch (msg) { /* This code is intentionally commented */ @@ -5263,8 +5273,8 @@ int windowProc (int hwnd, int msg, int wParam, int lParam) { OS.ScreenToClient (hwnd, pt); pinfo.x = pt.x; pinfo.y = pt.y; - int columnCount = OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); - int index = OS.SendMessage (hwndHeader, OS.HDM_HITTEST, 0, pinfo); + int columnCount = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); + int index = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_HITTEST, 0, pinfo); if (0 <= index && index < columnCount && !columns [index].resizable) { if ((pinfo.flags & (OS.HHT_ONDIVIDER | OS.HHT_ONDIVOPEN)) != 0) { OS.SetCursor (OS.LoadCursor (0, OS.IDC_ARROW)); @@ -5288,7 +5298,7 @@ int windowProc (int hwnd, int msg, int wParam, int lParam) { setScrollWidth (); if (ignoreResize) return 0; setResizeChildren (false); - int code = callWindowProc (hwnd, OS.WM_SIZE, wParam, lParam); + int /*long*/ code = callWindowProc (hwnd, OS.WM_SIZE, wParam, lParam); sendEvent (SWT.Resize); if (isDisposed ()) return 0; if (layout != null) { @@ -5347,7 +5357,7 @@ int windowProc (int hwnd, int msg, int wParam, int lParam) { } } OS.SetScrollInfo (handle, OS.SB_VERT, info, true); - int code = OS.SendMessage (handle, OS.WM_VSCROLL, wParam, lParam); + int /*long*/ code = OS.SendMessage (handle, OS.WM_VSCROLL, wParam, lParam); OS.GetScrollInfo (handle, OS.SB_VERT, info); OS.SetScrollInfo (hwndParent, OS.SB_VERT, info, true); return code; @@ -5358,7 +5368,7 @@ int windowProc (int hwnd, int msg, int wParam, int lParam) { return super.windowProc (hwnd, msg, wParam, lParam); } -LRESULT WM_CHAR (int wParam, int lParam) { +LRESULT WM_CHAR (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_CHAR (wParam, lParam); if (result != null) return result; /* @@ -5370,9 +5380,9 @@ LRESULT WM_CHAR (int wParam, int lParam) { * The fix is to avoid calling the tree window * proc in these cases. */ - switch (wParam) { + switch ((int)/*64*/wParam) { case ' ': { - int hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); + int /*long*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); if (hItem != 0) { hAnchor = hItem; OS.SendMessage (handle, OS.TVM_ENSUREVISIBLE, 0, hItem); @@ -5391,11 +5401,11 @@ LRESULT WM_CHAR (int wParam, int lParam) { tvItem.state = state << 12; OS.SendMessage (handle, OS.TVM_SETITEM, 0, tvItem); if (!OS.IsWinCE) { - int id = hItem; + int /*long*/ id = hItem; if (OS.COMCTL32_MAJOR >= 6) { id = OS.SendMessage (handle, OS.TVM_MAPHTREEITEMTOACCID, hItem, 0); } - OS.NotifyWinEvent (OS.EVENT_OBJECT_FOCUS, handle, OS.OBJID_CLIENT, id); + OS.NotifyWinEvent (OS.EVENT_OBJECT_FOCUS, handle, OS.OBJID_CLIENT, (int)/*64*/id); } } tvItem.stateMask = OS.TVIS_SELECTED; @@ -5433,7 +5443,7 @@ LRESULT WM_CHAR (int wParam, int lParam) { * using NM_RETURN. */ Event event = new Event (); - int hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); + int /*long*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); if (hItem != 0) event.item = _getItem (hItem); postEvent (SWT.DefaultSelection, event); return LRESULT.ZERO; @@ -5444,14 +5454,14 @@ LRESULT WM_CHAR (int wParam, int lParam) { return result; } -LRESULT WM_ERASEBKGND (int wParam, int lParam) { +LRESULT WM_ERASEBKGND (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_ERASEBKGND (wParam, lParam); if ((style & SWT.DOUBLE_BUFFERED) != 0) return LRESULT.ONE; if (findImageControl () != null) return LRESULT.ONE; return result; } -LRESULT WM_GETOBJECT (int wParam, int lParam) { +LRESULT WM_GETOBJECT (int /*long*/ wParam, int /*long*/ lParam) { /* * Ensure that there is an accessible object created for this * control because support for checked item and tree column @@ -5464,10 +5474,10 @@ LRESULT WM_GETOBJECT (int wParam, int lParam) { return super.WM_GETOBJECT (wParam, lParam); } -LRESULT WM_KEYDOWN (int wParam, int lParam) { +LRESULT WM_KEYDOWN (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_KEYDOWN (wParam, lParam); if (result != null) return result; - switch (wParam) { + switch ((int)/*64*/wParam) { case OS.VK_SPACE: /* * Ensure that the window proc does not process VK_SPACE @@ -5479,7 +5489,7 @@ LRESULT WM_KEYDOWN (int wParam, int lParam) { case OS.VK_ADD: if (OS.GetKeyState (OS.VK_CONTROL) < 0) { if (hwndHeader != 0) { - int count = OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); TreeColumn [] newColumns = new TreeColumn [count]; System.arraycopy (columns, 0, newColumns, 0, count); for (int i=0; i<count; i++) { @@ -5500,17 +5510,17 @@ LRESULT WM_KEYDOWN (int wParam, int lParam) { OS.SendMessage (handle, OS.WM_CHANGEUISTATE, OS.UIS_INITIALIZE, 0); if ((style & SWT.SINGLE) != 0) break; if (OS.GetKeyState (OS.VK_SHIFT) < 0) { - int hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); + int /*long*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); if (hItem != 0) { if (hAnchor == 0) hAnchor = hItem; ignoreSelect = ignoreDeselect = true; - int code = callWindowProc (handle, OS.WM_KEYDOWN, wParam, lParam); + int /*long*/ code = callWindowProc (handle, OS.WM_KEYDOWN, wParam, lParam); ignoreSelect = ignoreDeselect = false; - int hNewItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); + int /*long*/ hNewItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); TVITEM tvItem = new TVITEM (); tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_STATE; tvItem.stateMask = OS.TVIS_SELECTED; - int hDeselectItem = hItem; + int /*long*/ hDeselectItem = hItem; RECT rect1 = new RECT (); OS.TreeView_GetItemRect (handle, hAnchor, rect1, false); RECT rect2 = new RECT (); @@ -5521,7 +5531,7 @@ LRESULT WM_KEYDOWN (int wParam, int lParam) { OS.SendMessage (handle, OS.TVM_SETITEM, 0, tvItem); hDeselectItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, flags, hDeselectItem); } - int hSelectItem = hAnchor; + int /*long*/ hSelectItem = hAnchor; OS.TreeView_GetItemRect (handle, hNewItem, rect1, false); OS.TreeView_GetItemRect (handle, hSelectItem, rect2, false); tvItem.state = OS.TVIS_SELECTED; @@ -5543,7 +5553,7 @@ LRESULT WM_KEYDOWN (int wParam, int lParam) { } } if (OS.GetKeyState (OS.VK_CONTROL) < 0) { - int hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); + int /*long*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); if (hItem != 0) { TVITEM tvItem = new TVITEM (); tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_STATE; @@ -5551,8 +5561,8 @@ LRESULT WM_KEYDOWN (int wParam, int lParam) { tvItem.hItem = hItem; OS.SendMessage (handle, OS.TVM_GETITEM, 0, tvItem); boolean oldSelected = (tvItem.state & OS.TVIS_SELECTED) != 0; - int hNewItem = 0; - switch (wParam) { + int /*long*/ hNewItem = 0; + switch ((int)/*64*/wParam) { case OS.VK_UP: hNewItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_PREVIOUSVISIBLE, hItem); break; @@ -5574,7 +5584,7 @@ LRESULT WM_KEYDOWN (int wParam, int lParam) { OS.GetClientRect (handle, clientRect); hNewItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_FIRSTVISIBLE, 0); do { - int hVisible = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXTVISIBLE, hNewItem); + int /*long*/ hVisible = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXTVISIBLE, hNewItem); if (hVisible == 0) break; if (!OS.TreeView_GetItemRect (handle, hVisible, rect, false)) break; if (rect.bottom > clientRect.bottom) break; @@ -5628,7 +5638,7 @@ LRESULT WM_KEYDOWN (int wParam, int lParam) { } } } - int code = callWindowProc (handle, OS.WM_KEYDOWN, wParam, lParam); + int /*long*/ code = callWindowProc (handle, OS.WM_KEYDOWN, wParam, lParam); hAnchor = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); return new LRESULT (code); } @@ -5636,7 +5646,7 @@ LRESULT WM_KEYDOWN (int wParam, int lParam) { return result; } -LRESULT WM_KILLFOCUS (int wParam, int lParam) { +LRESULT WM_KILLFOCUS (int /*long*/ wParam, int /*long*/ lParam) { /* * Bug in Windows. When a tree item that has an image * with alpha is expanded or collapsed, the area where @@ -5666,7 +5676,7 @@ LRESULT WM_KILLFOCUS (int wParam, int lParam) { return super.WM_KILLFOCUS (wParam, lParam); } -LRESULT WM_LBUTTONDBLCLK (int wParam, int lParam) { +LRESULT WM_LBUTTONDBLCLK (int /*long*/ wParam, int /*long*/ lParam) { TVHITTESTINFO lpht = new TVHITTESTINFO (); lpht.x = OS.GET_X_LPARAM (lParam); lpht.y = OS.GET_Y_LPARAM (lParam); @@ -5701,11 +5711,11 @@ LRESULT WM_LBUTTONDBLCLK (int wParam, int lParam) { tvItem.state = state << 12; OS.SendMessage (handle, OS.TVM_SETITEM, 0, tvItem); if (!OS.IsWinCE) { - int id = tvItem.hItem; + int /*long*/ id = tvItem.hItem; if (OS.COMCTL32_MAJOR >= 6) { id = OS.SendMessage (handle, OS.TVM_MAPHTREEITEMTOACCID, tvItem.hItem, 0); } - OS.NotifyWinEvent (OS.EVENT_OBJECT_FOCUS, handle, OS.OBJID_CLIENT, id); + OS.NotifyWinEvent (OS.EVENT_OBJECT_FOCUS, handle, OS.OBJID_CLIENT, (int)/*64*/id); } Event event = new Event (); event.item = _getItem (tvItem.hItem, tvItem.lParam); @@ -5727,7 +5737,7 @@ LRESULT WM_LBUTTONDBLCLK (int wParam, int lParam) { return result; } -LRESULT WM_LBUTTONDOWN (int wParam, int lParam) { +LRESULT WM_LBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) { /* * In a multi-select tree, if the user is collapsing a subtree that * contains selected items, clear the selection from these items and @@ -5750,7 +5760,7 @@ LRESULT WM_LBUTTONDOWN (int wParam, int lParam) { } boolean fixSelection = false, deselected = false; if (lpht.hItem != 0 && (style & SWT.MULTI) != 0) { - int hSelection = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); + int /*long*/ hSelection = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); if (hSelection != 0) { TVITEM tvItem = new TVITEM (); tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_STATE; @@ -5759,14 +5769,14 @@ LRESULT WM_LBUTTONDOWN (int wParam, int lParam) { if ((tvItem.state & OS.TVIS_EXPANDED) != 0) { fixSelection = true; tvItem.stateMask = OS.TVIS_SELECTED; - int hNext = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXTVISIBLE, lpht.hItem); + int /*long*/ hNext = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXTVISIBLE, lpht.hItem); while (hNext != 0) { tvItem.hItem = hNext; OS.SendMessage (handle, OS.TVM_GETITEM, 0, tvItem); if ((tvItem.state & OS.TVIS_SELECTED) != 0) deselected = true; tvItem.state = 0; OS.SendMessage (handle, OS.TVM_SETITEM, 0, tvItem); - int hItem = hNext = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXTVISIBLE, hNext); + int /*long*/ hItem = hNext = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXTVISIBLE, hNext); while (hItem != 0 && hItem != lpht.hItem) { hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_PARENT, hItem); } @@ -5777,7 +5787,7 @@ LRESULT WM_LBUTTONDOWN (int wParam, int lParam) { } dragStarted = gestureCompleted = false; if (fixSelection) ignoreDeselect = ignoreSelect = lockSelection = true; - int code = callWindowProc (handle, OS.WM_LBUTTONDOWN, wParam, lParam); + int /*long*/ code = callWindowProc (handle, OS.WM_LBUTTONDOWN, wParam, lParam); if (fixSelection) ignoreDeselect = ignoreSelect = lockSelection = false; if (dragStarted) { if (!display.captureChanged && !isDisposed ()) { @@ -5820,12 +5830,12 @@ LRESULT WM_LBUTTONDOWN (int wParam, int lParam) { } tvItem.state = state << 12; OS.SendMessage (handle, OS.TVM_SETITEM, 0, tvItem); - if (!OS.IsWinCE) { - int id = tvItem.hItem; + if (!OS.IsWinCE) { + int /*long*/ id = tvItem.hItem; if (OS.COMCTL32_MAJOR >= 6) { id = OS.SendMessage (handle, OS.TVM_MAPHTREEITEMTOACCID, tvItem.hItem, 0); } - OS.NotifyWinEvent (OS.EVENT_OBJECT_FOCUS, handle, OS.OBJID_CLIENT, id); + OS.NotifyWinEvent (OS.EVENT_OBJECT_FOCUS, handle, OS.OBJID_CLIENT, (int)/*64*/id); } Event event = new Event (); event.item = _getItem (tvItem.hItem, tvItem.lParam); @@ -5846,7 +5856,7 @@ LRESULT WM_LBUTTONDOWN (int wParam, int lParam) { } return LRESULT.ZERO; } - int code = callWindowProc (handle, OS.WM_LBUTTONDOWN, wParam, lParam); + int /*long*/ code = callWindowProc (handle, OS.WM_LBUTTONDOWN, wParam, lParam); if (!display.captureChanged && !isDisposed ()) { if (OS.GetCapture () != handle) OS.SetCapture (handle); } @@ -5868,7 +5878,7 @@ LRESULT WM_LBUTTONDOWN (int wParam, int lParam) { /* Get the selected state of the last selected item */ boolean redraw = false; - int hOldItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); + int /*long*/ hOldItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); if ((style & SWT.MULTI) != 0) { tvItem.hItem = hOldItem; OS.SendMessage (handle, OS.TVM_GETITEM, 0, tvItem); @@ -5898,7 +5908,7 @@ LRESULT WM_LBUTTONDOWN (int wParam, int lParam) { * In SWT, the InvalidateRect() that causes the pixel corruption * is found in Composite.WM_UPDATEUISTATE(). */ - int uiState = OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); + int uiState = (int)/*64*/OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); if ((uiState & OS.UISF_HIDEFOCUS) == 0) { redraw = focused && drawCount == 0 && OS.IsWindowVisible (handle); } @@ -5923,8 +5933,8 @@ LRESULT WM_LBUTTONDOWN (int wParam, int lParam) { hSelect = lpht.hItem; dragStarted = gestureCompleted = false; ignoreDeselect = ignoreSelect = true; - int code = callWindowProc (handle, OS.WM_LBUTTONDOWN, wParam, lParam); - int hNewItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); + int /*long*/ code = callWindowProc (handle, OS.WM_LBUTTONDOWN, wParam, lParam); + int /*long*/ hNewItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); /* * Feature in Windows. When the tree has the style * TVS_FULLROWSELECT, the background color for the @@ -6012,10 +6022,10 @@ LRESULT WM_LBUTTONDOWN (int wParam, int lParam) { if ((wParam & OS.MK_CONTROL) == 0) { if (!hittestSelected || !dragStarted) { tvItem.state = 0; - int oldProc = OS.GetWindowLong (handle, OS.GWL_WNDPROC); - OS.SetWindowLong (handle, OS.GWL_WNDPROC, TreeProc); + int /*long*/ oldProc = OS.GetWindowLongPtr (handle, OS.GWLP_WNDPROC); + OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, TreeProc); if ((style & SWT.VIRTUAL) != 0) { - int hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); + int /*long*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); deselect (hItem, tvItem, hNewItem); } else { for (int i=0; i<items.length; i++) { @@ -6029,7 +6039,7 @@ LRESULT WM_LBUTTONDOWN (int wParam, int lParam) { tvItem.hItem = hNewItem; tvItem.state = OS.TVIS_SELECTED; OS.SendMessage (handle, OS.TVM_SETITEM, 0, tvItem); - OS.SetWindowLong (handle, OS.GWL_WNDPROC, oldProc); + OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, oldProc); if ((wParam & OS.MK_SHIFT) != 0) { RECT rect1 = new RECT (); if (hAnchor == 0) hAnchor = hNewItem; @@ -6038,7 +6048,7 @@ LRESULT WM_LBUTTONDOWN (int wParam, int lParam) { if (OS.TreeView_GetItemRect (handle, hNewItem, rect2, false)) { int flags = rect1.top < rect2.top ? OS.TVGN_NEXTVISIBLE : OS.TVGN_PREVIOUSVISIBLE; tvItem.state = OS.TVIS_SELECTED; - int hItem = tvItem.hItem = hAnchor; + int /*long*/ hItem = tvItem.hItem = hAnchor; OS.SendMessage (handle, OS.TVM_SETITEM, 0, tvItem); while (hItem != hNewItem) { tvItem.hItem = hItem; @@ -6084,7 +6094,7 @@ LRESULT WM_LBUTTONDOWN (int wParam, int lParam) { return new LRESULT (code); } -LRESULT WM_MOUSEMOVE (int wParam, int lParam) { +LRESULT WM_MOUSEMOVE (int /*long*/ wParam, int /*long*/ lParam) { Display display = this.display; LRESULT result = super.WM_MOUSEMOVE (wParam, lParam); if (result != null) return result; @@ -6103,8 +6113,8 @@ LRESULT WM_MOUSEMOVE (int wParam, int lParam) { lpht.y = OS.GET_Y_LPARAM (lParam); OS.SendMessage (handle, OS.TVM_HITTEST, 0, lpht); if (lpht.hItem != 0) { - int hDC = OS.GetDC (handle); - int oldFont = 0, newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); + int /*long*/ hDC = OS.GetDC (handle); + int /*long*/ oldFont = 0, newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont); POINT pt = new POINT(); pt.x = lpht.x; @@ -6113,11 +6123,11 @@ LRESULT WM_MOUSEMOVE (int wParam, int lParam) { OS.GetClientRect (hwndParent, rect); OS.MapWindowPoints (hwndParent, handle, rect, 2); TreeItem item = _getItem (lpht.hItem); - int index = 0, count = Math.max (1, OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0)); + int index = 0, count = Math.max (1, (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0)); int [] order = new int [count]; OS.SendMessage (hwndHeader, OS.HDM_GETORDERARRAY, count, order); while (index < count) { - int hFont = item.cellFont != null ? item.cellFont [order [index]] : -1; + int /*long*/ hFont = item.cellFont != null ? item.cellFont [order [index]] : -1; if (hFont == -1) hFont = item.font; if (hFont != -1) hFont = OS.SelectObject (hDC, hFont); RECT cellRect = item.getBounds (order [index], true, false, true, false, true, hDC); @@ -6150,12 +6160,12 @@ LRESULT WM_MOUSEMOVE (int wParam, int lParam) { return result; } -LRESULT WM_MOVE (int wParam, int lParam) { +LRESULT WM_MOVE (int /*long*/ wParam, int /*long*/ lParam) { if (ignoreResize) return null; return super.WM_MOVE (wParam, lParam); } -LRESULT WM_RBUTTONDOWN (int wParam, int lParam) { +LRESULT WM_RBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) { /* * Feature in Windows. The receiver uses WM_RBUTTONDOWN * to initiate a drag/drop operation depending on how the @@ -6216,7 +6226,7 @@ LRESULT WM_RBUTTONDOWN (int wParam, int lParam) { return LRESULT.ZERO; } -LRESULT WM_PAINT (int wParam, int lParam) { +LRESULT WM_PAINT (int /*long*/ wParam, int /*long*/ lParam) { if (shrink && !ignoreShrink) { /* Resize the item array to fit the last item */ int count = items.length - 1; @@ -6237,13 +6247,13 @@ LRESULT WM_PAINT (int wParam, int lParam) { boolean doubleBuffer = true; if (EXPLORER_THEME) { if (!OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (6, 0)) { - int exStyle = OS.SendMessage (handle, OS.TVM_GETEXTENDEDSTYLE, 0, 0); + int exStyle = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETEXTENDEDSTYLE, 0, 0); if ((exStyle & OS.TVS_EX_DOUBLEBUFFER) != 0) doubleBuffer = false; } } if (doubleBuffer) { GC gc = null; - int paintDC = 0; + int /*long*/ paintDC = 0; PAINTSTRUCT ps = new PAINTSTRUCT (); boolean hooksPaint = hooks (SWT.Paint); if (hooksPaint) { @@ -6258,12 +6268,12 @@ LRESULT WM_PAINT (int wParam, int lParam) { int width = ps.right - ps.left; int height = ps.bottom - ps.top; if (width != 0 && height != 0) { - int hDC = OS.CreateCompatibleDC (paintDC); + int /*long*/ hDC = OS.CreateCompatibleDC (paintDC); POINT lpPoint1 = new POINT (), lpPoint2 = new POINT (); OS.SetWindowOrgEx (hDC, ps.left, ps.top, lpPoint1); OS.SetBrushOrgEx (hDC, ps.left, ps.top, lpPoint2); - int hBitmap = OS.CreateCompatibleBitmap (paintDC, width, height); - int hOldBitmap = OS.SelectObject (hDC, hBitmap); + int /*long*/ hBitmap = OS.CreateCompatibleBitmap (paintDC, width, height); + int /*long*/ hOldBitmap = OS.SelectObject (hDC, hBitmap); RECT rect = new RECT (); OS.SetRect (rect, ps.left, ps.top, ps.right, ps.bottom); drawBackground (hDC, rect); @@ -6297,7 +6307,7 @@ LRESULT WM_PAINT (int wParam, int lParam) { return super.WM_PAINT (wParam, lParam); } -LRESULT WM_PRINTCLIENT (int wParam, int lParam) { +LRESULT WM_PRINTCLIENT (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_PRINTCLIENT (wParam, lParam); if (result != null) return result; /* @@ -6311,12 +6321,12 @@ LRESULT WM_PRINTCLIENT (int wParam, int lParam) { * is happening in WM_PRINTCLIENT, the redrawing is not visible. */ printClient = true; - int code = callWindowProc (handle, OS.WM_PRINTCLIENT, wParam, lParam); + int /*long*/ code = callWindowProc (handle, OS.WM_PRINTCLIENT, wParam, lParam); printClient = false; return new LRESULT (code); } -LRESULT WM_SETFOCUS (int wParam, int lParam) { +LRESULT WM_SETFOCUS (int /*long*/ wParam, int /*long*/ lParam) { /* * Bug in Windows. When a tree item that has an image * with alpha is expanded or collapsed, the area where @@ -6346,7 +6356,7 @@ LRESULT WM_SETFOCUS (int wParam, int lParam) { return super.WM_SETFOCUS (wParam, lParam); } -LRESULT WM_SETFONT (int wParam, int lParam) { +LRESULT WM_SETFONT (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_SETFONT (wParam, lParam); if (result != null) return result; if (hwndHeader != 0) { @@ -6369,7 +6379,7 @@ LRESULT WM_SETFONT (int wParam, int lParam) { return result; } -LRESULT WM_SETREDRAW (int wParam, int lParam) { +LRESULT WM_SETREDRAW (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_SETREDRAW (wParam, lParam); if (result != null) return result; /* @@ -6384,13 +6394,13 @@ LRESULT WM_SETREDRAW (int wParam, int lParam) { * Windows Vista running under the theme manager. */ if (!OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (6, 0)) { - int code = OS.DefWindowProc (handle, OS.WM_SETREDRAW, wParam, lParam); + int /*long*/ code = OS.DefWindowProc (handle, OS.WM_SETREDRAW, wParam, lParam); return code == 0 ? LRESULT.ZERO : new LRESULT (code); } return result; } -LRESULT WM_SIZE (int wParam, int lParam) { +LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) { /* * Bug in Windows. When TVS_NOHSCROLL is set when the * size of the tree is zero, the scroll bar is shown the @@ -6419,7 +6429,7 @@ LRESULT WM_SIZE (int wParam, int lParam) { return super.WM_SIZE (wParam, lParam); } -LRESULT WM_SYSCOLORCHANGE (int wParam, int lParam) { +LRESULT WM_SYSCOLORCHANGE (int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = super.WM_SYSCOLORCHANGE (wParam, lParam); if (result != null) return result; /* @@ -6435,7 +6445,7 @@ LRESULT WM_SYSCOLORCHANGE (int wParam, int lParam) { return result; } -LRESULT wmColorChild (int wParam, int lParam) { +LRESULT wmColorChild (int /*long*/ wParam, int /*long*/ lParam) { if (findImageControl () != null) { if (OS.COMCTL32_MAJOR < 6) { return super.wmColorChild (wParam, lParam); @@ -6452,7 +6462,7 @@ LRESULT wmColorChild (int wParam, int lParam) { return null; } -LRESULT wmNotify (NMHDR hdr, int wParam, int lParam) { +LRESULT wmNotify (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) { if (hdr.hwndFrom == itemToolTipHandle && hwndHeader != 0) { if (!OS.IsWinCE) { switch (hdr.code) { @@ -6477,19 +6487,19 @@ LRESULT wmNotify (NMHDR hdr, int wParam, int lParam) { lpht.y = pt.y; OS.SendMessage (handle, OS.TVM_HITTEST, 0, lpht); if (lpht.hItem != 0) { - int hDC = OS.GetDC (handle); - int oldFont = 0, newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); + int /*long*/ hDC = OS.GetDC (handle); + int /*long*/ oldFont = 0, newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont); LRESULT result = null; RECT rect = new RECT (); OS.GetClientRect (hwndParent, rect); OS.MapWindowPoints (hwndParent, handle, rect, 2); TreeItem item = _getItem (lpht.hItem); - int index = 0, count = Math.max (1, OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0)); + int index = 0, count = Math.max (1, (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0)); int [] order = new int [count]; OS.SendMessage (hwndHeader, OS.HDM_GETORDERARRAY, count, order); while (index < count) { - int hFont = item.cellFont != null ? item.cellFont [order [index]] : -1; + int /*long*/ hFont = item.cellFont != null ? item.cellFont [order [index]] : -1; if (hFont == -1) hFont = item.font; if (hFont != -1) hFont = OS.SelectObject (hDC, hFont); RECT cellRect = item.getBounds (order [index], true, false, true, false, true, hDC); @@ -6552,7 +6562,7 @@ LRESULT wmNotify (NMHDR hdr, int wParam, int lParam) { } case OS.NM_RELEASEDCAPTURE: { if (!ignoreColumnMove) { - int count = OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); for (int i=0; i<count; i++) { TreeColumn column = columns [i]; column.updateToolTip (i); @@ -6582,7 +6592,7 @@ LRESULT wmNotify (NMHDR hdr, int wParam, int lParam) { HDITEM pitem = new HDITEM (); OS.MoveMemory (pitem, phdn.pitem, HDITEM.sizeof); if ((pitem.mask & OS.HDI_ORDER) != 0 && pitem.iOrder != -1) { - int count = OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); int [] order = new int [count]; OS.SendMessage (hwndHeader, OS.HDM_GETORDERARRAY, count, order); int index = 0; @@ -6676,7 +6686,7 @@ LRESULT wmNotify (NMHDR hdr, int wParam, int lParam) { column.updateToolTip (phdn.iItem); column.sendEvent (SWT.Resize); if (isDisposed ()) return LRESULT.ZERO; - int count = OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); + int count = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); TreeColumn [] newColumns = new TreeColumn [count]; System.arraycopy (columns, 0, newColumns, 0, count); int [] order = new int [count]; @@ -6721,7 +6731,7 @@ LRESULT wmNotify (NMHDR hdr, int wParam, int lParam) { return super.wmNotify (hdr, wParam, lParam); } -LRESULT wmNotifyChild (NMHDR hdr, int wParam, int lParam) { +LRESULT wmNotifyChild (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) { switch (hdr.code) { case OS.TVN_GETDISPINFOA: case OS.TVN_GETDISPINFOW: { @@ -6749,7 +6759,7 @@ LRESULT wmNotifyChild (NMHDR hdr, int wParam, int lParam) { */ if (!ignoreShrink) { if (items != null && lptvdi.lParam != -1) { - if (items [lptvdi.lParam] != null && items [lptvdi.lParam].cached) { + if (items [(int)/*64*/lptvdi.lParam] != null && items [(int)/*64*/lptvdi.lParam].cached) { checkVisible = false; } } @@ -6778,7 +6788,7 @@ LRESULT wmNotifyChild (NMHDR hdr, int wParam, int lParam) { * fix is to query the field from the item instead * of using the struct. */ - int id = lptvdi.lParam; + int /*long*/ id = lptvdi.lParam; if ((style & SWT.VIRTUAL) != 0) { if (id == -1) { TVITEM tvItem = new TVITEM (); @@ -6814,7 +6824,7 @@ LRESULT wmNotifyChild (NMHDR hdr, int wParam, int lParam) { } int index = 0; if (hwndHeader != 0) { - index = OS.SendMessage (hwndHeader, OS.HDM_ORDERTOINDEX, 0, 0); + index = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_ORDERTOINDEX, 0, 0); } if ((lptvdi.mask & OS.TVIF_TEXT) != 0) { String string = null; @@ -6928,12 +6938,11 @@ LRESULT wmNotifyChild (NMHDR hdr, int wParam, int lParam) { if ((style & SWT.MULTI) != 0) { if (lockSelection) { /* Save the old selection state for both items */ - TVITEM tvItem = new TVITEM (); - int offset1 = NMHDR.sizeof + 4; - OS.MoveMemory (tvItem, lParam + offset1, TVITEM.sizeof); + NMTREEVIEW treeView = new NMTREEVIEW (); + OS.MoveMemory (treeView, lParam, NMTREEVIEW.sizeof); + TVITEM tvItem = treeView.itemOld; oldSelected = (tvItem.state & OS.TVIS_SELECTED) != 0; - int offset2 = NMHDR.sizeof + 4 + TVITEM.sizeof; - OS.MoveMemory (tvItem, lParam + offset2, TVITEM.sizeof); + tvItem = treeView.itemNew; newSelected = (tvItem.state & OS.TVIS_SELECTED) != 0; } } @@ -6945,22 +6954,27 @@ LRESULT wmNotifyChild (NMHDR hdr, int wParam, int lParam) { } case OS.TVN_SELCHANGEDA: case OS.TVN_SELCHANGEDW: { + NMTREEVIEW treeView = null; if ((style & SWT.MULTI) != 0) { if (lockSelection) { /* Restore the old selection state of both items */ if (oldSelected) { - TVITEM tvItem = new TVITEM (); - int offset = NMHDR.sizeof + 4; - OS.MoveMemory (tvItem, lParam + offset, TVITEM.sizeof); + if (treeView == null) { + treeView = new NMTREEVIEW (); + OS.MoveMemory (treeView, lParam, NMTREEVIEW.sizeof); + } + TVITEM tvItem = treeView.itemOld; tvItem.mask = OS.TVIF_STATE; tvItem.stateMask = OS.TVIS_SELECTED; tvItem.state = OS.TVIS_SELECTED; OS.SendMessage (handle, OS.TVM_SETITEM, 0, tvItem); } if (!newSelected && ignoreSelect) { - TVITEM tvItem = new TVITEM (); - int offset = NMHDR.sizeof + 4 + TVITEM.sizeof; - OS.MoveMemory (tvItem, lParam + offset, TVITEM.sizeof); + if (treeView == null) { + treeView = new NMTREEVIEW (); + OS.MoveMemory (treeView, lParam, NMTREEVIEW.sizeof); + } + TVITEM tvItem = treeView.itemNew; tvItem.mask = OS.TVIF_STATE; tvItem.stateMask = OS.TVIS_SELECTED; tvItem.state = 0; @@ -6969,9 +6983,11 @@ LRESULT wmNotifyChild (NMHDR hdr, int wParam, int lParam) { } } if (!ignoreSelect) { - TVITEM tvItem = new TVITEM (); - int offset = NMHDR.sizeof + 4 + TVITEM.sizeof; - OS.MoveMemory (tvItem, lParam + offset, TVITEM.sizeof); + if (treeView == null) { + treeView = new NMTREEVIEW (); + OS.MoveMemory (treeView, lParam, NMTREEVIEW.sizeof); + } + TVITEM tvItem = treeView.itemNew; hAnchor = tvItem.hItem; Event event = new Event (); event.item = _getItem (tvItem.hItem, tvItem.lParam); @@ -6999,9 +7015,9 @@ LRESULT wmNotifyChild (NMHDR hdr, int wParam, int lParam) { OS.SendMessage (handle, OS.TVM_SETINSERTMARK, 0, 0); } if (!ignoreExpand) { - TVITEM tvItem = new TVITEM (); - int offset = NMHDR.sizeof + 4 + TVITEM.sizeof; - OS.MoveMemory (tvItem, lParam + offset, TVITEM.sizeof); + NMTREEVIEW treeView = new NMTREEVIEW (); + OS.MoveMemory (treeView, lParam, NMTREEVIEW.sizeof); + TVITEM tvItem = treeView.itemNew; /* * Feature in Windows. In some cases, TVM_ITEMEXPANDING * is sent from within TVM_DELETEITEM for the tree item @@ -7014,9 +7030,7 @@ LRESULT wmNotifyChild (NMHDR hdr, int wParam, int lParam) { if (item == null) break; Event event = new Event (); event.item = item; - int [] action = new int [1]; - OS.MoveMemory (action, lParam + NMHDR.sizeof, 4); - switch (action [0]) { + switch (treeView.action) { case OS.TVE_EXPAND: /* * Bug in Windows. When the numeric keypad asterisk @@ -7042,7 +7056,7 @@ LRESULT wmNotifyChild (NMHDR hdr, int wParam, int lParam) { * The fix is to detect this case and run the TVN_ITEMEXPANDED * code in this method. */ - int hFirstItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, tvItem.hItem); + int /*long*/ hFirstItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, tvItem.hItem); runExpanded = hFirstItem == 0; } if (!runExpanded) break; @@ -7075,9 +7089,9 @@ LRESULT wmNotifyChild (NMHDR hdr, int wParam, int lParam) { */ if (!OS.IsWinCE && OS.COMCTL32_MAJOR >= 6) { if (imageList != null) { - TVITEM tvItem = new TVITEM (); - int offset = NMHDR.sizeof + 4 + TVITEM.sizeof; - OS.MoveMemory (tvItem, lParam + offset, TVITEM.sizeof); + NMTREEVIEW treeView = new NMTREEVIEW (); + OS.MoveMemory (treeView, lParam, NMTREEVIEW.sizeof); + TVITEM tvItem = treeView.itemNew; if (tvItem.hItem != 0) { int bits = OS.GetWindowLong (handle, OS.GWL_STYLE); if ((bits & OS.TVS_FULLROWSELECT) == 0) { @@ -7096,9 +7110,9 @@ LRESULT wmNotifyChild (NMHDR hdr, int wParam, int lParam) { case OS.TVN_BEGINDRAGW: case OS.TVN_BEGINRDRAGA: case OS.TVN_BEGINRDRAGW: { - TVITEM tvItem = new TVITEM (); - int offset = NMHDR.sizeof + 4 + TVITEM.sizeof; - OS.MoveMemory (tvItem, lParam + offset, TVITEM.sizeof); + NMTREEVIEW treeView = new NMTREEVIEW (); + OS.MoveMemory (treeView, lParam, NMTREEVIEW.sizeof); + TVITEM tvItem = treeView.itemNew; if (tvItem.hItem != 0 && (tvItem.state & OS.TVIS_SELECTED) == 0) { hSelect = tvItem.hItem; ignoreSelect = ignoreDeselect = true; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeColumn.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeColumn.java index 44b1e0fad8..44872d822d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeColumn.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeColumn.java @@ -303,7 +303,7 @@ public int getWidth () { checkWidget (); int index = parent.indexOf (this); if (index == -1) return 0; - int hwndHeader = parent.hwndHeader; + int /*long*/ hwndHeader = parent.hwndHeader; if (hwndHeader == 0) return 0; HDITEM hdItem = new HDITEM (); hdItem.mask = OS.HDI_WIDTH; @@ -327,20 +327,20 @@ public void pack () { int index = parent.indexOf (this); if (index == -1) return; int columnWidth = 0; - int hwnd = parent.handle, hwndHeader = parent.hwndHeader; + int /*long*/ hwnd = parent.handle, hwndHeader = parent.hwndHeader; RECT headerRect = new RECT (); OS.SendMessage (hwndHeader, OS.HDM_GETITEMRECT, index, headerRect); - int hDC = OS.GetDC (hwnd); - int oldFont = 0, newFont = OS.SendMessage (hwnd, OS.WM_GETFONT, 0, 0); + int /*long*/ hDC = OS.GetDC (hwnd); + int /*long*/ oldFont = 0, newFont = OS.SendMessage (hwnd, OS.WM_GETFONT, 0, 0); if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont); TVITEM tvItem = new TVITEM (); tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_PARAM; tvItem.hItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); while (tvItem.hItem != 0) { OS.SendMessage (hwnd, OS.TVM_GETITEM, 0, tvItem); - TreeItem item = tvItem.lParam != -1 ? parent.items [tvItem.lParam] : null; + TreeItem item = tvItem.lParam != -1 ? parent.items [(int)/*64*/tvItem.lParam] : null; if (item != null) { - int hFont = item.cellFont != null ? item.cellFont [index] : -1; + int /*long*/ hFont = item.cellFont != null ? item.cellFont [index] : -1; if (hFont == -1) hFont = item.font; if (hFont != -1) hFont = OS.SelectObject (hDC, hFont); RECT itemRect = item.getBounds (index, true, true, false, false, false, hDC); @@ -395,7 +395,7 @@ public void pack () { } int margin = 0; if (hwndHeader != 0 && OS.COMCTL32_VERSION >= OS.VERSION (5, 80)) { - margin = OS.SendMessage (hwndHeader, OS.HDM_GETBITMAPMARGIN, 0, 0); + margin = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_GETBITMAPMARGIN, 0, 0); } else { margin = OS.GetSystemMetrics (OS.SM_CXEDGE) * 3; } @@ -488,7 +488,7 @@ public void setAlignment (int alignment) { if (index == -1 || index == 0) return; style &= ~(SWT.LEFT | SWT.RIGHT | SWT.CENTER); style |= alignment & (SWT.LEFT | SWT.RIGHT | SWT.CENTER); - int hwndHeader = parent.hwndHeader; + int /*long*/ hwndHeader = parent.hwndHeader; if (hwndHeader == 0) return; HDITEM hdItem = new HDITEM (); hdItem.mask = OS.HDI_FORMAT | OS.HDI_IMAGE; @@ -499,7 +499,7 @@ public void setAlignment (int alignment) { if ((style & SWT.RIGHT) == SWT.RIGHT) hdItem.fmt |= OS.HDF_RIGHT; OS.SendMessage (hwndHeader, OS.HDM_SETITEM, index, hdItem); if (index != 0) { - int hwnd = parent.handle; + int /*long*/ hwnd = parent.handle; parent.forceResize (); RECT rect = new RECT (), headerRect = new RECT (); OS.GetClientRect (hwnd, rect); @@ -524,7 +524,7 @@ public void setImage (Image image) { void setImage (Image image, boolean sort, boolean right) { int index = parent.indexOf (this); if (index == -1) return; - int hwndHeader = parent.hwndHeader; + int /*long*/ hwndHeader = parent.hwndHeader; if (hwndHeader == 0) return; HDITEM hdItem = new HDITEM (); hdItem.mask = OS.HDI_FORMAT | OS.HDI_IMAGE | OS.HDI_BITMAP; @@ -595,7 +595,7 @@ public void setResizable (boolean resizable) { void setSortDirection (int direction) { if (OS.COMCTL32_MAJOR >= 6) { - int hwndHeader = parent.hwndHeader; + int /*long*/ hwndHeader = parent.hwndHeader; if (hwndHeader != 0) { int index = parent.indexOf (this); if (index == -1) return; @@ -623,7 +623,7 @@ void setSortDirection (int direction) { } OS.SendMessage (hwndHeader, OS.HDM_SETITEM, index, hdItem); if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) { - int hwnd = parent.handle; + int /*long*/ hwnd = parent.handle; parent.forceResize (); RECT rect = new RECT (), headerRect = new RECT (); OS.GetClientRect (hwnd, rect); @@ -661,17 +661,17 @@ public void setText (String string) { * mnemonic characters and replace doubled mnemonics * with spaces. */ - int hHeap = OS.GetProcessHeap (); + int /*long*/ hHeap = OS.GetProcessHeap (); TCHAR buffer = new TCHAR (parent.getCodePage (), fixMnemonic (string), true); int byteCount = buffer.length () * TCHAR.sizeof; - int pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); + int /*long*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); OS.MoveMemory (pszText, buffer, byteCount); - int hwndHeader = parent.hwndHeader; + int /*long*/ hwndHeader = parent.hwndHeader; if (hwndHeader == 0) return; HDITEM hdItem = new HDITEM (); hdItem.mask = OS.HDI_TEXT; hdItem.pszText = pszText; - int result = OS.SendMessage (hwndHeader, OS.HDM_SETITEM, index, hdItem); + int /*long*/ result = OS.SendMessage (hwndHeader, OS.HDM_SETITEM, index, hdItem); if (pszText != 0) OS.HeapFree (hHeap, 0, pszText); if (result == 0) error (SWT.ERROR_CANNOT_SET_TEXT); } @@ -692,7 +692,7 @@ public void setText (String string) { public void setToolTipText (String string) { checkWidget(); toolTipText = string; - int hwndHeaderToolTip = parent.headerToolTipHandle; + int /*long*/ hwndHeaderToolTip = parent.headerToolTipHandle; if (hwndHeaderToolTip == 0) { parent.createHeaderToolTips (); parent.updateHeaderToolTips (); @@ -714,7 +714,7 @@ public void setWidth (int width) { if (width < 0) return; int index = parent.indexOf (this); if (index == -1) return; - int hwndHeader = parent.hwndHeader; + int /*long*/ hwndHeader = parent.hwndHeader; if (hwndHeader == 0) return; HDITEM hdItem = new HDITEM (); hdItem.mask = OS.HDI_WIDTH; @@ -723,7 +723,7 @@ public void setWidth (int width) { RECT headerRect = new RECT (); OS.SendMessage (hwndHeader, OS.HDM_GETITEMRECT, index, headerRect); parent.forceResize (); - int hwnd = parent.handle; + int /*long*/ hwnd = parent.handle; RECT rect = new RECT (); OS.GetClientRect (hwnd, rect); rect.left = headerRect.left; @@ -732,9 +732,9 @@ public void setWidth (int width) { } void updateToolTip (int index) { - int hwndHeaderToolTip = parent.headerToolTipHandle; + int /*long*/ hwndHeaderToolTip = parent.headerToolTipHandle; if (hwndHeaderToolTip != 0) { - int hwndHeader = parent.hwndHeader; + int /*long*/ hwndHeader = parent.hwndHeader; RECT rect = new RECT (); if (OS.SendMessage (hwndHeader, OS.HDM_GETITEMRECT, index, rect) != 0) { TOOLINFO lpti = new TOOLINFO (); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeItem.java index 98486a4ec6..d79d4e2dc4 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeItem.java @@ -41,13 +41,15 @@ public class TreeItem extends Item { * platforms and should never be accessed from application code. * </p> */ - public int handle; + public int /*long*/ handle; Tree parent; String [] strings; Image [] images; boolean cached; - int background = -1, foreground = -1, font = -1; - int [] cellBackground, cellForeground, cellFont; + int background = -1, foreground = -1; + int /*long*/ font = -1; + int [] cellBackground, cellForeground; + int /*long*/ [] cellFont; /** * Constructs a new instance of this class given its parent @@ -189,7 +191,7 @@ public TreeItem (TreeItem parentItem, int style, int index) { this (checkNull (parentItem).parent, style, parentItem.handle, findPrevious (parentItem, index), 0); } -TreeItem (Tree parent, int style, int hParent, int hInsertAfter, int hItem) { +TreeItem (Tree parent, int style, int /*long*/ hParent, int /*long*/ hInsertAfter, int /*long*/ hItem) { super (parent, style); this.parent = parent; parent.createItem (this, hParent, hInsertAfter, hItem); @@ -200,25 +202,25 @@ static TreeItem checkNull (TreeItem item) { return item; } -static int findPrevious (Tree parent, int index) { +static int /*long*/ findPrevious (Tree parent, int index) { if (parent == null) return 0; if (index < 0) SWT.error (SWT.ERROR_INVALID_RANGE); if (index == 0) return OS.TVI_FIRST; - int hwnd = parent.handle; - int hFirstItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); - int hItem = parent.findItem (hFirstItem, index - 1); + int /*long*/ hwnd = parent.handle; + int /*long*/ hFirstItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); + int /*long*/ hItem = parent.findItem (hFirstItem, index - 1); if (hItem == 0) SWT.error (SWT.ERROR_INVALID_RANGE); return hItem; } -static int findPrevious (TreeItem parentItem, int index) { +static int /*long*/ findPrevious (TreeItem parentItem, int index) { if (parentItem == null) return 0; if (index < 0) SWT.error (SWT.ERROR_INVALID_RANGE); if (index == 0) return OS.TVI_FIRST; Tree parent = parentItem.parent; - int hwnd = parent.handle, hParent = parentItem.handle; - int hFirstItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, hParent); - int hItem = parent.findItem (hFirstItem, index - 1); + int /*long*/ hwnd = parent.handle, hParent = parentItem.handle; + int /*long*/ hFirstItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, hParent); + int /*long*/ hItem = parent.findItem (hFirstItem, index - 1); if (hItem == 0) SWT.error (SWT.ERROR_INVALID_RANGE); return hItem; } @@ -233,7 +235,7 @@ void clear () { strings = null; images = null; if ((parent.style & SWT.CHECK) != 0) { - int hwnd = parent.handle; + int /*long*/ hwnd = parent.handle; TVITEM tvItem = new TVITEM (); tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_STATE; tvItem.stateMask = OS.TVIS_STATEIMAGEMASK; @@ -241,8 +243,10 @@ void clear () { tvItem.hItem = handle; OS.SendMessage (hwnd, OS.TVM_SETITEM, 0, tvItem); } - background = foreground = font = -1; - cellBackground = cellForeground = cellFont = null; + background = foreground = -1; + font = -1; + cellBackground = cellForeground = null; + cellFont = null; if ((parent.style & SWT.VIRTUAL) != 0) cached = false; } @@ -271,8 +275,8 @@ void clear () { */ public void clear (int index, boolean all) { checkWidget (); - int hwnd = parent.handle; - int hItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, handle); + int /*long*/ hwnd = parent.handle; + int /*long*/ hItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, handle); if (hItem == 0) error (SWT.ERROR_INVALID_RANGE); hItem = parent.findItem (hItem, index); if (hItem == 0) error (SWT.ERROR_INVALID_RANGE); @@ -306,8 +310,8 @@ public void clear (int index, boolean all) { */ public void clearAll (boolean all) { checkWidget (); - int hwnd = parent.handle; - int hItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, handle); + int /*long*/ hwnd = parent.handle; + int /*long*/ hItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, handle); if (hItem == 0) return; TVITEM tvItem = new TVITEM (); tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_PARAM; @@ -410,9 +414,9 @@ RECT getBounds (int index, boolean getText, boolean getImage, boolean fullText) } //TODO - take into account grid (add boolean arg) to damage less during redraw -RECT getBounds (int index, boolean getText, boolean getImage, boolean fullText, boolean fullImage, boolean clip, int hDC) { +RECT getBounds (int index, boolean getText, boolean getImage, boolean fullText, boolean fullImage, boolean clip, int /*long*/ hDC) { if (!getText && !getImage) return new RECT (); - int hwnd = parent.handle; + int /*long*/ hwnd = parent.handle; if ((parent.style & SWT.VIRTUAL) == 0 && !cached && !parent.painted) { TVITEM tvItem = new TVITEM (); tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_TEXT; @@ -423,9 +427,10 @@ RECT getBounds (int index, boolean getText, boolean getImage, boolean fullText, parent.ignoreCustomDraw = false; } boolean firstColumn = index == 0; - int columnCount = 0, hwndHeader = parent.hwndHeader; + int columnCount = 0; + int /*long*/ hwndHeader = parent.hwndHeader; if (hwndHeader != 0) { - columnCount = OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); + columnCount = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); firstColumn = index == OS.SendMessage (hwndHeader, OS.HDM_ORDERTOINDEX, 0, 0); } RECT rect = new RECT (); @@ -495,7 +500,7 @@ RECT getBounds (int index, boolean getText, boolean getImage, boolean fullText, RECT textRect = new RECT (); TCHAR buffer = new TCHAR (parent.getCodePage (), string, false); int flags = OS.DT_NOPREFIX | OS.DT_SINGLELINE | OS.DT_CALCRECT; - int hNewDC = hDC, hFont = 0; + int /*long*/ hNewDC = hDC, hFont = 0; if (hDC == 0) { hNewDC = OS.GetDC (hwnd); hFont = cellFont != null ? cellFont [index] : -1; @@ -547,12 +552,12 @@ public boolean getChecked () { checkWidget (); if (!parent.checkData (this, true)) error (SWT.ERROR_WIDGET_DISPOSED); if ((parent.style & SWT.CHECK) == 0) return false; - int hwnd = parent.handle; + int /*long*/ hwnd = parent.handle; TVITEM tvItem = new TVITEM (); tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_STATE; tvItem.stateMask = OS.TVIS_STATEIMAGEMASK; tvItem.hItem = handle; - int result = OS.SendMessage (hwnd, OS.TVM_GETITEM, 0, tvItem); + int /*long*/ result = OS.SendMessage (hwnd, OS.TVM_GETITEM, 0, tvItem); return (result != 0) && (((tvItem.state >> 12) & 1) == 0); } @@ -570,7 +575,8 @@ public boolean getChecked () { */ public boolean getExpanded () { checkWidget (); - int hwnd = parent.handle, state = 0; + int /*long*/ hwnd = parent.handle; + int state = 0; if (OS.IsWinCE) { TVITEM tvItem = new TVITEM (); tvItem.hItem = handle; @@ -584,7 +590,7 @@ public boolean getExpanded () { * with TVIS_EXPANDED, the entire state is returned. The fix is * to explicitly check for the TVIS_EXPANDED bit. */ - state = OS.SendMessage (hwnd, OS.TVM_GETITEMSTATE, handle, OS.TVIS_EXPANDED); + state = (int)/*64*/OS.SendMessage (hwnd, OS.TVM_GETITEMSTATE, handle, OS.TVIS_EXPANDED); } return (state & OS.TVIS_EXPANDED) != 0; } @@ -626,7 +632,7 @@ public Font getFont (int index) { if (!parent.checkData (this, true)) error (SWT.ERROR_WIDGET_DISPOSED); int count = Math.max (1, parent.getColumnCount ()); if (0 > index || index > count -1) return getFont (); - int hFont = (cellFont != null) ? cellFont [index] : font; + int /*long*/ hFont = (cellFont != null) ? cellFont [index] : font; return hFont == -1 ? getFont () : Font.win32_new (display, hFont); } @@ -690,12 +696,12 @@ public boolean getGrayed () { checkWidget (); if (!parent.checkData (this, true)) error (SWT.ERROR_WIDGET_DISPOSED); if ((parent.style & SWT.CHECK) == 0) return false; - int hwnd = parent.handle; + int /*long*/ hwnd = parent.handle; TVITEM tvItem = new TVITEM (); tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_STATE; tvItem.stateMask = OS.TVIS_STATEIMAGEMASK; tvItem.hItem = handle; - int result = OS.SendMessage (hwnd, OS.TVM_GETITEM, 0, tvItem); + int /*long*/ result = OS.SendMessage (hwnd, OS.TVM_GETITEM, 0, tvItem); return (result != 0) && ((tvItem.state >> 12) > 2); } @@ -720,10 +726,10 @@ public TreeItem getItem (int index) { checkWidget (); if (index < 0) error (SWT.ERROR_INVALID_RANGE); if (!parent.checkData (this, true)) error (SWT.ERROR_WIDGET_DISPOSED); - int hwnd = parent.handle; - int hFirstItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, handle); + int /*long*/ hwnd = parent.handle; + int /*long*/ hFirstItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, handle); if (hFirstItem == 0) error (SWT.ERROR_INVALID_RANGE); - int hItem = parent.findItem (hFirstItem, index); + int /*long*/ hItem = parent.findItem (hFirstItem, index); if (hItem == 0) error (SWT.ERROR_INVALID_RANGE); return parent._getItem (hItem); } @@ -742,8 +748,8 @@ public TreeItem getItem (int index) { public int getItemCount () { checkWidget (); if (!parent.checkData (this, true)) error (SWT.ERROR_WIDGET_DISPOSED); - int hwnd = parent.handle; - int hItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, handle); + int /*long*/ hwnd = parent.handle; + int /*long*/ hItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, handle); if (hItem == 0) return 0; return parent.getItemCount (hItem); } @@ -767,8 +773,8 @@ public int getItemCount () { public TreeItem [] getItems () { checkWidget (); if (!parent.checkData (this, true)) error (SWT.ERROR_WIDGET_DISPOSED); - int hwnd = parent.handle; - int hItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, handle); + int /*long*/ hwnd = parent.handle; + int /*long*/ hItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, handle); if (hItem == 0) return new TreeItem [0]; return parent.getItems (hItem); } @@ -855,8 +861,8 @@ public Tree getParent () { */ public TreeItem getParentItem () { checkWidget (); - int hwnd = parent.handle; - int hItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_PARENT, handle); + int /*long*/ hwnd = parent.handle; + int /*long*/ hItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_PARENT, handle); return hItem != 0 ? parent._getItem (hItem) : null; } @@ -944,14 +950,14 @@ public int indexOf (TreeItem item) { checkWidget (); if (item == null) error (SWT.ERROR_NULL_ARGUMENT); if (item.isDisposed()) error(SWT.ERROR_INVALID_ARGUMENT); - int hwnd = parent.handle; - int hItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, handle); + int /*long*/ hwnd = parent.handle; + int /*long*/ hItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, handle); return hItem == 0 ? -1 : parent.findIndex (hItem, item.handle); } void redraw () { if (parent.currentItem == this || parent.drawCount != 0) return; - int hwnd = parent.handle; + int /*long*/ hwnd = parent.handle; if (!OS.IsWindowVisible (hwnd)) return; /* * When there are no columns and the tree is not @@ -960,7 +966,7 @@ void redraw () { */ boolean full = (parent.style & (SWT.FULL_SELECTION | SWT.VIRTUAL)) != 0; if (!full) { - int hwndHeader = parent.hwndHeader; + int /*long*/ hwndHeader = parent.hwndHeader; if (hwndHeader != 0) { full = OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0) != 0; } @@ -978,7 +984,7 @@ void redraw () { void redraw (int column, boolean drawText, boolean drawImage) { if (parent.currentItem == this || parent.drawCount != 0) return; - int hwnd = parent.handle; + int /*long*/ hwnd = parent.handle; if (!OS.IsWindowVisible (hwnd)) return; boolean fullImage = column == 0 && drawText && drawImage; RECT rect = getBounds (column, drawText, drawImage, true, fullImage, true, 0); @@ -1004,7 +1010,8 @@ void releaseWidget () { super.releaseWidget (); strings = null; images = null; - cellBackground = cellForeground = cellFont = null; + cellBackground = cellForeground = null; + cellFont = null; } /** @@ -1019,13 +1026,13 @@ void releaseWidget () { */ public void removeAll () { checkWidget (); - int hwnd = parent.handle; + int /*long*/ hwnd = parent.handle; TVITEM tvItem = new TVITEM (); tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_PARAM; tvItem.hItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, handle); while (tvItem.hItem != 0) { OS.SendMessage (hwnd, OS.TVM_GETITEM, 0, tvItem); - TreeItem item = tvItem.lParam != -1 ? parent.items [tvItem.lParam] : null; + TreeItem item = tvItem.lParam != -1 ? parent.items [(int)/*64*/tvItem.lParam] : null; if (item != null && !item.isDisposed ()) { item.dispose (); } else { @@ -1127,7 +1134,7 @@ public void setBackground (int index, Color color) { public void setChecked (boolean checked) { checkWidget (); if ((parent.style & SWT.CHECK) == 0) return; - int hwnd = parent.handle; + int /*long*/ hwnd = parent.handle; TVITEM tvItem = new TVITEM (); tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_STATE; tvItem.stateMask = OS.TVIS_STATEIMAGEMASK; @@ -1175,7 +1182,7 @@ public void setExpanded (boolean expanded) { checkWidget (); /* Do nothing when the item is a leaf or already expanded */ - int hwnd = parent.handle; + int /*long*/ hwnd = parent.handle; if (OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, handle) == 0) { return; } @@ -1193,7 +1200,7 @@ public void setExpanded (boolean expanded) { * with TVIS_EXPANDED, the entire state is returned. The fix is * to explicitly check for the TVIS_EXPANDED bit. */ - state = OS.SendMessage (hwnd, OS.TVM_GETITEMSTATE, handle, OS.TVIS_EXPANDED); + state = (int)/*64*/OS.SendMessage (hwnd, OS.TVM_GETITEMSTATE, handle, OS.TVIS_EXPANDED); } if (((state & OS.TVIS_EXPANDED) != 0) == expanded) return; @@ -1213,9 +1220,10 @@ public void setExpanded (boolean expanded) { RECT oldRect = null; RECT [] rects = null; SCROLLINFO oldInfo = null; - int count = 0, hBottomItem = 0; + int count = 0; + int /*long*/ hBottomItem = 0; boolean redraw = false, noScroll = true; - int hTopItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_FIRSTVISIBLE, 0); + int /*long*/ hTopItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_FIRSTVISIBLE, 0); if (noScroll && hTopItem != 0) { oldInfo = new SCROLLINFO (); oldInfo.cbSize = SCROLLINFO.sizeof; @@ -1225,9 +1233,10 @@ public void setExpanded (boolean expanded) { } if (parent.drawCount == 0 && OS.IsWindowVisible (hwnd)) { boolean noAnimate = true; - count = OS.SendMessage (hwnd, OS.TVM_GETVISIBLECOUNT, 0, 0); + count = (int)/*64*/OS.SendMessage (hwnd, OS.TVM_GETVISIBLECOUNT, 0, 0); rects = new RECT [count + 1]; - int hItem = hTopItem, index = 0; + int /*long*/ hItem = hTopItem; + int index = 0; while (hItem != 0 && (noAnimate || hItem != handle) && index < count) { RECT rect = new RECT (); if (OS.TreeView_GetItemRect (hwnd, hItem, rect, true)) { @@ -1241,7 +1250,7 @@ public void setExpanded (boolean expanded) { hBottomItem = hItem; oldRect = new RECT (); OS.GetClientRect (hwnd, oldRect); - int topHandle = parent.topHandle (); + int /*long*/ topHandle = parent.topHandle (); OS.UpdateWindow (topHandle); OS.DefWindowProc (topHandle, OS.WM_SETREDRAW, 0, 0); if (hwnd != topHandle) { @@ -1268,7 +1277,7 @@ public void setExpanded (boolean expanded) { * check whether the selection has changed and issue * the event. */ - int hOldItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); + int /*long*/ hOldItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); /* Expand or collapse the item */ parent.ignoreExpand = true; @@ -1296,7 +1305,7 @@ public void setExpanded (boolean expanded) { newInfo.fMask = OS.SIF_ALL; if (OS.GetScrollInfo (hwnd, OS.SB_HORZ, newInfo)) { if (oldInfo.nPos != newInfo.nPos) { - int lParam = OS.MAKELPARAM (OS.SB_THUMBPOSITION, oldInfo.nPos); + int /*long*/ lParam = OS.MAKELPARAM (OS.SB_THUMBPOSITION, oldInfo.nPos); OS.SendMessage (hwnd, OS.WM_HSCROLL, lParam, 0); } } @@ -1307,7 +1316,8 @@ public void setExpanded (boolean expanded) { RECT newRect = new RECT (); OS.GetClientRect (hwnd, newRect); if (OS.EqualRect (oldRect, newRect)) { - int hItem = hTopItem, index = 0; + int /*long*/ hItem = hTopItem; + int index = 0; while (hItem != 0 && index < count) { RECT rect = new RECT (); if (OS.TreeView_GetItemRect (hwnd, hItem, rect, true)) { @@ -1321,7 +1331,7 @@ public void setExpanded (boolean expanded) { fixScroll = index == count && hItem == hBottomItem; } } - int topHandle = parent.topHandle (); + int /*long*/ topHandle = parent.topHandle (); OS.DefWindowProc (topHandle, OS.WM_SETREDRAW, 1, 0); if (hwnd != topHandle) { OS.DefWindowProc (hwnd, OS.WM_SETREDRAW, 1, 0); @@ -1357,7 +1367,7 @@ public void setExpanded (boolean expanded) { } /* Check for a selection event */ - int hNewItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); + int /*long*/ hNewItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); if (hNewItem != hOldItem) { Event event = new Event (); if (hNewItem != 0) { @@ -1390,7 +1400,7 @@ public void setFont (Font font){ if (font != null && font.isDisposed ()) { SWT.error (SWT.ERROR_INVALID_ARGUMENT); } - int hFont = -1; + int /*long*/ hFont = -1; if (font != null) { parent.customDraw = true; hFont = font.handle; @@ -1407,7 +1417,7 @@ public void setFont (Font font){ if ((parent.style & SWT.VIRTUAL) == 0 && !cached && !parent.painted) { return; } - int hwnd = parent.handle; + int /*long*/ hwnd = parent.handle; TVITEM tvItem = new TVITEM (); tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_TEXT; tvItem.hItem = handle; @@ -1442,13 +1452,13 @@ public void setFont (int index, Font font) { } int count = Math.max (1, parent.getColumnCount ()); if (0 > index || index > count - 1) return; - int hFont = -1; + int /*long*/ hFont = -1; if (font != null) { parent.customDraw = true; hFont = font.handle; } if (cellFont == null) { - cellFont = new int [count]; + cellFont = new int /*long*/ [count]; for (int i = 0; i < count; i++) { cellFont [i] = -1; } @@ -1466,7 +1476,7 @@ public void setFont (int index, Font font) { if ((parent.style & SWT.VIRTUAL) == 0 && !cached && !parent.painted) { return; } - int hwnd = parent.handle; + int /*long*/ hwnd = parent.handle; TVITEM tvItem = new TVITEM (); tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_TEXT; tvItem.hItem = handle; @@ -1570,7 +1580,7 @@ public void setForeground (int index, Color color){ public void setGrayed (boolean grayed) { checkWidget (); if ((parent.style & SWT.CHECK) == 0) return; - int hwnd = parent.handle; + int /*long*/ hwnd = parent.handle; TVITEM tvItem = new TVITEM (); tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_STATE; tvItem.stateMask = OS.TVIS_STATEIMAGEMASK; @@ -1679,7 +1689,7 @@ public void setImage (int index, Image image) { if ((parent.style & SWT.VIRTUAL) == 0 &&!cached && !parent.painted) { return; } - int hwnd = parent.handle; + int /*long*/ hwnd = parent.handle; TVITEM tvItem = new TVITEM (); tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_IMAGE | OS.TVIF_SELECTEDIMAGE; tvItem.hItem = handle; @@ -1719,8 +1729,8 @@ public void setImage (Image image) { public void setItemCount (int count) { checkWidget (); count = Math.max (0, count); - int hwnd = parent.handle; - int hItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, handle); + int /*long*/ hwnd = parent.handle; + int /*long*/ hItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, handle); parent.setItemCount (count, handle, hItem); } @@ -1786,7 +1796,7 @@ public void setText (int index, String string) { if ((parent.style & SWT.VIRTUAL) == 0 && !cached && !parent.painted) { return; } - int hwnd = parent.handle; + int /*long*/ hwnd = parent.handle; TVITEM tvItem = new TVITEM (); tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_TEXT; tvItem.hItem = handle; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java index 82a4807a63..4e14315445 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java @@ -198,7 +198,7 @@ public void addDisposeListener (DisposeListener listener) { addListener (SWT.Dispose, typedListener); } -int callWindowProc (int hwnd, int msg, int wParam, int lParam) { +int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) { return 0; } @@ -350,7 +350,7 @@ void destroyWidget () { releaseHandle (); } -int DeferWindowPos(int hWinPosInfo, int hWnd, int hWndInsertAfter, int X, int Y, int cx, int cy, int uFlags){ +int /*long*/ DeferWindowPos(int /*long*/ hWinPosInfo, int /*long*/ hWnd, int /*long*/ hWndInsertAfter, int X, int Y, int cx, int cy, int uFlags){ if (OS.IsWinCE) { /* * Feature in Windows. On Windows CE, DeferWindowPos always causes @@ -410,7 +410,7 @@ public void dispose () { release (true); } -boolean dragDetect (int hwnd, int x, int y, boolean filter, boolean [] detect, boolean [] consume) { +boolean dragDetect (int /*long*/ hwnd, int x, int y, boolean filter, boolean [] detect, boolean [] consume) { if (consume != null) consume [0] = false; if (detect != null) detect [0] = true; POINT pt = new POINT (); @@ -436,7 +436,7 @@ boolean filters (int eventType) { return display.filters (eventType); } -Widget findItem (int id) { +Widget findItem (int /*long*/ id) { return null; } @@ -674,7 +674,7 @@ boolean isValidThread () { return getDisplay ().isValidThread (); } -void mapEvent (int hwnd, Event event) { +void mapEvent (int /*long*/ hwnd, Event event) { } GC new_GC (GCData data) { @@ -965,23 +965,23 @@ void sendEvent (int eventType, Event event, boolean send) { } } -boolean sendKeyEvent (int type, int msg, int wParam, int lParam) { +boolean sendKeyEvent (int type, int msg, int /*long*/ wParam, int /*long*/ lParam) { Event event = new Event (); if (!setKeyState (event, type, wParam, lParam)) return true; return sendKeyEvent (type, msg, wParam, lParam, event); } -boolean sendKeyEvent (int type, int msg, int wParam, int lParam, Event event) { +boolean sendKeyEvent (int type, int msg, int /*long*/ wParam, int /*long*/ lParam, Event event) { sendEvent (type, event); if (isDisposed ()) return false; return event.doit; } -boolean sendMouseEvent (int type, int button, int hwnd, int msg, int wParam, int lParam) { +boolean sendMouseEvent (int type, int button, int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) { return sendMouseEvent (type, button, display.getClickCount (type, button, hwnd, lParam), 0, false, hwnd, msg, wParam, lParam); } -boolean sendMouseEvent (int type, int button, int count, int detail, boolean send, int hwnd, int msg, int wParam, int lParam) { +boolean sendMouseEvent (int type, int button, int count, int detail, boolean send, int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) { if (!hooks (type) && !filters (type)) return true; Event event = new Event (); event.button = button; @@ -1146,7 +1146,7 @@ boolean setInputState (Event event, int type) { return true; } -boolean setKeyState (Event event, int type, int wParam, int lParam) { +boolean setKeyState (Event event, int type, int /*long*/ wParam, int /*long*/ lParam) { /* * Feature in Windows. When the user presses Ctrl+Backspace @@ -1208,7 +1208,7 @@ boolean setKeyState (Event event, int type, int wParam, int lParam) { return setInputState (event, type); } -boolean SetWindowPos (int hWnd, int hWndInsertAfter, int X, int Y, int cx, int cy, int uFlags) { +boolean SetWindowPos (int /*long*/ hWnd, int /*long*/ hWndInsertAfter, int X, int Y, int cx, int cy, int uFlags) { if (OS.IsWinCE) { /* * Feature in Windows. On Windows CE, SetWindowPos() always causes @@ -1267,12 +1267,12 @@ public String toString () { return getName () + " {" + string + "}"; //$NON-NLS-1$ //$NON-NLS-2$ } -LRESULT wmCaptureChanged (int hwnd, int wParam, int lParam) { +LRESULT wmCaptureChanged (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) { display.captureChanged = true; return null; } -LRESULT wmChar (int hwnd, int wParam, int lParam) { +LRESULT wmChar (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) { /* * Do not report a lead byte as a key pressed. */ @@ -1280,7 +1280,7 @@ LRESULT wmChar (int hwnd, int wParam, int lParam) { byte lead = (byte) (wParam & 0xFF); if (OS.IsDBCSLeadByte (lead)) return null; } - display.lastAscii = wParam; + display.lastAscii = (int)/*64*/wParam; display.lastNull = wParam == 0; if (!sendKeyEvent (SWT.KeyDown, OS.WM_CHAR, wParam, lParam)) { return LRESULT.ONE; @@ -1289,7 +1289,7 @@ LRESULT wmChar (int hwnd, int wParam, int lParam) { return null; } -LRESULT wmContextMenu (int hwnd, int wParam, int lParam) { +LRESULT wmContextMenu (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) { if (wParam != hwnd) return null; /* @@ -1336,10 +1336,10 @@ LRESULT wmContextMenu (int hwnd, int wParam, int lParam) { return showMenu (x, y) ? LRESULT.ZERO : null; } -LRESULT wmIMEChar (int hwnd, int wParam, int lParam) { +LRESULT wmIMEChar (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) { Display display = this.display; display.lastKey = 0; - display.lastAscii = wParam; + display.lastAscii = (int)/*64*/wParam; display.lastVirtual = display.lastNull = display.lastDead = false; if (!sendKeyEvent (SWT.KeyDown, OS.WM_IME_CHAR, wParam, lParam)) { return LRESULT.ONE; @@ -1350,10 +1350,10 @@ LRESULT wmIMEChar (int hwnd, int wParam, int lParam) { return LRESULT.ONE; } -LRESULT wmKeyDown (int hwnd, int wParam, int lParam) { +LRESULT wmKeyDown (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) { /* Ignore repeating modifier keys by testing key down state */ - switch (wParam) { + switch ((int)/*64*/wParam) { case OS.VK_SHIFT: case OS.VK_MENU: case OS.VK_CONTROL: @@ -1387,7 +1387,7 @@ LRESULT wmKeyDown (int hwnd, int wParam, int lParam) { */ int mapKey = 0; if (OS.IsWinCE) { - switch (wParam) { + switch ((int)/*64*/wParam) { case OS.VK_BACK: mapKey = SWT.BS; break; case OS.VK_RETURN: mapKey = SWT.CR; break; case OS.VK_DELETE: mapKey = SWT.DEL; break; @@ -1395,7 +1395,7 @@ LRESULT wmKeyDown (int hwnd, int wParam, int lParam) { case OS.VK_TAB: mapKey = SWT.TAB; break; } } else { - mapKey = OS.MapVirtualKey (wParam, 2); + mapKey = OS.MapVirtualKey ((int)/*64*/wParam, 2); } /* @@ -1425,7 +1425,7 @@ LRESULT wmKeyDown (int hwnd, int wParam, int lParam) { if (OS.PeekMessage (msg, hwnd, OS.WM_DEADCHAR, OS.WM_DEADCHAR, flags)) { display.lastDead = true; display.lastVirtual = mapKey == 0; - display.lastKey = display.lastVirtual ? wParam : mapKey; + display.lastKey = display.lastVirtual ? (int)/*64*/wParam : mapKey; return null; } @@ -1462,9 +1462,9 @@ LRESULT wmKeyDown (int hwnd, int wParam, int lParam) { * they are not virtual. Therefore it is necessary to force * numeric keypad keys to be virtual. */ - display.lastVirtual = mapKey == 0 || display.numpadKey (wParam) != 0; + display.lastVirtual = mapKey == 0 || display.numpadKey ((int)/*64*/wParam) != 0; if (display.lastVirtual) { - display.lastKey = wParam; + display.lastKey = (int)/*64*/wParam; /* * Feature in Windows. The virtual key VK_DELETE is not * treated as both a virtual key and an ASCII key by Windows. @@ -1521,7 +1521,7 @@ LRESULT wmKeyDown (int hwnd, int wParam, int lParam) { * WM_CHAR. If this is the case, issue the key down event from * inside WM_CHAR. */ - int asciiKey = display.asciiKey (wParam); + int asciiKey = display.asciiKey ((int)/*64*/wParam); if (asciiKey != 0) { /* * When the user types Ctrl+Space, ToAscii () maps this to @@ -1531,7 +1531,7 @@ LRESULT wmKeyDown (int hwnd, int wParam, int lParam) { * issue the event from WM_CHAR. */ if (asciiKey == ' ') return null; - if (asciiKey != wParam) return null; + if (asciiKey != (int)/*64*/wParam) return null; /* * Feature in Windows. The virtual key VK_CANCEL is treated * as both a virtual key and ASCII key by Windows. This @@ -1558,7 +1558,7 @@ LRESULT wmKeyDown (int hwnd, int wParam, int lParam) { * depend on the international keyboard. */ if (OS.GetKeyState (OS.VK_SHIFT) < 0) { - display.lastAscii = display.shiftedKey (wParam); + display.lastAscii = display.shiftedKey ((int)/*64*/wParam); if (display.lastAscii == 0) display.lastAscii = mapKey; } else { display.lastAscii = OS.CharLower ((short) mapKey); @@ -1575,7 +1575,7 @@ LRESULT wmKeyDown (int hwnd, int wParam, int lParam) { return null; } -LRESULT wmKeyUp (int hwnd, int wParam, int lParam) { +LRESULT wmKeyUp (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) { Display display = this.display; /* Check for hardware keys */ @@ -1584,7 +1584,7 @@ LRESULT wmKeyUp (int hwnd, int wParam, int lParam) { display.lastKey = display.lastAscii = 0; display.lastVirtual = display.lastNull = display.lastDead = false; Event event = new Event (); - event.detail = wParam - OS.VK_APP1 + 1; + event.detail = (int)/*64*/wParam - OS.VK_APP1 + 1; /* Check the bit 30 to get the key state */ int type = (lParam & 0x40000000) != 0 ? SWT.HardKeyUp : SWT.HardKeyDown; if (setInputState (event, type)) sendEvent (type, event); @@ -1615,7 +1615,7 @@ LRESULT wmKeyUp (int hwnd, int wParam, int lParam) { */ int mapKey = 0; if (OS.IsWinCE) { - switch (wParam) { + switch ((int)/*64*/wParam) { case OS.VK_BACK: mapKey = SWT.BS; break; case OS.VK_RETURN: mapKey = SWT.CR; break; case OS.VK_DELETE: mapKey = SWT.DEL; break; @@ -1623,7 +1623,7 @@ LRESULT wmKeyUp (int hwnd, int wParam, int lParam) { case OS.VK_TAB: mapKey = SWT.TAB; break; } } else { - mapKey = OS.MapVirtualKey (wParam, 2); + mapKey = OS.MapVirtualKey ((int)/*64*/wParam, 2); } /* @@ -1649,9 +1649,9 @@ LRESULT wmKeyUp (int hwnd, int wParam, int lParam) { * they are not virtual. Therefore it is necessary to force * numeric keypad keys to be virtual. */ - display.lastVirtual = mapKey == 0 || display.numpadKey (wParam) != 0; + display.lastVirtual = mapKey == 0 || display.numpadKey ((int)/*64*/wParam) != 0; if (display.lastVirtual) { - display.lastKey = wParam; + display.lastKey = (int)/*64*/wParam; } else { /* * Feature in Windows. The virtual key VK_CANCEL is treated @@ -1677,8 +1677,8 @@ LRESULT wmKeyUp (int hwnd, int wParam, int lParam) { return result; } -LRESULT wmKillFocus (int hwnd, int wParam, int lParam) { - int code = callWindowProc (hwnd, OS.WM_KILLFOCUS, wParam, lParam); +LRESULT wmKillFocus (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) { + int /*long*/ code = callWindowProc (hwnd, OS.WM_KILLFOCUS, wParam, lParam); sendFocusEvent (SWT.FocusOut); // widget could be disposed at this point @@ -1694,7 +1694,7 @@ LRESULT wmKillFocus (int hwnd, int wParam, int lParam) { return new LRESULT (code); } -LRESULT wmLButtonDblClk (int hwnd, int wParam, int lParam) { +LRESULT wmLButtonDblClk (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) { /* * Feature in Windows. Windows sends the following * messages when the user double clicks the mouse: @@ -1723,7 +1723,7 @@ LRESULT wmLButtonDblClk (int hwnd, int wParam, int lParam) { return result; } -LRESULT wmLButtonDown (int hwnd, int wParam, int lParam) { +LRESULT wmLButtonDown (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) { Display display = this.display; LRESULT result = null; int x = OS.GET_X_LPARAM (lParam); @@ -1811,7 +1811,7 @@ LRESULT wmLButtonDown (int hwnd, int wParam, int lParam) { return result; } -LRESULT wmLButtonUp (int hwnd, int wParam, int lParam) { +LRESULT wmLButtonUp (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) { Display display = this.display; LRESULT result = null; if (sendMouseEvent (SWT.MouseUp, 1, hwnd, OS.WM_LBUTTONUP, wParam, lParam)) { @@ -1833,7 +1833,7 @@ LRESULT wmLButtonUp (int hwnd, int wParam, int lParam) { return result; } -LRESULT wmMButtonDblClk (int hwnd, int wParam, int lParam) { +LRESULT wmMButtonDblClk (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) { /* * Feature in Windows. Windows sends the following * messages when the user double clicks the mouse: @@ -1862,7 +1862,7 @@ LRESULT wmMButtonDblClk (int hwnd, int wParam, int lParam) { return result; } -LRESULT wmMButtonDown (int hwnd, int wParam, int lParam) { +LRESULT wmMButtonDown (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = null; Display display = this.display; display.captureChanged = false; @@ -1877,7 +1877,7 @@ LRESULT wmMButtonDown (int hwnd, int wParam, int lParam) { return result; } -LRESULT wmMButtonUp (int hwnd, int wParam, int lParam) { +LRESULT wmMButtonUp (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) { Display display = this.display; LRESULT result = null; if (sendMouseEvent (SWT.MouseUp, 2, hwnd, OS.WM_MBUTTONUP, wParam, lParam)) { @@ -1899,14 +1899,14 @@ LRESULT wmMButtonUp (int hwnd, int wParam, int lParam) { return result; } -LRESULT wmMouseHover (int hwnd, int wParam, int lParam) { +LRESULT wmMouseHover (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) { if (!sendMouseEvent (SWT.MouseHover, 0, hwnd, OS.WM_MOUSEHOVER, wParam, lParam)) { return LRESULT.ZERO; } return null; } -LRESULT wmMouseLeave (int hwnd, int wParam, int lParam) { +LRESULT wmMouseLeave (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) { if (!hooks (SWT.MouseExit) && !filters (SWT.MouseExit)) return null; int pos = OS.GetMessagePos (); POINT pt = new POINT (); @@ -1919,7 +1919,7 @@ LRESULT wmMouseLeave (int hwnd, int wParam, int lParam) { return null; } -LRESULT wmMouseMove (int hwnd, int wParam, int lParam) { +LRESULT wmMouseMove (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = null; Display display = this.display; int pos = OS.GetMessagePos (); @@ -1971,7 +1971,7 @@ LRESULT wmMouseMove (int hwnd, int wParam, int lParam) { return result; } -LRESULT wmMouseWheel (int hwnd, int wParam, int lParam) { +LRESULT wmMouseWheel (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) { if (!hooks (SWT.MouseWheel) && !filters (SWT.MouseWheel)) return null; int delta = OS.GET_WHEEL_DELTA_WPARAM (wParam); int [] value = new int [1]; @@ -1994,7 +1994,7 @@ LRESULT wmMouseWheel (int hwnd, int wParam, int lParam) { return null; } -LRESULT wmPaint (int hwnd, int wParam, int lParam) { +LRESULT wmPaint (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) { /* Exit early - don't draw the background */ if (!hooks (SWT.Paint) && !filters (SWT.Paint)) { @@ -2002,7 +2002,7 @@ LRESULT wmPaint (int hwnd, int wParam, int lParam) { } /* Issue a paint event */ - int result = 0; + int /*long*/ result = 0; if (OS.IsWinCE) { RECT rect = new RECT (); OS.GetUpdateRect (hwnd, rect, false); @@ -2040,7 +2040,7 @@ LRESULT wmPaint (int hwnd, int wParam, int lParam) { gc.dispose (); } } else { - int rgn = OS.CreateRectRgn (0, 0, 0, 0); + int /*long*/ rgn = OS.CreateRectRgn (0, 0, 0, 0); OS.GetUpdateRgn (hwnd, rgn, false); result = callWindowProc (hwnd, OS.WM_PAINT, wParam, lParam); GCData data = new GCData (); @@ -2053,7 +2053,7 @@ LRESULT wmPaint (int hwnd, int wParam, int lParam) { int width = rect.right - rect.left; int height = rect.bottom - rect.top; if (width != 0 && height != 0) { - int hDC = gc.handle; + int /*long*/ hDC = gc.handle; OS.SelectClipRgn (hDC, rgn); OS.SetMetaRgn (hDC); Event event = new Event (); @@ -2075,7 +2075,7 @@ LRESULT wmPaint (int hwnd, int wParam, int lParam) { return new LRESULT (result); } -LRESULT wmPrint (int hwnd, int wParam, int lParam) { +LRESULT wmPrint (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) { /* * Bug in Windows. When WM_PRINT is used to print the contents * of a control that has WS_EX_CLIENTEDGE, the old 3D border is @@ -2086,7 +2086,7 @@ LRESULT wmPrint (int hwnd, int wParam, int lParam) { if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) { int bits = OS.GetWindowLong (hwnd, OS.GWL_EXSTYLE); if ((bits & OS.WS_EX_CLIENTEDGE) != 0) { - int code = callWindowProc (hwnd, OS.WM_PRINT, wParam, lParam); + int /*long*/ code = callWindowProc (hwnd, OS.WM_PRINT, wParam, lParam); RECT rect = new RECT (); OS.GetWindowRect (hwnd, rect); rect.right -= rect.left; @@ -2102,7 +2102,7 @@ LRESULT wmPrint (int hwnd, int wParam, int lParam) { return null; } -LRESULT wmRButtonDblClk (int hwnd, int wParam, int lParam) { +LRESULT wmRButtonDblClk (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) { /* * Feature in Windows. Windows sends the following * messages when the user double clicks the mouse: @@ -2131,7 +2131,7 @@ LRESULT wmRButtonDblClk (int hwnd, int wParam, int lParam) { return result; } -LRESULT wmRButtonDown (int hwnd, int wParam, int lParam) { +LRESULT wmRButtonDown (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = null; Display display = this.display; display.captureChanged = false; @@ -2146,7 +2146,7 @@ LRESULT wmRButtonDown (int hwnd, int wParam, int lParam) { return result; } -LRESULT wmRButtonUp (int hwnd, int wParam, int lParam) { +LRESULT wmRButtonUp (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) { Display display = this.display; LRESULT result = null; if (sendMouseEvent (SWT.MouseUp, 3, hwnd, OS.WM_RBUTTONUP, wParam, lParam)) { @@ -2170,8 +2170,8 @@ LRESULT wmRButtonUp (int hwnd, int wParam, int lParam) { return result; } -LRESULT wmSetFocus (int hwnd, int wParam, int lParam) { - int code = callWindowProc (hwnd, OS.WM_SETFOCUS, wParam, lParam); +LRESULT wmSetFocus (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) { + int /*long*/ code = callWindowProc (hwnd, OS.WM_SETFOCUS, wParam, lParam); sendFocusEvent (SWT.FocusIn); // widget could be disposed at this point @@ -2187,9 +2187,9 @@ LRESULT wmSetFocus (int hwnd, int wParam, int lParam) { return new LRESULT (code); } -LRESULT wmSysChar (int hwnd, int wParam, int lParam) { +LRESULT wmSysChar (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) { Display display = this.display; - display.lastAscii = wParam; + display.lastAscii = (int)/*64*/wParam; display.lastNull = wParam == 0; /* Do not issue a key down if a menu bar mnemonic was invoked */ @@ -2200,7 +2200,7 @@ LRESULT wmSysChar (int hwnd, int wParam, int lParam) { /* Call the window proc to determine whether it is a system key or mnemonic */ boolean oldKeyHit = display.mnemonicKeyHit; display.mnemonicKeyHit = true; - int result = callWindowProc (hwnd, OS.WM_SYSCHAR, wParam, lParam); + int /*long*/ result = callWindowProc (hwnd, OS.WM_SYSCHAR, wParam, lParam); boolean consumed = false; if (!display.mnemonicKeyHit) { consumed = !sendKeyEvent (SWT.KeyDown, OS.WM_SYSCHAR, wParam, lParam); @@ -2211,7 +2211,7 @@ LRESULT wmSysChar (int hwnd, int wParam, int lParam) { return consumed ? LRESULT.ONE : new LRESULT (result); } -LRESULT wmSysKeyDown (int hwnd, int wParam, int lParam) { +LRESULT wmSysKeyDown (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) { /* * Feature in Windows. When WM_SYSKEYDOWN is sent, * the user pressed ALT+<key> or F10 to get to the @@ -2226,9 +2226,9 @@ LRESULT wmSysKeyDown (int hwnd, int wParam, int lParam) { } /* Ignore well known system keys */ - switch (wParam) { + switch ((int)/*64*/wParam) { case OS.VK_F4: { - int hwndShell = hwnd; + int /*long*/ hwndShell = hwnd; while (OS.GetParent (hwndShell) != 0) { if (OS.GetWindow (hwndShell, OS.GW_OWNER) != 0) break; hwndShell = OS.GetParent (hwndShell); @@ -2239,7 +2239,7 @@ LRESULT wmSysKeyDown (int hwnd, int wParam, int lParam) { } /* Ignore repeating modifier keys by testing key down state */ - switch (wParam) { + switch ((int)/*64*/wParam) { case OS.VK_SHIFT: case OS.VK_MENU: case OS.VK_CONTROL: @@ -2265,7 +2265,7 @@ LRESULT wmSysKeyDown (int hwnd, int wParam, int lParam) { */ int mapKey = 0; if (OS.IsWinCE) { - switch (wParam) { + switch ((int)/*64*/wParam) { case OS.VK_BACK: mapKey = SWT.BS; break; case OS.VK_RETURN: mapKey = SWT.CR; break; case OS.VK_DELETE: mapKey = SWT.DEL; break; @@ -2273,11 +2273,11 @@ LRESULT wmSysKeyDown (int hwnd, int wParam, int lParam) { case OS.VK_TAB: mapKey = SWT.TAB; break; } } else { - mapKey = OS.MapVirtualKey (wParam, 2); + mapKey = OS.MapVirtualKey ((int)/*64*/wParam, 2); } - display.lastVirtual = mapKey == 0 || display.numpadKey (wParam) != 0; + display.lastVirtual = mapKey == 0 || display.numpadKey ((int)/*64*/wParam) != 0; if (display.lastVirtual) { - display.lastKey = wParam; + display.lastKey = (int)/*64*/wParam; /* * Feature in Windows. The virtual key VK_DELETE is not * treated as both a virtual key and an ASCII key by Windows. @@ -2334,11 +2334,11 @@ LRESULT wmSysKeyDown (int hwnd, int wParam, int lParam) { return null; } -LRESULT wmSysKeyUp (int hwnd, int wParam, int lParam) { +LRESULT wmSysKeyUp (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) { return wmKeyUp (hwnd, wParam, lParam); } -LRESULT wmXButtonDblClk (int hwnd, int wParam, int lParam) { +LRESULT wmXButtonDblClk (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) { /* * Feature in Windows. Windows sends the following * messages when the user double clicks the mouse: @@ -2368,7 +2368,7 @@ LRESULT wmXButtonDblClk (int hwnd, int wParam, int lParam) { return result; } -LRESULT wmXButtonDown (int hwnd, int wParam, int lParam) { +LRESULT wmXButtonDown (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) { LRESULT result = null; Display display = this.display; display.captureChanged = false; @@ -2385,7 +2385,7 @@ LRESULT wmXButtonDown (int hwnd, int wParam, int lParam) { return result; } -LRESULT wmXButtonUp (int hwnd, int wParam, int lParam) { +LRESULT wmXButtonUp (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) { Display display = this.display; LRESULT result = null; int button = OS.HIWORD (wParam) == OS.XBUTTON1 ? 4 : 5; |