diff options
author | Felipe Heidrich | 2010-02-05 18:50:24 +0000 |
---|---|---|
committer | Felipe Heidrich | 2010-02-05 18:50:24 +0000 |
commit | 5048049761b082fa8383b82ac8ee3ea6d70e7168 (patch) | |
tree | 8cf6f1a4fe4973eec0e77da79a9a2c632823c916 | |
parent | e4cdd0cb7ffb526fe1914c6febbe6f0fd302e1cf (diff) | |
download | eclipse.platform.swt-5048049761b082fa8383b82ac8ee3ea6d70e7168.tar.gz eclipse.platform.swt-5048049761b082fa8383b82ac8ee3ea6d70e7168.tar.xz eclipse.platform.swt-5048049761b082fa8383b82ac8ee3ea6d70e7168.zip |
Bug 293228: show progress in the Eclipse icon on the Windows 7 Task Bar
8 files changed, 184 insertions, 109 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 9166e9eaa2..e84c20de12 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 @@ -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 @@ -1335,52 +1335,6 @@ JNIEXPORT void JNICALL COM_NATIVE(VariantInit) } #endif -#if (!defined(NO_VtblCall__IIII) && !defined(JNI64)) || (!defined(NO_VtblCall__IJII) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3) -#endif -{ - jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IIII_FUNC); -#else - COM_NATIVE_ENTER(env, that, VtblCall__IJII_FUNC); -#endif - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IIII_FUNC); -#else - COM_NATIVE_EXIT(env, that, VtblCall__IJII_FUNC); -#endif - return rc; -} -#endif - -#if (!defined(NO_VtblCall__IIIII) && !defined(JNI64)) || (!defined(NO_VtblCall__IJIII) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4) -#endif -{ - jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IIIII_FUNC); -#else - COM_NATIVE_ENTER(env, that, VtblCall__IJIII_FUNC); -#endif - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IIIII_FUNC); -#else - COM_NATIVE_EXIT(env, that, VtblCall__IJIII_FUNC); -#endif - return rc; -} -#endif - #if (!defined(NO_VtblCall__IIIIII) && !defined(JNI64)) || (!defined(NO_VtblCall__IJIIII) && defined(JNI64)) #ifndef JNI64 JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5) @@ -2283,29 +2237,6 @@ fail: } #endif -#if (!defined(NO_VtblCall__IIJI) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3) -#endif -{ - jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IIJI_FUNC); -#else - COM_NATIVE_ENTER(env, that, VtblCall__IJJI_FUNC); -#endif - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IIJI_FUNC); -#else - COM_NATIVE_EXIT(env, that, VtblCall__IJJI_FUNC); -#endif - return rc; -} -#endif - #if (!defined(NO_VtblCall__IIJI_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJI_3I) && defined(JNI64)) #ifndef JNI64 JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIJI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jintArray arg4) 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 ee1e83178d..6e6fb0b45e 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2009 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 @@ -14,8 +14,8 @@ #ifdef NATIVE_STATS -int COM_nativeFunctionCount = 185; -int COM_nativeFunctionCallCount[185]; +int COM_nativeFunctionCount = 182; +int COM_nativeFunctionCallCount[182]; char * COM_nativeFunctionNames[] = { "AccessibleObjectFromWindow", "CALLBACK_1setCurrentValue", @@ -158,16 +158,6 @@ char * COM_nativeFunctionNames[] = { "VariantClear", "VariantInit", #ifndef JNI64 - "VtblCall__IIII", -#else - "VtblCall__IJII", -#endif -#ifndef JNI64 - "VtblCall__IIIII", -#else - "VtblCall__IJIII", -#endif -#ifndef JNI64 "VtblCall__IIIIII", #else "VtblCall__IJIIII", @@ -328,11 +318,6 @@ char * COM_nativeFunctionNames[] = { "VtblCall__IJI_3J_3J_3I_3J", #endif #ifndef JNI64 - "VtblCall__IIJI", -#else - "VtblCall__IJJI", -#endif -#ifndef JNI64 "VtblCall__IIJI_3I", #else "VtblCall__IJJI_3I", 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 33d4378306..3b78ebd7fa 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2009 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 @@ -166,16 +166,6 @@ typedef enum { VariantClear_FUNC, VariantInit_FUNC, #ifndef JNI64 - VtblCall__IIII_FUNC, -#else - VtblCall__IJII_FUNC, -#endif -#ifndef JNI64 - VtblCall__IIIII_FUNC, -#else - VtblCall__IJIII_FUNC, -#endif -#ifndef JNI64 VtblCall__IIIIII_FUNC, #else VtblCall__IJIIII_FUNC, @@ -336,11 +326,6 @@ typedef enum { VtblCall__IJI_3J_3J_3I_3J_FUNC, #endif #ifndef JNI64 - VtblCall__IIJI_FUNC, -#else - VtblCall__IJJI_FUNC, -#endif -#ifndef JNI64 VtblCall__IIJI_3I_FUNC, #else VtblCall__IJJI_3I_FUNC, 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 270a03ead7..92744afdc1 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 @@ -17029,6 +17029,52 @@ JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJI)(JNIEnv *env, jclass that, jint a } #endif +#if (!defined(NO_VtblCall__IIII) && !defined(JNI64)) || (!defined(NO_VtblCall__IJII) && defined(JNI64)) +#ifndef JNI64 +JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3) +#else +JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3) +#endif +{ + jint rc = 0; +#ifndef JNI64 + OS_NATIVE_ENTER(env, that, VtblCall__IIII_FUNC); +#else + OS_NATIVE_ENTER(env, that, VtblCall__IJII_FUNC); +#endif + rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3); +#ifndef JNI64 + OS_NATIVE_EXIT(env, that, VtblCall__IIII_FUNC); +#else + OS_NATIVE_EXIT(env, that, VtblCall__IJII_FUNC); +#endif + return rc; +} +#endif + +#if (!defined(NO_VtblCall__IIIII) && !defined(JNI64)) || (!defined(NO_VtblCall__IJIII) && defined(JNI64)) +#ifndef JNI64 +JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4) +#else +JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4) +#endif +{ + jint rc = 0; +#ifndef JNI64 + OS_NATIVE_ENTER(env, that, VtblCall__IIIII_FUNC); +#else + OS_NATIVE_ENTER(env, that, VtblCall__IJIII_FUNC); +#endif + rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4); +#ifndef JNI64 + OS_NATIVE_EXIT(env, that, VtblCall__IIIII_FUNC); +#else + OS_NATIVE_EXIT(env, that, VtblCall__IJIII_FUNC); +#endif + return rc; +} +#endif + #if (!defined(NO_VtblCall__IIIII_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJIII_3I) && defined(JNI64)) #ifndef JNI64 JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IIIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jintArray arg5) @@ -17083,6 +17129,29 @@ fail: } #endif +#if (!defined(NO_VtblCall__IIIJJ) && !defined(JNI64)) || (!defined(NO_VtblCall__IJIJJ) && defined(JNI64)) +#ifndef JNI64 +JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IIIJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jlong arg3, jlong arg4) +#else +JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJIJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jlong arg3, jlong arg4) +#endif +{ + jint rc = 0; +#ifndef JNI64 + OS_NATIVE_ENTER(env, that, VtblCall__IIIJJ_FUNC); +#else + OS_NATIVE_ENTER(env, that, VtblCall__IJIJJ_FUNC); +#endif + rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jlong, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4); +#ifndef JNI64 + OS_NATIVE_EXIT(env, that, VtblCall__IIIJJ_FUNC); +#else + OS_NATIVE_EXIT(env, that, VtblCall__IJIJJ_FUNC); +#endif + return rc; +} +#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) @@ -17136,6 +17205,29 @@ JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJJ)(JNIEnv *env, jclass that, jint a } #endif +#if (!defined(NO_VtblCall__IIJI) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJI) && defined(JNI64)) +#ifndef JNI64 +JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IIJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3) +#else +JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3) +#endif +{ + jint rc = 0; +#ifndef JNI64 + OS_NATIVE_ENTER(env, that, VtblCall__IIJI_FUNC); +#else + OS_NATIVE_ENTER(env, that, VtblCall__IJJI_FUNC); +#endif + rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3); +#ifndef JNI64 + OS_NATIVE_EXIT(env, that, VtblCall__IIJI_FUNC); +#else + OS_NATIVE_EXIT(env, that, VtblCall__IJJI_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) @@ -17190,6 +17282,29 @@ fail: } #endif +#if (!defined(NO_VtblCall__IIJJJ) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJJJ) && defined(JNI64)) +#ifndef JNI64 +JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IIJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4) +#else +JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4) +#endif +{ + jint rc = 0; +#ifndef JNI64 + OS_NATIVE_ENTER(env, that, VtblCall__IIJJJ_FUNC); +#else + OS_NATIVE_ENTER(env, that, VtblCall__IJJJJ_FUNC); +#endif + rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4); +#ifndef JNI64 + OS_NATIVE_EXIT(env, that, VtblCall__IIJJJ_FUNC); +#else + OS_NATIVE_EXIT(env, that, VtblCall__IJJJJ_FUNC); +#endif + return rc; +} +#endif + #if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_win32_TF_1DISPLAYATTRIBUTE_2) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_win32_TF_1DISPLAYATTRIBUTE_2) && defined(JNI64)) #ifndef JNI64 JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IILorg_eclipse_swt_internal_win32_TF_1DISPLAYATTRIBUTE_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2) 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 8da2f4bb10..357d9d78cf 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 = 985; -int OS_nativeFunctionCallCount[985]; +int OS_nativeFunctionCount = 990; +int OS_nativeFunctionCallCount[990]; char * OS_nativeFunctionNames[] = { "ACCEL_1sizeof", "ACTCTX_1sizeof", @@ -1758,6 +1758,16 @@ char * OS_nativeFunctionNames[] = { "VtblCall__IJI", #endif #ifndef JNI64 + "VtblCall__IIII", +#else + "VtblCall__IJII", +#endif +#ifndef JNI64 + "VtblCall__IIIII", +#else + "VtblCall__IJIII", +#endif +#ifndef JNI64 "VtblCall__IIIII_3I", #else "VtblCall__IJIII_3I", @@ -1768,6 +1778,11 @@ char * OS_nativeFunctionNames[] = { "VtblCall__IJIJI_3J", #endif #ifndef JNI64 + "VtblCall__IIIJJ", +#else + "VtblCall__IJIJJ", +#endif +#ifndef JNI64 "VtblCall__III_3I_3I", #else "VtblCall__IJI_3J_3I", @@ -1778,6 +1793,11 @@ char * OS_nativeFunctionNames[] = { "VtblCall__IJJ", #endif #ifndef JNI64 + "VtblCall__IIJI", +#else + "VtblCall__IJJI", +#endif +#ifndef JNI64 "VtblCall__IIJII_3J", #else "VtblCall__IJJII_3J", @@ -1788,6 +1808,11 @@ char * OS_nativeFunctionNames[] = { "VtblCall__IJJJI_3J", #endif #ifndef JNI64 + "VtblCall__IIJJJ", +#else + "VtblCall__IJJJJ", +#endif +#ifndef JNI64 "VtblCall__IILorg_eclipse_swt_internal_win32_TF_1DISPLAYATTRIBUTE_2", #else "VtblCall__IJLorg_eclipse_swt_internal_win32_TF_1DISPLAYATTRIBUTE_2", 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 8ad701cc51..2e24675614 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 @@ -1766,6 +1766,16 @@ typedef enum { VtblCall__IJI_FUNC, #endif #ifndef JNI64 + VtblCall__IIII_FUNC, +#else + VtblCall__IJII_FUNC, +#endif +#ifndef JNI64 + VtblCall__IIIII_FUNC, +#else + VtblCall__IJIII_FUNC, +#endif +#ifndef JNI64 VtblCall__IIIII_3I_FUNC, #else VtblCall__IJIII_3I_FUNC, @@ -1776,6 +1786,11 @@ typedef enum { VtblCall__IJIJI_3J_FUNC, #endif #ifndef JNI64 + VtblCall__IIIJJ_FUNC, +#else + VtblCall__IJIJJ_FUNC, +#endif +#ifndef JNI64 VtblCall__III_3I_3I_FUNC, #else VtblCall__IJI_3J_3I_FUNC, @@ -1786,6 +1801,11 @@ typedef enum { VtblCall__IJJ_FUNC, #endif #ifndef JNI64 + VtblCall__IIJI_FUNC, +#else + VtblCall__IJJI_FUNC, +#endif +#ifndef JNI64 VtblCall__IIJII_3J_FUNC, #else VtblCall__IJJII_3J_FUNC, @@ -1796,6 +1816,11 @@ typedef enum { VtblCall__IJJJI_3J_FUNC, #endif #ifndef JNI64 + VtblCall__IIJJJ_FUNC, +#else + VtblCall__IJJJJ_FUNC, +#endif +#ifndef JNI64 VtblCall__IILorg_eclipse_swt_internal_win32_TF_1DISPLAYATTRIBUTE_2_FUNC, #else VtblCall__IJLorg_eclipse_swt_internal_win32_TF_1DISPLAYATTRIBUTE_2_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 ec3c6a26c7..940d0a1987 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 @@ -687,9 +687,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, int[] arg1); 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, int arg0, int arg1); public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long arg1); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1); 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, int arg0, int arg1, int[] arg2); @@ -698,7 +696,6 @@ 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, long arg1, int[] arg2); public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int[] arg2); -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, int arg0, int arg1, long arg2); public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, DVTARGETDEVICE arg2, SIZE arg3); 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 4d6a77a096..6b427deb01 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 @@ -1659,6 +1659,11 @@ public class OS extends C { public static final int TB_SETROWS = 0x427; public static final int TB_SETSTATE = 0x411; public static final int TB_THUMBPOSITION = 0x4; + public static final int TBPF_NOPROGRESS = 0x0; + public static final int TBPF_INDETERMINATE = 0x1; + public static final int TBPF_NORMAL = 0x2; + public static final int TBPF_ERROR = 0x4; + public static final int TBPF_PAUSED = 0x8; public static final int TCIF_IMAGE = 0x2; public static final int TCIF_TEXT = 0x1; public static final int TCI_SRCCHARSET = 0x1; @@ -6594,6 +6599,13 @@ public static final native int VtblCall (int fnNumber, int /*long*/ ppVtbl, byte 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, TF_DISPLAYATTRIBUTE arg0); +public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long 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, int arg2); + +public static final native int VtblCall (int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1); +public static final native int VtblCall (int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1); + public static final native boolean WaitMessage (); /** * @param lpWideCharStr cast=(LPCWSTR),flags=no_out critical |