Make 64-bit the default source code

1 files changed, 199 insertions, 199 deletions

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 7f7ad8410e..92056be90c 100644
--- 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
@@ -58,7 +58,7 @@ public abstract class Control extends Widget implements Drawable {
 	 * 
 	 * @noreference This field is not intended to be referenced by clients.
 	 */
-	public int /*long*/ handle;
+	public long /*int*/ handle;
 	Composite parent;
 	Cursor cursor;
 	Menu menu;
@@ -531,7 +531,7 @@ int binarySearch (int [] indices, int start, int end, int index) {
 	return -low - 1;
 }
 
-int /*long*/ borderHandle () {
+long /*int*/ borderHandle () {
 	return handle;
 }
 
@@ -572,7 +572,7 @@ void checkComposited () {
 	/* Do nothing */
 }
 
-boolean checkHandle (int /*long*/ hwnd) {
+boolean checkHandle (long /*int*/ hwnd) {
 	return hwnd == handle;
 }
 
@@ -690,7 +690,7 @@ Widget [] computeTabList () {
 }
 
 void createHandle () {
-	int /*long*/ hwndParent = widgetParent ();
+	long /*int*/ hwndParent = widgetParent ();
 	handle = OS.CreateWindowEx (
 		widgetExtStyle (),
 		windowClass (),
@@ -707,7 +707,7 @@ void createHandle () {
 		OS.SetWindowLongPtr (handle, OS.GWLP_ID, handle);
 	}
 	if (OS.IsDBLocale && hwndParent != 0) {
-		int /*long*/ hIMC = OS.ImmGetContext (hwndParent);
+		long /*int*/ hIMC = OS.ImmGetContext (hwndParent);
 		OS.ImmAssociateContext (handle, hIMC);
 		OS.ImmReleaseContext (hwndParent, hIMC);
 	}
@@ -722,8 +722,8 @@ void checkGesture () {
 			 * Feature in Windows 7: All gestures are enabled by default except GID_ROTATE.
 			 * Enable it explicitly by calling SetGestureConfig.
 			 */
-			int /*long*/ hHeap = OS.GetProcessHeap ();
-			int /*long*/ pConfigs = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY,  GESTURECONFIG.sizeof);
+			long /*int*/ hHeap = OS.GetProcessHeap ();
+			long /*int*/ pConfigs = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY,  GESTURECONFIG.sizeof);
 			if (pConfigs != 0) {
 				GESTURECONFIG config = new GESTURECONFIG();
 				config.dwID = OS.GID_ROTATE;
@@ -761,7 +761,7 @@ int defaultBackground () {
 	return OS.GetSysColor (OS.COLOR_BTNFACE);
 }
 
-int /*long*/ defaultFont () {
+long /*int*/ defaultFont () {
 	return display.getSystemFont ().handle;
 }
 
@@ -774,7 +774,7 @@ void deregister () {
 }
 
 void destroyWidget () {
-	int /*long*/ hwnd = topHandle ();
+	long /*int*/ hwnd = topHandle ();
 	releaseHandle ();
 	if (hwnd != 0) {
 		OS.DestroyWindow (hwnd);
@@ -902,7 +902,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 /*long*/ lParam = OS.MAKELPARAM (x, y);
+			long /*int*/ lParam = OS.MAKELPARAM (x, y);
 			OS.SendMessage (handle, OS.WM_LBUTTONUP, wParam, lParam);
 		}
 		return false;
@@ -910,17 +910,17 @@ boolean dragDetect (int button, int count, int stateMask, int x, int y) {
 	return sendDragEvent (button, stateMask, x, y);
 }
 
-void drawBackground (int /*long*/ hDC) {
+void drawBackground (long /*int*/ hDC) {
 	RECT rect = new RECT ();
 	OS.GetClientRect (handle, rect);
 	drawBackground (hDC, rect);
 }
 
-void drawBackground (int /*long*/ hDC, RECT rect) {
+void drawBackground (long /*int*/ hDC, RECT rect) {
 	drawBackground (hDC, rect, -1, 0, 0);
 }
 
-void drawBackground (int /*long*/ hDC, RECT rect, int pixel, int tx, int ty) {
+void drawBackground (long /*int*/ hDC, RECT rect, int pixel, int tx, int ty) {
 	Control control = findBackgroundControl ();
 	if (control != null) {
 		if (control.backgroundImage != null) {
@@ -944,21 +944,21 @@ void drawBackground (int /*long*/ hDC, RECT rect, int pixel, int tx, int ty) {
 	fillBackground (hDC, pixel, rect);
 }
 
-void drawImageBackground (int /*long*/ hDC, int /*long*/ hwnd, int /*long*/ hBitmap, RECT rect, int tx, int ty) {
+void drawImageBackground (long /*int*/ hDC, long /*int*/ hwnd, long /*int*/ hBitmap, RECT rect, int tx, int ty) {
 	RECT rect2 = new RECT ();
 	OS.GetClientRect (hwnd, rect2);
 	OS.MapWindowPoints (hwnd, handle, rect2, 2);
-	int /*long*/ hBrush = findBrush (hBitmap, OS.BS_PATTERN);
+	long /*int*/ hBrush = findBrush (hBitmap, OS.BS_PATTERN);
 	POINT lpPoint = new POINT ();
 	OS.GetWindowOrgEx (hDC, lpPoint);
 	OS.SetBrushOrgEx (hDC, -rect2.left - lpPoint.x - tx, -rect2.top - lpPoint.y - ty, lpPoint);
-	int /*long*/ hOldBrush = OS.SelectObject (hDC, hBrush);
+	long /*int*/ 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 /*long*/ hDC, int /*long*/ hwnd, RECT rect) {
+void drawThemeBackground (long /*int*/ hDC, long /*int*/ hwnd, RECT rect) {
 	/* Do nothing */
 }
 
@@ -970,9 +970,9 @@ void enableWidget (boolean enabled) {
 	OS.EnableWindow (handle, enabled);
 }
 
-void fillBackground (int /*long*/ hDC, int pixel, RECT rect) {
+void fillBackground (long /*int*/ hDC, int pixel, RECT rect) {
 	if (rect.left > rect.right || rect.top > rect.bottom) return;
-	int /*long*/ hPalette = display.hPalette;
+	long /*int*/ hPalette = display.hPalette;
 	if (hPalette != 0) {
 		OS.SelectPalette (hDC, hPalette, false);
 		OS.RealizePalette (hDC);
@@ -980,7 +980,7 @@ void fillBackground (int /*long*/ hDC, int pixel, RECT rect) {
 	OS.FillRect (hDC, rect, findBrush (pixel, OS.BS_SOLID));
 }
 
-void fillImageBackground (int /*long*/ hDC, Control control, RECT rect, int tx, int ty) {
+void fillImageBackground (long /*int*/ hDC, Control control, RECT rect, int tx, int ty) {
 	if (rect.left > rect.right || rect.top > rect.bottom) return;
 	if (control != null) {
 		Image image = control.backgroundImage;
@@ -990,7 +990,7 @@ void fillImageBackground (int /*long*/ hDC, Control control, RECT rect, int tx,
 	}
 }
 
-void fillThemeBackground (int /*long*/ hDC, Control control, RECT rect) {
+void fillThemeBackground (long /*int*/ hDC, Control control, RECT rect) {
 	if (rect.left > rect.right || rect.top > rect.bottom) return;
 	if (control != null) {
 		control.drawThemeBackground (hDC, handle, rect);
@@ -1002,7 +1002,7 @@ Control findBackgroundControl () {
 	return (state & PARENT_BACKGROUND) != 0 ? parent.findBackgroundControl () : null;
 }
 
-int /*long*/ findBrush (int /*long*/ value, int lbStyle) {
+long /*int*/ findBrush (long /*int*/ value, int lbStyle) {
 	return parent.findBrush (value, lbStyle);
 }
 
@@ -1207,7 +1207,7 @@ int getBackgroundPixel () {
  */
 public int getBorderWidth () {
 	checkWidget ();
-	int /*long*/ borderHandle = borderHandle ();
+	long /*int*/ 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);
@@ -1234,7 +1234,7 @@ public Rectangle getBounds () {
 	forceResize ();
 	RECT rect = new RECT ();
 	OS.GetWindowRect (topHandle (), rect);
-	int /*long*/ hwndParent = parent == null ? 0 : parent.handle;
+	long /*int*/ hwndParent = parent == null ? 0 : parent.handle;
 	OS.MapWindowPoints (0, hwndParent, rect, 2);
 	int width = rect.right - rect.left;
 	int height =  rect.bottom - rect.top;
@@ -1243,7 +1243,7 @@ public Rectangle getBounds () {
 
 int getCodePage () {
 	if (OS.IsUnicode) return OS.CP_ACP;
-	int /*long*/ hFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0);
+	long /*int*/ 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;
@@ -1257,11 +1257,11 @@ int getCodePage () {
 String getClipboardText () {
 	String string = "";
 	if (OS.OpenClipboard (0)) {
-		int /*long*/ hMem = OS.GetClipboardData (OS.IsUnicode ? OS.CF_UNICODETEXT : OS.CF_TEXT);
+		long /*int*/ 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 /*long*/ ptr = OS.GlobalLock (hMem);
+			long /*int*/ ptr = OS.GlobalLock (hMem);
 			if (ptr != 0) {
 				/* Use the character encoding for the default locale */
 				TCHAR buffer = new TCHAR (0, byteCount / TCHAR.sizeof);
@@ -1351,7 +1351,7 @@ public boolean getEnabled () {
 public Font getFont () {
 	checkWidget ();
 	if (font != null) return font;
-	int /*long*/ hFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0);
+	long /*int*/ hFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0);
 	if (hFont == 0) hFont = defaultFont ();
 	return Font.win32_new (display, hFont);
 }
@@ -1408,7 +1408,7 @@ public Point getLocation () {
 	forceResize ();
 	RECT rect = new RECT ();
 	OS.GetWindowRect (topHandle (), rect);
-	int /*long*/ hwndParent = parent == null ? 0 : parent.handle;
+	long /*int*/ hwndParent = parent == null ? 0 : parent.handle;
 	OS.MapWindowPoints (0, hwndParent, rect, 2);
 	return new Point (rect.left, rect.top);
 }
@@ -1450,7 +1450,7 @@ public Monitor getMonitor () {
 	if (OS.IsWinCE || OS.WIN32_VERSION < OS.VERSION (4, 10)) {
 		return display.getPrimaryMonitor ();
 	}
-	int /*long*/ hmonitor = OS.MonitorFromWindow (handle, OS.MONITOR_DEFAULTTONEAREST);
+	long /*int*/ hmonitor = OS.MonitorFromWindow (handle, OS.MONITOR_DEFAULTTONEAREST);
 	MONITORINFO lpmi = new MONITORINFO ();
 	lpmi.cbSize = MONITORINFO.sizeof;
 	OS.GetMonitorInfo (hmonitor, lpmi);
@@ -1659,7 +1659,7 @@ boolean hasFocus () {
 	* then this control is considered to have focus
 	* even though it does not have focus in Windows.
 	*/
-	int /*long*/ hwndFocus = OS.GetFocus ();
+	long /*int*/ hwndFocus = OS.GetFocus ();
 	while (hwndFocus != 0) {
 		if (hwndFocus == handle) return true;
 		if (display.getControl (hwndFocus) != null) {
@@ -1685,12 +1685,12 @@ boolean hasFocus () {
  * 
  * @noreference This method is not intended to be referenced by clients.
  */
-public int /*long*/ internal_new_GC (GCData data) {
+public long /*int*/ internal_new_GC (GCData data) {
 	checkWidget();
-	int /*long*/ hwnd = handle;
+	long /*int*/ hwnd = handle;
 	if (data != null && data.hwnd != 0) hwnd = data.hwnd;
 	if (data != null) data.hwnd = hwnd;
-	int /*long*/ hDC = 0;
+	long /*int*/ hDC = 0;
 	if (data == null || data.ps == null) {
 		hDC = OS.GetDC (hwnd);
 	} else {
@@ -1741,9 +1741,9 @@ public int /*long*/ internal_new_GC (GCData data) {
  * 
  * @noreference This method is not intended to be referenced by clients.
  */
-public void internal_dispose_GC (int /*long*/ hDC, GCData data) {
+public void internal_dispose_GC (long /*int*/ hDC, GCData data) {
 	checkWidget ();
-	int /*long*/ hwnd = handle;
+	long /*int*/ hwnd = handle;
 	if (data != null && data.hwnd != 0) {
 		hwnd = data.hwnd;
 	}
@@ -1874,7 +1874,7 @@ boolean isShowing () {
 	*/
 //	if (!OS.IsWindowVisible (handle)) return false;
 //	int flags = OS.DCX_CACHE | OS.DCX_CLIPCHILDREN | OS.DCX_CLIPSIBLINGS;
-//	int /*long*/ hDC = OS.GetDCEx (handle, 0, flags);
+//	long /*int*/ hDC = OS.GetDCEx (handle, 0, flags);
 //	int result = OS.GetClipBox (hDC, new RECT ());
 //	OS.ReleaseDC (handle, hDC);
 //	return result != OS.NULLREGION;
@@ -1900,7 +1900,7 @@ boolean isTabItem () {
 	}
 	int bits = OS.GetWindowLong (handle, OS.GWL_STYLE);
 	if ((bits & OS.WS_TABSTOP) != 0) return false;
-	int /*long*/ code = OS.SendMessage (handle, OS.WM_GETDLGCODE, 0, 0);
+	long /*int*/ 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;
@@ -1928,7 +1928,7 @@ public boolean isVisible () {
 	return getVisible () && parent.isVisible ();
 }
 
-void mapEvent (int /*long*/ hwnd, Event event) {
+void mapEvent (long /*int*/ hwnd, Event event) {
 	if (hwnd != handle) {
 		POINT point = new POINT ();
 		point.x = event.x;
@@ -1977,11 +1977,11 @@ boolean mnemonicMatch (char key) {
  */
 public void moveAbove (Control control) {
 	checkWidget ();
-	int /*long*/ topHandle = topHandle (), hwndAbove = OS.HWND_TOP;
+	long /*int*/ topHandle = topHandle (), hwndAbove = OS.HWND_TOP;
 	if (control != null) {
 		if (control.isDisposed ()) error(SWT.ERROR_INVALID_ARGUMENT);
 		if (parent != control.parent) return;
-		int /*long*/ hwnd = control.topHandle ();
+		long /*int*/ hwnd = control.topHandle ();
 		if (hwnd == 0 || hwnd == topHandle) return;
 		hwndAbove = OS.GetWindow (hwnd, OS.GW_HWNDPREV);
 		/*
@@ -2021,7 +2021,7 @@ public void moveAbove (Control control) {
  */
 public void moveBelow (Control control) {
 	checkWidget ();
-	int /*long*/ topHandle = topHandle (), hwndAbove = OS.HWND_BOTTOM;
+	long /*int*/ topHandle = topHandle (), hwndAbove = OS.HWND_BOTTOM;
 	if (control != null) {
 		if (control.isDisposed ()) error(SWT.ERROR_INVALID_ARGUMENT);
 		if (parent != control.parent) return;
@@ -2045,7 +2045,7 @@ public void moveBelow (Control control) {
 			* this case and do nothing because the control is already
 			* at the bottom.
 			*/
-			int /*long*/ hwndParent = parent.handle, hwnd = hwndParent;
+			long /*int*/ 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;
@@ -2132,14 +2132,14 @@ public boolean print (GC gc) {
 	if (gc == null) error (SWT.ERROR_NULL_ARGUMENT);
 	if (gc.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
 	if (!OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (5, 1)) {
-		int /*long*/ topHandle = topHandle ();
-		int /*long*/ hdc = gc.handle;
+		long /*int*/ topHandle = topHandle ();
+		long /*int*/ hdc = gc.handle;
 		int state = 0;
-		int /*long*/ gdipGraphics = gc.getGCData().gdipGraphics;
+		long /*int*/ gdipGraphics = gc.getGCData().gdipGraphics;
 		if (gdipGraphics != 0) {
-			int /*long*/ clipRgn = 0;
+			long /*int*/ clipRgn = 0;
 			Gdip.Graphics_SetPixelOffsetMode(gdipGraphics, Gdip.PixelOffsetModeNone);
-			int /*long*/ rgn = Gdip.Region_new();
+			long /*int*/ rgn = Gdip.Region_new();
 			if (rgn == 0) error(SWT.ERROR_NO_HANDLES);
 			Gdip.Graphics_GetClip(gdipGraphics, rgn);
 			if (!Gdip.Region_IsInfinite(rgn, gdipGraphics)) {
@@ -2148,7 +2148,7 @@ public boolean print (GC gc) {
 			Gdip.Region_delete(rgn);
 			Gdip.Graphics_SetPixelOffsetMode(gdipGraphics, Gdip.PixelOffsetModeHalf);
 			float[] lpXform = null;
-			int /*long*/ matrix = Gdip.Matrix_new(1, 0, 0, 1, 0, 0);
+			long /*int*/ matrix = Gdip.Matrix_new(1, 0, 0, 1, 0, 0);
 			if (matrix == 0) error(SWT.ERROR_NO_HANDLES);
 			Gdip.Graphics_GetTransform(gdipGraphics, matrix);
 			if (!Gdip.Matrix_IsIdentity(matrix)) {
@@ -2183,7 +2183,7 @@ public boolean print (GC gc) {
 	return false;
 }
 
-void printWidget (int /*long*/ hwnd, int /*long*/ hdc, GC gc) {
+void printWidget (long /*int*/ hwnd, long /*int*/ hdc, GC gc) {
 	/*
 	* Bug in Windows.  For some reason, PrintWindow()
 	* returns success but does nothing when it is called
@@ -2198,8 +2198,8 @@ void printWidget (int /*long*/ hwnd, int /*long*/ hdc, GC gc) {
 		* The fix is temporarily reparent the window to the desktop,
 		* call PrintWindow() then reparent the window back.
 		*/
-		int /*long*/ hwndParent = OS.GetParent (hwnd);
-		int /*long*/ hwndShell = hwndParent;
+		long /*int*/ hwndParent = OS.GetParent (hwnd);
+		long /*int*/ hwndShell = hwndParent;
 		while (OS.GetParent (hwndShell) != 0) {
 			if (OS.GetWindow (hwndShell, OS.GW_OWNER) != 0) break;
 			hwndShell = OS.GetParent (hwndShell);
@@ -2221,8 +2221,8 @@ void printWidget (int /*long*/ hwnd, int /*long*/ hdc, GC gc) {
 		* back.
 		*/
 		if (!fixPrintWindow) {
-			int /*long*/ rgn = OS.CreateRectRgn(0, 0, 0, 0);
-			int /*long*/ parent = OS.GetParent(hwnd);
+			long /*int*/ rgn = OS.CreateRectRgn(0, 0, 0, 0);
+			long /*int*/ parent = OS.GetParent(hwnd);
 			while (parent != hwndShell && !fixPrintWindow) {
 				if (OS.GetWindowRgn(parent, rgn) != 0) {
 					fixPrintWindow = true;
@@ -2233,7 +2233,7 @@ void printWidget (int /*long*/ hwnd, int /*long*/ hdc, GC gc) {
 		}
 		int bits1 = OS.GetWindowLong (hwnd, OS.GWL_STYLE);
 		int bits2 = OS.GetWindowLong (hwnd, OS.GWL_EXSTYLE);
-		int /*long*/ hwndInsertAfter = OS.GetWindow (hwnd, OS.GW_HWNDPREV);
+		long /*int*/ hwndInsertAfter = OS.GetWindow (hwnd, OS.GW_HWNDPREV);
 		/*
 		* Bug in Windows.  For some reason, when GetWindow ()
 		* with GW_HWNDPREV is used to query the previous window
@@ -2798,7 +2798,7 @@ public void removeTraverseListener(TraverseListener listener) {
 }
 
 void showWidget (boolean visible) {
-	int /*long*/ topHandle = topHandle ();
+	long /*int*/ 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);
 }
@@ -3034,7 +3034,7 @@ public void setBackgroundImage (Image image) {
 	updateBackgroundImage ();
 }
 
-void setBackgroundImage (int /*long*/ hBitmap) {
+void setBackgroundImage (long /*int*/ hBitmap) {
 	if (OS.IsWinCE) {
 		OS.InvalidateRect (handle, null, true);
 	} else {
@@ -3095,7 +3095,7 @@ void setBounds (int x, int y, int width, int height, int flags, boolean defer) {
 			}
 		}
 	}
-	int /*long*/ topHandle = topHandle ();
+	long /*int*/ topHandle = topHandle ();
 	if (defer && parent != null) {
 		forceResize ();
 		if (parent.lpwp != null) {
@@ -3173,7 +3173,7 @@ public void setCapture (boolean capture) {
 }
 
 void setCursor () {
-	int /*long*/ lParam = OS.MAKELPARAM (OS.HTCLIENT, OS.WM_MOUSEMOVE);
+	long /*int*/ lParam = OS.MAKELPARAM (OS.HTCLIENT, OS.WM_MOUSEMOVE);
 	OS.SendMessage (handle, OS.WM_SETCURSOR, handle, lParam);
 }
 
@@ -3201,15 +3201,15 @@ public void setCursor (Cursor cursor) {
 	if (cursor != null && cursor.isDisposed()) error(SWT.ERROR_INVALID_ARGUMENT);
 	this.cursor = cursor;
 	if (OS.IsWinCE) {
-		int /*long*/ hCursor = cursor != null ? cursor.handle : 0;
+		long /*int*/ hCursor = cursor != null ? cursor.handle : 0;
 		OS.SetCursor (hCursor);
 		return;
 	}
-	int /*long*/ hwndCursor = OS.GetCapture ();
+	long /*int*/ hwndCursor = OS.GetCapture ();
 	if (hwndCursor == 0) {
 		POINT pt = new POINT ();
 		if (!OS.GetCursorPos (pt)) return;
-		int /*long*/ hwnd = hwndCursor = OS.WindowFromPoint (pt);
+		long /*int*/ hwnd = hwndCursor = OS.WindowFromPoint (pt);
 		while (hwnd != 0 && hwnd != handle) {
 			hwnd = OS.GetParent (hwnd);
 		}
@@ -3221,7 +3221,7 @@ public void setCursor (Cursor cursor) {
 }
 
 void setDefaultFont () {
-	int /*long*/ hFont = display.getSystemFont ().handle;
+	long /*int*/ hFont = display.getSystemFont ().handle;
 	OS.SendMessage (handle, OS.WM_SETFONT, hFont, 0);
 }
 
@@ -3320,7 +3320,7 @@ public boolean setFocus () {
  */
 public void setFont (Font font) {
 	checkWidget ();
-	int /*long*/ hFont = 0;
+	long /*int*/ hFont = 0;
 	if (font != null) { 
 		if (font.isDisposed()) error(SWT.ERROR_INVALID_ARGUMENT);
 		hFont = font.handle;
@@ -3540,7 +3540,7 @@ public void setRedraw (boolean redraw) {
 	}
 	if (redraw) {
 		if (--drawCount == 0) {
-			int /*long*/ topHandle = topHandle ();
+			long /*int*/ 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) {
@@ -3559,7 +3559,7 @@ public void setRedraw (boolean redraw) {
 		}
 	} else {
 		if (drawCount++ == 0) {
-			int /*long*/ topHandle = topHandle ();
+			long /*int*/ topHandle = topHandle ();
 			OS.SendMessage (topHandle, OS.WM_SETREDRAW, 0, 0);
 			if (handle != topHandle) OS.SendMessage (handle, OS.WM_SETREDRAW, 0, 0);
 		}
@@ -3586,7 +3586,7 @@ public void setRedraw (boolean redraw) {
 public void setRegion (Region region) {
 	checkWidget ();
 	if (region != null && region.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT);
-	int /*long*/ hRegion = 0;
+	long /*int*/ hRegion = 0;
 	if (region != null) {
 		hRegion = OS.CreateRectRgn (0, 0, 0, 0);
 		OS.CombineRgn (hRegion, region.handle, hRegion, OS.RGN_OR);
@@ -3779,8 +3779,8 @@ void sort (int [] items) {
 }
 
 void subclass () {
-	int /*long*/ oldProc = windowProc ();
-	int /*long*/ newProc = display.windowProc;
+	long /*int*/ oldProc = windowProc ();
+	long /*int*/ newProc = display.windowProc;
 	if (oldProc == newProc) return;
 	OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, newProc);
 }
@@ -3877,7 +3877,7 @@ public Point toDisplay (Point point) {
 	return toDisplay (point.x, point.y);
 }
 
-int /*long*/ topHandle () {
+long /*int*/ topHandle () {
 	return handle;
 }
 
@@ -3894,9 +3894,9 @@ boolean translateMnemonic (Event event, Control control) {
 
 boolean translateMnemonic (MSG msg) {
 	if (msg.wParam < 0x20) return false;
-	int /*long*/ hwnd = msg.hwnd;
+	long /*int*/ hwnd = msg.hwnd;
 	if (OS.GetKeyState (OS.VK_MENU) >= 0) {
-		int /*long*/ code = OS.SendMessage (hwnd, OS.WM_GETDLGCODE, 0, 0);
+		long /*int*/ 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;
 	}
@@ -3914,7 +3914,7 @@ boolean translateMnemonic (MSG msg) {
 }
 
 boolean translateTraversal (MSG msg) {
-	int /*long*/ hwnd = msg.hwnd;
+	long /*int*/ hwnd = msg.hwnd;
 	int key = (int)/*64*/msg.wParam;
 	if (key == OS.VK_MENU) {
 		if ((msg.lParam & 0x40000000) == 0) {
@@ -3930,7 +3930,7 @@ boolean translateTraversal (MSG msg) {
 		case OS.VK_ESCAPE: {
 			all = true;
 			lastAscii = 27;
-			int /*long*/ code = OS.SendMessage (hwnd, OS.WM_GETDLGCODE, 0, 0);
+			long /*int*/ code = OS.SendMessage (hwnd, OS.WM_GETDLGCODE, 0, 0);
 			if ((code & OS.DLGC_WANTALLKEYS) != 0) {
 				/*
 				* Use DLGC_HASSETSEL to determine that the control
@@ -3947,7 +3947,7 @@ boolean translateTraversal (MSG msg) {
 		case OS.VK_RETURN: {
 			all = true;
 			lastAscii = '\r';
-			int /*long*/ code = OS.SendMessage (hwnd, OS.WM_GETDLGCODE, 0, 0);
+			long /*int*/ code = OS.SendMessage (hwnd, OS.WM_GETDLGCODE, 0, 0);
 			if ((code & OS.DLGC_WANTALLKEYS) != 0) doit = false;
 			detail = SWT.TRAVERSE_RETURN;
 			break;
@@ -3955,7 +3955,7 @@ boolean translateTraversal (MSG msg) {
 		case OS.VK_TAB: {
 			lastAscii = '\t';
 			boolean next = OS.GetKeyState (OS.VK_SHIFT) >= 0;
-			int /*long*/ code = OS.SendMessage (hwnd, OS.WM_GETDLGCODE, 0, 0);
+			long /*int*/ 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
@@ -3989,7 +3989,7 @@ boolean translateTraversal (MSG msg) {
 				if (key == OS.VK_LEFT || key == OS.VK_RIGHT) return false;
 			}
 			lastVirtual = true;
-			int /*long*/ code = OS.SendMessage (hwnd, OS.WM_GETDLGCODE, 0, 0);
+			long /*int*/ 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;
 			if (parent != null && (parent.style & SWT.MIRRORED) != 0) {
@@ -4003,7 +4003,7 @@ boolean translateTraversal (MSG msg) {
 			all = true;
 			lastVirtual = true;
 			if (OS.GetKeyState (OS.VK_CONTROL) >= 0) return false;
-			int /*long*/ code = OS.SendMessage (hwnd, OS.WM_GETDLGCODE, 0, 0);
+			long /*int*/ 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
@@ -4340,8 +4340,8 @@ boolean traverseReturn () {
 }
 
 void unsubclass () {
-	int /*long*/ newProc = windowProc ();
-	int /*long*/ oldProc = display.windowProc;
+	long /*int*/ newProc = windowProc ();
+	long /*int*/ oldProc = display.windowProc;
 	if (oldProc == newProc) return;
 	OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, newProc);
 }
@@ -4449,7 +4449,7 @@ int widgetExtStyle () {
 	return bits;
 }
 
-int /*long*/ widgetParent () {
+long /*int*/ widgetParent () {
 	return parent.handle;
 }
 
@@ -4506,7 +4506,7 @@ public boolean setParent (Composite parent) {
 		Menu [] menus = oldShell.findMenus (this);
 		fixChildren (newShell, oldShell, newDecorations, oldDecorations, menus);
 	}
-	int /*long*/ topHandle = topHandle ();
+	long /*int*/ 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; 
@@ -4517,9 +4517,9 @@ public boolean setParent (Composite parent) {
 
 abstract TCHAR windowClass ();
 
-abstract int /*long*/ windowProc ();
+abstract long /*int*/ windowProc ();
 
-int /*long*/ windowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) {
+long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
 	LRESULT result = null;
 	switch (msg) {
 		case OS.WM_ACTIVATE:			result = WM_ACTIVATE (wParam, lParam); break;
@@ -4623,32 +4623,32 @@ int /*long*/ windowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*
 	return callWindowProc (hwnd, msg, wParam, lParam);
 }
 
-LRESULT WM_ACTIVATE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_ACTIVATE (long /*int*/ wParam, long /*int*/ lParam) {
 	return null;
 }
 
-LRESULT WM_CAPTURECHANGED (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_CAPTURECHANGED (long /*int*/ wParam, long /*int*/ lParam) {
 	return wmCaptureChanged (handle, wParam, lParam);
 }
 
-LRESULT WM_CHANGEUISTATE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_CHANGEUISTATE (long /*int*/ wParam, long /*int*/ lParam) {
 	if ((state & IGNORE_WM_CHANGEUISTATE) != 0) return LRESULT.ZERO;
 	return null;
 }
 
-LRESULT WM_CHAR (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_CHAR (long /*int*/ wParam, long /*int*/ lParam) {
 	return wmChar (handle, wParam, lParam);
 }
 
-LRESULT WM_CLEAR (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_CLEAR (long /*int*/ wParam, long /*int*/ lParam) {
 	return null;
 }
 
-LRESULT WM_CLOSE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_CLOSE (long /*int*/ wParam, long /*int*/ lParam) {
 	return null;
 }
 
-LRESULT WM_COMMAND (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_COMMAND (long /*int*/ wParam, long /*int*/ lParam) {
 	/*
 	* When the WM_COMMAND message is sent from a
 	* menu, the HWND parameter in LPARAM is zero.
@@ -4669,12 +4669,12 @@ LRESULT WM_COMMAND (int /*long*/ wParam, int /*long*/ lParam) {
 	return control.wmCommandChild (wParam, lParam);
 }
 
-LRESULT WM_CONTEXTMENU (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_CONTEXTMENU (long /*int*/ wParam, long /*int*/ lParam) {
 	return wmContextMenu (handle, wParam, lParam);
 }
 
-LRESULT WM_CTLCOLOR (int /*long*/ wParam, int /*long*/ lParam) {
-	int /*long*/ hPalette = display.hPalette;
+LRESULT WM_CTLCOLOR (long /*int*/ wParam, long /*int*/ lParam) {
+	long /*int*/ hPalette = display.hPalette;
 	if (hPalette != 0) {
 		OS.SelectPalette (wParam, hPalette, false);
 		OS.RealizePalette (wParam);
@@ -4684,15 +4684,15 @@ LRESULT WM_CTLCOLOR (int /*long*/ wParam, int /*long*/ lParam) {
 	return control.wmColorChild (wParam, lParam);
 }
 
-LRESULT WM_CUT (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_CUT (long /*int*/ wParam, long /*int*/ lParam) {
 	return null;
 }
 
-LRESULT WM_DESTROY (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_DESTROY (long /*int*/ wParam, long /*int*/ lParam) {
 	return null;
 }
 
-LRESULT WM_DRAWITEM (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_DRAWITEM (long /*int*/ wParam, long /*int*/ lParam) {
 	DRAWITEMSTRUCT struct = new DRAWITEMSTRUCT ();
 	OS.MoveMemory (struct, lParam, DRAWITEMSTRUCT.sizeof);
 	if (struct.CtlType == OS.ODT_MENU) {
@@ -4705,15 +4705,15 @@ LRESULT WM_DRAWITEM (int /*long*/ wParam, int /*long*/ lParam) {
 	return control.wmDrawChild (wParam, lParam);
 }
 
-LRESULT WM_ENDSESSION (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_ENDSESSION (long /*int*/ wParam, long /*int*/ lParam) {
 	return null;
 }
 
-LRESULT WM_ENTERIDLE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_ENTERIDLE (long /*int*/ wParam, long /*int*/ lParam) {
 	return null;
 }
 
-LRESULT WM_ERASEBKGND (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_ERASEBKGND (long /*int*/ wParam, long /*int*/ lParam) {
 	if ((state & DRAW_BACKGROUND) != 0) {
 		if (findImageControl () != null) return LRESULT.ONE;
 	}
@@ -4725,7 +4725,7 @@ LRESULT WM_ERASEBKGND (int /*long*/ wParam, int /*long*/ lParam) {
 	return null;
 }
 
-LRESULT WM_GESTURE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_GESTURE (long /*int*/ wParam, long /*int*/ lParam) {
 	if (hooks (SWT.Gesture) || filters (SWT.Gesture)) {
 		GESTUREINFO gi = new GESTUREINFO ();
 		gi.cbSize = GESTUREINFO.sizeof;
@@ -4739,31 +4739,31 @@ LRESULT WM_GESTURE (int /*long*/ wParam, int /*long*/ lParam) {
 	return null;
 }
 
-LRESULT WM_GETDLGCODE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_GETDLGCODE (long /*int*/ wParam, long /*int*/ lParam) {
 	return null;
 }
 
-LRESULT WM_GETFONT (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_GETFONT (long /*int*/ wParam, long /*int*/ lParam) {
 	return null;
 }
 
-LRESULT WM_GETOBJECT (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_GETOBJECT (long /*int*/ wParam, long /*int*/ lParam) {
 	if (accessible != null) {
-		int /*long*/ result = accessible.internal_WM_GETOBJECT (wParam, lParam);
+		long /*int*/ result = accessible.internal_WM_GETOBJECT (wParam, lParam);
 		if (result != 0) return new LRESULT (result);
 	}
 	return null;
 }
 
-LRESULT WM_GETMINMAXINFO (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_GETMINMAXINFO (long /*int*/ wParam, long /*int*/ lParam) {
 	return null;
 }
 
-LRESULT WM_HOTKEY (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_HOTKEY (long /*int*/ wParam, long /*int*/ lParam) {
 	return null;
 }
 
-LRESULT WM_HELP (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_HELP (long /*int*/ wParam, long /*int*/ lParam) {
 	if (OS.IsWinCE) return null;
 	HELPINFO lphi = new HELPINFO ();
 	OS.MoveMemory (lphi, lParam, HELPINFO.sizeof);
@@ -4780,7 +4780,7 @@ LRESULT WM_HELP (int /*long*/ wParam, int /*long*/ lParam) {
 				if (menu.hooks (SWT.Help)) widget = menu;
 			}
 			if (widget != null) {
-				int /*long*/ hwndShell = shell.handle;
+				long /*int*/ hwndShell = shell.handle;
 				OS.SendMessage (hwndShell, OS.WM_CANCELMODE, 0, 0);
 				widget.postEvent (SWT.Help);
 				return LRESULT.ONE;
@@ -4795,29 +4795,29 @@ LRESULT WM_HELP (int /*long*/ wParam, int /*long*/ lParam) {
 	return null;
 }
 
-LRESULT WM_HSCROLL (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_HSCROLL (long /*int*/ wParam, long /*int*/ lParam) {
 	Control control = display.getControl (lParam);
 	if (control == null) return null;
 	return control.wmScrollChild (wParam, lParam);
 }
 
-LRESULT WM_IME_CHAR (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_IME_CHAR (long /*int*/ wParam, long /*int*/ lParam) {
 	return wmIMEChar (handle, wParam, lParam);
 }
 
-LRESULT WM_IME_COMPOSITION (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_IME_COMPOSITION (long /*int*/ wParam, long /*int*/ lParam) {
 	return null;
 }
 
-LRESULT WM_IME_COMPOSITION_START (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_IME_COMPOSITION_START (long /*int*/ wParam, long /*int*/ lParam) {
 	return null;
 }
 
-LRESULT WM_IME_ENDCOMPOSITION (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_IME_ENDCOMPOSITION (long /*int*/ wParam, long /*int*/ lParam) {
 	return null;
 }
 
-LRESULT WM_UNINITMENUPOPUP (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_UNINITMENUPOPUP (long /*int*/ wParam, long /*int*/ lParam) {
 	Menu hiddenMenu = menuShell ().findMenu (wParam);
 	if (hiddenMenu != null) {
 		Shell shell = getShell ();
@@ -4827,7 +4827,7 @@ LRESULT WM_UNINITMENUPOPUP (int /*long*/ wParam, int /*long*/ lParam) {
 	return null;
 }
 
-LRESULT WM_INITMENUPOPUP (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_INITMENUPOPUP (long /*int*/ wParam, long /*int*/ lParam) {
 	
 	/* Ignore WM_INITMENUPOPUP for an accelerator */
 	if (display.accelKeyHit) return null;
@@ -4884,47 +4884,47 @@ LRESULT WM_INITMENUPOPUP (int /*long*/ wParam, int /*long*/ lParam) {
 	return null;
 }
 
-LRESULT WM_INPUTLANGCHANGE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_INPUTLANGCHANGE (long /*int*/ wParam, long /*int*/ lParam) {
 	return null;
 }
 
-LRESULT WM_KEYDOWN (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) {
 	return wmKeyDown (handle, wParam, lParam);
 }
 
-LRESULT WM_KEYUP (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_KEYUP (long /*int*/ wParam, long /*int*/ lParam) {
 	return wmKeyUp (handle, wParam, lParam);
 }
 
-LRESULT WM_KILLFOCUS (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_KILLFOCUS (long /*int*/ wParam, long /*int*/ lParam) {
 	return wmKillFocus (handle, wParam, lParam);
 }
 
-LRESULT WM_LBUTTONDBLCLK (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_LBUTTONDBLCLK (long /*int*/ wParam, long /*int*/ lParam) {
 	return wmLButtonDblClk (handle, wParam, lParam);
 }
 
-LRESULT WM_LBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) {
 	return wmLButtonDown (handle, wParam, lParam);
 }
 
-LRESULT WM_LBUTTONUP (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_LBUTTONUP (long /*int*/ wParam, long /*int*/ lParam) {
 	return wmLButtonUp (handle, wParam, lParam);
 }
 
-LRESULT WM_MBUTTONDBLCLK (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_MBUTTONDBLCLK (long /*int*/ wParam, long /*int*/ lParam) {
 	return wmMButtonDblClk (handle, wParam, lParam);
 }
 
-LRESULT WM_MBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_MBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) {
 	return wmMButtonDown (handle, wParam, lParam);
 }
 
-LRESULT WM_MBUTTONUP (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_MBUTTONUP (long /*int*/ wParam, long /*int*/ lParam) {
 	return wmMButtonUp (handle, wParam, lParam);
 }
 
-LRESULT WM_MEASUREITEM (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_MEASUREITEM (long /*int*/ wParam, long /*int*/ lParam) {
 	MEASUREITEMSTRUCT struct = new MEASUREITEMSTRUCT ();
 	OS.MoveMemory (struct, lParam, MEASUREITEMSTRUCT.sizeof);
 	if (struct.CtlType == OS.ODT_MENU) {
@@ -4932,13 +4932,13 @@ LRESULT WM_MEASUREITEM (int /*long*/ wParam, int /*long*/ lParam) {
 		if (item == null) return null;
 		return item.wmMeasureChild (wParam, lParam);
 	}
-	int /*long*/ hwnd = OS.GetDlgItem (handle, struct.CtlID);
+	long /*int*/ 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 /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_MENUCHAR (long /*int*/ wParam, long /*int*/ lParam) {
 	/*
 	* Feature in Windows.  When the user types Alt+<key>
 	* and <key> does not match a mnemonic in the System
@@ -4955,7 +4955,7 @@ LRESULT WM_MENUCHAR (int /*long*/ wParam, int /*long*/ lParam) {
 	return null;
 }
 
-LRESULT WM_MENUSELECT (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_MENUSELECT (long /*int*/ wParam, long /*int*/ lParam) {
 	int code = OS.HIWORD (wParam);
 	Shell shell = getShell ();
 	if (code == 0xFFFF && lParam == 0) {
@@ -5015,32 +5015,32 @@ LRESULT WM_MENUSELECT (int /*long*/ wParam, int /*long*/ lParam) {
 	return null;
 }
 
-LRESULT WM_MOUSEACTIVATE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_MOUSEACTIVATE (long /*int*/ wParam, long /*int*/ lParam) {
 	return null;
 }
 
-LRESULT WM_MOUSEHOVER (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_MOUSEHOVER (long /*int*/ wParam, long /*int*/ lParam) {
 	return wmMouseHover (handle, wParam, lParam);
 }
 
-LRESULT WM_MOUSELEAVE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_MOUSELEAVE (long /*int*/ wParam, long /*int*/ lParam) {
 	if (OS.COMCTL32_MAJOR >= 6) getShell ().fixToolTip ();
 	return wmMouseLeave (handle, wParam, lParam);
 }
 
-LRESULT WM_MOUSEMOVE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_MOUSEMOVE (long /*int*/ wParam, long /*int*/ lParam) {
 	return wmMouseMove (handle, wParam, lParam);
 }
 
-LRESULT WM_MOUSEWHEEL (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_MOUSEWHEEL (long /*int*/ wParam, long /*int*/ lParam) {
 	return wmMouseWheel (handle, wParam, lParam);
 }
 
-LRESULT WM_MOUSEHWHEEL (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_MOUSEHWHEEL (long /*int*/ wParam, long /*int*/ lParam) {
 	return wmMouseHWheel (handle, wParam, lParam);
 }
 
-LRESULT WM_MOVE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_MOVE (long /*int*/ wParam, long /*int*/ lParam) {
 	state |= MOVE_OCCURRED;
 	if (findImageControl () != null) {
 		if (this != getShell ()) redrawChildren ();
@@ -5058,83 +5058,83 @@ LRESULT WM_MOVE (int /*long*/ wParam, int /*long*/ lParam) {
 	return null;
 }
 
-LRESULT WM_NCACTIVATE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_NCACTIVATE (long /*int*/ wParam, long /*int*/ lParam) {
 	return null;
 }
 
-LRESULT WM_NCCALCSIZE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_NCCALCSIZE (long /*int*/ wParam, long /*int*/ lParam) {
 	return null;
 }
 
-LRESULT WM_NCHITTEST (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_NCHITTEST (long /*int*/ wParam, long /*int*/ lParam) {
 	if (!OS.IsWindowEnabled (handle)) return null;
 	if (!isActive ()) return new LRESULT (OS.HTTRANSPARENT);
 	return null;
 }
 
-LRESULT WM_NCLBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_NCLBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) {
 	return null;
 }
 
-LRESULT WM_NCPAINT (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_NCPAINT (long /*int*/ wParam, long /*int*/ lParam) {
 	return wmNCPaint (handle, wParam, lParam);
 }
 
-LRESULT WM_NOTIFY (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_NOTIFY (long /*int*/ wParam, long /*int*/ lParam) {
 	NMHDR hdr = new NMHDR ();
 	OS.MoveMemory (hdr, lParam, NMHDR.sizeof);
 	return wmNotify (hdr, wParam, lParam);
 }
 
-LRESULT WM_PAINT (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_PAINT (long /*int*/ wParam, long /*int*/ lParam) {
 	return wmPaint (handle, wParam, lParam);
 }
 
-LRESULT WM_PALETTECHANGED (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_PALETTECHANGED (long /*int*/ wParam, long /*int*/ lParam) {
 	return null;
 }
 
-LRESULT WM_PARENTNOTIFY (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_PARENTNOTIFY (long /*int*/ wParam, long /*int*/ lParam) {
 	return null;
 }
 
-LRESULT WM_PASTE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_PASTE (long /*int*/ wParam, long /*int*/ lParam) {
 	return null;
 }
 
-LRESULT WM_PRINT (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_PRINT (long /*int*/ wParam, long /*int*/ lParam) {
 	return wmPrint (handle, wParam, lParam);
 }
 
-LRESULT WM_PRINTCLIENT (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_PRINTCLIENT (long /*int*/ wParam, long /*int*/ lParam) {
 	return null;
 }
 
-LRESULT WM_QUERYENDSESSION (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_QUERYENDSESSION (long /*int*/ wParam, long /*int*/ lParam) {
 	return null;
 }
 
-LRESULT WM_QUERYNEWPALETTE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_QUERYNEWPALETTE (long /*int*/ wParam, long /*int*/ lParam) {
 	return null;
 }
 
-LRESULT WM_QUERYOPEN (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_QUERYOPEN (long /*int*/ wParam, long /*int*/ lParam) {
 	return null;
 }
 
-LRESULT WM_RBUTTONDBLCLK (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_RBUTTONDBLCLK (long /*int*/ wParam, long /*int*/ lParam) {
 	return wmRButtonDblClk (handle, wParam, lParam);
 }
 
-LRESULT WM_RBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_RBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) {
 	return wmRButtonDown (handle, wParam, lParam);
 }
 
-LRESULT WM_RBUTTONUP (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_RBUTTONUP (long /*int*/ wParam, long /*int*/ lParam) {
 	return wmRButtonUp (handle, wParam, lParam);
 }
 
-LRESULT WM_SETCURSOR (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SETCURSOR (long /*int*/ wParam, long /*int*/ lParam) {
 	int hitTest = (short) OS.LOWORD (lParam);
  	if (hitTest == OS.HTCLIENT) {
 		Control control = display.getControl (wParam);
@@ -5148,42 +5148,42 @@ LRESULT WM_SETCURSOR (int /*long*/ wParam, int /*long*/ lParam) {
 	return null;
 }
 
-LRESULT WM_SETFOCUS (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SETFOCUS (long /*int*/ wParam, long /*int*/ lParam) {
 	return wmSetFocus (handle, wParam, lParam);
 }
 
-LRESULT WM_SETTINGCHANGE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SETTINGCHANGE (long /*int*/ wParam, long /*int*/ lParam) {
 	return null;
 }
 
-LRESULT WM_SETFONT (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SETFONT (long /*int*/ wParam, long /*int*/ lParam) {
 	return null;
 }
 
-LRESULT WM_SETREDRAW (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SETREDRAW (long /*int*/ wParam, long /*int*/ lParam) {
 	return null;
 }
 
-LRESULT WM_SHOWWINDOW (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SHOWWINDOW (long /*int*/ wParam, long /*int*/ lParam) {
 	return null;
 }
 
-LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) {
 	state |= RESIZE_OCCURRED;
 	if ((state & RESIZE_DEFERRED) == 0) sendEvent (SWT.Resize);
 	// widget could be disposed at this point
 	return null;
 }
 
-LRESULT WM_SYSCHAR (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SYSCHAR (long /*int*/ wParam, long /*int*/ lParam) {
 	return wmSysChar (handle, wParam, lParam);
 }
 
-LRESULT WM_SYSCOLORCHANGE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SYSCOLORCHANGE (long /*int*/ wParam, long /*int*/ lParam) {
 	return null;
 }
 
-LRESULT WM_SYSCOMMAND (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SYSCOMMAND (long /*int*/ wParam, long /*int*/ lParam) {
 	/*
 	* Check to see if the command is a system command or
 	* a user menu item that was added to the System menu.
@@ -5205,7 +5205,7 @@ LRESULT WM_SYSCOMMAND (int /*long*/ wParam, int /*long*/ lParam) {
 	int cmd = (int)/*64*/wParam & 0xFFF0;
 	switch (cmd) {
 		case OS.SC_CLOSE:
-			int /*long*/ hwndShell = menuShell ().handle;
+			long /*int*/ hwndShell = menuShell ().handle;
 			int bits = OS.GetWindowLong (hwndShell, OS.GWL_STYLE);
 			if ((bits & OS.WS_SYSMENU) == 0) return LRESULT.ZERO;
 			break;
@@ -5298,19 +5298,19 @@ LRESULT WM_SYSCOMMAND (int /*long*/ wParam, int /*long*/ lParam) {
 	return null;
 }
 
-LRESULT WM_SYSKEYDOWN (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SYSKEYDOWN (long /*int*/ wParam, long /*int*/ lParam) {
 	return wmSysKeyDown (handle, wParam, lParam);
 }
 
-LRESULT WM_SYSKEYUP (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SYSKEYUP (long /*int*/ wParam, long /*int*/ lParam) {
 	return wmSysKeyUp (handle, wParam, lParam);
 }
 
-LRESULT WM_TABLET_FLICK (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_TABLET_FLICK (long /*int*/ wParam, long /*int*/ lParam) {
 	if (!hooks (SWT.Gesture) && !filters (SWT.Gesture)) return null;
 	Event event = new Event ();
 	FLICK_DATA fData = new FLICK_DATA ();
-	int /*long*/ [] source = new int /*long*/ [1];
+	long /*int*/ [] source = new long /*int*/ [1];
 	source[0] = wParam;
 	OS.MoveMemory (fData, source, OS.FLICK_DATA_sizeof ());
 	FLICK_POINT fPoint = new FLICK_POINT ();
@@ -5361,12 +5361,12 @@ LRESULT WM_TABLET_FLICK (int /*long*/ wParam, int /*long*/ lParam) {
 	return event.doit ? null : LRESULT.ONE;
 }
 
-LRESULT WM_TOUCH (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_TOUCH (long /*int*/ wParam, long /*int*/ lParam) {
 	LRESULT result = null;
 	if (hooks (SWT.Touch) || filters (SWT.Touch)) {
 		int cInputs = OS.LOWORD (wParam);
-		int /*long*/ hHeap = OS.GetProcessHeap ();
-		int /*long*/ pInputs = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY,  cInputs * TOUCHINPUT.sizeof);
+		long /*int*/ hHeap = OS.GetProcessHeap ();
+		long /*int*/ pInputs = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY,  cInputs * TOUCHINPUT.sizeof);
 		if (pInputs != 0) {
 			if (OS.GetTouchInputInfo (lParam, cInputs, pInputs, TOUCHINPUT.sizeof)) {
 				TOUCHINPUT ti [] = new TOUCHINPUT [cInputs];
@@ -5384,35 +5384,35 @@ LRESULT WM_TOUCH (int /*long*/ wParam, int /*long*/ lParam) {
 	return result;
 }
 
-LRESULT WM_TIMER (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_TIMER (long /*int*/ wParam, long /*int*/ lParam) {
 	return null;
 }
 
-LRESULT WM_UNDO (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_UNDO (long /*int*/ wParam, long /*int*/ lParam) {
 	return null;
 }
 
-LRESULT WM_UPDATEUISTATE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_UPDATEUISTATE (long /*int*/ wParam, long /*int*/ lParam) {
 	return null;
 }
 
-LRESULT WM_VSCROLL (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_VSCROLL (long /*int*/ wParam, long /*int*/ lParam) {
 	Control control = display.getControl (lParam);
 	if (control == null) return null;
 	return control.wmScrollChild (wParam, lParam);
 }
 
-LRESULT WM_WINDOWPOSCHANGED (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_WINDOWPOSCHANGED (long /*int*/ wParam, long /*int*/ lParam) {
 	try {
 		display.resizeCount++;
-		int /*long*/ code = callWindowProc (handle, OS.WM_WINDOWPOSCHANGED, wParam, lParam);
+		long /*int*/ code = callWindowProc (handle, OS.WM_WINDOWPOSCHANGED, wParam, lParam);
 		return code == 0 ? LRESULT.ZERO : new LRESULT (code);
 	} finally {
 		--display.resizeCount;
 	}
 }
 
-LRESULT WM_WINDOWPOSCHANGING (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_WINDOWPOSCHANGING (long /*int*/ wParam, long /*int*/ 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
@@ -5430,13 +5430,13 @@ LRESULT WM_WINDOWPOSCHANGING (int /*long*/ wParam, int /*long*/ lParam) {
 				int width = rect.right - rect.left;
 				int height = rect.bottom - rect.top;
 				if (width != 0 && height != 0) {
-					int /*long*/ hwndParent = parent == null ? 0 : parent.handle;
+					long /*int*/ hwndParent = parent == null ? 0 : parent.handle;
 					OS.MapWindowPoints (0, hwndParent, rect, 2);
 					if (OS.IsWinCE) {
 						OS.InvalidateRect (hwndParent, rect, true);
 					} else {
-						int /*long*/ rgn1 = OS.CreateRectRgn (rect.left, rect.top, rect.right, rect.bottom);
-						int /*long*/ rgn2 = OS.CreateRectRgn (lpwp.x, lpwp.y, lpwp.x + lpwp.cx, lpwp.y + lpwp.cy);
+						long /*int*/ rgn1 = OS.CreateRectRgn (rect.left, rect.top, rect.right, rect.bottom);
+						long /*int*/ rgn2 = OS.CreateRectRgn (lpwp.x, lpwp.y, lpwp.x + lpwp.cx, lpwp.y + lpwp.cy);
 						OS.CombineRgn (rgn1, rgn1, rgn2, OS.RGN_DIFF);
 						int flags = OS.RDW_ERASE | OS.RDW_FRAME | OS.RDW_INVALIDATE | OS.RDW_ALLCHILDREN;
 						OS.RedrawWindow (hwndParent, null, rgn1, flags);
@@ -5450,19 +5450,19 @@ LRESULT WM_WINDOWPOSCHANGING (int /*long*/ wParam, int /*long*/ lParam) {
 	return null;
 }
 
-LRESULT WM_XBUTTONDBLCLK (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_XBUTTONDBLCLK (long /*int*/ wParam, long /*int*/ lParam) {
 	return wmXButtonDblClk (handle, wParam, lParam);
 }
 
-LRESULT WM_XBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_XBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) {
 	return wmXButtonDown (handle, wParam, lParam);
 }
 
-LRESULT WM_XBUTTONUP (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_XBUTTONUP (long /*int*/ wParam, long /*int*/ lParam) {
 	return wmXButtonUp (handle, wParam, lParam);
 }
 
-LRESULT wmColorChild (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmColorChild (long /*int*/ wParam, long /*int*/ lParam) {
 	Control control = findBackgroundControl ();
 	if (control == null) {
 		if ((state & THEME_BACKGROUND) != 0) {
@@ -5489,15 +5489,15 @@ LRESULT wmColorChild (int /*long*/ wParam, int /*long*/ lParam) {
 	if (control.backgroundImage != null) {
 		RECT rect = new RECT ();
 		OS.GetClientRect (handle, rect);
-		int /*long*/ hwnd = control.handle;
-		int /*long*/ hBitmap = control.backgroundImage.handle;
+		long /*int*/ hwnd = control.handle;
+		long /*int*/ 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 /*long*/ hBrush = findBrush (hBitmap, OS.BS_PATTERN);
+		long /*int*/ hBrush = findBrush (hBitmap, OS.BS_PATTERN);
 		if ((state & DRAW_BACKGROUND) != 0) {
-			int /*long*/ hOldBrush = OS.SelectObject (wParam, hBrush);
+			long /*int*/ 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);
@@ -5505,40 +5505,40 @@ LRESULT wmColorChild (int /*long*/ wParam, int /*long*/ lParam) {
 		OS.SetBkMode (wParam, OS.TRANSPARENT);
 		return new LRESULT (hBrush);
 	}
-	int /*long*/ hBrush = findBrush (backPixel, OS.BS_SOLID);
+	long /*int*/ hBrush = findBrush (backPixel, OS.BS_SOLID);
 	if ((state & DRAW_BACKGROUND) != 0) {
 		RECT rect = new RECT ();
 		OS.GetClientRect (handle, rect);
-		int /*long*/ hOldBrush = OS.SelectObject (wParam, hBrush);
+		long /*int*/ 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 /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmCommandChild (long /*int*/ wParam, long /*int*/ lParam) {
 	return null;
 }
 
-LRESULT wmDrawChild (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmDrawChild (long /*int*/ wParam, long /*int*/ lParam) {
 	return null;
 }
 
-LRESULT wmMeasureChild (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmMeasureChild (long /*int*/ wParam, long /*int*/ lParam) {
 	return null;
 }
 
-LRESULT wmNotify (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmNotify (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
 	Control control = display.getControl (hdr.hwndFrom);
 	if (control == null) return null;
 	return control.wmNotifyChild (hdr, wParam, lParam);
 }
 
-LRESULT wmNotifyChild (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
 	return null;
 }
 
-LRESULT wmScrollChild (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmScrollChild (long /*int*/ wParam, long /*int*/ lParam) {
 	return null;
 }