diff options
| author | Nikita Nemkin | 2019-06-16 08:26:16 +0000 |
|---|---|---|
| committer | Nikita Nemkin | 2019-06-18 09:20:11 +0000 |
| commit | 8ce998bbd9e65934115002ec95404c37f3156411 (patch) | |
| tree | bfd46ec8dc7d9a0cdf168c978224813de7f0e84a | |
| parent | 8587a3bbc00131b5cba94f05365e573f4b041b15 (diff) | |
| download | eclipse.platform.swt-8ce998bbd9e65934115002ec95404c37f3156411.tar.gz eclipse.platform.swt-8ce998bbd9e65934115002ec95404c37f3156411.tar.xz eclipse.platform.swt-8ce998bbd9e65934115002ec95404c37f3156411.zip | |
Bug 548277 - [Win32] Remove 32-bit code comments
This change is completely automated. The script is attached to the issue.
Change-Id: Iad1ce2378a76f0474800f3ef907b9d9fa657bfbe
Signed-off-by: Nikita Nemkin <nikita@nemkin.ru>
277 files changed, 9333 insertions, 14869 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT AWT/win32/org/eclipse/swt/awt/SWT_AWT.java b/bundles/org.eclipse.swt/Eclipse SWT AWT/win32/org/eclipse/swt/awt/SWT_AWT.java index c462668d12..400800dcc4 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT AWT/win32/org/eclipse/swt/awt/SWT_AWT.java +++ b/bundles/org.eclipse.swt/Eclipse SWT AWT/win32/org/eclipse/swt/awt/SWT_AWT.java @@ -53,8 +53,8 @@ public class SWT_AWT { static boolean loaded, swingInitialized; -static native final long /*int*/ getAWTHandle (Canvas canvas); -static native final Object initFrame (long /*int*/ handle, String className); +static native final long getAWTHandle (Canvas canvas); +static native final Object initFrame (long handle, String className); static native final void synthesizeWindowActivation (Frame frame, boolean doActivate); static synchronized void loadLibrary () { @@ -131,7 +131,7 @@ public static Frame new_Frame (final Composite parent) { if ((parent.getStyle () & SWT.EMBEDDED) == 0) { SWT.error (SWT.ERROR_INVALID_ARGUMENT); } - final long /*int*/ handle = parent.handle; + final long handle = parent.handle; final Frame[] result = new Frame[1]; final Throwable[] exception = new Throwable[1]; Runnable runnable = () -> { @@ -286,7 +286,7 @@ public static Frame new_Frame (final Composite parent) { public static Shell new_Shell (final Display display, final Canvas parent) { if (display == null) SWT.error (SWT.ERROR_NULL_ARGUMENT); if (parent == null) SWT.error (SWT.ERROR_NULL_ARGUMENT); - long /*int*/ handle = 0; + long handle = 0; try { loadLibrary (); handle = getAWTHandle (parent); 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 208f955494..067b58742c 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 @@ -123,11 +123,11 @@ public class Accessible { Accessible(Control control) { this.control = control; - long /*int*/[] ppvObject = new long /*int*/[1]; + long[] ppvObject = new long[1]; /* CreateStdAccessibleObject([in] hwnd, [in] idObject, [in] riidInterface, [out] ppvObject). * AddRef has already been called on ppvObject by the callee and must be released by the caller. */ - int result = (int)/*64*/COM.CreateStdAccessibleObject(control.handle, OS.OBJID_CLIENT, COM.IIDIAccessible, ppvObject); + int result = (int)COM.CreateStdAccessibleObject(control.handle, OS.OBJID_CLIENT, COM.IIDIAccessible, ppvObject); /* The object needs to be checked, because if the CreateStdAccessibleObject() * symbol is not found, the return value is S_OK. */ @@ -138,7 +138,7 @@ public class Accessible { AddRef(); } - Accessible(Accessible parent, long /*int*/ iaccessible_address) { + Accessible(Accessible parent, long iaccessible_address) { this(parent); iaccessible = new IAccessible(iaccessible_address); } @@ -151,105 +151,105 @@ public class Accessible { void createIAccessible() { objIAccessible = new COMObject(new int[] {2,0,0,/*IA>>*/1,3,5,8,1,1,2,2,2,2,2,2,2,3,2,1,1,2,2,5,3,3,1,2,2,/*<<IA*/1,2,3,1,1,3,3,1,1,1,1,3,3,1,1,1,1,1}) { @Override - public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long method0(long[] args) {return QueryInterface(args[0], args[1]);} @Override - public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long method1(long[] args) {return AddRef();} @Override - public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long method2(long[] args) {return Release();} // method3 GetTypeInfoCount - not implemented // method4 GetTypeInfo - not implemented // method5 GetIDsOfNames - not implemented // method6 Invoke - not implemented @Override - public long /*int*/ method7(long /*int*/[] args) {return get_accParent(args[0]);} + public long method7(long[] args) {return get_accParent(args[0]);} @Override - public long /*int*/ method8(long /*int*/[] args) {return get_accChildCount(args[0]);} + public long method8(long[] args) {return get_accChildCount(args[0]);} @Override - public long /*int*/ method9(long /*int*/[] args) {return get_accChild(args[0], args[1]);} + public long method9(long[] args) {return get_accChild(args[0], args[1]);} @Override - public long /*int*/ method10(long /*int*/[] args) {return get_accName(args[0], args[1]);} + public long method10(long[] args) {return get_accName(args[0], args[1]);} @Override - public long /*int*/ method11(long /*int*/[] args) {return get_accValue(args[0], args[1]);} + public long method11(long[] args) {return get_accValue(args[0], args[1]);} @Override - public long /*int*/ method12(long /*int*/[] args) {return get_accDescription(args[0], args[1]);} + public long method12(long[] args) {return get_accDescription(args[0], args[1]);} @Override - public long /*int*/ method13(long /*int*/[] args) {return get_accRole(args[0], args[1]);} + public long method13(long[] args) {return get_accRole(args[0], args[1]);} @Override - public long /*int*/ method14(long /*int*/[] args) {return get_accState(args[0], args[1]);} + public long method14(long[] args) {return get_accState(args[0], args[1]);} @Override - public long /*int*/ method15(long /*int*/[] args) {return get_accHelp(args[0], args[1]);} + public long method15(long[] args) {return get_accHelp(args[0], args[1]);} @Override - public long /*int*/ method16(long /*int*/[] args) {return get_accHelpTopic(args[0], args[1], args[2]);} + public long method16(long[] args) {return get_accHelpTopic(args[0], args[1], args[2]);} @Override - public long /*int*/ method17(long /*int*/[] args) {return get_accKeyboardShortcut(args[0], args[1]);} + public long method17(long[] args) {return get_accKeyboardShortcut(args[0], args[1]);} @Override - public long /*int*/ method18(long /*int*/[] args) {return get_accFocus(args[0]);} + public long method18(long[] args) {return get_accFocus(args[0]);} @Override - public long /*int*/ method19(long /*int*/[] args) {return get_accSelection(args[0]);} + public long method19(long[] args) {return get_accSelection(args[0]);} @Override - public long /*int*/ method20(long /*int*/[] args) {return get_accDefaultAction(args[0], args[1]);} + public long method20(long[] args) {return get_accDefaultAction(args[0], args[1]);} @Override - public long /*int*/ method21(long /*int*/[] args) {return accSelect((int)/*64*/args[0], args[1]);} + public long method21(long[] args) {return accSelect((int)args[0], args[1]);} @Override - public long /*int*/ method22(long /*int*/[] args) {return accLocation(args[0], args[1], args[2], args[3], args[4]);} + public long method22(long[] args) {return accLocation(args[0], args[1], args[2], args[3], args[4]);} @Override - public long /*int*/ method23(long /*int*/[] args) {return accNavigate((int)/*64*/args[0], args[1], args[2]);} + public long method23(long[] args) {return accNavigate((int)args[0], args[1], args[2]);} @Override - public long /*int*/ method24(long /*int*/[] args) {return accHitTest((int)/*64*/args[0], (int)/*64*/args[1], args[2]);} + public long method24(long[] args) {return accHitTest((int)args[0], (int)args[1], args[2]);} @Override - public long /*int*/ method25(long /*int*/[] args) {return accDoDefaultAction(args[0]);} + public long method25(long[] args) {return accDoDefaultAction(args[0]);} @Override - public long /*int*/ method26(long /*int*/[] args) {return put_accName(args[0], args[1]);} + public long method26(long[] args) {return put_accName(args[0], args[1]);} @Override - public long /*int*/ method27(long /*int*/[] args) {return put_accValue(args[0], args[1]);} + public long method27(long[] args) {return put_accValue(args[0], args[1]);} // IAccessible2 methods @Override - public long /*int*/ method28(long /*int*/[] args) {return get_nRelations(args[0]);} + public long method28(long[] args) {return get_nRelations(args[0]);} @Override - public long /*int*/ method29(long /*int*/[] args) {return get_relation((int)/*64*/args[0], args[1]);} + public long method29(long[] args) {return get_relation((int)args[0], args[1]);} @Override - public long /*int*/ method30(long /*int*/[] args) {return get_relations((int)/*64*/args[0], args[1], args[2]);} + public long method30(long[] args) {return get_relations((int)args[0], args[1], args[2]);} @Override - public long /*int*/ method31(long /*int*/[] args) {return get_role(args[0]);} + public long method31(long[] args) {return get_role(args[0]);} @Override - public long /*int*/ method32(long /*int*/[] args) {return scrollTo((int)/*64*/args[0]);} + public long method32(long[] args) {return scrollTo((int)args[0]);} @Override - public long /*int*/ method33(long /*int*/[] args) {return scrollToPoint((int)/*64*/args[0], (int)/*64*/args[1], (int)/*64*/args[2]);} + public long method33(long[] args) {return scrollToPoint((int)args[0], (int)args[1], (int)args[2]);} @Override - public long /*int*/ method34(long /*int*/[] args) {return get_groupPosition(args[0], args[1], args[2]);} + public long method34(long[] args) {return get_groupPosition(args[0], args[1], args[2]);} @Override - public long /*int*/ method35(long /*int*/[] args) {return get_states(args[0]);} + public long method35(long[] args) {return get_states(args[0]);} @Override - public long /*int*/ method36(long /*int*/[] args) {return get_extendedRole(args[0]);} + public long method36(long[] args) {return get_extendedRole(args[0]);} @Override - public long /*int*/ method37(long /*int*/[] args) {return get_localizedExtendedRole(args[0]);} + public long method37(long[] args) {return get_localizedExtendedRole(args[0]);} @Override - public long /*int*/ method38(long /*int*/[] args) {return get_nExtendedStates(args[0]);} + public long method38(long[] args) {return get_nExtendedStates(args[0]);} @Override - public long /*int*/ method39(long /*int*/[] args) {return get_extendedStates((int)/*64*/args[0], args[1], args[2]);} + public long method39(long[] args) {return get_extendedStates((int)args[0], args[1], args[2]);} @Override - public long /*int*/ method40(long /*int*/[] args) {return get_localizedExtendedStates((int)/*64*/args[0], args[1], args[2]);} + public long method40(long[] args) {return get_localizedExtendedStates((int)args[0], args[1], args[2]);} @Override - public long /*int*/ method41(long /*int*/[] args) {return get_uniqueID(args[0]);} + public long method41(long[] args) {return get_uniqueID(args[0]);} @Override - public long /*int*/ method42(long /*int*/[] args) {return get_windowHandle(args[0]);} + public long method42(long[] args) {return get_windowHandle(args[0]);} @Override - public long /*int*/ method43(long /*int*/[] args) {return get_indexInParent(args[0]);} + public long method43(long[] args) {return get_indexInParent(args[0]);} @Override - public long /*int*/ method44(long /*int*/[] args) {return get_locale(args[0]);} + public long method44(long[] args) {return get_locale(args[0]);} @Override - public long /*int*/ method45(long /*int*/[] args) {return get_attributes(args[0]);} + 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 /*int*/ ppVtable = objIAccessible.ppVtable; - long /*int*/[] pVtable = new long /*int*/[1]; + long ppVtable = objIAccessible.ppVtable; + long[] pVtable = new long[1]; OS.MoveMemory(pVtable, ppVtable, C.PTR_SIZEOF); - long /*int*/[] funcs = new long /*int*/[28]; + 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]); @@ -273,265 +273,265 @@ public class Accessible { void createIAccessibleApplication() { objIAccessibleApplication = new COMObject(new int[] {2,0,0,1,1,1,1}) { @Override - public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long method0(long[] args) {return QueryInterface(args[0], args[1]);} @Override - public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long method1(long[] args) {return AddRef();} @Override - public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long method2(long[] args) {return Release();} @Override - public long /*int*/ method3(long /*int*/[] args) {return get_appName(args[0]);} + public long method3(long[] args) {return get_appName(args[0]);} @Override - public long /*int*/ method4(long /*int*/[] args) {return get_appVersion(args[0]);} + public long method4(long[] args) {return get_appVersion(args[0]);} @Override - public long /*int*/ method5(long /*int*/[] args) {return get_toolkitName(args[0]);} + public long method5(long[] args) {return get_toolkitName(args[0]);} @Override - public long /*int*/ method6(long /*int*/[] args) {return get_toolkitVersion(args[0]);} + public long method6(long[] args) {return get_toolkitVersion(args[0]);} }; } // This method is intentionally commented. We are not providing IAccessibleComponent at this time. // void createIAccessibleComponent() { // objIAccessibleComponent = new COMObject(new int[] {2,0,0,2,1,1}) { -// public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} -// public long /*int*/ method1(long /*int*/[] args) {return AddRef();} -// public long /*int*/ method2(long /*int*/[] args) {return Release();} -// public long /*int*/ method3(long /*int*/[] args) {return get_locationInParent(args[0], args[1]);} -// public long /*int*/ method4(long /*int*/[] args) {return get_foreground(args[0]);} -// public long /*int*/ method5(long /*int*/[] args) {return get_background(args[0]);} +// public long method0(long[] args) {return QueryInterface(args[0], args[1]);} +// public long method1(long[] args) {return AddRef();} +// public long method2(long[] args) {return Release();} +// public long method3(long[] args) {return get_locationInParent(args[0], args[1]);} +// public long method4(long[] args) {return get_foreground(args[0]);} +// public long method5(long[] args) {return get_background(args[0]);} // }; // } void createIAccessibleEditableText() { objIAccessibleEditableText = new COMObject(new int[] {2,0,0,2,2,2,2,1,3,3}) { @Override - public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long method0(long[] args) {return QueryInterface(args[0], args[1]);} @Override - public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long method1(long[] args) {return AddRef();} @Override - public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long method2(long[] args) {return Release();} @Override - public long /*int*/ method3(long /*int*/[] args) {return copyText((int)/*64*/args[0], (int)/*64*/args[1]);} + public long method3(long[] args) {return copyText((int)args[0], (int)args[1]);} @Override - public long /*int*/ method4(long /*int*/[] args) {return deleteText((int)/*64*/args[0], (int)/*64*/args[1]);} + public long method4(long[] args) {return deleteText((int)args[0], (int)args[1]);} @Override - public long /*int*/ method5(long /*int*/[] args) {return insertText((int)/*64*/args[0], args[1]);} + public long method5(long[] args) {return insertText((int)args[0], args[1]);} @Override - public long /*int*/ method6(long /*int*/[] args) {return cutText((int)/*64*/args[0], (int)/*64*/args[1]);} + public long method6(long[] args) {return cutText((int)args[0], (int)args[1]);} @Override - public long /*int*/ method7(long /*int*/[] args) {return pasteText((int)/*64*/args[0]);} + public long method7(long[] args) {return pasteText((int)args[0]);} @Override - public long /*int*/ method8(long /*int*/[] args) {return replaceText((int)/*64*/args[0], (int)/*64*/args[1], args[2]);} + public long method8(long[] args) {return replaceText((int)args[0], (int)args[1], args[2]);} @Override - public long /*int*/ method9(long /*int*/[] args) {return setAttributes((int)/*64*/args[0], (int)/*64*/args[1], args[2]);} + public long method9(long[] args) {return setAttributes((int)args[0], (int)args[1], args[2]);} }; } void createIAccessibleHyperlink() { objIAccessibleHyperlink = new COMObject(new int[] {2,0,0,/*IAA>>*/1,1,2,4,2,2,/*<<IAA*/2,2,1,1,1}) { @Override - public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long method0(long[] args) {return QueryInterface(args[0], args[1]);} @Override - public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long method1(long[] args) {return AddRef();} @Override - public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long method2(long[] args) {return Release();} // IAccessibleAction @Override - public long /*int*/ method3(long /*int*/[] args) {return get_nActions(args[0]);} + public long method3(long[] args) {return get_nActions(args[0]);} @Override - public long /*int*/ method4(long /*int*/[] args) {return doAction((int)/*64*/args[0]);} + public long method4(long[] args) {return doAction((int)args[0]);} @Override - public long /*int*/ method5(long /*int*/[] args) {return get_description((int)/*64*/args[0], args[1]);} + public long method5(long[] args) {return get_description((int)args[0], args[1]);} @Override - public long /*int*/ method6(long /*int*/[] args) {return get_keyBinding((int)/*64*/args[0], (int)/*64*/args[1], args[2], args[3]);} + public long method6(long[] args) {return get_keyBinding((int)args[0], (int)args[1], args[2], args[3]);} @Override - public long /*int*/ method7(long /*int*/[] args) {return get_name((int)/*64*/args[0], args[1]);} + public long method7(long[] args) {return get_name((int)args[0], args[1]);} @Override - public long /*int*/ method8(long /*int*/[] args) {return get_localizedName((int)/*64*/args[0], args[1]);} + public long method8(long[] args) {return get_localizedName((int)args[0], args[1]);} // IAccessibleHyperlink @Override - public long /*int*/ method9(long /*int*/[] args) {return get_anchor((int)/*64*/args[0], args[1]);} + public long method9(long[] args) {return get_anchor((int)args[0], args[1]);} @Override - public long /*int*/ method10(long /*int*/[] args) {return get_anchorTarget((int)/*64*/args[0], args[1]);} + public long method10(long[] args) {return get_anchorTarget((int)args[0], args[1]);} @Override - public long /*int*/ method11(long /*int*/[] args) {return get_startIndex(args[0]);} + public long method11(long[] args) {return get_startIndex(args[0]);} @Override - public long /*int*/ method12(long /*int*/[] args) {return get_endIndex(args[0]);} + public long method12(long[] args) {return get_endIndex(args[0]);} @Override - public long /*int*/ method13(long /*int*/[] args) {return get_valid(args[0]);} + public long method13(long[] args) {return get_valid(args[0]);} }; } void createIAccessibleHypertext() { objIAccessibleHypertext = new COMObject(new int[] {2,0,0,/*IAT>>*/2,4,1,6,1,4,3,3,5,5,5,1,1,3,1,3,5,1,1,/*<<IAT*/1,2,2}) { @Override - public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long method0(long[] args) {return QueryInterface(args[0], args[1]);} @Override - public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long method1(long[] args) {return AddRef();} @Override - public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long method2(long[] args) {return Release();} // IAccessibleText @Override - public long /*int*/ method3(long /*int*/[] args) {return addSelection((int)/*64*/args[0], (int)/*64*/args[1]);} + public long method3(long[] args) {return addSelection((int)args[0], (int)args[1]);} @Override - public long /*int*/ method4(long /*int*/[] args) {return get_attributes((int)/*64*/args[0], args[1], args[2], args[3]);} + public long method4(long[] args) {return get_attributes((int)args[0], args[1], args[2], args[3]);} @Override - public long /*int*/ method5(long /*int*/[] args) {return get_caretOffset(args[0]);} + public long method5(long[] args) {return get_caretOffset(args[0]);} @Override - public long /*int*/ method6(long /*int*/[] args) {return get_characterExtents((int)/*64*/args[0], (int)/*64*/args[1], args[2], args[3], args[4], args[5]);} + public long method6(long[] args) {return get_characterExtents((int)args[0], (int)args[1], args[2], args[3], args[4], args[5]);} @Override - public long /*int*/ method7(long /*int*/[] args) {return get_nSelections(args[0]);} + public long method7(long[] args) {return get_nSelections(args[0]);} @Override - public long /*int*/ method8(long /*int*/[] args) {return get_offsetAtPoint((int)/*64*/args[0], (int)/*64*/args[1], (int)/*64*/args[2], args[3]);} + public long method8(long[] args) {return get_offsetAtPoint((int)args[0], (int)args[1], (int)args[2], args[3]);} @Override - public long /*int*/ method9(long /*int*/[] args) {return get_selection((int)/*64*/args[0], args[1], args[2]);} + public long method9(long[] args) {return get_selection((int)args[0], args[1], args[2]);} @Override - public long /*int*/ method10(long /*int*/[] args) {return get_text((int)/*64*/args[0], (int)/*64*/args[1], args[2]);} + public long method10(long[] args) {return get_text((int)args[0], (int)args[1], args[2]);} @Override - public long /*int*/ method11(long /*int*/[] args) {return get_textBeforeOffset((int)/*64*/args[0], (int)/*64*/args[1], args[2], args[3], args[4]);} + public long method11(long[] args) {return get_textBeforeOffset((int)args[0], (int)args[1], args[2], args[3], args[4]);} @Override - public long /*int*/ method12(long /*int*/[] args) {return get_textAfterOffset((int)/*64*/args[0], (int)/*64*/args[1], args[2], args[3], args[4]);} + public long method12(long[] args) {return get_textAfterOffset((int)args[0], (int)args[1], args[2], args[3], args[4]);} @Override - public long /*int*/ method13(long /*int*/[] args) {return get_textAtOffset((int)/*64*/args[0], (int)/*64*/args[1], args[2], args[3], args[4]);} + public long method13(long[] args) {return get_textAtOffset((int)args[0], (int)args[1], args[2], args[3], args[4]);} @Override - public long /*int*/ method14(long /*int*/[] args) {return removeSelection((int)/*64*/args[0]);} + public long method14(long[] args) {return removeSelection((int)args[0]);} @Override - public long /*int*/ method15(long /*int*/[] args) {return setCaretOffset((int)/*64*/args[0]);} + public long method15(long[] args) {return setCaretOffset((int)args[0]);} @Override - public long /*int*/ method16(long /*int*/[] args) {return setSelection((int)/*64*/args[0], (int)/*64*/args[1], (int)/*64*/args[2]);} + public long method16(long[] args) {return setSelection((int)args[0], (int)args[1], (int)args[2]);} @Override - public long /*int*/ method17(long /*int*/[] args) {return get_nCharacters(args[0]);} + public long method17(long[] args) {return get_nCharacters(args[0]);} @Override - public long /*int*/ method18(long /*int*/[] args) {return scrollSubstringTo((int)/*64*/args[0], (int)/*64*/args[1], (int)/*64*/args[2]);} + public long method18(long[] args) {return scrollSubstringTo((int)args[0], (int)args[1], (int)args[2]);} @Override - public long /*int*/ method19(long /*int*/[] args) {return scrollSubstringToPoint((int)/*64*/args[0], (int)/*64*/args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4]);} + public long method19(long[] args) {return scrollSubstringToPoint((int)args[0], (int)args[1], (int)args[2], (int)args[3], (int)args[4]);} @Override - public long /*int*/ method20(long /*int*/[] args) {return get_newText(args[0]);} + public long method20(long[] args) {return get_newText(args[0]);} @Override - public long /*int*/ method21(long /*int*/[] args) {return get_oldText(args[0]);} + public long method21(long[] args) {return get_oldText(args[0]);} // IAccessibleHypertext @Override - public long /*int*/ method22(long /*int*/[] args) {return get_nHyperlinks(args[0]);} + public long method22(long[] args) {return get_nHyperlinks(args[0]);} @Override - public long /*int*/ method23(long /*int*/[] args) {return get_hyperlink((int)/*64*/args[0], args[1]);} + public long method23(long[] args) {return get_hyperlink((int)args[0], args[1]);} @Override - public long /*int*/ method24(long /*int*/[] args) {return get_hyperlinkIndex((int)/*64*/args[0], args[1]);} + public long method24(long[] args) {return get_hyperlinkIndex((int)args[0], args[1]);} }; } // This method is intentionally commented. We are not providing IAccessibleImage at this time. // void createIAccessibleImage() { // objIAccessibleImage = new COMObject(new int[] {2,0,0,1,3,2}) { -// public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} -// public long /*int*/ method1(long /*int*/[] args) {return AddRef();} -// public long /*int*/ method2(long /*int*/[] args) {return Release();} -// public long /*int*/ method3(long /*int*/[] args) {return get_description(args[0]);} -// public long /*int*/ method4(long /*int*/[] args) {return get_imagePosition((int)/*64*/args[0], args[1], args[2]);} -// public long /*int*/ method5(long /*int*/[] args) {return get_imageSize(args[0], args[1]);} +// public long method0(long[] args) {return QueryInterface(args[0], args[1]);} +// public long method1(long[] args) {return AddRef();} +// public long method2(long[] args) {return Release();} +// public long method3(long[] args) {return get_description(args[0]);} +// public long method4(long[] args) {return get_imagePosition((int)args[0], args[1], args[2]);} +// public long method5(long[] args) {return get_imageSize(args[0], args[1]);} // }; // } void createIAccessibleTable2() { objIAccessibleTable2 = new COMObject(new int[] {2,0,0,3,1,2,1,1,1,1,1,2,2,2,2,1,2,2,1,1,1,1,1}) { @Override - public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long method0(long[] args) {return QueryInterface(args[0], args[1]);} @Override - public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long method1(long[] args) {return AddRef();} @Override - public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long method2(long[] args) {return Release();} @Override - public long /*int*/ method3(long /*int*/[] args) {return get_cellAt((int)/*64*/args[0], (int)/*64*/args[1], args[2]);} + public long method3(long[] args) {return get_cellAt((int)args[0], (int)args[1], args[2]);} @Override - public long /*int*/ method4(long /*int*/[] args) {return get_caption(args[0]);} + public long method4(long[] args) {return get_caption(args[0]);} @Override - public long /*int*/ method5(long /*int*/[] args) {return get_columnDescription((int)/*64*/args[0], args[1]);} + public long method5(long[] args) {return get_columnDescription((int)args[0], args[1]);} @Override - public long /*int*/ method6(long /*int*/[] args) {return get_nColumns(args[0]);} + public long method6(long[] args) {return get_nColumns(args[0]);} @Override - public long /*int*/ method7(long /*int*/[] args) {return get_nRows(args[0]);} + public long method7(long[] args) {return get_nRows(args[0]);} @Override - public long /*int*/ method8(long /*int*/[] args) {return get_nSelectedCells(args[0]);} + public long method8(long[] args) {return get_nSelectedCells(args[0]);} @Override - public long /*int*/ method9(long /*int*/[] args) {return get_nSelectedColumns(args[0]);} + public long method9(long[] args) {return get_nSelectedColumns(args[0]);} @Override - public long /*int*/ method10(long /*int*/[] args) {return get_nSelectedRows(args[0]);} + public long method10(long[] args) {return get_nSelectedRows(args[0]);} @Override - public long /*int*/ method11(long /*int*/[] args) {return get_rowDescription((int)/*64*/args[0], args[1]);} + public long method11(long[] args) {return get_rowDescription((int)args[0], args[1]);} @Override - public long /*int*/ method12(long /*int*/[] args) {return get_selectedCells(args[0], args[1]);} + public long method12(long[] args) {return get_selectedCells(args[0], args[1]);} @Override - public long /*int*/ method13(long /*int*/[] args) {return get_selectedColumns(args[0], args[1]);} + public long method13(long[] args) {return get_selectedColumns(args[0], args[1]);} @Override - public long /*int*/ method14(long /*int*/[] args) {return get_selectedRows(args[0], args[1]);} + public long method14(long[] args) {return get_selectedRows(args[0], args[1]);} @Override - public long /*int*/ method15(long /*int*/[] args) {return get_summary(args[0]);} + public long method15(long[] args) {return get_summary(args[0]);} @Override - public long /*int*/ method16(long /*int*/[] args) {return get_isColumnSelected((int)/*64*/args[0], args[1]);} + public long method16(long[] args) {return get_isColumnSelected((int)args[0], args[1]);} @Override - public long /*int*/ method17(long /*int*/[] args) {return get_isRowSelected((int)/*64*/args[0], args[1]);} + public long method17(long[] args) {return get_isRowSelected((int)args[0], args[1]);} @Override - public long /*int*/ method18(long /*int*/[] args) {return selectRow((int)/*64*/args[0]);} + public long method18(long[] args) {return selectRow((int)args[0]);} @Override - public long /*int*/ method19(long /*int*/[] args) {return selectColumn((int)/*64*/args[0]);} + public long method19(long[] args) {return selectColumn((int)args[0]);} @Override - public long /*int*/ method20(long /*int*/[] args) {return unselectRow((int)/*64*/args[0]);} + public long method20(long[] args) {return unselectRow((int)args[0]);} @Override - public long /*int*/ method21(long /*int*/[] args) {return unselectColumn((int)/*64*/args[0]);} + public long method21(long[] args) {return unselectColumn((int)args[0]);} @Override - public long /*int*/ method22(long /*int*/[] args) {return get_modelChange(args[0]);} + public long method22(long[] args) {return get_modelChange(args[0]);} }; } void createIAccessibleTableCell() { objIAccessibleTableCell = new COMObject(new int[] {2,0,0,1,2,1,1,2,1,1,5,1}) { @Override - public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long method0(long[] args) {return QueryInterface(args[0], args[1]);} @Override - public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long method1(long[] args) {return AddRef();} @Override - public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long method2(long[] args) {return Release();} @Override - public long /*int*/ method3(long /*int*/[] args) {return get_columnExtent(args[0]);} + public long method3(long[] args) {return get_columnExtent(args[0]);} @Override - public long /*int*/ method4(long /*int*/[] args) {return get_columnHeaderCells(args[0], args[1]);} + public long method4(long[] args) {return get_columnHeaderCells(args[0], args[1]);} @Override - public long /*int*/ method5(long /*int*/[] args) {return get_columnIndex(args[0]);} + public long method5(long[] args) {return get_columnIndex(args[0]);} @Override - public long /*int*/ method6(long /*int*/[] args) {return get_rowExtent(args[0]);} + public long method6(long[] args) {return get_rowExtent(args[0]);} @Override - public long /*int*/ method7(long /*int*/[] args) {return get_rowHeaderCells(args[0], args[1]);} + public long method7(long[] args) {return get_rowHeaderCells(args[0], args[1]);} @Override - public long /*int*/ method8(long /*int*/[] args) {return get_rowIndex(args[0]);} + public long method8(long[] args) {return get_rowIndex(args[0]);} @Override - public long /*int*/ method9(long /*int*/[] args) {return get_isSelected(args[0]);} + public long method9(long[] args) {return get_isSelected(args[0]);} @Override - public long /*int*/ method10(long /*int*/[] args) {return get_rowColumnExtents(args[0], args[1], args[2], args[3], args[4]);} + public long method10(long[] args) {return get_rowColumnExtents(args[0], args[1], args[2], args[3], args[4]);} @Override - public long /*int*/ method11(long /*int*/[] args) {return get_table(args[0]);} + public long method11(long[] args) {return get_table(args[0]);} }; } void createIAccessibleValue() { objIAccessibleValue = new COMObject(new int[] {2,0,0,1,1,1,1}) { @Override - public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long method0(long[] args) {return QueryInterface(args[0], args[1]);} @Override - public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long method1(long[] args) {return AddRef();} @Override - public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long method2(long[] args) {return Release();} @Override - public long /*int*/ method3(long /*int*/[] args) {return get_currentValue(args[0]);} + public long method3(long[] args) {return get_currentValue(args[0]);} @Override - public long /*int*/ method4(long /*int*/[] args) {return setCurrentValue(args[0]);} + public long method4(long[] args) {return setCurrentValue(args[0]);} @Override - public long /*int*/ method5(long /*int*/[] args) {return get_maximumValue(args[0]);} + public long method5(long[] args) {return get_maximumValue(args[0]);} @Override - public long /*int*/ method6(long /*int*/[] args) {return get_minimumValue(args[0]);} + public long method6(long[] args) {return get_minimumValue(args[0]);} }; /* Dereference VARIANT struct parameters. */ - long /*int*/ ppVtable = objIAccessibleValue.ppVtable; - long /*int*/[] pVtable = new long /*int*/[1]; + long ppVtable = objIAccessibleValue.ppVtable; + long[] pVtable = new long[1]; OS.MoveMemory(pVtable, ppVtable, C.PTR_SIZEOF); - long /*int*/[] funcs = new long /*int*/[7]; + 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); @@ -540,32 +540,32 @@ public class Accessible { void createIEnumVARIANT() { objIEnumVARIANT = new COMObject(new int[] {2,0,0,3,1,0,1}) { @Override - public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long method0(long[] args) {return QueryInterface(args[0], args[1]);} @Override - public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long method1(long[] args) {return AddRef();} @Override - public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long method2(long[] args) {return Release();} @Override - public long /*int*/ method3(long /*int*/[] args) {return Next((int)/*64*/args[0], args[1], args[2]);} + public long method3(long[] args) {return Next((int)args[0], args[1], args[2]);} @Override - public long /*int*/ method4(long /*int*/[] args) {return Skip((int)/*64*/args[0]);} + public long method4(long[] args) {return Skip((int)args[0]);} @Override - public long /*int*/ method5(long /*int*/[] args) {return Reset();} + public long method5(long[] args) {return Reset();} @Override - public long /*int*/ method6(long /*int*/[] args) {return Clone(args[0]);} + public long method6(long[] args) {return Clone(args[0]);} }; } void createIServiceProvider() { objIServiceProvider = new COMObject(new int[] {2,0,0,3}) { @Override - public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long method0(long[] args) {return QueryInterface(args[0], args[1]);} @Override - public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long method1(long[] args) {return AddRef();} @Override - public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long method2(long[] args) {return Release();} @Override - public long /*int*/ method3(long /*int*/[] args) {return QueryService(args[0], args[1], args[2]);} + public long method3(long[] args) {return QueryService(args[0], args[1], args[2]);} }; } @@ -917,7 +917,7 @@ public class Accessible { parent = null; } - long /*int*/ getAddress() { + long getAddress() { /* The address of an Accessible is the address of its IAccessible COMObject. */ if (objIAccessible == null) createIAccessible(); return objIAccessible.getAddress(); @@ -969,9 +969,9 @@ public class Accessible { * * @noreference This method is not intended to be referenced by clients. */ - public long /*int*/ internal_WM_GETOBJECT (long /*int*/ wParam, long /*int*/ lParam) { + public long internal_WM_GETOBJECT (long wParam, long lParam) { if (objIAccessible == null) return 0; - if ((int)/*64*/lParam == OS.OBJID_CLIENT) { + if ((int)lParam == OS.OBJID_CLIENT) { /* LresultFromObject([in] riid, [in] wParam, [in] pAcc) * The argument pAcc is owned by the caller so reference count does not * need to be incremented. @@ -1638,15 +1638,15 @@ public class Accessible { * Ownership of ppvObject transfers from callee to caller so reference count on ppvObject * must be incremented before returning. Caller is responsible for releasing ppvObject. */ - int QueryInterface(long /*int*/ iid, long /*int*/ ppvObject) { + int QueryInterface(long iid, long ppvObject) { if (control != null && control.isDisposed()) return COM.CO_E_OBJNOTCONNECTED; - OS.MoveMemory(ppvObject, new long /*int*/[] { 0 }, C.PTR_SIZEOF); + OS.MoveMemory(ppvObject, new long[] { 0 }, C.PTR_SIZEOF); GUID guid = new GUID(); COM.MoveMemory(guid, iid, GUID.sizeof); if (COM.IsEqualGUID(guid, COM.IIDIUnknown) || COM.IsEqualGUID(guid, COM.IIDIDispatch) || COM.IsEqualGUID(guid, COM.IIDIAccessible)) { if (objIAccessible == null) createIAccessible(); - OS.MoveMemory(ppvObject, new long /*int*/[] { objIAccessible.getAddress() }, C.PTR_SIZEOF); + OS.MoveMemory(ppvObject, new long[] { objIAccessible.getAddress() }, C.PTR_SIZEOF); AddRef(); if (DEBUG) print(this + ".QueryInterface guid=" + guidString(guid) + " returning " + objIAccessible.getAddress() + hresult(COM.S_OK)); return COM.S_OK; @@ -1654,7 +1654,7 @@ public class Accessible { if (COM.IsEqualGUID(guid, COM.IIDIEnumVARIANT)) { if (objIEnumVARIANT == null) createIEnumVARIANT(); - OS.MoveMemory(ppvObject, new long /*int*/[] { objIEnumVARIANT.getAddress() }, C.PTR_SIZEOF); + OS.MoveMemory(ppvObject, new long[] { objIEnumVARIANT.getAddress() }, C.PTR_SIZEOF); AddRef(); enumIndex = 0; if (DEBUG) print(this + ".QueryInterface guid=" + guidString(guid) + " returning " + objIEnumVARIANT.getAddress() + hresult(COM.S_OK)); @@ -1669,7 +1669,7 @@ public class Accessible { accessibleValueListenersSize() > 0 || accessibleControlListenersSize() > 0 || getRelationCount() > 0 || (control instanceof Button && ((control.getStyle() & SWT.RADIO) != 0)) || (control instanceof Composite)) { if (objIServiceProvider == null) createIServiceProvider(); - OS.MoveMemory(ppvObject, new long /*int*/[] { objIServiceProvider.getAddress() }, C.PTR_SIZEOF); + OS.MoveMemory(ppvObject, new long[] { objIServiceProvider.getAddress() }, C.PTR_SIZEOF); AddRef(); if (DEBUG) print(this + ".QueryInterface guid=" + guidString(guid) + " returning " + objIServiceProvider.getAddress() + hresult(COM.S_OK)); return COM.S_OK; @@ -1686,7 +1686,7 @@ public class Accessible { if (iaccessible != null) { /* Forward any other GUIDs to the OS proxy. */ - long /*int*/[] ppv = new long /*int*/[1]; + long[] ppv = new long[1]; code = iaccessible.QueryInterface(guid, ppv); OS.MoveMemory(ppvObject, ppv, C.PTR_SIZEOF); if (DEBUG) if (interesting(guid)) print("QueryInterface guid=" + guidString(guid) + " returning super" + hresult(code)); @@ -1809,8 +1809,8 @@ public class Accessible { } /* QueryService([in] guidService, [in] riid, [out] ppvObject) */ - int QueryService(long /*int*/ guidService, long /*int*/ riid, long /*int*/ ppvObject) { - OS.MoveMemory(ppvObject, new long /*int*/[] { 0 }, C.PTR_SIZEOF); + int QueryService(long guidService, long riid, long ppvObject) { + OS.MoveMemory(ppvObject, new long[] { 0 }, C.PTR_SIZEOF); GUID service = new GUID(); COM.MoveMemory(service, guidService, GUID.sizeof); GUID guid = new GUID(); @@ -1820,7 +1820,7 @@ public class Accessible { if (COM.IsEqualGUID(guid, COM.IIDIUnknown) || COM.IsEqualGUID(guid, COM.IIDIDispatch) || COM.IsEqualGUID(guid, COM.IIDIAccessible)) { if (objIAccessible == null) createIAccessible(); if (DEBUG) print(this + ".QueryService service=" + guidString(service) + " guid=" + guidString(guid) + " returning " + objIAccessible.getAddress() + hresult(COM.S_OK)); - OS.MoveMemory(ppvObject, new long /*int*/[] { objIAccessible.getAddress() }, C.PTR_SIZEOF); + OS.MoveMemory(ppvObject, new long[] { objIAccessible.getAddress() }, C.PTR_SIZEOF); AddRef(); return COM.S_OK; } @@ -1841,11 +1841,11 @@ public class Accessible { if (iaccessible != null) { /* Forward any other GUIDs to the OS proxy. */ - long /*int*/ [] ppv = new long /*int*/ [1]; + long [] ppv = new long [1]; int code = iaccessible.QueryInterface(COM.IIDIServiceProvider, ppv); if (code == COM.S_OK) { IServiceProvider iserviceProvider = new IServiceProvider(ppv[0]); - long /*int*/ [] ppvx = new long /*int*/ [1]; + long [] ppvx = new long [1]; code = iserviceProvider.QueryService(service, guid, ppvx); OS.MoveMemory(ppvObject, ppvx, C.PTR_SIZEOF); if (DEBUG) if (interesting(service) && interesting(guid)) print("QueryService service=" + guidString(service) + " guid=" + guidString(guid) + " returning super" + hresult(code)); @@ -1857,7 +1857,7 @@ public class Accessible { return COM.E_NOINTERFACE; } - int queryAccessible2Interfaces(GUID guid, long /*int*/ ppvObject) { + int queryAccessible2Interfaces(GUID guid, long ppvObject) { if (control != null && control.isDisposed()) return COM.CO_E_OBJNOTCONNECTED; if (COM.IsEqualGUID(guid, COM.IIDIAccessible2)) { if (accessibleActionListenersSize() > 0 || accessibleAttributeListenersSize() > 0 || @@ -1867,7 +1867,7 @@ public class Accessible { || (control instanceof Button && ((control.getStyle() & SWT.RADIO) != 0)) || (control instanceof Composite)) { // NOTE: IAccessible2 vtable is shared with IAccessible if (objIAccessible == null) createIAccessible(); - OS.MoveMemory(ppvObject, new long /*int*/[] { objIAccessible.getAddress() }, C.PTR_SIZEOF); + OS.MoveMemory(ppvObject, new long[] { objIAccessible.getAddress() }, C.PTR_SIZEOF); AddRef(); return COM.S_OK; } @@ -1878,7 +1878,7 @@ public class Accessible { if (accessibleActionListenersSize() > 0) { // NOTE: IAccessibleAction vtable is shared with IAccessibleHyperlink if (objIAccessibleHyperlink == null) createIAccessibleHyperlink(); - OS.MoveMemory(ppvObject, new long /*int*/[] { objIAccessibleHyperlink.getAddress() }, C.PTR_SIZEOF); + OS.MoveMemory(ppvObject, new long[] { objIAccessibleHyperlink.getAddress() }, C.PTR_SIZEOF); AddRef(); return COM.S_OK; } @@ -1887,7 +1887,7 @@ public class Accessible { if (COM.IsEqualGUID(guid, COM.IIDIAccessibleApplication)) { if (objIAccessibleApplication == null) createIAccessibleApplication(); - OS.MoveMemory(ppvObject, new long /*int*/[] { objIAccessibleApplication.getAddress() }, C.PTR_SIZEOF); + OS.MoveMemory(ppvObject, new long[] { objIAccessibleApplication.getAddress() }, C.PTR_SIZEOF); AddRef(); return COM.S_OK; } @@ -1896,7 +1896,7 @@ public class Accessible { // The following lines are intentionally commented. We are not supporting IAccessibleComponent at this time. // if (accessibleControlListenersSize() > 0) { // TO DO: can we reduce the scope of this somehow? // if (objIAccessibleComponent == null) createIAccessibleComponent(); -// COM.MoveMemory(ppvObject, new long /*int*/[] { objIAccessibleComponent.getAddress() }, OS.PTR_SIZEOF); +// COM.MoveMemory(ppvObject, new long[] { objIAccessibleComponent.getAddress() }, OS.PTR_SIZEOF); // AddRef(); // return COM.S_OK; // } @@ -1906,7 +1906,7 @@ public class Accessible { if (COM.IsEqualGUID(guid, COM.IIDIAccessibleEditableText)) { if (accessibleEditableTextListenersSize() > 0) { if (objIAccessibleEditableText == null) createIAccessibleEditableText(); - OS.MoveMemory(ppvObject, new long /*int*/[] { objIAccessibleEditableText.getAddress() }, C.PTR_SIZEOF); + OS.MoveMemory(ppvObject, new long[] { objIAccessibleEditableText.getAddress() }, C.PTR_SIZEOF); AddRef(); return COM.S_OK; } @@ -1916,7 +1916,7 @@ public class Accessible { if (COM.IsEqualGUID(guid, COM.IIDIAccessibleHyperlink)) { if (accessibleHyperlinkListenersSize() > 0) { if (objIAccessibleHyperlink == null) createIAccessibleHyperlink(); - OS.MoveMemory(ppvObject, new long /*int*/[] { objIAccessibleHyperlink.getAddress() }, C.PTR_SIZEOF); + OS.MoveMemory(ppvObject, new long[] { objIAccessibleHyperlink.getAddress() }, C.PTR_SIZEOF); AddRef(); return COM.S_OK; } @@ -1926,7 +1926,7 @@ public class Accessible { if (COM.IsEqualGUID(guid, COM.IIDIAccessibleHypertext)) { if (accessibleTextExtendedListenersSize() > 0) { if (objIAccessibleHypertext == null) createIAccessibleHypertext(); - OS.MoveMemory(ppvObject, new long /*int*/[] { objIAccessibleHypertext.getAddress() }, C.PTR_SIZEOF); + OS.MoveMemory(ppvObject, new long[] { objIAccessibleHypertext.getAddress() }, C.PTR_SIZEOF); AddRef(); return COM.S_OK; } @@ -1937,7 +1937,7 @@ public class Accessible { // The following lines are intentionally commented. We are not supporting IAccessibleImage at this time. // if (getRole() == ACC.ROLE_GRAPHIC && (accessibleAccessibleListenersSize() > 0 || accessibleControlListenersSize() > 0)) { // if (objIAccessibleImage == null) createIAccessibleImage(); -// COM.MoveMemory(ppvObject, new long /*int*/[] { objIAccessibleImage.getAddress() }, OS.PTR_SIZEOF); +// COM.MoveMemory(ppvObject, new long[] { objIAccessibleImage.getAddress() }, OS.PTR_SIZEOF); // AddRef(); // return COM.S_OK; // } @@ -1952,7 +1952,7 @@ public class Accessible { if (COM.IsEqualGUID(guid, COM.IIDIAccessibleTable2)) { if (accessibleTableListenersSize() > 0) { if (objIAccessibleTable2 == null) createIAccessibleTable2(); - OS.MoveMemory(ppvObject, new long /*int*/[] { objIAccessibleTable2.getAddress() }, C.PTR_SIZEOF); + OS.MoveMemory(ppvObject, new long[] { objIAccessibleTable2.getAddress() }, C.PTR_SIZEOF); AddRef(); return COM.S_OK; } @@ -1962,7 +1962,7 @@ public class Accessible { if (COM.IsEqualGUID(guid, COM.IIDIAccessibleTableCell)) { if (accessibleTableCellListenersSize() > 0) { if (objIAccessibleTableCell == null) createIAccessibleTableCell(); - OS.MoveMemory(ppvObject, new long /*int*/[] { objIAccessibleTableCell.getAddress() }, C.PTR_SIZEOF); + OS.MoveMemory(ppvObject, new long[] { objIAccessibleTableCell.getAddress() }, C.PTR_SIZEOF); AddRef(); return COM.S_OK; } @@ -1973,7 +1973,7 @@ public class Accessible { if (accessibleTextExtendedListenersSize() > 0 || accessibleAttributeListenersSize() > 0) { // NOTE: IAccessibleText vtable is shared with IAccessibleHypertext if (objIAccessibleHypertext == null) createIAccessibleHypertext(); - OS.MoveMemory(ppvObject, new long /*int*/[] { objIAccessibleHypertext.getAddress() }, C.PTR_SIZEOF); + OS.MoveMemory(ppvObject, new long[] { objIAccessibleHypertext.getAddress() }, C.PTR_SIZEOF); AddRef(); return COM.S_OK; } @@ -1983,7 +1983,7 @@ public class Accessible { if (COM.IsEqualGUID(guid, COM.IIDIAccessibleValue)) { if (accessibleValueListenersSize() > 0) { if (objIAccessibleValue == null) createIAccessibleValue(); - OS.MoveMemory(ppvObject, new long /*int*/[] { objIAccessibleValue.getAddress() }, C.PTR_SIZEOF); + OS.MoveMemory(ppvObject, new long[] { objIAccessibleValue.getAddress() }, C.PTR_SIZEOF); AddRef(); return COM.S_OK; } @@ -1994,7 +1994,7 @@ public class Accessible { } /* IAccessible::accDoDefaultAction([in] varChild) */ - int accDoDefaultAction(long /*int*/ varChild) { + int accDoDefaultAction(long varChild) { if (DEBUG) print(this + ".IAccessible::accDoDefaultAction"); if (accessibleActionListenersSize() > 0) { VARIANT v = getVARIANT(varChild); @@ -2011,9 +2011,9 @@ public class Accessible { } /* IAccessible::accHitTest([in] xLeft, [in] yTop, [out] pvarChild) */ - int accHitTest(int xLeft, int yTop, long /*int*/ pvarChild) { + int accHitTest(int xLeft, int yTop, long pvarChild) { int osChild = ACC.CHILDID_NONE; - long /*int*/ osChildObject = 0; + long osChildObject = 0; if (iaccessible != null) { /* Get the default child at point (left, top) from the OS. */ int code = iaccessible.accHitTest(xLeft, yTop, pvarChild); @@ -2063,7 +2063,7 @@ public class Accessible { } /* IAccessible::accLocation([out] pxLeft, [out] pyTop, [out] pcxWidth, [out] pcyHeight, [in] varChild) */ - int accLocation(long /*int*/ pxLeft, long /*int*/ pyTop, long /*int*/ pcxWidth, long /*int*/ pcyHeight, long /*int*/ varChild) { + int accLocation(long pxLeft, long pyTop, long pcxWidth, long pcyHeight, long varChild) { VARIANT v = getVARIANT(varChild); if (v.vt != COM.VT_I4) return COM.E_INVALIDARG; int osLeft = 0, osTop = 0, osWidth = 0, osHeight = 0; @@ -2104,7 +2104,7 @@ public class Accessible { } /* IAccessible::accNavigate([in] navDir, [in] varStart, [out] pvarEndUpAt) */ - int accNavigate(int navDir, long /*int*/ varStart, long /*int*/ pvarEndUpAt) { + int accNavigate(int navDir, long varStart, long pvarEndUpAt) { if (DEBUG) print(this + ".IAccessible::accNavigate"); /* MSAA: "The accNavigate method is deprecated and should not be used." */ int code = COM.DISP_E_MEMBERNOTFOUND; @@ -2119,7 +2119,7 @@ public class Accessible { // TODO: Consider supporting this in future. /* IAccessible::accSelect([in] flagsSelect, [in] varChild) */ - int accSelect(int flagsSelect, long /*int*/ varChild) { + int accSelect(int flagsSelect, long varChild) { int code = COM.DISP_E_MEMBERNOTFOUND; if (iaccessible != null) { /* Currently, we don't expose this as API. Forward to the proxy. */ @@ -2134,13 +2134,13 @@ public class Accessible { * Ownership of ppdispChild transfers from callee to caller so reference count on ppdispChild * must be incremented before returning. The caller is responsible for releasing ppdispChild. */ - int get_accChild(long /*int*/ varChild, long /*int*/ ppdispChild) { + int get_accChild(long varChild, long ppdispChild) { VARIANT v = getVARIANT(varChild); if (v.vt != COM.VT_I4) return COM.E_INVALIDARG; if (v.lVal == COM.CHILDID_SELF) { if (DEBUG) print(this + ".IAccessible::get_accChild(" + v.lVal + ") returning " + getAddress() + hresult(COM.S_OK)); AddRef(); - OS.MoveMemory(ppdispChild, new long /*int*/[] { getAddress() }, C.PTR_SIZEOF); + OS.MoveMemory(ppdispChild, new long[] { getAddress() }, C.PTR_SIZEOF); return COM.S_OK; } final int childID = osToChildID(v.lVal); @@ -2154,7 +2154,7 @@ public class Accessible { ToolBar toolBar = (ToolBar) control; final ToolItem item = toolBar.getItem(childID); if (item != null && (item.getStyle() & SWT.DROP_DOWN) != 0) { - long /*int*/[] addr = new long /*int*/[1]; + long[] addr = new long[1]; OS.MoveMemory(addr, ppdispChild, C.PTR_SIZEOF); boolean found = false; for (int i = 0; i < children.size(); i++) { @@ -2211,7 +2211,7 @@ public class Accessible { if (accessible != null) { if (DEBUG) print(this + ".IAccessible::get_accChild(" + v.lVal + ") returning " + accessible.getAddress() + hresult(COM.S_OK)); accessible.AddRef(); - OS.MoveMemory(ppdispChild, new long /*int*/[] { accessible.getAddress() }, C.PTR_SIZEOF); + OS.MoveMemory(ppdispChild, new long[] { accessible.getAddress() }, C.PTR_SIZEOF); return COM.S_OK; } if (DEBUG) print(this + ".IAccessible::get_accChild(" + v.lVal + ") returning from super" + hresult(code)); @@ -2219,7 +2219,7 @@ public class Accessible { } /* IAccessible::get_accChildCount([out] pcountChildren) */ - int get_accChildCount(long /*int*/ pcountChildren) { + int get_accChildCount(long pcountChildren) { int osChildCount = 0; if (iaccessible != null) { /* Get the default child count from the OS. */ @@ -2248,7 +2248,7 @@ public class Accessible { } /* IAccessible::get_accDefaultAction([in] varChild, [out] pszDefaultAction) */ - int get_accDefaultAction(long /*int*/ varChild, long /*int*/ pszDefaultAction) { + int get_accDefaultAction(long varChild, long pszDefaultAction) { if (DEBUG) print(this + ".IAccessible::get_accDefaultAction"); VARIANT v = getVARIANT(varChild); if (v.vt != COM.VT_I4) return COM.E_INVALIDARG; @@ -2260,7 +2260,7 @@ public class Accessible { if (code == COM.E_INVALIDARG) code = COM.S_FALSE; // proxy doesn't know about app childID if (accessibleControlListenersSize() == 0) return code; if (code == COM.S_OK) { - long /*int*/[] pDefaultAction = new long /*int*/[1]; + long[] pDefaultAction = new long[1]; OS.MoveMemory(pDefaultAction, pszDefaultAction, C.PTR_SIZEOF); int size = COM.SysStringByteLen(pDefaultAction[0]); if (size > 0) { @@ -2288,7 +2288,7 @@ public class Accessible { } /* IAccessible::get_accDescription([in] varChild, [out] pszDescription) */ - int get_accDescription(long /*int*/ varChild, long /*int*/ pszDescription) { + int get_accDescription(long varChild, long pszDescription) { /* * MSAA: "The accDescription property is not supported in the transition to * UI Automation. MSAA servers and applications should not use it." @@ -2313,7 +2313,7 @@ public class Accessible { return code; } if (code == COM.S_OK) { - long /*int*/[] pDescription = new long /*int*/[1]; + long[] pDescription = new long[1]; OS.MoveMemory(pDescription, pszDescription, C.PTR_SIZEOF); int size = COM.SysStringByteLen(pDescription[0]); if (size > 0) { @@ -2337,7 +2337,7 @@ public class Accessible { Tree tree = (Tree) control; int columnCount = tree.getColumnCount (); if (columnCount > 1) { - long /*int*/ hwnd = control.handle, hItem = 0; + long hwnd = control.handle, hItem = 0; hItem = OS.SendMessage (hwnd, OS.TVM_MAPACCIDTOHTREEITEM, v.lVal, 0); Widget widget = tree.getDisplay ().findWidget (hwnd, hItem); event.result = ""; @@ -2370,7 +2370,7 @@ public class Accessible { * Ownership of pvarChild transfers from callee to caller so reference count on pvarChild * must be incremented before returning. The caller is responsible for releasing pvarChild. */ - int get_accFocus(long /*int*/ pvarChild) { + int get_accFocus(long pvarChild) { int osChild = ACC.CHILDID_NONE; if (iaccessible != null) { /* Get the default focus child from the OS. */ @@ -2418,7 +2418,7 @@ public class Accessible { } /* IAccessible::get_accHelp([in] varChild, [out] pszHelp) */ - int get_accHelp(long /*int*/ varChild, long /*int*/ pszHelp) { + int get_accHelp(long varChild, long pszHelp) { if (DEBUG) print(this + ".IAccessible::get_accHelp"); VARIANT v = getVARIANT(varChild); if (v.vt != COM.VT_I4) return COM.E_INVALIDARG; @@ -2430,7 +2430,7 @@ public class Accessible { if (code == COM.E_INVALIDARG) code = COM.S_FALSE; // proxy doesn't know about app childID if (accessibleListenersSize() == 0) return code; if (code == COM.S_OK) { - long /*int*/[] pHelp = new long /*int*/[1]; + long[] pHelp = new long[1]; OS.MoveMemory(pHelp, pszHelp, C.PTR_SIZEOF); int size = COM.SysStringByteLen(pHelp[0]); if (size > 0) { @@ -2455,7 +2455,7 @@ public class Accessible { } /* IAccessible::get_accHelpTopic([out] pszHelpFile, [in] varChild, [out] pidTopic) */ - int get_accHelpTopic(long /*int*/ pszHelpFile, long /*int*/ varChild, long /*int*/ pidTopic) { + int get_accHelpTopic(long pszHelpFile, long varChild, long pidTopic) { if (DEBUG) print(this + ".IAccessible::get_accHelpTopic"); /* MSAA: "The accHelpTopic property is deprecated and should not be used." */ int code = COM.DISP_E_MEMBERNOTFOUND; @@ -2469,7 +2469,7 @@ public class Accessible { } /* IAccessible::get_accKeyboardShortcut([in] varChild, [out] pszKeyboardShortcut) */ - int get_accKeyboardShortcut(long /*int*/ varChild, long /*int*/ pszKeyboardShortcut) { + int get_accKeyboardShortcut(long varChild, long pszKeyboardShortcut) { if (DEBUG) print(this + ".IAccessible::get_accKeyboardShortcut"); VARIANT v = getVARIANT(varChild); if (v.vt != COM.VT_I4) return COM.E_INVALIDARG; @@ -2482,7 +2482,7 @@ public class Accessible { /* Process TabFolder even if there are no apps listening. */ if (accessibleListenersSize() == 0 && !(control instanceof TabFolder)) return code; if (code == COM.S_OK) { - long /*int*/[] pKeyboardShortcut = new long /*int*/[1]; + long[] pKeyboardShortcut = new long[1]; OS.MoveMemory(pKeyboardShortcut, pszKeyboardShortcut, C.PTR_SIZEOF); int size = COM.SysStringByteLen(pKeyboardShortcut[0]); if (size > 0) { @@ -2511,7 +2511,7 @@ public class Accessible { } /* IAccessible::get_accName([in] varChild, [out] pszName) */ - int get_accName(long /*int*/ varChild, long /*int*/ pszName) { + int get_accName(long varChild, long pszName) { if (control != null && control.isDisposed()) return COM.CO_E_OBJNOTCONNECTED; VARIANT v = getVARIANT(varChild); if (v.vt != COM.VT_I4) return COM.E_INVALIDARG; @@ -2521,7 +2521,7 @@ public class Accessible { /* Get the default name from the OS. */ code = iaccessible.get_accName(varChild, pszName); if (code == COM.S_OK) { - long /*int*/[] pName = new long /*int*/[1]; + long[] pName = new long[1]; OS.MoveMemory(pName, pszName, C.PTR_SIZEOF); int size = COM.SysStringByteLen(pName[0]); if (size > 0) { @@ -2565,7 +2565,7 @@ public class Accessible { * Ownership of ppdispParent transfers from callee to caller so reference count on ppdispParent * must be incremented before returning. The caller is responsible for releasing ppdispParent. */ - int get_accParent(long /*int*/ ppdispParent) { + int get_accParent(long ppdispParent) { int code = COM.DISP_E_MEMBERNOTFOUND; if (iaccessible != null) { /* Currently, we don't expose this as API. Forward to the proxy. */ @@ -2574,7 +2574,7 @@ public class Accessible { if (parent != null) { /* For lightweight accessibles, return the accessible's parent. */ parent.AddRef(); - OS.MoveMemory(ppdispParent, new long /*int*/[] { parent.getAddress() }, C.PTR_SIZEOF); + OS.MoveMemory(ppdispParent, new long[] { parent.getAddress() }, C.PTR_SIZEOF); code = COM.S_OK; } if (DEBUG) print(this + ".IAccessible::get_accParent() returning" + (parent != null ? " " + parent.getAddress() : " from super") + hresult(code)); @@ -2582,7 +2582,7 @@ public class Accessible { } /* IAccessible::get_accRole([in] varChild, [out] pvarRole) */ - int get_accRole(long /*int*/ varChild, long /*int*/ pvarRole) { + int get_accRole(long varChild, long pvarRole) { if (control != null && control.isDisposed()) return COM.CO_E_OBJNOTCONNECTED; VARIANT v = getVARIANT(varChild); if (v.vt != COM.VT_I4) return COM.E_INVALIDARG; @@ -2618,10 +2618,10 @@ public class Accessible { * Ownership of pvarChildren transfers from callee to caller so reference count on pvarChildren * must be incremented before returning. The caller is responsible for releasing pvarChildren. */ - int get_accSelection(long /*int*/ pvarChildren) { + int get_accSelection(long pvarChildren) { if (DEBUG) print(this + ".IAccessible::get_accSelection"); int osChild = ACC.CHILDID_NONE; - long /*int*/ osChildObject = 0; + long osChildObject = 0; if (iaccessible != null) { /* Get the default selection from the OS. */ int code = iaccessible.get_accSelection(pvarChildren); @@ -2673,7 +2673,7 @@ public class Accessible { } /* IAccessible::get_accState([in] varChild, [out] pvarState) */ - int get_accState(long /*int*/ varChild, long /*int*/ pvarState) { + int get_accState(long varChild, long pvarState) { if (control != null && control.isDisposed()) return COM.CO_E_OBJNOTCONNECTED; VARIANT v = getVARIANT(varChild); if (v.vt != COM.VT_I4) return COM.E_INVALIDARG; @@ -2696,12 +2696,12 @@ public class Accessible { * images, so we need to determine if the item state is 'checked'. */ if (v.lVal != COM.CHILDID_SELF) { if (control instanceof Tree && (control.getStyle() & SWT.CHECK) != 0) { - long /*int*/ hwnd = control.handle; + long hwnd = control.handle; TVITEM tvItem = new TVITEM (); tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_STATE; tvItem.stateMask = OS.TVIS_STATEIMAGEMASK; tvItem.hItem = OS.SendMessage (hwnd, OS.TVM_MAPACCIDTOHTREEITEM, v.lVal, 0); - long /*int*/ result = OS.SendMessage (hwnd, OS.TVM_GETITEM, 0, tvItem); + long result = OS.SendMessage (hwnd, OS.TVM_GETITEM, 0, tvItem); boolean checked = (result != 0) && (((tvItem.state >> 12) & 1) == 0); if (checked) event.detail |= ACC.STATE_CHECKED; grayed = tvItem.state >> 12 > 2; @@ -2730,7 +2730,7 @@ public class Accessible { } /* IAccessible::get_accValue([in] varChild, [out] pszValue) */ - int get_accValue(long /*int*/ varChild, long /*int*/ pszValue) { + int get_accValue(long varChild, long pszValue) { if (control != null && control.isDisposed()) return COM.CO_E_OBJNOTCONNECTED; VARIANT v = getVARIANT(varChild); if (v.vt != COM.VT_I4) return COM.E_INVALIDARG; @@ -2740,7 +2740,7 @@ public class Accessible { /* Get the default value string from the OS. */ code = iaccessible.get_accValue(varChild, pszValue); if (code == COM.S_OK) { - long /*int*/[] pValue = new long /*int*/[1]; + long[] pValue = new long[1]; OS.MoveMemory(pValue, pszValue, C.PTR_SIZEOF); int size = COM.SysStringByteLen(pValue[0]); if (size > 0) { @@ -2781,13 +2781,13 @@ public class Accessible { } /* put_accName([in] varChild, [in] szName) */ - int put_accName(long /*int*/ varChild, long /*int*/ szName) { + int put_accName(long varChild, long szName) { /* MSAA: "The IAccessible::put_accName method is no longer supported. Servers should return E_NOTIMPL." */ return COM.E_NOTIMPL; } /* put_accValue([in] varChild, [in] szValue) */ - int put_accValue(long /*int*/ varChild, long /*int*/ szValue) { + int put_accValue(long varChild, long szValue) { /* MSAA: this method is supported for some UI elements (usually edit controls). */ VARIANT v = getVARIANT(varChild); if (v.vt != COM.VT_I4) return COM.E_INVALIDARG; @@ -2834,13 +2834,13 @@ public class Accessible { * Ownership of rgvar transfers from callee to caller so reference count on rgvar * must be incremented before returning. The caller is responsible for releasing rgvar. */ - int Next(int celt, long /*int*/ rgvar, long /*int*/ pceltFetched) { + int Next(int celt, long rgvar, long pceltFetched) { if (DEBUG) print(this + ".IEnumVARIANT::Next"); /* If there are no listeners, query the proxy for * its IEnumVariant, and get the Next items from it. */ if (iaccessible != null && accessibleControlListenersSize() == 0) { - long /*int*/[] ppvObject = new long /*int*/[1]; + long[] ppvObject = new long[1]; int code = iaccessible.QueryInterface(COM.IIDIEnumVARIANT, ppvObject); if (code != COM.S_OK) return code; IEnumVARIANT ienumvariant = new IEnumVARIANT(ppvObject[0]); @@ -2908,7 +2908,7 @@ public class Accessible { * for its IEnumVariant, and tell it to Skip. */ if (iaccessible != null && accessibleControlListenersSize() == 0) { - long /*int*/[] ppvObject = new long /*int*/[1]; + long[] ppvObject = new long[1]; int code = iaccessible.QueryInterface(COM.IIDIEnumVARIANT, ppvObject); if (code != COM.S_OK) return code; IEnumVARIANT ienumvariant = new IEnumVARIANT(ppvObject[0]); @@ -2933,8 +2933,8 @@ public class Accessible { * for its IEnumVariant, and tell it to Reset. */ if (iaccessible != null && accessibleControlListenersSize() == 0) { - long /*int*/[] ppvObject = new long /*int*/[1]; - int code = (int)/*64*/iaccessible.QueryInterface(COM.IIDIEnumVARIANT, ppvObject); + long[] ppvObject = new long[1]; + int code = (int)iaccessible.QueryInterface(COM.IIDIEnumVARIANT, ppvObject); if (code != COM.S_OK) return code; IEnumVARIANT ienumvariant = new IEnumVARIANT(ppvObject[0]); code = ienumvariant.Reset(); @@ -2950,17 +2950,17 @@ public class Accessible { * Ownership of ppEnum transfers from callee to caller so reference count on ppEnum * must be incremented before returning. The caller is responsible for releasing ppEnum. */ - int Clone(long /*int*/ ppEnum) { + int Clone(long ppEnum) { if (DEBUG) print(this + ".IEnumVARIANT::Clone"); /* If there are no listeners, query the proxy for * its IEnumVariant, and get the Clone from it. */ if (iaccessible != null && accessibleControlListenersSize() == 0) { - long /*int*/[] ppvObject = new long /*int*/[1]; + long[] ppvObject = new long[1]; int code = iaccessible.QueryInterface(COM.IIDIEnumVARIANT, ppvObject); if (code != COM.S_OK) return code; IEnumVARIANT ienumvariant = new IEnumVARIANT(ppvObject[0]); - long /*int*/ [] pEnum = new long /*int*/ [1]; + long [] pEnum = new long [1]; code = ienumvariant.Clone(pEnum); ienumvariant.Release(); OS.MoveMemory(ppEnum, pEnum, C.PTR_SIZEOF); @@ -2968,13 +2968,13 @@ public class Accessible { } if (ppEnum == 0) return COM.E_INVALIDARG; - OS.MoveMemory(ppEnum, new long /*int*/[] { objIEnumVARIANT.getAddress() }, C.PTR_SIZEOF); + OS.MoveMemory(ppEnum, new long[] { objIEnumVARIANT.getAddress() }, C.PTR_SIZEOF); AddRef(); return COM.S_OK; } /* IAccessible2::get_nRelations([out] pNRelations) */ - int get_nRelations(long /*int*/ pNRelations) { + int get_nRelations(long pNRelations) { int count = getRelationCount(); if (DEBUG) print(this + ".IAccessible2::get_nRelations returning " + count + hresult(COM.S_OK)); OS.MoveMemory(pNRelations, new int [] { count }, 4); @@ -2982,7 +2982,7 @@ public class Accessible { } /* IAccessible2::get_relation([in] relationIndex, [out] ppRelation) */ - int get_relation(int relationIndex, long /*int*/ ppRelation) { + int get_relation(int relationIndex, long ppRelation) { int i = -1; for (int type = 0; type < MAX_RELATION_TYPES; type++) { Relation relation = relations[type]; @@ -2990,7 +2990,7 @@ public class Accessible { if (i == relationIndex) { if (DEBUG) print(this + ".IAccessible2::get_relation(" + relationIndex + ") returning " + relation.getAddress() + hresult(COM.S_OK)); relation.AddRef(); - OS.MoveMemory(ppRelation, new long /*int*/[] { relation.getAddress() }, C.PTR_SIZEOF); + OS.MoveMemory(ppRelation, new long[] { relation.getAddress() }, C.PTR_SIZEOF); return COM.S_OK; } } @@ -2999,14 +2999,14 @@ public class Accessible { } /* IAccessible2::get_relations([in] maxRelations, [out] ppRelations, [out] pNRelations) */ - int get_relations(int maxRelations, long /*int*/ ppRelations, long /*int*/ pNRelations) { + int get_relations(int maxRelations, long ppRelations, long pNRelations) { int count = 0; for (int type = 0; type < MAX_RELATION_TYPES; type++) { if (count == maxRelations) break; Relation relation = relations[type]; if (relation != null) { relation.AddRef(); - OS.MoveMemory(ppRelations + count * C.PTR_SIZEOF, new long /*int*/[] { relation.getAddress() }, C.PTR_SIZEOF); + OS.MoveMemory(ppRelations + count * C.PTR_SIZEOF, new long[] { relation.getAddress() }, C.PTR_SIZEOF); count++; } } @@ -3016,7 +3016,7 @@ public class Accessible { } /* IAccessible2::get_role([out] pRole) */ - int get_role(long /*int*/ pRole) { + int get_role(long pRole) { int role = getRole(); if (role == 0) role = getDefaultRole(); if (DEBUG) print(this + ".IAccessible2::get_role() returning " + getRoleString(role) + hresult(COM.S_OK)); @@ -3039,7 +3039,7 @@ public class Accessible { } /* IAccessible2::get_groupPosition([out] pGroupLevel, [out] pSimilarItemsInGroup, [out] pPositionInGroup) */ - int get_groupPosition(long /*int*/ pGroupLevel, long /*int*/ pSimilarItemsInGroup, long /*int*/ pPositionInGroup) { + int get_groupPosition(long pGroupLevel, long pSimilarItemsInGroup, long pPositionInGroup) { if (control != null && control.isDisposed()) return COM.CO_E_OBJNOTCONNECTED; AccessibleAttributeEvent event = new AccessibleAttributeEvent(this); event.groupLevel = event.groupCount = event.groupIndex = -1; @@ -3074,7 +3074,7 @@ public class Accessible { } /* IAccessible2::get_states([out] pStates) */ - int get_states(long /*int*/ pStates) { + int get_states(long pStates) { AccessibleControlEvent event = new AccessibleControlEvent(this); event.childID = ACC.CHILDID_SELF; for (int i = 0; i < accessibleControlListenersSize(); i++) { @@ -3103,28 +3103,28 @@ public class Accessible { } /* IAccessible2::get_extendedRole([out] pbstrExtendedRole) */ - int get_extendedRole(long /*int*/ pbstrExtendedRole) { + int get_extendedRole(long pbstrExtendedRole) { /* This feature is not supported. */ setString(pbstrExtendedRole, null); return COM.S_FALSE; } /* IAccessible2::get_localizedExtendedRole([out] pbstrLocalizedExtendedRole) */ - int get_localizedExtendedRole(long /*int*/ pbstrLocalizedExtendedRole) { + int get_localizedExtendedRole(long pbstrLocalizedExtendedRole) { /* This feature is not supported. */ setString(pbstrLocalizedExtendedRole, null); return COM.S_FALSE; } /* IAccessible2::get_nExtendedStates([out] pNExtendedStates) */ - int get_nExtendedStates(long /*int*/ pNExtendedStates) { + int get_nExtendedStates(long pNExtendedStates) { /* This feature is not supported. */ OS.MoveMemory(pNExtendedStates, new int [] { 0 }, 4); return COM.S_OK; } /* IAccessible2::get_extendedStates([in] maxExtendedStates, [out] ppbstrExtendedStates, [out] pNExtendedStates) */ - int get_extendedStates(int maxExtendedStates, long /*int*/ ppbstrExtendedStates, long /*int*/ pNExtendedStates) { + int get_extendedStates(int maxExtendedStates, long ppbstrExtendedStates, long pNExtendedStates) { /* This feature is not supported. */ setString(ppbstrExtendedStates, null); OS.MoveMemory(pNExtendedStates, new int [] { 0 }, 4); @@ -3132,7 +3132,7 @@ public class Accessible { } /* IAccessible2::get_localizedExtendedStates([in] maxLocalizedExtendedStates, [out] ppbstrLocalizedExtendedStates, [out] pNLocalizedExtendedStates) */ - int get_localizedExtendedStates(int maxLocalizedExtendedStates, long /*int*/ ppbstrLocalizedExtendedStates, long /*int*/ pNLocalizedExtendedStates) { + int get_localizedExtendedStates(int maxLocalizedExtendedStates, long ppbstrLocalizedExtendedStates, long pNLocalizedExtendedStates) { /* This feature is not supported. */ setString(ppbstrLocalizedExtendedStates, null); OS.MoveMemory(pNLocalizedExtendedStates, new int [] { 0 }, 4); @@ -3140,22 +3140,22 @@ public class Accessible { } /* IAccessible2::get_uniqueID([out] pUniqueID) */ - int get_uniqueID(long /*int*/ pUniqueID) { + int get_uniqueID(long pUniqueID) { if (uniqueID == -1) uniqueID = UniqueID--; if (DEBUG) print(this + ".IAccessible2::get_uniqueID returning " + uniqueID + hresult(COM.S_OK)); - OS.MoveMemory(pUniqueID, new long /*int*/ [] { uniqueID }, 4); + OS.MoveMemory(pUniqueID, new long [] { uniqueID }, 4); return COM.S_OK; } /* IAccessible2::get_windowHandle([out] pWindowHandle) */ - int get_windowHandle(long /*int*/ pWindowHandle) { + int get_windowHandle(long pWindowHandle) { if (DEBUG) print(this + ".IAccessible2::get_windowHandle returning " + control.handle + hresult(COM.S_OK)); - OS.MoveMemory(pWindowHandle, new long /*int*/ [] { control.handle }, C.PTR_SIZEOF); + OS.MoveMemory(pWindowHandle, new long [] { control.handle }, C.PTR_SIZEOF); return COM.S_OK; } /* IAccessible2::get_indexInParent([out] pIndexInParent) */ - int get_indexInParent(long /*int*/ pIndexInParent) { + int get_indexInParent(long pIndexInParent) { AccessibleControlEvent event = new AccessibleControlEvent(this); event.childID = ACC.CHILDID_CHILD_INDEX; event.detail = -1; @@ -3173,20 +3173,20 @@ public class Accessible { // */ // // TODO: finish this. See also get_groupPosition // this won't work because VARIANT.sizeof isn't big enough on 64-bit machines. - // just create an long /*int*/ [] ppdispParent - it's not a variant anyhow... -// long /*int*/ ppdispParent = OS.GlobalAlloc (OS.GMEM_FIXED | OS.GMEM_ZEROINIT, VARIANT.sizeof); + // just create an long [] ppdispParent - it's not a variant anyhow... +// long ppdispParent = OS.GlobalAlloc (OS.GMEM_FIXED | OS.GMEM_ZEROINIT, VARIANT.sizeof); // int code = get_accParent(ppdispParent); // if (code == COM.S_OK) { // VARIANT v = getVARIANT(ppdispParent); // if (v.vt == COM.VT_DISPATCH) { // IAccessible accParent = new IAccessible(v.lVal); -// long /*int*/ pcountChildren = OS.GlobalAlloc (OS.GMEM_FIXED | OS.GMEM_ZEROINIT, 4); +// long pcountChildren = OS.GlobalAlloc (OS.GMEM_FIXED | OS.GMEM_ZEROINIT, 4); // code = accParent.get_accChildCount(pcountChildren); // if (code == COM.S_OK) { // int [] childCount = new int[1]; // OS.MoveMemory(childCount, pcountChildren, 4); // int[] pcObtained = new int[1]; -// long /*int*/ rgVarChildren = OS.GlobalAlloc (OS.GMEM_FIXED | OS.GMEM_ZEROINIT, VARIANT.sizeof * childCount[0]); +// long rgVarChildren = OS.GlobalAlloc (OS.GMEM_FIXED | OS.GMEM_ZEROINIT, VARIANT.sizeof * childCount[0]); // System.out.println("Asking for AccessibleChildren"); // code = COM.AccessibleChildren(accParent.getAddress(), 0, childCount[0], rgVarChildren, pcObtained); // if (code == COM.S_OK) { @@ -3215,28 +3215,28 @@ public class Accessible { } /* IAccessible2::get_locale([out] pLocale) */ - int get_locale(long /*int*/ pLocale) { + int get_locale(long pLocale) { /* Return the default locale for the JVM. */ Locale locale = Locale.getDefault(); char[] data = (locale.getLanguage()+"\0").toCharArray(); - long /*int*/ ptr = COM.SysAllocString(data); - OS.MoveMemory(pLocale, new long /*int*/[] {ptr}, C.PTR_SIZEOF); + long ptr = COM.SysAllocString(data); + OS.MoveMemory(pLocale, new long[] {ptr}, C.PTR_SIZEOF); data = (locale.getCountry()+"\0").toCharArray(); ptr = COM.SysAllocString(data); - OS.MoveMemory(pLocale + C.PTR_SIZEOF, new long /*int*/[] {ptr}, C.PTR_SIZEOF); + OS.MoveMemory(pLocale + C.PTR_SIZEOF, new long[] {ptr}, C.PTR_SIZEOF); data = (locale.getVariant()+"\0").toCharArray(); ptr = COM.SysAllocString(data); - OS.MoveMemory(pLocale + 2 * C.PTR_SIZEOF, new long /*int*/[] {ptr}, C.PTR_SIZEOF); + OS.MoveMemory(pLocale + 2 * C.PTR_SIZEOF, new long[] {ptr}, C.PTR_SIZEOF); if (DEBUG) print(this + ".IAccessible2::get_locale() returning" + hresult(COM.S_OK)); return COM.S_OK; } /* IAccessible2::get_attributes([out] pbstrAttributes) */ - int get_attributes(long /*int*/ pbstrAttributes) { + int get_attributes(long pbstrAttributes) { AccessibleAttributeEvent event = new AccessibleAttributeEvent(this); for (int i = 0; i < accessibleAttributeListenersSize(); i++) { AccessibleAttributeListener listener = accessibleAttributeListeners.get(i); @@ -3272,7 +3272,7 @@ public class Accessible { } /* IAccessibleAction::get_nActions([out] pNActions) */ - int get_nActions(long /*int*/ pNActions) { + int get_nActions(long pNActions) { AccessibleActionEvent event = new AccessibleActionEvent(this); for (int i = 0; i < accessibleActionListenersSize(); i++) { AccessibleActionListener listener = accessibleActionListeners.get(i); @@ -3297,7 +3297,7 @@ public class Accessible { } /* IAccessibleAction::get_description([in] actionIndex, [out] pbstrDescription) */ - int get_description(int actionIndex, long /*int*/ pbstrDescription) { + int get_description(int actionIndex, long pbstrDescription) { AccessibleActionEvent event = new AccessibleActionEvent(this); event.index = actionIndex; for (int i = 0; i < accessibleActionListenersSize(); i++) { @@ -3311,7 +3311,7 @@ public class Accessible { } /* IAccessibleAction::get_keyBinding([in] actionIndex, [in] nMaxBindings, [out] ppbstrKeyBindings, [out] pNBindings) */ - int get_keyBinding(int actionIndex, int nMaxBindings, long /*int*/ ppbstrKeyBindings, long /*int*/ pNBindings) { + int get_keyBinding(int actionIndex, int nMaxBindings, long ppbstrKeyBindings, long pNBindings) { AccessibleActionEvent event = new AccessibleActionEvent(this); event.index = actionIndex; for (int i = 0; i < accessibleActionListenersSize(); i++) { @@ -3343,7 +3343,7 @@ public class Accessible { } /* IAccessibleAction::get_name([in] actionIndex, [out] pbstrName) */ - int get_name(int actionIndex, long /*int*/ pbstrName) { + int get_name(int actionIndex, long pbstrName) { AccessibleActionEvent event = new AccessibleActionEvent(this); event.index = actionIndex; event.localized = false; @@ -3361,7 +3361,7 @@ public class Accessible { } /* IAccessibleAction::get_localizedName([in] actionIndex, [out] pbstrLocalizedName) */ - int get_localizedName(int actionIndex, long /*int*/ pbstrLocalizedName) { + int get_localizedName(int actionIndex, long pbstrLocalizedName) { AccessibleActionEvent event = new AccessibleActionEvent(this); event.index = actionIndex; event.localized = true; @@ -3379,7 +3379,7 @@ public class Accessible { } /* IAccessibleApplication::get_appName([out] pbstrName) */ - int get_appName(long /*int*/ pbstrName) { + int get_appName(long pbstrName) { String appName = Display.getAppName(); if (DEBUG) print(this + ".IAccessibleApplication::get_appName() returning " + appName + hresult(appName == null || appName.length() == 0 ? COM.S_FALSE : COM.S_OK)); if (appName == null || appName.length() == 0) { @@ -3391,7 +3391,7 @@ public class Accessible { } /* IAccessibleApplication::get_appVersion([out] pbstrVersion) */ - int get_appVersion(long /*int*/ pbstrVersion) { + int get_appVersion(long pbstrVersion) { String appVersion = Display.getAppVersion(); if (DEBUG) print(this + ".IAccessibleApplication::get_appVersion() returning" + appVersion + hresult(appVersion == null || appVersion.length() == 0 ? COM.S_FALSE : COM.S_OK)); if (appVersion == null || appVersion.length() == 0) { @@ -3403,7 +3403,7 @@ public class Accessible { } /* IAccessibleApplication::get_toolkitName([out] pbstrName) */ - int get_toolkitName(long /*int*/ pbstrName) { + int get_toolkitName(long pbstrName) { String toolkitName = "SWT"; if (DEBUG) print(this + ".IAccessibleApplication::get_toolkitName() returning" + toolkitName + hresult(COM.S_OK)); setString(pbstrName, toolkitName); @@ -3411,7 +3411,7 @@ public class Accessible { } /* IAccessibleApplication::get_toolkitVersion([out] pbstrVersion) */ - int get_toolkitVersion(long /*int*/ pbstrVersion) { + int get_toolkitVersion(long pbstrVersion) { String toolkitVersion = "" + SWT.getVersion(); //$NON-NLS-1$ if (DEBUG) print(this + ".IAccessibleApplication::get_toolkitVersion() returning" + toolkitVersion + hresult(COM.S_OK)); setString(pbstrVersion, toolkitVersion); @@ -3420,7 +3420,7 @@ public class Accessible { // The following 3 method are intentionally commented. We are not providing IAccessibleComponent at this time. // /* IAccessibleComponent::get_locationInParent([out] pX, [out] pY) */ -// int get_locationInParent(long /*int*/ pX, long /*int*/ pY) { +// int get_locationInParent(long pX, long pY) { // if (DEBUG) print(this + ".IAccessibleComponent::get_locationInParent"); // // TO DO: support transparently (hard for lightweight parents - screen vs. parent coords) // AccessibleControlEvent event = new AccessibleControlEvent(this); @@ -3434,7 +3434,7 @@ public class Accessible { // } // // /* IAccessibleComponent::get_foreground([out] pForeground) */ -// int get_foreground(long /*int*/ pForeground) { +// int get_foreground(long pForeground) { // Color color = control.getForeground(); // if (DEBUG) print(this + ".IAccessibleComponent::get_foreground returning " + color.handle); // COM.MoveMemory(pForeground, new int [] { color.handle }, 4); @@ -3442,7 +3442,7 @@ public class Accessible { // } // // /* IAccessibleComponent::get_background([out] pBackground) */ -// int get_background(long /*int*/ pBackground) { +// int get_background(long pBackground) { // Color color = control.getBackground(); // if (DEBUG) print(this + ".IAccessibleComponent::get_background returning " + color.handle); // COM.MoveMemory(pBackground, new int [] { color.handle }, 4); @@ -3479,7 +3479,7 @@ public class Accessible { } /* IAccessibleEditableText::insertText([in] offset, [in] pbstrText) */ - int insertText(int offset, long /*int*/ pbstrText) { + int insertText(int offset, long pbstrText) { if (DEBUG) print(this + ".IAccessibleEditableText::insertText, offset=" + offset + ", pbstrText=" + pbstrText); AccessibleEditableTextEvent event = new AccessibleEditableTextEvent(this); event.start = offset == COM.IA2_TEXT_OFFSET_LENGTH ? getCharacterCount() : offset; @@ -3522,7 +3522,7 @@ public class Accessible { } /* IAccessibleEditableText::replaceText([in] startOffset, [in] endOffset, [in] pbstrText) */ - int replaceText(int startOffset, int endOffset, long /*int*/ pbstrText) { + int replaceText(int startOffset, int endOffset, long pbstrText) { if (DEBUG) print(this + ".IAccessibleEditableText::replaceText, start=" + startOffset + ", end=" + endOffset + ", pbstrText=" + pbstrText); AccessibleEditableTextEvent event = new AccessibleEditableTextEvent(this); event.start = startOffset == COM.IA2_TEXT_OFFSET_LENGTH ? getCharacterCount() : startOffset; @@ -3537,7 +3537,7 @@ public class Accessible { } /* IAccessibleEditableText::setAttributes([in] startOffset, [in] endOffset, [in] pbstrAttributes) */ - int setAttributes(int startOffset, int endOffset, long /*int*/ pbstrAttributes) { + int setAttributes(int startOffset, int endOffset, long pbstrAttributes) { if (DEBUG) print(this + ".IAccessibleEditableText::setAttributes, start=" + startOffset + ", end=" + endOffset + ", pbstrAttributes=" + pbstrAttributes); AccessibleTextAttributeEvent event = new AccessibleTextAttributeEvent(this); String string = getString(pbstrAttributes); @@ -3645,7 +3645,7 @@ public class Accessible { } /* IAccessibleHyperlink::get_anchor([in] index, [out] pAnchor) */ - int get_anchor(int index, long /*int*/ pAnchor) { + int get_anchor(int index, long pAnchor) { if (DEBUG) print(this + ".IAccessibleHyperlink::get_anchor"); AccessibleHyperlinkEvent event = new AccessibleHyperlinkEvent(this); event.index = index; @@ -3665,7 +3665,7 @@ public class Accessible { } /* IAccessibleHyperlink::get_anchorTarget([in] index, [out] pAnchorTarget) */ - int get_anchorTarget(int index, long /*int*/ pAnchorTarget) { + int get_anchorTarget(int index, long pAnchorTarget) { if (DEBUG) print(this + ".IAccessibleHyperlink::get_anchorTarget"); AccessibleHyperlinkEvent event = new AccessibleHyperlinkEvent(this); event.index = index; @@ -3685,7 +3685,7 @@ public class Accessible { } /* IAccessibleHyperlink::get_startIndex([out] pIndex) */ - int get_startIndex(long /*int*/ pIndex) { + int get_startIndex(long pIndex) { if (DEBUG) print(this + ".IAccessibleHyperlink::get_startIndex"); AccessibleHyperlinkEvent event = new AccessibleHyperlinkEvent(this); for (int i = 0; i < accessibleHyperlinkListenersSize(); i++) { @@ -3697,7 +3697,7 @@ public class Accessible { } /* IAccessibleHyperlink::get_endIndex([out] pIndex) */ - int get_endIndex(long /*int*/ pIndex) { + int get_endIndex(long pIndex) { if (DEBUG) print(this + ".IAccessibleHyperlink::get_endIndex"); AccessibleHyperlinkEvent event = new AccessibleHyperlinkEvent(this); for (int i = 0; i < accessibleHyperlinkListenersSize(); i++) { @@ -3709,13 +3709,13 @@ public class Accessible { } /* IAccessibleHyperlink::get_valid([out] pValid) */ - int get_valid(long /*int*/ pValid) { + int get_valid(long pValid) { /* Deprecated. */ return COM.E_NOTIMPL; } /* IAccessibleHypertext::get_nHyperlinks([out] pHyperlinkCount) */ - int get_nHyperlinks(long /*int*/ pHyperlinkCount) { + int get_nHyperlinks(long pHyperlinkCount) { if (DEBUG) print(this + ".IAccessibleHypertext::get_nHyperlinks"); AccessibleTextEvent event = new AccessibleTextEvent(this); for (int i = 0; i < accessibleTextExtendedListenersSize(); i++) { @@ -3727,7 +3727,7 @@ public class Accessible { } /* IAccessibleHypertext::get_hyperlink([in] index, [out] ppHyperlink) */ - int get_hyperlink(int index, long /*int*/ ppHyperlink) { + int get_hyperlink(int index, long ppHyperlink) { if (DEBUG) print(this + ".IAccessibleHypertext::get_hyperlink"); AccessibleTextEvent event = new AccessibleTextEvent(this); event.index = index; @@ -3741,12 +3741,12 @@ public class Accessible { return COM.E_INVALIDARG; } accessible.AddRef(); - OS.MoveMemory(ppHyperlink, new long /*int*/[] { accessible.getAddress() }, C.PTR_SIZEOF); + OS.MoveMemory(ppHyperlink, new long[] { accessible.getAddress() }, C.PTR_SIZEOF); return COM.S_OK; } /* IAccessibleHypertext::get_hyperlinkIndex([in] charIndex, [out] pHyperlinkIndex) */ - int get_hyperlinkIndex(int charIndex, long /*int*/ pHyperlinkIndex) { + int get_hyperlinkIndex(int charIndex, long pHyperlinkIndex) { if (DEBUG) print(this + ".IAccessibleHypertext::get_hyperlinkIndex"); AccessibleTextEvent event = new AccessibleTextEvent(this); event.offset = charIndex; @@ -3762,7 +3762,7 @@ public class Accessible { // The following 3 method are intentionally commented. We are not providing IAccessibleImage at this time. // /* IAccessibleImage::get_description([out] pbstrDescription) */ -// int get_description(long /*int*/ pbstrDescription) { +// int get_description(long pbstrDescription) { // if (DEBUG) print(this + ".IAccessibleImage::get_description"); // // TO DO: Does it make sense to just reuse description? // AccessibleEvent event = new AccessibleEvent(this); @@ -3777,7 +3777,7 @@ public class Accessible { // } // // /* IAccessibleImage::get_imagePosition([in] coordinateType, [out] pX, [out] pY) */ -// int get_imagePosition(int coordinateType, long /*int*/ pX, long /*int*/ pY) { +// int get_imagePosition(int coordinateType, long pX, long pY) { // if (DEBUG) print(this + ".IAccessibleImage::get_imagePosition"); // // TO DO: does it make sense to just reuse getLocation? // AccessibleControlEvent event = new AccessibleControlEvent(this); @@ -3792,7 +3792,7 @@ public class Accessible { // } // // /* IAccessibleImage::get_imageSize([out] pHeight, [out] pWidth) */ -// int get_imageSize(long /*int*/ pHeight, long /*int*/ pWidth) { +// int get_imageSize(long pHeight, long pWidth) { // if (DEBUG) print(this + ".IAccessibleImage::get_imageSize"); // // TO DO: does it make sense to just reuse getLocation? // AccessibleControlEvent event = new AccessibleControlEvent(this); @@ -3806,7 +3806,7 @@ public class Accessible { // } /* IAccessibleTable2::get_cellAt([in] row, [in] column, [out] ppCell) */ - int get_cellAt(int row, int column, long /*int*/ ppCell) { + int get_cellAt(int row, int column, long ppCell) { AccessibleTableEvent event = new AccessibleTableEvent(this); event.row = row; event.column = column; @@ -3818,12 +3818,12 @@ public class Accessible { if (DEBUG) print(this + ".IAccessibleTable2::get_cellAt(row=" + row + ", column=" + column + ") returning " + accessible); if (accessible == null) return COM.E_INVALIDARG; accessible.AddRef(); - OS.MoveMemory(ppCell, new long /*int*/[] { accessible.getAddress() }, C.PTR_SIZEOF); + OS.MoveMemory(ppCell, new long[] { accessible.getAddress() }, C.PTR_SIZEOF); return COM.S_OK; } /* IAccessibleTable2::get_caption([out] ppAccessible) */ - int get_caption(long /*int*/ ppAccessible) { + int get_caption(long ppAccessible) { AccessibleTableEvent event = new AccessibleTableEvent(this); for (int i = 0; i < accessibleTableListenersSize(); i++) { AccessibleTableListener listener = accessibleTableListeners.get(i); @@ -3832,16 +3832,16 @@ public class Accessible { Accessible accessible = event.accessible; if (DEBUG) print(this + ".IAccessibleTable2::get_caption() returning " + accessible); if (accessible == null) { - OS.MoveMemory(ppAccessible, new long /*int*/[] { 0 }, C.PTR_SIZEOF); + OS.MoveMemory(ppAccessible, new long[] { 0 }, C.PTR_SIZEOF); return COM.S_FALSE; } accessible.AddRef(); - OS.MoveMemory(ppAccessible, new long /*int*/[] { accessible.getAddress() }, C.PTR_SIZEOF); + OS.MoveMemory(ppAccessible, new long[] { accessible.getAddress() }, C.PTR_SIZEOF); return COM.S_OK; } /* IAccessibleTable2::get_columnDescription([in] column, [out] pbstrDescription) */ - int get_columnDescription(int column, long /*int*/ pbstrDescription) { + int get_columnDescription(int column, long pbstrDescription) { AccessibleTableEvent event = new AccessibleTableEvent(this); event.column = column; for (int i = 0; i < accessibleTableListenersSize(); i++) { @@ -3855,7 +3855,7 @@ public class Accessible { } /* IAccessibleTable2::get_nColumns([out] pColumnCount) */ - int get_nColumns(long /*int*/ pColumnCount) { + int get_nColumns(long pColumnCount) { AccessibleTableEvent event = new AccessibleTableEvent(this); for (int i = 0; i < accessibleTableListenersSize(); i++) { AccessibleTableListener listener = accessibleTableListeners.get(i); @@ -3867,7 +3867,7 @@ public class Accessible { } /* IAccessibleTable2::get_nRows([out] pRowCount) */ - int get_nRows(long /*int*/ pRowCount) { + int get_nRows(long pRowCount) { AccessibleTableEvent event = new AccessibleTableEvent(this); for (int i = 0; i < accessibleTableListenersSize(); i++) { AccessibleTableListener listener = accessibleTableListeners.get(i); @@ -3879,7 +3879,7 @@ public class Accessible { } /* IAccessibleTable2::get_nSelectedCells([out] pCellCount) */ - int get_nSelectedCells(long /*int*/ pCellCount) { + int get_nSelectedCells(long pCellCount) { AccessibleTableEvent event = new AccessibleTableEvent(this); for (int i = 0; i < accessibleTableListenersSize(); i++) { AccessibleTableListener listener = accessibleTableListeners.get(i); @@ -3891,7 +3891,7 @@ public class Accessible { } /* IAccessibleTable2::get_nSelectedColumns([out] pColumnCount) */ - int get_nSelectedColumns(long /*int*/ pColumnCount) { + int get_nSelectedColumns(long pColumnCount) { AccessibleTableEvent event = new AccessibleTableEvent(this); for (int i = 0; i < accessibleTableListenersSize(); i++) { AccessibleTableListener listener = accessibleTableListeners.get(i); @@ -3903,7 +3903,7 @@ public class Accessible { } /* IAccessibleTable2::get_nSelectedRows([out] pRowCount) */ - int get_nSelectedRows(long /*int*/ pRowCount) { + int get_nSelectedRows(long pRowCount) { AccessibleTableEvent event = new AccessibleTableEvent(this); for (int i = 0; i < accessibleTableListenersSize(); i++) { AccessibleTableListener listener = accessibleTableListeners.get(i); @@ -3915,7 +3915,7 @@ public class Accessible { } /* IAccessibleTable2::get_rowDescription([in] row, [out] pbstrDescription) */ - int get_rowDescription(int row, long /*int*/ pbstrDescription) { + int get_rowDescription(int row, long pbstrDescription) { AccessibleTableEvent event = new AccessibleTableEvent(this); event.row = row; for (int i = 0; i < accessibleTableListenersSize(); i++) { @@ -3929,7 +3929,7 @@ public class Accessible { } /* IAccessibleTable2::get_selectedCells([out] ppCells, [out] pNSelectedCells) */ - int get_selectedCells(long /*int*/ ppCells, long /*int*/ pNSelectedCells) { + int get_selectedCells(long ppCells, long pNSelectedCells) { AccessibleTableEvent event = new AccessibleTableEvent(this); for (int i = 0; i < accessibleTableListenersSize(); i++) { AccessibleTableListener listener = accessibleTableListeners.get(i); @@ -3937,28 +3937,28 @@ public class Accessible { } if (DEBUG) print(this + ".IAccessibleTable2::get_selectedCells() returning " + (event.accessibles == null ? "null" : "accessibles[" + event.accessibles.length + "]")); if (event.accessibles == null || event.accessibles.length == 0) { - OS.MoveMemory(ppCells, new long /*int*/[] { 0 }, C.PTR_SIZEOF); + OS.MoveMemory(ppCells, new long[] { 0 }, C.PTR_SIZEOF); OS.MoveMemory(pNSelectedCells, new int [] { 0 }, 4); return COM.S_FALSE; } int length = event.accessibles.length; - long /*int*/ pv = OS.CoTaskMemAlloc(length * C.PTR_SIZEOF); + long pv = OS.CoTaskMemAlloc(length * C.PTR_SIZEOF); int count = 0; for (int i = 0; i < length; i++) { Accessible accessible = event.accessibles[i]; if (accessible != null) { accessible.AddRef(); - OS.MoveMemory(pv + i * C.PTR_SIZEOF, new long /*int*/[] { accessible.getAddress() }, C.PTR_SIZEOF); + OS.MoveMemory(pv + i * C.PTR_SIZEOF, new long[] { accessible.getAddress() }, C.PTR_SIZEOF); count++; } } - OS.MoveMemory(ppCells, new long /*int*/ [] { pv }, C.PTR_SIZEOF); + OS.MoveMemory(ppCells, new long [] { pv }, C.PTR_SIZEOF); OS.MoveMemory(pNSelectedCells, new int [] { count }, 4); return COM.S_OK; } /* IAccessibleTable2::get_selectedColumns([out] ppSelectedColumns, [out] pNColumns) */ - int get_selectedColumns(long /*int*/ ppSelectedColumns, long /*int*/ pNColumns) { + int get_selectedColumns(long ppSelectedColumns, long pNColumns) { AccessibleTableEvent event = new AccessibleTableEvent(this); for (int i = 0; i < accessibleTableListenersSize(); i++) { AccessibleTableListener listener = accessibleTableListeners.get(i); @@ -3967,19 +3967,19 @@ public class Accessible { int count = event.selected == null ? 0 : event.selected.length; if (DEBUG) print(this + ".IAccessibleTable2::get_selectedColumns() returning " + (count == 0 ? "null" : "selected[" + count + "]")); if (count == 0) { - OS.MoveMemory(ppSelectedColumns, new long /*int*/[] { 0 }, C.PTR_SIZEOF); + OS.MoveMemory(ppSelectedColumns, new long[] { 0 }, C.PTR_SIZEOF); OS.MoveMemory(pNColumns, new int [] { 0 }, 4); return COM.S_FALSE; } - long /*int*/ pv = OS.CoTaskMemAlloc(count * 4); + long pv = OS.CoTaskMemAlloc(count * 4); OS.MoveMemory(pv, event.selected, count * 4); - OS.MoveMemory(ppSelectedColumns, new long /*int*/ [] { pv }, C.PTR_SIZEOF); + OS.MoveMemory(ppSelectedColumns, new long [] { pv }, C.PTR_SIZEOF); OS.MoveMemory(pNColumns, new int [] { count }, 4); return COM.S_OK; } /* IAccessibleTable2::get_selectedRows([out] ppSelectedRows, [out] pNRows) */ - int get_selectedRows(long /*int*/ ppSelectedRows, long /*int*/ pNRows) { + int get_selectedRows(long ppSelectedRows, long pNRows) { AccessibleTableEvent event = new AccessibleTableEvent(this); for (int i = 0; i < accessibleTableListenersSize(); i++) { AccessibleTableListener listener = accessibleTableListeners.get(i); @@ -3988,19 +3988,19 @@ public class Accessible { int count = event.selected == null ? 0 : event.selected.length; if (DEBUG) print(this + ".IAccessibleTable2::get_selectedRows() returning " + (count == 0 ? "null" : "selected[" + count + "]")); if (count == 0) { - OS.MoveMemory(ppSelectedRows, new long /*int*/[] { 0 }, C.PTR_SIZEOF); + OS.MoveMemory(ppSelectedRows, new long[] { 0 }, C.PTR_SIZEOF); OS.MoveMemory(pNRows, new int [] { 0 }, 4); return COM.S_FALSE; } - long /*int*/ pv = OS.CoTaskMemAlloc(count * 4); + long pv = OS.CoTaskMemAlloc(count * 4); OS.MoveMemory(pv, event.selected, count * 4); - OS.MoveMemory(ppSelectedRows, new long /*int*/ [] { pv }, C.PTR_SIZEOF); + OS.MoveMemory(ppSelectedRows, new long [] { pv }, C.PTR_SIZEOF); OS.MoveMemory(pNRows, new int [] { count }, 4); return COM.S_OK; } /* IAccessibleTable2::get_summary([out] ppAccessible) */ - int get_summary(long /*int*/ ppAccessible) { + int get_summary(long ppAccessible) { AccessibleTableEvent event = new AccessibleTableEvent(this); for (int i = 0; i < accessibleTableListenersSize(); i++) { AccessibleTableListener listener = accessibleTableListeners.get(i); @@ -4009,16 +4009,16 @@ public class Accessible { Accessible accessible = event.accessible; if (DEBUG) print(this + ".IAccessibleTable2::get_summary() returning " + accessible); if (accessible == null) { - OS.MoveMemory(ppAccessible, new long /*int*/[] { 0 }, C.PTR_SIZEOF); + OS.MoveMemory(ppAccessible, new long[] { 0 }, C.PTR_SIZEOF); return COM.S_FALSE; } accessible.AddRef(); - OS.MoveMemory(ppAccessible, new long /*int*/[] { accessible.getAddress() }, C.PTR_SIZEOF); + OS.MoveMemory(ppAccessible, new long[] { accessible.getAddress() }, C.PTR_SIZEOF); return COM.S_OK; } /* IAccessibleTable2::get_isColumnSelected([in] column, [out] pIsSelected) */ - int get_isColumnSelected(int column, long /*int*/ pIsSelected) { + int get_isColumnSelected(int column, long pIsSelected) { AccessibleTableEvent event = new AccessibleTableEvent(this); event.column = column; for (int i = 0; i < accessibleTableListenersSize(); i++) { @@ -4031,7 +4031,7 @@ public class Accessible { } /* IAccessibleTable2::get_isRowSelected([in] row, [out] pIsSelected) */ - int get_isRowSelected(int row, long /*int*/ pIsSelected) { + int get_isRowSelected(int row, long pIsSelected) { AccessibleTableEvent event = new AccessibleTableEvent(this); event.row = row; for (int i = 0; i < accessibleTableListenersSize(); i++) { @@ -4096,10 +4096,10 @@ public class Accessible { } /* IAccessibleTable2::get_modelChange([out] pModelChange) */ - int get_modelChange(long /*int*/ pModelChange) { + int get_modelChange(long pModelChange) { if (DEBUG) print(this + ".IAccessibleTable2::get_modelChange() returning " + (tableChange == null ? "null" : "tableChange=" + tableChange[0] + ", " + tableChange[1] + ", " + tableChange[2] + ", " + tableChange[3])); if (tableChange == null) { - OS.MoveMemory(pModelChange, new long /*int*/ [] { 0 }, C.PTR_SIZEOF); + OS.MoveMemory(pModelChange, new long [] { 0 }, C.PTR_SIZEOF); return COM.S_FALSE; } OS.MoveMemory(pModelChange, tableChange, tableChange.length * 4); @@ -4107,7 +4107,7 @@ public class Accessible { } /* IAccessibleTableCell::get_columnExtent([out] pNColumnsSpanned) */ - int get_columnExtent(long /*int*/ pNColumnsSpanned) { + int get_columnExtent(long pNColumnsSpanned) { AccessibleTableCellEvent event = new AccessibleTableCellEvent(this); for (int i = 0; i < accessibleTableCellListenersSize(); i++) { AccessibleTableCellListener listener = accessibleTableCellListeners.get(i); @@ -4119,7 +4119,7 @@ public class Accessible { } /* IAccessibleTableCell::get_columnHeaderCells([out] ppCellAccessibles, [out] pNColumnHeaderCells) */ - int get_columnHeaderCells(long /*int*/ ppCellAccessibles, long /*int*/ pNColumnHeaderCells) { + int get_columnHeaderCells(long ppCellAccessibles, long pNColumnHeaderCells) { AccessibleTableCellEvent event = new AccessibleTableCellEvent(this); for (int i = 0; i < accessibleTableCellListenersSize(); i++) { AccessibleTableCellListener listener = accessibleTableCellListeners.get(i); @@ -4127,28 +4127,28 @@ public class Accessible { } if (DEBUG) print(this + ".IAccessibleTableCell::get_columnHeaderCells() returning " + (event.accessibles == null ? "null" : "accessibles[" + event.accessibles.length + "]")); if (event.accessibles == null || event.accessibles.length == 0) { - OS.MoveMemory(ppCellAccessibles, new long /*int*/[] { 0 }, C.PTR_SIZEOF); + OS.MoveMemory(ppCellAccessibles, new long[] { 0 }, C.PTR_SIZEOF); OS.MoveMemory(pNColumnHeaderCells, new int [] { 0 }, 4); return COM.S_FALSE; } int length = event.accessibles.length; - long /*int*/ pv = OS.CoTaskMemAlloc(length * C.PTR_SIZEOF); + long pv = OS.CoTaskMemAlloc(length * C.PTR_SIZEOF); int count = 0; for (int i = 0; i < length; i++) { Accessible accessible = event.accessibles[i]; if (accessible != null) { accessible.AddRef(); - OS.MoveMemory(pv + i * C.PTR_SIZEOF, new long /*int*/[] { accessible.getAddress() }, C.PTR_SIZEOF); + OS.MoveMemory(pv + i * C.PTR_SIZEOF, new long[] { accessible.getAddress() }, C.PTR_SIZEOF); count++; } } - OS.MoveMemory(ppCellAccessibles, new long /*int*/ [] { pv }, C.PTR_SIZEOF); + OS.MoveMemory(ppCellAccessibles, new long [] { pv }, C.PTR_SIZEOF); OS.MoveMemory(pNColumnHeaderCells, new int [] { count }, 4); return COM.S_OK; } /* IAccessibleTableCell::get_columnIndex([out] pColumnIndex) */ - int get_columnIndex(long /*int*/ pColumnIndex) { + int get_columnIndex(long pColumnIndex) { AccessibleTableCellEvent event = new AccessibleTableCellEvent(this); for (int i = 0; i < accessibleTableCellListenersSize(); i++) { AccessibleTableCellListener listener = accessibleTableCellListeners.get(i); @@ -4160,7 +4160,7 @@ public class Accessible { } /* IAccessibleTableCell::get_rowExtent([out] pNRowsSpanned) */ - int get_rowExtent(long /*int*/ pNRowsSpanned) { + int get_rowExtent(long pNRowsSpanned) { AccessibleTableCellEvent event = new AccessibleTableCellEvent(this); for (int i = 0; i < accessibleTableCellListenersSize(); i++) { AccessibleTableCellListener listener = accessibleTableCellListeners.get(i); @@ -4172,7 +4172,7 @@ public class Accessible { } /* IAccessibleTableCell::get_rowHeaderCells([out] ppCellAccessibles, [out] pNRowHeaderCells) */ - int get_rowHeaderCells(long /*int*/ ppCellAccessibles, long /*int*/ pNRowHeaderCells) { + int get_rowHeaderCells(long ppCellAccessibles, long pNRowHeaderCells) { AccessibleTableCellEvent event = new AccessibleTableCellEvent(this); for (int i = 0; i < accessibleTableCellListenersSize(); i++) { AccessibleTableCellListener listener = accessibleTableCellListeners.get(i); @@ -4180,28 +4180,28 @@ public class Accessible { } if (DEBUG) print(this + ".IAccessibleTableCell::get_rowHeaderCells() returning " + (event.accessibles == null ? "null" : "accessibles[" + event.accessibles.length + "]")); if (event.accessibles == null || event.accessibles.length == 0) { - OS.MoveMemory(ppCellAccessibles, new long /*int*/[] { 0 }, C.PTR_SIZEOF); + OS.MoveMemory(ppCellAccessibles, new long[] { 0 }, C.PTR_SIZEOF); OS.MoveMemory(pNRowHeaderCells, new int [] { 0 }, 4); return COM.S_FALSE; } int length = event.accessibles.length; - long /*int*/ pv = OS.CoTaskMemAlloc(length * C.PTR_SIZEOF); + long pv = OS.CoTaskMemAlloc(length * C.PTR_SIZEOF); int count = 0; for (int i = 0; i < length; i++) { Accessible accessible = event.accessibles[i]; if (accessible != null) { accessible.AddRef(); - OS.MoveMemory(pv + i * C.PTR_SIZEOF, new long /*int*/[] { accessible.getAddress() }, C.PTR_SIZEOF); + OS.MoveMemory(pv + i * C.PTR_SIZEOF, new long[] { accessible.getAddress() }, C.PTR_SIZEOF); count++; } } - OS.MoveMemory(ppCellAccessibles, new long /*int*/ [] { pv }, C.PTR_SIZEOF); + OS.MoveMemory(ppCellAccessibles, new long [] { pv }, C.PTR_SIZEOF); OS.MoveMemory(pNRowHeaderCells, new int [] { count }, 4); return COM.S_OK; } /* IAccessibleTableCell::get_rowIndex([out] pRowIndex) */ - int get_rowIndex(long /*int*/ pRowIndex) { + int get_rowIndex(long pRowIndex) { AccessibleTableCellEvent event = new AccessibleTableCellEvent(this); for (int i = 0; i < accessibleTableCellListenersSize(); i++) { AccessibleTableCellListener listener = accessibleTableCellListeners.get(i); @@ -4213,7 +4213,7 @@ public class Accessible { } /* IAccessibleTableCell::get_isSelected([out] pIsSelected) */ - int get_isSelected(long /*int*/ pIsSelected) { + int get_isSelected(long pIsSelected) { AccessibleTableCellEvent event = new AccessibleTableCellEvent(this); for (int i = 0; i < accessibleTableCellListenersSize(); i++) { AccessibleTableCellListener listener = accessibleTableCellListeners.get(i); @@ -4225,7 +4225,7 @@ public class Accessible { } /* IAccessibleTableCell::get_rowColumnExtents([out] pRow, [out] pColumn, [out] pRowExtents, [out] pColumnExtents, [out] pIsSelected) */ - int get_rowColumnExtents(long /*int*/ pRow, long /*int*/ pColumn, long /*int*/ pRowExtents, long /*int*/ pColumnExtents, long /*int*/ pIsSelected) { + int get_rowColumnExtents(long pRow, long pColumn, long pRowExtents, long pColumnExtents, long pIsSelected) { if (DEBUG) print(this + ".IAccessibleTableCell::get_rowColumnExtents"); // TODO: should we implement this? It is just a convenience function. return COM.DISP_E_MEMBERNOTFOUND; @@ -4242,7 +4242,7 @@ public class Accessible { } /* IAccessibleTableCell::get_table([out] ppTable) */ - int get_table(long /*int*/ ppTable) { + int get_table(long ppTable) { AccessibleTableCellEvent event = new AccessibleTableCellEvent(this); for (int i = 0; i < accessibleTableCellListenersSize(); i++) { AccessibleTableCellListener listener = accessibleTableCellListeners.get(i); @@ -4252,11 +4252,11 @@ public class Accessible { if (DEBUG) print(this + ".IAccessibleTableCell::get_table() returning " + accessible); if (accessible == null) { // TODO: This is not supposed to return S_FALSE. We need to lookup the table role parent and return that. - OS.MoveMemory(ppTable, new long /*int*/[] { 0 }, C.PTR_SIZEOF); + OS.MoveMemory(ppTable, new long[] { 0 }, C.PTR_SIZEOF); return COM.S_FALSE; } accessible.AddRef(); - OS.MoveMemory(ppTable, new long /*int*/[] { accessible.getAddress() }, C.PTR_SIZEOF); + OS.MoveMemory(ppTable, new long[] { accessible.getAddress() }, C.PTR_SIZEOF); return COM.S_OK; } @@ -4275,7 +4275,7 @@ public class Accessible { } /* IAccessibleText::get_attributes([in] offset, [out] pStartOffset, [out] pEndOffset, [out] pbstrTextAttributes) */ - int get_attributes(int offset, long /*int*/ pStartOffset, long /*int*/ pEndOffset, long /*int*/ pbstrTextAttributes) { + int get_attributes(int offset, long pStartOffset, long pEndOffset, long pbstrTextAttributes) { AccessibleTextAttributeEvent event = new AccessibleTextAttributeEvent(this); event.offset = offset == COM.IA2_TEXT_OFFSET_LENGTH ? getCharacterCount() : offset; for (int i = 0; i < accessibleAttributeListenersSize(); i++) { @@ -4336,7 +4336,7 @@ public class Accessible { } /* IAccessibleText::get_caretOffset([out] pOffset) */ - int get_caretOffset(long /*int*/ pOffset) { + int get_caretOffset(long pOffset) { int offset = getCaretOffset(); if (DEBUG) print(this + ".IAccessibleText::get_caretOffset returning " + offset + hresult(offset == -1 ? COM.S_FALSE : COM.S_OK)); OS.MoveMemory(pOffset, new int [] { offset }, 4); @@ -4345,7 +4345,7 @@ public class Accessible { } /* IAccessibleText::get_characterExtents([in] offset, [in] coordType, [out] pX, [out] pY, [out] pWidth, [out] pHeight) */ - int get_characterExtents(int offset, int coordType, long /*int*/ pX, long /*int*/ pY, long /*int*/ pWidth, long /*int*/ pHeight) { + int get_characterExtents(int offset, int coordType, long pX, long pY, long pWidth, long pHeight) { int length = getCharacterCount(); AccessibleTextEvent event = new AccessibleTextEvent(this); event.start = offset == COM.IA2_TEXT_OFFSET_LENGTH ? length : offset < 0 ? 0 : offset; @@ -4365,7 +4365,7 @@ public class Accessible { } /* IAccessibleText::get_nSelections([out] pNSelections) */ - int get_nSelections(long /*int*/ pNSelections) { + int get_nSelections(long pNSelections) { AccessibleTextEvent event = new AccessibleTextEvent(this); event.count = -1; for (int i = 0; i < accessibleTextExtendedListenersSize(); i++) { @@ -4388,7 +4388,7 @@ public class Accessible { } /* IAccessibleText::get_offsetAtPoint([in] x, [in] y, [in] coordType, [out] pOffset) */ - int get_offsetAtPoint(int x, int y, int coordType, long /*int*/ pOffset) { + int get_offsetAtPoint(int x, int y, int coordType, long pOffset) { AccessibleTextEvent event = new AccessibleTextEvent(this); event.x = x; event.y = y; @@ -4408,7 +4408,7 @@ public class Accessible { } /* IAccessibleText::get_selection([in] selectionIndex, [out] pStartOffset, [out] pEndOffset) */ - int get_selection(int selectionIndex, long /*int*/ pStartOffset, long /*int*/ pEndOffset) { + int get_selection(int selectionIndex, long pStartOffset, long pEndOffset) { AccessibleTextEvent event = new AccessibleTextEvent(this); event.index = selectionIndex; event.start = -1; @@ -4440,7 +4440,7 @@ public class Accessible { } /* IAccessibleText::get_text([in] startOffset, [in] endOffset, [out] pbstrText) */ - int get_text(int startOffset, int endOffset, long /*int*/ pbstrText) { + int get_text(int startOffset, int endOffset, long pbstrText) { AccessibleTextEvent event = new AccessibleTextEvent(this); event.start = startOffset == COM.IA2_TEXT_OFFSET_LENGTH ? getCharacterCount() : startOffset; event.end = endOffset == COM.IA2_TEXT_OFFSET_LENGTH ? getCharacterCount() : endOffset; @@ -4476,7 +4476,7 @@ public class Accessible { } /* IAccessibleText::get_textBeforeOffset([in] offset, [in] boundaryType, [out] pStartOffset, [out] pEndOffset, [out] pbstrText) */ - int get_textBeforeOffset(int offset, int boundaryType, long /*int*/ pStartOffset, long /*int*/ pEndOffset, long /*int*/ pbstrText) { + int get_textBeforeOffset(int offset, int boundaryType, long pStartOffset, long pEndOffset, long pbstrText) { AccessibleTextEvent event = new AccessibleTextEvent(this); int charCount = getCharacterCount(); event.start = offset == COM.IA2_TEXT_OFFSET_LENGTH ? charCount : offset == COM.IA2_TEXT_OFFSET_CARET ? getCaretOffset() : offset; @@ -4529,7 +4529,7 @@ public class Accessible { } /* IAccessibleText::get_textAfterOffset([in] offset, [in] boundaryType, [out] pStartOffset, [out] pEndOffset, [out] pbstrText) */ - int get_textAfterOffset(int offset, int boundaryType, long /*int*/ pStartOffset, long /*int*/ pEndOffset, long /*int*/ pbstrText) { + int get_textAfterOffset(int offset, int boundaryType, long pStartOffset, long pEndOffset, long pbstrText) { AccessibleTextEvent event = new AccessibleTextEvent(this); int charCount = getCharacterCount(); event.start = offset == COM.IA2_TEXT_OFFSET_LENGTH ? charCount : offset == COM.IA2_TEXT_OFFSET_CARET ? getCaretOffset() : offset; @@ -4582,7 +4582,7 @@ public class Accessible { } /* IAccessibleText::get_textAtOffset([in] offset, [in] boundaryType, [out] pStartOffset, [out] pEndOffset, [out] pbstrText) */ - int get_textAtOffset(int offset, int boundaryType, long /*int*/ pStartOffset, long /*int*/ pEndOffset, long /*int*/ pbstrText) { + int get_textAtOffset(int offset, int boundaryType, long pStartOffset, long pEndOffset, long pbstrText) { AccessibleTextEvent event = new AccessibleTextEvent(this); int charCount = getCharacterCount(); event.start = offset == COM.IA2_TEXT_OFFSET_LENGTH ? charCount : offset == COM.IA2_TEXT_OFFSET_CARET ? getCaretOffset() : offset; @@ -4683,7 +4683,7 @@ public class Accessible { } /* IAccessibleText::get_nCharacters([out] pNCharacters) */ - int get_nCharacters(long /*int*/ pNCharacters) { + int get_nCharacters(long pNCharacters) { int count = getCharacterCount(); OS.MoveMemory(pNCharacters, new int [] { count }, 4); if (DEBUG) print(this + ".IAccessibleText::get_nCharacters returning " + count); @@ -4731,7 +4731,7 @@ public class Accessible { } /* IAccessibleText::get_newText([out] pNewText) */ - int get_newText(long /*int*/ pNewText) { + int get_newText(long pNewText) { if (DEBUG) print(this + ".IAccessibleText::get_newText"); String text = null; int start = 0; @@ -4749,7 +4749,7 @@ public class Accessible { } /* IAccessibleText::get_oldText([out] pOldText) */ - int get_oldText(long /*int*/ pOldText) { + int get_oldText(long pOldText) { if (DEBUG) print(this + ".IAccessibleText::get_oldText"); String text = null; int start = 0; @@ -4767,7 +4767,7 @@ public class Accessible { } /* IAccessibleValue::get_currentValue([out] pCurrentValue) */ - int get_currentValue(long /*int*/ pCurrentValue) { + int get_currentValue(long pCurrentValue) { AccessibleValueEvent event = new AccessibleValueEvent(this); for (int i = 0; i < accessibleValueListenersSize(); i++) { AccessibleValueListener listener = accessibleValueListeners.get(i); @@ -4779,7 +4779,7 @@ public class Accessible { } /* IAccessibleValue::setCurrentValue([in] value) */ - int setCurrentValue(long /*int*/ value) { + int setCurrentValue(long value) { if (DEBUG) print(this + ".IAccessibleValue::setCurrentValue"); AccessibleValueEvent event = new AccessibleValueEvent(this); event.value = getNumberVARIANT(value); @@ -4792,7 +4792,7 @@ public class Accessible { } /* IAccessibleValue::get_maximumValue([out] pMaximumValue) */ - int get_maximumValue(long /*int*/ pMaximumValue) { + int get_maximumValue(long pMaximumValue) { AccessibleValueEvent event = new AccessibleValueEvent(this); for (int i = 0; i < accessibleValueListenersSize(); i++) { AccessibleValueListener listener = accessibleValueListeners.get(i); @@ -4804,7 +4804,7 @@ public class Accessible { } /* IAccessibleValue::get_minimumValue([out] pMinimumValue) */ - int get_minimumValue(long /*int*/ pMinimumValue) { + int get_minimumValue(long pMinimumValue) { AccessibleValueEvent event = new AccessibleValueEvent(this); for (int i = 0; i < accessibleValueListenersSize(); i++) { AccessibleValueListener listener = accessibleValueListeners.get(i); @@ -4841,7 +4841,7 @@ public class Accessible { /* ChildIDs are 1-based indices. */ int osChildID = childID + 1; if (control instanceof Tree) { - osChildID = (int)/*64*/OS.SendMessage (control.handle, OS.TVM_MAPHTREEITEMTOACCID, childID, 0); + osChildID = (int)OS.SendMessage (control.handle, OS.TVM_MAPHTREEITEMTOACCID, childID, 0); } checkUniqueID(osChildID); return osChildID; @@ -4858,7 +4858,7 @@ public class Accessible { * All other childIDs are 1-based indices. */ if (!(control instanceof Tree)) return osChildID - 1; - return (int)/*64*/OS.SendMessage (control.handle, OS.TVM_MAPACCIDTOHTREEITEM, osChildID, 0); + return (int)OS.SendMessage (control.handle, OS.TVM_MAPACCIDTOHTREEITEM, osChildID, 0); } int stateToOs(int state) { @@ -5090,9 +5090,9 @@ public class Accessible { role = COM.ROLE_SYSTEM_CLIENT; if (iaccessible != null) { /* Get the default role from the OS. */ - long /*int*/ varChild = OS.GlobalAlloc (OS.GMEM_FIXED | OS.GMEM_ZEROINIT, VARIANT.sizeof); + long varChild = OS.GlobalAlloc (OS.GMEM_FIXED | OS.GMEM_ZEROINIT, VARIANT.sizeof); setIntVARIANT(varChild, COM.VT_I4, COM.CHILDID_SELF); - long /*int*/ pvarRole = OS.GlobalAlloc (OS.GMEM_FIXED | OS.GMEM_ZEROINIT, VARIANT.sizeof); + long pvarRole = OS.GlobalAlloc (OS.GMEM_FIXED | OS.GMEM_ZEROINIT, VARIANT.sizeof); int code = iaccessible.get_accRole(varChild, pvarRole); if (code == COM.S_OK) { VARIANT v = getVARIANT(pvarRole); @@ -5104,8 +5104,8 @@ public class Accessible { return role; } - String getString(long /*int*/ psz) { - long /*int*/ [] ptr = new long /*int*/ [1]; + String getString(long psz) { + long [] ptr = new long [1]; OS.MoveMemory (ptr, psz, C.PTR_SIZEOF); int size = COM.SysStringByteLen(ptr [0]); if (size == 0) return ""; @@ -5114,34 +5114,34 @@ public class Accessible { return new String (buffer); } - VARIANT getVARIANT(long /*int*/ variant) { + VARIANT getVARIANT(long variant) { VARIANT v = new VARIANT(); COM.MoveMemory(v, variant, VARIANT.sizeof); return v; } - Number getNumberVARIANT(long /*int*/ variant) { + Number getNumberVARIANT(long variant) { VARIANT v = new VARIANT(); COM.MoveMemory(v, variant, VARIANT.sizeof); if (v.vt == COM.VT_I8) return Long.valueOf(v.lVal); // TODO: Fix this - v.lVal is an int - don't use struct return Integer.valueOf(v.lVal); } - void setIntVARIANT(long /*int*/ variant, short vt, int lVal) { + void setIntVARIANT(long variant, short vt, int lVal) { if (vt == COM.VT_I4 || vt == COM.VT_EMPTY) { OS.MoveMemory(variant, new short[] { vt }, 2); OS.MoveMemory(variant + 8, new int[] { lVal }, 4); } } - void setPtrVARIANT(long /*int*/ variant, short vt, long /*int*/ lVal) { + void setPtrVARIANT(long variant, short vt, long lVal) { if (vt == COM.VT_DISPATCH || vt == COM.VT_UNKNOWN) { OS.MoveMemory(variant, new short[] { vt }, 2); - OS.MoveMemory(variant + 8, new long /*int*/ [] { lVal }, C.PTR_SIZEOF); + OS.MoveMemory(variant + 8, new long [] { lVal }, C.PTR_SIZEOF); } } - void setNumberVARIANT(long /*int*/ variant, Number number) { + void setNumberVARIANT(long variant, Number number) { if (number == null) { OS.MoveMemory(variant, new short[] { COM.VT_EMPTY }, 2); OS.MoveMemory(variant + 8, new int[] { 0 }, 4); @@ -5160,23 +5160,23 @@ public class Accessible { } } - void setString(long /*int*/ psz, String string) { - long /*int*/ ptr = 0; + void setString(long psz, String string) { + long ptr = 0; if (string != null) { char[] data = (string + "\0").toCharArray(); ptr = COM.SysAllocString(data); } - OS.MoveMemory(psz, new long /*int*/ [] { ptr }, C.PTR_SIZEOF); + OS.MoveMemory(psz, new long [] { ptr }, C.PTR_SIZEOF); } - void setStringVARIANT(long /*int*/ variant, String string) { - long /*int*/ ptr = 0; + void setStringVARIANT(long variant, String string) { + long ptr = 0; if (string != null) { char[] data = (string + "\0").toCharArray(); ptr = COM.SysAllocString(data); } OS.MoveMemory(variant, new short[] { ptr == 0 ? COM.VT_EMPTY : COM.VT_BSTR }, 2); - OS.MoveMemory(variant + 8, new long /*int*/ [] { ptr }, C.PTR_SIZEOF); + OS.MoveMemory(variant + 8, new long [] { ptr }, C.PTR_SIZEOF); } /* checkWidget was copied from Widget, and rewritten to work in this package */ diff --git a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Relation.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Relation.java index e31347744b..760bd1b5b3 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Relation.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Relation.java @@ -66,7 +66,7 @@ class Relation { AddRef(); } - long /*int*/ getAddress() { + long getAddress() { /* The address of a Relation is the address of its IAccessibleRelation COMObject. */ if (objIAccessibleRelation == null) createIAccessibleRelation(); return objIAccessibleRelation.getAddress(); @@ -75,21 +75,21 @@ class Relation { void createIAccessibleRelation() { objIAccessibleRelation = new COMObject(new int[] {2,0,0,1,1,1,2,3}) { @Override - public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long method0(long[] args) {return QueryInterface(args[0], args[1]);} @Override - public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long method1(long[] args) {return AddRef();} @Override - public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long method2(long[] args) {return Release();} @Override - public long /*int*/ method3(long /*int*/[] args) {return get_relationType(args[0]);} + public long method3(long[] args) {return get_relationType(args[0]);} @Override - public long /*int*/ method4(long /*int*/[] args) {return get_localizedRelationType(args[0]);} + public long method4(long[] args) {return get_localizedRelationType(args[0]);} @Override - public long /*int*/ method5(long /*int*/[] args) {return get_nTargets(args[0]);} + public long method5(long[] args) {return get_nTargets(args[0]);} @Override - public long /*int*/ method6(long /*int*/[] args) {return get_target((int)/*64*/args[0], args[1]);} + public long method6(long[] args) {return get_target((int)args[0], args[1]);} @Override - public long /*int*/ method7(long /*int*/[] args) {return get_targets((int)/*64*/args[0], args[1], args[2]);} + public long method7(long[] args) {return get_targets((int)args[0], args[1], args[2]);} }; } @@ -97,12 +97,12 @@ class Relation { * Ownership of ppvObject transfers from callee to caller so reference count on ppvObject * must be incremented before returning. Caller is responsible for releasing ppvObject. */ - int QueryInterface(long /*int*/ iid, long /*int*/ ppvObject) { + int QueryInterface(long iid, long ppvObject) { GUID guid = new GUID(); COM.MoveMemory(guid, iid, GUID.sizeof); if (COM.IsEqualGUID(guid, COM.IIDIUnknown) || COM.IsEqualGUID(guid, COM.IIDIAccessibleRelation)) { - OS.MoveMemory(ppvObject, new long /*int*/[] { getAddress() }, C.PTR_SIZEOF); + OS.MoveMemory(ppvObject, new long[] { getAddress() }, C.PTR_SIZEOF); AddRef(); return COM.S_OK; } @@ -127,39 +127,39 @@ class Relation { } /* IAccessibleRelation::get_relationType([out] pbstrRelationType) */ - int get_relationType(long /*int*/ pbstrRelationType) { + int get_relationType(long pbstrRelationType) { setString(pbstrRelationType, relationTypeString[type]); return COM.S_OK; } /* IAccessibleRelation::get_localizedRelationType([out] pbstrLocalizedRelationType) */ - int get_localizedRelationType(long /*int*/ pbstrLocalizedRelationType) { + int get_localizedRelationType(long pbstrLocalizedRelationType) { setString(pbstrLocalizedRelationType, localizedRelationTypeString[type]); return COM.S_OK; } /* IAccessibleRelation::get_nTargets([out] pNTargets) */ - int get_nTargets(long /*int*/ pNTargets) { + int get_nTargets(long pNTargets) { OS.MoveMemory(pNTargets, new int [] { targets.length }, 4); return COM.S_OK; } /* IAccessibleRelation::get_target([in] targetIndex, [out] ppTarget) */ - int get_target(int targetIndex, long /*int*/ ppTarget) { + int get_target(int targetIndex, long ppTarget) { if (targetIndex < 0 || targetIndex >= targets.length) return COM.E_INVALIDARG; Accessible target = targets[targetIndex]; target.AddRef(); - OS.MoveMemory(ppTarget, new long /*int*/[] { target.getAddress() }, C.PTR_SIZEOF); + OS.MoveMemory(ppTarget, new long[] { target.getAddress() }, C.PTR_SIZEOF); return COM.S_OK; } /* IAccessibleRelation::get_targets([in] maxTargets, [out] ppTargets, [out] pNTargets) */ - int get_targets(int maxTargets, long /*int*/ ppTargets, long /*int*/ pNTargets) { + int get_targets(int maxTargets, long ppTargets, long pNTargets) { int count = Math.min(targets.length, maxTargets); for (int i = 0; i < count; i++) { Accessible target = targets[i]; target.AddRef(); - OS.MoveMemory(ppTargets + i * C.PTR_SIZEOF, new long /*int*/[] { target.getAddress() }, C.PTR_SIZEOF); + OS.MoveMemory(ppTargets + i * C.PTR_SIZEOF, new long[] { target.getAddress() }, C.PTR_SIZEOF); } OS.MoveMemory(pNTargets, new int [] { count }, 4); return COM.S_OK; @@ -197,9 +197,9 @@ class Relation { } // setString copied from Accessible class - void setString(long /*int*/ psz, String string) { + void setString(long psz, String string) { char[] data = (string + "\0").toCharArray(); - long /*int*/ ptr = COM.SysAllocString(data); - OS.MoveMemory(psz, new long /*int*/ [] { ptr }, C.PTR_SIZEOF); + long ptr = COM.SysAllocString(data); + OS.MoveMemory(psz, new long [] { ptr }, C.PTR_SIZEOF); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/IE.java b/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/IE.java index 0c0e6409a8..c5b328c46f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/IE.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/IE.java @@ -38,7 +38,7 @@ class IE extends WebBrowser { Point location; Point size; boolean addressBar = true, menuBar = true, statusBar = true, toolBar = true; - long /*int*/ globalDispatch; + long globalDispatch; String html, lastNavigateURL, uncRedirect; Object[] pendingText, pendingUrl; int style, lastKeyCode, lastCharCode; @@ -192,7 +192,7 @@ class IE extends WebBrowser { * version-specific features that can be enabled. */ TCHAR key = new TCHAR (0, "Software\\Microsoft\\Internet Explorer", true); //$NON-NLS-1$ - long /*int*/ [] phkResult = new long /*int*/ [1]; + long [] phkResult = new long [1]; if (OS.RegOpenKeyEx (OS.HKEY_LOCAL_MACHINE, key, 0, OS.KEY_READ, phkResult) == 0) { int [] lpcbData = new int [1]; TCHAR buffer = new TCHAR (0, "svcVersion", true); //$NON-NLS-1$ @@ -232,7 +232,7 @@ class IE extends WebBrowser { * will be embedded to explicitly specify Shell.Explorer.2. */ key = new TCHAR (0, "Shell.Explorer\\CLSID", true); //$NON-NLS-1$ - phkResult = new long /*int*/ [1]; + phkResult = new long [1]; if (OS.RegOpenKeyEx (OS.HKEY_CLASSES_ROOT, key, 0, OS.KEY_READ, phkResult) == 0) { int [] lpcbData = new int [1]; int result = OS.RegQueryValueEx (phkResult [0], null, 0, null, (TCHAR) null, lpcbData); @@ -244,7 +244,7 @@ class IE extends WebBrowser { if (clsid.equals (CLSID_SHELLEXPLORER1)) { /* Shell.Explorer.1 is the default, ensure that Shell.Explorer.2 is available */ key = new TCHAR (0, "Shell.Explorer.2", true); //$NON-NLS-1$ - long /*int*/ [] phkResult2 = new long /*int*/ [1]; + long [] phkResult2 = new long [1]; if (OS.RegOpenKeyEx (OS.HKEY_CLASSES_ROOT, key, 0, OS.KEY_READ, phkResult2) == 0) { /* specify that Shell.Explorer.2 is to be used */ OS.RegCloseKey (phkResult2 [0]); @@ -321,7 +321,7 @@ public void create(Composite parent, int style) { } if (version != -1) { - long /*int*/[] key = new long /*int*/[1]; + long[] key = new long[1]; final TCHAR subkey = new TCHAR(0, "Software\\Microsoft\\Internet Explorer\\Main\\FeatureControl\\FEATURE_BROWSER_EMULATION", true); //$NON-NLS-1$ if (OS.RegCreateKeyEx(OS.HKEY_CURRENT_USER, subkey, 0, null, OS.REG_OPTION_VOLATILE, OS.KEY_WRITE | OS.KEY_QUERY_VALUE, 0, key, null) == 0) { TCHAR lpszFile = new TCHAR(0, OS.MAX_PATH); @@ -342,7 +342,7 @@ public void create(Composite parent, int style) { if (result == 0 || result == OS.ERROR_FILE_NOT_FOUND) { if (OS.RegSetValueEx(key[0], lpValueName, 0, OS.REG_DWORD, new int[] {version}, 4) == 0) { parent.getDisplay().addListener(SWT.Dispose, event -> { - long /*int*/[] key1 = new long /*int*/[1]; + long[] key1 = new long[1]; if (OS.RegOpenKeyEx(OS.HKEY_CURRENT_USER, subkey, 0, OS.KEY_WRITE, key1) == 0) { OS.RegDeleteValue(key1[0], lpValueName); } @@ -475,7 +475,7 @@ public void create(Composite parent, int style) { if (uncRedirect.equals(url1) || (uncRedirect.startsWith(url1) && uncRedirect.indexOf('\\', 2) == url1.length())) { Variant cancel1 = event.arguments[6]; if (cancel1 != null) { - long /*int*/ pCancel1 = cancel1.getByRef(); + long pCancel1 = cancel1.getByRef(); OS.MoveMemory(pCancel1, new short[] {OS.VARIANT_FALSE}, 2); } setAboutBlank(false); @@ -510,7 +510,7 @@ public void create(Composite parent, int style) { if (url1.startsWith(PROTOCOL_FILE) && _getUrl().startsWith(ABOUT_BLANK) && untrustedText) { Variant cancel2 = event.arguments[6]; if (cancel2 != null) { - long /*int*/ pCancel2 = cancel2.getByRef(); + long pCancel2 = cancel2.getByRef(); OS.MoveMemory(pCancel2, new short[] {OS.VARIANT_TRUE}, 2); } break; @@ -527,7 +527,7 @@ public void create(Composite parent, int style) { boolean doit1 = newEvent1.doit && !browser.isDisposed(); Variant cancel3 = event.arguments[6]; if (cancel3 != null) { - long /*int*/ pCancel3 = cancel3.getByRef(); + long pCancel3 = cancel3.getByRef(); OS.MoveMemory(pCancel3, new short[] {doit1 ? OS.VARIANT_FALSE : OS.VARIANT_TRUE}, 2); } if (doit1) { @@ -800,7 +800,7 @@ public void create(Composite parent, int style) { final String host = url4.substring(0, index); Variant cancel4 = event.arguments[4]; if (cancel4 != null) { - long /*int*/ pCancel4 = cancel4.getByRef(); + long pCancel4 = cancel4.getByRef(); OS.MoveMemory(pCancel4, new short[] {OS.VARIANT_TRUE}, 2); } browser.getDisplay().asyncExec(() -> { @@ -825,7 +825,7 @@ public void create(Composite parent, int style) { } case NewWindow2: { Variant cancel5 = event.arguments[1]; - long /*int*/ pCancel5 = cancel5.getByRef(); + long pCancel5 = cancel5.getByRef(); WindowEvent newEvent2 = new WindowEvent(browser); newEvent2.display = browser.getDisplay(); newEvent2.widget = browser; @@ -850,8 +850,8 @@ public void create(Composite parent, int style) { Variant variant5 = new Variant(browser.auto); /* does not need to be disposed */ IDispatch iDispatch = variant5.getDispatch(); Variant ppDisp = event.arguments[0]; - long /*int*/ byref = ppDisp.getByRef(); - if (byref != 0) OS.MoveMemory(byref, new long /*int*/[] {iDispatch.getAddress()}, C.PTR_SIZEOF); + long byref = ppDisp.getByRef(); + if (byref != 0) OS.MoveMemory(byref, new long[] {iDispatch.getAddress()}, C.PTR_SIZEOF); } if (newEvent2.required) { OS.MoveMemory(pCancel5, new short[]{doit2 ? OS.VARIANT_FALSE : OS.VARIANT_TRUE}, 2); @@ -997,7 +997,7 @@ public void create(Composite parent, int style) { browser.dispose(); }); Variant cancel6 = event.arguments[1]; - long /*int*/ pCancel6 = cancel6.getByRef(); + long pCancel6 = cancel6.getByRef(); Variant arg15 = event.arguments[0]; boolean isChildWindow = arg15.getBoolean(); OS.MoveMemory(pCancel6, new short[]{isChildWindow ? OS.VARIANT_FALSE : OS.VARIANT_TRUE}, 2); @@ -1125,12 +1125,12 @@ static Variant createSafeArray(String string) { /* Create a pointer and copy the data into it */ byte[] bytes = string.getBytes(); int length = bytes.length; - long /*int*/ pvData = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, length); + long pvData = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, length); C.memmove(pvData, bytes, length); int cElements1 = length; /* Create a SAFEARRAY in memory */ - long /*int*/ pSafeArray = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, SAFEARRAY.sizeof); + long pSafeArray = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, SAFEARRAY.sizeof); SAFEARRAY safeArray = new SAFEARRAY(); safeArray.cDims = 1; safeArray.fFeatures = OS.FADF_FIXEDSIZE; @@ -1142,10 +1142,10 @@ static Variant createSafeArray(String string) { OS.MoveMemory (pSafeArray, safeArray, SAFEARRAY.sizeof); /* Return a Variant that holds the SAFEARRAY */ - long /*int*/ pVariant = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, Variant.sizeof); + long pVariant = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, Variant.sizeof); short vt = (short)(OLE.VT_ARRAY | OLE.VT_UI1); OS.MoveMemory(pVariant, new short[] {vt}, 2); - OS.MoveMemory(pVariant + 8, new long /*int*/[] {pSafeArray}, C.PTR_SIZEOF); + OS.MoveMemory(pVariant + 8, new long[] {pSafeArray}, C.PTR_SIZEOF); return new Variant(pVariant, (short)(OLE.VT_BYREF | OLE.VT_VARIANT)); } @@ -1398,11 +1398,11 @@ void setHTML (String string) { * prepend the UTF-8 Byte Order Mark signature to the data. */ byte[] UTF8BOM = {(byte)0xEF, (byte)0xBB, (byte)0xBF}; - long /*int*/ hGlobal = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, UTF8BOM.length + byteCount); + long hGlobal = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, UTF8BOM.length + byteCount); if (hGlobal != 0) { OS.MoveMemory(hGlobal, UTF8BOM, UTF8BOM.length); OS.WideCharToMultiByte(OS.CP_UTF8, 0, chars, charCount, hGlobal + UTF8BOM.length, byteCount, null, null); - long /*int*/ [] ppstm = new long /*int*/ [1]; + long [] ppstm = new long [1]; /* * CreateStreamOnHGlobal is called with the flag fDeleteOnRelease. * If the call succeeds the buffer hGlobal is freed automatically @@ -1413,7 +1413,7 @@ void setHTML (String string) { int[] rgdispid = auto.getIDsOfNames(new String[] {PROPERTY_DOCUMENT}); Variant pVarResult = auto.getProperty(rgdispid[0]); IDispatch dispatchDocument = pVarResult.getDispatch(); - long /*int*/ [] ppvObject = new long /*int*/ [1]; + long [] ppvObject = new long [1]; int result = dispatchDocument.QueryInterface(COM.IIDIPersistStreamInit, ppvObject); if (result == OS.S_OK) { IPersistStreamInit persistStreamInit = new IPersistStreamInit(ppvObject[0]); 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 70fac66537..60c1ea3506 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 @@ -47,119 +47,119 @@ protected void createCOMInterfaces () { super.createCOMInterfaces(); iDocHostUIHandler = new COMObject(new int[]{2, 0, 0, 4, 1, 5, 0, 0, 1, 1, 1, 3, 3, 2, 2, 1, 3, 2}){ @Override - public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long method0(long[] args) {return QueryInterface(args[0], args[1]);} @Override - public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long method1(long[] args) {return AddRef();} @Override - public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long method2(long[] args) {return Release();} @Override - public long /*int*/ method3(long /*int*/[] args) {return ShowContextMenu((int)/*64*/args[0], args[1], args[2], args[3]);} + public long method3(long[] args) {return ShowContextMenu((int)args[0], args[1], args[2], args[3]);} @Override - public long /*int*/ method4(long /*int*/[] args) {return GetHostInfo(args[0]);} + public long method4(long[] args) {return GetHostInfo(args[0]);} @Override - public long /*int*/ method5(long /*int*/[] args) {return ShowUI((int)/*64*/args[0], args[1], args[2], args[3], args[4]);} + public long method5(long[] args) {return ShowUI((int)args[0], args[1], args[2], args[3], args[4]);} @Override - public long /*int*/ method6(long /*int*/[] args) {return HideUI();} + public long method6(long[] args) {return HideUI();} @Override - public long /*int*/ method7(long /*int*/[] args) {return UpdateUI();} + public long method7(long[] args) {return UpdateUI();} @Override - public long /*int*/ method8(long /*int*/[] args) {return EnableModeless((int)/*64*/args[0]);} + public long method8(long[] args) {return EnableModeless((int)args[0]);} @Override - public long /*int*/ method9(long /*int*/[] args) {return OnDocWindowActivate((int)/*64*/args[0]);} + public long method9(long[] args) {return OnDocWindowActivate((int)args[0]);} @Override - public long /*int*/ method10(long /*int*/[] args) {return OnFrameWindowActivate((int)/*64*/args[0]);} + public long method10(long[] args) {return OnFrameWindowActivate((int)args[0]);} @Override - public long /*int*/ method11(long /*int*/[] args) {return ResizeBorder(args[0], args[1], (int)/*64*/args[2]);} + public long method11(long[] args) {return ResizeBorder(args[0], args[1], (int)args[2]);} @Override - public long /*int*/ method12(long /*int*/[] args) {return TranslateAccelerator(args[0], args[1], (int)/*64*/args[2]);} + public long method12(long[] args) {return TranslateAccelerator(args[0], args[1], (int)args[2]);} @Override - public long /*int*/ method13(long /*int*/[] args) {return GetOptionKeyPath(args[0], (int)/*64*/args[1]);} + public long method13(long[] args) {return GetOptionKeyPath(args[0], (int)args[1]);} @Override - public long /*int*/ method14(long /*int*/[] args) {return GetDropTarget(args[0], args[1]);} + public long method14(long[] args) {return GetDropTarget(args[0], args[1]);} @Override - public long /*int*/ method15(long /*int*/[] args) {return GetExternal(args[0]);} + public long method15(long[] args) {return GetExternal(args[0]);} @Override - public long /*int*/ method16(long /*int*/[] args) {return TranslateUrl((int)/*64*/args[0], args[1], args[2]);} + public long method16(long[] args) {return TranslateUrl((int)args[0], args[1], args[2]);} @Override - public long /*int*/ method17(long /*int*/[] args) {return FilterDataObject(args[0], args[1]);} + 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}){ @Override - public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long method0(long[] args) {return QueryInterface(args[0], args[1]);} @Override - public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long method1(long[] args) {return AddRef();} @Override - public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long method2(long[] args) {return Release();} @Override - public long /*int*/ method3(long /*int*/[] args) {return ShowMessage(args[0], args[1], args[2], (int)/*64*/args[3], args[4], (int)/*64*/args[5], args[6]);} + 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 /*int*/ method4(long /*int*/[] args) { + public long method4(long[] args) { if (args.length == 7) { - return ShowHelp(args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4], (int)/*64*/args[5], args[6]); + 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)/*64*/args[2], (int)/*64*/args[3], args[4], args[5]); + return ShowHelp_64(args[0], args[1], (int)args[2], (int)args[3], args[4], args[5]); } } }; iServiceProvider = new COMObject(new int[]{2, 0, 0, 3}){ @Override - public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long method0(long[] args) {return QueryInterface(args[0], args[1]);} @Override - public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long method1(long[] args) {return AddRef();} @Override - public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long method2(long[] args) {return Release();} @Override - public long /*int*/ method3(long /*int*/[] args) {return QueryService(args[0], args[1], args[2]);} + public long method3(long[] args) {return QueryService(args[0], args[1], args[2]);} }; iInternetSecurityManager = new COMObject(new int[]{2, 0, 0, 1, 1, 3, 4, 8, 7, 3, 3}){ @Override - public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long method0(long[] args) {return QueryInterface(args[0], args[1]);} @Override - public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long method1(long[] args) {return AddRef();} @Override - public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long method2(long[] args) {return Release();} @Override - public long /*int*/ method3(long /*int*/[] args) {return SetSecuritySite(args[0]);} + public long method3(long[] args) {return SetSecuritySite(args[0]);} @Override - public long /*int*/ method4(long /*int*/[] args) {return GetSecuritySite(args[0]);} + public long method4(long[] args) {return GetSecuritySite(args[0]);} @Override - public long /*int*/ method5(long /*int*/[] args) {return MapUrlToZone(args[0], args[1], (int)/*64*/args[2]);} + public long method5(long[] args) {return MapUrlToZone(args[0], args[1], (int)args[2]);} @Override - public long /*int*/ method6(long /*int*/[] args) {return GetSecurityId(args[0], args[1], args[2], args[3]);} + public long method6(long[] args) {return GetSecurityId(args[0], args[1], args[2], args[3]);} @Override - public long /*int*/ method7(long /*int*/[] args) {return ProcessUrlAction(args[0], (int)/*64*/args[1], args[2], (int)/*64*/args[3], args[4], (int)/*64*/args[5], (int)/*64*/args[6], (int)/*64*/args[7]);} + public long method7(long[] args) {return ProcessUrlAction(args[0], (int)args[1], args[2], (int)args[3], args[4], (int)args[5], (int)args[6], (int)args[7]);} @Override - public long /*int*/ method8(long /*int*/[] args) {return QueryCustomPolicy(args[0], args[1], args[2], args[3], args[4], (int)/*64*/args[5], (int)/*64*/args[6]);} + public long method8(long[] args) {return QueryCustomPolicy(args[0], args[1], args[2], args[3], args[4], (int)args[5], (int)args[6]);} @Override - public long /*int*/ method9(long /*int*/[] args) {return SetZoneMapping((int)/*64*/args[0], args[1], (int)/*64*/args[2]);} + public long method9(long[] args) {return SetZoneMapping((int)args[0], args[1], (int)args[2]);} @Override - public long /*int*/ method10(long /*int*/[] args) {return GetZoneMappings((int)/*64*/args[0], args[1], (int)/*64*/args[2]);} + public long method10(long[] args) {return GetZoneMappings((int)args[0], args[1], (int)args[2]);} }; iOleCommandTarget = new COMObject(new int[]{2, 0, 0, 4, 5}) { @Override - public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long method0(long[] args) {return QueryInterface(args[0], args[1]);} @Override - public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long method1(long[] args) {return AddRef();} @Override - public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long method2(long[] args) {return Release();} @Override - public long /*int*/ method3(long /*int*/[] args) {return QueryStatus(args[0], (int)/*64*/args[1], args[2], args[3]);} + public long method3(long[] args) {return QueryStatus(args[0], (int)args[1], args[2], args[3]);} @Override - public long /*int*/ method4(long /*int*/[] args) {return Exec(args[0], (int)/*64*/args[1], (int)/*64*/args[2], args[3], args[4]);} + public long method4(long[] args) {return Exec(args[0], (int)args[1], (int)args[2], args[3], args[4]);} }; iAuthenticate = new COMObject(new int[]{2, 0, 0, 3}){ @Override - public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long method0(long[] args) {return QueryInterface(args[0], args[1]);} @Override - public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long method1(long[] args) {return AddRef();} @Override - public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long method2(long[] args) {return Release();} @Override - public long /*int*/ method3(long /*int*/[] args) {return Authenticate(args[0], args[1], args[2]);} + public long method3(long[] args) {return Authenticate(args[0], args[1], args[2]);} }; iDispatch = new COMObject (new int[] {2, 0, 0, 1, 3, 5, 8}) { @Override - public long /*int*/ method0 (long /*int*/[] args) { + public long method0 (long[] args) { /* * IDispatch check must be done here instead of in the shared QueryInterface * implementation, to avoid answering the superclass's IDispatch implementation @@ -168,24 +168,24 @@ protected void createCOMInterfaces () { GUID guid = new GUID (); COM.MoveMemory (guid, args[0], GUID.sizeof); if (COM.IsEqualGUID (guid, COM.IIDIDispatch)) { - OS.MoveMemory (args[1], new long /*int*/[] {iDispatch.getAddress ()}, C.PTR_SIZEOF); + OS.MoveMemory (args[1], new long[] {iDispatch.getAddress ()}, C.PTR_SIZEOF); AddRef (); return COM.S_OK; } return QueryInterface (args[0], args[1]); } @Override - public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();} + public long method1 (long[] args) {return AddRef ();} @Override - public long /*int*/ method2 (long /*int*/[] args) {return Release ();} + public long method2 (long[] args) {return Release ();} @Override - public long /*int*/ method3 (long /*int*/[] args) {return GetTypeInfoCount (args[0]);} + public long method3 (long[] args) {return GetTypeInfoCount (args[0]);} @Override - public long /*int*/ method4 (long /*int*/[] args) {return GetTypeInfo ((int)/*64*/args[0], (int)/*64*/args[1], args[2]);} + public long method4 (long[] args) {return GetTypeInfo ((int)args[0], (int)args[1], args[2]);} @Override - public long /*int*/ method5 (long /*int*/[] args) {return GetIDsOfNames ((int)/*64*/args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], args[4]);} + public long method5 (long[] args) {return GetIDsOfNames ((int)args[0], args[1], (int)args[2], (int)args[3], args[4]);} @Override - public long /*int*/ method6 (long /*int*/[] args) {return Invoke ((int)/*64*/args[0], (int)/*64*/args[1], (int)/*64*/args[2], (int)/*64*/args[3], args[4], args[5], args[6], args[7]);} + public long method6 (long[] args) {return Invoke ((int)args[0], (int)args[1], (int)args[2], (int)args[3], args[4], args[5], args[6], args[7]);} }; } @@ -229,38 +229,38 @@ protected int AddRef() { } @Override -protected int QueryInterface(long /*int*/ riid, long /*int*/ ppvObject) { +protected int QueryInterface(long riid, long ppvObject) { int result = super.QueryInterface(riid, ppvObject); if (result == COM.S_OK) return result; if (riid == 0 || ppvObject == 0) return COM.E_INVALIDARG; GUID guid = new GUID(); COM.MoveMemory(guid, riid, GUID.sizeof); if (COM.IsEqualGUID(guid, COM.IIDIDocHostUIHandler)) { - OS.MoveMemory(ppvObject, new long /*int*/[] {iDocHostUIHandler.getAddress()}, C.PTR_SIZEOF); + OS.MoveMemory(ppvObject, new long[] {iDocHostUIHandler.getAddress()}, C.PTR_SIZEOF); AddRef(); return COM.S_OK; } if (COM.IsEqualGUID(guid, COM.IIDIDocHostShowUI)) { - OS.MoveMemory(ppvObject, new long /*int*/[] {iDocHostShowUI.getAddress()}, C.PTR_SIZEOF); + OS.MoveMemory(ppvObject, new long[] {iDocHostShowUI.getAddress()}, C.PTR_SIZEOF); AddRef(); return COM.S_OK; } if (COM.IsEqualGUID(guid, COM.IIDIServiceProvider)) { - OS.MoveMemory(ppvObject, new long /*int*/[] {iServiceProvider.getAddress()}, C.PTR_SIZEOF); + OS.MoveMemory(ppvObject, new long[] {iServiceProvider.getAddress()}, C.PTR_SIZEOF); AddRef(); return COM.S_OK; } if (COM.IsEqualGUID(guid, COM.IIDIInternetSecurityManager)) { - OS.MoveMemory(ppvObject, new long /*int*/[] {iInternetSecurityManager.getAddress()}, C.PTR_SIZEOF); + OS.MoveMemory(ppvObject, new long[] {iInternetSecurityManager.getAddress()}, C.PTR_SIZEOF); AddRef(); return COM.S_OK; } if (COM.IsEqualGUID(guid, COM.IIDIOleCommandTarget)) { - OS.MoveMemory(ppvObject, new long /*int*/[] {iOleCommandTarget.getAddress()}, C.PTR_SIZEOF); + OS.MoveMemory(ppvObject, new long[] {iOleCommandTarget.getAddress()}, C.PTR_SIZEOF); AddRef(); return COM.S_OK; } - OS.MoveMemory(ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF); + OS.MoveMemory(ppvObject, new long[] {0}, C.PTR_SIZEOF); return COM.E_NOINTERFACE; } @@ -270,21 +270,21 @@ int EnableModeless(int EnableModeless) { return COM.E_NOTIMPL; } -int FilterDataObject(long /*int*/ pDO, long /*int*/ ppDORet) { +int FilterDataObject(long pDO, long ppDORet) { return COM.E_NOTIMPL; } -int GetDropTarget(long /*int*/ pDropTarget, long /*int*/ ppDropTarget) { +int GetDropTarget(long pDropTarget, long ppDropTarget) { return COM.E_NOTIMPL; } -int GetExternal(long /*int*/ ppDispatch) { - OS.MoveMemory (ppDispatch, new long /*int*/[] {iDispatch.getAddress()}, C.PTR_SIZEOF); +int GetExternal(long ppDispatch) { + OS.MoveMemory (ppDispatch, new long[] {iDispatch.getAddress()}, C.PTR_SIZEOF); AddRef (); return COM.S_OK; } -int GetHostInfo(long /*int*/ pInfo) { +int GetHostInfo(long pInfo) { int info = IE.DOCHOSTUIFLAG_THEME | IE.DOCHOSTUIFLAG_ENABLE_REDIRECT_NOTIFICATION | IE.DOCHOSTUIFLAG_DPI_AWARE; IE browser = (IE)((Browser)getParent().getParent()).webBrowser; if ((browser.style & SWT.BORDER) == 0) info |= IE.DOCHOSTUIFLAG_NO3DOUTERBORDER; @@ -295,7 +295,7 @@ int GetHostInfo(long /*int*/ pInfo) { return COM.S_OK; } -int GetOptionKeyPath(long /*int*/ pchKey, int dw) { +int GetOptionKeyPath(long pchKey, int dw) { return COM.E_NOTIMPL; } @@ -317,11 +317,11 @@ protected int Release() { return super.Release(); } -int ResizeBorder(long /*int*/ prcBorder, long /*int*/ pUIWindow, int fFrameWindow) { +int ResizeBorder(long prcBorder, long pUIWindow, int fFrameWindow) { return COM.E_NOTIMPL; } -int ShowContextMenu(int dwID, long /*int*/ ppt, long /*int*/ pcmdtReserved, long /*int*/ pdispReserved) { +int ShowContextMenu(int dwID, long ppt, long pcmdtReserved, long pdispReserved) { Browser browser = (Browser)getParent().getParent(); Event event = new Event(); POINT pt = new POINT(); @@ -344,11 +344,11 @@ int ShowContextMenu(int dwID, long /*int*/ ppt, long /*int*/ pcmdtReserved, long return COM.S_FALSE; } -int ShowUI(int dwID, long /*int*/ pActiveObject, long /*int*/ pCommandTarget, long /*int*/ pFrame, long /*int*/ pDoc) { +int ShowUI(int dwID, long pActiveObject, long pCommandTarget, long pFrame, long pDoc) { return COM.S_FALSE; } -int TranslateAccelerator(long /*int*/ lpMsg, long /*int*/ pguidCmdGroup, int nCmdID) { +int TranslateAccelerator(long lpMsg, long pguidCmdGroup, int nCmdID) { /* * Feature in Internet Explorer. By default the embedded Internet Explorer control runs * the Internet Explorer shortcuts (e.g. Ctrl+F for Find). This overrides the shortcuts @@ -358,8 +358,8 @@ int TranslateAccelerator(long /*int*/ lpMsg, long /*int*/ pguidCmdGroup, int nCm Menu menubar = getShell().getMenuBar(); if (menubar != null && !menubar.isDisposed() && menubar.isEnabled()) { Shell shell = menubar.getShell(); - long /*int*/ hwnd = shell.handle; - long /*int*/ hAccel = OS.SendMessage(hwnd, OS.WM_APP+1, 0, 0); + long hwnd = shell.handle; + long hAccel = OS.SendMessage(hwnd, OS.WM_APP+1, 0, 0); if (hAccel != 0) { MSG msg = new MSG(); OS.MoveMemory(msg, lpMsg, MSG.sizeof); @@ -380,7 +380,7 @@ int TranslateAccelerator(long /*int*/ lpMsg, long /*int*/ pguidCmdGroup, int nCm MSG msg = new MSG(); OS.MoveMemory(msg, lpMsg, MSG.sizeof); if (msg.message == OS.WM_KEYDOWN) { - switch ((int)/*64*/msg.wParam) { + switch ((int)msg.wParam) { case OS.VK_F5: OleAutomation auto = new OleAutomation(this); int[] rgdispid = auto.getIDsOfNames(new String[] { "LocationURL" }); //$NON-NLS-1$ @@ -441,7 +441,7 @@ int TranslateAccelerator(long /*int*/ lpMsg, long /*int*/ pguidCmdGroup, int nCm case OS.WM_KEYDOWN: case OS.WM_KEYUP: { boolean isAccent = false; - switch ((int)/*64*/msg.wParam) { + switch ((int)msg.wParam) { case OS.VK_SHIFT: case OS.VK_MENU: case OS.VK_CONTROL: @@ -450,7 +450,7 @@ int TranslateAccelerator(long /*int*/ lpMsg, long /*int*/ pguidCmdGroup, int nCm case OS.VK_SCROLL: break; default: { - int mapKey = OS.MapVirtualKey ((int)/*64*/msg.wParam, 2); + int mapKey = OS.MapVirtualKey ((int)msg.wParam, 2); if (mapKey != 0) { isAccent = (mapKey & 0x80000000) != 0; if (!isAccent) { @@ -477,7 +477,7 @@ int TranslateAccelerator(long /*int*/ lpMsg, long /*int*/ pguidCmdGroup, int nCm return result; } -int TranslateUrl(int dwTranslate, long /*int*/ pchURLIn, long /*int*/ ppchURLOut) { +int TranslateUrl(int dwTranslate, long pchURLIn, long ppchURLOut) { return COM.E_NOTIMPL; } @@ -487,13 +487,13 @@ int UpdateUI() { /* IDocHostShowUI */ -int ShowMessage(long /*int*/ hwnd, long /*int*/ lpstrText, long /*int*/ lpstrCaption, int dwType, long /*int*/ lpstrHelpFile, int dwHelpContext, long /*int*/ plResult) { +int ShowMessage(long hwnd, long lpstrText, long lpstrCaption, int dwType, long lpstrHelpFile, int dwHelpContext, long plResult) { boolean ignore = ignoreNextMessage || ignoreAllMessages; ignoreNextMessage = false; return ignore ? COM.S_OK : COM.S_FALSE; } -int ShowHelp_64(long /*int*/ hwnd, long /*int*/ pszHelpFile, int uCommand, int dwData, long pt, long /*int*/ pDispatchObjectHit) { +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); @@ -504,7 +504,7 @@ int ShowHelp_64(long /*int*/ hwnd, long /*int*/ pszHelpFile, int uCommand, int d * ptMouse_x and ptMouse_y. Otherwise the Browser crashes when the user presses F1 to invoke * the help. */ -int ShowHelp(long /*int*/ hwnd, long /*int*/ pszHelpFile, int uCommand, int dwData, int ptMouse_x, int ptMouse_y, long /*int*/ pDispatchObjectHit) { +int ShowHelp(long hwnd, long pszHelpFile, int uCommand, int dwData, int ptMouse_x, int ptMouse_y, long pDispatchObjectHit) { Browser browser = (Browser)getParent().getParent(); Event event = new Event(); event.type = SWT.Help; @@ -525,35 +525,35 @@ int ShowHelp(long /*int*/ hwnd, long /*int*/ pszHelpFile, int uCommand, int dwDa /* IServiceProvider */ -int QueryService(long /*int*/ guidService, long /*int*/ riid, long /*int*/ ppvObject) { +int QueryService(long guidService, long riid, long ppvObject) { if (riid == 0 || ppvObject == 0) return COM.E_INVALIDARG; GUID guid = new GUID(); COM.MoveMemory(guid, riid, GUID.sizeof); if (COM.IsEqualGUID(guid, COM.IIDIInternetSecurityManager)) { - OS.MoveMemory(ppvObject, new long /*int*/[] {iInternetSecurityManager.getAddress()}, C.PTR_SIZEOF); + OS.MoveMemory(ppvObject, new long[] {iInternetSecurityManager.getAddress()}, C.PTR_SIZEOF); AddRef(); return COM.S_OK; } if (COM.IsEqualGUID(guid, COM.IIDIAuthenticate)) { - OS.MoveMemory(ppvObject, new long /*int*/[] {iAuthenticate.getAddress()}, C.PTR_SIZEOF); + OS.MoveMemory(ppvObject, new long[] {iAuthenticate.getAddress()}, C.PTR_SIZEOF); AddRef(); return COM.S_OK; } - OS.MoveMemory(ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF); + OS.MoveMemory(ppvObject, new long[] {0}, C.PTR_SIZEOF); return COM.E_NOINTERFACE; } /* IInternetSecurityManager */ -int SetSecuritySite(long /*int*/ pSite) { +int SetSecuritySite(long pSite) { return IE.INET_E_DEFAULT_ACTION; } -int GetSecuritySite(long /*int*/ ppSite) { +int GetSecuritySite(long ppSite) { return IE.INET_E_DEFAULT_ACTION; } -int MapUrlToZone(long /*int*/ pwszUrl, long /*int*/ pdwZone, int dwFlags) { +int MapUrlToZone(long pwszUrl, long pdwZone, int dwFlags) { /* * Feature in IE. HTML rendered in memory does not enable local links * but the same HTML document loaded through a local file is permitted @@ -567,11 +567,11 @@ int MapUrlToZone(long /*int*/ pwszUrl, long /*int*/ pdwZone, int dwFlags) { return IE.INET_E_DEFAULT_ACTION; } -int GetSecurityId(long /*int*/ pwszUrl, long /*int*/ pbSecurityId, long /*int*/ pcbSecurityId, long /*int*/ dwReserved) { +int GetSecurityId(long pwszUrl, long pbSecurityId, long pcbSecurityId, long dwReserved) { return IE.INET_E_DEFAULT_ACTION; } -int ProcessUrlAction(long /*int*/ pwszUrl, int dwAction, long /*int*/ pPolicy, int cbPolicy, long /*int*/ pContext, int cbContext, int dwFlags, int dwReserved) { +int ProcessUrlAction(long pwszUrl, int dwAction, long pPolicy, int cbPolicy, long pContext, int cbContext, int dwFlags, int dwReserved) { ignoreNextMessage = false; /* @@ -655,24 +655,24 @@ boolean canExecuteApplets () { return canExecuteApplets.booleanValue (); } -int QueryCustomPolicy(long /*int*/ pwszUrl, long /*int*/ guidKey, long /*int*/ ppPolicy, long /*int*/ pcbPolicy, long /*int*/ pContext, int cbContext, int dwReserved) { +int QueryCustomPolicy(long pwszUrl, long guidKey, long ppPolicy, long pcbPolicy, long pContext, int cbContext, int dwReserved) { return IE.INET_E_DEFAULT_ACTION; } -int SetZoneMapping(int dwZone, long /*int*/ lpszPattern, int dwFlags) { +int SetZoneMapping(int dwZone, long lpszPattern, int dwFlags) { return IE.INET_E_DEFAULT_ACTION; } -int GetZoneMappings(int dwZone, long /*int*/ ppenumString, int dwFlags) { +int GetZoneMappings(int dwZone, long ppenumString, int dwFlags) { return COM.E_NOTIMPL; } /* IOleCommandTarget */ -int QueryStatus(long /*int*/ pguidCmdGroup, int cCmds, long /*int*/ prgCmds, long /*int*/ pCmdText) { +int QueryStatus(long pguidCmdGroup, int cCmds, long prgCmds, long pCmdText) { return COM.E_NOTSUPPORTED; } -int Exec(long /*int*/ pguidCmdGroup, int nCmdID, int nCmdExecOpt, long /*int*/ pvaIn, long /*int*/ pvaOut) { +int Exec(long pguidCmdGroup, int nCmdID, int nCmdExecOpt, long pvaIn, long pvaOut) { if (pguidCmdGroup != 0) { GUID guid = new GUID(); COM.MoveMemory(guid, pguidCmdGroup, GUID.sizeof); @@ -701,7 +701,7 @@ int Exec(long /*int*/ pguidCmdGroup, int nCmdID, int nCmdExecOpt, long /*int*/ p /* IAuthenticate */ -int Authenticate (long /*int*/ hwnd, long /*int*/ szUsername, long /*int*/ szPassword) { +int Authenticate (long hwnd, long szUsername, long szPassword) { IE browser = (IE)((Browser)getParent ().getParent ()).webBrowser; for (int i = 0; i < browser.authenticationListeners.length; i++) { AuthenticationEvent event = new AuthenticationEvent (browser.browser); @@ -711,37 +711,37 @@ int Authenticate (long /*int*/ hwnd, long /*int*/ szUsername, long /*int*/ szPas if (event.user != null && event.password != null) { TCHAR user = new TCHAR (0, event.user, true); int size = user.length () * TCHAR.sizeof; - long /*int*/ userPtr = OS.CoTaskMemAlloc (size); + long userPtr = OS.CoTaskMemAlloc (size); OS.MoveMemory (userPtr, user, size); TCHAR password = new TCHAR (0, event.password, true); size = password.length () * TCHAR.sizeof; - long /*int*/ passwordPtr = OS.CoTaskMemAlloc (size); + long passwordPtr = OS.CoTaskMemAlloc (size); OS.MoveMemory (passwordPtr, password, size); - C.memmove (hwnd, new long /*int*/[] {0}, C.PTR_SIZEOF); - C.memmove (szUsername, new long /*int*/[] {userPtr}, C.PTR_SIZEOF); - C.memmove (szPassword, new long /*int*/[] {passwordPtr}, C.PTR_SIZEOF); + C.memmove (hwnd, new long[] {0}, C.PTR_SIZEOF); + C.memmove (szUsername, new long[] {userPtr}, C.PTR_SIZEOF); + C.memmove (szPassword, new long[] {passwordPtr}, C.PTR_SIZEOF); return COM.S_OK; } } /* no listener handled the challenge, so defer to the native dialog */ - C.memmove (hwnd, new long /*int*/[] {getShell().handle}, C.PTR_SIZEOF); + C.memmove (hwnd, new long[] {getShell().handle}, C.PTR_SIZEOF); return COM.S_OK; } /* IDispatch */ -int GetTypeInfoCount (long /*int*/ pctinfo) { +int GetTypeInfoCount (long pctinfo) { C.memmove (pctinfo, new int[] {0}, 4); return COM.S_OK; } -int GetTypeInfo (int iTInfo, int lcid, long /*int*/ ppTInfo) { +int GetTypeInfo (int iTInfo, int lcid, long ppTInfo) { return COM.S_OK; } -int GetIDsOfNames (int riid, long /*int*/ rgszNames, int cNames, int lcid, long /*int*/ rgDispId) { - long /*int*/[] ptr = new long /*int*/[1]; +int GetIDsOfNames (int riid, long rgszNames, int cNames, int lcid, long rgDispId) { + long[] ptr = new long[1]; OS.MoveMemory (ptr, rgszNames, C.PTR_SIZEOF); int length = OS.wcslen (ptr[0]); char[] buffer = new char[length]; @@ -763,12 +763,12 @@ int GetIDsOfNames (int riid, long /*int*/ rgszNames, int cNames, int lcid, long return result; } -int Invoke (int dispIdMember, long /*int*/ riid, int lcid, int dwFlags, long /*int*/ pDispParams, long /*int*/ pVarResult, long /*int*/ pExcepInfo, long /*int*/ pArgErr) { +int Invoke (int dispIdMember, long riid, int lcid, int dwFlags, long pDispParams, long pVarResult, long pExcepInfo, long pArgErr) { IE ie = (IE)((Browser)getParent ().getParent ()).webBrowser; Map<Integer, BrowserFunction> functions = ie.functions; if (functions == null) { if (pVarResult != 0) { - OS.MoveMemory (pVarResult, new long /*int*/[] {0}, C.PTR_SIZEOF); + OS.MoveMemory (pVarResult, new long[] {0}, C.PTR_SIZEOF); } return COM.S_OK; } @@ -777,17 +777,17 @@ int Invoke (int dispIdMember, long /*int*/ riid, int lcid, int dwFlags, long /*i COM.MoveMemory (dispParams, pDispParams, DISPPARAMS.sizeof); if (dispParams.cArgs != 3) { if (pVarResult != 0) { - OS.MoveMemory (pVarResult, new long /*int*/[] {0}, C.PTR_SIZEOF); + OS.MoveMemory (pVarResult, new long[] {0}, C.PTR_SIZEOF); } return COM.S_OK; } - long /*int*/ ptr = dispParams.rgvarg + 2 * Variant.sizeof; + long ptr = dispParams.rgvarg + 2 * Variant.sizeof; Variant variant = Variant.win32_new (ptr); if (variant.getType () != COM.VT_I4) { variant.dispose (); if (pVarResult != 0) { - OS.MoveMemory (pVarResult, new long /*int*/[] {0}, C.PTR_SIZEOF); + OS.MoveMemory (pVarResult, new long[] {0}, C.PTR_SIZEOF); } return COM.S_OK; } @@ -795,7 +795,7 @@ int Invoke (int dispIdMember, long /*int*/ riid, int lcid, int dwFlags, long /*i variant.dispose (); if (index <= 0) { if (pVarResult != 0) { - OS.MoveMemory (pVarResult, new long /*int*/[] {0}, C.PTR_SIZEOF); + OS.MoveMemory (pVarResult, new long[] {0}, C.PTR_SIZEOF); } return COM.S_OK; } @@ -806,7 +806,7 @@ int Invoke (int dispIdMember, long /*int*/ riid, int lcid, int dwFlags, long /*i if (type != COM.VT_BSTR) { variant.dispose (); if (pVarResult != 0) { - OS.MoveMemory (pVarResult, new long /*int*/[] {0}, C.PTR_SIZEOF); + OS.MoveMemory (pVarResult, new long[] {0}, C.PTR_SIZEOF); } return COM.S_OK; } @@ -963,14 +963,14 @@ Variant convertToJS (Object value) { Variant arrayType = ihtmlWindow2.getProperty (rgdispid[0]); ihtmlWindow2.dispose (); IDispatch arrayTypeDispatch = arrayType.getDispatch (); - long /*int*/[] result = new long /*int*/[1]; + long[] result = new long[1]; int rc = arrayTypeDispatch.QueryInterface (COM.IIDIDispatchEx, result); arrayType.dispose (); if (rc != COM.S_OK) return new Variant (); IDispatchEx arrayTypeDispatchEx = new IDispatchEx (result[0]); result[0] = 0; - long /*int*/ resultPtr = OS.GlobalAlloc (OS.GMEM_FIXED | OS.GMEM_ZEROINIT, VARIANT.sizeof); + long resultPtr = OS.GlobalAlloc (OS.GMEM_FIXED | OS.GMEM_ZEROINIT, VARIANT.sizeof); DISPPARAMS params = new DISPPARAMS (); rc = arrayTypeDispatchEx.InvokeEx (COM.DISPID_VALUE, COM.LOCALE_USER_DEFAULT, COM.DISPATCH_CONSTRUCT, params, resultPtr, null, 0); if (rc != COM.S_OK) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/ByteArrayTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/ByteArrayTransfer.java index a0c13fb230..3dee95c0eb 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/ByteArrayTransfer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/ByteArrayTransfer.java @@ -172,7 +172,7 @@ protected void javaToNative (Object object, TransferData transferData) { // The caller of this method must release the data when it is done with it. byte[] data = (byte[])object; int size = data.length; - long /*int*/ newPtr = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, size); + long newPtr = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, size); OS.MoveMemory(newPtr, data, size); transferData.stgmedium = new STGMEDIUM(); transferData.stgmedium.tymed = COM.TYMED_HGLOBAL; @@ -203,10 +203,10 @@ protected Object nativeToJava(TransferData transferData) { transferData.result = getData(data, formatetc, stgmedium); data.Release(); if (transferData.result != COM.S_OK) return null; - long /*int*/ hMem = stgmedium.unionField; + long hMem = stgmedium.unionField; int size = OS.GlobalSize(hMem); byte[] buffer = new byte[size]; - long /*int*/ ptr = OS.GlobalLock(hMem); + long ptr = OS.GlobalLock(hMem); OS.MoveMemory(buffer, ptr, size); OS.GlobalUnlock(hMem); OS.GlobalFree(hMem); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/Clipboard.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/Clipboard.java index 7a5ef22c0c..67b9b4b7eb 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/Clipboard.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/Clipboard.java @@ -319,7 +319,7 @@ public Object getContents(Transfer transfer, int clipboards) { * the clipboard, use PeekMessage() to enable cross thread * message sends. */ - long /*int*/[] ppv = new long /*int*/[1]; + long[] ppv = new long[1]; int retryCount = 0; /* OleGetClipboard([out] ppDataObject). * AddRef has already been called on ppDataObject by the callee and must be released by the caller. @@ -522,20 +522,20 @@ private void createCOMInterfaces() { // register each of the interfaces that this object implements iDataObject = new COMObject(new int[]{2, 0, 0, 2, 2, 1, 2, 3, 2, 4, 1, 1}){ @Override - public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long method0(long[] args) {return QueryInterface(args[0], args[1]);} @Override - public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long method1(long[] args) {return AddRef();} @Override - public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long method2(long[] args) {return Release();} @Override - public long /*int*/ method3(long /*int*/[] args) {return GetData(args[0], args[1]);} + public long method3(long[] args) {return GetData(args[0], args[1]);} // method4 GetDataHere - not implemented @Override - public long /*int*/ method5(long /*int*/[] args) {return QueryGetData(args[0]);} + public long method5(long[] args) {return QueryGetData(args[0]);} // method6 GetCanonicalFormatEtc - not implemented // method7 SetData - not implemented @Override - public long /*int*/ method8(long /*int*/[] args) {return EnumFormatEtc((int)/*64*/args[0], args[1]);} + public long method8(long[] args) {return EnumFormatEtc((int)args[0], args[1]);} // method9 DAdvise - not implemented // method10 DUnadvise - not implemented // method11 EnumDAdvise - not implemented @@ -551,7 +551,7 @@ private void disposeCOMInterfaces() { * Ownership of ppenumFormatetc transfers from callee to caller so reference count on ppenumFormatetc * must be incremented before returning. Caller is responsible for releasing ppenumFormatetc. */ -private int EnumFormatEtc(int dwDirection, long /*int*/ ppenumFormatetc) { +private int EnumFormatEtc(int dwDirection, long ppenumFormatetc) { // only allow getting of data - SetData is not currently supported if (dwDirection == COM.DATADIR_SET) return COM.E_NOTIMPL; // what types have been registered? @@ -577,10 +577,10 @@ private int EnumFormatEtc(int dwDirection, long /*int*/ ppenumFormatetc) { dropeffect.tymed = COM.TYMED_HGLOBAL; formats[formats.length -1] = dropeffect; enumFORMATETC.setFormats(formats); - OS.MoveMemory(ppenumFormatetc, new long /*int*/[] {enumFORMATETC.getAddress()}, C.PTR_SIZEOF); + OS.MoveMemory(ppenumFormatetc, new long[] {enumFORMATETC.getAddress()}, C.PTR_SIZEOF); return COM.S_OK; } -private int GetData(long /*int*/ pFormatetc, long /*int*/ pmedium) { +private int GetData(long pFormatetc, long pmedium) { /* Called by a data consumer to obtain data from a source data object. The GetData method renders the data described in the specified FORMATETC structure and transfers it through the specified STGMEDIUM structure. @@ -622,7 +622,7 @@ private int GetData(long /*int*/ pFormatetc, long /*int*/ pmedium) { return transferData.result; } -private int QueryGetData(long /*int*/ pFormatetc) { +private int QueryGetData(long pFormatetc) { if (transferAgents == null) return COM.E_FAIL; TransferData transferData = new TransferData(); transferData.formatetc = new FORMATETC(); @@ -641,16 +641,16 @@ private int QueryGetData(long /*int*/ pFormatetc) { * Ownership of ppvObject transfers from callee to caller so reference count on ppvObject * must be incremented before returning. Caller is responsible for releasing ppvObject. */ -private int QueryInterface(long /*int*/ riid, long /*int*/ ppvObject) { +private int QueryInterface(long riid, long ppvObject) { if (riid == 0 || ppvObject == 0) return COM.E_INVALIDARG; GUID guid = new GUID(); COM.MoveMemory(guid, riid, GUID.sizeof); if (COM.IsEqualGUID(guid, COM.IIDIUnknown) || COM.IsEqualGUID(guid, COM.IIDIDataObject) ) { - OS.MoveMemory(ppvObject, new long /*int*/[] {iDataObject.getAddress()}, C.PTR_SIZEOF); + OS.MoveMemory(ppvObject, new long[] {iDataObject.getAddress()}, C.PTR_SIZEOF); AddRef(); return COM.S_OK; } - OS.MoveMemory(ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF); + OS.MoveMemory(ppvObject, new long[] {0}, C.PTR_SIZEOF); return COM.E_NOINTERFACE; } private int Release() { @@ -775,13 +775,13 @@ public String[] getAvailableTypeNames() { private FORMATETC[] _getAvailableTypes() { FORMATETC[] types = new FORMATETC[0]; - long /*int*/[] ppv = new long /*int*/[1]; + long[] ppv = new long[1]; /* OleGetClipboard([out] ppDataObject). * AddRef has already been called on ppDataObject by the callee and must be released by the caller. */ if (COM.OleGetClipboard(ppv) != COM.S_OK) return types; IDataObject dataObject = new IDataObject(ppv[0]); - long /*int*/[] ppFormatetc = new long /*int*/[1]; + long[] ppFormatetc = new long[1]; /* EnumFormatEtc([in] dwDirection, [out] ppenumFormatetc) * AddRef has already been called on ppenumFormatetc by the callee and must be released by the caller. */ @@ -790,7 +790,7 @@ private FORMATETC[] _getAvailableTypes() { if (rc != COM.S_OK)return types; IEnumFORMATETC enumFormatetc = new IEnumFORMATETC(ppFormatetc[0]); // Loop over enumerator and save any types that match what we are looking for - long /*int*/ rgelt = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, FORMATETC.sizeof); + long rgelt = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, FORMATETC.sizeof); int[] pceltFetched = new int[1]; enumFormatetc.Reset(); while (enumFormatetc.Next(1, rgelt, pceltFetched) == COM.S_OK && pceltFetched[0] == 1) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DragSource.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DragSource.java index 544fbac79b..8d509da04a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DragSource.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DragSource.java @@ -111,7 +111,7 @@ public class DragSource extends Widget { Transfer[] transferAgents = new Transfer[0]; DragSourceEffect dragEffect; Composite topControl; - long /*int*/ hwndDrag; + long hwndDrag; // ole interfaces COMObject iDropSource; @@ -244,34 +244,34 @@ private void createCOMInterfaces() { // register each of the interfaces that this object implements iDropSource = new COMObject(new int[]{2, 0, 0, 2, 1}){ @Override - public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long method0(long[] args) {return QueryInterface(args[0], args[1]);} @Override - public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long method1(long[] args) {return AddRef();} @Override - public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long method2(long[] args) {return Release();} @Override - public long /*int*/ method3(long /*int*/[] args) {return QueryContinueDrag((int)/*64*/args[0], (int)/*64*/args[1]);} + public long method3(long[] args) {return QueryContinueDrag((int)args[0], (int)args[1]);} @Override - public long /*int*/ method4(long /*int*/[] args) {return GiveFeedback((int)/*64*/args[0]);} + public long method4(long[] args) {return GiveFeedback((int)args[0]);} }; iDataObject = new COMObject(new int[]{2, 0, 0, 2, 2, 1, 2, 3, 2, 4, 1, 1}){ @Override - public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long method0(long[] args) {return QueryInterface(args[0], args[1]);} @Override - public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long method1(long[] args) {return AddRef();} @Override - public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long method2(long[] args) {return Release();} @Override - public long /*int*/ method3(long /*int*/[] args) {return GetData(args[0], args[1]);} + public long method3(long[] args) {return GetData(args[0], args[1]);} // method4 GetDataHere - not implemented @Override - public long /*int*/ method5(long /*int*/[] args) {return QueryGetData(args[0]);} + public long method5(long[] args) {return QueryGetData(args[0]);} // method6 GetCanonicalFormatEtc - not implemented @Override - public long /*int*/ method7(long /*int*/[] args) {return SetData(args[0], args[1], (int)/*64*/args[2]);} + public long method7(long[] args) {return SetData(args[0], args[1], (int)args[2]);} @Override - public long /*int*/ method8(long /*int*/[] args) {return EnumFormatEtc((int)/*64*/args[0], args[1]);} + public long method8(long[] args) {return EnumFormatEtc((int)args[0], args[1]);} // method9 DAdvise - not implemented // method10 DUnadvise - not implemented // method11 EnumDAdvise - not implemented @@ -401,7 +401,7 @@ private void drag(Event dragEvent) { * Ownership of ppenumFormatetc transfers from callee to caller so reference count on ppenumFormatetc * must be incremented before returning. Caller is responsible for releasing ppenumFormatetc. */ -private int EnumFormatEtc(int dwDirection, long /*int*/ ppenumFormatetc) { +private int EnumFormatEtc(int dwDirection, long ppenumFormatetc) { // only allow getting of data - SetData is not currently supported if (dwDirection == COM.DATADIR_SET) return COM.E_NOTIMPL; @@ -427,7 +427,7 @@ private int EnumFormatEtc(int dwDirection, long /*int*/ ppenumFormatetc) { } enumFORMATETC.setFormats(formats); - OS.MoveMemory(ppenumFormatetc, new long /*int*/[] {enumFORMATETC.getAddress()}, C.PTR_SIZEOF); + OS.MoveMemory(ppenumFormatetc, new long[] {enumFORMATETC.getAddress()}, C.PTR_SIZEOF); return COM.S_OK; } /** @@ -440,7 +440,7 @@ public Control getControl() { return control; } -private int GetData(long /*int*/ pFormatetc, long /*int*/ pmedium) { +private int GetData(long pFormatetc, long pmedium) { /* Called by a data consumer to obtain data from a source data object. The GetData method renders the data described in the specified FORMATETC structure and transfers it through the specified STGMEDIUM structure. @@ -615,7 +615,7 @@ private int osToOp(int osOperation){ return operation; } -private int QueryGetData(long /*int*/ pFormatetc) { +private int QueryGetData(long pFormatetc) { if (transferAgents == null) return COM.E_FAIL; TransferData transferData = new TransferData(); transferData.formatetc = new FORMATETC(); @@ -636,25 +636,25 @@ private int QueryGetData(long /*int*/ pFormatetc) { * Ownership of ppvObject transfers from callee to caller so reference count on ppvObject * must be incremented before returning. Caller is responsible for releasing ppvObject. */ -private int QueryInterface(long /*int*/ riid, long /*int*/ ppvObject) { +private int QueryInterface(long riid, long ppvObject) { if (riid == 0 || ppvObject == 0) return COM.E_INVALIDARG; GUID guid = new GUID(); COM.MoveMemory(guid, riid, GUID.sizeof); if (COM.IsEqualGUID(guid, COM.IIDIUnknown) || COM.IsEqualGUID(guid, COM.IIDIDropSource)) { - OS.MoveMemory(ppvObject, new long /*int*/[] {iDropSource.getAddress()}, C.PTR_SIZEOF); + OS.MoveMemory(ppvObject, new long[] {iDropSource.getAddress()}, C.PTR_SIZEOF); AddRef(); return COM.S_OK; } if (COM.IsEqualGUID(guid, COM.IIDIDataObject) ) { - OS.MoveMemory(ppvObject, new long /*int*/[] {iDataObject.getAddress()}, C.PTR_SIZEOF); + OS.MoveMemory(ppvObject, new long[] {iDataObject.getAddress()}, C.PTR_SIZEOF); AddRef(); return COM.S_OK; } - OS.MoveMemory(ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF); + OS.MoveMemory(ppvObject, new long[] {0}, C.PTR_SIZEOF); return COM.E_NOINTERFACE; } @@ -694,7 +694,7 @@ public void removeDragListener(DragSourceListener listener) { removeListener(DND.DragEnd, listener); } -private int SetData(long /*int*/ pFormatetc, long /*int*/ pmedium, int fRelease) { +private int SetData(long pFormatetc, long pmedium, int fRelease) { if (pFormatetc == 0 || pmedium == 0) return COM.E_INVALIDARG; FORMATETC formatetc = new FORMATETC(); COM.MoveMemory(formatetc, pFormatetc, FORMATETC.sizeof); @@ -702,7 +702,7 @@ private int SetData(long /*int*/ pFormatetc, long /*int*/ pmedium, int fRelease) STGMEDIUM stgmedium = new STGMEDIUM(); COM.MoveMemory(stgmedium, pmedium,STGMEDIUM.sizeof); //TODO - this should be GlobalLock() - long /*int*/[] ptrEffect = new long /*int*/[1]; + long[] ptrEffect = new long[1]; OS.MoveMemory(ptrEffect, stgmedium.unionField, C.PTR_SIZEOF); int[] effect = new int[1]; OS.MoveMemory(effect, ptrEffect[0], 4); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DropTarget.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DropTarget.java index c97521a27c..177e3827bc 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DropTarget.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DropTarget.java @@ -234,35 +234,35 @@ void createCOMInterfaces() { boolean is32 = C.PTR_SIZEOF == 4; iDropTarget = new COMObject(new int[]{2, 0, 0, is32 ? 5 : 4, is32 ? 4 : 3, 0, is32 ? 5 : 4}){ @Override - public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long method0(long[] args) {return QueryInterface(args[0], args[1]);} @Override - public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long method1(long[] args) {return AddRef();} @Override - public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long method2(long[] args) {return Release();} @Override - public long /*int*/ method3(long /*int*/[] args) { + public long method3(long[] args) { if (args.length == 5) { - return DragEnter(args[0], (int)/*64*/args[1], (int)/*64*/args[2], (int)/*64*/args[3], args[4]); + return DragEnter(args[0], (int)args[1], (int)args[2], (int)args[3], args[4]); } else { - return DragEnter_64(args[0], (int)/*64*/args[1], args[2], args[3]); + return DragEnter_64(args[0], (int)args[1], args[2], args[3]); } } @Override - public long /*int*/ method4(long /*int*/[] args) { + public long method4(long[] args) { if (args.length == 4) { - return DragOver((int)/*64*/args[0], (int)/*64*/args[1], (int)/*64*/args[2], args[3]); + return DragOver((int)args[0], (int)args[1], (int)args[2], args[3]); } else { - return DragOver_64((int)/*64*/args[0], args[1], args[2]); + return DragOver_64((int)args[0], args[1], args[2]); } } @Override - public long /*int*/ method5(long /*int*/[] args) {return DragLeave();} + public long method5(long[] args) {return DragLeave();} @Override - public long /*int*/ method6(long /*int*/[] args) { + public long method6(long[] args) { if (args.length == 5) { - return Drop(args[0], (int)/*64*/args[1], (int)/*64*/args[2], (int)/*64*/args[3], args[4]); + return Drop(args[0], (int)args[1], (int)args[2], (int)args[3], args[4]); } else { - return Drop_64(args[0], (int)/*64*/args[1], args[2], args[3]); + return Drop_64(args[0], (int)args[1], args[2], args[3]); } } }; @@ -274,13 +274,13 @@ void disposeCOMInterfaces() { iDropTarget = null; } -int DragEnter_64(long /*int*/ pDataObject, int grfKeyState, long pt, long /*int*/ pdwEffect) { +int DragEnter_64(long pDataObject, int grfKeyState, long pt, long pdwEffect) { POINT point = new POINT(); OS.MoveMemory(point, new long[]{pt}, 8); return DragEnter(pDataObject, grfKeyState, point.x, point.y, pdwEffect); } -int DragEnter(long /*int*/ pDataObject, int grfKeyState, int pt_x, int pt_y, long /*int*/ pdwEffect) { +int DragEnter(long pDataObject, int grfKeyState, int pt_x, int pt_y, long pdwEffect) { pt_x = DPIUtil.autoScaleDown(pt_x);// To Points pt_y = DPIUtil.autoScaleDown(pt_y);// To Points selectedDataType = null; @@ -341,13 +341,13 @@ int DragLeave() { return COM.S_OK; } -int DragOver_64(int grfKeyState, long pt, long /*int*/ pdwEffect) { +int DragOver_64(int grfKeyState, long pt, long pdwEffect) { POINT point = new POINT(); OS.MoveMemory(point, new long[]{pt}, 8); return DragOver(grfKeyState, point.x, point.y, pdwEffect); } -int DragOver(int grfKeyState, int pt_x, int pt_y, long /*int*/ pdwEffect) { +int DragOver(int grfKeyState, int pt_x, int pt_y, long pdwEffect) { pt_x = DPIUtil.autoScaleDown(pt_x);// To Points pt_y = DPIUtil.autoScaleDown(pt_y);// To Points if (iDataObject == null) return COM.S_FALSE; @@ -395,13 +395,13 @@ int DragOver(int grfKeyState, int pt_x, int pt_y, long /*int*/ pdwEffect) { return COM.S_OK; } -int Drop_64(long /*int*/ pDataObject, int grfKeyState, long pt, long /*int*/ pdwEffect) { +int Drop_64(long pDataObject, int grfKeyState, long pt, long pdwEffect) { POINT point = new POINT(); OS.MoveMemory(point, new long[]{pt}, 8); return Drop(pDataObject, grfKeyState, point.x, point.y, pdwEffect); } -int Drop(long /*int*/ pDataObject, int grfKeyState, int pt_x, int pt_y, long /*int*/ pdwEffect) { +int Drop(long pDataObject, int grfKeyState, int pt_x, int pt_y, long pdwEffect) { pt_x = DPIUtil.autoScaleDown(pt_x);// To Points pt_y = DPIUtil.autoScaleDown(pt_y);// To Points DNDEvent event = new DNDEvent(); @@ -619,19 +619,19 @@ int osToOp(int osOperation){ * Ownership of ppvObject transfers from callee to caller so reference count on ppvObject * must be incremented before returning. Caller is responsible for releasing ppvObject. */ -int QueryInterface(long /*int*/ riid, long /*int*/ ppvObject) { +int QueryInterface(long riid, long ppvObject) { if (riid == 0 || ppvObject == 0) return COM.E_INVALIDARG; GUID guid = new GUID(); COM.MoveMemory(guid, riid, GUID.sizeof); if (COM.IsEqualGUID(guid, COM.IIDIUnknown) || COM.IsEqualGUID(guid, COM.IIDIDropTarget)) { - OS.MoveMemory(ppvObject, new long /*int*/[] {iDropTarget.getAddress()}, C.PTR_SIZEOF); + OS.MoveMemory(ppvObject, new long[] {iDropTarget.getAddress()}, C.PTR_SIZEOF); AddRef(); return COM.S_OK; } - OS.MoveMemory(ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF); + OS.MoveMemory(ppvObject, new long[] {0}, C.PTR_SIZEOF); return COM.E_NOINTERFACE; } @@ -650,7 +650,7 @@ int Release() { void refresh() { if (control == null || control.isDisposed()) return; - long /*int*/ handle = control.handle; + long handle = control.handle; RECT lpRect = new RECT(); if (OS.GetUpdateRect(handle, lpRect, false)) { OS.ImageList_DragShowNolock(false); @@ -700,7 +700,7 @@ public void setDropTargetEffect(DropTargetEffect effect) { dropEffect = effect; } -boolean setEventData(DNDEvent event, long /*int*/ pDataObject, int grfKeyState, int pt_x, int pt_y, long /*int*/ pdwEffect) { +boolean setEventData(DNDEvent event, long pDataObject, int grfKeyState, int pt_x, int pt_y, long pdwEffect) { if (pDataObject == 0 || pdwEffect == 0) return false; // get allowed operations @@ -726,14 +726,14 @@ boolean setEventData(DNDEvent event, long /*int*/ pDataObject, int grfKeyState, IDataObject dataObject = new IDataObject(pDataObject); dataObject.AddRef(); try { - long /*int*/[] address = new long /*int*/[1]; + long[] address = new long[1]; if (dataObject.EnumFormatEtc(COM.DATADIR_GET, address) != COM.S_OK) { return false; } IEnumFORMATETC enumFormatetc = new IEnumFORMATETC(address[0]); try { // Loop over enumerator and save any types that match what we are looking for - long /*int*/ rgelt = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, FORMATETC.sizeof); + long rgelt = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, FORMATETC.sizeof); try { int[] pceltFetched = new int[1]; enumFormatetc.Reset(); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/FileTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/FileTransfer.java index caab8e35bd..7f6ecfcf6f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/FileTransfer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/FileTransfer.java @@ -87,7 +87,7 @@ public void javaToNative(Object object, TransferData transferData) { // Allocate the memory because the caller (DropTarget) has not handed it in // The caller of this method must release the data when it is done with it. int byteCount = buffer.length * TCHAR.sizeof; - long /*int*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, DROPFILES.sizeof + byteCount); + long newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, DROPFILES.sizeof + byteCount); OS.MoveMemory(newPtr, dropfiles, DROPFILES.sizeof); OS.MoveMemory(newPtr + DROPFILES.sizeof, buffer, byteCount); transferData.stgmedium = new STGMEDIUM(); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/HTMLTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/HTMLTransfer.java index 313c54e01a..552ec74229 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/HTMLTransfer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/HTMLTransfer.java @@ -112,7 +112,7 @@ public void javaToNative (Object object, TransferData transferData){ chars = new char[count + 1]; buffer.getChars(0, count, chars, 0); cchMultiByte = OS.WideCharToMultiByte(OS.CP_UTF8, 0, chars, -1, null, 0, null, null); - long /*int*/ lpMultiByteStr = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, cchMultiByte); + long lpMultiByteStr = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, cchMultiByte); OS.WideCharToMultiByte(OS.CP_UTF8, 0, chars, -1, lpMultiByteStr, cchMultiByte, null, null); transferData.stgmedium = new STGMEDIUM(); transferData.stgmedium.tymed = COM.TYMED_HGLOBAL; @@ -143,10 +143,10 @@ public Object nativeToJava(TransferData transferData){ transferData.result = getData(data, formatetc, stgmedium); data.Release(); if (transferData.result != COM.S_OK) return null; - long /*int*/ hMem = stgmedium.unionField; + long hMem = stgmedium.unionField; try { - long /*int*/ lpMultiByteStr = OS.GlobalLock(hMem); + long lpMultiByteStr = OS.GlobalLock(hMem); if (lpMultiByteStr == 0) return null; try { /* NOTE: CF_HTML uses UTF-8 encoding. diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/ImageTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/ImageTransfer.java index 8fafa289d4..f5e21ec2a6 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/ImageTransfer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/ImageTransfer.java @@ -101,9 +101,9 @@ public void javaToNative(Object object, TransferData transferData) { offset += 4; } } - long /*int*/ newPtr = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, BITMAPINFOHEADER.sizeof + colorSize + imageSize); + long newPtr = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, BITMAPINFOHEADER.sizeof + colorSize + imageSize); OS.MoveMemory(newPtr, bmi, bmi.length); - long /*int*/ pBitDest = newPtr + BITMAPINFOHEADER.sizeof + colorSize; + long pBitDest = newPtr + BITMAPINFOHEADER.sizeof + colorSize; if (imageHeight <= 0) { OS.MoveMemory(pBitDest, imgData.data, imageSize); @@ -152,18 +152,18 @@ public Object nativeToJava(TransferData transferData) { transferData.result = getData(dataObject, formatetc, stgmedium); if (transferData.result != COM.S_OK) return null; - long /*int*/ hMem = stgmedium.unionField; + long hMem = stgmedium.unionField; dataObject.Release(); try { - long /*int*/ ptr = OS.GlobalLock(hMem); + long ptr = OS.GlobalLock(hMem); if (ptr == 0) return null; try { BITMAPINFOHEADER bmiHeader = new BITMAPINFOHEADER(); OS.MoveMemory(bmiHeader, ptr, BITMAPINFOHEADER.sizeof); - long /*int*/[] pBits = new long /*int*/[1]; - long /*int*/ memDib = OS.CreateDIBSection(0, ptr, OS.DIB_RGB_COLORS, pBits, 0, 0); + long[] pBits = new long[1]; + long memDib = OS.CreateDIBSection(0, ptr, OS.DIB_RGB_COLORS, pBits, 0, 0); if (memDib == 0) SWT.error(SWT.ERROR_NO_HANDLES); - long /*int*/ bits = ptr + bmiHeader.biSize; + long bits = ptr + bmiHeader.biSize; if (bmiHeader.biBitCount <= 8) { bits += (bmiHeader.biClrUsed == 0 ? (1 << bmiHeader.biBitCount) : bmiHeader.biClrUsed) * 4; } else if (bmiHeader.biCompression == OS.BI_BITFIELDS) { @@ -176,8 +176,8 @@ public Object nativeToJava(TransferData transferData) { OS.GetObject(memDib, DIBSECTION.sizeof, dib); int biHeight = dib.biHeight; int scanline = dib.biSizeImage / biHeight; - long /*int*/ pDestBits = pBits[0]; - long /*int*/ pSourceBits = bits + scanline * (biHeight - 1); + long pDestBits = pBits[0]; + long pSourceBits = bits + scanline * (biHeight - 1); for (int i = 0; i < biHeight; i++) { OS.MoveMemory(pDestBits, pSourceBits, scanline); pDestBits += scanline; diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/OleEnumFORMATETC.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/OleEnumFORMATETC.java index dce84b050b..cb7278f958 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/OleEnumFORMATETC.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/OleEnumFORMATETC.java @@ -38,17 +38,17 @@ int AddRef() { private void createCOMInterfaces() { iEnumFORMATETC = new COMObject(new int[] {2, 0, 0, 3, 1, 0, 1}){ @Override - public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long method0(long[] args) {return QueryInterface(args[0], args[1]);} @Override - public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long method1(long[] args) {return AddRef();} @Override - public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long method2(long[] args) {return Release();} @Override - public long /*int*/ method3(long /*int*/[] args) {return Next((int)/*64*/args[0], args[1], args[2]);} + public long method3(long[] args) {return Next((int)args[0], args[1], args[2]);} @Override - public long /*int*/ method4(long /*int*/[] args) {return Skip((int)/*64*/args[0]);} + public long method4(long[] args) {return Skip((int)args[0]);} @Override - public long /*int*/ method5(long /*int*/[] args) {return Reset();} + public long method5(long[] args) {return Reset();} // method6 Clone - not implemented }; } @@ -57,7 +57,7 @@ private void disposeCOMInterfaces() { iEnumFORMATETC.dispose(); iEnumFORMATETC = null; } -long /*int*/ getAddress() { +long getAddress() { return iEnumFORMATETC.getAddress(); } private FORMATETC[] getNextItems(int numItems){ @@ -76,7 +76,7 @@ private FORMATETC[] getNextItems(int numItems){ return items; } -private int Next(int celt, long /*int*/ rgelt, long /*int*/ pceltFetched) { +private int Next(int celt, long rgelt, long pceltFetched) { /* Retrieves the next celt items in the enumeration sequence. If there are fewer than the requested number of elements left in the sequence, it retrieves the remaining elements. @@ -106,7 +106,7 @@ private int Next(int celt, long /*int*/ rgelt, long /*int*/ pceltFetched) { } return COM.S_FALSE; } -private int QueryInterface(long /*int*/ riid, long /*int*/ ppvObject) { +private int QueryInterface(long riid, long ppvObject) { if (riid == 0 || ppvObject == 0) return COM.E_NOINTERFACE; @@ -114,11 +114,11 @@ private int QueryInterface(long /*int*/ riid, long /*int*/ ppvObject) { COM.MoveMemory(guid, riid, GUID.sizeof); if (COM.IsEqualGUID(guid, COM.IIDIUnknown) || COM.IsEqualGUID(guid, COM.IIDIEnumFORMATETC)) { - OS.MoveMemory(ppvObject, new long /*int*/[] {iEnumFORMATETC.getAddress()}, C.PTR_SIZEOF); + OS.MoveMemory(ppvObject, new long[] {iEnumFORMATETC.getAddress()}, C.PTR_SIZEOF); AddRef(); return COM.S_OK; } - OS.MoveMemory(ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF); + OS.MoveMemory(ppvObject, new long[] {0}, C.PTR_SIZEOF); return COM.E_NOINTERFACE; } int Release() { diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/RTFTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/RTFTransfer.java index 48929ebca6..ab1fbb1f8d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/RTFTransfer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/RTFTransfer.java @@ -74,7 +74,7 @@ public void javaToNative (Object object, TransferData transferData){ transferData.result = COM.DV_E_STGMEDIUM; return; } - long /*int*/ lpMultiByteStr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, cchMultiByte); + long lpMultiByteStr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, cchMultiByte); OS.WideCharToMultiByte(codePage, 0, chars, -1, lpMultiByteStr, cchMultiByte, null, null); transferData.stgmedium = new STGMEDIUM(); transferData.stgmedium.tymed = COM.TYMED_HGLOBAL; @@ -105,9 +105,9 @@ public Object nativeToJava(TransferData transferData){ transferData.result = getData(data, formatetc, stgmedium); data.Release(); if (transferData.result != COM.S_OK) return null; - long /*int*/ hMem = stgmedium.unionField; + long hMem = stgmedium.unionField; try { - long /*int*/ lpMultiByteStr = OS.GlobalLock(hMem); + long lpMultiByteStr = OS.GlobalLock(hMem); if (lpMultiByteStr == 0) return null; try { int codePage = OS.GetACP(); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TableDragSourceEffect.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TableDragSourceEffect.java index ba16e8c618..8eac76a342 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TableDragSourceEffect.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TableDragSourceEffect.java @@ -94,7 +94,7 @@ public class TableDragSourceEffect extends DragSourceEffect { event.offsetX = shdi.ptOffset.x; } event.offsetY = shdi.ptOffset.y; - long /*int*/ hImage = shdi.hbmpDragImage; + long hImage = shdi.hbmpDragImage; if (hImage != 0) { BITMAP bm = new BITMAP (); OS.GetObject (hImage, BITMAP.sizeof, bm); @@ -102,10 +102,10 @@ public class TableDragSourceEffect extends DragSourceEffect { int srcHeight = bm.bmHeight; /* Create resources */ - long /*int*/ hdc = OS.GetDC (0); - long /*int*/ srcHdc = OS.CreateCompatibleDC (hdc); - long /*int*/ oldSrcBitmap = OS.SelectObject (srcHdc, hImage); - long /*int*/ memHdc = OS.CreateCompatibleDC (hdc); + long hdc = OS.GetDC (0); + long srcHdc = OS.CreateCompatibleDC (hdc); + long oldSrcBitmap = OS.SelectObject (srcHdc, hImage); + long memHdc = OS.CreateCompatibleDC (hdc); BITMAPINFOHEADER bmiHeader = new BITMAPINFOHEADER (); bmiHeader.biSize = BITMAPINFOHEADER.sizeof; bmiHeader.biWidth = srcWidth; @@ -115,10 +115,10 @@ public class TableDragSourceEffect extends DragSourceEffect { bmiHeader.biCompression = OS.BI_RGB; byte [] bmi = new byte[BITMAPINFOHEADER.sizeof]; OS.MoveMemory (bmi, bmiHeader, BITMAPINFOHEADER.sizeof); - long /*int*/ [] pBits = new long /*int*/ [1]; - long /*int*/ memDib = OS.CreateDIBSection (0, bmi, OS.DIB_RGB_COLORS, pBits, 0, 0); + long [] pBits = new long [1]; + long memDib = OS.CreateDIBSection (0, bmi, OS.DIB_RGB_COLORS, pBits, 0, 0); if (memDib == 0) SWT.error (SWT.ERROR_NO_HANDLES); - long /*int*/ oldMemBitmap = OS.SelectObject (memHdc, memDib); + long oldMemBitmap = OS.SelectObject (memHdc, memDib); BITMAP dibBM = new BITMAP (); OS.GetObject (memDib, BITMAP.sizeof, dibBM); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TableDropTargetEffect.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TableDropTargetEffect.java index adbb966ee2..42cb9d6b8f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TableDropTargetEffect.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TableDropTargetEffect.java @@ -110,7 +110,7 @@ public class TableDropTargetEffect extends DropTargetEffect { @Override public void dragLeave(DropTargetEvent event) { Table table = (Table) control; - long /*int*/ handle = table.handle; + long handle = table.handle; if (dropHighlight != null) { LVITEM lvItem = new LVITEM (); lvItem.stateMask = OS.LVIS_DROPHILITED; @@ -149,7 +149,7 @@ public class TableDropTargetEffect extends DropTargetEffect { public void dragOver(DropTargetEvent event) { Table table = (Table) getControl(); int effect = checkEffect(event.feedback); - long /*int*/ handle = table.handle; + long handle = table.handle; Point coordinates = new Point(event.x, event.y); coordinates = DPIUtil.autoScaleUp(table.toControl(coordinates)); // To Pixels LVHITTESTINFO pinfo = new LVHITTESTINFO(); @@ -162,8 +162,8 @@ public class TableDropTargetEffect extends DropTargetEffect { } else { if (pinfo.iItem != -1 && scrollIndex == pinfo.iItem && scrollBeginTime != 0) { if (System.currentTimeMillis() >= scrollBeginTime) { - int top = Math.max (0, (int)/*64*/OS.SendMessage (handle, OS.LVM_GETTOPINDEX, 0, 0)); - int count = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + int top = Math.max (0, (int)OS.SendMessage (handle, OS.LVM_GETTOPINDEX, 0, 0)); + int count = (int)OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); int index = (scrollIndex - 1 < top) ? Math.max(0, scrollIndex - 1) : Math.min(count - 1, scrollIndex + 1); boolean scroll = true; if (pinfo.iItem == top) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TextTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TextTransfer.java index af2fdef685..c9c233ecee 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TextTransfer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TextTransfer.java @@ -78,7 +78,7 @@ public void javaToNative (Object object, TransferData transferData){ char[] chars = new char[charCount+1]; string.getChars (0, charCount, chars, 0); int byteCount = chars.length * 2; - long /*int*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, byteCount); + long newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, byteCount); OS.MoveMemory(newPtr, chars, byteCount); transferData.stgmedium = new STGMEDIUM(); transferData.stgmedium.tymed = COM.TYMED_HGLOBAL; @@ -98,7 +98,7 @@ public void javaToNative (Object object, TransferData transferData){ transferData.result = COM.DV_E_STGMEDIUM; return; } - long /*int*/ lpMultiByteStr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, cchMultiByte); + long lpMultiByteStr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, cchMultiByte); OS.WideCharToMultiByte(codePage, 0, chars, -1, lpMultiByteStr, cchMultiByte, null, null); transferData.stgmedium = new STGMEDIUM(); transferData.stgmedium.tymed = COM.TYMED_HGLOBAL; @@ -132,7 +132,7 @@ public Object nativeToJava(TransferData transferData){ transferData.result = getData(data, formatetc, stgmedium); data.Release(); if (transferData.result != COM.S_OK) return null; - long /*int*/ hMem = stgmedium.unionField; + long hMem = stgmedium.unionField; try { switch (transferData.type) { case CF_UNICODETEXTID: { @@ -140,7 +140,7 @@ public Object nativeToJava(TransferData transferData){ int size = OS.GlobalSize(hMem) / 2 * 2; if (size == 0) return null; char[] chars = new char[size/2]; - long /*int*/ ptr = OS.GlobalLock(hMem); + long ptr = OS.GlobalLock(hMem); if (ptr == 0) return null; try { OS.MoveMemory(chars, ptr, size); @@ -157,7 +157,7 @@ public Object nativeToJava(TransferData transferData){ } } case CF_TEXTID: { - long /*int*/ lpMultiByteStr = OS.GlobalLock(hMem); + long lpMultiByteStr = OS.GlobalLock(hMem); if (lpMultiByteStr == 0) return null; try { int codePage = OS.GetACP(); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TransferData.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TransferData.java index 672b026229..80240e23d9 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TransferData.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TransferData.java @@ -107,7 +107,7 @@ public class TransferData { * * @noreference This field is not intended to be referenced by clients. */ - public long /*int*/ pIDataObject; + public long pIDataObject; static boolean sameType(TransferData data1, TransferData data2) { if (data1 == data2) return true; diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TreeDragSourceEffect.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TreeDragSourceEffect.java index 411b45559b..363bf9c581 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TreeDragSourceEffect.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TreeDragSourceEffect.java @@ -93,7 +93,7 @@ public class TreeDragSourceEffect extends DragSourceEffect { event.offsetX = shdi.ptOffset.x; } event.offsetY = shdi.ptOffset.y; - long /*int*/ hImage = shdi.hbmpDragImage; + long hImage = shdi.hbmpDragImage; if (hImage != 0) { BITMAP bm = new BITMAP (); OS.GetObject (hImage, BITMAP.sizeof, bm); @@ -101,10 +101,10 @@ public class TreeDragSourceEffect extends DragSourceEffect { int srcHeight = bm.bmHeight; /* Create resources */ - long /*int*/ hdc = OS.GetDC (0); - long /*int*/ srcHdc = OS.CreateCompatibleDC (hdc); - long /*int*/ oldSrcBitmap = OS.SelectObject (srcHdc, hImage); - long /*int*/ memHdc = OS.CreateCompatibleDC (hdc); + long hdc = OS.GetDC (0); + long srcHdc = OS.CreateCompatibleDC (hdc); + long oldSrcBitmap = OS.SelectObject (srcHdc, hImage); + long memHdc = OS.CreateCompatibleDC (hdc); BITMAPINFOHEADER bmiHeader = new BITMAPINFOHEADER (); bmiHeader.biSize = BITMAPINFOHEADER.sizeof; bmiHeader.biWidth = srcWidth; @@ -114,10 +114,10 @@ public class TreeDragSourceEffect extends DragSourceEffect { bmiHeader.biCompression = OS.BI_RGB; byte [] bmi = new byte[BITMAPINFOHEADER.sizeof]; OS.MoveMemory (bmi, bmiHeader, BITMAPINFOHEADER.sizeof); - long /*int*/ [] pBits = new long /*int*/ [1]; - long /*int*/ memDib = OS.CreateDIBSection (0, bmi, OS.DIB_RGB_COLORS, pBits, 0, 0); + long [] pBits = new long [1]; + long memDib = OS.CreateDIBSection (0, bmi, OS.DIB_RGB_COLORS, pBits, 0, 0); if (memDib == 0) SWT.error (SWT.ERROR_NO_HANDLES); - long /*int*/ oldMemBitmap = OS.SelectObject (memHdc, memDib); + long oldMemBitmap = OS.SelectObject (memHdc, memDib); BITMAP dibBM = new BITMAP (); OS.GetObject (memDib, BITMAP.sizeof, dibBM); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TreeDropTargetEffect.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TreeDropTargetEffect.java index 2b7883de89..87385adfdd 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TreeDropTargetEffect.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TreeDropTargetEffect.java @@ -55,10 +55,10 @@ public class TreeDropTargetEffect extends DropTargetEffect { static final int SCROLL_HYSTERESIS = 200; // milli seconds static final int EXPAND_HYSTERESIS = 1000; // milli seconds - long /*int*/ dropIndex; - long /*int*/ scrollIndex; + long dropIndex; + long scrollIndex; long scrollBeginTime; - long /*int*/ expandIndex; + long expandIndex; long expandBeginTime; TreeItem insertItem; boolean insertBefore; @@ -121,7 +121,7 @@ public class TreeDropTargetEffect extends DropTargetEffect { @Override public void dragLeave(DropTargetEvent event) { Tree tree = (Tree) control; - long /*int*/ handle = tree.handle; + long handle = tree.handle; if (dropIndex != -1) { TVITEM tvItem = new TVITEM (); tvItem.hItem = dropIndex; @@ -163,22 +163,22 @@ public class TreeDropTargetEffect extends DropTargetEffect { public void dragOver(DropTargetEvent event) { Tree tree = (Tree) getControl(); int effect = checkEffect(event.feedback); - long /*int*/ handle = tree.handle; + long handle = tree.handle; Point coordinates = new Point(event.x, event.y); coordinates = DPIUtil.autoScaleUp(tree.toControl(coordinates)); // To Pixels TVHITTESTINFO lpht = new TVHITTESTINFO (); lpht.x = coordinates.x; lpht.y = coordinates.y; OS.SendMessage (handle, OS.TVM_HITTEST, 0, lpht); - long /*int*/ hItem = lpht.hItem; + long hItem = lpht.hItem; if ((effect & DND.FEEDBACK_SCROLL) == 0) { scrollBeginTime = 0; scrollIndex = -1; } else { if (hItem != -1 && scrollIndex == hItem && scrollBeginTime != 0) { if (System.currentTimeMillis() >= scrollBeginTime) { - long /*int*/ topItem = OS.SendMessage(handle, OS.TVM_GETNEXTITEM, OS.TVGN_FIRSTVISIBLE, 0); - long /*int*/ nextItem = OS.SendMessage(handle, OS.TVM_GETNEXTITEM, hItem == topItem ? OS.TVGN_PREVIOUSVISIBLE : OS.TVGN_NEXTVISIBLE, hItem); + long topItem = OS.SendMessage(handle, OS.TVM_GETNEXTITEM, OS.TVGN_FIRSTVISIBLE, 0); + long nextItem = OS.SendMessage(handle, OS.TVM_GETNEXTITEM, hItem == topItem ? OS.TVGN_PREVIOUSVISIBLE : OS.TVGN_NEXTVISIBLE, hItem); boolean scroll = true; if (hItem == topItem) { scroll = nextItem != 0; diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/URLTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/URLTransfer.java index fd1e22e170..1581e80a18 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/URLTransfer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/URLTransfer.java @@ -73,7 +73,7 @@ public void javaToNative (Object object, TransferData transferData){ char[] chars = new char[charCount+1]; url.getChars (0, charCount, chars, 0); int byteCount = chars.length * 2; - long /*int*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, byteCount); + long newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, byteCount); OS.MoveMemory(newPtr, chars, byteCount); transferData.stgmedium = new STGMEDIUM(); transferData.stgmedium.tymed = COM.TYMED_HGLOBAL; @@ -91,7 +91,7 @@ public void javaToNative (Object object, TransferData transferData){ transferData.result = COM.DV_E_STGMEDIUM; return; } - long /*int*/ lpMultiByteStr = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, cchMultiByte); + long lpMultiByteStr = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, cchMultiByte); OS.WideCharToMultiByte(codePage, 0, chars, -1, lpMultiByteStr, cchMultiByte, null, null); transferData.stgmedium = new STGMEDIUM(); transferData.stgmedium.tymed = COM.TYMED_HGLOBAL; @@ -122,14 +122,14 @@ public Object nativeToJava(TransferData transferData){ transferData.result = getData(data, formatetc, stgmedium); data.Release(); if (transferData.result != COM.S_OK) return null; - long /*int*/ hMem = stgmedium.unionField; + long hMem = stgmedium.unionField; try { if (transferData.type == CFSTR_INETURLIDW) { /* Ensure byteCount is a multiple of 2 bytes */ int size = OS.GlobalSize(hMem) / 2 * 2; if (size == 0) return null; char[] chars = new char[size/2]; - long /*int*/ ptr = OS.GlobalLock(hMem); + long ptr = OS.GlobalLock(hMem); if (ptr == 0) return null; try { OS.MoveMemory(chars, ptr, size); @@ -145,7 +145,7 @@ public Object nativeToJava(TransferData transferData){ OS.GlobalUnlock(hMem); } } else if (transferData.type == CFSTR_INETURLID) { - long /*int*/ lpMultiByteStr = OS.GlobalLock(hMem); + long lpMultiByteStr = OS.GlobalLock(hMem); if (lpMultiByteStr == 0) return null; try { int codePage = OS.GetACP(); diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/COMObject.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/COMObject.java index 722485031c..e6a810af0e 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/COMObject.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/COMObject.java @@ -21,7 +21,7 @@ import org.eclipse.swt.internal.win32.*; public class COMObject { - public long /*int*/ ppVtable; + public long ppVtable; static private final int MAX_ARG_COUNT = 12; static private final int MAX_VTABLE_LENGTH = 80; @@ -29,7 +29,7 @@ public class COMObject { static private Map<LONG, COMObject> ObjectMap = new HashMap<>(); public COMObject(int[] argCounts) { - long /*int*/[] callbackAddresses = new long /*int*/[argCounts.length]; + long[] callbackAddresses = new long[argCounts.length]; synchronized (Callbacks) { for (int i = 0, length = argCounts.length; i < length; i++){ if ((Callbacks[i][argCounts[i]]) == null) { @@ -40,10 +40,10 @@ public COMObject(int[] argCounts) { } } - long /*int*/ pVtable = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, C.PTR_SIZEOF * argCounts.length); + long pVtable = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, C.PTR_SIZEOF * argCounts.length); OS.MoveMemory(pVtable, callbackAddresses, C.PTR_SIZEOF * argCounts.length); ppVtable = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, C.PTR_SIZEOF); - OS.MoveMemory(ppVtable, new long /*int*/[] {pVtable}, C.PTR_SIZEOF); + OS.MoveMemory(ppVtable, new long[] {pVtable}, C.PTR_SIZEOF); ObjectMap.put(new LONG(ppVtable), this); } @@ -58,729 +58,729 @@ public static GUID IIDFromString(String lpsz) { return null; } -static long /*int*/ callback0(long /*int*/[] callbackArgs) { +static long callback0(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method0(args); } -static long /*int*/ callback1(long /*int*/[] callbackArgs) { +static long callback1(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method1(args); } -static long /*int*/ callback2(long /*int*/[] callbackArgs) { +static long callback2(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method2(args); } -static long /*int*/ callback3(long /*int*/[] callbackArgs) { +static long callback3(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method3(args); } -static long /*int*/ callback4(long /*int*/[] callbackArgs) { +static long callback4(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method4(args); } -static long /*int*/ callback5(long /*int*/[] callbackArgs) { +static long callback5(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method5(args); } -static long /*int*/ callback6(long /*int*/[] callbackArgs) { +static long callback6(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method6(args); } -static long /*int*/ callback7(long /*int*/[] callbackArgs) { +static long callback7(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method7(args); } -static long /*int*/ callback8(long /*int*/[] callbackArgs) { +static long callback8(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method8(args); } -static long /*int*/ callback9(long /*int*/[] callbackArgs) { +static long callback9(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method9(args); } -static long /*int*/ callback10(long /*int*/[] callbackArgs) { +static long callback10(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method10(args); } -static long /*int*/ callback11(long /*int*/[] callbackArgs) { +static long callback11(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method11(args); } -static long /*int*/ callback12(long /*int*/[] callbackArgs) { +static long callback12(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method12(args); } -static long /*int*/ callback13(long /*int*/[] callbackArgs) { +static long callback13(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method13(args); } -static long /*int*/ callback14(long /*int*/[] callbackArgs) { +static long callback14(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method14(args); } -static long /*int*/ callback15(long /*int*/[] callbackArgs) { +static long callback15(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method15(args); } -static long /*int*/ callback16(long /*int*/[] callbackArgs) { +static long callback16(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method16(args); } -static long /*int*/ callback17(long /*int*/[] callbackArgs) { +static long callback17(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method17(args); } -static long /*int*/ callback18(long /*int*/[] callbackArgs) { +static long callback18(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method18(args); } -static long /*int*/ callback19(long /*int*/[] callbackArgs) { +static long callback19(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method19(args); } -static long /*int*/ callback20(long /*int*/[] callbackArgs) { +static long callback20(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method20(args); } -static long /*int*/ callback21(long /*int*/[] callbackArgs) { +static long callback21(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method21(args); } -static long /*int*/ callback22(long /*int*/[] callbackArgs) { +static long callback22(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method22(args); } -static long /*int*/ callback23(long /*int*/[] callbackArgs) { +static long callback23(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method23(args); } -static long /*int*/ callback24(long /*int*/[] callbackArgs) { +static long callback24(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method24(args); } -static long /*int*/ callback25(long /*int*/[] callbackArgs) { +static long callback25(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method25(args); } -static long /*int*/ callback26(long /*int*/[] callbackArgs) { +static long callback26(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method26(args); } -static long /*int*/ callback27(long /*int*/[] callbackArgs) { +static long callback27(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method27(args); } -static long /*int*/ callback28(long /*int*/[] callbackArgs) { +static long callback28(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method28(args); } -static long /*int*/ callback29(long /*int*/[] callbackArgs) { +static long callback29(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method29(args); } -static long /*int*/ callback30(long /*int*/[] callbackArgs) { +static long callback30(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method30(args); } -static long /*int*/ callback31(long /*int*/[] callbackArgs) { +static long callback31(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method31(args); } -static long /*int*/ callback32(long /*int*/[] callbackArgs) { +static long callback32(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method32(args); } -static long /*int*/ callback33(long /*int*/[] callbackArgs) { +static long callback33(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method33(args); } -static long /*int*/ callback34(long /*int*/[] callbackArgs) { +static long callback34(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method34(args); } -static long /*int*/ callback35(long /*int*/[] callbackArgs) { +static long callback35(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method35(args); } -static long /*int*/ callback36(long /*int*/[] callbackArgs) { +static long callback36(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method36(args); } -static long /*int*/ callback37(long /*int*/[] callbackArgs) { +static long callback37(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method37(args); } -static long /*int*/ callback38(long /*int*/[] callbackArgs) { +static long callback38(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method38(args); } -static long /*int*/ callback39(long /*int*/[] callbackArgs) { +static long callback39(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method39(args); } -static long /*int*/ callback40(long /*int*/[] callbackArgs) { +static long callback40(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method40(args); } -static long /*int*/ callback41(long /*int*/[] callbackArgs) { +static long callback41(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method41(args); } -static long /*int*/ callback42(long /*int*/[] callbackArgs) { +static long callback42(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method42(args); } -static long /*int*/ callback43(long /*int*/[] callbackArgs) { +static long callback43(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method43(args); } -static long /*int*/ callback44(long /*int*/[] callbackArgs) { +static long callback44(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method44(args); } -static long /*int*/ callback45(long /*int*/[] callbackArgs) { +static long callback45(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method45(args); } -static long /*int*/ callback46(long /*int*/[] callbackArgs) { +static long callback46(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method46(args); } -static long /*int*/ callback47(long /*int*/[] callbackArgs) { +static long callback47(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method47(args); } -static long /*int*/ callback48(long /*int*/[] callbackArgs) { +static long callback48(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method48(args); } -static long /*int*/ callback49(long /*int*/[] callbackArgs) { +static long callback49(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method49(args); } -static long /*int*/ callback50(long /*int*/[] callbackArgs) { +static long callback50(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method50(args); } -static long /*int*/ callback51(long /*int*/[] callbackArgs) { +static long callback51(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method51(args); } -static long /*int*/ callback52(long /*int*/[] callbackArgs) { +static long callback52(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method52(args); } -static long /*int*/ callback53(long /*int*/[] callbackArgs) { +static long callback53(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method53(args); } -static long /*int*/ callback54(long /*int*/[] callbackArgs) { +static long callback54(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method54(args); } -static long /*int*/ callback55(long /*int*/[] callbackArgs) { +static long callback55(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method55(args); } -static long /*int*/ callback56(long /*int*/[] callbackArgs) { +static long callback56(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method56(args); } -static long /*int*/ callback57(long /*int*/[] callbackArgs) { +static long callback57(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method57(args); } -static long /*int*/ callback58(long /*int*/[] callbackArgs) { +static long callback58(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method58(args); } -static long /*int*/ callback59(long /*int*/[] callbackArgs) { +static long callback59(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method59(args); } -static long /*int*/ callback60(long /*int*/[] callbackArgs) { +static long callback60(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method60(args); } -static long /*int*/ callback61(long /*int*/[] callbackArgs) { +static long callback61(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method61(args); } -static long /*int*/ callback62(long /*int*/[] callbackArgs) { +static long callback62(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method62(args); } -static long /*int*/ callback63(long /*int*/[] callbackArgs) { +static long callback63(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method63(args); } -static long /*int*/ callback64(long /*int*/[] callbackArgs) { +static long callback64(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method64(args); } -static long /*int*/ callback65(long /*int*/[] callbackArgs) { +static long callback65(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method65(args); } -static long /*int*/ callback66(long /*int*/[] callbackArgs) { +static long callback66(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method66(args); } -static long /*int*/ callback67(long /*int*/[] callbackArgs) { +static long callback67(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method67(args); } -static long /*int*/ callback68(long /*int*/[] callbackArgs) { +static long callback68(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method68(args); } -static long /*int*/ callback69(long /*int*/[] callbackArgs) { +static long callback69(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method69(args); } -static long /*int*/ callback70(long /*int*/[] callbackArgs) { +static long callback70(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method70(args); } -static long /*int*/ callback71(long /*int*/[] callbackArgs) { +static long callback71(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method71(args); } -static long /*int*/ callback72(long /*int*/[] callbackArgs) { +static long callback72(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method72(args); } -static long /*int*/ callback73(long /*int*/[] callbackArgs) { +static long callback73(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method73(args); } -static long /*int*/ callback74(long /*int*/[] callbackArgs) { +static long callback74(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method74(args); } -static long /*int*/ callback75(long /*int*/[] callbackArgs) { +static long callback75(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method75(args); } -static long /*int*/ callback76(long /*int*/[] callbackArgs) { +static long callback76(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method76(args); } -static long /*int*/ callback77(long /*int*/[] callbackArgs) { +static long callback77(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method77(args); } -static long /*int*/ callback78(long /*int*/[] callbackArgs) { +static long callback78(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method78(args); } -static long /*int*/ callback79(long /*int*/[] callbackArgs) { +static long callback79(long[] callbackArgs) { // find the object on which this call was invoked - long /*int*/ address = callbackArgs[0]; + long address = callbackArgs[0]; COMObject object = ObjectMap.get(new LONG(address)); if (object == null) return COM.E_FAIL; - long /*int*/[] args = new long /*int*/[callbackArgs.length - 1]; + long[] args = new long[callbackArgs.length - 1]; System.arraycopy(callbackArgs, 1, args, 0, args.length); return object.method79(args); } public void dispose() { // free the memory for this reference - long /*int*/[] pVtable = new long /*int*/[1]; + long[] pVtable = new long[1]; OS.MoveMemory(pVtable, ppVtable, C.PTR_SIZEOF); OS.GlobalFree(pVtable[0]); OS.GlobalFree(ppVtable); @@ -790,247 +790,247 @@ public void dispose() { ppVtable = 0; } -public long /*int*/ getAddress () { +public long getAddress () { return ppVtable; } -public long /*int*/ method0(long /*int*/[] args) { +public long method0(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method1(long /*int*/[] args) { +public long method1(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method2(long /*int*/[] args) { +public long method2(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method3(long /*int*/[] args) { +public long method3(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method4(long /*int*/[] args) { +public long method4(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method5(long /*int*/[] args) { +public long method5(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method6(long /*int*/[] args) { +public long method6(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method7(long /*int*/[] args) { +public long method7(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method8(long /*int*/[] args) { +public long method8(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method9(long /*int*/[] args) { +public long method9(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method10(long /*int*/[] args) { +public long method10(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method11(long /*int*/[] args) { +public long method11(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method12(long /*int*/[] args) { +public long method12(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method13(long /*int*/[] args) { +public long method13(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method14(long /*int*/[] args) { +public long method14(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method15(long /*int*/[] args) { +public long method15(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method16(long /*int*/[] args) { +public long method16(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method17(long /*int*/[] args) { +public long method17(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method18(long /*int*/[] args) { +public long method18(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method19(long /*int*/[] args) { +public long method19(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method20(long /*int*/[] args) { +public long method20(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method21(long /*int*/[] args) { +public long method21(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method22(long /*int*/[] args) { +public long method22(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method23(long /*int*/[] args) { +public long method23(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method24(long /*int*/[] args) { +public long method24(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method25(long /*int*/[] args) { +public long method25(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method26(long /*int*/[] args) { +public long method26(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method27(long /*int*/[] args) { +public long method27(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method28(long /*int*/[] args) { +public long method28(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method29(long /*int*/[] args) { +public long method29(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method30(long /*int*/[] args) { +public long method30(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method31(long /*int*/[] args) { +public long method31(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method32(long /*int*/[] args) { +public long method32(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method33(long /*int*/[] args) { +public long method33(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method34(long /*int*/[] args) { +public long method34(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method35(long /*int*/[] args) { +public long method35(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method36(long /*int*/[] args) { +public long method36(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method37(long /*int*/[] args) { +public long method37(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method38(long /*int*/[] args) { +public long method38(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method39(long /*int*/[] args) { +public long method39(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method40(long /*int*/[] args) { +public long method40(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method41(long /*int*/[] args) { +public long method41(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method42(long /*int*/[] args) { +public long method42(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method43(long /*int*/[] args) { +public long method43(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method44(long /*int*/[] args) { +public long method44(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method45(long /*int*/[] args) { +public long method45(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method46(long /*int*/[] args) { +public long method46(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method47(long /*int*/[] args) { +public long method47(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method48(long /*int*/[] args) { +public long method48(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method49(long /*int*/[] args) { +public long method49(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method50(long /*int*/[] args) { +public long method50(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method51(long /*int*/[] args) { +public long method51(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method52(long /*int*/[] args) { +public long method52(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method53(long /*int*/[] args) { +public long method53(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method54(long /*int*/[] args) { +public long method54(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method55(long /*int*/[] args) { +public long method55(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method56(long /*int*/[] args) { +public long method56(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method57(long /*int*/[] args) { +public long method57(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method58(long /*int*/[] args) { +public long method58(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method59(long /*int*/[] args) { +public long method59(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method60(long /*int*/[] args) { +public long method60(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method61(long /*int*/[] args) { +public long method61(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method62(long /*int*/[] args) { +public long method62(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method63(long /*int*/[] args) { +public long method63(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method64(long /*int*/[] args) { +public long method64(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method65(long /*int*/[] args) { +public long method65(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method66(long /*int*/[] args) { +public long method66(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method67(long /*int*/[] args) { +public long method67(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method68(long /*int*/[] args) { +public long method68(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method69(long /*int*/[] args) { +public long method69(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method70(long /*int*/[] args) { +public long method70(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method71(long /*int*/[] args) { +public long method71(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method72(long /*int*/[] args) { +public long method72(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method73(long /*int*/[] args) { +public long method73(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method74(long /*int*/[] args) { +public long method74(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method75(long /*int*/[] args) { +public long method75(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method76(long /*int*/[] args) { +public long method76(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method77(long /*int*/[] args) { +public long method77(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method78(long /*int*/[] args) { +public long method78(long[] args) { return COM.E_NOTIMPL; } -public long /*int*/ method79(long /*int*/[] args) { +public long method79(long[] args) { return COM.E_NOTIMPL; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OLE.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OLE.java index 4c91f187ca..c10f62abf5 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OLE.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OLE.java @@ -393,7 +393,7 @@ public static String findProgramID (String extension) { return ""; //$NON-NLS-1$ } static String getKeyValue (TCHAR key) { - long /*int*/ [] phkResult = new long /*int*/ [1]; + long [] phkResult = new long [1]; if (OS.RegOpenKeyEx (OS.HKEY_CLASSES_ROOT, key, 0, OS.KEY_READ, phkResult) != 0) { return null; } @@ -416,7 +416,7 @@ static String getKeyValue (TCHAR key) { return result; } private static boolean getKeyExists (TCHAR key) { - long /*int*/ [] phkResult = new long /*int*/ [1]; + long [] phkResult = new long [1]; if (OS.RegOpenKeyEx (OS.HKEY_CLASSES_ROOT, key, 0, OS.KEY_READ, phkResult) != 0) { return false; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleAutomation.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleAutomation.java index 7ca5ad5239..5bf14447ec 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleAutomation.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleAutomation.java @@ -98,7 +98,7 @@ OleAutomation(IDispatch idispatch) { objIDispatch = idispatch; objIDispatch.AddRef(); - long /*int*/[] ppv = new long /*int*/[1]; + long[] ppv = new long[1]; /* GetTypeInfo([in] iTInfo, [in] lcid, [out] ppTInfo) * AddRef has already been called on ppTInfo by the callee and must be released by the caller. */ @@ -121,7 +121,7 @@ public OleAutomation(OleClientSite clientSite) { if (clientSite == null) OLE.error(OLE.ERROR_INVALID_INTERFACE_ADDRESS); objIDispatch = clientSite.getAutomationObject(); - long /*int*/[] ppv = new long /*int*/[1]; + long[] ppv = new long[1]; /* GetTypeInfo([in] iTInfo, [in] lcid, [out] ppTInfo) * AddRef has already been called on ppTInfo by the callee and must be released by the caller. */ @@ -155,7 +155,7 @@ public OleAutomation(String progId) { OLE.error(OLE.ERROR_INVALID_CLASSID); } int flags = COM.CLSCTX_INPROC_SERVER | COM.CLSCTX_LOCAL_SERVER; - long /*int*/[] ppvObject = new long /*int*/[1]; + long[] ppvObject = new long[1]; int result = COM.CoCreateInstance(appClsid, 0, flags, COM.IIDIUnknown, ppvObject); if (result != COM.S_OK) { OS.OleUninitialize(); @@ -202,7 +202,7 @@ public void dispose() { } objIUnknown = null; } -long /*int*/ getAddress() { +long getAddress() { return objIDispatch.getAddress(); } GUID getClassID(String clientName) { @@ -257,7 +257,7 @@ public String getDocumentation(int dispId) { */ public OlePropertyDescription getPropertyDescription(int index) { if (objITypeInfo == null) return null; - long /*int*/[] ppVarDesc = new long /*int*/[1]; + long[] ppVarDesc = new long[1]; int rc = objITypeInfo.GetVarDesc(index, ppVarDesc); if (rc != OLE.S_OK) return null; VARDESC vardesc = new VARDESC(); @@ -288,7 +288,7 @@ public OlePropertyDescription getPropertyDescription(int index) { */ public OleFunctionDescription getFunctionDescription(int index) { if (objITypeInfo == null) return null; - long /*int*/[] ppFuncDesc = new long /*int*/[1]; + long[] ppFuncDesc = new long[1]; int rc = objITypeInfo.GetFuncDesc(index, ppFuncDesc); if (rc != OLE.S_OK) return null; FUNCDESC funcdesc = new FUNCDESC(); @@ -319,7 +319,7 @@ public OleFunctionDescription getFunctionDescription(int index) { short[] vt = new short[1]; OS.MoveMemory(vt, funcdesc.lprgelemdescParam + i * COM.ELEMDESC_sizeof() + C.PTR_SIZEOF, 2); if (vt[0] == OLE.VT_PTR) { - long /*int*/ [] pTypedesc = new long /*int*/ [1]; + long [] pTypedesc = new long [1]; OS.MoveMemory(pTypedesc, funcdesc.lprgelemdescParam + i * COM.ELEMDESC_sizeof(), C.PTR_SIZEOF); short[] vt2 = new short[1]; OS.MoveMemory(vt2, pTypedesc[0] + C.PTR_SIZEOF, 2); @@ -350,7 +350,7 @@ public OleFunctionDescription getFunctionDescription(int index) { */ public TYPEATTR getTypeInfoAttributes() { if (objITypeInfo == null) return null; - long /*int*/ [] ppTypeAttr = new long /*int*/ [1]; + long [] ppTypeAttr = new long [1]; int rc = objITypeInfo.GetTypeAttr(ppTypeAttr); if (rc != OLE.S_OK) return null; TYPEATTR typeattr = new TYPEATTR(); @@ -480,8 +480,8 @@ public boolean equals(Object object) { if (objIDispatch == null) return false; OleAutomation oleAutomation = ((OleAutomation) object); if (oleAutomation.objIDispatch == null) return false; - long /*int*/ address1 = objIDispatch.getAddress(); - long /*int*/ address2 = oleAutomation.objIDispatch.getAddress(); + long address1 = objIDispatch.getAddress(); + long address2 = oleAutomation.objIDispatch.getAddress(); return address1 == address2; } return false; @@ -570,7 +570,7 @@ private int invoke(int dispIdMember, int wFlags, Variant[] rgvarg, int[] rgdispi // invoke the method EXCEPINFO excepInfo = new EXCEPINFO(); int[] pArgErr = new int[1]; - long /*int*/ pVarResultAddress = 0; + long pVarResultAddress = 0; if (pVarResult != null) pVarResultAddress = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, VARIANT.sizeof); int result = objIDispatch.Invoke(dispIdMember, new GUID(), COM.LOCALE_USER_DEFAULT, wFlags, pDispParams, pVarResultAddress, excepInfo, pArgErr); 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 fa933fd48f..094c02c976 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 @@ -247,14 +247,14 @@ public OleClientSite(Composite parent, int style, String progId) { tempStorage = createTempStorage(); // Create ole object with storage object - long /*int*/[] address = new long /*int*/[1]; + long[] address = new long[1]; /* * Bug in ICA Client 2.7. The creation of the IOleObject fails if the client * site is provided to OleCreate(). The fix is to detect that the program * id is an ICA Client and do not pass a client site to OleCreate(). * IOleObject.SetClientSite() is called later on. */ - long /*int*/ clientSite = isICAClient() ? 0 : iOleClientSite.getAddress(); + long clientSite = isICAClient() ? 0 : iOleClientSite.getAddress(); int result = COM.OleCreate(appClsid, COM.IIDIUnknown, COM.OLERENDER_DRAW, null, clientSite, tempStorage.getAddress(), address); if (result != COM.S_OK) OLE.error(OLE.ERROR_CANNOT_CREATE_OBJECT, result); @@ -335,7 +335,7 @@ void OleCreate(GUID appClsid, GUID fileClsid, char[] fileName, File file) { // Using the same application that created file, therefore, use default mechanism. tempStorage = createTempStorage(); // Create ole object with storage object - long /*int*/[] address = new long /*int*/[1]; + long[] address = new long[1]; int result = COM.OleCreateFromFile(appClsid, fileName, COM.IIDIUnknown, COM.OLERENDER_DRAW, null, iOleClientSite.getAddress(), tempStorage.getAddress(), address); if (result != COM.S_OK) OLE.error(OLE.ERROR_CANNOT_CREATE_OBJECT, result); objIUnknown = new IUnknown(address[0]); @@ -343,14 +343,14 @@ void OleCreate(GUID appClsid, GUID fileClsid, char[] fileName, File file) { // Not using the same application that created file, therefore, copy from original file to a new storage file IStorage storage = null; if (COM.StgIsStorageFile(fileName) == COM.S_OK) { - long /*int*/[] address = new long /*int*/[1]; + long[] address = new long[1]; int mode = COM.STGM_READ | COM.STGM_TRANSACTED | COM.STGM_SHARE_EXCLUSIVE; int result = COM.StgOpenStorage(fileName, 0, mode, 0, 0, address); //Does an AddRef if successful if (result != COM.S_OK) OLE.error(OLE.ERROR_CANNOT_OPEN_FILE, result); storage = new IStorage(address[0]); } else { // Original file is not a Storage file so copy contents to a stream in a new storage file - long /*int*/[] address = new long /*int*/[1]; + long[] address = new long[1]; int mode = COM.STGM_READWRITE | COM.STGM_DIRECT | COM.STGM_SHARE_EXCLUSIVE | COM.STGM_CREATE; int result = COM.StgCreateDocfile(null, mode | COM.STGM_DELETEONRELEASE, 0, address); // Increments ref count if successful if (result != COM.S_OK) OLE.error(OLE.ERROR_CANNOT_OPEN_FILE, result); @@ -362,7 +362,7 @@ void OleCreate(GUID appClsid, GUID fileClsid, char[] fileName, File file) { GUID wordGUID = getClassID(WORDPROGID); if (wordGUID != null && COM.IsEqualGUID(appClsid, wordGUID)) streamName = "WordDocument"; //$NON-NLS-1$ if (isOffice2007) streamName = "Package"; //$NON-NLS-1$ - address = new long /*int*/[1]; + address = new long[1]; result = storage.CreateStream(streamName, mode, 0, 0, address); // Increments ref count if successful if (result != COM.S_OK) { storage.Release(); @@ -376,7 +376,7 @@ void OleCreate(GUID appClsid, GUID fileClsid, char[] fileName, File file) { byte[] buffer = new byte[increment]; int count = 0; while((count = fileInput.read(buffer)) > 0){ - long /*int*/ pv = OS.CoTaskMemAlloc(count); + long pv = OS.CoTaskMemAlloc(count); OS.MoveMemory(pv, buffer, count); result = stream.Write(pv, count, null) ; OS.CoTaskMemFree(pv); @@ -405,12 +405,12 @@ void OleCreate(GUID appClsid, GUID fileClsid, char[] fileName, File file) { if (result != COM.S_OK) OLE.error(OLE.ERROR_CANNOT_OPEN_FILE, result); // create ole client - long /*int*/[] ppv = new long /*int*/[1]; + long[] ppv = new long[1]; result = COM.CoCreateInstance(appClsid, 0, COM.CLSCTX_INPROC_HANDLER | COM.CLSCTX_INPROC_SERVER, COM.IIDIUnknown, ppv); if (result != COM.S_OK) OLE.error(OLE.ERROR_CANNOT_CREATE_OBJECT, result); objIUnknown = new IUnknown(ppv[0]); // get the persistent storage of the ole client - ppv = new long /*int*/[1]; + ppv = new long[1]; result = objIUnknown.QueryInterface(COM.IIDIPersistStorage, ppv); if (result != COM.S_OK) OLE.error(OLE.ERROR_CANNOT_CREATE_OBJECT, result); IPersistStorage iPersistStorage = new IPersistStorage(ppv[0]); @@ -427,7 +427,7 @@ void OleCreate(GUID appClsid, GUID fileClsid, char[] fileName, File file) { } protected void addObjectReferences() { // - long /*int*/[] ppvObject = new long /*int*/[1]; + long[] ppvObject = new long[1]; if (objIUnknown.QueryInterface(COM.IIDIPersist, ppvObject) == COM.S_OK) { IPersist objIPersist = new IPersist(ppvObject[0]); GUID tempid = new GUID(); @@ -437,7 +437,7 @@ protected void addObjectReferences() { } // - ppvObject = new long /*int*/[1]; + ppvObject = new long[1]; int result = objIUnknown.QueryInterface(COM.IIDIViewObject2, ppvObject); if (result != COM.S_OK) OLE.error(OLE.ERROR_INTERFACE_NOT_FOUND, result); @@ -445,7 +445,7 @@ protected void addObjectReferences() { objIViewObject2.SetAdvise(aspect, 0, iAdviseSink.getAddress()); // - ppvObject = new long /*int*/[1]; + ppvObject = new long[1]; result = objIUnknown.QueryInterface(COM.IIDIOleObject, ppvObject); if (result != COM.S_OK) OLE.error(OLE.ERROR_INTERFACE_NOT_FOUND, result); @@ -457,7 +457,7 @@ protected void addObjectReferences() { * during OleCreate. The fix is to check whether the clientSite has already been set * and set it. Note that setting it twice can result in assert failures. */ - long /*int*/[] ppvClientSite = new long /*int*/[1]; + long[] ppvClientSite = new long[1]; result = objIOleObject.GetClientSite(ppvClientSite); if (ppvClientSite[0] == 0) { objIOleObject.SetClientSite(iOleClientSite.getAddress()); @@ -472,10 +472,10 @@ protected void addObjectReferences() { COM.OleSetContainedObject(objIUnknown.getAddress(), true); // Is OLE object linked or embedded? - ppvObject = new long /*int*/[1]; + ppvObject = new long[1]; if (objIUnknown.QueryInterface(COM.IIDIOleLink, ppvObject) == COM.S_OK) { IOleLink objIOleLink = new IOleLink(ppvObject[0]); - long /*int*/[] ppmk = new long /*int*/[1]; + long[] ppmk = new long[1]; if (objIOleLink.GetSourceMoniker(ppmk) == COM.S_OK) { IMoniker objIMoniker = new IMoniker(ppmk[0]); objIMoniker.Release(); @@ -504,91 +504,91 @@ protected void createCOMInterfaces() { iOleClientSite = new COMObject(new int[]{2, 0, 0, 0, 3, 1, 0, 1, 0}){ @Override - public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long method0(long[] args) {return QueryInterface(args[0], args[1]);} @Override - public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long method1(long[] args) {return AddRef();} @Override - public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long method2(long[] args) {return Release();} @Override - public long /*int*/ method3(long /*int*/[] args) {return SaveObject();} + public long method3(long[] args) {return SaveObject();} // method4 GetMoniker - not implemented @Override - public long /*int*/ method5(long /*int*/[] args) {return GetContainer(args[0]);} + public long method5(long[] args) {return GetContainer(args[0]);} @Override - public long /*int*/ method6(long /*int*/[] args) {return ShowObject();} + public long method6(long[] args) {return ShowObject();} @Override - public long /*int*/ method7(long /*int*/[] args) {return OnShowWindow((int)/*64*/args[0]);} + public long method7(long[] args) {return OnShowWindow((int)args[0]);} // method8 RequestNewObjectLayout - not implemented }; iAdviseSink = new COMObject(new int[]{2, 0, 0, 2, 2, 1, 0, 0}){ @Override - public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long method0(long[] args) {return QueryInterface(args[0], args[1]);} @Override - public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long method1(long[] args) {return AddRef();} @Override - public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long method2(long[] args) {return Release();} @Override - public long /*int*/ method3(long /*int*/[] args) {return OnDataChange(args[0], args[1]);} + public long method3(long[] args) {return OnDataChange(args[0], args[1]);} @Override - public long /*int*/ method4(long /*int*/[] args) {return OnViewChange((int)/*64*/args[0], (int)/*64*/args[1]);} + public long method4(long[] args) {return OnViewChange((int)args[0], (int)args[1]);} //method5 OnRename - not implemented @Override - public long /*int*/ method6(long /*int*/[] args) {OnSave();return 0;} + public long method6(long[] args) {OnSave();return 0;} @Override - public long /*int*/ method7(long /*int*/[] args) {return OnClose();} + 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}){ @Override - public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long method0(long[] args) {return QueryInterface(args[0], args[1]);} @Override - public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long method1(long[] args) {return AddRef();} @Override - public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long method2(long[] args) {return Release();} @Override - public long /*int*/ method3(long /*int*/[] args) {return GetWindow(args[0]);} + public long method3(long[] args) {return GetWindow(args[0]);} @Override - public long /*int*/ method4(long /*int*/[] args) {return ContextSensitiveHelp((int)/*64*/args[0]);} + public long method4(long[] args) {return ContextSensitiveHelp((int)args[0]);} @Override - public long /*int*/ method5(long /*int*/[] args) {return CanInPlaceActivate();} + public long method5(long[] args) {return CanInPlaceActivate();} @Override - public long /*int*/ method6(long /*int*/[] args) {return OnInPlaceActivate();} + public long method6(long[] args) {return OnInPlaceActivate();} @Override - public long /*int*/ method7(long /*int*/[] args) {return OnUIActivate();} + public long method7(long[] args) {return OnUIActivate();} @Override - public long /*int*/ method8(long /*int*/[] args) {return GetWindowContext(args[0], args[1], args[2], args[3], args[4]);} + public long method8(long[] args) {return GetWindowContext(args[0], args[1], args[2], args[3], args[4]);} @Override - public long /*int*/ method9(long /*int*/[] args) { + public long method9(long[] args) { if (args.length == 2) { - return Scroll((int)/*64*/args[0], (int)/*64*/args[1]); + return Scroll((int)args[0], (int)args[1]); } else { return Scroll_64(args[0]); } } @Override - public long /*int*/ method10(long /*int*/[] args) {return OnUIDeactivate((int)/*64*/args[0]);} + public long method10(long[] args) {return OnUIDeactivate((int)args[0]);} @Override - public long /*int*/ method11(long /*int*/[] args) {return OnInPlaceDeactivate();} + public long method11(long[] args) {return OnInPlaceDeactivate();} // method12 DiscardUndoState - not implemented // method13 DeactivateAndUndoChange - not implemented @Override - public long /*int*/ method14(long /*int*/[] args) {return OnPosRectChange(args[0]);} + public long method14(long[] args) {return OnPosRectChange(args[0]);} }; iOleDocumentSite = new COMObject(new int[]{2, 0, 0, 1}){ @Override - public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long method0(long[] args) {return QueryInterface(args[0], args[1]);} @Override - public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long method1(long[] args) {return AddRef();} @Override - public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long method2(long[] args) {return Release();} @Override - public long /*int*/ method3(long /*int*/[] args) {return ActivateMe(args[0]);} + public long method3(long[] args) {return ActivateMe(args[0]);} }; } protected IStorage createTempStorage() { - long /*int*/[] tempStorage = new long /*int*/[1]; + long[] tempStorage = new long[1]; int grfMode = COM.STGM_READWRITE | COM.STGM_SHARE_EXCLUSIVE | COM.STGM_DELETEONRELEASE; int result = COM.StgCreateDocfile(null, grfMode, 0, tempStorage); if (result != COM.S_OK) OLE.error(OLE.ERROR_CANNOT_CREATE_FILE, result); @@ -674,18 +674,18 @@ public int doVerb(int verb) { public int exec(int cmdID, int options, Variant in, Variant out) { if (objIOleCommandTarget == null) { - long /*int*/[] address = new long /*int*/[1]; + long[] address = new long[1]; if (objIUnknown.QueryInterface(COM.IIDIOleCommandTarget, address) != COM.S_OK) return OLE.ERROR_INTERFACE_NOT_FOUND; objIOleCommandTarget = new IOleCommandTarget(address[0]); } - long /*int*/ inAddress = 0; + long inAddress = 0; if (in != null){ inAddress = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, VARIANT.sizeof); in.getData(inAddress); } - long /*int*/ outAddress = 0; + long outAddress = 0; if (out != null){ outAddress = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, VARIANT.sizeof); out.getData(outAddress); @@ -706,7 +706,7 @@ public int exec(int cmdID, int options, Variant in, Variant out) { return result; } IDispatch getAutomationObject() { - long /*int*/[] ppvObject = new long /*int*/[1]; + long[] ppvObject = new long[1]; if (objIUnknown.QueryInterface(COM.IIDIDispatch, ppvObject) != COM.S_OK) return null; return new IDispatch(ppvObject[0]); @@ -728,13 +728,13 @@ protected GUID getClassID(String clientName) { } return guid; } -private int GetContainer(long /*int*/ ppContainer) { +private int GetContainer(long ppContainer) { /* Simple containers that do not support links to their embedded * objects probably do not need to implement this method. Instead, * they can return E_NOINTERFACE and set ppContainer to NULL. */ if (ppContainer != 0) - OS.MoveMemory(ppContainer, new long /*int*/[]{0}, C.PTR_SIZEOF); + OS.MoveMemory(ppContainer, new long[]{0}, C.PTR_SIZEOF); return COM.E_NOINTERFACE; } private SIZE getExtent() { @@ -770,11 +770,11 @@ public String getProgramID(){ } String getProgID(GUID clsid) { if (clsid != null){ - long /*int*/[] lplpszProgID = new long /*int*/[1]; + long[] lplpszProgID = new long[1]; if (COM.ProgIDFromCLSID(clsid, lplpszProgID) == COM.S_OK) { - long /*int*/ hMem = lplpszProgID[0]; + long hMem = lplpszProgID[0]; int length = OS.GlobalSize(hMem); - long /*int*/ ptr = OS.GlobalLock(hMem); + long ptr = OS.GlobalLock(hMem); char[] buffer = new char[length]; OS.MoveMemory(buffer, ptr, length); OS.GlobalUnlock(hMem); @@ -788,9 +788,9 @@ String getProgID(GUID clsid) { } return null; } -int ActivateMe(long /*int*/ pViewToActivate) { +int ActivateMe(long pViewToActivate) { if (pViewToActivate == 0) { - long /*int*/[] ppvObject = new long /*int*/[1]; + long[] ppvObject = new long[1]; if (objIUnknown.QueryInterface(COM.IIDIOleDocument, ppvObject) != COM.S_OK) return COM.E_FAIL; IOleDocument objOleDocument = new IOleDocument(ppvObject[0]); if (objOleDocument.CreateView(iOleInPlaceSite.getAddress(), 0, 0, ppvObject) != COM.S_OK) return COM.E_FAIL; @@ -807,16 +807,16 @@ int ActivateMe(long /*int*/ pViewToActivate) { objDocumentView.Show(1);//TRUE return COM.S_OK; } -protected int GetWindow(long /*int*/ phwnd) { +protected int GetWindow(long phwnd) { if (phwnd == 0) return COM.E_INVALIDARG; if (frame == null) { - OS.MoveMemory(phwnd, new long /*int*/[] {0}, C.PTR_SIZEOF); + OS.MoveMemory(phwnd, new long[] {0}, C.PTR_SIZEOF); return COM.E_NOTIMPL; } // Copy the Window's handle into the memory passed in - OS.MoveMemory(phwnd, new long /*int*/[] {handle}, C.PTR_SIZEOF); + OS.MoveMemory(phwnd, new long[] {handle}, C.PTR_SIZEOF); return COM.S_OK; } RECT getRect() { @@ -828,17 +828,17 @@ RECT getRect() { rect.bottom = area.y + area.height; return rect; } -private int GetWindowContext(long /*int*/ ppFrame, long /*int*/ ppDoc, long /*int*/ lprcPosRect, long /*int*/ lprcClipRect, long /*int*/ lpFrameInfo) { +private int GetWindowContext(long ppFrame, long ppDoc, long lprcPosRect, long lprcClipRect, long lpFrameInfo) { if (frame == null || ppFrame == 0) return COM.E_NOTIMPL; // fill in frame handle - long /*int*/ iOleInPlaceFrame = frame.getIOleInPlaceFrame(); - OS.MoveMemory(ppFrame, new long /*int*/[] {iOleInPlaceFrame}, C.PTR_SIZEOF); + long iOleInPlaceFrame = frame.getIOleInPlaceFrame(); + OS.MoveMemory(ppFrame, new long[] {iOleInPlaceFrame}, C.PTR_SIZEOF); frame.AddRef(); // null out document handle - if (ppDoc != 0) OS.MoveMemory(ppDoc, new long /*int*/[] {0}, C.PTR_SIZEOF); + if (ppDoc != 0) OS.MoveMemory(ppDoc, new long[] {0}, C.PTR_SIZEOF); // fill in position and clipping info RECT rect = getRect(); @@ -853,10 +853,10 @@ private int GetWindowContext(long /*int*/ ppFrame, long /*int*/ ppDoc, long /*in Shell shell = getShell(); Menu menubar = shell.getMenuBar(); if (menubar != null && !menubar.isDisposed()) { - long /*int*/ hwnd = shell.handle; - int cAccel = (int)/*64*/OS.SendMessage(hwnd, OS.WM_APP, 0, 0); + long hwnd = shell.handle; + int cAccel = (int)OS.SendMessage(hwnd, OS.WM_APP, 0, 0); if (cAccel != 0) { - long /*int*/ hAccel = OS.SendMessage(hwnd, OS.WM_APP+1, 0, 0); + long hAccel = OS.SendMessage(hwnd, OS.WM_APP+1, 0, 0); if (hAccel != 0) { frameInfo.cAccelEntries = cAccel; frameInfo.haccel = hAccel; @@ -886,7 +886,7 @@ public boolean isDirty() { */ // Get access to the persistent storage mechanism - long /*int*/[] address = new long /*int*/[1]; + long[] address = new long[1]; if (objIOleObject.QueryInterface(COM.IIDIPersistFile, address) != COM.S_OK) return true; IPersistFile permStorage = new IPersistFile(address[0]); @@ -899,9 +899,9 @@ public boolean isDirty() { @Override public boolean isFocusControl () { checkWidget (); - long /*int*/ focusHwnd = OS.GetFocus(); + long focusHwnd = OS.GetFocus(); if (objIOleInPlaceObject == null) return (handle == focusHwnd); - long /*int*/[] phwnd = new long /*int*/[1]; + long[] phwnd = new long[1]; objIOleInPlaceObject.GetWindow(phwnd); while (focusHwnd != 0) { if (phwnd[0] == focusHwnd) return true; @@ -929,7 +929,7 @@ private boolean isOffice2007(boolean program) { private int OnClose() { return COM.S_OK; } -private int OnDataChange(long /*int*/ pFormatetc, long /*int*/ pStgmed) { +private int OnDataChange(long pFormatetc, long pStgmed) { return COM.S_OK; } private void onDispose(Event e) { @@ -958,7 +958,7 @@ private void onDispose(Event e) { void onFocusIn(Event e) { if (inDispose) return; if (state != STATE_UIACTIVE) { - long /*int*/[] ppvObject = new long /*int*/[1]; + long[] ppvObject = new long[1]; if (objIUnknown.QueryInterface(COM.IIDIOleInPlaceObject, ppvObject) == COM.S_OK) { IOleInPlaceObject objIOleInPlaceObject = new IOleInPlaceObject(ppvObject[0]); objIOleInPlaceObject.Release(); @@ -967,7 +967,7 @@ void onFocusIn(Event e) { } if (objIOleInPlaceObject == null) return; if (isFocusControl()) return; - long /*int*/[] phwnd = new long /*int*/[1]; + long[] phwnd = new long[1]; objIOleInPlaceObject.GetWindow(phwnd); if (phwnd[0] == 0) return; OS.SetFocus(phwnd[0]); @@ -979,7 +979,7 @@ private int OnInPlaceActivate() { frame.setCurrentDocument(this); if (objIOleObject == null) return COM.S_OK; - long /*int*/[] ppvObject = new long /*int*/[1]; + long[] ppvObject = new long[1]; if (objIOleObject.QueryInterface(COM.IIDIOleInPlaceObject, ppvObject) == COM.S_OK) { objIOleInPlaceObject = new IOleInPlaceObject(ppvObject[0]); } @@ -996,7 +996,7 @@ private int OnInPlaceDeactivate() { } return COM.S_OK; } -private int OnPosRectChange(long /*int*/ lprcPosRect) { +private int OnPosRectChange(long lprcPosRect) { Point size = DPIUtil.autoScaleUp(getSize()); // To Pixels setExtent(size.x, size.y); return COM.S_OK; @@ -1014,7 +1014,7 @@ private void onPaint(Event e) { rect.top = area.y; rect.bottom = area.y + size.cy; } - long /*int*/ pArea = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, RECT.sizeof); + long pArea = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, RECT.sizeof); OS.MoveMemory(pArea, rect, RECT.sizeof); COM.OleDraw(objIUnknown.getAddress(), aspect, e.gc.handle, pArea); OS.GlobalFree(pArea); @@ -1031,7 +1031,7 @@ private int OnShowWindow(int fShow) { private int OnUIActivate() { if (objIOleInPlaceObject == null) return COM.E_FAIL; state = STATE_UIACTIVE; - long /*int*/[] phwnd = new long /*int*/[1]; + long[] phwnd = new long[1]; if (objIOleInPlaceObject.GetWindow(phwnd) == COM.S_OK) { OS.SetWindowPos(phwnd[0], OS.HWND_TOP, 0, 0, 0, 0, OS.SWP_NOSIZE | OS.SWP_NOMOVE); } @@ -1051,7 +1051,7 @@ int OnUIDeactivate(int fUndoable) { if (menubar == null || menubar.isDisposed()) return COM.S_OK; - long /*int*/ shellHandle = shell.handle; + long shellHandle = shell.handle; OS.SetMenu(shellHandle, menubar.handle); return COM.OleSetMenuDescriptor(0, shellHandle, 0, 0, 0); } @@ -1071,7 +1071,7 @@ private void onTraverse(Event event) { private int OnViewChange(int dwAspect, int lindex) { return COM.S_OK; } -protected int QueryInterface(long /*int*/ riid, long /*int*/ ppvObject) { +protected int QueryInterface(long riid, long ppvObject) { if (riid == 0 || ppvObject == 0) return COM.E_NOINTERFACE; @@ -1079,29 +1079,29 @@ protected int QueryInterface(long /*int*/ riid, long /*int*/ ppvObject) { COM.MoveMemory(guid, riid, GUID.sizeof); if (COM.IsEqualGUID(guid, COM.IIDIUnknown) || COM.IsEqualGUID(guid, COM.IIDIOleClientSite)) { - OS.MoveMemory(ppvObject, new long /*int*/[] {iOleClientSite.getAddress()}, C.PTR_SIZEOF); + OS.MoveMemory(ppvObject, new long[] {iOleClientSite.getAddress()}, C.PTR_SIZEOF); AddRef(); return COM.S_OK; } if (COM.IsEqualGUID(guid, COM.IIDIAdviseSink)) { - OS.MoveMemory(ppvObject, new long /*int*/[] {iAdviseSink.getAddress()}, C.PTR_SIZEOF); + OS.MoveMemory(ppvObject, new long[] {iAdviseSink.getAddress()}, C.PTR_SIZEOF); AddRef(); return COM.S_OK; } if (COM.IsEqualGUID(guid, COM.IIDIOleInPlaceSite)) { - OS.MoveMemory(ppvObject, new long /*int*/[] {iOleInPlaceSite.getAddress()}, C.PTR_SIZEOF); + OS.MoveMemory(ppvObject, new long[] {iOleInPlaceSite.getAddress()}, C.PTR_SIZEOF); AddRef(); return COM.S_OK; } if (COM.IsEqualGUID(guid, COM.IIDIOleDocumentSite )) { String progID = getProgramID(); if (!progID.startsWith("PowerPoint")) { //$NON-NLS-1$ - OS.MoveMemory(ppvObject, new long /*int*/[] {iOleDocumentSite.getAddress()}, C.PTR_SIZEOF); + OS.MoveMemory(ppvObject, new long[] {iOleDocumentSite.getAddress()}, C.PTR_SIZEOF); AddRef(); return COM.S_OK; } } - OS.MoveMemory(ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF); + OS.MoveMemory(ppvObject, new long[] {0}, C.PTR_SIZEOF); return COM.E_NOINTERFACE; } /** @@ -1119,7 +1119,7 @@ protected int QueryInterface(long /*int*/ riid, long /*int*/ ppvObject) { public int queryStatus(int cmd) { if (objIOleCommandTarget == null) { - long /*int*/[] address = new long /*int*/[1]; + long[] address = new long[1]; if (objIUnknown.QueryInterface(COM.IIDIOleCommandTarget, address) != COM.S_OK) return 0; objIOleCommandTarget = new IOleCommandTarget(address[0]); @@ -1202,7 +1202,7 @@ public boolean save(File file, boolean includeOleInfo) { return saveToStorageFile(file); return saveToTraditionalFile(file); } -private boolean saveFromContents(long /*int*/ address, File file) { +private boolean saveFromContents(long address, File file) { boolean success = false; @@ -1213,7 +1213,7 @@ private boolean saveFromContents(long /*int*/ address, File file) { FileOutputStream writer = new FileOutputStream(file); int increment = 1024 * 4; - long /*int*/ pv = OS.CoTaskMemAlloc(increment); + long pv = OS.CoTaskMemAlloc(increment); int[] pcbWritten = new int[1]; while (tempContents.Read(pv, increment, pcbWritten) == COM.S_OK && pcbWritten[0] > 0) { byte[] buffer = new byte[ pcbWritten[0]]; @@ -1233,7 +1233,7 @@ private boolean saveFromContents(long /*int*/ address, File file) { return success; } -private boolean saveFromOle10Native(long /*int*/ address, File file) { +private boolean saveFromOle10Native(long address, File file) { boolean success = false; @@ -1242,7 +1242,7 @@ private boolean saveFromOle10Native(long /*int*/ address, File file) { // The "\1Ole10Native" stream contains a DWORD header whose value is the length // of the native data that follows. - long /*int*/ pv = OS.CoTaskMemAlloc(4); + long pv = OS.CoTaskMemAlloc(4); int[] size = new int[1]; int rc = tempContents.Read(pv, 4, null); OS.MoveMemory(size, pv, 4); @@ -1282,14 +1282,14 @@ private boolean saveOffice2007(File file) { boolean result = false; /* Excel fails to open the package stream when the PersistStorage is not in hands off mode */ - long /*int*/[] ppv = new long /*int*/[1]; + long[] ppv = new long[1]; IPersistStorage iPersistStorage = null; if (objIUnknown.QueryInterface(COM.IIDIPersistStorage, ppv) == COM.S_OK) { iPersistStorage = new IPersistStorage(ppv[0]); tempStorage.AddRef(); iPersistStorage.HandsOffStorage(); } - long /*int*/[] address = new long /*int*/[1]; + long[] address = new long[1]; int grfMode = COM.STGM_DIRECT | COM.STGM_READ | COM.STGM_SHARE_EXCLUSIVE; if (tempStorage.OpenStream("Package", 0, grfMode, 0, address) == COM.S_OK) { //$NON-NLS-1$ result = saveFromContents(address[0], file); @@ -1323,11 +1323,11 @@ private boolean saveToStorageFile(File file) { if (!updateStorage()) return false; // get access to the persistent storage mechanism - long /*int*/[] address = new long /*int*/[1]; + long[] address = new long[1]; if (objIOleObject.QueryInterface(COM.IIDIPersistStorage, address) != COM.S_OK) return false; IPersistStorage permStorage = new IPersistStorage(address[0]); try { - address = new long /*int*/[1]; + address = new long[1]; char[] path = (file.getAbsolutePath()+"\0").toCharArray(); int mode = COM.STGM_TRANSACTED | COM.STGM_READWRITE | COM.STGM_SHARE_EXCLUSIVE | COM.STGM_CREATE; int result = COM.StgCreateDocfile(path, mode, 0, address); //Does an AddRef if successful @@ -1366,7 +1366,7 @@ private boolean saveToTraditionalFile(File file) { if (!updateStorage()) return false; - long /*int*/[] address = new long /*int*/[1]; + long[] address = new long[1]; // Look for a CONTENTS stream if (tempStorage.OpenStream("CONTENTS", 0, COM.STGM_DIRECT | COM.STGM_READ | COM.STGM_SHARE_EXCLUSIVE, 0, address) == COM.S_OK) //$NON-NLS-1$ return saveFromContents(address[0], file); @@ -1377,7 +1377,7 @@ private boolean saveToTraditionalFile(File file) { return false; } -private int Scroll_64(long /*int*/ scrollExtent) { +private int Scroll_64(long scrollExtent) { return COM.S_OK; } private int Scroll(int scrollExtent_cx, int scrollExtent_cy) { @@ -1459,7 +1459,7 @@ private int ShowObject() { public void showProperties(String title) { // Get the Property Page information from the OLE Object - long /*int*/[] ppvObject = new long /*int*/[1]; + long[] ppvObject = new long[1]; if (objIUnknown.QueryInterface(COM.IIDISpecifyPropertyPages, ppvObject) != COM.S_OK) return; ISpecifyPropertyPages objISPP = new ISpecifyPropertyPages(ppvObject[0]); CAUUID caGUID = new CAUUID(); @@ -1473,7 +1473,7 @@ public void showProperties(String title) { chTitle = new char[title.length()]; title.getChars(0, title.length(), chTitle, 0); } - result = COM.OleCreatePropertyFrame(frame.handle, 10, 10, chTitle, 1, new long /*int*/[] {objIUnknown.getAddress()}, caGUID.cElems, caGUID.pElems, COM.LOCALE_USER_DEFAULT, 0, 0); + result = COM.OleCreatePropertyFrame(frame.handle, 10, 10, chTitle, 1, new long[] {objIUnknown.getAddress()}, caGUID.cElems, caGUID.pElems, COM.LOCALE_USER_DEFAULT, 0, 0); // free the property page information OS.CoTaskMemFree(caGUID.pElems); @@ -1482,7 +1482,7 @@ private boolean updateStorage() { if (tempStorage == null) return false; - long /*int*/[] ppv = new long /*int*/[1]; + long[] ppv = new long[1]; if (objIUnknown.QueryInterface(COM.IIDIPersistStorage, ppv) != COM.S_OK) return false; IPersistStorage iPersistStorage = new IPersistStorage(ppv[0]); @@ -1504,7 +1504,7 @@ private SIZE xFormHimetricToPixels(SIZE aSize) { // Return a new Size which is the pixel transformation of a // size in HIMETRIC units. - long /*int*/ hDC = OS.GetDC(0); + long hDC = OS.GetDC(0); int xppi = OS.GetDeviceCaps(hDC, 88); // logical pixels/inch in x int yppi = OS.GetDeviceCaps(hDC, 90); // logical pixels/inch in y OS.ReleaseDC(0, hDC); @@ -1519,7 +1519,7 @@ private SIZE xFormPixelsToHimetric(SIZE aSize) { // Return a new size which is the HIMETRIC transformation of a // size in pixel units. - long /*int*/ hDC = OS.GetDC(0); + long hDC = OS.GetDC(0); int xppi = OS.GetDeviceCaps(hDC, 88); // logical pixels/inch in x int yppi = OS.GetDeviceCaps(hDC, 90); // logical pixels/inch in y OS.ReleaseDC(0, hDC); diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleControlSite.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleControlSite.java index 2e8de20233..3d3d0da62d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleControlSite.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleControlSite.java @@ -59,7 +59,7 @@ public class OleControlSite extends OleClientSite // supporting Event Sink attributes private OleEventSink[] oleEventSink = new OleEventSink[0]; private GUID[] oleEventSinkGUID = new GUID[0]; - private long /*int*/[] oleEventSinkIUnknown = new long /*int*/[0]; + private long[] oleEventSinkIUnknown = new long[0]; // supporting information for the Control COM object private CONTROLINFO currentControlInfo; @@ -133,21 +133,21 @@ public OleControlSite(Composite parent, int style, String progId) { appClsid = getClassID(progId); if (appClsid == null) OLE.error(OLE.ERROR_INVALID_CLASSID); - long /*int*/ licinfo = getLicenseInfo(appClsid); + long licinfo = getLicenseInfo(appClsid); if (licinfo == 0) { // Open a storage object tempStorage = createTempStorage(); // Create ole object with storage object - long /*int*/[] address = new long /*int*/[1]; + long[] address = new long[1]; /* * Bug in ICA Client 2.7. The creation of the IOleObject fails if the client * site is provided to OleCreate(). The fix is to detect that the program * id is an ICA Client and do not pass a client site to OleCreate(). * IOleObject.SetClientSite() is called later on. */ - long /*int*/ clientSite = isICAClient() ? 0 : iOleClientSite.getAddress(); + long clientSite = isICAClient() ? 0 : iOleClientSite.getAddress(); int result = COM.OleCreate(appClsid, COM.IIDIUnknown, COM.OLERENDER_DRAW, null, clientSite, tempStorage.getAddress(), address); if (result != COM.S_OK) OLE.error(OLE.ERROR_CANNOT_CREATE_OBJECT, result); @@ -156,7 +156,7 @@ public OleControlSite(Composite parent, int style, String progId) { } else { // Prepare the ClassFactory - long /*int*/[] ppvObject = new long /*int*/[1]; + long[] ppvObject = new long[1]; try { int result = COM.CoGetClassObject(appClsid, COM.CLSCTX_INPROC_HANDLER | COM.CLSCTX_INPROC_SERVER, 0, COM.IIDIClassFactory2, ppvObject); if (result != COM.S_OK) { @@ -164,7 +164,7 @@ public OleControlSite(Composite parent, int style, String progId) { } IClassFactory2 classFactory = new IClassFactory2(ppvObject[0]); // Create Com Object - ppvObject = new long /*int*/[1]; + ppvObject = new long[1]; result = classFactory.CreateInstanceLic(0, 0, COM.IIDIUnknown, licinfo, ppvObject); classFactory.Release(); if (result != COM.S_OK) @@ -176,7 +176,7 @@ public OleControlSite(Composite parent, int style, String progId) { objIUnknown = new IUnknown(ppvObject[0]); // Prepare a storage medium - ppvObject = new long /*int*/[1]; + ppvObject = new long[1]; if (objIUnknown.QueryInterface(COM.IIDIPersistStorage, ppvObject) == COM.S_OK) { IPersistStorage persist = new IPersistStorage(ppvObject[0]); tempStorage = createTempStorage(); @@ -260,7 +260,7 @@ public void addEventListener(int eventID, OleListener listener) { } static GUID getDefaultEventSinkGUID(IUnknown unknown) { // get Event Sink I/F from IProvideClassInfo2 - long /*int*/[] ppvObject = new long /*int*/[1]; + long[] ppvObject = new long[1]; if (unknown.QueryInterface(COM.IIDIProvideClassInfo2, ppvObject) == COM.S_OK) { IProvideClassInfo2 pci2 = new IProvideClassInfo2(ppvObject[0]); GUID riid = new GUID(); @@ -272,14 +272,14 @@ static GUID getDefaultEventSinkGUID(IUnknown unknown) { // get Event Sink I/F from IProvideClassInfo if (unknown.QueryInterface(COM.IIDIProvideClassInfo, ppvObject) == COM.S_OK) { IProvideClassInfo pci = new IProvideClassInfo(ppvObject[0]); - long /*int*/[] ppTI = new long /*int*/[1]; - long /*int*/[] ppEI = new long /*int*/[1]; + long[] ppTI = new long[1]; + long[] ppEI = new long[1]; int result = pci.GetClassInfo(ppTI); pci.Release(); if (result == COM.S_OK && ppTI[0] != 0) { ITypeInfo classInfo = new ITypeInfo(ppTI[0]); - long /*int*/[] ppTypeAttr = new long /*int*/[1]; + long[] ppTypeAttr = new long[1]; result = classInfo.GetTypeAttr(ppTypeAttr); if (result == COM.S_OK && ppTypeAttr[0] != 0) { TYPEATTR typeAttribute = new TYPEATTR(); @@ -304,7 +304,7 @@ static GUID getDefaultEventSinkGUID(IUnknown unknown) { if (ppEI[0] != 0) { ITypeInfo eventInfo = new ITypeInfo(ppEI[0]); - ppTypeAttr = new long /*int*/[1]; + ppTypeAttr = new long[1]; result = eventInfo.GetTypeAttr(ppTypeAttr); GUID riid = null; if (result == COM.S_OK && ppTypeAttr[0] != 0) { @@ -335,7 +335,7 @@ static GUID getDefaultEventSinkGUID(IUnknown unknown) { */ public void addEventListener(OleAutomation automation, int eventID, OleListener listener) { if (listener == null || automation == null) OLE.error (SWT.ERROR_NULL_ARGUMENT); - long /*int*/ address = automation.getAddress(); + long address = automation.getAddress(); IUnknown unknown = new IUnknown(address); GUID riid = getDefaultEventSinkGUID(unknown); if (riid != null) { @@ -359,7 +359,7 @@ public void addEventListener(OleAutomation automation, int eventID, OleListener */ public void addEventListener(OleAutomation automation, String eventSinkId, int eventID, OleListener listener) { if (listener == null || automation == null || eventSinkId == null) OLE.error (SWT.ERROR_NULL_ARGUMENT); - long /*int*/ address = automation.getAddress(); + long address = automation.getAddress(); if (address == 0) return; char[] buffer = (eventSinkId +"\0").toCharArray(); GUID guid = new GUID(); @@ -367,7 +367,7 @@ public void addEventListener(OleAutomation automation, String eventSinkId, int e addEventListener(address, guid, eventID, listener); } -void addEventListener(long /*int*/ iunknown, GUID guid, int eventID, OleListener listener) { +void addEventListener(long iunknown, GUID guid, int eventID, OleListener listener) { if (listener == null || iunknown == 0 || guid == null) OLE.error (SWT.ERROR_NULL_ARGUMENT); // have we connected to this kind of event sink before? int index = -1; @@ -385,7 +385,7 @@ void addEventListener(long /*int*/ iunknown, GUID guid, int eventID, OleListener int oldLength = oleEventSink.length; OleEventSink[] newOleEventSink = new OleEventSink[oldLength + 1]; GUID[] newOleEventSinkGUID = new GUID[oldLength + 1]; - long /*int*/[] newOleEventSinkIUnknown = new long /*int*/[oldLength + 1]; + long[] newOleEventSinkIUnknown = new long[oldLength + 1]; System.arraycopy(oleEventSink, 0, newOleEventSink, 0, oldLength); System.arraycopy(oleEventSinkGUID, 0, newOleEventSinkGUID, 0, oldLength); System.arraycopy(oleEventSinkIUnknown, 0, newOleEventSinkIUnknown, 0, oldLength); @@ -411,7 +411,7 @@ protected void addObjectReferences() { connectPropertyChangeSink(); // Get access to the Control object - long /*int*/[] ppvObject = new long /*int*/[1]; + long[] ppvObject = new long[1]; if (objIUnknown.QueryInterface(COM.IIDIOleControl, ppvObject) == COM.S_OK) { IOleControl objIOleControl = new IOleControl(ppvObject[0]); // ask the control for its info in case users @@ -448,34 +448,34 @@ protected void createCOMInterfaces () { // register each of the interfaces that this object implements iOleControlSite = new COMObject(new int[]{2, 0, 0, 0, 1, 1, 3, 2, 1, 0}){ @Override - public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long method0(long[] args) {return QueryInterface(args[0], args[1]);} @Override - public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long method1(long[] args) {return AddRef();} @Override - public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long method2(long[] args) {return Release();} @Override - public long /*int*/ method3(long /*int*/[] args) {return OnControlInfoChanged();} + public long method3(long[] args) {return OnControlInfoChanged();} // method4 LockInPlaceActive - not implemented // method5 GetExtendedControl - not implemented // method6 TransformCoords - not implemented // method7 Translate Accelerator - not implemented @Override - public long /*int*/ method8(long /*int*/[] args) {return OnFocus((int)/*64*/args[0]);} + public long method8(long[] args) {return OnFocus((int)args[0]);} // method9 ShowPropertyFrame - not implemented }; iDispatch = new COMObject(new int[]{2, 0, 0, 1, 3, 5, 8}){ @Override - public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long method0(long[] args) {return QueryInterface(args[0], args[1]);} @Override - public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long method1(long[] args) {return AddRef();} @Override - public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long method2(long[] args) {return Release();} // method3 GetTypeInfoCount - not implemented // method4 GetTypeInfo - not implemented // method5 GetIDsOfNames - not implemented @Override - public long /*int*/ method6(long /*int*/[] args) {return Invoke((int)/*64*/args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], args[4], args[5], args[6], args[7]);} + public long method6(long[] args) {return Invoke((int)args[0], args[1], (int)args[2], (int)args[3], args[4], args[5], args[6], args[7]);} }; } private void disconnectEventSinks() { @@ -487,7 +487,7 @@ private void disconnectEventSinks() { } oleEventSink = new OleEventSink[0]; oleEventSinkGUID = new GUID[0]; - oleEventSinkIUnknown = new long /*int*/[0]; + oleEventSinkIUnknown = new long[0]; } private void disconnectPropertyChangeSink() { @@ -575,19 +575,19 @@ public Color getForeground () { return super.getForeground(); } -protected long /*int*/ getLicenseInfo(GUID clsid) { - long /*int*/[] ppvObject = new long /*int*/[1]; +protected long getLicenseInfo(GUID clsid) { + long[] ppvObject = new long[1]; if (COM.CoGetClassObject(clsid, COM.CLSCTX_INPROC_HANDLER | COM.CLSCTX_INPROC_SERVER, 0, COM.IIDIClassFactory, ppvObject) != COM.S_OK) { return 0; } - long /*int*/ result = 0; + long result = 0; IUnknown unknown = new IUnknown(ppvObject[0]); if (unknown.QueryInterface(COM.IIDIClassFactory2, ppvObject) == COM.S_OK) { IClassFactory2 classFactory = new IClassFactory2(ppvObject[0]); LICINFO licinfo = new LICINFO(); if (classFactory.GetLicInfo(licinfo) == COM.S_OK) { - long /*int*/[] pBstrKey = new long /*int*/[1]; + long[] pBstrKey = new long[1]; if (licinfo != null && licinfo.fRuntimeKeyAvail) { if (classFactory.RequestLicKey(0, pBstrKey) == COM.S_OK) { result = pBstrKey[0]; @@ -619,22 +619,22 @@ public Variant getSiteProperty(int dispId){ return null; } @Override -protected int GetWindow(long /*int*/ phwnd) { +protected int GetWindow(long phwnd) { if (phwnd == 0) return COM.E_INVALIDARG; if (frame == null) { - OS.MoveMemory(phwnd, new long /*int*/[] {0}, C.PTR_SIZEOF); + OS.MoveMemory(phwnd, new long[] {0}, C.PTR_SIZEOF); return COM.E_NOTIMPL; } // Copy the Window's handle into the memory passed in - OS.MoveMemory(phwnd, new long /*int*/[] {handle}, C.PTR_SIZEOF); + OS.MoveMemory(phwnd, new long[] {handle}, C.PTR_SIZEOF); return COM.S_OK; } -private int Invoke(int dispIdMember, long /*int*/ riid, int lcid, int dwFlags, long /*int*/ pDispParams, long /*int*/ pVarResult, long /*int*/ pExcepInfo, long /*int*/ pArgErr) { +private int Invoke(int dispIdMember, long riid, int lcid, int dwFlags, long pDispParams, long pVarResult, long pExcepInfo, long pArgErr) { if (pVarResult == 0 || dwFlags != COM.DISPATCH_PROPERTYGET) { - if (pExcepInfo != 0) OS.MoveMemory(pExcepInfo, new long /*int*/ [] {0}, C.PTR_SIZEOF); + if (pExcepInfo != 0) OS.MoveMemory(pExcepInfo, new long [] {0}, C.PTR_SIZEOF); if (pArgErr != 0) OS.MoveMemory(pArgErr, new int[] {0}, 4); return COM.DISP_E_MEMBERNOTFOUND; } @@ -648,8 +648,8 @@ private int Invoke(int dispIdMember, long /*int*/ riid, int lcid, int dwFlags, l case COM.DISPID_AMBIENT_SUPPORTSMNEMONICS : case COM.DISPID_AMBIENT_SHOWGRABHANDLES : case COM.DISPID_AMBIENT_SHOWHATCHING : - if (pVarResult != 0) OS.MoveMemory(pVarResult, new long /*int*/ [] {0}, C.PTR_SIZEOF); - if (pExcepInfo != 0) OS.MoveMemory(pExcepInfo, new long /*int*/ [] {0}, C.PTR_SIZEOF); + if (pVarResult != 0) OS.MoveMemory(pVarResult, new long [] {0}, C.PTR_SIZEOF); + if (pExcepInfo != 0) OS.MoveMemory(pExcepInfo, new long [] {0}, C.PTR_SIZEOF); if (pArgErr != 0) OS.MoveMemory(pArgErr, new int[] {0}, 4); return COM.S_FALSE; @@ -661,20 +661,20 @@ private int Invoke(int dispIdMember, long /*int*/ riid, int lcid, int dwFlags, l case COM.DISPID_AMBIENT_LOCALEID : case COM.DISPID_AMBIENT_SILENT : case COM.DISPID_AMBIENT_MESSAGEREFLECT : - if (pVarResult != 0) OS.MoveMemory(pVarResult, new long /*int*/ [] {0}, C.PTR_SIZEOF); - if (pExcepInfo != 0) OS.MoveMemory(pExcepInfo, new long /*int*/ [] {0}, C.PTR_SIZEOF); + if (pVarResult != 0) OS.MoveMemory(pVarResult, new long [] {0}, C.PTR_SIZEOF); + if (pExcepInfo != 0) OS.MoveMemory(pExcepInfo, new long [] {0}, C.PTR_SIZEOF); if (pArgErr != 0) OS.MoveMemory(pArgErr, new int[] {0}, 4); return COM.E_NOTIMPL; default : - if (pVarResult != 0) OS.MoveMemory(pVarResult, new long /*int*/ [] {0}, C.PTR_SIZEOF); - if (pExcepInfo != 0) OS.MoveMemory(pExcepInfo,new long /*int*/ [] {0}, C.PTR_SIZEOF); + if (pVarResult != 0) OS.MoveMemory(pVarResult, new long [] {0}, C.PTR_SIZEOF); + if (pExcepInfo != 0) OS.MoveMemory(pExcepInfo,new long [] {0}, C.PTR_SIZEOF); if (pArgErr != 0) OS.MoveMemory(pArgErr, new int[] {0}, 4); return COM.DISP_E_MEMBERNOTFOUND; } } private int OnControlInfoChanged() { - long /*int*/[] ppvObject = new long /*int*/[1]; + long[] ppvObject = new long[1]; if (objIUnknown.QueryInterface(COM.IIDIOleControl, ppvObject) == COM.S_OK) { IOleControl objIOleControl = new IOleControl(ppvObject[0]); // ask the control for its info in case users @@ -700,7 +700,7 @@ void onFocusIn(Event e) { if (objIOleInPlaceObject == null) return; if (!isActivated) doVerb(OLE.OLEIVERB_UIACTIVATE); if (isFocusControl()) return; - long /*int*/[] phwnd = new long /*int*/[1]; + long[] phwnd = new long[1]; objIOleInPlaceObject.GetWindow(phwnd); if (phwnd[0] == 0) return; OS.SetFocus(phwnd[0]); @@ -763,7 +763,7 @@ private int OnFocus(int fGotFocus) { return COM.S_OK; } @Override -protected int QueryInterface(long /*int*/ riid, long /*int*/ ppvObject) { +protected int QueryInterface(long riid, long ppvObject) { int result = super.QueryInterface(riid, ppvObject); if (result == COM.S_OK) return result; @@ -772,16 +772,16 @@ protected int QueryInterface(long /*int*/ riid, long /*int*/ ppvObject) { GUID guid = new GUID(); COM.MoveMemory(guid, riid, GUID.sizeof); if (COM.IsEqualGUID(guid, COM.IIDIOleControlSite)) { - OS.MoveMemory(ppvObject, new long /*int*/[] {iOleControlSite.getAddress()}, C.PTR_SIZEOF); + OS.MoveMemory(ppvObject, new long[] {iOleControlSite.getAddress()}, C.PTR_SIZEOF); AddRef(); return COM.S_OK; } if (COM.IsEqualGUID(guid, COM.IIDIDispatch)) { - OS.MoveMemory(ppvObject, new long /*int*/[] {iDispatch.getAddress()}, C.PTR_SIZEOF); + OS.MoveMemory(ppvObject, new long[] {iDispatch.getAddress()}, C.PTR_SIZEOF); AddRef(); return COM.S_OK; } - OS.MoveMemory(ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF); + OS.MoveMemory(ppvObject, new long[] {0}, C.PTR_SIZEOF); return COM.E_NOINTERFACE; } @Override @@ -865,14 +865,14 @@ public void removeEventListener(OleAutomation automation, GUID guid, int eventID public void removeEventListener(OleAutomation automation, int eventID, OleListener listener) { checkWidget(); if (automation == null || listener == null) SWT.error (SWT.ERROR_NULL_ARGUMENT); - long /*int*/ address = automation.getAddress(); + long address = automation.getAddress(); IUnknown unknown = new IUnknown(address); GUID riid = getDefaultEventSinkGUID(unknown); if (riid != null) { removeEventListener(address, riid, eventID, listener); } } -void removeEventListener(long /*int*/ iunknown, GUID guid, int eventID, OleListener listener) { +void removeEventListener(long iunknown, GUID guid, int eventID, OleListener listener) { if (listener == null || guid == null) SWT.error (SWT.ERROR_NULL_ARGUMENT); for (int i = 0; i < oleEventSink.length; i++) { if (COM.IsEqualGUID(oleEventSinkGUID[i], guid)) { @@ -886,7 +886,7 @@ void removeEventListener(long /*int*/ iunknown, GUID guid, int eventID, OleListe if (oldLength == 1) { oleEventSink = new OleEventSink[0]; oleEventSinkGUID = new GUID[0]; - oleEventSinkIUnknown = new long /*int*/[0]; + oleEventSinkIUnknown = new long[0]; } else { OleEventSink[] newOleEventSink = new OleEventSink[oldLength - 1]; System.arraycopy(oleEventSink, 0, newOleEventSink, 0, i); @@ -898,7 +898,7 @@ void removeEventListener(long /*int*/ iunknown, GUID guid, int eventID, OleListe System.arraycopy(oleEventSinkGUID, i + 1, newOleEventSinkGUID, i, oldLength - i - 1); oleEventSinkGUID = newOleEventSinkGUID; - long /*int*/[] newOleEventSinkIUnknown = new long /*int*/[oldLength - 1]; + long[] newOleEventSinkIUnknown = new long[oldLength - 1]; System.arraycopy(oleEventSinkIUnknown, 0, newOleEventSinkIUnknown, 0, i); System.arraycopy(oleEventSinkIUnknown, i + 1, newOleEventSinkIUnknown, i, oldLength - i - 1); oleEventSinkIUnknown = newOleEventSinkIUnknown; diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleEventSink.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleEventSink.java index 99ee543376..cb3e57c1b5 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleEventSink.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleEventSink.java @@ -31,7 +31,7 @@ final class OleEventSink private OleEventTable eventTable; -OleEventSink(OleControlSite widget, long /*int*/ iUnknown, GUID riid) { +OleEventSink(OleControlSite widget, long iUnknown, GUID riid) { this.widget = widget; this.eventGuid = riid; @@ -41,10 +41,10 @@ OleEventSink(OleControlSite widget, long /*int*/ iUnknown, GUID riid) { } void connect () { - long /*int*/[] ppvObject = new long /*int*/[1]; + long[] ppvObject = new long[1]; if (objIUnknown.QueryInterface(COM.IIDIConnectionPointContainer, ppvObject) == COM.S_OK) { IConnectionPointContainer cpc = new IConnectionPointContainer(ppvObject[0]); - long /*int*/[] ppCP = new long /*int*/[1]; + long[] ppCP = new long[1]; if (cpc.FindConnectionPoint(eventGuid, ppCP) == COM.S_OK) { IConnectionPoint cp = new IConnectionPoint(ppCP[0]); int[] pCookie = new int[1]; @@ -67,22 +67,22 @@ int AddRef() { private void createCOMInterfaces() { iDispatch = new COMObject(new int[]{2, 0, 0, 1, 3, 4, 8}){ @Override - public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long method0(long[] args) {return QueryInterface(args[0], args[1]);} @Override - public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long method1(long[] args) {return AddRef();} @Override - public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long method2(long[] args) {return Release();} // method3 GetTypeInfoCount - not implemented // method4 GetTypeInfo - not implemented // method5 GetIDsOfNames - not implemented @Override - public long /*int*/ method6(long /*int*/[] args) {return Invoke((int)/*64*/args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], args[4], args[5], args[6], args[7]);} + public long method6(long[] args) {return Invoke((int)args[0], args[1], (int)args[2], (int)args[3], args[4], args[5], args[6], args[7]);} }; } void disconnect() { // disconnect event sink if (eventCookie != 0 && objIUnknown != null) { - long /*int*/[] ppvObject = new long /*int*/[1]; + long[] ppvObject = new long[1]; if (objIUnknown.QueryInterface(COM.IIDIConnectionPointContainer, ppvObject) == COM.S_OK) { IConnectionPointContainer cpc = new IConnectionPointContainer(ppvObject[0]); if (cpc.FindConnectionPoint(eventGuid, ppvObject) == COM.S_OK) { @@ -102,7 +102,7 @@ private void disposeCOMInterfaces() { iDispatch = null; } -private int Invoke(int dispIdMember, long /*int*/ riid, int lcid, int dwFlags, long /*int*/ pDispParams, long /*int*/ pVarResult, long /*int*/ pExcepInfo, long /*int*/ pArgErr) +private int Invoke(int dispIdMember, long riid, int lcid, int dwFlags, long pDispParams, long pVarResult, long pExcepInfo, long pArgErr) { if (eventTable == null || !eventTable.hooks(dispIdMember)) return COM.S_OK; @@ -114,7 +114,7 @@ private int Invoke(int dispIdMember, long /*int*/ riid, int lcid, int dwFlags, l COM.MoveMemory(dispParams, pDispParams, DISPPARAMS.sizeof); eventInfo = new Variant[dispParams.cArgs]; int size = VARIANT.sizeof; - long /*int*/ offset = (dispParams.cArgs - 1) * size; + long offset = (dispParams.cArgs - 1) * size; for (int j = 0; j < dispParams.cArgs; j++){ eventInfo[j] = new Variant(); @@ -159,7 +159,7 @@ private void notifyListener (int eventType, OleEvent event) { event.widget = widget; eventTable.sendEvent (event); } -private int QueryInterface(long /*int*/ riid, long /*int*/ ppvObject) { +private int QueryInterface(long riid, long ppvObject) { if (riid == 0 || ppvObject == 0) return COM.E_INVALIDARG; @@ -168,12 +168,12 @@ private int QueryInterface(long /*int*/ riid, long /*int*/ ppvObject) { if ( COM.IsEqualGUID(guid, COM.IIDIUnknown) || COM.IsEqualGUID(guid, COM.IIDIDispatch) || COM.IsEqualGUID(guid, eventGuid)) { - OS.MoveMemory(ppvObject, new long /*int*/[] {iDispatch.getAddress()}, C.PTR_SIZEOF); + OS.MoveMemory(ppvObject, new long[] {iDispatch.getAddress()}, C.PTR_SIZEOF); AddRef(); return OLE.S_OK; } - OS.MoveMemory(ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF); + OS.MoveMemory(ppvObject, new long[] {0}, C.PTR_SIZEOF); return COM.E_NOINTERFACE; } int Release() { diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleFrame.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleFrame.java index d87d3deea6..b6bd46ca49 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleFrame.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleFrame.java @@ -61,10 +61,10 @@ final public class OleFrame extends Composite private Listener listener; - private long /*int*/ shellHandle; - private long /*int*/ oldMenuHandle; - private long /*int*/ newMenuHandle; - private static long /*int*/ lastActivatedMenuHandle; + private long shellHandle; + private long oldMenuHandle; + private long newMenuHandle; + private static long lastActivatedMenuHandle; private static String CHECK_FOCUS = "OLE_CHECK_FOCUS"; //$NON-NLS-1$ private static String HHOOK = "OLE_HHOOK"; //$NON-NLS-1$ @@ -139,9 +139,9 @@ private static void initCheckFocus (final Display display) { timer[0] = () -> { if (lastFocus[0] instanceof OleClientSite && !lastFocus[0].isDisposed()) { // ignore popup menus and dialogs - long /*int*/ hwnd = OS.GetFocus(); + long hwnd = OS.GetFocus(); while (hwnd != 0) { - long /*int*/ ownerHwnd = OS.GetWindow(hwnd, OS.GW_OWNER); + long ownerHwnd = OS.GetWindow(hwnd, OS.GW_OWNER); if (ownerHwnd != 0) { display.timerExec(time, timer[0]); return; @@ -173,10 +173,10 @@ private static void initCheckFocus (final Display display) { private static void initMsgHook(Display display) { if (display.getData(HHOOK) != null) return; final Callback callback = new Callback(OleFrame.class, "getMsgProc", 3); //$NON-NLS-1$ - long /*int*/ address = callback.getAddress(); + long address = callback.getAddress(); if (address == 0) SWT.error(SWT.ERROR_NO_MORE_CALLBACKS); int threadId = OS.GetCurrentThreadId(); - final long /*int*/ hHook = OS.SetWindowsHookEx(OS.WH_GETMESSAGE, address, 0, threadId); + final long hHook = OS.SetWindowsHookEx(OS.WH_GETMESSAGE, address, 0, threadId); if (hHook == 0) { callback.dispose(); return; @@ -188,13 +188,13 @@ private static void initMsgHook(Display display) { if (callback != null) callback.dispose(); }); } -static long /*int*/ getMsgProc(long /*int*/ code, long /*int*/ wParam, long /*int*/ lParam) { +static long getMsgProc(long code, long wParam, long lParam) { Display display = Display.getCurrent(); if (display == null) return 0; LONG hHook = (LONG)display.getData(HHOOK); if (hHook == null) return 0; if (code < 0 || (wParam & OS.PM_REMOVE) == 0) { - return OS.CallNextHookEx(hHook.value, (int)/*64*/code, wParam, lParam); + return OS.CallNextHookEx(hHook.value, (int)code, wParam, lParam); } MSG msg = (MSG)display.getData(HHOOKMSG); OS.MoveMemory(msg, lParam, MSG.sizeof); @@ -202,7 +202,7 @@ static long /*int*/ getMsgProc(long /*int*/ code, long /*int*/ wParam, long /*in if (OS.WM_KEYFIRST <= message && message <= OS.WM_KEYLAST) { if (display != null) { Widget widget = null; - long /*int*/ hwnd = msg.hwnd; + long hwnd = msg.hwnd; while (hwnd != 0) { widget = display.findWidget (hwnd); if (widget != null) break; @@ -235,7 +235,7 @@ static long /*int*/ getMsgProc(long /*int*/ code, long /*int*/ wParam, long /*in switch (msg.message) { case OS.WM_KEYDOWN: case OS.WM_SYSKEYDOWN: { - switch ((int)/*64*/msg.wParam) { + switch ((int)msg.wParam) { case OS.VK_SHIFT: case OS.VK_MENU: case OS.VK_CONTROL: @@ -244,7 +244,7 @@ static long /*int*/ getMsgProc(long /*int*/ code, long /*int*/ wParam, long /*in case OS.VK_SCROLL: break; default: { - int mapKey = OS.MapVirtualKey ((int)/*64*/msg.wParam, 2); + int mapKey = OS.MapVirtualKey ((int)msg.wParam, 2); if (mapKey != 0) { accentKey = (mapKey & 0x80000000) != 0; if (!accentKey) { @@ -270,7 +270,7 @@ static long /*int*/ getMsgProc(long /*int*/ code, long /*int*/ wParam, long /*in } /* Allow OleClientSite to process key events before activeX control */ if (!consumed && !accentKey && !ignoreNextKey) { - long /*int*/ hwndOld = msg.hwnd; + long hwndOld = msg.hwnd; msg.hwnd = site.handle; consumed = OS.DispatchMessage (msg) == 1; msg.hwnd = hwndOld; @@ -278,7 +278,7 @@ static long /*int*/ getMsgProc(long /*int*/ code, long /*int*/ wParam, long /*in switch (msg.message) { case OS.WM_KEYDOWN: case OS.WM_SYSKEYDOWN: { - switch ((int)/*64*/msg.wParam) { + switch ((int)msg.wParam) { case OS.VK_SHIFT: case OS.VK_MENU: case OS.VK_CONTROL: @@ -306,7 +306,7 @@ static long /*int*/ getMsgProc(long /*int*/ code, long /*int*/ wParam, long /*in } } } - return OS.CallNextHookEx(hHook.value, (int)/*64*/code, wParam, lParam); + return OS.CallNextHookEx(hHook.value, (int)code, wParam, lParam); } /** * Increment the count of references to this instance @@ -323,33 +323,33 @@ private int ContextSensitiveHelp(int fEnterMode) { private void createCOMInterfaces() { iOleInPlaceFrame = new COMObject(new int[]{2, 0, 0, 1, 1, 1, 1, 1, 2, 2, 3, 1, 1, 1, 2}){ @Override - public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long method0(long[] args) {return QueryInterface(args[0], args[1]);} @Override - public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long method1(long[] args) {return AddRef();} @Override - public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long method2(long[] args) {return Release();} @Override - public long /*int*/ method3(long /*int*/[] args) {return GetWindow(args[0]);} + public long method3(long[] args) {return GetWindow(args[0]);} @Override - public long /*int*/ method4(long /*int*/[] args) {return ContextSensitiveHelp((int)/*64*/args[0]);} + public long method4(long[] args) {return ContextSensitiveHelp((int)args[0]);} @Override - public long /*int*/ method5(long /*int*/[] args) {return GetBorder(args[0]);} + public long method5(long[] args) {return GetBorder(args[0]);} @Override - public long /*int*/ method6(long /*int*/[] args) {return RequestBorderSpace(args[0]);} + public long method6(long[] args) {return RequestBorderSpace(args[0]);} @Override - public long /*int*/ method7(long /*int*/[] args) {return SetBorderSpace(args[0]);} + public long method7(long[] args) {return SetBorderSpace(args[0]);} @Override - public long /*int*/ method8(long /*int*/[] args) {return SetActiveObject(args[0], args[1]);} + public long method8(long[] args) {return SetActiveObject(args[0], args[1]);} @Override - public long /*int*/ method9(long /*int*/[] args) {return InsertMenus(args[0], args[1]);} + public long method9(long[] args) {return InsertMenus(args[0], args[1]);} @Override - public long /*int*/ method10(long /*int*/[] args) {return SetMenu(args[0], args[1], args[2]);} + public long method10(long[] args) {return SetMenu(args[0], args[1], args[2]);} @Override - public long /*int*/ method11(long /*int*/[] args) {return RemoveMenus(args[0]);} + public long method11(long[] args) {return RemoveMenus(args[0]);} // method12 SetStatusText - not implemented // method13 EnableModeless - not implemented @Override - public long /*int*/ method14(long /*int*/[] args) {return TranslateAccelerator(args[0], (int)/*64*/args[1]);} + public long method14(long[] args) {return TranslateAccelerator(args[0], (int)args[1]);} }; } private void disposeCOMInterfaces () { @@ -357,7 +357,7 @@ private void disposeCOMInterfaces () { iOleInPlaceFrame.dispose(); iOleInPlaceFrame = null; } -private int GetBorder(long /*int*/ lprectBorder) { +private int GetBorder(long lprectBorder) { /* The IOleInPlaceUIWindow::GetBorder function, when called on a document or frame window object, returns the outer rectangle (relative to the window) where the object can put @@ -406,11 +406,11 @@ public MenuItem[] getContainerMenus(){ public MenuItem[] getFileMenus(){ return fileMenuItems; } -long /*int*/ getIOleInPlaceFrame() { +long getIOleInPlaceFrame() { return iOleInPlaceFrame.getAddress(); } -private long /*int*/ getMenuItemID(long /*int*/ hMenu, int index) { - long /*int*/ id = 0; +private long getMenuItemID(long hMenu, int index) { + long id = 0; MENUITEMINFO lpmii = new MENUITEMINFO(); lpmii.cbSize = MENUITEMINFO.sizeof; lpmii.fMask = OS.MIIM_STATE | OS.MIIM_SUBMENU | OS.MIIM_ID; @@ -422,9 +422,9 @@ private long /*int*/ getMenuItemID(long /*int*/ hMenu, int index) { } return id; } -private int GetWindow(long /*int*/ phwnd) { +private int GetWindow(long phwnd) { if (phwnd != 0) { - OS.MoveMemory(phwnd, new long /*int*/[] {handle}, C.PTR_SIZEOF); + OS.MoveMemory(phwnd, new long[] {handle}, C.PTR_SIZEOF); } return COM.S_OK; } @@ -446,22 +446,22 @@ private int GetWindow(long /*int*/ phwnd) { public MenuItem[] getWindowMenus(){ return windowMenuItems; } -private int InsertMenus(long /*int*/ hmenuShared, long /*int*/ lpMenuWidths) { +private int InsertMenus(long hmenuShared, long lpMenuWidths) { // locate menu bar Menu menubar = getShell().getMenuBar(); if (menubar == null || menubar.isDisposed()) { OS.MoveMemory(lpMenuWidths, new int[] {0}, 4); return COM.S_OK; } - long /*int*/ hMenu = menubar.handle; + long hMenu = menubar.handle; // Create a holder for menu information. This will be passed down to // the OS and the OS will fill in the requested information for each menu. MENUITEMINFO lpmii = new MENUITEMINFO(); - long /*int*/ hHeap = OS.GetProcessHeap(); + long hHeap = OS.GetProcessHeap(); int cch = 128; int byteCount = cch * TCHAR.sizeof; - long /*int*/ pszText = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, byteCount); + long pszText = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, byteCount); lpmii.cbSize = MENUITEMINFO.sizeof; lpmii.fMask = OS.MIIM_STATE | OS.MIIM_ID | OS.MIIM_TYPE | OS.MIIM_SUBMENU | OS.MIIM_DATA; lpmii.dwTypeData = pszText; @@ -588,19 +588,19 @@ private void onResize(Event e) { objIOleInPlaceActiveObject.ResizeBorder(lpRect, iOleInPlaceFrame.getAddress(), true); } } -private int QueryInterface(long /*int*/ riid, long /*int*/ ppvObject) { +private int QueryInterface(long riid, long ppvObject) { // implements IUnknown, IOleInPlaceFrame, IOleContainer, IOleInPlaceUIWindow if (riid == 0 || ppvObject == 0) return COM.E_INVALIDARG; GUID guid = new GUID(); COM.MoveMemory(guid, riid, GUID.sizeof); if (COM.IsEqualGUID(guid, COM.IIDIUnknown) || COM.IsEqualGUID(guid, COM.IIDIOleInPlaceFrame) ) { - OS.MoveMemory(ppvObject, new long /*int*/ [] {iOleInPlaceFrame.getAddress()}, C.PTR_SIZEOF); + OS.MoveMemory(ppvObject, new long [] {iOleInPlaceFrame.getAddress()}, C.PTR_SIZEOF); AddRef(); return COM.S_OK; } - OS.MoveMemory(ppvObject, new long /*int*/ [] {0}, C.PTR_SIZEOF); + OS.MoveMemory(ppvObject, new long [] {0}, C.PTR_SIZEOF); return COM.E_NOINTERFACE; } /** @@ -624,12 +624,12 @@ private void releaseObjectInterfaces() { } objIOleInPlaceActiveObject = null; } -private int RemoveMenus(long /*int*/ hmenuShared) { +private int RemoveMenus(long hmenuShared) { Menu menubar = getShell().getMenuBar(); if (menubar == null || menubar.isDisposed()) return COM.S_FALSE; - long /*int*/ hMenu = menubar.handle; + long hMenu = menubar.handle; List<LONG> ids = new ArrayList<>(); if (this.fileMenuItems != null) { @@ -638,7 +638,7 @@ private int RemoveMenus(long /*int*/ hmenuShared) { if (item != null && !item.isDisposed()) { int index = item.getParent().indexOf(item); // get Id from original menubar - long /*int*/ id = getMenuItemID(hMenu, index); + long id = getMenuItemID(hMenu, index); ids.add(new LONG(id)); } } @@ -648,7 +648,7 @@ private int RemoveMenus(long /*int*/ hmenuShared) { MenuItem item = this.containerMenuItems[i]; if (item != null && !item.isDisposed()) { int index = item.getParent().indexOf(item); - long /*int*/ id = getMenuItemID(hMenu, index); + long id = getMenuItemID(hMenu, index); ids.add(new LONG(id)); } } @@ -658,24 +658,24 @@ private int RemoveMenus(long /*int*/ hmenuShared) { MenuItem item = this.windowMenuItems[i]; if (item != null && !item.isDisposed()) { int index = item.getParent().indexOf(item); - long /*int*/ id = getMenuItemID(hMenu, index); + long id = getMenuItemID(hMenu, index); ids.add(new LONG(id)); } } } int index = OS.GetMenuItemCount(hmenuShared) - 1; for (int i = index; i >= 0; i--) { - long /*int*/ id = getMenuItemID(hmenuShared, i); + long id = getMenuItemID(hmenuShared, i); if (ids.contains(new LONG(id))){ OS.RemoveMenu(hmenuShared, i, OS.MF_BYPOSITION); } } return COM.S_OK; } -private int RequestBorderSpace(long /*int*/ pborderwidths) { +private int RequestBorderSpace(long pborderwidths) { return COM.S_OK; } -int SetActiveObject(long /*int*/ pActiveObject, long /*int*/ pszObjName) { +int SetActiveObject(long pActiveObject, long pszObjName) { if (objIOleInPlaceActiveObject != null) { objIOleInPlaceActiveObject.Release(); objIOleInPlaceActiveObject = null; @@ -687,7 +687,7 @@ int SetActiveObject(long /*int*/ pActiveObject, long /*int*/ pszObjName) { return COM.S_OK; } -private int SetBorderSpace(long /*int*/ pborderwidths) { +private int SetBorderSpace(long pborderwidths) { // A Control/Document can : // Use its own toolbars, requesting border space of a specific size, or, // Use no toolbars, but force the container to remove its toolbars by passing a @@ -755,8 +755,8 @@ void setCurrentDocument(OleClientSite doc) { public void setFileMenus(MenuItem[] fileMenus){ fileMenuItems = fileMenus; } -private int SetMenu(long /*int*/ hmenuShared, long /*int*/ holemenu, long /*int*/ hwndActiveObject) { - long /*int*/ inPlaceActiveObject = 0; +private int SetMenu(long hmenuShared, long holemenu, long hwndActiveObject) { + long inPlaceActiveObject = 0; if (objIOleInPlaceActiveObject != null) inPlaceActiveObject = objIOleInPlaceActiveObject.getAddress(); @@ -765,7 +765,7 @@ private int SetMenu(long /*int*/ hmenuShared, long /*int*/ holemenu, long /*int* return COM.OleSetMenuDescriptor(0, getShell().handle, hwndActiveObject, iOleInPlaceFrame.getAddress(), inPlaceActiveObject); } - long /*int*/ handle = menubar.getShell().handle; + long handle = menubar.getShell().handle; if (hmenuShared == 0 && holemenu == 0) { // re-instate the original menu - this occurs on deactivation @@ -805,14 +805,14 @@ private boolean translateOleAccelerator(MSG msg) { int result = objIOleInPlaceActiveObject.TranslateAccelerator(msg); return (result != COM.S_FALSE && result != COM.E_NOTIMPL); } -private int TranslateAccelerator(long /*int*/ lpmsg, int wID){ +private int TranslateAccelerator(long lpmsg, int wID){ Menu menubar = getShell().getMenuBar(); if (menubar == null || menubar.isDisposed() || !menubar.isEnabled()) return COM.S_FALSE; if (wID < 0) return COM.S_FALSE; Shell shell = menubar.getShell(); - long /*int*/ hwnd = shell.handle; - long /*int*/ hAccel = OS.SendMessage(hwnd, OS.WM_APP+1, 0, 0); + long hwnd = shell.handle; + long hAccel = OS.SendMessage(hwnd, OS.WM_APP+1, 0, 0); if (hAccel == 0) return COM.S_FALSE; MSG msg = new MSG(); diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OlePropertyChangeSink.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OlePropertyChangeSink.java index 672f56e5f1..917dd2c1f9 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OlePropertyChangeSink.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OlePropertyChangeSink.java @@ -50,7 +50,7 @@ int AddRef() { void connect(IUnknown objIUnknown) { // Set up property change notification sink - long /*int*/[] ppvObject = new long /*int*/[1]; + long[] ppvObject = new long[1]; if (objIUnknown.QueryInterface(COM.IIDIConnectionPointContainer, ppvObject) == COM.S_OK) { IConnectionPointContainer cpc = new IConnectionPointContainer(ppvObject[0]); if (cpc.FindConnectionPoint(COM.IIDIPropertyNotifySink, ppvObject) == COM.S_OK) { @@ -67,22 +67,22 @@ void connect(IUnknown objIUnknown) { private void createCOMInterfaces() { iPropertyNotifySink = new COMObject(new int[]{2, 0, 0, 1, 1}){ @Override - public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long method0(long[] args) {return QueryInterface(args[0], args[1]);} @Override - public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long method1(long[] args) {return AddRef();} @Override - public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long method2(long[] args) {return Release();} @Override - public long /*int*/ method3(long /*int*/[] args) {return OnChanged((int)/*64*/args[0]);} + public long method3(long[] args) {return OnChanged((int)args[0]);} @Override - public long /*int*/ method4(long /*int*/[] args) {return OnRequestEdit((int)/*64*/args[0]);} + public long method4(long[] args) {return OnRequestEdit((int)args[0]);} }; } void disconnect(IUnknown objIUnknown) { // disconnect property notification sink if (propertyCookie != 0 && objIUnknown != null) { - long /*int*/[] ppvObject = new long /*int*/[1]; + long[] ppvObject = new long[1]; if (objIUnknown.QueryInterface(COM.IIDIConnectionPointContainer, ppvObject) == COM.S_OK) { IConnectionPointContainer cpc = new IConnectionPointContainer(ppvObject[0]); if (cpc.FindConnectionPoint(COM.IIDIPropertyNotifySink, ppvObject) == COM.S_OK) { @@ -139,17 +139,17 @@ private int OnRequestEdit(int dispID) { notifyListener(dispID,event); return (event.doit) ? COM.S_OK : COM.S_FALSE; } -private int QueryInterface(long /*int*/ riid, long /*int*/ ppvObject) { +private int QueryInterface(long riid, long ppvObject) { if (riid == 0 || ppvObject == 0) return COM.E_INVALIDARG; GUID guid = new GUID(); COM.MoveMemory(guid, riid, GUID.sizeof); if (COM.IsEqualGUID(guid, COM.IIDIUnknown) || COM.IsEqualGUID(guid, COM.IIDIPropertyNotifySink)) { - OS.MoveMemory(ppvObject, new long /*int*/[] {iPropertyNotifySink.getAddress()}, C.PTR_SIZEOF); + OS.MoveMemory(ppvObject, new long[] {iPropertyNotifySink.getAddress()}, C.PTR_SIZEOF); AddRef(); return COM.S_OK; } - OS.MoveMemory(ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF); + OS.MoveMemory(ppvObject, new long[] {0}, C.PTR_SIZEOF); return COM.E_NOINTERFACE; } int Release() { 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 4d3dd97fef..b9a0122cd1 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 @@ -41,7 +41,7 @@ public final class Variant { private float floatData; private double doubleData; private String stringData; - private long /*int*/ byRefPtr; + private long byRefPtr; private IDispatch dispatchData; private IUnknown unknownData; @@ -74,7 +74,7 @@ public final class Variant { * * @since 3.3 */ -public static void win32_copy (long /*int*/ pVarDest, Variant varSrc) { +public static void win32_copy (long pVarDest, Variant varSrc) { varSrc.getData (pVarDest); } @@ -97,7 +97,7 @@ public static void win32_copy (long /*int*/ pVarDest, Variant varSrc) { * * @since 3.3 */ -public static Variant win32_new (long /*int*/ pVariant) { +public static Variant win32_new (long pVariant) { Variant variant = new Variant (); variant.setData (pVariant); return variant; @@ -154,7 +154,7 @@ public Variant(double val) { * @param byRefType the type of the data being transferred such as OLE.VT_BSTR | OLE.VT_BYREF * */ -public Variant(long /*int*/ ptr, short byRefType) { +public Variant(long ptr, short byRefType) { type = byRefType; byRefPtr = ptr; } @@ -281,8 +281,8 @@ public OleAutomation getAutomation() { return new OleAutomation(dispatchData); } // try to coerce the value to the desired type - long /*int*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); - long /*int*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + long oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + long newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); try { getData(oldPtr); int result = COM.VariantChangeType(newPtr, oldPtr, (short) 0, COM.VT_DISPATCH); @@ -324,8 +324,8 @@ public IDispatch getDispatch() { return dispatchData; } // try to coerce the value to the desired type - long /*int*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); - long /*int*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + long oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + long newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); try { getData(oldPtr); int result = COM.VariantChangeType(newPtr, oldPtr, (short) 0, COM.VT_DISPATCH); @@ -366,8 +366,8 @@ public boolean getBoolean() { } // try to coerce the value to the desired type - long /*int*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); - long /*int*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + long oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + long newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); try { getData(oldPtr); int result = COM.VariantChangeType(newPtr, oldPtr, (short) 0, COM.VT_BOOL); @@ -391,7 +391,7 @@ public boolean getBoolean() { * @return a pointer to the referenced data represented by this Variant or 0 * */ -public long /*int*/ getByRef() { +public long getByRef() { if (type == COM.VT_EMPTY) { OLE.error(OLE.ERROR_CANNOT_CHANGE_VARIANT_TYPE, -1); } @@ -424,8 +424,8 @@ public byte getByte() { } // try to coerce the value to the desired type - long /*int*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); - long /*int*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + long oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + long newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); try { getData(oldPtr); int result = COM.VariantChangeType(newPtr, oldPtr, (short) 0, COM.VT_I1); @@ -464,8 +464,8 @@ public char getChar() { } // try to coerce the value to the desired type - long /*int*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); - long /*int*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + long oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + long newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); try { getData(oldPtr); int result = COM.VariantChangeType(newPtr, oldPtr, (short) 0, COM.VT_UI2); @@ -481,7 +481,7 @@ public char getChar() { OS.GlobalFree(newPtr); } } -void getData(long /*int*/ pData){ +void getData(long pData){ if (pData == 0) OLE.error(OLE.ERROR_OUT_OF_MEMORY); COM.VariantInit(pData); @@ -489,7 +489,7 @@ void getData(long /*int*/ pData){ if ((type & COM.VT_BYREF) == COM.VT_BYREF) { //TODO - use VARIANT structure OS.MoveMemory(pData, new short[] {type}, 2); - OS.MoveMemory(pData + 8, new long /*int*/[]{byRefPtr}, C.PTR_SIZEOF); + OS.MoveMemory(pData + 8, new long[]{byRefPtr}, C.PTR_SIZEOF); return; } @@ -533,18 +533,18 @@ void getData(long /*int*/ pData){ case COM.VT_DISPATCH : dispatchData.AddRef(); OS.MoveMemory(pData, new short[] {type}, 2); - OS.MoveMemory(pData + 8, new long /*int*/[]{dispatchData.getAddress()}, C.PTR_SIZEOF); + OS.MoveMemory(pData + 8, new long[]{dispatchData.getAddress()}, C.PTR_SIZEOF); break; case COM.VT_UNKNOWN : unknownData.AddRef(); OS.MoveMemory(pData, new short[] {type}, 2); - OS.MoveMemory(pData + 8, new long /*int*/[]{unknownData.getAddress()}, C.PTR_SIZEOF); + OS.MoveMemory(pData + 8, new long[]{unknownData.getAddress()}, C.PTR_SIZEOF); break; case COM.VT_BSTR : OS.MoveMemory(pData, new short[] {type}, 2); char[] data = (stringData+"\0").toCharArray(); - long /*int*/ ptr = COM.SysAllocString(data); - OS.MoveMemory(pData + 8, new long /*int*/[] {ptr}, C.PTR_SIZEOF); + long ptr = COM.SysAllocString(data); + OS.MoveMemory(pData + 8, new long[] {ptr}, C.PTR_SIZEOF); break; default : @@ -574,8 +574,8 @@ public double getDouble() { } // try to coerce the value to the desired type - long /*int*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); - long /*int*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + long oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + long newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); try { getData(oldPtr); int result = COM.VariantChangeType(newPtr, oldPtr, (short) 0, COM.VT_R8); @@ -613,8 +613,8 @@ public float getFloat() { } // try to coerce the value to the desired type - long /*int*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); - long /*int*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + long oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + long newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); try { getData(oldPtr); int result = COM.VariantChangeType(newPtr, oldPtr, (short) 0, COM.VT_R4); @@ -652,8 +652,8 @@ public int getInt() { } // try to coerce the value to the desired type - long /*int*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); - long /*int*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + long oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + long newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); try { getData(oldPtr); int result = COM.VariantChangeType(newPtr, oldPtr, (short) 0, COM.VT_I4); @@ -692,8 +692,8 @@ public long getLong() { } // try to coerce the value to the desired type - long /*int*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); - long /*int*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + long oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + long newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); try { getData(oldPtr); int result = COM.VariantChangeType(newPtr, oldPtr, (short) 0, COM.VT_I8); @@ -730,8 +730,8 @@ public short getShort() { } // try to coerce the value to the desired type - long /*int*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); - long /*int*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + long oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + long newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); try { getData(oldPtr); int result = COM.VariantChangeType(newPtr, oldPtr, (short) 0, COM.VT_I2); @@ -769,8 +769,8 @@ public String getString() { } // try to coerce the value to the desired type - long /*int*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); - long /*int*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + long oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + long newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); try { getData(oldPtr); int result = COM.VariantChangeType(newPtr, oldPtr, (short) 0, COM.VT_BSTR); @@ -823,8 +823,8 @@ public IUnknown getUnknown() { } // try to coerce the value to the desired type - long /*int*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); - long /*int*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + long oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + long newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); try { getData(oldPtr); int result = COM.VariantChangeType(newPtr, oldPtr, (short) 0, COM.VT_UNKNOWN); @@ -890,13 +890,13 @@ public void setByRef(float val) { * * @since 2.1 */ -public void setByRef(long /*int*/ val) { +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)) { OLE.error(OLE.ERROR_CANNOT_CHANGE_VARIANT_TYPE); } - OS.MoveMemory(byRefPtr, new long /*int*/[]{val}, C.PTR_SIZEOF); + OS.MoveMemory(byRefPtr, new long[]{val}, C.PTR_SIZEOF); } /** * Update the by reference value of this variant with a new short value. @@ -915,7 +915,7 @@ public void setByRef(short val) { } OS.MoveMemory(byRefPtr, new short[]{val}, 2); } -void setData(long /*int*/ pData){ +void setData(long pData){ if (pData == 0) OLE.error(SWT.ERROR_INVALID_ARGUMENT); //TODO - use VARIANT structure @@ -924,7 +924,7 @@ void setData(long /*int*/ pData){ type = dataType[0]; if ((type & COM.VT_BYREF) == COM.VT_BYREF) { - long /*int*/[] newByRefPtr = new long /*int*/[1]; + long[] newByRefPtr = new long[1]; OS.MoveMemory(newByRefPtr, pData + 8, C.PTR_SIZEOF); byRefPtr = newByRefPtr[0]; return; @@ -975,7 +975,7 @@ void setData(long /*int*/ pData){ doubleData = newDoubleData[0]; break; case COM.VT_DISPATCH : { - long /*int*/[] ppvObject = new long /*int*/[1]; + long[] ppvObject = new long[1]; OS.MoveMemory(ppvObject, pData + 8, C.PTR_SIZEOF); if (ppvObject[0] == 0) { type = COM.VT_EMPTY; @@ -986,7 +986,7 @@ void setData(long /*int*/ pData){ break; } case COM.VT_UNKNOWN : { - long /*int*/[] ppvObject = new long /*int*/[1]; + long[] ppvObject = new long[1]; OS.MoveMemory(ppvObject, pData + 8, C.PTR_SIZEOF); if (ppvObject[0] == 0) { type = COM.VT_EMPTY; @@ -998,7 +998,7 @@ void setData(long /*int*/ pData){ } case COM.VT_BSTR : // get the address of the memory in which the string resides - long /*int*/[] hMem = new long /*int*/[1]; + long[] hMem = new long[1]; OS.MoveMemory(hMem, pData + 8, C.PTR_SIZEOF); if (hMem[0] == 0) { type = COM.VT_EMPTY; @@ -1019,7 +1019,7 @@ void setData(long /*int*/ pData){ default : // try coercing it into one of the known forms - long /*int*/ newPData = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, sizeof); + long newPData = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, sizeof); if (COM.VariantChangeType(newPData, pData, (short) 0, COM.VT_R8) == COM.S_OK) { setData(newPData); } else if (COM.VariantChangeType(newPData, pData, (short) 0, COM.VT_I8) == COM.S_OK) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/library/wgl.c b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/library/wgl.c index 058a6a7589..ff4ae9cdf8 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/library/wgl.c +++ b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/library/wgl.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2016 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -25,7 +25,7 @@ #ifndef NO_ChoosePixelFormat JNIEXPORT jint JNICALL WGL_NATIVE(ChoosePixelFormat) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { PIXELFORMATDESCRIPTOR _arg1, *lparg1=NULL; jint rc = 0; @@ -41,7 +41,7 @@ fail: #ifndef NO_DescribePixelFormat JNIEXPORT jint JNICALL WGL_NATIVE(DescribePixelFormat) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jobject arg3) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jobject arg3) { PIXELFORMATDESCRIPTOR _arg3, *lparg3=NULL; jint rc = 0; @@ -57,7 +57,7 @@ fail: #ifndef NO_GetPixelFormat JNIEXPORT jint JNICALL WGL_NATIVE(GetPixelFormat) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; WGL_NATIVE_ENTER(env, that, GetPixelFormat_FUNC); @@ -69,7 +69,7 @@ JNIEXPORT jint JNICALL WGL_NATIVE(GetPixelFormat) #ifndef NO_SetPixelFormat JNIEXPORT jboolean JNICALL WGL_NATIVE(SetPixelFormat) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jobject arg2) { PIXELFORMATDESCRIPTOR _arg2, *lparg2=NULL; jboolean rc = 0; @@ -85,7 +85,7 @@ fail: #ifndef NO_SwapBuffers JNIEXPORT jboolean JNICALL WGL_NATIVE(SwapBuffers) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; WGL_NATIVE_ENTER(env, that, SwapBuffers_FUNC); @@ -97,7 +97,7 @@ JNIEXPORT jboolean JNICALL WGL_NATIVE(SwapBuffers) #ifndef NO_wglCopyContext JNIEXPORT jboolean JNICALL WGL_NATIVE(wglCopyContext) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2) { jboolean rc = 0; WGL_NATIVE_ENTER(env, that, wglCopyContext_FUNC); @@ -108,24 +108,24 @@ JNIEXPORT jboolean JNICALL WGL_NATIVE(wglCopyContext) #endif #ifndef NO_wglCreateContext -JNIEXPORT jintLong JNICALL WGL_NATIVE(wglCreateContext) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WGL_NATIVE(wglCreateContext) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WGL_NATIVE_ENTER(env, that, wglCreateContext_FUNC); - rc = (jintLong)wglCreateContext((HDC)arg0); + rc = (jlong)wglCreateContext((HDC)arg0); WGL_NATIVE_EXIT(env, that, wglCreateContext_FUNC); return rc; } #endif #ifndef NO_wglCreateLayerContext -JNIEXPORT jintLong JNICALL WGL_NATIVE(wglCreateLayerContext) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) +JNIEXPORT jlong JNICALL WGL_NATIVE(wglCreateLayerContext) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { - jintLong rc = 0; + jlong rc = 0; WGL_NATIVE_ENTER(env, that, wglCreateLayerContext_FUNC); - rc = (jintLong)wglCreateLayerContext((HDC)arg0, arg1); + rc = (jlong)wglCreateLayerContext((HDC)arg0, arg1); WGL_NATIVE_EXIT(env, that, wglCreateLayerContext_FUNC); return rc; } @@ -133,7 +133,7 @@ JNIEXPORT jintLong JNICALL WGL_NATIVE(wglCreateLayerContext) #ifndef NO_wglDeleteContext JNIEXPORT jboolean JNICALL WGL_NATIVE(wglDeleteContext) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; WGL_NATIVE_ENTER(env, that, wglDeleteContext_FUNC); @@ -145,7 +145,7 @@ JNIEXPORT jboolean JNICALL WGL_NATIVE(wglDeleteContext) #ifndef NO_wglDescribeLayerPlane JNIEXPORT jboolean JNICALL WGL_NATIVE(wglDescribeLayerPlane) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jobject arg4) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3, jobject arg4) { LAYERPLANEDESCRIPTOR _arg4, *lparg4=NULL; jboolean rc = 0; @@ -160,24 +160,24 @@ fail: #endif #ifndef NO_wglGetCurrentContext -JNIEXPORT jintLong JNICALL WGL_NATIVE(wglGetCurrentContext) +JNIEXPORT jlong JNICALL WGL_NATIVE(wglGetCurrentContext) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; WGL_NATIVE_ENTER(env, that, wglGetCurrentContext_FUNC); - rc = (jintLong)wglGetCurrentContext(); + rc = (jlong)wglGetCurrentContext(); WGL_NATIVE_EXIT(env, that, wglGetCurrentContext_FUNC); return rc; } #endif #ifndef NO_wglGetCurrentDC -JNIEXPORT jintLong JNICALL WGL_NATIVE(wglGetCurrentDC) +JNIEXPORT jlong JNICALL WGL_NATIVE(wglGetCurrentDC) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; WGL_NATIVE_ENTER(env, that, wglGetCurrentDC_FUNC); - rc = (jintLong)wglGetCurrentDC(); + rc = (jlong)wglGetCurrentDC(); WGL_NATIVE_EXIT(env, that, wglGetCurrentDC_FUNC); return rc; } @@ -185,7 +185,7 @@ JNIEXPORT jintLong JNICALL WGL_NATIVE(wglGetCurrentDC) #ifndef NO_wglGetLayerPaletteEntries JNIEXPORT jint JNICALL WGL_NATIVE(wglGetLayerPaletteEntries) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jintArray arg4) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3, jintArray arg4) { jint *lparg4=NULL; jint rc = 0; @@ -200,14 +200,14 @@ fail: #endif #ifndef NO_wglGetProcAddress -JNIEXPORT jintLong JNICALL WGL_NATIVE(wglGetProcAddress) +JNIEXPORT jlong JNICALL WGL_NATIVE(wglGetProcAddress) (JNIEnv *env, jclass that, jbyteArray arg0) { jbyte *lparg0=NULL; - jintLong rc = 0; + jlong rc = 0; WGL_NATIVE_ENTER(env, that, wglGetProcAddress_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; - rc = (jintLong)wglGetProcAddress(lparg0); + rc = (jlong)wglGetProcAddress(lparg0); fail: if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0); WGL_NATIVE_EXIT(env, that, wglGetProcAddress_FUNC); @@ -217,7 +217,7 @@ fail: #ifndef NO_wglMakeCurrent JNIEXPORT jboolean JNICALL WGL_NATIVE(wglMakeCurrent) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { jboolean rc = 0; WGL_NATIVE_ENTER(env, that, wglMakeCurrent_FUNC); @@ -229,7 +229,7 @@ JNIEXPORT jboolean JNICALL WGL_NATIVE(wglMakeCurrent) #ifndef NO_wglRealizeLayerPalette JNIEXPORT jboolean JNICALL WGL_NATIVE(wglRealizeLayerPalette) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jboolean arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jboolean arg2) { jboolean rc = 0; WGL_NATIVE_ENTER(env, that, wglRealizeLayerPalette_FUNC); @@ -241,7 +241,7 @@ JNIEXPORT jboolean JNICALL WGL_NATIVE(wglRealizeLayerPalette) #ifndef NO_wglSetLayerPaletteEntries JNIEXPORT jint JNICALL WGL_NATIVE(wglSetLayerPaletteEntries) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jintArray arg4) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3, jintArray arg4) { jint *lparg4=NULL; jint rc = 0; @@ -257,7 +257,7 @@ fail: #ifndef NO_wglShareLists JNIEXPORT jboolean JNICALL WGL_NATIVE(wglShareLists) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { jboolean rc = 0; WGL_NATIVE_ENTER(env, that, wglShareLists_FUNC); @@ -269,7 +269,7 @@ JNIEXPORT jboolean JNICALL WGL_NATIVE(wglShareLists) #ifndef NO_wglSwapLayerBuffers JNIEXPORT jboolean JNICALL WGL_NATIVE(wglSwapLayerBuffers) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { jboolean rc = 0; WGL_NATIVE_ENTER(env, that, wglSwapLayerBuffers_FUNC); diff --git a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/org/eclipse/swt/internal/opengl/win32/WGL.java b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/org/eclipse/swt/internal/opengl/win32/WGL.java index 3ea1ec7086..bbcd315c27 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/org/eclipse/swt/internal/opengl/win32/WGL.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/org/eclipse/swt/internal/opengl/win32/WGL.java @@ -102,53 +102,53 @@ public class WGL extends Platform { public static final int PFD_STEREO_DONTCARE = 0x80000000; /** @param hdc cast=(HDC) */ -public static final native int ChoosePixelFormat(long /*int*/ hdc, PIXELFORMATDESCRIPTOR ppfd); +public static final native int ChoosePixelFormat(long hdc, PIXELFORMATDESCRIPTOR ppfd); /** @param hdc cast=(HDC) */ -public static final native int DescribePixelFormat(long /*int*/ hdc, int iPixelFormat, int nBytes, PIXELFORMATDESCRIPTOR ppfd); +public static final native int DescribePixelFormat(long hdc, int iPixelFormat, int nBytes, PIXELFORMATDESCRIPTOR ppfd); /** @param hdc cast=(HDC) */ -public static final native int GetPixelFormat(long /*int*/ hdc); +public static final native int GetPixelFormat(long hdc); /** @param hdc cast=(HDC) */ -public static final native boolean SetPixelFormat(long /*int*/ hdc, int iPixelFormat, PIXELFORMATDESCRIPTOR ppfd); +public static final native boolean SetPixelFormat(long hdc, int iPixelFormat, PIXELFORMATDESCRIPTOR ppfd); /** @param hdc cast=(HDC) */ -public static final native boolean SwapBuffers(long /*int*/ hdc); +public static final native boolean SwapBuffers(long hdc); /** * @param hglrcSrc cast=(HGLRC) * @param hglrcDst cast=(HGLRC) */ -public static final native boolean wglCopyContext(long /*int*/ hglrcSrc, long /*int*/ hglrcDst, int mask); +public static final native boolean wglCopyContext(long hglrcSrc, long hglrcDst, int mask); /** @param hdc cast=(HDC) */ -public static final native long /*int*/ wglCreateContext(long /*int*/ hdc); +public static final native long wglCreateContext(long hdc); /** @param hdc cast=(HDC) */ -public static final native long /*int*/ wglCreateLayerContext(long /*int*/ hdc, int iLayerPlane); +public static final native long wglCreateLayerContext(long hdc, int iLayerPlane); /** @param hglrc cast=(HGLRC) */ -public static final native boolean wglDeleteContext(long /*int*/ hglrc); -public static final native long /*int*/ wglGetCurrentContext(); -public static final native long /*int*/ wglGetCurrentDC(); -public static final native long /*int*/ wglGetProcAddress(byte[] lpszProc); +public static final native boolean wglDeleteContext(long hglrc); +public static final native long wglGetCurrentContext(); +public static final native long wglGetCurrentDC(); +public static final native long wglGetProcAddress(byte[] lpszProc); /** * @param hdc cast=(HDC) * @param hglrc cast=(HGLRC) */ -public static final native boolean wglMakeCurrent(long /*int*/ hdc, long /*int*/ hglrc); +public static final native boolean wglMakeCurrent(long hdc, long hglrc); /** * @param hglrc1 cast=(HGLRC) * @param hglrc2 cast=(HGLRC) */ -public static final native boolean wglShareLists(long /*int*/ hglrc1, long /*int*/ hglrc2); +public static final native boolean wglShareLists(long hglrc1, long hglrc2); /** @param hdc cast=(HDC) */ -public static final native boolean wglDescribeLayerPlane(long /*int*/ hdc, int iPixelFormat, int iLayerPlane, int nBytes, LAYERPLANEDESCRIPTOR plpd); +public static final native boolean wglDescribeLayerPlane(long hdc, int iPixelFormat, int iLayerPlane, int nBytes, LAYERPLANEDESCRIPTOR plpd); /** * @param hdc cast=(HDC) * @param pcr cast=(COLORREF *) */ -public static final native int wglSetLayerPaletteEntries(long /*int*/ hdc, int iLayerPlane, int iStart, int cEntries, int[] pcr); +public static final native int wglSetLayerPaletteEntries(long hdc, int iLayerPlane, int iStart, int cEntries, int[] pcr); /** * @param hdc cast=(HDC) * @param pcr cast=(COLORREF *) */ -public static final native int wglGetLayerPaletteEntries(long /*int*/ hdc, int iLayerPlane, int iStart, int cEntries, int[] pcr); +public static final native int wglGetLayerPaletteEntries(long hdc, int iLayerPlane, int iStart, int cEntries, int[] pcr); /** @param hdc cast=(HDC) */ -public static final native boolean wglRealizeLayerPalette(long /*int*/ hdc, int iLayerPlane, boolean bRealize); +public static final native boolean wglRealizeLayerPalette(long hdc, int iLayerPlane, boolean bRealize); /** @param hdc cast=(HDC) */ -public static final native boolean wglSwapLayerBuffers(long /*int*/ hdc, int fuPlanes); +public static final native boolean wglSwapLayerBuffers(long hdc, int fuPlanes); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/org/eclipse/swt/opengl/GLCanvas.java b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/org/eclipse/swt/opengl/GLCanvas.java index 26ba98c379..95fdee3120 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/org/eclipse/swt/opengl/GLCanvas.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/org/eclipse/swt/opengl/GLCanvas.java @@ -29,7 +29,7 @@ import org.eclipse.swt.widgets.*; */ public class GLCanvas extends Canvas { - long /*int*/ context; + long context; int pixelFormat; static final String USE_OWNDC_KEY = "org.eclipse.swt.internal.win32.useOwnDC"; //$NON-NLS-1$ /** @@ -79,7 +79,7 @@ public GLCanvas (Composite parent, int style, GLData data) { // wglAttrib [pos++] = data.samples; // } - long /*int*/ hDC = OS.GetDC (handle); + long hDC = OS.GetDC (handle); pixelFormat = WGL.ChoosePixelFormat (hDC, pfd); if (pixelFormat == 0 || !WGL.SetPixelFormat (hDC, pixelFormat, pfd)) { OS.ReleaseDC (handle, hDC); @@ -127,7 +127,7 @@ public GLData getGLData () { GLData data = new GLData (); PIXELFORMATDESCRIPTOR pfd = new PIXELFORMATDESCRIPTOR (); pfd.nSize = (short) PIXELFORMATDESCRIPTOR.sizeof; - long /*int*/ hDC = OS.GetDC (handle); + long hDC = OS.GetDC (handle); WGL.DescribePixelFormat (hDC, pixelFormat, PIXELFORMATDESCRIPTOR.sizeof, pfd); OS.ReleaseDC (handle, hDC); data.doubleBuffer = (pfd.dwFlags & WGL.PFD_DOUBLEBUFFER) != 0; @@ -173,7 +173,7 @@ public boolean isCurrent () { public void setCurrent () { checkWidget (); if (WGL.wglGetCurrentContext () == context) return; - long /*int*/ hDC = OS.GetDC (handle); + long hDC = OS.GetDC (handle); WGL.wglMakeCurrent (hDC, context); OS.ReleaseDC (handle, hDC); } @@ -188,7 +188,7 @@ public void setCurrent () { */ public void swapBuffers () { checkWidget (); - long /*int*/ hDC = OS.GetDC (handle); + long hDC = OS.GetDC (handle); WGL.SwapBuffers (hDC); OS.ReleaseDC (handle, hDC); } 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 114489f28b..8d21bf7f73 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, 2016 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -25,7 +25,7 @@ #ifndef NO_AccessibleChildren JNIEXPORT jint JNICALL COM_NATIVE(AccessibleChildren) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jintLong arg3, jintArray arg4) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jlong arg3, jintArray arg4) { jint *lparg4=NULL; jint rc = 0; @@ -49,14 +49,14 @@ fail: #ifndef NO_AccessibleObjectFromWindow JNIEXPORT jint JNICALL COM_NATIVE(AccessibleObjectFromWindow) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2, jintLongArray arg3) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jobject arg2, jlongArray arg3) { GUID _arg2, *lparg2=NULL; - jintLong *lparg3=NULL; + jlong *lparg3=NULL; jint rc = 0; COM_NATIVE_ENTER(env, that, AccessibleObjectFromWindow_FUNC); if (arg2) if ((lparg2 = getGUIDFields(env, arg2, &_arg2)) == NULL) goto fail; - if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail; + if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail; /* rc = (jint)AccessibleObjectFromWindow((HWND)arg0, (DWORD)arg1, lparg2, (LPVOID *)lparg3); */ @@ -67,7 +67,7 @@ JNIEXPORT jint JNICALL COM_NATIVE(AccessibleObjectFromWindow) } } fail: - if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0); + if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0); if (arg2 && lparg2) setGUIDFields(env, arg2, lparg2); COM_NATIVE_EXIT(env, that, AccessibleObjectFromWindow_FUNC); return rc; @@ -150,19 +150,19 @@ JNIEXPORT jint JNICALL COM_NATIVE(COSERVERINFO_1sizeof) #ifndef NO_CoCreateInstance JNIEXPORT jint JNICALL COM_NATIVE(CoCreateInstance) - (JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2, jobject arg3, jintLongArray arg4) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2, jobject arg3, jlongArray arg4) { GUID _arg0, *lparg0=NULL; GUID _arg3, *lparg3=NULL; - jintLong *lparg4=NULL; + jlong *lparg4=NULL; jint rc = 0; COM_NATIVE_ENTER(env, that, CoCreateInstance_FUNC); if (arg0) if ((lparg0 = getGUIDFields(env, arg0, &_arg0)) == NULL) goto fail; if (arg3) if ((lparg3 = getGUIDFields(env, arg3, &_arg3)) == NULL) goto fail; - if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail; + if (arg4) if ((lparg4 = (*env)->GetLongArrayElements(env, arg4, NULL)) == NULL) goto fail; rc = (jint)CoCreateInstance(lparg0, (LPUNKNOWN)arg1, arg2, lparg3, (LPVOID *)lparg4); fail: - if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0); + if (arg4 && lparg4) (*env)->ReleaseLongArrayElements(env, arg4, lparg4, 0); if (arg3 && lparg3) setGUIDFields(env, arg3, lparg3); if (arg0 && lparg0) setGUIDFields(env, arg0, lparg0); COM_NATIVE_EXIT(env, that, CoCreateInstance_FUNC); @@ -182,19 +182,19 @@ JNIEXPORT void JNICALL COM_NATIVE(CoFreeUnusedLibraries) #ifndef NO_CoGetClassObject JNIEXPORT jint JNICALL COM_NATIVE(CoGetClassObject) - (JNIEnv *env, jclass that, jobject arg0, jint arg1, jintLong arg2, jobject arg3, jintLongArray arg4) + (JNIEnv *env, jclass that, jobject arg0, jint arg1, jlong arg2, jobject arg3, jlongArray arg4) { GUID _arg0, *lparg0=NULL; GUID _arg3, *lparg3=NULL; - jintLong *lparg4=NULL; + jlong *lparg4=NULL; jint rc = 0; COM_NATIVE_ENTER(env, that, CoGetClassObject_FUNC); if (arg0) if ((lparg0 = getGUIDFields(env, arg0, &_arg0)) == NULL) goto fail; if (arg3) if ((lparg3 = getGUIDFields(env, arg3, &_arg3)) == NULL) goto fail; - if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail; + if (arg4) if ((lparg4 = (*env)->GetLongArrayElements(env, arg4, NULL)) == NULL) goto fail; rc = (jint)CoGetClassObject(lparg0, arg1, (COSERVERINFO *)arg2, lparg3, (LPVOID *)lparg4); fail: - if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0); + if (arg4 && lparg4) (*env)->ReleaseLongArrayElements(env, arg4, lparg4, 0); if (arg3 && lparg3) setGUIDFields(env, arg3, lparg3); if (arg0 && lparg0) setGUIDFields(env, arg0, lparg0); COM_NATIVE_EXIT(env, that, CoGetClassObject_FUNC); @@ -204,7 +204,7 @@ fail: #ifndef NO_CoLockObjectExternal JNIEXPORT jint JNICALL COM_NATIVE(CoLockObjectExternal) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1, jboolean arg2) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1, jboolean arg2) { jint rc = 0; COM_NATIVE_ENTER(env, that, CoLockObjectExternal_FUNC); @@ -216,14 +216,14 @@ JNIEXPORT jint JNICALL COM_NATIVE(CoLockObjectExternal) #ifndef NO_CreateStdAccessibleObject JNIEXPORT jint JNICALL COM_NATIVE(CreateStdAccessibleObject) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2, jintLongArray arg3) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jobject arg2, jlongArray arg3) { GUID _arg2, *lparg2=NULL; - jintLong *lparg3=NULL; + jlong *lparg3=NULL; jint rc = 0; COM_NATIVE_ENTER(env, that, CreateStdAccessibleObject_FUNC); if (arg2) if ((lparg2 = getGUIDFields(env, arg2, &_arg2)) == NULL) goto fail; - if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail; + if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail; /* rc = (jint)CreateStdAccessibleObject((HWND)arg0, arg1, lparg2, (LPVOID *)lparg3); */ @@ -234,7 +234,7 @@ JNIEXPORT jint JNICALL COM_NATIVE(CreateStdAccessibleObject) } } fail: - if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0); + if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0); if (arg2 && lparg2) setGUIDFields(env, arg2, lparg2); COM_NATIVE_EXIT(env, that, CreateStdAccessibleObject_FUNC); return rc; @@ -267,7 +267,7 @@ JNIEXPORT jint JNICALL COM_NATIVE(DVTARGETDEVICE_1sizeof) #ifndef NO_DoDragDrop JNIEXPORT jint JNICALL COM_NATIVE(DoDragDrop) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintArray arg3) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jintArray arg3) { jint *lparg3=NULL; jint rc = 0; @@ -411,20 +411,20 @@ JNIEXPORT jint JNICALL COM_NATIVE(LICINFO_1sizeof) #endif #ifndef NO_LresultFromObject -JNIEXPORT jintLong JNICALL COM_NATIVE(LresultFromObject) - (JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) +JNIEXPORT jlong JNICALL COM_NATIVE(LresultFromObject) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2) { GUID _arg0, *lparg0=NULL; - jintLong rc = 0; + jlong rc = 0; COM_NATIVE_ENTER(env, that, LresultFromObject_FUNC); if (arg0) if ((lparg0 = getGUIDFields(env, arg0, &_arg0)) == NULL) goto fail; /* - rc = (jintLong)LresultFromObject(lparg0, arg1, (LPUNKNOWN)arg2); + rc = (jlong)LresultFromObject(lparg0, arg1, (LPUNKNOWN)arg2); */ { COM_LOAD_FUNCTION(fp, LresultFromObject) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GUID *, jintLong, LPUNKNOWN))fp)(lparg0, arg1, (LPUNKNOWN)arg2); + rc = (jlong)((jlong (CALLING_CONVENTION*)(GUID *, jlong, LPUNKNOWN))fp)(lparg0, arg1, (LPUNKNOWN)arg2); } } fail: @@ -434,373 +434,208 @@ fail: } #endif -#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_ole_win32_FORMATETC_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_ole_win32_FORMATETC_2I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_ole_win32_FORMATETC_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#else -JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_ole_win32_FORMATETC_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__JLorg_eclipse_swt_internal_ole_win32_FORMATETC_2I +JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_ole_win32_FORMATETC_2I) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2) { FORMATETC _arg1, *lparg1=NULL; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_ole_win32_FORMATETC_2I_FUNC); -#else COM_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_ole_win32_FORMATETC_2I_FUNC); -#endif if (arg1) if ((lparg1 = getFORMATETCFields(env, arg1, &_arg1)) == NULL) goto fail; MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2); fail: -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_ole_win32_FORMATETC_2I_FUNC); -#else COM_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_ole_win32_FORMATETC_2I_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_ole_win32_GUID_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_ole_win32_GUID_2I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_ole_win32_GUID_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#else -JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_ole_win32_GUID_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__JLorg_eclipse_swt_internal_ole_win32_GUID_2I +JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_ole_win32_GUID_2I) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2) { GUID _arg1, *lparg1=NULL; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_ole_win32_GUID_2I_FUNC); -#else COM_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_ole_win32_GUID_2I_FUNC); -#endif if (arg1) if ((lparg1 = getGUIDFields(env, arg1, &_arg1)) == NULL) goto fail; MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2); fail: -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_ole_win32_GUID_2I_FUNC); -#else COM_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_ole_win32_GUID_2I_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_ole_win32_OLEINPLACEFRAMEINFO_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_ole_win32_OLEINPLACEFRAMEINFO_2I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_ole_win32_OLEINPLACEFRAMEINFO_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#else -JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_ole_win32_OLEINPLACEFRAMEINFO_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__JLorg_eclipse_swt_internal_ole_win32_OLEINPLACEFRAMEINFO_2I +JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_ole_win32_OLEINPLACEFRAMEINFO_2I) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2) { OLEINPLACEFRAMEINFO _arg1, *lparg1=NULL; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_ole_win32_OLEINPLACEFRAMEINFO_2I_FUNC); -#else COM_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_ole_win32_OLEINPLACEFRAMEINFO_2I_FUNC); -#endif if (arg1) if ((lparg1 = getOLEINPLACEFRAMEINFOFields(env, arg1, &_arg1)) == NULL) goto fail; MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2); fail: -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_ole_win32_OLEINPLACEFRAMEINFO_2I_FUNC); -#else COM_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_ole_win32_OLEINPLACEFRAMEINFO_2I_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_ole_win32_STATSTG_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_ole_win32_STATSTG_2I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_ole_win32_STATSTG_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#else -JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_ole_win32_STATSTG_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__JLorg_eclipse_swt_internal_ole_win32_STATSTG_2I +JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_ole_win32_STATSTG_2I) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2) { STATSTG _arg1, *lparg1=NULL; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_ole_win32_STATSTG_2I_FUNC); -#else COM_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_ole_win32_STATSTG_2I_FUNC); -#endif if (arg1) if ((lparg1 = getSTATSTGFields(env, arg1, &_arg1)) == NULL) goto fail; MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2); fail: -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_ole_win32_STATSTG_2I_FUNC); -#else COM_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_ole_win32_STATSTG_2I_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#else -JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__JLorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2I +JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2I) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2) { STGMEDIUM _arg1, *lparg1=NULL; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2I_FUNC); -#else COM_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2I_FUNC); -#endif if (arg1) if ((lparg1 = getSTGMEDIUMFields(env, arg1, &_arg1)) == NULL) goto fail; MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2); fail: -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2I_FUNC); -#else COM_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2I_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JI +JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { DISPPARAMS _arg0, *lparg0=NULL; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2II_FUNC); -#else COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JI_FUNC); -#endif if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) setDISPPARAMSFields(env, arg0, lparg0); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2II_FUNC); -#else COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FORMATETC_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FORMATETC_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FORMATETC_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FORMATETC_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FORMATETC_2JI +JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FORMATETC_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { FORMATETC _arg0, *lparg0=NULL; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FORMATETC_2II_FUNC); -#else COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FORMATETC_2JI_FUNC); -#endif if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) setFORMATETCFields(env, arg0, lparg0); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FORMATETC_2II_FUNC); -#else COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FORMATETC_2JI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FUNCDESC_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FUNCDESC_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FUNCDESC_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FUNCDESC_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FUNCDESC_2JI +JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FUNCDESC_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { FUNCDESC _arg0, *lparg0=NULL; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FUNCDESC_2II_FUNC); -#else COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FUNCDESC_2JI_FUNC); -#endif if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) setFUNCDESCFields(env, arg0, lparg0); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FUNCDESC_2II_FUNC); -#else COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FUNCDESC_2JI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_GUID_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_GUID_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_GUID_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_GUID_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_GUID_2JI +JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_GUID_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { GUID _arg0, *lparg0=NULL; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_GUID_2II_FUNC); -#else COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_GUID_2JI_FUNC); -#endif if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) setGUIDFields(env, arg0, lparg0); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_GUID_2II_FUNC); -#else COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_GUID_2JI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STATSTG_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STATSTG_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STATSTG_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STATSTG_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STATSTG_2JI +JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STATSTG_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { STATSTG _arg0, *lparg0=NULL; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STATSTG_2II_FUNC); -#else COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STATSTG_2JI_FUNC); -#endif if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) setSTATSTGFields(env, arg0, lparg0); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STATSTG_2II_FUNC); -#else COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STATSTG_2JI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2JI +JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { STGMEDIUM _arg0, *lparg0=NULL; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2II_FUNC); -#else COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2JI_FUNC); -#endif if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) setSTGMEDIUMFields(env, arg0, lparg0); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2II_FUNC); -#else COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2JI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_TYPEATTR_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_TYPEATTR_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_TYPEATTR_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_TYPEATTR_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_TYPEATTR_2JI +JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_TYPEATTR_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { TYPEATTR _arg0, *lparg0=NULL; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_TYPEATTR_2II_FUNC); -#else COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_TYPEATTR_2JI_FUNC); -#endif if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) setTYPEATTRFields(env, arg0, lparg0); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_TYPEATTR_2II_FUNC); -#else COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_TYPEATTR_2JI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARDESC_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARDESC_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARDESC_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARDESC_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARDESC_2JI +JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARDESC_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { VARDESC _arg0, *lparg0=NULL; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARDESC_2II_FUNC); -#else COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARDESC_2JI_FUNC); -#endif if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) setVARDESCFields(env, arg0, lparg0); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARDESC_2II_FUNC); -#else COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARDESC_2JI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARIANT_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARIANT_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARIANT_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARIANT_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARIANT_2JI +JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARIANT_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { VARIANT _arg0, *lparg0=NULL; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARIANT_2II_FUNC); -#else COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARIANT_2JI_FUNC); -#endif if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) setVARIANTFields(env, arg0, lparg0); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARIANT_2II_FUNC); -#else COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARIANT_2JI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2JI +JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { RECT _arg0, *lparg0=NULL; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2II_FUNC); -#else COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2JI_FUNC); -#endif if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) setRECTFields(env, arg0, lparg0); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2II_FUNC); -#else COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2JI_FUNC); -#endif } #endif @@ -830,21 +665,21 @@ JNIEXPORT jint JNICALL COM_NATIVE(OLEINPLACEFRAMEINFO_1sizeof) #ifndef NO_OleCreate JNIEXPORT jint JNICALL COM_NATIVE(OleCreate) - (JNIEnv *env, jclass that, jobject arg0, jobject arg1, jint arg2, jobject arg3, jintLong arg4, jintLong arg5, jintLongArray arg6) + (JNIEnv *env, jclass that, jobject arg0, jobject arg1, jint arg2, jobject arg3, jlong arg4, jlong arg5, jlongArray arg6) { GUID _arg0, *lparg0=NULL; GUID _arg1, *lparg1=NULL; FORMATETC _arg3, *lparg3=NULL; - jintLong *lparg6=NULL; + jlong *lparg6=NULL; jint rc = 0; COM_NATIVE_ENTER(env, that, OleCreate_FUNC); if (arg0) if ((lparg0 = getGUIDFields(env, arg0, &_arg0)) == NULL) goto fail; if (arg1) if ((lparg1 = getGUIDFields(env, arg1, &_arg1)) == NULL) goto fail; if (arg3) if ((lparg3 = getFORMATETCFields(env, arg3, &_arg3)) == NULL) goto fail; - if (arg6) if ((lparg6 = (*env)->GetIntLongArrayElements(env, arg6, NULL)) == NULL) goto fail; + if (arg6) if ((lparg6 = (*env)->GetLongArrayElements(env, arg6, NULL)) == NULL) goto fail; rc = (jint)OleCreate(lparg0, lparg1, arg2, lparg3, (IOleClientSite *)arg4, (IStorage *)arg5, (void **)lparg6); fail: - if (arg6 && lparg6) (*env)->ReleaseIntLongArrayElements(env, arg6, lparg6, 0); + if (arg6 && lparg6) (*env)->ReleaseLongArrayElements(env, arg6, lparg6, 0); if (arg3 && lparg3) setFORMATETCFields(env, arg3, lparg3); if (arg1 && lparg1) setGUIDFields(env, arg1, lparg1); if (arg0 && lparg0) setGUIDFields(env, arg0, lparg0); @@ -855,23 +690,23 @@ fail: #ifndef NO_OleCreateFromFile JNIEXPORT jint JNICALL COM_NATIVE(OleCreateFromFile) - (JNIEnv *env, jclass that, jobject arg0, jcharArray arg1, jobject arg2, jint arg3, jobject arg4, jintLong arg5, jintLong arg6, jintLongArray arg7) + (JNIEnv *env, jclass that, jobject arg0, jcharArray arg1, jobject arg2, jint arg3, jobject arg4, jlong arg5, jlong arg6, jlongArray arg7) { GUID _arg0, *lparg0=NULL; jchar *lparg1=NULL; GUID _arg2, *lparg2=NULL; FORMATETC _arg4, *lparg4=NULL; - jintLong *lparg7=NULL; + jlong *lparg7=NULL; jint rc = 0; COM_NATIVE_ENTER(env, that, OleCreateFromFile_FUNC); if (arg0) if ((lparg0 = getGUIDFields(env, arg0, &_arg0)) == NULL) goto fail; if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail; if (arg2) if ((lparg2 = getGUIDFields(env, arg2, &_arg2)) == NULL) goto fail; if (arg4) if ((lparg4 = getFORMATETCFields(env, arg4, &_arg4)) == NULL) goto fail; - if (arg7) if ((lparg7 = (*env)->GetIntLongArrayElements(env, arg7, NULL)) == NULL) goto fail; + if (arg7) if ((lparg7 = (*env)->GetLongArrayElements(env, arg7, NULL)) == NULL) goto fail; rc = (jint)OleCreateFromFile(lparg0, (LPCOLESTR)lparg1, lparg2, arg3, lparg4, (LPOLECLIENTSITE)arg5, (LPSTORAGE)arg6, (LPVOID *)lparg7); fail: - if (arg7 && lparg7) (*env)->ReleaseIntLongArrayElements(env, arg7, lparg7, 0); + if (arg7 && lparg7) (*env)->ReleaseLongArrayElements(env, arg7, lparg7, 0); if (arg4 && lparg4) setFORMATETCFields(env, arg4, lparg4); if (arg2 && lparg2) setGUIDFields(env, arg2, lparg2); if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, 0); @@ -883,17 +718,17 @@ fail: #ifndef NO_OleCreatePropertyFrame JNIEXPORT jint JNICALL COM_NATIVE(OleCreatePropertyFrame) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jcharArray arg3, jint arg4, jintLongArray arg5, jint arg6, jintLong arg7, jint arg8, jint arg9, jintLong arg10) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jcharArray arg3, jint arg4, jlongArray arg5, jint arg6, jlong arg7, jint arg8, jint arg9, jlong arg10) { jchar *lparg3=NULL; - jintLong *lparg5=NULL; + jlong *lparg5=NULL; jint rc = 0; COM_NATIVE_ENTER(env, that, OleCreatePropertyFrame_FUNC); if (arg3) if ((lparg3 = (*env)->GetCharArrayElements(env, arg3, NULL)) == NULL) goto fail; - if (arg5) if ((lparg5 = (*env)->GetIntLongArrayElements(env, arg5, NULL)) == NULL) goto fail; + if (arg5) if ((lparg5 = (*env)->GetLongArrayElements(env, arg5, NULL)) == NULL) goto fail; rc = (jint)OleCreatePropertyFrame((HWND)arg0, arg1, arg2, (LPCOLESTR)lparg3, arg4, (LPUNKNOWN FAR*)lparg5, arg6, (LPCLSID)arg7, (LCID)arg8, arg9, (LPVOID)arg10); fail: - if (arg5 && lparg5) (*env)->ReleaseIntLongArrayElements(env, arg5, lparg5, 0); + if (arg5 && lparg5) (*env)->ReleaseLongArrayElements(env, arg5, lparg5, 0); if (arg3 && lparg3) (*env)->ReleaseCharArrayElements(env, arg3, lparg3, 0); COM_NATIVE_EXIT(env, that, OleCreatePropertyFrame_FUNC); return rc; @@ -902,7 +737,7 @@ fail: #ifndef NO_OleDraw JNIEXPORT jint JNICALL COM_NATIVE(OleDraw) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintLong arg3) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2, jlong arg3) { jint rc = 0; COM_NATIVE_ENTER(env, that, OleDraw_FUNC); @@ -926,15 +761,15 @@ JNIEXPORT jint JNICALL COM_NATIVE(OleFlushClipboard) #ifndef NO_OleGetClipboard JNIEXPORT jint JNICALL COM_NATIVE(OleGetClipboard) - (JNIEnv *env, jclass that, jintLongArray arg0) + (JNIEnv *env, jclass that, jlongArray arg0) { - jintLong *lparg0=NULL; + jlong *lparg0=NULL; jint rc = 0; COM_NATIVE_ENTER(env, that, OleGetClipboard_FUNC); - if (arg0) if ((lparg0 = (*env)->GetIntLongArrayElements(env, arg0, NULL)) == NULL) goto fail; + if (arg0) if ((lparg0 = (*env)->GetLongArrayElements(env, arg0, NULL)) == NULL) goto fail; rc = (jint)OleGetClipboard((IDataObject **)lparg0); fail: - if (arg0 && lparg0) (*env)->ReleaseIntLongArrayElements(env, arg0, lparg0, 0); + if (arg0 && lparg0) (*env)->ReleaseLongArrayElements(env, arg0, lparg0, 0); COM_NATIVE_EXIT(env, that, OleGetClipboard_FUNC); return rc; } @@ -942,7 +777,7 @@ fail: #ifndef NO_OleIsCurrentClipboard JNIEXPORT jint JNICALL COM_NATIVE(OleIsCurrentClipboard) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; COM_NATIVE_ENTER(env, that, OleIsCurrentClipboard_FUNC); @@ -954,7 +789,7 @@ JNIEXPORT jint JNICALL COM_NATIVE(OleIsCurrentClipboard) #ifndef NO_OleIsRunning JNIEXPORT jboolean JNICALL COM_NATIVE(OleIsRunning) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; COM_NATIVE_ENTER(env, that, OleIsRunning_FUNC); @@ -966,17 +801,17 @@ JNIEXPORT jboolean JNICALL COM_NATIVE(OleIsRunning) #ifndef NO_OleLoad JNIEXPORT jint JNICALL COM_NATIVE(OleLoad) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2, jintLongArray arg3) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jlong arg2, jlongArray arg3) { GUID _arg1, *lparg1=NULL; - jintLong *lparg3=NULL; + jlong *lparg3=NULL; jint rc = 0; COM_NATIVE_ENTER(env, that, OleLoad_FUNC); if (arg1) if ((lparg1 = getGUIDFields(env, arg1, &_arg1)) == NULL) goto fail; - if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail; + if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail; rc = (jint)OleLoad((IStorage *)arg0, lparg1, (IOleClientSite *)arg2, (LPVOID *)lparg3); fail: - if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0); + if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0); if (arg1 && lparg1) setGUIDFields(env, arg1, lparg1); COM_NATIVE_EXIT(env, that, OleLoad_FUNC); return rc; @@ -985,7 +820,7 @@ fail: #ifndef NO_OleRun JNIEXPORT jint JNICALL COM_NATIVE(OleRun) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; COM_NATIVE_ENTER(env, that, OleRun_FUNC); @@ -997,7 +832,7 @@ JNIEXPORT jint JNICALL COM_NATIVE(OleRun) #ifndef NO_OleSave JNIEXPORT jint JNICALL COM_NATIVE(OleSave) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jboolean arg2) { jint rc = 0; COM_NATIVE_ENTER(env, that, OleSave_FUNC); @@ -1009,7 +844,7 @@ JNIEXPORT jint JNICALL COM_NATIVE(OleSave) #ifndef NO_OleSetClipboard JNIEXPORT jint JNICALL COM_NATIVE(OleSetClipboard) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; COM_NATIVE_ENTER(env, that, OleSetClipboard_FUNC); @@ -1021,7 +856,7 @@ JNIEXPORT jint JNICALL COM_NATIVE(OleSetClipboard) #ifndef NO_OleSetContainedObject JNIEXPORT jint JNICALL COM_NATIVE(OleSetContainedObject) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { jint rc = 0; COM_NATIVE_ENTER(env, that, OleSetContainedObject_FUNC); @@ -1033,7 +868,7 @@ JNIEXPORT jint JNICALL COM_NATIVE(OleSetContainedObject) #ifndef NO_OleSetMenuDescriptor JNIEXPORT jint JNICALL COM_NATIVE(OleSetMenuDescriptor) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4) { jint rc = 0; COM_NATIVE_ENTER_TRY(env, that, OleSetMenuDescriptor_FUNC); @@ -1045,7 +880,7 @@ JNIEXPORT jint JNICALL COM_NATIVE(OleSetMenuDescriptor) #ifndef NO_OleTranslateColor JNIEXPORT jint JNICALL COM_NATIVE(OleTranslateColor) - (JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jintArray arg2) { jint *lparg2=NULL; jint rc = 0; @@ -1061,17 +896,17 @@ fail: #ifndef NO_ProgIDFromCLSID JNIEXPORT jint JNICALL COM_NATIVE(ProgIDFromCLSID) - (JNIEnv *env, jclass that, jobject arg0, jintLongArray arg1) + (JNIEnv *env, jclass that, jobject arg0, jlongArray arg1) { GUID _arg0, *lparg0=NULL; - jintLong *lparg1=NULL; + jlong *lparg1=NULL; jint rc = 0; COM_NATIVE_ENTER(env, that, ProgIDFromCLSID_FUNC); if (arg0) if ((lparg0 = getGUIDFields(env, arg0, &_arg0)) == NULL) goto fail; - if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail; + if (arg1) if ((lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL)) == NULL) goto fail; rc = (jint)ProgIDFromCLSID(lparg0, (LPOLESTR *)lparg1); fail: - if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0); + if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, 0); if (arg0 && lparg0) setGUIDFields(env, arg0, lparg0); COM_NATIVE_EXIT(env, that, ProgIDFromCLSID_FUNC); return rc; @@ -1080,7 +915,7 @@ fail: #ifndef NO_RegisterDragDrop JNIEXPORT jint JNICALL COM_NATIVE(RegisterDragDrop) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { jint rc = 0; COM_NATIVE_ENTER(env, that, RegisterDragDrop_FUNC); @@ -1092,7 +927,7 @@ JNIEXPORT jint JNICALL COM_NATIVE(RegisterDragDrop) #ifndef NO_ReleaseStgMedium JNIEXPORT void JNICALL COM_NATIVE(ReleaseStgMedium) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { COM_NATIVE_ENTER(env, that, ReleaseStgMedium_FUNC); ReleaseStgMedium((STGMEDIUM *)arg0); @@ -1102,7 +937,7 @@ JNIEXPORT void JNICALL COM_NATIVE(ReleaseStgMedium) #ifndef NO_RevokeDragDrop JNIEXPORT jint JNICALL COM_NATIVE(RevokeDragDrop) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; COM_NATIVE_ENTER(env, that, RevokeDragDrop_FUNC); @@ -1114,7 +949,7 @@ JNIEXPORT jint JNICALL COM_NATIVE(RevokeDragDrop) #ifndef NO_SHDoDragDrop JNIEXPORT jint JNICALL COM_NATIVE(SHDoDragDrop) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3, jintArray arg4) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jint arg3, jintArray arg4) { jint *lparg4=NULL; jint rc = 0; @@ -1154,17 +989,17 @@ JNIEXPORT jint JNICALL COM_NATIVE(STGMEDIUM_1sizeof) #ifndef NO_StgCreateDocfile JNIEXPORT jint JNICALL COM_NATIVE(StgCreateDocfile) - (JNIEnv *env, jclass that, jcharArray arg0, jint arg1, jint arg2, jintLongArray arg3) + (JNIEnv *env, jclass that, jcharArray arg0, jint arg1, jint arg2, jlongArray arg3) { jchar *lparg0=NULL; - jintLong *lparg3=NULL; + jlong *lparg3=NULL; jint rc = 0; COM_NATIVE_ENTER(env, that, StgCreateDocfile_FUNC); if (arg0) if ((lparg0 = (*env)->GetCharArrayElements(env, arg0, NULL)) == NULL) goto fail; - if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail; + if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail; rc = (jint)StgCreateDocfile(lparg0, arg1, arg2, (IStorage **)lparg3); fail: - if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0); + if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0); if (arg0 && lparg0) (*env)->ReleaseCharArrayElements(env, arg0, lparg0, 0); COM_NATIVE_EXIT(env, that, StgCreateDocfile_FUNC); return rc; @@ -1189,17 +1024,17 @@ fail: #ifndef NO_StgOpenStorage JNIEXPORT jint JNICALL COM_NATIVE(StgOpenStorage) - (JNIEnv *env, jclass that, jcharArray arg0, jintLong arg1, jint arg2, jintLong arg3, jint arg4, jintLongArray arg5) + (JNIEnv *env, jclass that, jcharArray arg0, jlong arg1, jint arg2, jlong arg3, jint arg4, jlongArray arg5) { jchar *lparg0=NULL; - jintLong *lparg5=NULL; + jlong *lparg5=NULL; jint rc = 0; COM_NATIVE_ENTER(env, that, StgOpenStorage_FUNC); if (arg0) if ((lparg0 = (*env)->GetCharArrayElements(env, arg0, NULL)) == NULL) goto fail; - if (arg5) if ((lparg5 = (*env)->GetIntLongArrayElements(env, arg5, NULL)) == NULL) goto fail; + if (arg5) if ((lparg5 = (*env)->GetLongArrayElements(env, arg5, NULL)) == NULL) goto fail; rc = (jint)StgOpenStorage((const WCHAR *)lparg0, (IStorage *)arg1, arg2, (SNB)arg3, arg4, (IStorage **)lparg5); fail: - if (arg5 && lparg5) (*env)->ReleaseIntLongArrayElements(env, arg5, lparg5, 0); + if (arg5 && lparg5) (*env)->ReleaseLongArrayElements(env, arg5, lparg5, 0); if (arg0 && lparg0) (*env)->ReleaseCharArrayElements(env, arg0, lparg0, 0); COM_NATIVE_EXIT(env, that, StgOpenStorage_FUNC); return rc; @@ -1208,17 +1043,17 @@ fail: #ifndef NO_StringFromCLSID JNIEXPORT jint JNICALL COM_NATIVE(StringFromCLSID) - (JNIEnv *env, jclass that, jobject arg0, jintLongArray arg1) + (JNIEnv *env, jclass that, jobject arg0, jlongArray arg1) { GUID _arg0, *lparg0=NULL; - jintLong *lparg1=NULL; + jlong *lparg1=NULL; jint rc = 0; COM_NATIVE_ENTER(env, that, StringFromCLSID_FUNC); if (arg0) if ((lparg0 = getGUIDFields(env, arg0, &_arg0)) == NULL) goto fail; - if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail; + if (arg1) if ((lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL)) == NULL) goto fail; rc = (jint)StringFromCLSID(lparg0, (LPOLESTR *)lparg1); fail: - if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0); + if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, 0); if (arg0 && lparg0) setGUIDFields(env, arg0, lparg0); COM_NATIVE_EXIT(env, that, StringFromCLSID_FUNC); return rc; @@ -1226,14 +1061,14 @@ fail: #endif #ifndef NO_SysAllocString -JNIEXPORT jintLong JNICALL COM_NATIVE(SysAllocString) +JNIEXPORT jlong JNICALL COM_NATIVE(SysAllocString) (JNIEnv *env, jclass that, jcharArray arg0) { jchar *lparg0=NULL; - jintLong rc = 0; + jlong rc = 0; COM_NATIVE_ENTER(env, that, SysAllocString_FUNC); if (arg0) if ((lparg0 = (*env)->GetCharArrayElements(env, arg0, NULL)) == NULL) goto fail; - rc = (jintLong)SysAllocString((OLECHAR *)lparg0); + rc = (jlong)SysAllocString((OLECHAR *)lparg0); fail: if (arg0 && lparg0) (*env)->ReleaseCharArrayElements(env, arg0, lparg0, 0); COM_NATIVE_EXIT(env, that, SysAllocString_FUNC); @@ -1243,7 +1078,7 @@ fail: #ifndef NO_SysFreeString JNIEXPORT void JNICALL COM_NATIVE(SysFreeString) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { COM_NATIVE_ENTER(env, that, SysFreeString_FUNC); SysFreeString((BSTR)arg0); @@ -1253,7 +1088,7 @@ JNIEXPORT void JNICALL COM_NATIVE(SysFreeString) #ifndef NO_SysStringByteLen JNIEXPORT jint JNICALL COM_NATIVE(SysStringByteLen) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; COM_NATIVE_ENTER(env, that, SysStringByteLen_FUNC); @@ -1265,7 +1100,7 @@ JNIEXPORT jint JNICALL COM_NATIVE(SysStringByteLen) #ifndef NO_SysStringLen JNIEXPORT jint JNICALL COM_NATIVE(SysStringLen) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; COM_NATIVE_ENTER(env, that, SysStringLen_FUNC); @@ -1325,7 +1160,7 @@ JNIEXPORT jint JNICALL COM_NATIVE(VARIANT_1sizeof) #ifndef NO_VariantChangeType JNIEXPORT jint JNICALL COM_NATIVE(VariantChangeType) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jshort arg2, jshort arg3) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jshort arg2, jshort arg3) { jint rc = 0; COM_NATIVE_ENTER(env, that, VariantChangeType_FUNC); @@ -1337,7 +1172,7 @@ JNIEXPORT jint JNICALL COM_NATIVE(VariantChangeType) #ifndef NO_VariantClear JNIEXPORT jint JNICALL COM_NATIVE(VariantClear) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; COM_NATIVE_ENTER(env, that, VariantClear_FUNC); @@ -1349,7 +1184,7 @@ JNIEXPORT jint JNICALL COM_NATIVE(VariantClear) #ifndef NO_VariantInit JNIEXPORT void JNICALL COM_NATIVE(VariantInit) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { COM_NATIVE_ENTER(env, that, VariantInit_FUNC); VariantInit((VARIANTARG FAR* )arg0); @@ -1357,2243 +1192,1374 @@ JNIEXPORT void JNICALL COM_NATIVE(VariantInit) } #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) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5) -#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; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IIIIII_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJIIII_FUNC); -#endif - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IIIIII_FUNC); -#else + 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); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IIIIIII) && !defined(JNI64)) || (!defined(NO_VtblCall__IJIIIII) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6) -#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; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IIIIIII_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJIIIII_FUNC); -#endif - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IIIIIII_FUNC); -#else + 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); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IIIIIIII) && !defined(JNI64)) || (!defined(NO_VtblCall__IJIIIIIJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIIIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jintLong arg7) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJIIIIIJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jintLong arg7) -#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; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IIIIIIII_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJIIIIIJ_FUNC); -#endif - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint, jint, jintLong))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IIIIIIII_FUNC); -#else + 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); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IIIIIIIIII) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJJJJIIII) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIIIIIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5, jint arg6, jint arg7, jint arg8, jint arg9) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJJJJIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5, jint arg6, jint arg7, jint arg8, jint arg9) -#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; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IIIIIIIIII_FUNC); -#else - COM_NATIVE_ENTER(env, that, VtblCall__IJJJJJIIII_FUNC); -#endif - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jintLong, jintLong, jintLong, jintLong, jint, jint, jint, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IIIIIIIIII_FUNC); -#else - COM_NATIVE_EXIT(env, that, VtblCall__IJJJJJIIII_FUNC); -#endif + 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 -#if (!defined(NO_VtblCall__IIIIILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2ILorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJIIILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2ILorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIIIILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2ILorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jobject arg5, jint arg6, jobject arg7, jint arg8) -#else -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, jintLong arg1, jint arg2, jint arg3, jint arg4, jobject arg5, jint arg6, jobject arg7, jint arg8) -#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) { DISPPARAMS _arg5, *lparg5=NULL; EXCEPINFO _arg7, *lparg7=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IIIIILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2ILorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2I_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJIIILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2ILorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2I_FUNC); -#endif if (arg5) if ((lparg5 = getDISPPARAMSFields(env, arg5, &_arg5)) == NULL) goto fail; if (arg7) if ((lparg7 = getEXCEPINFOFields(env, arg7, &_arg7)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, DISPPARAMS *, jint, EXCEPINFO *, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5, arg6, lparg7, arg8); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint, jint, DISPPARAMS *, jint, EXCEPINFO *, jint))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5, arg6, lparg7, arg8); fail: if (arg7 && lparg7) setEXCEPINFOFields(env, arg7, lparg7); if (arg5 && lparg5) setDISPPARAMSFields(env, arg5, lparg5); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IIIIILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2ILorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2I_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJIIILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2ILorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2I_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IIIIILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JLorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJIIILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JLorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2J) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIIIILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JLorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jobject arg5, jlong arg6, jobject arg7, jlong arg8) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJIIILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JLorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jobject arg5, jlong arg6, jobject arg7, jlong arg8) -#endif +#ifndef NO_VtblCall__IJIIILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JLorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2J +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJIIILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JLorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2J) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jobject arg5, jlong arg6, jobject arg7, jlong arg8) { DISPPARAMS _arg5, *lparg5=NULL; EXCEPINFO _arg7, *lparg7=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IIIIILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JLorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2J_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJIIILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JLorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2J_FUNC); -#endif if (arg5) if ((lparg5 = getDISPPARAMSFields(env, arg5, &_arg5)) == NULL) goto fail; if (arg7) if ((lparg7 = getEXCEPINFOFields(env, arg7, &_arg7)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, DISPPARAMS *, jlong, EXCEPINFO *, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5, arg6, lparg7, arg8); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint, jint, DISPPARAMS *, jlong, EXCEPINFO *, jlong))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5, arg6, lparg7, arg8); fail: if (arg7 && lparg7) setEXCEPINFOFields(env, arg7, lparg7); if (arg5 && lparg5) setDISPPARAMSFields(env, arg5, lparg5); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IIIIILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JLorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2J_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJIIILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JLorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2J_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IIIIJ) && !defined(JNI64)) || (!defined(NO_VtblCall__IJIIJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIIIJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jlong arg4) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJIIJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jlong arg4) -#endif +#ifndef NO_VtblCall__IJIIJ +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJIIJ) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jlong arg4) { jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IIIIJ_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJIIJ_FUNC); -#endif - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IIIIJ_FUNC); -#else + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint, jlong))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4); COM_NATIVE_EXIT(env, that, VtblCall__IJIIJ_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IIIILorg_eclipse_swt_internal_ole_win32_DVTARGETDEVICE_2Lorg_eclipse_swt_internal_win32_SIZE_2) && !defined(JNI64)) || (!defined(NO_VtblCall__IJIILorg_eclipse_swt_internal_ole_win32_DVTARGETDEVICE_2Lorg_eclipse_swt_internal_win32_SIZE_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIIILorg_eclipse_swt_internal_ole_win32_DVTARGETDEVICE_2Lorg_eclipse_swt_internal_win32_SIZE_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jobject arg4, jobject arg5) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJIILorg_eclipse_swt_internal_ole_win32_DVTARGETDEVICE_2Lorg_eclipse_swt_internal_win32_SIZE_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jobject arg4, jobject arg5) -#endif +#ifndef NO_VtblCall__IJIILorg_eclipse_swt_internal_ole_win32_DVTARGETDEVICE_2Lorg_eclipse_swt_internal_win32_SIZE_2 +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJIILorg_eclipse_swt_internal_ole_win32_DVTARGETDEVICE_2Lorg_eclipse_swt_internal_win32_SIZE_2) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jobject arg4, jobject arg5) { DVTARGETDEVICE _arg4, *lparg4=NULL; SIZE _arg5, *lparg5=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IIIILorg_eclipse_swt_internal_ole_win32_DVTARGETDEVICE_2Lorg_eclipse_swt_internal_win32_SIZE_2_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJIILorg_eclipse_swt_internal_ole_win32_DVTARGETDEVICE_2Lorg_eclipse_swt_internal_win32_SIZE_2_FUNC); -#endif if (arg4) if ((lparg4 = getDVTARGETDEVICEFields(env, arg4, &_arg4)) == NULL) goto fail; if (arg5) if ((lparg5 = getSIZEFields(env, arg5, &_arg5)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, DVTARGETDEVICE *, SIZE *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, lparg5); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint, DVTARGETDEVICE *, SIZE *))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, lparg5); fail: if (arg5 && lparg5) setSIZEFields(env, arg5, lparg5); if (arg4 && lparg4) setDVTARGETDEVICEFields(env, arg4, lparg4); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IIIILorg_eclipse_swt_internal_ole_win32_DVTARGETDEVICE_2Lorg_eclipse_swt_internal_win32_SIZE_2_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJIILorg_eclipse_swt_internal_ole_win32_DVTARGETDEVICE_2Lorg_eclipse_swt_internal_win32_SIZE_2_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IIIILorg_eclipse_swt_internal_ole_win32_GUID_2I_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJIILorg_eclipse_swt_internal_ole_win32_GUID_2I_3I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIIILorg_eclipse_swt_internal_ole_win32_GUID_2I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jintArray arg6) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJIILorg_eclipse_swt_internal_ole_win32_GUID_2I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jintArray arg6) -#endif +#ifndef NO_VtblCall__IJIILorg_eclipse_swt_internal_ole_win32_GUID_2I_3I +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJIILorg_eclipse_swt_internal_ole_win32_GUID_2I_3I) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jintArray arg6) { GUID _arg4, *lparg4=NULL; jint *lparg6=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IIIILorg_eclipse_swt_internal_ole_win32_GUID_2I_3I_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJIILorg_eclipse_swt_internal_ole_win32_GUID_2I_3I_FUNC); -#endif if (arg4) if ((lparg4 = getGUIDFields(env, arg4, &_arg4)) == NULL) goto fail; if (arg6) if ((lparg6 = (*env)->GetIntArrayElements(env, arg6, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, GUID *, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5, lparg6); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint, GUID *, jint, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5, lparg6); fail: if (arg6 && lparg6) (*env)->ReleaseIntArrayElements(env, arg6, lparg6, 0); if (arg4 && lparg4) setGUIDFields(env, arg4, lparg4); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IIIILorg_eclipse_swt_internal_ole_win32_GUID_2I_3I_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJIILorg_eclipse_swt_internal_ole_win32_GUID_2I_3I_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IIIILorg_eclipse_swt_internal_win32_POINT_2I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJIILorg_eclipse_swt_internal_win32_POINT_2I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIIILorg_eclipse_swt_internal_win32_POINT_2I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jobject arg4, jint arg5) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJIILorg_eclipse_swt_internal_win32_POINT_2I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jobject arg4, jint arg5) -#endif +#ifndef NO_VtblCall__IJIILorg_eclipse_swt_internal_win32_POINT_2I +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJIILorg_eclipse_swt_internal_win32_POINT_2I) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jobject arg4, jint arg5) { POINT _arg4, *lparg4=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IIIILorg_eclipse_swt_internal_win32_POINT_2I_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJIILorg_eclipse_swt_internal_win32_POINT_2I_FUNC); -#endif if (arg4) if ((lparg4 = getPOINTFields(env, arg4, &_arg4)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, POINT *, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint, POINT *, jint))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5); fail: if (arg4 && lparg4) setPOINTFields(env, arg4, lparg4); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IIIILorg_eclipse_swt_internal_win32_POINT_2I_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJIILorg_eclipse_swt_internal_win32_POINT_2I_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IIIIZ) && !defined(JNI64)) || (!defined(NO_VtblCall__IJIIZ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIIIZ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jboolean arg4) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJIIZ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jboolean arg4) -#endif +#ifndef NO_VtblCall__IJIIZ +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJIIZ) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jboolean arg4) { jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IIIIZ_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJIIZ_FUNC); -#endif - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jboolean))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IIIIZ_FUNC); -#else + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint, jboolean))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4); COM_NATIVE_EXIT(env, that, VtblCall__IJIIZ_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) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jintArray arg4) -#endif +#ifndef NO_VtblCall__IJII_3I +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJII_3I) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jintArray arg4) { jint *lparg4=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IIII_3I_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJII_3I_FUNC); -#endif if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, lparg4); fail: if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IIII_3I_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJII_3I_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IIII_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJII_3J) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIII_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jlongArray arg4) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJII_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jlongArray arg4) -#endif +#ifndef NO_VtblCall__IJII_3J +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJII_3J) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jlongArray arg4) { jlong *lparg4=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IIII_3J_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJII_3J_FUNC); -#endif if (arg4) if ((lparg4 = (*env)->GetLongArrayElements(env, arg4, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint, jlong *))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, lparg4); fail: if (arg4 && lparg4) (*env)->ReleaseLongArrayElements(env, arg4, lparg4, 0); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IIII_3J_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJII_3J_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IIIJ_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJIJ_3I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIIJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jlong arg3, jintArray arg4) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJIJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jlong arg3, jintArray arg4) -#endif +#ifndef NO_VtblCall__IJIJ_3I +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJIJ_3I) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jlong arg3, jintArray arg4) { jint *lparg4=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IIIJ_3I_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJIJ_3I_FUNC); -#endif if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jlong, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jlong, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, lparg4); fail: if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IIIJ_3I_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJIJ_3I_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IIILorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJILorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3, jintArray arg4) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJILorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3, jintArray arg4) -#endif +#ifndef NO_VtblCall__IJILorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3I +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJILorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3I) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jobject arg3, jintArray arg4) { FORMATETC _arg3, *lparg3=NULL; jint *lparg4=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IIILorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3I_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJILorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3I_FUNC); -#endif if (arg3) if ((lparg3 = getFORMATETCFields(env, arg3, &_arg3)) == NULL) goto fail; if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, FORMATETC *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, FORMATETC *, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4); fail: if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0); if (arg3 && lparg3) setFORMATETCFields(env, arg3, lparg3); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IIILorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3I_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJILorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3I_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2) && !defined(JNI64)) || (!defined(NO_VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3) -#endif +#ifndef NO_VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2 +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jobject arg3) { GUID _arg3, *lparg3=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2_FUNC); -#endif if (arg3) if ((lparg3 = getGUIDFields(env, arg3, &_arg3)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, GUID *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, GUID *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3); fail: if (arg3 && lparg3) setGUIDFields(env, arg3, lparg3); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2II) && !defined(JNI64)) || (!defined(NO_VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2II) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2II)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3, jint arg4, jint arg5) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2II)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3, jint arg4, jint arg5) -#endif +#ifndef NO_VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2II +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2II) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jobject arg3, jint arg4, jint arg5) { GUID _arg3, *lparg3=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2II_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2II_FUNC); -#endif if (arg3) if ((lparg3 = getGUIDFields(env, arg3, &_arg3)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, GUID *, jint, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, arg4, arg5); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, GUID *, jint, jint))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, arg4, arg5); fail: if (arg3 && lparg3) setGUIDFields(env, arg3, lparg3); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2II_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2II_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2ILorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2ILorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2ILorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3, jint arg4, jint arg5, jobject arg6, jint arg7, jobject arg8, jintArray arg9) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2ILorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3, jint arg4, jint arg5, jobject arg6, jint arg7, jobject arg8, jintArray arg9) -#endif +#ifndef NO_VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2ILorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2ILorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jobject arg3, jint arg4, jint arg5, jobject arg6, jint arg7, jobject arg8, jintArray arg9) { GUID _arg3, *lparg3=NULL; DISPPARAMS _arg6, *lparg6=NULL; EXCEPINFO _arg8, *lparg8=NULL; jint *lparg9=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2ILorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2ILorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I_FUNC); -#endif if (arg3) if ((lparg3 = getGUIDFields(env, arg3, &_arg3)) == NULL) goto fail; if (arg6) if ((lparg6 = getDISPPARAMSFields(env, arg6, &_arg6)) == NULL) goto fail; if (arg8) if ((lparg8 = getEXCEPINFOFields(env, arg8, &_arg8)) == NULL) goto fail; if (arg9) if ((lparg9 = (*env)->GetIntArrayElements(env, arg9, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, GUID *, jint, jint, DISPPARAMS *, jint, EXCEPINFO *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, arg4, arg5, lparg6, arg7, lparg8, lparg9); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, GUID *, jint, jint, DISPPARAMS *, jint, EXCEPINFO *, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, arg4, arg5, lparg6, arg7, lparg8, lparg9); fail: if (arg9 && lparg9) (*env)->ReleaseIntArrayElements(env, arg9, lparg9, 0); if (arg8 && lparg8) setEXCEPINFOFields(env, arg8, lparg8); if (arg6 && lparg6) setDISPPARAMSFields(env, arg6, lparg6); if (arg3 && lparg3) setGUIDFields(env, arg3, lparg3); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2ILorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2ILorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JLorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JLorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JLorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3, jint arg4, jint arg5, jobject arg6, jlong arg7, jobject arg8, jintArray arg9) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JLorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3, jint arg4, jint arg5, jobject arg6, jlong arg7, jobject arg8, jintArray arg9) -#endif +#ifndef NO_VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JLorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JLorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jobject arg3, jint arg4, jint arg5, jobject arg6, jlong arg7, jobject arg8, jintArray arg9) { GUID _arg3, *lparg3=NULL; DISPPARAMS _arg6, *lparg6=NULL; EXCEPINFO _arg8, *lparg8=NULL; jint *lparg9=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JLorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JLorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I_FUNC); -#endif if (arg3) if ((lparg3 = getGUIDFields(env, arg3, &_arg3)) == NULL) goto fail; if (arg6) if ((lparg6 = getDISPPARAMSFields(env, arg6, &_arg6)) == NULL) goto fail; if (arg8) if ((lparg8 = getEXCEPINFOFields(env, arg8, &_arg8)) == NULL) goto fail; if (arg9) if ((lparg9 = (*env)->GetIntArrayElements(env, arg9, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, GUID *, jint, jint, DISPPARAMS *, jlong, EXCEPINFO *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, arg4, arg5, lparg6, arg7, lparg8, lparg9); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, GUID *, jint, jint, DISPPARAMS *, jlong, EXCEPINFO *, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, arg4, arg5, lparg6, arg7, lparg8, lparg9); fail: if (arg9 && lparg9) (*env)->ReleaseIntArrayElements(env, arg9, lparg9, 0); if (arg8 && lparg8) setEXCEPINFOFields(env, arg8, lparg8); if (arg6 && lparg6) setDISPPARAMSFields(env, arg6, lparg6); if (arg3 && lparg3) setGUIDFields(env, arg3, lparg3); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JLorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JLorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2JJ) && !defined(JNI64)) || (!defined(NO_VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2JJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2JJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3, jlong arg4, jlong arg5) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2JJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3, jlong arg4, jlong arg5) -#endif +#ifndef NO_VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2JJ +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2JJ) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jobject arg3, jlong arg4, jlong arg5) { GUID _arg3, *lparg3=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2JJ_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2JJ_FUNC); -#endif if (arg3) if ((lparg3 = getGUIDFields(env, arg3, &_arg3)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, GUID *, jlong, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, arg4, arg5); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, GUID *, jlong, jlong))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, arg4, arg5); fail: if (arg3 && lparg3) setGUIDFields(env, arg3, lparg3); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2JJ_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2JJ_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IIILorg_eclipse_swt_internal_ole_win32_STATSTG_2_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJILorg_eclipse_swt_internal_ole_win32_STATSTG_2_3I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_ole_win32_STATSTG_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3, jintArray arg4) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJILorg_eclipse_swt_internal_ole_win32_STATSTG_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3, jintArray arg4) -#endif +#ifndef NO_VtblCall__IJILorg_eclipse_swt_internal_ole_win32_STATSTG_2_3I +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJILorg_eclipse_swt_internal_ole_win32_STATSTG_2_3I) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jobject arg3, jintArray arg4) { STATSTG _arg3, *lparg3=NULL; jint *lparg4=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IIILorg_eclipse_swt_internal_ole_win32_STATSTG_2_3I_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJILorg_eclipse_swt_internal_ole_win32_STATSTG_2_3I_FUNC); -#endif if (arg3) if ((lparg3 = getSTATSTGFields(env, arg3, &_arg3)) == NULL) goto fail; if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, STATSTG *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, STATSTG *, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4); fail: if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0); if (arg3 && lparg3) setSTATSTGFields(env, arg3, lparg3); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IIILorg_eclipse_swt_internal_ole_win32_STATSTG_2_3I_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJILorg_eclipse_swt_internal_ole_win32_STATSTG_2_3I_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IIILorg_eclipse_swt_internal_win32_MSG_2IIILorg_eclipse_swt_internal_win32_RECT_2) && !defined(JNI64)) || (!defined(NO_VtblCall__IJILorg_eclipse_swt_internal_win32_MSG_2IIILorg_eclipse_swt_internal_win32_RECT_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_win32_MSG_2IIILorg_eclipse_swt_internal_win32_RECT_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3, jint arg4, jint arg5, jint arg6, jobject arg7) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJILorg_eclipse_swt_internal_win32_MSG_2IIILorg_eclipse_swt_internal_win32_RECT_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3, jint arg4, jint arg5, jint arg6, jobject arg7) -#endif +#ifndef NO_VtblCall__IJILorg_eclipse_swt_internal_win32_MSG_2IIILorg_eclipse_swt_internal_win32_RECT_2 +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJILorg_eclipse_swt_internal_win32_MSG_2IIILorg_eclipse_swt_internal_win32_RECT_2) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jobject arg3, jint arg4, jint arg5, jint arg6, jobject arg7) { MSG _arg3, *lparg3=NULL; RECT _arg7, *lparg7=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IIILorg_eclipse_swt_internal_win32_MSG_2IIILorg_eclipse_swt_internal_win32_RECT_2_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJILorg_eclipse_swt_internal_win32_MSG_2IIILorg_eclipse_swt_internal_win32_RECT_2_FUNC); -#endif if (arg3) if ((lparg3 = getMSGFields(env, arg3, &_arg3)) == NULL) goto fail; if (arg7) if ((lparg7 = getRECTFields(env, arg7, &_arg7)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, MSG *, jint, jint, jint, RECT *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, arg4, arg5, arg6, lparg7); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, MSG *, jint, jint, jint, RECT *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, arg4, arg5, arg6, lparg7); fail: if (arg7 && lparg7) setRECTFields(env, arg7, lparg7); if (arg3 && lparg3) setMSGFields(env, arg3, lparg3); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IIILorg_eclipse_swt_internal_win32_MSG_2IIILorg_eclipse_swt_internal_win32_RECT_2_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJILorg_eclipse_swt_internal_win32_MSG_2IIILorg_eclipse_swt_internal_win32_RECT_2_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IIILorg_eclipse_swt_internal_win32_MSG_2JIJLorg_eclipse_swt_internal_win32_RECT_2) && !defined(JNI64)) || (!defined(NO_VtblCall__IJILorg_eclipse_swt_internal_win32_MSG_2JIJLorg_eclipse_swt_internal_win32_RECT_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_win32_MSG_2JIJLorg_eclipse_swt_internal_win32_RECT_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3, jlong arg4, jint arg5, jlong arg6, jobject arg7) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJILorg_eclipse_swt_internal_win32_MSG_2JIJLorg_eclipse_swt_internal_win32_RECT_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3, jlong arg4, jint arg5, jlong arg6, jobject arg7) -#endif +#ifndef NO_VtblCall__IJILorg_eclipse_swt_internal_win32_MSG_2JIJLorg_eclipse_swt_internal_win32_RECT_2 +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJILorg_eclipse_swt_internal_win32_MSG_2JIJLorg_eclipse_swt_internal_win32_RECT_2) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jobject arg3, jlong arg4, jint arg5, jlong arg6, jobject arg7) { MSG _arg3, *lparg3=NULL; RECT _arg7, *lparg7=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IIILorg_eclipse_swt_internal_win32_MSG_2JIJLorg_eclipse_swt_internal_win32_RECT_2_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJILorg_eclipse_swt_internal_win32_MSG_2JIJLorg_eclipse_swt_internal_win32_RECT_2_FUNC); -#endif if (arg3) if ((lparg3 = getMSGFields(env, arg3, &_arg3)) == NULL) goto fail; if (arg7) if ((lparg7 = getRECTFields(env, arg7, &_arg7)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, MSG *, jlong, jint, jlong, RECT *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, arg4, arg5, arg6, lparg7); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, MSG *, jlong, jint, jlong, RECT *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, arg4, arg5, arg6, lparg7); fail: if (arg7 && lparg7) setRECTFields(env, arg7, lparg7); if (arg3 && lparg3) setMSGFields(env, arg3, lparg3); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IIILorg_eclipse_swt_internal_win32_MSG_2JIJLorg_eclipse_swt_internal_win32_RECT_2_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJILorg_eclipse_swt_internal_win32_MSG_2JIJLorg_eclipse_swt_internal_win32_RECT_2_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IIILorg_eclipse_swt_internal_win32_POINT_2I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJILorg_eclipse_swt_internal_win32_POINT_2I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_win32_POINT_2I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3, jint arg4) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJILorg_eclipse_swt_internal_win32_POINT_2I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3, jint arg4) -#endif +#ifndef NO_VtblCall__IJILorg_eclipse_swt_internal_win32_POINT_2I +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJILorg_eclipse_swt_internal_win32_POINT_2I) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jobject arg3, jint arg4) { POINT _arg3, *lparg3=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IIILorg_eclipse_swt_internal_win32_POINT_2I_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJILorg_eclipse_swt_internal_win32_POINT_2I_FUNC); -#endif if (arg3) if ((lparg3 = getPOINTFields(env, arg3, &_arg3)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, POINT *, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, arg4); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, POINT *, jint))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, arg4); fail: if (arg3 && lparg3) setPOINTFields(env, arg3, lparg3); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IIILorg_eclipse_swt_internal_win32_POINT_2I_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJILorg_eclipse_swt_internal_win32_POINT_2I_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IIILorg_eclipse_swt_internal_win32_SIZE_2) && !defined(JNI64)) || (!defined(NO_VtblCall__IJILorg_eclipse_swt_internal_win32_SIZE_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_win32_SIZE_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJILorg_eclipse_swt_internal_win32_SIZE_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3) -#endif +#ifndef NO_VtblCall__IJILorg_eclipse_swt_internal_win32_SIZE_2 +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJILorg_eclipse_swt_internal_win32_SIZE_2) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jobject arg3) { SIZE _arg3, *lparg3=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IIILorg_eclipse_swt_internal_win32_SIZE_2_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJILorg_eclipse_swt_internal_win32_SIZE_2_FUNC); -#endif if (arg3) if ((lparg3 = getSIZEFields(env, arg3, &_arg3)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, SIZE *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, SIZE *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3); fail: if (arg3 && lparg3) setSIZEFields(env, arg3, lparg3); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IIILorg_eclipse_swt_internal_win32_SIZE_2_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJILorg_eclipse_swt_internal_win32_SIZE_2_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IIIZ) && !defined(JNI64)) || (!defined(NO_VtblCall__IJIZ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIIZ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jboolean arg3) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJIZ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jboolean arg3) -#endif +#ifndef NO_VtblCall__IJIZ +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJIZ) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jboolean arg3) { jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IIIZ_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJIZ_FUNC); -#endif - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jboolean))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IIIZ_FUNC); -#else + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jboolean))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3); COM_NATIVE_EXIT(env, that, VtblCall__IJIZ_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__III_3II_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJI_3II_3I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__III_3II_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3, jint arg4, jintArray arg5) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJI_3II_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3, jint arg4, jintArray arg5) -#endif +#ifndef NO_VtblCall__IJI_3II_3I +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJI_3II_3I) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jintArray arg3, jint arg4, jintArray arg5) { jint *lparg3=NULL; jint *lparg5=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__III_3II_3I_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJI_3II_3I_FUNC); -#endif if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail; if (arg5) if ((lparg5 = (*env)->GetIntArrayElements(env, arg5, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint *, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, arg4, lparg5); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint *, jint, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, arg4, lparg5); fail: if (arg5 && lparg5) (*env)->ReleaseIntArrayElements(env, arg5, lparg5, 0); if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__III_3II_3I_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJI_3II_3I_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__III_3I_3I_3I_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJI_3I_3I_3I_3I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__III_3I_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3, jintArray arg4, jintArray arg5, jintArray arg6) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJI_3I_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3, jintArray arg4, jintArray arg5, jintArray arg6) -#endif +#ifndef NO_VtblCall__IJI_3I_3I_3I_3I +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJI_3I_3I_3I_3I) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jintArray arg3, jintArray arg4, jintArray arg5, jintArray arg6) { jint *lparg3=NULL; jint *lparg4=NULL; jint *lparg5=NULL; jint *lparg6=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__III_3I_3I_3I_3I_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJI_3I_3I_3I_3I_FUNC); -#endif if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail; if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail; if (arg5) if ((lparg5 = (*env)->GetIntArrayElements(env, arg5, NULL)) == NULL) goto fail; if (arg6) if ((lparg6 = (*env)->GetIntArrayElements(env, arg6, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint *, jint *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint *, jint *, jint *, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6); fail: if (arg6 && lparg6) (*env)->ReleaseIntArrayElements(env, arg6, lparg6, 0); if (arg5 && lparg5) (*env)->ReleaseIntArrayElements(env, arg5, lparg5, 0); if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0); if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__III_3I_3I_3I_3I_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJI_3I_3I_3I_3I_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__III_3JI_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJI_3JI_3I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__III_3JI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jlongArray arg3, jint arg4, jintArray arg5) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJI_3JI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jlongArray arg3, jint arg4, jintArray arg5) -#endif +#ifndef NO_VtblCall__IJI_3JI_3I +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJI_3JI_3I) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jlongArray arg3, jint arg4, jintArray arg5) { jlong *lparg3=NULL; jint *lparg5=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__III_3JI_3I_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJI_3JI_3I_FUNC); -#endif if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail; if (arg5) if ((lparg5 = (*env)->GetIntArrayElements(env, arg5, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jlong *, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, arg4, lparg5); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jlong *, jint, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, arg4, lparg5); fail: if (arg5 && lparg5) (*env)->ReleaseIntArrayElements(env, arg5, lparg5, 0); if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__III_3JI_3I_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJI_3JI_3I_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__III_3J_3J_3I_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJI_3J_3J_3I_3J) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__III_3J_3J_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jlongArray arg3, jlongArray arg4, jintArray arg5, jlongArray arg6) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJI_3J_3J_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jlongArray arg3, jlongArray arg4, jintArray arg5, jlongArray arg6) -#endif +#ifndef NO_VtblCall__IJI_3J_3J_3I_3J +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJI_3J_3J_3I_3J) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jlongArray arg3, jlongArray arg4, jintArray arg5, jlongArray arg6) { jlong *lparg3=NULL; jlong *lparg4=NULL; jint *lparg5=NULL; jlong *lparg6=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__III_3J_3J_3I_3J_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJI_3J_3J_3I_3J_FUNC); -#endif if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail; if (arg4) if ((lparg4 = (*env)->GetLongArrayElements(env, arg4, NULL)) == NULL) goto fail; if (arg5) if ((lparg5 = (*env)->GetIntArrayElements(env, arg5, NULL)) == NULL) goto fail; if (arg6) if ((lparg6 = (*env)->GetLongArrayElements(env, arg6, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jlong *, jlong *, jint *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jlong *, jlong *, jint *, jlong *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6); fail: if (arg6 && lparg6) (*env)->ReleaseLongArrayElements(env, arg6, lparg6, 0); if (arg5 && lparg5) (*env)->ReleaseIntArrayElements(env, arg5, lparg5, 0); if (arg4 && lparg4) (*env)->ReleaseLongArrayElements(env, arg4, lparg4, 0); if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__III_3J_3J_3I_3J_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJI_3J_3J_3I_3J_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) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jintArray arg4) +#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) { jint *lparg4=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IIJI_3I_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJJI_3I_FUNC); -#endif if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jint, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, lparg4); fail: if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IIJI_3I_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJJI_3I_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IIJI_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJI_3J) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIJI_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jlongArray arg4) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJI_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jlongArray arg4) -#endif +#ifndef NO_VtblCall__IJJI_3J +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJI_3J) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jint arg3, jlongArray arg4) { jlong *lparg4=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IIJI_3J_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJJI_3J_FUNC); -#endif if (arg4) if ((lparg4 = (*env)->GetLongArrayElements(env, arg4, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jint, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jint, jlong *))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, lparg4); fail: if (arg4 && lparg4) (*env)->ReleaseLongArrayElements(env, arg4, lparg4, 0); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IIJI_3J_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJJI_3J_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) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJJLorg_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) +#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) +{ + 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); + return rc; +} #endif + +#ifndef NO_VtblCall__IJJJLorg_eclipse_swt_internal_ole_win32_GUID_2J_3J +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJJLorg_eclipse_swt_internal_ole_win32_GUID_2J_3J) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3, jobject arg4, jlong arg5, jlongArray arg6) { GUID _arg4, *lparg4=NULL; jlong *lparg6=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IIJJLorg_eclipse_swt_internal_ole_win32_GUID_2J_3J_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJJJLorg_eclipse_swt_internal_ole_win32_GUID_2J_3J_FUNC); -#endif if (arg4) if ((lparg4 = getGUIDFields(env, arg4, &_arg4)) == NULL) goto fail; if (arg6) if ((lparg6 = (*env)->GetLongArrayElements(env, arg6, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, GUID *, jlong, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5, lparg6); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jlong, GUID *, jlong, jlong *))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5, lparg6); fail: if (arg6 && lparg6) (*env)->ReleaseLongArrayElements(env, arg6, lparg6, 0); if (arg4 && lparg4) setGUIDFields(env, arg4, lparg4); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IIJJLorg_eclipse_swt_internal_ole_win32_GUID_2J_3J_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJJJLorg_eclipse_swt_internal_ole_win32_GUID_2J_3J_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IIJJLorg_eclipse_swt_internal_win32_POINT_2I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJJLorg_eclipse_swt_internal_win32_POINT_2I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIJJLorg_eclipse_swt_internal_win32_POINT_2I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jobject arg4, jint arg5) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJJLorg_eclipse_swt_internal_win32_POINT_2I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jobject arg4, jint arg5) -#endif +#ifndef NO_VtblCall__IJJJLorg_eclipse_swt_internal_win32_POINT_2I +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJJLorg_eclipse_swt_internal_win32_POINT_2I) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3, jobject arg4, jint arg5) { POINT _arg4, *lparg4=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IIJJLorg_eclipse_swt_internal_win32_POINT_2I_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJJJLorg_eclipse_swt_internal_win32_POINT_2I_FUNC); -#endif if (arg4) if ((lparg4 = getPOINTFields(env, arg4, &_arg4)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, POINT *, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jlong, POINT *, jint))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5); fail: if (arg4 && lparg4) setPOINTFields(env, arg4, lparg4); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IIJJLorg_eclipse_swt_internal_win32_POINT_2I_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJJJLorg_eclipse_swt_internal_win32_POINT_2I_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IIJJZ) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJJZ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIJJZ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jboolean arg4) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJJZ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jboolean arg4) -#endif +#ifndef NO_VtblCall__IJJJZ +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJJZ) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3, jboolean arg4) { jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IIJJZ_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJJJZ_FUNC); -#endif - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jboolean))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IIJJZ_FUNC); -#else + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jlong, jboolean))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4); COM_NATIVE_EXIT(env, that, VtblCall__IJJJZ_FUNC); -#endif return rc; } #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 +#ifndef NO_VtblCall__IJJJ_3J +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJJ_3J) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3, jlongArray arg4) { 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); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jlong, jlong *))(*(jlong **)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) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jobject arg3, jlongArray arg4) -#endif +#ifndef NO_VtblCall__IJJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3J +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3J) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jobject arg3, jlongArray arg4) { FORMATETC _arg3, *lparg3=NULL; jlong *lparg4=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IIJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3J_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3J_FUNC); -#endif if (arg3) if ((lparg3 = getFORMATETCFields(env, arg3, &_arg3)) == NULL) goto fail; if (arg4) if ((lparg4 = (*env)->GetLongArrayElements(env, arg4, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, FORMATETC *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, FORMATETC *, jlong *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4); fail: if (arg4 && lparg4) (*env)->ReleaseLongArrayElements(env, arg4, lparg4, 0); if (arg3 && lparg3) setFORMATETCFields(env, arg3, lparg3); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IIJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3J_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3J_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IIJLorg_eclipse_swt_internal_ole_win32_STATSTG_2_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJLorg_eclipse_swt_internal_ole_win32_STATSTG_2_3J) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIJLorg_eclipse_swt_internal_ole_win32_STATSTG_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jobject arg3, jlongArray arg4) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJLorg_eclipse_swt_internal_ole_win32_STATSTG_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jobject arg3, jlongArray arg4) -#endif +#ifndef NO_VtblCall__IJJLorg_eclipse_swt_internal_ole_win32_STATSTG_2_3J +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJLorg_eclipse_swt_internal_ole_win32_STATSTG_2_3J) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jobject arg3, jlongArray arg4) { STATSTG _arg3, *lparg3=NULL; jlong *lparg4=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IIJLorg_eclipse_swt_internal_ole_win32_STATSTG_2_3J_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJJLorg_eclipse_swt_internal_ole_win32_STATSTG_2_3J_FUNC); -#endif if (arg3) if ((lparg3 = getSTATSTGFields(env, arg3, &_arg3)) == NULL) goto fail; if (arg4) if ((lparg4 = (*env)->GetLongArrayElements(env, arg4, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, STATSTG *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, STATSTG *, jlong *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4); fail: if (arg4 && lparg4) (*env)->ReleaseLongArrayElements(env, arg4, lparg4, 0); if (arg3 && lparg3) setSTATSTGFields(env, arg3, lparg3); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IIJLorg_eclipse_swt_internal_ole_win32_STATSTG_2_3J_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJJLorg_eclipse_swt_internal_ole_win32_STATSTG_2_3J_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IIJLorg_eclipse_swt_internal_win32_POINT_2J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJLorg_eclipse_swt_internal_win32_POINT_2J) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIJLorg_eclipse_swt_internal_win32_POINT_2J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jobject arg3, jlong arg4) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJLorg_eclipse_swt_internal_win32_POINT_2J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jobject arg3, jlong arg4) -#endif +#ifndef NO_VtblCall__IJJLorg_eclipse_swt_internal_win32_POINT_2J +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJLorg_eclipse_swt_internal_win32_POINT_2J) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jobject arg3, jlong arg4) { POINT _arg3, *lparg3=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IIJLorg_eclipse_swt_internal_win32_POINT_2J_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJJLorg_eclipse_swt_internal_win32_POINT_2J_FUNC); -#endif if (arg3) if ((lparg3 = getPOINTFields(env, arg3, &_arg3)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, POINT *, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, arg4); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, POINT *, jlong))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, arg4); fail: if (arg3 && lparg3) setPOINTFields(env, arg3, lparg3); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IIJLorg_eclipse_swt_internal_win32_POINT_2J_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJJLorg_eclipse_swt_internal_win32_POINT_2J_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IIJZ) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJZ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIJZ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jboolean arg3) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJZ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jboolean arg3) -#endif +#ifndef NO_VtblCall__IJJZ +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJZ) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jboolean arg3) { jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IIJZ_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJJZ_FUNC); -#endif - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jboolean))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IIJZ_FUNC); -#else + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jboolean))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3); COM_NATIVE_EXIT(env, that, VtblCall__IJJZ_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IIJ_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJ_3J) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlongArray arg3) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlongArray arg3) -#endif +#ifndef NO_VtblCall__IJJ_3J +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJ_3J) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlongArray arg3) { jlong *lparg3=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IIJ_3J_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJJ_3J_FUNC); -#endif if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jlong *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3); fail: if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IIJ_3J_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJJ_3J_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_CAUUID_2) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_CAUUID_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_CAUUID_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_CAUUID_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2) -#endif +#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_CAUUID_2 +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_CAUUID_2) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2) { CAUUID _arg2, *lparg2=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_CAUUID_2_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_CAUUID_2_FUNC); -#endif if (arg2) if ((lparg2 = getCAUUIDFields(env, arg2, &_arg2)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, CAUUID *))(*(jintLong **)arg1)[arg0])(arg1, lparg2); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, CAUUID *))(*(jlong **)arg1)[arg0])(arg1, lparg2); fail: if (arg2 && lparg2) setCAUUIDFields(env, arg2, lparg2); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_CAUUID_2_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_CAUUID_2_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_CONTROLINFO_2) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_CONTROLINFO_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_CONTROLINFO_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_CONTROLINFO_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2) -#endif +#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_CONTROLINFO_2 +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_CONTROLINFO_2) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2) { CONTROLINFO _arg2, *lparg2=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_CONTROLINFO_2_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_CONTROLINFO_2_FUNC); -#endif if (arg2) if ((lparg2 = getCONTROLINFOFields(env, arg2, &_arg2)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, CONTROLINFO *))(*(jintLong **)arg1)[arg0])(arg1, lparg2); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, CONTROLINFO *))(*(jlong **)arg1)[arg0])(arg1, lparg2); fail: if (arg2 && lparg2) setCONTROLINFOFields(env, arg2, lparg2); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_CONTROLINFO_2_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_CONTROLINFO_2_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2) -#endif +#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2 +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2) { FORMATETC _arg2, *lparg2=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2_FUNC); -#endif if (arg2) if ((lparg2 = getFORMATETCFields(env, arg2, &_arg2)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, FORMATETC *))(*(jintLong **)arg1)[arg0])(arg1, lparg2); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, FORMATETC *))(*(jlong **)arg1)[arg0])(arg1, lparg2); fail: if (arg2 && lparg2) setFORMATETCFields(env, arg2, lparg2); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jobject arg3) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jobject arg3) -#endif +#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2 +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jobject arg3) { FORMATETC _arg2, *lparg2=NULL; STGMEDIUM _arg3, *lparg3=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2_FUNC); -#endif if (arg2) if ((lparg2 = getFORMATETCFields(env, arg2, &_arg2)) == NULL) goto fail; if (arg3) if ((lparg3 = getSTGMEDIUMFields(env, arg3, &_arg3)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, FORMATETC *, STGMEDIUM *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, FORMATETC *, STGMEDIUM *))(*(jlong **)arg1)[arg0])(arg1, lparg2, lparg3); fail: if (arg3 && lparg3) setSTGMEDIUMFields(env, arg3, lparg3); if (arg2 && lparg2) setFORMATETCFields(env, arg2, lparg2); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2Z) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2Z) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2Z)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jobject arg3, jboolean arg4) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2Z)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jobject arg3, jboolean arg4) -#endif +#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2Z +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2Z) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jobject arg3, jboolean arg4) { FORMATETC _arg2, *lparg2=NULL; STGMEDIUM _arg3, *lparg3=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2Z_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2Z_FUNC); -#endif if (arg2) if ((lparg2 = getFORMATETCFields(env, arg2, &_arg2)) == NULL) goto fail; if (arg3) if ((lparg3 = getSTGMEDIUMFields(env, arg3, &_arg3)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, FORMATETC *, STGMEDIUM *, jboolean))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, arg4); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, FORMATETC *, STGMEDIUM *, jboolean))(*(jlong **)arg1)[arg0])(arg1, lparg2, lparg3, arg4); fail: if (arg3 && lparg3) setSTGMEDIUMFields(env, arg3, lparg3); if (arg2 && lparg2) setFORMATETCFields(env, arg2, lparg2); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2Z_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2Z_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2) -#endif +#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2 +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2) { GUID _arg2, *lparg2=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2_FUNC); -#endif if (arg2) if ((lparg2 = getGUIDFields(env, arg2, &_arg2)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, GUID *))(*(jintLong **)arg1)[arg0])(arg1, lparg2); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, GUID *))(*(jlong **)arg1)[arg0])(arg1, lparg2); fail: if (arg2 && lparg2) setGUIDFields(env, arg2, lparg2); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2IIII) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2IIII) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2IIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jint arg3, jint arg4, jint arg5, jint arg6) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2IIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jint arg3, jint arg4, jint arg5, jint arg6) -#endif +#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2IIII +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2IIII) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jint arg3, jint arg4, jint arg5, jint arg6) { GUID _arg2, *lparg2=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2IIII_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2IIII_FUNC); -#endif if (arg2) if ((lparg2 = getGUIDFields(env, arg2, &_arg2)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, GUID *, jint, jint, jint, jint))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, arg6); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, GUID *, jint, jint, jint, jint))(*(jlong **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, arg6); fail: if (arg2 && lparg2) setGUIDFields(env, arg2, lparg2); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2IIII_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2IIII_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2III_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2III_3I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2III_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jint arg3, jint arg4, jint arg5, jintArray arg6) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2III_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jint arg3, jint arg4, jint arg5, jintArray arg6) -#endif +#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2III_3I +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2III_3I) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jint arg3, jint arg4, jint arg5, jintArray arg6) { GUID _arg2, *lparg2=NULL; jint *lparg6=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2III_3I_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2III_3I_FUNC); -#endif if (arg2) if ((lparg2 = getGUIDFields(env, arg2, &_arg2)) == NULL) goto fail; if (arg6) if ((lparg6 = (*env)->GetIntArrayElements(env, arg6, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, GUID *, jint, jint, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, lparg6); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, GUID *, jint, jint, jint, jint *))(*(jlong **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, lparg6); fail: if (arg6 && lparg6) (*env)->ReleaseIntArrayElements(env, arg6, lparg6, 0); if (arg2 && lparg2) setGUIDFields(env, arg2, lparg2); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2III_3I_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2III_3I_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2IIJJ) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2IIJJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2IIJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jint arg3, jint arg4, jlong arg5, jlong arg6) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2IIJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jint arg3, jint arg4, jlong arg5, jlong arg6) -#endif +#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2IIJJ +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2IIJJ) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jint arg3, jint arg4, jlong arg5, jlong arg6) { GUID _arg2, *lparg2=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2IIJJ_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2IIJJ_FUNC); -#endif if (arg2) if ((lparg2 = getGUIDFields(env, arg2, &_arg2)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, GUID *, jint, jint, jlong, jlong))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, arg6); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, GUID *, jint, jint, jlong, jlong))(*(jlong **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, arg6); fail: if (arg2 && lparg2) setGUIDFields(env, arg2, lparg2); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2IIJJ_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2IIJJ_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2ILorg_eclipse_swt_internal_ole_win32_OLECMD_2Lorg_eclipse_swt_internal_ole_win32_OLECMDTEXT_2) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2ILorg_eclipse_swt_internal_ole_win32_OLECMD_2Lorg_eclipse_swt_internal_ole_win32_OLECMDTEXT_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2ILorg_eclipse_swt_internal_ole_win32_OLECMD_2Lorg_eclipse_swt_internal_ole_win32_OLECMDTEXT_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jint arg3, jobject arg4, jobject arg5) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2ILorg_eclipse_swt_internal_ole_win32_OLECMD_2Lorg_eclipse_swt_internal_ole_win32_OLECMDTEXT_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jint arg3, jobject arg4, jobject arg5) -#endif +#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2ILorg_eclipse_swt_internal_ole_win32_OLECMD_2Lorg_eclipse_swt_internal_ole_win32_OLECMDTEXT_2 +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2ILorg_eclipse_swt_internal_ole_win32_OLECMD_2Lorg_eclipse_swt_internal_ole_win32_OLECMDTEXT_2) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jint arg3, jobject arg4, jobject arg5) { GUID _arg2, *lparg2=NULL; OLECMD _arg4, *lparg4=NULL; OLECMDTEXT _arg5, *lparg5=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2ILorg_eclipse_swt_internal_ole_win32_OLECMD_2Lorg_eclipse_swt_internal_ole_win32_OLECMDTEXT_2_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2ILorg_eclipse_swt_internal_ole_win32_OLECMD_2Lorg_eclipse_swt_internal_ole_win32_OLECMDTEXT_2_FUNC); -#endif if (arg2) if ((lparg2 = getGUIDFields(env, arg2, &_arg2)) == NULL) goto fail; if (arg4) if ((lparg4 = getOLECMDFields(env, arg4, &_arg4)) == NULL) goto fail; if (arg5) if ((lparg5 = getOLECMDTEXTFields(env, arg5, &_arg5)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, GUID *, jint, OLECMD *, OLECMDTEXT *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, GUID *, jint, OLECMD *, OLECMDTEXT *))(*(jlong **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5); fail: if (arg5 && lparg5) setOLECMDTEXTFields(env, arg5, lparg5); if (arg4 && lparg4) setOLECMDFields(env, arg4, lparg4); if (arg2 && lparg2) setGUIDFields(env, arg2, lparg2); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2ILorg_eclipse_swt_internal_ole_win32_OLECMD_2Lorg_eclipse_swt_internal_ole_win32_OLECMDTEXT_2_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2ILorg_eclipse_swt_internal_ole_win32_OLECMD_2Lorg_eclipse_swt_internal_ole_win32_OLECMDTEXT_2_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2JII_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2JII_3I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2JII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jlong arg3, jint arg4, jint arg5, jintArray arg6) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2JII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jlong arg3, jint arg4, jint arg5, jintArray arg6) -#endif +#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2JII_3I +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2JII_3I) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jlong arg3, jint arg4, jint arg5, jintArray arg6) { GUID _arg2, *lparg2=NULL; jint *lparg6=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2JII_3I_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2JII_3I_FUNC); -#endif if (arg2) if ((lparg2 = getGUIDFields(env, arg2, &_arg2)) == NULL) goto fail; if (arg6) if ((lparg6 = (*env)->GetIntArrayElements(env, arg6, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, GUID *, jlong, jint, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, lparg6); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, GUID *, jlong, jint, jint, jint *))(*(jlong **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, lparg6); fail: if (arg6 && lparg6) (*env)->ReleaseIntArrayElements(env, arg6, lparg6, 0); if (arg2 && lparg2) setGUIDFields(env, arg2, lparg2); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2JII_3I_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2JII_3I_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jobject arg3, jintArray arg4) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jobject arg3, jintArray arg4) -#endif +#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3I +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3I) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jobject arg3, jintArray arg4) { GUID _arg2, *lparg2=NULL; GUID _arg3, *lparg3=NULL; jint *lparg4=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3I_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3I_FUNC); -#endif if (arg2) if ((lparg2 = getGUIDFields(env, arg2, &_arg2)) == NULL) goto fail; if (arg3) if ((lparg3 = getGUIDFields(env, arg3, &_arg3)) == NULL) goto fail; if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, GUID *, GUID *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, GUID *, GUID *, jint *))(*(jlong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4); fail: if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0); if (arg3 && lparg3) setGUIDFields(env, arg3, lparg3); if (arg2 && lparg2) setGUIDFields(env, arg2, lparg2); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3I_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3I_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3J) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jobject arg3, jlongArray arg4) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jobject arg3, jlongArray arg4) -#endif +#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3J +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3J) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jobject arg3, jlongArray arg4) { GUID _arg2, *lparg2=NULL; GUID _arg3, *lparg3=NULL; jlong *lparg4=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3J_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3J_FUNC); -#endif if (arg2) if ((lparg2 = getGUIDFields(env, arg2, &_arg2)) == NULL) goto fail; if (arg3) if ((lparg3 = getGUIDFields(env, arg3, &_arg3)) == NULL) goto fail; if (arg4) if ((lparg4 = (*env)->GetLongArrayElements(env, arg4, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, GUID *, GUID *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, GUID *, GUID *, jlong *))(*(jlong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4); fail: if (arg4 && lparg4) (*env)->ReleaseLongArrayElements(env, arg4, lparg4, 0); if (arg3 && lparg3) setGUIDFields(env, arg3, lparg3); if (arg2 && lparg2) setGUIDFields(env, arg2, lparg2); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3J_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3J_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2_3I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jintArray arg3) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jintArray arg3) -#endif +#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2_3I +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2_3I) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jintArray arg3) { GUID _arg2, *lparg2=NULL; jint *lparg3=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2_3I_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2_3I_FUNC); -#endif if (arg2) if ((lparg2 = getGUIDFields(env, arg2, &_arg2)) == NULL) goto fail; if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, GUID *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, GUID *, jint *))(*(jlong **)arg1)[arg0])(arg1, lparg2, lparg3); fail: if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0); if (arg2 && lparg2) setGUIDFields(env, arg2, lparg2); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2_3I_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2_3I_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2_3J) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jlongArray arg3) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jlongArray arg3) -#endif +#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2_3J +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2_3J) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jlongArray arg3) { GUID _arg2, *lparg2=NULL; jlong *lparg3=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2_3J_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2_3J_FUNC); -#endif if (arg2) if ((lparg2 = getGUIDFields(env, arg2, &_arg2)) == NULL) goto fail; if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, GUID *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, GUID *, jlong *))(*(jlong **)arg1)[arg0])(arg1, lparg2, lparg3); fail: if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0); if (arg2 && lparg2) setGUIDFields(env, arg2, lparg2); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2_3J_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2_3J_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_LICINFO_2) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_LICINFO_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_LICINFO_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_LICINFO_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2) -#endif +#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_LICINFO_2 +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_LICINFO_2) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2) { LICINFO _arg2, *lparg2=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_LICINFO_2_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_LICINFO_2_FUNC); -#endif if (arg2) if ((lparg2 = getLICINFOFields(env, arg2, &_arg2)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, LICINFO *))(*(jintLong **)arg1)[arg0])(arg1, lparg2); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, LICINFO *))(*(jlong **)arg1)[arg0])(arg1, lparg2); fail: if (arg2 && lparg2) setLICINFOFields(env, arg2, lparg2); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_LICINFO_2_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_LICINFO_2_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_win32_MSG_2) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_win32_MSG_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_win32_MSG_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_win32_MSG_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2) -#endif +#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_win32_MSG_2 +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_win32_MSG_2) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2) { MSG _arg2, *lparg2=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_win32_MSG_2_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_MSG_2_FUNC); -#endif if (arg2) if ((lparg2 = getMSGFields(env, arg2, &_arg2)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, MSG *))(*(jintLong **)arg1)[arg0])(arg1, lparg2); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, MSG *))(*(jlong **)arg1)[arg0])(arg1, lparg2); fail: if (arg2 && lparg2) setMSGFields(env, arg2, lparg2); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_win32_MSG_2_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_MSG_2_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_win32_POINT_2I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_win32_POINT_2I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_win32_POINT_2I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jint arg3) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_win32_POINT_2I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jint arg3) -#endif +#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_win32_POINT_2I +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_win32_POINT_2I) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jint arg3) { POINT _arg2, *lparg2=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_win32_POINT_2I_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_POINT_2I_FUNC); -#endif if (arg2) if ((lparg2 = getPOINTFields(env, arg2, &_arg2)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, POINT *, jint))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, POINT *, jint))(*(jlong **)arg1)[arg0])(arg1, lparg2, arg3); fail: if (arg2 && lparg2) setPOINTFields(env, arg2, lparg2); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_win32_POINT_2I_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_POINT_2I_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2) -#endif +#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2 +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2) { RECT _arg2, *lparg2=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2_FUNC); -#endif if (arg2) if ((lparg2 = getRECTFields(env, arg2, &_arg2)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, RECT *))(*(jintLong **)arg1)[arg0])(arg1, lparg2); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, RECT *))(*(jlong **)arg1)[arg0])(arg1, lparg2); fail: if (arg2 && lparg2) setRECTFields(env, arg2, lparg2); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2_FUNC); -#endif return rc; } #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 +#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2II +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2II) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jint arg3, jint arg4) { 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); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, RECT, jint, jint))(*(jlong **)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) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2IZ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jint arg3, jboolean arg4) -#endif +#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2IZ +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2IZ) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jint arg3, jboolean arg4) { RECT _arg2, *lparg2=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2IZ_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2IZ_FUNC); -#endif if (arg2) if ((lparg2 = getRECTFields(env, arg2, &_arg2)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, RECT *, jint, jboolean))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, arg4); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, RECT *, jint, jboolean))(*(jlong **)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_2IZ_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2IZ_FUNC); -#endif return rc; } #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 +#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2JJ +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2JJ) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jlong arg3, jlong arg4) { 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); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, RECT, jlong, jlong))(*(jlong **)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) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2JZ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jlong arg3, jboolean arg4) -#endif +#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2JZ +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2JZ) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jlong arg3, jboolean arg4) { RECT _arg2, *lparg2=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2JZ_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2JZ_FUNC); -#endif if (arg2) if ((lparg2 = getRECTFields(env, arg2, &_arg2)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, RECT *, jlong, jboolean))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, arg4); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, RECT *, jlong, jboolean))(*(jlong **)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_2JZ_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2JZ_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2Lorg_eclipse_swt_internal_win32_RECT_2) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2Lorg_eclipse_swt_internal_win32_RECT_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2Lorg_eclipse_swt_internal_win32_RECT_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jobject arg3) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2Lorg_eclipse_swt_internal_win32_RECT_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jobject arg3) -#endif +#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2Lorg_eclipse_swt_internal_win32_RECT_2 +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2Lorg_eclipse_swt_internal_win32_RECT_2) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jobject arg3) { RECT _arg2, *lparg2=NULL; RECT _arg3, *lparg3=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2Lorg_eclipse_swt_internal_win32_RECT_2_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2Lorg_eclipse_swt_internal_win32_RECT_2_FUNC); -#endif if (arg2) if ((lparg2 = getRECTFields(env, arg2, &_arg2)) == NULL) goto fail; if (arg3) if ((lparg3 = getRECTFields(env, arg3, &_arg3)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, RECT *, RECT *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, RECT *, RECT *))(*(jlong **)arg1)[arg0])(arg1, lparg2, lparg3); fail: if (arg3 && lparg3) setRECTFields(env, arg3, lparg3); if (arg2 && lparg2) setRECTFields(env, arg2, lparg2); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2Lorg_eclipse_swt_internal_win32_RECT_2_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2Lorg_eclipse_swt_internal_win32_RECT_2_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jint arg3) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jint arg3) -#endif +#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jint arg3) { SHDRAGIMAGE _arg2, *lparg2=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I_FUNC); -#endif if (arg2) if ((lparg2 = getSHDRAGIMAGEFields(env, arg2, &_arg2)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, SHDRAGIMAGE *, jint))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, SHDRAGIMAGE *, jint))(*(jlong **)arg1)[arg0])(arg1, lparg2, arg3); fail: if (arg2 && lparg2) setSHDRAGIMAGEFields(env, arg2, lparg2); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2J) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jlong arg3) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jlong arg3) -#endif +#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2J +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2J) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jlong arg3) { SHDRAGIMAGE _arg2, *lparg2=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2J_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2J_FUNC); -#endif if (arg2) if ((lparg2 = getSHDRAGIMAGEFields(env, arg2, &_arg2)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, SHDRAGIMAGE *, jlong))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, SHDRAGIMAGE *, jlong))(*(jlong **)arg1)[arg0])(arg1, lparg2, arg3); fail: if (arg2 && lparg2) setSHDRAGIMAGEFields(env, arg2, lparg2); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2J_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2J_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IIZ) && !defined(JNI64)) || (!defined(NO_VtblCall__IJZ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIZ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jboolean arg2) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJZ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jboolean arg2) -#endif +#ifndef NO_VtblCall__IJZ +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJZ) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jboolean arg2) { jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IIZ_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJZ_FUNC); -#endif - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jboolean))(*(jintLong **)arg1)[arg0])(arg1, arg2); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IIZ_FUNC); -#else + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jboolean))(*(jlong **)arg1)[arg0])(arg1, arg2); COM_NATIVE_EXIT(env, that, VtblCall__IJZ_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IIZI) && !defined(JNI64)) || (!defined(NO_VtblCall__IJZI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIZI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jboolean arg2, jint arg3) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJZI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jboolean arg2, jint arg3) -#endif +#ifndef NO_VtblCall__IJZI +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJZI) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jboolean arg2, jint arg3) { jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IIZI_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJZI_FUNC); -#endif - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jboolean, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IIZI_FUNC); -#else + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jboolean, jint))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3); COM_NATIVE_EXIT(env, that, VtblCall__IJZI_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IIZJ) && !defined(JNI64)) || (!defined(NO_VtblCall__IJZJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIZJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jboolean arg2, jlong arg3) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJZJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jboolean arg2, jlong arg3) -#endif +#ifndef NO_VtblCall__IJZJ +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJZJ) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jboolean arg2, jlong arg3) { jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IIZJ_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJZJ_FUNC); -#endif - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jboolean, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IIZJ_FUNC); -#else + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jboolean, jlong))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3); 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) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJ_3CIIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3, jint arg4, jint arg5, jint arg6, jintArray arg7) -#endif +#ifndef NO_VtblCall__IJ_3CIIII_3I +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJ_3CIIII_3I) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jcharArray arg2, jint arg3, jint arg4, jint arg5, jint arg6, jintArray arg7) { jchar *lparg2=NULL; jint *lparg7=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__II_3CIIII_3I_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJ_3CIIII_3I_FUNC); -#endif if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail; if (arg7) if ((lparg7 = (*env)->GetIntArrayElements(env, arg7, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jchar *, jint, jint, jint, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, arg6, lparg7); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jchar *, jint, jint, jint, jint, jint *))(*(jlong **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, arg6, lparg7); fail: if (arg7 && lparg7) (*env)->ReleaseIntArrayElements(env, arg7, lparg7, 0); if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__II_3CIIII_3I_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJ_3CIIII_3I_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__II_3CIII_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3CIII_3I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__II_3CIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3, jint arg4, jint arg5, jintArray arg6) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJ_3CIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3, jint arg4, jint arg5, jintArray arg6) -#endif +#ifndef NO_VtblCall__IJ_3CIII_3I +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJ_3CIII_3I) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jcharArray arg2, jint arg3, jint arg4, jint arg5, jintArray arg6) { jchar *lparg2=NULL; jint *lparg6=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__II_3CIII_3I_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJ_3CIII_3I_FUNC); -#endif if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail; if (arg6) if ((lparg6 = (*env)->GetIntArrayElements(env, arg6, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jchar *, jint, jint, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, lparg6); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jchar *, jint, jint, jint, jint *))(*(jlong **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, lparg6); fail: if (arg6 && lparg6) (*env)->ReleaseIntArrayElements(env, arg6, lparg6, 0); if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__II_3CIII_3I_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJ_3CIII_3I_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__II_3CIII_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3CIII_3J) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__II_3CIII_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3, jint arg4, jint arg5, jlongArray arg6) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJ_3CIII_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3, jint arg4, jint arg5, jlongArray arg6) -#endif +#ifndef NO_VtblCall__IJ_3CIII_3J +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJ_3CIII_3J) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jcharArray arg2, jint arg3, jint arg4, jint arg5, jlongArray arg6) { jchar *lparg2=NULL; jlong *lparg6=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__II_3CIII_3J_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJ_3CIII_3J_FUNC); -#endif if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail; if (arg6) if ((lparg6 = (*env)->GetLongArrayElements(env, arg6, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jchar *, jint, jint, jint, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, lparg6); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jchar *, jint, jint, jint, jlong *))(*(jlong **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, lparg6); fail: if (arg6 && lparg6) (*env)->ReleaseLongArrayElements(env, arg6, lparg6, 0); if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__II_3CIII_3J_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJ_3CIII_3J_FUNC); -#endif return rc; } #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 +#ifndef NO_VtblCall__IJ_3CI_3I +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJ_3CI_3I) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jcharArray arg2, jint arg3, jintArray arg4) { 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); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jchar *, jint, jint *))(*(jlong **)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) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJ_3CJIII_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jlong arg3, jint arg4, jint arg5, jint arg6, jlongArray arg7) -#endif +#ifndef NO_VtblCall__IJ_3CJIII_3J +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJ_3CJIII_3J) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jcharArray arg2, jlong arg3, jint arg4, jint arg5, jint arg6, jlongArray arg7) { jchar *lparg2=NULL; jlong *lparg7=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__II_3CJIII_3J_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJ_3CJIII_3J_FUNC); -#endif if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail; if (arg7) if ((lparg7 = (*env)->GetLongArrayElements(env, arg7, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jchar *, jlong, jint, jint, jint, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, arg6, lparg7); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jchar *, jlong, jint, jint, jint, jlong *))(*(jlong **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, arg6, lparg7); fail: if (arg7 && lparg7) (*env)->ReleaseLongArrayElements(env, arg7, lparg7, 0); if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__II_3CJIII_3J_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJ_3CJIII_3J_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__II_3CJII_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3CJII_3J) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__II_3CJII_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jlong arg3, jint arg4, jint arg5, jlongArray arg6) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJ_3CJII_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jlong arg3, jint arg4, jint arg5, jlongArray arg6) -#endif +#ifndef NO_VtblCall__IJ_3CJII_3J +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJ_3CJII_3J) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jcharArray arg2, jlong arg3, jint arg4, jint arg5, jlongArray arg6) { jchar *lparg2=NULL; jlong *lparg6=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__II_3CJII_3J_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJ_3CJII_3J_FUNC); -#endif if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail; if (arg6) if ((lparg6 = (*env)->GetLongArrayElements(env, arg6, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jchar *, jlong, jint, jint, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, lparg6); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jchar *, jlong, jint, jint, jlong *))(*(jlong **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, lparg6); fail: if (arg6 && lparg6) (*env)->ReleaseLongArrayElements(env, arg6, lparg6, 0); if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__II_3CJII_3J_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJ_3CJII_3J_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__II_3C_3C) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3C_3C) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__II_3C_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jcharArray arg3) -#else -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJ_3C_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jcharArray arg3) -#endif +#ifndef NO_VtblCall__IJ_3C_3C +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJ_3C_3C) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jcharArray arg2, jcharArray arg3) { jchar *lparg2=NULL; jchar *lparg3=NULL; jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__II_3C_3C_FUNC); -#else COM_NATIVE_ENTER(env, that, VtblCall__IJ_3C_3C_FUNC); -#endif if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail; if (arg3) if ((lparg3 = (*env)->GetCharArrayElements(env, arg3, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jchar *, jchar *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jchar *, jchar *))(*(jlong **)arg1)[arg0])(arg1, lparg2, lparg3); fail: if (arg3 && lparg3) (*env)->ReleaseCharArrayElements(env, arg3, lparg3, 0); if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__II_3C_3C_FUNC); -#else COM_NATIVE_EXIT(env, that, VtblCall__IJ_3C_3C_FUNC); -#endif return rc; } #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 +#ifndef NO_VtblCall__IJ_3C_3I_3I +JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJ_3C_3I_3I) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jcharArray arg2, jintArray arg3, jintArray arg4) { 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); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jchar *, jint *, jint *))(*(jlong **)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) -{ - 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 - -#if (!defined(NO_VtblCall__IJJIIIII) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJIIIIJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJIIIII)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jint arg3, jint arg4, jint arg5, jint arg6, jintLong arg7) -#else -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, jintLong arg7) -#endif -{ - jint rc = 0; -#ifndef JNI64 - COM_NATIVE_ENTER(env, that, VtblCall__IJJIIIII_FUNC); -#else - COM_NATIVE_ENTER(env, that, VtblCall__IJJIIIIJ_FUNC); -#endif - rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jint, jint, jint, jint, jintLong))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7); -#ifndef JNI64 - COM_NATIVE_EXIT(env, that, VtblCall__IJJIIIII_FUNC); -#else - COM_NATIVE_EXIT(env, that, VtblCall__IJJIIIIJ_FUNC); -#endif return rc; } #endif #ifndef NO_WriteClassStg JNIEXPORT jint JNICALL COM_NATIVE(WriteClassStg) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { GUID _arg1, *lparg1=NULL; jint rc = 0; 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 aeef236d34..6d853bc663 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, 2016 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -47,81 +47,21 @@ char * COM_nativeFunctionNames[] = { "IsEqualGUID", "LICINFO_1sizeof", "LresultFromObject", -#ifndef JNI64 - "MoveMemory__ILorg_eclipse_swt_internal_ole_win32_FORMATETC_2I", -#else "MoveMemory__JLorg_eclipse_swt_internal_ole_win32_FORMATETC_2I", -#endif -#ifndef JNI64 - "MoveMemory__ILorg_eclipse_swt_internal_ole_win32_GUID_2I", -#else "MoveMemory__JLorg_eclipse_swt_internal_ole_win32_GUID_2I", -#endif -#ifndef JNI64 - "MoveMemory__ILorg_eclipse_swt_internal_ole_win32_OLEINPLACEFRAMEINFO_2I", -#else "MoveMemory__JLorg_eclipse_swt_internal_ole_win32_OLEINPLACEFRAMEINFO_2I", -#endif -#ifndef JNI64 - "MoveMemory__ILorg_eclipse_swt_internal_ole_win32_STATSTG_2I", -#else "MoveMemory__JLorg_eclipse_swt_internal_ole_win32_STATSTG_2I", -#endif -#ifndef JNI64 - "MoveMemory__ILorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2I", -#else "MoveMemory__JLorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2I", -#endif -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2II", -#else "MoveMemory__Lorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JI", -#endif -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FORMATETC_2II", -#else "MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FORMATETC_2JI", -#endif -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FUNCDESC_2II", -#else "MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FUNCDESC_2JI", -#endif -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_ole_win32_GUID_2II", -#else "MoveMemory__Lorg_eclipse_swt_internal_ole_win32_GUID_2JI", -#endif -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STATSTG_2II", -#else "MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STATSTG_2JI", -#endif -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2II", -#else "MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2JI", -#endif -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_ole_win32_TYPEATTR_2II", -#else "MoveMemory__Lorg_eclipse_swt_internal_ole_win32_TYPEATTR_2JI", -#endif -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARDESC_2II", -#else "MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARDESC_2JI", -#endif -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARIANT_2II", -#else "MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARIANT_2JI", -#endif -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2II", -#else "MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2JI", -#endif "OLECMD_1sizeof", "OLEINPLACEFRAMEINFO_1sizeof", "OleCreate", @@ -161,402 +101,86 @@ char * COM_nativeFunctionNames[] = { "VariantChangeType", "VariantClear", "VariantInit", -#ifndef JNI64 - "VtblCall__IIIIII", -#else "VtblCall__IJIIII", -#endif -#ifndef JNI64 - "VtblCall__IIIIIII", -#else "VtblCall__IJIIIII", -#endif -#ifndef JNI64 - "VtblCall__IIIIIIII", -#else "VtblCall__IJIIIIIJ", -#endif -#ifndef JNI64 - "VtblCall__IIIIIIIIII", -#else - "VtblCall__IJJJJJIIII", -#endif -#ifndef JNI64 - "VtblCall__IIIIILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2ILorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2I", -#else + "VtblCall__IJIIIIJ", "VtblCall__IJIIILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2ILorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2I", -#endif -#ifndef JNI64 - "VtblCall__IIIIILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JLorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2J", -#else "VtblCall__IJIIILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JLorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2J", -#endif -#ifndef JNI64 - "VtblCall__IIIIJ", -#else "VtblCall__IJIIJ", -#endif -#ifndef JNI64 - "VtblCall__IIIILorg_eclipse_swt_internal_ole_win32_DVTARGETDEVICE_2Lorg_eclipse_swt_internal_win32_SIZE_2", -#else "VtblCall__IJIILorg_eclipse_swt_internal_ole_win32_DVTARGETDEVICE_2Lorg_eclipse_swt_internal_win32_SIZE_2", -#endif -#ifndef JNI64 - "VtblCall__IIIILorg_eclipse_swt_internal_ole_win32_GUID_2I_3I", -#else "VtblCall__IJIILorg_eclipse_swt_internal_ole_win32_GUID_2I_3I", -#endif -#ifndef JNI64 - "VtblCall__IIIILorg_eclipse_swt_internal_win32_POINT_2I", -#else "VtblCall__IJIILorg_eclipse_swt_internal_win32_POINT_2I", -#endif -#ifndef JNI64 - "VtblCall__IIIIZ", -#else "VtblCall__IJIIZ", -#endif -#ifndef JNI64 - "VtblCall__IIII_3I", -#else "VtblCall__IJII_3I", -#endif -#ifndef JNI64 - "VtblCall__IIII_3J", -#else "VtblCall__IJII_3J", -#endif -#ifndef JNI64 - "VtblCall__IIIJ_3I", -#else "VtblCall__IJIJ_3I", -#endif -#ifndef JNI64 - "VtblCall__IIILorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3I", -#else "VtblCall__IJILorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3I", -#endif -#ifndef JNI64 - "VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2", -#else "VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2", -#endif -#ifndef JNI64 - "VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2II", -#else "VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2II", -#endif -#ifndef JNI64 - "VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2ILorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I", -#else "VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2ILorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I", -#endif -#ifndef JNI64 - "VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JLorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I", -#else "VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JLorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I", -#endif -#ifndef JNI64 - "VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2JJ", -#else "VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2JJ", -#endif -#ifndef JNI64 - "VtblCall__IIILorg_eclipse_swt_internal_ole_win32_STATSTG_2_3I", -#else "VtblCall__IJILorg_eclipse_swt_internal_ole_win32_STATSTG_2_3I", -#endif -#ifndef JNI64 - "VtblCall__IIILorg_eclipse_swt_internal_win32_MSG_2IIILorg_eclipse_swt_internal_win32_RECT_2", -#else "VtblCall__IJILorg_eclipse_swt_internal_win32_MSG_2IIILorg_eclipse_swt_internal_win32_RECT_2", -#endif -#ifndef JNI64 - "VtblCall__IIILorg_eclipse_swt_internal_win32_MSG_2JIJLorg_eclipse_swt_internal_win32_RECT_2", -#else "VtblCall__IJILorg_eclipse_swt_internal_win32_MSG_2JIJLorg_eclipse_swt_internal_win32_RECT_2", -#endif -#ifndef JNI64 - "VtblCall__IIILorg_eclipse_swt_internal_win32_POINT_2I", -#else "VtblCall__IJILorg_eclipse_swt_internal_win32_POINT_2I", -#endif -#ifndef JNI64 - "VtblCall__IIILorg_eclipse_swt_internal_win32_SIZE_2", -#else "VtblCall__IJILorg_eclipse_swt_internal_win32_SIZE_2", -#endif -#ifndef JNI64 - "VtblCall__IIIZ", -#else "VtblCall__IJIZ", -#endif -#ifndef JNI64 - "VtblCall__III_3II_3I", -#else "VtblCall__IJI_3II_3I", -#endif -#ifndef JNI64 - "VtblCall__III_3I_3I_3I_3I", -#else "VtblCall__IJI_3I_3I_3I_3I", -#endif -#ifndef JNI64 - "VtblCall__III_3JI_3I", -#else "VtblCall__IJI_3JI_3I", -#endif -#ifndef JNI64 - "VtblCall__III_3J_3J_3I_3J", -#else "VtblCall__IJI_3J_3J_3I_3J", -#endif -#ifndef JNI64 - "VtblCall__IIJI_3I", -#else + "VtblCall__IJJIIIIJ", "VtblCall__IJJI_3I", -#endif -#ifndef JNI64 - "VtblCall__IIJI_3J", -#else "VtblCall__IJJI_3J", -#endif -#ifndef JNI64 - "VtblCall__IIJJLorg_eclipse_swt_internal_ole_win32_GUID_2J_3J", -#else + "VtblCall__IJJJJJIIII", "VtblCall__IJJJLorg_eclipse_swt_internal_ole_win32_GUID_2J_3J", -#endif -#ifndef JNI64 - "VtblCall__IIJJLorg_eclipse_swt_internal_win32_POINT_2I", -#else "VtblCall__IJJJLorg_eclipse_swt_internal_win32_POINT_2I", -#endif -#ifndef JNI64 - "VtblCall__IIJJZ", -#else "VtblCall__IJJJZ", -#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", -#endif -#ifndef JNI64 - "VtblCall__IIJLorg_eclipse_swt_internal_ole_win32_STATSTG_2_3J", -#else "VtblCall__IJJLorg_eclipse_swt_internal_ole_win32_STATSTG_2_3J", -#endif -#ifndef JNI64 - "VtblCall__IIJLorg_eclipse_swt_internal_win32_POINT_2J", -#else "VtblCall__IJJLorg_eclipse_swt_internal_win32_POINT_2J", -#endif -#ifndef JNI64 - "VtblCall__IIJZ", -#else "VtblCall__IJJZ", -#endif -#ifndef JNI64 - "VtblCall__IIJ_3J", -#else "VtblCall__IJJ_3J", -#endif -#ifndef JNI64 - "VtblCall__IILorg_eclipse_swt_internal_ole_win32_CAUUID_2", -#else "VtblCall__IJLorg_eclipse_swt_internal_ole_win32_CAUUID_2", -#endif -#ifndef JNI64 - "VtblCall__IILorg_eclipse_swt_internal_ole_win32_CONTROLINFO_2", -#else "VtblCall__IJLorg_eclipse_swt_internal_ole_win32_CONTROLINFO_2", -#endif -#ifndef JNI64 - "VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2", -#else "VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2", -#endif -#ifndef JNI64 - "VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2", -#else "VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2", -#endif -#ifndef JNI64 - "VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2Z", -#else "VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2Z", -#endif -#ifndef JNI64 - "VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2", -#else "VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2", -#endif -#ifndef JNI64 - "VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2IIII", -#else "VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2IIII", -#endif -#ifndef JNI64 - "VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2III_3I", -#else "VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2III_3I", -#endif -#ifndef JNI64 - "VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2IIJJ", -#else "VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2IIJJ", -#endif -#ifndef JNI64 - "VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2ILorg_eclipse_swt_internal_ole_win32_OLECMD_2Lorg_eclipse_swt_internal_ole_win32_OLECMDTEXT_2", -#else "VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2ILorg_eclipse_swt_internal_ole_win32_OLECMD_2Lorg_eclipse_swt_internal_ole_win32_OLECMDTEXT_2", -#endif -#ifndef JNI64 - "VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2JII_3I", -#else "VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2JII_3I", -#endif -#ifndef JNI64 - "VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3I", -#else "VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3I", -#endif -#ifndef JNI64 - "VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3J", -#else "VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3J", -#endif -#ifndef JNI64 - "VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2_3I", -#else "VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2_3I", -#endif -#ifndef JNI64 - "VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2_3J", -#else "VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2_3J", -#endif -#ifndef JNI64 - "VtblCall__IILorg_eclipse_swt_internal_ole_win32_LICINFO_2", -#else "VtblCall__IJLorg_eclipse_swt_internal_ole_win32_LICINFO_2", -#endif -#ifndef JNI64 - "VtblCall__IILorg_eclipse_swt_internal_win32_MSG_2", -#else "VtblCall__IJLorg_eclipse_swt_internal_win32_MSG_2", -#endif -#ifndef JNI64 - "VtblCall__IILorg_eclipse_swt_internal_win32_POINT_2I", -#else "VtblCall__IJLorg_eclipse_swt_internal_win32_POINT_2I", -#endif -#ifndef JNI64 - "VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2", -#else "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", -#endif -#ifndef JNI64 - "VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2Lorg_eclipse_swt_internal_win32_RECT_2", -#else "VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2Lorg_eclipse_swt_internal_win32_RECT_2", -#endif -#ifndef JNI64 - "VtblCall__IILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I", -#else "VtblCall__IJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I", -#endif -#ifndef JNI64 - "VtblCall__IILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2J", -#else "VtblCall__IJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2J", -#endif -#ifndef JNI64 - "VtblCall__IIZ", -#else "VtblCall__IJZ", -#endif -#ifndef JNI64 - "VtblCall__IIZI", -#else "VtblCall__IJZI", -#endif -#ifndef JNI64 - "VtblCall__IIZJ", -#else "VtblCall__IJZJ", -#endif -#ifndef JNI64 - "VtblCall__II_3CIIII_3I", -#else "VtblCall__IJ_3CIIII_3I", -#endif -#ifndef JNI64 - "VtblCall__II_3CIII_3I", -#else "VtblCall__IJ_3CIII_3I", -#endif -#ifndef JNI64 - "VtblCall__II_3CIII_3J", -#else "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", -#endif -#ifndef JNI64 - "VtblCall__II_3CJII_3J", -#else "VtblCall__IJ_3CJII_3J", -#endif -#ifndef JNI64 - "VtblCall__II_3C_3C", -#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", -#else - "VtblCall__IJJIIIIJ", -#endif "VtblCall_1IVARIANT", "VtblCall_1IVARIANTP", "VtblCall_1PPPPVARIANT", 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 d87ddca958..ae69d4c99b 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, 2016 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -57,81 +57,21 @@ typedef enum { IsEqualGUID_FUNC, LICINFO_1sizeof_FUNC, LresultFromObject_FUNC, -#ifndef JNI64 - MoveMemory__ILorg_eclipse_swt_internal_ole_win32_FORMATETC_2I_FUNC, -#else MoveMemory__JLorg_eclipse_swt_internal_ole_win32_FORMATETC_2I_FUNC, -#endif -#ifndef JNI64 - MoveMemory__ILorg_eclipse_swt_internal_ole_win32_GUID_2I_FUNC, -#else MoveMemory__JLorg_eclipse_swt_internal_ole_win32_GUID_2I_FUNC, -#endif -#ifndef JNI64 - MoveMemory__ILorg_eclipse_swt_internal_ole_win32_OLEINPLACEFRAMEINFO_2I_FUNC, -#else MoveMemory__JLorg_eclipse_swt_internal_ole_win32_OLEINPLACEFRAMEINFO_2I_FUNC, -#endif -#ifndef JNI64 - MoveMemory__ILorg_eclipse_swt_internal_ole_win32_STATSTG_2I_FUNC, -#else MoveMemory__JLorg_eclipse_swt_internal_ole_win32_STATSTG_2I_FUNC, -#endif -#ifndef JNI64 - MoveMemory__ILorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2I_FUNC, -#else MoveMemory__JLorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2I_FUNC, -#endif -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FORMATETC_2II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FORMATETC_2JI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FUNCDESC_2II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FUNCDESC_2JI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_ole_win32_GUID_2II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_ole_win32_GUID_2JI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STATSTG_2II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STATSTG_2JI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2JI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_ole_win32_TYPEATTR_2II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_ole_win32_TYPEATTR_2JI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARDESC_2II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARDESC_2JI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARIANT_2II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARIANT_2JI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2JI_FUNC, -#endif OLECMD_1sizeof_FUNC, OLEINPLACEFRAMEINFO_1sizeof_FUNC, OleCreate_FUNC, @@ -171,402 +111,86 @@ typedef enum { VariantChangeType_FUNC, VariantClear_FUNC, VariantInit_FUNC, -#ifndef JNI64 - VtblCall__IIIIII_FUNC, -#else VtblCall__IJIIII_FUNC, -#endif -#ifndef JNI64 - VtblCall__IIIIIII_FUNC, -#else VtblCall__IJIIIII_FUNC, -#endif -#ifndef JNI64 - VtblCall__IIIIIIII_FUNC, -#else VtblCall__IJIIIIIJ_FUNC, -#endif -#ifndef JNI64 - VtblCall__IIIIIIIIII_FUNC, -#else - VtblCall__IJJJJJIIII_FUNC, -#endif -#ifndef JNI64 - VtblCall__IIIIILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2ILorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2I_FUNC, -#else + VtblCall__IJIIIIJ_FUNC, VtblCall__IJIIILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2ILorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2I_FUNC, -#endif -#ifndef JNI64 - VtblCall__IIIIILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JLorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2J_FUNC, -#else VtblCall__IJIIILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JLorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2J_FUNC, -#endif -#ifndef JNI64 - VtblCall__IIIIJ_FUNC, -#else VtblCall__IJIIJ_FUNC, -#endif -#ifndef JNI64 - VtblCall__IIIILorg_eclipse_swt_internal_ole_win32_DVTARGETDEVICE_2Lorg_eclipse_swt_internal_win32_SIZE_2_FUNC, -#else VtblCall__IJIILorg_eclipse_swt_internal_ole_win32_DVTARGETDEVICE_2Lorg_eclipse_swt_internal_win32_SIZE_2_FUNC, -#endif -#ifndef JNI64 - VtblCall__IIIILorg_eclipse_swt_internal_ole_win32_GUID_2I_3I_FUNC, -#else VtblCall__IJIILorg_eclipse_swt_internal_ole_win32_GUID_2I_3I_FUNC, -#endif -#ifndef JNI64 - VtblCall__IIIILorg_eclipse_swt_internal_win32_POINT_2I_FUNC, -#else VtblCall__IJIILorg_eclipse_swt_internal_win32_POINT_2I_FUNC, -#endif -#ifndef JNI64 - VtblCall__IIIIZ_FUNC, -#else VtblCall__IJIIZ_FUNC, -#endif -#ifndef JNI64 - VtblCall__IIII_3I_FUNC, -#else VtblCall__IJII_3I_FUNC, -#endif -#ifndef JNI64 - VtblCall__IIII_3J_FUNC, -#else VtblCall__IJII_3J_FUNC, -#endif -#ifndef JNI64 - VtblCall__IIIJ_3I_FUNC, -#else VtblCall__IJIJ_3I_FUNC, -#endif -#ifndef JNI64 - VtblCall__IIILorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3I_FUNC, -#else VtblCall__IJILorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3I_FUNC, -#endif -#ifndef JNI64 - VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2_FUNC, -#else VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2_FUNC, -#endif -#ifndef JNI64 - VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2II_FUNC, -#else VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2II_FUNC, -#endif -#ifndef JNI64 - VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2ILorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I_FUNC, -#else VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2ILorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I_FUNC, -#endif -#ifndef JNI64 - VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JLorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I_FUNC, -#else VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JLorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I_FUNC, -#endif -#ifndef JNI64 - VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2JJ_FUNC, -#else VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2JJ_FUNC, -#endif -#ifndef JNI64 - VtblCall__IIILorg_eclipse_swt_internal_ole_win32_STATSTG_2_3I_FUNC, -#else VtblCall__IJILorg_eclipse_swt_internal_ole_win32_STATSTG_2_3I_FUNC, -#endif -#ifndef JNI64 - VtblCall__IIILorg_eclipse_swt_internal_win32_MSG_2IIILorg_eclipse_swt_internal_win32_RECT_2_FUNC, -#else VtblCall__IJILorg_eclipse_swt_internal_win32_MSG_2IIILorg_eclipse_swt_internal_win32_RECT_2_FUNC, -#endif -#ifndef JNI64 - VtblCall__IIILorg_eclipse_swt_internal_win32_MSG_2JIJLorg_eclipse_swt_internal_win32_RECT_2_FUNC, -#else VtblCall__IJILorg_eclipse_swt_internal_win32_MSG_2JIJLorg_eclipse_swt_internal_win32_RECT_2_FUNC, -#endif -#ifndef JNI64 - VtblCall__IIILorg_eclipse_swt_internal_win32_POINT_2I_FUNC, -#else VtblCall__IJILorg_eclipse_swt_internal_win32_POINT_2I_FUNC, -#endif -#ifndef JNI64 - VtblCall__IIILorg_eclipse_swt_internal_win32_SIZE_2_FUNC, -#else VtblCall__IJILorg_eclipse_swt_internal_win32_SIZE_2_FUNC, -#endif -#ifndef JNI64 - VtblCall__IIIZ_FUNC, -#else VtblCall__IJIZ_FUNC, -#endif -#ifndef JNI64 - VtblCall__III_3II_3I_FUNC, -#else VtblCall__IJI_3II_3I_FUNC, -#endif -#ifndef JNI64 - VtblCall__III_3I_3I_3I_3I_FUNC, -#else VtblCall__IJI_3I_3I_3I_3I_FUNC, -#endif -#ifndef JNI64 - VtblCall__III_3JI_3I_FUNC, -#else VtblCall__IJI_3JI_3I_FUNC, -#endif -#ifndef JNI64 - VtblCall__III_3J_3J_3I_3J_FUNC, -#else VtblCall__IJI_3J_3J_3I_3J_FUNC, -#endif -#ifndef JNI64 - VtblCall__IIJI_3I_FUNC, -#else + VtblCall__IJJIIIIJ_FUNC, VtblCall__IJJI_3I_FUNC, -#endif -#ifndef JNI64 - VtblCall__IIJI_3J_FUNC, -#else VtblCall__IJJI_3J_FUNC, -#endif -#ifndef JNI64 - VtblCall__IIJJLorg_eclipse_swt_internal_ole_win32_GUID_2J_3J_FUNC, -#else + VtblCall__IJJJJJIIII_FUNC, VtblCall__IJJJLorg_eclipse_swt_internal_ole_win32_GUID_2J_3J_FUNC, -#endif -#ifndef JNI64 - VtblCall__IIJJLorg_eclipse_swt_internal_win32_POINT_2I_FUNC, -#else VtblCall__IJJJLorg_eclipse_swt_internal_win32_POINT_2I_FUNC, -#endif -#ifndef JNI64 - VtblCall__IIJJZ_FUNC, -#else VtblCall__IJJJZ_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, -#endif -#ifndef JNI64 - VtblCall__IIJLorg_eclipse_swt_internal_ole_win32_STATSTG_2_3J_FUNC, -#else VtblCall__IJJLorg_eclipse_swt_internal_ole_win32_STATSTG_2_3J_FUNC, -#endif -#ifndef JNI64 - VtblCall__IIJLorg_eclipse_swt_internal_win32_POINT_2J_FUNC, -#else VtblCall__IJJLorg_eclipse_swt_internal_win32_POINT_2J_FUNC, -#endif -#ifndef JNI64 - VtblCall__IIJZ_FUNC, -#else VtblCall__IJJZ_FUNC, -#endif -#ifndef JNI64 - VtblCall__IIJ_3J_FUNC, -#else VtblCall__IJJ_3J_FUNC, -#endif -#ifndef JNI64 - VtblCall__IILorg_eclipse_swt_internal_ole_win32_CAUUID_2_FUNC, -#else VtblCall__IJLorg_eclipse_swt_internal_ole_win32_CAUUID_2_FUNC, -#endif -#ifndef JNI64 - VtblCall__IILorg_eclipse_swt_internal_ole_win32_CONTROLINFO_2_FUNC, -#else VtblCall__IJLorg_eclipse_swt_internal_ole_win32_CONTROLINFO_2_FUNC, -#endif -#ifndef JNI64 - VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2_FUNC, -#else VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2_FUNC, -#endif -#ifndef JNI64 - VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2_FUNC, -#else VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2_FUNC, -#endif -#ifndef JNI64 - VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2Z_FUNC, -#else VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2Z_FUNC, -#endif -#ifndef JNI64 - VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2_FUNC, -#else VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2_FUNC, -#endif -#ifndef JNI64 - VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2IIII_FUNC, -#else VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2IIII_FUNC, -#endif -#ifndef JNI64 - VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2III_3I_FUNC, -#else VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2III_3I_FUNC, -#endif -#ifndef JNI64 - VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2IIJJ_FUNC, -#else VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2IIJJ_FUNC, -#endif -#ifndef JNI64 - VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2ILorg_eclipse_swt_internal_ole_win32_OLECMD_2Lorg_eclipse_swt_internal_ole_win32_OLECMDTEXT_2_FUNC, -#else VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2ILorg_eclipse_swt_internal_ole_win32_OLECMD_2Lorg_eclipse_swt_internal_ole_win32_OLECMDTEXT_2_FUNC, -#endif -#ifndef JNI64 - VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2JII_3I_FUNC, -#else VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2JII_3I_FUNC, -#endif -#ifndef JNI64 - VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3I_FUNC, -#else VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3I_FUNC, -#endif -#ifndef JNI64 - VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3J_FUNC, -#else VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3J_FUNC, -#endif -#ifndef JNI64 - VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2_3I_FUNC, -#else VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2_3I_FUNC, -#endif -#ifndef JNI64 - VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2_3J_FUNC, -#else VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2_3J_FUNC, -#endif -#ifndef JNI64 - VtblCall__IILorg_eclipse_swt_internal_ole_win32_LICINFO_2_FUNC, -#else VtblCall__IJLorg_eclipse_swt_internal_ole_win32_LICINFO_2_FUNC, -#endif -#ifndef JNI64 - VtblCall__IILorg_eclipse_swt_internal_win32_MSG_2_FUNC, -#else VtblCall__IJLorg_eclipse_swt_internal_win32_MSG_2_FUNC, -#endif -#ifndef JNI64 - VtblCall__IILorg_eclipse_swt_internal_win32_POINT_2I_FUNC, -#else VtblCall__IJLorg_eclipse_swt_internal_win32_POINT_2I_FUNC, -#endif -#ifndef JNI64 - VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2_FUNC, -#else 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, -#endif -#ifndef JNI64 - VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2Lorg_eclipse_swt_internal_win32_RECT_2_FUNC, -#else VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2Lorg_eclipse_swt_internal_win32_RECT_2_FUNC, -#endif -#ifndef JNI64 - VtblCall__IILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I_FUNC, -#else VtblCall__IJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I_FUNC, -#endif -#ifndef JNI64 - VtblCall__IILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2J_FUNC, -#else VtblCall__IJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2J_FUNC, -#endif -#ifndef JNI64 - VtblCall__IIZ_FUNC, -#else VtblCall__IJZ_FUNC, -#endif -#ifndef JNI64 - VtblCall__IIZI_FUNC, -#else VtblCall__IJZI_FUNC, -#endif -#ifndef JNI64 - VtblCall__IIZJ_FUNC, -#else VtblCall__IJZJ_FUNC, -#endif -#ifndef JNI64 - VtblCall__II_3CIIII_3I_FUNC, -#else VtblCall__IJ_3CIIII_3I_FUNC, -#endif -#ifndef JNI64 - VtblCall__II_3CIII_3I_FUNC, -#else VtblCall__IJ_3CIII_3I_FUNC, -#endif -#ifndef JNI64 - VtblCall__II_3CIII_3J_FUNC, -#else 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, -#endif -#ifndef JNI64 - VtblCall__II_3CJII_3J_FUNC, -#else VtblCall__IJ_3CJII_3J_FUNC, -#endif -#ifndef JNI64 - VtblCall__II_3C_3C_FUNC, -#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, -#else - VtblCall__IJJIIIIJ_FUNC, -#endif VtblCall_1IVARIANT_FUNC, VtblCall_1IVARIANTP_FUNC, VtblCall_1PPPPVARIANT_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 434a123b0a..bd6772d77c 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, 2016 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -32,7 +32,7 @@ void cacheCAUUIDFields(JNIEnv *env, jobject lpObject) if (CAUUIDFc.cached) return; CAUUIDFc.clazz = (*env)->GetObjectClass(env, lpObject); CAUUIDFc.cElems = (*env)->GetFieldID(env, CAUUIDFc.clazz, "cElems", "I"); - CAUUIDFc.pElems = (*env)->GetFieldID(env, CAUUIDFc.clazz, "pElems", I_J); + CAUUIDFc.pElems = (*env)->GetFieldID(env, CAUUIDFc.clazz, "pElems", "J"); CAUUIDFc.cached = 1; } @@ -40,7 +40,7 @@ CAUUID *getCAUUIDFields(JNIEnv *env, jobject lpObject, CAUUID *lpStruct) { if (!CAUUIDFc.cached) cacheCAUUIDFields(env, lpObject); lpStruct->cElems = (*env)->GetIntField(env, lpObject, CAUUIDFc.cElems); - lpStruct->pElems = (GUID FAR *)(*env)->GetIntLongField(env, lpObject, CAUUIDFc.pElems); + lpStruct->pElems = (GUID FAR *)(*env)->GetLongField(env, lpObject, CAUUIDFc.pElems); return lpStruct; } @@ -48,7 +48,7 @@ void setCAUUIDFields(JNIEnv *env, jobject lpObject, CAUUID *lpStruct) { if (!CAUUIDFc.cached) cacheCAUUIDFields(env, lpObject); (*env)->SetIntField(env, lpObject, CAUUIDFc.cElems, (jint)lpStruct->cElems); - (*env)->SetIntLongField(env, lpObject, CAUUIDFc.pElems, (jintLong)lpStruct->pElems); + (*env)->SetLongField(env, lpObject, CAUUIDFc.pElems, (jlong)lpStruct->pElems); } #endif @@ -66,7 +66,7 @@ void cacheCONTROLINFOFields(JNIEnv *env, jobject lpObject) if (CONTROLINFOFc.cached) return; CONTROLINFOFc.clazz = (*env)->GetObjectClass(env, lpObject); CONTROLINFOFc.cb = (*env)->GetFieldID(env, CONTROLINFOFc.clazz, "cb", "I"); - CONTROLINFOFc.hAccel = (*env)->GetFieldID(env, CONTROLINFOFc.clazz, "hAccel", I_J); + CONTROLINFOFc.hAccel = (*env)->GetFieldID(env, CONTROLINFOFc.clazz, "hAccel", "J"); CONTROLINFOFc.cAccel = (*env)->GetFieldID(env, CONTROLINFOFc.clazz, "cAccel", "S"); CONTROLINFOFc.dwFlags = (*env)->GetFieldID(env, CONTROLINFOFc.clazz, "dwFlags", "I"); CONTROLINFOFc.cached = 1; @@ -76,7 +76,7 @@ CONTROLINFO *getCONTROLINFOFields(JNIEnv *env, jobject lpObject, CONTROLINFO *lp { if (!CONTROLINFOFc.cached) cacheCONTROLINFOFields(env, lpObject); lpStruct->cb = (*env)->GetIntField(env, lpObject, CONTROLINFOFc.cb); - lpStruct->hAccel = (HACCEL)(*env)->GetIntLongField(env, lpObject, CONTROLINFOFc.hAccel); + lpStruct->hAccel = (HACCEL)(*env)->GetLongField(env, lpObject, CONTROLINFOFc.hAccel); lpStruct->cAccel = (*env)->GetShortField(env, lpObject, CONTROLINFOFc.cAccel); lpStruct->dwFlags = (*env)->GetIntField(env, lpObject, CONTROLINFOFc.dwFlags); return lpStruct; @@ -86,7 +86,7 @@ void setCONTROLINFOFields(JNIEnv *env, jobject lpObject, CONTROLINFO *lpStruct) { if (!CONTROLINFOFc.cached) cacheCONTROLINFOFields(env, lpObject); (*env)->SetIntField(env, lpObject, CONTROLINFOFc.cb, (jint)lpStruct->cb); - (*env)->SetIntLongField(env, lpObject, CONTROLINFOFc.hAccel, (jintLong)lpStruct->hAccel); + (*env)->SetLongField(env, lpObject, CONTROLINFOFc.hAccel, (jlong)lpStruct->hAccel); (*env)->SetShortField(env, lpObject, CONTROLINFOFc.cAccel, (jshort)lpStruct->cAccel); (*env)->SetIntField(env, lpObject, CONTROLINFOFc.dwFlags, (jint)lpStruct->dwFlags); } @@ -106,8 +106,8 @@ void cacheCOSERVERINFOFields(JNIEnv *env, jobject lpObject) if (COSERVERINFOFc.cached) return; COSERVERINFOFc.clazz = (*env)->GetObjectClass(env, lpObject); COSERVERINFOFc.dwReserved1 = (*env)->GetFieldID(env, COSERVERINFOFc.clazz, "dwReserved1", "I"); - COSERVERINFOFc.pwszName = (*env)->GetFieldID(env, COSERVERINFOFc.clazz, "pwszName", I_J); - COSERVERINFOFc.pAuthInfo = (*env)->GetFieldID(env, COSERVERINFOFc.clazz, "pAuthInfo", I_J); + COSERVERINFOFc.pwszName = (*env)->GetFieldID(env, COSERVERINFOFc.clazz, "pwszName", "J"); + COSERVERINFOFc.pAuthInfo = (*env)->GetFieldID(env, COSERVERINFOFc.clazz, "pAuthInfo", "J"); COSERVERINFOFc.dwReserved2 = (*env)->GetFieldID(env, COSERVERINFOFc.clazz, "dwReserved2", "I"); COSERVERINFOFc.cached = 1; } @@ -116,8 +116,8 @@ COSERVERINFO *getCOSERVERINFOFields(JNIEnv *env, jobject lpObject, COSERVERINFO { if (!COSERVERINFOFc.cached) cacheCOSERVERINFOFields(env, lpObject); lpStruct->dwReserved1 = (*env)->GetIntField(env, lpObject, COSERVERINFOFc.dwReserved1); - lpStruct->pwszName = (LPWSTR)(*env)->GetIntLongField(env, lpObject, COSERVERINFOFc.pwszName); - lpStruct->pAuthInfo = (COAUTHINFO *)(*env)->GetIntLongField(env, lpObject, COSERVERINFOFc.pAuthInfo); + lpStruct->pwszName = (LPWSTR)(*env)->GetLongField(env, lpObject, COSERVERINFOFc.pwszName); + lpStruct->pAuthInfo = (COAUTHINFO *)(*env)->GetLongField(env, lpObject, COSERVERINFOFc.pAuthInfo); lpStruct->dwReserved2 = (*env)->GetIntField(env, lpObject, COSERVERINFOFc.dwReserved2); return lpStruct; } @@ -126,8 +126,8 @@ void setCOSERVERINFOFields(JNIEnv *env, jobject lpObject, COSERVERINFO *lpStruct { if (!COSERVERINFOFc.cached) cacheCOSERVERINFOFields(env, lpObject); (*env)->SetIntField(env, lpObject, COSERVERINFOFc.dwReserved1, (jint)lpStruct->dwReserved1); - (*env)->SetIntLongField(env, lpObject, COSERVERINFOFc.pwszName, (jintLong)lpStruct->pwszName); - (*env)->SetIntLongField(env, lpObject, COSERVERINFOFc.pAuthInfo, (jintLong)lpStruct->pAuthInfo); + (*env)->SetLongField(env, lpObject, COSERVERINFOFc.pwszName, (jlong)lpStruct->pwszName); + (*env)->SetLongField(env, lpObject, COSERVERINFOFc.pAuthInfo, (jlong)lpStruct->pAuthInfo); (*env)->SetIntField(env, lpObject, COSERVERINFOFc.dwReserved2, (jint)lpStruct->dwReserved2); } #endif @@ -145,8 +145,8 @@ void cacheDISPPARAMSFields(JNIEnv *env, jobject lpObject) { if (DISPPARAMSFc.cached) return; DISPPARAMSFc.clazz = (*env)->GetObjectClass(env, lpObject); - DISPPARAMSFc.rgvarg = (*env)->GetFieldID(env, DISPPARAMSFc.clazz, "rgvarg", I_J); - DISPPARAMSFc.rgdispidNamedArgs = (*env)->GetFieldID(env, DISPPARAMSFc.clazz, "rgdispidNamedArgs", I_J); + DISPPARAMSFc.rgvarg = (*env)->GetFieldID(env, DISPPARAMSFc.clazz, "rgvarg", "J"); + DISPPARAMSFc.rgdispidNamedArgs = (*env)->GetFieldID(env, DISPPARAMSFc.clazz, "rgdispidNamedArgs", "J"); DISPPARAMSFc.cArgs = (*env)->GetFieldID(env, DISPPARAMSFc.clazz, "cArgs", "I"); DISPPARAMSFc.cNamedArgs = (*env)->GetFieldID(env, DISPPARAMSFc.clazz, "cNamedArgs", "I"); DISPPARAMSFc.cached = 1; @@ -155,8 +155,8 @@ void cacheDISPPARAMSFields(JNIEnv *env, jobject lpObject) DISPPARAMS *getDISPPARAMSFields(JNIEnv *env, jobject lpObject, DISPPARAMS *lpStruct) { if (!DISPPARAMSFc.cached) cacheDISPPARAMSFields(env, lpObject); - lpStruct->rgvarg = (VARIANTARG FAR *)(*env)->GetIntLongField(env, lpObject, DISPPARAMSFc.rgvarg); - lpStruct->rgdispidNamedArgs = (DISPID FAR *)(*env)->GetIntLongField(env, lpObject, DISPPARAMSFc.rgdispidNamedArgs); + lpStruct->rgvarg = (VARIANTARG FAR *)(*env)->GetLongField(env, lpObject, DISPPARAMSFc.rgvarg); + lpStruct->rgdispidNamedArgs = (DISPID FAR *)(*env)->GetLongField(env, lpObject, DISPPARAMSFc.rgdispidNamedArgs); lpStruct->cArgs = (*env)->GetIntField(env, lpObject, DISPPARAMSFc.cArgs); lpStruct->cNamedArgs = (*env)->GetIntField(env, lpObject, DISPPARAMSFc.cNamedArgs); return lpStruct; @@ -165,8 +165,8 @@ DISPPARAMS *getDISPPARAMSFields(JNIEnv *env, jobject lpObject, DISPPARAMS *lpStr void setDISPPARAMSFields(JNIEnv *env, jobject lpObject, DISPPARAMS *lpStruct) { if (!DISPPARAMSFc.cached) cacheDISPPARAMSFields(env, lpObject); - (*env)->SetIntLongField(env, lpObject, DISPPARAMSFc.rgvarg, (jintLong)lpStruct->rgvarg); - (*env)->SetIntLongField(env, lpObject, DISPPARAMSFc.rgdispidNamedArgs, (jintLong)lpStruct->rgdispidNamedArgs); + (*env)->SetLongField(env, lpObject, DISPPARAMSFc.rgvarg, (jlong)lpStruct->rgvarg); + (*env)->SetLongField(env, lpObject, DISPPARAMSFc.rgdispidNamedArgs, (jlong)lpStruct->rgdispidNamedArgs); (*env)->SetIntField(env, lpObject, DISPPARAMSFc.cArgs, (jint)lpStruct->cArgs); (*env)->SetIntField(env, lpObject, DISPPARAMSFc.cNamedArgs, (jint)lpStruct->cNamedArgs); } @@ -239,12 +239,12 @@ void cacheEXCEPINFOFields(JNIEnv *env, jobject lpObject) EXCEPINFOFc.clazz = (*env)->GetObjectClass(env, lpObject); EXCEPINFOFc.wCode = (*env)->GetFieldID(env, EXCEPINFOFc.clazz, "wCode", "S"); EXCEPINFOFc.wReserved = (*env)->GetFieldID(env, EXCEPINFOFc.clazz, "wReserved", "S"); - EXCEPINFOFc.bstrSource = (*env)->GetFieldID(env, EXCEPINFOFc.clazz, "bstrSource", I_J); - EXCEPINFOFc.bstrDescription = (*env)->GetFieldID(env, EXCEPINFOFc.clazz, "bstrDescription", I_J); - EXCEPINFOFc.bstrHelpFile = (*env)->GetFieldID(env, EXCEPINFOFc.clazz, "bstrHelpFile", I_J); + EXCEPINFOFc.bstrSource = (*env)->GetFieldID(env, EXCEPINFOFc.clazz, "bstrSource", "J"); + EXCEPINFOFc.bstrDescription = (*env)->GetFieldID(env, EXCEPINFOFc.clazz, "bstrDescription", "J"); + EXCEPINFOFc.bstrHelpFile = (*env)->GetFieldID(env, EXCEPINFOFc.clazz, "bstrHelpFile", "J"); EXCEPINFOFc.dwHelpContext = (*env)->GetFieldID(env, EXCEPINFOFc.clazz, "dwHelpContext", "I"); - EXCEPINFOFc.pvReserved = (*env)->GetFieldID(env, EXCEPINFOFc.clazz, "pvReserved", I_J); - EXCEPINFOFc.pfnDeferredFillIn = (*env)->GetFieldID(env, EXCEPINFOFc.clazz, "pfnDeferredFillIn", I_J); + EXCEPINFOFc.pvReserved = (*env)->GetFieldID(env, EXCEPINFOFc.clazz, "pvReserved", "J"); + EXCEPINFOFc.pfnDeferredFillIn = (*env)->GetFieldID(env, EXCEPINFOFc.clazz, "pfnDeferredFillIn", "J"); EXCEPINFOFc.scode = (*env)->GetFieldID(env, EXCEPINFOFc.clazz, "scode", "I"); EXCEPINFOFc.cached = 1; } @@ -254,12 +254,12 @@ EXCEPINFO *getEXCEPINFOFields(JNIEnv *env, jobject lpObject, EXCEPINFO *lpStruct if (!EXCEPINFOFc.cached) cacheEXCEPINFOFields(env, lpObject); lpStruct->wCode = (*env)->GetShortField(env, lpObject, EXCEPINFOFc.wCode); lpStruct->wReserved = (*env)->GetShortField(env, lpObject, EXCEPINFOFc.wReserved); - lpStruct->bstrSource = (BSTR)(*env)->GetIntLongField(env, lpObject, EXCEPINFOFc.bstrSource); - lpStruct->bstrDescription = (BSTR)(*env)->GetIntLongField(env, lpObject, EXCEPINFOFc.bstrDescription); - lpStruct->bstrHelpFile = (BSTR)(*env)->GetIntLongField(env, lpObject, EXCEPINFOFc.bstrHelpFile); + lpStruct->bstrSource = (BSTR)(*env)->GetLongField(env, lpObject, EXCEPINFOFc.bstrSource); + lpStruct->bstrDescription = (BSTR)(*env)->GetLongField(env, lpObject, EXCEPINFOFc.bstrDescription); + lpStruct->bstrHelpFile = (BSTR)(*env)->GetLongField(env, lpObject, EXCEPINFOFc.bstrHelpFile); lpStruct->dwHelpContext = (*env)->GetIntField(env, lpObject, EXCEPINFOFc.dwHelpContext); - lpStruct->pvReserved = (void FAR *)(*env)->GetIntLongField(env, lpObject, EXCEPINFOFc.pvReserved); - lpStruct->pfnDeferredFillIn = (HRESULT (STDAPICALLTYPE FAR* )(struct tagEXCEPINFO FAR*))(*env)->GetIntLongField(env, lpObject, EXCEPINFOFc.pfnDeferredFillIn); + lpStruct->pvReserved = (void FAR *)(*env)->GetLongField(env, lpObject, EXCEPINFOFc.pvReserved); + lpStruct->pfnDeferredFillIn = (HRESULT (STDAPICALLTYPE FAR* )(struct tagEXCEPINFO FAR*))(*env)->GetLongField(env, lpObject, EXCEPINFOFc.pfnDeferredFillIn); lpStruct->scode = (*env)->GetIntField(env, lpObject, EXCEPINFOFc.scode); return lpStruct; } @@ -269,12 +269,12 @@ void setEXCEPINFOFields(JNIEnv *env, jobject lpObject, EXCEPINFO *lpStruct) if (!EXCEPINFOFc.cached) cacheEXCEPINFOFields(env, lpObject); (*env)->SetShortField(env, lpObject, EXCEPINFOFc.wCode, (jshort)lpStruct->wCode); (*env)->SetShortField(env, lpObject, EXCEPINFOFc.wReserved, (jshort)lpStruct->wReserved); - (*env)->SetIntLongField(env, lpObject, EXCEPINFOFc.bstrSource, (jintLong)lpStruct->bstrSource); - (*env)->SetIntLongField(env, lpObject, EXCEPINFOFc.bstrDescription, (jintLong)lpStruct->bstrDescription); - (*env)->SetIntLongField(env, lpObject, EXCEPINFOFc.bstrHelpFile, (jintLong)lpStruct->bstrHelpFile); + (*env)->SetLongField(env, lpObject, EXCEPINFOFc.bstrSource, (jlong)lpStruct->bstrSource); + (*env)->SetLongField(env, lpObject, EXCEPINFOFc.bstrDescription, (jlong)lpStruct->bstrDescription); + (*env)->SetLongField(env, lpObject, EXCEPINFOFc.bstrHelpFile, (jlong)lpStruct->bstrHelpFile); (*env)->SetIntField(env, lpObject, EXCEPINFOFc.dwHelpContext, (jint)lpStruct->dwHelpContext); - (*env)->SetIntLongField(env, lpObject, EXCEPINFOFc.pvReserved, (jintLong)lpStruct->pvReserved); - (*env)->SetIntLongField(env, lpObject, EXCEPINFOFc.pfnDeferredFillIn, (jintLong)lpStruct->pfnDeferredFillIn); + (*env)->SetLongField(env, lpObject, EXCEPINFOFc.pvReserved, (jlong)lpStruct->pvReserved); + (*env)->SetLongField(env, lpObject, EXCEPINFOFc.pfnDeferredFillIn, (jlong)lpStruct->pfnDeferredFillIn); (*env)->SetIntField(env, lpObject, EXCEPINFOFc.scode, (jint)lpStruct->scode); } #endif @@ -293,7 +293,7 @@ void cacheFORMATETCFields(JNIEnv *env, jobject lpObject) if (FORMATETCFc.cached) return; FORMATETCFc.clazz = (*env)->GetObjectClass(env, lpObject); FORMATETCFc.cfFormat = (*env)->GetFieldID(env, FORMATETCFc.clazz, "cfFormat", "I"); - FORMATETCFc.ptd = (*env)->GetFieldID(env, FORMATETCFc.clazz, "ptd", I_J); + FORMATETCFc.ptd = (*env)->GetFieldID(env, FORMATETCFc.clazz, "ptd", "J"); FORMATETCFc.dwAspect = (*env)->GetFieldID(env, FORMATETCFc.clazz, "dwAspect", "I"); FORMATETCFc.lindex = (*env)->GetFieldID(env, FORMATETCFc.clazz, "lindex", "I"); FORMATETCFc.tymed = (*env)->GetFieldID(env, FORMATETCFc.clazz, "tymed", "I"); @@ -304,7 +304,7 @@ FORMATETC *getFORMATETCFields(JNIEnv *env, jobject lpObject, FORMATETC *lpStruct { if (!FORMATETCFc.cached) cacheFORMATETCFields(env, lpObject); lpStruct->cfFormat = (CLIPFORMAT)(*env)->GetIntField(env, lpObject, FORMATETCFc.cfFormat); - lpStruct->ptd = (DVTARGETDEVICE *)(*env)->GetIntLongField(env, lpObject, FORMATETCFc.ptd); + lpStruct->ptd = (DVTARGETDEVICE *)(*env)->GetLongField(env, lpObject, FORMATETCFc.ptd); lpStruct->dwAspect = (*env)->GetIntField(env, lpObject, FORMATETCFc.dwAspect); lpStruct->lindex = (*env)->GetIntField(env, lpObject, FORMATETCFc.lindex); lpStruct->tymed = (*env)->GetIntField(env, lpObject, FORMATETCFc.tymed); @@ -315,7 +315,7 @@ void setFORMATETCFields(JNIEnv *env, jobject lpObject, FORMATETC *lpStruct) { if (!FORMATETCFc.cached) cacheFORMATETCFields(env, lpObject); (*env)->SetIntField(env, lpObject, FORMATETCFc.cfFormat, (jint)lpStruct->cfFormat); - (*env)->SetIntLongField(env, lpObject, FORMATETCFc.ptd, (jintLong)lpStruct->ptd); + (*env)->SetLongField(env, lpObject, FORMATETCFc.ptd, (jlong)lpStruct->ptd); (*env)->SetIntField(env, lpObject, FORMATETCFc.dwAspect, (jint)lpStruct->dwAspect); (*env)->SetIntField(env, lpObject, FORMATETCFc.lindex, (jint)lpStruct->lindex); (*env)->SetIntField(env, lpObject, FORMATETCFc.tymed, (jint)lpStruct->tymed); @@ -336,8 +336,8 @@ void cacheFUNCDESCFields(JNIEnv *env, jobject lpObject) if (FUNCDESCFc.cached) return; FUNCDESCFc.clazz = (*env)->GetObjectClass(env, lpObject); FUNCDESCFc.memid = (*env)->GetFieldID(env, FUNCDESCFc.clazz, "memid", "I"); - FUNCDESCFc.lprgscode = (*env)->GetFieldID(env, FUNCDESCFc.clazz, "lprgscode", I_J); - FUNCDESCFc.lprgelemdescParam = (*env)->GetFieldID(env, FUNCDESCFc.clazz, "lprgelemdescParam", I_J); + FUNCDESCFc.lprgscode = (*env)->GetFieldID(env, FUNCDESCFc.clazz, "lprgscode", "J"); + FUNCDESCFc.lprgelemdescParam = (*env)->GetFieldID(env, FUNCDESCFc.clazz, "lprgelemdescParam", "J"); FUNCDESCFc.funckind = (*env)->GetFieldID(env, FUNCDESCFc.clazz, "funckind", "I"); FUNCDESCFc.invkind = (*env)->GetFieldID(env, FUNCDESCFc.clazz, "invkind", "I"); FUNCDESCFc.callconv = (*env)->GetFieldID(env, FUNCDESCFc.clazz, "callconv", "I"); @@ -345,9 +345,9 @@ void cacheFUNCDESCFields(JNIEnv *env, jobject lpObject) FUNCDESCFc.cParamsOpt = (*env)->GetFieldID(env, FUNCDESCFc.clazz, "cParamsOpt", "S"); FUNCDESCFc.oVft = (*env)->GetFieldID(env, FUNCDESCFc.clazz, "oVft", "S"); FUNCDESCFc.cScodes = (*env)->GetFieldID(env, FUNCDESCFc.clazz, "cScodes", "S"); - FUNCDESCFc.elemdescFunc_tdesc_union = (*env)->GetFieldID(env, FUNCDESCFc.clazz, "elemdescFunc_tdesc_union", I_J); + FUNCDESCFc.elemdescFunc_tdesc_union = (*env)->GetFieldID(env, FUNCDESCFc.clazz, "elemdescFunc_tdesc_union", "J"); FUNCDESCFc.elemdescFunc_tdesc_vt = (*env)->GetFieldID(env, FUNCDESCFc.clazz, "elemdescFunc_tdesc_vt", "S"); - FUNCDESCFc.elemdescFunc_paramdesc_pparamdescex = (*env)->GetFieldID(env, FUNCDESCFc.clazz, "elemdescFunc_paramdesc_pparamdescex", I_J); + FUNCDESCFc.elemdescFunc_paramdesc_pparamdescex = (*env)->GetFieldID(env, FUNCDESCFc.clazz, "elemdescFunc_paramdesc_pparamdescex", "J"); FUNCDESCFc.elemdescFunc_paramdesc_wParamFlags = (*env)->GetFieldID(env, FUNCDESCFc.clazz, "elemdescFunc_paramdesc_wParamFlags", "S"); FUNCDESCFc.wFuncFlags = (*env)->GetFieldID(env, FUNCDESCFc.clazz, "wFuncFlags", "S"); FUNCDESCFc.cached = 1; @@ -357,8 +357,8 @@ FUNCDESC *getFUNCDESCFields(JNIEnv *env, jobject lpObject, FUNCDESC *lpStruct) { if (!FUNCDESCFc.cached) cacheFUNCDESCFields(env, lpObject); lpStruct->memid = (MEMBERID)(*env)->GetIntField(env, lpObject, FUNCDESCFc.memid); - lpStruct->lprgscode = (SCODE FAR *)(*env)->GetIntLongField(env, lpObject, FUNCDESCFc.lprgscode); - lpStruct->lprgelemdescParam = (ELEMDESC FAR *)(*env)->GetIntLongField(env, lpObject, FUNCDESCFc.lprgelemdescParam); + lpStruct->lprgscode = (SCODE FAR *)(*env)->GetLongField(env, lpObject, FUNCDESCFc.lprgscode); + lpStruct->lprgelemdescParam = (ELEMDESC FAR *)(*env)->GetLongField(env, lpObject, FUNCDESCFc.lprgelemdescParam); lpStruct->funckind = (FUNCKIND)(*env)->GetIntField(env, lpObject, FUNCDESCFc.funckind); lpStruct->invkind = (INVOKEKIND)(*env)->GetIntField(env, lpObject, FUNCDESCFc.invkind); lpStruct->callconv = (CALLCONV)(*env)->GetIntField(env, lpObject, FUNCDESCFc.callconv); @@ -366,9 +366,9 @@ FUNCDESC *getFUNCDESCFields(JNIEnv *env, jobject lpObject, FUNCDESC *lpStruct) lpStruct->cParamsOpt = (*env)->GetShortField(env, lpObject, FUNCDESCFc.cParamsOpt); lpStruct->oVft = (*env)->GetShortField(env, lpObject, FUNCDESCFc.oVft); lpStruct->cScodes = (*env)->GetShortField(env, lpObject, FUNCDESCFc.cScodes); - lpStruct->elemdescFunc.tdesc.lptdesc = (struct FARSTRUCT tagTYPEDESC FAR* )(*env)->GetIntLongField(env, lpObject, FUNCDESCFc.elemdescFunc_tdesc_union); + lpStruct->elemdescFunc.tdesc.lptdesc = (struct FARSTRUCT tagTYPEDESC FAR* )(*env)->GetLongField(env, lpObject, FUNCDESCFc.elemdescFunc_tdesc_union); lpStruct->elemdescFunc.tdesc.vt = (*env)->GetShortField(env, lpObject, FUNCDESCFc.elemdescFunc_tdesc_vt); - lpStruct->elemdescFunc.paramdesc.pparamdescex = (LPPARAMDESCEX)(*env)->GetIntLongField(env, lpObject, FUNCDESCFc.elemdescFunc_paramdesc_pparamdescex); + lpStruct->elemdescFunc.paramdesc.pparamdescex = (LPPARAMDESCEX)(*env)->GetLongField(env, lpObject, FUNCDESCFc.elemdescFunc_paramdesc_pparamdescex); lpStruct->elemdescFunc.paramdesc.wParamFlags = (*env)->GetShortField(env, lpObject, FUNCDESCFc.elemdescFunc_paramdesc_wParamFlags); lpStruct->wFuncFlags = (*env)->GetShortField(env, lpObject, FUNCDESCFc.wFuncFlags); return lpStruct; @@ -378,8 +378,8 @@ void setFUNCDESCFields(JNIEnv *env, jobject lpObject, FUNCDESC *lpStruct) { if (!FUNCDESCFc.cached) cacheFUNCDESCFields(env, lpObject); (*env)->SetIntField(env, lpObject, FUNCDESCFc.memid, (jint)lpStruct->memid); - (*env)->SetIntLongField(env, lpObject, FUNCDESCFc.lprgscode, (jintLong)lpStruct->lprgscode); - (*env)->SetIntLongField(env, lpObject, FUNCDESCFc.lprgelemdescParam, (jintLong)lpStruct->lprgelemdescParam); + (*env)->SetLongField(env, lpObject, FUNCDESCFc.lprgscode, (jlong)lpStruct->lprgscode); + (*env)->SetLongField(env, lpObject, FUNCDESCFc.lprgelemdescParam, (jlong)lpStruct->lprgelemdescParam); (*env)->SetIntField(env, lpObject, FUNCDESCFc.funckind, (jint)lpStruct->funckind); (*env)->SetIntField(env, lpObject, FUNCDESCFc.invkind, (jint)lpStruct->invkind); (*env)->SetIntField(env, lpObject, FUNCDESCFc.callconv, (jint)lpStruct->callconv); @@ -387,9 +387,9 @@ void setFUNCDESCFields(JNIEnv *env, jobject lpObject, FUNCDESC *lpStruct) (*env)->SetShortField(env, lpObject, FUNCDESCFc.cParamsOpt, (jshort)lpStruct->cParamsOpt); (*env)->SetShortField(env, lpObject, FUNCDESCFc.oVft, (jshort)lpStruct->oVft); (*env)->SetShortField(env, lpObject, FUNCDESCFc.cScodes, (jshort)lpStruct->cScodes); - (*env)->SetIntLongField(env, lpObject, FUNCDESCFc.elemdescFunc_tdesc_union, (jintLong)lpStruct->elemdescFunc.tdesc.lptdesc); + (*env)->SetLongField(env, lpObject, FUNCDESCFc.elemdescFunc_tdesc_union, (jlong)lpStruct->elemdescFunc.tdesc.lptdesc); (*env)->SetShortField(env, lpObject, FUNCDESCFc.elemdescFunc_tdesc_vt, (jshort)lpStruct->elemdescFunc.tdesc.vt); - (*env)->SetIntLongField(env, lpObject, FUNCDESCFc.elemdescFunc_paramdesc_pparamdescex, (jintLong)lpStruct->elemdescFunc.paramdesc.pparamdescex); + (*env)->SetLongField(env, lpObject, FUNCDESCFc.elemdescFunc_paramdesc_pparamdescex, (jlong)lpStruct->elemdescFunc.paramdesc.pparamdescex); (*env)->SetShortField(env, lpObject, FUNCDESCFc.elemdescFunc_paramdesc_wParamFlags, (jshort)lpStruct->elemdescFunc.paramdesc.wParamFlags); (*env)->SetShortField(env, lpObject, FUNCDESCFc.wFuncFlags, (jshort)lpStruct->wFuncFlags); } @@ -573,8 +573,8 @@ void cacheOLEINPLACEFRAMEINFOFields(JNIEnv *env, jobject lpObject) OLEINPLACEFRAMEINFOFc.clazz = (*env)->GetObjectClass(env, lpObject); OLEINPLACEFRAMEINFOFc.cb = (*env)->GetFieldID(env, OLEINPLACEFRAMEINFOFc.clazz, "cb", "I"); OLEINPLACEFRAMEINFOFc.fMDIApp = (*env)->GetFieldID(env, OLEINPLACEFRAMEINFOFc.clazz, "fMDIApp", "I"); - OLEINPLACEFRAMEINFOFc.hwndFrame = (*env)->GetFieldID(env, OLEINPLACEFRAMEINFOFc.clazz, "hwndFrame", I_J); - OLEINPLACEFRAMEINFOFc.haccel = (*env)->GetFieldID(env, OLEINPLACEFRAMEINFOFc.clazz, "haccel", I_J); + OLEINPLACEFRAMEINFOFc.hwndFrame = (*env)->GetFieldID(env, OLEINPLACEFRAMEINFOFc.clazz, "hwndFrame", "J"); + OLEINPLACEFRAMEINFOFc.haccel = (*env)->GetFieldID(env, OLEINPLACEFRAMEINFOFc.clazz, "haccel", "J"); OLEINPLACEFRAMEINFOFc.cAccelEntries = (*env)->GetFieldID(env, OLEINPLACEFRAMEINFOFc.clazz, "cAccelEntries", "I"); OLEINPLACEFRAMEINFOFc.cached = 1; } @@ -584,8 +584,8 @@ OLEINPLACEFRAMEINFO *getOLEINPLACEFRAMEINFOFields(JNIEnv *env, jobject lpObject, if (!OLEINPLACEFRAMEINFOFc.cached) cacheOLEINPLACEFRAMEINFOFields(env, lpObject); lpStruct->cb = (*env)->GetIntField(env, lpObject, OLEINPLACEFRAMEINFOFc.cb); lpStruct->fMDIApp = (*env)->GetIntField(env, lpObject, OLEINPLACEFRAMEINFOFc.fMDIApp); - lpStruct->hwndFrame = (HWND)(*env)->GetIntLongField(env, lpObject, OLEINPLACEFRAMEINFOFc.hwndFrame); - lpStruct->haccel = (HACCEL)(*env)->GetIntLongField(env, lpObject, OLEINPLACEFRAMEINFOFc.haccel); + lpStruct->hwndFrame = (HWND)(*env)->GetLongField(env, lpObject, OLEINPLACEFRAMEINFOFc.hwndFrame); + lpStruct->haccel = (HACCEL)(*env)->GetLongField(env, lpObject, OLEINPLACEFRAMEINFOFc.haccel); lpStruct->cAccelEntries = (*env)->GetIntField(env, lpObject, OLEINPLACEFRAMEINFOFc.cAccelEntries); return lpStruct; } @@ -595,8 +595,8 @@ void setOLEINPLACEFRAMEINFOFields(JNIEnv *env, jobject lpObject, OLEINPLACEFRAME if (!OLEINPLACEFRAMEINFOFc.cached) cacheOLEINPLACEFRAMEINFOFields(env, lpObject); (*env)->SetIntField(env, lpObject, OLEINPLACEFRAMEINFOFc.cb, (jint)lpStruct->cb); (*env)->SetIntField(env, lpObject, OLEINPLACEFRAMEINFOFc.fMDIApp, (jint)lpStruct->fMDIApp); - (*env)->SetIntLongField(env, lpObject, OLEINPLACEFRAMEINFOFc.hwndFrame, (jintLong)lpStruct->hwndFrame); - (*env)->SetIntLongField(env, lpObject, OLEINPLACEFRAMEINFOFc.haccel, (jintLong)lpStruct->haccel); + (*env)->SetLongField(env, lpObject, OLEINPLACEFRAMEINFOFc.hwndFrame, (jlong)lpStruct->hwndFrame); + (*env)->SetLongField(env, lpObject, OLEINPLACEFRAMEINFOFc.haccel, (jlong)lpStruct->haccel); (*env)->SetIntField(env, lpObject, OLEINPLACEFRAMEINFOFc.cAccelEntries, (jint)lpStruct->cAccelEntries); } #endif @@ -614,7 +614,7 @@ void cacheSTATSTGFields(JNIEnv *env, jobject lpObject) { if (STATSTGFc.cached) return; STATSTGFc.clazz = (*env)->GetObjectClass(env, lpObject); - STATSTGFc.pwcsName = (*env)->GetFieldID(env, STATSTGFc.clazz, "pwcsName", I_J); + STATSTGFc.pwcsName = (*env)->GetFieldID(env, STATSTGFc.clazz, "pwcsName", "J"); STATSTGFc.type = (*env)->GetFieldID(env, STATSTGFc.clazz, "type", "I"); STATSTGFc.cbSize = (*env)->GetFieldID(env, STATSTGFc.clazz, "cbSize", "J"); STATSTGFc.mtime_dwLowDateTime = (*env)->GetFieldID(env, STATSTGFc.clazz, "mtime_dwLowDateTime", "I"); @@ -637,7 +637,7 @@ void cacheSTATSTGFields(JNIEnv *env, jobject lpObject) STATSTG *getSTATSTGFields(JNIEnv *env, jobject lpObject, STATSTG *lpStruct) { if (!STATSTGFc.cached) cacheSTATSTGFields(env, lpObject); - lpStruct->pwcsName = (LPWSTR)(*env)->GetIntLongField(env, lpObject, STATSTGFc.pwcsName); + lpStruct->pwcsName = (LPWSTR)(*env)->GetLongField(env, lpObject, STATSTGFc.pwcsName); lpStruct->type = (*env)->GetIntField(env, lpObject, STATSTGFc.type); lpStruct->cbSize.QuadPart = (*env)->GetLongField(env, lpObject, STATSTGFc.cbSize); lpStruct->mtime.dwLowDateTime = (*env)->GetIntField(env, lpObject, STATSTGFc.mtime_dwLowDateTime); @@ -663,7 +663,7 @@ STATSTG *getSTATSTGFields(JNIEnv *env, jobject lpObject, STATSTG *lpStruct) void setSTATSTGFields(JNIEnv *env, jobject lpObject, STATSTG *lpStruct) { if (!STATSTGFc.cached) cacheSTATSTGFields(env, lpObject); - (*env)->SetIntLongField(env, lpObject, STATSTGFc.pwcsName, (jintLong)lpStruct->pwcsName); + (*env)->SetLongField(env, lpObject, STATSTGFc.pwcsName, (jlong)lpStruct->pwcsName); (*env)->SetIntField(env, lpObject, STATSTGFc.type, (jint)lpStruct->type); (*env)->SetLongField(env, lpObject, STATSTGFc.cbSize, (jlong)lpStruct->cbSize.QuadPart); (*env)->SetIntField(env, lpObject, STATSTGFc.mtime_dwLowDateTime, (jint)lpStruct->mtime.dwLowDateTime); @@ -700,8 +700,8 @@ void cacheSTGMEDIUMFields(JNIEnv *env, jobject lpObject) if (STGMEDIUMFc.cached) return; STGMEDIUMFc.clazz = (*env)->GetObjectClass(env, lpObject); STGMEDIUMFc.tymed = (*env)->GetFieldID(env, STGMEDIUMFc.clazz, "tymed", "I"); - STGMEDIUMFc.unionField = (*env)->GetFieldID(env, STGMEDIUMFc.clazz, "unionField", I_J); - STGMEDIUMFc.pUnkForRelease = (*env)->GetFieldID(env, STGMEDIUMFc.clazz, "pUnkForRelease", I_J); + STGMEDIUMFc.unionField = (*env)->GetFieldID(env, STGMEDIUMFc.clazz, "unionField", "J"); + STGMEDIUMFc.pUnkForRelease = (*env)->GetFieldID(env, STGMEDIUMFc.clazz, "pUnkForRelease", "J"); STGMEDIUMFc.cached = 1; } @@ -709,8 +709,8 @@ STGMEDIUM *getSTGMEDIUMFields(JNIEnv *env, jobject lpObject, STGMEDIUM *lpStruct { if (!STGMEDIUMFc.cached) cacheSTGMEDIUMFields(env, lpObject); lpStruct->tymed = (*env)->GetIntField(env, lpObject, STGMEDIUMFc.tymed); - lpStruct->hGlobal = (HGLOBAL)(*env)->GetIntLongField(env, lpObject, STGMEDIUMFc.unionField); - lpStruct->pUnkForRelease = (IUnknown *)(*env)->GetIntLongField(env, lpObject, STGMEDIUMFc.pUnkForRelease); + lpStruct->hGlobal = (HGLOBAL)(*env)->GetLongField(env, lpObject, STGMEDIUMFc.unionField); + lpStruct->pUnkForRelease = (IUnknown *)(*env)->GetLongField(env, lpObject, STGMEDIUMFc.pUnkForRelease); return lpStruct; } @@ -718,8 +718,8 @@ void setSTGMEDIUMFields(JNIEnv *env, jobject lpObject, STGMEDIUM *lpStruct) { if (!STGMEDIUMFc.cached) cacheSTGMEDIUMFields(env, lpObject); (*env)->SetIntField(env, lpObject, STGMEDIUMFc.tymed, (jint)lpStruct->tymed); - (*env)->SetIntLongField(env, lpObject, STGMEDIUMFc.unionField, (jintLong)lpStruct->hGlobal); - (*env)->SetIntLongField(env, lpObject, STGMEDIUMFc.pUnkForRelease, (jintLong)lpStruct->pUnkForRelease); + (*env)->SetLongField(env, lpObject, STGMEDIUMFc.unionField, (jlong)lpStruct->hGlobal); + (*env)->SetLongField(env, lpObject, STGMEDIUMFc.pUnkForRelease, (jlong)lpStruct->pUnkForRelease); } #endif @@ -744,7 +744,7 @@ void cacheTYPEATTRFields(JNIEnv *env, jobject lpObject) TYPEATTRFc.dwReserved = (*env)->GetFieldID(env, TYPEATTRFc.clazz, "dwReserved", "I"); TYPEATTRFc.memidConstructor = (*env)->GetFieldID(env, TYPEATTRFc.clazz, "memidConstructor", "I"); TYPEATTRFc.memidDestructor = (*env)->GetFieldID(env, TYPEATTRFc.clazz, "memidDestructor", "I"); - TYPEATTRFc.lpstrSchema = (*env)->GetFieldID(env, TYPEATTRFc.clazz, "lpstrSchema", I_J); + TYPEATTRFc.lpstrSchema = (*env)->GetFieldID(env, TYPEATTRFc.clazz, "lpstrSchema", "J"); TYPEATTRFc.cbSizeInstance = (*env)->GetFieldID(env, TYPEATTRFc.clazz, "cbSizeInstance", "I"); TYPEATTRFc.typekind = (*env)->GetFieldID(env, TYPEATTRFc.clazz, "typekind", "I"); TYPEATTRFc.cFuncs = (*env)->GetFieldID(env, TYPEATTRFc.clazz, "cFuncs", "S"); @@ -755,7 +755,7 @@ void cacheTYPEATTRFields(JNIEnv *env, jobject lpObject) TYPEATTRFc.wTypeFlags = (*env)->GetFieldID(env, TYPEATTRFc.clazz, "wTypeFlags", "S"); TYPEATTRFc.wMajorVerNum = (*env)->GetFieldID(env, TYPEATTRFc.clazz, "wMajorVerNum", "S"); TYPEATTRFc.wMinorVerNum = (*env)->GetFieldID(env, TYPEATTRFc.clazz, "wMinorVerNum", "S"); - TYPEATTRFc.tdescAlias_unionField = (*env)->GetFieldID(env, TYPEATTRFc.clazz, "tdescAlias_unionField", I_J); + TYPEATTRFc.tdescAlias_unionField = (*env)->GetFieldID(env, TYPEATTRFc.clazz, "tdescAlias_unionField", "J"); TYPEATTRFc.tdescAlias_vt = (*env)->GetFieldID(env, TYPEATTRFc.clazz, "tdescAlias_vt", "S"); TYPEATTRFc.idldescType_dwReserved = (*env)->GetFieldID(env, TYPEATTRFc.clazz, "idldescType_dwReserved", "I"); TYPEATTRFc.idldescType_wIDLFlags = (*env)->GetFieldID(env, TYPEATTRFc.clazz, "idldescType_wIDLFlags", "S"); @@ -776,7 +776,7 @@ TYPEATTR *getTYPEATTRFields(JNIEnv *env, jobject lpObject, TYPEATTR *lpStruct) lpStruct->dwReserved = (*env)->GetIntField(env, lpObject, TYPEATTRFc.dwReserved); lpStruct->memidConstructor = (*env)->GetIntField(env, lpObject, TYPEATTRFc.memidConstructor); lpStruct->memidDestructor = (*env)->GetIntField(env, lpObject, TYPEATTRFc.memidDestructor); - lpStruct->lpstrSchema = (OLECHAR FAR *)(*env)->GetIntLongField(env, lpObject, TYPEATTRFc.lpstrSchema); + lpStruct->lpstrSchema = (OLECHAR FAR *)(*env)->GetLongField(env, lpObject, TYPEATTRFc.lpstrSchema); lpStruct->cbSizeInstance = (*env)->GetIntField(env, lpObject, TYPEATTRFc.cbSizeInstance); lpStruct->typekind = (*env)->GetIntField(env, lpObject, TYPEATTRFc.typekind); lpStruct->cFuncs = (*env)->GetShortField(env, lpObject, TYPEATTRFc.cFuncs); @@ -787,7 +787,7 @@ TYPEATTR *getTYPEATTRFields(JNIEnv *env, jobject lpObject, TYPEATTR *lpStruct) lpStruct->wTypeFlags = (*env)->GetShortField(env, lpObject, TYPEATTRFc.wTypeFlags); lpStruct->wMajorVerNum = (*env)->GetShortField(env, lpObject, TYPEATTRFc.wMajorVerNum); lpStruct->wMinorVerNum = (*env)->GetShortField(env, lpObject, TYPEATTRFc.wMinorVerNum); - lpStruct->tdescAlias.lptdesc = (struct FARSTRUCT tagTYPEDESC FAR *)(*env)->GetIntLongField(env, lpObject, TYPEATTRFc.tdescAlias_unionField); + lpStruct->tdescAlias.lptdesc = (struct FARSTRUCT tagTYPEDESC FAR *)(*env)->GetLongField(env, lpObject, TYPEATTRFc.tdescAlias_unionField); lpStruct->tdescAlias.vt = (*env)->GetShortField(env, lpObject, TYPEATTRFc.tdescAlias_vt); lpStruct->idldescType.dwReserved = (*env)->GetIntField(env, lpObject, TYPEATTRFc.idldescType_dwReserved); lpStruct->idldescType.wIDLFlags = (*env)->GetShortField(env, lpObject, TYPEATTRFc.idldescType_wIDLFlags); @@ -808,7 +808,7 @@ void setTYPEATTRFields(JNIEnv *env, jobject lpObject, TYPEATTR *lpStruct) (*env)->SetIntField(env, lpObject, TYPEATTRFc.dwReserved, (jint)lpStruct->dwReserved); (*env)->SetIntField(env, lpObject, TYPEATTRFc.memidConstructor, (jint)lpStruct->memidConstructor); (*env)->SetIntField(env, lpObject, TYPEATTRFc.memidDestructor, (jint)lpStruct->memidDestructor); - (*env)->SetIntLongField(env, lpObject, TYPEATTRFc.lpstrSchema, (jintLong)lpStruct->lpstrSchema); + (*env)->SetLongField(env, lpObject, TYPEATTRFc.lpstrSchema, (jlong)lpStruct->lpstrSchema); (*env)->SetIntField(env, lpObject, TYPEATTRFc.cbSizeInstance, (jint)lpStruct->cbSizeInstance); (*env)->SetIntField(env, lpObject, TYPEATTRFc.typekind, (jint)lpStruct->typekind); (*env)->SetShortField(env, lpObject, TYPEATTRFc.cFuncs, (jshort)lpStruct->cFuncs); @@ -819,7 +819,7 @@ void setTYPEATTRFields(JNIEnv *env, jobject lpObject, TYPEATTR *lpStruct) (*env)->SetShortField(env, lpObject, TYPEATTRFc.wTypeFlags, (jshort)lpStruct->wTypeFlags); (*env)->SetShortField(env, lpObject, TYPEATTRFc.wMajorVerNum, (jshort)lpStruct->wMajorVerNum); (*env)->SetShortField(env, lpObject, TYPEATTRFc.wMinorVerNum, (jshort)lpStruct->wMinorVerNum); - (*env)->SetIntLongField(env, lpObject, TYPEATTRFc.tdescAlias_unionField, (jintLong)lpStruct->tdescAlias.lptdesc); + (*env)->SetLongField(env, lpObject, TYPEATTRFc.tdescAlias_unionField, (jlong)lpStruct->tdescAlias.lptdesc); (*env)->SetShortField(env, lpObject, TYPEATTRFc.tdescAlias_vt, (jshort)lpStruct->tdescAlias.vt); (*env)->SetIntField(env, lpObject, TYPEATTRFc.idldescType_dwReserved, (jint)lpStruct->idldescType.dwReserved); (*env)->SetShortField(env, lpObject, TYPEATTRFc.idldescType_wIDLFlags, (jshort)lpStruct->idldescType.wIDLFlags); @@ -840,11 +840,11 @@ void cacheVARDESCFields(JNIEnv *env, jobject lpObject) if (VARDESCFc.cached) return; VARDESCFc.clazz = (*env)->GetObjectClass(env, lpObject); VARDESCFc.memid = (*env)->GetFieldID(env, VARDESCFc.clazz, "memid", "I"); - VARDESCFc.lpstrSchema = (*env)->GetFieldID(env, VARDESCFc.clazz, "lpstrSchema", I_J); + VARDESCFc.lpstrSchema = (*env)->GetFieldID(env, VARDESCFc.clazz, "lpstrSchema", "J"); VARDESCFc.oInst = (*env)->GetFieldID(env, VARDESCFc.clazz, "oInst", "I"); - VARDESCFc.elemdescVar_tdesc_union = (*env)->GetFieldID(env, VARDESCFc.clazz, "elemdescVar_tdesc_union", I_J); + VARDESCFc.elemdescVar_tdesc_union = (*env)->GetFieldID(env, VARDESCFc.clazz, "elemdescVar_tdesc_union", "J"); VARDESCFc.elemdescVar_tdesc_vt = (*env)->GetFieldID(env, VARDESCFc.clazz, "elemdescVar_tdesc_vt", "S"); - VARDESCFc.elemdescVar_paramdesc_pparamdescex = (*env)->GetFieldID(env, VARDESCFc.clazz, "elemdescVar_paramdesc_pparamdescex", I_J); + VARDESCFc.elemdescVar_paramdesc_pparamdescex = (*env)->GetFieldID(env, VARDESCFc.clazz, "elemdescVar_paramdesc_pparamdescex", "J"); VARDESCFc.elemdescVar_paramdesc_wParamFlags = (*env)->GetFieldID(env, VARDESCFc.clazz, "elemdescVar_paramdesc_wParamFlags", "S"); VARDESCFc.wVarFlags = (*env)->GetFieldID(env, VARDESCFc.clazz, "wVarFlags", "S"); VARDESCFc.varkind = (*env)->GetFieldID(env, VARDESCFc.clazz, "varkind", "I"); @@ -855,11 +855,11 @@ VARDESC *getVARDESCFields(JNIEnv *env, jobject lpObject, VARDESC *lpStruct) { if (!VARDESCFc.cached) cacheVARDESCFields(env, lpObject); lpStruct->memid = (*env)->GetIntField(env, lpObject, VARDESCFc.memid); - lpStruct->lpstrSchema = (OLECHAR FAR *)(*env)->GetIntLongField(env, lpObject, VARDESCFc.lpstrSchema); + lpStruct->lpstrSchema = (OLECHAR FAR *)(*env)->GetLongField(env, lpObject, VARDESCFc.lpstrSchema); lpStruct->oInst = (*env)->GetIntField(env, lpObject, VARDESCFc.oInst); - lpStruct->elemdescVar.tdesc.lptdesc = (struct FARSTRUCT tagTYPEDESC FAR *)(*env)->GetIntLongField(env, lpObject, VARDESCFc.elemdescVar_tdesc_union); + lpStruct->elemdescVar.tdesc.lptdesc = (struct FARSTRUCT tagTYPEDESC FAR *)(*env)->GetLongField(env, lpObject, VARDESCFc.elemdescVar_tdesc_union); lpStruct->elemdescVar.tdesc.vt = (*env)->GetShortField(env, lpObject, VARDESCFc.elemdescVar_tdesc_vt); - lpStruct->elemdescVar.paramdesc.pparamdescex = (LPPARAMDESCEX)(*env)->GetIntLongField(env, lpObject, VARDESCFc.elemdescVar_paramdesc_pparamdescex); + lpStruct->elemdescVar.paramdesc.pparamdescex = (LPPARAMDESCEX)(*env)->GetLongField(env, lpObject, VARDESCFc.elemdescVar_paramdesc_pparamdescex); lpStruct->elemdescVar.paramdesc.wParamFlags = (*env)->GetShortField(env, lpObject, VARDESCFc.elemdescVar_paramdesc_wParamFlags); lpStruct->wVarFlags = (*env)->GetShortField(env, lpObject, VARDESCFc.wVarFlags); lpStruct->varkind = (*env)->GetIntField(env, lpObject, VARDESCFc.varkind); @@ -870,11 +870,11 @@ void setVARDESCFields(JNIEnv *env, jobject lpObject, VARDESC *lpStruct) { if (!VARDESCFc.cached) cacheVARDESCFields(env, lpObject); (*env)->SetIntField(env, lpObject, VARDESCFc.memid, (jint)lpStruct->memid); - (*env)->SetIntLongField(env, lpObject, VARDESCFc.lpstrSchema, (jintLong)lpStruct->lpstrSchema); + (*env)->SetLongField(env, lpObject, VARDESCFc.lpstrSchema, (jlong)lpStruct->lpstrSchema); (*env)->SetIntField(env, lpObject, VARDESCFc.oInst, (jint)lpStruct->oInst); - (*env)->SetIntLongField(env, lpObject, VARDESCFc.elemdescVar_tdesc_union, (jintLong)lpStruct->elemdescVar.tdesc.lptdesc); + (*env)->SetLongField(env, lpObject, VARDESCFc.elemdescVar_tdesc_union, (jlong)lpStruct->elemdescVar.tdesc.lptdesc); (*env)->SetShortField(env, lpObject, VARDESCFc.elemdescVar_tdesc_vt, (jshort)lpStruct->elemdescVar.tdesc.vt); - (*env)->SetIntLongField(env, lpObject, VARDESCFc.elemdescVar_paramdesc_pparamdescex, (jintLong)lpStruct->elemdescVar.paramdesc.pparamdescex); + (*env)->SetLongField(env, lpObject, VARDESCFc.elemdescVar_paramdesc_pparamdescex, (jlong)lpStruct->elemdescVar.paramdesc.pparamdescex); (*env)->SetShortField(env, lpObject, VARDESCFc.elemdescVar_paramdesc_wParamFlags, (jshort)lpStruct->elemdescVar.paramdesc.wParamFlags); (*env)->SetShortField(env, lpObject, VARDESCFc.wVarFlags, (jshort)lpStruct->wVarFlags); (*env)->SetIntField(env, lpObject, VARDESCFc.varkind, (jint)lpStruct->varkind); diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip.cpp b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip.cpp index b31aa2b56d..3296efd9ec 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip.cpp +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip.cpp @@ -24,9 +24,9 @@ #endif #ifndef NO_BitmapData_1delete -extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(BitmapData_1delete)(JNIEnv *env, jclass that, jintLong arg0); +extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(BitmapData_1delete)(JNIEnv *env, jclass that, jlong arg0); JNIEXPORT void JNICALL Gdip_NATIVE(BitmapData_1delete) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { Gdip_NATIVE_ENTER(env, that, BitmapData_1delete_FUNC); delete (BitmapData *)arg0; @@ -35,56 +35,56 @@ JNIEXPORT void JNICALL Gdip_NATIVE(BitmapData_1delete) #endif #ifndef NO_BitmapData_1new -extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(BitmapData_1new)(JNIEnv *env, jclass that); -JNIEXPORT jintLong JNICALL Gdip_NATIVE(BitmapData_1new) +extern "C" JNIEXPORT jlong JNICALL Gdip_NATIVE(BitmapData_1new)(JNIEnv *env, jclass that); +JNIEXPORT jlong JNICALL Gdip_NATIVE(BitmapData_1new) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; Gdip_NATIVE_ENTER(env, that, BitmapData_1new_FUNC); - rc = (jintLong)new BitmapData(); + rc = (jlong)new BitmapData(); Gdip_NATIVE_EXIT(env, that, BitmapData_1new_FUNC); return rc; } #endif #ifndef NO_Bitmap_1GetHBITMAP -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1GetHBITMAP)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLongArray arg2); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1GetHBITMAP)(JNIEnv *env, jclass that, jlong arg0, jint arg1, jlongArray arg2); JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1GetHBITMAP) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLongArray arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlongArray arg2) { - jintLong *lparg2=NULL; + jlong *lparg2=NULL; jint rc = 0; Gdip_NATIVE_ENTER(env, that, Bitmap_1GetHBITMAP_FUNC); - if (arg2) if ((lparg2 = env->GetIntLongArrayElements(arg2, NULL)) == NULL) goto fail; + if (arg2) if ((lparg2 = env->GetLongArrayElements(arg2, NULL)) == NULL) goto fail; rc = (jint)((Bitmap*)arg0)->GetHBITMAP((Color)arg1, (HBITMAP*)lparg2); fail: - if (arg2 && lparg2) env->ReleaseIntLongArrayElements(arg2, lparg2, 0); + if (arg2 && lparg2) env->ReleaseLongArrayElements(arg2, lparg2, 0); Gdip_NATIVE_EXIT(env, that, Bitmap_1GetHBITMAP_FUNC); return rc; } #endif #ifndef NO_Bitmap_1GetHICON -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1GetHICON)(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1GetHICON)(JNIEnv *env, jclass that, jlong arg0, jlongArray arg1); JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1GetHICON) - (JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jlongArray arg1) { - jintLong *lparg1=NULL; + jlong *lparg1=NULL; jint rc = 0; Gdip_NATIVE_ENTER(env, that, Bitmap_1GetHICON_FUNC); - if (arg1) if ((lparg1 = env->GetIntLongArrayElements(arg1, NULL)) == NULL) goto fail; + if (arg1) if ((lparg1 = env->GetLongArrayElements(arg1, NULL)) == NULL) goto fail; rc = (jint)((Bitmap*)arg0)->GetHICON((HICON*)lparg1); fail: - if (arg1 && lparg1) env->ReleaseIntLongArrayElements(arg1, lparg1, 0); + if (arg1 && lparg1) env->ReleaseLongArrayElements(arg1, lparg1, 0); Gdip_NATIVE_EXIT(env, that, Bitmap_1GetHICON_FUNC); return rc; } #endif #ifndef NO_Bitmap_1LockBits -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1LockBits)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jintLong arg4); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1LockBits)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jlong arg4); JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1LockBits) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jintLong arg4) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jlong arg4) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, Bitmap_1LockBits_FUNC); @@ -95,9 +95,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1LockBits) #endif #ifndef NO_Bitmap_1UnlockBits -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1UnlockBits)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1UnlockBits)(JNIEnv *env, jclass that, jlong arg0, jlong arg1); JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1UnlockBits) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, Bitmap_1UnlockBits_FUNC); @@ -108,9 +108,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1UnlockBits) #endif #ifndef NO_Bitmap_1delete -extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Bitmap_1delete)(JNIEnv *env, jclass that, jintLong arg0); +extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Bitmap_1delete)(JNIEnv *env, jclass that, jlong arg0); JNIEXPORT void JNICALL Gdip_NATIVE(Bitmap_1delete) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { Gdip_NATIVE_ENTER(env, that, Bitmap_1delete_FUNC); delete (Bitmap *)arg0; @@ -118,91 +118,55 @@ JNIEXPORT void JNICALL Gdip_NATIVE(Bitmap_1delete) } #endif -#if (!defined(NO_Bitmap_1new__I) && !defined(JNI64)) || (!defined(NO_Bitmap_1new__J) && defined(JNI64)) -#ifndef JNI64 -extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Bitmap_1new__I)(JNIEnv *env, jclass that, jintLong arg0); -JNIEXPORT jintLong JNICALL Gdip_NATIVE(Bitmap_1new__I)(JNIEnv *env, jclass that, jintLong arg0) -#else -extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Bitmap_1new__J)(JNIEnv *env, jclass that, jintLong arg0); -JNIEXPORT jintLong JNICALL Gdip_NATIVE(Bitmap_1new__J)(JNIEnv *env, jclass that, jintLong arg0) -#endif +#ifndef NO_Bitmap_1new__IIIIJ +extern "C" JNIEXPORT jlong JNICALL Gdip_NATIVE(Bitmap_1new__IIIIJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jlong arg4); +JNIEXPORT jlong JNICALL Gdip_NATIVE(Bitmap_1new__IIIIJ) + (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jlong arg4) { - jintLong rc = 0; -#ifndef JNI64 - Gdip_NATIVE_ENTER(env, that, Bitmap_1new__I_FUNC); -#else - Gdip_NATIVE_ENTER(env, that, Bitmap_1new__J_FUNC); -#endif - rc = (jintLong)new Bitmap((HICON)arg0); -#ifndef JNI64 - Gdip_NATIVE_EXIT(env, that, Bitmap_1new__I_FUNC); -#else - Gdip_NATIVE_EXIT(env, that, Bitmap_1new__J_FUNC); -#endif + jlong rc = 0; + Gdip_NATIVE_ENTER(env, that, Bitmap_1new__IIIIJ_FUNC); + rc = (jlong)new Bitmap(arg0, arg1, arg2, (PixelFormat)arg3, (BYTE *)arg4); + Gdip_NATIVE_EXIT(env, that, Bitmap_1new__IIIIJ_FUNC); return rc; } #endif -#if (!defined(NO_Bitmap_1new__II) && !defined(JNI64)) || (!defined(NO_Bitmap_1new__JJ) && defined(JNI64)) -#ifndef JNI64 -extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Bitmap_1new__II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1); -JNIEXPORT jintLong JNICALL Gdip_NATIVE(Bitmap_1new__II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) -#else -extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Bitmap_1new__JJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1); -JNIEXPORT jintLong JNICALL Gdip_NATIVE(Bitmap_1new__JJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) -#endif +#ifndef NO_Bitmap_1new__J +extern "C" JNIEXPORT jlong JNICALL Gdip_NATIVE(Bitmap_1new__J)(JNIEnv *env, jclass that, jlong arg0); +JNIEXPORT jlong JNICALL Gdip_NATIVE(Bitmap_1new__J) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; -#ifndef JNI64 - Gdip_NATIVE_ENTER(env, that, Bitmap_1new__II_FUNC); -#else - Gdip_NATIVE_ENTER(env, that, Bitmap_1new__JJ_FUNC); -#endif - rc = (jintLong)new Bitmap((HBITMAP)arg0, (HPALETTE)arg1); -#ifndef JNI64 - Gdip_NATIVE_EXIT(env, that, Bitmap_1new__II_FUNC); -#else - Gdip_NATIVE_EXIT(env, that, Bitmap_1new__JJ_FUNC); -#endif + jlong rc = 0; + Gdip_NATIVE_ENTER(env, that, Bitmap_1new__J_FUNC); + rc = (jlong)new Bitmap((HICON)arg0); + Gdip_NATIVE_EXIT(env, that, Bitmap_1new__J_FUNC); return rc; } #endif -#if (!defined(NO_Bitmap_1new__IIIII) && !defined(JNI64)) || (!defined(NO_Bitmap_1new__IIIIJ) && defined(JNI64)) -#ifndef JNI64 -extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Bitmap_1new__IIIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jintLong arg4); -JNIEXPORT jintLong JNICALL Gdip_NATIVE(Bitmap_1new__IIIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jintLong arg4) -#else -extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Bitmap_1new__IIIIJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jintLong arg4); -JNIEXPORT jintLong JNICALL Gdip_NATIVE(Bitmap_1new__IIIIJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jintLong arg4) -#endif +#ifndef NO_Bitmap_1new__JJ +extern "C" JNIEXPORT jlong JNICALL Gdip_NATIVE(Bitmap_1new__JJ)(JNIEnv *env, jclass that, jlong arg0, jlong arg1); +JNIEXPORT jlong JNICALL Gdip_NATIVE(Bitmap_1new__JJ) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { - jintLong rc = 0; -#ifndef JNI64 - Gdip_NATIVE_ENTER(env, that, Bitmap_1new__IIIII_FUNC); -#else - Gdip_NATIVE_ENTER(env, that, Bitmap_1new__IIIIJ_FUNC); -#endif - rc = (jintLong)new Bitmap(arg0, arg1, arg2, (PixelFormat)arg3, (BYTE *)arg4); -#ifndef JNI64 - Gdip_NATIVE_EXIT(env, that, Bitmap_1new__IIIII_FUNC); -#else - Gdip_NATIVE_EXIT(env, that, Bitmap_1new__IIIIJ_FUNC); -#endif + jlong rc = 0; + Gdip_NATIVE_ENTER(env, that, Bitmap_1new__JJ_FUNC); + rc = (jlong)new Bitmap((HBITMAP)arg0, (HPALETTE)arg1); + Gdip_NATIVE_EXIT(env, that, Bitmap_1new__JJ_FUNC); return rc; } #endif #ifndef NO_Bitmap_1new___3CZ -extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Bitmap_1new___3CZ)(JNIEnv *env, jclass that, jcharArray arg0, jboolean arg1); -JNIEXPORT jintLong JNICALL Gdip_NATIVE(Bitmap_1new___3CZ) +extern "C" JNIEXPORT jlong JNICALL Gdip_NATIVE(Bitmap_1new___3CZ)(JNIEnv *env, jclass that, jcharArray arg0, jboolean arg1); +JNIEXPORT jlong JNICALL Gdip_NATIVE(Bitmap_1new___3CZ) (JNIEnv *env, jclass that, jcharArray arg0, jboolean arg1) { jchar *lparg0=NULL; - jintLong rc = 0; + jlong rc = 0; Gdip_NATIVE_ENTER(env, that, Bitmap_1new___3CZ_FUNC); if (arg0) if ((lparg0 = env->GetCharArrayElements(arg0, NULL)) == NULL) goto fail; - rc = (jintLong)new Bitmap((WCHAR*)lparg0, arg1); + rc = (jlong)new Bitmap((WCHAR*)lparg0, arg1); fail: if (arg0 && lparg0) env->ReleaseCharArrayElements(arg0, lparg0, 0); Gdip_NATIVE_EXIT(env, that, Bitmap_1new___3CZ_FUNC); @@ -211,22 +175,22 @@ fail: #endif #ifndef NO_Brush_1Clone -extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Brush_1Clone)(JNIEnv *env, jclass that, jintLong arg0); -JNIEXPORT jintLong JNICALL Gdip_NATIVE(Brush_1Clone) - (JNIEnv *env, jclass that, jintLong arg0) +extern "C" JNIEXPORT jlong JNICALL Gdip_NATIVE(Brush_1Clone)(JNIEnv *env, jclass that, jlong arg0); +JNIEXPORT jlong JNICALL Gdip_NATIVE(Brush_1Clone) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; Gdip_NATIVE_ENTER(env, that, Brush_1Clone_FUNC); - rc = (jintLong)((Brush *)arg0)->Clone(); + rc = (jlong)((Brush *)arg0)->Clone(); Gdip_NATIVE_EXIT(env, that, Brush_1Clone_FUNC); return rc; } #endif #ifndef NO_Brush_1GetType -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Brush_1GetType)(JNIEnv *env, jclass that, jintLong arg0); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Brush_1GetType)(JNIEnv *env, jclass that, jlong arg0); JNIEXPORT jint JNICALL Gdip_NATIVE(Brush_1GetType) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, Brush_1GetType_FUNC); @@ -250,9 +214,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(ColorPalette_1sizeof) #endif #ifndef NO_FontFamily_1GetFamilyName -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(FontFamily_1GetFamilyName)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jchar arg2); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(FontFamily_1GetFamilyName)(JNIEnv *env, jclass that, jlong arg0, jcharArray arg1, jchar arg2); JNIEXPORT jint JNICALL Gdip_NATIVE(FontFamily_1GetFamilyName) - (JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jchar arg2) + (JNIEnv *env, jclass that, jlong arg0, jcharArray arg1, jchar arg2) { jchar *lparg1=NULL; jint rc = 0; @@ -267,9 +231,9 @@ fail: #endif #ifndef NO_FontFamily_1IsAvailable -extern "C" JNIEXPORT jboolean JNICALL Gdip_NATIVE(FontFamily_1IsAvailable)(JNIEnv *env, jclass that, jintLong arg0); +extern "C" JNIEXPORT jboolean JNICALL Gdip_NATIVE(FontFamily_1IsAvailable)(JNIEnv *env, jclass that, jlong arg0); JNIEXPORT jboolean JNICALL Gdip_NATIVE(FontFamily_1IsAvailable) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; Gdip_NATIVE_ENTER(env, that, FontFamily_1IsAvailable_FUNC); @@ -280,9 +244,9 @@ JNIEXPORT jboolean JNICALL Gdip_NATIVE(FontFamily_1IsAvailable) #endif #ifndef NO_FontFamily_1delete -extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(FontFamily_1delete)(JNIEnv *env, jclass that, jintLong arg0); +extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(FontFamily_1delete)(JNIEnv *env, jclass that, jlong arg0); JNIEXPORT void JNICALL Gdip_NATIVE(FontFamily_1delete) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { Gdip_NATIVE_ENTER(env, that, FontFamily_1delete_FUNC); delete (FontFamily *)arg0; @@ -291,51 +255,39 @@ JNIEXPORT void JNICALL Gdip_NATIVE(FontFamily_1delete) #endif #ifndef NO_FontFamily_1new__ -extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(FontFamily_1new__)(JNIEnv *env, jclass that); -JNIEXPORT jintLong JNICALL Gdip_NATIVE(FontFamily_1new__) +extern "C" JNIEXPORT jlong JNICALL Gdip_NATIVE(FontFamily_1new__)(JNIEnv *env, jclass that); +JNIEXPORT jlong JNICALL Gdip_NATIVE(FontFamily_1new__) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; Gdip_NATIVE_ENTER(env, that, FontFamily_1new___FUNC); - rc = (jintLong)new FontFamily(); + rc = (jlong)new FontFamily(); Gdip_NATIVE_EXIT(env, that, FontFamily_1new___FUNC); return rc; } #endif -#if (!defined(NO_FontFamily_1new___3CI) && !defined(JNI64)) || (!defined(NO_FontFamily_1new___3CJ) && defined(JNI64)) -#ifndef JNI64 -extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(FontFamily_1new___3CI)(JNIEnv *env, jclass that, jcharArray arg0, jintLong arg1); -JNIEXPORT jintLong JNICALL Gdip_NATIVE(FontFamily_1new___3CI)(JNIEnv *env, jclass that, jcharArray arg0, jintLong arg1) -#else -extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(FontFamily_1new___3CJ)(JNIEnv *env, jclass that, jcharArray arg0, jintLong arg1); -JNIEXPORT jintLong JNICALL Gdip_NATIVE(FontFamily_1new___3CJ)(JNIEnv *env, jclass that, jcharArray arg0, jintLong arg1) -#endif +#ifndef NO_FontFamily_1new___3CJ +extern "C" JNIEXPORT jlong JNICALL Gdip_NATIVE(FontFamily_1new___3CJ)(JNIEnv *env, jclass that, jcharArray arg0, jlong arg1); +JNIEXPORT jlong JNICALL Gdip_NATIVE(FontFamily_1new___3CJ) + (JNIEnv *env, jclass that, jcharArray arg0, jlong arg1) { jchar *lparg0=NULL; - jintLong rc = 0; -#ifndef JNI64 - Gdip_NATIVE_ENTER(env, that, FontFamily_1new___3CI_FUNC); -#else + jlong rc = 0; Gdip_NATIVE_ENTER(env, that, FontFamily_1new___3CJ_FUNC); -#endif if (arg0) if ((lparg0 = env->GetCharArrayElements(arg0, NULL)) == NULL) goto fail; - rc = (jintLong)new FontFamily((const WCHAR *)lparg0, (const FontCollection *)arg1); + rc = (jlong)new FontFamily((const WCHAR *)lparg0, (const FontCollection *)arg1); fail: if (arg0 && lparg0) env->ReleaseCharArrayElements(arg0, lparg0, 0); -#ifndef JNI64 - Gdip_NATIVE_EXIT(env, that, FontFamily_1new___3CI_FUNC); -#else Gdip_NATIVE_EXIT(env, that, FontFamily_1new___3CJ_FUNC); -#endif return rc; } #endif #ifndef NO_Font_1GetFamily -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Font_1GetFamily)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Font_1GetFamily)(JNIEnv *env, jclass that, jlong arg0, jlong arg1); JNIEXPORT jint JNICALL Gdip_NATIVE(Font_1GetFamily) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, Font_1GetFamily_FUNC); @@ -346,9 +298,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Font_1GetFamily) #endif #ifndef NO_Font_1GetLogFontW -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Font_1GetLogFontW)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Font_1GetLogFontW)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2); JNIEXPORT jint JNICALL Gdip_NATIVE(Font_1GetLogFontW) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, Font_1GetLogFontW_FUNC); @@ -359,9 +311,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Font_1GetLogFontW) #endif #ifndef NO_Font_1GetSize -extern "C" JNIEXPORT jfloat JNICALL Gdip_NATIVE(Font_1GetSize)(JNIEnv *env, jclass that, jintLong arg0); +extern "C" JNIEXPORT jfloat JNICALL Gdip_NATIVE(Font_1GetSize)(JNIEnv *env, jclass that, jlong arg0); JNIEXPORT jfloat JNICALL Gdip_NATIVE(Font_1GetSize) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jfloat rc = 0; Gdip_NATIVE_ENTER(env, that, Font_1GetSize_FUNC); @@ -372,9 +324,9 @@ JNIEXPORT jfloat JNICALL Gdip_NATIVE(Font_1GetSize) #endif #ifndef NO_Font_1GetStyle -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Font_1GetStyle)(JNIEnv *env, jclass that, jintLong arg0); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Font_1GetStyle)(JNIEnv *env, jclass that, jlong arg0); JNIEXPORT jint JNICALL Gdip_NATIVE(Font_1GetStyle) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, Font_1GetStyle_FUNC); @@ -385,9 +337,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Font_1GetStyle) #endif #ifndef NO_Font_1IsAvailable -extern "C" JNIEXPORT jboolean JNICALL Gdip_NATIVE(Font_1IsAvailable)(JNIEnv *env, jclass that, jintLong arg0); +extern "C" JNIEXPORT jboolean JNICALL Gdip_NATIVE(Font_1IsAvailable)(JNIEnv *env, jclass that, jlong arg0); JNIEXPORT jboolean JNICALL Gdip_NATIVE(Font_1IsAvailable) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; Gdip_NATIVE_ENTER(env, that, Font_1IsAvailable_FUNC); @@ -398,9 +350,9 @@ JNIEXPORT jboolean JNICALL Gdip_NATIVE(Font_1IsAvailable) #endif #ifndef NO_Font_1delete -extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Font_1delete)(JNIEnv *env, jclass that, jintLong arg0); +extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Font_1delete)(JNIEnv *env, jclass that, jlong arg0); JNIEXPORT void JNICALL Gdip_NATIVE(Font_1delete) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { Gdip_NATIVE_ENTER(env, that, Font_1delete_FUNC); delete (Font *)arg0; @@ -408,89 +360,53 @@ JNIEXPORT void JNICALL Gdip_NATIVE(Font_1delete) } #endif -#if (!defined(NO_Font_1new__IFII) && !defined(JNI64)) || (!defined(NO_Font_1new__JFII) && defined(JNI64)) -#ifndef JNI64 -extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Font_1new__IFII)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jint arg2, jint arg3); -JNIEXPORT jintLong JNICALL Gdip_NATIVE(Font_1new__IFII)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jint arg2, jint arg3) -#else -extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Font_1new__JFII)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jint arg2, jint arg3); -JNIEXPORT jintLong JNICALL Gdip_NATIVE(Font_1new__JFII)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jint arg2, jint arg3) -#endif +#ifndef NO_Font_1new__JFII +extern "C" JNIEXPORT jlong JNICALL Gdip_NATIVE(Font_1new__JFII)(JNIEnv *env, jclass that, jlong arg0, jfloat arg1, jint arg2, jint arg3); +JNIEXPORT jlong JNICALL Gdip_NATIVE(Font_1new__JFII) + (JNIEnv *env, jclass that, jlong arg0, jfloat arg1, jint arg2, jint arg3) { - jintLong rc = 0; -#ifndef JNI64 - Gdip_NATIVE_ENTER(env, that, Font_1new__IFII_FUNC); -#else + jlong rc = 0; Gdip_NATIVE_ENTER(env, that, Font_1new__JFII_FUNC); -#endif - rc = (jintLong)new Font((const FontFamily *)arg0, (REAL)arg1, (INT)arg2, (Unit)arg3); -#ifndef JNI64 - Gdip_NATIVE_EXIT(env, that, Font_1new__IFII_FUNC); -#else + rc = (jlong)new Font((const FontFamily *)arg0, (REAL)arg1, (INT)arg2, (Unit)arg3); Gdip_NATIVE_EXIT(env, that, Font_1new__JFII_FUNC); -#endif return rc; } #endif -#if (!defined(NO_Font_1new__II) && !defined(JNI64)) || (!defined(NO_Font_1new__JJ) && defined(JNI64)) -#ifndef JNI64 -extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Font_1new__II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1); -JNIEXPORT jintLong JNICALL Gdip_NATIVE(Font_1new__II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) -#else -extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Font_1new__JJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1); -JNIEXPORT jintLong JNICALL Gdip_NATIVE(Font_1new__JJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) -#endif +#ifndef NO_Font_1new__JJ +extern "C" JNIEXPORT jlong JNICALL Gdip_NATIVE(Font_1new__JJ)(JNIEnv *env, jclass that, jlong arg0, jlong arg1); +JNIEXPORT jlong JNICALL Gdip_NATIVE(Font_1new__JJ) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { - jintLong rc = 0; -#ifndef JNI64 - Gdip_NATIVE_ENTER(env, that, Font_1new__II_FUNC); -#else + jlong rc = 0; Gdip_NATIVE_ENTER(env, that, Font_1new__JJ_FUNC); -#endif - rc = (jintLong)new Font((HDC)arg0, (HFONT)arg1); -#ifndef JNI64 - Gdip_NATIVE_EXIT(env, that, Font_1new__II_FUNC); -#else + rc = (jlong)new Font((HDC)arg0, (HFONT)arg1); Gdip_NATIVE_EXIT(env, that, Font_1new__JJ_FUNC); -#endif return rc; } #endif -#if (!defined(NO_Font_1new___3CFIII) && !defined(JNI64)) || (!defined(NO_Font_1new___3CFIIJ) && defined(JNI64)) -#ifndef JNI64 -extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Font_1new___3CFIII)(JNIEnv *env, jclass that, jcharArray arg0, jfloat arg1, jint arg2, jint arg3, jintLong arg4); -JNIEXPORT jintLong JNICALL Gdip_NATIVE(Font_1new___3CFIII)(JNIEnv *env, jclass that, jcharArray arg0, jfloat arg1, jint arg2, jint arg3, jintLong arg4) -#else -extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Font_1new___3CFIIJ)(JNIEnv *env, jclass that, jcharArray arg0, jfloat arg1, jint arg2, jint arg3, jintLong arg4); -JNIEXPORT jintLong JNICALL Gdip_NATIVE(Font_1new___3CFIIJ)(JNIEnv *env, jclass that, jcharArray arg0, jfloat arg1, jint arg2, jint arg3, jintLong arg4) -#endif +#ifndef NO_Font_1new___3CFIIJ +extern "C" JNIEXPORT jlong JNICALL Gdip_NATIVE(Font_1new___3CFIIJ)(JNIEnv *env, jclass that, jcharArray arg0, jfloat arg1, jint arg2, jint arg3, jlong arg4); +JNIEXPORT jlong JNICALL Gdip_NATIVE(Font_1new___3CFIIJ) + (JNIEnv *env, jclass that, jcharArray arg0, jfloat arg1, jint arg2, jint arg3, jlong arg4) { jchar *lparg0=NULL; - jintLong rc = 0; -#ifndef JNI64 - Gdip_NATIVE_ENTER(env, that, Font_1new___3CFIII_FUNC); -#else + jlong rc = 0; Gdip_NATIVE_ENTER(env, that, Font_1new___3CFIIJ_FUNC); -#endif if (arg0) if ((lparg0 = env->GetCharArrayElements(arg0, NULL)) == NULL) goto fail; - rc = (jintLong)new Font((const WCHAR *)lparg0, (REAL)arg1, (INT)arg2, (Unit)arg3, (const FontCollection *)arg4); + rc = (jlong)new Font((const WCHAR *)lparg0, (REAL)arg1, (INT)arg2, (Unit)arg3, (const FontCollection *)arg4); fail: if (arg0 && lparg0) env->ReleaseCharArrayElements(arg0, lparg0, 0); -#ifndef JNI64 - Gdip_NATIVE_EXIT(env, that, Font_1new___3CFIII_FUNC); -#else Gdip_NATIVE_EXIT(env, that, Font_1new___3CFIIJ_FUNC); -#endif return rc; } #endif #ifndef NO_GdiplusShutdown -extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(GdiplusShutdown)(JNIEnv *env, jclass that, jintLong arg0); +extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(GdiplusShutdown)(JNIEnv *env, jclass that, jlong arg0); JNIEXPORT void JNICALL Gdip_NATIVE(GdiplusShutdown) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { Gdip_NATIVE_ENTER(env, that, GdiplusShutdown_FUNC); GdiplusShutdown((ULONG_PTR)arg0); @@ -499,20 +415,20 @@ JNIEXPORT void JNICALL Gdip_NATIVE(GdiplusShutdown) #endif #ifndef NO_GdiplusStartup -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GdiplusStartup)(JNIEnv *env, jclass that, jintLongArray arg0, jobject arg1, jintLong arg2); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GdiplusStartup)(JNIEnv *env, jclass that, jlongArray arg0, jobject arg1, jlong arg2); JNIEXPORT jint JNICALL Gdip_NATIVE(GdiplusStartup) - (JNIEnv *env, jclass that, jintLongArray arg0, jobject arg1, jintLong arg2) + (JNIEnv *env, jclass that, jlongArray arg0, jobject arg1, jlong arg2) { - jintLong *lparg0=NULL; + jlong *lparg0=NULL; GdiplusStartupInput _arg1, *lparg1=NULL; jint rc = 0; Gdip_NATIVE_ENTER(env, that, GdiplusStartup_FUNC); - if (arg0) if ((lparg0 = env->GetIntLongArrayElements(arg0, NULL)) == NULL) goto fail; + if (arg0) if ((lparg0 = env->GetLongArrayElements(arg0, NULL)) == NULL) goto fail; if (arg1) if ((lparg1 = getGdiplusStartupInputFields(env, arg1, &_arg1)) == NULL) goto fail; rc = (jint)GdiplusStartup((ULONG_PTR *)lparg0, (const GdiplusStartupInput *)lparg1, (GdiplusStartupOutput *)arg2); fail: if (arg1 && lparg1) setGdiplusStartupInputFields(env, arg1, lparg1); - if (arg0 && lparg0) env->ReleaseIntLongArrayElements(arg0, lparg0, 0); + if (arg0 && lparg0) env->ReleaseLongArrayElements(arg0, lparg0, 0); Gdip_NATIVE_EXIT(env, that, GdiplusStartup_FUNC); return rc; } @@ -532,9 +448,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(GdiplusStartupInput_1sizeof) #endif #ifndef NO_GraphicsPath_1AddArc -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddArc)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5, jfloat arg6); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddArc)(JNIEnv *env, jclass that, jlong arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5, jfloat arg6); JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddArc) - (JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5, jfloat arg6) + (JNIEnv *env, jclass that, jlong arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5, jfloat arg6) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, GraphicsPath_1AddArc_FUNC); @@ -545,9 +461,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddArc) #endif #ifndef NO_GraphicsPath_1AddBezier -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddBezier)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5, jfloat arg6, jfloat arg7, jfloat arg8); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddBezier)(JNIEnv *env, jclass that, jlong arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5, jfloat arg6, jfloat arg7, jfloat arg8); JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddBezier) - (JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5, jfloat arg6, jfloat arg7, jfloat arg8) + (JNIEnv *env, jclass that, jlong arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5, jfloat arg6, jfloat arg7, jfloat arg8) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, GraphicsPath_1AddBezier_FUNC); @@ -558,9 +474,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddBezier) #endif #ifndef NO_GraphicsPath_1AddLine -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddLine)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddLine)(JNIEnv *env, jclass that, jlong arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4); JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddLine) - (JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4) + (JNIEnv *env, jclass that, jlong arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, GraphicsPath_1AddLine_FUNC); @@ -571,9 +487,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddLine) #endif #ifndef NO_GraphicsPath_1AddPath -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddPath)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddPath)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jboolean arg2); JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddPath) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jboolean arg2) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, GraphicsPath_1AddPath_FUNC); @@ -584,9 +500,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddPath) #endif #ifndef NO_GraphicsPath_1AddRectangle -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddRectangle)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddRectangle)(JNIEnv *env, jclass that, jlong arg0, jobject arg1); JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddRectangle) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { RectF _arg1, *lparg1=NULL; jint rc = 0; @@ -601,9 +517,9 @@ fail: #endif #ifndef NO_GraphicsPath_1AddString -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddString)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jintLong arg3, jint arg4, jfloat arg5, jobject arg6, jintLong arg7); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddString)(JNIEnv *env, jclass that, jlong arg0, jcharArray arg1, jint arg2, jlong arg3, jint arg4, jfloat arg5, jobject arg6, jlong arg7); JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddString) - (JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jintLong arg3, jint arg4, jfloat arg5, jobject arg6, jintLong arg7) + (JNIEnv *env, jclass that, jlong arg0, jcharArray arg1, jint arg2, jlong arg3, jint arg4, jfloat arg5, jobject arg6, jlong arg7) { jchar *lparg1=NULL; PointF _arg6, *lparg6=NULL; @@ -621,22 +537,22 @@ fail: #endif #ifndef NO_GraphicsPath_1Clone -extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(GraphicsPath_1Clone)(JNIEnv *env, jclass that, jintLong arg0); -JNIEXPORT jintLong JNICALL Gdip_NATIVE(GraphicsPath_1Clone) - (JNIEnv *env, jclass that, jintLong arg0) +extern "C" JNIEXPORT jlong JNICALL Gdip_NATIVE(GraphicsPath_1Clone)(JNIEnv *env, jclass that, jlong arg0); +JNIEXPORT jlong JNICALL Gdip_NATIVE(GraphicsPath_1Clone) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; Gdip_NATIVE_ENTER(env, that, GraphicsPath_1Clone_FUNC); - rc = (jintLong)((GraphicsPath *)arg0)->Clone(); + rc = (jlong)((GraphicsPath *)arg0)->Clone(); Gdip_NATIVE_EXIT(env, that, GraphicsPath_1Clone_FUNC); return rc; } #endif #ifndef NO_GraphicsPath_1CloseFigure -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1CloseFigure)(JNIEnv *env, jclass that, jintLong arg0); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1CloseFigure)(JNIEnv *env, jclass that, jlong arg0); JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1CloseFigure) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, GraphicsPath_1CloseFigure_FUNC); @@ -647,9 +563,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1CloseFigure) #endif #ifndef NO_GraphicsPath_1Flatten -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1Flatten)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jfloat arg2); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1Flatten)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jfloat arg2); JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1Flatten) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jfloat arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jfloat arg2) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, GraphicsPath_1Flatten_FUNC); @@ -660,9 +576,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1Flatten) #endif #ifndef NO_GraphicsPath_1GetBounds -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1GetBounds)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2, jintLong arg3); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1GetBounds)(JNIEnv *env, jclass that, jlong arg0, jobject arg1, jlong arg2, jlong arg3); JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1GetBounds) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2, jintLong arg3) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jlong arg2, jlong arg3) { RectF _arg1, *lparg1=NULL; jint rc = 0; @@ -677,9 +593,9 @@ fail: #endif #ifndef NO_GraphicsPath_1GetLastPoint -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1GetLastPoint)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1GetLastPoint)(JNIEnv *env, jclass that, jlong arg0, jobject arg1); JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1GetLastPoint) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { PointF _arg1, *lparg1=NULL; jint rc = 0; @@ -694,9 +610,9 @@ fail: #endif #ifndef NO_GraphicsPath_1GetPathPoints -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1GetPathPoints)(JNIEnv *env, jclass that, jintLong arg0, jfloatArray arg1, jint arg2); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1GetPathPoints)(JNIEnv *env, jclass that, jlong arg0, jfloatArray arg1, jint arg2); JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1GetPathPoints) - (JNIEnv *env, jclass that, jintLong arg0, jfloatArray arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jfloatArray arg1, jint arg2) { jfloat *lparg1=NULL; jint rc = 0; @@ -711,9 +627,9 @@ fail: #endif #ifndef NO_GraphicsPath_1GetPathTypes -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1GetPathTypes)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1GetPathTypes)(JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jint arg2); JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1GetPathTypes) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jint arg2) { jbyte *lparg1=NULL; jint rc = 0; @@ -728,9 +644,9 @@ fail: #endif #ifndef NO_GraphicsPath_1GetPointCount -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1GetPointCount)(JNIEnv *env, jclass that, jintLong arg0); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1GetPointCount)(JNIEnv *env, jclass that, jlong arg0); JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1GetPointCount) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, GraphicsPath_1GetPointCount_FUNC); @@ -741,9 +657,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1GetPointCount) #endif #ifndef NO_GraphicsPath_1IsOutlineVisible -extern "C" JNIEXPORT jboolean JNICALL Gdip_NATIVE(GraphicsPath_1IsOutlineVisible)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jintLong arg3, jintLong arg4); +extern "C" JNIEXPORT jboolean JNICALL Gdip_NATIVE(GraphicsPath_1IsOutlineVisible)(JNIEnv *env, jclass that, jlong arg0, jfloat arg1, jfloat arg2, jlong arg3, jlong arg4); JNIEXPORT jboolean JNICALL Gdip_NATIVE(GraphicsPath_1IsOutlineVisible) - (JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jintLong arg3, jintLong arg4) + (JNIEnv *env, jclass that, jlong arg0, jfloat arg1, jfloat arg2, jlong arg3, jlong arg4) { jboolean rc = 0; Gdip_NATIVE_ENTER(env, that, GraphicsPath_1IsOutlineVisible_FUNC); @@ -754,9 +670,9 @@ JNIEXPORT jboolean JNICALL Gdip_NATIVE(GraphicsPath_1IsOutlineVisible) #endif #ifndef NO_GraphicsPath_1IsVisible -extern "C" JNIEXPORT jboolean JNICALL Gdip_NATIVE(GraphicsPath_1IsVisible)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jintLong arg3); +extern "C" JNIEXPORT jboolean JNICALL Gdip_NATIVE(GraphicsPath_1IsVisible)(JNIEnv *env, jclass that, jlong arg0, jfloat arg1, jfloat arg2, jlong arg3); JNIEXPORT jboolean JNICALL Gdip_NATIVE(GraphicsPath_1IsVisible) - (JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jintLong arg3) + (JNIEnv *env, jclass that, jlong arg0, jfloat arg1, jfloat arg2, jlong arg3) { jboolean rc = 0; Gdip_NATIVE_ENTER(env, that, GraphicsPath_1IsVisible_FUNC); @@ -767,9 +683,9 @@ JNIEXPORT jboolean JNICALL Gdip_NATIVE(GraphicsPath_1IsVisible) #endif #ifndef NO_GraphicsPath_1SetFillMode -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1SetFillMode)(JNIEnv *env, jclass that, jintLong arg0, jint arg1); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1SetFillMode)(JNIEnv *env, jclass that, jlong arg0, jint arg1); JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1SetFillMode) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, GraphicsPath_1SetFillMode_FUNC); @@ -780,9 +696,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1SetFillMode) #endif #ifndef NO_GraphicsPath_1StartFigure -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1StartFigure)(JNIEnv *env, jclass that, jintLong arg0); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1StartFigure)(JNIEnv *env, jclass that, jlong arg0); JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1StartFigure) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, GraphicsPath_1StartFigure_FUNC); @@ -793,9 +709,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1StartFigure) #endif #ifndef NO_GraphicsPath_1Transform -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1Transform)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1Transform)(JNIEnv *env, jclass that, jlong arg0, jlong arg1); JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1Transform) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, GraphicsPath_1Transform_FUNC); @@ -806,9 +722,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1Transform) #endif #ifndef NO_GraphicsPath_1delete -extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(GraphicsPath_1delete)(JNIEnv *env, jclass that, jintLong arg0); +extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(GraphicsPath_1delete)(JNIEnv *env, jclass that, jlong arg0); JNIEXPORT void JNICALL Gdip_NATIVE(GraphicsPath_1delete) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { Gdip_NATIVE_ENTER(env, that, GraphicsPath_1delete_FUNC); delete (GraphicsPath *)arg0; @@ -817,30 +733,30 @@ JNIEXPORT void JNICALL Gdip_NATIVE(GraphicsPath_1delete) #endif #ifndef NO_GraphicsPath_1new__I -extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(GraphicsPath_1new__I)(JNIEnv *env, jclass that, jint arg0); -JNIEXPORT jintLong JNICALL Gdip_NATIVE(GraphicsPath_1new__I) +extern "C" JNIEXPORT jlong JNICALL Gdip_NATIVE(GraphicsPath_1new__I)(JNIEnv *env, jclass that, jint arg0); +JNIEXPORT jlong JNICALL Gdip_NATIVE(GraphicsPath_1new__I) (JNIEnv *env, jclass that, jint arg0) { - jintLong rc = 0; + jlong rc = 0; Gdip_NATIVE_ENTER(env, that, GraphicsPath_1new__I_FUNC); - rc = (jintLong)new GraphicsPath((FillMode)arg0); + rc = (jlong)new GraphicsPath((FillMode)arg0); Gdip_NATIVE_EXIT(env, that, GraphicsPath_1new__I_FUNC); return rc; } #endif #ifndef NO_GraphicsPath_1new___3I_3BII -extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(GraphicsPath_1new___3I_3BII)(JNIEnv *env, jclass that, jintArray arg0, jbyteArray arg1, jint arg2, jint arg3); -JNIEXPORT jintLong JNICALL Gdip_NATIVE(GraphicsPath_1new___3I_3BII) +extern "C" JNIEXPORT jlong JNICALL Gdip_NATIVE(GraphicsPath_1new___3I_3BII)(JNIEnv *env, jclass that, jintArray arg0, jbyteArray arg1, jint arg2, jint arg3); +JNIEXPORT jlong JNICALL Gdip_NATIVE(GraphicsPath_1new___3I_3BII) (JNIEnv *env, jclass that, jintArray arg0, jbyteArray arg1, jint arg2, jint arg3) { jint *lparg0=NULL; jbyte *lparg1=NULL; - jintLong rc = 0; + jlong rc = 0; Gdip_NATIVE_ENTER(env, that, GraphicsPath_1new___3I_3BII_FUNC); if (arg0) if ((lparg0 = env->GetIntArrayElements(arg0, NULL)) == NULL) goto fail; if (arg1) if ((lparg1 = env->GetByteArrayElements(arg1, NULL)) == NULL) goto fail; - rc = (jintLong)new GraphicsPath((const Point *)lparg0, (const BYTE *)lparg1, arg2, (FillMode)arg3); + rc = (jlong)new GraphicsPath((const Point *)lparg0, (const BYTE *)lparg1, arg2, (FillMode)arg3); fail: if (arg1 && lparg1) env->ReleaseByteArrayElements(arg1, lparg1, JNI_ABORT); if (arg0 && lparg0) env->ReleaseIntArrayElements(arg0, lparg0, JNI_ABORT); @@ -850,9 +766,9 @@ fail: #endif #ifndef NO_Graphics_1DrawArc -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawArc)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jfloat arg6, jfloat arg7); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawArc)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jfloat arg6, jfloat arg7); JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawArc) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jfloat arg6, jfloat arg7) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jfloat arg6, jfloat arg7) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, Graphics_1DrawArc_FUNC); @@ -862,68 +778,44 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawArc) } #endif -#if (!defined(NO_Graphics_1DrawDriverString__IIIIILorg_eclipse_swt_internal_gdip_PointF_2II) && !defined(JNI64)) || (!defined(NO_Graphics_1DrawDriverString__JJIJJLorg_eclipse_swt_internal_gdip_PointF_2IJ) && defined(JNI64)) -#ifndef JNI64 -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawDriverString__IIIIILorg_eclipse_swt_internal_gdip_PointF_2II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jintLong arg4, jobject arg5, jint arg6, jintLong arg7); -JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawDriverString__IIIIILorg_eclipse_swt_internal_gdip_PointF_2II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jintLong arg4, jobject arg5, jint arg6, jintLong arg7) -#else -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawDriverString__JJIJJLorg_eclipse_swt_internal_gdip_PointF_2IJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jintLong arg4, jobject arg5, jint arg6, jintLong arg7); -JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawDriverString__JJIJJLorg_eclipse_swt_internal_gdip_PointF_2IJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jintLong arg4, jobject arg5, jint arg6, jintLong arg7) -#endif +#ifndef NO_Graphics_1DrawDriverString__JJIJJLorg_eclipse_swt_internal_gdip_PointF_2IJ +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawDriverString__JJIJJLorg_eclipse_swt_internal_gdip_PointF_2IJ)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jlong arg3, jlong arg4, jobject arg5, jint arg6, jlong arg7); +JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawDriverString__JJIJJLorg_eclipse_swt_internal_gdip_PointF_2IJ) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jlong arg3, jlong arg4, jobject arg5, jint arg6, jlong arg7) { PointF _arg5, *lparg5=NULL; jint rc = 0; -#ifndef JNI64 - Gdip_NATIVE_ENTER(env, that, Graphics_1DrawDriverString__IIIIILorg_eclipse_swt_internal_gdip_PointF_2II_FUNC); -#else Gdip_NATIVE_ENTER(env, that, Graphics_1DrawDriverString__JJIJJLorg_eclipse_swt_internal_gdip_PointF_2IJ_FUNC); -#endif if (arg5) if ((lparg5 = getPointFFields(env, arg5, &_arg5)) == NULL) goto fail; rc = (jint)((Graphics *)arg0)->DrawDriverString((const UINT16 *)arg1, arg2, (const Font *)arg3, (const Brush *)arg4, (const PointF *)lparg5, arg6, (const Matrix *)arg7); fail: if (arg5 && lparg5) setPointFFields(env, arg5, lparg5); -#ifndef JNI64 - Gdip_NATIVE_EXIT(env, that, Graphics_1DrawDriverString__IIIIILorg_eclipse_swt_internal_gdip_PointF_2II_FUNC); -#else Gdip_NATIVE_EXIT(env, that, Graphics_1DrawDriverString__JJIJJLorg_eclipse_swt_internal_gdip_PointF_2IJ_FUNC); -#endif return rc; } #endif -#if (!defined(NO_Graphics_1DrawDriverString__IIIII_3FII) && !defined(JNI64)) || (!defined(NO_Graphics_1DrawDriverString__JJIJJ_3FIJ) && defined(JNI64)) -#ifndef JNI64 -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawDriverString__IIIII_3FII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jintLong arg4, jfloatArray arg5, jint arg6, jintLong arg7); -JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawDriverString__IIIII_3FII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jintLong arg4, jfloatArray arg5, jint arg6, jintLong arg7) -#else -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawDriverString__JJIJJ_3FIJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jintLong arg4, jfloatArray arg5, jint arg6, jintLong arg7); -JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawDriverString__JJIJJ_3FIJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jintLong arg4, jfloatArray arg5, jint arg6, jintLong arg7) -#endif +#ifndef NO_Graphics_1DrawDriverString__JJIJJ_3FIJ +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawDriverString__JJIJJ_3FIJ)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jlong arg3, jlong arg4, jfloatArray arg5, jint arg6, jlong arg7); +JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawDriverString__JJIJJ_3FIJ) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jlong arg3, jlong arg4, jfloatArray arg5, jint arg6, jlong arg7) { jfloat *lparg5=NULL; jint rc = 0; -#ifndef JNI64 - Gdip_NATIVE_ENTER(env, that, Graphics_1DrawDriverString__IIIII_3FII_FUNC); -#else Gdip_NATIVE_ENTER(env, that, Graphics_1DrawDriverString__JJIJJ_3FIJ_FUNC); -#endif if (arg5) if ((lparg5 = env->GetFloatArrayElements(arg5, NULL)) == NULL) goto fail; rc = (jint)((Graphics *)arg0)->DrawDriverString((const UINT16 *)arg1, arg2, (const Font *)arg3, (const Brush *)arg4, (const PointF *)lparg5, arg6, (const Matrix *)arg7); fail: if (arg5 && lparg5) env->ReleaseFloatArrayElements(arg5, lparg5, JNI_ABORT); -#ifndef JNI64 - Gdip_NATIVE_EXIT(env, that, Graphics_1DrawDriverString__IIIII_3FII_FUNC); -#else Gdip_NATIVE_EXIT(env, that, Graphics_1DrawDriverString__JJIJJ_3FIJ_FUNC); -#endif return rc; } #endif #ifndef NO_Graphics_1DrawEllipse -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawEllipse)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawEllipse)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jint arg5); JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawEllipse) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jint arg5) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, Graphics_1DrawEllipse_FUNC); @@ -933,64 +825,40 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawEllipse) } #endif -#if (!defined(NO_Graphics_1DrawImage__IIII) && !defined(JNI64)) || (!defined(NO_Graphics_1DrawImage__JJII) && defined(JNI64)) -#ifndef JNI64 -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawImage__IIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3); -JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawImage__IIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3) -#else -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawImage__JJII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3); -JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawImage__JJII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3) -#endif +#ifndef NO_Graphics_1DrawImage__JJII +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawImage__JJII)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3); +JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawImage__JJII) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3) { jint rc = 0; -#ifndef JNI64 - Gdip_NATIVE_ENTER(env, that, Graphics_1DrawImage__IIII_FUNC); -#else Gdip_NATIVE_ENTER(env, that, Graphics_1DrawImage__JJII_FUNC); -#endif rc = (jint)((Graphics *)arg0)->DrawImage((Image *)arg1, (INT)arg2, (INT)arg3); -#ifndef JNI64 - Gdip_NATIVE_EXIT(env, that, Graphics_1DrawImage__IIII_FUNC); -#else Gdip_NATIVE_EXIT(env, that, Graphics_1DrawImage__JJII_FUNC); -#endif return rc; } #endif -#if (!defined(NO_Graphics_1DrawImage__IILorg_eclipse_swt_internal_gdip_Rect_2IIIIIIII) && !defined(JNI64)) || (!defined(NO_Graphics_1DrawImage__JJLorg_eclipse_swt_internal_gdip_Rect_2IIIIIJJJ) && defined(JNI64)) -#ifndef JNI64 -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawImage__IILorg_eclipse_swt_internal_gdip_Rect_2IIIIIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jintLong arg8, jintLong arg9, jintLong arg10); -JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawImage__IILorg_eclipse_swt_internal_gdip_Rect_2IIIIIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jintLong arg8, jintLong arg9, jintLong arg10) -#else -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawImage__JJLorg_eclipse_swt_internal_gdip_Rect_2IIIIIJJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jintLong arg8, jintLong arg9, jintLong arg10); -JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawImage__JJLorg_eclipse_swt_internal_gdip_Rect_2IIIIIJJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jintLong arg8, jintLong arg9, jintLong arg10) -#endif +#ifndef NO_Graphics_1DrawImage__JJLorg_eclipse_swt_internal_gdip_Rect_2IIIIIJJJ +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawImage__JJLorg_eclipse_swt_internal_gdip_Rect_2IIIIIJJJ)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jobject arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jlong arg8, jlong arg9, jlong arg10); +JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawImage__JJLorg_eclipse_swt_internal_gdip_Rect_2IIIIIJJJ) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jobject arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jlong arg8, jlong arg9, jlong arg10) { Rect _arg2, *lparg2=NULL; jint rc = 0; -#ifndef JNI64 - Gdip_NATIVE_ENTER(env, that, Graphics_1DrawImage__IILorg_eclipse_swt_internal_gdip_Rect_2IIIIIIII_FUNC); -#else Gdip_NATIVE_ENTER(env, that, Graphics_1DrawImage__JJLorg_eclipse_swt_internal_gdip_Rect_2IIIIIJJJ_FUNC); -#endif if (arg2) if ((lparg2 = getRectFields(env, arg2, &_arg2)) == NULL) goto fail; rc = (jint)((Graphics *)arg0)->DrawImage((Image *)arg1, *(const Rect *)lparg2, (INT)arg3, (INT)arg4, (INT)arg5, (INT)arg6, (Unit)arg7, (ImageAttributes *)arg8, (DrawImageAbort)arg9, (VOID *)arg10); fail: if (arg2 && lparg2) setRectFields(env, arg2, lparg2); -#ifndef JNI64 - Gdip_NATIVE_EXIT(env, that, Graphics_1DrawImage__IILorg_eclipse_swt_internal_gdip_Rect_2IIIIIIII_FUNC); -#else Gdip_NATIVE_EXIT(env, that, Graphics_1DrawImage__JJLorg_eclipse_swt_internal_gdip_Rect_2IIIIIJJJ_FUNC); -#endif return rc; } #endif #ifndef NO_Graphics_1DrawLine -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawLine)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawLine)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jint arg5); JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawLine) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jint arg5) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, Graphics_1DrawLine_FUNC); @@ -1001,9 +869,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawLine) #endif #ifndef NO_Graphics_1DrawLines -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawLines)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintArray arg2, jint arg3); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawLines)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jintArray arg2, jint arg3); JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawLines) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintArray arg2, jint arg3) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jintArray arg2, jint arg3) { jint *lparg2=NULL; jint rc = 0; @@ -1018,9 +886,9 @@ fail: #endif #ifndef NO_Graphics_1DrawPath -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawPath)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawPath)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2); JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawPath) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, Graphics_1DrawPath_FUNC); @@ -1031,9 +899,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawPath) #endif #ifndef NO_Graphics_1DrawPolygon -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawPolygon)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintArray arg2, jint arg3); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawPolygon)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jintArray arg2, jint arg3); JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawPolygon) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintArray arg2, jint arg3) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jintArray arg2, jint arg3) { jint *lparg2=NULL; jint rc = 0; @@ -1048,9 +916,9 @@ fail: #endif #ifndef NO_Graphics_1DrawRectangle -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawRectangle)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawRectangle)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jint arg5); JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawRectangle) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jint arg5) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, Graphics_1DrawRectangle_FUNC); @@ -1060,74 +928,50 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawRectangle) } #endif -#if (!defined(NO_Graphics_1DrawString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2I) && !defined(JNI64)) || (!defined(NO_Graphics_1DrawString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2J) && defined(JNI64)) -#ifndef JNI64 -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2I)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jintLong arg3, jobject arg4, jintLong arg5); -JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2I)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jintLong arg3, jobject arg4, jintLong arg5) -#else -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2J)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jintLong arg3, jobject arg4, jintLong arg5); -JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2J)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jintLong arg3, jobject arg4, jintLong arg5) -#endif +#ifndef NO_Graphics_1DrawString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2J +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2J)(JNIEnv *env, jclass that, jlong arg0, jcharArray arg1, jint arg2, jlong arg3, jobject arg4, jlong arg5); +JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2J) + (JNIEnv *env, jclass that, jlong arg0, jcharArray arg1, jint arg2, jlong arg3, jobject arg4, jlong arg5) { jchar *lparg1=NULL; PointF _arg4, *lparg4=NULL; jint rc = 0; -#ifndef JNI64 - Gdip_NATIVE_ENTER(env, that, Graphics_1DrawString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2I_FUNC); -#else Gdip_NATIVE_ENTER(env, that, Graphics_1DrawString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2J_FUNC); -#endif if (arg1) if ((lparg1 = env->GetCharArrayElements(arg1, NULL)) == NULL) goto fail; if (arg4) if ((lparg4 = getPointFFields(env, arg4, &_arg4)) == NULL) goto fail; rc = (jint)((Graphics *)arg0)->DrawString((WCHAR *)lparg1, (int)arg2, (Font *)arg3, *lparg4, (Brush *)arg5); fail: if (arg4 && lparg4) setPointFFields(env, arg4, lparg4); if (arg1 && lparg1) env->ReleaseCharArrayElements(arg1, lparg1, 0); -#ifndef JNI64 - Gdip_NATIVE_EXIT(env, that, Graphics_1DrawString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2I_FUNC); -#else Gdip_NATIVE_EXIT(env, that, Graphics_1DrawString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2J_FUNC); -#endif return rc; } #endif -#if (!defined(NO_Graphics_1DrawString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2II) && !defined(JNI64)) || (!defined(NO_Graphics_1DrawString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2JJ) && defined(JNI64)) -#ifndef JNI64 -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2II)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jintLong arg3, jobject arg4, jintLong arg5, jintLong arg6); -JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2II)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jintLong arg3, jobject arg4, jintLong arg5, jintLong arg6) -#else -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2JJ)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jintLong arg3, jobject arg4, jintLong arg5, jintLong arg6); -JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2JJ)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jintLong arg3, jobject arg4, jintLong arg5, jintLong arg6) -#endif +#ifndef NO_Graphics_1DrawString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2JJ +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2JJ)(JNIEnv *env, jclass that, jlong arg0, jcharArray arg1, jint arg2, jlong arg3, jobject arg4, jlong arg5, jlong arg6); +JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2JJ) + (JNIEnv *env, jclass that, jlong arg0, jcharArray arg1, jint arg2, jlong arg3, jobject arg4, jlong arg5, jlong arg6) { jchar *lparg1=NULL; PointF _arg4, *lparg4=NULL; jint rc = 0; -#ifndef JNI64 - Gdip_NATIVE_ENTER(env, that, Graphics_1DrawString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2II_FUNC); -#else Gdip_NATIVE_ENTER(env, that, Graphics_1DrawString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2JJ_FUNC); -#endif if (arg1) if ((lparg1 = env->GetCharArrayElements(arg1, NULL)) == NULL) goto fail; if (arg4) if ((lparg4 = getPointFFields(env, arg4, &_arg4)) == NULL) goto fail; rc = (jint)((Graphics *)arg0)->DrawString((WCHAR *)lparg1, (int)arg2, (Font *)arg3, *lparg4, (StringFormat *)arg5, (Brush *)arg6); fail: if (arg4 && lparg4) setPointFFields(env, arg4, lparg4); if (arg1 && lparg1) env->ReleaseCharArrayElements(arg1, lparg1, 0); -#ifndef JNI64 - Gdip_NATIVE_EXIT(env, that, Graphics_1DrawString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2II_FUNC); -#else Gdip_NATIVE_EXIT(env, that, Graphics_1DrawString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2JJ_FUNC); -#endif return rc; } #endif #ifndef NO_Graphics_1FillEllipse -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1FillEllipse)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1FillEllipse)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jint arg5); JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1FillEllipse) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jint arg5) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, Graphics_1FillEllipse_FUNC); @@ -1138,9 +982,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1FillEllipse) #endif #ifndef NO_Graphics_1FillPath -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1FillPath)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1FillPath)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2); JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1FillPath) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, Graphics_1FillPath_FUNC); @@ -1151,9 +995,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1FillPath) #endif #ifndef NO_Graphics_1FillPie -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1FillPie)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jfloat arg6, jfloat arg7); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1FillPie)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jfloat arg6, jfloat arg7); JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1FillPie) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jfloat arg6, jfloat arg7) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jfloat arg6, jfloat arg7) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, Graphics_1FillPie_FUNC); @@ -1164,9 +1008,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1FillPie) #endif #ifndef NO_Graphics_1FillPolygon -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1FillPolygon)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintArray arg2, jint arg3, jint arg4); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1FillPolygon)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jintArray arg2, jint arg3, jint arg4); JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1FillPolygon) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintArray arg2, jint arg3, jint arg4) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jintArray arg2, jint arg3, jint arg4) { jint *lparg2=NULL; jint rc = 0; @@ -1181,9 +1025,9 @@ fail: #endif #ifndef NO_Graphics_1FillRectangle -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1FillRectangle)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1FillRectangle)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jint arg5); JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1FillRectangle) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jint arg5) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, Graphics_1FillRectangle_FUNC); @@ -1194,9 +1038,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1FillRectangle) #endif #ifndef NO_Graphics_1Flush -extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Graphics_1Flush)(JNIEnv *env, jclass that, jintLong arg0, jint arg1); +extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Graphics_1Flush)(JNIEnv *env, jclass that, jlong arg0, jint arg1); JNIEXPORT void JNICALL Gdip_NATIVE(Graphics_1Flush) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { Gdip_NATIVE_ENTER(env, that, Graphics_1Flush_FUNC); ((Graphics *)arg0)->Flush((FlushIntention)arg1); @@ -1205,9 +1049,9 @@ JNIEXPORT void JNICALL Gdip_NATIVE(Graphics_1Flush) #endif #ifndef NO_Graphics_1GetClip -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetClip)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetClip)(JNIEnv *env, jclass that, jlong arg0, jlong arg1); JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetClip) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, Graphics_1GetClip_FUNC); @@ -1217,81 +1061,57 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetClip) } #endif -#if (!defined(NO_Graphics_1GetClipBounds__ILorg_eclipse_swt_internal_gdip_RectF_2) && !defined(JNI64)) || (!defined(NO_Graphics_1GetClipBounds__JLorg_eclipse_swt_internal_gdip_RectF_2) && defined(JNI64)) -#ifndef JNI64 -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetClipBounds__ILorg_eclipse_swt_internal_gdip_RectF_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1); -JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetClipBounds__ILorg_eclipse_swt_internal_gdip_RectF_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1) -#else -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetClipBounds__JLorg_eclipse_swt_internal_gdip_RectF_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1); -JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetClipBounds__JLorg_eclipse_swt_internal_gdip_RectF_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1) -#endif +#ifndef NO_Graphics_1GetClipBounds__JLorg_eclipse_swt_internal_gdip_RectF_2 +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetClipBounds__JLorg_eclipse_swt_internal_gdip_RectF_2)(JNIEnv *env, jclass that, jlong arg0, jobject arg1); +JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetClipBounds__JLorg_eclipse_swt_internal_gdip_RectF_2) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { RectF _arg1, *lparg1=NULL; jint rc = 0; -#ifndef JNI64 - Gdip_NATIVE_ENTER(env, that, Graphics_1GetClipBounds__ILorg_eclipse_swt_internal_gdip_RectF_2_FUNC); -#else Gdip_NATIVE_ENTER(env, that, Graphics_1GetClipBounds__JLorg_eclipse_swt_internal_gdip_RectF_2_FUNC); -#endif if (arg1) if ((lparg1 = getRectFFields(env, arg1, &_arg1)) == NULL) goto fail; rc = (jint)((Graphics *)arg0)->GetClipBounds(lparg1); fail: if (arg1 && lparg1) setRectFFields(env, arg1, lparg1); -#ifndef JNI64 - Gdip_NATIVE_EXIT(env, that, Graphics_1GetClipBounds__ILorg_eclipse_swt_internal_gdip_RectF_2_FUNC); -#else Gdip_NATIVE_EXIT(env, that, Graphics_1GetClipBounds__JLorg_eclipse_swt_internal_gdip_RectF_2_FUNC); -#endif return rc; } #endif -#if (!defined(NO_Graphics_1GetClipBounds__ILorg_eclipse_swt_internal_gdip_Rect_2) && !defined(JNI64)) || (!defined(NO_Graphics_1GetClipBounds__JLorg_eclipse_swt_internal_gdip_Rect_2) && defined(JNI64)) -#ifndef JNI64 -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetClipBounds__ILorg_eclipse_swt_internal_gdip_Rect_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1); -JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetClipBounds__ILorg_eclipse_swt_internal_gdip_Rect_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1) -#else -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetClipBounds__JLorg_eclipse_swt_internal_gdip_Rect_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1); -JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetClipBounds__JLorg_eclipse_swt_internal_gdip_Rect_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1) -#endif +#ifndef NO_Graphics_1GetClipBounds__JLorg_eclipse_swt_internal_gdip_Rect_2 +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetClipBounds__JLorg_eclipse_swt_internal_gdip_Rect_2)(JNIEnv *env, jclass that, jlong arg0, jobject arg1); +JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetClipBounds__JLorg_eclipse_swt_internal_gdip_Rect_2) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { Rect _arg1, *lparg1=NULL; jint rc = 0; -#ifndef JNI64 - Gdip_NATIVE_ENTER(env, that, Graphics_1GetClipBounds__ILorg_eclipse_swt_internal_gdip_Rect_2_FUNC); -#else Gdip_NATIVE_ENTER(env, that, Graphics_1GetClipBounds__JLorg_eclipse_swt_internal_gdip_Rect_2_FUNC); -#endif if (arg1) if ((lparg1 = getRectFields(env, arg1, &_arg1)) == NULL) goto fail; rc = (jint)((Graphics *)arg0)->GetClipBounds(lparg1); fail: if (arg1 && lparg1) setRectFields(env, arg1, lparg1); -#ifndef JNI64 - Gdip_NATIVE_EXIT(env, that, Graphics_1GetClipBounds__ILorg_eclipse_swt_internal_gdip_Rect_2_FUNC); -#else Gdip_NATIVE_EXIT(env, that, Graphics_1GetClipBounds__JLorg_eclipse_swt_internal_gdip_Rect_2_FUNC); -#endif return rc; } #endif #ifndef NO_Graphics_1GetHDC -extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Graphics_1GetHDC)(JNIEnv *env, jclass that, jintLong arg0); -JNIEXPORT jintLong JNICALL Gdip_NATIVE(Graphics_1GetHDC) - (JNIEnv *env, jclass that, jintLong arg0) +extern "C" JNIEXPORT jlong JNICALL Gdip_NATIVE(Graphics_1GetHDC)(JNIEnv *env, jclass that, jlong arg0); +JNIEXPORT jlong JNICALL Gdip_NATIVE(Graphics_1GetHDC) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; Gdip_NATIVE_ENTER(env, that, Graphics_1GetHDC_FUNC); - rc = (jintLong)((Graphics *)arg0)->GetHDC(); + rc = (jlong)((Graphics *)arg0)->GetHDC(); Gdip_NATIVE_EXIT(env, that, Graphics_1GetHDC_FUNC); return rc; } #endif #ifndef NO_Graphics_1GetInterpolationMode -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetInterpolationMode)(JNIEnv *env, jclass that, jintLong arg0); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetInterpolationMode)(JNIEnv *env, jclass that, jlong arg0); JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetInterpolationMode) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, Graphics_1GetInterpolationMode_FUNC); @@ -1302,9 +1122,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetInterpolationMode) #endif #ifndef NO_Graphics_1GetSmoothingMode -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetSmoothingMode)(JNIEnv *env, jclass that, jintLong arg0); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetSmoothingMode)(JNIEnv *env, jclass that, jlong arg0); JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetSmoothingMode) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, Graphics_1GetSmoothingMode_FUNC); @@ -1315,9 +1135,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetSmoothingMode) #endif #ifndef NO_Graphics_1GetTextRenderingHint -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetTextRenderingHint)(JNIEnv *env, jclass that, jintLong arg0); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetTextRenderingHint)(JNIEnv *env, jclass that, jlong arg0); JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetTextRenderingHint) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, Graphics_1GetTextRenderingHint_FUNC); @@ -1328,9 +1148,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetTextRenderingHint) #endif #ifndef NO_Graphics_1GetTransform -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetTransform)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetTransform)(JNIEnv *env, jclass that, jlong arg0, jlong arg1); JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetTransform) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, Graphics_1GetTransform_FUNC); @@ -1341,9 +1161,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetTransform) #endif #ifndef NO_Graphics_1GetVisibleClipBounds -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetVisibleClipBounds)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetVisibleClipBounds)(JNIEnv *env, jclass that, jlong arg0, jobject arg1); JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetVisibleClipBounds) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { Rect _arg1, *lparg1=NULL; jint rc = 0; @@ -1358,9 +1178,9 @@ fail: #endif #ifndef NO_Graphics_1MeasureDriverString -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1MeasureDriverString)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jfloatArray arg4, jint arg5, jintLong arg6, jobject arg7); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1MeasureDriverString)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jlong arg3, jfloatArray arg4, jint arg5, jlong arg6, jobject arg7); JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1MeasureDriverString) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jfloatArray arg4, jint arg5, jintLong arg6, jobject arg7) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jlong arg3, jfloatArray arg4, jint arg5, jlong arg6, jobject arg7) { jfloat *lparg4=NULL; RectF _arg7, *lparg7=NULL; @@ -1377,24 +1197,16 @@ fail: } #endif -#if (!defined(NO_Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2ILorg_eclipse_swt_internal_gdip_RectF_2) && !defined(JNI64)) || (!defined(NO_Graphics_1MeasureString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2JLorg_eclipse_swt_internal_gdip_RectF_2) && defined(JNI64)) -#ifndef JNI64 -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2ILorg_eclipse_swt_internal_gdip_RectF_2)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jintLong arg3, jobject arg4, jintLong arg5, jobject arg6); -JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2ILorg_eclipse_swt_internal_gdip_RectF_2)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jintLong arg3, jobject arg4, jintLong arg5, jobject arg6) -#else -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1MeasureString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2JLorg_eclipse_swt_internal_gdip_RectF_2)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jintLong arg3, jobject arg4, jintLong arg5, jobject arg6); -JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1MeasureString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2JLorg_eclipse_swt_internal_gdip_RectF_2)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jintLong arg3, jobject arg4, jintLong arg5, jobject arg6) -#endif +#ifndef NO_Graphics_1MeasureString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2JLorg_eclipse_swt_internal_gdip_RectF_2 +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1MeasureString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2JLorg_eclipse_swt_internal_gdip_RectF_2)(JNIEnv *env, jclass that, jlong arg0, jcharArray arg1, jint arg2, jlong arg3, jobject arg4, jlong arg5, jobject arg6); +JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1MeasureString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2JLorg_eclipse_swt_internal_gdip_RectF_2) + (JNIEnv *env, jclass that, jlong arg0, jcharArray arg1, jint arg2, jlong arg3, jobject arg4, jlong arg5, jobject arg6) { jchar *lparg1=NULL; PointF _arg4, *lparg4=NULL; RectF _arg6, *lparg6=NULL; jint rc = 0; -#ifndef JNI64 - Gdip_NATIVE_ENTER(env, that, Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2ILorg_eclipse_swt_internal_gdip_RectF_2_FUNC); -#else Gdip_NATIVE_ENTER(env, that, Graphics_1MeasureString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2JLorg_eclipse_swt_internal_gdip_RectF_2_FUNC); -#endif if (arg1) if ((lparg1 = env->GetCharArrayElements(arg1, NULL)) == NULL) goto fail; if (arg4) if ((lparg4 = getPointFFields(env, arg4, &_arg4)) == NULL) goto fail; if (arg6) if ((lparg6 = getRectFFields(env, arg6, &_arg6)) == NULL) goto fail; @@ -1403,33 +1215,21 @@ fail: if (arg6 && lparg6) setRectFFields(env, arg6, lparg6); if (arg4 && lparg4) setPointFFields(env, arg4, lparg4); if (arg1 && lparg1) env->ReleaseCharArrayElements(arg1, lparg1, 0); -#ifndef JNI64 - Gdip_NATIVE_EXIT(env, that, Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2ILorg_eclipse_swt_internal_gdip_RectF_2_FUNC); -#else Gdip_NATIVE_EXIT(env, that, Graphics_1MeasureString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2JLorg_eclipse_swt_internal_gdip_RectF_2_FUNC); -#endif return rc; } #endif -#if (!defined(NO_Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2Lorg_eclipse_swt_internal_gdip_RectF_2) && !defined(JNI64)) || (!defined(NO_Graphics_1MeasureString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2Lorg_eclipse_swt_internal_gdip_RectF_2) && defined(JNI64)) -#ifndef JNI64 -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2Lorg_eclipse_swt_internal_gdip_RectF_2)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jintLong arg3, jobject arg4, jobject arg5); -JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2Lorg_eclipse_swt_internal_gdip_RectF_2)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jintLong arg3, jobject arg4, jobject arg5) -#else -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1MeasureString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2Lorg_eclipse_swt_internal_gdip_RectF_2)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jintLong arg3, jobject arg4, jobject arg5); -JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1MeasureString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2Lorg_eclipse_swt_internal_gdip_RectF_2)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jintLong arg3, jobject arg4, jobject arg5) -#endif +#ifndef NO_Graphics_1MeasureString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2Lorg_eclipse_swt_internal_gdip_RectF_2 +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1MeasureString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2Lorg_eclipse_swt_internal_gdip_RectF_2)(JNIEnv *env, jclass that, jlong arg0, jcharArray arg1, jint arg2, jlong arg3, jobject arg4, jobject arg5); +JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1MeasureString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2Lorg_eclipse_swt_internal_gdip_RectF_2) + (JNIEnv *env, jclass that, jlong arg0, jcharArray arg1, jint arg2, jlong arg3, jobject arg4, jobject arg5) { jchar *lparg1=NULL; PointF _arg4, *lparg4=NULL; RectF _arg5, *lparg5=NULL; jint rc = 0; -#ifndef JNI64 - Gdip_NATIVE_ENTER(env, that, Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2Lorg_eclipse_swt_internal_gdip_RectF_2_FUNC); -#else Gdip_NATIVE_ENTER(env, that, Graphics_1MeasureString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2Lorg_eclipse_swt_internal_gdip_RectF_2_FUNC); -#endif if (arg1) if ((lparg1 = env->GetCharArrayElements(arg1, NULL)) == NULL) goto fail; if (arg4) if ((lparg4 = getPointFFields(env, arg4, &_arg4)) == NULL) goto fail; if (arg5) if ((lparg5 = getRectFFields(env, arg5, &_arg5)) == NULL) goto fail; @@ -1438,19 +1238,15 @@ fail: if (arg5 && lparg5) setRectFFields(env, arg5, lparg5); if (arg4 && lparg4) setPointFFields(env, arg4, lparg4); if (arg1 && lparg1) env->ReleaseCharArrayElements(arg1, lparg1, 0); -#ifndef JNI64 - Gdip_NATIVE_EXIT(env, that, Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2Lorg_eclipse_swt_internal_gdip_RectF_2_FUNC); -#else Gdip_NATIVE_EXIT(env, that, Graphics_1MeasureString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2Lorg_eclipse_swt_internal_gdip_RectF_2_FUNC); -#endif return rc; } #endif #ifndef NO_Graphics_1ReleaseHDC -extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Graphics_1ReleaseHDC)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1); +extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Graphics_1ReleaseHDC)(JNIEnv *env, jclass that, jlong arg0, jlong arg1); JNIEXPORT void JNICALL Gdip_NATIVE(Graphics_1ReleaseHDC) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { Gdip_NATIVE_ENTER(env, that, Graphics_1ReleaseHDC_FUNC); ((Graphics *)arg0)->ReleaseHDC((HDC)arg1); @@ -1459,9 +1255,9 @@ JNIEXPORT void JNICALL Gdip_NATIVE(Graphics_1ReleaseHDC) #endif #ifndef NO_Graphics_1ResetClip -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1ResetClip)(JNIEnv *env, jclass that, jintLong arg0); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1ResetClip)(JNIEnv *env, jclass that, jlong arg0); JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1ResetClip) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, Graphics_1ResetClip_FUNC); @@ -1472,9 +1268,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1ResetClip) #endif #ifndef NO_Graphics_1Restore -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1Restore)(JNIEnv *env, jclass that, jintLong arg0, jint arg1); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1Restore)(JNIEnv *env, jclass that, jlong arg0, jint arg1); JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1Restore) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, Graphics_1Restore_FUNC); @@ -1485,9 +1281,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1Restore) #endif #ifndef NO_Graphics_1Save -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1Save)(JNIEnv *env, jclass that, jintLong arg0); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1Save)(JNIEnv *env, jclass that, jlong arg0); JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1Save) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, Graphics_1Save_FUNC); @@ -1498,9 +1294,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1Save) #endif #ifndef NO_Graphics_1ScaleTransform -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1ScaleTransform)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jint arg3); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1ScaleTransform)(JNIEnv *env, jclass that, jlong arg0, jfloat arg1, jfloat arg2, jint arg3); JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1ScaleTransform) - (JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jint arg3) + (JNIEnv *env, jclass that, jlong arg0, jfloat arg1, jfloat arg2, jint arg3) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, Graphics_1ScaleTransform_FUNC); @@ -1510,114 +1306,66 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1ScaleTransform) } #endif -#if (!defined(NO_Graphics_1SetClip__III) && !defined(JNI64)) || (!defined(NO_Graphics_1SetClip__JJI) && defined(JNI64)) -#ifndef JNI64 -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClip__III)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2); -JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClip__III)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2) -#else -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClip__JJI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2); -JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClip__JJI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_Graphics_1SetClip__JJI +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClip__JJI)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2); +JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClip__JJI) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2) { jint rc = 0; -#ifndef JNI64 - Gdip_NATIVE_ENTER(env, that, Graphics_1SetClip__III_FUNC); -#else Gdip_NATIVE_ENTER(env, that, Graphics_1SetClip__JJI_FUNC); -#endif rc = (jint)((Graphics *)arg0)->SetClip((Region *)arg1, (CombineMode)arg2); -#ifndef JNI64 - Gdip_NATIVE_EXIT(env, that, Graphics_1SetClip__III_FUNC); -#else Gdip_NATIVE_EXIT(env, that, Graphics_1SetClip__JJI_FUNC); -#endif return rc; } #endif -#if (!defined(NO_Graphics_1SetClip__ILorg_eclipse_swt_internal_gdip_Rect_2I) && !defined(JNI64)) || (!defined(NO_Graphics_1SetClip__JLorg_eclipse_swt_internal_gdip_Rect_2I) && defined(JNI64)) -#ifndef JNI64 -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClip__ILorg_eclipse_swt_internal_gdip_Rect_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2); -JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClip__ILorg_eclipse_swt_internal_gdip_Rect_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#else -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClip__JLorg_eclipse_swt_internal_gdip_Rect_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2); -JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClip__JLorg_eclipse_swt_internal_gdip_Rect_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#endif +#ifndef NO_Graphics_1SetClip__JLorg_eclipse_swt_internal_gdip_Rect_2I +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClip__JLorg_eclipse_swt_internal_gdip_Rect_2I)(JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2); +JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClip__JLorg_eclipse_swt_internal_gdip_Rect_2I) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2) { Rect _arg1, *lparg1=NULL; jint rc = 0; -#ifndef JNI64 - Gdip_NATIVE_ENTER(env, that, Graphics_1SetClip__ILorg_eclipse_swt_internal_gdip_Rect_2I_FUNC); -#else Gdip_NATIVE_ENTER(env, that, Graphics_1SetClip__JLorg_eclipse_swt_internal_gdip_Rect_2I_FUNC); -#endif if (arg1) if ((lparg1 = getRectFields(env, arg1, &_arg1)) == NULL) goto fail; rc = (jint)((Graphics *)arg0)->SetClip(*(Rect *)lparg1, (CombineMode)arg2); fail: if (arg1 && lparg1) setRectFields(env, arg1, lparg1); -#ifndef JNI64 - Gdip_NATIVE_EXIT(env, that, Graphics_1SetClip__ILorg_eclipse_swt_internal_gdip_Rect_2I_FUNC); -#else Gdip_NATIVE_EXIT(env, that, Graphics_1SetClip__JLorg_eclipse_swt_internal_gdip_Rect_2I_FUNC); -#endif return rc; } #endif -#if (!defined(NO_Graphics_1SetClipPath__II) && !defined(JNI64)) || (!defined(NO_Graphics_1SetClipPath__JJ) && defined(JNI64)) -#ifndef JNI64 -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClipPath__II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1); -JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClipPath__II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) -#else -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClipPath__JJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1); -JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClipPath__JJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) -#endif +#ifndef NO_Graphics_1SetClipPath__JJ +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClipPath__JJ)(JNIEnv *env, jclass that, jlong arg0, jlong arg1); +JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClipPath__JJ) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { jint rc = 0; -#ifndef JNI64 - Gdip_NATIVE_ENTER(env, that, Graphics_1SetClipPath__II_FUNC); -#else Gdip_NATIVE_ENTER(env, that, Graphics_1SetClipPath__JJ_FUNC); -#endif rc = (jint)((Graphics *)arg0)->SetClip((GraphicsPath *)arg1); -#ifndef JNI64 - Gdip_NATIVE_EXIT(env, that, Graphics_1SetClipPath__II_FUNC); -#else Gdip_NATIVE_EXIT(env, that, Graphics_1SetClipPath__JJ_FUNC); -#endif return rc; } #endif -#if (!defined(NO_Graphics_1SetClipPath__III) && !defined(JNI64)) || (!defined(NO_Graphics_1SetClipPath__JJI) && defined(JNI64)) -#ifndef JNI64 -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClipPath__III)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2); -JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClipPath__III)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2) -#else -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClipPath__JJI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2); -JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClipPath__JJI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_Graphics_1SetClipPath__JJI +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClipPath__JJI)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2); +JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClipPath__JJI) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2) { jint rc = 0; -#ifndef JNI64 - Gdip_NATIVE_ENTER(env, that, Graphics_1SetClipPath__III_FUNC); -#else Gdip_NATIVE_ENTER(env, that, Graphics_1SetClipPath__JJI_FUNC); -#endif rc = (jint)((Graphics *)arg0)->SetClip((GraphicsPath *)arg1, (CombineMode)arg2); -#ifndef JNI64 - Gdip_NATIVE_EXIT(env, that, Graphics_1SetClipPath__III_FUNC); -#else Gdip_NATIVE_EXIT(env, that, Graphics_1SetClipPath__JJI_FUNC); -#endif return rc; } #endif #ifndef NO_Graphics_1SetCompositingQuality -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetCompositingQuality)(JNIEnv *env, jclass that, jintLong arg0, jint arg1); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetCompositingQuality)(JNIEnv *env, jclass that, jlong arg0, jint arg1); JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetCompositingQuality) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, Graphics_1SetCompositingQuality_FUNC); @@ -1628,9 +1376,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetCompositingQuality) #endif #ifndef NO_Graphics_1SetInterpolationMode -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetInterpolationMode)(JNIEnv *env, jclass that, jintLong arg0, jint arg1); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetInterpolationMode)(JNIEnv *env, jclass that, jlong arg0, jint arg1); JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetInterpolationMode) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, Graphics_1SetInterpolationMode_FUNC); @@ -1641,9 +1389,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetInterpolationMode) #endif #ifndef NO_Graphics_1SetPageUnit -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetPageUnit)(JNIEnv *env, jclass that, jintLong arg0, jint arg1); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetPageUnit)(JNIEnv *env, jclass that, jlong arg0, jint arg1); JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetPageUnit) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, Graphics_1SetPageUnit_FUNC); @@ -1654,9 +1402,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetPageUnit) #endif #ifndef NO_Graphics_1SetPixelOffsetMode -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetPixelOffsetMode)(JNIEnv *env, jclass that, jintLong arg0, jint arg1); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetPixelOffsetMode)(JNIEnv *env, jclass that, jlong arg0, jint arg1); JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetPixelOffsetMode) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, Graphics_1SetPixelOffsetMode_FUNC); @@ -1667,9 +1415,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetPixelOffsetMode) #endif #ifndef NO_Graphics_1SetSmoothingMode -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetSmoothingMode)(JNIEnv *env, jclass that, jintLong arg0, jint arg1); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetSmoothingMode)(JNIEnv *env, jclass that, jlong arg0, jint arg1); JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetSmoothingMode) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, Graphics_1SetSmoothingMode_FUNC); @@ -1680,9 +1428,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetSmoothingMode) #endif #ifndef NO_Graphics_1SetTextRenderingHint -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetTextRenderingHint)(JNIEnv *env, jclass that, jintLong arg0, jint arg1); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetTextRenderingHint)(JNIEnv *env, jclass that, jlong arg0, jint arg1); JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetTextRenderingHint) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, Graphics_1SetTextRenderingHint_FUNC); @@ -1693,9 +1441,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetTextRenderingHint) #endif #ifndef NO_Graphics_1SetTransform -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetTransform)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetTransform)(JNIEnv *env, jclass that, jlong arg0, jlong arg1); JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetTransform) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, Graphics_1SetTransform_FUNC); @@ -1706,9 +1454,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetTransform) #endif #ifndef NO_Graphics_1TranslateTransform -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1TranslateTransform)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jint arg3); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1TranslateTransform)(JNIEnv *env, jclass that, jlong arg0, jfloat arg1, jfloat arg2, jint arg3); JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1TranslateTransform) - (JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jint arg3) + (JNIEnv *env, jclass that, jlong arg0, jfloat arg1, jfloat arg2, jint arg3) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, Graphics_1TranslateTransform_FUNC); @@ -1719,9 +1467,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1TranslateTransform) #endif #ifndef NO_Graphics_1delete -extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Graphics_1delete)(JNIEnv *env, jclass that, jintLong arg0); +extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Graphics_1delete)(JNIEnv *env, jclass that, jlong arg0); JNIEXPORT void JNICALL Gdip_NATIVE(Graphics_1delete) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { Gdip_NATIVE_ENTER(env, that, Graphics_1delete_FUNC); delete (Graphics *)arg0; @@ -1730,22 +1478,22 @@ JNIEXPORT void JNICALL Gdip_NATIVE(Graphics_1delete) #endif #ifndef NO_Graphics_1new -extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Graphics_1new)(JNIEnv *env, jclass that, jintLong arg0); -JNIEXPORT jintLong JNICALL Gdip_NATIVE(Graphics_1new) - (JNIEnv *env, jclass that, jintLong arg0) +extern "C" JNIEXPORT jlong JNICALL Gdip_NATIVE(Graphics_1new)(JNIEnv *env, jclass that, jlong arg0); +JNIEXPORT jlong JNICALL Gdip_NATIVE(Graphics_1new) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; Gdip_NATIVE_ENTER(env, that, Graphics_1new_FUNC); - rc = (jintLong)new Graphics((HDC)arg0); + rc = (jlong)new Graphics((HDC)arg0); Gdip_NATIVE_EXIT(env, that, Graphics_1new_FUNC); return rc; } #endif #ifndef NO_HatchBrush_1delete -extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(HatchBrush_1delete)(JNIEnv *env, jclass that, jintLong arg0); +extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(HatchBrush_1delete)(JNIEnv *env, jclass that, jlong arg0); JNIEXPORT void JNICALL Gdip_NATIVE(HatchBrush_1delete) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { Gdip_NATIVE_ENTER(env, that, HatchBrush_1delete_FUNC); delete (HatchBrush *)arg0; @@ -1754,22 +1502,22 @@ JNIEXPORT void JNICALL Gdip_NATIVE(HatchBrush_1delete) #endif #ifndef NO_HatchBrush_1new -extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(HatchBrush_1new)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2); -JNIEXPORT jintLong JNICALL Gdip_NATIVE(HatchBrush_1new) +extern "C" JNIEXPORT jlong JNICALL Gdip_NATIVE(HatchBrush_1new)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2); +JNIEXPORT jlong JNICALL Gdip_NATIVE(HatchBrush_1new) (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2) { - jintLong rc = 0; + jlong rc = 0; Gdip_NATIVE_ENTER(env, that, HatchBrush_1new_FUNC); - rc = (jintLong)new HatchBrush((HatchStyle)arg0, (Color)arg1, (Color)arg2); + rc = (jlong)new HatchBrush((HatchStyle)arg0, (Color)arg1, (Color)arg2); Gdip_NATIVE_EXIT(env, that, HatchBrush_1new_FUNC); return rc; } #endif #ifndef NO_ImageAttributes_1SetColorMatrix -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(ImageAttributes_1SetColorMatrix)(JNIEnv *env, jclass that, jintLong arg0, jfloatArray arg1, jint arg2, jint arg3); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(ImageAttributes_1SetColorMatrix)(JNIEnv *env, jclass that, jlong arg0, jfloatArray arg1, jint arg2, jint arg3); JNIEXPORT jint JNICALL Gdip_NATIVE(ImageAttributes_1SetColorMatrix) - (JNIEnv *env, jclass that, jintLong arg0, jfloatArray arg1, jint arg2, jint arg3) + (JNIEnv *env, jclass that, jlong arg0, jfloatArray arg1, jint arg2, jint arg3) { jfloat *lparg1=NULL; jint rc = 0; @@ -1784,9 +1532,9 @@ fail: #endif #ifndef NO_ImageAttributes_1SetWrapMode -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(ImageAttributes_1SetWrapMode)(JNIEnv *env, jclass that, jintLong arg0, jint arg1); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(ImageAttributes_1SetWrapMode)(JNIEnv *env, jclass that, jlong arg0, jint arg1); JNIEXPORT jint JNICALL Gdip_NATIVE(ImageAttributes_1SetWrapMode) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, ImageAttributes_1SetWrapMode_FUNC); @@ -1797,9 +1545,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(ImageAttributes_1SetWrapMode) #endif #ifndef NO_ImageAttributes_1delete -extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(ImageAttributes_1delete)(JNIEnv *env, jclass that, jintLong arg0); +extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(ImageAttributes_1delete)(JNIEnv *env, jclass that, jlong arg0); JNIEXPORT void JNICALL Gdip_NATIVE(ImageAttributes_1delete) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { Gdip_NATIVE_ENTER(env, that, ImageAttributes_1delete_FUNC); delete (ImageAttributes *)arg0; @@ -1808,22 +1556,22 @@ JNIEXPORT void JNICALL Gdip_NATIVE(ImageAttributes_1delete) #endif #ifndef NO_ImageAttributes_1new -extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(ImageAttributes_1new)(JNIEnv *env, jclass that); -JNIEXPORT jintLong JNICALL Gdip_NATIVE(ImageAttributes_1new) +extern "C" JNIEXPORT jlong JNICALL Gdip_NATIVE(ImageAttributes_1new)(JNIEnv *env, jclass that); +JNIEXPORT jlong JNICALL Gdip_NATIVE(ImageAttributes_1new) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; Gdip_NATIVE_ENTER(env, that, ImageAttributes_1new_FUNC); - rc = (jintLong)new ImageAttributes(); + rc = (jlong)new ImageAttributes(); Gdip_NATIVE_EXIT(env, that, ImageAttributes_1new_FUNC); return rc; } #endif #ifndef NO_Image_1GetHeight -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetHeight)(JNIEnv *env, jclass that, jintLong arg0); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetHeight)(JNIEnv *env, jclass that, jlong arg0); JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetHeight) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, Image_1GetHeight_FUNC); @@ -1834,9 +1582,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetHeight) #endif #ifndef NO_Image_1GetLastStatus -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetLastStatus)(JNIEnv *env, jclass that, jintLong arg0); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetLastStatus)(JNIEnv *env, jclass that, jlong arg0); JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetLastStatus) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, Image_1GetLastStatus_FUNC); @@ -1847,9 +1595,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetLastStatus) #endif #ifndef NO_Image_1GetPalette -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetPalette)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetPalette)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2); JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetPalette) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, Image_1GetPalette_FUNC); @@ -1860,9 +1608,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetPalette) #endif #ifndef NO_Image_1GetPaletteSize -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetPaletteSize)(JNIEnv *env, jclass that, jintLong arg0); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetPaletteSize)(JNIEnv *env, jclass that, jlong arg0); JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetPaletteSize) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, Image_1GetPaletteSize_FUNC); @@ -1873,9 +1621,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetPaletteSize) #endif #ifndef NO_Image_1GetPixelFormat -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetPixelFormat)(JNIEnv *env, jclass that, jintLong arg0); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetPixelFormat)(JNIEnv *env, jclass that, jlong arg0); JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetPixelFormat) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, Image_1GetPixelFormat_FUNC); @@ -1886,9 +1634,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetPixelFormat) #endif #ifndef NO_Image_1GetWidth -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetWidth)(JNIEnv *env, jclass that, jintLong arg0); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetWidth)(JNIEnv *env, jclass that, jlong arg0); JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetWidth) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, Image_1GetWidth_FUNC); @@ -1899,9 +1647,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetWidth) #endif #ifndef NO_LinearGradientBrush_1ResetTransform -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1ResetTransform)(JNIEnv *env, jclass that, jintLong arg0); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1ResetTransform)(JNIEnv *env, jclass that, jlong arg0); JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1ResetTransform) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, LinearGradientBrush_1ResetTransform_FUNC); @@ -1912,9 +1660,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1ResetTransform) #endif #ifndef NO_LinearGradientBrush_1ScaleTransform -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1ScaleTransform)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jint arg3); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1ScaleTransform)(JNIEnv *env, jclass that, jlong arg0, jfloat arg1, jfloat arg2, jint arg3); JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1ScaleTransform) - (JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jint arg3) + (JNIEnv *env, jclass that, jlong arg0, jfloat arg1, jfloat arg2, jint arg3) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, LinearGradientBrush_1ScaleTransform_FUNC); @@ -1925,9 +1673,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1ScaleTransform) #endif #ifndef NO_LinearGradientBrush_1SetInterpolationColors -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1SetInterpolationColors)(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jfloatArray arg2, jint arg3); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1SetInterpolationColors)(JNIEnv *env, jclass that, jlong arg0, jintArray arg1, jfloatArray arg2, jint arg3); JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1SetInterpolationColors) - (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jfloatArray arg2, jint arg3) + (JNIEnv *env, jclass that, jlong arg0, jintArray arg1, jfloatArray arg2, jint arg3) { jint *lparg1=NULL; jfloat *lparg2=NULL; @@ -1945,9 +1693,9 @@ fail: #endif #ifndef NO_LinearGradientBrush_1SetWrapMode -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1SetWrapMode)(JNIEnv *env, jclass that, jintLong arg0, jint arg1); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1SetWrapMode)(JNIEnv *env, jclass that, jlong arg0, jint arg1); JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1SetWrapMode) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, LinearGradientBrush_1SetWrapMode_FUNC); @@ -1958,9 +1706,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1SetWrapMode) #endif #ifndef NO_LinearGradientBrush_1TranslateTransform -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1TranslateTransform)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jint arg3); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1TranslateTransform)(JNIEnv *env, jclass that, jlong arg0, jfloat arg1, jfloat arg2, jint arg3); JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1TranslateTransform) - (JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jint arg3) + (JNIEnv *env, jclass that, jlong arg0, jfloat arg1, jfloat arg2, jint arg3) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, LinearGradientBrush_1TranslateTransform_FUNC); @@ -1971,9 +1719,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1TranslateTransform) #endif #ifndef NO_LinearGradientBrush_1delete -extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(LinearGradientBrush_1delete)(JNIEnv *env, jclass that, jintLong arg0); +extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(LinearGradientBrush_1delete)(JNIEnv *env, jclass that, jlong arg0); JNIEXPORT void JNICALL Gdip_NATIVE(LinearGradientBrush_1delete) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { Gdip_NATIVE_ENTER(env, that, LinearGradientBrush_1delete_FUNC); delete (LinearGradientBrush *)arg0; @@ -1982,17 +1730,17 @@ JNIEXPORT void JNICALL Gdip_NATIVE(LinearGradientBrush_1delete) #endif #ifndef NO_LinearGradientBrush_1new -extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(LinearGradientBrush_1new)(JNIEnv *env, jclass that, jobject arg0, jobject arg1, jint arg2, jint arg3); -JNIEXPORT jintLong JNICALL Gdip_NATIVE(LinearGradientBrush_1new) +extern "C" JNIEXPORT jlong JNICALL Gdip_NATIVE(LinearGradientBrush_1new)(JNIEnv *env, jclass that, jobject arg0, jobject arg1, jint arg2, jint arg3); +JNIEXPORT jlong JNICALL Gdip_NATIVE(LinearGradientBrush_1new) (JNIEnv *env, jclass that, jobject arg0, jobject arg1, jint arg2, jint arg3) { PointF _arg0, *lparg0=NULL; PointF _arg1, *lparg1=NULL; - jintLong rc = 0; + jlong rc = 0; Gdip_NATIVE_ENTER(env, that, LinearGradientBrush_1new_FUNC); if (arg0) if ((lparg0 = getPointFFields(env, arg0, &_arg0)) == NULL) goto fail; if (arg1) if ((lparg1 = getPointFFields(env, arg1, &_arg1)) == NULL) goto fail; - rc = (jintLong)new LinearGradientBrush(*lparg0, *lparg1, (Color)arg2, (Color)arg3); + rc = (jlong)new LinearGradientBrush(*lparg0, *lparg1, (Color)arg2, (Color)arg3); fail: if (arg1 && lparg1) setPointFFields(env, arg1, lparg1); if (arg0 && lparg0) setPointFFields(env, arg0, lparg0); @@ -2002,9 +1750,9 @@ fail: #endif #ifndef NO_Matrix_1GetElements -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1GetElements)(JNIEnv *env, jclass that, jintLong arg0, jfloatArray arg1); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1GetElements)(JNIEnv *env, jclass that, jlong arg0, jfloatArray arg1); JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1GetElements) - (JNIEnv *env, jclass that, jintLong arg0, jfloatArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jfloatArray arg1) { jfloat *lparg1=NULL; jint rc = 0; @@ -2019,9 +1767,9 @@ fail: #endif #ifndef NO_Matrix_1Invert -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Invert)(JNIEnv *env, jclass that, jintLong arg0); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Invert)(JNIEnv *env, jclass that, jlong arg0); JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Invert) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, Matrix_1Invert_FUNC); @@ -2032,9 +1780,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Invert) #endif #ifndef NO_Matrix_1IsIdentity -extern "C" JNIEXPORT jboolean JNICALL Gdip_NATIVE(Matrix_1IsIdentity)(JNIEnv *env, jclass that, jintLong arg0); +extern "C" JNIEXPORT jboolean JNICALL Gdip_NATIVE(Matrix_1IsIdentity)(JNIEnv *env, jclass that, jlong arg0); JNIEXPORT jboolean JNICALL Gdip_NATIVE(Matrix_1IsIdentity) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; Gdip_NATIVE_ENTER(env, that, Matrix_1IsIdentity_FUNC); @@ -2045,9 +1793,9 @@ JNIEXPORT jboolean JNICALL Gdip_NATIVE(Matrix_1IsIdentity) #endif #ifndef NO_Matrix_1Multiply -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Multiply)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Multiply)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2); JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Multiply) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, Matrix_1Multiply_FUNC); @@ -2058,9 +1806,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Multiply) #endif #ifndef NO_Matrix_1Rotate -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Rotate)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jint arg2); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Rotate)(JNIEnv *env, jclass that, jlong arg0, jfloat arg1, jint arg2); JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Rotate) - (JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jfloat arg1, jint arg2) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, Matrix_1Rotate_FUNC); @@ -2071,9 +1819,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Rotate) #endif #ifndef NO_Matrix_1Scale -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Scale)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jint arg3); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Scale)(JNIEnv *env, jclass that, jlong arg0, jfloat arg1, jfloat arg2, jint arg3); JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Scale) - (JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jint arg3) + (JNIEnv *env, jclass that, jlong arg0, jfloat arg1, jfloat arg2, jint arg3) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, Matrix_1Scale_FUNC); @@ -2084,9 +1832,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Scale) #endif #ifndef NO_Matrix_1SetElements -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1SetElements)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5, jfloat arg6); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1SetElements)(JNIEnv *env, jclass that, jlong arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5, jfloat arg6); JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1SetElements) - (JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5, jfloat arg6) + (JNIEnv *env, jclass that, jlong arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5, jfloat arg6) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, Matrix_1SetElements_FUNC); @@ -2097,9 +1845,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1SetElements) #endif #ifndef NO_Matrix_1Shear -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Shear)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jint arg3); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Shear)(JNIEnv *env, jclass that, jlong arg0, jfloat arg1, jfloat arg2, jint arg3); JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Shear) - (JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jint arg3) + (JNIEnv *env, jclass that, jlong arg0, jfloat arg1, jfloat arg2, jint arg3) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, Matrix_1Shear_FUNC); @@ -2109,68 +1857,44 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Shear) } #endif -#if (!defined(NO_Matrix_1TransformPoints__ILorg_eclipse_swt_internal_gdip_PointF_2I) && !defined(JNI64)) || (!defined(NO_Matrix_1TransformPoints__JLorg_eclipse_swt_internal_gdip_PointF_2I) && defined(JNI64)) -#ifndef JNI64 -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1TransformPoints__ILorg_eclipse_swt_internal_gdip_PointF_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2); -JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1TransformPoints__ILorg_eclipse_swt_internal_gdip_PointF_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#else -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1TransformPoints__JLorg_eclipse_swt_internal_gdip_PointF_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2); -JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1TransformPoints__JLorg_eclipse_swt_internal_gdip_PointF_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#endif +#ifndef NO_Matrix_1TransformPoints__JLorg_eclipse_swt_internal_gdip_PointF_2I +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1TransformPoints__JLorg_eclipse_swt_internal_gdip_PointF_2I)(JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2); +JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1TransformPoints__JLorg_eclipse_swt_internal_gdip_PointF_2I) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2) { PointF _arg1, *lparg1=NULL; jint rc = 0; -#ifndef JNI64 - Gdip_NATIVE_ENTER(env, that, Matrix_1TransformPoints__ILorg_eclipse_swt_internal_gdip_PointF_2I_FUNC); -#else Gdip_NATIVE_ENTER(env, that, Matrix_1TransformPoints__JLorg_eclipse_swt_internal_gdip_PointF_2I_FUNC); -#endif if (arg1) if ((lparg1 = getPointFFields(env, arg1, &_arg1)) == NULL) goto fail; rc = (jint)((Matrix *)arg0)->TransformPoints(lparg1, arg2); fail: if (arg1 && lparg1) setPointFFields(env, arg1, lparg1); -#ifndef JNI64 - Gdip_NATIVE_EXIT(env, that, Matrix_1TransformPoints__ILorg_eclipse_swt_internal_gdip_PointF_2I_FUNC); -#else Gdip_NATIVE_EXIT(env, that, Matrix_1TransformPoints__JLorg_eclipse_swt_internal_gdip_PointF_2I_FUNC); -#endif return rc; } #endif -#if (!defined(NO_Matrix_1TransformPoints__I_3FI) && !defined(JNI64)) || (!defined(NO_Matrix_1TransformPoints__J_3FI) && defined(JNI64)) -#ifndef JNI64 -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1TransformPoints__I_3FI)(JNIEnv *env, jclass that, jintLong arg0, jfloatArray arg1, jint arg2); -JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1TransformPoints__I_3FI)(JNIEnv *env, jclass that, jintLong arg0, jfloatArray arg1, jint arg2) -#else -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1TransformPoints__J_3FI)(JNIEnv *env, jclass that, jintLong arg0, jfloatArray arg1, jint arg2); -JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1TransformPoints__J_3FI)(JNIEnv *env, jclass that, jintLong arg0, jfloatArray arg1, jint arg2) -#endif +#ifndef NO_Matrix_1TransformPoints__J_3FI +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1TransformPoints__J_3FI)(JNIEnv *env, jclass that, jlong arg0, jfloatArray arg1, jint arg2); +JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1TransformPoints__J_3FI) + (JNIEnv *env, jclass that, jlong arg0, jfloatArray arg1, jint arg2) { jfloat *lparg1=NULL; jint rc = 0; -#ifndef JNI64 - Gdip_NATIVE_ENTER(env, that, Matrix_1TransformPoints__I_3FI_FUNC); -#else Gdip_NATIVE_ENTER(env, that, Matrix_1TransformPoints__J_3FI_FUNC); -#endif if (arg1) if ((lparg1 = env->GetFloatArrayElements(arg1, NULL)) == NULL) goto fail; rc = (jint)((Matrix *)arg0)->TransformPoints((PointF *)lparg1, arg2); fail: if (arg1 && lparg1) env->ReleaseFloatArrayElements(arg1, lparg1, 0); -#ifndef JNI64 - Gdip_NATIVE_EXIT(env, that, Matrix_1TransformPoints__I_3FI_FUNC); -#else Gdip_NATIVE_EXIT(env, that, Matrix_1TransformPoints__J_3FI_FUNC); -#endif return rc; } #endif #ifndef NO_Matrix_1TransformVectors -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1TransformVectors)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1TransformVectors)(JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2); JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1TransformVectors) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2) { PointF _arg1, *lparg1=NULL; jint rc = 0; @@ -2185,9 +1909,9 @@ fail: #endif #ifndef NO_Matrix_1Translate -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Translate)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jint arg3); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Translate)(JNIEnv *env, jclass that, jlong arg0, jfloat arg1, jfloat arg2, jint arg3); JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Translate) - (JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jint arg3) + (JNIEnv *env, jclass that, jlong arg0, jfloat arg1, jfloat arg2, jint arg3) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, Matrix_1Translate_FUNC); @@ -2198,9 +1922,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Translate) #endif #ifndef NO_Matrix_1delete -extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Matrix_1delete)(JNIEnv *env, jclass that, jintLong arg0); +extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Matrix_1delete)(JNIEnv *env, jclass that, jlong arg0); JNIEXPORT void JNICALL Gdip_NATIVE(Matrix_1delete) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { Gdip_NATIVE_ENTER(env, that, Matrix_1delete_FUNC); delete (Matrix *)arg0; @@ -2209,72 +1933,48 @@ JNIEXPORT void JNICALL Gdip_NATIVE(Matrix_1delete) #endif #ifndef NO_Matrix_1new -extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Matrix_1new)(JNIEnv *env, jclass that, jfloat arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5); -JNIEXPORT jintLong JNICALL Gdip_NATIVE(Matrix_1new) +extern "C" JNIEXPORT jlong JNICALL Gdip_NATIVE(Matrix_1new)(JNIEnv *env, jclass that, jfloat arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5); +JNIEXPORT jlong JNICALL Gdip_NATIVE(Matrix_1new) (JNIEnv *env, jclass that, jfloat arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5) { - jintLong rc = 0; + jlong rc = 0; Gdip_NATIVE_ENTER(env, that, Matrix_1new_FUNC); - rc = (jintLong)new Matrix((REAL)arg0, (REAL)arg1, (REAL)arg2, (REAL)arg3, (REAL)arg4, (REAL)arg5); + rc = (jlong)new Matrix((REAL)arg0, (REAL)arg1, (REAL)arg2, (REAL)arg3, (REAL)arg4, (REAL)arg5); Gdip_NATIVE_EXIT(env, that, Matrix_1new_FUNC); return rc; } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2J) && defined(JNI64)) -#ifndef JNI64 -extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1); -JNIEXPORT void JNICALL Gdip_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1) -#else -extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1); -JNIEXPORT void JNICALL Gdip_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2J +extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2J)(JNIEnv *env, jclass that, jobject arg0, jlong arg1); +JNIEXPORT void JNICALL Gdip_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2J) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1) { -#ifndef JNI64 - Gdip_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2I_FUNC); -#else Gdip_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2J_FUNC); -#endif if (arg0) setBitmapDataFields(env, arg0, (BitmapData *)arg1); -#ifndef JNI64 - Gdip_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2I_FUNC); -#else Gdip_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2J_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_gdip_ColorPalette_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_gdip_ColorPalette_2JI) && defined(JNI64)) -#ifndef JNI64 -extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_gdip_ColorPalette_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2); -JNIEXPORT void JNICALL Gdip_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_gdip_ColorPalette_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_gdip_ColorPalette_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2); -JNIEXPORT void JNICALL Gdip_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_gdip_ColorPalette_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_gdip_ColorPalette_2JI +extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_gdip_ColorPalette_2JI)(JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2); +JNIEXPORT void JNICALL Gdip_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_gdip_ColorPalette_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { ColorPalette _arg0, *lparg0=NULL; -#ifndef JNI64 - Gdip_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_gdip_ColorPalette_2II_FUNC); -#else Gdip_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_gdip_ColorPalette_2JI_FUNC); -#endif if (arg0) if ((lparg0 = getColorPaletteFields(env, arg0, &_arg0)) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID*)arg1, arg2); fail: if (arg0 && lparg0) setColorPaletteFields(env, arg0, lparg0); -#ifndef JNI64 - Gdip_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_gdip_ColorPalette_2II_FUNC); -#else Gdip_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_gdip_ColorPalette_2JI_FUNC); -#endif } #endif #ifndef NO_PathGradientBrush_1SetCenterColor -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetCenterColor)(JNIEnv *env, jclass that, jintLong arg0, jint arg1); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetCenterColor)(JNIEnv *env, jclass that, jlong arg0, jint arg1); JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetCenterColor) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, PathGradientBrush_1SetCenterColor_FUNC); @@ -2285,9 +1985,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetCenterColor) #endif #ifndef NO_PathGradientBrush_1SetCenterPoint -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetCenterPoint)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetCenterPoint)(JNIEnv *env, jclass that, jlong arg0, jobject arg1); JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetCenterPoint) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { PointF _arg1, *lparg1=NULL; jint rc = 0; @@ -2302,9 +2002,9 @@ fail: #endif #ifndef NO_PathGradientBrush_1SetGraphicsPath -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetGraphicsPath)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetGraphicsPath)(JNIEnv *env, jclass that, jlong arg0, jlong arg1); JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetGraphicsPath) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, PathGradientBrush_1SetGraphicsPath_FUNC); @@ -2315,9 +2015,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetGraphicsPath) #endif #ifndef NO_PathGradientBrush_1SetInterpolationColors -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetInterpolationColors)(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jfloatArray arg2, jint arg3); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetInterpolationColors)(JNIEnv *env, jclass that, jlong arg0, jintArray arg1, jfloatArray arg2, jint arg3); JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetInterpolationColors) - (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jfloatArray arg2, jint arg3) + (JNIEnv *env, jclass that, jlong arg0, jintArray arg1, jfloatArray arg2, jint arg3) { jint *lparg1=NULL; jfloat *lparg2=NULL; @@ -2335,9 +2035,9 @@ fail: #endif #ifndef NO_PathGradientBrush_1SetSurroundColors -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetSurroundColors)(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetSurroundColors)(JNIEnv *env, jclass that, jlong arg0, jintArray arg1, jintArray arg2); JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetSurroundColors) - (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2) + (JNIEnv *env, jclass that, jlong arg0, jintArray arg1, jintArray arg2) { jint *lparg1=NULL; jint *lparg2=NULL; @@ -2355,9 +2055,9 @@ fail: #endif #ifndef NO_PathGradientBrush_1SetWrapMode -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetWrapMode)(JNIEnv *env, jclass that, jintLong arg0, jint arg1); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetWrapMode)(JNIEnv *env, jclass that, jlong arg0, jint arg1); JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetWrapMode) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, PathGradientBrush_1SetWrapMode_FUNC); @@ -2368,9 +2068,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetWrapMode) #endif #ifndef NO_PathGradientBrush_1delete -extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(PathGradientBrush_1delete)(JNIEnv *env, jclass that, jintLong arg0); +extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(PathGradientBrush_1delete)(JNIEnv *env, jclass that, jlong arg0); JNIEXPORT void JNICALL Gdip_NATIVE(PathGradientBrush_1delete) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { Gdip_NATIVE_ENTER(env, that, PathGradientBrush_1delete_FUNC); delete (PathGradientBrush *)arg0; @@ -2379,35 +2079,35 @@ JNIEXPORT void JNICALL Gdip_NATIVE(PathGradientBrush_1delete) #endif #ifndef NO_PathGradientBrush_1new -extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(PathGradientBrush_1new)(JNIEnv *env, jclass that, jintLong arg0); -JNIEXPORT jintLong JNICALL Gdip_NATIVE(PathGradientBrush_1new) - (JNIEnv *env, jclass that, jintLong arg0) +extern "C" JNIEXPORT jlong JNICALL Gdip_NATIVE(PathGradientBrush_1new)(JNIEnv *env, jclass that, jlong arg0); +JNIEXPORT jlong JNICALL Gdip_NATIVE(PathGradientBrush_1new) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; Gdip_NATIVE_ENTER(env, that, PathGradientBrush_1new_FUNC); - rc = (jintLong)new PathGradientBrush((GraphicsPath *)arg0); + rc = (jlong)new PathGradientBrush((GraphicsPath *)arg0); Gdip_NATIVE_EXIT(env, that, PathGradientBrush_1new_FUNC); return rc; } #endif #ifndef NO_Pen_1GetBrush -extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Pen_1GetBrush)(JNIEnv *env, jclass that, jintLong arg0); -JNIEXPORT jintLong JNICALL Gdip_NATIVE(Pen_1GetBrush) - (JNIEnv *env, jclass that, jintLong arg0) +extern "C" JNIEXPORT jlong JNICALL Gdip_NATIVE(Pen_1GetBrush)(JNIEnv *env, jclass that, jlong arg0); +JNIEXPORT jlong JNICALL Gdip_NATIVE(Pen_1GetBrush) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; Gdip_NATIVE_ENTER(env, that, Pen_1GetBrush_FUNC); - rc = (jintLong)((Pen *)arg0)->GetBrush(); + rc = (jlong)((Pen *)arg0)->GetBrush(); Gdip_NATIVE_EXIT(env, that, Pen_1GetBrush_FUNC); return rc; } #endif #ifndef NO_Pen_1SetBrush -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetBrush)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetBrush)(JNIEnv *env, jclass that, jlong arg0, jlong arg1); JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetBrush) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, Pen_1SetBrush_FUNC); @@ -2418,9 +2118,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetBrush) #endif #ifndef NO_Pen_1SetDashOffset -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetDashOffset)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetDashOffset)(JNIEnv *env, jclass that, jlong arg0, jfloat arg1); JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetDashOffset) - (JNIEnv *env, jclass that, jintLong arg0, jfloat arg1) + (JNIEnv *env, jclass that, jlong arg0, jfloat arg1) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, Pen_1SetDashOffset_FUNC); @@ -2431,9 +2131,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetDashOffset) #endif #ifndef NO_Pen_1SetDashPattern -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetDashPattern)(JNIEnv *env, jclass that, jintLong arg0, jfloatArray arg1, jint arg2); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetDashPattern)(JNIEnv *env, jclass that, jlong arg0, jfloatArray arg1, jint arg2); JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetDashPattern) - (JNIEnv *env, jclass that, jintLong arg0, jfloatArray arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jfloatArray arg1, jint arg2) { jfloat *lparg1=NULL; jint rc = 0; @@ -2448,9 +2148,9 @@ fail: #endif #ifndef NO_Pen_1SetDashStyle -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetDashStyle)(JNIEnv *env, jclass that, jintLong arg0, jint arg1); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetDashStyle)(JNIEnv *env, jclass that, jlong arg0, jint arg1); JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetDashStyle) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, Pen_1SetDashStyle_FUNC); @@ -2461,9 +2161,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetDashStyle) #endif #ifndef NO_Pen_1SetLineCap -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetLineCap)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetLineCap)(JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3); JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetLineCap) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, Pen_1SetLineCap_FUNC); @@ -2474,9 +2174,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetLineCap) #endif #ifndef NO_Pen_1SetLineJoin -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetLineJoin)(JNIEnv *env, jclass that, jintLong arg0, jint arg1); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetLineJoin)(JNIEnv *env, jclass that, jlong arg0, jint arg1); JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetLineJoin) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, Pen_1SetLineJoin_FUNC); @@ -2487,9 +2187,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetLineJoin) #endif #ifndef NO_Pen_1SetMiterLimit -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetMiterLimit)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetMiterLimit)(JNIEnv *env, jclass that, jlong arg0, jfloat arg1); JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetMiterLimit) - (JNIEnv *env, jclass that, jintLong arg0, jfloat arg1) + (JNIEnv *env, jclass that, jlong arg0, jfloat arg1) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, Pen_1SetMiterLimit_FUNC); @@ -2500,9 +2200,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetMiterLimit) #endif #ifndef NO_Pen_1SetWidth -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetWidth)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetWidth)(JNIEnv *env, jclass that, jlong arg0, jfloat arg1); JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetWidth) - (JNIEnv *env, jclass that, jintLong arg0, jfloat arg1) + (JNIEnv *env, jclass that, jlong arg0, jfloat arg1) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, Pen_1SetWidth_FUNC); @@ -2513,9 +2213,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetWidth) #endif #ifndef NO_Pen_1delete -extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Pen_1delete)(JNIEnv *env, jclass that, jintLong arg0); +extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Pen_1delete)(JNIEnv *env, jclass that, jlong arg0); JNIEXPORT void JNICALL Gdip_NATIVE(Pen_1delete) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { Gdip_NATIVE_ENTER(env, that, Pen_1delete_FUNC); delete (Pen *)arg0; @@ -2524,22 +2224,22 @@ JNIEXPORT void JNICALL Gdip_NATIVE(Pen_1delete) #endif #ifndef NO_Pen_1new -extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Pen_1new)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1); -JNIEXPORT jintLong JNICALL Gdip_NATIVE(Pen_1new) - (JNIEnv *env, jclass that, jintLong arg0, jfloat arg1) +extern "C" JNIEXPORT jlong JNICALL Gdip_NATIVE(Pen_1new)(JNIEnv *env, jclass that, jlong arg0, jfloat arg1); +JNIEXPORT jlong JNICALL Gdip_NATIVE(Pen_1new) + (JNIEnv *env, jclass that, jlong arg0, jfloat arg1) { - jintLong rc = 0; + jlong rc = 0; Gdip_NATIVE_ENTER(env, that, Pen_1new_FUNC); - rc = (jintLong)new Pen((Brush *)arg0, (REAL)arg1); + rc = (jlong)new Pen((Brush *)arg0, (REAL)arg1); Gdip_NATIVE_EXIT(env, that, Pen_1new_FUNC); return rc; } #endif #ifndef NO_Point_1delete -extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Point_1delete)(JNIEnv *env, jclass that, jintLong arg0); +extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Point_1delete)(JNIEnv *env, jclass that, jlong arg0); JNIEXPORT void JNICALL Gdip_NATIVE(Point_1delete) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { Gdip_NATIVE_ENTER(env, that, Point_1delete_FUNC); delete (Point *)arg0; @@ -2548,22 +2248,22 @@ JNIEXPORT void JNICALL Gdip_NATIVE(Point_1delete) #endif #ifndef NO_Point_1new -extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Point_1new)(JNIEnv *env, jclass that, jint arg0, jint arg1); -JNIEXPORT jintLong JNICALL Gdip_NATIVE(Point_1new) +extern "C" JNIEXPORT jlong JNICALL Gdip_NATIVE(Point_1new)(JNIEnv *env, jclass that, jint arg0, jint arg1); +JNIEXPORT jlong JNICALL Gdip_NATIVE(Point_1new) (JNIEnv *env, jclass that, jint arg0, jint arg1) { - jintLong rc = 0; + jlong rc = 0; Gdip_NATIVE_ENTER(env, that, Point_1new_FUNC); - rc = (jintLong)new Point(arg0, arg1); + rc = (jlong)new Point(arg0, arg1); Gdip_NATIVE_EXIT(env, that, Point_1new_FUNC); return rc; } #endif #ifndef NO_PrivateFontCollection_1AddFontFile -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(PrivateFontCollection_1AddFontFile)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(PrivateFontCollection_1AddFontFile)(JNIEnv *env, jclass that, jlong arg0, jcharArray arg1); JNIEXPORT jint JNICALL Gdip_NATIVE(PrivateFontCollection_1AddFontFile) - (JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jcharArray arg1) { jchar *lparg1=NULL; jint rc = 0; @@ -2578,9 +2278,9 @@ fail: #endif #ifndef NO_PrivateFontCollection_1delete -extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(PrivateFontCollection_1delete)(JNIEnv *env, jclass that, jintLong arg0); +extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(PrivateFontCollection_1delete)(JNIEnv *env, jclass that, jlong arg0); JNIEXPORT void JNICALL Gdip_NATIVE(PrivateFontCollection_1delete) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { Gdip_NATIVE_ENTER(env, that, PrivateFontCollection_1delete_FUNC); delete (PrivateFontCollection *)arg0; @@ -2589,35 +2289,35 @@ JNIEXPORT void JNICALL Gdip_NATIVE(PrivateFontCollection_1delete) #endif #ifndef NO_PrivateFontCollection_1new -extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(PrivateFontCollection_1new)(JNIEnv *env, jclass that); -JNIEXPORT jintLong JNICALL Gdip_NATIVE(PrivateFontCollection_1new) +extern "C" JNIEXPORT jlong JNICALL Gdip_NATIVE(PrivateFontCollection_1new)(JNIEnv *env, jclass that); +JNIEXPORT jlong JNICALL Gdip_NATIVE(PrivateFontCollection_1new) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; Gdip_NATIVE_ENTER(env, that, PrivateFontCollection_1new_FUNC); - rc = (jintLong)new PrivateFontCollection(); + rc = (jlong)new PrivateFontCollection(); Gdip_NATIVE_EXIT(env, that, PrivateFontCollection_1new_FUNC); return rc; } #endif #ifndef NO_Region_1GetHRGN -extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Region_1GetHRGN)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1); -JNIEXPORT jintLong JNICALL Gdip_NATIVE(Region_1GetHRGN) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) +extern "C" JNIEXPORT jlong JNICALL Gdip_NATIVE(Region_1GetHRGN)(JNIEnv *env, jclass that, jlong arg0, jlong arg1); +JNIEXPORT jlong JNICALL Gdip_NATIVE(Region_1GetHRGN) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { - jintLong rc = 0; + jlong rc = 0; Gdip_NATIVE_ENTER(env, that, Region_1GetHRGN_FUNC); - rc = (jintLong)((Region *)arg0)->GetHRGN((Graphics *)arg1); + rc = (jlong)((Region *)arg0)->GetHRGN((Graphics *)arg1); Gdip_NATIVE_EXIT(env, that, Region_1GetHRGN_FUNC); return rc; } #endif #ifndef NO_Region_1IsInfinite -extern "C" JNIEXPORT jboolean JNICALL Gdip_NATIVE(Region_1IsInfinite)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1); +extern "C" JNIEXPORT jboolean JNICALL Gdip_NATIVE(Region_1IsInfinite)(JNIEnv *env, jclass that, jlong arg0, jlong arg1); JNIEXPORT jboolean JNICALL Gdip_NATIVE(Region_1IsInfinite) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { jboolean rc = 0; Gdip_NATIVE_ENTER(env, that, Region_1IsInfinite_FUNC); @@ -2628,9 +2328,9 @@ JNIEXPORT jboolean JNICALL Gdip_NATIVE(Region_1IsInfinite) #endif #ifndef NO_Region_1delete -extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Region_1delete)(JNIEnv *env, jclass that, jintLong arg0); +extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Region_1delete)(JNIEnv *env, jclass that, jlong arg0); JNIEXPORT void JNICALL Gdip_NATIVE(Region_1delete) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { Gdip_NATIVE_ENTER(env, that, Region_1delete_FUNC); delete (Region *)arg0; @@ -2639,60 +2339,48 @@ JNIEXPORT void JNICALL Gdip_NATIVE(Region_1delete) #endif #ifndef NO_Region_1new__ -extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Region_1new__)(JNIEnv *env, jclass that); -JNIEXPORT jintLong JNICALL Gdip_NATIVE(Region_1new__) +extern "C" JNIEXPORT jlong JNICALL Gdip_NATIVE(Region_1new__)(JNIEnv *env, jclass that); +JNIEXPORT jlong JNICALL Gdip_NATIVE(Region_1new__) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; Gdip_NATIVE_ENTER(env, that, Region_1new___FUNC); - rc = (jintLong)new Region(); + rc = (jlong)new Region(); Gdip_NATIVE_EXIT(env, that, Region_1new___FUNC); return rc; } #endif -#if (!defined(NO_Region_1new__I) && !defined(JNI64)) || (!defined(NO_Region_1new__J) && defined(JNI64)) -#ifndef JNI64 -extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Region_1new__I)(JNIEnv *env, jclass that, jintLong arg0); -JNIEXPORT jintLong JNICALL Gdip_NATIVE(Region_1new__I)(JNIEnv *env, jclass that, jintLong arg0) -#else -extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Region_1new__J)(JNIEnv *env, jclass that, jintLong arg0); -JNIEXPORT jintLong JNICALL Gdip_NATIVE(Region_1new__J)(JNIEnv *env, jclass that, jintLong arg0) -#endif +#ifndef NO_Region_1new__J +extern "C" JNIEXPORT jlong JNICALL Gdip_NATIVE(Region_1new__J)(JNIEnv *env, jclass that, jlong arg0); +JNIEXPORT jlong JNICALL Gdip_NATIVE(Region_1new__J) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; -#ifndef JNI64 - Gdip_NATIVE_ENTER(env, that, Region_1new__I_FUNC); -#else + jlong rc = 0; Gdip_NATIVE_ENTER(env, that, Region_1new__J_FUNC); -#endif - rc = (jintLong)new Region((HRGN)arg0); -#ifndef JNI64 - Gdip_NATIVE_EXIT(env, that, Region_1new__I_FUNC); -#else + rc = (jlong)new Region((HRGN)arg0); Gdip_NATIVE_EXIT(env, that, Region_1new__J_FUNC); -#endif return rc; } #endif #ifndef NO_Region_1newGraphicsPath -extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Region_1newGraphicsPath)(JNIEnv *env, jclass that, jintLong arg0); -JNIEXPORT jintLong JNICALL Gdip_NATIVE(Region_1newGraphicsPath) - (JNIEnv *env, jclass that, jintLong arg0) +extern "C" JNIEXPORT jlong JNICALL Gdip_NATIVE(Region_1newGraphicsPath)(JNIEnv *env, jclass that, jlong arg0); +JNIEXPORT jlong JNICALL Gdip_NATIVE(Region_1newGraphicsPath) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; Gdip_NATIVE_ENTER(env, that, Region_1newGraphicsPath_FUNC); - rc = (jintLong)new Region((GraphicsPath*)arg0); + rc = (jlong)new Region((GraphicsPath*)arg0); Gdip_NATIVE_EXIT(env, that, Region_1newGraphicsPath_FUNC); return rc; } #endif #ifndef NO_SolidBrush_1delete -extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(SolidBrush_1delete)(JNIEnv *env, jclass that, jintLong arg0); +extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(SolidBrush_1delete)(JNIEnv *env, jclass that, jlong arg0); JNIEXPORT void JNICALL Gdip_NATIVE(SolidBrush_1delete) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { Gdip_NATIVE_ENTER(env, that, SolidBrush_1delete_FUNC); delete (SolidBrush *)arg0; @@ -2701,61 +2389,61 @@ JNIEXPORT void JNICALL Gdip_NATIVE(SolidBrush_1delete) #endif #ifndef NO_SolidBrush_1new -extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(SolidBrush_1new)(JNIEnv *env, jclass that, jint arg0); -JNIEXPORT jintLong JNICALL Gdip_NATIVE(SolidBrush_1new) +extern "C" JNIEXPORT jlong JNICALL Gdip_NATIVE(SolidBrush_1new)(JNIEnv *env, jclass that, jint arg0); +JNIEXPORT jlong JNICALL Gdip_NATIVE(SolidBrush_1new) (JNIEnv *env, jclass that, jint arg0) { - jintLong rc = 0; + jlong rc = 0; Gdip_NATIVE_ENTER(env, that, SolidBrush_1new_FUNC); - rc = (jintLong)new SolidBrush((Color)arg0); + rc = (jlong)new SolidBrush((Color)arg0); Gdip_NATIVE_EXIT(env, that, SolidBrush_1new_FUNC); return rc; } #endif #ifndef NO_StringFormat_1Clone -extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(StringFormat_1Clone)(JNIEnv *env, jclass that, jintLong arg0); -JNIEXPORT jintLong JNICALL Gdip_NATIVE(StringFormat_1Clone) - (JNIEnv *env, jclass that, jintLong arg0) +extern "C" JNIEXPORT jlong JNICALL Gdip_NATIVE(StringFormat_1Clone)(JNIEnv *env, jclass that, jlong arg0); +JNIEXPORT jlong JNICALL Gdip_NATIVE(StringFormat_1Clone) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; Gdip_NATIVE_ENTER(env, that, StringFormat_1Clone_FUNC); - rc = (jintLong)((StringFormat *)arg0)->Clone(); + rc = (jlong)((StringFormat *)arg0)->Clone(); Gdip_NATIVE_EXIT(env, that, StringFormat_1Clone_FUNC); return rc; } #endif #ifndef NO_StringFormat_1GenericDefault -extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(StringFormat_1GenericDefault)(JNIEnv *env, jclass that); -JNIEXPORT jintLong JNICALL Gdip_NATIVE(StringFormat_1GenericDefault) +extern "C" JNIEXPORT jlong JNICALL Gdip_NATIVE(StringFormat_1GenericDefault)(JNIEnv *env, jclass that); +JNIEXPORT jlong JNICALL Gdip_NATIVE(StringFormat_1GenericDefault) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; Gdip_NATIVE_ENTER(env, that, StringFormat_1GenericDefault_FUNC); - rc = (jintLong)StringFormat::GenericDefault(); + rc = (jlong)StringFormat::GenericDefault(); Gdip_NATIVE_EXIT(env, that, StringFormat_1GenericDefault_FUNC); return rc; } #endif #ifndef NO_StringFormat_1GenericTypographic -extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(StringFormat_1GenericTypographic)(JNIEnv *env, jclass that); -JNIEXPORT jintLong JNICALL Gdip_NATIVE(StringFormat_1GenericTypographic) +extern "C" JNIEXPORT jlong JNICALL Gdip_NATIVE(StringFormat_1GenericTypographic)(JNIEnv *env, jclass that); +JNIEXPORT jlong JNICALL Gdip_NATIVE(StringFormat_1GenericTypographic) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; Gdip_NATIVE_ENTER(env, that, StringFormat_1GenericTypographic_FUNC); - rc = (jintLong)StringFormat::GenericTypographic(); + rc = (jlong)StringFormat::GenericTypographic(); Gdip_NATIVE_EXIT(env, that, StringFormat_1GenericTypographic_FUNC); return rc; } #endif #ifndef NO_StringFormat_1GetFormatFlags -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1GetFormatFlags)(JNIEnv *env, jclass that, jintLong arg0); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1GetFormatFlags)(JNIEnv *env, jclass that, jlong arg0); JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1GetFormatFlags) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, StringFormat_1GetFormatFlags_FUNC); @@ -2766,9 +2454,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1GetFormatFlags) #endif #ifndef NO_StringFormat_1SetFormatFlags -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1SetFormatFlags)(JNIEnv *env, jclass that, jintLong arg0, jint arg1); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1SetFormatFlags)(JNIEnv *env, jclass that, jlong arg0, jint arg1); JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1SetFormatFlags) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, StringFormat_1SetFormatFlags_FUNC); @@ -2779,9 +2467,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1SetFormatFlags) #endif #ifndef NO_StringFormat_1SetHotkeyPrefix -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1SetHotkeyPrefix)(JNIEnv *env, jclass that, jintLong arg0, jint arg1); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1SetHotkeyPrefix)(JNIEnv *env, jclass that, jlong arg0, jint arg1); JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1SetHotkeyPrefix) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, StringFormat_1SetHotkeyPrefix_FUNC); @@ -2792,9 +2480,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1SetHotkeyPrefix) #endif #ifndef NO_StringFormat_1SetTabStops -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1SetTabStops)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jint arg2, jfloatArray arg3); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1SetTabStops)(JNIEnv *env, jclass that, jlong arg0, jfloat arg1, jint arg2, jfloatArray arg3); JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1SetTabStops) - (JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jint arg2, jfloatArray arg3) + (JNIEnv *env, jclass that, jlong arg0, jfloat arg1, jint arg2, jfloatArray arg3) { jfloat *lparg3=NULL; jint rc = 0; @@ -2809,9 +2497,9 @@ fail: #endif #ifndef NO_StringFormat_1delete -extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(StringFormat_1delete)(JNIEnv *env, jclass that, jintLong arg0); +extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(StringFormat_1delete)(JNIEnv *env, jclass that, jlong arg0); JNIEXPORT void JNICALL Gdip_NATIVE(StringFormat_1delete) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { Gdip_NATIVE_ENTER(env, that, StringFormat_1delete_FUNC); delete (StringFormat *)arg0; @@ -2820,9 +2508,9 @@ JNIEXPORT void JNICALL Gdip_NATIVE(StringFormat_1delete) #endif #ifndef NO_TextureBrush_1ResetTransform -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1ResetTransform)(JNIEnv *env, jclass that, jintLong arg0); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1ResetTransform)(JNIEnv *env, jclass that, jlong arg0); JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1ResetTransform) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, TextureBrush_1ResetTransform_FUNC); @@ -2833,9 +2521,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1ResetTransform) #endif #ifndef NO_TextureBrush_1ScaleTransform -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1ScaleTransform)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jint arg3); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1ScaleTransform)(JNIEnv *env, jclass that, jlong arg0, jfloat arg1, jfloat arg2, jint arg3); JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1ScaleTransform) - (JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jint arg3) + (JNIEnv *env, jclass that, jlong arg0, jfloat arg1, jfloat arg2, jint arg3) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, TextureBrush_1ScaleTransform_FUNC); @@ -2846,9 +2534,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1ScaleTransform) #endif #ifndef NO_TextureBrush_1SetTransform -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1SetTransform)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1SetTransform)(JNIEnv *env, jclass that, jlong arg0, jlong arg1); JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1SetTransform) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, TextureBrush_1SetTransform_FUNC); @@ -2859,9 +2547,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1SetTransform) #endif #ifndef NO_TextureBrush_1TranslateTransform -extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1TranslateTransform)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jint arg3); +extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1TranslateTransform)(JNIEnv *env, jclass that, jlong arg0, jfloat arg1, jfloat arg2, jint arg3); JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1TranslateTransform) - (JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jint arg3) + (JNIEnv *env, jclass that, jlong arg0, jfloat arg1, jfloat arg2, jint arg3) { jint rc = 0; Gdip_NATIVE_ENTER(env, that, TextureBrush_1TranslateTransform_FUNC); @@ -2872,9 +2560,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1TranslateTransform) #endif #ifndef NO_TextureBrush_1delete -extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(TextureBrush_1delete)(JNIEnv *env, jclass that, jintLong arg0); +extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(TextureBrush_1delete)(JNIEnv *env, jclass that, jlong arg0); JNIEXPORT void JNICALL Gdip_NATIVE(TextureBrush_1delete) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { Gdip_NATIVE_ENTER(env, that, TextureBrush_1delete_FUNC); delete (TextureBrush *)arg0; @@ -2883,13 +2571,13 @@ JNIEXPORT void JNICALL Gdip_NATIVE(TextureBrush_1delete) #endif #ifndef NO_TextureBrush_1new -extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(TextureBrush_1new)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5); -JNIEXPORT jintLong JNICALL Gdip_NATIVE(TextureBrush_1new) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5) +extern "C" JNIEXPORT jlong JNICALL Gdip_NATIVE(TextureBrush_1new)(JNIEnv *env, jclass that, jlong arg0, jint arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5); +JNIEXPORT jlong JNICALL Gdip_NATIVE(TextureBrush_1new) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5) { - jintLong rc = 0; + jlong rc = 0; Gdip_NATIVE_ENTER(env, that, TextureBrush_1new_FUNC); - rc = (jintLong)new TextureBrush((Image *)arg0, (WrapMode)arg1, arg2, arg3, arg4, arg5); + rc = (jlong)new TextureBrush((Image *)arg0, (WrapMode)arg1, arg2, arg3, arg4, arg5); Gdip_NATIVE_EXIT(env, that, TextureBrush_1new_FUNC); return rc; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_stats.cpp b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_stats.cpp index de67fb8e79..26cf2a2afa 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_stats.cpp +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_stats.cpp @@ -28,21 +28,9 @@ char * Gdip_nativeFunctionNames[] = { "Bitmap_1LockBits", "Bitmap_1UnlockBits", "Bitmap_1delete", -#ifndef JNI64 - "Bitmap_1new__I", -#else + "Bitmap_1new__IIIIJ", "Bitmap_1new__J", -#endif -#ifndef JNI64 - "Bitmap_1new__II", -#else "Bitmap_1new__JJ", -#endif -#ifndef JNI64 - "Bitmap_1new__IIIII", -#else - "Bitmap_1new__IIIIJ", -#endif "Bitmap_1new___3CZ", "Brush_1Clone", "Brush_1GetType", @@ -51,32 +39,16 @@ char * Gdip_nativeFunctionNames[] = { "FontFamily_1IsAvailable", "FontFamily_1delete", "FontFamily_1new__", -#ifndef JNI64 - "FontFamily_1new___3CI", -#else "FontFamily_1new___3CJ", -#endif "Font_1GetFamily", "Font_1GetLogFontW", "Font_1GetSize", "Font_1GetStyle", "Font_1IsAvailable", "Font_1delete", -#ifndef JNI64 - "Font_1new__IFII", -#else "Font_1new__JFII", -#endif -#ifndef JNI64 - "Font_1new__II", -#else "Font_1new__JJ", -#endif -#ifndef JNI64 - "Font_1new___3CFIII", -#else "Font_1new___3CFIIJ", -#endif "GdiplusShutdown", "GdiplusStartup", "GdiplusStartupInput_1sizeof", @@ -103,42 +75,18 @@ char * Gdip_nativeFunctionNames[] = { "GraphicsPath_1new__I", "GraphicsPath_1new___3I_3BII", "Graphics_1DrawArc", -#ifndef JNI64 - "Graphics_1DrawDriverString__IIIIILorg_eclipse_swt_internal_gdip_PointF_2II", -#else "Graphics_1DrawDriverString__JJIJJLorg_eclipse_swt_internal_gdip_PointF_2IJ", -#endif -#ifndef JNI64 - "Graphics_1DrawDriverString__IIIII_3FII", -#else "Graphics_1DrawDriverString__JJIJJ_3FIJ", -#endif "Graphics_1DrawEllipse", -#ifndef JNI64 - "Graphics_1DrawImage__IIII", -#else "Graphics_1DrawImage__JJII", -#endif -#ifndef JNI64 - "Graphics_1DrawImage__IILorg_eclipse_swt_internal_gdip_Rect_2IIIIIIII", -#else "Graphics_1DrawImage__JJLorg_eclipse_swt_internal_gdip_Rect_2IIIIIJJJ", -#endif "Graphics_1DrawLine", "Graphics_1DrawLines", "Graphics_1DrawPath", "Graphics_1DrawPolygon", "Graphics_1DrawRectangle", -#ifndef JNI64 - "Graphics_1DrawString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2I", -#else "Graphics_1DrawString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2J", -#endif -#ifndef JNI64 - "Graphics_1DrawString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2II", -#else "Graphics_1DrawString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2JJ", -#endif "Graphics_1FillEllipse", "Graphics_1FillPath", "Graphics_1FillPie", @@ -146,16 +94,8 @@ char * Gdip_nativeFunctionNames[] = { "Graphics_1FillRectangle", "Graphics_1Flush", "Graphics_1GetClip", -#ifndef JNI64 - "Graphics_1GetClipBounds__ILorg_eclipse_swt_internal_gdip_RectF_2", -#else "Graphics_1GetClipBounds__JLorg_eclipse_swt_internal_gdip_RectF_2", -#endif -#ifndef JNI64 - "Graphics_1GetClipBounds__ILorg_eclipse_swt_internal_gdip_Rect_2", -#else "Graphics_1GetClipBounds__JLorg_eclipse_swt_internal_gdip_Rect_2", -#endif "Graphics_1GetHDC", "Graphics_1GetInterpolationMode", "Graphics_1GetSmoothingMode", @@ -163,41 +103,17 @@ char * Gdip_nativeFunctionNames[] = { "Graphics_1GetTransform", "Graphics_1GetVisibleClipBounds", "Graphics_1MeasureDriverString", -#ifndef JNI64 - "Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2ILorg_eclipse_swt_internal_gdip_RectF_2", -#else "Graphics_1MeasureString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2JLorg_eclipse_swt_internal_gdip_RectF_2", -#endif -#ifndef JNI64 - "Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2Lorg_eclipse_swt_internal_gdip_RectF_2", -#else "Graphics_1MeasureString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2Lorg_eclipse_swt_internal_gdip_RectF_2", -#endif "Graphics_1ReleaseHDC", "Graphics_1ResetClip", "Graphics_1Restore", "Graphics_1Save", "Graphics_1ScaleTransform", -#ifndef JNI64 - "Graphics_1SetClip__III", -#else "Graphics_1SetClip__JJI", -#endif -#ifndef JNI64 - "Graphics_1SetClip__ILorg_eclipse_swt_internal_gdip_Rect_2I", -#else "Graphics_1SetClip__JLorg_eclipse_swt_internal_gdip_Rect_2I", -#endif -#ifndef JNI64 - "Graphics_1SetClipPath__II", -#else "Graphics_1SetClipPath__JJ", -#endif -#ifndef JNI64 - "Graphics_1SetClipPath__III", -#else "Graphics_1SetClipPath__JJI", -#endif "Graphics_1SetCompositingQuality", "Graphics_1SetInterpolationMode", "Graphics_1SetPageUnit", @@ -235,30 +151,14 @@ char * Gdip_nativeFunctionNames[] = { "Matrix_1Scale", "Matrix_1SetElements", "Matrix_1Shear", -#ifndef JNI64 - "Matrix_1TransformPoints__ILorg_eclipse_swt_internal_gdip_PointF_2I", -#else "Matrix_1TransformPoints__JLorg_eclipse_swt_internal_gdip_PointF_2I", -#endif -#ifndef JNI64 - "Matrix_1TransformPoints__I_3FI", -#else "Matrix_1TransformPoints__J_3FI", -#endif "Matrix_1TransformVectors", "Matrix_1Translate", "Matrix_1delete", "Matrix_1new", -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2I", -#else "MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2J", -#endif -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_gdip_ColorPalette_2II", -#else "MoveMemory__Lorg_eclipse_swt_internal_gdip_ColorPalette_2JI", -#endif "PathGradientBrush_1SetCenterColor", "PathGradientBrush_1SetCenterPoint", "PathGradientBrush_1SetGraphicsPath", @@ -287,11 +187,7 @@ char * Gdip_nativeFunctionNames[] = { "Region_1IsInfinite", "Region_1delete", "Region_1new__", -#ifndef JNI64 - "Region_1new__I", -#else "Region_1new__J", -#endif "Region_1newGraphicsPath", "SolidBrush_1delete", "SolidBrush_1new", diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_stats.h index 53f5ad67aa..03c0320e39 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_stats.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_stats.h @@ -38,21 +38,9 @@ typedef enum { Bitmap_1LockBits_FUNC, Bitmap_1UnlockBits_FUNC, Bitmap_1delete_FUNC, -#ifndef JNI64 - Bitmap_1new__I_FUNC, -#else + Bitmap_1new__IIIIJ_FUNC, Bitmap_1new__J_FUNC, -#endif -#ifndef JNI64 - Bitmap_1new__II_FUNC, -#else Bitmap_1new__JJ_FUNC, -#endif -#ifndef JNI64 - Bitmap_1new__IIIII_FUNC, -#else - Bitmap_1new__IIIIJ_FUNC, -#endif Bitmap_1new___3CZ_FUNC, Brush_1Clone_FUNC, Brush_1GetType_FUNC, @@ -61,32 +49,16 @@ typedef enum { FontFamily_1IsAvailable_FUNC, FontFamily_1delete_FUNC, FontFamily_1new___FUNC, -#ifndef JNI64 - FontFamily_1new___3CI_FUNC, -#else FontFamily_1new___3CJ_FUNC, -#endif Font_1GetFamily_FUNC, Font_1GetLogFontW_FUNC, Font_1GetSize_FUNC, Font_1GetStyle_FUNC, Font_1IsAvailable_FUNC, Font_1delete_FUNC, -#ifndef JNI64 - Font_1new__IFII_FUNC, -#else Font_1new__JFII_FUNC, -#endif -#ifndef JNI64 - Font_1new__II_FUNC, -#else Font_1new__JJ_FUNC, -#endif -#ifndef JNI64 - Font_1new___3CFIII_FUNC, -#else Font_1new___3CFIIJ_FUNC, -#endif GdiplusShutdown_FUNC, GdiplusStartup_FUNC, GdiplusStartupInput_1sizeof_FUNC, @@ -113,42 +85,18 @@ typedef enum { GraphicsPath_1new__I_FUNC, GraphicsPath_1new___3I_3BII_FUNC, Graphics_1DrawArc_FUNC, -#ifndef JNI64 - Graphics_1DrawDriverString__IIIIILorg_eclipse_swt_internal_gdip_PointF_2II_FUNC, -#else Graphics_1DrawDriverString__JJIJJLorg_eclipse_swt_internal_gdip_PointF_2IJ_FUNC, -#endif -#ifndef JNI64 - Graphics_1DrawDriverString__IIIII_3FII_FUNC, -#else Graphics_1DrawDriverString__JJIJJ_3FIJ_FUNC, -#endif Graphics_1DrawEllipse_FUNC, -#ifndef JNI64 - Graphics_1DrawImage__IIII_FUNC, -#else Graphics_1DrawImage__JJII_FUNC, -#endif -#ifndef JNI64 - Graphics_1DrawImage__IILorg_eclipse_swt_internal_gdip_Rect_2IIIIIIII_FUNC, -#else Graphics_1DrawImage__JJLorg_eclipse_swt_internal_gdip_Rect_2IIIIIJJJ_FUNC, -#endif Graphics_1DrawLine_FUNC, Graphics_1DrawLines_FUNC, Graphics_1DrawPath_FUNC, Graphics_1DrawPolygon_FUNC, Graphics_1DrawRectangle_FUNC, -#ifndef JNI64 - Graphics_1DrawString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2I_FUNC, -#else Graphics_1DrawString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2J_FUNC, -#endif -#ifndef JNI64 - Graphics_1DrawString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2II_FUNC, -#else Graphics_1DrawString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2JJ_FUNC, -#endif Graphics_1FillEllipse_FUNC, Graphics_1FillPath_FUNC, Graphics_1FillPie_FUNC, @@ -156,16 +104,8 @@ typedef enum { Graphics_1FillRectangle_FUNC, Graphics_1Flush_FUNC, Graphics_1GetClip_FUNC, -#ifndef JNI64 - Graphics_1GetClipBounds__ILorg_eclipse_swt_internal_gdip_RectF_2_FUNC, -#else Graphics_1GetClipBounds__JLorg_eclipse_swt_internal_gdip_RectF_2_FUNC, -#endif -#ifndef JNI64 - Graphics_1GetClipBounds__ILorg_eclipse_swt_internal_gdip_Rect_2_FUNC, -#else Graphics_1GetClipBounds__JLorg_eclipse_swt_internal_gdip_Rect_2_FUNC, -#endif Graphics_1GetHDC_FUNC, Graphics_1GetInterpolationMode_FUNC, Graphics_1GetSmoothingMode_FUNC, @@ -173,41 +113,17 @@ typedef enum { Graphics_1GetTransform_FUNC, Graphics_1GetVisibleClipBounds_FUNC, Graphics_1MeasureDriverString_FUNC, -#ifndef JNI64 - Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2ILorg_eclipse_swt_internal_gdip_RectF_2_FUNC, -#else Graphics_1MeasureString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2JLorg_eclipse_swt_internal_gdip_RectF_2_FUNC, -#endif -#ifndef JNI64 - Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2Lorg_eclipse_swt_internal_gdip_RectF_2_FUNC, -#else Graphics_1MeasureString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2Lorg_eclipse_swt_internal_gdip_RectF_2_FUNC, -#endif Graphics_1ReleaseHDC_FUNC, Graphics_1ResetClip_FUNC, Graphics_1Restore_FUNC, Graphics_1Save_FUNC, Graphics_1ScaleTransform_FUNC, -#ifndef JNI64 - Graphics_1SetClip__III_FUNC, -#else Graphics_1SetClip__JJI_FUNC, -#endif -#ifndef JNI64 - Graphics_1SetClip__ILorg_eclipse_swt_internal_gdip_Rect_2I_FUNC, -#else Graphics_1SetClip__JLorg_eclipse_swt_internal_gdip_Rect_2I_FUNC, -#endif -#ifndef JNI64 - Graphics_1SetClipPath__II_FUNC, -#else Graphics_1SetClipPath__JJ_FUNC, -#endif -#ifndef JNI64 - Graphics_1SetClipPath__III_FUNC, -#else Graphics_1SetClipPath__JJI_FUNC, -#endif Graphics_1SetCompositingQuality_FUNC, Graphics_1SetInterpolationMode_FUNC, Graphics_1SetPageUnit_FUNC, @@ -245,30 +161,14 @@ typedef enum { Matrix_1Scale_FUNC, Matrix_1SetElements_FUNC, Matrix_1Shear_FUNC, -#ifndef JNI64 - Matrix_1TransformPoints__ILorg_eclipse_swt_internal_gdip_PointF_2I_FUNC, -#else Matrix_1TransformPoints__JLorg_eclipse_swt_internal_gdip_PointF_2I_FUNC, -#endif -#ifndef JNI64 - Matrix_1TransformPoints__I_3FI_FUNC, -#else Matrix_1TransformPoints__J_3FI_FUNC, -#endif Matrix_1TransformVectors_FUNC, Matrix_1Translate_FUNC, Matrix_1delete_FUNC, Matrix_1new_FUNC, -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2I_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2J_FUNC, -#endif -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_gdip_ColorPalette_2II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_gdip_ColorPalette_2JI_FUNC, -#endif PathGradientBrush_1SetCenterColor_FUNC, PathGradientBrush_1SetCenterPoint_FUNC, PathGradientBrush_1SetGraphicsPath_FUNC, @@ -297,11 +197,7 @@ typedef enum { Region_1IsInfinite_FUNC, Region_1delete_FUNC, Region_1new___FUNC, -#ifndef JNI64 - Region_1new__I_FUNC, -#else Region_1new__J_FUNC, -#endif Region_1newGraphicsPath_FUNC, SolidBrush_1delete_FUNC, SolidBrush_1new_FUNC, diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_structs.cpp b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_structs.cpp index abe3a0de43..d9fe2b9f84 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_structs.cpp +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_structs.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2016 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -35,8 +35,8 @@ void cacheBitmapDataFields(JNIEnv *env, jobject lpObject) BitmapDataFc.Height = env->GetFieldID(BitmapDataFc.clazz, "Height", "I"); BitmapDataFc.Stride = env->GetFieldID(BitmapDataFc.clazz, "Stride", "I"); BitmapDataFc.PixelFormat = env->GetFieldID(BitmapDataFc.clazz, "PixelFormat", "I"); - BitmapDataFc.Scan0 = env->GetFieldID(BitmapDataFc.clazz, "Scan0", I_J); - BitmapDataFc.Reserved = env->GetFieldID(BitmapDataFc.clazz, "Reserved", I_J); + BitmapDataFc.Scan0 = env->GetFieldID(BitmapDataFc.clazz, "Scan0", "J"); + BitmapDataFc.Reserved = env->GetFieldID(BitmapDataFc.clazz, "Reserved", "J"); BitmapDataFc.cached = 1; } @@ -47,8 +47,8 @@ BitmapData *getBitmapDataFields(JNIEnv *env, jobject lpObject, BitmapData *lpStr lpStruct->Height = env->GetIntField(lpObject, BitmapDataFc.Height); lpStruct->Stride = env->GetIntField(lpObject, BitmapDataFc.Stride); lpStruct->PixelFormat = (PixelFormat)env->GetIntField(lpObject, BitmapDataFc.PixelFormat); - lpStruct->Scan0 = (void*)env->GetIntLongField(lpObject, BitmapDataFc.Scan0); - lpStruct->Reserved = (UINT_PTR)env->GetIntLongField(lpObject, BitmapDataFc.Reserved); + lpStruct->Scan0 = (void*)env->GetLongField(lpObject, BitmapDataFc.Scan0); + lpStruct->Reserved = (UINT_PTR)env->GetLongField(lpObject, BitmapDataFc.Reserved); return lpStruct; } @@ -59,8 +59,8 @@ void setBitmapDataFields(JNIEnv *env, jobject lpObject, BitmapData *lpStruct) env->SetIntField(lpObject, BitmapDataFc.Height, (jint)lpStruct->Height); env->SetIntField(lpObject, BitmapDataFc.Stride, (jint)lpStruct->Stride); env->SetIntField(lpObject, BitmapDataFc.PixelFormat, (jint)lpStruct->PixelFormat); - env->SetIntLongField(lpObject, BitmapDataFc.Scan0, (jintLong)lpStruct->Scan0); - env->SetIntLongField(lpObject, BitmapDataFc.Reserved, (jintLong)lpStruct->Reserved); + env->SetLongField(lpObject, BitmapDataFc.Scan0, (jlong)lpStruct->Scan0); + env->SetLongField(lpObject, BitmapDataFc.Reserved, (jlong)lpStruct->Reserved); } #endif @@ -121,7 +121,7 @@ void cacheGdiplusStartupInputFields(JNIEnv *env, jobject lpObject) if (GdiplusStartupInputFc.cached) return; GdiplusStartupInputFc.clazz = env->GetObjectClass(lpObject); GdiplusStartupInputFc.GdiplusVersion = env->GetFieldID(GdiplusStartupInputFc.clazz, "GdiplusVersion", "I"); - GdiplusStartupInputFc.DebugEventCallback = env->GetFieldID(GdiplusStartupInputFc.clazz, "DebugEventCallback", I_J); + GdiplusStartupInputFc.DebugEventCallback = env->GetFieldID(GdiplusStartupInputFc.clazz, "DebugEventCallback", "J"); GdiplusStartupInputFc.SuppressBackgroundThread = env->GetFieldID(GdiplusStartupInputFc.clazz, "SuppressBackgroundThread", "Z"); GdiplusStartupInputFc.SuppressExternalCodecs = env->GetFieldID(GdiplusStartupInputFc.clazz, "SuppressExternalCodecs", "Z"); GdiplusStartupInputFc.cached = 1; @@ -131,7 +131,7 @@ GdiplusStartupInput *getGdiplusStartupInputFields(JNIEnv *env, jobject lpObject, { if (!GdiplusStartupInputFc.cached) cacheGdiplusStartupInputFields(env, lpObject); lpStruct->GdiplusVersion = env->GetIntField(lpObject, GdiplusStartupInputFc.GdiplusVersion); - lpStruct->DebugEventCallback = (DebugEventProc)env->GetIntLongField(lpObject, GdiplusStartupInputFc.DebugEventCallback); + lpStruct->DebugEventCallback = (DebugEventProc)env->GetLongField(lpObject, GdiplusStartupInputFc.DebugEventCallback); lpStruct->SuppressBackgroundThread = (BOOL)env->GetBooleanField(lpObject, GdiplusStartupInputFc.SuppressBackgroundThread); lpStruct->SuppressExternalCodecs = (BOOL)env->GetBooleanField(lpObject, GdiplusStartupInputFc.SuppressExternalCodecs); return lpStruct; @@ -141,7 +141,7 @@ void setGdiplusStartupInputFields(JNIEnv *env, jobject lpObject, GdiplusStartupI { if (!GdiplusStartupInputFc.cached) cacheGdiplusStartupInputFields(env, lpObject); env->SetIntField(lpObject, GdiplusStartupInputFc.GdiplusVersion, (jint)lpStruct->GdiplusVersion); - env->SetIntLongField(lpObject, GdiplusStartupInputFc.DebugEventCallback, (jintLong)lpStruct->DebugEventCallback); + env->SetLongField(lpObject, GdiplusStartupInputFc.DebugEventCallback, (jlong)lpStruct->DebugEventCallback); env->SetBooleanField(lpObject, GdiplusStartupInputFc.SuppressBackgroundThread, (jboolean)lpStruct->SuppressBackgroundThread); env->SetBooleanField(lpObject, GdiplusStartupInputFc.SuppressExternalCodecs, (jboolean)lpStruct->SuppressExternalCodecs); } 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 d02174121c..4b69c77525 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 @@ -49,7 +49,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(ACTCTX_1sizeof) #ifndef NO_AbortDoc JNIEXPORT jint JNICALL OS_NATIVE(AbortDoc) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; OS_NATIVE_ENTER(env, that, AbortDoc_FUNC); @@ -61,27 +61,27 @@ JNIEXPORT jint JNICALL OS_NATIVE(AbortDoc) #ifndef NO_ActivateActCtx JNIEXPORT jboolean JNICALL OS_NATIVE(ActivateActCtx) - (JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jlongArray arg1) { - jintLong *lparg1=NULL; + jlong *lparg1=NULL; jboolean rc = 0; OS_NATIVE_ENTER(env, that, ActivateActCtx_FUNC); - if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail; + if (arg1) if ((lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL)) == NULL) goto fail; rc = (jboolean)ActivateActCtx((HANDLE)arg0, (ULONG_PTR*)lparg1); fail: - if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0); + if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, 0); OS_NATIVE_EXIT(env, that, ActivateActCtx_FUNC); return rc; } #endif #ifndef NO_ActivateKeyboardLayout -JNIEXPORT jintLong JNICALL OS_NATIVE(ActivateKeyboardLayout) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) +JNIEXPORT jlong JNICALL OS_NATIVE(ActivateKeyboardLayout) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, ActivateKeyboardLayout_FUNC); - rc = (jintLong)ActivateKeyboardLayout((HKL)arg0, arg1); + rc = (jlong)ActivateKeyboardLayout((HKL)arg0, arg1); OS_NATIVE_EXIT(env, that, ActivateKeyboardLayout_FUNC); return rc; } @@ -89,7 +89,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(ActivateKeyboardLayout) #ifndef NO_AddFontResourceEx JNIEXPORT jint JNICALL OS_NATIVE(AddFontResourceEx) - (JNIEnv *env, jclass that, jcharArray arg0, jint arg1, jintLong arg2) + (JNIEnv *env, jclass that, jcharArray arg0, jint arg1, jlong arg2) { jchar *lparg0=NULL; jint rc = 0; @@ -133,7 +133,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(AllowSetForegroundWindow) #ifndef NO_AlphaBlend JNIEXPORT jboolean JNICALL OS_NATIVE(AlphaBlend) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4, jintLong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jobject arg10) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3, jint arg4, jlong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jobject arg10) { BLENDFUNCTION _arg10, *lparg10=NULL; jboolean rc = 0; @@ -149,7 +149,7 @@ fail: #ifndef NO_Arc JNIEXPORT jboolean JNICALL OS_NATIVE(Arc) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, Arc_FUNC); @@ -257,20 +257,20 @@ JNIEXPORT jint JNICALL OS_NATIVE(BUTTON_1IMAGELIST_1sizeof) #endif #ifndef NO_BeginBufferedPaint -JNIEXPORT jintLong JNICALL OS_NATIVE(BeginBufferedPaint) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2, jobject arg3, jintLongArray arg4) +JNIEXPORT jlong JNICALL OS_NATIVE(BeginBufferedPaint) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2, jobject arg3, jlongArray arg4) { RECT _arg1, *lparg1=NULL; BP_PAINTPARAMS _arg3, *lparg3=NULL; - jintLong *lparg4=NULL; - jintLong rc = 0; + jlong *lparg4=NULL; + jlong rc = 0; OS_NATIVE_ENTER(env, that, BeginBufferedPaint_FUNC); if (arg1) if ((lparg1 = getRECTFields(env, arg1, &_arg1)) == NULL) goto fail; if (arg3) if ((lparg3 = getBP_PAINTPARAMSFields(env, arg3, &_arg3)) == NULL) goto fail; - if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail; - rc = (jintLong)BeginBufferedPaint((HDC)arg0, lparg1, arg2, lparg3, (HDC*)lparg4); + if (arg4) if ((lparg4 = (*env)->GetLongArrayElements(env, arg4, NULL)) == NULL) goto fail; + rc = (jlong)BeginBufferedPaint((HDC)arg0, lparg1, arg2, lparg3, (HDC*)lparg4); fail: - if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0); + if (arg4 && lparg4) (*env)->ReleaseLongArrayElements(env, arg4, lparg4, 0); if (arg3 && lparg3) setBP_PAINTPARAMSFields(env, arg3, lparg3); if (arg1 && lparg1) setRECTFields(env, arg1, lparg1); OS_NATIVE_EXIT(env, that, BeginBufferedPaint_FUNC); @@ -279,26 +279,26 @@ fail: #endif #ifndef NO_BeginDeferWindowPos -JNIEXPORT jintLong JNICALL OS_NATIVE(BeginDeferWindowPos) +JNIEXPORT jlong JNICALL OS_NATIVE(BeginDeferWindowPos) (JNIEnv *env, jclass that, jint arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, BeginDeferWindowPos_FUNC); - rc = (jintLong)BeginDeferWindowPos(arg0); + rc = (jlong)BeginDeferWindowPos(arg0); OS_NATIVE_EXIT(env, that, BeginDeferWindowPos_FUNC); return rc; } #endif #ifndef NO_BeginPaint -JNIEXPORT jintLong JNICALL OS_NATIVE(BeginPaint) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) +JNIEXPORT jlong JNICALL OS_NATIVE(BeginPaint) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { PAINTSTRUCT _arg1, *lparg1=NULL; - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, BeginPaint_FUNC); if (arg1) if ((lparg1 = getPAINTSTRUCTFields(env, arg1, &_arg1)) == NULL) goto fail; - rc = (jintLong)BeginPaint((HWND)arg0, lparg1); + rc = (jlong)BeginPaint((HWND)arg0, lparg1); fail: if (arg1 && lparg1) setPAINTSTRUCTFields(env, arg1, lparg1); OS_NATIVE_EXIT(env, that, BeginPaint_FUNC); @@ -308,7 +308,7 @@ fail: #ifndef NO_BeginPath JNIEXPORT jboolean JNICALL OS_NATIVE(BeginPath) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, BeginPath_FUNC); @@ -320,7 +320,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(BeginPath) #ifndef NO_BitBlt JNIEXPORT jboolean JNICALL OS_NATIVE(BitBlt) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4, jintLong arg5, jint arg6, jint arg7, jint arg8) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3, jint arg4, jlong arg5, jint arg6, jint arg7, jint arg8) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, BitBlt_FUNC); @@ -332,7 +332,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(BitBlt) #ifndef NO_BringWindowToTop JNIEXPORT jboolean JNICALL OS_NATIVE(BringWindowToTop) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, BringWindowToTop_FUNC); @@ -535,24 +535,24 @@ JNIEXPORT jint JNICALL OS_NATIVE(CRYPT_1OBJID_1BLOB_1sizeof) #endif #ifndef NO_CallNextHookEx -JNIEXPORT jintLong JNICALL OS_NATIVE(CallNextHookEx) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintLong arg3) +JNIEXPORT jlong JNICALL OS_NATIVE(CallNextHookEx) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2, jlong arg3) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, CallNextHookEx_FUNC); - rc = (jintLong)CallNextHookEx((HHOOK)arg0, arg1, (WPARAM)arg2, (LPARAM)arg3); + rc = (jlong)CallNextHookEx((HHOOK)arg0, arg1, (WPARAM)arg2, (LPARAM)arg3); OS_NATIVE_EXIT(env, that, CallNextHookEx_FUNC); return rc; } #endif #ifndef NO_CallWindowProc -JNIEXPORT jintLong JNICALL OS_NATIVE(CallWindowProc) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jintLong arg4) +JNIEXPORT jlong JNICALL OS_NATIVE(CallWindowProc) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jlong arg3, jlong arg4) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, CallWindowProc_FUNC); - rc = (jintLong)CallWindowProc((WNDPROC)arg0, (HWND)arg1, arg2, arg3, arg4); + rc = (jlong)CallWindowProc((WNDPROC)arg0, (HWND)arg1, arg2, arg3, arg4); OS_NATIVE_EXIT(env, that, CallWindowProc_FUNC); return rc; } @@ -578,38 +578,38 @@ fail: #endif #ifndef NO_CharLower -JNIEXPORT jintLong JNICALL OS_NATIVE(CharLower) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(CharLower) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, CharLower_FUNC); - rc = (jintLong)CharLower((LPWSTR)arg0); + rc = (jlong)CharLower((LPWSTR)arg0); OS_NATIVE_EXIT(env, that, CharLower_FUNC); return rc; } #endif #ifndef NO_CharUpper -JNIEXPORT jintLong JNICALL OS_NATIVE(CharUpper) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(CharUpper) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, CharUpper_FUNC); - rc = (jintLong)CharUpper((LPWSTR)arg0); + rc = (jlong)CharUpper((LPWSTR)arg0); OS_NATIVE_EXIT(env, that, CharUpper_FUNC); return rc; } #endif #ifndef NO_ChildWindowFromPointEx -JNIEXPORT jintLong JNICALL OS_NATIVE(ChildWindowFromPointEx) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) +JNIEXPORT jlong JNICALL OS_NATIVE(ChildWindowFromPointEx) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2) { POINT _arg1, *lparg1=NULL; - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, ChildWindowFromPointEx_FUNC); if (arg1) if ((lparg1 = getPOINTFields(env, arg1, &_arg1)) == NULL) goto fail; - rc = (jintLong)ChildWindowFromPointEx((HWND)arg0, *lparg1, (UINT)arg2); + rc = (jlong)ChildWindowFromPointEx((HWND)arg0, *lparg1, (UINT)arg2); fail: if (arg1 && lparg1) setPOINTFields(env, arg1, lparg1); OS_NATIVE_EXIT(env, that, ChildWindowFromPointEx_FUNC); @@ -651,7 +651,7 @@ fail: #ifndef NO_ClientToScreen JNIEXPORT jboolean JNICALL OS_NATIVE(ClientToScreen) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { POINT _arg1, *lparg1=NULL; jboolean rc = 0; @@ -678,30 +678,30 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(CloseClipboard) #endif #ifndef NO_CloseEnhMetaFile -JNIEXPORT jintLong JNICALL OS_NATIVE(CloseEnhMetaFile) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(CloseEnhMetaFile) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, CloseEnhMetaFile_FUNC); - rc = (jintLong)CloseEnhMetaFile((HDC)arg0); + rc = (jlong)CloseEnhMetaFile((HDC)arg0); OS_NATIVE_EXIT(env, that, CloseEnhMetaFile_FUNC); return rc; } #endif #ifndef NO_CloseGestureInfoHandle -JNIEXPORT jintLong JNICALL OS_NATIVE(CloseGestureInfoHandle) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(CloseGestureInfoHandle) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, CloseGestureInfoHandle_FUNC); /* - rc = (jintLong)CloseGestureInfoHandle((HGESTUREINFO)arg0); + rc = (jlong)CloseGestureInfoHandle((HGESTUREINFO)arg0); */ { OS_LOAD_FUNCTION(fp, CloseGestureInfoHandle) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(HGESTUREINFO))fp)((HGESTUREINFO)arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(HGESTUREINFO))fp)((HGESTUREINFO)arg0); } } OS_NATIVE_EXIT(env, that, CloseGestureInfoHandle_FUNC); @@ -711,7 +711,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(CloseGestureInfoHandle) #ifndef NO_CloseHandle JNIEXPORT jboolean JNICALL OS_NATIVE(CloseHandle) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, CloseHandle_FUNC); @@ -723,7 +723,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(CloseHandle) #ifndef NO_ClosePrinter JNIEXPORT jboolean JNICALL OS_NATIVE(ClosePrinter) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, ClosePrinter_FUNC); @@ -735,7 +735,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(ClosePrinter) #ifndef NO_CloseThemeData JNIEXPORT jint JNICALL OS_NATIVE(CloseThemeData) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; OS_NATIVE_ENTER(env, that, CloseThemeData_FUNC); @@ -747,7 +747,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(CloseThemeData) #ifndef NO_CloseTouchInputHandle JNIEXPORT jboolean JNICALL OS_NATIVE(CloseTouchInputHandle) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, CloseTouchInputHandle_FUNC); @@ -767,19 +767,19 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(CloseTouchInputHandle) #ifndef NO_CoCreateInstance JNIEXPORT jint JNICALL OS_NATIVE(CoCreateInstance) - (JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1, jint arg2, jbyteArray arg3, jintLongArray arg4) + (JNIEnv *env, jclass that, jbyteArray arg0, jlong arg1, jint arg2, jbyteArray arg3, jlongArray arg4) { jbyte *lparg0=NULL; jbyte *lparg3=NULL; - jintLong *lparg4=NULL; + jlong *lparg4=NULL; jint rc = 0; OS_NATIVE_ENTER(env, that, CoCreateInstance_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail; - if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail; + if (arg4) if ((lparg4 = (*env)->GetLongArrayElements(env, arg4, NULL)) == NULL) goto fail; rc = (jint)CoCreateInstance((REFCLSID)lparg0, (LPUNKNOWN)arg1, arg2, (REFIID)lparg3, (LPVOID *)lparg4); fail: - if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0); + if (arg4 && lparg4) (*env)->ReleaseLongArrayElements(env, arg4, lparg4, 0); if (arg3 && lparg3) (*env)->ReleaseByteArrayElements(env, arg3, lparg3, 0); if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0); OS_NATIVE_EXIT(env, that, CoCreateInstance_FUNC); @@ -812,12 +812,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(CoInternetSetFeatureEnabled) #endif #ifndef NO_CoTaskMemAlloc -JNIEXPORT jintLong JNICALL OS_NATIVE(CoTaskMemAlloc) +JNIEXPORT jlong JNICALL OS_NATIVE(CoTaskMemAlloc) (JNIEnv *env, jclass that, jint arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, CoTaskMemAlloc_FUNC); - rc = (jintLong)CoTaskMemAlloc((ULONG)arg0); + rc = (jlong)CoTaskMemAlloc((ULONG)arg0); OS_NATIVE_EXIT(env, that, CoTaskMemAlloc_FUNC); return rc; } @@ -825,7 +825,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(CoTaskMemAlloc) #ifndef NO_CoTaskMemFree JNIEXPORT void JNICALL OS_NATIVE(CoTaskMemFree) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { OS_NATIVE_ENTER(env, that, CoTaskMemFree_FUNC); CoTaskMemFree((LPVOID)arg0); @@ -835,7 +835,7 @@ JNIEXPORT void JNICALL OS_NATIVE(CoTaskMemFree) #ifndef NO_CombineRgn JNIEXPORT jint JNICALL OS_NATIVE(CombineRgn) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jint arg3) { jint rc = 0; OS_NATIVE_ENTER(env, that, CombineRgn_FUNC); @@ -858,26 +858,26 @@ JNIEXPORT jint JNICALL OS_NATIVE(CommDlgExtendedError) #endif #ifndef NO_CopyImage -JNIEXPORT jintLong JNICALL OS_NATIVE(CopyImage) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4) +JNIEXPORT jlong JNICALL OS_NATIVE(CopyImage) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3, jint arg4) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, CopyImage_FUNC); - rc = (jintLong)CopyImage((HANDLE)arg0, arg1, arg2, arg3, arg4); + rc = (jlong)CopyImage((HANDLE)arg0, arg1, arg2, arg3, arg4); OS_NATIVE_EXIT(env, that, CopyImage_FUNC); return rc; } #endif #ifndef NO_CreateAcceleratorTable -JNIEXPORT jintLong JNICALL OS_NATIVE(CreateAcceleratorTable) +JNIEXPORT jlong JNICALL OS_NATIVE(CreateAcceleratorTable) (JNIEnv *env, jclass that, jbyteArray arg0, jint arg1) { jbyte *lparg0=NULL; - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, CreateAcceleratorTable_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; - rc = (jintLong)CreateAcceleratorTable((LPACCEL)lparg0, arg1); + rc = (jlong)CreateAcceleratorTable((LPACCEL)lparg0, arg1); fail: if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0); OS_NATIVE_EXIT(env, that, CreateAcceleratorTable_FUNC); @@ -886,14 +886,14 @@ fail: #endif #ifndef NO_CreateActCtx -JNIEXPORT jintLong JNICALL OS_NATIVE(CreateActCtx) +JNIEXPORT jlong JNICALL OS_NATIVE(CreateActCtx) (JNIEnv *env, jclass that, jobject arg0) { ACTCTX _arg0, *lparg0=NULL; - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, CreateActCtx_FUNC); if (arg0) if ((lparg0 = getACTCTXFields(env, arg0, &_arg0)) == NULL) goto fail; - rc = (jintLong)CreateActCtx(lparg0); + rc = (jlong)CreateActCtx(lparg0); fail: OS_NATIVE_EXIT(env, that, CreateActCtx_FUNC); return rc; @@ -901,14 +901,14 @@ fail: #endif #ifndef NO_CreateBitmap -JNIEXPORT jintLong JNICALL OS_NATIVE(CreateBitmap) +JNIEXPORT jlong JNICALL OS_NATIVE(CreateBitmap) (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jbyteArray arg4) { jbyte *lparg4=NULL; - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, CreateBitmap_FUNC); if (arg4) if ((lparg4 = (*env)->GetPrimitiveArrayCritical(env, arg4, NULL)) == NULL) goto fail; - rc = (jintLong)CreateBitmap(arg0, arg1, arg2, arg3, (CONST VOID *)lparg4); + rc = (jlong)CreateBitmap(arg0, arg1, arg2, arg3, (CONST VOID *)lparg4); fail: if (arg4 && lparg4) (*env)->ReleasePrimitiveArrayCritical(env, arg4, lparg4, JNI_ABORT); OS_NATIVE_EXIT(env, that, CreateBitmap_FUNC); @@ -918,7 +918,7 @@ fail: #ifndef NO_CreateCaret JNIEXPORT jboolean JNICALL OS_NATIVE(CreateCaret) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, CreateCaret_FUNC); @@ -929,40 +929,40 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(CreateCaret) #endif #ifndef NO_CreateCompatibleBitmap -JNIEXPORT jintLong JNICALL OS_NATIVE(CreateCompatibleBitmap) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2) +JNIEXPORT jlong JNICALL OS_NATIVE(CreateCompatibleBitmap) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, CreateCompatibleBitmap_FUNC); - rc = (jintLong)CreateCompatibleBitmap((HDC)arg0, arg1, arg2); + rc = (jlong)CreateCompatibleBitmap((HDC)arg0, arg1, arg2); OS_NATIVE_EXIT(env, that, CreateCompatibleBitmap_FUNC); return rc; } #endif #ifndef NO_CreateCompatibleDC -JNIEXPORT jintLong JNICALL OS_NATIVE(CreateCompatibleDC) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(CreateCompatibleDC) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, CreateCompatibleDC_FUNC); - rc = (jintLong)CreateCompatibleDC((HDC)arg0); + rc = (jlong)CreateCompatibleDC((HDC)arg0); OS_NATIVE_EXIT(env, that, CreateCompatibleDC_FUNC); return rc; } #endif #ifndef NO_CreateCursor -JNIEXPORT jintLong JNICALL OS_NATIVE(CreateCursor) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4, jbyteArray arg5, jbyteArray arg6) +JNIEXPORT jlong JNICALL OS_NATIVE(CreateCursor) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3, jint arg4, jbyteArray arg5, jbyteArray arg6) { jbyte *lparg5=NULL; jbyte *lparg6=NULL; - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, CreateCursor_FUNC); if (arg5) if ((lparg5 = (*env)->GetPrimitiveArrayCritical(env, arg5, NULL)) == NULL) goto fail; if (arg6) if ((lparg6 = (*env)->GetPrimitiveArrayCritical(env, arg6, NULL)) == NULL) goto fail; - rc = (jintLong)CreateCursor((HINSTANCE)arg0, arg1, arg2, arg3, arg4, (CONST VOID *)lparg5, (CONST VOID *)lparg6); + rc = (jlong)CreateCursor((HINSTANCE)arg0, arg1, arg2, arg3, arg4, (CONST VOID *)lparg5, (CONST VOID *)lparg6); fail: if (arg6 && lparg6) (*env)->ReleasePrimitiveArrayCritical(env, arg6, lparg6, JNI_ABORT); if (arg5 && lparg5) (*env)->ReleasePrimitiveArrayCritical(env, arg5, lparg5, JNI_ABORT); @@ -972,16 +972,16 @@ fail: #endif #ifndef NO_CreateDC -JNIEXPORT jintLong JNICALL OS_NATIVE(CreateDC) - (JNIEnv *env, jclass that, jcharArray arg0, jcharArray arg1, jintLong arg2, jintLong arg3) +JNIEXPORT jlong JNICALL OS_NATIVE(CreateDC) + (JNIEnv *env, jclass that, jcharArray arg0, jcharArray arg1, jlong arg2, jlong arg3) { jchar *lparg0=NULL; jchar *lparg1=NULL; - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, CreateDC_FUNC); if (arg0) if ((lparg0 = (*env)->GetCharArrayElements(env, arg0, NULL)) == NULL) goto fail; if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail; - rc = (jintLong)CreateDC((LPWSTR)lparg0, (LPWSTR)lparg1, (LPWSTR)arg2, (CONST DEVMODEW *)arg3); + rc = (jlong)CreateDC((LPWSTR)lparg0, (LPWSTR)lparg1, (LPWSTR)arg2, (CONST DEVMODEW *)arg3); fail: if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, 0); if (arg0 && lparg0) (*env)->ReleaseCharArrayElements(env, arg0, lparg0, 0); @@ -990,76 +990,54 @@ fail: } #endif -#if (!defined(NO_CreateDIBSection__III_3III) && !defined(JNI64)) || (!defined(NO_CreateDIBSection__JJI_3JJI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jintLong JNICALL OS_NATIVE(CreateDIBSection__III_3III)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLongArray arg3, jintLong arg4, jint arg5) -#else -JNIEXPORT jintLong JNICALL OS_NATIVE(CreateDIBSection__JJI_3JJI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLongArray arg3, jintLong arg4, jint arg5) -#endif +#ifndef NO_CreateDIBSection__JJI_3JJI +JNIEXPORT jlong JNICALL OS_NATIVE(CreateDIBSection__JJI_3JJI) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jlongArray arg3, jlong arg4, jint arg5) { - jintLong *lparg3=NULL; - jintLong rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, CreateDIBSection__III_3III_FUNC); -#else + jlong *lparg3=NULL; + jlong rc = 0; OS_NATIVE_ENTER(env, that, CreateDIBSection__JJI_3JJI_FUNC); -#endif if (arg3) if ((lparg3 = (*env)->GetPrimitiveArrayCritical(env, arg3, NULL)) == NULL) goto fail; - rc = (jintLong)CreateDIBSection((HDC)arg0, (BITMAPINFO *)arg1, arg2, (VOID **)lparg3, (HANDLE)arg4, arg5); + rc = (jlong)CreateDIBSection((HDC)arg0, (BITMAPINFO *)arg1, arg2, (VOID **)lparg3, (HANDLE)arg4, arg5); fail: if (arg3 && lparg3) (*env)->ReleasePrimitiveArrayCritical(env, arg3, lparg3, 0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, CreateDIBSection__III_3III_FUNC); -#else OS_NATIVE_EXIT(env, that, CreateDIBSection__JJI_3JJI_FUNC); -#endif return rc; } #endif -#if (!defined(NO_CreateDIBSection__I_3BI_3III) && !defined(JNI64)) || (!defined(NO_CreateDIBSection__J_3BI_3JJI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jintLong JNICALL OS_NATIVE(CreateDIBSection__I_3BI_3III)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2, jintLongArray arg3, jintLong arg4, jint arg5) -#else -JNIEXPORT jintLong JNICALL OS_NATIVE(CreateDIBSection__J_3BI_3JJI)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2, jintLongArray arg3, jintLong arg4, jint arg5) -#endif +#ifndef NO_CreateDIBSection__J_3BI_3JJI +JNIEXPORT jlong JNICALL OS_NATIVE(CreateDIBSection__J_3BI_3JJI) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jint arg2, jlongArray arg3, jlong arg4, jint arg5) { jbyte *lparg1=NULL; - jintLong *lparg3=NULL; - jintLong rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, CreateDIBSection__I_3BI_3III_FUNC); -#else + jlong *lparg3=NULL; + jlong rc = 0; OS_NATIVE_ENTER(env, that, CreateDIBSection__J_3BI_3JJI_FUNC); -#endif if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail; if (arg3) if ((lparg3 = (*env)->GetPrimitiveArrayCritical(env, arg3, NULL)) == NULL) goto fail; - rc = (jintLong)CreateDIBSection((HDC)arg0, (BITMAPINFO *)lparg1, arg2, (VOID **)lparg3, (HANDLE)arg4, arg5); + rc = (jlong)CreateDIBSection((HDC)arg0, (BITMAPINFO *)lparg1, arg2, (VOID **)lparg3, (HANDLE)arg4, arg5); fail: if (arg3 && lparg3) (*env)->ReleasePrimitiveArrayCritical(env, arg3, lparg3, 0); if (arg1 && lparg1) (*env)->ReleasePrimitiveArrayCritical(env, arg1, lparg1, JNI_ABORT); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, CreateDIBSection__I_3BI_3III_FUNC); -#else OS_NATIVE_EXIT(env, that, CreateDIBSection__J_3BI_3JJI_FUNC); -#endif return rc; } #endif #ifndef NO_CreateEnhMetaFile -JNIEXPORT jintLong JNICALL OS_NATIVE(CreateEnhMetaFile) - (JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jobject arg2, jcharArray arg3) +JNIEXPORT jlong JNICALL OS_NATIVE(CreateEnhMetaFile) + (JNIEnv *env, jclass that, jlong arg0, jcharArray arg1, jobject arg2, jcharArray arg3) { jchar *lparg1=NULL; RECT _arg2, *lparg2=NULL; jchar *lparg3=NULL; - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, CreateEnhMetaFile_FUNC); if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail; if (arg2) if ((lparg2 = getRECTFields(env, arg2, &_arg2)) == NULL) goto fail; if (arg3) if ((lparg3 = (*env)->GetCharArrayElements(env, arg3, NULL)) == NULL) goto fail; - rc = (jintLong)CreateEnhMetaFile((HDC)arg0, (LPCWSTR)lparg1, lparg2, (LPCWSTR)lparg3); + rc = (jlong)CreateEnhMetaFile((HDC)arg0, (LPCWSTR)lparg1, lparg2, (LPCWSTR)lparg3); fail: if (arg3 && lparg3) (*env)->ReleaseCharArrayElements(env, arg3, lparg3, 0); if (arg2 && lparg2) setRECTFields(env, arg2, lparg2); @@ -1069,38 +1047,27 @@ fail: } #endif -#if (!defined(NO_CreateFontIndirect__I) && !defined(JNI64)) || (!defined(NO_CreateFontIndirect__J) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jintLong JNICALL OS_NATIVE(CreateFontIndirect__I)(JNIEnv *env, jclass that, jintLong arg0) -#else -JNIEXPORT jintLong JNICALL OS_NATIVE(CreateFontIndirect__J)(JNIEnv *env, jclass that, jintLong arg0) -#endif +#ifndef NO_CreateFontIndirect__J +JNIEXPORT jlong JNICALL OS_NATIVE(CreateFontIndirect__J) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, CreateFontIndirect__I_FUNC); -#else + jlong rc = 0; OS_NATIVE_ENTER(env, that, CreateFontIndirect__J_FUNC); -#endif - rc = (jintLong)CreateFontIndirect((LPLOGFONTW)arg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, CreateFontIndirect__I_FUNC); -#else + rc = (jlong)CreateFontIndirect((LPLOGFONTW)arg0); OS_NATIVE_EXIT(env, that, CreateFontIndirect__J_FUNC); -#endif return rc; } #endif #ifndef NO_CreateFontIndirect__Lorg_eclipse_swt_internal_win32_LOGFONT_2 -JNIEXPORT jintLong JNICALL OS_NATIVE(CreateFontIndirect__Lorg_eclipse_swt_internal_win32_LOGFONT_2) +JNIEXPORT jlong JNICALL OS_NATIVE(CreateFontIndirect__Lorg_eclipse_swt_internal_win32_LOGFONT_2) (JNIEnv *env, jclass that, jobject arg0) { LOGFONT _arg0, *lparg0=NULL; - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, CreateFontIndirect__Lorg_eclipse_swt_internal_win32_LOGFONT_2_FUNC); if (arg0) if ((lparg0 = getLOGFONTFields(env, arg0, &_arg0)) == NULL) goto fail; - rc = (jintLong)CreateFontIndirect(lparg0); + rc = (jlong)CreateFontIndirect(lparg0); fail: OS_NATIVE_EXIT(env, that, CreateFontIndirect__Lorg_eclipse_swt_internal_win32_LOGFONT_2_FUNC); return rc; @@ -1108,14 +1075,14 @@ fail: #endif #ifndef NO_CreateIconIndirect -JNIEXPORT jintLong JNICALL OS_NATIVE(CreateIconIndirect) +JNIEXPORT jlong JNICALL OS_NATIVE(CreateIconIndirect) (JNIEnv *env, jclass that, jobject arg0) { ICONINFO _arg0, *lparg0=NULL; - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, CreateIconIndirect_FUNC); if (arg0) if ((lparg0 = getICONINFOFields(env, arg0, &_arg0)) == NULL) goto fail; - rc = (jintLong)CreateIconIndirect(lparg0); + rc = (jlong)CreateIconIndirect(lparg0); fail: OS_NATIVE_EXIT(env, that, CreateIconIndirect_FUNC); return rc; @@ -1123,50 +1090,50 @@ fail: #endif #ifndef NO_CreateMenu -JNIEXPORT jintLong JNICALL OS_NATIVE(CreateMenu) +JNIEXPORT jlong JNICALL OS_NATIVE(CreateMenu) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, CreateMenu_FUNC); - rc = (jintLong)CreateMenu(); + rc = (jlong)CreateMenu(); OS_NATIVE_EXIT(env, that, CreateMenu_FUNC); return rc; } #endif #ifndef NO_CreatePatternBrush -JNIEXPORT jintLong JNICALL OS_NATIVE(CreatePatternBrush) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(CreatePatternBrush) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, CreatePatternBrush_FUNC); - rc = (jintLong)CreatePatternBrush((HBITMAP)arg0); + rc = (jlong)CreatePatternBrush((HBITMAP)arg0); OS_NATIVE_EXIT(env, that, CreatePatternBrush_FUNC); return rc; } #endif #ifndef NO_CreatePen -JNIEXPORT jintLong JNICALL OS_NATIVE(CreatePen) +JNIEXPORT jlong JNICALL OS_NATIVE(CreatePen) (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, CreatePen_FUNC); - rc = (jintLong)CreatePen(arg0, arg1, (COLORREF)arg2); + rc = (jlong)CreatePen(arg0, arg1, (COLORREF)arg2); OS_NATIVE_EXIT(env, that, CreatePen_FUNC); return rc; } #endif #ifndef NO_CreatePolygonRgn -JNIEXPORT jintLong JNICALL OS_NATIVE(CreatePolygonRgn) +JNIEXPORT jlong JNICALL OS_NATIVE(CreatePolygonRgn) (JNIEnv *env, jclass that, jintArray arg0, jint arg1, jint arg2) { jint *lparg0=NULL; - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, CreatePolygonRgn_FUNC); if (arg0) if ((lparg0 = (*env)->GetIntArrayElements(env, arg0, NULL)) == NULL) goto fail; - rc = (jintLong)CreatePolygonRgn((CONST POINT *)lparg0, arg1, arg2); + rc = (jlong)CreatePolygonRgn((CONST POINT *)lparg0, arg1, arg2); fail: if (arg0 && lparg0) (*env)->ReleaseIntArrayElements(env, arg0, lparg0, 0); OS_NATIVE_EXIT(env, that, CreatePolygonRgn_FUNC); @@ -1175,12 +1142,12 @@ fail: #endif #ifndef NO_CreatePopupMenu -JNIEXPORT jintLong JNICALL OS_NATIVE(CreatePopupMenu) +JNIEXPORT jlong JNICALL OS_NATIVE(CreatePopupMenu) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, CreatePopupMenu_FUNC); - rc = (jintLong)CreatePopupMenu(); + rc = (jlong)CreatePopupMenu(); OS_NATIVE_EXIT(env, that, CreatePopupMenu_FUNC); return rc; } @@ -1188,7 +1155,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(CreatePopupMenu) #ifndef NO_CreateProcess JNIEXPORT jboolean JNICALL OS_NATIVE(CreateProcess) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jboolean arg4, jint arg5, jintLong arg6, jintLong arg7, jobject arg8, jobject arg9) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jboolean arg4, jint arg5, jlong arg6, jlong arg7, jobject arg8, jobject arg9) { STARTUPINFO _arg8, *lparg8=NULL; PROCESS_INFORMATION _arg9, *lparg9=NULL; @@ -1206,24 +1173,24 @@ fail: #endif #ifndef NO_CreateRectRgn -JNIEXPORT jintLong JNICALL OS_NATIVE(CreateRectRgn) +JNIEXPORT jlong JNICALL OS_NATIVE(CreateRectRgn) (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, CreateRectRgn_FUNC); - rc = (jintLong)CreateRectRgn(arg0, arg1, arg2, arg3); + rc = (jlong)CreateRectRgn(arg0, arg1, arg2, arg3); OS_NATIVE_EXIT(env, that, CreateRectRgn_FUNC); return rc; } #endif #ifndef NO_CreateSolidBrush -JNIEXPORT jintLong JNICALL OS_NATIVE(CreateSolidBrush) +JNIEXPORT jlong JNICALL OS_NATIVE(CreateSolidBrush) (JNIEnv *env, jclass that, jint arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, CreateSolidBrush_FUNC); - rc = (jintLong)CreateSolidBrush((COLORREF)arg0); + rc = (jlong)CreateSolidBrush((COLORREF)arg0); OS_NATIVE_EXIT(env, that, CreateSolidBrush_FUNC); return rc; } @@ -1231,33 +1198,33 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(CreateSolidBrush) #ifndef NO_CreateStreamOnHGlobal JNIEXPORT jint JNICALL OS_NATIVE(CreateStreamOnHGlobal) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1, jintLongArray arg2) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1, jlongArray arg2) { - jintLong *lparg2=NULL; + jlong *lparg2=NULL; jint rc = 0; OS_NATIVE_ENTER(env, that, CreateStreamOnHGlobal_FUNC); - if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail; + if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail; rc = (jint)CreateStreamOnHGlobal((HGLOBAL)arg0, (BOOL)arg1, (LPSTREAM *)lparg2); fail: - if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0); + if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0); OS_NATIVE_EXIT(env, that, CreateStreamOnHGlobal_FUNC); return rc; } #endif #ifndef NO_CreateWindowEx -JNIEXPORT jintLong JNICALL OS_NATIVE(CreateWindowEx) - (JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jcharArray arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jintLong arg8, jintLong arg9, jintLong arg10, jobject arg11) +JNIEXPORT jlong JNICALL OS_NATIVE(CreateWindowEx) + (JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jcharArray arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jlong arg8, jlong arg9, jlong arg10, jobject arg11) { jchar *lparg1=NULL; jchar *lparg2=NULL; CREATESTRUCT _arg11, *lparg11=NULL; - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, CreateWindowEx_FUNC); if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail; if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail; if (arg11) if ((lparg11 = getCREATESTRUCTFields(env, arg11, &_arg11)) == NULL) goto fail; - rc = (jintLong)CreateWindowEx(arg0, (LPWSTR)lparg1, (LPWSTR)lparg2, arg3, arg4, arg5, arg6, arg7, (HWND)arg8, (HMENU)arg9, (HINSTANCE)arg10, lparg11); + rc = (jlong)CreateWindowEx(arg0, (LPWSTR)lparg1, (LPWSTR)lparg2, arg3, arg4, arg5, arg6, arg7, (HWND)arg8, (HMENU)arg9, (HINSTANCE)arg10, lparg11); fail: if (arg11 && lparg11) setCREATESTRUCTFields(env, arg11, lparg11); if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0); @@ -1352,48 +1319,48 @@ JNIEXPORT jint JNICALL OS_NATIVE(DTTOPTS_1sizeof) #endif #ifndef NO_DefFrameProc -JNIEXPORT jintLong JNICALL OS_NATIVE(DefFrameProc) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jintLong arg4) +JNIEXPORT jlong JNICALL OS_NATIVE(DefFrameProc) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jlong arg3, jlong arg4) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, DefFrameProc_FUNC); - rc = (jintLong)DefFrameProc((HWND)arg0, (HWND)arg1, arg2, (WPARAM)arg3, (LPARAM)arg4); + rc = (jlong)DefFrameProc((HWND)arg0, (HWND)arg1, arg2, (WPARAM)arg3, (LPARAM)arg4); OS_NATIVE_EXIT(env, that, DefFrameProc_FUNC); return rc; } #endif #ifndef NO_DefMDIChildProc -JNIEXPORT jintLong JNICALL OS_NATIVE(DefMDIChildProc) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintLong arg3) +JNIEXPORT jlong JNICALL OS_NATIVE(DefMDIChildProc) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2, jlong arg3) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, DefMDIChildProc_FUNC); - rc = (jintLong)DefMDIChildProc((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)arg3); + rc = (jlong)DefMDIChildProc((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)arg3); OS_NATIVE_EXIT(env, that, DefMDIChildProc_FUNC); return rc; } #endif #ifndef NO_DefWindowProc -JNIEXPORT jintLong JNICALL OS_NATIVE(DefWindowProc) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintLong arg3) +JNIEXPORT jlong JNICALL OS_NATIVE(DefWindowProc) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2, jlong arg3) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, DefWindowProc_FUNC); - rc = (jintLong)DefWindowProc((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)arg3); + rc = (jlong)DefWindowProc((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)arg3); OS_NATIVE_EXIT(env, that, DefWindowProc_FUNC); return rc; } #endif #ifndef NO_DeferWindowPos -JNIEXPORT jintLong JNICALL OS_NATIVE(DeferWindowPos) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7) +JNIEXPORT jlong JNICALL OS_NATIVE(DeferWindowPos) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, DeferWindowPos_FUNC); - rc = (jintLong)DeferWindowPos((HDWP)arg0, (HWND)arg1, (HWND)arg2, arg3, arg4, arg5, arg6, arg7); + rc = (jlong)DeferWindowPos((HDWP)arg0, (HWND)arg1, (HWND)arg2, arg3, arg4, arg5, arg6, arg7); OS_NATIVE_EXIT(env, that, DeferWindowPos_FUNC); return rc; } @@ -1401,7 +1368,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(DeferWindowPos) #ifndef NO_DeleteDC JNIEXPORT jboolean JNICALL OS_NATIVE(DeleteDC) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, DeleteDC_FUNC); @@ -1413,7 +1380,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(DeleteDC) #ifndef NO_DeleteEnhMetaFile JNIEXPORT jboolean JNICALL OS_NATIVE(DeleteEnhMetaFile) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, DeleteEnhMetaFile_FUNC); @@ -1425,7 +1392,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(DeleteEnhMetaFile) #ifndef NO_DeleteMenu JNIEXPORT jboolean JNICALL OS_NATIVE(DeleteMenu) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, DeleteMenu_FUNC); @@ -1437,7 +1404,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(DeleteMenu) #ifndef NO_DeleteObject JNIEXPORT jboolean JNICALL OS_NATIVE(DeleteObject) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, DeleteObject_FUNC); @@ -1449,7 +1416,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(DeleteObject) #ifndef NO_DestroyAcceleratorTable JNIEXPORT jboolean JNICALL OS_NATIVE(DestroyAcceleratorTable) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, DestroyAcceleratorTable_FUNC); @@ -1473,7 +1440,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(DestroyCaret) #ifndef NO_DestroyCursor JNIEXPORT jboolean JNICALL OS_NATIVE(DestroyCursor) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, DestroyCursor_FUNC); @@ -1485,7 +1452,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(DestroyCursor) #ifndef NO_DestroyIcon JNIEXPORT jboolean JNICALL OS_NATIVE(DestroyIcon) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, DestroyIcon_FUNC); @@ -1497,7 +1464,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(DestroyIcon) #ifndef NO_DestroyMenu JNIEXPORT jboolean JNICALL OS_NATIVE(DestroyMenu) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, DestroyMenu_FUNC); @@ -1509,7 +1476,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(DestroyMenu) #ifndef NO_DestroyWindow JNIEXPORT jboolean JNICALL OS_NATIVE(DestroyWindow) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, DestroyWindow_FUNC); @@ -1520,14 +1487,14 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(DestroyWindow) #endif #ifndef NO_DispatchMessage -JNIEXPORT jintLong JNICALL OS_NATIVE(DispatchMessage) +JNIEXPORT jlong JNICALL OS_NATIVE(DispatchMessage) (JNIEnv *env, jclass that, jobject arg0) { MSG _arg0, *lparg0=NULL; - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, DispatchMessage_FUNC); if (arg0) if ((lparg0 = getMSGFields(env, arg0, &_arg0)) == NULL) goto fail; - rc = (jintLong)DispatchMessage(lparg0); + rc = (jlong)DispatchMessage(lparg0); fail: if (arg0 && lparg0) setMSGFields(env, arg0, lparg0); OS_NATIVE_EXIT(env, that, DispatchMessage_FUNC); @@ -1537,7 +1504,7 @@ fail: #ifndef NO_DocumentProperties JNIEXPORT jint JNICALL OS_NATIVE(DocumentProperties) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jcharArray arg2, jintLong arg3, jintLong arg4, jint arg5) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jcharArray arg2, jlong arg3, jlong arg4, jint arg5) { jchar *lparg2=NULL; jint rc = 0; @@ -1553,7 +1520,7 @@ fail: #ifndef NO_DragDetect JNIEXPORT jboolean JNICALL OS_NATIVE(DragDetect) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { POINT _arg1, *lparg1=NULL; jboolean rc = 0; @@ -1569,7 +1536,7 @@ fail: #ifndef NO_DragFinish JNIEXPORT void JNICALL OS_NATIVE(DragFinish) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { OS_NATIVE_ENTER(env, that, DragFinish_FUNC); DragFinish((HDROP)arg0); @@ -1579,7 +1546,7 @@ JNIEXPORT void JNICALL OS_NATIVE(DragFinish) #ifndef NO_DragQueryFile JNIEXPORT jint JNICALL OS_NATIVE(DragQueryFile) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jcharArray arg2, jint arg3) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jcharArray arg2, jint arg3) { jchar *lparg2=NULL; jint rc = 0; @@ -1595,7 +1562,7 @@ fail: #ifndef NO_DrawEdge JNIEXPORT jboolean JNICALL OS_NATIVE(DrawEdge) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2, jint arg3) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2, jint arg3) { RECT _arg1, *lparg1=NULL; jboolean rc = 0; @@ -1611,7 +1578,7 @@ fail: #ifndef NO_DrawFocusRect JNIEXPORT jboolean JNICALL OS_NATIVE(DrawFocusRect) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { RECT _arg1, *lparg1=NULL; jboolean rc = 0; @@ -1627,7 +1594,7 @@ fail: #ifndef NO_DrawFrameControl JNIEXPORT jboolean JNICALL OS_NATIVE(DrawFrameControl) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2, jint arg3) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2, jint arg3) { RECT _arg1, *lparg1=NULL; jboolean rc = 0; @@ -1643,7 +1610,7 @@ fail: #ifndef NO_DrawIconEx JNIEXPORT jboolean JNICALL OS_NATIVE(DrawIconEx) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jintLong arg3, jint arg4, jint arg5, jint arg6, jintLong arg7, jint arg8) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jlong arg3, jint arg4, jint arg5, jint arg6, jlong arg7, jint arg8) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, DrawIconEx_FUNC); @@ -1655,7 +1622,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(DrawIconEx) #ifndef NO_DrawMenuBar JNIEXPORT jboolean JNICALL OS_NATIVE(DrawMenuBar) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, DrawMenuBar_FUNC); @@ -1667,7 +1634,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(DrawMenuBar) #ifndef NO_DrawText JNIEXPORT jint JNICALL OS_NATIVE(DrawText) - (JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jobject arg3, jint arg4) + (JNIEnv *env, jclass that, jlong arg0, jcharArray arg1, jint arg2, jobject arg3, jint arg4) { jchar *lparg1=NULL; RECT _arg3, *lparg3=NULL; @@ -1686,7 +1653,7 @@ fail: #ifndef NO_DrawThemeBackground JNIEXPORT jint JNICALL OS_NATIVE(DrawThemeBackground) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jobject arg4, jobject arg5) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jobject arg4, jobject arg5) { RECT _arg4, *lparg4=NULL; RECT _arg5, *lparg5=NULL; @@ -1705,7 +1672,7 @@ fail: #ifndef NO_DrawThemeText JNIEXPORT jint JNICALL OS_NATIVE(DrawThemeText) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4, jint arg5, jint arg6, jint arg7, jobject arg8) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jcharArray arg4, jint arg5, jint arg6, jint arg7, jobject arg8) { jchar *lparg4=NULL; RECT _arg8, *lparg8=NULL; @@ -1724,15 +1691,15 @@ fail: #ifndef NO_DuplicateHandle JNIEXPORT jboolean JNICALL OS_NATIVE(DuplicateHandle) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLongArray arg3, jint arg4, jboolean arg5, jint arg6) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlongArray arg3, jint arg4, jboolean arg5, jint arg6) { - jintLong *lparg3=NULL; + jlong *lparg3=NULL; jboolean rc = 0; OS_NATIVE_ENTER(env, that, DuplicateHandle_FUNC); - if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail; + if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail; rc = (jboolean)DuplicateHandle((HANDLE)arg0, (HANDLE)arg1, (HANDLE)arg2, (LPHANDLE)lparg3, (DWORD)arg4, arg5, (DWORD)arg6); fail: - if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0); + if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0); OS_NATIVE_EXIT(env, that, DuplicateHandle_FUNC); return rc; } @@ -1776,7 +1743,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(EXTLOGFONTW_1sizeof) #ifndef NO_Ellipse JNIEXPORT jboolean JNICALL OS_NATIVE(Ellipse) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3, jint arg4) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, Ellipse_FUNC); @@ -1788,7 +1755,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(Ellipse) #ifndef NO_EnableMenuItem JNIEXPORT jboolean JNICALL OS_NATIVE(EnableMenuItem) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, EnableMenuItem_FUNC); @@ -1800,7 +1767,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(EnableMenuItem) #ifndef NO_EnableScrollBar JNIEXPORT jboolean JNICALL OS_NATIVE(EnableScrollBar) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, EnableScrollBar_FUNC); @@ -1812,7 +1779,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(EnableScrollBar) #ifndef NO_EnableWindow JNIEXPORT jboolean JNICALL OS_NATIVE(EnableWindow) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, EnableWindow_FUNC); @@ -1824,7 +1791,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(EnableWindow) #ifndef NO_EndBufferedPaint JNIEXPORT jint JNICALL OS_NATIVE(EndBufferedPaint) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { jint rc = 0; OS_NATIVE_ENTER(env, that, EndBufferedPaint_FUNC); @@ -1836,7 +1803,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(EndBufferedPaint) #ifndef NO_EndDeferWindowPos JNIEXPORT jboolean JNICALL OS_NATIVE(EndDeferWindowPos) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, EndDeferWindowPos_FUNC); @@ -1848,7 +1815,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(EndDeferWindowPos) #ifndef NO_EndDoc JNIEXPORT jint JNICALL OS_NATIVE(EndDoc) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; OS_NATIVE_ENTER(env, that, EndDoc_FUNC); @@ -1860,7 +1827,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(EndDoc) #ifndef NO_EndPage JNIEXPORT jint JNICALL OS_NATIVE(EndPage) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; OS_NATIVE_ENTER(env, that, EndPage_FUNC); @@ -1872,7 +1839,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(EndPage) #ifndef NO_EndPaint JNIEXPORT jint JNICALL OS_NATIVE(EndPaint) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { PAINTSTRUCT _arg1, *lparg1=NULL; jint rc = 0; @@ -1888,7 +1855,7 @@ fail: #ifndef NO_EnumDisplayMonitors JNIEXPORT jboolean JNICALL OS_NATIVE(EnumDisplayMonitors) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2, jint arg3) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jlong arg2, jint arg3) { RECT _arg1, *lparg1=NULL; jboolean rc = 0; @@ -1904,7 +1871,7 @@ fail: #ifndef NO_EnumEnhMetaFile JNIEXPORT jboolean JNICALL OS_NATIVE(EnumEnhMetaFile) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jobject arg4) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jobject arg4) { RECT _arg4, *lparg4=NULL; jboolean rc = 0; @@ -1920,7 +1887,7 @@ fail: #ifndef NO_EnumFontFamilies JNIEXPORT jint JNICALL OS_NATIVE(EnumFontFamilies) - (JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jintLong arg2, jintLong arg3) + (JNIEnv *env, jclass that, jlong arg0, jcharArray arg1, jlong arg2, jlong arg3) { jchar *lparg1=NULL; jint rc = 0; @@ -1936,7 +1903,7 @@ fail: #ifndef NO_EnumSystemLanguageGroups JNIEXPORT jboolean JNICALL OS_NATIVE(EnumSystemLanguageGroups) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, EnumSystemLanguageGroups_FUNC); @@ -1948,7 +1915,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(EnumSystemLanguageGroups) #ifndef NO_EnumSystemLocales JNIEXPORT jboolean JNICALL OS_NATIVE(EnumSystemLocales) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, EnumSystemLocales_FUNC); @@ -1977,7 +1944,7 @@ fail: #ifndef NO_ExcludeClipRect JNIEXPORT jint JNICALL OS_NATIVE(ExcludeClipRect) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3, jint arg4) { jint rc = 0; OS_NATIVE_ENTER(env, that, ExcludeClipRect_FUNC); @@ -2007,16 +1974,16 @@ fail: #endif #ifndef NO_ExtCreatePen -JNIEXPORT jintLong JNICALL OS_NATIVE(ExtCreatePen) +JNIEXPORT jlong JNICALL OS_NATIVE(ExtCreatePen) (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3, jintArray arg4) { LOGBRUSH _arg2, *lparg2=NULL; jint *lparg4=NULL; - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, ExtCreatePen_FUNC); if (arg2) if ((lparg2 = getLOGBRUSHFields(env, arg2, &_arg2)) == NULL) goto fail; if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail; - rc = (jintLong)ExtCreatePen(arg0, arg1, (CONST LOGBRUSH *)lparg2, arg3, (CONST DWORD *)lparg4); + rc = (jlong)ExtCreatePen(arg0, arg1, (CONST LOGBRUSH *)lparg2, arg3, (CONST DWORD *)lparg4); fail: if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0); if (arg2 && lparg2) setLOGBRUSHFields(env, arg2, lparg2); @@ -2026,16 +1993,16 @@ fail: #endif #ifndef NO_ExtCreateRegion -JNIEXPORT jintLong JNICALL OS_NATIVE(ExtCreateRegion) +JNIEXPORT jlong JNICALL OS_NATIVE(ExtCreateRegion) (JNIEnv *env, jclass that, jfloatArray arg0, jint arg1, jintArray arg2) { jfloat *lparg0=NULL; jint *lparg2=NULL; - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, ExtCreateRegion_FUNC); if (arg0) if ((lparg0 = (*env)->GetFloatArrayElements(env, arg0, NULL)) == NULL) goto fail; if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail; - rc = (jintLong)ExtCreateRegion((XFORM *)lparg0, arg1, (CONST RGNDATA *)lparg2); + rc = (jlong)ExtCreateRegion((XFORM *)lparg0, arg1, (CONST RGNDATA *)lparg2); fail: if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0); if (arg0 && lparg0) (*env)->ReleaseFloatArrayElements(env, arg0, lparg0, 0); @@ -2046,7 +2013,7 @@ fail: #ifndef NO_ExtTextOut JNIEXPORT jboolean JNICALL OS_NATIVE(ExtTextOut) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jcharArray arg5, jint arg6, jintArray arg7) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jcharArray arg5, jint arg6, jintArray arg7) { RECT _arg4, *lparg4=NULL; jchar *lparg5=NULL; @@ -2067,20 +2034,20 @@ fail: #ifndef NO_ExtractIconEx JNIEXPORT jint JNICALL OS_NATIVE(ExtractIconEx) - (JNIEnv *env, jclass that, jcharArray arg0, jint arg1, jintLongArray arg2, jintLongArray arg3, jint arg4) + (JNIEnv *env, jclass that, jcharArray arg0, jint arg1, jlongArray arg2, jlongArray arg3, jint arg4) { jchar *lparg0=NULL; - jintLong *lparg2=NULL; - jintLong *lparg3=NULL; + jlong *lparg2=NULL; + jlong *lparg3=NULL; jint rc = 0; OS_NATIVE_ENTER(env, that, ExtractIconEx_FUNC); if (arg0) if ((lparg0 = (*env)->GetCharArrayElements(env, arg0, NULL)) == NULL) goto fail; - if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail; - if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail; + if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail; + if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail; rc = (jint)ExtractIconEx((LPWSTR)lparg0, arg1, (HICON FAR *)lparg2, (HICON FAR *)lparg3, arg4); fail: - if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0); - if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0); + if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0); + if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0); if (arg0 && lparg0) (*env)->ReleaseCharArrayElements(env, arg0, lparg0, 0); OS_NATIVE_EXIT(env, that, ExtractIconEx_FUNC); return rc; @@ -2144,7 +2111,7 @@ fail: #ifndef NO_FillRect JNIEXPORT jint JNICALL OS_NATIVE(FillRect) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jlong arg2) { RECT _arg1, *lparg1=NULL; jint rc = 0; @@ -2159,15 +2126,15 @@ fail: #ifndef NO_FormatMessage JNIEXPORT jint JNICALL OS_NATIVE(FormatMessage) - (JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jintLongArray arg4, jint arg5, jintLong arg6) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jlongArray arg4, jint arg5, jlong arg6) { - jintLong *lparg4=NULL; + jlong *lparg4=NULL; jint rc = 0; OS_NATIVE_ENTER(env, that, FormatMessage_FUNC); - if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail; + if (arg4) if ((lparg4 = (*env)->GetLongArrayElements(env, arg4, NULL)) == NULL) goto fail; rc = (jint)FormatMessage(arg0, (LPCVOID)arg1, arg2, arg3, (LPWSTR)lparg4, arg5, (va_list*)arg6); fail: - if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0); + if (arg4 && lparg4) (*env)->ReleaseLongArrayElements(env, arg4, lparg4, 0); OS_NATIVE_EXIT(env, that, FormatMessage_FUNC); return rc; } @@ -2211,7 +2178,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GESTUREINFO_1sizeof) #ifndef NO_GET_1WHEEL_1DELTA_1WPARAM JNIEXPORT jint JNICALL OS_NATIVE(GET_1WHEEL_1DELTA_1WPARAM) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; OS_NATIVE_ENTER(env, that, GET_1WHEEL_1DELTA_1WPARAM_FUNC); @@ -2223,7 +2190,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GET_1WHEEL_1DELTA_1WPARAM) #ifndef NO_GET_1X_1LPARAM JNIEXPORT jint JNICALL OS_NATIVE(GET_1X_1LPARAM) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; OS_NATIVE_ENTER(env, that, GET_1X_1LPARAM_FUNC); @@ -2235,7 +2202,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GET_1X_1LPARAM) #ifndef NO_GET_1Y_1LPARAM JNIEXPORT jint JNICALL OS_NATIVE(GET_1Y_1LPARAM) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; OS_NATIVE_ENTER(env, that, GET_1Y_1LPARAM_FUNC); @@ -2306,12 +2273,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetACP) #endif #ifndef NO_GetActiveWindow -JNIEXPORT jintLong JNICALL OS_NATIVE(GetActiveWindow) +JNIEXPORT jlong JNICALL OS_NATIVE(GetActiveWindow) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, GetActiveWindow_FUNC); - rc = (jintLong)GetActiveWindow(); + rc = (jlong)GetActiveWindow(); OS_NATIVE_EXIT(env, that, GetActiveWindow_FUNC); return rc; } @@ -2319,7 +2286,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(GetActiveWindow) #ifndef NO_GetBkColor JNIEXPORT jint JNICALL OS_NATIVE(GetBkColor) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; OS_NATIVE_ENTER(env, that, GetBkColor_FUNC); @@ -2330,12 +2297,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetBkColor) #endif #ifndef NO_GetCapture -JNIEXPORT jintLong JNICALL OS_NATIVE(GetCapture) +JNIEXPORT jlong JNICALL OS_NATIVE(GetCapture) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, GetCapture_FUNC); - rc = (jintLong)GetCapture(); + rc = (jlong)GetCapture(); OS_NATIVE_EXIT(env, that, GetCapture_FUNC); return rc; } @@ -2359,7 +2326,7 @@ fail: #ifndef NO_GetCharABCWidths JNIEXPORT jboolean JNICALL OS_NATIVE(GetCharABCWidths) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jintArray arg3) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jintArray arg3) { jint *lparg3=NULL; jboolean rc = 0; @@ -2375,7 +2342,7 @@ fail: #ifndef NO_GetCharWidth JNIEXPORT jboolean JNICALL OS_NATIVE(GetCharWidth) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jintArray arg3) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jintArray arg3) { jint *lparg3=NULL; jboolean rc = 0; @@ -2391,7 +2358,7 @@ fail: #ifndef NO_GetCharacterPlacement JNIEXPORT jint JNICALL OS_NATIVE(GetCharacterPlacement) - (JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jint arg3, jobject arg4, jint arg5) + (JNIEnv *env, jclass that, jlong arg0, jcharArray arg1, jint arg2, jint arg3, jobject arg4, jint arg5) { jchar *lparg1=NULL; GCP_RESULTS _arg4, *lparg4=NULL; @@ -2410,7 +2377,7 @@ fail: #ifndef NO_GetClassInfo JNIEXPORT jboolean JNICALL OS_NATIVE(GetClassInfo) - (JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jobject arg2) + (JNIEnv *env, jclass that, jlong arg0, jcharArray arg1, jobject arg2) { jchar *lparg1=NULL; WNDCLASS _arg2, *lparg2=NULL; @@ -2429,7 +2396,7 @@ fail: #ifndef NO_GetClassName JNIEXPORT jint JNICALL OS_NATIVE(GetClassName) - (JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jcharArray arg1, jint arg2) { jchar *lparg1=NULL; jint rc = 0; @@ -2445,7 +2412,7 @@ fail: #ifndef NO_GetClientRect JNIEXPORT jboolean JNICALL OS_NATIVE(GetClientRect) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { RECT _arg1, *lparg1=NULL; jboolean rc = 0; @@ -2461,7 +2428,7 @@ fail: #ifndef NO_GetClipBox JNIEXPORT jint JNICALL OS_NATIVE(GetClipBox) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { RECT _arg1, *lparg1=NULL; jint rc = 0; @@ -2477,7 +2444,7 @@ fail: #ifndef NO_GetClipRgn JNIEXPORT jint JNICALL OS_NATIVE(GetClipRgn) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { jint rc = 0; OS_NATIVE_ENTER(env, that, GetClipRgn_FUNC); @@ -2488,12 +2455,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetClipRgn) #endif #ifndef NO_GetClipboardData -JNIEXPORT jintLong JNICALL OS_NATIVE(GetClipboardData) +JNIEXPORT jlong JNICALL OS_NATIVE(GetClipboardData) (JNIEnv *env, jclass that, jint arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, GetClipboardData_FUNC); - rc = (jintLong)GetClipboardData(arg0); + rc = (jlong)GetClipboardData(arg0); OS_NATIVE_EXIT(env, that, GetClipboardData_FUNC); return rc; } @@ -2517,7 +2484,7 @@ fail: #ifndef NO_GetComboBoxInfo JNIEXPORT jboolean JNICALL OS_NATIVE(GetComboBoxInfo) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { COMBOBOXINFO _arg1, *lparg1=NULL; jboolean rc = 0; @@ -2532,24 +2499,24 @@ fail: #endif #ifndef NO_GetCurrentObject -JNIEXPORT jintLong JNICALL OS_NATIVE(GetCurrentObject) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) +JNIEXPORT jlong JNICALL OS_NATIVE(GetCurrentObject) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, GetCurrentObject_FUNC); - rc = (jintLong)GetCurrentObject((HDC)arg0, arg1); + rc = (jlong)GetCurrentObject((HDC)arg0, arg1); OS_NATIVE_EXIT(env, that, GetCurrentObject_FUNC); return rc; } #endif #ifndef NO_GetCurrentProcess -JNIEXPORT jintLong JNICALL OS_NATIVE(GetCurrentProcess) +JNIEXPORT jlong JNICALL OS_NATIVE(GetCurrentProcess) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, GetCurrentProcess_FUNC); - rc = (jintLong)GetCurrentProcess(); + rc = (jlong)GetCurrentProcess(); OS_NATIVE_EXIT(env, that, GetCurrentProcess_FUNC); return rc; } @@ -2557,23 +2524,23 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(GetCurrentProcess) #ifndef NO_GetCurrentProcessExplicitAppUserModelID JNIEXPORT jint JNICALL OS_NATIVE(GetCurrentProcessExplicitAppUserModelID) - (JNIEnv *env, jclass that, jintLongArray arg0) + (JNIEnv *env, jclass that, jlongArray arg0) { - jintLong *lparg0=NULL; + jlong *lparg0=NULL; jint rc = 0; OS_NATIVE_ENTER(env, that, GetCurrentProcessExplicitAppUserModelID_FUNC); - if (arg0) if ((lparg0 = (*env)->GetIntLongArrayElements(env, arg0, NULL)) == NULL) goto fail; + if (arg0) if ((lparg0 = (*env)->GetLongArrayElements(env, arg0, NULL)) == NULL) goto fail; /* rc = (jint)GetCurrentProcessExplicitAppUserModelID(lparg0); */ { OS_LOAD_FUNCTION(fp, GetCurrentProcessExplicitAppUserModelID) if (fp) { - rc = (jint)((jint (CALLING_CONVENTION*)(jintLong *))fp)(lparg0); + rc = (jint)((jint (CALLING_CONVENTION*)(jlong *))fp)(lparg0); } } fail: - if (arg0 && lparg0) (*env)->ReleaseIntLongArrayElements(env, arg0, lparg0, 0); + if (arg0 && lparg0) (*env)->ReleaseLongArrayElements(env, arg0, lparg0, 0); OS_NATIVE_EXIT(env, that, GetCurrentProcessExplicitAppUserModelID_FUNC); return rc; } @@ -2604,12 +2571,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetCurrentThreadId) #endif #ifndef NO_GetCursor -JNIEXPORT jintLong JNICALL OS_NATIVE(GetCursor) +JNIEXPORT jlong JNICALL OS_NATIVE(GetCursor) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, GetCursor_FUNC); - rc = (jintLong)GetCursor(); + rc = (jlong)GetCursor(); OS_NATIVE_EXIT(env, that, GetCursor_FUNC); return rc; } @@ -2632,24 +2599,24 @@ fail: #endif #ifndef NO_GetDC -JNIEXPORT jintLong JNICALL OS_NATIVE(GetDC) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(GetDC) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, GetDC_FUNC); - rc = (jintLong)GetDC((HWND)arg0); + rc = (jlong)GetDC((HWND)arg0); OS_NATIVE_EXIT(env, that, GetDC_FUNC); return rc; } #endif #ifndef NO_GetDCEx -JNIEXPORT jintLong JNICALL OS_NATIVE(GetDCEx) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2) +JNIEXPORT jlong JNICALL OS_NATIVE(GetDCEx) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, GetDCEx_FUNC); - rc = (jintLong)GetDCEx((HWND)arg0, (HRGN)arg1, arg2); + rc = (jlong)GetDCEx((HWND)arg0, (HRGN)arg1, arg2); OS_NATIVE_EXIT(env, that, GetDCEx_FUNC); return rc; } @@ -2657,7 +2624,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(GetDCEx) #ifndef NO_GetDIBColorTable JNIEXPORT jint JNICALL OS_NATIVE(GetDIBColorTable) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jbyteArray arg3) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jbyteArray arg3) { jbyte *lparg3=NULL; jint rc = 0; @@ -2673,7 +2640,7 @@ fail: #ifndef NO_GetDIBits JNIEXPORT jint JNICALL OS_NATIVE(GetDIBits) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jbyteArray arg4, jbyteArray arg5, jint arg6) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jbyteArray arg4, jbyteArray arg5, jint arg6) { jbyte *lparg4=NULL; jbyte *lparg5=NULL; @@ -2691,12 +2658,12 @@ fail: #endif #ifndef NO_GetDesktopWindow -JNIEXPORT jintLong JNICALL OS_NATIVE(GetDesktopWindow) +JNIEXPORT jlong JNICALL OS_NATIVE(GetDesktopWindow) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, GetDesktopWindow_FUNC); - rc = (jintLong)GetDesktopWindow(); + rc = (jlong)GetDesktopWindow(); OS_NATIVE_EXIT(env, that, GetDesktopWindow_FUNC); return rc; } @@ -2704,7 +2671,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(GetDesktopWindow) #ifndef NO_GetDeviceCaps JNIEXPORT jint JNICALL OS_NATIVE(GetDeviceCaps) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { jint rc = 0; OS_NATIVE_ENTER(env, that, GetDeviceCaps_FUNC); @@ -2727,12 +2694,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetDialogBaseUnits) #endif #ifndef NO_GetDlgItem -JNIEXPORT jintLong JNICALL OS_NATIVE(GetDlgItem) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) +JNIEXPORT jlong JNICALL OS_NATIVE(GetDlgItem) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, GetDlgItem_FUNC); - rc = (jintLong)GetDlgItem((HWND)arg0, arg1); + rc = (jlong)GetDlgItem((HWND)arg0, arg1); OS_NATIVE_EXIT(env, that, GetDlgItem_FUNC); return rc; } @@ -2752,7 +2719,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetDoubleClickTime) #ifndef NO_GetDpiForMonitor JNIEXPORT jint JNICALL OS_NATIVE(GetDpiForMonitor) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintArray arg2, jintArray arg3) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jintArray arg2, jintArray arg3) { jint *lparg2=NULL; jint *lparg3=NULL; @@ -2766,7 +2733,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetDpiForMonitor) { OS_LOAD_FUNCTION(fp, GetDpiForMonitor) if (fp) { - rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jint, jint *, jint *))fp)(arg0, arg1, lparg2, lparg3); + rc = (jint)((jint (CALLING_CONVENTION*)(jlong, jint, jint *, jint *))fp)(arg0, arg1, lparg2, lparg3); } } fail: @@ -2778,12 +2745,12 @@ fail: #endif #ifndef NO_GetFocus -JNIEXPORT jintLong JNICALL OS_NATIVE(GetFocus) +JNIEXPORT jlong JNICALL OS_NATIVE(GetFocus) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, GetFocus_FUNC); - rc = (jintLong)GetFocus(); + rc = (jlong)GetFocus(); OS_NATIVE_EXIT(env, that, GetFocus_FUNC); return rc; } @@ -2791,7 +2758,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(GetFocus) #ifndef NO_GetFontLanguageInfo JNIEXPORT jint JNICALL OS_NATIVE(GetFontLanguageInfo) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; OS_NATIVE_ENTER(env, that, GetFontLanguageInfo_FUNC); @@ -2802,12 +2769,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetFontLanguageInfo) #endif #ifndef NO_GetForegroundWindow -JNIEXPORT jintLong JNICALL OS_NATIVE(GetForegroundWindow) +JNIEXPORT jlong JNICALL OS_NATIVE(GetForegroundWindow) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, GetForegroundWindow_FUNC); - rc = (jintLong)GetForegroundWindow(); + rc = (jlong)GetForegroundWindow(); OS_NATIVE_EXIT(env, that, GetForegroundWindow_FUNC); return rc; } @@ -2831,7 +2798,7 @@ fail: #ifndef NO_GetGestureInfo JNIEXPORT jboolean JNICALL OS_NATIVE(GetGestureInfo) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { GESTUREINFO _arg1, *lparg1=NULL; jboolean rc = 0; @@ -2855,7 +2822,7 @@ fail: #ifndef NO_GetGlyphIndices JNIEXPORT jint JNICALL OS_NATIVE(GetGlyphIndices) - (JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jshortArray arg3, jint arg4) + (JNIEnv *env, jclass that, jlong arg0, jcharArray arg1, jint arg2, jshortArray arg3, jint arg4) { jchar *lparg1=NULL; jshort *lparg3=NULL; @@ -2874,7 +2841,7 @@ fail: #ifndef NO_GetGraphicsMode JNIEXPORT jint JNICALL OS_NATIVE(GetGraphicsMode) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; OS_NATIVE_ENTER(env, that, GetGraphicsMode_FUNC); @@ -2886,7 +2853,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetGraphicsMode) #ifndef NO_GetIconInfo JNIEXPORT jboolean JNICALL OS_NATIVE(GetIconInfo) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { ICONINFO _arg1, *lparg1=NULL; jboolean rc = 0; @@ -2913,12 +2880,12 @@ JNIEXPORT jshort JNICALL OS_NATIVE(GetKeyState) #endif #ifndef NO_GetKeyboardLayout -JNIEXPORT jintLong JNICALL OS_NATIVE(GetKeyboardLayout) +JNIEXPORT jlong JNICALL OS_NATIVE(GetKeyboardLayout) (JNIEnv *env, jclass that, jint arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, GetKeyboardLayout_FUNC); - rc = (jintLong)GetKeyboardLayout(arg0); + rc = (jlong)GetKeyboardLayout(arg0); OS_NATIVE_EXIT(env, that, GetKeyboardLayout_FUNC); return rc; } @@ -2926,15 +2893,15 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(GetKeyboardLayout) #ifndef NO_GetKeyboardLayoutList JNIEXPORT jint JNICALL OS_NATIVE(GetKeyboardLayoutList) - (JNIEnv *env, jclass that, jint arg0, jintLongArray arg1) + (JNIEnv *env, jclass that, jint arg0, jlongArray arg1) { - jintLong *lparg1=NULL; + jlong *lparg1=NULL; jint rc = 0; OS_NATIVE_ENTER(env, that, GetKeyboardLayoutList_FUNC); - if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail; + if (arg1) if ((lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL)) == NULL) goto fail; rc = (jint)GetKeyboardLayoutList(arg0, (HKL FAR *)lparg1); fail: - if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0); + if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, 0); OS_NATIVE_EXIT(env, that, GetKeyboardLayoutList_FUNC); return rc; } @@ -2957,12 +2924,12 @@ fail: #endif #ifndef NO_GetLastActivePopup -JNIEXPORT jintLong JNICALL OS_NATIVE(GetLastActivePopup) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(GetLastActivePopup) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, GetLastActivePopup_FUNC); - rc = (jintLong)GetLastActivePopup((HWND)arg0); + rc = (jlong)GetLastActivePopup((HWND)arg0); OS_NATIVE_EXIT(env, that, GetLastActivePopup_FUNC); return rc; } @@ -2982,7 +2949,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetLastError) #ifndef NO_GetLayeredWindowAttributes JNIEXPORT jboolean JNICALL OS_NATIVE(GetLayeredWindowAttributes) - (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jbyteArray arg2, jintArray arg3) + (JNIEnv *env, jclass that, jlong arg0, jintArray arg1, jbyteArray arg2, jintArray arg3) { jint *lparg1=NULL; jbyte *lparg2=NULL; @@ -3004,7 +2971,7 @@ fail: #ifndef NO_GetLayout JNIEXPORT jint JNICALL OS_NATIVE(GetLayout) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; OS_NATIVE_ENTER(env, that, GetLayout_FUNC); @@ -3031,12 +2998,12 @@ fail: #endif #ifndef NO_GetMenu -JNIEXPORT jintLong JNICALL OS_NATIVE(GetMenu) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(GetMenu) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, GetMenu_FUNC); - rc = (jintLong)GetMenu((HWND)arg0); + rc = (jlong)GetMenu((HWND)arg0); OS_NATIVE_EXIT(env, that, GetMenu_FUNC); return rc; } @@ -3044,7 +3011,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(GetMenu) #ifndef NO_GetMenuBarInfo JNIEXPORT jboolean JNICALL OS_NATIVE(GetMenuBarInfo) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jobject arg3) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jobject arg3) { MENUBARINFO _arg3, *lparg3=NULL; jboolean rc = 0; @@ -3060,7 +3027,7 @@ fail: #ifndef NO_GetMenuDefaultItem JNIEXPORT jint JNICALL OS_NATIVE(GetMenuDefaultItem) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2) { jint rc = 0; OS_NATIVE_ENTER(env, that, GetMenuDefaultItem_FUNC); @@ -3072,7 +3039,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetMenuDefaultItem) #ifndef NO_GetMenuInfo JNIEXPORT jboolean JNICALL OS_NATIVE(GetMenuInfo) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { MENUINFO _arg1, *lparg1=NULL; jboolean rc = 0; @@ -3088,7 +3055,7 @@ fail: #ifndef NO_GetMenuItemCount JNIEXPORT jint JNICALL OS_NATIVE(GetMenuItemCount) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; OS_NATIVE_ENTER(env, that, GetMenuItemCount_FUNC); @@ -3100,7 +3067,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetMenuItemCount) #ifndef NO_GetMenuItemInfo JNIEXPORT jboolean JNICALL OS_NATIVE(GetMenuItemInfo) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jboolean arg2, jobject arg3) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jboolean arg2, jobject arg3) { MENUITEMINFO _arg3, *lparg3=NULL; jboolean rc = 0; @@ -3116,7 +3083,7 @@ fail: #ifndef NO_GetMenuItemRect JNIEXPORT jboolean JNICALL OS_NATIVE(GetMenuItemRect) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jobject arg3) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jobject arg3) { RECT _arg3, *lparg3=NULL; jboolean rc = 0; @@ -3132,7 +3099,7 @@ fail: #ifndef NO_GetMessage JNIEXPORT jboolean JNICALL OS_NATIVE(GetMessage) - (JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2, jint arg3) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2, jint arg3) { MSG _arg0, *lparg0=NULL; jboolean rc = 0; @@ -3172,7 +3139,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetMessageTime) #ifndef NO_GetMetaRgn JNIEXPORT jint JNICALL OS_NATIVE(GetMetaRgn) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { jint rc = 0; OS_NATIVE_ENTER(env, that, GetMetaRgn_FUNC); @@ -3184,7 +3151,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetMetaRgn) #ifndef NO_GetModuleFileName JNIEXPORT jint JNICALL OS_NATIVE(GetModuleFileName) - (JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jcharArray arg1, jint arg2) { jchar *lparg1=NULL; jint rc = 0; @@ -3199,14 +3166,14 @@ fail: #endif #ifndef NO_GetModuleHandle -JNIEXPORT jintLong JNICALL OS_NATIVE(GetModuleHandle) +JNIEXPORT jlong JNICALL OS_NATIVE(GetModuleHandle) (JNIEnv *env, jclass that, jcharArray arg0) { jchar *lparg0=NULL; - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, GetModuleHandle_FUNC); if (arg0) if ((lparg0 = (*env)->GetCharArrayElements(env, arg0, NULL)) == NULL) goto fail; - rc = (jintLong)GetModuleHandle((LPWSTR)lparg0); + rc = (jlong)GetModuleHandle((LPWSTR)lparg0); fail: if (arg0 && lparg0) (*env)->ReleaseCharArrayElements(env, arg0, lparg0, 0); OS_NATIVE_EXIT(env, that, GetModuleHandle_FUNC); @@ -3216,7 +3183,7 @@ fail: #ifndef NO_GetMonitorInfo JNIEXPORT jboolean JNICALL OS_NATIVE(GetMonitorInfo) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { MONITORINFO _arg1, *lparg1=NULL; jboolean rc = 0; @@ -3230,133 +3197,78 @@ fail: } #endif -#if (!defined(NO_GetObject__III) && !defined(JNI64)) || (!defined(NO_GetObject__JIJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL OS_NATIVE(GetObject__III)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2) -#else -JNIEXPORT jint JNICALL OS_NATIVE(GetObject__JIJ)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2) -#endif +#ifndef NO_GetObject__JIJ +JNIEXPORT jint JNICALL OS_NATIVE(GetObject__JIJ) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2) { jint rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, GetObject__III_FUNC); -#else OS_NATIVE_ENTER(env, that, GetObject__JIJ_FUNC); -#endif rc = (jint)GetObject((HGDIOBJ)arg0, arg1, (LPVOID)arg2); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, GetObject__III_FUNC); -#else OS_NATIVE_EXIT(env, that, GetObject__JIJ_FUNC); -#endif return rc; } #endif -#if (!defined(NO_GetObject__IILorg_eclipse_swt_internal_win32_BITMAP_2) && !defined(JNI64)) || (!defined(NO_GetObject__JILorg_eclipse_swt_internal_win32_BITMAP_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL OS_NATIVE(GetObject__IILorg_eclipse_swt_internal_win32_BITMAP_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2) -#else -JNIEXPORT jint JNICALL OS_NATIVE(GetObject__JILorg_eclipse_swt_internal_win32_BITMAP_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2) -#endif +#ifndef NO_GetObject__JILorg_eclipse_swt_internal_win32_BITMAP_2 +JNIEXPORT jint JNICALL OS_NATIVE(GetObject__JILorg_eclipse_swt_internal_win32_BITMAP_2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jobject arg2) { BITMAP _arg2, *lparg2=NULL; jint rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, GetObject__IILorg_eclipse_swt_internal_win32_BITMAP_2_FUNC); -#else OS_NATIVE_ENTER(env, that, GetObject__JILorg_eclipse_swt_internal_win32_BITMAP_2_FUNC); -#endif if (arg2) if ((lparg2 = &_arg2) == NULL) goto fail; rc = (jint)GetObject((HGDIOBJ)arg0, arg1, lparg2); fail: if (arg2 && lparg2) setBITMAPFields(env, arg2, lparg2); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, GetObject__IILorg_eclipse_swt_internal_win32_BITMAP_2_FUNC); -#else OS_NATIVE_EXIT(env, that, GetObject__JILorg_eclipse_swt_internal_win32_BITMAP_2_FUNC); -#endif return rc; } #endif -#if (!defined(NO_GetObject__IILorg_eclipse_swt_internal_win32_DIBSECTION_2) && !defined(JNI64)) || (!defined(NO_GetObject__JILorg_eclipse_swt_internal_win32_DIBSECTION_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL OS_NATIVE(GetObject__IILorg_eclipse_swt_internal_win32_DIBSECTION_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2) -#else -JNIEXPORT jint JNICALL OS_NATIVE(GetObject__JILorg_eclipse_swt_internal_win32_DIBSECTION_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2) -#endif +#ifndef NO_GetObject__JILorg_eclipse_swt_internal_win32_DIBSECTION_2 +JNIEXPORT jint JNICALL OS_NATIVE(GetObject__JILorg_eclipse_swt_internal_win32_DIBSECTION_2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jobject arg2) { DIBSECTION _arg2, *lparg2=NULL; jint rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, GetObject__IILorg_eclipse_swt_internal_win32_DIBSECTION_2_FUNC); -#else OS_NATIVE_ENTER(env, that, GetObject__JILorg_eclipse_swt_internal_win32_DIBSECTION_2_FUNC); -#endif if (arg2) if ((lparg2 = &_arg2) == NULL) goto fail; rc = (jint)GetObject((HGDIOBJ)arg0, arg1, lparg2); fail: if (arg2 && lparg2) setDIBSECTIONFields(env, arg2, lparg2); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, GetObject__IILorg_eclipse_swt_internal_win32_DIBSECTION_2_FUNC); -#else OS_NATIVE_EXIT(env, that, GetObject__JILorg_eclipse_swt_internal_win32_DIBSECTION_2_FUNC); -#endif return rc; } #endif -#if (!defined(NO_GetObject__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2) && !defined(JNI64)) || (!defined(NO_GetObject__JILorg_eclipse_swt_internal_win32_LOGBRUSH_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL OS_NATIVE(GetObject__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2) -#else -JNIEXPORT jint JNICALL OS_NATIVE(GetObject__JILorg_eclipse_swt_internal_win32_LOGBRUSH_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2) -#endif +#ifndef NO_GetObject__JILorg_eclipse_swt_internal_win32_LOGBRUSH_2 +JNIEXPORT jint JNICALL OS_NATIVE(GetObject__JILorg_eclipse_swt_internal_win32_LOGBRUSH_2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jobject arg2) { LOGBRUSH _arg2, *lparg2=NULL; jint rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, GetObject__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2_FUNC); -#else OS_NATIVE_ENTER(env, that, GetObject__JILorg_eclipse_swt_internal_win32_LOGBRUSH_2_FUNC); -#endif if (arg2) if ((lparg2 = &_arg2) == NULL) goto fail; rc = (jint)GetObject((HGDIOBJ)arg0, arg1, lparg2); fail: if (arg2 && lparg2) setLOGBRUSHFields(env, arg2, lparg2); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, GetObject__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2_FUNC); -#else OS_NATIVE_EXIT(env, that, GetObject__JILorg_eclipse_swt_internal_win32_LOGBRUSH_2_FUNC); -#endif return rc; } #endif -#if (!defined(NO_GetObject__IILorg_eclipse_swt_internal_win32_LOGFONT_2) && !defined(JNI64)) || (!defined(NO_GetObject__JILorg_eclipse_swt_internal_win32_LOGFONT_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL OS_NATIVE(GetObject__IILorg_eclipse_swt_internal_win32_LOGFONT_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2) -#else -JNIEXPORT jint JNICALL OS_NATIVE(GetObject__JILorg_eclipse_swt_internal_win32_LOGFONT_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2) -#endif +#ifndef NO_GetObject__JILorg_eclipse_swt_internal_win32_LOGFONT_2 +JNIEXPORT jint JNICALL OS_NATIVE(GetObject__JILorg_eclipse_swt_internal_win32_LOGFONT_2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jobject arg2) { LOGFONT _arg2, *lparg2=NULL; jint rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, GetObject__IILorg_eclipse_swt_internal_win32_LOGFONT_2_FUNC); -#else OS_NATIVE_ENTER(env, that, GetObject__JILorg_eclipse_swt_internal_win32_LOGFONT_2_FUNC); -#endif if (arg2) if ((lparg2 = &_arg2) == NULL) goto fail; rc = (jint)GetObject((HGDIOBJ)arg0, arg1, lparg2); fail: if (arg2 && lparg2) setLOGFONTFields(env, arg2, lparg2); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, GetObject__IILorg_eclipse_swt_internal_win32_LOGFONT_2_FUNC); -#else OS_NATIVE_EXIT(env, that, GetObject__JILorg_eclipse_swt_internal_win32_LOGFONT_2_FUNC); -#endif return rc; } #endif @@ -3379,7 +3291,7 @@ fail: #ifndef NO_GetOutlineTextMetrics JNIEXPORT jint JNICALL OS_NATIVE(GetOutlineTextMetrics) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jobject arg2) { OUTLINETEXTMETRIC _arg2, *lparg2=NULL; jint rc = 0; @@ -3394,12 +3306,12 @@ fail: #endif #ifndef NO_GetParent -JNIEXPORT jintLong JNICALL OS_NATIVE(GetParent) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(GetParent) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, GetParent_FUNC); - rc = (jintLong)GetParent((HWND)arg0); + rc = (jlong)GetParent((HWND)arg0); OS_NATIVE_EXIT(env, that, GetParent_FUNC); return rc; } @@ -3407,7 +3319,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(GetParent) #ifndef NO_GetPixel JNIEXPORT jint JNICALL OS_NATIVE(GetPixel) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2) { jint rc = 0; OS_NATIVE_ENTER(env, that, GetPixel_FUNC); @@ -3419,7 +3331,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetPixel) #ifndef NO_GetPolyFillMode JNIEXPORT jint JNICALL OS_NATIVE(GetPolyFillMode) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; OS_NATIVE_ENTER(env, that, GetPolyFillMode_FUNC); @@ -3430,12 +3342,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetPolyFillMode) #endif #ifndef NO_GetProcessHeap -JNIEXPORT jintLong JNICALL OS_NATIVE(GetProcessHeap) +JNIEXPORT jlong JNICALL OS_NATIVE(GetProcessHeap) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, GetProcessHeap_FUNC); - rc = (jintLong)GetProcessHeap(); + rc = (jlong)GetProcessHeap(); OS_NATIVE_EXIT(env, that, GetProcessHeap_FUNC); return rc; } @@ -3467,12 +3379,12 @@ fail: #endif #ifndef NO_GetProp -JNIEXPORT jintLong JNICALL OS_NATIVE(GetProp) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) +JNIEXPORT jlong JNICALL OS_NATIVE(GetProp) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, GetProp_FUNC); - rc = (jintLong)GetProp((HWND)arg0, (LPCWSTR)arg1); + rc = (jlong)GetProp((HWND)arg0, (LPCWSTR)arg1); OS_NATIVE_EXIT(env, that, GetProp_FUNC); return rc; } @@ -3480,7 +3392,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(GetProp) #ifndef NO_GetROP2 JNIEXPORT jint JNICALL OS_NATIVE(GetROP2) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; OS_NATIVE_ENTER(env, that, GetROP2_FUNC); @@ -3492,7 +3404,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetROP2) #ifndef NO_GetRandomRgn JNIEXPORT jint JNICALL OS_NATIVE(GetRandomRgn) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2) { jint rc = 0; OS_NATIVE_ENTER(env, that, GetRandomRgn_FUNC); @@ -3504,7 +3416,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetRandomRgn) #ifndef NO_GetRegionData JNIEXPORT jint JNICALL OS_NATIVE(GetRegionData) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintArray arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jintArray arg2) { jint *lparg2=NULL; jint rc = 0; @@ -3520,7 +3432,7 @@ fail: #ifndef NO_GetRgnBox JNIEXPORT jint JNICALL OS_NATIVE(GetRgnBox) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { RECT _arg1, *lparg1=NULL; jint rc = 0; @@ -3552,7 +3464,7 @@ fail: #ifndef NO_GetScrollBarInfo JNIEXPORT jboolean JNICALL OS_NATIVE(GetScrollBarInfo) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jobject arg2) { SCROLLBARINFO _arg2, *lparg2=NULL; jboolean rc = 0; @@ -3568,7 +3480,7 @@ fail: #ifndef NO_GetScrollInfo JNIEXPORT jboolean JNICALL OS_NATIVE(GetScrollInfo) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jobject arg2) { SCROLLINFO _arg2, *lparg2=NULL; jboolean rc = 0; @@ -3597,12 +3509,12 @@ fail: #endif #ifndef NO_GetStockObject -JNIEXPORT jintLong JNICALL OS_NATIVE(GetStockObject) +JNIEXPORT jlong JNICALL OS_NATIVE(GetStockObject) (JNIEnv *env, jclass that, jint arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, GetStockObject_FUNC); - rc = (jintLong)GetStockObject(arg0); + rc = (jlong)GetStockObject(arg0); OS_NATIVE_EXIT(env, that, GetStockObject_FUNC); return rc; } @@ -3621,12 +3533,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetSysColor) #endif #ifndef NO_GetSysColorBrush -JNIEXPORT jintLong JNICALL OS_NATIVE(GetSysColorBrush) +JNIEXPORT jlong JNICALL OS_NATIVE(GetSysColorBrush) (JNIEnv *env, jclass that, jint arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, GetSysColorBrush_FUNC); - rc = (jintLong)GetSysColorBrush(arg0); + rc = (jlong)GetSysColorBrush(arg0); OS_NATIVE_EXIT(env, that, GetSysColorBrush_FUNC); return rc; } @@ -3645,12 +3557,12 @@ JNIEXPORT jshort JNICALL OS_NATIVE(GetSystemDefaultUILanguage) #endif #ifndef NO_GetSystemMenu -JNIEXPORT jintLong JNICALL OS_NATIVE(GetSystemMenu) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) +JNIEXPORT jlong JNICALL OS_NATIVE(GetSystemMenu) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, GetSystemMenu_FUNC); - rc = (jintLong)GetSystemMenu((HWND)arg0, arg1); + rc = (jlong)GetSystemMenu((HWND)arg0, arg1); OS_NATIVE_EXIT(env, that, GetSystemMenu_FUNC); return rc; } @@ -3670,7 +3582,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetSystemMetrics) #ifndef NO_GetTextColor JNIEXPORT jint JNICALL OS_NATIVE(GetTextColor) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; OS_NATIVE_ENTER(env, that, GetTextColor_FUNC); @@ -3682,7 +3594,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetTextColor) #ifndef NO_GetTextExtentPoint32 JNIEXPORT jboolean JNICALL OS_NATIVE(GetTextExtentPoint32) - (JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jobject arg3) + (JNIEnv *env, jclass that, jlong arg0, jcharArray arg1, jint arg2, jobject arg3) { jchar *lparg1=NULL; SIZE _arg3, *lparg3=NULL; @@ -3701,7 +3613,7 @@ fail: #ifndef NO_GetTextMetrics JNIEXPORT jboolean JNICALL OS_NATIVE(GetTextMetrics) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { TEXTMETRIC _arg1, *lparg1=NULL; jboolean rc = 0; @@ -3717,7 +3629,7 @@ fail: #ifndef NO_GetThemePartSize JNIEXPORT jint JNICALL OS_NATIVE(GetThemePartSize) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jobject arg6) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jobject arg6) { RECT _arg4, *lparg4=NULL; SIZE _arg6, *lparg6=NULL; @@ -3735,7 +3647,7 @@ fail: #ifndef NO_GetThemeTextExtent JNIEXPORT jint JNICALL OS_NATIVE(GetThemeTextExtent) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4, jint arg5, jint arg6, jobject arg7, jobject arg8) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jcharArray arg4, jint arg5, jint arg6, jobject arg7, jobject arg8) { jchar *lparg4=NULL; RECT _arg7, *lparg7=NULL; @@ -3757,7 +3669,7 @@ fail: #ifndef NO_GetTouchInputInfo JNIEXPORT jboolean JNICALL OS_NATIVE(GetTouchInputInfo) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jint arg3) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2, jint arg3) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, GetTouchInputInfo_FUNC); @@ -3777,7 +3689,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(GetTouchInputInfo) #ifndef NO_GetUpdateRect JNIEXPORT jboolean JNICALL OS_NATIVE(GetUpdateRect) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jboolean arg2) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jboolean arg2) { RECT _arg1, *lparg1=NULL; jboolean rc = 0; @@ -3793,7 +3705,7 @@ fail: #ifndef NO_GetUpdateRgn JNIEXPORT jint JNICALL OS_NATIVE(GetUpdateRgn) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jboolean arg2) { jint rc = 0; OS_NATIVE_ENTER(env, that, GetUpdateRgn_FUNC); @@ -3816,24 +3728,24 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetVersion) #endif #ifndef NO_GetWindow -JNIEXPORT jintLong JNICALL OS_NATIVE(GetWindow) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) +JNIEXPORT jlong JNICALL OS_NATIVE(GetWindow) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, GetWindow_FUNC); - rc = (jintLong)GetWindow((HWND)arg0, arg1); + rc = (jlong)GetWindow((HWND)arg0, arg1); OS_NATIVE_EXIT(env, that, GetWindow_FUNC); return rc; } #endif #ifndef NO_GetWindowDC -JNIEXPORT jintLong JNICALL OS_NATIVE(GetWindowDC) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(GetWindowDC) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, GetWindowDC_FUNC); - rc = (jintLong)GetWindowDC((HWND)arg0); + rc = (jlong)GetWindowDC((HWND)arg0); OS_NATIVE_EXIT(env, that, GetWindowDC_FUNC); return rc; } @@ -3841,7 +3753,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(GetWindowDC) #ifndef NO_GetWindowLong JNIEXPORT jint JNICALL OS_NATIVE(GetWindowLong) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { jint rc = 0; OS_NATIVE_ENTER(env, that, GetWindowLong_FUNC); @@ -3852,12 +3764,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetWindowLong) #endif #ifndef NO_GetWindowLongPtr -JNIEXPORT jintLong JNICALL OS_NATIVE(GetWindowLongPtr) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) +JNIEXPORT jlong JNICALL OS_NATIVE(GetWindowLongPtr) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, GetWindowLongPtr_FUNC); - rc = (jintLong)GetWindowLongPtr((HWND)arg0, arg1); + rc = (jlong)GetWindowLongPtr((HWND)arg0, arg1); OS_NATIVE_EXIT(env, that, GetWindowLongPtr_FUNC); return rc; } @@ -3865,7 +3777,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(GetWindowLongPtr) #ifndef NO_GetWindowOrgEx JNIEXPORT jboolean JNICALL OS_NATIVE(GetWindowOrgEx) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { POINT _arg1, *lparg1=NULL; jboolean rc = 0; @@ -3881,7 +3793,7 @@ fail: #ifndef NO_GetWindowPlacement JNIEXPORT jboolean JNICALL OS_NATIVE(GetWindowPlacement) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { WINDOWPLACEMENT _arg1, *lparg1=NULL; jboolean rc = 0; @@ -3897,7 +3809,7 @@ fail: #ifndef NO_GetWindowRect JNIEXPORT jboolean JNICALL OS_NATIVE(GetWindowRect) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { RECT _arg1, *lparg1=NULL; jboolean rc = 0; @@ -3913,7 +3825,7 @@ fail: #ifndef NO_GetWindowRgn JNIEXPORT jint JNICALL OS_NATIVE(GetWindowRgn) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { jint rc = 0; OS_NATIVE_ENTER(env, that, GetWindowRgn_FUNC); @@ -3925,7 +3837,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetWindowRgn) #ifndef NO_GetWindowText JNIEXPORT jint JNICALL OS_NATIVE(GetWindowText) - (JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jcharArray arg1, jint arg2) { jchar *lparg1=NULL; jint rc = 0; @@ -3941,7 +3853,7 @@ fail: #ifndef NO_GetWindowTextLength JNIEXPORT jint JNICALL OS_NATIVE(GetWindowTextLength) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; OS_NATIVE_ENTER(env, that, GetWindowTextLength_FUNC); @@ -3953,7 +3865,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetWindowTextLength) #ifndef NO_GetWindowThreadProcessId JNIEXPORT jint JNICALL OS_NATIVE(GetWindowThreadProcessId) - (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jintArray arg1) { jint *lparg1=NULL; jint rc = 0; @@ -3984,36 +3896,36 @@ fail: #endif #ifndef NO_GlobalAlloc -JNIEXPORT jintLong JNICALL OS_NATIVE(GlobalAlloc) +JNIEXPORT jlong JNICALL OS_NATIVE(GlobalAlloc) (JNIEnv *env, jclass that, jint arg0, jint arg1) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, GlobalAlloc_FUNC); - rc = (jintLong)GlobalAlloc(arg0, arg1); + rc = (jlong)GlobalAlloc(arg0, arg1); OS_NATIVE_EXIT(env, that, GlobalAlloc_FUNC); return rc; } #endif #ifndef NO_GlobalFree -JNIEXPORT jintLong JNICALL OS_NATIVE(GlobalFree) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(GlobalFree) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, GlobalFree_FUNC); - rc = (jintLong)GlobalFree((HANDLE)arg0); + rc = (jlong)GlobalFree((HANDLE)arg0); OS_NATIVE_EXIT(env, that, GlobalFree_FUNC); return rc; } #endif #ifndef NO_GlobalLock -JNIEXPORT jintLong JNICALL OS_NATIVE(GlobalLock) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(GlobalLock) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, GlobalLock_FUNC); - rc = (jintLong)GlobalLock((HANDLE)arg0); + rc = (jlong)GlobalLock((HANDLE)arg0); OS_NATIVE_EXIT(env, that, GlobalLock_FUNC); return rc; } @@ -4021,7 +3933,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(GlobalLock) #ifndef NO_GlobalSize JNIEXPORT jint JNICALL OS_NATIVE(GlobalSize) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; OS_NATIVE_ENTER(env, that, GlobalSize_FUNC); @@ -4033,7 +3945,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GlobalSize) #ifndef NO_GlobalUnlock JNIEXPORT jboolean JNICALL OS_NATIVE(GlobalUnlock) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, GlobalUnlock_FUNC); @@ -4045,7 +3957,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(GlobalUnlock) #ifndef NO_GradientFill JNIEXPORT jboolean JNICALL OS_NATIVE(GradientFill) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jint arg4, jint arg5) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jlong arg3, jint arg4, jint arg5) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, GradientFill_FUNC); @@ -4117,7 +4029,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(HIGHCONTRAST_1sizeof) #ifndef NO_HIWORD JNIEXPORT jint JNICALL OS_NATIVE(HIWORD) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; OS_NATIVE_ENTER(env, that, HIWORD_FUNC); @@ -4128,12 +4040,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(HIWORD) #endif #ifndef NO_HeapAlloc -JNIEXPORT jintLong JNICALL OS_NATIVE(HeapAlloc) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2) +JNIEXPORT jlong JNICALL OS_NATIVE(HeapAlloc) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, HeapAlloc_FUNC); - rc = (jintLong)HeapAlloc((HANDLE)arg0, arg1, arg2); + rc = (jlong)HeapAlloc((HANDLE)arg0, arg1, arg2); OS_NATIVE_EXIT(env, that, HeapAlloc_FUNC); return rc; } @@ -4141,7 +4053,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(HeapAlloc) #ifndef NO_HeapFree JNIEXPORT jboolean JNICALL OS_NATIVE(HeapFree) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, HeapFree_FUNC); @@ -4153,7 +4065,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(HeapFree) #ifndef NO_HideCaret JNIEXPORT jboolean JNICALL OS_NATIVE(HideCaret) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, HideCaret_FUNC); @@ -4220,7 +4132,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(INPUT_1sizeof) #ifndef NO_ImageList_1Add JNIEXPORT jint JNICALL OS_NATIVE(ImageList_1Add) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2) { jint rc = 0; OS_NATIVE_ENTER(env, that, ImageList_1Add_FUNC); @@ -4232,7 +4144,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(ImageList_1Add) #ifndef NO_ImageList_1AddMasked JNIEXPORT jint JNICALL OS_NATIVE(ImageList_1AddMasked) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2) { jint rc = 0; OS_NATIVE_ENTER(env, that, ImageList_1AddMasked_FUNC); @@ -4244,7 +4156,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(ImageList_1AddMasked) #ifndef NO_ImageList_1BeginDrag JNIEXPORT jboolean JNICALL OS_NATIVE(ImageList_1BeginDrag) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, ImageList_1BeginDrag_FUNC); @@ -4255,12 +4167,12 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(ImageList_1BeginDrag) #endif #ifndef NO_ImageList_1Create -JNIEXPORT jintLong JNICALL OS_NATIVE(ImageList_1Create) +JNIEXPORT jlong JNICALL OS_NATIVE(ImageList_1Create) (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, ImageList_1Create_FUNC); - rc = (jintLong)ImageList_Create(arg0, arg1, arg2, arg3, arg4); + rc = (jlong)ImageList_Create(arg0, arg1, arg2, arg3, arg4); OS_NATIVE_EXIT(env, that, ImageList_1Create_FUNC); return rc; } @@ -4268,7 +4180,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(ImageList_1Create) #ifndef NO_ImageList_1Destroy JNIEXPORT jboolean JNICALL OS_NATIVE(ImageList_1Destroy) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, ImageList_1Destroy_FUNC); @@ -4280,7 +4192,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(ImageList_1Destroy) #ifndef NO_ImageList_1DragEnter JNIEXPORT jboolean JNICALL OS_NATIVE(ImageList_1DragEnter) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, ImageList_1DragEnter_FUNC); @@ -4292,7 +4204,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(ImageList_1DragEnter) #ifndef NO_ImageList_1DragLeave JNIEXPORT jboolean JNICALL OS_NATIVE(ImageList_1DragLeave) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, ImageList_1DragLeave_FUNC); @@ -4338,7 +4250,7 @@ JNIEXPORT void JNICALL OS_NATIVE(ImageList_1EndDrag) #ifndef NO_ImageList_1GetIconSize JNIEXPORT jboolean JNICALL OS_NATIVE(ImageList_1GetIconSize) - (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2) + (JNIEnv *env, jclass that, jlong arg0, jintArray arg1, jintArray arg2) { jint *lparg1=NULL; jint *lparg2=NULL; @@ -4357,7 +4269,7 @@ fail: #ifndef NO_ImageList_1GetImageCount JNIEXPORT jint JNICALL OS_NATIVE(ImageList_1GetImageCount) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; OS_NATIVE_ENTER(env, that, ImageList_1GetImageCount_FUNC); @@ -4369,7 +4281,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(ImageList_1GetImageCount) #ifndef NO_ImageList_1Remove JNIEXPORT jboolean JNICALL OS_NATIVE(ImageList_1Remove) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, ImageList_1Remove_FUNC); @@ -4381,7 +4293,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(ImageList_1Remove) #ifndef NO_ImageList_1Replace JNIEXPORT jboolean JNICALL OS_NATIVE(ImageList_1Replace) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintLong arg3) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2, jlong arg3) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, ImageList_1Replace_FUNC); @@ -4393,7 +4305,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(ImageList_1Replace) #ifndef NO_ImageList_1ReplaceIcon JNIEXPORT jint JNICALL OS_NATIVE(ImageList_1ReplaceIcon) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2) { jint rc = 0; OS_NATIVE_ENTER(env, that, ImageList_1ReplaceIcon_FUNC); @@ -4405,7 +4317,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(ImageList_1ReplaceIcon) #ifndef NO_ImageList_1SetIconSize JNIEXPORT jboolean JNICALL OS_NATIVE(ImageList_1SetIconSize) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, ImageList_1SetIconSize_FUNC); @@ -4416,24 +4328,24 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(ImageList_1SetIconSize) #endif #ifndef NO_ImmAssociateContext -JNIEXPORT jintLong JNICALL OS_NATIVE(ImmAssociateContext) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) +JNIEXPORT jlong JNICALL OS_NATIVE(ImmAssociateContext) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, ImmAssociateContext_FUNC); - rc = (jintLong)ImmAssociateContext((HWND)arg0, (HIMC)arg1); + rc = (jlong)ImmAssociateContext((HWND)arg0, (HIMC)arg1); OS_NATIVE_EXIT(env, that, ImmAssociateContext_FUNC); return rc; } #endif #ifndef NO_ImmCreateContext -JNIEXPORT jintLong JNICALL OS_NATIVE(ImmCreateContext) +JNIEXPORT jlong JNICALL OS_NATIVE(ImmCreateContext) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, ImmCreateContext_FUNC); - rc = (jintLong)ImmCreateContext(); + rc = (jlong)ImmCreateContext(); OS_NATIVE_EXIT(env, that, ImmCreateContext_FUNC); return rc; } @@ -4441,7 +4353,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(ImmCreateContext) #ifndef NO_ImmDestroyContext JNIEXPORT jboolean JNICALL OS_NATIVE(ImmDestroyContext) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, ImmDestroyContext_FUNC); @@ -4452,14 +4364,14 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(ImmDestroyContext) #endif #ifndef NO_ImmEscape -JNIEXPORT jintLong JNICALL OS_NATIVE(ImmEscape) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jcharArray arg3) +JNIEXPORT jlong JNICALL OS_NATIVE(ImmEscape) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jcharArray arg3) { jchar *lparg3=NULL; - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, ImmEscape_FUNC); if (arg3) if ((lparg3 = (*env)->GetCharArrayElements(env, arg3, NULL)) == NULL) goto fail; - rc = (jintLong)ImmEscape((HKL)arg0, (HIMC)arg1, arg2, (LPVOID)lparg3); + rc = (jlong)ImmEscape((HKL)arg0, (HIMC)arg1, arg2, (LPVOID)lparg3); fail: if (arg3 && lparg3) (*env)->ReleaseCharArrayElements(env, arg3, lparg3, 0); OS_NATIVE_EXIT(env, that, ImmEscape_FUNC); @@ -4469,7 +4381,7 @@ fail: #ifndef NO_ImmGetCompositionFont JNIEXPORT jboolean JNICALL OS_NATIVE(ImmGetCompositionFont) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { LOGFONT _arg1, *lparg1=NULL; jboolean rc = 0; @@ -4483,94 +4395,61 @@ fail: } #endif -#if (!defined(NO_ImmGetCompositionString__II_3BI) && !defined(JNI64)) || (!defined(NO_ImmGetCompositionString__JI_3BI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL OS_NATIVE(ImmGetCompositionString__II_3BI)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jbyteArray arg2, jint arg3) -#else -JNIEXPORT jint JNICALL OS_NATIVE(ImmGetCompositionString__JI_3BI)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jbyteArray arg2, jint arg3) -#endif +#ifndef NO_ImmGetCompositionString__JI_3BI +JNIEXPORT jint JNICALL OS_NATIVE(ImmGetCompositionString__JI_3BI) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jbyteArray arg2, jint arg3) { jbyte *lparg2=NULL; jint rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, ImmGetCompositionString__II_3BI_FUNC); -#else OS_NATIVE_ENTER(env, that, ImmGetCompositionString__JI_3BI_FUNC); -#endif if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail; rc = (jint)ImmGetCompositionString((HIMC)arg0, arg1, (LPWSTR)lparg2, arg3); fail: if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, ImmGetCompositionString__II_3BI_FUNC); -#else OS_NATIVE_EXIT(env, that, ImmGetCompositionString__JI_3BI_FUNC); -#endif return rc; } #endif -#if (!defined(NO_ImmGetCompositionString__II_3CI) && !defined(JNI64)) || (!defined(NO_ImmGetCompositionString__JI_3CI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL OS_NATIVE(ImmGetCompositionString__II_3CI)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jcharArray arg2, jint arg3) -#else -JNIEXPORT jint JNICALL OS_NATIVE(ImmGetCompositionString__JI_3CI)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jcharArray arg2, jint arg3) -#endif +#ifndef NO_ImmGetCompositionString__JI_3CI +JNIEXPORT jint JNICALL OS_NATIVE(ImmGetCompositionString__JI_3CI) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jcharArray arg2, jint arg3) { jchar *lparg2=NULL; jint rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, ImmGetCompositionString__II_3CI_FUNC); -#else OS_NATIVE_ENTER(env, that, ImmGetCompositionString__JI_3CI_FUNC); -#endif if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail; rc = (jint)ImmGetCompositionString((HIMC)arg0, arg1, (LPWSTR)lparg2, arg3); fail: if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, ImmGetCompositionString__II_3CI_FUNC); -#else OS_NATIVE_EXIT(env, that, ImmGetCompositionString__JI_3CI_FUNC); -#endif return rc; } #endif -#if (!defined(NO_ImmGetCompositionString__II_3II) && !defined(JNI64)) || (!defined(NO_ImmGetCompositionString__JI_3II) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL OS_NATIVE(ImmGetCompositionString__II_3II)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintArray arg2, jint arg3) -#else -JNIEXPORT jint JNICALL OS_NATIVE(ImmGetCompositionString__JI_3II)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintArray arg2, jint arg3) -#endif +#ifndef NO_ImmGetCompositionString__JI_3II +JNIEXPORT jint JNICALL OS_NATIVE(ImmGetCompositionString__JI_3II) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jintArray arg2, jint arg3) { jint *lparg2=NULL; jint rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, ImmGetCompositionString__II_3II_FUNC); -#else OS_NATIVE_ENTER(env, that, ImmGetCompositionString__JI_3II_FUNC); -#endif if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail; rc = (jint)ImmGetCompositionString((HIMC)arg0, arg1, (LPWSTR)lparg2, arg3); fail: if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, ImmGetCompositionString__II_3II_FUNC); -#else OS_NATIVE_EXIT(env, that, ImmGetCompositionString__JI_3II_FUNC); -#endif return rc; } #endif #ifndef NO_ImmGetContext -JNIEXPORT jintLong JNICALL OS_NATIVE(ImmGetContext) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(ImmGetContext) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, ImmGetContext_FUNC); - rc = (jintLong)ImmGetContext((HWND)arg0); + rc = (jlong)ImmGetContext((HWND)arg0); OS_NATIVE_EXIT(env, that, ImmGetContext_FUNC); return rc; } @@ -4578,7 +4457,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(ImmGetContext) #ifndef NO_ImmGetConversionStatus JNIEXPORT jboolean JNICALL OS_NATIVE(ImmGetConversionStatus) - (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2) + (JNIEnv *env, jclass that, jlong arg0, jintArray arg1, jintArray arg2) { jint *lparg1=NULL; jint *lparg2=NULL; @@ -4596,12 +4475,12 @@ fail: #endif #ifndef NO_ImmGetDefaultIMEWnd -JNIEXPORT jintLong JNICALL OS_NATIVE(ImmGetDefaultIMEWnd) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(ImmGetDefaultIMEWnd) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, ImmGetDefaultIMEWnd_FUNC); - rc = (jintLong)ImmGetDefaultIMEWnd((HWND)arg0); + rc = (jlong)ImmGetDefaultIMEWnd((HWND)arg0); OS_NATIVE_EXIT(env, that, ImmGetDefaultIMEWnd_FUNC); return rc; } @@ -4609,7 +4488,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(ImmGetDefaultIMEWnd) #ifndef NO_ImmGetOpenStatus JNIEXPORT jboolean JNICALL OS_NATIVE(ImmGetOpenStatus) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, ImmGetOpenStatus_FUNC); @@ -4621,7 +4500,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(ImmGetOpenStatus) #ifndef NO_ImmNotifyIME JNIEXPORT jboolean JNICALL OS_NATIVE(ImmNotifyIME) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, ImmNotifyIME_FUNC); @@ -4633,7 +4512,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(ImmNotifyIME) #ifndef NO_ImmReleaseContext JNIEXPORT jboolean JNICALL OS_NATIVE(ImmReleaseContext) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, ImmReleaseContext_FUNC); @@ -4645,7 +4524,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(ImmReleaseContext) #ifndef NO_ImmSetCandidateWindow JNIEXPORT jboolean JNICALL OS_NATIVE(ImmSetCandidateWindow) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { CANDIDATEFORM _arg1, *lparg1=NULL; jboolean rc = 0; @@ -4661,7 +4540,7 @@ fail: #ifndef NO_ImmSetCompositionFont JNIEXPORT jboolean JNICALL OS_NATIVE(ImmSetCompositionFont) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { LOGFONT _arg1, *lparg1=NULL; jboolean rc = 0; @@ -4677,7 +4556,7 @@ fail: #ifndef NO_ImmSetCompositionWindow JNIEXPORT jboolean JNICALL OS_NATIVE(ImmSetCompositionWindow) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { COMPOSITIONFORM _arg1, *lparg1=NULL; jboolean rc = 0; @@ -4693,7 +4572,7 @@ fail: #ifndef NO_ImmSetConversionStatus JNIEXPORT jboolean JNICALL OS_NATIVE(ImmSetConversionStatus) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, ImmSetConversionStatus_FUNC); @@ -4705,7 +4584,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(ImmSetConversionStatus) #ifndef NO_ImmSetOpenStatus JNIEXPORT jboolean JNICALL OS_NATIVE(ImmSetOpenStatus) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, ImmSetOpenStatus_FUNC); @@ -4743,7 +4622,7 @@ fail: #ifndef NO_InsertMenuItem JNIEXPORT jboolean JNICALL OS_NATIVE(InsertMenuItem) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jboolean arg2, jobject arg3) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jboolean arg2, jobject arg3) { MENUITEMINFO _arg3, *lparg3=NULL; jboolean rc = 0; @@ -4806,7 +4685,7 @@ fail: #ifndef NO_InternetSetOption JNIEXPORT jboolean JNICALL OS_NATIVE(InternetSetOption) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jint arg3) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2, jint arg3) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, InternetSetOption_FUNC); @@ -4818,7 +4697,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(InternetSetOption) #ifndef NO_IntersectClipRect JNIEXPORT jint JNICALL OS_NATIVE(IntersectClipRect) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3, jint arg4) { jint rc = 0; OS_NATIVE_ENTER(env, that, IntersectClipRect_FUNC); @@ -4850,7 +4729,7 @@ fail: #ifndef NO_InvalidateRect JNIEXPORT jboolean JNICALL OS_NATIVE(InvalidateRect) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jboolean arg2) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jboolean arg2) { RECT _arg1, *lparg1=NULL; jboolean rc = 0; @@ -4866,7 +4745,7 @@ fail: #ifndef NO_InvalidateRgn JNIEXPORT jboolean JNICALL OS_NATIVE(InvalidateRgn) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jboolean arg2) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, InvalidateRgn_FUNC); @@ -4890,7 +4769,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(IsAppThemed) #ifndef NO_IsHungAppWindow JNIEXPORT jboolean JNICALL OS_NATIVE(IsHungAppWindow) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, IsHungAppWindow_FUNC); @@ -4902,7 +4781,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(IsHungAppWindow) #ifndef NO_IsIconic JNIEXPORT jboolean JNICALL OS_NATIVE(IsIconic) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, IsIconic_FUNC); @@ -4914,7 +4793,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(IsIconic) #ifndef NO_IsTouchWindow JNIEXPORT jboolean JNICALL OS_NATIVE(IsTouchWindow) - (JNIEnv *env, jclass that, jintLong arg0, jlongArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jlongArray arg1) { jlong *lparg1=NULL; jboolean rc = 0; @@ -4938,7 +4817,7 @@ fail: #ifndef NO_IsWindowEnabled JNIEXPORT jboolean JNICALL OS_NATIVE(IsWindowEnabled) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, IsWindowEnabled_FUNC); @@ -4950,7 +4829,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(IsWindowEnabled) #ifndef NO_IsWindowVisible JNIEXPORT jboolean JNICALL OS_NATIVE(IsWindowVisible) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, IsWindowVisible_FUNC); @@ -4962,7 +4841,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(IsWindowVisible) #ifndef NO_IsZoomed JNIEXPORT jboolean JNICALL OS_NATIVE(IsZoomed) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, IsZoomed_FUNC); @@ -4986,7 +4865,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(KEYBDINPUT_1sizeof) #ifndef NO_KillTimer JNIEXPORT jboolean JNICALL OS_NATIVE(KillTimer) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, KillTimer_FUNC); @@ -5058,7 +4937,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(LOGPEN_1sizeof) #ifndef NO_LOWORD JNIEXPORT jint JNICALL OS_NATIVE(LOWORD) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; OS_NATIVE_ENTER(env, that, LOWORD_FUNC); @@ -5070,7 +4949,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(LOWORD) #ifndef NO_LPtoDP JNIEXPORT jboolean JNICALL OS_NATIVE(LPtoDP) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2) { POINT _arg1, *lparg1=NULL; jboolean rc = 0; @@ -5134,7 +5013,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(LVITEM_1sizeof) #ifndef NO_LineTo JNIEXPORT jboolean JNICALL OS_NATIVE(LineTo) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, LineTo_FUNC); @@ -5145,36 +5024,36 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(LineTo) #endif #ifndef NO_LoadBitmap -JNIEXPORT jintLong JNICALL OS_NATIVE(LoadBitmap) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) +JNIEXPORT jlong JNICALL OS_NATIVE(LoadBitmap) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, LoadBitmap_FUNC); - rc = (jintLong)LoadBitmap((HINSTANCE)arg0, (LPWSTR)arg1); + rc = (jlong)LoadBitmap((HINSTANCE)arg0, (LPWSTR)arg1); OS_NATIVE_EXIT(env, that, LoadBitmap_FUNC); return rc; } #endif #ifndef NO_LoadCursor -JNIEXPORT jintLong JNICALL OS_NATIVE(LoadCursor) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) +JNIEXPORT jlong JNICALL OS_NATIVE(LoadCursor) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, LoadCursor_FUNC); - rc = (jintLong)LoadCursor((HINSTANCE)arg0, (LPWSTR)arg1); + rc = (jlong)LoadCursor((HINSTANCE)arg0, (LPWSTR)arg1); OS_NATIVE_EXIT(env, that, LoadCursor_FUNC); return rc; } #endif #ifndef NO_LoadIcon -JNIEXPORT jintLong JNICALL OS_NATIVE(LoadIcon) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) +JNIEXPORT jlong JNICALL OS_NATIVE(LoadIcon) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, LoadIcon_FUNC); - rc = (jintLong)LoadIcon((HINSTANCE)arg0, (LPWSTR)arg1); + rc = (jlong)LoadIcon((HINSTANCE)arg0, (LPWSTR)arg1); OS_NATIVE_EXIT(env, that, LoadIcon_FUNC); return rc; } @@ -5182,63 +5061,63 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(LoadIcon) #ifndef NO_LoadIconMetric JNIEXPORT jint JNICALL OS_NATIVE(LoadIconMetric) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLongArray arg3) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jlongArray arg3) { - jintLong *lparg3=NULL; + jlong *lparg3=NULL; jint rc = 0; OS_NATIVE_ENTER(env, that, LoadIconMetric_FUNC); - if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail; + if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail; rc = (jint)LoadIconMetric((HINSTANCE)arg0, (PCWSTR)arg1, arg2, (HICON *)lparg3); fail: - if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0); + if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0); OS_NATIVE_EXIT(env, that, LoadIconMetric_FUNC); return rc; } #endif #ifndef NO_LoadImage -JNIEXPORT jintLong JNICALL OS_NATIVE(LoadImage) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5) +JNIEXPORT jlong JNICALL OS_NATIVE(LoadImage) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jint arg5) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, LoadImage_FUNC); - rc = (jintLong)LoadImage((HINSTANCE)arg0, (LPWSTR)arg1, arg2, arg3, arg4, arg5); + rc = (jlong)LoadImage((HINSTANCE)arg0, (LPWSTR)arg1, arg2, arg3, arg4, arg5); OS_NATIVE_EXIT(env, that, LoadImage_FUNC); return rc; } #endif #ifndef NO_LocalFree -JNIEXPORT jintLong JNICALL OS_NATIVE(LocalFree) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(LocalFree) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, LocalFree_FUNC); - rc = (jintLong)LocalFree((HLOCAL)arg0); + rc = (jlong)LocalFree((HLOCAL)arg0); OS_NATIVE_EXIT(env, that, LocalFree_FUNC); return rc; } #endif #ifndef NO_MAKELPARAM -JNIEXPORT jintLong JNICALL OS_NATIVE(MAKELPARAM) +JNIEXPORT jlong JNICALL OS_NATIVE(MAKELPARAM) (JNIEnv *env, jclass that, jint arg0, jint arg1) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, MAKELPARAM_FUNC); - rc = (jintLong)MAKELPARAM(arg0, arg1); + rc = (jlong)MAKELPARAM(arg0, arg1); OS_NATIVE_EXIT(env, that, MAKELPARAM_FUNC); return rc; } #endif #ifndef NO_MAKELRESULT -JNIEXPORT jintLong JNICALL OS_NATIVE(MAKELRESULT) +JNIEXPORT jlong JNICALL OS_NATIVE(MAKELRESULT) (JNIEnv *env, jclass that, jint arg0, jint arg1) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, MAKELRESULT_FUNC); - rc = (jintLong)MAKELRESULT(arg0, arg1); + rc = (jlong)MAKELRESULT(arg0, arg1); OS_NATIVE_EXIT(env, that, MAKELRESULT_FUNC); return rc; } @@ -5257,12 +5136,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(MAKEWORD) #endif #ifndef NO_MAKEWPARAM -JNIEXPORT jintLong JNICALL OS_NATIVE(MAKEWPARAM) +JNIEXPORT jlong JNICALL OS_NATIVE(MAKEWPARAM) (JNIEnv *env, jclass that, jint arg0, jint arg1) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, MAKEWPARAM_FUNC); - rc = (jintLong)MAKEWPARAM(arg0, arg1); + rc = (jlong)MAKEWPARAM(arg0, arg1); OS_NATIVE_EXIT(env, that, MAKEWPARAM_FUNC); return rc; } @@ -5389,12 +5268,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(MSG_1sizeof) #endif #ifndef NO_MapViewOfFile -JNIEXPORT jintLong JNICALL OS_NATIVE(MapViewOfFile) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4) +JNIEXPORT jlong JNICALL OS_NATIVE(MapViewOfFile) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3, jint arg4) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, MapViewOfFile_FUNC); - rc = (jintLong)MapViewOfFile((HANDLE)arg0, (DWORD)arg1, (DWORD)arg2, (DWORD)arg3, arg4); + rc = (jlong)MapViewOfFile((HANDLE)arg0, (DWORD)arg1, (DWORD)arg2, (DWORD)arg3, arg4); OS_NATIVE_EXIT(env, that, MapViewOfFile_FUNC); return rc; } @@ -5412,56 +5291,34 @@ JNIEXPORT jint JNICALL OS_NATIVE(MapVirtualKey) } #endif -#if (!defined(NO_MapWindowPoints__IILorg_eclipse_swt_internal_win32_POINT_2I) && !defined(JNI64)) || (!defined(NO_MapWindowPoints__JJLorg_eclipse_swt_internal_win32_POINT_2I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL OS_NATIVE(MapWindowPoints__IILorg_eclipse_swt_internal_win32_POINT_2I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jint arg3) -#else -JNIEXPORT jint JNICALL OS_NATIVE(MapWindowPoints__JJLorg_eclipse_swt_internal_win32_POINT_2I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jint arg3) -#endif +#ifndef NO_MapWindowPoints__JJLorg_eclipse_swt_internal_win32_POINT_2I +JNIEXPORT jint JNICALL OS_NATIVE(MapWindowPoints__JJLorg_eclipse_swt_internal_win32_POINT_2I) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jobject arg2, jint arg3) { POINT _arg2, *lparg2=NULL; jint rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MapWindowPoints__IILorg_eclipse_swt_internal_win32_POINT_2I_FUNC); -#else OS_NATIVE_ENTER(env, that, MapWindowPoints__JJLorg_eclipse_swt_internal_win32_POINT_2I_FUNC); -#endif if (arg2) if ((lparg2 = getPOINTFields(env, arg2, &_arg2)) == NULL) goto fail; rc = (jint)MapWindowPoints((HWND)arg0, (HWND)arg1, (LPPOINT)lparg2, arg3); fail: if (arg2 && lparg2) setPOINTFields(env, arg2, lparg2); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MapWindowPoints__IILorg_eclipse_swt_internal_win32_POINT_2I_FUNC); -#else OS_NATIVE_EXIT(env, that, MapWindowPoints__JJLorg_eclipse_swt_internal_win32_POINT_2I_FUNC); -#endif return rc; } #endif -#if (!defined(NO_MapWindowPoints__IILorg_eclipse_swt_internal_win32_RECT_2I) && !defined(JNI64)) || (!defined(NO_MapWindowPoints__JJLorg_eclipse_swt_internal_win32_RECT_2I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL OS_NATIVE(MapWindowPoints__IILorg_eclipse_swt_internal_win32_RECT_2I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jint arg3) -#else -JNIEXPORT jint JNICALL OS_NATIVE(MapWindowPoints__JJLorg_eclipse_swt_internal_win32_RECT_2I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jint arg3) -#endif +#ifndef NO_MapWindowPoints__JJLorg_eclipse_swt_internal_win32_RECT_2I +JNIEXPORT jint JNICALL OS_NATIVE(MapWindowPoints__JJLorg_eclipse_swt_internal_win32_RECT_2I) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jobject arg2, jint arg3) { RECT _arg2, *lparg2=NULL; jint rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MapWindowPoints__IILorg_eclipse_swt_internal_win32_RECT_2I_FUNC); -#else OS_NATIVE_ENTER(env, that, MapWindowPoints__JJLorg_eclipse_swt_internal_win32_RECT_2I_FUNC); -#endif if (arg2) if ((lparg2 = getRECTFields(env, arg2, &_arg2)) == NULL) goto fail; rc = (jint)MapWindowPoints((HWND)arg0, (HWND)arg1, (LPPOINT)lparg2, arg3); fail: if (arg2 && lparg2) setRECTFields(env, arg2, lparg2); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MapWindowPoints__IILorg_eclipse_swt_internal_win32_RECT_2I_FUNC); -#else OS_NATIVE_EXIT(env, that, MapWindowPoints__JJLorg_eclipse_swt_internal_win32_RECT_2I_FUNC); -#endif return rc; } #endif @@ -5480,7 +5337,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(MessageBeep) #ifndef NO_MessageBox JNIEXPORT jint JNICALL OS_NATIVE(MessageBox) - (JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jcharArray arg2, jint arg3) + (JNIEnv *env, jclass that, jlong arg0, jcharArray arg1, jcharArray arg2, jint arg3) { jchar *lparg1=NULL; jchar *lparg2=NULL; @@ -5499,7 +5356,7 @@ fail: #ifndef NO_ModifyWorldTransform JNIEXPORT jboolean JNICALL OS_NATIVE(ModifyWorldTransform) - (JNIEnv *env, jclass that, jintLong arg0, jfloatArray arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jfloatArray arg1, jint arg2) { jfloat *lparg1=NULL; jboolean rc = 0; @@ -5514,812 +5371,449 @@ fail: #endif #ifndef NO_MonitorFromWindow -JNIEXPORT jintLong JNICALL OS_NATIVE(MonitorFromWindow) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) +JNIEXPORT jlong JNICALL OS_NATIVE(MonitorFromWindow) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, MonitorFromWindow_FUNC); - rc = (jintLong)MonitorFromWindow((HWND)arg0, arg1); + rc = (jlong)MonitorFromWindow((HWND)arg0, arg1); OS_NATIVE_EXIT(env, that, MonitorFromWindow_FUNC); return rc; } #endif -#if (!defined(NO_MoveMemory__III) && !defined(JNI64)) || (!defined(NO_MoveMemory__JJI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__III)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JJI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__JJI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JJI) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2) { -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__III_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__JJI_FUNC); -#endif MoveMemory((PVOID)arg0, (CONST VOID *)arg1, arg2); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__III_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__JJI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_DEVMODE_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_DEVMODE_2I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_DEVMODE_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_DEVMODE_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__JLorg_eclipse_swt_internal_win32_DEVMODE_2I +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_DEVMODE_2I) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2) { DEVMODE _arg1, *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_DEVMODE_2I_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_DEVMODE_2I_FUNC); -#endif if (arg1) if ((lparg1 = getDEVMODEFields(env, arg1, &_arg1)) == NULL) goto fail; MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2); fail: -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_DEVMODE_2I_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_DEVMODE_2I_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__JLorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2I +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2I) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2) { DOCHOSTUIINFO _arg1, *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2I_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2I_FUNC); -#endif if (arg1) if ((lparg1 = getDOCHOSTUIINFOFields(env, arg1, &_arg1)) == NULL) goto fail; MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2); fail: -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2I_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2I_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_DROPFILES_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_DROPFILES_2I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_DROPFILES_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_DROPFILES_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__JLorg_eclipse_swt_internal_win32_DROPFILES_2I +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_DROPFILES_2I) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2) { DROPFILES _arg1, *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_DROPFILES_2I_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_DROPFILES_2I_FUNC); -#endif if (arg1) if ((lparg1 = getDROPFILESFields(env, arg1, &_arg1)) == NULL) goto fail; MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2); fail: -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_DROPFILES_2I_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_DROPFILES_2I_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_GESTURECONFIG_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_GESTURECONFIG_2I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_GESTURECONFIG_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_GESTURECONFIG_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__JLorg_eclipse_swt_internal_win32_GESTURECONFIG_2I +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_GESTURECONFIG_2I) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2) { GESTURECONFIG _arg1, *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_GESTURECONFIG_2I_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_GESTURECONFIG_2I_FUNC); -#endif if (arg1) if ((lparg1 = getGESTURECONFIGFields(env, arg1, &_arg1)) == NULL) goto fail; MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2); fail: -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_GESTURECONFIG_2I_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_GESTURECONFIG_2I_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_GRADIENT_1RECT_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_GRADIENT_1RECT_2I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_GRADIENT_1RECT_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_GRADIENT_1RECT_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__JLorg_eclipse_swt_internal_win32_GRADIENT_1RECT_2I +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_GRADIENT_1RECT_2I) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2) { GRADIENT_RECT _arg1, *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_GRADIENT_1RECT_2I_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_GRADIENT_1RECT_2I_FUNC); -#endif if (arg1) if ((lparg1 = getGRADIENT_RECTFields(env, arg1, &_arg1)) == NULL) goto fail; MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2); fail: -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_GRADIENT_1RECT_2I_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_GRADIENT_1RECT_2I_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_KEYBDINPUT_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_KEYBDINPUT_2I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_KEYBDINPUT_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_KEYBDINPUT_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__JLorg_eclipse_swt_internal_win32_KEYBDINPUT_2I +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_KEYBDINPUT_2I) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2) { KEYBDINPUT _arg1, *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_KEYBDINPUT_2I_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_KEYBDINPUT_2I_FUNC); -#endif if (arg1) if ((lparg1 = getKEYBDINPUTFields(env, arg1, &_arg1)) == NULL) goto fail; MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2); fail: -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_KEYBDINPUT_2I_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_KEYBDINPUT_2I_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_LOGFONT_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_LOGFONT_2I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_LOGFONT_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_LOGFONT_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__JLorg_eclipse_swt_internal_win32_LOGFONT_2I +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_LOGFONT_2I) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2) { LOGFONT _arg1, *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_LOGFONT_2I_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_LOGFONT_2I_FUNC); -#endif if (arg1) if ((lparg1 = getLOGFONTFields(env, arg1, &_arg1)) == NULL) goto fail; MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2); fail: -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_LOGFONT_2I_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_LOGFONT_2I_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__JLorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2I +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2I) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2) { MEASUREITEMSTRUCT _arg1, *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2I_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2I_FUNC); -#endif if (arg1) if ((lparg1 = getMEASUREITEMSTRUCTFields(env, arg1, &_arg1)) == NULL) goto fail; MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2); fail: -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2I_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2I_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_MINMAXINFO_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_MINMAXINFO_2I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_MINMAXINFO_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_MINMAXINFO_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__JLorg_eclipse_swt_internal_win32_MINMAXINFO_2I +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_MINMAXINFO_2I) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2) { MINMAXINFO _arg1, *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_MINMAXINFO_2I_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_MINMAXINFO_2I_FUNC); -#endif if (arg1) if ((lparg1 = getMINMAXINFOFields(env, arg1, &_arg1)) == NULL) goto fail; MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2); fail: -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_MINMAXINFO_2I_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_MINMAXINFO_2I_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_MOUSEINPUT_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_MOUSEINPUT_2I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_MOUSEINPUT_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_MOUSEINPUT_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__JLorg_eclipse_swt_internal_win32_MOUSEINPUT_2I +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_MOUSEINPUT_2I) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2) { MOUSEINPUT _arg1, *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_MOUSEINPUT_2I_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_MOUSEINPUT_2I_FUNC); -#endif if (arg1) if ((lparg1 = getMOUSEINPUTFields(env, arg1, &_arg1)) == NULL) goto fail; MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2); fail: -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_MOUSEINPUT_2I_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_MOUSEINPUT_2I_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_MSG_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_MSG_2I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_MSG_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_MSG_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__JLorg_eclipse_swt_internal_win32_MSG_2I +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_MSG_2I) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2) { MSG _arg1, *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_MSG_2I_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_MSG_2I_FUNC); -#endif if (arg1) if ((lparg1 = getMSGFields(env, arg1, &_arg1)) == NULL) goto fail; MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2); fail: -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_MSG_2I_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_MSG_2I_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__JLorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2I +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2I) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2) { NMLVCUSTOMDRAW _arg1, *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2I_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2I_FUNC); -#endif if (arg1) if ((lparg1 = getNMLVCUSTOMDRAWFields(env, arg1, &_arg1)) == NULL) goto fail; MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2); fail: -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2I_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2I_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_NMLVDISPINFO_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_NMLVDISPINFO_2I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_NMLVDISPINFO_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_NMLVDISPINFO_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__JLorg_eclipse_swt_internal_win32_NMLVDISPINFO_2I +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_NMLVDISPINFO_2I) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2) { NMLVDISPINFO _arg1, *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_NMLVDISPINFO_2I_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_NMLVDISPINFO_2I_FUNC); -#endif if (arg1) if ((lparg1 = getNMLVDISPINFOFields(env, arg1, &_arg1)) == NULL) goto fail; MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2); fail: -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_NMLVDISPINFO_2I_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_NMLVDISPINFO_2I_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_NMTBCUSTOMDRAW_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_NMTBCUSTOMDRAW_2I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_NMTBCUSTOMDRAW_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_NMTBCUSTOMDRAW_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__JLorg_eclipse_swt_internal_win32_NMTBCUSTOMDRAW_2I +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_NMTBCUSTOMDRAW_2I) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2) { NMTBCUSTOMDRAW _arg1, *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_NMTBCUSTOMDRAW_2I_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_NMTBCUSTOMDRAW_2I_FUNC); -#endif if (arg1) if ((lparg1 = getNMTBCUSTOMDRAWFields(env, arg1, &_arg1)) == NULL) goto fail; MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2); fail: -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_NMTBCUSTOMDRAW_2I_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_NMTBCUSTOMDRAW_2I_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTDISPINFO_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_NMTTDISPINFO_2I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTDISPINFO_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_NMTTDISPINFO_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__JLorg_eclipse_swt_internal_win32_NMTTDISPINFO_2I +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_NMTTDISPINFO_2I) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2) { NMTTDISPINFO _arg1, *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTDISPINFO_2I_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_NMTTDISPINFO_2I_FUNC); -#endif if (arg1) if ((lparg1 = getNMTTDISPINFOFields(env, arg1, &_arg1)) == NULL) goto fail; MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2); fail: -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTDISPINFO_2I_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_NMTTDISPINFO_2I_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__JLorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2I +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2I) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2) { NMTVCUSTOMDRAW _arg1, *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2I_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2I_FUNC); -#endif if (arg1) if ((lparg1 = getNMTVCUSTOMDRAWFields(env, arg1, &_arg1)) == NULL) goto fail; MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2); fail: -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2I_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2I_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_NMTVDISPINFO_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_NMTVDISPINFO_2I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_NMTVDISPINFO_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_NMTVDISPINFO_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__JLorg_eclipse_swt_internal_win32_NMTVDISPINFO_2I +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_NMTVDISPINFO_2I) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2) { NMTVDISPINFO _arg1, *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_NMTVDISPINFO_2I_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_NMTVDISPINFO_2I_FUNC); -#endif if (arg1) if ((lparg1 = getNMTVDISPINFOFields(env, arg1, &_arg1)) == NULL) goto fail; MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2); fail: -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_NMTVDISPINFO_2I_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_NMTVDISPINFO_2I_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_OPENFILENAME_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_OPENFILENAME_2I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_OPENFILENAME_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_OPENFILENAME_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__JLorg_eclipse_swt_internal_win32_OPENFILENAME_2I +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_OPENFILENAME_2I) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2) { OPENFILENAME _arg1, *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_OPENFILENAME_2I_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_OPENFILENAME_2I_FUNC); -#endif if (arg1) if ((lparg1 = getOPENFILENAMEFields(env, arg1, &_arg1)) == NULL) goto fail; MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2); fail: if (arg1 && lparg1) setOPENFILENAMEFields(env, arg1, lparg1); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_OPENFILENAME_2I_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_OPENFILENAME_2I_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_RECT_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_RECT_2I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_RECT_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_RECT_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__JLorg_eclipse_swt_internal_win32_RECT_2I +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_RECT_2I) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2) { RECT _arg1, *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_RECT_2I_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_RECT_2I_FUNC); -#endif if (arg1) if ((lparg1 = getRECTFields(env, arg1, &_arg1)) == NULL) goto fail; MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2); fail: -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_RECT_2I_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_RECT_2I_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_SAFEARRAY_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_SAFEARRAY_2I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_SAFEARRAY_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_SAFEARRAY_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__JLorg_eclipse_swt_internal_win32_SAFEARRAY_2I +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_SAFEARRAY_2I) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2) { SAFEARRAY _arg1, *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_SAFEARRAY_2I_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_SAFEARRAY_2I_FUNC); -#endif if (arg1) if ((lparg1 = getSAFEARRAYFields(env, arg1, &_arg1)) == NULL) goto fail; MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2); fail: -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_SAFEARRAY_2I_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_SAFEARRAY_2I_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__JLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2) { SHDRAGIMAGE _arg1, *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I_FUNC); -#endif if (arg1) if ((lparg1 = getSHDRAGIMAGEFields(env, arg1, &_arg1)) == NULL) goto fail; MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2); fail: -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_TRIVERTEX_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_TRIVERTEX_2I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_TRIVERTEX_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_TRIVERTEX_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__JLorg_eclipse_swt_internal_win32_TRIVERTEX_2I +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_TRIVERTEX_2I) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2) { TRIVERTEX _arg1, *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_TRIVERTEX_2I_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_TRIVERTEX_2I_FUNC); -#endif if (arg1) if ((lparg1 = getTRIVERTEXFields(env, arg1, &_arg1)) == NULL) goto fail; MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2); fail: -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_TRIVERTEX_2I_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_TRIVERTEX_2I_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_UDACCEL_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_UDACCEL_2I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_UDACCEL_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_UDACCEL_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__JLorg_eclipse_swt_internal_win32_UDACCEL_2I +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_UDACCEL_2I) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2) { UDACCEL _arg1, *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_UDACCEL_2I_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_UDACCEL_2I_FUNC); -#endif if (arg1) if ((lparg1 = getUDACCELFields(env, arg1, &_arg1)) == NULL) goto fail; MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2); fail: -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_UDACCEL_2I_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_UDACCEL_2I_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_WINDOWPOS_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_WINDOWPOS_2I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_WINDOWPOS_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_WINDOWPOS_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__JLorg_eclipse_swt_internal_win32_WINDOWPOS_2I +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_WINDOWPOS_2I) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2) { WINDOWPOS _arg1, *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_WINDOWPOS_2I_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_WINDOWPOS_2I_FUNC); -#endif if (arg1) if ((lparg1 = getWINDOWPOSFields(env, arg1, &_arg1)) == NULL) goto fail; MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2); fail: -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_WINDOWPOS_2I_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_WINDOWPOS_2I_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__I_3BI) && !defined(JNI64)) || (!defined(NO_MoveMemory__J_3BI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__I_3BI)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__J_3BI)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__J_3BI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__J_3BI) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jint arg2) { jbyte *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__I_3BI_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__J_3BI_FUNC); -#endif if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail; MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2); fail: if (arg1 && lparg1) (*env)->ReleasePrimitiveArrayCritical(env, arg1, lparg1, JNI_ABORT); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__I_3BI_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__J_3BI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__I_3CI) && !defined(JNI64)) || (!defined(NO_MoveMemory__J_3CI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__I_3CI)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__J_3CI)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__J_3CI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__J_3CI) + (JNIEnv *env, jclass that, jlong arg0, jcharArray arg1, jint arg2) { jchar *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__I_3CI_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__J_3CI_FUNC); -#endif if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail; MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2); fail: if (arg1 && lparg1) (*env)->ReleasePrimitiveArrayCritical(env, arg1, lparg1, JNI_ABORT); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__I_3CI_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__J_3CI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__I_3DI) && !defined(JNI64)) || (!defined(NO_MoveMemory__J_3DI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__I_3DI)(JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__J_3DI)(JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__J_3DI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__J_3DI) + (JNIEnv *env, jclass that, jlong arg0, jdoubleArray arg1, jint arg2) { jdouble *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__I_3DI_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__J_3DI_FUNC); -#endif if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail; MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2); fail: if (arg1 && lparg1) (*env)->ReleasePrimitiveArrayCritical(env, arg1, lparg1, JNI_ABORT); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__I_3DI_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__J_3DI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__I_3FI) && !defined(JNI64)) || (!defined(NO_MoveMemory__J_3FI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__I_3FI)(JNIEnv *env, jclass that, jintLong arg0, jfloatArray arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__J_3FI)(JNIEnv *env, jclass that, jintLong arg0, jfloatArray arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__J_3FI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__J_3FI) + (JNIEnv *env, jclass that, jlong arg0, jfloatArray arg1, jint arg2) { jfloat *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__I_3FI_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__J_3FI_FUNC); -#endif if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail; MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2); fail: if (arg1 && lparg1) (*env)->ReleasePrimitiveArrayCritical(env, arg1, lparg1, JNI_ABORT); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__I_3FI_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__J_3FI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__I_3II) && !defined(JNI64)) || (!defined(NO_MoveMemory__J_3II) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__I_3II)(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__J_3II)(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__J_3II +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__J_3II) + (JNIEnv *env, jclass that, jlong arg0, jintArray arg1, jint arg2) { jint *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__I_3II_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__J_3II_FUNC); -#endif if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail; MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2); fail: if (arg1 && lparg1) (*env)->ReleasePrimitiveArrayCritical(env, arg1, lparg1, JNI_ABORT); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__I_3II_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__J_3II_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__I_3JI) && !defined(JNI64)) || (!defined(NO_MoveMemory__J_3JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__I_3JI)(JNIEnv *env, jclass that, jintLong arg0, jlongArray arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__J_3JI)(JNIEnv *env, jclass that, jintLong arg0, jlongArray arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__J_3JI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__J_3JI) + (JNIEnv *env, jclass that, jlong arg0, jlongArray arg1, jint arg2) { jlong *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__I_3JI_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__J_3JI_FUNC); -#endif if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail; MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2); fail: if (arg1 && lparg1) (*env)->ReleasePrimitiveArrayCritical(env, arg1, lparg1, JNI_ABORT); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__I_3JI_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__J_3JI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__I_3SI) && !defined(JNI64)) || (!defined(NO_MoveMemory__J_3SI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__I_3SI)(JNIEnv *env, jclass that, jintLong arg0, jshortArray arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__J_3SI)(JNIEnv *env, jclass that, jintLong arg0, jshortArray arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__J_3SI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__J_3SI) + (JNIEnv *env, jclass that, jlong arg0, jshortArray arg1, jint arg2) { jshort *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__I_3SI_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__J_3SI_FUNC); -#endif if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail; MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2); fail: if (arg1 && lparg1) (*env)->ReleasePrimitiveArrayCritical(env, arg1, lparg1, JNI_ABORT); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__I_3SI_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__J_3SI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_BITMAPINFOHEADER_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_BITMAPINFOHEADER_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_BITMAPINFOHEADER_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_BITMAPINFOHEADER_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_BITMAPINFOHEADER_2JI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_BITMAPINFOHEADER_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { BITMAPINFOHEADER _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_BITMAPINFOHEADER_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_BITMAPINFOHEADER_2JI_FUNC); -#endif if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) setBITMAPINFOHEADERFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_BITMAPINFOHEADER_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_BITMAPINFOHEADER_2JI_FUNC); -#endif } #endif @@ -6340,959 +5834,541 @@ fail: } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_CERT_1CONTEXT_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_CERT_1CONTEXT_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_CERT_1CONTEXT_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_CERT_1CONTEXT_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_CERT_1CONTEXT_2JI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_CERT_1CONTEXT_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { CERT_CONTEXT _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_CERT_1CONTEXT_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_CERT_1CONTEXT_2JI_FUNC); -#endif if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) setCERT_CONTEXTFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_CERT_1CONTEXT_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_CERT_1CONTEXT_2JI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_CERT_1INFO_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_CERT_1INFO_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_CERT_1INFO_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_CERT_1INFO_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_CERT_1INFO_2JI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_CERT_1INFO_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { CERT_INFO _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_CERT_1INFO_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_CERT_1INFO_2JI_FUNC); -#endif if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) setCERT_INFOFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_CERT_1INFO_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_CERT_1INFO_2JI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_DEVMODE_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_DEVMODE_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_DEVMODE_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_DEVMODE_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_DEVMODE_2JI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_DEVMODE_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { DEVMODE _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_DEVMODE_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_DEVMODE_2JI_FUNC); -#endif if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) setDEVMODEFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_DEVMODE_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_DEVMODE_2JI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2JI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { DOCHOSTUIINFO _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2JI_FUNC); -#endif if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) setDOCHOSTUIINFOFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2JI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_DRAWITEMSTRUCT_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_DRAWITEMSTRUCT_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_DRAWITEMSTRUCT_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_DRAWITEMSTRUCT_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_DRAWITEMSTRUCT_2JI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_DRAWITEMSTRUCT_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { DRAWITEMSTRUCT _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_DRAWITEMSTRUCT_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_DRAWITEMSTRUCT_2JI_FUNC); -#endif if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) setDRAWITEMSTRUCTFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_DRAWITEMSTRUCT_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_DRAWITEMSTRUCT_2JI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_EMREXTCREATEFONTINDIRECTW_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_EMREXTCREATEFONTINDIRECTW_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_EMREXTCREATEFONTINDIRECTW_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_EMREXTCREATEFONTINDIRECTW_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_EMREXTCREATEFONTINDIRECTW_2JI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_EMREXTCREATEFONTINDIRECTW_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { EMREXTCREATEFONTINDIRECTW _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_EMREXTCREATEFONTINDIRECTW_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_EMREXTCREATEFONTINDIRECTW_2JI_FUNC); -#endif if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) setEMREXTCREATEFONTINDIRECTWFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_EMREXTCREATEFONTINDIRECTW_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_EMREXTCREATEFONTINDIRECTW_2JI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_EMR_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_EMR_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_EMR_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_EMR_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_EMR_2JI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_EMR_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { EMR _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_EMR_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_EMR_2JI_FUNC); -#endif if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) setEMRFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_EMR_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_EMR_2JI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_FLICK_1DATA_2_3II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_FLICK_1DATA_2_3JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_FLICK_1DATA_2_3II)(JNIEnv *env, jclass that, jobject arg0, jintLongArray arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_FLICK_1DATA_2_3JI)(JNIEnv *env, jclass that, jobject arg0, jintLongArray arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_FLICK_1DATA_2_3JI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_FLICK_1DATA_2_3JI) + (JNIEnv *env, jclass that, jobject arg0, jlongArray arg1, jint arg2) { FLICK_DATA _arg0, *lparg0=NULL; - jintLong *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_FLICK_1DATA_2_3II_FUNC); -#else + jlong *lparg1=NULL; OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_FLICK_1DATA_2_3JI_FUNC); -#endif if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; - if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail; + if (arg1) if ((lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL)) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)lparg1, arg2); fail: - if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, JNI_ABORT); + if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, JNI_ABORT); if (arg0 && lparg0) setFLICK_DATAFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_FLICK_1DATA_2_3II_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_FLICK_1DATA_2_3JI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_FLICK_1POINT_2_3II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_FLICK_1POINT_2_3JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_FLICK_1POINT_2_3II)(JNIEnv *env, jclass that, jobject arg0, jintLongArray arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_FLICK_1POINT_2_3JI)(JNIEnv *env, jclass that, jobject arg0, jintLongArray arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_FLICK_1POINT_2_3JI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_FLICK_1POINT_2_3JI) + (JNIEnv *env, jclass that, jobject arg0, jlongArray arg1, jint arg2) { FLICK_POINT _arg0, *lparg0=NULL; - jintLong *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_FLICK_1POINT_2_3II_FUNC); -#else + jlong *lparg1=NULL; OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_FLICK_1POINT_2_3JI_FUNC); -#endif if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; - if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail; + if (arg1) if ((lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL)) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)lparg1, arg2); fail: - if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, JNI_ABORT); + if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, JNI_ABORT); if (arg0 && lparg0) setFLICK_POINTFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_FLICK_1POINT_2_3II_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_FLICK_1POINT_2_3JI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_HDITEM_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_HDITEM_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_HDITEM_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_HDITEM_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_HDITEM_2JI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_HDITEM_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { HDITEM _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_HDITEM_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_HDITEM_2JI_FUNC); -#endif if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) setHDITEMFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_HDITEM_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_HDITEM_2JI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_HELPINFO_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_HELPINFO_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_HELPINFO_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_HELPINFO_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_HELPINFO_2JI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_HELPINFO_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { HELPINFO _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_HELPINFO_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_HELPINFO_2JI_FUNC); -#endif if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) setHELPINFOFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_HELPINFO_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_HELPINFO_2JI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONT_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONT_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONT_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONT_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONT_2JI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONT_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { LOGFONT _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONT_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONT_2JI_FUNC); -#endif if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) setLOGFONTFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONT_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONT_2JI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2JI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { MEASUREITEMSTRUCT _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2JI_FUNC); -#endif if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) setMEASUREITEMSTRUCTFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2JI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_MINMAXINFO_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_MINMAXINFO_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_MINMAXINFO_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_MINMAXINFO_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_MINMAXINFO_2JI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_MINMAXINFO_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { MINMAXINFO _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_MINMAXINFO_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_MINMAXINFO_2JI_FUNC); -#endif if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) setMINMAXINFOFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_MINMAXINFO_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_MINMAXINFO_2JI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_MSG_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_MSG_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_MSG_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_MSG_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_MSG_2JI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_MSG_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { MSG _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_MSG_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_MSG_2JI_FUNC); -#endif if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) setMSGFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_MSG_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_MSG_2JI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMCUSTOMDRAW_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMCUSTOMDRAW_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMCUSTOMDRAW_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMCUSTOMDRAW_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMCUSTOMDRAW_2JI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMCUSTOMDRAW_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { NMCUSTOMDRAW _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMCUSTOMDRAW_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMCUSTOMDRAW_2JI_FUNC); -#endif if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) setNMCUSTOMDRAWFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMCUSTOMDRAW_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMCUSTOMDRAW_2JI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMHDR_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMHDR_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMHDR_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMHDR_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMHDR_2JI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMHDR_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { NMHDR _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMHDR_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMHDR_2JI_FUNC); -#endif if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) setNMHDRFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMHDR_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMHDR_2JI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMHEADER_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMHEADER_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMHEADER_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMHEADER_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMHEADER_2JI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMHEADER_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { NMHEADER _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMHEADER_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMHEADER_2JI_FUNC); -#endif if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) setNMHEADERFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMHEADER_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMHEADER_2JI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMLINK_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMLINK_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMLINK_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMLINK_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMLINK_2JI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMLINK_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { NMLINK _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMLINK_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMLINK_2JI_FUNC); -#endif if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) setNMLINKFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMLINK_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMLINK_2JI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMLISTVIEW_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMLISTVIEW_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMLISTVIEW_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMLISTVIEW_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMLISTVIEW_2JI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMLISTVIEW_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { NMLISTVIEW _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMLISTVIEW_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMLISTVIEW_2JI_FUNC); -#endif if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) setNMLISTVIEWFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMLISTVIEW_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMLISTVIEW_2JI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2JI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { NMLVCUSTOMDRAW _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2JI_FUNC); -#endif if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) setNMLVCUSTOMDRAWFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2JI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVDISPINFO_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVDISPINFO_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVDISPINFO_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVDISPINFO_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVDISPINFO_2JI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVDISPINFO_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { NMLVDISPINFO _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVDISPINFO_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVDISPINFO_2JI_FUNC); -#endif if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) setNMLVDISPINFOFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVDISPINFO_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVDISPINFO_2JI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVODSTATECHANGE_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVODSTATECHANGE_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVODSTATECHANGE_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVODSTATECHANGE_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVODSTATECHANGE_2JI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVODSTATECHANGE_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { NMLVODSTATECHANGE _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVODSTATECHANGE_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVODSTATECHANGE_2JI_FUNC); -#endif if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) setNMLVODSTATECHANGEFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVODSTATECHANGE_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVODSTATECHANGE_2JI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHEVRON_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHEVRON_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHEVRON_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHEVRON_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHEVRON_2JI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHEVRON_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { NMREBARCHEVRON _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHEVRON_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHEVRON_2JI_FUNC); -#endif if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) setNMREBARCHEVRONFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHEVRON_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHEVRON_2JI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHILDSIZE_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHILDSIZE_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHILDSIZE_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHILDSIZE_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHILDSIZE_2JI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHILDSIZE_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { NMREBARCHILDSIZE _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHILDSIZE_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHILDSIZE_2JI_FUNC); -#endif if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) setNMREBARCHILDSIZEFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHILDSIZE_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHILDSIZE_2JI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTBCUSTOMDRAW_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTBCUSTOMDRAW_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTBCUSTOMDRAW_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTBCUSTOMDRAW_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTBCUSTOMDRAW_2JI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTBCUSTOMDRAW_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { NMTBCUSTOMDRAW _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTBCUSTOMDRAW_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTBCUSTOMDRAW_2JI_FUNC); -#endif if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) setNMTBCUSTOMDRAWFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTBCUSTOMDRAW_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTBCUSTOMDRAW_2JI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTBHOTITEM_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTBHOTITEM_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTBHOTITEM_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTBHOTITEM_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTBHOTITEM_2JI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTBHOTITEM_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { NMTBHOTITEM _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTBHOTITEM_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTBHOTITEM_2JI_FUNC); -#endif if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) setNMTBHOTITEMFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTBHOTITEM_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTBHOTITEM_2JI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTOOLBAR_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTOOLBAR_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTOOLBAR_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTOOLBAR_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTOOLBAR_2JI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTOOLBAR_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { NMTOOLBAR _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTOOLBAR_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTOOLBAR_2JI_FUNC); -#endif if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) setNMTOOLBARFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTOOLBAR_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTOOLBAR_2JI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTREEVIEW_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTREEVIEW_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTREEVIEW_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTREEVIEW_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTREEVIEW_2JI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTREEVIEW_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { NMTREEVIEW _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTREEVIEW_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTREEVIEW_2JI_FUNC); -#endif if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) setNMTREEVIEWFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTREEVIEW_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTREEVIEW_2JI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTCUSTOMDRAW_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTCUSTOMDRAW_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTCUSTOMDRAW_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTCUSTOMDRAW_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTCUSTOMDRAW_2JI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTCUSTOMDRAW_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { NMTTCUSTOMDRAW _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTCUSTOMDRAW_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTCUSTOMDRAW_2JI_FUNC); -#endif if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) setNMTTCUSTOMDRAWFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTCUSTOMDRAW_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTCUSTOMDRAW_2JI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFO_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFO_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFO_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFO_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFO_2JI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFO_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { NMTTDISPINFO _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFO_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFO_2JI_FUNC); -#endif if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) setNMTTDISPINFOFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFO_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFO_2JI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2JI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { NMTVCUSTOMDRAW _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2JI_FUNC); -#endif if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) setNMTVCUSTOMDRAWFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2JI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVDISPINFO_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVDISPINFO_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVDISPINFO_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVDISPINFO_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVDISPINFO_2JI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVDISPINFO_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { NMTVDISPINFO _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVDISPINFO_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVDISPINFO_2JI_FUNC); -#endif if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) setNMTVDISPINFOFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVDISPINFO_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVDISPINFO_2JI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVITEMCHANGE_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVITEMCHANGE_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVITEMCHANGE_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVITEMCHANGE_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVITEMCHANGE_2JI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVITEMCHANGE_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { NMTVITEMCHANGE _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVITEMCHANGE_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVITEMCHANGE_2JI_FUNC); -#endif if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) setNMTVITEMCHANGEFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVITEMCHANGE_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVITEMCHANGE_2JI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMUPDOWN_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMUPDOWN_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMUPDOWN_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMUPDOWN_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMUPDOWN_2JI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMUPDOWN_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { NMUPDOWN _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMUPDOWN_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMUPDOWN_2JI_FUNC); -#endif if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) setNMUPDOWNFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMUPDOWN_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMUPDOWN_2JI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_OFNOTIFY_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_OFNOTIFY_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_OFNOTIFY_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_OFNOTIFY_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_OFNOTIFY_2JI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_OFNOTIFY_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { OFNOTIFY _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_OFNOTIFY_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_OFNOTIFY_2JI_FUNC); -#endif if (arg0) if ((lparg0 = getOFNOTIFYFields(env, arg0, &_arg0)) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) setOFNOTIFYFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_OFNOTIFY_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_OFNOTIFY_2JI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_OPENFILENAME_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_OPENFILENAME_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_OPENFILENAME_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_OPENFILENAME_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_OPENFILENAME_2JI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_OPENFILENAME_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { OPENFILENAME _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_OPENFILENAME_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_OPENFILENAME_2JI_FUNC); -#endif if (arg0) if ((lparg0 = getOPENFILENAMEFields(env, arg0, &_arg0)) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) setOPENFILENAMEFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_OPENFILENAME_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_OPENFILENAME_2JI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_POINT_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_POINT_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_POINT_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_POINT_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_POINT_2JI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_POINT_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { POINT _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_POINT_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_POINT_2JI_FUNC); -#endif if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) setPOINTFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_POINT_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_POINT_2JI_FUNC); -#endif } #endif @@ -7313,228 +6389,129 @@ fail: } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_SAFEARRAY_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_SAFEARRAY_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_SAFEARRAY_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_SAFEARRAY_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_SAFEARRAY_2JI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_SAFEARRAY_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { SAFEARRAY _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_SAFEARRAY_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_SAFEARRAY_2JI_FUNC); -#endif if (arg0) if ((lparg0 = getSAFEARRAYFields(env, arg0, &_arg0)) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) setSAFEARRAYFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_SAFEARRAY_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_SAFEARRAY_2JI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1ITEM_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1ITEM_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1ITEM_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1ITEM_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1ITEM_2JI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1ITEM_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { SCRIPT_ITEM _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1ITEM_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1ITEM_2JI_FUNC); -#endif if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) setSCRIPT_ITEMFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1ITEM_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1ITEM_2JI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1LOGATTR_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1LOGATTR_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1LOGATTR_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1LOGATTR_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1LOGATTR_2JI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1LOGATTR_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { SCRIPT_LOGATTR _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1LOGATTR_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1LOGATTR_2JI_FUNC); -#endif if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) setSCRIPT_LOGATTRFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1LOGATTR_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1LOGATTR_2JI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1PROPERTIES_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1PROPERTIES_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1PROPERTIES_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1PROPERTIES_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1PROPERTIES_2JI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1PROPERTIES_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { SCRIPT_PROPERTIES _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1PROPERTIES_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1PROPERTIES_2JI_FUNC); -#endif if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) setSCRIPT_PROPERTIESFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1PROPERTIES_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1PROPERTIES_2JI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRIC_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRIC_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRIC_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRIC_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRIC_2JI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRIC_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { TEXTMETRIC _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRIC_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRIC_2JI_FUNC); -#endif if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) setTEXTMETRICFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRIC_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRIC_2JI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_TOUCHINPUT_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_TOUCHINPUT_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_TOUCHINPUT_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_TOUCHINPUT_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_TOUCHINPUT_2JI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_TOUCHINPUT_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { TOUCHINPUT _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_TOUCHINPUT_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_TOUCHINPUT_2JI_FUNC); -#endif if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) setTOUCHINPUTFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_TOUCHINPUT_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_TOUCHINPUT_2JI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_UDACCEL_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_UDACCEL_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_UDACCEL_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_UDACCEL_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_UDACCEL_2JI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_UDACCEL_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { UDACCEL _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_UDACCEL_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_UDACCEL_2JI_FUNC); -#endif if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) setUDACCELFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_UDACCEL_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_UDACCEL_2JI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_WINDOWPOS_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_WINDOWPOS_2JI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_WINDOWPOS_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_WINDOWPOS_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_WINDOWPOS_2JI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_WINDOWPOS_2JI) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2) { WINDOWPOS _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_WINDOWPOS_2II_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_WINDOWPOS_2JI_FUNC); -#endif if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) setWINDOWPOSFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_WINDOWPOS_2II_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_WINDOWPOS_2JI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory___3BII) && !defined(JNI64)) || (!defined(NO_MoveMemory___3BJI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory___3BII)(JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory___3BJI)(JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory___3BJI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory___3BJI) + (JNIEnv *env, jclass that, jbyteArray arg0, jlong arg1, jint arg2) { jbyte *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory___3BII_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory___3BJI_FUNC); -#endif if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) (*env)->ReleasePrimitiveArrayCritical(env, arg0, lparg0, 0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory___3BII_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory___3BJI_FUNC); -#endif } #endif @@ -7570,159 +6547,93 @@ fail: } #endif -#if (!defined(NO_MoveMemory___3CII) && !defined(JNI64)) || (!defined(NO_MoveMemory___3CJI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory___3CII)(JNIEnv *env, jclass that, jcharArray arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory___3CJI)(JNIEnv *env, jclass that, jcharArray arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory___3CJI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory___3CJI) + (JNIEnv *env, jclass that, jcharArray arg0, jlong arg1, jint arg2) { jchar *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory___3CII_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory___3CJI_FUNC); -#endif if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) (*env)->ReleasePrimitiveArrayCritical(env, arg0, lparg0, 0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory___3CII_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory___3CJI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory___3DII) && !defined(JNI64)) || (!defined(NO_MoveMemory___3DJI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory___3DII)(JNIEnv *env, jclass that, jdoubleArray arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory___3DJI)(JNIEnv *env, jclass that, jdoubleArray arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory___3DJI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory___3DJI) + (JNIEnv *env, jclass that, jdoubleArray arg0, jlong arg1, jint arg2) { jdouble *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory___3DII_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory___3DJI_FUNC); -#endif if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) (*env)->ReleasePrimitiveArrayCritical(env, arg0, lparg0, 0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory___3DII_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory___3DJI_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) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory___3FJI)(JNIEnv *env, jclass that, jfloatArray arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory___3FJI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory___3FJI) + (JNIEnv *env, jclass that, jfloatArray arg0, jlong arg1, jint arg2) { jfloat *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory___3FII_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory___3FJI_FUNC); -#endif if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) (*env)->ReleasePrimitiveArrayCritical(env, arg0, lparg0, 0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory___3FII_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory___3FJI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory___3III) && !defined(JNI64)) || (!defined(NO_MoveMemory___3IJI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory___3III)(JNIEnv *env, jclass that, jintArray arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory___3IJI)(JNIEnv *env, jclass that, jintArray arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory___3IJI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory___3IJI) + (JNIEnv *env, jclass that, jintArray arg0, jlong arg1, jint arg2) { jint *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory___3III_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory___3IJI_FUNC); -#endif if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) (*env)->ReleasePrimitiveArrayCritical(env, arg0, lparg0, 0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory___3III_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory___3IJI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory___3JII) && !defined(JNI64)) || (!defined(NO_MoveMemory___3JJI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory___3JII)(JNIEnv *env, jclass that, jlongArray arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory___3JJI)(JNIEnv *env, jclass that, jlongArray arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory___3JJI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory___3JJI) + (JNIEnv *env, jclass that, jlongArray arg0, jlong arg1, jint arg2) { jlong *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory___3JII_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory___3JJI_FUNC); -#endif if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) (*env)->ReleasePrimitiveArrayCritical(env, arg0, lparg0, 0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory___3JII_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory___3JJI_FUNC); -#endif } #endif -#if (!defined(NO_MoveMemory___3SII) && !defined(JNI64)) || (!defined(NO_MoveMemory___3SJI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory___3SII)(JNIEnv *env, jclass that, jshortArray arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(MoveMemory___3SJI)(JNIEnv *env, jclass that, jshortArray arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_MoveMemory___3SJI +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory___3SJI) + (JNIEnv *env, jclass that, jshortArray arg0, jlong arg1, jint arg2) { jshort *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MoveMemory___3SII_FUNC); -#else OS_NATIVE_ENTER(env, that, MoveMemory___3SJI_FUNC); -#endif if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail; MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); fail: if (arg0 && lparg0) (*env)->ReleasePrimitiveArrayCritical(env, arg0, lparg0, 0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MoveMemory___3SII_FUNC); -#else OS_NATIVE_EXIT(env, that, MoveMemory___3SJI_FUNC); -#endif } #endif #ifndef NO_MoveToEx JNIEXPORT jboolean JNICALL OS_NATIVE(MoveToEx) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jintLong arg3) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jlong arg3) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, MoveToEx_FUNC); @@ -7732,29 +6643,18 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(MoveToEx) } #endif -#if (!defined(NO_MultiByteToWideChar__IIII_3CI) && !defined(JNI64)) || (!defined(NO_MultiByteToWideChar__IIJI_3CI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL OS_NATIVE(MultiByteToWideChar__IIII_3CI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jintLong arg2, jint arg3, jcharArray arg4, jint arg5) -#else -JNIEXPORT jint JNICALL OS_NATIVE(MultiByteToWideChar__IIJI_3CI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jintLong arg2, jint arg3, jcharArray arg4, jint arg5) -#endif +#ifndef NO_MultiByteToWideChar__IIJI_3CI +JNIEXPORT jint JNICALL OS_NATIVE(MultiByteToWideChar__IIJI_3CI) + (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3, jcharArray arg4, jint arg5) { jchar *lparg4=NULL; jint rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, MultiByteToWideChar__IIII_3CI_FUNC); -#else OS_NATIVE_ENTER(env, that, MultiByteToWideChar__IIJI_3CI_FUNC); -#endif if (arg4) if ((lparg4 = (*env)->GetPrimitiveArrayCritical(env, arg4, NULL)) == NULL) goto fail; rc = (jint)MultiByteToWideChar(arg0, arg1, (LPCSTR)arg2, arg3, (LPWSTR)lparg4, arg5); fail: if (arg4 && lparg4) (*env)->ReleasePrimitiveArrayCritical(env, arg4, lparg4, 0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, MultiByteToWideChar__IIII_3CI_FUNC); -#else OS_NATIVE_EXIT(env, that, MultiByteToWideChar__IIJI_3CI_FUNC); -#endif return rc; } #endif @@ -8056,7 +6956,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(NOTIFYICONDATA_1V2_1SIZE) #ifndef NO_NotifyWinEvent JNIEXPORT void JNICALL OS_NATIVE(NotifyWinEvent) - (JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3) { OS_NATIVE_ENTER(env, that, NotifyWinEvent_FUNC); NotifyWinEvent((DWORD)arg0, (HWND)arg1, (LONG)arg2, (LONG)arg3); @@ -8118,7 +7018,7 @@ fail: #ifndef NO_OffsetRgn JNIEXPORT jint JNICALL OS_NATIVE(OffsetRgn) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2) { jint rc = 0; OS_NATIVE_ENTER(env, that, OffsetRgn_FUNC); @@ -8130,7 +7030,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(OffsetRgn) #ifndef NO_OleInitialize JNIEXPORT jint JNICALL OS_NATIVE(OleInitialize) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; OS_NATIVE_ENTER(env, that, OleInitialize_FUNC); @@ -8152,7 +7052,7 @@ JNIEXPORT void JNICALL OS_NATIVE(OleUninitialize) #ifndef NO_OpenClipboard JNIEXPORT jboolean JNICALL OS_NATIVE(OpenClipboard) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, OpenClipboard_FUNC); @@ -8164,17 +7064,17 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(OpenClipboard) #ifndef NO_OpenPrinter JNIEXPORT jboolean JNICALL OS_NATIVE(OpenPrinter) - (JNIEnv *env, jclass that, jcharArray arg0, jintLongArray arg1, jintLong arg2) + (JNIEnv *env, jclass that, jcharArray arg0, jlongArray arg1, jlong arg2) { jchar *lparg0=NULL; - jintLong *lparg1=NULL; + jlong *lparg1=NULL; jboolean rc = 0; OS_NATIVE_ENTER(env, that, OpenPrinter_FUNC); if (arg0) if ((lparg0 = (*env)->GetCharArrayElements(env, arg0, NULL)) == NULL) goto fail; - if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail; + if (arg1) if ((lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL)) == NULL) goto fail; rc = (jboolean)OpenPrinter((LPWSTR)lparg0, (LPHANDLE)lparg1, (LPPRINTER_DEFAULTSW)arg2); fail: - if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0); + if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, 0); if (arg0 && lparg0) (*env)->ReleaseCharArrayElements(env, arg0, lparg0, 0); OS_NATIVE_EXIT(env, that, OpenPrinter_FUNC); return rc; @@ -8182,26 +7082,26 @@ fail: #endif #ifndef NO_OpenProcess -JNIEXPORT jintLong JNICALL OS_NATIVE(OpenProcess) +JNIEXPORT jlong JNICALL OS_NATIVE(OpenProcess) (JNIEnv *env, jclass that, jint arg0, jboolean arg1, jint arg2) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, OpenProcess_FUNC); - rc = (jintLong)OpenProcess((DWORD)arg0, arg1, (DWORD)arg2); + rc = (jlong)OpenProcess((DWORD)arg0, arg1, (DWORD)arg2); OS_NATIVE_EXIT(env, that, OpenProcess_FUNC); return rc; } #endif #ifndef NO_OpenThemeData -JNIEXPORT jintLong JNICALL OS_NATIVE(OpenThemeData) - (JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1) +JNIEXPORT jlong JNICALL OS_NATIVE(OpenThemeData) + (JNIEnv *env, jclass that, jlong arg0, jcharArray arg1) { jchar *lparg1=NULL; - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, OpenThemeData_FUNC); if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail; - rc = (jintLong)OpenThemeData((HWND)arg0, (LPCWSTR)lparg1); + rc = (jlong)OpenThemeData((HWND)arg0, (LPCWSTR)lparg1); fail: if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, 0); OS_NATIVE_EXIT(env, that, OpenThemeData_FUNC); @@ -8235,7 +7135,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(PANOSE_1sizeof) #ifndef NO_POINTSTOPOINT JNIEXPORT void JNICALL OS_NATIVE(POINTSTOPOINT) - (JNIEnv *env, jclass that, jobject arg0, jintLong arg1) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1) { POINT _arg0, *lparg0=NULL; OS_NATIVE_ENTER(env, that, POINTSTOPOINT_FUNC); @@ -8340,7 +7240,7 @@ fail: #ifndef NO_PatBlt JNIEXPORT jboolean JNICALL OS_NATIVE(PatBlt) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, PatBlt_FUNC); @@ -8352,7 +7252,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(PatBlt) #ifndef NO_PathIsExe JNIEXPORT jboolean JNICALL OS_NATIVE(PathIsExe) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, PathIsExe_FUNC); @@ -8364,7 +7264,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(PathIsExe) #ifndef NO_PeekMessage JNIEXPORT jboolean JNICALL OS_NATIVE(PeekMessage) - (JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2, jint arg3, jint arg4) + (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2, jint arg3, jint arg4) { MSG _arg0, *lparg0=NULL; jboolean rc = 0; @@ -8380,7 +7280,7 @@ fail: #ifndef NO_Pie JNIEXPORT jboolean JNICALL OS_NATIVE(Pie) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, Pie_FUNC); @@ -8392,7 +7292,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(Pie) #ifndef NO_Polygon JNIEXPORT jboolean JNICALL OS_NATIVE(Polygon) - (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jintArray arg1, jint arg2) { jint *lparg1=NULL; jboolean rc = 0; @@ -8408,7 +7308,7 @@ fail: #ifndef NO_Polyline JNIEXPORT jboolean JNICALL OS_NATIVE(Polyline) - (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jintArray arg1, jint arg2) { jint *lparg1=NULL; jboolean rc = 0; @@ -8424,7 +7324,7 @@ fail: #ifndef NO_PostMessage JNIEXPORT jboolean JNICALL OS_NATIVE(PostMessage) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintLong arg3) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2, jlong arg3) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, PostMessage_FUNC); @@ -8436,7 +7336,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(PostMessage) #ifndef NO_PostThreadMessage JNIEXPORT jboolean JNICALL OS_NATIVE(PostThreadMessage) - (JNIEnv *env, jclass that, jint arg0, jint arg1, jintLong arg2, jintLong arg3) + (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, PostThreadMessage_FUNC); @@ -8464,7 +7364,7 @@ fail: #ifndef NO_PrintWindow JNIEXPORT jboolean JNICALL OS_NATIVE(PrintWindow) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, PrintWindow_FUNC); @@ -8493,7 +7393,7 @@ fail: #ifndef NO_PtInRegion JNIEXPORT jboolean JNICALL OS_NATIVE(PtInRegion) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, PtInRegion_FUNC); @@ -8529,7 +7429,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(RECT_1sizeof) #ifndef NO_RectInRegion JNIEXPORT jboolean JNICALL OS_NATIVE(RectInRegion) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { RECT _arg1, *lparg1=NULL; jboolean rc = 0; @@ -8544,7 +7444,7 @@ fail: #ifndef NO_Rectangle JNIEXPORT jboolean JNICALL OS_NATIVE(Rectangle) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3, jint arg4) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, Rectangle_FUNC); @@ -8556,7 +7456,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(Rectangle) #ifndef NO_RedrawWindow JNIEXPORT jboolean JNICALL OS_NATIVE(RedrawWindow) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2, jint arg3) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jlong arg2, jint arg3) { RECT _arg1, *lparg1=NULL; jboolean rc = 0; @@ -8572,7 +7472,7 @@ fail: #ifndef NO_RegCloseKey JNIEXPORT jint JNICALL OS_NATIVE(RegCloseKey) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; OS_NATIVE_ENTER(env, that, RegCloseKey_FUNC); @@ -8584,22 +7484,22 @@ JNIEXPORT jint JNICALL OS_NATIVE(RegCloseKey) #ifndef NO_RegCreateKeyEx JNIEXPORT jint JNICALL OS_NATIVE(RegCreateKeyEx) - (JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jcharArray arg3, jint arg4, jint arg5, jintLong arg6, jintLongArray arg7, jintLongArray arg8) + (JNIEnv *env, jclass that, jlong arg0, jcharArray arg1, jint arg2, jcharArray arg3, jint arg4, jint arg5, jlong arg6, jlongArray arg7, jlongArray arg8) { jchar *lparg1=NULL; jchar *lparg3=NULL; - jintLong *lparg7=NULL; - jintLong *lparg8=NULL; + jlong *lparg7=NULL; + jlong *lparg8=NULL; jint rc = 0; OS_NATIVE_ENTER(env, that, RegCreateKeyEx_FUNC); if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail; if (arg3) if ((lparg3 = (*env)->GetCharArrayElements(env, arg3, NULL)) == NULL) goto fail; - if (arg7) if ((lparg7 = (*env)->GetIntLongArrayElements(env, arg7, NULL)) == NULL) goto fail; - if (arg8) if ((lparg8 = (*env)->GetIntLongArrayElements(env, arg8, NULL)) == NULL) goto fail; + if (arg7) if ((lparg7 = (*env)->GetLongArrayElements(env, arg7, NULL)) == NULL) goto fail; + if (arg8) if ((lparg8 = (*env)->GetLongArrayElements(env, arg8, NULL)) == NULL) goto fail; rc = (jint)RegCreateKeyEx((HKEY)arg0, (LPWSTR)lparg1, arg2, (LPWSTR)lparg3, arg4, arg5, (LPSECURITY_ATTRIBUTES)arg6, (PHKEY)lparg7, (LPDWORD)lparg8); fail: - if (arg8 && lparg8) (*env)->ReleaseIntLongArrayElements(env, arg8, lparg8, 0); - if (arg7 && lparg7) (*env)->ReleaseIntLongArrayElements(env, arg7, lparg7, 0); + if (arg8 && lparg8) (*env)->ReleaseLongArrayElements(env, arg8, lparg8, 0); + if (arg7 && lparg7) (*env)->ReleaseLongArrayElements(env, arg7, lparg7, 0); if (arg3 && lparg3) (*env)->ReleaseCharArrayElements(env, arg3, lparg3, 0); if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, 0); OS_NATIVE_EXIT(env, that, RegCreateKeyEx_FUNC); @@ -8609,7 +7509,7 @@ fail: #ifndef NO_RegDeleteValue JNIEXPORT jint JNICALL OS_NATIVE(RegDeleteValue) - (JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jcharArray arg1) { jchar *lparg1=NULL; jint rc = 0; @@ -8625,7 +7525,7 @@ fail: #ifndef NO_RegEnumKeyEx JNIEXPORT jint JNICALL OS_NATIVE(RegEnumKeyEx) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jcharArray arg2, jintArray arg3, jintArray arg4, jcharArray arg5, jintArray arg6, jobject arg7) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jcharArray arg2, jintArray arg3, jintArray arg4, jcharArray arg5, jintArray arg6, jobject arg7) { jchar *lparg2=NULL; jint *lparg3=NULL; @@ -8656,40 +7556,33 @@ fail: #ifndef NO_RegOpenKeyEx JNIEXPORT jint JNICALL OS_NATIVE(RegOpenKeyEx) - (JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jint arg3, jintLongArray arg4) + (JNIEnv *env, jclass that, jlong arg0, jcharArray arg1, jint arg2, jint arg3, jlongArray arg4) { jchar *lparg1=NULL; - jintLong *lparg4=NULL; + jlong *lparg4=NULL; jint rc = 0; OS_NATIVE_ENTER(env, that, RegOpenKeyEx_FUNC); if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail; - if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail; + if (arg4) if ((lparg4 = (*env)->GetLongArrayElements(env, arg4, NULL)) == NULL) goto fail; rc = (jint)RegOpenKeyEx((HKEY)arg0, (LPWSTR)lparg1, arg2, arg3, (PHKEY)lparg4); fail: - if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0); + if (arg4 && lparg4) (*env)->ReleaseLongArrayElements(env, arg4, lparg4, 0); if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, 0); OS_NATIVE_EXIT(env, that, RegOpenKeyEx_FUNC); return rc; } #endif -#if (!defined(NO_RegQueryValueEx__I_3CI_3I_3C_3I) && !defined(JNI64)) || (!defined(NO_RegQueryValueEx__J_3CJ_3I_3C_3I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL OS_NATIVE(RegQueryValueEx__I_3CI_3I_3C_3I)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jintLong arg2, jintArray arg3, jcharArray arg4, jintArray arg5) -#else -JNIEXPORT jint JNICALL OS_NATIVE(RegQueryValueEx__J_3CJ_3I_3C_3I)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jintLong arg2, jintArray arg3, jcharArray arg4, jintArray arg5) -#endif +#ifndef NO_RegQueryValueEx__J_3CJ_3I_3C_3I +JNIEXPORT jint JNICALL OS_NATIVE(RegQueryValueEx__J_3CJ_3I_3C_3I) + (JNIEnv *env, jclass that, jlong arg0, jcharArray arg1, jlong arg2, jintArray arg3, jcharArray arg4, jintArray arg5) { jchar *lparg1=NULL; jint *lparg3=NULL; jchar *lparg4=NULL; jint *lparg5=NULL; jint rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, RegQueryValueEx__I_3CI_3I_3C_3I_FUNC); -#else OS_NATIVE_ENTER(env, that, RegQueryValueEx__J_3CJ_3I_3C_3I_FUNC); -#endif if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail; if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail; if (arg4) if ((lparg4 = (*env)->GetCharArrayElements(env, arg4, NULL)) == NULL) goto fail; @@ -8700,32 +7593,21 @@ fail: if (arg4 && lparg4) (*env)->ReleaseCharArrayElements(env, arg4, lparg4, 0); if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0); if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, 0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, RegQueryValueEx__I_3CI_3I_3C_3I_FUNC); -#else OS_NATIVE_EXIT(env, that, RegQueryValueEx__J_3CJ_3I_3C_3I_FUNC); -#endif return rc; } #endif -#if (!defined(NO_RegQueryValueEx__I_3CI_3I_3I_3I) && !defined(JNI64)) || (!defined(NO_RegQueryValueEx__J_3CJ_3I_3I_3I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL OS_NATIVE(RegQueryValueEx__I_3CI_3I_3I_3I)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jintLong arg2, jintArray arg3, jintArray arg4, jintArray arg5) -#else -JNIEXPORT jint JNICALL OS_NATIVE(RegQueryValueEx__J_3CJ_3I_3I_3I)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jintLong arg2, jintArray arg3, jintArray arg4, jintArray arg5) -#endif +#ifndef NO_RegQueryValueEx__J_3CJ_3I_3I_3I +JNIEXPORT jint JNICALL OS_NATIVE(RegQueryValueEx__J_3CJ_3I_3I_3I) + (JNIEnv *env, jclass that, jlong arg0, jcharArray arg1, jlong arg2, jintArray arg3, jintArray arg4, jintArray arg5) { jchar *lparg1=NULL; jint *lparg3=NULL; jint *lparg4=NULL; jint *lparg5=NULL; jint rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, RegQueryValueEx__I_3CI_3I_3I_3I_FUNC); -#else OS_NATIVE_ENTER(env, that, RegQueryValueEx__J_3CJ_3I_3I_3I_FUNC); -#endif if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, 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; @@ -8736,18 +7618,14 @@ fail: if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0); if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0); if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, 0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, RegQueryValueEx__I_3CI_3I_3I_3I_FUNC); -#else OS_NATIVE_EXIT(env, that, RegQueryValueEx__J_3CJ_3I_3I_3I_FUNC); -#endif return rc; } #endif #ifndef NO_RegSetValueEx JNIEXPORT jint JNICALL OS_NATIVE(RegSetValueEx) - (JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jint arg3, jintArray arg4, jint arg5) + (JNIEnv *env, jclass that, jlong arg0, jcharArray arg1, jint arg2, jint arg3, jintArray arg4, jint arg5) { jchar *lparg1=NULL; jint *lparg4=NULL; @@ -8798,7 +7676,7 @@ fail: #ifndef NO_RegisterTouchWindow JNIEXPORT jboolean JNICALL OS_NATIVE(RegisterTouchWindow) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, RegisterTouchWindow_FUNC); @@ -8846,7 +7724,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(ReleaseCapture) #ifndef NO_ReleaseDC JNIEXPORT jint JNICALL OS_NATIVE(ReleaseDC) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { jint rc = 0; OS_NATIVE_ENTER(env, that, ReleaseDC_FUNC); @@ -8858,7 +7736,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(ReleaseDC) #ifndef NO_RemoveMenu JNIEXPORT jboolean JNICALL OS_NATIVE(RemoveMenu) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, RemoveMenu_FUNC); @@ -8869,12 +7747,12 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(RemoveMenu) #endif #ifndef NO_RemoveProp -JNIEXPORT jintLong JNICALL OS_NATIVE(RemoveProp) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) +JNIEXPORT jlong JNICALL OS_NATIVE(RemoveProp) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, RemoveProp_FUNC); - rc = (jintLong)RemoveProp((HWND)arg0, (LPCWSTR)arg1); + rc = (jlong)RemoveProp((HWND)arg0, (LPCWSTR)arg1); OS_NATIVE_EXIT(env, that, RemoveProp_FUNC); return rc; } @@ -8882,7 +7760,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(RemoveProp) #ifndef NO_ReplyMessage JNIEXPORT jboolean JNICALL OS_NATIVE(ReplyMessage) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, ReplyMessage_FUNC); @@ -8894,7 +7772,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(ReplyMessage) #ifndef NO_RestoreDC JNIEXPORT jboolean JNICALL OS_NATIVE(RestoreDC) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, RestoreDC_FUNC); @@ -8906,7 +7784,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(RestoreDC) #ifndef NO_RoundRect JNIEXPORT jboolean JNICALL OS_NATIVE(RoundRect) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, RoundRect_FUNC); @@ -9073,14 +7951,14 @@ JNIEXPORT jint JNICALL OS_NATIVE(SCROLLINFO_1sizeof) #endif #ifndef NO_SHBrowseForFolder -JNIEXPORT jintLong JNICALL OS_NATIVE(SHBrowseForFolder) +JNIEXPORT jlong JNICALL OS_NATIVE(SHBrowseForFolder) (JNIEnv *env, jclass that, jobject arg0) { BROWSEINFO _arg0, *lparg0=NULL; - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, SHBrowseForFolder_FUNC); if (arg0) if ((lparg0 = getBROWSEINFOFields(env, arg0, &_arg0)) == NULL) goto fail; - rc = (jintLong)SHBrowseForFolder((LPBROWSEINFOW)lparg0); + rc = (jlong)SHBrowseForFolder((LPBROWSEINFOW)lparg0); fail: if (arg0 && lparg0) setBROWSEINFOFields(env, arg0, lparg0); OS_NATIVE_EXIT(env, that, SHBrowseForFolder_FUNC); @@ -9090,19 +7968,19 @@ fail: #ifndef NO_SHCreateItemFromParsingName JNIEXPORT jint JNICALL OS_NATIVE(SHCreateItemFromParsingName) - (JNIEnv *env, jclass that, jcharArray arg0, jintLong arg1, jbyteArray arg2, jintLongArray arg3) + (JNIEnv *env, jclass that, jcharArray arg0, jlong arg1, jbyteArray arg2, jlongArray arg3) { jchar *lparg0=NULL; jbyte *lparg2=NULL; - jintLong *lparg3=NULL; + jlong *lparg3=NULL; jint rc = 0; OS_NATIVE_ENTER(env, that, SHCreateItemFromParsingName_FUNC); if (arg0) if ((lparg0 = (*env)->GetCharArrayElements(env, arg0, NULL)) == NULL) goto fail; if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail; - if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail; + if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail; rc = (jint)SHCreateItemFromParsingName(lparg0, (IBindCtx *)arg1, (REFIID)lparg2, (void **)lparg3); fail: - if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0); + if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0); if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0); if (arg0 && lparg0) (*env)->ReleaseCharArrayElements(env, arg0, lparg0, 0); OS_NATIVE_EXIT(env, that, SHCreateItemFromParsingName_FUNC); @@ -9112,19 +7990,19 @@ fail: #ifndef NO_SHCreateItemFromRelativeName JNIEXPORT jint JNICALL OS_NATIVE(SHCreateItemFromRelativeName) - (JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jintLong arg2, jbyteArray arg3, jintLongArray arg4) + (JNIEnv *env, jclass that, jlong arg0, jcharArray arg1, jlong arg2, jbyteArray arg3, jlongArray arg4) { jchar *lparg1=NULL; jbyte *lparg3=NULL; - jintLong *lparg4=NULL; + jlong *lparg4=NULL; jint rc = 0; OS_NATIVE_ENTER(env, that, SHCreateItemFromRelativeName_FUNC); if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail; if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail; - if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail; + if (arg4) if ((lparg4 = (*env)->GetLongArrayElements(env, arg4, NULL)) == NULL) goto fail; rc = (jint)SHCreateItemFromRelativeName((IShellItem *)arg0, lparg1, (IBindCtx *)arg2, (REFIID)lparg3, (void **)lparg4); fail: - if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0); + if (arg4 && lparg4) (*env)->ReleaseLongArrayElements(env, arg4, lparg4, 0); if (arg3 && lparg3) (*env)->ReleaseByteArrayElements(env, arg3, lparg3, 0); if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, 0); OS_NATIVE_EXIT(env, that, SHCreateItemFromRelativeName_FUNC); @@ -9134,21 +8012,21 @@ fail: #ifndef NO_SHCreateItemInKnownFolder JNIEXPORT jint JNICALL OS_NATIVE(SHCreateItemInKnownFolder) - (JNIEnv *env, jclass that, jbyteArray arg0, jint arg1, jcharArray arg2, jbyteArray arg3, jintLongArray arg4) + (JNIEnv *env, jclass that, jbyteArray arg0, jint arg1, jcharArray arg2, jbyteArray arg3, jlongArray arg4) { jbyte *lparg0=NULL; jchar *lparg2=NULL; jbyte *lparg3=NULL; - jintLong *lparg4=NULL; + jlong *lparg4=NULL; jint rc = 0; OS_NATIVE_ENTER(env, that, SHCreateItemInKnownFolder_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail; if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail; - if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail; + if (arg4) if ((lparg4 = (*env)->GetLongArrayElements(env, arg4, NULL)) == NULL) goto fail; rc = (jint)SHCreateItemInKnownFolder((REFKNOWNFOLDERID)lparg0, arg1, lparg2, (REFIID)lparg3, (void **)lparg4); fail: - if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0); + if (arg4 && lparg4) (*env)->ReleaseLongArrayElements(env, arg4, lparg4, 0); if (arg3 && lparg3) (*env)->ReleaseByteArrayElements(env, arg3, lparg3, 0); if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0); if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0); @@ -9194,16 +8072,16 @@ JNIEXPORT jint JNICALL OS_NATIVE(SHFILEINFO_1sizeof) #endif #ifndef NO_SHGetFileInfo -JNIEXPORT jintLong JNICALL OS_NATIVE(SHGetFileInfo) +JNIEXPORT jlong JNICALL OS_NATIVE(SHGetFileInfo) (JNIEnv *env, jclass that, jcharArray arg0, jint arg1, jobject arg2, jint arg3, jint arg4) { jchar *lparg0=NULL; SHFILEINFO _arg2, *lparg2=NULL; - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, SHGetFileInfo_FUNC); if (arg0) if ((lparg0 = (*env)->GetCharArrayElements(env, arg0, NULL)) == NULL) goto fail; if (arg2) if ((lparg2 = getSHFILEINFOFields(env, arg2, &_arg2)) == NULL) goto fail; - rc = (jintLong)SHGetFileInfo((LPCWSTR)lparg0, arg1, (SHFILEINFOW *)lparg2, arg3, arg4); + rc = (jlong)SHGetFileInfo((LPCWSTR)lparg0, arg1, (SHFILEINFOW *)lparg2, arg3, arg4); fail: if (arg2 && lparg2) setSHFILEINFOFields(env, arg2, lparg2); if (arg0 && lparg0) (*env)->ReleaseCharArrayElements(env, arg0, lparg0, 0); @@ -9214,15 +8092,15 @@ fail: #ifndef NO_SHGetMalloc JNIEXPORT jint JNICALL OS_NATIVE(SHGetMalloc) - (JNIEnv *env, jclass that, jintLongArray arg0) + (JNIEnv *env, jclass that, jlongArray arg0) { - jintLong *lparg0=NULL; + jlong *lparg0=NULL; jint rc = 0; OS_NATIVE_ENTER(env, that, SHGetMalloc_FUNC); - if (arg0) if ((lparg0 = (*env)->GetIntLongArrayElements(env, arg0, NULL)) == NULL) goto fail; + if (arg0) if ((lparg0 = (*env)->GetLongArrayElements(env, arg0, NULL)) == NULL) goto fail; rc = (jint)SHGetMalloc((LPMALLOC *)lparg0); fail: - if (arg0 && lparg0) (*env)->ReleaseIntLongArrayElements(env, arg0, lparg0, 0); + if (arg0 && lparg0) (*env)->ReleaseLongArrayElements(env, arg0, lparg0, 0); OS_NATIVE_EXIT(env, that, SHGetMalloc_FUNC); return rc; } @@ -9230,7 +8108,7 @@ fail: #ifndef NO_SHGetPathFromIDList JNIEXPORT jboolean JNICALL OS_NATIVE(SHGetPathFromIDList) - (JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jcharArray arg1) { jchar *lparg1=NULL; jboolean rc = 0; @@ -9282,7 +8160,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(SYSTEMTIME_1sizeof) #ifndef NO_SaveDC JNIEXPORT jint JNICALL OS_NATIVE(SaveDC) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; OS_NATIVE_ENTER(env, that, SaveDC_FUNC); @@ -9294,7 +8172,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(SaveDC) #ifndef NO_ScreenToClient JNIEXPORT jboolean JNICALL OS_NATIVE(ScreenToClient) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { POINT _arg1, *lparg1=NULL; jboolean rc = 0; @@ -9332,7 +8210,7 @@ fail: #ifndef NO_ScriptBreak JNIEXPORT jint JNICALL OS_NATIVE(ScriptBreak) - (JNIEnv *env, jclass that, jcharArray arg0, jint arg1, jobject arg2, jintLong arg3) + (JNIEnv *env, jclass that, jcharArray arg0, jint arg1, jobject arg2, jlong arg3) { jchar *lparg0=NULL; SCRIPT_ANALYSIS _arg2, *lparg2=NULL; @@ -9351,7 +8229,7 @@ fail: #ifndef NO_ScriptCPtoX JNIEXPORT jint JNICALL OS_NATIVE(ScriptCPtoX) - (JNIEnv *env, jclass that, jint arg0, jboolean arg1, jint arg2, jint arg3, jintLong arg4, jintLong arg5, jintLong arg6, jobject arg7, jintArray arg8) + (JNIEnv *env, jclass that, jint arg0, jboolean arg1, jint arg2, jint arg3, jlong arg4, jlong arg5, jlong arg6, jobject arg7, jintArray arg8) { SCRIPT_ANALYSIS _arg7, *lparg7=NULL; jint *lparg8=NULL; @@ -9370,7 +8248,7 @@ fail: #ifndef NO_ScriptCacheGetHeight JNIEXPORT jint JNICALL OS_NATIVE(ScriptCacheGetHeight) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintArray arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jintArray arg2) { jint *lparg2=NULL; jint rc = 0; @@ -9386,7 +8264,7 @@ fail: #ifndef NO_ScriptFreeCache JNIEXPORT jint JNICALL OS_NATIVE(ScriptFreeCache) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; OS_NATIVE_ENTER(env, that, ScriptFreeCache_FUNC); @@ -9398,7 +8276,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(ScriptFreeCache) #ifndef NO_ScriptGetCMap JNIEXPORT jint JNICALL OS_NATIVE(ScriptGetCMap) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jcharArray arg2, jint arg3, jint arg4, jshortArray arg5) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jcharArray arg2, jint arg3, jint arg4, jshortArray arg5) { jchar *lparg2=NULL; jshort *lparg5=NULL; @@ -9417,7 +8295,7 @@ fail: #ifndef NO_ScriptGetFontProperties JNIEXPORT jint JNICALL OS_NATIVE(ScriptGetFontProperties) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jobject arg2) { SCRIPT_FONTPROPERTIES _arg2, *lparg2=NULL; jint rc = 0; @@ -9433,7 +8311,7 @@ fail: #ifndef NO_ScriptGetLogicalWidths JNIEXPORT jint JNICALL OS_NATIVE(ScriptGetLogicalWidths) - (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2, jintLong arg3, jintLong arg4, jintLong arg5, jintArray arg6) + (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2, jlong arg3, jlong arg4, jlong arg5, jintArray arg6) { SCRIPT_ANALYSIS _arg0, *lparg0=NULL; jint *lparg6=NULL; @@ -9452,18 +8330,18 @@ fail: #ifndef NO_ScriptGetProperties JNIEXPORT jint JNICALL OS_NATIVE(ScriptGetProperties) - (JNIEnv *env, jclass that, jintLongArray arg0, jintArray arg1) + (JNIEnv *env, jclass that, jlongArray arg0, jintArray arg1) { - jintLong *lparg0=NULL; + jlong *lparg0=NULL; jint *lparg1=NULL; jint rc = 0; OS_NATIVE_ENTER(env, that, ScriptGetProperties_FUNC); - if (arg0) if ((lparg0 = (*env)->GetIntLongArrayElements(env, arg0, NULL)) == NULL) goto fail; + if (arg0) if ((lparg0 = (*env)->GetLongArrayElements(env, arg0, NULL)) == NULL) goto fail; if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail; rc = (jint)ScriptGetProperties((const SCRIPT_PROPERTIES ***)lparg0, (int *)lparg1); fail: if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0); - if (arg0 && lparg0) (*env)->ReleaseIntLongArrayElements(env, arg0, lparg0, 0); + if (arg0 && lparg0) (*env)->ReleaseLongArrayElements(env, arg0, lparg0, 0); OS_NATIVE_EXIT(env, that, ScriptGetProperties_FUNC); return rc; } @@ -9471,7 +8349,7 @@ fail: #ifndef NO_ScriptItemize JNIEXPORT jint JNICALL OS_NATIVE(ScriptItemize) - (JNIEnv *env, jclass that, jcharArray arg0, jint arg1, jint arg2, jobject arg3, jobject arg4, jintLong arg5, jintArray arg6) + (JNIEnv *env, jclass that, jcharArray arg0, jint arg1, jint arg2, jobject arg3, jobject arg4, jlong arg5, jintArray arg6) { jchar *lparg0=NULL; SCRIPT_CONTROL _arg3, *lparg3=NULL; @@ -9496,7 +8374,7 @@ fail: #ifndef NO_ScriptJustify JNIEXPORT jint JNICALL OS_NATIVE(ScriptJustify) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jintLong arg5) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jlong arg5) { jint rc = 0; OS_NATIVE_ENTER(env, that, ScriptJustify_FUNC); @@ -9530,7 +8408,7 @@ fail: #ifndef NO_ScriptPlace JNIEXPORT jint JNICALL OS_NATIVE(ScriptPlace) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3, jintLong arg4, jobject arg5, jintLong arg6, jintLong arg7, jintArray arg8) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jint arg3, jlong arg4, jobject arg5, jlong arg6, jlong arg7, jintArray arg8) { SCRIPT_ANALYSIS _arg5, *lparg5=NULL; jint *lparg8=NULL; @@ -9565,7 +8443,7 @@ fail: #ifndef NO_ScriptShape JNIEXPORT jint JNICALL OS_NATIVE(ScriptShape) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jcharArray arg2, jint arg3, jint arg4, jobject arg5, jintLong arg6, jintLong arg7, jintLong arg8, jintArray arg9) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jcharArray arg2, jint arg3, jint arg4, jobject arg5, jlong arg6, jlong arg7, jlong arg8, jintArray arg9) { jchar *lparg2=NULL; SCRIPT_ANALYSIS _arg5, *lparg5=NULL; @@ -9587,7 +8465,7 @@ fail: #ifndef NO_ScriptStringAnalyse JNIEXPORT jint JNICALL OS_NATIVE(ScriptStringAnalyse) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jobject arg7, jobject arg8, jintLong arg9, jintLong arg10, jintLong arg11, jintLong arg12) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jobject arg7, jobject arg8, jlong arg9, jlong arg10, jlong arg11, jlong arg12) { SCRIPT_CONTROL _arg7, *lparg7=NULL; SCRIPT_STATE _arg8, *lparg8=NULL; @@ -9606,7 +8484,7 @@ fail: #ifndef NO_ScriptStringFree JNIEXPORT jint JNICALL OS_NATIVE(ScriptStringFree) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; OS_NATIVE_ENTER(env, that, ScriptStringFree_FUNC); @@ -9618,7 +8496,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(ScriptStringFree) #ifndef NO_ScriptStringOut JNIEXPORT jint JNICALL OS_NATIVE(ScriptStringOut) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jint arg6, jboolean arg7) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jint arg6, jboolean arg7) { RECT _arg4, *lparg4=NULL; jint rc = 0; @@ -9634,7 +8512,7 @@ fail: #ifndef NO_ScriptTextOut JNIEXPORT jint JNICALL OS_NATIVE(ScriptTextOut) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jobject arg5, jobject arg6, jintLong arg7, jint arg8, jintLong arg9, jint arg10, jintLong arg11, jintLong arg12, jintLong arg13) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jobject arg5, jobject arg6, jlong arg7, jint arg8, jlong arg9, jint arg10, jlong arg11, jlong arg12, jlong arg13) { RECT _arg5, *lparg5=NULL; SCRIPT_ANALYSIS _arg6, *lparg6=NULL; @@ -9653,7 +8531,7 @@ fail: #ifndef NO_ScriptXtoCP JNIEXPORT jint JNICALL OS_NATIVE(ScriptXtoCP) - (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintLong arg3, jintLong arg4, jintLong arg5, jobject arg6, jintArray arg7, jintArray arg8) + (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jlong arg3, jlong arg4, jlong arg5, jobject arg6, jintArray arg7, jintArray arg8) { SCRIPT_ANALYSIS _arg6, *lparg6=NULL; jint *lparg7=NULL; @@ -9675,7 +8553,7 @@ fail: #ifndef NO_ScrollWindowEx JNIEXPORT jint JNICALL OS_NATIVE(ScrollWindowEx) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jobject arg3, jobject arg4, jintLong arg5, jobject arg6, jint arg7) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jobject arg3, jobject arg4, jlong arg5, jobject arg6, jint arg7) { RECT _arg3, *lparg3=NULL; RECT _arg4, *lparg4=NULL; @@ -9697,7 +8575,7 @@ fail: #ifndef NO_SelectClipRgn JNIEXPORT jint JNICALL OS_NATIVE(SelectClipRgn) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { jint rc = 0; OS_NATIVE_ENTER(env, that, SelectClipRgn_FUNC); @@ -9708,12 +8586,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(SelectClipRgn) #endif #ifndef NO_SelectObject -JNIEXPORT jintLong JNICALL OS_NATIVE(SelectObject) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) +JNIEXPORT jlong JNICALL OS_NATIVE(SelectObject) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, SelectObject_FUNC); - rc = (jintLong)SelectObject((HDC)arg0, (HGDIOBJ)arg1); + rc = (jlong)SelectObject((HDC)arg0, (HGDIOBJ)arg1); OS_NATIVE_EXIT(env, that, SelectObject_FUNC); return rc; } @@ -9721,7 +8599,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(SelectObject) #ifndef NO_SendInput JNIEXPORT jint JNICALL OS_NATIVE(SendInput) - (JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2) { jint rc = 0; OS_NATIVE_ENTER(env, that, SendInput_FUNC); @@ -9731,822 +8609,492 @@ JNIEXPORT jint JNICALL OS_NATIVE(SendInput) } #endif -#if (!defined(NO_SendMessage__IIII) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__IIII)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintLong arg3) -#else -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJJ)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintLong arg3) -#endif +#ifndef NO_SendMessage__JIJJ +JNIEXPORT jlong JNICALL OS_NATIVE(SendMessage__JIJJ) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2, jlong arg3) { - jintLong rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, SendMessage__IIII_FUNC); -#else + jlong rc = 0; OS_NATIVE_ENTER(env, that, SendMessage__JIJJ_FUNC); -#endif - rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)arg3); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, SendMessage__IIII_FUNC); -#else + rc = (jlong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)arg3); OS_NATIVE_EXIT(env, that, SendMessage__JIJJ_FUNC); -#endif return rc; } #endif -#if (!defined(NO_SendMessage__IIILorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__IIILorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3) -#else -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3) -#endif +#ifndef NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2 +JNIEXPORT jlong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2, jobject arg3) { BUTTON_IMAGELIST _arg3, *lparg3=NULL; - jintLong rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2_FUNC); -#else + jlong rc = 0; OS_NATIVE_ENTER(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2_FUNC); -#endif if (arg3) if ((lparg3 = getBUTTON_IMAGELISTFields(env, arg3, &_arg3)) == NULL) goto fail; - rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3); + rc = (jlong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3); fail: if (arg3 && lparg3) setBUTTON_IMAGELISTFields(env, arg3, lparg3); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2_FUNC); -#else OS_NATIVE_EXIT(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2_FUNC); -#endif return rc; } #endif -#if (!defined(NO_SendMessage__IIILorg_eclipse_swt_internal_win32_HDHITTESTINFO_2) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_HDHITTESTINFO_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__IIILorg_eclipse_swt_internal_win32_HDHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3) -#else -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_HDHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3) -#endif +#ifndef NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_HDHITTESTINFO_2 +JNIEXPORT jlong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_HDHITTESTINFO_2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2, jobject arg3) { HDHITTESTINFO _arg3, *lparg3=NULL; - jintLong rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_HDHITTESTINFO_2_FUNC); -#else + jlong rc = 0; OS_NATIVE_ENTER(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_HDHITTESTINFO_2_FUNC); -#endif if (arg3) if ((lparg3 = getHDHITTESTINFOFields(env, arg3, &_arg3)) == NULL) goto fail; - rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3); + rc = (jlong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3); fail: if (arg3 && lparg3) setHDHITTESTINFOFields(env, arg3, lparg3); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_HDHITTESTINFO_2_FUNC); -#else OS_NATIVE_EXIT(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_HDHITTESTINFO_2_FUNC); -#endif return rc; } #endif -#if (!defined(NO_SendMessage__IIILorg_eclipse_swt_internal_win32_HDITEM_2) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_HDITEM_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__IIILorg_eclipse_swt_internal_win32_HDITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3) -#else -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_HDITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3) -#endif +#ifndef NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_HDITEM_2 +JNIEXPORT jlong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_HDITEM_2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2, jobject arg3) { HDITEM _arg3, *lparg3=NULL; - jintLong rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_HDITEM_2_FUNC); -#else + jlong rc = 0; OS_NATIVE_ENTER(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_HDITEM_2_FUNC); -#endif if (arg3) if ((lparg3 = getHDITEMFields(env, arg3, &_arg3)) == NULL) goto fail; - rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3); + rc = (jlong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3); fail: if (arg3 && lparg3) setHDITEMFields(env, arg3, lparg3); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_HDITEM_2_FUNC); -#else OS_NATIVE_EXIT(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_HDITEM_2_FUNC); -#endif return rc; } #endif -#if (!defined(NO_SendMessage__IIILorg_eclipse_swt_internal_win32_HDLAYOUT_2) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_HDLAYOUT_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__IIILorg_eclipse_swt_internal_win32_HDLAYOUT_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3) -#else -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_HDLAYOUT_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3) -#endif +#ifndef NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_HDLAYOUT_2 +JNIEXPORT jlong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_HDLAYOUT_2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2, jobject arg3) { HDLAYOUT _arg3, *lparg3=NULL; - jintLong rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_HDLAYOUT_2_FUNC); -#else + jlong rc = 0; OS_NATIVE_ENTER(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_HDLAYOUT_2_FUNC); -#endif if (arg3) if ((lparg3 = getHDLAYOUTFields(env, arg3, &_arg3)) == NULL) goto fail; - rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3); + rc = (jlong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3); fail: if (arg3 && lparg3) setHDLAYOUTFields(env, arg3, lparg3); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_HDLAYOUT_2_FUNC); -#else OS_NATIVE_EXIT(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_HDLAYOUT_2_FUNC); -#endif return rc; } #endif -#if (!defined(NO_SendMessage__IIILorg_eclipse_swt_internal_win32_LITEM_2) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_LITEM_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__IIILorg_eclipse_swt_internal_win32_LITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3) -#else -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_LITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3) -#endif +#ifndef NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_LITEM_2 +JNIEXPORT jlong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_LITEM_2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2, jobject arg3) { LITEM _arg3, *lparg3=NULL; - jintLong rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_LITEM_2_FUNC); -#else + jlong rc = 0; OS_NATIVE_ENTER(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_LITEM_2_FUNC); -#endif if (arg3) if ((lparg3 = getLITEMFields(env, arg3, &_arg3)) == NULL) goto fail; - rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3); + rc = (jlong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3); fail: if (arg3 && lparg3) setLITEMFields(env, arg3, lparg3); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_LITEM_2_FUNC); -#else OS_NATIVE_EXIT(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_LITEM_2_FUNC); -#endif return rc; } #endif -#if (!defined(NO_SendMessage__IIILorg_eclipse_swt_internal_win32_LVCOLUMN_2) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_LVCOLUMN_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__IIILorg_eclipse_swt_internal_win32_LVCOLUMN_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3) -#else -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_LVCOLUMN_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3) -#endif +#ifndef NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_LVCOLUMN_2 +JNIEXPORT jlong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_LVCOLUMN_2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2, jobject arg3) { LVCOLUMN _arg3, *lparg3=NULL; - jintLong rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_LVCOLUMN_2_FUNC); -#else + jlong rc = 0; OS_NATIVE_ENTER(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_LVCOLUMN_2_FUNC); -#endif if (arg3) if ((lparg3 = getLVCOLUMNFields(env, arg3, &_arg3)) == NULL) goto fail; - rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3); + rc = (jlong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3); fail: if (arg3 && lparg3) setLVCOLUMNFields(env, arg3, lparg3); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_LVCOLUMN_2_FUNC); -#else OS_NATIVE_EXIT(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_LVCOLUMN_2_FUNC); -#endif return rc; } #endif -#if (!defined(NO_SendMessage__IIILorg_eclipse_swt_internal_win32_LVHITTESTINFO_2) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_LVHITTESTINFO_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__IIILorg_eclipse_swt_internal_win32_LVHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3) -#else -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_LVHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3) -#endif +#ifndef NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_LVHITTESTINFO_2 +JNIEXPORT jlong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_LVHITTESTINFO_2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2, jobject arg3) { LVHITTESTINFO _arg3, *lparg3=NULL; - jintLong rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_LVHITTESTINFO_2_FUNC); -#else + jlong rc = 0; OS_NATIVE_ENTER(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_LVHITTESTINFO_2_FUNC); -#endif if (arg3) if ((lparg3 = getLVHITTESTINFOFields(env, arg3, &_arg3)) == NULL) goto fail; - rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3); + rc = (jlong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3); fail: if (arg3 && lparg3) setLVHITTESTINFOFields(env, arg3, lparg3); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_LVHITTESTINFO_2_FUNC); -#else OS_NATIVE_EXIT(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_LVHITTESTINFO_2_FUNC); -#endif return rc; } #endif -#if (!defined(NO_SendMessage__IIILorg_eclipse_swt_internal_win32_LVINSERTMARK_2) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_LVINSERTMARK_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__IIILorg_eclipse_swt_internal_win32_LVINSERTMARK_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3) -#else -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_LVINSERTMARK_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3) -#endif +#ifndef NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_LVINSERTMARK_2 +JNIEXPORT jlong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_LVINSERTMARK_2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2, jobject arg3) { LVINSERTMARK _arg3, *lparg3=NULL; - jintLong rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_LVINSERTMARK_2_FUNC); -#else + jlong rc = 0; OS_NATIVE_ENTER(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_LVINSERTMARK_2_FUNC); -#endif if (arg3) if ((lparg3 = getLVINSERTMARKFields(env, arg3, &_arg3)) == NULL) goto fail; - rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3); + rc = (jlong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3); fail: if (arg3 && lparg3) setLVINSERTMARKFields(env, arg3, lparg3); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_LVINSERTMARK_2_FUNC); -#else OS_NATIVE_EXIT(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_LVINSERTMARK_2_FUNC); -#endif return rc; } #endif -#if (!defined(NO_SendMessage__IIILorg_eclipse_swt_internal_win32_LVITEM_2) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_LVITEM_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__IIILorg_eclipse_swt_internal_win32_LVITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3) -#else -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_LVITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3) -#endif +#ifndef NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_LVITEM_2 +JNIEXPORT jlong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_LVITEM_2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2, jobject arg3) { LVITEM _arg3, *lparg3=NULL; - jintLong rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_LVITEM_2_FUNC); -#else + jlong rc = 0; OS_NATIVE_ENTER(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_LVITEM_2_FUNC); -#endif if (arg3) if ((lparg3 = getLVITEMFields(env, arg3, &_arg3)) == NULL) goto fail; - rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3); + rc = (jlong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3); fail: if (arg3 && lparg3) setLVITEMFields(env, arg3, lparg3); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_LVITEM_2_FUNC); -#else OS_NATIVE_EXIT(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_LVITEM_2_FUNC); -#endif return rc; } #endif -#if (!defined(NO_SendMessage__IIILorg_eclipse_swt_internal_win32_MARGINS_2) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_MARGINS_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__IIILorg_eclipse_swt_internal_win32_MARGINS_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3) -#else -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_MARGINS_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3) -#endif +#ifndef NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_MARGINS_2 +JNIEXPORT jlong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_MARGINS_2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2, jobject arg3) { MARGINS _arg3, *lparg3=NULL; - jintLong rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_MARGINS_2_FUNC); -#else + jlong rc = 0; OS_NATIVE_ENTER(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_MARGINS_2_FUNC); -#endif if (arg3) if ((lparg3 = getMARGINSFields(env, arg3, &_arg3)) == NULL) goto fail; - rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3); + rc = (jlong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3); fail: if (arg3 && lparg3) setMARGINSFields(env, arg3, lparg3); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_MARGINS_2_FUNC); -#else OS_NATIVE_EXIT(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_MARGINS_2_FUNC); -#endif return rc; } #endif -#if (!defined(NO_SendMessage__IIILorg_eclipse_swt_internal_win32_MCHITTESTINFO_2) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_MCHITTESTINFO_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__IIILorg_eclipse_swt_internal_win32_MCHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3) -#else -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_MCHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3) -#endif +#ifndef NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_MCHITTESTINFO_2 +JNIEXPORT jlong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_MCHITTESTINFO_2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2, jobject arg3) { MCHITTESTINFO _arg3, *lparg3=NULL; - jintLong rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_MCHITTESTINFO_2_FUNC); -#else + jlong rc = 0; OS_NATIVE_ENTER(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_MCHITTESTINFO_2_FUNC); -#endif if (arg3) if ((lparg3 = getMCHITTESTINFOFields(env, arg3, &_arg3)) == NULL) goto fail; - rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3); + rc = (jlong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3); fail: if (arg3 && lparg3) setMCHITTESTINFOFields(env, arg3, lparg3); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_MCHITTESTINFO_2_FUNC); -#else OS_NATIVE_EXIT(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_MCHITTESTINFO_2_FUNC); -#endif return rc; } #endif -#if (!defined(NO_SendMessage__IIILorg_eclipse_swt_internal_win32_REBARBANDINFO_2) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_REBARBANDINFO_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__IIILorg_eclipse_swt_internal_win32_REBARBANDINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3) -#else -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_REBARBANDINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3) -#endif +#ifndef NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_REBARBANDINFO_2 +JNIEXPORT jlong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_REBARBANDINFO_2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2, jobject arg3) { REBARBANDINFO _arg3, *lparg3=NULL; - jintLong rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_REBARBANDINFO_2_FUNC); -#else + jlong rc = 0; OS_NATIVE_ENTER(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_REBARBANDINFO_2_FUNC); -#endif if (arg3) if ((lparg3 = getREBARBANDINFOFields(env, arg3, &_arg3)) == NULL) goto fail; - rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3); + rc = (jlong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3); fail: if (arg3 && lparg3) setREBARBANDINFOFields(env, arg3, lparg3); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_REBARBANDINFO_2_FUNC); -#else OS_NATIVE_EXIT(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_REBARBANDINFO_2_FUNC); -#endif return rc; } #endif -#if (!defined(NO_SendMessage__IIILorg_eclipse_swt_internal_win32_RECT_2) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_RECT_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__IIILorg_eclipse_swt_internal_win32_RECT_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3) -#else -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_RECT_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3) -#endif +#ifndef NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_RECT_2 +JNIEXPORT jlong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_RECT_2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2, jobject arg3) { RECT _arg3, *lparg3=NULL; - jintLong rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_RECT_2_FUNC); -#else + jlong rc = 0; OS_NATIVE_ENTER(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_RECT_2_FUNC); -#endif if (arg3) if ((lparg3 = getRECTFields(env, arg3, &_arg3)) == NULL) goto fail; - rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3); + rc = (jlong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3); fail: if (arg3 && lparg3) setRECTFields(env, arg3, lparg3); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_RECT_2_FUNC); -#else OS_NATIVE_EXIT(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_RECT_2_FUNC); -#endif return rc; } #endif -#if (!defined(NO_SendMessage__IIILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__IIILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3) -#else -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3) -#endif +#ifndef NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2 +JNIEXPORT jlong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2, jobject arg3) { SHDRAGIMAGE _arg3, *lparg3=NULL; - jintLong rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2_FUNC); -#else + jlong rc = 0; OS_NATIVE_ENTER(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2_FUNC); -#endif if (arg3) if ((lparg3 = getSHDRAGIMAGEFields(env, arg3, &_arg3)) == NULL) goto fail; - rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3); + rc = (jlong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3); fail: if (arg3 && lparg3) setSHDRAGIMAGEFields(env, arg3, lparg3); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2_FUNC); -#else OS_NATIVE_EXIT(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2_FUNC); -#endif return rc; } #endif -#if (!defined(NO_SendMessage__IIILorg_eclipse_swt_internal_win32_SIZE_2) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_SIZE_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__IIILorg_eclipse_swt_internal_win32_SIZE_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3) -#else -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_SIZE_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3) -#endif +#ifndef NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_SIZE_2 +JNIEXPORT jlong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_SIZE_2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2, jobject arg3) { SIZE _arg3, *lparg3=NULL; - jintLong rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_SIZE_2_FUNC); -#else + jlong rc = 0; OS_NATIVE_ENTER(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_SIZE_2_FUNC); -#endif if (arg3) if ((lparg3 = getSIZEFields(env, arg3, &_arg3)) == NULL) goto fail; - rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3); + rc = (jlong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3); fail: if (arg3 && lparg3) setSIZEFields(env, arg3, lparg3); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_SIZE_2_FUNC); -#else OS_NATIVE_EXIT(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_SIZE_2_FUNC); -#endif return rc; } #endif -#if (!defined(NO_SendMessage__IIILorg_eclipse_swt_internal_win32_SYSTEMTIME_2) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_SYSTEMTIME_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__IIILorg_eclipse_swt_internal_win32_SYSTEMTIME_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3) -#else -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_SYSTEMTIME_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3) -#endif +#ifndef NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_SYSTEMTIME_2 +JNIEXPORT jlong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_SYSTEMTIME_2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2, jobject arg3) { SYSTEMTIME _arg3, *lparg3=NULL; - jintLong rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_SYSTEMTIME_2_FUNC); -#else + jlong rc = 0; OS_NATIVE_ENTER(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_SYSTEMTIME_2_FUNC); -#endif if (arg3) if ((lparg3 = getSYSTEMTIMEFields(env, arg3, &_arg3)) == NULL) goto fail; - rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3); + rc = (jlong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3); fail: if (arg3 && lparg3) setSYSTEMTIMEFields(env, arg3, lparg3); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_SYSTEMTIME_2_FUNC); -#else OS_NATIVE_EXIT(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_SYSTEMTIME_2_FUNC); -#endif return rc; } #endif -#if (!defined(NO_SendMessage__IIILorg_eclipse_swt_internal_win32_TBBUTTONINFO_2) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_TBBUTTONINFO_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__IIILorg_eclipse_swt_internal_win32_TBBUTTONINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3) -#else -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_TBBUTTONINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3) -#endif +#ifndef NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_TBBUTTONINFO_2 +JNIEXPORT jlong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_TBBUTTONINFO_2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2, jobject arg3) { TBBUTTONINFO _arg3, *lparg3=NULL; - jintLong rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_TBBUTTONINFO_2_FUNC); -#else + jlong rc = 0; OS_NATIVE_ENTER(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_TBBUTTONINFO_2_FUNC); -#endif if (arg3) if ((lparg3 = getTBBUTTONINFOFields(env, arg3, &_arg3)) == NULL) goto fail; - rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3); + rc = (jlong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3); fail: if (arg3 && lparg3) setTBBUTTONINFOFields(env, arg3, lparg3); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_TBBUTTONINFO_2_FUNC); -#else OS_NATIVE_EXIT(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_TBBUTTONINFO_2_FUNC); -#endif return rc; } #endif -#if (!defined(NO_SendMessage__IIILorg_eclipse_swt_internal_win32_TBBUTTON_2) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_TBBUTTON_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__IIILorg_eclipse_swt_internal_win32_TBBUTTON_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3) -#else -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_TBBUTTON_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3) -#endif +#ifndef NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_TBBUTTON_2 +JNIEXPORT jlong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_TBBUTTON_2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2, jobject arg3) { TBBUTTON _arg3, *lparg3=NULL; - jintLong rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_TBBUTTON_2_FUNC); -#else + jlong rc = 0; OS_NATIVE_ENTER(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_TBBUTTON_2_FUNC); -#endif if (arg3) if ((lparg3 = getTBBUTTONFields(env, arg3, &_arg3)) == NULL) goto fail; - rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3); + rc = (jlong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3); fail: if (arg3 && lparg3) setTBBUTTONFields(env, arg3, lparg3); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_TBBUTTON_2_FUNC); -#else OS_NATIVE_EXIT(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_TBBUTTON_2_FUNC); -#endif return rc; } #endif -#if (!defined(NO_SendMessage__IIILorg_eclipse_swt_internal_win32_TCHITTESTINFO_2) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_TCHITTESTINFO_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__IIILorg_eclipse_swt_internal_win32_TCHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3) -#else -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_TCHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3) -#endif +#ifndef NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_TCHITTESTINFO_2 +JNIEXPORT jlong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_TCHITTESTINFO_2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2, jobject arg3) { TCHITTESTINFO _arg3, *lparg3=NULL; - jintLong rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_TCHITTESTINFO_2_FUNC); -#else + jlong rc = 0; OS_NATIVE_ENTER(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_TCHITTESTINFO_2_FUNC); -#endif if (arg3) if ((lparg3 = getTCHITTESTINFOFields(env, arg3, &_arg3)) == NULL) goto fail; - rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3); + rc = (jlong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3); fail: if (arg3 && lparg3) setTCHITTESTINFOFields(env, arg3, lparg3); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_TCHITTESTINFO_2_FUNC); -#else OS_NATIVE_EXIT(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_TCHITTESTINFO_2_FUNC); -#endif return rc; } #endif -#if (!defined(NO_SendMessage__IIILorg_eclipse_swt_internal_win32_TCITEM_2) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_TCITEM_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__IIILorg_eclipse_swt_internal_win32_TCITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3) -#else -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_TCITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3) -#endif +#ifndef NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_TCITEM_2 +JNIEXPORT jlong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_TCITEM_2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2, jobject arg3) { TCITEM _arg3, *lparg3=NULL; - jintLong rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_TCITEM_2_FUNC); -#else + jlong rc = 0; OS_NATIVE_ENTER(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_TCITEM_2_FUNC); -#endif if (arg3) if ((lparg3 = getTCITEMFields(env, arg3, &_arg3)) == NULL) goto fail; - rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3); + rc = (jlong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3); fail: if (arg3 && lparg3) setTCITEMFields(env, arg3, lparg3); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_TCITEM_2_FUNC); -#else OS_NATIVE_EXIT(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_TCITEM_2_FUNC); -#endif return rc; } #endif -#if (!defined(NO_SendMessage__IIILorg_eclipse_swt_internal_win32_TOOLINFO_2) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_TOOLINFO_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__IIILorg_eclipse_swt_internal_win32_TOOLINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3) -#else -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_TOOLINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3) -#endif +#ifndef NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_TOOLINFO_2 +JNIEXPORT jlong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_TOOLINFO_2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2, jobject arg3) { TOOLINFO _arg3, *lparg3=NULL; - jintLong rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_TOOLINFO_2_FUNC); -#else + jlong rc = 0; OS_NATIVE_ENTER(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_TOOLINFO_2_FUNC); -#endif if (arg3) if ((lparg3 = getTOOLINFOFields(env, arg3, &_arg3)) == NULL) goto fail; - rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3); + rc = (jlong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3); fail: if (arg3 && lparg3) setTOOLINFOFields(env, arg3, lparg3); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_TOOLINFO_2_FUNC); -#else OS_NATIVE_EXIT(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_TOOLINFO_2_FUNC); -#endif return rc; } #endif -#if (!defined(NO_SendMessage__IIILorg_eclipse_swt_internal_win32_TVHITTESTINFO_2) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_TVHITTESTINFO_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__IIILorg_eclipse_swt_internal_win32_TVHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3) -#else -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_TVHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3) -#endif +#ifndef NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_TVHITTESTINFO_2 +JNIEXPORT jlong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_TVHITTESTINFO_2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2, jobject arg3) { TVHITTESTINFO _arg3, *lparg3=NULL; - jintLong rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_TVHITTESTINFO_2_FUNC); -#else + jlong rc = 0; OS_NATIVE_ENTER(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_TVHITTESTINFO_2_FUNC); -#endif if (arg3) if ((lparg3 = getTVHITTESTINFOFields(env, arg3, &_arg3)) == NULL) goto fail; - rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3); + rc = (jlong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3); fail: if (arg3 && lparg3) setTVHITTESTINFOFields(env, arg3, lparg3); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_TVHITTESTINFO_2_FUNC); -#else OS_NATIVE_EXIT(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_TVHITTESTINFO_2_FUNC); -#endif return rc; } #endif -#if (!defined(NO_SendMessage__IIILorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__IIILorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3) -#else -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3) -#endif +#ifndef NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2 +JNIEXPORT jlong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2, jobject arg3) { TVINSERTSTRUCT _arg3, *lparg3=NULL; - jintLong rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2_FUNC); -#else + jlong rc = 0; OS_NATIVE_ENTER(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2_FUNC); -#endif if (arg3) if ((lparg3 = getTVINSERTSTRUCTFields(env, arg3, &_arg3)) == NULL) goto fail; - rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3); + rc = (jlong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3); fail: if (arg3 && lparg3) setTVINSERTSTRUCTFields(env, arg3, lparg3); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2_FUNC); -#else OS_NATIVE_EXIT(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2_FUNC); -#endif return rc; } #endif -#if (!defined(NO_SendMessage__IIILorg_eclipse_swt_internal_win32_TVITEM_2) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_TVITEM_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__IIILorg_eclipse_swt_internal_win32_TVITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3) -#else -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_TVITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3) -#endif +#ifndef NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_TVITEM_2 +JNIEXPORT jlong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_TVITEM_2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2, jobject arg3) { TVITEM _arg3, *lparg3=NULL; - jintLong rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_TVITEM_2_FUNC); -#else + jlong rc = 0; OS_NATIVE_ENTER(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_TVITEM_2_FUNC); -#endif if (arg3) if ((lparg3 = getTVITEMFields(env, arg3, &_arg3)) == NULL) goto fail; - rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3); + rc = (jlong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3); fail: if (arg3 && lparg3) setTVITEMFields(env, arg3, lparg3); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_TVITEM_2_FUNC); -#else OS_NATIVE_EXIT(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_TVITEM_2_FUNC); -#endif return rc; } #endif -#if (!defined(NO_SendMessage__IIILorg_eclipse_swt_internal_win32_TVSORTCB_2) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_TVSORTCB_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__IIILorg_eclipse_swt_internal_win32_TVSORTCB_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3) -#else -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_TVSORTCB_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3) -#endif +#ifndef NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_TVSORTCB_2 +JNIEXPORT jlong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_TVSORTCB_2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2, jobject arg3) { TVSORTCB _arg3, *lparg3=NULL; - jintLong rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_TVSORTCB_2_FUNC); -#else + jlong rc = 0; OS_NATIVE_ENTER(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_TVSORTCB_2_FUNC); -#endif if (arg3) if ((lparg3 = getTVSORTCBFields(env, arg3, &_arg3)) == NULL) goto fail; - rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3); + rc = (jlong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3); fail: if (arg3 && lparg3) setTVSORTCBFields(env, arg3, lparg3); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_TVSORTCB_2_FUNC); -#else OS_NATIVE_EXIT(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_TVSORTCB_2_FUNC); -#endif return rc; } #endif -#if (!defined(NO_SendMessage__IIILorg_eclipse_swt_internal_win32_UDACCEL_2) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_UDACCEL_2) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__IIILorg_eclipse_swt_internal_win32_UDACCEL_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3) -#else -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_UDACCEL_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3) -#endif +#ifndef NO_SendMessage__JIJLorg_eclipse_swt_internal_win32_UDACCEL_2 +JNIEXPORT jlong JNICALL OS_NATIVE(SendMessage__JIJLorg_eclipse_swt_internal_win32_UDACCEL_2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2, jobject arg3) { UDACCEL _arg3, *lparg3=NULL; - jintLong rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_UDACCEL_2_FUNC); -#else + jlong rc = 0; OS_NATIVE_ENTER(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_UDACCEL_2_FUNC); -#endif if (arg3) if ((lparg3 = getUDACCELFields(env, arg3, &_arg3)) == NULL) goto fail; - rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3); + rc = (jlong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3); fail: if (arg3 && lparg3) setUDACCELFields(env, arg3, lparg3); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, SendMessage__IIILorg_eclipse_swt_internal_win32_UDACCEL_2_FUNC); -#else OS_NATIVE_EXIT(env, that, SendMessage__JIJLorg_eclipse_swt_internal_win32_UDACCEL_2_FUNC); -#endif return rc; } #endif -#if (!defined(NO_SendMessage__III_3C) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJ_3C) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__III_3C)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jcharArray arg3) -#else -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJ_3C)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jcharArray arg3) -#endif +#ifndef NO_SendMessage__JIJ_3C +JNIEXPORT jlong JNICALL OS_NATIVE(SendMessage__JIJ_3C) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2, jcharArray arg3) { jchar *lparg3=NULL; - jintLong rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, SendMessage__III_3C_FUNC); -#else + jlong rc = 0; OS_NATIVE_ENTER(env, that, SendMessage__JIJ_3C_FUNC); -#endif if (arg3) if ((lparg3 = (*env)->GetCharArrayElements(env, arg3, NULL)) == NULL) goto fail; - rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3); + rc = (jlong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3); fail: if (arg3 && lparg3) (*env)->ReleaseCharArrayElements(env, arg3, lparg3, 0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, SendMessage__III_3C_FUNC); -#else OS_NATIVE_EXIT(env, that, SendMessage__JIJ_3C_FUNC); -#endif return rc; } #endif -#if (!defined(NO_SendMessage__III_3I) && !defined(JNI64)) || (!defined(NO_SendMessage__JIJ_3I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__III_3I)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintArray arg3) -#else -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JIJ_3I)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintArray arg3) -#endif +#ifndef NO_SendMessage__JIJ_3I +JNIEXPORT jlong JNICALL OS_NATIVE(SendMessage__JIJ_3I) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2, jintArray arg3) { jint *lparg3=NULL; - jintLong rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, SendMessage__III_3I_FUNC); -#else + jlong rc = 0; OS_NATIVE_ENTER(env, that, SendMessage__JIJ_3I_FUNC); -#endif if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail; - rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3); + rc = (jlong)SendMessage((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3); fail: if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, SendMessage__III_3I_FUNC); -#else OS_NATIVE_EXIT(env, that, SendMessage__JIJ_3I_FUNC); -#endif return rc; } #endif -#if (!defined(NO_SendMessage__II_3I_3I) && !defined(JNI64)) || (!defined(NO_SendMessage__JI_3I_3I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__II_3I_3I)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintArray arg2, jintArray arg3) -#else -JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessage__JI_3I_3I)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintArray arg2, jintArray arg3) -#endif +#ifndef NO_SendMessage__JI_3I_3I +JNIEXPORT jlong JNICALL OS_NATIVE(SendMessage__JI_3I_3I) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jintArray arg2, jintArray arg3) { jint *lparg2=NULL; jint *lparg3=NULL; - jintLong rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, SendMessage__II_3I_3I_FUNC); -#else + jlong rc = 0; OS_NATIVE_ENTER(env, that, SendMessage__JI_3I_3I_FUNC); -#endif if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail; if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail; - rc = (jintLong)SendMessage((HWND)arg0, arg1, (WPARAM)lparg2, (LPARAM)lparg3); + rc = (jlong)SendMessage((HWND)arg0, arg1, (WPARAM)lparg2, (LPARAM)lparg3); fail: if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0); if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, SendMessage__II_3I_3I_FUNC); -#else OS_NATIVE_EXIT(env, that, SendMessage__JI_3I_3I_FUNC); -#endif return rc; } #endif #ifndef NO_SetActiveWindow -JNIEXPORT jintLong JNICALL OS_NATIVE(SetActiveWindow) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(SetActiveWindow) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, SetActiveWindow_FUNC); - rc = (jintLong)SetActiveWindow((HWND)arg0); + rc = (jlong)SetActiveWindow((HWND)arg0); OS_NATIVE_EXIT(env, that, SetActiveWindow_FUNC); return rc; } @@ -10554,7 +9102,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(SetActiveWindow) #ifndef NO_SetBkColor JNIEXPORT jint JNICALL OS_NATIVE(SetBkColor) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { jint rc = 0; OS_NATIVE_ENTER(env, that, SetBkColor_FUNC); @@ -10566,7 +9114,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(SetBkColor) #ifndef NO_SetBkMode JNIEXPORT jint JNICALL OS_NATIVE(SetBkMode) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { jint rc = 0; OS_NATIVE_ENTER(env, that, SetBkMode_FUNC); @@ -10578,7 +9126,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(SetBkMode) #ifndef NO_SetBrushOrgEx JNIEXPORT jboolean JNICALL OS_NATIVE(SetBrushOrgEx) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jobject arg3) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jobject arg3) { POINT _arg3, *lparg3=NULL; jboolean rc = 0; @@ -10593,12 +9141,12 @@ fail: #endif #ifndef NO_SetCapture -JNIEXPORT jintLong JNICALL OS_NATIVE(SetCapture) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(SetCapture) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, SetCapture_FUNC); - rc = (jintLong)SetCapture((HWND)arg0); + rc = (jlong)SetCapture((HWND)arg0); OS_NATIVE_EXIT(env, that, SetCapture_FUNC); return rc; } @@ -10641,12 +9189,12 @@ fail: #endif #ifndef NO_SetCursor -JNIEXPORT jintLong JNICALL OS_NATIVE(SetCursor) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(SetCursor) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, SetCursor_FUNC); - rc = (jintLong)SetCursor((HCURSOR)arg0); + rc = (jlong)SetCursor((HCURSOR)arg0); OS_NATIVE_EXIT(env, that, SetCursor_FUNC); return rc; } @@ -10666,7 +9214,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(SetCursorPos) #ifndef NO_SetDIBColorTable JNIEXPORT jint JNICALL OS_NATIVE(SetDIBColorTable) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jbyteArray arg3) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jbyteArray arg3) { jbyte *lparg3=NULL; jint rc = 0; @@ -10709,12 +9257,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(SetErrorMode) #endif #ifndef NO_SetFocus -JNIEXPORT jintLong JNICALL OS_NATIVE(SetFocus) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(SetFocus) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, SetFocus_FUNC); - rc = (jintLong)SetFocus((HWND)arg0); + rc = (jlong)SetFocus((HWND)arg0); OS_NATIVE_EXIT(env, that, SetFocus_FUNC); return rc; } @@ -10722,7 +9270,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(SetFocus) #ifndef NO_SetForegroundWindow JNIEXPORT jboolean JNICALL OS_NATIVE(SetForegroundWindow) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, SetForegroundWindow_FUNC); @@ -10734,7 +9282,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(SetForegroundWindow) #ifndef NO_SetGestureConfig JNIEXPORT jboolean JNICALL OS_NATIVE(SetGestureConfig) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jintLong arg3, jint arg4) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jlong arg3, jint arg4) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, SetGestureConfig_FUNC); @@ -10754,7 +9302,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(SetGestureConfig) #ifndef NO_SetGraphicsMode JNIEXPORT jint JNICALL OS_NATIVE(SetGraphicsMode) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { jint rc = 0; OS_NATIVE_ENTER(env, that, SetGraphicsMode_FUNC); @@ -10766,7 +9314,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(SetGraphicsMode) #ifndef NO_SetLayeredWindowAttributes JNIEXPORT jboolean JNICALL OS_NATIVE(SetLayeredWindowAttributes) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jbyte arg2, jint arg3) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jbyte arg2, jint arg3) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, SetLayeredWindowAttributes_FUNC); @@ -10778,7 +9326,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(SetLayeredWindowAttributes) #ifndef NO_SetLayout JNIEXPORT jint JNICALL OS_NATIVE(SetLayout) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { jint rc = 0; OS_NATIVE_ENTER(env, that, SetLayout_FUNC); @@ -10790,7 +9338,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(SetLayout) #ifndef NO_SetMenu JNIEXPORT jboolean JNICALL OS_NATIVE(SetMenu) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, SetMenu_FUNC); @@ -10802,7 +9350,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(SetMenu) #ifndef NO_SetMenuDefaultItem JNIEXPORT jboolean JNICALL OS_NATIVE(SetMenuDefaultItem) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, SetMenuDefaultItem_FUNC); @@ -10814,7 +9362,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(SetMenuDefaultItem) #ifndef NO_SetMenuInfo JNIEXPORT jboolean JNICALL OS_NATIVE(SetMenuInfo) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { MENUINFO _arg1, *lparg1=NULL; jboolean rc = 0; @@ -10830,7 +9378,7 @@ fail: #ifndef NO_SetMenuItemInfo JNIEXPORT jboolean JNICALL OS_NATIVE(SetMenuItemInfo) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jboolean arg2, jobject arg3) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jboolean arg2, jobject arg3) { MENUITEMINFO _arg3, *lparg3=NULL; jboolean rc = 0; @@ -10846,7 +9394,7 @@ fail: #ifndef NO_SetMetaRgn JNIEXPORT jint JNICALL OS_NATIVE(SetMetaRgn) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; OS_NATIVE_ENTER(env, that, SetMetaRgn_FUNC); @@ -10857,12 +9405,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(SetMetaRgn) #endif #ifndef NO_SetParent -JNIEXPORT jintLong JNICALL OS_NATIVE(SetParent) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) +JNIEXPORT jlong JNICALL OS_NATIVE(SetParent) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, SetParent_FUNC); - rc = (jintLong)SetParent((HWND)arg0, (HWND)arg1); + rc = (jlong)SetParent((HWND)arg0, (HWND)arg1); OS_NATIVE_EXIT(env, that, SetParent_FUNC); return rc; } @@ -10870,7 +9418,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(SetParent) #ifndef NO_SetPixel JNIEXPORT jint JNICALL OS_NATIVE(SetPixel) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3) { jint rc = 0; OS_NATIVE_ENTER(env, that, SetPixel_FUNC); @@ -10882,7 +9430,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(SetPixel) #ifndef NO_SetPolyFillMode JNIEXPORT jint JNICALL OS_NATIVE(SetPolyFillMode) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { jint rc = 0; OS_NATIVE_ENTER(env, that, SetPolyFillMode_FUNC); @@ -10906,7 +9454,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(SetProcessDPIAware) #ifndef NO_SetProp JNIEXPORT jboolean JNICALL OS_NATIVE(SetProp) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, SetProp_FUNC); @@ -10918,7 +9466,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(SetProp) #ifndef NO_SetROP2 JNIEXPORT jint JNICALL OS_NATIVE(SetROP2) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { jint rc = 0; OS_NATIVE_ENTER(env, that, SetROP2_FUNC); @@ -10946,7 +9494,7 @@ fail: #ifndef NO_SetRectRgn JNIEXPORT jboolean JNICALL OS_NATIVE(SetRectRgn) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3, jint arg4) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, SetRectRgn_FUNC); @@ -10958,7 +9506,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(SetRectRgn) #ifndef NO_SetScrollInfo JNIEXPORT jboolean JNICALL OS_NATIVE(SetScrollInfo) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2, jboolean arg3) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jobject arg2, jboolean arg3) { SCROLLINFO _arg2, *lparg2=NULL; jboolean rc = 0; @@ -10974,7 +9522,7 @@ fail: #ifndef NO_SetStretchBltMode JNIEXPORT jint JNICALL OS_NATIVE(SetStretchBltMode) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { jint rc = 0; OS_NATIVE_ENTER(env, that, SetStretchBltMode_FUNC); @@ -10986,7 +9534,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(SetStretchBltMode) #ifndef NO_SetTextColor JNIEXPORT jint JNICALL OS_NATIVE(SetTextColor) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { jint rc = 0; OS_NATIVE_ENTER(env, that, SetTextColor_FUNC); @@ -10997,12 +9545,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(SetTextColor) #endif #ifndef NO_SetTimer -JNIEXPORT jintLong JNICALL OS_NATIVE(SetTimer) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3) +JNIEXPORT jlong JNICALL OS_NATIVE(SetTimer) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jlong arg3) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, SetTimer_FUNC); - rc = (jintLong)SetTimer((HWND)arg0, arg1, arg2, (TIMERPROC)arg3); + rc = (jlong)SetTimer((HWND)arg0, arg1, arg2, (TIMERPROC)arg3); OS_NATIVE_EXIT(env, that, SetTimer_FUNC); return rc; } @@ -11010,7 +9558,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(SetTimer) #ifndef NO_SetWindowLong JNIEXPORT jint JNICALL OS_NATIVE(SetWindowLong) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2) { jint rc = 0; OS_NATIVE_ENTER(env, that, SetWindowLong_FUNC); @@ -11021,12 +9569,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(SetWindowLong) #endif #ifndef NO_SetWindowLongPtr -JNIEXPORT jintLong JNICALL OS_NATIVE(SetWindowLongPtr) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2) +JNIEXPORT jlong JNICALL OS_NATIVE(SetWindowLongPtr) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, SetWindowLongPtr_FUNC); - rc = (jintLong)SetWindowLongPtr((HWND)arg0, arg1, (LONG_PTR)arg2); + rc = (jlong)SetWindowLongPtr((HWND)arg0, arg1, (LONG_PTR)arg2); OS_NATIVE_EXIT(env, that, SetWindowLongPtr_FUNC); return rc; } @@ -11034,7 +9582,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(SetWindowLongPtr) #ifndef NO_SetWindowOrgEx JNIEXPORT jboolean JNICALL OS_NATIVE(SetWindowOrgEx) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jobject arg3) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jobject arg3) { POINT _arg3, *lparg3=NULL; jboolean rc = 0; @@ -11050,7 +9598,7 @@ fail: #ifndef NO_SetWindowPlacement JNIEXPORT jboolean JNICALL OS_NATIVE(SetWindowPlacement) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { WINDOWPLACEMENT _arg1, *lparg1=NULL; jboolean rc = 0; @@ -11066,7 +9614,7 @@ fail: #ifndef NO_SetWindowPos JNIEXPORT jboolean JNICALL OS_NATIVE(SetWindowPos) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, SetWindowPos_FUNC); @@ -11078,7 +9626,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(SetWindowPos) #ifndef NO_SetWindowRgn JNIEXPORT jint JNICALL OS_NATIVE(SetWindowRgn) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jboolean arg2) { jint rc = 0; OS_NATIVE_ENTER(env, that, SetWindowRgn_FUNC); @@ -11090,7 +9638,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(SetWindowRgn) #ifndef NO_SetWindowText JNIEXPORT jboolean JNICALL OS_NATIVE(SetWindowText) - (JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jcharArray arg1) { jchar *lparg1=NULL; jboolean rc = 0; @@ -11106,7 +9654,7 @@ fail: #ifndef NO_SetWindowTheme JNIEXPORT jint JNICALL OS_NATIVE(SetWindowTheme) - (JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jcharArray arg2) + (JNIEnv *env, jclass that, jlong arg0, jcharArray arg1, jcharArray arg2) { jchar *lparg1=NULL; jchar *lparg2=NULL; @@ -11124,12 +9672,12 @@ fail: #endif #ifndef NO_SetWindowsHookEx -JNIEXPORT jintLong JNICALL OS_NATIVE(SetWindowsHookEx) - (JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2, jint arg3) +JNIEXPORT jlong JNICALL OS_NATIVE(SetWindowsHookEx) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jint arg3) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, SetWindowsHookEx_FUNC); - rc = (jintLong)SetWindowsHookEx(arg0, (HOOKPROC)arg1, (HINSTANCE)arg2, arg3); + rc = (jlong)SetWindowsHookEx(arg0, (HOOKPROC)arg1, (HINSTANCE)arg2, arg3); OS_NATIVE_EXIT(env, that, SetWindowsHookEx_FUNC); return rc; } @@ -11137,7 +9685,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(SetWindowsHookEx) #ifndef NO_SetWorldTransform JNIEXPORT jboolean JNICALL OS_NATIVE(SetWorldTransform) - (JNIEnv *env, jclass that, jintLong arg0, jfloatArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jfloatArray arg1) { jfloat *lparg1=NULL; jboolean rc = 0; @@ -11185,7 +9733,7 @@ fail: #ifndef NO_ShowCaret JNIEXPORT jboolean JNICALL OS_NATIVE(ShowCaret) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, ShowCaret_FUNC); @@ -11197,7 +9745,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(ShowCaret) #ifndef NO_ShowOwnedPopups JNIEXPORT jboolean JNICALL OS_NATIVE(ShowOwnedPopups) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, ShowOwnedPopups_FUNC); @@ -11209,7 +9757,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(ShowOwnedPopups) #ifndef NO_ShowScrollBar JNIEXPORT jboolean JNICALL OS_NATIVE(ShowScrollBar) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jboolean arg2) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jboolean arg2) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, ShowScrollBar_FUNC); @@ -11221,7 +9769,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(ShowScrollBar) #ifndef NO_ShowWindow JNIEXPORT jboolean JNICALL OS_NATIVE(ShowWindow) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, ShowWindow_FUNC); @@ -11233,7 +9781,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(ShowWindow) #ifndef NO_StartDoc JNIEXPORT jint JNICALL OS_NATIVE(StartDoc) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { DOCINFO _arg1, *lparg1=NULL; jint rc = 0; @@ -11249,7 +9797,7 @@ fail: #ifndef NO_StartPage JNIEXPORT jint JNICALL OS_NATIVE(StartPage) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; OS_NATIVE_ENTER(env, that, StartPage_FUNC); @@ -11261,7 +9809,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(StartPage) #ifndef NO_StretchBlt JNIEXPORT jboolean JNICALL OS_NATIVE(StretchBlt) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4, jintLong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3, jint arg4, jlong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, StretchBlt_FUNC); @@ -11576,7 +10124,7 @@ fail: #ifndef NO_TrackPopupMenu JNIEXPORT jboolean JNICALL OS_NATIVE(TrackPopupMenu) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4, jintLong arg5, jobject arg6) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3, jint arg4, jlong arg5, jobject arg6) { RECT _arg6, *lparg6=NULL; jboolean rc = 0; @@ -11592,7 +10140,7 @@ fail: #ifndef NO_TranslateAccelerator JNIEXPORT jint JNICALL OS_NATIVE(TranslateAccelerator) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jobject arg2) { MSG _arg2, *lparg2=NULL; jint rc = 0; @@ -11608,7 +10156,7 @@ fail: #ifndef NO_TranslateCharsetInfo JNIEXPORT jboolean JNICALL OS_NATIVE(TranslateCharsetInfo) - (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jintArray arg1, jint arg2) { jint *lparg1=NULL; jboolean rc = 0; @@ -11624,7 +10172,7 @@ fail: #ifndef NO_TranslateMDISysAccel JNIEXPORT jboolean JNICALL OS_NATIVE(TranslateMDISysAccel) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { MSG _arg1, *lparg1=NULL; jboolean rc = 0; @@ -11656,7 +10204,7 @@ fail: #ifndef NO_TransparentBlt JNIEXPORT jboolean JNICALL OS_NATIVE(TransparentBlt) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4, jintLong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3, jint arg4, jlong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, TransparentBlt_FUNC); @@ -11668,7 +10216,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(TransparentBlt) #ifndef NO_TreeView_1GetItemRect JNIEXPORT jboolean JNICALL OS_NATIVE(TreeView_1GetItemRect) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jboolean arg3) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jobject arg2, jboolean arg3) { RECT _arg2, *lparg2=NULL; jboolean rc = 0; @@ -11696,7 +10244,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(UDACCEL_1sizeof) #ifndef NO_UnhookWindowsHookEx JNIEXPORT jboolean JNICALL OS_NATIVE(UnhookWindowsHookEx) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, UnhookWindowsHookEx_FUNC); @@ -11708,7 +10256,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(UnhookWindowsHookEx) #ifndef NO_UnmapViewOfFile JNIEXPORT jboolean JNICALL OS_NATIVE(UnmapViewOfFile) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, UnmapViewOfFile_FUNC); @@ -11720,7 +10268,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(UnmapViewOfFile) #ifndef NO_UnregisterClass JNIEXPORT jboolean JNICALL OS_NATIVE(UnregisterClass) - (JNIEnv *env, jclass that, jcharArray arg0, jintLong arg1) + (JNIEnv *env, jclass that, jcharArray arg0, jlong arg1) { jchar *lparg0=NULL; jboolean rc = 0; @@ -11736,7 +10284,7 @@ fail: #ifndef NO_UnregisterTouchWindow JNIEXPORT jboolean JNICALL OS_NATIVE(UnregisterTouchWindow) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, UnregisterTouchWindow_FUNC); @@ -11756,7 +10304,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(UnregisterTouchWindow) #ifndef NO_UpdateWindow JNIEXPORT jboolean JNICALL OS_NATIVE(UpdateWindow) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; OS_NATIVE_ENTER(env, that, UpdateWindow_FUNC); @@ -11790,7 +10338,7 @@ fail: #ifndef NO_ValidateRect JNIEXPORT jboolean JNICALL OS_NATIVE(ValidateRect) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { RECT _arg1, *lparg1=NULL; jboolean rc = 0; @@ -11816,1006 +10364,599 @@ JNIEXPORT jshort JNICALL OS_NATIVE(VkKeyScan) } #endif -#if (!defined(NO_VtblCall__II) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__II)(JNIEnv *env, jclass that, jint arg0, jintLong arg1) -#else -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1) -#endif +#ifndef NO_VtblCall__IJ +JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJ) + (JNIEnv *env, jclass that, jint arg0, jlong arg1) { jint rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER_TRY(env, that, VtblCall__II_FUNC); -#else OS_NATIVE_ENTER_TRY(env, that, VtblCall__IJ_FUNC); -#endif - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong))(*(jintLong **)arg1)[arg0])(arg1); -#ifndef JNI64 - OS_NATIVE_EXIT_CATCH(env, that, VtblCall__II_FUNC); -#else + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong))(*(jlong **)arg1)[arg0])(arg1); OS_NATIVE_EXIT_CATCH(env, that, VtblCall__IJ_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__III) && !defined(JNI64)) || (!defined(NO_VtblCall__IJI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__III)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2) -#else -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2) -#endif +#ifndef NO_VtblCall__IJI +JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJI) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2) { jint rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, VtblCall__III_FUNC); -#else OS_NATIVE_ENTER(env, that, VtblCall__IJI_FUNC); -#endif - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, VtblCall__III_FUNC); -#else + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint))(*(jlong **)arg1)[arg0])(arg1, arg2); OS_NATIVE_EXIT(env, that, VtblCall__IJI_FUNC); -#endif return rc; } #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 +#ifndef NO_VtblCall__IJII +JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJII) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3) { 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 + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3); 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 +#ifndef NO_VtblCall__IJIII +JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJIII) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jint arg4) { 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 + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint, jint))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4); 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) -#else -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jintArray arg5) -#endif +#ifndef NO_VtblCall__IJIII_3I +JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJIII_3I) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jintArray arg5) { jint *lparg5=NULL; jint rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, VtblCall__IIIII_3I_FUNC); -#else OS_NATIVE_ENTER(env, that, VtblCall__IJIII_3I_FUNC); -#endif if (arg5) if ((lparg5 = (*env)->GetIntArrayElements(env, arg5, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint, jint, jint *))(*(jlong **)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__IIIII_3I_FUNC); -#else OS_NATIVE_EXIT(env, that, VtblCall__IJIII_3I_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IIII_3C_3CI) && !defined(JNI64)) || (!defined(NO_VtblCall__IJII_3C_3CI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IIII_3C_3CI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4, jcharArray arg5, jint arg6) -#else -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJII_3C_3CI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4, jcharArray arg5, jint arg6) -#endif +#ifndef NO_VtblCall__IJII_3C_3CI +JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJII_3C_3CI) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jcharArray arg4, jcharArray arg5, jint arg6) { jchar *lparg4=NULL; jchar *lparg5=NULL; jint rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, VtblCall__IIII_3C_3CI_FUNC); -#else OS_NATIVE_ENTER(env, that, VtblCall__IJII_3C_3CI_FUNC); -#endif if (arg4) if ((lparg4 = (*env)->GetCharArrayElements(env, arg4, NULL)) == NULL) goto fail; if (arg5) if ((lparg5 = (*env)->GetCharArrayElements(env, arg5, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jchar *, jchar *, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, lparg5, arg6); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint, jchar *, jchar *, jint))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, lparg5, arg6); fail: if (arg5 && lparg5) (*env)->ReleaseCharArrayElements(env, arg5, lparg5, 0); if (arg4 && lparg4) (*env)->ReleaseCharArrayElements(env, arg4, lparg4, 0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, VtblCall__IIII_3C_3CI_FUNC); -#else OS_NATIVE_EXIT(env, that, VtblCall__IJII_3C_3CI_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IIIJ) && !defined(JNI64)) || (!defined(NO_VtblCall__IJIJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IIIJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jlong arg3) -#else -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJIJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jlong arg3) -#endif +#ifndef NO_VtblCall__IJIJ +JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJIJ) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jlong arg3) { jint rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, VtblCall__IIIJ_FUNC); -#else OS_NATIVE_ENTER(env, that, VtblCall__IJIJ_FUNC); -#endif - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, VtblCall__IIIJ_FUNC); -#else + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jlong))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3); OS_NATIVE_EXIT(env, that, VtblCall__IJIJ_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IIIJI_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJIJI_3J) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IIIJI_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jlong arg3, jint arg4, jlongArray arg5) -#else -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJIJI_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jlong arg3, jint arg4, jlongArray arg5) -#endif +#ifndef NO_VtblCall__IJIJI_3J +JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJIJI_3J) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jlong arg3, jint arg4, jlongArray arg5) { jlong *lparg5=NULL; jint rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, VtblCall__IIIJI_3J_FUNC); -#else OS_NATIVE_ENTER(env, that, VtblCall__IJIJI_3J_FUNC); -#endif if (arg5) if ((lparg5 = (*env)->GetLongArrayElements(env, arg5, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jlong, jint, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jlong, jint, jlong *))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5); fail: if (arg5 && lparg5) (*env)->ReleaseLongArrayElements(env, arg5, lparg5, 0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, VtblCall__IIIJI_3J_FUNC); -#else OS_NATIVE_EXIT(env, that, VtblCall__IJIJI_3J_FUNC); -#endif return rc; } #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 +#ifndef NO_VtblCall__IJIJJ +JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJIJJ) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jlong arg3, jlong arg4) { 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 + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jlong, jlong))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4); OS_NATIVE_EXIT(env, that, VtblCall__IJIJJ_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__III_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJI_3I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__III_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3) -#else -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3) -#endif +#ifndef NO_VtblCall__IJI_3I +JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJI_3I) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jintArray arg3) { jint *lparg3=NULL; jint rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, VtblCall__III_3I_FUNC); -#else OS_NATIVE_ENTER(env, that, VtblCall__IJI_3I_FUNC); -#endif if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3); fail: if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, VtblCall__III_3I_FUNC); -#else OS_NATIVE_EXIT(env, that, VtblCall__IJI_3I_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) -#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 +#ifndef NO_VtblCall__IJI_3J +JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJI_3J) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jlongArray arg3) { - jintLong *lparg3=NULL; - jint *lparg4=NULL; + jlong *lparg3=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); + OS_NATIVE_ENTER(env, that, VtblCall__IJI_3J_FUNC); + if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail; + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jlong *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3); 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 + if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0); + OS_NATIVE_EXIT(env, that, VtblCall__IJI_3J_FUNC); 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) -#else -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJI_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jlongArray arg3) -#endif +#ifndef NO_VtblCall__IJI_3J_3I +JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJI_3J_3I) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jlongArray arg3, jintArray arg4) { jlong *lparg3=NULL; + jint *lparg4=NULL; jint rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, VtblCall__III_3J_FUNC); -#else - OS_NATIVE_ENTER(env, that, VtblCall__IJI_3J_FUNC); -#endif + OS_NATIVE_ENTER(env, that, VtblCall__IJI_3J_3I_FUNC); if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3); + if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail; + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jlong *, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4); fail: + if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0); if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, VtblCall__III_3J_FUNC); -#else - OS_NATIVE_EXIT(env, that, VtblCall__IJI_3J_FUNC); -#endif + OS_NATIVE_EXIT(env, that, VtblCall__IJI_3J_3I_FUNC); return rc; } #endif -#if (!defined(NO_VtblCall__IIJ) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IIJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2) -#else -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2) -#endif +#ifndef NO_VtblCall__IJJ +JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJJ) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2) { jint rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, VtblCall__IIJ_FUNC); -#else OS_NATIVE_ENTER(env, that, VtblCall__IJJ_FUNC); -#endif - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, VtblCall__IIJ_FUNC); -#else + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong))(*(jlong **)arg1)[arg0])(arg1, arg2); OS_NATIVE_EXIT(env, that, VtblCall__IJJ_FUNC); -#endif return rc; } #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 +#ifndef NO_VtblCall__IJJI +JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJJI) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jint arg3) { 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 + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jint))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3); OS_NATIVE_EXIT(env, that, VtblCall__IJJI_FUNC); -#endif return rc; } #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 +#ifndef NO_VtblCall__IJJII_3I +JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJJII_3I) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jint arg3, jint arg4, jintArray arg5) { 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); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jint, jint, jint *))(*(jlong **)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) -#else -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJJII_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jlongArray arg5) -#endif +#ifndef NO_VtblCall__IJJII_3J +JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJJII_3J) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jint arg3, jint arg4, jlongArray arg5) { jlong *lparg5=NULL; jint rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, VtblCall__IIJII_3J_FUNC); -#else OS_NATIVE_ENTER(env, that, VtblCall__IJJII_3J_FUNC); -#endif if (arg5) if ((lparg5 = (*env)->GetLongArrayElements(env, arg5, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jint, jint, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jint, jint, jlong *))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5); fail: if (arg5 && lparg5) (*env)->ReleaseLongArrayElements(env, arg5, lparg5, 0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, VtblCall__IIJII_3J_FUNC); -#else OS_NATIVE_EXIT(env, that, VtblCall__IJJII_3J_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IIJI_3C_3CJ) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJI_3C_3CJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IIJI_3C_3CJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jcharArray arg4, jcharArray arg5, jlong arg6) -#else -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJJI_3C_3CJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jcharArray arg4, jcharArray arg5, jlong arg6) -#endif +#ifndef NO_VtblCall__IJJI_3C_3CJ +JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJJI_3C_3CJ) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jint arg3, jcharArray arg4, jcharArray arg5, jlong arg6) { jchar *lparg4=NULL; jchar *lparg5=NULL; jint rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, VtblCall__IIJI_3C_3CJ_FUNC); -#else OS_NATIVE_ENTER(env, that, VtblCall__IJJI_3C_3CJ_FUNC); -#endif if (arg4) if ((lparg4 = (*env)->GetCharArrayElements(env, arg4, NULL)) == NULL) goto fail; if (arg5) if ((lparg5 = (*env)->GetCharArrayElements(env, arg5, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jint, jchar *, jchar *, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, lparg5, arg6); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jint, jchar *, jchar *, jlong))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, lparg5, arg6); fail: if (arg5 && lparg5) (*env)->ReleaseCharArrayElements(env, arg5, lparg5, 0); if (arg4 && lparg4) (*env)->ReleaseCharArrayElements(env, arg4, lparg4, 0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, VtblCall__IIJI_3C_3CJ_FUNC); -#else OS_NATIVE_EXIT(env, that, VtblCall__IJJI_3C_3CJ_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IIJJ) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IIJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3) -#else -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3) -#endif +#ifndef NO_VtblCall__IJJJ +JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJJJ) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3) { jint rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, VtblCall__IIJJ_FUNC); -#else OS_NATIVE_ENTER(env, that, VtblCall__IJJJ_FUNC); -#endif - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, VtblCall__IIJJ_FUNC); -#else + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jlong))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3); OS_NATIVE_EXIT(env, that, VtblCall__IJJJ_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IIJJI_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJJI_3J) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IIJJI_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jlongArray arg5) -#else -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJJJI_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jlongArray arg5) -#endif +#ifndef NO_VtblCall__IJJJI_3J +JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJJJI_3J) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3, jint arg4, jlongArray arg5) { jlong *lparg5=NULL; jint rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, VtblCall__IIJJI_3J_FUNC); -#else OS_NATIVE_ENTER(env, that, VtblCall__IJJJI_3J_FUNC); -#endif if (arg5) if ((lparg5 = (*env)->GetLongArrayElements(env, arg5, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jint, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jlong, jint, jlong *))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5); fail: if (arg5 && lparg5) (*env)->ReleaseLongArrayElements(env, arg5, lparg5, 0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, VtblCall__IIJJI_3J_FUNC); -#else OS_NATIVE_EXIT(env, that, VtblCall__IJJJI_3J_FUNC); -#endif return rc; } #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 +#ifndef NO_VtblCall__IJJJJ +JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJJJJ) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4) { 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 + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jlong, jlong))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4); OS_NATIVE_EXIT(env, that, VtblCall__IJJJJ_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IIJ_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJ_3I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IIJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jintArray arg3) -#else -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jintArray arg3) -#endif +#ifndef NO_VtblCall__IJJ_3I +JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJJ_3I) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jintArray arg3) { jint *lparg3=NULL; jint rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, VtblCall__IIJ_3I_FUNC); -#else OS_NATIVE_ENTER(env, that, VtblCall__IJJ_3I_FUNC); -#endif if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3); fail: if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, VtblCall__IIJ_3I_FUNC); -#else OS_NATIVE_EXIT(env, that, VtblCall__IJJ_3I_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IIJ_3I_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJ_3I_3I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IIJ_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jintArray arg3, jintArray arg4) -#else -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJJ_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jintArray arg3, jintArray arg4) -#endif +#ifndef NO_VtblCall__IJJ_3I_3I +JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJJ_3I_3I) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jintArray arg3, jintArray arg4) { jint *lparg3=NULL; jint *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_3I_3I_FUNC); -#endif 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, jlong, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jint *, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4); fail: if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0); if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, VtblCall__IIJ_3I_3I_FUNC); -#else OS_NATIVE_EXIT(env, that, VtblCall__IJJ_3I_3I_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IIJ_3J_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJ_3J_3J) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IIJ_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlongArray arg3, jlongArray arg4) -#else -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJJ_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlongArray arg3, jlongArray arg4) -#endif +#ifndef NO_VtblCall__IJJ_3J_3J +JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJJ_3J_3J) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlongArray arg3, jlongArray arg4) { jlong *lparg3=NULL; jlong *lparg4=NULL; jint rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, VtblCall__IIJ_3J_3J_FUNC); -#else OS_NATIVE_ENTER(env, that, VtblCall__IJJ_3J_3J_FUNC); -#endif if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail; 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, lparg3, lparg4); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jlong *, jlong *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4); fail: if (arg4 && lparg4) (*env)->ReleaseLongArrayElements(env, arg4, lparg4, 0); if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, VtblCall__IIJ_3J_3J_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) -#else -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_win32_PROPERTYKEY_2I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jint arg3) -#endif +#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_win32_PROPERTYKEY_2I +JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_win32_PROPERTYKEY_2I) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jint arg3) { PROPERTYKEY _arg2, *lparg2=NULL; jint rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_win32_PROPERTYKEY_2I_FUNC); -#else OS_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_PROPERTYKEY_2I_FUNC); -#endif if (arg2) if ((lparg2 = getPROPERTYKEYFields(env, arg2, &_arg2)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, PROPERTYKEY *, jint))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, PROPERTYKEY *, jint))(*(jlong **)arg1)[arg0])(arg1, lparg2, arg3); fail: if (arg2 && lparg2) setPROPERTYKEYFields(env, arg2, lparg2); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_win32_PROPERTYKEY_2I_FUNC); -#else OS_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_PROPERTYKEY_2I_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_win32_PROPERTYKEY_2J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_win32_PROPERTYKEY_2J) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IILorg_eclipse_swt_internal_win32_PROPERTYKEY_2J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jlong arg3) -#else -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_win32_PROPERTYKEY_2J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jlong arg3) -#endif +#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_win32_PROPERTYKEY_2J +JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_win32_PROPERTYKEY_2J) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jlong arg3) { PROPERTYKEY _arg2, *lparg2=NULL; jint rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_win32_PROPERTYKEY_2J_FUNC); -#else OS_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_PROPERTYKEY_2J_FUNC); -#endif if (arg2) if ((lparg2 = getPROPERTYKEYFields(env, arg2, &_arg2)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, PROPERTYKEY *, jlong))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, PROPERTYKEY *, jlong))(*(jlong **)arg1)[arg0])(arg1, lparg2, arg3); fail: if (arg2 && lparg2) setPROPERTYKEYFields(env, arg2, lparg2); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_win32_PROPERTYKEY_2J_FUNC); -#else OS_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_PROPERTYKEY_2J_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) -#else -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_win32_TF_1DISPLAYATTRIBUTE_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2) -#endif +#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_win32_TF_1DISPLAYATTRIBUTE_2 +JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_win32_TF_1DISPLAYATTRIBUTE_2) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2) { TF_DISPLAYATTRIBUTE _arg2, *lparg2=NULL; jint rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_win32_TF_1DISPLAYATTRIBUTE_2_FUNC); -#else OS_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_TF_1DISPLAYATTRIBUTE_2_FUNC); -#endif if (arg2) if ((lparg2 = getTF_DISPLAYATTRIBUTEFields(env, arg2, &_arg2)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, TF_DISPLAYATTRIBUTE *))(*(jintLong **)arg1)[arg0])(arg1, lparg2); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, TF_DISPLAYATTRIBUTE *))(*(jlong **)arg1)[arg0])(arg1, lparg2); fail: if (arg2 && lparg2) setTF_DISPLAYATTRIBUTEFields(env, arg2, lparg2); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_win32_TF_1DISPLAYATTRIBUTE_2_FUNC); -#else OS_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_TF_1DISPLAYATTRIBUTE_2_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__IIS_3B_3B_3B) && !defined(JNI64)) || (!defined(NO_VtblCall__IJS_3B_3B_3B) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IIS_3B_3B_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jshort arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5) -#else -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJS_3B_3B_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jshort arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5) -#endif +#ifndef NO_VtblCall__IJS_3B_3B_3B +JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJS_3B_3B_3B) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jshort arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5) { jbyte *lparg3=NULL; jbyte *lparg4=NULL; jbyte *lparg5=NULL; jint rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, VtblCall__IIS_3B_3B_3B_FUNC); -#else OS_NATIVE_ENTER(env, that, VtblCall__IJS_3B_3B_3B_FUNC); -#endif if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail; if (arg4) if ((lparg4 = (*env)->GetByteArrayElements(env, arg4, NULL)) == NULL) goto fail; if (arg5) if ((lparg5 = (*env)->GetByteArrayElements(env, arg5, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jshort, jbyte *, jbyte *, jbyte *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jshort, jbyte *, jbyte *, jbyte *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5); fail: if (arg5 && lparg5) (*env)->ReleaseByteArrayElements(env, arg5, lparg5, 0); if (arg4 && lparg4) (*env)->ReleaseByteArrayElements(env, arg4, lparg4, 0); if (arg3 && lparg3) (*env)->ReleaseByteArrayElements(env, arg3, lparg3, 0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, VtblCall__IIS_3B_3B_3B_FUNC); -#else OS_NATIVE_EXIT(env, that, VtblCall__IJS_3B_3B_3B_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__II_3B_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3B_3I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__II_3B_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jintArray arg3) -#else -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJ_3B_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jintArray arg3) -#endif +#ifndef NO_VtblCall__IJ_3B_3I +JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJ_3B_3I) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jbyteArray arg2, jintArray arg3) { jbyte *lparg2=NULL; jint *lparg3=NULL; jint rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, VtblCall__II_3B_3I_FUNC); -#else OS_NATIVE_ENTER(env, that, VtblCall__IJ_3B_3I_FUNC); -#endif if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail; if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jbyte *, jint *))(*(jlong **)arg1)[arg0])(arg1, lparg2, lparg3); fail: if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0); if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, VtblCall__II_3B_3I_FUNC); -#else OS_NATIVE_EXIT(env, that, VtblCall__IJ_3B_3I_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__II_3B_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3B_3J) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__II_3B_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlongArray arg3) -#else -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJ_3B_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlongArray arg3) -#endif +#ifndef NO_VtblCall__IJ_3B_3J +JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJ_3B_3J) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jbyteArray arg2, jlongArray arg3) { jbyte *lparg2=NULL; jlong *lparg3=NULL; jint rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, VtblCall__II_3B_3J_FUNC); -#else OS_NATIVE_ENTER(env, that, VtblCall__IJ_3B_3J_FUNC); -#endif if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail; if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jbyte *, jlong *))(*(jlong **)arg1)[arg0])(arg1, lparg2, lparg3); fail: if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0); if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, VtblCall__II_3B_3J_FUNC); -#else OS_NATIVE_EXIT(env, that, VtblCall__IJ_3B_3J_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__II_3C) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3C) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__II_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2) -#else -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJ_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2) -#endif +#ifndef NO_VtblCall__IJ_3C +JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJ_3C) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jcharArray arg2) { jchar *lparg2=NULL; jint rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, VtblCall__II_3C_FUNC); -#else OS_NATIVE_ENTER(env, that, VtblCall__IJ_3C_FUNC); -#endif if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jchar *))(*(jintLong **)arg1)[arg0])(arg1, lparg2); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jchar *))(*(jlong **)arg1)[arg0])(arg1, lparg2); fail: if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, VtblCall__II_3C_FUNC); -#else OS_NATIVE_EXIT(env, that, VtblCall__IJ_3C_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__II_3CI) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3CI) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__II_3CI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3) -#else -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJ_3CI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3) -#endif +#ifndef NO_VtblCall__IJ_3CI +JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJ_3CI) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jcharArray arg2, jint arg3) { jchar *lparg2=NULL; jint rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, VtblCall__II_3CI_FUNC); -#else OS_NATIVE_ENTER(env, that, VtblCall__IJ_3CI_FUNC); -#endif if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jchar *, jint))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jchar *, jint))(*(jlong **)arg1)[arg0])(arg1, lparg2, arg3); fail: if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, VtblCall__II_3CI_FUNC); -#else OS_NATIVE_EXIT(env, that, VtblCall__IJ_3CI_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__II_3CII_3I_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3CII_3I_3I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__II_3CII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3, jint arg4, jintArray arg5, jintArray arg6) -#else -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJ_3CII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3, jint arg4, jintArray arg5, jintArray arg6) -#endif +#ifndef NO_VtblCall__IJ_3CII_3I_3I +JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJ_3CII_3I_3I) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jcharArray arg2, jint arg3, jint arg4, jintArray arg5, jintArray arg6) { jchar *lparg2=NULL; jint *lparg5=NULL; jint *lparg6=NULL; jint rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, VtblCall__II_3CII_3I_3I_FUNC); -#else OS_NATIVE_ENTER(env, that, VtblCall__IJ_3CII_3I_3I_FUNC); -#endif if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail; if (arg5) if ((lparg5 = (*env)->GetIntArrayElements(env, arg5, NULL)) == NULL) goto fail; if (arg6) if ((lparg6 = (*env)->GetIntArrayElements(env, arg6, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jchar *, jint, jint, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, arg4, lparg5, lparg6); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jchar *, jint, jint, jint *, jint *))(*(jlong **)arg1)[arg0])(arg1, lparg2, arg3, arg4, lparg5, lparg6); fail: if (arg6 && lparg6) (*env)->ReleaseIntArrayElements(env, arg6, lparg6, 0); if (arg5 && lparg5) (*env)->ReleaseIntArrayElements(env, arg5, lparg5, 0); if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, VtblCall__II_3CII_3I_3I_FUNC); -#else OS_NATIVE_EXIT(env, that, VtblCall__IJ_3CII_3I_3I_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__II_3CJ) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3CJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__II_3CJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jlong arg3) -#else -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJ_3CJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jlong arg3) -#endif +#ifndef NO_VtblCall__IJ_3CJ +JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJ_3CJ) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jcharArray arg2, jlong arg3) { jchar *lparg2=NULL; jint rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, VtblCall__II_3CJ_FUNC); -#else OS_NATIVE_ENTER(env, that, VtblCall__IJ_3CJ_FUNC); -#endif if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jchar *, jlong))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jchar *, jlong))(*(jlong **)arg1)[arg0])(arg1, lparg2, arg3); fail: if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, VtblCall__II_3CJ_FUNC); -#else OS_NATIVE_EXIT(env, that, VtblCall__IJ_3CJ_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__II_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__II_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2) -#else -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2) -#endif +#ifndef NO_VtblCall__IJ_3I +JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJ_3I) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jintArray arg2) { jint *lparg2=NULL; jint rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, VtblCall__II_3I_FUNC); -#else OS_NATIVE_ENTER(env, that, VtblCall__IJ_3I_FUNC); -#endif if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint *))(*(jlong **)arg1)[arg0])(arg1, lparg2); fail: if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, VtblCall__II_3I_FUNC); -#else OS_NATIVE_EXIT(env, that, VtblCall__IJ_3I_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__II_3I_3B_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3I_3B_3I) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__II_3I_3B_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jbyteArray arg3, jintArray arg4) -#else -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJ_3I_3B_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jbyteArray arg3, jintArray arg4) -#endif +#ifndef NO_VtblCall__IJ_3I_3B_3I +JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJ_3I_3B_3I) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jintArray arg2, jbyteArray arg3, jintArray arg4) { jint *lparg2=NULL; jbyte *lparg3=NULL; jint *lparg4=NULL; jint rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, VtblCall__II_3I_3B_3I_FUNC); -#else OS_NATIVE_ENTER(env, that, VtblCall__IJ_3I_3B_3I_FUNC); -#endif if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail; if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail; if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint *, jbyte *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint *, jbyte *, jint *))(*(jlong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4); fail: if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0); if (arg3 && lparg3) (*env)->ReleaseByteArrayElements(env, arg3, lparg3, 0); if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, VtblCall__II_3I_3B_3I_FUNC); -#else OS_NATIVE_EXIT(env, that, VtblCall__IJ_3I_3B_3I_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__II_3I_3B_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3I_3B_3J) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__II_3I_3B_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jbyteArray arg3, jlongArray arg4) -#else -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJ_3I_3B_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jbyteArray arg3, jlongArray arg4) -#endif +#ifndef NO_VtblCall__IJ_3I_3B_3J +JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJ_3I_3B_3J) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jintArray arg2, jbyteArray arg3, jlongArray arg4) { jint *lparg2=NULL; jbyte *lparg3=NULL; jlong *lparg4=NULL; jint rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, VtblCall__II_3I_3B_3J_FUNC); -#else OS_NATIVE_ENTER(env, that, VtblCall__IJ_3I_3B_3J_FUNC); -#endif if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail; if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail; if (arg4) if ((lparg4 = (*env)->GetLongArrayElements(env, arg4, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint *, jbyte *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint *, jbyte *, jlong *))(*(jlong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4); fail: if (arg4 && lparg4) (*env)->ReleaseLongArrayElements(env, arg4, lparg4, 0); if (arg3 && lparg3) (*env)->ReleaseByteArrayElements(env, arg3, lparg3, 0); if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, VtblCall__II_3I_3B_3J_FUNC); -#else OS_NATIVE_EXIT(env, that, VtblCall__IJ_3I_3B_3J_FUNC); -#endif return rc; } #endif -#if (!defined(NO_VtblCall__II_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3J) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__II_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlongArray arg2) -#else -JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlongArray arg2) -#endif +#ifndef NO_VtblCall__IJ_3J +JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJ_3J) + (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlongArray arg2) { jlong *lparg2=NULL; jint rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, VtblCall__II_3J_FUNC); -#else OS_NATIVE_ENTER(env, that, VtblCall__IJ_3J_FUNC); -#endif if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail; - rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2); + rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong *))(*(jlong **)arg1)[arg0])(arg1, lparg2); fail: if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, VtblCall__II_3J_FUNC); -#else OS_NATIVE_EXIT(env, that, VtblCall__IJ_3J_FUNC); -#endif return rc; } #endif @@ -12868,22 +11009,15 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(WaitMessage) } #endif -#if (!defined(NO_WideCharToMultiByte__II_3CIII_3B_3Z) && !defined(JNI64)) || (!defined(NO_WideCharToMultiByte__II_3CIJI_3B_3Z) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT jint JNICALL OS_NATIVE(WideCharToMultiByte__II_3CIII_3B_3Z)(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jint arg3, jintLong arg4, jint arg5, jbyteArray arg6, jbooleanArray arg7) -#else -JNIEXPORT jint JNICALL OS_NATIVE(WideCharToMultiByte__II_3CIJI_3B_3Z)(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jint arg3, jintLong arg4, jint arg5, jbyteArray arg6, jbooleanArray arg7) -#endif +#ifndef NO_WideCharToMultiByte__II_3CIJI_3B_3Z +JNIEXPORT jint JNICALL OS_NATIVE(WideCharToMultiByte__II_3CIJI_3B_3Z) + (JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jint arg3, jlong arg4, jint arg5, jbyteArray arg6, jbooleanArray arg7) { jchar *lparg2=NULL; jbyte *lparg6=NULL; jboolean *lparg7=NULL; jint rc = 0; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, WideCharToMultiByte__II_3CIII_3B_3Z_FUNC); -#else OS_NATIVE_ENTER(env, that, WideCharToMultiByte__II_3CIJI_3B_3Z_FUNC); -#endif if (arg6) if ((lparg6 = (*env)->GetByteArrayElements(env, arg6, NULL)) == NULL) goto fail; if (arg7) if ((lparg7 = (*env)->GetBooleanArrayElements(env, arg7, NULL)) == NULL) goto fail; if (arg2) if ((lparg2 = (*env)->GetPrimitiveArrayCritical(env, arg2, NULL)) == NULL) goto fail; @@ -12892,11 +11026,7 @@ fail: if (arg2 && lparg2) (*env)->ReleasePrimitiveArrayCritical(env, arg2, lparg2, JNI_ABORT); if (arg7 && lparg7) (*env)->ReleaseBooleanArrayElements(env, arg7, lparg7, 0); if (arg6 && lparg6) (*env)->ReleaseByteArrayElements(env, arg6, lparg6, 0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, WideCharToMultiByte__II_3CIII_3B_3Z_FUNC); -#else OS_NATIVE_EXIT(env, that, WideCharToMultiByte__II_3CIJI_3B_3Z_FUNC); -#endif return rc; } #endif @@ -12927,26 +11057,26 @@ fail: #endif #ifndef NO_WindowFromDC -JNIEXPORT jintLong JNICALL OS_NATIVE(WindowFromDC) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL OS_NATIVE(WindowFromDC) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, WindowFromDC_FUNC); - rc = (jintLong)WindowFromDC((HDC)arg0); + rc = (jlong)WindowFromDC((HDC)arg0); OS_NATIVE_EXIT(env, that, WindowFromDC_FUNC); return rc; } #endif #ifndef NO_WindowFromPoint -JNIEXPORT jintLong JNICALL OS_NATIVE(WindowFromPoint) +JNIEXPORT jlong JNICALL OS_NATIVE(WindowFromPoint) (JNIEnv *env, jclass that, jobject arg0) { POINT _arg0, *lparg0=NULL; - jintLong rc = 0; + jlong rc = 0; OS_NATIVE_ENTER(env, that, WindowFromPoint_FUNC); if (arg0) if ((lparg0 = getPOINTFields(env, arg0, &_arg0)) == NULL) goto fail; - rc = (jintLong)WindowFromPoint(*lparg0); + rc = (jlong)WindowFromPoint(*lparg0); fail: if (arg0 && lparg0) setPOINTFields(env, arg0, lparg0); OS_NATIVE_EXIT(env, that, WindowFromPoint_FUNC); @@ -12956,7 +11086,7 @@ fail: #ifndef NO_wcslen JNIEXPORT jint JNICALL OS_NATIVE(wcslen) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; OS_NATIVE_ENTER(env, that, wcslen_FUNC); 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 451f7bb9cc..19436deac3 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 @@ -92,22 +92,10 @@ char * OS_nativeFunctionNames[] = { "CreateCompatibleDC", "CreateCursor", "CreateDC", -#ifndef JNI64 - "CreateDIBSection__III_3III", -#else "CreateDIBSection__JJI_3JJI", -#endif -#ifndef JNI64 - "CreateDIBSection__I_3BI_3III", -#else "CreateDIBSection__J_3BI_3JJI", -#endif "CreateEnhMetaFile", -#ifndef JNI64 - "CreateFontIndirect__I", -#else "CreateFontIndirect__J", -#endif "CreateFontIndirect__Lorg_eclipse_swt_internal_win32_LOGFONT_2", "CreateIconIndirect", "CreateMenu", @@ -260,31 +248,11 @@ char * OS_nativeFunctionNames[] = { "GetModuleFileName", "GetModuleHandle", "GetMonitorInfo", -#ifndef JNI64 - "GetObject__III", -#else "GetObject__JIJ", -#endif -#ifndef JNI64 - "GetObject__IILorg_eclipse_swt_internal_win32_BITMAP_2", -#else "GetObject__JILorg_eclipse_swt_internal_win32_BITMAP_2", -#endif -#ifndef JNI64 - "GetObject__IILorg_eclipse_swt_internal_win32_DIBSECTION_2", -#else "GetObject__JILorg_eclipse_swt_internal_win32_DIBSECTION_2", -#endif -#ifndef JNI64 - "GetObject__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2", -#else "GetObject__JILorg_eclipse_swt_internal_win32_LOGBRUSH_2", -#endif -#ifndef JNI64 - "GetObject__IILorg_eclipse_swt_internal_win32_LOGFONT_2", -#else "GetObject__JILorg_eclipse_swt_internal_win32_LOGFONT_2", -#endif "GetOpenFileName", "GetOutlineTextMetrics", "GetParent", @@ -368,21 +336,9 @@ char * OS_nativeFunctionNames[] = { "ImmDestroyContext", "ImmEscape", "ImmGetCompositionFont", -#ifndef JNI64 - "ImmGetCompositionString__II_3BI", -#else "ImmGetCompositionString__JI_3BI", -#endif -#ifndef JNI64 - "ImmGetCompositionString__II_3CI", -#else "ImmGetCompositionString__JI_3CI", -#endif -#ifndef JNI64 - "ImmGetCompositionString__II_3II", -#else "ImmGetCompositionString__JI_3II", -#endif "ImmGetContext", "ImmGetConversionStatus", "ImmGetDefaultIMEWnd", @@ -447,460 +403,104 @@ char * OS_nativeFunctionNames[] = { "MSG_1sizeof", "MapViewOfFile", "MapVirtualKey", -#ifndef JNI64 - "MapWindowPoints__IILorg_eclipse_swt_internal_win32_POINT_2I", -#else "MapWindowPoints__JJLorg_eclipse_swt_internal_win32_POINT_2I", -#endif -#ifndef JNI64 - "MapWindowPoints__IILorg_eclipse_swt_internal_win32_RECT_2I", -#else "MapWindowPoints__JJLorg_eclipse_swt_internal_win32_RECT_2I", -#endif "MessageBeep", "MessageBox", "ModifyWorldTransform", "MonitorFromWindow", -#ifndef JNI64 - "MoveMemory__III", -#else "MoveMemory__JJI", -#endif -#ifndef JNI64 - "MoveMemory__ILorg_eclipse_swt_internal_win32_DEVMODE_2I", -#else "MoveMemory__JLorg_eclipse_swt_internal_win32_DEVMODE_2I", -#endif -#ifndef JNI64 - "MoveMemory__ILorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2I", -#else "MoveMemory__JLorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2I", -#endif -#ifndef JNI64 - "MoveMemory__ILorg_eclipse_swt_internal_win32_DROPFILES_2I", -#else "MoveMemory__JLorg_eclipse_swt_internal_win32_DROPFILES_2I", -#endif -#ifndef JNI64 - "MoveMemory__ILorg_eclipse_swt_internal_win32_GESTURECONFIG_2I", -#else "MoveMemory__JLorg_eclipse_swt_internal_win32_GESTURECONFIG_2I", -#endif -#ifndef JNI64 - "MoveMemory__ILorg_eclipse_swt_internal_win32_GRADIENT_1RECT_2I", -#else "MoveMemory__JLorg_eclipse_swt_internal_win32_GRADIENT_1RECT_2I", -#endif -#ifndef JNI64 - "MoveMemory__ILorg_eclipse_swt_internal_win32_KEYBDINPUT_2I", -#else "MoveMemory__JLorg_eclipse_swt_internal_win32_KEYBDINPUT_2I", -#endif -#ifndef JNI64 - "MoveMemory__ILorg_eclipse_swt_internal_win32_LOGFONT_2I", -#else "MoveMemory__JLorg_eclipse_swt_internal_win32_LOGFONT_2I", -#endif -#ifndef JNI64 - "MoveMemory__ILorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2I", -#else "MoveMemory__JLorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2I", -#endif -#ifndef JNI64 - "MoveMemory__ILorg_eclipse_swt_internal_win32_MINMAXINFO_2I", -#else "MoveMemory__JLorg_eclipse_swt_internal_win32_MINMAXINFO_2I", -#endif -#ifndef JNI64 - "MoveMemory__ILorg_eclipse_swt_internal_win32_MOUSEINPUT_2I", -#else "MoveMemory__JLorg_eclipse_swt_internal_win32_MOUSEINPUT_2I", -#endif -#ifndef JNI64 - "MoveMemory__ILorg_eclipse_swt_internal_win32_MSG_2I", -#else "MoveMemory__JLorg_eclipse_swt_internal_win32_MSG_2I", -#endif -#ifndef JNI64 - "MoveMemory__ILorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2I", -#else "MoveMemory__JLorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2I", -#endif -#ifndef JNI64 - "MoveMemory__ILorg_eclipse_swt_internal_win32_NMLVDISPINFO_2I", -#else "MoveMemory__JLorg_eclipse_swt_internal_win32_NMLVDISPINFO_2I", -#endif -#ifndef JNI64 - "MoveMemory__ILorg_eclipse_swt_internal_win32_NMTBCUSTOMDRAW_2I", -#else "MoveMemory__JLorg_eclipse_swt_internal_win32_NMTBCUSTOMDRAW_2I", -#endif -#ifndef JNI64 - "MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTDISPINFO_2I", -#else "MoveMemory__JLorg_eclipse_swt_internal_win32_NMTTDISPINFO_2I", -#endif -#ifndef JNI64 - "MoveMemory__ILorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2I", -#else "MoveMemory__JLorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2I", -#endif -#ifndef JNI64 - "MoveMemory__ILorg_eclipse_swt_internal_win32_NMTVDISPINFO_2I", -#else "MoveMemory__JLorg_eclipse_swt_internal_win32_NMTVDISPINFO_2I", -#endif -#ifndef JNI64 - "MoveMemory__ILorg_eclipse_swt_internal_win32_OPENFILENAME_2I", -#else "MoveMemory__JLorg_eclipse_swt_internal_win32_OPENFILENAME_2I", -#endif -#ifndef JNI64 - "MoveMemory__ILorg_eclipse_swt_internal_win32_RECT_2I", -#else "MoveMemory__JLorg_eclipse_swt_internal_win32_RECT_2I", -#endif -#ifndef JNI64 - "MoveMemory__ILorg_eclipse_swt_internal_win32_SAFEARRAY_2I", -#else "MoveMemory__JLorg_eclipse_swt_internal_win32_SAFEARRAY_2I", -#endif -#ifndef JNI64 - "MoveMemory__ILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I", -#else "MoveMemory__JLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I", -#endif -#ifndef JNI64 - "MoveMemory__ILorg_eclipse_swt_internal_win32_TRIVERTEX_2I", -#else "MoveMemory__JLorg_eclipse_swt_internal_win32_TRIVERTEX_2I", -#endif -#ifndef JNI64 - "MoveMemory__ILorg_eclipse_swt_internal_win32_UDACCEL_2I", -#else "MoveMemory__JLorg_eclipse_swt_internal_win32_UDACCEL_2I", -#endif -#ifndef JNI64 - "MoveMemory__ILorg_eclipse_swt_internal_win32_WINDOWPOS_2I", -#else "MoveMemory__JLorg_eclipse_swt_internal_win32_WINDOWPOS_2I", -#endif -#ifndef JNI64 - "MoveMemory__I_3BI", -#else "MoveMemory__J_3BI", -#endif -#ifndef JNI64 - "MoveMemory__I_3CI", -#else "MoveMemory__J_3CI", -#endif -#ifndef JNI64 - "MoveMemory__I_3DI", -#else "MoveMemory__J_3DI", -#endif -#ifndef JNI64 - "MoveMemory__I_3FI", -#else "MoveMemory__J_3FI", -#endif -#ifndef JNI64 - "MoveMemory__I_3II", -#else "MoveMemory__J_3II", -#endif -#ifndef JNI64 - "MoveMemory__I_3JI", -#else "MoveMemory__J_3JI", -#endif -#ifndef JNI64 - "MoveMemory__I_3SI", -#else "MoveMemory__J_3SI", -#endif -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_win32_BITMAPINFOHEADER_2II", -#else "MoveMemory__Lorg_eclipse_swt_internal_win32_BITMAPINFOHEADER_2JI", -#endif "MoveMemory__Lorg_eclipse_swt_internal_win32_BITMAPINFOHEADER_2_3BI", -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_win32_CERT_1CONTEXT_2II", -#else "MoveMemory__Lorg_eclipse_swt_internal_win32_CERT_1CONTEXT_2JI", -#endif -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_win32_CERT_1INFO_2II", -#else "MoveMemory__Lorg_eclipse_swt_internal_win32_CERT_1INFO_2JI", -#endif -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_win32_DEVMODE_2II", -#else "MoveMemory__Lorg_eclipse_swt_internal_win32_DEVMODE_2JI", -#endif -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2II", -#else "MoveMemory__Lorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2JI", -#endif -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_win32_DRAWITEMSTRUCT_2II", -#else "MoveMemory__Lorg_eclipse_swt_internal_win32_DRAWITEMSTRUCT_2JI", -#endif -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_win32_EMREXTCREATEFONTINDIRECTW_2II", -#else "MoveMemory__Lorg_eclipse_swt_internal_win32_EMREXTCREATEFONTINDIRECTW_2JI", -#endif -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_win32_EMR_2II", -#else "MoveMemory__Lorg_eclipse_swt_internal_win32_EMR_2JI", -#endif -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_win32_FLICK_1DATA_2_3II", -#else "MoveMemory__Lorg_eclipse_swt_internal_win32_FLICK_1DATA_2_3JI", -#endif -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_win32_FLICK_1POINT_2_3II", -#else "MoveMemory__Lorg_eclipse_swt_internal_win32_FLICK_1POINT_2_3JI", -#endif -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_win32_HDITEM_2II", -#else "MoveMemory__Lorg_eclipse_swt_internal_win32_HDITEM_2JI", -#endif -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_win32_HELPINFO_2II", -#else "MoveMemory__Lorg_eclipse_swt_internal_win32_HELPINFO_2JI", -#endif -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONT_2II", -#else "MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONT_2JI", -#endif -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2II", -#else "MoveMemory__Lorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2JI", -#endif -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_win32_MINMAXINFO_2II", -#else "MoveMemory__Lorg_eclipse_swt_internal_win32_MINMAXINFO_2JI", -#endif -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_win32_MSG_2II", -#else "MoveMemory__Lorg_eclipse_swt_internal_win32_MSG_2JI", -#endif -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_win32_NMCUSTOMDRAW_2II", -#else "MoveMemory__Lorg_eclipse_swt_internal_win32_NMCUSTOMDRAW_2JI", -#endif -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_win32_NMHDR_2II", -#else "MoveMemory__Lorg_eclipse_swt_internal_win32_NMHDR_2JI", -#endif -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_win32_NMHEADER_2II", -#else "MoveMemory__Lorg_eclipse_swt_internal_win32_NMHEADER_2JI", -#endif -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_win32_NMLINK_2II", -#else "MoveMemory__Lorg_eclipse_swt_internal_win32_NMLINK_2JI", -#endif -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_win32_NMLISTVIEW_2II", -#else "MoveMemory__Lorg_eclipse_swt_internal_win32_NMLISTVIEW_2JI", -#endif -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2II", -#else "MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2JI", -#endif -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVDISPINFO_2II", -#else "MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVDISPINFO_2JI", -#endif -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVODSTATECHANGE_2II", -#else "MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVODSTATECHANGE_2JI", -#endif -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHEVRON_2II", -#else "MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHEVRON_2JI", -#endif -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHILDSIZE_2II", -#else "MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHILDSIZE_2JI", -#endif -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_win32_NMTBCUSTOMDRAW_2II", -#else "MoveMemory__Lorg_eclipse_swt_internal_win32_NMTBCUSTOMDRAW_2JI", -#endif -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_win32_NMTBHOTITEM_2II", -#else "MoveMemory__Lorg_eclipse_swt_internal_win32_NMTBHOTITEM_2JI", -#endif -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_win32_NMTOOLBAR_2II", -#else "MoveMemory__Lorg_eclipse_swt_internal_win32_NMTOOLBAR_2JI", -#endif -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_win32_NMTREEVIEW_2II", -#else "MoveMemory__Lorg_eclipse_swt_internal_win32_NMTREEVIEW_2JI", -#endif -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTCUSTOMDRAW_2II", -#else "MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTCUSTOMDRAW_2JI", -#endif -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFO_2II", -#else "MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFO_2JI", -#endif -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2II", -#else "MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2JI", -#endif -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVDISPINFO_2II", -#else "MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVDISPINFO_2JI", -#endif -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVITEMCHANGE_2II", -#else "MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVITEMCHANGE_2JI", -#endif -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_win32_NMUPDOWN_2II", -#else "MoveMemory__Lorg_eclipse_swt_internal_win32_NMUPDOWN_2JI", -#endif -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_win32_OFNOTIFY_2II", -#else "MoveMemory__Lorg_eclipse_swt_internal_win32_OFNOTIFY_2JI", -#endif -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_win32_OPENFILENAME_2II", -#else "MoveMemory__Lorg_eclipse_swt_internal_win32_OPENFILENAME_2JI", -#endif -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_win32_POINT_2II", -#else "MoveMemory__Lorg_eclipse_swt_internal_win32_POINT_2JI", -#endif "MoveMemory__Lorg_eclipse_swt_internal_win32_POINT_2_3JI", -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_win32_SAFEARRAY_2II", -#else "MoveMemory__Lorg_eclipse_swt_internal_win32_SAFEARRAY_2JI", -#endif -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1ITEM_2II", -#else "MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1ITEM_2JI", -#endif -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1LOGATTR_2II", -#else "MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1LOGATTR_2JI", -#endif -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1PROPERTIES_2II", -#else "MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1PROPERTIES_2JI", -#endif -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRIC_2II", -#else "MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRIC_2JI", -#endif -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_win32_TOUCHINPUT_2II", -#else "MoveMemory__Lorg_eclipse_swt_internal_win32_TOUCHINPUT_2JI", -#endif -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_win32_UDACCEL_2II", -#else "MoveMemory__Lorg_eclipse_swt_internal_win32_UDACCEL_2JI", -#endif -#ifndef JNI64 - "MoveMemory__Lorg_eclipse_swt_internal_win32_WINDOWPOS_2II", -#else "MoveMemory__Lorg_eclipse_swt_internal_win32_WINDOWPOS_2JI", -#endif -#ifndef JNI64 - "MoveMemory___3BII", -#else "MoveMemory___3BJI", -#endif "MoveMemory___3BLorg_eclipse_swt_internal_win32_ACCEL_2I", "MoveMemory___3BLorg_eclipse_swt_internal_win32_BITMAPINFOHEADER_2I", -#ifndef JNI64 - "MoveMemory___3CII", -#else "MoveMemory___3CJI", -#endif -#ifndef JNI64 - "MoveMemory___3DII", -#else "MoveMemory___3DJI", -#endif -#ifndef JNI64 - "MoveMemory___3FII", -#else "MoveMemory___3FJI", -#endif -#ifndef JNI64 - "MoveMemory___3III", -#else "MoveMemory___3IJI", -#endif -#ifndef JNI64 - "MoveMemory___3JII", -#else "MoveMemory___3JJI", -#endif -#ifndef JNI64 - "MoveMemory___3SII", -#else "MoveMemory___3SJI", -#endif "MoveToEx", -#ifndef JNI64 - "MultiByteToWideChar__IIII_3CI", -#else "MultiByteToWideChar__IIJI_3CI", -#endif "MultiByteToWideChar__II_3BI_3CI", "NMCUSTOMDRAW_1sizeof", "NMHDR_1sizeof", @@ -969,16 +569,8 @@ char * OS_nativeFunctionNames[] = { "RegDeleteValue", "RegEnumKeyEx", "RegOpenKeyEx", -#ifndef JNI64 - "RegQueryValueEx__I_3CI_3I_3C_3I", -#else "RegQueryValueEx__J_3CJ_3I_3C_3I", -#endif -#ifndef JNI64 - "RegQueryValueEx__I_3CI_3I_3I_3I", -#else "RegQueryValueEx__J_3CJ_3I_3I_3I", -#endif "RegSetValueEx", "RegisterClass", "RegisterClipboardFormat", @@ -1043,156 +635,36 @@ char * OS_nativeFunctionNames[] = { "SelectClipRgn", "SelectObject", "SendInput", -#ifndef JNI64 - "SendMessage__IIII", -#else "SendMessage__JIJJ", -#endif -#ifndef JNI64 - "SendMessage__IIILorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2", -#else "SendMessage__JIJLorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2", -#endif -#ifndef JNI64 - "SendMessage__IIILorg_eclipse_swt_internal_win32_HDHITTESTINFO_2", -#else "SendMessage__JIJLorg_eclipse_swt_internal_win32_HDHITTESTINFO_2", -#endif -#ifndef JNI64 - "SendMessage__IIILorg_eclipse_swt_internal_win32_HDITEM_2", -#else "SendMessage__JIJLorg_eclipse_swt_internal_win32_HDITEM_2", -#endif -#ifndef JNI64 - "SendMessage__IIILorg_eclipse_swt_internal_win32_HDLAYOUT_2", -#else "SendMessage__JIJLorg_eclipse_swt_internal_win32_HDLAYOUT_2", -#endif -#ifndef JNI64 - "SendMessage__IIILorg_eclipse_swt_internal_win32_LITEM_2", -#else "SendMessage__JIJLorg_eclipse_swt_internal_win32_LITEM_2", -#endif -#ifndef JNI64 - "SendMessage__IIILorg_eclipse_swt_internal_win32_LVCOLUMN_2", -#else "SendMessage__JIJLorg_eclipse_swt_internal_win32_LVCOLUMN_2", -#endif -#ifndef JNI64 - "SendMessage__IIILorg_eclipse_swt_internal_win32_LVHITTESTINFO_2", -#else "SendMessage__JIJLorg_eclipse_swt_internal_win32_LVHITTESTINFO_2", -#endif -#ifndef JNI64 - "SendMessage__IIILorg_eclipse_swt_internal_win32_LVINSERTMARK_2", -#else "SendMessage__JIJLorg_eclipse_swt_internal_win32_LVINSERTMARK_2", -#endif -#ifndef JNI64 - "SendMessage__IIILorg_eclipse_swt_internal_win32_LVITEM_2", -#else "SendMessage__JIJLorg_eclipse_swt_internal_win32_LVITEM_2", -#endif -#ifndef JNI64 - "SendMessage__IIILorg_eclipse_swt_internal_win32_MARGINS_2", -#else "SendMessage__JIJLorg_eclipse_swt_internal_win32_MARGINS_2", -#endif -#ifndef JNI64 - "SendMessage__IIILorg_eclipse_swt_internal_win32_MCHITTESTINFO_2", -#else "SendMessage__JIJLorg_eclipse_swt_internal_win32_MCHITTESTINFO_2", -#endif -#ifndef JNI64 - "SendMessage__IIILorg_eclipse_swt_internal_win32_REBARBANDINFO_2", -#else "SendMessage__JIJLorg_eclipse_swt_internal_win32_REBARBANDINFO_2", -#endif -#ifndef JNI64 - "SendMessage__IIILorg_eclipse_swt_internal_win32_RECT_2", -#else "SendMessage__JIJLorg_eclipse_swt_internal_win32_RECT_2", -#endif -#ifndef JNI64 - "SendMessage__IIILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2", -#else "SendMessage__JIJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2", -#endif -#ifndef JNI64 - "SendMessage__IIILorg_eclipse_swt_internal_win32_SIZE_2", -#else "SendMessage__JIJLorg_eclipse_swt_internal_win32_SIZE_2", -#endif -#ifndef JNI64 - "SendMessage__IIILorg_eclipse_swt_internal_win32_SYSTEMTIME_2", -#else "SendMessage__JIJLorg_eclipse_swt_internal_win32_SYSTEMTIME_2", -#endif -#ifndef JNI64 - "SendMessage__IIILorg_eclipse_swt_internal_win32_TBBUTTONINFO_2", -#else "SendMessage__JIJLorg_eclipse_swt_internal_win32_TBBUTTONINFO_2", -#endif -#ifndef JNI64 - "SendMessage__IIILorg_eclipse_swt_internal_win32_TBBUTTON_2", -#else "SendMessage__JIJLorg_eclipse_swt_internal_win32_TBBUTTON_2", -#endif -#ifndef JNI64 - "SendMessage__IIILorg_eclipse_swt_internal_win32_TCHITTESTINFO_2", -#else "SendMessage__JIJLorg_eclipse_swt_internal_win32_TCHITTESTINFO_2", -#endif -#ifndef JNI64 - "SendMessage__IIILorg_eclipse_swt_internal_win32_TCITEM_2", -#else "SendMessage__JIJLorg_eclipse_swt_internal_win32_TCITEM_2", -#endif -#ifndef JNI64 - "SendMessage__IIILorg_eclipse_swt_internal_win32_TOOLINFO_2", -#else "SendMessage__JIJLorg_eclipse_swt_internal_win32_TOOLINFO_2", -#endif -#ifndef JNI64 - "SendMessage__IIILorg_eclipse_swt_internal_win32_TVHITTESTINFO_2", -#else "SendMessage__JIJLorg_eclipse_swt_internal_win32_TVHITTESTINFO_2", -#endif -#ifndef JNI64 - "SendMessage__IIILorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2", -#else "SendMessage__JIJLorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2", -#endif -#ifndef JNI64 - "SendMessage__IIILorg_eclipse_swt_internal_win32_TVITEM_2", -#else "SendMessage__JIJLorg_eclipse_swt_internal_win32_TVITEM_2", -#endif -#ifndef JNI64 - "SendMessage__IIILorg_eclipse_swt_internal_win32_TVSORTCB_2", -#else "SendMessage__JIJLorg_eclipse_swt_internal_win32_TVSORTCB_2", -#endif -#ifndef JNI64 - "SendMessage__IIILorg_eclipse_swt_internal_win32_UDACCEL_2", -#else "SendMessage__JIJLorg_eclipse_swt_internal_win32_UDACCEL_2", -#endif -#ifndef JNI64 - "SendMessage__III_3C", -#else "SendMessage__JIJ_3C", -#endif -#ifndef JNI64 - "SendMessage__III_3I", -#else "SendMessage__JIJ_3I", -#endif -#ifndef JNI64 - "SendMessage__II_3I_3I", -#else "SendMessage__JI_3I_3I", -#endif "SetActiveWindow", "SetBkColor", "SetBkMode", @@ -1286,200 +758,48 @@ char * OS_nativeFunctionNames[] = { "UrlCreateFromPath", "ValidateRect", "VkKeyScan", -#ifndef JNI64 - "VtblCall__II", -#else "VtblCall__IJ", -#endif -#ifndef JNI64 - "VtblCall__III", -#else "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", -#endif -#ifndef JNI64 - "VtblCall__IIII_3C_3CI", -#else "VtblCall__IJII_3C_3CI", -#endif -#ifndef JNI64 - "VtblCall__IIIJ", -#else "VtblCall__IJIJ", -#endif -#ifndef JNI64 - "VtblCall__IIIJI_3J", -#else "VtblCall__IJIJI_3J", -#endif -#ifndef JNI64 - "VtblCall__IIIJJ", -#else "VtblCall__IJIJJ", -#endif -#ifndef JNI64 - "VtblCall__III_3I", -#else "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", -#endif -#ifndef JNI64 - "VtblCall__IIJ", -#else + "VtblCall__IJI_3J_3I", "VtblCall__IJJ", -#endif -#ifndef JNI64 - "VtblCall__IIJI", -#else "VtblCall__IJJI", -#endif -#ifndef JNI64 - "VtblCall__IIJII_3I", -#else "VtblCall__IJJII_3I", -#endif -#ifndef JNI64 - "VtblCall__IIJII_3J", -#else "VtblCall__IJJII_3J", -#endif -#ifndef JNI64 - "VtblCall__IIJI_3C_3CJ", -#else "VtblCall__IJJI_3C_3CJ", -#endif -#ifndef JNI64 - "VtblCall__IIJJ", -#else "VtblCall__IJJJ", -#endif -#ifndef JNI64 - "VtblCall__IIJJI_3J", -#else "VtblCall__IJJJI_3J", -#endif -#ifndef JNI64 - "VtblCall__IIJJJ", -#else "VtblCall__IJJJJ", -#endif -#ifndef JNI64 - "VtblCall__IIJ_3I", -#else "VtblCall__IJJ_3I", -#endif -#ifndef JNI64 - "VtblCall__IIJ_3I_3I", -#else "VtblCall__IJJ_3I_3I", -#endif -#ifndef JNI64 - "VtblCall__IIJ_3J_3J", -#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", -#endif -#ifndef JNI64 - "VtblCall__IILorg_eclipse_swt_internal_win32_PROPERTYKEY_2J", -#else "VtblCall__IJLorg_eclipse_swt_internal_win32_PROPERTYKEY_2J", -#endif -#ifndef JNI64 - "VtblCall__IILorg_eclipse_swt_internal_win32_TF_1DISPLAYATTRIBUTE_2", -#else "VtblCall__IJLorg_eclipse_swt_internal_win32_TF_1DISPLAYATTRIBUTE_2", -#endif -#ifndef JNI64 - "VtblCall__IIS_3B_3B_3B", -#else "VtblCall__IJS_3B_3B_3B", -#endif -#ifndef JNI64 - "VtblCall__II_3B_3I", -#else "VtblCall__IJ_3B_3I", -#endif -#ifndef JNI64 - "VtblCall__II_3B_3J", -#else "VtblCall__IJ_3B_3J", -#endif -#ifndef JNI64 - "VtblCall__II_3C", -#else "VtblCall__IJ_3C", -#endif -#ifndef JNI64 - "VtblCall__II_3CI", -#else "VtblCall__IJ_3CI", -#endif -#ifndef JNI64 - "VtblCall__II_3CII_3I_3I", -#else "VtblCall__IJ_3CII_3I_3I", -#endif -#ifndef JNI64 - "VtblCall__II_3CJ", -#else "VtblCall__IJ_3CJ", -#endif -#ifndef JNI64 - "VtblCall__II_3I", -#else "VtblCall__IJ_3I", -#endif -#ifndef JNI64 - "VtblCall__II_3I_3B_3I", -#else "VtblCall__IJ_3I_3B_3I", -#endif -#ifndef JNI64 - "VtblCall__II_3I_3B_3J", -#else "VtblCall__IJ_3I_3B_3J", -#endif -#ifndef JNI64 - "VtblCall__II_3J", -#else "VtblCall__IJ_3J", -#endif "WINDOWPLACEMENT_1sizeof", "WINDOWPOS_1sizeof", "WNDCLASS_1sizeof", "WaitMessage", -#ifndef JNI64 - "WideCharToMultiByte__II_3CIII_3B_3Z", -#else "WideCharToMultiByte__II_3CIJI_3B_3Z", -#endif "WideCharToMultiByte__II_3CI_3BI_3B_3Z", "WindowFromDC", "WindowFromPoint", 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 4f0ff7b2f9..24475d8d6d 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 @@ -102,22 +102,10 @@ typedef enum { CreateCompatibleDC_FUNC, CreateCursor_FUNC, CreateDC_FUNC, -#ifndef JNI64 - CreateDIBSection__III_3III_FUNC, -#else CreateDIBSection__JJI_3JJI_FUNC, -#endif -#ifndef JNI64 - CreateDIBSection__I_3BI_3III_FUNC, -#else CreateDIBSection__J_3BI_3JJI_FUNC, -#endif CreateEnhMetaFile_FUNC, -#ifndef JNI64 - CreateFontIndirect__I_FUNC, -#else CreateFontIndirect__J_FUNC, -#endif CreateFontIndirect__Lorg_eclipse_swt_internal_win32_LOGFONT_2_FUNC, CreateIconIndirect_FUNC, CreateMenu_FUNC, @@ -270,31 +258,11 @@ typedef enum { GetModuleFileName_FUNC, GetModuleHandle_FUNC, GetMonitorInfo_FUNC, -#ifndef JNI64 - GetObject__III_FUNC, -#else GetObject__JIJ_FUNC, -#endif -#ifndef JNI64 - GetObject__IILorg_eclipse_swt_internal_win32_BITMAP_2_FUNC, -#else GetObject__JILorg_eclipse_swt_internal_win32_BITMAP_2_FUNC, -#endif -#ifndef JNI64 - GetObject__IILorg_eclipse_swt_internal_win32_DIBSECTION_2_FUNC, -#else GetObject__JILorg_eclipse_swt_internal_win32_DIBSECTION_2_FUNC, -#endif -#ifndef JNI64 - GetObject__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2_FUNC, -#else GetObject__JILorg_eclipse_swt_internal_win32_LOGBRUSH_2_FUNC, -#endif -#ifndef JNI64 - GetObject__IILorg_eclipse_swt_internal_win32_LOGFONT_2_FUNC, -#else GetObject__JILorg_eclipse_swt_internal_win32_LOGFONT_2_FUNC, -#endif GetOpenFileName_FUNC, GetOutlineTextMetrics_FUNC, GetParent_FUNC, @@ -378,21 +346,9 @@ typedef enum { ImmDestroyContext_FUNC, ImmEscape_FUNC, ImmGetCompositionFont_FUNC, -#ifndef JNI64 - ImmGetCompositionString__II_3BI_FUNC, -#else ImmGetCompositionString__JI_3BI_FUNC, -#endif -#ifndef JNI64 - ImmGetCompositionString__II_3CI_FUNC, -#else ImmGetCompositionString__JI_3CI_FUNC, -#endif -#ifndef JNI64 - ImmGetCompositionString__II_3II_FUNC, -#else ImmGetCompositionString__JI_3II_FUNC, -#endif ImmGetContext_FUNC, ImmGetConversionStatus_FUNC, ImmGetDefaultIMEWnd_FUNC, @@ -457,460 +413,104 @@ typedef enum { MSG_1sizeof_FUNC, MapViewOfFile_FUNC, MapVirtualKey_FUNC, -#ifndef JNI64 - MapWindowPoints__IILorg_eclipse_swt_internal_win32_POINT_2I_FUNC, -#else MapWindowPoints__JJLorg_eclipse_swt_internal_win32_POINT_2I_FUNC, -#endif -#ifndef JNI64 - MapWindowPoints__IILorg_eclipse_swt_internal_win32_RECT_2I_FUNC, -#else MapWindowPoints__JJLorg_eclipse_swt_internal_win32_RECT_2I_FUNC, -#endif MessageBeep_FUNC, MessageBox_FUNC, ModifyWorldTransform_FUNC, MonitorFromWindow_FUNC, -#ifndef JNI64 - MoveMemory__III_FUNC, -#else MoveMemory__JJI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__ILorg_eclipse_swt_internal_win32_DEVMODE_2I_FUNC, -#else MoveMemory__JLorg_eclipse_swt_internal_win32_DEVMODE_2I_FUNC, -#endif -#ifndef JNI64 - MoveMemory__ILorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2I_FUNC, -#else MoveMemory__JLorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2I_FUNC, -#endif -#ifndef JNI64 - MoveMemory__ILorg_eclipse_swt_internal_win32_DROPFILES_2I_FUNC, -#else MoveMemory__JLorg_eclipse_swt_internal_win32_DROPFILES_2I_FUNC, -#endif -#ifndef JNI64 - MoveMemory__ILorg_eclipse_swt_internal_win32_GESTURECONFIG_2I_FUNC, -#else MoveMemory__JLorg_eclipse_swt_internal_win32_GESTURECONFIG_2I_FUNC, -#endif -#ifndef JNI64 - MoveMemory__ILorg_eclipse_swt_internal_win32_GRADIENT_1RECT_2I_FUNC, -#else MoveMemory__JLorg_eclipse_swt_internal_win32_GRADIENT_1RECT_2I_FUNC, -#endif -#ifndef JNI64 - MoveMemory__ILorg_eclipse_swt_internal_win32_KEYBDINPUT_2I_FUNC, -#else MoveMemory__JLorg_eclipse_swt_internal_win32_KEYBDINPUT_2I_FUNC, -#endif -#ifndef JNI64 - MoveMemory__ILorg_eclipse_swt_internal_win32_LOGFONT_2I_FUNC, -#else MoveMemory__JLorg_eclipse_swt_internal_win32_LOGFONT_2I_FUNC, -#endif -#ifndef JNI64 - MoveMemory__ILorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2I_FUNC, -#else MoveMemory__JLorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2I_FUNC, -#endif -#ifndef JNI64 - MoveMemory__ILorg_eclipse_swt_internal_win32_MINMAXINFO_2I_FUNC, -#else MoveMemory__JLorg_eclipse_swt_internal_win32_MINMAXINFO_2I_FUNC, -#endif -#ifndef JNI64 - MoveMemory__ILorg_eclipse_swt_internal_win32_MOUSEINPUT_2I_FUNC, -#else MoveMemory__JLorg_eclipse_swt_internal_win32_MOUSEINPUT_2I_FUNC, -#endif -#ifndef JNI64 - MoveMemory__ILorg_eclipse_swt_internal_win32_MSG_2I_FUNC, -#else MoveMemory__JLorg_eclipse_swt_internal_win32_MSG_2I_FUNC, -#endif -#ifndef JNI64 - MoveMemory__ILorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2I_FUNC, -#else MoveMemory__JLorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2I_FUNC, -#endif -#ifndef JNI64 - MoveMemory__ILorg_eclipse_swt_internal_win32_NMLVDISPINFO_2I_FUNC, -#else MoveMemory__JLorg_eclipse_swt_internal_win32_NMLVDISPINFO_2I_FUNC, -#endif -#ifndef JNI64 - MoveMemory__ILorg_eclipse_swt_internal_win32_NMTBCUSTOMDRAW_2I_FUNC, -#else MoveMemory__JLorg_eclipse_swt_internal_win32_NMTBCUSTOMDRAW_2I_FUNC, -#endif -#ifndef JNI64 - MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTDISPINFO_2I_FUNC, -#else MoveMemory__JLorg_eclipse_swt_internal_win32_NMTTDISPINFO_2I_FUNC, -#endif -#ifndef JNI64 - MoveMemory__ILorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2I_FUNC, -#else MoveMemory__JLorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2I_FUNC, -#endif -#ifndef JNI64 - MoveMemory__ILorg_eclipse_swt_internal_win32_NMTVDISPINFO_2I_FUNC, -#else MoveMemory__JLorg_eclipse_swt_internal_win32_NMTVDISPINFO_2I_FUNC, -#endif -#ifndef JNI64 - MoveMemory__ILorg_eclipse_swt_internal_win32_OPENFILENAME_2I_FUNC, -#else MoveMemory__JLorg_eclipse_swt_internal_win32_OPENFILENAME_2I_FUNC, -#endif -#ifndef JNI64 - MoveMemory__ILorg_eclipse_swt_internal_win32_RECT_2I_FUNC, -#else MoveMemory__JLorg_eclipse_swt_internal_win32_RECT_2I_FUNC, -#endif -#ifndef JNI64 - MoveMemory__ILorg_eclipse_swt_internal_win32_SAFEARRAY_2I_FUNC, -#else MoveMemory__JLorg_eclipse_swt_internal_win32_SAFEARRAY_2I_FUNC, -#endif -#ifndef JNI64 - MoveMemory__ILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I_FUNC, -#else MoveMemory__JLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I_FUNC, -#endif -#ifndef JNI64 - MoveMemory__ILorg_eclipse_swt_internal_win32_TRIVERTEX_2I_FUNC, -#else MoveMemory__JLorg_eclipse_swt_internal_win32_TRIVERTEX_2I_FUNC, -#endif -#ifndef JNI64 - MoveMemory__ILorg_eclipse_swt_internal_win32_UDACCEL_2I_FUNC, -#else MoveMemory__JLorg_eclipse_swt_internal_win32_UDACCEL_2I_FUNC, -#endif -#ifndef JNI64 - MoveMemory__ILorg_eclipse_swt_internal_win32_WINDOWPOS_2I_FUNC, -#else MoveMemory__JLorg_eclipse_swt_internal_win32_WINDOWPOS_2I_FUNC, -#endif -#ifndef JNI64 - MoveMemory__I_3BI_FUNC, -#else MoveMemory__J_3BI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__I_3CI_FUNC, -#else MoveMemory__J_3CI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__I_3DI_FUNC, -#else MoveMemory__J_3DI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__I_3FI_FUNC, -#else MoveMemory__J_3FI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__I_3II_FUNC, -#else MoveMemory__J_3II_FUNC, -#endif -#ifndef JNI64 - MoveMemory__I_3JI_FUNC, -#else MoveMemory__J_3JI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__I_3SI_FUNC, -#else MoveMemory__J_3SI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_win32_BITMAPINFOHEADER_2II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_win32_BITMAPINFOHEADER_2JI_FUNC, -#endif MoveMemory__Lorg_eclipse_swt_internal_win32_BITMAPINFOHEADER_2_3BI_FUNC, -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_win32_CERT_1CONTEXT_2II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_win32_CERT_1CONTEXT_2JI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_win32_CERT_1INFO_2II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_win32_CERT_1INFO_2JI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_win32_DEVMODE_2II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_win32_DEVMODE_2JI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2JI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_win32_DRAWITEMSTRUCT_2II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_win32_DRAWITEMSTRUCT_2JI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_win32_EMREXTCREATEFONTINDIRECTW_2II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_win32_EMREXTCREATEFONTINDIRECTW_2JI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_win32_EMR_2II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_win32_EMR_2JI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_win32_FLICK_1DATA_2_3II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_win32_FLICK_1DATA_2_3JI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_win32_FLICK_1POINT_2_3II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_win32_FLICK_1POINT_2_3JI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_win32_HDITEM_2II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_win32_HDITEM_2JI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_win32_HELPINFO_2II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_win32_HELPINFO_2JI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONT_2II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONT_2JI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2JI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_win32_MINMAXINFO_2II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_win32_MINMAXINFO_2JI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_win32_MSG_2II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_win32_MSG_2JI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_win32_NMCUSTOMDRAW_2II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_win32_NMCUSTOMDRAW_2JI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_win32_NMHDR_2II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_win32_NMHDR_2JI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_win32_NMHEADER_2II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_win32_NMHEADER_2JI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_win32_NMLINK_2II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_win32_NMLINK_2JI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_win32_NMLISTVIEW_2II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_win32_NMLISTVIEW_2JI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2JI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVDISPINFO_2II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVDISPINFO_2JI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVODSTATECHANGE_2II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVODSTATECHANGE_2JI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHEVRON_2II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHEVRON_2JI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHILDSIZE_2II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHILDSIZE_2JI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_win32_NMTBCUSTOMDRAW_2II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_win32_NMTBCUSTOMDRAW_2JI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_win32_NMTBHOTITEM_2II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_win32_NMTBHOTITEM_2JI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_win32_NMTOOLBAR_2II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_win32_NMTOOLBAR_2JI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_win32_NMTREEVIEW_2II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_win32_NMTREEVIEW_2JI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTCUSTOMDRAW_2II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTCUSTOMDRAW_2JI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFO_2II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFO_2JI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2JI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVDISPINFO_2II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVDISPINFO_2JI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVITEMCHANGE_2II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVITEMCHANGE_2JI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_win32_NMUPDOWN_2II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_win32_NMUPDOWN_2JI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_win32_OFNOTIFY_2II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_win32_OFNOTIFY_2JI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_win32_OPENFILENAME_2II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_win32_OPENFILENAME_2JI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_win32_POINT_2II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_win32_POINT_2JI_FUNC, -#endif MoveMemory__Lorg_eclipse_swt_internal_win32_POINT_2_3JI_FUNC, -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_win32_SAFEARRAY_2II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_win32_SAFEARRAY_2JI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1ITEM_2II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1ITEM_2JI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1LOGATTR_2II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1LOGATTR_2JI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1PROPERTIES_2II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1PROPERTIES_2JI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRIC_2II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRIC_2JI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_win32_TOUCHINPUT_2II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_win32_TOUCHINPUT_2JI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_win32_UDACCEL_2II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_win32_UDACCEL_2JI_FUNC, -#endif -#ifndef JNI64 - MoveMemory__Lorg_eclipse_swt_internal_win32_WINDOWPOS_2II_FUNC, -#else MoveMemory__Lorg_eclipse_swt_internal_win32_WINDOWPOS_2JI_FUNC, -#endif -#ifndef JNI64 - MoveMemory___3BII_FUNC, -#else MoveMemory___3BJI_FUNC, -#endif MoveMemory___3BLorg_eclipse_swt_internal_win32_ACCEL_2I_FUNC, MoveMemory___3BLorg_eclipse_swt_internal_win32_BITMAPINFOHEADER_2I_FUNC, -#ifndef JNI64 - MoveMemory___3CII_FUNC, -#else MoveMemory___3CJI_FUNC, -#endif -#ifndef JNI64 - MoveMemory___3DII_FUNC, -#else MoveMemory___3DJI_FUNC, -#endif -#ifndef JNI64 - MoveMemory___3FII_FUNC, -#else MoveMemory___3FJI_FUNC, -#endif -#ifndef JNI64 - MoveMemory___3III_FUNC, -#else MoveMemory___3IJI_FUNC, -#endif -#ifndef JNI64 - MoveMemory___3JII_FUNC, -#else MoveMemory___3JJI_FUNC, -#endif -#ifndef JNI64 - MoveMemory___3SII_FUNC, -#else MoveMemory___3SJI_FUNC, -#endif MoveToEx_FUNC, -#ifndef JNI64 - MultiByteToWideChar__IIII_3CI_FUNC, -#else MultiByteToWideChar__IIJI_3CI_FUNC, -#endif MultiByteToWideChar__II_3BI_3CI_FUNC, NMCUSTOMDRAW_1sizeof_FUNC, NMHDR_1sizeof_FUNC, @@ -979,16 +579,8 @@ typedef enum { RegDeleteValue_FUNC, RegEnumKeyEx_FUNC, RegOpenKeyEx_FUNC, -#ifndef JNI64 - RegQueryValueEx__I_3CI_3I_3C_3I_FUNC, -#else RegQueryValueEx__J_3CJ_3I_3C_3I_FUNC, -#endif -#ifndef JNI64 - RegQueryValueEx__I_3CI_3I_3I_3I_FUNC, -#else RegQueryValueEx__J_3CJ_3I_3I_3I_FUNC, -#endif RegSetValueEx_FUNC, RegisterClass_FUNC, RegisterClipboardFormat_FUNC, @@ -1053,156 +645,36 @@ typedef enum { SelectClipRgn_FUNC, SelectObject_FUNC, SendInput_FUNC, -#ifndef JNI64 - SendMessage__IIII_FUNC, -#else SendMessage__JIJJ_FUNC, -#endif -#ifndef JNI64 - SendMessage__IIILorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2_FUNC, -#else SendMessage__JIJLorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2_FUNC, -#endif -#ifndef JNI64 - SendMessage__IIILorg_eclipse_swt_internal_win32_HDHITTESTINFO_2_FUNC, -#else SendMessage__JIJLorg_eclipse_swt_internal_win32_HDHITTESTINFO_2_FUNC, -#endif -#ifndef JNI64 - SendMessage__IIILorg_eclipse_swt_internal_win32_HDITEM_2_FUNC, -#else SendMessage__JIJLorg_eclipse_swt_internal_win32_HDITEM_2_FUNC, -#endif -#ifndef JNI64 - SendMessage__IIILorg_eclipse_swt_internal_win32_HDLAYOUT_2_FUNC, -#else SendMessage__JIJLorg_eclipse_swt_internal_win32_HDLAYOUT_2_FUNC, -#endif -#ifndef JNI64 - SendMessage__IIILorg_eclipse_swt_internal_win32_LITEM_2_FUNC, -#else SendMessage__JIJLorg_eclipse_swt_internal_win32_LITEM_2_FUNC, -#endif -#ifndef JNI64 - SendMessage__IIILorg_eclipse_swt_internal_win32_LVCOLUMN_2_FUNC, -#else SendMessage__JIJLorg_eclipse_swt_internal_win32_LVCOLUMN_2_FUNC, -#endif -#ifndef JNI64 - SendMessage__IIILorg_eclipse_swt_internal_win32_LVHITTESTINFO_2_FUNC, -#else SendMessage__JIJLorg_eclipse_swt_internal_win32_LVHITTESTINFO_2_FUNC, -#endif -#ifndef JNI64 - SendMessage__IIILorg_eclipse_swt_internal_win32_LVINSERTMARK_2_FUNC, -#else SendMessage__JIJLorg_eclipse_swt_internal_win32_LVINSERTMARK_2_FUNC, -#endif -#ifndef JNI64 - SendMessage__IIILorg_eclipse_swt_internal_win32_LVITEM_2_FUNC, -#else SendMessage__JIJLorg_eclipse_swt_internal_win32_LVITEM_2_FUNC, -#endif -#ifndef JNI64 - SendMessage__IIILorg_eclipse_swt_internal_win32_MARGINS_2_FUNC, -#else SendMessage__JIJLorg_eclipse_swt_internal_win32_MARGINS_2_FUNC, -#endif -#ifndef JNI64 - SendMessage__IIILorg_eclipse_swt_internal_win32_MCHITTESTINFO_2_FUNC, -#else SendMessage__JIJLorg_eclipse_swt_internal_win32_MCHITTESTINFO_2_FUNC, -#endif -#ifndef JNI64 - SendMessage__IIILorg_eclipse_swt_internal_win32_REBARBANDINFO_2_FUNC, -#else SendMessage__JIJLorg_eclipse_swt_internal_win32_REBARBANDINFO_2_FUNC, -#endif -#ifndef JNI64 - SendMessage__IIILorg_eclipse_swt_internal_win32_RECT_2_FUNC, -#else SendMessage__JIJLorg_eclipse_swt_internal_win32_RECT_2_FUNC, -#endif -#ifndef JNI64 - SendMessage__IIILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2_FUNC, -#else SendMessage__JIJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2_FUNC, -#endif -#ifndef JNI64 - SendMessage__IIILorg_eclipse_swt_internal_win32_SIZE_2_FUNC, -#else SendMessage__JIJLorg_eclipse_swt_internal_win32_SIZE_2_FUNC, -#endif -#ifndef JNI64 - SendMessage__IIILorg_eclipse_swt_internal_win32_SYSTEMTIME_2_FUNC, -#else SendMessage__JIJLorg_eclipse_swt_internal_win32_SYSTEMTIME_2_FUNC, -#endif -#ifndef JNI64 - SendMessage__IIILorg_eclipse_swt_internal_win32_TBBUTTONINFO_2_FUNC, -#else SendMessage__JIJLorg_eclipse_swt_internal_win32_TBBUTTONINFO_2_FUNC, -#endif -#ifndef JNI64 - SendMessage__IIILorg_eclipse_swt_internal_win32_TBBUTTON_2_FUNC, -#else SendMessage__JIJLorg_eclipse_swt_internal_win32_TBBUTTON_2_FUNC, -#endif -#ifndef JNI64 - SendMessage__IIILorg_eclipse_swt_internal_win32_TCHITTESTINFO_2_FUNC, -#else SendMessage__JIJLorg_eclipse_swt_internal_win32_TCHITTESTINFO_2_FUNC, -#endif -#ifndef JNI64 - SendMessage__IIILorg_eclipse_swt_internal_win32_TCITEM_2_FUNC, -#else SendMessage__JIJLorg_eclipse_swt_internal_win32_TCITEM_2_FUNC, -#endif -#ifndef JNI64 - SendMessage__IIILorg_eclipse_swt_internal_win32_TOOLINFO_2_FUNC, -#else SendMessage__JIJLorg_eclipse_swt_internal_win32_TOOLINFO_2_FUNC, -#endif -#ifndef JNI64 - SendMessage__IIILorg_eclipse_swt_internal_win32_TVHITTESTINFO_2_FUNC, -#else SendMessage__JIJLorg_eclipse_swt_internal_win32_TVHITTESTINFO_2_FUNC, -#endif -#ifndef JNI64 - SendMessage__IIILorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2_FUNC, -#else SendMessage__JIJLorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2_FUNC, -#endif -#ifndef JNI64 - SendMessage__IIILorg_eclipse_swt_internal_win32_TVITEM_2_FUNC, -#else SendMessage__JIJLorg_eclipse_swt_internal_win32_TVITEM_2_FUNC, -#endif -#ifndef JNI64 - SendMessage__IIILorg_eclipse_swt_internal_win32_TVSORTCB_2_FUNC, -#else SendMessage__JIJLorg_eclipse_swt_internal_win32_TVSORTCB_2_FUNC, -#endif -#ifndef JNI64 - SendMessage__IIILorg_eclipse_swt_internal_win32_UDACCEL_2_FUNC, -#else SendMessage__JIJLorg_eclipse_swt_internal_win32_UDACCEL_2_FUNC, -#endif -#ifndef JNI64 - SendMessage__III_3C_FUNC, -#else SendMessage__JIJ_3C_FUNC, -#endif -#ifndef JNI64 - SendMessage__III_3I_FUNC, -#else SendMessage__JIJ_3I_FUNC, -#endif -#ifndef JNI64 - SendMessage__II_3I_3I_FUNC, -#else SendMessage__JI_3I_3I_FUNC, -#endif SetActiveWindow_FUNC, SetBkColor_FUNC, SetBkMode_FUNC, @@ -1296,200 +768,48 @@ typedef enum { UrlCreateFromPath_FUNC, ValidateRect_FUNC, VkKeyScan_FUNC, -#ifndef JNI64 - VtblCall__II_FUNC, -#else VtblCall__IJ_FUNC, -#endif -#ifndef JNI64 - VtblCall__III_FUNC, -#else 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, -#endif -#ifndef JNI64 - VtblCall__IIII_3C_3CI_FUNC, -#else VtblCall__IJII_3C_3CI_FUNC, -#endif -#ifndef JNI64 - VtblCall__IIIJ_FUNC, -#else VtblCall__IJIJ_FUNC, -#endif -#ifndef JNI64 - VtblCall__IIIJI_3J_FUNC, -#else VtblCall__IJIJI_3J_FUNC, -#endif -#ifndef JNI64 - VtblCall__IIIJJ_FUNC, -#else VtblCall__IJIJJ_FUNC, -#endif -#ifndef JNI64 - VtblCall__III_3I_FUNC, -#else 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, -#endif -#ifndef JNI64 - VtblCall__IIJ_FUNC, -#else + VtblCall__IJI_3J_3I_FUNC, VtblCall__IJJ_FUNC, -#endif -#ifndef JNI64 - VtblCall__IIJI_FUNC, -#else 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, -#endif -#ifndef JNI64 - VtblCall__IIJI_3C_3CJ_FUNC, -#else VtblCall__IJJI_3C_3CJ_FUNC, -#endif -#ifndef JNI64 - VtblCall__IIJJ_FUNC, -#else VtblCall__IJJJ_FUNC, -#endif -#ifndef JNI64 - VtblCall__IIJJI_3J_FUNC, -#else VtblCall__IJJJI_3J_FUNC, -#endif -#ifndef JNI64 - VtblCall__IIJJJ_FUNC, -#else VtblCall__IJJJJ_FUNC, -#endif -#ifndef JNI64 - VtblCall__IIJ_3I_FUNC, -#else VtblCall__IJJ_3I_FUNC, -#endif -#ifndef JNI64 - VtblCall__IIJ_3I_3I_FUNC, -#else VtblCall__IJJ_3I_3I_FUNC, -#endif -#ifndef JNI64 - VtblCall__IIJ_3J_3J_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, -#endif -#ifndef JNI64 - VtblCall__IILorg_eclipse_swt_internal_win32_PROPERTYKEY_2J_FUNC, -#else VtblCall__IJLorg_eclipse_swt_internal_win32_PROPERTYKEY_2J_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, -#endif -#ifndef JNI64 - VtblCall__IIS_3B_3B_3B_FUNC, -#else VtblCall__IJS_3B_3B_3B_FUNC, -#endif -#ifndef JNI64 - VtblCall__II_3B_3I_FUNC, -#else VtblCall__IJ_3B_3I_FUNC, -#endif -#ifndef JNI64 - VtblCall__II_3B_3J_FUNC, -#else VtblCall__IJ_3B_3J_FUNC, -#endif -#ifndef JNI64 - VtblCall__II_3C_FUNC, -#else VtblCall__IJ_3C_FUNC, -#endif -#ifndef JNI64 - VtblCall__II_3CI_FUNC, -#else VtblCall__IJ_3CI_FUNC, -#endif -#ifndef JNI64 - VtblCall__II_3CII_3I_3I_FUNC, -#else VtblCall__IJ_3CII_3I_3I_FUNC, -#endif -#ifndef JNI64 - VtblCall__II_3CJ_FUNC, -#else VtblCall__IJ_3CJ_FUNC, -#endif -#ifndef JNI64 - VtblCall__II_3I_FUNC, -#else VtblCall__IJ_3I_FUNC, -#endif -#ifndef JNI64 - VtblCall__II_3I_3B_3I_FUNC, -#else VtblCall__IJ_3I_3B_3I_FUNC, -#endif -#ifndef JNI64 - VtblCall__II_3I_3B_3J_FUNC, -#else VtblCall__IJ_3I_3B_3J_FUNC, -#endif -#ifndef JNI64 - VtblCall__II_3J_FUNC, -#else VtblCall__IJ_3J_FUNC, -#endif WINDOWPLACEMENT_1sizeof_FUNC, WINDOWPOS_1sizeof_FUNC, WNDCLASS_1sizeof_FUNC, WaitMessage_FUNC, -#ifndef JNI64 - WideCharToMultiByte__II_3CIII_3B_3Z_FUNC, -#else WideCharToMultiByte__II_3CIJI_3B_3Z_FUNC, -#endif WideCharToMultiByte__II_3CI_3BI_3B_3Z_FUNC, WindowFromDC_FUNC, WindowFromPoint_FUNC, diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_structs.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_structs.c index 0f420fa214..0e58a96622 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_structs.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_structs.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2018 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -70,13 +70,13 @@ void cacheACTCTXFields(JNIEnv *env, jobject lpObject) ACTCTXFc.clazz = (*env)->GetObjectClass(env, lpObject); ACTCTXFc.cbSize = (*env)->GetFieldID(env, ACTCTXFc.clazz, "cbSize", "I"); ACTCTXFc.dwFlags = (*env)->GetFieldID(env, ACTCTXFc.clazz, "dwFlags", "I"); - ACTCTXFc.lpSource = (*env)->GetFieldID(env, ACTCTXFc.clazz, "lpSource", I_J); + ACTCTXFc.lpSource = (*env)->GetFieldID(env, ACTCTXFc.clazz, "lpSource", "J"); ACTCTXFc.wProcessorArchitecture = (*env)->GetFieldID(env, ACTCTXFc.clazz, "wProcessorArchitecture", "S"); ACTCTXFc.wLangId = (*env)->GetFieldID(env, ACTCTXFc.clazz, "wLangId", "S"); - ACTCTXFc.lpAssemblyDirectory = (*env)->GetFieldID(env, ACTCTXFc.clazz, "lpAssemblyDirectory", I_J); - ACTCTXFc.lpResourceName = (*env)->GetFieldID(env, ACTCTXFc.clazz, "lpResourceName", I_J); - ACTCTXFc.lpApplicationName = (*env)->GetFieldID(env, ACTCTXFc.clazz, "lpApplicationName", I_J); - ACTCTXFc.hModule = (*env)->GetFieldID(env, ACTCTXFc.clazz, "hModule", I_J); + ACTCTXFc.lpAssemblyDirectory = (*env)->GetFieldID(env, ACTCTXFc.clazz, "lpAssemblyDirectory", "J"); + ACTCTXFc.lpResourceName = (*env)->GetFieldID(env, ACTCTXFc.clazz, "lpResourceName", "J"); + ACTCTXFc.lpApplicationName = (*env)->GetFieldID(env, ACTCTXFc.clazz, "lpApplicationName", "J"); + ACTCTXFc.hModule = (*env)->GetFieldID(env, ACTCTXFc.clazz, "hModule", "J"); ACTCTXFc.cached = 1; } @@ -85,13 +85,13 @@ ACTCTX *getACTCTXFields(JNIEnv *env, jobject lpObject, ACTCTX *lpStruct) if (!ACTCTXFc.cached) cacheACTCTXFields(env, lpObject); lpStruct->cbSize = (*env)->GetIntField(env, lpObject, ACTCTXFc.cbSize); lpStruct->dwFlags = (*env)->GetIntField(env, lpObject, ACTCTXFc.dwFlags); - lpStruct->lpSource = (LPCTSTR)(*env)->GetIntLongField(env, lpObject, ACTCTXFc.lpSource); + lpStruct->lpSource = (LPCTSTR)(*env)->GetLongField(env, lpObject, ACTCTXFc.lpSource); lpStruct->wProcessorArchitecture = (*env)->GetShortField(env, lpObject, ACTCTXFc.wProcessorArchitecture); lpStruct->wLangId = (*env)->GetShortField(env, lpObject, ACTCTXFc.wLangId); - lpStruct->lpAssemblyDirectory = (LPCTSTR)(*env)->GetIntLongField(env, lpObject, ACTCTXFc.lpAssemblyDirectory); - lpStruct->lpResourceName = (LPCTSTR)(*env)->GetIntLongField(env, lpObject, ACTCTXFc.lpResourceName); - lpStruct->lpApplicationName = (LPCTSTR)(*env)->GetIntLongField(env, lpObject, ACTCTXFc.lpApplicationName); - lpStruct->hModule = (HMODULE)(*env)->GetIntLongField(env, lpObject, ACTCTXFc.hModule); + lpStruct->lpAssemblyDirectory = (LPCTSTR)(*env)->GetLongField(env, lpObject, ACTCTXFc.lpAssemblyDirectory); + lpStruct->lpResourceName = (LPCTSTR)(*env)->GetLongField(env, lpObject, ACTCTXFc.lpResourceName); + lpStruct->lpApplicationName = (LPCTSTR)(*env)->GetLongField(env, lpObject, ACTCTXFc.lpApplicationName); + lpStruct->hModule = (HMODULE)(*env)->GetLongField(env, lpObject, ACTCTXFc.hModule); return lpStruct; } @@ -100,13 +100,13 @@ void setACTCTXFields(JNIEnv *env, jobject lpObject, ACTCTX *lpStruct) if (!ACTCTXFc.cached) cacheACTCTXFields(env, lpObject); (*env)->SetIntField(env, lpObject, ACTCTXFc.cbSize, (jint)lpStruct->cbSize); (*env)->SetIntField(env, lpObject, ACTCTXFc.dwFlags, (jint)lpStruct->dwFlags); - (*env)->SetIntLongField(env, lpObject, ACTCTXFc.lpSource, (jintLong)lpStruct->lpSource); + (*env)->SetLongField(env, lpObject, ACTCTXFc.lpSource, (jlong)lpStruct->lpSource); (*env)->SetShortField(env, lpObject, ACTCTXFc.wProcessorArchitecture, (jshort)lpStruct->wProcessorArchitecture); (*env)->SetShortField(env, lpObject, ACTCTXFc.wLangId, (jshort)lpStruct->wLangId); - (*env)->SetIntLongField(env, lpObject, ACTCTXFc.lpAssemblyDirectory, (jintLong)lpStruct->lpAssemblyDirectory); - (*env)->SetIntLongField(env, lpObject, ACTCTXFc.lpResourceName, (jintLong)lpStruct->lpResourceName); - (*env)->SetIntLongField(env, lpObject, ACTCTXFc.lpApplicationName, (jintLong)lpStruct->lpApplicationName); - (*env)->SetIntLongField(env, lpObject, ACTCTXFc.hModule, (jintLong)lpStruct->hModule); + (*env)->SetLongField(env, lpObject, ACTCTXFc.lpAssemblyDirectory, (jlong)lpStruct->lpAssemblyDirectory); + (*env)->SetLongField(env, lpObject, ACTCTXFc.lpResourceName, (jlong)lpStruct->lpResourceName); + (*env)->SetLongField(env, lpObject, ACTCTXFc.lpApplicationName, (jlong)lpStruct->lpApplicationName); + (*env)->SetLongField(env, lpObject, ACTCTXFc.hModule, (jlong)lpStruct->hModule); } #endif @@ -129,7 +129,7 @@ void cacheBITMAPFields(JNIEnv *env, jobject lpObject) BITMAPFc.bmWidthBytes = (*env)->GetFieldID(env, BITMAPFc.clazz, "bmWidthBytes", "I"); BITMAPFc.bmPlanes = (*env)->GetFieldID(env, BITMAPFc.clazz, "bmPlanes", "S"); BITMAPFc.bmBitsPixel = (*env)->GetFieldID(env, BITMAPFc.clazz, "bmBitsPixel", "S"); - BITMAPFc.bmBits = (*env)->GetFieldID(env, BITMAPFc.clazz, "bmBits", I_J); + BITMAPFc.bmBits = (*env)->GetFieldID(env, BITMAPFc.clazz, "bmBits", "J"); BITMAPFc.cached = 1; } @@ -142,7 +142,7 @@ BITMAP *getBITMAPFields(JNIEnv *env, jobject lpObject, BITMAP *lpStruct) lpStruct->bmWidthBytes = (*env)->GetIntField(env, lpObject, BITMAPFc.bmWidthBytes); lpStruct->bmPlanes = (*env)->GetShortField(env, lpObject, BITMAPFc.bmPlanes); lpStruct->bmBitsPixel = (*env)->GetShortField(env, lpObject, BITMAPFc.bmBitsPixel); - lpStruct->bmBits = (LPVOID)(*env)->GetIntLongField(env, lpObject, BITMAPFc.bmBits); + lpStruct->bmBits = (LPVOID)(*env)->GetLongField(env, lpObject, BITMAPFc.bmBits); return lpStruct; } @@ -155,7 +155,7 @@ void setBITMAPFields(JNIEnv *env, jobject lpObject, BITMAP *lpStruct) (*env)->SetIntField(env, lpObject, BITMAPFc.bmWidthBytes, (jint)lpStruct->bmWidthBytes); (*env)->SetShortField(env, lpObject, BITMAPFc.bmPlanes, (jshort)lpStruct->bmPlanes); (*env)->SetShortField(env, lpObject, BITMAPFc.bmBitsPixel, (jshort)lpStruct->bmBitsPixel); - (*env)->SetIntLongField(env, lpObject, BITMAPFc.bmBits, (jintLong)lpStruct->bmBits); + (*env)->SetLongField(env, lpObject, BITMAPFc.bmBits, (jlong)lpStruct->bmBits); } #endif @@ -275,8 +275,8 @@ void cacheBP_PAINTPARAMSFields(JNIEnv *env, jobject lpObject) BP_PAINTPARAMSFc.clazz = (*env)->GetObjectClass(env, lpObject); BP_PAINTPARAMSFc.cbSize = (*env)->GetFieldID(env, BP_PAINTPARAMSFc.clazz, "cbSize", "I"); BP_PAINTPARAMSFc.dwFlags = (*env)->GetFieldID(env, BP_PAINTPARAMSFc.clazz, "dwFlags", "I"); - BP_PAINTPARAMSFc.prcExclude = (*env)->GetFieldID(env, BP_PAINTPARAMSFc.clazz, "prcExclude", I_J); - BP_PAINTPARAMSFc.pBlendFunction = (*env)->GetFieldID(env, BP_PAINTPARAMSFc.clazz, "pBlendFunction", I_J); + BP_PAINTPARAMSFc.prcExclude = (*env)->GetFieldID(env, BP_PAINTPARAMSFc.clazz, "prcExclude", "J"); + BP_PAINTPARAMSFc.pBlendFunction = (*env)->GetFieldID(env, BP_PAINTPARAMSFc.clazz, "pBlendFunction", "J"); BP_PAINTPARAMSFc.cached = 1; } @@ -285,8 +285,8 @@ BP_PAINTPARAMS *getBP_PAINTPARAMSFields(JNIEnv *env, jobject lpObject, BP_PAINTP if (!BP_PAINTPARAMSFc.cached) cacheBP_PAINTPARAMSFields(env, lpObject); lpStruct->cbSize = (*env)->GetIntField(env, lpObject, BP_PAINTPARAMSFc.cbSize); lpStruct->dwFlags = (*env)->GetIntField(env, lpObject, BP_PAINTPARAMSFc.dwFlags); - lpStruct->prcExclude = (RECT*)(*env)->GetIntLongField(env, lpObject, BP_PAINTPARAMSFc.prcExclude); - lpStruct->pBlendFunction = (BLENDFUNCTION*)(*env)->GetIntLongField(env, lpObject, BP_PAINTPARAMSFc.pBlendFunction); + lpStruct->prcExclude = (RECT*)(*env)->GetLongField(env, lpObject, BP_PAINTPARAMSFc.prcExclude); + lpStruct->pBlendFunction = (BLENDFUNCTION*)(*env)->GetLongField(env, lpObject, BP_PAINTPARAMSFc.pBlendFunction); return lpStruct; } @@ -295,8 +295,8 @@ void setBP_PAINTPARAMSFields(JNIEnv *env, jobject lpObject, BP_PAINTPARAMS *lpSt if (!BP_PAINTPARAMSFc.cached) cacheBP_PAINTPARAMSFields(env, lpObject); (*env)->SetIntField(env, lpObject, BP_PAINTPARAMSFc.cbSize, (jint)lpStruct->cbSize); (*env)->SetIntField(env, lpObject, BP_PAINTPARAMSFc.dwFlags, (jint)lpStruct->dwFlags); - (*env)->SetIntLongField(env, lpObject, BP_PAINTPARAMSFc.prcExclude, (jintLong)lpStruct->prcExclude); - (*env)->SetIntLongField(env, lpObject, BP_PAINTPARAMSFc.pBlendFunction, (jintLong)lpStruct->pBlendFunction); + (*env)->SetLongField(env, lpObject, BP_PAINTPARAMSFc.prcExclude, (jlong)lpStruct->prcExclude); + (*env)->SetLongField(env, lpObject, BP_PAINTPARAMSFc.pBlendFunction, (jlong)lpStruct->pBlendFunction); } #endif @@ -313,13 +313,13 @@ void cacheBROWSEINFOFields(JNIEnv *env, jobject lpObject) { if (BROWSEINFOFc.cached) return; BROWSEINFOFc.clazz = (*env)->GetObjectClass(env, lpObject); - BROWSEINFOFc.hwndOwner = (*env)->GetFieldID(env, BROWSEINFOFc.clazz, "hwndOwner", I_J); - BROWSEINFOFc.pidlRoot = (*env)->GetFieldID(env, BROWSEINFOFc.clazz, "pidlRoot", I_J); - BROWSEINFOFc.pszDisplayName = (*env)->GetFieldID(env, BROWSEINFOFc.clazz, "pszDisplayName", I_J); - BROWSEINFOFc.lpszTitle = (*env)->GetFieldID(env, BROWSEINFOFc.clazz, "lpszTitle", I_J); + BROWSEINFOFc.hwndOwner = (*env)->GetFieldID(env, BROWSEINFOFc.clazz, "hwndOwner", "J"); + BROWSEINFOFc.pidlRoot = (*env)->GetFieldID(env, BROWSEINFOFc.clazz, "pidlRoot", "J"); + BROWSEINFOFc.pszDisplayName = (*env)->GetFieldID(env, BROWSEINFOFc.clazz, "pszDisplayName", "J"); + BROWSEINFOFc.lpszTitle = (*env)->GetFieldID(env, BROWSEINFOFc.clazz, "lpszTitle", "J"); BROWSEINFOFc.ulFlags = (*env)->GetFieldID(env, BROWSEINFOFc.clazz, "ulFlags", "I"); - BROWSEINFOFc.lpfn = (*env)->GetFieldID(env, BROWSEINFOFc.clazz, "lpfn", I_J); - BROWSEINFOFc.lParam = (*env)->GetFieldID(env, BROWSEINFOFc.clazz, "lParam", I_J); + BROWSEINFOFc.lpfn = (*env)->GetFieldID(env, BROWSEINFOFc.clazz, "lpfn", "J"); + BROWSEINFOFc.lParam = (*env)->GetFieldID(env, BROWSEINFOFc.clazz, "lParam", "J"); BROWSEINFOFc.iImage = (*env)->GetFieldID(env, BROWSEINFOFc.clazz, "iImage", "I"); BROWSEINFOFc.cached = 1; } @@ -327,13 +327,13 @@ void cacheBROWSEINFOFields(JNIEnv *env, jobject lpObject) BROWSEINFO *getBROWSEINFOFields(JNIEnv *env, jobject lpObject, BROWSEINFO *lpStruct) { if (!BROWSEINFOFc.cached) cacheBROWSEINFOFields(env, lpObject); - lpStruct->hwndOwner = (HWND)(*env)->GetIntLongField(env, lpObject, BROWSEINFOFc.hwndOwner); - lpStruct->pidlRoot = (LPCITEMIDLIST)(*env)->GetIntLongField(env, lpObject, BROWSEINFOFc.pidlRoot); - lpStruct->pszDisplayName = (LPTSTR)(*env)->GetIntLongField(env, lpObject, BROWSEINFOFc.pszDisplayName); - lpStruct->lpszTitle = (LPCTSTR)(*env)->GetIntLongField(env, lpObject, BROWSEINFOFc.lpszTitle); + lpStruct->hwndOwner = (HWND)(*env)->GetLongField(env, lpObject, BROWSEINFOFc.hwndOwner); + lpStruct->pidlRoot = (LPCITEMIDLIST)(*env)->GetLongField(env, lpObject, BROWSEINFOFc.pidlRoot); + lpStruct->pszDisplayName = (LPTSTR)(*env)->GetLongField(env, lpObject, BROWSEINFOFc.pszDisplayName); + lpStruct->lpszTitle = (LPCTSTR)(*env)->GetLongField(env, lpObject, BROWSEINFOFc.lpszTitle); lpStruct->ulFlags = (*env)->GetIntField(env, lpObject, BROWSEINFOFc.ulFlags); - lpStruct->lpfn = (BFFCALLBACK)(*env)->GetIntLongField(env, lpObject, BROWSEINFOFc.lpfn); - lpStruct->lParam = (*env)->GetIntLongField(env, lpObject, BROWSEINFOFc.lParam); + lpStruct->lpfn = (BFFCALLBACK)(*env)->GetLongField(env, lpObject, BROWSEINFOFc.lpfn); + lpStruct->lParam = (*env)->GetLongField(env, lpObject, BROWSEINFOFc.lParam); lpStruct->iImage = (*env)->GetIntField(env, lpObject, BROWSEINFOFc.iImage); return lpStruct; } @@ -341,13 +341,13 @@ BROWSEINFO *getBROWSEINFOFields(JNIEnv *env, jobject lpObject, BROWSEINFO *lpStr void setBROWSEINFOFields(JNIEnv *env, jobject lpObject, BROWSEINFO *lpStruct) { if (!BROWSEINFOFc.cached) cacheBROWSEINFOFields(env, lpObject); - (*env)->SetIntLongField(env, lpObject, BROWSEINFOFc.hwndOwner, (jintLong)lpStruct->hwndOwner); - (*env)->SetIntLongField(env, lpObject, BROWSEINFOFc.pidlRoot, (jintLong)lpStruct->pidlRoot); - (*env)->SetIntLongField(env, lpObject, BROWSEINFOFc.pszDisplayName, (jintLong)lpStruct->pszDisplayName); - (*env)->SetIntLongField(env, lpObject, BROWSEINFOFc.lpszTitle, (jintLong)lpStruct->lpszTitle); + (*env)->SetLongField(env, lpObject, BROWSEINFOFc.hwndOwner, (jlong)lpStruct->hwndOwner); + (*env)->SetLongField(env, lpObject, BROWSEINFOFc.pidlRoot, (jlong)lpStruct->pidlRoot); + (*env)->SetLongField(env, lpObject, BROWSEINFOFc.pszDisplayName, (jlong)lpStruct->pszDisplayName); + (*env)->SetLongField(env, lpObject, BROWSEINFOFc.lpszTitle, (jlong)lpStruct->lpszTitle); (*env)->SetIntField(env, lpObject, BROWSEINFOFc.ulFlags, (jint)lpStruct->ulFlags); - (*env)->SetIntLongField(env, lpObject, BROWSEINFOFc.lpfn, (jintLong)lpStruct->lpfn); - (*env)->SetIntLongField(env, lpObject, BROWSEINFOFc.lParam, (jintLong)lpStruct->lParam); + (*env)->SetLongField(env, lpObject, BROWSEINFOFc.lpfn, (jlong)lpStruct->lpfn); + (*env)->SetLongField(env, lpObject, BROWSEINFOFc.lParam, (jlong)lpStruct->lParam); (*env)->SetIntField(env, lpObject, BROWSEINFOFc.iImage, (jint)lpStruct->iImage); } #endif @@ -365,7 +365,7 @@ void cacheBUTTON_IMAGELISTFields(JNIEnv *env, jobject lpObject) { if (BUTTON_IMAGELISTFc.cached) return; BUTTON_IMAGELISTFc.clazz = (*env)->GetObjectClass(env, lpObject); - BUTTON_IMAGELISTFc.himl = (*env)->GetFieldID(env, BUTTON_IMAGELISTFc.clazz, "himl", I_J); + BUTTON_IMAGELISTFc.himl = (*env)->GetFieldID(env, BUTTON_IMAGELISTFc.clazz, "himl", "J"); BUTTON_IMAGELISTFc.margin_left = (*env)->GetFieldID(env, BUTTON_IMAGELISTFc.clazz, "margin_left", "I"); BUTTON_IMAGELISTFc.margin_top = (*env)->GetFieldID(env, BUTTON_IMAGELISTFc.clazz, "margin_top", "I"); BUTTON_IMAGELISTFc.margin_right = (*env)->GetFieldID(env, BUTTON_IMAGELISTFc.clazz, "margin_right", "I"); @@ -377,7 +377,7 @@ void cacheBUTTON_IMAGELISTFields(JNIEnv *env, jobject lpObject) BUTTON_IMAGELIST *getBUTTON_IMAGELISTFields(JNIEnv *env, jobject lpObject, BUTTON_IMAGELIST *lpStruct) { if (!BUTTON_IMAGELISTFc.cached) cacheBUTTON_IMAGELISTFields(env, lpObject); - lpStruct->himl = (HIMAGELIST)(*env)->GetIntLongField(env, lpObject, BUTTON_IMAGELISTFc.himl); + lpStruct->himl = (HIMAGELIST)(*env)->GetLongField(env, lpObject, BUTTON_IMAGELISTFc.himl); lpStruct->margin.left = (LONG)(*env)->GetIntField(env, lpObject, BUTTON_IMAGELISTFc.margin_left); lpStruct->margin.top = (LONG)(*env)->GetIntField(env, lpObject, BUTTON_IMAGELISTFc.margin_top); lpStruct->margin.right = (LONG)(*env)->GetIntField(env, lpObject, BUTTON_IMAGELISTFc.margin_right); @@ -389,7 +389,7 @@ BUTTON_IMAGELIST *getBUTTON_IMAGELISTFields(JNIEnv *env, jobject lpObject, BUTTO void setBUTTON_IMAGELISTFields(JNIEnv *env, jobject lpObject, BUTTON_IMAGELIST *lpStruct) { if (!BUTTON_IMAGELISTFc.cached) cacheBUTTON_IMAGELISTFields(env, lpObject); - (*env)->SetIntLongField(env, lpObject, BUTTON_IMAGELISTFc.himl, (jintLong)lpStruct->himl); + (*env)->SetLongField(env, lpObject, BUTTON_IMAGELISTFc.himl, (jlong)lpStruct->himl); (*env)->SetIntField(env, lpObject, BUTTON_IMAGELISTFc.margin_left, (jint)lpStruct->margin.left); (*env)->SetIntField(env, lpObject, BUTTON_IMAGELISTFc.margin_top, (jint)lpStruct->margin.top); (*env)->SetIntField(env, lpObject, BUTTON_IMAGELISTFc.margin_right, (jint)lpStruct->margin.right); @@ -464,10 +464,10 @@ void cacheCERT_CONTEXTFields(JNIEnv *env, jobject lpObject) if (CERT_CONTEXTFc.cached) return; CERT_CONTEXTFc.clazz = (*env)->GetObjectClass(env, lpObject); CERT_CONTEXTFc.dwCertEncodingType = (*env)->GetFieldID(env, CERT_CONTEXTFc.clazz, "dwCertEncodingType", "I"); - CERT_CONTEXTFc.pbCertEncoded = (*env)->GetFieldID(env, CERT_CONTEXTFc.clazz, "pbCertEncoded", I_J); + CERT_CONTEXTFc.pbCertEncoded = (*env)->GetFieldID(env, CERT_CONTEXTFc.clazz, "pbCertEncoded", "J"); CERT_CONTEXTFc.cbCertEncoded = (*env)->GetFieldID(env, CERT_CONTEXTFc.clazz, "cbCertEncoded", "I"); - CERT_CONTEXTFc.pCertInfo = (*env)->GetFieldID(env, CERT_CONTEXTFc.clazz, "pCertInfo", I_J); - CERT_CONTEXTFc.hCertStore = (*env)->GetFieldID(env, CERT_CONTEXTFc.clazz, "hCertStore", I_J); + CERT_CONTEXTFc.pCertInfo = (*env)->GetFieldID(env, CERT_CONTEXTFc.clazz, "pCertInfo", "J"); + CERT_CONTEXTFc.hCertStore = (*env)->GetFieldID(env, CERT_CONTEXTFc.clazz, "hCertStore", "J"); CERT_CONTEXTFc.cached = 1; } @@ -475,10 +475,10 @@ CERT_CONTEXT *getCERT_CONTEXTFields(JNIEnv *env, jobject lpObject, CERT_CONTEXT { if (!CERT_CONTEXTFc.cached) cacheCERT_CONTEXTFields(env, lpObject); lpStruct->dwCertEncodingType = (*env)->GetIntField(env, lpObject, CERT_CONTEXTFc.dwCertEncodingType); - lpStruct->pbCertEncoded = (BYTE *)(*env)->GetIntLongField(env, lpObject, CERT_CONTEXTFc.pbCertEncoded); + lpStruct->pbCertEncoded = (BYTE *)(*env)->GetLongField(env, lpObject, CERT_CONTEXTFc.pbCertEncoded); lpStruct->cbCertEncoded = (*env)->GetIntField(env, lpObject, CERT_CONTEXTFc.cbCertEncoded); - lpStruct->pCertInfo = (PCERT_INFO)(*env)->GetIntLongField(env, lpObject, CERT_CONTEXTFc.pCertInfo); - lpStruct->hCertStore = (HCERTSTORE)(*env)->GetIntLongField(env, lpObject, CERT_CONTEXTFc.hCertStore); + lpStruct->pCertInfo = (PCERT_INFO)(*env)->GetLongField(env, lpObject, CERT_CONTEXTFc.pCertInfo); + lpStruct->hCertStore = (HCERTSTORE)(*env)->GetLongField(env, lpObject, CERT_CONTEXTFc.hCertStore); return lpStruct; } @@ -486,10 +486,10 @@ void setCERT_CONTEXTFields(JNIEnv *env, jobject lpObject, CERT_CONTEXT *lpStruct { if (!CERT_CONTEXTFc.cached) cacheCERT_CONTEXTFields(env, lpObject); (*env)->SetIntField(env, lpObject, CERT_CONTEXTFc.dwCertEncodingType, (jint)lpStruct->dwCertEncodingType); - (*env)->SetIntLongField(env, lpObject, CERT_CONTEXTFc.pbCertEncoded, (jintLong)lpStruct->pbCertEncoded); + (*env)->SetLongField(env, lpObject, CERT_CONTEXTFc.pbCertEncoded, (jlong)lpStruct->pbCertEncoded); (*env)->SetIntField(env, lpObject, CERT_CONTEXTFc.cbCertEncoded, (jint)lpStruct->cbCertEncoded); - (*env)->SetIntLongField(env, lpObject, CERT_CONTEXTFc.pCertInfo, (jintLong)lpStruct->pCertInfo); - (*env)->SetIntLongField(env, lpObject, CERT_CONTEXTFc.hCertStore, (jintLong)lpStruct->hCertStore); + (*env)->SetLongField(env, lpObject, CERT_CONTEXTFc.pCertInfo, (jlong)lpStruct->pCertInfo); + (*env)->SetLongField(env, lpObject, CERT_CONTEXTFc.hCertStore, (jlong)lpStruct->hCertStore); } #endif @@ -517,7 +517,7 @@ void cacheCERT_INFOFields(JNIEnv *env, jobject lpObject) CERT_INFOFc.IssuerUniqueId = (*env)->GetFieldID(env, CERT_INFOFc.clazz, "IssuerUniqueId", "Lorg/eclipse/swt/internal/win32/CRYPT_BIT_BLOB;"); CERT_INFOFc.SubjectUniqueId = (*env)->GetFieldID(env, CERT_INFOFc.clazz, "SubjectUniqueId", "Lorg/eclipse/swt/internal/win32/CRYPT_BIT_BLOB;"); CERT_INFOFc.cExtension = (*env)->GetFieldID(env, CERT_INFOFc.clazz, "cExtension", "I"); - CERT_INFOFc.rgExtension = (*env)->GetFieldID(env, CERT_INFOFc.clazz, "rgExtension", I_J); + CERT_INFOFc.rgExtension = (*env)->GetFieldID(env, CERT_INFOFc.clazz, "rgExtension", "J"); CERT_INFOFc.cached = 1; } @@ -562,7 +562,7 @@ CERT_INFO *getCERT_INFOFields(JNIEnv *env, jobject lpObject, CERT_INFO *lpStruct if (lpObject1 != NULL) getCRYPT_BIT_BLOBFields(env, lpObject1, &lpStruct->SubjectUniqueId); } lpStruct->cExtension = (*env)->GetIntField(env, lpObject, CERT_INFOFc.cExtension); - lpStruct->rgExtension = (PCERT_EXTENSION)(*env)->GetIntLongField(env, lpObject, CERT_INFOFc.rgExtension); + lpStruct->rgExtension = (PCERT_EXTENSION)(*env)->GetLongField(env, lpObject, CERT_INFOFc.rgExtension); return lpStruct; } @@ -607,7 +607,7 @@ void setCERT_INFOFields(JNIEnv *env, jobject lpObject, CERT_INFO *lpStruct) if (lpObject1 != NULL) setCRYPT_BIT_BLOBFields(env, lpObject1, &lpStruct->SubjectUniqueId); } (*env)->SetIntField(env, lpObject, CERT_INFOFc.cExtension, (jint)lpStruct->cExtension); - (*env)->SetIntLongField(env, lpObject, CERT_INFOFc.rgExtension, (jintLong)lpStruct->rgExtension); + (*env)->SetLongField(env, lpObject, CERT_INFOFc.rgExtension, (jlong)lpStruct->rgExtension); } #endif @@ -625,7 +625,7 @@ void cacheCERT_NAME_BLOBFields(JNIEnv *env, jobject lpObject) if (CERT_NAME_BLOBFc.cached) return; CERT_NAME_BLOBFc.clazz = (*env)->GetObjectClass(env, lpObject); CERT_NAME_BLOBFc.cbData = (*env)->GetFieldID(env, CERT_NAME_BLOBFc.clazz, "cbData", "I"); - CERT_NAME_BLOBFc.pbData = (*env)->GetFieldID(env, CERT_NAME_BLOBFc.clazz, "pbData", I_J); + CERT_NAME_BLOBFc.pbData = (*env)->GetFieldID(env, CERT_NAME_BLOBFc.clazz, "pbData", "J"); CERT_NAME_BLOBFc.cached = 1; } @@ -633,7 +633,7 @@ CERT_NAME_BLOB *getCERT_NAME_BLOBFields(JNIEnv *env, jobject lpObject, CERT_NAME { if (!CERT_NAME_BLOBFc.cached) cacheCERT_NAME_BLOBFields(env, lpObject); lpStruct->cbData = (*env)->GetIntField(env, lpObject, CERT_NAME_BLOBFc.cbData); - lpStruct->pbData = (BYTE *)(*env)->GetIntLongField(env, lpObject, CERT_NAME_BLOBFc.pbData); + lpStruct->pbData = (BYTE *)(*env)->GetLongField(env, lpObject, CERT_NAME_BLOBFc.pbData); return lpStruct; } @@ -641,7 +641,7 @@ void setCERT_NAME_BLOBFields(JNIEnv *env, jobject lpObject, CERT_NAME_BLOB *lpSt { if (!CERT_NAME_BLOBFc.cached) cacheCERT_NAME_BLOBFields(env, lpObject); (*env)->SetIntField(env, lpObject, CERT_NAME_BLOBFc.cbData, (jint)lpStruct->cbData); - (*env)->SetIntLongField(env, lpObject, CERT_NAME_BLOBFc.pbData, (jintLong)lpStruct->pbData); + (*env)->SetLongField(env, lpObject, CERT_NAME_BLOBFc.pbData, (jlong)lpStruct->pbData); } #endif @@ -705,14 +705,14 @@ void cacheCHOOSECOLORFields(JNIEnv *env, jobject lpObject) if (CHOOSECOLORFc.cached) return; CHOOSECOLORFc.clazz = (*env)->GetObjectClass(env, lpObject); CHOOSECOLORFc.lStructSize = (*env)->GetFieldID(env, CHOOSECOLORFc.clazz, "lStructSize", "I"); - CHOOSECOLORFc.hwndOwner = (*env)->GetFieldID(env, CHOOSECOLORFc.clazz, "hwndOwner", I_J); - CHOOSECOLORFc.hInstance = (*env)->GetFieldID(env, CHOOSECOLORFc.clazz, "hInstance", I_J); + CHOOSECOLORFc.hwndOwner = (*env)->GetFieldID(env, CHOOSECOLORFc.clazz, "hwndOwner", "J"); + CHOOSECOLORFc.hInstance = (*env)->GetFieldID(env, CHOOSECOLORFc.clazz, "hInstance", "J"); CHOOSECOLORFc.rgbResult = (*env)->GetFieldID(env, CHOOSECOLORFc.clazz, "rgbResult", "I"); - CHOOSECOLORFc.lpCustColors = (*env)->GetFieldID(env, CHOOSECOLORFc.clazz, "lpCustColors", I_J); + CHOOSECOLORFc.lpCustColors = (*env)->GetFieldID(env, CHOOSECOLORFc.clazz, "lpCustColors", "J"); CHOOSECOLORFc.Flags = (*env)->GetFieldID(env, CHOOSECOLORFc.clazz, "Flags", "I"); - CHOOSECOLORFc.lCustData = (*env)->GetFieldID(env, CHOOSECOLORFc.clazz, "lCustData", I_J); - CHOOSECOLORFc.lpfnHook = (*env)->GetFieldID(env, CHOOSECOLORFc.clazz, "lpfnHook", I_J); - CHOOSECOLORFc.lpTemplateName = (*env)->GetFieldID(env, CHOOSECOLORFc.clazz, "lpTemplateName", I_J); + CHOOSECOLORFc.lCustData = (*env)->GetFieldID(env, CHOOSECOLORFc.clazz, "lCustData", "J"); + CHOOSECOLORFc.lpfnHook = (*env)->GetFieldID(env, CHOOSECOLORFc.clazz, "lpfnHook", "J"); + CHOOSECOLORFc.lpTemplateName = (*env)->GetFieldID(env, CHOOSECOLORFc.clazz, "lpTemplateName", "J"); CHOOSECOLORFc.cached = 1; } @@ -720,14 +720,14 @@ CHOOSECOLOR *getCHOOSECOLORFields(JNIEnv *env, jobject lpObject, CHOOSECOLOR *lp { if (!CHOOSECOLORFc.cached) cacheCHOOSECOLORFields(env, lpObject); lpStruct->lStructSize = (*env)->GetIntField(env, lpObject, CHOOSECOLORFc.lStructSize); - lpStruct->hwndOwner = (HWND)(*env)->GetIntLongField(env, lpObject, CHOOSECOLORFc.hwndOwner); - lpStruct->hInstance = (HANDLE)(*env)->GetIntLongField(env, lpObject, CHOOSECOLORFc.hInstance); + lpStruct->hwndOwner = (HWND)(*env)->GetLongField(env, lpObject, CHOOSECOLORFc.hwndOwner); + lpStruct->hInstance = (HANDLE)(*env)->GetLongField(env, lpObject, CHOOSECOLORFc.hInstance); lpStruct->rgbResult = (*env)->GetIntField(env, lpObject, CHOOSECOLORFc.rgbResult); - lpStruct->lpCustColors = (COLORREF *)(*env)->GetIntLongField(env, lpObject, CHOOSECOLORFc.lpCustColors); + lpStruct->lpCustColors = (COLORREF *)(*env)->GetLongField(env, lpObject, CHOOSECOLORFc.lpCustColors); lpStruct->Flags = (*env)->GetIntField(env, lpObject, CHOOSECOLORFc.Flags); - lpStruct->lCustData = (*env)->GetIntLongField(env, lpObject, CHOOSECOLORFc.lCustData); - lpStruct->lpfnHook = (LPCCHOOKPROC)(*env)->GetIntLongField(env, lpObject, CHOOSECOLORFc.lpfnHook); - lpStruct->lpTemplateName = (LPCTSTR)(*env)->GetIntLongField(env, lpObject, CHOOSECOLORFc.lpTemplateName); + lpStruct->lCustData = (*env)->GetLongField(env, lpObject, CHOOSECOLORFc.lCustData); + lpStruct->lpfnHook = (LPCCHOOKPROC)(*env)->GetLongField(env, lpObject, CHOOSECOLORFc.lpfnHook); + lpStruct->lpTemplateName = (LPCTSTR)(*env)->GetLongField(env, lpObject, CHOOSECOLORFc.lpTemplateName); return lpStruct; } @@ -735,14 +735,14 @@ void setCHOOSECOLORFields(JNIEnv *env, jobject lpObject, CHOOSECOLOR *lpStruct) { if (!CHOOSECOLORFc.cached) cacheCHOOSECOLORFields(env, lpObject); (*env)->SetIntField(env, lpObject, CHOOSECOLORFc.lStructSize, (jint)lpStruct->lStructSize); - (*env)->SetIntLongField(env, lpObject, CHOOSECOLORFc.hwndOwner, (jintLong)lpStruct->hwndOwner); - (*env)->SetIntLongField(env, lpObject, CHOOSECOLORFc.hInstance, (jintLong)lpStruct->hInstance); + (*env)->SetLongField(env, lpObject, CHOOSECOLORFc.hwndOwner, (jlong)lpStruct->hwndOwner); + (*env)->SetLongField(env, lpObject, CHOOSECOLORFc.hInstance, (jlong)lpStruct->hInstance); (*env)->SetIntField(env, lpObject, CHOOSECOLORFc.rgbResult, (jint)lpStruct->rgbResult); - (*env)->SetIntLongField(env, lpObject, CHOOSECOLORFc.lpCustColors, (jintLong)lpStruct->lpCustColors); + (*env)->SetLongField(env, lpObject, CHOOSECOLORFc.lpCustColors, (jlong)lpStruct->lpCustColors); (*env)->SetIntField(env, lpObject, CHOOSECOLORFc.Flags, (jint)lpStruct->Flags); - (*env)->SetIntLongField(env, lpObject, CHOOSECOLORFc.lCustData, (jintLong)lpStruct->lCustData); - (*env)->SetIntLongField(env, lpObject, CHOOSECOLORFc.lpfnHook, (jintLong)lpStruct->lpfnHook); - (*env)->SetIntLongField(env, lpObject, CHOOSECOLORFc.lpTemplateName, (jintLong)lpStruct->lpTemplateName); + (*env)->SetLongField(env, lpObject, CHOOSECOLORFc.lCustData, (jlong)lpStruct->lCustData); + (*env)->SetLongField(env, lpObject, CHOOSECOLORFc.lpfnHook, (jlong)lpStruct->lpfnHook); + (*env)->SetLongField(env, lpObject, CHOOSECOLORFc.lpTemplateName, (jlong)lpStruct->lpTemplateName); } #endif @@ -760,17 +760,17 @@ void cacheCHOOSEFONTFields(JNIEnv *env, jobject lpObject) if (CHOOSEFONTFc.cached) return; CHOOSEFONTFc.clazz = (*env)->GetObjectClass(env, lpObject); CHOOSEFONTFc.lStructSize = (*env)->GetFieldID(env, CHOOSEFONTFc.clazz, "lStructSize", "I"); - CHOOSEFONTFc.hwndOwner = (*env)->GetFieldID(env, CHOOSEFONTFc.clazz, "hwndOwner", I_J); - CHOOSEFONTFc.hDC = (*env)->GetFieldID(env, CHOOSEFONTFc.clazz, "hDC", I_J); - CHOOSEFONTFc.lpLogFont = (*env)->GetFieldID(env, CHOOSEFONTFc.clazz, "lpLogFont", I_J); + CHOOSEFONTFc.hwndOwner = (*env)->GetFieldID(env, CHOOSEFONTFc.clazz, "hwndOwner", "J"); + CHOOSEFONTFc.hDC = (*env)->GetFieldID(env, CHOOSEFONTFc.clazz, "hDC", "J"); + CHOOSEFONTFc.lpLogFont = (*env)->GetFieldID(env, CHOOSEFONTFc.clazz, "lpLogFont", "J"); CHOOSEFONTFc.iPointSize = (*env)->GetFieldID(env, CHOOSEFONTFc.clazz, "iPointSize", "I"); CHOOSEFONTFc.Flags = (*env)->GetFieldID(env, CHOOSEFONTFc.clazz, "Flags", "I"); CHOOSEFONTFc.rgbColors = (*env)->GetFieldID(env, CHOOSEFONTFc.clazz, "rgbColors", "I"); - CHOOSEFONTFc.lCustData = (*env)->GetFieldID(env, CHOOSEFONTFc.clazz, "lCustData", I_J); - CHOOSEFONTFc.lpfnHook = (*env)->GetFieldID(env, CHOOSEFONTFc.clazz, "lpfnHook", I_J); - CHOOSEFONTFc.lpTemplateName = (*env)->GetFieldID(env, CHOOSEFONTFc.clazz, "lpTemplateName", I_J); - CHOOSEFONTFc.hInstance = (*env)->GetFieldID(env, CHOOSEFONTFc.clazz, "hInstance", I_J); - CHOOSEFONTFc.lpszStyle = (*env)->GetFieldID(env, CHOOSEFONTFc.clazz, "lpszStyle", I_J); + CHOOSEFONTFc.lCustData = (*env)->GetFieldID(env, CHOOSEFONTFc.clazz, "lCustData", "J"); + CHOOSEFONTFc.lpfnHook = (*env)->GetFieldID(env, CHOOSEFONTFc.clazz, "lpfnHook", "J"); + CHOOSEFONTFc.lpTemplateName = (*env)->GetFieldID(env, CHOOSEFONTFc.clazz, "lpTemplateName", "J"); + CHOOSEFONTFc.hInstance = (*env)->GetFieldID(env, CHOOSEFONTFc.clazz, "hInstance", "J"); + CHOOSEFONTFc.lpszStyle = (*env)->GetFieldID(env, CHOOSEFONTFc.clazz, "lpszStyle", "J"); CHOOSEFONTFc.nFontType = (*env)->GetFieldID(env, CHOOSEFONTFc.clazz, "nFontType", "S"); CHOOSEFONTFc.nSizeMin = (*env)->GetFieldID(env, CHOOSEFONTFc.clazz, "nSizeMin", "I"); CHOOSEFONTFc.nSizeMax = (*env)->GetFieldID(env, CHOOSEFONTFc.clazz, "nSizeMax", "I"); @@ -781,17 +781,17 @@ CHOOSEFONT *getCHOOSEFONTFields(JNIEnv *env, jobject lpObject, CHOOSEFONT *lpStr { if (!CHOOSEFONTFc.cached) cacheCHOOSEFONTFields(env, lpObject); lpStruct->lStructSize = (*env)->GetIntField(env, lpObject, CHOOSEFONTFc.lStructSize); - lpStruct->hwndOwner = (HWND)(*env)->GetIntLongField(env, lpObject, CHOOSEFONTFc.hwndOwner); - lpStruct->hDC = (HDC)(*env)->GetIntLongField(env, lpObject, CHOOSEFONTFc.hDC); - lpStruct->lpLogFont = (LPLOGFONT)(*env)->GetIntLongField(env, lpObject, CHOOSEFONTFc.lpLogFont); + lpStruct->hwndOwner = (HWND)(*env)->GetLongField(env, lpObject, CHOOSEFONTFc.hwndOwner); + lpStruct->hDC = (HDC)(*env)->GetLongField(env, lpObject, CHOOSEFONTFc.hDC); + lpStruct->lpLogFont = (LPLOGFONT)(*env)->GetLongField(env, lpObject, CHOOSEFONTFc.lpLogFont); lpStruct->iPointSize = (*env)->GetIntField(env, lpObject, CHOOSEFONTFc.iPointSize); lpStruct->Flags = (*env)->GetIntField(env, lpObject, CHOOSEFONTFc.Flags); lpStruct->rgbColors = (*env)->GetIntField(env, lpObject, CHOOSEFONTFc.rgbColors); - lpStruct->lCustData = (*env)->GetIntLongField(env, lpObject, CHOOSEFONTFc.lCustData); - lpStruct->lpfnHook = (LPCFHOOKPROC)(*env)->GetIntLongField(env, lpObject, CHOOSEFONTFc.lpfnHook); - lpStruct->lpTemplateName = (LPCTSTR)(*env)->GetIntLongField(env, lpObject, CHOOSEFONTFc.lpTemplateName); - lpStruct->hInstance = (HINSTANCE)(*env)->GetIntLongField(env, lpObject, CHOOSEFONTFc.hInstance); - lpStruct->lpszStyle = (LPTSTR)(*env)->GetIntLongField(env, lpObject, CHOOSEFONTFc.lpszStyle); + lpStruct->lCustData = (*env)->GetLongField(env, lpObject, CHOOSEFONTFc.lCustData); + lpStruct->lpfnHook = (LPCFHOOKPROC)(*env)->GetLongField(env, lpObject, CHOOSEFONTFc.lpfnHook); + lpStruct->lpTemplateName = (LPCTSTR)(*env)->GetLongField(env, lpObject, CHOOSEFONTFc.lpTemplateName); + lpStruct->hInstance = (HINSTANCE)(*env)->GetLongField(env, lpObject, CHOOSEFONTFc.hInstance); + lpStruct->lpszStyle = (LPTSTR)(*env)->GetLongField(env, lpObject, CHOOSEFONTFc.lpszStyle); lpStruct->nFontType = (*env)->GetShortField(env, lpObject, CHOOSEFONTFc.nFontType); lpStruct->nSizeMin = (*env)->GetIntField(env, lpObject, CHOOSEFONTFc.nSizeMin); lpStruct->nSizeMax = (*env)->GetIntField(env, lpObject, CHOOSEFONTFc.nSizeMax); @@ -802,17 +802,17 @@ void setCHOOSEFONTFields(JNIEnv *env, jobject lpObject, CHOOSEFONT *lpStruct) { if (!CHOOSEFONTFc.cached) cacheCHOOSEFONTFields(env, lpObject); (*env)->SetIntField(env, lpObject, CHOOSEFONTFc.lStructSize, (jint)lpStruct->lStructSize); - (*env)->SetIntLongField(env, lpObject, CHOOSEFONTFc.hwndOwner, (jintLong)lpStruct->hwndOwner); - (*env)->SetIntLongField(env, lpObject, CHOOSEFONTFc.hDC, (jintLong)lpStruct->hDC); - (*env)->SetIntLongField(env, lpObject, CHOOSEFONTFc.lpLogFont, (jintLong)lpStruct->lpLogFont); + (*env)->SetLongField(env, lpObject, CHOOSEFONTFc.hwndOwner, (jlong)lpStruct->hwndOwner); + (*env)->SetLongField(env, lpObject, CHOOSEFONTFc.hDC, (jlong)lpStruct->hDC); + (*env)->SetLongField(env, lpObject, CHOOSEFONTFc.lpLogFont, (jlong)lpStruct->lpLogFont); (*env)->SetIntField(env, lpObject, CHOOSEFONTFc.iPointSize, (jint)lpStruct->iPointSize); (*env)->SetIntField(env, lpObject, CHOOSEFONTFc.Flags, (jint)lpStruct->Flags); (*env)->SetIntField(env, lpObject, CHOOSEFONTFc.rgbColors, (jint)lpStruct->rgbColors); - (*env)->SetIntLongField(env, lpObject, CHOOSEFONTFc.lCustData, (jintLong)lpStruct->lCustData); - (*env)->SetIntLongField(env, lpObject, CHOOSEFONTFc.lpfnHook, (jintLong)lpStruct->lpfnHook); - (*env)->SetIntLongField(env, lpObject, CHOOSEFONTFc.lpTemplateName, (jintLong)lpStruct->lpTemplateName); - (*env)->SetIntLongField(env, lpObject, CHOOSEFONTFc.hInstance, (jintLong)lpStruct->hInstance); - (*env)->SetIntLongField(env, lpObject, CHOOSEFONTFc.lpszStyle, (jintLong)lpStruct->lpszStyle); + (*env)->SetLongField(env, lpObject, CHOOSEFONTFc.lCustData, (jlong)lpStruct->lCustData); + (*env)->SetLongField(env, lpObject, CHOOSEFONTFc.lpfnHook, (jlong)lpStruct->lpfnHook); + (*env)->SetLongField(env, lpObject, CHOOSEFONTFc.lpTemplateName, (jlong)lpStruct->lpTemplateName); + (*env)->SetLongField(env, lpObject, CHOOSEFONTFc.hInstance, (jlong)lpStruct->hInstance); + (*env)->SetLongField(env, lpObject, CHOOSEFONTFc.lpszStyle, (jlong)lpStruct->lpszStyle); (*env)->SetShortField(env, lpObject, CHOOSEFONTFc.nFontType, (jshort)lpStruct->nFontType); (*env)->SetIntField(env, lpObject, CHOOSEFONTFc.nSizeMin, (jint)lpStruct->nSizeMin); (*env)->SetIntField(env, lpObject, CHOOSEFONTFc.nSizeMax, (jint)lpStruct->nSizeMax); @@ -842,9 +842,9 @@ void cacheCOMBOBOXINFOFields(JNIEnv *env, jobject lpObject) COMBOBOXINFOFc.buttonRight = (*env)->GetFieldID(env, COMBOBOXINFOFc.clazz, "buttonRight", "I"); COMBOBOXINFOFc.buttonBottom = (*env)->GetFieldID(env, COMBOBOXINFOFc.clazz, "buttonBottom", "I"); COMBOBOXINFOFc.stateButton = (*env)->GetFieldID(env, COMBOBOXINFOFc.clazz, "stateButton", "I"); - COMBOBOXINFOFc.hwndCombo = (*env)->GetFieldID(env, COMBOBOXINFOFc.clazz, "hwndCombo", I_J); - COMBOBOXINFOFc.hwndItem = (*env)->GetFieldID(env, COMBOBOXINFOFc.clazz, "hwndItem", I_J); - COMBOBOXINFOFc.hwndList = (*env)->GetFieldID(env, COMBOBOXINFOFc.clazz, "hwndList", I_J); + COMBOBOXINFOFc.hwndCombo = (*env)->GetFieldID(env, COMBOBOXINFOFc.clazz, "hwndCombo", "J"); + COMBOBOXINFOFc.hwndItem = (*env)->GetFieldID(env, COMBOBOXINFOFc.clazz, "hwndItem", "J"); + COMBOBOXINFOFc.hwndList = (*env)->GetFieldID(env, COMBOBOXINFOFc.clazz, "hwndList", "J"); COMBOBOXINFOFc.cached = 1; } @@ -861,9 +861,9 @@ COMBOBOXINFO *getCOMBOBOXINFOFields(JNIEnv *env, jobject lpObject, COMBOBOXINFO lpStruct->rcButton.right = (*env)->GetIntField(env, lpObject, COMBOBOXINFOFc.buttonRight); lpStruct->rcButton.bottom = (*env)->GetIntField(env, lpObject, COMBOBOXINFOFc.buttonBottom); lpStruct->stateButton = (*env)->GetIntField(env, lpObject, COMBOBOXINFOFc.stateButton); - lpStruct->hwndCombo = (HWND)(*env)->GetIntLongField(env, lpObject, COMBOBOXINFOFc.hwndCombo); - lpStruct->hwndItem = (HWND)(*env)->GetIntLongField(env, lpObject, COMBOBOXINFOFc.hwndItem); - lpStruct->hwndList = (HWND)(*env)->GetIntLongField(env, lpObject, COMBOBOXINFOFc.hwndList); + lpStruct->hwndCombo = (HWND)(*env)->GetLongField(env, lpObject, COMBOBOXINFOFc.hwndCombo); + lpStruct->hwndItem = (HWND)(*env)->GetLongField(env, lpObject, COMBOBOXINFOFc.hwndItem); + lpStruct->hwndList = (HWND)(*env)->GetLongField(env, lpObject, COMBOBOXINFOFc.hwndList); return lpStruct; } @@ -880,9 +880,9 @@ void setCOMBOBOXINFOFields(JNIEnv *env, jobject lpObject, COMBOBOXINFO *lpStruct (*env)->SetIntField(env, lpObject, COMBOBOXINFOFc.buttonRight, (jint)lpStruct->rcButton.right); (*env)->SetIntField(env, lpObject, COMBOBOXINFOFc.buttonBottom, (jint)lpStruct->rcButton.bottom); (*env)->SetIntField(env, lpObject, COMBOBOXINFOFc.stateButton, (jint)lpStruct->stateButton); - (*env)->SetIntLongField(env, lpObject, COMBOBOXINFOFc.hwndCombo, (jintLong)lpStruct->hwndCombo); - (*env)->SetIntLongField(env, lpObject, COMBOBOXINFOFc.hwndItem, (jintLong)lpStruct->hwndItem); - (*env)->SetIntLongField(env, lpObject, COMBOBOXINFOFc.hwndList, (jintLong)lpStruct->hwndList); + (*env)->SetLongField(env, lpObject, COMBOBOXINFOFc.hwndCombo, (jlong)lpStruct->hwndCombo); + (*env)->SetLongField(env, lpObject, COMBOBOXINFOFc.hwndItem, (jlong)lpStruct->hwndItem); + (*env)->SetLongField(env, lpObject, COMBOBOXINFOFc.hwndList, (jlong)lpStruct->hwndList); } #endif @@ -948,17 +948,17 @@ void cacheCREATESTRUCTFields(JNIEnv *env, jobject lpObject) { if (CREATESTRUCTFc.cached) return; CREATESTRUCTFc.clazz = (*env)->GetObjectClass(env, lpObject); - CREATESTRUCTFc.lpCreateParams = (*env)->GetFieldID(env, CREATESTRUCTFc.clazz, "lpCreateParams", I_J); - CREATESTRUCTFc.hInstance = (*env)->GetFieldID(env, CREATESTRUCTFc.clazz, "hInstance", I_J); - CREATESTRUCTFc.hMenu = (*env)->GetFieldID(env, CREATESTRUCTFc.clazz, "hMenu", I_J); - CREATESTRUCTFc.hwndParent = (*env)->GetFieldID(env, CREATESTRUCTFc.clazz, "hwndParent", I_J); + CREATESTRUCTFc.lpCreateParams = (*env)->GetFieldID(env, CREATESTRUCTFc.clazz, "lpCreateParams", "J"); + CREATESTRUCTFc.hInstance = (*env)->GetFieldID(env, CREATESTRUCTFc.clazz, "hInstance", "J"); + CREATESTRUCTFc.hMenu = (*env)->GetFieldID(env, CREATESTRUCTFc.clazz, "hMenu", "J"); + CREATESTRUCTFc.hwndParent = (*env)->GetFieldID(env, CREATESTRUCTFc.clazz, "hwndParent", "J"); CREATESTRUCTFc.cy = (*env)->GetFieldID(env, CREATESTRUCTFc.clazz, "cy", "I"); CREATESTRUCTFc.cx = (*env)->GetFieldID(env, CREATESTRUCTFc.clazz, "cx", "I"); CREATESTRUCTFc.y = (*env)->GetFieldID(env, CREATESTRUCTFc.clazz, "y", "I"); CREATESTRUCTFc.x = (*env)->GetFieldID(env, CREATESTRUCTFc.clazz, "x", "I"); CREATESTRUCTFc.style = (*env)->GetFieldID(env, CREATESTRUCTFc.clazz, "style", "I"); - CREATESTRUCTFc.lpszName = (*env)->GetFieldID(env, CREATESTRUCTFc.clazz, "lpszName", I_J); - CREATESTRUCTFc.lpszClass = (*env)->GetFieldID(env, CREATESTRUCTFc.clazz, "lpszClass", I_J); + CREATESTRUCTFc.lpszName = (*env)->GetFieldID(env, CREATESTRUCTFc.clazz, "lpszName", "J"); + CREATESTRUCTFc.lpszClass = (*env)->GetFieldID(env, CREATESTRUCTFc.clazz, "lpszClass", "J"); CREATESTRUCTFc.dwExStyle = (*env)->GetFieldID(env, CREATESTRUCTFc.clazz, "dwExStyle", "I"); CREATESTRUCTFc.cached = 1; } @@ -966,17 +966,17 @@ void cacheCREATESTRUCTFields(JNIEnv *env, jobject lpObject) CREATESTRUCT *getCREATESTRUCTFields(JNIEnv *env, jobject lpObject, CREATESTRUCT *lpStruct) { if (!CREATESTRUCTFc.cached) cacheCREATESTRUCTFields(env, lpObject); - lpStruct->lpCreateParams = (LPVOID)(*env)->GetIntLongField(env, lpObject, CREATESTRUCTFc.lpCreateParams); - lpStruct->hInstance = (HINSTANCE)(*env)->GetIntLongField(env, lpObject, CREATESTRUCTFc.hInstance); - lpStruct->hMenu = (HMENU)(*env)->GetIntLongField(env, lpObject, CREATESTRUCTFc.hMenu); - lpStruct->hwndParent = (HWND)(*env)->GetIntLongField(env, lpObject, CREATESTRUCTFc.hwndParent); + lpStruct->lpCreateParams = (LPVOID)(*env)->GetLongField(env, lpObject, CREATESTRUCTFc.lpCreateParams); + lpStruct->hInstance = (HINSTANCE)(*env)->GetLongField(env, lpObject, CREATESTRUCTFc.hInstance); + lpStruct->hMenu = (HMENU)(*env)->GetLongField(env, lpObject, CREATESTRUCTFc.hMenu); + lpStruct->hwndParent = (HWND)(*env)->GetLongField(env, lpObject, CREATESTRUCTFc.hwndParent); lpStruct->cy = (*env)->GetIntField(env, lpObject, CREATESTRUCTFc.cy); lpStruct->cx = (*env)->GetIntField(env, lpObject, CREATESTRUCTFc.cx); lpStruct->y = (*env)->GetIntField(env, lpObject, CREATESTRUCTFc.y); lpStruct->x = (*env)->GetIntField(env, lpObject, CREATESTRUCTFc.x); lpStruct->style = (*env)->GetIntField(env, lpObject, CREATESTRUCTFc.style); - lpStruct->lpszName = (LPCTSTR)(*env)->GetIntLongField(env, lpObject, CREATESTRUCTFc.lpszName); - lpStruct->lpszClass = (LPCTSTR)(*env)->GetIntLongField(env, lpObject, CREATESTRUCTFc.lpszClass); + lpStruct->lpszName = (LPCTSTR)(*env)->GetLongField(env, lpObject, CREATESTRUCTFc.lpszName); + lpStruct->lpszClass = (LPCTSTR)(*env)->GetLongField(env, lpObject, CREATESTRUCTFc.lpszClass); lpStruct->dwExStyle = (*env)->GetIntField(env, lpObject, CREATESTRUCTFc.dwExStyle); return lpStruct; } @@ -984,17 +984,17 @@ CREATESTRUCT *getCREATESTRUCTFields(JNIEnv *env, jobject lpObject, CREATESTRUCT void setCREATESTRUCTFields(JNIEnv *env, jobject lpObject, CREATESTRUCT *lpStruct) { if (!CREATESTRUCTFc.cached) cacheCREATESTRUCTFields(env, lpObject); - (*env)->SetIntLongField(env, lpObject, CREATESTRUCTFc.lpCreateParams, (jintLong)lpStruct->lpCreateParams); - (*env)->SetIntLongField(env, lpObject, CREATESTRUCTFc.hInstance, (jintLong)lpStruct->hInstance); - (*env)->SetIntLongField(env, lpObject, CREATESTRUCTFc.hMenu, (jintLong)lpStruct->hMenu); - (*env)->SetIntLongField(env, lpObject, CREATESTRUCTFc.hwndParent, (jintLong)lpStruct->hwndParent); + (*env)->SetLongField(env, lpObject, CREATESTRUCTFc.lpCreateParams, (jlong)lpStruct->lpCreateParams); + (*env)->SetLongField(env, lpObject, CREATESTRUCTFc.hInstance, (jlong)lpStruct->hInstance); + (*env)->SetLongField(env, lpObject, CREATESTRUCTFc.hMenu, (jlong)lpStruct->hMenu); + (*env)->SetLongField(env, lpObject, CREATESTRUCTFc.hwndParent, (jlong)lpStruct->hwndParent); (*env)->SetIntField(env, lpObject, CREATESTRUCTFc.cy, (jint)lpStruct->cy); (*env)->SetIntField(env, lpObject, CREATESTRUCTFc.cx, (jint)lpStruct->cx); (*env)->SetIntField(env, lpObject, CREATESTRUCTFc.y, (jint)lpStruct->y); (*env)->SetIntField(env, lpObject, CREATESTRUCTFc.x, (jint)lpStruct->x); (*env)->SetIntField(env, lpObject, CREATESTRUCTFc.style, (jint)lpStruct->style); - (*env)->SetIntLongField(env, lpObject, CREATESTRUCTFc.lpszName, (jintLong)lpStruct->lpszName); - (*env)->SetIntLongField(env, lpObject, CREATESTRUCTFc.lpszClass, (jintLong)lpStruct->lpszClass); + (*env)->SetLongField(env, lpObject, CREATESTRUCTFc.lpszName, (jlong)lpStruct->lpszName); + (*env)->SetLongField(env, lpObject, CREATESTRUCTFc.lpszClass, (jlong)lpStruct->lpszClass); (*env)->SetIntField(env, lpObject, CREATESTRUCTFc.dwExStyle, (jint)lpStruct->dwExStyle); } #endif @@ -1012,7 +1012,7 @@ void cacheCRYPT_ALGORITHM_IDENTIFIERFields(JNIEnv *env, jobject lpObject) { if (CRYPT_ALGORITHM_IDENTIFIERFc.cached) return; CRYPT_ALGORITHM_IDENTIFIERFc.clazz = (*env)->GetObjectClass(env, lpObject); - CRYPT_ALGORITHM_IDENTIFIERFc.pszObjId = (*env)->GetFieldID(env, CRYPT_ALGORITHM_IDENTIFIERFc.clazz, "pszObjId", I_J); + CRYPT_ALGORITHM_IDENTIFIERFc.pszObjId = (*env)->GetFieldID(env, CRYPT_ALGORITHM_IDENTIFIERFc.clazz, "pszObjId", "J"); CRYPT_ALGORITHM_IDENTIFIERFc.Parameters = (*env)->GetFieldID(env, CRYPT_ALGORITHM_IDENTIFIERFc.clazz, "Parameters", "Lorg/eclipse/swt/internal/win32/CRYPT_OBJID_BLOB;"); CRYPT_ALGORITHM_IDENTIFIERFc.cached = 1; } @@ -1020,7 +1020,7 @@ void cacheCRYPT_ALGORITHM_IDENTIFIERFields(JNIEnv *env, jobject lpObject) CRYPT_ALGORITHM_IDENTIFIER *getCRYPT_ALGORITHM_IDENTIFIERFields(JNIEnv *env, jobject lpObject, CRYPT_ALGORITHM_IDENTIFIER *lpStruct) { if (!CRYPT_ALGORITHM_IDENTIFIERFc.cached) cacheCRYPT_ALGORITHM_IDENTIFIERFields(env, lpObject); - lpStruct->pszObjId = (LPSTR)(*env)->GetIntLongField(env, lpObject, CRYPT_ALGORITHM_IDENTIFIERFc.pszObjId); + lpStruct->pszObjId = (LPSTR)(*env)->GetLongField(env, lpObject, CRYPT_ALGORITHM_IDENTIFIERFc.pszObjId); { jobject lpObject1 = (*env)->GetObjectField(env, lpObject, CRYPT_ALGORITHM_IDENTIFIERFc.Parameters); if (lpObject1 != NULL) getCRYPT_OBJID_BLOBFields(env, lpObject1, &lpStruct->Parameters); @@ -1031,7 +1031,7 @@ CRYPT_ALGORITHM_IDENTIFIER *getCRYPT_ALGORITHM_IDENTIFIERFields(JNIEnv *env, job void setCRYPT_ALGORITHM_IDENTIFIERFields(JNIEnv *env, jobject lpObject, CRYPT_ALGORITHM_IDENTIFIER *lpStruct) { if (!CRYPT_ALGORITHM_IDENTIFIERFc.cached) cacheCRYPT_ALGORITHM_IDENTIFIERFields(env, lpObject); - (*env)->SetIntLongField(env, lpObject, CRYPT_ALGORITHM_IDENTIFIERFc.pszObjId, (jintLong)lpStruct->pszObjId); + (*env)->SetLongField(env, lpObject, CRYPT_ALGORITHM_IDENTIFIERFc.pszObjId, (jlong)lpStruct->pszObjId); { jobject lpObject1 = (*env)->GetObjectField(env, lpObject, CRYPT_ALGORITHM_IDENTIFIERFc.Parameters); if (lpObject1 != NULL) setCRYPT_OBJID_BLOBFields(env, lpObject1, &lpStruct->Parameters); @@ -1053,7 +1053,7 @@ void cacheCRYPT_BIT_BLOBFields(JNIEnv *env, jobject lpObject) if (CRYPT_BIT_BLOBFc.cached) return; CRYPT_BIT_BLOBFc.clazz = (*env)->GetObjectClass(env, lpObject); CRYPT_BIT_BLOBFc.cbData = (*env)->GetFieldID(env, CRYPT_BIT_BLOBFc.clazz, "cbData", "I"); - CRYPT_BIT_BLOBFc.pbData = (*env)->GetFieldID(env, CRYPT_BIT_BLOBFc.clazz, "pbData", I_J); + CRYPT_BIT_BLOBFc.pbData = (*env)->GetFieldID(env, CRYPT_BIT_BLOBFc.clazz, "pbData", "J"); CRYPT_BIT_BLOBFc.cUnusedBits = (*env)->GetFieldID(env, CRYPT_BIT_BLOBFc.clazz, "cUnusedBits", "I"); CRYPT_BIT_BLOBFc.cached = 1; } @@ -1062,7 +1062,7 @@ CRYPT_BIT_BLOB *getCRYPT_BIT_BLOBFields(JNIEnv *env, jobject lpObject, CRYPT_BIT { if (!CRYPT_BIT_BLOBFc.cached) cacheCRYPT_BIT_BLOBFields(env, lpObject); lpStruct->cbData = (*env)->GetIntField(env, lpObject, CRYPT_BIT_BLOBFc.cbData); - lpStruct->pbData = (BYTE *)(*env)->GetIntLongField(env, lpObject, CRYPT_BIT_BLOBFc.pbData); + lpStruct->pbData = (BYTE *)(*env)->GetLongField(env, lpObject, CRYPT_BIT_BLOBFc.pbData); lpStruct->cUnusedBits = (*env)->GetIntField(env, lpObject, CRYPT_BIT_BLOBFc.cUnusedBits); return lpStruct; } @@ -1071,7 +1071,7 @@ void setCRYPT_BIT_BLOBFields(JNIEnv *env, jobject lpObject, CRYPT_BIT_BLOB *lpSt { if (!CRYPT_BIT_BLOBFc.cached) cacheCRYPT_BIT_BLOBFields(env, lpObject); (*env)->SetIntField(env, lpObject, CRYPT_BIT_BLOBFc.cbData, (jint)lpStruct->cbData); - (*env)->SetIntLongField(env, lpObject, CRYPT_BIT_BLOBFc.pbData, (jintLong)lpStruct->pbData); + (*env)->SetLongField(env, lpObject, CRYPT_BIT_BLOBFc.pbData, (jlong)lpStruct->pbData); (*env)->SetIntField(env, lpObject, CRYPT_BIT_BLOBFc.cUnusedBits, (jint)lpStruct->cUnusedBits); } #endif @@ -1090,7 +1090,7 @@ void cacheCRYPT_INTEGER_BLOBFields(JNIEnv *env, jobject lpObject) if (CRYPT_INTEGER_BLOBFc.cached) return; CRYPT_INTEGER_BLOBFc.clazz = (*env)->GetObjectClass(env, lpObject); CRYPT_INTEGER_BLOBFc.cbData = (*env)->GetFieldID(env, CRYPT_INTEGER_BLOBFc.clazz, "cbData", "I"); - CRYPT_INTEGER_BLOBFc.pbData = (*env)->GetFieldID(env, CRYPT_INTEGER_BLOBFc.clazz, "pbData", I_J); + CRYPT_INTEGER_BLOBFc.pbData = (*env)->GetFieldID(env, CRYPT_INTEGER_BLOBFc.clazz, "pbData", "J"); CRYPT_INTEGER_BLOBFc.cached = 1; } @@ -1098,7 +1098,7 @@ CRYPT_INTEGER_BLOB *getCRYPT_INTEGER_BLOBFields(JNIEnv *env, jobject lpObject, C { if (!CRYPT_INTEGER_BLOBFc.cached) cacheCRYPT_INTEGER_BLOBFields(env, lpObject); lpStruct->cbData = (*env)->GetIntField(env, lpObject, CRYPT_INTEGER_BLOBFc.cbData); - lpStruct->pbData = (BYTE *)(*env)->GetIntLongField(env, lpObject, CRYPT_INTEGER_BLOBFc.pbData); + lpStruct->pbData = (BYTE *)(*env)->GetLongField(env, lpObject, CRYPT_INTEGER_BLOBFc.pbData); return lpStruct; } @@ -1106,7 +1106,7 @@ void setCRYPT_INTEGER_BLOBFields(JNIEnv *env, jobject lpObject, CRYPT_INTEGER_BL { if (!CRYPT_INTEGER_BLOBFc.cached) cacheCRYPT_INTEGER_BLOBFields(env, lpObject); (*env)->SetIntField(env, lpObject, CRYPT_INTEGER_BLOBFc.cbData, (jint)lpStruct->cbData); - (*env)->SetIntLongField(env, lpObject, CRYPT_INTEGER_BLOBFc.pbData, (jintLong)lpStruct->pbData); + (*env)->SetLongField(env, lpObject, CRYPT_INTEGER_BLOBFc.pbData, (jlong)lpStruct->pbData); } #endif @@ -1124,7 +1124,7 @@ void cacheCRYPT_OBJID_BLOBFields(JNIEnv *env, jobject lpObject) if (CRYPT_OBJID_BLOBFc.cached) return; CRYPT_OBJID_BLOBFc.clazz = (*env)->GetObjectClass(env, lpObject); CRYPT_OBJID_BLOBFc.cbData = (*env)->GetFieldID(env, CRYPT_OBJID_BLOBFc.clazz, "cbData", "I"); - CRYPT_OBJID_BLOBFc.pbData = (*env)->GetFieldID(env, CRYPT_OBJID_BLOBFc.clazz, "pbData", I_J); + CRYPT_OBJID_BLOBFc.pbData = (*env)->GetFieldID(env, CRYPT_OBJID_BLOBFc.clazz, "pbData", "J"); CRYPT_OBJID_BLOBFc.cached = 1; } @@ -1132,7 +1132,7 @@ CRYPT_OBJID_BLOB *getCRYPT_OBJID_BLOBFields(JNIEnv *env, jobject lpObject, CRYPT { if (!CRYPT_OBJID_BLOBFc.cached) cacheCRYPT_OBJID_BLOBFields(env, lpObject); lpStruct->cbData = (*env)->GetIntField(env, lpObject, CRYPT_OBJID_BLOBFc.cbData); - lpStruct->pbData = (BYTE *)(*env)->GetIntLongField(env, lpObject, CRYPT_OBJID_BLOBFc.pbData); + lpStruct->pbData = (BYTE *)(*env)->GetLongField(env, lpObject, CRYPT_OBJID_BLOBFc.pbData); return lpStruct; } @@ -1140,7 +1140,7 @@ void setCRYPT_OBJID_BLOBFields(JNIEnv *env, jobject lpObject, CRYPT_OBJID_BLOB * { if (!CRYPT_OBJID_BLOBFc.cached) cacheCRYPT_OBJID_BLOBFields(env, lpObject); (*env)->SetIntField(env, lpObject, CRYPT_OBJID_BLOBFc.cbData, (jint)lpStruct->cbData); - (*env)->SetIntLongField(env, lpObject, CRYPT_OBJID_BLOBFc.pbData, (jintLong)lpStruct->pbData); + (*env)->SetLongField(env, lpObject, CRYPT_OBJID_BLOBFc.pbData, (jlong)lpStruct->pbData); } #endif @@ -1314,7 +1314,7 @@ void cacheDIBSECTIONFields(JNIEnv *env, jobject lpObject) DIBSECTIONFc.dsBitfields0 = (*env)->GetFieldID(env, DIBSECTIONFc.clazz, "dsBitfields0", "I"); DIBSECTIONFc.dsBitfields1 = (*env)->GetFieldID(env, DIBSECTIONFc.clazz, "dsBitfields1", "I"); DIBSECTIONFc.dsBitfields2 = (*env)->GetFieldID(env, DIBSECTIONFc.clazz, "dsBitfields2", "I"); - DIBSECTIONFc.dshSection = (*env)->GetFieldID(env, DIBSECTIONFc.clazz, "dshSection", I_J); + DIBSECTIONFc.dshSection = (*env)->GetFieldID(env, DIBSECTIONFc.clazz, "dshSection", "J"); DIBSECTIONFc.dsOffset = (*env)->GetFieldID(env, DIBSECTIONFc.clazz, "dsOffset", "I"); DIBSECTIONFc.cached = 1; } @@ -1337,7 +1337,7 @@ DIBSECTION *getDIBSECTIONFields(JNIEnv *env, jobject lpObject, DIBSECTION *lpStr lpStruct->dsBitfields[0] = (*env)->GetIntField(env, lpObject, DIBSECTIONFc.dsBitfields0); lpStruct->dsBitfields[1] = (*env)->GetIntField(env, lpObject, DIBSECTIONFc.dsBitfields1); lpStruct->dsBitfields[2] = (*env)->GetIntField(env, lpObject, DIBSECTIONFc.dsBitfields2); - lpStruct->dshSection = (HANDLE)(*env)->GetIntLongField(env, lpObject, DIBSECTIONFc.dshSection); + lpStruct->dshSection = (HANDLE)(*env)->GetLongField(env, lpObject, DIBSECTIONFc.dshSection); lpStruct->dsOffset = (*env)->GetIntField(env, lpObject, DIBSECTIONFc.dsOffset); return lpStruct; } @@ -1360,7 +1360,7 @@ void setDIBSECTIONFields(JNIEnv *env, jobject lpObject, DIBSECTION *lpStruct) (*env)->SetIntField(env, lpObject, DIBSECTIONFc.dsBitfields0, (jint)lpStruct->dsBitfields[0]); (*env)->SetIntField(env, lpObject, DIBSECTIONFc.dsBitfields1, (jint)lpStruct->dsBitfields[1]); (*env)->SetIntField(env, lpObject, DIBSECTIONFc.dsBitfields2, (jint)lpStruct->dsBitfields[2]); - (*env)->SetIntLongField(env, lpObject, DIBSECTIONFc.dshSection, (jintLong)lpStruct->dshSection); + (*env)->SetLongField(env, lpObject, DIBSECTIONFc.dshSection, (jlong)lpStruct->dshSection); (*env)->SetIntField(env, lpObject, DIBSECTIONFc.dsOffset, (jint)lpStruct->dsOffset); } #endif @@ -1381,8 +1381,8 @@ void cacheDOCHOSTUIINFOFields(JNIEnv *env, jobject lpObject) DOCHOSTUIINFOFc.cbSize = (*env)->GetFieldID(env, DOCHOSTUIINFOFc.clazz, "cbSize", "I"); DOCHOSTUIINFOFc.dwFlags = (*env)->GetFieldID(env, DOCHOSTUIINFOFc.clazz, "dwFlags", "I"); DOCHOSTUIINFOFc.dwDoubleClick = (*env)->GetFieldID(env, DOCHOSTUIINFOFc.clazz, "dwDoubleClick", "I"); - DOCHOSTUIINFOFc.pchHostCss = (*env)->GetFieldID(env, DOCHOSTUIINFOFc.clazz, "pchHostCss", I_J); - DOCHOSTUIINFOFc.pchHostNS = (*env)->GetFieldID(env, DOCHOSTUIINFOFc.clazz, "pchHostNS", I_J); + DOCHOSTUIINFOFc.pchHostCss = (*env)->GetFieldID(env, DOCHOSTUIINFOFc.clazz, "pchHostCss", "J"); + DOCHOSTUIINFOFc.pchHostNS = (*env)->GetFieldID(env, DOCHOSTUIINFOFc.clazz, "pchHostNS", "J"); DOCHOSTUIINFOFc.cached = 1; } @@ -1392,8 +1392,8 @@ DOCHOSTUIINFO *getDOCHOSTUIINFOFields(JNIEnv *env, jobject lpObject, DOCHOSTUIIN lpStruct->cbSize = (*env)->GetIntField(env, lpObject, DOCHOSTUIINFOFc.cbSize); lpStruct->dwFlags = (*env)->GetIntField(env, lpObject, DOCHOSTUIINFOFc.dwFlags); lpStruct->dwDoubleClick = (*env)->GetIntField(env, lpObject, DOCHOSTUIINFOFc.dwDoubleClick); - lpStruct->pchHostCss = (OLECHAR *)(*env)->GetIntLongField(env, lpObject, DOCHOSTUIINFOFc.pchHostCss); - lpStruct->pchHostNS = (OLECHAR *)(*env)->GetIntLongField(env, lpObject, DOCHOSTUIINFOFc.pchHostNS); + lpStruct->pchHostCss = (OLECHAR *)(*env)->GetLongField(env, lpObject, DOCHOSTUIINFOFc.pchHostCss); + lpStruct->pchHostNS = (OLECHAR *)(*env)->GetLongField(env, lpObject, DOCHOSTUIINFOFc.pchHostNS); return lpStruct; } @@ -1403,8 +1403,8 @@ void setDOCHOSTUIINFOFields(JNIEnv *env, jobject lpObject, DOCHOSTUIINFO *lpStru (*env)->SetIntField(env, lpObject, DOCHOSTUIINFOFc.cbSize, (jint)lpStruct->cbSize); (*env)->SetIntField(env, lpObject, DOCHOSTUIINFOFc.dwFlags, (jint)lpStruct->dwFlags); (*env)->SetIntField(env, lpObject, DOCHOSTUIINFOFc.dwDoubleClick, (jint)lpStruct->dwDoubleClick); - (*env)->SetIntLongField(env, lpObject, DOCHOSTUIINFOFc.pchHostCss, (jintLong)lpStruct->pchHostCss); - (*env)->SetIntLongField(env, lpObject, DOCHOSTUIINFOFc.pchHostNS, (jintLong)lpStruct->pchHostNS); + (*env)->SetLongField(env, lpObject, DOCHOSTUIINFOFc.pchHostCss, (jlong)lpStruct->pchHostCss); + (*env)->SetLongField(env, lpObject, DOCHOSTUIINFOFc.pchHostNS, (jlong)lpStruct->pchHostNS); } #endif @@ -1422,9 +1422,9 @@ void cacheDOCINFOFields(JNIEnv *env, jobject lpObject) if (DOCINFOFc.cached) return; DOCINFOFc.clazz = (*env)->GetObjectClass(env, lpObject); DOCINFOFc.cbSize = (*env)->GetFieldID(env, DOCINFOFc.clazz, "cbSize", "I"); - DOCINFOFc.lpszDocName = (*env)->GetFieldID(env, DOCINFOFc.clazz, "lpszDocName", I_J); - DOCINFOFc.lpszOutput = (*env)->GetFieldID(env, DOCINFOFc.clazz, "lpszOutput", I_J); - DOCINFOFc.lpszDatatype = (*env)->GetFieldID(env, DOCINFOFc.clazz, "lpszDatatype", I_J); + DOCINFOFc.lpszDocName = (*env)->GetFieldID(env, DOCINFOFc.clazz, "lpszDocName", "J"); + DOCINFOFc.lpszOutput = (*env)->GetFieldID(env, DOCINFOFc.clazz, "lpszOutput", "J"); + DOCINFOFc.lpszDatatype = (*env)->GetFieldID(env, DOCINFOFc.clazz, "lpszDatatype", "J"); DOCINFOFc.fwType = (*env)->GetFieldID(env, DOCINFOFc.clazz, "fwType", "I"); DOCINFOFc.cached = 1; } @@ -1433,9 +1433,9 @@ DOCINFO *getDOCINFOFields(JNIEnv *env, jobject lpObject, DOCINFO *lpStruct) { if (!DOCINFOFc.cached) cacheDOCINFOFields(env, lpObject); lpStruct->cbSize = (*env)->GetIntField(env, lpObject, DOCINFOFc.cbSize); - lpStruct->lpszDocName = (LPCTSTR)(*env)->GetIntLongField(env, lpObject, DOCINFOFc.lpszDocName); - lpStruct->lpszOutput = (LPCTSTR)(*env)->GetIntLongField(env, lpObject, DOCINFOFc.lpszOutput); - lpStruct->lpszDatatype = (LPCTSTR)(*env)->GetIntLongField(env, lpObject, DOCINFOFc.lpszDatatype); + lpStruct->lpszDocName = (LPCTSTR)(*env)->GetLongField(env, lpObject, DOCINFOFc.lpszDocName); + lpStruct->lpszOutput = (LPCTSTR)(*env)->GetLongField(env, lpObject, DOCINFOFc.lpszOutput); + lpStruct->lpszDatatype = (LPCTSTR)(*env)->GetLongField(env, lpObject, DOCINFOFc.lpszDatatype); lpStruct->fwType = (*env)->GetIntField(env, lpObject, DOCINFOFc.fwType); return lpStruct; } @@ -1444,9 +1444,9 @@ void setDOCINFOFields(JNIEnv *env, jobject lpObject, DOCINFO *lpStruct) { if (!DOCINFOFc.cached) cacheDOCINFOFields(env, lpObject); (*env)->SetIntField(env, lpObject, DOCINFOFc.cbSize, (jint)lpStruct->cbSize); - (*env)->SetIntLongField(env, lpObject, DOCINFOFc.lpszDocName, (jintLong)lpStruct->lpszDocName); - (*env)->SetIntLongField(env, lpObject, DOCINFOFc.lpszOutput, (jintLong)lpStruct->lpszOutput); - (*env)->SetIntLongField(env, lpObject, DOCINFOFc.lpszDatatype, (jintLong)lpStruct->lpszDatatype); + (*env)->SetLongField(env, lpObject, DOCINFOFc.lpszDocName, (jlong)lpStruct->lpszDocName); + (*env)->SetLongField(env, lpObject, DOCINFOFc.lpszOutput, (jlong)lpStruct->lpszOutput); + (*env)->SetLongField(env, lpObject, DOCINFOFc.lpszDatatype, (jlong)lpStruct->lpszDatatype); (*env)->SetIntField(env, lpObject, DOCINFOFc.fwType, (jint)lpStruct->fwType); } #endif @@ -1469,13 +1469,13 @@ void cacheDRAWITEMSTRUCTFields(JNIEnv *env, jobject lpObject) DRAWITEMSTRUCTFc.itemID = (*env)->GetFieldID(env, DRAWITEMSTRUCTFc.clazz, "itemID", "I"); DRAWITEMSTRUCTFc.itemAction = (*env)->GetFieldID(env, DRAWITEMSTRUCTFc.clazz, "itemAction", "I"); DRAWITEMSTRUCTFc.itemState = (*env)->GetFieldID(env, DRAWITEMSTRUCTFc.clazz, "itemState", "I"); - DRAWITEMSTRUCTFc.hwndItem = (*env)->GetFieldID(env, DRAWITEMSTRUCTFc.clazz, "hwndItem", I_J); - DRAWITEMSTRUCTFc.hDC = (*env)->GetFieldID(env, DRAWITEMSTRUCTFc.clazz, "hDC", I_J); + DRAWITEMSTRUCTFc.hwndItem = (*env)->GetFieldID(env, DRAWITEMSTRUCTFc.clazz, "hwndItem", "J"); + DRAWITEMSTRUCTFc.hDC = (*env)->GetFieldID(env, DRAWITEMSTRUCTFc.clazz, "hDC", "J"); DRAWITEMSTRUCTFc.left = (*env)->GetFieldID(env, DRAWITEMSTRUCTFc.clazz, "left", "I"); DRAWITEMSTRUCTFc.top = (*env)->GetFieldID(env, DRAWITEMSTRUCTFc.clazz, "top", "I"); DRAWITEMSTRUCTFc.bottom = (*env)->GetFieldID(env, DRAWITEMSTRUCTFc.clazz, "bottom", "I"); DRAWITEMSTRUCTFc.right = (*env)->GetFieldID(env, DRAWITEMSTRUCTFc.clazz, "right", "I"); - DRAWITEMSTRUCTFc.itemData = (*env)->GetFieldID(env, DRAWITEMSTRUCTFc.clazz, "itemData", I_J); + DRAWITEMSTRUCTFc.itemData = (*env)->GetFieldID(env, DRAWITEMSTRUCTFc.clazz, "itemData", "J"); DRAWITEMSTRUCTFc.cached = 1; } @@ -1487,13 +1487,13 @@ DRAWITEMSTRUCT *getDRAWITEMSTRUCTFields(JNIEnv *env, jobject lpObject, DRAWITEMS lpStruct->itemID = (*env)->GetIntField(env, lpObject, DRAWITEMSTRUCTFc.itemID); lpStruct->itemAction = (*env)->GetIntField(env, lpObject, DRAWITEMSTRUCTFc.itemAction); lpStruct->itemState = (*env)->GetIntField(env, lpObject, DRAWITEMSTRUCTFc.itemState); - lpStruct->hwndItem = (HWND)(*env)->GetIntLongField(env, lpObject, DRAWITEMSTRUCTFc.hwndItem); - lpStruct->hDC = (HDC)(*env)->GetIntLongField(env, lpObject, DRAWITEMSTRUCTFc.hDC); + lpStruct->hwndItem = (HWND)(*env)->GetLongField(env, lpObject, DRAWITEMSTRUCTFc.hwndItem); + lpStruct->hDC = (HDC)(*env)->GetLongField(env, lpObject, DRAWITEMSTRUCTFc.hDC); lpStruct->rcItem.left = (*env)->GetIntField(env, lpObject, DRAWITEMSTRUCTFc.left); lpStruct->rcItem.top = (*env)->GetIntField(env, lpObject, DRAWITEMSTRUCTFc.top); lpStruct->rcItem.bottom = (*env)->GetIntField(env, lpObject, DRAWITEMSTRUCTFc.bottom); lpStruct->rcItem.right = (*env)->GetIntField(env, lpObject, DRAWITEMSTRUCTFc.right); - lpStruct->itemData = (*env)->GetIntLongField(env, lpObject, DRAWITEMSTRUCTFc.itemData); + lpStruct->itemData = (*env)->GetLongField(env, lpObject, DRAWITEMSTRUCTFc.itemData); return lpStruct; } @@ -1505,13 +1505,13 @@ void setDRAWITEMSTRUCTFields(JNIEnv *env, jobject lpObject, DRAWITEMSTRUCT *lpSt (*env)->SetIntField(env, lpObject, DRAWITEMSTRUCTFc.itemID, (jint)lpStruct->itemID); (*env)->SetIntField(env, lpObject, DRAWITEMSTRUCTFc.itemAction, (jint)lpStruct->itemAction); (*env)->SetIntField(env, lpObject, DRAWITEMSTRUCTFc.itemState, (jint)lpStruct->itemState); - (*env)->SetIntLongField(env, lpObject, DRAWITEMSTRUCTFc.hwndItem, (jintLong)lpStruct->hwndItem); - (*env)->SetIntLongField(env, lpObject, DRAWITEMSTRUCTFc.hDC, (jintLong)lpStruct->hDC); + (*env)->SetLongField(env, lpObject, DRAWITEMSTRUCTFc.hwndItem, (jlong)lpStruct->hwndItem); + (*env)->SetLongField(env, lpObject, DRAWITEMSTRUCTFc.hDC, (jlong)lpStruct->hDC); (*env)->SetIntField(env, lpObject, DRAWITEMSTRUCTFc.left, (jint)lpStruct->rcItem.left); (*env)->SetIntField(env, lpObject, DRAWITEMSTRUCTFc.top, (jint)lpStruct->rcItem.top); (*env)->SetIntField(env, lpObject, DRAWITEMSTRUCTFc.bottom, (jint)lpStruct->rcItem.bottom); (*env)->SetIntField(env, lpObject, DRAWITEMSTRUCTFc.right, (jint)lpStruct->rcItem.right); - (*env)->SetIntLongField(env, lpObject, DRAWITEMSTRUCTFc.itemData, (jintLong)lpStruct->itemData); + (*env)->SetLongField(env, lpObject, DRAWITEMSTRUCTFc.itemData, (jlong)lpStruct->itemData); } #endif @@ -1584,8 +1584,8 @@ void cacheDTTOPTSFields(JNIEnv *env, jobject lpObject) DTTOPTSFc.iStateId = (*env)->GetFieldID(env, DTTOPTSFc.clazz, "iStateId", "I"); DTTOPTSFc.fApplyOverlay = (*env)->GetFieldID(env, DTTOPTSFc.clazz, "fApplyOverlay", "Z"); DTTOPTSFc.iGlowSize = (*env)->GetFieldID(env, DTTOPTSFc.clazz, "iGlowSize", "I"); - DTTOPTSFc.pfnDrawTextCallback = (*env)->GetFieldID(env, DTTOPTSFc.clazz, "pfnDrawTextCallback", I_J); - DTTOPTSFc.lParam = (*env)->GetFieldID(env, DTTOPTSFc.clazz, "lParam", I_J); + DTTOPTSFc.pfnDrawTextCallback = (*env)->GetFieldID(env, DTTOPTSFc.clazz, "pfnDrawTextCallback", "J"); + DTTOPTSFc.lParam = (*env)->GetFieldID(env, DTTOPTSFc.clazz, "lParam", "J"); DTTOPTSFc.cached = 1; } @@ -1608,8 +1608,8 @@ DTTOPTS *getDTTOPTSFields(JNIEnv *env, jobject lpObject, DTTOPTS *lpStruct) lpStruct->iStateId = (*env)->GetIntField(env, lpObject, DTTOPTSFc.iStateId); lpStruct->fApplyOverlay = (*env)->GetBooleanField(env, lpObject, DTTOPTSFc.fApplyOverlay); lpStruct->iGlowSize = (*env)->GetIntField(env, lpObject, DTTOPTSFc.iGlowSize); - lpStruct->pfnDrawTextCallback = (DTT_CALLBACK_PROC)(*env)->GetIntLongField(env, lpObject, DTTOPTSFc.pfnDrawTextCallback); - lpStruct->lParam = (*env)->GetIntLongField(env, lpObject, DTTOPTSFc.lParam); + lpStruct->pfnDrawTextCallback = (DTT_CALLBACK_PROC)(*env)->GetLongField(env, lpObject, DTTOPTSFc.pfnDrawTextCallback); + lpStruct->lParam = (*env)->GetLongField(env, lpObject, DTTOPTSFc.lParam); return lpStruct; } @@ -1632,8 +1632,8 @@ void setDTTOPTSFields(JNIEnv *env, jobject lpObject, DTTOPTS *lpStruct) (*env)->SetIntField(env, lpObject, DTTOPTSFc.iStateId, (jint)lpStruct->iStateId); (*env)->SetBooleanField(env, lpObject, DTTOPTSFc.fApplyOverlay, (jboolean)lpStruct->fApplyOverlay); (*env)->SetIntField(env, lpObject, DTTOPTSFc.iGlowSize, (jint)lpStruct->iGlowSize); - (*env)->SetIntLongField(env, lpObject, DTTOPTSFc.pfnDrawTextCallback, (jintLong)lpStruct->pfnDrawTextCallback); - (*env)->SetIntLongField(env, lpObject, DTTOPTSFc.lParam, (jintLong)lpStruct->lParam); + (*env)->SetLongField(env, lpObject, DTTOPTSFc.pfnDrawTextCallback, (jlong)lpStruct->pfnDrawTextCallback); + (*env)->SetLongField(env, lpObject, DTTOPTSFc.lParam, (jlong)lpStruct->lParam); } #endif @@ -1948,12 +1948,12 @@ void cacheGCP_RESULTSFields(JNIEnv *env, jobject lpObject) if (GCP_RESULTSFc.cached) return; GCP_RESULTSFc.clazz = (*env)->GetObjectClass(env, lpObject); GCP_RESULTSFc.lStructSize = (*env)->GetFieldID(env, GCP_RESULTSFc.clazz, "lStructSize", "I"); - GCP_RESULTSFc.lpOutString = (*env)->GetFieldID(env, GCP_RESULTSFc.clazz, "lpOutString", I_J); - GCP_RESULTSFc.lpOrder = (*env)->GetFieldID(env, GCP_RESULTSFc.clazz, "lpOrder", I_J); - GCP_RESULTSFc.lpDx = (*env)->GetFieldID(env, GCP_RESULTSFc.clazz, "lpDx", I_J); - GCP_RESULTSFc.lpCaretPos = (*env)->GetFieldID(env, GCP_RESULTSFc.clazz, "lpCaretPos", I_J); - GCP_RESULTSFc.lpClass = (*env)->GetFieldID(env, GCP_RESULTSFc.clazz, "lpClass", I_J); - GCP_RESULTSFc.lpGlyphs = (*env)->GetFieldID(env, GCP_RESULTSFc.clazz, "lpGlyphs", I_J); + GCP_RESULTSFc.lpOutString = (*env)->GetFieldID(env, GCP_RESULTSFc.clazz, "lpOutString", "J"); + GCP_RESULTSFc.lpOrder = (*env)->GetFieldID(env, GCP_RESULTSFc.clazz, "lpOrder", "J"); + GCP_RESULTSFc.lpDx = (*env)->GetFieldID(env, GCP_RESULTSFc.clazz, "lpDx", "J"); + GCP_RESULTSFc.lpCaretPos = (*env)->GetFieldID(env, GCP_RESULTSFc.clazz, "lpCaretPos", "J"); + GCP_RESULTSFc.lpClass = (*env)->GetFieldID(env, GCP_RESULTSFc.clazz, "lpClass", "J"); + GCP_RESULTSFc.lpGlyphs = (*env)->GetFieldID(env, GCP_RESULTSFc.clazz, "lpGlyphs", "J"); GCP_RESULTSFc.nGlyphs = (*env)->GetFieldID(env, GCP_RESULTSFc.clazz, "nGlyphs", "I"); GCP_RESULTSFc.nMaxFit = (*env)->GetFieldID(env, GCP_RESULTSFc.clazz, "nMaxFit", "I"); GCP_RESULTSFc.cached = 1; @@ -1963,12 +1963,12 @@ GCP_RESULTS *getGCP_RESULTSFields(JNIEnv *env, jobject lpObject, GCP_RESULTS *lp { if (!GCP_RESULTSFc.cached) cacheGCP_RESULTSFields(env, lpObject); lpStruct->lStructSize = (*env)->GetIntField(env, lpObject, GCP_RESULTSFc.lStructSize); - lpStruct->lpOutString = (LPTSTR)(*env)->GetIntLongField(env, lpObject, GCP_RESULTSFc.lpOutString); - lpStruct->lpOrder = (UINT *)(*env)->GetIntLongField(env, lpObject, GCP_RESULTSFc.lpOrder); - lpStruct->lpDx = (int *)(*env)->GetIntLongField(env, lpObject, GCP_RESULTSFc.lpDx); - lpStruct->lpCaretPos = (int *)(*env)->GetIntLongField(env, lpObject, GCP_RESULTSFc.lpCaretPos); - lpStruct->lpClass = (LPSTR)(*env)->GetIntLongField(env, lpObject, GCP_RESULTSFc.lpClass); - lpStruct->lpGlyphs = (LPWSTR)(*env)->GetIntLongField(env, lpObject, GCP_RESULTSFc.lpGlyphs); + lpStruct->lpOutString = (LPTSTR)(*env)->GetLongField(env, lpObject, GCP_RESULTSFc.lpOutString); + lpStruct->lpOrder = (UINT *)(*env)->GetLongField(env, lpObject, GCP_RESULTSFc.lpOrder); + lpStruct->lpDx = (int *)(*env)->GetLongField(env, lpObject, GCP_RESULTSFc.lpDx); + lpStruct->lpCaretPos = (int *)(*env)->GetLongField(env, lpObject, GCP_RESULTSFc.lpCaretPos); + lpStruct->lpClass = (LPSTR)(*env)->GetLongField(env, lpObject, GCP_RESULTSFc.lpClass); + lpStruct->lpGlyphs = (LPWSTR)(*env)->GetLongField(env, lpObject, GCP_RESULTSFc.lpGlyphs); lpStruct->nGlyphs = (*env)->GetIntField(env, lpObject, GCP_RESULTSFc.nGlyphs); lpStruct->nMaxFit = (*env)->GetIntField(env, lpObject, GCP_RESULTSFc.nMaxFit); return lpStruct; @@ -1978,12 +1978,12 @@ void setGCP_RESULTSFields(JNIEnv *env, jobject lpObject, GCP_RESULTS *lpStruct) { if (!GCP_RESULTSFc.cached) cacheGCP_RESULTSFields(env, lpObject); (*env)->SetIntField(env, lpObject, GCP_RESULTSFc.lStructSize, (jint)lpStruct->lStructSize); - (*env)->SetIntLongField(env, lpObject, GCP_RESULTSFc.lpOutString, (jintLong)lpStruct->lpOutString); - (*env)->SetIntLongField(env, lpObject, GCP_RESULTSFc.lpOrder, (jintLong)lpStruct->lpOrder); - (*env)->SetIntLongField(env, lpObject, GCP_RESULTSFc.lpDx, (jintLong)lpStruct->lpDx); - (*env)->SetIntLongField(env, lpObject, GCP_RESULTSFc.lpCaretPos, (jintLong)lpStruct->lpCaretPos); - (*env)->SetIntLongField(env, lpObject, GCP_RESULTSFc.lpClass, (jintLong)lpStruct->lpClass); - (*env)->SetIntLongField(env, lpObject, GCP_RESULTSFc.lpGlyphs, (jintLong)lpStruct->lpGlyphs); + (*env)->SetLongField(env, lpObject, GCP_RESULTSFc.lpOutString, (jlong)lpStruct->lpOutString); + (*env)->SetLongField(env, lpObject, GCP_RESULTSFc.lpOrder, (jlong)lpStruct->lpOrder); + (*env)->SetLongField(env, lpObject, GCP_RESULTSFc.lpDx, (jlong)lpStruct->lpDx); + (*env)->SetLongField(env, lpObject, GCP_RESULTSFc.lpCaretPos, (jlong)lpStruct->lpCaretPos); + (*env)->SetLongField(env, lpObject, GCP_RESULTSFc.lpClass, (jlong)lpStruct->lpClass); + (*env)->SetLongField(env, lpObject, GCP_RESULTSFc.lpGlyphs, (jlong)lpStruct->lpGlyphs); (*env)->SetIntField(env, lpObject, GCP_RESULTSFc.nGlyphs, (jint)lpStruct->nGlyphs); (*env)->SetIntField(env, lpObject, GCP_RESULTSFc.nMaxFit, (jint)lpStruct->nMaxFit); } @@ -2042,7 +2042,7 @@ void cacheGESTUREINFOFields(JNIEnv *env, jobject lpObject) GESTUREINFOFc.cbSize = (*env)->GetFieldID(env, GESTUREINFOFc.clazz, "cbSize", "I"); GESTUREINFOFc.dwFlags = (*env)->GetFieldID(env, GESTUREINFOFc.clazz, "dwFlags", "I"); GESTUREINFOFc.dwID = (*env)->GetFieldID(env, GESTUREINFOFc.clazz, "dwID", "I"); - GESTUREINFOFc.hwndTarget = (*env)->GetFieldID(env, GESTUREINFOFc.clazz, "hwndTarget", I_J); + GESTUREINFOFc.hwndTarget = (*env)->GetFieldID(env, GESTUREINFOFc.clazz, "hwndTarget", "J"); GESTUREINFOFc.x = (*env)->GetFieldID(env, GESTUREINFOFc.clazz, "x", "S"); GESTUREINFOFc.y = (*env)->GetFieldID(env, GESTUREINFOFc.clazz, "y", "S"); GESTUREINFOFc.dwInstanceID = (*env)->GetFieldID(env, GESTUREINFOFc.clazz, "dwInstanceID", "I"); @@ -2058,7 +2058,7 @@ GESTUREINFO *getGESTUREINFOFields(JNIEnv *env, jobject lpObject, GESTUREINFO *lp lpStruct->cbSize = (*env)->GetIntField(env, lpObject, GESTUREINFOFc.cbSize); lpStruct->dwFlags = (*env)->GetIntField(env, lpObject, GESTUREINFOFc.dwFlags); lpStruct->dwID = (*env)->GetIntField(env, lpObject, GESTUREINFOFc.dwID); - lpStruct->hwndTarget = (HWND)(*env)->GetIntLongField(env, lpObject, GESTUREINFOFc.hwndTarget); + lpStruct->hwndTarget = (HWND)(*env)->GetLongField(env, lpObject, GESTUREINFOFc.hwndTarget); lpStruct->ptsLocation.x = (*env)->GetShortField(env, lpObject, GESTUREINFOFc.x); lpStruct->ptsLocation.y = (*env)->GetShortField(env, lpObject, GESTUREINFOFc.y); lpStruct->dwInstanceID = (*env)->GetIntField(env, lpObject, GESTUREINFOFc.dwInstanceID); @@ -2074,7 +2074,7 @@ void setGESTUREINFOFields(JNIEnv *env, jobject lpObject, GESTUREINFO *lpStruct) (*env)->SetIntField(env, lpObject, GESTUREINFOFc.cbSize, (jint)lpStruct->cbSize); (*env)->SetIntField(env, lpObject, GESTUREINFOFc.dwFlags, (jint)lpStruct->dwFlags); (*env)->SetIntField(env, lpObject, GESTUREINFOFc.dwID, (jint)lpStruct->dwID); - (*env)->SetIntLongField(env, lpObject, GESTUREINFOFc.hwndTarget, (jintLong)lpStruct->hwndTarget); + (*env)->SetLongField(env, lpObject, GESTUREINFOFc.hwndTarget, (jlong)lpStruct->hwndTarget); (*env)->SetShortField(env, lpObject, GESTUREINFOFc.x, (jshort)lpStruct->ptsLocation.x); (*env)->SetShortField(env, lpObject, GESTUREINFOFc.y, (jshort)lpStruct->ptsLocation.y); (*env)->SetIntField(env, lpObject, GESTUREINFOFc.dwInstanceID, (jint)lpStruct->dwInstanceID); @@ -2133,12 +2133,12 @@ void cacheGUITHREADINFOFields(JNIEnv *env, jobject lpObject) GUITHREADINFOFc.clazz = (*env)->GetObjectClass(env, lpObject); GUITHREADINFOFc.cbSize = (*env)->GetFieldID(env, GUITHREADINFOFc.clazz, "cbSize", "I"); GUITHREADINFOFc.flags = (*env)->GetFieldID(env, GUITHREADINFOFc.clazz, "flags", "I"); - GUITHREADINFOFc.hwndActive = (*env)->GetFieldID(env, GUITHREADINFOFc.clazz, "hwndActive", I_J); - GUITHREADINFOFc.hwndFocus = (*env)->GetFieldID(env, GUITHREADINFOFc.clazz, "hwndFocus", I_J); - GUITHREADINFOFc.hwndCapture = (*env)->GetFieldID(env, GUITHREADINFOFc.clazz, "hwndCapture", I_J); - GUITHREADINFOFc.hwndMenuOwner = (*env)->GetFieldID(env, GUITHREADINFOFc.clazz, "hwndMenuOwner", I_J); - GUITHREADINFOFc.hwndMoveSize = (*env)->GetFieldID(env, GUITHREADINFOFc.clazz, "hwndMoveSize", I_J); - GUITHREADINFOFc.hwndCaret = (*env)->GetFieldID(env, GUITHREADINFOFc.clazz, "hwndCaret", I_J); + GUITHREADINFOFc.hwndActive = (*env)->GetFieldID(env, GUITHREADINFOFc.clazz, "hwndActive", "J"); + GUITHREADINFOFc.hwndFocus = (*env)->GetFieldID(env, GUITHREADINFOFc.clazz, "hwndFocus", "J"); + GUITHREADINFOFc.hwndCapture = (*env)->GetFieldID(env, GUITHREADINFOFc.clazz, "hwndCapture", "J"); + GUITHREADINFOFc.hwndMenuOwner = (*env)->GetFieldID(env, GUITHREADINFOFc.clazz, "hwndMenuOwner", "J"); + GUITHREADINFOFc.hwndMoveSize = (*env)->GetFieldID(env, GUITHREADINFOFc.clazz, "hwndMoveSize", "J"); + GUITHREADINFOFc.hwndCaret = (*env)->GetFieldID(env, GUITHREADINFOFc.clazz, "hwndCaret", "J"); GUITHREADINFOFc.left = (*env)->GetFieldID(env, GUITHREADINFOFc.clazz, "left", "I"); GUITHREADINFOFc.top = (*env)->GetFieldID(env, GUITHREADINFOFc.clazz, "top", "I"); GUITHREADINFOFc.right = (*env)->GetFieldID(env, GUITHREADINFOFc.clazz, "right", "I"); @@ -2151,12 +2151,12 @@ GUITHREADINFO *getGUITHREADINFOFields(JNIEnv *env, jobject lpObject, GUITHREADIN if (!GUITHREADINFOFc.cached) cacheGUITHREADINFOFields(env, lpObject); lpStruct->cbSize = (DWORD)(*env)->GetIntField(env, lpObject, GUITHREADINFOFc.cbSize); lpStruct->flags = (DWORD)(*env)->GetIntField(env, lpObject, GUITHREADINFOFc.flags); - lpStruct->hwndActive = (HWND)(*env)->GetIntLongField(env, lpObject, GUITHREADINFOFc.hwndActive); - lpStruct->hwndFocus = (HWND)(*env)->GetIntLongField(env, lpObject, GUITHREADINFOFc.hwndFocus); - lpStruct->hwndCapture = (HWND)(*env)->GetIntLongField(env, lpObject, GUITHREADINFOFc.hwndCapture); - lpStruct->hwndMenuOwner = (HWND)(*env)->GetIntLongField(env, lpObject, GUITHREADINFOFc.hwndMenuOwner); - lpStruct->hwndMoveSize = (HWND)(*env)->GetIntLongField(env, lpObject, GUITHREADINFOFc.hwndMoveSize); - lpStruct->hwndCaret = (HWND)(*env)->GetIntLongField(env, lpObject, GUITHREADINFOFc.hwndCaret); + lpStruct->hwndActive = (HWND)(*env)->GetLongField(env, lpObject, GUITHREADINFOFc.hwndActive); + lpStruct->hwndFocus = (HWND)(*env)->GetLongField(env, lpObject, GUITHREADINFOFc.hwndFocus); + lpStruct->hwndCapture = (HWND)(*env)->GetLongField(env, lpObject, GUITHREADINFOFc.hwndCapture); + lpStruct->hwndMenuOwner = (HWND)(*env)->GetLongField(env, lpObject, GUITHREADINFOFc.hwndMenuOwner); + lpStruct->hwndMoveSize = (HWND)(*env)->GetLongField(env, lpObject, GUITHREADINFOFc.hwndMoveSize); + lpStruct->hwndCaret = (HWND)(*env)->GetLongField(env, lpObject, GUITHREADINFOFc.hwndCaret); lpStruct->rcCaret.left = (*env)->GetIntField(env, lpObject, GUITHREADINFOFc.left); lpStruct->rcCaret.top = (*env)->GetIntField(env, lpObject, GUITHREADINFOFc.top); lpStruct->rcCaret.right = (*env)->GetIntField(env, lpObject, GUITHREADINFOFc.right); @@ -2169,12 +2169,12 @@ void setGUITHREADINFOFields(JNIEnv *env, jobject lpObject, GUITHREADINFO *lpStru if (!GUITHREADINFOFc.cached) cacheGUITHREADINFOFields(env, lpObject); (*env)->SetIntField(env, lpObject, GUITHREADINFOFc.cbSize, (jint)lpStruct->cbSize); (*env)->SetIntField(env, lpObject, GUITHREADINFOFc.flags, (jint)lpStruct->flags); - (*env)->SetIntLongField(env, lpObject, GUITHREADINFOFc.hwndActive, (jintLong)lpStruct->hwndActive); - (*env)->SetIntLongField(env, lpObject, GUITHREADINFOFc.hwndFocus, (jintLong)lpStruct->hwndFocus); - (*env)->SetIntLongField(env, lpObject, GUITHREADINFOFc.hwndCapture, (jintLong)lpStruct->hwndCapture); - (*env)->SetIntLongField(env, lpObject, GUITHREADINFOFc.hwndMenuOwner, (jintLong)lpStruct->hwndMenuOwner); - (*env)->SetIntLongField(env, lpObject, GUITHREADINFOFc.hwndMoveSize, (jintLong)lpStruct->hwndMoveSize); - (*env)->SetIntLongField(env, lpObject, GUITHREADINFOFc.hwndCaret, (jintLong)lpStruct->hwndCaret); + (*env)->SetLongField(env, lpObject, GUITHREADINFOFc.hwndActive, (jlong)lpStruct->hwndActive); + (*env)->SetLongField(env, lpObject, GUITHREADINFOFc.hwndFocus, (jlong)lpStruct->hwndFocus); + (*env)->SetLongField(env, lpObject, GUITHREADINFOFc.hwndCapture, (jlong)lpStruct->hwndCapture); + (*env)->SetLongField(env, lpObject, GUITHREADINFOFc.hwndMenuOwner, (jlong)lpStruct->hwndMenuOwner); + (*env)->SetLongField(env, lpObject, GUITHREADINFOFc.hwndMoveSize, (jlong)lpStruct->hwndMoveSize); + (*env)->SetLongField(env, lpObject, GUITHREADINFOFc.hwndCaret, (jlong)lpStruct->hwndCaret); (*env)->SetIntField(env, lpObject, GUITHREADINFOFc.left, (jint)lpStruct->rcCaret.left); (*env)->SetIntField(env, lpObject, GUITHREADINFOFc.top, (jint)lpStruct->rcCaret.top); (*env)->SetIntField(env, lpObject, GUITHREADINFOFc.right, (jint)lpStruct->rcCaret.right); @@ -2237,15 +2237,15 @@ void cacheHDITEMFields(JNIEnv *env, jobject lpObject) HDITEMFc.clazz = (*env)->GetObjectClass(env, lpObject); HDITEMFc.mask = (*env)->GetFieldID(env, HDITEMFc.clazz, "mask", "I"); HDITEMFc.cxy = (*env)->GetFieldID(env, HDITEMFc.clazz, "cxy", "I"); - HDITEMFc.pszText = (*env)->GetFieldID(env, HDITEMFc.clazz, "pszText", I_J); - HDITEMFc.hbm = (*env)->GetFieldID(env, HDITEMFc.clazz, "hbm", I_J); + HDITEMFc.pszText = (*env)->GetFieldID(env, HDITEMFc.clazz, "pszText", "J"); + HDITEMFc.hbm = (*env)->GetFieldID(env, HDITEMFc.clazz, "hbm", "J"); HDITEMFc.cchTextMax = (*env)->GetFieldID(env, HDITEMFc.clazz, "cchTextMax", "I"); HDITEMFc.fmt = (*env)->GetFieldID(env, HDITEMFc.clazz, "fmt", "I"); - HDITEMFc.lParam = (*env)->GetFieldID(env, HDITEMFc.clazz, "lParam", I_J); + HDITEMFc.lParam = (*env)->GetFieldID(env, HDITEMFc.clazz, "lParam", "J"); HDITEMFc.iImage = (*env)->GetFieldID(env, HDITEMFc.clazz, "iImage", "I"); HDITEMFc.iOrder = (*env)->GetFieldID(env, HDITEMFc.clazz, "iOrder", "I"); HDITEMFc.type = (*env)->GetFieldID(env, HDITEMFc.clazz, "type", "I"); - HDITEMFc.pvFilter = (*env)->GetFieldID(env, HDITEMFc.clazz, "pvFilter", I_J); + HDITEMFc.pvFilter = (*env)->GetFieldID(env, HDITEMFc.clazz, "pvFilter", "J"); HDITEMFc.cached = 1; } @@ -2254,15 +2254,15 @@ HDITEM *getHDITEMFields(JNIEnv *env, jobject lpObject, HDITEM *lpStruct) if (!HDITEMFc.cached) cacheHDITEMFields(env, lpObject); lpStruct->mask = (*env)->GetIntField(env, lpObject, HDITEMFc.mask); lpStruct->cxy = (*env)->GetIntField(env, lpObject, HDITEMFc.cxy); - lpStruct->pszText = (LPTSTR)(*env)->GetIntLongField(env, lpObject, HDITEMFc.pszText); - lpStruct->hbm = (HBITMAP)(*env)->GetIntLongField(env, lpObject, HDITEMFc.hbm); + lpStruct->pszText = (LPTSTR)(*env)->GetLongField(env, lpObject, HDITEMFc.pszText); + lpStruct->hbm = (HBITMAP)(*env)->GetLongField(env, lpObject, HDITEMFc.hbm); lpStruct->cchTextMax = (*env)->GetIntField(env, lpObject, HDITEMFc.cchTextMax); lpStruct->fmt = (*env)->GetIntField(env, lpObject, HDITEMFc.fmt); - lpStruct->lParam = (*env)->GetIntLongField(env, lpObject, HDITEMFc.lParam); + lpStruct->lParam = (*env)->GetLongField(env, lpObject, HDITEMFc.lParam); lpStruct->iImage = (*env)->GetIntField(env, lpObject, HDITEMFc.iImage); lpStruct->iOrder = (*env)->GetIntField(env, lpObject, HDITEMFc.iOrder); lpStruct->type = (*env)->GetIntField(env, lpObject, HDITEMFc.type); - lpStruct->pvFilter = (void *)(*env)->GetIntLongField(env, lpObject, HDITEMFc.pvFilter); + lpStruct->pvFilter = (void *)(*env)->GetLongField(env, lpObject, HDITEMFc.pvFilter); return lpStruct; } @@ -2271,15 +2271,15 @@ void setHDITEMFields(JNIEnv *env, jobject lpObject, HDITEM *lpStruct) if (!HDITEMFc.cached) cacheHDITEMFields(env, lpObject); (*env)->SetIntField(env, lpObject, HDITEMFc.mask, (jint)lpStruct->mask); (*env)->SetIntField(env, lpObject, HDITEMFc.cxy, (jint)lpStruct->cxy); - (*env)->SetIntLongField(env, lpObject, HDITEMFc.pszText, (jintLong)lpStruct->pszText); - (*env)->SetIntLongField(env, lpObject, HDITEMFc.hbm, (jintLong)lpStruct->hbm); + (*env)->SetLongField(env, lpObject, HDITEMFc.pszText, (jlong)lpStruct->pszText); + (*env)->SetLongField(env, lpObject, HDITEMFc.hbm, (jlong)lpStruct->hbm); (*env)->SetIntField(env, lpObject, HDITEMFc.cchTextMax, (jint)lpStruct->cchTextMax); (*env)->SetIntField(env, lpObject, HDITEMFc.fmt, (jint)lpStruct->fmt); - (*env)->SetIntLongField(env, lpObject, HDITEMFc.lParam, (jintLong)lpStruct->lParam); + (*env)->SetLongField(env, lpObject, HDITEMFc.lParam, (jlong)lpStruct->lParam); (*env)->SetIntField(env, lpObject, HDITEMFc.iImage, (jint)lpStruct->iImage); (*env)->SetIntField(env, lpObject, HDITEMFc.iOrder, (jint)lpStruct->iOrder); (*env)->SetIntField(env, lpObject, HDITEMFc.type, (jint)lpStruct->type); - (*env)->SetIntLongField(env, lpObject, HDITEMFc.pvFilter, (jintLong)lpStruct->pvFilter); + (*env)->SetLongField(env, lpObject, HDITEMFc.pvFilter, (jlong)lpStruct->pvFilter); } #endif @@ -2296,24 +2296,24 @@ void cacheHDLAYOUTFields(JNIEnv *env, jobject lpObject) { if (HDLAYOUTFc.cached) return; HDLAYOUTFc.clazz = (*env)->GetObjectClass(env, lpObject); - HDLAYOUTFc.prc = (*env)->GetFieldID(env, HDLAYOUTFc.clazz, "prc", I_J); - HDLAYOUTFc.pwpos = (*env)->GetFieldID(env, HDLAYOUTFc.clazz, "pwpos", I_J); + HDLAYOUTFc.prc = (*env)->GetFieldID(env, HDLAYOUTFc.clazz, "prc", "J"); + HDLAYOUTFc.pwpos = (*env)->GetFieldID(env, HDLAYOUTFc.clazz, "pwpos", "J"); HDLAYOUTFc.cached = 1; } HDLAYOUT *getHDLAYOUTFields(JNIEnv *env, jobject lpObject, HDLAYOUT *lpStruct) { if (!HDLAYOUTFc.cached) cacheHDLAYOUTFields(env, lpObject); - lpStruct->prc = (RECT *)(*env)->GetIntLongField(env, lpObject, HDLAYOUTFc.prc); - lpStruct->pwpos = (WINDOWPOS *)(*env)->GetIntLongField(env, lpObject, HDLAYOUTFc.pwpos); + lpStruct->prc = (RECT *)(*env)->GetLongField(env, lpObject, HDLAYOUTFc.prc); + lpStruct->pwpos = (WINDOWPOS *)(*env)->GetLongField(env, lpObject, HDLAYOUTFc.pwpos); return lpStruct; } void setHDLAYOUTFields(JNIEnv *env, jobject lpObject, HDLAYOUT *lpStruct) { if (!HDLAYOUTFc.cached) cacheHDLAYOUTFields(env, lpObject); - (*env)->SetIntLongField(env, lpObject, HDLAYOUTFc.prc, (jintLong)lpStruct->prc); - (*env)->SetIntLongField(env, lpObject, HDLAYOUTFc.pwpos, (jintLong)lpStruct->pwpos); + (*env)->SetLongField(env, lpObject, HDLAYOUTFc.prc, (jlong)lpStruct->prc); + (*env)->SetLongField(env, lpObject, HDLAYOUTFc.pwpos, (jlong)lpStruct->pwpos); } #endif @@ -2333,7 +2333,7 @@ void cacheHELPINFOFields(JNIEnv *env, jobject lpObject) HELPINFOFc.cbSize = (*env)->GetFieldID(env, HELPINFOFc.clazz, "cbSize", "I"); HELPINFOFc.iContextType = (*env)->GetFieldID(env, HELPINFOFc.clazz, "iContextType", "I"); HELPINFOFc.iCtrlId = (*env)->GetFieldID(env, HELPINFOFc.clazz, "iCtrlId", "I"); - HELPINFOFc.hItemHandle = (*env)->GetFieldID(env, HELPINFOFc.clazz, "hItemHandle", I_J); + HELPINFOFc.hItemHandle = (*env)->GetFieldID(env, HELPINFOFc.clazz, "hItemHandle", "J"); HELPINFOFc.dwContextId = (*env)->GetFieldID(env, HELPINFOFc.clazz, "dwContextId", "I"); HELPINFOFc.x = (*env)->GetFieldID(env, HELPINFOFc.clazz, "x", "I"); HELPINFOFc.y = (*env)->GetFieldID(env, HELPINFOFc.clazz, "y", "I"); @@ -2346,7 +2346,7 @@ HELPINFO *getHELPINFOFields(JNIEnv *env, jobject lpObject, HELPINFO *lpStruct) lpStruct->cbSize = (*env)->GetIntField(env, lpObject, HELPINFOFc.cbSize); lpStruct->iContextType = (*env)->GetIntField(env, lpObject, HELPINFOFc.iContextType); lpStruct->iCtrlId = (*env)->GetIntField(env, lpObject, HELPINFOFc.iCtrlId); - lpStruct->hItemHandle = (HANDLE)(*env)->GetIntLongField(env, lpObject, HELPINFOFc.hItemHandle); + lpStruct->hItemHandle = (HANDLE)(*env)->GetLongField(env, lpObject, HELPINFOFc.hItemHandle); lpStruct->dwContextId = (*env)->GetIntField(env, lpObject, HELPINFOFc.dwContextId); lpStruct->MousePos.x = (*env)->GetIntField(env, lpObject, HELPINFOFc.x); lpStruct->MousePos.y = (*env)->GetIntField(env, lpObject, HELPINFOFc.y); @@ -2359,7 +2359,7 @@ void setHELPINFOFields(JNIEnv *env, jobject lpObject, HELPINFO *lpStruct) (*env)->SetIntField(env, lpObject, HELPINFOFc.cbSize, (jint)lpStruct->cbSize); (*env)->SetIntField(env, lpObject, HELPINFOFc.iContextType, (jint)lpStruct->iContextType); (*env)->SetIntField(env, lpObject, HELPINFOFc.iCtrlId, (jint)lpStruct->iCtrlId); - (*env)->SetIntLongField(env, lpObject, HELPINFOFc.hItemHandle, (jintLong)lpStruct->hItemHandle); + (*env)->SetLongField(env, lpObject, HELPINFOFc.hItemHandle, (jlong)lpStruct->hItemHandle); (*env)->SetIntField(env, lpObject, HELPINFOFc.dwContextId, (jint)lpStruct->dwContextId); (*env)->SetIntField(env, lpObject, HELPINFOFc.x, (jint)lpStruct->MousePos.x); (*env)->SetIntField(env, lpObject, HELPINFOFc.y, (jint)lpStruct->MousePos.y); @@ -2381,7 +2381,7 @@ void cacheHIGHCONTRASTFields(JNIEnv *env, jobject lpObject) HIGHCONTRASTFc.clazz = (*env)->GetObjectClass(env, lpObject); HIGHCONTRASTFc.cbSize = (*env)->GetFieldID(env, HIGHCONTRASTFc.clazz, "cbSize", "I"); HIGHCONTRASTFc.dwFlags = (*env)->GetFieldID(env, HIGHCONTRASTFc.clazz, "dwFlags", "I"); - HIGHCONTRASTFc.lpszDefaultScheme = (*env)->GetFieldID(env, HIGHCONTRASTFc.clazz, "lpszDefaultScheme", I_J); + HIGHCONTRASTFc.lpszDefaultScheme = (*env)->GetFieldID(env, HIGHCONTRASTFc.clazz, "lpszDefaultScheme", "J"); HIGHCONTRASTFc.cached = 1; } @@ -2390,7 +2390,7 @@ HIGHCONTRAST *getHIGHCONTRASTFields(JNIEnv *env, jobject lpObject, HIGHCONTRAST if (!HIGHCONTRASTFc.cached) cacheHIGHCONTRASTFields(env, lpObject); lpStruct->cbSize = (*env)->GetIntField(env, lpObject, HIGHCONTRASTFc.cbSize); lpStruct->dwFlags = (*env)->GetIntField(env, lpObject, HIGHCONTRASTFc.dwFlags); - lpStruct->lpszDefaultScheme = (LPTSTR)(*env)->GetIntLongField(env, lpObject, HIGHCONTRASTFc.lpszDefaultScheme); + lpStruct->lpszDefaultScheme = (LPTSTR)(*env)->GetLongField(env, lpObject, HIGHCONTRASTFc.lpszDefaultScheme); return lpStruct; } @@ -2399,7 +2399,7 @@ void setHIGHCONTRASTFields(JNIEnv *env, jobject lpObject, HIGHCONTRAST *lpStruct if (!HIGHCONTRASTFc.cached) cacheHIGHCONTRASTFields(env, lpObject); (*env)->SetIntField(env, lpObject, HIGHCONTRASTFc.cbSize, (jint)lpStruct->cbSize); (*env)->SetIntField(env, lpObject, HIGHCONTRASTFc.dwFlags, (jint)lpStruct->dwFlags); - (*env)->SetIntLongField(env, lpObject, HIGHCONTRASTFc.lpszDefaultScheme, (jintLong)lpStruct->lpszDefaultScheme); + (*env)->SetLongField(env, lpObject, HIGHCONTRASTFc.lpszDefaultScheme, (jlong)lpStruct->lpszDefaultScheme); } #endif @@ -2419,8 +2419,8 @@ void cacheICONINFOFields(JNIEnv *env, jobject lpObject) ICONINFOFc.fIcon = (*env)->GetFieldID(env, ICONINFOFc.clazz, "fIcon", "Z"); ICONINFOFc.xHotspot = (*env)->GetFieldID(env, ICONINFOFc.clazz, "xHotspot", "I"); ICONINFOFc.yHotspot = (*env)->GetFieldID(env, ICONINFOFc.clazz, "yHotspot", "I"); - ICONINFOFc.hbmMask = (*env)->GetFieldID(env, ICONINFOFc.clazz, "hbmMask", I_J); - ICONINFOFc.hbmColor = (*env)->GetFieldID(env, ICONINFOFc.clazz, "hbmColor", I_J); + ICONINFOFc.hbmMask = (*env)->GetFieldID(env, ICONINFOFc.clazz, "hbmMask", "J"); + ICONINFOFc.hbmColor = (*env)->GetFieldID(env, ICONINFOFc.clazz, "hbmColor", "J"); ICONINFOFc.cached = 1; } @@ -2430,8 +2430,8 @@ ICONINFO *getICONINFOFields(JNIEnv *env, jobject lpObject, ICONINFO *lpStruct) lpStruct->fIcon = (*env)->GetBooleanField(env, lpObject, ICONINFOFc.fIcon); lpStruct->xHotspot = (*env)->GetIntField(env, lpObject, ICONINFOFc.xHotspot); lpStruct->yHotspot = (*env)->GetIntField(env, lpObject, ICONINFOFc.yHotspot); - lpStruct->hbmMask = (HBITMAP)(*env)->GetIntLongField(env, lpObject, ICONINFOFc.hbmMask); - lpStruct->hbmColor = (HBITMAP)(*env)->GetIntLongField(env, lpObject, ICONINFOFc.hbmColor); + lpStruct->hbmMask = (HBITMAP)(*env)->GetLongField(env, lpObject, ICONINFOFc.hbmMask); + lpStruct->hbmColor = (HBITMAP)(*env)->GetLongField(env, lpObject, ICONINFOFc.hbmColor); return lpStruct; } @@ -2441,8 +2441,8 @@ void setICONINFOFields(JNIEnv *env, jobject lpObject, ICONINFO *lpStruct) (*env)->SetBooleanField(env, lpObject, ICONINFOFc.fIcon, (jboolean)lpStruct->fIcon); (*env)->SetIntField(env, lpObject, ICONINFOFc.xHotspot, (jint)lpStruct->xHotspot); (*env)->SetIntField(env, lpObject, ICONINFOFc.yHotspot, (jint)lpStruct->yHotspot); - (*env)->SetIntLongField(env, lpObject, ICONINFOFc.hbmMask, (jintLong)lpStruct->hbmMask); - (*env)->SetIntLongField(env, lpObject, ICONINFOFc.hbmColor, (jintLong)lpStruct->hbmColor); + (*env)->SetLongField(env, lpObject, ICONINFOFc.hbmMask, (jlong)lpStruct->hbmMask); + (*env)->SetLongField(env, lpObject, ICONINFOFc.hbmColor, (jlong)lpStruct->hbmColor); } #endif @@ -2528,7 +2528,7 @@ void cacheKEYBDINPUTFields(JNIEnv *env, jobject lpObject) KEYBDINPUTFc.wScan = (*env)->GetFieldID(env, KEYBDINPUTFc.clazz, "wScan", "S"); KEYBDINPUTFc.dwFlags = (*env)->GetFieldID(env, KEYBDINPUTFc.clazz, "dwFlags", "I"); KEYBDINPUTFc.time = (*env)->GetFieldID(env, KEYBDINPUTFc.clazz, "time", "I"); - KEYBDINPUTFc.dwExtraInfo = (*env)->GetFieldID(env, KEYBDINPUTFc.clazz, "dwExtraInfo", I_J); + KEYBDINPUTFc.dwExtraInfo = (*env)->GetFieldID(env, KEYBDINPUTFc.clazz, "dwExtraInfo", "J"); KEYBDINPUTFc.cached = 1; } @@ -2539,7 +2539,7 @@ KEYBDINPUT *getKEYBDINPUTFields(JNIEnv *env, jobject lpObject, KEYBDINPUT *lpStr lpStruct->wScan = (*env)->GetShortField(env, lpObject, KEYBDINPUTFc.wScan); lpStruct->dwFlags = (*env)->GetIntField(env, lpObject, KEYBDINPUTFc.dwFlags); lpStruct->time = (*env)->GetIntField(env, lpObject, KEYBDINPUTFc.time); - lpStruct->dwExtraInfo = (*env)->GetIntLongField(env, lpObject, KEYBDINPUTFc.dwExtraInfo); + lpStruct->dwExtraInfo = (*env)->GetLongField(env, lpObject, KEYBDINPUTFc.dwExtraInfo); return lpStruct; } @@ -2550,7 +2550,7 @@ void setKEYBDINPUTFields(JNIEnv *env, jobject lpObject, KEYBDINPUT *lpStruct) (*env)->SetShortField(env, lpObject, KEYBDINPUTFc.wScan, (jshort)lpStruct->wScan); (*env)->SetIntField(env, lpObject, KEYBDINPUTFc.dwFlags, (jint)lpStruct->dwFlags); (*env)->SetIntField(env, lpObject, KEYBDINPUTFc.time, (jint)lpStruct->time); - (*env)->SetIntLongField(env, lpObject, KEYBDINPUTFc.dwExtraInfo, (jintLong)lpStruct->dwExtraInfo); + (*env)->SetLongField(env, lpObject, KEYBDINPUTFc.dwExtraInfo, (jlong)lpStruct->dwExtraInfo); } #endif @@ -2627,7 +2627,7 @@ void cacheLOGBRUSHFields(JNIEnv *env, jobject lpObject) LOGBRUSHFc.clazz = (*env)->GetObjectClass(env, lpObject); LOGBRUSHFc.lbStyle = (*env)->GetFieldID(env, LOGBRUSHFc.clazz, "lbStyle", "I"); LOGBRUSHFc.lbColor = (*env)->GetFieldID(env, LOGBRUSHFc.clazz, "lbColor", "I"); - LOGBRUSHFc.lbHatch = (*env)->GetFieldID(env, LOGBRUSHFc.clazz, "lbHatch", I_J); + LOGBRUSHFc.lbHatch = (*env)->GetFieldID(env, LOGBRUSHFc.clazz, "lbHatch", "J"); LOGBRUSHFc.cached = 1; } @@ -2636,7 +2636,7 @@ LOGBRUSH *getLOGBRUSHFields(JNIEnv *env, jobject lpObject, LOGBRUSH *lpStruct) if (!LOGBRUSHFc.cached) cacheLOGBRUSHFields(env, lpObject); lpStruct->lbStyle = (*env)->GetIntField(env, lpObject, LOGBRUSHFc.lbStyle); lpStruct->lbColor = (*env)->GetIntField(env, lpObject, LOGBRUSHFc.lbColor); - lpStruct->lbHatch = (*env)->GetIntLongField(env, lpObject, LOGBRUSHFc.lbHatch); + lpStruct->lbHatch = (*env)->GetLongField(env, lpObject, LOGBRUSHFc.lbHatch); return lpStruct; } @@ -2645,7 +2645,7 @@ void setLOGBRUSHFields(JNIEnv *env, jobject lpObject, LOGBRUSH *lpStruct) if (!LOGBRUSHFc.cached) cacheLOGBRUSHFields(env, lpObject); (*env)->SetIntField(env, lpObject, LOGBRUSHFc.lbStyle, (jint)lpStruct->lbStyle); (*env)->SetIntField(env, lpObject, LOGBRUSHFc.lbColor, (jint)lpStruct->lbColor); - (*env)->SetIntLongField(env, lpObject, LOGBRUSHFc.lbHatch, (jintLong)lpStruct->lbHatch); + (*env)->SetLongField(env, lpObject, LOGBRUSHFc.lbHatch, (jlong)lpStruct->lbHatch); } #endif @@ -2781,7 +2781,7 @@ void cacheLVCOLUMNFields(JNIEnv *env, jobject lpObject) LVCOLUMNFc.mask = (*env)->GetFieldID(env, LVCOLUMNFc.clazz, "mask", "I"); LVCOLUMNFc.fmt = (*env)->GetFieldID(env, LVCOLUMNFc.clazz, "fmt", "I"); LVCOLUMNFc.cx = (*env)->GetFieldID(env, LVCOLUMNFc.clazz, "cx", "I"); - LVCOLUMNFc.pszText = (*env)->GetFieldID(env, LVCOLUMNFc.clazz, "pszText", I_J); + LVCOLUMNFc.pszText = (*env)->GetFieldID(env, LVCOLUMNFc.clazz, "pszText", "J"); LVCOLUMNFc.cchTextMax = (*env)->GetFieldID(env, LVCOLUMNFc.clazz, "cchTextMax", "I"); LVCOLUMNFc.iSubItem = (*env)->GetFieldID(env, LVCOLUMNFc.clazz, "iSubItem", "I"); LVCOLUMNFc.iImage = (*env)->GetFieldID(env, LVCOLUMNFc.clazz, "iImage", "I"); @@ -2795,7 +2795,7 @@ LVCOLUMN *getLVCOLUMNFields(JNIEnv *env, jobject lpObject, LVCOLUMN *lpStruct) lpStruct->mask = (*env)->GetIntField(env, lpObject, LVCOLUMNFc.mask); lpStruct->fmt = (*env)->GetIntField(env, lpObject, LVCOLUMNFc.fmt); lpStruct->cx = (*env)->GetIntField(env, lpObject, LVCOLUMNFc.cx); - lpStruct->pszText = (LPTSTR)(*env)->GetIntLongField(env, lpObject, LVCOLUMNFc.pszText); + lpStruct->pszText = (LPTSTR)(*env)->GetLongField(env, lpObject, LVCOLUMNFc.pszText); lpStruct->cchTextMax = (*env)->GetIntField(env, lpObject, LVCOLUMNFc.cchTextMax); lpStruct->iSubItem = (*env)->GetIntField(env, lpObject, LVCOLUMNFc.iSubItem); lpStruct->iImage = (*env)->GetIntField(env, lpObject, LVCOLUMNFc.iImage); @@ -2809,7 +2809,7 @@ void setLVCOLUMNFields(JNIEnv *env, jobject lpObject, LVCOLUMN *lpStruct) (*env)->SetIntField(env, lpObject, LVCOLUMNFc.mask, (jint)lpStruct->mask); (*env)->SetIntField(env, lpObject, LVCOLUMNFc.fmt, (jint)lpStruct->fmt); (*env)->SetIntField(env, lpObject, LVCOLUMNFc.cx, (jint)lpStruct->cx); - (*env)->SetIntLongField(env, lpObject, LVCOLUMNFc.pszText, (jintLong)lpStruct->pszText); + (*env)->SetLongField(env, lpObject, LVCOLUMNFc.pszText, (jlong)lpStruct->pszText); (*env)->SetIntField(env, lpObject, LVCOLUMNFc.cchTextMax, (jint)lpStruct->cchTextMax); (*env)->SetIntField(env, lpObject, LVCOLUMNFc.iSubItem, (jint)lpStruct->iSubItem); (*env)->SetIntField(env, lpObject, LVCOLUMNFc.iImage, (jint)lpStruct->iImage); @@ -2918,14 +2918,14 @@ void cacheLVITEMFields(JNIEnv *env, jobject lpObject) LVITEMFc.iSubItem = (*env)->GetFieldID(env, LVITEMFc.clazz, "iSubItem", "I"); LVITEMFc.state = (*env)->GetFieldID(env, LVITEMFc.clazz, "state", "I"); LVITEMFc.stateMask = (*env)->GetFieldID(env, LVITEMFc.clazz, "stateMask", "I"); - LVITEMFc.pszText = (*env)->GetFieldID(env, LVITEMFc.clazz, "pszText", I_J); + LVITEMFc.pszText = (*env)->GetFieldID(env, LVITEMFc.clazz, "pszText", "J"); LVITEMFc.cchTextMax = (*env)->GetFieldID(env, LVITEMFc.clazz, "cchTextMax", "I"); LVITEMFc.iImage = (*env)->GetFieldID(env, LVITEMFc.clazz, "iImage", "I"); - LVITEMFc.lParam = (*env)->GetFieldID(env, LVITEMFc.clazz, "lParam", I_J); + LVITEMFc.lParam = (*env)->GetFieldID(env, LVITEMFc.clazz, "lParam", "J"); LVITEMFc.iIndent = (*env)->GetFieldID(env, LVITEMFc.clazz, "iIndent", "I"); LVITEMFc.iGroupId = (*env)->GetFieldID(env, LVITEMFc.clazz, "iGroupId", "I"); LVITEMFc.cColumns = (*env)->GetFieldID(env, LVITEMFc.clazz, "cColumns", "I"); - LVITEMFc.puColumns = (*env)->GetFieldID(env, LVITEMFc.clazz, "puColumns", I_J); + LVITEMFc.puColumns = (*env)->GetFieldID(env, LVITEMFc.clazz, "puColumns", "J"); LVITEMFc.cached = 1; } @@ -2937,14 +2937,14 @@ LVITEM *getLVITEMFields(JNIEnv *env, jobject lpObject, LVITEM *lpStruct) lpStruct->iSubItem = (*env)->GetIntField(env, lpObject, LVITEMFc.iSubItem); lpStruct->state = (*env)->GetIntField(env, lpObject, LVITEMFc.state); lpStruct->stateMask = (*env)->GetIntField(env, lpObject, LVITEMFc.stateMask); - lpStruct->pszText = (LPTSTR)(*env)->GetIntLongField(env, lpObject, LVITEMFc.pszText); + lpStruct->pszText = (LPTSTR)(*env)->GetLongField(env, lpObject, LVITEMFc.pszText); lpStruct->cchTextMax = (*env)->GetIntField(env, lpObject, LVITEMFc.cchTextMax); lpStruct->iImage = (*env)->GetIntField(env, lpObject, LVITEMFc.iImage); - lpStruct->lParam = (*env)->GetIntLongField(env, lpObject, LVITEMFc.lParam); + lpStruct->lParam = (*env)->GetLongField(env, lpObject, LVITEMFc.lParam); lpStruct->iIndent = (*env)->GetIntField(env, lpObject, LVITEMFc.iIndent); lpStruct->iGroupId = (*env)->GetIntField(env, lpObject, LVITEMFc.iGroupId); lpStruct->cColumns = (*env)->GetIntField(env, lpObject, LVITEMFc.cColumns); - lpStruct->puColumns = (PUINT)(*env)->GetIntLongField(env, lpObject, LVITEMFc.puColumns); + lpStruct->puColumns = (PUINT)(*env)->GetLongField(env, lpObject, LVITEMFc.puColumns); return lpStruct; } @@ -2956,14 +2956,14 @@ void setLVITEMFields(JNIEnv *env, jobject lpObject, LVITEM *lpStruct) (*env)->SetIntField(env, lpObject, LVITEMFc.iSubItem, (jint)lpStruct->iSubItem); (*env)->SetIntField(env, lpObject, LVITEMFc.state, (jint)lpStruct->state); (*env)->SetIntField(env, lpObject, LVITEMFc.stateMask, (jint)lpStruct->stateMask); - (*env)->SetIntLongField(env, lpObject, LVITEMFc.pszText, (jintLong)lpStruct->pszText); + (*env)->SetLongField(env, lpObject, LVITEMFc.pszText, (jlong)lpStruct->pszText); (*env)->SetIntField(env, lpObject, LVITEMFc.cchTextMax, (jint)lpStruct->cchTextMax); (*env)->SetIntField(env, lpObject, LVITEMFc.iImage, (jint)lpStruct->iImage); - (*env)->SetIntLongField(env, lpObject, LVITEMFc.lParam, (jintLong)lpStruct->lParam); + (*env)->SetLongField(env, lpObject, LVITEMFc.lParam, (jlong)lpStruct->lParam); (*env)->SetIntField(env, lpObject, LVITEMFc.iIndent, (jint)lpStruct->iIndent); (*env)->SetIntField(env, lpObject, LVITEMFc.iGroupId, (jint)lpStruct->iGroupId); (*env)->SetIntField(env, lpObject, LVITEMFc.cColumns, (jint)lpStruct->cColumns); - (*env)->SetIntLongField(env, lpObject, LVITEMFc.puColumns, (jintLong)lpStruct->puColumns); + (*env)->SetLongField(env, lpObject, LVITEMFc.puColumns, (jlong)lpStruct->puColumns); } #endif @@ -3077,7 +3077,7 @@ void cacheMEASUREITEMSTRUCTFields(JNIEnv *env, jobject lpObject) MEASUREITEMSTRUCTFc.itemID = (*env)->GetFieldID(env, MEASUREITEMSTRUCTFc.clazz, "itemID", "I"); MEASUREITEMSTRUCTFc.itemWidth = (*env)->GetFieldID(env, MEASUREITEMSTRUCTFc.clazz, "itemWidth", "I"); MEASUREITEMSTRUCTFc.itemHeight = (*env)->GetFieldID(env, MEASUREITEMSTRUCTFc.clazz, "itemHeight", "I"); - MEASUREITEMSTRUCTFc.itemData = (*env)->GetFieldID(env, MEASUREITEMSTRUCTFc.clazz, "itemData", I_J); + MEASUREITEMSTRUCTFc.itemData = (*env)->GetFieldID(env, MEASUREITEMSTRUCTFc.clazz, "itemData", "J"); MEASUREITEMSTRUCTFc.cached = 1; } @@ -3089,7 +3089,7 @@ MEASUREITEMSTRUCT *getMEASUREITEMSTRUCTFields(JNIEnv *env, jobject lpObject, MEA lpStruct->itemID = (*env)->GetIntField(env, lpObject, MEASUREITEMSTRUCTFc.itemID); lpStruct->itemWidth = (*env)->GetIntField(env, lpObject, MEASUREITEMSTRUCTFc.itemWidth); lpStruct->itemHeight = (*env)->GetIntField(env, lpObject, MEASUREITEMSTRUCTFc.itemHeight); - lpStruct->itemData = (*env)->GetIntLongField(env, lpObject, MEASUREITEMSTRUCTFc.itemData); + lpStruct->itemData = (*env)->GetLongField(env, lpObject, MEASUREITEMSTRUCTFc.itemData); return lpStruct; } @@ -3101,7 +3101,7 @@ void setMEASUREITEMSTRUCTFields(JNIEnv *env, jobject lpObject, MEASUREITEMSTRUCT (*env)->SetIntField(env, lpObject, MEASUREITEMSTRUCTFc.itemID, (jint)lpStruct->itemID); (*env)->SetIntField(env, lpObject, MEASUREITEMSTRUCTFc.itemWidth, (jint)lpStruct->itemWidth); (*env)->SetIntField(env, lpObject, MEASUREITEMSTRUCTFc.itemHeight, (jint)lpStruct->itemHeight); - (*env)->SetIntLongField(env, lpObject, MEASUREITEMSTRUCTFc.itemData, (jintLong)lpStruct->itemData); + (*env)->SetLongField(env, lpObject, MEASUREITEMSTRUCTFc.itemData, (jlong)lpStruct->itemData); } #endif @@ -3123,8 +3123,8 @@ void cacheMENUBARINFOFields(JNIEnv *env, jobject lpObject) MENUBARINFOFc.top = (*env)->GetFieldID(env, MENUBARINFOFc.clazz, "top", "I"); MENUBARINFOFc.right = (*env)->GetFieldID(env, MENUBARINFOFc.clazz, "right", "I"); MENUBARINFOFc.bottom = (*env)->GetFieldID(env, MENUBARINFOFc.clazz, "bottom", "I"); - MENUBARINFOFc.hMenu = (*env)->GetFieldID(env, MENUBARINFOFc.clazz, "hMenu", I_J); - MENUBARINFOFc.hwndMenu = (*env)->GetFieldID(env, MENUBARINFOFc.clazz, "hwndMenu", I_J); + MENUBARINFOFc.hMenu = (*env)->GetFieldID(env, MENUBARINFOFc.clazz, "hMenu", "J"); + MENUBARINFOFc.hwndMenu = (*env)->GetFieldID(env, MENUBARINFOFc.clazz, "hwndMenu", "J"); MENUBARINFOFc.fBarFocused = (*env)->GetFieldID(env, MENUBARINFOFc.clazz, "fBarFocused", "Z"); MENUBARINFOFc.fFocused = (*env)->GetFieldID(env, MENUBARINFOFc.clazz, "fFocused", "Z"); MENUBARINFOFc.cached = 1; @@ -3138,8 +3138,8 @@ MENUBARINFO *getMENUBARINFOFields(JNIEnv *env, jobject lpObject, MENUBARINFO *lp lpStruct->rcBar.top = (*env)->GetIntField(env, lpObject, MENUBARINFOFc.top); lpStruct->rcBar.right = (*env)->GetIntField(env, lpObject, MENUBARINFOFc.right); lpStruct->rcBar.bottom = (*env)->GetIntField(env, lpObject, MENUBARINFOFc.bottom); - lpStruct->hMenu = (HMENU)(*env)->GetIntLongField(env, lpObject, MENUBARINFOFc.hMenu); - lpStruct->hwndMenu = (HWND)(*env)->GetIntLongField(env, lpObject, MENUBARINFOFc.hwndMenu); + lpStruct->hMenu = (HMENU)(*env)->GetLongField(env, lpObject, MENUBARINFOFc.hMenu); + lpStruct->hwndMenu = (HWND)(*env)->GetLongField(env, lpObject, MENUBARINFOFc.hwndMenu); lpStruct->fBarFocused = (*env)->GetBooleanField(env, lpObject, MENUBARINFOFc.fBarFocused); lpStruct->fFocused = (*env)->GetBooleanField(env, lpObject, MENUBARINFOFc.fFocused); return lpStruct; @@ -3153,8 +3153,8 @@ void setMENUBARINFOFields(JNIEnv *env, jobject lpObject, MENUBARINFO *lpStruct) (*env)->SetIntField(env, lpObject, MENUBARINFOFc.top, (jint)lpStruct->rcBar.top); (*env)->SetIntField(env, lpObject, MENUBARINFOFc.right, (jint)lpStruct->rcBar.right); (*env)->SetIntField(env, lpObject, MENUBARINFOFc.bottom, (jint)lpStruct->rcBar.bottom); - (*env)->SetIntLongField(env, lpObject, MENUBARINFOFc.hMenu, (jintLong)lpStruct->hMenu); - (*env)->SetIntLongField(env, lpObject, MENUBARINFOFc.hwndMenu, (jintLong)lpStruct->hwndMenu); + (*env)->SetLongField(env, lpObject, MENUBARINFOFc.hMenu, (jlong)lpStruct->hMenu); + (*env)->SetLongField(env, lpObject, MENUBARINFOFc.hwndMenu, (jlong)lpStruct->hwndMenu); (*env)->SetBooleanField(env, lpObject, MENUBARINFOFc.fBarFocused, (jboolean)lpStruct->fBarFocused); (*env)->SetBooleanField(env, lpObject, MENUBARINFOFc.fFocused, (jboolean)lpStruct->fFocused); } @@ -3177,9 +3177,9 @@ void cacheMENUINFOFields(JNIEnv *env, jobject lpObject) MENUINFOFc.fMask = (*env)->GetFieldID(env, MENUINFOFc.clazz, "fMask", "I"); MENUINFOFc.dwStyle = (*env)->GetFieldID(env, MENUINFOFc.clazz, "dwStyle", "I"); MENUINFOFc.cyMax = (*env)->GetFieldID(env, MENUINFOFc.clazz, "cyMax", "I"); - MENUINFOFc.hbrBack = (*env)->GetFieldID(env, MENUINFOFc.clazz, "hbrBack", I_J); + MENUINFOFc.hbrBack = (*env)->GetFieldID(env, MENUINFOFc.clazz, "hbrBack", "J"); MENUINFOFc.dwContextHelpID = (*env)->GetFieldID(env, MENUINFOFc.clazz, "dwContextHelpID", "I"); - MENUINFOFc.dwMenuData = (*env)->GetFieldID(env, MENUINFOFc.clazz, "dwMenuData", I_J); + MENUINFOFc.dwMenuData = (*env)->GetFieldID(env, MENUINFOFc.clazz, "dwMenuData", "J"); MENUINFOFc.cached = 1; } @@ -3190,9 +3190,9 @@ MENUINFO *getMENUINFOFields(JNIEnv *env, jobject lpObject, MENUINFO *lpStruct) lpStruct->fMask = (*env)->GetIntField(env, lpObject, MENUINFOFc.fMask); lpStruct->dwStyle = (*env)->GetIntField(env, lpObject, MENUINFOFc.dwStyle); lpStruct->cyMax = (*env)->GetIntField(env, lpObject, MENUINFOFc.cyMax); - lpStruct->hbrBack = (HBRUSH)(*env)->GetIntLongField(env, lpObject, MENUINFOFc.hbrBack); + lpStruct->hbrBack = (HBRUSH)(*env)->GetLongField(env, lpObject, MENUINFOFc.hbrBack); lpStruct->dwContextHelpID = (*env)->GetIntField(env, lpObject, MENUINFOFc.dwContextHelpID); - lpStruct->dwMenuData = (*env)->GetIntLongField(env, lpObject, MENUINFOFc.dwMenuData); + lpStruct->dwMenuData = (*env)->GetLongField(env, lpObject, MENUINFOFc.dwMenuData); return lpStruct; } @@ -3203,9 +3203,9 @@ void setMENUINFOFields(JNIEnv *env, jobject lpObject, MENUINFO *lpStruct) (*env)->SetIntField(env, lpObject, MENUINFOFc.fMask, (jint)lpStruct->fMask); (*env)->SetIntField(env, lpObject, MENUINFOFc.dwStyle, (jint)lpStruct->dwStyle); (*env)->SetIntField(env, lpObject, MENUINFOFc.cyMax, (jint)lpStruct->cyMax); - (*env)->SetIntLongField(env, lpObject, MENUINFOFc.hbrBack, (jintLong)lpStruct->hbrBack); + (*env)->SetLongField(env, lpObject, MENUINFOFc.hbrBack, (jlong)lpStruct->hbrBack); (*env)->SetIntField(env, lpObject, MENUINFOFc.dwContextHelpID, (jint)lpStruct->dwContextHelpID); - (*env)->SetIntLongField(env, lpObject, MENUINFOFc.dwMenuData, (jintLong)lpStruct->dwMenuData); + (*env)->SetLongField(env, lpObject, MENUINFOFc.dwMenuData, (jlong)lpStruct->dwMenuData); } #endif @@ -3227,13 +3227,13 @@ void cacheMENUITEMINFOFields(JNIEnv *env, jobject lpObject) MENUITEMINFOFc.fType = (*env)->GetFieldID(env, MENUITEMINFOFc.clazz, "fType", "I"); MENUITEMINFOFc.fState = (*env)->GetFieldID(env, MENUITEMINFOFc.clazz, "fState", "I"); MENUITEMINFOFc.wID = (*env)->GetFieldID(env, MENUITEMINFOFc.clazz, "wID", "I"); - MENUITEMINFOFc.hSubMenu = (*env)->GetFieldID(env, MENUITEMINFOFc.clazz, "hSubMenu", I_J); - MENUITEMINFOFc.hbmpChecked = (*env)->GetFieldID(env, MENUITEMINFOFc.clazz, "hbmpChecked", I_J); - MENUITEMINFOFc.hbmpUnchecked = (*env)->GetFieldID(env, MENUITEMINFOFc.clazz, "hbmpUnchecked", I_J); - MENUITEMINFOFc.dwItemData = (*env)->GetFieldID(env, MENUITEMINFOFc.clazz, "dwItemData", I_J); - MENUITEMINFOFc.dwTypeData = (*env)->GetFieldID(env, MENUITEMINFOFc.clazz, "dwTypeData", I_J); + MENUITEMINFOFc.hSubMenu = (*env)->GetFieldID(env, MENUITEMINFOFc.clazz, "hSubMenu", "J"); + MENUITEMINFOFc.hbmpChecked = (*env)->GetFieldID(env, MENUITEMINFOFc.clazz, "hbmpChecked", "J"); + MENUITEMINFOFc.hbmpUnchecked = (*env)->GetFieldID(env, MENUITEMINFOFc.clazz, "hbmpUnchecked", "J"); + MENUITEMINFOFc.dwItemData = (*env)->GetFieldID(env, MENUITEMINFOFc.clazz, "dwItemData", "J"); + MENUITEMINFOFc.dwTypeData = (*env)->GetFieldID(env, MENUITEMINFOFc.clazz, "dwTypeData", "J"); MENUITEMINFOFc.cch = (*env)->GetFieldID(env, MENUITEMINFOFc.clazz, "cch", "I"); - MENUITEMINFOFc.hbmpItem = (*env)->GetFieldID(env, MENUITEMINFOFc.clazz, "hbmpItem", I_J); + MENUITEMINFOFc.hbmpItem = (*env)->GetFieldID(env, MENUITEMINFOFc.clazz, "hbmpItem", "J"); MENUITEMINFOFc.cached = 1; } @@ -3245,13 +3245,13 @@ MENUITEMINFO *getMENUITEMINFOFields(JNIEnv *env, jobject lpObject, MENUITEMINFO lpStruct->fType = (*env)->GetIntField(env, lpObject, MENUITEMINFOFc.fType); lpStruct->fState = (*env)->GetIntField(env, lpObject, MENUITEMINFOFc.fState); lpStruct->wID = (*env)->GetIntField(env, lpObject, MENUITEMINFOFc.wID); - lpStruct->hSubMenu = (HMENU)(*env)->GetIntLongField(env, lpObject, MENUITEMINFOFc.hSubMenu); - lpStruct->hbmpChecked = (HBITMAP)(*env)->GetIntLongField(env, lpObject, MENUITEMINFOFc.hbmpChecked); - lpStruct->hbmpUnchecked = (HBITMAP)(*env)->GetIntLongField(env, lpObject, MENUITEMINFOFc.hbmpUnchecked); - lpStruct->dwItemData = (*env)->GetIntLongField(env, lpObject, MENUITEMINFOFc.dwItemData); - lpStruct->dwTypeData = (LPTSTR)(*env)->GetIntLongField(env, lpObject, MENUITEMINFOFc.dwTypeData); + lpStruct->hSubMenu = (HMENU)(*env)->GetLongField(env, lpObject, MENUITEMINFOFc.hSubMenu); + lpStruct->hbmpChecked = (HBITMAP)(*env)->GetLongField(env, lpObject, MENUITEMINFOFc.hbmpChecked); + lpStruct->hbmpUnchecked = (HBITMAP)(*env)->GetLongField(env, lpObject, MENUITEMINFOFc.hbmpUnchecked); + lpStruct->dwItemData = (*env)->GetLongField(env, lpObject, MENUITEMINFOFc.dwItemData); + lpStruct->dwTypeData = (LPTSTR)(*env)->GetLongField(env, lpObject, MENUITEMINFOFc.dwTypeData); lpStruct->cch = (*env)->GetIntField(env, lpObject, MENUITEMINFOFc.cch); - lpStruct->hbmpItem = (HBITMAP)(*env)->GetIntLongField(env, lpObject, MENUITEMINFOFc.hbmpItem); + lpStruct->hbmpItem = (HBITMAP)(*env)->GetLongField(env, lpObject, MENUITEMINFOFc.hbmpItem); return lpStruct; } @@ -3263,13 +3263,13 @@ void setMENUITEMINFOFields(JNIEnv *env, jobject lpObject, MENUITEMINFO *lpStruct (*env)->SetIntField(env, lpObject, MENUITEMINFOFc.fType, (jint)lpStruct->fType); (*env)->SetIntField(env, lpObject, MENUITEMINFOFc.fState, (jint)lpStruct->fState); (*env)->SetIntField(env, lpObject, MENUITEMINFOFc.wID, (jint)lpStruct->wID); - (*env)->SetIntLongField(env, lpObject, MENUITEMINFOFc.hSubMenu, (jintLong)lpStruct->hSubMenu); - (*env)->SetIntLongField(env, lpObject, MENUITEMINFOFc.hbmpChecked, (jintLong)lpStruct->hbmpChecked); - (*env)->SetIntLongField(env, lpObject, MENUITEMINFOFc.hbmpUnchecked, (jintLong)lpStruct->hbmpUnchecked); - (*env)->SetIntLongField(env, lpObject, MENUITEMINFOFc.dwItemData, (jintLong)lpStruct->dwItemData); - (*env)->SetIntLongField(env, lpObject, MENUITEMINFOFc.dwTypeData, (jintLong)lpStruct->dwTypeData); + (*env)->SetLongField(env, lpObject, MENUITEMINFOFc.hSubMenu, (jlong)lpStruct->hSubMenu); + (*env)->SetLongField(env, lpObject, MENUITEMINFOFc.hbmpChecked, (jlong)lpStruct->hbmpChecked); + (*env)->SetLongField(env, lpObject, MENUITEMINFOFc.hbmpUnchecked, (jlong)lpStruct->hbmpUnchecked); + (*env)->SetLongField(env, lpObject, MENUITEMINFOFc.dwItemData, (jlong)lpStruct->dwItemData); + (*env)->SetLongField(env, lpObject, MENUITEMINFOFc.dwTypeData, (jlong)lpStruct->dwTypeData); (*env)->SetIntField(env, lpObject, MENUITEMINFOFc.cch, (jint)lpStruct->cch); - (*env)->SetIntLongField(env, lpObject, MENUITEMINFOFc.hbmpItem, (jintLong)lpStruct->hbmpItem); + (*env)->SetLongField(env, lpObject, MENUITEMINFOFc.hbmpItem, (jlong)lpStruct->hbmpItem); } #endif @@ -3407,7 +3407,7 @@ void cacheMOUSEINPUTFields(JNIEnv *env, jobject lpObject) MOUSEINPUTFc.mouseData = (*env)->GetFieldID(env, MOUSEINPUTFc.clazz, "mouseData", "I"); MOUSEINPUTFc.dwFlags = (*env)->GetFieldID(env, MOUSEINPUTFc.clazz, "dwFlags", "I"); MOUSEINPUTFc.time = (*env)->GetFieldID(env, MOUSEINPUTFc.clazz, "time", "I"); - MOUSEINPUTFc.dwExtraInfo = (*env)->GetFieldID(env, MOUSEINPUTFc.clazz, "dwExtraInfo", I_J); + MOUSEINPUTFc.dwExtraInfo = (*env)->GetFieldID(env, MOUSEINPUTFc.clazz, "dwExtraInfo", "J"); MOUSEINPUTFc.cached = 1; } @@ -3419,7 +3419,7 @@ MOUSEINPUT *getMOUSEINPUTFields(JNIEnv *env, jobject lpObject, MOUSEINPUT *lpStr lpStruct->mouseData = (*env)->GetIntField(env, lpObject, MOUSEINPUTFc.mouseData); lpStruct->dwFlags = (*env)->GetIntField(env, lpObject, MOUSEINPUTFc.dwFlags); lpStruct->time = (*env)->GetIntField(env, lpObject, MOUSEINPUTFc.time); - lpStruct->dwExtraInfo = (*env)->GetIntLongField(env, lpObject, MOUSEINPUTFc.dwExtraInfo); + lpStruct->dwExtraInfo = (*env)->GetLongField(env, lpObject, MOUSEINPUTFc.dwExtraInfo); return lpStruct; } @@ -3431,7 +3431,7 @@ void setMOUSEINPUTFields(JNIEnv *env, jobject lpObject, MOUSEINPUT *lpStruct) (*env)->SetIntField(env, lpObject, MOUSEINPUTFc.mouseData, (jint)lpStruct->mouseData); (*env)->SetIntField(env, lpObject, MOUSEINPUTFc.dwFlags, (jint)lpStruct->dwFlags); (*env)->SetIntField(env, lpObject, MOUSEINPUTFc.time, (jint)lpStruct->time); - (*env)->SetIntLongField(env, lpObject, MOUSEINPUTFc.dwExtraInfo, (jintLong)lpStruct->dwExtraInfo); + (*env)->SetLongField(env, lpObject, MOUSEINPUTFc.dwExtraInfo, (jlong)lpStruct->dwExtraInfo); } #endif @@ -3448,10 +3448,10 @@ void cacheMSGFields(JNIEnv *env, jobject lpObject) { if (MSGFc.cached) return; MSGFc.clazz = (*env)->GetObjectClass(env, lpObject); - MSGFc.hwnd = (*env)->GetFieldID(env, MSGFc.clazz, "hwnd", I_J); + MSGFc.hwnd = (*env)->GetFieldID(env, MSGFc.clazz, "hwnd", "J"); MSGFc.message = (*env)->GetFieldID(env, MSGFc.clazz, "message", "I"); - MSGFc.wParam = (*env)->GetFieldID(env, MSGFc.clazz, "wParam", I_J); - MSGFc.lParam = (*env)->GetFieldID(env, MSGFc.clazz, "lParam", I_J); + MSGFc.wParam = (*env)->GetFieldID(env, MSGFc.clazz, "wParam", "J"); + MSGFc.lParam = (*env)->GetFieldID(env, MSGFc.clazz, "lParam", "J"); MSGFc.time = (*env)->GetFieldID(env, MSGFc.clazz, "time", "I"); MSGFc.x = (*env)->GetFieldID(env, MSGFc.clazz, "x", "I"); MSGFc.y = (*env)->GetFieldID(env, MSGFc.clazz, "y", "I"); @@ -3461,10 +3461,10 @@ void cacheMSGFields(JNIEnv *env, jobject lpObject) MSG *getMSGFields(JNIEnv *env, jobject lpObject, MSG *lpStruct) { if (!MSGFc.cached) cacheMSGFields(env, lpObject); - lpStruct->hwnd = (HWND)(*env)->GetIntLongField(env, lpObject, MSGFc.hwnd); + lpStruct->hwnd = (HWND)(*env)->GetLongField(env, lpObject, MSGFc.hwnd); lpStruct->message = (*env)->GetIntField(env, lpObject, MSGFc.message); - lpStruct->wParam = (*env)->GetIntLongField(env, lpObject, MSGFc.wParam); - lpStruct->lParam = (*env)->GetIntLongField(env, lpObject, MSGFc.lParam); + lpStruct->wParam = (*env)->GetLongField(env, lpObject, MSGFc.wParam); + lpStruct->lParam = (*env)->GetLongField(env, lpObject, MSGFc.lParam); lpStruct->time = (*env)->GetIntField(env, lpObject, MSGFc.time); lpStruct->pt.x = (*env)->GetIntField(env, lpObject, MSGFc.x); lpStruct->pt.y = (*env)->GetIntField(env, lpObject, MSGFc.y); @@ -3474,10 +3474,10 @@ MSG *getMSGFields(JNIEnv *env, jobject lpObject, MSG *lpStruct) void setMSGFields(JNIEnv *env, jobject lpObject, MSG *lpStruct) { if (!MSGFc.cached) cacheMSGFields(env, lpObject); - (*env)->SetIntLongField(env, lpObject, MSGFc.hwnd, (jintLong)lpStruct->hwnd); + (*env)->SetLongField(env, lpObject, MSGFc.hwnd, (jlong)lpStruct->hwnd); (*env)->SetIntField(env, lpObject, MSGFc.message, (jint)lpStruct->message); - (*env)->SetIntLongField(env, lpObject, MSGFc.wParam, (jintLong)lpStruct->wParam); - (*env)->SetIntLongField(env, lpObject, MSGFc.lParam, (jintLong)lpStruct->lParam); + (*env)->SetLongField(env, lpObject, MSGFc.wParam, (jlong)lpStruct->wParam); + (*env)->SetLongField(env, lpObject, MSGFc.lParam, (jlong)lpStruct->lParam); (*env)->SetIntField(env, lpObject, MSGFc.time, (jint)lpStruct->time); (*env)->SetIntField(env, lpObject, MSGFc.x, (jint)lpStruct->pt.x); (*env)->SetIntField(env, lpObject, MSGFc.y, (jint)lpStruct->pt.y); @@ -3499,14 +3499,14 @@ void cacheNMCUSTOMDRAWFields(JNIEnv *env, jobject lpObject) cacheNMHDRFields(env, lpObject); NMCUSTOMDRAWFc.clazz = (*env)->GetObjectClass(env, lpObject); NMCUSTOMDRAWFc.dwDrawStage = (*env)->GetFieldID(env, NMCUSTOMDRAWFc.clazz, "dwDrawStage", "I"); - NMCUSTOMDRAWFc.hdc = (*env)->GetFieldID(env, NMCUSTOMDRAWFc.clazz, "hdc", I_J); + NMCUSTOMDRAWFc.hdc = (*env)->GetFieldID(env, NMCUSTOMDRAWFc.clazz, "hdc", "J"); NMCUSTOMDRAWFc.left = (*env)->GetFieldID(env, NMCUSTOMDRAWFc.clazz, "left", "I"); NMCUSTOMDRAWFc.top = (*env)->GetFieldID(env, NMCUSTOMDRAWFc.clazz, "top", "I"); NMCUSTOMDRAWFc.right = (*env)->GetFieldID(env, NMCUSTOMDRAWFc.clazz, "right", "I"); NMCUSTOMDRAWFc.bottom = (*env)->GetFieldID(env, NMCUSTOMDRAWFc.clazz, "bottom", "I"); - NMCUSTOMDRAWFc.dwItemSpec = (*env)->GetFieldID(env, NMCUSTOMDRAWFc.clazz, "dwItemSpec", I_J); + NMCUSTOMDRAWFc.dwItemSpec = (*env)->GetFieldID(env, NMCUSTOMDRAWFc.clazz, "dwItemSpec", "J"); NMCUSTOMDRAWFc.uItemState = (*env)->GetFieldID(env, NMCUSTOMDRAWFc.clazz, "uItemState", "I"); - NMCUSTOMDRAWFc.lItemlParam = (*env)->GetFieldID(env, NMCUSTOMDRAWFc.clazz, "lItemlParam", I_J); + NMCUSTOMDRAWFc.lItemlParam = (*env)->GetFieldID(env, NMCUSTOMDRAWFc.clazz, "lItemlParam", "J"); NMCUSTOMDRAWFc.cached = 1; } @@ -3515,14 +3515,14 @@ NMCUSTOMDRAW *getNMCUSTOMDRAWFields(JNIEnv *env, jobject lpObject, NMCUSTOMDRAW if (!NMCUSTOMDRAWFc.cached) cacheNMCUSTOMDRAWFields(env, lpObject); getNMHDRFields(env, lpObject, (NMHDR *)lpStruct); lpStruct->dwDrawStage = (*env)->GetIntField(env, lpObject, NMCUSTOMDRAWFc.dwDrawStage); - lpStruct->hdc = (HDC)(*env)->GetIntLongField(env, lpObject, NMCUSTOMDRAWFc.hdc); + lpStruct->hdc = (HDC)(*env)->GetLongField(env, lpObject, NMCUSTOMDRAWFc.hdc); lpStruct->rc.left = (*env)->GetIntField(env, lpObject, NMCUSTOMDRAWFc.left); lpStruct->rc.top = (*env)->GetIntField(env, lpObject, NMCUSTOMDRAWFc.top); lpStruct->rc.right = (*env)->GetIntField(env, lpObject, NMCUSTOMDRAWFc.right); lpStruct->rc.bottom = (*env)->GetIntField(env, lpObject, NMCUSTOMDRAWFc.bottom); - lpStruct->dwItemSpec = (*env)->GetIntLongField(env, lpObject, NMCUSTOMDRAWFc.dwItemSpec); + lpStruct->dwItemSpec = (*env)->GetLongField(env, lpObject, NMCUSTOMDRAWFc.dwItemSpec); lpStruct->uItemState = (*env)->GetIntField(env, lpObject, NMCUSTOMDRAWFc.uItemState); - lpStruct->lItemlParam = (*env)->GetIntLongField(env, lpObject, NMCUSTOMDRAWFc.lItemlParam); + lpStruct->lItemlParam = (*env)->GetLongField(env, lpObject, NMCUSTOMDRAWFc.lItemlParam); return lpStruct; } @@ -3531,14 +3531,14 @@ void setNMCUSTOMDRAWFields(JNIEnv *env, jobject lpObject, NMCUSTOMDRAW *lpStruct if (!NMCUSTOMDRAWFc.cached) cacheNMCUSTOMDRAWFields(env, lpObject); setNMHDRFields(env, lpObject, (NMHDR *)lpStruct); (*env)->SetIntField(env, lpObject, NMCUSTOMDRAWFc.dwDrawStage, (jint)lpStruct->dwDrawStage); - (*env)->SetIntLongField(env, lpObject, NMCUSTOMDRAWFc.hdc, (jintLong)lpStruct->hdc); + (*env)->SetLongField(env, lpObject, NMCUSTOMDRAWFc.hdc, (jlong)lpStruct->hdc); (*env)->SetIntField(env, lpObject, NMCUSTOMDRAWFc.left, (jint)lpStruct->rc.left); (*env)->SetIntField(env, lpObject, NMCUSTOMDRAWFc.top, (jint)lpStruct->rc.top); (*env)->SetIntField(env, lpObject, NMCUSTOMDRAWFc.right, (jint)lpStruct->rc.right); (*env)->SetIntField(env, lpObject, NMCUSTOMDRAWFc.bottom, (jint)lpStruct->rc.bottom); - (*env)->SetIntLongField(env, lpObject, NMCUSTOMDRAWFc.dwItemSpec, (jintLong)lpStruct->dwItemSpec); + (*env)->SetLongField(env, lpObject, NMCUSTOMDRAWFc.dwItemSpec, (jlong)lpStruct->dwItemSpec); (*env)->SetIntField(env, lpObject, NMCUSTOMDRAWFc.uItemState, (jint)lpStruct->uItemState); - (*env)->SetIntLongField(env, lpObject, NMCUSTOMDRAWFc.lItemlParam, (jintLong)lpStruct->lItemlParam); + (*env)->SetLongField(env, lpObject, NMCUSTOMDRAWFc.lItemlParam, (jlong)lpStruct->lItemlParam); } #endif @@ -3555,8 +3555,8 @@ void cacheNMHDRFields(JNIEnv *env, jobject lpObject) { if (NMHDRFc.cached) return; NMHDRFc.clazz = (*env)->GetObjectClass(env, lpObject); - NMHDRFc.hwndFrom = (*env)->GetFieldID(env, NMHDRFc.clazz, "hwndFrom", I_J); - NMHDRFc.idFrom = (*env)->GetFieldID(env, NMHDRFc.clazz, "idFrom", I_J); + NMHDRFc.hwndFrom = (*env)->GetFieldID(env, NMHDRFc.clazz, "hwndFrom", "J"); + NMHDRFc.idFrom = (*env)->GetFieldID(env, NMHDRFc.clazz, "idFrom", "J"); NMHDRFc.code = (*env)->GetFieldID(env, NMHDRFc.clazz, "code", "I"); NMHDRFc.cached = 1; } @@ -3564,8 +3564,8 @@ void cacheNMHDRFields(JNIEnv *env, jobject lpObject) NMHDR *getNMHDRFields(JNIEnv *env, jobject lpObject, NMHDR *lpStruct) { if (!NMHDRFc.cached) cacheNMHDRFields(env, lpObject); - lpStruct->hwndFrom = (HWND)(*env)->GetIntLongField(env, lpObject, NMHDRFc.hwndFrom); - lpStruct->idFrom = (*env)->GetIntLongField(env, lpObject, NMHDRFc.idFrom); + lpStruct->hwndFrom = (HWND)(*env)->GetLongField(env, lpObject, NMHDRFc.hwndFrom); + lpStruct->idFrom = (*env)->GetLongField(env, lpObject, NMHDRFc.idFrom); lpStruct->code = (*env)->GetIntField(env, lpObject, NMHDRFc.code); return lpStruct; } @@ -3573,8 +3573,8 @@ NMHDR *getNMHDRFields(JNIEnv *env, jobject lpObject, NMHDR *lpStruct) void setNMHDRFields(JNIEnv *env, jobject lpObject, NMHDR *lpStruct) { if (!NMHDRFc.cached) cacheNMHDRFields(env, lpObject); - (*env)->SetIntLongField(env, lpObject, NMHDRFc.hwndFrom, (jintLong)lpStruct->hwndFrom); - (*env)->SetIntLongField(env, lpObject, NMHDRFc.idFrom, (jintLong)lpStruct->idFrom); + (*env)->SetLongField(env, lpObject, NMHDRFc.hwndFrom, (jlong)lpStruct->hwndFrom); + (*env)->SetLongField(env, lpObject, NMHDRFc.idFrom, (jlong)lpStruct->idFrom); (*env)->SetIntField(env, lpObject, NMHDRFc.code, (jint)lpStruct->code); } #endif @@ -3595,7 +3595,7 @@ void cacheNMHEADERFields(JNIEnv *env, jobject lpObject) NMHEADERFc.clazz = (*env)->GetObjectClass(env, lpObject); NMHEADERFc.iItem = (*env)->GetFieldID(env, NMHEADERFc.clazz, "iItem", "I"); NMHEADERFc.iButton = (*env)->GetFieldID(env, NMHEADERFc.clazz, "iButton", "I"); - NMHEADERFc.pitem = (*env)->GetFieldID(env, NMHEADERFc.clazz, "pitem", I_J); + NMHEADERFc.pitem = (*env)->GetFieldID(env, NMHEADERFc.clazz, "pitem", "J"); NMHEADERFc.cached = 1; } @@ -3605,7 +3605,7 @@ NMHEADER *getNMHEADERFields(JNIEnv *env, jobject lpObject, NMHEADER *lpStruct) getNMHDRFields(env, lpObject, (NMHDR *)lpStruct); lpStruct->iItem = (*env)->GetIntField(env, lpObject, NMHEADERFc.iItem); lpStruct->iButton = (*env)->GetIntField(env, lpObject, NMHEADERFc.iButton); - lpStruct->pitem = (HDITEM FAR *)(*env)->GetIntLongField(env, lpObject, NMHEADERFc.pitem); + lpStruct->pitem = (HDITEM FAR *)(*env)->GetLongField(env, lpObject, NMHEADERFc.pitem); return lpStruct; } @@ -3615,7 +3615,7 @@ void setNMHEADERFields(JNIEnv *env, jobject lpObject, NMHEADER *lpStruct) setNMHDRFields(env, lpObject, (NMHDR *)lpStruct); (*env)->SetIntField(env, lpObject, NMHEADERFc.iItem, (jint)lpStruct->iItem); (*env)->SetIntField(env, lpObject, NMHEADERFc.iButton, (jint)lpStruct->iButton); - (*env)->SetIntLongField(env, lpObject, NMHEADERFc.pitem, (jintLong)lpStruct->pitem); + (*env)->SetLongField(env, lpObject, NMHEADERFc.pitem, (jlong)lpStruct->pitem); } #endif @@ -3701,7 +3701,7 @@ void cacheNMLISTVIEWFields(JNIEnv *env, jobject lpObject) NMLISTVIEWFc.uChanged = (*env)->GetFieldID(env, NMLISTVIEWFc.clazz, "uChanged", "I"); NMLISTVIEWFc.x = (*env)->GetFieldID(env, NMLISTVIEWFc.clazz, "x", "I"); NMLISTVIEWFc.y = (*env)->GetFieldID(env, NMLISTVIEWFc.clazz, "y", "I"); - NMLISTVIEWFc.lParam = (*env)->GetFieldID(env, NMLISTVIEWFc.clazz, "lParam", I_J); + NMLISTVIEWFc.lParam = (*env)->GetFieldID(env, NMLISTVIEWFc.clazz, "lParam", "J"); NMLISTVIEWFc.cached = 1; } @@ -3716,7 +3716,7 @@ NMLISTVIEW *getNMLISTVIEWFields(JNIEnv *env, jobject lpObject, NMLISTVIEW *lpStr lpStruct->uChanged = (*env)->GetIntField(env, lpObject, NMLISTVIEWFc.uChanged); lpStruct->ptAction.x = (*env)->GetIntField(env, lpObject, NMLISTVIEWFc.x); lpStruct->ptAction.y = (*env)->GetIntField(env, lpObject, NMLISTVIEWFc.y); - lpStruct->lParam = (*env)->GetIntLongField(env, lpObject, NMLISTVIEWFc.lParam); + lpStruct->lParam = (*env)->GetLongField(env, lpObject, NMLISTVIEWFc.lParam); return lpStruct; } @@ -3731,7 +3731,7 @@ void setNMLISTVIEWFields(JNIEnv *env, jobject lpObject, NMLISTVIEW *lpStruct) (*env)->SetIntField(env, lpObject, NMLISTVIEWFc.uChanged, (jint)lpStruct->uChanged); (*env)->SetIntField(env, lpObject, NMLISTVIEWFc.x, (jint)lpStruct->ptAction.x); (*env)->SetIntField(env, lpObject, NMLISTVIEWFc.y, (jint)lpStruct->ptAction.y); - (*env)->SetIntLongField(env, lpObject, NMLISTVIEWFc.lParam, (jintLong)lpStruct->lParam); + (*env)->SetLongField(env, lpObject, NMLISTVIEWFc.lParam, (jlong)lpStruct->lParam); } #endif @@ -3827,14 +3827,14 @@ void cacheNMLVDISPINFOFields(JNIEnv *env, jobject lpObject) NMLVDISPINFOFc.iSubItem = (*env)->GetFieldID(env, NMLVDISPINFOFc.clazz, "iSubItem", "I"); NMLVDISPINFOFc.state = (*env)->GetFieldID(env, NMLVDISPINFOFc.clazz, "state", "I"); NMLVDISPINFOFc.stateMask = (*env)->GetFieldID(env, NMLVDISPINFOFc.clazz, "stateMask", "I"); - NMLVDISPINFOFc.pszText = (*env)->GetFieldID(env, NMLVDISPINFOFc.clazz, "pszText", I_J); + NMLVDISPINFOFc.pszText = (*env)->GetFieldID(env, NMLVDISPINFOFc.clazz, "pszText", "J"); NMLVDISPINFOFc.cchTextMax = (*env)->GetFieldID(env, NMLVDISPINFOFc.clazz, "cchTextMax", "I"); NMLVDISPINFOFc.iImage = (*env)->GetFieldID(env, NMLVDISPINFOFc.clazz, "iImage", "I"); - NMLVDISPINFOFc.lParam = (*env)->GetFieldID(env, NMLVDISPINFOFc.clazz, "lParam", I_J); + NMLVDISPINFOFc.lParam = (*env)->GetFieldID(env, NMLVDISPINFOFc.clazz, "lParam", "J"); NMLVDISPINFOFc.iIndent = (*env)->GetFieldID(env, NMLVDISPINFOFc.clazz, "iIndent", "I"); NMLVDISPINFOFc.iGroupId = (*env)->GetFieldID(env, NMLVDISPINFOFc.clazz, "iGroupId", "I"); NMLVDISPINFOFc.cColumns = (*env)->GetFieldID(env, NMLVDISPINFOFc.clazz, "cColumns", "I"); - NMLVDISPINFOFc.puColumns = (*env)->GetFieldID(env, NMLVDISPINFOFc.clazz, "puColumns", I_J); + NMLVDISPINFOFc.puColumns = (*env)->GetFieldID(env, NMLVDISPINFOFc.clazz, "puColumns", "J"); NMLVDISPINFOFc.cached = 1; } @@ -3847,14 +3847,14 @@ NMLVDISPINFO *getNMLVDISPINFOFields(JNIEnv *env, jobject lpObject, NMLVDISPINFO lpStruct->item.iSubItem = (*env)->GetIntField(env, lpObject, NMLVDISPINFOFc.iSubItem); lpStruct->item.state = (*env)->GetIntField(env, lpObject, NMLVDISPINFOFc.state); lpStruct->item.stateMask = (*env)->GetIntField(env, lpObject, NMLVDISPINFOFc.stateMask); - lpStruct->item.pszText = (LPTSTR)(*env)->GetIntLongField(env, lpObject, NMLVDISPINFOFc.pszText); + lpStruct->item.pszText = (LPTSTR)(*env)->GetLongField(env, lpObject, NMLVDISPINFOFc.pszText); lpStruct->item.cchTextMax = (*env)->GetIntField(env, lpObject, NMLVDISPINFOFc.cchTextMax); lpStruct->item.iImage = (*env)->GetIntField(env, lpObject, NMLVDISPINFOFc.iImage); - lpStruct->item.lParam = (*env)->GetIntLongField(env, lpObject, NMLVDISPINFOFc.lParam); + lpStruct->item.lParam = (*env)->GetLongField(env, lpObject, NMLVDISPINFOFc.lParam); lpStruct->item.iIndent = (*env)->GetIntField(env, lpObject, NMLVDISPINFOFc.iIndent); lpStruct->item.iGroupId = (*env)->GetIntField(env, lpObject, NMLVDISPINFOFc.iGroupId); lpStruct->item.cColumns = (*env)->GetIntField(env, lpObject, NMLVDISPINFOFc.cColumns); - lpStruct->item.puColumns = (PUINT)(*env)->GetIntLongField(env, lpObject, NMLVDISPINFOFc.puColumns); + lpStruct->item.puColumns = (PUINT)(*env)->GetLongField(env, lpObject, NMLVDISPINFOFc.puColumns); return lpStruct; } @@ -3867,14 +3867,14 @@ void setNMLVDISPINFOFields(JNIEnv *env, jobject lpObject, NMLVDISPINFO *lpStruct (*env)->SetIntField(env, lpObject, NMLVDISPINFOFc.iSubItem, (jint)lpStruct->item.iSubItem); (*env)->SetIntField(env, lpObject, NMLVDISPINFOFc.state, (jint)lpStruct->item.state); (*env)->SetIntField(env, lpObject, NMLVDISPINFOFc.stateMask, (jint)lpStruct->item.stateMask); - (*env)->SetIntLongField(env, lpObject, NMLVDISPINFOFc.pszText, (jintLong)lpStruct->item.pszText); + (*env)->SetLongField(env, lpObject, NMLVDISPINFOFc.pszText, (jlong)lpStruct->item.pszText); (*env)->SetIntField(env, lpObject, NMLVDISPINFOFc.cchTextMax, (jint)lpStruct->item.cchTextMax); (*env)->SetIntField(env, lpObject, NMLVDISPINFOFc.iImage, (jint)lpStruct->item.iImage); - (*env)->SetIntLongField(env, lpObject, NMLVDISPINFOFc.lParam, (jintLong)lpStruct->item.lParam); + (*env)->SetLongField(env, lpObject, NMLVDISPINFOFc.lParam, (jlong)lpStruct->item.lParam); (*env)->SetIntField(env, lpObject, NMLVDISPINFOFc.iIndent, (jint)lpStruct->item.iIndent); (*env)->SetIntField(env, lpObject, NMLVDISPINFOFc.iGroupId, (jint)lpStruct->item.iGroupId); (*env)->SetIntField(env, lpObject, NMLVDISPINFOFc.cColumns, (jint)lpStruct->item.cColumns); - (*env)->SetIntLongField(env, lpObject, NMLVDISPINFOFc.puColumns, (jintLong)lpStruct->item.puColumns); + (*env)->SetLongField(env, lpObject, NMLVDISPINFOFc.puColumns, (jlong)lpStruct->item.puColumns); } #endif @@ -3894,8 +3894,8 @@ void cacheNMLVFINDITEMFields(JNIEnv *env, jobject lpObject) NMLVFINDITEMFc.clazz = (*env)->GetObjectClass(env, lpObject); NMLVFINDITEMFc.iStart = (*env)->GetFieldID(env, NMLVFINDITEMFc.clazz, "iStart", "I"); NMLVFINDITEMFc.flags = (*env)->GetFieldID(env, NMLVFINDITEMFc.clazz, "flags", "I"); - NMLVFINDITEMFc.psz = (*env)->GetFieldID(env, NMLVFINDITEMFc.clazz, "psz", I_J); - NMLVFINDITEMFc.lParam = (*env)->GetFieldID(env, NMLVFINDITEMFc.clazz, "lParam", I_J); + NMLVFINDITEMFc.psz = (*env)->GetFieldID(env, NMLVFINDITEMFc.clazz, "psz", "J"); + NMLVFINDITEMFc.lParam = (*env)->GetFieldID(env, NMLVFINDITEMFc.clazz, "lParam", "J"); NMLVFINDITEMFc.x = (*env)->GetFieldID(env, NMLVFINDITEMFc.clazz, "x", "I"); NMLVFINDITEMFc.y = (*env)->GetFieldID(env, NMLVFINDITEMFc.clazz, "y", "I"); NMLVFINDITEMFc.vkDirection = (*env)->GetFieldID(env, NMLVFINDITEMFc.clazz, "vkDirection", "I"); @@ -3908,8 +3908,8 @@ NMLVFINDITEM *getNMLVFINDITEMFields(JNIEnv *env, jobject lpObject, NMLVFINDITEM getNMHDRFields(env, lpObject, (NMHDR *)lpStruct); lpStruct->iStart = (*env)->GetIntField(env, lpObject, NMLVFINDITEMFc.iStart); lpStruct->lvfi.flags = (*env)->GetIntField(env, lpObject, NMLVFINDITEMFc.flags); - lpStruct->lvfi.psz = (LPCTSTR)(*env)->GetIntLongField(env, lpObject, NMLVFINDITEMFc.psz); - lpStruct->lvfi.lParam = (*env)->GetIntLongField(env, lpObject, NMLVFINDITEMFc.lParam); + lpStruct->lvfi.psz = (LPCTSTR)(*env)->GetLongField(env, lpObject, NMLVFINDITEMFc.psz); + lpStruct->lvfi.lParam = (*env)->GetLongField(env, lpObject, NMLVFINDITEMFc.lParam); lpStruct->lvfi.pt.x = (*env)->GetIntField(env, lpObject, NMLVFINDITEMFc.x); lpStruct->lvfi.pt.y = (*env)->GetIntField(env, lpObject, NMLVFINDITEMFc.y); lpStruct->lvfi.vkDirection = (*env)->GetIntField(env, lpObject, NMLVFINDITEMFc.vkDirection); @@ -3922,8 +3922,8 @@ void setNMLVFINDITEMFields(JNIEnv *env, jobject lpObject, NMLVFINDITEM *lpStruct setNMHDRFields(env, lpObject, (NMHDR *)lpStruct); (*env)->SetIntField(env, lpObject, NMLVFINDITEMFc.iStart, (jint)lpStruct->iStart); (*env)->SetIntField(env, lpObject, NMLVFINDITEMFc.flags, (jint)lpStruct->lvfi.flags); - (*env)->SetIntLongField(env, lpObject, NMLVFINDITEMFc.psz, (jintLong)lpStruct->lvfi.psz); - (*env)->SetIntLongField(env, lpObject, NMLVFINDITEMFc.lParam, (jintLong)lpStruct->lvfi.lParam); + (*env)->SetLongField(env, lpObject, NMLVFINDITEMFc.psz, (jlong)lpStruct->lvfi.psz); + (*env)->SetLongField(env, lpObject, NMLVFINDITEMFc.lParam, (jlong)lpStruct->lvfi.lParam); (*env)->SetIntField(env, lpObject, NMLVFINDITEMFc.x, (jint)lpStruct->lvfi.pt.x); (*env)->SetIntField(env, lpObject, NMLVFINDITEMFc.y, (jint)lpStruct->lvfi.pt.y); (*env)->SetIntField(env, lpObject, NMLVFINDITEMFc.vkDirection, (jint)lpStruct->lvfi.vkDirection); @@ -3989,12 +3989,12 @@ void cacheNMREBARCHEVRONFields(JNIEnv *env, jobject lpObject) NMREBARCHEVRONFc.clazz = (*env)->GetObjectClass(env, lpObject); NMREBARCHEVRONFc.uBand = (*env)->GetFieldID(env, NMREBARCHEVRONFc.clazz, "uBand", "I"); NMREBARCHEVRONFc.wID = (*env)->GetFieldID(env, NMREBARCHEVRONFc.clazz, "wID", "I"); - NMREBARCHEVRONFc.lParam = (*env)->GetFieldID(env, NMREBARCHEVRONFc.clazz, "lParam", I_J); + NMREBARCHEVRONFc.lParam = (*env)->GetFieldID(env, NMREBARCHEVRONFc.clazz, "lParam", "J"); NMREBARCHEVRONFc.left = (*env)->GetFieldID(env, NMREBARCHEVRONFc.clazz, "left", "I"); NMREBARCHEVRONFc.top = (*env)->GetFieldID(env, NMREBARCHEVRONFc.clazz, "top", "I"); NMREBARCHEVRONFc.right = (*env)->GetFieldID(env, NMREBARCHEVRONFc.clazz, "right", "I"); NMREBARCHEVRONFc.bottom = (*env)->GetFieldID(env, NMREBARCHEVRONFc.clazz, "bottom", "I"); - NMREBARCHEVRONFc.lParamNM = (*env)->GetFieldID(env, NMREBARCHEVRONFc.clazz, "lParamNM", I_J); + NMREBARCHEVRONFc.lParamNM = (*env)->GetFieldID(env, NMREBARCHEVRONFc.clazz, "lParamNM", "J"); NMREBARCHEVRONFc.cached = 1; } @@ -4004,12 +4004,12 @@ NMREBARCHEVRON *getNMREBARCHEVRONFields(JNIEnv *env, jobject lpObject, NMREBARCH getNMHDRFields(env, lpObject, (NMHDR *)lpStruct); lpStruct->uBand = (*env)->GetIntField(env, lpObject, NMREBARCHEVRONFc.uBand); lpStruct->wID = (*env)->GetIntField(env, lpObject, NMREBARCHEVRONFc.wID); - lpStruct->lParam = (*env)->GetIntLongField(env, lpObject, NMREBARCHEVRONFc.lParam); + lpStruct->lParam = (*env)->GetLongField(env, lpObject, NMREBARCHEVRONFc.lParam); lpStruct->rc.left = (*env)->GetIntField(env, lpObject, NMREBARCHEVRONFc.left); lpStruct->rc.top = (*env)->GetIntField(env, lpObject, NMREBARCHEVRONFc.top); lpStruct->rc.right = (*env)->GetIntField(env, lpObject, NMREBARCHEVRONFc.right); lpStruct->rc.bottom = (*env)->GetIntField(env, lpObject, NMREBARCHEVRONFc.bottom); - lpStruct->lParamNM = (*env)->GetIntLongField(env, lpObject, NMREBARCHEVRONFc.lParamNM); + lpStruct->lParamNM = (*env)->GetLongField(env, lpObject, NMREBARCHEVRONFc.lParamNM); return lpStruct; } @@ -4019,12 +4019,12 @@ void setNMREBARCHEVRONFields(JNIEnv *env, jobject lpObject, NMREBARCHEVRON *lpSt setNMHDRFields(env, lpObject, (NMHDR *)lpStruct); (*env)->SetIntField(env, lpObject, NMREBARCHEVRONFc.uBand, (jint)lpStruct->uBand); (*env)->SetIntField(env, lpObject, NMREBARCHEVRONFc.wID, (jint)lpStruct->wID); - (*env)->SetIntLongField(env, lpObject, NMREBARCHEVRONFc.lParam, (jintLong)lpStruct->lParam); + (*env)->SetLongField(env, lpObject, NMREBARCHEVRONFc.lParam, (jlong)lpStruct->lParam); (*env)->SetIntField(env, lpObject, NMREBARCHEVRONFc.left, (jint)lpStruct->rc.left); (*env)->SetIntField(env, lpObject, NMREBARCHEVRONFc.top, (jint)lpStruct->rc.top); (*env)->SetIntField(env, lpObject, NMREBARCHEVRONFc.right, (jint)lpStruct->rc.right); (*env)->SetIntField(env, lpObject, NMREBARCHEVRONFc.bottom, (jint)lpStruct->rc.bottom); - (*env)->SetIntLongField(env, lpObject, NMREBARCHEVRONFc.lParamNM, (jintLong)lpStruct->lParamNM); + (*env)->SetLongField(env, lpObject, NMREBARCHEVRONFc.lParamNM, (jlong)lpStruct->lParamNM); } #endif @@ -4104,9 +4104,9 @@ void cacheNMTBCUSTOMDRAWFields(JNIEnv *env, jobject lpObject) cacheNMCUSTOMDRAWFields(env, lpObject); NMTBCUSTOMDRAWFc.clazz = (*env)->GetObjectClass(env, lpObject); NMTBCUSTOMDRAWFc.nmcd = (*env)->GetFieldID(env, NMTBCUSTOMDRAWFc.clazz, "nmcd", "Lorg/eclipse/swt/internal/win32/NMCUSTOMDRAW;"); - NMTBCUSTOMDRAWFc.hbrMonoDither = (*env)->GetFieldID(env, NMTBCUSTOMDRAWFc.clazz, "hbrMonoDither", I_J); - NMTBCUSTOMDRAWFc.hbrLines = (*env)->GetFieldID(env, NMTBCUSTOMDRAWFc.clazz, "hbrLines", I_J); - NMTBCUSTOMDRAWFc.hpenLines = (*env)->GetFieldID(env, NMTBCUSTOMDRAWFc.clazz, "hpenLines", I_J); + NMTBCUSTOMDRAWFc.hbrMonoDither = (*env)->GetFieldID(env, NMTBCUSTOMDRAWFc.clazz, "hbrMonoDither", "J"); + NMTBCUSTOMDRAWFc.hbrLines = (*env)->GetFieldID(env, NMTBCUSTOMDRAWFc.clazz, "hbrLines", "J"); + NMTBCUSTOMDRAWFc.hpenLines = (*env)->GetFieldID(env, NMTBCUSTOMDRAWFc.clazz, "hpenLines", "J"); NMTBCUSTOMDRAWFc.clrText = (*env)->GetFieldID(env, NMTBCUSTOMDRAWFc.clazz, "clrText", "I"); NMTBCUSTOMDRAWFc.clrMark = (*env)->GetFieldID(env, NMTBCUSTOMDRAWFc.clazz, "clrMark", "I"); NMTBCUSTOMDRAWFc.clrTextHighlight = (*env)->GetFieldID(env, NMTBCUSTOMDRAWFc.clazz, "clrTextHighlight", "I"); @@ -4131,9 +4131,9 @@ NMTBCUSTOMDRAW *getNMTBCUSTOMDRAWFields(JNIEnv *env, jobject lpObject, NMTBCUSTO jobject lpObject1 = (*env)->GetObjectField(env, lpObject, NMTBCUSTOMDRAWFc.nmcd); if (lpObject1 != NULL) getNMCUSTOMDRAWFields(env, lpObject1, &lpStruct->nmcd); } - lpStruct->hbrMonoDither = (HBRUSH)(*env)->GetIntLongField(env, lpObject, NMTBCUSTOMDRAWFc.hbrMonoDither); - lpStruct->hbrLines = (HBRUSH)(*env)->GetIntLongField(env, lpObject, NMTBCUSTOMDRAWFc.hbrLines); - lpStruct->hpenLines = (HPEN)(*env)->GetIntLongField(env, lpObject, NMTBCUSTOMDRAWFc.hpenLines); + lpStruct->hbrMonoDither = (HBRUSH)(*env)->GetLongField(env, lpObject, NMTBCUSTOMDRAWFc.hbrMonoDither); + lpStruct->hbrLines = (HBRUSH)(*env)->GetLongField(env, lpObject, NMTBCUSTOMDRAWFc.hbrLines); + lpStruct->hpenLines = (HPEN)(*env)->GetLongField(env, lpObject, NMTBCUSTOMDRAWFc.hpenLines); lpStruct->clrText = (*env)->GetIntField(env, lpObject, NMTBCUSTOMDRAWFc.clrText); lpStruct->clrMark = (*env)->GetIntField(env, lpObject, NMTBCUSTOMDRAWFc.clrMark); lpStruct->clrTextHighlight = (*env)->GetIntField(env, lpObject, NMTBCUSTOMDRAWFc.clrTextHighlight); @@ -4158,9 +4158,9 @@ void setNMTBCUSTOMDRAWFields(JNIEnv *env, jobject lpObject, NMTBCUSTOMDRAW *lpSt jobject lpObject1 = (*env)->GetObjectField(env, lpObject, NMTBCUSTOMDRAWFc.nmcd); if (lpObject1 != NULL) setNMCUSTOMDRAWFields(env, lpObject1, &lpStruct->nmcd); } - (*env)->SetIntLongField(env, lpObject, NMTBCUSTOMDRAWFc.hbrMonoDither, (jintLong)lpStruct->hbrMonoDither); - (*env)->SetIntLongField(env, lpObject, NMTBCUSTOMDRAWFc.hbrLines, (jintLong)lpStruct->hbrLines); - (*env)->SetIntLongField(env, lpObject, NMTBCUSTOMDRAWFc.hpenLines, (jintLong)lpStruct->hpenLines); + (*env)->SetLongField(env, lpObject, NMTBCUSTOMDRAWFc.hbrMonoDither, (jlong)lpStruct->hbrMonoDither); + (*env)->SetLongField(env, lpObject, NMTBCUSTOMDRAWFc.hbrLines, (jlong)lpStruct->hbrLines); + (*env)->SetLongField(env, lpObject, NMTBCUSTOMDRAWFc.hpenLines, (jlong)lpStruct->hpenLines); (*env)->SetIntField(env, lpObject, NMTBCUSTOMDRAWFc.clrText, (jint)lpStruct->clrText); (*env)->SetIntField(env, lpObject, NMTBCUSTOMDRAWFc.clrMark, (jint)lpStruct->clrMark); (*env)->SetIntField(env, lpObject, NMTBCUSTOMDRAWFc.clrTextHighlight, (jint)lpStruct->clrTextHighlight); @@ -4236,10 +4236,10 @@ void cacheNMTOOLBARFields(JNIEnv *env, jobject lpObject) NMTOOLBARFc.idCommand = (*env)->GetFieldID(env, NMTOOLBARFc.clazz, "idCommand", "I"); NMTOOLBARFc.fsState = (*env)->GetFieldID(env, NMTOOLBARFc.clazz, "fsState", "B"); NMTOOLBARFc.fsStyle = (*env)->GetFieldID(env, NMTOOLBARFc.clazz, "fsStyle", "B"); - NMTOOLBARFc.dwData = (*env)->GetFieldID(env, NMTOOLBARFc.clazz, "dwData", I_J); - NMTOOLBARFc.iString = (*env)->GetFieldID(env, NMTOOLBARFc.clazz, "iString", I_J); + NMTOOLBARFc.dwData = (*env)->GetFieldID(env, NMTOOLBARFc.clazz, "dwData", "J"); + NMTOOLBARFc.iString = (*env)->GetFieldID(env, NMTOOLBARFc.clazz, "iString", "J"); NMTOOLBARFc.cchText = (*env)->GetFieldID(env, NMTOOLBARFc.clazz, "cchText", "I"); - NMTOOLBARFc.pszText = (*env)->GetFieldID(env, NMTOOLBARFc.clazz, "pszText", I_J); + NMTOOLBARFc.pszText = (*env)->GetFieldID(env, NMTOOLBARFc.clazz, "pszText", "J"); NMTOOLBARFc.left = (*env)->GetFieldID(env, NMTOOLBARFc.clazz, "left", "I"); NMTOOLBARFc.top = (*env)->GetFieldID(env, NMTOOLBARFc.clazz, "top", "I"); NMTOOLBARFc.right = (*env)->GetFieldID(env, NMTOOLBARFc.clazz, "right", "I"); @@ -4256,10 +4256,10 @@ NMTOOLBAR *getNMTOOLBARFields(JNIEnv *env, jobject lpObject, NMTOOLBAR *lpStruct lpStruct->tbButton.idCommand = (*env)->GetIntField(env, lpObject, NMTOOLBARFc.idCommand); lpStruct->tbButton.fsState = (*env)->GetByteField(env, lpObject, NMTOOLBARFc.fsState); lpStruct->tbButton.fsStyle = (*env)->GetByteField(env, lpObject, NMTOOLBARFc.fsStyle); - lpStruct->tbButton.dwData = (*env)->GetIntLongField(env, lpObject, NMTOOLBARFc.dwData); - lpStruct->tbButton.iString = (*env)->GetIntLongField(env, lpObject, NMTOOLBARFc.iString); + lpStruct->tbButton.dwData = (*env)->GetLongField(env, lpObject, NMTOOLBARFc.dwData); + lpStruct->tbButton.iString = (*env)->GetLongField(env, lpObject, NMTOOLBARFc.iString); lpStruct->cchText = (*env)->GetIntField(env, lpObject, NMTOOLBARFc.cchText); - lpStruct->pszText = (LPTSTR)(*env)->GetIntLongField(env, lpObject, NMTOOLBARFc.pszText); + lpStruct->pszText = (LPTSTR)(*env)->GetLongField(env, lpObject, NMTOOLBARFc.pszText); lpStruct->rcButton.left = (*env)->GetIntField(env, lpObject, NMTOOLBARFc.left); lpStruct->rcButton.top = (*env)->GetIntField(env, lpObject, NMTOOLBARFc.top); lpStruct->rcButton.right = (*env)->GetIntField(env, lpObject, NMTOOLBARFc.right); @@ -4276,10 +4276,10 @@ void setNMTOOLBARFields(JNIEnv *env, jobject lpObject, NMTOOLBAR *lpStruct) (*env)->SetIntField(env, lpObject, NMTOOLBARFc.idCommand, (jint)lpStruct->tbButton.idCommand); (*env)->SetByteField(env, lpObject, NMTOOLBARFc.fsState, (jbyte)lpStruct->tbButton.fsState); (*env)->SetByteField(env, lpObject, NMTOOLBARFc.fsStyle, (jbyte)lpStruct->tbButton.fsStyle); - (*env)->SetIntLongField(env, lpObject, NMTOOLBARFc.dwData, (jintLong)lpStruct->tbButton.dwData); - (*env)->SetIntLongField(env, lpObject, NMTOOLBARFc.iString, (jintLong)lpStruct->tbButton.iString); + (*env)->SetLongField(env, lpObject, NMTOOLBARFc.dwData, (jlong)lpStruct->tbButton.dwData); + (*env)->SetLongField(env, lpObject, NMTOOLBARFc.iString, (jlong)lpStruct->tbButton.iString); (*env)->SetIntField(env, lpObject, NMTOOLBARFc.cchText, (jint)lpStruct->cchText); - (*env)->SetIntLongField(env, lpObject, NMTOOLBARFc.pszText, (jintLong)lpStruct->pszText); + (*env)->SetLongField(env, lpObject, NMTOOLBARFc.pszText, (jlong)lpStruct->pszText); (*env)->SetIntField(env, lpObject, NMTOOLBARFc.left, (jint)lpStruct->rcButton.left); (*env)->SetIntField(env, lpObject, NMTOOLBARFc.top, (jint)lpStruct->rcButton.top); (*env)->SetIntField(env, lpObject, NMTOOLBARFc.right, (jint)lpStruct->rcButton.right); @@ -4402,11 +4402,11 @@ void cacheNMTTDISPINFOFields(JNIEnv *env, jobject lpObject) if (NMTTDISPINFOFc.cached) return; cacheNMHDRFields(env, lpObject); NMTTDISPINFOFc.clazz = (*env)->GetObjectClass(env, lpObject); - NMTTDISPINFOFc.lpszText = (*env)->GetFieldID(env, NMTTDISPINFOFc.clazz, "lpszText", I_J); + NMTTDISPINFOFc.lpszText = (*env)->GetFieldID(env, NMTTDISPINFOFc.clazz, "lpszText", "J"); NMTTDISPINFOFc.szText = (*env)->GetFieldID(env, NMTTDISPINFOFc.clazz, "szText", "[C"); - NMTTDISPINFOFc.hinst = (*env)->GetFieldID(env, NMTTDISPINFOFc.clazz, "hinst", I_J); + NMTTDISPINFOFc.hinst = (*env)->GetFieldID(env, NMTTDISPINFOFc.clazz, "hinst", "J"); NMTTDISPINFOFc.uFlags = (*env)->GetFieldID(env, NMTTDISPINFOFc.clazz, "uFlags", "I"); - NMTTDISPINFOFc.lParam = (*env)->GetFieldID(env, NMTTDISPINFOFc.clazz, "lParam", I_J); + NMTTDISPINFOFc.lParam = (*env)->GetFieldID(env, NMTTDISPINFOFc.clazz, "lParam", "J"); NMTTDISPINFOFc.cached = 1; } @@ -4414,14 +4414,14 @@ NMTTDISPINFO *getNMTTDISPINFOFields(JNIEnv *env, jobject lpObject, NMTTDISPINFO { if (!NMTTDISPINFOFc.cached) cacheNMTTDISPINFOFields(env, lpObject); getNMHDRFields(env, lpObject, (NMHDR *)lpStruct); - lpStruct->lpszText = (void *)(*env)->GetIntLongField(env, lpObject, NMTTDISPINFOFc.lpszText); + lpStruct->lpszText = (void *)(*env)->GetLongField(env, lpObject, NMTTDISPINFOFc.lpszText); { jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, NMTTDISPINFOFc.szText); (*env)->GetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szText) / sizeof(jchar), (jchar *)lpStruct->szText); } - lpStruct->hinst = (HINSTANCE)(*env)->GetIntLongField(env, lpObject, NMTTDISPINFOFc.hinst); + lpStruct->hinst = (HINSTANCE)(*env)->GetLongField(env, lpObject, NMTTDISPINFOFc.hinst); lpStruct->uFlags = (*env)->GetIntField(env, lpObject, NMTTDISPINFOFc.uFlags); - lpStruct->lParam = (*env)->GetIntLongField(env, lpObject, NMTTDISPINFOFc.lParam); + lpStruct->lParam = (*env)->GetLongField(env, lpObject, NMTTDISPINFOFc.lParam); return lpStruct; } @@ -4429,14 +4429,14 @@ void setNMTTDISPINFOFields(JNIEnv *env, jobject lpObject, NMTTDISPINFO *lpStruct { if (!NMTTDISPINFOFc.cached) cacheNMTTDISPINFOFields(env, lpObject); setNMHDRFields(env, lpObject, (NMHDR *)lpStruct); - (*env)->SetIntLongField(env, lpObject, NMTTDISPINFOFc.lpszText, (jintLong)lpStruct->lpszText); + (*env)->SetLongField(env, lpObject, NMTTDISPINFOFc.lpszText, (jlong)lpStruct->lpszText); { jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, NMTTDISPINFOFc.szText); (*env)->SetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szText) / sizeof(jchar), (jchar *)lpStruct->szText); } - (*env)->SetIntLongField(env, lpObject, NMTTDISPINFOFc.hinst, (jintLong)lpStruct->hinst); + (*env)->SetLongField(env, lpObject, NMTTDISPINFOFc.hinst, (jlong)lpStruct->hinst); (*env)->SetIntField(env, lpObject, NMTTDISPINFOFc.uFlags, (jint)lpStruct->uFlags); - (*env)->SetIntLongField(env, lpObject, NMTTDISPINFOFc.lParam, (jintLong)lpStruct->lParam); + (*env)->SetLongField(env, lpObject, NMTTDISPINFOFc.lParam, (jlong)lpStruct->lParam); } #endif @@ -4495,15 +4495,15 @@ void cacheNMTVDISPINFOFields(JNIEnv *env, jobject lpObject) cacheNMHDRFields(env, lpObject); NMTVDISPINFOFc.clazz = (*env)->GetObjectClass(env, lpObject); NMTVDISPINFOFc.mask = (*env)->GetFieldID(env, NMTVDISPINFOFc.clazz, "mask", "I"); - NMTVDISPINFOFc.hItem = (*env)->GetFieldID(env, NMTVDISPINFOFc.clazz, "hItem", I_J); + NMTVDISPINFOFc.hItem = (*env)->GetFieldID(env, NMTVDISPINFOFc.clazz, "hItem", "J"); NMTVDISPINFOFc.state = (*env)->GetFieldID(env, NMTVDISPINFOFc.clazz, "state", "I"); NMTVDISPINFOFc.stateMask = (*env)->GetFieldID(env, NMTVDISPINFOFc.clazz, "stateMask", "I"); - NMTVDISPINFOFc.pszText = (*env)->GetFieldID(env, NMTVDISPINFOFc.clazz, "pszText", I_J); + NMTVDISPINFOFc.pszText = (*env)->GetFieldID(env, NMTVDISPINFOFc.clazz, "pszText", "J"); NMTVDISPINFOFc.cchTextMax = (*env)->GetFieldID(env, NMTVDISPINFOFc.clazz, "cchTextMax", "I"); NMTVDISPINFOFc.iImage = (*env)->GetFieldID(env, NMTVDISPINFOFc.clazz, "iImage", "I"); NMTVDISPINFOFc.iSelectedImage = (*env)->GetFieldID(env, NMTVDISPINFOFc.clazz, "iSelectedImage", "I"); NMTVDISPINFOFc.cChildren = (*env)->GetFieldID(env, NMTVDISPINFOFc.clazz, "cChildren", "I"); - NMTVDISPINFOFc.lParam = (*env)->GetFieldID(env, NMTVDISPINFOFc.clazz, "lParam", I_J); + NMTVDISPINFOFc.lParam = (*env)->GetFieldID(env, NMTVDISPINFOFc.clazz, "lParam", "J"); NMTVDISPINFOFc.cached = 1; } @@ -4512,15 +4512,15 @@ NMTVDISPINFO *getNMTVDISPINFOFields(JNIEnv *env, jobject lpObject, NMTVDISPINFO if (!NMTVDISPINFOFc.cached) cacheNMTVDISPINFOFields(env, lpObject); getNMHDRFields(env, lpObject, (NMHDR *)lpStruct); lpStruct->item.mask = (*env)->GetIntField(env, lpObject, NMTVDISPINFOFc.mask); - lpStruct->item.hItem = (HTREEITEM)(*env)->GetIntLongField(env, lpObject, NMTVDISPINFOFc.hItem); + lpStruct->item.hItem = (HTREEITEM)(*env)->GetLongField(env, lpObject, NMTVDISPINFOFc.hItem); lpStruct->item.state = (*env)->GetIntField(env, lpObject, NMTVDISPINFOFc.state); lpStruct->item.stateMask = (*env)->GetIntField(env, lpObject, NMTVDISPINFOFc.stateMask); - lpStruct->item.pszText = (LPTSTR)(*env)->GetIntLongField(env, lpObject, NMTVDISPINFOFc.pszText); + lpStruct->item.pszText = (LPTSTR)(*env)->GetLongField(env, lpObject, NMTVDISPINFOFc.pszText); lpStruct->item.cchTextMax = (*env)->GetIntField(env, lpObject, NMTVDISPINFOFc.cchTextMax); lpStruct->item.iImage = (*env)->GetIntField(env, lpObject, NMTVDISPINFOFc.iImage); lpStruct->item.iSelectedImage = (*env)->GetIntField(env, lpObject, NMTVDISPINFOFc.iSelectedImage); lpStruct->item.cChildren = (*env)->GetIntField(env, lpObject, NMTVDISPINFOFc.cChildren); - lpStruct->item.lParam = (*env)->GetIntLongField(env, lpObject, NMTVDISPINFOFc.lParam); + lpStruct->item.lParam = (*env)->GetLongField(env, lpObject, NMTVDISPINFOFc.lParam); return lpStruct; } @@ -4529,15 +4529,15 @@ void setNMTVDISPINFOFields(JNIEnv *env, jobject lpObject, NMTVDISPINFO *lpStruct if (!NMTVDISPINFOFc.cached) cacheNMTVDISPINFOFields(env, lpObject); setNMHDRFields(env, lpObject, (NMHDR *)lpStruct); (*env)->SetIntField(env, lpObject, NMTVDISPINFOFc.mask, (jint)lpStruct->item.mask); - (*env)->SetIntLongField(env, lpObject, NMTVDISPINFOFc.hItem, (jintLong)lpStruct->item.hItem); + (*env)->SetLongField(env, lpObject, NMTVDISPINFOFc.hItem, (jlong)lpStruct->item.hItem); (*env)->SetIntField(env, lpObject, NMTVDISPINFOFc.state, (jint)lpStruct->item.state); (*env)->SetIntField(env, lpObject, NMTVDISPINFOFc.stateMask, (jint)lpStruct->item.stateMask); - (*env)->SetIntLongField(env, lpObject, NMTVDISPINFOFc.pszText, (jintLong)lpStruct->item.pszText); + (*env)->SetLongField(env, lpObject, NMTVDISPINFOFc.pszText, (jlong)lpStruct->item.pszText); (*env)->SetIntField(env, lpObject, NMTVDISPINFOFc.cchTextMax, (jint)lpStruct->item.cchTextMax); (*env)->SetIntField(env, lpObject, NMTVDISPINFOFc.iImage, (jint)lpStruct->item.iImage); (*env)->SetIntField(env, lpObject, NMTVDISPINFOFc.iSelectedImage, (jint)lpStruct->item.iSelectedImage); (*env)->SetIntField(env, lpObject, NMTVDISPINFOFc.cChildren, (jint)lpStruct->item.cChildren); - (*env)->SetIntLongField(env, lpObject, NMTVDISPINFOFc.lParam, (jintLong)lpStruct->item.lParam); + (*env)->SetLongField(env, lpObject, NMTVDISPINFOFc.lParam, (jlong)lpStruct->item.lParam); } #endif @@ -4556,10 +4556,10 @@ void cacheNMTVITEMCHANGEFields(JNIEnv *env, jobject lpObject) cacheNMHDRFields(env, lpObject); NMTVITEMCHANGEFc.clazz = (*env)->GetObjectClass(env, lpObject); NMTVITEMCHANGEFc.uChanged = (*env)->GetFieldID(env, NMTVITEMCHANGEFc.clazz, "uChanged", "I"); - NMTVITEMCHANGEFc.hItem = (*env)->GetFieldID(env, NMTVITEMCHANGEFc.clazz, "hItem", I_J); + NMTVITEMCHANGEFc.hItem = (*env)->GetFieldID(env, NMTVITEMCHANGEFc.clazz, "hItem", "J"); NMTVITEMCHANGEFc.uStateNew = (*env)->GetFieldID(env, NMTVITEMCHANGEFc.clazz, "uStateNew", "I"); NMTVITEMCHANGEFc.uStateOld = (*env)->GetFieldID(env, NMTVITEMCHANGEFc.clazz, "uStateOld", "I"); - NMTVITEMCHANGEFc.lParam = (*env)->GetFieldID(env, NMTVITEMCHANGEFc.clazz, "lParam", I_J); + NMTVITEMCHANGEFc.lParam = (*env)->GetFieldID(env, NMTVITEMCHANGEFc.clazz, "lParam", "J"); NMTVITEMCHANGEFc.cached = 1; } @@ -4568,10 +4568,10 @@ NMTVITEMCHANGE *getNMTVITEMCHANGEFields(JNIEnv *env, jobject lpObject, NMTVITEMC if (!NMTVITEMCHANGEFc.cached) cacheNMTVITEMCHANGEFields(env, lpObject); getNMHDRFields(env, lpObject, (NMHDR *)lpStruct); lpStruct->uChanged = (*env)->GetIntField(env, lpObject, NMTVITEMCHANGEFc.uChanged); - lpStruct->hItem = (HTREEITEM)(*env)->GetIntLongField(env, lpObject, NMTVITEMCHANGEFc.hItem); + lpStruct->hItem = (HTREEITEM)(*env)->GetLongField(env, lpObject, NMTVITEMCHANGEFc.hItem); lpStruct->uStateNew = (*env)->GetIntField(env, lpObject, NMTVITEMCHANGEFc.uStateNew); lpStruct->uStateOld = (*env)->GetIntField(env, lpObject, NMTVITEMCHANGEFc.uStateOld); - lpStruct->lParam = (*env)->GetIntLongField(env, lpObject, NMTVITEMCHANGEFc.lParam); + lpStruct->lParam = (*env)->GetLongField(env, lpObject, NMTVITEMCHANGEFc.lParam); return lpStruct; } @@ -4580,10 +4580,10 @@ void setNMTVITEMCHANGEFields(JNIEnv *env, jobject lpObject, NMTVITEMCHANGE *lpSt if (!NMTVITEMCHANGEFc.cached) cacheNMTVITEMCHANGEFields(env, lpObject); setNMHDRFields(env, lpObject, (NMHDR *)lpStruct); (*env)->SetIntField(env, lpObject, NMTVITEMCHANGEFc.uChanged, (jint)lpStruct->uChanged); - (*env)->SetIntLongField(env, lpObject, NMTVITEMCHANGEFc.hItem, (jintLong)lpStruct->hItem); + (*env)->SetLongField(env, lpObject, NMTVITEMCHANGEFc.hItem, (jlong)lpStruct->hItem); (*env)->SetIntField(env, lpObject, NMTVITEMCHANGEFc.uStateNew, (jint)lpStruct->uStateNew); (*env)->SetIntField(env, lpObject, NMTVITEMCHANGEFc.uStateOld, (jint)lpStruct->uStateOld); - (*env)->SetIntLongField(env, lpObject, NMTVITEMCHANGEFc.lParam, (jintLong)lpStruct->lParam); + (*env)->SetLongField(env, lpObject, NMTVITEMCHANGEFc.lParam, (jlong)lpStruct->lParam); } #endif @@ -4741,11 +4741,11 @@ void cacheNOTIFYICONDATAFields(JNIEnv *env, jobject lpObject) if (NOTIFYICONDATAFc.cached) return; NOTIFYICONDATAFc.clazz = (*env)->GetObjectClass(env, lpObject); NOTIFYICONDATAFc.cbSize = (*env)->GetFieldID(env, NOTIFYICONDATAFc.clazz, "cbSize", "I"); - NOTIFYICONDATAFc.hWnd = (*env)->GetFieldID(env, NOTIFYICONDATAFc.clazz, "hWnd", I_J); + NOTIFYICONDATAFc.hWnd = (*env)->GetFieldID(env, NOTIFYICONDATAFc.clazz, "hWnd", "J"); NOTIFYICONDATAFc.uID = (*env)->GetFieldID(env, NOTIFYICONDATAFc.clazz, "uID", "I"); NOTIFYICONDATAFc.uFlags = (*env)->GetFieldID(env, NOTIFYICONDATAFc.clazz, "uFlags", "I"); NOTIFYICONDATAFc.uCallbackMessage = (*env)->GetFieldID(env, NOTIFYICONDATAFc.clazz, "uCallbackMessage", "I"); - NOTIFYICONDATAFc.hIcon = (*env)->GetFieldID(env, NOTIFYICONDATAFc.clazz, "hIcon", I_J); + NOTIFYICONDATAFc.hIcon = (*env)->GetFieldID(env, NOTIFYICONDATAFc.clazz, "hIcon", "J"); NOTIFYICONDATAFc.szTip = (*env)->GetFieldID(env, NOTIFYICONDATAFc.clazz, "szTip", "[C"); NOTIFYICONDATAFc.dwState = (*env)->GetFieldID(env, NOTIFYICONDATAFc.clazz, "dwState", "I"); NOTIFYICONDATAFc.dwStateMask = (*env)->GetFieldID(env, NOTIFYICONDATAFc.clazz, "dwStateMask", "I"); @@ -4760,11 +4760,11 @@ NOTIFYICONDATA *getNOTIFYICONDATAFields(JNIEnv *env, jobject lpObject, NOTIFYICO { if (!NOTIFYICONDATAFc.cached) cacheNOTIFYICONDATAFields(env, lpObject); lpStruct->cbSize = (*env)->GetIntField(env, lpObject, NOTIFYICONDATAFc.cbSize); - lpStruct->hWnd = (HWND)(*env)->GetIntLongField(env, lpObject, NOTIFYICONDATAFc.hWnd); + lpStruct->hWnd = (HWND)(*env)->GetLongField(env, lpObject, NOTIFYICONDATAFc.hWnd); lpStruct->uID = (*env)->GetIntField(env, lpObject, NOTIFYICONDATAFc.uID); lpStruct->uFlags = (*env)->GetIntField(env, lpObject, NOTIFYICONDATAFc.uFlags); lpStruct->uCallbackMessage = (*env)->GetIntField(env, lpObject, NOTIFYICONDATAFc.uCallbackMessage); - lpStruct->hIcon = (HICON)(*env)->GetIntLongField(env, lpObject, NOTIFYICONDATAFc.hIcon); + lpStruct->hIcon = (HICON)(*env)->GetLongField(env, lpObject, NOTIFYICONDATAFc.hIcon); { jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, NOTIFYICONDATAFc.szTip); (*env)->GetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szTip) / sizeof(jchar), (jchar *)lpStruct->szTip); @@ -4788,11 +4788,11 @@ void setNOTIFYICONDATAFields(JNIEnv *env, jobject lpObject, NOTIFYICONDATA *lpSt { if (!NOTIFYICONDATAFc.cached) cacheNOTIFYICONDATAFields(env, lpObject); (*env)->SetIntField(env, lpObject, NOTIFYICONDATAFc.cbSize, (jint)lpStruct->cbSize); - (*env)->SetIntLongField(env, lpObject, NOTIFYICONDATAFc.hWnd, (jintLong)lpStruct->hWnd); + (*env)->SetLongField(env, lpObject, NOTIFYICONDATAFc.hWnd, (jlong)lpStruct->hWnd); (*env)->SetIntField(env, lpObject, NOTIFYICONDATAFc.uID, (jint)lpStruct->uID); (*env)->SetIntField(env, lpObject, NOTIFYICONDATAFc.uFlags, (jint)lpStruct->uFlags); (*env)->SetIntField(env, lpObject, NOTIFYICONDATAFc.uCallbackMessage, (jint)lpStruct->uCallbackMessage); - (*env)->SetIntLongField(env, lpObject, NOTIFYICONDATAFc.hIcon, (jintLong)lpStruct->hIcon); + (*env)->SetLongField(env, lpObject, NOTIFYICONDATAFc.hIcon, (jlong)lpStruct->hIcon); { jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, NOTIFYICONDATAFc.szTip); (*env)->SetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szTip) / sizeof(jchar), (jchar *)lpStruct->szTip); @@ -4826,8 +4826,8 @@ void cacheOFNOTIFYFields(JNIEnv *env, jobject lpObject) if (OFNOTIFYFc.cached) return; cacheNMHDRFields(env, lpObject); OFNOTIFYFc.clazz = (*env)->GetObjectClass(env, lpObject); - OFNOTIFYFc.lpOFN = (*env)->GetFieldID(env, OFNOTIFYFc.clazz, "lpOFN", I_J); - OFNOTIFYFc.pszFile = (*env)->GetFieldID(env, OFNOTIFYFc.clazz, "pszFile", I_J); + OFNOTIFYFc.lpOFN = (*env)->GetFieldID(env, OFNOTIFYFc.clazz, "lpOFN", "J"); + OFNOTIFYFc.pszFile = (*env)->GetFieldID(env, OFNOTIFYFc.clazz, "pszFile", "J"); OFNOTIFYFc.cached = 1; } @@ -4835,8 +4835,8 @@ OFNOTIFY *getOFNOTIFYFields(JNIEnv *env, jobject lpObject, OFNOTIFY *lpStruct) { if (!OFNOTIFYFc.cached) cacheOFNOTIFYFields(env, lpObject); getNMHDRFields(env, lpObject, (NMHDR *)lpStruct); - lpStruct->lpOFN = (LPOPENFILENAME)(*env)->GetIntLongField(env, lpObject, OFNOTIFYFc.lpOFN); - lpStruct->pszFile = (LPTSTR)(*env)->GetIntLongField(env, lpObject, OFNOTIFYFc.pszFile); + lpStruct->lpOFN = (LPOPENFILENAME)(*env)->GetLongField(env, lpObject, OFNOTIFYFc.lpOFN); + lpStruct->pszFile = (LPTSTR)(*env)->GetLongField(env, lpObject, OFNOTIFYFc.pszFile); return lpStruct; } @@ -4844,8 +4844,8 @@ void setOFNOTIFYFields(JNIEnv *env, jobject lpObject, OFNOTIFY *lpStruct) { if (!OFNOTIFYFc.cached) cacheOFNOTIFYFields(env, lpObject); setNMHDRFields(env, lpObject, (NMHDR *)lpStruct); - (*env)->SetIntLongField(env, lpObject, OFNOTIFYFc.lpOFN, (jintLong)lpStruct->lpOFN); - (*env)->SetIntLongField(env, lpObject, OFNOTIFYFc.pszFile, (jintLong)lpStruct->pszFile); + (*env)->SetLongField(env, lpObject, OFNOTIFYFc.lpOFN, (jlong)lpStruct->lpOFN); + (*env)->SetLongField(env, lpObject, OFNOTIFYFc.pszFile, (jlong)lpStruct->pszFile); } #endif @@ -4863,26 +4863,26 @@ void cacheOPENFILENAMEFields(JNIEnv *env, jobject lpObject) if (OPENFILENAMEFc.cached) return; OPENFILENAMEFc.clazz = (*env)->GetObjectClass(env, lpObject); OPENFILENAMEFc.lStructSize = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "lStructSize", "I"); - OPENFILENAMEFc.hwndOwner = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "hwndOwner", I_J); - OPENFILENAMEFc.hInstance = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "hInstance", I_J); - OPENFILENAMEFc.lpstrFilter = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "lpstrFilter", I_J); - OPENFILENAMEFc.lpstrCustomFilter = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "lpstrCustomFilter", I_J); + OPENFILENAMEFc.hwndOwner = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "hwndOwner", "J"); + OPENFILENAMEFc.hInstance = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "hInstance", "J"); + OPENFILENAMEFc.lpstrFilter = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "lpstrFilter", "J"); + OPENFILENAMEFc.lpstrCustomFilter = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "lpstrCustomFilter", "J"); OPENFILENAMEFc.nMaxCustFilter = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "nMaxCustFilter", "I"); OPENFILENAMEFc.nFilterIndex = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "nFilterIndex", "I"); - OPENFILENAMEFc.lpstrFile = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "lpstrFile", I_J); + OPENFILENAMEFc.lpstrFile = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "lpstrFile", "J"); OPENFILENAMEFc.nMaxFile = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "nMaxFile", "I"); - OPENFILENAMEFc.lpstrFileTitle = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "lpstrFileTitle", I_J); + OPENFILENAMEFc.lpstrFileTitle = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "lpstrFileTitle", "J"); OPENFILENAMEFc.nMaxFileTitle = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "nMaxFileTitle", "I"); - OPENFILENAMEFc.lpstrInitialDir = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "lpstrInitialDir", I_J); - OPENFILENAMEFc.lpstrTitle = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "lpstrTitle", I_J); + OPENFILENAMEFc.lpstrInitialDir = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "lpstrInitialDir", "J"); + OPENFILENAMEFc.lpstrTitle = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "lpstrTitle", "J"); OPENFILENAMEFc.Flags = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "Flags", "I"); OPENFILENAMEFc.nFileOffset = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "nFileOffset", "S"); OPENFILENAMEFc.nFileExtension = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "nFileExtension", "S"); - OPENFILENAMEFc.lpstrDefExt = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "lpstrDefExt", I_J); - OPENFILENAMEFc.lCustData = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "lCustData", I_J); - OPENFILENAMEFc.lpfnHook = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "lpfnHook", I_J); - OPENFILENAMEFc.lpTemplateName = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "lpTemplateName", I_J); - OPENFILENAMEFc.pvReserved = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "pvReserved", I_J); + OPENFILENAMEFc.lpstrDefExt = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "lpstrDefExt", "J"); + OPENFILENAMEFc.lCustData = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "lCustData", "J"); + OPENFILENAMEFc.lpfnHook = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "lpfnHook", "J"); + OPENFILENAMEFc.lpTemplateName = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "lpTemplateName", "J"); + OPENFILENAMEFc.pvReserved = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "pvReserved", "J"); OPENFILENAMEFc.dwReserved = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "dwReserved", "I"); OPENFILENAMEFc.FlagsEx = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "FlagsEx", "I"); OPENFILENAMEFc.cached = 1; @@ -4892,26 +4892,26 @@ OPENFILENAME *getOPENFILENAMEFields(JNIEnv *env, jobject lpObject, OPENFILENAME { if (!OPENFILENAMEFc.cached) cacheOPENFILENAMEFields(env, lpObject); lpStruct->lStructSize = (*env)->GetIntField(env, lpObject, OPENFILENAMEFc.lStructSize); - lpStruct->hwndOwner = (HWND)(*env)->GetIntLongField(env, lpObject, OPENFILENAMEFc.hwndOwner); - lpStruct->hInstance = (HINSTANCE)(*env)->GetIntLongField(env, lpObject, OPENFILENAMEFc.hInstance); - lpStruct->lpstrFilter = (LPCTSTR)(*env)->GetIntLongField(env, lpObject, OPENFILENAMEFc.lpstrFilter); - lpStruct->lpstrCustomFilter = (LPTSTR)(*env)->GetIntLongField(env, lpObject, OPENFILENAMEFc.lpstrCustomFilter); + lpStruct->hwndOwner = (HWND)(*env)->GetLongField(env, lpObject, OPENFILENAMEFc.hwndOwner); + lpStruct->hInstance = (HINSTANCE)(*env)->GetLongField(env, lpObject, OPENFILENAMEFc.hInstance); + lpStruct->lpstrFilter = (LPCTSTR)(*env)->GetLongField(env, lpObject, OPENFILENAMEFc.lpstrFilter); + lpStruct->lpstrCustomFilter = (LPTSTR)(*env)->GetLongField(env, lpObject, OPENFILENAMEFc.lpstrCustomFilter); lpStruct->nMaxCustFilter = (*env)->GetIntField(env, lpObject, OPENFILENAMEFc.nMaxCustFilter); lpStruct->nFilterIndex = (*env)->GetIntField(env, lpObject, OPENFILENAMEFc.nFilterIndex); - lpStruct->lpstrFile = (LPTSTR)(*env)->GetIntLongField(env, lpObject, OPENFILENAMEFc.lpstrFile); + lpStruct->lpstrFile = (LPTSTR)(*env)->GetLongField(env, lpObject, OPENFILENAMEFc.lpstrFile); lpStruct->nMaxFile = (*env)->GetIntField(env, lpObject, OPENFILENAMEFc.nMaxFile); - lpStruct->lpstrFileTitle = (LPTSTR)(*env)->GetIntLongField(env, lpObject, OPENFILENAMEFc.lpstrFileTitle); + lpStruct->lpstrFileTitle = (LPTSTR)(*env)->GetLongField(env, lpObject, OPENFILENAMEFc.lpstrFileTitle); lpStruct->nMaxFileTitle = (*env)->GetIntField(env, lpObject, OPENFILENAMEFc.nMaxFileTitle); - lpStruct->lpstrInitialDir = (LPCTSTR)(*env)->GetIntLongField(env, lpObject, OPENFILENAMEFc.lpstrInitialDir); - lpStruct->lpstrTitle = (LPCTSTR)(*env)->GetIntLongField(env, lpObject, OPENFILENAMEFc.lpstrTitle); + lpStruct->lpstrInitialDir = (LPCTSTR)(*env)->GetLongField(env, lpObject, OPENFILENAMEFc.lpstrInitialDir); + lpStruct->lpstrTitle = (LPCTSTR)(*env)->GetLongField(env, lpObject, OPENFILENAMEFc.lpstrTitle); lpStruct->Flags = (*env)->GetIntField(env, lpObject, OPENFILENAMEFc.Flags); lpStruct->nFileOffset = (*env)->GetShortField(env, lpObject, OPENFILENAMEFc.nFileOffset); lpStruct->nFileExtension = (*env)->GetShortField(env, lpObject, OPENFILENAMEFc.nFileExtension); - lpStruct->lpstrDefExt = (LPCTSTR)(*env)->GetIntLongField(env, lpObject, OPENFILENAMEFc.lpstrDefExt); - lpStruct->lCustData = (*env)->GetIntLongField(env, lpObject, OPENFILENAMEFc.lCustData); - lpStruct->lpfnHook = (LPOFNHOOKPROC)(*env)->GetIntLongField(env, lpObject, OPENFILENAMEFc.lpfnHook); - lpStruct->lpTemplateName = (LPCTSTR)(*env)->GetIntLongField(env, lpObject, OPENFILENAMEFc.lpTemplateName); - lpStruct->pvReserved = (void *)(*env)->GetIntLongField(env, lpObject, OPENFILENAMEFc.pvReserved); + lpStruct->lpstrDefExt = (LPCTSTR)(*env)->GetLongField(env, lpObject, OPENFILENAMEFc.lpstrDefExt); + lpStruct->lCustData = (*env)->GetLongField(env, lpObject, OPENFILENAMEFc.lCustData); + lpStruct->lpfnHook = (LPOFNHOOKPROC)(*env)->GetLongField(env, lpObject, OPENFILENAMEFc.lpfnHook); + lpStruct->lpTemplateName = (LPCTSTR)(*env)->GetLongField(env, lpObject, OPENFILENAMEFc.lpTemplateName); + lpStruct->pvReserved = (void *)(*env)->GetLongField(env, lpObject, OPENFILENAMEFc.pvReserved); lpStruct->dwReserved = (*env)->GetIntField(env, lpObject, OPENFILENAMEFc.dwReserved); lpStruct->FlagsEx = (*env)->GetIntField(env, lpObject, OPENFILENAMEFc.FlagsEx); return lpStruct; @@ -4921,26 +4921,26 @@ void setOPENFILENAMEFields(JNIEnv *env, jobject lpObject, OPENFILENAME *lpStruct { if (!OPENFILENAMEFc.cached) cacheOPENFILENAMEFields(env, lpObject); (*env)->SetIntField(env, lpObject, OPENFILENAMEFc.lStructSize, (jint)lpStruct->lStructSize); - (*env)->SetIntLongField(env, lpObject, OPENFILENAMEFc.hwndOwner, (jintLong)lpStruct->hwndOwner); - (*env)->SetIntLongField(env, lpObject, OPENFILENAMEFc.hInstance, (jintLong)lpStruct->hInstance); - (*env)->SetIntLongField(env, lpObject, OPENFILENAMEFc.lpstrFilter, (jintLong)lpStruct->lpstrFilter); - (*env)->SetIntLongField(env, lpObject, OPENFILENAMEFc.lpstrCustomFilter, (jintLong)lpStruct->lpstrCustomFilter); + (*env)->SetLongField(env, lpObject, OPENFILENAMEFc.hwndOwner, (jlong)lpStruct->hwndOwner); + (*env)->SetLongField(env, lpObject, OPENFILENAMEFc.hInstance, (jlong)lpStruct->hInstance); + (*env)->SetLongField(env, lpObject, OPENFILENAMEFc.lpstrFilter, (jlong)lpStruct->lpstrFilter); + (*env)->SetLongField(env, lpObject, OPENFILENAMEFc.lpstrCustomFilter, (jlong)lpStruct->lpstrCustomFilter); (*env)->SetIntField(env, lpObject, OPENFILENAMEFc.nMaxCustFilter, (jint)lpStruct->nMaxCustFilter); (*env)->SetIntField(env, lpObject, OPENFILENAMEFc.nFilterIndex, (jint)lpStruct->nFilterIndex); - (*env)->SetIntLongField(env, lpObject, OPENFILENAMEFc.lpstrFile, (jintLong)lpStruct->lpstrFile); + (*env)->SetLongField(env, lpObject, OPENFILENAMEFc.lpstrFile, (jlong)lpStruct->lpstrFile); (*env)->SetIntField(env, lpObject, OPENFILENAMEFc.nMaxFile, (jint)lpStruct->nMaxFile); - (*env)->SetIntLongField(env, lpObject, OPENFILENAMEFc.lpstrFileTitle, (jintLong)lpStruct->lpstrFileTitle); + (*env)->SetLongField(env, lpObject, OPENFILENAMEFc.lpstrFileTitle, (jlong)lpStruct->lpstrFileTitle); (*env)->SetIntField(env, lpObject, OPENFILENAMEFc.nMaxFileTitle, (jint)lpStruct->nMaxFileTitle); - (*env)->SetIntLongField(env, lpObject, OPENFILENAMEFc.lpstrInitialDir, (jintLong)lpStruct->lpstrInitialDir); - (*env)->SetIntLongField(env, lpObject, OPENFILENAMEFc.lpstrTitle, (jintLong)lpStruct->lpstrTitle); + (*env)->SetLongField(env, lpObject, OPENFILENAMEFc.lpstrInitialDir, (jlong)lpStruct->lpstrInitialDir); + (*env)->SetLongField(env, lpObject, OPENFILENAMEFc.lpstrTitle, (jlong)lpStruct->lpstrTitle); (*env)->SetIntField(env, lpObject, OPENFILENAMEFc.Flags, (jint)lpStruct->Flags); (*env)->SetShortField(env, lpObject, OPENFILENAMEFc.nFileOffset, (jshort)lpStruct->nFileOffset); (*env)->SetShortField(env, lpObject, OPENFILENAMEFc.nFileExtension, (jshort)lpStruct->nFileExtension); - (*env)->SetIntLongField(env, lpObject, OPENFILENAMEFc.lpstrDefExt, (jintLong)lpStruct->lpstrDefExt); - (*env)->SetIntLongField(env, lpObject, OPENFILENAMEFc.lCustData, (jintLong)lpStruct->lCustData); - (*env)->SetIntLongField(env, lpObject, OPENFILENAMEFc.lpfnHook, (jintLong)lpStruct->lpfnHook); - (*env)->SetIntLongField(env, lpObject, OPENFILENAMEFc.lpTemplateName, (jintLong)lpStruct->lpTemplateName); - (*env)->SetIntLongField(env, lpObject, OPENFILENAMEFc.pvReserved, (jintLong)lpStruct->pvReserved); + (*env)->SetLongField(env, lpObject, OPENFILENAMEFc.lpstrDefExt, (jlong)lpStruct->lpstrDefExt); + (*env)->SetLongField(env, lpObject, OPENFILENAMEFc.lCustData, (jlong)lpStruct->lCustData); + (*env)->SetLongField(env, lpObject, OPENFILENAMEFc.lpfnHook, (jlong)lpStruct->lpfnHook); + (*env)->SetLongField(env, lpObject, OPENFILENAMEFc.lpTemplateName, (jlong)lpStruct->lpTemplateName); + (*env)->SetLongField(env, lpObject, OPENFILENAMEFc.pvReserved, (jlong)lpStruct->pvReserved); (*env)->SetIntField(env, lpObject, OPENFILENAMEFc.dwReserved, (jint)lpStruct->dwReserved); (*env)->SetIntField(env, lpObject, OPENFILENAMEFc.FlagsEx, (jint)lpStruct->FlagsEx); } @@ -4996,10 +4996,10 @@ void cacheOUTLINETEXTMETRICFields(JNIEnv *env, jobject lpObject) OUTLINETEXTMETRICFc.otmsStrikeoutPosition = (*env)->GetFieldID(env, OUTLINETEXTMETRICFc.clazz, "otmsStrikeoutPosition", "I"); OUTLINETEXTMETRICFc.otmsUnderscoreSize = (*env)->GetFieldID(env, OUTLINETEXTMETRICFc.clazz, "otmsUnderscoreSize", "I"); OUTLINETEXTMETRICFc.otmsUnderscorePosition = (*env)->GetFieldID(env, OUTLINETEXTMETRICFc.clazz, "otmsUnderscorePosition", "I"); - OUTLINETEXTMETRICFc.otmpFamilyName = (*env)->GetFieldID(env, OUTLINETEXTMETRICFc.clazz, "otmpFamilyName", I_J); - OUTLINETEXTMETRICFc.otmpFaceName = (*env)->GetFieldID(env, OUTLINETEXTMETRICFc.clazz, "otmpFaceName", I_J); - OUTLINETEXTMETRICFc.otmpStyleName = (*env)->GetFieldID(env, OUTLINETEXTMETRICFc.clazz, "otmpStyleName", I_J); - OUTLINETEXTMETRICFc.otmpFullName = (*env)->GetFieldID(env, OUTLINETEXTMETRICFc.clazz, "otmpFullName", I_J); + OUTLINETEXTMETRICFc.otmpFamilyName = (*env)->GetFieldID(env, OUTLINETEXTMETRICFc.clazz, "otmpFamilyName", "J"); + OUTLINETEXTMETRICFc.otmpFaceName = (*env)->GetFieldID(env, OUTLINETEXTMETRICFc.clazz, "otmpFaceName", "J"); + OUTLINETEXTMETRICFc.otmpStyleName = (*env)->GetFieldID(env, OUTLINETEXTMETRICFc.clazz, "otmpStyleName", "J"); + OUTLINETEXTMETRICFc.otmpFullName = (*env)->GetFieldID(env, OUTLINETEXTMETRICFc.clazz, "otmpFullName", "J"); OUTLINETEXTMETRICFc.cached = 1; } @@ -5061,10 +5061,10 @@ OUTLINETEXTMETRIC *getOUTLINETEXTMETRICFields(JNIEnv *env, jobject lpObject, OUT lpStruct->otmsStrikeoutPosition = (*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmsStrikeoutPosition); lpStruct->otmsUnderscoreSize = (*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmsUnderscoreSize); lpStruct->otmsUnderscorePosition = (*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmsUnderscorePosition); - lpStruct->otmpFamilyName = (PSTR)(*env)->GetIntLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpFamilyName); - lpStruct->otmpFaceName = (PSTR)(*env)->GetIntLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpFaceName); - lpStruct->otmpStyleName = (PSTR)(*env)->GetIntLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpStyleName); - lpStruct->otmpFullName = (PSTR)(*env)->GetIntLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpFullName); + lpStruct->otmpFamilyName = (PSTR)(*env)->GetLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpFamilyName); + lpStruct->otmpFaceName = (PSTR)(*env)->GetLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpFaceName); + lpStruct->otmpStyleName = (PSTR)(*env)->GetLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpStyleName); + lpStruct->otmpFullName = (PSTR)(*env)->GetLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpFullName); return lpStruct; } @@ -5126,10 +5126,10 @@ void setOUTLINETEXTMETRICFields(JNIEnv *env, jobject lpObject, OUTLINETEXTMETRIC (*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmsStrikeoutPosition, (jint)lpStruct->otmsStrikeoutPosition); (*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmsUnderscoreSize, (jint)lpStruct->otmsUnderscoreSize); (*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmsUnderscorePosition, (jint)lpStruct->otmsUnderscorePosition); - (*env)->SetIntLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpFamilyName, (jintLong)lpStruct->otmpFamilyName); - (*env)->SetIntLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpFaceName, (jintLong)lpStruct->otmpFaceName); - (*env)->SetIntLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpStyleName, (jintLong)lpStruct->otmpStyleName); - (*env)->SetIntLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpFullName, (jintLong)lpStruct->otmpFullName); + (*env)->SetLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpFamilyName, (jlong)lpStruct->otmpFamilyName); + (*env)->SetLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpFaceName, (jlong)lpStruct->otmpFaceName); + (*env)->SetLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpStyleName, (jlong)lpStruct->otmpStyleName); + (*env)->SetLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpFullName, (jlong)lpStruct->otmpFullName); } #endif @@ -5146,7 +5146,7 @@ void cachePAINTSTRUCTFields(JNIEnv *env, jobject lpObject) { if (PAINTSTRUCTFc.cached) return; PAINTSTRUCTFc.clazz = (*env)->GetObjectClass(env, lpObject); - PAINTSTRUCTFc.hdc = (*env)->GetFieldID(env, PAINTSTRUCTFc.clazz, "hdc", I_J); + PAINTSTRUCTFc.hdc = (*env)->GetFieldID(env, PAINTSTRUCTFc.clazz, "hdc", "J"); PAINTSTRUCTFc.fErase = (*env)->GetFieldID(env, PAINTSTRUCTFc.clazz, "fErase", "Z"); PAINTSTRUCTFc.left = (*env)->GetFieldID(env, PAINTSTRUCTFc.clazz, "left", "I"); PAINTSTRUCTFc.top = (*env)->GetFieldID(env, PAINTSTRUCTFc.clazz, "top", "I"); @@ -5161,7 +5161,7 @@ void cachePAINTSTRUCTFields(JNIEnv *env, jobject lpObject) PAINTSTRUCT *getPAINTSTRUCTFields(JNIEnv *env, jobject lpObject, PAINTSTRUCT *lpStruct) { if (!PAINTSTRUCTFc.cached) cachePAINTSTRUCTFields(env, lpObject); - lpStruct->hdc = (HDC)(*env)->GetIntLongField(env, lpObject, PAINTSTRUCTFc.hdc); + lpStruct->hdc = (HDC)(*env)->GetLongField(env, lpObject, PAINTSTRUCTFc.hdc); lpStruct->fErase = (*env)->GetBooleanField(env, lpObject, PAINTSTRUCTFc.fErase); lpStruct->rcPaint.left = (*env)->GetIntField(env, lpObject, PAINTSTRUCTFc.left); lpStruct->rcPaint.top = (*env)->GetIntField(env, lpObject, PAINTSTRUCTFc.top); @@ -5179,7 +5179,7 @@ PAINTSTRUCT *getPAINTSTRUCTFields(JNIEnv *env, jobject lpObject, PAINTSTRUCT *lp void setPAINTSTRUCTFields(JNIEnv *env, jobject lpObject, PAINTSTRUCT *lpStruct) { if (!PAINTSTRUCTFc.cached) cachePAINTSTRUCTFields(env, lpObject); - (*env)->SetIntLongField(env, lpObject, PAINTSTRUCTFc.hdc, (jintLong)lpStruct->hdc); + (*env)->SetLongField(env, lpObject, PAINTSTRUCTFc.hdc, (jlong)lpStruct->hdc); (*env)->SetBooleanField(env, lpObject, PAINTSTRUCTFc.fErase, (jboolean)lpStruct->fErase); (*env)->SetIntField(env, lpObject, PAINTSTRUCTFc.left, (jint)lpStruct->rcPaint.left); (*env)->SetIntField(env, lpObject, PAINTSTRUCTFc.top, (jint)lpStruct->rcPaint.top); @@ -5300,24 +5300,24 @@ void cachePRINTDLGFields(JNIEnv *env, jobject lpObject) if (PRINTDLGFc.cached) return; PRINTDLGFc.clazz = (*env)->GetObjectClass(env, lpObject); PRINTDLGFc.lStructSize = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "lStructSize", "I"); - PRINTDLGFc.hwndOwner = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "hwndOwner", I_J); - PRINTDLGFc.hDevMode = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "hDevMode", I_J); - PRINTDLGFc.hDevNames = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "hDevNames", I_J); - PRINTDLGFc.hDC = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "hDC", I_J); + PRINTDLGFc.hwndOwner = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "hwndOwner", "J"); + PRINTDLGFc.hDevMode = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "hDevMode", "J"); + PRINTDLGFc.hDevNames = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "hDevNames", "J"); + PRINTDLGFc.hDC = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "hDC", "J"); PRINTDLGFc.Flags = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "Flags", "I"); PRINTDLGFc.nFromPage = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "nFromPage", "S"); PRINTDLGFc.nToPage = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "nToPage", "S"); PRINTDLGFc.nMinPage = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "nMinPage", "S"); PRINTDLGFc.nMaxPage = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "nMaxPage", "S"); PRINTDLGFc.nCopies = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "nCopies", "S"); - PRINTDLGFc.hInstance = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "hInstance", I_J); - PRINTDLGFc.lCustData = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "lCustData", I_J); - PRINTDLGFc.lpfnPrintHook = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "lpfnPrintHook", I_J); - PRINTDLGFc.lpfnSetupHook = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "lpfnSetupHook", I_J); - PRINTDLGFc.lpPrintTemplateName = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "lpPrintTemplateName", I_J); - PRINTDLGFc.lpSetupTemplateName = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "lpSetupTemplateName", I_J); - PRINTDLGFc.hPrintTemplate = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "hPrintTemplate", I_J); - PRINTDLGFc.hSetupTemplate = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "hSetupTemplate", I_J); + PRINTDLGFc.hInstance = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "hInstance", "J"); + PRINTDLGFc.lCustData = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "lCustData", "J"); + PRINTDLGFc.lpfnPrintHook = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "lpfnPrintHook", "J"); + PRINTDLGFc.lpfnSetupHook = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "lpfnSetupHook", "J"); + PRINTDLGFc.lpPrintTemplateName = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "lpPrintTemplateName", "J"); + PRINTDLGFc.lpSetupTemplateName = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "lpSetupTemplateName", "J"); + PRINTDLGFc.hPrintTemplate = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "hPrintTemplate", "J"); + PRINTDLGFc.hSetupTemplate = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "hSetupTemplate", "J"); PRINTDLGFc.cached = 1; } @@ -5325,24 +5325,24 @@ PRINTDLG *getPRINTDLGFields(JNIEnv *env, jobject lpObject, PRINTDLG *lpStruct) { if (!PRINTDLGFc.cached) cachePRINTDLGFields(env, lpObject); lpStruct->lStructSize = (*env)->GetIntField(env, lpObject, PRINTDLGFc.lStructSize); - lpStruct->hwndOwner = (HWND)(*env)->GetIntLongField(env, lpObject, PRINTDLGFc.hwndOwner); - lpStruct->hDevMode = (HGLOBAL)(*env)->GetIntLongField(env, lpObject, PRINTDLGFc.hDevMode); - lpStruct->hDevNames = (HGLOBAL)(*env)->GetIntLongField(env, lpObject, PRINTDLGFc.hDevNames); - lpStruct->hDC = (HDC)(*env)->GetIntLongField(env, lpObject, PRINTDLGFc.hDC); + lpStruct->hwndOwner = (HWND)(*env)->GetLongField(env, lpObject, PRINTDLGFc.hwndOwner); + lpStruct->hDevMode = (HGLOBAL)(*env)->GetLongField(env, lpObject, PRINTDLGFc.hDevMode); + lpStruct->hDevNames = (HGLOBAL)(*env)->GetLongField(env, lpObject, PRINTDLGFc.hDevNames); + lpStruct->hDC = (HDC)(*env)->GetLongField(env, lpObject, PRINTDLGFc.hDC); lpStruct->Flags = (*env)->GetIntField(env, lpObject, PRINTDLGFc.Flags); lpStruct->nFromPage = (*env)->GetShortField(env, lpObject, PRINTDLGFc.nFromPage); lpStruct->nToPage = (*env)->GetShortField(env, lpObject, PRINTDLGFc.nToPage); lpStruct->nMinPage = (*env)->GetShortField(env, lpObject, PRINTDLGFc.nMinPage); lpStruct->nMaxPage = (*env)->GetShortField(env, lpObject, PRINTDLGFc.nMaxPage); lpStruct->nCopies = (*env)->GetShortField(env, lpObject, PRINTDLGFc.nCopies); - lpStruct->hInstance = (HINSTANCE)(*env)->GetIntLongField(env, lpObject, PRINTDLGFc.hInstance); - lpStruct->lCustData = (*env)->GetIntLongField(env, lpObject, PRINTDLGFc.lCustData); - lpStruct->lpfnPrintHook = (LPPRINTHOOKPROC)(*env)->GetIntLongField(env, lpObject, PRINTDLGFc.lpfnPrintHook); - lpStruct->lpfnSetupHook = (LPPRINTHOOKPROC)(*env)->GetIntLongField(env, lpObject, PRINTDLGFc.lpfnSetupHook); - lpStruct->lpPrintTemplateName = (LPCTSTR)(*env)->GetIntLongField(env, lpObject, PRINTDLGFc.lpPrintTemplateName); - lpStruct->lpSetupTemplateName = (LPCTSTR)(*env)->GetIntLongField(env, lpObject, PRINTDLGFc.lpSetupTemplateName); - lpStruct->hPrintTemplate = (HGLOBAL)(*env)->GetIntLongField(env, lpObject, PRINTDLGFc.hPrintTemplate); - lpStruct->hSetupTemplate = (HGLOBAL)(*env)->GetIntLongField(env, lpObject, PRINTDLGFc.hSetupTemplate); + lpStruct->hInstance = (HINSTANCE)(*env)->GetLongField(env, lpObject, PRINTDLGFc.hInstance); + lpStruct->lCustData = (*env)->GetLongField(env, lpObject, PRINTDLGFc.lCustData); + lpStruct->lpfnPrintHook = (LPPRINTHOOKPROC)(*env)->GetLongField(env, lpObject, PRINTDLGFc.lpfnPrintHook); + lpStruct->lpfnSetupHook = (LPPRINTHOOKPROC)(*env)->GetLongField(env, lpObject, PRINTDLGFc.lpfnSetupHook); + lpStruct->lpPrintTemplateName = (LPCTSTR)(*env)->GetLongField(env, lpObject, PRINTDLGFc.lpPrintTemplateName); + lpStruct->lpSetupTemplateName = (LPCTSTR)(*env)->GetLongField(env, lpObject, PRINTDLGFc.lpSetupTemplateName); + lpStruct->hPrintTemplate = (HGLOBAL)(*env)->GetLongField(env, lpObject, PRINTDLGFc.hPrintTemplate); + lpStruct->hSetupTemplate = (HGLOBAL)(*env)->GetLongField(env, lpObject, PRINTDLGFc.hSetupTemplate); return lpStruct; } @@ -5350,24 +5350,24 @@ void setPRINTDLGFields(JNIEnv *env, jobject lpObject, PRINTDLG *lpStruct) { if (!PRINTDLGFc.cached) cachePRINTDLGFields(env, lpObject); (*env)->SetIntField(env, lpObject, PRINTDLGFc.lStructSize, (jint)lpStruct->lStructSize); - (*env)->SetIntLongField(env, lpObject, PRINTDLGFc.hwndOwner, (jintLong)lpStruct->hwndOwner); - (*env)->SetIntLongField(env, lpObject, PRINTDLGFc.hDevMode, (jintLong)lpStruct->hDevMode); - (*env)->SetIntLongField(env, lpObject, PRINTDLGFc.hDevNames, (jintLong)lpStruct->hDevNames); - (*env)->SetIntLongField(env, lpObject, PRINTDLGFc.hDC, (jintLong)lpStruct->hDC); + (*env)->SetLongField(env, lpObject, PRINTDLGFc.hwndOwner, (jlong)lpStruct->hwndOwner); + (*env)->SetLongField(env, lpObject, PRINTDLGFc.hDevMode, (jlong)lpStruct->hDevMode); + (*env)->SetLongField(env, lpObject, PRINTDLGFc.hDevNames, (jlong)lpStruct->hDevNames); + (*env)->SetLongField(env, lpObject, PRINTDLGFc.hDC, (jlong)lpStruct->hDC); (*env)->SetIntField(env, lpObject, PRINTDLGFc.Flags, (jint)lpStruct->Flags); (*env)->SetShortField(env, lpObject, PRINTDLGFc.nFromPage, (jshort)lpStruct->nFromPage); (*env)->SetShortField(env, lpObject, PRINTDLGFc.nToPage, (jshort)lpStruct->nToPage); (*env)->SetShortField(env, lpObject, PRINTDLGFc.nMinPage, (jshort)lpStruct->nMinPage); (*env)->SetShortField(env, lpObject, PRINTDLGFc.nMaxPage, (jshort)lpStruct->nMaxPage); (*env)->SetShortField(env, lpObject, PRINTDLGFc.nCopies, (jshort)lpStruct->nCopies); - (*env)->SetIntLongField(env, lpObject, PRINTDLGFc.hInstance, (jintLong)lpStruct->hInstance); - (*env)->SetIntLongField(env, lpObject, PRINTDLGFc.lCustData, (jintLong)lpStruct->lCustData); - (*env)->SetIntLongField(env, lpObject, PRINTDLGFc.lpfnPrintHook, (jintLong)lpStruct->lpfnPrintHook); - (*env)->SetIntLongField(env, lpObject, PRINTDLGFc.lpfnSetupHook, (jintLong)lpStruct->lpfnSetupHook); - (*env)->SetIntLongField(env, lpObject, PRINTDLGFc.lpPrintTemplateName, (jintLong)lpStruct->lpPrintTemplateName); - (*env)->SetIntLongField(env, lpObject, PRINTDLGFc.lpSetupTemplateName, (jintLong)lpStruct->lpSetupTemplateName); - (*env)->SetIntLongField(env, lpObject, PRINTDLGFc.hPrintTemplate, (jintLong)lpStruct->hPrintTemplate); - (*env)->SetIntLongField(env, lpObject, PRINTDLGFc.hSetupTemplate, (jintLong)lpStruct->hSetupTemplate); + (*env)->SetLongField(env, lpObject, PRINTDLGFc.hInstance, (jlong)lpStruct->hInstance); + (*env)->SetLongField(env, lpObject, PRINTDLGFc.lCustData, (jlong)lpStruct->lCustData); + (*env)->SetLongField(env, lpObject, PRINTDLGFc.lpfnPrintHook, (jlong)lpStruct->lpfnPrintHook); + (*env)->SetLongField(env, lpObject, PRINTDLGFc.lpfnSetupHook, (jlong)lpStruct->lpfnSetupHook); + (*env)->SetLongField(env, lpObject, PRINTDLGFc.lpPrintTemplateName, (jlong)lpStruct->lpPrintTemplateName); + (*env)->SetLongField(env, lpObject, PRINTDLGFc.lpSetupTemplateName, (jlong)lpStruct->lpSetupTemplateName); + (*env)->SetLongField(env, lpObject, PRINTDLGFc.hPrintTemplate, (jlong)lpStruct->hPrintTemplate); + (*env)->SetLongField(env, lpObject, PRINTDLGFc.hSetupTemplate, (jlong)lpStruct->hSetupTemplate); } #endif @@ -5384,8 +5384,8 @@ void cachePROCESS_INFORMATIONFields(JNIEnv *env, jobject lpObject) { if (PROCESS_INFORMATIONFc.cached) return; PROCESS_INFORMATIONFc.clazz = (*env)->GetObjectClass(env, lpObject); - PROCESS_INFORMATIONFc.hProcess = (*env)->GetFieldID(env, PROCESS_INFORMATIONFc.clazz, "hProcess", I_J); - PROCESS_INFORMATIONFc.hThread = (*env)->GetFieldID(env, PROCESS_INFORMATIONFc.clazz, "hThread", I_J); + PROCESS_INFORMATIONFc.hProcess = (*env)->GetFieldID(env, PROCESS_INFORMATIONFc.clazz, "hProcess", "J"); + PROCESS_INFORMATIONFc.hThread = (*env)->GetFieldID(env, PROCESS_INFORMATIONFc.clazz, "hThread", "J"); PROCESS_INFORMATIONFc.dwProcessId = (*env)->GetFieldID(env, PROCESS_INFORMATIONFc.clazz, "dwProcessId", "I"); PROCESS_INFORMATIONFc.dwThreadId = (*env)->GetFieldID(env, PROCESS_INFORMATIONFc.clazz, "dwThreadId", "I"); PROCESS_INFORMATIONFc.cached = 1; @@ -5394,8 +5394,8 @@ void cachePROCESS_INFORMATIONFields(JNIEnv *env, jobject lpObject) PROCESS_INFORMATION *getPROCESS_INFORMATIONFields(JNIEnv *env, jobject lpObject, PROCESS_INFORMATION *lpStruct) { if (!PROCESS_INFORMATIONFc.cached) cachePROCESS_INFORMATIONFields(env, lpObject); - lpStruct->hProcess = (HANDLE)(*env)->GetIntLongField(env, lpObject, PROCESS_INFORMATIONFc.hProcess); - lpStruct->hThread = (HANDLE)(*env)->GetIntLongField(env, lpObject, PROCESS_INFORMATIONFc.hThread); + lpStruct->hProcess = (HANDLE)(*env)->GetLongField(env, lpObject, PROCESS_INFORMATIONFc.hProcess); + lpStruct->hThread = (HANDLE)(*env)->GetLongField(env, lpObject, PROCESS_INFORMATIONFc.hThread); lpStruct->dwProcessId = (*env)->GetIntField(env, lpObject, PROCESS_INFORMATIONFc.dwProcessId); lpStruct->dwThreadId = (*env)->GetIntField(env, lpObject, PROCESS_INFORMATIONFc.dwThreadId); return lpStruct; @@ -5404,8 +5404,8 @@ PROCESS_INFORMATION *getPROCESS_INFORMATIONFields(JNIEnv *env, jobject lpObject, void setPROCESS_INFORMATIONFields(JNIEnv *env, jobject lpObject, PROCESS_INFORMATION *lpStruct) { if (!PROCESS_INFORMATIONFc.cached) cachePROCESS_INFORMATIONFields(env, lpObject); - (*env)->SetIntLongField(env, lpObject, PROCESS_INFORMATIONFc.hProcess, (jintLong)lpStruct->hProcess); - (*env)->SetIntLongField(env, lpObject, PROCESS_INFORMATIONFc.hThread, (jintLong)lpStruct->hThread); + (*env)->SetLongField(env, lpObject, PROCESS_INFORMATIONFc.hProcess, (jlong)lpStruct->hProcess); + (*env)->SetLongField(env, lpObject, PROCESS_INFORMATIONFc.hThread, (jlong)lpStruct->hThread); (*env)->SetIntField(env, lpObject, PROCESS_INFORMATIONFc.dwProcessId, (jint)lpStruct->dwProcessId); (*env)->SetIntField(env, lpObject, PROCESS_INFORMATIONFc.dwThreadId, (jint)lpStruct->dwThreadId); } @@ -5469,20 +5469,20 @@ void cacheREBARBANDINFOFields(JNIEnv *env, jobject lpObject) REBARBANDINFOFc.fStyle = (*env)->GetFieldID(env, REBARBANDINFOFc.clazz, "fStyle", "I"); REBARBANDINFOFc.clrFore = (*env)->GetFieldID(env, REBARBANDINFOFc.clazz, "clrFore", "I"); REBARBANDINFOFc.clrBack = (*env)->GetFieldID(env, REBARBANDINFOFc.clazz, "clrBack", "I"); - REBARBANDINFOFc.lpText = (*env)->GetFieldID(env, REBARBANDINFOFc.clazz, "lpText", I_J); + REBARBANDINFOFc.lpText = (*env)->GetFieldID(env, REBARBANDINFOFc.clazz, "lpText", "J"); REBARBANDINFOFc.cch = (*env)->GetFieldID(env, REBARBANDINFOFc.clazz, "cch", "I"); REBARBANDINFOFc.iImage = (*env)->GetFieldID(env, REBARBANDINFOFc.clazz, "iImage", "I"); - REBARBANDINFOFc.hwndChild = (*env)->GetFieldID(env, REBARBANDINFOFc.clazz, "hwndChild", I_J); + REBARBANDINFOFc.hwndChild = (*env)->GetFieldID(env, REBARBANDINFOFc.clazz, "hwndChild", "J"); REBARBANDINFOFc.cxMinChild = (*env)->GetFieldID(env, REBARBANDINFOFc.clazz, "cxMinChild", "I"); REBARBANDINFOFc.cyMinChild = (*env)->GetFieldID(env, REBARBANDINFOFc.clazz, "cyMinChild", "I"); REBARBANDINFOFc.cx = (*env)->GetFieldID(env, REBARBANDINFOFc.clazz, "cx", "I"); - REBARBANDINFOFc.hbmBack = (*env)->GetFieldID(env, REBARBANDINFOFc.clazz, "hbmBack", I_J); + REBARBANDINFOFc.hbmBack = (*env)->GetFieldID(env, REBARBANDINFOFc.clazz, "hbmBack", "J"); REBARBANDINFOFc.wID = (*env)->GetFieldID(env, REBARBANDINFOFc.clazz, "wID", "I"); REBARBANDINFOFc.cyChild = (*env)->GetFieldID(env, REBARBANDINFOFc.clazz, "cyChild", "I"); REBARBANDINFOFc.cyMaxChild = (*env)->GetFieldID(env, REBARBANDINFOFc.clazz, "cyMaxChild", "I"); REBARBANDINFOFc.cyIntegral = (*env)->GetFieldID(env, REBARBANDINFOFc.clazz, "cyIntegral", "I"); REBARBANDINFOFc.cxIdeal = (*env)->GetFieldID(env, REBARBANDINFOFc.clazz, "cxIdeal", "I"); - REBARBANDINFOFc.lParam = (*env)->GetFieldID(env, REBARBANDINFOFc.clazz, "lParam", I_J); + REBARBANDINFOFc.lParam = (*env)->GetFieldID(env, REBARBANDINFOFc.clazz, "lParam", "J"); REBARBANDINFOFc.cxHeader = (*env)->GetFieldID(env, REBARBANDINFOFc.clazz, "cxHeader", "I"); REBARBANDINFOFc.cached = 1; } @@ -5495,20 +5495,20 @@ REBARBANDINFO *getREBARBANDINFOFields(JNIEnv *env, jobject lpObject, REBARBANDIN lpStruct->fStyle = (*env)->GetIntField(env, lpObject, REBARBANDINFOFc.fStyle); lpStruct->clrFore = (*env)->GetIntField(env, lpObject, REBARBANDINFOFc.clrFore); lpStruct->clrBack = (*env)->GetIntField(env, lpObject, REBARBANDINFOFc.clrBack); - lpStruct->lpText = (LPTSTR)(*env)->GetIntLongField(env, lpObject, REBARBANDINFOFc.lpText); + lpStruct->lpText = (LPTSTR)(*env)->GetLongField(env, lpObject, REBARBANDINFOFc.lpText); lpStruct->cch = (*env)->GetIntField(env, lpObject, REBARBANDINFOFc.cch); lpStruct->iImage = (*env)->GetIntField(env, lpObject, REBARBANDINFOFc.iImage); - lpStruct->hwndChild = (HWND)(*env)->GetIntLongField(env, lpObject, REBARBANDINFOFc.hwndChild); + lpStruct->hwndChild = (HWND)(*env)->GetLongField(env, lpObject, REBARBANDINFOFc.hwndChild); lpStruct->cxMinChild = (*env)->GetIntField(env, lpObject, REBARBANDINFOFc.cxMinChild); lpStruct->cyMinChild = (*env)->GetIntField(env, lpObject, REBARBANDINFOFc.cyMinChild); lpStruct->cx = (*env)->GetIntField(env, lpObject, REBARBANDINFOFc.cx); - lpStruct->hbmBack = (HBITMAP)(*env)->GetIntLongField(env, lpObject, REBARBANDINFOFc.hbmBack); + lpStruct->hbmBack = (HBITMAP)(*env)->GetLongField(env, lpObject, REBARBANDINFOFc.hbmBack); lpStruct->wID = (*env)->GetIntField(env, lpObject, REBARBANDINFOFc.wID); lpStruct->cyChild = (*env)->GetIntField(env, lpObject, REBARBANDINFOFc.cyChild); lpStruct->cyMaxChild = (*env)->GetIntField(env, lpObject, REBARBANDINFOFc.cyMaxChild); lpStruct->cyIntegral = (*env)->GetIntField(env, lpObject, REBARBANDINFOFc.cyIntegral); lpStruct->cxIdeal = (*env)->GetIntField(env, lpObject, REBARBANDINFOFc.cxIdeal); - lpStruct->lParam = (*env)->GetIntLongField(env, lpObject, REBARBANDINFOFc.lParam); + lpStruct->lParam = (*env)->GetLongField(env, lpObject, REBARBANDINFOFc.lParam); lpStruct->cxHeader = (*env)->GetIntField(env, lpObject, REBARBANDINFOFc.cxHeader); return lpStruct; } @@ -5521,20 +5521,20 @@ void setREBARBANDINFOFields(JNIEnv *env, jobject lpObject, REBARBANDINFO *lpStru (*env)->SetIntField(env, lpObject, REBARBANDINFOFc.fStyle, (jint)lpStruct->fStyle); (*env)->SetIntField(env, lpObject, REBARBANDINFOFc.clrFore, (jint)lpStruct->clrFore); (*env)->SetIntField(env, lpObject, REBARBANDINFOFc.clrBack, (jint)lpStruct->clrBack); - (*env)->SetIntLongField(env, lpObject, REBARBANDINFOFc.lpText, (jintLong)lpStruct->lpText); + (*env)->SetLongField(env, lpObject, REBARBANDINFOFc.lpText, (jlong)lpStruct->lpText); (*env)->SetIntField(env, lpObject, REBARBANDINFOFc.cch, (jint)lpStruct->cch); (*env)->SetIntField(env, lpObject, REBARBANDINFOFc.iImage, (jint)lpStruct->iImage); - (*env)->SetIntLongField(env, lpObject, REBARBANDINFOFc.hwndChild, (jintLong)lpStruct->hwndChild); + (*env)->SetLongField(env, lpObject, REBARBANDINFOFc.hwndChild, (jlong)lpStruct->hwndChild); (*env)->SetIntField(env, lpObject, REBARBANDINFOFc.cxMinChild, (jint)lpStruct->cxMinChild); (*env)->SetIntField(env, lpObject, REBARBANDINFOFc.cyMinChild, (jint)lpStruct->cyMinChild); (*env)->SetIntField(env, lpObject, REBARBANDINFOFc.cx, (jint)lpStruct->cx); - (*env)->SetIntLongField(env, lpObject, REBARBANDINFOFc.hbmBack, (jintLong)lpStruct->hbmBack); + (*env)->SetLongField(env, lpObject, REBARBANDINFOFc.hbmBack, (jlong)lpStruct->hbmBack); (*env)->SetIntField(env, lpObject, REBARBANDINFOFc.wID, (jint)lpStruct->wID); (*env)->SetIntField(env, lpObject, REBARBANDINFOFc.cyChild, (jint)lpStruct->cyChild); (*env)->SetIntField(env, lpObject, REBARBANDINFOFc.cyMaxChild, (jint)lpStruct->cyMaxChild); (*env)->SetIntField(env, lpObject, REBARBANDINFOFc.cyIntegral, (jint)lpStruct->cyIntegral); (*env)->SetIntField(env, lpObject, REBARBANDINFOFc.cxIdeal, (jint)lpStruct->cxIdeal); - (*env)->SetIntLongField(env, lpObject, REBARBANDINFOFc.lParam, (jintLong)lpStruct->lParam); + (*env)->SetLongField(env, lpObject, REBARBANDINFOFc.lParam, (jlong)lpStruct->lParam); (*env)->SetIntField(env, lpObject, REBARBANDINFOFc.cxHeader, (jint)lpStruct->cxHeader); } #endif @@ -5596,7 +5596,7 @@ void cacheSAFEARRAYFields(JNIEnv *env, jobject lpObject) SAFEARRAYFc.fFeatures = (*env)->GetFieldID(env, SAFEARRAYFc.clazz, "fFeatures", "S"); SAFEARRAYFc.cbElements = (*env)->GetFieldID(env, SAFEARRAYFc.clazz, "cbElements", "I"); SAFEARRAYFc.cLocks = (*env)->GetFieldID(env, SAFEARRAYFc.clazz, "cLocks", "I"); - SAFEARRAYFc.pvData = (*env)->GetFieldID(env, SAFEARRAYFc.clazz, "pvData", I_J); + SAFEARRAYFc.pvData = (*env)->GetFieldID(env, SAFEARRAYFc.clazz, "pvData", "J"); SAFEARRAYFc.rgsabound = (*env)->GetFieldID(env, SAFEARRAYFc.clazz, "rgsabound", "Lorg/eclipse/swt/internal/win32/SAFEARRAYBOUND;"); SAFEARRAYFc.cached = 1; } @@ -5608,7 +5608,7 @@ SAFEARRAY *getSAFEARRAYFields(JNIEnv *env, jobject lpObject, SAFEARRAY *lpStruct lpStruct->fFeatures = (*env)->GetShortField(env, lpObject, SAFEARRAYFc.fFeatures); lpStruct->cbElements = (*env)->GetIntField(env, lpObject, SAFEARRAYFc.cbElements); lpStruct->cLocks = (*env)->GetIntField(env, lpObject, SAFEARRAYFc.cLocks); - lpStruct->pvData = (PVOID)(*env)->GetIntLongField(env, lpObject, SAFEARRAYFc.pvData); + lpStruct->pvData = (PVOID)(*env)->GetLongField(env, lpObject, SAFEARRAYFc.pvData); { jobject lpObject1 = (*env)->GetObjectField(env, lpObject, SAFEARRAYFc.rgsabound); if (lpObject1 != NULL) getSAFEARRAYBOUNDFields(env, lpObject1, &lpStruct->rgsabound[0]); @@ -5623,7 +5623,7 @@ void setSAFEARRAYFields(JNIEnv *env, jobject lpObject, SAFEARRAY *lpStruct) (*env)->SetShortField(env, lpObject, SAFEARRAYFc.fFeatures, (jshort)lpStruct->fFeatures); (*env)->SetIntField(env, lpObject, SAFEARRAYFc.cbElements, (jint)lpStruct->cbElements); (*env)->SetIntField(env, lpObject, SAFEARRAYFc.cLocks, (jint)lpStruct->cLocks); - (*env)->SetIntLongField(env, lpObject, SAFEARRAYFc.pvData, (jintLong)lpStruct->pvData); + (*env)->SetLongField(env, lpObject, SAFEARRAYFc.pvData, (jlong)lpStruct->pvData); { jobject lpObject1 = (*env)->GetObjectField(env, lpObject, SAFEARRAYFc.rgsabound); if (lpObject1 != NULL) setSAFEARRAYBOUNDFields(env, lpObject1, &lpStruct->rgsabound[0]); @@ -6212,7 +6212,7 @@ void cacheSHDRAGIMAGEFields(JNIEnv *env, jobject lpObject) SHDRAGIMAGEFc.clazz = (*env)->GetObjectClass(env, lpObject); SHDRAGIMAGEFc.sizeDragImage = (*env)->GetFieldID(env, SHDRAGIMAGEFc.clazz, "sizeDragImage", "Lorg/eclipse/swt/internal/win32/SIZE;"); SHDRAGIMAGEFc.ptOffset = (*env)->GetFieldID(env, SHDRAGIMAGEFc.clazz, "ptOffset", "Lorg/eclipse/swt/internal/win32/POINT;"); - SHDRAGIMAGEFc.hbmpDragImage = (*env)->GetFieldID(env, SHDRAGIMAGEFc.clazz, "hbmpDragImage", I_J); + SHDRAGIMAGEFc.hbmpDragImage = (*env)->GetFieldID(env, SHDRAGIMAGEFc.clazz, "hbmpDragImage", "J"); SHDRAGIMAGEFc.crColorKey = (*env)->GetFieldID(env, SHDRAGIMAGEFc.clazz, "crColorKey", "I"); SHDRAGIMAGEFc.cached = 1; } @@ -6228,7 +6228,7 @@ SHDRAGIMAGE *getSHDRAGIMAGEFields(JNIEnv *env, jobject lpObject, SHDRAGIMAGE *lp jobject lpObject1 = (*env)->GetObjectField(env, lpObject, SHDRAGIMAGEFc.ptOffset); if (lpObject1 != NULL) getPOINTFields(env, lpObject1, &lpStruct->ptOffset); } - lpStruct->hbmpDragImage = (HBITMAP)(*env)->GetIntLongField(env, lpObject, SHDRAGIMAGEFc.hbmpDragImage); + lpStruct->hbmpDragImage = (HBITMAP)(*env)->GetLongField(env, lpObject, SHDRAGIMAGEFc.hbmpDragImage); lpStruct->crColorKey = (*env)->GetIntField(env, lpObject, SHDRAGIMAGEFc.crColorKey); return lpStruct; } @@ -6244,7 +6244,7 @@ void setSHDRAGIMAGEFields(JNIEnv *env, jobject lpObject, SHDRAGIMAGE *lpStruct) jobject lpObject1 = (*env)->GetObjectField(env, lpObject, SHDRAGIMAGEFc.ptOffset); if (lpObject1 != NULL) setPOINTFields(env, lpObject1, &lpStruct->ptOffset); } - (*env)->SetIntLongField(env, lpObject, SHDRAGIMAGEFc.hbmpDragImage, (jintLong)lpStruct->hbmpDragImage); + (*env)->SetLongField(env, lpObject, SHDRAGIMAGEFc.hbmpDragImage, (jlong)lpStruct->hbmpDragImage); (*env)->SetIntField(env, lpObject, SHDRAGIMAGEFc.crColorKey, (jint)lpStruct->crColorKey); } #endif @@ -6264,19 +6264,19 @@ void cacheSHELLEXECUTEINFOFields(JNIEnv *env, jobject lpObject) SHELLEXECUTEINFOFc.clazz = (*env)->GetObjectClass(env, lpObject); SHELLEXECUTEINFOFc.cbSize = (*env)->GetFieldID(env, SHELLEXECUTEINFOFc.clazz, "cbSize", "I"); SHELLEXECUTEINFOFc.fMask = (*env)->GetFieldID(env, SHELLEXECUTEINFOFc.clazz, "fMask", "I"); - SHELLEXECUTEINFOFc.hwnd = (*env)->GetFieldID(env, SHELLEXECUTEINFOFc.clazz, "hwnd", I_J); - SHELLEXECUTEINFOFc.lpVerb = (*env)->GetFieldID(env, SHELLEXECUTEINFOFc.clazz, "lpVerb", I_J); - SHELLEXECUTEINFOFc.lpFile = (*env)->GetFieldID(env, SHELLEXECUTEINFOFc.clazz, "lpFile", I_J); - SHELLEXECUTEINFOFc.lpParameters = (*env)->GetFieldID(env, SHELLEXECUTEINFOFc.clazz, "lpParameters", I_J); - SHELLEXECUTEINFOFc.lpDirectory = (*env)->GetFieldID(env, SHELLEXECUTEINFOFc.clazz, "lpDirectory", I_J); + SHELLEXECUTEINFOFc.hwnd = (*env)->GetFieldID(env, SHELLEXECUTEINFOFc.clazz, "hwnd", "J"); + SHELLEXECUTEINFOFc.lpVerb = (*env)->GetFieldID(env, SHELLEXECUTEINFOFc.clazz, "lpVerb", "J"); + SHELLEXECUTEINFOFc.lpFile = (*env)->GetFieldID(env, SHELLEXECUTEINFOFc.clazz, "lpFile", "J"); + SHELLEXECUTEINFOFc.lpParameters = (*env)->GetFieldID(env, SHELLEXECUTEINFOFc.clazz, "lpParameters", "J"); + SHELLEXECUTEINFOFc.lpDirectory = (*env)->GetFieldID(env, SHELLEXECUTEINFOFc.clazz, "lpDirectory", "J"); SHELLEXECUTEINFOFc.nShow = (*env)->GetFieldID(env, SHELLEXECUTEINFOFc.clazz, "nShow", "I"); - SHELLEXECUTEINFOFc.hInstApp = (*env)->GetFieldID(env, SHELLEXECUTEINFOFc.clazz, "hInstApp", I_J); - SHELLEXECUTEINFOFc.lpIDList = (*env)->GetFieldID(env, SHELLEXECUTEINFOFc.clazz, "lpIDList", I_J); - SHELLEXECUTEINFOFc.lpClass = (*env)->GetFieldID(env, SHELLEXECUTEINFOFc.clazz, "lpClass", I_J); - SHELLEXECUTEINFOFc.hkeyClass = (*env)->GetFieldID(env, SHELLEXECUTEINFOFc.clazz, "hkeyClass", I_J); + SHELLEXECUTEINFOFc.hInstApp = (*env)->GetFieldID(env, SHELLEXECUTEINFOFc.clazz, "hInstApp", "J"); + SHELLEXECUTEINFOFc.lpIDList = (*env)->GetFieldID(env, SHELLEXECUTEINFOFc.clazz, "lpIDList", "J"); + SHELLEXECUTEINFOFc.lpClass = (*env)->GetFieldID(env, SHELLEXECUTEINFOFc.clazz, "lpClass", "J"); + SHELLEXECUTEINFOFc.hkeyClass = (*env)->GetFieldID(env, SHELLEXECUTEINFOFc.clazz, "hkeyClass", "J"); SHELLEXECUTEINFOFc.dwHotKey = (*env)->GetFieldID(env, SHELLEXECUTEINFOFc.clazz, "dwHotKey", "I"); - SHELLEXECUTEINFOFc.hIcon = (*env)->GetFieldID(env, SHELLEXECUTEINFOFc.clazz, "hIcon", I_J); - SHELLEXECUTEINFOFc.hProcess = (*env)->GetFieldID(env, SHELLEXECUTEINFOFc.clazz, "hProcess", I_J); + SHELLEXECUTEINFOFc.hIcon = (*env)->GetFieldID(env, SHELLEXECUTEINFOFc.clazz, "hIcon", "J"); + SHELLEXECUTEINFOFc.hProcess = (*env)->GetFieldID(env, SHELLEXECUTEINFOFc.clazz, "hProcess", "J"); SHELLEXECUTEINFOFc.cached = 1; } @@ -6285,19 +6285,19 @@ SHELLEXECUTEINFO *getSHELLEXECUTEINFOFields(JNIEnv *env, jobject lpObject, SHELL if (!SHELLEXECUTEINFOFc.cached) cacheSHELLEXECUTEINFOFields(env, lpObject); lpStruct->cbSize = (*env)->GetIntField(env, lpObject, SHELLEXECUTEINFOFc.cbSize); lpStruct->fMask = (*env)->GetIntField(env, lpObject, SHELLEXECUTEINFOFc.fMask); - lpStruct->hwnd = (HWND)(*env)->GetIntLongField(env, lpObject, SHELLEXECUTEINFOFc.hwnd); - lpStruct->lpVerb = (LPCTSTR)(*env)->GetIntLongField(env, lpObject, SHELLEXECUTEINFOFc.lpVerb); - lpStruct->lpFile = (LPCTSTR)(*env)->GetIntLongField(env, lpObject, SHELLEXECUTEINFOFc.lpFile); - lpStruct->lpParameters = (LPCTSTR)(*env)->GetIntLongField(env, lpObject, SHELLEXECUTEINFOFc.lpParameters); - lpStruct->lpDirectory = (LPCTSTR)(*env)->GetIntLongField(env, lpObject, SHELLEXECUTEINFOFc.lpDirectory); + lpStruct->hwnd = (HWND)(*env)->GetLongField(env, lpObject, SHELLEXECUTEINFOFc.hwnd); + lpStruct->lpVerb = (LPCTSTR)(*env)->GetLongField(env, lpObject, SHELLEXECUTEINFOFc.lpVerb); + lpStruct->lpFile = (LPCTSTR)(*env)->GetLongField(env, lpObject, SHELLEXECUTEINFOFc.lpFile); + lpStruct->lpParameters = (LPCTSTR)(*env)->GetLongField(env, lpObject, SHELLEXECUTEINFOFc.lpParameters); + lpStruct->lpDirectory = (LPCTSTR)(*env)->GetLongField(env, lpObject, SHELLEXECUTEINFOFc.lpDirectory); lpStruct->nShow = (*env)->GetIntField(env, lpObject, SHELLEXECUTEINFOFc.nShow); - lpStruct->hInstApp = (HINSTANCE)(*env)->GetIntLongField(env, lpObject, SHELLEXECUTEINFOFc.hInstApp); - lpStruct->lpIDList = (LPVOID)(*env)->GetIntLongField(env, lpObject, SHELLEXECUTEINFOFc.lpIDList); - lpStruct->lpClass = (LPCTSTR)(*env)->GetIntLongField(env, lpObject, SHELLEXECUTEINFOFc.lpClass); - lpStruct->hkeyClass = (HKEY)(*env)->GetIntLongField(env, lpObject, SHELLEXECUTEINFOFc.hkeyClass); + lpStruct->hInstApp = (HINSTANCE)(*env)->GetLongField(env, lpObject, SHELLEXECUTEINFOFc.hInstApp); + lpStruct->lpIDList = (LPVOID)(*env)->GetLongField(env, lpObject, SHELLEXECUTEINFOFc.lpIDList); + lpStruct->lpClass = (LPCTSTR)(*env)->GetLongField(env, lpObject, SHELLEXECUTEINFOFc.lpClass); + lpStruct->hkeyClass = (HKEY)(*env)->GetLongField(env, lpObject, SHELLEXECUTEINFOFc.hkeyClass); lpStruct->dwHotKey = (*env)->GetIntField(env, lpObject, SHELLEXECUTEINFOFc.dwHotKey); - lpStruct->hIcon = (HANDLE)(*env)->GetIntLongField(env, lpObject, SHELLEXECUTEINFOFc.hIcon); - lpStruct->hProcess = (HANDLE)(*env)->GetIntLongField(env, lpObject, SHELLEXECUTEINFOFc.hProcess); + lpStruct->hIcon = (HANDLE)(*env)->GetLongField(env, lpObject, SHELLEXECUTEINFOFc.hIcon); + lpStruct->hProcess = (HANDLE)(*env)->GetLongField(env, lpObject, SHELLEXECUTEINFOFc.hProcess); return lpStruct; } @@ -6306,19 +6306,19 @@ void setSHELLEXECUTEINFOFields(JNIEnv *env, jobject lpObject, SHELLEXECUTEINFO * if (!SHELLEXECUTEINFOFc.cached) cacheSHELLEXECUTEINFOFields(env, lpObject); (*env)->SetIntField(env, lpObject, SHELLEXECUTEINFOFc.cbSize, (jint)lpStruct->cbSize); (*env)->SetIntField(env, lpObject, SHELLEXECUTEINFOFc.fMask, (jint)lpStruct->fMask); - (*env)->SetIntLongField(env, lpObject, SHELLEXECUTEINFOFc.hwnd, (jintLong)lpStruct->hwnd); - (*env)->SetIntLongField(env, lpObject, SHELLEXECUTEINFOFc.lpVerb, (jintLong)lpStruct->lpVerb); - (*env)->SetIntLongField(env, lpObject, SHELLEXECUTEINFOFc.lpFile, (jintLong)lpStruct->lpFile); - (*env)->SetIntLongField(env, lpObject, SHELLEXECUTEINFOFc.lpParameters, (jintLong)lpStruct->lpParameters); - (*env)->SetIntLongField(env, lpObject, SHELLEXECUTEINFOFc.lpDirectory, (jintLong)lpStruct->lpDirectory); + (*env)->SetLongField(env, lpObject, SHELLEXECUTEINFOFc.hwnd, (jlong)lpStruct->hwnd); + (*env)->SetLongField(env, lpObject, SHELLEXECUTEINFOFc.lpVerb, (jlong)lpStruct->lpVerb); + (*env)->SetLongField(env, lpObject, SHELLEXECUTEINFOFc.lpFile, (jlong)lpStruct->lpFile); + (*env)->SetLongField(env, lpObject, SHELLEXECUTEINFOFc.lpParameters, (jlong)lpStruct->lpParameters); + (*env)->SetLongField(env, lpObject, SHELLEXECUTEINFOFc.lpDirectory, (jlong)lpStruct->lpDirectory); (*env)->SetIntField(env, lpObject, SHELLEXECUTEINFOFc.nShow, (jint)lpStruct->nShow); - (*env)->SetIntLongField(env, lpObject, SHELLEXECUTEINFOFc.hInstApp, (jintLong)lpStruct->hInstApp); - (*env)->SetIntLongField(env, lpObject, SHELLEXECUTEINFOFc.lpIDList, (jintLong)lpStruct->lpIDList); - (*env)->SetIntLongField(env, lpObject, SHELLEXECUTEINFOFc.lpClass, (jintLong)lpStruct->lpClass); - (*env)->SetIntLongField(env, lpObject, SHELLEXECUTEINFOFc.hkeyClass, (jintLong)lpStruct->hkeyClass); + (*env)->SetLongField(env, lpObject, SHELLEXECUTEINFOFc.hInstApp, (jlong)lpStruct->hInstApp); + (*env)->SetLongField(env, lpObject, SHELLEXECUTEINFOFc.lpIDList, (jlong)lpStruct->lpIDList); + (*env)->SetLongField(env, lpObject, SHELLEXECUTEINFOFc.lpClass, (jlong)lpStruct->lpClass); + (*env)->SetLongField(env, lpObject, SHELLEXECUTEINFOFc.hkeyClass, (jlong)lpStruct->hkeyClass); (*env)->SetIntField(env, lpObject, SHELLEXECUTEINFOFc.dwHotKey, (jint)lpStruct->dwHotKey); - (*env)->SetIntLongField(env, lpObject, SHELLEXECUTEINFOFc.hIcon, (jintLong)lpStruct->hIcon); - (*env)->SetIntLongField(env, lpObject, SHELLEXECUTEINFOFc.hProcess, (jintLong)lpStruct->hProcess); + (*env)->SetLongField(env, lpObject, SHELLEXECUTEINFOFc.hIcon, (jlong)lpStruct->hIcon); + (*env)->SetLongField(env, lpObject, SHELLEXECUTEINFOFc.hProcess, (jlong)lpStruct->hProcess); } #endif @@ -6335,7 +6335,7 @@ void cacheSHFILEINFOFields(JNIEnv *env, jobject lpObject) { if (SHFILEINFOFc.cached) return; SHFILEINFOFc.clazz = (*env)->GetObjectClass(env, lpObject); - SHFILEINFOFc.hIcon = (*env)->GetFieldID(env, SHFILEINFOFc.clazz, "hIcon", I_J); + SHFILEINFOFc.hIcon = (*env)->GetFieldID(env, SHFILEINFOFc.clazz, "hIcon", "J"); SHFILEINFOFc.iIcon = (*env)->GetFieldID(env, SHFILEINFOFc.clazz, "iIcon", "I"); SHFILEINFOFc.dwAttributes = (*env)->GetFieldID(env, SHFILEINFOFc.clazz, "dwAttributes", "I"); SHFILEINFOFc.szDisplayName = (*env)->GetFieldID(env, SHFILEINFOFc.clazz, "szDisplayName", "[C"); @@ -6346,7 +6346,7 @@ void cacheSHFILEINFOFields(JNIEnv *env, jobject lpObject) SHFILEINFO *getSHFILEINFOFields(JNIEnv *env, jobject lpObject, SHFILEINFO *lpStruct) { if (!SHFILEINFOFc.cached) cacheSHFILEINFOFields(env, lpObject); - lpStruct->hIcon = (HICON)(*env)->GetIntLongField(env, lpObject, SHFILEINFOFc.hIcon); + lpStruct->hIcon = (HICON)(*env)->GetLongField(env, lpObject, SHFILEINFOFc.hIcon); lpStruct->iIcon = (*env)->GetIntField(env, lpObject, SHFILEINFOFc.iIcon); lpStruct->dwAttributes = (*env)->GetIntField(env, lpObject, SHFILEINFOFc.dwAttributes); { @@ -6363,7 +6363,7 @@ SHFILEINFO *getSHFILEINFOFields(JNIEnv *env, jobject lpObject, SHFILEINFO *lpStr void setSHFILEINFOFields(JNIEnv *env, jobject lpObject, SHFILEINFO *lpStruct) { if (!SHFILEINFOFc.cached) cacheSHFILEINFOFields(env, lpObject); - (*env)->SetIntLongField(env, lpObject, SHFILEINFOFc.hIcon, (jintLong)lpStruct->hIcon); + (*env)->SetLongField(env, lpObject, SHFILEINFOFc.hIcon, (jlong)lpStruct->hIcon); (*env)->SetIntField(env, lpObject, SHFILEINFOFc.iIcon, (jint)lpStruct->iIcon); (*env)->SetIntField(env, lpObject, SHFILEINFOFc.dwAttributes, (jint)lpStruct->dwAttributes); { @@ -6425,9 +6425,9 @@ void cacheSTARTUPINFOFields(JNIEnv *env, jobject lpObject) if (STARTUPINFOFc.cached) return; STARTUPINFOFc.clazz = (*env)->GetObjectClass(env, lpObject); STARTUPINFOFc.cb = (*env)->GetFieldID(env, STARTUPINFOFc.clazz, "cb", "I"); - STARTUPINFOFc.lpReserved = (*env)->GetFieldID(env, STARTUPINFOFc.clazz, "lpReserved", I_J); - STARTUPINFOFc.lpDesktop = (*env)->GetFieldID(env, STARTUPINFOFc.clazz, "lpDesktop", I_J); - STARTUPINFOFc.lpTitle = (*env)->GetFieldID(env, STARTUPINFOFc.clazz, "lpTitle", I_J); + STARTUPINFOFc.lpReserved = (*env)->GetFieldID(env, STARTUPINFOFc.clazz, "lpReserved", "J"); + STARTUPINFOFc.lpDesktop = (*env)->GetFieldID(env, STARTUPINFOFc.clazz, "lpDesktop", "J"); + STARTUPINFOFc.lpTitle = (*env)->GetFieldID(env, STARTUPINFOFc.clazz, "lpTitle", "J"); STARTUPINFOFc.dwX = (*env)->GetFieldID(env, STARTUPINFOFc.clazz, "dwX", "I"); STARTUPINFOFc.dwY = (*env)->GetFieldID(env, STARTUPINFOFc.clazz, "dwY", "I"); STARTUPINFOFc.dwXSize = (*env)->GetFieldID(env, STARTUPINFOFc.clazz, "dwXSize", "I"); @@ -6438,10 +6438,10 @@ void cacheSTARTUPINFOFields(JNIEnv *env, jobject lpObject) STARTUPINFOFc.dwFlags = (*env)->GetFieldID(env, STARTUPINFOFc.clazz, "dwFlags", "I"); STARTUPINFOFc.wShowWindow = (*env)->GetFieldID(env, STARTUPINFOFc.clazz, "wShowWindow", "S"); STARTUPINFOFc.cbReserved2 = (*env)->GetFieldID(env, STARTUPINFOFc.clazz, "cbReserved2", "S"); - STARTUPINFOFc.lpReserved2 = (*env)->GetFieldID(env, STARTUPINFOFc.clazz, "lpReserved2", I_J); - STARTUPINFOFc.hStdInput = (*env)->GetFieldID(env, STARTUPINFOFc.clazz, "hStdInput", I_J); - STARTUPINFOFc.hStdOutput = (*env)->GetFieldID(env, STARTUPINFOFc.clazz, "hStdOutput", I_J); - STARTUPINFOFc.hStdError = (*env)->GetFieldID(env, STARTUPINFOFc.clazz, "hStdError", I_J); + STARTUPINFOFc.lpReserved2 = (*env)->GetFieldID(env, STARTUPINFOFc.clazz, "lpReserved2", "J"); + STARTUPINFOFc.hStdInput = (*env)->GetFieldID(env, STARTUPINFOFc.clazz, "hStdInput", "J"); + STARTUPINFOFc.hStdOutput = (*env)->GetFieldID(env, STARTUPINFOFc.clazz, "hStdOutput", "J"); + STARTUPINFOFc.hStdError = (*env)->GetFieldID(env, STARTUPINFOFc.clazz, "hStdError", "J"); STARTUPINFOFc.cached = 1; } @@ -6449,9 +6449,9 @@ STARTUPINFO *getSTARTUPINFOFields(JNIEnv *env, jobject lpObject, STARTUPINFO *lp { if (!STARTUPINFOFc.cached) cacheSTARTUPINFOFields(env, lpObject); lpStruct->cb = (*env)->GetIntField(env, lpObject, STARTUPINFOFc.cb); - lpStruct->lpReserved = (LPTSTR)(*env)->GetIntLongField(env, lpObject, STARTUPINFOFc.lpReserved); - lpStruct->lpDesktop = (LPTSTR)(*env)->GetIntLongField(env, lpObject, STARTUPINFOFc.lpDesktop); - lpStruct->lpTitle = (LPTSTR)(*env)->GetIntLongField(env, lpObject, STARTUPINFOFc.lpTitle); + lpStruct->lpReserved = (LPTSTR)(*env)->GetLongField(env, lpObject, STARTUPINFOFc.lpReserved); + lpStruct->lpDesktop = (LPTSTR)(*env)->GetLongField(env, lpObject, STARTUPINFOFc.lpDesktop); + lpStruct->lpTitle = (LPTSTR)(*env)->GetLongField(env, lpObject, STARTUPINFOFc.lpTitle); lpStruct->dwX = (*env)->GetIntField(env, lpObject, STARTUPINFOFc.dwX); lpStruct->dwY = (*env)->GetIntField(env, lpObject, STARTUPINFOFc.dwY); lpStruct->dwXSize = (*env)->GetIntField(env, lpObject, STARTUPINFOFc.dwXSize); @@ -6462,10 +6462,10 @@ STARTUPINFO *getSTARTUPINFOFields(JNIEnv *env, jobject lpObject, STARTUPINFO *lp lpStruct->dwFlags = (*env)->GetIntField(env, lpObject, STARTUPINFOFc.dwFlags); lpStruct->wShowWindow = (*env)->GetShortField(env, lpObject, STARTUPINFOFc.wShowWindow); lpStruct->cbReserved2 = (*env)->GetShortField(env, lpObject, STARTUPINFOFc.cbReserved2); - lpStruct->lpReserved2 = (LPBYTE)(*env)->GetIntLongField(env, lpObject, STARTUPINFOFc.lpReserved2); - lpStruct->hStdInput = (HANDLE)(*env)->GetIntLongField(env, lpObject, STARTUPINFOFc.hStdInput); - lpStruct->hStdOutput = (HANDLE)(*env)->GetIntLongField(env, lpObject, STARTUPINFOFc.hStdOutput); - lpStruct->hStdError = (HANDLE)(*env)->GetIntLongField(env, lpObject, STARTUPINFOFc.hStdError); + lpStruct->lpReserved2 = (LPBYTE)(*env)->GetLongField(env, lpObject, STARTUPINFOFc.lpReserved2); + lpStruct->hStdInput = (HANDLE)(*env)->GetLongField(env, lpObject, STARTUPINFOFc.hStdInput); + lpStruct->hStdOutput = (HANDLE)(*env)->GetLongField(env, lpObject, STARTUPINFOFc.hStdOutput); + lpStruct->hStdError = (HANDLE)(*env)->GetLongField(env, lpObject, STARTUPINFOFc.hStdError); return lpStruct; } @@ -6473,9 +6473,9 @@ void setSTARTUPINFOFields(JNIEnv *env, jobject lpObject, STARTUPINFO *lpStruct) { if (!STARTUPINFOFc.cached) cacheSTARTUPINFOFields(env, lpObject); (*env)->SetIntField(env, lpObject, STARTUPINFOFc.cb, (jint)lpStruct->cb); - (*env)->SetIntLongField(env, lpObject, STARTUPINFOFc.lpReserved, (jintLong)lpStruct->lpReserved); - (*env)->SetIntLongField(env, lpObject, STARTUPINFOFc.lpDesktop, (jintLong)lpStruct->lpDesktop); - (*env)->SetIntLongField(env, lpObject, STARTUPINFOFc.lpTitle, (jintLong)lpStruct->lpTitle); + (*env)->SetLongField(env, lpObject, STARTUPINFOFc.lpReserved, (jlong)lpStruct->lpReserved); + (*env)->SetLongField(env, lpObject, STARTUPINFOFc.lpDesktop, (jlong)lpStruct->lpDesktop); + (*env)->SetLongField(env, lpObject, STARTUPINFOFc.lpTitle, (jlong)lpStruct->lpTitle); (*env)->SetIntField(env, lpObject, STARTUPINFOFc.dwX, (jint)lpStruct->dwX); (*env)->SetIntField(env, lpObject, STARTUPINFOFc.dwY, (jint)lpStruct->dwY); (*env)->SetIntField(env, lpObject, STARTUPINFOFc.dwXSize, (jint)lpStruct->dwXSize); @@ -6486,10 +6486,10 @@ void setSTARTUPINFOFields(JNIEnv *env, jobject lpObject, STARTUPINFO *lpStruct) (*env)->SetIntField(env, lpObject, STARTUPINFOFc.dwFlags, (jint)lpStruct->dwFlags); (*env)->SetShortField(env, lpObject, STARTUPINFOFc.wShowWindow, (jshort)lpStruct->wShowWindow); (*env)->SetShortField(env, lpObject, STARTUPINFOFc.cbReserved2, (jshort)lpStruct->cbReserved2); - (*env)->SetIntLongField(env, lpObject, STARTUPINFOFc.lpReserved2, (jintLong)lpStruct->lpReserved2); - (*env)->SetIntLongField(env, lpObject, STARTUPINFOFc.hStdInput, (jintLong)lpStruct->hStdInput); - (*env)->SetIntLongField(env, lpObject, STARTUPINFOFc.hStdOutput, (jintLong)lpStruct->hStdOutput); - (*env)->SetIntLongField(env, lpObject, STARTUPINFOFc.hStdError, (jintLong)lpStruct->hStdError); + (*env)->SetLongField(env, lpObject, STARTUPINFOFc.lpReserved2, (jlong)lpStruct->lpReserved2); + (*env)->SetLongField(env, lpObject, STARTUPINFOFc.hStdInput, (jlong)lpStruct->hStdInput); + (*env)->SetLongField(env, lpObject, STARTUPINFOFc.hStdOutput, (jlong)lpStruct->hStdOutput); + (*env)->SetLongField(env, lpObject, STARTUPINFOFc.hStdError, (jlong)lpStruct->hStdError); } #endif @@ -6562,8 +6562,8 @@ void cacheTBBUTTONFields(JNIEnv *env, jobject lpObject) TBBUTTONFc.idCommand = (*env)->GetFieldID(env, TBBUTTONFc.clazz, "idCommand", "I"); TBBUTTONFc.fsState = (*env)->GetFieldID(env, TBBUTTONFc.clazz, "fsState", "B"); TBBUTTONFc.fsStyle = (*env)->GetFieldID(env, TBBUTTONFc.clazz, "fsStyle", "B"); - TBBUTTONFc.dwData = (*env)->GetFieldID(env, TBBUTTONFc.clazz, "dwData", I_J); - TBBUTTONFc.iString = (*env)->GetFieldID(env, TBBUTTONFc.clazz, "iString", I_J); + TBBUTTONFc.dwData = (*env)->GetFieldID(env, TBBUTTONFc.clazz, "dwData", "J"); + TBBUTTONFc.iString = (*env)->GetFieldID(env, TBBUTTONFc.clazz, "iString", "J"); TBBUTTONFc.cached = 1; } @@ -6574,8 +6574,8 @@ TBBUTTON *getTBBUTTONFields(JNIEnv *env, jobject lpObject, TBBUTTON *lpStruct) lpStruct->idCommand = (*env)->GetIntField(env, lpObject, TBBUTTONFc.idCommand); lpStruct->fsState = (*env)->GetByteField(env, lpObject, TBBUTTONFc.fsState); lpStruct->fsStyle = (*env)->GetByteField(env, lpObject, TBBUTTONFc.fsStyle); - lpStruct->dwData = (*env)->GetIntLongField(env, lpObject, TBBUTTONFc.dwData); - lpStruct->iString = (*env)->GetIntLongField(env, lpObject, TBBUTTONFc.iString); + lpStruct->dwData = (*env)->GetLongField(env, lpObject, TBBUTTONFc.dwData); + lpStruct->iString = (*env)->GetLongField(env, lpObject, TBBUTTONFc.iString); return lpStruct; } @@ -6586,8 +6586,8 @@ void setTBBUTTONFields(JNIEnv *env, jobject lpObject, TBBUTTON *lpStruct) (*env)->SetIntField(env, lpObject, TBBUTTONFc.idCommand, (jint)lpStruct->idCommand); (*env)->SetByteField(env, lpObject, TBBUTTONFc.fsState, (jbyte)lpStruct->fsState); (*env)->SetByteField(env, lpObject, TBBUTTONFc.fsStyle, (jbyte)lpStruct->fsStyle); - (*env)->SetIntLongField(env, lpObject, TBBUTTONFc.dwData, (jintLong)lpStruct->dwData); - (*env)->SetIntLongField(env, lpObject, TBBUTTONFc.iString, (jintLong)lpStruct->iString); + (*env)->SetLongField(env, lpObject, TBBUTTONFc.dwData, (jlong)lpStruct->dwData); + (*env)->SetLongField(env, lpObject, TBBUTTONFc.iString, (jlong)lpStruct->iString); } #endif @@ -6611,8 +6611,8 @@ void cacheTBBUTTONINFOFields(JNIEnv *env, jobject lpObject) TBBUTTONINFOFc.fsState = (*env)->GetFieldID(env, TBBUTTONINFOFc.clazz, "fsState", "B"); TBBUTTONINFOFc.fsStyle = (*env)->GetFieldID(env, TBBUTTONINFOFc.clazz, "fsStyle", "B"); TBBUTTONINFOFc.cx = (*env)->GetFieldID(env, TBBUTTONINFOFc.clazz, "cx", "S"); - TBBUTTONINFOFc.lParam = (*env)->GetFieldID(env, TBBUTTONINFOFc.clazz, "lParam", I_J); - TBBUTTONINFOFc.pszText = (*env)->GetFieldID(env, TBBUTTONINFOFc.clazz, "pszText", I_J); + TBBUTTONINFOFc.lParam = (*env)->GetFieldID(env, TBBUTTONINFOFc.clazz, "lParam", "J"); + TBBUTTONINFOFc.pszText = (*env)->GetFieldID(env, TBBUTTONINFOFc.clazz, "pszText", "J"); TBBUTTONINFOFc.cchText = (*env)->GetFieldID(env, TBBUTTONINFOFc.clazz, "cchText", "I"); TBBUTTONINFOFc.cached = 1; } @@ -6627,8 +6627,8 @@ TBBUTTONINFO *getTBBUTTONINFOFields(JNIEnv *env, jobject lpObject, TBBUTTONINFO lpStruct->fsState = (*env)->GetByteField(env, lpObject, TBBUTTONINFOFc.fsState); lpStruct->fsStyle = (*env)->GetByteField(env, lpObject, TBBUTTONINFOFc.fsStyle); lpStruct->cx = (*env)->GetShortField(env, lpObject, TBBUTTONINFOFc.cx); - lpStruct->lParam = (*env)->GetIntLongField(env, lpObject, TBBUTTONINFOFc.lParam); - lpStruct->pszText = (LPTSTR)(*env)->GetIntLongField(env, lpObject, TBBUTTONINFOFc.pszText); + lpStruct->lParam = (*env)->GetLongField(env, lpObject, TBBUTTONINFOFc.lParam); + lpStruct->pszText = (LPTSTR)(*env)->GetLongField(env, lpObject, TBBUTTONINFOFc.pszText); lpStruct->cchText = (*env)->GetIntField(env, lpObject, TBBUTTONINFOFc.cchText); return lpStruct; } @@ -6643,8 +6643,8 @@ void setTBBUTTONINFOFields(JNIEnv *env, jobject lpObject, TBBUTTONINFO *lpStruct (*env)->SetByteField(env, lpObject, TBBUTTONINFOFc.fsState, (jbyte)lpStruct->fsState); (*env)->SetByteField(env, lpObject, TBBUTTONINFOFc.fsStyle, (jbyte)lpStruct->fsStyle); (*env)->SetShortField(env, lpObject, TBBUTTONINFOFc.cx, (jshort)lpStruct->cx); - (*env)->SetIntLongField(env, lpObject, TBBUTTONINFOFc.lParam, (jintLong)lpStruct->lParam); - (*env)->SetIntLongField(env, lpObject, TBBUTTONINFOFc.pszText, (jintLong)lpStruct->pszText); + (*env)->SetLongField(env, lpObject, TBBUTTONINFOFc.lParam, (jlong)lpStruct->lParam); + (*env)->SetLongField(env, lpObject, TBBUTTONINFOFc.pszText, (jlong)lpStruct->pszText); (*env)->SetIntField(env, lpObject, TBBUTTONINFOFc.cchText, (jint)lpStruct->cchText); } #endif @@ -6702,10 +6702,10 @@ void cacheTCITEMFields(JNIEnv *env, jobject lpObject) TCITEMFc.mask = (*env)->GetFieldID(env, TCITEMFc.clazz, "mask", "I"); TCITEMFc.dwState = (*env)->GetFieldID(env, TCITEMFc.clazz, "dwState", "I"); TCITEMFc.dwStateMask = (*env)->GetFieldID(env, TCITEMFc.clazz, "dwStateMask", "I"); - TCITEMFc.pszText = (*env)->GetFieldID(env, TCITEMFc.clazz, "pszText", I_J); + TCITEMFc.pszText = (*env)->GetFieldID(env, TCITEMFc.clazz, "pszText", "J"); TCITEMFc.cchTextMax = (*env)->GetFieldID(env, TCITEMFc.clazz, "cchTextMax", "I"); TCITEMFc.iImage = (*env)->GetFieldID(env, TCITEMFc.clazz, "iImage", "I"); - TCITEMFc.lParam = (*env)->GetFieldID(env, TCITEMFc.clazz, "lParam", I_J); + TCITEMFc.lParam = (*env)->GetFieldID(env, TCITEMFc.clazz, "lParam", "J"); TCITEMFc.cached = 1; } @@ -6715,10 +6715,10 @@ TCITEM *getTCITEMFields(JNIEnv *env, jobject lpObject, TCITEM *lpStruct) lpStruct->mask = (*env)->GetIntField(env, lpObject, TCITEMFc.mask); lpStruct->dwState = (*env)->GetIntField(env, lpObject, TCITEMFc.dwState); lpStruct->dwStateMask = (*env)->GetIntField(env, lpObject, TCITEMFc.dwStateMask); - lpStruct->pszText = (LPTSTR)(*env)->GetIntLongField(env, lpObject, TCITEMFc.pszText); + lpStruct->pszText = (LPTSTR)(*env)->GetLongField(env, lpObject, TCITEMFc.pszText); lpStruct->cchTextMax = (*env)->GetIntField(env, lpObject, TCITEMFc.cchTextMax); lpStruct->iImage = (*env)->GetIntField(env, lpObject, TCITEMFc.iImage); - lpStruct->lParam = (*env)->GetIntLongField(env, lpObject, TCITEMFc.lParam); + lpStruct->lParam = (*env)->GetLongField(env, lpObject, TCITEMFc.lParam); return lpStruct; } @@ -6728,10 +6728,10 @@ void setTCITEMFields(JNIEnv *env, jobject lpObject, TCITEM *lpStruct) (*env)->SetIntField(env, lpObject, TCITEMFc.mask, (jint)lpStruct->mask); (*env)->SetIntField(env, lpObject, TCITEMFc.dwState, (jint)lpStruct->dwState); (*env)->SetIntField(env, lpObject, TCITEMFc.dwStateMask, (jint)lpStruct->dwStateMask); - (*env)->SetIntLongField(env, lpObject, TCITEMFc.pszText, (jintLong)lpStruct->pszText); + (*env)->SetLongField(env, lpObject, TCITEMFc.pszText, (jlong)lpStruct->pszText); (*env)->SetIntField(env, lpObject, TCITEMFc.cchTextMax, (jint)lpStruct->cchTextMax); (*env)->SetIntField(env, lpObject, TCITEMFc.iImage, (jint)lpStruct->iImage); - (*env)->SetIntLongField(env, lpObject, TCITEMFc.lParam, (jintLong)lpStruct->lParam); + (*env)->SetLongField(env, lpObject, TCITEMFc.lParam, (jlong)lpStruct->lParam); } #endif @@ -6936,16 +6936,16 @@ void cacheTOOLINFOFields(JNIEnv *env, jobject lpObject) TOOLINFOFc.clazz = (*env)->GetObjectClass(env, lpObject); TOOLINFOFc.cbSize = (*env)->GetFieldID(env, TOOLINFOFc.clazz, "cbSize", "I"); TOOLINFOFc.uFlags = (*env)->GetFieldID(env, TOOLINFOFc.clazz, "uFlags", "I"); - TOOLINFOFc.hwnd = (*env)->GetFieldID(env, TOOLINFOFc.clazz, "hwnd", I_J); - TOOLINFOFc.uId = (*env)->GetFieldID(env, TOOLINFOFc.clazz, "uId", I_J); + TOOLINFOFc.hwnd = (*env)->GetFieldID(env, TOOLINFOFc.clazz, "hwnd", "J"); + TOOLINFOFc.uId = (*env)->GetFieldID(env, TOOLINFOFc.clazz, "uId", "J"); TOOLINFOFc.left = (*env)->GetFieldID(env, TOOLINFOFc.clazz, "left", "I"); TOOLINFOFc.top = (*env)->GetFieldID(env, TOOLINFOFc.clazz, "top", "I"); TOOLINFOFc.right = (*env)->GetFieldID(env, TOOLINFOFc.clazz, "right", "I"); TOOLINFOFc.bottom = (*env)->GetFieldID(env, TOOLINFOFc.clazz, "bottom", "I"); - TOOLINFOFc.hinst = (*env)->GetFieldID(env, TOOLINFOFc.clazz, "hinst", I_J); - TOOLINFOFc.lpszText = (*env)->GetFieldID(env, TOOLINFOFc.clazz, "lpszText", I_J); - TOOLINFOFc.lParam = (*env)->GetFieldID(env, TOOLINFOFc.clazz, "lParam", I_J); - TOOLINFOFc.lpReserved = (*env)->GetFieldID(env, TOOLINFOFc.clazz, "lpReserved", I_J); + TOOLINFOFc.hinst = (*env)->GetFieldID(env, TOOLINFOFc.clazz, "hinst", "J"); + TOOLINFOFc.lpszText = (*env)->GetFieldID(env, TOOLINFOFc.clazz, "lpszText", "J"); + TOOLINFOFc.lParam = (*env)->GetFieldID(env, TOOLINFOFc.clazz, "lParam", "J"); + TOOLINFOFc.lpReserved = (*env)->GetFieldID(env, TOOLINFOFc.clazz, "lpReserved", "J"); TOOLINFOFc.cached = 1; } @@ -6954,16 +6954,16 @@ TOOLINFO *getTOOLINFOFields(JNIEnv *env, jobject lpObject, TOOLINFO *lpStruct) if (!TOOLINFOFc.cached) cacheTOOLINFOFields(env, lpObject); lpStruct->cbSize = (*env)->GetIntField(env, lpObject, TOOLINFOFc.cbSize); lpStruct->uFlags = (*env)->GetIntField(env, lpObject, TOOLINFOFc.uFlags); - lpStruct->hwnd = (HWND)(*env)->GetIntLongField(env, lpObject, TOOLINFOFc.hwnd); - lpStruct->uId = (*env)->GetIntLongField(env, lpObject, TOOLINFOFc.uId); + lpStruct->hwnd = (HWND)(*env)->GetLongField(env, lpObject, TOOLINFOFc.hwnd); + lpStruct->uId = (*env)->GetLongField(env, lpObject, TOOLINFOFc.uId); lpStruct->rect.left = (*env)->GetIntField(env, lpObject, TOOLINFOFc.left); lpStruct->rect.top = (*env)->GetIntField(env, lpObject, TOOLINFOFc.top); lpStruct->rect.right = (*env)->GetIntField(env, lpObject, TOOLINFOFc.right); lpStruct->rect.bottom = (*env)->GetIntField(env, lpObject, TOOLINFOFc.bottom); - lpStruct->hinst = (HINSTANCE)(*env)->GetIntLongField(env, lpObject, TOOLINFOFc.hinst); - lpStruct->lpszText = (LPTSTR)(*env)->GetIntLongField(env, lpObject, TOOLINFOFc.lpszText); - lpStruct->lParam = (*env)->GetIntLongField(env, lpObject, TOOLINFOFc.lParam); - lpStruct->lpReserved = (void *)(*env)->GetIntLongField(env, lpObject, TOOLINFOFc.lpReserved); + lpStruct->hinst = (HINSTANCE)(*env)->GetLongField(env, lpObject, TOOLINFOFc.hinst); + lpStruct->lpszText = (LPTSTR)(*env)->GetLongField(env, lpObject, TOOLINFOFc.lpszText); + lpStruct->lParam = (*env)->GetLongField(env, lpObject, TOOLINFOFc.lParam); + lpStruct->lpReserved = (void *)(*env)->GetLongField(env, lpObject, TOOLINFOFc.lpReserved); return lpStruct; } @@ -6972,16 +6972,16 @@ void setTOOLINFOFields(JNIEnv *env, jobject lpObject, TOOLINFO *lpStruct) if (!TOOLINFOFc.cached) cacheTOOLINFOFields(env, lpObject); (*env)->SetIntField(env, lpObject, TOOLINFOFc.cbSize, (jint)lpStruct->cbSize); (*env)->SetIntField(env, lpObject, TOOLINFOFc.uFlags, (jint)lpStruct->uFlags); - (*env)->SetIntLongField(env, lpObject, TOOLINFOFc.hwnd, (jintLong)lpStruct->hwnd); - (*env)->SetIntLongField(env, lpObject, TOOLINFOFc.uId, (jintLong)lpStruct->uId); + (*env)->SetLongField(env, lpObject, TOOLINFOFc.hwnd, (jlong)lpStruct->hwnd); + (*env)->SetLongField(env, lpObject, TOOLINFOFc.uId, (jlong)lpStruct->uId); (*env)->SetIntField(env, lpObject, TOOLINFOFc.left, (jint)lpStruct->rect.left); (*env)->SetIntField(env, lpObject, TOOLINFOFc.top, (jint)lpStruct->rect.top); (*env)->SetIntField(env, lpObject, TOOLINFOFc.right, (jint)lpStruct->rect.right); (*env)->SetIntField(env, lpObject, TOOLINFOFc.bottom, (jint)lpStruct->rect.bottom); - (*env)->SetIntLongField(env, lpObject, TOOLINFOFc.hinst, (jintLong)lpStruct->hinst); - (*env)->SetIntLongField(env, lpObject, TOOLINFOFc.lpszText, (jintLong)lpStruct->lpszText); - (*env)->SetIntLongField(env, lpObject, TOOLINFOFc.lParam, (jintLong)lpStruct->lParam); - (*env)->SetIntLongField(env, lpObject, TOOLINFOFc.lpReserved, (jintLong)lpStruct->lpReserved); + (*env)->SetLongField(env, lpObject, TOOLINFOFc.hinst, (jlong)lpStruct->hinst); + (*env)->SetLongField(env, lpObject, TOOLINFOFc.lpszText, (jlong)lpStruct->lpszText); + (*env)->SetLongField(env, lpObject, TOOLINFOFc.lParam, (jlong)lpStruct->lParam); + (*env)->SetLongField(env, lpObject, TOOLINFOFc.lpReserved, (jlong)lpStruct->lpReserved); } #endif @@ -7000,12 +7000,12 @@ void cacheTOUCHINPUTFields(JNIEnv *env, jobject lpObject) TOUCHINPUTFc.clazz = (*env)->GetObjectClass(env, lpObject); TOUCHINPUTFc.x = (*env)->GetFieldID(env, TOUCHINPUTFc.clazz, "x", "I"); TOUCHINPUTFc.y = (*env)->GetFieldID(env, TOUCHINPUTFc.clazz, "y", "I"); - TOUCHINPUTFc.hSource = (*env)->GetFieldID(env, TOUCHINPUTFc.clazz, "hSource", I_J); + TOUCHINPUTFc.hSource = (*env)->GetFieldID(env, TOUCHINPUTFc.clazz, "hSource", "J"); TOUCHINPUTFc.dwID = (*env)->GetFieldID(env, TOUCHINPUTFc.clazz, "dwID", "I"); TOUCHINPUTFc.dwFlags = (*env)->GetFieldID(env, TOUCHINPUTFc.clazz, "dwFlags", "I"); TOUCHINPUTFc.dwMask = (*env)->GetFieldID(env, TOUCHINPUTFc.clazz, "dwMask", "I"); TOUCHINPUTFc.dwTime = (*env)->GetFieldID(env, TOUCHINPUTFc.clazz, "dwTime", "I"); - TOUCHINPUTFc.dwExtraInfo = (*env)->GetFieldID(env, TOUCHINPUTFc.clazz, "dwExtraInfo", I_J); + TOUCHINPUTFc.dwExtraInfo = (*env)->GetFieldID(env, TOUCHINPUTFc.clazz, "dwExtraInfo", "J"); TOUCHINPUTFc.cxContact = (*env)->GetFieldID(env, TOUCHINPUTFc.clazz, "cxContact", "I"); TOUCHINPUTFc.cyContact = (*env)->GetFieldID(env, TOUCHINPUTFc.clazz, "cyContact", "I"); TOUCHINPUTFc.cached = 1; @@ -7016,12 +7016,12 @@ TOUCHINPUT *getTOUCHINPUTFields(JNIEnv *env, jobject lpObject, TOUCHINPUT *lpStr if (!TOUCHINPUTFc.cached) cacheTOUCHINPUTFields(env, lpObject); lpStruct->x = (*env)->GetIntField(env, lpObject, TOUCHINPUTFc.x); lpStruct->y = (*env)->GetIntField(env, lpObject, TOUCHINPUTFc.y); - lpStruct->hSource = (HWND)(*env)->GetIntLongField(env, lpObject, TOUCHINPUTFc.hSource); + lpStruct->hSource = (HWND)(*env)->GetLongField(env, lpObject, TOUCHINPUTFc.hSource); lpStruct->dwID = (*env)->GetIntField(env, lpObject, TOUCHINPUTFc.dwID); lpStruct->dwFlags = (*env)->GetIntField(env, lpObject, TOUCHINPUTFc.dwFlags); lpStruct->dwMask = (*env)->GetIntField(env, lpObject, TOUCHINPUTFc.dwMask); lpStruct->dwTime = (*env)->GetIntField(env, lpObject, TOUCHINPUTFc.dwTime); - lpStruct->dwExtraInfo = (*env)->GetIntLongField(env, lpObject, TOUCHINPUTFc.dwExtraInfo); + lpStruct->dwExtraInfo = (*env)->GetLongField(env, lpObject, TOUCHINPUTFc.dwExtraInfo); lpStruct->cxContact = (*env)->GetIntField(env, lpObject, TOUCHINPUTFc.cxContact); lpStruct->cyContact = (*env)->GetIntField(env, lpObject, TOUCHINPUTFc.cyContact); return lpStruct; @@ -7032,12 +7032,12 @@ void setTOUCHINPUTFields(JNIEnv *env, jobject lpObject, TOUCHINPUT *lpStruct) if (!TOUCHINPUTFc.cached) cacheTOUCHINPUTFields(env, lpObject); (*env)->SetIntField(env, lpObject, TOUCHINPUTFc.x, (jint)lpStruct->x); (*env)->SetIntField(env, lpObject, TOUCHINPUTFc.y, (jint)lpStruct->y); - (*env)->SetIntLongField(env, lpObject, TOUCHINPUTFc.hSource, (jintLong)lpStruct->hSource); + (*env)->SetLongField(env, lpObject, TOUCHINPUTFc.hSource, (jlong)lpStruct->hSource); (*env)->SetIntField(env, lpObject, TOUCHINPUTFc.dwID, (jint)lpStruct->dwID); (*env)->SetIntField(env, lpObject, TOUCHINPUTFc.dwFlags, (jint)lpStruct->dwFlags); (*env)->SetIntField(env, lpObject, TOUCHINPUTFc.dwMask, (jint)lpStruct->dwMask); (*env)->SetIntField(env, lpObject, TOUCHINPUTFc.dwTime, (jint)lpStruct->dwTime); - (*env)->SetIntLongField(env, lpObject, TOUCHINPUTFc.dwExtraInfo, (jintLong)lpStruct->dwExtraInfo); + (*env)->SetLongField(env, lpObject, TOUCHINPUTFc.dwExtraInfo, (jlong)lpStruct->dwExtraInfo); (*env)->SetIntField(env, lpObject, TOUCHINPUTFc.cxContact, (jint)lpStruct->cxContact); (*env)->SetIntField(env, lpObject, TOUCHINPUTFc.cyContact, (jint)lpStruct->cyContact); } @@ -7058,7 +7058,7 @@ void cacheTRACKMOUSEEVENTFields(JNIEnv *env, jobject lpObject) TRACKMOUSEEVENTFc.clazz = (*env)->GetObjectClass(env, lpObject); TRACKMOUSEEVENTFc.cbSize = (*env)->GetFieldID(env, TRACKMOUSEEVENTFc.clazz, "cbSize", "I"); TRACKMOUSEEVENTFc.dwFlags = (*env)->GetFieldID(env, TRACKMOUSEEVENTFc.clazz, "dwFlags", "I"); - TRACKMOUSEEVENTFc.hwndTrack = (*env)->GetFieldID(env, TRACKMOUSEEVENTFc.clazz, "hwndTrack", I_J); + TRACKMOUSEEVENTFc.hwndTrack = (*env)->GetFieldID(env, TRACKMOUSEEVENTFc.clazz, "hwndTrack", "J"); TRACKMOUSEEVENTFc.dwHoverTime = (*env)->GetFieldID(env, TRACKMOUSEEVENTFc.clazz, "dwHoverTime", "I"); TRACKMOUSEEVENTFc.cached = 1; } @@ -7068,7 +7068,7 @@ TRACKMOUSEEVENT *getTRACKMOUSEEVENTFields(JNIEnv *env, jobject lpObject, TRACKMO if (!TRACKMOUSEEVENTFc.cached) cacheTRACKMOUSEEVENTFields(env, lpObject); lpStruct->cbSize = (*env)->GetIntField(env, lpObject, TRACKMOUSEEVENTFc.cbSize); lpStruct->dwFlags = (*env)->GetIntField(env, lpObject, TRACKMOUSEEVENTFc.dwFlags); - lpStruct->hwndTrack = (HWND)(*env)->GetIntLongField(env, lpObject, TRACKMOUSEEVENTFc.hwndTrack); + lpStruct->hwndTrack = (HWND)(*env)->GetLongField(env, lpObject, TRACKMOUSEEVENTFc.hwndTrack); lpStruct->dwHoverTime = (*env)->GetIntField(env, lpObject, TRACKMOUSEEVENTFc.dwHoverTime); return lpStruct; } @@ -7078,7 +7078,7 @@ void setTRACKMOUSEEVENTFields(JNIEnv *env, jobject lpObject, TRACKMOUSEEVENT *lp if (!TRACKMOUSEEVENTFc.cached) cacheTRACKMOUSEEVENTFields(env, lpObject); (*env)->SetIntField(env, lpObject, TRACKMOUSEEVENTFc.cbSize, (jint)lpStruct->cbSize); (*env)->SetIntField(env, lpObject, TRACKMOUSEEVENTFc.dwFlags, (jint)lpStruct->dwFlags); - (*env)->SetIntLongField(env, lpObject, TRACKMOUSEEVENTFc.hwndTrack, (jintLong)lpStruct->hwndTrack); + (*env)->SetLongField(env, lpObject, TRACKMOUSEEVENTFc.hwndTrack, (jlong)lpStruct->hwndTrack); (*env)->SetIntField(env, lpObject, TRACKMOUSEEVENTFc.dwHoverTime, (jint)lpStruct->dwHoverTime); } #endif @@ -7145,7 +7145,7 @@ void cacheTVHITTESTINFOFields(JNIEnv *env, jobject lpObject) TVHITTESTINFOFc.x = (*env)->GetFieldID(env, TVHITTESTINFOFc.clazz, "x", "I"); TVHITTESTINFOFc.y = (*env)->GetFieldID(env, TVHITTESTINFOFc.clazz, "y", "I"); TVHITTESTINFOFc.flags = (*env)->GetFieldID(env, TVHITTESTINFOFc.clazz, "flags", "I"); - TVHITTESTINFOFc.hItem = (*env)->GetFieldID(env, TVHITTESTINFOFc.clazz, "hItem", I_J); + TVHITTESTINFOFc.hItem = (*env)->GetFieldID(env, TVHITTESTINFOFc.clazz, "hItem", "J"); TVHITTESTINFOFc.cached = 1; } @@ -7155,7 +7155,7 @@ TVHITTESTINFO *getTVHITTESTINFOFields(JNIEnv *env, jobject lpObject, TVHITTESTIN lpStruct->pt.x = (*env)->GetIntField(env, lpObject, TVHITTESTINFOFc.x); lpStruct->pt.y = (*env)->GetIntField(env, lpObject, TVHITTESTINFOFc.y); lpStruct->flags = (*env)->GetIntField(env, lpObject, TVHITTESTINFOFc.flags); - lpStruct->hItem = (HTREEITEM)(*env)->GetIntLongField(env, lpObject, TVHITTESTINFOFc.hItem); + lpStruct->hItem = (HTREEITEM)(*env)->GetLongField(env, lpObject, TVHITTESTINFOFc.hItem); return lpStruct; } @@ -7165,7 +7165,7 @@ void setTVHITTESTINFOFields(JNIEnv *env, jobject lpObject, TVHITTESTINFO *lpStru (*env)->SetIntField(env, lpObject, TVHITTESTINFOFc.x, (jint)lpStruct->pt.x); (*env)->SetIntField(env, lpObject, TVHITTESTINFOFc.y, (jint)lpStruct->pt.y); (*env)->SetIntField(env, lpObject, TVHITTESTINFOFc.flags, (jint)lpStruct->flags); - (*env)->SetIntLongField(env, lpObject, TVHITTESTINFOFc.hItem, (jintLong)lpStruct->hItem); + (*env)->SetLongField(env, lpObject, TVHITTESTINFOFc.hItem, (jlong)lpStruct->hItem); } #endif @@ -7182,18 +7182,18 @@ void cacheTVINSERTSTRUCTFields(JNIEnv *env, jobject lpObject) { if (TVINSERTSTRUCTFc.cached) return; TVINSERTSTRUCTFc.clazz = (*env)->GetObjectClass(env, lpObject); - TVINSERTSTRUCTFc.hParent = (*env)->GetFieldID(env, TVINSERTSTRUCTFc.clazz, "hParent", I_J); - TVINSERTSTRUCTFc.hInsertAfter = (*env)->GetFieldID(env, TVINSERTSTRUCTFc.clazz, "hInsertAfter", I_J); + TVINSERTSTRUCTFc.hParent = (*env)->GetFieldID(env, TVINSERTSTRUCTFc.clazz, "hParent", "J"); + TVINSERTSTRUCTFc.hInsertAfter = (*env)->GetFieldID(env, TVINSERTSTRUCTFc.clazz, "hInsertAfter", "J"); TVINSERTSTRUCTFc.mask = (*env)->GetFieldID(env, TVINSERTSTRUCTFc.clazz, "mask", "I"); - TVINSERTSTRUCTFc.hItem = (*env)->GetFieldID(env, TVINSERTSTRUCTFc.clazz, "hItem", I_J); + TVINSERTSTRUCTFc.hItem = (*env)->GetFieldID(env, TVINSERTSTRUCTFc.clazz, "hItem", "J"); TVINSERTSTRUCTFc.state = (*env)->GetFieldID(env, TVINSERTSTRUCTFc.clazz, "state", "I"); TVINSERTSTRUCTFc.stateMask = (*env)->GetFieldID(env, TVINSERTSTRUCTFc.clazz, "stateMask", "I"); - TVINSERTSTRUCTFc.pszText = (*env)->GetFieldID(env, TVINSERTSTRUCTFc.clazz, "pszText", I_J); + TVINSERTSTRUCTFc.pszText = (*env)->GetFieldID(env, TVINSERTSTRUCTFc.clazz, "pszText", "J"); TVINSERTSTRUCTFc.cchTextMax = (*env)->GetFieldID(env, TVINSERTSTRUCTFc.clazz, "cchTextMax", "I"); TVINSERTSTRUCTFc.iImage = (*env)->GetFieldID(env, TVINSERTSTRUCTFc.clazz, "iImage", "I"); TVINSERTSTRUCTFc.iSelectedImage = (*env)->GetFieldID(env, TVINSERTSTRUCTFc.clazz, "iSelectedImage", "I"); TVINSERTSTRUCTFc.cChildren = (*env)->GetFieldID(env, TVINSERTSTRUCTFc.clazz, "cChildren", "I"); - TVINSERTSTRUCTFc.lParam = (*env)->GetFieldID(env, TVINSERTSTRUCTFc.clazz, "lParam", I_J); + TVINSERTSTRUCTFc.lParam = (*env)->GetFieldID(env, TVINSERTSTRUCTFc.clazz, "lParam", "J"); TVINSERTSTRUCTFc.iIntegral = (*env)->GetFieldID(env, TVINSERTSTRUCTFc.clazz, "iIntegral", "I"); TVINSERTSTRUCTFc.cached = 1; } @@ -7201,18 +7201,18 @@ void cacheTVINSERTSTRUCTFields(JNIEnv *env, jobject lpObject) TVINSERTSTRUCT *getTVINSERTSTRUCTFields(JNIEnv *env, jobject lpObject, TVINSERTSTRUCT *lpStruct) { if (!TVINSERTSTRUCTFc.cached) cacheTVINSERTSTRUCTFields(env, lpObject); - lpStruct->hParent = (HTREEITEM)(*env)->GetIntLongField(env, lpObject, TVINSERTSTRUCTFc.hParent); - lpStruct->hInsertAfter = (HTREEITEM)(*env)->GetIntLongField(env, lpObject, TVINSERTSTRUCTFc.hInsertAfter); + lpStruct->hParent = (HTREEITEM)(*env)->GetLongField(env, lpObject, TVINSERTSTRUCTFc.hParent); + lpStruct->hInsertAfter = (HTREEITEM)(*env)->GetLongField(env, lpObject, TVINSERTSTRUCTFc.hInsertAfter); lpStruct->item.mask = (*env)->GetIntField(env, lpObject, TVINSERTSTRUCTFc.mask); - lpStruct->item.hItem = (HTREEITEM)(*env)->GetIntLongField(env, lpObject, TVINSERTSTRUCTFc.hItem); + lpStruct->item.hItem = (HTREEITEM)(*env)->GetLongField(env, lpObject, TVINSERTSTRUCTFc.hItem); lpStruct->item.state = (*env)->GetIntField(env, lpObject, TVINSERTSTRUCTFc.state); lpStruct->item.stateMask = (*env)->GetIntField(env, lpObject, TVINSERTSTRUCTFc.stateMask); - lpStruct->item.pszText = (LPTSTR)(*env)->GetIntLongField(env, lpObject, TVINSERTSTRUCTFc.pszText); + lpStruct->item.pszText = (LPTSTR)(*env)->GetLongField(env, lpObject, TVINSERTSTRUCTFc.pszText); lpStruct->item.cchTextMax = (*env)->GetIntField(env, lpObject, TVINSERTSTRUCTFc.cchTextMax); lpStruct->item.iImage = (*env)->GetIntField(env, lpObject, TVINSERTSTRUCTFc.iImage); lpStruct->item.iSelectedImage = (*env)->GetIntField(env, lpObject, TVINSERTSTRUCTFc.iSelectedImage); lpStruct->item.cChildren = (*env)->GetIntField(env, lpObject, TVINSERTSTRUCTFc.cChildren); - lpStruct->item.lParam = (*env)->GetIntLongField(env, lpObject, TVINSERTSTRUCTFc.lParam); + lpStruct->item.lParam = (*env)->GetLongField(env, lpObject, TVINSERTSTRUCTFc.lParam); lpStruct->itemex.iIntegral = (*env)->GetIntField(env, lpObject, TVINSERTSTRUCTFc.iIntegral); return lpStruct; } @@ -7220,18 +7220,18 @@ TVINSERTSTRUCT *getTVINSERTSTRUCTFields(JNIEnv *env, jobject lpObject, TVINSERTS void setTVINSERTSTRUCTFields(JNIEnv *env, jobject lpObject, TVINSERTSTRUCT *lpStruct) { if (!TVINSERTSTRUCTFc.cached) cacheTVINSERTSTRUCTFields(env, lpObject); - (*env)->SetIntLongField(env, lpObject, TVINSERTSTRUCTFc.hParent, (jintLong)lpStruct->hParent); - (*env)->SetIntLongField(env, lpObject, TVINSERTSTRUCTFc.hInsertAfter, (jintLong)lpStruct->hInsertAfter); + (*env)->SetLongField(env, lpObject, TVINSERTSTRUCTFc.hParent, (jlong)lpStruct->hParent); + (*env)->SetLongField(env, lpObject, TVINSERTSTRUCTFc.hInsertAfter, (jlong)lpStruct->hInsertAfter); (*env)->SetIntField(env, lpObject, TVINSERTSTRUCTFc.mask, (jint)lpStruct->item.mask); - (*env)->SetIntLongField(env, lpObject, TVINSERTSTRUCTFc.hItem, (jintLong)lpStruct->item.hItem); + (*env)->SetLongField(env, lpObject, TVINSERTSTRUCTFc.hItem, (jlong)lpStruct->item.hItem); (*env)->SetIntField(env, lpObject, TVINSERTSTRUCTFc.state, (jint)lpStruct->item.state); (*env)->SetIntField(env, lpObject, TVINSERTSTRUCTFc.stateMask, (jint)lpStruct->item.stateMask); - (*env)->SetIntLongField(env, lpObject, TVINSERTSTRUCTFc.pszText, (jintLong)lpStruct->item.pszText); + (*env)->SetLongField(env, lpObject, TVINSERTSTRUCTFc.pszText, (jlong)lpStruct->item.pszText); (*env)->SetIntField(env, lpObject, TVINSERTSTRUCTFc.cchTextMax, (jint)lpStruct->item.cchTextMax); (*env)->SetIntField(env, lpObject, TVINSERTSTRUCTFc.iImage, (jint)lpStruct->item.iImage); (*env)->SetIntField(env, lpObject, TVINSERTSTRUCTFc.iSelectedImage, (jint)lpStruct->item.iSelectedImage); (*env)->SetIntField(env, lpObject, TVINSERTSTRUCTFc.cChildren, (jint)lpStruct->item.cChildren); - (*env)->SetIntLongField(env, lpObject, TVINSERTSTRUCTFc.lParam, (jintLong)lpStruct->item.lParam); + (*env)->SetLongField(env, lpObject, TVINSERTSTRUCTFc.lParam, (jlong)lpStruct->item.lParam); (*env)->SetIntField(env, lpObject, TVINSERTSTRUCTFc.iIntegral, (jint)lpStruct->itemex.iIntegral); } #endif @@ -7250,15 +7250,15 @@ void cacheTVITEMFields(JNIEnv *env, jobject lpObject) if (TVITEMFc.cached) return; TVITEMFc.clazz = (*env)->GetObjectClass(env, lpObject); TVITEMFc.mask = (*env)->GetFieldID(env, TVITEMFc.clazz, "mask", "I"); - TVITEMFc.hItem = (*env)->GetFieldID(env, TVITEMFc.clazz, "hItem", I_J); + TVITEMFc.hItem = (*env)->GetFieldID(env, TVITEMFc.clazz, "hItem", "J"); TVITEMFc.state = (*env)->GetFieldID(env, TVITEMFc.clazz, "state", "I"); TVITEMFc.stateMask = (*env)->GetFieldID(env, TVITEMFc.clazz, "stateMask", "I"); - TVITEMFc.pszText = (*env)->GetFieldID(env, TVITEMFc.clazz, "pszText", I_J); + TVITEMFc.pszText = (*env)->GetFieldID(env, TVITEMFc.clazz, "pszText", "J"); TVITEMFc.cchTextMax = (*env)->GetFieldID(env, TVITEMFc.clazz, "cchTextMax", "I"); TVITEMFc.iImage = (*env)->GetFieldID(env, TVITEMFc.clazz, "iImage", "I"); TVITEMFc.iSelectedImage = (*env)->GetFieldID(env, TVITEMFc.clazz, "iSelectedImage", "I"); TVITEMFc.cChildren = (*env)->GetFieldID(env, TVITEMFc.clazz, "cChildren", "I"); - TVITEMFc.lParam = (*env)->GetFieldID(env, TVITEMFc.clazz, "lParam", I_J); + TVITEMFc.lParam = (*env)->GetFieldID(env, TVITEMFc.clazz, "lParam", "J"); TVITEMFc.cached = 1; } @@ -7266,15 +7266,15 @@ TVITEM *getTVITEMFields(JNIEnv *env, jobject lpObject, TVITEM *lpStruct) { if (!TVITEMFc.cached) cacheTVITEMFields(env, lpObject); lpStruct->mask = (*env)->GetIntField(env, lpObject, TVITEMFc.mask); - lpStruct->hItem = (HTREEITEM)(*env)->GetIntLongField(env, lpObject, TVITEMFc.hItem); + lpStruct->hItem = (HTREEITEM)(*env)->GetLongField(env, lpObject, TVITEMFc.hItem); lpStruct->state = (*env)->GetIntField(env, lpObject, TVITEMFc.state); lpStruct->stateMask = (*env)->GetIntField(env, lpObject, TVITEMFc.stateMask); - lpStruct->pszText = (LPTSTR)(*env)->GetIntLongField(env, lpObject, TVITEMFc.pszText); + lpStruct->pszText = (LPTSTR)(*env)->GetLongField(env, lpObject, TVITEMFc.pszText); lpStruct->cchTextMax = (*env)->GetIntField(env, lpObject, TVITEMFc.cchTextMax); lpStruct->iImage = (*env)->GetIntField(env, lpObject, TVITEMFc.iImage); lpStruct->iSelectedImage = (*env)->GetIntField(env, lpObject, TVITEMFc.iSelectedImage); lpStruct->cChildren = (*env)->GetIntField(env, lpObject, TVITEMFc.cChildren); - lpStruct->lParam = (*env)->GetIntLongField(env, lpObject, TVITEMFc.lParam); + lpStruct->lParam = (*env)->GetLongField(env, lpObject, TVITEMFc.lParam); return lpStruct; } @@ -7282,15 +7282,15 @@ void setTVITEMFields(JNIEnv *env, jobject lpObject, TVITEM *lpStruct) { if (!TVITEMFc.cached) cacheTVITEMFields(env, lpObject); (*env)->SetIntField(env, lpObject, TVITEMFc.mask, (jint)lpStruct->mask); - (*env)->SetIntLongField(env, lpObject, TVITEMFc.hItem, (jintLong)lpStruct->hItem); + (*env)->SetLongField(env, lpObject, TVITEMFc.hItem, (jlong)lpStruct->hItem); (*env)->SetIntField(env, lpObject, TVITEMFc.state, (jint)lpStruct->state); (*env)->SetIntField(env, lpObject, TVITEMFc.stateMask, (jint)lpStruct->stateMask); - (*env)->SetIntLongField(env, lpObject, TVITEMFc.pszText, (jintLong)lpStruct->pszText); + (*env)->SetLongField(env, lpObject, TVITEMFc.pszText, (jlong)lpStruct->pszText); (*env)->SetIntField(env, lpObject, TVITEMFc.cchTextMax, (jint)lpStruct->cchTextMax); (*env)->SetIntField(env, lpObject, TVITEMFc.iImage, (jint)lpStruct->iImage); (*env)->SetIntField(env, lpObject, TVITEMFc.iSelectedImage, (jint)lpStruct->iSelectedImage); (*env)->SetIntField(env, lpObject, TVITEMFc.cChildren, (jint)lpStruct->cChildren); - (*env)->SetIntLongField(env, lpObject, TVITEMFc.lParam, (jintLong)lpStruct->lParam); + (*env)->SetLongField(env, lpObject, TVITEMFc.lParam, (jlong)lpStruct->lParam); } #endif @@ -7341,27 +7341,27 @@ void cacheTVSORTCBFields(JNIEnv *env, jobject lpObject) { if (TVSORTCBFc.cached) return; TVSORTCBFc.clazz = (*env)->GetObjectClass(env, lpObject); - TVSORTCBFc.hParent = (*env)->GetFieldID(env, TVSORTCBFc.clazz, "hParent", I_J); - TVSORTCBFc.lpfnCompare = (*env)->GetFieldID(env, TVSORTCBFc.clazz, "lpfnCompare", I_J); - TVSORTCBFc.lParam = (*env)->GetFieldID(env, TVSORTCBFc.clazz, "lParam", I_J); + TVSORTCBFc.hParent = (*env)->GetFieldID(env, TVSORTCBFc.clazz, "hParent", "J"); + TVSORTCBFc.lpfnCompare = (*env)->GetFieldID(env, TVSORTCBFc.clazz, "lpfnCompare", "J"); + TVSORTCBFc.lParam = (*env)->GetFieldID(env, TVSORTCBFc.clazz, "lParam", "J"); TVSORTCBFc.cached = 1; } TVSORTCB *getTVSORTCBFields(JNIEnv *env, jobject lpObject, TVSORTCB *lpStruct) { if (!TVSORTCBFc.cached) cacheTVSORTCBFields(env, lpObject); - lpStruct->hParent = (HTREEITEM)(*env)->GetIntLongField(env, lpObject, TVSORTCBFc.hParent); - lpStruct->lpfnCompare = (PFNTVCOMPARE)(*env)->GetIntLongField(env, lpObject, TVSORTCBFc.lpfnCompare); - lpStruct->lParam = (LPARAM)(*env)->GetIntLongField(env, lpObject, TVSORTCBFc.lParam); + lpStruct->hParent = (HTREEITEM)(*env)->GetLongField(env, lpObject, TVSORTCBFc.hParent); + lpStruct->lpfnCompare = (PFNTVCOMPARE)(*env)->GetLongField(env, lpObject, TVSORTCBFc.lpfnCompare); + lpStruct->lParam = (LPARAM)(*env)->GetLongField(env, lpObject, TVSORTCBFc.lParam); return lpStruct; } void setTVSORTCBFields(JNIEnv *env, jobject lpObject, TVSORTCB *lpStruct) { if (!TVSORTCBFc.cached) cacheTVSORTCBFields(env, lpObject); - (*env)->SetIntLongField(env, lpObject, TVSORTCBFc.hParent, (jintLong)lpStruct->hParent); - (*env)->SetIntLongField(env, lpObject, TVSORTCBFc.lpfnCompare, (jintLong)lpStruct->lpfnCompare); - (*env)->SetIntLongField(env, lpObject, TVSORTCBFc.lParam, (jintLong)lpStruct->lParam); + (*env)->SetLongField(env, lpObject, TVSORTCBFc.hParent, (jlong)lpStruct->hParent); + (*env)->SetLongField(env, lpObject, TVSORTCBFc.lpfnCompare, (jlong)lpStruct->lpfnCompare); + (*env)->SetLongField(env, lpObject, TVSORTCBFc.lParam, (jlong)lpStruct->lParam); } #endif @@ -7473,8 +7473,8 @@ void cacheWINDOWPOSFields(JNIEnv *env, jobject lpObject) { if (WINDOWPOSFc.cached) return; WINDOWPOSFc.clazz = (*env)->GetObjectClass(env, lpObject); - WINDOWPOSFc.hwnd = (*env)->GetFieldID(env, WINDOWPOSFc.clazz, "hwnd", I_J); - WINDOWPOSFc.hwndInsertAfter = (*env)->GetFieldID(env, WINDOWPOSFc.clazz, "hwndInsertAfter", I_J); + WINDOWPOSFc.hwnd = (*env)->GetFieldID(env, WINDOWPOSFc.clazz, "hwnd", "J"); + WINDOWPOSFc.hwndInsertAfter = (*env)->GetFieldID(env, WINDOWPOSFc.clazz, "hwndInsertAfter", "J"); WINDOWPOSFc.x = (*env)->GetFieldID(env, WINDOWPOSFc.clazz, "x", "I"); WINDOWPOSFc.y = (*env)->GetFieldID(env, WINDOWPOSFc.clazz, "y", "I"); WINDOWPOSFc.cx = (*env)->GetFieldID(env, WINDOWPOSFc.clazz, "cx", "I"); @@ -7486,8 +7486,8 @@ void cacheWINDOWPOSFields(JNIEnv *env, jobject lpObject) WINDOWPOS *getWINDOWPOSFields(JNIEnv *env, jobject lpObject, WINDOWPOS *lpStruct) { if (!WINDOWPOSFc.cached) cacheWINDOWPOSFields(env, lpObject); - lpStruct->hwnd = (HWND)(*env)->GetIntLongField(env, lpObject, WINDOWPOSFc.hwnd); - lpStruct->hwndInsertAfter = (HWND)(*env)->GetIntLongField(env, lpObject, WINDOWPOSFc.hwndInsertAfter); + lpStruct->hwnd = (HWND)(*env)->GetLongField(env, lpObject, WINDOWPOSFc.hwnd); + lpStruct->hwndInsertAfter = (HWND)(*env)->GetLongField(env, lpObject, WINDOWPOSFc.hwndInsertAfter); lpStruct->x = (*env)->GetIntField(env, lpObject, WINDOWPOSFc.x); lpStruct->y = (*env)->GetIntField(env, lpObject, WINDOWPOSFc.y); lpStruct->cx = (*env)->GetIntField(env, lpObject, WINDOWPOSFc.cx); @@ -7499,8 +7499,8 @@ WINDOWPOS *getWINDOWPOSFields(JNIEnv *env, jobject lpObject, WINDOWPOS *lpStruct void setWINDOWPOSFields(JNIEnv *env, jobject lpObject, WINDOWPOS *lpStruct) { if (!WINDOWPOSFc.cached) cacheWINDOWPOSFields(env, lpObject); - (*env)->SetIntLongField(env, lpObject, WINDOWPOSFc.hwnd, (jintLong)lpStruct->hwnd); - (*env)->SetIntLongField(env, lpObject, WINDOWPOSFc.hwndInsertAfter, (jintLong)lpStruct->hwndInsertAfter); + (*env)->SetLongField(env, lpObject, WINDOWPOSFc.hwnd, (jlong)lpStruct->hwnd); + (*env)->SetLongField(env, lpObject, WINDOWPOSFc.hwndInsertAfter, (jlong)lpStruct->hwndInsertAfter); (*env)->SetIntField(env, lpObject, WINDOWPOSFc.x, (jint)lpStruct->x); (*env)->SetIntField(env, lpObject, WINDOWPOSFc.y, (jint)lpStruct->y); (*env)->SetIntField(env, lpObject, WINDOWPOSFc.cx, (jint)lpStruct->cx); @@ -7523,15 +7523,15 @@ void cacheWNDCLASSFields(JNIEnv *env, jobject lpObject) if (WNDCLASSFc.cached) return; WNDCLASSFc.clazz = (*env)->GetObjectClass(env, lpObject); WNDCLASSFc.style = (*env)->GetFieldID(env, WNDCLASSFc.clazz, "style", "I"); - WNDCLASSFc.lpfnWndProc = (*env)->GetFieldID(env, WNDCLASSFc.clazz, "lpfnWndProc", I_J); + WNDCLASSFc.lpfnWndProc = (*env)->GetFieldID(env, WNDCLASSFc.clazz, "lpfnWndProc", "J"); WNDCLASSFc.cbClsExtra = (*env)->GetFieldID(env, WNDCLASSFc.clazz, "cbClsExtra", "I"); WNDCLASSFc.cbWndExtra = (*env)->GetFieldID(env, WNDCLASSFc.clazz, "cbWndExtra", "I"); - WNDCLASSFc.hInstance = (*env)->GetFieldID(env, WNDCLASSFc.clazz, "hInstance", I_J); - WNDCLASSFc.hIcon = (*env)->GetFieldID(env, WNDCLASSFc.clazz, "hIcon", I_J); - WNDCLASSFc.hCursor = (*env)->GetFieldID(env, WNDCLASSFc.clazz, "hCursor", I_J); - WNDCLASSFc.hbrBackground = (*env)->GetFieldID(env, WNDCLASSFc.clazz, "hbrBackground", I_J); - WNDCLASSFc.lpszMenuName = (*env)->GetFieldID(env, WNDCLASSFc.clazz, "lpszMenuName", I_J); - WNDCLASSFc.lpszClassName = (*env)->GetFieldID(env, WNDCLASSFc.clazz, "lpszClassName", I_J); + WNDCLASSFc.hInstance = (*env)->GetFieldID(env, WNDCLASSFc.clazz, "hInstance", "J"); + WNDCLASSFc.hIcon = (*env)->GetFieldID(env, WNDCLASSFc.clazz, "hIcon", "J"); + WNDCLASSFc.hCursor = (*env)->GetFieldID(env, WNDCLASSFc.clazz, "hCursor", "J"); + WNDCLASSFc.hbrBackground = (*env)->GetFieldID(env, WNDCLASSFc.clazz, "hbrBackground", "J"); + WNDCLASSFc.lpszMenuName = (*env)->GetFieldID(env, WNDCLASSFc.clazz, "lpszMenuName", "J"); + WNDCLASSFc.lpszClassName = (*env)->GetFieldID(env, WNDCLASSFc.clazz, "lpszClassName", "J"); WNDCLASSFc.cached = 1; } @@ -7539,15 +7539,15 @@ WNDCLASS *getWNDCLASSFields(JNIEnv *env, jobject lpObject, WNDCLASS *lpStruct) { if (!WNDCLASSFc.cached) cacheWNDCLASSFields(env, lpObject); lpStruct->style = (*env)->GetIntField(env, lpObject, WNDCLASSFc.style); - lpStruct->lpfnWndProc = (WNDPROC)(*env)->GetIntLongField(env, lpObject, WNDCLASSFc.lpfnWndProc); + lpStruct->lpfnWndProc = (WNDPROC)(*env)->GetLongField(env, lpObject, WNDCLASSFc.lpfnWndProc); lpStruct->cbClsExtra = (*env)->GetIntField(env, lpObject, WNDCLASSFc.cbClsExtra); lpStruct->cbWndExtra = (*env)->GetIntField(env, lpObject, WNDCLASSFc.cbWndExtra); - lpStruct->hInstance = (HINSTANCE)(*env)->GetIntLongField(env, lpObject, WNDCLASSFc.hInstance); - lpStruct->hIcon = (HICON)(*env)->GetIntLongField(env, lpObject, WNDCLASSFc.hIcon); - lpStruct->hCursor = (HCURSOR)(*env)->GetIntLongField(env, lpObject, WNDCLASSFc.hCursor); - lpStruct->hbrBackground = (HBRUSH)(*env)->GetIntLongField(env, lpObject, WNDCLASSFc.hbrBackground); - lpStruct->lpszMenuName = (LPCTSTR)(*env)->GetIntLongField(env, lpObject, WNDCLASSFc.lpszMenuName); - lpStruct->lpszClassName = (LPCTSTR)(*env)->GetIntLongField(env, lpObject, WNDCLASSFc.lpszClassName); + lpStruct->hInstance = (HINSTANCE)(*env)->GetLongField(env, lpObject, WNDCLASSFc.hInstance); + lpStruct->hIcon = (HICON)(*env)->GetLongField(env, lpObject, WNDCLASSFc.hIcon); + lpStruct->hCursor = (HCURSOR)(*env)->GetLongField(env, lpObject, WNDCLASSFc.hCursor); + lpStruct->hbrBackground = (HBRUSH)(*env)->GetLongField(env, lpObject, WNDCLASSFc.hbrBackground); + lpStruct->lpszMenuName = (LPCTSTR)(*env)->GetLongField(env, lpObject, WNDCLASSFc.lpszMenuName); + lpStruct->lpszClassName = (LPCTSTR)(*env)->GetLongField(env, lpObject, WNDCLASSFc.lpszClassName); return lpStruct; } @@ -7555,15 +7555,15 @@ void setWNDCLASSFields(JNIEnv *env, jobject lpObject, WNDCLASS *lpStruct) { if (!WNDCLASSFc.cached) cacheWNDCLASSFields(env, lpObject); (*env)->SetIntField(env, lpObject, WNDCLASSFc.style, (jint)lpStruct->style); - (*env)->SetIntLongField(env, lpObject, WNDCLASSFc.lpfnWndProc, (jintLong)lpStruct->lpfnWndProc); + (*env)->SetLongField(env, lpObject, WNDCLASSFc.lpfnWndProc, (jlong)lpStruct->lpfnWndProc); (*env)->SetIntField(env, lpObject, WNDCLASSFc.cbClsExtra, (jint)lpStruct->cbClsExtra); (*env)->SetIntField(env, lpObject, WNDCLASSFc.cbWndExtra, (jint)lpStruct->cbWndExtra); - (*env)->SetIntLongField(env, lpObject, WNDCLASSFc.hInstance, (jintLong)lpStruct->hInstance); - (*env)->SetIntLongField(env, lpObject, WNDCLASSFc.hIcon, (jintLong)lpStruct->hIcon); - (*env)->SetIntLongField(env, lpObject, WNDCLASSFc.hCursor, (jintLong)lpStruct->hCursor); - (*env)->SetIntLongField(env, lpObject, WNDCLASSFc.hbrBackground, (jintLong)lpStruct->hbrBackground); - (*env)->SetIntLongField(env, lpObject, WNDCLASSFc.lpszMenuName, (jintLong)lpStruct->lpszMenuName); - (*env)->SetIntLongField(env, lpObject, WNDCLASSFc.lpszClassName, (jintLong)lpStruct->lpszClassName); + (*env)->SetLongField(env, lpObject, WNDCLASSFc.hInstance, (jlong)lpStruct->hInstance); + (*env)->SetLongField(env, lpObject, WNDCLASSFc.hIcon, (jlong)lpStruct->hIcon); + (*env)->SetLongField(env, lpObject, WNDCLASSFc.hCursor, (jlong)lpStruct->hCursor); + (*env)->SetLongField(env, lpObject, WNDCLASSFc.hbrBackground, (jlong)lpStruct->hbrBackground); + (*env)->SetLongField(env, lpObject, WNDCLASSFc.lpszMenuName, (jlong)lpStruct->lpszMenuName); + (*env)->SetLongField(env, lpObject, WNDCLASSFc.lpszClassName, (jlong)lpStruct->lpszClassName); } #endif diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/BitmapData.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/BitmapData.java index 2a4efb711d..457100c2b3 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/BitmapData.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/BitmapData.java @@ -20,7 +20,7 @@ public class BitmapData { /** @field cast=(PixelFormat) */ public int PixelFormat; /** @field cast=(void*) */ - public long /*int*/ Scan0; + public long Scan0; /** @field cast=(UINT_PTR) */ - public long /*int*/ Reserved; + public long Reserved; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/Gdip.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/Gdip.java index 61c790c9ea..375544e4cf 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/Gdip.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/Gdip.java @@ -151,50 +151,50 @@ public static final native int GdiplusStartupInput_sizeof(); * @param input cast=(const GdiplusStartupInput *) * @param output cast=(GdiplusStartupOutput *) */ -public static final native int GdiplusStartup(long /*int*/[] token, GdiplusStartupInput input, long /*int*/ output); +public static final native int GdiplusStartup(long[] token, GdiplusStartupInput input, long output); /** @param token cast=(ULONG_PTR) */ -public static final native void GdiplusShutdown(long /*int*/ token); +public static final native void GdiplusShutdown(long token); /** * @method flags=new * @param hbm cast=(HBITMAP) * @param hpal cast=(HPALETTE) */ -public static final native long /*int*/ Bitmap_new(long /*int*/ hbm, long /*int*/ hpal); +public static final native long Bitmap_new(long hbm, long hpal); /** * @method flags=new * @param hicon cast=(HICON) */ -public static final native long /*int*/ Bitmap_new(long /*int*/ hicon); +public static final native long Bitmap_new(long hicon); /** * @method flags=new * @param format cast=(PixelFormat) * @param scan0 cast=(BYTE *) */ -public static final native long /*int*/ Bitmap_new(int width, int height, int stride, int format, long /*int*/ scan0); +public static final native long Bitmap_new(int width, int height, int stride, int format, long scan0); /** * @method flags=new * @param filename cast=(WCHAR*) */ -public static final native long /*int*/ Bitmap_new(char[] filename, boolean useIcm); +public static final native long Bitmap_new(char[] filename, boolean useIcm); /** @method flags=delete */ -public static final native void Bitmap_delete(long /*int*/ bitmap); +public static final native void Bitmap_delete(long bitmap); /** * @method flags=cpp * @param bitmap cast=(Bitmap*) * @param colorBackground cast=(Color) * @param hbmReturn cast=(HBITMAP*) */ -public static final native int Bitmap_GetHBITMAP(long /*int*/ bitmap, int colorBackground, long /*int*/[] hbmReturn); +public static final native int Bitmap_GetHBITMAP(long bitmap, int colorBackground, long[] hbmReturn); /** * @method flags=cpp * @param bitmap cast=(Bitmap*) * @param hicon cast=(HICON*) */ -public static final native int Bitmap_GetHICON(long /*int*/ bitmap, long /*int*/[] hicon); +public static final native int Bitmap_GetHICON(long bitmap, long[] hicon); /** @method flags=new */ -public static final native long /*int*/ BitmapData_new(); +public static final native long BitmapData_new(); /** @method flags=delete */ -public static final native void BitmapData_delete(long /*int*/ bitmapData); +public static final native void BitmapData_delete(long bitmapData); /** * @method flags=cpp * @param bitmap cast=(Bitmap*) @@ -202,39 +202,39 @@ public static final native void BitmapData_delete(long /*int*/ bitmapData); * @param pixelFormat cast=(PixelFormat) * @param lockedBitmapData cast=(BitmapData*) */ -public static final native int Bitmap_LockBits(long /*int*/ bitmap, long /*int*/ rect, int flags, int pixelFormat, long /*int*/ lockedBitmapData); +public static final native int Bitmap_LockBits(long bitmap, long rect, int flags, int pixelFormat, long lockedBitmapData); /** * @method flags=cpp * @param bitmap cast=(Bitmap*) * @param lockedBitmapData cast=(BitmapData*) */ -public static final native int Bitmap_UnlockBits(long /*int*/ bitmap, long /*int*/ lockedBitmapData); +public static final native int Bitmap_UnlockBits(long bitmap, long lockedBitmapData); /** * @method flags=cpp * @param brush cast=(Brush *) */ -public static final native long /*int*/ Brush_Clone(long /*int*/ brush); +public static final native long Brush_Clone(long brush); /** * @method flags=cpp * @param brush cast=(Brush *) */ -public static final native int Brush_GetType(long /*int*/ brush); +public static final native int Brush_GetType(long brush); /** @method flags=new */ -public static final native long /*int*/ PrivateFontCollection_new(); +public static final native long PrivateFontCollection_new(); /** @method flags=delete */ -public static final native void PrivateFontCollection_delete(long /*int*/ collection); +public static final native void PrivateFontCollection_delete(long collection); /** * @method flags=cpp * @param collection cast=(PrivateFontCollection *) * @param filename cast=(const WCHAR *) */ -public static final native int PrivateFontCollection_AddFontFile(long /*int*/ collection, char[] filename); +public static final native int PrivateFontCollection_AddFontFile(long collection, char[] filename); /** * @method flags=new * @param hdc cast=(HDC) * @param hfont cast=(HFONT) */ -public static final native long /*int*/ Font_new(long /*int*/ hdc, long /*int*/ hfont); +public static final native long Font_new(long hdc, long hfont); /** * @method flags=new * @param family cast=(const FontFamily *) @@ -242,7 +242,7 @@ public static final native long /*int*/ Font_new(long /*int*/ hdc, long /*int*/ * @param style cast=(INT) * @param unit cast=(Unit) */ -public static final native long /*int*/ Font_new(long /*int*/ family, float emSize, int style, int unit); +public static final native long Font_new(long family, float emSize, int style, int unit); /** * @method flags=new * @param familyName cast=(const WCHAR *) @@ -251,72 +251,72 @@ public static final native long /*int*/ Font_new(long /*int*/ family, float emSi * @param unit cast=(Unit) * @param fontCollection cast=(const FontCollection *) */ -public static final native long /*int*/ Font_new(char[] familyName, float emSize, int style, int unit, long /*int*/ fontCollection); +public static final native long Font_new(char[] familyName, float emSize, int style, int unit, long fontCollection); /** @method flags=delete */ -public static final native void Font_delete(long /*int*/ font); +public static final native void Font_delete(long font); /** * @method flags=cpp * @param font cast=(Font *) * @param family cast=(FontFamily *) */ -public static final native int Font_GetFamily(long /*int*/ font, long /*int*/ family); +public static final native int Font_GetFamily(long font, long family); /** * @method flags=cpp * @param font cast=(Font *) */ -public static final native float Font_GetSize(long /*int*/ font); +public static final native float Font_GetSize(long font); /** * @method flags=cpp * @param font cast=(Font *) */ -public static final native int Font_GetStyle(long /*int*/ font); +public static final native int Font_GetStyle(long font); /** * @method flags=cpp * @param font cast=(Font *) * @param g cast=(const Graphics *) * @param logfontW cast=(LOGFONTW *) */ -public static final native int Font_GetLogFontW (long /*int*/ font, long /*int*/ g, long /*int*/ logfontW); +public static final native int Font_GetLogFontW (long font, long g, long logfontW); /** * @method flags=cpp * @param font cast=(Font *) */ -public static final native boolean Font_IsAvailable(long /*int*/ font); +public static final native boolean Font_IsAvailable(long font); /** @method flags=new */ -public static final native long /*int*/ FontFamily_new(); +public static final native long FontFamily_new(); /** * @method flags=new * @param name cast=(const WCHAR *) * @param fontCollection cast=(const FontCollection *) */ -public static final native long /*int*/ FontFamily_new(char[] name, long /*int*/ fontCollection); +public static final native long FontFamily_new(char[] name, long fontCollection); /** @method flags=delete */ -public static final native void FontFamily_delete(long /*int*/ family); +public static final native void FontFamily_delete(long family); /** * @method flags=cpp * @param family cast=(FontFamily *) * @param name cast=(WCHAR *) * @param language cast=(WCHAR) */ -public static final native int FontFamily_GetFamilyName(long /*int*/ family, char[] name, char language); +public static final native int FontFamily_GetFamilyName(long family, char[] name, char language); /** * @method flags=cpp * @param family cast=(FontFamily *) */ -public static final native boolean FontFamily_IsAvailable(long /*int*/ family); +public static final native boolean FontFamily_IsAvailable(long family); /** * @method flags=new * @param hdc cast=(HDC) */ -public static final native long /*int*/ Graphics_new(long /*int*/ hdc); +public static final native long Graphics_new(long hdc); /** @method flags=delete */ -public static final native void Graphics_delete(long /*int*/ graphics); +public static final native void Graphics_delete(long graphics); /** * @method flags=cpp * @param graphics cast=(Graphics *) * @param pen cast=(Pen *) */ -public static final native int Graphics_DrawArc(long /*int*/ graphics, long /*int*/ pen, int x, int y, int width, int height, float startAngle, float sweepAngle); +public static final native int Graphics_DrawArc(long graphics, long pen, int x, int y, int width, int height, float startAngle, float sweepAngle); /** * @method flags=cpp * @param graphics cast=(Graphics *) @@ -326,7 +326,7 @@ public static final native int Graphics_DrawArc(long /*int*/ graphics, long /*in * @param positions cast=(const PointF *) * @param matrix cast=(const Matrix *) */ -public static final native int Graphics_DrawDriverString(long /*int*/ graphics, long /*int*/ text, int length, long /*int*/ font, long /*int*/ brush, PointF /*long*/ positions, int flags, long /*int*/ matrix); +public static final native int Graphics_DrawDriverString(long graphics, long text, int length, long font, long brush, PointF /*long*/ positions, int flags, long matrix); /** * @method flags=cpp * @param graphics cast=(Graphics *) @@ -336,13 +336,13 @@ public static final native int Graphics_DrawDriverString(long /*int*/ graphics, * @param positions cast=(const PointF *),flags=no_out * @param matrix cast=(const Matrix *) */ -public static final native int Graphics_DrawDriverString(long /*int*/ graphics, long /*int*/ text, int length, long /*int*/ font, long /*int*/ brush, float[] positions, int flags, long /*int*/ matrix); +public static final native int Graphics_DrawDriverString(long graphics, long text, int length, long font, long brush, float[] positions, int flags, long matrix); /** * @method flags=cpp * @param graphics cast=(Graphics *) * @param pen cast=(Pen *) */ -public static final native int Graphics_DrawEllipse(long /*int*/ graphics, long /*int*/ pen, int x, int y, int width, int height); +public static final native int Graphics_DrawEllipse(long graphics, long pen, int x, int y, int width, int height); /** * @method flags=cpp * @param graphics cast=(Graphics *) @@ -350,7 +350,7 @@ public static final native int Graphics_DrawEllipse(long /*int*/ graphics, long * @param x cast=(INT) * @param y cast=(INT) */ -public static final native int Graphics_DrawImage(long /*int*/ graphics, long /*int*/ image, int x, int y); +public static final native int Graphics_DrawImage(long graphics, long image, int x, int y); /** * @method flags=cpp * @param graphics cast=(Graphics *) @@ -365,13 +365,13 @@ public static final native int Graphics_DrawImage(long /*int*/ graphics, long /* * @param callback cast=(DrawImageAbort) * @param callbackData cast=(VOID *) */ -public static final native int Graphics_DrawImage(long /*int*/ graphics, long /*int*/ image, Rect destRect, int srcx, int srcy, int srcwidth, int srcheight, int srcUnit, long /*int*/ imageAttributes, long /*int*/ callback, long /*int*/ callbackData); +public static final native int Graphics_DrawImage(long graphics, long image, Rect destRect, int srcx, int srcy, int srcwidth, int srcheight, int srcUnit, long imageAttributes, long callback, long callbackData); /** * @method flags=cpp * @param graphics cast=(Graphics *) * @param pen cast=(Pen *) */ -public static final native int Graphics_DrawLine(long /*int*/ graphics, long /*int*/ pen, int x1, int y1, int x2, int y2); +public static final native int Graphics_DrawLine(long graphics, long pen, int x1, int y1, int x2, int y2); /** * @method flags=cpp * @param graphics cast=(Graphics *) @@ -379,14 +379,14 @@ public static final native int Graphics_DrawLine(long /*int*/ graphics, long /*i * @param points cast=(const Point *),flags=no_out * @param count cast=(INT) */ -public static final native int Graphics_DrawLines(long /*int*/ graphics, long /*int*/ pen, int[] points, int count); +public static final native int Graphics_DrawLines(long graphics, long pen, int[] points, int count); /** * @method flags=cpp * @param graphics cast=(Graphics *) * @param pen cast=(Pen *) * @param path cast=(GraphicsPath *) */ -public static final native int Graphics_DrawPath(long /*int*/ graphics, long /*int*/ pen, long /*int*/ path); +public static final native int Graphics_DrawPath(long graphics, long pen, long path); /** * @method flags=cpp * @param graphics cast=(Graphics *) @@ -394,13 +394,13 @@ public static final native int Graphics_DrawPath(long /*int*/ graphics, long /*i * @param points cast=(Point *) * @param count cast=(INT) */ -public static final native int Graphics_DrawPolygon(long /*int*/ graphics, long /*int*/ pen, int[] points, int count); +public static final native int Graphics_DrawPolygon(long graphics, long pen, int[] points, int count); /** * @method flags=cpp * @param graphics cast=(Graphics *) * @param pen cast=(Pen *) */ -public static final native int Graphics_DrawRectangle(long /*int*/ graphics, long /*int*/ pen, int x, int y, int width, int height); +public static final native int Graphics_DrawRectangle(long graphics, long pen, int x, int y, int width, int height); /** * @method flags=cpp * @param graphics cast=(Graphics *) @@ -410,7 +410,7 @@ public static final native int Graphics_DrawRectangle(long /*int*/ graphics, lon * @param origin flags=struct * @param brush cast=(Brush *) */ -public static final native int Graphics_DrawString(long /*int*/ graphics, char[] string, int length, long /*int*/ font, PointF origin, long /*int*/ brush); +public static final native int Graphics_DrawString(long graphics, char[] string, int length, long font, PointF origin, long brush); /** * @method flags=cpp * @param graphics cast=(Graphics *) @@ -421,7 +421,7 @@ public static final native int Graphics_DrawString(long /*int*/ graphics, char[] * @param format cast=(StringFormat *) * @param brush cast=(Brush *) */ -public static final native int Graphics_DrawString(long /*int*/ graphics, char[] string, int length, long /*int*/ font, PointF origin, long /*int*/ format, long /*int*/ brush); +public static final native int Graphics_DrawString(long graphics, char[] string, int length, long font, PointF origin, long format, long brush); /** * @method flags=cpp * @param graphics cast=(Graphics *) @@ -431,20 +431,20 @@ public static final native int Graphics_DrawString(long /*int*/ graphics, char[] * @param width cast=(INT) * @param height cast=(INT) */ -public static final native int Graphics_FillEllipse(long /*int*/ graphics, long /*int*/ brush, int x, int y, int width, int height); +public static final native int Graphics_FillEllipse(long graphics, long brush, int x, int y, int width, int height); /** * @method flags=cpp * @param graphics cast=(Graphics *) * @param brush cast=(Brush *) * @param path cast=(GraphicsPath *) */ -public static final native int Graphics_FillPath(long /*int*/ graphics, long /*int*/ brush, long /*int*/ path); +public static final native int Graphics_FillPath(long graphics, long brush, long path); /** * @method flags=cpp * @param graphics cast=(Graphics *) * @param intention cast=(FlushIntention) */ -public static final native void Graphics_Flush(long /*int*/ graphics, int intention); +public static final native void Graphics_Flush(long graphics, int intention); /** * @method flags=cpp * @param graphics cast=(Graphics *) @@ -456,7 +456,7 @@ public static final native void Graphics_Flush(long /*int*/ graphics, int intent * @param startAngle cast=(REAL) * @param sweepAngle cast=(REAL) */ -public static final native int Graphics_FillPie(long /*int*/ graphics, long /*int*/ brush, int x, int y, int width, int height, float startAngle, float sweepAngle); +public static final native int Graphics_FillPie(long graphics, long brush, int x, int y, int width, int height, float startAngle, float sweepAngle); /** * @method flags=cpp * @param graphics cast=(Graphics *) @@ -465,7 +465,7 @@ public static final native int Graphics_FillPie(long /*int*/ graphics, long /*in * @param count cast=(INT) * @param fillMode cast=(FillMode) */ -public static final native int Graphics_FillPolygon(long /*int*/ graphics, long /*int*/ brush, int[] points, int count, int fillMode); +public static final native int Graphics_FillPolygon(long graphics, long brush, int[] points, int count, int fillMode); /** * @method flags=cpp * @param graphics cast=(Graphics *) @@ -475,60 +475,60 @@ public static final native int Graphics_FillPolygon(long /*int*/ graphics, long * @param width cast=(INT) * @param height cast=(INT) */ -public static final native int Graphics_FillRectangle(long /*int*/ graphics, long /*int*/ brush, int x, int y, int width, int height); +public static final native int Graphics_FillRectangle(long graphics, long brush, int x, int y, int width, int height); /** * @method flags=cpp * @param graphics cast=(Graphics *) */ -public static final native int Graphics_GetClipBounds(long /*int*/ graphics, RectF rect); +public static final native int Graphics_GetClipBounds(long graphics, RectF rect); /** * @method flags=cpp * @param graphics cast=(Graphics *) */ -public static final native int Graphics_GetClipBounds(long /*int*/ graphics, Rect rect); +public static final native int Graphics_GetClipBounds(long graphics, Rect rect); /** * @method flags=cpp * @param graphics cast=(Graphics *) * @param region cast=(Region *) */ -public static final native int Graphics_GetClip(long /*int*/ graphics, long /*int*/ region); +public static final native int Graphics_GetClip(long graphics, long region); /** * @method flags=cpp * @param graphics cast=(Graphics *) */ -public static final native long /*int*/ Graphics_GetHDC(long /*int*/ graphics); +public static final native long Graphics_GetHDC(long graphics); /** * @method flags=cpp * @param graphics cast=(Graphics *) * @param hdc cast=(HDC) */ -public static final native void Graphics_ReleaseHDC(long /*int*/ graphics, long /*int*/ hdc); +public static final native void Graphics_ReleaseHDC(long graphics, long hdc); /** * @method flags=cpp * @param graphics cast=(Graphics *) */ -public static final native int Graphics_GetInterpolationMode(long /*int*/ graphics); +public static final native int Graphics_GetInterpolationMode(long graphics); /** * @method flags=cpp * @param graphics cast=(Graphics *) */ -public static final native int Graphics_GetSmoothingMode(long /*int*/ graphics); +public static final native int Graphics_GetSmoothingMode(long graphics); /** * @method flags=cpp * @param graphics cast=(Graphics *) */ -public static final native int Graphics_GetTextRenderingHint(long /*int*/ graphics); +public static final native int Graphics_GetTextRenderingHint(long graphics); /** * @method flags=cpp * @param graphics cast=(Graphics *) * @param matrix cast=(Matrix *) */ -public static final native int Graphics_GetTransform(long /*int*/ graphics, long /*int*/ matrix); +public static final native int Graphics_GetTransform(long graphics, long matrix); /** * @method flags=cpp * @param graphics cast=(Graphics *) */ -public static final native int Graphics_GetVisibleClipBounds(long /*int*/ graphics, Rect rect); +public static final native int Graphics_GetVisibleClipBounds(long graphics, Rect rect); /** * @method flags=cpp * @param graphics cast=(Graphics *) @@ -537,7 +537,7 @@ public static final native int Graphics_GetVisibleClipBounds(long /*int*/ graphi * @param positions cast=(const PointF *),flags=no_out * @param matrix cast=(const Matrix *) */ -public static final native int Graphics_MeasureDriverString(long /*int*/ graphics, long /*int*/ text, int length, long /*int*/ font, float[] positions, int flags, long /*int*/ matrix, RectF boundingBox); +public static final native int Graphics_MeasureDriverString(long graphics, long text, int length, long font, float[] positions, int flags, long matrix, RectF boundingBox); /** * @method flags=cpp * @param graphics cast=(Graphics *) @@ -547,7 +547,7 @@ public static final native int Graphics_MeasureDriverString(long /*int*/ graphic * @param origin cast=(const PointF *),flags=struct * @param boundingBox cast=(RectF *) */ -public static final native int Graphics_MeasureString(long /*int*/ graphics, char[] string, int length, long /*int*/ font, PointF origin, RectF boundingBox); +public static final native int Graphics_MeasureString(long graphics, char[] string, int length, long font, PointF origin, RectF boundingBox); /** * @method flags=cpp * @param graphics cast=(Graphics *) @@ -557,118 +557,118 @@ public static final native int Graphics_MeasureString(long /*int*/ graphics, cha * @param origin cast=(const PointF *),flags=struct * @param format cast=(StringFormat *) */ -public static final native int Graphics_MeasureString(long /*int*/ graphics, char[] string, int length, long /*int*/ font, PointF origin, long /*int*/ format, RectF boundingBox); +public static final native int Graphics_MeasureString(long graphics, char[] string, int length, long font, PointF origin, long format, RectF boundingBox); /** * @method flags=cpp * @param graphics cast=(Graphics *) */ -public static final native int Graphics_ResetClip(long /*int*/ graphics); +public static final native int Graphics_ResetClip(long graphics); /** * @method flags=cpp * @param graphics cast=(Graphics *) * @param gstate cast=(GraphicsState) */ -public static final native int Graphics_Restore(long /*int*/ graphics, int gstate); +public static final native int Graphics_Restore(long graphics, int gstate); /** * @method flags=cpp * @param graphics cast=(Graphics *) */ -public static final native int Graphics_Save(long /*int*/ graphics); +public static final native int Graphics_Save(long graphics); /** * @method flags=cpp * @param graphics cast=(Graphics *) * @param order cast=(MatrixOrder) */ -public static final native int Graphics_ScaleTransform(long /*int*/ graphics, float sx, float sy, int order); +public static final native int Graphics_ScaleTransform(long graphics, float sx, float sy, int order); /** * @method flags=cpp * @param graphics cast=(Graphics *) * @param hrgn cast=(Region *) * @param combineMode cast=(CombineMode) */ -public static final native int Graphics_SetClip(long /*int*/ graphics, long /*int*/ hrgn, int combineMode); +public static final native int Graphics_SetClip(long graphics, long hrgn, int combineMode); /** * @method flags=cpp * @param graphics cast=(Graphics *) * @param rect cast=(Rect *),flags=struct * @param combineMode cast=(CombineMode) */ -public static final native int Graphics_SetClip(long /*int*/ graphics, Rect rect, int combineMode); +public static final native int Graphics_SetClip(long graphics, Rect rect, int combineMode); /** * @method accessor=SetClip,flags=cpp * @param graphics cast=(Graphics *) * @param path cast=(GraphicsPath *) */ -public static final native int Graphics_SetClipPath(long /*int*/ graphics, long /*int*/ path); +public static final native int Graphics_SetClipPath(long graphics, long path); /** * @method accessor=SetClip,flags=cpp * @param graphics cast=(Graphics *) * @param path cast=(GraphicsPath *) * @param combineMode cast=(CombineMode) */ -public static final native int Graphics_SetClipPath(long /*int*/ graphics, long /*int*/ path, int combineMode); +public static final native int Graphics_SetClipPath(long graphics, long path, int combineMode); /** * @method flags=cpp * @param graphics cast=(Graphics *) * @param compositingQuality cast=(CompositingQuality) */ -public static final native int Graphics_SetCompositingQuality(long /*int*/ graphics, int compositingQuality); +public static final native int Graphics_SetCompositingQuality(long graphics, int compositingQuality); /** * @method flags=cpp * @param graphics cast=(Graphics *) * @param unit cast=(Unit) */ -public static final native int Graphics_SetPageUnit(long /*int*/ graphics, int unit); +public static final native int Graphics_SetPageUnit(long graphics, int unit); /** * @method flags=cpp * @param graphics cast=(Graphics *) * @param pixelOffsetMode cast=(PixelOffsetMode) */ -public static final native int Graphics_SetPixelOffsetMode(long /*int*/ graphics, int pixelOffsetMode); +public static final native int Graphics_SetPixelOffsetMode(long graphics, int pixelOffsetMode); /** * @method flags=cpp * @param graphics cast=(Graphics *) * @param smoothingMode cast=(SmoothingMode) */ -public static final native int Graphics_SetSmoothingMode(long /*int*/ graphics, int smoothingMode); +public static final native int Graphics_SetSmoothingMode(long graphics, int smoothingMode); /** * @method flags=cpp * @param graphics cast=(Graphics *) * @param matrix cast=(Matrix *) */ -public static final native int Graphics_SetTransform(long /*int*/ graphics, long /*int*/ matrix); +public static final native int Graphics_SetTransform(long graphics, long matrix); /** * @method flags=cpp * @param graphics cast=(Graphics *) * @param mode cast=(InterpolationMode) */ -public static final native int Graphics_SetInterpolationMode(long /*int*/ graphics, int mode); +public static final native int Graphics_SetInterpolationMode(long graphics, int mode); /** * @method flags=cpp * @param graphics cast=(Graphics *) * @param mode cast=(TextRenderingHint) */ -public static final native int Graphics_SetTextRenderingHint(long /*int*/ graphics, int mode); +public static final native int Graphics_SetTextRenderingHint(long graphics, int mode); /** * @method flags=cpp * @param graphics cast=(Graphics *) * @param order cast=(MatrixOrder) */ -public static final native int Graphics_TranslateTransform(long /*int*/ graphics, float dx, float dy, int order); +public static final native int Graphics_TranslateTransform(long graphics, float dx, float dy, int order); /** * @method flags=new * @param fillMode cast=(FillMode) */ -public static final native long /*int*/ GraphicsPath_new(int fillMode); +public static final native long GraphicsPath_new(int fillMode); /** * @method flags=new * @param points cast=(const Point *),flags=no_out * @param types cast=(const BYTE *),flags=no_out * @param fillMode cast=(FillMode) */ -public static final native long /*int*/ GraphicsPath_new(int[] points, byte[] types, int count, int fillMode); +public static final native long GraphicsPath_new(int[] points, byte[] types, int count, int fillMode); /** @method flags=delete */ -public static final native void GraphicsPath_delete(long /*int*/ path); +public static final native void GraphicsPath_delete(long path); /** * @method flags=cpp * @param path cast=(GraphicsPath *) @@ -679,7 +679,7 @@ public static final native void GraphicsPath_delete(long /*int*/ path); * @param startAngle cast=(REAL) * @param sweepAngle cast=(REAL) */ -public static final native int GraphicsPath_AddArc(long /*int*/ path, float x, float y, float width, float height, float startAngle, float sweepAngle); +public static final native int GraphicsPath_AddArc(long path, float x, float y, float width, float height, float startAngle, float sweepAngle); /** * @method flags=cpp * @param path cast=(GraphicsPath *) @@ -692,7 +692,7 @@ public static final native int GraphicsPath_AddArc(long /*int*/ path, float x, f * @param x4 cast=(REAL) * @param y4 cast=(REAL) */ -public static final native int GraphicsPath_AddBezier(long /*int*/ path, float x1, float y1, float x2, float y2, float x3, float y3, float x4, float y4); +public static final native int GraphicsPath_AddBezier(long path, float x1, float y1, float x2, float y2, float x3, float y3, float x4, float y4); /** * @method flags=cpp * @param path cast=(GraphicsPath *) @@ -701,20 +701,20 @@ public static final native int GraphicsPath_AddBezier(long /*int*/ path, float x * @param x2 cast=(REAL) * @param y2 cast=(REAL) */ -public static final native int GraphicsPath_AddLine(long /*int*/ path, float x1, float y1, float x2, float y2); +public static final native int GraphicsPath_AddLine(long path, float x1, float y1, float x2, float y2); /** * @method flags=cpp * @param path cast=(GraphicsPath *) * @param addingPath cast=(GraphicsPath *) * @param connect cast=(BOOL) */ -public static final native int GraphicsPath_AddPath(long /*int*/ path, long /*int*/ addingPath, boolean connect); +public static final native int GraphicsPath_AddPath(long path, long addingPath, boolean connect); /** * @method flags=cpp * @param path cast=(GraphicsPath *) * @param rect flags=struct */ -public static final native int GraphicsPath_AddRectangle(long /*int*/ path, RectF rect); +public static final native int GraphicsPath_AddRectangle(long path, RectF rect); /** * @method flags=cpp * @param path cast=(GraphicsPath *) @@ -726,131 +726,131 @@ public static final native int GraphicsPath_AddRectangle(long /*int*/ path, Rect * @param origin cast=(const PointF *),flags=struct * @param format cast=(const StringFormat *) */ -public static final native int GraphicsPath_AddString(long /*int*/ path, char[] string, int length, long /*int*/ family, int style, float emSize, PointF origin, long /*int*/ format); +public static final native int GraphicsPath_AddString(long path, char[] string, int length, long family, int style, float emSize, PointF origin, long format); /** * @method flags=cpp * @param path cast=(GraphicsPath *) */ -public static final native int GraphicsPath_CloseFigure(long /*int*/ path); +public static final native int GraphicsPath_CloseFigure(long path); /** * @method flags=cpp * @param path cast=(GraphicsPath *) */ -public static final native long /*int*/ GraphicsPath_Clone(long /*int*/ path); +public static final native long GraphicsPath_Clone(long path); /** * @method flags=cpp * @param path cast=(GraphicsPath *) * @param matrix cast=(Matrix *) */ -public static final native int GraphicsPath_Flatten(long /*int*/ path, long /*int*/ matrix, float flatness); +public static final native int GraphicsPath_Flatten(long path, long matrix, float flatness); /** * @method flags=cpp * @param path cast=(GraphicsPath *) * @param matrix cast=(Matrix *) * @param pen cast=(Pen *) */ -public static final native int GraphicsPath_GetBounds(long /*int*/ path, RectF bounds, long /*int*/ matrix, long /*int*/ pen); +public static final native int GraphicsPath_GetBounds(long path, RectF bounds, long matrix, long pen); /** * @method flags=cpp * @param path cast=(GraphicsPath *) * @param lastPoint cast=(PointF *) */ -public static final native int GraphicsPath_GetLastPoint(long /*int*/ path, PointF lastPoint); +public static final native int GraphicsPath_GetLastPoint(long path, PointF lastPoint); /** * @method flags=cpp * @param path cast=(GraphicsPath *) * @param points cast=(PointF *) */ -public static final native int GraphicsPath_GetPathPoints(long /*int*/ path, float[] points, int count); +public static final native int GraphicsPath_GetPathPoints(long path, float[] points, int count); /** * @method flags=cpp * @param path cast=(GraphicsPath *) * @param types cast=(BYTE *) */ -public static final native int GraphicsPath_GetPathTypes(long /*int*/ path, byte[] types, int count); +public static final native int GraphicsPath_GetPathTypes(long path, byte[] types, int count); /** * @method flags=cpp * @param path cast=(GraphicsPath *) */ -public static final native int GraphicsPath_GetPointCount(long /*int*/ path); +public static final native int GraphicsPath_GetPointCount(long path); /** * @method flags=cpp * @param path cast=(GraphicsPath *) * @param pen cast=(const Pen *) * @param g cast=(const Graphics *) */ -public static final native boolean GraphicsPath_IsOutlineVisible(long /*int*/ path, float x, float y, long /*int*/ pen, long /*int*/ g); +public static final native boolean GraphicsPath_IsOutlineVisible(long path, float x, float y, long pen, long g); /** * @method flags=cpp * @param path cast=(GraphicsPath *) * @param g cast=(const Graphics *) */ -public static final native boolean GraphicsPath_IsVisible(long /*int*/ path, float x, float y, long /*int*/ g); +public static final native boolean GraphicsPath_IsVisible(long path, float x, float y, long g); /** * @method flags=cpp * @param path cast=(GraphicsPath *) * @param fillmode cast=(FillMode) */ -public static final native int GraphicsPath_SetFillMode(long /*int*/ path, int fillmode); +public static final native int GraphicsPath_SetFillMode(long path, int fillmode); /** * @method flags=cpp * @param path cast=(GraphicsPath *) */ -public static final native int GraphicsPath_StartFigure(long /*int*/ path); +public static final native int GraphicsPath_StartFigure(long path); /** * @method flags=cpp * @param path cast=(GraphicsPath *) * @param matrix cast=(Matrix *) */ -public static final native int GraphicsPath_Transform(long /*int*/ path, long /*int*/ matrix); +public static final native int GraphicsPath_Transform(long path, long matrix); /** * @method flags=new * @param hatchStyle cast=(HatchStyle) * @param foreColor cast=(Color) * @param backColor cast=(Color) */ -public static final native long /*int*/ HatchBrush_new(int hatchStyle, int foreColor, int backColor); +public static final native long HatchBrush_new(int hatchStyle, int foreColor, int backColor); /** * @method flags=cpp * @param image cast=(Image*) */ -public static final native int Image_GetLastStatus(long /*int*/ image); +public static final native int Image_GetLastStatus(long image); /** * @method flags=cpp * @param image cast=(Image*) */ -public static final native int Image_GetPixelFormat(long /*int*/ image); +public static final native int Image_GetPixelFormat(long image); /** * @method flags=cpp * @param image cast=(Image *) */ -public static final native int Image_GetWidth(long /*int*/ image); +public static final native int Image_GetWidth(long image); /** * @method flags=cpp * @param image cast=(Image *) */ -public static final native int Image_GetHeight(long /*int*/ image); +public static final native int Image_GetHeight(long image); /** * @method flags=cpp * @param image cast=(Image*) * @param palette cast=(ColorPalette*) */ -public static final native int Image_GetPalette(long /*int*/ image, long /*int*/ palette, int size); +public static final native int Image_GetPalette(long image, long palette, int size); /** * @method flags=cpp * @param image cast=(Image*) */ -public static final native int Image_GetPaletteSize(long /*int*/ image); +public static final native int Image_GetPaletteSize(long image); /** @method flags=new */ -public static final native long /*int*/ ImageAttributes_new(); +public static final native long ImageAttributes_new(); /** @method flags=delete */ -public static final native void ImageAttributes_delete(long /*int*/ attrib); +public static final native void ImageAttributes_delete(long attrib); /** * @method flags=cpp * @param attrib cast=(ImageAttributes *) * @param wrap cast=(WrapMode) */ -public static final native int ImageAttributes_SetWrapMode(long /*int*/ attrib, int wrap); +public static final native int ImageAttributes_SetWrapMode(long attrib, int wrap); /** * @method flags=cpp * @param attrib cast=(ImageAttributes *) @@ -858,9 +858,9 @@ public static final native int ImageAttributes_SetWrapMode(long /*int*/ attrib, * @param mode cast=(ColorMatrixFlags) * @param type cast=(ColorAdjustType) */ -public static final native int ImageAttributes_SetColorMatrix(long /*int*/ attrib, float[] matrix, int mode, int type); +public static final native int ImageAttributes_SetColorMatrix(long attrib, float[] matrix, int mode, int type); /** @method flags=delete */ -public static final native void HatchBrush_delete(long /*int*/ brush); +public static final native void HatchBrush_delete(long brush); /** * @method flags=new * @param point1 flags=struct @@ -868,39 +868,39 @@ public static final native void HatchBrush_delete(long /*int*/ brush); * @param color1 cast=(Color) * @param color2 cast=(Color) */ -public static final native long /*int*/ LinearGradientBrush_new(PointF point1, PointF point2, int color1, int color2); +public static final native long LinearGradientBrush_new(PointF point1, PointF point2, int color1, int color2); /** @method flags=delete */ -public static final native void LinearGradientBrush_delete(long /*int*/ brush); +public static final native void LinearGradientBrush_delete(long brush); /** * @method flags=cpp * @param brush cast=(LinearGradientBrush *) * @param presetColors cast=(const Color *),flags=no_out * @param blendPositions cast=(const REAL *),flags=no_out */ -public static final native int LinearGradientBrush_SetInterpolationColors(long /*int*/ brush, int [] presetColors, float[] blendPositions, int count); +public static final native int LinearGradientBrush_SetInterpolationColors(long brush, int [] presetColors, float[] blendPositions, int count); /** * @method flags=cpp * @param brush cast=(LinearGradientBrush *) * @param wrapMode cast=(WrapMode) */ -public static final native int LinearGradientBrush_SetWrapMode(long /*int*/ brush, int wrapMode); +public static final native int LinearGradientBrush_SetWrapMode(long brush, int wrapMode); /** * @method flags=cpp * @param brush cast=(LinearGradientBrush *) */ -public static final native int LinearGradientBrush_ResetTransform(long /*int*/ brush); +public static final native int LinearGradientBrush_ResetTransform(long brush); /** * @method flags=cpp * @param brush cast=(LinearGradientBrush *) * @param order cast=(MatrixOrder) */ -public static final native int LinearGradientBrush_ScaleTransform(long /*int*/ brush, float sx, float sy, int order); +public static final native int LinearGradientBrush_ScaleTransform(long brush, float sx, float sy, int order); /** * @method flags=cpp * @param brush cast=(LinearGradientBrush *) * @param order cast=(MatrixOrder) */ -public static final native int LinearGradientBrush_TranslateTransform(long /*int*/ brush, float dx, float dy, int order); +public static final native int LinearGradientBrush_TranslateTransform(long brush, float dx, float dy, int order); /** * @method flags=new * @param m11 cast=(REAL) @@ -910,39 +910,39 @@ public static final native int LinearGradientBrush_TranslateTransform(long /*int * @param dx cast=(REAL) * @param dy cast=(REAL) */ -public static final native long /*int*/ Matrix_new(float m11, float m12, float m21, float m22, float dx, float dy); +public static final native long Matrix_new(float m11, float m12, float m21, float m22, float dx, float dy); /** @method flags=delete */ -public static final native void Matrix_delete(long /*int*/ matrix); +public static final native void Matrix_delete(long matrix); /** * @method flags=cpp * @param matrix cast=(Matrix *) * @param m cast=(REAL *) */ -public static final native int Matrix_GetElements(long /*int*/ matrix, float[] m); +public static final native int Matrix_GetElements(long matrix, float[] m); /** * @method flags=cpp * @param matrix cast=(Matrix *) */ -public static final native int Matrix_Invert(long /*int*/ matrix); +public static final native int Matrix_Invert(long matrix); /** * @method flags=cpp * @param matrix cast=(Matrix *) */ -public static final native boolean Matrix_IsIdentity(long /*int*/ matrix); +public static final native boolean Matrix_IsIdentity(long matrix); /** * @method flags=cpp * @param matrix cast=(Matrix *) * @param matrix1 cast=(Matrix *) * @param order cast=(MatrixOrder) */ -public static final native int Matrix_Multiply(long /*int*/ matrix, long /*int*/ matrix1, int order); +public static final native int Matrix_Multiply(long matrix, long matrix1, int order); /** * @method flags=cpp * @param matrix cast=(Matrix *) * @param angle cast=(REAL) * @param order cast=(MatrixOrder) */ -public static final native int Matrix_Rotate(long /*int*/ matrix, float angle, int order); +public static final native int Matrix_Rotate(long matrix, float angle, int order); /** * @method flags=cpp * @param matrix cast=(Matrix *) @@ -950,7 +950,7 @@ public static final native int Matrix_Rotate(long /*int*/ matrix, float angle, i * @param scaleY cast=(REAL) * @param order cast=(MatrixOrder) */ -public static final native int Matrix_Scale(long /*int*/ matrix, float scaleX, float scaleY, int order); +public static final native int Matrix_Scale(long matrix, float scaleX, float scaleY, int order); /** * @method flags=cpp * @param matrix cast=(Matrix *) @@ -958,23 +958,23 @@ public static final native int Matrix_Scale(long /*int*/ matrix, float scaleX, f * @param shearY cast=(REAL) * @param order cast=(MatrixOrder) */ -public static final native int Matrix_Shear(long /*int*/ matrix, float shearX, float shearY, int order); +public static final native int Matrix_Shear(long matrix, float shearX, float shearY, int order); /** * @method flags=cpp * @param matrix cast=(Matrix *) */ -public static final native int Matrix_TransformPoints(long /*int*/ matrix, PointF pts, int count); +public static final native int Matrix_TransformPoints(long matrix, PointF pts, int count); /** * @method flags=cpp * @param matrix cast=(Matrix *) * @param pts cast=(PointF *) */ -public static final native int Matrix_TransformPoints(long /*int*/ matrix, float[] pts, int count); +public static final native int Matrix_TransformPoints(long matrix, float[] pts, int count); /** * @method flags=cpp * @param matrix cast=(Matrix *) */ -public static final native int Matrix_TransformVectors(long /*int*/ matrix, PointF pts, int count); +public static final native int Matrix_TransformVectors(long matrix, PointF pts, int count); /** * @method flags=cpp * @param matrix cast=(Matrix *) @@ -982,7 +982,7 @@ public static final native int Matrix_TransformVectors(long /*int*/ matrix, Poin * @param offsetY cast=(REAL) * @param order cast=(MatrixOrder) */ -public static final native int Matrix_Translate(long /*int*/ matrix, float offsetX, float offsetY, int order); +public static final native int Matrix_Translate(long matrix, float offsetX, float offsetY, int order); /** * @method flags=cpp * @param matrix cast=(Matrix *) @@ -993,99 +993,99 @@ public static final native int Matrix_Translate(long /*int*/ matrix, float offse * @param dx cast=(REAL) * @param dy cast=(REAL) */ -public static final native int Matrix_SetElements(long /*int*/ matrix, float m11, float m12, float m21, float m22, float dx, float dy); +public static final native int Matrix_SetElements(long matrix, float m11, float m12, float m21, float m22, float dx, float dy); /** * @param Destination cast=(PVOID) * @param SourcePtr cast=(CONST VOID*) */ -public static final native void MoveMemory(ColorPalette Destination, long /*int*/ SourcePtr, int Length); +public static final native void MoveMemory(ColorPalette Destination, long SourcePtr, int Length); /** * @param Destination cast=(PVOID) * @param SourcePtr cast=(CONST VOID*) */ -public static final native void MoveMemory(BitmapData Destination, long /*int*/ SourcePtr); +public static final native void MoveMemory(BitmapData Destination, long SourcePtr); /** * @method flags=new * @param path cast=(GraphicsPath *) */ -public static final native long /*int*/ PathGradientBrush_new(long /*int*/ path); +public static final native long PathGradientBrush_new(long path); /** @method flags=delete */ -public static final native void PathGradientBrush_delete(long /*int*/ brush); +public static final native void PathGradientBrush_delete(long brush); /** * @method flags=cpp * @param brush cast=(PathGradientBrush *) * @param color cast=(Color) */ -public static final native int PathGradientBrush_SetCenterColor(long /*int*/ brush, int color); +public static final native int PathGradientBrush_SetCenterColor(long brush, int color); /** * @method flags=cpp * @param brush cast=(PathGradientBrush *) * @param pt flags=struct */ -public static final native int PathGradientBrush_SetCenterPoint(long /*int*/ brush, PointF pt); +public static final native int PathGradientBrush_SetCenterPoint(long brush, PointF pt); /** * @method flags=cpp * @param brush cast=(PathGradientBrush *) * @param presetColors cast=(const Color *),flags=no_out * @param blendPositions cast=(const REAL *),flags=no_out */ -public static final native int PathGradientBrush_SetInterpolationColors(long /*int*/ brush, int [] presetColors, float[] blendPositions, int count); +public static final native int PathGradientBrush_SetInterpolationColors(long brush, int [] presetColors, float[] blendPositions, int count); /** * @method flags=cpp * @param brush cast=(PathGradientBrush *) * @param colors cast=(const Color *),flags=no_out * @param count cast=(INT *) */ -public static final native int PathGradientBrush_SetSurroundColors(long /*int*/ brush, int [] colors, int[] count); +public static final native int PathGradientBrush_SetSurroundColors(long brush, int [] colors, int[] count); /** * @method flags=cpp * @param brush cast=(PathGradientBrush *) * @param path cast=(GraphicsPath *) */ -public static final native int PathGradientBrush_SetGraphicsPath(long /*int*/ brush, long /*int*/ path); +public static final native int PathGradientBrush_SetGraphicsPath(long brush, long path); /** * @method flags=cpp * @param brush cast=(PathGradientBrush *) * @param wrapMode cast=(WrapMode) */ -public static final native int PathGradientBrush_SetWrapMode(long /*int*/ brush, int wrapMode); +public static final native int PathGradientBrush_SetWrapMode(long brush, int wrapMode); /** * @method flags=new * @param brush cast=(Brush *) * @param width cast=(REAL) */ -public static final native long /*int*/ Pen_new(long /*int*/ brush, float width); +public static final native long Pen_new(long brush, float width); /** @method flags=delete */ -public static final native void Pen_delete(long /*int*/ pen); +public static final native void Pen_delete(long pen); /** * @method flags=cpp * @param pen cast=(Pen *) */ -public static final native long /*int*/ Pen_GetBrush(long /*int*/ pen); +public static final native long Pen_GetBrush(long pen); /** * @method flags=cpp * @param pen cast=(Pen *) * @param brush cast=(Brush *) */ -public static final native int Pen_SetBrush(long /*int*/ pen, long /*int*/ brush); +public static final native int Pen_SetBrush(long pen, long brush); /** * @method flags=cpp * @param pen cast=(Pen *) */ -public static final native int Pen_SetDashOffset(long /*int*/ pen, float dashOffset); +public static final native int Pen_SetDashOffset(long pen, float dashOffset); /** * @method flags=cpp * @param pen cast=(Pen *) * @param dashArray cast=(REAL *) * @param count cast=(int) */ -public static final native int Pen_SetDashPattern(long /*int*/ pen, float[] dashArray, int count); +public static final native int Pen_SetDashPattern(long pen, float[] dashArray, int count); /** * @method flags=cpp * @param pen cast=(Pen *) * @param dashStyle cast=(DashStyle) */ -public static final native int Pen_SetDashStyle(long /*int*/ pen, int dashStyle); +public static final native int Pen_SetDashStyle(long pen, int dashStyle); /** * @method flags=cpp * @param pen cast=(Pen *) @@ -1093,123 +1093,123 @@ public static final native int Pen_SetDashStyle(long /*int*/ pen, int dashStyle) * @param endCap cast=(LineCap) * @param dashCap cast=(DashCap) */ -public static final native int Pen_SetLineCap(long /*int*/ pen, int startCap, int endCap, int dashCap); +public static final native int Pen_SetLineCap(long pen, int startCap, int endCap, int dashCap); /** * @method flags=cpp * @param pen cast=(Pen *) * @param lineJoin cast=(LineJoin) */ -public static final native int Pen_SetLineJoin(long /*int*/ pen, int lineJoin); +public static final native int Pen_SetLineJoin(long pen, int lineJoin); /** * @method flags=cpp * @param pen cast=(Pen *) */ -public static final native int Pen_SetMiterLimit(long /*int*/ pen, float miterLimit); +public static final native int Pen_SetMiterLimit(long pen, float miterLimit); /** * @method flags=cpp * @param pen cast=(Pen *) * @param width cast=(REAL) */ -public static final native int Pen_SetWidth(long /*int*/ pen, float width); +public static final native int Pen_SetWidth(long pen, float width); /** @method flags=new */ -public static final native long /*int*/ Point_new(int x, int y); +public static final native long Point_new(int x, int y); /** @method flags=delete */ -public static final native void Point_delete(long /*int*/ point); +public static final native void Point_delete(long point); /** * @method flags=new * @param hRgn cast=(HRGN) */ -public static final native long /*int*/ Region_new(long /*int*/ hRgn); +public static final native long Region_new(long hRgn); /** * @method flags=new * @param path cast=(GraphicsPath*) */ -public static final native long /*int*/ Region_newGraphicsPath(long /*int*/ path); +public static final native long Region_newGraphicsPath(long path); /** @method flags=new */ -public static final native long /*int*/ Region_new(); +public static final native long Region_new(); /** @method flags=delete */ -public static final native void Region_delete(long /*int*/ region); +public static final native void Region_delete(long region); /** * @method flags=cpp * @param region cast=(Region *) * @param graphics cast=(Graphics *) */ -public static final native long /*int*/ Region_GetHRGN(long /*int*/ region, long /*int*/ graphics); +public static final native long Region_GetHRGN(long region, long graphics); /** * @method flags=cpp * @param region cast=(Region *) * @param graphics cast=(Graphics *) */ -public static final native boolean Region_IsInfinite(long /*int*/ region, long /*int*/ graphics); +public static final native boolean Region_IsInfinite(long region, long graphics); /** * @method flags=new * @param color cast=(Color) */ -public static final native long /*int*/ SolidBrush_new(int color); +public static final native long SolidBrush_new(int color); /** @method flags=delete */ -public static final native void SolidBrush_delete(long /*int*/ brush); +public static final native void SolidBrush_delete(long brush); /** @method flags=delete */ -public static final native void StringFormat_delete(long /*int*/ format); +public static final native void StringFormat_delete(long format); /** * @method flags=cpp * @param format cast=(StringFormat *) */ -public static final native long /*int*/ StringFormat_Clone(long /*int*/ format); +public static final native long StringFormat_Clone(long format); /** @method accessor=StringFormat::GenericDefault */ -public static final native long /*int*/ StringFormat_GenericDefault(); +public static final native long StringFormat_GenericDefault(); /** @method accessor=StringFormat::GenericTypographic */ -public static final native long /*int*/ StringFormat_GenericTypographic(); +public static final native long StringFormat_GenericTypographic(); /** * @method flags=cpp * @param format cast=(StringFormat *) */ -public static final native int StringFormat_GetFormatFlags(long /*int*/ format); +public static final native int StringFormat_GetFormatFlags(long format); /** * @method flags=cpp * @param format cast=(StringFormat *) * @param hotkeyPrefix cast=(HotkeyPrefix) */ -public static final native int StringFormat_SetHotkeyPrefix(long /*int*/ format, int hotkeyPrefix); +public static final native int StringFormat_SetHotkeyPrefix(long format, int hotkeyPrefix); /** * @method flags=cpp * @param format cast=(StringFormat *) * @param flags cast=(StringFormatFlags) */ -public static final native int StringFormat_SetFormatFlags(long /*int*/ format, int flags); +public static final native int StringFormat_SetFormatFlags(long format, int flags); /** * @method flags=cpp * @param format cast=(StringFormat *) */ -public static final native int StringFormat_SetTabStops(long /*int*/ format, float firstTabOffset, int count, float[] tabStops); +public static final native int StringFormat_SetTabStops(long format, float firstTabOffset, int count, float[] tabStops); /** * @method flags=new * @param image cast=(Image *) * @param wrapMode cast=(WrapMode) */ -public static final native long /*int*/ TextureBrush_new(long /*int*/ image, int wrapMode, float dstX, float dstY, float dstWidth, float dstHeight); +public static final native long TextureBrush_new(long image, int wrapMode, float dstX, float dstY, float dstWidth, float dstHeight); /** @method flags=delete */ -public static final native void TextureBrush_delete(long /*int*/ brush); +public static final native void TextureBrush_delete(long brush); /** * @method flags=cpp * @param brush cast=(TextureBrush *) * @param matrix cast=(Matrix *) */ -public static final native int TextureBrush_SetTransform(long /*int*/ brush, long /*int*/ matrix); +public static final native int TextureBrush_SetTransform(long brush, long matrix); /** * @method flags=cpp * @param brush cast=(TextureBrush *) */ -public static final native int TextureBrush_ResetTransform(long /*int*/ brush); +public static final native int TextureBrush_ResetTransform(long brush); /** * @method flags=cpp * @param brush cast=(TextureBrush *) * @param order cast=(MatrixOrder) */ -public static final native int TextureBrush_ScaleTransform(long /*int*/ brush, float sx, float sy, int order); +public static final native int TextureBrush_ScaleTransform(long brush, float sx, float sy, int order); /** * @method flags=cpp * @param brush cast=(TextureBrush *) * @param order cast=(MatrixOrder) */ -public static final native int TextureBrush_TranslateTransform(long /*int*/ brush, float dx, float dy, int order); +public static final native int TextureBrush_TranslateTransform(long brush, float dx, float dy, int order); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/GdiplusStartupInput.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/GdiplusStartupInput.java index 427b7d599b..e9c782a31f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/GdiplusStartupInput.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/GdiplusStartupInput.java @@ -17,7 +17,7 @@ package org.eclipse.swt.internal.gdip; public class GdiplusStartupInput { public int GdiplusVersion; /** @field cast=(DebugEventProc) */ - public long /*int*/ DebugEventCallback; + public long DebugEventCallback; /** @field cast=(BOOL) */ public boolean SuppressBackgroundThread; /** @field cast=(BOOL) */ diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/CAUUID.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/CAUUID.java index 70ae9d51bd..11b964578f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/CAUUID.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/CAUUID.java @@ -16,6 +16,6 @@ package org.eclipse.swt.internal.ole.win32; public final class CAUUID { public int cElems; /** @field cast=(GUID FAR *) */ - public long /*int*/ pElems; + public long pElems; public static final int sizeof = COM.CAUUID_sizeof (); } 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 d43b8f76dd..b99de1f8b6 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 @@ -445,25 +445,25 @@ public static final native int CLSIDFromString(char[] lpsz, GUID pclsid); * @param pUnkOuter cast=(LPUNKNOWN) * @param ppv cast=(LPVOID *) */ -public static final native int CoCreateInstance(GUID rclsid, long /*int*/ pUnkOuter, int dwClsContext, GUID riid, long /*int*/[] ppv); +public static final native int CoCreateInstance(GUID rclsid, long pUnkOuter, int dwClsContext, GUID riid, long[] ppv); public static final native void CoFreeUnusedLibraries(); /** * @param pServerInfo cast=(COSERVERINFO *) * @param ppv cast=(LPVOID *) */ -public static final native int CoGetClassObject(GUID rclsid, int dwClsContext, long /*int*/ pServerInfo, GUID riid, long /*int*/[] ppv); +public static final native int CoGetClassObject(GUID rclsid, int dwClsContext, long pServerInfo, GUID riid, long[] ppv); /** * @param pUnk cast=(IUnknown *) * @param fLock cast=(BOOL) * @param fLastUnlockReleases cast=(BOOL) */ -public static final native int CoLockObjectExternal(long /*int*/ pUnk, boolean fLock, boolean fLastUnlockReleases); +public static final native int CoLockObjectExternal(long pUnk, boolean fLock, boolean fLastUnlockReleases); /** * @param pDataObject cast=(IDataObject *) * @param pDropSource cast=(IDropSource *) * @param pdwEffect cast=(LPDWORD) */ -public static final native int DoDragDrop(long /*int*/ pDataObject, long /*int*/ pDropSource, int dwOKEffect, int[] pdwEffect); +public static final native int DoDragDrop(long pDataObject, long pDropSource, int dwOKEffect, int[] pdwEffect); /** @param szFileName cast=(LPCWSTR) */ public static final native int GetClassFile(char[] szFileName, GUID clsid); /** @param lpsz cast=(LPOLESTR) */ @@ -473,90 +473,90 @@ public static final native boolean IsEqualGUID(GUID rguid1, GUID rguid2); * @param Destination cast=(PVOID) * @param Source cast=(CONST VOID *),flags=no_out */ -public static final native void MoveMemory(long /*int*/ Destination, FORMATETC Source, int Length); +public static final native void MoveMemory(long Destination, FORMATETC Source, int Length); /** * @param DestinationPtr cast=(PVOID) * @param Source cast=(CONST VOID *),flags=no_out */ -public static final native void MoveMemory(long /*int*/ DestinationPtr, GUID Source, int Length); +public static final native void MoveMemory(long DestinationPtr, GUID Source, int Length); /** * @param DestinationPtr cast=(PVOID) * @param Source cast=(CONST VOID *),flags=no_out */ -public static final native void MoveMemory(long /*int*/ DestinationPtr, OLEINPLACEFRAMEINFO Source, int Length); +public static final native void MoveMemory(long DestinationPtr, OLEINPLACEFRAMEINFO Source, int Length); /** * @param Destination cast=(PVOID) * @param Source cast=(CONST VOID *),flags=no_out */ -public static final native void MoveMemory(long /*int*/ Destination, STATSTG Source, int Length); +public static final native void MoveMemory(long Destination, STATSTG Source, int Length); /** * @param Destination cast=(PVOID) * @param Source cast=(CONST VOID *),flags=no_out */ -public static final native void MoveMemory(long /*int*/ Destination, STGMEDIUM Source, int Length); +public static final native void MoveMemory(long Destination, STGMEDIUM Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param SourcePtr cast=(CONST VOID *) */ -public static final native void MoveMemory(STGMEDIUM Destination, long /*int*/ SourcePtr, int Length); +public static final native void MoveMemory(STGMEDIUM Destination, long SourcePtr, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param SourcePtr cast=(CONST VOID *) */ -public static final native void MoveMemory(DISPPARAMS Destination, long /*int*/ SourcePtr, int Length); +public static final native void MoveMemory(DISPPARAMS Destination, long SourcePtr, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param Source cast=(CONST VOID *) */ -public static final native void MoveMemory(FORMATETC Destination, long /*int*/ Source, int Length); +public static final native void MoveMemory(FORMATETC Destination, long Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param SourcePtr cast=(CONST VOID *) */ -public static final native void MoveMemory(GUID Destination, long /*int*/ SourcePtr, int Length); +public static final native void MoveMemory(GUID Destination, long SourcePtr, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param Source cast=(CONST VOID *) */ -public static final native void MoveMemory(STATSTG Destination, long /*int*/ Source, int Length); +public static final native void MoveMemory(STATSTG Destination, long Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param SourcePtr cast=(CONST VOID *) */ -public static final native void MoveMemory(TYPEATTR Destination, long /*int*/ SourcePtr, int Length); +public static final native void MoveMemory(TYPEATTR Destination, long SourcePtr, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param Source cast=(CONST VOID *) */ -public static final native void MoveMemory(RECT Destination, long /*int*/ Source, int Length); +public static final native void MoveMemory(RECT Destination, long Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param Source cast=(CONST VOID *) */ -public static final native void MoveMemory(FUNCDESC Destination, long /*int*/ Source, int Length); +public static final native void MoveMemory(FUNCDESC Destination, long Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param Source cast=(CONST VOID *) */ -public static final native void MoveMemory(VARDESC Destination, long /*int*/ Source, int Length); +public static final native void MoveMemory(VARDESC Destination, long Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param Source cast=(CONST VOID *) */ -public static final native void MoveMemory(VARIANT Destination, long /*int*/ Source, int Length); +public static final native void MoveMemory(VARIANT Destination, long Source, int Length); /** * @param pClientSite cast=(IOleClientSite *) * @param pStg cast=(IStorage *) * @param ppvObject cast=(void **) */ -public static final native int OleCreate(GUID rclsid, GUID riid, int renderopt, FORMATETC pFormatEtc, long /*int*/ pClientSite, long /*int*/ pStg, long /*int*/[] ppvObject); +public static final native int OleCreate(GUID rclsid, GUID riid, int renderopt, FORMATETC pFormatEtc, long pClientSite, long pStg, long[] ppvObject); /** * @param lpszFileName cast=(LPCOLESTR) * @param pClientSite cast=(LPOLECLIENTSITE) * @param pStg cast=(LPSTORAGE) * @param ppvObj cast=(LPVOID *) */ -public static final native int OleCreateFromFile(GUID rclsid, char[] lpszFileName, GUID riid, int renderopt, FORMATETC pFormatEtc, long /*int*/ pClientSite, long /*int*/ pStg, long /*int*/[] ppvObj); +public static final native int OleCreateFromFile(GUID rclsid, char[] lpszFileName, GUID riid, int renderopt, FORMATETC pFormatEtc, long pClientSite, long pStg, long[] ppvObj); /** * @param hwndOwner cast=(HWND) * @param lpszCaption cast=(LPCOLESTR) @@ -565,38 +565,38 @@ public static final native int OleCreateFromFile(GUID rclsid, char[] lpszFileNam * @param lcid cast=(LCID) * @param lpvReserved cast=(LPVOID) */ -public static final native int OleCreatePropertyFrame(long /*int*/ hwndOwner,int x, int y, char[] lpszCaption, int cObjects, long /*int*/[] lplpUnk, int cPages, long /*int*/ lpPageClsID, int lcid, int dwReserved, long /*int*/ lpvReserved); +public static final native int OleCreatePropertyFrame(long hwndOwner,int x, int y, char[] lpszCaption, int cObjects, long[] lplpUnk, int cPages, long lpPageClsID, int lcid, int dwReserved, long lpvReserved); /** * @param pUnk cast=(LPUNKNOWN) * @param dwAspect cast=(DWORD) * @param hdcDraw cast=(HDC) * @param lprcBounds cast=(LPRECT) */ -public static final native int OleDraw(long /*int*/ pUnk, int dwAspect, long /*int*/ hdcDraw, long /*int*/ lprcBounds); +public static final native int OleDraw(long pUnk, int dwAspect, long hdcDraw, long lprcBounds); public static final native int OleFlushClipboard(); /** @param ppDataObject cast=(IDataObject **) */ -public static final native int OleGetClipboard(long /*int*/[] ppDataObject); +public static final native int OleGetClipboard(long[] ppDataObject); /** @param pDataObject cast=(IDataObject *) */ -public static final native int OleIsCurrentClipboard(long /*int*/ pDataObject); +public static final native int OleIsCurrentClipboard(long pDataObject); /** @param pObject cast=(LPOLEOBJECT) */ -public static final native boolean OleIsRunning(long /*int*/ pObject); +public static final native boolean OleIsRunning(long pObject); /** * @param pStg cast=(IStorage *) * @param pClientSite cast=(IOleClientSite *) * @param ppvObj cast=(LPVOID *) */ -public static final native int OleLoad(long /*int*/ pStg, GUID riid, long /*int*/ pClientSite, long /*int*/[] ppvObj); +public static final native int OleLoad(long pStg, GUID riid, long pClientSite, long[] ppvObj); /** @param pUnknown cast=(LPUNKNOWN) */ -public static final native int OleRun(long /*int*/ pUnknown); +public static final native int OleRun(long pUnknown); /** * @param pPS cast=(IPersistStorage *) * @param pStg cast=(IStorage *) */ -public static final native int OleSave(long /*int*/ pPS, long /*int*/ pStg, boolean fSameAsLoad); +public static final native int OleSave(long pPS, long pStg, boolean fSameAsLoad); /** @param pDataObject cast=(IDataObject *) */ -public static final native int OleSetClipboard(long /*int*/ pDataObject); +public static final native int OleSetClipboard(long pDataObject); /** @param pUnk cast=(LPUNKNOWN) */ -public static final native int OleSetContainedObject(long /*int*/ pUnk, boolean fContained); +public static final native int OleSetContainedObject(long pUnk, boolean fContained); /** * @method flags=trycatch * @param holemenu cast=(HOLEMENU) @@ -605,33 +605,33 @@ public static final native int OleSetContainedObject(long /*int*/ pUnk, boolean * @param lpFrame cast=(LPOLEINPLACEFRAME) * @param lpActiveObj cast=(LPOLEINPLACEACTIVEOBJECT) */ -public static final native int OleSetMenuDescriptor(long /*int*/ holemenu, long /*int*/ hwndFrame, long /*int*/ hwndActiveObject, long /*int*/ lpFrame, long /*int*/ lpActiveObj); +public static final native int OleSetMenuDescriptor(long holemenu, long hwndFrame, long hwndActiveObject, long lpFrame, long lpActiveObj); /** * @param clr cast=(OLE_COLOR) * @param hpal cast=(HPALETTE) * @param pcolorref cast=(COLORREF *) */ -public static final native int OleTranslateColor(int clr, long /*int*/ hpal, int[] pcolorref); +public static final native int OleTranslateColor(int clr, long hpal, int[] pcolorref); /** @param lplpszProgID cast=(LPOLESTR *) */ -public static final native int ProgIDFromCLSID(GUID clsid, long /*int*/[] lplpszProgID); +public static final native int ProgIDFromCLSID(GUID clsid, long[] lplpszProgID); /** * @param hwnd cast=(HWND) * @param pDropTarget cast=(IDropTarget *) */ -public static final native int RegisterDragDrop(long /*int*/ hwnd, long /*int*/ pDropTarget); +public static final native int RegisterDragDrop(long hwnd, long pDropTarget); /** @param pmedium cast=(STGMEDIUM *) */ -public static final native void ReleaseStgMedium(long /*int*/ pmedium); +public static final native void ReleaseStgMedium(long pmedium); /** @param hwnd cast=(HWND) */ -public static final native int RevokeDragDrop(long /*int*/ hwnd); +public static final native int RevokeDragDrop(long hwnd); /** * @param hwnd cast=(HWND) * @param pDataObject cast=(IDataObject *) * @param pDropSource cast=(IDropSource *) * @param pdwEffect cast=(DWORD *) */ -public static final native int SHDoDragDrop(long /*int*/ hwnd, long /*int*/ pDataObject, long /*int*/ pDropSource, int dwOKEffect, int[] pdwEffect); +public static final native int SHDoDragDrop(long hwnd, long pDataObject, long pDropSource, int dwOKEffect, int[] pdwEffect); /** @param ppstgOpen cast=(IStorage **) */ -public static final native int StgCreateDocfile(char[] pwcsName, int grfMode, int reserved, long /*int*/[] ppstgOpen); +public static final native int StgCreateDocfile(char[] pwcsName, int grfMode, int reserved, long[] ppstgOpen); /** @param pwcsName cast=(const WCHAR *) */ public static final native int StgIsStorageFile(char[] pwcsName); /** @@ -640,144 +640,144 @@ public static final native int StgIsStorageFile(char[] pwcsName); * @param snbExclude cast=(SNB) * @param ppstgOpen cast=(IStorage **) */ -public static final native int StgOpenStorage(char[] pwcsName, long /*int*/ pstgPriority, int grfMode, long /*int*/ snbExclude, int reserved, long /*int*/[] ppstgOpen); +public static final native int StgOpenStorage(char[] pwcsName, long pstgPriority, int grfMode, long snbExclude, int reserved, long[] ppstgOpen); /** @param ppsz cast=(LPOLESTR *) */ -public static final native int StringFromCLSID(GUID rclsid, long /*int*/[] ppsz); +public static final native int StringFromCLSID(GUID rclsid, long[] ppsz); /** @param sz cast=(OLECHAR *) */ -public static final native long /*int*/ SysAllocString(char [] sz); +public static final native long SysAllocString(char [] sz); /** @param bstr cast=(BSTR) */ -public static final native void SysFreeString(long /*int*/ bstr); +public static final native void SysFreeString(long bstr); /** @param bstr cast=(BSTR) */ -public static final native int SysStringByteLen(long /*int*/ bstr); +public static final native int SysStringByteLen(long bstr); /** @param bstr cast=(BSTR) */ -public static final native int SysStringLen(long /*int*/ bstr); +public static final native int SysStringLen(long bstr); /** * @param pvargDest cast=(VARIANTARG FAR* ) * @param pvarSrc cast=(VARIANTARG FAR* ) * @param vt cast=(VARTYPE) */ -public static final native int VariantChangeType(long /*int*/ pvargDest, long /*int*/ pvarSrc, short wFlags, short vt); +public static final native int VariantChangeType(long pvargDest, long pvarSrc, short wFlags, short vt); /** @param pvarg cast=(VARIANTARG FAR* ) */ -public static final native int VariantClear(long /*int*/ pvarg); +public static final native int VariantClear(long pvarg); /** @param pvarg cast=(VARIANTARG FAR* ) */ -public static final native void VariantInit(long /*int*/ pvarg); +public static final native void VariantInit(long pvarg); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, char[] arg1); +public static final native int VtblCall(int fnNumber, long ppVtbl, char[] arg0, char[] arg1); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, POINT arg2, int arg3); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, POINT arg2, int arg3); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, POINT arg1, int arg2); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, POINT arg1, long arg2); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, POINT arg0, int arg1); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, SHDRAGIMAGE arg0, int arg1); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, SHDRAGIMAGE arg0, long arg1); +public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, int arg1, POINT arg2, int arg3); +public static final native int VtblCall(int fnNumber, long ppVtbl, long arg0, long arg1, POINT arg2, int arg3); +public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, POINT arg1, int arg2); +public static final native int VtblCall(int fnNumber, long ppVtbl, long arg0, POINT arg1, long arg2); +public static final native int VtblCall(int fnNumber, long ppVtbl, POINT arg0, int arg1); +public static final native int VtblCall(int fnNumber, long ppVtbl, SHDRAGIMAGE arg0, int arg1); +public static final native int VtblCall(int fnNumber, long ppVtbl, SHDRAGIMAGE arg0, long arg1); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, int arg1, int arg2, int arg3, int[] arg4); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, int arg1, int arg2, int arg3, long[] arg4); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, long arg1, int arg2, int arg3, long[] arg4); +public static final native int VtblCall(int fnNumber, long ppVtbl, char[] arg0, int arg1, int arg2, int arg3, int[] arg4); +public static final native int VtblCall(int fnNumber, long ppVtbl, char[] arg0, int arg1, int arg2, int arg3, long[] arg4); +public static final native int VtblCall(int fnNumber, long ppVtbl, char[] arg0, long arg1, int arg2, int arg3, long[] arg4); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, int arg1, int arg2, int arg3, int arg4, int [] arg5); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, long arg1, int arg2, int arg3, int arg4, long[] arg5); +public static final native int VtblCall(int fnNumber, long ppVtbl, char[] arg0, int arg1, int arg2, int arg3, int arg4, int [] arg5); +public static final native int VtblCall(int fnNumber, long ppVtbl, char[] arg0, long arg1, int arg2, int arg3, int arg4, long[] arg5); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long[] arg1); +public static final native int VtblCall(int fnNumber, long ppVtbl, long arg0, long[] arg1); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int[] arg2); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, long[] arg2); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long[] arg2); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, long[] arg2); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, long arg1, int[] arg2); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int[] arg2); +public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, int arg1, int[] arg2); +public static final native int VtblCall(int fnNumber, long ppVtbl, long arg0, int arg1, long[] arg2); +public static final native int VtblCall(int fnNumber, long ppVtbl, long arg0, long arg1, long[] arg2); +public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, int arg1, long[] arg2); +public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, long arg1, int[] arg2); +public static final native int VtblCall(int fnNumber, long ppVtbl, long arg0, int arg1, int[] arg2); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, long arg2); +public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, int arg1, long arg2); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, DVTARGETDEVICE arg2, SIZE arg3); +public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, int arg1, DVTARGETDEVICE arg2, SIZE arg3); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, GUID arg2, int arg3, int [] arg4); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, GUID arg2, long arg3, long [] arg4); +public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, int arg1, GUID arg2, int arg3, int [] arg4); +public static final native int VtblCall(int fnNumber, long ppVtbl, long arg0, long arg1, GUID arg2, long arg3, long [] arg4); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, FORMATETC arg1, int [] arg2); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, FORMATETC arg1, long[] arg2); +public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, FORMATETC arg1, int [] arg2); +public static final native int VtblCall(int fnNumber, long ppVtbl, long arg0, FORMATETC arg1, long[] arg2); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, GUID arg1); +public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, GUID arg1); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, GUID arg1, int arg2, int arg3); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, GUID arg1, long arg2, long arg3); +public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, GUID arg1, int arg2, int arg3); +public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, GUID arg1, long arg2, long arg3); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, GUID arg1, int arg2, int arg3, DISPPARAMS arg4, int arg5, EXCEPINFO arg6, int[] arg7); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, GUID arg1, int arg2, int arg3, DISPPARAMS arg4, long arg5, EXCEPINFO arg6, int[] arg7); +public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, GUID arg1, int arg2, int arg3, DISPPARAMS arg4, int arg5, EXCEPINFO arg6, int[] arg7); +public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, GUID arg1, int arg2, int arg3, DISPPARAMS arg4, long arg5, EXCEPINFO arg6, int[] arg7); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, STATSTG arg1, int [] arg2); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, STATSTG arg1, long[] arg2); +public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, STATSTG arg1, int [] arg2); +public static final native int VtblCall(int fnNumber, long ppVtbl, long arg0, STATSTG arg1, long[] arg2); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, MSG arg0); +public static final native int VtblCall(int fnNumber, long ppVtbl, MSG arg0); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, MSG arg1, int arg2, int arg3, int arg4, RECT arg5); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, MSG arg1, long arg2, int arg3, long arg4, RECT arg5); +public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, MSG arg1, int arg2, int arg3, int arg4, RECT arg5); +public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, MSG arg1, long arg2, int arg3, long arg4, RECT arg5); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, SIZE arg1); +public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, SIZE arg1); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, boolean arg1); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, boolean arg1); +public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, boolean arg1); +public static final native int VtblCall(int fnNumber, long ppVtbl, long arg0, boolean arg1); -public static final native int VtblCall (int fnNumber, long /*int*/ ppVtbl, boolean arg0); -public static final native int VtblCall (int fnNumber, long /*int*/ ppVtbl, boolean arg0, int arg1); -public static final native int VtblCall (int fnNumber, long /*int*/ ppVtbl, boolean arg0, long arg1); +public static final native int VtblCall (int fnNumber, long ppVtbl, boolean arg0); +public static final native int VtblCall (int fnNumber, long ppVtbl, boolean arg0, int arg1); +public static final native int VtblCall (int fnNumber, long ppVtbl, boolean arg0, long arg1); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, CAUUID arg0); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, CONTROLINFO arg0); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, FORMATETC arg0); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, FORMATETC arg0, STGMEDIUM arg1); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, FORMATETC arg0, STGMEDIUM arg1, boolean arg2); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, GUID arg0); +public static final native int VtblCall(int fnNumber, long ppVtbl, CAUUID arg0); +public static final native int VtblCall(int fnNumber, long ppVtbl, CONTROLINFO arg0); +public static final native int VtblCall(int fnNumber, long ppVtbl, FORMATETC arg0); +public static final native int VtblCall(int fnNumber, long ppVtbl, FORMATETC arg0, STGMEDIUM arg1); +public static final native int VtblCall(int fnNumber, long ppVtbl, FORMATETC arg0, STGMEDIUM arg1, boolean arg2); +public static final native int VtblCall(int fnNumber, long ppVtbl, GUID arg0); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, GUID arg0, int[] arg1); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, GUID arg0, long[] arg1); +public static final native int VtblCall(int fnNumber, long ppVtbl, GUID arg0, int[] arg1); +public static final native int VtblCall(int fnNumber, long ppVtbl, GUID arg0, long[] arg1); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, GUID arg0, GUID arg1, int[] arg2); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, GUID arg0, GUID arg1, long[] arg2); +public static final native int VtblCall(int fnNumber, long ppVtbl, GUID arg0, GUID arg1, int[] arg2); +public static final native int VtblCall(int fnNumber, long ppVtbl, GUID arg0, GUID arg1, long[] arg2); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, GUID arg0, int arg1, int arg2, int arg3, int[] arg4); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, GUID arg0, long arg1, int arg2, int arg3, int[] arg4); +public static final native int VtblCall(int fnNumber, long ppVtbl, GUID arg0, int arg1, int arg2, int arg3, int[] arg4); +public static final native int VtblCall(int fnNumber, long ppVtbl, GUID arg0, long arg1, int arg2, int arg3, int[] arg4); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, GUID arg0, int arg1, int arg2, int arg3, int arg4); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, GUID arg0, int arg1, int arg2, long arg3, long arg4); +public static final native int VtblCall(int fnNumber, long ppVtbl, GUID arg0, int arg1, int arg2, int arg3, int arg4); +public static final native int VtblCall(int fnNumber, long ppVtbl, GUID arg0, int arg1, int arg2, long arg3, long arg4); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, GUID arg0, int arg1, OLECMD arg2, OLECMDTEXT arg3); +public static final native int VtblCall(int fnNumber, long ppVtbl, GUID arg0, int arg1, OLECMD arg2, OLECMDTEXT arg3); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, LICINFO arg0); +public static final native int VtblCall(int fnNumber, long ppVtbl, LICINFO arg0); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, RECT arg0, int arg1, boolean arg2); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, RECT arg0, long arg1, boolean arg2); +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); /** * @param arg0 flags=struct */ -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, RECT arg0, int arg1, int arg2); +public static final native int VtblCall(int fnNumber, long ppVtbl, RECT arg0, int arg1, int arg2); /** * @param arg0 flags=struct */ -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, RECT arg0, long arg1, long arg2); +public static final native int VtblCall(int fnNumber, long ppVtbl, RECT arg0, long arg1, long arg2); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, RECT arg0, RECT arg1); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, RECT arg0); +public static final native int VtblCall(int fnNumber, long ppVtbl, RECT arg0, RECT arg1); +public static final native int VtblCall(int fnNumber, long ppVtbl, RECT arg0); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int [] arg1, int [] arg2, int[] arg3, int [] arg4); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, long[] arg1, long[] arg2, int[] arg3, long[] arg4); +public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, int [] arg1, int [] arg2, int[] arg3, int [] arg4); +public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, long[] arg1, long[] arg2, int[] arg3, long[] arg4); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int [] arg1, int arg2, int[] arg3); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, long[] arg1, int arg2, int[] arg3); +public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, int [] arg1, int arg2, int[] arg3); +public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, long[] arg1, int arg2, int[] arg3); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, DISPPARAMS arg3, int arg4, EXCEPINFO arg5, int arg6); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, DISPPARAMS arg3, long arg4, EXCEPINFO arg5, long arg6); +public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, int arg1, int arg2, DISPPARAMS arg3, int arg4, EXCEPINFO arg5, int arg6); +public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, int arg1, int arg2, DISPPARAMS arg3, long arg4, EXCEPINFO arg5, long arg6); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] pszPropName, int[] pVar, int[] pErrorLog); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] pszPropName, int pVar, int[] pErrorLog); +public static final native int VtblCall(int fnNumber, long ppVtbl, char[] pszPropName, int[] pVar, int[] pErrorLog); +public static final native int VtblCall(int fnNumber, long ppVtbl, char[] pszPropName, int pVar, int[] pErrorLog); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int type, int listener, boolean useCapture); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long type, long listener, boolean useCapture); +public static final native int VtblCall(int fnNumber, long ppVtbl, int type, int listener, boolean useCapture); +public static final native int VtblCall(int fnNumber, long ppVtbl, long type, long listener, boolean useCapture); /** @param pStg cast=(IStorage *) */ -public static final native int WriteClassStg(long /*int*/ pStg, GUID rclsid); +public static final native int WriteClassStg(long pStg, GUID rclsid); /** Accessibility constants */ public static final int CHILDID_SELF = 0; @@ -953,18 +953,18 @@ public static final int IA2_SCROLL_TYPE_ANYWHERE = 6; * @param dwObjectID cast=(DWORD) * @param ppvObject cast=(LPVOID *) */ -public static final native int AccessibleObjectFromWindow (long /*int*/ hwnd, int dwObjectID, GUID riid, long /*int*/[] ppvObject); +public static final native int AccessibleObjectFromWindow (long hwnd, int dwObjectID, GUID riid, long[] ppvObject); /** * @method flags=dynamic * @param hwnd cast=(HWND) * @param ppvObject cast=(LPVOID *) */ -public static final native int CreateStdAccessibleObject (long /*int*/ hwnd, int idObject, GUID riidInterface, long /*int*/[] ppvObject); +public static final native int CreateStdAccessibleObject (long hwnd, int idObject, GUID riidInterface, long[] ppvObject); /** * @method flags=dynamic * @param pAcc cast=(LPUNKNOWN) */ -public static final native long /*int*/ LresultFromObject (GUID riid, long /*int*/ wParam, long /*int*/ pAcc); +public static final native long LresultFromObject (GUID riid, long wParam, long pAcc); /** * @method flags=dynamic * @param paccContainer cast=(IAccessible *) @@ -973,63 +973,63 @@ public static final native long /*int*/ LresultFromObject (GUID riid, long /*int * @param rgvarChildren cast=(VARIANT *) * @param pcObtained cast=(LONG *) */ -public static final native int AccessibleChildren(long /*int*/ paccContainer, int iChildStart, int cChildren, long /*int*/ rgvarChildren, int [] pcObtained); +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 /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3); -/*USED*/public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4); +/*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 /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, long /*int*/ arg5); -/*USED,NEW*/public static final native int VtblCall(int fnNumber, long ppVtbl, long arg0, int arg1, int arg2, int arg3, int arg4, long /*int*/ arg5); -/*USED*/public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, int arg4, int arg5, int arg6, int arg7); +/*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 /*int*/ ppVtbl, long /*int*/ arg0); +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 /*int*/ ppVtbl, long /*int*/ arg0, long /*int*/ arg1); +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 /*int*/ ppVtbl, int arg0, long /*int*/ arg1); +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 /*int*/ ppVtbl, int arg0, long /*int*/ arg1, long /*int*/ arg2); +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 /*int*/ ppVtbl, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2); +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 /*int*/ ppVtbl, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ arg4); +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 /*int*/ get_accChild_CALLBACK(long /*int*/ func); +public static final native long get_accChild_CALLBACK(long func); /** @method flags=no_gen */ -public static final native long /*int*/ get_accName_CALLBACK(long /*int*/ func); +public static final native long get_accName_CALLBACK(long func); /** @method flags=no_gen */ -public static final native long /*int*/ get_accValue_CALLBACK(long /*int*/ func); +public static final native long get_accValue_CALLBACK(long func); /** @method flags=no_gen */ -public static final native long /*int*/ get_accDescription_CALLBACK(long /*int*/ func); +public static final native long get_accDescription_CALLBACK(long func); /** @method flags=no_gen */ -public static final native long /*int*/ get_accRole_CALLBACK(long /*int*/ func); +public static final native long get_accRole_CALLBACK(long func); /** @method flags=no_gen */ -public static final native long /*int*/ get_accState_CALLBACK(long /*int*/ func); +public static final native long get_accState_CALLBACK(long func); /** @method flags=no_gen */ -public static final native long /*int*/ get_accHelp_CALLBACK(long /*int*/ func); +public static final native long get_accHelp_CALLBACK(long func); /** @method flags=no_gen */ -public static final native long /*int*/ get_accHelpTopic_CALLBACK(long /*int*/ func); +public static final native long get_accHelpTopic_CALLBACK(long func); /** @method flags=no_gen */ -public static final native long /*int*/ get_accKeyboardShortcut_CALLBACK(long /*int*/ func); +public static final native long get_accKeyboardShortcut_CALLBACK(long func); /** @method flags=no_gen */ -public static final native long /*int*/ get_accDefaultAction_CALLBACK(long /*int*/ func); +public static final native long get_accDefaultAction_CALLBACK(long func); /** @method flags=no_gen */ -public static final native long /*int*/ accSelect_CALLBACK(long /*int*/ func); +public static final native long accSelect_CALLBACK(long func); /** @method flags=no_gen */ -public static final native long /*int*/ accLocation_CALLBACK(long /*int*/ func); +public static final native long accLocation_CALLBACK(long func); /** @method flags=no_gen */ -public static final native long /*int*/ accNavigate_CALLBACK(long /*int*/ func); +public static final native long accNavigate_CALLBACK(long func); /** @method flags=no_gen */ -public static final native long /*int*/ accDoDefaultAction_CALLBACK(long /*int*/ func); +public static final native long accDoDefaultAction_CALLBACK(long func); /** @method flags=no_gen */ -public static final native long /*int*/ put_accName_CALLBACK(long /*int*/ func); +public static final native long put_accName_CALLBACK(long func); /** @method flags=no_gen */ -public static final native long /*int*/ put_accValue_CALLBACK(long /*int*/ func); +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 /*int*/ CALLBACK_setCurrentValue(long /*int*/ func); +public static final native long CALLBACK_setCurrentValue(long func); /* sizeof's */ public static final native int CAUUID_sizeof(); diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/CONTROLINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/CONTROLINFO.java index 447e96b8d8..3e9db86972 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/CONTROLINFO.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/CONTROLINFO.java @@ -16,7 +16,7 @@ package org.eclipse.swt.internal.ole.win32; public final class CONTROLINFO { public int cb; /** @field cast=(HACCEL) */ - public long /*int*/ hAccel; + public long hAccel; public short cAccel; public int dwFlags; public static final int sizeof = COM.CONTROLINFO_sizeof (); diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COSERVERINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COSERVERINFO.java index b900407fa6..2a7549f44d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COSERVERINFO.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COSERVERINFO.java @@ -16,9 +16,9 @@ package org.eclipse.swt.internal.ole.win32; public class COSERVERINFO { public int dwReserved1; /** @field cast=(LPWSTR) */ - public long /*int*/ pwszName; + public long pwszName; /** @field cast=(COAUTHINFO *) */ - public long /*int*/ pAuthInfo; + public long pAuthInfo; public int dwReserved2; public static final int sizeof = COM.COSERVERINFO_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/DISPPARAMS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/DISPPARAMS.java index f7e70c7068..6d4dd054bb 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/DISPPARAMS.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/DISPPARAMS.java @@ -15,9 +15,9 @@ package org.eclipse.swt.internal.ole.win32; public final class DISPPARAMS { /** @field cast=(VARIANTARG FAR *) */ - public long /*int*/ rgvarg; + public long rgvarg; /** @field cast=(DISPID FAR *) */ - public long /*int*/ rgdispidNamedArgs; + public long rgdispidNamedArgs; public int cArgs; public int cNamedArgs; public static final int sizeof = COM.DISPPARAMS_sizeof (); diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/EXCEPINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/EXCEPINFO.java index dade6b3384..0a48daa0f4 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/EXCEPINFO.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/EXCEPINFO.java @@ -17,16 +17,16 @@ public final class EXCEPINFO { public short wCode; public short wReserved; /** @field cast=(BSTR) */ - public long /*int*/ bstrSource; + public long bstrSource; /** @field cast=(BSTR) */ - public long /*int*/ bstrDescription; + public long bstrDescription; /** @field cast=(BSTR) */ - public long /*int*/ bstrHelpFile; + public long bstrHelpFile; public int dwHelpContext; /** @field cast=(void FAR *) */ - public long /*int*/ pvReserved; + public long pvReserved; /** @field cast=(HRESULT (STDAPICALLTYPE FAR* )(struct tagEXCEPINFO FAR*)) */ - public long /*int*/ pfnDeferredFillIn; + public long pfnDeferredFillIn; public int scode; public static final int sizeof = COM.EXCEPINFO_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/FORMATETC.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/FORMATETC.java index 1ac26025ee..4796c7f65c 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/FORMATETC.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/FORMATETC.java @@ -17,7 +17,7 @@ public final class FORMATETC { /** @field cast=(CLIPFORMAT) */ public int cfFormat; /** @field cast=(DVTARGETDEVICE *) */ - public long /*int*/ ptd; + public long ptd; public int dwAspect; public int lindex; public int tymed; diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/FUNCDESC.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/FUNCDESC.java index 63bbf90da2..3cd2aecbd7 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/FUNCDESC.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/FUNCDESC.java @@ -17,9 +17,9 @@ public class FUNCDESC { /** @field cast=(MEMBERID) */ public int memid; /** @field cast=(SCODE FAR *) */ - public long /*int*/ lprgscode; + public long lprgscode; /** @field cast=(ELEMDESC FAR *) */ - public long /*int*/ lprgelemdescParam; + public long lprgelemdescParam; /** @field cast=(FUNCKIND) */ public int funckind; /** @field cast=(INVOKEKIND) */ @@ -33,12 +33,12 @@ public class FUNCDESC { // ELEMDESC elemdescFunc; // TYPEDESC elemdescFunc.tdesc /** @field accessor=elemdescFunc.tdesc.lptdesc,cast=(struct FARSTRUCT tagTYPEDESC FAR* ) */ - public long /*int*/ elemdescFunc_tdesc_union; + public long elemdescFunc_tdesc_union; /** @field accessor=elemdescFunc.tdesc.vt */ public short elemdescFunc_tdesc_vt; // PARAMDESC elemdescFunc.paramdesc /** @field accessor=elemdescFunc.paramdesc.pparamdescex,cast=(LPPARAMDESCEX) */ - public long /*int*/ elemdescFunc_paramdesc_pparamdescex; + public long elemdescFunc_paramdesc_pparamdescex; /** @field accessor=elemdescFunc.paramdesc.wParamFlags */ public short elemdescFunc_paramdesc_wParamFlags; public short wFuncFlags; 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 31a465aa6d..675a2cf602 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 @@ -17,71 +17,71 @@ import org.eclipse.swt.internal.win32.*; public class IAccessible extends IDispatch { -public IAccessible(long /*int*/ address) { +public IAccessible(long address) { super(address); } -public int get_accParent(long /*int*/ ppdispParent) { +public int get_accParent(long ppdispParent) { return OS.VtblCall(7, address, ppdispParent); } -public int get_accChildCount(long /*int*/ pcountChildren) { +public int get_accChildCount(long pcountChildren) { return OS.VtblCall(8, address, pcountChildren); } -public int get_accChild(long /*int*/ variant, long /*int*/ ppdispChild) { +public int get_accChild(long variant, long ppdispChild) { return COM.VtblCall_VARIANTP(9, address, variant, ppdispChild); } -public int get_accName(long /*int*/ variant, long /*int*/ pszName) { +public int get_accName(long variant, long pszName) { return COM.VtblCall_VARIANTP(10, address, variant, pszName); } -public int get_accValue(long /*int*/ variant, long /*int*/ pszValue) { +public int get_accValue(long variant, long pszValue) { return COM.VtblCall_VARIANTP(11, address, variant, pszValue); } -public int get_accDescription(long /*int*/ variant, long /*int*/ pszDescription) { +public int get_accDescription(long variant, long pszDescription) { return COM.VtblCall_VARIANTP(12, address, variant, pszDescription); } -public int get_accRole(long /*int*/ variant, long /*int*/ pvarRole) { +public int get_accRole(long variant, long pvarRole) { return COM.VtblCall_VARIANTP(13, address, variant, pvarRole); } -public int get_accState(long /*int*/ variant, long /*int*/ pvarState) { +public int get_accState(long variant, long pvarState) { return COM.VtblCall_VARIANTP(14, address, variant, pvarState); } -public int get_accHelp(long /*int*/ variant, long /*int*/ pszHelp) { +public int get_accHelp(long variant, long pszHelp) { return COM.VtblCall_VARIANTP(15, address, variant, pszHelp); } -public int get_accHelpTopic(long /*int*/ pszHelpFile, long /*int*/ variant, long /*int*/ pidTopic) { +public int get_accHelpTopic(long pszHelpFile, long variant, long pidTopic) { return COM.VtblCall_PVARIANTP(16, address, pszHelpFile, variant, pidTopic); } -public int get_accKeyboardShortcut(long /*int*/ variant, long /*int*/ pszKeyboardShortcut) { +public int get_accKeyboardShortcut(long variant, long pszKeyboardShortcut) { return COM.VtblCall_VARIANTP(17, address, variant, pszKeyboardShortcut); } -public int get_accFocus(long /*int*/ pvarChild) { +public int get_accFocus(long pvarChild) { return OS.VtblCall(18, address, pvarChild); } -public int get_accSelection(long /*int*/ pvarChildren) { +public int get_accSelection(long pvarChildren) { return OS.VtblCall(19, address, pvarChildren); } -public int get_accDefaultAction(long /*int*/ variant, long /*int*/ pszDefaultAction) { +public int get_accDefaultAction(long variant, long pszDefaultAction) { return COM.VtblCall_VARIANTP(20, address, variant, pszDefaultAction); } -public int accSelect(int flagsSelect, long /*int*/ variant) { +public int accSelect(int flagsSelect, long variant) { return COM.VtblCall_IVARIANT(21, address, flagsSelect, variant); } -public int accLocation(long /*int*/ pxLeft, long /*int*/ pyTop, long /*int*/ pcxWidth, long /*int*/ pcyHeight, long /*int*/ 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); } -public int accNavigate(int navDir, long /*int*/ variant, long /*int*/ pvarEndUpAt) { +public int accNavigate(int navDir, long variant, long pvarEndUpAt) { return COM.VtblCall_IVARIANTP(23, address, navDir, variant, pvarEndUpAt); } -public int accHitTest(int xLeft, int yTop, long /*int*/ pvarChild) { +public int accHitTest(int xLeft, int yTop, long pvarChild) { return COM.VtblCall(24, address, xLeft, yTop, pvarChild); } -public int accDoDefaultAction(long /*int*/ variant) { +public int accDoDefaultAction(long variant) { return COM.VtblCall_VARIANT(25, address, variant); } -public int put_accName(long /*int*/ variant, long /*int*/ szName) { +public int put_accName(long variant, long szName) { return COM.VtblCall_VARIANTP(26, address, variant, szName); } -public int put_accValue(long /*int*/ variant, long /*int*/ szValue) { +public int put_accValue(long variant, long szValue) { return COM.VtblCall_VARIANTP(27, address, variant, szValue); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IClassFactory2.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IClassFactory2.java index 78dc614e93..a3fa7fba51 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IClassFactory2.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IClassFactory2.java @@ -17,16 +17,16 @@ import org.eclipse.swt.internal.win32.*; public class IClassFactory2 extends IUnknown { -public IClassFactory2(long /*int*/ address) { +public IClassFactory2(long address) { super(address); } -public int CreateInstanceLic(long /*int*/ pUnkOuter, long /*int*/ pUnkReserved, GUID riid, long /*int*/ bstrKey, long /*int*/ ppvObject[]) { +public int CreateInstanceLic(long pUnkOuter, long pUnkReserved, GUID riid, long bstrKey, long ppvObject[]) { return COM.VtblCall(7, address, pUnkOuter, pUnkReserved, riid, bstrKey, ppvObject); } public int GetLicInfo(LICINFO licInfo) { return COM.VtblCall(5, address, licInfo); } -public int RequestLicKey(int dwReserved, long /*int*/[] pBstrKey) { +public int RequestLicKey(int dwReserved, long[] pBstrKey) { return OS.VtblCall(6, address, dwReserved, pBstrKey); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IConnectionPoint.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IConnectionPoint.java index 1fd82c5a40..cac612c195 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IConnectionPoint.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IConnectionPoint.java @@ -17,10 +17,10 @@ import org.eclipse.swt.internal.win32.*; public class IConnectionPoint extends IUnknown { -public IConnectionPoint(long /*int*/ address) { +public IConnectionPoint(long address) { super(address); } -public int Advise(long /*int*/ pUnk, int[] pdwCookie) { +public int Advise(long pUnk, int[] pdwCookie) { return OS.VtblCall(5, address, pUnk, pdwCookie); } public int Unadvise(int dwCookie) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IConnectionPointContainer.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IConnectionPointContainer.java index 8880b387ef..66eb77124d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IConnectionPointContainer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IConnectionPointContainer.java @@ -15,10 +15,10 @@ package org.eclipse.swt.internal.ole.win32; public class IConnectionPointContainer extends IUnknown { -public IConnectionPointContainer(long /*int*/ address) { +public IConnectionPointContainer(long address) { super(address); } -public int FindConnectionPoint(GUID riid, long /*int*/[] ppCP) { +public int FindConnectionPoint(GUID riid, long[] ppCP) { return COM.VtblCall(4, address, riid, ppCP); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDataObject.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDataObject.java index 1357a24b0e..c0984a1d02 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDataObject.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDataObject.java @@ -16,10 +16,10 @@ package org.eclipse.swt.internal.ole.win32; import org.eclipse.swt.internal.win32.*; public class IDataObject extends IUnknown { -public IDataObject(long /*int*/ address) { +public IDataObject(long address) { super(address); } -public int EnumFormatEtc(int dwDirection, long /*int*/[] ppenumFormatetc) { +public int EnumFormatEtc(int dwDirection, long[] ppenumFormatetc) { return OS.VtblCall(8, address, dwDirection, ppenumFormatetc); } public int GetData(FORMATETC pFormatetc, STGMEDIUM pmedium) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDispatch.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDispatch.java index ce77169239..733e2ad75d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDispatch.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDispatch.java @@ -18,7 +18,7 @@ import org.eclipse.swt.internal.win32.*; public class IDispatch extends IUnknown { -public IDispatch(long /*int*/ address) { +public IDispatch(long address) { super(address); } public int GetIDsOfNames(GUID riid, String[] rgszNames, int cNames, int lcid, int[] rgDispId) { @@ -27,9 +27,9 @@ public int GetIDsOfNames(GUID riid, String[] rgszNames, int cNames, int lcid, in int size = rgszNames.length; // create an array to hold the addresses - long /*int*/ hHeap = OS.GetProcessHeap(); - long /*int*/ ppNames = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, size * C.PTR_SIZEOF); - long /*int*/[] memTracker = new long /*int*/[size]; + long hHeap = OS.GetProcessHeap(); + long ppNames = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, size * C.PTR_SIZEOF); + long[] memTracker = new long[size]; try { // add the address of each string to the array @@ -40,10 +40,10 @@ public int GetIDsOfNames(GUID riid, String[] rgszNames, int cNames, int lcid, in buffer = new char[nameSize +1]; rgszNames[i].getChars(0, nameSize, buffer, 0); // get the address of the start of the array of char - long /*int*/ pName = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, buffer.length * 2); + long pName = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, buffer.length * 2); OS.MoveMemory(pName, buffer, buffer.length * 2); // copy the address to the array of addresses - OS.MoveMemory(ppNames + C.PTR_SIZEOF * i, new long /*int*/[]{pName}, C.PTR_SIZEOF); + OS.MoveMemory(ppNames + C.PTR_SIZEOF * i, new long[]{pName}, C.PTR_SIZEOF); // keep track of the Global Memory so we can free it memTracker[i] = pName; } @@ -58,13 +58,13 @@ public int GetIDsOfNames(GUID riid, String[] rgszNames, int cNames, int lcid, in OS.HeapFree(hHeap, 0, ppNames); } } -public int GetTypeInfo(int iTInfo, int lcid, long /*int*/[] ppTInfo ){ +public int GetTypeInfo(int iTInfo, int lcid, long[] ppTInfo ){ return COM.VtblCall(4, address, iTInfo, lcid, ppTInfo); } public int GetTypeInfoCount(int [] pctinfo ){ return OS.VtblCall(3, address, pctinfo); } -public int Invoke(int dispIdMember, GUID riid, int lcid, int dwFlags, DISPPARAMS pDispParams, long /*int*/ pVarResult, EXCEPINFO pExcepInfo, int[] pArgErr) { +public int Invoke(int dispIdMember, GUID riid, int lcid, int dwFlags, DISPPARAMS pDispParams, long pVarResult, EXCEPINFO pExcepInfo, int[] pArgErr) { return COM.VtblCall(6, address, dispIdMember, riid, lcid, dwFlags, pDispParams, pVarResult, pExcepInfo, pArgErr); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDispatchEx.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDispatchEx.java index 3e03bffeb8..89f3fe0a46 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDispatchEx.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDispatchEx.java @@ -17,19 +17,19 @@ import org.eclipse.swt.internal.win32.*; public class IDispatchEx extends IDispatch { -public IDispatchEx (long /*int*/ address) { +public IDispatchEx (long address) { super (address); } -public int GetDispID (long /*int*/ bstrName, int grfdex, int[] pid) { +public int GetDispID (long bstrName, int grfdex, int[] pid) { return COM.VtblCall (7, address, bstrName, grfdex, pid); } -public int InvokeEx (int id, int lcid, int wFlags, DISPPARAMS pdp, long /*int*/ pvarRes, EXCEPINFO pei, long /*int*/ pspCaller) { +public int InvokeEx (int id, int lcid, int wFlags, DISPPARAMS pdp, long pvarRes, EXCEPINFO pei, long pspCaller) { return COM.VtblCall (8, address, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); } -public int DeleteMemberByName (long /*int*/ bstrName, int grfdex) { +public int DeleteMemberByName (long bstrName, int grfdex) { return OS.VtblCall (9, address, bstrName, grfdex); } @@ -41,7 +41,7 @@ public int GetMemberProperties (int id, int grfdexFetch, int[] pgrfdex) { return COM.VtblCall (11, address, id, grfdexFetch, pgrfdex); } -public int GetMemberName (int id, long /*int*/[] pbstrName) { +public int GetMemberName (int id, long[] pbstrName) { return OS.VtblCall (12, address, id, pbstrName); } @@ -49,7 +49,7 @@ public int GetNextDispID (int grfdex, int id, int[] pid) { return COM.VtblCall (13, address, grfdex, id, pid); } -public int GetNameSpaceParent (long /*int*/[] ppunk) { +public int GetNameSpaceParent (long[] ppunk) { return OS.VtblCall (14, address, ppunk); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDragSourceHelper.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDragSourceHelper.java index 9e8a6cceb0..5ed69b5b77 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDragSourceHelper.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDragSourceHelper.java @@ -16,13 +16,13 @@ package org.eclipse.swt.internal.ole.win32; import org.eclipse.swt.internal.win32.*; public class IDragSourceHelper extends IUnknown { -public IDragSourceHelper(long /*int*/ address) { +public IDragSourceHelper(long address) { super(address); } -public int InitializeFromBitmap(SHDRAGIMAGE pshdi, long /*int*/ pDataObject) { +public int InitializeFromBitmap(SHDRAGIMAGE pshdi, long pDataObject) { return COM.VtblCall(3, address, pshdi, pDataObject); } -public int InitializeFromWindow(long /*int*/ hwnd, POINT ppt, long /*int*/ pDataObject) { +public int InitializeFromWindow(long hwnd, POINT ppt, long pDataObject) { return COM.VtblCall(4, address, hwnd, ppt, pDataObject); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDragSourceHelper2.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDragSourceHelper2.java index f603090f90..e1c6844d04 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDragSourceHelper2.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDragSourceHelper2.java @@ -16,7 +16,7 @@ package org.eclipse.swt.internal.ole.win32; import org.eclipse.swt.internal.win32.*; public class IDragSourceHelper2 extends IDragSourceHelper { -public IDragSourceHelper2(long /*int*/ address) { +public IDragSourceHelper2(long address) { super(address); } public int SetFlags(int dwFlags) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDropTargetHelper.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDropTargetHelper.java index a6652bcd9c..2e707e340f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDropTargetHelper.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDropTargetHelper.java @@ -16,10 +16,10 @@ package org.eclipse.swt.internal.ole.win32; import org.eclipse.swt.internal.win32.*; public class IDropTargetHelper extends IUnknown { -public IDropTargetHelper(long /*int*/ address) { +public IDropTargetHelper(long address) { super(address); } -public int DragEnter(long /*int*/ hwndTarget, long /*int*/ pDataObject, POINT ppt, int dwEffect) { +public int DragEnter(long hwndTarget, long pDataObject, POINT ppt, int dwEffect) { return COM.VtblCall(3, address, hwndTarget, pDataObject, ppt, dwEffect); } public int DragLeave() { @@ -28,7 +28,7 @@ public int DragLeave() { public int DragOver(POINT ppt, int dwEffect) { return COM.VtblCall(5, address, ppt, dwEffect); } -public int Drop(long /*int*/ pDataObject, POINT ppt, int dwEffect) { +public int Drop(long pDataObject, POINT ppt, int dwEffect) { return COM.VtblCall(6, address, pDataObject, ppt, dwEffect); } public int Show(boolean fShow) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnum.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnum.java index 41ec305443..eb35c971d7 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnum.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnum.java @@ -17,13 +17,13 @@ import org.eclipse.swt.internal.win32.*; public class IEnum extends IUnknown { -public IEnum(long /*int*/ address) { +public IEnum(long address) { super(address); } -public int Clone( long /*int*/[] ppenum ){ +public int Clone( long[] ppenum ){ return OS.VtblCall(6, address, ppenum); } -public int Next(int celt, long /*int*/ rgelt, int[] pceltFetched ){ +public int Next(int celt, long rgelt, int[] pceltFetched ){ return COM.VtblCall(3, address, celt, rgelt, pceltFetched); } public int Reset() { diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumFORMATETC.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumFORMATETC.java index fffde6444c..664fe05c51 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumFORMATETC.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumFORMATETC.java @@ -14,7 +14,7 @@ package org.eclipse.swt.internal.ole.win32; public class IEnumFORMATETC extends IEnum { -public IEnumFORMATETC(long /*int*/ address) { +public IEnumFORMATETC(long address) { super(address); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumSTATSTG.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumSTATSTG.java index a333bdd9f4..80949f1699 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumSTATSTG.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumSTATSTG.java @@ -14,7 +14,7 @@ package org.eclipse.swt.internal.ole.win32; public class IEnumSTATSTG extends IEnum { -public IEnumSTATSTG(long /*int*/ address) { +public IEnumSTATSTG(long address) { super(address); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumVARIANT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumVARIANT.java index ee33a6cfa7..0efbf3774a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumVARIANT.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumVARIANT.java @@ -14,7 +14,7 @@ package org.eclipse.swt.internal.ole.win32; public class IEnumVARIANT extends IEnum { -public IEnumVARIANT(long /*int*/ address) { +public IEnumVARIANT(long address) { super(address); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IFont.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IFont.java index 24b368c07d..bd388a22fd 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IFont.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IFont.java @@ -16,10 +16,10 @@ package org.eclipse.swt.internal.ole.win32; import org.eclipse.swt.internal.win32.*; public class IFont extends IUnknown { -public IFont(long /*int*/ address) { +public IFont(long address) { super(address); } -public int get_hFont(long /*int*/[] phfont){ +public int get_hFont(long[] phfont){ return OS.VtblCall(3, address, phfont); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IMoniker.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IMoniker.java index fe5d2c8dd9..21ce83454e 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IMoniker.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IMoniker.java @@ -15,7 +15,7 @@ package org.eclipse.swt.internal.ole.win32; public class IMoniker extends IPersist { -public IMoniker(long /*int*/ address) { +public IMoniker(long address) { super(address); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleCommandTarget.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleCommandTarget.java index c5c06b45ef..313c41b3b0 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleCommandTarget.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleCommandTarget.java @@ -14,15 +14,15 @@ package org.eclipse.swt.internal.ole.win32; public class IOleCommandTarget extends IUnknown { -public IOleCommandTarget(long /*int*/ address) { +public IOleCommandTarget(long address) { super(address); } public int Exec( GUID pguidCmdGroup, // Pointer to command group int nCmdID, // Identifier of command to execute int nCmdExecOpt, // Options for executing the command - long /*int*/ pvaIn, // Pointer to input arguments - long /*int*/ pvaOut // Pointer to command output + long pvaIn, // Pointer to input arguments + long pvaOut // Pointer to command output ){ return COM.VtblCall(4, address, pguidCmdGroup, nCmdID, nCmdExecOpt, pvaIn, pvaOut); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleControl.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleControl.java index d1c14a0d7f..a2a80c5049 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleControl.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleControl.java @@ -15,7 +15,7 @@ package org.eclipse.swt.internal.ole.win32; public class IOleControl extends IUnknown { -public IOleControl(long /*int*/ address) { +public IOleControl(long address) { super(address); } public int GetControlInfo(CONTROLINFO pCI) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleDocument.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleDocument.java index b6f4c3f1e0..a248d0e717 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleDocument.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleDocument.java @@ -17,10 +17,10 @@ import org.eclipse.swt.internal.win32.*; public class IOleDocument extends IUnknown { -public IOleDocument(long /*int*/ address) { +public IOleDocument(long address) { super(address); } -public int CreateView(long /*int*/ pIPSite,long /*int*/ pstm, int dwReserved, long /*int*/[] ppView) { +public int CreateView(long pIPSite,long pstm, int dwReserved, long[] ppView) { return OS.VtblCall(3, address, pIPSite, pstm, dwReserved, ppView); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleDocumentView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleDocumentView.java index efebe480e2..c5cf7f0b55 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleDocumentView.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleDocumentView.java @@ -18,10 +18,10 @@ import org.eclipse.swt.internal.win32.*; public class IOleDocumentView extends IUnknown { -public IOleDocumentView(long /*int*/ address) { +public IOleDocumentView(long address) { super(address); } -public int SetInPlaceSite(long /*int*/ pIPSite) { +public int SetInPlaceSite(long pIPSite) { return OS.VtblCall(3, address, pIPSite); } public int SetRect(RECT prcView) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleInPlaceActiveObject.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleInPlaceActiveObject.java index eadda7a037..6114adc97a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleInPlaceActiveObject.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleInPlaceActiveObject.java @@ -17,7 +17,7 @@ import org.eclipse.swt.internal.win32.*; public class IOleInPlaceActiveObject extends IOleWindow { -public IOleInPlaceActiveObject(long /*int*/ address) { +public IOleInPlaceActiveObject(long address) { super(address); } public int TranslateAccelerator(MSG lpmsg) { @@ -30,7 +30,7 @@ public void OnFrameWindowActivate(boolean fActivate) { public void OnDocWindowActivate(boolean fActivate) { COM.VtblCall(7, getAddress(), fActivate); } -public int ResizeBorder(RECT prcBorder, long /*int*/ pUIWindow, boolean fFrameWindow) { +public int ResizeBorder(RECT prcBorder, long pUIWindow, boolean fFrameWindow) { return COM.VtblCall(8, address, prcBorder, pUIWindow, fFrameWindow); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleInPlaceObject.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleInPlaceObject.java index dbdad4f245..6f877756c4 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleInPlaceObject.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleInPlaceObject.java @@ -17,7 +17,7 @@ import org.eclipse.swt.internal.win32.*; public class IOleInPlaceObject extends IOleWindow { -public IOleInPlaceObject(long /*int*/ address) { +public IOleInPlaceObject(long address) { super(address); } public int InPlaceDeactivate() { diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleLink.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleLink.java index 785a8f981b..6299bbb621 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleLink.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleLink.java @@ -17,13 +17,13 @@ import org.eclipse.swt.internal.win32.*; public class IOleLink extends IUnknown { -public IOleLink(long /*int*/ address) { +public IOleLink(long address) { super(address); } public int BindIfRunning() { return OS.VtblCall(10, address); } -public int GetSourceMoniker(long /*int*/[] ppmk) { +public int GetSourceMoniker(long[] ppmk) { return OS.VtblCall(6, address, ppmk); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleObject.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleObject.java index 8e6715f1d8..ea55399671 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleObject.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleObject.java @@ -17,25 +17,25 @@ import org.eclipse.swt.internal.win32.*; public class IOleObject extends IUnknown { -public IOleObject(long /*int*/ address) { +public IOleObject(long address) { super(address); } -public int Advise(long /*int*/ pAdvSink, int[] pdwConnection) { +public int Advise(long pAdvSink, int[] pdwConnection) { return OS.VtblCall(19, address, pAdvSink, pdwConnection); } public int Close(int dwSaveOption) { return OS.VtblCall(6, address, dwSaveOption); } -public int DoVerb(int iVerb, MSG lpmsg, long /*int*/ pActiveSite, int lindex, long /*int*/ hwndParent, RECT lprcPosRect) { +public int DoVerb(int iVerb, MSG lpmsg, long pActiveSite, int lindex, long hwndParent, RECT lprcPosRect) { return COM.VtblCall(11, address, iVerb, lpmsg, pActiveSite, lindex, hwndParent, lprcPosRect); } -public int GetClientSite(long /*int*/[] ppvClientSite) { +public int GetClientSite(long[] ppvClientSite) { return OS.VtblCall(4, address, ppvClientSite); } public int GetExtent(int dwDrawAspect, SIZE pSizel) { return COM.VtblCall(18, address, dwDrawAspect, pSizel); } -public int SetClientSite(long /*int*/ pClientSite) { +public int SetClientSite(long pClientSite) { return OS.VtblCall(3, address, pClientSite); } public int SetExtent(int dwDrawAspect, SIZE pSizel) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleWindow.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleWindow.java index 7dc026711d..4a93d80e8f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleWindow.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleWindow.java @@ -16,10 +16,10 @@ package org.eclipse.swt.internal.ole.win32; import org.eclipse.swt.internal.win32.*; public class IOleWindow extends IUnknown { -public IOleWindow(long /*int*/ address) { +public IOleWindow(long address) { super(address); } -public int GetWindow(long /*int*/[] phwnd) { +public int GetWindow(long[] phwnd) { return OS.VtblCall(3, address, phwnd); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersist.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersist.java index 2b563d6388..fdede1c292 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersist.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersist.java @@ -15,7 +15,7 @@ package org.eclipse.swt.internal.ole.win32; public class IPersist extends IUnknown { -public IPersist(long /*int*/ address) { +public IPersist(long address) { super(address); } public int GetClassID(GUID pClassID) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistFile.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistFile.java index 609c30e3f0..b8f80c110a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistFile.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistFile.java @@ -17,22 +17,22 @@ import org.eclipse.swt.internal.win32.*; public class IPersistFile extends IPersist { -public IPersistFile(long /*int*/ address) { +public IPersistFile(long address) { super(address); } public int IsDirty() { return OS.VtblCall(4, address); } -public int Load(long /*int*/ pszFileName, int dwMode) { +public int Load(long pszFileName, int dwMode) { return OS.VtblCall(5, address, pszFileName, dwMode); } -public int Save(long /*int*/ pszFileName, boolean fRemember) { +public int Save(long pszFileName, boolean fRemember) { return COM.VtblCall(6, address, pszFileName, fRemember); } -public int SaveCompleted(long /*int*/ pszFileName) { +public int SaveCompleted(long pszFileName) { return OS.VtblCall(7, address, pszFileName); } -public int GetCurFile(long /*int*/ [] ppszFileName){ +public int GetCurFile(long [] ppszFileName){ return OS.VtblCall(8, address, ppszFileName); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistStorage.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistStorage.java index e4acf5af83..638cda9838 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistStorage.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistStorage.java @@ -17,22 +17,22 @@ import org.eclipse.swt.internal.win32.*; public class IPersistStorage extends IPersist { -public IPersistStorage(long /*int*/ address) { +public IPersistStorage(long address) { super(address); } public int IsDirty() { return OS.VtblCall(4, address); } -public int InitNew(long /*int*/ pStg) { +public int InitNew(long pStg) { return OS.VtblCall(5, address, pStg); } -public int Load(long /*int*/ pStg) { +public int Load(long pStg) { return OS.VtblCall(6, address, pStg); } -public int Save(long /*int*/ pStgSave, boolean fSameAsLoad) { +public int Save(long pStgSave, boolean fSameAsLoad) { return COM.VtblCall(7, address, pStgSave, fSameAsLoad); } -public int SaveCompleted(long /*int*/ pStgNew) { +public int SaveCompleted(long pStgNew) { return OS.VtblCall(8, address, pStgNew); } public int HandsOffStorage(){ diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistStreamInit.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistStreamInit.java index e09925b2c6..0cf1b7a7f1 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistStreamInit.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistStreamInit.java @@ -17,11 +17,11 @@ import org.eclipse.swt.internal.win32.*; public class IPersistStreamInit extends IPersist { -public IPersistStreamInit(long /*int*/ address) { +public IPersistStreamInit(long address) { super(address); } -public int Load(long /*int*/ pStm) { +public int Load(long pStm) { return OS.VtblCall(5, address, pStm); } 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 index 21a3ab71c6..f234be670d 100644 --- 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 @@ -16,11 +16,11 @@ package org.eclipse.swt.internal.ole.win32; public class IPropertyBag extends IUnknown { -public IPropertyBag (long /*int*/ address) { +public IPropertyBag (long address) { super (address); } -public int Read (long /*int*/ pszPropName, long /*int*/ pVar, long /*int*/[] pErrorLog) { +public int Read (long pszPropName, long pVar, long[] pErrorLog) { return COM.VtblCall (3, getAddress(), pszPropName, pVar, pErrorLog); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IProvideClassInfo.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IProvideClassInfo.java index 7462d68341..26dc566496 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IProvideClassInfo.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IProvideClassInfo.java @@ -17,10 +17,10 @@ import org.eclipse.swt.internal.win32.*; public class IProvideClassInfo extends IUnknown { -public IProvideClassInfo(long /*int*/ address) { +public IProvideClassInfo(long address) { super(address); } -public int GetClassInfo(long /*int*/[] ppTI) { +public int GetClassInfo(long[] ppTI) { return OS.VtblCall(3, address, ppTI); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IProvideClassInfo2.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IProvideClassInfo2.java index 3996b0bdb8..61f7fbbfa9 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IProvideClassInfo2.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IProvideClassInfo2.java @@ -15,7 +15,7 @@ package org.eclipse.swt.internal.ole.win32; public class IProvideClassInfo2 extends IProvideClassInfo { -public IProvideClassInfo2(long /*int*/ address) { +public IProvideClassInfo2(long address) { super(address); } public int GetGUID(int dwGuidKind, GUID pGUID) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IServiceProvider.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IServiceProvider.java index 395ea2717a..0ac2256dde 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IServiceProvider.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IServiceProvider.java @@ -15,10 +15,10 @@ package org.eclipse.swt.internal.ole.win32; public class IServiceProvider extends IUnknown { -public IServiceProvider(long /*int*/ address) { +public IServiceProvider(long address) { super(address); } -public int QueryService(GUID iid1, GUID iid2, long /*int*/ ppvObject[]) { +public int QueryService(GUID iid1, GUID iid2, long ppvObject[]) { return COM.VtblCall(3, address, iid1, iid2, ppvObject); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ISpecifyPropertyPages.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ISpecifyPropertyPages.java index 53192153a3..31b382d546 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ISpecifyPropertyPages.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ISpecifyPropertyPages.java @@ -15,7 +15,7 @@ package org.eclipse.swt.internal.ole.win32; public class ISpecifyPropertyPages extends IUnknown { -public ISpecifyPropertyPages(long /*int*/ address) { +public ISpecifyPropertyPages(long address) { super(address); } public int GetPages(CAUUID pPages){ diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IStorage.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IStorage.java index 799bad9fb1..046a56e7f8 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IStorage.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IStorage.java @@ -17,7 +17,7 @@ import org.eclipse.swt.internal.win32.*; public class IStorage extends IUnknown { -public IStorage(long /*int*/ address) { +public IStorage(long address) { super(address); } public int Commit(int grfCommitFlag) { @@ -27,7 +27,7 @@ public int CopyTo( int ciidExclude, //Number of elements in rgiidExclude GUID rgiidExclude, //Array of interface identifiers (IIDs) String[] snbExclude, //Points to a block of stream names in the storage object - long /*int*/ pstgDest //Points to destination storage object + long pstgDest //Points to destination storage object ){ // we only support snbExclude = null if (snbExclude != null) { @@ -40,7 +40,7 @@ public int CreateStorage( int grfMode, //Access mode for the new storage object int reserved1, //Reserved; must be zero int reserved2, //Reserved; must be zero - long /*int*/[] ppStg //Pointer to new storage object + long[] ppStg //Pointer to new storage object ){ // create a null terminated array of char @@ -56,7 +56,7 @@ public int CreateStream( int grfMode, //Access mode for the new stream int reserved1, //Reserved; must be zero int reserved2, //Reserved; must be zero - long /*int*/[] ppStm //Pointer to new stream object + long[] ppStm //Pointer to new stream object ){ // create a null terminated array of char @@ -78,9 +78,9 @@ public int DestroyElement(String pwcsName) { } public int EnumElements( int reserved1, //Reserved; must be zero - long /*int*/ reserved2, //Reserved; must be NULL + long reserved2, //Reserved; must be NULL int reserved3, //Reserved; must be zero - long /*int*/[] ppenum //Pointer to output variable that + long[] ppenum //Pointer to output variable that // receives the IEnumSTATSTG interface ){ return OS.VtblCall(11, address, reserved1, reserved2, reserved3, ppenum); @@ -88,11 +88,11 @@ public int EnumElements( public int OpenStorage( String pwcsName, //Pointer to the name of the // storage object to open - long /*int*/ pstgPriority, //Must be NULL. + long pstgPriority, //Must be NULL. int grfMode, //Access mode for the new storage object String snbExclude[], //Must be NULL. int reserved, //Reserved; must be zero - long /*int*/[] ppStg //Pointer to opened storage object + long[] ppStg //Pointer to opened storage object ){ // create a null terminated array of char @@ -109,10 +109,10 @@ public int OpenStorage( } public int OpenStream( String pwcsName, //Pointer to name of stream to open - long /*int*/ reserved1, //Reserved; must be NULL + long reserved1, //Reserved; must be NULL int grfMode, //Access mode for the new stream int reserved2, //Reserved; must be zero - long /*int*/[] ppStm //Pointer to output variable + long[] ppStm //Pointer to output variable // that receives the IStream interface pointer ) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IStream.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IStream.java index f92973db82..18e73508cc 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IStream.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IStream.java @@ -16,11 +16,11 @@ package org.eclipse.swt.internal.ole.win32; import org.eclipse.swt.internal.win32.*; public class IStream extends IUnknown { -public IStream(long /*int*/ address) { +public IStream(long address) { super(address); } public int Clone( - long /*int*/[] ppstm //Pointer to location for pointer to the new stream object + long[] ppstm //Pointer to location for pointer to the new stream object ){ return OS.VtblCall(13, address, ppstm); } @@ -28,13 +28,13 @@ public int Commit( int grfCommitFlags //Specifies how changes are committed ){ return OS.VtblCall(8, address, grfCommitFlags); } -public int Read(long /*int*/ pv, int cb, int[] pcbWritten) { +public int Read(long pv, int cb, int[] pcbWritten) { return COM.VtblCall(3, address, pv, cb, pcbWritten); } public int Revert(){ return OS.VtblCall(9, address); } -public int Write(long /*int*/ pv, int cb, int[] pcbWritten) { +public int Write(long pv, int cb, int[] pcbWritten) { return COM.VtblCall(4, address, pv, cb, pcbWritten); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ITypeInfo.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ITypeInfo.java index e1690ee8f3..6f9e415857 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ITypeInfo.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ITypeInfo.java @@ -20,16 +20,16 @@ import org.eclipse.swt.internal.win32.*; public class ITypeInfo extends IUnknown { -public ITypeInfo(long /*int*/ address) { +public ITypeInfo(long address) { super(address); } public int GetDocumentation(int index, String[] name, String[] docString, int[] pdwHelpContext, String[] helpFile ) { - long /*int*/[] pBstrName = null; - if (name != null) pBstrName = new long /*int*/[1]; - long /*int*/[] pBstrDocString = null; - if (docString != null) pBstrDocString = new long /*int*/[1]; - long /*int*/[] pBstrHelpFile = null; - if (helpFile != null) pBstrHelpFile = new long /*int*/[1]; + long[] pBstrName = null; + if (name != null) pBstrName = new long[1]; + long[] pBstrDocString = null; + if (docString != null) pBstrDocString = new long[1]; + long[] pBstrHelpFile = null; + if (helpFile != null) pBstrHelpFile = new long[1]; int rc = COM.VtblCall(12, address, index, pBstrName, pBstrDocString, pdwHelpContext, pBstrHelpFile); if (name != null && pBstrName[0] != 0) { int size = COM.SysStringByteLen(pBstrName[0]); @@ -72,7 +72,7 @@ public int GetDocumentation(int index, String[] name, String[] docString, int[] } return rc; } -public int GetFuncDesc(int index, long /*int*/[] ppFuncDesc) { +public int GetFuncDesc(int index, long[] ppFuncDesc) { return OS.VtblCall(5, address, index, ppFuncDesc); } public int GetIDsOfNames(String[] rgszNames, int cNames, int[] pMemId) { @@ -81,9 +81,9 @@ public int GetIDsOfNames(String[] rgszNames, int cNames, int[] pMemId) { int size = rgszNames.length; // create an array to hold the addresses - long /*int*/ hHeap = OS.GetProcessHeap(); - long /*int*/ ppNames = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, size * C.PTR_SIZEOF); - long /*int*/[] memTracker = new long /*int*/[size]; + long hHeap = OS.GetProcessHeap(); + long ppNames = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, size * C.PTR_SIZEOF); + long[] memTracker = new long[size]; try { // add the address of each string to the array @@ -94,10 +94,10 @@ public int GetIDsOfNames(String[] rgszNames, int cNames, int[] pMemId) { buffer = new char[nameSize +1]; rgszNames[i].getChars(0, nameSize, buffer, 0); // get the address of the start of the array of char - long /*int*/ pName = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, buffer.length * 2); + long pName = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, buffer.length * 2); OS.MoveMemory(pName, buffer, buffer.length * 2); // copy the address to the array of addresses - OS.MoveMemory(ppNames + C.PTR_SIZEOF * i, new long /*int*/[]{pName}, C.PTR_SIZEOF); + OS.MoveMemory(ppNames + C.PTR_SIZEOF * i, new long[]{pName}, C.PTR_SIZEOF); // keep track of the Global Memory so we can free it memTracker[i] = pName; } @@ -119,7 +119,7 @@ public int GetImplTypeFlags(int index, int[] pImplTypeFlags) { public int GetNames(int memid, String[] names, int cMaxNames, int[] pcNames){ int nameSize = names.length; - long /*int*/[] rgBstrNames = new long /*int*/[nameSize]; + long[] rgBstrNames = new long[nameSize]; int rc = COM.VtblCall(7, address, memid, rgBstrNames, nameSize, pcNames); if (rc == COM.S_OK) { @@ -140,25 +140,25 @@ public int GetNames(int memid, String[] names, int cMaxNames, int[] pcNames){ return rc; } -public int GetRefTypeInfo(int hRefType, long /*int*/[] ppTInfo) { +public int GetRefTypeInfo(int hRefType, long[] ppTInfo) { return OS.VtblCall(14, address, hRefType, ppTInfo); } public int GetRefTypeOfImplType(int index, int[] pRefType) { return OS.VtblCall(8, address, index, pRefType); } -public int GetTypeAttr(long /*int*/[] ppTypeAttr) { +public int GetTypeAttr(long[] ppTypeAttr) { return OS.VtblCall(3, address, ppTypeAttr); } -public int GetVarDesc(int index, long /*int*/[] ppVarDesc ) { +public int GetVarDesc(int index, long[] ppVarDesc ) { return OS.VtblCall(6, address, index, ppVarDesc); } -public int ReleaseFuncDesc(long /*int*/ pFuncDesc ) { +public int ReleaseFuncDesc(long pFuncDesc ) { return OS.VtblCall(20, address, pFuncDesc); } -public int ReleaseTypeAttr(long /*int*/ pTypeAttr) { +public int ReleaseTypeAttr(long pTypeAttr) { return OS.VtblCall(19, address, pTypeAttr); } -public int ReleaseVarDesc(long /*int*/ pVarDesc ) { +public int ReleaseVarDesc(long pVarDesc ) { return OS.VtblCall(21, address, pVarDesc); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IUnknown.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IUnknown.java index 99089c7d5b..3524caade8 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IUnknown.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IUnknown.java @@ -17,17 +17,17 @@ import org.eclipse.swt.internal.win32.*; public class IUnknown { - long /*int*/ address; -public IUnknown(long /*int*/ address) { + long address; +public IUnknown(long address) { this.address = address; } public int AddRef() { return OS.VtblCall(1, address); } -public long /*int*/ getAddress() { +public long getAddress() { return address; } -public int QueryInterface(GUID riid, long /*int*/[] ppvObject) { +public int QueryInterface(GUID riid, long[] ppvObject) { return COM.VtblCall(0, address, riid, ppvObject); } public int Release() { diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IViewObject2.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IViewObject2.java index 5becd13db0..d5aef32572 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IViewObject2.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IViewObject2.java @@ -17,13 +17,13 @@ import org.eclipse.swt.internal.win32.*; public class IViewObject2 extends IUnknown { -public IViewObject2(long /*int*/ address) { +public IViewObject2(long address) { super(address); } public int GetExtent(int dwAspect, int lindex, DVTARGETDEVICE ptd, SIZE lpsizel) { return COM.VtblCall(9, address, dwAspect, lindex, ptd, lpsizel); } -public int SetAdvise(int dwAspects, int dwAdvf, long /*int*/ pIAdviseSink) { +public int SetAdvise(int dwAspects, int dwAdvf, long pIAdviseSink) { return COM.VtblCall(7, address, dwAspects, dwAdvf, pIAdviseSink); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/OLEINPLACEFRAMEINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/OLEINPLACEFRAMEINFO.java index a845fc2529..1c28d09ba8 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/OLEINPLACEFRAMEINFO.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/OLEINPLACEFRAMEINFO.java @@ -17,9 +17,9 @@ public final class OLEINPLACEFRAMEINFO { public int cb; public int fMDIApp; /** @field cast=(HWND) */ - public long /*int*/ hwndFrame; + public long hwndFrame; /** @field cast=(HACCEL) */ - public long /*int*/ haccel; + public long haccel; public int cAccelEntries; public static final int sizeof = COM.OLEINPLACEFRAMEINFO_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/STATSTG.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/STATSTG.java index 2a83c1f5ef..0dfb29b581 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/STATSTG.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/STATSTG.java @@ -15,7 +15,7 @@ package org.eclipse.swt.internal.ole.win32; public class STATSTG { /** @field cast=(LPWSTR) */ - public long /*int*/ pwcsName; + public long pwcsName; public int type; /** @field accessor=cbSize.QuadPart */ public long cbSize; diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/STGMEDIUM.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/STGMEDIUM.java index 51e884fb58..4f25f70a97 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/STGMEDIUM.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/STGMEDIUM.java @@ -16,8 +16,8 @@ package org.eclipse.swt.internal.ole.win32; public final class STGMEDIUM { public int tymed; /** @field accessor=hGlobal,cast=(HGLOBAL) */ - public long /*int*/ unionField; + public long unionField; /** @field cast=(IUnknown *) */ - public long /*int*/ pUnkForRelease; + public long pUnkForRelease; public static final int sizeof = COM.STGMEDIUM_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/TYPEATTR.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/TYPEATTR.java index 292e35d839..97e9b2feae 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/TYPEATTR.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/TYPEATTR.java @@ -28,7 +28,7 @@ public final class TYPEATTR { public int memidConstructor; public int memidDestructor; /** @field cast=(OLECHAR FAR *) */ - public long /*int*/ lpstrSchema; + public long lpstrSchema; public int cbSizeInstance; public int typekind; public short cFuncs; @@ -41,7 +41,7 @@ public final class TYPEATTR { public short wMinorVerNum; // TYPEDESC tdescAlias /** @field accessor=tdescAlias.lptdesc,cast=(struct FARSTRUCT tagTYPEDESC FAR *) */ - public long /*int*/ tdescAlias_unionField; + public long tdescAlias_unionField; /** @field accessor=tdescAlias.vt */ public short tdescAlias_vt; // IDLDESC idldesctype diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/VARDESC.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/VARDESC.java index 4e825bd78d..0618a7b927 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/VARDESC.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/VARDESC.java @@ -16,17 +16,17 @@ package org.eclipse.swt.internal.ole.win32; public class VARDESC { public int memid; /** @field cast=(OLECHAR FAR *) */ - public long /*int*/ lpstrSchema; + public long lpstrSchema; public int oInst; // ELEMDESC elemdescVar // TYPEDESC elemdescVar.tdesc /** @field accessor=elemdescVar.tdesc.lptdesc,cast=(struct FARSTRUCT tagTYPEDESC FAR *) */ - public long /*int*/ elemdescVar_tdesc_union; + public long elemdescVar_tdesc_union; /** @field accessor=elemdescVar.tdesc.vt */ public short elemdescVar_tdesc_vt; // PARAMDESC elemdescFunc.paramdesc /** @field accessor=elemdescVar.paramdesc.pparamdescex,cast=(LPPARAMDESCEX) */ - public long /*int*/ elemdescVar_paramdesc_pparamdescex; + public long elemdescVar_paramdesc_pparamdescex; /** @field accessor=elemdescVar.paramdesc.wParamFlags */ public short elemdescVar_paramdesc_wParamFlags; public short wVarFlags; diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/ACTCTX.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/ACTCTX.java index 4145171c91..4b187b3903 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/ACTCTX.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/ACTCTX.java @@ -17,16 +17,16 @@ public class ACTCTX { public int cbSize; public int dwFlags; /** @field cast=(LPCTSTR) */ - public long /*int*/ lpSource; + public long lpSource; public short wProcessorArchitecture; public short wLangId; /** @field cast=(LPCTSTR) */ - public long /*int*/ lpAssemblyDirectory; + public long lpAssemblyDirectory; /** @field cast=(LPCTSTR) */ - public long /*int*/ lpResourceName; + public long lpResourceName; /** @field cast=(LPCTSTR) */ - public long /*int*/ lpApplicationName; + public long lpApplicationName; /** @field cast=(HMODULE) */ - public long /*int*/ hModule; + public long hModule; public static final int sizeof = OS.ACTCTX_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BITMAP.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BITMAP.java index fe3cf842e0..01084c607a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BITMAP.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BITMAP.java @@ -21,6 +21,6 @@ public class BITMAP { public short bmPlanes; public short bmBitsPixel; /** @field cast=(LPVOID) */ - public long /*int*/ bmBits; + public long bmBits; public static final int sizeof = OS.BITMAP_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BP_PAINTPARAMS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BP_PAINTPARAMS.java index a8a4048f94..388560f3cb 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BP_PAINTPARAMS.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BP_PAINTPARAMS.java @@ -17,8 +17,8 @@ public class BP_PAINTPARAMS { public int cbSize; public int dwFlags; /** @field cast=(RECT*) */ - public long /*int*/ prcExclude; + public long prcExclude; /** @field cast=(BLENDFUNCTION*) */ - public long /*int*/ pBlendFunction; + public long pBlendFunction; public static final int sizeof = OS.BP_PAINTPARAMS_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BROWSEINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BROWSEINFO.java index ac60f6e9b2..3a9ee0731b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BROWSEINFO.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BROWSEINFO.java @@ -15,17 +15,17 @@ package org.eclipse.swt.internal.win32; public class BROWSEINFO { /** @field cast=(HWND) */ - public long /*int*/ hwndOwner; + public long hwndOwner; /** @field cast=(LPCITEMIDLIST) */ - public long /*int*/ pidlRoot; + public long pidlRoot; /** @field cast=(LPTSTR) */ - public long /*int*/ pszDisplayName; + public long pszDisplayName; /** @field cast=(LPCTSTR) */ - public long /*int*/ lpszTitle; + public long lpszTitle; public int ulFlags; /** @field cast=(BFFCALLBACK) */ - public long /*int*/ lpfn; - public long /*int*/ lParam; + public long lpfn; + public long lParam; public int iImage; public static final int sizeof = OS.BROWSEINFO_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BUTTON_IMAGELIST.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BUTTON_IMAGELIST.java index a74138089e..13b39edd7c 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BUTTON_IMAGELIST.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BUTTON_IMAGELIST.java @@ -15,7 +15,7 @@ package org.eclipse.swt.internal.win32; public class BUTTON_IMAGELIST { /** @field cast=(HIMAGELIST) */ - public long /*int*/ himl; + public long himl; /** @field accessor=margin.left,cast=(LONG) */ public int margin_left; /** @field accessor=margin.top,cast=(LONG) */ diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CERT_CONTEXT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CERT_CONTEXT.java index 79fa46d377..d4bb416b26 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CERT_CONTEXT.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CERT_CONTEXT.java @@ -17,12 +17,12 @@ package org.eclipse.swt.internal.win32; public class CERT_CONTEXT { public int dwCertEncodingType; /** @field cast=(BYTE *) */ - public long /*int*/ pbCertEncoded; + public long pbCertEncoded; public int cbCertEncoded; /** @field cast=(PCERT_INFO) */ - public long /*int*/ pCertInfo; + public long pCertInfo; /** @field cast=(HCERTSTORE) */ - public long /*int*/ hCertStore; + public long hCertStore; public static final int sizeof = OS.CERT_CONTEXT_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CERT_INFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CERT_INFO.java index 987c45e81a..f38f3aaafe 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CERT_INFO.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CERT_INFO.java @@ -27,7 +27,7 @@ public class CERT_INFO { public CRYPT_BIT_BLOB SubjectUniqueId = new CRYPT_BIT_BLOB (); public int cExtension; /** @field cast=(PCERT_EXTENSION) */ - public long /*int*/ rgExtension; + public long rgExtension; public static final int sizeof = OS.CERT_INFO_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CERT_NAME_BLOB.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CERT_NAME_BLOB.java index c2452c5cfc..c563cbc3b2 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CERT_NAME_BLOB.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CERT_NAME_BLOB.java @@ -17,7 +17,7 @@ package org.eclipse.swt.internal.win32; public class CERT_NAME_BLOB { public int cbData; /** @field cast=(BYTE *) */ - public long /*int*/ pbData; + public long pbData; static final public int sizeof = OS.CERT_NAME_BLOB_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CHOOSECOLOR.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CHOOSECOLOR.java index c158a49365..22015a0cac 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CHOOSECOLOR.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CHOOSECOLOR.java @@ -16,17 +16,17 @@ package org.eclipse.swt.internal.win32; public class CHOOSECOLOR { public int lStructSize; /** @field cast=(HWND) */ - public long /*int*/ hwndOwner; + public long hwndOwner; /** @field cast=(HANDLE) */ - public long /*int*/ hInstance; + public long hInstance; public int rgbResult; /** @field cast=(COLORREF *) */ - public long /*int*/ lpCustColors; + public long lpCustColors; public int Flags; - public long /*int*/ lCustData; + public long lCustData; /** @field cast=(LPCCHOOKPROC) */ - public long /*int*/ lpfnHook; + public long lpfnHook; /** @field cast=(LPCTSTR) */ - public long /*int*/ lpTemplateName; + public long lpTemplateName; public static final int sizeof = OS.CHOOSECOLOR_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CHOOSEFONT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CHOOSEFONT.java index 1c3e4e6803..5b0773cd9a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CHOOSEFONT.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CHOOSEFONT.java @@ -16,23 +16,23 @@ package org.eclipse.swt.internal.win32; public class CHOOSEFONT { public int lStructSize; /** @field cast=(HWND) */ - public long /*int*/ hwndOwner; + public long hwndOwner; /** @field cast=(HDC) */ - public long /*int*/ hDC; + public long hDC; /** @field cast=(LPLOGFONT) */ - public long /*int*/ lpLogFont; + public long lpLogFont; public int iPointSize; public int Flags; public int rgbColors; - public long /*int*/ lCustData; + public long lCustData; /** @field cast=(LPCFHOOKPROC) */ - public long /*int*/ lpfnHook; + public long lpfnHook; /** @field cast=(LPCTSTR) */ - public long /*int*/ lpTemplateName; + public long lpTemplateName; /** @field cast=(HINSTANCE) */ - public long /*int*/ hInstance; + public long hInstance; /** @field cast=(LPTSTR) */ - public long /*int*/ lpszStyle; + public long lpszStyle; public short nFontType; public int nSizeMin; public int nSizeMax; diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/COMBOBOXINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/COMBOBOXINFO.java index 4c990d0270..aa46d5fa5a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/COMBOBOXINFO.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/COMBOBOXINFO.java @@ -33,10 +33,10 @@ public class COMBOBOXINFO { public int buttonBottom; public int stateButton; /** @field cast=(HWND) */ - public long /*int*/ hwndCombo; + public long hwndCombo; /** @field cast=(HWND) */ - public long /*int*/ hwndItem; + public long hwndItem; /** @field cast=(HWND) */ - public long /*int*/ hwndList; + public long hwndList; public static final int sizeof = OS.COMBOBOXINFO_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CREATESTRUCT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CREATESTRUCT.java index e12ff6e1be..0f25f7af24 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CREATESTRUCT.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CREATESTRUCT.java @@ -15,22 +15,22 @@ package org.eclipse.swt.internal.win32; public class CREATESTRUCT { /** @field cast=(LPVOID) */ - public long /*int*/ lpCreateParams; + public long lpCreateParams; /** @field cast=(HINSTANCE) */ - public long /*int*/ hInstance; + public long hInstance; /** @field cast=(HMENU) */ - public long /*int*/ hMenu; + public long hMenu; /** @field cast=(HWND) */ - public long /*int*/ hwndParent; + public long hwndParent; public int cy; public int cx; public int y; public int x; public int style; /** @field cast=(LPCTSTR) */ - public long /*int*/ lpszName; + public long lpszName; /** @field cast=(LPCTSTR) */ - public long /*int*/ lpszClass; + public long lpszClass; public int dwExStyle; public static final int sizeof = OS.CREATESTRUCT_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CRYPT_ALGORITHM_IDENTIFIER.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CRYPT_ALGORITHM_IDENTIFIER.java index 80f3f0e7ce..47d3c4216b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CRYPT_ALGORITHM_IDENTIFIER.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CRYPT_ALGORITHM_IDENTIFIER.java @@ -16,7 +16,7 @@ package org.eclipse.swt.internal.win32; public class CRYPT_ALGORITHM_IDENTIFIER { /** @field cast=(LPSTR) */ - public long /*int*/ pszObjId; + public long pszObjId; public CRYPT_OBJID_BLOB Parameters = new CRYPT_OBJID_BLOB (); static final public int sizeof = OS.CRYPT_ALGORITHM_IDENTIFIER_sizeof (); diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CRYPT_BIT_BLOB.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CRYPT_BIT_BLOB.java index 33a3e4d501..a6cb3b1ef4 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CRYPT_BIT_BLOB.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CRYPT_BIT_BLOB.java @@ -17,7 +17,7 @@ package org.eclipse.swt.internal.win32; public class CRYPT_BIT_BLOB { public int cbData; /** @field cast=(BYTE *) */ - public long /*int*/ pbData; + public long pbData; public int cUnusedBits; static final public int sizeof = OS.CRYPT_BIT_BLOB_sizeof (); diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CRYPT_INTEGER_BLOB.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CRYPT_INTEGER_BLOB.java index 6a04f2c1ee..1d83007c86 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CRYPT_INTEGER_BLOB.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CRYPT_INTEGER_BLOB.java @@ -17,7 +17,7 @@ package org.eclipse.swt.internal.win32; public class CRYPT_INTEGER_BLOB { public int cbData; /** @field cast=(BYTE *) */ - public long /*int*/ pbData; + public long pbData; static final public int sizeof = OS.CRYPT_INTEGER_BLOB_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CRYPT_OBJID_BLOB.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CRYPT_OBJID_BLOB.java index c57acceec0..56cccdf923 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CRYPT_OBJID_BLOB.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CRYPT_OBJID_BLOB.java @@ -17,7 +17,7 @@ package org.eclipse.swt.internal.win32; public class CRYPT_OBJID_BLOB { public int cbData; /** @field cast=(BYTE *) */ - public long /*int*/ pbData; + public long pbData; static final public int sizeof = OS.CRYPT_OBJID_BLOB_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DIBSECTION.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DIBSECTION.java index 23fc7794ef..80bebafa3b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DIBSECTION.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DIBSECTION.java @@ -43,7 +43,7 @@ public class DIBSECTION extends BITMAP { /** @field accessor=dsBitfields[2] */ public int dsBitfields2; /** @field cast=(HANDLE) */ - public long /*int*/ dshSection; + public long dshSection; public int dsOffset; public static final int sizeof = OS.DIBSECTION_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DOCHOSTUIINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DOCHOSTUIINFO.java index 3dc5f2dc48..5cca035f3c 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DOCHOSTUIINFO.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DOCHOSTUIINFO.java @@ -18,8 +18,8 @@ public class DOCHOSTUIINFO { public int dwFlags; public int dwDoubleClick; /** @field cast=(OLECHAR *) */ - public long /*int*/ pchHostCss; + public long pchHostCss; /** @field cast=(OLECHAR *) */ - public long /*int*/ pchHostNS; + public long pchHostNS; public static final int sizeof = OS.DOCHOSTUIINFO_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DOCINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DOCINFO.java index 6ebab62159..e0ad9abfa3 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DOCINFO.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DOCINFO.java @@ -16,11 +16,11 @@ package org.eclipse.swt.internal.win32; public class DOCINFO { public int cbSize; /** @field cast=(LPCTSTR) */ - public long /*int*/ lpszDocName; // LPCTSTR + public long lpszDocName; // LPCTSTR /** @field cast=(LPCTSTR) */ - public long /*int*/ lpszOutput; // LPCTSTR + public long lpszOutput; // LPCTSTR /** @field cast=(LPCTSTR) */ - public long /*int*/ lpszDatatype;// LPCTSTR + public long lpszDatatype;// LPCTSTR public int fwType; // DWORD public static final int sizeof = OS.DOCINFO_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DRAWITEMSTRUCT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DRAWITEMSTRUCT.java index 32ad51e8df..0a7cb9427a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DRAWITEMSTRUCT.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DRAWITEMSTRUCT.java @@ -20,9 +20,9 @@ public class DRAWITEMSTRUCT { public int itemAction; public int itemState; /** @field cast=(HWND) */ - public long /*int*/ hwndItem; + public long hwndItem; /** @field cast=(HDC) */ - public long /*int*/ hDC; + public long hDC; // RECT rcItem; /** @field accessor=rcItem.left */ public int left; @@ -32,6 +32,6 @@ public class DRAWITEMSTRUCT { public int bottom; /** @field accessor=rcItem.right */ public int right; - public long /*int*/ itemData; + public long itemData; public static final int sizeof = OS.DRAWITEMSTRUCT_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DTTOPTS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DTTOPTS.java index c79349d625..a642165f91 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DTTOPTS.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DTTOPTS.java @@ -29,7 +29,7 @@ public class DTTOPTS { public boolean fApplyOverlay; public int iGlowSize; /** @field cast=(DTT_CALLBACK_PROC) */ - public long /*int*/ pfnDrawTextCallback; - public long /*int*/ lParam; + public long pfnDrawTextCallback; + public long lParam; public static final int sizeof = OS.DTTOPTS_sizeof (); }
\ No newline at end of file diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/GCP_RESULTS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/GCP_RESULTS.java index 884a5dd657..00312c6553 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/GCP_RESULTS.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/GCP_RESULTS.java @@ -16,17 +16,17 @@ package org.eclipse.swt.internal.win32; public class GCP_RESULTS { public int lStructSize; /** @field cast=(LPTSTR) */ - public long /*int*/ lpOutString; + public long lpOutString; /** @field cast=(UINT *) */ - public long /*int*/ lpOrder; + public long lpOrder; /** @field cast=(int *) */ - public long /*int*/ lpDx; + public long lpDx; /** @field cast=(int *) */ - public long /*int*/ lpCaretPos; + public long lpCaretPos; /** @field cast=(LPSTR) */ - public long /*int*/ lpClass; + public long lpClass; /** @field cast=(LPWSTR) */ - public long /*int*/ lpGlyphs; + public long lpGlyphs; public int nGlyphs; public int nMaxFit; public static final int sizeof = OS.GCP_RESULTS_sizeof (); diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/GESTUREINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/GESTUREINFO.java index 54e1748a8c..991c6a9713 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/GESTUREINFO.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/GESTUREINFO.java @@ -18,7 +18,7 @@ public class GESTUREINFO { public int dwFlags; public int dwID; /** @field cast=(HWND) */ - public long /*int*/ hwndTarget; + public long hwndTarget; // POINTS ptsLocation /** @field accessor=ptsLocation.x */ public short x; diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/GUITHREADINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/GUITHREADINFO.java index 53fca826dc..4b25342791 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/GUITHREADINFO.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/GUITHREADINFO.java @@ -19,17 +19,17 @@ public class GUITHREADINFO { /** @field cast=(DWORD) */ public int flags; /** @field cast=(HWND) */ - public long /*int*/ hwndActive; + public long hwndActive; /** @field cast=(HWND) */ - public long /*int*/ hwndFocus; + public long hwndFocus; /** @field cast=(HWND) */ - public long /*int*/ hwndCapture; + public long hwndCapture; /** @field cast=(HWND) */ - public long /*int*/ hwndMenuOwner; + public long hwndMenuOwner; /** @field cast=(HWND) */ - public long /*int*/ hwndMoveSize; + public long hwndMoveSize; /** @field cast=(HWND) */ - public long /*int*/ hwndCaret; + public long hwndCaret; // RECT rcCaret; /** @field accessor=rcCaret.left */ public int left; diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HDITEM.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HDITEM.java index a393ad7e27..57503ae7c9 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HDITEM.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HDITEM.java @@ -17,16 +17,16 @@ public class HDITEM { public int mask; public int cxy; /** @field cast=(LPTSTR) */ - public long /*int*/ pszText; + public long pszText; /** @field cast=(HBITMAP) */ - public long /*int*/ hbm; + public long hbm; public int cchTextMax; public int fmt; - public long /*int*/ lParam; + public long lParam; public int iImage; public int iOrder; public int type; /** @field cast=(void *) */ - public long /*int*/ pvFilter; + public long pvFilter; public static int sizeof = OS.HDITEM_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HDLAYOUT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HDLAYOUT.java index 7cb25fca62..59c67a2450 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HDLAYOUT.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HDLAYOUT.java @@ -15,8 +15,8 @@ package org.eclipse.swt.internal.win32; public class HDLAYOUT { /** @field cast=(RECT *) */ - public long /*int*/ prc; + public long prc; /** @field cast=(WINDOWPOS *) */ - public long /*int*/ pwpos; + public long pwpos; public static final int sizeof = OS.HDLAYOUT_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HELPINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HELPINFO.java index d5d6ffc261..91163409f6 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HELPINFO.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HELPINFO.java @@ -18,7 +18,7 @@ public class HELPINFO { public int iContextType; public int iCtrlId; /** @field cast=(HANDLE) */ - public long /*int*/ hItemHandle; + public long hItemHandle; public int dwContextId; // POINT MousePos /** @field accessor=MousePos.x */ diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HIGHCONTRAST.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HIGHCONTRAST.java index 69fddfd480..aff9bc1a1d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HIGHCONTRAST.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HIGHCONTRAST.java @@ -17,6 +17,6 @@ public class HIGHCONTRAST { public int cbSize; public int dwFlags; /** @field cast=(LPTSTR) */ - public long /*int*/ lpszDefaultScheme; + public long lpszDefaultScheme; public static final int sizeof = OS.HIGHCONTRAST_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/ICONINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/ICONINFO.java index f47e322ee6..edc107fb5c 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/ICONINFO.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/ICONINFO.java @@ -18,8 +18,8 @@ public class ICONINFO { public int xHotspot; public int yHotspot; /** @field cast=(HBITMAP) */ - public long /*int*/ hbmMask; + public long hbmMask; /** @field cast=(HBITMAP) */ - public long /*int*/ hbmColor; + public long hbmColor; public static final int sizeof = OS.ICONINFO_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/KEYBDINPUT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/KEYBDINPUT.java index ce7272c7d1..d502bc0b24 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/KEYBDINPUT.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/KEYBDINPUT.java @@ -18,6 +18,6 @@ public class KEYBDINPUT { public short wScan; public int dwFlags; public int time; - public long /*int*/ dwExtraInfo; + public long dwExtraInfo; public static final int sizeof = OS.KEYBDINPUT_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LOGBRUSH.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LOGBRUSH.java index a7eb9ac3ff..0b09d1586d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LOGBRUSH.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LOGBRUSH.java @@ -16,6 +16,6 @@ package org.eclipse.swt.internal.win32; public class LOGBRUSH { public int lbStyle; public int lbColor; - public long /*int*/ lbHatch; + public long lbHatch; public static final int sizeof = OS.LOGBRUSH_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LRESULT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LRESULT.java index 6821254273..c76f7e2cac 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LRESULT.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LRESULT.java @@ -15,11 +15,11 @@ package org.eclipse.swt.internal.win32; /** @jniclass flags=no_gen */ public class LRESULT { - public long /*int*/ value; + public long value; public static final LRESULT ONE = new LRESULT (1); public static final LRESULT ZERO = new LRESULT (0); -public LRESULT (long /*int*/ value) { +public LRESULT (long value) { this.value = value; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LVCOLUMN.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LVCOLUMN.java index ce1807ddfd..b30d10fa23 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LVCOLUMN.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LVCOLUMN.java @@ -18,7 +18,7 @@ public class LVCOLUMN { public int fmt; public int cx; /** @field cast=(LPTSTR) */ - public long /*int*/ pszText; + public long pszText; public int cchTextMax; public int iSubItem; public int iImage; diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LVITEM.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LVITEM.java index 8a0fde81f1..ccfc1c1edb 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LVITEM.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LVITEM.java @@ -20,14 +20,14 @@ public class LVITEM { public int state; public int stateMask; /** @field cast=(LPTSTR) */ - public long /*int*/ pszText; + public long pszText; public int cchTextMax; public int iImage; - public long /*int*/ lParam; + public long lParam; public int iIndent; public int iGroupId; public int cColumns; /** @field cast=(PUINT) */ - public long /*int*/ puColumns; + public long puColumns; public static final int sizeof = OS.LVITEM_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MEASUREITEMSTRUCT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MEASUREITEMSTRUCT.java index 890d1a6dfc..8d719d3804 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MEASUREITEMSTRUCT.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MEASUREITEMSTRUCT.java @@ -19,6 +19,6 @@ public class MEASUREITEMSTRUCT { public int itemID; public int itemWidth; public int itemHeight; - public long /*int*/ itemData; + public long itemData; public static final int sizeof = OS.MEASUREITEMSTRUCT_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MENUBARINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MENUBARINFO.java index fdfd5a725b..873e646df3 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MENUBARINFO.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MENUBARINFO.java @@ -25,9 +25,9 @@ public class MENUBARINFO { /** @field accessor=rcBar.bottom */ public int bottom; /** @field cast=(HMENU) */ - public long /*int*/ hMenu; + public long hMenu; /** @field cast=(HWND) */ - public long /*int*/ hwndMenu; + public long hwndMenu; public boolean fBarFocused; public boolean fFocused; public static final int sizeof = OS.MENUBARINFO_sizeof (); diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MENUINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MENUINFO.java index 613cc04cd0..cfb2a7f7af 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MENUINFO.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MENUINFO.java @@ -19,8 +19,8 @@ public class MENUINFO { public int dwStyle; public int cyMax; /** @field cast=(HBRUSH) */ - public long /*int*/ hbrBack; + public long hbrBack; public int dwContextHelpID; - public long /*int*/ dwMenuData; + public long dwMenuData; public static final int sizeof = OS.MENUINFO_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MENUITEMINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MENUITEMINFO.java index 9a5c6fa6a8..63df535687 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MENUITEMINFO.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MENUITEMINFO.java @@ -20,16 +20,16 @@ public class MENUITEMINFO { public int fState; public int wID; /** @field cast=(HMENU) */ - public long /*int*/ hSubMenu; + public long hSubMenu; /** @field cast=(HBITMAP) */ - public long /*int*/ hbmpChecked; + public long hbmpChecked; /** @field cast=(HBITMAP) */ - public long /*int*/ hbmpUnchecked; - public long /*int*/ dwItemData; + public long hbmpUnchecked; + public long dwItemData; /** @field cast=(LPTSTR) */ - public long /*int*/ dwTypeData; + public long dwTypeData; public int cch; /** @field cast=(HBITMAP) */ - public long /*int*/ hbmpItem; + public long hbmpItem; public static final int sizeof = OS.MENUITEMINFO_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MOUSEINPUT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MOUSEINPUT.java index ed7e2c7bbd..87f0f9fa58 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MOUSEINPUT.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MOUSEINPUT.java @@ -19,6 +19,6 @@ public class MOUSEINPUT { public int mouseData; public int dwFlags; public int time; - public long /*int*/ dwExtraInfo; + public long dwExtraInfo; public static final int sizeof = OS.MOUSEINPUT_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MSG.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MSG.java index 4c75016696..c4652ecfa7 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MSG.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MSG.java @@ -15,10 +15,10 @@ package org.eclipse.swt.internal.win32; public class MSG { /** @field cast=(HWND) */ - public long /*int*/ hwnd; + public long hwnd; public int message; - public long /*int*/ wParam; - public long /*int*/ lParam; + public long wParam; + public long lParam; public int time; // POINT pt; /** @field accessor=pt.x */ diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMCUSTOMDRAW.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMCUSTOMDRAW.java index 93090ea26e..5fcc48292f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMCUSTOMDRAW.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMCUSTOMDRAW.java @@ -16,7 +16,7 @@ package org.eclipse.swt.internal.win32; public class NMCUSTOMDRAW extends NMHDR { public int dwDrawStage; /** @field cast=(HDC) */ - public long /*int*/ hdc; + public long hdc; // RECT rc; /** @field accessor=rc.left */ public int left; @@ -26,8 +26,8 @@ public class NMCUSTOMDRAW extends NMHDR { public int right; /** @field accessor=rc.bottom */ public int bottom; - public long /*int*/ dwItemSpec; + public long dwItemSpec; public int uItemState; - public long /*int*/ lItemlParam; + public long lItemlParam; public static final int sizeof = OS.NMCUSTOMDRAW_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMHDR.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMHDR.java index e134786d1f..2ce1e1111e 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMHDR.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMHDR.java @@ -15,8 +15,8 @@ package org.eclipse.swt.internal.win32; public class NMHDR { /** @field cast=(HWND) */ - public long /*int*/ hwndFrom; - public long /*int*/ idFrom; + public long hwndFrom; + public long idFrom; public int code; public static final int sizeof = OS.NMHDR_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMHEADER.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMHEADER.java index 164f970e66..15b302f2fb 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMHEADER.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMHEADER.java @@ -17,6 +17,6 @@ public class NMHEADER extends NMHDR { public int iItem; public int iButton; /** @field cast=(HDITEM FAR *) */ - public long /*int*/ pitem; + public long pitem; public static int sizeof = OS.NMHEADER_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMLISTVIEW.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMLISTVIEW.java index 0af65e337d..dcbfaee2ad 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMLISTVIEW.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMLISTVIEW.java @@ -24,6 +24,6 @@ public class NMLISTVIEW extends NMHDR { public int x; /** @field accessor=ptAction.y */ public int y; - public long /*int*/ lParam; + public long lParam; public static int sizeof = OS.NMLISTVIEW_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMLVDISPINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMLVDISPINFO.java index 603826982e..3d550e8e27 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMLVDISPINFO.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMLVDISPINFO.java @@ -26,13 +26,13 @@ public class NMLVDISPINFO extends NMHDR { /** @field accessor=item.stateMask */ public int stateMask; /** @field accessor=item.pszText,cast=(LPTSTR) */ - public long /*int*/ pszText; + public long pszText; /** @field accessor=item.cchTextMax */ public int cchTextMax; /** @field accessor=item.iImage */ public int iImage; /** @field accessor=item.lParam */ - public long /*int*/ lParam; + public long lParam; /** @field accessor=item.iIndent */ public int iIndent; /** @field accessor=item.iGroupId */ @@ -40,6 +40,6 @@ public class NMLVDISPINFO extends NMHDR { /** @field accessor=item.cColumns */ public int cColumns; /** @field accessor=item.puColumns,cast=(PUINT) */ - public long /*int*/ puColumns; + public long puColumns; public static final int sizeof = OS.NMLVDISPINFO_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMLVFINDITEM.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMLVFINDITEM.java index e356ece1bf..29daa5d0d3 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMLVFINDITEM.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMLVFINDITEM.java @@ -19,9 +19,9 @@ public class NMLVFINDITEM extends NMHDR { /** @field accessor=lvfi.flags */ public int flags; /** @field accessor=lvfi.psz,cast=(LPCTSTR) */ - public long /*int*/ psz; + public long psz; /** @field accessor=lvfi.lParam */ - public long /*int*/ lParam; + public long lParam; // POINT pt; /** @field accessor=lvfi.pt.x */ public int x; diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMREBARCHEVRON.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMREBARCHEVRON.java index 783c31b0f3..85c311b894 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMREBARCHEVRON.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMREBARCHEVRON.java @@ -16,7 +16,7 @@ package org.eclipse.swt.internal.win32; public class NMREBARCHEVRON extends NMHDR { public int uBand; public int wID; - public long /*int*/ lParam; + public long lParam; // RECT rc; /** @field accessor=rc.left */ public int left; @@ -26,6 +26,6 @@ public class NMREBARCHEVRON extends NMHDR { public int right; /** @field accessor=rc.bottom */ public int bottom; - public long /*int*/ lParamNM; + public long lParamNM; public static int sizeof = OS.NMREBARCHEVRON_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTBCUSTOMDRAW.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTBCUSTOMDRAW.java index 4976f57f7b..00ef24ec8e 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTBCUSTOMDRAW.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTBCUSTOMDRAW.java @@ -16,11 +16,11 @@ package org.eclipse.swt.internal.win32; public class NMTBCUSTOMDRAW extends NMCUSTOMDRAW { public NMCUSTOMDRAW nmcd; /** @field cast=(HBRUSH) */ - public long /*int*/ hbrMonoDither; + public long hbrMonoDither; /** @field cast=(HBRUSH) */ - public long /*int*/ hbrLines; + public long hbrLines; /** @field cast=(HPEN) */ - public long /*int*/ hpenLines; + public long hpenLines; public int clrText; public int clrMark; public int clrTextHighlight; diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTOOLBAR.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTOOLBAR.java index 91d7a72262..9383762cec 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTOOLBAR.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTOOLBAR.java @@ -25,12 +25,12 @@ public class NMTOOLBAR extends NMHDR { /** @field accessor=tbButton.fsStyle */ public byte fsStyle; /** @field accessor=tbButton.dwData */ - public long /*int*/ dwData; + public long dwData; /** @field accessor=tbButton.iString */ - public long /*int*/ iString; + public long iString; public int cchText; /** @field cast=(LPTSTR) */ - public long /*int*/ pszText; + public long pszText; // RECT rcButton; /** @field accessor=rcButton.left */ public int left; diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTTDISPINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTTDISPINFO.java index 815f919960..5c040e9fa2 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTTDISPINFO.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTTDISPINFO.java @@ -15,11 +15,11 @@ package org.eclipse.swt.internal.win32; public class NMTTDISPINFO extends NMHDR { /** @field cast=(void *) */ - public long /*int*/ lpszText; + public long lpszText; public char[] szText = new char[80]; /** @field cast=(HINSTANCE) */ - public long /*int*/ hinst; + public long hinst; public int uFlags; - public long /*int*/ lParam; + public long lParam; public static final int sizeof = OS.NMTTDISPINFO_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTVDISPINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTVDISPINFO.java index c90e7e3ab0..cae9d2aa5f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTVDISPINFO.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTVDISPINFO.java @@ -18,13 +18,13 @@ public class NMTVDISPINFO extends NMHDR { /** @field accessor=item.mask */ public int mask; /** @field accessor=item.hItem,cast=(HTREEITEM) */ - public long /*int*/ hItem; + public long hItem; /** @field accessor=item.state */ public int state; /** @field accessor=item.stateMask */ public int stateMask; /** @field accessor=item.pszText,cast=(LPTSTR) */ - public long /*int*/ pszText; + public long pszText; /** @field accessor=item.cchTextMax */ public int cchTextMax; /** @field accessor=item.iImage */ @@ -34,6 +34,6 @@ public class NMTVDISPINFO extends NMHDR { /** @field accessor=item.cChildren */ public int cChildren; /** @field accessor=item.lParam */ - public long /*int*/ lParam; + public long lParam; public static final int sizeof = OS.NMTVDISPINFO_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTVITEMCHANGE.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTVITEMCHANGE.java index ee9a98c131..53f1991ec9 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTVITEMCHANGE.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTVITEMCHANGE.java @@ -16,9 +16,9 @@ package org.eclipse.swt.internal.win32; public class NMTVITEMCHANGE extends NMHDR { public int uChanged; /** @field cast=(HTREEITEM) */ - public long /*int*/ hItem; + public long hItem; public int uStateNew; public int uStateOld; - public long /*int*/ lParam; + public long lParam; public static int sizeof = OS.NMTVITEMCHANGE_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NOTIFYICONDATA.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NOTIFYICONDATA.java index b3ff09169b..d226b47a85 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NOTIFYICONDATA.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NOTIFYICONDATA.java @@ -16,12 +16,12 @@ package org.eclipse.swt.internal.win32; public class NOTIFYICONDATA { public int cbSize; /** @field cast=(HWND) */ - public long /*int*/ hWnd; + public long hWnd; public int uID; public int uFlags; public int uCallbackMessage; /** @field cast=(HICON) */ - public long /*int*/ hIcon; + public long hIcon; public char szTip[] = new char [128]; public int dwState; public int dwStateMask; diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OFNOTIFY.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OFNOTIFY.java index 3a9d2e5a1c..e213180d14 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OFNOTIFY.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OFNOTIFY.java @@ -15,8 +15,8 @@ package org.eclipse.swt.internal.win32; public class OFNOTIFY extends NMHDR { /** @field cast=(LPOPENFILENAME) */ - public long /*int*/ lpOFN; + public long lpOFN; /** @field cast=(LPTSTR) */ - public long /*int*/ pszFile; + public long pszFile; public static int sizeof = OS.OFNOTIFY_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OPENFILENAME.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OPENFILENAME.java index 60a6584083..af18ce26d8 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OPENFILENAME.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OPENFILENAME.java @@ -16,37 +16,37 @@ package org.eclipse.swt.internal.win32; public class OPENFILENAME { public int lStructSize; /** @field cast=(HWND) */ - public long /*int*/ hwndOwner; + public long hwndOwner; /** @field cast=(HINSTANCE) */ - public long /*int*/ hInstance; + public long hInstance; /** @field cast=(LPCTSTR) */ - public long /*int*/ lpstrFilter; + public long lpstrFilter; /** @field cast=(LPTSTR) */ - public long /*int*/ lpstrCustomFilter; + public long lpstrCustomFilter; public int nMaxCustFilter; public int nFilterIndex; /** @field cast=(LPTSTR) */ - public long /*int*/ lpstrFile; + public long lpstrFile; public int nMaxFile; /** @field cast=(LPTSTR) */ - public long /*int*/ lpstrFileTitle; + public long lpstrFileTitle; public int nMaxFileTitle; /** @field cast=(LPCTSTR) */ - public long /*int*/ lpstrInitialDir; + public long lpstrInitialDir; /** @field cast=(LPCTSTR) */ - public long /*int*/ lpstrTitle; + public long lpstrTitle; public int Flags; public short nFileOffset; public short nFileExtension; /** @field cast=(LPCTSTR) */ - public long /*int*/ lpstrDefExt; - public long /*int*/ lCustData; + public long lpstrDefExt; + public long lCustData; /** @field cast=(LPOFNHOOKPROC) */ - public long /*int*/ lpfnHook; + public long lpfnHook; /** @field cast=(LPCTSTR) */ - public long /*int*/ lpTemplateName; + public long lpTemplateName; /** @field cast=(void *) */ - public long /*int*/ pvReserved; + public long pvReserved; public int dwReserved; public int FlagsEx; public static final int sizeof = OS.OPENFILENAME_sizeof (); 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 0a20afaeb7..f8f55a8145 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 @@ -49,8 +49,8 @@ public class OS extends C { pActCtx.dwFlags = ACTCTX_FLAG_RESOURCE_NAME_VALID | ACTCTX_FLAG_HMODULE_VALID | ACTCTX_FLAG_SET_PROCESS_DEFAULT; pActCtx.hModule = OS.GetLibraryHandle (); pActCtx.lpResourceName = MANIFEST_RESOURCE_ID; - long /*int*/ hActCtx = OS.CreateActCtx (pActCtx); - long /*int*/ [] lpCookie = new long /*int*/ [1]; + long hActCtx = OS.CreateActCtx (pActCtx); + long [] lpCookie = new long [1]; OS.ActivateActCtx (hActCtx, lpCookie); /* * NOTE: A single activation context is created and activated @@ -1641,10 +1641,10 @@ public class OS extends C { public static final int TVIS_EXPANDED = 0x20; public static final int TVIS_SELECTED = 0x2; public static final int TVIS_STATEIMAGEMASK = 0xf000; - public static final long /*int*/ TVI_FIRST = -0x0FFFF; - public static final long /*int*/ TVI_LAST = -0x0FFFE; - public static final long /*int*/ TVI_ROOT = -0x10000; - public static final long /*int*/ TVI_SORT = -0x0FFFD; + public static final long TVI_FIRST = -0x0FFFF; + public static final long TVI_LAST = -0x0FFFE; + public static final long TVI_ROOT = -0x10000; + public static final long TVI_SORT = -0x0FFFD; public static final int TVM_CREATEDRAGIMAGE = TV_FIRST + 18; public static final int TVM_DELETEITEM = 0x1101; public static final int TVM_ENSUREVISIBLE = 0x1114; @@ -2126,7 +2126,7 @@ public static final native int WNDCLASS_sizeof (); /** Ansi/Unicode wrappers */ -public static final long /*int*/ AddFontResourceEx (TCHAR lpszFilename, int fl, long /*int*/ pdv) { +public static final long AddFontResourceEx (TCHAR lpszFilename, int fl, long pdv) { char [] lpszFilename1 = lpszFilename == null ? null : lpszFilename.chars; return AddFontResourceEx (lpszFilename1, fl, pdv); } @@ -2138,24 +2138,24 @@ public static final int AssocQueryString(int flags, int str, TCHAR pszAssoc, TCH return AssocQueryString (flags, str, pszAssoc1, pszExtra1, pszOut1, pcchOut); } -public static final long /*int*/ CreateDC (TCHAR lpszDriver, TCHAR lpszDevice, long /*int*/ lpszOutput, long /*int*/ lpInitData) { +public static final long CreateDC (TCHAR lpszDriver, TCHAR lpszDevice, long lpszOutput, long lpInitData) { char [] lpszDriver1 = lpszDriver == null ? null : lpszDriver.chars; char [] lpszDevice1 = lpszDevice == null ? null : lpszDevice.chars; return CreateDC (lpszDriver1, lpszDevice1, lpszOutput, lpInitData); } -public static final long /*int*/ CreateWindowEx (int dwExStyle, TCHAR lpClassName, TCHAR lpWindowName, int dwStyle, int X, int Y, int nWidth, int nHeight, long /*int*/ hWndParent, long /*int*/ hMenu, long /*int*/ hInstance, CREATESTRUCT lpParam) { +public static final long CreateWindowEx (int dwExStyle, TCHAR lpClassName, TCHAR lpWindowName, int dwStyle, int X, int Y, int nWidth, int nHeight, long hWndParent, long hMenu, long hInstance, CREATESTRUCT lpParam) { char [] lpClassName1 = lpClassName == null ? null : lpClassName.chars; char [] lpWindowName1 = lpWindowName == null ? null : lpWindowName.chars; return CreateWindowEx (dwExStyle, lpClassName1, lpWindowName1, dwStyle, X, Y, nWidth, nHeight, hWndParent, hMenu, hInstance, lpParam); } -public static final int DocumentProperties (long /*int*/ hWnd, long /*int*/ hPrinter, TCHAR pDeviceName, long /*int*/ pDevModeOutput, long /*int*/ pDevModeInput, int fMode) { +public static final int DocumentProperties (long hWnd, long hPrinter, TCHAR pDeviceName, long pDevModeOutput, long pDevModeInput, int fMode) { char [] pDeviceName1 = pDeviceName == null ? null : pDeviceName.chars; return DocumentProperties (hWnd, hPrinter, pDeviceName1, pDevModeOutput, pDevModeInput, fMode); } -public static final int DrawText (long /*int*/ hDC, TCHAR lpString, int nCount, RECT lpRect, int uFormat) { +public static final int DrawText (long hDC, TCHAR lpString, int nCount, RECT lpRect, int uFormat) { char [] lpString1 = lpString == null ? null : lpString.chars; return DrawText (hDC, lpString1, nCount, lpRect, uFormat); } @@ -2166,12 +2166,12 @@ public static final int ExpandEnvironmentStrings (TCHAR lpSrc, TCHAR lpDst, int return ExpandEnvironmentStrings (lpSrc1, lpDst1, nSize); } -public static final int ExtractIconEx (TCHAR lpszFile, int nIconIndex, long /*int*/ [] phiconLarge, long /*int*/ [] phiconSmall, int nIcons) { +public static final int ExtractIconEx (TCHAR lpszFile, int nIconIndex, long [] phiconLarge, long [] phiconSmall, int nIcons) { char [] lpszFile1 = lpszFile == null ? null : lpszFile.chars; return ExtractIconEx (lpszFile1, nIconIndex, phiconLarge, phiconSmall, nIcons); } -public static final boolean GetClassInfo (long /*int*/ hInstance, TCHAR lpClassName, WNDCLASS lpWndClass) { +public static final boolean GetClassInfo (long hInstance, TCHAR lpClassName, WNDCLASS lpWndClass) { boolean result; char [] lpClassName1 = lpClassName == null ? null : lpClassName.chars; @@ -2194,7 +2194,7 @@ public static final int GetLocaleInfo (int Locale, int LCType, TCHAR lpLCData, i return GetLocaleInfo (Locale, LCType, lpLCData1, cchData); } -public static final int GetModuleFileName (long /*int*/ hModule, TCHAR lpFilename, int inSize) { +public static final int GetModuleFileName (long hModule, TCHAR lpFilename, int inSize) { char [] lpFilename1 = lpFilename == null ? null : lpFilename.chars; return GetModuleFileName (hModule, lpFilename1, inSize); } @@ -2207,7 +2207,7 @@ public static final int GetProfileString (TCHAR lpAppName, TCHAR lpKeyName, TCHA return GetProfileString (lpAppName1, lpKeyName1, lpDefault1, lpReturnedString1, nSize); } -public static final int GetWindowText (long /*int*/ hWnd, TCHAR lpString, int nMaxCount) { +public static final int GetWindowText (long hWnd, TCHAR lpString, int nMaxCount) { char [] lpString1 = lpString == null ? null : lpString.chars; return GetWindowText (hWnd, lpString1, nMaxCount); } @@ -2217,7 +2217,7 @@ public static final int GlobalAddAtom (TCHAR lpString) { return GlobalAddAtom (lpString1); } -public static final long /*int*/ ImmEscape (long /*int*/ hKL,long /*int*/ hIMC, int uEscape, TCHAR lpData) { +public static final long ImmEscape (long hKL,long hIMC, int uEscape, TCHAR lpData) { char [] lpData1 = lpData == null ? null : lpData.chars; return ImmEscape (hKL, hIMC, uEscape, lpData1); } @@ -2236,39 +2236,39 @@ public static final boolean InternetSetCookie (TCHAR lpszUrl, TCHAR lpszCookieNa return InternetSetCookie (url, cookieName, cookieData); } -public static final int MessageBox (long /*int*/ hWnd, TCHAR lpText, TCHAR lpCaption, int uType) { +public static final int MessageBox (long hWnd, TCHAR lpText, TCHAR lpCaption, int uType) { char [] lpText1 = lpText == null ? null : lpText.chars; char [] lpCaption1 = lpCaption == null ? null : lpCaption.chars; return MessageBox (hWnd, lpText1, lpCaption1, uType); } -public static final void MoveMemory (long /*int*/ Destination, TCHAR Source, int Length) { +public static final void MoveMemory (long Destination, TCHAR Source, int Length) { char [] Source1 = Source == null ? null : Source.chars; MoveMemory (Destination, Source1, Length); } -public static final void MoveMemory (TCHAR Destination, long /*int*/ Source, int Length) { +public static final void MoveMemory (TCHAR Destination, long Source, int Length) { char [] Destination1 = Destination == null ? null : Destination.chars; MoveMemory (Destination1, Source, Length); } -public static final boolean OpenPrinter (TCHAR pPrinterName, long /*int*/ [] phPrinter, long /*int*/ pDefault) { +public static final boolean OpenPrinter (TCHAR pPrinterName, long [] phPrinter, long pDefault) { char [] pPrinterName1 = pPrinterName == null ? null : pPrinterName.chars; return OpenPrinter (pPrinterName1, phPrinter, pDefault); } -public static final int RegCreateKeyEx (long /*int*/ hKey, TCHAR lpSubKey, int Reserved, TCHAR lpClass, int dwOptions, int samDesired, long /*int*/ lpSecurityAttributes, long /*int*/[] phkResult, long /*int*/[] lpdwDisposition) { +public static final int RegCreateKeyEx (long hKey, TCHAR lpSubKey, int Reserved, TCHAR lpClass, int dwOptions, int samDesired, long lpSecurityAttributes, long[] phkResult, long[] lpdwDisposition) { char [] lpClass1 = lpClass == null ? null : lpClass.chars; char [] lpSubKey1 = lpSubKey == null ? null : lpSubKey.chars; return RegCreateKeyEx (hKey, lpSubKey1, Reserved, lpClass1, dwOptions, samDesired, lpSecurityAttributes, phkResult, lpdwDisposition); } -public static final int RegDeleteValue (long /*int*/ hKey, TCHAR lpValueName) { +public static final int RegDeleteValue (long hKey, TCHAR lpValueName) { char [] lpValueName1 = lpValueName == null ? null : lpValueName.chars; return RegDeleteValue (hKey, lpValueName1); } -public static final int RegEnumKeyEx (long /*int*/ hKey, int dwIndex, TCHAR lpName, int [] lpcName, int [] lpReserved, TCHAR lpClass, int [] lpcClass, FILETIME lpftLastWriteTime) { +public static final int RegEnumKeyEx (long hKey, int dwIndex, TCHAR lpName, int [] lpcName, int [] lpReserved, TCHAR lpClass, int [] lpcClass, FILETIME lpftLastWriteTime) { char [] lpName1 = lpName == null ? null : lpName.chars; char [] lpClass1 = lpClass == null ? null : lpClass.chars; return RegEnumKeyEx (hKey, dwIndex, lpName1, lpcName, lpReserved, lpClass1, lpcClass, lpftLastWriteTime); @@ -2276,7 +2276,7 @@ public static final int RegEnumKeyEx (long /*int*/ hKey, int dwIndex, TCHAR lpNa public static final int RegisterClass (TCHAR lpszClassName, WNDCLASS lpWndClass) { /* Allocate a native string */ - long /*int*/ hHeap = OS.GetProcessHeap (); + long hHeap = OS.GetProcessHeap (); int byteCount = lpszClassName.length () * TCHAR.sizeof; lpWndClass.lpszClassName = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); OS.MoveMemory (lpWndClass.lpszClassName, lpszClassName, byteCount); @@ -2300,28 +2300,28 @@ public static final int RegisterWindowMessage (TCHAR lpString) { return RegisterWindowMessage (lpString1); } -public static final int RegOpenKeyEx (long /*int*/ hKey, TCHAR lpSubKey, int ulOptions, int samDesired, long /*int*/[] phkResult) { +public static final int RegOpenKeyEx (long hKey, TCHAR lpSubKey, int ulOptions, int samDesired, long[] phkResult) { char [] lpSubKey1 = lpSubKey == null ? null : lpSubKey.chars; return RegOpenKeyEx (hKey, lpSubKey1, ulOptions, samDesired, phkResult); } -public static final int RegQueryValueEx (long /*int*/ hKey, TCHAR lpValueName, long /*int*/ lpReserved, int[] lpType, TCHAR lpData, int[] lpcbData) { +public static final int RegQueryValueEx (long hKey, TCHAR lpValueName, long lpReserved, int[] lpType, TCHAR lpData, int[] lpcbData) { char [] lpValueName1 = lpValueName == null ? null : lpValueName.chars; char [] lpData1 = lpData == null ? null : lpData.chars; return RegQueryValueEx (hKey, lpValueName1, lpReserved, lpType, lpData1, lpcbData); } -public static final int RegQueryValueEx (long /*int*/ hKey, TCHAR lpValueName, long /*int*/ lpReserved, int[] lpType, int [] lpData, int[] lpcbData) { +public static final int RegQueryValueEx (long hKey, TCHAR lpValueName, long lpReserved, int[] lpType, int [] lpData, int[] lpcbData) { char [] lpValueName1 = lpValueName == null ? null : lpValueName.chars; return RegQueryValueEx (hKey, lpValueName1, lpReserved, lpType, lpData, lpcbData); } -public static final int RegSetValueEx (long /*int*/ hKey, TCHAR lpValueName, int Reserved, int dwType, int[] lpData, int cbData) { +public static final int RegSetValueEx (long hKey, TCHAR lpValueName, int Reserved, int dwType, int[] lpData, int cbData) { char [] lpValueName1 = lpValueName == null ? null : lpValueName.chars; return RegSetValueEx (hKey, lpValueName1, Reserved, dwType, lpData, cbData); } -public static final long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, TCHAR lParam) { +public static final long SendMessage (long hWnd, int Msg, long wParam, TCHAR lParam) { char [] lParam1 = lParam == null ? null : lParam.chars; return SendMessage (hWnd, Msg, wParam, lParam1); } @@ -2331,17 +2331,17 @@ public static final boolean SetDllDirectory (TCHAR lpPathName) { return SetDllDirectory (lpPathName1); } -public static final boolean SetWindowText (long /*int*/ hWnd, TCHAR lpString) { +public static final boolean SetWindowText (long hWnd, TCHAR lpString) { char [] lpString1 = lpString == null ? null : lpString.chars; return SetWindowText (hWnd, lpString1); } -public static final boolean SHGetPathFromIDList (long /*int*/ pidl, TCHAR pszPath) { +public static final boolean SHGetPathFromIDList (long pidl, TCHAR pszPath) { char [] pszPath1 = pszPath == null ? null : pszPath.chars; return SHGetPathFromIDList (pidl, pszPath1); } -public static final boolean UnregisterClass (TCHAR lpClassName, long /*int*/ hInstance) { +public static final boolean UnregisterClass (TCHAR lpClassName, long hInstance) { char [] lpClassName1 = lpClassName == null ? null : lpClassName.chars; return UnregisterClass (lpClassName1, hInstance); } @@ -2355,16 +2355,16 @@ public static final int UrlCreateFromPath (TCHAR pszPath, TCHAR pszURL, int[] pc /** Natives */ /** @param hdc cast=(HDC) */ -public static final native int AbortDoc (long /*int*/ hdc); +public static final native int AbortDoc (long hdc); /** * @param hActCtx cast=(HANDLE) * @param lpCookie cast=(ULONG_PTR*) */ -public static final native boolean ActivateActCtx (long /*int*/ hActCtx, long /*int*/ [] lpCookie); +public static final native boolean ActivateActCtx (long hActCtx, long [] lpCookie); /** @param hkl cast=(HKL) */ -public static final native long /*int*/ ActivateKeyboardLayout(long /*int*/ hkl, int Flags); +public static final native long ActivateKeyboardLayout(long hkl, int Flags); /** @param pdv cast=(PVOID) */ -public static final native int AddFontResourceEx(char[] lpszFilename, int fl, long /*int*/ pdv); +public static final native int AddFontResourceEx(char[] lpszFilename, int fl, long pdv); public static final native boolean AdjustWindowRectEx (RECT lpRect, int dwStyle, boolean bMenu, int dwExStyle); public static final native boolean AllowSetForegroundWindow (int dwProcessId); /** @@ -2372,27 +2372,27 @@ public static final native boolean AllowSetForegroundWindow (int dwProcessId); * @param hdcSrc cast=(HDC) * @param blendFunction flags=struct */ -public static final native boolean AlphaBlend(long /*int*/ hdcDest, int nXOriginDest, int nYOriginDest, int nWidthDest, int nHeightDest, long /*int*/ hdcSrc, int nXOriginSrc, int nYOriginSrc, int nWidthSrc, int nHeightSrc, BLENDFUNCTION blendFunction); +public static final native boolean AlphaBlend(long hdcDest, int nXOriginDest, int nYOriginDest, int nWidthDest, int nHeightDest, long hdcSrc, int nXOriginSrc, int nYOriginSrc, int nWidthSrc, int nHeightSrc, BLENDFUNCTION blendFunction); /** @param hdc cast=(HDC) */ -public static final native boolean Arc (long /*int*/ hdc, int nLeftRect, int nTopRect, int nRightRect, int nBottomRect, int nXStartArc, int nYStartArc, int nXEndArc, int nYEndArc); +public static final native boolean Arc (long hdc, int nLeftRect, int nTopRect, int nRightRect, int nBottomRect, int nXStartArc, int nYStartArc, int nXEndArc, int nYEndArc); public static final native int AssocQueryString (int flags, int str, char[] pszAssoc, char[] pszExtra, char[] pszOut, int[] pcchOut); /** * @param hdcTarget cast=(HDC) * @param phdc cast=(HDC*) */ -public static final native long /*int*/ BeginBufferedPaint (long /*int*/ hdcTarget, RECT prcTarget, int dwFormat, BP_PAINTPARAMS pPaintParams, long /*int*/ [] phdc); -public static final native long /*int*/ BeginDeferWindowPos (int nNumWindows); +public static final native long BeginBufferedPaint (long hdcTarget, RECT prcTarget, int dwFormat, BP_PAINTPARAMS pPaintParams, long [] phdc); +public static final native long BeginDeferWindowPos (int nNumWindows); /** @param hWnd cast=(HWND) */ -public static final native long /*int*/ BeginPaint (long /*int*/ hWnd, PAINTSTRUCT lpPaint); +public static final native long BeginPaint (long hWnd, PAINTSTRUCT lpPaint); /** @param hdc cast=(HDC) */ -public static final native boolean BeginPath(long /*int*/ hdc); +public static final native boolean BeginPath(long hdc); /** * @param hdcDest cast=(HDC) * @param hdcSrc cast=(HDC) */ -public static final native boolean BitBlt (long /*int*/ hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, long /*int*/ hdcSrc, int nXSrc, int nYSrc, int dwRop); +public static final native boolean BitBlt (long hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, long hdcSrc, int nXSrc, int nYSrc, int dwRop); /** @param hWnd cast=(HWND) */ -public static final native boolean BringWindowToTop (long /*int*/ hWnd); +public static final native boolean BringWindowToTop (long hWnd); public static final native int BufferedPaintInit (); public static final native int BufferedPaintUnInit (); /** @@ -2400,59 +2400,59 @@ public static final native int BufferedPaintUnInit (); * @param wParam cast=(WPARAM) * @param lParam cast=(LPARAM) */ -public static final native long /*int*/ CallNextHookEx(long /*int*/ hhk, int nCode, long /*int*/ wParam, long /*int*/ lParam); +public static final native long CallNextHookEx(long hhk, int nCode, long wParam, long lParam); /** * @param lpPrevWndFunc cast=(WNDPROC) * @param hWnd cast=(HWND) */ -public static final native long /*int*/ CallWindowProc (long /*int*/ lpPrevWndFunc, long /*int*/ hWnd, int Msg, long /*int*/ wParam, long /*int*/ lParam); +public static final native long CallWindowProc (long lpPrevWndFunc, long hWnd, int Msg, long wParam, long lParam); /** * @param pName cast=(PCERT_NAME_BLOB) * @param psz cast=(LPWSTR) */ public static final native int CertNameToStr (int dwCertEncodingType, CERT_NAME_BLOB pName, int dwStrType, char[] psz, int csz); /** @param ch cast=(LPWSTR) */ -public static final native long /*int*/ CharLower (long /*int*/ ch); +public static final native long CharLower (long ch); /** @param ch cast=(LPWSTR) */ -public static final native long /*int*/ CharUpper (long /*int*/ ch); +public static final native long CharUpper (long ch); /** * @param hWndParent cast=(HWND) * @param pt flags=struct * @param flags cast=(UINT) */ -public static final native long /*int*/ ChildWindowFromPointEx (long /*int*/ hWndParent, POINT pt, int flags); +public static final native long ChildWindowFromPointEx (long hWndParent, POINT pt, int flags); /** @param lpcc cast=(LPCHOOSECOLORW) */ public static final native boolean ChooseColor (CHOOSECOLOR lpcc); /** @param chooseFont cast=(LPCHOOSEFONTW) */ public static final native boolean ChooseFont (CHOOSEFONT chooseFont); /** @param hWnd cast=(HWND) */ -public static final native boolean ClientToScreen (long /*int*/ hWnd, POINT lpPoint); +public static final native boolean ClientToScreen (long hWnd, POINT lpPoint); public static final native boolean CloseClipboard (); /** @param hdc cast=(HDC) */ -public static final native long /*int*/ CloseEnhMetaFile (long /*int*/ hdc); +public static final native long CloseEnhMetaFile (long hdc); /** * @method flags=dynamic * @param hGesture cast=(HGESTUREINFO) */ -public static final native long /*int*/ CloseGestureInfoHandle (long /*int*/ hGesture); +public static final native long CloseGestureInfoHandle (long hGesture); /** @param hObject cast=(HANDLE) */ -public static final native boolean CloseHandle (long /*int*/ hObject); +public static final native boolean CloseHandle (long hObject); /** @param hPrinter cast=(HANDLE) */ -public static final native boolean ClosePrinter (long /*int*/ hPrinter); +public static final native boolean ClosePrinter (long hPrinter); /** @param hTheme cast=(HTHEME) */ -public static final native int CloseThemeData (long /*int*/ hTheme); +public static final native int CloseThemeData (long hTheme); /** * @method flags=dynamic * @param hTouchInput cast=(HTOUCHINPUT) */ -public static final native boolean CloseTouchInputHandle(long /*int*/ hTouchInput); +public static final native boolean CloseTouchInputHandle(long hTouchInput); /** * @param rclsid cast=(REFCLSID) * @param pUnkOuter cast=(LPUNKNOWN) * @param riid cast=(REFIID) * @param ppv cast=(LPVOID *) */ -public static final native int CoCreateInstance (byte[] rclsid, long /*int*/ pUnkOuter, int dwClsContext, byte[] riid, long /*int*/[] ppv); +public static final native int CoCreateInstance (byte[] rclsid, long pUnkOuter, int dwClsContext, byte[] riid, long[] ppv); public static final native int CoInternetIsFeatureEnabled (int FeatureEntry, int dwFlags); /** @param fEnable cast=(BOOL) */ public static final native int CoInternetSetFeatureEnabled (int FeatureEntry, int dwFlags, boolean fEnable); @@ -2461,76 +2461,76 @@ public static final native int CoInternetSetFeatureEnabled (int FeatureEntry, in * @param hrgnSrc1 cast=(HRGN) * @param hrgnSrc2 cast=(HRGN) */ -public static final native int CombineRgn (long /*int*/ hrgnDest, long /*int*/ hrgnSrc1, long /*int*/ hrgnSrc2, int fnCombineMode); +public static final native int CombineRgn (long hrgnDest, long hrgnSrc1, long hrgnSrc2, int fnCombineMode); public static final native int CommDlgExtendedError (); /** @param hImage cast=(HANDLE) */ -public static final native long /*int*/ CopyImage (long /*int*/ hImage, int uType, int cxDesired, int cyDesired, int fuFlags); +public static final native long CopyImage (long hImage, int uType, int cxDesired, int cyDesired, int fuFlags); /** @param cb cast=(ULONG) */ -public static final native long /*int*/ CoTaskMemAlloc(int cb); +public static final native long CoTaskMemAlloc(int cb); /** @param pv cast=(LPVOID) */ -public static final native void CoTaskMemFree(long /*int*/ pv); +public static final native void CoTaskMemFree(long pv); /** @param lpaccl cast=(LPACCEL) */ -public static final native long /*int*/ CreateAcceleratorTable (byte [] lpaccl, int cEntries); +public static final native long CreateAcceleratorTable (byte [] lpaccl, int cEntries); /** @param pActCtx flags=no_out */ -public static final native long /*int*/ CreateActCtx (ACTCTX pActCtx); +public static final native long CreateActCtx (ACTCTX pActCtx); /** @param lpvBits cast=(CONST VOID *),flags=no_out critical */ -public static final native long /*int*/ CreateBitmap (int nWidth, int nHeight, int cPlanes, int cBitsPerPel, byte [] lpvBits); +public static final native long CreateBitmap (int nWidth, int nHeight, int cPlanes, int cBitsPerPel, byte [] lpvBits); /** * @param hWnd cast=(HWND) * @param hBitmap cast=(HBITMAP) */ -public static final native boolean CreateCaret (long /*int*/ hWnd, long /*int*/ hBitmap, int nWidth, int nHeight); +public static final native boolean CreateCaret (long hWnd, long hBitmap, int nWidth, int nHeight); /** @param hdc cast=(HDC) */ -public static final native long /*int*/ CreateCompatibleBitmap (long /*int*/ hdc, int nWidth, int nHeight); +public static final native long CreateCompatibleBitmap (long hdc, int nWidth, int nHeight); /** @param hdc cast=(HDC) */ -public static final native long /*int*/ CreateCompatibleDC (long /*int*/ hdc); +public static final native long CreateCompatibleDC (long hdc); /** * @param hInst cast=(HINSTANCE) * @param pvANDPlane cast=(CONST VOID *),flags=no_out critical * @param pvXORPlane cast=(CONST VOID *),flags=no_out critical */ -public static final native long /*int*/ CreateCursor (long /*int*/ hInst, int xHotSpot, int yHotSpot, int nWidth, int nHeight, byte [] pvANDPlane, byte [] pvXORPlane); +public static final native long CreateCursor (long hInst, int xHotSpot, int yHotSpot, int nWidth, int nHeight, byte [] pvANDPlane, byte [] pvXORPlane); /** * @param lpszDriver cast=(LPWSTR) * @param lpszDevice cast=(LPWSTR) * @param lpszOutput cast=(LPWSTR) * @param lpInitData cast=(CONST DEVMODEW *) */ -public static final native long /*int*/ CreateDC (char [] lpszDriver, char [] lpszDevice, long /*int*/ lpszOutput, long /*int*/ lpInitData); +public static final native long CreateDC (char [] lpszDriver, char [] lpszDevice, long lpszOutput, long lpInitData); /** * @param hdc cast=(HDC) * @param pbmi cast=(BITMAPINFO *),flags=no_out critical * @param ppvBits cast=(VOID **),flags=no_in critical * @param hSection cast=(HANDLE) */ -public static final native long /*int*/ CreateDIBSection(long /*int*/ hdc, byte[] pbmi, int iUsage, long /*int*/[] ppvBits, long /*int*/ hSection, int dwOffset); +public static final native long CreateDIBSection(long hdc, byte[] pbmi, int iUsage, long[] ppvBits, long hSection, int dwOffset); /** * @param hdc cast=(HDC) * @param pbmi cast=(BITMAPINFO *),flags=no_out critical * @param ppvBits cast=(VOID **),flags=no_in critical * @param hSection cast=(HANDLE) */ -public static final native long /*int*/ CreateDIBSection(long /*int*/ hdc, long /*int*/ pbmi, int iUsage, long /*int*/[] ppvBits, long /*int*/ hSection, int dwOffset); +public static final native long CreateDIBSection(long hdc, long pbmi, int iUsage, long[] ppvBits, long hSection, int dwOffset); /** * @param hdcRef cast=(HDC) * @param lpFilename cast=(LPCWSTR) * @param lpDescription cast=(LPCWSTR) */ -public static final native long /*int*/ CreateEnhMetaFile (long /*int*/ hdcRef, char[] lpFilename, RECT lpRect, char[] lpDescription); +public static final native long CreateEnhMetaFile (long hdcRef, char[] lpFilename, RECT lpRect, char[] lpDescription); /** @param lplf cast=(LPLOGFONTW) */ -public static final native long /*int*/ CreateFontIndirect (long /*int*/ lplf); +public static final native long CreateFontIndirect (long lplf); /** @param lplf flags=no_out */ -public static final native long /*int*/ CreateFontIndirect (LOGFONT lplf); +public static final native long CreateFontIndirect (LOGFONT lplf); /** @param lplf flags=no_out */ -public static final native long /*int*/ CreateIconIndirect (ICONINFO lplf); -public static final native long /*int*/ CreateMenu (); +public static final native long CreateIconIndirect (ICONINFO lplf); +public static final native long CreateMenu (); /** @param hbmp cast=(HBITMAP) */ -public static final native long /*int*/ CreatePatternBrush (long /*int*/ hbmp); +public static final native long CreatePatternBrush (long hbmp); /** @param crColor cast=(COLORREF) */ -public static final native long /*int*/ CreatePen (int fnPenStyle, int nWidth, int crColor); +public static final native long CreatePen (int fnPenStyle, int nWidth, int crColor); /** @param lppt cast=(CONST POINT *) */ -public static final native long /*int*/ CreatePolygonRgn(int[] lppt, int cPoints, int fnPolyFillMode); -public static final native long /*int*/ CreatePopupMenu (); +public static final native long CreatePolygonRgn(int[] lppt, int cPoints, int fnPolyFillMode); +public static final native long CreatePopupMenu (); /** * @param lpApplicationName cast=(LPCWSTR) * @param lpCommandLine cast=(LPWSTR) @@ -2541,16 +2541,16 @@ public static final native long /*int*/ CreatePopupMenu (); * @param lpStartupInfo cast=(LPSTARTUPINFOW) * @param lpProcessInformation cast=(LPPROCESS_INFORMATION) */ -public static final native boolean CreateProcess (long /*int*/ lpApplicationName, long /*int*/ lpCommandLine, long /*int*/ lpProcessAttributes, long /*int*/ lpThreadAttributes, boolean bInheritHandles, int dwCreationFlags, long /*int*/ lpEnvironment, long /*int*/ lpCurrentDirectory, STARTUPINFO lpStartupInfo, PROCESS_INFORMATION lpProcessInformation); -public static final native long /*int*/ CreateRectRgn (int left, int top, int right, int bottom); +public static final native boolean CreateProcess (long lpApplicationName, long lpCommandLine, long lpProcessAttributes, long lpThreadAttributes, boolean bInheritHandles, int dwCreationFlags, long lpEnvironment, long lpCurrentDirectory, STARTUPINFO lpStartupInfo, PROCESS_INFORMATION lpProcessInformation); +public static final native long CreateRectRgn (int left, int top, int right, int bottom); /** @param colorRef cast=(COLORREF) */ -public static final native long /*int*/ CreateSolidBrush (int colorRef); +public static final native long CreateSolidBrush (int colorRef); /** * @param hGlobal cast=(HGLOBAL) * @param fDeleteOnRelease cast=(BOOL) * @param ppstm cast=(LPSTREAM *) */ -public static final native int CreateStreamOnHGlobal(long /*int*/ hGlobal, boolean fDeleteOnRelease, long /*int*/[] ppstm); +public static final native int CreateStreamOnHGlobal(long hGlobal, boolean fDeleteOnRelease, long[] ppstm); /** * @param lpClassName cast=(LPWSTR) * @param lpWindowName cast=(LPWSTR) @@ -2558,52 +2558,52 @@ public static final native int CreateStreamOnHGlobal(long /*int*/ hGlobal, boole * @param hMenu cast=(HMENU) * @param hInstance cast=(HINSTANCE) */ -public static final native long /*int*/ CreateWindowEx (int dwExStyle, char [] lpClassName, char [] lpWindowName, int dwStyle, int X, int Y, int nWidth, int nHeight, long /*int*/ hWndParent, long /*int*/ hMenu, long /*int*/ hInstance, CREATESTRUCT lpParam); +public static final native long CreateWindowEx (int dwExStyle, char [] lpClassName, char [] lpWindowName, int dwStyle, int X, int Y, int nWidth, int nHeight, long hWndParent, long hMenu, long hInstance, CREATESTRUCT lpParam); /** * @param hWinPosInfo cast=(HDWP) * @param hWnd cast=(HWND) * @param hWndInsertAfter cast=(HWND) */ -public static final native long /*int*/ DeferWindowPos (long /*int*/ hWinPosInfo, long /*int*/ hWnd, long /*int*/ hWndInsertAfter, int X, int Y, int cx, int cy, int uFlags); +public static final native long DeferWindowPos (long hWinPosInfo, long hWnd, long hWndInsertAfter, int X, int Y, int cx, int cy, int uFlags); /** * @param hWnd cast=(HWND) * @param wParam cast=(WPARAM) * @param lParam cast=(LPARAM) */ -public static final native long /*int*/ DefMDIChildProc (long /*int*/ hWnd, int Msg, long /*int*/ wParam, long /*int*/ lParam); +public static final native long DefMDIChildProc (long hWnd, int Msg, long wParam, long lParam); /** * @param hWnd cast=(HWND) * @param hWndMDIClient cast=(HWND) * @param wParam cast=(WPARAM) * @param lParam cast=(LPARAM) */ -public static final native long /*int*/ DefFrameProc (long /*int*/ hWnd, long /*int*/ hWndMDIClient, int Msg, long /*int*/ wParam, long /*int*/ lParam); +public static final native long DefFrameProc (long hWnd, long hWndMDIClient, int Msg, long wParam, long lParam); /** * @param hWnd cast=(HWND) * @param wParam cast=(WPARAM) * @param lParam cast=(LPARAM) */ -public static final native long /*int*/ DefWindowProc (long /*int*/ hWnd, int Msg, long /*int*/ wParam, long /*int*/ lParam); +public static final native long DefWindowProc (long hWnd, int Msg, long wParam, long lParam); /** @param hdc cast=(HDC) */ -public static final native boolean DeleteDC (long /*int*/ hdc); +public static final native boolean DeleteDC (long hdc); /** @param hemf cast=(HENHMETAFILE) */ -public static final native boolean DeleteEnhMetaFile (long /*int*/ hemf); +public static final native boolean DeleteEnhMetaFile (long hemf); /** @param hMenu cast=(HMENU) */ -public static final native boolean DeleteMenu (long /*int*/ hMenu, int uPosition, int uFlags); +public static final native boolean DeleteMenu (long hMenu, int uPosition, int uFlags); /** @param hGdiObj cast=(HGDIOBJ) */ -public static final native boolean DeleteObject (long /*int*/ hGdiObj); +public static final native boolean DeleteObject (long hGdiObj); /** @param hAccel cast=(HACCEL) */ -public static final native boolean DestroyAcceleratorTable (long /*int*/ hAccel); +public static final native boolean DestroyAcceleratorTable (long hAccel); public static final native boolean DestroyCaret (); /** @param hCursor cast=(HCURSOR) */ -public static final native boolean DestroyCursor (long /*int*/ hCursor); +public static final native boolean DestroyCursor (long hCursor); /** @param hIcon cast=(HICON) */ -public static final native boolean DestroyIcon (long /*int*/ hIcon); +public static final native boolean DestroyIcon (long hIcon); /** @param hMenu cast=(HMENU) */ -public static final native boolean DestroyMenu (long /*int*/ hMenu); +public static final native boolean DestroyMenu (long hMenu); /** @param hWnd cast=(HWND) */ -public static final native boolean DestroyWindow (long /*int*/ hWnd); -public static final native long /*int*/ DispatchMessage (MSG lpmsg); +public static final native boolean DestroyWindow (long hWnd); +public static final native long DispatchMessage (MSG lpmsg); /** * @param hWnd cast=(HWND) * @param hPrinter cast=(HANDLE) @@ -2611,242 +2611,242 @@ public static final native long /*int*/ DispatchMessage (MSG lpmsg); * @param pDevModeOutput cast=(PDEVMODEW) * @param pDevModeInput cast=(PDEVMODEW) */ -public static final native int DocumentProperties (long /*int*/ hWnd, long /*int*/ hPrinter, char[] pDeviceName, long /*int*/ pDevModeOutput, long /*int*/ pDevModeInput, int fMode); +public static final native int DocumentProperties (long hWnd, long hPrinter, char[] pDeviceName, long pDevModeOutput, long pDevModeInput, int fMode); /** * @param hwnd cast=(HWND) * @param pt flags=struct */ -public static final native boolean DragDetect (long /*int*/ hwnd, POINT pt); +public static final native boolean DragDetect (long hwnd, POINT pt); /** @param hDrop cast=(HDROP) */ -public static final native void DragFinish (long /*int*/ hDrop); +public static final native void DragFinish (long hDrop); /** * @param hDrop cast=(HDROP) * @param lpszFile cast=(LPWSTR) */ -public static final native int DragQueryFile (long /*int*/ hDrop, int iFile, char[] lpszFile, int cch); +public static final native int DragQueryFile (long hDrop, int iFile, char[] lpszFile, int cch); /** @param hdc cast=(HDC) */ -public static final native boolean DrawEdge (long /*int*/ hdc, RECT qrc, int edge, int grfFlags); +public static final native boolean DrawEdge (long hdc, RECT qrc, int edge, int grfFlags); /** @param hDC cast=(HDC) */ -public static final native boolean DrawFocusRect (long /*int*/ hDC, RECT lpRect); +public static final native boolean DrawFocusRect (long hDC, RECT lpRect); /** @param hdc cast=(HDC) */ -public static final native boolean DrawFrameControl (long /*int*/ hdc, RECT lprc, int uType, int uState); +public static final native boolean DrawFrameControl (long hdc, RECT lprc, int uType, int uState); /** * @param hdc cast=(HDC) * @param hIcon cast=(HICON) * @param hbrFlickerFreeDraw cast=(HBRUSH) */ -public static final native boolean DrawIconEx (long /*int*/ hdc, int xLeft, int yTop, long /*int*/ hIcon, int cxWidth, int cyWidth, int istepIfAniCur, long /*int*/ hbrFlickerFreeDraw, int diFlags); +public static final native boolean DrawIconEx (long hdc, int xLeft, int yTop, long hIcon, int cxWidth, int cyWidth, int istepIfAniCur, long hbrFlickerFreeDraw, int diFlags); /** @param hWnd cast=(HWND) */ -public static final native boolean DrawMenuBar (long /*int*/ hWnd); +public static final native boolean DrawMenuBar (long hWnd); /** * @param hDC cast=(HDC) * @param lpString cast=(LPWSTR),flags=no_out critical */ -public static final native int DrawText (long /*int*/ hDC, char [] lpString, int nCount, RECT lpRect, int uFormat); +public static final native int DrawText (long hDC, char [] lpString, int nCount, RECT lpRect, int uFormat); /** * @param hTheme cast=(HTHEME) * @param hdc cast=(HDC) * @param pRect cast=(const RECT *) * @param pClipRect cast=(const RECT *) */ -public static final native int DrawThemeBackground (long /*int*/ hTheme, long /*int*/ hdc, int iPartId, int iStateId, RECT pRect, RECT pClipRect); +public static final native int DrawThemeBackground (long hTheme, long hdc, int iPartId, int iStateId, RECT pRect, RECT pClipRect); /** * @param hTheme cast=(HTHEME) * @param hdc cast=(HDC) */ -public static final native int DrawThemeText (long /*int*/ hTheme, long /*int*/ hdc, int iPartId, int iStateId, char[] pszText, int iCharCount, int dwTextFlags, int dwTextFlags2, RECT pRect); +public static final native int DrawThemeText (long hTheme, long hdc, int iPartId, int iStateId, char[] pszText, int iCharCount, int dwTextFlags, int dwTextFlags2, RECT pRect); /** @param hdc cast=(HDC) */ -public static final native boolean Ellipse (long /*int*/ hdc, int nLeftRect, int nTopRect, int nRightRect, int nBottomRect); +public static final native boolean Ellipse (long hdc, int nLeftRect, int nTopRect, int nRightRect, int nBottomRect); /** @param hMenu cast=(HMENU) */ -public static final native boolean EnableMenuItem (long /*int*/ hMenu, int uIDEnableItem, int uEnable); +public static final native boolean EnableMenuItem (long hMenu, int uIDEnableItem, int uEnable); /** @param hWnd cast=(HWND) */ -public static final native boolean EnableScrollBar (long /*int*/ hWnd, int wSBflags, int wArrows); +public static final native boolean EnableScrollBar (long hWnd, int wSBflags, int wArrows); /** @param hWnd cast=(HWND) */ -public static final native boolean EnableWindow (long /*int*/ hWnd, boolean bEnable); +public static final native boolean EnableWindow (long hWnd, boolean bEnable); /** * @param pLangGroupEnumProc cast=(LANGUAGEGROUP_ENUMPROCW) * @param lParam cast=(LONG_PTR) */ -public static final native boolean EnumSystemLanguageGroups (long /*int*/ pLangGroupEnumProc, int dwFlags, long /*int*/ lParam); +public static final native boolean EnumSystemLanguageGroups (long pLangGroupEnumProc, int dwFlags, long lParam); /** @param lpLocaleEnumProc cast=(LOCALE_ENUMPROCW) */ -public static final native boolean EnumSystemLocales (long /*int*/ lpLocaleEnumProc, int dwFlags); +public static final native boolean EnumSystemLocales (long lpLocaleEnumProc, int dwFlags); /** @param hWinPosInfo cast=(HDWP) */ -public static final native boolean EndDeferWindowPos (long /*int*/ hWinPosInfo); +public static final native boolean EndDeferWindowPos (long hWinPosInfo); /** @param hBufferedPaint cast=(HPAINTBUFFER) */ -public static final native int EndBufferedPaint (long /*int*/ hBufferedPaint, boolean fUpdateTarget); +public static final native int EndBufferedPaint (long hBufferedPaint, boolean fUpdateTarget); /** @param hdc cast=(HDC) */ -public static final native int EndDoc (long /*int*/ hdc); +public static final native int EndDoc (long hdc); /** @param hdc cast=(HDC) */ -public static final native int EndPage (long /*int*/ hdc); +public static final native int EndPage (long hdc); /** @param hWnd cast=(HWND) */ -public static final native int EndPaint (long /*int*/ hWnd, PAINTSTRUCT lpPaint); +public static final native int EndPaint (long hWnd, PAINTSTRUCT lpPaint); /** * @param hdc cast=(HDC) * @param lprcClip cast=(LPCRECT) * @param lpfnEnum cast=(MONITORENUMPROC) * @param dwData cast=(LPARAM) */ -public static final native boolean EnumDisplayMonitors (long /*int*/ hdc, RECT lprcClip, long /*int*/ lpfnEnum, int dwData); +public static final native boolean EnumDisplayMonitors (long hdc, RECT lprcClip, long lpfnEnum, int dwData); /** * @param hdc cast=(HDC) * @param hemf cast=(HENHMETAFILE) * @param lpEnhMetaFunc cast=(ENHMFENUMPROC) * @param lpData cast=(LPVOID) */ -public static final native boolean EnumEnhMetaFile(long /*int*/ hdc, long /*int*/ hemf, long /*int*/ lpEnhMetaFunc, long /*int*/ lpData, RECT lpRect); +public static final native boolean EnumEnhMetaFile(long hdc, long hemf, long lpEnhMetaFunc, long lpData, RECT lpRect); /** * @param hdc cast=(HDC) * @param lpszFamily cast=(LPCWSTR) * @param lpEnumFontFamProc cast=(FONTENUMPROCW) * @param lParam cast=(LPARAM) */ -public static final native int EnumFontFamilies (long /*int*/ hdc, char [] lpszFamily, long /*int*/ lpEnumFontFamProc, long /*int*/ lParam); +public static final native int EnumFontFamilies (long hdc, char [] lpszFamily, long lpEnumFontFamProc, long lParam); /** * @param lprc1 cast=(CONST RECT *),flags=no_out * @param lprc2 cast=(CONST RECT *),flags=no_out */ public static final native boolean EqualRect (RECT lprc1, RECT lprc2); /** @param hdc cast=(HDC) */ -public static final native int ExcludeClipRect (long /*int*/ hdc, int nLeftRect, int nTopRect, int nRightRect, int nBottomRect); +public static final native int ExcludeClipRect (long hdc, int nLeftRect, int nTopRect, int nRightRect, int nBottomRect); public static final native int ExpandEnvironmentStrings (char [] lpSrc, char [] lsDst, int nSize); /** * @param lplb cast=(CONST LOGBRUSH *) * @param lpStyle cast=(CONST DWORD *) */ -public static final native long /*int*/ ExtCreatePen (int dwPenStyle, int dwWidth, LOGBRUSH lplb, int dwStyleCount, int[] lpStyle); +public static final native long ExtCreatePen (int dwPenStyle, int dwWidth, LOGBRUSH lplb, int dwStyleCount, int[] lpStyle); /** * @param lpXform cast=(XFORM *) * @param lpRgnData cast=(CONST RGNDATA *) */ -public static final native long /*int*/ ExtCreateRegion (float[] lpXform, int nCount, int[] lpRgnData); +public static final native long ExtCreateRegion (float[] lpXform, int nCount, int[] lpRgnData); /** * @param hdc cast=(HDC) * @param lprc flags=no_out * @param lpString cast=(LPWSTR),flags=no_out critical * @param lpDx cast=(CONST INT *),flags=no_out critical */ -public static final native boolean ExtTextOut (long /*int*/ hdc, int X, int Y, int fuOptions, RECT lprc, char[] lpString, int cbCount, int[] lpDx); +public static final native boolean ExtTextOut (long hdc, int X, int Y, int fuOptions, RECT lprc, char[] lpString, int cbCount, int[] lpDx); /** * @param lpszFile cast=(LPWSTR) * @param phiconLarge cast=(HICON FAR *) * @param phiconSmall cast=(HICON FAR *) */ -public static final native int ExtractIconEx (char [] lpszFile, int nIconIndex, long /*int*/ [] phiconLarge, long /*int*/ [] phiconSmall, int nIcons); +public static final native int ExtractIconEx (char [] lpszFile, int nIconIndex, long [] phiconLarge, long [] phiconSmall, int nIcons); public static final native boolean FileTimeToSystemTime (FILETIME lpFileTime, SYSTEMTIME lpSystemTime); /** * @param hDC cast=(HDC) * @param lprc flags=no_out * @param hbr cast=(HBRUSH) */ -public static final native int FillRect (long /*int*/ hDC, RECT lprc, long /*int*/ hbr); +public static final native int FillRect (long hDC, RECT lprc, long hbr); /** * @param lpSource cast=(LPCVOID) * @param lpBuffer cast=(LPWSTR) * @param Arguments cast=(va_list*) */ -public static final native int FormatMessage (int dwFlags, long /*int*/ lpSource, int dwMessageId, int dwLanguageId, long /*int*/ [] lpBuffer, int nSize, long /*int*/ Arguments); +public static final native int FormatMessage (int dwFlags, long lpSource, int dwMessageId, int dwLanguageId, long [] lpBuffer, int nSize, long Arguments); /** @param dwLimit cast=(DWORD) */ public static final native int GdiSetBatchLimit (int dwLimit); -public static final native int GET_WHEEL_DELTA_WPARAM(long /*int*/ wParam); -public static final native int GET_X_LPARAM(long /*int*/ lp); -public static final native int GET_Y_LPARAM(long /*int*/ lp); +public static final native int GET_WHEEL_DELTA_WPARAM(long wParam); +public static final native int GET_X_LPARAM(long lp); +public static final native int GET_Y_LPARAM(long lp); public static final native int GetACP (); -public static final native long /*int*/ GetActiveWindow (); +public static final native long GetActiveWindow (); /** @param hDC cast=(HDC) */ -public static final native int GetBkColor (long /*int*/ hDC); -public static final native long /*int*/ GetCapture (); +public static final native int GetBkColor (long hDC); +public static final native long GetCapture (); public static final native boolean GetCaretPos (POINT lpPoint); /** * @param hdc cast=(HDC) * @param lpabc cast=(LPABC),flags=no_in critical */ -public static final native boolean GetCharABCWidths (long /*int*/ hdc, int iFirstChar, int iLastChar, int [] lpabc); +public static final native boolean GetCharABCWidths (long hdc, int iFirstChar, int iLastChar, int [] lpabc); /** * @param hdc cast=(HDC) * @param lpString cast=(LPWSTR),flags=no_out critical * @param lpResults cast=(LPGCP_RESULTSW) */ -public static final native int GetCharacterPlacement (long /*int*/ hdc, char[] lpString, int nCount, int nMaxExtent, GCP_RESULTS lpResults, int dwFlags); +public static final native int GetCharacterPlacement (long hdc, char[] lpString, int nCount, int nMaxExtent, GCP_RESULTS lpResults, int dwFlags); /** * @param hdc cast=(HDC) * @param lpBuffer cast=(LPINT),flags=no_in critical */ -public static final native boolean GetCharWidth (long /*int*/ hdc, int iFirstChar, int iLastChar, int [] lpBuffer); +public static final native boolean GetCharWidth (long hdc, int iFirstChar, int iLastChar, int [] lpBuffer); /** * @param hInstance cast=(HINSTANCE) * @param lpClassName cast=(LPWSTR) * @param lpWndClass cast=(LPWNDCLASSW) */ -public static final native boolean GetClassInfo (long /*int*/ hInstance, char [] lpClassName, WNDCLASS lpWndClass); +public static final native boolean GetClassInfo (long hInstance, char [] lpClassName, WNDCLASS lpWndClass); /** @param hWnd cast=(HWND) */ -public static final native int GetClassName (long /*int*/ hWnd, char [] lpClassName, int nMaxCount); +public static final native int GetClassName (long hWnd, char [] lpClassName, int nMaxCount); /** @param hWnd cast=(HWND) */ -public static final native boolean GetClientRect (long /*int*/ hWnd, RECT lpRect); -public static final native long /*int*/ GetClipboardData (int uFormat); +public static final native boolean GetClientRect (long hWnd, RECT lpRect); +public static final native long GetClipboardData (int uFormat); /** @param lpszFormatName cast=(LPWSTR) */ public static final native int GetClipboardFormatName (int format, char[] lpszFormatName, int cchMaxCount); /** @param hdc cast=(HDC) */ -public static final native int GetClipBox (long /*int*/ hdc, RECT lprc); +public static final native int GetClipBox (long hdc, RECT lprc); /** * @param hdc cast=(HDC) * @param hrgn cast=(HRGN) */ -public static final native int GetClipRgn (long /*int*/ hdc, long /*int*/ hrgn); +public static final native int GetClipRgn (long hdc, long hrgn); /** @param hwndCombo cast=(HWND) */ -public static final native boolean GetComboBoxInfo (long /*int*/ hwndCombo, COMBOBOXINFO pcbi); +public static final native boolean GetComboBoxInfo (long hwndCombo, COMBOBOXINFO pcbi); /** @param hdc cast=(HDC) */ -public static final native long /*int*/ GetCurrentObject (long /*int*/ hdc, int uObjectType); +public static final native long GetCurrentObject (long hdc, int uObjectType); public static final native int GetCurrentProcessId (); public static final native int GetCurrentThreadId (); /** @method flags=dynamic */ -public static final native int GetCurrentProcessExplicitAppUserModelID(long /*int*/[] AppID); -public static final native long /*int*/ GetCursor (); +public static final native int GetCurrentProcessExplicitAppUserModelID(long[] AppID); +public static final native long GetCursor (); public static final native boolean GetCursorPos (POINT lpPoint); /** @param hwnd cast=(HWND) */ -public static final native long /*int*/ GetDC (long /*int*/ hwnd); +public static final native long GetDC (long hwnd); /** * @param hWnd cast=(HWND) * @param hrgnClip cast=(HRGN) */ -public static final native long /*int*/ GetDCEx (long /*int*/ hWnd, long /*int*/ hrgnClip, int flags); -public static final native long /*int*/ GetDesktopWindow (); +public static final native long GetDCEx (long hWnd, long hrgnClip, int flags); +public static final native long GetDesktopWindow (); /** @param hdc cast=(HDC) */ -public static final native int GetDeviceCaps (long /*int*/ hdc, int nIndex); +public static final native int GetDeviceCaps (long hdc, int nIndex); public static final native int GetDialogBaseUnits (); /** * @param hdc cast=(HDC) * @param pColors cast=(RGBQUAD *),flags=no_in critical */ -public static final native int GetDIBColorTable (long /*int*/ hdc, int uStartIndex, int cEntries, byte[] pColors); +public static final native int GetDIBColorTable (long hdc, int uStartIndex, int cEntries, byte[] pColors); /** * @param hdc cast=(HDC) * @param hbmp cast=(HBITMAP) * @param lpvBits cast=(LPVOID),flags=critical * @param lpbi cast=(LPBITMAPINFO),flags=critical */ -public static final native int GetDIBits (long /*int*/ hdc, long /*int*/ hbmp, int uStartScan, int cScanLines, byte[] lpvBits, byte[] lpbi, int uUsage); +public static final native int GetDIBits (long hdc, long hbmp, int uStartScan, int cScanLines, byte[] lpvBits, byte[] lpbi, int uUsage); /** @param hDlg cast=(HWND) */ -public static final native long /*int*/ GetDlgItem (long /*int*/ hDlg, int nIDDlgItem); +public static final native long GetDlgItem (long hDlg, int nIDDlgItem); public static final native int GetDoubleClickTime (); /** @method flags=dynamic */ -public static final native int GetDpiForMonitor (long /*int*/ hmonitor, int dpiType, int [] dpiX, int [] dpiY); -public static final native long /*int*/ GetFocus (); +public static final native int GetDpiForMonitor (long hmonitor, int dpiType, int [] dpiX, int [] dpiY); +public static final native long GetFocus (); /** @param hdc cast=(HDC) */ -public static final native int GetFontLanguageInfo (long /*int*/ hdc); -public static final native long /*int*/ GetForegroundWindow (); +public static final native int GetFontLanguageInfo (long hdc); +public static final native long GetForegroundWindow (); /** * @method flags=dynamic * @param hGestureInfo cast=(HGESTUREINFO) * @param pGestureInfo cast=(PGESTUREINFO) */ -public static final native boolean GetGestureInfo(long /*int*/ hGestureInfo, GESTUREINFO pGestureInfo); +public static final native boolean GetGestureInfo(long hGestureInfo, GESTUREINFO pGestureInfo); /** @param hdc cast=(HDC) */ -public static final native int GetGraphicsMode (long /*int*/ hdc); +public static final native int GetGraphicsMode (long hdc); /** * @param hdc cast=(HDC) * @param pgi cast=(LPWORD) */ -public static final native int GetGlyphIndices (long /*int*/ hdc, char[] lpstr, int c, short[] pgi, int fl); +public static final native int GetGlyphIndices (long hdc, char[] lpstr, int c, short[] pgi, int fl); /** * @param idThread cast=(DWORD) * @param lpgui cast=(LPGUITHREADINFO) @@ -2856,120 +2856,120 @@ public static final native boolean GetGUIThreadInfo (int idThread, GUITHREADINFO * @param hIcon cast=(HICON) * @param piconinfo flags=no_in */ -public static final native boolean GetIconInfo (long /*int*/ hIcon, ICONINFO piconinfo); +public static final native boolean GetIconInfo (long hIcon, ICONINFO piconinfo); /** @param lpList cast=(HKL FAR *) */ -public static final native int GetKeyboardLayoutList (int nBuff, long /*int*/ [] lpList); -public static final native long /*int*/ GetKeyboardLayout (int idThread); +public static final native int GetKeyboardLayoutList (int nBuff, long [] lpList); +public static final native long GetKeyboardLayout (int idThread); public static final native short GetKeyState (int nVirtKey); /** @param lpKeyState cast=(PBYTE) */ public static final native boolean GetKeyboardState (byte [] lpKeyState); /** @param hWnd cast=(HWND) */ -public static final native long /*int*/ GetLastActivePopup (long /*int*/ hWnd); +public static final native long GetLastActivePopup (long hWnd); public static final native int GetLastError (); /** @param hwnd cast=(HWND) */ -public static final native boolean GetLayeredWindowAttributes (long /*int*/ hwnd, int [] pcrKey, byte [] pbAlpha, int [] pdwFlags); +public static final native boolean GetLayeredWindowAttributes (long hwnd, int [] pcrKey, byte [] pbAlpha, int [] pdwFlags); /** @param hdc cast=(HDC) */ -public static final native int GetLayout (long /*int*/ hdc); +public static final native int GetLayout (long hdc); /* returns the instance handle to the swt library */ /** @method flags=no_gen */ -public static final native long /*int*/ GetLibraryHandle (); +public static final native long GetLibraryHandle (); /** @param lpLCData cast=(LPWSTR) */ public static final native int GetLocaleInfo (int Locale, int LCType, char [] lpLCData, int cchData); /** @param hWnd cast=(HWND) */ -public static final native long /*int*/ GetMenu (long /*int*/ hWnd); +public static final native long GetMenu (long hWnd); /** @param hWnd cast=(HWND) */ -public static final native boolean GetMenuBarInfo (long /*int*/ hWnd, int idObject, int idItem, MENUBARINFO pmbi); +public static final native boolean GetMenuBarInfo (long hWnd, int idObject, int idItem, MENUBARINFO pmbi); /** @param hMenu cast=(HMENU) */ -public static final native int GetMenuDefaultItem (long /*int*/ hMenu, int fByPos, int gmdiFlags); +public static final native int GetMenuDefaultItem (long hMenu, int fByPos, int gmdiFlags); /** @param hmenu cast=(HMENU) */ -public static final native boolean GetMenuInfo (long /*int*/ hmenu, MENUINFO lpcmi); +public static final native boolean GetMenuInfo (long hmenu, MENUINFO lpcmi); /** @param hMenu cast=(HMENU) */ -public static final native int GetMenuItemCount (long /*int*/ hMenu); +public static final native int GetMenuItemCount (long hMenu); /** * @param hMenu cast=(HMENU) * @param lpmii cast=(LPMENUITEMINFOW) */ -public static final native boolean GetMenuItemInfo (long /*int*/ hMenu, int uItem, boolean fByPosition, MENUITEMINFO lpmii); +public static final native boolean GetMenuItemInfo (long hMenu, int uItem, boolean fByPosition, MENUITEMINFO lpmii); /** * @param hWnd cast=(HWND) * @param hMenu cast=(HMENU) */ -public static final native boolean GetMenuItemRect (long /*int*/ hWnd, long /*int*/ hMenu, int uItem, RECT lprcItem); +public static final native boolean GetMenuItemRect (long hWnd, long hMenu, int uItem, RECT lprcItem); /** @param hWnd cast=(HWND) */ -public static final native boolean GetMessage (MSG lpMsg, long /*int*/ hWnd, int wMsgFilterMin, int wMsgFilterMax); +public static final native boolean GetMessage (MSG lpMsg, long hWnd, int wMsgFilterMin, int wMsgFilterMax); public static final native int GetMessagePos (); public static final native int GetMessageTime (); /** * @param hdc cast=(HDC) * @param hrgn cast=(HRGN) */ -public static final native int GetMetaRgn (long /*int*/ hdc, long /*int*/ hrgn); +public static final native int GetMetaRgn (long hdc, long hrgn); /** * @param hTheme cast=(HTHEME) * @param hdc cast=(HDC) * @param prc flags=no_out * @param psz flags=no_in */ -public static final native int GetThemePartSize(long /*int*/ hTheme, long /*int*/ hdc, int iPartId, int iStateId, RECT prc, int eSize, SIZE psz); +public static final native int GetThemePartSize(long hTheme, long hdc, int iPartId, int iStateId, RECT prc, int eSize, SIZE psz); /** * @param hTheme cast=(HTHEME) * @param hdc cast=(HDC) */ -public static final native int GetThemeTextExtent (long /*int*/ hTheme, long /*int*/ hdc, int iPartId, int iStateId, char[] pszText, int iCharCount, int dwTextFlags, RECT pBoundingRect, RECT pExtentRect); +public static final native int GetThemeTextExtent (long hTheme, long hdc, int iPartId, int iStateId, char[] pszText, int iCharCount, int dwTextFlags, RECT pBoundingRect, RECT pExtentRect); /** * @param hModule cast=(HMODULE) * @param lpFilename cast=(LPWSTR) */ -public static final native int GetModuleFileName (long /*int*/ hModule, char [] lpFilename, int inSize); +public static final native int GetModuleFileName (long hModule, char [] lpFilename, int inSize); /** @param lpModuleName cast=(LPWSTR) */ -public static final native long /*int*/ GetModuleHandle (char [] lpModuleName); +public static final native long GetModuleHandle (char [] lpModuleName); /** * @param hmonitor cast=(HMONITOR) * @param lpmi cast=(LPMONITORINFO) */ -public static final native boolean GetMonitorInfo (long /*int*/ hmonitor, MONITORINFO lpmi); +public static final native boolean GetMonitorInfo (long hmonitor, MONITORINFO lpmi); /** * @param hgdiobj cast=(HGDIOBJ) * @param lpvObject flags=no_in */ -public static final native int GetObject (long /*int*/ hgdiobj, int cbBuffer, BITMAP lpvObject); +public static final native int GetObject (long hgdiobj, int cbBuffer, BITMAP lpvObject); /** * @param hgdiobj cast=(HGDIOBJ) * @param lpvObject flags=no_in */ -public static final native int GetObject (long /*int*/ hgdiobj, int cbBuffer, DIBSECTION lpvObject); +public static final native int GetObject (long hgdiobj, int cbBuffer, DIBSECTION lpvObject); /** * @param hgdiobj cast=(HGDIOBJ) * @param lpvObject flags=no_in */ -public static final native int GetObject (long /*int*/ hgdiobj, int cbBuffer, LOGBRUSH lpvObject); +public static final native int GetObject (long hgdiobj, int cbBuffer, LOGBRUSH lpvObject); /** * @param hgdiobj cast=(HGDIOBJ) * @param lpvObject flags=no_in */ -public static final native int GetObject (long /*int*/ hgdiobj, int cbBuffer, LOGFONT lpvObject); +public static final native int GetObject (long hgdiobj, int cbBuffer, LOGFONT lpvObject); /** * @param hgdiobj cast=(HGDIOBJ) * @param lpvObject cast=(LPVOID),flags=no_in */ -public static final native int GetObject (long /*int*/ hgdiobj, int cbBuffer, long /*int*/ lpvObject); +public static final native int GetObject (long hgdiobj, int cbBuffer, long lpvObject); /** @param lpofn cast=(LPOPENFILENAMEW) */ public static final native boolean GetOpenFileName (OPENFILENAME lpofn); /** @param hdc cast=(HDC) */ -public static final native int GetOutlineTextMetrics (long /*int*/ hdc, int cbData, OUTLINETEXTMETRIC lpOTM); +public static final native int GetOutlineTextMetrics (long hdc, int cbData, OUTLINETEXTMETRIC lpOTM); /** @param hWnd cast=(HWND) */ -public static final native long /*int*/ GetParent (long /*int*/ hWnd); +public static final native long GetParent (long hWnd); /** @param hdc cast=(HDC) */ -public static final native int GetPixel (long /*int*/ hdc, int x, int y); +public static final native int GetPixel (long hdc, int x, int y); /** @param hdc cast=(HDC) */ -public static final native int GetPolyFillMode (long /*int*/ hdc); +public static final native int GetPolyFillMode (long hdc); /** * @param pPrinterName cast=(LPWSTR) * @param phPrinter cast=(LPHANDLE) * @param pDefault cast=(LPPRINTER_DEFAULTSW) */ -public static final native boolean OpenPrinter (char[] pPrinterName, long /*int*/ [] phPrinter, long /*int*/ pDefault); -public static final native long /*int*/ GetProcessHeap (); +public static final native boolean OpenPrinter (char[] pPrinterName, long [] phPrinter, long pDefault); +public static final native long GetProcessHeap (); /** * @param lpAppName cast=(LPWSTR) * @param lpKeyName cast=(LPWSTR) @@ -2981,114 +2981,114 @@ public static final native int GetProfileString (char [] lpAppName, char [] lpKe * @param hWnd cast=(HWND) * @param lpString cast=(LPCWSTR) */ -public static final native long /*int*/ GetProp (long /*int*/ hWnd, long /*int*/ lpString); +public static final native long GetProp (long hWnd, long lpString); /** * @param hdc cast=(HDC) * @param hrgn cast=(HRGN) */ -public static final native int GetRandomRgn (long /*int*/ hdc, long /*int*/ hrgn, int iNum); +public static final native int GetRandomRgn (long hdc, long hrgn, int iNum); /** * @param hRgn cast=(HRGN) * @param lpRgnData cast=(RGNDATA *),flags=no_in critical */ -public static final native int GetRegionData (long /*int*/ hRgn, int dwCount, int [] lpRgnData); +public static final native int GetRegionData (long hRgn, int dwCount, int [] lpRgnData); /** * @param hrgn cast=(HRGN) * @param lprc flags=no_in */ -public static final native int GetRgnBox (long /*int*/ hrgn, RECT lprc); +public static final native int GetRgnBox (long hrgn, RECT lprc); /** @param hdc cast=(HDC) */ -public static final native int GetROP2 (long /*int*/ hdc); +public static final native int GetROP2 (long hdc); /** @param lpofn cast=(LPOPENFILENAMEW) */ public static final native boolean GetSaveFileName (OPENFILENAME lpofn); /** @param hwnd cast=(HWND) */ -public static final native boolean GetScrollBarInfo (long /*int*/ hwnd, int idObject, SCROLLBARINFO psbi); +public static final native boolean GetScrollBarInfo (long hwnd, int idObject, SCROLLBARINFO psbi); /** @param hwnd cast=(HWND) */ -public static final native boolean GetScrollInfo (long /*int*/ hwnd, int flags, SCROLLINFO info); +public static final native boolean GetScrollInfo (long hwnd, int flags, SCROLLINFO info); /** @param lpStartupInfo cast=(LPSTARTUPINFOW) */ public static final native void GetStartupInfo (STARTUPINFO lpStartupInfo); -public static final native long /*int*/ GetStockObject (int fnObject); +public static final native long GetStockObject (int fnObject); public static final native int GetSysColor (int nIndex); -public static final native long /*int*/ GetSysColorBrush (int nIndex); +public static final native long GetSysColorBrush (int nIndex); public static final native short GetSystemDefaultUILanguage (); /** @param hWnd cast=(HWND) */ -public static final native long /*int*/ GetSystemMenu (long /*int*/ hWnd, boolean bRevert); +public static final native long GetSystemMenu (long hWnd, boolean bRevert); public static final native int GetSystemMetrics (int nIndex); /** @param hDC cast=(HDC) */ -public static final native int GetTextColor (long /*int*/ hDC); +public static final native int GetTextColor (long hDC); /** * @param hdc cast=(HDC) * @param lpString cast=(LPWSTR),flags=no_out critical * @param lpSize flags=no_in */ -public static final native boolean GetTextExtentPoint32 (long /*int*/ hdc, char [] lpString, int cbString, SIZE lpSize); +public static final native boolean GetTextExtentPoint32 (long hdc, char [] lpString, int cbString, SIZE lpSize); /** * @param hdc cast=(HDC) * @param lptm flags=no_in */ -public static final native boolean GetTextMetrics (long /*int*/ hdc, TEXTMETRIC lptm); +public static final native boolean GetTextMetrics (long hdc, TEXTMETRIC lptm); /** * @method flags=dynamic * @param hTouchInput cast=(HTOUCHINPUT) * @param cInputs cast=(UINT) * @param pTouchInputs cast=(PTOUCHINPUT) */ -public static final native boolean GetTouchInputInfo(long /*int*/ hTouchInput, int cInputs, long /*int*/ pTouchInputs, int cbSize); +public static final native boolean GetTouchInputInfo(long hTouchInput, int cInputs, long pTouchInputs, int cbSize); /** * @param hWnd cast=(HWND) * @param lpRect cast=(LPRECT) * @param bErase cast=(BOOL) */ -public static final native boolean GetUpdateRect (long /*int*/ hWnd, RECT lpRect, boolean bErase); +public static final native boolean GetUpdateRect (long hWnd, RECT lpRect, boolean bErase); /** * @param hWnd cast=(HWND) * @param hRgn cast=(HRGN) */ -public static final native int GetUpdateRgn (long /*int*/ hWnd, long /*int*/ hRgn, boolean bErase); +public static final native int GetUpdateRgn (long hWnd, long hRgn, boolean bErase); public static final native int GetVersion (); /** @param hWnd cast=(HWND) */ -public static final native long /*int*/ GetWindow (long /*int*/ hWnd, int uCmd); +public static final native long GetWindow (long hWnd, int uCmd); /** @param hWnd cast=(HWND) */ -public static final native int GetWindowLong (long /*int*/ hWnd, int nIndex); +public static final native int GetWindowLong (long hWnd, int nIndex); /** @param hWnd cast=(HWND) */ -public static final native long /*int*/ GetWindowLongPtr (long /*int*/ hWnd, int nIndex); +public static final native long GetWindowLongPtr (long hWnd, int nIndex); /** @param hWnd cast=(HWND) */ -public static final native long /*int*/ GetWindowDC (long /*int*/ hWnd); +public static final native long GetWindowDC (long hWnd); /** @param hdc cast=(HDC) */ -public static final native boolean GetWindowOrgEx (long /*int*/ hdc, POINT lpPoint); +public static final native boolean GetWindowOrgEx (long hdc, POINT lpPoint); /** @param hWnd cast=(HWND) */ -public static final native boolean GetWindowPlacement (long /*int*/ hWnd, WINDOWPLACEMENT lpwndpl); +public static final native boolean GetWindowPlacement (long hWnd, WINDOWPLACEMENT lpwndpl); /** @param hWnd cast=(HWND) */ -public static final native boolean GetWindowRect (long /*int*/ hWnd, RECT lpRect); +public static final native boolean GetWindowRect (long hWnd, RECT lpRect); /** * @param hWnd cast=(HWND) * @param hRgn cast=(HRGN) */ -public static final native int GetWindowRgn (long /*int*/ hWnd, long /*int*/ hRgn); +public static final native int GetWindowRgn (long hWnd, long hRgn); /** * @param hWnd cast=(HWND) * @param lpString cast=(LPWSTR) */ -public static final native int GetWindowText (long /*int*/ hWnd, char [] lpString, int nMaxCount); +public static final native int GetWindowText (long hWnd, char [] lpString, int nMaxCount); /** @param hWnd cast=(HWND) */ -public static final native int GetWindowTextLength (long /*int*/ hWnd); +public static final native int GetWindowTextLength (long hWnd); /** * @param hWnd cast=(HWND) * @param lpdwProcessId cast=(LPDWORD) */ -public static final native int GetWindowThreadProcessId (long /*int*/ hWnd, int [] lpdwProcessId); +public static final native int GetWindowThreadProcessId (long hWnd, int [] lpdwProcessId); public static final native double GID_ROTATE_ANGLE_FROM_ARGUMENT(long dwArgument); /** @param lpString cast=(LPCWSTR) */ public static final native int GlobalAddAtom (char [] lpString); -public static final native long /*int*/ GlobalAlloc (int uFlags, int dwBytes); +public static final native long GlobalAlloc (int uFlags, int dwBytes); /** @param hMem cast=(HANDLE) */ -public static final native long /*int*/ GlobalFree (long /*int*/ hMem); +public static final native long GlobalFree (long hMem); /** @param hMem cast=(HANDLE) */ -public static final native long /*int*/ GlobalLock (long /*int*/ hMem); +public static final native long GlobalLock (long hMem); /** @param hMem cast=(HANDLE) */ -public static final native int GlobalSize (long /*int*/ hMem); +public static final native int GlobalSize (long hMem); /** @param hMem cast=(HANDLE) */ -public static final native boolean GlobalUnlock (long /*int*/ hMem); +public static final native boolean GlobalUnlock (long hMem); /** * @param hdc cast=(HDC) * @param pVertex cast=(PTRIVERTEX) @@ -3097,17 +3097,17 @@ public static final native boolean GlobalUnlock (long /*int*/ hMem); * @param dwNumMesh cast=(ULONG) * @param dwMode cast=(ULONG) */ -public static final native boolean GradientFill (long /*int*/ hdc, long /*int*/ pVertex, int dwNumVertex, long /*int*/ pMesh, int dwNumMesh, int dwMode); -public static final native int HIWORD(long /*int*/ l); +public static final native boolean GradientFill (long hdc, long pVertex, int dwNumVertex, long pMesh, int dwNumMesh, int dwMode); +public static final native int HIWORD(long l); /** @param hHeap cast=(HANDLE) */ -public static final native long /*int*/ HeapAlloc (long /*int*/ hHeap, int dwFlags, int dwBytes); +public static final native long HeapAlloc (long hHeap, int dwFlags, int dwBytes); /** * @param hHeap cast=(HANDLE) * @param lpMem cast=(LPVOID) */ -public static final native boolean HeapFree (long /*int*/ hHeap, int dwFlags, long /*int*/ lpMem); +public static final native boolean HeapFree (long hHeap, int dwFlags, long lpMem); /** @param hWnd cast=(HWND) */ -public static final native boolean HideCaret (long /*int*/ hWnd); +public static final native boolean HideCaret (long hWnd); /** * @param lpsz cast=(LPOLESTR) * @param lpiid cast=(LPIID) @@ -3118,22 +3118,22 @@ public static final native int IIDFromString (char[] lpsz, byte[] lpiid); * @param hbmImage cast=(HBITMAP) * @param hbmMask cast=(HBITMAP) */ -public static final native int ImageList_Add (long /*int*/ himl, long /*int*/ hbmImage, long /*int*/ hbmMask); +public static final native int ImageList_Add (long himl, long hbmImage, long hbmMask); /** * @param himl cast=(HIMAGELIST) * @param hbmImage cast=(HBITMAP) * @param crMask cast=(COLORREF) */ -public static final native int ImageList_AddMasked (long /*int*/ himl, long /*int*/ hbmImage, int crMask); +public static final native int ImageList_AddMasked (long himl, long hbmImage, int crMask); /** @param himl cast=(HIMAGELIST) */ -public static final native boolean ImageList_BeginDrag (long /*int*/ himl, int iTrack, int dxHotspot, int dyHotspot); -public static final native long /*int*/ ImageList_Create (int cx, int cy, int flags, int cInitial, int cGrow); +public static final native boolean ImageList_BeginDrag (long himl, int iTrack, int dxHotspot, int dyHotspot); +public static final native long ImageList_Create (int cx, int cy, int flags, int cInitial, int cGrow); /** @param himl cast=(HIMAGELIST) */ -public static final native boolean ImageList_Destroy (long /*int*/ himl); +public static final native boolean ImageList_Destroy (long himl); /** @param hwndLock cast=(HWND) */ -public static final native boolean ImageList_DragEnter (long /*int*/ hwndLock, int x, int y); +public static final native boolean ImageList_DragEnter (long hwndLock, int x, int y); /** @param hwndLock cast=(HWND) */ -public static final native boolean ImageList_DragLeave (long /*int*/ hwndLock); +public static final native boolean ImageList_DragLeave (long hwndLock); public static final native boolean ImageList_DragMove (int x, int y); /** @param fShow cast=(BOOL) */ public static final native boolean ImageList_DragShowNolock (boolean fShow); @@ -3143,91 +3143,91 @@ public static final native void ImageList_EndDrag (); * @param cx cast=(int *) * @param cy cast=(int *) */ -public static final native boolean ImageList_GetIconSize (long /*int*/ himl, int [] cx, int [] cy); +public static final native boolean ImageList_GetIconSize (long himl, int [] cx, int [] cy); /** @param himl cast=(HIMAGELIST) */ -public static final native int ImageList_GetImageCount (long /*int*/ himl); +public static final native int ImageList_GetImageCount (long himl); /** @param himl cast=(HIMAGELIST) */ -public static final native boolean ImageList_Remove (long /*int*/ himl, int i); +public static final native boolean ImageList_Remove (long himl, int i); /** * @param himl cast=(HIMAGELIST) * @param hbmImage cast=(HBITMAP) * @param hbmMask cast=(HBITMAP) */ -public static final native boolean ImageList_Replace (long /*int*/ himl, int i, long /*int*/ hbmImage, long /*int*/ hbmMask); +public static final native boolean ImageList_Replace (long himl, int i, long hbmImage, long hbmMask); /** * @param himl cast=(HIMAGELIST) * @param hicon cast=(HICON) */ -public static final native int ImageList_ReplaceIcon (long /*int*/ himl, int i, long /*int*/ hicon); +public static final native int ImageList_ReplaceIcon (long himl, int i, long hicon); /** @param himl cast=(HIMAGELIST) */ -public static final native boolean ImageList_SetIconSize (long /*int*/ himl, int cx, int cy); +public static final native boolean ImageList_SetIconSize (long himl, int cx, int cy); /** * @param hWnd cast=(HWND) * @param hIMC cast=(HIMC) */ -public static final native long /*int*/ ImmAssociateContext (long /*int*/ hWnd, long /*int*/ hIMC); -public static final native long /*int*/ ImmCreateContext (); +public static final native long ImmAssociateContext (long hWnd, long hIMC); +public static final native long ImmCreateContext (); /** @param hIMC cast=(HIMC) */ -public static final native boolean ImmDestroyContext (long /*int*/ hIMC); +public static final native boolean ImmDestroyContext (long hIMC); /** * @param hKL cast=(HKL) * @param hIMC cast=(HIMC) * @param lpData cast=(LPVOID) */ -public static final native long /*int*/ ImmEscape (long /*int*/ hKL, long /*int*/ hIMC, int uEscape, char[] lpData); +public static final native long ImmEscape (long hKL, long hIMC, int uEscape, char[] lpData); /** @param hIMC cast=(HIMC) */ -public static final native boolean ImmGetCompositionFont (long /*int*/ hIMC, LOGFONT lplf); +public static final native boolean ImmGetCompositionFont (long hIMC, LOGFONT lplf); /** * @param hIMC cast=(HIMC) * @param lpBuf cast=(LPWSTR) */ -public static final native int ImmGetCompositionString (long /*int*/ hIMC, int dwIndex, char [] lpBuf, int dwBufLen); +public static final native int ImmGetCompositionString (long hIMC, int dwIndex, char [] lpBuf, int dwBufLen); /** * @param hIMC cast=(HIMC) * @param lpBuf cast=(LPWSTR) */ -public static final native int ImmGetCompositionString (long /*int*/ hIMC, int dwIndex, int [] lpBuf, int dwBufLen); +public static final native int ImmGetCompositionString (long hIMC, int dwIndex, int [] lpBuf, int dwBufLen); /** * @param hIMC cast=(HIMC) * @param lpBuf cast=(LPWSTR) */ -public static final native int ImmGetCompositionString (long /*int*/ hIMC, int dwIndex, byte [] lpBuf, int dwBufLen); +public static final native int ImmGetCompositionString (long hIMC, int dwIndex, byte [] lpBuf, int dwBufLen); /** @param hWnd cast=(HWND) */ -public static final native long /*int*/ ImmGetContext (long /*int*/ hWnd); +public static final native long ImmGetContext (long hWnd); /** * @param hIMC cast=(HIMC) * @param lpfdwConversion cast=(LPDWORD) * @param lpfdwSentence cast=(LPDWORD) */ -public static final native boolean ImmGetConversionStatus (long /*int*/ hIMC, int [] lpfdwConversion, int [] lpfdwSentence); +public static final native boolean ImmGetConversionStatus (long hIMC, int [] lpfdwConversion, int [] lpfdwSentence); /** @param hWnd cast=(HWND) */ -public static final native long /*int*/ ImmGetDefaultIMEWnd (long /*int*/ hWnd); +public static final native long ImmGetDefaultIMEWnd (long hWnd); /** @param hIMC cast=(HIMC) */ -public static final native boolean ImmGetOpenStatus (long /*int*/ hIMC); +public static final native boolean ImmGetOpenStatus (long hIMC); /** @param hIMC cast=(HIMC) */ -public static final native boolean ImmNotifyIME (long /*int*/ hIMC, int dwAction, int dwIndex, int dwValue); +public static final native boolean ImmNotifyIME (long hIMC, int dwAction, int dwIndex, int dwValue); /** * @param hWnd cast=(HWND) * @param hIMC cast=(HIMC) */ -public static final native boolean ImmReleaseContext (long /*int*/ hWnd, long /*int*/ hIMC); +public static final native boolean ImmReleaseContext (long hWnd, long hIMC); /** @param hIMC cast=(HIMC) */ -public static final native boolean ImmSetCompositionFont (long /*int*/ hIMC, LOGFONT lplf); +public static final native boolean ImmSetCompositionFont (long hIMC, LOGFONT lplf); /** @param hIMC cast=(HIMC) */ -public static final native boolean ImmSetCompositionWindow (long /*int*/ hIMC, COMPOSITIONFORM lpCompForm); +public static final native boolean ImmSetCompositionWindow (long hIMC, COMPOSITIONFORM lpCompForm); /** @param hIMC cast=(HIMC) */ -public static final native boolean ImmSetCandidateWindow (long /*int*/ hIMC, CANDIDATEFORM lpCandidate); +public static final native boolean ImmSetCandidateWindow (long hIMC, CANDIDATEFORM lpCandidate); /** @param hIMC cast=(HIMC) */ -public static final native boolean ImmSetConversionStatus (long /*int*/ hIMC, int fdwConversion, int dwSentence); +public static final native boolean ImmSetConversionStatus (long hIMC, int fdwConversion, int dwSentence); /** @param hIMC cast=(HIMC) */ -public static final native boolean ImmSetOpenStatus (long /*int*/ hIMC, boolean fOpen); +public static final native boolean ImmSetOpenStatus (long hIMC, boolean fOpen); public static final native void InitCommonControls (); public static final native boolean InitCommonControlsEx (INITCOMMONCONTROLSEX lpInitCtrls); /** * @param hMenu cast=(HMENU) * @param lpmii cast=(LPMENUITEMINFOW) */ -public static final native boolean InsertMenuItem (long /*int*/ hMenu, int uItem, boolean fByPosition, MENUITEMINFO lpmii); +public static final native boolean InsertMenuItem (long hMenu, int uItem, boolean fByPosition, MENUITEMINFO lpmii); /** * @param lpszUrl cast=(LPCWSTR) * @param lpszCookieName cast=(LPCWSTR) @@ -3245,9 +3245,9 @@ public static final native boolean InternetSetCookie (char[] lpszUrl, char[] lps * @param hInternet cast=(HINTERNET) * @param lpBuffer cast=(LPVOID) */ -public static final native boolean InternetSetOption (long /*int*/ hInternet, int dwOption, long /*int*/ lpBuffer, int dwBufferLength); +public static final native boolean InternetSetOption (long hInternet, int dwOption, long lpBuffer, int dwBufferLength); /** @param hdc cast=(HDC) */ -public static final native int IntersectClipRect (long /*int*/ hdc, int nLeftRect, int nTopRect, int nRightRect, int nBottomRect); +public static final native int IntersectClipRect (long hdc, int nLeftRect, int nTopRect, int nRightRect, int nBottomRect); /** * @param lprcDst flags=no_in * @param lprcSrc1 flags=no_out @@ -3255,106 +3255,106 @@ public static final native int IntersectClipRect (long /*int*/ hdc, int nLeftRec */ public static final native boolean IntersectRect (RECT lprcDst, RECT lprcSrc1, RECT lprcSrc2); /** @param hWnd cast=(HWND) */ -public static final native boolean InvalidateRect (long /*int*/ hWnd, RECT lpRect, boolean bErase); +public static final native boolean InvalidateRect (long hWnd, RECT lpRect, boolean bErase); /** * @param hWnd cast=(HWND) * @param hRgn cast=(HRGN) */ -public static final native boolean InvalidateRgn (long /*int*/ hWnd, long /*int*/ hRgn, boolean bErase); +public static final native boolean InvalidateRgn (long hWnd, long hRgn, boolean bErase); public static final native boolean IsAppThemed (); /** @param hWnd cast=(HWND) */ -public static final native boolean IsHungAppWindow (long /*int*/ hWnd); +public static final native boolean IsHungAppWindow (long hWnd); /** @param hWnd cast=(HWND) */ -public static final native boolean IsIconic (long /*int*/ hWnd); +public static final native boolean IsIconic (long hWnd); /** * @method flags=dynamic * @param hWnd cast=(HWND) * @param outFlags cast=(PULONG) */ -public static final native boolean IsTouchWindow (long /*int*/ hWnd, long[] outFlags); +public static final native boolean IsTouchWindow (long hWnd, long[] outFlags); /** @param hWnd cast=(HWND) */ -public static final native boolean IsWindowEnabled (long /*int*/ hWnd); +public static final native boolean IsWindowEnabled (long hWnd); /** @param hWnd cast=(HWND) */ -public static final native boolean IsWindowVisible (long /*int*/ hWnd); +public static final native boolean IsWindowVisible (long hWnd); /** @param hWnd cast=(HWND) */ -public static final native boolean IsZoomed (long /*int*/ hWnd); +public static final native boolean IsZoomed (long hWnd); /** @param hWnd cast=(HWND) */ -public static final native boolean KillTimer (long /*int*/ hWnd, long /*int*/ uIDEvent); +public static final native boolean KillTimer (long hWnd, long uIDEvent); /** @param hdc cast=(HDC) */ -public static final native boolean LineTo (long /*int*/ hdc, int x1, int x2); +public static final native boolean LineTo (long hdc, int x1, int x2); /** * @param hInstance cast=(HINSTANCE) * @param lpBitmapName cast=(LPWSTR) */ -public static final native long /*int*/ LoadBitmap (long /*int*/ hInstance, long /*int*/ lpBitmapName); +public static final native long LoadBitmap (long hInstance, long lpBitmapName); /** * @param hInstance cast=(HINSTANCE) * @param lpCursorName cast=(LPWSTR) */ -public static final native long /*int*/ LoadCursor (long /*int*/ hInstance, long /*int*/ lpCursorName); +public static final native long LoadCursor (long hInstance, long lpCursorName); /** * @param hInstance cast=(HINSTANCE) * @param lpIconName cast=(LPWSTR) */ -public static final native long /*int*/ LoadIcon (long /*int*/ hInstance, long /*int*/ lpIconName); +public static final native long LoadIcon (long hInstance, long lpIconName); /** * @param hinst cast=(HINSTANCE) * @param pszName cast=(PCWSTR) * @param phico cast=(HICON *) */ -public static final native int LoadIconMetric (long /*int*/ hinst, long /*int*/ pszName, int lims, long /*int*/ [] phico); +public static final native int LoadIconMetric (long hinst, long pszName, int lims, long [] phico); /** * @param hinst cast=(HINSTANCE) * @param lpszName cast=(LPWSTR) */ -public static final native long /*int*/ LoadImage (long /*int*/ hinst, long /*int*/ lpszName, int uType, int cxDesired, int cyDesired, int fuLoad); +public static final native long LoadImage (long hinst, long lpszName, int uType, int cxDesired, int cyDesired, int fuLoad); /** @param hMem cast=(HLOCAL) */ -public static final native long /*int*/ LocalFree (long /*int*/ hMem); +public static final native long LocalFree (long hMem); public static final native int LODWORD (long l); -public static final native int LOWORD (long /*int*/ l); +public static final native int LOWORD (long l); /** @param hdc cast=(HDC) */ -public static final native boolean LPtoDP (long /*int*/ hdc, POINT lpPoints, int nCount); +public static final native boolean LPtoDP (long hdc, POINT lpPoints, int nCount); public static final native int MAKEWORD(int l, int h); -public static final native long /*int*/ MAKEWPARAM(int l, int h); -public static final native long /*int*/ MAKELPARAM(int l, int h); -public static final native long /*int*/ MAKELRESULT(int l, int h); +public static final native long MAKEWPARAM(int l, int h); +public static final native long MAKELPARAM(int l, int h); +public static final native long MAKELRESULT(int l, int h); public static final native int MapVirtualKey (int uCode, int uMapType); /** * @param hWndFrom cast=(HWND) * @param hWndTo cast=(HWND) * @param lpPoints cast=(LPPOINT) */ -public static final native int MapWindowPoints (long /*int*/ hWndFrom, long /*int*/ hWndTo, POINT lpPoints, int cPoints); +public static final native int MapWindowPoints (long hWndFrom, long hWndTo, POINT lpPoints, int cPoints); /** * @param hWndFrom cast=(HWND) * @param hWndTo cast=(HWND) * @param lpPoints cast=(LPPOINT) */ -public static final native int MapWindowPoints (long /*int*/ hWndFrom, long /*int*/ hWndTo, RECT lpPoints, int cPoints); +public static final native int MapWindowPoints (long hWndFrom, long hWndTo, RECT lpPoints, int cPoints); public static final native boolean MessageBeep (int uType); /** * @param hWnd cast=(HWND) * @param lpText cast=(LPWSTR) * @param lpCaption cast=(LPWSTR) */ -public static final native int MessageBox (long /*int*/ hWnd, char [] lpText, char [] lpCaption, int uType); +public static final native int MessageBox (long hWnd, char [] lpText, char [] lpCaption, int uType); /** * @param hdc cast=(HDC) * @param lpXform cast=(XFORM *) */ -public static final native boolean ModifyWorldTransform(long /*int*/ hdc, float [] lpXform, int iMode); +public static final native boolean ModifyWorldTransform(long hdc, float [] lpXform, int iMode); /** @param hwnd cast=(HWND) */ -public static final native long /*int*/ MonitorFromWindow (long /*int*/ hwnd, int dwFlags); +public static final native long MonitorFromWindow (long hwnd, int dwFlags); /** * @param Destination cast=(PVOID),flags=no_in critical * @param SourcePtr cast=(CONST VOID *) */ -public static final native void MoveMemory (char[] Destination, long /*int*/ SourcePtr, int Length); +public static final native void MoveMemory (char[] Destination, long SourcePtr, int Length); /** * @param Destination cast=(PVOID),flags=no_in critical * @param Source cast=(CONST VOID *) */ -public static final native void MoveMemory (byte [] Destination, long /*int*/ Source, int Length); +public static final native void MoveMemory (byte [] Destination, long Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in critical * @param Source cast=(CONST VOID *),flags=no_out @@ -3369,122 +3369,122 @@ public static final native void MoveMemory (byte [] Destination, BITMAPINFOHEADE * @param Destination cast=(PVOID),flags=no_in critical * @param Source cast=(CONST VOID *) */ -public static final native void MoveMemory (int [] Destination, long /*int*/ Source, int Length); +public static final native void MoveMemory (int [] Destination, long Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in critical * @param SourcePtr cast=(CONST VOID *) */ -public static final native void MoveMemory (long [] Destination, long /*int*/ SourcePtr, int Length); +public static final native void MoveMemory (long [] Destination, long SourcePtr, int Length); /** * @param Destination cast=(PVOID),flags=no_in critical * @param SourcePtr cast=(CONST VOID *) */ -public static final native void MoveMemory (double[] Destination, long /*int*/ SourcePtr, int Length); +public static final native void MoveMemory (double[] Destination, 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, long /*int*/ SourcePtr, int Length); +public static final native void MoveMemory (float[] Destination, long SourcePtr, int Length); /** * @param Destination cast=(PVOID),flags=no_in critical * @param SourcePtr cast=(CONST VOID *) */ -public static final native void MoveMemory (short[] Destination, long /*int*/ SourcePtr, int Length); +public static final native void MoveMemory (short[] Destination, long SourcePtr, int Length); /** * @param Destination cast=(PVOID) * @param Source cast=(CONST VOID *),flags=no_out critical */ -public static final native void MoveMemory (long /*int*/ Destination, byte [] Source, int Length); +public static final native void MoveMemory (long Destination, byte [] Source, int Length); /** * @param Destination cast=(PVOID) * @param Source cast=(CONST VOID *),flags=no_out critical */ -public static final native void MoveMemory (long /*int*/ Destination, char [] Source, int Length); +public static final native void MoveMemory (long Destination, char [] Source, int Length); /** * @param Destination cast=(PVOID) * @param Source cast=(CONST VOID *),flags=no_out critical */ -public static final native void MoveMemory (long /*int*/ Destination, int [] Source, int Length); +public static final native void MoveMemory (long Destination, int [] Source, int Length); /** * @param Destination cast=(PVOID) * @param Source cast=(CONST VOID *) */ -public static final native void MoveMemory (long /*int*/ Destination, long /*int*/ Source, int Length); +public static final native void MoveMemory (long Destination, long Source, int Length); /** * @param Destination cast=(PVOID) * @param Source cast=(CONST VOID *),flags=no_out */ -public static final native void MoveMemory (long /*int*/ Destination, DEVMODE Source, int Length); +public static final native void MoveMemory (long Destination, DEVMODE Source, int Length); /** * @param Destination cast=(PVOID) * @param Source cast=(CONST VOID *),flags=no_out */ -public static final native void MoveMemory (long /*int*/ Destination, DOCHOSTUIINFO Source, int Length); +public static final native void MoveMemory (long Destination, DOCHOSTUIINFO Source, int Length); /** * @param Destination cast=(PVOID) * @param Source cast=(CONST VOID *),flags=no_out */ -public static final native void MoveMemory (long /*int*/ Destination, GRADIENT_RECT Source, int Length); +public static final native void MoveMemory (long Destination, GRADIENT_RECT Source, int Length); /** * @param Destination cast=(PVOID) * @param Source cast=(CONST VOID *),flags=no_out */ -public static final native void MoveMemory (long /*int*/ Destination, LOGFONT Source, int Length); +public static final native void MoveMemory (long Destination, LOGFONT Source, int Length); /** * @param Destination cast=(PVOID) * @param Source cast=(CONST VOID *),flags=no_out */ -public static final native void MoveMemory (long /*int*/ Destination, MEASUREITEMSTRUCT Source, int Length); +public static final native void MoveMemory (long Destination, MEASUREITEMSTRUCT Source, int Length); /** * @param Destination cast=(PVOID) * @param Source cast=(CONST VOID *),flags=no_out */ -public static final native void MoveMemory (long /*int*/ Destination, MINMAXINFO Source, int Length); +public static final native void MoveMemory (long Destination, MINMAXINFO Source, int Length); /** * @param Destination cast=(PVOID) * @param Source cast=(CONST VOID *),flags=no_out */ -public static final native void MoveMemory (long /*int*/ Destination, MSG Source, int Length); +public static final native void MoveMemory (long Destination, MSG Source, int Length); /** * @param Destination cast=(PVOID) * @param Source cast=(CONST VOID *),flags=no_out */ -public static final native void MoveMemory (long /*int*/ Destination, UDACCEL Source, int Length); +public static final native void MoveMemory (long Destination, UDACCEL Source, int Length); /** * @param Destination cast=(PVOID) * @param Source cast=(CONST VOID *),flags=no_out */ -public static final native void MoveMemory (long /*int*/ Destination, NMTTDISPINFO Source, int Length); +public static final native void MoveMemory (long Destination, NMTTDISPINFO Source, int Length); /** * @param Destination cast=(PVOID) * @param Source cast=(CONST VOID *) */ -public static final native void MoveMemory (long /*int*/ Destination, OPENFILENAME Source, int Length); +public static final native void MoveMemory (long Destination, OPENFILENAME Source, int Length); /** * @param Destination cast=(PVOID) * @param Source cast=(CONST VOID *),flags=no_out */ -public static final native void MoveMemory (long /*int*/ Destination, RECT Source, int Length); +public static final native void MoveMemory (long Destination, RECT Source, int Length); /** * @param Destination cast=(PVOID) * @param Source cast=(CONST VOID *),flags=no_out */ -public static final native void MoveMemory (long /*int*/ Destination, SAFEARRAY Source, int Length); +public static final native void MoveMemory (long Destination, SAFEARRAY Source, int Length); /** * @param Destination cast=(PVOID) * @param Source cast=(CONST VOID *),flags=no_out */ -public static final native void MoveMemory (SAFEARRAY Destination, long /*int*/ Source, int Length); +public static final native void MoveMemory (SAFEARRAY Destination, long Source, int Length); /** * @param Destination cast=(PVOID) * @param Source cast=(CONST VOID *),flags=no_out */ -public static final native void MoveMemory (long /*int*/ Destination, TRIVERTEX Source, int Length); +public static final native void MoveMemory (long Destination, TRIVERTEX Source, int Length); /** * @param Destination cast=(PVOID) * @param Source cast=(CONST VOID *),flags=no_out */ -public static final native void MoveMemory (long /*int*/ Destination, WINDOWPOS Source, int Length); +public static final native void MoveMemory (long Destination, WINDOWPOS Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param Source cast=(CONST VOID *),flags=no_out critical @@ -3494,82 +3494,82 @@ public static final native void MoveMemory (BITMAPINFOHEADER Destination, byte [ * @param Destination cast=(PVOID),flags=no_in * @param Source cast=(CONST VOID *),flags=no_out critical */ -public static final native void MoveMemory (BITMAPINFOHEADER Destination, long /*int*/ Source, int Length); +public static final native void MoveMemory (BITMAPINFOHEADER Destination, long Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param Source cast=(CONST VOID *) */ -public static final native void MoveMemory (CERT_CONTEXT Destination, long /*int*/ Source, int Length); +public static final native void MoveMemory (CERT_CONTEXT Destination, long Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param Source cast=(CONST VOID *) */ -public static final native void MoveMemory (CERT_INFO Destination, long /*int*/ Source, int Length); +public static final native void MoveMemory (CERT_INFO Destination, long Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param Source cast=(CONST VOID *) */ -public static final native void MoveMemory (DEVMODE Destination, long /*int*/ Source, int Length); +public static final native void MoveMemory (DEVMODE Destination, long Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param Source cast=(CONST VOID *) */ -public static final native void MoveMemory (DOCHOSTUIINFO Destination, long /*int*/ Source, int Length); +public static final native void MoveMemory (DOCHOSTUIINFO Destination, long Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param Source cast=(CONST VOID *) */ -public static final native void MoveMemory (DRAWITEMSTRUCT Destination, long /*int*/ Source, int Length); +public static final native void MoveMemory (DRAWITEMSTRUCT Destination, long Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param Source cast=(CONST VOID *),flags=no_out */ -public static final native void MoveMemory (FLICK_DATA Destination, long /*int*/ [] Source, int Length); +public static final native void MoveMemory (FLICK_DATA Destination, long [] Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param Source cast=(CONST VOID *),flags=no_out */ -public static final native void MoveMemory (FLICK_POINT Destination, long /*int*/ [] Source, int Length); +public static final native void MoveMemory (FLICK_POINT Destination, long [] Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param Source cast=(CONST VOID *) */ -public static final native void MoveMemory (HDITEM Destination, long /*int*/ Source, int Length); +public static final native void MoveMemory (HDITEM Destination, long Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param Source cast=(CONST VOID *) */ -public static final native void MoveMemory (HELPINFO Destination, long /*int*/ Source, int Length); +public static final native void MoveMemory (HELPINFO Destination, long Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param Source cast=(CONST VOID *) */ -public static final native void MoveMemory (LOGFONT Destination, long /*int*/ Source, int Length); +public static final native void MoveMemory (LOGFONT Destination, long Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param Source cast=(CONST VOID *) */ -public static final native void MoveMemory (MEASUREITEMSTRUCT Destination, long /*int*/ Source, int Length); +public static final native void MoveMemory (MEASUREITEMSTRUCT Destination, long Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param Source cast=(CONST VOID *) */ -public static final native void MoveMemory (MINMAXINFO Destination, long /*int*/ Source, int Length); +public static final native void MoveMemory (MINMAXINFO Destination, long Source, int Length); /** * @param Destination cast=(PVOID) * @param Source cast=(CONST VOID *) */ -public static final native void MoveMemory (OFNOTIFY Destination, long /*int*/ Source, int Length); +public static final native void MoveMemory (OFNOTIFY Destination, long Source, int Length); /** * @param Destination cast=(PVOID) * @param Source cast=(CONST VOID *) */ -public static final native void MoveMemory (OPENFILENAME Destination, long /*int*/ Source, int Length); +public static final native void MoveMemory (OPENFILENAME Destination, long Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param Source cast=(CONST VOID *) */ -public static final native void MoveMemory (POINT Destination, long /*int*/ Source, int Length); +public static final native void MoveMemory (POINT Destination, long Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param Source cast=(CONST VOID *),flags=no_out critical @@ -3579,227 +3579,227 @@ public static final native void MoveMemory (POINT Destination, long[] Source, in * @param Destination cast=(PVOID),flags=no_in * @param Source cast=(CONST VOID *) */ -public static final native void MoveMemory (NMHDR Destination, long /*int*/ Source, int Length); +public static final native void MoveMemory (NMHDR Destination, long Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param Source cast=(CONST VOID *) */ -public static final native void MoveMemory (NMCUSTOMDRAW Destination, long /*int*/ Source, int Length); +public static final native void MoveMemory (NMCUSTOMDRAW Destination, long Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param Source cast=(CONST VOID *) */ -public static final native void MoveMemory (NMLVCUSTOMDRAW Destination, long /*int*/ Source, int Length); +public static final native void MoveMemory (NMLVCUSTOMDRAW Destination, long Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param Source cast=(CONST VOID *) */ -public static final native void MoveMemory (NMTBCUSTOMDRAW Destination, long /*int*/ Source, int Length); +public static final native void MoveMemory (NMTBCUSTOMDRAW Destination, long Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param Source cast=(CONST VOID *) */ -public static final native void MoveMemory (NMTBHOTITEM Destination, long /*int*/ Source, int Length); +public static final native void MoveMemory (NMTBHOTITEM Destination, long Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param Source cast=(CONST VOID *) */ -public static final native void MoveMemory (NMTREEVIEW Destination, long /*int*/ Source, int Length); +public static final native void MoveMemory (NMTREEVIEW Destination, long Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param Source cast=(CONST VOID *) */ -public static final native void MoveMemory (NMTVCUSTOMDRAW Destination, long /*int*/ Source, int Length); +public static final native void MoveMemory (NMTVCUSTOMDRAW Destination, long Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param Source cast=(CONST VOID *) */ -public static final native void MoveMemory (NMTVITEMCHANGE Destination, long /*int*/ Source, int Length); +public static final native void MoveMemory (NMTVITEMCHANGE Destination, long Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param Source cast=(CONST VOID *) */ -public static final native void MoveMemory (NMUPDOWN Destination, long /*int*/ Source, int Length); +public static final native void MoveMemory (NMUPDOWN Destination, long Source, int Length); /** * @param Destination cast=(PVOID) * @param Source cast=(CONST VOID *),flags=no_out */ -public static final native void MoveMemory (long /*int*/ Destination, NMLVCUSTOMDRAW Source, int Length); +public static final native void MoveMemory (long Destination, NMLVCUSTOMDRAW Source, int Length); /** * @param Destination cast=(PVOID) * @param Source cast=(CONST VOID *),flags=no_out */ -public static final native void MoveMemory (long /*int*/ Destination, NMTBCUSTOMDRAW Source, int Length); +public static final native void MoveMemory (long Destination, NMTBCUSTOMDRAW Source, int Length); /** * @param Destination cast=(PVOID) * @param Source cast=(CONST VOID *),flags=no_out */ -public static final native void MoveMemory (long /*int*/ Destination, NMTVCUSTOMDRAW Source, int Length); +public static final native void MoveMemory (long Destination, NMTVCUSTOMDRAW Source, int Length); /** * @param Destination cast=(PVOID) * @param Source cast=(CONST VOID *),flags=no_out */ -public static final native void MoveMemory (long /*int*/ Destination, NMLVDISPINFO Source, int Length); +public static final native void MoveMemory (long Destination, NMLVDISPINFO Source, int Length); /** * @param Destination cast=(PVOID) * @param Source cast=(CONST VOID *),flags=no_out */ -public static final native void MoveMemory (long /*int*/ Destination, NMTVDISPINFO Source, int Length); +public static final native void MoveMemory (long Destination, NMTVDISPINFO Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param Source cast=(CONST VOID *) */ -public static final native void MoveMemory (NMLVDISPINFO Destination, long /*int*/ Source, int Length); +public static final native void MoveMemory (NMLVDISPINFO Destination, long Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param Source cast=(CONST VOID *) */ -public static final native void MoveMemory (NMTVDISPINFO Destination, long /*int*/ Source, int Length); +public static final native void MoveMemory (NMTVDISPINFO Destination, long Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param Source cast=(CONST VOID *) */ -public static final native void MoveMemory (NMLVODSTATECHANGE Destination, long /*int*/ Source, int Length); +public static final native void MoveMemory (NMLVODSTATECHANGE Destination, long Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param Source cast=(CONST VOID *) */ -public static final native void MoveMemory (NMHEADER Destination, long /*int*/ Source, int Length); +public static final native void MoveMemory (NMHEADER Destination, long Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param Source cast=(CONST VOID *) */ -public static final native void MoveMemory (NMLINK Destination, long /*int*/ Source, int Length); +public static final native void MoveMemory (NMLINK Destination, long Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param Source cast=(CONST VOID *) */ -public static final native void MoveMemory (NMLISTVIEW Destination, long /*int*/ Source, int Length); +public static final native void MoveMemory (NMLISTVIEW Destination, long Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param Source cast=(CONST VOID *) */ -public static final native void MoveMemory (NMREBARCHILDSIZE Destination, long /*int*/ Source, int Length); +public static final native void MoveMemory (NMREBARCHILDSIZE Destination, long Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param Source cast=(CONST VOID *) */ -public static final native void MoveMemory (NMREBARCHEVRON Destination, long /*int*/ Source, int Length); +public static final native void MoveMemory (NMREBARCHEVRON Destination, long Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param Source cast=(CONST VOID *) */ -public static final native void MoveMemory (NMTOOLBAR Destination, long /*int*/ Source, int Length); +public static final native void MoveMemory (NMTOOLBAR Destination, long Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param Source cast=(CONST VOID *) */ -public static final native void MoveMemory (NMTTCUSTOMDRAW Destination, long /*int*/ Source, int Length); +public static final native void MoveMemory (NMTTCUSTOMDRAW Destination, long Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param Source cast=(CONST VOID *) */ -public static final native void MoveMemory (NMTTDISPINFO Destination, long /*int*/ Source, int Length); +public static final native void MoveMemory (NMTTDISPINFO Destination, long Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param Source cast=(CONST VOID *) */ -public static final native void MoveMemory (EMR Destination, long /*int*/ Source, int Length); +public static final native void MoveMemory (EMR Destination, long Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param Source cast=(CONST VOID *) */ -public static final native void MoveMemory (EMREXTCREATEFONTINDIRECTW Destination, long /*int*/ Source, int Length); +public static final native void MoveMemory (EMREXTCREATEFONTINDIRECTW Destination, long Source, int Length); /** * @param Destination cast=(PVOID) * @param Source cast=(CONST VOID *),flags=no_out */ -public static final native void MoveMemory (long /*int*/ Destination, SHDRAGIMAGE Source, int Length); +public static final native void MoveMemory (long Destination, SHDRAGIMAGE Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param Source cast=(CONST VOID *) */ -public static final native void MoveMemory (TEXTMETRIC Destination, long /*int*/ Source, int Length); +public static final native void MoveMemory (TEXTMETRIC Destination, long Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param Source cast=(CONST VOID *) */ -public static final native void MoveMemory (TOUCHINPUT Destination, long /*int*/ Source, int Length); +public static final native void MoveMemory (TOUCHINPUT Destination, long Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param Source cast=(CONST VOID *) */ -public static final native void MoveMemory (WINDOWPOS Destination, long /*int*/ Source, int Length); +public static final native void MoveMemory (WINDOWPOS Destination, long Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param Source cast=(CONST VOID *) */ -public static final native void MoveMemory (MSG Destination, long /*int*/ Source, int Length); +public static final native void MoveMemory (MSG Destination, long Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param Source cast=(CONST VOID *) */ -public static final native void MoveMemory (UDACCEL Destination, long /*int*/ Source, int Length); +public static final native void MoveMemory (UDACCEL Destination, long Source, int Length); /** * @param Destination cast=(PVOID) * @param Source cast=(CONST VOID *),flags=no_out */ -public static final native void MoveMemory (long /*int*/ Destination, DROPFILES Source, int Length); +public static final native void MoveMemory (long Destination, DROPFILES Source, int Length); /** * @param DestinationPtr cast=(PVOID) * @param Source cast=(CONST VOID *),flags=no_out critical */ -public static final native void MoveMemory (long /*int*/ DestinationPtr, double[] Source, int Length); +public static final native void MoveMemory (long DestinationPtr, double[] Source, int Length); /** * @param DestinationPtr cast=(PVOID) * @param Source cast=(CONST VOID *),flags=no_out critical */ -public static final native void MoveMemory (long /*int*/ DestinationPtr, float[] Source, int Length); +public static final native void MoveMemory (long DestinationPtr, float[] Source, int Length); /** * @param DestinationPtr cast=(PVOID) * @param Source cast=(CONST VOID *),flags=no_out critical */ -public static final native void MoveMemory (long /*int*/ DestinationPtr, long[] Source, int Length); +public static final native void MoveMemory (long DestinationPtr, long[] Source, int Length); /** * @param DestinationPtr cast=(PVOID) * @param Source cast=(CONST VOID *),flags=no_out critical */ -public static final native void MoveMemory (long /*int*/ DestinationPtr, short[] Source, int Length); +public static final native void MoveMemory (long DestinationPtr, short[] Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param SourcePtr cast=(CONST VOID *) */ -public static final native void MoveMemory (SCRIPT_ITEM Destination, long /*int*/ SourcePtr, int Length); +public static final native void MoveMemory (SCRIPT_ITEM Destination, long SourcePtr, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param SourcePtr cast=(CONST VOID *) */ -public static final native void MoveMemory (SCRIPT_LOGATTR Destination, long /*int*/ SourcePtr, int Length); +public static final native void MoveMemory (SCRIPT_LOGATTR Destination, long SourcePtr, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param SourcePtr cast=(CONST VOID *) */ -public static final native void MoveMemory (SCRIPT_PROPERTIES Destination, long /*int*/ SourcePtr, int Length); +public static final native void MoveMemory (SCRIPT_PROPERTIES Destination, long SourcePtr, int Length); /** * @param Destination cast=(PVOID) * @param Source cast=(CONST VOID *),flags=no_out */ -public static final native void MoveMemory (long /*int*/ Destination, KEYBDINPUT Source, int Length); +public static final native void MoveMemory (long Destination, KEYBDINPUT Source, int Length); /** * @param Destination cast=(PVOID) * @param Source cast=(CONST VOID *),flags=no_out */ -public static final native void MoveMemory (long /*int*/ Destination, MOUSEINPUT Source, int Length); +public static final native void MoveMemory (long Destination, MOUSEINPUT Source, int Length); /** * @param Destination cast=(PVOID) * @param Source cast=(CONST VOID *),flags=no_out */ -public static final native void MoveMemory (long /*int*/ Destination, GESTURECONFIG Source, int Length); +public static final native void MoveMemory (long Destination, GESTURECONFIG Source, int Length); /** * @param hdc cast=(HDC) * @param lPoint cast=(LPPOINT) */ -public static final native boolean MoveToEx (long /*int*/ hdc, int x1, int x2, long /*int*/ lPoint); +public static final native boolean MoveToEx (long hdc, int x1, int x2, long lPoint); /** * @param lpMultiByteStr cast=(LPCSTR),flags=no_out critical * @param lpWideCharStr cast=(LPWSTR),flags=no_in critical @@ -3809,58 +3809,58 @@ public static final native int MultiByteToWideChar (int CodePage, int dwFlags, b * @param lpMultiByteStr cast=(LPCSTR) * @param lpWideCharStr cast=(LPWSTR),flags=no_in critical */ -public static final native int MultiByteToWideChar (int CodePage, int dwFlags, long /*int*/ lpMultiByteStr, int cchMultiByte, char [] lpWideCharStr, int cchWideChar); +public static final native int MultiByteToWideChar (int CodePage, int dwFlags, long lpMultiByteStr, int cchMultiByte, char [] lpWideCharStr, int cchWideChar); /** * @param event cast=(DWORD) * @param hwnd cast=(HWND) * @param idObject cast=(LONG) * @param idChild cast=(LONG) */ -public static final native void NotifyWinEvent (int event, long /*int*/ hwnd, int idObject, int idChild); +public static final native void NotifyWinEvent (int event, long hwnd, int idObject, int idChild); public static final native boolean OffsetRect (RECT lprc, int dx, int dy); /** @param hrgn cast=(HRGN) */ -public static final native int OffsetRgn (long /*int*/ hrgn, int nXOffset, int nYOffset); +public static final native int OffsetRgn (long hrgn, int nXOffset, int nYOffset); /** @param pvReserved cast=(LPVOID) */ -public static final native int OleInitialize (long /*int*/ pvReserved); +public static final native int OleInitialize (long pvReserved); public static final native void OleUninitialize (); /** @param hWndNewOwner cast=(HWND) */ -public static final native boolean OpenClipboard (long /*int*/ hWndNewOwner); +public static final native boolean OpenClipboard (long hWndNewOwner); /** * @param hwnd cast=(HWND) * @param pszClassList cast=(LPCWSTR) */ -public static final native long /*int*/ OpenThemeData (long /*int*/ hwnd, char[] pszClassList); +public static final native long OpenThemeData (long hwnd, char[] pszClassList); /** @param hdc cast=(HDC) */ -public static final native boolean PatBlt (long /*int*/ hdc, int x1, int x2, int w, int h, int rop); +public static final native boolean PatBlt (long hdc, int x1, int x2, int w, int h, int rop); /** @param szfile cast=(LPCWSTR) */ -public static final native boolean PathIsExe (long /*int*/ szfile); +public static final native boolean PathIsExe (long szfile); /** @param hWnd cast=(HWND) */ -public static final native boolean PeekMessage (MSG lpMsg, long /*int*/ hWnd, int wMsgFilterMin, int wMsgFilterMax, int wRemoveMsg); +public static final native boolean PeekMessage (MSG lpMsg, long hWnd, int wMsgFilterMin, int wMsgFilterMax, int wRemoveMsg); /** @param hdc cast=(HDC) */ -public static final native boolean Pie (long /*int*/ hdc, int nLeftRect, int nTopRect, int nRightRect, int nBottomRect, int nXStartArc, int nYStartArc, int nXEndArc, int nYEndArc); +public static final native boolean Pie (long hdc, int nLeftRect, int nTopRect, int nRightRect, int nBottomRect, int nXStartArc, int nYStartArc, int nXEndArc, int nYEndArc); /** @param pt flags=struct */ -public static final native void POINTSTOPOINT(POINT pt, long /*int*/ pts); +public static final native void POINTSTOPOINT(POINT pt, long pts); /** * @param hdc cast=(HDC) * @param points cast=(CONST POINT *),flags=no_out critical */ -public static final native boolean Polygon (long /*int*/ hdc, int [] points, int nPoints); +public static final native boolean Polygon (long hdc, int [] points, int nPoints); /** * @param hdc cast=(HDC) * @param points cast=(CONST POINT *),flags=no_out critical */ -public static final native boolean Polyline (long /*int*/ hdc, int[] points, int nPoints); +public static final native boolean Polyline (long hdc, int[] points, int nPoints); /** * @param hWnd cast=(HWND) * @param wParam cast=(WPARAM) * @param lParam cast=(LPARAM) */ -public static final native boolean PostMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, long /*int*/ lParam); +public static final native boolean PostMessage (long hWnd, int Msg, long wParam, long lParam); /** * @param wParam cast=(WPARAM) * @param lParam cast=(LPARAM) */ -public static final native boolean PostThreadMessage (int idThread, int Msg, long /*int*/ wParam, long /*int*/ lParam); +public static final native boolean PostThreadMessage (int idThread, int Msg, long wParam, long lParam); public static final native short PRIMARYLANGID (int lgid); /** @param lppd cast=(LPPRINTDLGW) */ public static final native boolean PrintDlg (PRINTDLG lppd); @@ -3868,7 +3868,7 @@ public static final native boolean PrintDlg (PRINTDLG lppd); * @param hwnd cast=(HWND) * @param hdcBlt cast=(HDC) */ -public static final native boolean PrintWindow (long /*int*/ hwnd, long /*int*/ hdcBlt, int nFlags); +public static final native boolean PrintWindow (long hwnd, long hdcBlt, int nFlags); public static final native int PSPropertyKeyFromString (char[] pszString, PROPERTYKEY pkey); /** * @param rect flags=no_out @@ -3876,21 +3876,21 @@ public static final native int PSPropertyKeyFromString (char[] pszString, PROPER */ public static final native boolean PtInRect (RECT rect, POINT pt); /** @param hrgn cast=(HRGN) */ -public static final native boolean PtInRegion (long /*int*/ hrgn, int X, int Y); +public static final native boolean PtInRegion (long hrgn, int X, int Y); /** @param hdc cast=(HDC) */ -public static final native boolean Rectangle (long /*int*/ hdc, int nLeftRect, int nTopRect, int nRightRect, int nBottomRect); +public static final native boolean Rectangle (long hdc, int nLeftRect, int nTopRect, int nRightRect, int nBottomRect); /** * @param hrgn cast=(HRGN) * @param lprc flags=no_out */ -public static final native boolean RectInRegion (long /*int*/ hrgn, RECT lprc); +public static final native boolean RectInRegion (long hrgn, RECT lprc); /** * @param hWnd cast=(HWND) * @param hrgnUpdate cast=(HRGN) */ -public static final native boolean RedrawWindow (long /*int*/ hWnd, RECT lprcUpdate, long /*int*/ hrgnUpdate, int flags); +public static final native boolean RedrawWindow (long hWnd, RECT lprcUpdate, long hrgnUpdate, int flags); /** @param hKey cast=(HKEY) */ -public static final native int RegCloseKey (long /*int*/ hKey); +public static final native int RegCloseKey (long hKey); /** * @param hKey cast=(HKEY) * @param lpSubKey cast=(LPWSTR) @@ -3899,12 +3899,12 @@ public static final native int RegCloseKey (long /*int*/ hKey); * @param phkResult cast=(PHKEY) * @param lpdwDisposition cast=(LPDWORD) */ -public static final native int RegCreateKeyEx (long /*int*/ hKey, char[] lpSubKey, int Reserved, char[] lpClass, int dwOptions, int samDesired, long /*int*/ lpSecurityAttributes, long /*int*/[] phkResult, long /*int*/[] lpdwDisposition); +public static final native int RegCreateKeyEx (long hKey, char[] lpSubKey, int Reserved, char[] lpClass, int dwOptions, int samDesired, long lpSecurityAttributes, long[] phkResult, long[] lpdwDisposition); /** * @param hKey cast=(HKEY) * @param lpValueName cast=(LPWSTR) */ -public static final native int RegDeleteValue (long /*int*/ hKey, char[] lpValueName); +public static final native int RegDeleteValue (long hKey, char[] lpValueName); /** * @param hKey cast=(HKEY) * @param lpName cast=(LPWSTR) @@ -3913,7 +3913,7 @@ public static final native int RegDeleteValue (long /*int*/ hKey, char[] lpValue * @param lpClass cast=(LPWSTR) * @param lpcClass cast=(LPDWORD) */ -public static final native int RegEnumKeyEx (long /*int*/ hKey, int dwIndex, char [] lpName, int [] lpcName, int [] lpReserved, char [] lpClass, int [] lpcClass, FILETIME lpftLastWriteTime); +public static final native int RegEnumKeyEx (long hKey, int dwIndex, char [] lpName, int [] lpcName, int [] lpReserved, char [] lpClass, int [] lpcClass, FILETIME lpftLastWriteTime); /** @param lpWndClass cast=(LPWNDCLASSW) */ public static final native int RegisterClass (WNDCLASS lpWndClass); /** @@ -3921,7 +3921,7 @@ public static final native int RegisterClass (WNDCLASS lpWndClass); * @param hWnd cast=(HWND) * @param ulFlags cast=(ULONG) */ -public static final native boolean RegisterTouchWindow(long /*int*/ hWnd, int ulFlags); +public static final native boolean RegisterTouchWindow(long hWnd, int ulFlags); /** @param lpString cast=(LPWSTR) */ public static final native int RegisterWindowMessage (char [] lpString); /** @param lpszFormat cast=(LPWSTR) */ @@ -3931,7 +3931,7 @@ public static final native int RegisterClipboardFormat (char[] lpszFormat); * @param lpSubKey cast=(LPWSTR) * @param phkResult cast=(PHKEY) */ -public static final native int RegOpenKeyEx (long /*int*/ hKey, char[] lpSubKey, int ulOptions, int samDesired, long /*int*/[] phkResult); +public static final native int RegOpenKeyEx (long hKey, char[] lpSubKey, int ulOptions, int samDesired, long[] phkResult); /** * @param hKey cast=(HKEY) * @param lpValueName cast=(LPWSTR) @@ -3940,7 +3940,7 @@ public static final native int RegOpenKeyEx (long /*int*/ hKey, char[] lpSubKey, * @param lpData cast=(LPBYTE) * @param lpcbData cast=(LPDWORD) */ -public static final native int RegQueryValueEx (long /*int*/ hKey, char[] lpValueName, long /*int*/ lpReserved, int[] lpType, char [] lpData, int[] lpcbData); +public static final native int RegQueryValueEx (long hKey, char[] lpValueName, long lpReserved, int[] lpType, char [] lpData, int[] lpcbData); /** * @param hKey cast=(HKEY) * @param lpValueName cast=(LPWSTR) @@ -3949,38 +3949,38 @@ public static final native int RegQueryValueEx (long /*int*/ hKey, char[] lpValu * @param lpData cast=(LPBYTE) * @param lpcbData cast=(LPDWORD) */ -public static final native int RegQueryValueEx (long /*int*/ hKey, char[] lpValueName, long /*int*/ lpReserved, int[] lpType, int [] lpData, int[] lpcbData); +public static final native int RegQueryValueEx (long hKey, char[] lpValueName, long lpReserved, int[] lpType, int [] lpData, int[] lpcbData); /** * @param hKey cast=(HKEY) * @param lpValueName cast=(LPWSTR) * @param lpData cast=(const BYTE*) */ -public static final native int RegSetValueEx (long /*int*/ hKey, char[] lpValueName, int Reserved, int dwType, int[] lpData, int cbData); +public static final native int RegSetValueEx (long hKey, char[] lpValueName, int Reserved, int dwType, int[] lpData, int cbData); public static final native boolean ReleaseCapture (); /** * @param hWnd cast=(HWND) * @param hDC cast=(HDC) */ -public static final native int ReleaseDC (long /*int*/ hWnd, long /*int*/ hDC); +public static final native int ReleaseDC (long hWnd, long hDC); /** @param hMenu cast=(HMENU) */ -public static final native boolean RemoveMenu (long /*int*/ hMenu, int uPosition, int uFlags); +public static final native boolean RemoveMenu (long hMenu, int uPosition, int uFlags); /** * @param hWnd cast=(HWND) * @param lpString cast=(LPCWSTR) */ -public static final native long /*int*/ RemoveProp (long /*int*/ hWnd, long /*int*/ lpString); -public static final native boolean ReplyMessage (long /*int*/ lResult); +public static final native long RemoveProp (long hWnd, long lpString); +public static final native boolean ReplyMessage (long lResult); /** * @param hdc cast=(HDC) * @param nSavedDC cast=(int) */ -public static final native boolean RestoreDC (long /*int*/ hdc, int nSavedDC); +public static final native boolean RestoreDC (long hdc, int nSavedDC); /** @param hdc cast=(HDC) */ -public static final native boolean RoundRect (long /*int*/ hdc, int nLeftRect, int nTopRect, int nRightRect, int nBottomRect, int nWidth, int nHeight); +public static final native boolean RoundRect (long hdc, int nLeftRect, int nTopRect, int nRightRect, int nBottomRect, int nWidth, int nHeight); /** @param hdc cast=(HDC) */ -public static final native int SaveDC (long /*int*/ hdc); +public static final native int SaveDC (long hdc); /** @param hWnd cast=(HWND) */ -public static final native boolean ScreenToClient (long /*int*/ hWnd, POINT lpPoint); +public static final native boolean ScreenToClient (long hWnd, POINT lpPoint); /** * @param psds cast=(const SCRIPT_DIGITSUBSTITUTE*) * @param psc cast=(SCRIPT_CONTROL*) @@ -3992,18 +3992,18 @@ public static final native int ScriptApplyDigitSubstitution (SCRIPT_DIGITSUBSTIT * @param psa cast=(const SCRIPT_ANALYSIS *) * @param psla cast=(SCRIPT_LOGATTR *) */ -public static final native int ScriptBreak (char[] pwcChars, int cChars, SCRIPT_ANALYSIS psa, long /*int*/ psla); +public static final native int ScriptBreak (char[] pwcChars, int cChars, SCRIPT_ANALYSIS psa, long psla); /** * @param ppSp cast=(const SCRIPT_PROPERTIES ***) * @param piNumScripts cast=(int *) */ -public static final native int ScriptGetProperties (long /*int*/[] ppSp, int[] piNumScripts); +public static final native int ScriptGetProperties (long[] ppSp, int[] piNumScripts); /** * @param hdc cast=(HDC) * @param psc cast=(SCRIPT_CACHE *) * @param tmHeight cast=(long *) */ -public static final native int ScriptCacheGetHeight (long /*int*/ hdc, long /*int*/ psc, int[] tmHeight); +public static final native int ScriptCacheGetHeight (long hdc, long psc, int[] tmHeight); /** * @param pwLogClust cast=(const WORD *) * @param psva cast=(const SCRIPT_VISATTR *) @@ -4011,15 +4011,15 @@ public static final native int ScriptCacheGetHeight (long /*int*/ hdc, long /*in * @param psa cast=(const SCRIPT_ANALYSIS *) * @param piX cast=(int *) */ -public static final native int ScriptCPtoX (int iCP, boolean fTrailing, int cChars, int cGlyphs, long /*int*/ pwLogClust, long /*int*/ psva, long /*int*/ piAdvance, SCRIPT_ANALYSIS psa, int[] piX); +public static final native int ScriptCPtoX (int iCP, boolean fTrailing, int cChars, int cGlyphs, long pwLogClust, long psva, long piAdvance, SCRIPT_ANALYSIS psa, int[] piX); /** @param psc cast=(SCRIPT_CACHE *) */ -public static final native int ScriptFreeCache (long /*int*/ psc); +public static final native int ScriptFreeCache (long psc); /** * @param hdc cast=(HDC) * @param psc cast=(SCRIPT_CACHE *) * @param sfp cast=(SCRIPT_FONTPROPERTIES *) */ -public static final native int ScriptGetFontProperties (long /*int*/ hdc, long /*int*/ psc, SCRIPT_FONTPROPERTIES sfp); +public static final native int ScriptGetFontProperties (long hdc, long psc, SCRIPT_FONTPROPERTIES sfp); /** * @param psa cast=(const SCRIPT_ANALYSIS *) * @param piGlyphWidth cast=(const int *) @@ -4027,7 +4027,7 @@ public static final native int ScriptGetFontProperties (long /*int*/ hdc, long / * @param psva cast=(const SCRIPT_VISATTR *) * @param piDx cast=(int *) */ -public static final native int ScriptGetLogicalWidths (SCRIPT_ANALYSIS psa, int cChars, int cGlyphs, long /*int*/ piGlyphWidth, long /*int*/ pwLogClust, long /*int*/ psva, int[] piDx); +public static final native int ScriptGetLogicalWidths (SCRIPT_ANALYSIS psa, int cChars, int cGlyphs, long piGlyphWidth, long pwLogClust, long psva, int[] piDx); /** * @param pwcInChars cast=(const WCHAR *) * @param psControl cast=(const SCRIPT_CONTROL *) @@ -4035,13 +4035,13 @@ public static final native int ScriptGetLogicalWidths (SCRIPT_ANALYSIS psa, int * @param pItems cast=(SCRIPT_ITEM *) * @param pcItems cast=(int *) */ -public static final native int ScriptItemize (char[] pwcInChars, int cInChars, int cMaxItems, SCRIPT_CONTROL psControl, SCRIPT_STATE psState, long /*int*/ pItems, int[] pcItems); +public static final native int ScriptItemize (char[] pwcInChars, int cInChars, int cMaxItems, SCRIPT_CONTROL psControl, SCRIPT_STATE psState, long pItems, int[] pcItems); /** * @param psva cast=(SCRIPT_VISATTR *) * @param piAdvance cast=(const int *) * @param piJustify cast=(int *) */ -public static final native int ScriptJustify (long /*int*/ psva, long /*int*/ piAdvance, int cGlyphs, int iDx, int iMinKashida, long /*int*/ piJustify); +public static final native int ScriptJustify (long psva, long piAdvance, int cGlyphs, int iDx, int iMinKashida, long piJustify); /** * @param pbLevel cast=(const BYTE *) * @param piVisualToLogical cast=(int *) @@ -4058,7 +4058,7 @@ public static final native int ScriptLayout (int cRuns, byte[] pbLevel, int[] pi * @param pGoffset cast=(GOFFSET *) * @param pABC cast=(ABC *) */ -public static final native int ScriptPlace (long /*int*/ hdc, long /*int*/ psc, long /*int*/ pwGlyphs, int cGlyphs, long /*int*/ psva, SCRIPT_ANALYSIS psa, long /*int*/ piAdvance, long /*int*/ pGoffset, int[] pABC); +public static final native int ScriptPlace (long hdc, long psc, long pwGlyphs, int cGlyphs, long psva, SCRIPT_ANALYSIS psa, long piAdvance, long pGoffset, int[] pABC); /** * @param Locale cast=(LCID) * @param psds cast=(SCRIPT_DIGITSUBSTITUTE*) @@ -4070,7 +4070,7 @@ public static final native int ScriptRecordDigitSubstitution (int Locale, SCRIPT * @param pwcChars cast=(const WCHAR *) * @param pwOutGlyphs cast=(WORD*) */ -public static final native int ScriptGetCMap (long /*int*/ hdc, long /*int*/ psc, char[] pwcChars, int cChars, int dwFlags, short[] pwOutGlyphs); +public static final native int ScriptGetCMap (long hdc, long psc, char[] pwcChars, int cChars, int dwFlags, short[] pwOutGlyphs); /** * @param hdc cast=(HDC) * @param psc cast=(SCRIPT_CACHE *) @@ -4081,7 +4081,7 @@ public static final native int ScriptGetCMap (long /*int*/ hdc, long /*int*/ psc * @param psva cast=(SCRIPT_VISATTR *) * @param pcGlyphs cast=(int *) */ -public static final native int ScriptShape (long /*int*/ hdc, long /*int*/ psc, char[] pwcChars, int cChars, int cMaxGlyphs, SCRIPT_ANALYSIS psa, long /*int*/ pwOutGlyphs, long /*int*/ pwLogClust, long /*int*/ psva, int[] pcGlyphs); +public static final native int ScriptShape (long hdc, long psc, char[] pwcChars, int cChars, int cMaxGlyphs, SCRIPT_ANALYSIS psa, long pwOutGlyphs, long pwLogClust, long psva, int[] pcGlyphs); /** * @param hdc cast=(HDC) * @param pString cast=(const void*) @@ -4090,11 +4090,11 @@ public static final native int ScriptShape (long /*int*/ hdc, long /*int*/ psc, * @param pbInClass cast=(const BYTE*) * @param pssa cast=(SCRIPT_STRING_ANALYSIS*) */ -public static final native int ScriptStringAnalyse (long /*int*/ hdc, long /*int*/ pString, int cString, int cGlyphs, int iCharset, int dwFlags, int iReqWidth, SCRIPT_CONTROL psControl, SCRIPT_STATE psState, long /*int*/ piDx, long /*int*/ pTabdef, long /*int*/ pbInClass, long /*int*/ pssa); +public static final native int ScriptStringAnalyse (long hdc, long pString, int cString, int cGlyphs, int iCharset, int dwFlags, int iReqWidth, SCRIPT_CONTROL psControl, SCRIPT_STATE psState, long piDx, long pTabdef, long pbInClass, long pssa); /** @param ssa cast=(SCRIPT_STRING_ANALYSIS*),flags=struct */ -public static final native int ScriptStringOut(long /*int*/ ssa, int iX, int iY, int uOptions, RECT prc, int iMinSel, int iMaxSel, boolean fDisabled); +public static final native int ScriptStringOut(long ssa, int iX, int iY, int uOptions, RECT prc, int iMinSel, int iMaxSel, boolean fDisabled); /** @param pssa cast=(SCRIPT_STRING_ANALYSIS*) */ -public static final native int ScriptStringFree(long /*int*/ pssa); +public static final native int ScriptStringFree(long pssa); /** * @param hdc cast=(const HDC) * @param psc cast=(SCRIPT_CACHE *) @@ -4106,7 +4106,7 @@ public static final native int ScriptStringFree(long /*int*/ pssa); * @param piJustify cast=(const int *) * @param pGoffset cast=(const GOFFSET *) */ -public static final native int ScriptTextOut (long /*int*/ hdc, long /*int*/ psc, int x, int y, int fuOptions, RECT lprc, SCRIPT_ANALYSIS psa, long /*int*/ pwcReserved, int iReserved, long /*int*/ pwGlyphs, int cGlyphs, long /*int*/ piAdvance, long /*int*/ piJustify, long /*int*/ pGoffset); +public static final native int ScriptTextOut (long hdc, long psc, int x, int y, int fuOptions, RECT lprc, SCRIPT_ANALYSIS psa, long pwcReserved, int iReserved, long pwGlyphs, int cGlyphs, long piAdvance, long piJustify, long pGoffset); /** * @param pwLogClust cast=(const WORD *) * @param psva cast=(const SCRIPT_VISATTR *) @@ -4115,402 +4115,402 @@ public static final native int ScriptTextOut (long /*int*/ hdc, long /*int*/ psc * @param piCP cast=(int *) * @param piTrailing cast=(int *) */ -public static final native int ScriptXtoCP (int iX, int cChars, int cGlyphs, long /*int*/ pwLogClust, long /*int*/ psva, long /*int*/ piAdvance, SCRIPT_ANALYSIS psa, int[] piCP, int[] piTrailing); +public static final native int ScriptXtoCP (int iX, int cChars, int cGlyphs, long pwLogClust, long psva, long piAdvance, SCRIPT_ANALYSIS psa, int[] piCP, int[] piTrailing); /** * @param hWnd cast=(HWND) * @param hrgnUpdate cast=(HRGN) */ -public static final native int ScrollWindowEx (long /*int*/ hWnd, int dx, int dy, RECT prcScroll, RECT prcClip, long /*int*/ hrgnUpdate, RECT prcUpdate, int flags); +public static final native int ScrollWindowEx (long hWnd, int dx, int dy, RECT prcScroll, RECT prcClip, long hrgnUpdate, RECT prcUpdate, int flags); /** * @param hdc cast=(HDC) * @param hrgn cast=(HRGN) */ -public static final native int SelectClipRgn (long /*int*/ hdc, long /*int*/ hrgn); +public static final native int SelectClipRgn (long hdc, long hrgn); /** * @param hDC cast=(HDC) * @param HGDIObj cast=(HGDIOBJ) */ -public static final native long /*int*/ SelectObject (long /*int*/ hDC, long /*int*/ HGDIObj); +public static final native long SelectObject (long hDC, long HGDIObj); /** @param pInputs cast=(LPINPUT) */ -public static final native int SendInput (int nInputs, long /*int*/ pInputs, int cbSize); +public static final native int SendInput (int nInputs, long pInputs, int cbSize); /** * @param hWnd cast=(HWND) * @param wParam cast=(WPARAM) * @param lParam cast=(LPARAM) */ -public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, int [] wParam, int [] lParam); +public static final native long SendMessage (long hWnd, int Msg, int [] wParam, int [] lParam); /** * @param hWnd cast=(HWND) * @param wParam cast=(WPARAM) * @param lParam cast=(LPARAM) */ -public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, char [] lParam); +public static final native long SendMessage (long hWnd, int Msg, long wParam, char [] lParam); /** * @param hWnd cast=(HWND) * @param wParam cast=(WPARAM) * @param lParam cast=(LPARAM) */ -public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, int [] lParam); +public static final native long SendMessage (long hWnd, int Msg, long wParam, int [] lParam); /** * @param hWnd cast=(HWND) * @param wParam cast=(WPARAM) * @param lParam cast=(LPARAM) */ -public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, long /*int*/ lParam); +public static final native long SendMessage (long hWnd, int Msg, long wParam, long lParam); /** * @param hWnd cast=(HWND) * @param wParam cast=(WPARAM) * @param lParam cast=(LPARAM) */ -public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, LVCOLUMN lParam); +public static final native long SendMessage (long hWnd, int Msg, long wParam, LVCOLUMN lParam); /** * @param hWnd cast=(HWND) * @param wParam cast=(WPARAM) * @param lParam cast=(LPARAM) */ -public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, LVHITTESTINFO lParam); +public static final native long SendMessage (long hWnd, int Msg, long wParam, LVHITTESTINFO lParam); /** * @param hWnd cast=(HWND) * @param wParam cast=(WPARAM) * @param lParam cast=(LPARAM) */ -public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, LITEM lParam); +public static final native long SendMessage (long hWnd, int Msg, long wParam, LITEM lParam); /** * @param hWnd cast=(HWND) * @param wParam cast=(WPARAM) * @param lParam cast=(LPARAM) */ -public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, LVITEM lParam); +public static final native long SendMessage (long hWnd, int Msg, long wParam, LVITEM lParam); /** * @param hWnd cast=(HWND) * @param wParam cast=(WPARAM) * @param lParam cast=(LPARAM) */ -public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, LVINSERTMARK lParam); +public static final native long SendMessage (long hWnd, int Msg, long wParam, LVINSERTMARK lParam); /** * @param hWnd cast=(HWND) * @param wParam cast=(WPARAM) * @param lParam cast=(LPARAM) */ -public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, MARGINS lParam); +public static final native long SendMessage (long hWnd, int Msg, long wParam, MARGINS lParam); /** * @param hWnd cast=(HWND) * @param wParam cast=(WPARAM) * @param lParam cast=(LPARAM) */ -public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, MCHITTESTINFO lParam); +public static final native long SendMessage (long hWnd, int Msg, long wParam, MCHITTESTINFO lParam); /** * @param hWnd cast=(HWND) * @param wParam cast=(WPARAM) * @param lParam cast=(LPARAM) */ -public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, REBARBANDINFO lParam); +public static final native long SendMessage (long hWnd, int Msg, long wParam, REBARBANDINFO lParam); /** * @param hWnd cast=(HWND) * @param wParam cast=(WPARAM) * @param lParam cast=(LPARAM) */ -public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, RECT lParam); +public static final native long SendMessage (long hWnd, int Msg, long wParam, RECT lParam); /** * @param hWnd cast=(HWND) * @param wParam cast=(WPARAM) * @param lParam cast=(LPARAM) */ -public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, SYSTEMTIME lParam); +public static final native long SendMessage (long hWnd, int Msg, long wParam, SYSTEMTIME lParam); /** * @param hWnd cast=(HWND) * @param wParam cast=(WPARAM) * @param lParam cast=(LPARAM) */ -public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, SHDRAGIMAGE lParam); +public static final native long SendMessage (long hWnd, int Msg, long wParam, SHDRAGIMAGE lParam); /** * @param hWnd cast=(HWND) * @param wParam cast=(WPARAM) * @param lParam cast=(LPARAM) */ -public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, TBBUTTON lParam); +public static final native long SendMessage (long hWnd, int Msg, long wParam, TBBUTTON lParam); /** * @param hWnd cast=(HWND) * @param wParam cast=(WPARAM) * @param lParam cast=(LPARAM) */ -public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, TBBUTTONINFO lParam); +public static final native long SendMessage (long hWnd, int Msg, long wParam, TBBUTTONINFO lParam); /** * @param hWnd cast=(HWND) * @param wParam cast=(WPARAM) * @param lParam cast=(LPARAM) */ -public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, TCITEM lParam); +public static final native long SendMessage (long hWnd, int Msg, long wParam, TCITEM lParam); /** * @param hWnd cast=(HWND) * @param wParam cast=(WPARAM) * @param lParam cast=(LPARAM) */ -public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, TCHITTESTINFO lParam); +public static final native long SendMessage (long hWnd, int Msg, long wParam, TCHITTESTINFO lParam); /** * @param hWnd cast=(HWND) * @param wParam cast=(WPARAM) * @param lParam cast=(LPARAM) */ -public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, TOOLINFO lParam); +public static final native long SendMessage (long hWnd, int Msg, long wParam, TOOLINFO lParam); /** * @param hWnd cast=(HWND) * @param wParam cast=(WPARAM) * @param lParam cast=(LPARAM) */ -public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, TVHITTESTINFO lParam); +public static final native long SendMessage (long hWnd, int Msg, long wParam, TVHITTESTINFO lParam); /** * @param hWnd cast=(HWND) * @param wParam cast=(WPARAM) * @param lParam cast=(LPARAM) */ -public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, TVINSERTSTRUCT lParam); +public static final native long SendMessage (long hWnd, int Msg, long wParam, TVINSERTSTRUCT lParam); /** * @param hWnd cast=(HWND) * @param wParam cast=(WPARAM) * @param lParam cast=(LPARAM) */ -public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, TVITEM lParam); +public static final native long SendMessage (long hWnd, int Msg, long wParam, TVITEM lParam); /** * @param hWnd cast=(HWND) * @param wParam cast=(WPARAM) * @param lParam cast=(LPARAM) */ -public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, TVSORTCB lParam); +public static final native long SendMessage (long hWnd, int Msg, long wParam, TVSORTCB lParam); /** * @param hWnd cast=(HWND) * @param wParam cast=(WPARAM) * @param lParam cast=(LPARAM) */ -public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, UDACCEL lParam); +public static final native long SendMessage (long hWnd, int Msg, long wParam, UDACCEL lParam); /** * @param hWnd cast=(HWND) * @param wParam cast=(WPARAM) * @param lParam cast=(LPARAM) */ -public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, HDHITTESTINFO lParam); +public static final native long SendMessage (long hWnd, int Msg, long wParam, HDHITTESTINFO lParam); /** * @param hWnd cast=(HWND) * @param wParam cast=(WPARAM) * @param lParam cast=(LPARAM) */ -public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, HDITEM lParam); +public static final native long SendMessage (long hWnd, int Msg, long wParam, HDITEM lParam); /** * @param hWnd cast=(HWND) * @param wParam cast=(WPARAM) * @param lParam cast=(LPARAM) */ -public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, HDLAYOUT lParam); +public static final native long SendMessage (long hWnd, int Msg, long wParam, HDLAYOUT lParam); /** * @param hWnd cast=(HWND) * @param wParam cast=(WPARAM) * @param lParam cast=(LPARAM) */ -public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, BUTTON_IMAGELIST lParam); +public static final native long SendMessage (long hWnd, int Msg, long wParam, BUTTON_IMAGELIST lParam); /** * @param hWnd cast=(HWND) * @param wParam cast=(WPARAM) * @param lParam cast=(LPARAM) */ -public static final native long /*int*/ SendMessage (long /*int*/ hWnd, int Msg, long /*int*/ wParam, SIZE lParam); +public static final native long SendMessage (long hWnd, int Msg, long wParam, SIZE lParam); /** @param hWnd cast=(HWND) */ -public static final native long /*int*/ SetActiveWindow (long /*int*/ hWnd); +public static final native long SetActiveWindow (long hWnd); /** * @param hdc cast=(HDC) * @param colorRef cast=(COLORREF) */ -public static final native int SetBkColor (long /*int*/ hdc, int colorRef); +public static final native int SetBkColor (long hdc, int colorRef); /** @param hdc cast=(HDC) */ -public static final native int SetBkMode (long /*int*/ hdc, int mode); +public static final native int SetBkMode (long hdc, int mode); /** * @param hdc cast=(HDC) * @param lppt cast=(LPPOINT) */ -public static final native boolean SetBrushOrgEx (long /*int*/ hdc, int nXOrg, int nYOrg, POINT lppt); +public static final native boolean SetBrushOrgEx (long hdc, int nXOrg, int nYOrg, POINT lppt); /** @param hWnd cast=(HWND) */ -public static final native long /*int*/ SetCapture (long /*int*/ hWnd); +public static final native long SetCapture (long hWnd); public static final native boolean SetCaretPos (int X, int Y); /** @method flags=dynamic */ public static final native int SetCurrentProcessExplicitAppUserModelID (char[] AppID); /** @param hCursor cast=(HCURSOR) */ -public static final native long /*int*/ SetCursor (long /*int*/ hCursor); +public static final native long SetCursor (long hCursor); public static final native boolean SetCursorPos (int X, int Y); /** * @param hdc cast=(HDC) * @param pColors cast=(RGBQUAD *),flags=no_out critical */ -public static final native int SetDIBColorTable (long /*int*/ hdc, int uStartIndex, int cEntries, byte[] pColors); +public static final native int SetDIBColorTable (long hdc, int uStartIndex, int cEntries, byte[] pColors); public static final native boolean SetDllDirectory (char [] lpString); public static final native int SetErrorMode (int uMode); /** @param hWnd cast=(HWND) */ -public static final native long /*int*/ SetFocus (long /*int*/ hWnd); +public static final native long SetFocus (long hWnd); /** @param hWnd cast=(HWND) */ -public static final native boolean SetForegroundWindow (long /*int*/ hWnd); +public static final native boolean SetForegroundWindow (long hWnd); /** * @method flags=dynamic * @param hwnd cast=(HWND) * @param pGestureConfig cast=(PGESTURECONFIG) */ -public static final native boolean SetGestureConfig(long /*int*/ hwnd, int dwReserved, int cIDs, long /*int*/ pGestureConfig, int cbSize); +public static final native boolean SetGestureConfig(long hwnd, int dwReserved, int cIDs, long pGestureConfig, int cbSize); /** @param hdc cast=(HDC) */ -public static final native int SetGraphicsMode (long /*int*/ hdc, int iMode); +public static final native int SetGraphicsMode (long hdc, int iMode); /** @param hwnd cast=(HWND) */ -public static final native boolean SetLayeredWindowAttributes(long /*int*/ hwnd, int crKey, byte bAlpha, int dwFlags); +public static final native boolean SetLayeredWindowAttributes(long hwnd, int crKey, byte bAlpha, int dwFlags); /** * @param hdc cast=(HDC) * @param dwLayout cast=(DWORD) */ -public static final native int SetLayout (long /*int*/ hdc, int dwLayout); +public static final native int SetLayout (long hdc, int dwLayout); /** * @param hWnd cast=(HWND) * @param hMenu cast=(HMENU) */ -public static final native boolean SetMenu (long /*int*/ hWnd, long /*int*/ hMenu); +public static final native boolean SetMenu (long hWnd, long hMenu); /** @param hMenu cast=(HMENU) */ -public static final native boolean SetMenuDefaultItem (long /*int*/ hMenu, int uItem, int fByPos); +public static final native boolean SetMenuDefaultItem (long hMenu, int uItem, int fByPos); /** @param hmenu cast=(HMENU) */ -public static final native boolean SetMenuInfo (long /*int*/ hmenu, MENUINFO lpcmi); +public static final native boolean SetMenuInfo (long hmenu, MENUINFO lpcmi); /** * @param hMenu cast=(HMENU) * @param lpmii cast=(LPMENUITEMINFOW) */ -public static final native boolean SetMenuItemInfo (long /*int*/ hMenu, int uItem, boolean fByPosition, MENUITEMINFO lpmii); +public static final native boolean SetMenuItemInfo (long hMenu, int uItem, boolean fByPosition, MENUITEMINFO lpmii); /** @param hdc cast=(HDC) */ -public static final native int SetMetaRgn (long /*int*/ hdc); +public static final native int SetMetaRgn (long hdc); /** * @param hWndChild cast=(HWND) * @param hWndNewParent cast=(HWND) */ -public static final native long /*int*/ SetParent (long /*int*/ hWndChild, long /*int*/ hWndNewParent); +public static final native long SetParent (long hWndChild, long hWndNewParent); /** @param hdc cast=(HDC) */ -public static final native int SetPixel (long /*int*/ hdc, int X, int Y, int crColor); +public static final native int SetPixel (long hdc, int X, int Y, int crColor); /** @param hdc cast=(HDC) */ -public static final native int SetPolyFillMode (long /*int*/ hdc, int iPolyFillMode); +public static final native int SetPolyFillMode (long hdc, int iPolyFillMode); public static final native boolean SetProcessDPIAware (); /** @param lprc flags=no_in */ public static final native boolean SetRect (RECT lprc, int xLeft, int yTop, int xRight, int yBottom); /** @param hrgn cast=(HRGN) */ -public static final native boolean SetRectRgn (long /*int*/ hrgn, int nLeftRect, int nTopRect, int nRightRect, int nBottomRect); +public static final native boolean SetRectRgn (long hrgn, int nLeftRect, int nTopRect, int nRightRect, int nBottomRect); /** @param hdc cast=(HDC) */ -public static final native int SetROP2 (long /*int*/ hdc, int fnDrawMode); +public static final native int SetROP2 (long hdc, int fnDrawMode); /** @param hwnd cast=(HWND) */ -public static final native boolean SetScrollInfo (long /*int*/ hwnd, int flags, SCROLLINFO info, boolean fRedraw); +public static final native boolean SetScrollInfo (long hwnd, int flags, SCROLLINFO info, boolean fRedraw); /** @param hdc cast=(HDC) */ -public static final native int SetStretchBltMode (long /*int*/ hdc, int iStretchMode); +public static final native int SetStretchBltMode (long hdc, int iStretchMode); /** * @param hWnd cast=(HWND) * @param lpString cast=(LPCWSTR) * @param hData cast=(HANDLE) */ -public static final native boolean SetProp (long /*int*/ hWnd, long /*int*/ lpString, long /*int*/ hData); +public static final native boolean SetProp (long hWnd, long lpString, long hData); /** * @param hdc cast=(HDC) * @param colorRef cast=(COLORREF) */ -public static final native int SetTextColor (long /*int*/ hdc, int colorRef); +public static final native int SetTextColor (long hdc, int colorRef); /** * @param hWnd cast=(HWND) * @param lpTimerFunc cast=(TIMERPROC) */ -public static final native long /*int*/ SetTimer (long /*int*/ hWnd, long /*int*/ nIDEvent, int Elapse, long /*int*/ lpTimerFunc); +public static final native long SetTimer (long hWnd, long nIDEvent, int Elapse, long lpTimerFunc); /** @param hWnd cast=(HWND) */ -public static final native int SetWindowLong (long /*int*/ hWnd, int nIndex, int dwNewLong); +public static final native int SetWindowLong (long hWnd, int nIndex, int dwNewLong); /** * @param hWnd cast=(HWND) * @param dwNewLong cast=(LONG_PTR) */ -public static final native long /*int*/ SetWindowLongPtr (long /*int*/ hWnd, int nIndex, long /*int*/ dwNewLong); +public static final native long SetWindowLongPtr (long hWnd, int nIndex, long dwNewLong); /** @param hdc cast=(HDC) */ -public static final native boolean SetWindowOrgEx (long /*int*/ hdc, int X, int Y, POINT lpPoint); +public static final native boolean SetWindowOrgEx (long hdc, int X, int Y, POINT lpPoint); /** @param hWnd cast=(HWND) */ -public static final native boolean SetWindowPlacement (long /*int*/ hWnd, WINDOWPLACEMENT lpwndpl); +public static final native boolean SetWindowPlacement (long hWnd, WINDOWPLACEMENT lpwndpl); /** * @param hWnd cast=(HWND) * @param hWndInsertAfter cast=(HWND) */ -public static final native boolean SetWindowPos(long /*int*/ hWnd, long /*int*/ hWndInsertAfter, int X, int Y, int cx, int cy, int uFlags); +public static final native boolean SetWindowPos(long hWnd, long hWndInsertAfter, int X, int Y, int cx, int cy, int uFlags); /** * @param hWnd cast=(HWND) * @param hRgn cast=(HRGN) */ -public static final native int SetWindowRgn (long /*int*/ hWnd, long /*int*/ hRgn, boolean bRedraw); +public static final native int SetWindowRgn (long hWnd, long hRgn, boolean bRedraw); /** * @param hWnd cast=(HWND) * @param lpString cast=(LPWSTR) */ -public static final native boolean SetWindowText (long /*int*/ hWnd, char [] lpString); +public static final native boolean SetWindowText (long hWnd, char [] lpString); /** * @param hwnd cast=(HWND) * @param pszSubAppName cast=(LPCWSTR) * @param pszSubIdList cast=(LPCWSTR) */ -public static final native int SetWindowTheme (long /*int*/ hwnd, char [] pszSubAppName, char [] pszSubIdList); +public static final native int SetWindowTheme (long hwnd, char [] pszSubAppName, char [] pszSubIdList); /** * @param lpfn cast=(HOOKPROC) * @param hMod cast=(HINSTANCE) */ -public static final native long /*int*/ SetWindowsHookEx (int idHook, long /*int*/ lpfn, long /*int*/ hMod, int dwThreadId); +public static final native long SetWindowsHookEx (int idHook, long lpfn, long hMod, int dwThreadId); /** * @param hdc cast=(HDC) * @param lpXform cast=(XFORM *) */ -public static final native boolean SetWorldTransform(long /*int*/ hdc, float[] lpXform); +public static final native boolean SetWorldTransform(long hdc, float[] lpXform); /** @param lpbi cast=(LPBROWSEINFOW) */ -public static final native long /*int*/ SHBrowseForFolder (BROWSEINFO lpbi); +public static final native long SHBrowseForFolder (BROWSEINFO lpbi); /** * @param pszPath cast=(LPCWSTR) * @param psfi cast=(SHFILEINFOW *) */ -public static final native long /*int*/ SHGetFileInfo (char [] pszPath, int dwFileAttributes, SHFILEINFO psfi, int cbFileInfo, int uFlags); +public static final native long SHGetFileInfo (char [] pszPath, int dwFileAttributes, SHFILEINFO psfi, int cbFileInfo, int uFlags); /** @param lpExecInfo cast=(LPSHELLEXECUTEINFOW) */ public static final native boolean ShellExecuteEx (SHELLEXECUTEINFO lpExecInfo); public static final native boolean Shell_NotifyIcon (int dwMessage, NOTIFYICONDATA lpData); /** @param ppMalloc cast=(LPMALLOC *) */ -public static final native int SHGetMalloc (long /*int*/ [] ppMalloc); +public static final native int SHGetMalloc (long [] ppMalloc); /** * @param pidl cast=(LPCITEMIDLIST) * @param pszPath cast=(LPWSTR) */ -public static final native boolean SHGetPathFromIDList (long /*int*/ pidl, char [] pszPath); +public static final native boolean SHGetPathFromIDList (long pidl, char [] pszPath); /** * @param kfid cast=(REFKNOWNFOLDERID) * @param riid cast=(REFIID) * @param ppv cast=(void **) */ -public static final native int SHCreateItemInKnownFolder (byte [] kfid, int dwKFFlags, char [] pszItem, byte [] riid, long /*int*/ [] ppv); +public static final native int SHCreateItemInKnownFolder (byte [] kfid, int dwKFFlags, char [] pszItem, byte [] riid, long [] ppv); /** * @param psiParent cast=(IShellItem *) * @param pbc cast=(IBindCtx *) * @param riid cast=(REFIID) * @param ppv cast=(void **) */ -public static final native int SHCreateItemFromRelativeName (long /*int*/ psiParent, char [] pszName, long /*int*/ pbc, byte [] riid, long /*int*/ [] ppv); +public static final native int SHCreateItemFromRelativeName (long psiParent, char [] pszName, long pbc, byte [] riid, long [] ppv); /** * @param pbc cast=(IBindCtx *) * @param riid cast=(REFIID) * @param ppv cast=(void **) */ -public static final native int SHCreateItemFromParsingName (char [] pszName, long /*int*/ pbc, byte [] riid, long /*int*/ [] ppv); +public static final native int SHCreateItemFromParsingName (char [] pszName, long pbc, byte [] riid, long [] ppv); /** @param hWnd cast=(HWND) */ -public static final native boolean ShowCaret (long /*int*/ hWnd); +public static final native boolean ShowCaret (long hWnd); /** @param hWnd cast=(HWND) */ -public static final native boolean ShowOwnedPopups (long /*int*/ hWnd, boolean fShow); +public static final native boolean ShowOwnedPopups (long hWnd, boolean fShow); /** @param hWnd cast=(HWND) */ -public static final native boolean ShowScrollBar (long /*int*/ hWnd, int wBar, boolean bShow); +public static final native boolean ShowScrollBar (long hWnd, int wBar, boolean bShow); /** @param hWnd cast=(HWND) */ -public static final native boolean ShowWindow (long /*int*/ hWnd, int nCmdShow); +public static final native boolean ShowWindow (long hWnd, int nCmdShow); /** * @param hdc cast=(HDC) * @param lpdi cast=(LPDOCINFOW) */ -public static final native int StartDoc (long /*int*/ hdc, DOCINFO lpdi); +public static final native int StartDoc (long hdc, DOCINFO lpdi); /** @param hdc cast=(HDC) */ -public static final native int StartPage (long /*int*/ hdc); +public static final native int StartPage (long hdc); /** * @param hdcDest cast=(HDC) * @param hdcSrc cast=(HDC) */ -public static final native boolean StretchBlt (long /*int*/ hdcDest, int nXOriginDest, int nYOriginDest, int nWidthDest, int nHeightDest, long /*int*/ hdcSrc, int nXOriginSrc, int nYOriginSrc, int nWidthSrc, int nHeightSrc, int dwRop); +public static final native boolean StretchBlt (long hdcDest, int nXOriginDest, int nYOriginDest, int nWidthDest, int nHeightDest, long hdcSrc, int nXOriginSrc, int nYOriginSrc, int nWidthSrc, int nHeightSrc, int dwRop); public static final native boolean SystemParametersInfo (int uiAction, int uiParam, HIGHCONTRAST pvParam, int fWinIni); public static final native boolean SystemParametersInfo (int uiAction, int uiParam, RECT pvParam, int fWinIni); public static final native boolean SystemParametersInfo (int uiAction, int uiParam, NONCLIENTMETRICS pvParam, int fWinIni); @@ -4525,101 +4525,101 @@ public static final native long TOUCH_COORD_TO_PIXEL(long touchCoord); * @param hwndTV cast=(HWND) * @param hitem cast=(HTREEITEM) */ -public static final native boolean TreeView_GetItemRect (long /*int*/ hwndTV, long /*int*/ hitem, RECT prc, boolean fItemRect); +public static final native boolean TreeView_GetItemRect (long hwndTV, long hitem, RECT prc, boolean fItemRect); public static final native boolean TrackMouseEvent (TRACKMOUSEEVENT lpEventTrack); /** * @param hMenu cast=(HMENU) * @param hWnd cast=(HWND) */ -public static final native boolean TrackPopupMenu (long /*int*/ hMenu, int uFlags, int x, int y, int nReserved, long /*int*/ hWnd, RECT prcRect); +public static final native boolean TrackPopupMenu (long hMenu, int uFlags, int x, int y, int nReserved, long hWnd, RECT prcRect); /** * @param hWnd cast=(HWND) * @param hAccTable cast=(HACCEL) */ -public static final native int TranslateAccelerator (long /*int*/ hWnd, long /*int*/ hAccTable, MSG lpMsg); +public static final native int TranslateAccelerator (long hWnd, long hAccTable, MSG lpMsg); /** * @param lpSrc cast=(DWORD *) * @param lpCs cast=(LPCHARSETINFO) */ -public static final native boolean TranslateCharsetInfo (long /*int*/ lpSrc, int [] lpCs, int dwFlags); +public static final native boolean TranslateCharsetInfo (long lpSrc, int [] lpCs, int dwFlags); /** * @param hWndClient cast=(HWND) * @param lpMsg cast=(LPMSG) */ -public static final native boolean TranslateMDISysAccel (long /*int*/ hWndClient, MSG lpMsg); +public static final native boolean TranslateMDISysAccel (long hWndClient, MSG lpMsg); public static final native boolean TranslateMessage (MSG lpmsg); /** * @param hdcDest cast=(HDC) * @param hdcSrc cast=(HDC) */ -public static final native boolean TransparentBlt (long /*int*/ hdcDest, int nXOriginDest, int nYOriginDest, int nWidthDest, int hHeightDest, long /*int*/ hdcSrc, int nXOriginSrc, int nYOriginSrc, int nWidthSrc, int nHeightSrc, int crTransparent); +public static final native boolean TransparentBlt (long hdcDest, int nXOriginDest, int nYOriginDest, int nWidthDest, int hHeightDest, long hdcSrc, int nXOriginSrc, int nYOriginSrc, int nWidthSrc, int nHeightSrc, int crTransparent); /** @param hhk cast=(HHOOK) */ -public static final native boolean UnhookWindowsHookEx (long /*int*/ hhk); +public static final native boolean UnhookWindowsHookEx (long hhk); /** * @param lpClassName cast=(LPWSTR) * @param hInstance cast=(HINSTANCE) */ -public static final native boolean UnregisterClass (char [] lpClassName, long /*int*/ hInstance); +public static final native boolean UnregisterClass (char [] lpClassName, long hInstance); /** * @method flags=dynamic * @param hwnd cast=(HWND) */ -public static final native boolean UnregisterTouchWindow (long /*int*/ hwnd); +public static final native boolean UnregisterTouchWindow (long hwnd); /** @param hWnd cast=(HWND) */ -public static final native boolean UpdateWindow (long /*int*/ hWnd); +public static final native boolean UpdateWindow (long hWnd); /** * @param pszPath cast=(LPCWSTR) * @param pszURL cast=(LPWSTR) */ public static final native int UrlCreateFromPath (char[] pszPath, char[] pszURL, int[] pcchUrl, int flags); /** @param hWnd cast=(HWND) */ -public static final native boolean ValidateRect (long /*int*/ hWnd, RECT lpRect); +public static final native boolean ValidateRect (long hWnd, RECT lpRect); /** @param ch cast=(WCHAR) */ public static final native short VkKeyScan (short ch); /** @method flags=trycatch */ -public static final native int VtblCall (int fnNumber, long /*int*/ ppVtbl); +public static final native int VtblCall (int fnNumber, long ppVtbl); -public static final native int VtblCall (int fnNumber, long /*int*/ ppVtbl, int arg0); -public static final native int VtblCall (int fnNumber, long /*int*/ ppVtbl, long arg0); +public static final native int VtblCall (int fnNumber, long ppVtbl, int arg0); +public static final native int VtblCall (int fnNumber, long ppVtbl, long arg0); -public static final native int VtblCall (int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int[] arg3); -public static final native int VtblCall (int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2, int[] arg3); -public static final native int VtblCall (int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, long[] arg3); -public static final native int VtblCall (int fnNumber, long /*int*/ ppVtbl, int arg0, long arg1, int arg2, long[] arg3); -public static final native int VtblCall (int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2, long[] arg3); +public static final native int VtblCall (int fnNumber, long ppVtbl, int arg0, int arg1, int arg2, int[] arg3); +public static final native int VtblCall (int fnNumber, long ppVtbl, long arg0, int arg1, int arg2, int[] arg3); +public static final native int VtblCall (int fnNumber, long ppVtbl, long arg0, long arg1, int arg2, long[] arg3); +public static final native int VtblCall (int fnNumber, long ppVtbl, int arg0, long arg1, int arg2, long[] arg3); +public static final native int VtblCall (int fnNumber, long ppVtbl, long arg0, int arg1, int arg2, long[] arg3); -public static final native int VtblCall (int fnNumber, long /*int*/ ppVtbl, char[] arg0, int arg1, int arg2, int[] arg3, int[] arg4); -public static final native int VtblCall (int fnNumber, long /*int*/ ppVtbl, short arg0, byte[] arg1, byte[] arg2, byte[] arg3); -public static final native int VtblCall (int fnNumber, long /*int*/ ppVtbl, int[] arg0); -public static final native int VtblCall (int fnNumber, long /*int*/ ppVtbl, long[] arg0); -public static final native int VtblCall (int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int[] arg1); -public static final native int VtblCall (int fnNumber, long /*int*/ ppVtbl, byte[] arg0, long[] arg1); -public static final native int VtblCall (int fnNumber, long /*int*/ ppVtbl, int arg0, long /*int*/[] arg1, int[] arg2); -public static final native int VtblCall (int fnNumber, long /*int*/ ppVtbl, long arg0, int[] arg1, int[] arg2); -public static final native int VtblCall (int fnNumber, long /*int*/ ppVtbl, long arg0, long[] arg1, long[] arg2); -public static final native int VtblCall (int fnNumber, long /*int*/ ppVtbl, TF_DISPLAYATTRIBUTE arg0); +public static final native int VtblCall (int fnNumber, long ppVtbl, char[] arg0, int arg1, int arg2, int[] arg3, int[] arg4); +public static final native int VtblCall (int fnNumber, long ppVtbl, short arg0, byte[] arg1, byte[] arg2, byte[] arg3); +public static final native int VtblCall (int fnNumber, long ppVtbl, int[] arg0); +public static final native int VtblCall (int fnNumber, long ppVtbl, long[] arg0); +public static final native int VtblCall (int fnNumber, long ppVtbl, byte[] arg0, int[] arg1); +public static final native int VtblCall (int fnNumber, long ppVtbl, byte[] arg0, long[] arg1); +public static final native int VtblCall (int fnNumber, long ppVtbl, int arg0, long[] arg1, int[] arg2); +public static final native int VtblCall (int fnNumber, long ppVtbl, long arg0, int[] arg1, int[] arg2); +public static final native int VtblCall (int fnNumber, long ppVtbl, long arg0, long[] arg1, long[] arg2); +public static final native int VtblCall (int fnNumber, long ppVtbl, TF_DISPLAYATTRIBUTE arg0); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, long arg1, long arg2); -public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2); -public static final native int VtblCall (int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2); +public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, long arg1, long arg2); +public static final native int VtblCall(int fnNumber, long ppVtbl, long arg0, long arg1, long arg2); +public static final native int VtblCall (int fnNumber, long ppVtbl, int arg0, int arg1, int arg2); -public static final native int VtblCall (int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1); -public static final native int VtblCall (int fnNumber, long /*int*/ ppVtbl, int arg0, long arg1); -public static final native int VtblCall (int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1); -public static final native int VtblCall (int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1); -public static final native int VtblCall (int fnNumber, long /*int*/ ppVtbl, int[] arg0, byte[] arg1, int[] arg2); -public static final native int VtblCall (int fnNumber, long /*int*/ ppVtbl, int[] arg0, byte[] arg1, long[] arg2); -public static final native int VtblCall (int fnNumber, long /*int*/ ppVtbl, char[] arg0); -public static final native int VtblCall (int fnNumber, long /*int*/ ppVtbl, char[] arg0, int arg1); -public static final native int VtblCall (int fnNumber, long /*int*/ ppVtbl, char[] arg0, long arg1); -public static final native int VtblCall (int fnNumber, long /*int*/ ppVtbl, PROPERTYKEY arg0, int arg1); -public static final native int VtblCall (int fnNumber, long /*int*/ ppVtbl, PROPERTYKEY arg0, long arg1); -public static final native int VtblCall (int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, char[] arg2, char[] arg3, int arg4); -public static final native int VtblCall (int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, char[] arg2, char[] arg3, long arg4); -public static final native int VtblCall (int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1); -public static final native int VtblCall (int fnNumber, long /*int*/ ppVtbl, long arg0, int[] arg1); -public static final native int VtblCall (int fnNumber, long /*int*/ ppVtbl, int arg0, long[] arg1); +public static final native int VtblCall (int fnNumber, long ppVtbl, int arg0, int arg1); +public static final native int VtblCall (int fnNumber, long ppVtbl, int arg0, long arg1); +public static final native int VtblCall (int fnNumber, long ppVtbl, long arg0, long arg1); +public static final native int VtblCall (int fnNumber, long ppVtbl, long arg0, int arg1); +public static final native int VtblCall (int fnNumber, long ppVtbl, int[] arg0, byte[] arg1, int[] arg2); +public static final native int VtblCall (int fnNumber, long ppVtbl, int[] arg0, byte[] arg1, long[] arg2); +public static final native int VtblCall (int fnNumber, long ppVtbl, char[] arg0); +public static final native int VtblCall (int fnNumber, long ppVtbl, char[] arg0, int arg1); +public static final native int VtblCall (int fnNumber, long ppVtbl, char[] arg0, long arg1); +public static final native int VtblCall (int fnNumber, long ppVtbl, PROPERTYKEY arg0, int arg1); +public static final native int VtblCall (int fnNumber, long ppVtbl, PROPERTYKEY arg0, long arg1); +public static final native int VtblCall (int fnNumber, long ppVtbl, int arg0, int arg1, char[] arg2, char[] arg3, int arg4); +public static final native int VtblCall (int fnNumber, long ppVtbl, long arg0, int arg1, char[] arg2, char[] arg3, long arg4); +public static final native int VtblCall (int fnNumber, long ppVtbl, int arg0, int[] arg1); +public static final native int VtblCall (int fnNumber, long ppVtbl, long arg0, int[] arg1); +public static final native int VtblCall (int fnNumber, long ppVtbl, int arg0, long[] arg1); public static final native boolean WaitMessage (); /** @@ -4635,22 +4635,22 @@ public static final native int WideCharToMultiByte (int CodePage, int dwFlags, c * @param lpDefaultChar cast=(LPCSTR) * @param lpUsedDefaultChar cast=(LPBOOL) */ -public static final native int WideCharToMultiByte (int CodePage, int dwFlags, char [] lpWideCharStr, int cchWideChar, long /*int*/ lpMultiByteStr, int cchMultiByte, byte [] lpDefaultChar, boolean [] lpUsedDefaultChar); +public static final native int WideCharToMultiByte (int CodePage, int dwFlags, char [] lpWideCharStr, int cchWideChar, long lpMultiByteStr, int cchMultiByte, byte [] lpDefaultChar, boolean [] lpUsedDefaultChar); /** @param hDC cast=(HDC) */ -public static final native long /*int*/ WindowFromDC (long /*int*/ hDC); +public static final native long WindowFromDC (long hDC); /** @param lpPoint flags=struct */ -public static final native long /*int*/ WindowFromPoint (POINT lpPoint); +public static final native long WindowFromPoint (POINT lpPoint); /** @param string cast=(const wchar_t *) */ -public static final native int wcslen (long /*int*/ string); +public static final native int wcslen (long string); /** @param hFileMappingObject cast=(HANDLE) * @param dwDesiredAccess cast=(DWORD) * @param dwFileOffsetHigh cast=(DWORD) * @param dwFileOffsetLow cast=(DWORD) */ -public static final native long /*int*/ MapViewOfFile(long /*int*/ hFileMappingObject, int dwDesiredAccess, int dwFileOffsetHigh, int dwFileOffsetLow, int dwNumberOfBytesToMap); +public static final native long MapViewOfFile(long hFileMappingObject, int dwDesiredAccess, int dwFileOffsetHigh, int dwFileOffsetLow, int dwNumberOfBytesToMap); /** @param lpBaseAddress cast=(LPCVOID) */ -public static final native boolean UnmapViewOfFile(long /*int*/ lpBaseAddress); +public static final native boolean UnmapViewOfFile(long lpBaseAddress); public static final int PROCESS_DUP_HANDLE = 0x0040; public static final int PROCESS_VM_READ = 0x0010; @@ -4660,9 +4660,9 @@ public static final int DUPLICATE_SAME_ACCESS = 2; * @param dwDesiredAccess cast=(DWORD) * @param dwProcessId cast=(DWORD) */ -public static final native long /*int*/ OpenProcess(int dwDesiredAccess, boolean bInheritHandle, int dwProcessId); +public static final native long OpenProcess(int dwDesiredAccess, boolean bInheritHandle, int dwProcessId); -public static final native long /*int*/ GetCurrentProcess(); +public static final native long GetCurrentProcess(); /** * @param hSourceProcessHandle cast=(HANDLE) @@ -4672,7 +4672,7 @@ public static final native long /*int*/ GetCurrentProcess(); * @param dwDesiredAccess cast=(DWORD) * @param dwOptions cast=(DWORD) */ -public static final native boolean DuplicateHandle(long /*int*/ hSourceProcessHandle, long /*int*/ hSourceHandle, long /*int*/ hTargetProcessHandle, - long /*int*/ [] lpTargetHandle, int dwDesiredAccess, boolean b, int dwOptions); +public static final native boolean DuplicateHandle(long hSourceProcessHandle, long hSourceHandle, long hTargetProcessHandle, + long [] lpTargetHandle, int dwDesiredAccess, boolean b, int dwOptions); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OUTLINETEXTMETRIC.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OUTLINETEXTMETRIC.java index 0d31133269..daacae7e8e 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OUTLINETEXTMETRIC.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OUTLINETEXTMETRIC.java @@ -62,12 +62,12 @@ public class OUTLINETEXTMETRIC { public int otmsUnderscoreSize; public int otmsUnderscorePosition; /** @field cast=(PSTR) */ - public long /*int*/ otmpFamilyName; + public long otmpFamilyName; /** @field cast=(PSTR) */ - public long /*int*/ otmpFaceName; + public long otmpFaceName; /** @field cast=(PSTR) */ - public long /*int*/ otmpStyleName; + public long otmpStyleName; /** @field cast=(PSTR) */ - public long /*int*/ otmpFullName; + public long otmpFullName; public static final int sizeof = OS.OUTLINETEXTMETRIC_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/PAINTSTRUCT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/PAINTSTRUCT.java index d1acaf45a6..7da7b4f054 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/PAINTSTRUCT.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/PAINTSTRUCT.java @@ -15,7 +15,7 @@ package org.eclipse.swt.internal.win32; public class PAINTSTRUCT { /** @field cast=(HDC) */ - public long /*int*/ hdc; + public long hdc; public boolean fErase; // public RECT rcPaint; /** @field accessor=rcPaint.left */ diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/PRINTDLG.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/PRINTDLG.java index 3d845bbc4a..93b2ad2d26 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/PRINTDLG.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/PRINTDLG.java @@ -16,13 +16,13 @@ package org.eclipse.swt.internal.win32; public class PRINTDLG { public int lStructSize; // DWORD /** @field cast=(HWND) */ - public long /*int*/ hwndOwner; // HWND + public long hwndOwner; // HWND /** @field cast=(HGLOBAL) */ - public long /*int*/ hDevMode; // HGLOBAL + public long hDevMode; // HGLOBAL /** @field cast=(HGLOBAL) */ - public long /*int*/ hDevNames; // HGLOBAL + public long hDevNames; // HGLOBAL /** @field cast=(HDC) */ - public long /*int*/ hDC; // HDC + public long hDC; // HDC public int Flags; // DWORD public short nFromPage; // WORD public short nToPage; // WORD @@ -30,19 +30,19 @@ public class PRINTDLG { public short nMaxPage; // WORD public short nCopies; // WORD /** @field cast=(HINSTANCE) */ - public long /*int*/ hInstance; // HINSTANCE - public long /*int*/ lCustData; // LPARAM + public long hInstance; // HINSTANCE + public long lCustData; // LPARAM /** @field cast=(LPPRINTHOOKPROC) */ - public long /*int*/ lpfnPrintHook; // LPPRINTHOOKPROC + public long lpfnPrintHook; // LPPRINTHOOKPROC /** @field cast=(LPPRINTHOOKPROC) */ - public long /*int*/ lpfnSetupHook; // LPSETUPHOOKPROC + public long lpfnSetupHook; // LPSETUPHOOKPROC /** @field cast=(LPCTSTR) */ - public long /*int*/ lpPrintTemplateName; // LPCTSTR + public long lpPrintTemplateName; // LPCTSTR /** @field cast=(LPCTSTR) */ - public long /*int*/ lpSetupTemplateName; // LPCTSTR + public long lpSetupTemplateName; // LPCTSTR /** @field cast=(HGLOBAL) */ - public long /*int*/ hPrintTemplate; // HGLOBAL + public long hPrintTemplate; // HGLOBAL /** @field cast=(HGLOBAL) */ - public long /*int*/ hSetupTemplate; // HGLOBAL + public long hSetupTemplate; // HGLOBAL public static final int sizeof = OS.PRINTDLG_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/PROCESS_INFORMATION.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/PROCESS_INFORMATION.java index 9d143a8512..39a71f7368 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/PROCESS_INFORMATION.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/PROCESS_INFORMATION.java @@ -15,9 +15,9 @@ package org.eclipse.swt.internal.win32; public class PROCESS_INFORMATION { /** @field cast=(HANDLE) */ - public long /*int*/ hProcess; + public long hProcess; /** @field cast=(HANDLE) */ - public long /*int*/ hThread; + public long hThread; public int dwProcessId; public int dwThreadId; public static int sizeof = OS.PROCESS_INFORMATION_sizeof (); diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/REBARBANDINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/REBARBANDINFO.java index 81aa663fe1..8a5e32139d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/REBARBANDINFO.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/REBARBANDINFO.java @@ -20,22 +20,22 @@ public class REBARBANDINFO { public int clrFore; public int clrBack; /** @field cast=(LPTSTR) */ - public long /*int*/ lpText; + public long lpText; public int cch; public int iImage; /** @field cast=(HWND) */ - public long /*int*/ hwndChild; + public long hwndChild; public int cxMinChild; public int cyMinChild; public int cx; /** @field cast=(HBITMAP) */ - public long /*int*/ hbmBack; + public long hbmBack; public int wID; public int cyChild; public int cyMaxChild; public int cyIntegral; public int cxIdeal; - public long /*int*/ lParam; + public long lParam; public int cxHeader; public static final int sizeof = OS.REBARBANDINFO_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SAFEARRAY.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SAFEARRAY.java index c1d47b0d31..ea4085fe48 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SAFEARRAY.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SAFEARRAY.java @@ -19,7 +19,7 @@ public class SAFEARRAY { public int cbElements; public int cLocks; /** @field cast=(PVOID) */ - public long /*int*/ pvData; + public long pvData; /** @field accessor=rgsabound[0] */ public SAFEARRAYBOUND rgsabound; diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SHDRAGIMAGE.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SHDRAGIMAGE.java index 4c506c37f9..66f2552eab 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SHDRAGIMAGE.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SHDRAGIMAGE.java @@ -17,7 +17,7 @@ public final class SHDRAGIMAGE { public SIZE sizeDragImage = new SIZE (); public POINT ptOffset = new POINT (); /** @field cast=(HBITMAP) */ - public long /*int*/ hbmpDragImage; + public long hbmpDragImage; public int crColorKey; public static final int sizeof = OS.SHDRAGIMAGE_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SHELLEXECUTEINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SHELLEXECUTEINFO.java index a8b7bb7b76..c3ebf66f33 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SHELLEXECUTEINFO.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SHELLEXECUTEINFO.java @@ -17,34 +17,34 @@ public class SHELLEXECUTEINFO { public int cbSize; public int fMask; /** @field cast=(HWND) */ - public long /*int*/ hwnd; + public long hwnd; /** @field cast=(LPCTSTR) */ - public long /*int*/ lpVerb; + public long lpVerb; /** @field cast=(LPCTSTR) */ - public long /*int*/ lpFile; + public long lpFile; /** @field cast=(LPCTSTR) */ - public long /*int*/ lpParameters; + public long lpParameters; /** @field cast=(LPCTSTR) */ - public long /*int*/ lpDirectory; + public long lpDirectory; public int nShow; /** @field cast=(HINSTANCE) */ - public long /*int*/ hInstApp; + public long hInstApp; // Optional members /** @field cast=(LPVOID) */ - public long /*int*/ lpIDList; + public long lpIDList; /** @field cast=(LPCTSTR) */ - public long /*int*/ lpClass; + public long lpClass; /** @field cast=(HKEY) */ - public long /*int*/ hkeyClass; + public long hkeyClass; public int dwHotKey; // union { // HANDLE hIcon; // HANDLE hMonitor; // }; /** @field cast=(HANDLE) */ - public long /*int*/ hIcon; + public long hIcon; /** @field cast=(HANDLE) */ - public long /*int*/ hProcess; + public long hProcess; public static final int sizeof = OS.SHELLEXECUTEINFO_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SHFILEINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SHFILEINFO.java index bb97cfc16d..a1858677ac 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SHFILEINFO.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SHFILEINFO.java @@ -15,7 +15,7 @@ package org.eclipse.swt.internal.win32; public class SHFILEINFO { /** @field cast=(HICON) */ - public long /*int*/ hIcon; + public long hIcon; public int iIcon; public int dwAttributes; public char [] szDisplayName = new char [OS.MAX_PATH]; diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/STARTUPINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/STARTUPINFO.java index c744b74351..00780f69ed 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/STARTUPINFO.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/STARTUPINFO.java @@ -16,11 +16,11 @@ package org.eclipse.swt.internal.win32; public class STARTUPINFO { public int cb; /** @field cast=(LPTSTR) */ - public long /*int*/ lpReserved; + public long lpReserved; /** @field cast=(LPTSTR) */ - public long /*int*/ lpDesktop; + public long lpDesktop; /** @field cast=(LPTSTR) */ - public long /*int*/ lpTitle; + public long lpTitle; public int dwX; public int dwY; public int dwXSize; @@ -32,12 +32,12 @@ public class STARTUPINFO { public short wShowWindow; public short cbReserved2; /** @field cast=(LPBYTE) */ - public long /*int*/ lpReserved2; + public long lpReserved2; /** @field cast=(HANDLE) */ - public long /*int*/ hStdInput; + public long hStdInput; /** @field cast=(HANDLE) */ - public long /*int*/ hStdOutput; + public long hStdOutput; /** @field cast=(HANDLE) */ - public long /*int*/ hStdError; + public long hStdError; public static int sizeof = OS.STARTUPINFO_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TBBUTTON.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TBBUTTON.java index bc2c361ad2..b2f17c60ce 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TBBUTTON.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TBBUTTON.java @@ -18,7 +18,7 @@ public class TBBUTTON { public int idCommand; public byte fsState; public byte fsStyle; - public long /*int*/ dwData; - public long /*int*/ iString; + public long dwData; + public long iString; public static final int sizeof = OS.TBBUTTON_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TBBUTTONINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TBBUTTONINFO.java index 183c002948..db1c8bb7f0 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TBBUTTONINFO.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TBBUTTONINFO.java @@ -21,9 +21,9 @@ public class TBBUTTONINFO { public byte fsState; public byte fsStyle; public short cx; - public long /*int*/ lParam; + public long lParam; /** @field cast=(LPTSTR) */ - public long /*int*/ pszText; + public long pszText; public int cchText; public static final int sizeof = OS.TBBUTTONINFO_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TCITEM.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TCITEM.java index 97735190de..b9b1b70dd4 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TCITEM.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TCITEM.java @@ -18,9 +18,9 @@ public class TCITEM { public int dwState; public int dwStateMask; /** @field cast=(LPTSTR) */ - public long /*int*/ pszText; + public long pszText; public int cchTextMax; public int iImage; - public long /*int*/ lParam; + public long lParam; public static final int sizeof = OS.TCITEM_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TOOLINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TOOLINFO.java index 81b3a3b348..e14f703c56 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TOOLINFO.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TOOLINFO.java @@ -17,8 +17,8 @@ public class TOOLINFO { public int cbSize; public int uFlags; /** @field cast=(HWND) */ - public long /*int*/ hwnd; - public long /*int*/ uId; + public long hwnd; + public long uId; // public RECT rect; /** @field accessor=rect.left */ public int left; @@ -29,11 +29,11 @@ public class TOOLINFO { /** @field accessor=rect.bottom */ public int bottom; /** @field cast=(HINSTANCE) */ - public long /*int*/ hinst; + public long hinst; /** @field cast=(LPTSTR) */ - public long /*int*/ lpszText; - public long /*int*/ lParam; + public long lpszText; + public long lParam; /** @field cast=(void *) */ - public long /*int*/ lpReserved; + public long lpReserved; public static int sizeof = OS.TOOLINFO_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TOUCHINPUT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TOUCHINPUT.java index 8fca5a7ed7..84c3093fc5 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TOUCHINPUT.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TOUCHINPUT.java @@ -17,12 +17,12 @@ public class TOUCHINPUT { public int x; public int y; /** @field cast=(HWND) */ - public long /*int*/ hSource; + public long hSource; public int dwID; public int dwFlags; public int dwMask; public int dwTime; - public long /*int*/ dwExtraInfo; + public long dwExtraInfo; public int cxContact; public int cyContact; public static final int sizeof = OS.TOUCHINPUT_sizeof(); diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TRACKMOUSEEVENT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TRACKMOUSEEVENT.java index b1d608dfdc..b56fa1f22b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TRACKMOUSEEVENT.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TRACKMOUSEEVENT.java @@ -17,7 +17,7 @@ public class TRACKMOUSEEVENT { public int cbSize; public int dwFlags; /** @field cast=(HWND) */ - public long /*int*/ hwndTrack; + public long hwndTrack; public int dwHoverTime; public static final int sizeof = OS.TRACKMOUSEEVENT_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVHITTESTINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVHITTESTINFO.java index b33d4f4698..0d3b85e059 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVHITTESTINFO.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVHITTESTINFO.java @@ -21,6 +21,6 @@ public class TVHITTESTINFO { public int y; public int flags; /** @field cast=(HTREEITEM) */ - public long /*int*/ hItem; + public long hItem; public static int sizeof = OS.TVHITTESTINFO_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVINSERTSTRUCT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVINSERTSTRUCT.java index 92e1875b7d..59a332aa32 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVINSERTSTRUCT.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVINSERTSTRUCT.java @@ -15,20 +15,20 @@ package org.eclipse.swt.internal.win32; public class TVINSERTSTRUCT { /** @field cast=(HTREEITEM) */ - public long /*int*/ hParent; + public long hParent; /** @field cast=(HTREEITEM) */ - public long /*int*/ hInsertAfter; + public long hInsertAfter; // public TVITEMEX item; /** @field accessor=item.mask */ public int mask; /** @field accessor=item.hItem,cast=(HTREEITEM) */ - public long /*int*/ hItem; + public long hItem; /** @field accessor=item.state */ public int state; /** @field accessor=item.stateMask */ public int stateMask; /** @field accessor=item.pszText,cast=(LPTSTR) */ - public long /*int*/ pszText; + public long pszText; /** @field accessor=item.cchTextMax */ public int cchTextMax; /** @field accessor=item.iImage */ @@ -38,7 +38,7 @@ public class TVINSERTSTRUCT { /** @field accessor=item.cChildren */ public int cChildren; /** @field accessor=item.lParam */ - public long /*int*/ lParam; + public long lParam; /** @field accessor=itemex.iIntegral */ public int iIntegral; public static final int sizeof = OS.TVINSERTSTRUCT_sizeof (); diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVITEM.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVITEM.java index 4bb47a9ada..8952603595 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVITEM.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVITEM.java @@ -16,15 +16,15 @@ package org.eclipse.swt.internal.win32; public class TVITEM { public int mask; /** @field cast=(HTREEITEM) */ - public long /*int*/ hItem; + public long hItem; public int state; public int stateMask; /** @field cast=(LPTSTR) */ - public long /*int*/ pszText; + public long pszText; public int cchTextMax; public int iImage; public int iSelectedImage; public int cChildren; - public long /*int*/ lParam; + public long lParam; public static final int sizeof = OS.TVITEM_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVSORTCB.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVSORTCB.java index 2b5ff1c36b..fd9ff29108 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVSORTCB.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVSORTCB.java @@ -15,10 +15,10 @@ package org.eclipse.swt.internal.win32; public class TVSORTCB { /** @field cast=(HTREEITEM) */ - public long /*int*/ hParent; + public long hParent; /** @field cast=(PFNTVCOMPARE) */ - public long /*int*/ lpfnCompare; + public long lpfnCompare; /** @field cast=(LPARAM) */ - public long /*int*/ lParam; + public long lParam; public static final int sizeof = OS.TVSORTCB_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/WINDOWPOS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/WINDOWPOS.java index f74f969cc1..cb9d33659a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/WINDOWPOS.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/WINDOWPOS.java @@ -15,9 +15,9 @@ package org.eclipse.swt.internal.win32; public class WINDOWPOS { /** @field cast=(HWND) */ - public long /*int*/ hwnd; + public long hwnd; /** @field cast=(HWND) */ - public long /*int*/ hwndInsertAfter; + public long hwndInsertAfter; public int x; public int y; public int cx; diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/WNDCLASS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/WNDCLASS.java index 90bc05b742..02998074c9 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/WNDCLASS.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/WNDCLASS.java @@ -16,20 +16,20 @@ package org.eclipse.swt.internal.win32; public class WNDCLASS { public int style; /** @field cast=(WNDPROC) */ - public long /*int*/ lpfnWndProc; + public long lpfnWndProc; public int cbClsExtra; public int cbWndExtra; /** @field cast=(HINSTANCE) */ - public long /*int*/ hInstance; + public long hInstance; /** @field cast=(HICON) */ - public long /*int*/ hIcon; + public long hIcon; /** @field cast=(HCURSOR) */ - public long /*int*/ hCursor; + public long hCursor; /** @field cast=(HBRUSH) */ - public long /*int*/ hbrBackground; + public long hbrBackground; /** @field cast=(LPCTSTR) */ - public long /*int*/ lpszMenuName; + public long lpszMenuName; /** @field cast=(LPCTSTR) */ - public long /*int*/ lpszClassName; + public long lpszClassName; public static final int sizeof = OS.WNDCLASS_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Printing/win32/org/eclipse/swt/printing/PrintDialog.java b/bundles/org.eclipse.swt/Eclipse SWT Printing/win32/org/eclipse/swt/printing/PrintDialog.java index aaf0ad6fbb..68d9d8ac68 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Printing/win32/org/eclipse/swt/printing/PrintDialog.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Printing/win32/org/eclipse/swt/printing/PrintDialog.java @@ -290,8 +290,8 @@ public PrinterData open() { /* Get the owner HWND for the dialog */ Control parent = getParent(); int style = getStyle(); - long /*int*/ hwndOwner = parent.handle; - long /*int*/ hwndParent = parent.handle; + long hwndOwner = parent.handle; + long hwndParent = parent.handle; /* * Feature in Windows. There is no API to set the BIDI orientation @@ -343,8 +343,8 @@ public PrinterData open() { short[] offsets = new short[4]; // DEVNAMES (4 offsets) int offsetsSize = offsets.length * 2; // 2 bytes each offsets[1] = (short) offsets.length; // offset 1 points to wDeviceOffset - long /*int*/ hMem = OS.GlobalAlloc(OS.GMEM_MOVEABLE | OS.GMEM_ZEROINIT, offsetsSize + size); - long /*int*/ ptr = OS.GlobalLock(hMem); + long hMem = OS.GlobalAlloc(OS.GMEM_MOVEABLE | OS.GMEM_ZEROINIT, offsetsSize + size); + long ptr = OS.GlobalLock(hMem); OS.MoveMemory(ptr, offsets, offsetsSize); OS.MoveMemory(ptr + offsetsSize, buffer, size); OS.GlobalUnlock(hMem); @@ -373,8 +373,8 @@ public PrinterData open() { */ byte devmodeData [] = printerData.otherData; if (devmodeData != null && devmodeData.length != 0) { - long /*int*/ hMem = OS.GlobalAlloc(OS.GMEM_MOVEABLE | OS.GMEM_ZEROINIT, devmodeData.length); - long /*int*/ ptr = OS.GlobalLock(hMem); + long hMem = OS.GlobalAlloc(OS.GMEM_MOVEABLE | OS.GMEM_ZEROINIT, devmodeData.length); + long ptr = OS.GlobalLock(hMem); OS.MoveMemory(ptr, devmodeData, devmodeData.length); OS.GlobalUnlock(hMem); if (pd.hDevMode != 0) OS.GlobalFree(pd.hDevMode); @@ -382,12 +382,12 @@ public PrinterData open() { } /* Initialize the DEVMODE struct's fields from the printerData. */ - long /*int*/ hMem = pd.hDevMode; + long hMem = pd.hDevMode; if (hMem == 0) { hMem = OS.GlobalAlloc(OS.GMEM_MOVEABLE | OS.GMEM_ZEROINIT, DEVMODE.sizeof); pd.hDevMode = hMem; } - long /*int*/ ptr = OS.GlobalLock(hMem); + long ptr = OS.GlobalLock(hMem); DEVMODE devmode = new DEVMODE (); OS.MoveMemory(devmode, ptr, DEVMODE.sizeof); if (printerData.name != null) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT Printing/win32/org/eclipse/swt/printing/Printer.java b/bundles/org.eclipse.swt/Eclipse SWT Printing/win32/org/eclipse/swt/printing/Printer.java index d157b99fb5..4e68b8bfba 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Printing/win32/org/eclipse/swt/printing/Printer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Printing/win32/org/eclipse/swt/printing/Printer.java @@ -53,7 +53,7 @@ public final class Printer extends Device { * * @noreference This field is not intended to be referenced by clients. */ - public long /*int*/ handle; + public long handle; /** * the printer data describing this printer @@ -218,15 +218,15 @@ protected void create(DeviceData deviceData) { /* Use the character encoding for the default locale */ TCHAR driver = new TCHAR(0, data.driver, true); TCHAR device = new TCHAR(0, data.name, true); - long /*int*/ lpInitData = 0; + long lpInitData = 0; byte devmodeData [] = data.otherData; - long /*int*/ hHeap = OS.GetProcessHeap(); + long hHeap = OS.GetProcessHeap(); if (devmodeData != null && devmodeData.length != 0) { /* If user setup info from a print dialog was specified, restore the DEVMODE struct. */ lpInitData = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, devmodeData.length); OS.MoveMemory(lpInitData, devmodeData, devmodeData.length); } else { - long /*int*/ [] hPrinter = new long /*int*/ [1]; + long [] hPrinter = new long [1]; OS.OpenPrinter(device, hPrinter, 0); if (hPrinter[0] != 0) { int dwNeeded = OS.DocumentProperties(0, hPrinter[0], device, 0, 0, 0); @@ -287,7 +287,7 @@ protected void create(DeviceData deviceData) { * @noreference This method is not intended to be referenced by clients. */ @Override -public long /*int*/ internal_new_GC(GCData data) { +public long internal_new_GC(GCData data) { if (handle == 0) SWT.error(SWT.ERROR_NO_HANDLES); if (data != null) { if (isGCCreated) SWT.error(SWT.ERROR_INVALID_ARGUMENT); @@ -320,7 +320,7 @@ public long /*int*/ internal_new_GC(GCData data) { * @noreference This method is not intended to be referenced by clients. */ @Override -public void internal_dispose_GC(long /*int*/ hDC, GCData data) { +public void internal_dispose_GC(long hDC, GCData data) { if (data != null) isGCCreated = false; } @@ -357,8 +357,8 @@ public boolean startJob(String jobName) { checkDevice(); DOCINFO di = new DOCINFO(); di.cbSize = DOCINFO.sizeof; - long /*int*/ hHeap = OS.GetProcessHeap(); - long /*int*/ lpszDocName = 0; + long hHeap = OS.GetProcessHeap(); + long lpszDocName = 0; if (jobName != null && jobName.length() != 0) { /* Use the character encoding for the default locale */ TCHAR buffer = new TCHAR(0, jobName, true); @@ -367,7 +367,7 @@ public boolean startJob(String jobName) { OS.MoveMemory(lpszDocName, buffer, byteCount); di.lpszDocName = lpszDocName; } - long /*int*/ lpszOutput = 0; + long lpszOutput = 0; if (data.printToFile) { if (data.fileName == null) { /* Prompt the user for a file name. */ diff --git a/bundles/org.eclipse.swt/Eclipse SWT Program/win32/org/eclipse/swt/program/Program.java b/bundles/org.eclipse.swt/Eclipse SWT Program/win32/org/eclipse/swt/program/Program.java index 37e47bf541..dd390980cf 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Program/win32/org/eclipse/swt/program/Program.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Program/win32/org/eclipse/swt/program/Program.java @@ -141,7 +141,7 @@ public static String [] getExtensions () { static String getKeyValue (String string, boolean expand) { /* Use the character encoding for the default locale */ TCHAR key = new TCHAR (0, string, true); - long /*int*/ [] phkResult = new long /*int*/ [1]; + long [] phkResult = new long [1]; if (OS.RegOpenKeyEx (OS.HKEY_CLASSES_ROOT, key, 0, OS.KEY_READ, phkResult) != 0) { return null; } @@ -278,13 +278,13 @@ public static boolean launch (String fileName, String workingDir) { if (fileName == null) SWT.error (SWT.ERROR_NULL_ARGUMENT); /* Use the character encoding for the default locale */ - long /*int*/ hHeap = OS.GetProcessHeap (); + long hHeap = OS.GetProcessHeap (); TCHAR buffer = new TCHAR (0, fileName, true); int byteCount = buffer.length () * TCHAR.sizeof; - long /*int*/ lpFile = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); + long lpFile = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); OS.MoveMemory (lpFile, buffer, byteCount); - long /*int*/ lpDirectory = 0; + long lpDirectory = 0; if (workingDir != null && OS.PathIsExe(lpFile)) { TCHAR buffer1 = new TCHAR (0, workingDir, true); byteCount = buffer1.length () * TCHAR.sizeof; @@ -333,11 +333,11 @@ public boolean execute (String fileName) { } if (append) fileName = " \"" + fileName + "\""; String commandLine = prefix + fileName + suffix; - long /*int*/ hHeap = OS.GetProcessHeap (); + long hHeap = OS.GetProcessHeap (); /* Use the character encoding for the default locale */ TCHAR buffer = new TCHAR (0, commandLine, true); int byteCount = buffer.length () * TCHAR.sizeof; - long /*int*/ lpCommandLine = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); + long lpCommandLine = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); OS.MoveMemory (lpCommandLine, buffer, byteCount); STARTUPINFO lpStartupInfo = new STARTUPINFO (); lpStartupInfo.cb = STARTUPINFO.sizeof; @@ -388,7 +388,7 @@ public ImageData getImageData () { } /* Use the character encoding for the default locale */ TCHAR lpszFile = new TCHAR (0, fileName, true); - long /*int*/ [] phiconSmall = new long /*int*/[1], phiconLarge = null; + long [] phiconSmall = new long[1], phiconLarge = null; OS.ExtractIconEx (lpszFile, nIconIndex, phiconLarge, phiconSmall, 1); if (phiconSmall [0] == 0) return null; Image image = Image.win32_new (null, SWT.ICON, phiconSmall [0]); diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library/webkit_win32.cpp b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library/webkit_win32.cpp index 9c7e39ffb1..2382805596 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library/webkit_win32.cpp +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library/webkit_win32.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2016 IBM Corporation and others. All rights reserved. + * Copyright (c) 2009, 2019 IBM Corporation and others. All rights reserved. * The contents of this file are made available under the terms * of the GNU Lesser General Public License (LGPL) Version 2.1 that * accompanies this distribution (lgpl-v21.txt). The LGPL is also @@ -25,9 +25,9 @@ #endif #ifndef NO_CFArrayGetCount -extern "C" JNIEXPORT jint JNICALL WebKit_win32_NATIVE(CFArrayGetCount)(JNIEnv *env, jclass that, jintLong arg0); +extern "C" JNIEXPORT jint JNICALL WebKit_win32_NATIVE(CFArrayGetCount)(JNIEnv *env, jclass that, jlong arg0); JNIEXPORT jint JNICALL WebKit_win32_NATIVE(CFArrayGetCount) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; WebKit_win32_NATIVE_ENTER(env, that, CFArrayGetCount_FUNC); @@ -38,28 +38,28 @@ JNIEXPORT jint JNICALL WebKit_win32_NATIVE(CFArrayGetCount) #endif #ifndef NO_CFArrayGetValueAtIndex -extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(CFArrayGetValueAtIndex)(JNIEnv *env, jclass that, jintLong arg0, jint arg1); -JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(CFArrayGetValueAtIndex) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) +extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(CFArrayGetValueAtIndex)(JNIEnv *env, jclass that, jlong arg0, jint arg1); +JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(CFArrayGetValueAtIndex) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { - jintLong rc = 0; + jlong rc = 0; WebKit_win32_NATIVE_ENTER(env, that, CFArrayGetValueAtIndex_FUNC); - rc = (jintLong)CFArrayGetValueAtIndex((CFArrayRef)arg0, (CFIndex)arg1); + rc = (jlong)CFArrayGetValueAtIndex((CFArrayRef)arg0, (CFIndex)arg1); WebKit_win32_NATIVE_EXIT(env, that, CFArrayGetValueAtIndex_FUNC); return rc; } #endif #ifndef NO_CFDataCreate -extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(CFDataCreate)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2); -JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(CFDataCreate) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2) +extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(CFDataCreate)(JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jint arg2); +JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(CFDataCreate) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jint arg2) { jbyte *lparg1=NULL; - jintLong rc = 0; + jlong rc = 0; WebKit_win32_NATIVE_ENTER(env, that, CFDataCreate_FUNC); if (arg1) if ((lparg1 = env->GetByteArrayElements(arg1, NULL)) == NULL) goto fail; - rc = (jintLong)CFDataCreate((CFAllocatorRef)arg0, (const UInt8 *)lparg1, (CFIndex)arg2); + rc = (jlong)CFDataCreate((CFAllocatorRef)arg0, (const UInt8 *)lparg1, (CFIndex)arg2); fail: if (arg1 && lparg1) env->ReleaseByteArrayElements(arg1, lparg1, 0); WebKit_win32_NATIVE_EXIT(env, that, CFDataCreate_FUNC); @@ -68,22 +68,22 @@ fail: #endif #ifndef NO_CFDataGetBytePtr -extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(CFDataGetBytePtr)(JNIEnv *env, jclass that, jintLong arg0); -JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(CFDataGetBytePtr) - (JNIEnv *env, jclass that, jintLong arg0) +extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(CFDataGetBytePtr)(JNIEnv *env, jclass that, jlong arg0); +JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(CFDataGetBytePtr) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKit_win32_NATIVE_ENTER(env, that, CFDataGetBytePtr_FUNC); - rc = (jintLong)CFDataGetBytePtr((CFDataRef)arg0); + rc = (jlong)CFDataGetBytePtr((CFDataRef)arg0); WebKit_win32_NATIVE_EXIT(env, that, CFDataGetBytePtr_FUNC); return rc; } #endif #ifndef NO_CFDataGetLength -extern "C" JNIEXPORT jint JNICALL WebKit_win32_NATIVE(CFDataGetLength)(JNIEnv *env, jclass that, jintLong arg0); +extern "C" JNIEXPORT jint JNICALL WebKit_win32_NATIVE(CFDataGetLength)(JNIEnv *env, jclass that, jlong arg0); JNIEXPORT jint JNICALL WebKit_win32_NATIVE(CFDataGetLength) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; WebKit_win32_NATIVE_ENTER(env, that, CFDataGetLength_FUNC); @@ -94,42 +94,42 @@ JNIEXPORT jint JNICALL WebKit_win32_NATIVE(CFDataGetLength) #endif #ifndef NO_CFDictionaryCreate -extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(CFDictionaryCreate)(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1, jintLongArray arg2, jint arg3, jintLong arg4, jintLong arg5); -JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(CFDictionaryCreate) - (JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1, jintLongArray arg2, jint arg3, jintLong arg4, jintLong arg5) +extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(CFDictionaryCreate)(JNIEnv *env, jclass that, jlong arg0, jlongArray arg1, jlongArray arg2, jint arg3, jlong arg4, jlong arg5); +JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(CFDictionaryCreate) + (JNIEnv *env, jclass that, jlong arg0, jlongArray arg1, jlongArray arg2, jint arg3, jlong arg4, jlong arg5) { - jintLong *lparg1=NULL; - jintLong *lparg2=NULL; - jintLong rc = 0; + jlong *lparg1=NULL; + jlong *lparg2=NULL; + jlong rc = 0; WebKit_win32_NATIVE_ENTER(env, that, CFDictionaryCreate_FUNC); - if (arg1) if ((lparg1 = env->GetIntLongArrayElements(arg1, NULL)) == NULL) goto fail; - if (arg2) if ((lparg2 = env->GetIntLongArrayElements(arg2, NULL)) == NULL) goto fail; - rc = (jintLong)CFDictionaryCreate((CFAllocatorRef)arg0, (const void **)lparg1, (const void **)lparg2, (CFIndex)arg3, (const CFDictionaryKeyCallBacks *)arg4, (const CFDictionaryValueCallBacks *)arg5); + if (arg1) if ((lparg1 = env->GetLongArrayElements(arg1, NULL)) == NULL) goto fail; + if (arg2) if ((lparg2 = env->GetLongArrayElements(arg2, NULL)) == NULL) goto fail; + rc = (jlong)CFDictionaryCreate((CFAllocatorRef)arg0, (const void **)lparg1, (const void **)lparg2, (CFIndex)arg3, (const CFDictionaryKeyCallBacks *)arg4, (const CFDictionaryValueCallBacks *)arg5); fail: - if (arg2 && lparg2) env->ReleaseIntLongArrayElements(arg2, lparg2, 0); - if (arg1 && lparg1) env->ReleaseIntLongArrayElements(arg1, lparg1, 0); + if (arg2 && lparg2) env->ReleaseLongArrayElements(arg2, lparg2, 0); + if (arg1 && lparg1) env->ReleaseLongArrayElements(arg1, lparg1, 0); WebKit_win32_NATIVE_EXIT(env, that, CFDictionaryCreate_FUNC); return rc; } #endif #ifndef NO_CFHTTPCookieCreateWithResponseHeaderFields -extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(CFHTTPCookieCreateWithResponseHeaderFields)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2); -JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(CFHTTPCookieCreateWithResponseHeaderFields) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2) +extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(CFHTTPCookieCreateWithResponseHeaderFields)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2); +JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(CFHTTPCookieCreateWithResponseHeaderFields) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2) { - jintLong rc = 0; + jlong rc = 0; WebKit_win32_NATIVE_ENTER(env, that, CFHTTPCookieCreateWithResponseHeaderFields_FUNC); - rc = (jintLong)CFHTTPCookieCreateWithResponseHeaderFields((CFAllocatorRef)arg0, (CFDictionaryRef)arg1, (CFURLRef)arg2); + rc = (jlong)CFHTTPCookieCreateWithResponseHeaderFields((CFAllocatorRef)arg0, (CFDictionaryRef)arg1, (CFURLRef)arg2); WebKit_win32_NATIVE_EXIT(env, that, CFHTTPCookieCreateWithResponseHeaderFields_FUNC); return rc; } #endif #ifndef NO_CFHTTPCookieGetFlags -extern "C" JNIEXPORT jint JNICALL WebKit_win32_NATIVE(CFHTTPCookieGetFlags)(JNIEnv *env, jclass that, jintLong arg0); +extern "C" JNIEXPORT jint JNICALL WebKit_win32_NATIVE(CFHTTPCookieGetFlags)(JNIEnv *env, jclass that, jlong arg0); JNIEXPORT jint JNICALL WebKit_win32_NATIVE(CFHTTPCookieGetFlags) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; WebKit_win32_NATIVE_ENTER(env, that, CFHTTPCookieGetFlags_FUNC); @@ -140,61 +140,61 @@ JNIEXPORT jint JNICALL WebKit_win32_NATIVE(CFHTTPCookieGetFlags) #endif #ifndef NO_CFHTTPCookieGetName -extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(CFHTTPCookieGetName)(JNIEnv *env, jclass that, jintLong arg0); -JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(CFHTTPCookieGetName) - (JNIEnv *env, jclass that, jintLong arg0) +extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(CFHTTPCookieGetName)(JNIEnv *env, jclass that, jlong arg0); +JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(CFHTTPCookieGetName) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKit_win32_NATIVE_ENTER(env, that, CFHTTPCookieGetName_FUNC); - rc = (jintLong)CFHTTPCookieGetName((CFHTTPCookieRef)arg0); + rc = (jlong)CFHTTPCookieGetName((CFHTTPCookieRef)arg0); WebKit_win32_NATIVE_EXIT(env, that, CFHTTPCookieGetName_FUNC); return rc; } #endif #ifndef NO_CFHTTPCookieGetValue -extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(CFHTTPCookieGetValue)(JNIEnv *env, jclass that, jintLong arg0); -JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(CFHTTPCookieGetValue) - (JNIEnv *env, jclass that, jintLong arg0) +extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(CFHTTPCookieGetValue)(JNIEnv *env, jclass that, jlong arg0); +JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(CFHTTPCookieGetValue) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKit_win32_NATIVE_ENTER(env, that, CFHTTPCookieGetValue_FUNC); - rc = (jintLong)CFHTTPCookieGetValue((CFHTTPCookieRef)arg0); + rc = (jlong)CFHTTPCookieGetValue((CFHTTPCookieRef)arg0); WebKit_win32_NATIVE_EXIT(env, that, CFHTTPCookieGetValue_FUNC); return rc; } #endif #ifndef NO_CFHTTPCookieStorageCopyCookies -extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(CFHTTPCookieStorageCopyCookies)(JNIEnv *env, jclass that, jintLong arg0); -JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(CFHTTPCookieStorageCopyCookies) - (JNIEnv *env, jclass that, jintLong arg0) +extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(CFHTTPCookieStorageCopyCookies)(JNIEnv *env, jclass that, jlong arg0); +JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(CFHTTPCookieStorageCopyCookies) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKit_win32_NATIVE_ENTER(env, that, CFHTTPCookieStorageCopyCookies_FUNC); - rc = (jintLong)CFHTTPCookieStorageCopyCookies((CFHTTPCookieStorageRef)arg0); + rc = (jlong)CFHTTPCookieStorageCopyCookies((CFHTTPCookieStorageRef)arg0); WebKit_win32_NATIVE_EXIT(env, that, CFHTTPCookieStorageCopyCookies_FUNC); return rc; } #endif #ifndef NO_CFHTTPCookieStorageCopyCookiesForURL -extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(CFHTTPCookieStorageCopyCookiesForURL)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2); -JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(CFHTTPCookieStorageCopyCookiesForURL) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2) +extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(CFHTTPCookieStorageCopyCookiesForURL)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jboolean arg2); +JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(CFHTTPCookieStorageCopyCookiesForURL) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jboolean arg2) { - jintLong rc = 0; + jlong rc = 0; WebKit_win32_NATIVE_ENTER(env, that, CFHTTPCookieStorageCopyCookiesForURL_FUNC); - rc = (jintLong)CFHTTPCookieStorageCopyCookiesForURL((CFHTTPCookieStorageRef)arg0, (CFURLRef)arg1, (Boolean)arg2); + rc = (jlong)CFHTTPCookieStorageCopyCookiesForURL((CFHTTPCookieStorageRef)arg0, (CFURLRef)arg1, (Boolean)arg2); WebKit_win32_NATIVE_EXIT(env, that, CFHTTPCookieStorageCopyCookiesForURL_FUNC); return rc; } #endif #ifndef NO_CFHTTPCookieStorageDeleteCookie -extern "C" JNIEXPORT void JNICALL WebKit_win32_NATIVE(CFHTTPCookieStorageDeleteCookie)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1); +extern "C" JNIEXPORT void JNICALL WebKit_win32_NATIVE(CFHTTPCookieStorageDeleteCookie)(JNIEnv *env, jclass that, jlong arg0, jlong arg1); JNIEXPORT void JNICALL WebKit_win32_NATIVE(CFHTTPCookieStorageDeleteCookie) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { WebKit_win32_NATIVE_ENTER(env, that, CFHTTPCookieStorageDeleteCookie_FUNC); CFHTTPCookieStorageDeleteCookie((CFHTTPCookieStorageRef)arg0, (CFHTTPCookieRef)arg1); @@ -203,9 +203,9 @@ JNIEXPORT void JNICALL WebKit_win32_NATIVE(CFHTTPCookieStorageDeleteCookie) #endif #ifndef NO_CFHTTPCookieStorageSetCookie -extern "C" JNIEXPORT void JNICALL WebKit_win32_NATIVE(CFHTTPCookieStorageSetCookie)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1); +extern "C" JNIEXPORT void JNICALL WebKit_win32_NATIVE(CFHTTPCookieStorageSetCookie)(JNIEnv *env, jclass that, jlong arg0, jlong arg1); JNIEXPORT void JNICALL WebKit_win32_NATIVE(CFHTTPCookieStorageSetCookie) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { WebKit_win32_NATIVE_ENTER(env, that, CFHTTPCookieStorageSetCookie_FUNC); CFHTTPCookieStorageSetCookie((CFHTTPCookieStorageRef)arg0, (CFHTTPCookieRef)arg1); @@ -214,9 +214,9 @@ JNIEXPORT void JNICALL WebKit_win32_NATIVE(CFHTTPCookieStorageSetCookie) #endif #ifndef NO_CFRelease -extern "C" JNIEXPORT void JNICALL WebKit_win32_NATIVE(CFRelease)(JNIEnv *env, jclass that, jintLong arg0); +extern "C" JNIEXPORT void JNICALL WebKit_win32_NATIVE(CFRelease)(JNIEnv *env, jclass that, jlong arg0); JNIEXPORT void JNICALL WebKit_win32_NATIVE(CFRelease) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { WebKit_win32_NATIVE_ENTER(env, that, CFRelease_FUNC); CFRelease((CFTypeRef)arg0); @@ -225,9 +225,9 @@ JNIEXPORT void JNICALL WebKit_win32_NATIVE(CFRelease) #endif #ifndef NO_CFStringCreateWithCharacters -extern "C" JNIEXPORT jint JNICALL WebKit_win32_NATIVE(CFStringCreateWithCharacters)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2); +extern "C" JNIEXPORT jint JNICALL WebKit_win32_NATIVE(CFStringCreateWithCharacters)(JNIEnv *env, jclass that, jlong arg0, jcharArray arg1, jint arg2); JNIEXPORT jint JNICALL WebKit_win32_NATIVE(CFStringCreateWithCharacters) - (JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2) + (JNIEnv *env, jclass that, jlong arg0, jcharArray arg1, jint arg2) { jchar *lparg1=NULL; jint rc = 0; @@ -242,9 +242,9 @@ fail: #endif #ifndef NO_CFStringGetCharacterAtIndex -extern "C" JNIEXPORT jchar JNICALL WebKit_win32_NATIVE(CFStringGetCharacterAtIndex)(JNIEnv *env, jclass that, jintLong arg0, jint arg1); +extern "C" JNIEXPORT jchar JNICALL WebKit_win32_NATIVE(CFStringGetCharacterAtIndex)(JNIEnv *env, jclass that, jlong arg0, jint arg1); JNIEXPORT jchar JNICALL WebKit_win32_NATIVE(CFStringGetCharacterAtIndex) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { jchar rc = 0; WebKit_win32_NATIVE_ENTER(env, that, CFStringGetCharacterAtIndex_FUNC); @@ -255,22 +255,22 @@ JNIEXPORT jchar JNICALL WebKit_win32_NATIVE(CFStringGetCharacterAtIndex) #endif #ifndef NO_CFStringGetCharactersPtr -extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(CFStringGetCharactersPtr)(JNIEnv *env, jclass that, jintLong arg0); -JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(CFStringGetCharactersPtr) - (JNIEnv *env, jclass that, jintLong arg0) +extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(CFStringGetCharactersPtr)(JNIEnv *env, jclass that, jlong arg0); +JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(CFStringGetCharactersPtr) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKit_win32_NATIVE_ENTER(env, that, CFStringGetCharactersPtr_FUNC); - rc = (jintLong)CFStringGetCharactersPtr((CFStringRef)arg0); + rc = (jlong)CFStringGetCharactersPtr((CFStringRef)arg0); WebKit_win32_NATIVE_EXIT(env, that, CFStringGetCharactersPtr_FUNC); return rc; } #endif #ifndef NO_CFStringGetLength -extern "C" JNIEXPORT jint JNICALL WebKit_win32_NATIVE(CFStringGetLength)(JNIEnv *env, jclass that, jintLong arg0); +extern "C" JNIEXPORT jint JNICALL WebKit_win32_NATIVE(CFStringGetLength)(JNIEnv *env, jclass that, jlong arg0); JNIEXPORT jint JNICALL WebKit_win32_NATIVE(CFStringGetLength) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; WebKit_win32_NATIVE_ENTER(env, that, CFStringGetLength_FUNC); @@ -281,48 +281,48 @@ JNIEXPORT jint JNICALL WebKit_win32_NATIVE(CFStringGetLength) #endif #ifndef NO_CFURLCreateWithString -extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(CFURLCreateWithString)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2); -JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(CFURLCreateWithString) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2) +extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(CFURLCreateWithString)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2); +JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(CFURLCreateWithString) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2) { - jintLong rc = 0; + jlong rc = 0; WebKit_win32_NATIVE_ENTER(env, that, CFURLCreateWithString_FUNC); - rc = (jintLong)CFURLCreateWithString((CFAllocatorRef)arg0, (CFStringRef)arg1, (CFURLRef)arg2); + rc = (jlong)CFURLCreateWithString((CFAllocatorRef)arg0, (CFStringRef)arg1, (CFURLRef)arg2); WebKit_win32_NATIVE_EXIT(env, that, CFURLCreateWithString_FUNC); return rc; } #endif #ifndef NO_CFURLRequestCopyHTTPRequestBody -extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(CFURLRequestCopyHTTPRequestBody)(JNIEnv *env, jclass that, jintLong arg0); -JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(CFURLRequestCopyHTTPRequestBody) - (JNIEnv *env, jclass that, jintLong arg0) +extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(CFURLRequestCopyHTTPRequestBody)(JNIEnv *env, jclass that, jlong arg0); +JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(CFURLRequestCopyHTTPRequestBody) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKit_win32_NATIVE_ENTER(env, that, CFURLRequestCopyHTTPRequestBody_FUNC); - rc = (jintLong)CFURLRequestCopyHTTPRequestBody((CFURLRequestRef)arg0); + rc = (jlong)CFURLRequestCopyHTTPRequestBody((CFURLRequestRef)arg0); WebKit_win32_NATIVE_EXIT(env, that, CFURLRequestCopyHTTPRequestBody_FUNC); return rc; } #endif #ifndef NO_CFURLRequestCreateMutableCopy -extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(CFURLRequestCreateMutableCopy)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1); -JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(CFURLRequestCreateMutableCopy) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) +extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(CFURLRequestCreateMutableCopy)(JNIEnv *env, jclass that, jlong arg0, jlong arg1); +JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(CFURLRequestCreateMutableCopy) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { - jintLong rc = 0; + jlong rc = 0; WebKit_win32_NATIVE_ENTER(env, that, CFURLRequestCreateMutableCopy_FUNC); - rc = (jintLong)CFURLRequestCreateMutableCopy((CFAllocatorRef)arg0, (CFURLRequestRef)arg1); + rc = (jlong)CFURLRequestCreateMutableCopy((CFAllocatorRef)arg0, (CFURLRequestRef)arg1); WebKit_win32_NATIVE_EXIT(env, that, CFURLRequestCreateMutableCopy_FUNC); return rc; } #endif #ifndef NO_CFURLRequestSetHTTPRequestBody -extern "C" JNIEXPORT void JNICALL WebKit_win32_NATIVE(CFURLRequestSetHTTPRequestBody)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1); +extern "C" JNIEXPORT void JNICALL WebKit_win32_NATIVE(CFURLRequestSetHTTPRequestBody)(JNIEnv *env, jclass that, jlong arg0, jlong arg1); JNIEXPORT void JNICALL WebKit_win32_NATIVE(CFURLRequestSetHTTPRequestBody) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { WebKit_win32_NATIVE_ENTER(env, that, CFURLRequestSetHTTPRequestBody_FUNC); CFURLRequestSetHTTPRequestBody((CFMutableURLRequestRef)arg0, (CFDataRef)arg1); @@ -331,9 +331,9 @@ JNIEXPORT void JNICALL WebKit_win32_NATIVE(CFURLRequestSetHTTPRequestBody) #endif #ifndef NO_CFURLRequestSetURL -extern "C" JNIEXPORT void JNICALL WebKit_win32_NATIVE(CFURLRequestSetURL)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1); +extern "C" JNIEXPORT void JNICALL WebKit_win32_NATIVE(CFURLRequestSetURL)(JNIEnv *env, jclass that, jlong arg0, jlong arg1); JNIEXPORT void JNICALL WebKit_win32_NATIVE(CFURLRequestSetURL) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { WebKit_win32_NATIVE_ENTER(env, that, CFURLRequestSetURL_FUNC); CFURLRequestSetURL((CFMutableURLRequestRef)arg0, (CFURLRef)arg1); @@ -342,13 +342,13 @@ JNIEXPORT void JNICALL WebKit_win32_NATIVE(CFURLRequestSetURL) #endif #ifndef NO_JSClassCreate -extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSClassCreate)(JNIEnv *env, jclass that, jintLong arg0); -JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSClassCreate) - (JNIEnv *env, jclass that, jintLong arg0) +extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSClassCreate)(JNIEnv *env, jclass that, jlong arg0); +JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSClassCreate) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKit_win32_NATIVE_ENTER(env, that, JSClassCreate_FUNC); - rc = (jintLong)JSClassCreate((const JSClassDefinition*)arg0); + rc = (jlong)JSClassCreate((const JSClassDefinition*)arg0); WebKit_win32_NATIVE_EXIT(env, that, JSClassCreate_FUNC); return rc; } @@ -368,52 +368,52 @@ JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSClassDefinition_1sizeof) #endif #ifndef NO_JSClassRetain -extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSClassRetain)(JNIEnv *env, jclass that, jintLong arg0); -JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSClassRetain) - (JNIEnv *env, jclass that, jintLong arg0) +extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSClassRetain)(JNIEnv *env, jclass that, jlong arg0); +JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSClassRetain) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKit_win32_NATIVE_ENTER(env, that, JSClassRetain_FUNC); - rc = (jintLong)JSClassRetain((JSClassRef)arg0); + rc = (jlong)JSClassRetain((JSClassRef)arg0); WebKit_win32_NATIVE_EXIT(env, that, JSClassRetain_FUNC); return rc; } #endif #ifndef NO_JSContextGetGlobalObject -extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSContextGetGlobalObject)(JNIEnv *env, jclass that, jintLong arg0); -JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSContextGetGlobalObject) - (JNIEnv *env, jclass that, jintLong arg0) +extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSContextGetGlobalObject)(JNIEnv *env, jclass that, jlong arg0); +JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSContextGetGlobalObject) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKit_win32_NATIVE_ENTER(env, that, JSContextGetGlobalObject_FUNC); - rc = (jintLong)JSContextGetGlobalObject((JSContextRef)arg0); + rc = (jlong)JSContextGetGlobalObject((JSContextRef)arg0); WebKit_win32_NATIVE_EXIT(env, that, JSContextGetGlobalObject_FUNC); return rc; } #endif #ifndef NO_JSEvaluateScript -extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSEvaluateScript)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jint arg4, jintLongArray arg5); -JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSEvaluateScript) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jint arg4, jintLongArray arg5) +extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSEvaluateScript)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jint arg4, jlongArray arg5); +JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSEvaluateScript) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jint arg4, jlongArray arg5) { - jintLong *lparg5=NULL; - jintLong rc = 0; + jlong *lparg5=NULL; + jlong rc = 0; WebKit_win32_NATIVE_ENTER(env, that, JSEvaluateScript_FUNC); - if (arg5) if ((lparg5 = env->GetIntLongArrayElements(arg5, NULL)) == NULL) goto fail; - rc = (jintLong)JSEvaluateScript((JSContextRef)arg0, (JSStringRef)arg1, (JSObjectRef)arg2, (JSStringRef)arg3, arg4, (JSValueRef *)lparg5); + if (arg5) if ((lparg5 = env->GetLongArrayElements(arg5, NULL)) == NULL) goto fail; + rc = (jlong)JSEvaluateScript((JSContextRef)arg0, (JSStringRef)arg1, (JSObjectRef)arg2, (JSStringRef)arg3, arg4, (JSValueRef *)lparg5); fail: - if (arg5 && lparg5) env->ReleaseIntLongArrayElements(arg5, lparg5, 0); + if (arg5 && lparg5) env->ReleaseLongArrayElements(arg5, lparg5, 0); WebKit_win32_NATIVE_EXIT(env, that, JSEvaluateScript_FUNC); return rc; } #endif #ifndef NO_JSGlobalContextRetain -extern "C" JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSGlobalContextRetain)(JNIEnv *env, jclass that, jintLong arg0); +extern "C" JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSGlobalContextRetain)(JNIEnv *env, jclass that, jlong arg0); JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSGlobalContextRetain) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; WebKit_win32_NATIVE_ENTER(env, that, JSGlobalContextRetain_FUNC); @@ -424,56 +424,56 @@ JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSGlobalContextRetain) #endif #ifndef NO_JSObjectGetPrivate -extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSObjectGetPrivate)(JNIEnv *env, jclass that, jintLong arg0); -JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSObjectGetPrivate) - (JNIEnv *env, jclass that, jintLong arg0) +extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSObjectGetPrivate)(JNIEnv *env, jclass that, jlong arg0); +JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSObjectGetPrivate) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKit_win32_NATIVE_ENTER(env, that, JSObjectGetPrivate_FUNC); - rc = (jintLong)JSObjectGetPrivate((JSObjectRef)arg0); + rc = (jlong)JSObjectGetPrivate((JSObjectRef)arg0); WebKit_win32_NATIVE_EXIT(env, that, JSObjectGetPrivate_FUNC); return rc; } #endif #ifndef NO_JSObjectGetProperty -extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSObjectGetProperty)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLongArray arg3); -JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSObjectGetProperty) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLongArray arg3) +extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSObjectGetProperty)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlongArray arg3); +JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSObjectGetProperty) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlongArray arg3) { - jintLong *lparg3=NULL; - jintLong rc = 0; + jlong *lparg3=NULL; + jlong rc = 0; WebKit_win32_NATIVE_ENTER(env, that, JSObjectGetProperty_FUNC); - if (arg3) if ((lparg3 = env->GetIntLongArrayElements(arg3, NULL)) == NULL) goto fail; - rc = (jintLong)JSObjectGetProperty((JSContextRef)arg0, (JSObjectRef)arg1, (JSStringRef)arg2, (JSValueRef*)lparg3); + if (arg3) if ((lparg3 = env->GetLongArrayElements(arg3, NULL)) == NULL) goto fail; + rc = (jlong)JSObjectGetProperty((JSContextRef)arg0, (JSObjectRef)arg1, (JSStringRef)arg2, (JSValueRef*)lparg3); fail: - if (arg3 && lparg3) env->ReleaseIntLongArrayElements(arg3, lparg3, 0); + if (arg3 && lparg3) env->ReleaseLongArrayElements(arg3, lparg3, 0); WebKit_win32_NATIVE_EXIT(env, that, JSObjectGetProperty_FUNC); return rc; } #endif #ifndef NO_JSObjectGetPropertyAtIndex -extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSObjectGetPropertyAtIndex)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLongArray arg3); -JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSObjectGetPropertyAtIndex) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLongArray arg3) +extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSObjectGetPropertyAtIndex)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jlongArray arg3); +JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSObjectGetPropertyAtIndex) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jlongArray arg3) { - jintLong *lparg3=NULL; - jintLong rc = 0; + jlong *lparg3=NULL; + jlong rc = 0; WebKit_win32_NATIVE_ENTER(env, that, JSObjectGetPropertyAtIndex_FUNC); - if (arg3) if ((lparg3 = env->GetIntLongArrayElements(arg3, NULL)) == NULL) goto fail; - rc = (jintLong)JSObjectGetPropertyAtIndex((JSContextRef)arg0, (JSObjectRef)arg1, (unsigned)arg2, (JSValueRef*)lparg3); + if (arg3) if ((lparg3 = env->GetLongArrayElements(arg3, NULL)) == NULL) goto fail; + rc = (jlong)JSObjectGetPropertyAtIndex((JSContextRef)arg0, (JSObjectRef)arg1, (unsigned)arg2, (JSValueRef*)lparg3); fail: - if (arg3 && lparg3) env->ReleaseIntLongArrayElements(arg3, lparg3, 0); + if (arg3 && lparg3) env->ReleaseLongArrayElements(arg3, lparg3, 0); WebKit_win32_NATIVE_EXIT(env, that, JSObjectGetPropertyAtIndex_FUNC); return rc; } #endif #ifndef NO_JSObjectMake -extern "C" JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSObjectMake)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2); +extern "C" JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSObjectMake)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2); JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSObjectMake) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2) { jint rc = 0; WebKit_win32_NATIVE_ENTER(env, that, JSObjectMake_FUNC); @@ -484,29 +484,29 @@ JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSObjectMake) #endif #ifndef NO_JSObjectMakeArray -extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSObjectMakeArray)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3); -JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSObjectMakeArray) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3) +extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSObjectMakeArray)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlongArray arg2, jlongArray arg3); +JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSObjectMakeArray) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlongArray arg2, jlongArray arg3) { - jintLong *lparg2=NULL; - jintLong *lparg3=NULL; - jintLong rc = 0; + jlong *lparg2=NULL; + jlong *lparg3=NULL; + jlong rc = 0; WebKit_win32_NATIVE_ENTER(env, that, JSObjectMakeArray_FUNC); - if (arg2) if ((lparg2 = env->GetIntLongArrayElements(arg2, NULL)) == NULL) goto fail; - if (arg3) if ((lparg3 = env->GetIntLongArrayElements(arg3, NULL)) == NULL) goto fail; - rc = (jintLong)JSObjectMakeArray((JSContextRef)arg0, (size_t)arg1, (const struct OpaqueJSValue * const*)lparg2, (JSValueRef*)lparg3); + if (arg2) if ((lparg2 = env->GetLongArrayElements(arg2, NULL)) == NULL) goto fail; + if (arg3) if ((lparg3 = env->GetLongArrayElements(arg3, NULL)) == NULL) goto fail; + rc = (jlong)JSObjectMakeArray((JSContextRef)arg0, (size_t)arg1, (const struct OpaqueJSValue * const*)lparg2, (JSValueRef*)lparg3); fail: - if (arg3 && lparg3) env->ReleaseIntLongArrayElements(arg3, lparg3, 0); - if (arg2 && lparg2) env->ReleaseIntLongArrayElements(arg2, lparg2, 0); + if (arg3 && lparg3) env->ReleaseLongArrayElements(arg3, lparg3, 0); + if (arg2 && lparg2) env->ReleaseLongArrayElements(arg2, lparg2, 0); WebKit_win32_NATIVE_EXIT(env, that, JSObjectMakeArray_FUNC); return rc; } #endif #ifndef NO_JSObjectMakeFunctionWithCallback -extern "C" JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSObjectMakeFunctionWithCallback)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2); +extern "C" JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSObjectMakeFunctionWithCallback)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2); JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSObjectMakeFunctionWithCallback) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2) { jint rc = 0; WebKit_win32_NATIVE_ENTER(env, that, JSObjectMakeFunctionWithCallback_FUNC); @@ -517,30 +517,30 @@ JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSObjectMakeFunctionWithCallback) #endif #ifndef NO_JSObjectSetProperty -extern "C" JNIEXPORT void JNICALL WebKit_win32_NATIVE(JSObjectSetProperty)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLongArray arg5); +extern "C" JNIEXPORT void JNICALL WebKit_win32_NATIVE(JSObjectSetProperty)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4, jlongArray arg5); JNIEXPORT void JNICALL WebKit_win32_NATIVE(JSObjectSetProperty) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLongArray arg5) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4, jlongArray arg5) { - jintLong *lparg5=NULL; + jlong *lparg5=NULL; WebKit_win32_NATIVE_ENTER(env, that, JSObjectSetProperty_FUNC); - if (arg5) if ((lparg5 = env->GetIntLongArrayElements(arg5, NULL)) == NULL) goto fail; + if (arg5) if ((lparg5 = env->GetLongArrayElements(arg5, NULL)) == NULL) goto fail; JSObjectSetProperty((JSContextRef)arg0, (JSObjectRef)arg1, (JSStringRef)arg2, (JSValueRef)arg3, (JSPropertyAttributes)arg4, (JSValueRef *)lparg5); fail: - if (arg5 && lparg5) env->ReleaseIntLongArrayElements(arg5, lparg5, 0); + if (arg5 && lparg5) env->ReleaseLongArrayElements(arg5, lparg5, 0); WebKit_win32_NATIVE_EXIT(env, that, JSObjectSetProperty_FUNC); } #endif #ifndef NO_JSStringCreateWithUTF8CString -extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSStringCreateWithUTF8CString)(JNIEnv *env, jclass that, jbyteArray arg0); -JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSStringCreateWithUTF8CString) +extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSStringCreateWithUTF8CString)(JNIEnv *env, jclass that, jbyteArray arg0); +JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSStringCreateWithUTF8CString) (JNIEnv *env, jclass that, jbyteArray arg0) { jbyte *lparg0=NULL; - jintLong rc = 0; + jlong rc = 0; WebKit_win32_NATIVE_ENTER(env, that, JSStringCreateWithUTF8CString_FUNC); if (arg0) if ((lparg0 = env->GetByteArrayElements(arg0, NULL)) == NULL) goto fail; - rc = (jintLong)JSStringCreateWithUTF8CString((const char*)lparg0); + rc = (jlong)JSStringCreateWithUTF8CString((const char*)lparg0); fail: if (arg0 && lparg0) env->ReleaseByteArrayElements(arg0, lparg0, 0); WebKit_win32_NATIVE_EXIT(env, that, JSStringCreateWithUTF8CString_FUNC); @@ -549,9 +549,9 @@ fail: #endif #ifndef NO_JSStringGetLength -extern "C" JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSStringGetLength)(JNIEnv *env, jclass that, jintLong arg0); +extern "C" JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSStringGetLength)(JNIEnv *env, jclass that, jlong arg0); JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSStringGetLength) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; WebKit_win32_NATIVE_ENTER(env, that, JSStringGetLength_FUNC); @@ -562,22 +562,22 @@ JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSStringGetLength) #endif #ifndef NO_JSStringGetMaximumUTF8CStringSize -extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSStringGetMaximumUTF8CStringSize)(JNIEnv *env, jclass that, jintLong arg0); -JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSStringGetMaximumUTF8CStringSize) - (JNIEnv *env, jclass that, jintLong arg0) +extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSStringGetMaximumUTF8CStringSize)(JNIEnv *env, jclass that, jlong arg0); +JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSStringGetMaximumUTF8CStringSize) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKit_win32_NATIVE_ENTER(env, that, JSStringGetMaximumUTF8CStringSize_FUNC); - rc = (jintLong)JSStringGetMaximumUTF8CStringSize((JSStringRef)arg0); + rc = (jlong)JSStringGetMaximumUTF8CStringSize((JSStringRef)arg0); WebKit_win32_NATIVE_EXIT(env, that, JSStringGetMaximumUTF8CStringSize_FUNC); return rc; } #endif #ifndef NO_JSStringGetUTF8CString -extern "C" JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSStringGetUTF8CString)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2); +extern "C" JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSStringGetUTF8CString)(JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlong arg2); JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSStringGetUTF8CString) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlong arg2) { jbyte *lparg1=NULL; jint rc = 0; @@ -592,9 +592,9 @@ fail: #endif #ifndef NO_JSStringIsEqualToUTF8CString -extern "C" JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSStringIsEqualToUTF8CString)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1); +extern "C" JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSStringIsEqualToUTF8CString)(JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1); JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSStringIsEqualToUTF8CString) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1) { jbyte *lparg1=NULL; jint rc = 0; @@ -609,9 +609,9 @@ fail: #endif #ifndef NO_JSStringRelease -extern "C" JNIEXPORT void JNICALL WebKit_win32_NATIVE(JSStringRelease)(JNIEnv *env, jclass that, jintLong arg0); +extern "C" JNIEXPORT void JNICALL WebKit_win32_NATIVE(JSStringRelease)(JNIEnv *env, jclass that, jlong arg0); JNIEXPORT void JNICALL WebKit_win32_NATIVE(JSStringRelease) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { WebKit_win32_NATIVE_ENTER(env, that, JSStringRelease_FUNC); JSStringRelease((JSStringRef)arg0); @@ -620,9 +620,9 @@ JNIEXPORT void JNICALL WebKit_win32_NATIVE(JSStringRelease) #endif #ifndef NO_JSValueGetType -extern "C" JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSValueGetType)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1); +extern "C" JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSValueGetType)(JNIEnv *env, jclass that, jlong arg0, jlong arg1); JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSValueGetType) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { jint rc = 0; WebKit_win32_NATIVE_ENTER(env, that, JSValueGetType_FUNC); @@ -633,9 +633,9 @@ JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSValueGetType) #endif #ifndef NO_JSValueIsObjectOfClass -extern "C" JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSValueIsObjectOfClass)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2); +extern "C" JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSValueIsObjectOfClass)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2); JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSValueIsObjectOfClass) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2) { jint rc = 0; WebKit_win32_NATIVE_ENTER(env, that, JSValueIsObjectOfClass_FUNC); @@ -646,134 +646,134 @@ JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSValueIsObjectOfClass) #endif #ifndef NO_JSValueMakeBoolean -extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSValueMakeBoolean)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1); -JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSValueMakeBoolean) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) +extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSValueMakeBoolean)(JNIEnv *env, jclass that, jlong arg0, jlong arg1); +JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSValueMakeBoolean) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { - jintLong rc = 0; + jlong rc = 0; WebKit_win32_NATIVE_ENTER(env, that, JSValueMakeBoolean_FUNC); - rc = (jintLong)JSValueMakeBoolean((JSContextRef)arg0, (bool)arg1); + rc = (jlong)JSValueMakeBoolean((JSContextRef)arg0, (bool)arg1); WebKit_win32_NATIVE_EXIT(env, that, JSValueMakeBoolean_FUNC); return rc; } #endif #ifndef NO_JSValueMakeNull -extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSValueMakeNull)(JNIEnv *env, jclass that, jintLong arg0); -JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSValueMakeNull) - (JNIEnv *env, jclass that, jintLong arg0) +extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSValueMakeNull)(JNIEnv *env, jclass that, jlong arg0); +JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSValueMakeNull) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKit_win32_NATIVE_ENTER(env, that, JSValueMakeNull_FUNC); - rc = (jintLong)JSValueMakeNull((JSContextRef)arg0); + rc = (jlong)JSValueMakeNull((JSContextRef)arg0); WebKit_win32_NATIVE_EXIT(env, that, JSValueMakeNull_FUNC); return rc; } #endif #ifndef NO_JSValueMakeNumber -extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSValueMakeNumber)(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1); -JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSValueMakeNumber) - (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1) +extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSValueMakeNumber)(JNIEnv *env, jclass that, jlong arg0, jdouble arg1); +JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSValueMakeNumber) + (JNIEnv *env, jclass that, jlong arg0, jdouble arg1) { - jintLong rc = 0; + jlong rc = 0; WebKit_win32_NATIVE_ENTER(env, that, JSValueMakeNumber_FUNC); - rc = (jintLong)JSValueMakeNumber((JSContextRef)arg0, (double)arg1); + rc = (jlong)JSValueMakeNumber((JSContextRef)arg0, (double)arg1); WebKit_win32_NATIVE_EXIT(env, that, JSValueMakeNumber_FUNC); return rc; } #endif #ifndef NO_JSValueMakeString -extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSValueMakeString)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1); -JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSValueMakeString) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) +extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSValueMakeString)(JNIEnv *env, jclass that, jlong arg0, jlong arg1); +JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSValueMakeString) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { - jintLong rc = 0; + jlong rc = 0; WebKit_win32_NATIVE_ENTER(env, that, JSValueMakeString_FUNC); - rc = (jintLong)JSValueMakeString((JSContextRef)arg0, (JSStringRef)arg1); + rc = (jlong)JSValueMakeString((JSContextRef)arg0, (JSStringRef)arg1); WebKit_win32_NATIVE_EXIT(env, that, JSValueMakeString_FUNC); return rc; } #endif #ifndef NO_JSValueMakeUndefined -extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSValueMakeUndefined)(JNIEnv *env, jclass that, jintLong arg0); -JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSValueMakeUndefined) - (JNIEnv *env, jclass that, jintLong arg0) +extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSValueMakeUndefined)(JNIEnv *env, jclass that, jlong arg0); +JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSValueMakeUndefined) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKit_win32_NATIVE_ENTER(env, that, JSValueMakeUndefined_FUNC); - rc = (jintLong)JSValueMakeUndefined((JSContextRef)arg0); + rc = (jlong)JSValueMakeUndefined((JSContextRef)arg0); WebKit_win32_NATIVE_EXIT(env, that, JSValueMakeUndefined_FUNC); return rc; } #endif #ifndef NO_JSValueToNumber -extern "C" JNIEXPORT jdouble JNICALL WebKit_win32_NATIVE(JSValueToNumber)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2); +extern "C" JNIEXPORT jdouble JNICALL WebKit_win32_NATIVE(JSValueToNumber)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlongArray arg2); JNIEXPORT jdouble JNICALL WebKit_win32_NATIVE(JSValueToNumber) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlongArray arg2) { - jintLong *lparg2=NULL; + jlong *lparg2=NULL; jdouble rc = 0; WebKit_win32_NATIVE_ENTER(env, that, JSValueToNumber_FUNC); - if (arg2) if ((lparg2 = env->GetIntLongArrayElements(arg2, NULL)) == NULL) goto fail; + if (arg2) if ((lparg2 = env->GetLongArrayElements(arg2, NULL)) == NULL) goto fail; rc = (jdouble)JSValueToNumber((JSContextRef)arg0, (JSValueRef)arg1, (JSValueRef*)lparg2); fail: - if (arg2 && lparg2) env->ReleaseIntLongArrayElements(arg2, lparg2, 0); + if (arg2 && lparg2) env->ReleaseLongArrayElements(arg2, lparg2, 0); WebKit_win32_NATIVE_EXIT(env, that, JSValueToNumber_FUNC); return rc; } #endif #ifndef NO_JSValueToStringCopy -extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSValueToStringCopy)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2); -JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSValueToStringCopy) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2) +extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSValueToStringCopy)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlongArray arg2); +JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSValueToStringCopy) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlongArray arg2) { - jintLong *lparg2=NULL; - jintLong rc = 0; + jlong *lparg2=NULL; + jlong rc = 0; WebKit_win32_NATIVE_ENTER(env, that, JSValueToStringCopy_FUNC); - if (arg2) if ((lparg2 = env->GetIntLongArrayElements(arg2, NULL)) == NULL) goto fail; - rc = (jintLong)JSValueToStringCopy((JSContextRef)arg0, (JSValueRef)arg1, (JSValueRef*)lparg2); + if (arg2) if ((lparg2 = env->GetLongArrayElements(arg2, NULL)) == NULL) goto fail; + rc = (jlong)JSValueToStringCopy((JSContextRef)arg0, (JSValueRef)arg1, (JSValueRef*)lparg2); fail: - if (arg2 && lparg2) env->ReleaseIntLongArrayElements(arg2, lparg2, 0); + if (arg2 && lparg2) env->ReleaseLongArrayElements(arg2, lparg2, 0); WebKit_win32_NATIVE_EXIT(env, that, JSValueToStringCopy_FUNC); return rc; } #endif #ifndef NO_kCFCopyStringDictionaryKeyCallBacks -extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(kCFCopyStringDictionaryKeyCallBacks)(JNIEnv *env, jclass that); -JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(kCFCopyStringDictionaryKeyCallBacks) +extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(kCFCopyStringDictionaryKeyCallBacks)(JNIEnv *env, jclass that); +JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(kCFCopyStringDictionaryKeyCallBacks) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; WebKit_win32_NATIVE_ENTER(env, that, kCFCopyStringDictionaryKeyCallBacks_FUNC); - rc = (jintLong)&kCFCopyStringDictionaryKeyCallBacks; + rc = (jlong)&kCFCopyStringDictionaryKeyCallBacks; WebKit_win32_NATIVE_EXIT(env, that, kCFCopyStringDictionaryKeyCallBacks_FUNC); return rc; } #endif #ifndef NO_kCFTypeDictionaryValueCallBacks -extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(kCFTypeDictionaryValueCallBacks)(JNIEnv *env, jclass that); -JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(kCFTypeDictionaryValueCallBacks) +extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(kCFTypeDictionaryValueCallBacks)(JNIEnv *env, jclass that); +JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(kCFTypeDictionaryValueCallBacks) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; WebKit_win32_NATIVE_ENTER(env, that, kCFTypeDictionaryValueCallBacks_FUNC); - rc = (jintLong)&kCFTypeDictionaryValueCallBacks; + rc = (jlong)&kCFTypeDictionaryValueCallBacks; WebKit_win32_NATIVE_EXIT(env, that, kCFTypeDictionaryValueCallBacks_FUNC); return rc; } #endif #ifndef NO_memmove -extern "C" JNIEXPORT void JNICALL WebKit_win32_NATIVE(memmove)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2); +extern "C" JNIEXPORT void JNICALL WebKit_win32_NATIVE(memmove)(JNIEnv *env, jclass that, jlong arg0, jobject arg1, jlong arg2); JNIEXPORT void JNICALL WebKit_win32_NATIVE(memmove) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jlong arg2) { JSClassDefinition _arg1, *lparg1=NULL; WebKit_win32_NATIVE_ENTER(env, that, memmove_FUNC); diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library/webkit_win32_structs.cpp b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library/webkit_win32_structs.cpp index c0a9efea4c..782dc5e93b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library/webkit_win32_structs.cpp +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library/webkit_win32_structs.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2016 IBM Corporation and others. All rights reserved. + * Copyright (c) 2009, 2019 IBM Corporation and others. All rights reserved. * The contents of this file are made available under the terms * of the GNU Lesser General Public License (LGPL) Version 2.1 that * accompanies this distribution (lgpl-v21.txt). The LGPL is also @@ -34,21 +34,21 @@ void cacheJSClassDefinitionFields(JNIEnv *env, jobject lpObject) JSClassDefinitionFc.clazz = env->GetObjectClass(lpObject); JSClassDefinitionFc.version = env->GetFieldID(JSClassDefinitionFc.clazz, "version", "I"); JSClassDefinitionFc.attributes = env->GetFieldID(JSClassDefinitionFc.clazz, "attributes", "I"); - JSClassDefinitionFc.className = env->GetFieldID(JSClassDefinitionFc.clazz, "className", I_J); - JSClassDefinitionFc.parentClass = env->GetFieldID(JSClassDefinitionFc.clazz, "parentClass", I_J); - JSClassDefinitionFc.staticValues = env->GetFieldID(JSClassDefinitionFc.clazz, "staticValues", I_J); - JSClassDefinitionFc.staticFunctions = env->GetFieldID(JSClassDefinitionFc.clazz, "staticFunctions", I_J); - JSClassDefinitionFc.initialize = env->GetFieldID(JSClassDefinitionFc.clazz, "initialize", I_J); - JSClassDefinitionFc.finalize = env->GetFieldID(JSClassDefinitionFc.clazz, "finalize", I_J); - JSClassDefinitionFc.hasProperty = env->GetFieldID(JSClassDefinitionFc.clazz, "hasProperty", I_J); - JSClassDefinitionFc.getProperty = env->GetFieldID(JSClassDefinitionFc.clazz, "getProperty", I_J); - JSClassDefinitionFc.setProperty = env->GetFieldID(JSClassDefinitionFc.clazz, "setProperty", I_J); - JSClassDefinitionFc.deleteProperty = env->GetFieldID(JSClassDefinitionFc.clazz, "deleteProperty", I_J); - JSClassDefinitionFc.getPropertyNames = env->GetFieldID(JSClassDefinitionFc.clazz, "getPropertyNames", I_J); - JSClassDefinitionFc.callAsFunction = env->GetFieldID(JSClassDefinitionFc.clazz, "callAsFunction", I_J); - JSClassDefinitionFc.callAsConstructor = env->GetFieldID(JSClassDefinitionFc.clazz, "callAsConstructor", I_J); - JSClassDefinitionFc.hasInstance = env->GetFieldID(JSClassDefinitionFc.clazz, "hasInstance", I_J); - JSClassDefinitionFc.convertToType = env->GetFieldID(JSClassDefinitionFc.clazz, "convertToType", I_J); + JSClassDefinitionFc.className = env->GetFieldID(JSClassDefinitionFc.clazz, "className", "J"); + JSClassDefinitionFc.parentClass = env->GetFieldID(JSClassDefinitionFc.clazz, "parentClass", "J"); + JSClassDefinitionFc.staticValues = env->GetFieldID(JSClassDefinitionFc.clazz, "staticValues", "J"); + JSClassDefinitionFc.staticFunctions = env->GetFieldID(JSClassDefinitionFc.clazz, "staticFunctions", "J"); + JSClassDefinitionFc.initialize = env->GetFieldID(JSClassDefinitionFc.clazz, "initialize", "J"); + JSClassDefinitionFc.finalize = env->GetFieldID(JSClassDefinitionFc.clazz, "finalize", "J"); + JSClassDefinitionFc.hasProperty = env->GetFieldID(JSClassDefinitionFc.clazz, "hasProperty", "J"); + JSClassDefinitionFc.getProperty = env->GetFieldID(JSClassDefinitionFc.clazz, "getProperty", "J"); + JSClassDefinitionFc.setProperty = env->GetFieldID(JSClassDefinitionFc.clazz, "setProperty", "J"); + JSClassDefinitionFc.deleteProperty = env->GetFieldID(JSClassDefinitionFc.clazz, "deleteProperty", "J"); + JSClassDefinitionFc.getPropertyNames = env->GetFieldID(JSClassDefinitionFc.clazz, "getPropertyNames", "J"); + JSClassDefinitionFc.callAsFunction = env->GetFieldID(JSClassDefinitionFc.clazz, "callAsFunction", "J"); + JSClassDefinitionFc.callAsConstructor = env->GetFieldID(JSClassDefinitionFc.clazz, "callAsConstructor", "J"); + JSClassDefinitionFc.hasInstance = env->GetFieldID(JSClassDefinitionFc.clazz, "hasInstance", "J"); + JSClassDefinitionFc.convertToType = env->GetFieldID(JSClassDefinitionFc.clazz, "convertToType", "J"); JSClassDefinitionFc.cached = 1; } @@ -57,21 +57,21 @@ JSClassDefinition *getJSClassDefinitionFields(JNIEnv *env, jobject lpObject, JSC if (!JSClassDefinitionFc.cached) cacheJSClassDefinitionFields(env, lpObject); lpStruct->version = env->GetIntField(lpObject, JSClassDefinitionFc.version); lpStruct->attributes = (JSClassAttributes)env->GetIntField(lpObject, JSClassDefinitionFc.attributes); - lpStruct->className = (const char*)env->GetIntLongField(lpObject, JSClassDefinitionFc.className); - lpStruct->parentClass = (JSClassRef)env->GetIntLongField(lpObject, JSClassDefinitionFc.parentClass); - lpStruct->staticValues = (const JSStaticValue*)env->GetIntLongField(lpObject, JSClassDefinitionFc.staticValues); - lpStruct->staticFunctions = (const JSStaticFunction*)env->GetIntLongField(lpObject, JSClassDefinitionFc.staticFunctions); - lpStruct->initialize = (JSObjectInitializeCallback)env->GetIntLongField(lpObject, JSClassDefinitionFc.initialize); - lpStruct->finalize = (JSObjectFinalizeCallback)env->GetIntLongField(lpObject, JSClassDefinitionFc.finalize); - lpStruct->hasProperty = (JSObjectHasPropertyCallback)env->GetIntLongField(lpObject, JSClassDefinitionFc.hasProperty); - lpStruct->getProperty = (JSObjectGetPropertyCallback)env->GetIntLongField(lpObject, JSClassDefinitionFc.getProperty); - lpStruct->setProperty = (JSObjectSetPropertyCallback)env->GetIntLongField(lpObject, JSClassDefinitionFc.setProperty); - lpStruct->deleteProperty = (JSObjectDeletePropertyCallback)env->GetIntLongField(lpObject, JSClassDefinitionFc.deleteProperty); - lpStruct->getPropertyNames = (JSObjectGetPropertyNamesCallback)env->GetIntLongField(lpObject, JSClassDefinitionFc.getPropertyNames); - lpStruct->callAsFunction = (JSObjectCallAsFunctionCallback)env->GetIntLongField(lpObject, JSClassDefinitionFc.callAsFunction); - lpStruct->callAsConstructor = (JSObjectCallAsConstructorCallback)env->GetIntLongField(lpObject, JSClassDefinitionFc.callAsConstructor); - lpStruct->hasInstance = (JSObjectHasInstanceCallback)env->GetIntLongField(lpObject, JSClassDefinitionFc.hasInstance); - lpStruct->convertToType = (JSObjectConvertToTypeCallback)env->GetIntLongField(lpObject, JSClassDefinitionFc.convertToType); + lpStruct->className = (const char*)env->GetLongField(lpObject, JSClassDefinitionFc.className); + lpStruct->parentClass = (JSClassRef)env->GetLongField(lpObject, JSClassDefinitionFc.parentClass); + lpStruct->staticValues = (const JSStaticValue*)env->GetLongField(lpObject, JSClassDefinitionFc.staticValues); + lpStruct->staticFunctions = (const JSStaticFunction*)env->GetLongField(lpObject, JSClassDefinitionFc.staticFunctions); + lpStruct->initialize = (JSObjectInitializeCallback)env->GetLongField(lpObject, JSClassDefinitionFc.initialize); + lpStruct->finalize = (JSObjectFinalizeCallback)env->GetLongField(lpObject, JSClassDefinitionFc.finalize); + lpStruct->hasProperty = (JSObjectHasPropertyCallback)env->GetLongField(lpObject, JSClassDefinitionFc.hasProperty); + lpStruct->getProperty = (JSObjectGetPropertyCallback)env->GetLongField(lpObject, JSClassDefinitionFc.getProperty); + lpStruct->setProperty = (JSObjectSetPropertyCallback)env->GetLongField(lpObject, JSClassDefinitionFc.setProperty); + lpStruct->deleteProperty = (JSObjectDeletePropertyCallback)env->GetLongField(lpObject, JSClassDefinitionFc.deleteProperty); + lpStruct->getPropertyNames = (JSObjectGetPropertyNamesCallback)env->GetLongField(lpObject, JSClassDefinitionFc.getPropertyNames); + lpStruct->callAsFunction = (JSObjectCallAsFunctionCallback)env->GetLongField(lpObject, JSClassDefinitionFc.callAsFunction); + lpStruct->callAsConstructor = (JSObjectCallAsConstructorCallback)env->GetLongField(lpObject, JSClassDefinitionFc.callAsConstructor); + lpStruct->hasInstance = (JSObjectHasInstanceCallback)env->GetLongField(lpObject, JSClassDefinitionFc.hasInstance); + lpStruct->convertToType = (JSObjectConvertToTypeCallback)env->GetLongField(lpObject, JSClassDefinitionFc.convertToType); return lpStruct; } @@ -80,21 +80,21 @@ void setJSClassDefinitionFields(JNIEnv *env, jobject lpObject, JSClassDefinition if (!JSClassDefinitionFc.cached) cacheJSClassDefinitionFields(env, lpObject); env->SetIntField(lpObject, JSClassDefinitionFc.version, (jint)lpStruct->version); env->SetIntField(lpObject, JSClassDefinitionFc.attributes, (jint)lpStruct->attributes); - env->SetIntLongField(lpObject, JSClassDefinitionFc.className, (jintLong)lpStruct->className); - env->SetIntLongField(lpObject, JSClassDefinitionFc.parentClass, (jintLong)lpStruct->parentClass); - env->SetIntLongField(lpObject, JSClassDefinitionFc.staticValues, (jintLong)lpStruct->staticValues); - env->SetIntLongField(lpObject, JSClassDefinitionFc.staticFunctions, (jintLong)lpStruct->staticFunctions); - env->SetIntLongField(lpObject, JSClassDefinitionFc.initialize, (jintLong)lpStruct->initialize); - env->SetIntLongField(lpObject, JSClassDefinitionFc.finalize, (jintLong)lpStruct->finalize); - env->SetIntLongField(lpObject, JSClassDefinitionFc.hasProperty, (jintLong)lpStruct->hasProperty); - env->SetIntLongField(lpObject, JSClassDefinitionFc.getProperty, (jintLong)lpStruct->getProperty); - env->SetIntLongField(lpObject, JSClassDefinitionFc.setProperty, (jintLong)lpStruct->setProperty); - env->SetIntLongField(lpObject, JSClassDefinitionFc.deleteProperty, (jintLong)lpStruct->deleteProperty); - env->SetIntLongField(lpObject, JSClassDefinitionFc.getPropertyNames, (jintLong)lpStruct->getPropertyNames); - env->SetIntLongField(lpObject, JSClassDefinitionFc.callAsFunction, (jintLong)lpStruct->callAsFunction); - env->SetIntLongField(lpObject, JSClassDefinitionFc.callAsConstructor, (jintLong)lpStruct->callAsConstructor); - env->SetIntLongField(lpObject, JSClassDefinitionFc.hasInstance, (jintLong)lpStruct->hasInstance); - env->SetIntLongField(lpObject, JSClassDefinitionFc.convertToType, (jintLong)lpStruct->convertToType); + env->SetLongField(lpObject, JSClassDefinitionFc.className, (jlong)lpStruct->className); + env->SetLongField(lpObject, JSClassDefinitionFc.parentClass, (jlong)lpStruct->parentClass); + env->SetLongField(lpObject, JSClassDefinitionFc.staticValues, (jlong)lpStruct->staticValues); + env->SetLongField(lpObject, JSClassDefinitionFc.staticFunctions, (jlong)lpStruct->staticFunctions); + env->SetLongField(lpObject, JSClassDefinitionFc.initialize, (jlong)lpStruct->initialize); + env->SetLongField(lpObject, JSClassDefinitionFc.finalize, (jlong)lpStruct->finalize); + env->SetLongField(lpObject, JSClassDefinitionFc.hasProperty, (jlong)lpStruct->hasProperty); + env->SetLongField(lpObject, JSClassDefinitionFc.getProperty, (jlong)lpStruct->getProperty); + env->SetLongField(lpObject, JSClassDefinitionFc.setProperty, (jlong)lpStruct->setProperty); + env->SetLongField(lpObject, JSClassDefinitionFc.deleteProperty, (jlong)lpStruct->deleteProperty); + env->SetLongField(lpObject, JSClassDefinitionFc.getPropertyNames, (jlong)lpStruct->getPropertyNames); + env->SetLongField(lpObject, JSClassDefinitionFc.callAsFunction, (jlong)lpStruct->callAsFunction); + env->SetLongField(lpObject, JSClassDefinitionFc.callAsConstructor, (jlong)lpStruct->callAsConstructor); + env->SetLongField(lpObject, JSClassDefinitionFc.hasInstance, (jlong)lpStruct->hasInstance); + env->SetLongField(lpObject, JSClassDefinitionFc.convertToType, (jlong)lpStruct->convertToType); } #endif diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebDownloadDelegate.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebDownloadDelegate.java index 822938173a..eaf177a547 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebDownloadDelegate.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebDownloadDelegate.java @@ -50,39 +50,39 @@ int AddRef () { void createCOMInterfaces () { iWebDownloadDelegate = new COMObject (new int[] {2, 0, 0, 2, 2, 2, 2, 2, 2, 2, 3, 3, 4, 1, 1}) { @Override - public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);} + public long method0 (long[] args) {return QueryInterface (args[0], args[1]);} @Override - public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();} + public long method1 (long[] args) {return AddRef ();} @Override - public long /*int*/ method2 (long /*int*/[] args) {return Release ();} + public long method2 (long[] args) {return Release ();} @Override - public long /*int*/ method3 (long /*int*/[] args) {return decideDestinationWithSuggestedFilename (args[0], args[1]);} + public long method3 (long[] args) {return decideDestinationWithSuggestedFilename (args[0], args[1]);} @Override - public long /*int*/ method4 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long method4 (long[] args) {return COM.E_NOTIMPL;} @Override - public long /*int*/ method5 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long method5 (long[] args) {return COM.E_NOTIMPL;} @Override - public long /*int*/ method6 (long /*int*/[] args) {return didFailWithError (args[0], args[1]);} + public long method6 (long[] args) {return didFailWithError (args[0], args[1]);} @Override - public long /*int*/ method7 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long method7 (long[] args) {return COM.E_NOTIMPL;} @Override - public long /*int*/ method8 (long /*int*/[] args) {return didReceiveDataOfLength (args[0], (int)/*64*/args[1]);} + public long method8 (long[] args) {return didReceiveDataOfLength (args[0], (int)args[1]);} @Override - public long /*int*/ method9 (long /*int*/[] args) {return didReceiveResponse (args[0], args[1]);} + public long method9 (long[] args) {return didReceiveResponse (args[0], args[1]);} @Override - public long /*int*/ method10 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long method10 (long[] args) {return COM.E_NOTIMPL;} @Override - public long /*int*/ method11 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long method11 (long[] args) {return COM.E_NOTIMPL;} @Override - public long /*int*/ method12 (long /*int*/[] args) {return willSendRequest (args[0], args[1], args[2], args[3]);} + public long method12 (long[] args) {return willSendRequest (args[0], args[1], args[2], args[3]);} @Override - public long /*int*/ method13 (long /*int*/[] args) {return didBegin (args[0]);} + public long method13 (long[] args) {return didBegin (args[0]);} @Override - public long /*int*/ method14 (long /*int*/[] args) {return didFinish (args[0]);} + public long method14 (long[] args) {return didFinish (args[0]);} }; } -int decideDestinationWithSuggestedFilename (long /*int*/ download, long /*int*/ filename) { +int decideDestinationWithSuggestedFilename (long download, long filename) { String name = WebKit.extractBSTR (filename); FileDialog dialog = new FileDialog (browser.getShell(), SWT.SAVE); dialog.setText (SWT.getMessage ("SWT_FileDownload")); //$NON-NLS-1$ @@ -108,7 +108,7 @@ int decideDestinationWithSuggestedFilename (long /*int*/ download, long /*int*/ return COM.S_OK; } -int didBegin (long /*int*/ download) { +int didBegin (long download) { new IWebDownload (download).AddRef (); status = -1; size = 0; @@ -117,30 +117,30 @@ int didBegin (long /*int*/ download) { return COM.S_OK; } -int didFailWithError (long /*int*/ download, long /*int*/ error) { +int didFailWithError (long download, long error) { new IWebDownload (download).Release (); status = DOWNLOAD_ERROR; return COM.S_OK; } -int didFinish (long /*int*/ download) { +int didFinish (long download) { new IWebDownload (download).Release (); status = DOWNLOAD_FINISHED; return COM.S_OK; } -int didReceiveDataOfLength (long /*int*/ download, int length) { +int didReceiveDataOfLength (long download, int length) { size += length; return COM.S_OK; } -int didReceiveResponse (long /*int*/ download, long /*int*/ response) { +int didReceiveResponse (long download, long response) { if (response != 0) { IWebURLResponse urlResponse = new IWebURLResponse (response); long[] size = new long[1]; int hr = urlResponse.expectedContentLength (size); if (hr == COM.S_OK) totalSize = size[0]; - long /*int*/[] result = new long /*int*/[1]; + long[] result = new long[1]; hr = urlResponse.URL (result); if (hr == COM.S_OK && result[0] != 0) { url = WebKit.extractBSTR (result[0]); @@ -157,7 +157,7 @@ void disposeCOMInterfaces () { } } -long /*int*/ getAddress () { +long getAddress () { return iWebDownloadDelegate.getAddress (); } @@ -224,23 +224,23 @@ void openDownloadWindow (final IWebDownload download, String name) { shell.open (); } -int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) { +int QueryInterface (long riid, long ppvObject) { if (riid == 0 || ppvObject == 0) return COM.E_INVALIDARG; GUID guid = new GUID (); COM.MoveMemory (guid, riid, GUID.sizeof); if (COM.IsEqualGUID (guid, COM.IIDIUnknown)) { - OS.MoveMemory (ppvObject, new long /*int*/[] {iWebDownloadDelegate.getAddress ()}, C.PTR_SIZEOF); + OS.MoveMemory (ppvObject, new long[] {iWebDownloadDelegate.getAddress ()}, C.PTR_SIZEOF); new IUnknown (iWebDownloadDelegate.getAddress ()).AddRef (); return COM.S_OK; } if (COM.IsEqualGUID (guid, WebKit_win32.IID_IWebDownloadDelegate)) { - OS.MoveMemory (ppvObject, new long /*int*/[] {iWebDownloadDelegate.getAddress ()}, C.PTR_SIZEOF); + OS.MoveMemory (ppvObject, new long[] {iWebDownloadDelegate.getAddress ()}, C.PTR_SIZEOF); new IUnknown (iWebDownloadDelegate.getAddress ()).AddRef (); return COM.S_OK; } - OS.MoveMemory (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF); + OS.MoveMemory (ppvObject, new long[] {0}, C.PTR_SIZEOF); return COM.E_NOINTERFACE; } @@ -252,10 +252,10 @@ int Release () { return refCount; } -int willSendRequest (long /*int*/ download, long /*int*/ request, long /*int*/ redirectResponse, long /*int*/ finalRequest) { +int willSendRequest (long download, long request, long redirectResponse, long finalRequest) { IWebMutableURLRequest req = new IWebMutableURLRequest (request); req.AddRef (); - OS.MoveMemory (finalRequest, new long /*int*/[] {request}, C.PTR_SIZEOF); + OS.MoveMemory (finalRequest, new long[] {request}, C.PTR_SIZEOF); return COM.S_OK; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebFrameLoadDelegate.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebFrameLoadDelegate.java index f15cfa6e31..6ab93ca60e 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebFrameLoadDelegate.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebFrameLoadDelegate.java @@ -87,54 +87,54 @@ int AddRef () { void createCOMInterfaces () { iWebFrameLoadDelegate = new COMObject (new int[] {2, 0, 0, 2, 2, 3, 2, 3, 3, 2, 3, 2, 5, 2, 2, 3, 4}) { @Override - public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);} + public long method0 (long[] args) {return QueryInterface (args[0], args[1]);} @Override - public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();} + public long method1 (long[] args) {return AddRef ();} @Override - public long /*int*/ method2 (long /*int*/[] args) {return Release ();} + public long method2 (long[] args) {return Release ();} @Override - public long /*int*/ method3 (long /*int*/[] args) {return didStartProvisionalLoadForFrame (args[0], args[1]);} + public long method3 (long[] args) {return didStartProvisionalLoadForFrame (args[0], args[1]);} @Override - public long /*int*/ method4 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long method4 (long[] args) {return COM.E_NOTIMPL;} @Override - public long /*int*/ method5 (long /*int*/[] args) {return didFailProvisionalLoadWithError (args[0], args[1], args[2]);} + public long method5 (long[] args) {return didFailProvisionalLoadWithError (args[0], args[1], args[2]);} @Override - public long /*int*/ method6 (long /*int*/[] args) {return didCommitLoadForFrame (args[0], args[1]);} + public long method6 (long[] args) {return didCommitLoadForFrame (args[0], args[1]);} @Override - public long /*int*/ method7 (long /*int*/[] args) {return didReceiveTitle (args[0], args[1], args[2]);} + public long method7 (long[] args) {return didReceiveTitle (args[0], args[1], args[2]);} @Override - public long /*int*/ method8 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long method8 (long[] args) {return COM.E_NOTIMPL;} @Override - public long /*int*/ method9 (long /*int*/[] args) {return didFinishLoadForFrame (args[0], args[1]);} + public long method9 (long[] args) {return didFinishLoadForFrame (args[0], args[1]);} @Override - public long /*int*/ method10 (long /*int*/[] args){return COM.E_NOTIMPL;} + public long method10 (long[] args){return COM.E_NOTIMPL;} @Override - public long /*int*/ method11 (long /*int*/[] args){return didChangeLocationWithinPageForFrame (args[0], args[1]);} + public long method11 (long[] args){return didChangeLocationWithinPageForFrame (args[0], args[1]);} @Override - public long /*int*/ method12 (long /*int*/[] args){return COM.S_OK;} + public long method12 (long[] args){return COM.S_OK;} @Override - public long /*int*/ method13 (long /*int*/[] args){return COM.E_NOTIMPL;} + public long method13 (long[] args){return COM.E_NOTIMPL;} @Override - public long /*int*/ method14 (long /*int*/[] args){return COM.S_OK;} + public long method14 (long[] args){return COM.S_OK;} @Override - public long /*int*/ method15 (long /*int*/[] args){return COM.S_OK;} + public long method15 (long[] args){return COM.S_OK;} @Override - public long /*int*/ method16 (long /*int*/[] args){return didClearWindowObject (args[0], args[1], args[2], args[3]);} + public long method16 (long[] args){return didClearWindowObject (args[0], args[1], args[2], args[3]);} }; /* Callbacks that take double parameters require custom callbacks that instead pass pointers to the doubles. */ - long /*int*/ ppVtable = iWebFrameLoadDelegate.ppVtable; - long /*int*/[] pVtable = new long /*int*/[1]; + long ppVtable = iWebFrameLoadDelegate.ppVtable; + long[] pVtable = new long[1]; OS.MoveMemory (pVtable, ppVtable, C.PTR_SIZEOF); - long /*int*/[] funcs = new long /*int*/[17]; + long[] funcs = new long[17]; OS.MoveMemory (funcs, pVtable[0], C.PTR_SIZEOF * funcs.length); funcs[12] = WebKit_win32.willPerformClientRedirectToURL_CALLBACK (funcs[12]); OS.MoveMemory (pVtable[0], funcs, C.PTR_SIZEOF * funcs.length); } -int didChangeLocationWithinPageForFrame (long /*int*/ webView, long /*int*/ frame) { +int didChangeLocationWithinPageForFrame (long webView, long frame) { IWebFrame iwebframe = new IWebFrame (frame); - long /*int*/[] result = new long /*int*/[1]; + long[] result = new long[1]; int hr = iwebframe.dataSource (result); if (hr != COM.S_OK || result[0] == 0) { return COM.S_OK; @@ -200,13 +200,13 @@ int didChangeLocationWithinPageForFrame (long /*int*/ webView, long /*int*/ fram return COM.S_OK; } -int didClearWindowObject (long /*int*/ webView, long /*int*/ context, long /*int*/ windowScriptObject, long /*int*/ frame) { +int didClearWindowObject (long webView, long context, long windowScriptObject, long frame) { WebKit_win32.JSGlobalContextRetain (context); - long /*int*/ globalObject = WebKit_win32.JSContextGetGlobalObject (context); - long /*int*/ privateData = ((WebKit)browser.webBrowser).webViewData; - long /*int*/ externalObject = WebKit_win32.JSObjectMake (context, WebKit.ExternalClass, privateData); + long globalObject = WebKit_win32.JSContextGetGlobalObject (context); + long privateData = ((WebKit)browser.webBrowser).webViewData; + long externalObject = WebKit_win32.JSObjectMake (context, WebKit.ExternalClass, privateData); byte[] bytes = (OBJECTNAME_EXTERNAL + '\0').getBytes (StandardCharsets.UTF_8); - long /*int*/ name = WebKit_win32.JSStringCreateWithUTF8CString (bytes); + long name = WebKit_win32.JSStringCreateWithUTF8CString (bytes); WebKit_win32.JSObjectSetProperty (context, globalObject, name, externalObject, 0, null); WebKit_win32.JSStringRelease (name); @@ -215,7 +215,7 @@ int didClearWindowObject (long /*int*/ webView, long /*int*/ context, long /*int } IWebView iwebView = new IWebView (webView); - long /*int*/[] mainFrame = new long /*int*/[1]; + long[] mainFrame = new long[1]; iwebView.mainFrame (mainFrame); boolean top = mainFrame[0] == frame; new IWebFrame (mainFrame[0]).Release (); @@ -223,9 +223,9 @@ int didClearWindowObject (long /*int*/ webView, long /*int*/ context, long /*int return COM.S_OK; } -int didCommitLoadForFrame (long /*int*/ webview, long /*int*/ frame) { +int didCommitLoadForFrame (long webview, long frame) { IWebFrame iWebFrame = new IWebFrame (frame); - long /*int*/[] result = new long /*int*/[1]; + long[] result = new long[1]; int hr = iWebFrame.dataSource (result); if (hr != COM.S_OK || result[0] == 0) { return COM.S_OK; @@ -319,14 +319,14 @@ int didCommitLoadForFrame (long /*int*/ webview, long /*int*/ frame) { return COM.S_OK; } -int didFailProvisionalLoadWithError (long /*int*/ webView, long /*int*/ error, long /*int*/ frame) { +int didFailProvisionalLoadWithError (long webView, long error, long frame) { IWebError iweberror = new IWebError (error); int[] errorCode = new int[1]; int hr = iweberror.code (errorCode); if (WebKit_win32.WebURLErrorBadURL < errorCode[0]) return COM.S_OK; String failingURLString = null; - long /*int*/[] failingURL = new long /*int*/[1]; + long[] failingURL = new long[1]; hr = iweberror.failingURL (failingURL); if (hr == COM.S_OK && failingURL[0] != 0) { failingURLString = WebKit.extractBSTR (failingURL[0]); @@ -334,7 +334,7 @@ int didFailProvisionalLoadWithError (long /*int*/ webView, long /*int*/ error, l } if (failingURLString != null && WebKit_win32.WebURLErrorServerCertificateNotYetValid <= errorCode[0] && errorCode[0] <= WebKit_win32.WebURLErrorSecureConnectionFailed) { /* handle invalid certificate error */ - long /*int*/[] result = new long /*int*/[1]; + long[] result = new long[1]; hr = iweberror.localizedDescription (result); if (hr != COM.S_OK || result[0] == 0) { return COM.S_OK; @@ -350,7 +350,7 @@ int didFailProvisionalLoadWithError (long /*int*/ webView, long /*int*/ error, l IWebErrorPrivate webErrorPrivate = new IWebErrorPrivate (result[0]); result[0] = 0; - long /*int*/[] certificate = new long /*int*/[1]; + long[] certificate = new long[1]; hr = webErrorPrivate.sslPeerCertificate (certificate); webErrorPrivate.Release (); if (hr != COM.S_OK || certificate[0] == 0) { @@ -374,7 +374,7 @@ int didFailProvisionalLoadWithError (long /*int*/ webView, long /*int*/ error, l } /* handle other types of errors */ - long /*int*/[] result = new long /*int*/[1]; + long[] result = new long[1]; hr = iweberror.localizedDescription (result); if (hr != COM.S_OK || result[0] == 0) { return COM.S_OK; @@ -391,9 +391,9 @@ int didFailProvisionalLoadWithError (long /*int*/ webView, long /*int*/ error, l return COM.S_OK; } -int didFinishLoadForFrame (long /*int*/ webview, long /*int*/ frame) { +int didFinishLoadForFrame (long webview, long frame) { IWebView iWebView = new IWebView (webview); - long /*int*/[] iWebFrame = new long /*int*/[1]; + long[] iWebFrame = new long[1]; int hr = iWebView.mainFrame (iWebFrame); if (hr != COM.S_OK || iWebFrame[0] == 0) { return COM.S_OK; @@ -409,8 +409,8 @@ int didFinishLoadForFrame (long /*int*/ webview, long /*int*/ frame) { if (html != null) { if (getUrl ().startsWith (WebKit.ABOUT_BLANK)) { ((WebKit)browser.webBrowser).loadingText = true; - long /*int*/ string = WebKit.createBSTR (html); - long /*int*/ URLString; + long string = WebKit.createBSTR (html); + long URLString; if (((WebKit)browser.webBrowser).untrustedText) { URLString = WebKit.createBSTR (WebKit.ABOUT_BLANK); } else { @@ -438,7 +438,7 @@ int didFinishLoadForFrame (long /*int*/ webview, long /*int*/ frame) { */ Display display = browser.getDisplay (); IWebFrame mainFrame = new IWebFrame (frame); - long /*int*/[] result = new long /*int*/[1]; + long[] result = new long[1]; hr = mainFrame.dataSource (result); if (hr != COM.S_OK || result[0] == 0) { return COM.S_OK; @@ -482,8 +482,8 @@ int didFinishLoadForFrame (long /*int*/ webview, long /*int*/ frame) { return COM.S_OK; } -int didReceiveTitle (long /*int*/ webView, long /*int*/ title, long /*int*/ frame) { - long /*int*/[] mainFrame = new long /*int*/[1]; +int didReceiveTitle (long webView, long title, long frame) { + long[] mainFrame = new long[1]; IWebView iWebView = new IWebView (webView); int hr = iWebView.mainFrame (mainFrame); if (hr != COM.S_OK || frame == 0) { @@ -504,7 +504,7 @@ int didReceiveTitle (long /*int*/ webView, long /*int*/ title, long /*int*/ fram return COM.S_OK; } -int didStartProvisionalLoadForFrame (long /*int*/ webView, long /*int*/ frame) { +int didStartProvisionalLoadForFrame (long webView, long frame) { return COM.S_OK; } @@ -515,7 +515,7 @@ void disposeCOMInterfaces () { } } -long /*int*/ getAddress () { +long getAddress () { return iWebFrameLoadDelegate.getAddress (); } @@ -525,23 +525,23 @@ String getUrl () { return url; } -int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) { +int QueryInterface (long riid, long ppvObject) { if (riid == 0 || ppvObject == 0) return COM.E_INVALIDARG; GUID guid = new GUID (); COM.MoveMemory (guid, riid, GUID.sizeof); if (COM.IsEqualGUID (guid, COM.IIDIUnknown)) { - OS.MoveMemory (ppvObject, new long /*int*/[] {iWebFrameLoadDelegate.getAddress ()}, C.PTR_SIZEOF); + OS.MoveMemory (ppvObject, new long[] {iWebFrameLoadDelegate.getAddress ()}, C.PTR_SIZEOF); new IUnknown (iWebFrameLoadDelegate.getAddress ()).AddRef (); return COM.S_OK; } if (COM.IsEqualGUID (guid, WebKit_win32.IID_IWebFrameLoadDelegate)) { - OS.MoveMemory (ppvObject, new long /*int*/[] {iWebFrameLoadDelegate.getAddress ()}, C.PTR_SIZEOF); + OS.MoveMemory (ppvObject, new long[] {iWebFrameLoadDelegate.getAddress ()}, C.PTR_SIZEOF); new IUnknown (iWebFrameLoadDelegate.getAddress ()).AddRef (); return COM.S_OK; } - OS.MoveMemory (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF); + OS.MoveMemory (ppvObject, new long[] {0}, C.PTR_SIZEOF); return COM.E_NOINTERFACE; } @@ -553,7 +553,7 @@ int Release () { return refCount; } -boolean showCertificateDialog (long /*int*/ webView, final String failingUrlString, final String description, final long /*int*/ certificate) { +boolean showCertificateDialog (long webView, final String failingUrlString, final String description, final long certificate) { Shell parent = browser.getShell (); final Shell shell = new Shell (parent, SWT.APPLICATION_MODAL | SWT.DIALOG_TRIM); shell.setText (Compatibility.getMessage ("SWT_InvalidCert_Title")); //$NON-NLS-1$ @@ -629,7 +629,7 @@ boolean showCertificateDialog (long /*int*/ webView, final String failingUrlStri return result[0]; } -void showCertificate (Shell parent, long /*int*/ certificate) { +void showCertificate (Shell parent, long certificate) { CERT_CONTEXT context = new CERT_CONTEXT (); OS.MoveMemory (context, certificate, CERT_CONTEXT.sizeof); CERT_INFO info = new CERT_INFO (); diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebKit.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebKit.java index 829f49f037..e935db206b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebKit.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebKit.java @@ -29,7 +29,7 @@ import org.eclipse.swt.widgets.*; class WebKit extends WebBrowser { IWebView webView; - long /*int*/ webViewWindowHandle, webViewData; + long webViewWindowHandle, webViewData; int refCount = 0; int lastKeyCode, lastCharCode; @@ -48,7 +48,7 @@ class WebKit extends WebBrowser { BrowserFunction eventFunction; static int prefsIdentifier; - static long /*int*/ ExternalClass; + static long ExternalClass; static boolean LibraryLoaded = false; static String LibraryLoadError; static Callback JSObjectHasPropertyProc; @@ -147,24 +147,24 @@ static { if (JSObjectCallAsFunctionProc.getAddress () == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS); NativeClearSessions = () -> { - long /*int*/[] result = new long /*int*/[1]; + long[] result = new long[1]; int hr = WebKit_win32.WebKitCreateInstance (WebKit_win32.CLSID_WebCookieManager, 0, WebKit_win32.IID_IWebCookieManager, result); if (hr != COM.S_OK || result[0] == 0) { return; } IWebCookieManager cookieManager = new IWebCookieManager (result[0]); - long /*int*/[] storage = new long /*int*/[1]; + long[] storage = new long[1]; hr = cookieManager.cookieStorage (storage); cookieManager.Release (); if (hr != COM.S_OK || storage[0] == 0) { return; } - long /*int*/ cookies = WebKit_win32.CFHTTPCookieStorageCopyCookies (storage[0]); + long cookies = WebKit_win32.CFHTTPCookieStorageCopyCookies (storage[0]); if (cookies != 0) { int count = WebKit_win32.CFArrayGetCount (cookies); for (int i = 0; i < count; i++) { - long /*int*/ cookie = WebKit_win32.CFArrayGetValueAtIndex (cookies, i); - long /*int*/ flags = WebKit_win32.CFHTTPCookieGetFlags (cookie); + long cookie = WebKit_win32.CFArrayGetValueAtIndex (cookies, i); + long flags = WebKit_win32.CFHTTPCookieGetFlags (cookie); if ((flags & WebKit_win32.CFHTTPCookieSessionOnlyFlag) != 0) { WebKit_win32.CFHTTPCookieStorageDeleteCookie (storage[0], cookie); } @@ -175,35 +175,35 @@ static { }; NativeGetCookie = () -> { - long /*int*/[] result = new long /*int*/[1]; + long[] result = new long[1]; int hr = WebKit_win32.WebKitCreateInstance (WebKit_win32.CLSID_WebCookieManager, 0, WebKit_win32.IID_IWebCookieManager, result); if (hr != COM.S_OK || result[0] == 0) { return; } IWebCookieManager cookieManager = new IWebCookieManager (result[0]); - long /*int*/[] storage = new long /*int*/[1]; + long[] storage = new long[1]; hr = cookieManager.cookieStorage (storage); cookieManager.Release (); if (hr != COM.S_OK || storage[0] == 0) { return; } char[] chars = CookieUrl.toCharArray (); - long /*int*/ string = WebKit_win32.CFStringCreateWithCharacters (0, chars, chars.length); + long string = WebKit_win32.CFStringCreateWithCharacters (0, chars, chars.length); if (string != 0) { - long /*int*/ cfUrl = WebKit_win32.CFURLCreateWithString (0, string, 0); + long cfUrl = WebKit_win32.CFURLCreateWithString (0, string, 0); if (cfUrl != 0) { boolean secure = CookieUrl.startsWith (PROTOCOL_HTTPS); - long /*int*/ cookiesArray = WebKit_win32.CFHTTPCookieStorageCopyCookiesForURL (storage[0], cfUrl, secure); + long cookiesArray = WebKit_win32.CFHTTPCookieStorageCopyCookiesForURL (storage[0], cfUrl, secure); if (cookiesArray != 0) { int count = WebKit_win32.CFArrayGetCount (cookiesArray); for (int i = 0; i < count; i++) { - long /*int*/ cookie = WebKit_win32.CFArrayGetValueAtIndex (cookiesArray, i); + long cookie = WebKit_win32.CFArrayGetValueAtIndex (cookiesArray, i); if (cookie != 0) { - long /*int*/ cookieName = WebKit_win32.CFHTTPCookieGetName (cookie); + long cookieName = WebKit_win32.CFHTTPCookieGetName (cookie); if (cookieName != 0) { String name = stringFromCFString (cookieName); if (CookieName.equals (name)) { - long /*int*/ value = WebKit_win32.CFHTTPCookieGetValue (cookie); + long value = WebKit_win32.CFHTTPCookieGetValue (cookie); if (value != 0) CookieValue = stringFromCFString (value); break; } @@ -220,13 +220,13 @@ static { }; NativeSetCookie = () -> { - long /*int*/[] result = new long /*int*/[1]; + long[] result = new long[1]; int hr = WebKit_win32.WebKitCreateInstance (WebKit_win32.CLSID_WebCookieManager, 0, WebKit_win32.IID_IWebCookieManager, result); if (hr != COM.S_OK || result[0] == 0) { return; } IWebCookieManager cookieManager = new IWebCookieManager (result[0]); - long /*int*/[] storage = new long /*int*/[1]; + long[] storage = new long[1]; hr = cookieManager.cookieStorage (storage); cookieManager.Release (); if (hr != COM.S_OK || storage[0] == 0) { @@ -234,21 +234,21 @@ static { } char[] chars = CookieUrl.toCharArray (); - long /*int*/ string = WebKit_win32.CFStringCreateWithCharacters (0, chars, chars.length); + long string = WebKit_win32.CFStringCreateWithCharacters (0, chars, chars.length); if (string != 0) { - long /*int*/ cfUrl = WebKit_win32.CFURLCreateWithString (0, string, 0); + long cfUrl = WebKit_win32.CFURLCreateWithString (0, string, 0); if (cfUrl != 0) { chars = CookieValue.toCharArray (); - long /*int*/ value = WebKit_win32.CFStringCreateWithCharacters (0, chars, chars.length); + long value = WebKit_win32.CFStringCreateWithCharacters (0, chars, chars.length); if (value != 0) { chars = HEADER_SETCOOKIE.toCharArray (); - long /*int*/ key = WebKit_win32.CFStringCreateWithCharacters (0, chars, chars.length); + long key = WebKit_win32.CFStringCreateWithCharacters (0, chars, chars.length); if (key != 0) { - long /*int*/ headers = WebKit_win32.CFDictionaryCreate (0, new long /*int*/[] {key}, new long /*int*/[] {value}, 1, WebKit_win32.kCFCopyStringDictionaryKeyCallBacks (), WebKit_win32.kCFTypeDictionaryValueCallBacks ()); + long headers = WebKit_win32.CFDictionaryCreate (0, new long[] {key}, new long[] {value}, 1, WebKit_win32.kCFCopyStringDictionaryKeyCallBacks (), WebKit_win32.kCFTypeDictionaryValueCallBacks ()); if (headers != 0) { - long /*int*/ cookies = WebKit_win32.CFHTTPCookieCreateWithResponseHeaderFields (0, headers, cfUrl); + long cookies = WebKit_win32.CFHTTPCookieCreateWithResponseHeaderFields (0, headers, cfUrl); if (cookies != 0) { - long /*int*/ cookie = WebKit_win32.CFArrayGetValueAtIndex (cookies, 0); + long cookie = WebKit_win32.CFArrayGetValueAtIndex (cookies, 0); if (cookie != 0) { WebKit_win32.CFHTTPCookieStorageSetCookie (storage[0], cookie); CookieResult = true; @@ -275,7 +275,7 @@ static { } } -static long /*int*/ createBSTR (String string) { +static long createBSTR (String string) { char[] data = (string + '\0').toCharArray (); return COM.SysAllocString (data); } @@ -284,7 +284,7 @@ static String error (int code) { throw new SWTError ("WebKit error " + code); //$NON-NLS-1$ } -static String extractBSTR (long /*int*/ bstrString) { +static String extractBSTR (long bstrString) { int size = COM.SysStringByteLen (bstrString); if (size == 0) return EMPTY_STRING; char[] buffer = new char[(size + 1) / 2]; // add one to avoid rounding errors @@ -292,10 +292,10 @@ static String extractBSTR (long /*int*/ bstrString) { return new String (buffer); } -static Browser findBrowser (long /*int*/ webView) { +static Browser findBrowser (long webView) { if (webView == 0) return null; IWebView iwebView = new IWebView (webView); - long /*int*/[] result = new long /*int*/[1]; + long[] result = new long[1]; int hr = iwebView.hostWindow (result); if (hr == COM.S_OK && result[0] != 0) { Widget widget = Display.getCurrent ().findWidget (result[0]); @@ -304,13 +304,13 @@ static Browser findBrowser (long /*int*/ webView) { return null; } -static long /*int*/ JSObjectCallAsFunctionProc (long /*int*/ ctx, long /*int*/ function, long /*int*/ thisObject, long /*int*/ argumentCount, long /*int*/ arguments, long /*int*/ exception) { +static long JSObjectCallAsFunctionProc (long ctx, long function, long thisObject, long argumentCount, long arguments, long exception) { WebKit_win32.JSGlobalContextRetain (ctx); if (WebKit_win32.JSValueIsObjectOfClass (ctx, thisObject, ExternalClass) == 0) { return WebKit_win32.JSValueMakeUndefined (ctx); } - long /*int*/ ptr = WebKit_win32.JSObjectGetPrivate (thisObject); - long /*int*/[] handle = new long /*int*/[1]; + long ptr = WebKit_win32.JSObjectGetPrivate (thisObject); + long[] handle = new long[1]; C.memmove (handle, ptr, C.PTR_SIZEOF); Browser browser = findBrowser (handle[0]); if (browser == null) return WebKit_win32.JSValueMakeUndefined (ctx); @@ -318,22 +318,22 @@ static long /*int*/ JSObjectCallAsFunctionProc (long /*int*/ ctx, long /*int*/ f return webkit.callJava (ctx, function, thisObject, argumentCount, arguments, exception); } -static long /*int*/ JSObjectGetPropertyProc (long /*int*/ ctx, long /*int*/ object, long /*int*/ propertyName, long /*int*/ exception) { +static long JSObjectGetPropertyProc (long ctx, long object, long propertyName, long exception) { byte[] bytes = (FUNCTIONNAME_CALLJAVA + '\0').getBytes (StandardCharsets.UTF_8); - long /*int*/ name = WebKit_win32.JSStringCreateWithUTF8CString (bytes); - long /*int*/ addr = WebKit_win32.JSObjectCallAsFunctionProc_CALLBACK (WebKit.JSObjectCallAsFunctionProc.getAddress ()); - long /*int*/ function = WebKit_win32.JSObjectMakeFunctionWithCallback (ctx, name, addr); + long name = WebKit_win32.JSStringCreateWithUTF8CString (bytes); + long addr = WebKit_win32.JSObjectCallAsFunctionProc_CALLBACK (WebKit.JSObjectCallAsFunctionProc.getAddress ()); + long function = WebKit_win32.JSObjectMakeFunctionWithCallback (ctx, name, addr); WebKit_win32.JSStringRelease (name); return function; } -static long /*int*/ JSObjectHasPropertyProc (long /*int*/ ctx, long /*int*/ object, long /*int*/ propertyName) { +static long JSObjectHasPropertyProc (long ctx, long object, long propertyName) { byte[] bytes = (FUNCTIONNAME_CALLJAVA + '\0').getBytes (StandardCharsets.UTF_8); return WebKit_win32.JSStringIsEqualToUTF8CString (propertyName, bytes); } static String readInstallDir (String keyString) { - long /*int*/[] phkResult = new long /*int*/[1]; + long[] phkResult = new long[1]; TCHAR key = new TCHAR (0, keyString, true); if (OS.RegOpenKeyEx (OS.HKEY_LOCAL_MACHINE, key, 0, OS.KEY_READ, phkResult) == 0) { int[] lpcbData = new int[1]; @@ -352,10 +352,10 @@ static String readInstallDir (String keyString) { return null; } -static String stringFromCFString (long /*int*/ cfString) { +static String stringFromCFString (long cfString) { if (cfString == 0) return null; int length = WebKit_win32.CFStringGetLength (cfString); - long /*int*/ ptr = WebKit_win32.CFStringGetCharactersPtr (cfString); + long ptr = WebKit_win32.CFStringGetCharactersPtr (cfString); char[] chars = new char[length]; if (ptr != 0) { OS.MoveMemory (chars, ptr, length); @@ -367,7 +367,7 @@ static String stringFromCFString (long /*int*/ cfString) { return new String (chars); } -static String stringFromJSString (long /*int*/ jsString) { +static String stringFromJSString (long jsString) { if (jsString == 0) return null; int length = WebKit_win32.JSStringGetLength (jsString); byte[] bytes = new byte[length + 1]; @@ -382,10 +382,10 @@ public boolean back () { return result[0] != 0; } -long /*int*/ callJava (long /*int*/ ctx, long /*int*/ func, long /*int*/ thisObject, long /*int*/ argumentCount, long /*int*/ arguments, long /*int*/ exception) { +long callJava (long ctx, long func, long thisObject, long argumentCount, long arguments, long exception) { Object returnValue = null; if (argumentCount == 3) { - long /*int*/[] result = new long /*int*/[1]; + long[] result = new long[1]; C.memmove (result, arguments, C.PTR_SIZEOF); int type = WebKit_win32.JSValueGetType (ctx, result[0]); if (type == WebKit_win32.kJSTypeNumber) { @@ -431,7 +431,7 @@ public boolean close () { return shouldClose (); } -Object convertToJava (long /*int*/ ctx, long /*int*/ value) { +Object convertToJava (long ctx, long value) { int type = WebKit_win32.JSValueGetType (ctx, value); switch (type) { case WebKit_win32.kJSTypeBoolean: { @@ -443,29 +443,29 @@ Object convertToJava (long /*int*/ ctx, long /*int*/ value) { return result; } case WebKit_win32.kJSTypeString: { - long /*int*/ string = WebKit_win32.JSValueToStringCopy (ctx, value, null); + long string = WebKit_win32.JSValueToStringCopy (ctx, value, null); if (string == 0) return ""; //$NON-NLS-1$ - long /*int*/ length = WebKit_win32.JSStringGetMaximumUTF8CStringSize (string); - byte[] bytes = new byte[(int)/*64*/length]; + long length = WebKit_win32.JSStringGetMaximumUTF8CStringSize (string); + byte[] bytes = new byte[(int)length]; length = WebKit_win32.JSStringGetUTF8CString (string, bytes, length); WebKit_win32.JSStringRelease (string); /* length-1 is needed below to exclude the terminator character */ - return new String (bytes, 0, (int)/*64*/length - 1, StandardCharsets.UTF_8); + return new String (bytes, 0, (int)length - 1, StandardCharsets.UTF_8); } case WebKit_win32.kJSTypeNull: // FALL THROUGH case WebKit_win32.kJSTypeUndefined: return null; case WebKit_win32.kJSTypeObject: { byte[] bytes = (PROPERTY_LENGTH + '\0').getBytes (StandardCharsets.UTF_8); - long /*int*/ propertyName = WebKit_win32.JSStringCreateWithUTF8CString (bytes); - long /*int*/ valuePtr = WebKit_win32.JSObjectGetProperty (ctx, value, propertyName, null); + long propertyName = WebKit_win32.JSStringCreateWithUTF8CString (bytes); + long valuePtr = WebKit_win32.JSObjectGetProperty (ctx, value, propertyName, null); WebKit_win32.JSStringRelease (propertyName); type = WebKit_win32.JSValueGetType (ctx, valuePtr); if (type == WebKit_win32.kJSTypeNumber) { int length = (int)WebKit_win32.JSValueToNumber (ctx, valuePtr, null); Object[] result = new Object[length]; for (int i = 0; i < length; i++) { - long /*int*/ current = WebKit_win32.JSObjectGetPropertyAtIndex (ctx, value, i, null); + long current = WebKit_win32.JSObjectGetPropertyAtIndex (ctx, value, i, null); if (current != 0) { result[i] = convertToJava (ctx, current); } @@ -478,14 +478,14 @@ Object convertToJava (long /*int*/ ctx, long /*int*/ value) { return null; } -long /*int*/ convertToJS (long /*int*/ ctx, Object value) { +long convertToJS (long ctx, Object value) { if (value == null) { return WebKit_win32.JSValueMakeNull (ctx); } if (value instanceof String) { byte[] bytes = ((String)value + '\0').getBytes (StandardCharsets.UTF_8); - long /*int*/ stringRef = WebKit_win32.JSStringCreateWithUTF8CString (bytes); - long /*int*/ result = WebKit_win32.JSValueMakeString (ctx, stringRef); + long stringRef = WebKit_win32.JSStringCreateWithUTF8CString (bytes); + long result = WebKit_win32.JSValueMakeString (ctx, stringRef); WebKit_win32.JSStringRelease (stringRef); return result; } @@ -498,10 +498,10 @@ long /*int*/ convertToJS (long /*int*/ ctx, Object value) { if (value instanceof Object[]) { Object[] arrayValue = (Object[]) value; int length = arrayValue.length; - long /*int*/[] arguments = new long /*int*/[length]; + long[] arguments = new long[length]; for (int i = 0; i < length; i++) { Object javaObject = arrayValue[i]; - long /*int*/ jsObject = convertToJS (ctx, javaObject); + long jsObject = convertToJS (ctx, javaObject); arguments[i] = jsObject; } return WebKit_win32.JSObjectMakeArray (ctx, length, arguments, null); @@ -524,18 +524,18 @@ public void create (Composite parent, int style) { C.memmove (jsClassDefinition.className, bytes, bytes.length); /* custom callbacks for hasProperty, getProperty and callAsFunction */ - long /*int*/ addr = WebKit_win32.JSObjectHasPropertyProc_CALLBACK (JSObjectHasPropertyProc.getAddress ()); + long addr = WebKit_win32.JSObjectHasPropertyProc_CALLBACK (JSObjectHasPropertyProc.getAddress ()); jsClassDefinition.hasProperty = addr; addr = WebKit_win32.JSObjectGetPropertyProc_CALLBACK (JSObjectGetPropertyProc.getAddress ()); jsClassDefinition.getProperty = addr; - long /*int*/ classDefinitionPtr = C.malloc (JSClassDefinition.sizeof); + long classDefinitionPtr = C.malloc (JSClassDefinition.sizeof); WebKit_win32.memmove (classDefinitionPtr, jsClassDefinition, JSClassDefinition.sizeof); ExternalClass = WebKit_win32.JSClassCreate (classDefinitionPtr); WebKit_win32.JSClassRetain (ExternalClass); } - long /*int*/[] result = new long /*int*/[1]; + long[] result = new long[1]; int hr = WebKit_win32.WebKitCreateInstance (WebKit_win32.CLSID_WebView, 0, WebKit_win32.IID_IWebView, result); if (hr != COM.S_OK || result[0] == 0) { browser.dispose (); @@ -543,7 +543,7 @@ public void create (Composite parent, int style) { } webView = new IWebView (result[0]); webViewData = C.malloc (C.PTR_SIZEOF); - C.memmove (webViewData, new long /*int*/[] {webView.getAddress ()}, C.PTR_SIZEOF); + C.memmove (webViewData, new long[] {webView.getAddress ()}, C.PTR_SIZEOF); hr = webView.setHostWindow (browser.handle); if (hr != COM.S_OK) { browser.dispose (); @@ -656,27 +656,27 @@ public void create (Composite parent, int style) { @Override public boolean execute (String script) { - long /*int*/[] result = new long /*int*/[1]; + long[] result = new long[1]; int hr = webView.mainFrame (result); if (hr != COM.S_OK || result[0] == 0) { return false; } IWebFrame frame = new IWebFrame (result[0]); - long /*int*/ context = frame.globalContext (); + long context = frame.globalContext (); frame.Release (); if (context == 0) { return false; } byte[] bytes = (script + '\0').getBytes (StandardCharsets.UTF_8); //$NON-NLS-1$ - long /*int*/ scriptString = WebKit_win32.JSStringCreateWithUTF8CString (bytes); + long scriptString = WebKit_win32.JSStringCreateWithUTF8CString (bytes); if (scriptString == 0) return false; bytes = (getUrl () + '\0').getBytes (StandardCharsets.UTF_8); //$NON-NLS-1$ - long /*int*/ urlString = WebKit_win32.JSStringCreateWithUTF8CString (bytes); + long urlString = WebKit_win32.JSStringCreateWithUTF8CString (bytes); if (urlString == 0) { WebKit_win32.JSStringRelease (scriptString); return false; } - long /*int*/ evalResult = WebKit_win32.JSEvaluateScript (context, scriptString, 0, urlString, 0, null); + long evalResult = WebKit_win32.JSEvaluateScript (context, scriptString, 0, urlString, 0, null); WebKit_win32.JSStringRelease (urlString); WebKit_win32.JSStringRelease (scriptString); return evalResult != 0; @@ -696,7 +696,7 @@ public String getBrowserType () { @Override public String getText () { - long /*int*/[] result = new long /*int*/[1]; + long[] result = new long[1]; int hr = webView.mainFrame (result); if (hr != COM.S_OK || result[0] == 0) { return EMPTY_STRING; @@ -980,7 +980,7 @@ boolean handleEvent (Object[] arguments) { @Override public boolean isBackEnabled () { - long /*int*/[] address = new long /*int*/[1]; + long[] address = new long[1]; int hr = webView.QueryInterface (WebKit_win32.IID_IWebIBActions, address); if (hr != COM.S_OK || address[0] == 0) { return false; @@ -994,13 +994,13 @@ public boolean isBackEnabled () { @Override public boolean isFocusControl () { - long /*int*/ hwndFocus = OS.GetFocus (); + long hwndFocus = OS.GetFocus (); return hwndFocus != 0 && hwndFocus == webViewWindowHandle; } @Override public boolean isForwardEnabled () { - long /*int*/[] address = new long /*int*/[1]; + long[] address = new long[1]; int hr = webView.QueryInterface (WebKit_win32.IID_IWebIBActions, address); if (hr != COM.S_OK || address[0] == 0) { return false; @@ -1053,7 +1053,7 @@ void onDispose () { @Override public void refresh () { webFrameLoadDelegate.html = null; - long /*int*/[] result = new long /*int*/[1]; + long[] result = new long[1]; int hr = webView.QueryInterface (WebKit_win32.IID_IWebIBActions, result); if (hr != COM.S_OK || result[0] == 0) { return; @@ -1114,7 +1114,7 @@ public boolean setText (String html, boolean trusted) { untrustedText = !trusted; if (blankLoading) return true; - long /*int*/[] result = new long /*int*/[1]; + long[] result = new long[1]; int hr = webView.mainFrame (result); if (hr != COM.S_OK || result[0] == 0) { return false; @@ -1129,7 +1129,7 @@ public boolean setText (String html, boolean trusted) { } IWebMutableURLRequest request = new IWebMutableURLRequest (result[0]); - long /*int*/ urlString = createBSTR (ABOUT_BLANK); + long urlString = createBSTR (ABOUT_BLANK); hr = request.setURL (urlString); COM.SysFreeString (urlString); @@ -1168,7 +1168,7 @@ public boolean setUrl (String url, String postData, String[] headers) { } webFrameLoadDelegate.html = null; lastNavigateURL = url; - long /*int*/[] result = new long /*int*/[1]; + long[] result = new long[1]; int hr = webView.mainFrame (result); if (hr != COM.S_OK || result[0] == 0) { return false; @@ -1185,7 +1185,7 @@ public boolean setUrl (String url, String postData, String[] headers) { if (postData != null) { //TODO: POST // webResourceLoadDelegate.postData = postData; -// long /*int*/ postString = createBSTR (POST); +// long postString = createBSTR (POST); // hr = request.setHTTPMethod (postString); // COM.SysFreeString (postString); // @@ -1195,12 +1195,12 @@ public boolean setUrl (String url, String postData, String[] headers) { // IWebMutableURLRequestPrivate requestPrivate = new IWebMutableURLRequestPrivate(result[0]); // int cfRequest = requestPrivate.cfRequest(); // byte[] bytes = postData.getBytes(); -// long /*int*/ data = WebKit_win32.CFDataCreate(0, bytes, bytes.length); +// long data = WebKit_win32.CFDataCreate(0, bytes, bytes.length); // if (data != 0)WebKit_win32.CFURLRequestSetHTTPRequestBody(cfRequest, data); // -// long /*int*/ dataGet = WebKit_win32.CFURLRequestCopyHTTPRequestBody(cfRequest); +// long dataGet = WebKit_win32.CFURLRequestCopyHTTPRequestBody(cfRequest); // int length = WebKit_win32.CFDataGetLength(dataGet); -// long /*int*/ bytePtr = WebKit_win32.CFDataGetBytePtr(dataGet); +// long bytePtr = WebKit_win32.CFDataGetBytePtr(dataGet); // } } hr = COM.S_OK; //TODO: once post code is completed, remove this line if not required @@ -1213,7 +1213,7 @@ public boolean setUrl (String url, String postData, String[] headers) { String key = current.substring (0, index).trim (); String value = current.substring (index + 1).trim (); if (key.length () > 0 && value.length () > 0) { - long /*int*/ valueString = createBSTR (value); + long valueString = createBSTR (value); if (key.equalsIgnoreCase (USER_AGENT)) { /* * Feature of WebKit. The user-agent header value cannot be overridden @@ -1222,7 +1222,7 @@ public boolean setUrl (String url, String postData, String[] headers) { */ hr = webView.setCustomUserAgent (valueString); } else { - long /*int*/ keyString = createBSTR (key); + long keyString = createBSTR (key); hr = request.setValue (valueString, keyString); COM.SysFreeString (keyString); } @@ -1233,7 +1233,7 @@ public boolean setUrl (String url, String postData, String[] headers) { } } if (hr == COM.S_OK) { - long /*int*/ urlString = createBSTR (url); + long urlString = createBSTR (url); hr = request.setURL (urlString); COM.SysFreeString (urlString); if (hr == COM.S_OK) { @@ -1249,7 +1249,7 @@ public boolean setUrl (String url, String postData, String[] headers) { boolean shouldClose () { if (!jsEnabled) return true; - long /*int*/[] address = new long /*int*/[1]; + long[] address = new long[1]; int hr = webView.QueryInterface (WebKit_win32.IID_IWebViewPrivate, address); if (hr != COM.S_OK || address[0] == 0) { return false; @@ -1265,7 +1265,7 @@ boolean shouldClose () { @Override public void stop () { webFrameLoadDelegate.html = null; - long /*int*/[] result = new long /*int*/[1]; + long[] result = new long[1]; int hr = webView.QueryInterface (WebKit_win32.IID_IWebIBActions, result); if (hr != COM.S_OK || result[0] == 0) { return; @@ -1280,7 +1280,7 @@ void initializeWebViewPreferences () { * Try to create separate preferences for each webview using different identifier for each webview. * Otherwise all the webviews use the shared preferences. */ - long /*int*/[] result = new long /*int*/[1]; + long[] result = new long[1]; int hr = WebKit_win32.WebKitCreateInstance (WebKit_win32.CLSID_WebPreferences, 0, WebKit_win32.IID_IWebPreferences, result); if (hr == COM.S_OK && result[0] != 0) { IWebPreferences preferences = new IWebPreferences (result[0]); diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebPolicyDelegate.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebPolicyDelegate.java index d09a8fd892..1c63764507 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebPolicyDelegate.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebPolicyDelegate.java @@ -40,23 +40,23 @@ int AddRef () { void createCOMInterfaces () { iWebPolicyDelegate = new COMObject (new int[] {2, 0, 0, 5, 5, 5, 3}) { @Override - public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);} + public long method0 (long[] args) {return QueryInterface (args[0], args[1]);} @Override - public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();} + public long method1 (long[] args) {return AddRef ();} @Override - public long /*int*/ method2 (long /*int*/[] args) {return Release ();} + public long method2 (long[] args) {return Release ();} @Override - public long /*int*/ method3 (long /*int*/[] args) {return decidePolicyForNavigationAction (args[0], args[1], args[2], args[3], args[4]);} + public long method3 (long[] args) {return decidePolicyForNavigationAction (args[0], args[1], args[2], args[3], args[4]);} @Override - public long /*int*/ method4 (long /*int*/[] args) {return decidePolicyForNewWindowAction (args[0], args[1], args[2], args[3], args[4]);} + public long method4 (long[] args) {return decidePolicyForNewWindowAction (args[0], args[1], args[2], args[3], args[4]);} @Override - public long /*int*/ method5 (long /*int*/[] args) {return decidePolicyForMIMEType (args[0], args[1], args[2], args[3], args[4]);} + public long method5 (long[] args) {return decidePolicyForMIMEType (args[0], args[1], args[2], args[3], args[4]);} @Override - public long /*int*/ method6 (long /*int*/[] args) {return unableToImplementPolicyWithError (args[0], args[1], args[2]);} + public long method6 (long[] args) {return unableToImplementPolicyWithError (args[0], args[1], args[2]);} }; } -int decidePolicyForMIMEType (long /*int*/ webView, long /*int*/ type, long /*int*/ request, long /*int*/ frame, long /*int*/ listener) { +int decidePolicyForMIMEType (long webView, long type, long request, long frame, long listener) { IWebView iwebView = new IWebView (webView); int[] canShow = new int[1]; iwebView.canShowMIMEType (type, canShow); @@ -69,9 +69,9 @@ int decidePolicyForMIMEType (long /*int*/ webView, long /*int*/ type, long /*int return COM.S_OK; } -int decidePolicyForNavigationAction (long /*int*/ webView, long /*int*/ actionInformation, long /*int*/ request, long /*int*/ frame, long /*int*/ listener) { +int decidePolicyForNavigationAction (long webView, long actionInformation, long request, long frame, long listener) { IWebURLRequest iwebUrlRequest = new IWebURLRequest (request); - long /*int*/[] result = new long /*int*/[1]; + long[] result = new long[1]; int hr = iwebUrlRequest.URL (result); if (hr != COM.S_OK || result[0] == 0) { return COM.S_OK; @@ -142,7 +142,7 @@ int decidePolicyForNavigationAction (long /*int*/ webView, long /*int*/ actionIn return COM.S_OK; } -int decidePolicyForNewWindowAction (long /*int*/ webView, long /*int*/ actionInformation, long /*int*/ request, long /*int*/ frameName, long /*int*/ listener) { +int decidePolicyForNewWindowAction (long webView, long actionInformation, long request, long frameName, long listener) { IWebPolicyDecisionListener pdListener = new IWebPolicyDecisionListener (listener); pdListener.use(); return COM.S_OK; @@ -155,27 +155,27 @@ protected void disposeCOMInterfaces () { } } -long /*int*/ getAddress () { +long getAddress () { return iWebPolicyDelegate.getAddress (); } -int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) { +int QueryInterface (long riid, long ppvObject) { if (riid == 0 || ppvObject == 0) return COM.E_INVALIDARG; GUID guid = new GUID (); COM.MoveMemory (guid, riid, GUID.sizeof); if (COM.IsEqualGUID (guid, COM.IIDIUnknown)) { - OS.MoveMemory (ppvObject, new long /*int*/[] {iWebPolicyDelegate.getAddress ()}, C.PTR_SIZEOF); + OS.MoveMemory (ppvObject, new long[] {iWebPolicyDelegate.getAddress ()}, C.PTR_SIZEOF); new IUnknown (iWebPolicyDelegate.getAddress ()).AddRef (); return COM.S_OK; } if (COM.IsEqualGUID (guid, WebKit_win32.IID_IWebPolicyDelegate)) { - OS.MoveMemory (ppvObject, new long /*int*/[] {iWebPolicyDelegate.getAddress ()}, C.PTR_SIZEOF); + OS.MoveMemory (ppvObject, new long[] {iWebPolicyDelegate.getAddress ()}, C.PTR_SIZEOF); new IUnknown (iWebPolicyDelegate.getAddress ()).AddRef (); return COM.S_OK; } - OS.MoveMemory (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF); + OS.MoveMemory (ppvObject, new long[] {0}, C.PTR_SIZEOF); return COM.E_NOINTERFACE; } @@ -187,12 +187,12 @@ int Release () { return refCount; } -int unableToImplementPolicyWithError (long /*int*/ webView, long /*int*/ error, long /*int*/ frame) { +int unableToImplementPolicyWithError (long webView, long error, long frame) { if (browser.isDisposed ()) return COM.S_OK; IWebError iweberror = new IWebError (error); String failingURL = null; - long /*int*/[] result = new long /*int*/[1]; + long[] result = new long[1]; int hr = iweberror.failingURL (result); if (hr == COM.S_OK && result[0] != 0) { failingURL = WebKit.extractBSTR (result[0]); diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebResourceLoadDelegate.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebResourceLoadDelegate.java index 3fccfff2c2..9924b6862d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebResourceLoadDelegate.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebResourceLoadDelegate.java @@ -43,33 +43,33 @@ int AddRef () { void createCOMInterfaces () { iWebResourceLoadDelegate = new COMObject (new int[] {2, 0, 0, 4, 6, 4, 4, 4, 4, 3, 4, 3}) { @Override - public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);} + public long method0 (long[] args) {return QueryInterface (args[0], args[1]);} @Override - public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();} + public long method1 (long[] args) {return AddRef ();} @Override - public long /*int*/ method2 (long /*int*/[] args) {return Release ();} + public long method2 (long[] args) {return Release ();} @Override - public long /*int*/ method3 (long /*int*/[] args) {return identifierForInitialRequest (args[0], args[1], args[2], args[3]);} + public long method3 (long[] args) {return identifierForInitialRequest (args[0], args[1], args[2], args[3]);} @Override - public long /*int*/ method4 (long /*int*/[] args) {return willSendRequest (args[0], args[1], args[2], args[3], args[4], args[5]);} + public long method4 (long[] args) {return willSendRequest (args[0], args[1], args[2], args[3], args[4], args[5]);} @Override - public long /*int*/ method5 (long /*int*/[] args) {return didReceiveAuthenticationChallenge (args[0], args[1], args[2], args[3]);} + public long method5 (long[] args) {return didReceiveAuthenticationChallenge (args[0], args[1], args[2], args[3]);} @Override - public long /*int*/ method6 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long method6 (long[] args) {return COM.E_NOTIMPL;} @Override - public long /*int*/ method7 (long /*int*/[] args) {return COM.S_OK;} + public long method7 (long[] args) {return COM.S_OK;} @Override - public long /*int*/ method8 (long /*int*/[] args) {return COM.S_OK;} + public long method8 (long[] args) {return COM.S_OK;} @Override - public long /*int*/ method9 (long /*int*/[] args) {return COM.S_OK;} + public long method9 (long[] args) {return COM.S_OK;} @Override - public long /*int*/ method10 (long /*int*/[] args) {return COM.S_OK;} + public long method10 (long[] args) {return COM.S_OK;} @Override - public long /*int*/ method11 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long method11 (long[] args) {return COM.E_NOTIMPL;} }; } -int didReceiveAuthenticationChallenge (long /*int*/ webView, long /*int*/ identifier, long /*int*/ challenge, long /*int*/ dataSource) { +int didReceiveAuthenticationChallenge (long webView, long identifier, long challenge, long dataSource) { IWebURLAuthenticationChallenge authenticationChallenge = new IWebURLAuthenticationChallenge (challenge); /* * Do not invoke the listeners if this challenge has been failed too many @@ -78,7 +78,7 @@ int didReceiveAuthenticationChallenge (long /*int*/ webView, long /*int*/ identi */ int[] count = new int[1]; int hr = authenticationChallenge.previousFailureCount (count); - long /*int*/[] result = new long /*int*/[1]; + long[] result = new long[1]; if (hr == COM.S_OK && count[0] < 3) { AuthenticationListener[] authenticationListeners = browser.webBrowser.authenticationListeners; for (int i = 0; i < authenticationListeners.length; i++) { @@ -104,8 +104,8 @@ int didReceiveAuthenticationChallenge (long /*int*/ webView, long /*int*/ identi hr = WebKit_win32.WebKitCreateInstance (WebKit_win32.CLSID_WebURLCredential, 0, WebKit_win32.IID_IWebURLCredential, result); if (hr == COM.S_OK && result[0] != 0) { IWebURLCredential credential = new IWebURLCredential (result[0]); - long /*int*/ user = WebKit.createBSTR (event.user); - long /*int*/ password = WebKit.createBSTR (event.password); + long user = WebKit.createBSTR (event.user); + long password = WebKit.createBSTR (event.password); credential.initWithUser (user, password, WebKit_win32.WebURLCredentialPersistenceForSession); challengeSender.useCredential (credential.getAddress (), challenge); credential.Release (); @@ -182,8 +182,8 @@ int didReceiveAuthenticationChallenge (long /*int*/ webView, long /*int*/ identi hr = WebKit_win32.WebKitCreateInstance (WebKit_win32.CLSID_WebURLCredential, 0, WebKit_win32.IID_IWebURLCredential, result); if (hr == COM.S_OK && result[0] != 0) { IWebURLCredential credential = new IWebURLCredential (result[0]); - long /*int*/ user = WebKit.createBSTR (userReturn[0]); - long /*int*/ password = WebKit.createBSTR (passwordReturn[0]); + long user = WebKit.createBSTR (userReturn[0]); + long password = WebKit.createBSTR (passwordReturn[0]); credential.initWithUser (user, password, WebKit_win32.WebURLCredentialPersistenceForSession); challengeSender.useCredential (credential.getAddress (), challenge); credential.Release (); @@ -199,23 +199,23 @@ void disposeCOMInterfaces () { } } -long /*int*/ getAddress () { +long getAddress () { return iWebResourceLoadDelegate.getAddress (); } -int identifierForInitialRequest (long /*int*/ webView, long /*int*/ request, long /*int*/ dataSource, long /*int*/ identifier) { +int identifierForInitialRequest (long webView, long request, long dataSource, long identifier) { if (browser.isDisposed ()) return COM.S_OK; /* send progress event iff request is for top-level frame */ IWebDataSource source = new IWebDataSource (dataSource); - long /*int*/[] frame = new long /*int*/[1]; + long[] frame = new long[1]; int hr = source.webFrame (frame); if (hr != COM.S_OK || frame[0] == 0) { return COM.S_OK; } new IWebFrame (frame[0]).Release (); - long /*int*/[] mainFrame = new long /*int*/[1]; + long[] mainFrame = new long[1]; IWebView iWebView = new IWebView (webView); hr = iWebView.mainFrame (mainFrame); if (hr != COM.S_OK || mainFrame[0] == 0) { @@ -223,7 +223,7 @@ int identifierForInitialRequest (long /*int*/ webView, long /*int*/ request, lon } new IWebFrame (mainFrame[0]).Release (); if (frame[0] == mainFrame[0]) { - long /*int*/ ptr = C.malloc (8); + long ptr = C.malloc (8); iWebView.estimatedProgress (ptr); double[] estimate = new double[1]; OS.MoveMemory (estimate, ptr, 8); @@ -243,23 +243,23 @@ int identifierForInitialRequest (long /*int*/ webView, long /*int*/ request, lon return COM.S_OK; } -int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) { +int QueryInterface (long riid, long ppvObject) { if (riid == 0 || ppvObject == 0) return COM.E_INVALIDARG; GUID guid = new GUID (); COM.MoveMemory (guid, riid, GUID.sizeof); if (COM.IsEqualGUID (guid, COM.IIDIUnknown)) { - OS.MoveMemory (ppvObject, new long /*int*/[] {iWebResourceLoadDelegate.getAddress ()}, C.PTR_SIZEOF); + OS.MoveMemory (ppvObject, new long[] {iWebResourceLoadDelegate.getAddress ()}, C.PTR_SIZEOF); new IUnknown (iWebResourceLoadDelegate.getAddress ()).AddRef (); return COM.S_OK; } if (COM.IsEqualGUID (guid, WebKit_win32.IID_IWebResourceLoadDelegate)) { - OS.MoveMemory (ppvObject, new long /*int*/[] {iWebResourceLoadDelegate.getAddress ()}, C.PTR_SIZEOF); + OS.MoveMemory (ppvObject, new long[] {iWebResourceLoadDelegate.getAddress ()}, C.PTR_SIZEOF); new IUnknown (iWebResourceLoadDelegate.getAddress ()).AddRef (); return COM.S_OK; } - OS.MoveMemory (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF); + OS.MoveMemory (ppvObject, new long[] {0}, C.PTR_SIZEOF); return COM.E_NOINTERFACE; } @@ -348,9 +348,9 @@ boolean showAuthenticationDialog (final String[] user, final String[] password, return result[0]; } -int willSendRequest (long /*int*/ webView, long /*int*/ identifier, long /*int*/ request, long /*int*/ redirectResponse, long /*int*/ dataSource, long /*int*/ newRequest) { +int willSendRequest (long webView, long identifier, long request, long redirectResponse, long dataSource, long newRequest) { IWebURLRequest req = new IWebURLRequest (request); - long /*int*/[] result = new long /*int*/ [1]; + long[] result = new long [1]; int hr = req.URL (result); if (hr == COM.S_OK && result[0] != 0) { String url = WebKit.extractBSTR (result[0]); @@ -367,15 +367,15 @@ int willSendRequest (long /*int*/ webView, long /*int*/ identifier, long /*int*/ hr = req.mutableCopy (result); if (hr == COM.S_OK && result[0] != 0) { IWebMutableURLRequest mReq = new IWebMutableURLRequest (result[0]); - long /*int*/ urlString = WebKit.createBSTR (url); + long urlString = WebKit.createBSTR (url); mReq.setURL (urlString); - OS.MoveMemory (newRequest, new long /*int*/[] {mReq.getAddress ()}, C.PTR_SIZEOF); + OS.MoveMemory (newRequest, new long[] {mReq.getAddress ()}, C.PTR_SIZEOF); return COM.S_OK; } } } req.AddRef (); - OS.MoveMemory (newRequest, new long /*int*/[] {request}, C.PTR_SIZEOF); + OS.MoveMemory (newRequest, new long[] {request}, C.PTR_SIZEOF); return COM.S_OK; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebUIDelegate.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebUIDelegate.java index eb9892cf19..f73d6c67d8 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebUIDelegate.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebUIDelegate.java @@ -45,12 +45,12 @@ int AddRef () { return refCount; } -int canTakeFocus (long /*int*/ sender, int forward, long /*int*/ result) { +int canTakeFocus (long sender, int forward, long result) { OS.MoveMemory (result, new int[] {1}, 4); /* BOOL */ return COM.S_OK; } -int contextMenuItemsForElement (long /*int*/ sender, long /*int*/ element, long /*int*/ defaultItemsHMenu, long /*int*/ resultHMenu) { +int contextMenuItemsForElement (long sender, long element, long defaultItemsHMenu, long resultHMenu) { Point pt = browser.getDisplay ().getCursorLocation (); Event event = new Event (); event.x = pt.x; @@ -64,152 +64,152 @@ int contextMenuItemsForElement (long /*int*/ sender, long /*int*/ element, long } menu.setVisible (true); } else { - OS.MoveMemory (resultHMenu, new long /*int*/[] {defaultItemsHMenu}, C.PTR_SIZEOF); + OS.MoveMemory (resultHMenu, new long[] {defaultItemsHMenu}, C.PTR_SIZEOF); return COM.S_OK; } } - OS.MoveMemory (resultHMenu, new long /*int*/[] {0}, C.PTR_SIZEOF); + OS.MoveMemory (resultHMenu, new long[] {0}, C.PTR_SIZEOF); return COM.S_OK; } void createCOMInterfaces () { iWebUIDelegate = new COMObject (new int[] {2, 0, 0, 3, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 4, 4, 2, 3, 4, 4, 3, 3, 3, 3, 5, 3, 1, 3, 2, 2, 2, 2, 3, 2, 3, 1, 1, 0, 0, 1, 1, 2, 2, 2, 2, 3, 5, 2, 2, 3, 1, 2, 2, 4, 10, 3}) { @Override - public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);} + public long method0 (long[] args) {return QueryInterface (args[0], args[1]);} @Override - public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();} + public long method1 (long[] args) {return AddRef ();} @Override - public long /*int*/ method2 (long /*int*/[] args) {return Release ();} + public long method2 (long[] args) {return Release ();} @Override - public long /*int*/ method3 (long /*int*/[] args) {return createWebViewWithRequest (args[0], args[1], args[2]);} + public long method3 (long[] args) {return createWebViewWithRequest (args[0], args[1], args[2]);} @Override - public long /*int*/ method4 (long /*int*/[] args) {return webViewShow (args[0]);} + public long method4 (long[] args) {return webViewShow (args[0]);} @Override - public long /*int*/ method5 (long /*int*/[] args) {return webViewClose (args[0]);} + public long method5 (long[] args) {return webViewClose (args[0]);} @Override - public long /*int*/ method6 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long method6 (long[] args) {return COM.E_NOTIMPL;} @Override - public long /*int*/ method7 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long method7 (long[] args) {return COM.E_NOTIMPL;} @Override - public long /*int*/ method8 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long method8 (long[] args) {return COM.E_NOTIMPL;} @Override - public long /*int*/ method9 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long method9 (long[] args) {return COM.E_NOTIMPL;} @Override - public long /*int*/ method10 (long /*int*/[] args) {return setStatusText (args[0], args[1]);} + public long method10 (long[] args) {return setStatusText (args[0], args[1]);} @Override - public long /*int*/ method11 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long method11 (long[] args) {return COM.E_NOTIMPL;} @Override - public long /*int*/ method12 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long method12 (long[] args) {return COM.E_NOTIMPL;} @Override - public long /*int*/ method13 (long /*int*/[] args) {return setToolbarsVisible (args[0], (int)/*64*/args[1]);} + public long method13 (long[] args) {return setToolbarsVisible (args[0], (int)args[1]);} @Override - public long /*int*/ method14 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long method14 (long[] args) {return COM.E_NOTIMPL;} @Override - public long /*int*/ method15 (long /*int*/[] args) {return setStatusBarVisible (args[0], (int)/*64*/args[1]);} + public long method15 (long[] args) {return setStatusBarVisible (args[0], (int)args[1]);} @Override - public long /*int*/ method16 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long method16 (long[] args) {return COM.E_NOTIMPL;} @Override - public long /*int*/ method17 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long method17 (long[] args) {return COM.E_NOTIMPL;} @Override - public long /*int*/ method18 (long /*int*/[] args) {return setFrame (args[0], args[1]);} + public long method18 (long[] args) {return setFrame (args[0], args[1]);} @Override - public long /*int*/ method19 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long method19 (long[] args) {return COM.E_NOTIMPL;} @Override - public long /*int*/ method20 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long method20 (long[] args) {return COM.E_NOTIMPL;} @Override - public long /*int*/ method21 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long method21 (long[] args) {return COM.E_NOTIMPL;} @Override - public long /*int*/ method22 (long /*int*/[] args) {return runJavaScriptAlertPanelWithMessage (args[0], args[1]);} + public long method22 (long[] args) {return runJavaScriptAlertPanelWithMessage (args[0], args[1]);} @Override - public long /*int*/ method23 (long /*int*/[] args) {return runJavaScriptConfirmPanelWithMessage (args[0], args[1], args[2]);} + public long method23 (long[] args) {return runJavaScriptConfirmPanelWithMessage (args[0], args[1], args[2]);} @Override - public long /*int*/ method24 (long /*int*/[] args) {return runJavaScriptTextInputPanelWithPrompt (args[0], args[1], args[2], args[3]);} + public long method24 (long[] args) {return runJavaScriptTextInputPanelWithPrompt (args[0], args[1], args[2], args[3]);} @Override - public long /*int*/ method25 (long /*int*/[] args) {return runBeforeUnloadConfirmPanelWithMessage (args[0], args[1], args[2], args[3]);} + public long method25 (long[] args) {return runBeforeUnloadConfirmPanelWithMessage (args[0], args[1], args[2], args[3]);} @Override - public long /*int*/ method26 (long /*int*/[] args) {return runOpenPanelForFileButtonWithResultListener (args[0], args[1]);} + public long method26 (long[] args) {return runOpenPanelForFileButtonWithResultListener (args[0], args[1]);} @Override - public long /*int*/ method27 (long /*int*/[] args) {return mouseDidMoveOverElement (args[0], args[1], (int)/*64*/args[2]);} + public long method27 (long[] args) {return mouseDidMoveOverElement (args[0], args[1], (int)args[2]);} @Override - public long /*int*/ method28 (long /*int*/[] args) {return contextMenuItemsForElement (args[0], args[1], args[2], args[3]);} + public long method28 (long[] args) {return contextMenuItemsForElement (args[0], args[1], args[2], args[3]);} @Override - public long /*int*/ method29 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long method29 (long[] args) {return COM.E_NOTIMPL;} @Override - public long /*int*/ method30 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long method30 (long[] args) {return COM.E_NOTIMPL;} @Override - public long /*int*/ method31 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long method31 (long[] args) {return COM.E_NOTIMPL;} @Override - public long /*int*/ method32 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long method32 (long[] args) {return COM.E_NOTIMPL;} @Override - public long /*int*/ method33 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long method33 (long[] args) {return COM.E_NOTIMPL;} @Override - public long /*int*/ method34 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long method34 (long[] args) {return COM.E_NOTIMPL;} @Override - public long /*int*/ method35 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long method35 (long[] args) {return COM.E_NOTIMPL;} @Override - public long /*int*/ method36 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long method36 (long[] args) {return COM.E_NOTIMPL;} @Override - public long /*int*/ method37 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long method37 (long[] args) {return COM.E_NOTIMPL;} @Override - public long /*int*/ method38 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long method38 (long[] args) {return COM.E_NOTIMPL;} @Override - public long /*int*/ method39 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long method39 (long[] args) {return COM.E_NOTIMPL;} @Override - public long /*int*/ method40 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long method40 (long[] args) {return COM.E_NOTIMPL;} @Override - public long /*int*/ method41 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long method41 (long[] args) {return COM.E_NOTIMPL;} @Override - public long /*int*/ method42 (long /*int*/[] args) {return canTakeFocus (args[0], (int)/*64*/args[1], args[2]);} + public long method42 (long[] args) {return canTakeFocus (args[0], (int)args[1], args[2]);} @Override - public long /*int*/ method43 (long /*int*/[] args) {return takeFocus (args[0], (int)/*64*/args[1]);} + public long method43 (long[] args) {return takeFocus (args[0], (int)args[1]);} @Override - public long /*int*/ method44 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long method44 (long[] args) {return COM.E_NOTIMPL;} @Override - public long /*int*/ method45 (long /*int*/[] args) {return COM.S_OK;} + public long method45 (long[] args) {return COM.S_OK;} @Override - public long /*int*/ method46 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long method46 (long[] args) {return COM.E_NOTIMPL;} @Override - public long /*int*/ method47 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long method47 (long[] args) {return COM.E_NOTIMPL;} @Override - public long /*int*/ method48 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long method48 (long[] args) {return COM.E_NOTIMPL;} @Override - public long /*int*/ method49 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long method49 (long[] args) {return COM.E_NOTIMPL;} @Override - public long /*int*/ method50 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long method50 (long[] args) {return COM.E_NOTIMPL;} @Override - public long /*int*/ method51 (long /*int*/[] args) {return printFrame (args[0], args[1]);} + public long method51 (long[] args) {return printFrame (args[0], args[1]);} @Override - public long /*int*/ method52 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long method52 (long[] args) {return COM.E_NOTIMPL;} @Override - public long /*int*/ method53 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long method53 (long[] args) {return COM.E_NOTIMPL;} @Override - public long /*int*/ method54 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long method54 (long[] args) {return COM.E_NOTIMPL;} @Override - public long /*int*/ method55 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long method55 (long[] args) {return COM.E_NOTIMPL;} @Override - public long /*int*/ method56 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long method56 (long[] args) {return COM.E_NOTIMPL;} @Override - public long /*int*/ method57 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long method57 (long[] args) {return COM.E_NOTIMPL;} @Override - public long /*int*/ method58 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long method58 (long[] args) {return COM.E_NOTIMPL;} @Override - public long /*int*/ method59 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long method59 (long[] args) {return COM.E_NOTIMPL;} @Override - public long /*int*/ method60 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long method60 (long[] args) {return COM.E_NOTIMPL;} @Override - public long /*int*/ method61 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long method61 (long[] args) {return COM.E_NOTIMPL;} @Override - public long /*int*/ method62 (long /*int*/[] args) {return setMenuBarVisible (args[0], (int)/*64*/args[1]);} + public long method62 (long[] args) {return setMenuBarVisible (args[0], (int)args[1]);} @Override - public long /*int*/ method63 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long method63 (long[] args) {return COM.E_NOTIMPL;} @Override - public long /*int*/ method64 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long method64 (long[] args) {return COM.E_NOTIMPL;} @Override - public long /*int*/ method65 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long method65 (long[] args) {return COM.E_NOTIMPL;} }; } -int createWebViewWithRequest (long /*int*/ sender, long /*int*/ request, long /*int*/ webView) { +int createWebViewWithRequest (long sender, long request, long webView) { WindowEvent newEvent = new WindowEvent (browser); newEvent.display = browser.getDisplay (); newEvent.widget = browser; @@ -225,10 +225,10 @@ int createWebViewWithRequest (long /*int*/ sender, long /*int*/ request, long /* } if (browser != null && !browser.isDisposed ()) { iwebview = ((WebKit)browser.webBrowser).webView; - OS.MoveMemory (webView, new long /*int*/[] {iwebview.getAddress ()}, C.PTR_SIZEOF); + OS.MoveMemory (webView, new long[] {iwebview.getAddress ()}, C.PTR_SIZEOF); if (request != 0) { IWebURLRequest req = new IWebURLRequest (request); - long /*int*/[] result = new long /*int*/[1]; + long[] result = new long[1]; int hr = req.URL (result); if (hr != COM.S_OK || result[0] == 0) { return COM.S_OK; @@ -258,17 +258,17 @@ protected void disposeCOMInterfaces () { } } -long /*int*/ getAddress () { +long getAddress () { return iWebUIDelegate.getAddress (); } -int mouseDidMoveOverElement (long /*int*/ sender, long /*int*/ elementInformation, int modifierFlags) { +int mouseDidMoveOverElement (long sender, long elementInformation, int modifierFlags) { if (elementInformation == 0) return COM.S_OK; IPropertyBag info = new IPropertyBag (elementInformation); - long /*int*/ key = WebKit.createBSTR ("WebElementLinkURLKey"); //$NON-NLS-N$ - long /*int*/ hHeap = OS.GetProcessHeap (); - long /*int*/ resultPtr = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, VARIANT.sizeof); + long key = WebKit.createBSTR ("WebElementLinkURLKey"); //$NON-NLS-N$ + long hHeap = OS.GetProcessHeap (); + long resultPtr = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, VARIANT.sizeof); int hr = info.Read (key, resultPtr, null); if (hr != COM.S_OK || resultPtr == 0) { return COM.S_OK; @@ -304,7 +304,7 @@ int mouseDidMoveOverElement (long /*int*/ sender, long /*int*/ elementInformatio return COM.S_OK; } -int printFrame (long /*int*/ webView, long /*int*/ frame) { +int printFrame (long webView, long frame) { IWebFrame iwebFrame = new IWebFrame (frame); PRINTDLG pd = new PRINTDLG (); pd.lStructSize = PRINTDLG.sizeof; @@ -314,9 +314,9 @@ int printFrame (long /*int*/ webView, long /*int*/ frame) { boolean success = OS.PrintDlg (pd); display.sendPostExternalEventDispatchEvent (); if (!success) return COM.S_OK; - long /*int*/ printDC = pd.hDC; + long printDC = pd.hDC; - long /*int*/[] result = new long /*int*/[1]; + long[] result = new long[1]; int hr = iwebFrame.QueryInterface (WebKit_win32.IID_IWebFramePrivate, result); if (hr != COM.S_OK || result[0] == 0) { return COM.S_OK; @@ -345,8 +345,8 @@ int printFrame (long /*int*/ webView, long /*int*/ frame) { } DOCINFO di = new DOCINFO (); di.cbSize = DOCINFO.sizeof; - long /*int*/ hHeap = OS.GetProcessHeap (); - long /*int*/ lpszDocName = 0; + long hHeap = OS.GetProcessHeap (); + long lpszDocName = 0; if (jobName != null && jobName.length () != 0) { /* Use the character encoding for the default locale */ TCHAR buffer = new TCHAR (0, jobName, true); @@ -370,23 +370,23 @@ int printFrame (long /*int*/ webView, long /*int*/ frame) { return COM.S_OK; } -int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) { +int QueryInterface (long riid, long ppvObject) { if (riid == 0 || ppvObject == 0) return COM.E_INVALIDARG; GUID guid = new GUID (); COM.MoveMemory (guid, riid, GUID.sizeof); if (COM.IsEqualGUID (guid, COM.IIDIUnknown)) { - OS.MoveMemory (ppvObject, new long /*int*/[] {iWebUIDelegate.getAddress ()}, C.PTR_SIZEOF); + OS.MoveMemory (ppvObject, new long[] {iWebUIDelegate.getAddress ()}, C.PTR_SIZEOF); new IUnknown (iWebUIDelegate.getAddress ()).AddRef (); return COM.S_OK; } if (COM.IsEqualGUID (guid, WebKit_win32.IID_IWebUIDelegate)) { - OS.MoveMemory (ppvObject, new long /*int*/[] {iWebUIDelegate.getAddress ()}, C.PTR_SIZEOF); + OS.MoveMemory (ppvObject, new long[] {iWebUIDelegate.getAddress ()}, C.PTR_SIZEOF); new IUnknown (iWebUIDelegate.getAddress ()).AddRef (); return COM.S_OK; } - OS.MoveMemory (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF); + OS.MoveMemory (ppvObject, new long[] {0}, C.PTR_SIZEOF); return COM.E_NOINTERFACE; } @@ -398,7 +398,7 @@ int Release () { return refCount; } -int runBeforeUnloadConfirmPanelWithMessage (long /*int*/ sender, long /*int*/ message, long /*int*/ initiatedByFrame, long /*int*/ result) { +int runBeforeUnloadConfirmPanelWithMessage (long sender, long message, long initiatedByFrame, long result) { if (!prompt) return COM.S_OK; Shell parent = browser.getShell (); @@ -416,13 +416,13 @@ int runBeforeUnloadConfirmPanelWithMessage (long /*int*/ sender, long /*int*/ me return COM.S_OK; } -int runJavaScriptAlertPanelWithMessage (long /*int*/ sender, long /*int*/ message) { +int runJavaScriptAlertPanelWithMessage (long sender, long message) { String messageString = WebKit.extractBSTR (message); showAlertMessage ("Javascript", messageString); //$NON-NLS-1$ return COM.S_OK; } -int runJavaScriptConfirmPanelWithMessage (long /*int*/ sender, long /*int*/ message, long /*int*/ result) { +int runJavaScriptConfirmPanelWithMessage (long sender, long message, long result) { String messageString = WebKit.extractBSTR (message); int[] response = new int[1]; response[0] = showConfirmPanel ("Javascript", messageString) == SWT.OK ? 1 : 0; //$NON-NLS-1$ @@ -430,11 +430,11 @@ int runJavaScriptConfirmPanelWithMessage (long /*int*/ sender, long /*int*/ mess return COM.S_OK; } -int runJavaScriptTextInputPanelWithPrompt (long /*int*/ sender, long /*int*/ message, long /*int*/ defaultText, long /*int*/ result) { +int runJavaScriptTextInputPanelWithPrompt (long sender, long message, long defaultText, long result) { String messageString = WebKit.extractBSTR (message); String defaultTextString = WebKit.extractBSTR (defaultText); String resultString = showTextPrompter ("Javascript", messageString, defaultTextString); //$NON-NLS-1$ - long /*int*/[] response = new long /*int*/[1]; + long[] response = new long[1]; if (resultString != null) { response[0] = WebKit.createBSTR (resultString); } @@ -442,7 +442,7 @@ int runJavaScriptTextInputPanelWithPrompt (long /*int*/ sender, long /*int*/ mes return COM.S_OK; } -int runOpenPanelForFileButtonWithResultListener (long /*int*/ sender, long /*int*/ resultListener) { +int runOpenPanelForFileButtonWithResultListener (long sender, long resultListener) { Shell parent = browser.getShell (); FileDialog dialog = new FileDialog (parent, SWT.NONE); String result = dialog.open (); @@ -455,7 +455,7 @@ int runOpenPanelForFileButtonWithResultListener (long /*int*/ sender, long /*int return COM.S_OK; } -int setFrame (long /*int*/ sender, long /*int*/ frame) { +int setFrame (long sender, long frame) { RECT rect = new RECT (); COM.MoveMemory (rect, frame, RECT.sizeof); /* convert to SWT system coordinates */ @@ -467,19 +467,19 @@ int setFrame (long /*int*/ sender, long /*int*/ frame) { return COM.S_OK; } -int setMenuBarVisible (long /*int*/ sender, int visible) { +int setMenuBarVisible (long sender, int visible) { /* Note. Webkit only emits the notification when the status bar should be hidden. */ menuBar = visible == 1; return COM.S_OK; } -int setStatusBarVisible (long /*int*/ sender, int visible) { +int setStatusBarVisible (long sender, int visible) { /* Note. Webkit only emits the notification when the status bar should be hidden. */ statusBar = visible == 1; return COM.S_OK; } -int setStatusText (long /*int*/ sender, long /*int*/ text) { +int setStatusText (long sender, long text) { String statusText = WebKit.extractBSTR (text); if (statusText.length () == 0) return COM.S_OK; StatusTextEvent statusTextEvent = new StatusTextEvent (browser); @@ -493,7 +493,7 @@ int setStatusText (long /*int*/ sender, long /*int*/ text) { return COM.S_OK; } -int setToolbarsVisible (long /*int*/ sender, int visible) { +int setToolbarsVisible (long sender, int visible) { /* Note. Webkit only emits the notification when the status bar should be hidden. */ toolBar = visible == 1; return COM.S_OK; @@ -682,14 +682,14 @@ String showTextPrompter (String title, String message, String defaultText) { return result[0]; } -int takeFocus (long /*int*/ sender, int forward) { +int takeFocus (long sender, int forward) { int traveralCode = forward == 0 ? SWT.TRAVERSE_TAB_PREVIOUS : SWT.TRAVERSE_TAB_NEXT; ((WebKit)browser.webBrowser).traverseOut = true; browser.traverse (traveralCode); return COM.S_OK; } -int webViewClose (long /*int*/ sender) { +int webViewClose (long sender) { WindowEvent newEvent = new WindowEvent (browser); newEvent.display = browser.getDisplay (); newEvent.widget = browser; @@ -701,13 +701,13 @@ int webViewClose (long /*int*/ sender) { return COM.S_OK; } -int webViewFrame (long /*int*/ sender, long /*int*/ frame) { +int webViewFrame (long sender, long frame) { RECT rect = new RECT (); OS.MoveMemory (frame, rect, RECT.sizeof); return COM.S_OK; } -int webViewShow (long /*int*/ sender) { +int webViewShow (long sender) { WindowEvent newEvent = new WindowEvent (browser); newEvent.display = browser.getDisplay (); newEvent.widget = browser; diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebCookieManager.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebCookieManager.java index 228b878aa5..3f61ab39e6 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebCookieManager.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebCookieManager.java @@ -19,11 +19,11 @@ import org.eclipse.swt.internal.win32.*; public class IWebCookieManager extends IUnknown { -public IWebCookieManager (long /*int*/ address) { +public IWebCookieManager (long address) { super (address); } -public int cookieStorage (long /*int*/[] storage) { +public int cookieStorage (long[] storage) { return OS.VtblCall (3, getAddress (), storage); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDataSource.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDataSource.java index fa1760dd10..180bf8192e 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDataSource.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDataSource.java @@ -19,23 +19,23 @@ import org.eclipse.swt.internal.win32.*; public class IWebDataSource extends IUnknown { -public IWebDataSource (long /*int*/ address) { +public IWebDataSource (long address) { super (address); } -public int representation (long /*int*/[] rep) { +public int representation (long[] rep) { return OS.VtblCall (5, getAddress (), rep); } -public int webFrame (long /*int*/[] frame) { +public int webFrame (long[] frame) { return OS.VtblCall (6, getAddress (), frame); } -public int request (long /*int*/[] request) { +public int request (long[] request) { return OS.VtblCall (8, getAddress (), request); } -public int pageTitle (long /*int*/[] title) { +public int pageTitle (long[] title) { return OS.VtblCall (12, getAddress (), title); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDocumentRepresentation.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDocumentRepresentation.java index 973cde9c49..da31f88e59 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDocumentRepresentation.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDocumentRepresentation.java @@ -19,11 +19,11 @@ import org.eclipse.swt.internal.win32.*; public class IWebDocumentRepresentation extends IUnknown { -public IWebDocumentRepresentation (long /*int*/ address) { +public IWebDocumentRepresentation (long address) { super (address); } -public int documentSource (long /*int*/[] source) { +public int documentSource (long[] source) { return OS.VtblCall (8, getAddress (), source); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDownload.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDownload.java index 759fa19e07..832a74088f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDownload.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDownload.java @@ -19,7 +19,7 @@ import org.eclipse.swt.internal.win32.*; public class IWebDownload extends IUnknown { -public IWebDownload (long /*int*/ address) { +public IWebDownload (long address) { super (address); } @@ -31,7 +31,7 @@ public int setDeletesFileUponFailure (int deletesFileUponFailure) { return OS.VtblCall (12, getAddress (), deletesFileUponFailure); } -public int setDestination (long /*int*/ path, int allowOverwrite) { +public int setDestination (long path, int allowOverwrite) { return OS.VtblCall (13, getAddress(), path, allowOverwrite); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebError.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebError.java index c5d2433082..1917d78f03 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebError.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebError.java @@ -19,7 +19,7 @@ import org.eclipse.swt.internal.win32.*; public class IWebError extends IUnknown { -public IWebError (long /*int*/ address) { +public IWebError (long address) { super (address); } @@ -27,23 +27,23 @@ public int code (int[] result) { return OS.VtblCall (4, getAddress (), result); } -//public int domain (long /*int*/[] result) { +//public int domain (long[] result) { // return COM.VtblCall (5, getAddress (), result); //} -public int localizedDescription (long /*int*/[] result) { +public int localizedDescription (long[] result) { return OS.VtblCall (6, getAddress (), result); } -//public int localizedFailureReason (long /*int*/[] result) { +//public int localizedFailureReason (long[] result) { // return COM.VtblCall (7, getAddress (), result); //} -//public int userInfo (long /*int*/[] result) { +//public int userInfo (long[] result) { //return COM.VtblCall (11, getAddress (), result); //} -public int failingURL (long /*int*/[] result) { +public int failingURL (long[] result) { return OS.VtblCall (12, getAddress (), result); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebErrorPrivate.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebErrorPrivate.java index e6cd5d2dcd..0666b4bbdd 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebErrorPrivate.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebErrorPrivate.java @@ -19,11 +19,11 @@ import org.eclipse.swt.internal.win32.*; public class IWebErrorPrivate extends IUnknown { -public IWebErrorPrivate (long /*int*/ address) { +public IWebErrorPrivate (long address) { super (address); } -public int sslPeerCertificate (long /*int*/[] result) { +public int sslPeerCertificate (long[] result) { return OS.VtblCall (3, getAddress (), result); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebFrame.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebFrame.java index 2c7cfc5771..750b457ed3 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebFrame.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebFrame.java @@ -19,23 +19,23 @@ import org.eclipse.swt.internal.win32.*; public class IWebFrame extends IUnknown { -public IWebFrame (long /*int*/ address) { +public IWebFrame (long address) { super (address); } -public int loadRequest (long /*int*/ request) { +public int loadRequest (long request) { return OS.VtblCall (8, getAddress (), request); } -public int loadHTMLString (long /*int*/ string, long /*int*/ baseURL) { +public int loadHTMLString (long string, long baseURL) { return OS.VtblCall (10, getAddress (), string, baseURL); } -public int dataSource (long /*int*/[] source) { +public int dataSource (long[] source) { return OS.VtblCall (13, getAddress (), source); } -public long /*int*/ globalContext () { +public long globalContext () { return OS.VtblCall (23, getAddress ()); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebFramePrivate.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebFramePrivate.java index 944278a0c2..4e60f157fb 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebFramePrivate.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebFramePrivate.java @@ -19,19 +19,19 @@ import org.eclipse.swt.internal.win32.*; public class IWebFramePrivate extends IUnknown { -public IWebFramePrivate (long /*int*/ address) { +public IWebFramePrivate (long address) { super (address); } -public int setInPrintingMode (int value, long /*int*/ printDC) { +public int setInPrintingMode (int value, long printDC) { return OS.VtblCall (8, getAddress (), value, printDC); } -public int getPrintedPageCount (long /*int*/ printDC, int[] pageCount) { +public int getPrintedPageCount (long printDC, int[] pageCount) { return OS.VtblCall (9, getAddress (), printDC, pageCount); } -public int spoolPages (long /*int*/ printDC, int startPage, int endPage, long /*int*/[] ctx) { +public int spoolPages (long printDC, int startPage, int endPage, long[] ctx) { return OS.VtblCall (10, getAddress (), printDC, startPage, endPage, ctx); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebIBActions.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebIBActions.java index b740a2884b..0117c86c61 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebIBActions.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebIBActions.java @@ -19,23 +19,23 @@ import org.eclipse.swt.internal.win32.*; public class IWebIBActions extends IUnknown { -public IWebIBActions (long /*int*/ address) { +public IWebIBActions (long address) { super (address); } -public int stopLoading (long /*int*/ sender) { +public int stopLoading (long sender) { return OS.VtblCall (4, getAddress (), sender); } -public int reload (long /*int*/ sender) { +public int reload (long sender) { return OS.VtblCall (5, getAddress (), sender); } -public int canGoBack (long /*int*/ sender, int[] result) { +public int canGoBack (long sender, int[] result) { return OS.VtblCall (6, getAddress (), sender, result); } -public int canGoForward (long /*int*/ sender, int[] result) { +public int canGoForward (long sender, int[] result) { return OS.VtblCall (8, getAddress (), sender, result); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebMutableURLRequest.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebMutableURLRequest.java index 8d9ec4ecad..0d83f033be 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebMutableURLRequest.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebMutableURLRequest.java @@ -18,15 +18,15 @@ import org.eclipse.swt.internal.win32.*; public class IWebMutableURLRequest extends IWebURLRequest { -public IWebMutableURLRequest (long /*int*/ address) { +public IWebMutableURLRequest (long address) { super (address); } -//public int setHTTPBody (long /*int*/ data) { +//public int setHTTPBody (long data) { // return COM.VtblCall (21, getAddress (), data); //} -//public int setHTTPBodyStream (long /*int*/ data) { +//public int setHTTPBodyStream (long data) { // return COM.VtblCall (22, getAddress (), data); //} @@ -34,11 +34,11 @@ public int setHTTPMethod (int post) { return OS.VtblCall (23, getAddress (), post); } -public int setURL (long /*int*/ theUrl) { +public int setURL (long theUrl) { return OS.VtblCall (27, getAddress (), theUrl); } -public int setValue (long /*int*/ value, long /*int*/ field) { +public int setValue (long value, long field) { return OS.VtblCall (28, getAddress (), value, field); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebMutableURLRequestPrivate.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebMutableURLRequestPrivate.java index 1511ff332d..ef531a2c57 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebMutableURLRequestPrivate.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebMutableURLRequestPrivate.java @@ -19,11 +19,11 @@ import org.eclipse.swt.internal.win32.*; public class IWebMutableURLRequestPrivate extends IUnknown { -public IWebMutableURLRequestPrivate (long /*int*/ address) { +public IWebMutableURLRequestPrivate (long address) { super (address); } -//public int setClientCertificate (long /*int*/ cert) { +//public int setClientCertificate (long cert) { //return COM.VtblCall (3, getAddress (), cert); //} diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebOpenPanelResultListener.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebOpenPanelResultListener.java index 36ecccbdc1..5f3aef2a10 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebOpenPanelResultListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebOpenPanelResultListener.java @@ -18,11 +18,11 @@ import org.eclipse.swt.internal.win32.*; public class IWebOpenPanelResultListener extends IUnknown { -public IWebOpenPanelResultListener (long /*int*/ address) { +public IWebOpenPanelResultListener (long address) { super (address); } -public int chooseFilename (long /*int*/ fileName) { +public int chooseFilename (long fileName) { return OS.VtblCall (3, getAddress (), fileName); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebPolicyDecisionListener.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebPolicyDecisionListener.java index 58aaf99531..74520ba60a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebPolicyDecisionListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebPolicyDecisionListener.java @@ -19,7 +19,7 @@ import org.eclipse.swt.internal.win32.*; public class IWebPolicyDecisionListener extends IUnknown{ -public IWebPolicyDecisionListener (long /*int*/ address) { +public IWebPolicyDecisionListener (long address) { super (address); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebPreferences.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebPreferences.java index 59129fb8e5..fdf79a49d4 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebPreferences.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebPreferences.java @@ -19,11 +19,11 @@ import org.eclipse.swt.internal.win32.*; public class IWebPreferences extends IUnknown { -public IWebPreferences (long /*int*/ address) { +public IWebPreferences (long address) { super (address); } -public int initWithIdentifier (long /*int*/ identifier, long /*int*/[] preferences) { +public int initWithIdentifier (long identifier, long[] preferences) { return COM.VtblCall (4, getAddress (), identifier, preferences); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLAuthenticationChallenge.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLAuthenticationChallenge.java index e3e3585095..17b3b9b07d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLAuthenticationChallenge.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLAuthenticationChallenge.java @@ -19,7 +19,7 @@ import org.eclipse.swt.internal.win32.*; public class IWebURLAuthenticationChallenge extends IUnknown { -public IWebURLAuthenticationChallenge (long /*int*/ address) { +public IWebURLAuthenticationChallenge (long address) { super (address); } @@ -27,15 +27,15 @@ public int previousFailureCount (int[] result) { return OS.VtblCall (7, getAddress (), result); } -public int proposedCredential (long /*int*/[] result) { +public int proposedCredential (long[] result) { return OS.VtblCall (8, getAddress (), result); } -public int protectionSpace (long /*int*/[] result) { +public int protectionSpace (long[] result) { return OS.VtblCall (9, getAddress (), result); } -public int sender (long /*int*/[] sender) { +public int sender (long[] sender) { return OS.VtblCall (10, getAddress (), sender); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLAuthenticationChallengeSender.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLAuthenticationChallengeSender.java index 4204830d37..7bbac4d91a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLAuthenticationChallengeSender.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLAuthenticationChallengeSender.java @@ -19,15 +19,15 @@ import org.eclipse.swt.internal.win32.*; public class IWebURLAuthenticationChallengeSender extends IUnknown { -public IWebURLAuthenticationChallengeSender (long /*int*/ address) { +public IWebURLAuthenticationChallengeSender (long address) { super (address); } -public int cancelAuthenticationChallenge (long /*int*/ challenge) { +public int cancelAuthenticationChallenge (long challenge) { return OS.VtblCall (3, getAddress (), challenge); } -public int useCredential (long /*int*/ credential, long /*int*/ challenge) { +public int useCredential (long credential, long challenge) { return OS.VtblCall (5, getAddress (), credential, challenge); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLCredential.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLCredential.java index 20378ba106..7f50e2187c 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLCredential.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLCredential.java @@ -19,7 +19,7 @@ import org.eclipse.swt.internal.win32.*; public class IWebURLCredential extends IUnknown { -public IWebURLCredential (long /*int*/ address) { +public IWebURLCredential (long address) { super (address); } @@ -27,15 +27,15 @@ public int hasPassword (int[] result) { return OS.VtblCall (3, getAddress (), result); } -public int initWithUser (long /*int*/ user, long /*int*/ password, long /*int*/ persistence) { +public int initWithUser (long user, long password, long persistence) { return OS.VtblCall (4, getAddress (), user, password, persistence); } -public int password (long /*int*/[] password) { +public int password (long[] password) { return OS.VtblCall (5, getAddress (), password); } -public int user (long /*int*/[] result) { +public int user (long[] result) { return OS.VtblCall (7, getAddress (), result); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLProtectionSpace.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLProtectionSpace.java index aceab44449..93c4b36ab5 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLProtectionSpace.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLProtectionSpace.java @@ -19,11 +19,11 @@ import org.eclipse.swt.internal.win32.*; public class IWebURLProtectionSpace extends IUnknown { -public IWebURLProtectionSpace(long /*int*/ address) { +public IWebURLProtectionSpace(long address) { super(address); } -public int host (long /*int*/[] result) { +public int host (long[] result) { return OS.VtblCall (4, getAddress (), result); } @@ -31,7 +31,7 @@ public int port (int[] result) { return OS.VtblCall (8, getAddress (), result); } -public int realm (long /*int*/[] result) { +public int realm (long[] result) { return OS.VtblCall (11, getAddress (), result); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLRequest.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLRequest.java index 8af8b64bba..a0b5b538ba 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLRequest.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLRequest.java @@ -19,23 +19,23 @@ import org.eclipse.swt.internal.win32.*; public class IWebURLRequest extends IUnknown { -public IWebURLRequest (long /*int*/ address) { +public IWebURLRequest (long address) { super (address); } -//public int HTTPBody (long /*int*/[] result) { +//public int HTTPBody (long[] result) { // return COM.VtblCall (6, getAddress (), result); //} -public int HTTPMethod (long /*int*/[] result) { +public int HTTPMethod (long[] result) { return OS.VtblCall (8, getAddress (), result); } -public int URL (long /*int*/[] result) { +public int URL (long[] result) { return OS.VtblCall (13, getAddress (), result); } -public int mutableCopy (long /*int*/[] result) { +public int mutableCopy (long[] result) { return OS.VtblCall (16, getAddress (), result); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLResponse.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLResponse.java index bcff19fdfb..8a87223998 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLResponse.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLResponse.java @@ -19,7 +19,7 @@ import org.eclipse.swt.internal.win32.*; public class IWebURLResponse extends IUnknown { -public IWebURLResponse (long /*int*/ address) { +public IWebURLResponse (long address) { super (address); } @@ -27,7 +27,7 @@ public int expectedContentLength (long[] result) { return OS.VtblCall (3, getAddress (), result); } -public int URL (long /*int*/[] result) { +public int URL (long[] result) { return OS.VtblCall (8, getAddress (), result); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebView.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebView.java index 9369d79767..99b8735956 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebView.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebView.java @@ -19,39 +19,39 @@ import org.eclipse.swt.internal.win32.*; public class IWebView extends IUnknown { -public IWebView (long /*int*/ address) { +public IWebView (long address) { super (address); } -public int canShowMIMEType (long /*int*/ mimeType, int[] canShow) { +public int canShowMIMEType (long mimeType, int[] canShow) { return OS.VtblCall (3, getAddress (), mimeType, canShow); } -public int initWithFrame (RECT frame, long /*int*/ frameName, long /*int*/ groupName) { +public int initWithFrame (RECT frame, long frameName, long groupName) { return COM.VtblCall (9, getAddress(), frame, frameName, groupName); } -public int setUIDelegate (long /*int*/ delegate) { +public int setUIDelegate (long delegate) { return OS.VtblCall (10, getAddress (), delegate); } -public int setResourceLoadDelegate (long /*int*/ delegate) { +public int setResourceLoadDelegate (long delegate) { return OS.VtblCall (12, getAddress (), delegate); } -public int setDownloadDelegate (long /*int*/ delegate) { +public int setDownloadDelegate (long delegate) { return OS.VtblCall (14, getAddress (), delegate); } -public int setFrameLoadDelegate (long /*int*/ delegate) { +public int setFrameLoadDelegate (long delegate) { return OS.VtblCall (16, getAddress (), delegate); } -public int setPolicyDelegate (long /*int*/ delegate) { +public int setPolicyDelegate (long delegate) { return OS.VtblCall (18, getAddress (), delegate); } -public int mainFrame (long /*int*/[] frame) { +public int mainFrame (long[] frame) { return OS.VtblCall (20, getAddress (), frame); } @@ -63,27 +63,27 @@ public int goForward (int[] succeeded) { return OS.VtblCall (25, getAddress(), succeeded); } -public int setCustomUserAgent (long /*int*/ valueString) { +public int setCustomUserAgent (long valueString) { return OS.VtblCall (31, getAddress (), valueString); } -public int setPreferences (long /*int*/ prefs) { +public int setPreferences (long prefs) { return OS.VtblCall (41, getAddress (), prefs); } -public int preferences (long /*int*/[] prefs) { +public int preferences (long[] prefs) { return OS.VtblCall (42, getAddress (), prefs); } -public int setHostWindow (long /*int*/ window) { +public int setHostWindow (long window) { return OS.VtblCall (45, getAddress (), window); } -public int hostWindow (long /*int*/[] window) { +public int hostWindow (long[] window) { return OS.VtblCall (46, getAddress (), window); } -public int estimatedProgress (long /*int*/ estimatedProgress) { +public int estimatedProgress (long estimatedProgress) { return OS.VtblCall (51, getAddress (), estimatedProgress); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebViewPrivate.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebViewPrivate.java index 2e650be341..a620bd5e2b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebViewPrivate.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebViewPrivate.java @@ -19,11 +19,11 @@ import org.eclipse.swt.internal.win32.*; public class IWebViewPrivate extends IUnknown { -public IWebViewPrivate (long /*int*/ address) { +public IWebViewPrivate (long address) { super (address); } -public int viewWindow (long /*int*/[] window) { +public int viewWindow (long[] window) { return OS.VtblCall (5, getAddress (), window); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/JSClassDefinition.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/JSClassDefinition.java index dbfea019ee..595928e70a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/JSClassDefinition.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/JSClassDefinition.java @@ -20,35 +20,35 @@ public class JSClassDefinition { /** @field cast=(JSClassAttributes) */ public int attributes; /** @field cast=(const char*) */ - public long /*int*/ className; + public long className; /** @field cast=(JSClassRef) */ - public long /*int*/ parentClass; + public long parentClass; /** @field cast=(const JSStaticValue*) */ - public long /*int*/ staticValues; + public long staticValues; /** @field cast=(const JSStaticFunction*) */ - public long /*int*/ staticFunctions; + public long staticFunctions; /** @field cast=(JSObjectInitializeCallback) */ - public long /*int*/ initialize; + public long initialize; /** @field cast=(JSObjectFinalizeCallback) */ - public long /*int*/ finalize; + public long finalize; /** @field cast=(JSObjectHasPropertyCallback) */ - public long /*int*/ hasProperty; + public long hasProperty; /** @field cast=(JSObjectGetPropertyCallback) */ - public long /*int*/ getProperty; + public long getProperty; /** @field cast=(JSObjectSetPropertyCallback) */ - public long /*int*/ setProperty; + public long setProperty; /** @field cast=(JSObjectDeletePropertyCallback) */ - public long /*int*/ deleteProperty; + public long deleteProperty; /** @field cast=(JSObjectGetPropertyNamesCallback) */ - public long /*int*/ getPropertyNames; + public long getPropertyNames; /** @field cast=(JSObjectCallAsFunctionCallback) */ - public long /*int*/ callAsFunction; + public long callAsFunction; /** @field cast=(JSObjectCallAsConstructorCallback) */ - public long /*int*/ callAsConstructor; + public long callAsConstructor; /** @field cast=(JSObjectHasInstanceCallback) */ - public long /*int*/ hasInstance; + public long hasInstance; /** @field cast=(JSObjectConvertToTypeCallback) */ - public long /*int*/ convertToType; + public long convertToType; public static final int sizeof = WebKit_win32.JSClassDefinition_sizeof(); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/WebKit_win32.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/WebKit_win32.java index b266bd8c71..3f2a020812 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/WebKit_win32.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/WebKit_win32.java @@ -71,26 +71,26 @@ static GUID IIDFromString (String lpsz) { /** * @param theArray cast=(CFArrayRef) */ -public static final native int CFArrayGetCount (long /*int*/ theArray); +public static final native int CFArrayGetCount (long theArray); /** * @param theArray cast=(CFArrayRef) * @param idx cast=(CFIndex) */ -public static final native long /*int*/ CFArrayGetValueAtIndex (long /*int*/ theArray, int idx); +public static final native long CFArrayGetValueAtIndex (long theArray, int idx); /** * @param allocator cast=(CFAllocatorRef) * @param bytes cast=(const UInt8 *) * @param length cast=(CFIndex) */ -public static final native long /*int*/ CFDataCreate (long /*int*/ allocator, byte [] bytes, int length); +public static final native long CFDataCreate (long allocator, byte [] bytes, int length); /** * @param theData cast=(CFDataRef) */ -public static final native long /*int*/ CFDataGetBytePtr (long /*int*/ theData); +public static final native long CFDataGetBytePtr (long theData); /** * @param theData cast=(CFDataRef) */ -public static final native int CFDataGetLength (long /*int*/ theData); +public static final native int CFDataGetLength (long theData); /** * @param allocator cast=(CFAllocatorRef) * @param keys cast=(const void **) @@ -99,106 +99,106 @@ public static final native int CFDataGetLength (long /*int*/ theData); * @param keyCallBacks cast=(const CFDictionaryKeyCallBacks *) * @param valueCallBacks cast=(const CFDictionaryValueCallBacks *) */ -public static final native long /*int*/ CFDictionaryCreate (long /*int*/ allocator, long /*int*/[] keys, long /*int*/[] values, int numValues, long /*int*/ keyCallBacks, long /*int*/ valueCallBacks); +public static final native long CFDictionaryCreate (long allocator, long[] keys, long[] values, int numValues, long keyCallBacks, long valueCallBacks); /** * @param inAllocator cast=(CFAllocatorRef) * @param headerFields cast=(CFDictionaryRef) * @param inURL cast=(CFURLRef) */ -public static final native long /*int*/ CFHTTPCookieCreateWithResponseHeaderFields (long /*int*/ inAllocator, long /*int*/ headerFields, long /*int*/ inURL); +public static final native long CFHTTPCookieCreateWithResponseHeaderFields (long inAllocator, long headerFields, long inURL); /** * @param inCookie cast=(CFHTTPCookieRef) */ -public static final native int CFHTTPCookieGetFlags (long /*int*/ inCookie); +public static final native int CFHTTPCookieGetFlags (long inCookie); /** * @param inCookie cast=(CFHTTPCookieRef) */ -public static final native long /*int*/ CFHTTPCookieGetName (long /*int*/ inCookie); +public static final native long CFHTTPCookieGetName (long inCookie); /** * @param inCookie cast=(CFHTTPCookieRef) */ -public static final native long /*int*/ CFHTTPCookieGetValue (long /*int*/ inCookie); +public static final native long CFHTTPCookieGetValue (long inCookie); /** * @param inCookieStorage cast=(CFHTTPCookieStorageRef) */ -public static final native long /*int*/ CFHTTPCookieStorageCopyCookies (long /*int*/ inCookieStorage); +public static final native long CFHTTPCookieStorageCopyCookies (long inCookieStorage); /** * @param inCookieStorage cast=(CFHTTPCookieStorageRef) * @param inURL cast=(CFURLRef) * @param sendSecureCookies cast=(Boolean) */ -public static final native long /*int*/ CFHTTPCookieStorageCopyCookiesForURL (long /*int*/ inCookieStorage, long /*int*/ inURL, boolean sendSecureCookies); +public static final native long CFHTTPCookieStorageCopyCookiesForURL (long inCookieStorage, long inURL, boolean sendSecureCookies); /** * @param inCookieStorage cast=(CFHTTPCookieStorageRef) * @param inCookie cast=(CFHTTPCookieRef) */ -public static final native void CFHTTPCookieStorageDeleteCookie (long /*int*/ inCookieStorage, long /*int*/ inCookie); +public static final native void CFHTTPCookieStorageDeleteCookie (long inCookieStorage, long inCookie); /** * @param inCookieStorage cast=(CFHTTPCookieStorageRef) * @param inCookie cast=(CFHTTPCookieRef) */ -public static final native void CFHTTPCookieStorageSetCookie (long /*int*/ inCookieStorage, long /*int*/ inCookie); +public static final native void CFHTTPCookieStorageSetCookie (long inCookieStorage, long inCookie); /** * @param cf cast=(CFTypeRef) */ -public static final native void CFRelease (long /*int*/ cf); +public static final native void CFRelease (long cf); /** * @param alloc cast=(CFAllocatorRef) * @param chars cast=(const UniChar *) * @param numChars cast=(CFIndex) */ -public static final native int CFStringCreateWithCharacters (long /*int*/ alloc, char[] chars, int numChars); +public static final native int CFStringCreateWithCharacters (long alloc, char[] chars, int numChars); /** * @param theString cast=(CFStringRef) * @param idx cast=(CFIndex) */ -public static final native char CFStringGetCharacterAtIndex (long /*int*/ theString, int idx); +public static final native char CFStringGetCharacterAtIndex (long theString, int idx); /** * @param theString cast=(CFStringRef) */ -public static final native long /*int*/ CFStringGetCharactersPtr (long /*int*/ theString); +public static final native long CFStringGetCharactersPtr (long theString); /** * @param theString cast=(CFStringRef) */ -public static final native int CFStringGetLength (long /*int*/ theString); +public static final native int CFStringGetLength (long theString); /** * @param allocator cast=(CFAllocatorRef) * @param URLString cast=(CFStringRef) * @param baseURL cast=(CFURLRef) */ -public static final native long /*int*/ CFURLCreateWithString (long /*int*/ allocator, long /*int*/ URLString, long /*int*/ baseURL); +public static final native long CFURLCreateWithString (long allocator, long URLString, long baseURL); /** * @param alloc cast=(CFAllocatorRef) * @param origRequest cast=(CFURLRequestRef) */ -public static final native long /*int*/ CFURLRequestCreateMutableCopy (long /*int*/ alloc, long /*int*/ origRequest); +public static final native long CFURLRequestCreateMutableCopy (long alloc, long origRequest); /** * @param request cast=(CFURLRequestRef) */ -public static final native long /*int*/ CFURLRequestCopyHTTPRequestBody (long /*int*/ request); +public static final native long CFURLRequestCopyHTTPRequestBody (long request); /** * @param mutableHTTPRequest cast=(CFMutableURLRequestRef) * @param httpBody cast=(CFDataRef) */ -public static final native void CFURLRequestSetHTTPRequestBody (long /*int*/ mutableHTTPRequest, long /*int*/ httpBody); +public static final native void CFURLRequestSetHTTPRequestBody (long mutableHTTPRequest, long httpBody); /** * @param mutableRequest cast=(CFMutableURLRequestRef) * @param url cast=(CFURLRef) */ -public static final native void CFURLRequestSetURL (long /*int*/ mutableRequest, long /*int*/ url); +public static final native void CFURLRequestSetURL (long mutableRequest, long url); /** * @param definition cast=(const JSClassDefinition*) */ -public static final native long /*int*/ JSClassCreate (long /*int*/ definition); +public static final native long JSClassCreate (long definition); /** * @param jsClass cast=(JSClassRef) */ -public static final native long /*int*/ JSClassRetain (long /*int*/ jsClass); +public static final native long JSClassRetain (long jsClass); /** * @param ctx cast=(JSContextRef) */ -public static final native long /*int*/ JSContextGetGlobalObject (long /*int*/ ctx); +public static final native long JSContextGetGlobalObject (long ctx); /** * @param ctx cast=(JSContextRef) * @param script cast=(JSStringRef) @@ -206,48 +206,48 @@ public static final native long /*int*/ JSContextGetGlobalObject (long /*int*/ c * @param sourceURL cast=(JSStringRef) * @param exception cast=(JSValueRef *) */ -public static final native long /*int*/ JSEvaluateScript (long /*int*/ ctx, long /*int*/ script, long /*int*/ thisObject, long /*int*/ sourceURL, int startingLineNumber, long /*int*/[] exception); +public static final native long JSEvaluateScript (long ctx, long script, long thisObject, long sourceURL, int startingLineNumber, long[] exception); /** * @param ctx cast=(JSGlobalContextRef) */ -public static final native int JSGlobalContextRetain (long /*int*/ ctx); +public static final native int JSGlobalContextRetain (long ctx); /** * @param object cast=(JSObjectRef) */ -public static final native long /*int*/ JSObjectGetPrivate (long /*int*/ object); +public static final native long JSObjectGetPrivate (long object); /** * @param ctx cast=(JSContextRef) * @param object cast=(JSObjectRef) * @param propertyName cast=(JSStringRef) * @param exception cast=(JSValueRef*) */ -public static final native long /*int*/ JSObjectGetProperty (long /*int*/ ctx, long /*int*/ object, long /*int*/ propertyName, long /*int*/[] exception); +public static final native long JSObjectGetProperty (long ctx, long object, long propertyName, long[] exception); /** * @param ctx cast=(JSContextRef) * @param object cast=(JSObjectRef) * @param propertyIndex cast=(unsigned) * @param exception cast=(JSValueRef*) */ -public static final native long /*int*/ JSObjectGetPropertyAtIndex (long /*int*/ ctx, long /*int*/ object, int propertyIndex, long /*int*/[] exception); +public static final native long JSObjectGetPropertyAtIndex (long ctx, long object, int propertyIndex, long[] exception); /** * @param ctx cast=(JSContextRef) * @param jsClass cast=(JSClassRef) * @param data cast=(void *) */ -public static final native int JSObjectMake (long /*int*/ ctx, long /*int*/ jsClass, long /*int*/ data); +public static final native int JSObjectMake (long ctx, long jsClass, long data); /** * @param ctx cast=(JSContextRef) * @param argumentCount cast=(size_t) * @param arguments cast=(const struct OpaqueJSValue * const*) * @param exception cast=(JSValueRef*) */ -public static final native long /*int*/ JSObjectMakeArray (long /*int*/ ctx, long /*int*/ argumentCount, long /*int*/[] arguments, long /*int*/[] exception); +public static final native long JSObjectMakeArray (long ctx, long argumentCount, long[] arguments, long[] exception); /** * @param ctx cast=(JSContextRef) * @param name cast=(JSStringRef) * @param callAsFunction cast=(JSObjectCallAsFunctionCallback) */ -public static final native int JSObjectMakeFunctionWithCallback (long /*int*/ ctx, long /*int*/ name, long /*int*/ callAsFunction); +public static final native int JSObjectMakeFunctionWithCallback (long ctx, long name, long callAsFunction); /** * @param ctx cast=(JSContextRef) * @param object cast=(JSObjectRef) @@ -256,84 +256,84 @@ public static final native int JSObjectMakeFunctionWithCallback (long /*int*/ ct * @param attributes cast=(JSPropertyAttributes) * @param exception cast=(JSValueRef *) */ -public static final native void JSObjectSetProperty (long /*int*/ ctx, long /*int*/ object, long /*int*/ propertyName, long /*int*/ value, long /*int*/ attributes, long /*int*/[] exception); +public static final native void JSObjectSetProperty (long ctx, long object, long propertyName, long value, long attributes, long[] exception); /** * @param string cast=(const char*) */ -public static final native long /*int*/ JSStringCreateWithUTF8CString (byte[] string); +public static final native long JSStringCreateWithUTF8CString (byte[] string); /** * @param string cast=(JSStringRef) */ -public static final native int JSStringGetLength (long /*int*/ string); +public static final native int JSStringGetLength (long string); /** * @param string cast=(JSStringRef) */ -public static final native long /*int*/ JSStringGetMaximumUTF8CStringSize (long /*int*/ string); +public static final native long JSStringGetMaximumUTF8CStringSize (long string); /** * @param string cast=(JSStringRef) * @param buffer cast=(char *) * @param bufferSize cast=(size_t) */ -public static final native int JSStringGetUTF8CString (long /*int*/ string, byte[] buffer, long /*int*/ bufferSize); +public static final native int JSStringGetUTF8CString (long string, byte[] buffer, long bufferSize); /** * @param a cast=(JSStringRef) * @param b cast=(const char *) */ -public static final native int JSStringIsEqualToUTF8CString (long /*int*/ a, byte[] b); +public static final native int JSStringIsEqualToUTF8CString (long a, byte[] b); /** * @param string cast=(JSStringRef) */ -public static final native void JSStringRelease (long /*int*/ string); +public static final native void JSStringRelease (long string); /** * @param ctx cast=(JSContextRef) * @param value cast=(JSValueRef) */ -public static final native int JSValueGetType (long /*int*/ ctx, long /*int*/ value); +public static final native int JSValueGetType (long ctx, long value); /** * @param ctx cast=(JSContextRef) * @param value cast=(JSValueRef) * @param jsClass cast=(JSClassRef) */ -public static final native int JSValueIsObjectOfClass (long /*int*/ ctx, long /*int*/ value, long /*int*/ jsClass); +public static final native int JSValueIsObjectOfClass (long ctx, long value, long jsClass); /** * @param ctx cast=(JSContextRef) * @param b cast=(bool) */ -public static final native long /*int*/ JSValueMakeBoolean (long /*int*/ ctx, long /*int*/ b); +public static final native long JSValueMakeBoolean (long ctx, long b); /** * @param ctx cast=(JSContextRef) */ -public static final native long /*int*/ JSValueMakeNull (long /*int*/ ctx); +public static final native long JSValueMakeNull (long ctx); /** * @param ctx cast=(JSContextRef) * @param number cast=(double) */ -public static final native long /*int*/ JSValueMakeNumber (long /*int*/ ctx, double number); +public static final native long JSValueMakeNumber (long ctx, double number); /** * @param ctx cast=(JSContextRef) * @param string cast=(JSStringRef) */ -public static final native long /*int*/ JSValueMakeString (long /*int*/ ctx, long /*int*/ string); +public static final native long JSValueMakeString (long ctx, long string); /** * @param ctx cast=(JSContextRef) */ -public static final native long /*int*/ JSValueMakeUndefined (long /*int*/ ctx); +public static final native long JSValueMakeUndefined (long ctx); /** * @param ctx cast=(JSContextRef) * @param value cast=(JSValueRef) * @param exception cast=(JSValueRef*) */ -public static final native double JSValueToNumber (long /*int*/ ctx, long /*int*/ value, long /*int*/[] exception); +public static final native double JSValueToNumber (long ctx, long value, long[] exception); /** * @param ctx cast=(JSContextRef) * @param value cast=(JSValueRef) * @param exception cast=(JSValueRef*) */ -public static final native long /*int*/ JSValueToStringCopy (long /*int*/ ctx, long /*int*/ value, long /*int*/[] exception); +public static final native long JSValueToStringCopy (long ctx, long value, long[] exception); /** @method flags=const address*/ -public static final native long /*int*/ kCFCopyStringDictionaryKeyCallBacks (); +public static final native long kCFCopyStringDictionaryKeyCallBacks (); /** @method flags=const address*/ -public static final native long /*int*/ kCFTypeDictionaryValueCallBacks (); +public static final native long kCFTypeDictionaryValueCallBacks (); public static final native int JSClassDefinition_sizeof (); /** @@ -341,10 +341,10 @@ public static final native int JSClassDefinition_sizeof (); * @param src cast=(const void *),flags=no_out * @param size cast=(size_t) */ -public static final native void memmove (long /*int*/ dest, JSClassDefinition src, long /*int*/ size); +public static final native void memmove (long dest, JSClassDefinition src, long size); /** @method flags=no_gen */ -public static final native int WebKitCreateInstance (byte[] rclsid, long /*int*/ pUnkOuter, byte[] refiid, long /*int*/[] ppvObject); -public static final int WebKitCreateInstance (GUID clsid, long /*int*/ pUnkOuter, GUID iid, long /*int*/[] ppvObject) { +public static final native int WebKitCreateInstance (byte[] rclsid, long pUnkOuter, byte[] refiid, long[] ppvObject); +public static final int WebKitCreateInstance (GUID clsid, long pUnkOuter, GUID iid, long[] ppvObject) { byte[] rclsid = new byte[GUID.sizeof]; OS.IIDFromString ((clsid.toString () + '\0').toCharArray (), rclsid); byte[] refiid = new byte[GUID.sizeof]; @@ -353,12 +353,12 @@ public static final int WebKitCreateInstance (GUID clsid, long /*int*/ pUnkOuter } /** @method flags=no_gen */ -public static final native long /*int*/ JSObjectCallAsFunctionProc_CALLBACK (long /*int*/ func); +public static final native long JSObjectCallAsFunctionProc_CALLBACK (long func); /** @method flags=no_gen */ -public static final native long /*int*/ JSObjectGetPropertyProc_CALLBACK (long /*int*/ func); +public static final native long JSObjectGetPropertyProc_CALLBACK (long func); /** @method flags=no_gen */ -public static final native long /*int*/ JSObjectHasPropertyProc_CALLBACK (long /*int*/ func); +public static final native long JSObjectHasPropertyProc_CALLBACK (long func); /** @method flags=no_gen */ -public static final native long /*int*/ willPerformClientRedirectToURL_CALLBACK (long /*int*/ func); +public static final native long willPerformClientRedirectToURL_CALLBACK (long func); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Cursor.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Cursor.java index 3c7149a8ec..a677a4b790 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Cursor.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Cursor.java @@ -58,7 +58,7 @@ public final class Cursor extends Resource { * * @noreference This field is not intended to be referenced by clients. */ - public long /*int*/ handle; + public long handle; boolean isIcon; @@ -117,7 +117,7 @@ Cursor(Device device) { */ public Cursor(Device device, int style) { super(device); - long /*int*/ lpCursorName = 0; + long lpCursorName = 0; switch (style) { case SWT.CURSOR_HAND: lpCursorName = OS.IDC_HAND; break; case SWT.CURSOR_ARROW: lpCursorName = OS.IDC_ARROW; break; @@ -209,7 +209,7 @@ public Cursor(Device device, ImageData source, ImageData mask, int hotspotX, int byte[] maskData = ImageData.convertPad(mask.data, mask.width, mask.height, mask.depth, mask.scanlinePad, 2); /* Create the cursor */ - long /*int*/ hInst = OS.GetModuleHandle(null); + long hInst = OS.GetModuleHandle(null); handle = OS.CreateCursor(hInst, hotspotX, hotspotY, source.width, source.height, sourceData, maskData); if (handle == 0) SWT.error(SWT.ERROR_NO_HANDLES); init(); @@ -252,8 +252,8 @@ public Cursor(Device device, ImageData source, int hotspotX, int hotspotY) { hotspotY >= source.height || hotspotY < 0) { SWT.error(SWT.ERROR_INVALID_ARGUMENT); } - long /*int*/ hBitmap = 0; - long /*int*/ hMask = 0; + long hBitmap = 0; + long hMask = 0; if (source.maskData == null && source.transparentPixel == -1 && (source.alpha != -1 || source.alphaData != null)) { PaletteData palette = source.palette; PaletteData newPalette = new PaletteData(0xFF00, 0xFF0000, 0xFF000000); @@ -302,7 +302,7 @@ public Cursor(Device device, ImageData source, int hotspotX, int hotspotY) { if (hMask == 0) SWT.error(SWT.ERROR_NO_HANDLES); } else { ImageData mask = source.getTransparencyMask(); - long /*int*/ [] result = Image.init(this.device, null, source, mask); + long [] result = Image.init(this.device, null, source, mask); hBitmap = result[0]; hMask = result[1]; } @@ -382,7 +382,7 @@ public boolean equals (Object object) { */ @Override public int hashCode () { - return (int)/*64*/handle; + return (int)handle; } /** diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Device.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Device.java index 996434c0cd..79ba567c3f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Device.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Device.java @@ -47,11 +47,11 @@ public abstract class Device implements Drawable { int[] pixels; /* Scripts */ - long /*int*/ [] scripts; + long [] scripts; /* Advanced Graphics */ - long /*int*/ [] gdipToken; - long /*int*/ fontCollection; + long [] gdipToken; + long fontCollection; String[] loadedFonts; boolean disposed; @@ -174,7 +174,7 @@ protected void checkDevice () { void checkGDIP() { if (gdipToken != null) return; - long /*int*/ [] token = new long /*int*/ [1]; + long [] token = new long [1]; GdiplusStartupInput input = new GdiplusStartupInput (); input.GdiplusVersion = 1; if (Gdip.GdiplusStartup (token, input, 0) != 0) SWT.error (SWT.ERROR_NO_HANDLES); @@ -213,14 +213,14 @@ protected void create (DeviceData data) { } int computePixels(float height) { - long /*int*/ hDC = internal_new_GC (null); + long hDC = internal_new_GC (null); int pixels = -(int)(0.5f + (height * OS.GetDeviceCaps(hDC, OS.LOGPIXELSY) / 72f)); internal_dispose_GC (hDC, null); return pixels; } -float computePoints(LOGFONT logFont, long /*int*/ hFont) { - long /*int*/ hDC = internal_new_GC (null); +float computePoints(LOGFONT logFont, long hFont) { + long hDC = internal_new_GC (null); int logPixelsY = OS.GetDeviceCaps(hDC, OS.LOGPIXELSY); int pixels = 0; if (logFont.lfHeight > 0) { @@ -231,7 +231,7 @@ float computePoints(LOGFONT logFont, long /*int*/ hFont) { * height of a font in points does not include the internal leading, * we must subtract the internal leading, which requires a TEXTMETRIC. */ - long /*int*/ oldFont = OS.SelectObject(hDC, hFont); + long oldFont = OS.SelectObject(hDC, hFont); TEXTMETRIC lptm = new TEXTMETRIC (); OS.GetTextMetrics(hDC, lptm); OS.SelectObject(hDC, oldFont); @@ -300,8 +300,8 @@ void dispose_Object (Object object) { } } -long /*int*/ EnumFontFamProc (long /*int*/ lpelfe, long /*int*/ lpntme, long /*int*/ FontType, long /*int*/ lParam) { - boolean isScalable = ((int)/*64*/FontType & OS.RASTER_FONTTYPE) == 0; +long EnumFontFamProc (long lpelfe, long lpntme, long FontType, long lParam) { + boolean isScalable = ((int)FontType & OS.RASTER_FONTTYPE) == 0; boolean scalable = lParam == 1; if (isScalable == scalable) { /* Add the log font to the list of log fonts */ @@ -351,7 +351,7 @@ public Rectangle getBounds() { } private Rectangle getBoundsInPixels () { - long /*int*/ hDC = internal_new_GC (null); + long hDC = internal_new_GC (null); int width = OS.GetDeviceCaps (hDC, OS.HORZRES); int height = OS.GetDeviceCaps (hDC, OS.VERTRES); internal_dispose_GC (hDC, null); @@ -430,7 +430,7 @@ public Rectangle getClientArea () { */ public int getDepth () { checkDevice (); - long /*int*/ hDC = internal_new_GC (null); + long hDC = internal_new_GC (null); int bits = OS.GetDeviceCaps (hDC, OS.BITSPIXEL); int planes = OS.GetDeviceCaps (hDC, OS.PLANES); internal_dispose_GC (hDC, null); @@ -450,7 +450,7 @@ public int getDepth () { */ public Point getDPI () { checkDevice (); - long /*int*/ hDC = internal_new_GC (null); + long hDC = internal_new_GC (null); int dpiX = OS.GetDeviceCaps (hDC, OS.LOGPIXELSX); int dpiY = OS.GetDeviceCaps (hDC, OS.LOGPIXELSY); internal_dispose_GC (hDC, null); @@ -464,7 +464,7 @@ public Point getDPI () { * @return the horizontal DPI */ int _getDPIx () { - long /*int*/ hDC = internal_new_GC (null); + long hDC = internal_new_GC (null); int dpi = OS.GetDeviceCaps (hDC, OS.LOGPIXELSX); internal_dispose_GC (hDC, null); return dpi; @@ -487,7 +487,7 @@ public FontData [] getFontList (String faceName, boolean scalable) { /* Create the callback */ Callback callback = new Callback (this, "EnumFontFamProc", 4); //$NON-NLS-1$ - long /*int*/ lpEnumFontFamProc = callback.getAddress (); + long lpEnumFontFamProc = callback.getAddress (); if (lpEnumFontFamProc == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS); /* Initialize the instance variables */ @@ -501,7 +501,7 @@ public FontData [] getFontList (String faceName, boolean scalable) { /* Enumerate */ int offset = 0; - long /*int*/ hDC = internal_new_GC (null); + long hDC = internal_new_GC (null); if (faceName == null) { /* The user did not specify a face name, so they want all versions of all available face names */ OS.EnumFontFamilies (hDC, null, lpEnumFontFamProc, scalable ? 1 : 0); @@ -558,7 +558,7 @@ String getLastError () { String getLastErrorText () { int error = OS.GetLastError(); if (error == 0) return ""; //$NON-NLS-1$ - long /*int*/ [] buffer = new long /*int*/ [1]; + long [] buffer = new long [1]; int dwFlags = OS.FORMAT_MESSAGE_ALLOCATE_BUFFER | OS.FORMAT_MESSAGE_FROM_SYSTEM | OS.FORMAT_MESSAGE_IGNORE_INSERTS; int length = OS.FormatMessage(dwFlags, 0, error, OS.LANG_USER_DEFAULT, buffer, 0, 0); if (length == 0) return " [GetLastError=0x" + Integer.toHexString(error) + "]"; //$NON-NLS-1$ //$NON-NLS-2$ @@ -634,7 +634,7 @@ public Color getSystemColor (int id) { */ public Font getSystemFont () { checkDevice (); - long /*int*/ hFont = OS.GetStockObject (OS.SYSTEM_FONT); + long hFont = OS.GetStockObject (OS.SYSTEM_FONT); return Font.win32_new (this, hFont); } @@ -675,10 +675,10 @@ protected void init () { systemFont = getSystemFont(); /* Initialize scripts list */ - long /*int*/ [] ppSp = new long /*int*/ [1]; + long [] ppSp = new long [1]; int [] piNumScripts = new int [1]; OS.ScriptGetProperties (ppSp, piNumScripts); - scripts = new long /*int*/ [piNumScripts [0]]; + scripts = new long [piNumScripts [0]]; OS.MoveMemory (scripts, ppSp [0], scripts.length * C.PTR_SIZEOF); } /** @@ -697,7 +697,7 @@ protected void init () { * @noreference This method is not intended to be referenced by clients. */ @Override -public abstract long /*int*/ internal_new_GC (GCData data); +public abstract long internal_new_GC (GCData data); /** * Invokes platform specific functionality to dispose a GC handle. @@ -715,7 +715,7 @@ public abstract long /*int*/ internal_new_GC (GCData data); * @noreference This method is not intended to be referenced by clients. */ @Override -public abstract void /*long*/ internal_dispose_GC (long /*int*/ hDC, GCData data); +public abstract void /*long*/ internal_dispose_GC (long hDC, GCData data); /** * Returns <code>true</code> if the device has been disposed, diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Font.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Font.java index dce8d59ac7..1223d16219 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Font.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Font.java @@ -47,7 +47,7 @@ public final class Font extends Resource { * * @noreference This field is not intended to be referenced by clients. */ - public long /*int*/ handle; + public long handle; /** * Prevents uninitialized instances from being created outside the package. @@ -210,7 +210,7 @@ public FontData[] getFontData() { */ @Override public int hashCode () { - return (int)/*64*/handle; + return (int)handle; } void init (FontData fd) { @@ -266,7 +266,7 @@ public String toString () { * * @noreference This method is not intended to be referenced by clients. */ -public static Font win32_new(Device device, long /*int*/ handle) { +public static Font win32_new(Device device, long handle) { Font font = new Font(device); font.handle = handle; return font; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/FontData.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/FontData.java index 7c814b7ec9..631993f085 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/FontData.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/FontData.java @@ -317,7 +317,7 @@ public boolean equals (Object object) { getName().equals(fd.getName()); } -long /*int*/ EnumLocalesProc(long /*int*/ lpLocaleString) { +long EnumLocalesProc(long lpLocaleString) { /* Get the locale ID */ int length = 8; @@ -521,7 +521,7 @@ public void setLocale(String locale) { data.lfCharSet = (byte)OS.DEFAULT_CHARSET; } else { Callback callback = new Callback (this, "EnumLocalesProc", 1); //$NON-NLS-1$ - long /*int*/ lpEnumLocalesProc = callback.getAddress (); + long lpEnumLocalesProc = callback.getAddress (); if (lpEnumLocalesProc == 0) SWT.error(SWT.ERROR_NO_MORE_CALLBACKS); OS.EnumSystemLocales(lpEnumLocalesProc, OS.LCID_SUPPORTED); callback.dispose (); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java index 7bfc551f52..2e9e245435 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java @@ -73,7 +73,7 @@ public final class GC extends Resource { * * @noreference This field is not intended to be referenced by clients. */ - public long /*int*/ handle; + public long handle; Drawable drawable; GCData data; @@ -168,7 +168,7 @@ public GC(Drawable drawable, int style) { if (drawable == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); GCData data = new GCData (); data.style = checkStyle(style); - long /*int*/ hDC = drawable.internal_new_GC(data); + long hDC = drawable.internal_new_GC(data); Device device = data.device; if (device == null) device = Device.getDevice(); if (device == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); @@ -187,14 +187,14 @@ void checkGC(int mask) { if ((state & mask) == mask) return; state = (state ^ mask) & mask; data.state |= mask; - long /*int*/ gdipGraphics = data.gdipGraphics; + long gdipGraphics = data.gdipGraphics; if (gdipGraphics != 0) { - long /*int*/ pen = data.gdipPen; + long pen = data.gdipPen; float width = data.lineWidth; if ((state & FOREGROUND) != 0 || (pen == 0 && (state & (LINE_WIDTH | LINE_STYLE | LINE_MITERLIMIT | LINE_JOIN | LINE_CAP)) != 0)) { if (data.gdipFgBrush != 0) Gdip.SolidBrush_delete(data.gdipFgBrush); data.gdipFgBrush = 0; - long /*int*/ brush; + long brush; Pattern pattern = data.foregroundPattern; if (pattern != null) { brush = pattern.handle; @@ -287,7 +287,7 @@ void checkGC(int mask) { if ((data.style & SWT.MIRRORED) != 0) { switch (Gdip.Brush_GetType(data.gdipBrush)) { case Gdip.BrushTypeTextureFill: - long /*int*/ brush = Gdip.Brush_Clone(data.gdipBrush); + long brush = Gdip.Brush_Clone(data.gdipBrush); if (brush == 0) SWT.error(SWT.ERROR_NO_HANDLES); Gdip.TextureBrush_ScaleTransform(brush, -1, 1, Gdip.MatrixOrderPrepend); data.gdipBrush = data.gdipBgBrush = brush; @@ -296,7 +296,7 @@ void checkGC(int mask) { } else { int background = data.background; int color = (data.alpha << 24) | ((background >> 16) & 0xFF) | (background & 0xFF00) | ((background & 0xFF) << 16); - long /*int*/ brush = Gdip.SolidBrush_new(color); + long brush = Gdip.SolidBrush_new(color); if (brush == 0) SWT.error(SWT.ERROR_NO_HANDLES); data.gdipBrush = data.gdipBgBrush = brush; } @@ -304,8 +304,8 @@ void checkGC(int mask) { if ((state & FONT) != 0) { Font font = data.font; OS.SelectObject(handle, font.handle); - long /*int*/[] hFont = new long /*int*/[1]; - long /*int*/ gdipFont = createGdipFont(handle, font.handle, gdipGraphics, device.fontCollection, null, hFont); + long[] hFont = new long[1]; + long gdipFont = createGdipFont(handle, font.handle, gdipGraphics, device.fontCollection, null, hFont); if (hFont[0] != 0) OS.SelectObject(handle, hFont[0]); if (data.hGDIFont != 0) OS.DeleteObject(data.hGDIFont); data.hGDIFont = hFont[0]; @@ -314,7 +314,7 @@ void checkGC(int mask) { } if ((state & DRAW_OFFSET) != 0) { data.gdipXOffset = data.gdipYOffset = 0; - long /*int*/ matrix = Gdip.Matrix_new(1, 0, 0, 1, 0, 0); + long matrix = Gdip.Matrix_new(1, 0, 0, 1, 0, 0); PointF point = new PointF(); point.X = point.Y = 1; Gdip.Graphics_GetTransform(gdipGraphics, matrix); @@ -378,7 +378,7 @@ void checkGC(int mask) { * PS_SOLID for pens wider than 1 pixel created with CreatePen(). The fix * is to use ExtCreatePen() instead. */ - long /*int*/ newPen; + long newPen; if ((width == 0 && lineStyle != OS.PS_USERSTYLE) || style == 0) { newPen = OS.CreatePen(style & OS.PS_STYLE_MASK, width, color); } else { @@ -401,7 +401,7 @@ void checkGC(int mask) { data.state &= ~PEN; } if ((state & BACKGROUND) != 0) { - long /*int*/ newBrush = OS.CreateSolidBrush(data.background); + long newBrush = OS.CreateSolidBrush(data.background); OS.SelectObject(handle, newBrush); data.state |= BRUSH; data.state &= ~NULL_BRUSH; @@ -454,8 +454,8 @@ void copyAreaInPixels(Image image, int x, int y) { if (image.type != SWT.BITMAP || image.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT); /* Copy the bitmap area */ Rectangle rect = image.getBoundsInPixels(); - long /*int*/ memHdc = OS.CreateCompatibleDC(handle); - long /*int*/ hOldBitmap = OS.SelectObject(memHdc, image.handle); + long memHdc = OS.CreateCompatibleDC(handle); + long hOldBitmap = OS.SelectObject(memHdc, image.handle); OS.BitBlt(memHdc, 0, 0, rect.width, rect.height, handle, x, y, OS.SRCCOPY); OS.SelectObject(memHdc, hOldBitmap); OS.DeleteDC(memHdc); @@ -510,12 +510,12 @@ public void copyArea (int srcX, int srcY, int width, int height, int destX, int void copyAreaInPixels(int srcX, int srcY, int width, int height, int destX, int destY, boolean paint) { if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); - long /*int*/ hwnd = data.hwnd; + long hwnd = data.hwnd; if (hwnd == 0) { OS.BitBlt(handle, destX, destY, width, height, handle, srcX, srcY, OS.SRCCOPY); } else { RECT lprcClip = null; - long /*int*/ hrgn = OS.CreateRectRgn(0, 0, 0, 0); + long hrgn = OS.CreateRectRgn(0, 0, 0, 0); if (OS.GetClipRgn(handle, hrgn) == 1) { lprcClip = new RECT(); OS.GetRgnBox(hrgn, lprcClip); @@ -527,10 +527,10 @@ void copyAreaInPixels(int srcX, int srcY, int width, int height, int destX, int OS.ScrollWindowEx(hwnd, destX - srcX, destY - srcY, lprcScroll, lprcClip, 0, null, flags); } } -static long /*int*/ createGdipFont(long /*int*/ hDC, long /*int*/ hFont, long /*int*/ graphics, long /*int*/ fontCollection, long /*int*/ [] outFamily, long /*int*/[] outFont) { - long /*int*/ font = Gdip.Font_new(hDC, hFont); +static long createGdipFont(long hDC, long hFont, long graphics, long fontCollection, long [] outFamily, long[] outFont) { + long font = Gdip.Font_new(hDC, hFont); if (font == 0) SWT.error(SWT.ERROR_NO_HANDLES); - long /*int*/ family = 0; + long family = 0; if (!Gdip.Font_IsAvailable(font)) { Gdip.Font_delete(font); LOGFONT logFont = new LOGFONT (); @@ -568,8 +568,8 @@ static long /*int*/ createGdipFont(long /*int*/ hDC, long /*int*/ hFont, long /* font = Gdip.Font_new(buffer, size, style, Gdip.UnitPixel, 0); } if (outFont != null && font != 0) { - long /*int*/ hHeap = OS.GetProcessHeap(); - long /*int*/ pLogFont = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, LOGFONT.sizeof); + long hHeap = OS.GetProcessHeap(); + long pLogFont = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, LOGFONT.sizeof); Gdip.Font_GetLogFontW(font, graphics, pLogFont); outFont[0] = OS.CreateFontIndirect(pLogFont); OS.HeapFree(hHeap, 0, pLogFont); @@ -588,7 +588,7 @@ static long /*int*/ createGdipFont(long /*int*/ hDC, long /*int*/ hFont, long /* return font; } -static void destroyGdipBrush(long /*int*/ brush) { +static void destroyGdipBrush(long brush) { int type = Gdip.Brush_GetType(brush); switch (type) { case Gdip.BrushTypeSolidColor: @@ -640,7 +640,7 @@ void destroy() { * This will ensure that we have not left a bitmap * selected in it when we delete the HDC. */ - long /*int*/ hNullBitmap = data.hNullBitmap; + long hNullBitmap = data.hNullBitmap; if (hNullBitmap != 0) { OS.SelectObject(handle, hNullBitmap); data.hNullBitmap = 0; @@ -719,15 +719,15 @@ void drawArcInPixels (int x, int y, int width, int height, int startAngle, int a height = -height; } if (width == 0 || height == 0 || arcAngle == 0) return; - long /*int*/ gdipGraphics = data.gdipGraphics; + long gdipGraphics = data.gdipGraphics; if (gdipGraphics != 0) { Gdip.Graphics_TranslateTransform(gdipGraphics, data.gdipXOffset, data.gdipYOffset, Gdip.MatrixOrderPrepend); if (width == height) { Gdip.Graphics_DrawArc(gdipGraphics, data.gdipPen, x, y, width, height, -startAngle, -arcAngle); } else { - long /*int*/ path = Gdip.GraphicsPath_new(Gdip.FillModeAlternate); + long path = Gdip.GraphicsPath_new(Gdip.FillModeAlternate); if (path == 0) SWT.error(SWT.ERROR_NO_HANDLES); - long /*int*/ matrix = Gdip.Matrix_new(width, 0, 0, height, x, y); + long matrix = Gdip.Matrix_new(width, 0, 0, height, x, y); if (matrix == 0) SWT.error(SWT.ERROR_NO_HANDLES); Gdip.GraphicsPath_AddArc(path, 0, 0, 1, 1, -startAngle, -arcAngle); Gdip.GraphicsPath_Transform(path, matrix); @@ -794,13 +794,13 @@ void drawFocusInPixels (int x, int y, int width, int height) { if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); if ((data.uiState & OS.UISF_HIDEFOCUS) != 0) return; data.focusDrawn = true; - long /*int*/ hdc = handle; + long hdc = handle; int state = 0; - long /*int*/ gdipGraphics = data.gdipGraphics; + long gdipGraphics = data.gdipGraphics; if (gdipGraphics != 0) { - long /*int*/ clipRgn = 0; + long clipRgn = 0; Gdip.Graphics_SetPixelOffsetMode(gdipGraphics, Gdip.PixelOffsetModeNone); - long /*int*/ rgn = Gdip.Region_new(); + long rgn = Gdip.Region_new(); if (rgn == 0) SWT.error(SWT.ERROR_NO_HANDLES); Gdip.Graphics_GetClip(gdipGraphics, rgn); if (!Gdip.Region_IsInfinite(rgn, gdipGraphics)) { @@ -809,7 +809,7 @@ void drawFocusInPixels (int x, int y, int width, int height) { Gdip.Region_delete(rgn); Gdip.Graphics_SetPixelOffsetMode(gdipGraphics, Gdip.PixelOffsetModeHalf); float[] lpXform = null; - long /*int*/ matrix = Gdip.Matrix_new(1, 0, 0, 1, 0, 0); + long matrix = Gdip.Matrix_new(1, 0, 0, 1, 0, 0); if (matrix == 0) SWT.error(SWT.ERROR_NO_HANDLES); Gdip.Graphics_GetTransform(gdipGraphics, matrix); if (!Gdip.Matrix_IsIdentity(matrix)) { @@ -943,8 +943,8 @@ void drawImage(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight, if (data.gdipGraphics != 0) { //TODO - cache bitmap - long /*int*/ [] gdipImage = srcImage.createGdipImage(); - long /*int*/ img = gdipImage[0]; + long [] gdipImage = srcImage.createGdipImage(); + long img = gdipImage[0]; int imgWidth = Gdip.Image_GetWidth(img); int imgHeight = Gdip.Image_GetHeight(img); if (simple) { @@ -967,7 +967,7 @@ void drawImage(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight, * Note that if the wrap mode is not WrapModeTileFlipXY, the scaled image * is translucent around the borders. */ - long /*int*/ attrib = Gdip.ImageAttributes_new(); + long attrib = Gdip.ImageAttributes_new(); Gdip.ImageAttributes_SetWrapMode(attrib, Gdip.WrapModeTileFlipXY); if (data.alpha != 0xFF) { float[] matrix = new float[]{ @@ -992,7 +992,7 @@ void drawImage(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight, Gdip.ImageAttributes_delete(attrib); Gdip.Bitmap_delete(img); if (gdipImage[1] != 0) { - long /*int*/ hHeap = OS.GetProcessHeap (); + long hHeap = OS.GetProcessHeap (); OS.HeapFree(hHeap, 0, gdipImage[1]); } return; @@ -1041,7 +1041,7 @@ void drawIcon(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight, i OS.GetIconInfo(srcImage.handle, srcIconInfo); /* Get the icon width and height */ - long /*int*/ hBitmap = srcIconInfo.hbmColor; + long hBitmap = srcIconInfo.hbmColor; if (hBitmap == 0) hBitmap = srcIconInfo.hbmMask; BITMAP bm = new BITMAP(); OS.GetObject(hBitmap, BITMAP.sizeof, bm); @@ -1070,20 +1070,20 @@ void drawIcon(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight, i /* Create the icon info and HDC's */ ICONINFO newIconInfo = new ICONINFO(); newIconInfo.fIcon = true; - long /*int*/ srcHdc = OS.CreateCompatibleDC(handle); - long /*int*/ dstHdc = OS.CreateCompatibleDC(handle); + long srcHdc = OS.CreateCompatibleDC(handle); + long dstHdc = OS.CreateCompatibleDC(handle); /* Blt the color bitmap */ int srcColorY = srcY; - long /*int*/ srcColor = srcIconInfo.hbmColor; + long srcColor = srcIconInfo.hbmColor; if (srcColor == 0) { srcColor = srcIconInfo.hbmMask; srcColorY += iconHeight; } - long /*int*/ oldSrcBitmap = OS.SelectObject(srcHdc, srcColor); + long oldSrcBitmap = OS.SelectObject(srcHdc, srcColor); newIconInfo.hbmColor = OS.CreateCompatibleBitmap(srcHdc, destWidth, destHeight); if (newIconInfo.hbmColor == 0) SWT.error(SWT.ERROR_NO_HANDLES); - long /*int*/ oldDestBitmap = OS.SelectObject(dstHdc, newIconInfo.hbmColor); + long oldDestBitmap = OS.SelectObject(dstHdc, newIconInfo.hbmColor); boolean stretch = !simple && (srcWidth != destWidth || srcHeight != destHeight); if (stretch) { OS.SetStretchBltMode(dstHdc, OS.COLORONCOLOR); @@ -1112,7 +1112,7 @@ void drawIcon(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight, i } else { OS.SelectObject(srcHdc, oldSrcBitmap); OS.SelectObject(dstHdc, oldDestBitmap); - long /*int*/ hIcon = OS.CreateIconIndirect(newIconInfo); + long hIcon = OS.CreateIconIndirect(newIconInfo); if (hIcon == 0) SWT.error(SWT.ERROR_NO_HANDLES); if (offsetX != 0 || offsetY != 0) OS.SetWindowOrgEx(handle, 0, 0, null); OS.DrawIconEx(handle, destX - offsetX, destY - offsetY, hIcon, destWidth, destHeight, 0, 0, flags); @@ -1172,7 +1172,7 @@ void drawBitmap(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight, drawBitmap(srcImage, srcX, srcY, srcWidth, srcHeight, destX, destY, destWidth, destHeight, simple, bm, imgWidth, imgHeight); } if (mustRestore) { - long /*int*/ hOldBitmap = OS.SelectObject(memGC.handle, srcImage.handle); + long hOldBitmap = OS.SelectObject(memGC.handle, srcImage.handle); memGC.data.hNullBitmap = hOldBitmap; } } @@ -1200,16 +1200,16 @@ void drawBitmapAlpha(Image srcImage, int srcX, int srcY, int srcWidth, int srcHe if (alphaBlendSupport) { BLENDFUNCTION blend = new BLENDFUNCTION(); blend.BlendOp = OS.AC_SRC_OVER; - long /*int*/ srcHdc = OS.CreateCompatibleDC(handle); - long /*int*/ oldSrcBitmap = OS.SelectObject(srcHdc, srcImage.handle); + long srcHdc = OS.CreateCompatibleDC(handle); + long oldSrcBitmap = OS.SelectObject(srcHdc, srcImage.handle); if (srcImage.alpha != -1) { blend.SourceConstantAlpha = (byte)srcImage.alpha; OS.AlphaBlend(handle, destX, destY, destWidth, destHeight, srcHdc, srcX, srcY, srcWidth, srcHeight, blend); } else { - long /*int*/ memDib = Image.createDIB(srcWidth, srcHeight, 32); + long memDib = Image.createDIB(srcWidth, srcHeight, 32); if (memDib == 0) SWT.error(SWT.ERROR_NO_HANDLES); - long /*int*/ memHdc = OS.CreateCompatibleDC(handle); - long /*int*/ oldMemBitmap = OS.SelectObject(memHdc, memDib); + long memHdc = OS.CreateCompatibleDC(handle); + long oldMemBitmap = OS.SelectObject(memHdc, memDib); BITMAP dibBM = new BITMAP(); OS.GetObject(memDib, BITMAP.sizeof, dibBM); OS.BitBlt(memHdc, 0, 0, srcWidth, srcHeight, srcHdc, srcX, srcY, OS.SRCCOPY); @@ -1271,12 +1271,12 @@ void drawBitmapAlpha(Image srcImage, int srcX, int srcY, int srcWidth, int srcHe srcHeight = Math.max(1, sy2 - sy1); /* Create resources */ - long /*int*/ srcHdc = OS.CreateCompatibleDC(handle); - long /*int*/ oldSrcBitmap = OS.SelectObject(srcHdc, srcImage.handle); - long /*int*/ memHdc = OS.CreateCompatibleDC(handle); - long /*int*/ memDib = Image.createDIB(Math.max(srcWidth, destWidth), Math.max(srcHeight, destHeight), 32); + long srcHdc = OS.CreateCompatibleDC(handle); + long oldSrcBitmap = OS.SelectObject(srcHdc, srcImage.handle); + long memHdc = OS.CreateCompatibleDC(handle); + long memDib = Image.createDIB(Math.max(srcWidth, destWidth), Math.max(srcHeight, destHeight), 32); if (memDib == 0) SWT.error(SWT.ERROR_NO_HANDLES); - long /*int*/ oldMemBitmap = OS.SelectObject(memHdc, memDib); + long oldMemBitmap = OS.SelectObject(memHdc, memDib); BITMAP dibBM = new BITMAP(); OS.GetObject(memDib, BITMAP.sizeof, dibBM); @@ -1318,10 +1318,10 @@ void drawBitmapAlpha(Image srcImage, int srcX, int srcY, int srcWidth, int srcHe * stretch to a temporary HDC and blit back into the original HDC. */ if (isPrinter) { - long /*int*/ tempHdc = OS.CreateCompatibleDC(handle); - long /*int*/ tempDib = Image.createDIB(destWidth, destHeight, 32); + long tempHdc = OS.CreateCompatibleDC(handle); + long tempDib = Image.createDIB(destWidth, destHeight, 32); if (tempDib == 0) SWT.error(SWT.ERROR_NO_HANDLES); - long /*int*/ oldTempBitmap = OS.SelectObject(tempHdc, tempDib); + long oldTempBitmap = OS.SelectObject(tempHdc, tempDib); if (!simple && (srcWidth != destWidth || srcHeight != destHeight)) { OS.SetStretchBltMode(memHdc, OS.COLORONCOLOR); OS.StretchBlt(tempHdc, 0, 0, destWidth, destHeight, memHdc, 0, 0, srcWidth, srcHeight, OS.SRCCOPY); @@ -1368,13 +1368,13 @@ void drawBitmapAlpha(Image srcImage, int srcX, int srcY, int srcWidth, int srcHe OS.DeleteDC(srcHdc); } -void drawBitmapTransparentByClipping(long /*int*/ srcHdc, long /*int*/ maskHdc, int srcX, int srcY, int srcWidth, int srcHeight, int destX, int destY, int destWidth, int destHeight, boolean simple, int imgWidth, int imgHeight) { +void drawBitmapTransparentByClipping(long srcHdc, long maskHdc, int srcX, int srcY, int srcWidth, int srcHeight, int destX, int destY, int destWidth, int destHeight, boolean simple, int imgWidth, int imgHeight) { /* Create a clipping region from the mask */ - long /*int*/ rgn = OS.CreateRectRgn(0, 0, 0, 0); + long rgn = OS.CreateRectRgn(0, 0, 0, 0); for (int y=0; y<imgHeight; y++) { for (int x=0; x<imgWidth; x++) { if (OS.GetPixel(maskHdc, x, y) == 0) { - long /*int*/ tempRgn = OS.CreateRectRgn(x, y, x+1, y+1); + long tempRgn = OS.CreateRectRgn(x, y, x+1, y+1); OS.CombineRgn(rgn, rgn, tempRgn, OS.RGN_OR); OS.DeleteObject(tempRgn); } @@ -1386,12 +1386,12 @@ void drawBitmapTransparentByClipping(long /*int*/ srcHdc, long /*int*/ maskHdc, int[] lpRgnData = new int[nBytes / 4]; OS.GetRegionData (rgn, nBytes, lpRgnData); float[] lpXform = new float[] {(float)destWidth/srcWidth, 0, 0, (float)destHeight/srcHeight, 0, 0}; - long /*int*/ tmpRgn = OS.ExtCreateRegion(lpXform, nBytes, lpRgnData); + long tmpRgn = OS.ExtCreateRegion(lpXform, nBytes, lpRgnData); OS.DeleteObject(rgn); rgn = tmpRgn; } OS.OffsetRgn(rgn, destX, destY); - long /*int*/ clip = OS.CreateRectRgn(0, 0, 0, 0); + long clip = OS.CreateRectRgn(0, 0, 0, 0); int result = OS.GetClipRgn(handle, clip); if (result == 1) OS.CombineRgn(rgn, rgn, clip, OS.RGN_AND); OS.SelectClipRgn(handle, rgn); @@ -1408,17 +1408,17 @@ void drawBitmapTransparentByClipping(long /*int*/ srcHdc, long /*int*/ maskHdc, OS.DeleteObject(rgn); } -void drawBitmapMask(Image srcImage, long /*int*/ srcColor, long /*int*/ srcMask, int srcX, int srcY, int srcWidth, int srcHeight, int destX, int destY, int destWidth, int destHeight, boolean simple, int imgWidth, int imgHeight, boolean offscreen) { +void drawBitmapMask(Image srcImage, long srcColor, long srcMask, int srcX, int srcY, int srcWidth, int srcHeight, int destX, int destY, int destWidth, int destHeight, boolean simple, int imgWidth, int imgHeight, boolean offscreen) { int srcColorY = srcY; if (srcColor == 0) { srcColor = srcMask; srcColorY += imgHeight; } - long /*int*/ srcHdc = OS.CreateCompatibleDC(handle); - long /*int*/ oldSrcBitmap = OS.SelectObject(srcHdc, srcColor); - long /*int*/ destHdc = handle; + long srcHdc = OS.CreateCompatibleDC(handle); + long oldSrcBitmap = OS.SelectObject(srcHdc, srcColor); + long destHdc = handle; int x = destX, y = destY; - long /*int*/ tempHdc = 0, tempBitmap = 0, oldTempBitmap = 0; + long tempHdc = 0, tempBitmap = 0, oldTempBitmap = 0; int oldBkColor = 0, oldTextColor = 0; if (offscreen) { tempHdc = OS.CreateCompatibleDC(handle); @@ -1464,9 +1464,9 @@ void drawBitmapTransparent(Image srcImage, int srcX, int srcY, int srcWidth, int /* Find the RGB values for the transparent pixel. */ boolean isDib = bm.bmBits != 0; - long /*int*/ hBitmap = srcImage.handle; - long /*int*/ srcHdc = OS.CreateCompatibleDC(handle); - long /*int*/ oldSrcBitmap = OS.SelectObject(srcHdc, hBitmap); + long hBitmap = srcImage.handle; + long srcHdc = OS.CreateCompatibleDC(handle); + long oldSrcBitmap = OS.SelectObject(srcHdc, hBitmap); byte[] originalColors = null; int transparentColor = srcImage.transparentColor; if (transparentColor == -1) { @@ -1546,9 +1546,9 @@ void drawBitmapTransparent(Image srcImage, int srcX, int srcY, int srcWidth, int OS.SetStretchBltMode(handle, mode); } else { /* Create the mask for the source image */ - long /*int*/ maskHdc = OS.CreateCompatibleDC(handle); - long /*int*/ maskBitmap = OS.CreateBitmap(imgWidth, imgHeight, 1, 1, null); - long /*int*/ oldMaskBitmap = OS.SelectObject(maskHdc, maskBitmap); + long maskHdc = OS.CreateCompatibleDC(handle); + long maskBitmap = OS.CreateBitmap(imgWidth, imgHeight, 1, 1, null); + long oldMaskBitmap = OS.SelectObject(maskHdc, maskBitmap); OS.SetBkColor(srcHdc, transparentColor); OS.BitBlt(maskHdc, 0, 0, imgWidth, imgHeight, srcHdc, 0, 0, OS.SRCCOPY); if (originalColors != null) OS.SetDIBColorTable(srcHdc, 0, 1 << bm.bmBitsPixel, originalColors); @@ -1558,9 +1558,9 @@ void drawBitmapTransparent(Image srcImage, int srcX, int srcY, int srcWidth, int drawBitmapTransparentByClipping(srcHdc, maskHdc, srcX, srcY, srcWidth, srcHeight, destX, destY, destWidth, destHeight, simple, imgWidth, imgHeight); } else { /* Draw the source bitmap transparently using invert/and mask/invert */ - long /*int*/ tempHdc = OS.CreateCompatibleDC(handle); - long /*int*/ tempBitmap = OS.CreateCompatibleBitmap(handle, destWidth, destHeight); - long /*int*/ oldTempBitmap = OS.SelectObject(tempHdc, tempBitmap); + long tempHdc = OS.CreateCompatibleDC(handle); + long tempBitmap = OS.CreateCompatibleBitmap(handle, destWidth, destHeight); + long oldTempBitmap = OS.SelectObject(tempHdc, tempBitmap); OS.BitBlt(tempHdc, 0, 0, destWidth, destHeight, handle, destX, destY, OS.SRCCOPY); if (!simple && (srcWidth != destWidth || srcHeight != destHeight)) { OS.SetStretchBltMode(tempHdc, OS.COLORONCOLOR); @@ -1587,8 +1587,8 @@ void drawBitmapTransparent(Image srcImage, int srcX, int srcY, int srcWidth, int } void drawBitmap(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight, int destX, int destY, int destWidth, int destHeight, boolean simple, BITMAP bm, int imgWidth, int imgHeight) { - long /*int*/ srcHdc = OS.CreateCompatibleDC(handle); - long /*int*/ oldSrcBitmap = OS.SelectObject(srcHdc, srcImage.handle); + long srcHdc = OS.CreateCompatibleDC(handle); + long oldSrcBitmap = OS.SelectObject(srcHdc, srcImage.handle); int dwRop = OS.GetROP2(handle) == OS.R2_XORPEN ? OS.SRCINVERT : OS.SRCCOPY; if (!simple && (srcWidth != destWidth || srcHeight != destHeight)) { int mode = OS.SetStretchBltMode(handle, OS.COLORONCOLOR); @@ -1625,7 +1625,7 @@ public void drawLine (int x1, int y1, int x2, int y2) { void drawLineInPixels (int x1, int y1, int x2, int y2) { if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); checkGC(DRAW); - long /*int*/ gdipGraphics = data.gdipGraphics; + long gdipGraphics = data.gdipGraphics; if (gdipGraphics != 0) { Gdip.Graphics_TranslateTransform(gdipGraphics, data.gdipXOffset, data.gdipYOffset, Gdip.MatrixOrderPrepend); Gdip.Graphics_DrawLine(gdipGraphics, data.gdipPen, x1, y1, x2, y2); @@ -1677,7 +1677,7 @@ public void drawOval (int x, int y, int width, int height) { void drawOvalInPixels (int x, int y, int width, int height) { if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); checkGC(DRAW); - long /*int*/ gdipGraphics = data.gdipGraphics; + long gdipGraphics = data.gdipGraphics; if (gdipGraphics != 0) { Gdip.Graphics_TranslateTransform(gdipGraphics, data.gdipXOffset, data.gdipYOffset, Gdip.MatrixOrderPrepend); Gdip.Graphics_DrawEllipse(gdipGraphics, data.gdipPen, x, y, width, height); @@ -1719,7 +1719,7 @@ public void drawPath (Path path) { if (path.handle == 0) SWT.error(SWT.ERROR_INVALID_ARGUMENT); initGdip(); checkGC(DRAW); - long /*int*/ gdipGraphics = data.gdipGraphics; + long gdipGraphics = data.gdipGraphics; Gdip.Graphics_TranslateTransform(gdipGraphics, data.gdipXOffset, data.gdipYOffset, Gdip.MatrixOrderPrepend); Gdip.Graphics_DrawPath(gdipGraphics, data.gdipPen, path.handle); Gdip.Graphics_TranslateTransform(gdipGraphics, -data.gdipXOffset, -data.gdipYOffset, Gdip.MatrixOrderPrepend); @@ -1783,7 +1783,7 @@ public void drawPolygon (int[] pointArray) { void drawPolygonInPixels(int[] pointArray) { if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); checkGC(DRAW); - long /*int*/ gdipGraphics = data.gdipGraphics; + long gdipGraphics = data.gdipGraphics; if (gdipGraphics != 0) { Gdip.Graphics_TranslateTransform(gdipGraphics, data.gdipXOffset, data.gdipYOffset, Gdip.MatrixOrderPrepend); Gdip.Graphics_DrawPolygon(gdipGraphics, data.gdipPen, pointArray, pointArray.length / 2); @@ -1832,7 +1832,7 @@ void drawPolylineInPixels(int[] pointArray) { if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); if (pointArray == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); checkGC(DRAW); - long /*int*/ gdipGraphics = data.gdipGraphics; + long gdipGraphics = data.gdipGraphics; if (gdipGraphics != 0) { Gdip.Graphics_TranslateTransform(gdipGraphics, data.gdipXOffset, data.gdipYOffset, Gdip.MatrixOrderPrepend); Gdip.Graphics_DrawLines(gdipGraphics, data.gdipPen, pointArray, pointArray.length / 2); @@ -1888,7 +1888,7 @@ public void drawRectangle (int x, int y, int width, int height) { void drawRectangleInPixels (int x, int y, int width, int height) { if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); checkGC(DRAW); - long /*int*/ gdipGraphics = data.gdipGraphics; + long gdipGraphics = data.gdipGraphics; if (gdipGraphics != 0) { if (width < 0) { x = x + width; @@ -1985,7 +1985,7 @@ void drawRoundRectangleInPixels (int x, int y, int width, int height, int arcWid OS.RoundRect(handle, x,y,x+width+1,y+height+1, arcWidth, arcHeight); } -void drawRoundRectangleGdip (long /*int*/ gdipGraphics, long /*int*/ pen, int x, int y, int width, int height, int arcWidth, int arcHeight) { +void drawRoundRectangleGdip (long gdipGraphics, long pen, int x, int y, int width, int height, int arcWidth, int arcHeight) { int nx = x; int ny = y; int nw = width; @@ -2010,7 +2010,7 @@ void drawRoundRectangleGdip (long /*int*/ gdipGraphics, long /*int*/ pen, int x, if (naw == 0 || nah == 0) { Gdip.Graphics_DrawRectangle(gdipGraphics, data.gdipPen, x, y, width, height); } else { - long /*int*/ path = Gdip.GraphicsPath_new(Gdip.FillModeAlternate); + long path = Gdip.GraphicsPath_new(Gdip.FillModeAlternate); if (path == 0) SWT.error(SWT.ERROR_NO_HANDLES); if (nw > naw) { if (nh > nah) { @@ -2092,7 +2092,7 @@ void drawStringInPixels (String string, int x, int y, boolean isTransparent) { if (string == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); if (string.isEmpty()) return; char[] buffer = string.toCharArray(); - long /*int*/ gdipGraphics = data.gdipGraphics; + long gdipGraphics = data.gdipGraphics; if (gdipGraphics != 0) { checkGC(FONT | FOREGROUND | (isTransparent ? 0 : BACKGROUND)); drawText(gdipGraphics, string, x, y, isTransparent ? SWT.DRAW_TRANSPARENT : 0, null); @@ -2126,10 +2126,10 @@ void drawStringInPixels (String string, int x, int y, boolean isTransparent) { OS.GetTextExtentPoint32(handle, buffer, buffer.length, size); } int width = size.cx, height = size.cy; - long /*int*/ hBitmap = OS.CreateCompatibleBitmap(handle, width, height); + long hBitmap = OS.CreateCompatibleBitmap(handle, width, height); if (hBitmap == 0) SWT.error(SWT.ERROR_NO_HANDLES); - long /*int*/ memDC = OS.CreateCompatibleDC(handle); - long /*int*/ hOldBitmap = OS.SelectObject(memDC, hBitmap); + long memDC = OS.CreateCompatibleDC(handle); + long hOldBitmap = OS.SelectObject(memDC, hBitmap); OS.PatBlt(memDC, 0, 0, width, height, OS.BLACKNESS); OS.SetBkMode(memDC, OS.TRANSPARENT); OS.SetTextColor(memDC, foreground); @@ -2253,7 +2253,7 @@ void drawTextInPixels (String string, int x, int y, int flags) { if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); if (string == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); if (string.isEmpty()) return; - long /*int*/ gdipGraphics = data.gdipGraphics; + long gdipGraphics = data.gdipGraphics; if (gdipGraphics != 0) { checkGC(FONT | FOREGROUND | ((flags & SWT.DRAW_TRANSPARENT) != 0 ? 0 : BACKGROUND)); drawText(gdipGraphics, string, x, y, flags, null); @@ -2279,10 +2279,10 @@ void drawTextInPixels (String string, int x, int y, int flags) { OS.DrawText(handle, buffer, buffer.length, rect, uFormat | OS.DT_CALCRECT); int width = rect.right - rect.left; int height = rect.bottom - rect.top; - long /*int*/ hBitmap = OS.CreateCompatibleBitmap(handle, width, height); + long hBitmap = OS.CreateCompatibleBitmap(handle, width, height); if (hBitmap == 0) SWT.error(SWT.ERROR_NO_HANDLES); - long /*int*/ memDC = OS.CreateCompatibleDC(handle); - long /*int*/ hOldBitmap = OS.SelectObject(memDC, hBitmap); + long memDC = OS.CreateCompatibleDC(handle); + long hOldBitmap = OS.SelectObject(memDC, hBitmap); OS.PatBlt(memDC, 0, 0, width, height, OS.BLACKNESS); OS.SetBkMode(memDC, OS.TRANSPARENT); OS.SetTextColor(memDC, foreground); @@ -2303,7 +2303,7 @@ void drawTextInPixels (String string, int x, int y, int flags) { OS.SetBkMode(handle, oldBkMode); } -boolean useGDIP (long /*int*/ hdc, char[] buffer) { +boolean useGDIP (long hdc, char[] buffer) { short[] glyphs = new short[buffer.length]; OS.GetGlyphIndices(hdc, buffer, buffer.length, glyphs, OS.GGI_MARK_NONEXISTING_GLYPHS); for (int i = 0; i < glyphs.length; i++) { @@ -2321,13 +2321,13 @@ boolean useGDIP (long /*int*/ hdc, char[] buffer) { return false; } -void drawText(long /*int*/ gdipGraphics, String string, int x, int y, int flags, Point size) { +void drawText(long gdipGraphics, String string, int x, int y, int flags, Point size) { int length = string.length(); char[] chars = string.toCharArray(); - long /*int*/ hdc = Gdip.Graphics_GetHDC(gdipGraphics); - long /*int*/ hFont = data.hGDIFont; + long hdc = Gdip.Graphics_GetHDC(gdipGraphics); + long hFont = data.hGDIFont; if (hFont == 0 && data.font != null) hFont = data.font.handle; - long /*int*/ oldFont = 0; + long oldFont = 0; if (hFont != 0) oldFont = OS.SelectObject(hdc, hFont); TEXTMETRIC lptm = new TEXTMETRIC(); OS.GetTextMetrics(hdc, lptm); @@ -2391,7 +2391,7 @@ void drawText(long /*int*/ gdipGraphics, String string, int x, int y, int flags, } } -RectF drawText(long /*int*/ gdipGraphics, char[] buffer, int start, int length, int x, int y, int flags, int mnemonicIndex, TEXTMETRIC lptm, boolean draw) { +RectF drawText(long gdipGraphics, char[] buffer, int start, int length, int x, int y, int flags, int mnemonicIndex, TEXTMETRIC lptm, boolean draw) { boolean drawMnemonic = draw && mnemonicIndex != -1 && (data.uiState & OS.UISF_HIDEACCEL) == 0; boolean needsBounds = !draw || drawMnemonic || (flags & SWT.DRAW_TRANSPARENT) == 0 || (data.style & SWT.MIRRORED) != 0 || (flags & SWT.DRAW_DELIMITER) != 0; if (length <= 0) { @@ -2406,18 +2406,18 @@ RectF drawText(long /*int*/ gdipGraphics, char[] buffer, int start, int length, GCP_RESULTS result = new GCP_RESULTS(); result.lStructSize = GCP_RESULTS.sizeof; result.nGlyphs = nGlyphs; - long /*int*/ hHeap = OS.GetProcessHeap(); - long /*int*/ lpDx = result.lpDx = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, nGlyphs * 4); - long /*int*/ lpGlyphs = result.lpGlyphs = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, nGlyphs * 2); - long /*int*/ lpOrder = 0; + long hHeap = OS.GetProcessHeap(); + long lpDx = result.lpDx = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, nGlyphs * 4); + long lpGlyphs = result.lpGlyphs = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, nGlyphs * 2); + long lpOrder = 0; int dwFlags = OS.GCP_GLYPHSHAPE | OS.GCP_REORDER | OS.GCP_LIGATE; if (drawMnemonic) { lpOrder = result.lpOrder = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, nGlyphs * 4); } - long /*int*/ hdc = Gdip.Graphics_GetHDC(gdipGraphics); - long /*int*/ hFont = data.hGDIFont; + long hdc = Gdip.Graphics_GetHDC(gdipGraphics); + long hFont = data.hGDIFont; if (hFont == 0 && data.font != null) hFont = data.font.handle; - long /*int*/ oldFont = 0; + long oldFont = 0; if (hFont != 0) oldFont = OS.SelectObject(hdc, hFont); if (start != 0) { char[] temp = new char[length]; @@ -2449,7 +2449,7 @@ RectF drawText(long /*int*/ gdipGraphics, char[] buffer, int start, int length, Gdip.Graphics_FillRectangle(gdipGraphics, data.gdipBrush, x, y, (int)Math.ceil(bounds.Width), (int)Math.ceil(bounds.Height)); } int gstate = 0; - long /*int*/ brush = getFgBrush(); + long brush = getFgBrush(); if ((data.style & SWT.MIRRORED) != 0) { switch (Gdip.Brush_GetType(brush)) { case Gdip.BrushTypeLinearGradient: @@ -2478,7 +2478,7 @@ RectF drawText(long /*int*/ gdipGraphics, char[] buffer, int start, int length, Gdip.Graphics_Restore(gdipGraphics, gstate); } if (drawMnemonic) { - long /*int*/ pen = Gdip.Pen_new(brush, 1); + long pen = Gdip.Pen_new(brush, 1); if (pen != 0) { int[] order = new int[1]; OS.MoveMemory(order, result.lpOrder + mnemonicIndex * 4, 4); @@ -2505,7 +2505,7 @@ RectF drawText(long /*int*/ gdipGraphics, char[] buffer, int start, int length, return bounds; } -void drawTextGDIP(long /*int*/ gdipGraphics, String string, int x, int y, int flags, boolean draw, Point size) { +void drawTextGDIP(long gdipGraphics, String string, int x, int y, int flags, boolean draw, Point size) { boolean needsBounds = !draw || (flags & SWT.DRAW_TRANSPARENT) == 0; char[] buffer; int length = string.length(); @@ -2516,7 +2516,7 @@ void drawTextGDIP(long /*int*/ gdipGraphics, String string, int x, int y, int fl buffer = new char[]{' '}; } PointF pt = new PointF(); - long /*int*/ format = Gdip.StringFormat_Clone(Gdip.StringFormat_GenericTypographic()); + long format = Gdip.StringFormat_Clone(Gdip.StringFormat_GenericTypographic()); int formatFlags = Gdip.StringFormat_GetFormatFlags(format) | Gdip.StringFormatFlagsMeasureTrailingSpaces; if ((data.style & SWT.MIRRORED) != 0) formatFlags |= Gdip.StringFormatFlagsDirectionRightToLeft; Gdip.StringFormat_SetFormatFlags(format, formatFlags); @@ -2535,7 +2535,7 @@ void drawTextGDIP(long /*int*/ gdipGraphics, String string, int x, int y, int fl Gdip.Graphics_FillRectangle(gdipGraphics, data.gdipBrush, x, y, (int)Math.ceil(bounds.Width), (int)Math.ceil(bounds.Height)); } int gstate = 0; - long /*int*/ brush = getFgBrush(); + long brush = getFgBrush(); if ((data.style & SWT.MIRRORED) != 0) { switch (Gdip.Brush_GetType(brush)) { case Gdip.BrushTypeLinearGradient: @@ -2641,7 +2641,7 @@ void fillArcInPixels (int x, int y, int width, int height, int startAngle, int a height = -height; } if (width == 0 || height == 0 || arcAngle == 0) return; - long /*int*/ gdipGraphics = data.gdipGraphics; + long gdipGraphics = data.gdipGraphics; if (gdipGraphics != 0) { if (width == height) { Gdip.Graphics_FillPie(gdipGraphics, data.gdipBrush, x, y, width, height, -startAngle, -arcAngle); @@ -2751,7 +2751,7 @@ void fillGradientRectangleInPixels(int x, int y, int width, int height, boolean } int fromGpColor = (data.alpha << 24) | ((fromRGB.red & 0xFF) << 16) | ((fromRGB.green & 0xFF) << 8) | (fromRGB.blue & 0xFF); int toGpColor = (data.alpha << 24) | ((toRGB.red & 0xFF) << 16) | ((toRGB.green & 0xFF) << 8) | (toRGB.blue & 0xFF); - long /*int*/ brush = Gdip.LinearGradientBrush_new(p1, p2, fromGpColor, toGpColor); + long brush = Gdip.LinearGradientBrush_new(p1, p2, fromGpColor, toGpColor); Gdip.Graphics_FillRectangle(data.gdipGraphics, brush, x, y, width, height); Gdip.LinearGradientBrush_delete(brush); return; @@ -2763,10 +2763,10 @@ void fillGradientRectangleInPixels(int x, int y, int width, int height, boolean * GradientFill for printer devices. */ if (OS.GetROP2(handle) != OS.R2_XORPEN && OS.GetDeviceCaps(handle, OS.TECHNOLOGY) != OS.DT_RASPRINTER) { - final long /*int*/ hHeap = OS.GetProcessHeap(); - final long /*int*/ pMesh = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, GRADIENT_RECT.sizeof + TRIVERTEX.sizeof * 2); + final long hHeap = OS.GetProcessHeap(); + final long pMesh = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, GRADIENT_RECT.sizeof + TRIVERTEX.sizeof * 2); if (pMesh == 0) SWT.error(SWT.ERROR_NO_HANDLES); - final long /*int*/ pVertex = pMesh + GRADIENT_RECT.sizeof; + final long pVertex = pMesh + GRADIENT_RECT.sizeof; GRADIENT_RECT gradientRect = new GRADIENT_RECT(); gradientRect.UpperLeft = 0; @@ -3026,7 +3026,7 @@ void fillRoundRectangleInPixels (int x, int y, int width, int height, int arcWid OS.RoundRect(handle, x,y,x+width+1,y+height+1,arcWidth, arcHeight); } -void fillRoundRectangleGdip (long /*int*/ gdipGraphics, long /*int*/ brush, int x, int y, int width, int height, int arcWidth, int arcHeight) { +void fillRoundRectangleGdip (long gdipGraphics, long brush, int x, int y, int width, int height, int arcWidth, int arcHeight) { int nx = x; int ny = y; int nw = width; @@ -3050,7 +3050,7 @@ void fillRoundRectangleGdip (long /*int*/ gdipGraphics, long /*int*/ brush, int if (naw == 0 || nah == 0) { Gdip.Graphics_FillRectangle(data.gdipGraphics, data.gdipBrush, x, y, width, height); } else { - long /*int*/ path = Gdip.GraphicsPath_new(Gdip.FillModeAlternate); + long path = Gdip.GraphicsPath_new(Gdip.FillModeAlternate); if (path == 0) SWT.error(SWT.ERROR_NO_HANDLES); if (nw > naw) { if (nh > nah) { @@ -3084,7 +3084,7 @@ void flush () { * underline HDC. This is done by calling GetHDC() * followed by ReleaseHDC(). */ - long /*int*/ hdc = Gdip.Graphics_GetHDC(data.gdipGraphics); + long hdc = Gdip.Graphics_GetHDC(data.gdipGraphics); Gdip.Graphics_ReleaseHDC(data.gdipGraphics, hdc); } } @@ -3275,7 +3275,7 @@ public Rectangle getClipping () { Rectangle getClippingInPixels() { if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); - long /*int*/ gdipGraphics = data.gdipGraphics; + long gdipGraphics = data.gdipGraphics; if (gdipGraphics != 0) { Rect rect = new Rect(); Gdip.Graphics_SetPixelOffsetMode(gdipGraphics, Gdip.PixelOffsetModeNone); @@ -3306,9 +3306,9 @@ public void getClipping (Region region) { if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); if (region == null) SWT.error (SWT.ERROR_NULL_ARGUMENT); if (region.isDisposed()) SWT.error (SWT.ERROR_INVALID_ARGUMENT); - long /*int*/ gdipGraphics = data.gdipGraphics; + long gdipGraphics = data.gdipGraphics; if (gdipGraphics != 0) { - long /*int*/ rgn = Gdip.Region_new(); + long rgn = Gdip.Region_new(); Gdip.Graphics_GetClip(data.gdipGraphics, rgn); if (Gdip.Region_IsInfinite(rgn, gdipGraphics)) { Rect rect = new Rect(); @@ -3317,11 +3317,11 @@ public void getClipping (Region region) { Gdip.Graphics_SetPixelOffsetMode(gdipGraphics, Gdip.PixelOffsetModeHalf); OS.SetRectRgn(region.handle, rect.X, rect.Y, rect.X + rect.Width, rect.Y + rect.Height); } else { - long /*int*/ matrix = Gdip.Matrix_new(1, 0, 0, 1, 0, 0); - long /*int*/ identity = Gdip.Matrix_new(1, 0, 0, 1, 0, 0); + long matrix = Gdip.Matrix_new(1, 0, 0, 1, 0, 0); + long identity = Gdip.Matrix_new(1, 0, 0, 1, 0, 0); Gdip.Graphics_GetTransform(gdipGraphics, matrix); Gdip.Graphics_SetTransform(gdipGraphics, identity); - long /*int*/ hRgn = Gdip.Region_GetHRGN(rgn, data.gdipGraphics); + long hRgn = Gdip.Region_GetHRGN(rgn, data.gdipGraphics); Gdip.Graphics_SetTransform(gdipGraphics, matrix); Gdip.Matrix_delete(identity); Gdip.Matrix_delete(matrix); @@ -3344,21 +3344,21 @@ public void getClipping (Region region) { } else { OS.OffsetRgn (region.handle, pt.x, pt.y); } - long /*int*/ metaRgn = OS.CreateRectRgn (0, 0, 0, 0); + long metaRgn = OS.CreateRectRgn (0, 0, 0, 0); if (OS.GetMetaRgn (handle, metaRgn) != 0) { OS.OffsetRgn (metaRgn, pt.x, pt.y); OS.CombineRgn (region.handle, metaRgn, region.handle, OS.RGN_AND); } OS.DeleteObject(metaRgn); - long /*int*/ hwnd = data.hwnd; + long hwnd = data.hwnd; if (hwnd != 0 && data.ps != null) { - long /*int*/ sysRgn = OS.CreateRectRgn (0, 0, 0, 0); + long sysRgn = OS.CreateRectRgn (0, 0, 0, 0); if (OS.GetRandomRgn (handle, sysRgn, OS.SYSRGN) == 1) { if ((OS.GetLayout(handle) & OS.LAYOUT_RTL) != 0) { int nBytes = OS.GetRegionData (sysRgn, 0, null); int [] lpRgnData = new int [nBytes / 4]; OS.GetRegionData (sysRgn, nBytes, lpRgnData); - long /*int*/ newSysRgn = OS.ExtCreateRegion(new float [] {-1, 0, 0, 1, 0, 0}, nBytes, lpRgnData); + long newSysRgn = OS.ExtCreateRegion(new float [] {-1, 0, 0, 1, 0, 0}, nBytes, lpRgnData); OS.DeleteObject(sysRgn); sysRgn = newSysRgn; } @@ -3370,7 +3370,7 @@ public void getClipping (Region region) { } } -long /*int*/ getFgBrush() { +long getFgBrush() { return data.foregroundPattern != null ? data.foregroundPattern.handle : data.gdipFgBrush; } @@ -3714,10 +3714,10 @@ public void getTransform(Transform transform) { if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); if (transform == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); if (transform.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT); - long /*int*/ gdipGraphics = data.gdipGraphics; + long gdipGraphics = data.gdipGraphics; if (gdipGraphics != 0) { Gdip.Graphics_GetTransform(gdipGraphics, transform.handle); - long /*int*/ identity = identity(); + long identity = identity(); Gdip.Matrix_Invert(identity); Gdip.Matrix_Multiply(transform.handle, identity, Gdip.MatrixOrderAppend); Gdip.Matrix_delete(identity); @@ -3747,7 +3747,7 @@ public boolean getXORMode() { void initGdip() { data.device.checkGDIP(); - long /*int*/ gdipGraphics = data.gdipGraphics; + long gdipGraphics = data.gdipGraphics; if (gdipGraphics != 0) return; /* * Feature in GDI+. The GDI+ clipping set with Graphics->SetClip() @@ -3756,7 +3756,7 @@ void initGdip() { * cannot be reset. The fix is to clear the clipping before * the GDI+ graphics is created and reset it afterwards. */ - long /*int*/ hRgn = OS.CreateRectRgn(0, 0, 0, 0); + long hRgn = OS.CreateRectRgn(0, 0, 0, 0); int result = OS.GetClipRgn(handle, hRgn); POINT pt = new POINT (); OS.GetWindowOrgEx (handle, pt); @@ -3779,7 +3779,7 @@ void initGdip() { Gdip.Graphics_SetPageUnit(gdipGraphics, Gdip.UnitPixel); Gdip.Graphics_SetPixelOffsetMode(gdipGraphics, Gdip.PixelOffsetModeHalf); if ((data.style & SWT.MIRRORED) != 0) { - long /*int*/ matrix = identity(); + long matrix = identity(); Gdip.Graphics_SetTransform(gdipGraphics, matrix); Gdip.Matrix_delete(matrix); } @@ -3798,7 +3798,7 @@ void initGdip() { } } -long /*int*/ identity() { +long identity() { if ((data.style & SWT.MIRRORED) != 0) { int width = 0; int technology = OS.GetDeviceCaps(handle, OS.TECHNOLOGY); @@ -3811,13 +3811,13 @@ long /*int*/ identity() { OS.GetObject(image.handle, BITMAP.sizeof, bm); width = bm.bmWidth; } else { - long /*int*/ hwnd = OS.WindowFromDC(handle); + long hwnd = OS.WindowFromDC(handle); if (hwnd != 0) { RECT rect = new RECT(); OS.GetClientRect(hwnd, rect); width = rect.right - rect.left; } else { - long /*int*/ hBitmap = OS.GetCurrentObject(handle, OS.OBJ_BITMAP); + long hBitmap = OS.GetCurrentObject(handle, OS.OBJ_BITMAP); BITMAP bm = new BITMAP(); OS.GetObject(hBitmap, BITMAP.sizeof, bm); width = bm.bmWidth; @@ -3831,7 +3831,7 @@ long /*int*/ identity() { return Gdip.Matrix_new(1, 0, 0, 1, 0, 0); } -void init(Drawable drawable, GCData data, long /*int*/ hDC) { +void init(Drawable drawable, GCData data, long hDC) { int foreground = data.foreground; if (foreground != -1) { data.state &= ~(FOREGROUND | FOREGROUND_TEXT | PEN); @@ -3886,7 +3886,7 @@ void init(Drawable drawable, GCData data, long /*int*/ hDC) { */ @Override public int hashCode () { - return (int)/*64*/handle; + return (int)handle; } /** @@ -3905,15 +3905,15 @@ public int hashCode () { */ public boolean isClipped() { if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); - long /*int*/ gdipGraphics = data.gdipGraphics; + long gdipGraphics = data.gdipGraphics; if (gdipGraphics != 0) { - long /*int*/ rgn = Gdip.Region_new(); + long rgn = Gdip.Region_new(); Gdip.Graphics_GetClip(data.gdipGraphics, rgn); boolean isInfinite = Gdip.Region_IsInfinite(rgn, gdipGraphics); Gdip.Region_delete(rgn); return !isInfinite; } - long /*int*/ region = OS.CreateRectRgn(0, 0, 0, 0); + long region = OS.CreateRectRgn(0, 0, 0, 0); int result = OS.GetClipRgn(handle, region); OS.DeleteObject(region); return result > 0; @@ -3934,7 +3934,7 @@ public boolean isDisposed() { return handle == 0; } -float measureSpace(long /*int*/ font, long /*int*/ format) { +float measureSpace(long font, long format) { PointF pt = new PointF(); RectF bounds = new RectF(); Gdip.Graphics_MeasureString(data.gdipGraphics, new char[]{' '}, 1, font, pt, format, bounds); @@ -4136,12 +4136,12 @@ public void setBackgroundPattern (Pattern pattern) { data.state &= ~BACKGROUND; } -void setClipping(long /*int*/ clipRgn) { - long /*int*/ hRgn = clipRgn; - long /*int*/ gdipGraphics = data.gdipGraphics; +void setClipping(long clipRgn) { + long hRgn = clipRgn; + long gdipGraphics = data.gdipGraphics; if (gdipGraphics != 0) { if (hRgn != 0) { - long /*int*/ region = Gdip.Region_new(hRgn); + long region = Gdip.Region_new(hRgn); Gdip.Graphics_SetClip(gdipGraphics, region, Gdip.CombineModeReplace); Gdip.Region_delete(region); } else { @@ -4185,7 +4185,7 @@ public void setClipping (int x, int y, int width, int height) { void setClippingInPixels (int x, int y, int width, int height) { if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); - long /*int*/ hRgn = OS.CreateRectRgn(x, y, x + width, y + height); + long hRgn = OS.CreateRectRgn(x, y, x + width, y + height); setClipping(hRgn); OS.DeleteObject(hRgn); } @@ -4828,7 +4828,7 @@ public void setTransform(Transform transform) { if (transform != null && transform.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT); if (data.gdipGraphics == 0 && transform == null) return; initGdip(); - long /*int*/ identity = identity(); + long identity = identity(); if (transform != null) { Gdip.Matrix_Multiply(identity, transform.handle, Gdip.MatrixOrderPrepend); } @@ -4865,7 +4865,7 @@ Point stringExtentInPixels (String string) { if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); checkGC(FONT); int length = string.length(); - long /*int*/ gdipGraphics = data.gdipGraphics; + long gdipGraphics = data.gdipGraphics; if (gdipGraphics != 0) { Point size = new Point(0, 0); drawText(gdipGraphics, string, 0, 0, 0, size); @@ -4945,7 +4945,7 @@ Point textExtentInPixels(String string, int flags) { if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); if (string == null) SWT.error (SWT.ERROR_NULL_ARGUMENT); checkGC(FONT); - long /*int*/ gdipGraphics = data.gdipGraphics; + long gdipGraphics = data.gdipGraphics; if (gdipGraphics != 0) { Point size = new Point(0, 0); drawText(gdipGraphics, string, 0, 0, flags, size); @@ -4997,7 +4997,7 @@ public String toString () { */ public static GC win32_new(Drawable drawable, GCData data) { GC gc = new GC(); - long /*int*/ hDC = drawable.internal_new_GC(data); + long hDC = drawable.internal_new_GC(data); gc.device = data.device; gc.init(drawable, data, hDC); return gc; @@ -5020,7 +5020,7 @@ public static GC win32_new(Drawable drawable, GCData data) { * * @noreference This method is not intended to be referenced by clients. */ -public static GC win32_new(long /*int*/ hDC, GCData data) { +public static GC win32_new(long hDC, GCData data) { GC gc = new GC(); gc.device = data.device; data.style |= SWT.LEFT_TO_RIGHT; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GCData.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GCData.java index 0c7e3c8fa7..8f03afbe22 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GCData.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GCData.java @@ -49,7 +49,7 @@ public final class GCData { public Image image; public PAINTSTRUCT ps; public int layout = -1; - public long /*int*/ hPen, hOldPen, hBrush, hOldBrush, hNullBitmap, + public long hPen, hOldPen, hBrush, hOldBrush, hNullBitmap, hwnd, gdipGraphics, gdipPen, gdipBrush, gdipFgBrush, gdipBgBrush, gdipFont, hGDIFont; public float gdipXOffset, gdipYOffset; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Image.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Image.java index 25af16c849..65d972929a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Image.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Image.java @@ -99,7 +99,7 @@ public final class Image extends Resource implements Drawable { * * @noreference This field is not intended to be referenced by clients. */ - public long /*int*/ handle; + public long handle; /** * specifies the transparent pixel @@ -262,17 +262,17 @@ public Image(Device device, Image srcImage, int flag) { switch (type) { case SWT.BITMAP: /* Get the HDC for the device */ - long /*int*/ hDC = device.internal_new_GC(null); + long hDC = device.internal_new_GC(null); /* Copy the bitmap */ - long /*int*/ hdcSource = OS.CreateCompatibleDC(hDC); - long /*int*/ hdcDest = OS.CreateCompatibleDC(hDC); - long /*int*/ hOldSrc = OS.SelectObject(hdcSource, srcImage.handle); + long hdcSource = OS.CreateCompatibleDC(hDC); + long hdcDest = OS.CreateCompatibleDC(hDC); + long hOldSrc = OS.SelectObject(hdcSource, srcImage.handle); BITMAP bm = new BITMAP(); OS.GetObject(srcImage.handle, BITMAP.sizeof, bm); handle = OS.CreateCompatibleBitmap(hdcSource, rect.width, bm.bmBits != 0 ? -rect.height : rect.height); if (handle == 0) SWT.error(SWT.ERROR_NO_HANDLES); - long /*int*/ hOldDest = OS.SelectObject(hdcDest, handle); + long hOldDest = OS.SelectObject(hdcDest, handle); OS.BitBlt(hdcDest, 0, 0, rect.width, rect.height, hdcSource, 0, 0, OS.SRCCOPY); OS.SelectObject(hdcSource, hOldSrc); OS.SelectObject(hdcDest, hOldDest); @@ -825,14 +825,14 @@ void initNative(String filename) { int length = filename.length(); char[] chars = new char[length+1]; filename.getChars(0, length, chars, 0); - long /*int*/ bitmap = Gdip.Bitmap_new(chars, false); + long bitmap = Gdip.Bitmap_new(chars, false); if (bitmap != 0) { int error = SWT.ERROR_NO_HANDLES; int status = Gdip.Image_GetLastStatus(bitmap); if (status == 0) { if (filename.toLowerCase().endsWith(".ico")) { this.type = SWT.ICON; - long /*int*/[] hicon = new long /*int*/[1]; + long[] hicon = new long[1]; status = Gdip.Bitmap_GetHICON(bitmap, hicon); this.handle = hicon[0]; } else { @@ -864,10 +864,10 @@ void initNative(String filename) { * This performs better than getting the bits with Bitmap.LockBits(), * but it cannot be used when there is transparency. */ - long /*int*/ hDC = device.internal_new_GC(null); - long /*int*/ srcHDC = OS.CreateCompatibleDC(hDC); - long /*int*/ oldSrcBitmap = OS.SelectObject(srcHDC, this.handle); - long /*int*/ graphics = Gdip.Graphics_new(srcHDC); + long hDC = device.internal_new_GC(null); + long srcHDC = OS.CreateCompatibleDC(hDC); + long oldSrcBitmap = OS.SelectObject(srcHDC, this.handle); + long graphics = Gdip.Graphics_new(srcHDC); if (graphics != 0) { Rect rect = new Rect(); rect.Width = width; @@ -884,14 +884,14 @@ void initNative(String filename) { OS.DeleteDC(srcHDC); device.internal_dispose_GC(hDC, null); } else { - long /*int*/ lockedBitmapData = Gdip.BitmapData_new(); + long lockedBitmapData = Gdip.BitmapData_new(); if (lockedBitmapData != 0) { status = Gdip.Bitmap_LockBits(bitmap, 0, 0, pixelFormat, lockedBitmapData); if (status == 0) { BitmapData bitmapData = new BitmapData(); Gdip.MoveMemory(bitmapData, lockedBitmapData); int stride = bitmapData.Stride; - long /*int*/ pixels = bitmapData.Scan0; + long pixels = bitmapData.Scan0; int depth = 0, scanlinePad = 4, transparentPixel = -1; switch (bitmapData.PixelFormat) { case Gdip.PixelFormat1bppIndexed: depth = 1; break; @@ -911,8 +911,8 @@ void initNative(String filename) { case Gdip.PixelFormat4bppIndexed: case Gdip.PixelFormat8bppIndexed: int paletteSize = Gdip.Image_GetPaletteSize(bitmap); - long /*int*/ hHeap = OS.GetProcessHeap(); - long /*int*/ palette = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, paletteSize); + long hHeap = OS.GetProcessHeap(); + long palette = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, paletteSize); if (palette == 0) SWT.error(SWT.ERROR_NO_HANDLES); Gdip.Image_GetPalette(bitmap, palette, paletteSize); ColorPalette colorPalette = new ColorPalette(); @@ -974,7 +974,7 @@ void initNative(String filename) { } } -long /*int*/ [] createGdipImage() { +long [] createGdipImage() { switch (type) { case SWT.BITMAP: { if (alpha != -1 || alphaData != null || transparentPixel != -1) { @@ -982,13 +982,13 @@ long /*int*/ [] createGdipImage() { OS.GetObject(handle, BITMAP.sizeof, bm); int imgWidth = bm.bmWidth; int imgHeight = bm.bmHeight; - long /*int*/ hDC = device.internal_new_GC(null); - long /*int*/ srcHdc = OS.CreateCompatibleDC(hDC); - long /*int*/ oldSrcBitmap = OS.SelectObject(srcHdc, handle); - long /*int*/ memHdc = OS.CreateCompatibleDC(hDC); - long /*int*/ memDib = createDIB(imgWidth, imgHeight, 32); + long hDC = device.internal_new_GC(null); + long srcHdc = OS.CreateCompatibleDC(hDC); + long oldSrcBitmap = OS.SelectObject(srcHdc, handle); + long memHdc = OS.CreateCompatibleDC(hDC); + long memDib = createDIB(imgWidth, imgHeight, 32); if (memDib == 0) SWT.error(SWT.ERROR_NO_HANDLES); - long /*int*/ oldMemBitmap = OS.SelectObject(memHdc, memDib); + long oldMemBitmap = OS.SelectObject(memHdc, memDib); BITMAP dibBM = new BITMAP(); OS.GetObject(memDib, BITMAP.sizeof, dibBM); int sizeInBytes = dibBM.bmWidthBytes * dibBM.bmHeight; @@ -1064,13 +1064,13 @@ long /*int*/ [] createGdipImage() { } } } - long /*int*/ hHeap = OS.GetProcessHeap(); - long /*int*/ pixels = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, srcData.length); + long hHeap = OS.GetProcessHeap(); + long pixels = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, srcData.length); if (pixels == 0) SWT.error(SWT.ERROR_NO_HANDLES); OS.MoveMemory(pixels, srcData, sizeInBytes); - return new long /*int*/ []{Gdip.Bitmap_new(imgWidth, imgHeight, dibBM.bmWidthBytes, Gdip.PixelFormat32bppARGB, pixels), pixels}; + return new long []{Gdip.Bitmap_new(imgWidth, imgHeight, dibBM.bmWidthBytes, Gdip.PixelFormat32bppARGB, pixels), pixels}; } - return new long /*int*/ []{Gdip.Bitmap_new(handle, 0), 0}; + return new long []{Gdip.Bitmap_new(handle, 0), 0}; } case SWT.ICON: { /* @@ -1080,13 +1080,13 @@ long /*int*/ [] createGdipImage() { */ ICONINFO iconInfo = new ICONINFO(); OS.GetIconInfo(handle, iconInfo); - long /*int*/ hBitmap = iconInfo.hbmColor; + long hBitmap = iconInfo.hbmColor; if (hBitmap == 0) hBitmap = iconInfo.hbmMask; BITMAP bm = new BITMAP(); OS.GetObject(hBitmap, BITMAP.sizeof, bm); int imgWidth = bm.bmWidth; int imgHeight = hBitmap == iconInfo.hbmMask ? bm.bmHeight / 2 : bm.bmHeight; - long /*int*/ img = 0, pixels = 0; + long img = 0, pixels = 0; /* * Bug in GDI+. Bitmap_new() segments fault if the image width * is greater than the image height. @@ -1095,13 +1095,13 @@ long /*int*/ [] createGdipImage() { * channel when the icon depth is 32. */ if (imgWidth > imgHeight || bm.bmBitsPixel == 32) { - long /*int*/ hDC = device.internal_new_GC(null); - long /*int*/ srcHdc = OS.CreateCompatibleDC(hDC); - long /*int*/ oldSrcBitmap = OS.SelectObject(srcHdc, hBitmap); - long /*int*/ memHdc = OS.CreateCompatibleDC(hDC); - long /*int*/ memDib = createDIB(imgWidth, imgHeight, 32); + long hDC = device.internal_new_GC(null); + long srcHdc = OS.CreateCompatibleDC(hDC); + long oldSrcBitmap = OS.SelectObject(srcHdc, hBitmap); + long memHdc = OS.CreateCompatibleDC(hDC); + long memDib = createDIB(imgWidth, imgHeight, 32); if (memDib == 0) SWT.error(SWT.ERROR_NO_HANDLES); - long /*int*/ oldMemBitmap = OS.SelectObject(memHdc, memDib); + long oldMemBitmap = OS.SelectObject(memHdc, memDib); BITMAP dibBM = new BITMAP(); OS.GetObject(memDib, BITMAP.sizeof, dibBM); OS.BitBlt(memHdc, 0, 0, imgWidth, imgHeight, srcHdc, 0, hBitmap == iconInfo.hbmMask ? imgHeight : 0, OS.SRCCOPY); @@ -1126,7 +1126,7 @@ long /*int*/ [] createGdipImage() { OS.SelectObject(srcHdc, oldSrcBitmap); OS.DeleteObject(srcHdc); device.internal_dispose_GC(hDC, null); - long /*int*/ hHeap = OS.GetProcessHeap(); + long hHeap = OS.GetProcessHeap(); pixels = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, srcData.length); if (pixels == 0) SWT.error(SWT.ERROR_NO_HANDLES); OS.MoveMemory(pixels, srcData, srcData.length); @@ -1136,7 +1136,7 @@ long /*int*/ [] createGdipImage() { } if (iconInfo.hbmColor != 0) OS.DeleteObject(iconInfo.hbmColor); if (iconInfo.hbmMask != 0) OS.DeleteObject(iconInfo.hbmMask); - return new long /*int*/ []{img, pixels}; + return new long []{img, pixels}; } default: SWT.error(SWT.ERROR_INVALID_IMAGE); } @@ -1203,13 +1203,13 @@ public Color getBackground() { if (transparentPixel == -1) return null; /* Get the HDC for the device */ - long /*int*/ hDC = device.internal_new_GC(null); + long hDC = device.internal_new_GC(null); /* Compute the background color */ BITMAP bm = new BITMAP(); OS.GetObject(handle, BITMAP.sizeof, bm); - long /*int*/ hdcMem = OS.CreateCompatibleDC(hDC); - long /*int*/ hOldObject = OS.SelectObject(hdcMem, handle); + long hdcMem = OS.CreateCompatibleDC(hDC); + long hOldObject = OS.SelectObject(hdcMem, handle); int red = 0, green = 0, blue = 0; if (bm.bmBitsPixel <= 8) { byte[] color = new byte[4]; @@ -1300,7 +1300,7 @@ public Rectangle getBoundsInPixels() { case SWT.ICON: ICONINFO info = new ICONINFO(); OS.GetIconInfo(handle, info); - long /*int*/ hBitmap = info.hbmColor; + long hBitmap = info.hbmColor; if (hBitmap == 0) hBitmap = info.hbmMask; bm = new BITMAP(); OS.GetObject(hBitmap, BITMAP.sizeof, bm); @@ -1420,7 +1420,7 @@ public ImageData getImageDataAtCurrentZoom() { ICONINFO info = new ICONINFO(); OS.GetIconInfo(handle, info); /* Get the basic BITMAP information */ - long /*int*/ hBitmap = info.hbmColor; + long hBitmap = info.hbmColor; if (hBitmap == 0) hBitmap = info.hbmMask; bm = new BITMAP(); OS.GetObject(hBitmap, BITMAP.sizeof, bm); @@ -1442,11 +1442,11 @@ public ImageData getImageDataAtCurrentZoom() { OS.MoveMemory(bmi, bmiHeader, BITMAPINFOHEADER.sizeof); /* Get the HDC for the device */ - long /*int*/ hDC = device.internal_new_GC(null); + long hDC = device.internal_new_GC(null); /* Create the DC and select the bitmap */ - long /*int*/ hBitmapDC = OS.CreateCompatibleDC(hDC); - long /*int*/ hOldBitmap = OS.SelectObject(hBitmapDC, hBitmap); + long hBitmapDC = OS.CreateCompatibleDC(hDC); + long hOldBitmap = OS.SelectObject(hBitmapDC, hBitmap); /* Find the size of the image and allocate data */ int imageSize; /* Call with null lpBits to get the image size */ @@ -1544,7 +1544,7 @@ public ImageData getImageDataAtCurrentZoom() { /* Find out whether this is a DIB or a DDB. */ boolean isDib = (bm.bmBits != 0); /* Get the HDC for the device */ - long /*int*/ hDC = device.internal_new_GC(null); + long hDC = device.internal_new_GC(null); DIBSECTION dib = null; if (isDib) { dib = new DIBSECTION(); @@ -1575,8 +1575,8 @@ public ImageData getImageDataAtCurrentZoom() { } /* Create the DC and select the bitmap */ - long /*int*/ hBitmapDC = OS.CreateCompatibleDC(hDC); - long /*int*/ hOldBitmap = OS.SelectObject(hBitmapDC, handle); + long hBitmapDC = OS.CreateCompatibleDC(hDC); + long hOldBitmap = OS.SelectObject(hBitmapDC, handle); /* Find the size of the image and allocate data */ int imageSize; if (isDib) { @@ -1663,7 +1663,7 @@ public int hashCode () { } else if (imageFileNameProvider != null) { return imageFileNameProvider.hashCode(); } else { - return (int)/*64*/handle; + return (int)handle; } } @@ -1672,7 +1672,7 @@ void init(int width, int height) { SWT.error (SWT.ERROR_INVALID_ARGUMENT); } type = SWT.BITMAP; - long /*int*/ hDC = device.internal_new_GC(null); + long hDC = device.internal_new_GC(null); handle = OS.CreateCompatibleBitmap(hDC, width, height); /* * Feature in Windows. CreateCompatibleBitmap() may fail @@ -1687,8 +1687,8 @@ void init(int width, int height) { handle = createDIB(width, height, depth); } if (handle != 0) { - long /*int*/ memDC = OS.CreateCompatibleDC(hDC); - long /*int*/ hOldBitmap = OS.SelectObject(memDC, handle); + long memDC = OS.CreateCompatibleDC(hDC); + long hOldBitmap = OS.SelectObject(memDC, handle); OS.PatBlt(memDC, 0, 0, width, height, OS.PATCOPY); OS.SelectObject(memDC, hOldBitmap); OS.DeleteDC(memDC); @@ -1699,7 +1699,7 @@ void init(int width, int height) { } } -static long /*int*/ createDIB(int width, int height, int depth) { +static long createDIB(int width, int height, int depth) { BITMAPINFOHEADER bmiHeader = new BITMAPINFOHEADER(); bmiHeader.biSize = BITMAPINFOHEADER.sizeof; bmiHeader.biWidth = width; @@ -1709,11 +1709,11 @@ static long /*int*/ createDIB(int width, int height, int depth) { bmiHeader.biCompression = OS.BI_RGB; byte[] bmi = new byte[BITMAPINFOHEADER.sizeof]; OS.MoveMemory(bmi, bmiHeader, BITMAPINFOHEADER.sizeof); - long /*int*/[] pBits = new long /*int*/[1]; + long[] pBits = new long[1]; return OS.CreateDIBSection(0, bmi, OS.DIB_RGB_COLORS, pBits, 0, 0); } -static long /*int*/ [] init(Device device, Image image, ImageData i) { +static long [] init(Device device, Image image, ImageData i) { /* Windows does not support 2-bit images. Convert to 4-bit image. */ if (i.depth == 2) { ImageData img = new ImageData(i.width, i.height, 4, i.palette); @@ -1814,8 +1814,8 @@ static long /*int*/ [] init(Device device, Image image, ImageData i) { offset += 4; } } - long /*int*/[] pBits = new long /*int*/[1]; - long /*int*/ hDib = OS.CreateDIBSection(0, bmi, OS.DIB_RGB_COLORS, pBits, 0, 0); + long[] pBits = new long[1]; + long hDib = OS.CreateDIBSection(0, bmi, OS.DIB_RGB_COLORS, pBits, 0, 0); if (hDib == 0) SWT.error(SWT.ERROR_NO_HANDLES); /* In case of a scanline pad other than 4, do the work to convert it */ byte[] data = i.data; @@ -1824,17 +1824,17 @@ static long /*int*/ [] init(Device device, Image image, ImageData i) { } OS.MoveMemory(pBits[0], data, data.length); - long /*int*/ [] result = null; + long [] result = null; if (i.getTransparencyType() == SWT.TRANSPARENCY_MASK) { /* Get the HDC for the device */ - long /*int*/ hDC = device.internal_new_GC(null); + long hDC = device.internal_new_GC(null); /* Create the color bitmap */ - long /*int*/ hdcSrc = OS.CreateCompatibleDC(hDC); + long hdcSrc = OS.CreateCompatibleDC(hDC); OS.SelectObject(hdcSrc, hDib); - long /*int*/ hBitmap = OS.CreateCompatibleBitmap(hDC, i.width, i.height); + long hBitmap = OS.CreateCompatibleBitmap(hDC, i.width, i.height); if (hBitmap == 0) SWT.error(SWT.ERROR_NO_HANDLES); - long /*int*/ hdcDest = OS.CreateCompatibleDC(hDC); + long hdcDest = OS.CreateCompatibleDC(hDC); OS.SelectObject(hdcDest, hBitmap); OS.BitBlt(hdcDest, 0, 0, i.width, i.height, hdcSrc, 0, 0, OS.SRCCOPY); @@ -1843,7 +1843,7 @@ static long /*int*/ [] init(Device device, Image image, ImageData i) { /* Create the mask. Windows requires icon masks to have a scanline pad of 2. */ byte[] maskData = ImageData.convertPad(i.maskData, i.width, i.height, 1, i.maskPad, 2); - long /*int*/ hMask = OS.CreateBitmap(i.width, i.height, 1, 1, maskData); + long hMask = OS.CreateBitmap(i.width, i.height, 1, 1, maskData); if (hMask == 0) SWT.error(SWT.ERROR_NO_HANDLES); OS.SelectObject(hdcSrc, hMask); OS.PatBlt(hdcSrc, 0, 0, i.width, i.height, OS.DSTINVERT); @@ -1852,14 +1852,14 @@ static long /*int*/ [] init(Device device, Image image, ImageData i) { OS.DeleteObject(hDib); if (image == null) { - result = new long /*int*/ []{hBitmap, hMask}; + result = new long []{hBitmap, hMask}; } else { /* Create the icon */ ICONINFO info = new ICONINFO(); info.fIcon = true; info.hbmColor = hBitmap; info.hbmMask = hMask; - long /*int*/ hIcon = OS.CreateIconIndirect(info); + long hIcon = OS.CreateIconIndirect(info); if (hIcon == 0) SWT.error(SWT.ERROR_NO_HANDLES); OS.DeleteObject(hBitmap); OS.DeleteObject(hMask); @@ -1868,7 +1868,7 @@ static long /*int*/ [] init(Device device, Image image, ImageData i) { } } else { if (image == null) { - result = new long /*int*/ []{hDib}; + result = new long []{hDib}; } else { image.handle = hDib; image.type = SWT.BITMAP; @@ -1886,7 +1886,7 @@ static long /*int*/ [] init(Device device, Image image, ImageData i) { return result; } -static long /*int*/ [] init(Device device, Image image, ImageData source, ImageData mask) { +static long [] init(Device device, Image image, ImageData source, ImageData mask) { /* Create a temporary image and locate the black pixel */ ImageData imageData; int blackIndex = 0; @@ -1980,7 +1980,7 @@ void init(ImageData i) { * @noreference This method is not intended to be referenced by clients. */ @Override -public long /*int*/ internal_new_GC (GCData data) { +public long internal_new_GC (GCData data) { if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); /* * Create a new GC that can draw into the image. @@ -1991,8 +1991,8 @@ public long /*int*/ internal_new_GC (GCData data) { } /* Create a compatible HDC for the device */ - long /*int*/ hDC = device.internal_new_GC(null); - long /*int*/ imageDC = OS.CreateCompatibleDC(hDC); + long hDC = device.internal_new_GC(null); + long imageDC = OS.CreateCompatibleDC(hDC); device.internal_dispose_GC(hDC, null); if (imageDC == 0) SWT.error(SWT.ERROR_NO_HANDLES); @@ -2027,7 +2027,7 @@ public long /*int*/ internal_new_GC (GCData data) { * @noreference This method is not intended to be referenced by clients. */ @Override -public void internal_dispose_GC (long /*int*/ hDC, GCData data) { +public void internal_dispose_GC (long hDC, GCData data) { OS.DeleteDC(hDC); } @@ -2088,12 +2088,12 @@ public void setBackground(Color color) { transparentColor = -1; /* Get the HDC for the device */ - long /*int*/ hDC = device.internal_new_GC(null); + long hDC = device.internal_new_GC(null); /* Change the background color in the image */ BITMAP bm = new BITMAP(); OS.GetObject(handle, BITMAP.sizeof, bm); - long /*int*/ hdcMem = OS.CreateCompatibleDC(hDC); + long hdcMem = OS.CreateCompatibleDC(hDC); OS.SelectObject(hdcMem, handle); int maxColors = 1 << bm.bmBitsPixel; byte[] colors = new byte[maxColors * 4]; @@ -2138,7 +2138,7 @@ public String toString () { * * @noreference This method is not intended to be referenced by clients. */ -public static Image win32_new(Device device, int type, long /*int*/ handle) { +public static Image win32_new(Device device, int type, long handle) { Image image = new Image(device); image.type = type; image.handle = handle; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Path.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Path.java index cd8d2bc3e7..249c409c5c 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Path.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Path.java @@ -53,7 +53,7 @@ public class Path extends Resource { * * @noreference This field is not intended to be referenced by clients. */ - public long /*int*/ handle; + public long handle; PointF currentPoint = new PointF(), startPoint = new PointF(); @@ -220,9 +220,9 @@ void addArcInPixels(float x, float y, float width, float height, float startAngl if (width == height) { Gdip.GraphicsPath_AddArc(handle, x, y, width, height, -startAngle, -arcAngle); } else { - long /*int*/ path = Gdip.GraphicsPath_new(Gdip.FillModeAlternate); + long path = Gdip.GraphicsPath_new(Gdip.FillModeAlternate); if (path == 0) SWT.error(SWT.ERROR_NO_HANDLES); - long /*int*/ matrix = Gdip.Matrix_new(width, 0, 0, height, x, y); + long matrix = Gdip.Matrix_new(width, 0, 0, height, x, y); if (matrix == 0) SWT.error(SWT.ERROR_NO_HANDLES); Gdip.GraphicsPath_AddArc(path, 0, 0, 1, 1, -startAngle, -arcAngle); Gdip.GraphicsPath_Transform(path, matrix); @@ -316,9 +316,9 @@ void addStringInPixels(String string, float x, float y, Font font) { if (font == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); if (font.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT); char[] buffer = string.toCharArray(); - long /*int*/ hDC = device.internal_new_GC(null); - long /*int*/ [] family = new long /*int*/ [1]; - long /*int*/ gdipFont = GC.createGdipFont(hDC, font.handle, 0, device.fontCollection, family, null); + long hDC = device.internal_new_GC(null); + long [] family = new long [1]; + long gdipFont = GC.createGdipFont(hDC, font.handle, 0, device.fontCollection, family, null); PointF point = new PointF(); point.X = x - (Gdip.Font_GetSize(gdipFont) / 6); point.Y = y; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Pattern.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Pattern.java index 3918f5c4ec..5ff9e06a41 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Pattern.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Pattern.java @@ -51,7 +51,7 @@ public class Pattern extends Resource { * * @noreference This field is not intended to be referenced by clients. */ - public long /*int*/ handle; + public long handle; /** * Constructs a new Pattern given an image. Drawing with the resulting @@ -86,14 +86,14 @@ public Pattern(Device device, Image image) { if (image == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); if (image.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT); this.device.checkGDIP(); - long /*int*/[] gdipImage = image.createGdipImage(); - long /*int*/ img = gdipImage[0]; + long[] gdipImage = image.createGdipImage(); + long img = gdipImage[0]; int width = Gdip.Image_GetWidth(img); int height = Gdip.Image_GetHeight(img); handle = Gdip.TextureBrush_new(img, Gdip.WrapModeTile, 0, 0, width, height); Gdip.Bitmap_delete(img); if (gdipImage[1] != 0) { - long /*int*/ hHeap = OS.GetProcessHeap (); + long hHeap = OS.GetProcessHeap (); OS.HeapFree(hHeap, 0, gdipImage[1]); } if (handle == 0) SWT.error(SWT.ERROR_NO_HANDLES); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Region.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Region.java index da4c4a804f..e2409b4772 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Region.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Region.java @@ -45,7 +45,7 @@ public final class Region extends Resource { * * @noreference This field is not intended to be referenced by clients. */ - public long /*int*/ handle; + public long handle; /** * Constructs a new empty region. @@ -123,7 +123,7 @@ public void add (int[] pointArray) { } void addInPixels (int[] pointArray) { - long /*int*/ polyRgn = OS.CreatePolygonRgn(pointArray, pointArray.length / 2, OS.ALTERNATE); + long polyRgn = OS.CreatePolygonRgn(pointArray, pointArray.length / 2, OS.ALTERNATE); OS.CombineRgn (handle, handle, polyRgn, OS.RGN_OR); OS.DeleteObject (polyRgn); } @@ -174,7 +174,7 @@ public void add (int x, int y, int width, int height) { void addInPixels (int x, int y, int width, int height) { if (width < 0 || height < 0) SWT.error(SWT.ERROR_INVALID_ARGUMENT); - long /*int*/ rectRgn = OS.CreateRectRgn (x, y, x + width, y + height); + long rectRgn = OS.CreateRectRgn (x, y, x + width, y + height); OS.CombineRgn (handle, handle, rectRgn, OS.RGN_OR); OS.DeleteObject (rectRgn); } @@ -305,7 +305,7 @@ Rectangle getBoundsInPixels() { */ @Override public int hashCode () { - return (int)/*64*/handle; + return (int)handle; } /** @@ -356,7 +356,7 @@ public void intersect (int x, int y, int width, int height) { void intersectInPixels (int x, int y, int width, int height) { if (width < 0 || height < 0) SWT.error(SWT.ERROR_INVALID_ARGUMENT); - long /*int*/ rectRgn = OS.CreateRectRgn (x, y, x + width, y + height); + long rectRgn = OS.CreateRectRgn (x, y, x + width, y + height); OS.CombineRgn (handle, handle, rectRgn, OS.RGN_AND); OS.DeleteObject (rectRgn); } @@ -493,7 +493,7 @@ public void subtract (int[] pointArray) { } void subtractInPixels (int[] pointArray) { - long /*int*/ polyRgn = OS.CreatePolygonRgn(pointArray, pointArray.length / 2, OS.ALTERNATE); + long polyRgn = OS.CreatePolygonRgn(pointArray, pointArray.length / 2, OS.ALTERNATE); OS.CombineRgn (handle, handle, polyRgn, OS.RGN_DIFF); OS.DeleteObject (polyRgn); } @@ -546,7 +546,7 @@ public void subtract (int x, int y, int width, int height) { void subtractInPixels (int x, int y, int width, int height) { if (width < 0 || height < 0) SWT.error(SWT.ERROR_INVALID_ARGUMENT); - long /*int*/ rectRgn = OS.CreateRectRgn (x, y, x + width, y + height); + long rectRgn = OS.CreateRectRgn (x, y, x + width, y + height); OS.CombineRgn (handle, handle, rectRgn, OS.RGN_DIFF); OS.DeleteObject (rectRgn); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/TextLayout.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/TextLayout.java index 663d970214..711240ee36 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/TextLayout.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/TextLayout.java @@ -60,7 +60,7 @@ public final class TextLayout extends Resource { StyleItem[] allRuns; StyleItem[][] runs; int[] lineOffset, lineY, lineWidth; - long /*int*/ mLangFontLink2; + long mLangFontLink2; int verticalIndentInPoints; static final char LTR_MARK = '\u200E', RTL_MARK = '\u200F'; @@ -88,17 +88,17 @@ public final class TextLayout extends Resource { /*Script cache and analysis */ SCRIPT_ANALYSIS analysis; - long /*int*/ psc = 0; + long psc = 0; /*Shape info (malloc when the run is shaped) */ - long /*int*/ glyphs; + long glyphs; int glyphCount; - long /*int*/ clusters; - long /*int*/ visAttrs; + long clusters; + long visAttrs; /*Place info (malloc when the run is placed) */ - long /*int*/ advances; - long /*int*/ goffsets; + long advances; + long goffsets; int width; int ascentInPoints; int descentInPoints; @@ -108,15 +108,15 @@ public final class TextLayout extends Resource { int strikeoutPos, strikeoutThickness; /* Justify info (malloc during computeRuns) */ - long /*int*/ justify; + long justify; /* ScriptBreak */ - long /*int*/ psla; + long psla; - long /*int*/ fallbackFont; + long fallbackFont; void free() { - long /*int*/ hHeap = OS.GetProcessHeap(); + long hHeap = OS.GetProcessHeap(); if (psc != 0) { OS.ScriptFreeCache (psc); OS.HeapFree(hHeap, 0, psc); @@ -190,7 +190,7 @@ public TextLayout (Device device) { styles[1] = new StyleItem(); stylesCount = 2; text = ""; //$NON-NLS-1$ - long /*int*/[] ppv = new long /*int*/[1]; + long[] ppv = new long[1]; OS.OleInitialize(0); if (OS.CoCreateInstance(CLSID_CMultiLanguage, 0, OS.CLSCTX_INPROC_SERVER, IID_IMLangFontLink2, ppv) == OS.S_OK) { mLangFontLink2 = ppv[0]; @@ -227,7 +227,7 @@ void breakRun(StyleItem run) { if (run.psla != 0) return; char[] chars = new char[run.length]; segmentsText.getChars(run.start, run.start + run.length, chars, 0); - long /*int*/ hHeap = OS.GetProcessHeap(); + long hHeap = OS.GetProcessHeap(); run.psla = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, SCRIPT_LOGATTR.sizeof * chars.length); if (run.psla == 0) SWT.error(SWT.ERROR_NO_HANDLES); OS.ScriptBreak(chars, chars.length, run.analysis, run.psla); @@ -243,8 +243,8 @@ void checkLayout () { */ void computeRuns (GC gc) { if (runs != null) return; - long /*int*/ hDC = gc != null ? gc.handle : device.internal_new_GC(null); - long /*int*/ srcHdc = OS.CreateCompatibleDC(hDC); + long hDC = gc != null ? gc.handle : device.internal_new_GC(null); + long srcHdc = OS.CreateCompatibleDC(hDC); allRuns = itemize(); for (int i=0; i<allRuns.length - 1; i++) { StyleItem run = allRuns[i]; @@ -434,7 +434,7 @@ void computeRuns (GC gc) { } } lineWidth += lineIndent; - long /*int*/ hHeap = OS.GetProcessHeap(); + long hHeap = OS.GetProcessHeap(); int newLineWidth = 0; for (int j = 0; j < runs[line].length; j++) { StyleItem item = runs[line][j]; @@ -546,12 +546,12 @@ int[] computePolyline(int left, int top, int right, int bottom) { return coordinates; } -long /*int*/ createGdipBrush(int pixel, int alpha) { +long createGdipBrush(int pixel, int alpha) { int argb = ((alpha & 0xFF) << 24) | ((pixel >> 16) & 0xFF) | (pixel & 0xFF00) | ((pixel & 0xFF) << 16); return Gdip.SolidBrush_new(argb); } -long /*int*/ createGdipBrush(Color color, int alpha) { +long createGdipBrush(Color color, int alpha) { return createGdipBrush(color.handle, alpha); } @@ -648,16 +648,16 @@ void drawInPixels (GC gc, int x, int y, int selectionStart, int selectionEnd, Co int length = text.length(); if (length == 0 && flags == 0) return; y += getScaledVerticalIndent(); - long /*int*/ hdc = gc.handle; + long hdc = gc.handle; Rectangle clip = gc.getClippingInPixels(); GCData data = gc.data; - long /*int*/ gdipGraphics = data.gdipGraphics; + long gdipGraphics = data.gdipGraphics; int foreground = data.foreground; int linkColor = OS.GetSysColor (OS.COLOR_HOTLIGHT); int alpha = data.alpha; boolean gdip = gdipGraphics != 0; - long /*int*/ gdipForeground = 0; - long /*int*/ gdipLinkColor = 0; + long gdipForeground = 0; + long gdipLinkColor = 0; int state = 0; if (gdip) { gc.checkGC(GC.FOREGROUND); @@ -669,8 +669,8 @@ void drawInPixels (GC gc, int x, int y, int selectionStart, int selectionEnd, Co } } boolean hasSelection = selectionStart <= selectionEnd && selectionStart != -1 && selectionEnd != -1; - long /*int*/ gdipSelBackground = 0, gdipSelForeground = 0, gdipFont = 0, lastHFont = 0; - long /*int*/ selBackground = 0; + long gdipSelBackground = 0, gdipSelForeground = 0, gdipFont = 0, lastHFont = 0; + long selBackground = 0; int selForeground = 0; if (hasSelection || ((flags & SWT.LAST_LINE_SELECTION) != 0 && (flags & (SWT.FULL_SELECTION | SWT.DELIMITER_SELECTION)) != 0)) { int fgSel = selectionForeground != null ? selectionForeground.handle : OS.GetSysColor (OS.COLOR_HIGHLIGHTTEXT); @@ -768,11 +768,11 @@ void drawInPixels (GC gc, int x, int y, int selectionStart, int selectionEnd, Co if (!skipTab && (!run.lineBreak || run.softBreak) && !(style != null && style.metrics != null)) { OS.SetRect(rect, drawX, drawY, drawX + run.width, drawY + lineHeight); if (gdip) { - long /*int*/ hFont = getItemFont(run); + long hFont = getItemFont(run); if (hFont != lastHFont) { lastHFont = hFont; if (gdipFont != 0) Gdip.Font_delete(gdipFont); - long /*int*/ oldFont = OS.SelectObject(hdc, hFont); + long oldFont = OS.SelectObject(hdc, hFont); gdipFont = Gdip.Font_new(hdc, hFont); OS.SelectObject(hdc, oldFont); if (gdipFont == 0) SWT.error(SWT.ERROR_NO_HANDLES); @@ -781,7 +781,7 @@ void drawInPixels (GC gc, int x, int y, int selectionStart, int selectionEnd, Co gdipFont = 0; } } - long /*int*/ gdipFg = gdipForeground; + long gdipFg = gdipForeground; if (style != null && style.underline && style.underlineStyle == SWT.UNDERLINE_LINK) { if (gdipLinkColor == 0) gdipLinkColor = createGdipBrush(linkColor, alpha); gdipFg = gdipLinkColor; @@ -815,7 +815,7 @@ void drawInPixels (GC gc, int x, int y, int selectionStart, int selectionEnd, Co if (selBackground != 0) OS.DeleteObject (selBackground); } -RECT drawBorder(long /*int*/ hdc, int x, int y, int lineHeight, StyleItem[] line, int index, int color, int selectionColor, RECT clipRect, RECT pRect, int selectionStart, int selectionEnd, Rectangle drawClip) { +RECT drawBorder(long hdc, int x, int y, int lineHeight, StyleItem[] line, int index, int color, int selectionColor, RECT clipRect, RECT pRect, int selectionStart, int selectionEnd, Rectangle drawClip) { StyleItem run = line[index]; TextStyle style = run.style; if (style == null) return null; @@ -862,12 +862,12 @@ RECT drawBorder(long /*int*/ hdc, int x, int y, int lineHeight, StyleItem[] line break; } } - long /*int*/ oldBrush = OS.SelectObject(hdc, OS.GetStockObject(OS.NULL_BRUSH)); + long oldBrush = OS.SelectObject(hdc, OS.GetStockObject(OS.NULL_BRUSH)); LOGBRUSH logBrush = new LOGBRUSH(); logBrush.lbStyle = OS.BS_SOLID; - logBrush.lbColor = /*64*/(int)color; - long /*int*/ newPen = OS.ExtCreatePen(lineStyle | OS.PS_GEOMETRIC, lineWidth, logBrush, 0, null); - long /*int*/ oldPen = OS.SelectObject(hdc, newPen); + logBrush.lbColor = (int)color; + long newPen = OS.ExtCreatePen(lineStyle | OS.PS_GEOMETRIC, lineWidth, logBrush, 0, null); + long oldPen = OS.SelectObject(hdc, newPen); RECT drawRect = new RECT(); OS.SetRect(drawRect, x + left, y, x + run.x + run.width, y + lineHeight); if (drawClip != null) { @@ -888,8 +888,8 @@ RECT drawBorder(long /*int*/ hdc, int x, int y, int lineHeight, StyleItem[] line if (clipRect.left == -1) clipRect.left = 0; if (clipRect.right == -1) clipRect.right = 0x7ffff; OS.IntersectClipRect(hdc, clipRect.left, clipRect.top, clipRect.right, clipRect.bottom); - logBrush.lbColor = /*64*/(int)selectionColor; - long /*int*/ selPen = OS.ExtCreatePen (lineStyle | OS.PS_GEOMETRIC, lineWidth, logBrush, 0, null); + logBrush.lbColor = (int)selectionColor; + long selPen = OS.ExtCreatePen (lineStyle | OS.PS_GEOMETRIC, lineWidth, logBrush, 0, null); oldPen = OS.SelectObject(hdc, selPen); OS.Rectangle(hdc, drawRect.left, drawRect.top, drawRect.right, drawRect.bottom); OS.RestoreDC(hdc, state); @@ -902,7 +902,7 @@ RECT drawBorder(long /*int*/ hdc, int x, int y, int lineHeight, StyleItem[] line return clipRect; } -RECT drawBorderGDIP(long /*int*/ graphics, int x, int y, int lineHeight, StyleItem[] line, int index, long /*int*/ color, long /*int*/ selectionColor, RECT clipRect, RECT pRect, int selectionStart, int selectionEnd, int alpha, Rectangle drawClip) { +RECT drawBorderGDIP(long graphics, int x, int y, int lineHeight, StyleItem[] line, int index, long color, long selectionColor, RECT clipRect, RECT pRect, int selectionStart, int selectionEnd, int alpha, Rectangle drawClip) { StyleItem run = line[index]; TextStyle style = run.style; if (style == null) return null; @@ -920,7 +920,7 @@ RECT drawBorderGDIP(long /*int*/ graphics, int x, int y, int lineHeight, StyleIt } boolean hasSelection = selectionStart <= selectionEnd && selectionStart != -1 && selectionEnd != -1; boolean fullSelection = hasSelection && selectionStart <= start && end <= selectionEnd; - long /*int*/ brush = color; + long brush = color; if (style.borderColor != null) { brush = createGdipBrush(style.borderColor, alpha); clipRect = null; @@ -941,7 +941,7 @@ RECT drawBorderGDIP(long /*int*/ graphics, int x, int y, int lineHeight, StyleIt case SWT.BORDER_DASH: lineStyle = Gdip.DashStyleDash; break; case SWT.BORDER_DOT: lineStyle = Gdip.DashStyleDot; break; } - long /*int*/ pen = Gdip.Pen_new(brush, lineWidth); + long pen = Gdip.Pen_new(brush, lineWidth); Gdip.Pen_SetDashStyle(pen, lineStyle); Gdip.Graphics_SetPixelOffsetMode(graphics, Gdip.PixelOffsetModeNone); int smoothingMode = Gdip.Graphics_GetSmoothingMode(graphics); @@ -960,7 +960,7 @@ RECT drawBorderGDIP(long /*int*/ graphics, int x, int y, int lineHeight, StyleIt Gdip.Graphics_Restore(graphics, gstate); gstate = Gdip.Graphics_Save(graphics); Gdip.Graphics_SetClip(graphics, gdipRect, Gdip.CombineModeIntersect); - long /*int*/ selPen = Gdip.Pen_new(selectionColor, lineWidth); + long selPen = Gdip.Pen_new(selectionColor, lineWidth); Gdip.Pen_SetDashStyle(selPen, lineStyle); Gdip.Graphics_DrawRectangle(graphics, selPen, x + left, y, run.x + run.width - left - 1, lineHeight - 1); Gdip.Pen_delete(selPen); @@ -977,7 +977,7 @@ RECT drawBorderGDIP(long /*int*/ graphics, int x, int y, int lineHeight, StyleIt return clipRect; } -void drawRunBackground(StyleItem run, long /*int*/ hdc, RECT rect, int selectionStart, int selectionEnd, long /*int*/ selBrush, boolean hasSelection) { +void drawRunBackground(StyleItem run, long hdc, RECT rect, int selectionStart, int selectionEnd, long selBrush, boolean hasSelection) { int end = run.start + run.length - 1; boolean fullSelection = hasSelection && selectionStart <= run.start && selectionEnd >= end; if (fullSelection) { @@ -986,8 +986,8 @@ void drawRunBackground(StyleItem run, long /*int*/ hdc, RECT rect, int selection } else { if (run.style != null && run.style.background != null) { int bg = run.style.background.handle; - long /*int*/ hBrush = OS.CreateSolidBrush (bg); - long /*int*/ oldBrush = OS.SelectObject(hdc, hBrush); + long hBrush = OS.CreateSolidBrush (bg); + long oldBrush = OS.SelectObject(hdc, hBrush); OS.PatBlt(hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, OS.PATCOPY); OS.SelectObject(hdc, oldBrush); OS.DeleteObject(hBrush); @@ -1001,14 +1001,14 @@ void drawRunBackground(StyleItem run, long /*int*/ hdc, RECT rect, int selection } } -void drawRunBackgroundGDIP(StyleItem run, long /*int*/ graphics, RECT rect, int selectionStart, int selectionEnd, int alpha, long /*int*/ selBrush, boolean hasSelection) { +void drawRunBackgroundGDIP(StyleItem run, long graphics, RECT rect, int selectionStart, int selectionEnd, int alpha, long selBrush, boolean hasSelection) { int end = run.start + run.length - 1; boolean fullSelection = hasSelection && selectionStart <= run.start && selectionEnd >= end; if (fullSelection) { Gdip.Graphics_FillRectangle(graphics, selBrush, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top); } else { if (run.style != null && run.style.background != null) { - long /*int*/ brush = createGdipBrush(run.style.background, alpha); + long brush = createGdipBrush(run.style.background, alpha); Gdip.Graphics_FillRectangle(graphics, brush, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top); Gdip.SolidBrush_delete(brush); } @@ -1025,7 +1025,7 @@ void drawRunBackgroundGDIP(StyleItem run, long /*int*/ graphics, RECT rect, int } } -RECT drawRunText(long /*int*/ hdc, StyleItem run, RECT rect, int baselineInPixels, int color, int selectionColor, int selectionStart, int selectionEnd) { +RECT drawRunText(long hdc, StyleItem run, RECT rect, int baselineInPixels, int color, int selectionColor, int selectionStart, int selectionEnd) { int end = run.start + run.length - 1; boolean hasSelection = selectionStart <= selectionEnd && selectionStart != -1 && selectionEnd != -1; boolean fullSelection = hasSelection && selectionStart <= run.start && selectionEnd >= end; @@ -1033,7 +1033,7 @@ RECT drawRunText(long /*int*/ hdc, StyleItem run, RECT rect, int baselineInPixel int offset = (orientation & SWT.RIGHT_TO_LEFT) != 0 ? -1 : 0; int x = rect.left + offset; int y = rect.top + (baselineInPixels - DPIUtil.autoScaleUp(getDevice(), run.ascentInPoints)); - long /*int*/ hFont = getItemFont(run); + long hFont = getItemFont(run); OS.SelectObject(hdc, hFont); if (fullSelection) { color = selectionColor; @@ -1052,7 +1052,7 @@ RECT drawRunText(long /*int*/ hdc, StyleItem run, RECT rect, int baselineInPixel return fullSelection || partialSelection ? rect : null; } -RECT drawRunTextGDIP(long /*int*/ graphics, StyleItem run, RECT rect, long /*int*/ gdipFont, int baselineInPixels, long /*int*/ color, long /*int*/ selectionColor, int selectionStart, int selectionEnd, int alpha) { +RECT drawRunTextGDIP(long graphics, StyleItem run, RECT rect, long gdipFont, int baselineInPixels, long color, long selectionColor, int selectionStart, int selectionEnd, int alpha) { int end = run.start + run.length - 1; boolean hasSelection = selectionStart <= selectionEnd && selectionStart != -1 && selectionEnd != -1; boolean fullSelection = hasSelection && selectionStart <= run.start && selectionEnd >= end; @@ -1060,7 +1060,7 @@ RECT drawRunTextGDIP(long /*int*/ graphics, StyleItem run, RECT rect, long /*int int drawY = rect.top + baselineInPixels; if (run.style != null && run.style.rise != 0) drawY -= DPIUtil.autoScaleUp(getDevice(), run.style.rise); int drawX = rect.left; - long /*int*/ brush = color; + long brush = color; if (fullSelection) { brush = selectionColor; } else { @@ -1137,10 +1137,10 @@ RECT drawRunTextGDIP(long /*int*/ graphics, StyleItem run, RECT rect, long /*int return fullSelection || partialSelection ? rect : null; } -RECT drawRunTextGDIPRaster(long /*int*/ graphics, StyleItem run, RECT rect, int baselineInPixels, int color, int selectionColor, int selectionStart, int selectionEnd) { - long /*int*/ clipRgn = 0; +RECT drawRunTextGDIPRaster(long graphics, StyleItem run, RECT rect, int baselineInPixels, int color, int selectionColor, int selectionStart, int selectionEnd) { + long clipRgn = 0; Gdip.Graphics_SetPixelOffsetMode(graphics, Gdip.PixelOffsetModeNone); - long /*int*/ rgn = Gdip.Region_new(); + long rgn = Gdip.Region_new(); if (rgn == 0) SWT.error(SWT.ERROR_NO_HANDLES); Gdip.Graphics_GetClip(graphics, rgn); if (!Gdip.Region_IsInfinite(rgn, graphics)) { @@ -1149,7 +1149,7 @@ RECT drawRunTextGDIPRaster(long /*int*/ graphics, StyleItem run, RECT rect, int Gdip.Region_delete(rgn); Gdip.Graphics_SetPixelOffsetMode(graphics, Gdip.PixelOffsetModeHalf); float[] lpXform = null; - long /*int*/ matrix = Gdip.Matrix_new(1, 0, 0, 1, 0, 0); + long matrix = Gdip.Matrix_new(1, 0, 0, 1, 0, 0); if (matrix == 0) SWT.error(SWT.ERROR_NO_HANDLES); Gdip.Graphics_GetTransform(graphics, matrix); if (!Gdip.Matrix_IsIdentity(matrix)) { @@ -1157,7 +1157,7 @@ RECT drawRunTextGDIPRaster(long /*int*/ graphics, StyleItem run, RECT rect, int Gdip.Matrix_GetElements(matrix, lpXform); } Gdip.Matrix_delete(matrix); - long /*int*/ hdc = Gdip.Graphics_GetHDC(graphics); + long hdc = Gdip.Graphics_GetHDC(graphics); int state = OS.SaveDC(hdc); if (lpXform != null) { OS.SetGraphicsMode(hdc, OS.GM_ADVANCED); @@ -1177,7 +1177,7 @@ RECT drawRunTextGDIPRaster(long /*int*/ graphics, StyleItem run, RECT rect, int return pRect; } -RECT drawStrikeout(long /*int*/ hdc, int x, int baselineInPixels, StyleItem[] line, int index, int color, int selectionColor, RECT clipRect, RECT pRect, int selectionStart, int selectionEnd, Rectangle drawClip) { +RECT drawStrikeout(long hdc, int x, int baselineInPixels, StyleItem[] line, int index, int color, int selectionColor, RECT clipRect, RECT pRect, int selectionStart, int selectionEnd, Rectangle drawClip) { StyleItem run = line[index]; TextStyle style = run.style; if (style == null) return null; @@ -1211,11 +1211,11 @@ RECT drawStrikeout(long /*int*/ hdc, int x, int baselineInPixels, StyleItem[] li RECT rect = new RECT(); int riseInPixels = DPIUtil.autoScaleUp(getDevice(), style.rise); OS.SetRect(rect, x + left, baselineInPixels - run.strikeoutPos - riseInPixels, x + run.x + run.width, baselineInPixels - run.strikeoutPos + run.strikeoutThickness - riseInPixels); - long /*int*/ brush = OS.CreateSolidBrush(color); + long brush = OS.CreateSolidBrush(color); OS.FillRect(hdc, rect, brush); OS.DeleteObject(brush); if (clipRect != null) { - long /*int*/ selBrush = OS.CreateSolidBrush(selectionColor); + long selBrush = OS.CreateSolidBrush(selectionColor); if (clipRect.left == -1) clipRect.left = 0; if (clipRect.right == -1) clipRect.right = 0x7ffff; OS.SetRect(clipRect, Math.max(rect.left, clipRect.left), rect.top, Math.min(rect.right, clipRect.right), rect.bottom); @@ -1227,7 +1227,7 @@ RECT drawStrikeout(long /*int*/ hdc, int x, int baselineInPixels, StyleItem[] li return clipRect; } -RECT drawStrikeoutGDIP(long /*int*/ graphics, int x, int baselineInPixels, StyleItem[] line, int index, long /*int*/ color, long /*int*/ selectionColor, RECT clipRect, RECT pRect, int selectionStart, int selectionEnd, int alpha, Rectangle drawClip) { +RECT drawStrikeoutGDIP(long graphics, int x, int baselineInPixels, StyleItem[] line, int index, long color, long selectionColor, RECT clipRect, RECT pRect, int selectionStart, int selectionEnd, int alpha, Rectangle drawClip) { StyleItem run = line[index]; TextStyle style = run.style; if (style == null) return null; @@ -1245,7 +1245,7 @@ RECT drawStrikeoutGDIP(long /*int*/ graphics, int x, int baselineInPixels, Style } boolean hasSelection = selectionStart <= selectionEnd && selectionStart != -1 && selectionEnd != -1; boolean fullSelection = hasSelection && selectionStart <= start && end <= selectionEnd; - long /*int*/ brush = color; + long brush = color; if (style.strikeoutColor != null) { brush = createGdipBrush(style.strikeoutColor, alpha); clipRect = null; @@ -1285,7 +1285,7 @@ RECT drawStrikeoutGDIP(long /*int*/ graphics, int x, int baselineInPixels, Style return clipRect; } -RECT drawUnderline(long /*int*/ hdc, int x, int baselineInPixels, int lineUnderlinePos, int lineBottom, StyleItem[] line, int index, int color, int selectionColor, RECT clipRect, RECT pRect, int selectionStart, int selectionEnd, Rectangle drawClip) { +RECT drawUnderline(long hdc, int x, int baselineInPixels, int lineUnderlinePos, int lineBottom, StyleItem[] line, int index, int color, int selectionColor, RECT clipRect, RECT pRect, int selectionStart, int selectionEnd, Rectangle drawClip) { StyleItem run = line[index]; TextStyle style = run.style; if (style == null) return null; @@ -1331,8 +1331,8 @@ RECT drawUnderline(long /*int*/ hdc, int x, int baselineInPixels, int lineUnderl int squigglyHeight = 2 * squigglyThickness; int squigglyY = Math.min(rect.top - squigglyHeight / 2, lineBottom - squigglyHeight - 1); int[] points = computePolyline(rect.left, squigglyY, rect.right, squigglyY + squigglyHeight); - long /*int*/ pen = OS.CreatePen(OS.PS_SOLID, squigglyThickness, color); - long /*int*/ oldPen = OS.SelectObject(hdc, pen); + long pen = OS.CreatePen(OS.PS_SOLID, squigglyThickness, color); + long oldPen = OS.SelectObject(hdc, pen); int state = OS.SaveDC(hdc); OS.IntersectClipRect(hdc, rect.left, squigglyY, rect.right + 1, squigglyY + squigglyHeight + 1); OS.Polyline(hdc, points, points.length / 2); @@ -1371,7 +1371,7 @@ RECT drawUnderline(long /*int*/ hdc, int x, int baselineInPixels, int lineUnderl OS.OffsetRect(rect, 0, lineBottom - bottom); if (clipRect != null) OS.OffsetRect(clipRect, 0, lineBottom - bottom); } - long /*int*/ brush = OS.CreateSolidBrush(color); + long brush = OS.CreateSolidBrush(color); OS.FillRect(hdc, rect, brush); if (style.underlineStyle == SWT.UNDERLINE_DOUBLE) { OS.SetRect(rect, rect.left, rect.top + run.underlineThickness * 2, rect.right, rect.bottom + run.underlineThickness * 2); @@ -1379,7 +1379,7 @@ RECT drawUnderline(long /*int*/ hdc, int x, int baselineInPixels, int lineUnderl } OS.DeleteObject(brush); if (clipRect != null) { - long /*int*/ selBrush = OS.CreateSolidBrush(selectionColor); + long selBrush = OS.CreateSolidBrush(selectionColor); OS.FillRect(hdc, clipRect, selBrush); if (style.underlineStyle == SWT.UNDERLINE_DOUBLE) { OS.SetRect(clipRect, clipRect.left, rect.top, clipRect.right, rect.bottom); @@ -1391,8 +1391,8 @@ RECT drawUnderline(long /*int*/ hdc, int x, int baselineInPixels, int lineUnderl case UNDERLINE_IME_DASH: case UNDERLINE_IME_DOT: { int penStyle = style.underlineStyle == UNDERLINE_IME_DASH ? OS.PS_DASH : OS.PS_DOT; - long /*int*/ pen = OS.CreatePen(penStyle, 1, color); - long /*int*/ oldPen = OS.SelectObject(hdc, pen); + long pen = OS.CreatePen(penStyle, 1, color); + long oldPen = OS.SelectObject(hdc, pen); int descentInPixels = DPIUtil.autoScaleUp(getDevice(), run.descentInPoints); OS.SetRect(rect, rect.left, baselineInPixels + descentInPixels, rect.right, baselineInPixels + descentInPixels + run.underlineThickness); OS.MoveToEx(hdc, rect.left, rect.top, 0); @@ -1416,7 +1416,7 @@ RECT drawUnderline(long /*int*/ hdc, int x, int baselineInPixels, int lineUnderl return clipRect; } -RECT drawUnderlineGDIP (long /*int*/ graphics, int x, int baselineInPixels, int lineUnderlinePos, int lineBottom, StyleItem[] line, int index, long /*int*/ color, long /*int*/ selectionColor, RECT clipRect, RECT pRect, int selectionStart, int selectionEnd, int alpha, Rectangle drawClip) { +RECT drawUnderlineGDIP (long graphics, int x, int baselineInPixels, int lineUnderlinePos, int lineBottom, StyleItem[] line, int index, long color, long selectionColor, RECT clipRect, RECT pRect, int selectionStart, int selectionEnd, int alpha, Rectangle drawClip) { StyleItem run = line[index]; TextStyle style = run.style; if (style == null) return null; @@ -1434,7 +1434,7 @@ RECT drawUnderlineGDIP (long /*int*/ graphics, int x, int baselineInPixels, int } boolean hasSelection = selectionStart <= selectionEnd && selectionStart != -1 && selectionEnd != -1; boolean fullSelection = hasSelection && selectionStart <= start && end <= selectionEnd; - long /*int*/ brush = color; + long brush = color; if (style.underlineColor != null) { brush = createGdipBrush(style.underlineColor, alpha); clipRect = null; @@ -1473,7 +1473,7 @@ RECT drawUnderlineGDIP (long /*int*/ graphics, int x, int baselineInPixels, int int squigglyHeight = 2 * squigglyThickness; int squigglyY = Math.min(rect.top - squigglyHeight / 2, lineBottom - squigglyHeight - 1); int[] points = computePolyline(rect.left, squigglyY, rect.right, squigglyY + squigglyHeight); - long /*int*/ pen = Gdip.Pen_new(brush, squigglyThickness); + long pen = Gdip.Pen_new(brush, squigglyThickness); gstate = Gdip.Graphics_Save(graphics); if (gdipRect != null) { Gdip.Graphics_SetClip(graphics, gdipRect, Gdip.CombineModeExclude); @@ -1487,7 +1487,7 @@ RECT drawUnderlineGDIP (long /*int*/ graphics, int x, int baselineInPixels, int } Gdip.Graphics_DrawLines(graphics, pen, points, points.length / 2); if (gdipRect != null) { - long /*int*/ selPen = Gdip.Pen_new(selectionColor, squigglyThickness); + long selPen = Gdip.Pen_new(selectionColor, squigglyThickness); Gdip.Graphics_Restore(graphics, gstate); gstate = Gdip.Graphics_Save(graphics); Gdip.Graphics_SetClip(graphics, gdipRect, Gdip.CombineModeIntersect); @@ -1538,7 +1538,7 @@ RECT drawUnderlineGDIP (long /*int*/ graphics, int x, int baselineInPixels, int break; case UNDERLINE_IME_DOT: case UNDERLINE_IME_DASH: { - long /*int*/ pen = Gdip.Pen_new(brush, 1); + long pen = Gdip.Pen_new(brush, 1); int dashStyle = style.underlineStyle == UNDERLINE_IME_DOT ? Gdip.DashStyleDot : Gdip.DashStyleDash; Gdip.Pen_SetDashStyle(pen, dashStyle); if (gdipRect != null) { @@ -1551,7 +1551,7 @@ RECT drawUnderlineGDIP (long /*int*/ graphics, int x, int baselineInPixels, int Gdip.Graphics_Restore(graphics, gstate); gstate = Gdip.Graphics_Save(graphics); Gdip.Graphics_SetClip(graphics, gdipRect, Gdip.CombineModeIntersect); - long /*int*/ selPen = Gdip.Pen_new(brush, 1); + long selPen = Gdip.Pen_new(brush, 1); Gdip.Pen_SetDashStyle(selPen, dashStyle); Gdip.Graphics_DrawLine(graphics, selPen, rect.left, baselineInPixels + descentInPixels, run.width - run.length, baselineInPixels + descentInPixels); Gdip.Graphics_Restore(graphics, gstate); @@ -1708,7 +1708,7 @@ Rectangle getBoundsInPixels (int start, int end) { cx = metrics.getWidthInPixels() * (start - run.start); } else if (!run.tab) { int[] piX = new int[1]; - long /*int*/ advances = run.justify != 0 ? run.justify : run.advances; + long advances = run.justify != 0 ? run.justify : run.advances; OS.ScriptCPtoX(start - run.start, false, run.length, run.glyphCount, run.clusters, run.visAttrs, advances, run.analysis, piX); cx = isRTL ? run.width - piX[0] : piX[0]; } @@ -1725,7 +1725,7 @@ Rectangle getBoundsInPixels (int start, int end) { cx = metrics.getWidthInPixels() * (end - run.start + 1); } else if (!run.tab) { int[] piX = new int[1]; - long /*int*/ advances = run.justify != 0 ? run.justify : run.advances; + long advances = run.justify != 0 ? run.justify : run.advances; OS.ScriptCPtoX(end - run.start, true, run.length, run.glyphCount, run.clusters, run.visAttrs, advances, run.analysis, piX); cx = isRTL ? run.width - piX[0] : piX[0]; } @@ -1817,7 +1817,7 @@ public boolean getJustify () { return justify; } -long /*int*/ getItemFont (StyleItem item) { +long getItemFont (StyleItem item) { if (item.fallbackFont != 0) return item.fallbackFont; if (item.style != null && item.style.font != null) { return item.style.font.handle; @@ -1975,8 +1975,8 @@ public FontMetrics getLineMetrics (int lineIndex) { checkLayout(); computeRuns(null); if (!(0 <= lineIndex && lineIndex < runs.length)) SWT.error(SWT.ERROR_INVALID_RANGE); - long /*int*/ hDC = device.internal_new_GC(null); - long /*int*/ srcHdc = OS.CreateCompatibleDC(hDC); + long hDC = device.internal_new_GC(null); + long srcHdc = OS.CreateCompatibleDC(hDC); TEXTMETRIC lptm = new TEXTMETRIC(); OS.SelectObject(srcHdc, font != null ? font.handle : device.systemFont.handle); OS.GetTextMetrics(srcHdc, lptm); @@ -2103,7 +2103,7 @@ Point getLocationInPixels (int offset, boolean trailing) { int cChars = run.length; int gGlyphs = run.glyphCount; int[] piX = new int[1]; - long /*int*/ advances = run.justify != 0 ? run.justify : run.advances; + long advances = run.justify != 0 ? run.justify : run.advances; OS.ScriptCPtoX(runOffset, trailing, cChars, gGlyphs, run.clusters, run.visAttrs, advances, run.analysis, piX); width = (orientation & SWT.RIGHT_TO_LEFT) != 0 ? run.width - piX[0] : piX[0]; } @@ -2320,7 +2320,7 @@ int getOffsetInPixels (int x, int y, int[] trailing) { if ((orientation & SWT.RIGHT_TO_LEFT) != 0) { xRun = run.width - xRun; } - long /*int*/ advances = run.justify != 0 ? run.justify : run.advances; + long advances = run.justify != 0 ? run.justify : run.advances; OS.ScriptXtoCP(xRun, cChars, cGlyphs, run.clusters, run.visAttrs, advances, run.analysis, piCP, piTrailing); int offset = run.start + piCP[0]; int length = segmentsText.length(); @@ -2376,7 +2376,7 @@ void getPartialSelection(StyleItem run, int selectionStart, int selectionEnd, RE int gGlyphs = run.glyphCount; int[] piX = new int[1]; int x = rect.left; - long /*int*/ advances = run.justify != 0 ? run.justify : run.advances; + long advances = run.justify != 0 ? run.justify : run.advances; OS.ScriptCPtoX(selStart, false, cChars, gGlyphs, run.clusters, run.visAttrs, advances, run.analysis, piX); int runX = (orientation & SWT.RIGHT_TO_LEFT) != 0 ? run.width - piX[0] : piX[0]; rect.left = x + runX; @@ -2732,8 +2732,8 @@ StyleItem[] itemize () { OS.ScriptApplyDigitSubstitution(null, scriptControl, scriptState); - long /*int*/ hHeap = OS.GetProcessHeap(); - long /*int*/ pItems = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, MAX_ITEM * SCRIPT_ITEM.sizeof); + long hHeap = OS.GetProcessHeap(); + long pItems = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, MAX_ITEM * SCRIPT_ITEM.sizeof); if (pItems == 0) SWT.error(SWT.ERROR_NO_HANDLES); int[] pcItems = new int[1]; char[] chars = new char[length]; @@ -2749,7 +2749,7 @@ StyleItem[] itemize () { /* * Merge styles ranges and script items */ -StyleItem[] merge (long /*int*/ items, int itemCount) { +StyleItem[] merge (long items, int itemCount) { if (styles.length > stylesCount) { StyleItem[] newStyles = new StyleItem[stylesCount]; System.arraycopy(styles, 0, newStyles, 0, stylesCount); @@ -3414,7 +3414,7 @@ void setWrapIndentInPixels (int wrapIndent) { this.wrapIndent = wrapIndent; } -boolean shape (long /*int*/ hdc, StyleItem run, char[] chars, int[] glyphCount, int maxGlyphs, SCRIPT_PROPERTIES sp) { +boolean shape (long hdc, StyleItem run, char[] chars, int[] glyphCount, int maxGlyphs, SCRIPT_PROPERTIES sp) { boolean useCMAPcheck = !sp.fComplex && !run.analysis.fNoGlyphIndex; if (useCMAPcheck) { short[] glyphs = new short[chars.length]; @@ -3422,7 +3422,7 @@ boolean shape (long /*int*/ hdc, StyleItem run, char[] chars, int[] glyphCount, if (run.psc != 0) { OS.ScriptFreeCache(run.psc); glyphCount[0] = 0; - OS.MoveMemory(run.psc, new long /*int*/ [1], C.PTR_SIZEOF); + OS.MoveMemory(run.psc, new long [1], C.PTR_SIZEOF); } return false; } @@ -3447,14 +3447,14 @@ boolean shape (long /*int*/ hdc, StyleItem run, char[] chars, int[] glyphCount, if (run.psc != 0) { OS.ScriptFreeCache(run.psc); glyphCount[0] = 0; - OS.MoveMemory(run.psc, new long /*int*/ [1], C.PTR_SIZEOF); + OS.MoveMemory(run.psc, new long [1], C.PTR_SIZEOF); } run.glyphCount = 0; return false; } -long /*int*/ createMetafileWithChars(long /*int*/ hdc, long /*int*/ hFont, char[] chars, int charCount) { - long /*int*/ hHeap = OS.GetProcessHeap(); +long createMetafileWithChars(long hdc, long hFont, char[] chars, int charCount) { + long hHeap = OS.GetProcessHeap(); /* * The native string must remain unchanged between ScriptStringAnalyse and ScriptStringOut. @@ -3466,12 +3466,12 @@ long /*int*/ createMetafileWithChars(long /*int*/ hdc, long /*int*/ hFont, char[ * temporary native string which will be deallocated upon return from ScriptStringAnalyse. */ int nativeStringSize = charCount * Character.BYTES; - long /*int*/ nativeString = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, nativeStringSize); + long nativeString = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, nativeStringSize); OS.MoveMemory (nativeString, chars, nativeStringSize); - long /*int*/ ssa = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, OS.SCRIPT_STRING_ANALYSIS_sizeof()); - long /*int*/ metaFileDc = OS.CreateEnhMetaFile(hdc, null, null, null); - long /*int*/ oldMetaFont = OS.SelectObject(metaFileDc, hFont); + long ssa = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, OS.SCRIPT_STRING_ANALYSIS_sizeof()); + long metaFileDc = OS.CreateEnhMetaFile(hdc, null, null, null); + long oldMetaFont = OS.SelectObject(metaFileDc, hFont); int flags = OS.SSA_METAFILE | OS.SSA_FALLBACK | OS.SSA_GLYPHS | OS.SSA_LINK; if (OS.ScriptStringAnalyse(metaFileDc, nativeString, charCount, 0, -1, flags, 0, null, null, 0, 0, 0, ssa) == OS.S_OK) { OS.ScriptStringOut(ssa, 0, 0, 0, null, 0, 0, false); @@ -3486,7 +3486,7 @@ long /*int*/ createMetafileWithChars(long /*int*/ hdc, long /*int*/ hFont, char[ /* * Generate glyphs for one Run. */ -void shape (final long /*int*/ hdc, final StyleItem run) { +void shape (final long hdc, final StyleItem run) { if (run.lineBreak) return; if (run.glyphs != 0) return; final int[] buffer = new int[1]; @@ -3494,7 +3494,7 @@ void shape (final long /*int*/ hdc, final StyleItem run) { segmentsText.getChars(run.start, run.start + run.length, chars, 0); final int maxGlyphs = (chars.length * 3 / 2) + 16; - long /*int*/ hHeap = OS.GetProcessHeap(); + long hHeap = OS.GetProcessHeap(); run.glyphs = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, maxGlyphs * 2); if (run.glyphs == 0) SWT.error(SWT.ERROR_NO_HANDLES); run.clusters = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, maxGlyphs * 2); @@ -3514,8 +3514,8 @@ void shape (final long /*int*/ hdc, final StyleItem run) { } } if (!shapeSucceed) { - long /*int*/ hFont = OS.GetCurrentObject(hdc, OS.OBJ_FONT); - long /*int*/ newFont = 0; + long hFont = OS.GetCurrentObject(hdc, OS.OBJ_FONT); + long newFont = 0; /* * Bug in Uniscribe. In some version of Uniscribe, ScriptStringAnalyse crashes * when the character array is too long. The fix is to limit the size of character @@ -3534,10 +3534,10 @@ void shape (final long /*int*/ hdc, final StyleItem run) { } } if (count > 0) { - long /*int*/ metaFile = createMetafileWithChars(hdc, hFont, sampleChars, count); + long metaFile = createMetafileWithChars(hdc, hFont, sampleChars, count); final EMREXTCREATEFONTINDIRECTW emr = new EMREXTCREATEFONTINDIRECTW(); class MetaFileEnumProc { - long /*int*/ metaFileEnumProc (long /*int*/ hDC, long /*int*/ table, long /*int*/ record, long /*int*/ nObj, long /*int*/ lpData) { + long metaFileEnumProc (long hDC, long table, long record, long nObj, long lpData) { OS.MoveMemory(emr.emr, record, EMR.sizeof); switch (emr.emr.iType) { case OS.EMR_EXTCREATEFONTINDIRECTW: @@ -3554,7 +3554,7 @@ void shape (final long /*int*/ hdc, final StyleItem run) { boolean compilerWarningWorkaround = false; if (compilerWarningWorkaround) object.metaFileEnumProc(0, 0, 0, 0, 0); Callback callback = new Callback(object, "metaFileEnumProc", 5); - long /*int*/ address = callback.getAddress(); + long address = callback.getAddress(); if (address == 0) SWT.error(SWT.ERROR_NO_MORE_CALLBACKS); OS.EnumEnhMetaFile(0, metaFile, address, 0, null); OS.DeleteEnhMetaFile(metaFile); @@ -3573,7 +3573,7 @@ void shape (final long /*int*/ hdc, final StyleItem run) { if (index > 0) { StyleItem pRun = allRuns[index - 1]; if (pRun.analysis.eScript == run.analysis.eScript) { - long /*int*/ pFont = getItemFont(pRun); + long pFont = getItemFont(pRun); LOGFONT logFont = new LOGFONT (); OS.GetObject(pFont, LOGFONT.sizeof, logFont); newFont = OS.CreateFontIndirect(logFont); @@ -3585,7 +3585,7 @@ void shape (final long /*int*/ hdc, final StyleItem run) { if (nRun.analysis.eScript == run.analysis.eScript) { OS.SelectObject(hdc, getItemFont(nRun)); shape(hdc, nRun); - long /*int*/ nFont = getItemFont(nRun); + long nFont = getItemFont(nRun); LOGFONT logFont = new LOGFONT (); OS.GetObject(nFont, LOGFONT.sizeof, logFont); newFont = OS.CreateFontIndirect(logFont); @@ -3615,7 +3615,7 @@ void shape (final long /*int*/ hdc, final StyleItem run) { } if (!shapeSucceed) { if (mLangFontLink2 != 0) { - long /*int*/[] hNewFont = new long /*int*/[1]; + long[] hNewFont = new long[1]; int[] dwCodePages = new int[1], cchCodePages = new int[1]; /* GetStrCodePages() */ OS.VtblCall(4, mLangFontLink2, chars, chars.length, 0, dwCodePages, cchCodePages); @@ -3625,8 +3625,8 @@ void shape (final long /*int*/ hdc, final StyleItem run) { OS.GetObject(hNewFont[0], LOGFONT.sizeof, logFont); /* ReleaseFont() */ OS.VtblCall(8, mLangFontLink2, hNewFont[0]); - long /*int*/ mLangFont = OS.CreateFontIndirect(logFont); - long /*int*/ oldFont = OS.SelectObject(hdc, mLangFont); + long mLangFont = OS.CreateFontIndirect(logFont); + long oldFont = OS.SelectObject(hdc, mLangFont); if (shapeSucceed = shape(hdc, run, chars, buffer, maxGlyphs, sp)) { run.fallbackFont = mLangFont; } else { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Transform.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Transform.java index 29de64d3f2..6e666ba735 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Transform.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Transform.java @@ -49,7 +49,7 @@ public class Transform extends Resource { * * @noreference This field is not intended to be referenced by clients. */ - public long /*int*/ handle; + public long handle; /** * Constructs a new identity Transform. diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/BidiUtil.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/BidiUtil.java index 992b0b4df4..4cb9407dfe 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/BidiUtil.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/BidiUtil.java @@ -110,7 +110,7 @@ public class BidiUtil { * @param runnable the code that should be executed when a keyboard language change * occurs */ -public static void addLanguageListener (long /*int*/ hwnd, Runnable runnable) { +public static void addLanguageListener (long hwnd, Runnable runnable) { languageMap.put(new LONG(hwnd), runnable); subclass(hwnd); } @@ -120,12 +120,12 @@ public static void addLanguageListener (Control control, Runnable runnable) { /** * Proc used for OS.EnumSystemLanguageGroups call during isBidiPlatform test. */ -static long /*int*/ EnumSystemLanguageGroupsProc(long /*int*/ lpLangGrpId, long /*int*/ lpLangGrpIdString, long /*int*/ lpLangGrpName, long /*int*/ options, long /*int*/ lParam) { - if ((int)/*64*/lpLangGrpId == OS.LGRPID_HEBREW) { +static long EnumSystemLanguageGroupsProc(long lpLangGrpId, long lpLangGrpIdString, long lpLangGrpName, long options, long lParam) { + if ((int)lpLangGrpId == OS.LGRPID_HEBREW) { isBidiPlatform = 1; return 0; } - if ((int)/*64*/lpLangGrpId == OS.LGRPID_ARABIC) { + if ((int)lpLangGrpId == OS.LGRPID_ARABIC) { isBidiPlatform = 1; return 0; } @@ -173,7 +173,7 @@ public static void drawGlyphs(GC gc, char[] renderBuffer, int[] renderDx, int x, */ public static char[] getRenderInfo(GC gc, String text, int[] order, byte[] classBuffer, int[] dx, int flags, int [] offsets) { int fontLanguageInfo = OS.GetFontLanguageInfo(gc.handle); - long /*int*/ hHeap = OS.GetProcessHeap(); + long hHeap = OS.GetProcessHeap(); boolean isRightOriented = OS.GetLayout(gc.handle) != 0; char [] textBuffer = text.toCharArray(); int byteCount = textBuffer.length; @@ -183,10 +183,10 @@ public static char[] getRenderInfo(GC gc, String text, int[] order, byte[] class GCP_RESULTS result = new GCP_RESULTS(); result.lStructSize = GCP_RESULTS.sizeof; result.nGlyphs = byteCount; - long /*int*/ lpOrder = result.lpOrder = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, byteCount * 4); - long /*int*/ lpDx = result.lpDx = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, byteCount * 4); - long /*int*/ lpClass = result.lpClass = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, byteCount); - long /*int*/ lpGlyphs = result.lpGlyphs = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, byteCount * 2); + long lpOrder = result.lpOrder = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, byteCount * 4); + long lpDx = result.lpDx = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, byteCount * 4); + long lpClass = result.lpClass = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, byteCount); + long lpGlyphs = result.lpGlyphs = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, byteCount * 2); // set required dwFlags int dwFlags = 0; @@ -300,7 +300,7 @@ public static char[] getRenderInfo(GC gc, String text, int[] order, byte[] class */ public static void getOrderInfo(GC gc, String text, int[] order, byte[] classBuffer, int flags, int [] offsets) { int fontLanguageInfo = OS.GetFontLanguageInfo(gc.handle); - long /*int*/ hHeap = OS.GetProcessHeap(); + long hHeap = OS.GetProcessHeap(); char [] textBuffer = text.toCharArray(); int byteCount = textBuffer.length; boolean isRightOriented = OS.GetLayout(gc.handle) != 0; @@ -308,8 +308,8 @@ public static void getOrderInfo(GC gc, String text, int[] order, byte[] classBuf GCP_RESULTS result = new GCP_RESULTS(); result.lStructSize = GCP_RESULTS.sizeof; result.nGlyphs = byteCount; - long /*int*/ lpOrder = result.lpOrder = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, byteCount * 4); - long /*int*/ lpClass = result.lpClass = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, byteCount); + long lpOrder = result.lpOrder = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, byteCount * 4); + long lpClass = result.lpClass = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, byteCount); // set required dwFlags, these values will affect how the text gets rendered and // ordered @@ -396,7 +396,7 @@ public static int getFontBidiAttributes(GC gc) { * KEYBOARD_NON_BIDI) */ public static int getKeyboardLanguage() { - long /*int*/ layout = OS.GetKeyboardLayout(0); + long layout = OS.GetKeyboardLayout(0); return isBidiLang(layout) ? KEYBOARD_BIDI : KEYBOARD_NON_BIDI; } /** @@ -405,15 +405,15 @@ public static int getKeyboardLanguage() { * * @return integer array with an entry for each installed language */ -static long /*int*/[] getKeyboardLanguageList() { +static long[] getKeyboardLanguageList() { int maxSize = 10; - long /*int*/[] tempList = new long /*int*/[maxSize]; + long[] tempList = new long[maxSize]; int size = OS.GetKeyboardLayoutList(maxSize, tempList); - long /*int*/[] list = new long /*int*/[size]; + long[] list = new long[size]; System.arraycopy(tempList, 0, list, 0, size); return list; } -static boolean isBidiLang(long /*int*/ lang) { +static boolean isBidiLang(long lang) { int id = OS.PRIMARYLANGID(OS.LOWORD(lang)); return id == LANG_ARABIC || id == LANG_HEBREW || id == LANG_FARSI; } @@ -443,7 +443,7 @@ public static boolean isBidiPlatform() { Callback callback = null; try { callback = new Callback (Class.forName (CLASS_NAME), "EnumSystemLanguageGroupsProc", 5); //$NON-NLS-1$ - long /*int*/ lpEnumSystemLanguageGroupsProc = callback.getAddress (); + long lpEnumSystemLanguageGroupsProc = callback.getAddress (); if (lpEnumSystemLanguageGroupsProc == 0) SWT.error(SWT.ERROR_NO_MORE_CALLBACKS); OS.EnumSystemLanguageGroups(lpEnumSystemLanguageGroupsProc, OS.LGRPID_INSTALLED, 0); callback.dispose (); @@ -467,7 +467,7 @@ public static boolean isBidiPlatform() { * @return true if bidi is supported, false otherwise. */ public static boolean isKeyboardBidi() { - long /*int*/[] list = getKeyboardLanguageList(); + long[] list = getKeyboardLanguageList(); for (int i=0; i<list.length; i++) { if (isBidiLang(list[i])) { return true; @@ -481,7 +481,7 @@ public static boolean isKeyboardBidi() { * * @param hwnd the handle of the Control that is listening for keyboard language changes */ -public static void removeLanguageListener (long /*int*/ hwnd) { +public static void removeLanguageListener (long hwnd) { languageMap.remove(new LONG(hwnd)); unsubclass(hwnd); } @@ -516,9 +516,9 @@ public static int resolveTextDirection (String text) { GCP_RESULTS result = new GCP_RESULTS(); result.lStructSize = GCP_RESULTS.sizeof; int nGlyphs = result.nGlyphs = ltrProbe.length; - long /*int*/ hHeap = OS.GetProcessHeap(); - long /*int*/ lpOrder = result.lpOrder = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, nGlyphs * 4); - long /*int*/ hdc = OS.GetDC(0); + long hHeap = OS.GetProcessHeap(); + long lpOrder = result.lpOrder = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, nGlyphs * 4); + long hdc = OS.GetDC(0); int[] order = new int[1]; int textDirection = SWT.NONE; for (int i = 0; i < length; i++) { @@ -560,7 +560,7 @@ public static int resolveTextDirection (String text) { public static void setKeyboardLanguage(int language) { if (language == getKeyboardLanguage()) return; boolean bidi = language == KEYBOARD_BIDI; - long /*int*/[] list = getKeyboardLanguageList(); + long[] list = getKeyboardLanguageList(); for (int i=0; i<list.length; i++) { if (bidi == isBidiLang(list[i])) { OS.ActivateKeyboardLayout(list[i], 0); @@ -578,7 +578,7 @@ public static void setKeyboardLanguage(int language) { * @return true if the orientation was changed, false if the orientation * could not be changed */ -public static boolean setOrientation (long /*int*/ hwnd, int orientation) { +public static boolean setOrientation (long hwnd, int orientation) { int bits = OS.GetWindowLong (hwnd, OS.GWL_EXSTYLE); if ((orientation & SWT.RIGHT_TO_LEFT) != 0) { bits |= OS.WS_EX_LAYOUTRTL; @@ -596,10 +596,10 @@ public static boolean setOrientation (Control control, int orientation) { * * @param hwnd control to override the window proc of */ -static void subclass(long /*int*/ hwnd) { +static void subclass(long hwnd) { LONG key = new LONG(hwnd); if (oldProcMap.get(key) == null) { - long /*int*/ oldProc = OS.GetWindowLongPtr(hwnd, OS.GWLP_WNDPROC); + long oldProc = OS.GetWindowLongPtr(hwnd, OS.GWLP_WNDPROC); oldProcMap.put(key, new LONG(oldProc)); OS.SetWindowLongPtr(hwnd, OS.GWLP_WNDPROC, callback.getAddress()); } @@ -656,7 +656,7 @@ static void translateOrder(int[] orderArray, int glyphCount, boolean isRightOrie * * @param hwnd control to remove the window proc override for */ -static void unsubclass(long /*int*/ hwnd) { +static void unsubclass(long hwnd) { LONG key = new LONG(hwnd); if (languageMap.get(key) == null) { LONG proc = oldProcMap.remove(key); @@ -673,16 +673,16 @@ static void unsubclass(long /*int*/ hwnd) { * change event * @param msg window message */ -static long /*int*/ windowProc (long /*int*/ hwnd, long /*int*/ msg, long /*int*/ wParam, long /*int*/ lParam) { +static long windowProc (long hwnd, long msg, long wParam, long lParam) { LONG key = new LONG (hwnd); - switch ((int)/*64*/msg) { + switch ((int)msg) { case OS.WM_INPUTLANGCHANGE: Runnable runnable = languageMap.get (key); if (runnable != null) runnable.run (); break; } LONG oldProc = oldProcMap.get(key); - return OS.CallWindowProc (oldProc.value, hwnd, (int)/*64*/msg, wParam, lParam); + return OS.CallWindowProc (oldProc.value, hwnd, (int)msg, wParam, lParam); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/ImageList.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/ImageList.java index 3859a51c39..6b8905b6a9 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/ImageList.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/ImageList.java @@ -19,7 +19,7 @@ import org.eclipse.swt.graphics.*; import org.eclipse.swt.internal.win32.*; public class ImageList { - long /*int*/ handle; + long handle; int style, refCount; Image [] images; @@ -63,13 +63,13 @@ public int addRef() { return ++refCount; } -long /*int*/ copyBitmap (long /*int*/ hImage, int width, int height) { +long copyBitmap (long hImage, int width, int height) { BITMAP bm = new BITMAP (); OS.GetObject (hImage, BITMAP.sizeof, bm); - long /*int*/ hDC = OS.GetDC (0); - long /*int*/ hdc1 = OS.CreateCompatibleDC (hDC); + long hDC = OS.GetDC (0); + long hdc1 = OS.CreateCompatibleDC (hDC); OS.SelectObject (hdc1, hImage); - long /*int*/ hdc2 = OS.CreateCompatibleDC (hDC); + long hdc2 = OS.CreateCompatibleDC (hDC); /* * Feature in Windows. If a bitmap has a 32-bit depth and any * pixel has an alpha value different than zero, common controls @@ -80,7 +80,7 @@ long /*int*/ copyBitmap (long /*int*/ hImage, int width, int height) { * remove the alpha channel of opaque images by down sampling * it to 24-bit depth. */ - long /*int*/ hBitmap; + long hBitmap; if (bm.bmBitsPixel == 32) { BITMAPINFOHEADER bmiHeader = new BITMAPINFOHEADER(); bmiHeader.biSize = BITMAPINFOHEADER.sizeof; @@ -91,7 +91,7 @@ long /*int*/ copyBitmap (long /*int*/ hImage, int width, int height) { bmiHeader.biCompression = OS.BI_RGB; byte[] bmi = new byte[BITMAPINFOHEADER.sizeof]; OS.MoveMemory(bmi, bmiHeader, BITMAPINFOHEADER.sizeof); - long /*int*/[] pBits = new long /*int*/[1]; + long[] pBits = new long[1]; hBitmap = OS.CreateDIBSection(0, bmi, OS.DIB_RGB_COLORS, pBits, 0, 0); } else { hBitmap = OS.CreateCompatibleBitmap (hDC, width, height); @@ -109,22 +109,22 @@ long /*int*/ copyBitmap (long /*int*/ hImage, int width, int height) { return hBitmap; } -long /*int*/ copyIcon (long /*int*/ hImage, int width, int height) { - long /*int*/ hIcon = OS.CopyImage (hImage, OS.IMAGE_ICON, width, height, 0); +long copyIcon (long hImage, int width, int height) { + long hIcon = OS.CopyImage (hImage, OS.IMAGE_ICON, width, height, 0); return hIcon != 0 ? hIcon : hImage; } -long /*int*/ copyWithAlpha (long /*int*/ hBitmap, int background, byte[] alphaData, int destWidth, int destHeight) { +long copyWithAlpha (long hBitmap, int background, byte[] alphaData, int destWidth, int destHeight) { BITMAP bm = new BITMAP (); OS.GetObject (hBitmap, BITMAP.sizeof, bm); int srcWidth = bm.bmWidth; int srcHeight = bm.bmHeight; /* Create resources */ - long /*int*/ hdc = OS.GetDC (0); - long /*int*/ srcHdc = OS.CreateCompatibleDC (hdc); - long /*int*/ oldSrcBitmap = OS.SelectObject (srcHdc, hBitmap); - long /*int*/ memHdc = OS.CreateCompatibleDC (hdc); + long hdc = OS.GetDC (0); + long srcHdc = OS.CreateCompatibleDC (hdc); + long oldSrcBitmap = OS.SelectObject (srcHdc, hBitmap); + long memHdc = OS.CreateCompatibleDC (hdc); BITMAPINFOHEADER bmiHeader = new BITMAPINFOHEADER (); bmiHeader.biSize = BITMAPINFOHEADER.sizeof; bmiHeader.biWidth = srcWidth; @@ -134,10 +134,10 @@ long /*int*/ copyWithAlpha (long /*int*/ hBitmap, int background, byte[] alphaDa bmiHeader.biCompression = OS.BI_RGB; byte [] bmi = new byte[BITMAPINFOHEADER.sizeof]; OS.MoveMemory (bmi, bmiHeader, BITMAPINFOHEADER.sizeof); - long /*int*/ [] pBits = new long /*int*/ [1]; - long /*int*/ memDib = OS.CreateDIBSection (0, bmi, OS.DIB_RGB_COLORS, pBits, 0, 0); + long [] pBits = new long [1]; + long memDib = OS.CreateDIBSection (0, bmi, OS.DIB_RGB_COLORS, pBits, 0, 0); if (memDib == 0) SWT.error (SWT.ERROR_NO_HANDLES); - long /*int*/ oldMemBitmap = OS.SelectObject (memHdc, memDib); + long oldMemBitmap = OS.SelectObject (memHdc, memDib); BITMAP dibBM = new BITMAP (); OS.GetObject (memDib, BITMAP.sizeof, dibBM); @@ -186,10 +186,10 @@ long /*int*/ copyWithAlpha (long /*int*/ hBitmap, int background, byte[] alphaDa bmiHeader2.biCompression = OS.BI_RGB; byte [] bmi2 = new byte[BITMAPINFOHEADER.sizeof]; OS.MoveMemory (bmi2, bmiHeader2, BITMAPINFOHEADER.sizeof); - long /*int*/ [] pBits2 = new long /*int*/ [1]; - long /*int*/ memDib2 = OS.CreateDIBSection (0, bmi2, OS.DIB_RGB_COLORS, pBits2, 0, 0); - long /*int*/ memHdc2 = OS.CreateCompatibleDC (hdc); - long /*int*/ oldMemBitmap2 = OS.SelectObject (memHdc2, memDib2); + long [] pBits2 = new long [1]; + long memDib2 = OS.CreateDIBSection (0, bmi2, OS.DIB_RGB_COLORS, pBits2, 0, 0); + long memHdc2 = OS.CreateCompatibleDC (hdc); + long oldMemBitmap2 = OS.SelectObject (memHdc2, memDib2); OS.SetStretchBltMode(memHdc2, OS.COLORONCOLOR); OS.StretchBlt (memHdc2, 0, 0, destWidth, destHeight, memHdc, 0, 0, srcWidth, srcHeight, OS.SRCCOPY); OS.SelectObject (memHdc2, oldMemBitmap2); @@ -208,7 +208,7 @@ long /*int*/ copyWithAlpha (long /*int*/ hBitmap, int background, byte[] alphaDa return memDib; } -long /*int*/ createMaskFromAlpha (ImageData data, int destWidth, int destHeight) { +long createMaskFromAlpha (ImageData data, int destWidth, int destHeight) { int srcWidth = data.width; int srcHeight = data.height; ImageData mask = ImageData.internal_new (srcWidth, srcHeight, 1, @@ -220,13 +220,13 @@ long /*int*/ createMaskFromAlpha (ImageData data, int destWidth, int destHeight) mask.setPixel (x, y, (data.alphaData [ap++] & 0xff) <= 127 ? 1 : 0); } } - long /*int*/ hMask = OS.CreateBitmap (srcWidth, srcHeight, 1, 1, mask.data); + long hMask = OS.CreateBitmap (srcWidth, srcHeight, 1, 1, mask.data); if (srcWidth != destWidth || srcHeight != destHeight) { - long /*int*/ hdc = OS.GetDC (0); - long /*int*/ hdc1 = OS.CreateCompatibleDC (hdc); + long hdc = OS.GetDC (0); + long hdc1 = OS.CreateCompatibleDC (hdc); OS.SelectObject (hdc1, hMask); - long /*int*/ hdc2 = OS.CreateCompatibleDC (hdc); - long /*int*/ hMask2 = OS.CreateBitmap (destWidth, destHeight, 1, 1, null); + long hdc2 = OS.CreateCompatibleDC (hdc); + long hMask2 = OS.CreateBitmap (destWidth, destHeight, 1, 1, null); OS.SelectObject (hdc2, hMask2); OS.SetStretchBltMode(hdc2, OS.COLORONCOLOR); OS.StretchBlt (hdc2, 0, 0, destWidth, destHeight, hdc1, 0, 0, srcWidth, srcHeight, OS.SRCCOPY); @@ -239,14 +239,14 @@ long /*int*/ createMaskFromAlpha (ImageData data, int destWidth, int destHeight) return hMask; } -long /*int*/ createMask (long /*int*/ hBitmap, int destWidth, int destHeight, int background, int transparentPixel) { +long createMask (long hBitmap, int destWidth, int destHeight, int background, int transparentPixel) { BITMAP bm = new BITMAP (); OS.GetObject (hBitmap, BITMAP.sizeof, bm); int srcWidth = bm.bmWidth; int srcHeight = bm.bmHeight; - long /*int*/ hMask = OS.CreateBitmap (destWidth, destHeight, 1, 1, null); - long /*int*/ hDC = OS.GetDC (0); - long /*int*/ hdc1 = OS.CreateCompatibleDC (hDC); + long hMask = OS.CreateBitmap (destWidth, destHeight, 1, 1, null); + long hDC = OS.GetDC (0); + long hdc1 = OS.CreateCompatibleDC (hDC); if (background != -1) { OS.SelectObject (hdc1, hBitmap); @@ -276,7 +276,7 @@ long /*int*/ createMask (long /*int*/ hBitmap, int destWidth, int destHeight, in OS.SetBkColor (hdc1, background); } - long /*int*/ hdc2 = OS.CreateCompatibleDC (hDC); + long hdc2 = OS.CreateCompatibleDC (hDC); OS.SelectObject (hdc2, hMask); if (destWidth != srcWidth || destHeight != srcHeight) { OS.SetStretchBltMode (hdc2, OS.COLORONCOLOR); @@ -289,7 +289,7 @@ long /*int*/ createMask (long /*int*/ hBitmap, int destWidth, int destHeight, in /* Put back the original palette */ if (originalColors != null) OS.SetDIBColorTable(hdc1, 0, 1 << bm.bmBitsPixel, originalColors); } else { - long /*int*/ hOldBitmap = OS.SelectObject (hdc1, hMask); + long hOldBitmap = OS.SelectObject (hdc1, hMask); OS.PatBlt (hdc1, 0, 0, destWidth, destHeight, OS.BLACKNESS); OS.SelectObject (hdc1, hOldBitmap); } @@ -312,7 +312,7 @@ public int getStyle () { return style; } -public long /*int*/ getHandle () { +public long getHandle () { return handle; } @@ -353,7 +353,7 @@ public int removeRef() { } void set (int index, Image image, int count) { - long /*int*/ hImage = image.handle; + long hImage = image.handle; int [] cx = new int [1], cy = new int [1]; OS.ImageList_GetIconSize (handle, cx, cy); switch (image.type) { @@ -361,7 +361,7 @@ void set (int index, Image image, int count) { /* * Note that the image size has to match the image list icon size. */ - long /*int*/ hBitmap = 0, hMask = 0; + long hBitmap = 0, hMask = 0; ImageData data = image.getImageData (DPIUtil.getDeviceZoom ()); switch (data.getTransparencyType ()) { case SWT.TRANSPARENCY_ALPHA: @@ -416,7 +416,7 @@ void set (int index, Image image, int count) { break; } case SWT.ICON: { - long /*int*/ hIcon = copyIcon (hImage, cx [0], cy [0]); + long hIcon = copyIcon (hImage, cx [0], cy [0]); OS.ImageList_ReplaceIcon (handle, index == count ? -1 : index, hIcon); OS.DestroyIcon (hIcon); break; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Button.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Button.java index 20fcc839ba..feb543a561 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Button.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Button.java @@ -60,10 +60,10 @@ public class Button extends Control { static final int CHECK_WIDTH, CHECK_HEIGHT; static final int ICON_WIDTH = 128, ICON_HEIGHT = 128; static /*final*/ boolean COMMAND_LINK = false; - static final long /*int*/ ButtonProc; + static final long ButtonProc; static final TCHAR ButtonClass = new TCHAR (0, "BUTTON", true); static { - long /*int*/ hBitmap = OS.LoadBitmap (0, OS.OBM_CHECKBOXES); + long hBitmap = OS.LoadBitmap (0, OS.OBM_CHECKBOXES); if (hBitmap == 0) { CHECK_WIDTH = OS.GetSystemMetrics (OS.SM_CXVSCROLL); CHECK_HEIGHT = OS.GetSystemMetrics (OS.SM_CYVSCROLL); @@ -250,7 +250,7 @@ public void addSelectionListener (SelectionListener listener) { } @Override -long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) { +long callWindowProc (long hwnd, int msg, long wParam, long lParam) { if (handle == 0) return 0; return OS.CallWindowProc (ButtonProc, hwnd, msg, wParam, lParam); } @@ -289,9 +289,9 @@ int computeLeftMargin () { if (image != null && text.length () != 0) { Rectangle bounds = image.getBoundsInPixels (); margin += bounds.width + MARGIN * 2; - long /*int*/ oldFont = 0; - long /*int*/ hDC = OS.GetDC (handle); - long /*int*/ newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); + long oldFont = 0; + long hDC = OS.GetDC (handle); + long newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont); char [] buffer = text.toCharArray (); RECT rect = new RECT (); @@ -351,9 +351,9 @@ int computeLeftMargin () { } } if (hasText) { - long /*int*/ oldFont = 0; - long /*int*/ hDC = OS.GetDC (handle); - long /*int*/ newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); + long oldFont = 0; + long hDC = OS.GetDC (handle); + long newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont); TEXTMETRIC lptm = new TEXTMETRIC (); OS.GetTextMetrics (hDC, lptm); @@ -655,7 +655,7 @@ public String getText () { } private boolean isChecked() { - long /*int*/ flags = OS.SendMessage (handle, OS.BM_GETCHECK, 0, 0); + long flags = OS.SendMessage (handle, OS.BM_GETCHECK, 0, 0); return flags != OS.BST_UNCHECKED; } @@ -858,7 +858,7 @@ private void setButtonBackground (Color color) { void setDefault (boolean value) { if ((style & SWT.PUSH) == 0) return; - long /*int*/ hwndShell = menuShell ().handle; + long hwndShell = menuShell ().handle; int bits = OS.GetWindowLong (handle, OS.GWL_STYLE); if (value) { bits |= OS.BS_DEFPUSHBUTTON; @@ -934,7 +934,7 @@ public void setGrayed (boolean grayed) { checkWidget (); if ((style & SWT.CHECK) == 0) return; this.grayed = grayed; - long /*int*/ flags = OS.SendMessage (handle, OS.BM_GETCHECK, 0, 0); + long flags = OS.SendMessage (handle, OS.BM_GETCHECK, 0, 0); if (grayed) { if (flags == OS.BST_CHECKED) updateSelection (OS.BST_INDETERMINATE); } else { @@ -1159,12 +1159,12 @@ TCHAR windowClass () { } @Override -long /*int*/ windowProc () { +long windowProc () { return ButtonProc; } @Override -LRESULT WM_GETDLGCODE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_GETDLGCODE (long wParam, long lParam) { LRESULT result = super.WM_GETDLGCODE (wParam, lParam); if (result != null) return result; if ((style & SWT.ARROW) != 0) { @@ -1174,7 +1174,7 @@ LRESULT WM_GETDLGCODE (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_GETOBJECT (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_GETOBJECT (long wParam, long lParam) { /* * Ensure that there is an accessible object created for this * control because support for radio button position in group @@ -1187,7 +1187,7 @@ LRESULT WM_GETOBJECT (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_KILLFOCUS (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_KILLFOCUS (long wParam, long lParam) { LRESULT result = super.WM_KILLFOCUS (wParam, lParam); if ((style & SWT.PUSH) != 0 && getDefault ()) { menuShell ().setDefaultButton (null, false); @@ -1196,19 +1196,19 @@ LRESULT WM_KILLFOCUS (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_LBUTTONDOWN (long wParam, long lParam) { if (ignoreMouse) return null; return super.WM_LBUTTONDOWN (wParam, lParam); } @Override -LRESULT WM_LBUTTONUP (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_LBUTTONUP (long wParam, long lParam) { if (ignoreMouse) return null; return super.WM_LBUTTONUP (wParam, lParam); } @Override -LRESULT WM_SETFOCUS (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SETFOCUS (long wParam, long lParam) { /* * Feature in Windows. When Windows sets focus to * a radio button, it sets the WS_TABSTOP style. @@ -1230,7 +1230,7 @@ LRESULT WM_SETFOCUS (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SIZE (long wParam, long lParam) { LRESULT result = super.WM_SIZE (wParam, lParam); if (result != null) return result; if ((style & (SWT.PUSH | SWT.TOGGLE)) != 0) { @@ -1247,7 +1247,7 @@ LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_SYSCOLORCHANGE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SYSCOLORCHANGE (long wParam, long lParam) { LRESULT result = super.WM_SYSCOLORCHANGE (wParam, lParam); if (result != null) return result; if (image2 != null) _setImage (image); @@ -1255,7 +1255,7 @@ LRESULT WM_SYSCOLORCHANGE (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_UPDATEUISTATE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_UPDATEUISTATE (long wParam, long lParam) { LRESULT result = super.WM_UPDATEUISTATE (wParam, lParam); if (result != null) return result; /* @@ -1281,7 +1281,7 @@ LRESULT WM_UPDATEUISTATE (long /*int*/ wParam, long /*int*/ lParam) { } if (redraw) { OS.InvalidateRect (handle, null, false); - long /*int*/ code = OS.DefWindowProc (handle, OS.WM_UPDATEUISTATE, wParam, lParam); + long code = OS.DefWindowProc (handle, OS.WM_UPDATEUISTATE, wParam, lParam); return new LRESULT (code); } } @@ -1301,7 +1301,7 @@ LRESULT WM_UPDATEUISTATE (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT wmCommandChild (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmCommandChild (long wParam, long lParam) { int code = OS.HIWORD (wParam); switch (code) { case OS.BN_CLICKED: @@ -1323,7 +1323,7 @@ LRESULT wmCommandChild (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmNotifyChild (NMHDR hdr, long wParam, long lParam) { switch (hdr.code) { case OS.NM_CUSTOMDRAW: // this message will not appear for owner-draw buttons (currently the ARROW button). @@ -1346,7 +1346,7 @@ LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { } RECT rect = new RECT (); OS.SetRect (rect, nmcd.left+2, nmcd.top+2, nmcd.right-2, nmcd.bottom-2); - long /*int*/ brush = OS.CreateSolidBrush(pixel); + long brush = OS.CreateSolidBrush(pixel); OS.FillRect(nmcd.hdc, rect, brush); OS.DeleteObject(brush); } @@ -1443,7 +1443,7 @@ LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT wmDrawChild (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmDrawChild (long wParam, long lParam) { if ((style & SWT.ARROW) == 0) return super.wmDrawChild (wParam, lParam); DRAWITEMSTRUCT struct = new DRAWITEMSTRUCT (); OS.MoveMemory (struct, lParam, DRAWITEMSTRUCT.sizeof); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Canvas.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Canvas.java index b88d7ad5ed..f7b8fb9a19 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Canvas.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Canvas.java @@ -86,7 +86,7 @@ void clearArea (int x, int y, int width, int height) { if (OS.IsWindowVisible (handle)) { RECT rect = new RECT (); OS.SetRect (rect, x, y, x + width, y + height); - long /*int*/ hDC = OS.GetDCEx (handle, 0, OS.DCX_CACHE | OS.DCX_CLIPCHILDREN | OS.DCX_CLIPSIBLINGS); + long hDC = OS.GetDCEx (handle, 0, OS.DCX_CACHE | OS.DCX_CLIPCHILDREN | OS.DCX_CLIPSIBLINGS); drawBackground (hDC, rect); OS.ReleaseDC (handle, hDC); } @@ -335,7 +335,7 @@ TCHAR windowClass () { } @Override -long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) { +long windowProc (long hwnd, int msg, long wParam, long lParam) { if (msg == Display.SWT_RESTORECARET) { if ((state & CANVAS) != 0) { if (caret != null) { @@ -349,11 +349,11 @@ long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long / } @Override -LRESULT WM_CHAR (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_CHAR (long wParam, long lParam) { LRESULT result = super.WM_CHAR (wParam, lParam); if (result != null) return result; if (caret != null) { - switch ((int)/*64*/wParam) { + switch ((int)wParam) { case SWT.DEL: case SWT.BS: case SWT.ESC: @@ -372,7 +372,7 @@ LRESULT WM_CHAR (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_IME_COMPOSITION (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_IME_COMPOSITION (long wParam, long lParam) { if (ime != null) { LRESULT result = ime.WM_IME_COMPOSITION (wParam, lParam); if (result != null) return result; @@ -381,7 +381,7 @@ LRESULT WM_IME_COMPOSITION (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_IME_COMPOSITION_START (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_IME_COMPOSITION_START (long wParam, long lParam) { if (ime != null) { LRESULT result = ime.WM_IME_COMPOSITION_START (wParam, lParam); if (result != null) return result; @@ -390,7 +390,7 @@ LRESULT WM_IME_COMPOSITION_START (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_IME_ENDCOMPOSITION (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_IME_ENDCOMPOSITION (long wParam, long lParam) { if (ime != null) { LRESULT result = ime.WM_IME_ENDCOMPOSITION (wParam, lParam); if (result != null) return result; @@ -399,7 +399,7 @@ LRESULT WM_IME_ENDCOMPOSITION (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_INPUTLANGCHANGE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_INPUTLANGCHANGE (long wParam, long lParam) { LRESULT result = super.WM_INPUTLANGCHANGE (wParam, lParam); if (caret != null && caret.isFocusCaret ()) { caret.setIMEFont (); @@ -410,7 +410,7 @@ LRESULT WM_INPUTLANGCHANGE (long /*int*/ wParam, long /*int*/ lParam) { @Override -LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_KEYDOWN (long wParam, long lParam) { LRESULT result = super.WM_KEYDOWN (wParam, lParam); if (result != null) return result; if (ime != null) { @@ -420,7 +420,7 @@ LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_KILLFOCUS (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_KILLFOCUS (long wParam, long lParam) { if (ime != null) { LRESULT result = ime.WM_KILLFOCUS (wParam, lParam); if (result != null) return result; @@ -432,7 +432,7 @@ LRESULT WM_KILLFOCUS (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_LBUTTONDOWN (long wParam, long lParam) { if (ime != null) { LRESULT result = ime.WM_LBUTTONDOWN (wParam, lParam); if (result != null) return result; @@ -441,21 +441,21 @@ LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_SETFOCUS (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SETFOCUS (long wParam, long lParam) { LRESULT result = super.WM_SETFOCUS (wParam, lParam); if (caret != null && caret.isFocusCaret ()) caret.setFocus (); return result; } @Override -LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SIZE (long wParam, long lParam) { LRESULT result = super.WM_SIZE (wParam, lParam); if (caret != null && caret.isFocusCaret ()) caret.resizeIME (); return result; } @Override -LRESULT WM_WINDOWPOSCHANGED (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_WINDOWPOSCHANGED (long wParam, long lParam) { LRESULT result = super.WM_WINDOWPOSCHANGED (wParam, lParam); //if (result != null) return result; /* @@ -471,7 +471,7 @@ LRESULT WM_WINDOWPOSCHANGED (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_WINDOWPOSCHANGING (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_WINDOWPOSCHANGING (long wParam, long lParam) { LRESULT result = super.WM_WINDOWPOSCHANGING (wParam, lParam); if (result != null) return result; /* diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Caret.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Caret.java index 2e2be436dd..4d5fde534d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Caret.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Caret.java @@ -87,10 +87,10 @@ void createWidget () { } } -long /*int*/ defaultFont () { - long /*int*/ hwnd = parent.handle; - long /*int*/ hwndIME = OS.ImmGetDefaultIMEWnd (hwnd); - long /*int*/ hFont = 0; +long defaultFont () { + long hwnd = parent.handle; + long hwndIME = OS.ImmGetDefaultIMEWnd (hwnd); + long hFont = 0; if (hwndIME != 0) { hFont = OS.SendMessage (hwndIME, OS.WM_GETFONT, 0, 0); } @@ -144,7 +144,7 @@ Rectangle getBoundsInPixels () { public Font getFont () { checkWidget(); if (font == null) { - long /*int*/ hFont = defaultFont (); + long hFont = defaultFont (); return Font.win32_new (display, hFont); } return font; @@ -293,8 +293,8 @@ void resizeIME () { if (!OS.IsDBLocale) return; POINT ptCurrentPos = new POINT (); if (!OS.GetCaretPos (ptCurrentPos)) return; - long /*int*/ hwnd = parent.handle; - long /*int*/ hIMC = OS.ImmGetContext (hwnd); + long hwnd = parent.handle; + long hIMC = OS.ImmGetContext (hwnd); IME ime = parent.getIME (); if (ime != null && ime.isInlineEnabled ()) { Point size = getSizeInPixels (); @@ -337,9 +337,9 @@ void releaseWidget () { void resize () { resized = false; - long /*int*/ hwnd = parent.handle; + long hwnd = parent.handle; OS.DestroyCaret (); - long /*int*/ hBitmap = image != null ? image.handle : 0; + long hBitmap = image != null ? image.handle : 0; int width = this.width; if (image == null && width == 0) { int [] buffer = new int [1]; @@ -356,8 +356,8 @@ void resize () { void restoreIMEFont () { if (!OS.IsDBLocale) return; if (oldFont == null) return; - long /*int*/ hwnd = parent.handle; - long /*int*/ hIMC = OS.ImmGetContext (hwnd); + long hwnd = parent.handle; + long hIMC = OS.ImmGetContext (hwnd); OS.ImmSetCompositionFont (hIMC, oldFont); OS.ImmReleaseContext (hwnd, hIMC); oldFont = null; @@ -424,8 +424,8 @@ void setBoundsInPixels (Rectangle rect) { } void setFocus () { - long /*int*/ hwnd = parent.handle; - long /*int*/ hBitmap = 0; + long hwnd = parent.handle; + long hBitmap = 0; if (image != null) hBitmap = image.handle; int width = this.width; if (image == null && width == 0) { @@ -490,11 +490,11 @@ public void setImage (Image image) { void setIMEFont () { if (!OS.IsDBLocale) return; - long /*int*/ hFont = 0; + long hFont = 0; if (font != null) hFont = font.handle; if (hFont == 0) hFont = defaultFont (); - long /*int*/ hwnd = parent.handle; - long /*int*/ hIMC = OS.ImmGetContext (hwnd); + long hwnd = parent.handle; + long hIMC = OS.ImmGetContext (hwnd); /* Save the current IME font */ if (oldFont == null) { oldFont = new LOGFONT (); @@ -615,7 +615,7 @@ public void setVisible (boolean visible) { checkWidget(); if (visible == isVisible) return; isVisible = visible; - long /*int*/ hwnd = parent.handle; + long hwnd = parent.handle; if (OS.GetFocus () != hwnd) return; if (!isVisible) { OS.HideCaret (hwnd); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ColorDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ColorDialog.java index 6c951d4a9b..de7f6c1d6e 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ColorDialog.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ColorDialog.java @@ -98,8 +98,8 @@ public ColorDialog (Shell parent, int style) { checkSubclass (); } -long /*int*/ CCHookProc (long /*int*/ hdlg, long /*int*/ uiMsg, long /*int*/ lParam, long /*int*/ lpData) { - switch ((int)/*64*/uiMsg) { +long CCHookProc (long hdlg, long uiMsg, long lParam, long lpData) { + switch ((int)uiMsg) { case OS.WM_INITDIALOG: { RECT rect = new RECT (); OS.GetWindowRect (hdlg, rect); @@ -170,8 +170,8 @@ public RGB[] getRGBs() { public RGB open () { /* Get the owner HWND for the dialog */ - long /*int*/ hwndOwner = parent.handle; - long /*int*/ hwndParent = parent.handle; + long hwndOwner = parent.handle; + long hwndParent = parent.handle; /* * Feature in Windows. There is no API to set the orientation of a @@ -201,13 +201,13 @@ public RGB open () { /* Create the CCHookProc */ Callback callback = new Callback (this, "CCHookProc", 4); //$NON-NLS-1$ - long /*int*/ lpfnHook = callback.getAddress (); + long lpfnHook = callback.getAddress (); if (lpfnHook == 0) error(SWT.ERROR_NO_MORE_CALLBACKS); /* Allocate the Custom Colors and initialize to white */ display = parent.display; if (display.lpCustColors == 0) { - long /*int*/ hHeap = OS.GetProcessHeap (); + long hHeap = OS.GetProcessHeap (); display.lpCustColors = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, CUSTOM_COLOR_COUNT * 4); for (int i=0; i < CUSTOM_COLOR_COUNT; i++) { colors[i] = 0x00FFFFFF; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Combo.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Combo.java index cd4c2404e9..311eacfae8 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Combo.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Combo.java @@ -63,7 +63,7 @@ import org.eclipse.swt.internal.win32.*; public class Combo extends Composite { boolean noSelection, ignoreDefaultSelection, ignoreCharacter, ignoreModify, ignoreResize, lockText; int scrollWidth, visibleCount; - long /*int*/ cbtHook; + long cbtHook; String [] items = new String [0]; int[] segments; int clearSegmentsCount = 0; @@ -96,9 +96,9 @@ public class Combo extends Composite { */ static final int CBID_LIST = 1000; static final int CBID_EDIT = 1001; - static /*final*/ long /*int*/ EditProc, ListProc; + static /*final*/ long EditProc, ListProc; - static final long /*int*/ ComboProc; + static final long ComboProc; static final TCHAR ComboClass = new TCHAR (0, "COMBOBOX", true); static { WNDCLASS lpWndClass = new WNDCLASS (); @@ -169,7 +169,7 @@ public void add (String string) { checkWidget (); if (string == null) error (SWT.ERROR_NULL_ARGUMENT); TCHAR buffer = new TCHAR (getCodePage (), string, true); - int result = (int)/*64*/OS.SendMessage (handle, OS.CB_ADDSTRING, 0, buffer); + int result = (int)OS.SendMessage (handle, OS.CB_ADDSTRING, 0, buffer); if (result == OS.CB_ERR) error (SWT.ERROR_ITEM_NOT_ADDED); if (result == OS.CB_ERRSPACE) error (SWT.ERROR_ITEM_NOT_ADDED); if ((style & SWT.H_SCROLL) != 0) setScrollWidth (buffer.chars, true); @@ -204,12 +204,12 @@ public void add (String string) { public void add (String string, int index) { checkWidget (); if (string == null) error (SWT.ERROR_NULL_ARGUMENT); - int count = (int)/*64*/OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); if (!(0 <= index && index <= count)) { error (SWT.ERROR_INVALID_RANGE); } TCHAR buffer = new TCHAR (getCodePage (), string, true); - int result = (int)/*64*/OS.SendMessage (handle, OS.CB_INSERTSTRING, index, buffer); + int result = (int)OS.SendMessage (handle, OS.CB_INSERTSTRING, index, buffer); if (result == OS.CB_ERRSPACE || result == OS.CB_ERR) { error (SWT.ERROR_ITEM_NOT_ADDED); } @@ -282,7 +282,7 @@ public void addSegmentListener (SegmentListener listener) { addListener (SWT.Segments, new TypedListener (listener)); int selection = OS.CB_ERR; if (!noSelection) { - selection = (int)/*64*/OS.SendMessage (handle, OS.CB_GETCURSEL, 0, 0); + selection = (int)OS.SendMessage (handle, OS.CB_GETCURSEL, 0, 0); } clearSegments (true); applyEditSegments (); @@ -355,7 +355,7 @@ public void addVerifyListener (VerifyListener listener) { void applyEditSegments () { if (--clearSegmentsCount != 0) return; if (!hooks (SWT.Segments) && !filters (SWT.Segments) && (state & HAS_AUTO_DIRECTION) == 0) return; - long /*int*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT); + long hwndText = OS.GetDlgItem (handle, CBID_EDIT); int length = OS.GetWindowTextLength (hwndText); char [] buffer = new char [length + 1]; if (length > 0) OS.GetWindowText (hwndText, buffer, length + 1); @@ -368,7 +368,7 @@ void applyEditSegments () { int nSegments = segments.length; if (nSegments == 0) return; char [] segmentsChars = event.segmentsChars; - int/*64*/ limit = (int/*64*/)OS.SendMessage (hwndText, OS.EM_GETLIMITTEXT, 0, 0) & 0x7fffffff; + int limit = (int)OS.SendMessage (hwndText, OS.EM_GETLIMITTEXT, 0, 0) & 0x7fffffff; OS.SendMessage (hwndText, OS.EM_SETLIMITTEXT, limit + Math.min (nSegments, LIMIT - limit), 0); length += nSegments; char [] newChars = new char [length + 1]; @@ -400,7 +400,7 @@ void applyEditSegments () { */ newChars [length] = 0; OS.SendMessage (hwndText, OS.EM_SETSEL, 0, -1); - long /*int*/ undo = OS.SendMessage (hwndText, OS.EM_CANUNDO, 0, 0); + long undo = OS.SendMessage (hwndText, OS.EM_CANUNDO, 0, 0); OS.SendMessage (hwndText, OS.EM_REPLACESEL, undo, newChars); /* Restore selection */ start [0] = translateOffset (start [0]); @@ -426,7 +426,7 @@ void applyEditSegments () { } void applyListSegments () { - int count = (int)/*64*/OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); if (count == OS.CB_ERR) return; boolean add = items.length != count; if (add) items = new String [count]; @@ -436,12 +436,12 @@ void applyListSegments () { String string; TCHAR buffer; if (!noSelection) { - selection = (int)/*64*/OS.SendMessage (handle, OS.CB_GETCURSEL, 0, 0); + selection = (int)OS.SendMessage (handle, OS.CB_GETCURSEL, 0, 0); } while (index-- > 0) { buffer = null; if (add) { - int length = (int)/*64*/OS.SendMessage (handle, OS.CB_GETLBTEXTLEN, index, 0); + int length = (int)OS.SendMessage (handle, OS.CB_GETLBTEXTLEN, index, 0); if (length == OS.CB_ERR) error (SWT.ERROR); buffer = new TCHAR (cp, length + 1); if (OS.SendMessage (handle, OS.CB_GETLBTEXT, index, buffer) == OS.CB_ERR) return; @@ -459,7 +459,7 @@ void applyListSegments () { } @Override -long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) { +long callWindowProc (long hwnd, int msg, long wParam, long lParam) { if (handle == 0) return 0; if (hwnd == handle) { switch (msg) { @@ -467,7 +467,7 @@ long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, lo ignoreResize = true; boolean oldLockText = lockText; if ((style & SWT.READ_ONLY) == 0) lockText = true; - long /*int*/ result = OS.CallWindowProc (ComboProc, hwnd, msg, wParam, lParam); + long result = OS.CallWindowProc (ComboProc, hwnd, msg, wParam, lParam); if ((style & SWT.READ_ONLY) == 0) lockText = oldLockText; ignoreResize = false; return result; @@ -475,31 +475,31 @@ long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, lo } return OS.CallWindowProc (ComboProc, hwnd, msg, wParam, lParam); } - long /*int*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT); + long hwndText = OS.GetDlgItem (handle, CBID_EDIT); if (hwnd == hwndText) { if (lockText && msg == OS.WM_SETTEXT) { - long /*int*/ hHeap = OS.GetProcessHeap (); + long hHeap = OS.GetProcessHeap (); int length = OS.GetWindowTextLength (handle); char [] buffer = new char [length + 1]; OS.GetWindowText (handle, buffer, length + 1); int byteCount = buffer.length * TCHAR.sizeof; - long /*int*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); + long pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); OS.MoveMemory (pszText, buffer, byteCount); - long /*int*/ code = OS.CallWindowProc (EditProc, hwndText, msg, wParam, pszText); + long code = OS.CallWindowProc (EditProc, hwndText, msg, wParam, pszText); OS.HeapFree (hHeap, 0, pszText); return code; } return OS.CallWindowProc (EditProc, hwnd, msg, wParam, lParam); } - long /*int*/ hwndList = OS.GetDlgItem (handle, CBID_LIST); + long hwndList = OS.GetDlgItem (handle, CBID_LIST); if (hwnd == hwndList) { return OS.CallWindowProc (ListProc, hwnd, msg, wParam, lParam); } return OS.DefWindowProc (hwnd, msg, wParam, lParam); } -long /*int*/ CBTProc (long /*int*/ nCode, long /*int*/ wParam, long /*int*/ lParam) { - if ((int)/*64*/nCode == OS.HCBT_CREATEWND) { +long CBTProc (long nCode, long wParam, long lParam) { + if ((int)nCode == OS.HCBT_CREATEWND) { char [] buffer = new char [128]; int length = OS.GetClassName (wParam, buffer, buffer.length); String className = new String (buffer, 0, length); @@ -508,11 +508,11 @@ long /*int*/ CBTProc (long /*int*/ nCode, long /*int*/ wParam, long /*int*/ lPar OS.SetWindowLong (wParam, OS.GWL_STYLE, bits & ~OS.ES_NOHIDESEL); } } - return OS.CallNextHookEx (cbtHook, (int)/*64*/nCode, wParam, lParam); + return OS.CallNextHookEx (cbtHook, (int)nCode, wParam, lParam); } @Override -boolean checkHandle (long /*int*/ hwnd) { +boolean checkHandle (long hwnd) { return hwnd == handle || hwnd == OS.GetDlgItem (handle, CBID_EDIT) || hwnd == OS.GetDlgItem (handle, CBID_LIST); } @@ -554,8 +554,8 @@ void clearSegments (boolean applyText) { if (segments == null) return; int nSegments = segments.length; if (nSegments == 0) return; - long /*int*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT); - int/*64*/ limit = (int/*64*/)OS.SendMessage (hwndText, OS.EM_GETLIMITTEXT, 0, 0) & 0x7fffffff; + long hwndText = OS.GetDlgItem (handle, CBID_EDIT); + int limit = (int)OS.SendMessage (hwndText, OS.EM_GETLIMITTEXT, 0, 0) & 0x7fffffff; if (limit < LIMIT) { OS.SendMessage (hwndText, OS.EM_SETLIMITTEXT, Math.max (1, limit - nSegments), 0); } @@ -582,7 +582,7 @@ void clearSegments (boolean applyText) { * menu. Sending OS.EM_REPLACESEL message instead. */ OS.SendMessage (hwndText, OS.EM_SETSEL, 0, -1); - long /*int*/ undo = OS.SendMessage (hwndText, OS.EM_CANUNDO, 0, 0); + long undo = OS.SendMessage (hwndText, OS.EM_CANUNDO, 0, 0); OS.SendMessage (hwndText, OS.EM_REPLACESEL, undo, buffer); OS.SendMessage (hwndText, OS.EM_SETSEL, start [0], end [0]); ignoreCharacter = oldIgnoreCharacter; @@ -615,11 +615,11 @@ public void clearSelection () { checkWidget (); int width = 0, height = 0; if (wHint == SWT.DEFAULT) { - long /*int*/ newFont, oldFont = 0; - long /*int*/ hDC = OS.GetDC (handle); + long newFont, oldFont = 0; + long hDC = OS.GetDC (handle); newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont); - int count = (int)/*64*/OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); RECT rect = new RECT (); int flags = OS.DT_CALCRECT | OS.DT_NOPREFIX; if ((style & SWT.READ_ONLY) == 0) flags |= OS.DT_EDITCONTROL; @@ -632,10 +632,10 @@ public void clearSelection () { width = Math.max (width, scrollWidth); } else { for (int i=0; i<count; i++) { - length = (int)/*64*/OS.SendMessage (handle, OS.CB_GETLBTEXTLEN, i, 0); + length = (int)OS.SendMessage (handle, OS.CB_GETLBTEXTLEN, i, 0); if (length != OS.CB_ERR) { if (length + 1 > buffer.length) buffer = new char [length + 1]; - int result = (int)/*64*/OS.SendMessage (handle, OS.CB_GETLBTEXT, i, buffer); + int result = (int)OS.SendMessage (handle, OS.CB_GETLBTEXT, i, buffer); if (result != OS.CB_ERR) { OS.DrawText (hDC, buffer, length, rect, flags); width = Math.max (width, rect.right - rect.left); @@ -648,8 +648,8 @@ public void clearSelection () { } if (hHint == SWT.DEFAULT) { if ((style & SWT.SIMPLE) != 0) { - int count = (int)/*64*/OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); - int itemHeight = (int)/*64*/OS.SendMessage (handle, OS.CB_GETITEMHEIGHT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); + int itemHeight = (int)OS.SendMessage (handle, OS.CB_GETITEMHEIGHT, 0, 0); height = count * itemHeight; } } @@ -660,9 +660,9 @@ public void clearSelection () { if ((style & SWT.READ_ONLY) != 0) { width += 8; } else { - long /*int*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT); + long hwndText = OS.GetDlgItem (handle, CBID_EDIT); if (hwndText != 0) { - long /*int*/ margins = OS.SendMessage (hwndText, OS.EM_GETMARGINS, 0, 0); + long margins = OS.SendMessage (hwndText, OS.EM_GETMARGINS, 0, 0); int marginWidth = OS.LOWORD (margins) + OS.HIWORD (margins); width += marginWidth + 3; } @@ -675,7 +675,7 @@ public void clearSelection () { } else { int border = OS.GetSystemMetrics (OS.SM_CXEDGE); width += OS.GetSystemMetrics (OS.SM_CXVSCROLL) + border * 2; - int textHeight = (int)/*64*/OS.SendMessage (handle, OS.CB_GETITEMHEIGHT, -1, 0); + int textHeight = (int)OS.SendMessage (handle, OS.CB_GETITEMHEIGHT, -1, 0); if ((style & SWT.DROP_DOWN) != 0) { height = textHeight + 6; } else { @@ -723,7 +723,7 @@ void createHandle () { } else { int threadId = OS.GetCurrentThreadId (); Callback cbtCallback = new Callback (this, "CBTProc", 3); //$NON-NLS-1$ - long /*int*/ cbtProc = cbtCallback.getAddress (); + long cbtProc = cbtCallback.getAddress (); if (cbtProc == 0) error (SWT.ERROR_NO_MORE_CALLBACKS); cbtHook = OS.SetWindowsHookEx (OS.WH_CBT, cbtProc, 0, threadId); super.createHandle (); @@ -736,11 +736,11 @@ void createHandle () { stateFlagsUsable = stateFlagsTest(); /* Get the text and list window procs */ - long /*int*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT); + long hwndText = OS.GetDlgItem (handle, CBID_EDIT); if (hwndText != 0 && EditProc == 0) { EditProc = OS.GetWindowLongPtr (hwndText, OS.GWLP_WNDPROC); } - long /*int*/ hwndList = OS.GetDlgItem (handle, CBID_LIST); + long hwndList = OS.GetDlgItem (handle, CBID_LIST); if (hwndList != 0 && ListProc == 0) { ListProc = OS.GetWindowLongPtr (hwndList, OS.GWLP_WNDPROC); } @@ -763,10 +763,10 @@ void createWidget() { super.createWidget(); visibleCount = VISIBLE_COUNT; if ((style & SWT.SIMPLE) == 0) { - int itemHeight = (int)/*64*/OS.SendMessage (handle, OS.CB_GETITEMHEIGHT, 0, 0); + int itemHeight = (int)OS.SendMessage (handle, OS.CB_GETITEMHEIGHT, 0, 0); if (itemHeight != OS.CB_ERR && itemHeight != 0) { int maxHeight = 0; - long /*int*/ hmonitor = OS.MonitorFromWindow (handle, OS.MONITOR_DEFAULTTONEAREST); + long hmonitor = OS.MonitorFromWindow (handle, OS.MONITOR_DEFAULTTONEAREST); MONITORINFO lpmi = new MONITORINFO (); lpmi.cbSize = MONITORINFO.sizeof; OS.GetMonitorInfo (hmonitor, lpmi); @@ -836,9 +836,9 @@ TCHAR deprocessText (TCHAR text, int start, int end, boolean terminate) { @Override void deregister () { super.deregister (); - long /*int*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT); + long hwndText = OS.GetDlgItem (handle, CBID_EDIT); if (hwndText != 0) display.removeControl (hwndText); - long /*int*/ hwndList = OS.GetDlgItem (handle, CBID_LIST); + long hwndList = OS.GetDlgItem (handle, CBID_LIST); if (hwndList != 0) display.removeControl (hwndList); } @@ -856,7 +856,7 @@ void deregister () { */ public void deselect (int index) { checkWidget (); - int selection = (int)/*64*/OS.SendMessage (handle, OS.CB_GETCURSEL, 0, 0); + int selection = (int)OS.SendMessage (handle, OS.CB_GETCURSEL, 0, 0); if (index != selection) return; OS.SendMessage (handle, OS.CB_SETCURSEL, -1, 0); sendEvent (SWT.Modify); @@ -889,14 +889,14 @@ public void deselectAll () { } @Override -boolean dragDetect (long /*int*/ hwnd, int x, int y, boolean filter, boolean [] detect, boolean [] consume) { +boolean dragDetect (long hwnd, int x, int y, boolean filter, boolean [] detect, boolean [] consume) { if (filter && (style & SWT.READ_ONLY) == 0) { - long /*int*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT); + long hwndText = OS.GetDlgItem (handle, CBID_EDIT); if (hwndText != 0) { int [] start = new int [1], end = new int [1]; OS.SendMessage (handle, OS.CB_GETEDITSEL, start, end); if (start [0] != end [0]) { - long /*int*/ lParam = OS.MAKELPARAM (x, y); + long lParam = OS.MAKELPARAM (x, y); int position = OS.LOWORD (OS.SendMessage (hwndText, OS.EM_CHARFROMPOS, 0, lParam)); if (start [0] <= position && position < end [0]) { if (super.dragDetect (hwnd, x, y, filter, detect, consume)) { @@ -942,8 +942,8 @@ Point getCaretLocationInPixels () { * pixel coordinates (0,0). */ int position = translateOffset (getCaretPosition ()); - long /*int*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT); - long /*int*/ caretPos = OS.SendMessage (hwndText, OS.EM_POSFROMCHAR, position, 0); + long hwndText = OS.GetDlgItem (handle, CBID_EDIT); + long caretPos = OS.SendMessage (hwndText, OS.EM_POSFROMCHAR, position, 0); if (caretPos == -1) { caretPos = 0; if (position >= OS.GetWindowTextLength (hwndText)) { @@ -996,7 +996,7 @@ Point getCaretLocationInPixels () { public int getCaretPosition () { checkWidget (); int [] start = new int [1], end = new int [1]; - long /*int*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT); + long hwndText = OS.GetDlgItem (handle, CBID_EDIT); OS.SendMessage (hwndText, OS.EM_GETSEL, start, end); /* * In Windows, there is no API to get the position of the caret @@ -1017,9 +1017,9 @@ public int getCaretPosition () { if (lpgui.hwndCaret == hwndText || lpgui.hwndCaret == 0) { POINT ptCurrentPos = new POINT (); if (OS.GetCaretPos (ptCurrentPos)) { - long /*int*/ endPos = OS.SendMessage (hwndText, OS.EM_POSFROMCHAR, end [0], 0); + long endPos = OS.SendMessage (hwndText, OS.EM_POSFROMCHAR, end [0], 0); if (endPos == -1) { - long /*int*/ startPos = OS.SendMessage (hwndText, OS.EM_POSFROMCHAR, start [0], 0); + long startPos = OS.SendMessage (hwndText, OS.EM_POSFROMCHAR, start [0], 0); int startX = OS.GET_X_LPARAM (startPos); if (ptCurrentPos.x > startX) caret = end [0]; } else { @@ -1051,14 +1051,14 @@ public int getCaretPosition () { */ public String getItem (int index) { checkWidget (); - int length = (int)/*64*/OS.SendMessage (handle, OS.CB_GETLBTEXTLEN, index, 0); + int length = (int)OS.SendMessage (handle, OS.CB_GETLBTEXTLEN, index, 0); if (length != OS.CB_ERR) { if (hooks (SWT.Segments) || filters (SWT.Segments) || (state & HAS_AUTO_DIRECTION) != 0) return items [index]; char [] buffer = new char [length + 1]; - int result = (int)/*64*/OS.SendMessage (handle, OS.CB_GETLBTEXT, index, buffer); + int result = (int)OS.SendMessage (handle, OS.CB_GETLBTEXT, index, buffer); if (result != OS.CB_ERR) return new String (buffer, 0, length); } - int count = (int)/*64*/OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); if (0 <= index && index < count) error (SWT.ERROR_CANNOT_GET_ITEM); error (SWT.ERROR_INVALID_RANGE); return ""; @@ -1076,7 +1076,7 @@ public String getItem (int index) { */ public int getItemCount () { checkWidget (); - int count = (int)/*64*/OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); if (count == OS.CB_ERR) error (SWT.ERROR_CANNOT_GET_COUNT); return count; } @@ -1098,7 +1098,7 @@ public int getItemHeight () { } int getItemHeightInPixels () { - int result = (int)/*64*/OS.SendMessage (handle, OS.CB_GETITEMHEIGHT, 0, 0); + int result = (int)OS.SendMessage (handle, OS.CB_GETITEMHEIGHT, 0, 0); if (result == OS.CB_ERR) error (SWT.ERROR_CANNOT_GET_ITEM_HEIGHT); return result; } @@ -1319,7 +1319,7 @@ public Point getSelection () { public int getSelectionIndex () { checkWidget (); if (noSelection) return -1; - return (int)/*64*/OS.SendMessage (handle, OS.CB_GETCURSEL, 0, 0); + return (int)OS.SendMessage (handle, OS.CB_GETCURSEL, 0, 0); } /** @@ -1369,7 +1369,7 @@ int getTextHeightInPixels () { if (((style & SWT.SIMPLE) == 0) && OS.GetComboBoxInfo (handle, pcbi)) { return (pcbi.buttonBottom - pcbi.buttonTop) + pcbi.buttonTop * 2; } - int result = (int)/*64*/OS.SendMessage (handle, OS.CB_GETITEMHEIGHT, -1, 0); + int result = (int)OS.SendMessage (handle, OS.CB_GETITEMHEIGHT, -1, 0); if (result == OS.CB_ERR) error (SWT.ERROR_CANNOT_GET_ITEM_HEIGHT); return (style & SWT.DROP_DOWN) != 0 ? result + 6 : result + 10; } @@ -1391,9 +1391,9 @@ int getTextHeightInPixels () { */ public int getTextLimit () { checkWidget (); - long /*int*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT); + long hwndText = OS.GetDlgItem (handle, CBID_EDIT); if (hwndText == 0) return LIMIT; - int/*64*/ limit = (int)/*64*/OS.SendMessage (hwndText, OS.EM_GETLIMITTEXT, 0, 0) & 0x7FFFFFFF; + int limit = (int)OS.SendMessage (hwndText, OS.EM_GETLIMITTEXT, 0, 0) & 0x7FFFFFFF; if (segments != null && limit < LIMIT) limit = Math.max (1, limit - segments.length); return limit; } @@ -1422,12 +1422,12 @@ public int getVisibleItemCount () { @Override boolean hasFocus () { - long /*int*/ hwndFocus = OS.GetFocus (); + long hwndFocus = OS.GetFocus (); if (hwndFocus == handle) return true; if (hwndFocus == 0) return false; - long /*int*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT); + long hwndText = OS.GetDlgItem (handle, CBID_EDIT); if (hwndFocus == hwndText) return true; - long /*int*/ hwndList = OS.GetDlgItem (handle, CBID_LIST); + long hwndList = OS.GetDlgItem (handle, CBID_LIST); if (hwndFocus == hwndList) return true; return false; } @@ -1491,12 +1491,12 @@ public int indexOf (String string, int start) { } /* Use CB_FINDSTRINGEXACT to search for the item */ - int count = (int)/*64*/OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); if (!(0 <= start && start < count)) return -1; int index = start - 1, last = 0; TCHAR buffer = new TCHAR (getCodePage (), string, true); do { - index = (int)/*64*/OS.SendMessage (handle, OS.CB_FINDSTRINGEXACT, last = index, buffer); + index = (int)OS.SendMessage (handle, OS.CB_FINDSTRINGEXACT, last = index, buffer); if (index == OS.CB_ERR || index <= last) return -1; } while (!string.equals (getItem (index))); return index; @@ -1523,8 +1523,8 @@ public void paste () { } void stateFlagsAdd(int flags) { - final long /*int*/ tagCBoxPtr = OS.GetWindowLongPtr(handle, 0); - final long /*int*/ stateFlagsPtr = tagCBoxPtr + stateFlagsOffset; + final long tagCBoxPtr = OS.GetWindowLongPtr(handle, 0); + final long stateFlagsPtr = tagCBoxPtr + stateFlagsOffset; int stateFlags[] = new int[1]; OS.MoveMemory(stateFlags, stateFlagsPtr, 4); @@ -1538,8 +1538,8 @@ void stateFlagsAdd(int flags) { * For simplicity, only SWT.READ_ONLY combos are handled. */ boolean stateFlagsTest() { - final long /*int*/ tagCBoxPtr = OS.GetWindowLongPtr(handle, 0); - final long /*int*/ stateFlagsPtr = tagCBoxPtr + stateFlagsOffset; + final long tagCBoxPtr = OS.GetWindowLongPtr(handle, 0); + final long stateFlagsPtr = tagCBoxPtr + stateFlagsOffset; int stateFlags[] = new int[1]; OS.MoveMemory(stateFlags, stateFlagsPtr, 4); @@ -1556,9 +1556,9 @@ boolean stateFlagsTest() { @Override void register () { super.register (); - long /*int*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT); + long hwndText = OS.GetDlgItem (handle, CBID_EDIT); if (hwndText != 0) display.addControl (hwndText, this); - long /*int*/ hwndList = OS.GetDlgItem (handle, CBID_LIST); + long hwndList = OS.GetDlgItem (handle, CBID_LIST); if (hwndList != 0) display.addControl (hwndList, this); } @@ -1584,24 +1584,24 @@ public void remove (int index) { void remove (int index, boolean notify) { char [] buffer = null; if ((style & SWT.H_SCROLL) != 0) { - int length = (int)/*64*/OS.SendMessage (handle, OS.CB_GETLBTEXTLEN, index, 0); + int length = (int)OS.SendMessage (handle, OS.CB_GETLBTEXTLEN, index, 0); if (length == OS.CB_ERR) { - int count = (int)/*64*/OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); if (0 <= index && index < count) error (SWT.ERROR_ITEM_NOT_REMOVED); error (SWT.ERROR_INVALID_RANGE); } buffer = new char [length + 1]; - int result = (int)/*64*/OS.SendMessage (handle, OS.CB_GETLBTEXT, index, buffer); + int result = (int)OS.SendMessage (handle, OS.CB_GETLBTEXT, index, buffer); if (result == OS.CB_ERR) { - int count = (int)/*64*/OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); if (0 <= index && index < count) error (SWT.ERROR_ITEM_NOT_REMOVED); error (SWT.ERROR_INVALID_RANGE); } } int length = OS.GetWindowTextLength (handle); - int code = (int)/*64*/OS.SendMessage (handle, OS.CB_DELETESTRING, index, 0); + int code = (int)OS.SendMessage (handle, OS.CB_DELETESTRING, index, 0); if (code == OS.CB_ERR) { - int count = (int)/*64*/OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); if (0 <= index && index < count) error (SWT.ERROR_ITEM_NOT_REMOVED); error (SWT.ERROR_INVALID_RANGE); } @@ -1639,13 +1639,13 @@ void remove (int index, boolean notify) { public void remove (int start, int end) { checkWidget (); if (start > end) return; - int count = (int)/*64*/OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); if (!(0 <= start && start <= end && end < count)) { error (SWT.ERROR_INVALID_RANGE); } int textLength = OS.GetWindowTextLength (handle); RECT rect = null; - long /*int*/ hDC = 0, oldFont = 0, newFont = 0; + long hDC = 0, oldFont = 0, newFont = 0; int newWidth = 0; if ((style & SWT.H_SCROLL) != 0) { rect = new RECT (); @@ -1657,13 +1657,13 @@ public void remove (int start, int end) { for (int i=start; i<=end; i++) { char [] buffer = null; if ((style & SWT.H_SCROLL) != 0) { - int length = (int)/*64*/OS.SendMessage (handle, OS.CB_GETLBTEXTLEN, start, 0); + int length = (int)OS.SendMessage (handle, OS.CB_GETLBTEXTLEN, start, 0); if (length == OS.CB_ERR) break; buffer = new char [length + 1]; - int result = (int)/*64*/OS.SendMessage (handle, OS.CB_GETLBTEXT, start, buffer); + int result = (int)OS.SendMessage (handle, OS.CB_GETLBTEXT, start, buffer); if (result == OS.CB_ERR) break; } - int result = (int)/*64*/OS.SendMessage (handle, OS.CB_DELETESTRING, start, 0); + int result = (int)OS.SendMessage (handle, OS.CB_DELETESTRING, start, 0); if (result == OS.CB_ERR) { error (SWT.ERROR_ITEM_NOT_REMOVED); } @@ -1781,7 +1781,7 @@ public void removeSegmentListener (SegmentListener listener) { eventTable.unhook (SWT.Segments, listener); int selection = OS.CB_ERR; if (!noSelection) { - selection = (int)/*64*/OS.SendMessage (handle, OS.CB_GETCURSEL, 0, 0); + selection = (int)OS.SendMessage (handle, OS.CB_GETCURSEL, 0, 0); } clearSegments (true); applyEditSegments (); @@ -1842,7 +1842,7 @@ public void removeVerifyListener (VerifyListener listener) { } @Override -boolean sendKeyEvent (int type, int msg, long /*int*/ wParam, long /*int*/ lParam, Event event) { +boolean sendKeyEvent (int type, int msg, long wParam, long lParam, Event event) { if (!super.sendKeyEvent (type, msg, wParam, lParam, event)) { return false; } @@ -1883,7 +1883,7 @@ boolean sendKeyEvent (int type, int msg, long /*int*/ wParam, long /*int*/ lPara /* Verify the character */ String oldText = ""; int [] start = new int [1], end = new int [1]; - long /*int*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT); + long hwndText = OS.GetDlgItem (handle, CBID_EDIT); if (hwndText == 0) return true; OS.SendMessage (hwndText, OS.EM_GETSEL, start, end); switch (key) { @@ -1932,16 +1932,16 @@ boolean sendKeyEvent (int type, int msg, long /*int*/ wParam, long /*int*/ lPara */ public void select (int index) { checkWidget (); - int count = (int)/*64*/OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); if (0 <= index && index < count) { - int selection = (int)/*64*/OS.SendMessage (handle, OS.CB_GETCURSEL, 0, 0); + int selection = (int)OS.SendMessage (handle, OS.CB_GETCURSEL, 0, 0); //corner case for single elements combo boxes for Bug 222752 if (OS.WIN32_VERSION < OS.VERSION (6, 2) && getListVisible() && (style & SWT.READ_ONLY) != 0 && count==1 && selection == OS.CB_ERR) { OS.SendMessage (handle, OS.WM_KEYDOWN, OS.VK_DOWN, 0); sendEvent (SWT.Modify); return; } - int code = (int)/*64*/OS.SendMessage (handle, OS.CB_SETCURSEL, index, 0); + int code = (int)OS.SendMessage (handle, OS.CB_SETCURSEL, index, 0); if (code != OS.CB_ERR && code != selection) { //Workaround for Bug 222752 if (OS.WIN32_VERSION < OS.VERSION (6, 2) && getListVisible() && (style & SWT.READ_ONLY) != 0) { @@ -1961,20 +1961,20 @@ public void select (int index) { } @Override -void setBackgroundImage (long /*int*/ hBitmap) { +void setBackgroundImage (long hBitmap) { super.setBackgroundImage (hBitmap); - long /*int*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT); + long hwndText = OS.GetDlgItem (handle, CBID_EDIT); if (hwndText != 0) OS.InvalidateRect (hwndText, null, true); - long /*int*/ hwndList = OS.GetDlgItem (handle, CBID_LIST); + long hwndList = OS.GetDlgItem (handle, CBID_LIST); if (hwndList != 0) OS.InvalidateRect (hwndList, null, true); } @Override void setBackgroundPixel (int pixel) { super.setBackgroundPixel (pixel); - long /*int*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT); + long hwndText = OS.GetDlgItem (handle, CBID_EDIT); if (hwndText != 0) OS.InvalidateRect (hwndText, null, true); - long /*int*/ hwndList = OS.GetDlgItem (handle, CBID_LIST); + long hwndList = OS.GetDlgItem (handle, CBID_LIST); if (hwndList != 0) OS.InvalidateRect (hwndList, null, true); } @@ -2050,9 +2050,9 @@ public void setFont (Font font) { @Override void setForegroundPixel (int pixel) { super.setForegroundPixel (pixel); - long /*int*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT); + long hwndText = OS.GetDlgItem (handle, CBID_EDIT); if (hwndText != 0) OS.InvalidateRect (hwndText, null, true); - long /*int*/ hwndList = OS.GetDlgItem (handle, CBID_LIST); + long hwndList = OS.GetDlgItem (handle, CBID_LIST); if (hwndList != 0) OS.InvalidateRect (hwndList, null, true); } @@ -2103,7 +2103,7 @@ public void setItems (String... items) { if (items [i] == null) error (SWT.ERROR_INVALID_ARGUMENT); } RECT rect = null; - long /*int*/ hDC = 0, oldFont = 0, newFont = 0; + long hDC = 0, oldFont = 0, newFont = 0; int newWidth = 0; if ((style & SWT.H_SCROLL) != 0) { rect = new RECT (); @@ -2117,7 +2117,7 @@ public void setItems (String... items) { for (int i=0; i<items.length; i++) { String string = items [i]; TCHAR buffer = new TCHAR (codePage, string, true); - int code = (int)/*64*/OS.SendMessage (handle, OS.CB_ADDSTRING, 0, buffer); + int code = (int)OS.SendMessage (handle, OS.CB_ADDSTRING, 0, buffer); if (code == OS.CB_ERR) error (SWT.ERROR_ITEM_NOT_ADDED); if (code == OS.CB_ERRSPACE) error (SWT.ERROR_ITEM_NOT_ADDED); if ((style & SWT.H_SCROLL) != 0) { @@ -2157,17 +2157,17 @@ public void setOrientation (int orientation) { void setScrollWidth () { int newWidth = 0; RECT rect = new RECT (); - long /*int*/ newFont, oldFont = 0; - long /*int*/ hDC = OS.GetDC (handle); + long newFont, oldFont = 0; + long hDC = OS.GetDC (handle); newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont); - int count = (int)/*64*/OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); int flags = OS.DT_CALCRECT | OS.DT_SINGLELINE | OS.DT_NOPREFIX; for (int i=0; i<count; i++) { - int length = (int)/*64*/OS.SendMessage (handle, OS.CB_GETLBTEXTLEN, i, 0); + int length = (int)OS.SendMessage (handle, OS.CB_GETLBTEXTLEN, i, 0); if (length != OS.CB_ERR) { char [] buffer = new char [length + 1]; - int result = (int)/*64*/OS.SendMessage (handle, OS.CB_GETLBTEXT, i, buffer); + int result = (int)OS.SendMessage (handle, OS.CB_GETLBTEXT, i, buffer); if (result != OS.CB_ERR) { OS.DrawText (hDC, buffer, -1, rect, flags); newWidth = Math.max (newWidth, rect.right - rect.left); @@ -2186,9 +2186,9 @@ void setScrollWidth (int scrollWidth) { return; } boolean scroll = false; - int count = (int)/*64*/OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0); if (count > 3) { - long /*int*/ hmonitor = OS.MonitorFromWindow (handle, OS.MONITOR_DEFAULTTONEAREST); + long hmonitor = OS.MonitorFromWindow (handle, OS.MONITOR_DEFAULTTONEAREST); MONITORINFO lpmi = new MONITORINFO (); lpmi.cbSize = MONITORINFO.sizeof; OS.GetMonitorInfo (hmonitor, lpmi); @@ -2219,8 +2219,8 @@ void setScrollWidth (int scrollWidth) { void setScrollWidth (char[] buffer, boolean grow) { RECT rect = new RECT (); - long /*int*/ newFont, oldFont = 0; - long /*int*/ hDC = OS.GetDC (handle); + long newFont, oldFont = 0; + long hDC = OS.GetDC (handle); newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont); int flags = OS.DT_CALCRECT | OS.DT_SINGLELINE | OS.DT_NOPREFIX; @@ -2260,7 +2260,7 @@ public void setSelection (Point selection) { checkWidget (); if (selection == null) error (SWT.ERROR_NULL_ARGUMENT); int start = translateOffset (selection.x), end = translateOffset (selection.y); - long /*int*/ bits = OS.MAKELPARAM (start, end); + long bits = OS.MAKELPARAM (start, end); OS.SendMessage (handle, OS.CB_SETEDITSEL, 0, bits); } @@ -2302,9 +2302,9 @@ public void setText (String string) { } clearSegments (false); int limit = LIMIT; - long /*int*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT); + long hwndText = OS.GetDlgItem (handle, CBID_EDIT); if (hwndText != 0) { - limit = (int)/*64*/OS.SendMessage (hwndText, OS.EM_GETLIMITTEXT, 0, 0) & 0x7FFFFFFF; + limit = (int)OS.SendMessage (hwndText, OS.EM_GETLIMITTEXT, 0, 0) & 0x7FFFFFFF; } if (string.length () > limit) string = string.substring (0, limit); TCHAR buffer = new TCHAR (getCodePage (), string, true); @@ -2347,8 +2347,8 @@ public void setTextLimit (int limit) { @Override void setToolTipText (Shell shell, String string) { - long /*int*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT); - long /*int*/ hwndList = OS.GetDlgItem (handle, CBID_LIST); + long hwndText = OS.GetDlgItem (handle, CBID_EDIT); + long hwndList = OS.GetDlgItem (handle, CBID_LIST); if (hwndText != 0) shell.setToolTipText (hwndText, string); if (hwndList != 0) shell.setToolTipText (hwndList, string); shell.setToolTipText (handle, string); @@ -2381,12 +2381,12 @@ public void setVisibleItemCount (int count) { @Override void subclass () { super.subclass (); - long /*int*/ newProc = display.windowProc; - long /*int*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT); + long newProc = display.windowProc; + long hwndText = OS.GetDlgItem (handle, CBID_EDIT); if (hwndText != 0) { OS.SetWindowLongPtr (hwndText, OS.GWLP_WNDPROC, newProc); } - long /*int*/ hwndList = OS.GetDlgItem (handle, CBID_LIST); + long hwndList = OS.GetDlgItem (handle, CBID_LIST); if (hwndList != 0) { OS.SetWindowLongPtr (hwndList, OS.GWLP_WNDPROC, newProc); } @@ -2407,7 +2407,7 @@ boolean translateTraversal (MSG msg) { * to select an item in the list and escape to close * the combo box. */ - switch ((int)/*64*/(msg.wParam)) { + switch ((int)(msg.wParam)) { case OS.VK_RETURN: case OS.VK_ESCAPE: if ((style & SWT.DROP_DOWN) != 0) { @@ -2444,11 +2444,11 @@ boolean traverseReturn () { @Override void unsubclass () { super.unsubclass (); - long /*int*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT); + long hwndText = OS.GetDlgItem (handle, CBID_EDIT); if (hwndText != 0 && EditProc != 0) { OS.SetWindowLongPtr (hwndText, OS.GWLP_WNDPROC, EditProc); } - long /*int*/ hwndList = OS.GetDlgItem (handle, CBID_LIST); + long hwndList = OS.GetDlgItem (handle, CBID_LIST); if (hwndList != 0 && ListProc != 0) { OS.SetWindowLongPtr (hwndList, OS.GWLP_WNDPROC, ListProc); } @@ -2504,7 +2504,7 @@ void updateOrientation () { } bits &= ~OS.WS_EX_RTLREADING; OS.SetWindowLong (handle, OS.GWL_EXSTYLE, bits); - long /*int*/ hwndText = 0, hwndList = 0; + long hwndText = 0, hwndList = 0; COMBOBOXINFO pcbi = new COMBOBOXINFO (); pcbi.cbSize = COMBOBOXINFO.sizeof; if (OS.GetComboBoxInfo (handle, pcbi)) { @@ -2595,16 +2595,16 @@ TCHAR windowClass () { } @Override -long /*int*/ windowProc () { +long windowProc () { return ComboProc; } @Override -long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) { +long windowProc (long hwnd, int msg, long wParam, long lParam) { if (handle == 0) return 0; if (hwnd != handle) { - long /*int*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT); - long /*int*/ hwndList = OS.GetDlgItem (handle, CBID_LIST); + long hwndText = OS.GetDlgItem (handle, CBID_EDIT); + long hwndList = OS.GetDlgItem (handle, CBID_LIST); if ((hwndText != 0 && hwnd == hwndText) || (hwndList != 0 && hwnd == hwndList)) { LRESULT result = null; boolean processSegments = false, redraw = false; @@ -2675,7 +2675,7 @@ long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long / OS.DefWindowProc (hwndText, OS.WM_SETREDRAW, 0, 0); } clearSegments (true); - long /*int*/ code = callWindowProc (hwnd, msg, wParam, lParam); + long code = callWindowProc (hwnd, msg, wParam, lParam); applyEditSegments (); if (redraw) { OS.DefWindowProc (hwndText, OS.WM_SETREDRAW, 1, 0); @@ -2688,8 +2688,8 @@ long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long / } switch (msg) { case OS.CB_SETCURSEL: { - long /*int*/ code = OS.CB_ERR; - int index = (int)/*64*/ wParam; + long code = OS.CB_ERR; + int index = (int) wParam; if ((style & SWT.READ_ONLY) != 0) { if (hooks (SWT.Verify) || filters (SWT.Verify)) { String oldText = getText (), newText = null; @@ -2697,7 +2697,7 @@ long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long / newText = ""; } else { if (0 <= wParam && wParam < getItemCount ()) { - newText = getItem ((int)/*64*/wParam); + newText = getItem ((int)wParam); } } if (newText != null && !newText.equals (oldText)) { @@ -2737,7 +2737,7 @@ long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long / case OS.CB_INSERTSTRING: case OS.CB_FINDSTRINGEXACT: if (lParam != 0 && (hooks (SWT.Segments) || filters (SWT.Segments) || ((state & HAS_AUTO_DIRECTION) != 0))) { - long /*int*/ code = OS.CB_ERR; + long code = OS.CB_ERR; int length = OS.wcslen (lParam); TCHAR buffer = new TCHAR (getCodePage (), length); OS.MoveMemory (buffer, lParam, buffer.length () * TCHAR.sizeof); @@ -2745,15 +2745,15 @@ long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long / Event event = getSegments (string); if (event != null && event.segments != null) { buffer = new TCHAR (getCodePage (), getSegmentsText (string, event), true); - long /*int*/ hHeap = OS.GetProcessHeap (); + long hHeap = OS.GetProcessHeap (); length = buffer.length() * TCHAR.sizeof; - long /*int*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, length); + long pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, length); OS.MoveMemory (pszText, buffer, length); code = super.windowProc (hwnd, msg, wParam, pszText); OS.HeapFree (hHeap, 0, pszText); } if (msg == OS.CB_ADDSTRING || msg == OS.CB_INSERTSTRING) { - int index = msg == OS.CB_ADDSTRING ? items.length : (int)/*64*/ wParam; + int index = msg == OS.CB_ADDSTRING ? items.length : (int) wParam; String [] newItems = new String [items.length + 1]; System.arraycopy (items, 0, newItems, 0, index); newItems [index] = string; @@ -2765,9 +2765,9 @@ long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long / break; case OS.CB_DELETESTRING: { if (hooks (SWT.Segments) || filters (SWT.Segments) || ((state & HAS_AUTO_DIRECTION) != 0)) { - long /*int*/ code = super.windowProc (hwnd, msg, wParam, lParam); + long code = super.windowProc (hwnd, msg, wParam, lParam); if (code != OS.CB_ERR && code != OS.CB_ERRSPACE) { - int index = (int)/*64*/ wParam; + int index = (int) wParam; if (items.length == 1) { items = new String[0]; } else if (items.length > 1) { @@ -2777,7 +2777,7 @@ long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long / items = newItems; } if (!noSelection) { - index = (int)/*64*/OS.SendMessage (handle, OS.CB_GETCURSEL, 0, 0); + index = (int)OS.SendMessage (handle, OS.CB_GETCURSEL, 0, 0); if (index == wParam) { clearSegments (false); applyEditSegments (); @@ -2801,7 +2801,7 @@ long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long / } @Override -LRESULT wmColorChild (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmColorChild (long wParam, long lParam) { LRESULT result = super.wmColorChild(wParam, lParam); /* @@ -2831,18 +2831,18 @@ LRESULT wmColorChild (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_CTLCOLOR (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_CTLCOLOR (long wParam, long lParam) { return wmColorChild (wParam, lParam); } @Override -LRESULT WM_GETDLGCODE (long /*int*/ wParam, long /*int*/ lParam) { - long /*int*/ code = callWindowProc (handle, OS.WM_GETDLGCODE, wParam, lParam); +LRESULT WM_GETDLGCODE (long wParam, long lParam) { + long code = callWindowProc (handle, OS.WM_GETDLGCODE, wParam, lParam); return new LRESULT (code | OS.DLGC_WANTARROWS); } @Override -LRESULT WM_KILLFOCUS (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_KILLFOCUS (long wParam, long lParam) { /* * Bug in Windows. When a combo box that is read only * is disposed in CBN_KILLFOCUS, Windows segment faults. @@ -2863,7 +2863,7 @@ LRESULT WM_KILLFOCUS (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_LBUTTONDOWN (long wParam, long lParam) { /* * Feature in Windows. When an editable combo box is dropped * down and the text in the entry field partially matches an @@ -2871,11 +2871,11 @@ LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) { * WM_COMMAND with CBN_SELCHANGE. The fix is to detect that * the selection has changed and issue the notification. */ - int oldSelection = (int)/*64*/OS.SendMessage (handle, OS.CB_GETCURSEL, 0, 0); + int oldSelection = (int)OS.SendMessage (handle, OS.CB_GETCURSEL, 0, 0); LRESULT result = super.WM_LBUTTONDOWN (wParam, lParam); if (result == LRESULT.ZERO) return result; if ((style & SWT.READ_ONLY) == 0) { - int newSelection = (int)/*64*/OS.SendMessage (handle, OS.CB_GETCURSEL, 0, 0); + int newSelection = (int)OS.SendMessage (handle, OS.CB_GETCURSEL, 0, 0); if (oldSelection != newSelection) { sendEvent (SWT.Modify); if (isDisposed ()) return LRESULT.ZERO; @@ -2887,7 +2887,7 @@ LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_SETFOCUS (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SETFOCUS (long wParam, long lParam) { /* * Return NULL - Focus notification is * done by WM_COMMAND with CBN_SETFOCUS. @@ -2896,7 +2896,7 @@ LRESULT WM_SETFOCUS (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SIZE (long wParam, long lParam) { /* * Feature in Windows. When a combo box is resized, * the size of the drop down rectangle is specified @@ -2968,7 +2968,7 @@ LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_UPDATEUISTATE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_UPDATEUISTATE (long wParam, long lParam) { LRESULT result = super.WM_UPDATEUISTATE (wParam, lParam); if (result != null) return result; OS.InvalidateRect (handle, null, true); @@ -2976,7 +2976,7 @@ LRESULT WM_UPDATEUISTATE (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_WINDOWPOSCHANGING (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_WINDOWPOSCHANGING (long wParam, long lParam) { LRESULT result = super.WM_WINDOWPOSCHANGING (wParam, lParam); if (result != null) return result; /* @@ -3004,15 +3004,15 @@ LRESULT WM_WINDOWPOSCHANGING (long /*int*/ wParam, long /*int*/ lParam) { int width = rect.right - rect.left; int height = rect.bottom - rect.top; if (width != 0 && height != 0) { - long /*int*/ hwndParent = parent.handle; - long /*int*/ hwndChild = OS.GetWindow (hwndParent, OS.GW_CHILD); + long hwndParent = parent.handle; + long hwndChild = OS.GetWindow (hwndParent, OS.GW_CHILD); OS.MapWindowPoints (0, hwndParent, rect, 2); - long /*int*/ rgn1 = OS.CreateRectRgn (rect.left, rect.top, rect.right, rect.bottom); + long rgn1 = OS.CreateRectRgn (rect.left, rect.top, rect.right, rect.bottom); while (hwndChild != 0) { if (hwndChild != handle) { OS.GetWindowRect (hwndChild, rect); OS.MapWindowPoints (0, hwndParent, rect, 2); - long /*int*/ rgn2 = OS.CreateRectRgn (rect.left, rect.top, rect.right, rect.bottom); + long rgn2 = OS.CreateRectRgn (rect.left, rect.top, rect.right, rect.bottom); OS.CombineRgn (rgn1, rgn1, rgn2, OS.RGN_DIFF); OS.DeleteObject (rgn2); } @@ -3028,11 +3028,11 @@ LRESULT WM_WINDOWPOSCHANGING (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT wmChar (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmChar (long hwnd, long wParam, long lParam) { if (ignoreCharacter) return null; LRESULT result = super.wmChar (hwnd, wParam, lParam); if (result != null) return result; - switch ((int)/*64*/wParam) { + switch ((int)wParam) { /* * Feature in Windows. For some reason, when the * widget is a single line text widget, when the @@ -3074,7 +3074,7 @@ LRESULT wmChar (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { if (OS.GetKeyState (OS.VK_CONTROL) < 0) { if ((style & SWT.READ_ONLY) != 0) return LRESULT.ZERO; Point selection = getSelection (); - long /*int*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT); + long hwndText = OS.GetDlgItem (handle, CBID_EDIT); int x = selection.x; int y = selection.y; if (x == y) { @@ -3099,7 +3099,7 @@ LRESULT wmChar (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { return result; } -LRESULT wmClipboard (long /*int*/ hwndText, int msg, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmClipboard (long hwndText, int msg, long wParam, long lParam) { if ((style & SWT.READ_ONLY) != 0) return null; if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return null; boolean call = false; @@ -3158,11 +3158,11 @@ LRESULT wmClipboard (long /*int*/ hwndText, int msg, long /*int*/ wParam, long / } TCHAR buffer = new TCHAR (getCodePage (), newText, true); if (msg == OS.WM_SETTEXT) { - long /*int*/ hHeap = OS.GetProcessHeap (); + long hHeap = OS.GetProcessHeap (); int byteCount = buffer.length () * TCHAR.sizeof; - long /*int*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); + long pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); OS.MoveMemory (pszText, buffer, byteCount); - long /*int*/ code = OS.CallWindowProc (EditProc, hwndText, msg, wParam, pszText); + long code = OS.CallWindowProc (EditProc, hwndText, msg, wParam, pszText); OS.HeapFree (hHeap, 0, pszText); return new LRESULT (code); } else { @@ -3175,7 +3175,7 @@ LRESULT wmClipboard (long /*int*/ hwndText, int msg, long /*int*/ wParam, long / } @Override -LRESULT wmCommandChild (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmCommandChild (long wParam, long lParam) { int code = OS.HIWORD (wParam); switch (code) { case OS.CBN_EDITCHANGE: @@ -3204,7 +3204,7 @@ LRESULT wmCommandChild (long /*int*/ wParam, long /*int*/ lParam) { * match the list selection. The fix is to force the text field * to match the list selection by re-selecting the list item. */ - int index = (int)/*64*/OS.SendMessage (handle, OS.CB_GETCURSEL, 0, 0); + int index = (int)OS.SendMessage (handle, OS.CB_GETCURSEL, 0, 0); if (index != OS.CB_ERR) { OS.SendMessage (handle, OS.CB_SETCURSEL, index, 0); } @@ -3246,7 +3246,7 @@ LRESULT wmCommandChild (long /*int*/ wParam, long /*int*/ lParam) { event.doit = true; sendEvent (SWT.OrientationChange, event); if (!event.doit) { - long /*int*/ hwnd = lParam; + long hwnd = lParam; int bits1 = OS.GetWindowLong (hwnd, OS.GWL_EXSTYLE); int bits2 = OS.GetWindowLong (hwnd, OS.GWL_STYLE); if (code == OS.EN_ALIGN_LTR_EC) { @@ -3274,12 +3274,12 @@ LRESULT wmCommandChild (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT wmIMEChar (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmIMEChar (long hwnd, long wParam, long lParam) { /* Process a DBCS character */ Display display = this.display; display.lastKey = 0; - display.lastAscii = (int)/*64*/wParam; + display.lastAscii = (int)wParam; display.lastVirtual = display.lastNull = display.lastDead = false; if (!sendKeyEvent (SWT.KeyDown, OS.WM_IME_CHAR, wParam, lParam)) { return LRESULT.ZERO; @@ -3293,7 +3293,7 @@ LRESULT wmIMEChar (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) * them to the application. */ ignoreCharacter = true; - long /*int*/ result = callWindowProc (hwnd, OS.WM_IME_CHAR, wParam, lParam); + long result = callWindowProc (hwnd, OS.WM_IME_CHAR, wParam, lParam); MSG msg = new MSG (); int flags = OS.PM_REMOVE | OS.PM_NOYIELD | OS.PM_QS_INPUT | OS.PM_QS_POSTMESSAGE; while (OS.PeekMessage (msg, hwnd, OS.WM_CHAR, OS.WM_CHAR, flags)) { @@ -3309,18 +3309,18 @@ LRESULT wmIMEChar (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) } @Override -LRESULT wmKeyDown (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmKeyDown (long hwnd, long wParam, long lParam) { if (ignoreCharacter) return null; LRESULT result = super.wmKeyDown (hwnd, wParam, lParam); if (result != null) return result; ignoreDefaultSelection = false; - switch ((int)/*64*/wParam) { + switch ((int)wParam) { case OS.VK_LEFT: case OS.VK_UP: case OS.VK_RIGHT: case OS.VK_DOWN: if (segments != null) { - long /*int*/ code = 0; + long code = 0; int [] start = new int [1], end = new int [1], newStart = new int [1], newEnd = new int [1]; OS.SendMessage (handle, OS.CB_GETEDITSEL, start, end); while (true) { @@ -3351,7 +3351,7 @@ LRESULT wmKeyDown (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) } @Override -LRESULT wmSysKeyDown (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmSysKeyDown (long hwnd, long wParam, long lParam) { /* * Feature in Windows. When an editable combo box is dropped * down using Alt+Down and the text in the entry field partially @@ -3359,13 +3359,13 @@ LRESULT wmSysKeyDown (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lPara * send WM_COMMAND with CBN_SELCHANGE. The fix is to detect that * the selection has changed and issue the notification. */ - int oldSelection = (int)/*64*/OS.SendMessage (handle, OS.CB_GETCURSEL, 0, 0); + int oldSelection = (int)OS.SendMessage (handle, OS.CB_GETCURSEL, 0, 0); LRESULT result = super.wmSysKeyDown (hwnd, wParam, lParam); if (result != null) return result; if ((style & SWT.READ_ONLY) == 0) { if (wParam == OS.VK_DOWN) { - long /*int*/ code = callWindowProc (hwnd, OS.WM_SYSKEYDOWN, wParam, lParam); - int newSelection = (int)/*64*/OS.SendMessage (handle, OS.CB_GETCURSEL, 0, 0); + long code = callWindowProc (hwnd, OS.WM_SYSKEYDOWN, wParam, lParam); + int newSelection = (int)OS.SendMessage (handle, OS.CB_GETCURSEL, 0, 0); if (oldSelection != newSelection) { sendEvent (SWT.Modify); if (isDisposed ()) return LRESULT.ZERO; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Composite.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Composite.java index f5751e7861..ed0cc9decd 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Composite.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Composite.java @@ -101,7 +101,7 @@ public Composite (Composite parent, int style) { Control [] _getChildren () { int count = 0; - long /*int*/ hwndChild = OS.GetWindow (handle, OS.GW_CHILD); + long hwndChild = OS.GetWindow (handle, OS.GW_CHILD); if (hwndChild == 0) return new Control [0]; while (hwndChild != 0) { count++; @@ -176,7 +176,7 @@ void checkBuffered () { void checkComposited () { if ((state & CANVAS) != 0) { if ((style & SWT.TRANSPARENT) != 0) { - long /*int*/ hwndParent = parent.handle; + long hwndParent = parent.handle; int bits = OS.GetWindowLong (hwndParent, OS.GWL_EXSTYLE); bits |= OS.WS_EX_COMPOSITED; OS.SetWindowLong (hwndParent, OS.GWL_EXSTYLE, bits); @@ -262,13 +262,13 @@ Point computeSizeInPixels (int wHint, int hHint, boolean changed) { //#define PW_CLIENTONLY 0x00000001 //DCOrg() wrong //topHandle wrong for Tree? - long /*int*/ hDC = gc.handle; + long hDC = gc.handle; int nSavedDC = OS.SaveDC (hDC); OS.IntersectClipRect (hDC, 0, 0, width, height); //WRONG PARENT POINT lpPoint = new POINT (); - long /*int*/ hwndParent = OS.GetParent (handle); + long hwndParent = OS.GetParent (handle); OS.MapWindowPoints (handle, hwndParent, lpPoint, 1); RECT rect = new RECT (); OS.GetWindowRect (handle, rect); @@ -364,7 +364,7 @@ void drawBackgroundInPixels(GC gc, int x, int y, int width, int height, int offs if (gc.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT); RECT rect = new RECT (); OS.SetRect (rect, x, y, x + width, y + height); - long /*int*/ hDC = gc.handle; + long hDC = gc.handle; int pixel = background == -1 ? gc.getBackground ().handle : -1; drawBackground (hDC, rect, pixel, offsetX, offsetY); } @@ -476,7 +476,7 @@ int getChildrenCount () { * non-registered children. */ int count = 0; - long /*int*/ hwndChild = OS.GetWindow (handle, OS.GW_CHILD); + long hwndChild = OS.GetWindow (handle, OS.GW_CHILD); while (hwndChild != 0) { count++; hwndChild = OS.GetWindow (hwndChild, OS.GW_HWNDNEXT); @@ -906,8 +906,8 @@ void releaseParent () { super.releaseParent (); if ((state & CANVAS) != 0) { if ((style & SWT.TRANSPARENT) != 0) { - long /*int*/ hwndParent = parent.handle; - long /*int*/ hwndChild = OS.GetWindow (hwndParent, OS.GW_CHILD); + long hwndParent = parent.handle; + long hwndChild = OS.GetWindow (hwndParent, OS.GW_CHILD); while (hwndChild != 0) { if (hwndChild != handle) { int bits = OS.GetWindowLong (hwndParent, OS.GWL_EXSTYLE); @@ -938,7 +938,7 @@ void releaseChildren (boolean destroy) { void releaseWidget () { super.releaseWidget (); if ((state & CANVAS) != 0 && (style & SWT.EMBEDDED) != 0) { - long /*int*/ hwndChild = OS.GetWindow (handle, OS.GW_CHILD); + long hwndChild = OS.GetWindow (handle, OS.GW_CHILD); if (hwndChild != 0) { int threadId = OS.GetWindowThreadProcessId (hwndChild, null); if (threadId != OS.GetCurrentThreadId ()) { @@ -980,7 +980,7 @@ void resizeChildren () { boolean resizeChildren (boolean defer, WINDOWPOS [] pwp) { if (pwp == null) return true; - long /*int*/ hdwp = 0; + long hdwp = 0; if (defer) { hdwp = OS.BeginDeferWindowPos (pwp.length); if (hdwp == 0) return false; @@ -1010,7 +1010,7 @@ boolean resizeChildren (boolean defer, WINDOWPOS [] pwp) { return true; } -void resizeEmbeddedHandle(long /*int*/ embeddedHandle, int width, int height) { +void resizeEmbeddedHandle(long embeddedHandle, int width, int height) { if (embeddedHandle == 0) return; int [] processID = new int [1]; int threadId = OS.GetWindowThreadProcessId (embeddedHandle, processID); @@ -1245,7 +1245,7 @@ String toolTipText (NMTTDISPINFO hdr) { Shell shell = getShell (); if ((hdr.uFlags & OS.TTF_IDISHWND) == 0) { String string = null; - ToolTip toolTip = shell.findToolTip ((int)/*64*/hdr.idFrom); + ToolTip toolTip = shell.findToolTip ((int)hdr.idFrom); if (toolTip != null) { string = toolTip.message; if (string == null || string.length () == 0) string = " "; @@ -1282,14 +1282,14 @@ boolean translateMnemonic (Event event, Control control) { boolean translateTraversal (MSG msg) { if ((state & CANVAS) != 0 ) { if ((style & SWT.EMBEDDED) != 0) return false; - switch ((int)/*64*/msg.wParam) { + switch ((int)msg.wParam) { case OS.VK_UP: case OS.VK_LEFT: case OS.VK_DOWN: case OS.VK_RIGHT: case OS.VK_PRIOR: case OS.VK_NEXT: - int uiState = (int)/*64*/OS.SendMessage (msg.hwnd, OS.WM_QUERYUISTATE, 0, 0); + int uiState = (int)OS.SendMessage (msg.hwnd, OS.WM_QUERYUISTATE, 0, 0); if ((uiState & OS.UISF_HIDEFOCUS) != 0) { OS.SendMessage (msg.hwnd, OS.WM_UPDATEUISTATE, OS.MAKEWPARAM (OS.UIS_CLEAR, OS.UISF_HIDEFOCUS), 0); } @@ -1393,8 +1393,8 @@ void updateOrientation () { } void updateUIState () { - long /*int*/ hwndShell = getShell ().handle; - int uiState = /*64*/(int)OS.SendMessage (hwndShell, OS.WM_QUERYUISTATE, 0, 0); + long hwndShell = getShell ().handle; + int uiState = (int)OS.SendMessage (hwndShell, OS.WM_QUERYUISTATE, 0, 0); if ((uiState & OS.UISF_HIDEFOCUS) != 0) { OS.SendMessage (hwndShell, OS.WM_CHANGEUISTATE, OS.MAKEWPARAM (OS.UIS_CLEAR, OS.UISF_HIDEFOCUS), 0); } @@ -1407,7 +1407,7 @@ int widgetStyle () { } @Override -LRESULT WM_ERASEBKGND (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_ERASEBKGND (long wParam, long lParam) { LRESULT result = super.WM_ERASEBKGND (wParam, lParam); if (result != null) return result; if ((state & CANVAS) != 0) { @@ -1420,7 +1420,7 @@ LRESULT WM_ERASEBKGND (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_GETDLGCODE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_GETDLGCODE (long wParam, long lParam) { LRESULT result = super.WM_GETDLGCODE (wParam, lParam); if (result != null) return result; if ((state & CANVAS) != 0) { @@ -1436,16 +1436,16 @@ LRESULT WM_GETDLGCODE (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_GETFONT (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_GETFONT (long wParam, long lParam) { LRESULT result = super.WM_GETFONT (wParam, lParam); if (result != null) return result; - long /*int*/ code = callWindowProc (handle, OS.WM_GETFONT, wParam, lParam); + long code = callWindowProc (handle, OS.WM_GETFONT, wParam, lParam); if (code != 0) return new LRESULT (code); return new LRESULT (font != null ? font.handle : defaultFont ()); } @Override -LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_LBUTTONDOWN (long wParam, long lParam) { LRESULT result = super.WM_LBUTTONDOWN (wParam, lParam); if (result == LRESULT.ZERO) return result; @@ -1459,7 +1459,7 @@ LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_NCHITTEST (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_NCHITTEST (long wParam, long lParam) { LRESULT result = super.WM_NCHITTEST (wParam, lParam); if (result != null) return result; /* @@ -1476,7 +1476,7 @@ LRESULT WM_NCHITTEST (long /*int*/ wParam, long /*int*/ lParam) { */ if (OS.IsAppThemed ()) { if ((state & CANVAS)!= 0) { - long /*int*/ code = callWindowProc (handle, OS.WM_NCHITTEST, wParam, lParam); + long code = callWindowProc (handle, OS.WM_NCHITTEST, wParam, lParam); if (code == OS.HTCLIENT) { RECT rect = new RECT (); OS.GetClientRect (handle, rect); @@ -1496,7 +1496,7 @@ LRESULT WM_NCHITTEST (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_PARENTNOTIFY (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_PARENTNOTIFY (long wParam, long lParam) { if ((state & CANVAS) != 0 && (style & SWT.EMBEDDED) != 0) { if (OS.LOWORD (wParam) == OS.WM_CREATE) { RECT rect = new RECT (); @@ -1508,7 +1508,7 @@ LRESULT WM_PARENTNOTIFY (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_PAINT (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_PAINT (long wParam, long lParam) { if ((state & DISPOSE_SENT) != 0) return LRESULT.ZERO; if ((state & CANVAS) == 0 || (state & FOREIGN_HANDLE) != 0) { return super.WM_PAINT (wParam, lParam); @@ -1531,15 +1531,15 @@ LRESULT WM_PAINT (long /*int*/ wParam, long /*int*/ lParam) { } } if (bufferedPaint) { - long /*int*/ hDC = OS.BeginPaint (handle, ps); + long hDC = OS.BeginPaint (handle, ps); int width = ps.right - ps.left; int height = ps.bottom - ps.top; if (width != 0 && height != 0) { - long /*int*/ [] phdc = new long /*int*/ [1]; + long [] phdc = new long [1]; int flags = OS.BPBF_COMPATIBLEBITMAP; RECT prcTarget = new RECT (); OS.SetRect (prcTarget, ps.left, ps.top, ps.right, ps.bottom); - long /*int*/ hBufferedPaint = OS.BeginBufferedPaint (hDC, prcTarget, flags, null, phdc); + long hBufferedPaint = OS.BeginBufferedPaint (hDC, prcTarget, flags, null, phdc); GCData data = new GCData (); data.device = display; data.foreground = getForegroundPixel (); @@ -1547,7 +1547,7 @@ LRESULT WM_PAINT (long /*int*/ wParam, long /*int*/ lParam) { if (control == null) control = this; data.background = control.getBackgroundPixel (); data.font = Font.win32_new(display, OS.SendMessage (handle, OS.WM_GETFONT, 0, 0)); - data.uiState = (int)/*64*/OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); + data.uiState = (int)OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); if ((style & SWT.NO_BACKGROUND) != 0) { /* This code is intentionally commented because it may be slow to copy bits from the screen */ //paintGC.copyArea (image, ps.left, ps.top); @@ -1575,7 +1575,7 @@ LRESULT WM_PAINT (long /*int*/ wParam, long /*int*/ lParam) { GC gc = GC.win32_new (this, data); /* Get the system region for the paint HDC */ - long /*int*/ sysRgn = 0; + long sysRgn = 0; if ((style & (SWT.DOUBLE_BUFFERED | SWT.TRANSPARENT)) != 0 || (style & SWT.NO_MERGE_PAINTS) != 0) { sysRgn = OS.CreateRectRgn (0, 0, 0, 0); if (OS.GetRandomRgn (gc.handle, sysRgn, OS.SYSRGN) == 1) { @@ -1583,7 +1583,7 @@ LRESULT WM_PAINT (long /*int*/ wParam, long /*int*/ lParam) { int nBytes = OS.GetRegionData (sysRgn, 0, null); int [] lpRgnData = new int [nBytes / 4]; OS.GetRegionData (sysRgn, nBytes, lpRgnData); - long /*int*/ newSysRgn = OS.ExtCreateRegion (new float [] {-1, 0, 0, 1, 0, 0}, nBytes, lpRgnData); + long newSysRgn = OS.ExtCreateRegion (new float [] {-1, 0, 0, 1, 0, 0}, nBytes, lpRgnData); OS.DeleteObject (sysRgn); sysRgn = newSysRgn; } @@ -1673,7 +1673,7 @@ LRESULT WM_PAINT (long /*int*/ wParam, long /*int*/ lParam) { gc.dispose (); } } else { - long /*int*/ hDC = OS.BeginPaint (handle, ps); + long hDC = OS.BeginPaint (handle, ps); if ((style & (SWT.NO_BACKGROUND | SWT.TRANSPARENT)) == 0) { RECT rect = new RECT (); OS.SetRect (rect, ps.left, ps.top, ps.right, ps.bottom); @@ -1700,7 +1700,7 @@ LRESULT WM_PAINT (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_PRINTCLIENT (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_PRINTCLIENT (long wParam, long lParam) { LRESULT result = super.WM_PRINTCLIENT (wParam, lParam); if (result != null) return result; if ((state & CANVAS) != 0) { @@ -1719,7 +1719,7 @@ LRESULT WM_PRINTCLIENT (long /*int*/ wParam, long /*int*/ lParam) { if (control == null) control = this; data.background = control.getBackgroundPixel (); data.font = Font.win32_new(display, OS.SendMessage (handle, OS.WM_GETFONT, 0, 0)); - data.uiState = (int)/*64*/OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); + data.uiState = (int)OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); GC gc = GC.win32_new (wParam, data); Event event = new Event (); event.gc = gc; @@ -1734,13 +1734,13 @@ LRESULT WM_PRINTCLIENT (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_SETFONT (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SETFONT (long wParam, long lParam) { if (lParam != 0) OS.InvalidateRect (handle, null, true); return super.WM_SETFONT (wParam, lParam); } @Override -LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SIZE (long wParam, long lParam) { LRESULT result = null; if ((state & RESIZE_DEFERRED) != 0) { result = super.WM_SIZE (wParam, lParam); @@ -1789,10 +1789,10 @@ LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_SYSCOLORCHANGE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SYSCOLORCHANGE (long wParam, long lParam) { LRESULT result = super.WM_SYSCOLORCHANGE (wParam, lParam); if (result != null) return result; - long /*int*/ hwndChild = OS.GetWindow (handle, OS.GW_CHILD); + long hwndChild = OS.GetWindow (handle, OS.GW_CHILD); while (hwndChild != 0) { OS.SendMessage (hwndChild, OS.WM_SYSCOLORCHANGE, 0, 0); hwndChild = OS.GetWindow (hwndChild, OS.GW_HWNDNEXT); @@ -1801,7 +1801,7 @@ LRESULT WM_SYSCOLORCHANGE (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_SYSCOMMAND (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SYSCOMMAND (long wParam, long lParam) { LRESULT result = super.WM_SYSCOMMAND (wParam, lParam); if (result != null) return result; @@ -1820,13 +1820,13 @@ LRESULT WM_SYSCOMMAND (long /*int*/ wParam, long /*int*/ lParam) { * does not redraw properly. The fix is to detect this case and * redraw the non-client area. */ - int cmd = (int)/*64*/wParam & 0xFFF0; + int cmd = (int)wParam & 0xFFF0; switch (cmd) { case OS.SC_HSCROLL: case OS.SC_VSCROLL: boolean showHBar = horizontalBar != null && horizontalBar.getVisible (); boolean showVBar = verticalBar != null && verticalBar.getVisible (); - long /*int*/ code = callWindowProc (handle, OS.WM_SYSCOMMAND, wParam, lParam); + long code = callWindowProc (handle, OS.WM_SYSCOMMAND, wParam, lParam); if ((showHBar != (horizontalBar != null && horizontalBar.getVisible ())) || (showVBar != (verticalBar != null && verticalBar.getVisible ()))) { int flags = OS.RDW_FRAME | OS.RDW_INVALIDATE | OS.RDW_UPDATENOW; @@ -1841,7 +1841,7 @@ LRESULT WM_SYSCOMMAND (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_UPDATEUISTATE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_UPDATEUISTATE (long wParam, long lParam) { LRESULT result = super.WM_UPDATEUISTATE (wParam, lParam); if (result != null) return result; if ((state & CANVAS) != 0 && hooks (SWT.Paint)) { @@ -1851,20 +1851,20 @@ LRESULT WM_UPDATEUISTATE (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT wmNCPaint (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmNCPaint (long hwnd, long wParam, long lParam) { LRESULT result = super.wmNCPaint (hwnd, wParam, lParam); if (result != null) return result; - long /*int*/ borderHandle = borderHandle (); + long borderHandle = borderHandle (); if ((state & CANVAS) != 0 || (hwnd == borderHandle && handle != borderHandle)) { if (OS.IsAppThemed ()) { int bits1 = OS.GetWindowLong (hwnd, OS.GWL_EXSTYLE); if ((bits1 & OS.WS_EX_CLIENTEDGE) != 0) { - long /*int*/ code = 0; + long code = 0; int bits2 = OS.GetWindowLong (hwnd, OS.GWL_STYLE); if ((bits2 & (OS.WS_HSCROLL | OS.WS_VSCROLL)) != 0) { code = callWindowProc (hwnd, OS.WM_NCPAINT, wParam, lParam); } - long /*int*/ hDC = OS.GetWindowDC (hwnd); + long hDC = OS.GetWindowDC (hwnd); RECT rect = new RECT (); OS.GetWindowRect (hwnd, rect); rect.right -= rect.left; @@ -1882,7 +1882,7 @@ LRESULT wmNCPaint (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) } @Override -LRESULT wmNotify (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmNotify (NMHDR hdr, long wParam, long lParam) { switch (hdr.code) { /* * Feature in Windows. When the tool tip control is @@ -1907,7 +1907,7 @@ LRESULT wmNotify (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { * check if the parent is already on top and neither set or clear * the topmost status of the tool tip. */ - long /*int*/ hwndParent = hdr.hwndFrom; + long hwndParent = hdr.hwndFrom; do { hwndParent = OS.GetParent (hwndParent); if (hwndParent == 0) break; @@ -1929,7 +1929,7 @@ LRESULT wmNotify (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { display.lockActiveWindow = true; int flags = OS.SWP_NOACTIVATE | OS.SWP_NOMOVE | OS.SWP_NOSIZE; - long /*int*/ hwndInsertAfter = hdr.code == OS.TTN_SHOW ? OS.HWND_TOPMOST : OS.HWND_NOTOPMOST; + long hwndInsertAfter = hdr.code == OS.TTN_SHOW ? OS.HWND_TOPMOST : OS.HWND_NOTOPMOST; OS.SetWindowPos (hdr.hwndFrom, hwndInsertAfter, 0, 0, 0, 0, flags); display.lockActiveWindow = false; break; @@ -1961,12 +1961,12 @@ LRESULT wmNotify (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { * the orientation of the control. */ Widget widget = null; - long /*int*/ hwnd = hdr.idFrom; + long hwnd = hdr.idFrom; if ((lpnmtdi.uFlags & OS.TTF_IDISHWND) != 0) { widget = display.getControl (hwnd); } else { if (hdr.hwndFrom == shell.toolTipHandle || hdr.hwndFrom == shell.balloonTipHandle) { - widget = shell.findToolTip ((int)/*64*/hdr.idFrom); + widget = shell.findToolTip ((int)hdr.idFrom); } } if (widget != null) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Control.java index 6f8f72bd84..f6aa00675d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Control.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Control.java @@ -60,7 +60,7 @@ public abstract class Control extends Widget implements Drawable { * * @noreference This field is not intended to be referenced by clients. */ - public long /*int*/ handle; + public long handle; Composite parent; Cursor cursor; Menu menu, activeMenu; @@ -541,7 +541,7 @@ int binarySearch (int [] indices, int start, int end, int index) { return -low - 1; } -long /*int*/ borderHandle () { +long borderHandle () { return handle; } @@ -582,7 +582,7 @@ void checkComposited () { /* Do nothing */ } -boolean checkHandle (long /*int*/ hwnd) { +boolean checkHandle (long hwnd) { return hwnd == handle; } @@ -706,7 +706,7 @@ Widget [] computeTabList () { } void createHandle () { - long /*int*/ hwndParent = widgetParent (); + long hwndParent = widgetParent (); handle = OS.CreateWindowEx ( widgetExtStyle (), windowClass (), @@ -723,7 +723,7 @@ void createHandle () { OS.SetWindowLongPtr (handle, OS.GWLP_ID, handle); } if (OS.IsDBLocale && hwndParent != 0) { - long /*int*/ hIMC = OS.ImmGetContext (hwndParent); + long hIMC = OS.ImmGetContext (hwndParent); OS.ImmAssociateContext (handle, hIMC); OS.ImmReleaseContext (hwndParent, hIMC); } @@ -738,8 +738,8 @@ void checkGesture () { * Feature in Windows 7: All gestures are enabled by default except GID_ROTATE. * Enable it explicitly by calling SetGestureConfig. */ - long /*int*/ hHeap = OS.GetProcessHeap (); - long /*int*/ pConfigs = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, GESTURECONFIG.sizeof); + long hHeap = OS.GetProcessHeap (); + long pConfigs = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, GESTURECONFIG.sizeof); if (pConfigs != 0) { GESTURECONFIG config = new GESTURECONFIG(); config.dwID = OS.GID_ROTATE; @@ -776,7 +776,7 @@ int defaultBackground () { return OS.GetSysColor (OS.COLOR_BTNFACE); } -long /*int*/ defaultFont () { +long defaultFont () { return display.getSystemFont ().handle; } @@ -790,7 +790,7 @@ void deregister () { @Override void destroyWidget () { - long /*int*/ hwnd = topHandle (); + long hwnd = topHandle (); releaseHandle (); if (hwnd != 0) { OS.DestroyWindow (hwnd); @@ -919,7 +919,7 @@ boolean dragDetect (int button, int count, int stateMask, int x, int y) { if ((stateMask & SWT.BUTTON3) != 0) wParam |= OS.MK_RBUTTON; if ((stateMask & SWT.BUTTON4) != 0) wParam |= OS.MK_XBUTTON1; if ((stateMask & SWT.BUTTON5) != 0) wParam |= OS.MK_XBUTTON2; - long /*int*/ lParam = OS.MAKELPARAM (x, y); + long lParam = OS.MAKELPARAM (x, y); OS.SendMessage (handle, OS.WM_LBUTTONUP, wParam, lParam); } return false; @@ -927,17 +927,17 @@ boolean dragDetect (int button, int count, int stateMask, int x, int y) { return sendDragEvent (button, stateMask, x, y); } -void drawBackground (long /*int*/ hDC) { +void drawBackground (long hDC) { RECT rect = new RECT (); OS.GetClientRect (handle, rect); drawBackground (hDC, rect); } -void drawBackground (long /*int*/ hDC, RECT rect) { +void drawBackground (long hDC, RECT rect) { drawBackground (hDC, rect, -1, 0, 0); } -void drawBackground (long /*int*/ hDC, RECT rect, int pixel, int tx, int ty) { +void drawBackground (long hDC, RECT rect, int pixel, int tx, int ty) { Control control = findBackgroundControl (); if (control != null) { if (control.backgroundImage != null) { @@ -961,21 +961,21 @@ void drawBackground (long /*int*/ hDC, RECT rect, int pixel, int tx, int ty) { fillBackground (hDC, pixel, rect); } -void drawImageBackground (long /*int*/ hDC, long /*int*/ hwnd, long /*int*/ hBitmap, RECT rect, int tx, int ty) { +void drawImageBackground (long hDC, long hwnd, long hBitmap, RECT rect, int tx, int ty) { RECT rect2 = new RECT (); OS.GetClientRect (hwnd, rect2); OS.MapWindowPoints (hwnd, handle, rect2, 2); - long /*int*/ hBrush = findBrush (hBitmap, OS.BS_PATTERN); + long hBrush = findBrush (hBitmap, OS.BS_PATTERN); POINT lpPoint = new POINT (); OS.GetWindowOrgEx (hDC, lpPoint); OS.SetBrushOrgEx (hDC, -rect2.left - lpPoint.x - tx, -rect2.top - lpPoint.y - ty, lpPoint); - long /*int*/ hOldBrush = OS.SelectObject (hDC, hBrush); + long hOldBrush = OS.SelectObject (hDC, hBrush); OS.PatBlt (hDC, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, OS.PATCOPY); OS.SetBrushOrgEx (hDC, lpPoint.x, lpPoint.y, null); OS.SelectObject (hDC, hOldBrush); } -void drawThemeBackground (long /*int*/ hDC, long /*int*/ hwnd, RECT rect) { +void drawThemeBackground (long hDC, long hwnd, RECT rect) { /* Do nothing */ } @@ -987,12 +987,12 @@ void enableWidget (boolean enabled) { OS.EnableWindow (handle, enabled); } -void fillBackground (long /*int*/ hDC, int pixel, RECT rect) { +void fillBackground (long hDC, int pixel, RECT rect) { if (rect.left > rect.right || rect.top > rect.bottom) return; OS.FillRect (hDC, rect, findBrush (pixel, OS.BS_SOLID)); } -void fillImageBackground (long /*int*/ hDC, Control control, RECT rect, int tx, int ty) { +void fillImageBackground (long hDC, Control control, RECT rect, int tx, int ty) { if (rect.left > rect.right || rect.top > rect.bottom) return; if (control != null) { Image image = control.backgroundImage; @@ -1002,7 +1002,7 @@ void fillImageBackground (long /*int*/ hDC, Control control, RECT rect, int tx, } } -void fillThemeBackground (long /*int*/ hDC, Control control, RECT rect) { +void fillThemeBackground (long hDC, Control control, RECT rect) { if (rect.left > rect.right || rect.top > rect.bottom) return; if (control != null) { control.drawThemeBackground (hDC, handle, rect); @@ -1014,7 +1014,7 @@ Control findBackgroundControl () { return (parent != null && (state & PARENT_BACKGROUND) != 0) ? parent.findBackgroundControl () : null; } -long /*int*/ findBrush (long /*int*/ value, int lbStyle) { +long findBrush (long value, int lbStyle) { return parent.findBrush (value, lbStyle); } @@ -1229,7 +1229,7 @@ public int getBorderWidth () { } int getBorderWidthInPixels () { - long /*int*/ borderHandle = borderHandle (); + long borderHandle = borderHandle (); int bits1 = OS.GetWindowLong (borderHandle, OS.GWL_EXSTYLE); if ((bits1 & OS.WS_EX_CLIENTEDGE) != 0) return OS.GetSystemMetrics (OS.SM_CXEDGE); if ((bits1 & OS.WS_EX_STATICEDGE) != 0) return OS.GetSystemMetrics (OS.SM_CXBORDER); @@ -1260,7 +1260,7 @@ Rectangle getBoundsInPixels () { forceResize (); RECT rect = new RECT (); OS.GetWindowRect (topHandle (), rect); - long /*int*/ hwndParent = parent == null ? 0 : parent.handle; + long hwndParent = parent == null ? 0 : parent.handle; OS.MapWindowPoints (0, hwndParent, rect, 2); int width = rect.right - rect.left; int height = rect.bottom - rect.top; @@ -1274,11 +1274,11 @@ int getCodePage () { String getClipboardText () { String string = ""; if (OS.OpenClipboard (0)) { - long /*int*/ hMem = OS.GetClipboardData (OS.CF_UNICODETEXT); + long hMem = OS.GetClipboardData (OS.CF_UNICODETEXT); if (hMem != 0) { /* Ensure byteCount is a multiple of 2 bytes on UNICODE platforms */ int byteCount = OS.GlobalSize (hMem) / TCHAR.sizeof * TCHAR.sizeof; - long /*int*/ ptr = OS.GlobalLock (hMem); + long ptr = OS.GlobalLock (hMem); if (ptr != 0) { /* Use the character encoding for the default locale */ TCHAR buffer = new TCHAR (0, byteCount / TCHAR.sizeof); @@ -1368,7 +1368,7 @@ public boolean getEnabled () { public Font getFont () { checkWidget (); if (font != null) return font; - long /*int*/ hFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); + long hFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); if (hFont == 0) hFont = defaultFont (); return Font.win32_new (display, hFont); } @@ -1429,7 +1429,7 @@ Point getLocationInPixels () { forceResize (); RECT rect = new RECT (); OS.GetWindowRect (topHandle (), rect); - long /*int*/ hwndParent = parent == null ? 0 : parent.handle; + long hwndParent = parent == null ? 0 : parent.handle; OS.MapWindowPoints (0, hwndParent, rect, 2); return new Point (rect.left, rect.top); } @@ -1469,7 +1469,7 @@ public Menu getMenu () { */ public Monitor getMonitor () { checkWidget (); - long /*int*/ hmonitor = OS.MonitorFromWindow (handle, OS.MONITOR_DEFAULTTONEAREST); + long hmonitor = OS.MonitorFromWindow (handle, OS.MONITOR_DEFAULTTONEAREST); return display.getMonitor (hmonitor); } @@ -1751,7 +1751,7 @@ boolean hasFocus () { * then this control is considered to have focus * even though it does not have focus in Windows. */ - long /*int*/ hwndFocus = OS.GetFocus (); + long hwndFocus = OS.GetFocus (); while (hwndFocus != 0) { if (hwndFocus == handle) return true; if (display.getControl (hwndFocus) != null) { @@ -1778,12 +1778,12 @@ boolean hasFocus () { * @noreference This method is not intended to be referenced by clients. */ @Override -public long /*int*/ internal_new_GC (GCData data) { +public long internal_new_GC (GCData data) { checkWidget(); - long /*int*/ hwnd = handle; + long hwnd = handle; if (data != null && data.hwnd != 0) hwnd = data.hwnd; if (data != null) data.hwnd = hwnd; - long /*int*/ hDC = 0; + long hDC = 0; if (data == null || data.ps == null) { hDC = OS.GetDC (hwnd); } else { @@ -1810,7 +1810,7 @@ public long /*int*/ internal_new_GC (GCData data) { int background = control.getBackgroundPixel (); if (background != OS.GetBkColor (hDC)) data.background = background; data.font = font != null ? font : Font.win32_new (display, OS.SendMessage (hwnd, OS.WM_GETFONT, 0, 0)); - data.uiState = (int)/*64*/OS.SendMessage (hwnd, OS.WM_QUERYUISTATE, 0, 0); + data.uiState = (int)OS.SendMessage (hwnd, OS.WM_QUERYUISTATE, 0, 0); } return hDC; } @@ -1831,9 +1831,9 @@ public long /*int*/ internal_new_GC (GCData data) { * @noreference This method is not intended to be referenced by clients. */ @Override -public void internal_dispose_GC (long /*int*/ hDC, GCData data) { +public void internal_dispose_GC (long hDC, GCData data) { checkWidget (); - long /*int*/ hwnd = handle; + long hwnd = handle; if (data != null && data.hwnd != 0) { hwnd = data.hwnd; } @@ -1964,7 +1964,7 @@ boolean isShowing () { */ // if (!OS.IsWindowVisible (handle)) return false; // int flags = OS.DCX_CACHE | OS.DCX_CLIPCHILDREN | OS.DCX_CLIPSIBLINGS; -// long /*int*/ hDC = OS.GetDCEx (handle, 0, flags); +// long hDC = OS.GetDCEx (handle, 0, flags); // int result = OS.GetClipBox (hDC, new RECT ()); // OS.ReleaseDC (handle, hDC); // return result != OS.NULLREGION; @@ -1990,7 +1990,7 @@ boolean isTabItem () { } int bits = OS.GetWindowLong (handle, OS.GWL_STYLE); if ((bits & OS.WS_TABSTOP) != 0) return false; - long /*int*/ code = OS.SendMessage (handle, OS.WM_GETDLGCODE, 0, 0); + long code = OS.SendMessage (handle, OS.WM_GETDLGCODE, 0, 0); if ((code & OS.DLGC_STATIC) != 0) return false; if ((code & OS.DLGC_WANTALLKEYS) != 0) return false; if ((code & OS.DLGC_WANTARROWS) != 0) return false; @@ -2019,7 +2019,7 @@ public boolean isVisible () { } @Override -void mapEvent (long /*int*/ hwnd, Event event) { +void mapEvent (long hwnd, Event event) { if (hwnd != handle) { POINT point = new POINT (); Point loc = event.getLocationInPixels(); @@ -2068,11 +2068,11 @@ boolean mnemonicMatch (char key) { */ public void moveAbove (Control control) { checkWidget (); - long /*int*/ topHandle = topHandle (), hwndAbove = OS.HWND_TOP; + long topHandle = topHandle (), hwndAbove = OS.HWND_TOP; if (control != null) { if (control.isDisposed ()) error(SWT.ERROR_INVALID_ARGUMENT); if (parent != control.parent) return; - long /*int*/ hwnd = control.topHandle (); + long hwnd = control.topHandle (); if (hwnd == 0 || hwnd == topHandle) return; hwndAbove = OS.GetWindow (hwnd, OS.GW_HWNDPREV); /* @@ -2112,7 +2112,7 @@ public void moveAbove (Control control) { */ public void moveBelow (Control control) { checkWidget (); - long /*int*/ topHandle = topHandle (), hwndAbove = OS.HWND_BOTTOM; + long topHandle = topHandle (), hwndAbove = OS.HWND_BOTTOM; if (control != null) { if (control.isDisposed ()) error(SWT.ERROR_INVALID_ARGUMENT); if (parent != control.parent) return; @@ -2136,7 +2136,7 @@ public void moveBelow (Control control) { * this case and do nothing because the control is already * at the bottom. */ - long /*int*/ hwndParent = parent.handle, hwnd = hwndParent; + long hwndParent = parent.handle, hwnd = hwndParent; hwndAbove = OS.GetWindow (hwnd, OS.GW_HWNDPREV); while (hwndAbove != 0 && hwndAbove != hwnd) { if (OS.GetWindow (hwndAbove, OS.GW_OWNER) == hwndParent) break; @@ -2227,14 +2227,14 @@ public boolean print (GC gc) { checkWidget (); if (gc == null) error (SWT.ERROR_NULL_ARGUMENT); if (gc.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT); - long /*int*/ topHandle = topHandle (); - long /*int*/ hdc = gc.handle; + long topHandle = topHandle (); + long hdc = gc.handle; int state = 0; - long /*int*/ gdipGraphics = gc.getGCData().gdipGraphics; + long gdipGraphics = gc.getGCData().gdipGraphics; if (gdipGraphics != 0) { - long /*int*/ clipRgn = 0; + long clipRgn = 0; Gdip.Graphics_SetPixelOffsetMode(gdipGraphics, Gdip.PixelOffsetModeNone); - long /*int*/ rgn = Gdip.Region_new(); + long rgn = Gdip.Region_new(); if (rgn == 0) error(SWT.ERROR_NO_HANDLES); Gdip.Graphics_GetClip(gdipGraphics, rgn); if (!Gdip.Region_IsInfinite(rgn, gdipGraphics)) { @@ -2243,7 +2243,7 @@ public boolean print (GC gc) { Gdip.Region_delete(rgn); Gdip.Graphics_SetPixelOffsetMode(gdipGraphics, Gdip.PixelOffsetModeHalf); float[] lpXform = null; - long /*int*/ matrix = Gdip.Matrix_new(1, 0, 0, 1, 0, 0); + long matrix = Gdip.Matrix_new(1, 0, 0, 1, 0, 0); if (matrix == 0) error(SWT.ERROR_NO_HANDLES); Gdip.Graphics_GetTransform(gdipGraphics, matrix); if (!Gdip.Matrix_IsIdentity(matrix)) { @@ -2272,7 +2272,7 @@ public boolean print (GC gc) { return true; } -void printWidget (long /*int*/ hwnd, long /*int*/ hdc, GC gc) { +void printWidget (long hwnd, long hdc, GC gc) { /* * Bug in Windows. For some reason, PrintWindow() * returns success but does nothing when it is called @@ -2287,8 +2287,8 @@ void printWidget (long /*int*/ hwnd, long /*int*/ hdc, GC gc) { * The fix is temporarily reparent the window to the desktop, * call PrintWindow() then reparent the window back. */ - long /*int*/ hwndParent = OS.GetParent (hwnd); - long /*int*/ hwndShell = hwndParent; + long hwndParent = OS.GetParent (hwnd); + long hwndShell = hwndParent; while (OS.GetParent (hwndShell) != 0) { if (OS.GetWindow (hwndShell, OS.GW_OWNER) != 0) break; hwndShell = OS.GetParent (hwndShell); @@ -2310,8 +2310,8 @@ void printWidget (long /*int*/ hwnd, long /*int*/ hdc, GC gc) { * back. */ if (!fixPrintWindow) { - long /*int*/ rgn = OS.CreateRectRgn(0, 0, 0, 0); - long /*int*/ parent = OS.GetParent(hwnd); + long rgn = OS.CreateRectRgn(0, 0, 0, 0); + long parent = OS.GetParent(hwnd); while (parent != hwndShell && !fixPrintWindow) { if (OS.GetWindowRgn(parent, rgn) != 0) { fixPrintWindow = true; @@ -2322,7 +2322,7 @@ void printWidget (long /*int*/ hwnd, long /*int*/ hdc, GC gc) { } int bits1 = OS.GetWindowLong (hwnd, OS.GWL_STYLE); int bits2 = OS.GetWindowLong (hwnd, OS.GWL_EXSTYLE); - long /*int*/ hwndInsertAfter = OS.GetWindow (hwnd, OS.GW_HWNDPREV); + long hwndInsertAfter = OS.GetWindow (hwnd, OS.GW_HWNDPREV); /* * Bug in Windows. For some reason, when GetWindow () * with GW_HWNDPREV is used to query the previous window @@ -2927,7 +2927,7 @@ int resolveTextDirection() { } void showWidget (boolean visible) { - long /*int*/ topHandle = topHandle (); + long topHandle = topHandle (); OS.ShowWindow (topHandle, visible ? OS.SW_SHOW : OS.SW_HIDE); if (handle != topHandle) OS.ShowWindow (handle, visible ? OS.SW_SHOW : OS.SW_HIDE); } @@ -3173,7 +3173,7 @@ public void setBackgroundImage (Image image) { updateBackgroundImage (); } -void setBackgroundImage (long /*int*/ hBitmap) { +void setBackgroundImage (long hBitmap) { int flags = OS.RDW_ERASE | OS.RDW_FRAME | OS.RDW_INVALIDATE; OS.RedrawWindow (handle, null, 0, flags); } @@ -3239,7 +3239,7 @@ void setBoundsInPixels (int x, int y, int width, int height, int flags, boolean } } } - long /*int*/ topHandle = topHandle (); + long topHandle = topHandle (); if (defer && parent != null) { forceResize (); if (parent.lpwp != null) { @@ -3326,7 +3326,7 @@ public void setCapture (boolean capture) { } void setCursor () { - long /*int*/ lParam = OS.MAKELPARAM (OS.HTCLIENT, OS.WM_MOUSEMOVE); + long lParam = OS.MAKELPARAM (OS.HTCLIENT, OS.WM_MOUSEMOVE); OS.SendMessage (handle, OS.WM_SETCURSOR, handle, lParam); } @@ -3353,11 +3353,11 @@ public void setCursor (Cursor cursor) { checkWidget (); if (cursor != null && cursor.isDisposed()) error(SWT.ERROR_INVALID_ARGUMENT); this.cursor = cursor; - long /*int*/ hwndCursor = OS.GetCapture (); + long hwndCursor = OS.GetCapture (); if (hwndCursor == 0) { POINT pt = new POINT (); if (!OS.GetCursorPos (pt)) return; - long /*int*/ hwnd = hwndCursor = OS.WindowFromPoint (pt); + long hwnd = hwndCursor = OS.WindowFromPoint (pt); while (hwnd != 0 && hwnd != handle) { hwnd = OS.GetParent (hwnd); } @@ -3369,7 +3369,7 @@ public void setCursor (Cursor cursor) { } void setDefaultFont () { - long /*int*/ hFont = display.getSystemFont ().handle; + long hFont = display.getSystemFont ().handle; OS.SendMessage (handle, OS.WM_SETFONT, hFont, 0); } @@ -3468,7 +3468,7 @@ public boolean setFocus () { */ public void setFont (Font font) { checkWidget (); - long /*int*/ hFont = 0; + long hFont = 0; if (font != null) { if (font.isDisposed()) error(SWT.ERROR_INVALID_ARGUMENT); hFont = font.handle; @@ -3687,7 +3687,7 @@ public void setRedraw (boolean redraw) { } if (redraw) { if (--drawCount == 0) { - long /*int*/ topHandle = topHandle (); + long topHandle = topHandle (); OS.SendMessage (topHandle, OS.WM_SETREDRAW, 1, 0); if (handle != topHandle) OS.SendMessage (handle, OS.WM_SETREDRAW, 1, 0); if ((state & HIDDEN) != 0) { @@ -3701,7 +3701,7 @@ public void setRedraw (boolean redraw) { } } else { if (drawCount++ == 0) { - long /*int*/ topHandle = topHandle (); + long topHandle = topHandle (); OS.SendMessage (topHandle, OS.WM_SETREDRAW, 0, 0); if (handle != topHandle) OS.SendMessage (handle, OS.WM_SETREDRAW, 0, 0); } @@ -3728,7 +3728,7 @@ public void setRedraw (boolean redraw) { public void setRegion (Region region) { checkWidget (); if (region != null && region.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT); - long /*int*/ hRegion = 0; + long hRegion = 0; if (region != null) { hRegion = OS.CreateRectRgn (0, 0, 0, 0); OS.CombineRgn (hRegion, region.handle, hRegion, OS.RGN_OR); @@ -3979,8 +3979,8 @@ void sort (int [] items) { } void subclass () { - long /*int*/ oldProc = windowProc (); - long /*int*/ newProc = display.windowProc; + long oldProc = windowProc (); + long newProc = display.windowProc; if (oldProc == newProc) return; OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, newProc); } @@ -4103,7 +4103,7 @@ public Point toDisplay (Point point) { return DPIUtil.autoScaleDown(toDisplayInPixels(point.x, point.y)); } -long /*int*/ topHandle () { +long topHandle () { return handle; } @@ -4120,15 +4120,15 @@ boolean translateMnemonic (Event event, Control control) { boolean translateMnemonic (MSG msg) { if (msg.wParam < 0x20) return false; - long /*int*/ hwnd = msg.hwnd; + long hwnd = msg.hwnd; if (OS.GetKeyState (OS.VK_MENU) >= 0) { - long /*int*/ code = OS.SendMessage (hwnd, OS.WM_GETDLGCODE, 0, 0); + long code = OS.SendMessage (hwnd, OS.WM_GETDLGCODE, 0, 0); if ((code & OS.DLGC_WANTALLKEYS) != 0) return false; if ((code & OS.DLGC_BUTTON) == 0) return false; } Decorations shell = menuShell (); if (shell.isVisible () && shell.isEnabled ()) { - display.lastAscii = (int)/*64*/msg.wParam; + display.lastAscii = (int)msg.wParam; display.lastNull = display.lastDead = false; Event event = new Event (); event.detail = SWT.TRAVERSE_MNEMONIC; @@ -4140,8 +4140,8 @@ boolean translateMnemonic (MSG msg) { } boolean translateTraversal (MSG msg) { - long /*int*/ hwnd = msg.hwnd; - int key = (int)/*64*/msg.wParam; + long hwnd = msg.hwnd; + int key = (int)msg.wParam; if (key == OS.VK_MENU) { if ((msg.lParam & 0x40000000) == 0) { OS.SendMessage (hwnd, OS.WM_CHANGEUISTATE, OS.UIS_INITIALIZE, 0); @@ -4156,7 +4156,7 @@ boolean translateTraversal (MSG msg) { case OS.VK_ESCAPE: { all = true; lastAscii = 27; - long /*int*/ code = OS.SendMessage (hwnd, OS.WM_GETDLGCODE, 0, 0); + long code = OS.SendMessage (hwnd, OS.WM_GETDLGCODE, 0, 0); if ((code & OS.DLGC_WANTALLKEYS) != 0) { /* * Use DLGC_HASSETSEL to determine that the control @@ -4173,7 +4173,7 @@ boolean translateTraversal (MSG msg) { case OS.VK_RETURN: { all = true; lastAscii = '\r'; - long /*int*/ code = OS.SendMessage (hwnd, OS.WM_GETDLGCODE, 0, 0); + long code = OS.SendMessage (hwnd, OS.WM_GETDLGCODE, 0, 0); if ((code & OS.DLGC_WANTALLKEYS) != 0) doit = false; detail = SWT.TRAVERSE_RETURN; break; @@ -4181,7 +4181,7 @@ boolean translateTraversal (MSG msg) { case OS.VK_TAB: { lastAscii = '\t'; boolean next = OS.GetKeyState (OS.VK_SHIFT) >= 0; - long /*int*/ code = OS.SendMessage (hwnd, OS.WM_GETDLGCODE, 0, 0); + long code = OS.SendMessage (hwnd, OS.WM_GETDLGCODE, 0, 0); if ((code & (OS.DLGC_WANTTAB | OS.DLGC_WANTALLKEYS)) != 0) { /* * Use DLGC_HASSETSEL to determine that the control is a @@ -4207,7 +4207,7 @@ boolean translateTraversal (MSG msg) { case OS.VK_DOWN: case OS.VK_RIGHT: { lastVirtual = true; - long /*int*/ code = OS.SendMessage (hwnd, OS.WM_GETDLGCODE, 0, 0); + long code = OS.SendMessage (hwnd, OS.WM_GETDLGCODE, 0, 0); if ((code & (OS.DLGC_WANTARROWS /*| OS.DLGC_WANTALLKEYS*/)) != 0) doit = false; boolean next = key == OS.VK_DOWN || key == OS.VK_RIGHT; if (parent != null && (parent.style & SWT.MIRRORED) != 0) { @@ -4221,7 +4221,7 @@ boolean translateTraversal (MSG msg) { all = true; lastVirtual = true; if (OS.GetKeyState (OS.VK_CONTROL) >= 0) return false; - long /*int*/ code = OS.SendMessage (hwnd, OS.WM_GETDLGCODE, 0, 0); + long code = OS.SendMessage (hwnd, OS.WM_GETDLGCODE, 0, 0); if ((code & OS.DLGC_WANTALLKEYS) != 0) { /* * Use DLGC_HASSETSEL to determine that the control is a @@ -4558,8 +4558,8 @@ boolean traverseReturn () { } void unsubclass () { - long /*int*/ newProc = windowProc (); - long /*int*/ oldProc = display.windowProc; + long newProc = windowProc (); + long oldProc = display.windowProc; if (oldProc == newProc) return; OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, newProc); } @@ -4683,7 +4683,7 @@ int widgetExtStyle () { return bits; } -long /*int*/ widgetParent () { +long widgetParent () { return parent.handle; } @@ -4736,7 +4736,7 @@ public boolean setParent (Composite parent) { Menu [] menus = oldShell.findMenus (this); fixChildren (newShell, oldShell, newDecorations, oldDecorations, menus); } - long /*int*/ topHandle = topHandle (); + long topHandle = topHandle (); if (OS.SetParent (topHandle, parent.handle) == 0) return false; this.parent = parent; int flags = OS.SWP_NOSIZE | OS.SWP_NOMOVE | OS.SWP_NOACTIVATE; @@ -4747,9 +4747,9 @@ public boolean setParent (Composite parent) { abstract TCHAR windowClass (); -abstract long /*int*/ windowProc (); +abstract long windowProc (); -long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) { +long windowProc (long hwnd, int msg, long wParam, long lParam) { Display display = this.display; LRESULT result = null; switch (msg) { @@ -4860,32 +4860,32 @@ long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long / } } -LRESULT WM_ACTIVATE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_ACTIVATE (long wParam, long lParam) { return null; } -LRESULT WM_CAPTURECHANGED (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_CAPTURECHANGED (long wParam, long lParam) { return wmCaptureChanged (handle, wParam, lParam); } -LRESULT WM_CHANGEUISTATE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_CHANGEUISTATE (long wParam, long lParam) { if ((state & IGNORE_WM_CHANGEUISTATE) != 0) return LRESULT.ZERO; return null; } -LRESULT WM_CHAR (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_CHAR (long wParam, long lParam) { return wmChar (handle, wParam, lParam); } -LRESULT WM_CLEAR (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_CLEAR (long wParam, long lParam) { return null; } -LRESULT WM_CLOSE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_CLOSE (long wParam, long lParam) { return null; } -LRESULT WM_COMMAND (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_COMMAND (long wParam, long lParam) { /* * When the WM_COMMAND message is sent from a * menu, the HWND parameter in LPARAM is zero. @@ -4906,26 +4906,26 @@ LRESULT WM_COMMAND (long /*int*/ wParam, long /*int*/ lParam) { return control.wmCommandChild (wParam, lParam); } -LRESULT WM_CONTEXTMENU (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_CONTEXTMENU (long wParam, long lParam) { return wmContextMenu (handle, wParam, lParam); } -LRESULT WM_CTLCOLOR (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_CTLCOLOR (long wParam, long lParam) { Control control = display.getControl (lParam); if (control == null) return null; return control.wmColorChild (wParam, lParam); } -LRESULT WM_CUT (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_CUT (long wParam, long lParam) { return null; } -LRESULT WM_DESTROY (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_DESTROY (long wParam, long lParam) { OS.KillTimer (this.handle, Menu.ID_TOOLTIP_TIMER); return null; } -LRESULT WM_DPICHANGED (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_DPICHANGED (long wParam, long lParam) { // Map DPI to Zoom and compare int nativeZoom = DPIUtil.mapDPIToZoom (OS.HIWORD (wParam)); int newSWTZoom = DPIUtil.getZoomForAutoscaleProperty (nativeZoom); @@ -4944,7 +4944,7 @@ LRESULT WM_DPICHANGED (long /*int*/ wParam, long /*int*/ lParam) { return LRESULT.ONE; } -LRESULT WM_DRAWITEM (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_DRAWITEM (long wParam, long lParam) { DRAWITEMSTRUCT struct = new DRAWITEMSTRUCT (); OS.MoveMemory (struct, lParam, DRAWITEMSTRUCT.sizeof); if (struct.CtlType == OS.ODT_MENU) { @@ -4957,15 +4957,15 @@ LRESULT WM_DRAWITEM (long /*int*/ wParam, long /*int*/ lParam) { return control.wmDrawChild (wParam, lParam); } -LRESULT WM_ENDSESSION (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_ENDSESSION (long wParam, long lParam) { return null; } -LRESULT WM_ENTERIDLE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_ENTERIDLE (long wParam, long lParam) { return null; } -LRESULT WM_ERASEBKGND (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_ERASEBKGND (long wParam, long lParam) { if ((state & DRAW_BACKGROUND) != 0) { if (findImageControl () != null) return LRESULT.ONE; } @@ -4977,7 +4977,7 @@ LRESULT WM_ERASEBKGND (long /*int*/ wParam, long /*int*/ lParam) { return null; } -LRESULT WM_GESTURE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_GESTURE (long wParam, long lParam) { if (hooks (SWT.Gesture) || filters (SWT.Gesture)) { GESTUREINFO gi = new GESTUREINFO (); gi.cbSize = GESTUREINFO.sizeof; @@ -4991,31 +4991,31 @@ LRESULT WM_GESTURE (long /*int*/ wParam, long /*int*/ lParam) { return null; } -LRESULT WM_GETDLGCODE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_GETDLGCODE (long wParam, long lParam) { return null; } -LRESULT WM_GETFONT (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_GETFONT (long wParam, long lParam) { return null; } -LRESULT WM_GETOBJECT (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_GETOBJECT (long wParam, long lParam) { if (accessible != null) { - long /*int*/ result = accessible.internal_WM_GETOBJECT (wParam, lParam); + long result = accessible.internal_WM_GETOBJECT (wParam, lParam); if (result != 0) return new LRESULT (result); } return null; } -LRESULT WM_GETMINMAXINFO (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_GETMINMAXINFO (long wParam, long lParam) { return null; } -LRESULT WM_HOTKEY (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_HOTKEY (long wParam, long lParam) { return null; } -LRESULT WM_HELP (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_HELP (long wParam, long lParam) { HELPINFO lphi = new HELPINFO (); OS.MoveMemory (lphi, lParam, HELPINFO.sizeof); Decorations shell = menuShell (); @@ -5031,7 +5031,7 @@ LRESULT WM_HELP (long /*int*/ wParam, long /*int*/ lParam) { if (menu.hooks (SWT.Help)) widget = menu; } if (widget != null) { - long /*int*/ hwndShell = shell.handle; + long hwndShell = shell.handle; OS.SendMessage (hwndShell, OS.WM_CANCELMODE, 0, 0); widget.postEvent (SWT.Help); return LRESULT.ONE; @@ -5046,29 +5046,29 @@ LRESULT WM_HELP (long /*int*/ wParam, long /*int*/ lParam) { return null; } -LRESULT WM_HSCROLL (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_HSCROLL (long wParam, long lParam) { Control control = display.getControl (lParam); if (control == null) return null; return control.wmScrollChild (wParam, lParam); } -LRESULT WM_IME_CHAR (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_IME_CHAR (long wParam, long lParam) { return wmIMEChar (handle, wParam, lParam); } -LRESULT WM_IME_COMPOSITION (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_IME_COMPOSITION (long wParam, long lParam) { return null; } -LRESULT WM_IME_COMPOSITION_START (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_IME_COMPOSITION_START (long wParam, long lParam) { return null; } -LRESULT WM_IME_ENDCOMPOSITION (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_IME_ENDCOMPOSITION (long wParam, long lParam) { return null; } -LRESULT WM_UNINITMENUPOPUP (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_UNINITMENUPOPUP (long wParam, long lParam) { Menu hiddenMenu = menuShell ().findMenu (wParam); if (hiddenMenu != null) { Shell shell = getShell (); @@ -5078,7 +5078,7 @@ LRESULT WM_UNINITMENUPOPUP (long /*int*/ wParam, long /*int*/ lParam) { return null; } -LRESULT WM_INITMENUPOPUP (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_INITMENUPOPUP (long wParam, long lParam) { /* Ignore WM_INITMENUPOPUP for an accelerator */ if (display.accelKeyHit) return null; @@ -5135,48 +5135,48 @@ LRESULT WM_INITMENUPOPUP (long /*int*/ wParam, long /*int*/ lParam) { return null; } -LRESULT WM_INPUTLANGCHANGE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_INPUTLANGCHANGE (long wParam, long lParam) { menuShell().destroyAccelerators(); return null; } -LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_KEYDOWN (long wParam, long lParam) { return wmKeyDown (handle, wParam, lParam); } -LRESULT WM_KEYUP (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_KEYUP (long wParam, long lParam) { return wmKeyUp (handle, wParam, lParam); } -LRESULT WM_KILLFOCUS (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_KILLFOCUS (long wParam, long lParam) { return wmKillFocus (handle, wParam, lParam); } -LRESULT WM_LBUTTONDBLCLK (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_LBUTTONDBLCLK (long wParam, long lParam) { return wmLButtonDblClk (handle, wParam, lParam); } -LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_LBUTTONDOWN (long wParam, long lParam) { return wmLButtonDown (handle, wParam, lParam); } -LRESULT WM_LBUTTONUP (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_LBUTTONUP (long wParam, long lParam) { return wmLButtonUp (handle, wParam, lParam); } -LRESULT WM_MBUTTONDBLCLK (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_MBUTTONDBLCLK (long wParam, long lParam) { return wmMButtonDblClk (handle, wParam, lParam); } -LRESULT WM_MBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_MBUTTONDOWN (long wParam, long lParam) { return wmMButtonDown (handle, wParam, lParam); } -LRESULT WM_MBUTTONUP (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_MBUTTONUP (long wParam, long lParam) { return wmMButtonUp (handle, wParam, lParam); } -LRESULT WM_MEASUREITEM (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_MEASUREITEM (long wParam, long lParam) { MEASUREITEMSTRUCT struct = new MEASUREITEMSTRUCT (); OS.MoveMemory (struct, lParam, MEASUREITEMSTRUCT.sizeof); if (struct.CtlType == OS.ODT_MENU) { @@ -5184,13 +5184,13 @@ LRESULT WM_MEASUREITEM (long /*int*/ wParam, long /*int*/ lParam) { if (item == null) return null; return item.wmMeasureChild (wParam, lParam); } - long /*int*/ hwnd = OS.GetDlgItem (handle, struct.CtlID); + long hwnd = OS.GetDlgItem (handle, struct.CtlID); Control control = display.getControl (hwnd); if (control == null) return null; return control.wmMeasureChild (wParam, lParam); } -LRESULT WM_MENUCHAR (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_MENUCHAR (long wParam, long lParam) { /* * Feature in Windows. When the user types Alt+<key> * and <key> does not match a mnemonic in the System @@ -5207,7 +5207,7 @@ LRESULT WM_MENUCHAR (long /*int*/ wParam, long /*int*/ lParam) { return null; } -LRESULT WM_MENUSELECT (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_MENUSELECT (long wParam, long lParam) { int code = OS.HIWORD (wParam); Shell shell = getShell (); OS.KillTimer (this.handle, Menu.ID_TOOLTIP_TIMER); @@ -5280,32 +5280,32 @@ LRESULT WM_MENUSELECT (long /*int*/ wParam, long /*int*/ lParam) { return null; } -LRESULT WM_MOUSEACTIVATE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_MOUSEACTIVATE (long wParam, long lParam) { return null; } -LRESULT WM_MOUSEHOVER (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_MOUSEHOVER (long wParam, long lParam) { return wmMouseHover (handle, wParam, lParam); } -LRESULT WM_MOUSELEAVE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_MOUSELEAVE (long wParam, long lParam) { getShell ().fixToolTip (); return wmMouseLeave (handle, wParam, lParam); } -LRESULT WM_MOUSEMOVE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_MOUSEMOVE (long wParam, long lParam) { return wmMouseMove (handle, wParam, lParam); } -LRESULT WM_MOUSEWHEEL (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_MOUSEWHEEL (long wParam, long lParam) { return wmMouseWheel (handle, wParam, lParam); } -LRESULT WM_MOUSEHWHEEL (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_MOUSEHWHEEL (long wParam, long lParam) { return wmMouseHWheel (handle, wParam, lParam); } -LRESULT WM_MOVE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_MOVE (long wParam, long lParam) { state |= MOVE_OCCURRED; if (findImageControl () != null) { if (this != getShell ()) redrawChildren (); @@ -5323,76 +5323,76 @@ LRESULT WM_MOVE (long /*int*/ wParam, long /*int*/ lParam) { return null; } -LRESULT WM_NCACTIVATE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_NCACTIVATE (long wParam, long lParam) { return null; } -LRESULT WM_NCCALCSIZE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_NCCALCSIZE (long wParam, long lParam) { return null; } -LRESULT WM_NCHITTEST (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_NCHITTEST (long wParam, long lParam) { if (!OS.IsWindowEnabled (handle)) return null; if (!isActive ()) return new LRESULT (OS.HTTRANSPARENT); return null; } -LRESULT WM_NCLBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_NCLBUTTONDOWN (long wParam, long lParam) { return null; } -LRESULT WM_NCPAINT (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_NCPAINT (long wParam, long lParam) { return wmNCPaint (handle, wParam, lParam); } -LRESULT WM_NOTIFY (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_NOTIFY (long wParam, long lParam) { NMHDR hdr = new NMHDR (); OS.MoveMemory (hdr, lParam, NMHDR.sizeof); return wmNotify (hdr, wParam, lParam); } -LRESULT WM_PAINT (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_PAINT (long wParam, long lParam) { if ((state & DISPOSE_SENT) != 0) return LRESULT.ZERO; return wmPaint (handle, wParam, lParam); } -LRESULT WM_PARENTNOTIFY (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_PARENTNOTIFY (long wParam, long lParam) { return null; } -LRESULT WM_PASTE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_PASTE (long wParam, long lParam) { return null; } -LRESULT WM_PRINT (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_PRINT (long wParam, long lParam) { return wmPrint (handle, wParam, lParam); } -LRESULT WM_PRINTCLIENT (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_PRINTCLIENT (long wParam, long lParam) { return null; } -LRESULT WM_QUERYENDSESSION (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_QUERYENDSESSION (long wParam, long lParam) { return null; } -LRESULT WM_QUERYOPEN (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_QUERYOPEN (long wParam, long lParam) { return null; } -LRESULT WM_RBUTTONDBLCLK (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_RBUTTONDBLCLK (long wParam, long lParam) { return wmRButtonDblClk (handle, wParam, lParam); } -LRESULT WM_RBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_RBUTTONDOWN (long wParam, long lParam) { return wmRButtonDown (handle, wParam, lParam); } -LRESULT WM_RBUTTONUP (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_RBUTTONUP (long wParam, long lParam) { return wmRButtonUp (handle, wParam, lParam); } -LRESULT WM_SETCURSOR (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SETCURSOR (long wParam, long lParam) { int hitTest = (short) OS.LOWORD (lParam); if (hitTest == OS.HTCLIENT) { Control control = display.getControl (wParam); @@ -5406,42 +5406,42 @@ LRESULT WM_SETCURSOR (long /*int*/ wParam, long /*int*/ lParam) { return null; } -LRESULT WM_SETFOCUS (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SETFOCUS (long wParam, long lParam) { return wmSetFocus (handle, wParam, lParam); } -LRESULT WM_SETTINGCHANGE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SETTINGCHANGE (long wParam, long lParam) { return null; } -LRESULT WM_SETFONT (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SETFONT (long wParam, long lParam) { return null; } -LRESULT WM_SETREDRAW (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SETREDRAW (long wParam, long lParam) { return null; } -LRESULT WM_SHOWWINDOW (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SHOWWINDOW (long wParam, long lParam) { return null; } -LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SIZE (long wParam, long lParam) { state |= RESIZE_OCCURRED; if ((state & RESIZE_DEFERRED) == 0) sendEvent (SWT.Resize); // widget could be disposed at this point return null; } -LRESULT WM_SYSCHAR (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SYSCHAR (long wParam, long lParam) { return wmSysChar (handle, wParam, lParam); } -LRESULT WM_SYSCOLORCHANGE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SYSCOLORCHANGE (long wParam, long lParam) { return null; } -LRESULT WM_SYSCOMMAND (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SYSCOMMAND (long wParam, long lParam) { /* * Check to see if the command is a system command or * a user menu item that was added to the System menu. @@ -5460,7 +5460,7 @@ LRESULT WM_SYSCOMMAND (long /*int*/ wParam, long /*int*/ lParam) { } /* Process the System Command */ - int cmd = (int)/*64*/wParam & 0xFFF0; + int cmd = (int)wParam & 0xFFF0; switch (cmd) { case OS.SC_KEYMENU: /* @@ -5551,19 +5551,19 @@ LRESULT WM_SYSCOMMAND (long /*int*/ wParam, long /*int*/ lParam) { return null; } -LRESULT WM_SYSKEYDOWN (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SYSKEYDOWN (long wParam, long lParam) { return wmSysKeyDown (handle, wParam, lParam); } -LRESULT WM_SYSKEYUP (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SYSKEYUP (long wParam, long lParam) { return wmSysKeyUp (handle, wParam, lParam); } -LRESULT WM_TABLET_FLICK (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_TABLET_FLICK (long wParam, long lParam) { if (!hooks (SWT.Gesture) && !filters (SWT.Gesture)) return null; Event event = new Event (); FLICK_DATA fData = new FLICK_DATA (); - long /*int*/ [] source = new long /*int*/ [1]; + long [] source = new long [1]; source[0] = wParam; OS.MoveMemory (fData, source, OS.FLICK_DATA_sizeof ()); FLICK_POINT fPoint = new FLICK_POINT (); @@ -5612,12 +5612,12 @@ LRESULT WM_TABLET_FLICK (long /*int*/ wParam, long /*int*/ lParam) { return event.doit ? null : LRESULT.ONE; } -LRESULT WM_TOUCH (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_TOUCH (long wParam, long lParam) { LRESULT result = null; if (hooks (SWT.Touch) || filters (SWT.Touch)) { int cInputs = OS.LOWORD (wParam); - long /*int*/ hHeap = OS.GetProcessHeap (); - long /*int*/ pInputs = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, cInputs * TOUCHINPUT.sizeof); + long hHeap = OS.GetProcessHeap (); + long pInputs = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, cInputs * TOUCHINPUT.sizeof); if (pInputs != 0) { if (OS.GetTouchInputInfo (lParam, cInputs, pInputs, TOUCHINPUT.sizeof)) { TOUCHINPUT ti [] = new TOUCHINPUT [cInputs]; @@ -5635,7 +5635,7 @@ LRESULT WM_TOUCH (long /*int*/ wParam, long /*int*/ lParam) { return result; } -LRESULT WM_TIMER (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_TIMER (long wParam, long lParam) { if (wParam == Menu.ID_TOOLTIP_TIMER && activeMenu != null) { OS.KillTimer (this.handle, Menu.ID_TOOLTIP_TIMER); activeMenu.wmTimer (wParam, lParam); @@ -5643,31 +5643,31 @@ LRESULT WM_TIMER (long /*int*/ wParam, long /*int*/ lParam) { return null; } -LRESULT WM_UNDO (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_UNDO (long wParam, long lParam) { return null; } -LRESULT WM_UPDATEUISTATE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_UPDATEUISTATE (long wParam, long lParam) { return null; } -LRESULT WM_VSCROLL (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_VSCROLL (long wParam, long lParam) { Control control = display.getControl (lParam); if (control == null) return null; return control.wmScrollChild (wParam, lParam); } -LRESULT WM_WINDOWPOSCHANGED (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_WINDOWPOSCHANGED (long wParam, long lParam) { try { display.resizeCount++; - long /*int*/ code = callWindowProc (handle, OS.WM_WINDOWPOSCHANGED, wParam, lParam); + long code = callWindowProc (handle, OS.WM_WINDOWPOSCHANGED, wParam, lParam); return code == 0 ? LRESULT.ZERO : new LRESULT (code); } finally { --display.resizeCount; } } -LRESULT WM_WINDOWPOSCHANGING (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_WINDOWPOSCHANGING (long wParam, long lParam) { /* * Bug in Windows. When WM_SETREDRAW is used to turn off drawing * for a control and the control is moved or resized, Windows does @@ -5685,10 +5685,10 @@ LRESULT WM_WINDOWPOSCHANGING (long /*int*/ wParam, long /*int*/ lParam) { int width = rect.right - rect.left; int height = rect.bottom - rect.top; if (width != 0 && height != 0) { - long /*int*/ hwndParent = parent == null ? 0 : parent.handle; + long hwndParent = parent == null ? 0 : parent.handle; OS.MapWindowPoints (0, hwndParent, rect, 2); - long /*int*/ rgn1 = OS.CreateRectRgn (rect.left, rect.top, rect.right, rect.bottom); - long /*int*/ rgn2 = OS.CreateRectRgn (lpwp.x, lpwp.y, lpwp.x + lpwp.cx, lpwp.y + lpwp.cy); + long rgn1 = OS.CreateRectRgn (rect.left, rect.top, rect.right, rect.bottom); + long rgn2 = OS.CreateRectRgn (lpwp.x, lpwp.y, lpwp.x + lpwp.cx, lpwp.y + lpwp.cy); OS.CombineRgn (rgn1, rgn1, rgn2, OS.RGN_DIFF); int flags = OS.RDW_ERASE | OS.RDW_FRAME | OS.RDW_INVALIDATE | OS.RDW_ALLCHILDREN; OS.RedrawWindow (hwndParent, null, rgn1, flags); @@ -5701,19 +5701,19 @@ LRESULT WM_WINDOWPOSCHANGING (long /*int*/ wParam, long /*int*/ lParam) { return null; } -LRESULT WM_XBUTTONDBLCLK (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_XBUTTONDBLCLK (long wParam, long lParam) { return wmXButtonDblClk (handle, wParam, lParam); } -LRESULT WM_XBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_XBUTTONDOWN (long wParam, long lParam) { return wmXButtonDown (handle, wParam, lParam); } -LRESULT WM_XBUTTONUP (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_XBUTTONUP (long wParam, long lParam) { return wmXButtonUp (handle, wParam, lParam); } -LRESULT wmColorChild (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmColorChild (long wParam, long lParam) { Control control = findBackgroundControl (); if (control == null) { if ((state & THEME_BACKGROUND) != 0) { @@ -5740,15 +5740,15 @@ LRESULT wmColorChild (long /*int*/ wParam, long /*int*/ lParam) { if (control.backgroundImage != null) { RECT rect = new RECT (); OS.GetClientRect (handle, rect); - long /*int*/ hwnd = control.handle; - long /*int*/ hBitmap = control.backgroundImage.handle; + long hwnd = control.handle; + long hBitmap = control.backgroundImage.handle; OS.MapWindowPoints (handle, hwnd, rect, 2); POINT lpPoint = new POINT (); OS.GetWindowOrgEx (wParam, lpPoint); OS.SetBrushOrgEx (wParam, -rect.left - lpPoint.x, -rect.top - lpPoint.y, lpPoint); - long /*int*/ hBrush = findBrush (hBitmap, OS.BS_PATTERN); + long hBrush = findBrush (hBitmap, OS.BS_PATTERN); if ((state & DRAW_BACKGROUND) != 0) { - long /*int*/ hOldBrush = OS.SelectObject (wParam, hBrush); + long hOldBrush = OS.SelectObject (wParam, hBrush); OS.MapWindowPoints (hwnd, handle, rect, 2); OS.PatBlt (wParam, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, OS.PATCOPY); OS.SelectObject (wParam, hOldBrush); @@ -5756,40 +5756,40 @@ LRESULT wmColorChild (long /*int*/ wParam, long /*int*/ lParam) { OS.SetBkMode (wParam, OS.TRANSPARENT); return new LRESULT (hBrush); } - long /*int*/ hBrush = findBrush (backPixel, OS.BS_SOLID); + long hBrush = findBrush (backPixel, OS.BS_SOLID); if ((state & DRAW_BACKGROUND) != 0) { RECT rect = new RECT (); OS.GetClientRect (handle, rect); - long /*int*/ hOldBrush = OS.SelectObject (wParam, hBrush); + long hOldBrush = OS.SelectObject (wParam, hBrush); OS.PatBlt (wParam, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, OS.PATCOPY); OS.SelectObject (wParam, hOldBrush); } return new LRESULT (hBrush); } -LRESULT wmCommandChild (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmCommandChild (long wParam, long lParam) { return null; } -LRESULT wmDrawChild (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmDrawChild (long wParam, long lParam) { return null; } -LRESULT wmMeasureChild (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmMeasureChild (long wParam, long lParam) { return null; } -LRESULT wmNotify (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmNotify (NMHDR hdr, long wParam, long lParam) { Control control = display.getControl (hdr.hwndFrom); if (control == null) return null; return control.wmNotifyChild (hdr, wParam, lParam); } -LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmNotifyChild (NMHDR hdr, long wParam, long lParam) { return null; } -LRESULT wmScrollChild (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmScrollChild (long wParam, long lParam) { return null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolBar.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolBar.java index 296641ef03..5afbbde335 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolBar.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolBar.java @@ -52,7 +52,7 @@ public class CoolBar extends Composite { CoolItem [] originalItems; boolean locked; boolean ignoreResize; - static final long /*int*/ ReBarProc; + static final long ReBarProc; static final TCHAR ReBarClass = new TCHAR (0, OS.REBARCLASSNAME, true); static { INITCOMMONCONTROLSEX icex = new INITCOMMONCONTROLSEX (); @@ -122,7 +122,7 @@ public CoolBar (Composite parent, int style) { } @Override -long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) { +long callWindowProc (long hwnd, int msg, long wParam, long lParam) { if (handle == 0) return 0; return OS.CallWindowProc (ReBarProc, hwnd, msg, wParam, lParam); } @@ -149,7 +149,7 @@ protected void checkSubclass () { int border = getBorderWidthInPixels (); int newWidth = wHint == SWT.DEFAULT ? 0x3FFF : wHint + (border * 2); int newHeight = hHint == SWT.DEFAULT ? 0x3FFF : hHint + (border * 2); - int count = (int)/*64*/OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0); if (count != 0) { ignoreResize = true; boolean redraw = false; @@ -217,12 +217,12 @@ void createHandle () { * The control will not destroy a font that it did not * create. */ - long /*int*/ hFont = OS.GetStockObject (OS.SYSTEM_FONT); + long hFont = OS.GetStockObject (OS.SYSTEM_FONT); OS.SendMessage (handle, OS.WM_SETFONT, hFont, 0); } void createItem (CoolItem item, int index) { - int count = (int)/*64*/OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0); if (!(0 <= index && index <= count)) error (SWT.ERROR_INVALID_RANGE); int id = 0; while (id < items.length && items [id] != null) id++; @@ -231,8 +231,8 @@ void createItem (CoolItem item, int index) { System.arraycopy (items, 0, newItems, 0, items.length); items = newItems; } - long /*int*/ hHeap = OS.GetProcessHeap (); - long /*int*/ lpText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, TCHAR.sizeof); + long hHeap = OS.GetProcessHeap (); + long lpText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, TCHAR.sizeof); REBARBANDINFO rbBand = new REBARBANDINFO (); rbBand.cbSize = REBARBANDINFO.sizeof; rbBand.fMask = OS.RBBIM_TEXT | OS.RBBIM_STYLE | OS.RBBIM_ID; @@ -297,8 +297,8 @@ void createWidget () { } void destroyItem (CoolItem item) { - int index = (int)/*64*/OS.SendMessage (handle, OS.RB_IDTOINDEX, item.id, 0); - int count = (int)/*64*/OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0); + int index = (int)OS.SendMessage (handle, OS.RB_IDTOINDEX, item.id, 0); + int count = (int)OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0); if (count != 0) { int lastIndex = getLastIndexOfRow (index); if (index == lastIndex) { @@ -363,7 +363,7 @@ void destroyItem (CoolItem item) { } @Override -void drawThemeBackground (long /*int*/ hDC, long /*int*/ hwnd, RECT rect) { +void drawThemeBackground (long hDC, long hwnd, RECT rect) { if (OS.IsAppThemed ()) { if (background == -1 && (style & SWT.FLAT) != 0) { Control control = findBackgroundControl (); @@ -439,7 +439,7 @@ int getMargin (int index) { */ public CoolItem getItem (int index) { checkWidget (); - int count = (int)/*64*/OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0); if (!(0 <= index && index < count)) error (SWT.ERROR_INVALID_RANGE); REBARBANDINFO rbBand = new REBARBANDINFO (); rbBand.cbSize = REBARBANDINFO.sizeof; @@ -460,7 +460,7 @@ public CoolItem getItem (int index) { */ public int getItemCount () { checkWidget (); - return (int)/*64*/OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0); + return (int)OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0); } /** @@ -486,7 +486,7 @@ public int getItemCount () { */ public int [] getItemOrder () { checkWidget (); - int count = (int)/*64*/OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0); int [] indices = new int [count]; REBARBANDINFO rbBand = new REBARBANDINFO (); rbBand.cbSize = REBARBANDINFO.sizeof; @@ -523,7 +523,7 @@ public int [] getItemOrder () { */ public CoolItem [] getItems () { checkWidget (); - int count = (int)/*64*/OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0); CoolItem [] result = new CoolItem [count]; REBARBANDINFO rbBand = new REBARBANDINFO (); rbBand.cbSize = REBARBANDINFO.sizeof; @@ -559,7 +559,7 @@ public Point [] getItemSizes () { } Point [] getItemSizesInPixels () { - int count = (int)/*64*/OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0); Point [] sizes = new Point [count]; REBARBANDINFO rbBand = new REBARBANDINFO (); rbBand.cbSize = REBARBANDINFO.sizeof; @@ -584,7 +584,7 @@ Point [] getItemSizesInPixels () { } int getLastIndexOfRow (int index) { - int count = (int)/*64*/OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0); if (count == 0) return -1; REBARBANDINFO rbBand = new REBARBANDINFO (); rbBand.cbSize = REBARBANDINFO.sizeof; @@ -599,7 +599,7 @@ int getLastIndexOfRow (int index) { } boolean isLastItemOfRow (int index) { - int count = (int)/*64*/OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0); if (index + 1 == count) return true; REBARBANDINFO rbBand = new REBARBANDINFO (); rbBand.cbSize = REBARBANDINFO.sizeof; @@ -674,7 +674,7 @@ public int indexOf (CoolItem item) { checkWidget (); if (item == null) error (SWT.ERROR_NULL_ARGUMENT); if (item.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT); - return (int)/*64*/OS.SendMessage (handle, OS.RB_IDTOINDEX, item.id, 0); + return (int)OS.SendMessage (handle, OS.RB_IDTOINDEX, item.id, 0); } void resizeToPreferredWidth (int index) { @@ -683,7 +683,7 @@ void resizeToPreferredWidth (int index) { * with an index out of range, Windows GP's. The * fix is to ensure the index is in range. */ - int count = (int)/*64*/OS.SendMessage(handle, OS.RB_GETBANDCOUNT, 0, 0); + int count = (int)OS.SendMessage(handle, OS.RB_GETBANDCOUNT, 0, 0); if (0 <= index && index < count) { REBARBANDINFO rbBand = new REBARBANDINFO(); rbBand.cbSize = REBARBANDINFO.sizeof; @@ -746,7 +746,7 @@ void reskinChildren (int flags) { void setBackgroundPixel (int pixel) { if (pixel == -1) pixel = defaultBackground (); OS.SendMessage (handle, OS.RB_SETBKCOLOR, 0, pixel); - setItemColors ((int)/*64*/OS.SendMessage (handle, OS.RB_GETTEXTCOLOR, 0, 0), pixel); + setItemColors ((int)OS.SendMessage (handle, OS.RB_GETTEXTCOLOR, 0, 0), pixel); /* * Feature in Windows. For some reason, Windows * does not fully erase the coolbar area and coolbar @@ -762,11 +762,11 @@ void setBackgroundPixel (int pixel) { void setForegroundPixel (int pixel) { if (pixel == -1) pixel = defaultForeground (); OS.SendMessage (handle, OS.RB_SETTEXTCOLOR, 0, pixel); - setItemColors (pixel, (int)/*64*/OS.SendMessage (handle, OS.RB_GETBKCOLOR, 0, 0)); + setItemColors (pixel, (int)OS.SendMessage (handle, OS.RB_GETBKCOLOR, 0, 0)); } void setItemColors (int foreColor, int backColor) { - int count = (int)/*64*/OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0); REBARBANDINFO rbBand = new REBARBANDINFO (); rbBand.cbSize = REBARBANDINFO.sizeof; rbBand.fMask = OS.RBBIM_COLORS; @@ -847,7 +847,7 @@ void setItemLayoutInPixels (int [] itemOrder, int [] wrapIndices, Point [] sizes */ void setItemOrder (int [] itemOrder) { if (itemOrder == null) error (SWT.ERROR_NULL_ARGUMENT); - int itemCount = (int)/*64*/OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0); + int itemCount = (int)OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0); if (itemOrder.length != itemCount) error (SWT.ERROR_INVALID_ARGUMENT); /* Ensure that itemOrder does not contain any duplicates. */ @@ -863,7 +863,7 @@ void setItemOrder (int [] itemOrder) { rbBand.cbSize = REBARBANDINFO.sizeof; for (int i=0; i<itemOrder.length; i++) { int id = originalItems [itemOrder [i]].id; - int index = (int)/*64*/OS.SendMessage (handle, OS.RB_IDTOINDEX, id, 0); + int index = (int)OS.SendMessage (handle, OS.RB_IDTOINDEX, id, 0); if (index != i) { int lastItemSrcRow = getLastIndexOfRow (index); int lastItemDstRow = getLastIndexOfRow (i); @@ -906,7 +906,7 @@ void setItemOrder (int [] itemOrder) { */ void setItemSizes (Point [] sizes) { if (sizes == null) error (SWT.ERROR_NULL_ARGUMENT); - int count = (int)/*64*/OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0); if (sizes.length != count) error (SWT.ERROR_INVALID_ARGUMENT); REBARBANDINFO rbBand = new REBARBANDINFO (); rbBand.cbSize = REBARBANDINFO.sizeof; @@ -933,7 +933,7 @@ void setItemSizes (Point [] sizes) { public void setLocked (boolean locked) { checkWidget (); this.locked = locked; - int count = (int)/*64*/OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0); REBARBANDINFO rbBand = new REBARBANDINFO (); rbBand.cbSize = REBARBANDINFO.sizeof; rbBand.fMask = OS.RBBIM_STYLE; @@ -1007,12 +1007,12 @@ TCHAR windowClass () { } @Override -long /*int*/ windowProc () { +long windowProc () { return ReBarProc; } @Override -LRESULT WM_COMMAND (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_COMMAND (long wParam, long lParam) { /* * Feature in Windows. When the coolbar window * proc processes WM_COMMAND, it forwards this @@ -1037,7 +1037,7 @@ LRESULT WM_COMMAND (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_ERASEBKGND (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_ERASEBKGND (long wParam, long lParam) { LRESULT result = super.WM_ERASEBKGND (wParam, lParam); /* * Feature in Windows. For some reason, Windows @@ -1060,7 +1060,7 @@ LRESULT WM_ERASEBKGND (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_NOTIFY (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_NOTIFY (long wParam, long lParam) { /* * Feature in Windows. When the cool bar window * proc processes WM_NOTIFY, it forwards this @@ -1085,7 +1085,7 @@ LRESULT WM_NOTIFY (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_SETREDRAW (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SETREDRAW (long wParam, long lParam) { LRESULT result = super.WM_SETREDRAW (wParam, lParam); if (result != null) return result; /* @@ -1111,9 +1111,9 @@ LRESULT WM_SETREDRAW (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SIZE (long wParam, long lParam) { if (ignoreResize) { - long /*int*/ code = callWindowProc (handle, OS.WM_SIZE, wParam, lParam); + long code = callWindowProc (handle, OS.WM_SIZE, wParam, lParam); if (code == 0) return LRESULT.ZERO; return new LRESULT (code); } @@ -1127,7 +1127,7 @@ LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmNotifyChild (NMHDR hdr, long wParam, long lParam) { switch (hdr.code) { case OS.RBN_BEGINDRAG: { int pos = OS.GetMessagePos (); @@ -1165,7 +1165,7 @@ LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { if (!ignoreResize) { Point size = getSizeInPixels (); int border = getBorderWidthInPixels (); - int barHeight = (int)/*64*/OS.SendMessage (handle, OS.RB_GETBARHEIGHT, 0, 0); + int barHeight = (int)OS.SendMessage (handle, OS.RB_GETBARHEIGHT, 0, 0); if ((style & SWT.VERTICAL) != 0) { setSizeInPixels (barHeight + 2 * border, size.y); } else { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolItem.java index 05bbc0aa80..961b177899 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolItem.java @@ -232,7 +232,7 @@ public Rectangle getBounds () { Rectangle getBoundsInPixels () { int index = parent.indexOf (this); if (index == -1) return new Rectangle (0, 0, 0, 0); - long /*int*/ hwnd = parent.handle; + long hwnd = parent.handle; RECT rect = new RECT (); OS.SendMessage (hwnd, OS.RB_GETRECT, index, rect); MARGINS margins = new MARGINS (); @@ -254,7 +254,7 @@ Rectangle getClientArea () { checkWidget (); int index = parent.indexOf (this); if (index == -1) return new Rectangle (0, 0, 0, 0); - long /*int*/ hwnd = parent.handle; + long hwnd = parent.handle; RECT insetRect = new RECT (); OS.SendMessage (hwnd, OS.RB_GETBANDBORDERS, index, insetRect); RECT rect = new RECT (); @@ -343,8 +343,8 @@ public void setControl (Control control) { this.control = null; } Control oldControl = this.control, newControl = control; - long /*int*/ hwnd = parent.handle; - long /*int*/ hwndChild = newControl != null ? control.topHandle () : 0; + long hwnd = parent.handle; + long hwndChild = newControl != null ? control.topHandle () : 0; REBARBANDINFO rbBand = new REBARBANDINFO (); rbBand.cbSize = REBARBANDINFO.sizeof; rbBand.fMask = OS.RBBIM_CHILD; @@ -357,7 +357,7 @@ public void setControl (Control control) { * moves the new child to the top of the Z-order. The fix is * to save and restore the visibility and Z-order. */ - long /*int*/ hwndAbove = 0; + long hwndAbove = 0; if (newControl != null) { hwndAbove = OS.GetWindow (hwndChild, OS.GW_HWNDPREV); } @@ -392,7 +392,7 @@ public Point getPreferredSize () { Point getPreferredSizeInPixels () { int index = parent.indexOf (this); if (index == -1) return new Point (0, 0); - long /*int*/ hwnd = parent.handle; + long hwnd = parent.handle; REBARBANDINFO rbBand = new REBARBANDINFO (); rbBand.cbSize = REBARBANDINFO.sizeof; rbBand.fMask = OS.RBBIM_CHILDSIZE | OS.RBBIM_IDEALSIZE; @@ -426,7 +426,7 @@ void setPreferredSizeInPixels (int width, int height) { width = Math.max (0, width); height = Math.max (0, height); ideal = true; - long /*int*/ hwnd = parent.handle; + long hwnd = parent.handle; int cxIdeal, cyMaxChild; if ((parent.style & SWT.VERTICAL) != 0) { cxIdeal = Math.max (0, height - parent.getMargin (index)); @@ -491,7 +491,7 @@ public Point getSize () { Point getSizeInPixels() { int index = parent.indexOf (this); if (index == -1) new Point (0, 0); - long /*int*/ hwnd = parent.handle; + long hwnd = parent.handle; RECT rect = new RECT (); OS.SendMessage (hwnd, OS.RB_GETRECT, index, rect); MARGINS margins = new MARGINS (); @@ -535,7 +535,7 @@ void setSizeInPixels (int width, int height) { if (index == -1) return; width = Math.max (0, width); height = Math.max (0, height); - long /*int*/ hwnd = parent.handle; + long hwnd = parent.handle; int cx, cyChild, cxIdeal; if ((parent.style & SWT.VERTICAL) != 0) { cx = height; @@ -618,7 +618,7 @@ public Point getMinimumSize () { Point getMinimumSizeInPixels () { int index = parent.indexOf (this); if (index == -1) return new Point (0, 0); - long /*int*/ hwnd = parent.handle; + long hwnd = parent.handle; REBARBANDINFO rbBand = new REBARBANDINFO (); rbBand.cbSize = REBARBANDINFO.sizeof; rbBand.fMask = OS.RBBIM_CHILDSIZE; @@ -654,7 +654,7 @@ void setMinimumSizeInPixels (int width, int height) { width = Math.max (0, width); height = Math.max (0, height); minimum = true; - long /*int*/ hwnd = parent.handle; + long hwnd = parent.handle; int cxMinChild, cyMinChild; if ((parent.style & SWT.VERTICAL) != 0) { cxMinChild = height; @@ -701,7 +701,7 @@ public void setMinimumSize (Point size) { boolean getWrap() { int index = parent.indexOf (this); - long /*int*/ hwnd = parent.handle; + long hwnd = parent.handle; REBARBANDINFO rbBand = new REBARBANDINFO (); rbBand.cbSize = REBARBANDINFO.sizeof; rbBand.fMask = OS.RBBIM_STYLE; @@ -711,7 +711,7 @@ boolean getWrap() { void setWrap(boolean wrap) { int index = parent.indexOf (this); - long /*int*/ hwnd = parent.handle; + long hwnd = parent.handle; REBARBANDINFO rbBand = new REBARBANDINFO (); rbBand.cbSize = REBARBANDINFO.sizeof; rbBand.fMask = OS.RBBIM_STYLE; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/DateTime.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/DateTime.java index ffadd410a2..3b7750aec3 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/DateTime.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/DateTime.java @@ -53,9 +53,9 @@ public class DateTime extends Composite { boolean doubleClick, ignoreSelection; SYSTEMTIME lastSystemTime; SYSTEMTIME time = new SYSTEMTIME (); // only used in calendar mode - static final long /*int*/ DateTimeProc; + static final long DateTimeProc; static final TCHAR DateTimeClass = new TCHAR (0, OS.DATETIMEPICK_CLASS, true); - static final long /*int*/ CalendarProc; + static final long CalendarProc; static final TCHAR CalendarClass = new TCHAR (0, OS.MONTHCAL_CLASS, true); static { INITCOMMONCONTROLSEX icex = new INITCOMMONCONTROLSEX (); @@ -202,7 +202,7 @@ public void addSelectionListener (SelectionListener listener) { } @Override -long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) { +long callWindowProc (long hwnd, int msg, long wParam, long lParam) { if (handle == 0) return 0; return OS.CallWindowProc (windowProc (), hwnd, msg, wParam, lParam); } @@ -735,12 +735,12 @@ TCHAR windowClass () { } @Override -long /*int*/ windowProc () { +long windowProc () { return (style & SWT.CALENDAR) != 0 ? CalendarProc : DateTimeProc; } @Override -LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmNotifyChild (NMHDR hdr, long wParam, long lParam) { switch (hdr.code) { case OS.DTN_CLOSEUP: { /* @@ -776,7 +776,7 @@ LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_CHAR (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_CHAR (long wParam, long lParam) { LRESULT result = super.WM_CHAR (wParam, lParam); if (result != null) return result; /* @@ -785,7 +785,7 @@ LRESULT WM_CHAR (long /*int*/ wParam, long /*int*/ lParam) { * The fix is to look for these keys and not call * the window proc. */ - switch ((int)/*64*/wParam) { + switch ((int)wParam) { case SWT.CR: sendSelectionEvent (SWT.DefaultSelection); // FALL THROUGH @@ -796,7 +796,7 @@ LRESULT WM_CHAR (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_LBUTTONDBLCLK (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_LBUTTONDBLCLK (long wParam, long lParam) { LRESULT result = super.WM_LBUTTONDBLCLK (wParam, lParam); if (isDisposed ()) return LRESULT.ZERO; if ((style & SWT.CALENDAR) != 0) { @@ -806,14 +806,14 @@ LRESULT WM_LBUTTONDBLCLK (long /*int*/ wParam, long /*int*/ lParam) { pt.x = OS.GET_X_LPARAM (lParam); pt.y = OS.GET_Y_LPARAM (lParam); pMCHitTest.pt = pt; - long /*int*/ code = OS.SendMessage (handle, OS.MCM_HITTEST, 0, pMCHitTest); + long code = OS.SendMessage (handle, OS.MCM_HITTEST, 0, pMCHitTest); if ((code & OS.MCHT_CALENDARDATE) == OS.MCHT_CALENDARDATE) doubleClick = true; } return result; } @Override -LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_LBUTTONDOWN (long wParam, long lParam) { LRESULT result = super.WM_LBUTTONDOWN (wParam, lParam); if (result == LRESULT.ZERO) return result; doubleClick = false; @@ -829,7 +829,7 @@ LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_LBUTTONUP (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_LBUTTONUP (long wParam, long lParam) { LRESULT result = super.WM_LBUTTONUP (wParam, lParam); if (isDisposed ()) return LRESULT.ZERO; if (doubleClick) sendSelectionEvent (SWT.DefaultSelection); @@ -838,7 +838,7 @@ LRESULT WM_LBUTTONUP (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_TIMER (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_TIMER (long wParam, long lParam) { LRESULT result = super.WM_TIMER (wParam, lParam); if (result != null) return result; /* @@ -847,7 +847,7 @@ LRESULT WM_TIMER (long /*int*/ wParam, long /*int*/ lParam) { * to ignore MCN_SELCHANGE during WM_TIMER. */ ignoreSelection = true; - long /*int*/ code = callWindowProc(handle, OS.WM_TIMER, wParam, lParam); + long code = callWindowProc(handle, OS.WM_TIMER, wParam, lParam); ignoreSelection = false; return code == 0 ? LRESULT.ZERO : new LRESULT(code); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Decorations.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Decorations.java index 112577a494..9c584ce36b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Decorations.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Decorations.java @@ -106,7 +106,7 @@ public class Decorations extends Canvas { Control savedFocus; Button defaultButton, saveDefault; int swFlags, nAccel; - long /*int*/ hAccel; + long hAccel; boolean moved, resized, opened; int oldX = OS.CW_USEDEFAULT, oldY = OS.CW_USEDEFAULT; int oldWidth = OS.CW_USEDEFAULT, oldHeight = OS.CW_USEDEFAULT; @@ -274,7 +274,7 @@ protected void checkSubclass () { } @Override -long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) { +long callWindowProc (long hwnd, int msg, long wParam, long lParam) { if (handle == 0) return 0; return OS.DefMDIChildProc (hwnd, msg, wParam, lParam); } @@ -408,7 +408,7 @@ public void dispose () { super.dispose (); } -Menu findMenu (long /*int*/ hMenu) { +Menu findMenu (long hMenu) { if (menus == null) return null; for (int i=0; i<menus.length; i++) { Menu menu = menus [i]; @@ -903,7 +903,7 @@ void setImages (Image image, Image [] images) { if (smallImage != null) smallImage.dispose (); if (largeImage != null) largeImage.dispose (); smallImage = largeImage = null; - long /*int*/ hSmallIcon = 0, hLargeIcon = 0; + long hSmallIcon = 0, hLargeIcon = 0; Image smallIcon = null, largeIcon = null; if (image != null) { smallIcon = largeIcon = image; @@ -1054,7 +1054,7 @@ public void setMenuBar (Menu menu) { } if (menu != null) display.removeBar (menu); menuBar = menu; - long /*int*/ hMenu = menuBar != null ? menuBar.handle: 0; + long hMenu = menuBar != null ? menuBar.handle: 0; OS.SetMenu (handle, hMenu); destroyAccelerators (); } @@ -1110,7 +1110,7 @@ void setParent () { * undocumented and possibly dangerous Windows * feature. */ - long /*int*/ hwndParent = parent.handle; + long hwndParent = parent.handle; display.lockActiveWindow = true; OS.SetParent (handle, hwndParent); if (!OS.IsWindowVisible (hwndParent)) { @@ -1181,7 +1181,7 @@ void setSavedFocus (Control control) { } void setSystemMenu () { - long /*int*/ hMenu = OS.GetSystemMenu (handle, false); + long hMenu = OS.GetSystemMenu (handle, false); if (hMenu == 0) return; int oldCount = OS.GetMenuItemCount (hMenu); if ((style & SWT.RESIZE) == 0) { @@ -1244,9 +1244,9 @@ public void setText (String string) { TCHAR buffer = new TCHAR (0, string, true); /* Ensure that the title appears in the task bar.*/ if ((state & FOREIGN_HANDLE) != 0) { - long /*int*/ hHeap = OS.GetProcessHeap (); + long hHeap = OS.GetProcessHeap (); int byteCount = buffer.length () * TCHAR.sizeof; - long /*int*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); + long pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); OS.MoveMemory (pszText, buffer, byteCount); OS.DefWindowProc (handle, OS.WM_SETTEXT, 0, pszText); if (pszText != 0) OS.HeapFree (hHeap, 0, pszText); @@ -1369,13 +1369,13 @@ boolean translateMenuAccelerator (MSG msg) { boolean translateMDIAccelerator (MSG msg) { if (!(this instanceof Shell)) { Shell shell = getShell (); - long /*int*/ hwndMDIClient = shell.hwndMDIClient; + long hwndMDIClient = shell.hwndMDIClient; if (hwndMDIClient != 0 && OS.TranslateMDISysAccel (hwndMDIClient, msg)) { return true; } if (msg.message == OS.WM_KEYDOWN) { if (OS.GetKeyState (OS.VK_CONTROL) >= 0) return false; - switch ((int)/*64*/(msg.wParam)) { + switch ((int)(msg.wParam)) { case OS.VK_F4: OS.PostMessage (handle, OS.WM_CLOSE, 0, 0); return true; @@ -1385,7 +1385,7 @@ boolean translateMDIAccelerator (MSG msg) { return false; } if (msg.message == OS.WM_SYSKEYDOWN) { - switch ((int)/*64*/(msg.wParam)) { + switch ((int)(msg.wParam)) { case OS.VK_F4: OS.PostMessage (shell.handle, OS.WM_CLOSE, 0, 0); return true; @@ -1449,7 +1449,7 @@ int widgetExtStyle () { } @Override -long /*int*/ widgetParent () { +long widgetParent () { Shell shell = getShell (); return shell.hwndMDIClient (); } @@ -1491,7 +1491,7 @@ int widgetStyle () { } @Override -long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) { +long windowProc (long hwnd, int msg, long wParam, long lParam) { switch (msg) { case Display.SWT_GETACCEL: case Display.SWT_GETACCELCOUNT: @@ -1502,7 +1502,7 @@ long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long / } @Override -LRESULT WM_ACTIVATE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_ACTIVATE (long wParam, long lParam) { LRESULT result = super.WM_ACTIVATE (wParam, lParam); if (result != null) return result; /* @@ -1567,7 +1567,7 @@ LRESULT WM_ACTIVATE (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_CLOSE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_CLOSE (long wParam, long lParam) { LRESULT result = super.WM_CLOSE (wParam, lParam); if (result != null) return result; if (isEnabled () && isActive ()) closeWidget (); @@ -1575,14 +1575,14 @@ LRESULT WM_CLOSE (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_KILLFOCUS (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_KILLFOCUS (long wParam, long lParam) { LRESULT result = super.WM_KILLFOCUS (wParam, lParam); saveFocus (); return result; } @Override -LRESULT WM_MOVE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_MOVE (long wParam, long lParam) { if (moved) { Point location = getLocationInPixels (); if (location.x == oldX && location.y == oldY) { @@ -1595,7 +1595,7 @@ LRESULT WM_MOVE (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_NCACTIVATE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_NCACTIVATE (long wParam, long lParam) { LRESULT result = super.WM_NCACTIVATE (wParam, lParam); if (result != null) return result; if (wParam == 0) { @@ -1615,14 +1615,14 @@ LRESULT WM_NCACTIVATE (long /*int*/ wParam, long /*int*/ lParam) { } } if (!(this instanceof Shell)) { - long /*int*/ hwndShell = getShell().handle; + long hwndShell = getShell().handle; OS.SendMessage (hwndShell, OS.WM_NCACTIVATE, wParam, lParam); } return result; } @Override -LRESULT WM_QUERYOPEN (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_QUERYOPEN (long wParam, long lParam) { LRESULT result = super.WM_QUERYOPEN (wParam, lParam); if (result != null) return result; sendEvent (SWT.Deiconify); @@ -1631,7 +1631,7 @@ LRESULT WM_QUERYOPEN (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_SETFOCUS (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SETFOCUS (long wParam, long lParam) { LRESULT result = super.WM_SETFOCUS (wParam, lParam); if (isDisposed ()) return result; if (savedFocus != this) restoreFocus (); @@ -1639,12 +1639,12 @@ LRESULT WM_SETFOCUS (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SIZE (long wParam, long lParam) { LRESULT result = null; boolean changed = true; if (resized) { int newWidth = 0, newHeight = 0; - switch ((int)/*64*/wParam) { + switch ((int)wParam) { case OS.SIZE_MAXIMIZED: OS.GetWindowRect (handle, maxRect); case OS.SIZE_RESTORED: @@ -1675,11 +1675,11 @@ LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_SYSCOMMAND (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SYSCOMMAND (long wParam, long lParam) { LRESULT result = super.WM_SYSCOMMAND (wParam, lParam); if (result != null) return result; if (!(this instanceof Shell)) { - int cmd = (int)/*64*/wParam & 0xFFF0; + int cmd = (int)wParam & 0xFFF0; switch (cmd) { case OS.SC_CLOSE: { OS.PostMessage (handle, OS.WM_CLOSE, 0, 0); @@ -1695,7 +1695,7 @@ LRESULT WM_SYSCOMMAND (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_WINDOWPOSCHANGING (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_WINDOWPOSCHANGING (long wParam, long lParam) { LRESULT result = super.WM_WINDOWPOSCHANGING (wParam, lParam); if (result != null) return result; if (display.lockActiveWindow) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/DirectoryDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/DirectoryDialog.java index 50b3be4d3f..9e355f98e3 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/DirectoryDialog.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/DirectoryDialog.java @@ -97,8 +97,8 @@ public DirectoryDialog (Shell parent, int style) { checkSubclass (); } -long /*int*/ BrowseCallbackProc (long /*int*/ hwnd, long /*int*/ uMsg, long /*int*/ lParam, long /*int*/ lpData) { - switch ((int)/*64*/uMsg) { +long BrowseCallbackProc (long hwnd, long uMsg, long lParam, long lpData) { + switch ((int)uMsg) { case OS.BFFM_INITIALIZED: if (filterPath != null && filterPath.length () != 0) { /* Use the character encoding for the default locale */ @@ -166,14 +166,14 @@ public String open() { } private String openCommonFileDialog () { - long /*int*/ hHeap = OS.GetProcessHeap (); + long hHeap = OS.GetProcessHeap (); /* Get the owner HWND for the dialog */ - long /*int*/ hwndOwner = 0; + long hwndOwner = 0; if (parent != null) hwndOwner = parent.handle; /* Copy the message to OS memory */ - long /*int*/ lpszTitle = 0; + long lpszTitle = 0; if (message.length () != 0) { String string = message; if (string.indexOf ('&') != -1) { @@ -196,7 +196,7 @@ private String openCommonFileDialog () { /* Create the BrowseCallbackProc */ Callback callback = new Callback (this, "BrowseCallbackProc", 4); //$NON-NLS-1$ - long /*int*/ lpfn = callback.getAddress (); + long lpfn = callback.getAddress (); if (lpfn == 0) error (SWT.ERROR_NO_MORE_CALLBACKS); /* Make the parent shell be temporary modal */ @@ -233,7 +233,7 @@ private String openCommonFileDialog () { int oldErrorMode = OS.SetErrorMode (OS.SEM_FAILCRITICALERRORS); display.sendPreExternalEventDispatchEvent (); - long /*int*/ lpItemIdList = OS.SHBrowseForFolder (lpbi); + long lpItemIdList = OS.SHBrowseForFolder (lpbi); display.sendPostExternalEventDispatchEvent (); OS.SetErrorMode (oldErrorMode); @@ -259,7 +259,7 @@ private String openCommonFileDialog () { if (lpszTitle != 0) OS.HeapFree (hHeap, 0, lpszTitle); /* Free the pointer to the ITEMIDLIST */ - long /*int*/ [] ppMalloc = new long /*int*/ [1]; + long [] ppMalloc = new long [1]; if (OS.SHGetMalloc (ppMalloc) == OS.S_OK) { /* void Free (struct IMalloc *this, void *pv); */ OS.VtblCall (5, ppMalloc [0], lpItemIdList); @@ -281,9 +281,9 @@ private String openCommonFileDialog () { private String openCommonItemDialog() { this.directoryPath = null; - long /*int*/ [] ppv = new long /*int*/ [1]; + long [] ppv = new long [1]; if (OS.CoCreateInstance(CLSID_FileOpenDialog, 0, OS.CLSCTX_INPROC_SERVER, IID_IFileOpenDialog, ppv) == OS.S_OK) { - long /*int*/ fileDialog = ppv[0]; + long fileDialog = ppv[0]; int[] options = new int[1]; if ((OS.VtblCall(FileDialogVtbl.GET_OPTIONS, fileDialog, options)) == OS.S_OK) { @@ -304,7 +304,7 @@ private String openCommonItemDialog() { char[] buffer = new char[path.length() + 1]; path.getChars(0, path.length(), buffer, 0); if (OS.SHCreateItemFromParsingName(buffer, 0, IID_IShellItem, ppv) == OS.S_OK) { - long /*int*/ psi = ppv[0]; + long psi = ppv[0]; /* * SetDefaultDirectory does not work if the dialog has * persisted recently used folder. The fix is to clear the @@ -316,12 +316,12 @@ private String openCommonItemDialog() { } } - long /*int*/ hwndOwner = parent.handle; + long hwndOwner = parent.handle; if (OS.VtblCall(FileDialogVtbl.SHOW, fileDialog, hwndOwner) == OS.S_OK) { if (OS.VtblCall(FileDialogVtbl.GET_RESULT, fileDialog, ppv) == OS.S_OK) { - long /*int*/ psi = ppv[0]; + long psi = ppv[0]; if (OS.VtblCall(ShellItemVtbl.GET_DISPLAY_NAME, psi, OS.SIGDN_FILESYSPATH, ppv) == OS.S_OK) { - long /*int*/ wstr = ppv[0]; + long wstr = ppv[0]; int length = OS.wcslen(wstr); char[] buffer = new char[length]; OS.MoveMemory(buffer, wstr, length * 2); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java index 1aa83e1836..018f65a453 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java @@ -123,7 +123,7 @@ public class Display extends Device { /* Windows and Events */ Event [] eventQueue; Callback windowCallback; - long /*int*/ windowProc; + long windowProc; int threadId; TCHAR windowClass, windowShadowClass, windowOwnDCClass; static int WindowClassCount; @@ -137,7 +137,7 @@ public class Display extends Device { int freeSlot; int [] indexTable; Control lastControl, lastGetControl; - long /*int*/ lastHwnd, lastGetHwnd; + long lastHwnd, lastGetHwnd; Control [] controlTable; static final int GROW_SIZE = 1024; static final int SWT_OBJECT_INDEX = OS.GlobalAddAtom (new TCHAR (0, "SWT_OBJECT_INDEX", true)); //$NON-NLS-1$ @@ -151,7 +151,7 @@ public class Display extends Device { } /* XP Themes */ - long /*int*/ hButtonTheme, hEditTheme, hExplorerBarTheme, hScrollBarTheme, hTabTheme; + long hButtonTheme, hEditTheme, hExplorerBarTheme, hScrollBarTheme, hTabTheme; static final char [] BUTTON = new char [] {'B', 'U', 'T', 'T', 'O', 'N', 0}; static final char [] EDIT = new char [] {'E', 'D', 'I', 'T', 0}; static final char [] EXPLORER = new char [] {'E', 'X', 'P', 'L', 'O', 'R', 'E', 'R', 0}; @@ -162,8 +162,8 @@ public class Display extends Device { static final char [] TREEVIEW = new char [] {'T', 'R', 'E', 'E', 'V', 'I', 'E', 'W', 0}; /* Custom icons */ - long /*int*/ hIconSearch; - long /*int*/ hIconCancel; + long hIconSearch; + long hIconCancel; /* Focus */ int focusEvent; @@ -185,18 +185,18 @@ public class Display extends Device { /* Filter Hook */ Callback msgFilterCallback; - long /*int*/ msgFilterProc, filterHook; + long msgFilterProc, filterHook; MSG hookMsg = new MSG (); boolean runDragDrop = true, dragCancelled = false; /* Idle Hook */ Callback foregroundIdleCallback; - long /*int*/ foregroundIdleProc, idleHook; + long foregroundIdleProc, idleHook; /* Message Hook and Embedding */ boolean ignoreNextKey; Callback getMsgCallback, embeddedCallback; - long /*int*/ getMsgProc, msgHook, embeddedHwnd, embeddedProc; + long getMsgProc, msgHook, embeddedHwnd, embeddedProc; static final String AWT_WINDOW_CLASS = "SunAwtWindow"; //$NON-NLS-1$ static final short [] ACCENTS = new short [] {'~', '`', '\'', '^', '"'}; @@ -228,18 +228,18 @@ public class Display extends Device { static final String LAUNCHER_PREFIX = "--launcher.openFile "; //$NON-NLS-1$ /* Timers */ - long /*int*/ [] timerIds; + long [] timerIds; Runnable [] timerList; - long /*int*/ nextTimerId = SETTINGS_ID + 1; + long nextTimerId = SETTINGS_ID + 1; /* Settings */ - static final long /*int*/ SETTINGS_ID = 100; + static final long SETTINGS_ID = 100; static final int SETTINGS_DELAY = 2000; /* Keyboard and Mouse */ RECT clickRect; int clickCount, lastTime, lastButton; - long /*int*/ lastClickHwnd; + long lastClickHwnd; int scrollRemainder, scrollHRemainder; int lastKey, lastMouse, lastAscii; boolean lastVirtual, lastNull, lastDead; @@ -265,7 +265,7 @@ public class Display extends Device { /* Message Only Window */ Callback messageCallback; - long /*int*/ hwndMessage, messageProc; + long hwndMessage, messageProc; /* System Resources */ LOGFONT lfSystemFont; @@ -279,7 +279,7 @@ public class Display extends Device { ImageList[] imageList, toolImageList, toolHotImageList, toolDisabledImageList; /* Custom Colors for ChooseColor */ - long /*int*/ lpCustColors; + long lpCustColors; /* Table */ char [] tableBuffer; @@ -500,7 +500,7 @@ void addBar (Menu menu) { bars [index] = menu; } -void addControl (long /*int*/ handle, Control control) { +void addControl (long handle, Control control) { if (handle == 0) return; if (freeSlot == -1) { int length = (freeSlot = indexTable.length) + GROW_SIZE; @@ -773,7 +773,7 @@ void clearModal (Shell shell) { } int controlKey (int key) { - int upper = (int)/*64*/OS.CharUpper ((short) key); + int upper = (int)OS.CharUpper ((short) key); if (64 <= upper && upper <= 95) return upper & 0xBF; return key; } @@ -822,9 +822,9 @@ protected void create (DeviceData data) { void createDisplay (DeviceData data) { } -static long /*int*/ create32bitDIB (Image image) { +static long create32bitDIB (Image image) { int transparentPixel = -1, alpha = -1; - long /*int*/ hMask = 0, hBitmap = 0; + long hMask = 0, hBitmap = 0; byte[] alphaData = null; switch (image.type) { case SWT.ICON: @@ -845,10 +845,10 @@ static long /*int*/ create32bitDIB (Image image) { OS.GetObject (hBitmap, BITMAP.sizeof, bm); int imgWidth = bm.bmWidth; int imgHeight = bm.bmHeight; - long /*int*/ hDC = OS.GetDC (0); - long /*int*/ srcHdc = OS.CreateCompatibleDC (hDC); - long /*int*/ oldSrcBitmap = OS.SelectObject (srcHdc, hBitmap); - long /*int*/ memHdc = OS.CreateCompatibleDC (hDC); + long hDC = OS.GetDC (0); + long srcHdc = OS.CreateCompatibleDC (hDC); + long oldSrcBitmap = OS.SelectObject (srcHdc, hBitmap); + long memHdc = OS.CreateCompatibleDC (hDC); BITMAPINFOHEADER bmiHeader = new BITMAPINFOHEADER (); bmiHeader.biSize = BITMAPINFOHEADER.sizeof; bmiHeader.biWidth = imgWidth; @@ -858,10 +858,10 @@ static long /*int*/ create32bitDIB (Image image) { bmiHeader.biCompression = OS.BI_RGB; byte [] bmi = new byte [BITMAPINFOHEADER.sizeof]; OS.MoveMemory (bmi, bmiHeader, BITMAPINFOHEADER.sizeof); - long /*int*/ [] pBits = new long /*int*/ [1]; - long /*int*/ memDib = OS.CreateDIBSection (0, bmi, OS.DIB_RGB_COLORS, pBits, 0, 0); + long [] pBits = new long [1]; + long memDib = OS.CreateDIBSection (0, bmi, OS.DIB_RGB_COLORS, pBits, 0, 0); if (memDib == 0) SWT.error (SWT.ERROR_NO_HANDLES); - long /*int*/ oldMemBitmap = OS.SelectObject (memHdc, memDib); + long oldMemBitmap = OS.SelectObject (memHdc, memDib); BITMAP dibBM = new BITMAP (); OS.GetObject (memDib, BITMAP.sizeof, dibBM); int sizeInBytes = dibBM.bmWidthBytes * dibBM.bmHeight; @@ -970,15 +970,15 @@ static long /*int*/ create32bitDIB (Image image) { if (hMask != 0) OS.DeleteObject (hMask); return memDib; } -static long /*int*/ create32bitDIB (long /*int*/ hBitmap, int alpha, byte [] alphaData, int transparentPixel) { +static long create32bitDIB (long hBitmap, int alpha, byte [] alphaData, int transparentPixel) { BITMAP bm = new BITMAP (); OS.GetObject (hBitmap, BITMAP.sizeof, bm); int imgWidth = bm.bmWidth; int imgHeight = bm.bmHeight; - long /*int*/ hDC = OS.GetDC (0); - long /*int*/ srcHdc = OS.CreateCompatibleDC (hDC); - long /*int*/ oldSrcBitmap = OS.SelectObject (srcHdc, hBitmap); - long /*int*/ memHdc = OS.CreateCompatibleDC (hDC); + long hDC = OS.GetDC (0); + long srcHdc = OS.CreateCompatibleDC (hDC); + long oldSrcBitmap = OS.SelectObject (srcHdc, hBitmap); + long memHdc = OS.CreateCompatibleDC (hDC); BITMAPINFOHEADER bmiHeader = new BITMAPINFOHEADER (); bmiHeader.biSize = BITMAPINFOHEADER.sizeof; bmiHeader.biWidth = imgWidth; @@ -988,10 +988,10 @@ static long /*int*/ create32bitDIB (long /*int*/ hBitmap, int alpha, byte [] alp bmiHeader.biCompression = OS.BI_RGB; byte [] bmi = new byte [BITMAPINFOHEADER.sizeof]; OS.MoveMemory (bmi, bmiHeader, BITMAPINFOHEADER.sizeof); - long /*int*/ [] pBits = new long /*int*/ [1]; - long /*int*/ memDib = OS.CreateDIBSection (0, bmi, OS.DIB_RGB_COLORS, pBits, 0, 0); + long [] pBits = new long [1]; + long memDib = OS.CreateDIBSection (0, bmi, OS.DIB_RGB_COLORS, pBits, 0, 0); if (memDib == 0) SWT.error (SWT.ERROR_NO_HANDLES); - long /*int*/ oldMemBitmap = OS.SelectObject (memHdc, memDib); + long oldMemBitmap = OS.SelectObject (memHdc, memDib); BITMAP dibBM = new BITMAP (); OS.GetObject (memDib, BITMAP.sizeof, dibBM); int sizeInBytes = dibBM.bmWidthBytes * dibBM.bmHeight; @@ -1069,9 +1069,9 @@ static Image createIcon (Image image) { return new Image (device, data, mask); } int width = data.width, height = data.height; - long /*int*/ hMask, hBitmap; - long /*int*/ hDC = device.internal_new_GC (null); - long /*int*/ dstHdc = OS.CreateCompatibleDC (hDC), oldDstBitmap; + long hMask, hBitmap; + long hDC = device.internal_new_GC (null); + long dstHdc = OS.CreateCompatibleDC (hDC), oldDstBitmap; hBitmap = Display.create32bitDIB (image.handle, data.alpha, data.alphaData, data.transparentPixel); hMask = OS.CreateBitmap (width, height, 1, 1, null); oldDstBitmap = OS.SelectObject (dstHdc, hMask); @@ -1083,7 +1083,7 @@ static Image createIcon (Image image) { info.fIcon = true; info.hbmColor = hBitmap; info.hbmMask = hMask; - long /*int*/ hIcon = OS.CreateIconIndirect (info); + long hIcon = OS.CreateIconIndirect (info); if (hIcon == 0) SWT.error(SWT.ERROR_NO_HANDLES); OS.DeleteObject (hBitmap); OS.DeleteObject (hMask); @@ -1155,14 +1155,14 @@ void drawMenuBars () { bars = null; } -long /*int*/ embeddedProc (long /*int*/ hwnd, long /*int*/ msg, long /*int*/ wParam, long /*int*/ lParam) { - switch ((int)/*64*/msg) { +long embeddedProc (long hwnd, long msg, long wParam, long lParam) { + switch ((int)msg) { case SWT_KEYMSG: { MSG keyMsg = new MSG (); OS.MoveMemory (keyMsg, lParam, MSG.sizeof); OS.TranslateMessage (keyMsg); OS.DispatchMessage (keyMsg); - long /*int*/ hHeap = OS.GetProcessHeap (); + long hHeap = OS.GetProcessHeap (); OS.HeapFree (hHeap, 0, lParam); break; } @@ -1175,7 +1175,7 @@ long /*int*/ embeddedProc (long /*int*/ hwnd, long /*int*/ msg, long /*int*/ wPa break; } } - return OS.DefWindowProc (hwnd, (int)/*64*/msg, wParam, lParam); + return OS.DefWindowProc (hwnd, (int)msg, wParam, lParam); } /** @@ -1223,9 +1223,9 @@ boolean filterMessage (MSG msg) { return false; } -Control findControl (long /*int*/ handle) { +Control findControl (long handle) { if (handle == 0) return null; - long /*int*/ hwndOwner = 0; + long hwndOwner = 0; do { Control control = getControl (handle); if (control != null) return control; @@ -1255,7 +1255,7 @@ Control findControl (long /*int*/ handle) { * * @noreference This method is not intended to be referenced by clients. */ -public Widget findWidget (long /*int*/ handle) { +public Widget findWidget (long handle) { checkDevice (); return getControl (handle); } @@ -1284,7 +1284,7 @@ public Widget findWidget (long /*int*/ handle) { * * @since 3.1 */ -public Widget findWidget (long /*int*/ handle, long /*int*/ id) { +public Widget findWidget (long handle, long id) { checkDevice (); Control control = getControl (handle); return control != null ? control.findItem (id) : null; @@ -1309,7 +1309,7 @@ public Widget findWidget (long /*int*/ handle, long /*int*/ id) { * * @since 3.3 */ -public Widget findWidget (Widget widget, long /*int*/ id) { +public Widget findWidget (Widget widget, long id) { checkDevice (); if (widget instanceof Control) { return findWidget (((Control) widget).handle, id); @@ -1317,7 +1317,7 @@ public Widget findWidget (Widget widget, long /*int*/ id) { return null; } -long /*int*/ foregroundIdleProc (long /*int*/ code, long /*int*/ wParam, long /*int*/ lParam) { +long foregroundIdleProc (long code, long wParam, long lParam) { if (code >= 0) { if (getMessageCount () != 0) { sendPostExternalEventDispatchEvent (); @@ -1347,7 +1347,7 @@ long /*int*/ foregroundIdleProc (long /*int*/ code, long /*int*/ wParam, long /* sendPreExternalEventDispatchEvent (); } } - return OS.CallNextHookEx (idleHook, (int)/*64*/code, wParam, lParam); + return OS.CallNextHookEx (idleHook, (int)code, wParam, lParam); } /** @@ -1372,7 +1372,7 @@ public static Display findDisplay (Thread thread) { } } -TouchSource findTouchSource (long /*int*/ touchDevice, Monitor monitor) { +TouchSource findTouchSource (long touchDevice, Monitor monitor) { if (touchSources == null) touchSources = new TouchSource [4]; int length = touchSources.length; for (int i=0; i<length; i++) { @@ -1470,7 +1470,7 @@ public static Display getCurrent () { return findDisplay (Thread.currentThread ()); } -int getClickCount (int type, int button, long /*int*/ hwnd, long /*int*/ lParam) { +int getClickCount (int type, int button, long hwnd, long lParam) { switch (type) { case SWT.MouseDown: int doubleClick = OS.GetDoubleClickTime (); @@ -1534,7 +1534,7 @@ Rectangle getClientAreaInPixels () { return new Rectangle (x, y, width, height); } -Control getControl (long /*int*/ handle) { +Control getControl (long handle) { if (handle == 0) return null; if (lastControl != null && lastHwnd == handle) { return lastControl; @@ -1542,7 +1542,7 @@ Control getControl (long /*int*/ handle) { if (lastGetControl != null && lastGetHwnd == handle) { return lastGetControl; } - int index = (int)/*64*/OS.GetProp (handle, SWT_OBJECT_INDEX) - 1; + int index = (int)OS.GetProp (handle, SWT_OBJECT_INDEX) - 1; if (0 <= index && index < controlTable.length) { Control control = controlTable [index]; /* @@ -1848,7 +1848,7 @@ public int getIconDepth () { /* Use the character encoding for the default locale */ TCHAR buffer1 = new TCHAR (0, "Control Panel\\Desktop\\WindowMetrics", true); //$NON-NLS-1$ - long /*int*/ [] phkResult = new long /*int*/ [1]; + long [] phkResult = new long [1]; int result = OS.RegOpenKeyEx (OS.HKEY_CURRENT_USER, buffer1, 0, OS.KEY_READ, phkResult); if (result != 0) return 4; int depth = 4; @@ -2048,7 +2048,7 @@ Dialog getModalDialog () { return modalDialog; } -Monitor getMonitor (long /*int*/ hmonitor) { +Monitor getMonitor (long hmonitor) { MONITORINFO lpmi = new MONITORINFO (); lpmi.cbSize = MONITORINFO.sizeof; OS.GetMonitorInfo (hmonitor, lpmi); @@ -2085,7 +2085,7 @@ public Monitor [] getMonitors () { checkDevice (); monitors = new Monitor [4]; Callback callback = new Callback (this, "monitorEnumProc", 4); //$NON-NLS-1$ - long /*int*/ lpfnEnum = callback.getAddress (); + long lpfnEnum = callback.getAddress (); if (lpfnEnum == 0) error (SWT.ERROR_NO_MORE_CALLBACKS); OS.EnumDisplayMonitors (0, null, lpfnEnum, 0); callback.dispose (); @@ -2096,9 +2096,9 @@ public Monitor [] getMonitors () { return result; } -long /*int*/ getMsgProc (long /*int*/ code, long /*int*/ wParam, long /*int*/ lParam) { +long getMsgProc (long code, long wParam, long lParam) { if (embeddedHwnd == 0) { - long /*int*/ hInstance = OS.GetModuleHandle (null); + long hInstance = OS.GetModuleHandle (null); embeddedHwnd = OS.CreateWindowEx (0, windowClass, null, @@ -2123,11 +2123,11 @@ long /*int*/ getMsgProc (long /*int*/ code, long /*int*/ wParam, long /*int*/ lP case OS.WM_SYSKEYUP: { Control control = findControl (msg.hwnd); if (control != null) { - long /*int*/ hHeap = OS.GetProcessHeap (); - long /*int*/ keyMsg = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, MSG.sizeof); + long hHeap = OS.GetProcessHeap (); + long keyMsg = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, MSG.sizeof); OS.MoveMemory (keyMsg, msg, MSG.sizeof); OS.PostMessage (hwndMessage, SWT_KEYMSG, wParam, keyMsg); - switch ((int)/*64*/msg.wParam) { + switch ((int)msg.wParam) { case OS.VK_SHIFT: case OS.VK_MENU: case OS.VK_CONTROL: @@ -2143,7 +2143,7 @@ long /*int*/ getMsgProc (long /*int*/ code, long /*int*/ wParam, long /*int*/ lP } } } - return OS.CallNextHookEx (msgHook, (int)/*64*/code, wParam, lParam); + return OS.CallNextHookEx (msgHook, (int)code, wParam, lParam); } /** @@ -2155,7 +2155,7 @@ long /*int*/ getMsgProc (long /*int*/ code, long /*int*/ wParam, long /*int*/ lP */ public Monitor getPrimaryMonitor () { checkDevice (); - long /*int*/ hmonitor = OS.MonitorFromWindow (0, OS.MONITOR_DEFAULTTOPRIMARY); + long hmonitor = OS.MonitorFromWindow (0, OS.MONITOR_DEFAULTTOPRIMARY); return getMonitor (hmonitor); } @@ -2369,7 +2369,7 @@ public Cursor getSystemCursor (int id) { public Font getSystemFont () { checkDevice (); if (systemFont != null) return systemFont; - long /*int*/ hFont = 0; + long hFont = 0; NONCLIENTMETRICS info = new NONCLIENTMETRICS (); info.cbSize = NONCLIENTMETRICS.sizeof; if (OS.SystemParametersInfo (OS.SPI_GETNONCLIENTMETRICS, 0, info, 0)) { @@ -2413,23 +2413,23 @@ public Image getSystemImage (int id) { switch (id) { case SWT.ICON_ERROR: { if (errorImage != null) return errorImage; - long /*int*/ hIcon = OS.LoadImage (0, OS.OIC_HAND, OS.IMAGE_ICON, 0, 0, OS.LR_SHARED); + long hIcon = OS.LoadImage (0, OS.OIC_HAND, OS.IMAGE_ICON, 0, 0, OS.LR_SHARED); return errorImage = Image.win32_new (this, SWT.ICON, hIcon); } case SWT.ICON_WORKING: case SWT.ICON_INFORMATION: { if (infoImage != null) return infoImage; - long /*int*/ hIcon = OS.LoadImage (0, OS.OIC_INFORMATION, OS.IMAGE_ICON, 0, 0, OS.LR_SHARED); + long hIcon = OS.LoadImage (0, OS.OIC_INFORMATION, OS.IMAGE_ICON, 0, 0, OS.LR_SHARED); return infoImage = Image.win32_new (this, SWT.ICON, hIcon); } case SWT.ICON_QUESTION: { if (questionImage != null) return questionImage; - long /*int*/ hIcon = OS.LoadImage (0, OS.OIC_QUES, OS.IMAGE_ICON, 0, 0, OS.LR_SHARED); + long hIcon = OS.LoadImage (0, OS.OIC_QUES, OS.IMAGE_ICON, 0, 0, OS.LR_SHARED); return questionImage = Image.win32_new (this, SWT.ICON, hIcon); } case SWT.ICON_WARNING: { if (warningIcon != null) return warningIcon; - long /*int*/ hIcon = OS.LoadImage (0, OS.OIC_BANG, OS.IMAGE_ICON, 0, 0, OS.LR_SHARED); + long hIcon = OS.LoadImage (0, OS.OIC_BANG, OS.IMAGE_ICON, 0, 0, OS.LR_SHARED); return warningIcon = Image.win32_new (this, SWT.ICON, hIcon); } } @@ -2528,27 +2528,27 @@ public boolean getTouchEnabled () { return (value & (OS.NID_READY | OS.NID_MULTI_INPUT)) == (OS.NID_READY | OS.NID_MULTI_INPUT); } -long /*int*/ hButtonTheme () { +long hButtonTheme () { if (hButtonTheme != 0) return hButtonTheme; return hButtonTheme = OS.OpenThemeData (hwndMessage, BUTTON); } -long /*int*/ hEditTheme () { +long hEditTheme () { if (hEditTheme != 0) return hEditTheme; return hEditTheme = OS.OpenThemeData (hwndMessage, EDIT); } -long /*int*/ hExplorerBarTheme () { +long hExplorerBarTheme () { if (hExplorerBarTheme != 0) return hExplorerBarTheme; return hExplorerBarTheme = OS.OpenThemeData (hwndMessage, EXPLORERBAR); } -long /*int*/ hScrollBarTheme () { +long hScrollBarTheme () { if (hScrollBarTheme != 0) return hScrollBarTheme; return hScrollBarTheme = OS.OpenThemeData (hwndMessage, SCROLLBAR); } -long /*int*/ hTabTheme () { +long hTabTheme () { if (hTabTheme != 0) return hTabTheme; return hTabTheme = OS.OpenThemeData (hwndMessage, TAB); } @@ -2576,9 +2576,9 @@ long /*int*/ hTabTheme () { * @noreference This method is not intended to be referenced by clients. */ @Override -public long /*int*/ internal_new_GC (GCData data) { +public long internal_new_GC (GCData data) { if (isDisposed()) error(SWT.ERROR_DEVICE_DISPOSED); - long /*int*/ hDC = OS.GetDC (0); + long hDC = OS.GetDC (0); if (hDC == 0) error (SWT.ERROR_NO_HANDLES); if (data != null) { int mask = SWT.LEFT_TO_RIGHT | SWT.RIGHT_TO_LEFT; @@ -2614,7 +2614,7 @@ protected void init () { int length = APP_NAME.length (); appName = new char [length + 1]; APP_NAME.getChars (0, length, appName, 0); - long /*int*/ [] appID = new long /*int*/ [1]; + long [] appID = new long [1]; if (OS.GetCurrentProcessExplicitAppUserModelID(appID) != 0) { OS.SetCurrentProcessExplicitAppUserModelID (appName); } @@ -2637,7 +2637,7 @@ protected void init () { WindowClassCount++; /* Register the SWT window class */ - long /*int*/ hInstance = OS.GetModuleHandle (null); + long hInstance = OS.GetModuleHandle (null); WNDCLASS lpWndClass = new WNDCLASS (); lpWndClass.hInstance = hInstance; lpWndClass.lpfnWndProc = windowProc; @@ -2695,7 +2695,7 @@ protected void init () { if (appName != null) { /* Delete any old jump list set for the ID */ - long /*int*/ [] ppv = new long /*int*/ [1]; + long [] ppv = new long [1]; int hr = OS.CoCreateInstance (TaskBar.CLSID_DestinationList, 0, OS.CLSCTX_INPROC_SERVER, TaskBar.IID_ICustomDestinationList, ppv); if (hr == OS.S_OK) { /*ICustomDestinationList::DeleteList*/ @@ -2731,7 +2731,7 @@ protected void init () { * @noreference This method is not intended to be referenced by clients. */ @Override -public void internal_dispose_GC (long /*int*/ hDC, GCData data) { +public void internal_dispose_GC (long hDC, GCData data) { OS.ReleaseDC (0, hDC); } @@ -2741,7 +2741,7 @@ boolean isXMouseActive () { */ boolean xMouseActive = false; TCHAR key = new TCHAR (0, "Control Panel\\Desktop", true); //$NON-NLS-1$ - long /*int*/ [] phKey = new long /*int*/ [1]; + long [] phKey = new long [1]; int result = OS.RegOpenKeyEx (OS.HKEY_CURRENT_USER, key, 0, OS.KEY_READ, phKey); if (result == 0) { TCHAR lpValueName = new TCHAR (0, "UserPreferencesMask", true); //$NON-NLS-1$ @@ -2851,8 +2851,8 @@ Point mapInPixels (Control from, Control to, int x, int y) { if (from != null && from.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT); if (to != null && to.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT); if (from == to) return new Point (x, y); - long /*int*/ hwndFrom = from != null ? from.handle : 0; - long /*int*/ hwndTo = to != null ? to.handle : 0; + long hwndFrom = from != null ? from.handle : 0; + long hwndTo = to != null ? to.handle : 0; POINT point = new POINT (); point.x = x; point.y = y; @@ -2958,8 +2958,8 @@ Rectangle mapInPixels (Control from, Control to, int x, int y, int width, int he if (from != null && from.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT); if (to != null && to.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT); if (from == to) return new Rectangle (x, y, width, height); - long /*int*/ hwndFrom = from != null ? from.handle : 0; - long /*int*/ hwndTo = to != null ? to.handle : 0; + long hwndFrom = from != null ? from.handle : 0; + long hwndTo = to != null ? to.handle : 0; RECT rect = new RECT (); rect.left = x; rect.top = y; @@ -2969,8 +2969,8 @@ Rectangle mapInPixels (Control from, Control to, int x, int y, int width, int he return new Rectangle (rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top); } -long /*int*/ messageProc (long /*int*/ hwnd, long /*int*/ msg, long /*int*/ wParam, long /*int*/ lParam) { - switch ((int)/*64*/msg) { +long messageProc (long hwnd, long msg, long wParam, long lParam) { + switch ((int)msg) { case SWT_RUNASYNC: { if (runMessagesInIdle) runAsyncMessages (false); break; @@ -2994,7 +2994,7 @@ long /*int*/ messageProc (long /*int*/ hwnd, long /*int*/ msg, long /*int*/ wPar switch (keyMsg.message) { case OS.WM_KEYDOWN: case OS.WM_SYSKEYDOWN: { - switch ((int)/*64*/keyMsg.wParam) { + switch ((int)keyMsg.wParam) { case OS.VK_SHIFT: case OS.VK_MENU: case OS.VK_CONTROL: @@ -3003,7 +3003,7 @@ long /*int*/ messageProc (long /*int*/ hwnd, long /*int*/ msg, long /*int*/ wPar case OS.VK_SCROLL: break; default: { - int mapKey = OS.MapVirtualKey ((int)/*64*/keyMsg.wParam, 2); + int mapKey = OS.MapVirtualKey ((int)keyMsg.wParam, 2); if (mapKey != 0) { accentKey = (mapKey & 0x80000000) != 0; if (!accentKey) { @@ -3040,7 +3040,7 @@ long /*int*/ messageProc (long /*int*/ hwnd, long /*int*/ msg, long /*int*/ wPar switch (keyMsg.message) { case OS.WM_KEYDOWN: case OS.WM_SYSKEYDOWN: { - switch ((int)/*64*/keyMsg.wParam) { + switch ((int)keyMsg.wParam) { case OS.VK_SHIFT: case OS.VK_MENU: case OS.VK_CONTROL: @@ -3056,7 +3056,7 @@ long /*int*/ messageProc (long /*int*/ hwnd, long /*int*/ msg, long /*int*/ wPar } } } - switch ((int)/*64*/keyMsg.wParam) { + switch ((int)keyMsg.wParam) { case OS.VK_SHIFT: case OS.VK_MENU: case OS.VK_CONTROL: @@ -3066,7 +3066,7 @@ long /*int*/ messageProc (long /*int*/ hwnd, long /*int*/ msg, long /*int*/ wPar consumed = true; } if (consumed) { - long /*int*/ hHeap = OS.GetProcessHeap (); + long hHeap = OS.GetProcessHeap (); OS.HeapFree (hHeap, 0, lParam); } else { OS.PostMessage (embeddedHwnd, SWT_KEYMSG, wParam, lParam); @@ -3079,7 +3079,7 @@ long /*int*/ messageProc (long /*int*/ hwnd, long /*int*/ msg, long /*int*/ wPar for (int i=0; i<items.length; i++) { TrayItem item = items [i]; if (item != null && item.id == wParam) { - return item.messageProc (hwnd, (int)/*64*/msg, wParam, lParam); + return item.messageProc (hwnd, (int)msg, wParam, lParam); } } } @@ -3107,16 +3107,16 @@ long /*int*/ messageProc (long /*int*/ hwnd, long /*int*/ msg, long /*int*/ wPar */ if (wParam != 0) { if (!isXMouseActive ()) { - long /*int*/ hwndActive = OS.GetActiveWindow (); + long hwndActive = OS.GetActiveWindow (); if (hwndActive != 0 && OS.IsWindowEnabled (hwndActive)) break; Shell modal = modalDialog != null ? modalDialog.parent : getModalShell (); if (modal != null && !modal.isDisposed ()) { - long /*int*/ hwndModal = modal.handle; + long hwndModal = modal.handle; if (OS.IsWindowEnabled (hwndModal)) { modal.bringToTop (); if (modal.isDisposed ()) break; } - long /*int*/ hwndPopup = OS.GetLastActivePopup (hwndModal); + long hwndPopup = OS.GetLastActivePopup (hwndModal); if (hwndPopup != 0 && hwndPopup != modal.handle) { if (getControl (hwndPopup) == null) { if (OS.IsWindowEnabled (hwndPopup)) { @@ -3173,7 +3173,7 @@ long /*int*/ messageProc (long /*int*/ hwnd, long /*int*/ msg, long /*int*/ wPar break; } default: { - if ((int)/*64*/msg == TASKBARCREATED) { + if ((int)msg == TASKBARCREATED) { if (tray != null) { TrayItem [] items = tray.items; for (int i=0; i<items.length; i++) { @@ -3182,8 +3182,8 @@ long /*int*/ messageProc (long /*int*/ hwnd, long /*int*/ msg, long /*int*/ wPar } } } - if ((int)/*64*/msg == SWT_OPENDOC) { - String filename = getSharedData((int)/*64*/wParam, (int)/*64*/lParam); + if ((int)msg == SWT_OPENDOC) { + String filename = getSharedData((int)wParam, (int)lParam); if (filename != null) { if (filename.startsWith (TASKBAR_EVENT)) { String text = filename.substring (TASKBAR_EVENT.length ()); @@ -3207,21 +3207,21 @@ long /*int*/ messageProc (long /*int*/ hwnd, long /*int*/ msg, long /*int*/ wPar } } } - return OS.DefWindowProc (hwnd, (int)/*64*/msg, wParam, lParam); + return OS.DefWindowProc (hwnd, (int)msg, wParam, lParam); } String getSharedData(int pid, int handle) { - long /*int*/ [] mapHandle = new long /*int*/ [1]; + long [] mapHandle = new long [1]; if (pid == OS.GetCurrentProcessId()) { mapHandle[0] = handle; } else { - long /*int*/ processHandle = OS.OpenProcess(OS.PROCESS_VM_READ|OS.PROCESS_DUP_HANDLE, false, pid); + long processHandle = OS.OpenProcess(OS.PROCESS_VM_READ|OS.PROCESS_DUP_HANDLE, false, pid); if (processHandle == 0) return null; OS.DuplicateHandle(processHandle, handle, OS.GetCurrentProcess(), mapHandle, OS.DUPLICATE_SAME_ACCESS, false, OS.DUPLICATE_SAME_ACCESS); OS.CloseHandle(processHandle); } - long /*int*/ sharedData = OS.MapViewOfFile(mapHandle[0], OS.FILE_MAP_READ, 0, 0, 0); + long sharedData = OS.MapViewOfFile(mapHandle[0], OS.FILE_MAP_READ, 0, 0, 0); if (sharedData == 0) return null; int length = OS.wcslen (sharedData); TCHAR buffer = new TCHAR (0, length); @@ -3235,7 +3235,7 @@ String getSharedData(int pid, int handle) { return result; } -long /*int*/ monitorEnumProc (long /*int*/ hmonitor, long /*int*/ hdc, long /*int*/ lprcMonitor, long /*int*/ dwData) { +long monitorEnumProc (long hmonitor, long hdc, long lprcMonitor, long dwData) { if (monitorCount >= monitors.length) { Monitor[] newMonitors = new Monitor [monitors.length + 4]; System.arraycopy (monitors, 0, newMonitors, 0, monitors.length); @@ -3245,8 +3245,8 @@ long /*int*/ monitorEnumProc (long /*int*/ hmonitor, long /*int*/ hdc, long /*in return 1; } -long /*int*/ msgFilterProc (long /*int*/ code, long /*int*/ wParam, long /*int*/ lParam) { - switch ((int)/*64*/code) { +long msgFilterProc (long code, long wParam, long lParam) { + switch ((int)code) { case OS.MSGF_COMMCTRL_BEGINDRAG: { if (!runDragDrop && !dragCancelled) { OS.MoveMemory (hookMsg, lParam, MSG.sizeof); @@ -3283,7 +3283,7 @@ long /*int*/ msgFilterProc (long /*int*/ code, long /*int*/ wParam, long /*int*/ break; } } - return OS.CallNextHookEx (filterHook, (int)/*64*/code, wParam, lParam); + return OS.CallNextHookEx (filterHook, (int)code, wParam, lParam); } int numpadKey (int key) { @@ -3420,8 +3420,8 @@ public boolean post (Event event) { case OS.VK_DIVIDE: inputs.dwFlags |= OS.KEYEVENTF_EXTENDEDKEY; } - long /*int*/ hHeap = OS.GetProcessHeap (); - long /*int*/ pInputs = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, INPUT.sizeof); + long hHeap = OS.GetProcessHeap (); + long pInputs = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, INPUT.sizeof); OS.MoveMemory(pInputs, new int[] {OS.INPUT_KEYBOARD}, 4); //TODO - DWORD type of INPUT structure aligned to 8 bytes on 64 bit OS.MoveMemory (pInputs + C.PTR_SIZEOF, inputs, KEYBDINPUT.sizeof); @@ -3476,8 +3476,8 @@ public boolean post (Event event) { } } } - long /*int*/ hHeap = OS.GetProcessHeap (); - long /*int*/ pInputs = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, INPUT.sizeof); + long hHeap = OS.GetProcessHeap (); + long pInputs = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, INPUT.sizeof); OS.MoveMemory(pInputs, new int[] {OS.INPUT_MOUSE}, 4); //TODO - DWORD type of INPUT structure aligned to 8 bytes on 64 bit OS.MoveMemory (pInputs + C.PTR_SIZEOF, inputs, MOUSEINPUT.sizeof); @@ -3673,8 +3673,8 @@ void releaseDisplay () { messageProc = 0; /* Unregister the SWT window class */ - long /*int*/ hHeap = OS.GetProcessHeap (); - long /*int*/ hInstance = OS.GetModuleHandle (null); + long hHeap = OS.GetProcessHeap (); + long hInstance = OS.GetModuleHandle (null); OS.UnregisterClass (windowClass, hInstance); /* Unregister the SWT drop shadow and CS_OWNDC window class */ @@ -3894,11 +3894,11 @@ void removeBar (Menu menu) { } } -Control removeControl (long /*int*/ handle) { +Control removeControl (long handle) { if (handle == 0) return null; lastControl = lastGetControl = null; Control control = null; - int index = (int)/*64*/OS.RemoveProp (handle, SWT_OBJECT_INDEX) - 1; + int index = (int)OS.RemoveProp (handle, SWT_OBJECT_INDEX) - 1; if (0 <= index && index < controlTable.length) { control = controlTable [index]; controlTable [index] = null; @@ -4040,7 +4040,7 @@ boolean runSkin () { return false; } -boolean runTimer (long /*int*/ id) { +boolean runTimer (long id) { if (timerList != null && timerIds != null) { int index = 0; while (index <timerIds.length) { @@ -4617,13 +4617,13 @@ public void timerExec (int milliseconds, Runnable runnable) { checkDevice (); if (runnable == null) error (SWT.ERROR_NULL_ARGUMENT); if (timerList == null) timerList = new Runnable [4]; - if (timerIds == null) timerIds = new long /*int*/ [4]; + if (timerIds == null) timerIds = new long [4]; int index = 0; while (index < timerList.length) { if (timerList [index] == runnable) break; index++; } - long /*int*/ timerId = 0; + long timerId = 0; if (index != timerList.length) { timerId = timerIds [index]; if (milliseconds < 0) { @@ -4644,12 +4644,12 @@ public void timerExec (int milliseconds, Runnable runnable) { Runnable [] newTimerList = new Runnable [timerList.length + 4]; System.arraycopy (timerList, 0, newTimerList, 0, timerList.length); timerList = newTimerList; - long /*int*/ [] newTimerIds = new long /*int*/ [timerIds.length + 4]; + long [] newTimerIds = new long [timerIds.length + 4]; System.arraycopy (timerIds, 0, newTimerIds, 0, timerIds.length); timerIds = newTimerIds; } } - long /*int*/ newTimerID = OS.SetTimer (hwndMessage, timerId, milliseconds, 0); + long newTimerID = OS.SetTimer (hwndMessage, timerId, milliseconds, 0); if (newTimerID != 0) { timerList [index] = runnable; timerIds [index] = newTimerID; @@ -4682,7 +4682,7 @@ boolean translateMnemonic (MSG msg, Control control) { boolean translateTraversal (MSG msg, Control control) { switch (msg.message) { case OS.WM_KEYDOWN: - switch ((int)/*64*/msg.wParam) { + switch ((int)msg.wParam) { case OS.VK_RETURN: case OS.VK_ESCAPE: case OS.VK_TAB: @@ -4696,7 +4696,7 @@ boolean translateTraversal (MSG msg, Control control) { } break; case OS.WM_SYSKEYDOWN: - switch ((int)/*64*/msg.wParam) { + switch ((int)msg.wParam) { case OS.VK_MENU: return control.translateTraversal (msg); } @@ -4773,27 +4773,27 @@ void wakeThread () { OS.PostThreadMessage (threadId, OS.WM_NULL, 0, 0); } -long /*int*/ windowProc (long /*int*/ hwnd, long /*int*/ msg, long /*int*/ wParam, long /*int*/ lParam) { +long windowProc (long hwnd, long msg, long wParam, long lParam) { if (lastControl != null && lastHwnd == hwnd) { - return lastControl.windowProc (hwnd, (int)/*64*/msg, wParam, lParam); + return lastControl.windowProc (hwnd, (int)msg, wParam, lParam); } - int index = (int)/*64*/OS.GetProp (hwnd, SWT_OBJECT_INDEX) - 1; + int index = (int)OS.GetProp (hwnd, SWT_OBJECT_INDEX) - 1; if (0 <= index && index < controlTable.length) { Control control = controlTable [index]; if (control != null) { lastHwnd = hwnd; lastControl = control; - return control.windowProc (hwnd, (int)/*64*/msg, wParam, lParam); + return control.windowProc (hwnd, (int)msg, wParam, lParam); } } - return OS.DefWindowProc (hwnd, (int)/*64*/msg, wParam, lParam); + return OS.DefWindowProc (hwnd, (int)msg, wParam, lParam); } -int textWidth (String text, long /*int*/ handle) { - long /*int*/ oldFont = 0; +int textWidth (String text, long handle) { + long oldFont = 0; RECT rect = new RECT (); - long /*int*/ hDC = OS.GetDC (handle); - long /*int*/ newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); + long hDC = OS.GetDC (handle); + long newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont); int flags = OS.DT_CALCRECT | OS.DT_SINGLELINE | OS.DT_NOPREFIX; char [] buffer = text.toCharArray (); @@ -4803,7 +4803,7 @@ int textWidth (String text, long /*int*/ handle) { return (rect.right - rect.left); } -String wrapText (String text, long /*int*/ handle, int width) { +String wrapText (String text, long handle, int width) { String Lf = "\r\n"; //$NON-NLS-1$ text = withCrLf (text); int length = text.length (); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ExpandBar.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ExpandBar.java index 8b85c43964..b1e01e63f4 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ExpandBar.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ExpandBar.java @@ -53,7 +53,7 @@ public class ExpandBar extends Composite { ExpandItem focusItem; int spacing = 4; int yCurrentScroll; - long /*int*/ hFont; + long hFont; /** @@ -116,7 +116,7 @@ public void addExpandListener (ExpandListener listener) { } @Override -long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) { +long callWindowProc (long hwnd, int msg, long wParam, long lParam) { if (handle == 0) return 0; return OS.DefWindowProc (hwnd, msg, wParam, lParam); } @@ -135,12 +135,12 @@ static int checkStyle (int style) { int height = 0, width = 0; if (wHint == SWT.DEFAULT || hHint == SWT.DEFAULT) { if (itemCount > 0) { - long /*int*/ hDC = OS.GetDC (handle); - long /*int*/ hTheme = 0; + long hDC = OS.GetDC (handle); + long hTheme = 0; if (isAppThemed ()) { hTheme = display.hExplorerBarTheme (); } - long /*int*/ hCurrentFont = 0, oldFont = 0; + long hCurrentFont = 0, oldFont = 0; if (hTheme == 0) { if (hFont != 0) { hCurrentFont = hFont; @@ -244,7 +244,7 @@ void destroyItem (ExpandItem item) { } @Override -void drawThemeBackground (long /*int*/ hDC, long /*int*/ hwnd, RECT rect) { +void drawThemeBackground (long hDC, long hwnd, RECT rect) { RECT rect2 = new RECT (); OS.GetClientRect (handle, rect2); OS.MapWindowPoints (handle, hwnd, rect2, 2); @@ -252,7 +252,7 @@ void drawThemeBackground (long /*int*/ hDC, long /*int*/ hwnd, RECT rect) { } void drawWidget (GC gc, RECT clipRect) { - long /*int*/ hTheme = 0; + long hTheme = 0; if (isAppThemed ()) { hTheme = display.hExplorerBarTheme (); } @@ -265,10 +265,10 @@ void drawWidget (GC gc, RECT clipRect) { } boolean drawFocus = false; if (handle == OS.GetFocus ()) { - int uiState = (int)/*64*/OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); + int uiState = (int)OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); drawFocus = (uiState & OS.UISF_HIDEFOCUS) == 0; } - long /*int*/ hCurrentFont = 0, oldFont = 0; + long hCurrentFont = 0, oldFont = 0; if (hTheme == 0) { if (hFont != 0) { hCurrentFont = hFont; @@ -312,8 +312,8 @@ Control findThemeControl () { } int getBandHeight () { - long /*int*/ hDC = OS.GetDC (handle); - long /*int*/ oldHFont = OS.SelectObject (hDC, hFont == 0 ? defaultFont () : hFont); + long hDC = OS.GetDC (handle); + long oldHFont = OS.SelectObject (hDC, hFont == 0 ? defaultFont () : hFont); TEXTMETRIC lptm = new TEXTMETRIC (); OS.GetTextMetrics (hDC, lptm); OS.SelectObject (hDC, oldHFont); @@ -647,16 +647,16 @@ TCHAR windowClass () { } @Override -long /*int*/ windowProc () { +long windowProc () { return display.windowProc; } @Override -LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_KEYDOWN (long wParam, long lParam) { LRESULT result = super.WM_KEYDOWN (wParam, lParam); if (result != null) return result; if (focusItem == null) return result; - switch ((int)/*64*/wParam) { + switch ((int)wParam) { case OS.VK_SPACE: case OS.VK_RETURN: Event event = new Event (); @@ -692,14 +692,14 @@ LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_KILLFOCUS (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_KILLFOCUS (long wParam, long lParam) { LRESULT result = super.WM_KILLFOCUS (wParam, lParam); if (focusItem != null) focusItem.redraw (true); return result; } @Override -LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_LBUTTONDOWN (long wParam, long lParam) { LRESULT result = super.WM_LBUTTONDOWN (wParam, lParam); if (result == LRESULT.ZERO) return result; int x = OS.GET_X_LPARAM (lParam); @@ -719,7 +719,7 @@ LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_LBUTTONUP (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_LBUTTONUP (long wParam, long lParam) { LRESULT result = super.WM_LBUTTONUP (wParam, lParam); if (result == LRESULT.ZERO) return result; if (focusItem == null) return result; @@ -737,7 +737,7 @@ LRESULT WM_LBUTTONUP (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_MOUSELEAVE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_MOUSELEAVE (long wParam, long lParam) { LRESULT result = super.WM_MOUSELEAVE (wParam, lParam); if (result != null) return result; for (int i = 0; i < itemCount; i++) { @@ -752,7 +752,7 @@ LRESULT WM_MOUSELEAVE (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_MOUSEMOVE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_MOUSEMOVE (long wParam, long lParam) { LRESULT result = super.WM_MOUSEMOVE (wParam, lParam); if (result == LRESULT.ZERO) return result; int x = OS.GET_X_LPARAM (lParam); @@ -769,12 +769,12 @@ LRESULT WM_MOUSEMOVE (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_MOUSEWHEEL (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_MOUSEWHEEL (long wParam, long lParam) { return wmScrollWheel (true, wParam, lParam); } @Override -LRESULT WM_PAINT (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_PAINT (long wParam, long lParam) { if ((state & DISPOSE_SENT) != 0) return LRESULT.ZERO; PAINTSTRUCT ps = new PAINTSTRUCT (); @@ -803,7 +803,7 @@ LRESULT WM_PAINT (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_PRINTCLIENT (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_PRINTCLIENT (long wParam, long lParam) { LRESULT result = super.WM_PRINTCLIENT (wParam, lParam); RECT rect = new RECT (); OS.GetClientRect (handle, rect); @@ -817,7 +817,7 @@ LRESULT WM_PRINTCLIENT (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_SETCURSOR (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SETCURSOR (long wParam, long lParam) { LRESULT result = super.WM_SETCURSOR (wParam, lParam); if (result != null) return result; int hitTest = (short) OS.LOWORD (lParam); @@ -825,7 +825,7 @@ LRESULT WM_SETCURSOR (long /*int*/ wParam, long /*int*/ lParam) { for (int i = 0; i < itemCount; i++) { ExpandItem item = items [i]; if (item.hover) { - long /*int*/ hCursor = OS.LoadCursor (0, OS.IDC_HAND); + long hCursor = OS.LoadCursor (0, OS.IDC_HAND); OS.SetCursor (hCursor); return LRESULT.ONE; } @@ -835,14 +835,14 @@ LRESULT WM_SETCURSOR (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_SETFOCUS (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SETFOCUS (long wParam, long lParam) { LRESULT result = super.WM_SETFOCUS (wParam, lParam); if (focusItem != null) focusItem.redraw (true); return result; } @Override -LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SIZE (long wParam, long lParam) { LRESULT result = super.WM_SIZE (wParam, lParam); RECT rect = new RECT (); OS.GetClientRect (handle, rect); @@ -857,7 +857,7 @@ LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT wmScroll (ScrollBar bar, boolean update, long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmScroll (ScrollBar bar, boolean update, long hwnd, int msg, long wParam, long lParam) { LRESULT result = super.wmScroll (bar, true, hwnd, msg, wParam, lParam); SCROLLINFO info = new SCROLLINFO (); info.cbSize = SCROLLINFO.sizeof; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ExpandItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ExpandItem.java index 086c471e92..a092e41093 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ExpandItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ExpandItem.java @@ -119,16 +119,16 @@ static ExpandBar checkNull (ExpandBar control) { return control; } -private void drawChevron (long /*int*/ hDC, RECT rect) { - long /*int*/ oldBrush = OS.SelectObject (hDC, OS.GetSysColorBrush (OS.COLOR_BTNFACE)); +private void drawChevron (long hDC, RECT rect) { + long oldBrush = OS.SelectObject (hDC, OS.GetSysColorBrush (OS.COLOR_BTNFACE)); OS.PatBlt (hDC, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, OS.PATCOPY); OS.SelectObject (hDC, oldBrush); rect.left += 4; rect.top += 4; rect.right -= 4; rect.bottom -= 4; - long /*int*/ hPen = OS.CreatePen (OS.PS_SOLID, 1, parent.getForegroundPixel ()); - long /*int*/ oldPen = OS.SelectObject (hDC, hPen); + long hPen = OS.CreatePen (OS.PS_SOLID, 1, parent.getForegroundPixel ()); + long oldPen = OS.SelectObject (hDC, hPen); int [] polyline1, polyline2; if (expanded) { int px = rect.left + 5; @@ -154,8 +154,8 @@ private void drawChevron (long /*int*/ hDC, RECT rect) { OS.Polyline (hDC, polyline1, polyline1.length / 2); OS.Polyline (hDC, polyline2, polyline2.length / 2); if (hover) { - long /*int*/ whitePen = OS.CreatePen (OS.PS_SOLID, 1, OS.GetSysColor (OS.COLOR_3DHILIGHT)); - long /*int*/ darkGrayPen = OS.CreatePen (OS.PS_SOLID, 1, OS.GetSysColor (OS.COLOR_3DSHADOW)); + long whitePen = OS.CreatePen (OS.PS_SOLID, 1, OS.GetSysColor (OS.COLOR_3DHILIGHT)); + long darkGrayPen = OS.CreatePen (OS.PS_SOLID, 1, OS.GetSysColor (OS.COLOR_3DSHADOW)); OS.SelectObject (hDC, whitePen); int [] points1 = { rect.left, rect.bottom, @@ -177,15 +177,15 @@ private void drawChevron (long /*int*/ hDC, RECT rect) { OS.DeleteObject (hPen); } -void drawItem (GC gc, long /*int*/ hTheme, RECT clipRect, boolean drawFocus) { - long /*int*/ hDC = gc.handle; +void drawItem (GC gc, long hTheme, RECT clipRect, boolean drawFocus) { + long hDC = gc.handle; int headerHeight = parent.getBandHeight (); RECT rect = new RECT (); OS.SetRect (rect, x, y, x + width, y + headerHeight); if (hTheme != 0) { OS.DrawThemeBackground (hTheme, hDC, OS.EBP_NORMALGROUPHEAD, 0, rect, clipRect); } else { - long /*int*/ oldBrush = OS.SelectObject (hDC, OS.GetSysColorBrush (OS.COLOR_BTNFACE)); + long oldBrush = OS.SelectObject (hDC, OS.GetSysColorBrush (OS.COLOR_BTNFACE)); OS.PatBlt (hDC, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, OS.PATCOPY); OS.SelectObject (hDC, oldBrush); } @@ -237,8 +237,8 @@ void drawItem (GC gc, long /*int*/ hTheme, RECT clipRect, boolean drawFocus) { } if (expanded) { if (!parent.isAppThemed ()) { - long /*int*/ pen = OS.CreatePen (OS.PS_SOLID, 1, OS.GetSysColor (OS.COLOR_BTNFACE)); - long /*int*/ oldPen = OS.SelectObject (hDC, pen); + long pen = OS.CreatePen (OS.PS_SOLID, 1, OS.GetSysColor (OS.COLOR_BTNFACE)); + long oldPen = OS.SelectObject (hDC, pen); int [] points = { x, y + headerHeight, x, y + headerHeight + height, @@ -342,7 +342,7 @@ public ExpandBar getParent () { return parent; } -int getPreferredWidth (long /*int*/ hTheme, long /*int*/ hDC) { +int getPreferredWidth (long hTheme, long hDC) { int width = ExpandItem.TEXT_INSET * 2 + ExpandItem.CHEVRON_SIZE; if (image != null) { width += ExpandItem.TEXT_INSET + imageWidth; @@ -366,7 +366,7 @@ boolean isHover (int x, int y) { } void redraw (boolean all) { - long /*int*/ parentHandle = parent.handle; + long parentHandle = parent.handle; int headerHeight = parent.getBandHeight (); RECT rect = new RECT (); int left = all ? x : x + width - headerHeight; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/FileDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/FileDialog.java index a04c0608cc..62c4a004d2 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/FileDialog.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/FileDialog.java @@ -197,20 +197,20 @@ public boolean getOverwrite () { return overwrite; } -long /*int*/ OFNHookProc (long /*int*/ hdlg, long /*int*/ uiMsg, long /*int*/ wParam, long /*int*/ lParam) { - switch ((int)/*64*/uiMsg) { +long OFNHookProc (long hdlg, long uiMsg, long wParam, long lParam) { + switch ((int)uiMsg) { case OS.WM_NOTIFY: OFNOTIFY ofn = new OFNOTIFY (); OS.MoveMemory (ofn, lParam, OFNOTIFY.sizeof); if (ofn.code == OS.CDN_SELCHANGE) { - int lResult = (int)/*64*/OS.SendMessage (ofn.hwndFrom, OS.CDM_GETSPEC, 0, 0); + int lResult = (int)OS.SendMessage (ofn.hwndFrom, OS.CDM_GETSPEC, 0, 0); if (lResult > 0) { lResult += OS.MAX_PATH; OPENFILENAME lpofn = new OPENFILENAME (); OS.MoveMemory (lpofn, ofn.lpOFN, OPENFILENAME.sizeof); if (lpofn.nMaxFile < lResult) { - long /*int*/ hHeap = OS.GetProcessHeap (); - long /*int*/ lpstrFile = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, lResult * TCHAR.sizeof); + long hHeap = OS.GetProcessHeap (); + long lpstrFile = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, lResult * TCHAR.sizeof); if (lpstrFile != 0) { if (lpofn.lpstrFile != 0) OS.HeapFree (hHeap, 0, lpofn.lpstrFile); lpofn.lpstrFile = lpstrFile; @@ -238,11 +238,11 @@ long /*int*/ OFNHookProc (long /*int*/ hdlg, long /*int*/ uiMsg, long /*int*/ wP * </ul> */ public String open () { - long /*int*/ hHeap = OS.GetProcessHeap (); + long hHeap = OS.GetProcessHeap (); /* Get the owner HWND for the dialog */ - long /*int*/ hwndOwner = parent.handle; - long /*int*/ hwndParent = parent.handle; + long hwndOwner = parent.handle; + long hwndParent = parent.handle; /* * Feature in Windows. There is no API to set the orientation of a @@ -275,7 +275,7 @@ public String open () { /* Use the character encoding for the default locale */ TCHAR buffer3 = new TCHAR (0, title, true); int byteCount3 = buffer3.length () * TCHAR.sizeof; - long /*int*/ lpstrTitle = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount3); + long lpstrTitle = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount3); OS.MoveMemory (lpstrTitle, buffer3, byteCount3); /* Compute filters and copy into lpstrFilter */ @@ -293,7 +293,7 @@ public String open () { /* Use the character encoding for the default locale */ TCHAR buffer4 = new TCHAR (0, strFilter, true); int byteCount4 = buffer4.length () * TCHAR.sizeof; - long /*int*/ lpstrFilter = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount4); + long lpstrFilter = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount4); OS.MoveMemory (lpstrFilter, buffer4, byteCount4); /* Convert the fileName and filterName to C strings */ @@ -308,7 +308,7 @@ public String open () { int nMaxFile = OS.MAX_PATH; if ((style & SWT.MULTI) != 0) nMaxFile = Math.max (nMaxFile, BUFFER_SIZE); int byteCount = nMaxFile * TCHAR.sizeof; - long /*int*/ lpstrFile = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); + long lpstrFile = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); int byteCountFile = Math.min (name.length () * TCHAR.sizeof, byteCount - TCHAR.sizeof); OS.MoveMemory (lpstrFile, name, byteCountFile); @@ -320,7 +320,7 @@ public String open () { /* Use the character encoding for the default locale */ TCHAR path = new TCHAR (0, filterPath.replace ('/', '\\'), true); int byteCount5 = OS.MAX_PATH * TCHAR.sizeof; - long /*int*/ lpstrInitialDir = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount5); + long lpstrInitialDir = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount5); int byteCountDir = Math.min (path.length () * TCHAR.sizeof, byteCount5 - TCHAR.sizeof); OS.MoveMemory (lpstrInitialDir, path, byteCountDir); @@ -335,7 +335,7 @@ public String open () { struct.Flags |= OS.OFN_ALLOWMULTISELECT | OS.OFN_EXPLORER | OS.OFN_ENABLESIZING; if (USE_HOOK) { callback = new Callback (this, "OFNHookProc", 4); //$NON-NLS-1$ - long /*int*/ lpfnHook = callback.getAddress (); + long lpfnHook = callback.getAddress (); if (lpfnHook == 0) error (SWT.ERROR_NO_MORE_CALLBACKS); struct.lpfnHook = lpfnHook; struct.Flags |= OS.OFN_ENABLEHOOK; @@ -355,7 +355,7 @@ public String open () { * empty, Windows uses the current value of the filter * extension at the time that the dialog is closed. */ - long /*int*/ lpstrDefExt = 0; + long lpstrDefExt = 0; if (save) { lpstrDefExt = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, TCHAR.sizeof); struct.lpstrDefExt = lpstrDefExt; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/FontDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/FontDialog.java index 2728b9f2dd..b987f3100e 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/FontDialog.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/FontDialog.java @@ -157,8 +157,8 @@ public RGB getRGB () { */ public FontData open () { /* Get the owner HWND for the dialog */ - long /*int*/ hwndOwner = parent.handle; - long /*int*/ hwndParent = parent.handle; + long hwndOwner = parent.handle; + long hwndParent = parent.handle; /* * Feature in Windows. There is no API to set the orientation of a @@ -187,7 +187,7 @@ public FontData open () { } /* Open the dialog */ - long /*int*/ hHeap = OS.GetProcessHeap (); + long hHeap = OS.GetProcessHeap (); CHOOSEFONT lpcf = new CHOOSEFONT (); lpcf.lStructSize = CHOOSEFONT.sizeof; lpcf.hwndOwner = hwndOwner; @@ -196,11 +196,11 @@ public FontData open () { lpcf.Flags |= OS.CF_EFFECTS; } - long /*int*/ lpLogFont = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, LOGFONT.sizeof); + long lpLogFont = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, LOGFONT.sizeof); if (fontData != null && fontData.data != null) { LOGFONT logFont = fontData.data; int lfHeight = logFont.lfHeight; - long /*int*/ hDC = OS.GetDC (0); + long hDC = OS.GetDC (0); int pixels = -(int)(0.5f + (fontData.height * OS.GetDeviceCaps(hDC, OS.LOGPIXELSY) / 72)); OS.ReleaseDC (0, hDC); logFont.lfHeight = pixels; @@ -243,7 +243,7 @@ public FontData open () { * This will not work on multiple screens or * for printing. Should use DC for the proper device. */ - long /*int*/ hDC = OS.GetDC(0); + long hDC = OS.GetDC(0); int logPixelsY = OS.GetDeviceCaps(hDC, OS.LOGPIXELSY); int pixels = 0; if (logFont.lfHeight > 0) { @@ -255,8 +255,8 @@ public FontData open () { * we must subtract the internal leading, which requires a TEXTMETRIC, * which in turn requires font creation. */ - long /*int*/ hFont = OS.CreateFontIndirect(logFont); - long /*int*/ oldFont = OS.SelectObject(hDC, hFont); + long hFont = OS.CreateFontIndirect(logFont); + long oldFont = OS.SelectObject(hDC, hFont); TEXTMETRIC lptm = new TEXTMETRIC (); OS.GetTextMetrics(hDC, lptm); OS.SelectObject(hDC, oldFont); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Group.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Group.java index 9cfb4ba2a0..0277d353de 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Group.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Group.java @@ -46,7 +46,7 @@ import org.eclipse.swt.internal.win32.*; public class Group extends Composite { String text = ""; static final int CLIENT_INSET = 3; - static final long /*int*/ GroupProc; + static final long GroupProc; static final TCHAR GroupClass = new TCHAR (0, "SWT_GROUP", true); static { /* @@ -61,7 +61,7 @@ public class Group extends Composite { TCHAR WC_BUTTON = new TCHAR (0, "BUTTON", true); OS.GetClassInfo (0, WC_BUTTON, lpWndClass); GroupProc = lpWndClass.lpfnWndProc; - long /*int*/ hInstance = OS.GetModuleHandle (null); + long hInstance = OS.GetModuleHandle (null); if (!OS.GetClassInfo (hInstance, GroupClass, lpWndClass)) { lpWndClass.hInstance = hInstance; lpWndClass.style &= ~(OS.CS_HREDRAW | OS.CS_VREDRAW); @@ -106,7 +106,7 @@ public Group (Composite parent, int style) { } @Override -long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) { +long callWindowProc (long hwnd, int msg, long wParam, long lParam) { if (handle == 0) return 0; /* * Feature in Windows. When the user clicks on the group @@ -150,8 +150,8 @@ protected void checkSubclass () { * client area, pad the width so the text is not clipped. */ char [] buffer = (string == null ? text : string).toCharArray (); - long /*int*/ newFont, oldFont = 0; - long /*int*/ hDC = OS.GetDC (handle); + long newFont, oldFont = 0; + long hDC = OS.GetDC (handle); newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont); RECT rect = new RECT (); @@ -168,8 +168,8 @@ protected void checkSubclass () { @Override Rectangle computeTrimInPixels (int x, int y, int width, int height) { checkWidget (); Rectangle trim = super.computeTrimInPixels (x, y, width, height); - long /*int*/ newFont, oldFont = 0; - long /*int*/ hDC = OS.GetDC (handle); + long newFont, oldFont = 0; + long hDC = OS.GetDC (handle); newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont); TEXTMETRIC tm = new TEXTMETRIC (); @@ -244,8 +244,8 @@ String fixText (boolean enabled) { forceResize (); RECT rect = new RECT (); OS.GetClientRect (handle, rect); - long /*int*/ newFont, oldFont = 0; - long /*int*/ hDC = OS.GetDC (handle); + long newFont, oldFont = 0; + long hDC = OS.GetDC (handle); newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont); TEXTMETRIC tm = new TEXTMETRIC (); @@ -294,7 +294,7 @@ boolean mnemonicMatch (char key) { } @Override -void printWidget (long /*int*/ hwnd, long /*int*/ hdc, GC gc) { +void printWidget (long hwnd, long hdc, GC gc) { /* * Bug in Windows. For some reason, PrintWindow() * returns success but does nothing when it is called @@ -343,7 +343,7 @@ void printWidget (long /*int*/ hwnd, long /*int*/ hdc, GC gc) { } else { OS.SetWindowOrgEx (hdc, -location.x, -location.y, null); } - long /*int*/ topHandle = children [i].topHandle(); + long topHandle = children [i].topHandle(); int bits = OS.GetWindowLong (topHandle, OS.GWL_STYLE); if ((bits & OS.WS_VISIBLE) != 0) { children [i].printWidget (topHandle, hdc, gc); @@ -448,12 +448,12 @@ TCHAR windowClass () { } @Override -long /*int*/ windowProc () { +long windowProc () { return GroupProc; } @Override -LRESULT WM_ERASEBKGND (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_ERASEBKGND (long wParam, long lParam) { LRESULT result = super.WM_ERASEBKGND (wParam, lParam); if (result != null) return result; /* @@ -466,7 +466,7 @@ LRESULT WM_ERASEBKGND (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_NCHITTEST (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_NCHITTEST (long wParam, long lParam) { LRESULT result = super.WM_NCHITTEST (wParam, lParam); if (result != null) return result; /* @@ -478,13 +478,13 @@ LRESULT WM_NCHITTEST (long /*int*/ wParam, long /*int*/ lParam) { * allow children, answer HTCLIENT to allow mouse messages * to be delivered to the children. */ - long /*int*/ code = callWindowProc (handle, OS.WM_NCHITTEST, wParam, lParam); + long code = callWindowProc (handle, OS.WM_NCHITTEST, wParam, lParam); if (code == OS.HTTRANSPARENT) code = OS.HTCLIENT; return new LRESULT (code); } @Override -LRESULT WM_MOUSEMOVE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_MOUSEMOVE (long wParam, long lParam) { LRESULT result = super.WM_MOUSEMOVE (wParam, lParam); if (result != null) return result; /* @@ -497,7 +497,7 @@ LRESULT WM_MOUSEMOVE (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_PAINT (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_PAINT (long wParam, long lParam) { LRESULT result = super.WM_PAINT(wParam, lParam); if (hasCustomForeground() && text.length () != 0) { @@ -505,12 +505,12 @@ LRESULT WM_PAINT (long /*int*/ wParam, long /*int*/ lParam) { char [] buffer = (string == null ? text : string).toCharArray (); // We cannot use BeginPaint and EndPaint, because that removes the group border - long /*int*/ hDC = OS.GetDC(handle); + long hDC = OS.GetDC(handle); RECT rect = new RECT (); OS.GetClientRect (handle, rect); rect.left += 3*CLIENT_INSET; - long /*int*/ newFont, oldFont = 0; + long newFont, oldFont = 0; newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont); @@ -531,7 +531,7 @@ LRESULT WM_PAINT (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_PRINTCLIENT (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_PRINTCLIENT (long wParam, long lParam) { LRESULT result = super.WM_PRINTCLIENT (wParam, lParam); if (result != null) return result; /* @@ -546,7 +546,7 @@ LRESULT WM_PRINTCLIENT (long /*int*/ wParam, long /*int*/ lParam) { */ if (OS.IsAppThemed ()) { int nSavedDC = OS.SaveDC (wParam); - long /*int*/ code = callWindowProc (handle, OS.WM_PRINTCLIENT, wParam, lParam); + long code = callWindowProc (handle, OS.WM_PRINTCLIENT, wParam, lParam); OS.RestoreDC (wParam, nSavedDC); return new LRESULT (code); } @@ -554,7 +554,7 @@ LRESULT WM_PRINTCLIENT (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_UPDATEUISTATE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_UPDATEUISTATE (long wParam, long lParam) { LRESULT result = super.WM_UPDATEUISTATE (wParam, lParam); if (result != null) return result; /* @@ -576,14 +576,14 @@ LRESULT WM_UPDATEUISTATE (long /*int*/ wParam, long /*int*/ lParam) { } if (redraw) { OS.InvalidateRect (handle, null, false); - long /*int*/ code = OS.DefWindowProc (handle, OS.WM_UPDATEUISTATE, wParam, lParam); + long code = OS.DefWindowProc (handle, OS.WM_UPDATEUISTATE, wParam, lParam); return new LRESULT (code); } return result; } @Override -LRESULT WM_WINDOWPOSCHANGING (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_WINDOWPOSCHANGING (long wParam, long lParam) { LRESULT result = super.WM_WINDOWPOSCHANGING (wParam, lParam); if (result != null) return result; /* diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/IME.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/IME.java index 8d1b099210..8216567bdd 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/IME.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/IME.java @@ -169,7 +169,7 @@ public int getCompositionOffset () { } TF_DISPLAYATTRIBUTE getDisplayAttribute (short langid, int attInfo) { - long /*int*/ [] pProfiles = new long /*int*/ [1]; + long [] pProfiles = new long [1]; int hr = OS.CoCreateInstance (CLSID_TF_InputProcessorProfiles, 0, OS.CLSCTX_INPROC_SERVER, IID_ITfInputProcessorProfiles, pProfiles); TF_DISPLAYATTRIBUTE pda = null; if (hr == OS.S_OK) { @@ -178,14 +178,14 @@ TF_DISPLAYATTRIBUTE getDisplayAttribute (short langid, int attInfo) { /* pProfiles.GetDefaultLanguageProfile () */ hr = OS.VtblCall (8, pProfiles [0], langid, GUID_TFCAT_TIP_KEYBOARD, pclsid, pguidProfile); if (hr == OS.S_OK) { - long /*int*/ [] pProvider = new long /*int*/ [1]; + long [] pProvider = new long [1]; hr = OS.CoCreateInstance (pclsid, 0, OS.CLSCTX_INPROC_SERVER, IID_ITfDisplayAttributeProvider, pProvider); if (hr == OS.S_OK) { - long /*int*/ [] pEnum = new long /*int*/ [1]; + long [] pEnum = new long [1]; /* pProvider.EnumDisplayAttributeInfo () */ hr = OS.VtblCall (3, pProvider [0], pEnum); if (hr == OS.S_OK) { - long /*int*/ [] pDispInfo = new long /*int*/ [1]; + long [] pDispInfo = new long [1]; TF_DISPLAYATTRIBUTE tempPda = new TF_DISPLAYATTRIBUTE (); /* pEnum.Next () */ while ((hr = OS.VtblCall (4, pEnum [0], 1, pDispInfo, (int[])null)) == OS.S_OK) { @@ -314,7 +314,7 @@ public String getText () { */ public boolean getWideCaret() { checkWidget (); - long /*int*/ layout = OS.GetKeyboardLayout (0); + long layout = OS.GetKeyboardLayout (0); short langID = (short)OS.LOWORD (layout); return OS.PRIMARYLANGID (langID) == OS.LANG_KOREAN; } @@ -362,13 +362,13 @@ public void setCompositionOffset (int offset) { } } -LRESULT WM_IME_COMPOSITION (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_IME_COMPOSITION (long wParam, long lParam) { if (!isInlineEnabled ()) return null; ranges = null; styles = null; caretOffset = commitCount = 0; - long /*int*/ hwnd = parent.handle; - long /*int*/ hIMC = OS.ImmGetContext (hwnd); + long hwnd = parent.handle; + long hIMC = OS.ImmGetContext (hwnd); if (hIMC != 0) { char [] buffer = null; if ((lParam & OS.GCS_RESULTSTR) != 0) { @@ -434,7 +434,7 @@ LRESULT WM_IME_COMPOSITION (long /*int*/ wParam, long /*int*/ lParam) { length = clauses.length - 1; ranges = new int [length * 2]; styles = new TextStyle [length]; - long /*int*/ layout = OS.GetKeyboardLayout (0); + long layout = OS.GetKeyboardLayout (0); short langID = (short)OS.LOWORD (layout); TF_DISPLAYATTRIBUTE attr = null; TextStyle style = null; @@ -519,20 +519,20 @@ LRESULT WM_IME_COMPOSITION (long /*int*/ wParam, long /*int*/ lParam) { return LRESULT.ONE; } -LRESULT WM_IME_COMPOSITION_START (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_IME_COMPOSITION_START (long wParam, long lParam) { return isInlineEnabled () ? LRESULT.ONE : null; } -LRESULT WM_IME_ENDCOMPOSITION (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_IME_ENDCOMPOSITION (long wParam, long lParam) { // Reset defaults. Otherwise the next composition overwrites the previous one. startOffset = -1; caretOffset = 0; return isInlineEnabled () ? LRESULT.ONE : null; } -LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_KEYDOWN (long wParam, long lParam) { if (wParam == OS.VK_HANJA) { - long /*int*/ hKL = OS.GetKeyboardLayout (0); + long hKL = OS.GetKeyboardLayout (0); short langID = (short)OS.LOWORD (hKL); if (OS.PRIMARYLANGID (langID) == OS.LANG_KOREAN) { Event event = new Event (); @@ -548,10 +548,10 @@ LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) { if (length > 1) { event.end = event.start + 1; } - long /*int*/ hwnd = parent.handle; - long /*int*/ hIMC = OS.ImmGetContext (hwnd); + long hwnd = parent.handle; + long hIMC = OS.ImmGetContext (hwnd); TCHAR buffer = new TCHAR (0, event.text, true); - long /*int*/ rc = OS.ImmEscape(hKL, hIMC, OS.IME_ESC_HANJA_MODE, buffer); + long rc = OS.ImmEscape(hKL, hIMC, OS.IME_ESC_HANJA_MODE, buffer); if (rc != 0) { sendEvent (SWT.ImeComposition, event); } @@ -561,10 +561,10 @@ LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) { return null; } -LRESULT WM_KILLFOCUS (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_KILLFOCUS (long wParam, long lParam) { if (!isInlineEnabled ()) return null; - long /*int*/ hwnd = parent.handle; - long /*int*/ hIMC = OS.ImmGetContext (hwnd); + long hwnd = parent.handle; + long hIMC = OS.ImmGetContext (hwnd); if (hIMC != 0) { if (OS.ImmGetOpenStatus (hIMC)) { OS.ImmNotifyIME (hIMC, OS.NI_COMPOSITIONSTR, OS.CPS_COMPLETE, 0); @@ -574,10 +574,10 @@ LRESULT WM_KILLFOCUS (long /*int*/ wParam, long /*int*/ lParam) { return null; } -LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_LBUTTONDOWN (long wParam, long lParam) { if (!isInlineEnabled ()) return null; - long /*int*/ hwnd = parent.handle; - long /*int*/ hIMC = OS.ImmGetContext (hwnd); + long hwnd = parent.handle; + long hIMC = OS.ImmGetContext (hwnd); if (hIMC != 0) { if (OS.ImmGetOpenStatus (hIMC)) { if (OS.ImmGetCompositionString (hIMC, OS.GCS_COMPSTR, (char [])null, 0) > 0) { @@ -588,10 +588,10 @@ LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) { int offset = event.index; int length = text.length(); if (offset != -1 && startOffset != -1 && startOffset <= offset && offset < startOffset + length) { - long /*int*/ imeWnd = OS.ImmGetDefaultIMEWnd (hwnd); + long imeWnd = OS.ImmGetDefaultIMEWnd (hwnd); offset = event.index + event.count - startOffset; int trailing = event.count > 0 ? 1 : 2; - long /*int*/ param = OS.MAKEWPARAM (OS.MAKEWORD (OS.IMEMOUSE_LDOWN, trailing), offset); + long param = OS.MAKEWPARAM (OS.MAKEWORD (OS.IMEMOUSE_LDOWN, trailing), offset); OS.SendMessage (imeWnd, WM_MSIME_MOUSE, param, hIMC); } else { OS.ImmNotifyIME (hIMC, OS.NI_COMPOSITIONSTR, OS.CPS_COMPLETE, 0); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Label.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Label.java index 4c8ddfeaec..57fef708ef 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Label.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Label.java @@ -56,7 +56,7 @@ public class Label extends Control { Image image; static final int MARGIN = 4; static /*final*/ boolean IMAGE_AND_TEXT = false; - static final long /*int*/ LabelProc; + static final long LabelProc; static final TCHAR LabelClass = new TCHAR (0, "STATIC", true); static { WNDCLASS lpWndClass = new WNDCLASS (); @@ -106,7 +106,7 @@ public Label (Composite parent, int style) { } @Override -long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) { +long callWindowProc (long hwnd, int msg, long wParam, long lParam) { if (handle == 0) return 0; /* * Feature in Windows 7. When the user double clicks @@ -162,9 +162,9 @@ static int checkStyle (int style) { } } if (drawText) { - long /*int*/ hDC = OS.GetDC (handle); - long /*int*/ newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); - long /*int*/ oldFont = OS.SelectObject (hDC, newFont); + long hDC = OS.GetDC (handle); + long newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); + long oldFont = OS.SelectObject (hDC, newFont); int length = OS.GetWindowTextLength (handle); if (length == 0) { TEXTMETRIC tm = new TEXTMETRIC (); @@ -452,12 +452,12 @@ TCHAR windowClass () { } @Override -long /*int*/ windowProc () { +long windowProc () { return LabelProc; } @Override -LRESULT WM_ERASEBKGND (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_ERASEBKGND (long wParam, long lParam) { LRESULT result = super.WM_ERASEBKGND (wParam, lParam); if (result != null) return result; int bits = OS.GetWindowLong (handle, OS.GWL_STYLE); @@ -468,7 +468,7 @@ LRESULT WM_ERASEBKGND (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SIZE (long wParam, long lParam) { LRESULT result = super.WM_SIZE (wParam, lParam); if (isDisposed ()) return result; if ((style & SWT.SEPARATOR) != 0) { @@ -495,7 +495,7 @@ LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_UPDATEUISTATE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_UPDATEUISTATE (long wParam, long lParam) { LRESULT result = super.WM_UPDATEUISTATE (wParam, lParam); if (result != null) return result; /* @@ -516,14 +516,14 @@ LRESULT WM_UPDATEUISTATE (long /*int*/ wParam, long /*int*/ lParam) { } if (redraw) { OS.InvalidateRect (handle, null, false); - long /*int*/ code = OS.DefWindowProc (handle, OS.WM_UPDATEUISTATE, wParam, lParam); + long code = OS.DefWindowProc (handle, OS.WM_UPDATEUISTATE, wParam, lParam); return new LRESULT (code); } return result; } @Override -LRESULT wmDrawChild (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmDrawChild (long wParam, long lParam) { DRAWITEMSTRUCT struct = new DRAWITEMSTRUCT (); OS.MoveMemory (struct, lParam, DRAWITEMSTRUCT.sizeof); drawBackground (struct.hDC); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Link.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Link.java index ac3355efa4..1a1ee086d3 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Link.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Link.java @@ -48,7 +48,7 @@ public class Link extends Control { int linkForeground = -1; String [] ids; char [] mnemonics; - static final long /*int*/ LinkProc; + static final long LinkProc; static final TCHAR LinkClass = new TCHAR (0, OS.WC_LINK, true); static { WNDCLASS lpWndClass = new WNDCLASS (); @@ -141,7 +141,7 @@ public void addSelectionListener (SelectionListener listener) { } @Override -long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) { +long callWindowProc (long hwnd, int msg, long wParam, long lParam) { if (handle == 0) return 0; /* * Feature in Windows. By convention, native Windows controls @@ -169,9 +169,9 @@ Point computeSizeInPixels (int wHint, int hHint, boolean changed) { * but SWT convention is to return zero width and line height. */ if (text.isEmpty()) { - long /*int*/ hDC = OS.GetDC (handle); - long /*int*/ newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); - long /*int*/ oldFont = OS.SelectObject (hDC, newFont); + long hDC = OS.GetDC (handle); + long newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); + long oldFont = OS.SelectObject (hDC, newFont); TEXTMETRIC lptm = new TEXTMETRIC (); OS.GetTextMetrics (hDC, lptm); width = 0; @@ -457,7 +457,7 @@ boolean setFocusItem (int index) { } item.iLink = index; item.state = OS.LIS_FOCUSED; - long /*int*/ result = OS.SendMessage (handle, OS.LM_SETITEM, 0, item); + long result = OS.SendMessage (handle, OS.LM_SETITEM, 0, item); /* Feature in Windows. For some reason, setting the focus to * any item but first causes the control to clear the WS_TABSTOP @@ -579,15 +579,15 @@ TCHAR windowClass () { } @Override -long /*int*/ windowProc () { +long windowProc () { return LinkProc; } @Override -LRESULT WM_CHAR (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_CHAR (long wParam, long lParam) { LRESULT result = super.WM_CHAR (wParam, lParam); if (result != null) return result; - switch ((int)/*64*/wParam) { + switch ((int)wParam) { case ' ': case SWT.CR: case SWT.TAB: @@ -597,15 +597,15 @@ LRESULT WM_CHAR (long /*int*/ wParam, long /*int*/ lParam) { * This allows the application to cancel an operation that is normally * performed in WM_KEYDOWN from WM_CHAR. */ - long /*int*/ code = callWindowProc (handle, OS.WM_KEYDOWN, wParam, lParam); + long code = callWindowProc (handle, OS.WM_KEYDOWN, wParam, lParam); return new LRESULT (code); } return result; } @Override -LRESULT WM_GETDLGCODE (long /*int*/ wParam, long /*int*/ lParam) { - long /*int*/ code = callWindowProc (handle, OS.WM_GETDLGCODE, wParam, lParam); +LRESULT WM_GETDLGCODE (long wParam, long lParam) { + long code = callWindowProc (handle, OS.WM_GETDLGCODE, wParam, lParam); int count = ids.length; if (count == 0) { code |= OS.DLGC_STATIC; @@ -619,10 +619,10 @@ LRESULT WM_GETDLGCODE (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_KEYDOWN (long wParam, long lParam) { LRESULT result = super.WM_KEYDOWN (wParam, lParam); if (result != null) return result; - switch ((int)/*64*/wParam) { + switch ((int)wParam) { case OS.VK_SPACE: case OS.VK_RETURN: case OS.VK_TAB: @@ -638,7 +638,7 @@ LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_KILLFOCUS (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_KILLFOCUS (long wParam, long lParam) { int focusItem = getFocusItem(); LRESULT result = super.WM_KILLFOCUS(wParam, lParam); if (focusItem != -1) setFocusItem(focusItem); @@ -646,7 +646,7 @@ LRESULT WM_KILLFOCUS (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_NCHITTEST (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_NCHITTEST (long wParam, long lParam) { LRESULT result = super.WM_NCHITTEST (wParam, lParam); if (result != null) return result; @@ -659,17 +659,17 @@ LRESULT WM_NCHITTEST (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_SETCURSOR(long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SETCURSOR(long wParam, long lParam) { LRESULT result = super.WM_SETCURSOR (wParam, lParam); if (result != null) return result; - long /*int*/ fDone = callWindowProc (handle, OS.WM_SETCURSOR, wParam, lParam); + long fDone = callWindowProc (handle, OS.WM_SETCURSOR, wParam, lParam); /* Take responsibility for cursor over plain text after overriding WM_NCHITTEST. */ if (fDone == 0) OS.DefWindowProc (handle, OS.WM_SETCURSOR, wParam, lParam); return LRESULT.ONE; } @Override -LRESULT WM_SETFOCUS (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SETFOCUS (long wParam, long lParam) { /* * Feature in Windows. Upon receiving focus, SysLink control * always activates the first link. This leads to surprising @@ -685,7 +685,7 @@ LRESULT WM_SETFOCUS (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmNotifyChild (NMHDR hdr, long wParam, long lParam) { switch (hdr.code) { case OS.NM_RETURN: case OS.NM_CLICK: diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/List.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/List.java index e393f1abcd..604da205ed 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/List.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/List.java @@ -43,7 +43,7 @@ import org.eclipse.swt.internal.win32.*; */ public class List extends Scrollable { static final int INSET = 3; - static final long /*int*/ ListProc; + static final long ListProc; static final TCHAR ListClass = new TCHAR (0, "LISTBOX", true); boolean addedUCC = false; // indicates whether Bidi UCC were added; 'state & HAS_AUTO_DIRECTION' isn't a sufficient indicator static { @@ -106,7 +106,7 @@ public void add (String string) { checkWidget (); if (string == null) error (SWT.ERROR_NULL_ARGUMENT); TCHAR buffer = new TCHAR (getCodePage (), string, true); - int result = (int)/*64*/OS.SendMessage (handle, OS.LB_ADDSTRING, 0, buffer); + int result = (int)OS.SendMessage (handle, OS.LB_ADDSTRING, 0, buffer); if (result == OS.LB_ERR) error (SWT.ERROR_ITEM_NOT_ADDED); if (result == OS.LB_ERRSPACE) error (SWT.ERROR_ITEM_NOT_ADDED); if ((style & SWT.H_SCROLL) != 0) setScrollWidth (buffer.chars, true); @@ -142,10 +142,10 @@ public void add (String string, int index) { if (string == null) error (SWT.ERROR_NULL_ARGUMENT); if (index == -1) error (SWT.ERROR_INVALID_RANGE); TCHAR buffer = new TCHAR (getCodePage (), string, true); - int result = (int)/*64*/OS.SendMessage (handle, OS.LB_INSERTSTRING, index, buffer); + int result = (int)OS.SendMessage (handle, OS.LB_INSERTSTRING, index, buffer); if (result == OS.LB_ERRSPACE) error (SWT.ERROR_ITEM_NOT_ADDED); if (result == OS.LB_ERR) { - int count = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); if (0 <= index && index <= count) { error (SWT.ERROR_ITEM_NOT_ADDED); } else { @@ -188,7 +188,7 @@ public void addSelectionListener(SelectionListener listener) { } @Override -long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) { +long callWindowProc (long hwnd, int msg, long wParam, long lParam) { if (handle == 0) return 0; boolean redraw = false; switch (msg) { @@ -199,7 +199,7 @@ long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, lo break; } } - long /*int*/ code = OS.CallWindowProc (ListProc, hwnd, msg, wParam, lParam); + long code = OS.CallWindowProc (ListProc, hwnd, msg, wParam, lParam); switch (msg) { case OS.WM_HSCROLL: case OS.WM_VSCROLL: { @@ -222,24 +222,24 @@ static int checkStyle (int style) { int width = 0, height = 0; if (wHint == SWT.DEFAULT) { if ((style & SWT.H_SCROLL) != 0) { - width = (int)/*64*/OS.SendMessage (handle, OS.LB_GETHORIZONTALEXTENT, 0, 0); + width = (int)OS.SendMessage (handle, OS.LB_GETHORIZONTALEXTENT, 0, 0); width -= INSET; } else { - int count = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); - long /*int*/ newFont, oldFont = 0; - long /*int*/ hDC = OS.GetDC (handle); + int count = (int)OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); + long newFont, oldFont = 0; + long hDC = OS.GetDC (handle); newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont); RECT rect = new RECT (); int flags = OS.DT_CALCRECT | OS.DT_SINGLELINE | OS.DT_NOPREFIX; char [] buffer = new char [64 + 1]; for (int i=0; i<count; i++) { - int length = (int)/*64*/OS.SendMessage (handle, OS.LB_GETTEXTLEN, i, 0); + int length = (int)OS.SendMessage (handle, OS.LB_GETTEXTLEN, i, 0); if (length != OS.LB_ERR) { if (length + 1 > buffer.length) { buffer = new char [length + 1]; } - int result = (int)/*64*/OS.SendMessage (handle, OS.LB_GETTEXT, i, buffer); + int result = (int)OS.SendMessage (handle, OS.LB_GETTEXT, i, buffer); if (result != OS.LB_ERR) { OS.DrawText (hDC, buffer, length, rect, flags); width = Math.max (width, rect.right - rect.left); @@ -251,8 +251,8 @@ static int checkStyle (int style) { } } if (hHint == SWT.DEFAULT) { - int count = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); - int itemHeight = (int)/*64*/OS.SendMessage (handle, OS.LB_GETITEMHEIGHT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); + int itemHeight = (int)OS.SendMessage (handle, OS.LB_GETITEMHEIGHT, 0, 0); height = count * itemHeight; } if (width == 0) width = DEFAULT_WIDTH; @@ -298,7 +298,7 @@ public void deselect (int [] indices) { if (indices == null) error (SWT.ERROR_NULL_ARGUMENT); if (indices.length == 0) return; if ((style & SWT.SINGLE) != 0) { - int oldIndex = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCURSEL, 0, 0); + int oldIndex = (int)OS.SendMessage (handle, OS.LB_GETCURSEL, 0, 0); if (oldIndex == OS.LB_ERR) return; for (int i=0; i<indices.length; i++) { if (oldIndex == indices [i]) { @@ -332,7 +332,7 @@ public void deselect (int index) { checkWidget (); if (index == -1) return; if ((style & SWT.SINGLE) != 0) { - int oldIndex = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCURSEL, 0, 0); + int oldIndex = (int)OS.SendMessage (handle, OS.LB_GETCURSEL, 0, 0); if (oldIndex == OS.LB_ERR) return; if (oldIndex == index) OS.SendMessage (handle, OS.LB_SETCURSEL, -1, 0); return; @@ -359,7 +359,7 @@ public void deselect (int start, int end) { checkWidget (); if (start > end) return; if ((style & SWT.SINGLE) != 0) { - int oldIndex = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCURSEL, 0, 0); + int oldIndex = (int)OS.SendMessage (handle, OS.LB_GETCURSEL, 0, 0); if (oldIndex == OS.LB_ERR) return; if (start <= oldIndex && oldIndex <= end) { OS.SendMessage (handle, OS.LB_SETCURSEL, -1, 0); @@ -372,7 +372,7 @@ public void deselect (int start, int end) { * start = end, LB_SELITEMRANGEEX deselects the * item. */ - int count = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); if (start < 0 && end < 0) return; if (start >= count && end >= count) return; start = Math.min (count - 1, Math.max (0, start)); @@ -410,9 +410,9 @@ public void deselectAll () { */ public int getFocusIndex () { checkWidget (); - int result = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCARETINDEX, 0, 0); + int result = (int)OS.SendMessage (handle, OS.LB_GETCARETINDEX, 0, 0); if (result == 0) { - int count = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); if (count == 0) return -1; } return result; @@ -435,13 +435,13 @@ public int getFocusIndex () { */ public String getItem (int index) { checkWidget (); - int length = (int)/*64*/OS.SendMessage (handle, OS.LB_GETTEXTLEN, index, 0); + int length = (int)OS.SendMessage (handle, OS.LB_GETTEXTLEN, index, 0); if (length != OS.LB_ERR) { char [] buffer = new char [length + 1]; - int result = (int)/*64*/OS.SendMessage (handle, OS.LB_GETTEXT, index, buffer); + int result = (int)OS.SendMessage (handle, OS.LB_GETTEXT, index, buffer); if (result != OS.LB_ERR) return ((state & HAS_AUTO_DIRECTION) != 0) ? new String (buffer, 1, length - 1) : new String (buffer, 0, length); } - int count = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); if (0 <= index && index < count) error (SWT.ERROR_CANNOT_GET_ITEM); error (SWT.ERROR_INVALID_RANGE); return ""; @@ -459,7 +459,7 @@ public String getItem (int index) { */ public int getItemCount () { checkWidget (); - int result = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); + int result = (int)OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); if (result == OS.LB_ERR) error (SWT.ERROR_CANNOT_GET_COUNT); return result; } @@ -481,7 +481,7 @@ public int getItemHeight () { } int getItemHeightInPixels () { - int result = (int)/*64*/OS.SendMessage (handle, OS.LB_GETITEMHEIGHT, 0, 0); + int result = (int)OS.SendMessage (handle, OS.LB_GETITEMHEIGHT, 0, 0); if (result == OS.LB_ERR) error (SWT.ERROR_CANNOT_GET_ITEM_HEIGHT); return result; } @@ -549,11 +549,11 @@ public String [] getSelection () { public int getSelectionCount () { checkWidget (); if ((style & SWT.SINGLE) != 0) { - int result = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCURSEL, 0, 0); + int result = (int)OS.SendMessage (handle, OS.LB_GETCURSEL, 0, 0); if (result == OS.LB_ERR) return 0; return 1; } - int result = (int)/*64*/OS.SendMessage (handle, OS.LB_GETSELCOUNT, 0, 0); + int result = (int)OS.SendMessage (handle, OS.LB_GETSELCOUNT, 0, 0); if (result == OS.LB_ERR) error (SWT.ERROR_CANNOT_GET_COUNT); return result; } @@ -572,17 +572,17 @@ public int getSelectionCount () { public int getSelectionIndex () { checkWidget (); if ((style & SWT.SINGLE) != 0) { - return (int)/*64*/OS.SendMessage (handle, OS.LB_GETCURSEL, 0, 0); + return (int)OS.SendMessage (handle, OS.LB_GETCURSEL, 0, 0); } - int count = (int)/*64*/OS.SendMessage (handle, OS.LB_GETSELCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.LB_GETSELCOUNT, 0, 0); if (count == OS.LB_ERR) error (SWT.ERROR_CANNOT_GET_SELECTION); if (count == 0) return -1; - int index = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCARETINDEX, 0, 0); - int result = (int)/*64*/OS.SendMessage (handle, OS.LB_GETSEL, index, 0); + int index = (int)OS.SendMessage (handle, OS.LB_GETCARETINDEX, 0, 0); + int result = (int)OS.SendMessage (handle, OS.LB_GETSEL, index, 0); if (result == OS.LB_ERR) error (SWT.ERROR_CANNOT_GET_SELECTION); if (result != 0) return index; int [] buffer = new int[1]; - result = (int)/*64*/OS.SendMessage (handle, OS.LB_GETSELITEMS, 1, buffer); + result = (int)OS.SendMessage (handle, OS.LB_GETSELITEMS, 1, buffer); if (result != 1) error (SWT.ERROR_CANNOT_GET_SELECTION); return buffer [0]; } @@ -606,14 +606,14 @@ public int getSelectionIndex () { public int [] getSelectionIndices () { checkWidget (); if ((style & SWT.SINGLE) != 0) { - int result = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCURSEL, 0, 0); + int result = (int)OS.SendMessage (handle, OS.LB_GETCURSEL, 0, 0); if (result == OS.LB_ERR) return new int [0]; return new int [] {result}; } - int length = (int)/*64*/OS.SendMessage (handle, OS.LB_GETSELCOUNT, 0, 0); + int length = (int)OS.SendMessage (handle, OS.LB_GETSELCOUNT, 0, 0); if (length == OS.LB_ERR) error (SWT.ERROR_CANNOT_GET_SELECTION); int [] indices = new int [length]; - int result = (int)/*64*/OS.SendMessage (handle, OS.LB_GETSELITEMS, length, indices); + int result = (int)OS.SendMessage (handle, OS.LB_GETSELITEMS, length, indices); if (result != length) error (SWT.ERROR_CANNOT_GET_SELECTION); return indices; } @@ -632,7 +632,7 @@ public int [] getSelectionIndices () { */ public int getTopIndex () { checkWidget (); - return (int)/*64*/OS.SendMessage (handle, OS.LB_GETTOPINDEX, 0, 0); + return (int)OS.SendMessage (handle, OS.LB_GETTOPINDEX, 0, 0); } /** @@ -696,12 +696,12 @@ public int indexOf (String string, int start) { } /* Use LB_FINDSTRINGEXACT to search for the item */ - int count = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); if (!(0 <= start && start < count)) return -1; int index = start - 1, last; TCHAR buffer = new TCHAR (getCodePage (), string, true); do { - index = (int)/*64*/OS.SendMessage (handle, OS.LB_FINDSTRINGEXACT, last = index, buffer); + index = (int)OS.SendMessage (handle, OS.LB_FINDSTRINGEXACT, last = index, buffer); if (index == OS.LB_ERR || index <= last) return -1; } while (!string.equals (getItem (index))); return index; @@ -722,7 +722,7 @@ public int indexOf (String string, int start) { */ public boolean isSelected (int index) { checkWidget (); - int result = (int)/*64*/OS.SendMessage (handle, OS.LB_GETSEL, index, 0); + int result = (int)OS.SendMessage (handle, OS.LB_GETSEL, index, 0); return (result != 0) && (result != OS.LB_ERR); } @@ -749,13 +749,13 @@ public void remove (int [] indices) { System.arraycopy (indices, 0, newIndices, 0, indices.length); sort (newIndices); int start = newIndices [newIndices.length - 1], end = newIndices [0]; - int count = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); if (!(0 <= start && start <= end && end < count)) { error (SWT.ERROR_INVALID_RANGE); } - int topIndex = (int)/*64*/OS.SendMessage (handle, OS.LB_GETTOPINDEX, 0, 0); + int topIndex = (int)OS.SendMessage (handle, OS.LB_GETTOPINDEX, 0, 0); RECT rect = null; - long /*int*/ hDC = 0, oldFont = 0, newFont = 0; + long hDC = 0, oldFont = 0, newFont = 0; int newWidth = 0; if ((style & SWT.H_SCROLL) != 0) { rect = new RECT (); @@ -770,13 +770,13 @@ public void remove (int [] indices) { char [] buffer = null; int length = 0; if ((style & SWT.H_SCROLL) != 0) { - length = (int)/*64*/OS.SendMessage (handle, OS.LB_GETTEXTLEN, index, 0); + length = (int)OS.SendMessage (handle, OS.LB_GETTEXTLEN, index, 0); if (length == OS.LB_ERR) break; buffer = new char [length + 1]; - int result = (int)/*64*/OS.SendMessage (handle, OS.LB_GETTEXT, index, buffer); + int result = (int)OS.SendMessage (handle, OS.LB_GETTEXT, index, buffer); if (result == OS.LB_ERR) break; } - int result = (int)/*64*/OS.SendMessage (handle, OS.LB_DELETESTRING, index, 0); + int result = (int)OS.SendMessage (handle, OS.LB_DELETESTRING, index, 0); if (result == OS.LB_ERR) break; if ((style & SWT.H_SCROLL) != 0) { int flags = OS.DT_CALCRECT | OS.DT_SINGLELINE | OS.DT_NOPREFIX; @@ -818,24 +818,24 @@ public void remove (int index) { checkWidget (); char [] buffer = null; if ((style & SWT.H_SCROLL) != 0) { - int length = (int)/*64*/OS.SendMessage (handle, OS.LB_GETTEXTLEN, index, 0); + int length = (int)OS.SendMessage (handle, OS.LB_GETTEXTLEN, index, 0); if (length == OS.LB_ERR) { - int count = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); if (0 <= index && index < count) error (SWT.ERROR_ITEM_NOT_REMOVED); error (SWT.ERROR_INVALID_RANGE); } buffer = new char [length + 1]; - int result = (int)/*64*/OS.SendMessage (handle, OS.LB_GETTEXT, index, buffer); + int result = (int)OS.SendMessage (handle, OS.LB_GETTEXT, index, buffer); if (result == OS.LB_ERR) { - int count = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); if (0 <= index && index < count) error (SWT.ERROR_ITEM_NOT_REMOVED); error (SWT.ERROR_INVALID_RANGE); } } - int topIndex = (int)/*64*/OS.SendMessage (handle, OS.LB_GETTOPINDEX, 0, 0); - int result = (int)/*64*/OS.SendMessage (handle, OS.LB_DELETESTRING, index, 0); + int topIndex = (int)OS.SendMessage (handle, OS.LB_GETTOPINDEX, 0, 0); + int result = (int)OS.SendMessage (handle, OS.LB_DELETESTRING, index, 0); if (result == OS.LB_ERR) { - int count = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); if (0 <= index && index < count) error (SWT.ERROR_ITEM_NOT_REMOVED); error (SWT.ERROR_INVALID_RANGE); } @@ -865,7 +865,7 @@ public void remove (int index) { public void remove (int start, int end) { checkWidget (); if (start > end) return; - int count = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); if (!(0 <= start && start <= end && end < count)) { error (SWT.ERROR_INVALID_RANGE); } @@ -873,9 +873,9 @@ public void remove (int start, int end) { removeAll (); return; } - int topIndex = (int)/*64*/OS.SendMessage (handle, OS.LB_GETTOPINDEX, 0, 0); + int topIndex = (int)OS.SendMessage (handle, OS.LB_GETTOPINDEX, 0, 0); RECT rect = null; - long /*int*/ hDC = 0, oldFont = 0, newFont = 0; + long hDC = 0, oldFont = 0, newFont = 0; int newWidth = 0; if ((style & SWT.H_SCROLL) != 0) { rect = new RECT (); @@ -889,13 +889,13 @@ public void remove (int start, int end) { char [] buffer = null; int length = 0; if ((style & SWT.H_SCROLL) != 0) { - length = (int)/*64*/OS.SendMessage (handle, OS.LB_GETTEXTLEN, start, 0); + length = (int)OS.SendMessage (handle, OS.LB_GETTEXTLEN, start, 0); if (length == OS.LB_ERR) break; buffer = new char [length + 1]; - int result = (int)/*64*/OS.SendMessage (handle, OS.LB_GETTEXT, start, buffer); + int result = (int)OS.SendMessage (handle, OS.LB_GETTEXT, start, buffer); if (result == OS.LB_ERR) break; } - int result = (int)/*64*/OS.SendMessage (handle, OS.LB_DELETESTRING, start, 0); + int result = (int)OS.SendMessage (handle, OS.LB_DELETESTRING, start, 0); if (result == OS.LB_ERR) break; if ((style & SWT.H_SCROLL) != 0) { OS.DrawText (hDC, buffer, length, rect, flags); @@ -1041,7 +1041,7 @@ public void select (int index) { void select (int index, boolean scroll) { if (index < 0) return; - int count = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); if (index >= count) return; if (scroll) { if ((style & SWT.SINGLE) != 0) { @@ -1051,7 +1051,7 @@ void select (int index, boolean scroll) { } return; } - int topIndex = (int)/*64*/OS.SendMessage (handle, OS.LB_GETTOPINDEX, 0, 0); + int topIndex = (int)OS.SendMessage (handle, OS.LB_GETTOPINDEX, 0, 0); RECT itemRect = new RECT (), selectedRect = null; OS.SendMessage (handle, OS.LB_GETITEMRECT, index, itemRect); boolean redraw = getDrawing () && OS.IsWindowVisible (handle); @@ -1061,14 +1061,14 @@ void select (int index, boolean scroll) { } int focusIndex = -1; if ((style & SWT.SINGLE) != 0) { - int oldIndex = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCURSEL, 0, 0); + int oldIndex = (int)OS.SendMessage (handle, OS.LB_GETCURSEL, 0, 0); if (oldIndex != -1) { selectedRect = new RECT (); OS.SendMessage (handle, OS.LB_GETITEMRECT, oldIndex, selectedRect); } OS.SendMessage (handle, OS.LB_SETCURSEL, index, 0); } else { - focusIndex = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCARETINDEX, 0, 0); + focusIndex = (int)OS.SendMessage (handle, OS.LB_GETCARETINDEX, 0, 0); OS.SendMessage (handle, OS.LB_SETSEL, 1, index); } if ((style & SWT.MULTI) != 0) { @@ -1112,7 +1112,7 @@ void select (int index, boolean scroll) { public void select (int start, int end) { checkWidget (); if (end < 0 || start > end || ((style & SWT.SINGLE) != 0 && start != end)) return; - int count = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); if (count == 0 || start >= count) return; start = Math.max (0, start); end = Math.min (end, count - 1); @@ -1154,7 +1154,7 @@ public void selectAll () { void setFocusIndex (int index) { // checkWidget (); - int count = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); if (!(0 <= index && index < count)) return; OS.SendMessage (handle, OS.LB_SETCARETINDEX, index, 0); } @@ -1213,14 +1213,14 @@ public void setItems (String... items) { for (int i=0; i<items.length; i++) { if (items [i] == null) error (SWT.ERROR_INVALID_ARGUMENT); } - long /*int*/ oldProc = OS.GetWindowLongPtr (handle, OS.GWLP_WNDPROC); + long oldProc = OS.GetWindowLongPtr (handle, OS.GWLP_WNDPROC); OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, ListProc); boolean redraw = getDrawing () && OS.IsWindowVisible (handle); if (redraw) { OS.SendMessage (handle, OS.WM_SETREDRAW, 0, 0); } RECT rect = null; - long /*int*/ hDC = 0, oldFont = 0, newFont = 0; + long hDC = 0, oldFont = 0, newFont = 0; int newWidth = 0; if ((style & SWT.H_SCROLL) != 0) { rect = new RECT (); @@ -1237,7 +1237,7 @@ public void setItems (String... items) { while (index < length) { String string = items [index]; TCHAR buffer = new TCHAR (cp, string, true); - int result = (int)/*64*/OS.SendMessage (handle, OS.LB_ADDSTRING, 0, buffer); + int result = (int)OS.SendMessage (handle, OS.LB_ADDSTRING, 0, buffer); if (result == OS.LB_ERR || result == OS.LB_ERRSPACE) break; if ((style & SWT.H_SCROLL) != 0) { int flags = OS.DT_CALCRECT | OS.DT_SINGLELINE | OS.DT_NOPREFIX; @@ -1271,17 +1271,17 @@ public void setItems (String... items) { void setScrollWidth () { int newWidth = 0; RECT rect = new RECT (); - long /*int*/ newFont, oldFont = 0; - long /*int*/ hDC = OS.GetDC (handle); + long newFont, oldFont = 0; + long hDC = OS.GetDC (handle); newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont); - int count = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); int flags = OS.DT_CALCRECT | OS.DT_SINGLELINE | OS.DT_NOPREFIX; for (int i=0; i<count; i++) { - int length = (int)/*64*/OS.SendMessage (handle, OS.LB_GETTEXTLEN, i, 0); + int length = (int)OS.SendMessage (handle, OS.LB_GETTEXTLEN, i, 0); if (length != OS.LB_ERR) { char [] buffer = new char [length + 1]; - int result = (int)/*64*/OS.SendMessage (handle, OS.LB_GETTEXT, i, buffer); + int result = (int)OS.SendMessage (handle, OS.LB_GETTEXT, i, buffer); if (result != OS.LB_ERR) { OS.DrawText (hDC, buffer, length, rect, flags); newWidth = Math.max (newWidth, rect.right - rect.left); @@ -1295,8 +1295,8 @@ void setScrollWidth () { void setScrollWidth (char[] buffer, boolean grow) { RECT rect = new RECT (); - long /*int*/ newFont, oldFont = 0; - long /*int*/ hDC = OS.GetDC (handle); + long newFont, oldFont = 0; + long hDC = OS.GetDC (handle); newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont); int flags = OS.DT_CALCRECT | OS.DT_SINGLELINE | OS.DT_NOPREFIX; @@ -1308,7 +1308,7 @@ void setScrollWidth (char[] buffer, boolean grow) { void setScrollWidth (int newWidth, boolean grow) { newWidth += INSET; - int width = (int)/*64*/OS.SendMessage (handle, OS.LB_GETHORIZONTALEXTENT, 0, 0); + int width = (int)OS.SendMessage (handle, OS.LB_GETHORIZONTALEXTENT, 0, 0); if (grow) { if (newWidth <= width) return; OS.SendMessage (handle, OS.LB_SETHORIZONTALEXTENT, newWidth, 0); @@ -1456,7 +1456,7 @@ public void setSelection (int start, int end) { checkWidget (); deselectAll (); if (end < 0 || start > end || ((style & SWT.SINGLE) != 0 && start != end)) return; - int count = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); if (count == 0 || start >= count) return; start = Math.max (0, start); end = Math.min (end, count - 1); @@ -1482,9 +1482,9 @@ public void setSelection (int start, int end) { */ public void setTopIndex (int index) { checkWidget (); - int result = (int)/*64*/OS.SendMessage (handle, OS.LB_SETTOPINDEX, index, 0); + int result = (int)OS.SendMessage (handle, OS.LB_SETTOPINDEX, index, 0); if (result == OS.LB_ERR) { - int count = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); index = Math.min (count - 1, Math.max (0, index)); OS.SendMessage (handle, OS.LB_SETTOPINDEX, index, 0); } @@ -1504,21 +1504,21 @@ public void showSelection () { checkWidget (); int index; if ((style & SWT.SINGLE) != 0) { - index = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCURSEL, 0, 0); + index = (int)OS.SendMessage (handle, OS.LB_GETCURSEL, 0, 0); } else { int [] indices = new int [1]; - int result = (int)/*64*/OS.SendMessage (handle, OS.LB_GETSELITEMS, 1, indices); + int result = (int)OS.SendMessage (handle, OS.LB_GETSELITEMS, 1, indices); index = indices [0]; if (result != 1) index = -1; } if (index == -1) return; - int count = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); if (count == 0) return; - int height = (int)/*64*/OS.SendMessage (handle, OS.LB_GETITEMHEIGHT, 0, 0); + int height = (int)OS.SendMessage (handle, OS.LB_GETITEMHEIGHT, 0, 0); forceResize (); RECT rect = new RECT (); OS.GetClientRect (handle, rect); - int topIndex = (int)/*64*/OS.SendMessage (handle, OS.LB_GETTOPINDEX, 0, 0); + int topIndex = (int)OS.SendMessage (handle, OS.LB_GETTOPINDEX, 0, 0); int visibleCount = Math.max (rect.bottom / height, 1); int bottomIndex = Math.min (topIndex + visibleCount, count) - 1; if (topIndex <= index && index <= bottomIndex) return; @@ -1533,18 +1533,18 @@ void updateMenuLocation (Event event) { int focusIndex = getFocusIndex(); if (focusIndex != -1) { RECT rect = new RECT (); - long /*int*/ newFont, oldFont = 0; - long /*int*/ hDC = OS.GetDC (handle); + long newFont, oldFont = 0; + long hDC = OS.GetDC (handle); newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont); int flags = OS.DT_CALCRECT | OS.DT_SINGLELINE | OS.DT_NOPREFIX; char [] buffer = new char [64 + 1]; - int length = (int)/*64*/OS.SendMessage (handle, OS.LB_GETTEXTLEN, focusIndex, 0); + int length = (int)OS.SendMessage (handle, OS.LB_GETTEXTLEN, focusIndex, 0); if (length != OS.LB_ERR) { if (length + 1 > buffer.length) { buffer = new char [length + 1]; } - int result = (int)/*64*/OS.SendMessage (handle, OS.LB_GETTEXT, focusIndex, buffer); + int result = (int)OS.SendMessage (handle, OS.LB_GETTEXT, focusIndex, buffer); if (result != OS.LB_ERR) { OS.DrawText (hDC, buffer, length, rect, flags); } @@ -1574,12 +1574,12 @@ boolean updateTextDirection (int textDirection) { return super.updateTextDirection (textDirection); } } - int count = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); if (count == OS.LB_ERR) return false; - int selection = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCURSEL, 0, 0); + int selection = (int)OS.SendMessage (handle, OS.LB_GETCURSEL, 0, 0); addedUCC = false; while (count-- > 0) { - int length = (int)/*64*/OS.SendMessage (handle, OS.LB_GETTEXTLEN, count, 0); + int length = (int)OS.SendMessage (handle, OS.LB_GETTEXTLEN, count, 0); if (length == OS.LB_ERR) break; if (length == 0) continue; char [] buffer = new char [length + 1]; @@ -1615,12 +1615,12 @@ TCHAR windowClass () { } @Override -long /*int*/ windowProc () { +long windowProc () { return ListProc; } @Override -long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) { +long windowProc (long hwnd, int msg, long wParam, long lParam) { /* Below code is to support auto text direction. */ if (handle != 0 && lParam != 0 && (state & HAS_AUTO_DIRECTION) != 0) { switch (msg) { @@ -1643,11 +1643,11 @@ long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long / } string = (direction == SWT.RIGHT_TO_LEFT ? RLE : LRE) + string; buffer = new TCHAR (cp, string, true); - long /*int*/ hHeap = OS.GetProcessHeap (); + long hHeap = OS.GetProcessHeap (); length = buffer.length() * TCHAR.sizeof; - long /*int*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, length); + long pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, length); OS.MoveMemory (pszText, buffer, length); - long /*int*/ code = super.windowProc (hwnd, msg, wParam, pszText); + long code = super.windowProc (hwnd, msg, wParam, pszText); OS.HeapFree (hHeap, 0, pszText); addedUCC = true; return code; @@ -1657,7 +1657,7 @@ long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long / } @Override -LRESULT WM_CHAR (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_CHAR (long wParam, long lParam) { LRESULT result = super.WM_CHAR (wParam, lParam); if (result != null) return result; /* @@ -1669,10 +1669,10 @@ LRESULT WM_CHAR (long /*int*/ wParam, long /*int*/ lParam) { if (OS.GetKeyState (OS.VK_CONTROL) < 0 && OS.GetKeyState (OS.VK_SHIFT) >= 0) { int bits = OS.GetWindowLong (handle, OS.GWL_STYLE); if ((bits & OS.LBS_EXTENDEDSEL) != 0) { - switch ((int)/*64*/wParam) { + switch ((int)wParam) { case OS.VK_SPACE: { - int index = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCARETINDEX, 0, 0); - int code = (int)/*64*/OS.SendMessage (handle, OS.LB_GETSEL, index, 0); + int index = (int)OS.SendMessage (handle, OS.LB_GETCARETINDEX, 0, 0); + int code = (int)OS.SendMessage (handle, OS.LB_GETSEL, index, 0); if (code == OS.LB_ERR) break; OS.SendMessage (handle, OS.LB_SETSEL, code != 0 ? 0 : 1, index); OS.SendMessage (handle, OS.LB_SETANCHORINDEX, index, 0); @@ -1686,7 +1686,7 @@ LRESULT WM_CHAR (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_KEYDOWN (long wParam, long lParam) { LRESULT result = super.WM_KEYDOWN (wParam, lParam); if (result != null) return result; /* @@ -1699,7 +1699,7 @@ LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) { int bits = OS.GetWindowLong (handle, OS.GWL_STYLE); if ((bits & OS.LBS_EXTENDEDSEL) != 0) { int newIndex = -1; - switch ((int)/*64*/wParam) { + switch ((int)wParam) { case OS.VK_SPACE: { /* * Ensure that the window proc does not process VK_SPACE @@ -1711,32 +1711,32 @@ LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) { } case OS.VK_UP: case OS.VK_DOWN: { - int oldIndex = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCARETINDEX, 0, 0); - newIndex = Math.max (0, oldIndex + (((int)/*64*/wParam) == OS.VK_UP ? -1 : 1)); + int oldIndex = (int)OS.SendMessage (handle, OS.LB_GETCARETINDEX, 0, 0); + newIndex = Math.max (0, oldIndex + (((int)wParam) == OS.VK_UP ? -1 : 1)); break; } case OS.VK_PRIOR: { - int topIndex = (int)/*64*/OS.SendMessage (handle, OS.LB_GETTOPINDEX, 0, 0); - int oldIndex = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCARETINDEX, 0, 0); + int topIndex = (int)OS.SendMessage (handle, OS.LB_GETTOPINDEX, 0, 0); + int oldIndex = (int)OS.SendMessage (handle, OS.LB_GETCARETINDEX, 0, 0); if (oldIndex != topIndex) { newIndex = topIndex; } else { forceResize (); RECT rect = new RECT (); OS.GetClientRect (handle, rect); - int itemHeight = (int)/*64*/OS.SendMessage (handle, OS.LB_GETITEMHEIGHT, 0, 0); + int itemHeight = (int)OS.SendMessage (handle, OS.LB_GETITEMHEIGHT, 0, 0); int pageSize = Math.max (2, (rect.bottom / itemHeight)); newIndex = Math.max (0, topIndex - (pageSize - 1)); } break; } case OS.VK_NEXT: { - int topIndex = (int)/*64*/OS.SendMessage (handle, OS.LB_GETTOPINDEX, 0, 0); - int oldIndex = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCARETINDEX, 0, 0); + int topIndex = (int)OS.SendMessage (handle, OS.LB_GETTOPINDEX, 0, 0); + int oldIndex = (int)OS.SendMessage (handle, OS.LB_GETCARETINDEX, 0, 0); forceResize (); RECT rect = new RECT (); OS.GetClientRect (handle, rect); - int itemHeight = (int)/*64*/OS.SendMessage (handle, OS.LB_GETITEMHEIGHT, 0, 0); + int itemHeight = (int)OS.SendMessage (handle, OS.LB_GETITEMHEIGHT, 0, 0); int pageSize = Math.max (2, (rect.bottom / itemHeight)); int bottomIndex = topIndex + pageSize - 1; if (oldIndex != bottomIndex) { @@ -1744,7 +1744,7 @@ LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) { } else { newIndex = bottomIndex + pageSize - 1; } - int count = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); if (count != OS.LB_ERR) newIndex = Math.min (count - 1, newIndex); break; } @@ -1753,7 +1753,7 @@ LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) { break; } case OS.VK_END: { - int count = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0); if (count == OS.LB_ERR) break; newIndex = count - 1; break; @@ -1767,7 +1767,7 @@ LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) { * the focus indicator changes as a result of something * the user types. */ - int uiState = (int)/*64*/OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); + int uiState = (int)OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); if ((uiState & OS.UISF_HIDEFOCUS) != 0) { OS.SendMessage (handle, OS.WM_CHANGEUISTATE, OS.UIS_INITIALIZE, 0); /* @@ -1778,7 +1778,7 @@ LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) { * control. */ RECT itemRect = new RECT (); - int oldIndex = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCARETINDEX, 0, 0); + int oldIndex = (int)OS.SendMessage (handle, OS.LB_GETCARETINDEX, 0, 0); OS.SendMessage (handle, OS.LB_GETITEMRECT, oldIndex, itemRect); OS.InvalidateRect (handle, itemRect, true); } @@ -1791,7 +1791,7 @@ LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_SETREDRAW (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SETREDRAW (long wParam, long lParam) { LRESULT result = super.WM_SETREDRAW (wParam, lParam); if (result != null) return result; /* @@ -1805,7 +1805,7 @@ LRESULT WM_SETREDRAW (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SIZE (long wParam, long lParam) { /* * Bug in Windows. If the top index is changed while the * list is being resized, Windows does not redraw properly @@ -1818,7 +1818,7 @@ LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) { * is to redraw the control when the horizontal scroll bar is * not at the beginning. */ - int oldIndex = (int)/*64*/OS.SendMessage (handle, OS.LB_GETTOPINDEX, 0, 0); + int oldIndex = (int)OS.SendMessage (handle, OS.LB_GETTOPINDEX, 0, 0); LRESULT result = super.WM_SIZE (wParam, lParam); if (!isDisposed ()) { SCROLLINFO info = new SCROLLINFO (); @@ -1827,14 +1827,14 @@ LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) { if (OS.GetScrollInfo (handle, OS.SB_HORZ, info)) { if (info.nPos != 0) OS.InvalidateRect (handle, null, true); } - int newIndex = (int)/*64*/OS.SendMessage (handle, OS.LB_GETTOPINDEX, 0, 0); + int newIndex = (int)OS.SendMessage (handle, OS.LB_GETTOPINDEX, 0, 0); if (oldIndex != newIndex) OS.InvalidateRect (handle, null, true); } return result; } @Override -LRESULT wmCommandChild (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmCommandChild (long wParam, long lParam) { int code = OS.HIWORD (wParam); switch (code) { case OS.LBN_SELCHANGE: diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Menu.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Menu.java index 3f4b7dcd23..0d55d5aef1 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Menu.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Menu.java @@ -55,10 +55,10 @@ public class Menu extends Widget { * * @noreference This field is not intended to be referenced by clients. */ - public long /*int*/ handle; + public long handle; int x, y; - long /*int*/ hBrush; + long hBrush; int id0, id1; int foreground = -1, background = -1; Image backgroundImage; @@ -195,7 +195,7 @@ public Menu (MenuItem parentItem) { this (checkNull (parentItem).parent); } -Menu (Decorations parent, int style, long /*int*/ handle) { +Menu (Decorations parent, int style, long handle) { super (parent, checkStyle (style)); this.parent = parent; this.handle = handle; @@ -219,7 +219,7 @@ Menu (Decorations parent, int style, long /*int*/ handle) { void _setVisible (boolean visible) { if ((style & (SWT.BAR | SWT.DROP_DOWN)) != 0) return; - long /*int*/ hwndParent = parent.handle; + long hwndParent = parent.handle; if (visible) { int flags = OS.TPM_LEFTBUTTON; if (OS.GetKeyState (OS.VK_LBUTTON) >= 0) flags |= OS.TPM_RIGHTBUTTON; @@ -264,7 +264,7 @@ void _setVisible (boolean visible) { * is not returned to the focus control. This causes confusion for AT users. * The fix is to explicitly set the accessibility focus back to the focus control. */ - long /*int*/ hFocus = OS.GetFocus(); + long hFocus = OS.GetFocus(); if (hFocus != 0) { OS.NotifyWinEvent (OS.EVENT_OBJECT_FOCUS, hFocus, OS.OBJID_CLIENT, 0); } @@ -368,8 +368,8 @@ void createItem (MenuItem item, int index) { * becomes unexpectedly disabled. The fix is to insert a * space. */ - long /*int*/ hHeap = OS.GetProcessHeap (); - long /*int*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, 4); + long hHeap = OS.GetProcessHeap (); + long pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, 4); OS.MoveMemory (pszText, new char [] {' ', '\0'}, 4); MENUITEMINFO info = new MENUITEMINFO (); info.cbSize = MENUITEMINFO.sizeof; @@ -429,7 +429,7 @@ void destroyItem (MenuItem item) { @Override void destroyWidget () { MenuItem cascade = this.cascade; - long /*int*/ hMenu = handle; + long hMenu = handle; releaseHandle (); if (cascade != null) { cascade.setMenu (null, true); @@ -511,7 +511,7 @@ void fixMenus (Decorations newParent) { if (parent.menuBar != this) { return new Rectangle (0, 0, 0, 0); } - long /*int*/ hwndShell = parent.handle; + long hwndShell = parent.handle; MENUBARINFO info = new MENUBARINFO (); info.cbSize = MENUBARINFO.sizeof; if (OS.GetMenuBarInfo (hwndShell, OS.OBJID_MENU, 0, info)) { @@ -620,7 +620,7 @@ public MenuItem getItem (int index) { if (!OS.GetMenuItemInfo (handle, index, true, info)) { error (SWT.ERROR_INVALID_RANGE); } - id = (int)/*64*/info.dwItemData; + id = (int)info.dwItemData; return display.getMenuItem (id); } @@ -673,7 +673,7 @@ public MenuItem [] getItems () { System.arraycopy (items, 0, newItems, 0, count); items = newItems; } - MenuItem item = display.getMenuItem ((int)/*64*/info.dwItemData); + MenuItem item = display.getMenuItem ((int)info.dwItemData); if (item != null) items [count++] = item; index++; } @@ -1334,7 +1334,7 @@ void updateForeground () { redraw (); } -LRESULT wmTimer (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmTimer (long wParam, long lParam) { if (wParam == ID_TOOLTIP_TIMER) { POINT pt = new POINT (); OS.GetCursorPos (pt); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MenuItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MenuItem.java index e29920f5dc..66b24b1eb3 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MenuItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MenuItem.java @@ -41,7 +41,7 @@ import org.eclipse.swt.internal.win32.*; */ public class MenuItem extends Item { Menu parent, menu; - long /*int*/ hBitmap; + long hBitmap; int id, accelerator, userId, index; ToolTip itemToolTip; /* Image margin. */ @@ -267,7 +267,7 @@ boolean fillAccel (ACCEL accel) { if (key == 0) return false; vKey = OS.VkKeyScan ((short) key); if (vKey == -1) { - if (key != (int)/*64*/OS.CharUpper ((short) key)) { + if (key != (int)OS.CharUpper ((short) key)) { fVirt = 0; } } else { @@ -330,7 +330,7 @@ public int getAccelerator () { if (shell.menuBar != parent) { return new Rectangle (0, 0, 0, 0); } - long /*int*/ hwndShell = shell.handle; + long hwndShell = shell.handle; MENUBARINFO info1 = new MENUBARINFO (); info1.cbSize = MENUBARINFO.sizeof; if (!OS.GetMenuBarInfo (hwndShell, OS.OBJID_MENU, 1, info1)) { @@ -347,7 +347,7 @@ public int getAccelerator () { int height = info2.bottom - info2.top; return new Rectangle (x, y, width, height); } else { - long /*int*/ hMenu = parent.handle; + long hMenu = parent.handle; RECT rect1 = new RECT (); if (!OS.GetMenuItemRect (0, hMenu, 0, rect1)) { return new Rectangle (0, 0, 0, 0); @@ -390,7 +390,7 @@ public boolean getEnabled () { if ((style & SWT.SEPARATOR) != 0) { return (state & DISABLED) == 0; } - long /*int*/ hMenu = parent.handle; + long hMenu = parent.handle; MENUITEMINFO info = new MENUITEMINFO (); info.cbSize = MENUITEMINFO.sizeof; info.fMask = OS.MIIM_STATE; @@ -474,7 +474,7 @@ public Menu getParent () { public boolean getSelection () { checkWidget (); if ((style & (SWT.CHECK | SWT.RADIO)) == 0) return false; - long /*int*/ hMenu = parent.handle; + long hMenu = parent.handle; MENUITEMINFO info = new MENUITEMINFO (); info.cbSize = MENUITEMINFO.sizeof; info.fMask = OS.MIIM_STATE; @@ -700,7 +700,7 @@ public void setEnabled (boolean enabled) { state |= DISABLED; } } - long /*int*/ hMenu = parent.handle; + long hMenu = parent.handle; MENUITEMINFO info = new MENUITEMINFO (); info.cbSize = MENUITEMINFO.sizeof; info.fMask = OS.MIIM_STATE; @@ -793,7 +793,7 @@ public void setImage (Image image) { info.hbmpItem = image != null ? OS.HBMMENU_CALLBACK : 0; } } - long /*int*/ hMenu = parent.handle; + long hMenu = parent.handle; OS.SetMenuItemInfo (hMenu, id, false, info); parent.redraw (); } @@ -850,7 +850,7 @@ void setMenu (Menu menu, boolean dispose) { if (oldMenu != null) oldMenu.cascade = null; this.menu = menu; - long /*int*/ hMenu = parent.handle; + long hMenu = parent.handle; MENUITEMINFO info = new MENUITEMINFO (); info.cbSize = MENUITEMINFO.sizeof; info.fMask = OS.MIIM_DATA; @@ -861,9 +861,9 @@ void setMenu (Menu menu, boolean dispose) { } if (info.dwItemData != id) return; int cch = 128; - long /*int*/ hHeap = OS.GetProcessHeap (); + long hHeap = OS.GetProcessHeap (); int byteCount = cch * 2; - long /*int*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); + long pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); info.fMask = OS.MIIM_STATE | OS.MIIM_ID | OS.MIIM_DATA; /* * Bug in Windows. When GetMenuItemInfo() is used to get the text, @@ -913,7 +913,7 @@ boolean setRadioSelection (boolean value) { } void setOrientation (int orientation) { - long /*int*/ hMenu = parent.handle; + long hMenu = parent.handle; MENUITEMINFO info = new MENUITEMINFO (); info.cbSize = MENUITEMINFO.sizeof; info.fMask = OS.MIIM_FTYPE; @@ -938,7 +938,7 @@ void setOrientation (int orientation) { public void setSelection (boolean selected) { checkWidget (); if ((style & (SWT.CHECK | SWT.RADIO)) == 0) return; - long /*int*/ hMenu = parent.handle; + long hMenu = parent.handle; MENUITEMINFO info = new MENUITEMINFO (); info.cbSize = MENUITEMINFO.sizeof; info.fMask = OS.MIIM_STATE; @@ -1008,11 +1008,11 @@ public void setText (String string) { if ((style & SWT.SEPARATOR) != 0) return; if (text.equals (string)) return; super.setText (string); - long /*int*/ hHeap = OS.GetProcessHeap (); - long /*int*/ pszText = 0; + long hHeap = OS.GetProcessHeap (); + long pszText = 0; MENUITEMINFO info = new MENUITEMINFO (); info.cbSize = MENUITEMINFO.sizeof; - long /*int*/ hMenu = parent.handle; + long hMenu = parent.handle; /* Use the character encoding for the default locale */ TCHAR buffer = new TCHAR (0, string, true); @@ -1104,7 +1104,7 @@ int widgetStyle () { return bits | OS.MFT_STRING; } -LRESULT wmCommandChild (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmCommandChild (long wParam, long lParam) { if ((style & SWT.CHECK) != 0) { setSelection (!getSelection ()); } else { @@ -1120,7 +1120,7 @@ LRESULT wmCommandChild (long /*int*/ wParam, long /*int*/ lParam) { return null; } -LRESULT wmDrawChild (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmDrawChild (long wParam, long lParam) { DRAWITEMSTRUCT struct = new DRAWITEMSTRUCT (); OS.MoveMemory (struct, lParam, DRAWITEMSTRUCT.sizeof); if (image != null) { @@ -1143,7 +1143,7 @@ LRESULT wmDrawChild (long /*int*/ wParam, long /*int*/ lParam) { return null; } -LRESULT wmMeasureChild (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmMeasureChild (long wParam, long lParam) { MEASUREITEMSTRUCT struct = new MEASUREITEMSTRUCT (); OS.MoveMemory (struct, lParam, MEASUREITEMSTRUCT.sizeof); int width = 0, height = 0; @@ -1165,7 +1165,7 @@ LRESULT wmMeasureChild (long /*int*/ wParam, long /*int*/ lParam) { MENUINFO lpcmi = new MENUINFO (); lpcmi.cbSize = MENUINFO.sizeof; lpcmi.fMask = OS.MIM_STYLE; - long /*int*/ hMenu = parent.handle; + long hMenu = parent.handle; OS.GetMenuInfo (hMenu, lpcmi); if ((lpcmi.dwStyle & OS.MNS_CHECKORBMP) == 0) { MenuItem [] items = parent.getItems (); @@ -1193,7 +1193,7 @@ private static final class MenuItemToolTip extends ToolTip { } @Override - long /*int*/ hwndToolTip() { + long hwndToolTip() { return parent.menuItemToolTipHandle(); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MessageBox.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MessageBox.java index 4c045bd894..dc0a2f0b01 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MessageBox.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MessageBox.java @@ -186,7 +186,7 @@ public int open () { * anyway and not rely on MB_MODAL to work by making the * parent be temporarily modal. */ - long /*int*/ hwndOwner = parent != null ? parent.handle : 0; + long hwndOwner = parent != null ? parent.handle : 0; Display display = parent != null ? parent.getDisplay (): Display.getCurrent (); Dialog oldModal = null; if ((bits & OS.MB_TASKMODAL) != 0) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ProgressBar.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ProgressBar.java index 739c790e01..c761b0a2f8 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ProgressBar.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ProgressBar.java @@ -43,7 +43,7 @@ public class ProgressBar extends Control { static final int DELAY = 100; static final int TIMER_ID = 100; static final int MINIMUM_WIDTH = 100; - static final long /*int*/ ProgressBarProc; + static final long ProgressBarProc; static final TCHAR ProgressBarClass = new TCHAR (0, OS.PROGRESS_CLASS, true); static { WNDCLASS lpWndClass = new WNDCLASS (); @@ -108,7 +108,7 @@ public ProgressBar (Composite parent, int style) { } @Override -long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) { +long callWindowProc (long hwnd, int msg, long wParam, long lParam) { if (handle == 0) return 0; return OS.CallWindowProc (ProgressBarProc, hwnd, msg, wParam, lParam); } @@ -157,7 +157,7 @@ int defaultForeground () { */ public int getMaximum () { checkWidget (); - return (int)/*64*/OS.SendMessage (handle, OS.PBM_GETRANGE, 0, 0); + return (int)OS.SendMessage (handle, OS.PBM_GETRANGE, 0, 0); } /** @@ -172,7 +172,7 @@ public int getMaximum () { */ public int getMinimum () { checkWidget (); - return (int)/*64*/OS.SendMessage (handle, OS.PBM_GETRANGE, 1, 0); + return (int)OS.SendMessage (handle, OS.PBM_GETRANGE, 1, 0); } /** @@ -187,7 +187,7 @@ public int getMinimum () { */ public int getSelection () { checkWidget (); - return (int)/*64*/OS.SendMessage (handle, OS.PBM_GETPOS, 0, 0); + return (int)OS.SendMessage (handle, OS.PBM_GETPOS, 0, 0); } /** @@ -209,7 +209,7 @@ public int getSelection () { */ public int getState () { checkWidget (); - int state = (int)/*64*/OS.SendMessage (handle, OS.PBM_GETSTATE, 0, 0); + int state = (int)OS.SendMessage (handle, OS.PBM_GETSTATE, 0, 0); switch (state) { case OS.PBST_NORMAL: return SWT.NORMAL; case OS.PBST_ERROR: return SWT.ERROR; @@ -273,7 +273,7 @@ void setForegroundPixel (int pixel) { */ public void setMaximum (int value) { checkWidget (); - int minimum = (int)/*64*/OS.SendMessage (handle, OS.PBM_GETRANGE, 1, 0); + int minimum = (int)OS.SendMessage (handle, OS.PBM_GETRANGE, 1, 0); if (0 <= minimum && minimum < value) { OS.SendMessage (handle, OS.PBM_SETRANGE32, minimum, value); } @@ -294,7 +294,7 @@ public void setMaximum (int value) { */ public void setMinimum (int value) { checkWidget (); - int maximum = (int)/*64*/OS.SendMessage (handle, OS.PBM_GETRANGE, 0, 0); + int maximum = (int)OS.SendMessage (handle, OS.PBM_GETRANGE, 0, 0); if (0 <= value && value < maximum) { OS.SendMessage (handle, OS.PBM_SETRANGE32, value, maximum); } @@ -322,7 +322,7 @@ public void setSelection (int value) { * PBM_SETPOS. This is undocumented. The fix is to call PBM_SETPOS * a second time. */ - long /*int*/ state = OS.SendMessage (handle, OS.PBM_GETSTATE, 0, 0); + long state = OS.SendMessage (handle, OS.PBM_GETSTATE, 0, 0); if (state != OS.PBST_NORMAL) { OS.SendMessage (handle, OS.PBM_SETPOS, value, 0); } @@ -379,12 +379,12 @@ TCHAR windowClass () { } @Override -long /*int*/ windowProc () { +long windowProc () { return ProgressBarProc; } @Override -LRESULT WM_GETDLGCODE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_GETDLGCODE (long wParam, long lParam) { LRESULT result = super.WM_GETDLGCODE (wParam, lParam); if (result != null) return result; /* @@ -400,7 +400,7 @@ LRESULT WM_GETDLGCODE (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SIZE (long wParam, long lParam) { LRESULT result = super.WM_SIZE (wParam, lParam); if (result != null) return result; /* @@ -437,7 +437,7 @@ LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_TIMER (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_TIMER (long wParam, long lParam) { LRESULT result = super.WM_TIMER (wParam, lParam); if (result != null) return result; if ((style & SWT.INDETERMINATE) != 0) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Sash.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Sash.java index 886379ba00..59eb302b26 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Sash.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Sash.java @@ -114,7 +114,7 @@ public void addSelectionListener (SelectionListener listener) { } @Override -long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) { +long callWindowProc (long hwnd, int msg, long wParam, long lParam) { if (handle == 0) return 0; return OS.DefWindowProc (hwnd, msg, wParam, lParam); } @@ -145,12 +145,12 @@ static int checkStyle (int style) { void drawBand (int x, int y, int width, int height) { if ((style & SWT.SMOOTH) != 0) return; - long /*int*/ hwndTrack = parent.handle; + long hwndTrack = parent.handle; byte [] bits = {-86, 0, 85, 0, -86, 0, 85, 0, -86, 0, 85, 0, -86, 0, 85, 0}; - long /*int*/ stippleBitmap = OS.CreateBitmap (8, 8, 1, 1, bits); - long /*int*/ stippleBrush = OS.CreatePatternBrush (stippleBitmap); - long /*int*/ hDC = OS.GetDCEx (hwndTrack, 0, OS.DCX_CACHE); - long /*int*/ oldBrush = OS.SelectObject (hDC, stippleBrush); + long stippleBitmap = OS.CreateBitmap (8, 8, 1, 1, bits); + long stippleBrush = OS.CreatePatternBrush (stippleBitmap); + long hDC = OS.GetDCEx (hwndTrack, 0, OS.DCX_CACHE); + long oldBrush = OS.SelectObject (hDC, stippleBrush); OS.PatBlt (hDC, x, y, width, height, OS.PATINVERT); OS.SelectObject (hDC, oldBrush); OS.ReleaseDC (hwndTrack, hDC); @@ -189,22 +189,22 @@ TCHAR windowClass () { } @Override -long /*int*/ windowProc () { +long windowProc () { return display.windowProc; } @Override -LRESULT WM_ERASEBKGND (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_ERASEBKGND (long wParam, long lParam) { super.WM_ERASEBKGND (wParam, lParam); drawBackground (wParam); return LRESULT.ONE; } @Override -LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_KEYDOWN (long wParam, long lParam) { LRESULT result = super.WM_KEYDOWN (wParam, lParam); if (result != null) return result; - switch ((int)/*64*/wParam) { + switch ((int)wParam) { case OS.VK_LEFT: case OS.VK_RIGHT: case OS.VK_UP: @@ -225,7 +225,7 @@ LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) { OS.GetWindowRect (handle, rect); int width = rect.right - rect.left; int height = rect.bottom - rect.top; - long /*int*/ hwndTrack = parent.handle; + long hwndTrack = parent.handle; RECT clientRect = new RECT (); OS.GetClientRect (hwndTrack, clientRect); int clientWidth = clientRect.right - clientRect.left; @@ -261,17 +261,17 @@ LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_GETDLGCODE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_GETDLGCODE (long wParam, long lParam) { return new LRESULT (OS.DLGC_STATIC); } @Override -LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_LBUTTONDOWN (long wParam, long lParam) { LRESULT result = super.WM_LBUTTONDOWN (wParam, lParam); if (result == LRESULT.ZERO) return result; /* Compute the banding rectangle */ - long /*int*/ hwndTrack = parent.handle; + long hwndTrack = parent.handle; POINT pt = new POINT (); OS.POINTSTOPOINT (pt, lParam); RECT rect = new RECT (); @@ -314,7 +314,7 @@ LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_LBUTTONUP (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_LBUTTONUP (long wParam, long lParam) { LRESULT result = super.WM_LBUTTONUP (wParam, lParam); if (result == LRESULT.ZERO) return result; @@ -343,7 +343,7 @@ LRESULT WM_LBUTTONUP (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_MOUSEMOVE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_MOUSEMOVE (long wParam, long lParam) { LRESULT result = super.WM_MOUSEMOVE (wParam, lParam); if (result != null) return result; if (!dragging || (wParam & OS.MK_LBUTTON) == 0) return result; @@ -351,7 +351,7 @@ LRESULT WM_MOUSEMOVE (long /*int*/ wParam, long /*int*/ lParam) { /* Compute the banding rectangle */ POINT pt = new POINT (); OS.POINTSTOPOINT (pt, lParam); - long /*int*/ hwndTrack = parent.handle; + long hwndTrack = parent.handle; OS.MapWindowPoints (handle, hwndTrack, pt, 1); RECT rect = new RECT (), clientRect = new RECT (); OS.GetWindowRect (handle, rect); @@ -393,12 +393,12 @@ LRESULT WM_MOUSEMOVE (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_SETCURSOR (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SETCURSOR (long wParam, long lParam) { LRESULT result = super.WM_SETCURSOR (wParam, lParam); if (result != null) return result; int hitTest = (short) OS.LOWORD (lParam); if (hitTest == OS.HTCLIENT) { - long /*int*/ hCursor = 0; + long hCursor = 0; if ((style & SWT.HORIZONTAL) != 0) { hCursor = OS.LoadCursor (0, OS.IDC_SIZENS); } else { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Scale.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Scale.java index b5119af1ff..65d41a87af 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Scale.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Scale.java @@ -43,7 +43,7 @@ import org.eclipse.swt.internal.win32.*; */ public class Scale extends Control { boolean ignoreResize, ignoreSelection; - static final long /*int*/ TrackBarProc; + static final long TrackBarProc; static final TCHAR TrackBarClass = new TCHAR (0, OS.TRACKBAR_CLASS, true); boolean createdAsRTL; static { @@ -138,7 +138,7 @@ public void addSelectionListener(SelectionListener listener) { } @Override -long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) { +long callWindowProc (long hwnd, int msg, long wParam, long lParam) { if (handle == 0) return 0; return OS.CallWindowProc (TrackBarProc, hwnd, msg, wParam, lParam); } @@ -196,7 +196,7 @@ int defaultForeground () { */ public int getIncrement () { checkWidget (); - return (int)/*64*/OS.SendMessage (handle, OS.TBM_GETLINESIZE, 0, 0); + return (int)OS.SendMessage (handle, OS.TBM_GETLINESIZE, 0, 0); } /** @@ -211,7 +211,7 @@ public int getIncrement () { */ public int getMaximum () { checkWidget (); - return (int)/*64*/OS.SendMessage (handle, OS.TBM_GETRANGEMAX, 0, 0); + return (int)OS.SendMessage (handle, OS.TBM_GETRANGEMAX, 0, 0); } /** @@ -243,7 +243,7 @@ public int getMinimum () { */ public int getPageIncrement () { checkWidget (); - return (int)/*64*/OS.SendMessage (handle, OS.TBM_GETPAGESIZE, 0, 0); + return (int)OS.SendMessage (handle, OS.TBM_GETPAGESIZE, 0, 0); } /** @@ -258,7 +258,7 @@ public int getPageIncrement () { */ public int getSelection () { checkWidget (); - return (int)/*64*/OS.SendMessage (handle, OS.TBM_GETPOS, 0, 0); + return (int)OS.SendMessage (handle, OS.TBM_GETPOS, 0, 0); } /** @@ -287,7 +287,7 @@ public void removeSelectionListener(SelectionListener listener) { } @Override -void setBackgroundImage (long /*int*/ hImage) { +void setBackgroundImage (long hImage) { super.setBackgroundImage (hImage); /* * Bug in Windows. Changing the background color of the Scale @@ -358,8 +358,8 @@ void setBoundsInPixels (int x, int y, int width, int height, int flags, boolean public void setIncrement (int increment) { checkWidget (); if (increment < 1) return; - int minimum = (int)/*64*/OS.SendMessage (handle, OS.TBM_GETRANGEMIN, 0, 0); - int maximum = (int)/*64*/OS.SendMessage (handle, OS.TBM_GETRANGEMAX, 0, 0); + int minimum = (int)OS.SendMessage (handle, OS.TBM_GETRANGEMIN, 0, 0); + int maximum = (int)OS.SendMessage (handle, OS.TBM_GETRANGEMAX, 0, 0); if (increment > maximum - minimum) return; OS.SendMessage (handle, OS.TBM_SETLINESIZE, 0, increment); } @@ -379,7 +379,7 @@ public void setIncrement (int increment) { */ public void setMaximum (int value) { checkWidget (); - int minimum = (int)/*64*/OS.SendMessage (handle, OS.TBM_GETRANGEMIN, 0, 0); + int minimum = (int)OS.SendMessage (handle, OS.TBM_GETRANGEMIN, 0, 0); if (0 <= minimum && minimum < value) { OS.SendMessage (handle, OS.TBM_SETRANGEMAX, 1, value); } @@ -400,7 +400,7 @@ public void setMaximum (int value) { */ public void setMinimum (int value) { checkWidget (); - int maximum = (int)/*64*/OS.SendMessage (handle, OS.TBM_GETRANGEMAX, 0, 0); + int maximum = (int)OS.SendMessage (handle, OS.TBM_GETRANGEMAX, 0, 0); if (0 <= value && value < maximum) { OS.SendMessage (handle, OS.TBM_SETRANGEMIN, 1, value); } @@ -422,8 +422,8 @@ public void setMinimum (int value) { public void setPageIncrement (int pageIncrement) { checkWidget (); if (pageIncrement < 1) return; - int minimum = (int)/*64*/OS.SendMessage (handle, OS.TBM_GETRANGEMIN, 0, 0); - int maximum = (int)/*64*/OS.SendMessage (handle, OS.TBM_GETRANGEMAX, 0, 0); + int minimum = (int)OS.SendMessage (handle, OS.TBM_GETRANGEMIN, 0, 0); + int maximum = (int)OS.SendMessage (handle, OS.TBM_GETRANGEMAX, 0, 0); if (pageIncrement > maximum - minimum) return; OS.SendMessage (handle, OS.TBM_SETPAGESIZE, 0, pageIncrement); OS.SendMessage (handle, OS.TBM_SETTICFREQ, pageIncrement, 0); @@ -458,15 +458,15 @@ TCHAR windowClass () { } @Override -long /*int*/ windowProc () { +long windowProc () { return TrackBarProc; } @Override -LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_KEYDOWN (long wParam, long lParam) { LRESULT result = super.WM_KEYDOWN (wParam, lParam); if (result != null) return result; - switch ((int)/*64*/wParam) { + switch ((int)wParam) { case OS.VK_LEFT: case OS.VK_RIGHT: /* @@ -478,7 +478,7 @@ LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) { */ boolean isRTL = (style & SWT.RIGHT_TO_LEFT) != 0; if (isRTL != createdAsRTL) { - long /*int*/ code = callWindowProc (handle, OS.WM_KEYDOWN, wParam == OS.VK_RIGHT ? OS.VK_LEFT : OS.VK_RIGHT, lParam); + long code = callWindowProc (handle, OS.WM_KEYDOWN, wParam == OS.VK_RIGHT ? OS.VK_LEFT : OS.VK_RIGHT, lParam); return new LRESULT (code); } break; @@ -487,7 +487,7 @@ LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_MOUSEWHEEL (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_MOUSEWHEEL (long wParam, long lParam) { LRESULT result = super.WM_MOUSEWHEEL (wParam, lParam); if (result != null) return result; /* @@ -498,11 +498,11 @@ LRESULT WM_MOUSEWHEEL (long /*int*/ wParam, long /*int*/ lParam) { * has changed and that notification has not been issued * and send the selection event. */ - int oldPosition = (int)/*64*/OS.SendMessage (handle, OS.TBM_GETPOS, 0, 0); + int oldPosition = (int)OS.SendMessage (handle, OS.TBM_GETPOS, 0, 0); ignoreSelection = true; - long /*int*/ code = callWindowProc (handle, OS.WM_MOUSEWHEEL, wParam, lParam); + long code = callWindowProc (handle, OS.WM_MOUSEWHEEL, wParam, lParam); ignoreSelection = false; - int newPosition = (int)/*64*/OS.SendMessage (handle, OS.TBM_GETPOS, 0, 0); + int newPosition = (int)OS.SendMessage (handle, OS.TBM_GETPOS, 0, 0); if (oldPosition != newPosition) { /* * Send the event because WM_HSCROLL and WM_VSCROLL @@ -516,7 +516,7 @@ LRESULT WM_MOUSEWHEEL (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_PAINT (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_PAINT (long wParam, long lParam) { if ((state & DISPOSE_SENT) != 0) return LRESULT.ZERO; /* @@ -551,13 +551,13 @@ LRESULT WM_PAINT (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SIZE (long wParam, long lParam) { if (ignoreResize) return null; return super.WM_SIZE (wParam, lParam); } @Override -LRESULT wmScrollChild (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmScrollChild (long wParam, long lParam) { /* Do nothing when scrolling is ending */ int code = OS.LOWORD (wParam); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ScrollBar.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ScrollBar.java index 058f25a9fb..769bcf010d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ScrollBar.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ScrollBar.java @@ -187,7 +187,7 @@ void createWidget () { @Override void destroyWidget () { - long /*int*/ hwnd = hwndScrollBar (); + long hwnd = hwndScrollBar (); int type = scrollBarType (); OS.ShowScrollBar (hwnd, type, false); parent.destroyScrollBar (style); @@ -266,7 +266,7 @@ public int getMaximum () { SCROLLINFO info = new SCROLLINFO (); info.cbSize = SCROLLINFO.sizeof; info.fMask = OS.SIF_RANGE; - long /*int*/ hwnd = hwndScrollBar (); + long hwnd = hwndScrollBar (); int type = scrollBarType (); OS.GetScrollInfo (hwnd, type, info); return info.nMax; @@ -287,7 +287,7 @@ public int getMinimum () { SCROLLINFO info = new SCROLLINFO (); info.cbSize = SCROLLINFO.sizeof; info.fMask = OS.SIF_RANGE; - long /*int*/ hwnd = hwndScrollBar (); + long hwnd = hwndScrollBar (); int type = scrollBarType (); OS.GetScrollInfo (hwnd, type, info); return info.nMin; @@ -340,7 +340,7 @@ public int getSelection () { SCROLLINFO info = new SCROLLINFO (); info.cbSize = SCROLLINFO.sizeof; info.fMask = OS.SIF_POS; - long /*int*/ hwnd = hwndScrollBar (); + long hwnd = hwndScrollBar (); int type = scrollBarType (); OS.GetScrollInfo (hwnd, type, info); return info.nPos; @@ -396,7 +396,7 @@ public int getThumb () { SCROLLINFO info = new SCROLLINFO (); info.cbSize = SCROLLINFO.sizeof; info.fMask = OS.SIF_PAGE; - long /*int*/ hwnd = hwndScrollBar (); + long hwnd = hwndScrollBar (); int type = scrollBarType (); OS.GetScrollInfo (hwnd, type, info); if (info.nPage != 0) --info.nPage; @@ -534,7 +534,7 @@ public boolean getVisible () { return (psbi.rgstate [0] & OS.STATE_SYSTEM_INVISIBLE) == 0; } -long /*int*/ hwndScrollBar () { +long hwndScrollBar () { return parent.scrolledHandle (); } @@ -634,7 +634,7 @@ int scrollBarType () { */ public void setEnabled (boolean enabled) { checkWidget(); - long /*int*/ hwnd = hwndScrollBar (); + long hwnd = hwndScrollBar (); int type = scrollBarType (); int flags = enabled ? OS.ESB_ENABLE_BOTH : OS.ESB_DISABLE_BOTH; OS.EnableScrollBar (hwnd, type, flags); @@ -682,7 +682,7 @@ public void setMaximum (int value) { if (value < 0) return; SCROLLINFO info = new SCROLLINFO (); info.cbSize = SCROLLINFO.sizeof; - long /*int*/ hwnd = hwndScrollBar (); + long hwnd = hwndScrollBar (); int type = scrollBarType (); info.fMask = OS.SIF_RANGE | OS.SIF_DISABLENOSCROLL; OS.GetScrollInfo (hwnd, type, info); @@ -709,7 +709,7 @@ public void setMinimum (int value) { if (value < 0) return; SCROLLINFO info = new SCROLLINFO (); info.cbSize = SCROLLINFO.sizeof; - long /*int*/ hwnd = hwndScrollBar (); + long hwnd = hwndScrollBar (); int type = scrollBarType (); info.fMask = OS.SIF_RANGE | OS.SIF_DISABLENOSCROLL; OS.GetScrollInfo (hwnd, type, info); @@ -737,7 +737,7 @@ public void setPageIncrement (int value) { pageIncrement = value; } -boolean SetScrollInfo (long /*int*/ hwnd, int flags, SCROLLINFO info, boolean fRedraw) { +boolean SetScrollInfo (long hwnd, int flags, SCROLLINFO info, boolean fRedraw) { /* * Bug in Windows. For some reason, when SetScrollInfo() * is used with SIF_POS and the scroll bar is hidden, @@ -820,7 +820,7 @@ public void setSelection (int selection) { checkWidget(); SCROLLINFO info = new SCROLLINFO (); info.cbSize = SCROLLINFO.sizeof; - long /*int*/ hwnd = hwndScrollBar (); + long hwnd = hwndScrollBar (); int type = scrollBarType (); info.fMask = OS.SIF_POS; info.nPos = selection; @@ -849,7 +849,7 @@ public void setThumb (int value) { if (value < 1) return; SCROLLINFO info = new SCROLLINFO (); info.cbSize = SCROLLINFO.sizeof; - long /*int*/ hwnd = hwndScrollBar (); + long hwnd = hwndScrollBar (); int type = scrollBarType (); info.fMask = OS.SIF_PAGE | OS.SIF_RANGE | OS.SIF_DISABLENOSCROLL; OS.GetScrollInfo (hwnd, type, info); @@ -896,7 +896,7 @@ public void setValues (int selection, int minimum, int maximum, int thumb, int i info.nMax = maximum; info.nPage = thumb; if (info.nPage != 0) info.nPage++; - long /*int*/ hwnd = hwndScrollBar (); + long hwnd = hwndScrollBar (); int type = scrollBarType (); SetScrollInfo (hwnd, type, info, true); } @@ -929,7 +929,7 @@ public void setVisible (boolean visible) { * of the scroll bar will get the correct value. */ state = visible ? state & ~HIDDEN : state | HIDDEN; - long /*int*/ hwnd = hwndScrollBar (); + long hwnd = hwndScrollBar (); int type = scrollBarType (); /* * Bug in Windows 7. Windows will cause pixel corruption @@ -977,7 +977,7 @@ public void setVisible (boolean visible) { } } -LRESULT wmScrollChild (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmScrollChild (long wParam, long lParam) { /* Do nothing when scrolling is ending */ int code = OS.LOWORD (wParam); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Scrollable.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Scrollable.java index c82dc1f750..c9efef9da1 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Scrollable.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Scrollable.java @@ -86,7 +86,7 @@ public Scrollable (Composite parent, int style) { } @Override -long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) { +long callWindowProc (long hwnd, int msg, long wParam, long lParam) { if (handle == 0) return 0; return OS.DefWindowProc (hwnd, msg, wParam, lParam); } @@ -128,7 +128,7 @@ public Rectangle computeTrim (int x, int y, int width, int height) { } Rectangle computeTrimInPixels (int x, int y, int width, int height) { - long /*int*/ scrolledHandle = scrolledHandle (); + long scrolledHandle = scrolledHandle (); RECT rect = new RECT (); OS.SetRect (rect, x, y, x + width, y + height); int bits1 = OS.GetWindowLong (scrolledHandle, OS.GWL_STYLE); @@ -183,7 +183,7 @@ int applyThemeBackground () { } void destroyScrollBar (int type) { - long /*int*/ hwnd = scrolledHandle (); + long hwnd = scrolledHandle (); int bits = OS.GetWindowLong (hwnd, OS.GWL_STYLE); if ((type & SWT.HORIZONTAL) != 0) { style &= ~SWT.H_SCROLL; @@ -218,7 +218,7 @@ public Rectangle getClientArea () { Rectangle getClientAreaInPixels () { forceResize (); RECT rect = new RECT (); - long /*int*/ scrolledHandle = scrolledHandle (); + long scrolledHandle = scrolledHandle (); OS.GetClientRect (scrolledHandle, rect); int x = rect.left, y = rect.top; int width = rect.right - rect.left; @@ -312,7 +312,7 @@ void reskinChildren (int flags) { super.reskinChildren (flags); } -long /*int*/ scrolledHandle () { +long scrolledHandle () { return handle; } @@ -351,12 +351,12 @@ TCHAR windowClass () { } @Override -long /*int*/ windowProc () { +long windowProc () { return display.windowProc; } @Override -LRESULT WM_HSCROLL (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_HSCROLL (long wParam, long lParam) { LRESULT result = super.WM_HSCROLL (wParam, lParam); if (result != null) return result; if (horizontalBar != null && lParam == 0) { @@ -366,13 +366,13 @@ LRESULT WM_HSCROLL (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_MOUSEWHEEL (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_MOUSEWHEEL (long wParam, long lParam) { return wmScrollWheel ((state & CANVAS) != 0, wParam, lParam); } @Override -LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) { - long /*int*/ code = callWindowProc (handle, OS.WM_SIZE, wParam, lParam); +LRESULT WM_SIZE (long wParam, long lParam) { + long code = callWindowProc (handle, OS.WM_SIZE, wParam, lParam); super.WM_SIZE (wParam, lParam); // widget may be disposed at this point if (code == 0) return LRESULT.ZERO; @@ -380,7 +380,7 @@ LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_VSCROLL (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_VSCROLL (long wParam, long lParam) { LRESULT result = super.WM_VSCROLL (wParam, lParam); if (result != null) return result; if (verticalBar != null && lParam == 0) { @@ -389,7 +389,7 @@ LRESULT WM_VSCROLL (long /*int*/ wParam, long /*int*/ lParam) { return result; } -LRESULT wmScrollWheel (boolean update, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmScrollWheel (boolean update, long wParam, long lParam) { LRESULT result = super.WM_MOUSEWHEEL (wParam, lParam); if (result != null) return result; /* @@ -431,7 +431,7 @@ LRESULT wmScrollWheel (boolean update, long /*int*/ wParam, long /*int*/ lParam) */ int vPosition = verticalBar == null ? 0 : verticalBar.getSelection (); int hPosition = horizontalBar == null ? 0 : horizontalBar.getSelection (); - long /*int*/ code = callWindowProc (handle, OS.WM_MOUSEWHEEL, wParam, lParam); + long code = callWindowProc (handle, OS.WM_MOUSEWHEEL, wParam, lParam); if (verticalBar != null) { int position = verticalBar.getSelection (); if (position != vPosition) { @@ -451,7 +451,7 @@ LRESULT wmScrollWheel (boolean update, long /*int*/ wParam, long /*int*/ lParam) return new LRESULT (code); } -LRESULT wmScroll (ScrollBar bar, boolean update, long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmScroll (ScrollBar bar, boolean update, long hwnd, int msg, long wParam, long lParam) { LRESULT result = null; if (update) { int type = msg == OS.WM_HSCROLL ? OS.SB_HORZ : OS.SB_VERT; @@ -490,7 +490,7 @@ LRESULT wmScroll (ScrollBar bar, boolean update, long /*int*/ hwnd, int msg, lon } OS.SetScrollInfo (hwnd, type, info, true); } else { - long /*int*/ code = callWindowProc (hwnd, msg, wParam, lParam); + long code = callWindowProc (hwnd, msg, wParam, lParam); result = code == 0 ? LRESULT.ZERO : new LRESULT (code); } bar.wmScrollChild (wParam, lParam); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Shell.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Shell.java index 75f472fbeb..d41e3d95a1 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Shell.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Shell.java @@ -123,16 +123,16 @@ import org.eclipse.swt.internal.win32.*; public class Shell extends Decorations { Menu activeMenu; ToolTip [] toolTips; - long /*int*/ hIMC, hwndMDIClient, lpstrTip, toolTipHandle, balloonTipHandle, menuItemToolTipHandle; + long hIMC, hwndMDIClient, lpstrTip, toolTipHandle, balloonTipHandle, menuItemToolTipHandle; int minWidth = SWT.DEFAULT, minHeight = SWT.DEFAULT; - long /*int*/ [] brushes; + long [] brushes; boolean showWithParent, fullScreen, wasMaximized, modified, center; String toolTitle, balloonTitle; - long /*int*/ toolIcon, balloonIcon; - long /*int*/ windowProc; + long toolIcon, balloonIcon; + long windowProc; Control lastActive; - static /*final*/ long /*int*/ ToolTipProc; - static final long /*int*/ DialogProc; + static /*final*/ long ToolTipProc; + static final long DialogProc; static final TCHAR DialogClass = new TCHAR (0, "#32770", true); final static int [] SYSTEM_COLORS = { OS.COLOR_BTNFACE, @@ -279,7 +279,7 @@ public Shell (Display display, int style) { this (display, null, style, 0, false); } -Shell (Display display, Shell parent, int style, long /*int*/ handle, boolean embedded) { +Shell (Display display, Shell parent, int style, long handle, boolean embedded) { super (); checkSubclass (); if (display == null) display = Display.getCurrent (); @@ -398,7 +398,7 @@ public Shell (Shell parent, int style) { * * @noreference This method is not intended to be referenced by clients. */ -public static Shell win32_new (Display display, long /*int*/ handle) { +public static Shell win32_new (Display display, long handle) { return new Shell (display, null, SWT.NO_TRIM, handle, true); } @@ -421,7 +421,7 @@ public static Shell win32_new (Display display, long /*int*/ handle) { * * @since 3.3 */ -public static Shell internal_new (Display display, long /*int*/ handle) { +public static Shell internal_new (Display display, long handle) { return new Shell (display, null, SWT.NO_TRIM, handle, false); } @@ -473,13 +473,13 @@ public void addShellListener (ShellListener listener) { addListener (SWT.Deactivate, typedListener); } -long /*int*/ balloonTipHandle () { +long balloonTipHandle () { if (balloonTipHandle == 0) createBalloonTipHandle (); return balloonTipHandle; } @Override -long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) { +long callWindowProc (long hwnd, int msg, long wParam, long lParam) { if (handle == 0) return 0; if (hwnd == toolTipHandle || hwnd == balloonTipHandle || hwnd == menuItemToolTipHandle) { return OS.CallWindowProc (ToolTipProc, hwnd, msg, wParam, lParam); @@ -659,8 +659,8 @@ void createToolTipHandle () { toolTipHandle = createToolTipHandle (handle); } -long /*int*/ createToolTipHandle (long /*int*/ parent) { - long /*int*/ toolTipHandle = OS.CreateWindowEx ( +long createToolTipHandle (long parent) { + long toolTipHandle = OS.CreateWindowEx ( 0, new TCHAR (0, OS.TOOLTIPS_CLASS, true), null, @@ -759,7 +759,7 @@ void enableWidget (boolean enabled) { } @Override -long /*int*/ findBrush (long /*int*/ value, int lbStyle) { +long findBrush (long value, int lbStyle) { if (lbStyle == OS.BS_SOLID) { for (int i=0; i<SYSTEM_COLORS.length; i++) { if (value == OS.GetSysColor (SYSTEM_COLORS [i])) { @@ -767,10 +767,10 @@ long /*int*/ findBrush (long /*int*/ value, int lbStyle) { } } } - if (brushes == null) brushes = new long /*int*/ [BRUSHES_SIZE]; + if (brushes == null) brushes = new long [BRUSHES_SIZE]; LOGBRUSH logBrush = new LOGBRUSH (); for (int i=0; i<brushes.length; i++) { - long /*int*/ hBrush = brushes [i]; + long hBrush = brushes [i]; if (hBrush == 0) break; OS.GetObject (hBrush, LOGBRUSH.sizeof, logBrush); switch (logBrush.lbStyle) { @@ -787,12 +787,12 @@ long /*int*/ findBrush (long /*int*/ value, int lbStyle) { } } int length = brushes.length; - long /*int*/ hBrush = brushes [--length]; + long hBrush = brushes [--length]; if (hBrush != 0) OS.DeleteObject (hBrush); System.arraycopy (brushes, 0, brushes, 1, length); switch (lbStyle) { case OS.BS_SOLID: - hBrush = OS.CreateSolidBrush ((int)/*64*/value); + hBrush = OS.CreateSolidBrush ((int)value); break; case OS.BS_PATTERN: hBrush = OS.CreatePatternBrush (value); @@ -832,7 +832,7 @@ void fixActiveShell () { * application). The fix is to activate the disabled parent * shell before disposing or hiding the active shell. */ - long /*int*/ hwndParent = OS.GetParent (handle); + long hwndParent = OS.GetParent (handle); if (hwndParent != 0 && handle == OS.GetActiveWindow ()) { if (!OS.IsWindowEnabled (hwndParent) && OS.IsWindowVisible (hwndParent)) { OS.SetActiveWindow (hwndParent); @@ -960,13 +960,13 @@ ToolTip getCurrentToolTip () { return null; } -ToolTip getCurrentToolTip (long /*int*/ hwndToolTip) { +ToolTip getCurrentToolTip (long hwndToolTip) { if (hwndToolTip == 0) return null; if (OS.SendMessage (hwndToolTip, OS.TTM_GETCURRENTTOOL, 0, 0) != 0) { TOOLINFO lpti = new TOOLINFO (); lpti.cbSize = TOOLINFO.sizeof; if (OS.SendMessage (hwndToolTip, OS.TTM_GETCURRENTTOOL, 0, lpti) != 0) { - if ((lpti.uFlags & OS.TTF_IDISHWND) == 0) return findToolTip ((int)/*64*/lpti.uId); + if ((lpti.uFlags & OS.TTF_IDISHWND) == 0) return findToolTip ((int)lpti.uId); } } return null; @@ -1017,7 +1017,7 @@ public boolean getFullScreen () { public int getImeInputMode () { checkWidget (); if (!OS.IsDBLocale) return 0; - long /*int*/ hIMC = OS.ImmGetContext (handle); + long hIMC = OS.ImmGetContext (handle); int [] lpfdwConversion = new int [1], lpfdwSentence = new int [1]; boolean open = OS.ImmGetOpenStatus (hIMC); if (open) open = OS.ImmGetConversionStatus (hIMC, lpfdwConversion, lpfdwSentence); @@ -1212,7 +1212,7 @@ public boolean isVisible () { return getVisible (); } -long /*int*/ hwndMDIClient () { +long hwndMDIClient () { if (hwndMDIClient == 0) { int widgetStyle = OS.MDIS_ALLCHILDSTYLES | OS.WS_CHILD | OS.WS_CLIPCHILDREN | OS.WS_CLIPSIBLINGS; hwndMDIClient = OS.CreateWindowEx ( @@ -1230,7 +1230,7 @@ long /*int*/ hwndMDIClient () { return hwndMDIClient; } -long /*int*/ menuItemToolTipHandle () { +long menuItemToolTipHandle () { if (menuItemToolTipHandle == 0) createMenuItemToolTipHandle (); return menuItemToolTipHandle; } @@ -1371,7 +1371,7 @@ void releaseWidget () { activeMenu = null; display.clearModal (this); if (lpstrTip != 0) { - long /*int*/ hHeap = OS.GetProcessHeap (); + long hHeap = OS.GetProcessHeap (); OS.HeapFree (hHeap, 0, lpstrTip); } lpstrTip = 0; @@ -1436,7 +1436,7 @@ void reskinChildren (int flags) { } @Override -boolean sendKeyEvent (int type, int msg, long /*int*/ wParam, long /*int*/ lParam, Event event) { +boolean sendKeyEvent (int type, int msg, long wParam, long lParam, Event event) { if (!isEnabled () || !isActive ()) return false; return super.sendKeyEvent (type, msg, wParam, lParam, event); } @@ -1642,7 +1642,7 @@ public void setImeInputMode (int mode) { checkWidget (); if (!OS.IsDBLocale) return; boolean imeOn = mode != SWT.NONE; - long /*int*/ hIMC = OS.ImmGetContext (handle); + long hIMC = OS.ImmGetContext (handle); OS.ImmSetOpenStatus (hIMC, imeOn); if (imeOn) { int [] lpfdwConversion = new int [1], lpfdwSentence = new int [1]; @@ -1660,7 +1660,7 @@ public void setImeInputMode (int mode) { } boolean fullShape = (mode & SWT.DBCS) != 0; if ((mode & SWT.NATIVE) != 0) { - long /*int*/ hkl = OS.GetKeyboardLayout (0); + long hkl = OS.GetKeyboardLayout (0); int langid = OS.PRIMARYLANGID (OS.LOWORD (hkl)); if (langid == OS.LANG_JAPANESE) { fullShape = true; @@ -1771,7 +1771,7 @@ public void setModified (boolean modified) { } void setItemEnabled (int cmd, boolean enabled) { - long /*int*/ hMenu = OS.GetSystemMenu (handle, false); + long hMenu = OS.GetSystemMenu (handle, false); if (hMenu == 0) return; int flags = OS.MF_ENABLED; if (!enabled) flags = OS.MF_DISABLED | OS.MF_GRAYED; @@ -1818,12 +1818,12 @@ public void setRegion (Region region) { super.setRegion (region); } -void setToolTipText (long /*int*/ hwnd, String text) { +void setToolTipText (long hwnd, String text) { TOOLINFO lpti = new TOOLINFO (); lpti.cbSize = TOOLINFO.sizeof; lpti.hwnd = handle; lpti.uId = hwnd; - long /*int*/ hwndToolTip = toolTipHandle (); + long hwndToolTip = toolTipHandle (); if (text == null) { OS.SendMessage (hwndToolTip, OS.TTM_DELTOOL, 0, lpti); } else { @@ -1845,7 +1845,7 @@ void setToolTipText (NMTTDISPINFO lpnmtdi, char [] buffer) { * shell trimmings. */ if (!hasCursor ()) return; - long /*int*/ hHeap = OS.GetProcessHeap (); + long hHeap = OS.GetProcessHeap (); if (lpstrTip != 0) OS.HeapFree (hHeap, 0, lpstrTip); int byteCount = buffer.length * 2; lpstrTip = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); @@ -1853,7 +1853,7 @@ void setToolTipText (NMTTDISPINFO lpnmtdi, char [] buffer) { lpnmtdi.lpszText = lpstrTip; } -void setToolTipTitle (long /*int*/ hwndToolTip, String text, int icon) { +void setToolTipTitle (long hwndToolTip, String text, int icon) { /* * Bug in Windows. For some reason, when TTM_SETTITLE * is used to set the title of a tool tip, Windows leaks @@ -1926,7 +1926,7 @@ public void setVisible (boolean visible) { bringToTop (); if (isDisposed ()) return; } - long /*int*/ hwndShell = OS.GetActiveWindow (); + long hwndShell = OS.GetActiveWindow (); if (hwndShell == 0) { if (parent != null) hwndShell = parent.handle; } @@ -1967,7 +1967,7 @@ public void setVisible (boolean visible) { /* Make the foreign window parent appear in the task bar */ if (visible) { if (parent != null && (parent.state & FOREIGN_HANDLE) != 0) { - long /*int*/ hwndParent = parent.handle; + long hwndParent = parent.handle; int style = OS.GetWindowLong (hwndParent, OS.GWL_EXSTYLE); if ((style & OS.WS_EX_TOOLWINDOW) != 0) { OS.SetWindowLong (hwndParent, OS.GWL_EXSTYLE, style & ~OS.WS_EX_TOOLWINDOW); @@ -1987,7 +1987,7 @@ public void setVisible (boolean visible) { void subclass () { super.subclass (); if (ToolTipProc != 0) { - long /*int*/ newProc = display.windowProc; + long newProc = display.windowProc; if (toolTipHandle != 0) { OS.SetWindowLongPtr (toolTipHandle, OS.GWLP_WNDPROC, newProc); } @@ -2000,7 +2000,7 @@ void subclass () { } } -long /*int*/ toolTipHandle () { +long toolTipHandle () { if (toolTipHandle == 0) createToolTipHandle (); return toolTipHandle; } @@ -2050,7 +2050,7 @@ CREATESTRUCT widgetCreateStruct () { } @Override -long /*int*/ widgetParent () { +long widgetParent () { if (handle != 0) return handle; return parent != null ? parent.handle : 0; } @@ -2089,7 +2089,7 @@ TCHAR windowClass () { } @Override -long /*int*/ windowProc () { +long windowProc () { if (windowProc != 0) return windowProc; if ((style & SWT.TOOL) != 0) { int trim = SWT.TITLE | SWT.CLOSE | SWT.MIN | SWT.MAX | SWT.BORDER | SWT.RESIZE; @@ -2099,7 +2099,7 @@ long /*int*/ windowProc () { } @Override -long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) { +long windowProc (long hwnd, int msg, long wParam, long lParam) { if (handle == 0) return 0; if((style & SWT.NO_MOVE) != 0 && msg == OS.WM_NCLBUTTONDOWN && wParam == OS.HTCAPTION) return 0; if (hwnd == toolTipHandle || hwnd == balloonTipHandle || hwnd == menuItemToolTipHandle) { @@ -2124,7 +2124,7 @@ long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long / return callWindowProc (hwnd, msg, wParam, lParam); } if (hwnd == handle) { - if ((int)/*64*/msg == Display.TASKBARBUTTONCREATED) { + if ((int)msg == Display.TASKBARBUTTONCREATED) { if (display.taskBar != null) { for (TaskItem item : display.taskBar.items) { if (item != null && item.shell == this) { @@ -2161,7 +2161,7 @@ int widgetStyle () { } @Override -LRESULT WM_ACTIVATE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_ACTIVATE (long wParam, long lParam) { /* * Bug in Windows XP. When a Shell is deactivated, the * IME composition window does not go away. This causes @@ -2187,7 +2187,7 @@ LRESULT WM_ACTIVATE (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_DESTROY (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_DESTROY (long wParam, long lParam) { LRESULT result = super.WM_DESTROY (wParam, lParam); /* * When the shell is a WS_CHILD window of a non-SWT @@ -2204,7 +2204,7 @@ LRESULT WM_DESTROY (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_ERASEBKGND (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_ERASEBKGND (long wParam, long lParam) { LRESULT result = super.WM_ERASEBKGND (wParam, lParam); if (result != null) return result; /* @@ -2223,7 +2223,7 @@ LRESULT WM_ERASEBKGND (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_ENTERIDLE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_ENTERIDLE (long wParam, long lParam) { LRESULT result = super.WM_ENTERIDLE (wParam, lParam); if (result != null) return result; Display display = this.display; @@ -2232,7 +2232,7 @@ LRESULT WM_ENTERIDLE (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_GETMINMAXINFO (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_GETMINMAXINFO (long wParam, long lParam) { LRESULT result = super.WM_GETMINMAXINFO (wParam, lParam); if (result != null) return result; if (minWidth != SWT.DEFAULT || minHeight != SWT.DEFAULT) { @@ -2247,7 +2247,7 @@ LRESULT WM_GETMINMAXINFO (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_MOUSEACTIVATE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_MOUSEACTIVATE (long wParam, long lParam) { LRESULT result = super.WM_MOUSEACTIVATE (wParam, lParam); if (result != null) return result; @@ -2298,7 +2298,7 @@ LRESULT WM_MOUSEACTIVATE (long /*int*/ wParam, long /*int*/ lParam) { int pos = OS.GetMessagePos (); OS.POINTSTOPOINT (pt, pos); } - long /*int*/ hwnd = OS.WindowFromPoint (pt); + long hwnd = OS.WindowFromPoint (pt); if (hwnd == 0) return null; Control control = display.findControl (hwnd); @@ -2319,13 +2319,13 @@ LRESULT WM_MOUSEACTIVATE (long /*int*/ wParam, long /*int*/ lParam) { } } - long /*int*/ code = callWindowProc (handle, OS.WM_MOUSEACTIVATE, wParam, lParam); + long code = callWindowProc (handle, OS.WM_MOUSEACTIVATE, wParam, lParam); setActiveControl (control, SWT.MouseDown); return new LRESULT (code); } @Override -LRESULT WM_MOVE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_MOVE (long wParam, long lParam) { LRESULT result = super.WM_MOVE (wParam, lParam); if (result != null) return result; ToolTip tip = getCurrentToolTip (); @@ -2334,16 +2334,16 @@ LRESULT WM_MOVE (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_NCHITTEST (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_NCHITTEST (long wParam, long lParam) { if (!OS.IsWindowEnabled (handle)) return null; if (!isEnabled () || !isActive ()) { if (!Display.TrimEnabled) return new LRESULT (OS.HTNOWHERE); - long /*int*/ hittest = callWindowProc (handle, OS.WM_NCHITTEST, wParam, lParam); + long hittest = callWindowProc (handle, OS.WM_NCHITTEST, wParam, lParam); if (hittest == OS.HTCLIENT || hittest == OS.HTMENU) hittest = OS.HTBORDER; return new LRESULT (hittest); } if (menuBar != null && !menuBar.getEnabled ()) { - long /*int*/ hittest = callWindowProc (handle, OS.WM_NCHITTEST, wParam, lParam); + long hittest = callWindowProc (handle, OS.WM_NCHITTEST, wParam, lParam); if (hittest == OS.HTMENU) hittest = OS.HTBORDER; return new LRESULT (hittest); } @@ -2351,7 +2351,7 @@ LRESULT WM_NCHITTEST (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_NCLBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_NCLBUTTONDOWN (long wParam, long lParam) { LRESULT result = super.WM_NCLBUTTONDOWN (wParam, lParam); if (result != null) return result; /* @@ -2364,7 +2364,7 @@ LRESULT WM_NCLBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) { if (!display.ignoreRestoreFocus) return result; Display display = this.display; display.lockActiveWindow = true; - long /*int*/ code = callWindowProc (handle, OS.WM_NCLBUTTONDOWN, wParam, lParam); + long code = callWindowProc (handle, OS.WM_NCLBUTTONDOWN, wParam, lParam); display.lockActiveWindow = false; Control focusControl = display.lastHittestControl; if (focusControl != null && !focusControl.isDisposed ()) { @@ -2376,7 +2376,7 @@ LRESULT WM_NCLBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_SETCURSOR (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SETCURSOR (long wParam, long lParam) { /* * Feature in Windows. When the shell is disabled * by a Windows standard dialog (like a MessageBox @@ -2390,14 +2390,14 @@ LRESULT WM_SETCURSOR (long /*int*/ wParam, long /*int*/ lParam) { if (!Display.TrimEnabled) { Shell modalShell = display.getModalShell (); if (modalShell != null && !isActive ()) { - long /*int*/ hwndModal = modalShell.handle; + long hwndModal = modalShell.handle; if (OS.IsWindowEnabled (hwndModal)) { OS.SetActiveWindow (hwndModal); } } } if (!OS.IsWindowEnabled (handle)) { - long /*int*/ hwndPopup = OS.GetLastActivePopup (handle); + long hwndPopup = OS.GetLastActivePopup (handle); if (hwndPopup != 0 && hwndPopup != handle) { if (display.getControl (hwndPopup) == null) { if (OS.IsWindowEnabled (hwndPopup)) { @@ -2447,7 +2447,7 @@ LRESULT WM_SETCURSOR (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_SHOWWINDOW (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SHOWWINDOW (long wParam, long lParam) { LRESULT result = super.WM_SHOWWINDOW (wParam, lParam); if (result != null) return result; /* @@ -2470,7 +2470,7 @@ LRESULT WM_SHOWWINDOW (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_WINDOWPOSCHANGING (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_WINDOWPOSCHANGING (long wParam, long lParam) { LRESULT result = super.WM_WINDOWPOSCHANGING (wParam,lParam); if (result != null) return result; WINDOWPOS lpwp = new WINDOWPOS (); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Slider.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Slider.java index 94b0c0f8e1..eece94732f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Slider.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Slider.java @@ -76,7 +76,7 @@ import org.eclipse.swt.events.*; public class Slider extends Control { int increment, pageIncrement; boolean ignoreFocus; - static final long /*int*/ ScrollBarProc; + static final long ScrollBarProc; static final TCHAR ScrollBarClass = new TCHAR (0, "SCROLLBAR", true); static { WNDCLASS lpWndClass = new WNDCLASS (); @@ -158,7 +158,7 @@ public void addSelectionListener (SelectionListener listener) { } @Override -long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) { +long callWindowProc (long hwnd, int msg, long wParam, long lParam) { if (handle == 0) return 0; /* * Feature in Windows. Windows runs a modal message @@ -483,7 +483,7 @@ public void setPageIncrement (int value) { pageIncrement = value; } -boolean SetScrollInfo (long /*int*/ hwnd, int flags, SCROLLINFO info, boolean fRedraw) { +boolean SetScrollInfo (long hwnd, int flags, SCROLLINFO info, boolean fRedraw) { /* * Feature in Windows. Using SIF_DISABLENOSCROLL, * SetScrollInfo () can change enabled and disabled @@ -637,12 +637,12 @@ TCHAR windowClass () { } @Override -long /*int*/ windowProc () { +long windowProc () { return ScrollBarProc; } @Override -LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_KEYDOWN (long wParam, long lParam) { LRESULT result = super.WM_KEYDOWN (wParam, lParam); if (result != null) return result; if ((style & SWT.VERTICAL) != 0) return result; @@ -656,11 +656,11 @@ LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) { * in the operating system. */ if ((style & SWT.MIRRORED) != 0) { - switch ((int)/*64*/wParam) { + switch ((int)wParam) { case OS.VK_LEFT: case OS.VK_RIGHT: { int key = wParam == OS.VK_LEFT ? OS.VK_RIGHT : OS.VK_LEFT; - long /*int*/ code = callWindowProc (handle, OS.WM_KEYDOWN, key, lParam); + long code = callWindowProc (handle, OS.WM_KEYDOWN, key, lParam); return new LRESULT (code); } } @@ -669,7 +669,7 @@ LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_LBUTTONDBLCLK (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_LBUTTONDBLCLK (long wParam, long lParam) { /* * Feature in Windows. Windows uses the WS_TABSTOP * style for the scroll bar to decide that focus @@ -701,7 +701,7 @@ LRESULT WM_LBUTTONDBLCLK (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_LBUTTONDOWN (long wParam, long lParam) { /* * Feature in Windows. Windows uses the WS_TABSTOP * style for the scroll bar to decide that focus @@ -733,13 +733,13 @@ LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_SETFOCUS (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SETFOCUS (long wParam, long lParam) { if (ignoreFocus) return null; return super.WM_SETFOCUS (wParam, lParam); } @Override -LRESULT wmScrollChild (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmScrollChild (long wParam, long lParam) { /* Do nothing when scrolling is ending */ int code = OS.LOWORD (wParam); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Spinner.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Spinner.java index 5fff0cf3c2..e1b327fda2 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Spinner.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Spinner.java @@ -45,12 +45,12 @@ import org.eclipse.swt.internal.win32.*; * @noextend This class is not intended to be subclassed by clients. */ public class Spinner extends Composite { - long /*int*/ hwndText, hwndUpDown; + long hwndText, hwndUpDown; boolean ignoreModify, ignoreCharacter; int pageIncrement, digits; - static final long /*int*/ EditProc; + static final long EditProc; static final TCHAR EditClass = new TCHAR (0, "EDIT", true); - static final long /*int*/ UpDownProc; + static final long UpDownProc; static final TCHAR UpDownClass = new TCHAR (0, OS.UPDOWN_CLASS, true); static { WNDCLASS lpWndClass = new WNDCLASS (); @@ -111,7 +111,7 @@ public Spinner (Composite parent, int style) { } @Override -long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) { +long callWindowProc (long hwnd, int msg, long wParam, long lParam) { if (handle == 0) return 0; if (hwnd == hwndText) { return OS.CallWindowProc (EditProc, hwnd, msg, wParam, lParam); @@ -134,7 +134,7 @@ static int checkStyle (int style) { } @Override -boolean checkHandle (long /*int*/ hwnd) { +boolean checkHandle (long hwnd) { return hwnd == handle || hwnd == hwndText || hwnd == hwndUpDown; } @@ -147,7 +147,7 @@ protected void checkSubclass () { void createHandle () { super.createHandle (); state &= ~(CANVAS | THEME_BACKGROUND); - long /*int*/ hInstance = OS.GetModuleHandle (null); + long hInstance = OS.GetModuleHandle (null); int textExStyle = (style & SWT.BORDER) != 0 ? OS.WS_EX_CLIENTEDGE : 0; int textStyle = OS.WS_CHILD | OS.WS_VISIBLE | OS.ES_AUTOHSCROLL | OS.WS_CLIPSIBLINGS; if ((style & SWT.READ_ONLY) != 0) textStyle |= OS.ES_READONLY; @@ -188,7 +188,7 @@ void createHandle () { OS.SetWindowPos (hwndText, hwndUpDown, 0, 0, 0, 0, flags); OS.SetWindowLongPtr (hwndUpDown, OS.GWLP_ID, hwndUpDown); if (OS.IsDBLocale) { - long /*int*/ hIMC = OS.ImmGetContext (handle); + long hIMC = OS.ImmGetContext (handle); OS.ImmAssociateContext (hwndText, hIMC); OS.ImmAssociateContext (hwndUpDown, hIMC); OS.ImmReleaseContext (handle, hIMC); @@ -285,7 +285,7 @@ void addVerifyListener (VerifyListener listener) { } @Override -long /*int*/ borderHandle () { +long borderHandle () { return hwndText; } @@ -293,8 +293,8 @@ long /*int*/ borderHandle () { checkWidget (); int width = 0, height = 0; if (wHint == SWT.DEFAULT || hHint == SWT.DEFAULT) { - long /*int*/ newFont, oldFont = 0; - long /*int*/ hDC = OS.GetDC (hwndText); + long newFont, oldFont = 0; + long hDC = OS.GetDC (hwndText); newFont = OS.SendMessage (hwndText, OS.WM_GETFONT, 0, 0); if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont); TEXTMETRIC tm = new TEXTMETRIC (); @@ -353,7 +353,7 @@ long /*int*/ borderHandle () { * the single-line text widget in an editable combo * box. */ - long /*int*/ margins = OS.SendMessage (hwndText, OS.EM_GETMARGINS, 0, 0); + long margins = OS.SendMessage (hwndText, OS.EM_GETMARGINS, 0, 0); x -= OS.LOWORD (margins); width += OS.LOWORD (margins) + OS.HIWORD (margins); if ((style & SWT.BORDER) != 0) { @@ -421,7 +421,7 @@ void deregister () { @Override boolean hasFocus () { - long /*int*/ hwndFocus = OS.GetFocus (); + long hwndFocus = OS.GetFocus (); if (hwndFocus == handle) return true; if (hwndFocus == hwndText) return true; if (hwndFocus == hwndUpDown) return true; @@ -529,7 +529,7 @@ public int getPageIncrement () { */ public int getSelection () { checkWidget (); - return (int)/*64*/OS.SendMessage (hwndUpDown, OS.UDM_GETPOS32, 0, 0); + return (int)OS.SendMessage (hwndUpDown, OS.UDM_GETPOS32, 0, 0); } int getSelectionText (boolean [] parseFail) { @@ -617,7 +617,7 @@ public String getText () { */ public int getTextLimit () { checkWidget (); - return (int)/*64*/OS.SendMessage (hwndText, OS.EM_GETLIMITTEXT, 0, 0) & 0x7FFFFFFF; + return (int)OS.SendMessage (hwndText, OS.EM_GETLIMITTEXT, 0, 0) & 0x7FFFFFFF; } /** @@ -725,7 +725,7 @@ void removeVerifyListener (VerifyListener listener) { } @Override -boolean sendKeyEvent (int type, int msg, long /*int*/ wParam, long /*int*/ lParam, Event event) { +boolean sendKeyEvent (int type, int msg, long wParam, long lParam, Event event) { if (!super.sendKeyEvent (type, msg, wParam, lParam, event)) { return false; } @@ -797,7 +797,7 @@ boolean sendKeyEvent (int type, int msg, long /*int*/ wParam, long /*int*/ lPara } @Override -void setBackgroundImage (long /*int*/ hBitmap) { +void setBackgroundImage (long hBitmap) { super.setBackgroundImage (hBitmap); OS.InvalidateRect (hwndText, null, true); } @@ -833,7 +833,7 @@ public void setDigits (int value) { if (value < 0) error (SWT.ERROR_INVALID_ARGUMENT); if (value == this.digits) return; this.digits = value; - int pos = (int)/*64*/OS.SendMessage (hwndUpDown, OS.UDM_GETPOS32, 0, 0); + int pos = (int)OS.SendMessage (hwndUpDown, OS.UDM_GETPOS32, 0, 0); setSelection (pos, false, true, false); } @@ -858,14 +858,14 @@ void setForegroundPixel (int pixel) { public void setIncrement (int value) { checkWidget (); if (value < 1) return; - long /*int*/ hHeap = OS.GetProcessHeap (); - int count = (int)/*64*/OS.SendMessage (hwndUpDown, OS.UDM_GETACCEL, 0, (UDACCEL)null); - long /*int*/ udaccels = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, UDACCEL.sizeof * count); + long hHeap = OS.GetProcessHeap (); + int count = (int)OS.SendMessage (hwndUpDown, OS.UDM_GETACCEL, 0, (UDACCEL)null); + long udaccels = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, UDACCEL.sizeof * count); OS.SendMessage (hwndUpDown, OS.UDM_GETACCEL, count, udaccels); int first = -1; UDACCEL udaccel = new UDACCEL (); for (int i = 0; i < count; i++) { - long /*int*/ offset = udaccels + (i * UDACCEL.sizeof); + long offset = udaccels + (i * UDACCEL.sizeof); OS.MoveMemory (udaccel, offset, UDACCEL.sizeof); if (first == -1) first = udaccel.nInc; udaccel.nInc = udaccel.nInc / first * value; @@ -893,7 +893,7 @@ public void setMaximum (int value) { int [] min = new int [1]; OS.SendMessage (hwndUpDown , OS.UDM_GETRANGE32, min, null); if (value < min [0]) return; - int pos = (int)/*64*/OS.SendMessage (hwndUpDown, OS.UDM_GETPOS32, 0, 0); + int pos = (int)OS.SendMessage (hwndUpDown, OS.UDM_GETPOS32, 0, 0); OS.SendMessage (hwndUpDown , OS.UDM_SETRANGE32, min [0], value); if (pos > value) setSelection (value, true, true, false); } @@ -916,7 +916,7 @@ public void setMinimum (int value) { int [] max = new int [1]; OS.SendMessage (hwndUpDown , OS.UDM_GETRANGE32, null, max); if (value > max [0]) return; - int pos = (int)/*64*/OS.SendMessage (hwndUpDown, OS.UDM_GETPOS32, 0, 0); + int pos = (int)OS.SendMessage (hwndUpDown, OS.UDM_GETPOS32, 0, 0); OS.SendMessage (hwndUpDown , OS.UDM_SETRANGE32, value, max [0]); if (pos < value) setSelection (value, true, true, false); } @@ -1073,7 +1073,7 @@ public void setValues (int selection, int minimum, int maximum, int digits, int @Override void subclass () { super.subclass (); - long /*int*/ newProc = display.windowProc; + long newProc = display.windowProc; OS.SetWindowLongPtr (hwndText, OS.GWLP_WNDPROC, newProc); OS.SetWindowLongPtr (hwndUpDown, OS.GWLP_WNDPROC, newProc); } @@ -1147,7 +1147,7 @@ int widgetExtStyle () { } @Override -long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) { +long windowProc (long hwnd, int msg, long wParam, long lParam) { if (hwnd == hwndText || hwnd == hwndUpDown) { LRESULT result = null; switch (msg) { @@ -1208,26 +1208,26 @@ long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long / } @Override -LRESULT WM_ERASEBKGND (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_ERASEBKGND (long wParam, long lParam) { super.WM_ERASEBKGND (wParam, lParam); drawBackground (wParam); return LRESULT.ONE; } @Override -LRESULT WM_KILLFOCUS (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_KILLFOCUS (long wParam, long lParam) { return null; } @Override -LRESULT WM_SETFOCUS (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SETFOCUS (long wParam, long lParam) { OS.SetFocus (hwndText); OS.SendMessage (hwndText, OS.EM_SETSEL, 0, -1); return null; } @Override -LRESULT WM_SETFONT (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SETFONT (long wParam, long lParam) { LRESULT result = super.WM_SETFONT (wParam, lParam); if (result != null) return result; OS.SendMessage (hwndText, OS.WM_SETFONT, wParam, lParam); @@ -1235,7 +1235,7 @@ LRESULT WM_SETFONT (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SIZE (long wParam, long lParam) { LRESULT result = super.WM_SIZE (wParam, lParam); if (isDisposed ()) return result; int width = OS.LOWORD (lParam), height = OS.HIWORD (lParam); @@ -1249,12 +1249,12 @@ LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT wmIMEChar(long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmIMEChar(long hwnd, long wParam, long lParam) { /* Process a DBCS character */ Display display = this.display; display.lastKey = 0; - display.lastAscii = (int)/*64*/wParam; + display.lastAscii = (int)wParam; display.lastVirtual = display.lastNull = display.lastDead = false; if (!sendKeyEvent (SWT.KeyDown, OS.WM_IME_CHAR, wParam, lParam)) { return LRESULT.ZERO; @@ -1268,7 +1268,7 @@ LRESULT wmIMEChar(long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { * them to the application. */ ignoreCharacter = true; - long /*int*/ result = callWindowProc (hwnd, OS.WM_IME_CHAR, wParam, lParam); + long result = callWindowProc (hwnd, OS.WM_IME_CHAR, wParam, lParam); MSG msg = new MSG (); int flags = OS.PM_REMOVE | OS.PM_NOYIELD | OS.PM_QS_INPUT | OS.PM_QS_POSTMESSAGE; while (OS.PeekMessage (msg, hwnd, OS.WM_CHAR, OS.WM_CHAR, flags)) { @@ -1284,7 +1284,7 @@ LRESULT wmIMEChar(long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT wmChar (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmChar (long hwnd, long wParam, long lParam) { if (ignoreCharacter) return null; LRESULT result = super.wmChar (hwnd, wParam, lParam); if (result != null) return result; @@ -1295,7 +1295,7 @@ LRESULT wmChar (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { * The fix is to look for these keys and not call * the window proc. */ - switch ((int)/*64*/wParam) { + switch ((int)wParam) { case SWT.CR: sendSelectionEvent (SWT.DefaultSelection); // FALL THROUGH @@ -1305,7 +1305,7 @@ LRESULT wmChar (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { return result; } -LRESULT wmClipboard (long /*int*/ hwndText, int msg, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmClipboard (long hwndText, int msg, long wParam, long lParam) { if ((style & SWT.READ_ONLY) != 0) return null; // if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return null; boolean call = false; @@ -1355,11 +1355,11 @@ LRESULT wmClipboard (long /*int*/ hwndText, int msg, long /*int*/ wParam, long / } TCHAR buffer = new TCHAR (getCodePage (), newText, true); if (msg == OS.WM_SETTEXT) { - long /*int*/ hHeap = OS.GetProcessHeap (); + long hHeap = OS.GetProcessHeap (); int byteCount = buffer.length () * TCHAR.sizeof; - long /*int*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); + long pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); OS.MoveMemory (pszText, buffer, byteCount); - long /*int*/ code = OS.CallWindowProc (EditProc, hwndText, msg, wParam, pszText); + long code = OS.CallWindowProc (EditProc, hwndText, msg, wParam, pszText); OS.HeapFree (hHeap, 0, pszText); return new LRESULT (code); } else { @@ -1372,7 +1372,7 @@ LRESULT wmClipboard (long /*int*/ hwndText, int msg, long /*int*/ wParam, long / } @Override -LRESULT wmCommandChild (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmCommandChild (long wParam, long lParam) { int code = OS.HIWORD (wParam); switch (code) { case OS.EN_CHANGE: @@ -1380,7 +1380,7 @@ LRESULT wmCommandChild (long /*int*/ wParam, long /*int*/ lParam) { boolean [] parseFail = new boolean [1]; int value = getSelectionText (parseFail); if (!parseFail [0]) { - int pos = (int)/*64*/OS.SendMessage (hwndUpDown, OS.UDM_GETPOS32, 0, 0); + int pos = (int)OS.SendMessage (hwndUpDown, OS.UDM_GETPOS32, 0, 0); if (pos != value) setSelection (value, true, false, true); } sendEvent (SWT.Modify); @@ -1391,7 +1391,7 @@ LRESULT wmCommandChild (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT wmKeyDown (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmKeyDown (long hwnd, long wParam, long lParam) { if (ignoreCharacter) return null; LRESULT result = super.wmKeyDown (hwnd, wParam, lParam); if (result != null) return result; @@ -1400,7 +1400,7 @@ LRESULT wmKeyDown (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) UDACCEL udaccel = new UDACCEL (); OS.SendMessage (hwndUpDown, OS.UDM_GETACCEL, 1, udaccel); int delta = 0; - switch ((int)/*64*/wParam) { + switch ((int)wParam) { case OS.VK_UP: delta = udaccel.nInc; break; case OS.VK_DOWN: delta = -udaccel.nInc; break; case OS.VK_PRIOR: delta = pageIncrement; break; @@ -1410,7 +1410,7 @@ LRESULT wmKeyDown (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) boolean [] parseFail = new boolean [1]; int value = getSelectionText (parseFail); if (parseFail [0]) { - value = (int)/*64*/OS.SendMessage (hwndUpDown, OS.UDM_GETPOS32, 0, 0); + value = (int)OS.SendMessage (hwndUpDown, OS.UDM_GETPOS32, 0, 0); } int newValue = value + delta; int [] max = new int [1], min = new int [1]; @@ -1424,7 +1424,7 @@ LRESULT wmKeyDown (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) } /* Stop the edit control from moving the caret */ - switch ((int)/*64*/wParam) { + switch ((int)wParam) { case OS.VK_UP: case OS.VK_DOWN: return LRESULT.ZERO; @@ -1433,18 +1433,18 @@ LRESULT wmKeyDown (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) } @Override -LRESULT wmKillFocus (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmKillFocus (long hwnd, long wParam, long lParam) { boolean [] parseFail = new boolean [1]; int value = getSelectionText (parseFail); if (parseFail [0]) { - value = (int)/*64*/OS.SendMessage (hwndUpDown, OS.UDM_GETPOS32, 0, 0); + value = (int)OS.SendMessage (hwndUpDown, OS.UDM_GETPOS32, 0, 0); setSelection (value, false, true, false); } return super.wmKillFocus (hwnd, wParam, lParam); } @Override -LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmNotifyChild (NMHDR hdr, long wParam, long lParam) { switch (hdr.code) { case OS.UDN_DELTAPOS: NMUPDOWN lpnmud = new NMUPDOWN (); @@ -1474,7 +1474,7 @@ LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT wmScrollChild (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmScrollChild (long wParam, long lParam) { int code = OS.LOWORD (wParam); switch (code) { case OS.SB_THUMBPOSITION: diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabFolder.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabFolder.java index adbae64c5e..ce6d7e3ee8 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabFolder.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabFolder.java @@ -53,7 +53,7 @@ import org.eclipse.swt.internal.win32.*; public class TabFolder extends Composite { TabItem [] items; ImageList imageList; - static final long /*int*/ TabFolderProc; + static final long TabFolderProc; static final TCHAR TabFolderClass = new TCHAR (0, OS.WC_TABCONTROL, true); boolean createdAsRTL; @@ -159,7 +159,7 @@ public void addSelectionListener(SelectionListener listener) { } @Override -long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) { +long callWindowProc (long hwnd, int msg, long wParam, long lParam) { if (handle == 0) return 0; return OS.CallWindowProc (TabFolderProc, hwnd, msg, wParam, lParam); } @@ -188,7 +188,7 @@ protected void checkSubclass () { RECT insetRect = new RECT (), itemRect = new RECT (); OS.SendMessage (handle, OS.TCM_ADJUSTRECT, 0, insetRect); int width = insetRect.left - insetRect.right; - int count = (int)/*64*/OS.SendMessage (handle, OS.TCM_GETITEMCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.TCM_GETITEMCOUNT, 0, 0); if (count != 0) { OS.SendMessage (handle, OS.TCM_GETITEMRECT, count - 1, itemRect); width = Math.max (width, itemRect.right - insetRect.right); @@ -217,7 +217,7 @@ protected void checkSubclass () { } void createItem (TabItem item, int index) { - int count = (int)/*64*/OS.SendMessage (handle, OS.TCM_GETITEMCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.TCM_GETITEMCOUNT, 0, 0); if (!(0 <= index && index <= count)) error (SWT.ERROR_INVALID_RANGE); if (count == items.length) { TabItem [] newItems = new TabItem [items.length + 4]; @@ -256,7 +256,7 @@ void createHandle () { * is set. The fix is to set TTM_SETMAXTIPWIDTH to * a large value. */ - long /*int*/ hwndToolTip = OS.SendMessage (handle, OS.TCM_GETTOOLTIPS, 0, 0); + long hwndToolTip = OS.SendMessage (handle, OS.TCM_GETTOOLTIPS, 0, 0); OS.SendMessage (hwndToolTip, OS.TTM_SETMAXTIPWIDTH, 0, 0x7FFF); createdAsRTL = (style & SWT.RIGHT_TO_LEFT) != 0; @@ -269,14 +269,14 @@ void createWidget () { } void destroyItem (TabItem item) { - int count = (int)/*64*/OS.SendMessage (handle, OS.TCM_GETITEMCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.TCM_GETITEMCOUNT, 0, 0); int index = 0; while (index < count) { if (items [index] == item) break; index++; } if (index == count) return; - int selectionIndex = (int)/*64*/OS.SendMessage (handle, OS.TCM_GETCURSEL, 0, 0); + int selectionIndex = (int)OS.SendMessage (handle, OS.TCM_GETCURSEL, 0, 0); if (OS.SendMessage (handle, OS.TCM_DELETEITEM, index, 0) == 0) { error (SWT.ERROR_ITEM_NOT_REMOVED); } @@ -296,7 +296,7 @@ void destroyItem (TabItem item) { } @Override -void drawThemeBackground (long /*int*/ hDC, long /*int*/ hwnd, RECT rect) { +void drawThemeBackground (long hDC, long hwnd, RECT rect) { RECT rect2 = new RECT (); OS.GetClientRect (handle, rect2); OS.MapWindowPoints (handle, hwnd, rect2, 2); @@ -339,7 +339,7 @@ Control findThemeControl () { */ public TabItem getItem (int index) { checkWidget (); - int count = (int)/*64*/OS.SendMessage (handle, OS.TCM_GETITEMCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.TCM_GETITEMCOUNT, 0, 0); if (!(0 <= index && index < count)) error (SWT.ERROR_INVALID_RANGE); return items [index]; } @@ -368,7 +368,7 @@ public TabItem getItem (Point point) { TCHITTESTINFO pinfo = new TCHITTESTINFO (); pinfo.x = point.x; pinfo.y = point.y; - int index = (int)/*64*/OS.SendMessage (handle, OS.TCM_HITTEST, 0, pinfo); + int index = (int)OS.SendMessage (handle, OS.TCM_HITTEST, 0, pinfo); if (index == -1) return null; return items [index]; } @@ -385,7 +385,7 @@ public TabItem getItem (Point point) { */ public int getItemCount () { checkWidget (); - return (int)/*64*/OS.SendMessage (handle, OS.TCM_GETITEMCOUNT, 0, 0); + return (int)OS.SendMessage (handle, OS.TCM_GETITEMCOUNT, 0, 0); } /** @@ -406,7 +406,7 @@ public int getItemCount () { */ public TabItem [] getItems () { checkWidget (); - int count = (int)/*64*/OS.SendMessage (handle, OS.TCM_GETITEMCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.TCM_GETITEMCOUNT, 0, 0); TabItem [] result = new TabItem [count]; System.arraycopy (items, 0, result, 0, count); return result; @@ -430,7 +430,7 @@ public TabItem [] getItems () { */ public TabItem [] getSelection () { checkWidget (); - int index = (int)/*64*/OS.SendMessage (handle, OS.TCM_GETCURSEL, 0, 0); + int index = (int)OS.SendMessage (handle, OS.TCM_GETCURSEL, 0, 0); if (index == -1) return new TabItem [0]; return new TabItem [] {items [index]}; } @@ -448,7 +448,7 @@ public TabItem [] getSelection () { */ public int getSelectionIndex () { checkWidget (); - return (int)/*64*/OS.SendMessage (handle, OS.TCM_GETCURSEL, 0, 0); + return (int)OS.SendMessage (handle, OS.TCM_GETCURSEL, 0, 0); } int imageIndex (Image image) { @@ -461,7 +461,7 @@ int imageIndex (Image image) { Rectangle bounds = image.getBoundsInPixels (); imageList = display.getImageList (style & SWT.RIGHT_TO_LEFT, bounds.width, bounds.height); int index = imageList.add (image); - long /*int*/ hImageList = imageList.getHandle (); + long hImageList = imageList.getHandle (); OS.SendMessage (handle, OS.TCM_SETIMAGELIST, 0, hImageList); return index; } @@ -494,7 +494,7 @@ int imageIndex (Image image) { public int indexOf (TabItem item) { checkWidget (); if (item == null) error (SWT.ERROR_NULL_ARGUMENT); - int count = (int)/*64*/OS.SendMessage (handle, OS.TCM_GETITEMCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.TCM_GETITEMCOUNT, 0, 0); for (int i=0; i<count; i++) { if (items [i] == item) return i; } @@ -508,7 +508,7 @@ Point minimumSize (int wHint, int hHint, boolean flushCache) { for (int i=0; i<children.length; i++) { Control child = children [i]; int index = 0; - int count = (int)/*64*/OS.SendMessage (handle, OS.TCM_GETITEMCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.TCM_GETITEMCOUNT, 0, 0); while (index < count) { if (items [index].control == child) break; index++; @@ -564,7 +564,7 @@ boolean mnemonicMatch (char key) { @Override void releaseChildren (boolean destroy) { if (items != null) { - int count = (int)/*64*/OS.SendMessage (handle, OS.TCM_GETITEMCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.TCM_GETITEMCOUNT, 0, 0); for (int i=0; i<count; i++) { TabItem item = items [i]; if (item != null && !item.isDisposed ()) { @@ -589,7 +589,7 @@ void releaseWidget () { @Override void removeControl (Control control) { super.removeControl (control); - int count = (int)/*64*/OS.SendMessage (handle, OS.TCM_GETITEMCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.TCM_GETITEMCOUNT, 0, 0); for (int i=0; i<count; i++) { TabItem item = items [i]; if (item.control == control) item.setControl (null); @@ -625,7 +625,7 @@ public void removeSelectionListener (SelectionListener listener) { @Override void reskinChildren (int flags) { if (items != null) { - int count = (int)/*64*/OS.SendMessage (handle, OS.TCM_GETITEMCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.TCM_GETITEMCOUNT, 0, 0); for (int i=0; i<count; i++) { TabItem item = items [i]; if (item != null) item.reskin (flags); @@ -693,7 +693,7 @@ public void setFont (Font font) { Rectangle newRect = getClientAreaInPixels (); if (!oldRect.equals (newRect)) { sendResize (); - int index = (int)/*64*/OS.SendMessage (handle, OS.TCM_GETCURSEL, 0, 0); + int index = (int)OS.SendMessage (handle, OS.TCM_GETCURSEL, 0, 0); if (index != -1) { TabItem item = items [index]; Control control = item.control; @@ -719,13 +719,13 @@ public void setFont (Font font) { */ public void setSelection (int index) { checkWidget (); - int count = (int)/*64*/OS.SendMessage (handle, OS.TCM_GETITEMCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.TCM_GETITEMCOUNT, 0, 0); if (!(0 <= index && index < count)) return; setSelection (index, false); } void setSelection (int index, boolean notify) { - int oldIndex = (int)/*64*/OS.SendMessage (handle, OS.TCM_GETCURSEL, 0, 0); + int oldIndex = (int)OS.SendMessage (handle, OS.TCM_GETCURSEL, 0, 0); if (oldIndex == index) return; if (oldIndex != -1) { TabItem item = items [oldIndex]; @@ -735,7 +735,7 @@ void setSelection (int index, boolean notify) { } } OS.SendMessage (handle, OS.TCM_SETCURSEL, index, 0); - int newIndex = (int)/*64*/OS.SendMessage (handle, OS.TCM_GETCURSEL, 0, 0); + int newIndex = (int)OS.SendMessage (handle, OS.TCM_GETCURSEL, 0, 0); if (newIndex != -1) { TabItem item = items [newIndex]; Control control = item.control; @@ -770,8 +770,8 @@ String toolTipText (NMTTDISPINFO hdr) { if ((hdr.uFlags & OS.TTF_IDISHWND) != 0) { return null; } - int index = (int)/*64*/hdr.idFrom; - long /*int*/ hwndToolTip = OS.SendMessage (handle, OS.TCM_GETTOOLTIPS, 0, 0); + int index = (int)hdr.idFrom; + long hwndToolTip = OS.SendMessage (handle, OS.TCM_GETTOOLTIPS, 0, 0); if (hwndToolTip == hdr.hwndFrom) { /* * Bug in Windows. For some reason the reading order @@ -817,7 +817,7 @@ boolean traversePage (boolean next) { @Override void updateOrientation () { super.updateOrientation (); - long /*int*/ hwndChild = OS.GetWindow (handle, OS.GW_CHILD); + long hwndChild = OS.GetWindow (handle, OS.GW_CHILD); while (hwndChild != 0) { char [] buffer = new char [128]; int length = OS.GetClassName (hwndChild, buffer, buffer.length); @@ -845,7 +845,7 @@ void updateOrientation () { Point size = imageList.getImageSize (); display.releaseImageList (imageList); imageList = display.getImageList (style & SWT.RIGHT_TO_LEFT, size.x, size.y); - long /*int*/ hImageList = imageList.getHandle (); + long hImageList = imageList.getHandle (); OS.SendMessage (handle, OS.TCM_SETIMAGELIST, 0, hImageList); TCITEM tcItem = new TCITEM (); tcItem.mask = OS.TCIF_IMAGE; @@ -882,12 +882,12 @@ TCHAR windowClass () { } @Override -long /*int*/ windowProc () { +long windowProc () { return TabFolderProc; } @Override -LRESULT WM_GETDLGCODE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_GETDLGCODE (long wParam, long lParam) { LRESULT result = super.WM_GETDLGCODE (wParam, lParam); /* * Return DLGC_BUTTON so that mnemonics will be @@ -899,7 +899,7 @@ LRESULT WM_GETDLGCODE (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_GETOBJECT (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_GETOBJECT (long wParam, long lParam) { /* * Ensure that there is an accessible object created for this * control because support for publishing the keyboard shortcut @@ -910,10 +910,10 @@ LRESULT WM_GETOBJECT (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_KEYDOWN (long wParam, long lParam) { LRESULT result = super.WM_KEYDOWN (wParam, lParam); if (result != null) return result; - switch ((int)/*64*/wParam) { + switch ((int)wParam) { case OS.VK_LEFT: case OS.VK_RIGHT: /* @@ -925,7 +925,7 @@ LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) { */ boolean isRTL = (style & SWT.RIGHT_TO_LEFT) != 0; if (isRTL != createdAsRTL) { - long /*int*/ code = callWindowProc (handle, OS.WM_KEYDOWN, wParam == OS.VK_RIGHT ? OS.VK_LEFT : OS.VK_RIGHT, lParam); + long code = callWindowProc (handle, OS.WM_KEYDOWN, wParam == OS.VK_RIGHT ? OS.VK_LEFT : OS.VK_RIGHT, lParam); return new LRESULT (code); } break; @@ -934,7 +934,7 @@ LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_MOUSELEAVE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_MOUSELEAVE (long wParam, long lParam) { LRESULT result = super.WM_MOUSELEAVE (wParam, lParam); if (result != null) return result; /* @@ -950,7 +950,7 @@ LRESULT WM_MOUSELEAVE (long /*int*/ wParam, long /*int*/ lParam) { */ TOOLINFO lpti = new TOOLINFO (); lpti.cbSize = TOOLINFO.sizeof; - long /*int*/ hwndToolTip = OS.SendMessage (handle, OS.TCM_GETTOOLTIPS, 0, 0); + long hwndToolTip = OS.SendMessage (handle, OS.TCM_GETTOOLTIPS, 0, 0); if (OS.SendMessage (hwndToolTip, OS.TTM_GETCURRENTTOOL, 0, lpti) != 0) { if ((lpti.uFlags & OS.TTF_IDISHWND) == 0) { OS.SendMessage (hwndToolTip, OS.TTM_DELTOOL, 0, lpti); @@ -961,7 +961,7 @@ LRESULT WM_MOUSELEAVE (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_NCHITTEST (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_NCHITTEST (long wParam, long lParam) { LRESULT result = super.WM_NCHITTEST (wParam, lParam); if (result != null) return result; /* @@ -976,12 +976,12 @@ LRESULT WM_NCHITTEST (long /*int*/ wParam, long /*int*/ lParam) { * default window proc that returns HTCLIENT when * the mouse is in the client area. */ - long /*int*/ hittest = OS.DefWindowProc (handle, OS.WM_NCHITTEST, wParam, lParam); + long hittest = OS.DefWindowProc (handle, OS.WM_NCHITTEST, wParam, lParam); return new LRESULT (hittest); } @Override -LRESULT WM_NOTIFY (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_NOTIFY (long wParam, long lParam) { /* * Feature in Windows. When the tab folder window * proc processes WM_NOTIFY, it forwards this @@ -1006,7 +1006,7 @@ LRESULT WM_NOTIFY (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_PARENTNOTIFY (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_PARENTNOTIFY (long wParam, long lParam) { LRESULT result = super.WM_PARENTNOTIFY (wParam, lParam); if (result != null) return result; /* @@ -1022,7 +1022,7 @@ LRESULT WM_PARENTNOTIFY (long /*int*/ wParam, long /*int*/ lParam) { switch (code) { case OS.WM_CREATE: { int id = OS.HIWORD (wParam); - long /*int*/ hwnd = lParam; + long hwnd = lParam; if (id == ID_UPDOWN) { int bits = OS.GetWindowLong (hwnd, OS.GWL_EXSTYLE); OS.SetWindowLong (hwnd, OS.GWL_EXSTYLE, bits | OS.WS_EX_LAYOUTRTL); @@ -1035,7 +1035,7 @@ LRESULT WM_PARENTNOTIFY (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SIZE (long wParam, long lParam) { LRESULT result = super.WM_SIZE (wParam, lParam); /* * It is possible (but unlikely), that application @@ -1045,7 +1045,7 @@ LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) { * WM_SIZE message. */ if (isDisposed ()) return result; - int index = (int)/*64*/OS.SendMessage (handle, OS.TCM_GETCURSEL, 0, 0); + int index = (int)OS.SendMessage (handle, OS.TCM_GETCURSEL, 0, 0); if (index != -1) { TabItem item = items [index]; Control control = item.control; @@ -1057,7 +1057,7 @@ LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_WINDOWPOSCHANGING (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_WINDOWPOSCHANGING (long wParam, long lParam) { LRESULT result = super.WM_WINDOWPOSCHANGING (wParam, lParam); if (result != null) return result; if (!OS.IsWindowVisible (handle)) return result; @@ -1107,13 +1107,13 @@ LRESULT WM_WINDOWPOSCHANGING (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmNotifyChild (NMHDR hdr, long wParam, long lParam) { int code = hdr.code; switch (code) { case OS.TCN_SELCHANGE: case OS.TCN_SELCHANGING: TabItem item = null; - int index = (int)/*64*/OS.SendMessage (handle, OS.TCM_GETCURSEL, 0, 0); + int index = (int)OS.SendMessage (handle, OS.TCM_GETCURSEL, 0, 0); if (index != -1) item = items [index]; if (item != null) { Control control = item.control; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabItem.java index adec2a5955..ac4a3f89b6 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabItem.java @@ -135,11 +135,11 @@ void _setText (int index, String string) { if (j < i) string = new String (text, 0, j); } } - long /*int*/ hwnd = parent.handle; - long /*int*/ hHeap = OS.GetProcessHeap (); + long hwnd = parent.handle; + long hHeap = OS.GetProcessHeap (); TCHAR buffer = new TCHAR (parent.getCodePage (), string, true); int byteCount = buffer.length () * TCHAR.sizeof; - long /*int*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); + long pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); OS.MoveMemory (pszText, buffer, byteCount); TCITEM tcItem = new TCITEM (); tcItem.mask = OS.TCIF_TEXT; @@ -314,7 +314,7 @@ public void setImage (Image image) { * whenever the image or text is changed. */ if (text.indexOf ('&') != -1) _setText (index, text); - long /*int*/ hwnd = parent.handle; + long hwnd = parent.handle; TCITEM tcItem = new TCITEM (); tcItem.mask = OS.TCIF_IMAGE; tcItem.iImage = parent.imageIndex (image); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java index 4cf3fba318..f9f18ba786 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java @@ -84,7 +84,7 @@ public class Table extends Composite { TableColumn sortColumn; RECT focusRect; boolean [] columnVisible; - long /*int*/ headerToolTipHandle, hwndHeader; + long headerToolTipHandle, hwndHeader; boolean ignoreCustomDraw, ignoreDrawForeground, ignoreDrawBackground, ignoreDrawFocus, ignoreDrawSelection, ignoreDrawHot; boolean customDraw, dragStarted, explorerTheme, firstColumnImage, fixScrollWidth, tipRequested, wasSelected, wasResized, painted; boolean ignoreActivate, ignoreSelect, ignoreShrink, ignoreResize, ignoreColumnMove, ignoreColumnResize, fullRowSelect, settingItemHeight; @@ -92,7 +92,7 @@ public class Table extends Composite { int itemHeight, lastIndexOf, lastWidth, sortDirection, resizeCount, selectionForeground, hotIndex; int headerBackground = -1; int headerForeground = -1; - static /*final*/ long /*int*/ HeaderProc; + static /*final*/ long HeaderProc; static final int INSET = 4; static final int GRID_WIDTH = 1; static final int SORT_WIDTH = 10; @@ -104,7 +104,7 @@ public class Table extends Composite { static final int V_SCROLL_LIMIT = 16; static final int DRAG_IMAGE_SIZE = 301; static boolean COMPRESS_ITEMS = true; - static final long /*int*/ TableProc; + static final long TableProc; static final TCHAR TableClass = new TCHAR (0, OS.WC_LISTVIEW, true); static final TCHAR HeaderClass = new TCHAR (0, OS.WC_HEADER, true); static { @@ -221,7 +221,7 @@ void _checkShrink () { if (keys == null) { if (!ignoreShrink) { /* Resize the item array to match the item count */ - int count = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); /* * Bug in Windows. Call to OS.LVM_GETITEMCOUNT unexpectedly returns zero, @@ -290,7 +290,7 @@ TableItem _getItem (int index, boolean create, int count) { } if (keyIndex < 0) { if (count == -1) { - count = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + count = (int)OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); } //TODO - _checkGrow() doesn't return a value, check keys == null instead if (_checkGrow (count)) { @@ -450,11 +450,11 @@ public void addSelectionListener (SelectionListener listener) { } @Override -long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) { +long callWindowProc (long hwnd, int msg, long wParam, long lParam) { return callWindowProc (hwnd, msg, wParam, lParam, false); } -long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam, boolean forceSelect) { +long callWindowProc (long hwnd, int msg, long wParam, long lParam, boolean forceSelect) { if (handle == 0) return 0; if (hwndHeader != 0 && hwnd == hwndHeader) { return OS.CallWindowProc (HeaderProc, hwnd, msg, wParam, lParam); @@ -525,7 +525,7 @@ long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, lo case OS.WM_SETFONT: case OS.WM_TIMER: { if (findImageControl () != null) { - topIndex = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETTOPINDEX, 0, 0); + topIndex = (int)OS.SendMessage (handle, OS.LVM_GETTOPINDEX, 0, 0); } } } @@ -544,7 +544,7 @@ long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, lo if (msg == OS.WM_PAINT) { int bits0 = OS.GetWindowLong (handle, OS.GWL_STYLE); if ((bits0 & OS.LVS_NOCOLUMNHEADER) == 0) { - long /*int*/ hwndParent = OS.GetParent (handle), hwndOwner = 0; + long hwndParent = OS.GetParent (handle), hwndOwner = 0; while (hwndParent != 0) { int bits1 = OS.GetWindowLong (hwndParent, OS.GWL_EXSTYLE); if ((bits1 & OS.WS_EX_COMPOSITED) != 0) { @@ -578,10 +578,10 @@ long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, lo } } } - long /*int*/ code = 0; + long code = 0; if (fixPaint) { PAINTSTRUCT ps = new PAINTSTRUCT (); - long /*int*/ hDC = OS.BeginPaint (hwnd, ps); + long hDC = OS.BeginPaint (hwnd, ps); code = OS.CallWindowProc (TableProc, hwnd, OS.WM_PAINT, hDC, lParam); OS.EndPaint (hwnd, ps); } else { @@ -596,7 +596,7 @@ long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, lo if (checkSelection) { if (wasSelected || forceSelect) { Event event = new Event (); - int index = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETNEXTITEM, -1, OS.LVNI_FOCUSED); + int index = (int)OS.SendMessage (handle, OS.LVM_GETNEXTITEM, -1, OS.LVNI_FOCUSED); if (index != -1) event.item = _getItem (index); sendSelectionEvent (SWT.Selection, event, false); } @@ -624,7 +624,7 @@ long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, lo OS.SendMessage (handle, OS.LVM_SETBKCOLOR, 0, OS.CLR_NONE); OS.DefWindowProc (handle, OS.WM_SETREDRAW, 1, 0); OS.InvalidateRect (handle, null, true); - long /*int*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); + long hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); if (hwndHeader != 0) OS.InvalidateRect (hwndHeader, null, true); } //FALL THROUGH @@ -682,8 +682,8 @@ static int checkStyle (int style) { return checkBits (style, SWT.SINGLE, SWT.MULTI, 0, 0, 0, 0); } -LRESULT CDDS_ITEMPOSTPAINT (NMLVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*int*/ lParam) { - long /*int*/ hDC = nmcd.hdc; +LRESULT CDDS_ITEMPOSTPAINT (NMLVCUSTOMDRAW nmcd, long wParam, long lParam) { + long hDC = nmcd.hdc; if (explorerTheme && !ignoreCustomDraw) { hotIndex = -1; if (hooks (SWT.EraseItem) && nmcd.left != nmcd.right) { @@ -705,21 +705,21 @@ LRESULT CDDS_ITEMPOSTPAINT (NMLVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*int if (!ignoreCustomDraw && !ignoreDrawFocus && nmcd.left != nmcd.right) { if (OS.IsWindowVisible (handle) && OS.IsWindowEnabled (handle)) { if (!explorerTheme && (style & SWT.FULL_SELECTION) != 0) { - if ((int)/*64*/OS.SendMessage (handle, OS.LVM_GETBKCOLOR, 0, 0) == OS.CLR_NONE) { - int dwExStyle = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); + if ((int)OS.SendMessage (handle, OS.LVM_GETBKCOLOR, 0, 0) == OS.CLR_NONE) { + int dwExStyle = (int)OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); if ((dwExStyle & OS.LVS_EX_FULLROWSELECT) == 0) { // if ((nmcd.uItemState & OS.CDIS_FOCUS) != 0) { if (OS.SendMessage (handle, OS.LVM_GETNEXTITEM, -1, OS.LVNI_FOCUSED) == nmcd.dwItemSpec) { if (handle == OS.GetFocus ()) { - int uiState = (int)/*64*/OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); + int uiState = (int)OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); if ((uiState & OS.UISF_HIDEFOCUS) == 0) { RECT rect = new RECT (); rect.left = OS.LVIR_BOUNDS; boolean oldIgnore = ignoreCustomDraw; ignoreCustomDraw = true; OS.SendMessage (handle, OS. LVM_GETITEMRECT, nmcd.dwItemSpec, rect); - long /*int*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); - int index = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_ORDERTOINDEX, 0, 0); + long hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); + int index = (int)OS.SendMessage (hwndHeader, OS.HDM_ORDERTOINDEX, 0, 0); RECT itemRect = new RECT (); if (index == 0) { itemRect.left = OS.LVIR_LABEL; @@ -743,7 +743,7 @@ LRESULT CDDS_ITEMPOSTPAINT (NMLVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*int return null; } -LRESULT CDDS_ITEMPREPAINT (NMLVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT CDDS_ITEMPREPAINT (NMLVCUSTOMDRAW nmcd, long wParam, long lParam) { /* * Bug in Windows. When the table has the extended style * LVS_EX_FULLROWSELECT and LVM_SETBKCOLOR is used with @@ -759,8 +759,8 @@ LRESULT CDDS_ITEMPREPAINT (NMLVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*int* if (!ignoreCustomDraw) { if (OS.IsWindowVisible (handle) && OS.IsWindowEnabled (handle)) { if (!explorerTheme && (style & SWT.FULL_SELECTION) != 0) { - if ((int)/*64*/OS.SendMessage (handle, OS.LVM_GETBKCOLOR, 0, 0) == OS.CLR_NONE) { - int dwExStyle = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); + if ((int)OS.SendMessage (handle, OS.LVM_GETBKCOLOR, 0, 0) == OS.CLR_NONE) { + int dwExStyle = (int)OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); if ((dwExStyle & OS.LVS_EX_FULLROWSELECT) == 0) { if ((nmcd.uItemState & OS.CDIS_FOCUS) != 0) { nmcd.uItemState &= ~OS.CDIS_FOCUS; @@ -772,10 +772,10 @@ LRESULT CDDS_ITEMPREPAINT (NMLVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*int* } } if (explorerTheme && !ignoreCustomDraw) { - hotIndex = (nmcd.uItemState & OS.CDIS_HOT) != 0 ? (int)/*64*/nmcd.dwItemSpec : -1; + hotIndex = (nmcd.uItemState & OS.CDIS_HOT) != 0 ? (int)nmcd.dwItemSpec : -1; if (hooks (SWT.EraseItem) && nmcd.left != nmcd.right) { OS.SaveDC (nmcd.hdc); - long /*int*/ hrgn = OS.CreateRectRgn (0, 0, 0, 0); + long hrgn = OS.CreateRectRgn (0, 0, 0, 0); OS.SelectClipRgn (nmcd.hdc, hrgn); OS.DeleteObject (hrgn); } @@ -783,7 +783,7 @@ LRESULT CDDS_ITEMPREPAINT (NMLVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*int* return new LRESULT (OS.CDRF_NOTIFYSUBITEMDRAW | OS.CDRF_NOTIFYPOSTPAINT); } -LRESULT CDDS_POSTPAINT (NMLVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT CDDS_POSTPAINT (NMLVCUSTOMDRAW nmcd, long wParam, long lParam) { if (ignoreCustomDraw) return null; /* * Bug in Windows. When the table has the extended style @@ -795,8 +795,8 @@ LRESULT CDDS_POSTPAINT (NMLVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*int*/ l */ if (--customCount == 0 && OS.IsWindowVisible (handle)) { if (!explorerTheme && (style & SWT.FULL_SELECTION) != 0) { - if ((int)/*64*/OS.SendMessage (handle, OS.LVM_GETBKCOLOR, 0, 0) == OS.CLR_NONE) { - int dwExStyle = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); + if ((int)OS.SendMessage (handle, OS.LVM_GETBKCOLOR, 0, 0) == OS.CLR_NONE) { + int dwExStyle = (int)OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); if ((dwExStyle & OS.LVS_EX_FULLROWSELECT) == 0) { int bits = OS.LVS_EX_FULLROWSELECT; /* @@ -805,8 +805,8 @@ LRESULT CDDS_POSTPAINT (NMLVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*int*/ l * has a tooltip, the tooltip is hidden. The fix is to clear * the tooltip before setting the bits and then reset it. */ - long /*int*/ hwndToolTip = OS.SendMessage (handle, OS.LVM_SETTOOLTIPS, 0, 0); - long /*int*/ rgn = OS.CreateRectRgn (0, 0, 0, 0); + long hwndToolTip = OS.SendMessage (handle, OS.LVM_SETTOOLTIPS, 0, 0); + long rgn = OS.CreateRectRgn (0, 0, 0, 0); int result = OS.GetUpdateRgn (handle, rgn, true); OS.SendMessage (handle, OS.LVM_SETEXTENDEDLISTVIEWSTYLE, bits, bits); OS.ValidateRect (handle, null); @@ -825,7 +825,7 @@ LRESULT CDDS_POSTPAINT (NMLVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*int*/ l return null; } -LRESULT CDDS_PREPAINT (NMLVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT CDDS_PREPAINT (NMLVCUSTOMDRAW nmcd, long wParam, long lParam) { if (ignoreCustomDraw) { return new LRESULT (OS.CDRF_NOTIFYITEMDRAW | OS.CDRF_NOTIFYPOSTPAINT); } @@ -839,8 +839,8 @@ LRESULT CDDS_PREPAINT (NMLVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*int*/ lP */ if (customCount++ == 0 && OS.IsWindowVisible (handle)) { if (!explorerTheme && (style & SWT.FULL_SELECTION) != 0) { - if ((int)/*64*/OS.SendMessage (handle, OS.LVM_GETBKCOLOR, 0, 0) == OS.CLR_NONE) { - int dwExStyle = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); + if ((int)OS.SendMessage (handle, OS.LVM_GETBKCOLOR, 0, 0) == OS.CLR_NONE) { + int dwExStyle = (int)OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); if ((dwExStyle & OS.LVS_EX_FULLROWSELECT) != 0) { int bits = OS.LVS_EX_FULLROWSELECT; /* @@ -849,8 +849,8 @@ LRESULT CDDS_PREPAINT (NMLVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*int*/ lP * has a tooltip, the tooltip is hidden. The fix is to clear * the tooltip before setting the bits and then reset it. */ - long /*int*/ hwndToolTip = OS.SendMessage (handle, OS.LVM_SETTOOLTIPS, 0, 0); - long /*int*/ rgn = OS.CreateRectRgn (0, 0, 0, 0); + long hwndToolTip = OS.SendMessage (handle, OS.LVM_SETTOOLTIPS, 0, 0); + long rgn = OS.CreateRectRgn (0, 0, 0, 0); int result = OS.GetUpdateRgn (handle, rgn, true); OS.SendMessage (handle, OS.LVM_SETEXTENDEDLISTVIEWSTYLE, bits, 0); OS.ValidateRect (handle, null); @@ -876,7 +876,7 @@ LRESULT CDDS_PREPAINT (NMLVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*int*/ lP RECT rect = new RECT (); OS.SetRect (rect, nmcd.left, nmcd.top, nmcd.right, nmcd.bottom); if (explorerTheme && columnCount == 0) { - long /*int*/ hDC = nmcd.hdc; + long hDC = nmcd.hdc; if (OS.IsWindowEnabled (handle) || findImageControl () != null) { drawBackground (hDC, rect); } else { @@ -888,7 +888,7 @@ LRESULT CDDS_PREPAINT (NMLVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*int*/ lP fillImageBackground (nmcd.hdc, control, rect, 0, 0); } else { final boolean enabled = OS.IsWindowEnabled (handle); - if (enabled && (int)/*64*/OS.SendMessage (handle, OS.LVM_GETBKCOLOR, 0, 0) == OS.CLR_NONE || !enabled && hasCustomBackground()) { + if (enabled && (int)OS.SendMessage (handle, OS.LVM_GETBKCOLOR, 0, 0) == OS.CLR_NONE || !enabled && hasCustomBackground()) { if (control == null) control = this; fillBackground (nmcd.hdc, control.getBackgroundPixel (), rect); if (OS.IsAppThemed ()) { @@ -899,7 +899,7 @@ LRESULT CDDS_PREPAINT (NMLVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*int*/ lP int clrSortBk = getSortColumnPixel (); RECT columnRect = new RECT (), headerRect = new RECT (); OS.GetClientRect (handle, columnRect); - long /*int*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); + long hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); if (OS.SendMessage (hwndHeader, OS.HDM_GETITEMRECT, index, headerRect) != 0) { OS.MapWindowPoints (hwndHeader, handle, headerRect, 2); columnRect.left = headerRect.left; @@ -918,10 +918,10 @@ LRESULT CDDS_PREPAINT (NMLVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*int*/ lP return new LRESULT (OS.CDRF_NOTIFYITEMDRAW | OS.CDRF_NOTIFYPOSTPAINT); } -LRESULT CDDS_SUBITEMPOSTPAINT (NMLVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT CDDS_SUBITEMPOSTPAINT (NMLVCUSTOMDRAW nmcd, long wParam, long lParam) { if (ignoreCustomDraw) return null; if (nmcd.left == nmcd.right) return new LRESULT (OS.CDRF_DODEFAULT); - long /*int*/ hDC = nmcd.hdc; + long hDC = nmcd.hdc; if (ignoreDrawForeground) OS.RestoreDC (hDC, -1); if (OS.IsWindowVisible (handle)) { /* @@ -933,13 +933,13 @@ LRESULT CDDS_SUBITEMPOSTPAINT (NMLVCUSTOMDRAW nmcd, long /*int*/ wParam, long /* * Update region is saved and restored around LVM_SETSELECTEDCOLUMN * to prevent infinite WM_PAINT on Vista. */ - if ((int)/*64*/OS.SendMessage (handle, OS.LVM_GETBKCOLOR, 0, 0) != OS.CLR_NONE) { + if ((int)OS.SendMessage (handle, OS.LVM_GETBKCOLOR, 0, 0) != OS.CLR_NONE) { if ((sortDirection & (SWT.UP | SWT.DOWN)) != 0) { if (sortColumn != null && !sortColumn.isDisposed ()) { - int oldColumn = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETSELECTEDCOLUMN, 0, 0); + int oldColumn = (int)OS.SendMessage (handle, OS.LVM_GETSELECTEDCOLUMN, 0, 0); if (oldColumn == -1) { int newColumn = indexOf (sortColumn); - long /*int*/ rgn = OS.CreateRectRgn (0, 0, 0, 0); + long rgn = OS.CreateRectRgn (0, 0, 0, 0); int result = OS.GetUpdateRgn (handle, rgn, true); OS.SendMessage (handle, OS.LVM_SETSELECTEDCOLUMN, newColumn, 0); OS.ValidateRect (handle, null); @@ -950,7 +950,7 @@ LRESULT CDDS_SUBITEMPOSTPAINT (NMLVCUSTOMDRAW nmcd, long /*int*/ wParam, long /* } } if (hooks (SWT.PaintItem)) { - TableItem item = _getItem ((int)/*64*/nmcd.dwItemSpec); + TableItem item = _getItem ((int)nmcd.dwItemSpec); sendPaintItemEvent (item, nmcd); //widget could be disposed at this point } @@ -964,8 +964,8 @@ LRESULT CDDS_SUBITEMPOSTPAINT (NMLVCUSTOMDRAW nmcd, long /*int*/ wParam, long /* return null; } -LRESULT CDDS_SUBITEMPREPAINT (NMLVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*int*/ lParam) { - long /*int*/ hDC = nmcd.hdc; +LRESULT CDDS_SUBITEMPREPAINT (NMLVCUSTOMDRAW nmcd, long wParam, long lParam) { + long hDC = nmcd.hdc; if (explorerTheme && !ignoreCustomDraw && hooks (SWT.EraseItem) && (nmcd.left != nmcd.right)) { OS.RestoreDC (hDC, -1); } @@ -979,9 +979,9 @@ LRESULT CDDS_SUBITEMPREPAINT (NMLVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*i * * NOTE: Force the item to be created if it does not exist. */ - TableItem item = _getItem ((int)/*64*/nmcd.dwItemSpec); + TableItem item = _getItem ((int)nmcd.dwItemSpec); if (item == null || item.isDisposed ()) return null; - long /*int*/ hFont = item.fontHandle (nmcd.iSubItem); + long hFont = item.fontHandle (nmcd.iSubItem); if (hFont != -1) OS.SelectObject (hDC, hFont); if (ignoreCustomDraw || (nmcd.left == nmcd.right)) { return new LRESULT (hFont == -1 ? OS.CDRF_DODEFAULT : OS.CDRF_NEWFONT); @@ -992,7 +992,7 @@ LRESULT CDDS_SUBITEMPREPAINT (NMLVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*i if (OS.IsWindowVisible (handle)) { Event measureEvent = null; if (hooks (SWT.MeasureItem)) { - measureEvent = sendMeasureItemEvent (item, (int)/*64*/nmcd.dwItemSpec, nmcd.iSubItem, nmcd.hdc); + measureEvent = sendMeasureItemEvent (item, (int)nmcd.dwItemSpec, nmcd.iSubItem, nmcd.hdc); if (isDisposed () || item.isDisposed ()) return null; } if (hooks (SWT.EraseItem)) { @@ -1018,7 +1018,7 @@ LRESULT CDDS_SUBITEMPREPAINT (NMLVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*i final boolean enabled = OS.IsWindowEnabled (handle); if (OS.IsWindowVisible (handle) && enabled) { if (!explorerTheme && !ignoreDrawSelection && (style & SWT.FULL_SELECTION) != 0) { - int bits = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); + int bits = (int)OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); if ((bits & OS.LVS_EX_FULLROWSELECT) == 0) { /* * Bug in Windows. For some reason, CDIS_SELECTED always set, @@ -1028,8 +1028,8 @@ LRESULT CDDS_SUBITEMPREPAINT (NMLVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*i LVITEM lvItem = new LVITEM (); lvItem.mask = OS.LVIF_STATE; lvItem.stateMask = OS.LVIS_SELECTED; - lvItem.iItem = (int)/*64*/nmcd.dwItemSpec; - long /*int*/ result = OS.SendMessage (handle, OS.LVM_GETITEM, 0, lvItem); + lvItem.iItem = (int)nmcd.dwItemSpec; + long result = OS.SendMessage (handle, OS.LVM_GETITEM, 0, lvItem); if ((result != 0 && (lvItem.state & OS.LVIS_SELECTED) != 0)) { int clrSelection = -1; if (nmcd.iSubItem == 0) { @@ -1051,7 +1051,7 @@ LRESULT CDDS_SUBITEMPREPAINT (NMLVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*i } } if (clrSelection != -1) { - RECT rect = item.getBounds ((int)/*64*/nmcd.dwItemSpec, nmcd.iSubItem, true, nmcd.iSubItem != 0, true, false, hDC); + RECT rect = item.getBounds ((int)nmcd.dwItemSpec, nmcd.iSubItem, true, nmcd.iSubItem != 0, true, false, hDC); fillBackground (hDC, clrSelection, rect); } } @@ -1069,7 +1069,7 @@ LRESULT CDDS_SUBITEMPREPAINT (NMLVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*i boolean hasAttributes = true; if (hFont == -1 && clrText == -1 && clrTextBk == -1) { if (item.cellForeground == null && item.cellBackground == null && item.cellFont == null) { - int count = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); + int count = (int)OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); if (count == 1) hasAttributes = false; } } @@ -1084,7 +1084,7 @@ LRESULT CDDS_SUBITEMPREPAINT (NMLVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*i Control control = findBackgroundControl (); if (control == null) control = this; if (control.backgroundImage == null) { - if ((int)/*64*/OS.SendMessage (handle, OS.LVM_GETBKCOLOR, 0, 0) != OS.CLR_NONE) { + if ((int)OS.SendMessage (handle, OS.LVM_GETBKCOLOR, 0, 0) != OS.CLR_NONE) { nmcd.clrTextBk = control.getBackgroundPixel (); } } @@ -1107,9 +1107,9 @@ LRESULT CDDS_SUBITEMPREPAINT (NMLVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*i * to prevent infinite WM_PAINT on Vista. */ if ((enabled && clrTextBk != -1) || (!enabled && hasCustomBackground())) { - int oldColumn = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETSELECTEDCOLUMN, 0, 0); + int oldColumn = (int)OS.SendMessage (handle, OS.LVM_GETSELECTEDCOLUMN, 0, 0); if (oldColumn != -1 && oldColumn == nmcd.iSubItem) { - long /*int*/ rgn = OS.CreateRectRgn (0, 0, 0, 0); + long rgn = OS.CreateRectRgn (0, 0, 0, 0); int result = OS.GetUpdateRgn (handle, rgn, true); OS.SendMessage (handle, OS.LVM_SETSELECTEDCOLUMN, -1, 0); OS.ValidateRect (handle, null); @@ -1168,7 +1168,7 @@ boolean checkData (TableItem item, int index, boolean redraw) { } @Override -boolean checkHandle (long /*int*/ hwnd) { +boolean checkHandle (long hwnd) { if (hwnd == handle) return true; return hwnd == OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); } @@ -1201,7 +1201,7 @@ protected void checkSubclass () { */ public void clear (int index) { checkWidget (); - int count = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); if (!(0 <= index && index < count)) error (SWT.ERROR_INVALID_RANGE); TableItem item = _getItem (index, false); if (item != null) { @@ -1258,7 +1258,7 @@ public void clear (int index) { public void clear (int start, int end) { checkWidget (); if (start > end) return; - int count = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); if (!(0 <= start && start <= end && end < count)) { error (SWT.ERROR_INVALID_RANGE); } @@ -1333,7 +1333,7 @@ public void clear (int [] indices) { checkWidget (); if (indices == null) error (SWT.ERROR_NULL_ARGUMENT); if (indices.length == 0) return; - int count = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); for (int i=0; i<indices.length; i++) { if (!(0 <= indices [i] && indices [i] < count)) { error (SWT.ERROR_INVALID_RANGE); @@ -1398,7 +1398,7 @@ public void clearAll () { checkWidget (); LVITEM lvItem = null; boolean cleared = false; - int count = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); for (int i=0; i<count; i++) { TableItem item = _getItem (i, false); if (item != null) { @@ -1469,18 +1469,18 @@ public void clearAll () { bits |= wHint & 0xFFFF; } else { int width = 0; - int count = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); + int count = (int)OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); for (int i=0; i<count; i++) { width += OS.SendMessage (handle, OS.LVM_GETCOLUMNWIDTH, i, 0); } bits |= width & 0xFFFF; } - long /*int*/ result = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, -1, OS.MAKELPARAM (bits, 0xFFFF)); + long result = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, -1, OS.MAKELPARAM (bits, 0xFFFF)); int width = OS.LOWORD (result); - long /*int*/ empty = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 0, 0); - long /*int*/ oneItem = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 1, 0); + long empty = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 0, 0); + long oneItem = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 1, 0); int itemHeight = OS.HIWORD (oneItem) - OS.HIWORD (empty); - height += (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0) * itemHeight; + height += (int)OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0) * itemHeight; if (width == 0) width = DEFAULT_WIDTH; if (height == 0) height = DEFAULT_HEIGHT; if (wHint != SWT.DEFAULT) width = wHint; @@ -1520,8 +1520,8 @@ void createHandle () { /* Set the checkbox image list */ if ((style & SWT.CHECK) != 0) { - long /*int*/ empty = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 0, 0); - long /*int*/ oneItem = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 1, 0); + long empty = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 0, 0); + long oneItem = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 1, 0); int width = OS.HIWORD (oneItem) - OS.HIWORD (empty), height = width; setCheckboxImageList (width, height, false); OS.SendMessage (handle, OS. LVM_SETCALLBACKMASK, OS.LVIS_STATEIMAGEMASK, 0); @@ -1539,7 +1539,7 @@ void createHandle () { * The control will not destroy a font that it did not * create. */ - long /*int*/ hFont = OS.GetStockObject (OS.SYSTEM_FONT); + long hFont = OS.GetStockObject (OS.SYSTEM_FONT); OS.SendMessage (handle, OS.WM_SETFONT, hFont, 0); /* @@ -1551,8 +1551,8 @@ void createHandle () { */ LVCOLUMN lvColumn = new LVCOLUMN (); lvColumn.mask = OS.LVCF_TEXT | OS.LVCF_WIDTH; - long /*int*/ hHeap = OS.GetProcessHeap (); - long /*int*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, TCHAR.sizeof); + long hHeap = OS.GetProcessHeap (); + long pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, TCHAR.sizeof); lvColumn.pszText = pszText; OS.SendMessage (handle, OS.LVM_INSERTCOLUMN, 0, lvColumn); OS.HeapFree (hHeap, 0, pszText); @@ -1573,7 +1573,7 @@ void createHandle () { if ((style & SWT.RIGHT_TO_LEFT) != 0) { int bits2 = OS.GetWindowLong (hwndHeader, OS.GWL_EXSTYLE); OS.SetWindowLong (hwndHeader, OS.GWL_EXSTYLE, bits2 | OS.WS_EX_LAYOUTRTL); - long /*int*/ hwndTooltop = OS.SendMessage (handle, OS.LVM_GETTOOLTIPS, 0, 0); + long hwndTooltop = OS.SendMessage (handle, OS.LVM_GETTOOLTIPS, 0, 0); int bits3 = OS.GetWindowLong (hwndTooltop, OS.GWL_EXSTYLE); OS.SetWindowLong (hwndTooltop, OS.GWL_EXSTYLE, bits3 | OS.WS_EX_LAYOUTRTL); } @@ -1615,7 +1615,7 @@ void createHeaderToolTips () { void createItem (TableColumn column, int index) { if (!(0 <= index && index <= columnCount)) error (SWT.ERROR_INVALID_RANGE); - int oldColumn = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETSELECTEDCOLUMN, 0, 0); + int oldColumn = (int)OS.SendMessage (handle, OS.LVM_GETSELECTEDCOLUMN, 0, 0); if (oldColumn >= index) { OS.SendMessage (handle, OS.LVM_SETSELECTEDCOLUMN, oldColumn + 1, 0); } @@ -1624,7 +1624,7 @@ void createItem (TableColumn column, int index) { System.arraycopy (columns, 0, newColumns, 0, columns.length); columns = newColumns; } - int itemCount = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + int itemCount = (int)OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); for (int i=0; i<itemCount; i++) { TableItem item = _getItem (i, false); if (item != null) { @@ -1705,9 +1705,9 @@ void createItem (TableColumn column, int index) { OS.SendMessage (handle, OS.LVM_GETCOLUMN, 1, lvColumn); int width = lvColumn.cx; int cchTextMax = 1024; - long /*int*/ hHeap = OS.GetProcessHeap (); + long hHeap = OS.GetProcessHeap (); int byteCount = cchTextMax * TCHAR.sizeof; - long /*int*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); + long pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); lvColumn.mask = OS.LVCF_TEXT | OS.LVCF_IMAGE | OS.LVCF_WIDTH | OS.LVCF_FMT; lvColumn.pszText = pszText; lvColumn.cchTextMax = cchTextMax; @@ -1777,7 +1777,7 @@ void createItem (TableColumn column, int index) { } void createItem (TableItem item, int index) { - int count = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); if (!(0 <= index && index <= count)) error (SWT.ERROR_INVALID_RANGE); _checkGrow (count); LVITEM lvItem = new LVITEM (); @@ -1799,7 +1799,7 @@ void createItem (TableItem item, int index) { /* Insert the item */ setDeferResize (true); ignoreSelect = ignoreShrink = true; - int result = (int)/*64*/OS.SendMessage (handle, OS.LVM_INSERTITEM, 0, lvItem); + int result = (int)OS.SendMessage (handle, OS.LVM_INSERTITEM, 0, lvItem); ignoreSelect = ignoreShrink = false; if (result == -1) error (SWT.ERROR_ITEM_NOT_ADDED); _insertItem (index, item, count); @@ -1911,7 +1911,7 @@ public void deselect (int index) { */ public void deselect (int start, int end) { checkWidget (); - int count = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); if (start == 0 && end == count - 1) { deselectAll (); } else { @@ -1954,7 +1954,7 @@ void destroyItem (TableColumn column) { if (columns [index] == column) break; index++; } - int oldColumn = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETSELECTEDCOLUMN, 0, 0); + int oldColumn = (int)OS.SendMessage (handle, OS.LVM_GETSELECTEDCOLUMN, 0, 0); if (oldColumn == index) { OS.SendMessage (handle, OS.LVM_SETSELECTEDCOLUMN, -1, 0); } else { @@ -1984,9 +1984,9 @@ void destroyItem (TableColumn column) { if (columnCount > 1) { index = 1; int cchTextMax = 1024; - long /*int*/ hHeap = OS.GetProcessHeap (); + long hHeap = OS.GetProcessHeap (); int byteCount = cchTextMax * TCHAR.sizeof; - long /*int*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); + long pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); LVCOLUMN lvColumn = new LVCOLUMN (); lvColumn.mask = OS.LVCF_TEXT | OS.LVCF_IMAGE | OS.LVCF_WIDTH | OS.LVCF_FMT; lvColumn.pszText = pszText; @@ -1997,8 +1997,8 @@ void destroyItem (TableColumn column) { OS.SendMessage (handle, OS.LVM_SETCOLUMN, 0, lvColumn); if (pszText != 0) OS.HeapFree (hHeap, 0, pszText); } else { - long /*int*/ hHeap = OS.GetProcessHeap (); - long /*int*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, TCHAR.sizeof); + long hHeap = OS.GetProcessHeap (); + long pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, TCHAR.sizeof); LVCOLUMN lvColumn = new LVCOLUMN (); lvColumn.mask = OS.LVCF_TEXT | OS.LVCF_IMAGE | OS.LVCF_WIDTH | OS.LVCF_FMT; lvColumn.pszText = pszText; @@ -2009,7 +2009,7 @@ void destroyItem (TableColumn column) { HDITEM hdItem = new HDITEM (); hdItem.mask = OS.HDI_FORMAT; hdItem.fmt = OS.HDF_LEFT; - long /*int*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); + long hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); OS.SendMessage (hwndHeader, OS.HDM_SETITEM, index, hdItem); } setRedraw (true); @@ -2029,7 +2029,7 @@ void destroyItem (TableColumn column) { lvItem.mask = OS.LVIF_TEXT | OS.LVIF_IMAGE; lvItem.pszText = OS.LPSTR_TEXTCALLBACK; lvItem.iImage = OS.I_IMAGECALLBACK; - int itemCount = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + int itemCount = (int)OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); for (int i=0; i<itemCount; i++) { lvItem.iItem = i; OS.SendMessage (handle, OS.LVM_SETITEM, 0, lvItem); @@ -2044,7 +2044,7 @@ void destroyItem (TableColumn column) { if (first) index = 0; System.arraycopy (columns, index + 1, columns, index, --columnCount - index); columns [columnCount] = null; - int itemCount = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + int itemCount = (int)OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); for (int i=0; i<itemCount; i++) { TableItem item = _getItem (i, false); if (item != null) { @@ -2163,7 +2163,7 @@ void destroyItem (TableColumn column) { } void destroyItem (TableItem item) { - int count = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); int index = 0; while (index < count) { if (_getItem (index, false) == item) break; @@ -2172,7 +2172,7 @@ void destroyItem (TableItem item) { if (index == count) return; setDeferResize (true); ignoreSelect = ignoreShrink = true; - long /*int*/ code = OS.SendMessage (handle, OS.LVM_DELETEITEM, index, 0); + long code = OS.SendMessage (handle, OS.LVM_DELETEITEM, index, 0); ignoreSelect = ignoreShrink = false; if (code == 0) error (SWT.ERROR_ITEM_NOT_REMOVED); _removeItem (index, count); @@ -2189,11 +2189,11 @@ void fixCheckboxImageList (boolean fixScroll) { * the state image list to be the same size as the image list. */ if ((style & SWT.CHECK) == 0) return; - long /*int*/ hImageList = OS.SendMessage (handle, OS.LVM_GETIMAGELIST, OS.LVSIL_SMALL, 0); + long hImageList = OS.SendMessage (handle, OS.LVM_GETIMAGELIST, OS.LVSIL_SMALL, 0); if (hImageList == 0) return; int [] cx = new int [1], cy = new int [1]; OS.ImageList_GetIconSize (hImageList, cx, cy); - long /*int*/ hStateList = OS.SendMessage (handle, OS.LVM_GETIMAGELIST, OS.LVSIL_STATE, 0); + long hStateList = OS.SendMessage (handle, OS.LVM_GETIMAGELIST, OS.LVSIL_STATE, 0); if (hStateList == 0) return; int [] stateCx = new int [1], stateCy = new int [1]; OS.ImageList_GetIconSize (hStateList, stateCx, stateCy); @@ -2203,7 +2203,7 @@ void fixCheckboxImageList (boolean fixScroll) { void fixCheckboxImageListColor (boolean fixScroll) { if ((style & SWT.CHECK) == 0) return; - long /*int*/ hStateList = OS.SendMessage (handle, OS.LVM_GETIMAGELIST, OS.LVSIL_STATE, 0); + long hStateList = OS.SendMessage (handle, OS.LVM_GETIMAGELIST, OS.LVSIL_STATE, 0); if (hStateList == 0) return; int [] cx = new int [1], cy = new int [1]; OS.ImageList_GetIconSize (hStateList, cx, cy); @@ -2334,7 +2334,7 @@ public TableColumn [] getColumns () { int getFocusIndex () { // checkWidget (); - return (int)/*64*/OS.SendMessage (handle, OS.LVM_GETNEXTITEM, -1, OS.LVNI_FOCUSED); + return (int)OS.SendMessage (handle, OS.LVM_GETNEXTITEM, -1, OS.LVNI_FOCUSED); } /** @@ -2460,7 +2460,7 @@ public boolean getHeaderVisible () { */ public TableItem getItem (int index) { checkWidget (); - int count = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); if (!(0 <= index && index < count)) error (SWT.ERROR_INVALID_RANGE); return _getItem (index); } @@ -2495,7 +2495,7 @@ public TableItem getItem (Point point) { } TableItem getItemInPixels (Point point) { - int count = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); if (count == 0) return null; LVHITTESTINFO pinfo = new LVHITTESTINFO (); pinfo.x = point.x; @@ -2512,7 +2512,7 @@ TableItem getItemInPixels (Point point) { RECT rect = new RECT (); rect.left = OS.LVIR_ICON; ignoreCustomDraw = true; - long /*int*/ code = OS.SendMessage (handle, OS.LVM_GETITEMRECT, 0, rect); + long code = OS.SendMessage (handle, OS.LVM_GETITEMRECT, 0, rect); ignoreCustomDraw = false; if (code != 0) { pinfo.x = rect.left; @@ -2575,7 +2575,7 @@ TableItem getItemInPixels (Point point) { */ public int getItemCount () { checkWidget (); - return (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + return (int)OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); } /** @@ -2596,8 +2596,8 @@ public int getItemHeight () { int getItemHeightInPixels () { if (!painted && hooks (SWT.MeasureItem)) hitTestSelection (0, 0, 0); - long /*int*/ empty = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 0, 0); - long /*int*/ oneItem = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 1, 0); + long empty = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 0, 0); + long oneItem = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 1, 0); return OS.HIWORD (oneItem) - OS.HIWORD (empty); } @@ -2619,7 +2619,7 @@ int getItemHeightInPixels () { */ public TableItem [] getItems () { checkWidget (); - int count = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); TableItem [] result = new TableItem [count]; if ((style & SWT.VIRTUAL) != 0) { for (int i=0; i<count; i++) { @@ -2655,7 +2655,7 @@ public boolean getLinesVisible () { } private boolean _getLinesVisible() { - int bits = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); + int bits = (int)OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); return (bits & OS.LVS_EX_GRIDLINES) != 0; } @@ -2677,9 +2677,9 @@ private boolean _getLinesVisible() { */ public TableItem [] getSelection () { checkWidget (); - int i = -1, j = 0, count = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETSELECTEDCOUNT, 0, 0); + int i = -1, j = 0, count = (int)OS.SendMessage (handle, OS.LVM_GETSELECTEDCOUNT, 0, 0); TableItem [] result = new TableItem [count]; - while ((i = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETNEXTITEM, i, OS.LVNI_SELECTED)) != -1) { + while ((i = (int)OS.SendMessage (handle, OS.LVM_GETNEXTITEM, i, OS.LVNI_SELECTED)) != -1) { result [j++] = _getItem (i); } return result; @@ -2697,7 +2697,7 @@ public TableItem [] getSelection () { */ public int getSelectionCount () { checkWidget (); - return (int)/*64*/OS.SendMessage (handle, OS.LVM_GETSELECTEDCOUNT, 0, 0); + return (int)OS.SendMessage (handle, OS.LVM_GETSELECTEDCOUNT, 0, 0); } /** @@ -2713,11 +2713,11 @@ public int getSelectionCount () { */ public int getSelectionIndex () { checkWidget (); - int focusIndex = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETNEXTITEM, -1, OS.LVNI_FOCUSED); - int selectedIndex = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETNEXTITEM, -1, OS.LVNI_SELECTED); + int focusIndex = (int)OS.SendMessage (handle, OS.LVM_GETNEXTITEM, -1, OS.LVNI_FOCUSED); + int selectedIndex = (int)OS.SendMessage (handle, OS.LVM_GETNEXTITEM, -1, OS.LVNI_SELECTED); if (focusIndex == selectedIndex) return selectedIndex; int i = -1; - while ((i = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETNEXTITEM, i, OS.LVNI_SELECTED)) != -1) { + while ((i = (int)OS.SendMessage (handle, OS.LVM_GETNEXTITEM, i, OS.LVNI_SELECTED)) != -1) { if (i == focusIndex) return i; } return selectedIndex; @@ -2741,9 +2741,9 @@ public int getSelectionIndex () { */ public int [] getSelectionIndices () { checkWidget (); - int i = -1, j = 0, count = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETSELECTEDCOUNT, 0, 0); + int i = -1, j = 0, count = (int)OS.SendMessage (handle, OS.LVM_GETSELECTEDCOUNT, 0, 0); int [] result = new int [count]; - while ((i = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETNEXTITEM, i, OS.LVNI_SELECTED)) != -1) { + while ((i = (int)OS.SendMessage (handle, OS.LVM_GETNEXTITEM, i, OS.LVNI_SELECTED)) != -1) { result [j++] = i; } return result; @@ -2816,11 +2816,11 @@ public int getTopIndex () { * is displaying blank lines at the top of the controls. The * fix is to check for a negative number and return zero instead. */ - return Math.max (0, (int)/*64*/OS.SendMessage (handle, OS.LVM_GETTOPINDEX, 0, 0)); + return Math.max (0, (int)OS.SendMessage (handle, OS.LVM_GETTOPINDEX, 0, 0)); } boolean hasChildren () { - long /*int*/ hwndChild = OS.GetWindow (handle, OS.GW_CHILD); + long hwndChild = OS.GetWindow (handle, OS.GW_CHILD); while (hwndChild != 0) { if (hwndChild != hwndHeader) return true; hwndChild = OS.GetWindow (hwndChild, OS.GW_HWNDNEXT); @@ -2829,16 +2829,16 @@ boolean hasChildren () { } boolean hitTestSelection (int index, int x, int y) { - int count = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); if (count == 0) return false; if (!hooks (SWT.MeasureItem)) return false; boolean result = false; if (0 <= index && index < count) { TableItem item = _getItem (index); - long /*int*/ hDC = OS.GetDC (handle); - long /*int*/ oldFont = 0, newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); + long hDC = OS.GetDC (handle); + long oldFont = 0, newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont); - long /*int*/ hFont = item.fontHandle (0); + long hFont = item.fontHandle (0); if (hFont != -1) hFont = OS.SelectObject (hDC, hFont); Event event = sendMeasureItemEvent (item, index, 0, hDC); if (event.getBoundsInPixels ().contains (x, y)) result = true; @@ -2862,7 +2862,7 @@ int imageIndex (Image image, int column) { imageList = display.getImageList (style & SWT.RIGHT_TO_LEFT, bounds.width, bounds.height); int index = imageList.indexOf (image); if (index == -1) index = imageList.add (image); - long /*int*/ hImageList = imageList.getHandle (); + long hImageList = imageList.getHandle (); /* * Bug in Windows. Making any change to an item that * changes the item height of a table while the table @@ -2879,7 +2879,7 @@ int imageIndex (Image image, int column) { } OS.SendMessage (handle, OS.LVM_SETIMAGELIST, OS.LVSIL_SMALL, hImageList); if (headerImageList != null) { - long /*int*/ hHeaderImageList = headerImageList.getHandle (); + long hHeaderImageList = headerImageList.getHandle (); OS.SendMessage (hwndHeader, OS.HDM_SETIMAGELIST, 0, hHeaderImageList); } fixCheckboxImageList (false); @@ -2902,7 +2902,7 @@ int imageIndexHeader (Image image) { headerImageList = display.getImageList (style & SWT.RIGHT_TO_LEFT, bounds.width, bounds.height); int index = headerImageList.indexOf (image); if (index == -1) index = headerImageList.add (image); - long /*int*/ hImageList = headerImageList.getHandle (); + long hImageList = headerImageList.getHandle (); OS.SendMessage (hwndHeader, OS.HDM_SETIMAGELIST, 0, hImageList); return index; } @@ -2959,7 +2959,7 @@ public int indexOf (TableItem item) { if (item == null) error (SWT.ERROR_NULL_ARGUMENT); //TODO - find other loops that can be optimized if (keys == null) { - int count = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); if (1 <= lastIndexOf && lastIndexOf < count - 1) { if (_getItem (lastIndexOf, false) == item) return lastIndexOf; if (_getItem (lastIndexOf + 1, false) == item) return ++lastIndexOf; @@ -3010,7 +3010,7 @@ public boolean isSelected (int index) { lvItem.mask = OS.LVIF_STATE; lvItem.stateMask = OS.LVIS_SELECTED; lvItem.iItem = index; - long /*int*/ result = OS.SendMessage (handle, OS.LVM_GETITEM, 0, lvItem); + long result = OS.SendMessage (handle, OS.LVM_GETITEM, 0, lvItem); return (result != 0) && ((lvItem.state & OS.LVIS_SELECTED) != 0); } @@ -3023,7 +3023,7 @@ void register () { @Override void releaseChildren (boolean destroy) { if (_hasItems ()) { - int itemCount = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + int itemCount = (int)OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); if (keys == null) { for (int i=0; i<itemCount; i++) { TableItem item = _getItem (i, false); @@ -3061,7 +3061,7 @@ void releaseWidget () { display.releaseImageList (headerImageList); } imageList = headerImageList = null; - long /*int*/ hStateList = OS.SendMessage (handle, OS.LVM_GETIMAGELIST, OS.LVSIL_STATE, 0); + long hStateList = OS.SendMessage (handle, OS.LVM_GETIMAGELIST, OS.LVSIL_STATE, 0); OS.SendMessage (handle, OS.LVM_SETIMAGELIST, OS.LVSIL_STATE, 0); if (hStateList != 0) OS.ImageList_Destroy (hStateList); if (headerToolTipHandle != 0) OS.DestroyWindow (headerToolTipHandle); @@ -3091,7 +3091,7 @@ public void remove (int [] indices) { System.arraycopy (indices, 0, newIndices, 0, indices.length); sort (newIndices); int start = newIndices [newIndices.length - 1], end = newIndices [0]; - int count = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); if (!(0 <= start && start <= end && end < count)) { error (SWT.ERROR_INVALID_RANGE); } @@ -3103,7 +3103,7 @@ public void remove (int [] indices) { TableItem item = _getItem (index, false); if (item != null && !item.isDisposed ()) item.release (false); ignoreSelect = ignoreShrink = true; - long /*int*/ code = OS.SendMessage (handle, OS.LVM_DELETEITEM, index, 0); + long code = OS.SendMessage (handle, OS.LVM_DELETEITEM, index, 0); ignoreSelect = ignoreShrink = false; if (code == 0) error (SWT.ERROR_ITEM_NOT_REMOVED); _removeItem(index, count); @@ -3131,13 +3131,13 @@ public void remove (int [] indices) { */ public void remove (int index) { checkWidget (); - int count = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); if (!(0 <= index && index < count)) error (SWT.ERROR_INVALID_RANGE); TableItem item = _getItem (index, false); if (item != null && !item.isDisposed ()) item.release (false); setDeferResize (true); ignoreSelect = ignoreShrink = true; - long /*int*/ code = OS.SendMessage (handle, OS.LVM_DELETEITEM, index, 0); + long code = OS.SendMessage (handle, OS.LVM_DELETEITEM, index, 0); ignoreSelect = ignoreShrink = false; if (code == 0) error (SWT.ERROR_ITEM_NOT_REMOVED); _removeItem (index, count); @@ -3165,7 +3165,7 @@ public void remove (int index) { public void remove (int start, int end) { checkWidget (); if (start > end) return; - int count = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); if (!(0 <= start && start <= end && end < count)) { error (SWT.ERROR_INVALID_RANGE); } @@ -3178,7 +3178,7 @@ public void remove (int start, int end) { TableItem item = _getItem (index, false); if (item != null && !item.isDisposed ()) item.release (false); ignoreSelect = ignoreShrink = true; - long /*int*/ code = OS.SendMessage (handle, OS.LVM_DELETEITEM, start, 0); + long code = OS.SendMessage (handle, OS.LVM_DELETEITEM, start, 0); ignoreSelect = ignoreShrink = false; if (code == 0) break; index++; @@ -3205,14 +3205,14 @@ public void remove (int start, int end) { */ public void removeAll () { checkWidget (); - int itemCount = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + int itemCount = (int)OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); for (int i=0; i<itemCount; i++) { TableItem item = _getItem (i, false); if (item != null && !item.isDisposed ()) item.release (false); } setDeferResize (true); ignoreSelect = ignoreShrink = true; - long /*int*/ code = OS.SendMessage (handle, OS.LVM_DELETEALLITEMS, 0, 0); + long code = OS.SendMessage (handle, OS.LVM_DELETEALLITEMS, 0, 0); ignoreSelect = ignoreShrink = false; if (code == 0) error (SWT.ERROR_ITEM_NOT_REMOVED); setTableEmpty (); @@ -3291,7 +3291,7 @@ public void select (int [] indices) { @Override void reskinChildren (int flags) { if (_hasItems ()) { - int itemCount = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + int itemCount = (int)OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); for (int i=0; i<itemCount; i++) { TableItem item = _getItem (i, false); if (item != null) item.reskin (flags); @@ -3359,7 +3359,7 @@ public void select (int index) { public void select (int start, int end) { checkWidget (); if (end < 0 || start > end || ((style & SWT.SINGLE) != 0 && start != end)) return; - int count = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); if (count == 0 || start >= count) return; start = Math.max (0, start); end = Math.min (end, count - 1); @@ -3404,8 +3404,8 @@ public void selectAll () { ignoreSelect = false; } -void sendEraseItemEvent (TableItem item, NMLVCUSTOMDRAW nmcd, long /*int*/ lParam, Event measureEvent) { - long /*int*/ hDC = nmcd.hdc; +void sendEraseItemEvent (TableItem item, NMLVCUSTOMDRAW nmcd, long lParam, Event measureEvent) { + long hDC = nmcd.hdc; int clrText = item.cellForeground != null ? item.cellForeground [nmcd.iSubItem] : -1; if (clrText == -1) clrText = item.foreground; int clrTextBk = -1; @@ -3428,8 +3428,8 @@ void sendEraseItemEvent (TableItem item, NMLVCUSTOMDRAW nmcd, long /*int*/ lPara LVITEM lvItem = new LVITEM (); lvItem.mask = OS.LVIF_STATE; lvItem.stateMask = OS.LVIS_SELECTED; - lvItem.iItem = (int)/*64*/nmcd.dwItemSpec; - long /*int*/ result = OS.SendMessage (handle, OS.LVM_GETITEM, 0, lvItem); + lvItem.iItem = (int)nmcd.dwItemSpec; + long result = OS.SendMessage (handle, OS.LVM_GETITEM, 0, lvItem); boolean selected = (result != 0 && (lvItem.state & OS.LVIS_SELECTED) != 0); GCData data = new GCData (); data.device = display; @@ -3477,10 +3477,10 @@ void sendEraseItemEvent (TableItem item, NMLVCUSTOMDRAW nmcd, long /*int*/ lPara if (selected) clrSelectionBk = data.background; } data.font = item.getFont (nmcd.iSubItem); - data.uiState = (int)/*64*/OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); + data.uiState = (int)OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); int nSavedDC = OS.SaveDC (hDC); GC gc = GC.win32_new (hDC, data); - RECT cellRect = item.getBounds ((int)/*64*/nmcd.dwItemSpec, nmcd.iSubItem, true, true, true, true, hDC); + RECT cellRect = item.getBounds ((int)nmcd.dwItemSpec, nmcd.iSubItem, true, true, true, true, hDC); Event event = new Event (); event.item = item; event.gc = gc; @@ -3490,7 +3490,7 @@ void sendEraseItemEvent (TableItem item, NMLVCUSTOMDRAW nmcd, long /*int*/ lPara if (OS.SendMessage (handle, OS.LVM_GETNEXTITEM, -1, OS.LVNI_FOCUSED) == nmcd.dwItemSpec) { if (nmcd.iSubItem == 0 || (style & SWT.FULL_SELECTION) != 0) { if (handle == OS.GetFocus ()) { - int uiState = (int)/*64*/OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); + int uiState = (int)OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); if ((uiState & OS.UISF_HIDEFOCUS) == 0) event.detail |= SWT.FOCUSED; } } @@ -3535,14 +3535,14 @@ void sendEraseItemEvent (TableItem item, NMLVCUSTOMDRAW nmcd, long /*int*/ lPara boolean firstColumn = nmcd.iSubItem == OS.SendMessage (hwndHeader, OS.HDM_ORDERTOINDEX, 0, 0); if (ignoreDrawForeground && ignoreDrawHot && !drawDrophilited) { if (!ignoreDrawBackground && drawBackground) { - RECT backgroundRect = item.getBounds ((int)/*64*/nmcd.dwItemSpec, nmcd.iSubItem, true, false, true, false, hDC); + RECT backgroundRect = item.getBounds ((int)nmcd.dwItemSpec, nmcd.iSubItem, true, false, true, false, hDC); fillBackground (hDC, clrTextBk, backgroundRect); } } focusRect = null; if (!ignoreDrawHot || !ignoreDrawSelection || !ignoreDrawFocus || drawDrophilited) { boolean fullText = (style & SWT.FULL_SELECTION) != 0 || !firstColumn; - RECT textRect = item.getBounds ((int)/*64*/nmcd.dwItemSpec, nmcd.iSubItem, true, false, fullText, false, hDC); + RECT textRect = item.getBounds ((int)nmcd.dwItemSpec, nmcd.iSubItem, true, false, fullText, false, hDC); if ((style & SWT.FULL_SELECTION) == 0) { if (measureEvent != null) { Rectangle boundInPixels = measureEvent.getBoundsInPixels(); @@ -3561,13 +3561,13 @@ void sendEraseItemEvent (TableItem item, NMLVCUSTOMDRAW nmcd, long /*int*/ lPara RECT rect = new RECT (); OS.SetRect (rect, nmcd.left, nmcd.top, nmcd.right, nmcd.bottom); if ((style & SWT.FULL_SELECTION) != 0) { - int count = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); - int index = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_ORDERTOINDEX, count - 1, 0); + int count = (int)OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); + int index = (int)OS.SendMessage (hwndHeader, OS.HDM_ORDERTOINDEX, count - 1, 0); RECT headerRect = new RECT (); OS.SendMessage (hwndHeader, OS.HDM_GETITEMRECT, index, headerRect); OS.MapWindowPoints (hwndHeader, handle, headerRect, 2); rect.right = headerRect.right; - index = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_ORDERTOINDEX, 0, 0); + index = (int)OS.SendMessage (hwndHeader, OS.HDM_ORDERTOINDEX, 0, 0); OS.SendMessage (hwndHeader, OS.HDM_GETITEMRECT, index, headerRect); OS.MapWindowPoints (hwndHeader, handle, headerRect, 2); rect.left = headerRect.left; @@ -3577,7 +3577,7 @@ void sendEraseItemEvent (TableItem item, NMLVCUSTOMDRAW nmcd, long /*int*/ lPara rect.right += EXPLORER_EXTRA; pClipRect.right += EXPLORER_EXTRA; } - long /*int*/ hTheme = OS.OpenThemeData (handle, Display.LISTVIEW); + long hTheme = OS.OpenThemeData (handle, Display.LISTVIEW); int iStateId = selected ? OS.LISS_SELECTED : OS.LISS_HOT; if (OS.GetFocus () != handle && selected && !drawHot) iStateId = OS.LISS_SELECTEDNOTFOCUS; if (drawDrophilited) iStateId = OS.LISS_SELECTED; @@ -3593,7 +3593,7 @@ void sendEraseItemEvent (TableItem item, NMLVCUSTOMDRAW nmcd, long /*int*/ lPara OS.MoveMemory (lParam, nmcd, NMLVCUSTOMDRAW.sizeof); } if (ignoreDrawForeground) { - RECT clipRect = item.getBounds ((int)/*64*/nmcd.dwItemSpec, nmcd.iSubItem, true, true, true, false, hDC); + RECT clipRect = item.getBounds ((int)nmcd.dwItemSpec, nmcd.iSubItem, true, true, true, false, hDC); OS.SaveDC (hDC); OS.SelectClipRgn (hDC, 0); OS.ExcludeClipRect (hDC, clipRect.left, clipRect.top, clipRect.right, clipRect.bottom); @@ -3609,7 +3609,7 @@ Event sendEraseItemEvent (TableItem item, NMTTCUSTOMDRAW nmcd, int column, RECT data.foreground = OS.GetTextColor (nmcd.hdc); data.background = OS.GetBkColor (nmcd.hdc); data.font = item.getFont (column); - data.uiState = (int)/*64*/OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); + data.uiState = (int)OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); GC gc = GC.win32_new (nmcd.hdc, data); Event event = new Event (); event.item = item; @@ -3626,7 +3626,7 @@ Event sendEraseItemEvent (TableItem item, NMTTCUSTOMDRAW nmcd, int column, RECT return event; } -Event sendMeasureItemEvent (TableItem item, int row, int column, long /*int*/ hDC) { +Event sendMeasureItemEvent (TableItem item, int row, int column, long hDC) { GCData data = new GCData (); data.device = display; data.font = item.getFont (column); @@ -3643,8 +3643,8 @@ Event sendMeasureItemEvent (TableItem item, int row, int column, long /*int*/ hD LVITEM lvItem = new LVITEM (); lvItem.mask = OS.LVIF_STATE; lvItem.stateMask = OS.LVIS_SELECTED; - lvItem.iItem = (int)/*64*/row; - long /*int*/ result = OS.SendMessage (handle, OS.LVM_GETITEM, 0, lvItem); + lvItem.iItem = (int)row; + long result = OS.SendMessage (handle, OS.LVM_GETITEM, 0, lvItem); boolean selected = (result != 0 && (lvItem.state & OS.LVIS_SELECTED) != 0); if (selected && (column == 0 || (style & SWT.FULL_SELECTION) != 0)) { if (OS.GetFocus () == handle || display.getHighContrast ()) { @@ -3662,11 +3662,11 @@ Event sendMeasureItemEvent (TableItem item, int row, int column, long /*int*/ hD if (!isDisposed () && !item.isDisposed ()) { Rectangle boundsInPixels = event.getBoundsInPixels(); if (columnCount == 0) { - int width = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETCOLUMNWIDTH, 0, 0); + int width = (int)OS.SendMessage (handle, OS.LVM_GETCOLUMNWIDTH, 0, 0); if (boundsInPixels.x + boundsInPixels.width > width) setScrollWidth (boundsInPixels.x + boundsInPixels.width); } - long /*int*/ empty = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 0, 0); - long /*int*/ oneItem = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 1, 0); + long empty = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 0, 0); + long oneItem = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 1, 0); int itemHeight = OS.HIWORD (oneItem) - OS.HIWORD (empty); /* * Possible recursion: when setItemHeight() is called during @@ -3682,7 +3682,7 @@ Event sendMeasureItemEvent (TableItem item, int row, int column, long /*int*/ hD return event; } -LRESULT sendMouseDownEvent (int type, int button, int msg, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT sendMouseDownEvent (int type, int button, int msg, long wParam, long lParam) { Display display = this.display; display.captureChanged = false; if (!sendMouseEvent (type, button, handle, msg, wParam, lParam)) { @@ -3717,12 +3717,12 @@ LRESULT sendMouseDownEvent (int type, int button, int msg, long /*int*/ wParam, * The fix is to consider any value that is negative a failure. */ if (OS.SendMessage (handle, OS.LVM_SUBITEMHITTEST, 0, pinfo) < 0) { - int count = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); if (count != 0) { RECT rect = new RECT (); rect.left = OS.LVIR_ICON; ignoreCustomDraw = true; - long /*int*/ code = OS.SendMessage (handle, OS.LVM_GETITEMRECT, 0, rect); + long code = OS.SendMessage (handle, OS.LVM_GETITEMRECT, 0, rect); ignoreCustomDraw = false; if (code != 0) { pinfo.x = rect.left; @@ -3779,7 +3779,7 @@ LRESULT sendMouseDownEvent (int type, int button, int msg, long /*int*/ wParam, * it as selected. */ boolean forceSelect = false; - int count = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETSELECTEDCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.LVM_GETSELECTEDCOUNT, 0, 0); if (count == 1 && pinfo.iItem != -1) { LVITEM lvItem = new LVITEM (); lvItem.mask = OS.LVIF_STATE; @@ -3833,7 +3833,7 @@ LRESULT sendMouseDownEvent (int type, int button, int msg, long /*int*/ wParam, dragStarted = false; display.dragCancelled = false; if (!dragDetect) display.runDragDrop = false; - long /*int*/ code = callWindowProc (handle, msg, wParam, lParam, forceSelect); + long code = callWindowProc (handle, msg, wParam, lParam, forceSelect); if (!dragDetect) display.runDragDrop = true; if (fullRowSelect) { fullRowSelect = false; @@ -3859,7 +3859,7 @@ LRESULT sendMouseDownEvent (int type, int button, int msg, long /*int*/ wParam, } void sendPaintItemEvent (TableItem item, NMLVCUSTOMDRAW nmcd) { - long /*int*/ hDC = nmcd.hdc; + long hDC = nmcd.hdc; GCData data = new GCData (); data.device = display; data.font = item.getFont (nmcd.iSubItem); @@ -3871,8 +3871,8 @@ void sendPaintItemEvent (TableItem item, NMLVCUSTOMDRAW nmcd) { LVITEM lvItem = new LVITEM (); lvItem.mask = OS.LVIF_STATE; lvItem.stateMask = OS.LVIS_SELECTED; - lvItem.iItem = (int)/*64*/nmcd.dwItemSpec; - long /*int*/ result = OS.SendMessage (handle, OS.LVM_GETITEM, 0, lvItem); + lvItem.iItem = (int)nmcd.dwItemSpec; + long result = OS.SendMessage (handle, OS.LVM_GETITEM, 0, lvItem); boolean selected = result != 0 && (lvItem.state & OS.LVIS_SELECTED) != 0; boolean drawSelected = false, drawBackground = false, drawHot = false; if (nmcd.iSubItem == 0 || (style & SWT.FULL_SELECTION) != 0) { @@ -3924,10 +3924,10 @@ void sendPaintItemEvent (TableItem item, NMLVCUSTOMDRAW nmcd) { data.foreground = OS.GetSysColor (OS.COLOR_GRAYTEXT); data.background = OS.GetSysColor (OS.COLOR_3DFACE); } - data.uiState = (int)/*64*/OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); + data.uiState = (int)OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); int nSavedDC = OS.SaveDC (hDC); GC gc = GC.win32_new (hDC, data); - RECT itemRect = item.getBounds ((int)/*64*/nmcd.dwItemSpec, nmcd.iSubItem, true, true, false, false, hDC); + RECT itemRect = item.getBounds ((int)nmcd.dwItemSpec, nmcd.iSubItem, true, true, false, false, hDC); Event event = new Event (); event.item = item; event.gc = gc; @@ -3937,7 +3937,7 @@ void sendPaintItemEvent (TableItem item, NMLVCUSTOMDRAW nmcd) { if (OS.SendMessage (handle, OS.LVM_GETNEXTITEM, -1, OS.LVNI_FOCUSED) == nmcd.dwItemSpec) { if (nmcd.iSubItem == 0 || (style & SWT.FULL_SELECTION) != 0) { if (handle == OS.GetFocus ()) { - int uiState = (int)/*64*/OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); + int uiState = (int)OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); if ((uiState & OS.UISF_HIDEFOCUS) == 0) event.detail |= SWT.FOCUSED; } } @@ -3946,7 +3946,7 @@ void sendPaintItemEvent (TableItem item, NMLVCUSTOMDRAW nmcd) { if (drawSelected) event.detail |= SWT.SELECTED; if (drawBackground) event.detail |= SWT.BACKGROUND; event.setBoundsInPixels(new Rectangle(itemRect.left, itemRect.top, itemRect.right - itemRect.left, itemRect.bottom - itemRect.top)); - RECT cellRect = item.getBounds ((int)/*64*/nmcd.dwItemSpec, nmcd.iSubItem, true, true, true, true, hDC); + RECT cellRect = item.getBounds ((int)nmcd.dwItemSpec, nmcd.iSubItem, true, true, true, true, hDC); int cellWidth = cellRect.right - cellRect.left; int cellHeight = cellRect.bottom - cellRect.top; gc.setClipping (DPIUtil.autoScaleDown(new Rectangle (cellRect.left, cellRect.top, cellWidth, cellHeight))); @@ -3966,7 +3966,7 @@ Event sendPaintItemEvent (TableItem item, NMTTCUSTOMDRAW nmcd, int column, RECT data.font = item.getFont (column); data.foreground = OS.GetTextColor (nmcd.hdc); data.background = OS.GetBkColor (nmcd.hdc); - data.uiState = (int)/*64*/OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); + data.uiState = (int)OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); GC gc = GC.win32_new (nmcd.hdc, data); Event event = new Event (); event.item = item; @@ -3983,7 +3983,7 @@ Event sendPaintItemEvent (TableItem item, NMTTCUSTOMDRAW nmcd, int column, RECT } @Override -void setBackgroundImage (long /*int*/ hBitmap) { +void setBackgroundImage (long hBitmap) { super.setBackgroundImage (hBitmap); if (hBitmap != 0) { setBackgroundTransparent (true); @@ -3996,7 +3996,7 @@ void setBackgroundImage (long /*int*/ hBitmap) { @Override void setBackgroundPixel (int newPixel) { - int oldPixel = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETBKCOLOR, 0, 0); + int oldPixel = (int)OS.SendMessage (handle, OS.LVM_GETBKCOLOR, 0, 0); if (oldPixel != OS.CLR_NONE) { if (findImageControl () != null) return; if (newPixel == -1) newPixel = defaultBackground (); @@ -4029,7 +4029,7 @@ void setBackgroundTransparent (boolean transparent) { * other custom drawing. The fix is to clear the selected * column. */ - int oldPixel = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETBKCOLOR, 0, 0); + int oldPixel = (int)OS.SendMessage (handle, OS.LVM_GETBKCOLOR, 0, 0); if (transparent) { if (oldPixel != OS.CLR_NONE) { /* @@ -4248,11 +4248,11 @@ void setCheckboxImageList (int width, int height, boolean fixScroll) { int count = 8, flags = OS.ILC_COLOR32; if ((style & SWT.RIGHT_TO_LEFT) != 0) flags |= OS.ILC_MIRROR; if (!OS.IsAppThemed ()) flags |= OS.ILC_MASK; - long /*int*/ hStateList = OS.ImageList_Create (width, height, flags, count, count); - long /*int*/ hDC = OS.GetDC (handle); - long /*int*/ memDC = OS.CreateCompatibleDC (hDC); - long /*int*/ hBitmap = OS.CreateCompatibleBitmap (hDC, width * count, height); - long /*int*/ hOldBitmap = OS.SelectObject (memDC, hBitmap); + long hStateList = OS.ImageList_Create (width, height, flags, count, count); + long hDC = OS.GetDC (handle); + long memDC = OS.CreateCompatibleDC (hDC); + long hBitmap = OS.CreateCompatibleBitmap (hDC, width * count, height); + long hOldBitmap = OS.SelectObject (memDC, hBitmap); RECT rect = new RECT (); OS.SetRect (rect, 0, 0, width * count, height); int clrBackground; @@ -4266,10 +4266,10 @@ void setCheckboxImageList (int width, int height, boolean fixScroll) { clrBackground = 0x0200FF00; } } - long /*int*/ hBrush = OS.CreateSolidBrush (clrBackground); + long hBrush = OS.CreateSolidBrush (clrBackground); OS.FillRect (memDC, rect, hBrush); OS.DeleteObject (hBrush); - long /*int*/ oldFont = OS.SelectObject (hDC, defaultFont ()); + long oldFont = OS.SelectObject (hDC, defaultFont ()); TEXTMETRIC tm = new TEXTMETRIC (); OS.GetTextMetrics (hDC, tm); OS.SelectObject (hDC, oldFont); @@ -4289,7 +4289,7 @@ void setCheckboxImageList (int width, int height, boolean fixScroll) { int left = (width - itemWidth) / 2, top = (height - itemHeight) / 2; OS.SetRect (rect, left, top, left + itemWidth, top + itemHeight); if (OS.IsAppThemed ()) { - long /*int*/ hTheme = display.hButtonTheme (); + long hTheme = display.hButtonTheme (); OS.DrawThemeBackground (hTheme, memDC, OS.BP_CHECKBOX, OS.CBS_UNCHECKEDNORMAL, rect, null); rect.left += width; rect.right += width; OS.DrawThemeBackground (hTheme, memDC, OS.BP_CHECKBOX, OS.CBS_CHECKEDNORMAL, rect, null); @@ -4345,7 +4345,7 @@ void setCheckboxImageList (int width, int height, boolean fixScroll) { setRedraw (false); setTopIndex (0); } - long /*int*/ hOldStateList = OS.SendMessage (handle, OS.LVM_GETIMAGELIST, OS.LVSIL_STATE, 0); + long hOldStateList = OS.SendMessage (handle, OS.LVM_GETIMAGELIST, OS.LVSIL_STATE, 0); OS.SendMessage (handle, OS.LVM_SETIMAGELIST, OS.LVSIL_STATE, hStateList); if (hOldStateList != 0) OS.ImageList_Destroy (hOldStateList); /* @@ -4354,7 +4354,7 @@ void setCheckboxImageList (int width, int height, boolean fixScroll) { * pixel corruption of the images. The fix is to reset the * LVSIL_SMALL image list. */ - long /*int*/ hImageList = OS.SendMessage (handle, OS.LVM_GETIMAGELIST, OS.LVSIL_SMALL, 0); + long hImageList = OS.SendMessage (handle, OS.LVM_GETIMAGELIST, OS.LVSIL_SMALL, 0); OS.SendMessage (handle, OS.LVM_SETIMAGELIST, OS.LVSIL_SMALL, hImageList); if (fixScroll && topIndex != 0) { setTopIndex (topIndex); @@ -4569,7 +4569,7 @@ public void setHeaderVisible (boolean show) { public void setItemCount (int count) { checkWidget (); count = Math.max (0, count); - int itemCount = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + int itemCount = (int)OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); if (count == itemCount) return; setDeferResize (true); boolean isVirtual = (style & SWT.VIRTUAL) != 0; @@ -4580,7 +4580,7 @@ public void setItemCount (int count) { if (item != null && !item.isDisposed ()) item.release (false); if (!isVirtual) { ignoreSelect = ignoreShrink = true; - long /*int*/ code = OS.SendMessage (handle, OS.LVM_DELETEITEM, count, 0); + long code = OS.SendMessage (handle, OS.LVM_DELETEITEM, count, 0); ignoreSelect = ignoreShrink = false; if (code == 0) break; } @@ -4634,7 +4634,7 @@ void setItemHeight (boolean fixScroll) { * WM_SETFONT which recomputes and assigns the default item * height. */ - long /*int*/ hFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); + long hFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); OS.SendMessage (handle, OS.WM_SETFONT, hFont, 0); } else { /* @@ -4786,7 +4786,7 @@ public void setRedraw (boolean redraw) { } void setScrollWidth (int width) { - if (width != (int)/*64*/OS.SendMessage (handle, OS.LVM_GETCOLUMNWIDTH, 0, 0)) { + if (width != (int)OS.SendMessage (handle, OS.LVM_GETCOLUMNWIDTH, 0, 0)) { /* * Feature in Windows. When LVM_SETCOLUMNWIDTH is sent, * Windows draws right away instead of queuing a WM_PAINT. @@ -4827,10 +4827,10 @@ boolean setScrollWidth (TableItem item, boolean force) { */ if (columnCount == 0) { int newWidth = 0, imageIndent = 0, index = 0; - int itemCount = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + int itemCount = (int)OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); while (index < itemCount) { String string = null; - long /*int*/ hFont = -1; + long hFont = -1; if (item != null) { string = item.text; imageIndent = Math.max (imageIndent, item.imageIndent); @@ -4845,8 +4845,8 @@ boolean setScrollWidth (TableItem item, boolean force) { } if (string != null && string.length () != 0) { if (hFont != -1) { - long /*int*/ hDC = OS.GetDC (handle); - long /*int*/ oldFont = OS.SelectObject (hDC, hFont); + long hDC = OS.GetDC (handle); + long oldFont = OS.SelectObject (hDC, hFont); int flags = OS.DT_CALCRECT | OS.DT_SINGLELINE | OS.DT_NOPREFIX; char [] buffer = string.toCharArray (); RECT rect = new RECT (); @@ -4856,7 +4856,7 @@ boolean setScrollWidth (TableItem item, boolean force) { newWidth = Math.max (newWidth, rect.right - rect.left); } else { TCHAR buffer = new TCHAR (getCodePage (), string, true); - newWidth = Math.max (newWidth, (int)/*64*/OS.SendMessage (handle, OS.LVM_GETSTRINGWIDTH, 0, buffer)); + newWidth = Math.max (newWidth, (int)OS.SendMessage (handle, OS.LVM_GETSTRINGWIDTH, 0, buffer)); } } if (item != null) break; @@ -4874,15 +4874,15 @@ boolean setScrollWidth (TableItem item, boolean force) { */ if (newWidth == 0) { char [] buffer = {' ', '\0'}; - newWidth = Math.max (newWidth, (int)/*64*/OS.SendMessage (handle, OS.LVM_GETSTRINGWIDTH, 0, buffer)); + newWidth = Math.max (newWidth, (int)OS.SendMessage (handle, OS.LVM_GETSTRINGWIDTH, 0, buffer)); } - long /*int*/ hStateList = OS.SendMessage (handle, OS.LVM_GETIMAGELIST, OS.LVSIL_STATE, 0); + long hStateList = OS.SendMessage (handle, OS.LVM_GETIMAGELIST, OS.LVSIL_STATE, 0); if (hStateList != 0) { int [] cx = new int [1], cy = new int [1]; OS.ImageList_GetIconSize (hStateList, cx, cy); newWidth += cx [0] + INSET; } - long /*int*/ hImageList = OS.SendMessage (handle, OS.LVM_GETIMAGELIST, OS.LVSIL_SMALL, 0); + long hImageList = OS.SendMessage (handle, OS.LVM_GETIMAGELIST, OS.LVSIL_SMALL, 0); if (hImageList != 0) { int [] cx = new int [1], cy = new int [1]; OS.ImageList_GetIconSize (hImageList, cx, cy); @@ -4901,7 +4901,7 @@ boolean setScrollWidth (TableItem item, boolean force) { newWidth++; } newWidth += INSET * 2 + VISTA_EXTRA; - int oldWidth = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETCOLUMNWIDTH, 0, 0); + int oldWidth = (int)OS.SendMessage (handle, OS.LVM_GETCOLUMNWIDTH, 0, 0); if (newWidth > oldWidth) { setScrollWidth (newWidth); return true; @@ -5064,7 +5064,7 @@ public void setSelection (int start, int end) { checkWidget (); deselectAll (); if (end < 0 || start > end || ((style & SWT.SINGLE) != 0 && start != end)) return; - int count = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); if (count == 0 || start >= count) return; start = Math.max (0, start); end = Math.min (end, count - 1); @@ -5125,7 +5125,7 @@ public void setSortDirection (int direction) { } void setSubImagesVisible (boolean visible) { - int dwExStyle = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); + int dwExStyle = (int)OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); if ((dwExStyle & OS.LVS_EX_SUBITEMIMAGES) != 0 == visible) return; int bits = visible ? OS.LVS_EX_SUBITEMIMAGES : 0; OS.SendMessage (handle, OS.LVM_SETEXTENDEDLISTVIEWSTYLE, OS.LVS_EX_SUBITEMIMAGES, bits); @@ -5142,12 +5142,12 @@ void setTableEmpty () { * Windows to reserve the smallest possible space when an image * list is removed. */ - long /*int*/ hImageList = OS.ImageList_Create (1, 1, 0, 0, 0); + long hImageList = OS.ImageList_Create (1, 1, 0, 0, 0); OS.SendMessage (handle, OS.LVM_SETIMAGELIST, OS.LVSIL_SMALL, hImageList); OS.SendMessage (handle, OS.LVM_SETIMAGELIST, OS.LVSIL_SMALL, 0); if (headerImageList != null) { - long /*int*/ hHeaderImageList = headerImageList.getHandle (); - long /*int*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); + long hHeaderImageList = headerImageList.getHandle (); + long hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); OS.SendMessage (hwndHeader, OS.HDM_SETIMAGELIST, 0, hHeaderImageList); } OS.ImageList_Destroy (hImageList); @@ -5184,7 +5184,7 @@ void setTableEmpty () { */ public void setTopIndex (int index) { checkWidget (); - int topIndex = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETTOPINDEX, 0, 0); + int topIndex = (int)OS.SendMessage (handle, OS.LVM_GETTOPINDEX, 0, 0); if (index == topIndex) return; if (!painted && hooks (SWT.MeasureItem)) hitTestSelection (index, 0, 0); @@ -5279,7 +5279,7 @@ public void showColumn (TableColumn column) { OS.SendMessage (handle, OS.LVM_GETSUBITEMRECT, -1, itemRect); ignoreCustomDraw = false; itemRect.right = itemRect.left; - int width = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETCOLUMNWIDTH, 0, 0); + int width = (int)OS.SendMessage (handle, OS.LVM_GETCOLUMNWIDTH, 0, 0); itemRect.left = itemRect.right - width; } else { itemRect.top = index; @@ -5345,7 +5345,7 @@ void showItem (int index) { * of visible items is zero and use LVM_ENSUREVISIBLE with the * fPartialOK flag set to true to scroll the table. */ - long /*int*/ counterPage = OS.SendMessage (handle, OS.LVM_GETCOUNTPERPAGE, 0, 0); + long counterPage = OS.SendMessage (handle, OS.LVM_GETCOUNTPERPAGE, 0, 0); if (counterPage <= 0) { /* * Bug in Windows. For some reason, LVM_ENSUREVISIBLE can @@ -5366,7 +5366,7 @@ void showItem (int index) { * LVM_ENSUREVISIBLE command scrolls the table to the leftmost * column even if the item is already visible, refer Bug 334234 */ - long /*int*/ topIndex = OS.SendMessage (handle, OS.LVM_GETTOPINDEX, 0, 0); + long topIndex = OS.SendMessage (handle, OS.LVM_GETTOPINDEX, 0, 0); if (topIndex > index || index >= topIndex + counterPage ) { OS.SendMessage (handle, OS.LVM_ENSUREVISIBLE, index, 0); } @@ -5413,7 +5413,7 @@ public void showItem (TableItem item) { */ public void showSelection () { checkWidget (); - int index = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETNEXTITEM, -1, OS.LVNI_SELECTED); + int index = (int)OS.SendMessage (handle, OS.LVM_GETNEXTITEM, -1, OS.LVNI_SELECTED); if (index != -1) { /* * Bug in Windows. For some reason, when a table had vertically @@ -5475,7 +5475,7 @@ RECT toolTipRect (RECT rect) { @Override String toolTipText (NMTTDISPINFO hdr) { - long /*int*/ hwndToolTip = OS.SendMessage (handle, OS.LVM_GETTOOLTIPS, 0, 0); + long hwndToolTip = OS.SendMessage (handle, OS.LVM_GETTOOLTIPS, 0, 0); if (hwndToolTip == hdr.hwndFrom && toolTipText != null) return ""; //$NON-NLS-1$ if (headerToolTipHandle == hdr.hwndFrom) { for (int i=0; i<columnCount; i++) { @@ -5508,7 +5508,7 @@ void update (boolean all) { * NOTE: The header tooltip can subclass the header proc so the * current proc must be restored or header tooltips stop working. */ - long /*int*/ oldHeaderProc = 0, oldTableProc = 0; + long oldHeaderProc = 0, oldTableProc = 0; boolean fixSubclass = isOptimizedRedraw (); if (fixSubclass) { oldTableProc = OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, TableProc); @@ -5523,7 +5523,7 @@ void update (boolean all) { void updateHeaderToolTips () { if (headerToolTipHandle == 0) return; - long /*int*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); + long hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); RECT rect = new RECT (); TOOLINFO lpti = new TOOLINFO (); lpti.cbSize = TOOLINFO.sizeof; @@ -5576,7 +5576,7 @@ void updateMoveable () { @Override void updateOrientation () { super.updateOrientation (); - long /*int*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); + long hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); if (hwndHeader != 0) { int bits = OS.GetWindowLong (hwndHeader, OS.GWL_EXSTYLE); if ((style & SWT.RIGHT_TO_LEFT) != 0) { @@ -5598,7 +5598,7 @@ void updateOrientation () { Point size = imageList.getImageSize (); display.releaseImageList (imageList); imageList = display.getImageList (style & SWT.RIGHT_TO_LEFT, size.x, size.y); - int count = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); for (int i = 0; i < count; i++) { TableItem item = _getItem (i, false); if (item != null) { @@ -5609,7 +5609,7 @@ void updateOrientation () { } } } - long /*int*/ hImageList = imageList.getHandle (); + long hImageList = imageList.getHandle (); OS.SendMessage (handle, OS.LVM_SETIMAGELIST, OS.LVSIL_SMALL, hImageList); } if (hwndHeader != 0) { @@ -5637,7 +5637,7 @@ void updateOrientation () { } } } - long /*int*/ hHeaderImageList = headerImageList.getHandle (); + long hHeaderImageList = headerImageList.getHandle (); OS.SendMessage (hwndHeader, OS.HDM_SETIMAGELIST, 0, hHeaderImageList); } } @@ -5681,12 +5681,12 @@ TCHAR windowClass () { } @Override -long /*int*/ windowProc () { +long windowProc () { return TableProc; } @Override -long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) { +long windowProc (long hwnd, int msg, long wParam, long lParam) { if (handle == 0) return 0; if (hwnd != handle) { switch (msg) { @@ -5729,8 +5729,8 @@ long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long / OS.ScreenToClient (hwnd, pt); pinfo.x = pt.x; pinfo.y = pt.y; - long /*int*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); - int index = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_HITTEST, 0, pinfo); + long hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); + int index = (int)OS.SendMessage (hwndHeader, OS.HDM_HITTEST, 0, pinfo); if (0 <= index && index < columnCount && !columns [index].resizable) { if ((pinfo.flags & (OS.HHT_ONDIVIDER | OS.HHT_ONDIVOPEN)) != 0) { OS.SetCursor (OS.LoadCursor (0, OS.IDC_ARROW)); @@ -5754,8 +5754,8 @@ long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long / * * The fix for both cases is to create the image using PrintWindow(). */ - int topIndex = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETTOPINDEX, 0, 0); - int selection = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETNEXTITEM, topIndex - 1, OS.LVNI_SELECTED); + int topIndex = (int)OS.SendMessage (handle, OS.LVM_GETTOPINDEX, 0, 0); + int selection = (int)OS.SendMessage (handle, OS.LVM_GETNEXTITEM, topIndex - 1, OS.LVNI_SELECTED); if (selection == -1) return 0; POINT mousePos = new POINT (); OS.POINTSTOPOINT (mousePos, OS.GetMessagePos ()); @@ -5774,12 +5774,12 @@ long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long / rect.left = Math.max (clientRect.left, rect.right - width); } } - long /*int*/ hRgn = OS.CreateRectRgn (rect.left, rect.top, rect.right, rect.bottom); - while ((selection = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETNEXTITEM, selection, OS.LVNI_SELECTED)) != -1) { + long hRgn = OS.CreateRectRgn (rect.left, rect.top, rect.right, rect.bottom); + while ((selection = (int)OS.SendMessage (handle, OS.LVM_GETNEXTITEM, selection, OS.LVNI_SELECTED)) != -1) { if (rect.bottom - rect.top > DRAG_IMAGE_SIZE) break; if (rect.bottom > clientRect.bottom) break; RECT itemRect = item.getBounds (selection, 0, true, true, true); - long /*int*/ rectRgn = OS.CreateRectRgn (rect.left, itemRect.top, rect.right, itemRect.bottom); + long rectRgn = OS.CreateRectRgn (rect.left, itemRect.top, rect.right, itemRect.bottom); OS.CombineRgn (hRgn, hRgn, rectRgn, OS.RGN_OR); OS.DeleteObject (rectRgn); rect.bottom = itemRect.bottom; @@ -5787,8 +5787,8 @@ long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long / OS.GetRgnBox (hRgn, rect); /* Create resources */ - long /*int*/ hdc = OS.GetDC (handle); - long /*int*/ memHdc = OS.CreateCompatibleDC (hdc); + long hdc = OS.GetDC (handle); + long memHdc = OS.CreateCompatibleDC (hdc); BITMAPINFOHEADER bmiHeader = new BITMAPINFOHEADER (); bmiHeader.biSize = BITMAPINFOHEADER.sizeof; bmiHeader.biWidth = rect.right - rect.left; @@ -5798,10 +5798,10 @@ long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long / bmiHeader.biCompression = OS.BI_RGB; byte [] bmi = new byte [BITMAPINFOHEADER.sizeof]; OS.MoveMemory (bmi, bmiHeader, BITMAPINFOHEADER.sizeof); - long /*int*/ [] pBits = new long /*int*/ [1]; - long /*int*/ memDib = OS.CreateDIBSection (0, bmi, OS.DIB_RGB_COLORS, pBits, 0, 0); + long [] pBits = new long [1]; + long memDib = OS.CreateDIBSection (0, bmi, OS.DIB_RGB_COLORS, pBits, 0, 0); if (memDib == 0) error (SWT.ERROR_NO_HANDLES); - long /*int*/ oldMemBitmap = OS.SelectObject (memHdc, memDib); + long oldMemBitmap = OS.SelectObject (memHdc, memDib); int colorKey = 0x0000FD; POINT pt = new POINT(); OS.SetWindowOrgEx (memHdc, rect.left, rect.top, pt); @@ -5832,13 +5832,13 @@ long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long / } @Override -LRESULT WM_CHAR (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_CHAR (long wParam, long lParam) { LRESULT result = super.WM_CHAR (wParam, lParam); if (result != null) return result; - switch ((int)/*64*/wParam) { + switch ((int)wParam) { case ' ': if ((style & SWT.CHECK) != 0) { - int index = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETNEXTITEM, -1, OS.LVNI_FOCUSED); + int index = (int)OS.SendMessage (handle, OS.LVM_GETNEXTITEM, -1, OS.LVNI_FOCUSED); if (index != -1) { TableItem item = _getItem (index); item.setChecked (!item.getChecked (), true); @@ -5851,7 +5851,7 @@ LRESULT WM_CHAR (long /*int*/ wParam, long /*int*/ lParam) { * This allows the application to cancel an operation that is normally * performed in WM_KEYDOWN from WM_CHAR. */ - long /*int*/ code = callWindowProc (handle, OS.WM_KEYDOWN, wParam, lParam); + long code = callWindowProc (handle, OS.WM_KEYDOWN, wParam, lParam); return new LRESULT (code); case SWT.CR: /* @@ -5861,7 +5861,7 @@ LRESULT WM_CHAR (long /*int*/ wParam, long /*int*/ lParam) { * event will fail. The fix is to ignore LVN_ITEMACTIVATE when it is * caused by WM_KEYDOWN and send SWT.DefaultSelection from WM_CHAR. */ - int index = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETNEXTITEM, -1, OS.LVNI_FOCUSED); + int index = (int)OS.SendMessage (handle, OS.LVM_GETNEXTITEM, -1, OS.LVNI_FOCUSED); if (index != -1) { Event event = new Event (); event.item = _getItem (index); @@ -5873,7 +5873,7 @@ LRESULT WM_CHAR (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_CONTEXTMENU (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_CONTEXTMENU (long wParam, long lParam) { /* * Feature in Windows. For some reason, when the right * mouse button is pressed over an item, Windows sends @@ -5891,14 +5891,14 @@ LRESULT WM_CONTEXTMENU (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_ERASEBKGND (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_ERASEBKGND (long wParam, long lParam) { LRESULT result = super.WM_ERASEBKGND (wParam, lParam); if (findImageControl () != null) return LRESULT.ONE; return result; } @Override -LRESULT WM_GETOBJECT (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_GETOBJECT (long wParam, long lParam) { /* * Ensure that there is an accessible object created for this * control because support for checked item accessibility is @@ -5911,10 +5911,10 @@ LRESULT WM_GETOBJECT (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_KEYDOWN (long wParam, long lParam) { LRESULT result = super.WM_KEYDOWN (wParam, lParam); if (result != null) return result; - switch ((int)/*64*/wParam) { + switch ((int)wParam) { case OS.VK_SPACE: /* * Ensure that the window proc does not process VK_SPACE @@ -5957,14 +5957,14 @@ LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) { * NOTE: The header tooltip can subclass the header proc so the * current proc must be restored or header tooltips stop working. */ - long /*int*/ oldHeaderProc = 0, oldTableProc = 0; - long /*int*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); + long oldHeaderProc = 0, oldTableProc = 0; + long hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); boolean fixSubclass = isOptimizedRedraw (); if (fixSubclass) { oldTableProc = OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, TableProc); oldHeaderProc = OS.SetWindowLongPtr (hwndHeader, OS.GWLP_WNDPROC, HeaderProc); } - long /*int*/ code = callWindowProc (handle, OS.WM_KEYDOWN, wParam, lParam); + long code = callWindowProc (handle, OS.WM_KEYDOWN, wParam, lParam); result = code == 0 ? LRESULT.ZERO : new LRESULT (code); if (fixSubclass) { OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, oldTableProc); @@ -5980,7 +5980,7 @@ LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_KILLFOCUS (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_KILLFOCUS (long wParam, long lParam) { LRESULT result = super.WM_KILLFOCUS (wParam, lParam); /* * Bug in Windows. When focus is lost, Windows does not @@ -5995,7 +5995,7 @@ LRESULT WM_KILLFOCUS (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_LBUTTONDBLCLK (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_LBUTTONDBLCLK (long wParam, long lParam) { /* * Feature in Windows. When the user selects outside of @@ -6007,7 +6007,7 @@ LRESULT WM_LBUTTONDBLCLK (long /*int*/ wParam, long /*int*/ lParam) { LVHITTESTINFO pinfo = new LVHITTESTINFO (); pinfo.x = OS.GET_X_LPARAM (lParam); pinfo.y = OS.GET_Y_LPARAM (lParam); - int index = (int)/*64*/OS.SendMessage (handle, OS.LVM_HITTEST, 0, pinfo); + int index = (int)OS.SendMessage (handle, OS.LVM_HITTEST, 0, pinfo); Display display = this.display; display.captureChanged = false; sendMouseEvent (SWT.MouseDown, 1, handle, OS.WM_LBUTTONDOWN, wParam, lParam); @@ -6044,7 +6044,7 @@ LRESULT WM_LBUTTONDBLCLK (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_LBUTTONDOWN (long wParam, long lParam) { /* * Feature in Windows. For some reason, capturing * the mouse after processing the mouse event for the @@ -6068,7 +6068,7 @@ LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) { * the correct way to determine that the user has selected * the check box, equality is needed. */ - int index = (int)/*64*/OS.SendMessage (handle, OS.LVM_HITTEST, 0, pinfo); + int index = (int)OS.SendMessage (handle, OS.LVM_HITTEST, 0, pinfo); if (index != -1 && pinfo.flags == OS.LVHT_ONITEMSTATEICON) { TableItem item = _getItem (index); if (item != null && !item.isDisposed ()) { @@ -6081,7 +6081,7 @@ LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_MOUSEHOVER (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_MOUSEHOVER (long wParam, long lParam) { /* * Feature in Windows. Despite the fact that hot * tracking is not enabled, the hot tracking code @@ -6090,14 +6090,14 @@ LRESULT WM_MOUSEHOVER (long /*int*/ wParam, long /*int*/ lParam) { * avoid calling the window proc. */ LRESULT result = super.WM_MOUSEHOVER (wParam, lParam); - int bits = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); + int bits = (int)OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); int mask = OS.LVS_EX_ONECLICKACTIVATE | OS.LVS_EX_TRACKSELECT | OS.LVS_EX_TWOCLICKACTIVATE; if ((bits & mask) != 0) return result; return LRESULT.ZERO; } @Override -LRESULT WM_PAINT (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_PAINT (long wParam, long lParam) { if ((state & DISPOSE_SENT) != 0) return LRESULT.ZERO; _checkShrink(); @@ -6106,7 +6106,7 @@ LRESULT WM_PAINT (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_RBUTTONDBLCLK (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_RBUTTONDBLCLK (long wParam, long lParam) { /* * Feature in Windows. When the user selects outside of * a table item, Windows deselects all the items, even @@ -6131,7 +6131,7 @@ LRESULT WM_RBUTTONDBLCLK (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_RBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_RBUTTONDOWN (long wParam, long lParam) { /* * Feature in Windows. For some reason, capturing * the mouse after processing the mouse event for the @@ -6143,7 +6143,7 @@ LRESULT WM_RBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_SETFOCUS (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SETFOCUS (long wParam, long lParam) { LRESULT result = super.WM_SETFOCUS (wParam, lParam); /* * Bug in Windows. When focus is gained after the @@ -6164,9 +6164,9 @@ LRESULT WM_SETFOCUS (long /*int*/ wParam, long /*int*/ lParam) { * no selected item. The fix to make the first item * be the focus item. */ - int count = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0); if (count == 0) return result; - int index = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETNEXTITEM, -1, OS.LVNI_FOCUSED); + int index = (int)OS.SendMessage (handle, OS.LVM_GETNEXTITEM, -1, OS.LVNI_FOCUSED); if (index == -1) { LVITEM lvItem = new LVITEM (); lvItem.state = OS.LVIS_FOCUSED; @@ -6179,7 +6179,7 @@ LRESULT WM_SETFOCUS (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_SETFONT (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SETFONT (long wParam, long lParam) { LRESULT result = super.WM_SETFONT (wParam, lParam); if (result != null) return result; @@ -6203,7 +6203,7 @@ LRESULT WM_SETFONT (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_SETREDRAW (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SETREDRAW (long wParam, long lParam) { LRESULT result = super.WM_SETREDRAW (wParam, lParam); if (result != null) return result; /* @@ -6213,7 +6213,7 @@ LRESULT WM_SETREDRAW (long /*int*/ wParam, long /*int*/ lParam) { * turned off. */ if (wParam == 1) { - if ((int)/*64*/OS.SendMessage (handle, OS.LVM_GETBKCOLOR, 0, 0) != OS.CLR_NONE) { + if ((int)OS.SendMessage (handle, OS.LVM_GETBKCOLOR, 0, 0) != OS.CLR_NONE) { if (hooks (SWT.MeasureItem) || hooks (SWT.EraseItem) || hooks (SWT.PaintItem)) { OS.SendMessage (handle, OS.LVM_SETBKCOLOR, 0, OS.CLR_NONE); } @@ -6226,9 +6226,9 @@ LRESULT WM_SETREDRAW (long /*int*/ wParam, long /*int*/ lParam) { * which stops all graphics output to the control. */ OS.DefWindowProc (handle, OS.WM_SETREDRAW, wParam, lParam); - long /*int*/ code = callWindowProc (handle, OS.WM_SETREDRAW, wParam, lParam); + long code = callWindowProc (handle, OS.WM_SETREDRAW, wParam, lParam); if (wParam == 0) { - if ((int)/*64*/OS.SendMessage (handle, OS.LVM_GETBKCOLOR, 0, 0) == OS.CLR_NONE) { + if ((int)OS.SendMessage (handle, OS.LVM_GETBKCOLOR, 0, 0) == OS.CLR_NONE) { OS.SendMessage (handle, OS.LVM_SETBKCOLOR, 0, 0xFFFFFF); } } @@ -6236,7 +6236,7 @@ LRESULT WM_SETREDRAW (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SIZE (long wParam, long lParam) { if (ignoreResize) return null; if (hooks (SWT.EraseItem) || hooks (SWT.PaintItem)) { OS.InvalidateRect (handle, null, true); @@ -6249,13 +6249,13 @@ LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_SYSCOLORCHANGE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SYSCOLORCHANGE (long wParam, long lParam) { LRESULT result = super.WM_SYSCOLORCHANGE (wParam, lParam); if (result != null) return result; if (findBackgroundControl () == null) { setBackgroundPixel (defaultBackground ()); } else { - int oldPixel = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETBKCOLOR, 0, 0); + int oldPixel = (int)OS.SendMessage (handle, OS.LVM_GETBKCOLOR, 0, 0); if (oldPixel != OS.CLR_NONE) { if (findImageControl () == null) { if ((style & SWT.CHECK) != 0) fixCheckboxImageListColor (true); @@ -6266,7 +6266,7 @@ LRESULT WM_SYSCOLORCHANGE (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_HSCROLL (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_HSCROLL (long wParam, long lParam) { /* * Bug in Windows. When a table that is drawing grid lines * is slowly scrolled horizontally to the left, the table does @@ -6294,8 +6294,8 @@ LRESULT WM_HSCROLL (long /*int*/ wParam, long /*int*/ lParam) { * NOTE: The header tooltip can subclass the header proc so the * current proc must be restored or header tooltips stop working. */ - long /*int*/ oldHeaderProc = 0, oldTableProc = 0; - long /*int*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); + long oldHeaderProc = 0, oldTableProc = 0; + long hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); boolean fixSubclass = isOptimizedRedraw (); if (fixSubclass) { oldTableProc = OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, TableProc); @@ -6314,7 +6314,7 @@ LRESULT WM_HSCROLL (long /*int*/ wParam, long /*int*/ lParam) { boolean fixScroll = false; if (OS.LOWORD (wParam) != OS.SB_ENDSCROLL) { if (columnCount > H_SCROLL_LIMIT) { - int rowCount = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETCOUNTPERPAGE, 0, 0); + int rowCount = (int)OS.SendMessage (handle, OS.LVM_GETCOUNTPERPAGE, 0, 0); if (rowCount > V_SCROLL_LIMIT) fixScroll = getDrawing () && OS.IsWindowVisible (handle); } } @@ -6382,7 +6382,7 @@ LRESULT WM_HSCROLL (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_VSCROLL (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_VSCROLL (long wParam, long lParam) { /* * When there are many columns in a table, scrolling performance * can be improved by temporarily unsubclassing the window proc @@ -6394,8 +6394,8 @@ LRESULT WM_VSCROLL (long /*int*/ wParam, long /*int*/ lParam) { * NOTE: The header tooltip can subclass the header proc so the * current proc must be restored or header tooltips stop working. */ - long /*int*/ oldHeaderProc = 0, oldTableProc = 0; - long /*int*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); + long oldHeaderProc = 0, oldTableProc = 0; + long hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); boolean fixSubclass = isOptimizedRedraw (); if (fixSubclass) { oldTableProc = OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, TableProc); @@ -6414,7 +6414,7 @@ LRESULT WM_VSCROLL (long /*int*/ wParam, long /*int*/ lParam) { boolean fixScroll = false; if (OS.LOWORD (wParam) != OS.SB_ENDSCROLL) { if (columnCount > H_SCROLL_LIMIT) { - int rowCount = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETCOUNTPERPAGE, 0, 0); + int rowCount = (int)OS.SendMessage (handle, OS.LVM_GETCOUNTPERPAGE, 0, 0); if (rowCount > V_SCROLL_LIMIT) fixScroll = getDrawing () && OS.IsWindowVisible (handle); } } @@ -6481,8 +6481,8 @@ LRESULT WM_VSCROLL (long /*int*/ wParam, long /*int*/ lParam) { RECT clientRect = new RECT (); OS.GetClientRect (handle, clientRect); clientRect.top += headerHeight; - long /*int*/ empty = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 0, 0); - long /*int*/ oneItem = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 1, 0); + long empty = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 0, 0); + long oneItem = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 1, 0); int itemHeight = OS.HIWORD (oneItem) - OS.HIWORD (empty); if (code == OS.SB_LINEDOWN) { clientRect.top = clientRect.bottom - itemHeight - GRID_WIDTH; @@ -6501,12 +6501,12 @@ LRESULT WM_VSCROLL (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT wmMeasureChild (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmMeasureChild (long wParam, long lParam) { MEASUREITEMSTRUCT struct = new MEASUREITEMSTRUCT (); OS.MoveMemory (struct, lParam, MEASUREITEMSTRUCT.sizeof); if (itemHeight == -1) { - long /*int*/ empty = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 0, 0); - long /*int*/ oneItem = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 1, 0); + long empty = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 0, 0); + long oneItem = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 1, 0); struct.itemHeight = OS.HIWORD (oneItem) - OS.HIWORD (empty); } else { struct.itemHeight = itemHeight; @@ -6516,8 +6516,8 @@ LRESULT wmMeasureChild (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT wmNotify (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { - long /*int*/ hwndToolTip = OS.SendMessage (handle, OS.LVM_GETTOOLTIPS, 0, 0); +LRESULT wmNotify (NMHDR hdr, long wParam, long lParam) { + long hwndToolTip = OS.SendMessage (handle, OS.LVM_GETTOOLTIPS, 0, 0); if (hdr.hwndFrom == hwndToolTip) { LRESULT result = wmNotifyToolTip (hdr, wParam, lParam); if (result != null) return result; @@ -6530,7 +6530,7 @@ LRESULT wmNotify (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmNotifyChild (NMHDR hdr, long wParam, long lParam) { switch (hdr.code) { case OS.LVN_ODFINDITEM: { if ((style & SWT.VIRTUAL) != 0) return new LRESULT (-1); @@ -6594,7 +6594,7 @@ LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { RECT rect = new RECT (); rect.left = OS.LVIR_BOUNDS; ignoreCustomDraw = true; - long /*int*/ code = OS.SendMessage (handle, OS. LVM_GETITEMRECT, plvfi.iItem, rect); + long code = OS.SendMessage (handle, OS. LVM_GETITEMRECT, plvfi.iItem, rect); ignoreCustomDraw = false; if (code != 0) OS.InvalidateRect (handle, rect, true); break; @@ -6727,7 +6727,7 @@ LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { break; } case OS.NM_CUSTOMDRAW: { - long /*int*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); + long hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); if (hdr.hwndFrom == hwndHeader) break; if (!customDraw && findImageControl () == null) { /* @@ -6820,8 +6820,8 @@ LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { } } if (hooks (SWT.EraseItem) || hooks (SWT.PaintItem)) { - long /*int*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); - int count = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); + long hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0); + int count = (int)OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0); if (count != 0) { forceResize (); RECT rect = new RECT (); @@ -6835,7 +6835,7 @@ LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { OS.SendMessage (handle, OS. LVM_GETITEMRECT, pnmlv.iItem, itemRect); ignoreCustomDraw = false; RECT headerRect = new RECT (); - int index = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_ORDERTOINDEX, count - 1, 0); + int index = (int)OS.SendMessage (hwndHeader, OS.HDM_ORDERTOINDEX, count - 1, 0); OS.SendMessage (hwndHeader, OS.HDM_GETITEMRECT, index, headerRect); OS.MapWindowPoints (hwndHeader, handle, headerRect, 2); rect.left = headerRect.right; @@ -6851,7 +6851,7 @@ LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { return super.wmNotifyChild (hdr, wParam, lParam); } -LRESULT wmNotifyHeader (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmNotifyHeader (NMHDR hdr, long wParam, long lParam) { /* * Feature in Windows. On NT, the automatically created * header control is created as a UNICODE window, not an @@ -6904,7 +6904,7 @@ LRESULT wmNotifyHeader (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { } else if (columns[(int) nmcd.dwItemSpec] == sortColumn && sortDirection != SWT.NONE) { pixel = getSlightlyDifferentColor(pixel); } - long /*int*/ brush = OS.CreateSolidBrush(pixel); + long brush = OS.CreateSolidBrush(pixel); OS.FillRect(nmcd.hdc, rect, brush); OS.DeleteObject(brush); @@ -6929,8 +6929,8 @@ LRESULT wmNotifyHeader (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { if (columns[i] == sortColumn && sortDirection != SWT.NONE) { // the display.getSortImage looks terrible after scaling up. - long /*int*/ pen = OS.CreatePen (OS.PS_SOLID, 1, getHeaderForegroundPixel()); - long /*int*/ oldPen = OS.SelectObject (nmcd.hdc, pen); + long pen = OS.CreatePen (OS.PS_SOLID, 1, getHeaderForegroundPixel()); + long oldPen = OS.SelectObject (nmcd.hdc, pen); int center = rects[i].left + (rects[i].right - rects[i].left) / 2; /* * Sort indicator size needs to scale as per the Native Windows OS DPI level @@ -6951,8 +6951,8 @@ LRESULT wmNotifyHeader (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { /* Windows 7 and 10 always draw a nearly invisible vertical line between the columns, even if lines are disabled. This line uses no fixed color constant, but calculates it from the background color. The method getSlightlyDifferentColor gives us a color, that is near enough to the windows algorithm. */ - long /*int*/ pen = OS.CreatePen (OS.PS_SOLID, getGridLineWidthInPixels(), getSlightlyDifferentColor(getHeaderBackgroundPixel())); - long /*int*/ oldPen = OS.SelectObject (nmcd.hdc, pen); + long pen = OS.CreatePen (OS.PS_SOLID, getGridLineWidthInPixels(), getSlightlyDifferentColor(getHeaderBackgroundPixel())); + long oldPen = OS.SelectObject (nmcd.hdc, pen); int alignmentCorrection = _getLinesVisible () ? 0 : 1; OS.Polyline(nmcd.hdc, new int[] {rects[i].right-alignmentCorrection, rects[i].top, rects[i].right-alignmentCorrection, rects[i].bottom}, 2); OS.SelectObject (nmcd.hdc, oldPen); @@ -7008,15 +7008,15 @@ LRESULT wmNotifyHeader (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { RECT rect = new RECT(); lastColumnRight += _getLinesVisible() ? 1 : 0; OS.SetRect(rect, lastColumnRight, nmcd.top, nmcd.right, nmcd.bottom-1); - long /*int*/ brush = OS.CreateSolidBrush(getHeaderBackgroundPixel()); + long brush = OS.CreateSolidBrush(getHeaderBackgroundPixel()); OS.FillRect(nmcd.hdc, rect, brush); OS.DeleteObject(brush); } // always draw the highlighted border at the end, to avoid overdrawing by other borders. if (highlightedHeaderDividerX != -1) { - long /*int*/ pen = OS.CreatePen (OS.PS_SOLID, 4, OS.GetSysColor(OS.COLOR_HIGHLIGHT)); - long /*int*/ oldPen = OS.SelectObject (nmcd.hdc, pen); + long pen = OS.CreatePen (OS.PS_SOLID, 4, OS.GetSysColor(OS.COLOR_HIGHLIGHT)); + long oldPen = OS.SelectObject (nmcd.hdc, pen); OS.Polyline(nmcd.hdc, new int[] {highlightedHeaderDividerX, nmcd.top, highlightedHeaderDividerX, nmcd.bottom}, 2); OS.SelectObject (nmcd.hdc, oldPen); OS.DeleteObject (pen); @@ -7039,7 +7039,7 @@ LRESULT wmNotifyHeader (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { } case OS.HDN_BEGINDRAG: { if (ignoreColumnMove) return LRESULT.ONE; - int bits = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); + int bits = (int)OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); if ((bits & OS.LVS_EX_HEADERDRAGDROP) != 0) { if (columnCount == 0) return LRESULT.ONE; NMHEADER phdn = new NMHEADER (); @@ -7057,7 +7057,7 @@ LRESULT wmNotifyHeader (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { } case OS.HDN_ENDDRAG: { headerItemDragging = false; - int bits = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); + int bits = (int)OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); if ((bits & OS.LVS_EX_HEADERDRAGDROP) == 0) break; NMHEADER phdn = new NMHEADER (); OS.MoveMemory (phdn, lParam, NMHEADER.sizeof); @@ -7097,7 +7097,7 @@ LRESULT wmNotifyHeader (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { * lines are not redrawn. The fix is to detect the case and force * a redraw of the first column. */ - int width = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETCOLUMNWIDTH, 0, 0); + int width = (int)OS.SendMessage (handle, OS.LVM_GETCOLUMNWIDTH, 0, 0); if (lastWidth == 0 && width > 0) { if (_getLinesVisible()) { RECT rect = new RECT (); @@ -7157,7 +7157,7 @@ LRESULT wmNotifyHeader (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { return null; } -LRESULT wmNotifyToolTip (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmNotifyToolTip (NMHDR hdr, long wParam, long lParam) { switch (hdr.code) { case OS.NM_CUSTOMDRAW: { if (toolTipText != null) break; @@ -7173,7 +7173,7 @@ LRESULT wmNotifyToolTip (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { LRESULT result = super.wmNotify (hdr, wParam, lParam); if (result != null) return result; if (hdr.code != OS.TTN_SHOW) tipRequested = true; - long /*int*/ code = callWindowProc (handle, OS.WM_NOTIFY, wParam, lParam); + long code = callWindowProc (handle, OS.WM_NOTIFY, wParam, lParam); if (hdr.code != OS.TTN_SHOW) tipRequested = false; if (toolTipText != null) break; if (isCustomToolTip ()) { @@ -7192,10 +7192,10 @@ LRESULT wmNotifyToolTip (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { */ if (OS.SendMessage (handle, OS.LVM_SUBITEMHITTEST, 0, pinfo) >= 0) { TableItem item = _getItem (pinfo.iItem); - long /*int*/ hDC = OS.GetDC (handle); - long /*int*/ oldFont = 0, newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); + long hDC = OS.GetDC (handle); + long oldFont = 0, newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont); - long /*int*/ hFont = item.fontHandle (pinfo.iSubItem); + long hFont = item.fontHandle (pinfo.iSubItem); if (hFont != -1) hFont = OS.SelectObject (hDC, hFont); Event event = sendMeasureItemEvent (item, pinfo.iItem, pinfo.iSubItem, hDC); if (!isDisposed () && !item.isDisposed ()) { @@ -7205,7 +7205,7 @@ LRESULT wmNotifyToolTip (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { if (hdr.code == OS.TTN_SHOW) { RECT toolRect = toolTipRect (itemRect); OS.MapWindowPoints (handle, 0, toolRect, 2); - long /*int*/ hwndToolTip = OS.SendMessage (handle, OS.LVM_GETTOOLTIPS, 0, 0); + long hwndToolTip = OS.SendMessage (handle, OS.LVM_GETTOOLTIPS, 0, 0); int flags = OS.SWP_NOACTIVATE | OS.SWP_NOZORDER; int width = toolRect.right - toolRect.left, height = toolRect.bottom - toolRect.top; OS.SetWindowPos (hwndToolTip, 0, toolRect.left , toolRect.top, width, height, flags); @@ -7250,7 +7250,7 @@ LRESULT wmNotifyToolTip (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { return null; } -LRESULT wmNotifyToolTip (NMTTCUSTOMDRAW nmcd, long /*int*/ lParam) { +LRESULT wmNotifyToolTip (NMTTCUSTOMDRAW nmcd, long lParam) { switch (nmcd.dwDrawStage) { case OS.CDDS_PREPAINT: { if (isCustomToolTip ()) { @@ -7277,10 +7277,10 @@ LRESULT wmNotifyToolTip (NMTTCUSTOMDRAW nmcd, long /*int*/ lParam) { */ if (OS.SendMessage (handle, OS.LVM_SUBITEMHITTEST, 0, pinfo) >= 0) { TableItem item = _getItem (pinfo.iItem); - long /*int*/ hDC = OS.GetDC (handle); - long /*int*/ hFont = item.fontHandle (pinfo.iSubItem); + long hDC = OS.GetDC (handle); + long hFont = item.fontHandle (pinfo.iSubItem); if (hFont == -1) hFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); - long /*int*/ oldFont = OS.SelectObject (hDC, hFont); + long oldFont = OS.SelectObject (hDC, hFont); boolean drawForeground = true; RECT cellRect = item.getBounds (pinfo.iItem, pinfo.iSubItem, true, true, false, false, hDC); if (hooks (SWT.EraseItem)) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableColumn.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableColumn.java index b6bc0cb37e..b29a01ff32 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableColumn.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableColumn.java @@ -319,8 +319,8 @@ public int getWidth () { int getWidthInPixels () { int index = parent.indexOf (this); if (index == -1) return 0; - long /*int*/ hwnd = parent.handle; - return (int)/*64*/OS.SendMessage (hwnd, OS.LVM_GETCOLUMNWIDTH, index, 0); + long hwnd = parent.handle; + return (int)OS.SendMessage (hwnd, OS.LVM_GETCOLUMNWIDTH, index, 0); } /** @@ -338,10 +338,10 @@ public void pack () { checkWidget (); int index = parent.indexOf (this); if (index == -1) return; - long /*int*/ hwnd = parent.handle; - int oldWidth = (int)/*64*/OS.SendMessage (hwnd, OS.LVM_GETCOLUMNWIDTH, index, 0); + long hwnd = parent.handle; + int oldWidth = (int)OS.SendMessage (hwnd, OS.LVM_GETCOLUMNWIDTH, index, 0); TCHAR buffer = new TCHAR (parent.getCodePage (), text, true); - int headerWidth = (int)/*64*/OS.SendMessage (hwnd, OS.LVM_GETSTRINGWIDTH, 0, buffer) + Table.HEADER_MARGIN; + int headerWidth = (int)OS.SendMessage (hwnd, OS.LVM_GETSTRINGWIDTH, 0, buffer) + Table.HEADER_MARGIN; if (OS.IsAppThemed ()) headerWidth += Table.HEADER_EXTRA; boolean hasHeaderImage = false; if (image != null || parent.sortColumn == this) { @@ -352,25 +352,25 @@ public void pack () { Rectangle bounds = image.getBoundsInPixels (); headerWidth += bounds.width; } - long /*int*/ hwndHeader = OS.SendMessage (hwnd, OS.LVM_GETHEADER, 0, 0); - int margin = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_GETBITMAPMARGIN, 0, 0); + long hwndHeader = OS.SendMessage (hwnd, OS.LVM_GETHEADER, 0, 0); + int margin = (int)OS.SendMessage (hwndHeader, OS.HDM_GETBITMAPMARGIN, 0, 0); headerWidth += margin * 4; } parent.ignoreColumnResize = true; int columnWidth = 0; if (parent.hooks (SWT.MeasureItem)) { RECT headerRect = new RECT (); - long /*int*/ hwndHeader = OS.SendMessage (hwnd, OS.LVM_GETHEADER, 0, 0); + long hwndHeader = OS.SendMessage (hwnd, OS.LVM_GETHEADER, 0, 0); OS.SendMessage (hwndHeader, OS.HDM_GETITEMRECT, index, headerRect); OS.MapWindowPoints (hwndHeader, hwnd, headerRect, 2); - long /*int*/ hDC = OS.GetDC (hwnd); - long /*int*/ oldFont = 0, newFont = OS.SendMessage (hwnd, OS.WM_GETFONT, 0, 0); + long hDC = OS.GetDC (hwnd); + long oldFont = 0, newFont = OS.SendMessage (hwnd, OS.WM_GETFONT, 0, 0); if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont); - int count = (int)/*64*/OS.SendMessage (hwnd, OS.LVM_GETITEMCOUNT, 0, 0); + int count = (int)OS.SendMessage (hwnd, OS.LVM_GETITEMCOUNT, 0, 0); for (int i=0; i<count; i++) { TableItem item = parent._getItem (i, false); if (item != null) { - long /*int*/ hFont = item.fontHandle (index); + long hFont = item.fontHandle (index); if (hFont != -1) hFont = OS.SelectObject (hDC, hFont); Event event = parent.sendMeasureItemEvent (item, i, index, hDC); if (hFont != -1) hFont = OS.SelectObject (hDC, hFont); @@ -384,7 +384,7 @@ public void pack () { OS.SendMessage (hwnd, OS.LVM_SETCOLUMNWIDTH, index, columnWidth); } else { OS.SendMessage (hwnd, OS.LVM_SETCOLUMNWIDTH, index, OS.LVSCW_AUTOSIZE); - columnWidth = (int)/*64*/OS.SendMessage (hwnd, OS.LVM_GETCOLUMNWIDTH, index, 0); + columnWidth = (int)OS.SendMessage (hwnd, OS.LVM_GETCOLUMNWIDTH, index, 0); if (index == 0) { /* * Bug in Windows. When LVM_SETCOLUMNWIDTH is used with LVSCW_AUTOSIZE @@ -401,7 +401,7 @@ public void pack () { * width by the width of the image list. */ if ((parent.style & SWT.CHECK) != 0) { - long /*int*/ hStateList = OS.SendMessage (hwnd, OS.LVM_GETIMAGELIST, OS.LVSIL_STATE, 0); + long hStateList = OS.SendMessage (hwnd, OS.LVM_GETIMAGELIST, OS.LVSIL_STATE, 0); if (hStateList != 0) { int [] cx = new int [1], cy = new int [1]; OS.ImageList_GetIconSize (hStateList, cx, cy); @@ -442,7 +442,7 @@ public void pack () { } } parent.ignoreColumnResize = false; - int newWidth = (int)/*64*/OS.SendMessage (hwnd, OS.LVM_GETCOLUMNWIDTH, index, 0); + int newWidth = (int)OS.SendMessage (hwnd, OS.LVM_GETCOLUMNWIDTH, index, 0); if (oldWidth != newWidth) { updateToolTip (index); sendEvent (SWT.Resize); @@ -547,7 +547,7 @@ public void setAlignment (int alignment) { if (index == -1 || index == 0) return; style &= ~(SWT.LEFT | SWT.RIGHT | SWT.CENTER); style |= alignment & (SWT.LEFT | SWT.RIGHT | SWT.CENTER); - long /*int*/ hwnd = parent.handle; + long hwnd = parent.handle; LVCOLUMN lvColumn = new LVCOLUMN (); lvColumn.mask = OS.LVCF_FMT; OS.SendMessage (hwnd, OS.LVM_GETCOLUMN, index, lvColumn); @@ -568,7 +568,7 @@ public void setAlignment (int alignment) { parent.forceResize (); RECT rect = new RECT (), headerRect = new RECT (); OS.GetClientRect (hwnd, rect); - long /*int*/ hwndHeader = OS.SendMessage (hwnd, OS.LVM_GETHEADER, 0, 0); + long hwndHeader = OS.SendMessage (hwnd, OS.LVM_GETHEADER, 0, 0); OS.SendMessage (hwndHeader, OS.HDM_GETITEMRECT, index, headerRect); OS.MapWindowPoints (hwndHeader, hwnd, headerRect, 2); rect.left = headerRect.left; @@ -592,7 +592,7 @@ public void setImage (Image image) { void setImage (Image image, boolean sort, boolean right) { int index = parent.indexOf (this); if (index == -1) return; - long /*int*/ hwnd = parent.handle; + long hwnd = parent.handle; LVCOLUMN lvColumn = new LVCOLUMN (); lvColumn.mask = OS.LVCF_FMT | OS.LVCF_IMAGE; OS.SendMessage (hwnd, OS.LVM_GETCOLUMN, index, lvColumn); @@ -656,8 +656,8 @@ public void setResizable (boolean resizable) { void setSortDirection (int direction) { int index = parent.indexOf (this); if (index == -1) return; - long /*int*/ hwnd = parent.handle; - long /*int*/ hwndHeader = OS.SendMessage (hwnd, OS.LVM_GETHEADER, 0, 0); + long hwnd = parent.handle; + long hwndHeader = OS.SendMessage (hwnd, OS.LVM_GETHEADER, 0, 0); HDITEM hdItem = new HDITEM (); hdItem.mask = OS.HDI_FORMAT | OS.HDI_IMAGE; OS.SendMessage (hwndHeader, OS.HDM_GETITEM, index, hdItem); @@ -700,8 +700,8 @@ void setSortDirection (int direction) { parent.forceResize (); RECT rect = new RECT (); OS.GetClientRect (hwnd, rect); - if ((int)/*64*/OS.SendMessage (hwnd, OS.LVM_GETBKCOLOR, 0, 0) != OS.CLR_NONE) { - int oldColumn = (int)/*64*/OS.SendMessage (hwnd, OS.LVM_GETSELECTEDCOLUMN, 0, 0); + if ((int)OS.SendMessage (hwnd, OS.LVM_GETBKCOLOR, 0, 0) != OS.CLR_NONE) { + int oldColumn = (int)OS.SendMessage (hwnd, OS.LVM_GETSELECTEDCOLUMN, 0, 0); int newColumn = direction == SWT.NONE ? -1 : index; OS.SendMessage (hwnd, OS.LVM_SETSELECTEDCOLUMN, newColumn, 0); RECT headerRect = new RECT (); @@ -739,7 +739,7 @@ public void setText (String string) { * text does not draw. The fix is to query and then * set the alignment. */ - long /*int*/ hwnd = parent.handle; + long hwnd = parent.handle; LVCOLUMN lvColumn = new LVCOLUMN (); lvColumn.mask = OS.LVCF_FMT; OS.SendMessage (hwnd, OS.LVM_GETCOLUMN, index, lvColumn); @@ -751,14 +751,14 @@ public void setText (String string) { * at the end of the text. The fix is to remove * mnemonic characters. */ - long /*int*/ hHeap = OS.GetProcessHeap (); + long hHeap = OS.GetProcessHeap (); char [] buffer = fixMnemonic (string); int byteCount = buffer.length * TCHAR.sizeof; - long /*int*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); + long pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); OS.MoveMemory (pszText, buffer, byteCount); lvColumn.mask |= OS.LVCF_TEXT; lvColumn.pszText = pszText; - long /*int*/ result = OS.SendMessage (hwnd, OS.LVM_SETCOLUMN, index, lvColumn); + long result = OS.SendMessage (hwnd, OS.LVM_SETCOLUMN, index, lvColumn); if (pszText != 0) OS.HeapFree (hHeap, 0, pszText); if (result == 0) error (SWT.ERROR_CANNOT_SET_TEXT); } @@ -793,7 +793,7 @@ public void setText (String string) { public void setToolTipText (String string) { checkWidget(); toolTipText = string; - long /*int*/ hwndHeaderToolTip = parent.headerToolTipHandle; + long hwndHeaderToolTip = parent.headerToolTipHandle; if (hwndHeaderToolTip == 0) { parent.createHeaderToolTips (); parent.updateHeaderToolTips (); @@ -819,17 +819,17 @@ void setWidthInPixels (int width) { if (width < 0) return; int index = parent.indexOf (this); if (index == -1) return; - long /*int*/ hwnd = parent.handle; - if (width != (int)/*64*/OS.SendMessage (hwnd, OS.LVM_GETCOLUMNWIDTH, index, 0)) { + long hwnd = parent.handle; + if (width != (int)OS.SendMessage (hwnd, OS.LVM_GETCOLUMNWIDTH, index, 0)) { OS.SendMessage (hwnd, OS.LVM_SETCOLUMNWIDTH, index, width); } } void updateToolTip (int index) { - long /*int*/ hwndHeaderToolTip = parent.headerToolTipHandle; + long hwndHeaderToolTip = parent.headerToolTipHandle; if (hwndHeaderToolTip != 0) { - long /*int*/ hwnd = parent.handle; - long /*int*/ hwndHeader = OS.SendMessage (hwnd, OS.LVM_GETHEADER, 0, 0); + long hwnd = parent.handle; + long hwndHeader = OS.SendMessage (hwnd, OS.LVM_GETHEADER, 0, 0); RECT rect = new RECT (); if (OS.SendMessage (hwndHeader, OS.HDM_GETITEMRECT, index, rect) != 0) { TOOLINFO lpti = new TOOLINFO (); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableItem.java index c58affa272..0206d30cb3 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableItem.java @@ -152,7 +152,7 @@ void destroyWidget () { releaseHandle (); } -long /*int*/ fontHandle (int index) { +long fontHandle (int index) { if (cellFont != null && cellFont [index] != null) return cellFont [index].handle; if (font != null) return font.handle; return -1; @@ -256,7 +256,7 @@ RECT getBounds (int row, int column, boolean getText, boolean getImage, boolean return getBounds (row, column, getText, getImage, fullText, false, 0); } -RECT getBounds (int row, int column, boolean getText, boolean getImage, boolean fullText, boolean fullImage, long /*int*/ hDC) { +RECT getBounds (int row, int column, boolean getText, boolean getImage, boolean fullText, boolean fullImage, long hDC) { if (!getText && !getImage) return new RECT (); int columnCount = parent.getColumnCount (); if (!(0 <= column && column < Math.max (1, columnCount))) { @@ -264,24 +264,24 @@ RECT getBounds (int row, int column, boolean getText, boolean getImage, boolean } if (parent.fixScrollWidth) parent.setScrollWidth (null, true); RECT rect = new RECT (); - long /*int*/ hwnd = parent.handle; - int bits = (int)/*64*/OS.SendMessage (hwnd, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); + long hwnd = parent.handle; + int bits = (int)OS.SendMessage (hwnd, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); if (column == 0 && (bits & OS.LVS_EX_FULLROWSELECT) == 0) { if (parent.explorerTheme) { rect.left = OS.LVIR_ICON; parent.ignoreCustomDraw = true; - long /*int*/ code = OS.SendMessage (hwnd, OS. LVM_GETITEMRECT, row, rect); + long code = OS.SendMessage (hwnd, OS. LVM_GETITEMRECT, row, rect); parent.ignoreCustomDraw = false; if (code == 0) return new RECT (); if (getText) { int width = 0; - long /*int*/ hFont = fontHandle (column); + long hFont = fontHandle (column); if (hFont == -1 && hDC == 0) { TCHAR buffer = new TCHAR (parent.getCodePage (), text, true); - width = (int)/*64*/OS.SendMessage (hwnd, OS.LVM_GETSTRINGWIDTH, 0, buffer); + width = (int)OS.SendMessage (hwnd, OS.LVM_GETSTRINGWIDTH, 0, buffer); } else { char [] buffer = text.toCharArray (); - long /*int*/ textDC = hDC != 0 ? hDC : OS.GetDC (hwnd), oldFont = -1; + long textDC = hDC != 0 ? hDC : OS.GetDC (hwnd), oldFont = -1; if (hDC == 0) { if (hFont == -1) hFont = OS.SendMessage (hwnd, OS.WM_GETFONT, 0, 0); oldFont = OS.SelectObject (textDC, hFont); @@ -302,7 +302,7 @@ RECT getBounds (int row, int column, boolean getText, boolean getImage, boolean if (getText) { rect.left = OS.LVIR_SELECTBOUNDS; parent.ignoreCustomDraw = true; - long /*int*/ code = OS.SendMessage (hwnd, OS.LVM_GETITEMRECT, row, rect); + long code = OS.SendMessage (hwnd, OS.LVM_GETITEMRECT, row, rect); parent.ignoreCustomDraw = false; if (code == 0) return new RECT (); if (!getImage) { @@ -316,14 +316,14 @@ RECT getBounds (int row, int column, boolean getText, boolean getImage, boolean } else { rect.left = OS.LVIR_ICON; parent.ignoreCustomDraw = true; - long /*int*/ code = OS.SendMessage (hwnd, OS.LVM_GETITEMRECT, row, rect); + long code = OS.SendMessage (hwnd, OS.LVM_GETITEMRECT, row, rect); parent.ignoreCustomDraw = false; if (code == 0) return new RECT (); } } if (fullText || fullImage) { RECT headerRect = new RECT (); - long /*int*/ hwndHeader = OS.SendMessage (hwnd, OS.LVM_GETHEADER, 0, 0); + long hwndHeader = OS.SendMessage (hwnd, OS.LVM_GETHEADER, 0, 0); OS.SendMessage (hwndHeader, OS.HDM_GETITEMRECT, 0, headerRect); OS.MapWindowPoints (hwndHeader, hwnd, headerRect, 2); if (getText && fullText) rect.right = headerRect.right; @@ -347,7 +347,7 @@ RECT getBounds (int row, int column, boolean getText, boolean getImage, boolean */ rect.left = getText ? OS.LVIR_LABEL : OS.LVIR_ICON; parent.ignoreCustomDraw = true; - long /*int*/ code = OS.SendMessage (hwnd, OS. LVM_GETSUBITEMRECT, row, rect); + long code = OS.SendMessage (hwnd, OS. LVM_GETSUBITEMRECT, row, rect); parent.ignoreCustomDraw = false; if (code == 0) return new RECT (); /* @@ -381,7 +381,7 @@ RECT getBounds (int row, int column, boolean getText, boolean getImage, boolean } if (column == 0 && fullImage) { RECT headerRect = new RECT (); - long /*int*/ hwndHeader = OS.SendMessage (hwnd, OS.LVM_GETHEADER, 0, 0); + long hwndHeader = OS.SendMessage (hwnd, OS.LVM_GETHEADER, 0, 0); OS.SendMessage (hwndHeader, OS.HDM_GETITEMRECT, 0, headerRect); OS.MapWindowPoints (hwndHeader, hwnd, headerRect, 2); rect.left = headerRect.left; @@ -389,7 +389,7 @@ RECT getBounds (int row, int column, boolean getText, boolean getImage, boolean } else { rect.left = OS.LVIR_ICON; parent.ignoreCustomDraw = true; - long /*int*/ code = OS.SendMessage (hwnd, OS. LVM_GETSUBITEMRECT, row, rect); + long code = OS.SendMessage (hwnd, OS. LVM_GETSUBITEMRECT, row, rect); parent.ignoreCustomDraw = false; if (code == 0) return new RECT (); if (!hasImage) rect.right = rect.left; @@ -706,7 +706,7 @@ Rectangle getTextBoundsInPixels (int index) { void redraw () { if (parent.currentItem == this || !parent.getDrawing ()) return; - long /*int*/ hwnd = parent.handle; + long hwnd = parent.handle; if (!OS.IsWindowVisible (hwnd)) return; int index = parent.indexOf (this); if (index == -1) return; @@ -715,7 +715,7 @@ void redraw () { void redraw (int column, boolean drawText, boolean drawImage) { if (parent.currentItem == this || !parent.getDrawing ()) return; - long /*int*/ hwnd = parent.handle; + long hwnd = parent.handle; if (!OS.IsWindowVisible (hwnd)) return; int index = parent.indexOf (this); if (index == -1) return; @@ -885,7 +885,7 @@ public void setFont (Font font){ if ((parent.style & SWT.VIRTUAL) == 0 && cached) { int itemIndex = parent.indexOf (this); if (itemIndex != -1) { - long /*int*/ hwnd = parent.handle; + long hwnd = parent.handle; LVITEM lvItem = new LVITEM (); lvItem.mask = OS.LVIF_TEXT; lvItem.iItem = itemIndex; @@ -949,7 +949,7 @@ public void setFont (int index, Font font) { if ((parent.style & SWT.VIRTUAL) == 0 && cached) { int itemIndex = parent.indexOf (this); if (itemIndex != -1) { - long /*int*/ hwnd = parent.handle; + long hwnd = parent.handle; LVITEM lvItem = new LVITEM (); lvItem.mask = OS.LVIF_TEXT; lvItem.iItem = itemIndex; @@ -1159,7 +1159,7 @@ public void setImageIndent (int indent) { } else { int index = parent.indexOf (this); if (index != -1) { - long /*int*/ hwnd = parent.handle; + long hwnd = parent.handle; LVITEM lvItem = new LVITEM (); lvItem.mask = OS.LVIF_INDENT; lvItem.iItem = index; @@ -1246,7 +1246,7 @@ public void setText (int index, String string) { if ((parent.style & SWT.VIRTUAL) == 0 && cached) { int itemIndex = parent.indexOf (this); if (itemIndex != -1) { - long /*int*/ hwnd = parent.handle; + long hwnd = parent.handle; LVITEM lvItem = new LVITEM (); lvItem.mask = OS.LVIF_TEXT; lvItem.iItem = itemIndex; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TaskBar.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TaskBar.java index ed3c218b2c..406c1bf00f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TaskBar.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TaskBar.java @@ -40,7 +40,7 @@ import org.eclipse.swt.internal.win32.*; public class TaskBar extends Widget { int itemCount; TaskItem [] items = new TaskItem [4]; - long /*int*/ mTaskbarList3; + long mTaskbarList3; static final char [] EXE_PATH; static final char [] ICO_DIR = {'i','c','o','_','d','i','r','\0'}; @@ -95,7 +95,7 @@ TaskBar (Display display, int style) { } void createHandle () { - long /*int*/[] ppv = new long /*int*/ [1]; + long[] ppv = new long [1]; int hr = OS.CoCreateInstance (CLSID_TaskbarList, 0, OS.CLSCTX_INPROC_SERVER, IID_ITaskbarList3, ppv); if (hr != OS.S_OK) error (SWT.ERROR_NO_HANDLES); mTaskbarList3 = ppv [0]; @@ -121,17 +121,17 @@ void createItems () { getItem (null); } -long /*int*/ createShellLink (MenuItem item, String directory) { +long createShellLink (MenuItem item, String directory) { int style = item.getStyle (); if ((style & SWT.CASCADE) != 0) return 0; - long /*int*/ [] ppv = new long /*int*/ [1]; + long [] ppv = new long [1]; int hr = OS.CoCreateInstance (CLSID_ShellLink, 0, OS.CLSCTX_INPROC_SERVER, IID_IShellLinkW, ppv); if (hr != OS.S_OK) error (SWT.ERROR_NO_HANDLES); - long /*int*/ pLink = ppv [0]; + long pLink = ppv [0]; - long /*int*/ hHeap = OS.GetProcessHeap (); - long /*int*/ pv = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, OS.PROPVARIANT_sizeof()); - long /*int*/ titlePtr = 0; + long hHeap = OS.GetProcessHeap (); + long pv = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, OS.PROPVARIANT_sizeof()); + long titlePtr = 0; PROPERTYKEY key; if ((style & SWT.SEPARATOR) != 0) { OS.MoveMemory (pv, new short [] {OS.VT_BOOL}, 2); @@ -145,7 +145,7 @@ long /*int*/ createShellLink (MenuItem item, String directory) { titlePtr = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, buffer.length * 2); OS.MoveMemory (titlePtr, buffer, buffer.length * 2); OS.MoveMemory (pv, new short [] {OS.VT_LPWSTR}, 2); - OS.MoveMemory (pv + 8, new long /*int*/ [] {titlePtr}, C.PTR_SIZEOF); + OS.MoveMemory (pv + 8, new long [] {titlePtr}, C.PTR_SIZEOF); key = PKEY_Title; /*IShellLink::SetPath*/ @@ -214,7 +214,7 @@ long /*int*/ createShellLink (MenuItem item, String directory) { /*IUnknown::QueryInterface*/ hr = OS.VtblCall (0, pLink, IID_IPropertyStore, ppv); if (hr != OS.S_OK) error (SWT.ERROR_NO_HANDLES); - long /*int*/ pPropStore = ppv [0]; + long pPropStore = ppv [0]; /*IPropertyStore::SetValue*/ hr = OS.VtblCall (6, pPropStore, key, pv); if (hr != OS.S_OK) error (SWT.ERROR_INVALID_ARGUMENT); @@ -228,15 +228,15 @@ long /*int*/ createShellLink (MenuItem item, String directory) { return pLink; } -long /*int*/ createShellLinkArray (MenuItem [] items, String directory) { +long createShellLinkArray (MenuItem [] items, String directory) { if (items == null) return 0; if (items.length == 0) return 0; - long /*int*/ [] ppv = new long /*int*/ [1]; + long [] ppv = new long [1]; int hr = OS.CoCreateInstance (CLSID_EnumerableObjectCollection, 0, OS.CLSCTX_INPROC_SERVER, IID_IObjectCollection, ppv); if (hr != OS.S_OK) error (SWT.ERROR_NO_HANDLES); - long /*int*/ pObjColl = ppv [0]; + long pObjColl = ppv [0]; for (int i = 0; i < items.length; i++) { - long /*int*/ pLink = createShellLink (items[i], directory); + long pLink = createShellLink (items[i], directory); if (pLink != 0) { /*IObjectCollection::AddObject*/ hr = OS.VtblCall (5, pObjColl, pLink); @@ -248,7 +248,7 @@ long /*int*/ createShellLinkArray (MenuItem [] items, String directory) { /*IUnknown::QueryInterface*/ hr = OS.VtblCall (0, pObjColl, IID_IObjectArray, ppv); if (hr != OS.S_OK) error (SWT.ERROR_NO_HANDLES); - long /*int*/ poa = ppv [0]; + long poa = ppv [0]; /*IUnknown::Release*/ OS.VtblCall (2, pObjColl); return poa; @@ -286,24 +286,24 @@ String getDirectory (char[] appName) { } } String result = null; - long /*int*/ [] ppv = new long /*int*/ [1]; + long [] ppv = new long [1]; int hr = OS.SHCreateItemInKnownFolder (FOLDERID_LocalAppData, 0, null, IID_IShellItem, ppv); if (hr == OS.S_OK) { - long /*int*/ psiRoot = ppv [0]; + long psiRoot = ppv [0]; hr = OS.CoCreateInstance (CLSID_FileOperation, 0, OS.CLSCTX_INPROC_SERVER, IID_IFileOperation, ppv); if (hr == OS.S_OK) { - long /*int*/ pfo = ppv [0]; + long pfo = ppv [0]; /*IFileOperation.SetOperationFlags*/ hr = OS.VtblCall (5, pfo, OS.FOF_NO_UI); if (hr == OS.S_OK) { - long /*int*/ psiAppDir = getDirectory (psiRoot, pfo, appDir, false); + long psiAppDir = getDirectory (psiRoot, pfo, appDir, false); if (psiAppDir != 0) { - long /*int*/ psiIcoDir = getDirectory (psiAppDir, pfo, ICO_DIR, true); + long psiIcoDir = getDirectory (psiAppDir, pfo, ICO_DIR, true); if (psiIcoDir != 0) { /*IShellItem::GetDisplayName*/ hr = OS.VtblCall (5, psiIcoDir, OS.SIGDN_FILESYSPATH, ppv); if (hr == OS.S_OK) { - long /*int*/ wstr = ppv [0]; + long wstr = ppv [0]; int length = OS.wcslen (wstr); char [] buffer = new char [length]; OS.MoveMemory (buffer, wstr, length * 2); @@ -326,8 +326,8 @@ String getDirectory (char[] appName) { return result; } -long /*int*/ getDirectory (long /*int*/ parent, long /*int*/ pfo, char [] name, boolean delete) { - long /*int*/ [] ppv = new long /*int*/ [1]; +long getDirectory (long parent, long pfo, char [] name, boolean delete) { + long [] ppv = new long [1]; int hr = OS.SHCreateItemFromRelativeName (parent, name, 0, IID_IShellItem, ppv); if (hr == OS.S_OK) { if (delete) { @@ -498,10 +498,10 @@ void reskinChildren (int flags) { } void setMenu (Menu menu) { - long /*int*/ [] ppv = new long /*int*/ [1]; + long [] ppv = new long [1]; int hr = OS.CoCreateInstance (CLSID_DestinationList, 0, OS.CLSCTX_INPROC_SERVER, IID_ICustomDestinationList, ppv); if (hr != OS.S_OK) error (SWT.ERROR_NO_HANDLES); - long /*int*/ pDestList = ppv[0]; + long pDestList = ppv[0]; String appName = Display.APP_NAME; char [] buffer = {'S', 'W', 'T', '\0'}; if (appName != null && appName.length () > 0) { @@ -520,7 +520,7 @@ void setMenu (Menu menu) { break; } } - long /*int*/ poa = createShellLinkArray (items, directory); + long poa = createShellLinkArray (items, directory); if (poa != 0) { /*ICustomDestinationList::SetAppID*/ @@ -531,7 +531,7 @@ void setMenu (Menu menu) { int [] cMaxSlots = new int [1]; OS.VtblCall (4, pDestList, cMaxSlots, IID_IObjectArray, ppv); if (hr != OS.S_OK) error (SWT.ERROR_INVALID_ARGUMENT); - long /*int*/ pRemovedItems = ppv [0]; + long pRemovedItems = ppv [0]; int [] count = new int [1]; /*IObjectArray::GetCount*/ @@ -557,7 +557,7 @@ void setMenu (Menu menu) { } } } - long /*int*/ poa2 = createShellLinkArray (subItems, directory); + long poa2 = createShellLinkArray (subItems, directory); if (poa2 != 0) { /*IObjectArray::GetCount*/ OS.VtblCall (3, poa2, count); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TaskItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TaskItem.java index 575c6fdd02..42153c82a2 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TaskItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TaskItem.java @@ -293,8 +293,8 @@ public void setOverlayImage (Image overlayImage) { if (overlayText.length () != 0) { updateText (); } else { - long /*int*/ mTaskbarList3 = parent.mTaskbarList3; - long /*int*/ hwnd = shell.handle; + long mTaskbarList3 = parent.mTaskbarList3; + long hwnd = shell.handle; /* ITaskbarList3::SetOverlayIcon */ OS.VtblCall (18, mTaskbarList3, hwnd, 0, 0); } @@ -338,8 +338,8 @@ public void setOverlayText (String overlayText) { if (overlayImage != null) { updateImage (); } else { - long /*int*/ mTaskbarList3 = parent.mTaskbarList3; - long /*int*/ hwnd = shell.handle; + long mTaskbarList3 = parent.mTaskbarList3; + long hwnd = shell.handle; /* ITaskbarList3::SetOverlayIcon */ OS.VtblCall (18, mTaskbarList3, hwnd, 0, 0); } @@ -437,7 +437,7 @@ void setShell (Shell shell) { void updateImage () { showingText = false; Image image2 = null; - long /*int*/ hIcon = 0; + long hIcon = 0; switch (overlayImage.type) { case SWT.BITMAP: image2 = Display.createIcon (overlayImage); @@ -447,8 +447,8 @@ void updateImage () { hIcon = overlayImage.handle; break; } - long /*int*/ mTaskbarList3 = parent.mTaskbarList3; - long /*int*/ hwnd = shell.handle; + long mTaskbarList3 = parent.mTaskbarList3; + long hwnd = shell.handle; /* ITaskbarList3::SetOverlayIcon */ OS.VtblCall (18, mTaskbarList3, hwnd, hIcon, 0); if (image2 != null) image2.dispose (); @@ -457,8 +457,8 @@ void updateImage () { void updateProgress () { if (progressState == SWT.INDETERMINATE) return; if (progressState == SWT.DEFAULT) return; - long /*int*/ mTaskbarList3 = parent.mTaskbarList3; - long /*int*/ hwnd = shell.handle; + long mTaskbarList3 = parent.mTaskbarList3; + long hwnd = shell.handle; /* ITaskbarList3::SetProgressValue */ OS.VtblCall (9, mTaskbarList3, hwnd, (long)progress, (long)PROGRESS_MAX); } @@ -471,8 +471,8 @@ void updateProgressState () { case SWT.PAUSED: tbpFlags = OS.TBPF_PAUSED; break; case SWT.INDETERMINATE: tbpFlags = OS.TBPF_INDETERMINATE; break; } - long /*int*/ mTaskbarList3 = parent.mTaskbarList3; - long /*int*/ hwnd = shell.handle; + long mTaskbarList3 = parent.mTaskbarList3; + long hwnd = shell.handle; /* ITaskbarList3::SetProgressValue */ OS.VtblCall (9, mTaskbarList3, hwnd, (long)progress, (long)PROGRESS_MAX); /* ITaskbarList3::SetProgressState */ @@ -483,7 +483,7 @@ void updateText () { showingText = true; /* Create resources */ int width = 16, height = 16; - long /*int*/ hdc = OS.GetDC (0); + long hdc = OS.GetDC (0); BITMAPINFOHEADER bmiHeader = new BITMAPINFOHEADER (); bmiHeader.biSize = BITMAPINFOHEADER.sizeof; bmiHeader.biWidth = width; @@ -493,23 +493,23 @@ void updateText () { bmiHeader.biCompression = OS.BI_RGB; byte [] bmi = new byte [BITMAPINFOHEADER.sizeof]; OS.MoveMemory (bmi, bmiHeader, BITMAPINFOHEADER.sizeof); - long /*int*/ [] pBits = new long /*int*/ [1]; - long /*int*/ hBitmap = OS.CreateDIBSection (0, bmi, OS.DIB_RGB_COLORS, pBits, 0, 0); + long [] pBits = new long [1]; + long hBitmap = OS.CreateDIBSection (0, bmi, OS.DIB_RGB_COLORS, pBits, 0, 0); if (hBitmap == 0) error (SWT.ERROR_NO_HANDLES); - long /*int*/ dstHdc = OS.CreateCompatibleDC (hdc); - long /*int*/ oldBitmap = OS.SelectObject (dstHdc, hBitmap); - long /*int*/ hMask = OS.CreateBitmap (width, height, 1, 1, null); + long dstHdc = OS.CreateCompatibleDC (hdc); + long oldBitmap = OS.SelectObject (dstHdc, hBitmap); + long hMask = OS.CreateBitmap (width, height, 1, 1, null); if (hMask == 0) error (SWT.ERROR_NO_HANDLES); - long /*int*/ maskHdc = OS.CreateCompatibleDC (hdc); - long /*int*/ oldMask = OS.SelectObject (maskHdc, hMask); + long maskHdc = OS.CreateCompatibleDC (hdc); + long oldMask = OS.SelectObject (maskHdc, hMask); /* Draw content */ OS.PatBlt (maskHdc, 0, 0, width, height, OS.WHITENESS); - long /*int*/ oldBrush = OS.SelectObject (maskHdc, OS.GetStockObject (OS.BLACK_BRUSH)); + long oldBrush = OS.SelectObject (maskHdc, OS.GetStockObject (OS.BLACK_BRUSH)); OS.RoundRect (maskHdc, 0, 0, width, height, 8, 8); OS.SelectObject (maskHdc, oldBrush); - long /*int*/ brush = OS.CreateSolidBrush (OS.GetSysColor (OS.COLOR_HIGHLIGHT)); + long brush = OS.CreateSolidBrush (OS.GetSysColor (OS.COLOR_HIGHLIGHT)); oldBrush = OS.SelectObject (dstHdc, brush); OS.RoundRect (dstHdc, 0, 0, width, height, 8, 8); OS.SelectObject (dstHdc, oldBrush); @@ -519,7 +519,7 @@ void updateText () { RECT rect = new RECT (); char [] buffer = overlayText.toCharArray (); int length = buffer.length; - long /*int*/ hFont = 0, oldHFont = 0; + long hFont = 0, oldHFont = 0; NONCLIENTMETRICS info = new NONCLIENTMETRICS (); info.cbSize = NONCLIENTMETRICS.sizeof; if (OS.SystemParametersInfo (OS.SPI_GETNONCLIENTMETRICS, 0, info, 0)) { @@ -558,13 +558,13 @@ void updateText () { iconInfo.fIcon = true; iconInfo.hbmColor = hBitmap; iconInfo.hbmMask = hMask; - long /*int*/ hIcon = OS.CreateIconIndirect (iconInfo); + long hIcon = OS.CreateIconIndirect (iconInfo); if (hIcon == 0) error (SWT.ERROR_NO_HANDLES); OS.DeleteObject (hBitmap); OS.DeleteObject (hMask); - long /*int*/ mTaskbarList3 = parent.mTaskbarList3; - long /*int*/ hwnd = shell.handle; + long mTaskbarList3 = parent.mTaskbarList3; + long hwnd = shell.handle; /* ITaskbarList3::SetOverlayIcon */ OS.VtblCall (18, mTaskbarList3, hwnd, hIcon, 0); OS.DestroyIcon (hIcon); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Text.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Text.java index 68a1eff19a..fa06e8ae13 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Text.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Text.java @@ -68,7 +68,7 @@ public class Text extends Scrollable { String message; int[] segments; int clearSegmentsCount = 0; - long /*int*/ hwndSearch, hwndCancel, hwndActive; + long hwndSearch, hwndCancel, hwndActive; static final char LTR_MARK = '\u200e'; static final char RTL_MARK = '\u200f'; @@ -109,7 +109,7 @@ public class Text extends Scrollable { DELIMITER = "\r\n"; } - static final long /*int*/ EditProc; + static final long EditProc; static final TCHAR EditClass = new TCHAR (0, "EDIT", true); static { WNDCLASS lpWndClass = new WNDCLASS (); @@ -118,7 +118,7 @@ public class Text extends Scrollable { /* * This code is intentionally commented. */ -// long /*int*/ hwndText = OS.CreateWindowEx (0, +// long hwndText = OS.CreateWindowEx (0, // EditClass, // null, // OS.WS_OVERLAPPED | OS.ES_PASSWORD, @@ -175,7 +175,7 @@ public Text (Composite parent, int style) { } @Override -long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) { +long callWindowProc (long hwnd, int msg, long wParam, long lParam) { if (handle == 0) return 0; boolean redraw = false; switch (msg) { @@ -196,13 +196,13 @@ long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, lo drawMessage = hwnd != OS.GetFocus () && OS.GetWindowTextLength (handle) == 0; } if (doubleBuffer || drawMessage) { - long /*int*/ paintDC = 0; + long paintDC = 0; PAINTSTRUCT ps = new PAINTSTRUCT (); paintDC = OS.BeginPaint (handle, ps); int width = ps.right - ps.left; int height = ps.bottom - ps.top; if (width != 0 && height != 0) { - long /*int*/ hDC = paintDC, hBitmap = 0, hOldBitmap = 0; + long hDC = paintDC, hBitmap = 0, hOldBitmap = 0; POINT lpPoint1 = null, lpPoint2 = null; if (doubleBuffer) { hDC = OS.CreateCompatibleDC (paintDC); @@ -225,7 +225,7 @@ long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, lo if (drawMessage) { RECT rect = new RECT(); OS.GetClientRect(handle, rect); - long /*int*/ margins = OS.SendMessage (handle, OS.EM_GETMARGINS, 0, 0); + long margins = OS.SendMessage (handle, OS.EM_GETMARGINS, 0, 0); rect.left += OS.LOWORD (margins); rect.right -= OS.HIWORD (margins); if ((style & SWT.BORDER) != 0) { @@ -244,8 +244,8 @@ long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, lo case SWT.CENTER: uFormat |= OS.DT_CENTER; case SWT.RIGHT: uFormat |= (rtl ? OS.DT_LEFT : OS.DT_RIGHT); break; } - long /*int*/ hFont = OS.SendMessage (hwnd, OS.WM_GETFONT, 0, 0); - long /*int*/ hOldFont = OS.SelectObject (hDC, hFont); + long hFont = OS.SendMessage (hwnd, OS.WM_GETFONT, 0, 0); + long hOldFont = OS.SelectObject (hDC, hFont); OS.SetTextColor (hDC, OS.GetSysColor (OS.COLOR_GRAYTEXT)); OS.SetBkMode (hDC, OS.TRANSPARENT); OS.DrawText (hDC, buffer, buffer.length, rect, uFormat); @@ -272,7 +272,7 @@ long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, lo case OS.WM_MOUSEMOVE: { POINT pt = new POINT (); OS.POINTSTOPOINT(pt, lParam); - long /*int*/ prevActive = hwndActive; + long prevActive = hwndActive; hwndActive = OS.ChildWindowFromPointEx (handle, pt, OS.CWP_SKIPINVISIBLE); if (hwndActive == handle) hwndActive = 0; if (prevActive != hwndActive) { @@ -310,7 +310,7 @@ long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, lo } } } - long /*int*/ code = OS.CallWindowProc (EditProc, hwnd, msg, wParam, lParam); + long code = OS.CallWindowProc (EditProc, hwnd, msg, wParam, lParam); switch (msg) { case OS.WM_HSCROLL: case OS.WM_VSCROLL: { @@ -335,7 +335,7 @@ void createHandle () { } if ((style & SWT.SEARCH) != 0) { if (display.hIconSearch == 0) { - long /*int*/ [] phicon = new long /*int*/ [1]; + long [] phicon = new long [1]; int hresult = OS.LoadIconMetric (OS.GetLibraryHandle (), IDI_SEARCH, OS.LIM_SMALL, phicon); if (hresult != OS.S_OK) error (SWT.ERROR_NO_HANDLES); display.hIconSearch = phicon [0]; @@ -587,7 +587,7 @@ void applySegments () { segmentsChars = segmentsCharsCrLf; } - int/*64*/ limit = (int/*64*/)OS.SendMessage (handle, OS.EM_GETLIMITTEXT, 0, 0) & 0x7fffffff; + int limit = (int)OS.SendMessage (handle, OS.EM_GETLIMITTEXT, 0, 0) & 0x7fffffff; OS.SendMessage (handle, OS.EM_SETLIMITTEXT, limit + Math.min (nSegments, LIMIT - limit), 0); length += nSegments; char [] newChars = new char [length + 1]; @@ -619,7 +619,7 @@ void applySegments () { */ newChars [length] = 0; OS.SendMessage (handle, OS.EM_SETSEL, 0, -1); - long /*int*/ undo = OS.SendMessage (handle, OS.EM_CANUNDO, 0, 0); + long undo = OS.SendMessage (handle, OS.EM_CANUNDO, 0, 0); OS.SendMessage (handle, OS.EM_REPLACESEL, undo, newChars); /* Restore selection */ start [0] = translateOffset (start [0]); @@ -660,7 +660,7 @@ void clearSegments (boolean applyText) { if (segments == null) return; int nSegments = segments.length; if (nSegments == 0) return; - int/*64*/ limit = (int/*64*/)OS.SendMessage (handle, OS.EM_GETLIMITTEXT, 0, 0) & 0x7fffffff; + int limit = (int)OS.SendMessage (handle, OS.EM_GETLIMITTEXT, 0, 0) & 0x7fffffff; if (limit < LIMIT) { OS.SendMessage (handle, OS.EM_SETLIMITTEXT, Math.max (1, limit - nSegments), 0); } @@ -686,7 +686,7 @@ void clearSegments (boolean applyText) { * menu. Sending OS.EM_REPLACESEL message instead. */ OS.SendMessage (handle, OS.EM_SETSEL, 0, -1); - long /*int*/ undo = OS.SendMessage (handle, OS.EM_CANUNDO, 0, 0); + long undo = OS.SendMessage (handle, OS.EM_CANUNDO, 0, 0); OS.SendMessage (handle, OS.EM_REPLACESEL, undo, buffer); OS.SendMessage (handle, OS.EM_SETSEL, start [0], end [0]); ignoreCharacter = oldIgnoreCharacter; @@ -711,13 +711,13 @@ public void clearSelection () { checkWidget (); int height = 0, width = 0; if (wHint == SWT.DEFAULT || hHint == SWT.DEFAULT) { - long /*int*/ newFont, oldFont = 0; - long /*int*/ hDC = OS.GetDC (handle); + long newFont, oldFont = 0; + long hDC = OS.GetDC (handle); newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont); TEXTMETRIC tm = new TEXTMETRIC (); OS.GetTextMetrics (hDC, tm); - int count = (style & SWT.SINGLE) != 0 ? 1 : (int)/*64*/OS.SendMessage (handle, OS.EM_GETLINECOUNT, 0, 0); + int count = (style & SWT.SINGLE) != 0 ? 1 : (int)OS.SendMessage (handle, OS.EM_GETLINECOUNT, 0, 0); height = count * tm.tmHeight; RECT rect = new RECT (); int flags = OS.DT_CALCRECT | OS.DT_EDITCONTROL | OS.DT_NOPREFIX; @@ -764,7 +764,7 @@ public void clearSelection () { * the single-line text widget in an editable combo * box. */ - long /*int*/ margins = OS.SendMessage(handle, OS.EM_GETMARGINS, 0, 0); + long margins = OS.SendMessage(handle, OS.EM_GETMARGINS, 0, 0); rect.x -= OS.LOWORD (margins); rect.width += OS.LOWORD (margins) + OS.HIWORD (margins); if ((style & SWT.H_SCROLL) != 0) rect.width++; @@ -862,12 +862,12 @@ TCHAR deprocessText (TCHAR text, int start, int end, boolean terminate) { } @Override -boolean dragDetect (long /*int*/ hwnd, int x, int y, boolean filter, boolean [] detect, boolean [] consume) { +boolean dragDetect (long hwnd, int x, int y, boolean filter, boolean [] detect, boolean [] consume) { if (filter) { int [] start = new int [1], end = new int [1]; OS.SendMessage (handle, OS.EM_GETSEL, start, end); if (start [0] != end [0]) { - long /*int*/ lParam = OS.MAKELPARAM (x, y); + long lParam = OS.MAKELPARAM (x, y); int position = OS.LOWORD (OS.SendMessage (handle, OS.EM_CHARFROMPOS, 0, lParam)); if (start [0] <= position && position < end [0]) { if (super.dragDetect (hwnd, x, y, filter, detect, consume)) { @@ -955,7 +955,7 @@ void fixAlignment () { */ public int getCaretLineNumber () { checkWidget (); - return (int)/*64*/OS.SendMessage (handle, OS.EM_LINEFROMCHAR, -1, 0); + return (int)OS.SendMessage (handle, OS.EM_LINEFROMCHAR, -1, 0); } /** @@ -987,7 +987,7 @@ Point getCaretLocationInPixels () { * pixel coordinates (0,0). */ int position = translateOffset (getCaretPosition ()); - long /*int*/ caretPos = OS.SendMessage (handle, OS.EM_POSFROMCHAR, position, 0); + long caretPos = OS.SendMessage (handle, OS.EM_POSFROMCHAR, position, 0); if (caretPos == -1) { caretPos = 0; if (position >= OS.GetWindowTextLength (handle)) { @@ -1047,8 +1047,8 @@ public int getCaretPosition () { */ int caret = start [0]; if (start [0] != end [0]) { - int startLine = (int)/*64*/OS.SendMessage (handle, OS.EM_LINEFROMCHAR, start [0], 0); - int endLine = (int)/*64*/OS.SendMessage (handle, OS.EM_LINEFROMCHAR, end [0], 0); + int startLine = (int)OS.SendMessage (handle, OS.EM_LINEFROMCHAR, start [0], 0); + int endLine = (int)OS.SendMessage (handle, OS.EM_LINEFROMCHAR, end [0], 0); if (startLine == endLine) { int idThread = OS.GetWindowThreadProcessId (handle, null); GUITHREADINFO lpgui = new GUITHREADINFO (); @@ -1057,9 +1057,9 @@ public int getCaretPosition () { if (lpgui.hwndCaret == handle || lpgui.hwndCaret == 0) { POINT ptCurrentPos = new POINT (); if (OS.GetCaretPos (ptCurrentPos)) { - long /*int*/ endPos = OS.SendMessage (handle, OS.EM_POSFROMCHAR, end [0], 0); + long endPos = OS.SendMessage (handle, OS.EM_POSFROMCHAR, end [0], 0); if (endPos == -1) { - long /*int*/ startPos = OS.SendMessage (handle, OS.EM_POSFROMCHAR, start [0], 0); + long startPos = OS.SendMessage (handle, OS.EM_POSFROMCHAR, start [0], 0); int startX = OS.GET_X_LPARAM (startPos); if (ptCurrentPos.x > startX) caret = end [0]; } else { @@ -1070,8 +1070,8 @@ public int getCaretPosition () { } } } else { - int caretPos = (int)/*64*/OS.SendMessage (handle, OS.EM_LINEINDEX, -1, 0); - int caretLine = (int)/*64*/OS.SendMessage (handle, OS.EM_LINEFROMCHAR, caretPos, 0); + int caretPos = (int)OS.SendMessage (handle, OS.EM_LINEINDEX, -1, 0); + int caretLine = (int)OS.SendMessage (handle, OS.EM_LINEFROMCHAR, caretPos, 0); if (caretLine == endLine) caret = end [0]; } } @@ -1164,7 +1164,7 @@ public boolean getEditable () { */ public int getLineCount () { checkWidget (); - return (int)/*64*/OS.SendMessage (handle, OS.EM_GETLINECOUNT, 0, 0); + return (int)OS.SendMessage (handle, OS.EM_GETLINECOUNT, 0, 0); } /** @@ -1200,8 +1200,8 @@ public int getLineHeight () { } int getLineHeightInPixels () { - long /*int*/ newFont, oldFont = 0; - long /*int*/ hDC = OS.GetDC (handle); + long newFont, oldFont = 0; + long hDC = OS.GetDC (handle); newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont); TEXTMETRIC tm = new TEXTMETRIC (); @@ -1271,7 +1271,7 @@ public String getMessage () { /*public*/ int getPosition (Point point) { checkWidget(); if (point == null) error (SWT.ERROR_NULL_ARGUMENT); - long /*int*/ lParam = OS.MAKELPARAM (point.x, point.y); + long lParam = OS.MAKELPARAM (point.x, point.y); int position = OS.LOWORD (OS.SendMessage (handle, OS.EM_CHARFROMPOS, 0, lParam)); return untranslateOffset (position); } @@ -1364,10 +1364,10 @@ public int getTabs () { } int getTabWidth (int tabs) { - long /*int*/ oldFont = 0; + long oldFont = 0; RECT rect = new RECT (); - long /*int*/ hDC = OS.GetDC (handle); - long /*int*/ newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); + long hDC = OS.GetDC (handle); + long newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont); int flags = OS.DT_CALCRECT | OS.DT_SINGLELINE | OS.DT_NOPREFIX; OS.DrawText (hDC, new char [] {' '}, 1, rect, flags); @@ -1492,7 +1492,7 @@ public String getText (int start, int end) { */ public int getTextLimit () { checkWidget (); - int/*64*/ limit = (int)/*64*/OS.SendMessage (handle, OS.EM_GETLIMITTEXT, 0, 0) & 0x7FFFFFFF; + int limit = (int)OS.SendMessage (handle, OS.EM_GETLIMITTEXT, 0, 0) & 0x7FFFFFFF; if (segments != null && limit < LIMIT) limit = Math.max (1, limit - segments.length); return limit; } @@ -1514,7 +1514,7 @@ public int getTextLimit () { public int getTopIndex () { checkWidget (); if ((style & SWT.SINGLE) != 0) return 0; - return (int)/*64*/OS.SendMessage (handle, OS.EM_GETFIRSTVISIBLELINE, 0, 0); + return (int)OS.SendMessage (handle, OS.EM_GETFIRSTVISIBLELINE, 0, 0); } /** @@ -1549,7 +1549,7 @@ int getTopPixelInPixels () { * of Rich Edit return zero. */ int [] buffer = new int [2]; - long /*int*/ code = OS.SendMessage (handle, OS.EM_GETSCROLLPOS, 0, buffer); + long code = OS.SendMessage (handle, OS.EM_GETSCROLLPOS, 0, buffer); if (code == 1) return buffer [1]; return getTopIndex () * getLineHeightInPixels (); } @@ -1764,7 +1764,7 @@ public void selectAll () { } @Override -boolean sendKeyEvent (int type, int msg, long /*int*/ wParam, long /*int*/ lParam, Event event) { +boolean sendKeyEvent (int type, int msg, long wParam, long lParam, Event event) { if (!super.sendKeyEvent (type, msg, wParam, lParam, event)) { return false; } @@ -1811,7 +1811,7 @@ boolean sendKeyEvent (int type, int msg, long /*int*/ wParam, long /*int*/ lPara case 0x08: /* Bs */ if (start [0] == end [0]) { if (start [0] == 0) return true; - int lineStart = (int)/*64*/OS.SendMessage (handle, OS.EM_LINEINDEX, -1, 0); + int lineStart = (int)OS.SendMessage (handle, OS.EM_LINEINDEX, -1, 0); if (start [0] == lineStart) { start [0] = start [0] - DELIMITER.length (); } else { @@ -1824,8 +1824,8 @@ boolean sendKeyEvent (int type, int msg, long /*int*/ wParam, long /*int*/ lPara if (start [0] == end [0]) { int length = OS.GetWindowTextLength (handle); if (start [0] == length) return true; - int line = (int)/*64*/OS.SendMessage (handle, OS.EM_LINEFROMCHAR, end [0], 0); - int lineStart = (int)/*64*/OS.SendMessage (handle, OS.EM_LINEINDEX, line + 1, 0); + int line = (int)OS.SendMessage (handle, OS.EM_LINEFROMCHAR, end [0], 0); + int lineStart = (int)OS.SendMessage (handle, OS.EM_LINEINDEX, line + 1, 0); if (end [0] == lineStart - DELIMITER.length ()) { end [0] = end [0] + DELIMITER.length (); } else { @@ -1867,7 +1867,7 @@ boolean sendKeyEvent (int type, int msg, long /*int*/ wParam, long /*int*/ lPara } @Override -void setBackgroundImage (long /*int*/ hBitmap) { +void setBackgroundImage (long hBitmap) { int flags = OS.RDW_ERASE | OS.RDW_ALLCHILDREN | OS.RDW_INVALIDATE; OS.RedrawWindow (handle, null, 0, flags); } @@ -1898,7 +1898,7 @@ void setBoundsInPixels (int x, int y, int width, int height, int flags) { if ((flags & OS.SWP_NOSIZE) == 0 && width != 0) { RECT rect = new RECT (); OS.GetWindowRect (handle, rect); - long /*int*/ margins = OS.SendMessage (handle, OS.EM_GETMARGINS, 0, 0); + long margins = OS.SendMessage (handle, OS.EM_GETMARGINS, 0, 0); int marginWidth = OS.LOWORD (margins) + OS.HIWORD (margins); if (rect.right - rect.left <= marginWidth) { int [] start = new int [1], end = new int [1]; @@ -1922,8 +1922,8 @@ void setBoundsInPixels (int x, int y, int width, int height, int flags) { if ((flags & OS.SWP_NOSIZE) == 0) { int bits = OS.GetWindowLong (handle, OS.GWL_STYLE); if ((bits & OS.ES_MULTILINE) != 0) { - long /*int*/ newFont, oldFont = 0; - long /*int*/ hDC = OS.GetDC (handle); + long newFont, oldFont = 0; + long hDC = OS.GetDC (handle); newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont); TEXTMETRIC tm = new TEXTMETRIC (); @@ -1933,7 +1933,7 @@ void setBoundsInPixels (int x, int y, int width, int height, int flags) { RECT rect = new RECT(); OS.GetClientRect (handle, rect); if ((rect.bottom - rect.top) < tm.tmHeight) { - long /*int*/ margins = OS.SendMessage (handle, OS.EM_GETMARGINS, 0, 0); + long margins = OS.SendMessage (handle, OS.EM_GETMARGINS, 0, 0); rect.left += OS.LOWORD (margins); rect.right -= OS.HIWORD (margins); rect.top = 0; @@ -2281,7 +2281,7 @@ public void setText (String string) { if (string == null) return; } clearSegments (false); - int limit = (int)/*64*/OS.SendMessage (handle, OS.EM_GETLIMITTEXT, 0, 0) & 0x7FFFFFFF; + int limit = (int)OS.SendMessage (handle, OS.EM_GETLIMITTEXT, 0, 0) & 0x7FFFFFFF; if (string.length () > limit) string = string.substring (0, limit); TCHAR buffer = new TCHAR (getCodePage (), string, true); OS.SetWindowText (handle, buffer); @@ -2341,7 +2341,7 @@ public void setTextChars (char[] text) { string.getChars (0, text.length, text, 0); } clearSegments (false); - int limit = (int)/*64*/OS.SendMessage (handle, OS.EM_GETLIMITTEXT, 0, 0) & 0x7FFFFFFF; + int limit = (int)OS.SendMessage (handle, OS.EM_GETLIMITTEXT, 0, 0) & 0x7FFFFFFF; if (text.length > limit) { char [] temp = new char [limit]; for (int i = 0; i < limit; i++) temp [i] = text [i]; @@ -2417,9 +2417,9 @@ public void setTextLimit (int limit) { public void setTopIndex (int index) { checkWidget (); if ((style & SWT.SINGLE) != 0) return; - int count = (int)/*64*/OS.SendMessage (handle, OS.EM_GETLINECOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.EM_GETLINECOUNT, 0, 0); index = Math.min (Math.max (index, 0), count - 1); - int topIndex = (int)/*64*/OS.SendMessage (handle, OS.EM_GETFIRSTVISIBLELINE, 0, 0); + int topIndex = (int)OS.SendMessage (handle, OS.EM_GETFIRSTVISIBLELINE, 0, 0); OS.SendMessage (handle, OS.EM_LINESCROLL, 0, index - topIndex); } @@ -2550,14 +2550,14 @@ TCHAR windowClass () { } @Override -long /*int*/ windowProc () { +long windowProc () { return EditProc; } @Override -long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) { +long windowProc (long hwnd, int msg, long wParam, long lParam) { boolean processSegments = hooks (SWT.Segments) || filters (SWT.Segments), redraw = false, updateDirection = (state & HAS_AUTO_DIRECTION) != 0; - long /*int*/ code; + long code; if (processSegments || updateDirection) { switch (msg) { case OS.EM_CANUNDO: @@ -2631,7 +2631,7 @@ long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long / } @Override -LRESULT WM_CHAR (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_CHAR (long wParam, long lParam) { if (ignoreCharacter) return null; LRESULT result = super.WM_CHAR (wParam, lParam); if (result != null) return result; @@ -2643,7 +2643,7 @@ LRESULT WM_CHAR (long /*int*/ wParam, long /*int*/ lParam) { * is inserted into the control. The fix is to detect * this case and not call the window proc. */ - switch ((int)/*64*/wParam) { + switch ((int)wParam) { case SWT.DEL: if (OS.GetKeyState (OS.VK_CONTROL) < 0) { if ((style & SWT.READ_ONLY) != 0 || (style & SWT.PASSWORD) != 0) return LRESULT.ZERO; @@ -2678,7 +2678,7 @@ LRESULT WM_CHAR (long /*int*/ wParam, long /*int*/ lParam) { * the window proc. */ if ((style & SWT.SINGLE) != 0) { - switch ((int)/*64*/wParam) { + switch ((int)wParam) { case SWT.CR: sendSelectionEvent (SWT.DefaultSelection); // FALL THROUGH @@ -2690,14 +2690,14 @@ LRESULT WM_CHAR (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_CLEAR (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_CLEAR (long wParam, long lParam) { LRESULT result = super.WM_CLEAR (wParam, lParam); if (result != null) return result; return wmClipboard (OS.WM_CLEAR, wParam, lParam); } @Override -LRESULT WM_CUT (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_CUT (long wParam, long lParam) { LRESULT result = super.WM_CUT (wParam, lParam); if (result != null) return result; return wmClipboard (OS.WM_CUT, wParam, lParam); @@ -2716,14 +2716,14 @@ LRESULT WM_DRAWITEM (long wParam, long lParam) { int state = OS.GetKeyState (OS.VK_LBUTTON) < 0 ? OS.PBS_PRESSED : OS.PBS_HOT; OS.DrawThemeBackground (display.hButtonTheme (), struct.hDC, OS.BP_PUSHBUTTON, state, rect, null); } - long /*int*/ hIcon = (struct.hwndItem == hwndSearch) ? display.hIconSearch : display.hIconCancel; + long hIcon = (struct.hwndItem == hwndSearch) ? display.hIconSearch : display.hIconCancel; int y = (rect.bottom - rect.right) / 2; OS.DrawIconEx (struct.hDC, 0, y, hIcon, 0, 0, 0, 0, OS.DI_NORMAL); return LRESULT.ONE; } @Override -LRESULT WM_ERASEBKGND (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_ERASEBKGND (long wParam, long lParam) { LRESULT result = super.WM_ERASEBKGND (wParam, lParam); if ((style & SWT.READ_ONLY) != 0) { if ((style & (SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL)) == 0) { @@ -2750,7 +2750,7 @@ LRESULT WM_ERASEBKGND (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_GETDLGCODE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_GETDLGCODE (long wParam, long lParam) { LRESULT result = super.WM_GETDLGCODE (wParam, lParam); if (result != null) return result; @@ -2764,7 +2764,7 @@ LRESULT WM_GETDLGCODE (long /*int*/ wParam, long /*int*/ lParam) { * so DLGC_WANTARROWS should not be cleared. */ if ((style & SWT.READ_ONLY) != 0) { - long /*int*/ code = callWindowProc (handle, OS.WM_GETDLGCODE, wParam, lParam); + long code = callWindowProc (handle, OS.WM_GETDLGCODE, wParam, lParam); code &= ~(OS.DLGC_WANTALLKEYS | OS.DLGC_WANTTAB); return new LRESULT (code); } @@ -2772,7 +2772,7 @@ LRESULT WM_GETDLGCODE (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_GETOBJECT (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_GETOBJECT (long wParam, long lParam) { /* * Ensure that there is an accessible object created for this * control because support for search text accessibility is @@ -2785,12 +2785,12 @@ LRESULT WM_GETOBJECT (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_IME_CHAR (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_IME_CHAR (long wParam, long lParam) { /* Process a DBCS character */ Display display = this.display; display.lastKey = 0; - display.lastAscii = (int)/*64*/wParam; + display.lastAscii = (int)wParam; display.lastVirtual = display.lastNull = display.lastDead = false; if (!sendKeyEvent (SWT.KeyDown, OS.WM_IME_CHAR, wParam, lParam)) { return LRESULT.ZERO; @@ -2804,7 +2804,7 @@ LRESULT WM_IME_CHAR (long /*int*/ wParam, long /*int*/ lParam) { * them to the application. */ ignoreCharacter = true; - long /*int*/ result = callWindowProc (handle, OS.WM_IME_CHAR, wParam, lParam); + long result = callWindowProc (handle, OS.WM_IME_CHAR, wParam, lParam); MSG msg = new MSG (); int flags = OS.PM_REMOVE | OS.PM_NOYIELD | OS.PM_QS_INPUT | OS.PM_QS_POSTMESSAGE; while (OS.PeekMessage (msg, handle, OS.WM_CHAR, OS.WM_CHAR, flags)) { @@ -2820,7 +2820,7 @@ LRESULT WM_IME_CHAR (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_LBUTTONDBLCLK (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_LBUTTONDBLCLK (long wParam, long lParam) { /* * Prevent Windows from processing WM_LBUTTONDBLCLK * when double clicking behavior is disabled by not @@ -2851,7 +2851,7 @@ LRESULT WM_LBUTTONDBLCLK (long /*int*/ wParam, long /*int*/ lParam) { if (start [0] == end [0]) { int length = OS.GetWindowTextLength (handle); if (length == start [0]) { - int code = (int)/*64*/OS.SendMessage (handle, OS.EM_LINELENGTH, length, 0); + int code = (int)OS.SendMessage (handle, OS.EM_LINELENGTH, length, 0); if (code == 0) return LRESULT.ZERO; } } @@ -2859,7 +2859,7 @@ LRESULT WM_LBUTTONDBLCLK (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_PASTE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_PASTE (long wParam, long lParam) { LRESULT result = super.WM_PASTE (wParam, lParam); if (result != null) return result; return wmClipboard (OS.WM_PASTE, wParam, lParam); @@ -2871,8 +2871,8 @@ LRESULT WM_SIZE(long wParam, long lParam) { if (isDisposed ()) return result; if ((style & SWT.SEARCH) != 0) { /* NOTE: EDIT controls don't support mirrored layout. */ - long /*int*/ hwndLeading = (style & SWT.LEFT_TO_RIGHT) != 0 ? hwndSearch : hwndCancel; - long /*int*/ hwndTrailing = (style & SWT.LEFT_TO_RIGHT) != 0 ? hwndCancel : hwndSearch; + long hwndLeading = (style & SWT.LEFT_TO_RIGHT) != 0 ? hwndSearch : hwndCancel; + long hwndTrailing = (style & SWT.LEFT_TO_RIGHT) != 0 ? hwndCancel : hwndSearch; int width = OS.LOWORD (lParam); int height = OS.HIWORD (lParam); int iconWidth = OS.GetSystemMetrics (OS.SM_CXSMICON); @@ -2884,13 +2884,13 @@ LRESULT WM_SIZE(long wParam, long lParam) { } @Override -LRESULT WM_UNDO (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_UNDO (long wParam, long lParam) { LRESULT result = super.WM_UNDO (wParam, lParam); if (result != null) return result; return wmClipboard (OS.WM_UNDO, wParam, lParam); } -LRESULT wmClipboard (int msg, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmClipboard (int msg, long wParam, long lParam) { if ((style & SWT.READ_ONLY) != 0) return null; if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return null; boolean call = false; @@ -2967,7 +2967,7 @@ LRESULT wmClipboard (int msg, long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT wmColorChild (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmColorChild (long wParam, long lParam) { if ((style & SWT.READ_ONLY) != 0) { if ((style & (SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL)) == 0) { int bits = OS.GetWindowLong (handle, OS.GWL_STYLE); @@ -2993,7 +2993,7 @@ LRESULT wmColorChild (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT wmCommandChild (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmCommandChild (long wParam, long lParam) { int code = OS.HIWORD (wParam); switch (code) { case OS.EN_CHANGE: @@ -3054,17 +3054,17 @@ LRESULT wmCommandChild (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT wmKeyDown (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmKeyDown (long hwnd, long wParam, long lParam) { LRESULT result = super.wmKeyDown (hwnd, wParam, lParam); if (result != null) return result; if (segments != null) { - switch ((int)/*64*/wParam) { + switch ((int)wParam) { case OS.VK_LEFT: case OS.VK_UP: case OS.VK_RIGHT: case OS.VK_DOWN: - long /*int*/ code = 0; + long code = 0; int [] start = new int [1], end = new int [1], newStart = new int [1], newEnd = new int [1]; OS.SendMessage (handle, OS.EM_GETSEL, start, end); while (true) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolBar.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolBar.java index 1fddaf9833..aa76ab3361 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolBar.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolBar.java @@ -53,7 +53,7 @@ public class ToolBar extends Composite { ToolItem [] tabItemList; boolean ignoreResize, ignoreMouse; ImageList imageList, disabledImageList, hotImageList; - static final long /*int*/ ToolBarProc; + static final long ToolBarProc; static final TCHAR ToolBarClass = new TCHAR (0, OS.TOOLBARCLASSNAME, true); static { WNDCLASS lpWndClass = new WNDCLASS (); @@ -143,7 +143,7 @@ public ToolBar (Composite parent, int style) { } @Override -long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) { +long callWindowProc (long hwnd, int msg, long wParam, long lParam) { if (handle == 0) return 0; /* * Bug in Windows. For some reason, during the processing @@ -196,7 +196,7 @@ protected void checkSubclass () { if ((style & SWT.VERTICAL) != 0) { RECT rect = new RECT (); TBBUTTON lpButton = new TBBUTTON (); - int count = (int)/*64*/OS.SendMessage (handle, OS.TB_BUTTONCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.TB_BUTTONCOUNT, 0, 0); for (int i=0; i<count; i++) { OS.SendMessage (handle, OS.TB_GETITEMRECT, i, rect); height = Math.max (height, rect.bottom); @@ -224,7 +224,7 @@ protected void checkSubclass () { if (redraw) OS.UpdateWindow (handle); int flags = OS.SWP_NOACTIVATE | OS.SWP_NOMOVE | OS.SWP_NOREDRAW | OS.SWP_NOZORDER; OS.SetWindowPos (handle, 0, 0, 0, newWidth, newHeight, flags); - int count = (int)/*64*/OS.SendMessage (handle, OS.TB_BUTTONCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.TB_BUTTONCOUNT, 0, 0); if (count != 0) { RECT rect = new RECT (); OS.SendMessage (handle, OS.TB_GETITEMRECT, count - 1, rect); @@ -267,7 +267,7 @@ Widget computeTabGroup () { while (i < items.length && items [i].control == null) i++; if (i == items.length) return super.computeTabGroup (); } - int index = (int)/*64*/OS.SendMessage (handle, OS.TB_GETHOTITEM, 0, 0); + int index = (int)OS.SendMessage (handle, OS.TB_GETHOTITEM, 0, 0); if (index == -1) index = lastHotId; while (index >= 0) { ToolItem item = items [index]; @@ -337,7 +337,7 @@ void createHandle () { * bar currently sets this value to 300 so it is not * necessary to set TTM_SETMAXTIPWIDTH. */ -// long /*int*/ hwndToolTip = OS.SendMessage (handle, OS.TB_GETTOOLTIPS, 0, 0); +// long hwndToolTip = OS.SendMessage (handle, OS.TB_GETTOOLTIPS, 0, 0); // OS.SendMessage (hwndToolTip, OS.TTM_SETMAXTIPWIDTH, 0, 0x7FFF); /* @@ -352,7 +352,7 @@ void createHandle () { * The control will not destroy a font that it did not * create. */ - long /*int*/ hFont = OS.GetStockObject (OS.SYSTEM_FONT); + long hFont = OS.GetStockObject (OS.SYSTEM_FONT); OS.SendMessage (handle, OS.WM_SETFONT, hFont, 0); /* Set the button struct, bitmap and button sizes */ @@ -366,7 +366,7 @@ void createHandle () { } void createItem (ToolItem item, int index) { - int count = (int)/*64*/OS.SendMessage (handle, OS.TB_BUTTONCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.TB_BUTTONCOUNT, 0, 0); if (!(0 <= index && index <= count)) error (SWT.ERROR_INVALID_RANGE); int id = 0; while (id < items.length && items [id] != null) id++; @@ -418,7 +418,7 @@ void destroyItem (ToolItem item) { TBBUTTONINFO info = new TBBUTTONINFO (); info.cbSize = TBBUTTONINFO.sizeof; info.dwMask = OS.TBIF_IMAGE | OS.TBIF_STYLE; - int index = (int)/*64*/OS.SendMessage (handle, OS.TB_GETBUTTONINFO, item.id, info); + int index = (int)OS.SendMessage (handle, OS.TB_GETBUTTONINFO, item.id, info); /* * Feature in Windows. For some reason, a tool item that has * the style BTNS_SEP does not return I_IMAGENONE when queried @@ -440,7 +440,7 @@ void destroyItem (ToolItem item) { if (item.id == lastHotId) lastHotId = -1; items [item.id] = null; item.id = -1; - int count = (int)/*64*/OS.SendMessage (handle, OS.TB_BUTTONCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.TB_BUTTONCOUNT, 0, 0); if (count == 0) { if (imageList != null) { OS.SendMessage (handle, OS.TB_SETIMAGELIST, 0, 0); @@ -515,10 +515,10 @@ ImageList getImageList () { */ public ToolItem getItem (int index) { checkWidget (); - int count = (int)/*64*/OS.SendMessage (handle, OS.TB_BUTTONCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.TB_BUTTONCOUNT, 0, 0); if (!(0 <= index && index < count)) error (SWT.ERROR_INVALID_RANGE); TBBUTTON lpButton = new TBBUTTON (); - long /*int*/ result = OS.SendMessage (handle, OS.TB_GETBUTTON, index, lpButton); + long result = OS.SendMessage (handle, OS.TB_GETBUTTON, index, lpButton); if (result == 0) error (SWT.ERROR_CANNOT_GET_ITEM); return items [lpButton.idCommand]; } @@ -566,7 +566,7 @@ ToolItem getItemInPixels (Point point) { */ public int getItemCount () { checkWidget (); - return (int)/*64*/OS.SendMessage (handle, OS.TB_BUTTONCOUNT, 0, 0); + return (int)OS.SendMessage (handle, OS.TB_BUTTONCOUNT, 0, 0); } /** @@ -591,7 +591,7 @@ public ToolItem [] getItems () { } ToolItem [] _getItems () { - int count = (int)/*64*/OS.SendMessage (handle, OS.TB_BUTTONCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.TB_BUTTONCOUNT, 0, 0); TBBUTTON lpButton = new TBBUTTON (); ToolItem [] result = new ToolItem [count]; for (int i=0; i<count; i++) { @@ -617,9 +617,9 @@ ToolItem [] _getItems () { public int getRowCount () { checkWidget (); if ((style & SWT.VERTICAL) != 0) { - return (int)/*64*/OS.SendMessage (handle, OS.TB_BUTTONCOUNT, 0, 0); + return (int)OS.SendMessage (handle, OS.TB_BUTTONCOUNT, 0, 0); } - return (int)/*64*/OS.SendMessage (handle, OS.TB_GETROWS, 0, 0); + return (int)OS.SendMessage (handle, OS.TB_GETROWS, 0, 0); } ToolItem [] _getTabItemList () { @@ -662,7 +662,7 @@ public int indexOf (ToolItem item) { checkWidget (); if (item == null) error (SWT.ERROR_NULL_ARGUMENT); if (item.isDisposed()) error(SWT.ERROR_INVALID_ARGUMENT); - return (int)/*64*/OS.SendMessage (handle, OS.TB_COMMANDTOINDEX, item.id, 0); + return (int)OS.SendMessage (handle, OS.TB_COMMANDTOINDEX, item.id, 0); } void layoutItems () { @@ -705,7 +705,7 @@ void layoutItems () { * the tool items. The fix is to use WM_SETFONT to force * the tool bar to redraw and lay out. */ - long /*int*/ hFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); + long hFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); OS.SendMessage (handle, OS.WM_SETFONT, hFont, 0); setDropDownItems (true); } @@ -722,12 +722,12 @@ void layoutItems () { * into account extra padding. */ if ((style & SWT.VERTICAL) != 0) { - int itemCount = (int)/*64*/OS.SendMessage (handle, OS.TB_BUTTONCOUNT, 0, 0); + int itemCount = (int)OS.SendMessage (handle, OS.TB_BUTTONCOUNT, 0, 0); if (itemCount > 1) { TBBUTTONINFO info = new TBBUTTONINFO (); info.cbSize = TBBUTTONINFO.sizeof; info.dwMask = OS.TBIF_SIZE; - long /*int*/ size = OS.SendMessage (handle, OS.TB_GETBUTTONSIZE, 0, 0); + long size = OS.SendMessage (handle, OS.TB_GETBUTTONSIZE, 0, 0); info.cx = (short) OS.LOWORD (size); int index = 0, extraPadding = 0; while (index < items.length) { @@ -745,7 +745,7 @@ void layoutItems () { index++; } if (index < items.length) { - long /*int*/ padding = OS.SendMessage (handle, OS.TB_GETPADDING, 0, 0); + long padding = OS.SendMessage (handle, OS.TB_GETPADDING, 0, 0); info.cx += OS.LOWORD (padding + extraPadding) * 2; } for (int i=0; i<items.length; i++) { @@ -796,7 +796,7 @@ boolean mnemonicHit (char ch) { return false; } if ((style & SWT.FLAT) != 0 && !setTabGroupFocus ()) return false; - int index = (int)/*64*/OS.SendMessage (handle, OS.TB_COMMANDTOINDEX, id [0], 0); + int index = (int)OS.SendMessage (handle, OS.TB_COMMANDTOINDEX, id [0], 0); if (index == -1) return false; OS.SendMessage (handle, OS.TB_SETHOTITEM, index, 0); items [id [0]].click (false); @@ -815,7 +815,7 @@ boolean mnemonicMatch (char ch) { * undocumented and unwanted. The fix is to ensure that the tool item * contains a mnemonic when TB_MAPACCELERATOR returns true. */ - int index = (int)/*64*/OS.SendMessage (handle, OS.TB_COMMANDTOINDEX, id [0], 0); + int index = (int)OS.SendMessage (handle, OS.TB_COMMANDTOINDEX, id [0], 0); if (index == -1) return false; return findMnemonic (items [id [0]].text) != '\0'; } @@ -875,7 +875,7 @@ void reskinChildren (int flags) { } @Override -void setBackgroundImage (long /*int*/ hBitmap) { +void setBackgroundImage (long hBitmap) { super.setBackgroundImage (hBitmap); setBackgroundTransparent (hBitmap != 0); } @@ -982,7 +982,7 @@ void setDropDownItems (boolean set) { void setDisabledImageList (ImageList imageList) { if (disabledImageList == imageList) return; - long /*int*/ hImageList = 0; + long hImageList = 0; if ((disabledImageList = imageList) != null) { hImageList = disabledImageList.getHandle (); } @@ -1019,7 +1019,7 @@ public void setFont (Font font) { void setHotImageList (ImageList imageList) { if (hotImageList == imageList) return; - long /*int*/ hImageList = 0; + long hImageList = 0; if ((hotImageList = imageList) != null) { hImageList = hotImageList.getHandle (); } @@ -1030,7 +1030,7 @@ void setHotImageList (ImageList imageList) { void setImageList (ImageList imageList) { if (this.imageList == imageList) return; - long /*int*/ hImageList = 0; + long hImageList = 0; if ((this.imageList = imageList) != null) { hImageList = imageList.getHandle (); } @@ -1043,7 +1043,7 @@ void setImageList (ImageList imageList) { public boolean setParent (Composite parent) { checkWidget (); if (!super.setParent (parent)) return false; - long /*int*/ hwndParent = parent.handle; + long hwndParent = parent.handle; OS.SendMessage (handle, OS.TB_SETPARENT, hwndParent, 0); /* * Bug in Windows. When a tool bar is reparented, the tooltip @@ -1052,8 +1052,8 @@ public boolean setParent (Composite parent) { * over using SetWindowLongPtr(). Note that for some reason, * SetParent() does not work. */ - long /*int*/ hwndShell = parent.getShell ().handle; - long /*int*/ hwndToolTip = OS.SendMessage (handle, OS.TB_GETTOOLTIPS, 0, 0); + long hwndShell = parent.getShell ().handle; + long hwndToolTip = OS.SendMessage (handle, OS.TB_GETTOOLTIPS, 0, 0); OS.SetWindowLongPtr (hwndToolTip, OS.GWLP_HWNDPARENT, hwndShell); return true; } @@ -1157,8 +1157,8 @@ String toolTipText (NMTTDISPINFO hdr) { * provide the string, causing no tool tip to be displayed. */ if (!hasCursor ()) return ""; //$NON-NLS-1$ - int index = (int)/*64*/hdr.idFrom; - long /*int*/ hwndToolTip = OS.SendMessage (handle, OS.TB_GETTOOLTIPS, 0, 0); + int index = (int)hdr.idFrom; + long hwndToolTip = OS.SendMessage (handle, OS.TB_GETTOOLTIPS, 0, 0); if (hwndToolTip == hdr.hwndFrom) { /* * Bug in Windows. For some reason the reading order @@ -1203,7 +1203,7 @@ void updateOrientation () { TBBUTTONINFO info = new TBBUTTONINFO (); info.cbSize = TBBUTTONINFO.sizeof; info.dwMask = OS.TBIF_IMAGE; - int count = (int)/*64*/OS.SendMessage (handle, OS.TB_BUTTONCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.TB_BUTTONCOUNT, 0, 0); for (int i=0; i<count; i++) { ToolItem item = items [i]; if ((item.style & SWT.SEPARATOR) != 0) continue; @@ -1267,12 +1267,12 @@ TCHAR windowClass () { } @Override -long /*int*/ windowProc () { +long windowProc () { return ToolBarProc; } @Override -LRESULT WM_CAPTURECHANGED (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_CAPTURECHANGED (long wParam, long lParam) { LRESULT result = super.WM_CAPTURECHANGED (wParam, lParam); if (result != null) return result; /* @@ -1283,7 +1283,7 @@ LRESULT WM_CAPTURECHANGED (long /*int*/ wParam, long /*int*/ lParam) { for (int i=0; i<items.length; i++) { ToolItem item = items [i]; if (item != null) { - int fsState = (int)/*64*/OS.SendMessage (handle, OS.TB_GETSTATE, item.id, 0); + int fsState = (int)OS.SendMessage (handle, OS.TB_GETSTATE, item.id, 0); if ((fsState & OS.TBSTATE_PRESSED) != 0) { fsState &= ~OS.TBSTATE_PRESSED; OS.SendMessage (handle, OS.TB_SETSTATE, item.id, fsState); @@ -1294,15 +1294,15 @@ LRESULT WM_CAPTURECHANGED (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_CHAR (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_CHAR (long wParam, long lParam) { LRESULT result = super.WM_CHAR (wParam, lParam); if (result != null) return result; - switch ((int)/*64*/wParam) { + switch ((int)wParam) { case ' ': - int index = (int)/*64*/OS.SendMessage (handle, OS.TB_GETHOTITEM, 0, 0); + int index = (int)OS.SendMessage (handle, OS.TB_GETHOTITEM, 0, 0); if (index != -1) { TBBUTTON lpButton = new TBBUTTON (); - long /*int*/ code = OS.SendMessage (handle, OS.TB_GETBUTTON, index, lpButton); + long code = OS.SendMessage (handle, OS.TB_GETBUTTON, index, lpButton); if (code != 0) { items [lpButton.idCommand].click (false); return LRESULT.ZERO; @@ -1313,7 +1313,7 @@ LRESULT WM_CHAR (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_COMMAND (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_COMMAND (long wParam, long lParam) { /* * Feature in Windows. When the toolbar window * proc processes WM_COMMAND, it forwards this @@ -1338,7 +1338,7 @@ LRESULT WM_COMMAND (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_GETDLGCODE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_GETDLGCODE (long wParam, long lParam) { LRESULT result = super.WM_GETDLGCODE (wParam, lParam); /* * Return DLGC_BUTTON so that mnemonics will be @@ -1350,10 +1350,10 @@ LRESULT WM_GETDLGCODE (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_KEYDOWN (long wParam, long lParam) { LRESULT result = super.WM_KEYDOWN (wParam, lParam); if (result != null) return result; - switch ((int)/*64*/wParam) { + switch ((int)wParam) { case OS.VK_SPACE: /* * Ensure that the window proc does not process VK_SPACE @@ -1366,28 +1366,28 @@ LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_KILLFOCUS (long /*int*/ wParam, long /*int*/ lParam) { - int index = (int)/*64*/OS.SendMessage (handle, OS.TB_GETHOTITEM, 0, 0); +LRESULT WM_KILLFOCUS (long wParam, long lParam) { + int index = (int)OS.SendMessage (handle, OS.TB_GETHOTITEM, 0, 0); TBBUTTON lpButton = new TBBUTTON (); - long /*int*/ code = OS.SendMessage (handle, OS.TB_GETBUTTON, index, lpButton); + long code = OS.SendMessage (handle, OS.TB_GETBUTTON, index, lpButton); if (code != 0) lastFocusId = lpButton.idCommand; return super.WM_KILLFOCUS (wParam, lParam); } @Override -LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_LBUTTONDOWN (long wParam, long lParam) { if (ignoreMouse) return null; return super.WM_LBUTTONDOWN (wParam, lParam); } @Override -LRESULT WM_LBUTTONUP (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_LBUTTONUP (long wParam, long lParam) { if (ignoreMouse) return null; return super.WM_LBUTTONUP (wParam, lParam); } @Override -LRESULT WM_MOUSELEAVE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_MOUSELEAVE (long wParam, long lParam) { LRESULT result = super.WM_MOUSELEAVE (wParam, lParam); if (result != null) return result; /* @@ -1403,7 +1403,7 @@ LRESULT WM_MOUSELEAVE (long /*int*/ wParam, long /*int*/ lParam) { */ TOOLINFO lpti = new TOOLINFO (); lpti.cbSize = TOOLINFO.sizeof; - long /*int*/ hwndToolTip = OS.SendMessage (handle, OS.TB_GETTOOLTIPS, 0, 0); + long hwndToolTip = OS.SendMessage (handle, OS.TB_GETTOOLTIPS, 0, 0); if (OS.SendMessage (hwndToolTip, OS.TTM_GETCURRENTTOOL, 0, lpti) != 0) { if ((lpti.uFlags & OS.TTF_IDISHWND) == 0) { OS.SendMessage (hwndToolTip, OS.TTM_DELTOOL, 0, lpti); @@ -1414,13 +1414,13 @@ LRESULT WM_MOUSELEAVE (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_MOUSEMOVE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_MOUSEMOVE (long wParam, long lParam) { if (OS.GetMessagePos () != display.lastMouse) lastArrowId = -1; return super.WM_MOUSEMOVE (wParam, lParam); } @Override -LRESULT WM_NOTIFY (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_NOTIFY (long wParam, long lParam) { /* * Feature in Windows. When the toolbar window * proc processes WM_NOTIFY, it forwards this @@ -1445,19 +1445,19 @@ LRESULT WM_NOTIFY (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_SETFOCUS (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SETFOCUS (long wParam, long lParam) { LRESULT result = super.WM_SETFOCUS (wParam, lParam); if (lastFocusId != -1 && handle == OS.GetFocus ()) { - int index = (int)/*64*/OS.SendMessage (handle, OS.TB_COMMANDTOINDEX, lastFocusId, 0); + int index = (int)OS.SendMessage (handle, OS.TB_COMMANDTOINDEX, lastFocusId, 0); OS.SendMessage (handle, OS.TB_SETHOTITEM, index, 0); } return result; } @Override -LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SIZE (long wParam, long lParam) { if (ignoreResize) { - long /*int*/ code = callWindowProc (handle, OS.WM_SIZE, wParam, lParam); + long code = callWindowProc (handle, OS.WM_SIZE, wParam, lParam); if (code == 0) return LRESULT.ZERO; return new LRESULT (code); } @@ -1478,14 +1478,14 @@ LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) { OS.GetWindowRect (handle, windowRect); int index = 0, border = getBorderWidthInPixels () * 2; RECT rect = new RECT (); - int count = (int)/*64*/OS.SendMessage (handle, OS.TB_BUTTONCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.TB_BUTTONCOUNT, 0, 0); while (index < count) { OS.SendMessage (handle, OS.TB_GETITEMRECT, index, rect); OS.MapWindowPoints (handle, 0, rect, 2); if (rect.right > windowRect.right - border * 2) break; index++; } - int bits = (int)/*64*/OS.SendMessage (handle, OS.TB_GETEXTENDEDSTYLE, 0, 0); + int bits = (int)OS.SendMessage (handle, OS.TB_GETEXTENDEDSTYLE, 0, 0); if (index == count) { bits |= OS.TBSTYLE_EX_HIDECLIPPEDBUTTONS; } else { @@ -1498,7 +1498,7 @@ LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_WINDOWPOSCHANGING (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_WINDOWPOSCHANGING (long wParam, long lParam) { LRESULT result = super.WM_WINDOWPOSCHANGING (wParam, lParam); if (result != null) return result; if (ignoreResize) return result; @@ -1541,7 +1541,7 @@ LRESULT WM_WINDOWPOSCHANGING (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT wmCommandChild (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmCommandChild (long wParam, long lParam) { ToolItem child = items [OS.LOWORD (wParam)]; if (child == null) return null; return child.wmCommandChild (wParam, lParam); @@ -1552,7 +1552,7 @@ private boolean customDrawing() { } @Override -LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmNotifyChild (NMHDR hdr, long wParam, long lParam) { switch (hdr.code) { case OS.TBN_DROPDOWN: NMTOOLBAR lpnmtb = new NMTOOLBAR (); @@ -1561,7 +1561,7 @@ LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { if (child != null) { Event event = new Event (); event.detail = SWT.ARROW; - int index = (int)/*64*/OS.SendMessage (handle, OS.TB_COMMANDTOINDEX, lpnmtb.iItem, 0); + int index = (int)OS.SendMessage (handle, OS.TB_COMMANDTOINDEX, lpnmtb.iItem, 0); RECT rect = new RECT (); OS.SendMessage (handle, OS.TB_GETITEMRECT, index, rect); event.setLocationInPixels(rect.left, rect.bottom); @@ -1631,7 +1631,7 @@ LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { case OS.HICF_ARROWKEYS: { RECT client = new RECT (); OS.GetClientRect (handle, client); - int index = (int)/*64*/OS.SendMessage (handle, OS.TB_COMMANDTOINDEX, lpnmhi.idNew, 0); + int index = (int)OS.SendMessage (handle, OS.TB_COMMANDTOINDEX, lpnmhi.idNew, 0); RECT rect = new RECT (); OS.SendMessage (handle, OS.TB_GETITEMRECT, index, rect); if (rect.right > client.right || rect.bottom > client.bottom) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolItem.java index 690810de79..ccc6c3ca2f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolItem.java @@ -180,12 +180,12 @@ protected void checkSubclass () { } void click (boolean dropDown) { - long /*int*/ hwnd = parent.handle; + long hwnd = parent.handle; if (OS.GetKeyState (OS.VK_LBUTTON) < 0) return; - int index = (int)/*64*/OS.SendMessage (hwnd, OS.TB_COMMANDTOINDEX, id, 0); + int index = (int)OS.SendMessage (hwnd, OS.TB_COMMANDTOINDEX, id, 0); RECT rect = new RECT (); OS.SendMessage (hwnd, OS.TB_GETITEMRECT, index, rect); - int hotIndex = (int)/*64*/OS.SendMessage (hwnd, OS.TB_GETHOTITEM, 0, 0); + int hotIndex = (int)OS.SendMessage (hwnd, OS.TB_GETHOTITEM, 0, 0); /* * In order to emulate all the processing that @@ -195,7 +195,7 @@ void click (boolean dropDown) { * properly. */ int y = rect.top + (rect.bottom - rect.top) / 2; - long /*int*/ lParam = OS.MAKELPARAM (dropDown ? rect.right - 1 : rect.left, y); + long lParam = OS.MAKELPARAM (dropDown ? rect.right - 1 : rect.left, y); parent.ignoreMouse = true; OS.SendMessage (hwnd, OS.WM_LBUTTONDOWN, 0, lParam); OS.SendMessage (hwnd, OS.WM_LBUTTONUP, 0, lParam); @@ -242,8 +242,8 @@ public Rectangle getBounds () { } Rectangle getBoundsInPixels () { - long /*int*/ hwnd = parent.handle; - int index = (int)/*64*/OS.SendMessage (hwnd, OS.TB_COMMANDTOINDEX, id, 0); + long hwnd = parent.handle; + int index = (int)OS.SendMessage (hwnd, OS.TB_COMMANDTOINDEX, id, 0); RECT rect = new RECT (); OS.SendMessage (hwnd, OS.TB_GETITEMRECT, index, rect); int width = rect.right - rect.left; @@ -306,8 +306,8 @@ public boolean getEnabled () { if ((style & SWT.SEPARATOR) != 0) { return (state & DISABLED) == 0; } - long /*int*/ hwnd = parent.handle; - long /*int*/ fsState = OS.SendMessage (hwnd, OS.TB_GETSTATE, id, 0); + long hwnd = parent.handle; + long fsState = OS.SendMessage (hwnd, OS.TB_GETSTATE, id, 0); return (fsState & OS.TBSTATE_ENABLED) != 0; } @@ -365,8 +365,8 @@ public ToolBar getParent () { public boolean getSelection () { checkWidget(); if ((style & (SWT.CHECK | SWT.RADIO)) == 0) return false; - long /*int*/ hwnd = parent.handle; - long /*int*/ fsState = OS.SendMessage (hwnd, OS.TB_GETSTATE, id, 0); + long hwnd = parent.handle; + long fsState = OS.SendMessage (hwnd, OS.TB_GETSTATE, id, 0); return (fsState & OS.TBSTATE_CHECKED) != 0; } @@ -401,8 +401,8 @@ public int getWidth () { } int getWidthInPixels () { - long /*int*/ hwnd = parent.handle; - int index = (int)/*64*/OS.SendMessage (hwnd, OS.TB_COMMANDTOINDEX, id, 0); + long hwnd = parent.handle; + int index = (int)OS.SendMessage (hwnd, OS.TB_COMMANDTOINDEX, id, 0); RECT rect = new RECT (); OS.SendMessage (hwnd, OS.TB_GETITEMRECT, index, rect); return rect.right - rect.left; @@ -464,7 +464,7 @@ void releaseImages () { TBBUTTONINFO info = new TBBUTTONINFO (); info.cbSize = TBBUTTONINFO.sizeof; info.dwMask = OS.TBIF_IMAGE | OS.TBIF_STYLE; - long /*int*/ hwnd = parent.handle; + long hwnd = parent.handle; OS.SendMessage (hwnd, OS.TB_GETBUTTONINFO, id, info); /* * Feature in Windows. For some reason, a tool item that has @@ -580,7 +580,7 @@ public void setControl (Control control) { */ if ((parent.style & (SWT.WRAP | SWT.VERTICAL)) != 0) { boolean changed = false; - long /*int*/ hwnd = parent.handle; + long hwnd = parent.handle; TBBUTTONINFO info = new TBBUTTONINFO (); info.cbSize = TBBUTTONINFO.sizeof; info.dwMask = OS.TBIF_STYLE | OS.TBIF_STATE; @@ -643,8 +643,8 @@ public void setControl (Control control) { */ public void setEnabled (boolean enabled) { checkWidget(); - long /*int*/ hwnd = parent.handle; - int fsState = (int)/*64*/OS.SendMessage (hwnd, OS.TB_GETSTATE, id, 0); + long hwnd = parent.handle; + int fsState = (int)OS.SendMessage (hwnd, OS.TB_GETSTATE, id, 0); /* * Feature in Windows. When TB_SETSTATE is used to set the * state of a tool item, the item redraws even when the state @@ -751,8 +751,8 @@ boolean setRadioSelection (boolean value) { public void setSelection (boolean selected) { checkWidget(); if ((style & (SWT.CHECK | SWT.RADIO)) == 0) return; - long /*int*/ hwnd = parent.handle; - int fsState = (int)/*64*/OS.SendMessage (hwnd, OS.TB_GETSTATE, id, 0); + long hwnd = parent.handle; + int fsState = (int)OS.SendMessage (hwnd, OS.TB_GETSTATE, id, 0); /* * Feature in Windows. When TB_SETSTATE is used to set the * state of a tool item, the item redraws even when the state @@ -787,8 +787,8 @@ public void setSelection (boolean selected) { @Override boolean setTabItemFocus () { if (parent.setTabItemFocus ()) { - long /*int*/ hwnd = parent.handle; - int index = (int)/*64*/OS.SendMessage (hwnd, OS.TB_COMMANDTOINDEX, id, 0); + long hwnd = parent.handle; + int index = (int)OS.SendMessage (hwnd, OS.TB_COMMANDTOINDEX, id, 0); OS.SendMessage (hwnd, OS.TB_SETHOTITEM, index, 0); return true; } @@ -796,12 +796,12 @@ boolean setTabItemFocus () { } void _setText (String string) { - long /*int*/ hwnd = parent.handle; + long hwnd = parent.handle; TBBUTTONINFO info = new TBBUTTONINFO (); info.cbSize = TBBUTTONINFO.sizeof; info.dwMask = OS.TBIF_TEXT | OS.TBIF_STYLE; info.fsStyle = (byte) (widgetStyle () | OS.BTNS_AUTOSIZE); - long /*int*/ hHeap = OS.GetProcessHeap (), pszText = 0; + long hHeap = OS.GetProcessHeap (), pszText = 0; if (string.length () != 0) { info.fsStyle |= OS.BTNS_SHOWTEXT; TCHAR buffer; @@ -870,8 +870,8 @@ public void setText (String string) { * the tool bar to redraw and layout. */ parent.setDropDownItems (false); - long /*int*/ hwnd = parent.handle; - long /*int*/ hFont = OS.SendMessage (hwnd, OS.WM_GETFONT, 0, 0); + long hwnd = parent.handle; + long hFont = OS.SendMessage (hwnd, OS.WM_GETFONT, 0, 0); OS.SendMessage (hwnd, OS.WM_SETFONT, hFont, 0); parent.setDropDownItems (true); parent.layoutItems (); @@ -942,7 +942,7 @@ public void setWidth (int width) { void setWidthInPixels (int width) { if ((style & SWT.SEPARATOR) == 0) return; if (width < 0) return; - long /*int*/ hwnd = parent.handle; + long hwnd = parent.handle; TBBUTTONINFO info = new TBBUTTONINFO (); info.cbSize = TBBUTTONINFO.sizeof; info.dwMask = OS.TBIF_SIZE; @@ -953,7 +953,7 @@ void setWidthInPixels (int width) { void updateImages (boolean enabled) { if ((style & SWT.SEPARATOR) != 0) return; - long /*int*/ hwnd = parent.handle; + long hwnd = parent.handle; TBBUTTONINFO info = new TBBUTTONINFO (); info.cbSize = TBBUTTONINFO.sizeof; info.dwMask = OS.TBIF_IMAGE; @@ -1043,7 +1043,7 @@ void updateImages (boolean enabled) { info.dwMask |= OS.TBIF_SIZE; info.cx = 0; OS.SendMessage (hwnd, OS.TB_SETBUTTONINFO, id, info); - long /*int*/ hFont = OS.SendMessage (hwnd, OS.WM_GETFONT, 0, 0); + long hFont = OS.SendMessage (hwnd, OS.WM_GETFONT, 0, 0); OS.SendMessage (hwnd, OS.WM_SETFONT, hFont, 0); parent.layoutItems (); } @@ -1063,7 +1063,7 @@ int widgetStyle () { return OS.BTNS_BUTTON; } -LRESULT wmCommandChild (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmCommandChild (long wParam, long lParam) { if ((style & SWT.RADIO) != 0) { if ((parent.getStyle () & SWT.NO_RADIO_GROUP) == 0) { selectRadio (); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolTip.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolTip.java index d7aaca1ce5..78c2a55472 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolTip.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolTip.java @@ -217,7 +217,7 @@ public String getText () { public boolean getVisible () { checkWidget(); if (item != null) return visible; - long /*int*/ hwndToolTip = hwndToolTip (); + long hwndToolTip = hwndToolTip (); if (OS.SendMessage (hwndToolTip, OS.TTM_GETCURRENTTOOL, 0, 0) != 0) { TOOLINFO lpti = new TOOLINFO (); lpti.cbSize = TOOLINFO.sizeof; @@ -229,8 +229,8 @@ public boolean getVisible () { } int getWidth () { - long /*int*/ hwnd = parent.handle; - long /*int*/ hmonitor = OS.MonitorFromWindow (hwnd, OS.MONITOR_DEFAULTTONEAREST); + long hwnd = parent.handle; + long hmonitor = OS.MonitorFromWindow (hwnd, OS.MONITOR_DEFAULTTONEAREST); MONITORINFO lpmi = new MONITORINFO (); lpmi.cbSize = MONITORINFO.sizeof; OS.GetMonitorInfo (hmonitor, lpmi); @@ -238,7 +238,7 @@ int getWidth () { return maxWidth / 4; } -long /*int*/ hwndToolTip () { +long hwndToolTip () { return (style & SWT.BALLOON) != 0 ? parent.balloonTipHandle () : parent.toolTipHandle (); } @@ -275,7 +275,7 @@ void releaseWidget () { super.releaseWidget (); if (item == null) { if (autoHide) { - long /*int*/ hwndToolTip = hwndToolTip (); + long hwndToolTip = hwndToolTip (); if (OS.SendMessage (hwndToolTip, OS.TTM_GETCURRENTTOOL, 0, 0) != 0) { TOOLINFO lpti = new TOOLINFO (); lpti.cbSize = TOOLINFO.sizeof; @@ -443,13 +443,13 @@ public void setText (String string) { } void updateMessage () { - long /*int*/ hwnd = hwndToolTip(); + long hwnd = hwndToolTip(); if (OS.SendMessage (hwnd, OS.TTM_GETCURRENTTOOL, 0, 0) != 0) { TOOLINFO lpti = new TOOLINFO (); lpti.cbSize = TOOLINFO.sizeof; if (OS.SendMessage (hwnd, OS.TTM_GETCURRENTTOOL, 0, lpti) != 0) { if (message != null && message.length() > 0) { - long /*int*/ hHeap = OS.GetProcessHeap (); + long hHeap = OS.GetProcessHeap (); TCHAR buffer = new TCHAR (0, message, true); int byteCount = buffer.length () * TCHAR.sizeof; lpti.lpszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); @@ -493,12 +493,12 @@ public void setVisible (boolean visible) { checkWidget (); if (visible == getVisible ()) return; if (item == null) { - long /*int*/ hwnd = parent.handle; + long hwnd = parent.handle; TOOLINFO lpti = new TOOLINFO (); lpti.cbSize = TOOLINFO.sizeof; lpti.uId = id; lpti.hwnd = hwnd; - long /*int*/ hwndToolTip = hwndToolTip (); + long hwndToolTip = hwndToolTip (); Shell shell = parent.getShell (); if (text.length () != 0) { int icon = OS.TTI_NONE; @@ -519,7 +519,7 @@ public void setVisible (boolean visible) { nY = pt.y; } } - long /*int*/ lParam = OS.MAKELPARAM (nX, nY); + long lParam = OS.MAKELPARAM (nX, nY); OS.SendMessage (hwndToolTip, OS.TTM_TRACKPOSITION, 0, lParam); /* @@ -535,7 +535,7 @@ public void setVisible (boolean visible) { OS.GetClientRect (hwnd, rect); OS.MapWindowPoints (hwnd, 0, rect, 2); if (!OS.PtInRect (rect, pt)) { - long /*int*/ hCursor = OS.GetCursor (); + long hCursor = OS.GetCursor (); OS.SetCursor (0); OS.SetCursorPos (rect.left, rect.top); OS.SendMessage (hwndToolTip, OS.TTM_TRACKACTIVATE, 1, lpti); @@ -545,7 +545,7 @@ public void setVisible (boolean visible) { OS.SendMessage (hwndToolTip, OS.TTM_TRACKACTIVATE, 1, lpti); } - int time = (int)/*64*/OS.SendMessage (hwndToolTip, OS.TTM_GETDELAYTIME, OS.TTDT_AUTOPOP, 0); + int time = (int)OS.SendMessage (hwndToolTip, OS.TTM_GETDELAYTIME, OS.TTDT_AUTOPOP, 0); OS.SetTimer (hwndToolTip, TIMER_ID, time, 0); updateMessage(); } else { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tracker.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tracker.java index 1727a13bed..ba256fea18 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tracker.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tracker.java @@ -48,12 +48,12 @@ public class Tracker extends Widget { boolean tracking, cancelled, stippled; Rectangle [] rectangles = new Rectangle [0], proportions = rectangles; Rectangle bounds; - long /*int*/ resizeCursor; + long resizeCursor; Cursor clientCursor; int cursorOrientation = SWT.NONE; boolean inEvent = false; boolean drawn; - long /*int*/ hwndTransparent, hwndOpaque, oldTransparentProc, oldOpaqueProc; + long hwndTransparent, hwndOpaque, oldTransparentProc, oldOpaqueProc; int oldX, oldY; /* @@ -250,7 +250,7 @@ Point adjustResizeCursor () { * the appropriate resize cursor. */ if (clientCursor == null) { - long /*int*/ newCursor = 0; + long newCursor = 0; switch (cursorOrientation) { case SWT.UP: newCursor = OS.LoadCursor (0, OS.IDC_SIZENS); @@ -373,9 +373,9 @@ void drawRectangles (Rectangle [] rects, boolean stippled) { return; } int bandWidth = 1; - long /*int*/ hwndTrack = parent == null ? OS.GetDesktopWindow () : parent.handle; - long /*int*/ hDC = OS.GetDCEx (hwndTrack, 0, OS.DCX_CACHE); - long /*int*/ hBitmap = 0, hBrush = 0, oldBrush = 0; + long hwndTrack = parent == null ? OS.GetDesktopWindow () : parent.handle; + long hDC = OS.GetDCEx (hwndTrack, 0, OS.DCX_CACHE); + long hBitmap = 0, hBrush = 0, oldBrush = 0; if (stippled) { bandWidth = 3; byte [] bits = {-86, 0, 85, 0, -86, 0, 85, 0, -86, 0, 85, 0, -86, 0, 85, 0}; @@ -524,7 +524,7 @@ public boolean open () { OS.SetLayeredWindowAttributes (hwndOpaque, 0xFFFFFF, (byte)0, OS.LWA_COLORKEY | OS.LWA_ALPHA); drawn = false; newProc = new Callback (this, "transparentProc", 4); //$NON-NLS-1$ - long /*int*/ newProcAddress = newProc.getAddress (); + long newProcAddress = newProc.getAddress (); if (newProcAddress == 0) error (SWT.ERROR_NO_MORE_CALLBACKS); oldTransparentProc = OS.GetWindowLongPtr (hwndTransparent, OS.GWLP_WNDPROC); OS.SetWindowLongPtr (hwndTransparent, OS.GWLP_WNDPROC, newProcAddress); @@ -553,7 +553,7 @@ public boolean open () { OS.GetModuleHandle (null), null); newProc = new Callback (this, "transparentProc", 4); //$NON-NLS-1$ - long /*int*/ newProcAddress = newProc.getAddress (); + long newProcAddress = newProc.getAddress (); if (newProcAddress == 0) error (SWT.ERROR_NO_MORE_CALLBACKS); oldTransparentProc = OS.GetWindowLongPtr (hwndTransparent, OS.GWLP_WNDPROC); OS.SetWindowLongPtr (hwndTransparent, OS.GWLP_WNDPROC, newProcAddress); @@ -891,8 +891,8 @@ public void setStippled (boolean stippled) { this.stippled = stippled; } -long /*int*/ transparentProc (long /*int*/ hwnd, long /*int*/ msg, long /*int*/ wParam, long /*int*/ lParam) { - switch ((int)/*64*/msg) { +long transparentProc (long hwnd, long msg, long wParam, long lParam) { + switch ((int)msg) { /* * We typically do not want to answer that the transparent window is * transparent to hits since doing so negates the effect of having it @@ -918,9 +918,9 @@ long /*int*/ transparentProc (long /*int*/ hwnd, long /*int*/ msg, long /*int*/ case OS.WM_PAINT: if (hwndOpaque == hwnd) { PAINTSTRUCT ps = new PAINTSTRUCT(); - long /*int*/ hDC = OS.BeginPaint (hwnd, ps); - long /*int*/ hBitmap = 0, hBrush = 0, oldBrush = 0; - long /*int*/ transparentBrush = OS.CreateSolidBrush(0xFFFFFF); + long hDC = OS.BeginPaint (hwnd, ps); + long hBitmap = 0, hBrush = 0, oldBrush = 0; + long transparentBrush = OS.CreateSolidBrush(0xFFFFFF); oldBrush = OS.SelectObject (hDC, transparentBrush); OS.PatBlt (hDC, ps.left, ps.top, ps.right - ps.left, ps.bottom - ps.top, OS.PATCOPY); OS.SelectObject (hDC, oldBrush); @@ -965,7 +965,7 @@ long /*int*/ transparentProc (long /*int*/ hwnd, long /*int*/ msg, long /*int*/ return 0; } } - return OS.CallWindowProc (hwnd == hwndTransparent ? oldTransparentProc : oldOpaqueProc, hwnd, (int)/*64*/msg, wParam, lParam); + return OS.CallWindowProc (hwnd == hwndTransparent ? oldTransparentProc : oldOpaqueProc, hwnd, (int)msg, wParam, lParam); } void update () { @@ -980,13 +980,13 @@ void update () { } @Override -LRESULT wmKeyDown (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmKeyDown (long hwnd, long wParam, long lParam) { LRESULT result = super.wmKeyDown (hwnd, wParam, lParam); if (result != null) return result; boolean isMirrored = parent != null && (parent.style & SWT.MIRRORED) != 0; int stepSize = OS.GetKeyState (OS.VK_CONTROL) < 0 ? STEPSIZE_SMALL : STEPSIZE_LARGE; int xChange = 0, yChange = 0; - switch ((int)/*64*/wParam) { + switch ((int)wParam) { case OS.VK_ESCAPE: cancelled = true; tracking = false; @@ -1114,7 +1114,7 @@ LRESULT wmKeyDown (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) } @Override -LRESULT wmSysKeyDown (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmSysKeyDown (long hwnd, long wParam, long lParam) { LRESULT result = super.wmSysKeyDown (hwnd, wParam, lParam); if (result != null) return result; cancelled = true; @@ -1122,7 +1122,7 @@ LRESULT wmSysKeyDown (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lPara return result; } -LRESULT wmMouse (int message, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmMouse (int message, long wParam, long lParam) { boolean isMirrored = parent != null && (parent.style & SWT.MIRRORED) != 0; int newPos = OS.GetMessagePos (); int newX = OS.GET_X_LPARAM (newPos); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TrayItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TrayItem.java index 2126b9ca37..ea39f2614c 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TrayItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TrayItem.java @@ -262,7 +262,7 @@ public boolean getVisible () { return visible; } -long /*int*/ messageProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) { +long messageProc (long hwnd, int msg, long wParam, long lParam) { /* * Feature in Windows. When the user clicks on the tray * icon, another application may be the foreground window. @@ -274,7 +274,7 @@ long /*int*/ messageProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long * menu is not hidden. The fix is to force the tray icon * message window to the foreground when sending an event. */ - switch ((int)/*64*/lParam) { + switch ((int)lParam) { case OS.WM_LBUTTONDOWN: if (hooks (SWT.Selection)) { OS.SetForegroundWindow (hwnd); @@ -459,7 +459,7 @@ public void setImage (Image image) { super.setImage (image); if (image2 != null) image2.dispose (); image2 = null; - long /*int*/ hIcon = 0; + long hIcon = 0; Image icon = image; if (icon != null) { switch (icon.type) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java index a03c5bd9a8..dcd82269aa 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java @@ -85,9 +85,9 @@ public class Tree extends Composite { TreeItem currentItem; TreeColumn sortColumn; RECT focusRect; - long /*int*/ hwndParent, hwndHeader, hAnchor, hInsert, hSelect; + long hwndParent, hwndHeader, hAnchor, hInsert, hSelect; int lastID; - long /*int*/ hFirstIndexOf, hLastIndexOf; + long hFirstIndexOf, hLastIndexOf; int lastIndexOf, itemCount, sortDirection; boolean dragStarted, gestureCompleted, insertAfter, shrink, ignoreShrink; boolean ignoreSelect, ignoreExpand, ignoreDeselect, ignoreResize; @@ -98,8 +98,8 @@ public class Tree extends Composite { boolean createdAsRTL; boolean headerItemDragging; int scrollWidth, selectionForeground; - long /*int*/ headerToolTipHandle, itemToolTipHandle; - long /*int*/ lastTimerID = -1; + long headerToolTipHandle, itemToolTipHandle; + long lastTimerID = -1; int lastTimerCount; int headerBackground = -1; int headerForeground = -1; @@ -113,9 +113,9 @@ public class Tree extends Composite { static final int INCREMENT = 5; static final int EXPLORER_EXTRA = 2; static final int DRAG_IMAGE_SIZE = 301; - static final long /*int*/ TreeProc; + static final long TreeProc; static final TCHAR TreeClass = new TCHAR (0, OS.WC_TREEVIEW, true); - static final long /*int*/ HeaderProc; + static final long HeaderProc; static final TCHAR HeaderClass = new TCHAR (0, OS.WC_HEADER, true); static { WNDCLASS lpWndClass = new WNDCLASS (); @@ -209,7 +209,7 @@ void _addListener (int eventType, Listener listener) { * This code is intentionally commented. */ // if (explorerTheme) { -// int bits1 = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETEXTENDEDSTYLE, 0, 0); +// int bits1 = (int)OS.SendMessage (handle, OS.TVM_GETEXTENDEDSTYLE, 0, 0); // bits1 &= ~OS.TVS_EX_AUTOHSCROLL; // OS.SendMessage (handle, OS.TVM_SETEXTENDEDSTYLE, 0, bits1); // } @@ -236,7 +236,7 @@ void _addListener (int eventType, Listener listener) { * scroll bar. The fix is to check for this case and * explicitly hide the scroll bar. */ - int count = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.TVM_GETCOUNT, 0, 0); if (count != 0 && (bits & OS.TVS_NOHSCROLL) != 0) { OS.ShowScrollBar (handle, OS.SB_HORZ, false); } @@ -246,17 +246,17 @@ void _addListener (int eventType, Listener listener) { } } -TreeItem _getItem (long /*int*/ hItem) { +TreeItem _getItem (long hItem) { TVITEM tvItem = new TVITEM (); tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_PARAM; tvItem.hItem = hItem; if (OS.SendMessage (handle, OS.TVM_GETITEM, 0, tvItem) != 0) { - return _getItem (tvItem.hItem, (int)/*64*/tvItem.lParam); + return _getItem (tvItem.hItem, (int)tvItem.lParam); } return null; } -TreeItem _getItem (long /*int*/ hItem, int id) { +TreeItem _getItem (long hItem, int id) { if ((style & SWT.VIRTUAL) == 0) return items [id]; return id != -1 ? items [id] : new TreeItem (this, SWT.NONE, -1, -1, hItem); } @@ -282,7 +282,7 @@ void _removeListener (int eventType, Listener listener) { } void _setBackgroundPixel (int newPixel) { - int oldPixel = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETBKCOLOR, 0, 0); + int oldPixel = (int)OS.SendMessage (handle, OS.TVM_GETBKCOLOR, 0, 0); if (oldPixel != newPixel) { /* * Bug in Windows. When TVM_SETBKCOLOR is used more @@ -305,7 +305,7 @@ void _setBackgroundPixel (int newPixel) { * animation draws badly. The fix is to clear the effect. */ if (explorerTheme && ENABLE_TVS_EX_FADEINOUTEXPANDOS) { - int bits2 = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETEXTENDEDSTYLE, 0, 0); + int bits2 = (int)OS.SendMessage (handle, OS.TVM_GETEXTENDEDSTYLE, 0, 0); if (newPixel == -1 && findImageControl () == null) { bits2 |= OS.TVS_EX_FADEINOUTEXPANDOS; } else { @@ -382,14 +382,14 @@ public void addTreeListener(TreeListener listener) { } @Override -long /*int*/ borderHandle () { +long borderHandle () { return hwndParent != 0 ? hwndParent : handle; } -LRESULT CDDS_ITEMPOSTPAINT (NMTVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT CDDS_ITEMPOSTPAINT (NMTVCUSTOMDRAW nmcd, long wParam, long lParam) { if (ignoreCustomDraw) return null; if (nmcd.left == nmcd.right) return new LRESULT (OS.CDRF_DODEFAULT); - long /*int*/ hDC = nmcd.hdc; + long hDC = nmcd.hdc; OS.RestoreDC (hDC, -1); TreeItem item = getItem (nmcd); @@ -504,7 +504,7 @@ LRESULT CDDS_ITEMPOSTPAINT (NMTVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*int } } draw = false; - long /*int*/ hTheme = OS.OpenThemeData (handle, Display.TREEVIEW); + long hTheme = OS.OpenThemeData (handle, Display.TREEVIEW); int iStateId = selected ? OS.TREIS_SELECTED : OS.TREIS_HOT; if (OS.GetFocus () != handle && selected && !hot) iStateId = OS.TREIS_SELECTEDNOTFOCUS; OS.DrawThemeBackground (hTheme, hDC, OS.TVP_TREEITEM, iStateId, pRect, pClipRect); @@ -574,7 +574,7 @@ LRESULT CDDS_ITEMPOSTPAINT (NMTVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*int backgroundRect = rect; } int clrText = -1, clrTextBk = -1; - long /*int*/ hFont = item.fontHandle (index); + long hFont = item.fontHandle (index); if (selectionForeground != -1) clrText = selectionForeground; if (OS.IsWindowEnabled (handle)) { boolean drawForeground = false; @@ -632,7 +632,7 @@ LRESULT CDDS_ITEMPOSTPAINT (NMTVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*int if (clrTextBk != -1) data.background = clrTextBk; } data.font = item.getFont (index); - data.uiState = (int)/*64*/OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); + data.uiState = (int)OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); GC gc = GC.win32_new (hDC, data); Event event = new Event (); event.item = item; @@ -647,7 +647,7 @@ LRESULT CDDS_ITEMPOSTPAINT (NMTVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*int //if ((nmcd.uItemState & OS.CDIS_FOCUS) != 0) { if (OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0) == nmcd.dwItemSpec) { if (handle == OS.GetFocus ()) { - int uiState = (int)/*64*/OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); + int uiState = (int)OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); if ((uiState & OS.UISF_HIDEFOCUS) == 0) event.detail |= SWT.FOCUSED; } } @@ -717,7 +717,7 @@ LRESULT CDDS_ITEMPOSTPAINT (NMTVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*int backgroundRect = selectionRect; } } - long /*int*/ hTheme = OS.OpenThemeData (handle, Display.TREEVIEW); + long hTheme = OS.OpenThemeData (handle, Display.TREEVIEW); int iStateId = selected ? OS.TREIS_SELECTED : OS.TREIS_HOT; if (OS.GetFocus () != handle && selected && !hot) iStateId = OS.TREIS_SELECTEDNOTFOCUS; OS.DrawThemeBackground (hTheme, hDC, OS.TVP_TREEITEM, iStateId, pRect, backgroundRect); @@ -848,7 +848,7 @@ LRESULT CDDS_ITEMPOSTPAINT (NMTVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*int if (clrText != -1) data.foreground = clrText; if (clrTextBk != -1) data.background = clrTextBk; } - data.uiState = (int)/*64*/OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); + data.uiState = (int)OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); GC gc = GC.win32_new (hDC, data); Event event = new Event (); event.item = item; @@ -865,7 +865,7 @@ LRESULT CDDS_ITEMPOSTPAINT (NMTVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*int if (OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0) == nmcd.dwItemSpec) { if (i == 0 /*nmcd.iSubItem == 0*/ || (style & SWT.FULL_SELECTION) != 0) { if (handle == OS.GetFocus ()) { - int uiState = (int)/*64*/OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); + int uiState = (int)OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); if ((uiState & OS.UISF_HIDEFOCUS) == 0) event.detail |= SWT.FOCUSED; } } @@ -908,9 +908,9 @@ LRESULT CDDS_ITEMPOSTPAINT (NMTVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*int } else { if (!explorerTheme) { if (handle == OS.GetFocus ()) { - int uiState = (int)/*64*/OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); + int uiState = (int)OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); if ((uiState & OS.UISF_HIDEFOCUS) == 0) { - long /*int*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); + long hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); if (hItem == item.handle) { if (!ignoreDrawFocus && findImageControl () != null) { if ((style & SWT.FULL_SELECTION) != 0) { @@ -918,7 +918,7 @@ LRESULT CDDS_ITEMPOSTPAINT (NMTVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*int OS.SetRect (focusRect, 0, nmcd.top, clientRect.right + 1, nmcd.bottom); OS.DrawFocusRect (hDC, focusRect); } else { - int index = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_ORDERTOINDEX, 0, 0); + int index = (int)OS.SendMessage (hwndHeader, OS.HDM_ORDERTOINDEX, 0, 0); RECT focusRect = item.getBounds (index, true, false, false, false, false, hDC); RECT clipRect = item.getBounds (index, true, false, false, false, true, hDC); OS.IntersectClipRect (hDC, clipRect.left, clipRect.top, clipRect.right, clipRect.bottom); @@ -934,7 +934,7 @@ LRESULT CDDS_ITEMPOSTPAINT (NMTVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*int return new LRESULT (OS.CDRF_DODEFAULT); } -LRESULT CDDS_ITEMPREPAINT (NMTVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT CDDS_ITEMPREPAINT (NMTVCUSTOMDRAW nmcd, long wParam, long lParam) { /* * Even when custom draw is being ignored, the font needs * to be selected into the HDC so that the item bounds are @@ -952,9 +952,9 @@ LRESULT CDDS_ITEMPREPAINT (NMTVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*int* * COMCTL32.DLL, */ if (item == null) return null; - long /*int*/ hDC = nmcd.hdc; - int index = hwndHeader != 0 ? (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_ORDERTOINDEX, 0, 0) : 0; - long /*int*/ hFont = item.fontHandle (index); + long hDC = nmcd.hdc; + int index = hwndHeader != 0 ? (int)OS.SendMessage (hwndHeader, OS.HDM_ORDERTOINDEX, 0, 0) : 0; + long hFont = item.fontHandle (index); if (hFont != -1) OS.SelectObject (hDC, hFont); if (ignoreCustomDraw || nmcd.left == nmcd.right) { return new LRESULT (hFont == -1 ? OS.CDRF_DODEFAULT : OS.CDRF_NEWFONT); @@ -1031,7 +1031,7 @@ LRESULT CDDS_ITEMPREPAINT (NMTVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*int* if (clrText != -1) data.foreground = clrText; if (clrTextBk != -1) data.background = clrTextBk; } - data.uiState = (int)/*64*/OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); + data.uiState = (int)OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); data.font = item.getFont (index); GC gc = GC.win32_new (hDC, data); Event event = new Event (); @@ -1045,7 +1045,7 @@ LRESULT CDDS_ITEMPREPAINT (NMTVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*int* //if ((nmcd.uItemState & OS.CDIS_FOCUS) != 0) { if (OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0) == nmcd.dwItemSpec) { if (handle == OS.GetFocus ()) { - int uiState = (int)/*64*/OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); + int uiState = (int)OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); if ((uiState & OS.UISF_HIDEFOCUS) == 0) { if (!explorerTheme || !selected) { focused = true; @@ -1109,7 +1109,7 @@ LRESULT CDDS_ITEMPREPAINT (NMTVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*int* } pRect.left -= EXPLORER_EXTRA; pClipRect.left -= EXPLORER_EXTRA; - long /*int*/ hTheme = OS.OpenThemeData (handle, Display.TREEVIEW); + long hTheme = OS.OpenThemeData (handle, Display.TREEVIEW); int iStateId = selected ? OS.TREIS_SELECTED : OS.TREIS_HOT; if (OS.GetFocus () != handle && selected && !hot) iStateId = OS.TREIS_SELECTEDNOTFOCUS; OS.DrawThemeBackground (hTheme, hDC, OS.TVP_TREEITEM, iStateId, pRect, pClipRect); @@ -1324,7 +1324,7 @@ LRESULT CDDS_ITEMPREPAINT (NMTVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*int* } OS.SaveDC (hDC); if (clipRect != null) { - long /*int*/ hRgn = OS.CreateRectRgn (clipRect.left, clipRect.top, clipRect.right, clipRect.bottom); + long hRgn = OS.CreateRectRgn (clipRect.left, clipRect.top, clipRect.right, clipRect.bottom); POINT lpPoint = new POINT (); OS.GetWindowOrgEx (hDC, lpPoint); OS.OffsetRgn (hRgn, -lpPoint.x, -lpPoint.y); @@ -1334,7 +1334,7 @@ LRESULT CDDS_ITEMPREPAINT (NMTVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*int* return result; } -LRESULT CDDS_POSTPAINT (NMTVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT CDDS_POSTPAINT (NMTVCUSTOMDRAW nmcd, long wParam, long lParam) { if (ignoreCustomDraw) return null; if (OS.IsWindowVisible (handle)) { if (OS.IsAppThemed ()) { @@ -1359,7 +1359,7 @@ LRESULT CDDS_POSTPAINT (NMTVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*int*/ l * NOTE: This problem only happens on Vista during * WM_NOTIFY with NM_CUSTOMDRAW and CDDS_POSTPAINT. */ - long /*int*/ hItem = 0; + long hItem = 0; if (OS.WIN32_VERSION >= OS.VERSION (6, 0)) { hItem = getBottomItem (); } else { @@ -1383,14 +1383,14 @@ LRESULT CDDS_POSTPAINT (NMTVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*int*/ l } } if (linesVisible) { - long /*int*/ hDC = nmcd.hdc; + long hDC = nmcd.hdc; if (hwndHeader != 0) { int x = 0; RECT rect = new RECT (); HDITEM hdItem = new HDITEM (); hdItem.mask = OS.HDI_WIDTH; for (int i=0; i<columnCount; i++) { - int index = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_ORDERTOINDEX, i, 0); + int index = (int)OS.SendMessage (hwndHeader, OS.HDM_ORDERTOINDEX, i, 0); OS.SendMessage (hwndHeader, OS.HDM_GETITEM, index, hdItem); OS.SetRect (rect, x, nmcd.top, x + hdItem.cxy, nmcd.bottom); OS.DrawEdge (hDC, rect, OS.BDR_SUNKENINNER, OS.BF_RIGHT); @@ -1415,7 +1415,7 @@ LRESULT CDDS_POSTPAINT (NMTVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*int*/ l * NOTE: This problem only happens on Vista during * WM_NOTIFY with NM_CUSTOMDRAW and CDDS_POSTPAINT. */ - long /*int*/ hItem = 0; + long hItem = 0; if (OS.WIN32_VERSION >= OS.VERSION (6, 0)) { hItem = getBottomItem (); } else { @@ -1427,7 +1427,7 @@ LRESULT CDDS_POSTPAINT (NMTVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*int*/ l } } if (height == 0) { - height = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETITEMHEIGHT, 0, 0); + height = (int)OS.SendMessage (handle, OS.TVM_GETITEMHEIGHT, 0, 0); OS.GetClientRect (handle, rect); OS.SetRect (rect, rect.left, rect.top, rect.right, rect.top + height); OS.DrawEdge (hDC, rect, OS.BDR_SUNKENINNER, OS.BF_BOTTOM); @@ -1444,7 +1444,7 @@ LRESULT CDDS_POSTPAINT (NMTVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*int*/ l return new LRESULT (OS.CDRF_DODEFAULT); } -LRESULT CDDS_PREPAINT (NMTVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT CDDS_PREPAINT (NMTVCUSTOMDRAW nmcd, long wParam, long lParam) { if (explorerTheme) { if ((OS.IsWindowEnabled (handle) && hooks (SWT.EraseItem)) || hasCustomBackground() || findImageControl () != null) { RECT rect = new RECT (); @@ -1456,7 +1456,7 @@ LRESULT CDDS_PREPAINT (NMTVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*int*/ lP } @Override -long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) { +long callWindowProc (long hwnd, int msg, long wParam, long lParam) { if (handle == 0) return 0; if (hwndParent != 0 && hwnd == hwndParent) { return OS.DefWindowProc (hwnd, msg, wParam, lParam); @@ -1475,7 +1475,7 @@ long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, lo * only the focus is assigned. */ if ((style & SWT.SINGLE) != 0) break; - long /*int*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); + long hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); if (hItem == 0) { hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_FIRSTVISIBLE, 0); if (hItem != 0) { @@ -1496,7 +1496,7 @@ long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, lo break; } } - long /*int*/ hItem = 0; + long hItem = 0; boolean redraw = false; switch (msg) { /* Keyboard messages */ @@ -1551,7 +1551,7 @@ long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, lo break; } } - long /*int*/ code = OS.CallWindowProc (TreeProc, hwnd, msg, wParam, lParam); + long code = OS.CallWindowProc (TreeProc, hwnd, msg, wParam, lParam); switch (msg) { /* Keyboard messages */ case OS.WM_KEYDOWN: @@ -1625,7 +1625,7 @@ void checkBuffered () { OS.SendMessage (handle, OS.TVM_SETSCROLLTIME, 0, 0); } if (OS.IsAppThemed ()) { - int exStyle = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETEXTENDEDSTYLE, 0, 0); + int exStyle = (int)OS.SendMessage (handle, OS.TVM_GETEXTENDEDSTYLE, 0, 0); if ((exStyle & OS.TVS_EX_DOUBLEBUFFER) != 0) style |= SWT.DOUBLE_BUFFERED; } } @@ -1654,7 +1654,7 @@ boolean checkData (TreeItem item, int index, boolean redraw) { * is to detect that the top item has changed and redraw * the entire tree. */ - long /*int*/ hTopItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_FIRSTVISIBLE, 0); + long hTopItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_FIRSTVISIBLE, 0); sendEvent (SWT.SetData, event); //widget could be disposed at this point currentItem = oldItem; @@ -1668,11 +1668,11 @@ boolean checkData (TreeItem item, int index, boolean redraw) { } @Override -boolean checkHandle (long /*int*/ hwnd) { +boolean checkHandle (long hwnd) { return hwnd == handle || (hwndParent != 0 && hwnd == hwndParent) || (hwndHeader != 0 && hwnd == hwndHeader); } -boolean checkScroll (long /*int*/ hItem) { +boolean checkScroll (long hItem) { /* * Feature in Windows. If redraw is turned off using WM_SETREDRAW * and a tree item that is not a child of the first root is selected or @@ -1685,8 +1685,8 @@ boolean checkScroll (long /*int*/ hItem) { * callers of this method. */ if (getDrawing ()) return false; - long /*int*/ hRoot = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); - long /*int*/ hParent = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_PARENT, hItem); + long hRoot = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); + long hParent = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_PARENT, hItem); while (hParent != hRoot && hParent != 0) { hParent = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_PARENT, hParent); } @@ -1723,7 +1723,7 @@ protected void checkSubclass () { */ public void clear (int index, boolean all) { checkWidget (); - long /*int*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); + long hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); if (hItem == 0) error (SWT.ERROR_INVALID_RANGE); hItem = findItem (hItem, index); if (hItem == 0) error (SWT.ERROR_INVALID_RANGE); @@ -1736,11 +1736,11 @@ public void clear (int index, boolean all) { } } -void clear (long /*int*/ hItem, TVITEM tvItem) { +void clear (long hItem, TVITEM tvItem) { tvItem.hItem = hItem; TreeItem item = null; if (OS.SendMessage (handle, OS.TVM_GETITEM, 0, tvItem) != 0) { - item = tvItem.lParam != -1 ? items [(int)/*64*/tvItem.lParam] : null; + item = tvItem.lParam != -1 ? items [(int)tvItem.lParam] : null; } if (item != null) { if ((style & SWT.VIRTUAL) != 0 && !item.cached) return; @@ -1770,7 +1770,7 @@ void clear (long /*int*/ hItem, TVITEM tvItem) { */ public void clearAll (boolean all) { checkWidget (); - long /*int*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); + long hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); if (hItem == 0) return; if (all) { boolean redraw = false; @@ -1789,20 +1789,20 @@ public void clearAll (boolean all) { } } -void clearAll (long /*int*/ hItem, TVITEM tvItem, boolean all) { +void clearAll (long hItem, TVITEM tvItem, boolean all) { while (hItem != 0) { clear (hItem, tvItem); if (all) { - long /*int*/ hFirstItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, hItem); + long hFirstItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, hItem); clearAll (hFirstItem, tvItem, all); } hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXT, hItem); } } -long /*int*/ CompareFunc (long /*int*/ lParam1, long /*int*/ lParam2, long /*int*/ lParamSort) { - TreeItem item1 = items [(int)/*64*/lParam1], item2 = items [(int)/*64*/lParam2]; - String text1 = item1.getText ((int)/*64*/lParamSort), text2 = item2.getText ((int)/*64*/lParamSort); +long CompareFunc (long lParam1, long lParam2, long lParamSort) { + TreeItem item1 = items [(int)lParam1], item2 = items [(int)lParam2]; + String text1 = item1.getText ((int)lParamSort), text2 = item2.getText ((int)lParamSort); return sortDirection == SWT.UP ? text1.compareTo (text2) : text2.compareTo (text1); } @@ -1820,7 +1820,7 @@ long /*int*/ CompareFunc (long /*int*/ lParam1, long /*int*/ lParam2, long /*int height += rect.bottom - rect.top; } RECT rect = new RECT (); - long /*int*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); + long hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); while (hItem != 0) { if ((style & SWT.VIRTUAL) == 0 && !painted) { TVITEM tvItem = new TVITEM (); @@ -1893,7 +1893,7 @@ void createHandle () { * The control will not destroy a font that it did not * create. */ - long /*int*/ hFont = OS.GetStockObject (OS.SYSTEM_FONT); + long hFont = OS.GetStockObject (OS.SYSTEM_FONT); OS.SendMessage (handle, OS.WM_SETFONT, hFont, 0); /* @@ -2006,8 +2006,8 @@ void createItem (TreeColumn column, int index) { * if is not possible to set the text at a later time. * The fix is to insert the item with an empty string. */ - long /*int*/ hHeap = OS.GetProcessHeap (); - long /*int*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, TCHAR.sizeof); + long hHeap = OS.GetProcessHeap (); + long pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, TCHAR.sizeof); HDITEM hdItem = new HDITEM (); hdItem.mask = OS.HDI_TEXT | OS.HDI_FORMAT; hdItem.pszText = pszText; @@ -2031,7 +2031,7 @@ void createItem (TreeColumn column, int index) { * scroll bar. The fix is to check for this case and * explicitly hide the scroll bar explicitly. */ - int count = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.TVM_GETCOUNT, 0, 0); if (count != 0) { OS.ShowScrollBar (handle, OS.SB_HORZ, false); } @@ -2068,7 +2068,7 @@ void createItem (TreeColumn column, int index) { } } -void createItem (TreeItem item, long /*int*/ hParent, long /*int*/ hInsertAfter, long /*int*/ hItem) { +void createItem (TreeItem item, long hParent, long hInsertAfter, long hItem) { int id = -1; if (item != null) { id = lastID < items.length ? lastID : 0; @@ -2093,8 +2093,8 @@ void createItem (TreeItem item, long /*int*/ hParent, long /*int*/ hInsertAfter, } lastID = id + 1; } - long /*int*/ hNewItem = 0; - long /*int*/ hFirstItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, hParent); + long hNewItem = 0; + long hFirstItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, hParent); boolean fixParent = hFirstItem == 0; if (hItem == 0) { TVINSERTSTRUCT tvInsert = new TVINSERTSTRUCT (); @@ -2169,7 +2169,7 @@ void createItem (TreeItem item, long /*int*/ hParent, long /*int*/ hInsertAfter, RECT damageRect = new RECT (); boolean damaged = OS.GetUpdateRect (handle, damageRect, true); if (damaged && damageRect.top < rect.bottom) { - long /*int*/ rgn = OS.CreateRectRgn (0, 0, 0, 0); + long rgn = OS.CreateRectRgn (0, 0, 0, 0); int result = OS.GetUpdateRgn (handle, rgn, true); if (result != OS.NULLREGION) { OS.OffsetRgn (rgn, 0, rect.bottom - rect.top); @@ -2267,7 +2267,7 @@ void createParent () { if (hwndHeader == 0) error (SWT.ERROR_NO_HANDLES); OS.SetWindowLongPtr (hwndHeader, OS.GWLP_ID, hwndHeader); if (OS.IsDBLocale) { - long /*int*/ hIMC = OS.ImmGetContext (handle); + long hIMC = OS.ImmGetContext (handle); OS.ImmAssociateContext (hwndParent, hIMC); OS.ImmAssociateContext (hwndHeader, hIMC); OS.ImmReleaseContext (handle, hIMC); @@ -2280,9 +2280,9 @@ void createParent () { // OS.SetWindowLong (handle, OS.GWL_EXSTYLE, oldExStyle); // } // } - long /*int*/ hFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); + long hFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); if (hFont != 0) OS.SendMessage (hwndHeader, OS.WM_SETFONT, hFont, 0); - long /*int*/ hwndInsertAfter = OS.GetWindow (handle, OS.GW_HWNDPREV); + long hwndInsertAfter = OS.GetWindow (handle, OS.GW_HWNDPREV); int flags = OS.SWP_NOSIZE | OS.SWP_NOMOVE | OS.SWP_NOACTIVATE; OS.SetWindowPos (hwndParent, hwndInsertAfter, 0, 0, 0, 0, flags); SCROLLINFO info = new SCROLLINFO (); @@ -2299,7 +2299,7 @@ void createParent () { if ((oldStyle & OS.WS_VISIBLE) != 0) { OS.ShowWindow (hwndParent, OS.SW_SHOW); } - long /*int*/ hwndFocus = OS.GetFocus (); + long hwndFocus = OS.GetFocus (); if (hwndFocus == handle) OS.SetFocus (hwndParent); OS.SetParent (handle, hwndParent); if (hwndFocus == handle) OS.SetFocus (handle); @@ -2331,13 +2331,13 @@ void deregister () { if (hwndHeader != 0) display.removeControl (hwndHeader); } -void deselect (long /*int*/ hItem, TVITEM tvItem, long /*int*/ hIgnoreItem) { +void deselect (long hItem, TVITEM tvItem, long hIgnoreItem) { while (hItem != 0) { if (hItem != hIgnoreItem) { tvItem.hItem = hItem; OS.SendMessage (handle, OS.TVM_SETITEM, 0, tvItem); } - long /*int*/ hFirstItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, hItem); + long hFirstItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, hItem); deselect (hFirstItem, tvItem, hIgnoreItem); hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXT, hItem); } @@ -2385,16 +2385,16 @@ public void deselectAll () { tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_STATE; tvItem.stateMask = OS.TVIS_SELECTED; if ((style & SWT.SINGLE) != 0) { - long /*int*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); + long hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); if (hItem != 0) { tvItem.hItem = hItem; OS.SendMessage (handle, OS.TVM_SETITEM, 0, tvItem); } } else { - long /*int*/ oldProc = OS.GetWindowLongPtr (handle, OS.GWLP_WNDPROC); + long oldProc = OS.GetWindowLongPtr (handle, OS.GWLP_WNDPROC); OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, TreeProc); if ((style & SWT.VIRTUAL) != 0) { - long /*int*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); + long hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); deselect (hItem, tvItem, 0); } else { for (int i=0; i<items.length; i++) { @@ -2547,7 +2547,7 @@ void destroyItem (TreeColumn column) { } } -void destroyItem (TreeItem item, long /*int*/ hItem) { +void destroyItem (TreeItem item, long hItem) { hFirstIndexOf = hLastIndexOf = 0; itemCount = -1; /* @@ -2565,7 +2565,7 @@ void destroyItem (TreeItem item, long /*int*/ hItem) { * allowing application code to add or remove items during * this remove operation. */ - long /*int*/ hParent = 0; + long hParent = 0; boolean fixRedraw = false; if ((style & SWT.DOUBLE_BUFFERED) == 0) { if (getDrawing () && OS.IsWindowVisible (handle)) { @@ -2596,7 +2596,7 @@ void destroyItem (TreeItem item, long /*int*/ hItem) { * * NOTE: This only happens on Vista. */ - long /*int*/ hwndToolTip = OS.SendMessage (handle, OS.TVM_GETTOOLTIPS, 0, 0); + long hwndToolTip = OS.SendMessage (handle, OS.TVM_GETTOOLTIPS, 0, 0); if (hwndToolTip != 0) OS.SendMessage (hwndToolTip, OS.TTM_POP, 0 ,0); shrink = ignoreShrink = true; @@ -2619,7 +2619,7 @@ void destroyItem (TreeItem item, long /*int*/ hItem) { } } } - int count = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.TVM_GETCOUNT, 0, 0); if (count == 0) { if (imageList != null) { OS.SendMessage (handle, OS.TVM_SETIMAGELIST, 0, 0); @@ -2703,8 +2703,8 @@ boolean findCell (int x, int y, TreeItem [] item, int [] index, RECT [] cellRect POINT pt = new POINT (); pt.x = x; pt.y = y; - long /*int*/ hDC = OS.GetDC (handle); - long /*int*/ oldFont = 0, newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); + long hDC = OS.GetDC (handle); + long oldFont = 0, newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont); RECT rect = new RECT (); if (hwndParent != 0) { @@ -2719,7 +2719,7 @@ boolean findCell (int x, int y, TreeItem [] item, int [] index, RECT [] cellRect index [0] = 0; boolean quit = false; while (index [0] < count && !quit) { - long /*int*/ hFont = item [0].fontHandle (order [index [0]]); + long hFont = item [0].fontHandle (order [index [0]]); if (hFont != -1) hFont = OS.SelectObject (hDC, hFont); cellRect [0] = item [0].getBounds (order [index [0]], true, false, true, false, true, hDC); if (cellRect [0].left > rect.right) { @@ -2728,7 +2728,7 @@ boolean findCell (int x, int y, TreeItem [] item, int [] index, RECT [] cellRect cellRect [0].right = Math.min (cellRect [0].right, rect.right); if (OS.PtInRect (cellRect [0], pt)) { if (isCustomToolTip ()) { - int state = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETITEMSTATE, lpht.hItem, OS.TVIS_SELECTED); + int state = (int)OS.SendMessage (handle, OS.TVM_GETITEMSTATE, lpht.hItem, OS.TVIS_SELECTED); int detail = (state & OS.TVIS_SELECTED) != 0 ? SWT.SELECTED : 0; Event event = sendMeasureItemEvent (item [0], order [index [0]], hDC, detail); if (isDisposed () || item [0].isDisposed ()) break; @@ -2754,7 +2754,7 @@ boolean findCell (int x, int y, TreeItem [] item, int [] index, RECT [] cellRect return found; } -int findIndex (long /*int*/ hFirstItem, long /*int*/ hItem) { +int findIndex (long hFirstItem, long hItem) { if (hFirstItem == 0) return -1; if (hFirstItem == hFirstIndexOf) { if (hFirstIndexOf == hItem) { @@ -2762,12 +2762,12 @@ int findIndex (long /*int*/ hFirstItem, long /*int*/ hItem) { return lastIndexOf = 0; } if (hLastIndexOf == hItem) return lastIndexOf; - long /*int*/ hPrevItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_PREVIOUS, hLastIndexOf); + long hPrevItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_PREVIOUS, hLastIndexOf); if (hPrevItem == hItem) { hLastIndexOf = hPrevItem; return --lastIndexOf; } - long /*int*/ hNextItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXT, hLastIndexOf); + long hNextItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXT, hLastIndexOf); if (hNextItem == hItem) { hLastIndexOf = hNextItem; return ++lastIndexOf; @@ -2793,7 +2793,7 @@ int findIndex (long /*int*/ hFirstItem, long /*int*/ hItem) { return -1; } int index = 0; - long /*int*/ hNextItem = hFirstItem; + long hNextItem = hFirstItem; while (hNextItem != 0 && hNextItem != hItem) { hNextItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXT, hNextItem); index++; @@ -2808,11 +2808,11 @@ int findIndex (long /*int*/ hFirstItem, long /*int*/ hItem) { } @Override -Widget findItem (long /*int*/ hItem) { +Widget findItem (long hItem) { return _getItem (hItem); } -long /*int*/ findItem (long /*int*/ hFirstItem, int index) { +long findItem (long hFirstItem, int index) { if (hFirstItem == 0) return 0; if (hFirstItem == hFirstIndexOf) { if (index == 0) { @@ -2830,7 +2830,7 @@ long /*int*/ findItem (long /*int*/ hFirstItem, int index) { } if (index < lastIndexOf) { int previousIndex = lastIndexOf - 1; - long /*int*/ hPrevItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_PREVIOUS, hLastIndexOf); + long hPrevItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_PREVIOUS, hLastIndexOf); while (hPrevItem != 0 && index < previousIndex) { hPrevItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_PREVIOUS, hPrevItem); --previousIndex; @@ -2841,7 +2841,7 @@ long /*int*/ findItem (long /*int*/ hFirstItem, int index) { } } else { int nextIndex = lastIndexOf + 1; - long /*int*/ hNextItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXT, hLastIndexOf); + long hNextItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXT, hLastIndexOf); while (hNextItem != 0 && nextIndex < index) { hNextItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXT, hNextItem); nextIndex++; @@ -2854,7 +2854,7 @@ long /*int*/ findItem (long /*int*/ hFirstItem, int index) { return 0; } int nextIndex = 0; - long /*int*/ hNextItem = hFirstItem; + long hNextItem = hFirstItem; while (hNextItem != 0 && nextIndex < index) { hNextItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXT, hNextItem); nextIndex++; @@ -2870,7 +2870,7 @@ long /*int*/ findItem (long /*int*/ hFirstItem, int index) { TreeItem getFocusItem () { // checkWidget (); - long /*int*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); + long hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); return hItem != 0 ? _getItem (hItem) : null; } @@ -2990,12 +2990,12 @@ Point getImageSize () { return new Point (0, getItemHeightInPixels ()); } -long /*int*/ getBottomItem () { - long /*int*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_FIRSTVISIBLE, 0); +long getBottomItem () { + long hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_FIRSTVISIBLE, 0); if (hItem == 0) return 0; - int index = 0, count = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETVISIBLECOUNT, 0, 0); + int index = 0, count = (int)OS.SendMessage (handle, OS.TVM_GETVISIBLECOUNT, 0, 0); while (index <= count) { - long /*int*/ hNextItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXTVISIBLE, hItem); + long hNextItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXTVISIBLE, hItem); if (hNextItem == 0) return hItem; hItem = hNextItem; index++; @@ -3151,9 +3151,9 @@ public TreeColumn [] getColumns () { public TreeItem getItem (int index) { checkWidget (); if (index < 0) error (SWT.ERROR_INVALID_RANGE); - long /*int*/ hFirstItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); + long hFirstItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); if (hFirstItem == 0) error (SWT.ERROR_INVALID_RANGE); - long /*int*/ hItem = findItem (hFirstItem, index); + long hItem = findItem (hFirstItem, index); if (hItem == 0) error (SWT.ERROR_INVALID_RANGE); return _getItem (hItem); } @@ -3167,14 +3167,14 @@ TreeItem getItem (NMTVCUSTOMDRAW nmcd) { * fix is to query the field from the item instead * of using the struct. */ - int id = (int)/*64*/nmcd.lItemlParam; + int id = (int)nmcd.lItemlParam; if ((style & SWT.VIRTUAL) != 0) { if (id == -1) { TVITEM tvItem = new TVITEM (); tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_PARAM; tvItem.hItem = nmcd.dwItemSpec; OS.SendMessage (handle, OS.TVM_GETITEM, 0, tvItem); - id = (int)/*64*/tvItem.lParam; + id = (int)tvItem.lParam; } } return _getItem (nmcd.dwItemSpec, id); @@ -3246,14 +3246,14 @@ TreeItem getItemInPixels (Point point) { */ public int getItemCount () { checkWidget (); - long /*int*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); + long hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); if (hItem == 0) return 0; return getItemCount (hItem); } -int getItemCount (long /*int*/ hItem) { +int getItemCount (long hItem) { int count = 0; - long /*int*/ hFirstItem = hItem; + long hFirstItem = hItem; if (hItem == hFirstIndexOf) { if (itemCount != -1) return itemCount; hFirstItem = hLastIndexOf; @@ -3284,7 +3284,7 @@ public int getItemHeight () { } int getItemHeightInPixels () { - return (int)/*64*/OS.SendMessage (handle, OS.TVM_GETITEMHEIGHT, 0, 0); + return (int)OS.SendMessage (handle, OS.TVM_GETITEMHEIGHT, 0, 0); } /** @@ -3306,14 +3306,14 @@ int getItemHeightInPixels () { */ public TreeItem [] getItems () { checkWidget (); - long /*int*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); + long hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); if (hItem == 0) return new TreeItem [0]; return getItems (hItem); } -TreeItem [] getItems (long /*int*/ hTreeItem) { +TreeItem [] getItems (long hTreeItem) { int count = 0; - long /*int*/ hItem = hTreeItem; + long hItem = hTreeItem; while (hItem != 0) { hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXT, hItem); count++; @@ -3332,7 +3332,7 @@ TreeItem [] getItems (long /*int*/ hTreeItem) { */ while (tvItem.hItem != 0) { OS.SendMessage (handle, OS.TVM_GETITEM, 0, tvItem); - TreeItem item = _getItem (tvItem.hItem, (int)/*64*/tvItem.lParam); + TreeItem item = _getItem (tvItem.hItem, (int)tvItem.lParam); if (item != null) result [index++] = item; tvItem.hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXT, tvItem.hItem); } @@ -3369,12 +3369,12 @@ public boolean getLinesVisible () { return linesVisible; } -long /*int*/ getNextSelection (long /*int*/ hItem) { +long getNextSelection (long hItem) { while (hItem != 0) { - int state = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETITEMSTATE, hItem, OS.TVIS_SELECTED); + int state = (int)OS.SendMessage (handle, OS.TVM_GETITEMSTATE, hItem, OS.TVIS_SELECTED); if ((state & OS.TVIS_SELECTED) != 0) return hItem; - long /*int*/ hFirstItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, hItem); - long /*int*/ hSelected = getNextSelection (hFirstItem); + long hFirstItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, hItem); + long hSelected = getNextSelection (hFirstItem); if (hSelected != 0) return hSelected; hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXT, hItem); } @@ -3398,7 +3398,7 @@ public TreeItem getParentItem () { return null; } -int getSelection (long /*int*/ hItem, TVITEM tvItem, TreeItem [] selection, int index, int count, boolean bigSelection, boolean all) { +int getSelection (long hItem, TVITEM tvItem, TreeItem [] selection, int index, int count, boolean bigSelection, boolean all) { while (hItem != 0) { boolean expanded = true; if (bigSelection) { @@ -3406,7 +3406,7 @@ int getSelection (long /*int*/ hItem, TVITEM tvItem, TreeItem [] selection, int OS.SendMessage (handle, OS.TVM_GETITEM, 0, tvItem); if ((tvItem.state & OS.TVIS_SELECTED) != 0) { if (selection != null && index < selection.length) { - TreeItem item = _getItem (hItem, (int)/*64*/tvItem.lParam); + TreeItem item = _getItem (hItem, (int)tvItem.lParam); if (item != null) { selection [index] = item; } else { @@ -3417,12 +3417,12 @@ int getSelection (long /*int*/ hItem, TVITEM tvItem, TreeItem [] selection, int } expanded = (tvItem.state & OS.TVIS_EXPANDED) != 0; } else { - int state = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETITEMSTATE, hItem, OS.TVIS_SELECTED | OS.TVIS_EXPANDED); + int state = (int)OS.SendMessage (handle, OS.TVM_GETITEMSTATE, hItem, OS.TVIS_SELECTED | OS.TVIS_EXPANDED); if ((state & OS.TVIS_SELECTED) != 0) { if (tvItem != null && selection != null && index < selection.length) { tvItem.hItem = hItem; OS.SendMessage (handle, OS.TVM_GETITEM, 0, tvItem); - TreeItem item = _getItem (hItem, (int)/*64*/tvItem.lParam); + TreeItem item = _getItem (hItem, (int)tvItem.lParam); if (item != null) { selection [index] = item; } else { @@ -3436,7 +3436,7 @@ int getSelection (long /*int*/ hItem, TVITEM tvItem, TreeItem [] selection, int if (index == count) break; if (all) { if (expanded) { - long /*int*/ hFirstItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, hItem); + long hFirstItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, hItem); if ((index = getSelection (hFirstItem, tvItem, selection, index, count, bigSelection, all)) == count) { break; } @@ -3468,32 +3468,32 @@ int getSelection (long /*int*/ hItem, TVITEM tvItem, TreeItem [] selection, int public TreeItem [] getSelection () { checkWidget (); if ((style & SWT.SINGLE) != 0) { - long /*int*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); + long hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); if (hItem == 0) return new TreeItem [0]; TVITEM tvItem = new TVITEM (); tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_PARAM | OS.TVIF_STATE; tvItem.hItem = hItem; OS.SendMessage (handle, OS.TVM_GETITEM, 0, tvItem); if ((tvItem.state & OS.TVIS_SELECTED) == 0) return new TreeItem [0]; - TreeItem item = _getItem (tvItem.hItem, (int)/*64*/tvItem.lParam); + TreeItem item = _getItem (tvItem.hItem, (int)tvItem.lParam); if (item == null) return new TreeItem [0]; return new TreeItem [] {item}; } int count = 0; TreeItem [] guess = new TreeItem [(style & SWT.VIRTUAL) != 0 ? 8 : 1]; - long /*int*/ oldProc = OS.GetWindowLongPtr (handle, OS.GWLP_WNDPROC); + long oldProc = OS.GetWindowLongPtr (handle, OS.GWLP_WNDPROC); OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, TreeProc); if ((style & SWT.VIRTUAL) != 0) { TVITEM tvItem = new TVITEM (); tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_PARAM | OS.TVIF_STATE; - long /*int*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); + long hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); count = getSelection (hItem, tvItem, guess, 0, -1, false, true); } else { for (int i=0; i<items.length; i++) { TreeItem item = items [i]; if (item != null) { - long /*int*/ hItem = item.handle; - int state = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETITEMSTATE, hItem, OS.TVIS_SELECTED); + long hItem = item.handle; + int state = (int)OS.SendMessage (handle, OS.TVM_GETITEMSTATE, hItem, OS.TVIS_SELECTED); if ((state & OS.TVIS_SELECTED) != 0) { if (count < guess.length) guess [count] = item; count++; @@ -3512,8 +3512,8 @@ public TreeItem [] getSelection () { OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, TreeProc); TVITEM tvItem = new TVITEM (); tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_PARAM | OS.TVIF_STATE; - long /*int*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); - int itemCount = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETCOUNT, 0, 0); + long hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); + int itemCount = (int)OS.SendMessage (handle, OS.TVM_GETCOUNT, 0, 0); boolean bigSelection = result.length > itemCount / 2; if (count != getSelection (hItem, tvItem, result, 0, count, bigSelection, false)) { count = getSelection (hItem, tvItem, result, 0, count, bigSelection, true); @@ -3540,23 +3540,23 @@ public TreeItem [] getSelection () { public int getSelectionCount () { checkWidget (); if ((style & SWT.SINGLE) != 0) { - long /*int*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); + long hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); if (hItem == 0) return 0; - int state = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETITEMSTATE, hItem, OS.TVIS_SELECTED); + int state = (int)OS.SendMessage (handle, OS.TVM_GETITEMSTATE, hItem, OS.TVIS_SELECTED); return (state & OS.TVIS_SELECTED) == 0 ? 0 : 1; } int count = 0; - long /*int*/ oldProc = OS.GetWindowLongPtr (handle, OS.GWLP_WNDPROC); + long oldProc = OS.GetWindowLongPtr (handle, OS.GWLP_WNDPROC); OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, TreeProc); if ((style & SWT.VIRTUAL) != 0) { - long /*int*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); + long hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); count = getSelection (hItem, null, null, 0, -1, false, true); } else { for (int i=0; i<items.length; i++) { TreeItem item = items [i]; if (item != null) { - long /*int*/ hItem = item.handle; - int state = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETITEMSTATE, hItem, OS.TVIS_SELECTED); + long hItem = item.handle; + int state = (int)OS.SendMessage (handle, OS.TVM_GETITEMSTATE, hItem, OS.TVIS_SELECTED); if ((state & OS.TVIS_SELECTED) != 0) count++; } } @@ -3628,11 +3628,11 @@ public int getSortDirection () { */ public TreeItem getTopItem () { checkWidget (); - long /*int*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_FIRSTVISIBLE, 0); + long hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_FIRSTVISIBLE, 0); return hItem != 0 ? _getItem (hItem) : null; } -boolean hitTestSelection (long /*int*/ hItem, int x, int y) { +boolean hitTestSelection (long hItem, int x, int y) { if (hItem == 0) return false; TreeItem item = _getItem (hItem); if (item == null) return false; @@ -3643,12 +3643,12 @@ boolean hitTestSelection (long /*int*/ hItem, int x, int y) { //BUG? - check drag detect int [] order = new int [1], index = new int [1]; - long /*int*/ hDC = OS.GetDC (handle); - long /*int*/ oldFont = 0, newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); + long hDC = OS.GetDC (handle); + long oldFont = 0, newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont); - long /*int*/ hFont = item.fontHandle (order [index [0]]); + long hFont = item.fontHandle (order [index [0]]); if (hFont != -1) hFont = OS.SelectObject (hDC, hFont); - int state = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETITEMSTATE, hItem, OS.TVIS_SELECTED); + int state = (int)OS.SendMessage (handle, OS.TVM_GETITEMSTATE, hItem, OS.TVIS_SELECTED); int detail = (state & OS.TVIS_SELECTED) != 0 ? SWT.SELECTED : 0; Event event = sendMeasureItemEvent (item, order [index [0]], hDC, detail); if (event.getBoundsInPixels ().contains (x, y)) result = true; @@ -3672,8 +3672,8 @@ int imageIndex (Image image, int index) { * times, Windows does work making this operation slow. The fix * is to test for the same image list before setting the new one. */ - long /*int*/ hImageList = imageList.getHandle (); - long /*int*/ hOldImageList = OS.SendMessage (handle, OS.TVM_GETIMAGELIST, OS.TVSIL_NORMAL, 0); + long hImageList = imageList.getHandle (); + long hOldImageList = OS.SendMessage (handle, OS.TVM_GETIMAGELIST, OS.TVSIL_NORMAL, 0); if (hOldImageList != hImageList) { OS.SendMessage (handle, OS.TVM_SETIMAGELIST, OS.TVSIL_NORMAL, hImageList); updateScrollBar (); @@ -3689,7 +3689,7 @@ int imageIndexHeader (Image image) { headerImageList = display.getImageList (style & SWT.RIGHT_TO_LEFT, bounds.width, bounds.height); int index = headerImageList.indexOf (image); if (index == -1) index = headerImageList.add (image); - long /*int*/ hImageList = headerImageList.getHandle (); + long hImageList = headerImageList.getHandle (); if (hwndHeader != 0) { OS.SendMessage (hwndHeader, OS.HDM_SETIMAGELIST, 0, hImageList); } @@ -3754,7 +3754,7 @@ public int indexOf (TreeItem item) { checkWidget (); if (item == null) error (SWT.ERROR_NULL_ARGUMENT); if (item.isDisposed()) error(SWT.ERROR_INVALID_ARGUMENT); - long /*int*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); + long hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); return hItem == 0 ? -1 : findIndex (hItem, item.handle); } @@ -3828,7 +3828,7 @@ boolean isItemSelected (NMTVCUSTOMDRAW nmcd) { void redrawSelection () { if ((style & SWT.SINGLE) != 0) { - long /*int*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); + long hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); if (hItem != 0) { RECT rect = new RECT (); if (OS.TreeView_GetItemRect (handle, hItem, rect, false)) { @@ -3836,12 +3836,12 @@ void redrawSelection () { } } } else { - long /*int*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_FIRSTVISIBLE, 0); + long hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_FIRSTVISIBLE, 0); if (hItem != 0) { RECT rect = new RECT (); - int index = 0, count = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETVISIBLECOUNT, 0, 0); + int index = 0, count = (int)OS.SendMessage (handle, OS.TVM_GETVISIBLECOUNT, 0, 0); while (index <= count && hItem != 0) { - int state = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETITEMSTATE, hItem, OS.TVIS_SELECTED); + int state = (int)OS.SendMessage (handle, OS.TVM_GETITEMSTATE, hItem, OS.TVIS_SELECTED); if ((state & OS.TVIS_SELECTED) != 0) { if (OS.TreeView_GetItemRect (handle, hItem, rect, false)) { OS.InvalidateRect (handle, rect, true); @@ -3861,23 +3861,23 @@ void register () { if (hwndHeader != 0) display.addControl (hwndHeader, this); } -void releaseItem (long /*int*/ hItem, TVITEM tvItem, boolean release) { +void releaseItem (long hItem, TVITEM tvItem, boolean release) { if (hItem == hAnchor) hAnchor = 0; if (hItem == hInsert) hInsert = 0; tvItem.hItem = hItem; if (OS.SendMessage (handle, OS.TVM_GETITEM, 0, tvItem) != 0) { if (tvItem.lParam != -1) { - if (tvItem.lParam < lastID) lastID = (int)/*64*/tvItem.lParam; + if (tvItem.lParam < lastID) lastID = (int)tvItem.lParam; if (release) { - TreeItem item = items [(int)/*64*/tvItem.lParam]; + TreeItem item = items [(int)tvItem.lParam]; if (item != null) item.release (false); } - items [(int)/*64*/tvItem.lParam] = null; + items [(int)tvItem.lParam] = null; } } } -void releaseItems (long /*int*/ hItem, TVITEM tvItem) { +void releaseItems (long hItem, TVITEM tvItem) { hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, hItem); while (hItem != 0) { releaseItems (hItem, tvItem); @@ -3939,7 +3939,7 @@ void releaseWidget () { display.releaseImageList (headerImageList); } imageList = headerImageList = null; - long /*int*/ hStateList = OS.SendMessage (handle, OS.TVM_GETIMAGELIST, OS.TVSIL_STATE, 0); + long hStateList = OS.SendMessage (handle, OS.TVM_GETIMAGELIST, OS.TVSIL_STATE, 0); OS.SendMessage (handle, OS.TVM_SETIMAGELIST, OS.TVSIL_STATE, 0); if (hStateList != 0) OS.ImageList_Destroy (hStateList); if (itemToolTipHandle != 0) OS.DestroyWindow (itemToolTipHandle); @@ -3969,7 +3969,7 @@ public void removeAll () { boolean redraw = getDrawing () && OS.IsWindowVisible (handle); if (redraw) OS.DefWindowProc (handle, OS.WM_SETREDRAW, 0, 0); shrink = ignoreShrink = true; - long /*int*/ result = OS.SendMessage (handle, OS.TVM_DELETEITEM, 0, OS.TVI_ROOT); + long result = OS.SendMessage (handle, OS.TVM_DELETEITEM, 0, OS.TVI_ROOT); ignoreShrink = false; if (redraw) { OS.DefWindowProc (handle, OS.WM_SETREDRAW, 1, 0); @@ -4081,7 +4081,7 @@ void reskinChildren (int flags) { */ public void setInsertMark (TreeItem item, boolean before) { checkWidget (); - long /*int*/ hItem = 0; + long hItem = 0; if (item != null) { if (item.isDisposed()) error(SWT.ERROR_INVALID_ARGUMENT); hItem = item.handle; @@ -4106,11 +4106,11 @@ public void setInsertMark (TreeItem item, boolean before) { public void setItemCount (int count) { checkWidget (); count = Math.max (0, count); - long /*int*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); + long hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); setItemCount (count, OS.TVGN_ROOT, hItem); } -void setItemCount (int count, long /*int*/ hParent, long /*int*/ hItem) { +void setItemCount (int count, long hParent, long hItem) { boolean redraw = false; if (OS.SendMessage (handle, OS.TVM_GETCOUNT, 0, 0) == 0) { redraw = getDrawing () && OS.IsWindowVisible (handle); @@ -4131,14 +4131,14 @@ void setItemCount (int count, long /*int*/ hParent, long /*int*/ hItem) { * with TVIS_EXPANDED, the entire state is returned. The fix is * to explicitly check for the TVIS_EXPANDED bit. */ - int state = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETITEMSTATE, hParent, OS.TVIS_EXPANDED); + int state = (int)OS.SendMessage (handle, OS.TVM_GETITEMSTATE, hParent, OS.TVIS_EXPANDED); expanded = (state & OS.TVIS_EXPANDED) != 0; } while (hItem != 0) { tvItem.hItem = hItem; OS.SendMessage (handle, OS.TVM_GETITEM, 0, tvItem); hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXT, hItem); - TreeItem item = tvItem.lParam != -1 ? items [(int)/*64*/tvItem.lParam] : null; + TreeItem item = tvItem.lParam != -1 ? items [(int)tvItem.lParam] : null; if (item != null && !item.isDisposed ()) { item.dispose (); } else { @@ -4216,18 +4216,18 @@ public void setLinesVisible (boolean show) { } @Override -long /*int*/ scrolledHandle () { +long scrolledHandle () { if (hwndHeader == 0) return handle; return columnCount == 0 && scrollWidth == 0 ? handle : hwndParent; } -void select (long /*int*/ hItem, TVITEM tvItem) { +void select (long hItem, TVITEM tvItem) { while (hItem != 0) { tvItem.hItem = hItem; OS.SendMessage (handle, OS.TVM_SETITEM, 0, tvItem); - int state = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETITEMSTATE, hItem, OS.TVIS_EXPANDED); + int state = (int)OS.SendMessage (handle, OS.TVM_GETITEMSTATE, hItem, OS.TVIS_EXPANDED); if ((state & OS.TVIS_EXPANDED) != 0) { - long /*int*/ hFirstItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, hItem); + long hFirstItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, hItem); select (hFirstItem, tvItem); } @@ -4257,8 +4257,8 @@ public void select (TreeItem item) { if (item == null) error (SWT.ERROR_NULL_ARGUMENT); if (item.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT); if ((style & SWT.SINGLE) != 0) { - long /*int*/ hItem = item.handle; - int state = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETITEMSTATE, hItem, OS.TVIS_SELECTED); + long hItem = item.handle; + int state = (int)OS.SendMessage (handle, OS.TVM_GETITEMSTATE, hItem, OS.TVIS_SELECTED); if ((state & OS.TVIS_SELECTED) != 0) return; /* * Feature in Windows. When an item is selected with @@ -4289,7 +4289,7 @@ public void select (TreeItem item) { } setSelection (item); if (hInfo != null) { - long /*int*/ hThumb = OS.MAKELPARAM (OS.SB_THUMBPOSITION, hInfo.nPos); + long hThumb = OS.MAKELPARAM (OS.SB_THUMBPOSITION, hInfo.nPos); OS.SendMessage (handle, OS.WM_HSCROLL, hThumb, 0); } /* @@ -4302,7 +4302,7 @@ public void select (TreeItem item) { * NOTE: This code is only necessary on Windows Vista. */ OS.SetScrollInfo (handle, OS.SB_VERT, vInfo, true); - long /*int*/ vThumb = OS.MAKELPARAM (OS.SB_THUMBPOSITION, vInfo.nPos); + long vThumb = OS.MAKELPARAM (OS.SB_THUMBPOSITION, vInfo.nPos); OS.SendMessage (handle, OS.WM_VSCROLL, vThumb, 0); if (redraw) { OS.DefWindowProc (handle, OS.WM_SETREDRAW, 1, 0); @@ -4343,9 +4343,9 @@ public void selectAll () { tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_STATE; tvItem.state = OS.TVIS_SELECTED; tvItem.stateMask = OS.TVIS_SELECTED; - long /*int*/ oldProc = OS.GetWindowLongPtr (handle, OS.GWLP_WNDPROC); + long oldProc = OS.GetWindowLongPtr (handle, OS.GWLP_WNDPROC); OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, TreeProc); - long /*int*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); + long hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); select (hItem, tvItem); OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, oldProc); } @@ -4359,7 +4359,7 @@ Event sendEraseItemEvent (TreeItem item, NMTTCUSTOMDRAW nmcd, int column, RECT c data.foreground = OS.GetTextColor (nmcd.hdc); data.background = OS.GetBkColor (nmcd.hdc); data.font = item.getFont (column); - data.uiState = (int)/*64*/OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); + data.uiState = (int)OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); GC gc = GC.win32_new (nmcd.hdc, data); Event event = new Event (); event.item = item; @@ -4376,7 +4376,7 @@ Event sendEraseItemEvent (TreeItem item, NMTTCUSTOMDRAW nmcd, int column, RECT c return event; } -Event sendMeasureItemEvent (TreeItem item, int index, long /*int*/ hDC, int detail) { +Event sendMeasureItemEvent (TreeItem item, int index, long hDC, int detail) { RECT itemRect = item.getBounds (index, true, true, false, false, false, hDC); int nSavedDC = OS.SaveDC (hDC); GCData data = new GCData (); @@ -4415,7 +4415,7 @@ Event sendPaintItemEvent (TreeItem item, NMTTCUSTOMDRAW nmcd, int column, RECT i data.font = item.getFont (column); data.foreground = OS.GetTextColor (nmcd.hdc); data.background = OS.GetBkColor (nmcd.hdc); - data.uiState = (int)/*64*/OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); + data.uiState = (int)OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); GC gc = GC.win32_new (nmcd.hdc, data); Event event = new Event (); event.item = item; @@ -4432,7 +4432,7 @@ Event sendPaintItemEvent (TreeItem item, NMTTCUSTOMDRAW nmcd, int column, RECT i } @Override -void setBackgroundImage (long /*int*/ hBitmap) { +void setBackgroundImage (long hBitmap) { super.setBackgroundImage (hBitmap); if (hBitmap != 0) { /* @@ -4499,7 +4499,7 @@ void setCursor () { * is IDC_ARROW. */ Cursor cursor = findCursor (); - long /*int*/ hCursor = cursor == null ? OS.LoadCursor (0, OS.IDC_ARROW) : cursor.handle; + long hCursor = cursor == null ? OS.LoadCursor (0, OS.IDC_ARROW) : cursor.handle; OS.SetCursor (hCursor); } @@ -4576,12 +4576,12 @@ void setCheckboxImageList () { int count = 5, flags = OS.ILC_COLOR32; if ((style & SWT.RIGHT_TO_LEFT) != 0) flags |= OS.ILC_MIRROR; if (!OS.IsAppThemed ()) flags |= OS.ILC_MASK; - int height = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETITEMHEIGHT, 0, 0), width = height; - long /*int*/ hStateList = OS.ImageList_Create (width, height, flags, count, count); - long /*int*/ hDC = OS.GetDC (handle); - long /*int*/ memDC = OS.CreateCompatibleDC (hDC); - long /*int*/ hBitmap = OS.CreateCompatibleBitmap (hDC, width * count, height); - long /*int*/ hOldBitmap = OS.SelectObject (memDC, hBitmap); + int height = (int)OS.SendMessage (handle, OS.TVM_GETITEMHEIGHT, 0, 0), width = height; + long hStateList = OS.ImageList_Create (width, height, flags, count, count); + long hDC = OS.GetDC (handle); + long memDC = OS.CreateCompatibleDC (hDC); + long hBitmap = OS.CreateCompatibleBitmap (hDC, width * count, height); + long hOldBitmap = OS.SelectObject (memDC, hBitmap); RECT rect = new RECT (); OS.SetRect (rect, 0, 0, width * count, height); /* @@ -4601,10 +4601,10 @@ void setCheckboxImageList () { clrBackground = 0x0200FF00; } } - long /*int*/ hBrush = OS.CreateSolidBrush (clrBackground); + long hBrush = OS.CreateSolidBrush (clrBackground); OS.FillRect (memDC, rect, hBrush); OS.DeleteObject (hBrush); - long /*int*/ oldFont = OS.SelectObject (hDC, defaultFont ()); + long oldFont = OS.SelectObject (hDC, defaultFont ()); TEXTMETRIC tm = new TEXTMETRIC (); OS.GetTextMetrics (hDC, tm); OS.SelectObject (hDC, oldFont); @@ -4624,7 +4624,7 @@ void setCheckboxImageList () { int left = (width - itemWidth) / 2, top = (height - itemHeight) / 2 + 1; OS.SetRect (rect, left + width, top, left + width + itemWidth, top + itemHeight); if (OS.IsAppThemed ()) { - long /*int*/ hTheme = display.hButtonTheme (); + long hTheme = display.hButtonTheme (); OS.DrawThemeBackground (hTheme, memDC, OS.BP_CHECKBOX, OS.CBS_UNCHECKEDNORMAL, rect, null); rect.left += width; rect.right += width; OS.DrawThemeBackground (hTheme, memDC, OS.BP_CHECKBOX, OS.CBS_CHECKEDNORMAL, rect, null); @@ -4650,7 +4650,7 @@ void setCheckboxImageList () { OS.ImageList_AddMasked (hStateList, hBitmap, clrBackground); } OS.DeleteObject (hBitmap); - long /*int*/ hOldStateList = OS.SendMessage (handle, OS.TVM_GETIMAGELIST, OS.TVSIL_STATE, 0); + long hOldStateList = OS.SendMessage (handle, OS.TVM_GETIMAGELIST, OS.TVSIL_STATE, 0); OS.SendMessage (handle, OS.TVM_SETIMAGELIST, OS.TVSIL_STATE, hStateList); if (hOldStateList != 0) OS.ImageList_Destroy (hOldStateList); } @@ -4804,10 +4804,10 @@ public void setRedraw (boolean redraw) { * when redraw is turned on and there are no items in * the tree. */ - long /*int*/ hItem = 0; + long hItem = 0; if (redraw) { if (drawCount == 1) { - int count = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETCOUNT, 0, 0); + int count = (int)OS.SendMessage (handle, OS.TVM_GETCOUNT, 0, 0); if (count == 0) { TVINSERTSTRUCT tvInsert = new TVINSERTSTRUCT (); tvInsert.hInsertAfter = OS.TVI_FIRST; @@ -4873,7 +4873,7 @@ void setScrollWidth (int width) { horizontalBar.setPageIncrement (info.nPage); } OS.GetClientRect (hwndParent, rect); - long /*int*/ hHeap = OS.GetProcessHeap (); + long hHeap = OS.GetProcessHeap (); HDLAYOUT playout = new HDLAYOUT (); playout.prc = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, RECT.sizeof); playout.pwpos = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, WINDOWPOS.sizeof); @@ -4894,7 +4894,7 @@ void setScrollWidth (int width) { ignoreResize = oldIgnore; } -void setSelection (long /*int*/ hItem, TVITEM tvItem, TreeItem [] selection) { +void setSelection (long hItem, TVITEM tvItem, TreeItem [] selection) { while (hItem != 0) { int index = 0; while (index < selection.length) { @@ -4916,7 +4916,7 @@ void setSelection (long /*int*/ hItem, TVITEM tvItem, TreeItem [] selection) { OS.SendMessage (handle, OS.TVM_SETITEM, 0, tvItem); } } - long /*int*/ hFirstItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, hItem); + long hFirstItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, hItem); setSelection (hFirstItem, tvItem, selection); hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXT, hItem); } @@ -4985,8 +4985,8 @@ public void setSelection (TreeItem [] items) { TreeItem item = items [0]; if (item != null) { if (item.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT); - long /*int*/ hOldItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); - long /*int*/ hNewItem = hAnchor = item.handle; + long hOldItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); + long hNewItem = hAnchor = item.handle; /* * Bug in Windows. When TVM_SELECTITEM is used to select and @@ -5010,7 +5010,7 @@ public void setSelection (TreeItem [] items) { ignoreSelect = false; if (OS.SendMessage (handle, OS.TVM_GETVISIBLECOUNT, 0, 0) == 0) { OS.SendMessage (handle, OS.TVM_SELECTITEM, OS.TVGN_FIRSTVISIBLE, hNewItem); - long /*int*/ hParent = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_PARENT, hNewItem); + long hParent = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_PARENT, hNewItem); if (hParent == 0) OS.SendMessage (handle, OS.WM_HSCROLL, OS.SB_TOP, 0); } if (fixScroll) { @@ -5041,10 +5041,10 @@ public void setSelection (TreeItem [] items) { TVITEM tvItem = new TVITEM (); tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_STATE; tvItem.stateMask = OS.TVIS_SELECTED; - long /*int*/ oldProc = OS.GetWindowLongPtr (handle, OS.GWLP_WNDPROC); + long oldProc = OS.GetWindowLongPtr (handle, OS.GWLP_WNDPROC); OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, TreeProc); if ((style & SWT.VIRTUAL) != 0) { - long /*int*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); + long hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); setSelection (hItem, tvItem, items); } else { for (int i=0; i<this.items.length; i++) { @@ -5161,8 +5161,8 @@ public void setTopItem (TreeItem item) { checkWidget (); if (item == null) error (SWT.ERROR_NULL_ARGUMENT); if (item.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT); - long /*int*/ hItem = item.handle; - long /*int*/ hTopItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_FIRSTVISIBLE, 0); + long hItem = item.handle; + long hTopItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_FIRSTVISIBLE, 0); if (hItem == hTopItem) return; boolean fixScroll = checkScroll (hItem), redraw = false; if (fixScroll) { @@ -5174,7 +5174,7 @@ public void setTopItem (TreeItem item) { } SCROLLINFO hInfo = null; int bits = OS.GetWindowLong (handle, OS.GWL_STYLE); - long /*int*/ hParent = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_PARENT, hItem); + long hParent = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_PARENT, hItem); if (hParent != 0 && (bits & (OS.TVS_NOHSCROLL | OS.TVS_NOSCROLL)) == 0) { hInfo = new SCROLLINFO (); hInfo.cbSize = SCROLLINFO.sizeof; @@ -5184,7 +5184,7 @@ public void setTopItem (TreeItem item) { OS.SendMessage (handle, OS.TVM_SELECTITEM, OS.TVGN_FIRSTVISIBLE, hItem); if (hParent != 0) { if (hInfo != null) { - long /*int*/ hThumb = OS.MAKELPARAM (OS.SB_THUMBPOSITION, hInfo.nPos); + long hThumb = OS.MAKELPARAM (OS.SB_THUMBPOSITION, hInfo.nPos); OS.SendMessage (handle, OS.WM_HSCROLL, hThumb, 0); } } else { @@ -5202,7 +5202,7 @@ public void setTopItem (TreeItem item) { updateScrollBar (); } -void showItem (long /*int*/ hItem) { +void showItem (long hItem) { /* * Bug in Windows. When TVM_ENSUREVISIBLE is used to ensure * that an item is visible and the client area of the tree is @@ -5368,17 +5368,17 @@ public void showItem (TreeItem item) { */ public void showSelection () { checkWidget (); - long /*int*/ hItem = 0; + long hItem = 0; if ((style & SWT.SINGLE) != 0) { hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); if (hItem == 0) return; - int state = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETITEMSTATE, hItem, OS.TVIS_SELECTED); + int state = (int)OS.SendMessage (handle, OS.TVM_GETITEMSTATE, hItem, OS.TVIS_SELECTED); if ((state & OS.TVIS_SELECTED) == 0) return; } else { - long /*int*/ oldProc = OS.GetWindowLongPtr (handle, OS.GWLP_WNDPROC); + long oldProc = OS.GetWindowLongPtr (handle, OS.GWLP_WNDPROC); OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, TreeProc); if ((style & SWT.VIRTUAL) != 0) { - long /*int*/ hRoot = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); + long hRoot = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); hItem = getNextSelection (hRoot); } else { //FIXME - this code expands first selected item it finds @@ -5386,7 +5386,7 @@ public void showSelection () { while (index <items.length) { TreeItem item = items [index]; if (item != null) { - int state = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETITEMSTATE, item.handle, OS.TVIS_SELECTED); + int state = (int)OS.SendMessage (handle, OS.TVM_GETITEMSTATE, item.handle, OS.TVIS_SELECTED); if ((state & OS.TVIS_SELECTED) != 0) { hItem = item.handle; break; @@ -5406,8 +5406,8 @@ public void showSelection () { sort (OS.TVI_ROOT, false); } -void sort (long /*int*/ hParent, boolean all) { - int itemCount = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETCOUNT, 0, 0); +void sort (long hParent, boolean all) { + int itemCount = (int)OS.SendMessage (handle, OS.TVM_GETCOUNT, 0, 0); if (itemCount == 0 || itemCount == 1) return; hFirstIndexOf = hLastIndexOf = 0; itemCount = -1; @@ -5415,7 +5415,7 @@ void sort (long /*int*/ hParent, boolean all) { OS.SendMessage (handle, OS.TVM_SORTCHILDREN, all ? 1 : 0, hParent); } else { Callback compareCallback = new Callback (this, "CompareFunc", 3); - long /*int*/ lpfnCompare = compareCallback.getAddress (); + long lpfnCompare = compareCallback.getAddress (); TVSORTCB psort = new TVSORTCB (); psort.hParent = hParent; psort.lpfnCompare = lpfnCompare; @@ -5447,7 +5447,7 @@ RECT toolTipRect (RECT rect) { @Override String toolTipText (NMTTDISPINFO hdr) { - long /*int*/ hwndToolTip = OS.SendMessage (handle, OS.TVM_GETTOOLTIPS, 0, 0); + long hwndToolTip = OS.SendMessage (handle, OS.TVM_GETTOOLTIPS, 0, 0); if (hwndToolTip == hdr.hwndFrom && toolTipText != null) return ""; //$NON-NLS-1$ if (headerToolTipHandle == hdr.hwndFrom) { for (int i=0; i<columnCount; i++) { @@ -5482,7 +5482,7 @@ String toolTipText (NMTTDISPINFO hdr) { } @Override -long /*int*/ topHandle () { +long topHandle () { return hwndParent != 0 ? hwndParent : handle; } @@ -5531,7 +5531,7 @@ void updateHeaderToolTips () { void updateImageList () { if (imageList == null) return; if (hwndHeader == 0) return; - int i = 0, index = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_ORDERTOINDEX, 0, 0); + int i = 0, index = (int)OS.SendMessage (hwndHeader, OS.HDM_ORDERTOINDEX, 0, 0); while (i < items.length) { TreeItem item = items [i]; if (item != null) { @@ -5551,8 +5551,8 @@ void updateImageList () { * times, Windows does work making this operation slow. The fix * is to test for the same image list before setting the new one. */ - long /*int*/ hImageList = i == items.length ? 0 : imageList.getHandle (); - long /*int*/ hOldImageList = OS.SendMessage (handle, OS.TVM_GETIMAGELIST, OS.TVSIL_NORMAL, 0); + long hImageList = i == items.length ? 0 : imageList.getHandle (); + long hOldImageList = OS.SendMessage (handle, OS.TVM_GETIMAGELIST, OS.TVSIL_NORMAL, 0); if (hImageList != hOldImageList) { OS.SendMessage (handle, OS.TVM_SETIMAGELIST, OS.TVSIL_NORMAL, hImageList); } @@ -5625,7 +5625,7 @@ void updateOrientation () { } } } - long /*int*/ hImageList = imageList.getHandle (); + long hImageList = imageList.getHandle (); OS.SendMessage (handle, OS.TVM_SETIMAGELIST, OS.TVSIL_NORMAL, hImageList); } if (hwndHeader != 0) { @@ -5653,7 +5653,7 @@ void updateOrientation () { } } } - long /*int*/ hImageListHeader = headerImageList.getHandle (); + long hImageListHeader = headerImageList.getHandle (); OS.SendMessage (hwndHeader, OS.HDM_SETIMAGELIST, 0, hImageListHeader); } } @@ -5665,7 +5665,7 @@ void updateScrollBar () { SCROLLINFO info = new SCROLLINFO (); info.cbSize = SCROLLINFO.sizeof; info.fMask = OS.SIF_ALL; - int itemCount = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETCOUNT, 0, 0); + int itemCount = (int)OS.SendMessage (handle, OS.TVM_GETCOUNT, 0, 0); if (itemCount == 0) { OS.GetScrollInfo (hwndParent, OS.SB_VERT, info); info.nPage = info.nMax + 1; @@ -5726,12 +5726,12 @@ TCHAR windowClass () { } @Override -long /*int*/ windowProc () { +long windowProc () { return TreeProc; } @Override -long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) { +long windowProc (long hwnd, int msg, long wParam, long lParam) { if (hwndHeader != 0 && hwnd == hwndHeader) { switch (msg) { case OS.WM_CONTEXTMENU: { @@ -5773,7 +5773,7 @@ long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long / OS.ScreenToClient (hwnd, pt); pinfo.x = pt.x; pinfo.y = pt.y; - int index = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_HITTEST, 0, pinfo); + int index = (int)OS.SendMessage (hwndHeader, OS.HDM_HITTEST, 0, pinfo); if (0 <= index && index < columnCount && !columns [index].resizable) { if ((pinfo.flags & (OS.HHT_ONDIVIDER | OS.HHT_ONDIVOPEN)) != 0) { OS.SetCursor (OS.LoadCursor (0, OS.IDC_ARROW)); @@ -5797,7 +5797,7 @@ long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long / setScrollWidth (); if (ignoreResize) return 0; setResizeChildren (false); - long /*int*/ code = callWindowProc (hwnd, OS.WM_SIZE, wParam, lParam); + long code = callWindowProc (hwnd, OS.WM_SIZE, wParam, lParam); sendEvent (SWT.Resize); if (isDisposed ()) return 0; if (layout != null) { @@ -5854,7 +5854,7 @@ long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long / info.nPos = info.nTrackPos; } OS.SetScrollInfo (handle, OS.SB_VERT, info, true); - long /*int*/ code = OS.SendMessage (handle, OS.WM_VSCROLL, wParam, lParam); + long code = OS.SendMessage (handle, OS.WM_VSCROLL, wParam, lParam); OS.GetScrollInfo (handle, OS.SB_VERT, info); OS.SetScrollInfo (hwndParent, OS.SB_VERT, info, true); return code; @@ -5871,7 +5871,7 @@ long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long / * selected. */ if ((style & SWT.MULTI) != 0 || hooks (SWT.EraseItem) || hooks (SWT.PaintItem)) { - long /*int*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_FIRSTVISIBLE, 0); + long hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_FIRSTVISIBLE, 0); TreeItem [] items = new TreeItem [10]; TVITEM tvItem = new TVITEM (); tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_PARAM | OS.TVIF_STATE; @@ -5896,7 +5896,7 @@ long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long / rect.left = Math.max (rect.left, clientRect.left); rect.right = Math.min (rect.right, clientRect.right); } - long /*int*/ hRgn = OS.CreateRectRgn (rect.left, rect.top, rect.right, rect.bottom); + long hRgn = OS.CreateRectRgn (rect.left, rect.top, rect.right, rect.bottom); for (int i = 1; i < count; i++) { if (rect.bottom - rect.top > DRAG_IMAGE_SIZE) break; if (rect.bottom > clientRect.bottom) break; @@ -5908,7 +5908,7 @@ long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long / itemRect.left = Math.max (itemRect.left, clientRect.left); itemRect.right = Math.min (itemRect.right, clientRect.right); } - long /*int*/ rectRgn = OS.CreateRectRgn (itemRect.left, itemRect.top, itemRect.right, itemRect.bottom); + long rectRgn = OS.CreateRectRgn (itemRect.left, itemRect.top, itemRect.right, itemRect.bottom); OS.CombineRgn (hRgn, hRgn, rectRgn, OS.RGN_OR); OS.DeleteObject (rectRgn); rect.bottom = itemRect.bottom; @@ -5917,8 +5917,8 @@ long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long / OS.GetRgnBox (hRgn, rect); /* Create resources */ - long /*int*/ hdc = OS.GetDC (handle); - long /*int*/ memHdc = OS.CreateCompatibleDC (hdc); + long hdc = OS.GetDC (handle); + long memHdc = OS.CreateCompatibleDC (hdc); BITMAPINFOHEADER bmiHeader = new BITMAPINFOHEADER (); bmiHeader.biSize = BITMAPINFOHEADER.sizeof; bmiHeader.biWidth = rect.right - rect.left; @@ -5928,10 +5928,10 @@ long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long / bmiHeader.biCompression = OS.BI_RGB; byte [] bmi = new byte [BITMAPINFOHEADER.sizeof]; OS.MoveMemory (bmi, bmiHeader, BITMAPINFOHEADER.sizeof); - long /*int*/ [] pBits = new long /*int*/ [1]; - long /*int*/ memDib = OS.CreateDIBSection (0, bmi, OS.DIB_RGB_COLORS, pBits, 0, 0); + long [] pBits = new long [1]; + long memDib = OS.CreateDIBSection (0, bmi, OS.DIB_RGB_COLORS, pBits, 0, 0); if (memDib == 0) error (SWT.ERROR_NO_HANDLES); - long /*int*/ oldMemBitmap = OS.SelectObject (memHdc, memDib); + long oldMemBitmap = OS.SelectObject (memHdc, memDib); int colorKey = 0x0000FD; POINT pt = new POINT (); OS.SetWindowOrgEx (memHdc, rect.left, rect.top, pt); @@ -5963,7 +5963,7 @@ long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long / } @Override -LRESULT WM_CHAR (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_CHAR (long wParam, long lParam) { LRESULT result = super.WM_CHAR (wParam, lParam); if (result != null) return result; /* @@ -5975,9 +5975,9 @@ LRESULT WM_CHAR (long /*int*/ wParam, long /*int*/ lParam) { * The fix is to avoid calling the tree window * proc in these cases. */ - switch ((int)/*64*/wParam) { + switch ((int)wParam) { case ' ': { - long /*int*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); + long hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); if (hItem != 0) { hAnchor = hItem; OS.SendMessage (handle, OS.TVM_ENSUREVISIBLE, 0, hItem); @@ -5995,8 +5995,8 @@ LRESULT WM_CHAR (long /*int*/ wParam, long /*int*/ lParam) { } tvItem.state = state << 12; OS.SendMessage (handle, OS.TVM_SETITEM, 0, tvItem); - long /*int*/ id = OS.SendMessage (handle, OS.TVM_MAPHTREEITEMTOACCID, hItem, 0); - OS.NotifyWinEvent (OS.EVENT_OBJECT_FOCUS, handle, OS.OBJID_CLIENT, (int)/*64*/id); + long id = OS.SendMessage (handle, OS.TVM_MAPHTREEITEMTOACCID, hItem, 0); + OS.NotifyWinEvent (OS.EVENT_OBJECT_FOCUS, handle, OS.OBJID_CLIENT, (int)id); } tvItem.stateMask = OS.TVIS_SELECTED; OS.SendMessage (handle, OS.TVM_GETITEM, 0, tvItem); @@ -6010,7 +6010,7 @@ LRESULT WM_CHAR (long /*int*/ wParam, long /*int*/ lParam) { tvItem.state |= OS.TVIS_SELECTED; } OS.SendMessage (handle, OS.TVM_SETITEM, 0, tvItem); - TreeItem item = _getItem (hItem, (int)/*64*/tvItem.lParam); + TreeItem item = _getItem (hItem, (int)tvItem.lParam); Event event = new Event (); event.item = item; sendSelectionEvent (SWT.Selection, event, false); @@ -6033,7 +6033,7 @@ LRESULT WM_CHAR (long /*int*/ wParam, long /*int*/ lParam) { * using NM_RETURN. */ Event event = new Event (); - long /*int*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); + long hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); if (hItem != 0) event.item = _getItem (hItem); sendSelectionEvent (SWT.DefaultSelection, event, false); return LRESULT.ZERO; @@ -6045,7 +6045,7 @@ LRESULT WM_CHAR (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_ERASEBKGND (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_ERASEBKGND (long wParam, long lParam) { LRESULT result = super.WM_ERASEBKGND (wParam, lParam); if ((style & SWT.DOUBLE_BUFFERED) != 0) return LRESULT.ONE; if (findImageControl () != null) return LRESULT.ONE; @@ -6053,7 +6053,7 @@ LRESULT WM_ERASEBKGND (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_GETOBJECT (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_GETOBJECT (long wParam, long lParam) { /* * Ensure that there is an accessible object created for this * control because support for checked item and tree column @@ -6067,7 +6067,7 @@ LRESULT WM_GETOBJECT (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_HSCROLL (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_HSCROLL (long wParam, long lParam) { boolean fixScroll = false; if ((style & SWT.DOUBLE_BUFFERED) != 0) { fixScroll = (style & SWT.VIRTUAL) != 0 || hooks (SWT.EraseItem) || hooks (SWT.PaintItem); @@ -6090,10 +6090,10 @@ LRESULT WM_HSCROLL (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_KEYDOWN (long wParam, long lParam) { LRESULT result = super.WM_KEYDOWN (wParam, lParam); if (result != null) return result; - switch ((int)/*64*/wParam) { + switch ((int)wParam) { case OS.VK_LEFT: case OS.VK_RIGHT: /* @@ -6105,7 +6105,7 @@ LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) { */ boolean isRTL = (style & SWT.RIGHT_TO_LEFT) != 0; if (isRTL != createdAsRTL) { - long /*int*/ code = callWindowProc (handle, OS.WM_KEYDOWN, wParam == OS.VK_RIGHT ? OS.VK_LEFT : OS.VK_RIGHT, lParam); + long code = callWindowProc (handle, OS.WM_KEYDOWN, wParam == OS.VK_RIGHT ? OS.VK_LEFT : OS.VK_RIGHT, lParam); return new LRESULT (code); } break; @@ -6141,17 +6141,17 @@ LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) { if (itemToolTipHandle != 0) OS.ShowWindow (itemToolTipHandle, OS.SW_HIDE); if ((style & SWT.SINGLE) != 0) break; if (OS.GetKeyState (OS.VK_SHIFT) < 0) { - long /*int*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); + long hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); if (hItem != 0) { if (hAnchor == 0) hAnchor = hItem; ignoreSelect = ignoreDeselect = true; - long /*int*/ code = callWindowProc (handle, OS.WM_KEYDOWN, wParam, lParam); + long code = callWindowProc (handle, OS.WM_KEYDOWN, wParam, lParam); ignoreSelect = ignoreDeselect = false; - long /*int*/ hNewItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); + long hNewItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); TVITEM tvItem = new TVITEM (); tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_STATE; tvItem.stateMask = OS.TVIS_SELECTED; - long /*int*/ hDeselectItem = hItem; + long hDeselectItem = hItem; RECT rect1 = new RECT (); if (!OS.TreeView_GetItemRect (handle, hAnchor, rect1, false)) { hAnchor = hItem; @@ -6165,7 +6165,7 @@ LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) { OS.SendMessage (handle, OS.TVM_SETITEM, 0, tvItem); hDeselectItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, flags, hDeselectItem); } - long /*int*/ hSelectItem = hAnchor; + long hSelectItem = hAnchor; OS.TreeView_GetItemRect (handle, hNewItem, rect1, false); OS.TreeView_GetItemRect (handle, hSelectItem, rect2, false); tvItem.state = OS.TVIS_SELECTED; @@ -6181,13 +6181,13 @@ LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) { tvItem.hItem = hNewItem; OS.SendMessage (handle, OS.TVM_GETITEM, 0, tvItem); Event event = new Event (); - event.item = _getItem (hNewItem, (int)/*64*/tvItem.lParam); + event.item = _getItem (hNewItem, (int)tvItem.lParam); sendSelectionEvent (SWT.Selection, event, false); return new LRESULT (code); } } if (OS.GetKeyState (OS.VK_CONTROL) < 0) { - long /*int*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); + long hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); if (hItem != 0) { TVITEM tvItem = new TVITEM (); tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_STATE; @@ -6195,8 +6195,8 @@ LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) { tvItem.hItem = hItem; OS.SendMessage (handle, OS.TVM_GETITEM, 0, tvItem); boolean oldSelected = (tvItem.state & OS.TVIS_SELECTED) != 0; - long /*int*/ hNewItem = 0; - switch ((int)/*64*/wParam) { + long hNewItem = 0; + switch ((int)wParam) { case OS.VK_UP: hNewItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_PREVIOUSVISIBLE, hItem); break; @@ -6218,7 +6218,7 @@ LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) { OS.GetClientRect (handle, clientRect); hNewItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_FIRSTVISIBLE, 0); do { - long /*int*/ hVisible = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXTVISIBLE, hNewItem); + long hVisible = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXTVISIBLE, hNewItem); if (hVisible == 0) break; if (!OS.TreeView_GetItemRect (handle, hVisible, rect, false)) break; if (rect.bottom > clientRect.bottom) break; @@ -6269,7 +6269,7 @@ LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) { } } } - long /*int*/ code = callWindowProc (handle, OS.WM_KEYDOWN, wParam, lParam); + long code = callWindowProc (handle, OS.WM_KEYDOWN, wParam, lParam); hAnchor = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); return new LRESULT (code); } @@ -6278,7 +6278,7 @@ LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_KILLFOCUS (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_KILLFOCUS (long wParam, long lParam) { /* * Bug in Windows. When a tree item that has an image * with alpha is expanded or collapsed, the area where @@ -6305,7 +6305,7 @@ LRESULT WM_KILLFOCUS (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_LBUTTONDBLCLK (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_LBUTTONDBLCLK (long wParam, long lParam) { TVHITTESTINFO lpht = new TVHITTESTINFO (); lpht.x = OS.GET_X_LPARAM (lParam); lpht.y = OS.GET_Y_LPARAM (lParam); @@ -6339,10 +6339,10 @@ LRESULT WM_LBUTTONDBLCLK (long /*int*/ wParam, long /*int*/ lParam) { } tvItem.state = state << 12; OS.SendMessage (handle, OS.TVM_SETITEM, 0, tvItem); - long /*int*/ id = OS.SendMessage (handle, OS.TVM_MAPHTREEITEMTOACCID, tvItem.hItem, 0); - OS.NotifyWinEvent (OS.EVENT_OBJECT_FOCUS, handle, OS.OBJID_CLIENT, (int)/*64*/id); + long id = OS.SendMessage (handle, OS.TVM_MAPHTREEITEMTOACCID, tvItem.hItem, 0); + OS.NotifyWinEvent (OS.EVENT_OBJECT_FOCUS, handle, OS.OBJID_CLIENT, (int)id); Event event = new Event (); - event.item = _getItem (tvItem.hItem, (int)/*64*/tvItem.lParam); + event.item = _getItem (tvItem.hItem, (int)tvItem.lParam); event.detail = SWT.CHECK; sendSelectionEvent (SWT.Selection, event, false); return LRESULT.ZERO; @@ -6373,7 +6373,7 @@ LRESULT WM_LBUTTONDBLCLK (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_LBUTTONDOWN (long wParam, long lParam) { /* * In a multi-select tree, if the user is collapsing a subtree that * contains selected items, clear the selection from these items and @@ -6395,7 +6395,7 @@ LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) { return LRESULT.ZERO; } boolean fixSelection = false, deselected = false; - long /*int*/ hOldSelection = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); + long hOldSelection = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); if (lpht.hItem != 0 && (style & SWT.MULTI) != 0) { if (hOldSelection != 0) { TVITEM tvItem = new TVITEM (); @@ -6405,7 +6405,7 @@ LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) { if ((tvItem.state & OS.TVIS_EXPANDED) != 0) { fixSelection = true; tvItem.stateMask = OS.TVIS_SELECTED; - long /*int*/ hNext = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXTVISIBLE, lpht.hItem); + long hNext = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXTVISIBLE, lpht.hItem); while (hNext != 0) { if (hNext == hAnchor) hAnchor = 0; tvItem.hItem = hNext; @@ -6413,7 +6413,7 @@ LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) { if ((tvItem.state & OS.TVIS_SELECTED) != 0) deselected = true; tvItem.state = 0; OS.SendMessage (handle, OS.TVM_SETITEM, 0, tvItem); - long /*int*/ hItem = hNext = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXTVISIBLE, hNext); + long hItem = hNext = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXTVISIBLE, hNext); while (hItem != 0 && hItem != lpht.hItem) { hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_PARENT, hItem); } @@ -6427,14 +6427,14 @@ LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) { hSelect = lpht.hItem; ignoreDeselect = ignoreSelect = lockSelection = true; } - long /*int*/ code = callWindowProc (handle, OS.WM_LBUTTONDOWN, wParam, lParam); + long code = callWindowProc (handle, OS.WM_LBUTTONDOWN, wParam, lParam); /* Bug 225404 */ if (OS.GetFocus () != handle) OS.SetFocus (handle); if (fixSelection) { hSelect = 0; ignoreDeselect = ignoreSelect = lockSelection = false; } - long /*int*/ hNewSelection = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); + long hNewSelection = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); if (hOldSelection != hNewSelection) hAnchor = hNewSelection; if (dragStarted) { if (!display.captureChanged && !isDisposed ()) { @@ -6455,7 +6455,7 @@ LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) { int bits = OS.GetWindowLong (handle, OS.GWL_STYLE); if ((bits & OS.TVS_FULLROWSELECT) == 0) { if (OS.SendMessage (handle, OS.TVM_GETIMAGELIST, OS.TVSIL_NORMAL, 0) == 0) { - long /*int*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); + long hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); if (hItem != 0) { RECT rect = new RECT (); if (OS.TreeView_GetItemRect (handle, hItem, rect, false)) { @@ -6501,10 +6501,10 @@ LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) { } tvItem.state = state << 12; OS.SendMessage (handle, OS.TVM_SETITEM, 0, tvItem); - long /*int*/ id = OS.SendMessage (handle, OS.TVM_MAPHTREEITEMTOACCID, tvItem.hItem, 0); - OS.NotifyWinEvent (OS.EVENT_OBJECT_FOCUS, handle, OS.OBJID_CLIENT, (int)/*64*/id); + long id = OS.SendMessage (handle, OS.TVM_MAPHTREEITEMTOACCID, tvItem.hItem, 0); + OS.NotifyWinEvent (OS.EVENT_OBJECT_FOCUS, handle, OS.OBJID_CLIENT, (int)id); Event event = new Event (); - event.item = _getItem (tvItem.hItem, (int)/*64*/tvItem.lParam); + event.item = _getItem (tvItem.hItem, (int)tvItem.lParam); event.detail = SWT.CHECK; sendSelectionEvent (SWT.Selection, event, false); return LRESULT.ZERO; @@ -6545,7 +6545,7 @@ LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) { } return LRESULT.ZERO; } - long /*int*/ code = callWindowProc (handle, OS.WM_LBUTTONDOWN, wParam, lParam); + long code = callWindowProc (handle, OS.WM_LBUTTONDOWN, wParam, lParam); /* Bug 225404 */ if (OS.GetFocus () != handle) OS.SetFocus (handle); if (!display.captureChanged && !isDisposed ()) { @@ -6567,7 +6567,7 @@ LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) { } /* Get the selected state of the last selected item */ - long /*int*/ hOldItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); + long hOldItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); if ((style & SWT.MULTI) != 0) { tvItem.hItem = hOldItem; OS.SendMessage (handle, OS.TVM_GETITEM, 0, tvItem); @@ -6597,7 +6597,7 @@ LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) { * In SWT, the InvalidateRect() that caused the pixel corruption * is found in Composite.WM_UPDATEUISTATE(). */ - int uiState = (int)/*64*/OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); + int uiState = (int)OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0); if ((uiState & OS.UISF_HIDEFOCUS) != 0) { OS.SendMessage (handle, OS.WM_CHANGEUISTATE, OS.UIS_INITIALIZE, 0); } @@ -6620,10 +6620,10 @@ LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) { hSelect = lpht.hItem; dragStarted = gestureCompleted = false; ignoreDeselect = ignoreSelect = true; - long /*int*/ code = callWindowProc (handle, OS.WM_LBUTTONDOWN, wParam, lParam); + long code = callWindowProc (handle, OS.WM_LBUTTONDOWN, wParam, lParam); /* Bug 225404 */ if (OS.GetFocus () != handle) OS.SetFocus (handle); - long /*int*/ hNewItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); + long hNewItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); if (fakeSelection) { if (hOldItem == 0 || (hNewItem == hOldItem && lpht.hItem != hOldItem)) { OS.SendMessage (handle, OS.TVM_SELECTITEM, OS.TVGN_CARET, lpht.hItem); @@ -6696,10 +6696,10 @@ LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) { if ((wParam & OS.MK_CONTROL) == 0) { if (!hittestSelected || !dragStarted) { tvItem.state = 0; - long /*int*/ oldProc = OS.GetWindowLongPtr (handle, OS.GWLP_WNDPROC); + long oldProc = OS.GetWindowLongPtr (handle, OS.GWLP_WNDPROC); OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, TreeProc); if ((style & SWT.VIRTUAL) != 0) { - long /*int*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); + long hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); deselect (hItem, tvItem, hNewItem); } else { for (int i=0; i<items.length; i++) { @@ -6722,7 +6722,7 @@ LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) { if (OS.TreeView_GetItemRect (handle, hNewItem, rect2, false)) { int flags = rect1.top < rect2.top ? OS.TVGN_NEXTVISIBLE : OS.TVGN_PREVIOUSVISIBLE; tvItem.state = OS.TVIS_SELECTED; - long /*int*/ hItem = tvItem.hItem = hAnchor; + long hItem = tvItem.hItem = hAnchor; OS.SendMessage (handle, OS.TVM_SETITEM, 0, tvItem); while (hItem != hNewItem) { tvItem.hItem = hItem; @@ -6743,7 +6743,7 @@ LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) { tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_PARAM; OS.SendMessage (handle, OS.TVM_GETITEM, 0, tvItem); Event event = new Event (); - event.item = _getItem (tvItem.hItem, (int)/*64*/tvItem.lParam); + event.item = _getItem (tvItem.hItem, (int)tvItem.lParam); sendSelectionEvent (SWT.Selection, event, false); } gestureCompleted = false; @@ -6769,7 +6769,7 @@ LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_MOUSEMOVE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_MOUSEMOVE (long wParam, long lParam) { Display display = this.display; LRESULT result = super.WM_MOUSEMOVE (wParam, lParam); if (result != null) return result; @@ -6819,21 +6819,21 @@ LRESULT WM_MOUSEMOVE (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_MOUSEWHEEL (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_MOUSEWHEEL (long wParam, long lParam) { LRESULT result = super.WM_MOUSEWHEEL (wParam, lParam); if (itemToolTipHandle != 0) OS.ShowWindow (itemToolTipHandle, OS.SW_HIDE); return result; } @Override -LRESULT WM_MOVE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_MOVE (long wParam, long lParam) { if (itemToolTipHandle != 0) OS.ShowWindow (itemToolTipHandle, OS.SW_HIDE); if (ignoreResize) return null; return super.WM_MOVE (wParam, lParam); } @Override -LRESULT WM_RBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_RBUTTONDOWN (long wParam, long lParam) { /* * Feature in Windows. The receiver uses WM_RBUTTONDOWN * to initiate a drag/drop operation depending on how the @@ -6904,7 +6904,7 @@ LRESULT WM_RBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_PAINT (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_PAINT (long wParam, long lParam) { if ((state & DISPOSE_SENT) != 0) return LRESULT.ZERO; if (shrink && !ignoreShrink && items != null) { @@ -6926,12 +6926,12 @@ LRESULT WM_PAINT (long /*int*/ wParam, long /*int*/ lParam) { if ((style & SWT.DOUBLE_BUFFERED) != 0 || findImageControl () != null) { boolean doubleBuffer = true; if (explorerTheme) { - int exStyle = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETEXTENDEDSTYLE, 0, 0); + int exStyle = (int)OS.SendMessage (handle, OS.TVM_GETEXTENDEDSTYLE, 0, 0); if ((exStyle & OS.TVS_EX_DOUBLEBUFFER) != 0) doubleBuffer = false; } if (doubleBuffer) { GC gc = null; - long /*int*/ paintDC = 0; + long paintDC = 0; PAINTSTRUCT ps = new PAINTSTRUCT (); boolean hooksPaint = hooks (SWT.Paint) || filters (SWT.Paint); if (hooksPaint) { @@ -6946,12 +6946,12 @@ LRESULT WM_PAINT (long /*int*/ wParam, long /*int*/ lParam) { int width = ps.right - ps.left; int height = ps.bottom - ps.top; if (width != 0 && height != 0) { - long /*int*/ hDC = OS.CreateCompatibleDC (paintDC); + long hDC = OS.CreateCompatibleDC (paintDC); POINT lpPoint1 = new POINT (), lpPoint2 = new POINT (); OS.SetWindowOrgEx (hDC, ps.left, ps.top, lpPoint1); OS.SetBrushOrgEx (hDC, ps.left, ps.top, lpPoint2); - long /*int*/ hBitmap = OS.CreateCompatibleBitmap (paintDC, width, height); - long /*int*/ hOldBitmap = OS.SelectObject (hDC, hBitmap); + long hBitmap = OS.CreateCompatibleBitmap (paintDC, width, height); + long hOldBitmap = OS.SelectObject (hDC, hBitmap); RECT rect = new RECT (); OS.SetRect (rect, ps.left, ps.top, ps.right, ps.bottom); drawBackground (hDC, rect); @@ -6983,7 +6983,7 @@ LRESULT WM_PAINT (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_SETCURSOR (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SETCURSOR (long wParam, long lParam) { LRESULT result = super.WM_SETCURSOR (wParam, lParam); if (result != null) return result; @@ -7006,7 +7006,7 @@ LRESULT WM_SETCURSOR (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_SETFOCUS (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SETFOCUS (long wParam, long lParam) { /* * Bug in Windows. When a tree item that has an image * with alpha is expanded or collapsed, the area where @@ -7033,7 +7033,7 @@ LRESULT WM_SETFOCUS (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_SETFONT (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SETFONT (long wParam, long lParam) { LRESULT result = super.WM_SETFONT (wParam, lParam); if (result != null) return result; if (hwndHeader != 0) { @@ -7059,7 +7059,7 @@ LRESULT WM_SETFONT (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_SETREDRAW (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SETREDRAW (long wParam, long lParam) { LRESULT result = super.WM_SETREDRAW (wParam, lParam); if (result != null) return result; if (itemToolTipHandle != 0) OS.ShowWindow (itemToolTipHandle, OS.SW_HIDE); @@ -7074,12 +7074,12 @@ LRESULT WM_SETREDRAW (long /*int*/ wParam, long /*int*/ lParam) { * NOTE: This problem is intermittent and happens on * Windows Vista running under the theme manager. */ - long /*int*/ code = OS.DefWindowProc (handle, OS.WM_SETREDRAW, wParam, lParam); + long code = OS.DefWindowProc (handle, OS.WM_SETREDRAW, wParam, lParam); return code == 0 ? LRESULT.ZERO : new LRESULT (code); } @Override -LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SIZE (long wParam, long lParam) { if (itemToolTipHandle != 0) OS.ShowWindow (itemToolTipHandle, OS.SW_HIDE); /* * Bug in Windows. When TVS_NOHSCROLL is set when the @@ -7106,7 +7106,7 @@ LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_SYSCOLORCHANGE (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_SYSCOLORCHANGE (long wParam, long lParam) { LRESULT result = super.WM_SYSCOLORCHANGE (wParam, lParam); if (result != null) return result; /* @@ -7123,7 +7123,7 @@ LRESULT WM_SYSCOLORCHANGE (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_VSCROLL (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_VSCROLL (long wParam, long lParam) { boolean fixScroll = false; if ((style & SWT.DOUBLE_BUFFERED) != 0) { int code = OS.LOWORD (wParam); @@ -7156,7 +7156,7 @@ LRESULT WM_VSCROLL (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT WM_TIMER (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT WM_TIMER (long wParam, long lParam) { LRESULT result = super.WM_TIMER (wParam, lParam); if (result != null) return result; @@ -7170,7 +7170,7 @@ LRESULT WM_TIMER (long /*int*/ wParam, long /*int*/ lParam) { * Note: Just killing the timer could cause some internal clean up task related to the * animation not to run. */ - long /*int*/ bits = OS.SendMessage (handle, OS.TVM_GETEXTENDEDSTYLE, 0, 0); + long bits = OS.SendMessage (handle, OS.TVM_GETEXTENDEDSTYLE, 0, 0); if ((bits & OS.TVS_EX_FADEINOUTEXPANDOS) != 0) { if (!OS.IsWindowVisible (handle)) { if (lastTimerID == wParam) { @@ -7193,7 +7193,7 @@ LRESULT WM_TIMER (long /*int*/ wParam, long /*int*/ lParam) { }; @Override -LRESULT wmColorChild (long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmColorChild (long wParam, long lParam) { if (findImageControl () != null) { return new LRESULT (OS.GetStockObject (OS.NULL_BRUSH)); } @@ -7208,7 +7208,7 @@ LRESULT wmColorChild (long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT wmNotify (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmNotify (NMHDR hdr, long wParam, long lParam) { if (hdr.hwndFrom == itemToolTipHandle) { LRESULT result = wmNotifyToolTip (hdr, wParam, lParam); if (result != null) return result; @@ -7221,7 +7221,7 @@ LRESULT wmNotify (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { } @Override -LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmNotifyChild (NMHDR hdr, long wParam, long lParam) { switch (hdr.code) { case OS.TVN_GETDISPINFO: { NMTVDISPINFO lptvdi = new NMTVDISPINFO (); @@ -7248,7 +7248,7 @@ LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { */ if (!ignoreShrink) { if (items != null && lptvdi.lParam != -1) { - if (items [(int)/*64*/lptvdi.lParam] != null && items [(int)/*64*/lptvdi.lParam].cached) { + if (items [(int)lptvdi.lParam] != null && items [(int)lptvdi.lParam].cached) { checkVisible = false; } } @@ -7277,14 +7277,14 @@ LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { * fix is to query the field from the item instead * of using the struct. */ - int id = (int)/*64*/lptvdi.lParam; + int id = (int)lptvdi.lParam; if ((style & SWT.VIRTUAL) != 0) { if (id == -1) { TVITEM tvItem = new TVITEM (); tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_PARAM; tvItem.hItem = lptvdi.hItem; OS.SendMessage (handle, OS.TVM_GETITEM, 0, tvItem); - id = (int)/*64*/tvItem.lParam; + id = (int)tvItem.lParam; } } TreeItem item = _getItem (lptvdi.hItem, id); @@ -7313,7 +7313,7 @@ LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { } int index = 0; if (hwndHeader != 0) { - index = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_ORDERTOINDEX, 0, 0); + index = (int)OS.SendMessage (hwndHeader, OS.HDM_ORDERTOINDEX, 0, 0); } if ((lptvdi.mask & OS.TVIF_TEXT) != 0) { String string = null; @@ -7475,7 +7475,7 @@ LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { TVITEM tvItem = treeView.itemNew; hAnchor = tvItem.hItem; Event event = new Event (); - event.item = _getItem (tvItem.hItem, (int)/*64*/tvItem.lParam); + event.item = _getItem (tvItem.hItem, (int)tvItem.lParam); sendSelectionEvent (SWT.Selection, event, false); } updateScrollBar (); @@ -7511,7 +7511,7 @@ LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { * items. The fix is to check for null. */ if (items == null) break; - TreeItem item = _getItem (tvItem.hItem, (int)/*64*/tvItem.lParam); + TreeItem item = _getItem (tvItem.hItem, (int)tvItem.lParam); if (item == null) break; Event event = new Event (); event.item = item; @@ -7541,7 +7541,7 @@ LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { * The fix is to detect this case and run the TVN_ITEMEXPANDED * code in this method. */ - long /*int*/ hFirstItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, tvItem.hItem); + long hFirstItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, tvItem.hItem); runExpanded = hFirstItem == 0; } if (!runExpanded) break; @@ -7609,7 +7609,7 @@ LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { return super.wmNotifyChild (hdr, wParam, lParam); } -LRESULT wmNotifyHeader (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmNotifyHeader (NMHDR hdr, long wParam, long lParam) { /* * Feature in Windows. On NT, the automatically created * header control is created as a UNICODE window, not an @@ -7658,7 +7658,7 @@ LRESULT wmNotifyHeader (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { } else if (columns[(int) nmcd.dwItemSpec] == sortColumn && sortDirection != SWT.NONE) { pixel = getSlightlyDifferentColor(pixel); } - long /*int*/ brush = OS.CreateSolidBrush(pixel); + long brush = OS.CreateSolidBrush(pixel); OS.FillRect(nmcd.hdc, rect, brush); OS.DeleteObject(brush); @@ -7683,8 +7683,8 @@ LRESULT wmNotifyHeader (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { if (columns[i] == sortColumn && sortDirection != SWT.NONE) { // the display.getSortImage looks terrible after scaling up. - long /*int*/ pen = OS.CreatePen (OS.PS_SOLID, 1, getHeaderForegroundPixel()); - long /*int*/ oldPen = OS.SelectObject (nmcd.hdc, pen); + long pen = OS.CreatePen (OS.PS_SOLID, 1, getHeaderForegroundPixel()); + long oldPen = OS.SelectObject (nmcd.hdc, pen); int center = rects[i].left + (rects[i].right - rects[i].left) / 2; /* * Sort indicator size needs to scale as per the Native Windows OS DPI level @@ -7705,8 +7705,8 @@ LRESULT wmNotifyHeader (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { /* Windows 7 and 10 always draw a nearly invisible vertical line between the columns, even if lines are disabled. This line uses no fixed color constant, but calculates it from the background color. The method getSlightlyDifferentColor gives us a color, that is near enough to the windows algorithm. */ - long /*int*/ pen = OS.CreatePen (OS.PS_SOLID, getGridLineWidthInPixels(), getSlightlyDifferentColor(getHeaderBackgroundPixel())); - long /*int*/ oldPen = OS.SelectObject (nmcd.hdc, pen); + long pen = OS.CreatePen (OS.PS_SOLID, getGridLineWidthInPixels(), getSlightlyDifferentColor(getHeaderBackgroundPixel())); + long oldPen = OS.SelectObject (nmcd.hdc, pen); OS.Polyline(nmcd.hdc, new int[] {rects[i].right-1, rects[i].top, rects[i].right-1, rects[i].bottom}, 2); OS.SelectObject (nmcd.hdc, oldPen); OS.DeleteObject (pen); @@ -7760,15 +7760,15 @@ LRESULT wmNotifyHeader (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { // draw background of the 'no column' area RECT rect = new RECT(); OS.SetRect(rect, lastColumnRight, nmcd.top, nmcd.right, nmcd.bottom-1); - long /*int*/ brush = OS.CreateSolidBrush(getHeaderBackgroundPixel()); + long brush = OS.CreateSolidBrush(getHeaderBackgroundPixel()); OS.FillRect(nmcd.hdc, rect, brush); OS.DeleteObject(brush); } // always draw the highlighted border at the end, to avoid overdrawing by other borders. if (highlightedHeaderDividerX != -1) { - long /*int*/ pen = OS.CreatePen (OS.PS_SOLID, 4, OS.GetSysColor(OS.COLOR_HIGHLIGHT)); - long /*int*/ oldPen = OS.SelectObject (nmcd.hdc, pen); + long pen = OS.CreatePen (OS.PS_SOLID, 4, OS.GetSysColor(OS.COLOR_HIGHLIGHT)); + long oldPen = OS.SelectObject (nmcd.hdc, pen); OS.Polyline(nmcd.hdc, new int[] {highlightedHeaderDividerX, nmcd.top, highlightedHeaderDividerX, nmcd.bottom}, 2); OS.SelectObject (nmcd.hdc, oldPen); OS.DeleteObject (pen); @@ -7936,7 +7936,7 @@ LRESULT wmNotifyHeader (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { return null; } -LRESULT wmNotifyToolTip (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmNotifyToolTip (NMHDR hdr, long wParam, long lParam) { switch (hdr.code) { case OS.NM_CUSTOMDRAW: { NMTTCUSTOMDRAW nmcd = new NMTTCUSTOMDRAW (); @@ -7969,7 +7969,7 @@ LRESULT wmNotifyToolTip (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) { return null; } -LRESULT wmNotifyToolTip (NMTTCUSTOMDRAW nmcd, long /*int*/ lParam) { +LRESULT wmNotifyToolTip (NMTTCUSTOMDRAW nmcd, long lParam) { switch (nmcd.dwDrawStage) { case OS.CDDS_PREPAINT: { if (isCustomToolTip ()) { @@ -7993,10 +7993,10 @@ LRESULT wmNotifyToolTip (NMTTCUSTOMDRAW nmcd, long /*int*/ lParam) { OS.POINTSTOPOINT (pt, pos); OS.ScreenToClient (handle, pt); if (findCell (pt.x, pt.y, item, index, cellRect, itemRect)) { - long /*int*/ hDC = OS.GetDC (handle); - long /*int*/ hFont = item [0].fontHandle (index [0]); + long hDC = OS.GetDC (handle); + long hFont = item [0].fontHandle (index [0]); if (hFont == -1) hFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0); - long /*int*/ oldFont = OS.SelectObject (hDC, hFont); + long oldFont = OS.SelectObject (hDC, hFont); boolean drawForeground = true; cellRect [0] = item [0].getBounds (index [0], true, true, false, false, false, hDC); if (hooks (SWT.EraseItem)) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeColumn.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeColumn.java index 1cd30929ad..495b10a756 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeColumn.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeColumn.java @@ -321,7 +321,7 @@ public int getWidth () { int getWidthInPixels () { int index = parent.indexOf (this); if (index == -1) return 0; - long /*int*/ hwndHeader = parent.hwndHeader; + long hwndHeader = parent.hwndHeader; if (hwndHeader == 0) return 0; HDITEM hdItem = new HDITEM (); hdItem.mask = OS.HDI_WIDTH; @@ -345,18 +345,18 @@ public void pack () { int index = parent.indexOf (this); if (index == -1) return; int columnWidth = 0; - long /*int*/ hwnd = parent.handle, hwndHeader = parent.hwndHeader; + long hwnd = parent.handle, hwndHeader = parent.hwndHeader; RECT headerRect = new RECT (); OS.SendMessage (hwndHeader, OS.HDM_GETITEMRECT, index, headerRect); - long /*int*/ hDC = OS.GetDC (hwnd); - long /*int*/ oldFont = 0, newFont = OS.SendMessage (hwnd, OS.WM_GETFONT, 0, 0); + long hDC = OS.GetDC (hwnd); + long oldFont = 0, newFont = OS.SendMessage (hwnd, OS.WM_GETFONT, 0, 0); if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont); TVITEM tvItem = new TVITEM (); tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_PARAM | OS.TVIF_STATE; tvItem.hItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); while (tvItem.hItem != 0) { OS.SendMessage (hwnd, OS.TVM_GETITEM, 0, tvItem); - TreeItem item = tvItem.lParam != -1 ? parent.items [(int)/*64*/tvItem.lParam] : null; + TreeItem item = tvItem.lParam != -1 ? parent.items [(int)tvItem.lParam] : null; if (item != null) { int itemRight = 0; if (parent.hooks (SWT.MeasureItem)) { @@ -366,7 +366,7 @@ public void pack () { Rectangle bounds = event.getBoundsInPixels(); itemRight = bounds.x + bounds.width; } else { - long /*int*/ hFont = item.fontHandle (index); + long hFont = item.fontHandle (index); if (hFont != -1) hFont = OS.SelectObject (hDC, hFont); RECT itemRect = item.getBounds (index, true, true, false, false, false, hDC); if (hFont != -1) OS.SelectObject (hDC, hFont); @@ -395,7 +395,7 @@ public void pack () { } int margin = 0; if (hwndHeader != 0) { - margin = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_GETBITMAPMARGIN, 0, 0); + margin = (int)OS.SendMessage (hwndHeader, OS.HDM_GETBITMAPMARGIN, 0, 0); } else { margin = OS.GetSystemMetrics (OS.SM_CXEDGE) * 3; } @@ -493,7 +493,7 @@ public void setAlignment (int alignment) { if (index == -1 || index == 0) return; style &= ~(SWT.LEFT | SWT.RIGHT | SWT.CENTER); style |= alignment & (SWT.LEFT | SWT.RIGHT | SWT.CENTER); - long /*int*/ hwndHeader = parent.hwndHeader; + long hwndHeader = parent.hwndHeader; if (hwndHeader == 0) return; HDITEM hdItem = new HDITEM (); hdItem.mask = OS.HDI_FORMAT; @@ -504,7 +504,7 @@ public void setAlignment (int alignment) { if ((style & SWT.RIGHT) == SWT.RIGHT) hdItem.fmt |= OS.HDF_RIGHT; OS.SendMessage (hwndHeader, OS.HDM_SETITEM, index, hdItem); if (index != 0) { - long /*int*/ hwnd = parent.handle; + long hwnd = parent.handle; parent.forceResize (); RECT rect = new RECT (), headerRect = new RECT (); OS.GetClientRect (hwnd, rect); @@ -530,7 +530,7 @@ public void setImage (Image image) { void setImage (Image image, boolean sort, boolean right) { int index = parent.indexOf (this); if (index == -1) return; - long /*int*/ hwndHeader = parent.hwndHeader; + long hwndHeader = parent.hwndHeader; if (hwndHeader == 0) return; HDITEM hdItem = new HDITEM (); hdItem.mask = OS.HDI_FORMAT | OS.HDI_IMAGE | OS.HDI_BITMAP; @@ -600,7 +600,7 @@ public void setResizable (boolean resizable) { } void setSortDirection (int direction) { - long /*int*/ hwndHeader = parent.hwndHeader; + long hwndHeader = parent.hwndHeader; if (hwndHeader != 0) { int index = parent.indexOf (this); if (index == -1) return; @@ -631,7 +631,7 @@ void setSortDirection (int direction) { } OS.SendMessage (hwndHeader, OS.HDM_SETITEM, index, hdItem); if (OS.IsAppThemed ()) { - long /*int*/ hwnd = parent.handle; + long hwnd = parent.handle; parent.forceResize (); RECT rect = new RECT (), headerRect = new RECT (); OS.GetClientRect (hwnd, rect); @@ -658,17 +658,17 @@ public void setText (String string) { * at the end of the text. The fix is to remove * mnemonic characters. */ - long /*int*/ hHeap = OS.GetProcessHeap (); + long hHeap = OS.GetProcessHeap (); char [] buffer = fixMnemonic (string); int byteCount = buffer.length * TCHAR.sizeof; - long /*int*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); + long pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount); OS.MoveMemory (pszText, buffer, byteCount); - long /*int*/ hwndHeader = parent.hwndHeader; + long hwndHeader = parent.hwndHeader; if (hwndHeader == 0) return; HDITEM hdItem = new HDITEM (); hdItem.mask = OS.HDI_TEXT; hdItem.pszText = pszText; - long /*int*/ result = OS.SendMessage (hwndHeader, OS.HDM_SETITEM, index, hdItem); + long result = OS.SendMessage (hwndHeader, OS.HDM_SETITEM, index, hdItem); if (pszText != 0) OS.HeapFree (hHeap, 0, pszText); if (result == 0) error (SWT.ERROR_CANNOT_SET_TEXT); } @@ -703,7 +703,7 @@ public void setText (String string) { public void setToolTipText (String string) { checkWidget(); toolTipText = string; - long /*int*/ hwndHeaderToolTip = parent.headerToolTipHandle; + long hwndHeaderToolTip = parent.headerToolTipHandle; if (hwndHeaderToolTip == 0) { parent.createHeaderToolTips (); parent.updateHeaderToolTips (); @@ -729,7 +729,7 @@ void setWidthInPixels (int width) { if (width < 0) return; int index = parent.indexOf (this); if (index == -1) return; - long /*int*/ hwndHeader = parent.hwndHeader; + long hwndHeader = parent.hwndHeader; if (hwndHeader == 0) return; HDITEM hdItem = new HDITEM (); hdItem.mask = OS.HDI_WIDTH; @@ -738,7 +738,7 @@ void setWidthInPixels (int width) { RECT headerRect = new RECT (); OS.SendMessage (hwndHeader, OS.HDM_GETITEMRECT, index, headerRect); parent.forceResize (); - long /*int*/ hwnd = parent.handle; + long hwnd = parent.handle; RECT rect = new RECT (); OS.GetClientRect (hwnd, rect); rect.left = headerRect.left; @@ -747,9 +747,9 @@ void setWidthInPixels (int width) { } void updateToolTip (int index) { - long /*int*/ hwndHeaderToolTip = parent.headerToolTipHandle; + long hwndHeaderToolTip = parent.headerToolTipHandle; if (hwndHeaderToolTip != 0) { - long /*int*/ hwndHeader = parent.hwndHeader; + long hwndHeader = parent.hwndHeader; RECT rect = new RECT (); if (OS.SendMessage (hwndHeader, OS.HDM_GETITEMRECT, index, rect) != 0) { TOOLINFO lpti = new TOOLINFO (); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeItem.java index 54aaebb7b7..172cfda00f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeItem.java @@ -50,7 +50,7 @@ public class TreeItem extends Item { * * @noreference This field is not intended to be referenced by clients. */ - public long /*int*/ handle; + public long handle; Tree parent; String [] strings; Image [] images; @@ -200,7 +200,7 @@ public TreeItem (TreeItem parentItem, int style, int index) { this (checkNull (parentItem).parent, style, parentItem.handle, findPrevious (parentItem, index), 0); } -TreeItem (Tree parent, int style, long /*int*/ hParent, long /*int*/ hInsertAfter, long /*int*/ hItem) { +TreeItem (Tree parent, int style, long hParent, long hInsertAfter, long hItem) { super (parent, style); this.parent = parent; parent.createItem (this, hParent, hInsertAfter, hItem); @@ -211,25 +211,25 @@ static TreeItem checkNull (TreeItem item) { return item; } -static long /*int*/ findPrevious (Tree parent, int index) { +static long findPrevious (Tree parent, int index) { if (parent == null) return 0; if (index < 0) SWT.error (SWT.ERROR_INVALID_RANGE); if (index == 0) return OS.TVI_FIRST; - long /*int*/ hwnd = parent.handle; - long /*int*/ hFirstItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); - long /*int*/ hItem = parent.findItem (hFirstItem, index - 1); + long hwnd = parent.handle; + long hFirstItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0); + long hItem = parent.findItem (hFirstItem, index - 1); if (hItem == 0) SWT.error (SWT.ERROR_INVALID_RANGE); return hItem; } -static long /*int*/ findPrevious (TreeItem parentItem, int index) { +static long findPrevious (TreeItem parentItem, int index) { if (parentItem == null) return 0; if (index < 0) SWT.error (SWT.ERROR_INVALID_RANGE); if (index == 0) return OS.TVI_FIRST; Tree parent = parentItem.parent; - long /*int*/ hwnd = parent.handle, hParent = parentItem.handle; - long /*int*/ hFirstItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, hParent); - long /*int*/ hItem = parent.findItem (hFirstItem, index - 1); + long hwnd = parent.handle, hParent = parentItem.handle; + long hFirstItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, hParent); + long hItem = parent.findItem (hFirstItem, index - 1); if (hItem == 0) SWT.error (SWT.ERROR_INVALID_RANGE); return hItem; } @@ -245,7 +245,7 @@ void clear () { strings = null; images = null; if ((parent.style & SWT.CHECK) != 0) { - long /*int*/ hwnd = parent.handle; + long hwnd = parent.handle; TVITEM tvItem = new TVITEM (); tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_STATE; tvItem.stateMask = OS.TVIS_STATEIMAGEMASK; @@ -285,8 +285,8 @@ void clear () { */ public void clear (int index, boolean all) { checkWidget (); - long /*int*/ hwnd = parent.handle; - long /*int*/ hItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, handle); + long hwnd = parent.handle; + long hItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, handle); if (hItem == 0) error (SWT.ERROR_INVALID_RANGE); hItem = parent.findItem (hItem, index); if (hItem == 0) error (SWT.ERROR_INVALID_RANGE); @@ -320,8 +320,8 @@ public void clear (int index, boolean all) { */ public void clearAll (boolean all) { checkWidget (); - long /*int*/ hwnd = parent.handle; - long /*int*/ hItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, handle); + long hwnd = parent.handle; + long hItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, handle); if (hItem == 0) return; TVITEM tvItem = new TVITEM (); tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_PARAM; @@ -337,7 +337,7 @@ void destroyWidget () { releaseHandle (); } -long /*int*/ fontHandle (int index) { +long fontHandle (int index) { if (cellFont != null && cellFont [index] != null) return cellFont [index].handle; if (font != null) return font.handle; return -1; @@ -439,9 +439,9 @@ RECT getBounds (int index, boolean getText, boolean getImage, boolean fullText) } //TODO - take into account grid (add boolean arg) to damage less during redraw -RECT getBounds (int index, boolean getText, boolean getImage, boolean fullText, boolean fullImage, boolean clip, long /*int*/ hDC) { +RECT getBounds (int index, boolean getText, boolean getImage, boolean fullText, boolean fullImage, boolean clip, long hDC) { if (!getText && !getImage) return new RECT (); - long /*int*/ hwnd = parent.handle; + long hwnd = parent.handle; if ((parent.style & SWT.VIRTUAL) == 0 && !cached && !parent.painted) { TVITEM tvItem = new TVITEM (); tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_TEXT; @@ -453,7 +453,7 @@ RECT getBounds (int index, boolean getText, boolean getImage, boolean fullText, } boolean firstColumn = index == 0; int columnCount = 0; - long /*int*/ hwndHeader = parent.hwndHeader; + long hwndHeader = parent.hwndHeader; if (hwndHeader != 0) { columnCount = parent.columnCount; firstColumn = index == OS.SendMessage (hwndHeader, OS.HDM_ORDERTOINDEX, 0, 0); @@ -525,7 +525,7 @@ RECT getBounds (int index, boolean getText, boolean getImage, boolean fullText, RECT textRect = new RECT (); char [] buffer = string.toCharArray (); int flags = OS.DT_NOPREFIX | OS.DT_SINGLELINE | OS.DT_CALCRECT; - long /*int*/ hNewDC = hDC, hFont = 0; + long hNewDC = hDC, hFont = 0; if (hDC == 0) { hNewDC = OS.GetDC (hwnd); hFont = fontHandle (index); @@ -575,12 +575,12 @@ public boolean getChecked () { checkWidget (); if (!parent.checkData (this, true)) error (SWT.ERROR_WIDGET_DISPOSED); if ((parent.style & SWT.CHECK) == 0) return false; - long /*int*/ hwnd = parent.handle; + long hwnd = parent.handle; TVITEM tvItem = new TVITEM (); tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_STATE; tvItem.stateMask = OS.TVIS_STATEIMAGEMASK; tvItem.hItem = handle; - long /*int*/ result = OS.SendMessage (hwnd, OS.TVM_GETITEM, 0, tvItem); + long result = OS.SendMessage (hwnd, OS.TVM_GETITEM, 0, tvItem); return (result != 0) && (((tvItem.state >> 12) & 1) == 0); } @@ -598,14 +598,14 @@ public boolean getChecked () { */ public boolean getExpanded () { checkWidget (); - long /*int*/ hwnd = parent.handle; + long hwnd = parent.handle; /* * Bug in Windows. Despite the fact that TVM_GETITEMSTATE claims * to return only the bits specified by the stateMask, when called * with TVIS_EXPANDED, the entire state is returned. The fix is * to explicitly check for the TVIS_EXPANDED bit. */ - int state = (int)/*64*/OS.SendMessage (hwnd, OS.TVM_GETITEMSTATE, handle, OS.TVIS_EXPANDED); + int state = (int)OS.SendMessage (hwnd, OS.TVM_GETITEMSTATE, handle, OS.TVIS_EXPANDED); return (state & OS.TVIS_EXPANDED) != 0; } @@ -709,12 +709,12 @@ public boolean getGrayed () { checkWidget (); if (!parent.checkData (this, true)) error (SWT.ERROR_WIDGET_DISPOSED); if ((parent.style & SWT.CHECK) == 0) return false; - long /*int*/ hwnd = parent.handle; + long hwnd = parent.handle; TVITEM tvItem = new TVITEM (); tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_STATE; tvItem.stateMask = OS.TVIS_STATEIMAGEMASK; tvItem.hItem = handle; - long /*int*/ result = OS.SendMessage (hwnd, OS.TVM_GETITEM, 0, tvItem); + long result = OS.SendMessage (hwnd, OS.TVM_GETITEM, 0, tvItem); return (result != 0) && ((tvItem.state >> 12) > 2); } @@ -739,10 +739,10 @@ public TreeItem getItem (int index) { checkWidget (); if (index < 0) error (SWT.ERROR_INVALID_RANGE); if (!parent.checkData (this, true)) error (SWT.ERROR_WIDGET_DISPOSED); - long /*int*/ hwnd = parent.handle; - long /*int*/ hFirstItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, handle); + long hwnd = parent.handle; + long hFirstItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, handle); if (hFirstItem == 0) error (SWT.ERROR_INVALID_RANGE); - long /*int*/ hItem = parent.findItem (hFirstItem, index); + long hItem = parent.findItem (hFirstItem, index); if (hItem == 0) error (SWT.ERROR_INVALID_RANGE); return parent._getItem (hItem); } @@ -761,8 +761,8 @@ public TreeItem getItem (int index) { public int getItemCount () { checkWidget (); if (!parent.checkData (this, true)) error (SWT.ERROR_WIDGET_DISPOSED); - long /*int*/ hwnd = parent.handle; - long /*int*/ hItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, handle); + long hwnd = parent.handle; + long hItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, handle); if (hItem == 0) return 0; return parent.getItemCount (hItem); } @@ -786,8 +786,8 @@ public int getItemCount () { public TreeItem [] getItems () { checkWidget (); if (!parent.checkData (this, true)) error (SWT.ERROR_WIDGET_DISPOSED); - long /*int*/ hwnd = parent.handle; - long /*int*/ hItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, handle); + long hwnd = parent.handle; + long hItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, handle); if (hItem == 0) return new TreeItem [0]; return parent.getItems (hItem); } @@ -879,8 +879,8 @@ public Tree getParent () { */ public TreeItem getParentItem () { checkWidget (); - long /*int*/ hwnd = parent.handle; - long /*int*/ hItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_PARENT, handle); + long hwnd = parent.handle; + long hItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_PARENT, handle); return hItem != 0 ? parent._getItem (hItem) : null; } @@ -973,14 +973,14 @@ public int indexOf (TreeItem item) { checkWidget (); if (item == null) error (SWT.ERROR_NULL_ARGUMENT); if (item.isDisposed()) error(SWT.ERROR_INVALID_ARGUMENT); - long /*int*/ hwnd = parent.handle; - long /*int*/ hItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, handle); + long hwnd = parent.handle; + long hItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, handle); return hItem == 0 ? -1 : parent.findIndex (hItem, item.handle); } void redraw () { if (parent.currentItem == this || !parent.getDrawing ()) return; - long /*int*/ hwnd = parent.handle; + long hwnd = parent.handle; if (!OS.IsWindowVisible (hwnd)) return; /* * When there are no columns and the tree is not @@ -1004,7 +1004,7 @@ void redraw () { void redraw (int column, boolean drawText, boolean drawImage) { if (parent.currentItem == this || !parent.getDrawing ()) return; - long /*int*/ hwnd = parent.handle; + long hwnd = parent.handle; if (!OS.IsWindowVisible (hwnd)) return; boolean fullImage = column == 0 && drawText && drawImage; RECT rect = getBounds (column, drawText, drawImage, true, fullImage, true, 0); @@ -1049,13 +1049,13 @@ void releaseWidget () { */ public void removeAll () { checkWidget (); - long /*int*/ hwnd = parent.handle; + long hwnd = parent.handle; TVITEM tvItem = new TVITEM (); tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_PARAM; tvItem.hItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, handle); while (tvItem.hItem != 0) { OS.SendMessage (hwnd, OS.TVM_GETITEM, 0, tvItem); - TreeItem item = tvItem.lParam != -1 ? parent.items [(int)/*64*/tvItem.lParam] : null; + TreeItem item = tvItem.lParam != -1 ? parent.items [(int)tvItem.lParam] : null; if (item != null && !item.isDisposed ()) { item.dispose (); } else { @@ -1157,7 +1157,7 @@ public void setBackground (int index, Color color) { public void setChecked (boolean checked) { checkWidget (); if ((parent.style & SWT.CHECK) == 0) return; - long /*int*/ hwnd = parent.handle; + long hwnd = parent.handle; TVITEM tvItem = new TVITEM (); tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_STATE; tvItem.stateMask = OS.TVIS_STATEIMAGEMASK; @@ -1205,7 +1205,7 @@ public void setExpanded (boolean expanded) { checkWidget (); /* Do nothing when the item is a leaf or already expanded */ - long /*int*/ hwnd = parent.handle; + long hwnd = parent.handle; if (OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, handle) == 0) { return; } @@ -1215,7 +1215,7 @@ public void setExpanded (boolean expanded) { * with TVIS_EXPANDED, the entire state is returned. The fix is * to explicitly check for the TVIS_EXPANDED bit. */ - int state = (int)/*64*/OS.SendMessage (hwnd, OS.TVM_GETITEMSTATE, handle, OS.TVIS_EXPANDED); + int state = (int)OS.SendMessage (hwnd, OS.TVM_GETITEMSTATE, handle, OS.TVIS_EXPANDED); if (((state & OS.TVIS_EXPANDED) != 0) == expanded) return; /* @@ -1235,9 +1235,9 @@ public void setExpanded (boolean expanded) { RECT [] rects = null; SCROLLINFO oldInfo = null; int count = 0; - long /*int*/ hBottomItem = 0; + long hBottomItem = 0; boolean redraw = false, noScroll = true; - long /*int*/ hTopItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_FIRSTVISIBLE, 0); + long hTopItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_FIRSTVISIBLE, 0); if (noScroll && hTopItem != 0) { oldInfo = new SCROLLINFO (); oldInfo.cbSize = SCROLLINFO.sizeof; @@ -1247,9 +1247,9 @@ public void setExpanded (boolean expanded) { } if (parent.getDrawing () && OS.IsWindowVisible (hwnd)) { boolean noAnimate = true; - count = (int)/*64*/OS.SendMessage (hwnd, OS.TVM_GETVISIBLECOUNT, 0, 0); + count = (int)OS.SendMessage (hwnd, OS.TVM_GETVISIBLECOUNT, 0, 0); rects = new RECT [count + 1]; - long /*int*/ hItem = hTopItem; + long hItem = hTopItem; int index = 0; while (hItem != 0 && (noAnimate || hItem != handle) && index < count) { RECT rect = new RECT (); @@ -1264,7 +1264,7 @@ public void setExpanded (boolean expanded) { hBottomItem = hItem; oldRect = new RECT (); OS.GetClientRect (hwnd, oldRect); - long /*int*/ topHandle = parent.topHandle (); + long topHandle = parent.topHandle (); OS.UpdateWindow (topHandle); OS.DefWindowProc (topHandle, OS.WM_SETREDRAW, 0, 0); if (hwnd != topHandle) { @@ -1291,7 +1291,7 @@ public void setExpanded (boolean expanded) { * check whether the selection has changed and issue * the event. */ - long /*int*/ hOldItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); + long hOldItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); /* Expand or collapse the item */ parent.ignoreExpand = true; @@ -1319,7 +1319,7 @@ public void setExpanded (boolean expanded) { newInfo.fMask = OS.SIF_ALL; if (OS.GetScrollInfo (hwnd, OS.SB_HORZ, newInfo)) { if (oldInfo.nPos != newInfo.nPos) { - long /*int*/ lParam = OS.MAKELPARAM (OS.SB_THUMBPOSITION, oldInfo.nPos); + long lParam = OS.MAKELPARAM (OS.SB_THUMBPOSITION, oldInfo.nPos); OS.SendMessage (hwnd, OS.WM_HSCROLL, lParam, 0); } } @@ -1330,7 +1330,7 @@ public void setExpanded (boolean expanded) { RECT newRect = new RECT (); OS.GetClientRect (hwnd, newRect); if (OS.EqualRect (oldRect, newRect)) { - long /*int*/ hItem = hTopItem; + long hItem = hTopItem; int index = 0; while (hItem != 0 && index < count) { RECT rect = new RECT (); @@ -1345,7 +1345,7 @@ public void setExpanded (boolean expanded) { fixScroll = index == count && hItem == hBottomItem; } } - long /*int*/ topHandle = parent.topHandle (); + long topHandle = parent.topHandle (); OS.DefWindowProc (topHandle, OS.WM_SETREDRAW, 1, 0); if (hwnd != topHandle) { OS.DefWindowProc (hwnd, OS.WM_SETREDRAW, 1, 0); @@ -1376,7 +1376,7 @@ public void setExpanded (boolean expanded) { } /* Check for a selection event */ - long /*int*/ hNewItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); + long hNewItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0); if (hNewItem != hOldItem) { Event event = new Event (); if (hNewItem != 0) { @@ -1424,7 +1424,7 @@ public void setFont (Font font){ if ((parent.style & SWT.VIRTUAL) == 0 && !cached && !parent.painted) { return; } - long /*int*/ hwnd = parent.handle; + long hwnd = parent.handle; TVITEM tvItem = new TVITEM (); tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_TEXT; tvItem.hItem = handle; @@ -1479,7 +1479,7 @@ public void setFont (int index, Font font) { if ((parent.style & SWT.VIRTUAL) == 0 && !cached && !parent.painted) { return; } - long /*int*/ hwnd = parent.handle; + long hwnd = parent.handle; TVITEM tvItem = new TVITEM (); tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_TEXT; tvItem.hItem = handle; @@ -1581,7 +1581,7 @@ public void setForeground (int index, Color color){ public void setGrayed (boolean grayed) { checkWidget (); if ((parent.style & SWT.CHECK) == 0) return; - long /*int*/ hwnd = parent.handle; + long hwnd = parent.handle; TVITEM tvItem = new TVITEM (); tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_STATE; tvItem.stateMask = OS.TVIS_STATEIMAGEMASK; @@ -1690,7 +1690,7 @@ public void setImage (int index, Image image) { if ((parent.style & SWT.VIRTUAL) == 0 &&!cached && !parent.painted) { return; } - long /*int*/ hwnd = parent.handle; + long hwnd = parent.handle; TVITEM tvItem = new TVITEM (); tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_IMAGE | OS.TVIF_SELECTEDIMAGE; tvItem.hItem = handle; @@ -1731,8 +1731,8 @@ public void setImage (Image image) { public void setItemCount (int count) { checkWidget (); count = Math.max (0, count); - long /*int*/ hwnd = parent.handle; - long /*int*/ hItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, handle); + long hwnd = parent.handle; + long hItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, handle); parent.setItemCount (count, handle, hItem); } @@ -1804,7 +1804,7 @@ public void setText (int index, String string) { if ((parent.style & SWT.VIRTUAL) == 0 && !cached && !parent.painted) { return; } - long /*int*/ hwnd = parent.handle; + long hwnd = parent.handle; TVITEM tvItem = new TVITEM (); tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_TEXT; tvItem.hItem = handle; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java index 1b2e9c5195..78992e7284 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java @@ -223,7 +223,7 @@ public void addDisposeListener (DisposeListener listener) { addListener (SWT.Dispose, typedListener); } -long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) { +long callWindowProc (long hwnd, int msg, long wParam, long lParam) { return 0; } @@ -429,7 +429,7 @@ public void dispose () { release (true); } -boolean dragDetect (long /*int*/ hwnd, int x, int y, boolean filter, boolean [] detect, boolean [] consume) { +boolean dragDetect (long hwnd, int x, int y, boolean filter, boolean [] detect, boolean [] consume) { if (consume != null) consume [0] = false; if (detect != null) detect [0] = true; POINT pt = new POINT (); @@ -455,7 +455,7 @@ boolean filters (int eventType) { return display.filters (eventType); } -Widget findItem (long /*int*/ id) { +Widget findItem (long id) { return null; } @@ -746,7 +746,7 @@ boolean isValidThread () { return getDisplay ().isValidThread (); } -void mapEvent (long /*int*/ hwnd, Event event) { +void mapEvent (long hwnd, Event event) { } GC new_GC (GCData data) { @@ -1097,23 +1097,23 @@ void sendSelectionEvent (int type, Event event, boolean send) { sendEvent (type, event, send); } -boolean sendKeyEvent (int type, int msg, long /*int*/ wParam, long /*int*/ lParam) { +boolean sendKeyEvent (int type, int msg, long wParam, long lParam) { Event event = new Event (); if (!setKeyState (event, type, wParam, lParam)) return true; return sendKeyEvent (type, msg, wParam, lParam, event); } -boolean sendKeyEvent (int type, int msg, long /*int*/ wParam, long /*int*/ lParam, Event event) { +boolean sendKeyEvent (int type, int msg, long wParam, long lParam, Event event) { sendEvent (type, event); if (isDisposed ()) return false; return event.doit; } -boolean sendMouseEvent (int type, int button, long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) { +boolean sendMouseEvent (int type, int button, long hwnd, int msg, long wParam, long lParam) { return sendMouseEvent (type, button, display.getClickCount (type, button, hwnd, lParam), 0, false, hwnd, msg, wParam, lParam); } -boolean sendMouseEvent (int type, int button, int count, int detail, boolean send, long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) { +boolean sendMouseEvent (int type, int button, int count, int detail, boolean send, long hwnd, int msg, long wParam, long lParam) { if (!hooks (type) && !filters (type)) return true; Event event = new Event (); event.button = button; @@ -1131,7 +1131,7 @@ boolean sendMouseEvent (int type, int button, int count, int detail, boolean sen return event.doit; } -boolean sendMouseWheelEvent (int type, long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { +boolean sendMouseWheelEvent (int type, long hwnd, long wParam, long lParam) { int delta = OS.GET_WHEEL_DELTA_WPARAM (wParam); int detail = 0; if (type == SWT.MouseWheel) { @@ -1318,7 +1318,7 @@ boolean setInputState (Event event, int type) { return true; } -boolean setKeyState (Event event, int type, long /*int*/ wParam, long /*int*/ lParam) { +boolean setKeyState (Event event, int type, long wParam, long lParam) { /* * Feature in Windows. When the user presses Ctrl+Backspace @@ -1382,7 +1382,7 @@ boolean setKeyState (Event event, int type, long /*int*/ wParam, long /*int*/ lP return setInputState (event, type); } -int setLocationMask (Event event, int type, long /*int*/ wParam, long /*int*/ lParam) { +int setLocationMask (Event event, int type, long wParam, long lParam) { int location = SWT.NONE; if (display.lastVirtual) { switch (display.lastKey) { @@ -1479,13 +1479,13 @@ void updateMenuLocation (Event event) { /* Do nothing */ } -LRESULT wmCaptureChanged (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmCaptureChanged (long hwnd, long wParam, long lParam) { display.captureChanged = true; return null; } -LRESULT wmChar (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { - display.lastAscii = (int)/*64*/wParam; +LRESULT wmChar (long hwnd, long wParam, long lParam) { + display.lastAscii = (int)wParam; display.lastNull = wParam == 0; if (!sendKeyEvent (SWT.KeyDown, OS.WM_CHAR, wParam, lParam)) { return LRESULT.ONE; @@ -1494,7 +1494,7 @@ LRESULT wmChar (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { return null; } -LRESULT wmContextMenu (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmContextMenu (long hwnd, long wParam, long lParam) { if (wParam != hwnd) return null; /* @@ -1530,10 +1530,10 @@ LRESULT wmContextMenu (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lPar return showMenu (x, y, detail) ? LRESULT.ZERO : null; } -LRESULT wmIMEChar (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmIMEChar (long hwnd, long wParam, long lParam) { Display display = this.display; display.lastKey = 0; - display.lastAscii = (int)/*64*/wParam; + display.lastAscii = (int)wParam; display.lastVirtual = display.lastNull = display.lastDead = false; if (!sendKeyEvent (SWT.KeyDown, OS.WM_IME_CHAR, wParam, lParam)) { return LRESULT.ONE; @@ -1544,10 +1544,10 @@ LRESULT wmIMEChar (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) return LRESULT.ONE; } -LRESULT wmKeyDown (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmKeyDown (long hwnd, long wParam, long lParam) { /* Ignore repeating modifier keys by testing key down state */ - switch ((int)/*64*/wParam) { + switch ((int)wParam) { case OS.VK_SHIFT: case OS.VK_MENU: case OS.VK_CONTROL: @@ -1562,7 +1562,7 @@ LRESULT wmKeyDown (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) display.lastVirtual = display.lastNull = display.lastDead = false; /* Map the virtual key */ - int mapKey = OS.MapVirtualKey ((int)/*64*/wParam, 2); + int mapKey = OS.MapVirtualKey ((int)wParam, 2); /* * Feature in Windows. For Devanagari and Bengali numbers, * MapVirtualKey() returns the localized number instead of @@ -1575,7 +1575,7 @@ LRESULT wmKeyDown (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) * NOTE: VK_0 to VK_9 are the same as ASCII. */ if (('\u09e6' <= mapKey && mapKey <= '\u09ef') || ('\u0966' <= mapKey && mapKey <= '\u096f')) { - mapKey = (int)/*64*/wParam; + mapKey = (int)wParam; } /* @@ -1600,7 +1600,7 @@ LRESULT wmKeyDown (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) if (OS.PeekMessage (msg, hwnd, OS.WM_DEADCHAR, OS.WM_DEADCHAR, flags)) { display.lastDead = true; display.lastVirtual = mapKey == 0; - display.lastKey = display.lastVirtual ? (int)/*64*/wParam : mapKey; + display.lastKey = display.lastVirtual ? (int)wParam : mapKey; return null; } @@ -1637,9 +1637,9 @@ LRESULT wmKeyDown (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) * they are not virtual. Therefore it is necessary to force * numeric keypad keys to be virtual. */ - display.lastVirtual = mapKey == 0 || display.numpadKey ((int)/*64*/wParam) != 0; + display.lastVirtual = mapKey == 0 || display.numpadKey ((int)wParam) != 0; if (display.lastVirtual) { - display.lastKey = (int)/*64*/wParam; + display.lastKey = (int)wParam; /* * Feature in Windows. The virtual key VK_DELETE is not * treated as both a virtual key and an ASCII key by Windows. @@ -1677,7 +1677,7 @@ LRESULT wmKeyDown (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) * upper case values in WM_KEYDOWN despite the fact that the * Shift was not pressed. */ - display.lastKey = (int)/*64*/OS.CharLower ((short) mapKey); + display.lastKey = (int)OS.CharLower ((short) mapKey); /* * Feature in Windows. The virtual key VK_CANCEL is treated @@ -1696,7 +1696,7 @@ LRESULT wmKeyDown (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) * WM_CHAR. If this is the case, issue the key down event from * inside WM_CHAR. */ - int asciiKey = display.asciiKey ((int)/*64*/wParam); + int asciiKey = display.asciiKey ((int)wParam); if (asciiKey != 0) { /* * When the user types Ctrl+Space, ToAscii () maps this to @@ -1706,7 +1706,7 @@ LRESULT wmKeyDown (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) * issue the event from WM_CHAR. */ if (asciiKey == ' ') return null; - if (asciiKey != (int)/*64*/wParam) return null; + if (asciiKey != (int)wParam) return null; /* * Feature in Windows. The virtual key VK_CANCEL is treated * as both a virtual key and ASCII key by Windows. This @@ -1733,10 +1733,10 @@ LRESULT wmKeyDown (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) * depend on the international keyboard. */ if (OS.GetKeyState (OS.VK_SHIFT) < 0) { - display.lastAscii = display.shiftedKey ((int)/*64*/wParam); + display.lastAscii = display.shiftedKey ((int)wParam); if (display.lastAscii == 0) display.lastAscii = mapKey; } else { - display.lastAscii = (int)/*64*/OS.CharLower ((short) mapKey); + display.lastAscii = (int)OS.CharLower ((short) mapKey); } /* Note that Ctrl+'@' is ASCII NUL and is delivered in WM_CHAR */ @@ -1750,7 +1750,7 @@ LRESULT wmKeyDown (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) return null; } -LRESULT wmKeyUp (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmKeyUp (long hwnd, long wParam, long lParam) { Display display = this.display; /* @@ -1764,7 +1764,7 @@ LRESULT wmKeyUp (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { } /* Map the virtual key. */ - int mapKey = OS.MapVirtualKey ((int)/*64*/wParam, 2); + int mapKey = OS.MapVirtualKey ((int)wParam, 2); /* * Bug in Windows 95 and NT. When the user types an accent key such @@ -1784,9 +1784,9 @@ LRESULT wmKeyUp (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { * they are not virtual. Therefore it is necessary to force * numeric keypad keys to be virtual. */ - display.lastVirtual = mapKey == 0 || display.numpadKey ((int)/*64*/wParam) != 0; + display.lastVirtual = mapKey == 0 || display.numpadKey ((int)wParam) != 0; if (display.lastVirtual) { - display.lastKey = (int)/*64*/wParam; + display.lastKey = (int)wParam; } else { /* * Feature in Windows. The virtual key VK_CANCEL is treated @@ -1812,9 +1812,9 @@ LRESULT wmKeyUp (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { return result; } -LRESULT wmKillFocus (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmKillFocus (long hwnd, long wParam, long lParam) { display.scrollRemainder = display.scrollHRemainder = 0; - long /*int*/ code = callWindowProc (hwnd, OS.WM_KILLFOCUS, wParam, lParam); + long code = callWindowProc (hwnd, OS.WM_KILLFOCUS, wParam, lParam); sendFocusEvent (SWT.FocusOut); // widget could be disposed at this point @@ -1830,7 +1830,7 @@ LRESULT wmKillFocus (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam return new LRESULT (code); } -LRESULT wmLButtonDblClk (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmLButtonDblClk (long hwnd, long wParam, long lParam) { /* * Feature in Windows. Windows sends the following * messages when the user double clicks the mouse: @@ -1859,7 +1859,7 @@ LRESULT wmLButtonDblClk (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lP return result; } -LRESULT wmLButtonDown (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmLButtonDown (long hwnd, long wParam, long lParam) { Display display = this.display; LRESULT result = null; int x = OS.GET_X_LPARAM (lParam); @@ -1926,7 +1926,7 @@ LRESULT wmLButtonDown (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lPar return result; } -LRESULT wmLButtonUp (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmLButtonUp (long hwnd, long wParam, long lParam) { Display display = this.display; LRESULT result = null; if (sendMouseEvent (SWT.MouseUp, 1, hwnd, OS.WM_LBUTTONUP, wParam, lParam)) { @@ -1948,7 +1948,7 @@ LRESULT wmLButtonUp (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam return result; } -LRESULT wmMButtonDblClk (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmMButtonDblClk (long hwnd, long wParam, long lParam) { /* * Feature in Windows. Windows sends the following * messages when the user double clicks the mouse: @@ -1977,7 +1977,7 @@ LRESULT wmMButtonDblClk (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lP return result; } -LRESULT wmMButtonDown (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmMButtonDown (long hwnd, long wParam, long lParam) { LRESULT result = null; Display display = this.display; display.captureChanged = false; @@ -1992,7 +1992,7 @@ LRESULT wmMButtonDown (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lPar return result; } -LRESULT wmMButtonUp (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmMButtonUp (long hwnd, long wParam, long lParam) { Display display = this.display; LRESULT result = null; if (sendMouseEvent (SWT.MouseUp, 2, hwnd, OS.WM_MBUTTONUP, wParam, lParam)) { @@ -2014,14 +2014,14 @@ LRESULT wmMButtonUp (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam return result; } -LRESULT wmMouseHover (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmMouseHover (long hwnd, long wParam, long lParam) { if (!sendMouseEvent (SWT.MouseHover, 0, hwnd, OS.WM_MOUSEHOVER, wParam, lParam)) { return LRESULT.ZERO; } return null; } -LRESULT wmMouseLeave (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmMouseLeave (long hwnd, long wParam, long lParam) { if (!hooks (SWT.MouseExit) && !filters (SWT.MouseExit)) return null; int pos = OS.GetMessagePos (); POINT pt = new POINT (); @@ -2034,7 +2034,7 @@ LRESULT wmMouseLeave (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lPara return null; } -LRESULT wmMouseMove (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmMouseMove (long hwnd, long wParam, long lParam) { LRESULT result = null; Display display = this.display; int pos = OS.GetMessagePos (); @@ -2084,19 +2084,19 @@ LRESULT wmMouseMove (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam return result; } -LRESULT wmMouseWheel (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmMouseWheel (long hwnd, long wParam, long lParam) { return sendMouseWheelEvent(SWT.MouseWheel, hwnd, wParam, lParam) ? null : LRESULT.ZERO; } -LRESULT wmMouseHWheel (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmMouseHWheel (long hwnd, long wParam, long lParam) { return sendMouseWheelEvent(SWT.MouseHorizontalWheel, hwnd, wParam, lParam) ? null : LRESULT.ZERO; } -LRESULT wmNCPaint (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmNCPaint (long hwnd, long wParam, long lParam) { return null; } -LRESULT wmPaint (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmPaint (long hwnd, long wParam, long lParam) { /* Exit early - don't draw the background */ if (!hooks (SWT.Paint) && !filters (SWT.Paint)) { @@ -2104,9 +2104,9 @@ LRESULT wmPaint (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { } /* Issue a paint event */ - long /*int*/ rgn = OS.CreateRectRgn (0, 0, 0, 0); + long rgn = OS.CreateRectRgn (0, 0, 0, 0); OS.GetUpdateRgn (hwnd, rgn, false); - long /*int*/ result = callWindowProc (hwnd, OS.WM_PAINT, wParam, lParam); + long result = callWindowProc (hwnd, OS.WM_PAINT, wParam, lParam); GCData data = new GCData (); data.hwnd = hwnd; GC gc = new_GC (data); @@ -2117,7 +2117,7 @@ LRESULT wmPaint (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { int width = rect.right - rect.left; int height = rect.bottom - rect.top; if (width != 0 && height != 0) { - long /*int*/ hDC = gc.handle; + long hDC = gc.handle; OS.SelectClipRgn (hDC, rgn); OS.SetMetaRgn (hDC); Event event = new Event (); @@ -2135,7 +2135,7 @@ LRESULT wmPaint (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { return new LRESULT (result); } -LRESULT wmPrint (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmPrint (long hwnd, long wParam, long lParam) { /* * Bug in Windows. When WM_PRINT is used to print the contents * of a control that has WS_EX_CLIENTEDGE, the old 3D border is @@ -2146,7 +2146,7 @@ LRESULT wmPrint (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { if (OS.IsAppThemed ()) { int bits = OS.GetWindowLong (hwnd, OS.GWL_EXSTYLE); if ((bits & OS.WS_EX_CLIENTEDGE) != 0) { - long /*int*/ code = callWindowProc (hwnd, OS.WM_PRINT, wParam, lParam); + long code = callWindowProc (hwnd, OS.WM_PRINT, wParam, lParam); RECT rect = new RECT (); OS.GetWindowRect (hwnd, rect); rect.right -= rect.left; @@ -2162,7 +2162,7 @@ LRESULT wmPrint (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { return null; } -LRESULT wmRButtonDblClk (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmRButtonDblClk (long hwnd, long wParam, long lParam) { /* * Feature in Windows. Windows sends the following * messages when the user double clicks the mouse: @@ -2191,7 +2191,7 @@ LRESULT wmRButtonDblClk (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lP return result; } -LRESULT wmRButtonDown (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmRButtonDown (long hwnd, long wParam, long lParam) { LRESULT result = null; Display display = this.display; display.captureChanged = false; @@ -2206,7 +2206,7 @@ LRESULT wmRButtonDown (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lPar return result; } -LRESULT wmRButtonUp (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmRButtonUp (long hwnd, long wParam, long lParam) { Display display = this.display; LRESULT result = null; if (sendMouseEvent (SWT.MouseUp, 3, hwnd, OS.WM_RBUTTONUP, wParam, lParam)) { @@ -2230,8 +2230,8 @@ LRESULT wmRButtonUp (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam return result; } -LRESULT wmSetFocus (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { - long /*int*/ code = callWindowProc (hwnd, OS.WM_SETFOCUS, wParam, lParam); +LRESULT wmSetFocus (long hwnd, long wParam, long lParam) { + long code = callWindowProc (hwnd, OS.WM_SETFOCUS, wParam, lParam); sendFocusEvent (SWT.FocusIn); // widget could be disposed at this point @@ -2247,9 +2247,9 @@ LRESULT wmSetFocus (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) return new LRESULT (code); } -LRESULT wmSysChar (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmSysChar (long hwnd, long wParam, long lParam) { Display display = this.display; - display.lastAscii = (int)/*64*/wParam; + display.lastAscii = (int)wParam; display.lastNull = wParam == 0; /* Do not issue a key down if a menu bar mnemonic was invoked */ @@ -2260,7 +2260,7 @@ LRESULT wmSysChar (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) /* Call the window proc to determine whether it is a system key or mnemonic */ boolean oldKeyHit = display.mnemonicKeyHit; display.mnemonicKeyHit = true; - long /*int*/ result = callWindowProc (hwnd, OS.WM_SYSCHAR, wParam, lParam); + long result = callWindowProc (hwnd, OS.WM_SYSCHAR, wParam, lParam); boolean consumed = false; if (!display.mnemonicKeyHit) { consumed = !sendKeyEvent (SWT.KeyDown, OS.WM_SYSCHAR, wParam, lParam); @@ -2271,7 +2271,7 @@ LRESULT wmSysChar (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) return consumed ? LRESULT.ONE : new LRESULT (result); } -LRESULT wmSysKeyDown (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmSysKeyDown (long hwnd, long wParam, long lParam) { /* * Feature in Windows. When WM_SYSKEYDOWN is sent, * the user pressed ALT+<key> or F10 to get to the @@ -2286,9 +2286,9 @@ LRESULT wmSysKeyDown (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lPara } /* Ignore well known system keys */ - switch ((int)/*64*/wParam) { + switch ((int)wParam) { case OS.VK_F4: { - long /*int*/ hwndShell = hwnd; + long hwndShell = hwnd; while (OS.GetParent (hwndShell) != 0) { if (OS.GetWindow (hwndShell, OS.GW_OWNER) != 0) break; hwndShell = OS.GetParent (hwndShell); @@ -2299,7 +2299,7 @@ LRESULT wmSysKeyDown (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lPara } /* Ignore repeating modifier keys by testing key down state */ - switch ((int)/*64*/wParam) { + switch ((int)wParam) { case OS.VK_SHIFT: case OS.VK_MENU: case OS.VK_CONTROL: @@ -2314,11 +2314,11 @@ LRESULT wmSysKeyDown (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lPara display.lastVirtual = display.lastNull = display.lastDead = false; /* If are going to get a WM_SYSCHAR, ignore this message. */ - int mapKey = OS.MapVirtualKey ((int)/*64*/wParam, 2); + int mapKey = OS.MapVirtualKey ((int)wParam, 2); - display.lastVirtual = mapKey == 0 || display.numpadKey ((int)/*64*/wParam) != 0; + display.lastVirtual = mapKey == 0 || display.numpadKey ((int)wParam) != 0; if (display.lastVirtual) { - display.lastKey = (int)/*64*/wParam; + display.lastKey = (int)wParam; /* * Feature in Windows. The virtual key VK_DELETE is not * treated as both a virtual key and an ASCII key by Windows. @@ -2355,7 +2355,7 @@ LRESULT wmSysKeyDown (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lPara * upper case values in WM_SYSKEYDOWN despite the fact that the * Shift was not pressed. */ - display.lastKey = (int)/*64*/OS.CharLower ((short) mapKey); + display.lastKey = (int)OS.CharLower ((short) mapKey); return null; } @@ -2366,11 +2366,11 @@ LRESULT wmSysKeyDown (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lPara return null; } -LRESULT wmSysKeyUp (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmSysKeyUp (long hwnd, long wParam, long lParam) { return wmKeyUp (hwnd, wParam, lParam); } -LRESULT wmXButtonDblClk (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmXButtonDblClk (long hwnd, long wParam, long lParam) { /* * Feature in Windows. Windows sends the following * messages when the user double clicks the mouse: @@ -2400,7 +2400,7 @@ LRESULT wmXButtonDblClk (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lP return result; } -LRESULT wmXButtonDown (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmXButtonDown (long hwnd, long wParam, long lParam) { LRESULT result = null; Display display = this.display; display.captureChanged = false; @@ -2417,7 +2417,7 @@ LRESULT wmXButtonDown (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lPar return result; } -LRESULT wmXButtonUp (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) { +LRESULT wmXButtonUp (long hwnd, long wParam, long lParam) { Display display = this.display; LRESULT result = null; int button = OS.HIWORD (wParam) == OS.XBUTTON1 ? 4 : 5; |