Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNikita Nemkin2019-06-14 11:39:25 -0400
committerNikita Nemkin2019-06-18 05:36:37 -0400
commiteebc5e7cbb549ba580cb7b91ce8443dde9c056dc (patch)
treeeb8d3e688a83c9d6cbb9e598213a5d3535d2e070
parent8ce998bbd9e65934115002ec95404c37f3156411 (diff)
downloadeclipse.platform.swt-eebc5e7cbb549ba580cb7b91ce8443dde9c056dc.tar.gz
eclipse.platform.swt-eebc5e7cbb549ba580cb7b91ce8443dde9c056dc.tar.xz
eclipse.platform.swt-eebc5e7cbb549ba580cb7b91ce8443dde9c056dc.zip
Bug 548277 - [Win32] Remove 32-bit code remnants
Small structures passed by value use different convention between x86 and x64 ABI on Windows. We only need to conform to 64-bit ABI now. In particular, IAccessible required custom callback wrappers to convert by-value VARIANT structures to pointers. Under x64 ABI by-value VARIANTS actually are passed as pointers. Change-Id: I12efeddc3298f92367fd2739fb11f6fa572b31dd Signed-off-by: Nikita Nemkin <nikita@nemkin.ru>
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Accessible.java35
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/WebSite.java23
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleClientSite.java15
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/Variant.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com.c72
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_custom.c309
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_stats.c30
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_stats.h30
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COM.java57
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IAccessible.java32
10 files changed, 32 insertions, 575 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Accessible.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Accessible.java
index 067b58742c..21648c99bb 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Accessible.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Accessible.java
@@ -241,33 +241,6 @@ public class Accessible {
@Override
public long method45(long[] args) {return get_attributes(args[0]);}
};
-
- /* If the callback takes a struct parameter (for example, a VARIANT),
- * then create a custom callback that dereferences the struct and
- * passes a pointer to the original callback.
- */
- long ppVtable = objIAccessible.ppVtable;
- long[] pVtable = new long[1];
- OS.MoveMemory(pVtable, ppVtable, C.PTR_SIZEOF);
- long[] funcs = new long[28];
- OS.MoveMemory(funcs, pVtable[0], C.PTR_SIZEOF * funcs.length);
- funcs[9] = COM.get_accChild_CALLBACK(funcs[9]);
- funcs[10] = COM.get_accName_CALLBACK(funcs[10]);
- funcs[11] = COM.get_accValue_CALLBACK(funcs[11]);
- funcs[12] = COM.get_accDescription_CALLBACK(funcs[12]);
- funcs[13] = COM.get_accRole_CALLBACK(funcs[13]);
- funcs[14] = COM.get_accState_CALLBACK(funcs[14]);
- funcs[15] = COM.get_accHelp_CALLBACK(funcs[15]);
- funcs[16] = COM.get_accHelpTopic_CALLBACK(funcs[16]);
- funcs[17] = COM.get_accKeyboardShortcut_CALLBACK(funcs[17]);
- funcs[20] = COM.get_accDefaultAction_CALLBACK(funcs[20]);
- funcs[21] = COM.accSelect_CALLBACK(funcs[21]);
- funcs[22] = COM.accLocation_CALLBACK(funcs[22]);
- funcs[23] = COM.accNavigate_CALLBACK(funcs[23]);
- funcs[25] = COM.accDoDefaultAction_CALLBACK(funcs[25]);
- funcs[26] = COM.put_accName_CALLBACK(funcs[26]);
- funcs[27] = COM.put_accValue_CALLBACK(funcs[27]);
- OS.MoveMemory(pVtable[0], funcs, C.PTR_SIZEOF * funcs.length);
}
void createIAccessibleApplication() {
@@ -527,14 +500,6 @@ public class Accessible {
@Override
public long method6(long[] args) {return get_minimumValue(args[0]);}
};
- /* Dereference VARIANT struct parameters. */
- long ppVtable = objIAccessibleValue.ppVtable;
- long[] pVtable = new long[1];
- OS.MoveMemory(pVtable, ppVtable, C.PTR_SIZEOF);
- long[] funcs = new long[7];
- OS.MoveMemory(funcs, pVtable[0], C.PTR_SIZEOF * funcs.length);
- funcs[4] = COM.CALLBACK_setCurrentValue(funcs[4]);
- OS.MoveMemory(pVtable[0], funcs, C.PTR_SIZEOF * funcs.length);
}
void createIEnumVARIANT() {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/WebSite.java b/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/WebSite.java
index 60c1ea3506..d9245fed72 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/WebSite.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/WebSite.java
@@ -83,7 +83,7 @@ protected void createCOMInterfaces () {
@Override
public long method17(long[] args) {return FilterDataObject(args[0], args[1]);}
};
- iDocHostShowUI = new COMObject(new int[]{2, 0, 0, 7, C.PTR_SIZEOF == 4 ? 7 : 6}){
+ iDocHostShowUI = new COMObject(new int[]{2, 0, 0, 7, 6}){
@Override
public long method0(long[] args) {return QueryInterface(args[0], args[1]);}
@Override
@@ -93,13 +93,7 @@ protected void createCOMInterfaces () {
@Override
public long method3(long[] args) {return ShowMessage(args[0], args[1], args[2], (int)args[3], args[4], (int)args[5], args[6]);}
@Override
- public long method4(long[] args) {
- if (args.length == 7) {
- return ShowHelp(args[0], args[1], (int)args[2], (int)args[3], (int)args[4], (int)args[5], args[6]);
- } else {
- return ShowHelp_64(args[0], args[1], (int)args[2], (int)args[3], args[4], args[5]);
- }
- }
+ public long method4(long[] args) {return ShowHelp(args[0], args[1], (int)args[2], (int)args[3], args[4], args[5]);}
};
iServiceProvider = new COMObject(new int[]{2, 0, 0, 3}){
@Override
@@ -493,18 +487,7 @@ int ShowMessage(long hwnd, long lpstrText, long lpstrCaption, int dwType, long l
return ignore ? COM.S_OK : COM.S_FALSE;
}
-int ShowHelp_64(long hwnd, long pszHelpFile, int uCommand, int dwData, long pt, long pDispatchObjectHit) {
- POINT point = new POINT();
- OS.MoveMemory(point, new long[]{pt}, 8);
- return ShowHelp(hwnd, pszHelpFile, uCommand, dwData, point.x, point.y, pDispatchObjectHit);
-}
-
-/* Note. One of the arguments of ShowHelp is a POINT struct and not a pointer to a POINT struct. Because
- * of the way Callback gets int parameters from a va_list of C arguments 2 integer arguments must be declared,
- * ptMouse_x and ptMouse_y. Otherwise the Browser crashes when the user presses F1 to invoke
- * the help.
- */
-int ShowHelp(long hwnd, long pszHelpFile, int uCommand, int dwData, int ptMouse_x, int ptMouse_y, long pDispatchObjectHit) {
+int ShowHelp(long hwnd, long pszHelpFile, int uCommand, int dwData, long pt, long pDispatchObjectHit) {
Browser browser = (Browser)getParent().getParent();
Event event = new Event();
event.type = SWT.Help;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleClientSite.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleClientSite.java
index 094c02c976..efec4e5a21 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleClientSite.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleClientSite.java
@@ -539,7 +539,7 @@ protected void createCOMInterfaces() {
public long method7(long[] args) {return OnClose();}
};
- iOleInPlaceSite = new COMObject(new int[]{2, 0, 0, 1, 1, 0, 0, 0, 5, C.PTR_SIZEOF == 4 ? 2 : 1, 1, 0, 0, 0, 1}){
+ iOleInPlaceSite = new COMObject(new int[]{2, 0, 0, 1, 1, 0, 0, 0, 5, 1, 1, 0, 0, 0, 1}){
@Override
public long method0(long[] args) {return QueryInterface(args[0], args[1]);}
@Override
@@ -559,13 +559,7 @@ protected void createCOMInterfaces() {
@Override
public long method8(long[] args) {return GetWindowContext(args[0], args[1], args[2], args[3], args[4]);}
@Override
- public long method9(long[] args) {
- if (args.length == 2) {
- return Scroll((int)args[0], (int)args[1]);
- } else {
- return Scroll_64(args[0]);
- }
- }
+ public long method9(long[] args) {return Scroll(args[0]);}
@Override
public long method10(long[] args) {return OnUIDeactivate((int)args[0]);}
@Override
@@ -1377,10 +1371,7 @@ private boolean saveToTraditionalFile(File file) {
return false;
}
-private int Scroll_64(long scrollExtent) {
- return COM.S_OK;
-}
-private int Scroll(int scrollExtent_cx, int scrollExtent_cy) {
+private int Scroll(long scrollExtent) {
return COM.S_OK;
}
void setBorderSpace(RECT newBorderwidth) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/Variant.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/Variant.java
index b9a0122cd1..c75a3bccb4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/Variant.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/Variant.java
@@ -891,9 +891,7 @@ public void setByRef(float val) {
* @since 2.1
*/
public void setByRef(long val) {
- if ((type & COM.VT_BYREF) == 0
- || (C.PTR_SIZEOF == 4 && (type & COM.VT_I4) == 0)
- || (C.PTR_SIZEOF == 8 && (type & COM.VT_I8) == 0)) {
+ if ((type & COM.VT_BYREF) == 0 || (type & COM.VT_I8) == 0) {
OLE.error(OLE.ERROR_CANNOT_CHANGE_VARIANT_TYPE);
}
OS.MoveMemory(byRefPtr, new long[]{val}, C.PTR_SIZEOF);
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 8d21bf7f73..7954807364 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
@@ -1192,54 +1192,6 @@ JNIEXPORT void JNICALL COM_NATIVE(VariantInit)
}
#endif
-#ifndef NO_VtblCall__IJIIII
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJIIII)
- (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jint arg5)
-{
- jint rc = 0;
- COM_NATIVE_ENTER(env, that, VtblCall__IJIIII_FUNC);
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint, jint, jint))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5);
- COM_NATIVE_EXIT(env, that, VtblCall__IJIIII_FUNC);
- return rc;
-}
-#endif
-
-#ifndef NO_VtblCall__IJIIIII
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJIIIII)
- (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6)
-{
- jint rc = 0;
- COM_NATIVE_ENTER(env, that, VtblCall__IJIIIII_FUNC);
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint, jint, jint, jint))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6);
- COM_NATIVE_EXIT(env, that, VtblCall__IJIIIII_FUNC);
- return rc;
-}
-#endif
-
-#ifndef NO_VtblCall__IJIIIIIJ
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJIIIIIJ)
- (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jlong arg7)
-{
- jint rc = 0;
- COM_NATIVE_ENTER(env, that, VtblCall__IJIIIIIJ_FUNC);
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint, jint, jint, jint, jlong))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
- COM_NATIVE_EXIT(env, that, VtblCall__IJIIIIIJ_FUNC);
- 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)
-{
- jint rc = 0;
- COM_NATIVE_ENTER(env, that, VtblCall__IJIIIIJ_FUNC);
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint, jint, jint, jlong))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6);
- COM_NATIVE_EXIT(env, that, VtblCall__IJIIIIJ_FUNC);
- return rc;
-}
-#endif
-
#ifndef NO_VtblCall__IJIIILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2ILorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2I
JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJIIILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2ILorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2I)
(JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jobject arg5, jint arg6, jobject arg7, jint arg8)
@@ -1710,18 +1662,6 @@ fail:
}
#endif
-#ifndef NO_VtblCall__IJJIIIIJ
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJIIIIJ)
- (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jint arg3, jint arg4, jint arg5, jint arg6, jlong arg7)
-{
- jint rc = 0;
- COM_NATIVE_ENTER(env, that, VtblCall__IJJIIIIJ_FUNC);
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jint, jint, jint, jint, jlong))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
- COM_NATIVE_EXIT(env, that, VtblCall__IJJIIIIJ_FUNC);
- return rc;
-}
-#endif
-
#ifndef NO_VtblCall__IJJI_3I
JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJI_3I)
(JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jint arg3, jintArray arg4)
@@ -1754,14 +1694,14 @@ fail:
}
#endif
-#ifndef NO_VtblCall__IJJJJJIIII
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJJJJIIII)
- (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jint arg6, jint arg7, jint arg8, jint arg9)
+#ifndef NO_VtblCall__IJJJJJJ
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJJJJJ)
+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6)
{
jint rc = 0;
- COM_NATIVE_ENTER(env, that, VtblCall__IJJJJJIIII_FUNC);
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jlong, jlong, jlong, jint, jint, jint, jint))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
- COM_NATIVE_EXIT(env, that, VtblCall__IJJJJJIIII_FUNC);
+ COM_NATIVE_ENTER(env, that, VtblCall__IJJJJJJ_FUNC);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jlong, jlong, jlong, jlong))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6);
+ COM_NATIVE_EXIT(env, that, VtblCall__IJJJJJJ_FUNC);
return rc;
}
#endif
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_custom.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_custom.c
index 99b4c863e3..590330a0fb 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_custom.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_custom.c
@@ -17,312 +17,3 @@
#include "com_stats.h"
#define COM_NATIVE(func) Java_org_eclipse_swt_internal_ole_win32_COM_##func
-
-#ifndef NO_get_1accChild_1CALLBACK
-static jintLong get_accChild_CALLBACK;
-static HRESULT CALLBACK get_accChild(void* ppVTable, VARIANT varChildID, IDispatch** ppdispChild)
-{
- return ((HRESULT (CALLBACK *)(void*, VARIANT*, IDispatch**))get_accChild_CALLBACK)(ppVTable, &varChildID, ppdispChild);
-}
-JNIEXPORT jintLong JNICALL COM_NATIVE(get_1accChild_1CALLBACK)
- (JNIEnv *env, jclass that, jintLong func)
-{
- get_accChild_CALLBACK = func;
- return (jintLong)get_accChild;
-}
-#endif
-
-#ifndef NO_get_1accName_1CALLBACK
-static jintLong get_accName_CALLBACK;
-static HRESULT CALLBACK get_accName(void* ppVTable, VARIANT varID, BSTR* pszName)
-{
- return ((HRESULT (CALLBACK *)(void*, VARIANT*, BSTR*))get_accName_CALLBACK)(ppVTable, &varID, pszName);
-}
-JNIEXPORT jintLong JNICALL COM_NATIVE(get_1accName_1CALLBACK)
- (JNIEnv *env, jclass that, jintLong func)
-{
- get_accName_CALLBACK = func;
- return (jintLong)get_accName;
-}
-#endif
-
-#ifndef NO_get_1accValue_1CALLBACK
-static jintLong get_accValue_CALLBACK;
-static HRESULT CALLBACK get_accValue(void* ppVTable, VARIANT varID, BSTR* pszValue)
-{
- return ((HRESULT (CALLBACK *)(void*, VARIANT*, BSTR*))get_accValue_CALLBACK)(ppVTable, &varID, pszValue);
-}
-JNIEXPORT jintLong JNICALL COM_NATIVE(get_1accValue_1CALLBACK)
- (JNIEnv *env, jclass that, jintLong func)
-{
- get_accValue_CALLBACK = func;
- return (jintLong)get_accValue;
-}
-#endif
-
-#ifndef NO_get_1accDescription_1CALLBACK
-static jintLong get_accDescription_CALLBACK;
-static HRESULT CALLBACK get_accDescription( void* ppVTable, VARIANT varID, BSTR* pszDescription)
-{
- return ((HRESULT (CALLBACK *)(void*, VARIANT*, BSTR*))get_accDescription_CALLBACK)(ppVTable, &varID, pszDescription);
-}
-JNIEXPORT jintLong JNICALL COM_NATIVE(get_1accDescription_1CALLBACK)
- (JNIEnv *env, jclass that, jintLong func)
-{
- get_accDescription_CALLBACK = func;
- return (jintLong)get_accDescription;
-}
-#endif
-
-#ifndef NO_get_1accRole_1CALLBACK
-static jintLong get_accRole_CALLBACK;
-static HRESULT CALLBACK get_accRole(void* ppVTable, VARIANT varID, VARIANT* pvarRole)
-{
- return ((HRESULT (CALLBACK *)(void*, VARIANT*, VARIANT*))get_accRole_CALLBACK)(ppVTable, &varID, pvarRole);
-}
-JNIEXPORT jintLong JNICALL COM_NATIVE(get_1accRole_1CALLBACK)
- (JNIEnv *env, jclass that, jintLong func)
-{
- get_accRole_CALLBACK = func;
- return (jintLong)get_accRole;
-}
-#endif
-
-#ifndef NO_get_1accState_1CALLBACK
-static jintLong get_accState_CALLBACK;
-static HRESULT CALLBACK get_accState(void* ppVTable, VARIANT varID, VARIANT* pvarState)
-{
- return ((HRESULT (CALLBACK *)(void*, VARIANT*, VARIANT*))get_accState_CALLBACK)(ppVTable, &varID, pvarState);
-}
-JNIEXPORT jintLong JNICALL COM_NATIVE(get_1accState_1CALLBACK)
- (JNIEnv *env, jclass that, jintLong func)
-{
- get_accState_CALLBACK = func;
- return (jintLong)get_accState;
-}
-#endif
-
-#ifndef NO_get_1accHelp_1CALLBACK
-static jintLong get_accHelp_CALLBACK;
-static HRESULT CALLBACK get_accHelp(void* ppVTable, VARIANT varID, BSTR* pszHelp)
-{
- return ((HRESULT (CALLBACK *)(void*, VARIANT*, BSTR*))get_accHelp_CALLBACK)(ppVTable, &varID, pszHelp);
-}
-JNIEXPORT jintLong JNICALL COM_NATIVE(get_1accHelp_1CALLBACK)
- (JNIEnv *env, jclass that, jintLong func)
-{
- get_accHelp_CALLBACK = func;
- return (jintLong)get_accHelp;
-}
-#endif
-
-#ifndef NO_get_1accHelpTopic_1CALLBACK
-static jintLong get_accHelpTopic_CALLBACK;
-static HRESULT CALLBACK get_accHelpTopic(void* ppVTable, BSTR* pszHelpFile, VARIANT varChild, long* pidTopic)
-{
- return ((HRESULT (CALLBACK *)(void*, BSTR*, VARIANT*, long*))get_accHelpTopic_CALLBACK)(ppVTable, pszHelpFile, &varChild, pidTopic);
-}
-JNIEXPORT jintLong JNICALL COM_NATIVE(get_1accHelpTopic_1CALLBACK)
- (JNIEnv *env, jclass that, jintLong func)
-{
- get_accHelpTopic_CALLBACK = func;
- return (jintLong)get_accHelpTopic;
-}
-#endif
-
-#ifndef NO_get_1accKeyboardShortcut_1CALLBACK
-static jintLong get_accKeyboardShortcut_CALLBACK;
-static HRESULT CALLBACK get_accKeyboardShortcut(void* ppVTable, VARIANT varID, BSTR* pszKeyboardShortcut)
-{
- return ((HRESULT (CALLBACK *)(void*, VARIANT*, BSTR*))get_accKeyboardShortcut_CALLBACK)(ppVTable, &varID, pszKeyboardShortcut);
-}
-JNIEXPORT jintLong JNICALL COM_NATIVE(get_1accKeyboardShortcut_1CALLBACK)
- (JNIEnv *env, jclass that, jintLong func)
-{
- get_accKeyboardShortcut_CALLBACK = func;
- return (jintLong)get_accKeyboardShortcut;
-}
-#endif
-
-#ifndef NO_get_1accDefaultAction_1CALLBACK
-static jintLong get_accDefaultAction_CALLBACK;
-static HRESULT CALLBACK get_accDefaultAction(void* ppVTable, VARIANT varID, BSTR* pszDefaultAction)
-{
- return ((HRESULT (CALLBACK *)(void*, VARIANT*, BSTR*))get_accDefaultAction_CALLBACK)(ppVTable, &varID, pszDefaultAction);
-}
-JNIEXPORT jintLong JNICALL COM_NATIVE(get_1accDefaultAction_1CALLBACK)
- (JNIEnv *env, jclass that, jintLong func)
-{
- get_accDefaultAction_CALLBACK = func;
- return (jintLong)get_accDefaultAction;
-}
-#endif
-
-#ifndef NO_accSelect_1CALLBACK
-static jintLong accSelect_CALLBACK;
-static HRESULT CALLBACK accSelect(void* ppVTable, long flagsSelect, VARIANT varID)
-{
- return ((HRESULT (CALLBACK *)(void*, long, VARIANT*))accSelect_CALLBACK)(ppVTable, flagsSelect, &varID);
-}
-JNIEXPORT jintLong JNICALL COM_NATIVE(accSelect_1CALLBACK)
- (JNIEnv *env, jclass that, jintLong func)
-{
- accSelect_CALLBACK = func;
- return (jintLong)accSelect;
-}
-#endif
-
-#ifndef NO_accLocation_1CALLBACK
-static jintLong accLocation_CALLBACK;
-static HRESULT CALLBACK accLocation(void* ppVTable, long* pxLeft, long* pyTop, long* pcxWidth, long* pcyHeight, VARIANT varID)
-{
- return ((HRESULT (CALLBACK *)(void*, long*, long*, long*, long*, VARIANT*))accLocation_CALLBACK)(ppVTable, pxLeft, pyTop, pcxWidth, pcyHeight, &varID);
-}
-JNIEXPORT jintLong JNICALL COM_NATIVE(accLocation_1CALLBACK)
- (JNIEnv *env, jclass that, jintLong func)
-{
- accLocation_CALLBACK = func;
- return (jintLong)accLocation;
-}
-#endif
-
-#ifndef NO_accNavigate_1CALLBACK
-static jintLong accNavigate_CALLBACK;
-static HRESULT CALLBACK accNavigate(void* ppVTable, long navDir, VARIANT varStart, VARIANT* pvarEnd)
-{
- return ((HRESULT (CALLBACK *)(void*, long, VARIANT*, VARIANT*))accNavigate_CALLBACK)(ppVTable, navDir, &varStart, pvarEnd);
-}
-JNIEXPORT jintLong JNICALL COM_NATIVE(accNavigate_1CALLBACK)
- (JNIEnv *env, jclass that, jintLong func)
-{
- accNavigate_CALLBACK = func;
- return (jintLong)accNavigate;
-}
-#endif
-
-#ifndef NO_accDoDefaultAction_1CALLBACK
-static jintLong accDoDefaultAction_CALLBACK;
-static HRESULT CALLBACK accDoDefaultAction(void* ppVTable, VARIANT varID)
-{
- return ((HRESULT (CALLBACK *)(void*, VARIANT*))accDoDefaultAction_CALLBACK)(ppVTable, &varID);
-}
-JNIEXPORT jintLong JNICALL COM_NATIVE(accDoDefaultAction_1CALLBACK)
- (JNIEnv *env, jclass that, jintLong func)
-{
- accDoDefaultAction_CALLBACK = func;
- return (jintLong)accDoDefaultAction;
-}
-#endif
-
-#ifndef NO_put_1accName_1CALLBACK
-static jintLong put_accName_CALLBACK;
-static HRESULT CALLBACK put_accName(void* ppVTable, VARIANT varID, BSTR* pszName)
-{
- return ((HRESULT (CALLBACK *)(void*, VARIANT*, BSTR*))put_accName_CALLBACK)(ppVTable, &varID, pszName);
-}
-JNIEXPORT jintLong JNICALL COM_NATIVE(put_1accName_1CALLBACK)
- (JNIEnv *env, jclass that, jintLong func)
-{
- put_accName_CALLBACK = func;
- return (jintLong)put_accName;
-}
-#endif
-
-#ifndef NO_put_1accValue_1CALLBACK
-static jintLong put_accValue_CALLBACK;
-static HRESULT CALLBACK put_accValue(void* ppVTable, VARIANT varID, BSTR* pszValue)
-{
- return ((HRESULT (CALLBACK *)(void*, VARIANT*, BSTR*))put_accValue_CALLBACK)(ppVTable, &varID, pszValue);
-}
-JNIEXPORT jintLong JNICALL COM_NATIVE(put_1accValue_1CALLBACK)
- (JNIEnv *env, jclass that, jintLong func)
-{
- put_accValue_CALLBACK = func;
- return (jintLong)put_accValue;
-}
-#endif
-
-#ifndef NO_CALLBACK_1setCurrentValue
-static jintLong CALLBACK_setCurrentValue;
-static HRESULT CALLBACK setCurrentValue(void* ppVTable, VARIANT arg0) {
- return ((HRESULT (CALLBACK *)(void*, VARIANT*))CALLBACK_setCurrentValue)(ppVTable, &arg0);
-}
-JNIEXPORT jintLong JNICALL COM_NATIVE(CALLBACK_1setCurrentValue)
- (JNIEnv *env, jclass that, jintLong func)
-{
- CALLBACK_setCurrentValue = func;
- return (jintLong)setCurrentValue;
-}
-#endif
-
-#ifndef NO_VtblCall_1PPPPVARIANT
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall_1PPPPVARIANT)
- (JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5, jintLong arg6)
-{
- jint rc = 0;
- COM_NATIVE_ENTER(env, that, VtblCall_1PPPPVARIANT_FUNC);
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jintLong, jintLong, jintLong, jintLong, VARIANT))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, *(VARIANT *)arg6);
- COM_NATIVE_EXIT(env, that, VtblCall_1PPPPVARIANT_FUNC);
- return rc;
-}
-#endif
-
-#ifndef NO_VtblCall_1IVARIANT
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall_1IVARIANT)
- (JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintLong arg3)
-{
- jint rc = 0;
- COM_NATIVE_ENTER(env, that, VtblCall_1IVARIANT_FUNC);
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, VARIANT))(*(jintLong **)arg1)[arg0])(arg1, arg2, *(VARIANT *)arg3);
- COM_NATIVE_EXIT(env, that, VtblCall_1IVARIANT_FUNC);
- return rc;
-}
-#endif
-
-#ifndef NO_VtblCall_1PVARIANTP
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall_1PVARIANTP)
- (JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4)
-{
- jint rc = 0;
- COM_NATIVE_ENTER(env, that, VtblCall_1PVARIANTP_FUNC);
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jintLong, VARIANT, jintLong))(*(jintLong **)arg1)[arg0])(arg1, arg2, *(VARIANT *)arg3, arg4);
- COM_NATIVE_EXIT(env, that, VtblCall_1PVARIANTP_FUNC);
- return rc;
-}
-#endif
-
-#ifndef NO_VtblCall_1IVARIANTP
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall_1IVARIANTP)
- (JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintLong arg3, jintLong arg4)
-{
- jint rc = 0;
- COM_NATIVE_ENTER(env, that, VtblCall_1IVARIANTP_FUNC);
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, VARIANT, jintLong))(*(jintLong **)arg1)[arg0])(arg1, arg2, *(VARIANT *)arg3, arg4);
- COM_NATIVE_EXIT(env, that, VtblCall_1IVARIANTP_FUNC);
- return rc;
-}
-#endif
-
-#ifndef NO_VtblCall_1VARIANT
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall_1VARIANT)
- (JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2)
-{
- jint rc = 0;
- COM_NATIVE_ENTER(env, that, VtblCall_1VARIANT_FUNC);
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, VARIANT))(*(jintLong **)arg1)[arg0])(arg1, *(VARIANT *)arg2);
- COM_NATIVE_EXIT(env, that, VtblCall_1VARIANT_FUNC);
- return rc;
-}
-#endif
-
-#ifndef NO_VtblCall_1VARIANTI
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall_1VARIANTP)
- (JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2, jintLong arg3)
-{
- jint rc = 0;
- COM_NATIVE_ENTER(env, that, VtblCall_1VARIANTP_FUNC);
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, VARIANT, jintLong))(*(jintLong **)arg1)[arg0])(arg1, *(VARIANT *)arg2, arg3);
- COM_NATIVE_EXIT(env, that, VtblCall_1VARIANTP_FUNC);
- return rc;
-}
-#endif
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 6d853bc663..04270f9363 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
@@ -23,7 +23,6 @@
char * COM_nativeFunctionNames[] = {
"AccessibleChildren",
"AccessibleObjectFromWindow",
- "CALLBACK_1setCurrentValue",
"CAUUID_1sizeof",
"CLSIDFromProgID",
"CLSIDFromString",
@@ -101,10 +100,6 @@ char * COM_nativeFunctionNames[] = {
"VariantChangeType",
"VariantClear",
"VariantInit",
- "VtblCall__IJIIII",
- "VtblCall__IJIIIII",
- "VtblCall__IJIIIIIJ",
- "VtblCall__IJIIIIJ",
"VtblCall__IJIIILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2ILorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2I",
"VtblCall__IJIIILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JLorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2J",
"VtblCall__IJIIJ",
@@ -131,10 +126,9 @@ char * COM_nativeFunctionNames[] = {
"VtblCall__IJI_3I_3I_3I_3I",
"VtblCall__IJI_3JI_3I",
"VtblCall__IJI_3J_3J_3I_3J",
- "VtblCall__IJJIIIIJ",
"VtblCall__IJJI_3I",
"VtblCall__IJJI_3J",
- "VtblCall__IJJJJJIIII",
+ "VtblCall__IJJJJJJ",
"VtblCall__IJJJLorg_eclipse_swt_internal_ole_win32_GUID_2J_3J",
"VtblCall__IJJJLorg_eclipse_swt_internal_win32_POINT_2I",
"VtblCall__IJJJZ",
@@ -181,29 +175,7 @@ char * COM_nativeFunctionNames[] = {
"VtblCall__IJ_3CJII_3J",
"VtblCall__IJ_3C_3C",
"VtblCall__IJ_3C_3I_3I",
- "VtblCall_1IVARIANT",
- "VtblCall_1IVARIANTP",
- "VtblCall_1PPPPVARIANT",
- "VtblCall_1PVARIANTP",
- "VtblCall_1VARIANT",
- "VtblCall_1VARIANTP",
"WriteClassStg",
- "accDoDefaultAction_1CALLBACK",
- "accLocation_1CALLBACK",
- "accNavigate_1CALLBACK",
- "accSelect_1CALLBACK",
- "get_1accChild_1CALLBACK",
- "get_1accDefaultAction_1CALLBACK",
- "get_1accDescription_1CALLBACK",
- "get_1accHelpTopic_1CALLBACK",
- "get_1accHelp_1CALLBACK",
- "get_1accKeyboardShortcut_1CALLBACK",
- "get_1accName_1CALLBACK",
- "get_1accRole_1CALLBACK",
- "get_1accState_1CALLBACK",
- "get_1accValue_1CALLBACK",
- "put_1accName_1CALLBACK",
- "put_1accValue_1CALLBACK",
};
#define NATIVE_FUNCTION_COUNT sizeof(COM_nativeFunctionNames) / sizeof(char*)
int COM_nativeFunctionCount = NATIVE_FUNCTION_COUNT;
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 ae69d4c99b..d765f066a2 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
@@ -33,7 +33,6 @@ extern char* COM_nativeFunctionNames[];
typedef enum {
AccessibleChildren_FUNC,
AccessibleObjectFromWindow_FUNC,
- CALLBACK_1setCurrentValue_FUNC,
CAUUID_1sizeof_FUNC,
CLSIDFromProgID_FUNC,
CLSIDFromString_FUNC,
@@ -111,10 +110,6 @@ typedef enum {
VariantChangeType_FUNC,
VariantClear_FUNC,
VariantInit_FUNC,
- VtblCall__IJIIII_FUNC,
- VtblCall__IJIIIII_FUNC,
- VtblCall__IJIIIIIJ_FUNC,
- VtblCall__IJIIIIJ_FUNC,
VtblCall__IJIIILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2ILorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2I_FUNC,
VtblCall__IJIIILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JLorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2J_FUNC,
VtblCall__IJIIJ_FUNC,
@@ -141,10 +136,9 @@ typedef enum {
VtblCall__IJI_3I_3I_3I_3I_FUNC,
VtblCall__IJI_3JI_3I_FUNC,
VtblCall__IJI_3J_3J_3I_3J_FUNC,
- VtblCall__IJJIIIIJ_FUNC,
VtblCall__IJJI_3I_FUNC,
VtblCall__IJJI_3J_FUNC,
- VtblCall__IJJJJJIIII_FUNC,
+ VtblCall__IJJJJJJ_FUNC,
VtblCall__IJJJLorg_eclipse_swt_internal_ole_win32_GUID_2J_3J_FUNC,
VtblCall__IJJJLorg_eclipse_swt_internal_win32_POINT_2I_FUNC,
VtblCall__IJJJZ_FUNC,
@@ -191,27 +185,5 @@ typedef enum {
VtblCall__IJ_3CJII_3J_FUNC,
VtblCall__IJ_3C_3C_FUNC,
VtblCall__IJ_3C_3I_3I_FUNC,
- VtblCall_1IVARIANT_FUNC,
- VtblCall_1IVARIANTP_FUNC,
- VtblCall_1PPPPVARIANT_FUNC,
- VtblCall_1PVARIANTP_FUNC,
- VtblCall_1VARIANT_FUNC,
- VtblCall_1VARIANTP_FUNC,
WriteClassStg_FUNC,
- accDoDefaultAction_1CALLBACK_FUNC,
- accLocation_1CALLBACK_FUNC,
- accNavigate_1CALLBACK_FUNC,
- accSelect_1CALLBACK_FUNC,
- get_1accChild_1CALLBACK_FUNC,
- get_1accDefaultAction_1CALLBACK_FUNC,
- get_1accDescription_1CALLBACK_FUNC,
- get_1accHelpTopic_1CALLBACK_FUNC,
- get_1accHelp_1CALLBACK_FUNC,
- get_1accKeyboardShortcut_1CALLBACK_FUNC,
- get_1accName_1CALLBACK_FUNC,
- get_1accRole_1CALLBACK_FUNC,
- get_1accState_1CALLBACK_FUNC,
- get_1accValue_1CALLBACK_FUNC,
- put_1accName_1CALLBACK_FUNC,
- put_1accValue_1CALLBACK_FUNC,
} COM_FUNCS;
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 b99de1f8b6..bb25295ad8 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
@@ -749,6 +749,7 @@ public static final native int VtblCall(int fnNumber, long ppVtbl, LICINFO arg0)
public static final native int VtblCall(int fnNumber, long ppVtbl, RECT arg0, int arg1, boolean arg2);
public static final native int VtblCall(int fnNumber, long ppVtbl, RECT arg0, long arg1, boolean arg2);
+public static final native int VtblCall(int fnNumber, long ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4);
/**
* @param arg0 flags=struct
*/
@@ -975,62 +976,6 @@ public static final native long LresultFromObject (GUID riid, long wParam, long
*/
public static final native int AccessibleChildren(long paccContainer, int iChildStart, int cChildren, long rgvarChildren, int [] pcObtained);
-/*USED*/public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, int arg1, int arg2, int arg3);
-/*USED*/public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4);
-/*USED,NEW*/public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, int arg1, int arg2, int arg3, long arg4);
-/*USED*/public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, long arg5);
-/*USED,NEW*/public static final native int VtblCall(int fnNumber, long ppVtbl, long arg0, int arg1, int arg2, int arg3, int arg4, long arg5);
-/*USED*/public static final native int VtblCall(int fnNumber, long ppVtbl, long arg0, long arg1, long arg2, long arg3, int arg4, int arg5, int arg6, int arg7);
-
-/** Custom accessibility natives */
-
-/** @method flags=no_gen */
-public static final native int VtblCall_VARIANT(int fnNumber, long ppVtbl, long arg0);
-/** @method flags=no_gen */
-public static final native int VtblCall_VARIANTP(int fnNumber, long ppVtbl, long arg0, long arg1);
-/** @method flags=no_gen */
-public static final native int VtblCall_IVARIANT(int fnNumber, long ppVtbl, int arg0, long arg1);
-/** @method flags=no_gen */
-public static final native int VtblCall_IVARIANTP(int fnNumber, long ppVtbl, int arg0, long arg1, long arg2);
-/** @method flags=no_gen */
-public static final native int VtblCall_PVARIANTP(int fnNumber, long ppVtbl, long arg0, long arg1, long arg2);
-/** @method flags=no_gen */
-public static final native int VtblCall_PPPPVARIANT(int fnNumber, long ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4);
-/** @method flags=no_gen */
-public static final native long get_accChild_CALLBACK(long func);
-/** @method flags=no_gen */
-public static final native long get_accName_CALLBACK(long func);
-/** @method flags=no_gen */
-public static final native long get_accValue_CALLBACK(long func);
-/** @method flags=no_gen */
-public static final native long get_accDescription_CALLBACK(long func);
-/** @method flags=no_gen */
-public static final native long get_accRole_CALLBACK(long func);
-/** @method flags=no_gen */
-public static final native long get_accState_CALLBACK(long func);
-/** @method flags=no_gen */
-public static final native long get_accHelp_CALLBACK(long func);
-/** @method flags=no_gen */
-public static final native long get_accHelpTopic_CALLBACK(long func);
-/** @method flags=no_gen */
-public static final native long get_accKeyboardShortcut_CALLBACK(long func);
-/** @method flags=no_gen */
-public static final native long get_accDefaultAction_CALLBACK(long func);
-/** @method flags=no_gen */
-public static final native long accSelect_CALLBACK(long func);
-/** @method flags=no_gen */
-public static final native long accLocation_CALLBACK(long func);
-/** @method flags=no_gen */
-public static final native long accNavigate_CALLBACK(long func);
-/** @method flags=no_gen */
-public static final native long accDoDefaultAction_CALLBACK(long func);
-/** @method flags=no_gen */
-public static final native long put_accName_CALLBACK(long func);
-/** @method flags=no_gen */
-public static final native long put_accValue_CALLBACK(long func);
-/** @method flags=no_gen,callback_types=HRESULT;VARIANT;,callback_flags=none;struct; */
-public static final native long CALLBACK_setCurrentValue(long func);
-
/* sizeof's */
public static final native int CAUUID_sizeof();
public static final native int CONTROLINFO_sizeof();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IAccessible.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IAccessible.java
index 675a2cf602..97716fa178 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IAccessible.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IAccessible.java
@@ -28,31 +28,31 @@ public int get_accChildCount(long pcountChildren) {
return OS.VtblCall(8, address, pcountChildren);
}
public int get_accChild(long variant, long ppdispChild) {
- return COM.VtblCall_VARIANTP(9, address, variant, ppdispChild);
+ return OS.VtblCall(9, address, variant, ppdispChild);
}
public int get_accName(long variant, long pszName) {
- return COM.VtblCall_VARIANTP(10, address, variant, pszName);
+ return OS.VtblCall(10, address, variant, pszName);
}
public int get_accValue(long variant, long pszValue) {
- return COM.VtblCall_VARIANTP(11, address, variant, pszValue);
+ return OS.VtblCall(11, address, variant, pszValue);
}
public int get_accDescription(long variant, long pszDescription) {
- return COM.VtblCall_VARIANTP(12, address, variant, pszDescription);
+ return OS.VtblCall(12, address, variant, pszDescription);
}
public int get_accRole(long variant, long pvarRole) {
- return COM.VtblCall_VARIANTP(13, address, variant, pvarRole);
+ return OS.VtblCall(13, address, variant, pvarRole);
}
public int get_accState(long variant, long pvarState) {
- return COM.VtblCall_VARIANTP(14, address, variant, pvarState);
+ return OS.VtblCall(14, address, variant, pvarState);
}
public int get_accHelp(long variant, long pszHelp) {
- return COM.VtblCall_VARIANTP(15, address, variant, pszHelp);
+ return OS.VtblCall(15, address, variant, pszHelp);
}
public int get_accHelpTopic(long pszHelpFile, long variant, long pidTopic) {
- return COM.VtblCall_PVARIANTP(16, address, pszHelpFile, variant, pidTopic);
+ return OS.VtblCall(16, address, pszHelpFile, variant, pidTopic);
}
public int get_accKeyboardShortcut(long variant, long pszKeyboardShortcut) {
- return COM.VtblCall_VARIANTP(17, address, variant, pszKeyboardShortcut);
+ return OS.VtblCall(17, address, variant, pszKeyboardShortcut);
}
public int get_accFocus(long pvarChild) {
return OS.VtblCall(18, address, pvarChild);
@@ -61,27 +61,27 @@ public int get_accSelection(long pvarChildren) {
return OS.VtblCall(19, address, pvarChildren);
}
public int get_accDefaultAction(long variant, long pszDefaultAction) {
- return COM.VtblCall_VARIANTP(20, address, variant, pszDefaultAction);
+ return OS.VtblCall(20, address, variant, pszDefaultAction);
}
public int accSelect(int flagsSelect, long variant) {
- return COM.VtblCall_IVARIANT(21, address, flagsSelect, variant);
+ return OS.VtblCall(21, address, flagsSelect, variant);
}
public int accLocation(long pxLeft, long pyTop, long pcxWidth, long pcyHeight, long variant) {
- return COM.VtblCall_PPPPVARIANT(22, address, pxLeft, pyTop, pcxWidth, pcyHeight, variant);
+ return COM.VtblCall(22, address, pxLeft, pyTop, pcxWidth, pcyHeight, variant);
}
public int accNavigate(int navDir, long variant, long pvarEndUpAt) {
- return COM.VtblCall_IVARIANTP(23, address, navDir, variant, pvarEndUpAt);
+ return OS.VtblCall(23, address, navDir, variant, pvarEndUpAt);
}
public int accHitTest(int xLeft, int yTop, long pvarChild) {
return COM.VtblCall(24, address, xLeft, yTop, pvarChild);
}
public int accDoDefaultAction(long variant) {
- return COM.VtblCall_VARIANT(25, address, variant);
+ return OS.VtblCall(25, address, variant);
}
public int put_accName(long variant, long szName) {
- return COM.VtblCall_VARIANTP(26, address, variant, szName);
+ return OS.VtblCall(26, address, variant, szName);
}
public int put_accValue(long variant, long szValue) {
- return COM.VtblCall_VARIANTP(27, address, variant, szValue);
+ return OS.VtblCall(27, address, variant, szValue);
}
}

Back to the top