*** empty log message ***

6 files changed, 30 insertions, 5 deletions

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 65f1e25b72..10d91b866a 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
@@ -2828,6 +2828,10 @@ OS_MAKELRESULT=
 OS_MAKELRESULT_0=
 OS_MAKELRESULT_1=
 
+OS_MAKEWORD=
+OS_MAKEWORD_0=
+OS_MAKEWORD_1=
+
 OS_MAKEWPARAM=
 OS_MAKEWPARAM_0=
 OS_MAKEWPARAM_1=
@@ -4855,6 +4859,12 @@ OS_VtblCall__IIS_3B_3B_3B_3=
 OS_VtblCall__IIS_3B_3B_3B_4=
 OS_VtblCall__IIS_3B_3B_3B_5=
 
+OS_VtblCall__II_3B_3I=
+OS_VtblCall__II_3B_3I_0=
+OS_VtblCall__II_3B_3I_1=
+OS_VtblCall__II_3B_3I_2=
+OS_VtblCall__II_3B_3I_3=
+
 OS_VtblCall__II_3CII_3I_3I=
 OS_VtblCall__II_3CII_3I_3I_0=
 OS_VtblCall__II_3CII_3I_3I_1=
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 479c29b971..c099597e4f 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
@@ -7724,6 +7724,18 @@ JNIEXPORT jint JNICALL OS_NATIVE(MAKELRESULT)
 }
 #endif
 
+#ifndef NO_MAKEWORD
+JNIEXPORT jint JNICALL OS_NATIVE(MAKEWORD)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, MAKEWORD_FUNC);
+	rc = (jint)MAKEWORD(arg0, arg1);
+	OS_NATIVE_EXIT(env, that, MAKEWORD_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_MAKEWPARAM
 JNIEXPORT jint JNICALL OS_NATIVE(MAKEWPARAM)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1)
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 c8f65b2ba5..f5cc1476a3 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 = 909;
-int OS_nativeFunctionCallCount[909];
+int OS_nativeFunctionCount = 910;
+int OS_nativeFunctionCallCount[910];
 char * OS_nativeFunctionNames[] = {
 	"ACCEL_1sizeof",
 	"ACTCTX_1sizeof",
@@ -485,6 +485,7 @@ char * OS_nativeFunctionNames[] = {
 	"LockWindowUpdate",
 	"MAKELPARAM",
 	"MAKELRESULT",
+	"MAKEWORD",
 	"MAKEWPARAM",
 	"MARGINS_1sizeof",
 	"MCIWndRegisterClass",
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 9502cb9eb5..63110e9bbe 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
@@ -493,6 +493,7 @@ typedef enum {
 	LockWindowUpdate_FUNC,
 	MAKELPARAM_FUNC,
 	MAKELRESULT_FUNC,
+	MAKEWORD_FUNC,
 	MAKEWPARAM_FUNC,
 	MARGINS_1sizeof_FUNC,
 	MCIWndRegisterClass_FUNC,
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 10ed1739d5..3a6ac39798 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
@@ -1442,6 +1442,7 @@ public class OS extends C {
 	public static final int SPI_GETWORKAREA = 0x30;
 	public static final int SPI_GETNONCLIENTMETRICS = 41;
 	public static final int SPI_GETWHEELSCROLLLINES = 104;
+	public static final int SPI_GETCARETWIDTH = 0x2006;
 	public static final int SPI_SETSIPINFO = 224;
 	public static final int SPI_SETHIGHCONTRAST = 67;
 	public static final int SRCAND = 0x8800c6;
@@ -3597,6 +3598,7 @@ public static final native int /*long*/ LoadLibraryW (char [] lpLibFileName);
 public static final native int /*long*/ LoadLibraryA (byte [] lpLibFileName);
 public static final native int /*long*/ LocalFree (int /*long*/ hMem);
 public static final native boolean LockWindowUpdate (int /*long*/ hWndLock);
+public static final native int /*long*/ MAKEWORD(int l, int h);
 public static final native int /*long*/ MAKEWPARAM(int l, int h);
 public static final native int /*long*/ MAKELPARAM(int l, int h);
 public static final native int /*long*/ MAKELRESULT(int l, int h);
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 cc00fdfd45..9ffd152dec 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
@@ -590,11 +590,10 @@ LRESULT WM_LBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) {
 					sendEvent (SWT.ImeComposition, event);
 					if (event.hitTest == SWT.HITTEST_INSIDE_COMPOSITION) {
 						int /*long*/ imeWnd = OS.ImmGetDefaultIMEWnd (handle);
-						int action = OS.IMEMOUSE_LDOWN;
 						int offset = event.index + event.trailing;
 						int trailing = event.trailing > 0 ? 1 : 2;
-						int w = ((action & 0xFF) | (trailing & 0xFF) << 8) | ((offset & 0xFFFF) << 16);
-						OS.SendMessage (imeWnd, WM_MSIME_MOUSE, w, hIMC);
+						int param = OS.MAKEWPARAM (OS.MAKEWORD (OS.IMEMOUSE_LDOWN, trailing), offset);
+						OS.SendMessage (imeWnd, WM_MSIME_MOUSE, param, hIMC);
 					} else {
 						OS.ImmNotifyIME (hIMC, OS.NI_COMPOSITIONSTR, OS.CPS_COMPLETE, 0);
 					}