Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNikita Nemkin2019-06-16 04:26:16 -0400
committerNikita Nemkin2019-06-18 05:20:11 -0400
commit8ce998bbd9e65934115002ec95404c37f3156411 (patch)
treebfd46ec8dc7d9a0cdf168c978224813de7f0e84a
parent8587a3bbc00131b5cba94f05365e573f4b041b15 (diff)
downloadeclipse.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>
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT AWT/win32/org/eclipse/swt/awt/SWT_AWT.java8
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Accessible.java770
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Relation.java42
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/IE.java42
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/WebSite.java234
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/ByteArrayTransfer.java6
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/Clipboard.java34
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DragSource.java46
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DropTarget.java52
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/FileTransfer.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/HTMLTransfer.java6
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/ImageTransfer.java18
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/OleEnumFORMATETC.java22
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/RTFTransfer.java6
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TableDragSourceEffect.java16
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TableDropTargetEffect.java8
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TextTransfer.java10
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TransferData.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TreeDragSourceEffect.java16
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TreeDropTargetEffect.java16
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/URLTransfer.java10
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/COMObject.java652
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OLE.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleAutomation.java22
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleClientSite.java204
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleControlSite.java104
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleEventSink.java26
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleFrame.java114
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OlePropertyChangeSink.java20
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/Variant.java86
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/library/wgl.c64
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/org/eclipse/swt/internal/opengl/win32/WGL.java38
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/org/eclipse/swt/opengl/GLCanvas.java10
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com.c1964
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_stats.c384
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_stats.h384
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_structs.c158
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip.cpp1332
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_stats.cpp106
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_stats.h106
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_structs.cpp20
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.c4526
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.c682
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.h682
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_structs.c1364
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/BitmapData.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/Gdip.java364
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/GdiplusStartupInput.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/CAUUID.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COM.java310
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/CONTROLINFO.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COSERVERINFO.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/DISPPARAMS.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/EXCEPINFO.java10
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/FORMATETC.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/FUNCDESC.java8
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IAccessible.java44
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IClassFactory2.java6
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IConnectionPoint.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IConnectionPointContainer.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDataObject.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDispatch.java16
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDispatchEx.java12
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDragSourceHelper.java6
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDragSourceHelper2.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDropTargetHelper.java6
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnum.java6
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumFORMATETC.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumSTATSTG.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumVARIANT.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IFont.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IMoniker.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleCommandTarget.java6
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleControl.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleDocument.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleDocumentView.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleInPlaceActiveObject.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleInPlaceObject.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleLink.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleObject.java10
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleWindow.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersist.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistFile.java10
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistStorage.java10
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistStreamInit.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPropertyBag.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IProvideClassInfo.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IProvideClassInfo2.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IServiceProvider.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ISpecifyPropertyPages.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IStorage.java20
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IStream.java8
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ITypeInfo.java40
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IUnknown.java8
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IViewObject2.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/OLEINPLACEFRAMEINFO.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/STATSTG.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/STGMEDIUM.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/TYPEATTR.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/VARDESC.java6
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/ACTCTX.java10
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BITMAP.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BP_PAINTPARAMS.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BROWSEINFO.java12
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BUTTON_IMAGELIST.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CERT_CONTEXT.java6
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CERT_INFO.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CERT_NAME_BLOB.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CHOOSECOLOR.java12
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CHOOSEFONT.java16
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/COMBOBOXINFO.java6
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CREATESTRUCT.java12
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CRYPT_ALGORITHM_IDENTIFIER.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CRYPT_BIT_BLOB.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CRYPT_INTEGER_BLOB.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CRYPT_OBJID_BLOB.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DIBSECTION.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DOCHOSTUIINFO.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DOCINFO.java6
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DRAWITEMSTRUCT.java6
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DTTOPTS.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/GCP_RESULTS.java12
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/GESTUREINFO.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/GUITHREADINFO.java12
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HDITEM.java8
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HDLAYOUT.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HELPINFO.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HIGHCONTRAST.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/ICONINFO.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/KEYBDINPUT.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LOGBRUSH.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LRESULT.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LVCOLUMN.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LVITEM.java6
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MEASUREITEMSTRUCT.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MENUBARINFO.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MENUINFO.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MENUITEMINFO.java12
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MOUSEINPUT.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MSG.java6
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMCUSTOMDRAW.java6
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMHDR.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMHEADER.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMLISTVIEW.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMLVDISPINFO.java6
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMLVFINDITEM.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMREBARCHEVRON.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTBCUSTOMDRAW.java6
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTOOLBAR.java6
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTTDISPINFO.java6
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTVDISPINFO.java6
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTVITEMCHANGE.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NOTIFYICONDATA.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OFNOTIFY.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OPENFILENAME.java26
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java1160
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OUTLINETEXTMETRIC.java8
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/PAINTSTRUCT.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/PRINTDLG.java24
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/PROCESS_INFORMATION.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/REBARBANDINFO.java8
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SAFEARRAY.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SHDRAGIMAGE.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SHELLEXECUTEINFO.java22
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SHFILEINFO.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/STARTUPINFO.java14
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TBBUTTON.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TBBUTTONINFO.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TCITEM.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TOOLINFO.java12
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TOUCHINPUT.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TRACKMOUSEEVENT.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVHITTESTINFO.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVINSERTSTRUCT.java10
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVITEM.java6
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVSORTCB.java6
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/WINDOWPOS.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/WNDCLASS.java14
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Printing/win32/org/eclipse/swt/printing/PrintDialog.java16
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Printing/win32/org/eclipse/swt/printing/Printer.java18
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Program/win32/org/eclipse/swt/program/Program.java14
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library/webkit_win32.cpp458
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library/webkit_win32_structs.cpp92
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebDownloadDelegate.java58
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebFrameLoadDelegate.java100
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebKit.java164
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebPolicyDelegate.java36
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebResourceLoadDelegate.java64
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebUIDelegate.java204
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebCookieManager.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDataSource.java10
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDocumentRepresentation.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDownload.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebError.java12
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebErrorPrivate.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebFrame.java10
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebFramePrivate.java8
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebIBActions.java10
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebMutableURLRequest.java10
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebMutableURLRequestPrivate.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebOpenPanelResultListener.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebPolicyDecisionListener.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebPreferences.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLAuthenticationChallenge.java8
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLAuthenticationChallengeSender.java6
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLCredential.java8
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLProtectionSpace.java6
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLRequest.java10
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLResponse.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebView.java30
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebViewPrivate.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/JSClassDefinition.java30
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/WebKit_win32.java120
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Cursor.java14
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Device.java44
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Font.java6
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/FontData.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java308
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GCData.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Image.java148
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Path.java12
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Pattern.java8
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Region.java14
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/TextLayout.java204
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Transform.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/BidiUtil.java62
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/ImageList.java74
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Button.java54
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Canvas.java30
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Caret.java34
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ColorDialog.java12
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Combo.java342
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Composite.java102
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Control.java394
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolBar.java70
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolItem.java26
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/DateTime.java26
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Decorations.java54
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/DirectoryDialog.java28
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java260
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ExpandBar.java54
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ExpandItem.java26
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/FileDialog.java28
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/FontDialog.java16
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Group.java48
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/IME.java48
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Label.java22
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Link.java40
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/List.java236
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Menu.java24
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MenuItem.java42
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MessageBox.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ProgressBar.java26
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Sash.java38
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Scale.java48
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ScrollBar.java30
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Scrollable.java30
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Shell.java120
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Slider.java22
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Spinner.java98
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabFolder.java92
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabItem.java8
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java602
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableColumn.java64
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableItem.java40
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TaskBar.java56
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TaskItem.java50
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Text.java162
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolBar.java128
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolItem.java56
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolTip.java24
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tracker.java36
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TrayItem.java6
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java644
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeColumn.java42
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeItem.java122
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java146
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_ec