Bug 220098 - Support for WebKit on Windows

12 files changed, 577 insertions, 54 deletions

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 b4f0e9b5d6..6a75301484 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
@@ -1255,6 +1255,18 @@ JNIEXPORT jint JNICALL COM_NATIVE(SysStringByteLen)
 }
 #endif
 
+#ifndef NO_SysStringLen
+JNIEXPORT jint JNICALL COM_NATIVE(SysStringLen)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jint rc = 0;
+	COM_NATIVE_ENTER(env, that, SysStringLen_FUNC);
+	rc = (jint)SysStringLen((BSTR)arg0);
+	COM_NATIVE_EXIT(env, that, SysStringLen_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_TYPEATTR_1sizeof
 JNIEXPORT jint JNICALL COM_NATIVE(TYPEATTR_1sizeof)
 	(JNIEnv *env, jclass that)
@@ -1599,6 +1611,29 @@ fail:
 }
 #endif
 
+#if (!defined(NO_VtblCall__IIIIZ) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJJZ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIIIZ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2, jintLong arg3, jboolean arg4)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJJZ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2, jintLong arg3, jboolean arg4)
+#endif
+{
+	jint rc = 0;
+#ifndef JNI64
+	COM_NATIVE_ENTER(env, that, VtblCall__IIIIZ_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJJJZ_FUNC);
+#endif
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jintLong, jintLong, jboolean))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4);
+#ifndef JNI64
+	COM_NATIVE_EXIT(env, that, VtblCall__IIIIZ_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJJJZ_FUNC);
+#endif
+	return rc;
+}
+#endif
+
 #if (!defined(NO_VtblCall__IIII_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJII_3I) && defined(JNI64))
 #ifndef JNI64
 JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jintArray arg4)
@@ -2239,6 +2274,29 @@ fail:
 }
 #endif
 
+#if (!defined(NO_VtblCall__IIJJ) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3)
+#endif
+{
+	jint rc = 0;
+#ifndef JNI64
+	COM_NATIVE_ENTER(env, that, VtblCall__IIJJ_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJJJ_FUNC);
+#endif
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3);
+#ifndef JNI64
+	COM_NATIVE_EXIT(env, that, VtblCall__IIJJ_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJJJ_FUNC);
+#endif
+	return rc;
+}
+#endif
+
 #if (!defined(NO_VtblCall__IIJJLorg_eclipse_swt_internal_ole_win32_GUID_2J_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJJLorg_eclipse_swt_internal_ole_win32_GUID_2J_3J) && defined(JNI64))
 #ifndef JNI64
 JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIJJLorg_eclipse_swt_internal_ole_win32_GUID_2J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jobject arg4, jlong arg5, jlongArray arg6)
@@ -2296,6 +2354,33 @@ fail:
 }
 #endif
 
+#if (!defined(NO_VtblCall__IIJJ_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJJ_3J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIJJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlongArray arg4)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlongArray arg4)
+#endif
+{
+	jlong *lparg4=NULL;
+	jint rc = 0;
+#ifndef JNI64
+	COM_NATIVE_ENTER(env, that, VtblCall__IIJJ_3J_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJJJ_3J_FUNC);
+#endif
+	if (arg4) if ((lparg4 = (*env)->GetLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
+fail:
+	if (arg4 && lparg4) (*env)->ReleaseLongArrayElements(env, arg4, lparg4, 0);
+#ifndef JNI64
+	COM_NATIVE_EXIT(env, that, VtblCall__IIJJ_3J_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJJJ_3J_FUNC);
+#endif
+	return rc;
+}
+#endif
+
 #if (!defined(NO_VtblCall__IIJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3J) && defined(JNI64))
 #ifndef JNI64
 JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jobject arg3, jlongArray arg4)
@@ -3009,6 +3094,33 @@ fail:
 }
 #endif
 
+#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2II) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2II) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2II)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jint arg3, jint arg4)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2II)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jint arg3, jint arg4)
+#endif
+{
+	RECT _arg2, *lparg2=NULL;
+	jint rc = 0;
+#ifndef JNI64
+	COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2II_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2II_FUNC);
+#endif
+	if (arg2) if ((lparg2 = getRECTFields(env, arg2, &_arg2)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, RECT *, jint, jint))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, arg4);
+fail:
+	if (arg2 && lparg2) setRECTFields(env, arg2, lparg2);
+#ifndef JNI64
+	COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2II_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2II_FUNC);
+#endif
+	return rc;
+}
+#endif
+
 #if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2IZ) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2IZ) && defined(JNI64))
 #ifndef JNI64
 JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2IZ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jint arg3, jboolean arg4)
@@ -3036,6 +3148,33 @@ fail:
 }
 #endif
 
+#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2JJ) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2JJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jlong arg3, jlong arg4)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2JJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jlong arg3, jlong arg4)
+#endif
+{
+	RECT _arg2, *lparg2=NULL;
+	jint rc = 0;
+#ifndef JNI64
+	COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2JJ_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2JJ_FUNC);
+#endif
+	if (arg2) if ((lparg2 = getRECTFields(env, arg2, &_arg2)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, RECT *, jlong, jlong))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, arg4);
+fail:
+	if (arg2 && lparg2) setRECTFields(env, arg2, lparg2);
+#ifndef JNI64
+	COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2JJ_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2JJ_FUNC);
+#endif
+	return rc;
+}
+#endif
+
 #if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2JZ) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2JZ) && defined(JNI64))
 #ifndef JNI64
 JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2JZ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jlong arg3, jboolean arg4)
@@ -3170,6 +3309,29 @@ JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJZ)(JNIEnv *env, jclass that, jint
 }
 #endif
 
+#if (!defined(NO_VtblCall__IIZI) && !defined(JNI64)) || (!defined(NO_VtblCall__IJZJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIZI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jboolean arg2, jintLong arg3)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJZJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jboolean arg2, jintLong arg3)
+#endif
+{
+	jint rc = 0;
+#ifndef JNI64
+	COM_NATIVE_ENTER(env, that, VtblCall__IIZI_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJZJ_FUNC);
+#endif
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jboolean, jintLong))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3);
+#ifndef JNI64
+	COM_NATIVE_EXIT(env, that, VtblCall__IIZI_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJZJ_FUNC);
+#endif
+	return rc;
+}
+#endif
+
 #if (!defined(NO_VtblCall__II_3CIIII_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3CIIII_3I) && defined(JNI64))
 #ifndef JNI64
 JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__II_3CIIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3, jint arg4, jint arg5, jint arg6, jintArray arg7)
@@ -3260,6 +3422,36 @@ fail:
 }
 #endif
 
+#if (!defined(NO_VtblCall__II_3CI_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3CI_3I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__II_3CI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3, jintArray arg4)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJ_3CI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3, jintArray arg4)
+#endif
+{
+	jchar *lparg2=NULL;
+	jint *lparg4=NULL;
+	jint rc = 0;
+#ifndef JNI64
+	COM_NATIVE_ENTER(env, that, VtblCall__II_3CI_3I_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJ_3CI_3I_FUNC);
+#endif
+	if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jchar *, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, lparg4);
+fail:
+	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
+	if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0);
+#ifndef JNI64
+	COM_NATIVE_EXIT(env, that, VtblCall__II_3CI_3I_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJ_3CI_3I_FUNC);
+#endif
+	return rc;
+}
+#endif
+
 #if (!defined(NO_VtblCall__II_3CJIII_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3CJIII_3J) && defined(JNI64))
 #ifndef JNI64
 JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__II_3CJIII_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jlong arg3, jint arg4, jint arg5, jint arg6, jlongArray arg7)
@@ -3350,6 +3542,39 @@ fail:
 }
 #endif
 
+#if (!defined(NO_VtblCall__II_3C_3I_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3C_3I_3I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__II_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jintArray arg3, jintArray arg4)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJ_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jintArray arg3, jintArray arg4)
+#endif
+{
+	jchar *lparg2=NULL;
+	jint *lparg3=NULL;
+	jint *lparg4=NULL;
+	jint rc = 0;
+#ifndef JNI64
+	COM_NATIVE_ENTER(env, that, VtblCall__II_3C_3I_3I_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJ_3C_3I_3I_FUNC);
+#endif
+	if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
+	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jchar *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
+fail:
+	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
+	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
+	if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0);
+#ifndef JNI64
+	COM_NATIVE_EXIT(env, that, VtblCall__II_3C_3I_3I_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJ_3C_3I_3I_FUNC);
+#endif
+	return rc;
+}
+#endif
+
 #ifndef NO_VtblCall__IJIIIIJ
 JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJIIIIJ)
 	(JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jlong arg6)
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 435385def1..7b1916910e 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 = 175;
-int COM_nativeFunctionCallCount[175];
+int COM_nativeFunctionCount = 184;
+int COM_nativeFunctionCallCount[184];
 char * COM_nativeFunctionNames[] = {
 	"AccessibleChildren",
 	"AccessibleObjectFromWindow",
@@ -149,6 +149,7 @@ char * COM_nativeFunctionNames[] = {
 	"SysAllocString",
 	"SysFreeString",
 	"SysStringByteLen",
+	"SysStringLen",
 	"TYPEATTR_1sizeof",
 	"TYPEDESC_1sizeof",
 	"VARDESC_1sizeof",
@@ -207,6 +208,11 @@ char * COM_nativeFunctionNames[] = {
 	"VtblCall__IJIILorg_eclipse_swt_internal_win32_POINT_2I",
 #endif
 #ifndef JNI64
+	"VtblCall__IIIIZ",
+#else
+	"VtblCall__IJJJZ",
+#endif
+#ifndef JNI64
 	"VtblCall__IIII_3I",
 #else
 	"VtblCall__IJII_3I",
@@ -317,6 +323,11 @@ char * COM_nativeFunctionNames[] = {
 	"VtblCall__IJJI_3J",
 #endif
 #ifndef JNI64
+	"VtblCall__IIJJ",
+#else
+	"VtblCall__IJJJ",
+#endif
+#ifndef JNI64
 	"VtblCall__IIJJLorg_eclipse_swt_internal_ole_win32_GUID_2J_3J",
 #else
 	"VtblCall__IJJJLorg_eclipse_swt_internal_ole_win32_GUID_2J_3J",
@@ -327,6 +338,11 @@ char * COM_nativeFunctionNames[] = {
 	"VtblCall__IJJJLorg_eclipse_swt_internal_win32_POINT_2I",
 #endif
 #ifndef JNI64
+	"VtblCall__IIJJ_3J",
+#else
+	"VtblCall__IJJJ_3J",
+#endif
+#ifndef JNI64
 	"VtblCall__IIJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3J",
 #else
 	"VtblCall__IJJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3J",
@@ -452,11 +468,21 @@ char * COM_nativeFunctionNames[] = {
 	"VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2",
 #endif
 #ifndef JNI64
+	"VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2II",
+#else
+	"VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2II",
+#endif
+#ifndef JNI64
 	"VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2IZ",
 #else
 	"VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2IZ",
 #endif
 #ifndef JNI64
+	"VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2JJ",
+#else
+	"VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2JJ",
+#endif
+#ifndef JNI64
 	"VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2JZ",
 #else
 	"VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2JZ",
@@ -482,6 +508,11 @@ char * COM_nativeFunctionNames[] = {
 	"VtblCall__IJZ",
 #endif
 #ifndef JNI64
+	"VtblCall__IIZI",
+#else
+	"VtblCall__IJZJ",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3CIIII_3I",
 #else
 	"VtblCall__IJ_3CIIII_3I",
@@ -497,6 +528,11 @@ char * COM_nativeFunctionNames[] = {
 	"VtblCall__IJ_3CIII_3J",
 #endif
 #ifndef JNI64
+	"VtblCall__II_3CI_3I",
+#else
+	"VtblCall__IJ_3CI_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3CJIII_3J",
 #else
 	"VtblCall__IJ_3CJIII_3J",
@@ -511,6 +547,11 @@ char * COM_nativeFunctionNames[] = {
 #else
 	"VtblCall__IJ_3C_3C",
 #endif
+#ifndef JNI64
+	"VtblCall__II_3C_3I_3I",
+#else
+	"VtblCall__IJ_3C_3I_3I",
+#endif
 	"VtblCall__IJIIIIJ",
 #ifndef JNI64
 	"VtblCall__IJJIIIII",
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 0312728b1f..3a8cb4ae75 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
@@ -157,6 +157,7 @@ typedef enum {
 	SysAllocString_FUNC,
 	SysFreeString_FUNC,
 	SysStringByteLen_FUNC,
+	SysStringLen_FUNC,
 	TYPEATTR_1sizeof_FUNC,
 	TYPEDESC_1sizeof_FUNC,
 	VARDESC_1sizeof_FUNC,
@@ -215,6 +216,11 @@ typedef enum {
 	VtblCall__IJIILorg_eclipse_swt_internal_win32_POINT_2I_FUNC,
 #endif
 #ifndef JNI64
+	VtblCall__IIIIZ_FUNC,
+#else
+	VtblCall__IJJJZ_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIII_3I_FUNC,
 #else
 	VtblCall__IJII_3I_FUNC,
@@ -325,6 +331,11 @@ typedef enum {
 	VtblCall__IJJI_3J_FUNC,
 #endif
 #ifndef JNI64
+	VtblCall__IIJJ_FUNC,
+#else
+	VtblCall__IJJJ_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIJJLorg_eclipse_swt_internal_ole_win32_GUID_2J_3J_FUNC,
 #else
 	VtblCall__IJJJLorg_eclipse_swt_internal_ole_win32_GUID_2J_3J_FUNC,
@@ -335,6 +346,11 @@ typedef enum {
 	VtblCall__IJJJLorg_eclipse_swt_internal_win32_POINT_2I_FUNC,
 #endif
 #ifndef JNI64
+	VtblCall__IIJJ_3J_FUNC,
+#else
+	VtblCall__IJJJ_3J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3J_FUNC,
 #else
 	VtblCall__IJJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3J_FUNC,
@@ -460,11 +476,21 @@ typedef enum {
 	VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2_FUNC,
 #endif
 #ifndef JNI64
+	VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2II_FUNC,
+#else
+	VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2II_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2IZ_FUNC,
 #else
 	VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2IZ_FUNC,
 #endif
 #ifndef JNI64
+	VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2JJ_FUNC,
+#else
+	VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2JJ_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2JZ_FUNC,
 #else
 	VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2JZ_FUNC,
@@ -490,6 +516,11 @@ typedef enum {
 	VtblCall__IJZ_FUNC,
 #endif
 #ifndef JNI64
+	VtblCall__IIZI_FUNC,
+#else
+	VtblCall__IJZJ_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3CIIII_3I_FUNC,
 #else
 	VtblCall__IJ_3CIIII_3I_FUNC,
@@ -505,6 +536,11 @@ typedef enum {
 	VtblCall__IJ_3CIII_3J_FUNC,
 #endif
 #ifndef JNI64
+	VtblCall__II_3CI_3I_FUNC,
+#else
+	VtblCall__IJ_3CI_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3CJIII_3J_FUNC,
 #else
 	VtblCall__IJ_3CJIII_3J_FUNC,
@@ -519,6 +555,11 @@ typedef enum {
 #else
 	VtblCall__IJ_3C_3C_FUNC,
 #endif
+#ifndef JNI64
+	VtblCall__II_3C_3I_3I_FUNC,
+#else
+	VtblCall__IJ_3C_3I_3I_FUNC,
+#endif
 	VtblCall__IJIIIIJ_FUNC,
 #ifndef JNI64
 	VtblCall__IJJIIIII_FUNC,
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_structs.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_structs.c
index 7f6dab7ff3..78daed63b9 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_structs.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_structs.c
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 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
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_structs.h b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_structs.h
index 099dee8882..42ef159b8f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_structs.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_structs.h
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 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
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/make_win32.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/make_win32.mak
index 45da37780e..95a99d2f8a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/make_win32.mak
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/make_win32.mak
@@ -37,6 +37,13 @@ AWT_LIB    = $(AWT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).dll
 AWT_LIBS   = "$(JAVA_HOME)\jre\bin\jawt.lib"
 AWT_OBJS   = swt_awt.obj
 
+WEBKIT_DIR 	  = C:\WebKit-r68077\WebKit-r68077
+WEBKIT_SUPPORT_DIR = C:\WebKit-r68077\WebKit-r68077\WebKitSupportLibrary\WebKitSupportLibrary
+WEBKIT_PREFIX = swt-webkit
+WEBKIT_LIB    = $(WEBKIT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).dll
+WEBKIT_LIBS   = $(WEBKIT_DIR)\lib\webkit.lib $(WEBKIT_SUPPORT_DIR)\win\lib\CFNetwork.lib $(WEBKIT_SUPPORT_DIR)\win\lib\CoreFoundation.lib
+WEBKIT_OBJS   = webkit_win32.obj webkit_win32_stats.obj webkit_win32_custom.obj webkit_win32_structs.obj
+
 WGL_PREFIX = swt-wgl
 WGL_LIB    = $(WGL_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).dll
 WGL_LIBS   = opengl32.lib
@@ -62,6 +69,14 @@ MOZILLACFLAGS = -c \
 	-I"$(JAVA_HOME)/include/win32" \
 	-I"$(XULRUNNER_SDK)\include\mozilla-config.h" -I"$(XULRUNNER_SDK)\include"
 
+WEBKITCFLAGS = -c -O1\
+	-DSWT_VERSION=$(SWT_VERSION) $(NATIVE_STATS) \
+	-I"$(JAVA_HOME)\include" -I"$(JAVA_HOME)\include\win32" \
+	-I"$(WEBKIT_DIR)" \
+	-I"$(WEBKIT_DIR)\WebKit\win" \
+	-I"$(WEBKIT_DIR)\JavaScriptCore\ForwardingHeaders" \
+	-I"$(WEBKIT_SUPPORT_DIR)\win\include"
+
 #CFLAGS = $(cdebug) $(cflags) $(cvarsmt) $(CFLAGS) \
 CFLAGS = -O1 -DNDEBUG $(cflags) $(cvarsmt) $(CFLAGS) \
 	-DSWT_VERSION=$(SWT_VERSION) $(NATIVE_STATS) -DUSE_ASSEMBLER \
@@ -70,6 +85,15 @@ RCFLAGS = $(rcflags) $(rcvars) $(RCFLAGS) -DSWT_FILE_VERSION=\"$(maj_ver).$(min_
 
 all: make_swt make_awt make_gdip make_wgl
 
+webkit_win32_custom.obj: webkit_win32_custom.cpp
+	cl $(WEBKITCFLAGS) webkit_win32_custom.cpp
+webkit_win32_stats.obj: webkit_win32_stats.cpp
+	cl $(WEBKITCFLAGS) webkit_win32_stats.cpp
+webkit_win32_structs.obj: webkit_win32_structs.cpp
+	cl $(WEBKITCFLAGS) webkit_win32_structs.cpp
+webkit_win32.obj: webkit_win32.cpp
+	cl $(WEBKITCFLAGS) webkit_win32.cpp
+	
 xpcom_custom.obj: xpcom_custom.cpp
 	cl $(MOZILLACFLAGS) xpcom_custom.cpp
 xpcom_stats.obj: xpcom_stats.cpp
@@ -118,6 +142,15 @@ make_awt: $(AWT_OBJS) swt_awt.res
 	link @templrf
 	del templrf
 
+make_webkit: $(WEBKIT_OBJS) swt_webkit.res
+	echo $(ldebug) $(dlllflags) >templrf
+	echo $(WEBKIT_LIBS) >>templrf
+	echo $(WEBKIT_OBJS) >>templrf
+	echo swt_webkit.res >>templrf
+	echo -out:$(WEBKIT_LIB) >>templrf
+	link @templrf
+	del templrf
+
 make_wgl: $(WGL_OBJS) swt_wgl.res
 	echo $(ldebug) $(dlllflags) $(guilibsmt) >templrf
 	echo $(WGL_LIBS) >>templrf
@@ -145,6 +178,9 @@ swt_gdip.res:
 swt_awt.res:
 	rc $(RCFLAGS) -DSWT_ORG_FILENAME=\"$(AWT_LIB)\" -r -fo swt_awt.res swt_awt.rc
 
+swt_webkit.res:
+	rc $(RCFLAGS) -DSWT_ORG_FILENAME=\"$(WEBKIT_LIB)\" -r -fo swt_webkit.res swt_webkit.rc
+
 swt_wgl.res:
 	rc $(RCFLAGS) -DSWT_ORG_FILENAME=\"$(WGL_LIB)\" -r -fo swt_wgl.res swt_wgl.rc
 
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 fc48919765..ffa4735239 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
@@ -607,18 +607,52 @@ JNIEXPORT jint JNICALL OS_NATIVE(CREATESTRUCT_1sizeof)
 }
 #endif
 
-#ifndef NO_Call
-JNIEXPORT jint JNICALL OS_NATIVE(Call)
-	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+#if (!defined(NO_Call__I) && !defined(JNI64)) || (!defined(NO_Call__J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(Call__I)(JNIEnv *env, jclass that, jintLong arg0)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(Call__J)(JNIEnv *env, jclass that, jintLong arg0)
+#endif
+{
+	jint rc = 0;
+#ifndef JNI64
+	OS_NATIVE_ENTER(env, that, Call__I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, Call__J_FUNC);
+#endif
+	rc = (jint)((jint (*)())arg0)();
+#ifndef JNI64
+	OS_NATIVE_EXIT(env, that, Call__I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, Call__J_FUNC);
+#endif
+	return rc;
+}
+#endif
+
+#if (!defined(NO_Call__ILorg_eclipse_swt_internal_win32_DLLVERSIONINFO_2) && !defined(JNI64)) || (!defined(NO_Call__JLorg_eclipse_swt_internal_win32_DLLVERSIONINFO_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(Call__ILorg_eclipse_swt_internal_win32_DLLVERSIONINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(Call__JLorg_eclipse_swt_internal_win32_DLLVERSIONINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+#endif
 {
 	DLLVERSIONINFO _arg1, *lparg1=NULL;
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, Call_FUNC);
+#ifndef JNI64
+	OS_NATIVE_ENTER(env, that, Call__ILorg_eclipse_swt_internal_win32_DLLVERSIONINFO_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, Call__JLorg_eclipse_swt_internal_win32_DLLVERSIONINFO_2_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getDLLVERSIONINFOFields(env, arg1, &_arg1)) == NULL) goto fail;
 	rc = (jint)((DLLGETVERSIONPROC)arg0)(lparg1);
 fail:
 	if (arg1 && lparg1) setDLLVERSIONINFOFields(env, arg1, lparg1);
-	OS_NATIVE_EXIT(env, that, Call_FUNC);
+#ifndef JNI64
+	OS_NATIVE_EXIT(env, that, Call__ILorg_eclipse_swt_internal_win32_DLLVERSIONINFO_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, Call__JLorg_eclipse_swt_internal_win32_DLLVERSIONINFO_2_FUNC);
+#endif
 	return rc;
 }
 #endif
@@ -10847,6 +10881,48 @@ fail:
 }
 #endif
 
+#if (!defined(NO_MoveMemory___3D_3II) && !defined(JNI64)) || (!defined(NO_MoveMemory___3D_3JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory___3D_3II)(JNIEnv *env, jclass that, jdoubleArray arg0, jintLongArray arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory___3D_3JI)(JNIEnv *env, jclass that, jdoubleArray arg0, jintLongArray arg1, jint arg2)
+#endif
+{
+	jdouble *lparg0=NULL;
+	jintLong *lparg1=NULL;
+#ifndef JNI64
+	OS_NATIVE_ENTER(env, that, MoveMemory___3D_3II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory___3D_3JI_FUNC);
+#endif
+	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
+#ifdef JNI_VERSION_1_2
+	if (IS_JNI_1_2) {
+		if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail;
+	} else
+#endif
+	{
+		if (arg0) if ((lparg0 = (*env)->GetDoubleArrayElements(env, arg0, NULL)) == NULL) goto fail;
+	}
+	MoveMemory((PVOID)lparg0, (CONST VOID *)lparg1, arg2);
+fail:
+#ifdef JNI_VERSION_1_2
+	if (IS_JNI_1_2) {
+		if (arg0 && lparg0) (*env)->ReleasePrimitiveArrayCritical(env, arg0, lparg0, 0);
+	} else
+#endif
+	{
+		if (arg0 && lparg0) (*env)->ReleaseDoubleArrayElements(env, arg0, lparg0, 0);
+	}
+	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
+#ifndef JNI64
+	OS_NATIVE_EXIT(env, that, MoveMemory___3D_3II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory___3D_3JI_FUNC);
+#endif
+}
+#endif
+
 #if (!defined(NO_MoveMemory___3FII) && !defined(JNI64)) || (!defined(NO_MoveMemory___3FJI) && defined(JNI64))
 #ifndef JNI64
 JNIEXPORT void JNICALL OS_NATIVE(MoveMemory___3FII)(JNIEnv *env, jclass that, jfloatArray arg0, jintLong arg1, jint arg2)
@@ -17388,36 +17464,6 @@ fail:
 }
 #endif
 
-#if (!defined(NO_VtblCall__III_3I_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJI_3J_3I) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__III_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintLongArray arg3, jintArray arg4)
-#else
-JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJI_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintLongArray arg3, jintArray arg4)
-#endif
-{
-	jintLong *lparg3=NULL;
-	jint *lparg4=NULL;
-	jint rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, VtblCall__III_3I_3I_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, VtblCall__IJI_3J_3I_FUNC);
-#endif
-	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jintLong *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
-fail:
-	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
-	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, VtblCall__III_3I_3I_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, VtblCall__IJI_3J_3I_FUNC);
-#endif
-	return rc;
-}
-#endif
-
 #if (!defined(NO_VtblCall__III_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJI_3J) && defined(JNI64))
 #ifndef JNI64
 JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__III_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jlongArray arg3)
@@ -17491,6 +17537,33 @@ JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJJI)(JNIEnv *env, jclass that, jint
 }
 #endif
 
+#if (!defined(NO_VtblCall__IIJII_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJII_3I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IIJII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jintArray arg5)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJJII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jintArray arg5)
+#endif
+{
+	jint *lparg5=NULL;
+	jint rc = 0;
+#ifndef JNI64
+	OS_NATIVE_ENTER(env, that, VtblCall__IIJII_3I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, VtblCall__IJJII_3I_FUNC);
+#endif
+	if (arg5) if ((lparg5 = (*env)->GetIntArrayElements(env, arg5, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jint, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5);
+fail:
+	if (arg5 && lparg5) (*env)->ReleaseIntArrayElements(env, arg5, lparg5, 0);
+#ifndef JNI64
+	OS_NATIVE_EXIT(env, that, VtblCall__IIJII_3I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, VtblCall__IJJII_3I_FUNC);
+#endif
+	return rc;
+}
+#endif
+
 #if (!defined(NO_VtblCall__IIJII_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJII_3J) && defined(JNI64))
 #ifndef JNI64
 JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IIJII_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jlongArray arg5)
@@ -17568,6 +17641,36 @@ JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJJJJ)(JNIEnv *env, jclass that, jint
 }
 #endif
 
+#if (!defined(NO_VtblCall__IIJ_3I_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJ_3J_3J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IIJ_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jintLongArray arg3, jintLongArray arg4)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJJ_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jintLongArray arg3, jintLongArray arg4)
+#endif
+{
+	jintLong *lparg3=NULL;
+	jintLong *lparg4=NULL;
+	jint rc = 0;
+#ifndef JNI64
+	OS_NATIVE_ENTER(env, that, VtblCall__IIJ_3I_3I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, VtblCall__IJJ_3J_3J_FUNC);
+#endif
+	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
+	if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jintLong *, jintLong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
+fail:
+	if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
+	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
+#ifndef JNI64
+	OS_NATIVE_EXIT(env, that, VtblCall__IIJ_3I_3I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, VtblCall__IJJ_3J_3J_FUNC);
+#endif
+	return rc;
+}
+#endif
+
 #if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_win32_PROPERTYKEY_2I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_win32_PROPERTYKEY_2I) && defined(JNI64))
 #ifndef JNI64
 JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IILorg_eclipse_swt_internal_win32_PROPERTYKEY_2I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jint arg3)
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 60cc211391..ce04a26fc1 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 = 1009;
-int OS_nativeFunctionCallCount[1009];
+int OS_nativeFunctionCount = 1012;
+int OS_nativeFunctionCallCount[1012];
 char * OS_nativeFunctionNames[] = {
 	"ACCEL_1sizeof",
 	"ACTCTX_1sizeof",
@@ -53,7 +53,16 @@ char * OS_nativeFunctionNames[] = {
 	"COMBOBOXINFO_1sizeof",
 	"COMPOSITIONFORM_1sizeof",
 	"CREATESTRUCT_1sizeof",
-	"Call",
+#ifndef JNI64
+	"Call__I",
+#else
+	"Call__J",
+#endif
+#ifndef JNI64
+	"Call__ILorg_eclipse_swt_internal_win32_DLLVERSIONINFO_2",
+#else
+	"Call__JLorg_eclipse_swt_internal_win32_DLLVERSIONINFO_2",
+#endif
 	"CallNextHookEx",
 	"CallWindowProcA",
 	"CallWindowProcW",
@@ -1093,6 +1102,11 @@ char * OS_nativeFunctionNames[] = {
 	"MoveMemory___3DJI",
 #endif
 #ifndef JNI64
+	"MoveMemory___3D_3II",
+#else
+	"MoveMemory___3D_3JI",
+#endif
+#ifndef JNI64
 	"MoveMemory___3FII",
 #else
 	"MoveMemory___3FJI",
@@ -1802,11 +1816,6 @@ char * OS_nativeFunctionNames[] = {
 	"VtblCall__IJI_3I",
 #endif
 #ifndef JNI64
-	"VtblCall__III_3I_3I",
-#else
-	"VtblCall__IJI_3J_3I",
-#endif
-#ifndef JNI64
 	"VtblCall__III_3J",
 #else
 	"VtblCall__IJI_3J",
@@ -1822,6 +1831,11 @@ char * OS_nativeFunctionNames[] = {
 	"VtblCall__IJJI",
 #endif
 #ifndef JNI64
+	"VtblCall__IIJII_3I",
+#else
+	"VtblCall__IJJII_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__IIJII_3J",
 #else
 	"VtblCall__IJJII_3J",
@@ -1837,6 +1851,11 @@ char * OS_nativeFunctionNames[] = {
 	"VtblCall__IJJJJ",
 #endif
 #ifndef JNI64
+	"VtblCall__IIJ_3I_3I",
+#else
+	"VtblCall__IJJ_3J_3J",
+#endif
+#ifndef JNI64
 	"VtblCall__IILorg_eclipse_swt_internal_win32_PROPERTYKEY_2I",
 #else
 	"VtblCall__IJLorg_eclipse_swt_internal_win32_PROPERTYKEY_2I",
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 58b2e699cc..077523b5d4 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
@@ -61,7 +61,16 @@ typedef enum {
 	COMBOBOXINFO_1sizeof_FUNC,
 	COMPOSITIONFORM_1sizeof_FUNC,
 	CREATESTRUCT_1sizeof_FUNC,
-	Call_FUNC,
+#ifndef JNI64
+	Call__I_FUNC,
+#else
+	Call__J_FUNC,
+#endif
+#ifndef JNI64
+	Call__ILorg_eclipse_swt_internal_win32_DLLVERSIONINFO_2_FUNC,
+#else
+	Call__JLorg_eclipse_swt_internal_win32_DLLVERSIONINFO_2_FUNC,
+#endif
 	CallNextHookEx_FUNC,
 	CallWindowProcA_FUNC,
 	CallWindowProcW_FUNC,
@@ -1101,6 +1110,11 @@ typedef enum {
 	MoveMemory___3DJI_FUNC,
 #endif
 #ifndef JNI64
+	MoveMemory___3D_3II_FUNC,
+#else
+	MoveMemory___3D_3JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory___3FII_FUNC,
 #else
 	MoveMemory___3FJI_FUNC,
@@ -1810,11 +1824,6 @@ typedef enum {
 	VtblCall__IJI_3I_FUNC,
 #endif
 #ifndef JNI64
-	VtblCall__III_3I_3I_FUNC,
-#else
-	VtblCall__IJI_3J_3I_FUNC,
-#endif
-#ifndef JNI64
 	VtblCall__III_3J_FUNC,
 #else
 	VtblCall__IJI_3J_FUNC,
@@ -1830,6 +1839,11 @@ typedef enum {
 	VtblCall__IJJI_FUNC,
 #endif
 #ifndef JNI64
+	VtblCall__IIJII_3I_FUNC,
+#else
+	VtblCall__IJJII_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIJII_3J_FUNC,
 #else
 	VtblCall__IJJII_3J_FUNC,
@@ -1845,6 +1859,11 @@ typedef enum {
 	VtblCall__IJJJJ_FUNC,
 #endif
 #ifndef JNI64
+	VtblCall__IIJ_3I_3I_FUNC,
+#else
+	VtblCall__IJJ_3J_3J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IILorg_eclipse_swt_internal_win32_PROPERTYKEY_2I_FUNC,
 #else
 	VtblCall__IJLorg_eclipse_swt_internal_win32_PROPERTYKEY_2I_FUNC,
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 1b9c11bcb0..64686811b0 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
@@ -645,6 +645,8 @@ public static final native int /*long*/ SysAllocString(char [] sz);
 public static final native void SysFreeString(int /*long*/ bstr);
 /** @param bstr cast=(BSTR) */
 public static final native int SysStringByteLen(int /*long*/ bstr);
+/** @param bstr cast=(BSTR) */
+public static final native int SysStringLen(int /*long*/ bstr);
 /**
  * @param pvargDest cast=(VARIANTARG FAR* )
  * @param pvarSrc cast=(VARIANTARG FAR* )
@@ -680,6 +682,7 @@ public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int a
 
 public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int[] arg2);
 public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long[] arg2);
+public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long[] arg2);
 public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, long[] arg2);
 public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long arg1, int[] arg2);
 public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int[] arg2);
@@ -716,6 +719,7 @@ public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int a
 public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, boolean arg1);
 
 public static final native int VtblCall (int fnNumber, int /*long*/ ppVtbl, boolean arg0);
+public static final native int VtblCall (int fnNumber, int /*long*/ ppVtbl, boolean arg0, int /*long*/ arg1);
 
 public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, CAUUID arg0);
 public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, CONTROLINFO arg0);
@@ -733,6 +737,8 @@ public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, GUID
 public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, GUID arg0, int arg1, int arg2, int arg3, int[] arg4);
 public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, GUID arg0, long arg1, int arg2, int arg3, int[] arg4);
 
+public static final native int VtblCall (int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1);
+
 public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, GUID arg0, int arg1, int arg2, int arg3, int arg4);
 public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, GUID arg0, int arg1, int arg2, long arg3, long arg4);
 
@@ -743,6 +749,9 @@ public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, LICIN
 public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, RECT arg0, int arg1, boolean arg2);
 public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, RECT arg0, long arg1, boolean arg2);
 
+public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, RECT arg0, int arg1, int arg2);
+public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, RECT arg0, long arg1, long arg2);
+
 public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, RECT arg0, RECT arg1);
 public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, RECT arg0);
 
@@ -755,6 +764,11 @@ public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int a
 public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, DISPPARAMS arg3, int arg4, EXCEPINFO arg5, int arg6);
 public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, DISPPARAMS arg3, long arg4, EXCEPINFO arg5, long arg6);
 
+public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] pszPropName, int[] pVar, int[] pErrorLog);
+public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] pszPropName, int pVar, int[] pErrorLog);
+
+public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int /*long*/ type, int /*long*/ listener, boolean useCapture);
+
 /** @param pStg cast=(IStorage *) */
 public static final native int WriteClassStg(int /*long*/ pStg, GUID rclsid);
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPropertyBag.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPropertyBag.java
new file mode 100644
index 0000000000..336bed5cac
--- /dev/null
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPropertyBag.java
@@ -0,0 +1,17 @@
+package org.eclipse.swt.internal.ole.win32;
+
+public class IPropertyBag extends IUnknown {
+
+public IPropertyBag(int /*long*/ address) {
+	super(address);
+}
+
+public int Read (int /*long*/ pszPropName, int /*long*/ pVar, int /*long*/[] pErrorLog) {
+	return COM.VtblCall(3, getAddress(), pszPropName, pVar, pErrorLog);
+}
+
+public int Write (int /*long*/ propName, int /*long*/[] var, int /*long*/[] errorLog) {
+	return COM.VtblCall(4, getAddress(), propName, var, errorLog);
+}
+
+}
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 048a9aa3d8..c0774d7a47 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
@@ -1298,6 +1298,7 @@ public class OS extends C {
 	public static final int PD_ALLPAGES = 0x0;
 	public static final int PD_COLLATE = 0x10;
 	public static final int PD_PAGENUMS = 0x2;
+	public static final int PD_PRINTSETUP = 0x00000040;
 	public static final int PD_PRINTTOFILE = 0x20;
 	public static final int PD_RETURNDC = 0x100;
 	public static final int PD_RETURNDEFAULT = 0x00000400;
@@ -3479,6 +3480,7 @@ public static final native int BufferedPaintInit ();
 public static final native int BufferedPaintSetAlpha (int /*long*/ hBufferedPaint, RECT prc, byte alpha);
 /** @method flags=dynamic */
 public static final native int BufferedPaintUnInit ();
+public static final native int Call (int /*long*/ address);
 /** @param address cast=(DLLGETVERSIONPROC) */
 public static final native int Call (int /*long*/ address, DLLVERSIONINFO arg0);
 /**
@@ -5004,6 +5006,11 @@ public static final native void MoveMemory (double[] Destination, int /*long*/ S
  * @param Destination cast=(PVOID),flags=no_in critical
  * @param SourcePtr cast=(CONST VOID *)
  */
+public static final native void MoveMemory (double[] Destination, int /*long*/[] SourcePtr, int Length);
+/**
+ * @param Destination cast=(PVOID),flags=no_in critical
+ * @param SourcePtr cast=(CONST VOID *)
+ */
 public static final native void MoveMemory (float[] Destination, int /*long*/ SourcePtr, int Length);
 /**
  * @param Destination cast=(PVOID),flags=no_in critical
@@ -6626,6 +6633,7 @@ public static final native int VtblCall (int fnNumber, int /*long*/ ppVtbl, int
 public static final native int VtblCall (int fnNumber, int /*long*/ ppVtbl, long arg0);
 
 public static final native int VtblCall (int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int[] arg3);
+public static final native int VtblCall (int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, int[] arg3);
 public static final native int VtblCall (int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, long[] arg3);
 public static final native int VtblCall (int fnNumber, int /*long*/ ppVtbl, int arg0, long arg1, int arg2, long[] arg3);
 public static final native int VtblCall (int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, long[] arg3);
@@ -6635,7 +6643,7 @@ public static final native int VtblCall (int fnNumber, int /*long*/ ppVtbl, shor
 public static final native int VtblCall (int fnNumber, int /*long*/ ppVtbl, int[] arg0);
 public static final native int VtblCall (int fnNumber, int /*long*/ ppVtbl, long[] arg0);
 public static final native int VtblCall (int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int /*long*/[] arg1);
-public static final native int VtblCall (int fnNumber, int /*long*/ ppVtbl, int arg0, int /*long*/[] arg1, int[] arg2);
+public static final native int VtblCall (int fnNumber, int /*long*/ ppVtbl, long arg0, int /*long*/[] arg1, int /*long*/[] arg2);
 public static final native int VtblCall (int fnNumber, int /*long*/ ppVtbl, TF_DISPLAYATTRIBUTE arg0);
 
 public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long arg1, long arg2);