diff options
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole')
52 files changed, 323 insertions, 323 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/CAUUID.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/CAUUID.java index 847a8782fd..a64633265f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/CAUUID.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/CAUUID.java @@ -13,6 +13,6 @@ package org.eclipse.swt.internal.ole.win32; public final class CAUUID { public int cElems; /** @field cast=(GUID FAR *) */ - public int /*long*/ pElems; + public long /*int*/ pElems; public static final int sizeof = COM.CAUUID_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COM.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COM.java index 1a0041c62f..4d8f18dd5b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COM.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COM.java @@ -442,25 +442,25 @@ public static final native int CLSIDFromString(char[] lpsz, GUID pclsid); * @param pUnkOuter cast=(LPUNKNOWN) * @param ppv cast=(LPVOID *) */ -public static final native int CoCreateInstance(GUID rclsid, int /*long*/ pUnkOuter, int dwClsContext, GUID riid, int /*long*/[] ppv); +public static final native int CoCreateInstance(GUID rclsid, long /*int*/ pUnkOuter, int dwClsContext, GUID riid, long /*int*/[] ppv); public static final native void CoFreeUnusedLibraries(); /** * @param pServerInfo cast=(COSERVERINFO *) * @param ppv cast=(LPVOID *) */ -public static final native int CoGetClassObject(GUID rclsid, int dwClsContext, int /*long*/ pServerInfo, GUID riid, int /*long*/[] ppv); +public static final native int CoGetClassObject(GUID rclsid, int dwClsContext, long /*int*/ pServerInfo, GUID riid, long /*int*/[] ppv); /** * @param pUnk cast=(IUnknown *) * @param fLock cast=(BOOL) * @param fLastUnlockReleases cast=(BOOL) */ -public static final native int CoLockObjectExternal(int /*long*/ pUnk, boolean fLock, boolean fLastUnlockReleases); +public static final native int CoLockObjectExternal(long /*int*/ pUnk, boolean fLock, boolean fLastUnlockReleases); /** * @param pDataObject cast=(IDataObject *) * @param pDropSource cast=(IDropSource *) * @param pdwEffect cast=(LPDWORD) */ -public static final native int DoDragDrop(int /*long*/ pDataObject, int /*long*/ pDropSource, int dwOKEffect, int[] pdwEffect); +public static final native int DoDragDrop(long /*int*/ pDataObject, long /*int*/ pDropSource, int dwOKEffect, int[] pdwEffect); /** @param szFileName cast=(LPCWSTR) */ public static final native int GetClassFile(char[] szFileName, GUID clsid); /** @param lpsz cast=(LPOLESTR) */ @@ -470,90 +470,90 @@ public static final native boolean IsEqualGUID(GUID rguid1, GUID rguid2); * @param Destination cast=(PVOID) * @param Source cast=(CONST VOID *),flags=no_out */ -public static final native void MoveMemory(int /*long*/ Destination, FORMATETC Source, int Length); +public static final native void MoveMemory(long /*int*/ Destination, FORMATETC Source, int Length); /** * @param DestinationPtr cast=(PVOID) * @param Source cast=(CONST VOID *),flags=no_out */ -public static final native void MoveMemory(int /*long*/ DestinationPtr, GUID Source, int Length); +public static final native void MoveMemory(long /*int*/ DestinationPtr, GUID Source, int Length); /** * @param DestinationPtr cast=(PVOID) * @param Source cast=(CONST VOID *),flags=no_out */ -public static final native void MoveMemory(int /*long*/ DestinationPtr, OLEINPLACEFRAMEINFO Source, int Length); +public static final native void MoveMemory(long /*int*/ DestinationPtr, OLEINPLACEFRAMEINFO Source, int Length); /** * @param Destination cast=(PVOID) * @param Source cast=(CONST VOID *),flags=no_out */ -public static final native void MoveMemory(int /*long*/ Destination, STATSTG Source, int Length); +public static final native void MoveMemory(long /*int*/ Destination, STATSTG Source, int Length); /** * @param Destination cast=(PVOID) * @param Source cast=(CONST VOID *),flags=no_out */ -public static final native void MoveMemory(int /*long*/ Destination, STGMEDIUM Source, int Length); +public static final native void MoveMemory(long /*int*/ Destination, STGMEDIUM Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param SourcePtr cast=(CONST VOID *) */ -public static final native void MoveMemory(STGMEDIUM Destination, int /*long*/ SourcePtr, int Length); +public static final native void MoveMemory(STGMEDIUM Destination, long /*int*/ SourcePtr, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param SourcePtr cast=(CONST VOID *) */ -public static final native void MoveMemory(DISPPARAMS Destination, int /*long*/ SourcePtr, int Length); +public static final native void MoveMemory(DISPPARAMS Destination, long /*int*/ SourcePtr, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param Source cast=(CONST VOID *) */ -public static final native void MoveMemory(FORMATETC Destination, int /*long*/ Source, int Length); +public static final native void MoveMemory(FORMATETC Destination, long /*int*/ Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param SourcePtr cast=(CONST VOID *) */ -public static final native void MoveMemory(GUID Destination, int /*long*/ SourcePtr, int Length); +public static final native void MoveMemory(GUID Destination, long /*int*/ SourcePtr, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param Source cast=(CONST VOID *) */ -public static final native void MoveMemory(STATSTG Destination, int /*long*/ Source, int Length); +public static final native void MoveMemory(STATSTG Destination, long /*int*/ Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param SourcePtr cast=(CONST VOID *) */ -public static final native void MoveMemory(TYPEATTR Destination, int /*long*/ SourcePtr, int Length); +public static final native void MoveMemory(TYPEATTR Destination, long /*int*/ SourcePtr, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param Source cast=(CONST VOID *) */ -public static final native void MoveMemory(RECT Destination, int /*long*/ Source, int Length); +public static final native void MoveMemory(RECT Destination, long /*int*/ Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param Source cast=(CONST VOID *) */ -public static final native void MoveMemory(FUNCDESC Destination, int /*long*/ Source, int Length); +public static final native void MoveMemory(FUNCDESC Destination, long /*int*/ Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param Source cast=(CONST VOID *) */ -public static final native void MoveMemory(VARDESC Destination, int /*long*/ Source, int Length); +public static final native void MoveMemory(VARDESC Destination, long /*int*/ Source, int Length); /** * @param Destination cast=(PVOID),flags=no_in * @param Source cast=(CONST VOID *) */ -public static final native void MoveMemory(VARIANT Destination, int /*long*/ Source, int Length); +public static final native void MoveMemory(VARIANT Destination, long /*int*/ Source, int Length); /** * @param pClientSite cast=(IOleClientSite *) * @param pStg cast=(IStorage *) * @param ppvObject cast=(void **) */ -public static final native int OleCreate(GUID rclsid, GUID riid, int renderopt, FORMATETC pFormatEtc, int /*long*/ pClientSite, int /*long*/ pStg, int /*long*/[] ppvObject); +public static final native int OleCreate(GUID rclsid, GUID riid, int renderopt, FORMATETC pFormatEtc, long /*int*/ pClientSite, long /*int*/ pStg, long /*int*/[] ppvObject); /** * @param lpszFileName cast=(LPCOLESTR) * @param pClientSite cast=(LPOLECLIENTSITE) * @param pStg cast=(LPSTORAGE) * @param ppvObj cast=(LPVOID *) */ -public static final native int OleCreateFromFile(GUID rclsid, char[] lpszFileName, GUID riid, int renderopt, FORMATETC pFormatEtc, int /*long*/ pClientSite, int /*long*/ pStg, int /*long*/[] ppvObj); +public static final native int OleCreateFromFile(GUID rclsid, char[] lpszFileName, GUID riid, int renderopt, FORMATETC pFormatEtc, long /*int*/ pClientSite, long /*int*/ pStg, long /*int*/[] ppvObj); /** * @param hwndOwner cast=(HWND) * @param lpszCaption cast=(LPCOLESTR) @@ -562,38 +562,38 @@ public static final native int OleCreateFromFile(GUID rclsid, char[] lpszFileNam * @param lcid cast=(LCID) * @param lpvReserved cast=(LPVOID) */ -public static final native int OleCreatePropertyFrame(int /*long*/ hwndOwner,int x, int y, char[] lpszCaption, int cObjects, int /*long*/[] lplpUnk, int cPages, int /*long*/ lpPageClsID, int lcid, int dwReserved, int /*long*/ lpvReserved); +public static final native int OleCreatePropertyFrame(long /*int*/ hwndOwner,int x, int y, char[] lpszCaption, int cObjects, long /*int*/[] lplpUnk, int cPages, long /*int*/ lpPageClsID, int lcid, int dwReserved, long /*int*/ lpvReserved); /** * @param pUnk cast=(LPUNKNOWN) * @param dwAspect cast=(DWORD) * @param hdcDraw cast=(HDC) * @param lprcBounds cast=(LPRECT) */ -public static final native int OleDraw(int /*long*/ pUnk, int dwAspect, int /*long*/ hdcDraw, int /*long*/ lprcBounds); +public static final native int OleDraw(long /*int*/ pUnk, int dwAspect, long /*int*/ hdcDraw, long /*int*/ lprcBounds); public static final native int OleFlushClipboard(); /** @param ppDataObject cast=(IDataObject **) */ -public static final native int OleGetClipboard(int /*long*/[] ppDataObject); +public static final native int OleGetClipboard(long /*int*/[] ppDataObject); /** @param pDataObject cast=(IDataObject *) */ -public static final native int OleIsCurrentClipboard(int /*long*/ pDataObject); +public static final native int OleIsCurrentClipboard(long /*int*/ pDataObject); /** @param pObject cast=(LPOLEOBJECT) */ -public static final native boolean OleIsRunning(int /*long*/ pObject); +public static final native boolean OleIsRunning(long /*int*/ pObject); /** * @param pStg cast=(IStorage *) * @param pClientSite cast=(IOleClientSite *) * @param ppvObj cast=(LPVOID *) */ -public static final native int OleLoad(int /*long*/ pStg, GUID riid, int /*long*/ pClientSite, int /*long*/[] ppvObj); +public static final native int OleLoad(long /*int*/ pStg, GUID riid, long /*int*/ pClientSite, long /*int*/[] ppvObj); /** @param pUnknown cast=(LPUNKNOWN) */ -public static final native int OleRun(int /*long*/ pUnknown); +public static final native int OleRun(long /*int*/ pUnknown); /** * @param pPS cast=(IPersistStorage *) * @param pStg cast=(IStorage *) */ -public static final native int OleSave(int /*long*/ pPS, int /*long*/ pStg, boolean fSameAsLoad); +public static final native int OleSave(long /*int*/ pPS, long /*int*/ pStg, boolean fSameAsLoad); /** @param pDataObject cast=(IDataObject *) */ -public static final native int OleSetClipboard(int /*long*/ pDataObject); +public static final native int OleSetClipboard(long /*int*/ pDataObject); /** @param pUnk cast=(LPUNKNOWN) */ -public static final native int OleSetContainedObject(int /*long*/ pUnk, boolean fContained); +public static final native int OleSetContainedObject(long /*int*/ pUnk, boolean fContained); /** * @method flags=trycatch * @param holemenu cast=(HOLEMENU) @@ -602,33 +602,33 @@ public static final native int OleSetContainedObject(int /*long*/ pUnk, boolean * @param lpFrame cast=(LPOLEINPLACEFRAME) * @param lpActiveObj cast=(LPOLEINPLACEACTIVEOBJECT) */ -public static final native int OleSetMenuDescriptor(int /*long*/ holemenu, int /*long*/ hwndFrame, int /*long*/ hwndActiveObject, int /*long*/ lpFrame, int /*long*/ lpActiveObj); +public static final native int OleSetMenuDescriptor(long /*int*/ holemenu, long /*int*/ hwndFrame, long /*int*/ hwndActiveObject, long /*int*/ lpFrame, long /*int*/ lpActiveObj); /** * @param clr cast=(OLE_COLOR) * @param hpal cast=(HPALETTE) * @param pcolorref cast=(COLORREF *) */ -public static final native int OleTranslateColor(int clr, int /*long*/ hpal, int[] pcolorref); +public static final native int OleTranslateColor(int clr, long /*int*/ hpal, int[] pcolorref); /** @param lplpszProgID cast=(LPOLESTR *) */ -public static final native int ProgIDFromCLSID(GUID clsid, int /*long*/[] lplpszProgID); +public static final native int ProgIDFromCLSID(GUID clsid, long /*int*/[] lplpszProgID); /** * @param hwnd cast=(HWND) * @param pDropTarget cast=(IDropTarget *) */ -public static final native int RegisterDragDrop(int /*long*/ hwnd, int /*long*/ pDropTarget); +public static final native int RegisterDragDrop(long /*int*/ hwnd, long /*int*/ pDropTarget); /** @param pmedium cast=(STGMEDIUM *) */ -public static final native void ReleaseStgMedium(int /*long*/ pmedium); +public static final native void ReleaseStgMedium(long /*int*/ pmedium); /** @param hwnd cast=(HWND) */ -public static final native int RevokeDragDrop(int /*long*/ hwnd); +public static final native int RevokeDragDrop(long /*int*/ hwnd); /** * @param hwnd cast=(HWND) * @param pDataObject cast=(IDataObject *) * @param pDropSource cast=(IDropSource *) * @param pdwEffect cast=(DWORD *) */ -public static final native int SHDoDragDrop(int /*long*/ hwnd, int /*long*/ pDataObject, int /*long*/ pDropSource, int dwOKEffect, int[] pdwEffect); +public static final native int SHDoDragDrop(long /*int*/ hwnd, long /*int*/ pDataObject, long /*int*/ pDropSource, int dwOKEffect, int[] pdwEffect); /** @param ppstgOpen cast=(IStorage **) */ -public static final native int StgCreateDocfile(char[] pwcsName, int grfMode, int reserved, int /*long*/[] ppstgOpen); +public static final native int StgCreateDocfile(char[] pwcsName, int grfMode, int reserved, long /*int*/[] ppstgOpen); /** @param pwcsName cast=(const WCHAR *) */ public static final native int StgIsStorageFile(char[] pwcsName); /** @@ -637,144 +637,144 @@ public static final native int StgIsStorageFile(char[] pwcsName); * @param snbExclude cast=(SNB) * @param ppstgOpen cast=(IStorage **) */ -public static final native int StgOpenStorage(char[] pwcsName, int /*long*/ pstgPriority, int grfMode, int /*long*/ snbExclude, int reserved, int /*long*/[] ppstgOpen); +public static final native int StgOpenStorage(char[] pwcsName, long /*int*/ pstgPriority, int grfMode, long /*int*/ snbExclude, int reserved, long /*int*/[] ppstgOpen); /** @param ppsz cast=(LPOLESTR *) */ -public static final native int StringFromCLSID(GUID rclsid, int /*long*/[] ppsz); +public static final native int StringFromCLSID(GUID rclsid, long /*int*/[] ppsz); /** @param sz cast=(OLECHAR *) */ -public static final native int /*long*/ SysAllocString(char [] sz); +public static final native long /*int*/ SysAllocString(char [] sz); /** @param bstr cast=(BSTR) */ -public static final native void SysFreeString(int /*long*/ bstr); +public static final native void SysFreeString(long /*int*/ bstr); /** @param bstr cast=(BSTR) */ -public static final native int SysStringByteLen(int /*long*/ bstr); +public static final native int SysStringByteLen(long /*int*/ bstr); /** @param bstr cast=(BSTR) */ -public static final native int SysStringLen(int /*long*/ bstr); +public static final native int SysStringLen(long /*int*/ bstr); /** * @param pvargDest cast=(VARIANTARG FAR* ) * @param pvarSrc cast=(VARIANTARG FAR* ) * @param vt cast=(VARTYPE) */ -public static final native int VariantChangeType(int /*long*/ pvargDest, int /*long*/ pvarSrc, short wFlags, short vt); +public static final native int VariantChangeType(long /*int*/ pvargDest, long /*int*/ pvarSrc, short wFlags, short vt); /** @param pvarg cast=(VARIANTARG FAR* ) */ -public static final native int VariantClear(int /*long*/ pvarg); +public static final native int VariantClear(long /*int*/ pvarg); /** @param pvarg cast=(VARIANTARG FAR* ) */ -public static final native void VariantInit(int /*long*/ pvarg); +public static final native void VariantInit(long /*int*/ pvarg); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, char[] arg1); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, char[] arg1); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, POINT arg2, int arg3); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, POINT arg2, int arg3); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, POINT arg1, int arg2); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, POINT arg1, long arg2); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, POINT arg0, int arg1); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, SHDRAGIMAGE arg0, int arg1); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, SHDRAGIMAGE arg0, long arg1); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, POINT arg2, int arg3); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, POINT arg2, int arg3); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, POINT arg1, int arg2); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, POINT arg1, long arg2); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, POINT arg0, int arg1); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, SHDRAGIMAGE arg0, int arg1); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, SHDRAGIMAGE arg0, long arg1); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, int arg2, int arg3, int[] arg4); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, int arg2, int arg3, long[] arg4); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, long arg1, int arg2, int arg3, long[] arg4); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, int arg1, int arg2, int arg3, int[] arg4); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, int arg1, int arg2, int arg3, long[] arg4); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, long arg1, int arg2, int arg3, long[] arg4); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, int arg2, int arg3, int arg4, int [] arg5); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, long arg1, int arg2, int arg3, int arg4, long[] arg5); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, int arg1, int arg2, int arg3, int arg4, int [] arg5); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, long arg1, int arg2, int arg3, int arg4, long[] arg5); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long[] arg1); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long[] arg1); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int[] arg2); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long[] arg2); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long[] arg2); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, long[] arg2); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long arg1, int[] arg2); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int[] arg2); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int[] arg2); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, long[] arg2); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long[] arg2); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, long[] arg2); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, long arg1, int[] arg2); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int[] arg2); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, long arg2); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, long arg2); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, DVTARGETDEVICE arg2, SIZE arg3); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, DVTARGETDEVICE arg2, SIZE arg3); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, GUID arg2, int arg3, int [] arg4); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, GUID arg2, long arg3, long [] arg4); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, GUID arg2, int arg3, int [] arg4); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, GUID arg2, long arg3, long [] arg4); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, FORMATETC arg1, int [] arg2); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, FORMATETC arg1, long[] arg2); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, FORMATETC arg1, int [] arg2); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, FORMATETC arg1, long[] arg2); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, GUID arg1); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, GUID arg1); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, GUID arg1, int arg2, int arg3); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, GUID arg1, long arg2, long arg3); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, GUID arg1, int arg2, int arg3); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, GUID arg1, long arg2, long arg3); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, GUID arg1, int arg2, int arg3, DISPPARAMS arg4, int arg5, EXCEPINFO arg6, int[] arg7); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, GUID arg1, int arg2, int arg3, DISPPARAMS arg4, long arg5, EXCEPINFO arg6, int[] arg7); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, GUID arg1, int arg2, int arg3, DISPPARAMS arg4, int arg5, EXCEPINFO arg6, int[] arg7); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, GUID arg1, int arg2, int arg3, DISPPARAMS arg4, long arg5, EXCEPINFO arg6, int[] arg7); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, STATSTG arg1, int [] arg2); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, STATSTG arg1, long[] arg2); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, STATSTG arg1, int [] arg2); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, STATSTG arg1, long[] arg2); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, MSG arg0); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, MSG arg0); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, MSG arg1, int arg2, int arg3, int arg4, RECT arg5); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, MSG arg1, long arg2, int arg3, long arg4, RECT arg5); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, MSG arg1, int arg2, int arg3, int arg4, RECT arg5); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, MSG arg1, long arg2, int arg3, long arg4, RECT arg5); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, SIZE arg1); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, SIZE arg1); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, boolean arg1); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, boolean arg1); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, boolean arg1); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, boolean arg1); -public static final native int VtblCall (int fnNumber, int /*long*/ ppVtbl, boolean arg0); -public static final native int VtblCall (int fnNumber, int /*long*/ ppVtbl, boolean arg0, int arg1); -public static final native int VtblCall (int fnNumber, int /*long*/ ppVtbl, boolean arg0, long arg1); +public static final native int VtblCall (int fnNumber, long /*int*/ ppVtbl, boolean arg0); +public static final native int VtblCall (int fnNumber, long /*int*/ ppVtbl, boolean arg0, int arg1); +public static final native int VtblCall (int fnNumber, long /*int*/ ppVtbl, boolean arg0, long arg1); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, CAUUID arg0); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, CONTROLINFO arg0); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, FORMATETC arg0); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, FORMATETC arg0, STGMEDIUM arg1); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, FORMATETC arg0, STGMEDIUM arg1, boolean arg2); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, GUID arg0); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, CAUUID arg0); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, CONTROLINFO arg0); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, FORMATETC arg0); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, FORMATETC arg0, STGMEDIUM arg1); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, FORMATETC arg0, STGMEDIUM arg1, boolean arg2); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, GUID arg0); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, GUID arg0, int[] arg1); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, GUID arg0, long[] arg1); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, GUID arg0, int[] arg1); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, GUID arg0, long[] arg1); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, GUID arg0, GUID arg1, int[] arg2); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, GUID arg0, GUID arg1, long[] arg2); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, GUID arg0, GUID arg1, int[] arg2); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, GUID arg0, GUID arg1, long[] arg2); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, GUID arg0, int arg1, int arg2, int arg3, int[] arg4); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, GUID arg0, long arg1, int arg2, int arg3, int[] arg4); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, GUID arg0, int arg1, int arg2, int arg3, int[] arg4); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, GUID arg0, long arg1, int arg2, int arg3, int[] arg4); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, GUID arg0, int arg1, int arg2, int arg3, int arg4); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, GUID arg0, int arg1, int arg2, long arg3, long arg4); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, GUID arg0, int arg1, int arg2, int arg3, int arg4); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, GUID arg0, int arg1, int arg2, long arg3, long arg4); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, GUID arg0, int arg1, OLECMD arg2, OLECMDTEXT arg3); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, GUID arg0, int arg1, OLECMD arg2, OLECMDTEXT arg3); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, LICINFO arg0); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, LICINFO arg0); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, RECT arg0, int arg1, boolean arg2); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, RECT arg0, long arg1, boolean arg2); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, RECT arg0, int arg1, boolean arg2); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, RECT arg0, long arg1, boolean arg2); /** * @param arg0 flags=struct */ -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, RECT arg0, int arg1, int arg2); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, RECT arg0, int arg1, int arg2); /** * @param arg0 flags=struct */ -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, RECT arg0, long arg1, long arg2); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, RECT arg0, long arg1, long arg2); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, RECT arg0, RECT arg1); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, RECT arg0); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, RECT arg0, RECT arg1); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, RECT arg0); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int [] arg1, int [] arg2, int[] arg3, int [] arg4); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long[] arg1, long[] arg2, int[] arg3, long[] arg4); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int [] arg1, int [] arg2, int[] arg3, int [] arg4); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, long[] arg1, long[] arg2, int[] arg3, long[] arg4); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int [] arg1, int arg2, int[] arg3); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long[] arg1, int arg2, int[] arg3); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int [] arg1, int arg2, int[] arg3); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, long[] arg1, int arg2, int[] arg3); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, DISPPARAMS arg3, int arg4, EXCEPINFO arg5, int arg6); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, DISPPARAMS arg3, long arg4, EXCEPINFO arg5, long arg6); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, DISPPARAMS arg3, int arg4, EXCEPINFO arg5, int arg6); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, DISPPARAMS arg3, long arg4, EXCEPINFO arg5, long arg6); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] pszPropName, int[] pVar, int[] pErrorLog); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] pszPropName, int pVar, int[] pErrorLog); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] pszPropName, int[] pVar, int[] pErrorLog); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] pszPropName, int pVar, int[] pErrorLog); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int type, int listener, boolean useCapture); -public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long type, long listener, boolean useCapture); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int type, int listener, boolean useCapture); +public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long type, long listener, boolean useCapture); /** @param pStg cast=(IStorage *) */ -public static final native int WriteClassStg(int /*long*/ pStg, GUID rclsid); +public static final native int WriteClassStg(long /*int*/ pStg, GUID rclsid); /** Accessibility constants */ public static final int CHILDID_SELF = 0; @@ -950,18 +950,18 @@ public static final int IA2_SCROLL_TYPE_ANYWHERE = 6; * @param dwObjectID cast=(DWORD) * @param ppvObject cast=(LPVOID *) */ -public static final native int AccessibleObjectFromWindow (int /*long*/ hwnd, int dwObjectID, GUID riid, int /*long*/[] ppvObject); +public static final native int AccessibleObjectFromWindow (long /*int*/ hwnd, int dwObjectID, GUID riid, long /*int*/[] ppvObject); /** * @method flags=dynamic * @param hwnd cast=(HWND) * @param ppvObject cast=(LPVOID *) */ -public static final native int CreateStdAccessibleObject (int /*long*/ hwnd, int idObject, GUID riidInterface, int /*long*/[] ppvObject); +public static final native int CreateStdAccessibleObject (long /*int*/ hwnd, int idObject, GUID riidInterface, long /*int*/[] ppvObject); /** * @method flags=dynamic * @param pAcc cast=(LPUNKNOWN) */ -public static final native int /*long*/ LresultFromObject (GUID riid, int /*long*/ wParam, int /*long*/ pAcc); +public static final native long /*int*/ LresultFromObject (GUID riid, long /*int*/ wParam, long /*int*/ pAcc); /** * @method flags=dynamic * @param paccContainer cast=(IAccessible *) @@ -970,63 +970,63 @@ public static final native int /*long*/ LresultFromObject (GUID riid, int /*long * @param rgvarChildren cast=(VARIANT *) * @param pcObtained cast=(LONG *) */ -public static final native int AccessibleChildren(int /*long*/ paccContainer, int iChildStart, int cChildren, int /*long*/ rgvarChildren, int [] pcObtained); +public static final native int AccessibleChildren(long /*int*/ paccContainer, int iChildStart, int cChildren, long /*int*/ rgvarChildren, int [] pcObtained); -/*USED*/public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3); -/*USED*/public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4); +/*USED*/public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3); +/*USED*/public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4); /*USED,NEW*/public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, int arg1, int arg2, int arg3, long arg4); -/*USED*/public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int /*long*/ arg5); -/*USED,NEW*/public static final native int VtblCall(int fnNumber, long ppVtbl, long arg0, int arg1, int arg2, int arg3, int arg4, int /*long*/ arg5); -/*USED*/public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int arg4, int arg5, int arg6, int arg7); +/*USED*/public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, long /*int*/ arg5); +/*USED,NEW*/public static final native int VtblCall(int fnNumber, long ppVtbl, long arg0, int arg1, int arg2, int arg3, int arg4, long /*int*/ arg5); +/*USED*/public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, int arg4, int arg5, int arg6, int arg7); /** Custom accessibility natives */ /** @method flags=no_gen */ -public static final native int VtblCall_VARIANT(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0); +public static final native int VtblCall_VARIANT(int fnNumber, long /*int*/ ppVtbl, long /*int*/ arg0); /** @method flags=no_gen */ -public static final native int VtblCall_VARIANTP(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0, int /*long*/ arg1); +public static final native int VtblCall_VARIANTP(int fnNumber, long /*int*/ ppVtbl, long /*int*/ arg0, long /*int*/ arg1); /** @method flags=no_gen */ -public static final native int VtblCall_IVARIANT(int fnNumber, int /*long*/ ppVtbl, int arg0, int /*long*/ arg1); +public static final native int VtblCall_IVARIANT(int fnNumber, long /*int*/ ppVtbl, int arg0, long /*int*/ arg1); /** @method flags=no_gen */ -public static final native int VtblCall_IVARIANTP(int fnNumber, int /*long*/ ppVtbl, int arg0, int /*long*/ arg1, int /*long*/ arg2); +public static final native int VtblCall_IVARIANTP(int fnNumber, long /*int*/ ppVtbl, int arg0, long /*int*/ arg1, long /*int*/ arg2); /** @method flags=no_gen */ -public static final native int VtblCall_PVARIANTP(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2); +public static final native int VtblCall_PVARIANTP(int fnNumber, long /*int*/ ppVtbl, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2); /** @method flags=no_gen */ -public static final native int VtblCall_PPPPVARIANT(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ arg4); +public static final native int VtblCall_PPPPVARIANT(int fnNumber, long /*int*/ ppVtbl, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ arg4); /** @method flags=no_gen */ -public static final native int /*long*/ get_accChild_CALLBACK(int /*long*/ func); +public static final native long /*int*/ get_accChild_CALLBACK(long /*int*/ func); /** @method flags=no_gen */ -public static final native int /*long*/ get_accName_CALLBACK(int /*long*/ func); +public static final native long /*int*/ get_accName_CALLBACK(long /*int*/ func); /** @method flags=no_gen */ -public static final native int /*long*/ get_accValue_CALLBACK(int /*long*/ func); +public static final native long /*int*/ get_accValue_CALLBACK(long /*int*/ func); /** @method flags=no_gen */ -public static final native int /*long*/ get_accDescription_CALLBACK(int /*long*/ func); +public static final native long /*int*/ get_accDescription_CALLBACK(long /*int*/ func); /** @method flags=no_gen */ -public static final native int /*long*/ get_accRole_CALLBACK(int /*long*/ func); +public static final native long /*int*/ get_accRole_CALLBACK(long /*int*/ func); /** @method flags=no_gen */ -public static final native int /*long*/ get_accState_CALLBACK(int /*long*/ func); +public static final native long /*int*/ get_accState_CALLBACK(long /*int*/ func); /** @method flags=no_gen */ -public static final native int /*long*/ get_accHelp_CALLBACK(int /*long*/ func); +public static final native long /*int*/ get_accHelp_CALLBACK(long /*int*/ func); /** @method flags=no_gen */ -public static final native int /*long*/ get_accHelpTopic_CALLBACK(int /*long*/ func); +public static final native long /*int*/ get_accHelpTopic_CALLBACK(long /*int*/ func); /** @method flags=no_gen */ -public static final native int /*long*/ get_accKeyboardShortcut_CALLBACK(int /*long*/ func); +public static final native long /*int*/ get_accKeyboardShortcut_CALLBACK(long /*int*/ func); /** @method flags=no_gen */ -public static final native int /*long*/ get_accDefaultAction_CALLBACK(int /*long*/ func); +public static final native long /*int*/ get_accDefaultAction_CALLBACK(long /*int*/ func); /** @method flags=no_gen */ -public static final native int /*long*/ accSelect_CALLBACK(int /*long*/ func); +public static final native long /*int*/ accSelect_CALLBACK(long /*int*/ func); /** @method flags=no_gen */ -public static final native int /*long*/ accLocation_CALLBACK(int /*long*/ func); +public static final native long /*int*/ accLocation_CALLBACK(long /*int*/ func); /** @method flags=no_gen */ -public static final native int /*long*/ accNavigate_CALLBACK(int /*long*/ func); +public static final native long /*int*/ accNavigate_CALLBACK(long /*int*/ func); /** @method flags=no_gen */ -public static final native int /*long*/ accDoDefaultAction_CALLBACK(int /*long*/ func); +public static final native long /*int*/ accDoDefaultAction_CALLBACK(long /*int*/ func); /** @method flags=no_gen */ -public static final native int /*long*/ put_accName_CALLBACK(int /*long*/ func); +public static final native long /*int*/ put_accName_CALLBACK(long /*int*/ func); /** @method flags=no_gen */ -public static final native int /*long*/ put_accValue_CALLBACK(int /*long*/ func); +public static final native long /*int*/ put_accValue_CALLBACK(long /*int*/ func); /** @method flags=no_gen,callback_types=HRESULT;VARIANT;,callback_flags=none;struct; */ -public static final native int /*long*/ CALLBACK_setCurrentValue(int /*long*/ func); +public static final native long /*int*/ CALLBACK_setCurrentValue(long /*int*/ func); /* sizeof's */ public static final native int CAUUID_sizeof(); diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/CONTROLINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/CONTROLINFO.java index d95aac5123..5ba2d6f505 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/CONTROLINFO.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/CONTROLINFO.java @@ -13,7 +13,7 @@ package org.eclipse.swt.internal.ole.win32; public final class CONTROLINFO { public int cb; /** @field cast=(HACCEL) */ - public int /*long*/ hAccel; + public long /*int*/ hAccel; public short cAccel; public int dwFlags; public static final int sizeof = COM.CONTROLINFO_sizeof (); diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COSERVERINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COSERVERINFO.java index 125240cfd9..82d51abf58 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COSERVERINFO.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COSERVERINFO.java @@ -13,9 +13,9 @@ package org.eclipse.swt.internal.ole.win32; public class COSERVERINFO { public int dwReserved1; /** @field cast=(LPWSTR) */ - public int /*long*/ pwszName; + public long /*int*/ pwszName; /** @field cast=(COAUTHINFO *) */ - public int /*long*/ pAuthInfo; + public long /*int*/ pAuthInfo; public int dwReserved2; public static final int sizeof = COM.COSERVERINFO_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/DISPPARAMS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/DISPPARAMS.java index db5c5886ac..014e86ceb0 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/DISPPARAMS.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/DISPPARAMS.java @@ -12,9 +12,9 @@ package org.eclipse.swt.internal.ole.win32; public final class DISPPARAMS { /** @field cast=(VARIANTARG FAR *) */ - public int /*long*/ rgvarg; + public long /*int*/ rgvarg; /** @field cast=(DISPID FAR *) */ - public int /*long*/ rgdispidNamedArgs; + public long /*int*/ rgdispidNamedArgs; public int cArgs; public int cNamedArgs; public static final int sizeof = COM.DISPPARAMS_sizeof (); diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/EXCEPINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/EXCEPINFO.java index 207dea841f..a2e0ebbdab 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/EXCEPINFO.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/EXCEPINFO.java @@ -14,16 +14,16 @@ public final class EXCEPINFO { public short wCode; public short wReserved; /** @field cast=(BSTR) */ - public int /*long*/ bstrSource; + public long /*int*/ bstrSource; /** @field cast=(BSTR) */ - public int /*long*/ bstrDescription; + public long /*int*/ bstrDescription; /** @field cast=(BSTR) */ - public int /*long*/ bstrHelpFile; + public long /*int*/ bstrHelpFile; public int dwHelpContext; /** @field cast=(void FAR *) */ - public int /*long*/ pvReserved; + public long /*int*/ pvReserved; /** @field cast=(HRESULT (STDAPICALLTYPE FAR* )(struct tagEXCEPINFO FAR*)) */ - public int /*long*/ pfnDeferredFillIn; + public long /*int*/ pfnDeferredFillIn; public int scode; public static final int sizeof = COM.EXCEPINFO_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/FORMATETC.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/FORMATETC.java index 5bfaf024ce..f5f53878e8 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/FORMATETC.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/FORMATETC.java @@ -14,7 +14,7 @@ public final class FORMATETC { /** @field cast=(CLIPFORMAT) */ public int cfFormat; /** @field cast=(DVTARGETDEVICE *) */ - public int /*long*/ ptd; + public long /*int*/ ptd; public int dwAspect; public int lindex; public int tymed; diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/FUNCDESC.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/FUNCDESC.java index a9e4ab3d4e..be3f07b275 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/FUNCDESC.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/FUNCDESC.java @@ -14,9 +14,9 @@ public class FUNCDESC { /** @field cast=(MEMBERID) */ public int memid; /** @field cast=(SCODE FAR *) */ - public int /*long*/ lprgscode; + public long /*int*/ lprgscode; /** @field cast=(ELEMDESC FAR *) */ - public int /*long*/ lprgelemdescParam; + public long /*int*/ lprgelemdescParam; /** @field cast=(FUNCKIND) */ public int funckind; /** @field cast=(INVOKEKIND) */ @@ -30,12 +30,12 @@ public class FUNCDESC { // ELEMDESC elemdescFunc; // TYPEDESC elemdescFunc.tdesc /** @field accessor=elemdescFunc.tdesc.lptdesc,cast=(struct FARSTRUCT tagTYPEDESC FAR* ) */ - public int /*long*/ elemdescFunc_tdesc_union; + public long /*int*/ elemdescFunc_tdesc_union; /** @field accessor=elemdescFunc.tdesc.vt */ public short elemdescFunc_tdesc_vt; // PARAMDESC elemdescFunc.paramdesc /** @field accessor=elemdescFunc.paramdesc.pparamdescex,cast=(LPPARAMDESCEX) */ - public int /*long*/ elemdescFunc_paramdesc_pparamdescex; + public long /*int*/ elemdescFunc_paramdesc_pparamdescex; /** @field accessor=elemdescFunc.paramdesc.wParamFlags */ public short elemdescFunc_paramdesc_wParamFlags; public short wFuncFlags; diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IAccessible.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IAccessible.java index 607d4e7e67..2302ae3de1 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IAccessible.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IAccessible.java @@ -13,71 +13,71 @@ package org.eclipse.swt.internal.ole.win32; public class IAccessible extends IDispatch { -public IAccessible(int /*long*/ address) { +public IAccessible(long /*int*/ address) { super(address); } -public int get_accParent(int /*long*/ ppdispParent) { +public int get_accParent(long /*int*/ ppdispParent) { return COM.VtblCall(7, address, ppdispParent); } -public int get_accChildCount(int /*long*/ pcountChildren) { +public int get_accChildCount(long /*int*/ pcountChildren) { return COM.VtblCall(8, address, pcountChildren); } -public int get_accChild(int /*long*/ variant, int /*long*/ ppdispChild) { +public int get_accChild(long /*int*/ variant, long /*int*/ ppdispChild) { return COM.VtblCall_VARIANTP(9, address, variant, ppdispChild); } -public int get_accName(int /*long*/ variant, int /*long*/ pszName) { +public int get_accName(long /*int*/ variant, long /*int*/ pszName) { return COM.VtblCall_VARIANTP(10, address, variant, pszName); } -public int get_accValue(int /*long*/ variant, int /*long*/ pszValue) { +public int get_accValue(long /*int*/ variant, long /*int*/ pszValue) { return COM.VtblCall_VARIANTP(11, address, variant, pszValue); } -public int get_accDescription(int /*long*/ variant, int /*long*/ pszDescription) { +public int get_accDescription(long /*int*/ variant, long /*int*/ pszDescription) { return COM.VtblCall_VARIANTP(12, address, variant, pszDescription); } -public int get_accRole(int /*long*/ variant, int /*long*/ pvarRole) { +public int get_accRole(long /*int*/ variant, long /*int*/ pvarRole) { return COM.VtblCall_VARIANTP(13, address, variant, pvarRole); } -public int get_accState(int /*long*/ variant, int /*long*/ pvarState) { +public int get_accState(long /*int*/ variant, long /*int*/ pvarState) { return COM.VtblCall_VARIANTP(14, address, variant, pvarState); } -public int get_accHelp(int /*long*/ variant, int /*long*/ pszHelp) { +public int get_accHelp(long /*int*/ variant, long /*int*/ pszHelp) { return COM.VtblCall_VARIANTP(15, address, variant, pszHelp); } -public int get_accHelpTopic(int /*long*/ pszHelpFile, int /*long*/ variant, int /*long*/ pidTopic) { +public int get_accHelpTopic(long /*int*/ pszHelpFile, long /*int*/ variant, long /*int*/ pidTopic) { return COM.VtblCall_PVARIANTP(16, address, pszHelpFile, variant, pidTopic); } -public int get_accKeyboardShortcut(int /*long*/ variant, int /*long*/ pszKeyboardShortcut) { +public int get_accKeyboardShortcut(long /*int*/ variant, long /*int*/ pszKeyboardShortcut) { return COM.VtblCall_VARIANTP(17, address, variant, pszKeyboardShortcut); } -public int get_accFocus(int /*long*/ pvarChild) { +public int get_accFocus(long /*int*/ pvarChild) { return COM.VtblCall(18, address, pvarChild); } -public int get_accSelection(int /*long*/ pvarChildren) { +public int get_accSelection(long /*int*/ pvarChildren) { return COM.VtblCall(19, address, pvarChildren); } -public int get_accDefaultAction(int /*long*/ variant, int /*long*/ pszDefaultAction) { +public int get_accDefaultAction(long /*int*/ variant, long /*int*/ pszDefaultAction) { return COM.VtblCall_VARIANTP(20, address, variant, pszDefaultAction); } -public int accSelect(int flagsSelect, int /*long*/ variant) { +public int accSelect(int flagsSelect, long /*int*/ variant) { return COM.VtblCall_IVARIANT(21, address, flagsSelect, variant); } -public int accLocation(int /*long*/ pxLeft, int /*long*/ pyTop, int /*long*/ pcxWidth, int /*long*/ pcyHeight, int /*long*/ variant) { +public int accLocation(long /*int*/ pxLeft, long /*int*/ pyTop, long /*int*/ pcxWidth, long /*int*/ pcyHeight, long /*int*/ variant) { return COM.VtblCall_PPPPVARIANT(22, address, pxLeft, pyTop, pcxWidth, pcyHeight, variant); } -public int accNavigate(int navDir, int /*long*/ variant, int /*long*/ pvarEndUpAt) { +public int accNavigate(int navDir, long /*int*/ variant, long /*int*/ pvarEndUpAt) { return COM.VtblCall_IVARIANTP(23, address, navDir, variant, pvarEndUpAt); } -public int accHitTest(int xLeft, int yTop, int /*long*/ pvarChild) { +public int accHitTest(int xLeft, int yTop, long /*int*/ pvarChild) { return COM.VtblCall(24, address, xLeft, yTop, pvarChild); } -public int accDoDefaultAction(int /*long*/ variant) { +public int accDoDefaultAction(long /*int*/ variant) { return COM.VtblCall_VARIANT(25, address, variant); } -public int put_accName(int /*long*/ variant, int /*long*/ szName) { +public int put_accName(long /*int*/ variant, long /*int*/ szName) { return COM.VtblCall_VARIANTP(26, address, variant, szName); } -public int put_accValue(int /*long*/ variant, int /*long*/ szValue) { +public int put_accValue(long /*int*/ variant, long /*int*/ szValue) { return COM.VtblCall_VARIANTP(27, address, variant, szValue); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IClassFactory2.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IClassFactory2.java index c10211c0a0..b910113f88 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IClassFactory2.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IClassFactory2.java @@ -12,16 +12,16 @@ package org.eclipse.swt.internal.ole.win32; public class IClassFactory2 extends IUnknown { -public IClassFactory2(int /*long*/ address) { +public IClassFactory2(long /*int*/ address) { super(address); } -public int CreateInstanceLic(int /*long*/ pUnkOuter, int /*long*/ pUnkReserved, GUID riid, int /*long*/ bstrKey, int /*long*/ ppvObject[]) { +public int CreateInstanceLic(long /*int*/ pUnkOuter, long /*int*/ pUnkReserved, GUID riid, long /*int*/ bstrKey, long /*int*/ ppvObject[]) { return COM.VtblCall(7, address, pUnkOuter, pUnkReserved, riid, bstrKey, ppvObject); } public int GetLicInfo(LICINFO licInfo) { return COM.VtblCall(5, address, licInfo); } -public int RequestLicKey(int dwReserved, int /*long*/[] pBstrKey) { +public int RequestLicKey(int dwReserved, long /*int*/[] pBstrKey) { return COM.VtblCall(6, address, dwReserved, pBstrKey); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IConnectionPoint.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IConnectionPoint.java index 66b4b3599f..afa960f7dd 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IConnectionPoint.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IConnectionPoint.java @@ -12,10 +12,10 @@ package org.eclipse.swt.internal.ole.win32; public class IConnectionPoint extends IUnknown { -public IConnectionPoint(int /*long*/ address) { +public IConnectionPoint(long /*int*/ address) { super(address); } -public int Advise(int /*long*/ pUnk, int[] pdwCookie) { +public int Advise(long /*int*/ pUnk, int[] pdwCookie) { return COM.VtblCall(5, address, pUnk, pdwCookie); } public int Unadvise(int dwCookie) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IConnectionPointContainer.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IConnectionPointContainer.java index 250713aa25..083208b86b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IConnectionPointContainer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IConnectionPointContainer.java @@ -12,10 +12,10 @@ package org.eclipse.swt.internal.ole.win32; public class IConnectionPointContainer extends IUnknown { -public IConnectionPointContainer(int /*long*/ address) { +public IConnectionPointContainer(long /*int*/ address) { super(address); } -public int FindConnectionPoint(GUID riid, int /*long*/[] ppCP) { +public int FindConnectionPoint(GUID riid, long /*int*/[] ppCP) { return COM.VtblCall(4, address, riid, ppCP); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDataObject.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDataObject.java index b788e201b0..d183e8906b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDataObject.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDataObject.java @@ -11,10 +11,10 @@ package org.eclipse.swt.internal.ole.win32; public class IDataObject extends IUnknown { -public IDataObject(int /*long*/ address) { +public IDataObject(long /*int*/ address) { super(address); } -public int EnumFormatEtc(int dwDirection, int /*long*/[] ppenumFormatetc) { +public int EnumFormatEtc(int dwDirection, long /*int*/[] ppenumFormatetc) { return COM.VtblCall(8, address, dwDirection, ppenumFormatetc); } public int GetData(FORMATETC pFormatetc, STGMEDIUM pmedium) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDispatch.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDispatch.java index 211582bceb..e12faaca8b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDispatch.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDispatch.java @@ -14,7 +14,7 @@ import org.eclipse.swt.internal.win32.*; public class IDispatch extends IUnknown { -public IDispatch(int /*long*/ address) { +public IDispatch(long /*int*/ address) { super(address); } public int GetIDsOfNames(GUID riid, String[] rgszNames, int cNames, int lcid, int[] rgDispId) { @@ -23,9 +23,9 @@ public int GetIDsOfNames(GUID riid, String[] rgszNames, int cNames, int lcid, in int size = rgszNames.length; // create an array to hold the addresses - int /*long*/ hHeap = OS.GetProcessHeap(); - int /*long*/ ppNames = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, size * OS.PTR_SIZEOF); - int /*long*/[] memTracker = new int /*long*/[size]; + long /*int*/ hHeap = OS.GetProcessHeap(); + long /*int*/ ppNames = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, size * OS.PTR_SIZEOF); + long /*int*/[] memTracker = new long /*int*/[size]; try { // add the address of each string to the array @@ -36,10 +36,10 @@ public int GetIDsOfNames(GUID riid, String[] rgszNames, int cNames, int lcid, in buffer = new char[nameSize +1]; rgszNames[i].getChars(0, nameSize, buffer, 0); // get the address of the start of the array of char - int /*long*/ pName = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, buffer.length * 2); + long /*int*/ pName = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, buffer.length * 2); OS.MoveMemory(pName, buffer, buffer.length * 2); // copy the address to the array of addresses - COM.MoveMemory(ppNames + OS.PTR_SIZEOF * i, new int /*long*/[]{pName}, OS.PTR_SIZEOF); + COM.MoveMemory(ppNames + OS.PTR_SIZEOF * i, new long /*int*/[]{pName}, OS.PTR_SIZEOF); // keep track of the Global Memory so we can free it memTracker[i] = pName; } @@ -54,13 +54,13 @@ public int GetIDsOfNames(GUID riid, String[] rgszNames, int cNames, int lcid, in OS.HeapFree(hHeap, 0, ppNames); } } -public int GetTypeInfo(int iTInfo, int lcid, int /*long*/[] ppTInfo ){ +public int GetTypeInfo(int iTInfo, int lcid, long /*int*/[] ppTInfo ){ return COM.VtblCall(4, address, iTInfo, lcid, ppTInfo); } public int GetTypeInfoCount(int [] pctinfo ){ return COM.VtblCall(3, address, pctinfo); } -public int Invoke(int dispIdMember, GUID riid, int lcid, int dwFlags, DISPPARAMS pDispParams, int /*long*/ pVarResult, EXCEPINFO pExcepInfo, int[] pArgErr) { +public int Invoke(int dispIdMember, GUID riid, int lcid, int dwFlags, DISPPARAMS pDispParams, long /*int*/ pVarResult, EXCEPINFO pExcepInfo, int[] pArgErr) { return COM.VtblCall(6, address, dispIdMember, riid, lcid, dwFlags, pDispParams, pVarResult, pExcepInfo, pArgErr); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDispatchEx.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDispatchEx.java index 76e18752b3..6c857d26d9 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDispatchEx.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDispatchEx.java @@ -12,19 +12,19 @@ package org.eclipse.swt.internal.ole.win32; public class IDispatchEx extends IDispatch { -public IDispatchEx (int /*long*/ address) { +public IDispatchEx (long /*int*/ address) { super (address); } -public int GetDispID (int /*long*/ bstrName, int grfdex, int[] pid) { +public int GetDispID (long /*int*/ bstrName, int grfdex, int[] pid) { return COM.VtblCall (7, address, bstrName, grfdex, pid); } -public int InvokeEx (int id, int lcid, int wFlags, DISPPARAMS pdp, int /*long*/ pvarRes, EXCEPINFO pei, int /*long*/ pspCaller) { +public int InvokeEx (int id, int lcid, int wFlags, DISPPARAMS pdp, long /*int*/ pvarRes, EXCEPINFO pei, long /*int*/ pspCaller) { return COM.VtblCall (8, address, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); } -public int DeleteMemberByName (int /*long*/ bstrName, int grfdex) { +public int DeleteMemberByName (long /*int*/ bstrName, int grfdex) { return COM.VtblCall (9, address, bstrName, grfdex); } @@ -36,7 +36,7 @@ public int GetMemberProperties (int id, int grfdexFetch, int[] pgrfdex) { return COM.VtblCall (11, address, id, grfdexFetch, pgrfdex); } -public int GetMemberName (int id, int /*long*/[] pbstrName) { +public int GetMemberName (int id, long /*int*/[] pbstrName) { return COM.VtblCall (12, address, id, pbstrName); } @@ -44,7 +44,7 @@ public int GetNextDispID (int grfdex, int id, int[] pid) { return COM.VtblCall (13, address, grfdex, id, pid); } -public int GetNameSpaceParent (int /*long*/[] ppunk) { +public int GetNameSpaceParent (long /*int*/[] ppunk) { return COM.VtblCall (14, address, ppunk); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDragSourceHelper.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDragSourceHelper.java index b739306765..4e2221db84 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDragSourceHelper.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDragSourceHelper.java @@ -13,13 +13,13 @@ package org.eclipse.swt.internal.ole.win32; import org.eclipse.swt.internal.win32.*; public class IDragSourceHelper extends IUnknown { -public IDragSourceHelper(int /*long*/ address) { +public IDragSourceHelper(long /*int*/ address) { super(address); } -public int InitializeFromBitmap(SHDRAGIMAGE pshdi, int /*long*/ pDataObject) { +public int InitializeFromBitmap(SHDRAGIMAGE pshdi, long /*int*/ pDataObject) { return COM.VtblCall(3, address, pshdi, pDataObject); } -public int InitializeFromWindow(int /*long*/ hwnd, POINT ppt, int /*long*/ pDataObject) { +public int InitializeFromWindow(long /*int*/ hwnd, POINT ppt, long /*int*/ pDataObject) { return COM.VtblCall(4, address, hwnd, ppt, pDataObject); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDragSourceHelper2.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDragSourceHelper2.java index 5a2f611f2f..76621b5fe6 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDragSourceHelper2.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDragSourceHelper2.java @@ -11,7 +11,7 @@ package org.eclipse.swt.internal.ole.win32; public class IDragSourceHelper2 extends IDragSourceHelper { -public IDragSourceHelper2(int /*long*/ address) { +public IDragSourceHelper2(long /*int*/ address) { super(address); } public int SetFlags(int dwFlags) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDropTargetHelper.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDropTargetHelper.java index 4c66578475..294b3ad2f4 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDropTargetHelper.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDropTargetHelper.java @@ -13,10 +13,10 @@ package org.eclipse.swt.internal.ole.win32; import org.eclipse.swt.internal.win32.*; public class IDropTargetHelper extends IUnknown { -public IDropTargetHelper(int /*long*/ address) { +public IDropTargetHelper(long /*int*/ address) { super(address); } -public int DragEnter(int /*long*/ hwndTarget, int /*long*/ pDataObject, POINT ppt, int dwEffect) { +public int DragEnter(long /*int*/ hwndTarget, long /*int*/ pDataObject, POINT ppt, int dwEffect) { return COM.VtblCall(3, address, hwndTarget, pDataObject, ppt, dwEffect); } public int DragLeave() { @@ -25,7 +25,7 @@ public int DragLeave() { public int DragOver(POINT ppt, int dwEffect) { return COM.VtblCall(5, address, ppt, dwEffect); } -public int Drop(int /*long*/ pDataObject, POINT ppt, int dwEffect) { +public int Drop(long /*int*/ pDataObject, POINT ppt, int dwEffect) { return COM.VtblCall(6, address, pDataObject, ppt, dwEffect); } public int Show(boolean fShow) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnum.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnum.java index e208d9b0c2..0ab50ddd4b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnum.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnum.java @@ -12,13 +12,13 @@ package org.eclipse.swt.internal.ole.win32; public class IEnum extends IUnknown { -public IEnum(int /*long*/ address) { +public IEnum(long /*int*/ address) { super(address); } -public int Clone( int /*long*/[] ppenum ){ +public int Clone( long /*int*/[] ppenum ){ return COM.VtblCall(6, address, ppenum); } -public int Next(int celt, int /*long*/ rgelt, int[] pceltFetched ){ +public int Next(int celt, long /*int*/ rgelt, int[] pceltFetched ){ return COM.VtblCall(3, address, celt, rgelt, pceltFetched); } public int Reset() { diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumFORMATETC.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumFORMATETC.java index 44db7e38df..43fe9bf70a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumFORMATETC.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumFORMATETC.java @@ -11,7 +11,7 @@ package org.eclipse.swt.internal.ole.win32; public class IEnumFORMATETC extends IEnum { -public IEnumFORMATETC(int /*long*/ address) { +public IEnumFORMATETC(long /*int*/ address) { super(address); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumSTATSTG.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumSTATSTG.java index 7ae5f3c343..4beb656c43 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumSTATSTG.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumSTATSTG.java @@ -11,7 +11,7 @@ package org.eclipse.swt.internal.ole.win32; public class IEnumSTATSTG extends IEnum { -public IEnumSTATSTG(int /*long*/ address) { +public IEnumSTATSTG(long /*int*/ address) { super(address); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumVARIANT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumVARIANT.java index 478178a8ca..d14e1dff91 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumVARIANT.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumVARIANT.java @@ -11,7 +11,7 @@ package org.eclipse.swt.internal.ole.win32; public class IEnumVARIANT extends IEnum { -public IEnumVARIANT(int /*long*/ address) { +public IEnumVARIANT(long /*int*/ address) { super(address); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IFont.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IFont.java index edfdd07b40..291c7c1435 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IFont.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IFont.java @@ -11,10 +11,10 @@ package org.eclipse.swt.internal.ole.win32; public class IFont extends IUnknown { -public IFont(int /*long*/ address) { +public IFont(long /*int*/ address) { super(address); } -public int get_hFont(int /*long*/[] phfont){ +public int get_hFont(long /*int*/[] phfont){ return COM.VtblCall(3, address, phfont); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IMoniker.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IMoniker.java index 4ef147e8db..4b1f94bbaa 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IMoniker.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IMoniker.java @@ -12,7 +12,7 @@ package org.eclipse.swt.internal.ole.win32; public class IMoniker extends IPersist { -public IMoniker(int /*long*/ address) { +public IMoniker(long /*int*/ address) { super(address); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleCommandTarget.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleCommandTarget.java index 734cdad81b..b322f2c325 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleCommandTarget.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleCommandTarget.java @@ -11,15 +11,15 @@ package org.eclipse.swt.internal.ole.win32; public class IOleCommandTarget extends IUnknown { -public IOleCommandTarget(int /*long*/ address) { +public IOleCommandTarget(long /*int*/ address) { super(address); } public int Exec( GUID pguidCmdGroup, // Pointer to command group int nCmdID, // Identifier of command to execute int nCmdExecOpt, // Options for executing the command - int /*long*/ pvaIn, // Pointer to input arguments - int /*long*/ pvaOut // Pointer to command output + long /*int*/ pvaIn, // Pointer to input arguments + long /*int*/ pvaOut // Pointer to command output ){ return COM.VtblCall(4, address, pguidCmdGroup, nCmdID, nCmdExecOpt, pvaIn, pvaOut); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleControl.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleControl.java index 5e009c87bb..652de7f79e 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleControl.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleControl.java @@ -12,7 +12,7 @@ package org.eclipse.swt.internal.ole.win32; public class IOleControl extends IUnknown { -public IOleControl(int /*long*/ address) { +public IOleControl(long /*int*/ address) { super(address); } public int GetControlInfo(CONTROLINFO pCI) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleDocument.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleDocument.java index 434069eacd..cf26cdb1c0 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleDocument.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleDocument.java @@ -12,10 +12,10 @@ package org.eclipse.swt.internal.ole.win32; public class IOleDocument extends IUnknown { -public IOleDocument(int /*long*/ address) { +public IOleDocument(long /*int*/ address) { super(address); } -public int CreateView(int /*long*/ pIPSite,int /*long*/ pstm, int dwReserved, int /*long*/[] ppView) { +public int CreateView(long /*int*/ pIPSite,long /*int*/ pstm, int dwReserved, long /*int*/[] ppView) { return COM.VtblCall(3, address, pIPSite, pstm, dwReserved, ppView); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleDocumentView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleDocumentView.java index a50c10696f..0f2cdef166 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleDocumentView.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleDocumentView.java @@ -15,10 +15,10 @@ import org.eclipse.swt.internal.win32.RECT; public class IOleDocumentView extends IUnknown { -public IOleDocumentView(int /*long*/ address) { +public IOleDocumentView(long /*int*/ address) { super(address); } -public int SetInPlaceSite(int /*long*/ pIPSite) { +public int SetInPlaceSite(long /*int*/ pIPSite) { return COM.VtblCall(3, address, pIPSite); } public int SetRect(RECT prcView) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleInPlaceActiveObject.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleInPlaceActiveObject.java index 72b0b93229..535bbae931 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleInPlaceActiveObject.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleInPlaceActiveObject.java @@ -14,7 +14,7 @@ import org.eclipse.swt.internal.win32.*; public class IOleInPlaceActiveObject extends IOleWindow { -public IOleInPlaceActiveObject(int /*long*/ address) { +public IOleInPlaceActiveObject(long /*int*/ address) { super(address); } public int TranslateAccelerator(MSG lpmsg) { @@ -27,7 +27,7 @@ public void OnFrameWindowActivate(boolean fActivate) { public void OnDocWindowActivate(boolean fActivate) { COM.VtblCall(7, getAddress(), fActivate); } -public int ResizeBorder(RECT prcBorder, int /*long*/ pUIWindow, boolean fFrameWindow) { +public int ResizeBorder(RECT prcBorder, long /*int*/ pUIWindow, boolean fFrameWindow) { return COM.VtblCall(8, address, prcBorder, pUIWindow, fFrameWindow); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleInPlaceObject.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleInPlaceObject.java index 242841610b..3aa49f23d0 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleInPlaceObject.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleInPlaceObject.java @@ -14,7 +14,7 @@ import org.eclipse.swt.internal.win32.*; public class IOleInPlaceObject extends IOleWindow { -public IOleInPlaceObject(int /*long*/ address) { +public IOleInPlaceObject(long /*int*/ address) { super(address); } public int InPlaceDeactivate() { diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleLink.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleLink.java index 3075d83f69..849fde78eb 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleLink.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleLink.java @@ -12,13 +12,13 @@ package org.eclipse.swt.internal.ole.win32; public class IOleLink extends IUnknown { -public IOleLink(int /*long*/ address) { +public IOleLink(long /*int*/ address) { super(address); } public int BindIfRunning() { return COM.VtblCall(10, address); } -public int GetSourceMoniker(int /*long*/[] ppmk) { +public int GetSourceMoniker(long /*int*/[] ppmk) { return COM.VtblCall(6, address, ppmk); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleObject.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleObject.java index 6fea374a0a..9d1eee33ff 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleObject.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleObject.java @@ -14,25 +14,25 @@ import org.eclipse.swt.internal.win32.*; public class IOleObject extends IUnknown { -public IOleObject(int /*long*/ address) { +public IOleObject(long /*int*/ address) { super(address); } -public int Advise(int /*long*/ pAdvSink, int[] pdwConnection) { +public int Advise(long /*int*/ pAdvSink, int[] pdwConnection) { return COM.VtblCall(19, address, pAdvSink, pdwConnection); } public int Close(int dwSaveOption) { return COM.VtblCall(6, address, dwSaveOption); } -public int DoVerb(int iVerb, MSG lpmsg, int /*long*/ pActiveSite, int lindex, int /*long*/ hwndParent, RECT lprcPosRect) { +public int DoVerb(int iVerb, MSG lpmsg, long /*int*/ pActiveSite, int lindex, long /*int*/ hwndParent, RECT lprcPosRect) { return COM.VtblCall(11, address, iVerb, lpmsg, pActiveSite, lindex, hwndParent, lprcPosRect); } -public int GetClientSite(int /*long*/[] ppvClientSite) { +public int GetClientSite(long /*int*/[] ppvClientSite) { return COM.VtblCall(4, address, ppvClientSite); } public int GetExtent(int dwDrawAspect, SIZE pSizel) { return COM.VtblCall(18, address, dwDrawAspect, pSizel); } -public int SetClientSite(int /*long*/ pClientSite) { +public int SetClientSite(long /*int*/ pClientSite) { return COM.VtblCall(3, address, pClientSite); } public int SetExtent(int dwDrawAspect, SIZE pSizel) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleWindow.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleWindow.java index 8585eb0d9d..a1eaceef5a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleWindow.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleWindow.java @@ -11,10 +11,10 @@ package org.eclipse.swt.internal.ole.win32; public class IOleWindow extends IUnknown { -public IOleWindow(int /*long*/ address) { +public IOleWindow(long /*int*/ address) { super(address); } -public int GetWindow(int /*long*/[] phwnd) { +public int GetWindow(long /*int*/[] phwnd) { return COM.VtblCall(3, address, phwnd); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersist.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersist.java index 828ccfd48c..e4e8ad0a04 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersist.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersist.java @@ -12,7 +12,7 @@ package org.eclipse.swt.internal.ole.win32; public class IPersist extends IUnknown { -public IPersist(int /*long*/ address) { +public IPersist(long /*int*/ address) { super(address); } public int GetClassID(GUID pClassID) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistFile.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistFile.java index 39bfccece4..d3e8b9dfc0 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistFile.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistFile.java @@ -12,22 +12,22 @@ package org.eclipse.swt.internal.ole.win32; public class IPersistFile extends IPersist { -public IPersistFile(int /*long*/ address) { +public IPersistFile(long /*int*/ address) { super(address); } public int IsDirty() { return COM.VtblCall(4, address); } -public int Load(int /*long*/ pszFileName, int dwMode) { +public int Load(long /*int*/ pszFileName, int dwMode) { return COM.VtblCall(5, address, pszFileName, dwMode); } -public int Save(int /*long*/ pszFileName, boolean fRemember) { +public int Save(long /*int*/ pszFileName, boolean fRemember) { return COM.VtblCall(6, address, pszFileName, fRemember); } -public int SaveCompleted(int /*long*/ pszFileName) { +public int SaveCompleted(long /*int*/ pszFileName) { return COM.VtblCall(7, address, pszFileName); } -public int GetCurFile(int /*long*/ [] ppszFileName){ +public int GetCurFile(long /*int*/ [] ppszFileName){ return COM.VtblCall(8, address, ppszFileName); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistStorage.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistStorage.java index 34d1af7385..5c89043a4f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistStorage.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistStorage.java @@ -12,22 +12,22 @@ package org.eclipse.swt.internal.ole.win32; public class IPersistStorage extends IPersist { -public IPersistStorage(int /*long*/ address) { +public IPersistStorage(long /*int*/ address) { super(address); } public int IsDirty() { return COM.VtblCall(4, address); } -public int InitNew(int /*long*/ pStg) { +public int InitNew(long /*int*/ pStg) { return COM.VtblCall(5, address, pStg); } -public int Load(int /*long*/ pStg) { +public int Load(long /*int*/ pStg) { return COM.VtblCall(6, address, pStg); } -public int Save(int /*long*/ pStgSave, boolean fSameAsLoad) { +public int Save(long /*int*/ pStgSave, boolean fSameAsLoad) { return COM.VtblCall(7, address, pStgSave, fSameAsLoad); } -public int SaveCompleted(int /*long*/ pStgNew) { +public int SaveCompleted(long /*int*/ pStgNew) { return COM.VtblCall(8, address, pStgNew); } public int HandsOffStorage(){ diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistStreamInit.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistStreamInit.java index ff12382e12..b186d70c52 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistStreamInit.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistStreamInit.java @@ -12,11 +12,11 @@ package org.eclipse.swt.internal.ole.win32; public class IPersistStreamInit extends IPersist { -public IPersistStreamInit(int /*long*/ address) { +public IPersistStreamInit(long /*int*/ address) { super(address); } -public int Load(int /*long*/ pStm) { +public int Load(long /*int*/ pStm) { return COM.VtblCall(5, address, pStm); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPropertyBag.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPropertyBag.java index 98e0b4ea9c..404e6355b6 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPropertyBag.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPropertyBag.java @@ -13,11 +13,11 @@ package org.eclipse.swt.internal.ole.win32; public class IPropertyBag extends IUnknown { -public IPropertyBag (int /*long*/ address) { +public IPropertyBag (long /*int*/ address) { super (address); } -public int Read (int /*long*/ pszPropName, int /*long*/ pVar, int /*long*/[] pErrorLog) { +public int Read (long /*int*/ pszPropName, long /*int*/ pVar, long /*int*/[] pErrorLog) { return COM.VtblCall (3, getAddress(), pszPropName, pVar, pErrorLog); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IProvideClassInfo.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IProvideClassInfo.java index 441cb26392..4a32a67449 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IProvideClassInfo.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IProvideClassInfo.java @@ -12,10 +12,10 @@ package org.eclipse.swt.internal.ole.win32; public class IProvideClassInfo extends IUnknown { -public IProvideClassInfo(int /*long*/ address) { +public IProvideClassInfo(long /*int*/ address) { super(address); } -public int GetClassInfo(int /*long*/[] ppTI) { +public int GetClassInfo(long /*int*/[] ppTI) { return COM.VtblCall(3, address, ppTI); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IProvideClassInfo2.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IProvideClassInfo2.java index 08b95a0212..ba515ee07d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IProvideClassInfo2.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IProvideClassInfo2.java @@ -12,7 +12,7 @@ package org.eclipse.swt.internal.ole.win32; public class IProvideClassInfo2 extends IProvideClassInfo { -public IProvideClassInfo2(int /*long*/ address) { +public IProvideClassInfo2(long /*int*/ address) { super(address); } public int GetGUID(int dwGuidKind, GUID pGUID) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IServiceProvider.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IServiceProvider.java index fd073c58ab..edb4e5ebf7 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IServiceProvider.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IServiceProvider.java @@ -12,10 +12,10 @@ package org.eclipse.swt.internal.ole.win32; public class IServiceProvider extends IUnknown { -public IServiceProvider(int /*long*/ address) { +public IServiceProvider(long /*int*/ address) { super(address); } -public int QueryService(GUID iid1, GUID iid2, int /*long*/ ppvObject[]) { +public int QueryService(GUID iid1, GUID iid2, long /*int*/ ppvObject[]) { return COM.VtblCall(3, address, iid1, iid2, ppvObject); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ISpecifyPropertyPages.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ISpecifyPropertyPages.java index 23f6004850..7e9ef557a4 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ISpecifyPropertyPages.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ISpecifyPropertyPages.java @@ -12,7 +12,7 @@ package org.eclipse.swt.internal.ole.win32; public class ISpecifyPropertyPages extends IUnknown { -public ISpecifyPropertyPages(int /*long*/ address) { +public ISpecifyPropertyPages(long /*int*/ address) { super(address); } public int GetPages(CAUUID pPages){ diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IStorage.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IStorage.java index e2b85322bb..0db9965c68 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IStorage.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IStorage.java @@ -12,7 +12,7 @@ package org.eclipse.swt.internal.ole.win32; public class IStorage extends IUnknown { -public IStorage(int /*long*/ address) { +public IStorage(long /*int*/ address) { super(address); } public int Commit(int grfCommitFlag) { @@ -22,7 +22,7 @@ public int CopyTo( int ciidExclude, //Number of elements in rgiidExclude GUID rgiidExclude, //Array of interface identifiers (IIDs) String[] snbExclude, //Points to a block of stream names in the storage object - int /*long*/ pstgDest //Points to destination storage object + long /*int*/ pstgDest //Points to destination storage object ){ // we only support snbExclude = null if (snbExclude != null) { @@ -35,7 +35,7 @@ public int CreateStorage( int grfMode, //Access mode for the new storage object int reserved1, //Reserved; must be zero int reserved2, //Reserved; must be zero - int /*long*/[] ppStg //Pointer to new storage object + long /*int*/[] ppStg //Pointer to new storage object ){ // create a null terminated array of char @@ -51,7 +51,7 @@ public int CreateStream( int grfMode, //Access mode for the new stream int reserved1, //Reserved; must be zero int reserved2, //Reserved; must be zero - int /*long*/[] ppStm //Pointer to new stream object + long /*int*/[] ppStm //Pointer to new stream object ){ // create a null terminated array of char @@ -73,9 +73,9 @@ public int DestroyElement(String pwcsName) { } public int EnumElements( int reserved1, //Reserved; must be zero - int /*long*/ reserved2, //Reserved; must be NULL + long /*int*/ reserved2, //Reserved; must be NULL int reserved3, //Reserved; must be zero - int /*long*/[] ppenum //Pointer to output variable that + long /*int*/[] ppenum //Pointer to output variable that // receives the IEnumSTATSTG interface ){ return COM.VtblCall(11, address, reserved1, reserved2, reserved3, ppenum); @@ -83,11 +83,11 @@ public int EnumElements( public int OpenStorage( String pwcsName, //Pointer to the name of the // storage object to open - int /*long*/ pstgPriority, //Must be NULL. + long /*int*/ pstgPriority, //Must be NULL. int grfMode, //Access mode for the new storage object String snbExclude[], //Must be NULL. int reserved, //Reserved; must be zero - int /*long*/[] ppStg //Pointer to opened storage object + long /*int*/[] ppStg //Pointer to opened storage object ){ // create a null terminated array of char @@ -104,10 +104,10 @@ public int OpenStorage( } public int OpenStream( String pwcsName, //Pointer to name of stream to open - int /*long*/ reserved1, //Reserved; must be NULL + long /*int*/ reserved1, //Reserved; must be NULL int grfMode, //Access mode for the new stream int reserved2, //Reserved; must be zero - int /*long*/[] ppStm //Pointer to output variable + long /*int*/[] ppStm //Pointer to output variable // that receives the IStream interface pointer ) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IStream.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IStream.java index cf9ebe66a2..c97432e65d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IStream.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IStream.java @@ -11,11 +11,11 @@ package org.eclipse.swt.internal.ole.win32; public class IStream extends IUnknown { -public IStream(int /*long*/ address) { +public IStream(long /*int*/ address) { super(address); } public int Clone( - int /*long*/[] ppstm //Pointer to location for pointer to the new stream object + long /*int*/[] ppstm //Pointer to location for pointer to the new stream object ){ return COM.VtblCall(13, address, ppstm); } @@ -23,13 +23,13 @@ public int Commit( int grfCommitFlags //Specifies how changes are committed ){ return COM.VtblCall(8, address, grfCommitFlags); } -public int Read(int /*long*/ pv, int cb, int[] pcbWritten) { +public int Read(long /*int*/ pv, int cb, int[] pcbWritten) { return COM.VtblCall(3, address, pv, cb, pcbWritten); } public int Revert(){ return COM.VtblCall(9, address); } -public int Write(int /*long*/ pv, int cb, int[] pcbWritten) { +public int Write(long /*int*/ pv, int cb, int[] pcbWritten) { return COM.VtblCall(4, address, pv, cb, pcbWritten); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ITypeInfo.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ITypeInfo.java index 22d2e33f3a..3093b3d5c6 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ITypeInfo.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ITypeInfo.java @@ -16,16 +16,16 @@ import org.eclipse.swt.internal.win32.OS; public class ITypeInfo extends IUnknown { -public ITypeInfo(int /*long*/ address) { +public ITypeInfo(long /*int*/ address) { super(address); } public int GetDocumentation(int index, String[] name, String[] docString, int[] pdwHelpContext, String[] helpFile ) { - int /*long*/[] pBstrName = null; - if (name != null) pBstrName = new int /*long*/[1]; - int /*long*/[] pBstrDocString = null; - if (docString != null) pBstrDocString = new int /*long*/[1]; - int /*long*/[] pBstrHelpFile = null; - if (helpFile != null) pBstrHelpFile = new int /*long*/[1]; + long /*int*/[] pBstrName = null; + if (name != null) pBstrName = new long /*int*/[1]; + long /*int*/[] pBstrDocString = null; + if (docString != null) pBstrDocString = new long /*int*/[1]; + long /*int*/[] pBstrHelpFile = null; + if (helpFile != null) pBstrHelpFile = new long /*int*/[1]; int rc = COM.VtblCall(12, address, index, pBstrName, pBstrDocString, pdwHelpContext, pBstrHelpFile); if (name != null && pBstrName[0] != 0) { int size = COM.SysStringByteLen(pBstrName[0]); @@ -68,7 +68,7 @@ public int GetDocumentation(int index, String[] name, String[] docString, int[] } return rc; } -public int GetFuncDesc(int index, int /*long*/[] ppFuncDesc) { +public int GetFuncDesc(int index, long /*int*/[] ppFuncDesc) { return COM.VtblCall(5, address, index, ppFuncDesc); } public int GetIDsOfNames(String[] rgszNames, int cNames, int[] pMemId) { @@ -77,9 +77,9 @@ public int GetIDsOfNames(String[] rgszNames, int cNames, int[] pMemId) { int size = rgszNames.length; // create an array to hold the addresses - int /*long*/ hHeap = OS.GetProcessHeap(); - int /*long*/ ppNames = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, size * OS.PTR_SIZEOF); - int /*long*/[] memTracker = new int /*long*/[size]; + long /*int*/ hHeap = OS.GetProcessHeap(); + long /*int*/ ppNames = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, size * OS.PTR_SIZEOF); + long /*int*/[] memTracker = new long /*int*/[size]; try { // add the address of each string to the array @@ -90,10 +90,10 @@ public int GetIDsOfNames(String[] rgszNames, int cNames, int[] pMemId) { buffer = new char[nameSize +1]; rgszNames[i].getChars(0, nameSize, buffer, 0); // get the address of the start of the array of char - int /*long*/ pName = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, buffer.length * 2); + long /*int*/ pName = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, buffer.length * 2); OS.MoveMemory(pName, buffer, buffer.length * 2); // copy the address to the array of addresses - COM.MoveMemory(ppNames + OS.PTR_SIZEOF * i, new int /*long*/[]{pName}, OS.PTR_SIZEOF); + COM.MoveMemory(ppNames + OS.PTR_SIZEOF * i, new long /*int*/[]{pName}, OS.PTR_SIZEOF); // keep track of the Global Memory so we can free it memTracker[i] = pName; } @@ -115,7 +115,7 @@ public int GetImplTypeFlags(int index, int[] pImplTypeFlags) { public int GetNames(int memid, String[] names, int cMaxNames, int[] pcNames){ int nameSize = names.length; - int /*long*/[] rgBstrNames = new int /*long*/[nameSize]; + long /*int*/[] rgBstrNames = new long /*int*/[nameSize]; int rc = COM.VtblCall(7, address, memid, rgBstrNames, nameSize, pcNames); if (rc == COM.S_OK) { @@ -136,25 +136,25 @@ public int GetNames(int memid, String[] names, int cMaxNames, int[] pcNames){ return rc; } -public int GetRefTypeInfo(int hRefType, int /*long*/[] ppTInfo) { +public int GetRefTypeInfo(int hRefType, long /*int*/[] ppTInfo) { return COM.VtblCall(14, address, hRefType, ppTInfo); } public int GetRefTypeOfImplType(int index, int[] pRefType) { return COM.VtblCall(8, address, index, pRefType); } -public int GetTypeAttr(int /*long*/[] ppTypeAttr) { +public int GetTypeAttr(long /*int*/[] ppTypeAttr) { return COM.VtblCall(3, address, ppTypeAttr); } -public int GetVarDesc(int index, int /*long*/[] ppVarDesc ) { +public int GetVarDesc(int index, long /*int*/[] ppVarDesc ) { return COM.VtblCall(6, address, index, ppVarDesc); } -public int ReleaseFuncDesc(int /*long*/ pFuncDesc ) { +public int ReleaseFuncDesc(long /*int*/ pFuncDesc ) { return COM.VtblCall(20, address, pFuncDesc); } -public int ReleaseTypeAttr(int /*long*/ pTypeAttr) { +public int ReleaseTypeAttr(long /*int*/ pTypeAttr) { return COM.VtblCall(19, address, pTypeAttr); } -public int ReleaseVarDesc(int /*long*/ pVarDesc ) { +public int ReleaseVarDesc(long /*int*/ pVarDesc ) { return COM.VtblCall(21, address, pVarDesc); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IUnknown.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IUnknown.java index 1327dd8b4a..d88f8345f7 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IUnknown.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IUnknown.java @@ -12,17 +12,17 @@ package org.eclipse.swt.internal.ole.win32; public class IUnknown { - int /*long*/ address; -public IUnknown(int /*long*/ address) { + long /*int*/ address; +public IUnknown(long /*int*/ address) { this.address = address; } public int AddRef() { return COM.VtblCall(1, address); } -public int /*long*/ getAddress() { +public long /*int*/ getAddress() { return address; } -public int QueryInterface(GUID riid, int /*long*/[] ppvObject) { +public int QueryInterface(GUID riid, long /*int*/[] ppvObject) { return COM.VtblCall(0, address, riid, ppvObject); } public int Release() { diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IViewObject2.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IViewObject2.java index 39438bf560..eaa536ed0a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IViewObject2.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IViewObject2.java @@ -14,13 +14,13 @@ import org.eclipse.swt.internal.win32.*; public class IViewObject2 extends IUnknown { -public IViewObject2(int /*long*/ address) { +public IViewObject2(long /*int*/ address) { super(address); } public int GetExtent(int dwAspect, int lindex, DVTARGETDEVICE ptd, SIZE lpsizel) { return COM.VtblCall(9, address, dwAspect, lindex, ptd, lpsizel); } -public int SetAdvise(int dwAspects, int dwAdvf, int /*long*/ pIAdviseSink) { +public int SetAdvise(int dwAspects, int dwAdvf, long /*int*/ pIAdviseSink) { return COM.VtblCall(7, address, dwAspects, dwAdvf, pIAdviseSink); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/OLEINPLACEFRAMEINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/OLEINPLACEFRAMEINFO.java index 0b2a9cfb85..ca504aa54d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/OLEINPLACEFRAMEINFO.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/OLEINPLACEFRAMEINFO.java @@ -14,9 +14,9 @@ public final class OLEINPLACEFRAMEINFO { public int cb; public int fMDIApp; /** @field cast=(HWND) */ - public int /*long*/ hwndFrame; + public long /*int*/ hwndFrame; /** @field cast=(HACCEL) */ - public int /*long*/ haccel; + public long /*int*/ haccel; public int cAccelEntries; public static final int sizeof = COM.OLEINPLACEFRAMEINFO_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/STATSTG.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/STATSTG.java index 6a0d0ec9df..ee2ac3b739 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/STATSTG.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/STATSTG.java @@ -12,7 +12,7 @@ package org.eclipse.swt.internal.ole.win32; public class STATSTG { /** @field cast=(LPWSTR) */ - public int /*long*/ pwcsName; + public long /*int*/ pwcsName; public int type; /** @field accessor=cbSize.QuadPart */ public long cbSize; diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/STGMEDIUM.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/STGMEDIUM.java index d5ad8a60ad..4bd70a6b1b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/STGMEDIUM.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/STGMEDIUM.java @@ -13,8 +13,8 @@ package org.eclipse.swt.internal.ole.win32; public final class STGMEDIUM { public int tymed; /** @field accessor=hGlobal,cast=(HGLOBAL) */ - public int /*long*/ unionField; + public long /*int*/ unionField; /** @field cast=(IUnknown *) */ - public int /*long*/ pUnkForRelease; + public long /*int*/ pUnkForRelease; public static final int sizeof = COM.STGMEDIUM_sizeof (); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/TYPEATTR.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/TYPEATTR.java index 4025c05cd3..81e1bed030 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/TYPEATTR.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/TYPEATTR.java @@ -25,7 +25,7 @@ public final class TYPEATTR { public int memidConstructor; public int memidDestructor; /** @field cast=(OLECHAR FAR *) */ - public int /*long*/ lpstrSchema; + public long /*int*/ lpstrSchema; public int cbSizeInstance; public int typekind; public short cFuncs; @@ -38,7 +38,7 @@ public final class TYPEATTR { public short wMinorVerNum; // TYPEDESC tdescAlias /** @field accessor=tdescAlias.lptdesc,cast=(struct FARSTRUCT tagTYPEDESC FAR *) */ - public int /*long*/ tdescAlias_unionField; + public long /*int*/ tdescAlias_unionField; /** @field accessor=tdescAlias.vt */ public short tdescAlias_vt; // IDLDESC idldesctype diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/VARDESC.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/VARDESC.java index ef6d267393..6723649835 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/VARDESC.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/VARDESC.java @@ -13,17 +13,17 @@ package org.eclipse.swt.internal.ole.win32; public class VARDESC { public int memid; /** @field cast=(OLECHAR FAR *) */ - public int /*long*/ lpstrSchema; + public long /*int*/ lpstrSchema; public int oInst; // ELEMDESC elemdescVar // TYPEDESC elemdescVar.tdesc /** @field accessor=elemdescVar.tdesc.lptdesc,cast=(struct FARSTRUCT tagTYPEDESC FAR *) */ - public int /*long*/ elemdescVar_tdesc_union; + public long /*int*/ elemdescVar_tdesc_union; /** @field accessor=elemdescVar.tdesc.vt */ public short elemdescVar_tdesc_vt; // PARAMDESC elemdescFunc.paramdesc /** @field accessor=elemdescVar.paramdesc.pparamdescex,cast=(LPPARAMDESCEX) */ - public int /*long*/ elemdescVar_paramdesc_pparamdescex; + public long /*int*/ elemdescVar_paramdesc_pparamdescex; /** @field accessor=elemdescVar.paramdesc.wParamFlags */ public short elemdescVar_paramdesc_wParamFlags; public short wVarFlags; |