diff options
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole')
8 files changed, 290 insertions, 290 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OLE.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OLE.java index bb29d26cd3..2fdea5ed92 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OLE.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OLE.java @@ -390,7 +390,7 @@ public static String findProgramID (String extension) { return ""; //$NON-NLS-1$ } static String getKeyValue (TCHAR key) { - int /*long*/ [] phkResult = new int /*long*/ [1]; + long /*int*/ [] phkResult = new long /*int*/ [1]; if (OS.RegOpenKeyEx (OS.HKEY_CLASSES_ROOT, key, 0, OS.KEY_READ, phkResult) != 0) { return null; } @@ -413,7 +413,7 @@ static String getKeyValue (TCHAR key) { return result; } private static boolean getKeyExists (TCHAR key) { - int /*long*/ [] phkResult = new int /*long*/ [1]; + long /*int*/ [] phkResult = new long /*int*/ [1]; if (OS.RegOpenKeyEx (OS.HKEY_CLASSES_ROOT, key, 0, OS.KEY_READ, phkResult) != 0) { return false; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleAutomation.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleAutomation.java index 62cf4b11c4..c176377f19 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleAutomation.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleAutomation.java @@ -94,7 +94,7 @@ OleAutomation(IDispatch idispatch) { objIDispatch = idispatch; objIDispatch.AddRef(); - int /*long*/[] ppv = new int /*long*/[1]; + long /*int*/[] ppv = new long /*int*/[1]; /* GetTypeInfo([in] iTInfo, [in] lcid, [out] ppTInfo) * AddRef has already been called on ppTInfo by the callee and must be released by the caller. */ @@ -117,7 +117,7 @@ public OleAutomation(OleClientSite clientSite) { if (clientSite == null) OLE.error(OLE.ERROR_INVALID_INTERFACE_ADDRESS); objIDispatch = clientSite.getAutomationObject(); - int /*long*/[] ppv = new int /*long*/[1]; + long /*int*/[] ppv = new long /*int*/[1]; /* GetTypeInfo([in] iTInfo, [in] lcid, [out] ppTInfo) * AddRef has already been called on ppTInfo by the callee and must be released by the caller. */ @@ -152,7 +152,7 @@ public OleAutomation(String progId) { } int flags = COM.CLSCTX_INPROC_SERVER; if (progId.startsWith("Excel")) flags |= COM.CLSCTX_LOCAL_SERVER; //$NON-NLS-1$ - int /*long*/[] ppvObject = new int /*long*/[1]; + long /*int*/[] ppvObject = new long /*int*/[1]; int result = COM.CoCreateInstance(appClsid, 0, flags, COM.IIDIUnknown, ppvObject); if (result != COM.S_OK) { OS.OleUninitialize(); @@ -199,7 +199,7 @@ public void dispose() { } objIUnknown = null; } -int /*long*/ getAddress() { +long /*int*/ getAddress() { return objIDispatch.getAddress(); } GUID getClassID(String clientName) { @@ -254,7 +254,7 @@ public String getDocumentation(int dispId) { */ public OlePropertyDescription getPropertyDescription(int index) { if (objITypeInfo == null) return null; - int /*long*/[] ppVarDesc = new int /*long*/[1]; + long /*int*/[] ppVarDesc = new long /*int*/[1]; int rc = objITypeInfo.GetVarDesc(index, ppVarDesc); if (rc != OLE.S_OK) return null; VARDESC vardesc = new VARDESC(); @@ -285,7 +285,7 @@ public OlePropertyDescription getPropertyDescription(int index) { */ public OleFunctionDescription getFunctionDescription(int index) { if (objITypeInfo == null) return null; - int /*long*/[] ppFuncDesc = new int /*long*/[1]; + long /*int*/[] ppFuncDesc = new long /*int*/[1]; int rc = objITypeInfo.GetFuncDesc(index, ppFuncDesc); if (rc != OLE.S_OK) return null; FUNCDESC funcdesc = new FUNCDESC(); @@ -316,7 +316,7 @@ public OleFunctionDescription getFunctionDescription(int index) { short[] vt = new short[1]; COM.MoveMemory(vt, funcdesc.lprgelemdescParam + i * COM.ELEMDESC_sizeof() + OS.PTR_SIZEOF, 2); if (vt[0] == OLE.VT_PTR) { - int /*long*/ [] pTypedesc = new int /*long*/ [1]; + long /*int*/ [] pTypedesc = new long /*int*/ [1]; COM.MoveMemory(pTypedesc, funcdesc.lprgelemdescParam + i * COM.ELEMDESC_sizeof(), OS.PTR_SIZEOF); short[] vt2 = new short[1]; COM.MoveMemory(vt2, pTypedesc[0] + OS.PTR_SIZEOF, 2); @@ -347,7 +347,7 @@ public OleFunctionDescription getFunctionDescription(int index) { */ public TYPEATTR getTypeInfoAttributes() { if (objITypeInfo == null) return null; - int /*long*/ [] ppTypeAttr = new int /*long*/ [1]; + long /*int*/ [] ppTypeAttr = new long /*int*/ [1]; int rc = objITypeInfo.GetTypeAttr(ppTypeAttr); if (rc != OLE.S_OK) return null; TYPEATTR typeattr = new TYPEATTR(); @@ -476,8 +476,8 @@ public boolean equals(Object object) { if (objIDispatch == null) return false; OleAutomation oleAutomation = ((OleAutomation) object); if (oleAutomation.objIDispatch == null) return false; - int /*long*/ address1 = objIDispatch.getAddress(); - int /*long*/ address2 = oleAutomation.objIDispatch.getAddress(); + long /*int*/ address1 = objIDispatch.getAddress(); + long /*int*/ address2 = oleAutomation.objIDispatch.getAddress(); return address1 == address2; } return false; @@ -566,7 +566,7 @@ private int invoke(int dispIdMember, int wFlags, Variant[] rgvarg, int[] rgdispi // invoke the method EXCEPINFO excepInfo = new EXCEPINFO(); int[] pArgErr = new int[1]; - int /*long*/ pVarResultAddress = 0; + long /*int*/ pVarResultAddress = 0; if (pVarResult != null) pVarResultAddress = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, VARIANT.sizeof); int result = objIDispatch.Invoke(dispIdMember, new GUID(), COM.LOCALE_USER_DEFAULT, wFlags, pDispParams, pVarResultAddress, excepInfo, pArgErr); diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleClientSite.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleClientSite.java index f05b576148..e10840d41f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleClientSite.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleClientSite.java @@ -229,14 +229,14 @@ public OleClientSite(Composite parent, int style, String progId) { tempStorage = createTempStorage(); // Create ole object with storage object - int /*long*/[] address = new int /*long*/[1]; + long /*int*/[] address = new long /*int*/[1]; /* * Bug in ICA Client 2.7. The creation of the IOleObject fails if the client * site is provided to OleCreate(). The fix is to detect that the program * id is an ICA Client and do not pass a client site to OleCreate(). * IOleObject.SetClientSite() is called later on. */ - int /*long*/ clientSite = isICAClient() ? 0 : iOleClientSite.getAddress(); + long /*int*/ clientSite = isICAClient() ? 0 : iOleClientSite.getAddress(); int result = COM.OleCreate(appClsid, COM.IIDIUnknown, COM.OLERENDER_DRAW, null, clientSite, tempStorage.getAddress(), address); if (result != COM.S_OK) OLE.error(OLE.ERROR_CANNOT_CREATE_OBJECT, result); @@ -317,7 +317,7 @@ void OleCreate(GUID appClsid, GUID fileClsid, char[] fileName, File file) { // Using the same application that created file, therefore, use default mechanism. tempStorage = createTempStorage(); // Create ole object with storage object - int /*long*/[] address = new int /*long*/[1]; + long /*int*/[] address = new long /*int*/[1]; int result = COM.OleCreateFromFile(appClsid, fileName, COM.IIDIUnknown, COM.OLERENDER_DRAW, null, iOleClientSite.getAddress(), tempStorage.getAddress(), address); if (result != COM.S_OK) OLE.error(OLE.ERROR_CANNOT_CREATE_OBJECT, result); objIUnknown = new IUnknown(address[0]); @@ -325,14 +325,14 @@ void OleCreate(GUID appClsid, GUID fileClsid, char[] fileName, File file) { // Not using the same application that created file, therefore, copy from original file to a new storage file IStorage storage = null; if (COM.StgIsStorageFile(fileName) == COM.S_OK) { - int /*long*/[] address = new int /*long*/[1]; + long /*int*/[] address = new long /*int*/[1]; int mode = COM.STGM_READ | COM.STGM_TRANSACTED | COM.STGM_SHARE_EXCLUSIVE; int result = COM.StgOpenStorage(fileName, 0, mode, 0, 0, address); //Does an AddRef if successful if (result != COM.S_OK) OLE.error(OLE.ERROR_CANNOT_OPEN_FILE, result); storage = new IStorage(address[0]); } else { // Original file is not a Storage file so copy contents to a stream in a new storage file - int /*long*/[] address = new int /*long*/[1]; + long /*int*/[] address = new long /*int*/[1]; int mode = COM.STGM_READWRITE | COM.STGM_DIRECT | COM.STGM_SHARE_EXCLUSIVE | COM.STGM_CREATE; int result = COM.StgCreateDocfile(null, mode | COM.STGM_DELETEONRELEASE, 0, address); // Increments ref count if successful if (result != COM.S_OK) OLE.error(OLE.ERROR_CANNOT_OPEN_FILE, result); @@ -344,7 +344,7 @@ void OleCreate(GUID appClsid, GUID fileClsid, char[] fileName, File file) { GUID wordGUID = getClassID(WORDPROGID); if (wordGUID != null && COM.IsEqualGUID(appClsid, wordGUID)) streamName = "WordDocument"; //$NON-NLS-1$ if (isOffice2007) streamName = "Package"; //$NON-NLS-1$ - address = new int /*long*/[1]; + address = new long /*int*/[1]; result = storage.CreateStream(streamName, mode, 0, 0, address); // Increments ref count if successful if (result != COM.S_OK) { storage.Release(); @@ -358,7 +358,7 @@ void OleCreate(GUID appClsid, GUID fileClsid, char[] fileName, File file) { byte[] buffer = new byte[increment]; int count = 0; while((count = fileInput.read(buffer)) > 0){ - int /*long*/ pv = COM.CoTaskMemAlloc(count); + long /*int*/ pv = COM.CoTaskMemAlloc(count); OS.MoveMemory(pv, buffer, count); result = stream.Write(pv, count, null) ; COM.CoTaskMemFree(pv); @@ -387,12 +387,12 @@ void OleCreate(GUID appClsid, GUID fileClsid, char[] fileName, File file) { if (result != COM.S_OK) OLE.error(OLE.ERROR_CANNOT_OPEN_FILE, result); // create ole client - int /*long*/[] ppv = new int /*long*/[1]; + long /*int*/[] ppv = new long /*int*/[1]; result = COM.CoCreateInstance(appClsid, 0, COM.CLSCTX_INPROC_HANDLER | COM.CLSCTX_INPROC_SERVER, COM.IIDIUnknown, ppv); if (result != COM.S_OK) OLE.error(OLE.ERROR_CANNOT_CREATE_OBJECT, result); objIUnknown = new IUnknown(ppv[0]); // get the persistent storage of the ole client - ppv = new int /*long*/[1]; + ppv = new long /*int*/[1]; result = objIUnknown.QueryInterface(COM.IIDIPersistStorage, ppv); if (result != COM.S_OK) OLE.error(OLE.ERROR_CANNOT_CREATE_OBJECT, result); IPersistStorage iPersistStorage = new IPersistStorage(ppv[0]); @@ -409,7 +409,7 @@ void OleCreate(GUID appClsid, GUID fileClsid, char[] fileName, File file) { } protected void addObjectReferences() { // - int /*long*/[] ppvObject = new int /*long*/[1]; + long /*int*/[] ppvObject = new long /*int*/[1]; if (objIUnknown.QueryInterface(COM.IIDIPersist, ppvObject) == COM.S_OK) { IPersist objIPersist = new IPersist(ppvObject[0]); GUID tempid = new GUID(); @@ -419,7 +419,7 @@ protected void addObjectReferences() { } // - ppvObject = new int /*long*/[1]; + ppvObject = new long /*int*/[1]; int result = objIUnknown.QueryInterface(COM.IIDIViewObject2, ppvObject); if (result != COM.S_OK) OLE.error(OLE.ERROR_INTERFACE_NOT_FOUND, result); @@ -427,7 +427,7 @@ protected void addObjectReferences() { objIViewObject2.SetAdvise(aspect, 0, iAdviseSink.getAddress()); // - ppvObject = new int /*long*/[1]; + ppvObject = new long /*int*/[1]; result = objIUnknown.QueryInterface(COM.IIDIOleObject, ppvObject); if (result != COM.S_OK) OLE.error(OLE.ERROR_INTERFACE_NOT_FOUND, result); @@ -439,7 +439,7 @@ protected void addObjectReferences() { * during OleCreate. The fix is to check whether the clientSite has already been set * and set it. Note that setting it twice can result in assert failures. */ - int /*long*/[] ppvClientSite = new int /*long*/[1]; + long /*int*/[] ppvClientSite = new long /*int*/[1]; result = objIOleObject.GetClientSite(ppvClientSite); if (ppvClientSite[0] == 0) { objIOleObject.SetClientSite(iOleClientSite.getAddress()); @@ -454,10 +454,10 @@ protected void addObjectReferences() { COM.OleSetContainedObject(objIUnknown.getAddress(), true); // Is OLE object linked or embedded? - ppvObject = new int /*long*/[1]; + ppvObject = new long /*int*/[1]; if (objIUnknown.QueryInterface(COM.IIDIOleLink, ppvObject) == COM.S_OK) { IOleLink objIOleLink = new IOleLink(ppvObject[0]); - int /*long*/[] ppmk = new int /*long*/[1]; + long /*int*/[] ppmk = new long /*int*/[1]; if (objIOleLink.GetSourceMoniker(ppmk) == COM.S_OK) { IMoniker objIMoniker = new IMoniker(ppmk[0]); objIMoniker.Release(); @@ -485,67 +485,67 @@ private int ContextSensitiveHelp(int fEnterMode) { protected void createCOMInterfaces() { iUnknown = new COMObject(new int[]{2, 0, 0}){ - public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);} - public int /*long*/ method1(int /*long*/[] args) {return AddRef();} - public int /*long*/ method2(int /*long*/[] args) {return Release();} + public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long /*int*/ method2(long /*int*/[] args) {return Release();} }; iOleClientSite = new COMObject(new int[]{2, 0, 0, 0, 3, 1, 0, 1, 0}){ - public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);} - public int /*long*/ method1(int /*long*/[] args) {return AddRef();} - public int /*long*/ method2(int /*long*/[] args) {return Release();} - public int /*long*/ method3(int /*long*/[] args) {return SaveObject();} + public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long /*int*/ method3(long /*int*/[] args) {return SaveObject();} // method4 GetMoniker - not implemented - public int /*long*/ method5(int /*long*/[] args) {return GetContainer(args[0]);} - public int /*long*/ method6(int /*long*/[] args) {return ShowObject();} - public int /*long*/ method7(int /*long*/[] args) {return OnShowWindow((int)/*64*/args[0]);} + public long /*int*/ method5(long /*int*/[] args) {return GetContainer(args[0]);} + public long /*int*/ method6(long /*int*/[] args) {return ShowObject();} + public long /*int*/ method7(long /*int*/[] args) {return OnShowWindow((int)/*64*/args[0]);} // method8 RequestNewObjectLayout - not implemented }; iAdviseSink = new COMObject(new int[]{2, 0, 0, 2, 2, 1, 0, 0}){ - public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);} - public int /*long*/ method1(int /*long*/[] args) {return AddRef();} - public int /*long*/ method2(int /*long*/[] args) {return Release();} - public int /*long*/ method3(int /*long*/[] args) {return OnDataChange(args[0], args[1]);} - public int /*long*/ method4(int /*long*/[] args) {return OnViewChange((int)/*64*/args[0], (int)/*64*/args[1]);} + public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long /*int*/ method3(long /*int*/[] args) {return OnDataChange(args[0], args[1]);} + public long /*int*/ method4(long /*int*/[] args) {return OnViewChange((int)/*64*/args[0], (int)/*64*/args[1]);} //method5 OnRename - not implemented - public int /*long*/ method6(int /*long*/[] args) {OnSave();return 0;} - public int /*long*/ method7(int /*long*/[] args) {return OnClose();} + public long /*int*/ method6(long /*int*/[] args) {OnSave();return 0;} + public long /*int*/ method7(long /*int*/[] args) {return OnClose();} }; iOleInPlaceSite = new COMObject(new int[]{2, 0, 0, 1, 1, 0, 0, 0, 5, C.PTR_SIZEOF == 4 ? 2 : 1, 1, 0, 0, 0, 1}){ - public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);} - public int /*long*/ method1(int /*long*/[] args) {return AddRef();} - public int /*long*/ method2(int /*long*/[] args) {return Release();} - public int /*long*/ method3(int /*long*/[] args) {return GetWindow(args[0]);} - public int /*long*/ method4(int /*long*/[] args) {return ContextSensitiveHelp((int)/*64*/args[0]);} - public int /*long*/ method5(int /*long*/[] args) {return CanInPlaceActivate();} - public int /*long*/ method6(int /*long*/[] args) {return OnInPlaceActivate();} - public int /*long*/ method7(int /*long*/[] args) {return OnUIActivate();} - public int /*long*/ method8(int /*long*/[] args) {return GetWindowContext(args[0], args[1], args[2], args[3], args[4]);} - public int /*long*/ method9(int /*long*/[] args) { + public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long /*int*/ method3(long /*int*/[] args) {return GetWindow(args[0]);} + public long /*int*/ method4(long /*int*/[] args) {return ContextSensitiveHelp((int)/*64*/args[0]);} + public long /*int*/ method5(long /*int*/[] args) {return CanInPlaceActivate();} + public long /*int*/ method6(long /*int*/[] args) {return OnInPlaceActivate();} + public long /*int*/ method7(long /*int*/[] args) {return OnUIActivate();} + public long /*int*/ method8(long /*int*/[] args) {return GetWindowContext(args[0], args[1], args[2], args[3], args[4]);} + public long /*int*/ method9(long /*int*/[] args) { if (args.length == 2) { return Scroll((int)/*64*/args[0], (int)/*64*/args[1]); } else { return Scroll_64(args[0]); } } - public int /*long*/ method10(int /*long*/[] args) {return OnUIDeactivate((int)/*64*/args[0]);} - public int /*long*/ method11(int /*long*/[] args) {return OnInPlaceDeactivate();} + public long /*int*/ method10(long /*int*/[] args) {return OnUIDeactivate((int)/*64*/args[0]);} + public long /*int*/ method11(long /*int*/[] args) {return OnInPlaceDeactivate();} // method12 DiscardUndoState - not implemented // method13 DeactivateAndUndoChange - not implemented - public int /*long*/ method14(int /*long*/[] args) {return OnPosRectChange(args[0]);} + public long /*int*/ method14(long /*int*/[] args) {return OnPosRectChange(args[0]);} }; iOleDocumentSite = new COMObject(new int[]{2, 0, 0, 1}){ - public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);} - public int /*long*/ method1(int /*long*/[] args) {return AddRef();} - public int /*long*/ method2(int /*long*/[] args) {return Release();} - public int /*long*/ method3(int /*long*/[] args) {return ActivateMe(args[0]);} + public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long /*int*/ method3(long /*int*/[] args) {return ActivateMe(args[0]);} }; } protected IStorage createTempStorage() { - int /*long*/[] tempStorage = new int /*long*/[1]; + long /*int*/[] tempStorage = new long /*int*/[1]; int grfMode = COM.STGM_READWRITE | COM.STGM_SHARE_EXCLUSIVE | COM.STGM_DELETEONRELEASE; int result = COM.StgCreateDocfile(null, grfMode, 0, tempStorage); if (result != COM.S_OK) OLE.error(OLE.ERROR_CANNOT_CREATE_FILE, result); @@ -635,18 +635,18 @@ public int doVerb(int verb) { public int exec(int cmdID, int options, Variant in, Variant out) { if (objIOleCommandTarget == null) { - int /*long*/[] address = new int /*long*/[1]; + long /*int*/[] address = new long /*int*/[1]; if (objIUnknown.QueryInterface(COM.IIDIOleCommandTarget, address) != COM.S_OK) return OLE.ERROR_INTERFACE_NOT_FOUND; objIOleCommandTarget = new IOleCommandTarget(address[0]); } - int /*long*/ inAddress = 0; + long /*int*/ inAddress = 0; if (in != null){ inAddress = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, VARIANT.sizeof); in.getData(inAddress); } - int /*long*/ outAddress = 0; + long /*int*/ outAddress = 0; if (out != null){ outAddress = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, VARIANT.sizeof); out.getData(outAddress); @@ -667,7 +667,7 @@ public int exec(int cmdID, int options, Variant in, Variant out) { return result; } IDispatch getAutomationObject() { - int /*long*/[] ppvObject = new int /*long*/[1]; + long /*int*/[] ppvObject = new long /*int*/[1]; if (objIUnknown.QueryInterface(COM.IIDIDispatch, ppvObject) != COM.S_OK) return null; return new IDispatch(ppvObject[0]); @@ -689,13 +689,13 @@ protected GUID getClassID(String clientName) { } return guid; } -private int GetContainer(int /*long*/ ppContainer) { +private int GetContainer(long /*int*/ ppContainer) { /* Simple containers that do not support links to their embedded * objects probably do not need to implement this method. Instead, * they can return E_NOINTERFACE and set ppContainer to NULL. */ if (ppContainer != 0) - COM.MoveMemory(ppContainer, new int /*long*/[]{0}, OS.PTR_SIZEOF); + COM.MoveMemory(ppContainer, new long /*int*/[]{0}, OS.PTR_SIZEOF); return COM.E_NOINTERFACE; } private SIZE getExtent() { @@ -731,11 +731,11 @@ public String getProgramID(){ } String getProgID(GUID clsid) { if (clsid != null){ - int /*long*/[] lplpszProgID = new int /*long*/[1]; + long /*int*/[] lplpszProgID = new long /*int*/[1]; if (COM.ProgIDFromCLSID(clsid, lplpszProgID) == COM.S_OK) { - int /*long*/ hMem = lplpszProgID[0]; + long /*int*/ hMem = lplpszProgID[0]; int length = OS.GlobalSize(hMem); - int /*long*/ ptr = OS.GlobalLock(hMem); + long /*int*/ ptr = OS.GlobalLock(hMem); char[] buffer = new char[length]; COM.MoveMemory(buffer, ptr, length); OS.GlobalUnlock(hMem); @@ -749,9 +749,9 @@ String getProgID(GUID clsid) { } return null; } -int ActivateMe(int /*long*/ pViewToActivate) { +int ActivateMe(long /*int*/ pViewToActivate) { if (pViewToActivate == 0) { - int /*long*/[] ppvObject = new int /*long*/[1]; + long /*int*/[] ppvObject = new long /*int*/[1]; if (objIUnknown.QueryInterface(COM.IIDIOleDocument, ppvObject) != COM.S_OK) return COM.E_FAIL; IOleDocument objOleDocument = new IOleDocument(ppvObject[0]); if (objOleDocument.CreateView(iOleInPlaceSite.getAddress(), 0, 0, ppvObject) != COM.S_OK) return COM.E_FAIL; @@ -768,16 +768,16 @@ int ActivateMe(int /*long*/ pViewToActivate) { objDocumentView.Show(1);//TRUE return COM.S_OK; } -protected int GetWindow(int /*long*/ phwnd) { +protected int GetWindow(long /*int*/ phwnd) { if (phwnd == 0) return COM.E_INVALIDARG; if (frame == null) { - COM.MoveMemory(phwnd, new int /*long*/[] {0}, OS.PTR_SIZEOF); + COM.MoveMemory(phwnd, new long /*int*/[] {0}, OS.PTR_SIZEOF); return COM.E_NOTIMPL; } // Copy the Window's handle into the memory passed in - COM.MoveMemory(phwnd, new int /*long*/[] {handle}, OS.PTR_SIZEOF); + COM.MoveMemory(phwnd, new long /*int*/[] {handle}, OS.PTR_SIZEOF); return COM.S_OK; } RECT getRect() { @@ -789,17 +789,17 @@ RECT getRect() { rect.bottom = area.y + area.height; return rect; } -private int GetWindowContext(int /*long*/ ppFrame, int /*long*/ ppDoc, int /*long*/ lprcPosRect, int /*long*/ lprcClipRect, int /*long*/ lpFrameInfo) { +private int GetWindowContext(long /*int*/ ppFrame, long /*int*/ ppDoc, long /*int*/ lprcPosRect, long /*int*/ lprcClipRect, long /*int*/ lpFrameInfo) { if (frame == null || ppFrame == 0) return COM.E_NOTIMPL; // fill in frame handle - int /*long*/ iOleInPlaceFrame = frame.getIOleInPlaceFrame(); - COM.MoveMemory(ppFrame, new int /*long*/[] {iOleInPlaceFrame}, OS.PTR_SIZEOF); + long /*int*/ iOleInPlaceFrame = frame.getIOleInPlaceFrame(); + COM.MoveMemory(ppFrame, new long /*int*/[] {iOleInPlaceFrame}, OS.PTR_SIZEOF); frame.AddRef(); // null out document handle - if (ppDoc != 0) COM.MoveMemory(ppDoc, new int /*long*/[] {0}, OS.PTR_SIZEOF); + if (ppDoc != 0) COM.MoveMemory(ppDoc, new long /*int*/[] {0}, OS.PTR_SIZEOF); // fill in position and clipping info RECT rect = getRect(); @@ -814,10 +814,10 @@ private int GetWindowContext(int /*long*/ ppFrame, int /*long*/ ppDoc, int /*lon Shell shell = getShell(); Menu menubar = shell.getMenuBar(); if (menubar != null && !menubar.isDisposed()) { - int /*long*/ hwnd = shell.handle; + long /*int*/ hwnd = shell.handle; int cAccel = (int)/*64*/OS.SendMessage(hwnd, OS.WM_APP, 0, 0); if (cAccel != 0) { - int /*long*/ hAccel = OS.SendMessage(hwnd, OS.WM_APP+1, 0, 0); + long /*int*/ hAccel = OS.SendMessage(hwnd, OS.WM_APP+1, 0, 0); if (hAccel != 0) { frameInfo.cAccelEntries = cAccel; frameInfo.haccel = hAccel; @@ -847,7 +847,7 @@ public boolean isDirty() { */ // Get access to the persistent storage mechanism - int /*long*/[] address = new int /*long*/[1]; + long /*int*/[] address = new long /*int*/[1]; if (objIOleObject.QueryInterface(COM.IIDIPersistFile, address) != COM.S_OK) return true; IPersistFile permStorage = new IPersistFile(address[0]); @@ -859,9 +859,9 @@ public boolean isDirty() { } public boolean isFocusControl () { checkWidget (); - int /*long*/ focusHwnd = OS.GetFocus(); + long /*int*/ focusHwnd = OS.GetFocus(); if (objIOleInPlaceObject == null) return (handle == focusHwnd); - int /*long*/[] phwnd = new int /*long*/[1]; + long /*int*/[] phwnd = new long /*int*/[1]; objIOleInPlaceObject.GetWindow(phwnd); while (focusHwnd != 0) { if (phwnd[0] == focusHwnd) return true; @@ -889,7 +889,7 @@ private boolean isOffice2007(boolean program) { private int OnClose() { return COM.S_OK; } -private int OnDataChange(int /*long*/ pFormatetc, int /*long*/ pStgmed) { +private int OnDataChange(long /*int*/ pFormatetc, long /*int*/ pStgmed) { return COM.S_OK; } private void onDispose(Event e) { @@ -918,7 +918,7 @@ private void onDispose(Event e) { void onFocusIn(Event e) { if (inDispose) return; if (state != STATE_UIACTIVE) { - int /*long*/[] ppvObject = new int /*long*/[1]; + long /*int*/[] ppvObject = new long /*int*/[1]; if (objIUnknown.QueryInterface(COM.IIDIOleInPlaceObject, ppvObject) == COM.S_OK) { IOleInPlaceObject objIOleInPlaceObject = new IOleInPlaceObject(ppvObject[0]); objIOleInPlaceObject.Release(); @@ -927,7 +927,7 @@ void onFocusIn(Event e) { } if (objIOleInPlaceObject == null) return; if (isFocusControl()) return; - int /*long*/[] phwnd = new int /*long*/[1]; + long /*int*/[] phwnd = new long /*int*/[1]; objIOleInPlaceObject.GetWindow(phwnd); if (phwnd[0] == 0) return; OS.SetFocus(phwnd[0]); @@ -939,7 +939,7 @@ private int OnInPlaceActivate() { frame.setCurrentDocument(this); if (objIOleObject == null) return COM.S_OK; - int /*long*/[] ppvObject = new int /*long*/[1]; + long /*int*/[] ppvObject = new long /*int*/[1]; if (objIOleObject.QueryInterface(COM.IIDIOleInPlaceObject, ppvObject) == COM.S_OK) { objIOleInPlaceObject = new IOleInPlaceObject(ppvObject[0]); } @@ -956,7 +956,7 @@ private int OnInPlaceDeactivate() { } return COM.S_OK; } -private int OnPosRectChange(int /*long*/ lprcPosRect) { +private int OnPosRectChange(long /*int*/ lprcPosRect) { Point size = getSize(); setExtent(size.x, size.y); return COM.S_OK; @@ -974,7 +974,7 @@ private void onPaint(Event e) { rect.top = area.y; rect.bottom = area.y + size.cy; } - int /*long*/ pArea = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, RECT.sizeof); + long /*int*/ pArea = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, RECT.sizeof); OS.MoveMemory(pArea, rect, RECT.sizeof); COM.OleDraw(objIUnknown.getAddress(), aspect, e.gc.handle, pArea); OS.GlobalFree(pArea); @@ -991,7 +991,7 @@ private int OnShowWindow(int fShow) { private int OnUIActivate() { if (objIOleInPlaceObject == null) return COM.E_FAIL; state = STATE_UIACTIVE; - int /*long*/[] phwnd = new int /*long*/[1]; + long /*int*/[] phwnd = new long /*int*/[1]; if (objIOleInPlaceObject.GetWindow(phwnd) == COM.S_OK) { OS.SetWindowPos(phwnd[0], OS.HWND_TOP, 0, 0, 0, 0, OS.SWP_NOSIZE | OS.SWP_NOMOVE); } @@ -1011,7 +1011,7 @@ int OnUIDeactivate(int fUndoable) { if (menubar == null || menubar.isDisposed()) return COM.S_OK; - int /*long*/ shellHandle = shell.handle; + long /*int*/ shellHandle = shell.handle; OS.SetMenu(shellHandle, menubar.handle); return COM.OleSetMenuDescriptor(0, shellHandle, 0, 0, 0); } @@ -1031,7 +1031,7 @@ private void onTraverse(Event event) { private int OnViewChange(int dwAspect, int lindex) { return COM.S_OK; } -protected int QueryInterface(int /*long*/ riid, int /*long*/ ppvObject) { +protected int QueryInterface(long /*int*/ riid, long /*int*/ ppvObject) { if (riid == 0 || ppvObject == 0) return COM.E_NOINTERFACE; @@ -1039,34 +1039,34 @@ protected int QueryInterface(int /*long*/ riid, int /*long*/ ppvObject) { COM.MoveMemory(guid, riid, GUID.sizeof); if (COM.IsEqualGUID(guid, COM.IIDIUnknown)) { - COM.MoveMemory(ppvObject, new int /*long*/[] {iUnknown.getAddress()}, OS.PTR_SIZEOF); + COM.MoveMemory(ppvObject, new long /*int*/[] {iUnknown.getAddress()}, OS.PTR_SIZEOF); AddRef(); return COM.S_OK; } if (COM.IsEqualGUID(guid, COM.IIDIAdviseSink)) { - COM.MoveMemory(ppvObject, new int /*long*/[] {iAdviseSink.getAddress()}, OS.PTR_SIZEOF); + COM.MoveMemory(ppvObject, new long /*int*/[] {iAdviseSink.getAddress()}, OS.PTR_SIZEOF); AddRef(); return COM.S_OK; } if (COM.IsEqualGUID(guid, COM.IIDIOleClientSite)) { - COM.MoveMemory(ppvObject, new int /*long*/[] {iOleClientSite.getAddress()}, OS.PTR_SIZEOF); + COM.MoveMemory(ppvObject, new long /*int*/[] {iOleClientSite.getAddress()}, OS.PTR_SIZEOF); AddRef(); return COM.S_OK; } if (COM.IsEqualGUID(guid, COM.IIDIOleInPlaceSite)) { - COM.MoveMemory(ppvObject, new int /*long*/[] {iOleInPlaceSite.getAddress()}, OS.PTR_SIZEOF); + COM.MoveMemory(ppvObject, new long /*int*/[] {iOleInPlaceSite.getAddress()}, OS.PTR_SIZEOF); AddRef(); return COM.S_OK; } if (COM.IsEqualGUID(guid, COM.IIDIOleDocumentSite )) { String progID = getProgramID(); if (!progID.startsWith("PowerPoint")) { //$NON-NLS-1$ - COM.MoveMemory(ppvObject, new int /*long*/[] {iOleDocumentSite.getAddress()}, OS.PTR_SIZEOF); + COM.MoveMemory(ppvObject, new long /*int*/[] {iOleDocumentSite.getAddress()}, OS.PTR_SIZEOF); AddRef(); return COM.S_OK; } } - COM.MoveMemory(ppvObject, new int /*long*/[] {0}, OS.PTR_SIZEOF); + COM.MoveMemory(ppvObject, new long /*int*/[] {0}, OS.PTR_SIZEOF); return COM.E_NOINTERFACE; } /** @@ -1084,7 +1084,7 @@ protected int QueryInterface(int /*long*/ riid, int /*long*/ ppvObject) { public int queryStatus(int cmd) { if (objIOleCommandTarget == null) { - int /*long*/[] address = new int /*long*/[1]; + long /*int*/[] address = new long /*int*/[1]; if (objIUnknown.QueryInterface(COM.IIDIOleCommandTarget, address) != COM.S_OK) return 0; objIOleCommandTarget = new IOleCommandTarget(address[0]); @@ -1167,7 +1167,7 @@ public boolean save(File file, boolean includeOleInfo) { return saveToStorageFile(file); return saveToTraditionalFile(file); } -private boolean saveFromContents(int /*long*/ address, File file) { +private boolean saveFromContents(long /*int*/ address, File file) { boolean success = false; @@ -1178,7 +1178,7 @@ private boolean saveFromContents(int /*long*/ address, File file) { FileOutputStream writer = new FileOutputStream(file); int increment = 1024 * 4; - int /*long*/ pv = COM.CoTaskMemAlloc(increment); + long /*int*/ pv = COM.CoTaskMemAlloc(increment); int[] pcbWritten = new int[1]; while (tempContents.Read(pv, increment, pcbWritten) == COM.S_OK && pcbWritten[0] > 0) { byte[] buffer = new byte[ pcbWritten[0]]; @@ -1198,7 +1198,7 @@ private boolean saveFromContents(int /*long*/ address, File file) { return success; } -private boolean saveFromOle10Native(int /*long*/ address, File file) { +private boolean saveFromOle10Native(long /*int*/ address, File file) { boolean success = false; @@ -1207,7 +1207,7 @@ private boolean saveFromOle10Native(int /*long*/ address, File file) { // The "\1Ole10Native" stream contains a DWORD header whose value is the length // of the native data that follows. - int /*long*/ pv = COM.CoTaskMemAlloc(4); + long /*int*/ pv = COM.CoTaskMemAlloc(4); int[] size = new int[1]; int rc = tempContents.Read(pv, 4, null); OS.MoveMemory(size, pv, 4); @@ -1247,14 +1247,14 @@ private boolean saveOffice2007(File file) { boolean result = false; /* Excel fails to open the package stream when the PersistStorage is not in hands off mode */ - int /*long*/[] ppv = new int /*long*/[1]; + long /*int*/[] ppv = new long /*int*/[1]; IPersistStorage iPersistStorage = null; if (objIUnknown.QueryInterface(COM.IIDIPersistStorage, ppv) == COM.S_OK) { iPersistStorage = new IPersistStorage(ppv[0]); tempStorage.AddRef(); iPersistStorage.HandsOffStorage(); } - int /*long*/[] address = new int /*long*/[1]; + long /*int*/[] address = new long /*int*/[1]; int grfMode = COM.STGM_DIRECT | COM.STGM_READ | COM.STGM_SHARE_EXCLUSIVE; if (tempStorage.OpenStream("Package", 0, grfMode, 0, address) == COM.S_OK) { //$NON-NLS-1$ result = saveFromContents(address[0], file); @@ -1288,11 +1288,11 @@ private boolean saveToStorageFile(File file) { if (!updateStorage()) return false; // get access to the persistent storage mechanism - int /*long*/[] address = new int /*long*/[1]; + long /*int*/[] address = new long /*int*/[1]; if (objIOleObject.QueryInterface(COM.IIDIPersistStorage, address) != COM.S_OK) return false; IPersistStorage permStorage = new IPersistStorage(address[0]); try { - address = new int /*long*/[1]; + address = new long /*int*/[1]; char[] path = (file.getAbsolutePath()+"\0").toCharArray(); int mode = COM.STGM_TRANSACTED | COM.STGM_READWRITE | COM.STGM_SHARE_EXCLUSIVE | COM.STGM_CREATE; int result = COM.StgCreateDocfile(path, mode, 0, address); //Does an AddRef if successful @@ -1331,7 +1331,7 @@ private boolean saveToTraditionalFile(File file) { if (!updateStorage()) return false; - int /*long*/[] address = new int /*long*/[1]; + long /*int*/[] address = new long /*int*/[1]; // Look for a CONTENTS stream if (tempStorage.OpenStream("CONTENTS", 0, COM.STGM_DIRECT | COM.STGM_READ | COM.STGM_SHARE_EXCLUSIVE, 0, address) == COM.S_OK) //$NON-NLS-1$ return saveFromContents(address[0], file); @@ -1342,7 +1342,7 @@ private boolean saveToTraditionalFile(File file) { return false; } -private int Scroll_64(int /*long*/ scrollExtent) { +private int Scroll_64(long /*int*/ scrollExtent) { return COM.S_OK; } private int Scroll(int scrollExtent_cx, int scrollExtent_cy) { @@ -1424,7 +1424,7 @@ private int ShowObject() { public void showProperties(String title) { // Get the Property Page information from the OLE Object - int /*long*/[] ppvObject = new int /*long*/[1]; + long /*int*/[] ppvObject = new long /*int*/[1]; if (objIUnknown.QueryInterface(COM.IIDISpecifyPropertyPages, ppvObject) != COM.S_OK) return; ISpecifyPropertyPages objISPP = new ISpecifyPropertyPages(ppvObject[0]); CAUUID caGUID = new CAUUID(); @@ -1438,7 +1438,7 @@ public void showProperties(String title) { chTitle = new char[title.length()]; title.getChars(0, title.length(), chTitle, 0); } - result = COM.OleCreatePropertyFrame(frame.handle, 10, 10, chTitle, 1, new int /*long*/[] {objIUnknown.getAddress()}, caGUID.cElems, caGUID.pElems, COM.LOCALE_USER_DEFAULT, 0, 0); + result = COM.OleCreatePropertyFrame(frame.handle, 10, 10, chTitle, 1, new long /*int*/[] {objIUnknown.getAddress()}, caGUID.cElems, caGUID.pElems, COM.LOCALE_USER_DEFAULT, 0, 0); // free the property page information COM.CoTaskMemFree(caGUID.pElems); @@ -1447,7 +1447,7 @@ private boolean updateStorage() { if (tempStorage == null) return false; - int /*long*/[] ppv = new int /*long*/[1]; + long /*int*/[] ppv = new long /*int*/[1]; if (objIUnknown.QueryInterface(COM.IIDIPersistStorage, ppv) != COM.S_OK) return false; IPersistStorage iPersistStorage = new IPersistStorage(ppv[0]); @@ -1469,7 +1469,7 @@ private SIZE xFormHimetricToPixels(SIZE aSize) { // Return a new Size which is the pixel transformation of a // size in HIMETRIC units. - int /*long*/ hDC = OS.GetDC(0); + long /*int*/ hDC = OS.GetDC(0); int xppi = OS.GetDeviceCaps(hDC, 88); // logical pixels/inch in x int yppi = OS.GetDeviceCaps(hDC, 90); // logical pixels/inch in y OS.ReleaseDC(0, hDC); @@ -1484,7 +1484,7 @@ private SIZE xFormPixelsToHimetric(SIZE aSize) { // Return a new size which is the HIMETRIC transformation of a // size in pixel units. - int /*long*/ hDC = OS.GetDC(0); + long /*int*/ hDC = OS.GetDC(0); int xppi = OS.GetDeviceCaps(hDC, 88); // logical pixels/inch in x int yppi = OS.GetDeviceCaps(hDC, 90); // logical pixels/inch in y OS.ReleaseDC(0, hDC); diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleControlSite.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleControlSite.java index b5dda3f6ca..504eebf0b8 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleControlSite.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleControlSite.java @@ -55,7 +55,7 @@ public class OleControlSite extends OleClientSite // supporting Event Sink attributes private OleEventSink[] oleEventSink = new OleEventSink[0]; private GUID[] oleEventSinkGUID = new GUID[0]; - private int /*long*/[] oleEventSinkIUnknown = new int /*long*/[0]; + private long /*int*/[] oleEventSinkIUnknown = new long /*int*/[0]; // supporting information for the Control COM object private CONTROLINFO currentControlInfo; @@ -129,21 +129,21 @@ public OleControlSite(Composite parent, int style, String progId) { appClsid = getClassID(progId); if (appClsid == null) OLE.error(OLE.ERROR_INVALID_CLASSID); - int /*long*/ licinfo = getLicenseInfo(appClsid); + long /*int*/ licinfo = getLicenseInfo(appClsid); if (licinfo == 0) { // Open a storage object tempStorage = createTempStorage(); // Create ole object with storage object - int /*long*/[] address = new int /*long*/[1]; + long /*int*/[] address = new long /*int*/[1]; /* * Bug in ICA Client 2.7. The creation of the IOleObject fails if the client * site is provided to OleCreate(). The fix is to detect that the program * id is an ICA Client and do not pass a client site to OleCreate(). * IOleObject.SetClientSite() is called later on. */ - int /*long*/ clientSite = isICAClient() ? 0 : iOleClientSite.getAddress(); + long /*int*/ clientSite = isICAClient() ? 0 : iOleClientSite.getAddress(); int result = COM.OleCreate(appClsid, COM.IIDIUnknown, COM.OLERENDER_DRAW, null, clientSite, tempStorage.getAddress(), address); if (result != COM.S_OK) OLE.error(OLE.ERROR_CANNOT_CREATE_OBJECT, result); @@ -152,7 +152,7 @@ public OleControlSite(Composite parent, int style, String progId) { } else { // Prepare the ClassFactory - int /*long*/[] ppvObject = new int /*long*/[1]; + long /*int*/[] ppvObject = new long /*int*/[1]; try { int result = COM.CoGetClassObject(appClsid, COM.CLSCTX_INPROC_HANDLER | COM.CLSCTX_INPROC_SERVER, 0, COM.IIDIClassFactory2, ppvObject); if (result != COM.S_OK) { @@ -160,7 +160,7 @@ public OleControlSite(Composite parent, int style, String progId) { } IClassFactory2 classFactory = new IClassFactory2(ppvObject[0]); // Create Com Object - ppvObject = new int /*long*/[1]; + ppvObject = new long /*int*/[1]; result = classFactory.CreateInstanceLic(0, 0, COM.IIDIUnknown, licinfo, ppvObject); classFactory.Release(); if (result != COM.S_OK) @@ -172,7 +172,7 @@ public OleControlSite(Composite parent, int style, String progId) { objIUnknown = new IUnknown(ppvObject[0]); // Prepare a storage medium - ppvObject = new int /*long*/[1]; + ppvObject = new long /*int*/[1]; if (objIUnknown.QueryInterface(COM.IIDIPersistStorage, ppvObject) == COM.S_OK) { IPersistStorage persist = new IPersistStorage(ppvObject[0]); tempStorage = createTempStorage(); @@ -256,7 +256,7 @@ public void addEventListener(int eventID, OleListener listener) { } static GUID getDefaultEventSinkGUID(IUnknown unknown) { // get Event Sink I/F from IProvideClassInfo2 - int /*long*/[] ppvObject = new int /*long*/[1]; + long /*int*/[] ppvObject = new long /*int*/[1]; if (unknown.QueryInterface(COM.IIDIProvideClassInfo2, ppvObject) == COM.S_OK) { IProvideClassInfo2 pci2 = new IProvideClassInfo2(ppvObject[0]); GUID riid = new GUID(); @@ -268,14 +268,14 @@ static GUID getDefaultEventSinkGUID(IUnknown unknown) { // get Event Sink I/F from IProvideClassInfo if (unknown.QueryInterface(COM.IIDIProvideClassInfo, ppvObject) == COM.S_OK) { IProvideClassInfo pci = new IProvideClassInfo(ppvObject[0]); - int /*long*/[] ppTI = new int /*long*/[1]; - int /*long*/[] ppEI = new int /*long*/[1]; + long /*int*/[] ppTI = new long /*int*/[1]; + long /*int*/[] ppEI = new long /*int*/[1]; int result = pci.GetClassInfo(ppTI); pci.Release(); if (result == COM.S_OK && ppTI[0] != 0) { ITypeInfo classInfo = new ITypeInfo(ppTI[0]); - int /*long*/[] ppTypeAttr = new int /*long*/[1]; + long /*int*/[] ppTypeAttr = new long /*int*/[1]; result = classInfo.GetTypeAttr(ppTypeAttr); if (result == COM.S_OK && ppTypeAttr[0] != 0) { TYPEATTR typeAttribute = new TYPEATTR(); @@ -300,7 +300,7 @@ static GUID getDefaultEventSinkGUID(IUnknown unknown) { if (ppEI[0] != 0) { ITypeInfo eventInfo = new ITypeInfo(ppEI[0]); - ppTypeAttr = new int /*long*/[1]; + ppTypeAttr = new long /*int*/[1]; result = eventInfo.GetTypeAttr(ppTypeAttr); GUID riid = null; if (result == COM.S_OK && ppTypeAttr[0] != 0) { @@ -331,7 +331,7 @@ static GUID getDefaultEventSinkGUID(IUnknown unknown) { */ public void addEventListener(OleAutomation automation, int eventID, OleListener listener) { if (listener == null || automation == null) OLE.error (SWT.ERROR_NULL_ARGUMENT); - int /*long*/ address = automation.getAddress(); + long /*int*/ address = automation.getAddress(); IUnknown unknown = new IUnknown(address); GUID riid = getDefaultEventSinkGUID(unknown); if (riid != null) { @@ -355,7 +355,7 @@ public void addEventListener(OleAutomation automation, int eventID, OleListener */ public void addEventListener(OleAutomation automation, String eventSinkId, int eventID, OleListener listener) { if (listener == null || automation == null || eventSinkId == null) OLE.error (SWT.ERROR_NULL_ARGUMENT); - int /*long*/ address = automation.getAddress(); + long /*int*/ address = automation.getAddress(); if (address == 0) return; char[] buffer = (eventSinkId +"\0").toCharArray(); GUID guid = new GUID(); @@ -363,7 +363,7 @@ public void addEventListener(OleAutomation automation, String eventSinkId, int e addEventListener(address, guid, eventID, listener); } -void addEventListener(int /*long*/ iunknown, GUID guid, int eventID, OleListener listener) { +void addEventListener(long /*int*/ iunknown, GUID guid, int eventID, OleListener listener) { if (listener == null || iunknown == 0 || guid == null) OLE.error (SWT.ERROR_NULL_ARGUMENT); // have we connected to this kind of event sink before? int index = -1; @@ -381,7 +381,7 @@ void addEventListener(int /*long*/ iunknown, GUID guid, int eventID, OleListener int oldLength = oleEventSink.length; OleEventSink[] newOleEventSink = new OleEventSink[oldLength + 1]; GUID[] newOleEventSinkGUID = new GUID[oldLength + 1]; - int /*long*/[] newOleEventSinkIUnknown = new int /*long*/[oldLength + 1]; + long /*int*/[] newOleEventSinkIUnknown = new long /*int*/[oldLength + 1]; System.arraycopy(oleEventSink, 0, newOleEventSink, 0, oldLength); System.arraycopy(oleEventSinkGUID, 0, newOleEventSinkGUID, 0, oldLength); System.arraycopy(oleEventSinkIUnknown, 0, newOleEventSinkIUnknown, 0, oldLength); @@ -406,7 +406,7 @@ protected void addObjectReferences() { connectPropertyChangeSink(); // Get access to the Control object - int /*long*/[] ppvObject = new int /*long*/[1]; + long /*int*/[] ppvObject = new long /*int*/[1]; if (objIUnknown.QueryInterface(COM.IIDIOleControl, ppvObject) == COM.S_OK) { IOleControl objIOleControl = new IOleControl(ppvObject[0]); // ask the control for its info in case users @@ -441,26 +441,26 @@ protected void createCOMInterfaces () { // register each of the interfaces that this object implements iOleControlSite = new COMObject(new int[]{2, 0, 0, 0, 1, 1, 3, 2, 1, 0}){ - public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);} - public int /*long*/ method1(int /*long*/[] args) {return AddRef();} - public int /*long*/ method2(int /*long*/[] args) {return Release();} - public int /*long*/ method3(int /*long*/[] args) {return OnControlInfoChanged();} + public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long /*int*/ method3(long /*int*/[] args) {return OnControlInfoChanged();} // method4 LockInPlaceActive - not implemented // method5 GetExtendedControl - not implemented // method6 TransformCoords - not implemented // method7 Translate Accelerator - not implemented - public int /*long*/ method8(int /*long*/[] args) {return OnFocus((int)/*64*/args[0]);} + public long /*int*/ method8(long /*int*/[] args) {return OnFocus((int)/*64*/args[0]);} // method9 ShowPropertyFrame - not implemented }; iDispatch = new COMObject(new int[]{2, 0, 0, 1, 3, 5, 8}){ - public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);} - public int /*long*/ method1(int /*long*/[] args) {return AddRef();} - public int /*long*/ method2(int /*long*/[] args) {return Release();} + public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long /*int*/ method2(long /*int*/[] args) {return Release();} // method3 GetTypeInfoCount - not implemented // method4 GetTypeInfo - not implemented // method5 GetIDsOfNames - not implemented - public int /*long*/ method6(int /*long*/[] args) {return Invoke((int)/*64*/args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], args[4], args[5], args[6], args[7]);} + public long /*int*/ method6(long /*int*/[] args) {return Invoke((int)/*64*/args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], args[4], args[5], args[6], args[7]);} }; } private void disconnectEventSinks() { @@ -472,7 +472,7 @@ private void disconnectEventSinks() { } oleEventSink = new OleEventSink[0]; oleEventSinkGUID = new GUID[0]; - oleEventSinkIUnknown = new int /*long*/[0]; + oleEventSinkIUnknown = new long /*int*/[0]; } private void disconnectPropertyChangeSink() { @@ -556,19 +556,19 @@ public Color getForeground () { return super.getForeground(); } -protected int /*long*/ getLicenseInfo(GUID clsid) { - int /*long*/[] ppvObject = new int /*long*/[1]; +protected long /*int*/ getLicenseInfo(GUID clsid) { + long /*int*/[] ppvObject = new long /*int*/[1]; if (COM.CoGetClassObject(clsid, COM.CLSCTX_INPROC_HANDLER | COM.CLSCTX_INPROC_SERVER, 0, COM.IIDIClassFactory, ppvObject) != COM.S_OK) { return 0; } - int /*long*/ result = 0; + long /*int*/ result = 0; IUnknown unknown = new IUnknown(ppvObject[0]); if (unknown.QueryInterface(COM.IIDIClassFactory2, ppvObject) == COM.S_OK) { IClassFactory2 classFactory = new IClassFactory2(ppvObject[0]); LICINFO licinfo = new LICINFO(); if (classFactory.GetLicInfo(licinfo) == COM.S_OK) { - int /*long*/[] pBstrKey = new int /*long*/[1]; + long /*int*/[] pBstrKey = new long /*int*/[1]; if (licinfo != null && licinfo.fRuntimeKeyAvail) { if (classFactory.RequestLicKey(0, pBstrKey) == COM.S_OK) { result = pBstrKey[0]; @@ -599,22 +599,22 @@ public Variant getSiteProperty(int dispId){ } return null; } -protected int GetWindow(int /*long*/ phwnd) { +protected int GetWindow(long /*int*/ phwnd) { if (phwnd == 0) return COM.E_INVALIDARG; if (frame == null) { - COM.MoveMemory(phwnd, new int /*long*/[] {0}, OS.PTR_SIZEOF); + COM.MoveMemory(phwnd, new long /*int*/[] {0}, OS.PTR_SIZEOF); return COM.E_NOTIMPL; } // Copy the Window's handle into the memory passed in - COM.MoveMemory(phwnd, new int /*long*/[] {handle}, OS.PTR_SIZEOF); + COM.MoveMemory(phwnd, new long /*int*/[] {handle}, OS.PTR_SIZEOF); return COM.S_OK; } -private int Invoke(int dispIdMember, int /*long*/ riid, int lcid, int dwFlags, int /*long*/ pDispParams, int /*long*/ pVarResult, int /*long*/ pExcepInfo, int /*long*/ pArgErr) { +private int Invoke(int dispIdMember, long /*int*/ riid, int lcid, int dwFlags, long /*int*/ pDispParams, long /*int*/ pVarResult, long /*int*/ pExcepInfo, long /*int*/ pArgErr) { if (pVarResult == 0 || dwFlags != COM.DISPATCH_PROPERTYGET) { - if (pExcepInfo != 0) COM.MoveMemory(pExcepInfo, new int /*long*/ [] {0}, OS.PTR_SIZEOF); + if (pExcepInfo != 0) COM.MoveMemory(pExcepInfo, new long /*int*/ [] {0}, OS.PTR_SIZEOF); if (pArgErr != 0) COM.MoveMemory(pArgErr, new int[] {0}, 4); return COM.DISP_E_MEMBERNOTFOUND; } @@ -628,8 +628,8 @@ private int Invoke(int dispIdMember, int /*long*/ riid, int lcid, int dwFlags, i case COM.DISPID_AMBIENT_SUPPORTSMNEMONICS : case COM.DISPID_AMBIENT_SHOWGRABHANDLES : case COM.DISPID_AMBIENT_SHOWHATCHING : - if (pVarResult != 0) COM.MoveMemory(pVarResult, new int /*long*/ [] {0}, OS.PTR_SIZEOF); - if (pExcepInfo != 0) COM.MoveMemory(pExcepInfo, new int /*long*/ [] {0}, OS.PTR_SIZEOF); + if (pVarResult != 0) COM.MoveMemory(pVarResult, new long /*int*/ [] {0}, OS.PTR_SIZEOF); + if (pExcepInfo != 0) COM.MoveMemory(pExcepInfo, new long /*int*/ [] {0}, OS.PTR_SIZEOF); if (pArgErr != 0) COM.MoveMemory(pArgErr, new int[] {0}, 4); return COM.S_FALSE; @@ -641,20 +641,20 @@ private int Invoke(int dispIdMember, int /*long*/ riid, int lcid, int dwFlags, i case COM.DISPID_AMBIENT_LOCALEID : case COM.DISPID_AMBIENT_SILENT : case COM.DISPID_AMBIENT_MESSAGEREFLECT : - if (pVarResult != 0) COM.MoveMemory(pVarResult, new int /*long*/ [] {0}, OS.PTR_SIZEOF); - if (pExcepInfo != 0) COM.MoveMemory(pExcepInfo, new int /*long*/ [] {0}, OS.PTR_SIZEOF); + if (pVarResult != 0) COM.MoveMemory(pVarResult, new long /*int*/ [] {0}, OS.PTR_SIZEOF); + if (pExcepInfo != 0) COM.MoveMemory(pExcepInfo, new long /*int*/ [] {0}, OS.PTR_SIZEOF); if (pArgErr != 0) COM.MoveMemory(pArgErr, new int[] {0}, 4); return COM.E_NOTIMPL; default : - if (pVarResult != 0) COM.MoveMemory(pVarResult, new int /*long*/ [] {0}, OS.PTR_SIZEOF); - if (pExcepInfo != 0) COM.MoveMemory(pExcepInfo,new int /*long*/ [] {0}, OS.PTR_SIZEOF); + if (pVarResult != 0) COM.MoveMemory(pVarResult, new long /*int*/ [] {0}, OS.PTR_SIZEOF); + if (pExcepInfo != 0) COM.MoveMemory(pExcepInfo,new long /*int*/ [] {0}, OS.PTR_SIZEOF); if (pArgErr != 0) COM.MoveMemory(pArgErr, new int[] {0}, 4); return COM.DISP_E_MEMBERNOTFOUND; } } private int OnControlInfoChanged() { - int /*long*/[] ppvObject = new int /*long*/[1]; + long /*int*/[] ppvObject = new long /*int*/[1]; if (objIUnknown.QueryInterface(COM.IIDIOleControl, ppvObject) == COM.S_OK) { IOleControl objIOleControl = new IOleControl(ppvObject[0]); // ask the control for its info in case users @@ -678,7 +678,7 @@ void onFocusIn(Event e) { if (objIOleInPlaceObject == null) return; if (!isActivated) doVerb(OLE.OLEIVERB_UIACTIVATE); if (isFocusControl()) return; - int /*long*/[] phwnd = new int /*long*/[1]; + long /*int*/[] phwnd = new long /*int*/[1]; objIOleInPlaceObject.GetWindow(phwnd); if (phwnd[0] == 0) return; OS.SetFocus(phwnd[0]); @@ -737,7 +737,7 @@ void onFocusOut(Event e) { private int OnFocus(int fGotFocus) { return COM.S_OK; } -protected int QueryInterface(int /*long*/ riid, int /*long*/ ppvObject) { +protected int QueryInterface(long /*int*/ riid, long /*int*/ ppvObject) { int result = super.QueryInterface(riid, ppvObject); if (result == COM.S_OK) return result; @@ -746,16 +746,16 @@ protected int QueryInterface(int /*long*/ riid, int /*long*/ ppvObject) { GUID guid = new GUID(); COM.MoveMemory(guid, riid, GUID.sizeof); if (COM.IsEqualGUID(guid, COM.IIDIOleControlSite)) { - COM.MoveMemory(ppvObject, new int /*long*/[] {iOleControlSite.getAddress()}, OS.PTR_SIZEOF); + COM.MoveMemory(ppvObject, new long /*int*/[] {iOleControlSite.getAddress()}, OS.PTR_SIZEOF); AddRef(); return COM.S_OK; } if (COM.IsEqualGUID(guid, COM.IIDIDispatch)) { - COM.MoveMemory(ppvObject, new int /*long*/[] {iDispatch.getAddress()}, OS.PTR_SIZEOF); + COM.MoveMemory(ppvObject, new long /*int*/[] {iDispatch.getAddress()}, OS.PTR_SIZEOF); AddRef(); return COM.S_OK; } - COM.MoveMemory(ppvObject, new int /*long*/[] {0}, OS.PTR_SIZEOF); + COM.MoveMemory(ppvObject, new long /*int*/[] {0}, OS.PTR_SIZEOF); return COM.E_NOINTERFACE; } protected int Release() { @@ -836,14 +836,14 @@ public void removeEventListener(OleAutomation automation, GUID guid, int eventID public void removeEventListener(OleAutomation automation, int eventID, OleListener listener) { checkWidget(); if (automation == null || listener == null) SWT.error (SWT.ERROR_NULL_ARGUMENT); - int /*long*/ address = automation.getAddress(); + long /*int*/ address = automation.getAddress(); IUnknown unknown = new IUnknown(address); GUID riid = getDefaultEventSinkGUID(unknown); if (riid != null) { removeEventListener(address, riid, eventID, listener); } } -void removeEventListener(int /*long*/ iunknown, GUID guid, int eventID, OleListener listener) { +void removeEventListener(long /*int*/ iunknown, GUID guid, int eventID, OleListener listener) { if (listener == null || guid == null) SWT.error (SWT.ERROR_NULL_ARGUMENT); for (int i = 0; i < oleEventSink.length; i++) { if (COM.IsEqualGUID(oleEventSinkGUID[i], guid)) { @@ -857,7 +857,7 @@ void removeEventListener(int /*long*/ iunknown, GUID guid, int eventID, OleListe if (oldLength == 1) { oleEventSink = new OleEventSink[0]; oleEventSinkGUID = new GUID[0]; - oleEventSinkIUnknown = new int /*long*/[0]; + oleEventSinkIUnknown = new long /*int*/[0]; } else { OleEventSink[] newOleEventSink = new OleEventSink[oldLength - 1]; System.arraycopy(oleEventSink, 0, newOleEventSink, 0, i); @@ -869,7 +869,7 @@ void removeEventListener(int /*long*/ iunknown, GUID guid, int eventID, OleListe System.arraycopy(oleEventSinkGUID, i + 1, newOleEventSinkGUID, i, oldLength - i - 1); oleEventSinkGUID = newOleEventSinkGUID; - int /*long*/[] newOleEventSinkIUnknown = new int /*long*/[oldLength - 1]; + long /*int*/[] newOleEventSinkIUnknown = new long /*int*/[oldLength - 1]; System.arraycopy(oleEventSinkIUnknown, 0, newOleEventSinkIUnknown, 0, i); System.arraycopy(oleEventSinkIUnknown, i + 1, newOleEventSinkIUnknown, i, oldLength - i - 1); oleEventSinkIUnknown = newOleEventSinkIUnknown; diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleEventSink.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleEventSink.java index ae94cf4103..648195eef0 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleEventSink.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleEventSink.java @@ -27,7 +27,7 @@ final class OleEventSink private OleEventTable eventTable; -OleEventSink(OleControlSite widget, int /*long*/ iUnknown, GUID riid) { +OleEventSink(OleControlSite widget, long /*int*/ iUnknown, GUID riid) { this.widget = widget; this.eventGuid = riid; @@ -37,10 +37,10 @@ OleEventSink(OleControlSite widget, int /*long*/ iUnknown, GUID riid) { } void connect () { - int /*long*/[] ppvObject = new int /*long*/[1]; + long /*int*/[] ppvObject = new long /*int*/[1]; if (objIUnknown.QueryInterface(COM.IIDIConnectionPointContainer, ppvObject) == COM.S_OK) { IConnectionPointContainer cpc = new IConnectionPointContainer(ppvObject[0]); - int /*long*/[] ppCP = new int /*long*/[1]; + long /*int*/[] ppCP = new long /*int*/[1]; if (cpc.FindConnectionPoint(eventGuid, ppCP) == COM.S_OK) { IConnectionPoint cp = new IConnectionPoint(ppCP[0]); int[] pCookie = new int[1]; @@ -62,19 +62,19 @@ int AddRef() { } private void createCOMInterfaces() { iDispatch = new COMObject(new int[]{2, 0, 0, 1, 3, 4, 8}){ - public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);} - public int /*long*/ method1(int /*long*/[] args) {return AddRef();} - public int /*long*/ method2(int /*long*/[] args) {return Release();} + public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long /*int*/ method2(long /*int*/[] args) {return Release();} // method3 GetTypeInfoCount - not implemented // method4 GetTypeInfo - not implemented // method5 GetIDsOfNames - not implemented - public int /*long*/ method6(int /*long*/[] args) {return Invoke((int)/*64*/args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], args[4], args[5], args[6], args[7]);} + public long /*int*/ method6(long /*int*/[] args) {return Invoke((int)/*64*/args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], args[4], args[5], args[6], args[7]);} }; } void disconnect() { // disconnect event sink if (eventCookie != 0 && objIUnknown != null) { - int /*long*/[] ppvObject = new int /*long*/[1]; + long /*int*/[] ppvObject = new long /*int*/[1]; if (objIUnknown.QueryInterface(COM.IIDIConnectionPointContainer, ppvObject) == COM.S_OK) { IConnectionPointContainer cpc = new IConnectionPointContainer(ppvObject[0]); if (cpc.FindConnectionPoint(eventGuid, ppvObject) == COM.S_OK) { @@ -94,7 +94,7 @@ private void disposeCOMInterfaces() { iDispatch = null; } -private int Invoke(int dispIdMember, int /*long*/ riid, int lcid, int dwFlags, int /*long*/ pDispParams, int /*long*/ pVarResult, int /*long*/ pExcepInfo, int /*long*/ pArgErr) +private int Invoke(int dispIdMember, long /*int*/ riid, int lcid, int dwFlags, long /*int*/ pDispParams, long /*int*/ pVarResult, long /*int*/ pExcepInfo, long /*int*/ pArgErr) { if (eventTable == null || !eventTable.hooks(dispIdMember)) return COM.S_OK; @@ -106,7 +106,7 @@ private int Invoke(int dispIdMember, int /*long*/ riid, int lcid, int dwFlags, i COM.MoveMemory(dispParams, pDispParams, DISPPARAMS.sizeof); eventInfo = new Variant[dispParams.cArgs]; int size = VARIANT.sizeof; - int /*long*/ offset = (dispParams.cArgs - 1) * size; + long /*int*/ offset = (dispParams.cArgs - 1) * size; for (int j = 0; j < dispParams.cArgs; j++){ eventInfo[j] = new Variant(); @@ -144,7 +144,7 @@ private void notifyListener (int eventType, OleEvent event) { event.widget = widget; eventTable.sendEvent (event); } -private int QueryInterface(int /*long*/ riid, int /*long*/ ppvObject) { +private int QueryInterface(long /*int*/ riid, long /*int*/ ppvObject) { if (riid == 0 || ppvObject == 0) return COM.E_INVALIDARG; @@ -153,12 +153,12 @@ private int QueryInterface(int /*long*/ riid, int /*long*/ ppvObject) { if ( COM.IsEqualGUID(guid, COM.IIDIUnknown) || COM.IsEqualGUID(guid, COM.IIDIDispatch) || COM.IsEqualGUID(guid, eventGuid)) { - COM.MoveMemory(ppvObject, new int /*long*/[] {iDispatch.getAddress()}, OS.PTR_SIZEOF); + COM.MoveMemory(ppvObject, new long /*int*/[] {iDispatch.getAddress()}, OS.PTR_SIZEOF); AddRef(); return OLE.S_OK; } - COM.MoveMemory(ppvObject, new int /*long*/[] {0}, OS.PTR_SIZEOF); + COM.MoveMemory(ppvObject, new long /*int*/[] {0}, OS.PTR_SIZEOF); return COM.E_NOINTERFACE; } int Release() { diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleFrame.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleFrame.java index 560d7927e5..403b7d47e3 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleFrame.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleFrame.java @@ -133,9 +133,9 @@ private static void initCheckFocus (final Display display) { public void run() { if (lastFocus[0] instanceof OleClientSite && !lastFocus[0].isDisposed()) { // ignore popup menus and dialogs - int /*long*/ hwnd = OS.GetFocus(); + long /*int*/ hwnd = OS.GetFocus(); while (hwnd != 0) { - int /*long*/ ownerHwnd = OS.GetWindow(hwnd, OS.GW_OWNER); + long /*int*/ ownerHwnd = OS.GetWindow(hwnd, OS.GW_OWNER); if (ownerHwnd != 0) { display.timerExec(time, timer[0]); return; @@ -168,10 +168,10 @@ private static void initCheckFocus (final Display display) { private static void initMsgHook(Display display) { if (display.getData(HHOOK) != null) return; final Callback callback = new Callback(OleFrame.class, "getMsgProc", 3); //$NON-NLS-1$ - int /*long*/ address = callback.getAddress(); + long /*int*/ address = callback.getAddress(); if (address == 0) SWT.error(SWT.ERROR_NO_MORE_CALLBACKS); int threadId = OS.GetCurrentThreadId(); - final int /*long*/ hHook = OS.SetWindowsHookEx(OS.WH_GETMESSAGE, address, 0, threadId); + final long /*int*/ hHook = OS.SetWindowsHookEx(OS.WH_GETMESSAGE, address, 0, threadId); if (hHook == 0) { callback.dispose(); return; @@ -185,7 +185,7 @@ private static void initMsgHook(Display display) { } }); } -static int /*long*/ getMsgProc(int /*long*/ code, int /*long*/ wParam, int /*long*/ lParam) { +static long /*int*/ getMsgProc(long /*int*/ code, long /*int*/ wParam, long /*int*/ lParam) { Display display = Display.getCurrent(); if (display == null) return 0; LONG hHook = (LONG)display.getData(HHOOK); @@ -199,7 +199,7 @@ static int /*long*/ getMsgProc(int /*long*/ code, int /*long*/ wParam, int /*lon if (OS.WM_KEYFIRST <= message && message <= OS.WM_KEYLAST) { if (display != null) { Widget widget = null; - int /*long*/ hwnd = msg.hwnd; + long /*int*/ hwnd = msg.hwnd; while (hwnd != 0) { widget = display.findWidget (hwnd); if (widget != null) break; @@ -274,7 +274,7 @@ static int /*long*/ getMsgProc(int /*long*/ code, int /*long*/ wParam, int /*lon } /* Allow OleClientSite to process key events before activeX control */ if (!consumed && !accentKey && !ignoreNextKey) { - int /*long*/ hwndOld = msg.hwnd; + long /*int*/ hwndOld = msg.hwnd; msg.hwnd = site.handle; consumed = OS.DispatchMessage (msg) == 1; msg.hwnd = hwndOld; @@ -327,27 +327,27 @@ private int ContextSensitiveHelp(int fEnterMode) { private void createCOMInterfaces() { // Create each of the interfaces that this object implements iUnknown = new COMObject(new int[]{2, 0, 0}){ - public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);} - public int /*long*/ method1(int /*long*/[] args) {return AddRef();} - public int /*long*/ method2(int /*long*/[] args) {return Release();} + public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long /*int*/ method2(long /*int*/[] args) {return Release();} }; iOleInPlaceFrame = new COMObject(new int[]{2, 0, 0, 1, 1, 1, 1, 1, 2, 2, 3, 1, 1, 1, 2}){ - public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);} - public int /*long*/ method1(int /*long*/[] args) {return AddRef();} - public int /*long*/ method2(int /*long*/[] args) {return Release();} - public int /*long*/ method3(int /*long*/[] args) {return GetWindow(args[0]);} - public int /*long*/ method4(int /*long*/[] args) {return ContextSensitiveHelp((int)/*64*/args[0]);} - public int /*long*/ method5(int /*long*/[] args) {return GetBorder(args[0]);} - public int /*long*/ method6(int /*long*/[] args) {return RequestBorderSpace(args[0]);} - public int /*long*/ method7(int /*long*/[] args) {return SetBorderSpace(args[0]);} - public int /*long*/ method8(int /*long*/[] args) {return SetActiveObject(args[0], args[1]);} - public int /*long*/ method9(int /*long*/[] args) {return InsertMenus(args[0], args[1]);} - public int /*long*/ method10(int /*long*/[] args) {return SetMenu(args[0], args[1], args[2]);} - public int /*long*/ method11(int /*long*/[] args) {return RemoveMenus(args[0]);} + public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long /*int*/ method3(long /*int*/[] args) {return GetWindow(args[0]);} + public long /*int*/ method4(long /*int*/[] args) {return ContextSensitiveHelp((int)/*64*/args[0]);} + public long /*int*/ method5(long /*int*/[] args) {return GetBorder(args[0]);} + public long /*int*/ method6(long /*int*/[] args) {return RequestBorderSpace(args[0]);} + public long /*int*/ method7(long /*int*/[] args) {return SetBorderSpace(args[0]);} + public long /*int*/ method8(long /*int*/[] args) {return SetActiveObject(args[0], args[1]);} + public long /*int*/ method9(long /*int*/[] args) {return InsertMenus(args[0], args[1]);} + public long /*int*/ method10(long /*int*/[] args) {return SetMenu(args[0], args[1], args[2]);} + public long /*int*/ method11(long /*int*/[] args) {return RemoveMenus(args[0]);} // method12 SetStatusText - not implemented // method13 EnableModeless - not implemented - public int /*long*/ method14(int /*long*/[] args) {return TranslateAccelerator(args[0], (int)/*64*/args[1]);} + public long /*int*/ method14(long /*int*/[] args) {return TranslateAccelerator(args[0], (int)/*64*/args[1]);} }; } private void disposeCOMInterfaces () { @@ -360,7 +360,7 @@ private void disposeCOMInterfaces () { iOleInPlaceFrame.dispose(); iOleInPlaceFrame = null; } -private int GetBorder(int /*long*/ lprectBorder) { +private int GetBorder(long /*int*/ lprectBorder) { /* The IOleInPlaceUIWindow::GetBorder function, when called on a document or frame window object, returns the outer rectangle (relative to the window) where the object can put @@ -409,11 +409,11 @@ public MenuItem[] getContainerMenus(){ public MenuItem[] getFileMenus(){ return fileMenuItems; } -int /*long*/ getIOleInPlaceFrame() { +long /*int*/ getIOleInPlaceFrame() { return iOleInPlaceFrame.getAddress(); } -private int /*long*/ getMenuItemID(int /*long*/ hMenu, int index) { - int /*long*/ id = 0; +private long /*int*/ getMenuItemID(long /*int*/ hMenu, int index) { + long /*int*/ id = 0; MENUITEMINFO lpmii = new MENUITEMINFO(); lpmii.cbSize = MENUITEMINFO.sizeof; lpmii.fMask = OS.MIIM_STATE | OS.MIIM_SUBMENU | OS.MIIM_ID; @@ -425,9 +425,9 @@ private int /*long*/ getMenuItemID(int /*long*/ hMenu, int index) { } return id; } -private int GetWindow(int /*long*/ phwnd) { +private int GetWindow(long /*int*/ phwnd) { if (phwnd != 0) { - COM.MoveMemory(phwnd, new int /*long*/[] {handle}, OS.PTR_SIZEOF); + COM.MoveMemory(phwnd, new long /*int*/[] {handle}, OS.PTR_SIZEOF); } return COM.S_OK; } @@ -449,22 +449,22 @@ private int GetWindow(int /*long*/ phwnd) { public MenuItem[] getWindowMenus(){ return windowMenuItems; } -private int InsertMenus(int /*long*/ hmenuShared, int /*long*/ lpMenuWidths) { +private int InsertMenus(long /*int*/ hmenuShared, long /*int*/ lpMenuWidths) { // locate menu bar Menu menubar = getShell().getMenuBar(); if (menubar == null || menubar.isDisposed()) { COM.MoveMemory(lpMenuWidths, new int[] {0}, 4); return COM.S_OK; } - int /*long*/ hMenu = menubar.handle; + long /*int*/ hMenu = menubar.handle; // Create a holder for menu information. This will be passed down to // the OS and the OS will fill in the requested information for each menu. MENUITEMINFO lpmii = new MENUITEMINFO(); - int /*long*/ hHeap = OS.GetProcessHeap(); + long /*int*/ hHeap = OS.GetProcessHeap(); int cch = 128; int byteCount = cch * TCHAR.sizeof; - int /*long*/ pszText = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, byteCount); + long /*int*/ pszText = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, byteCount); lpmii.cbSize = MENUITEMINFO.sizeof; lpmii.fMask = OS.MIIM_STATE | OS.MIIM_ID | OS.MIIM_TYPE | OS.MIIM_SUBMENU | OS.MIIM_DATA; lpmii.dwTypeData = pszText; @@ -580,19 +580,19 @@ private void onResize(Event e) { objIOleInPlaceActiveObject.ResizeBorder(lpRect, iOleInPlaceFrame.getAddress(), true); } } -private int QueryInterface(int /*long*/ riid, int /*long*/ ppvObject) { +private int QueryInterface(long /*int*/ riid, long /*int*/ ppvObject) { // implements IUnknown, IOleInPlaceFrame, IOleContainer, IOleInPlaceUIWindow if (riid == 0 || ppvObject == 0) return COM.E_INVALIDARG; GUID guid = new GUID(); COM.MoveMemory(guid, riid, GUID.sizeof); if (COM.IsEqualGUID(guid, COM.IIDIUnknown) || COM.IsEqualGUID(guid, COM.IIDIOleInPlaceFrame) ) { - COM.MoveMemory(ppvObject, new int /*long*/ [] {iOleInPlaceFrame.getAddress()}, OS.PTR_SIZEOF); + COM.MoveMemory(ppvObject, new long /*int*/ [] {iOleInPlaceFrame.getAddress()}, OS.PTR_SIZEOF); AddRef(); return COM.S_OK; } - COM.MoveMemory(ppvObject, new int /*long*/ [] {0}, OS.PTR_SIZEOF); + COM.MoveMemory(ppvObject, new long /*int*/ [] {0}, OS.PTR_SIZEOF); return COM.E_NOINTERFACE; } /** @@ -616,12 +616,12 @@ private void releaseObjectInterfaces() { } objIOleInPlaceActiveObject = null; } -private int RemoveMenus(int /*long*/ hmenuShared) { +private int RemoveMenus(long /*int*/ hmenuShared) { Menu menubar = getShell().getMenuBar(); if (menubar == null || menubar.isDisposed()) return COM.S_FALSE; - int /*long*/ hMenu = menubar.handle; + long /*int*/ hMenu = menubar.handle; Vector ids = new Vector(); if (this.fileMenuItems != null) { @@ -630,7 +630,7 @@ private int RemoveMenus(int /*long*/ hmenuShared) { if (item != null && !item.isDisposed()) { int index = item.getParent().indexOf(item); // get Id from original menubar - int /*long*/ id = getMenuItemID(hMenu, index); + long /*int*/ id = getMenuItemID(hMenu, index); ids.addElement(new LONG(id)); } } @@ -640,7 +640,7 @@ private int RemoveMenus(int /*long*/ hmenuShared) { MenuItem item = this.containerMenuItems[i]; if (item != null && !item.isDisposed()) { int index = item.getParent().indexOf(item); - int /*long*/ id = getMenuItemID(hMenu, index); + long /*int*/ id = getMenuItemID(hMenu, index); ids.addElement(new LONG(id)); } } @@ -650,24 +650,24 @@ private int RemoveMenus(int /*long*/ hmenuShared) { MenuItem item = this.windowMenuItems[i]; if (item != null && !item.isDisposed()) { int index = item.getParent().indexOf(item); - int /*long*/ id = getMenuItemID(hMenu, index); + long /*int*/ id = getMenuItemID(hMenu, index); ids.addElement(new LONG(id)); } } } int index = OS.GetMenuItemCount(hmenuShared) - 1; for (int i = index; i >= 0; i--) { - int /*long*/ id = getMenuItemID(hmenuShared, i); + long /*int*/ id = getMenuItemID(hmenuShared, i); if (ids.contains(new LONG(id))){ OS.RemoveMenu(hmenuShared, i, OS.MF_BYPOSITION); } } return COM.S_OK; } -private int RequestBorderSpace(int /*long*/ pborderwidths) { +private int RequestBorderSpace(long /*int*/ pborderwidths) { return COM.S_OK; } -int SetActiveObject(int /*long*/ pActiveObject, int /*long*/ pszObjName) { +int SetActiveObject(long /*int*/ pActiveObject, long /*int*/ pszObjName) { if (objIOleInPlaceActiveObject != null) { objIOleInPlaceActiveObject.Release(); objIOleInPlaceActiveObject = null; @@ -679,7 +679,7 @@ int SetActiveObject(int /*long*/ pActiveObject, int /*long*/ pszObjName) { return COM.S_OK; } -private int SetBorderSpace(int /*long*/ pborderwidths) { +private int SetBorderSpace(long /*int*/ pborderwidths) { // A Control/Document can : // Use its own toolbars, requesting border space of a specific size, or, // Use no toolbars, but force the container to remove its toolbars by passing a @@ -747,8 +747,8 @@ void setCurrentDocument(OleClientSite doc) { public void setFileMenus(MenuItem[] fileMenus){ fileMenuItems = fileMenus; } -private int SetMenu(int /*long*/ hmenuShared, int /*long*/ holemenu, int /*long*/ hwndActiveObject) { - int /*long*/ inPlaceActiveObject = 0; +private int SetMenu(long /*int*/ hmenuShared, long /*int*/ holemenu, long /*int*/ hwndActiveObject) { + long /*int*/ inPlaceActiveObject = 0; if (objIOleInPlaceActiveObject != null) inPlaceActiveObject = objIOleInPlaceActiveObject.getAddress(); @@ -757,7 +757,7 @@ private int SetMenu(int /*long*/ hmenuShared, int /*long*/ holemenu, int /*long* return COM.OleSetMenuDescriptor(0, getShell().handle, hwndActiveObject, iOleInPlaceFrame.getAddress(), inPlaceActiveObject); } - int /*long*/ handle = menubar.getShell().handle; + long /*int*/ handle = menubar.getShell().handle; if (hmenuShared == 0 && holemenu == 0) { // re-instate the original menu - this occurs on deactivation @@ -795,14 +795,14 @@ private boolean translateOleAccelerator(MSG msg) { int result = objIOleInPlaceActiveObject.TranslateAccelerator(msg); return (result != COM.S_FALSE && result != COM.E_NOTIMPL); } -private int TranslateAccelerator(int /*long*/ lpmsg, int wID){ +private int TranslateAccelerator(long /*int*/ lpmsg, int wID){ Menu menubar = getShell().getMenuBar(); if (menubar == null || menubar.isDisposed() || !menubar.isEnabled()) return COM.S_FALSE; if (wID < 0) return COM.S_FALSE; Shell shell = menubar.getShell(); - int /*long*/ hwnd = shell.handle; - int /*long*/ hAccel = OS.SendMessage(hwnd, OS.WM_APP+1, 0, 0); + long /*int*/ hwnd = shell.handle; + long /*int*/ hAccel = OS.SendMessage(hwnd, OS.WM_APP+1, 0, 0); if (hAccel == 0) return COM.S_FALSE; MSG msg = new MSG(); diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OlePropertyChangeSink.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OlePropertyChangeSink.java index 98ca8a8a2a..b1d0ed72c3 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OlePropertyChangeSink.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OlePropertyChangeSink.java @@ -47,7 +47,7 @@ int AddRef() { void connect(IUnknown objIUnknown) { // Set up property change notification sink - int /*long*/[] ppvObject = new int /*long*/[1]; + long /*int*/[] ppvObject = new long /*int*/[1]; if (objIUnknown.QueryInterface(COM.IIDIConnectionPointContainer, ppvObject) == COM.S_OK) { IConnectionPointContainer cpc = new IConnectionPointContainer(ppvObject[0]); if (cpc.FindConnectionPoint(COM.IIDIPropertyNotifySink, ppvObject) == COM.S_OK) { @@ -64,24 +64,24 @@ void connect(IUnknown objIUnknown) { private void createCOMInterfaces() { // register each of the interfaces that this object implements iUnknown = new COMObject(new int[]{2, 0, 0}){ - public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);} - public int /*long*/ method1(int /*long*/[] args) {return AddRef();} - public int /*long*/ method2(int /*long*/[] args) {return Release();} + public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long /*int*/ method2(long /*int*/[] args) {return Release();} }; iPropertyNotifySink = new COMObject(new int[]{2, 0, 0, 1, 1}){ - public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);} - public int /*long*/ method1(int /*long*/[] args) {return AddRef();} - public int /*long*/ method2(int /*long*/[] args) {return Release();} - public int /*long*/ method3(int /*long*/[] args) {return OnChanged((int)/*64*/args[0]);} - public int /*long*/ method4(int /*long*/[] args) {return OnRequestEdit((int)/*64*/args[0]);} + public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + public long /*int*/ method2(long /*int*/[] args) {return Release();} + public long /*int*/ method3(long /*int*/[] args) {return OnChanged((int)/*64*/args[0]);} + public long /*int*/ method4(long /*int*/[] args) {return OnRequestEdit((int)/*64*/args[0]);} }; } void disconnect(IUnknown objIUnknown) { // disconnect property notification sink if (propertyCookie != 0 && objIUnknown != null) { - int /*long*/[] ppvObject = new int /*long*/[1]; + long /*int*/[] ppvObject = new long /*int*/[1]; if (objIUnknown.QueryInterface(COM.IIDIConnectionPointContainer, ppvObject) == COM.S_OK) { IConnectionPointContainer cpc = new IConnectionPointContainer(ppvObject[0]); if (cpc.FindConnectionPoint(COM.IIDIPropertyNotifySink, ppvObject) == COM.S_OK) { @@ -140,22 +140,22 @@ private int OnRequestEdit(int dispID) { notifyListener(dispID,event); return (event.doit) ? COM.S_OK : COM.S_FALSE; } -private int QueryInterface(int /*long*/ riid, int /*long*/ ppvObject) { +private int QueryInterface(long /*int*/ riid, long /*int*/ ppvObject) { if (riid == 0 || ppvObject == 0) return COM.E_INVALIDARG; GUID guid = new GUID(); COM.MoveMemory(guid, riid, GUID.sizeof); if (COM.IsEqualGUID(guid, COM.IIDIUnknown)) { - COM.MoveMemory(ppvObject, new int /*long*/[] {iUnknown.getAddress()}, OS.PTR_SIZEOF); + COM.MoveMemory(ppvObject, new long /*int*/[] {iUnknown.getAddress()}, OS.PTR_SIZEOF); AddRef(); return COM.S_OK; } if (COM.IsEqualGUID(guid, COM.IIDIPropertyNotifySink)) { - COM.MoveMemory(ppvObject, new int /*long*/[] {iPropertyNotifySink.getAddress()}, OS.PTR_SIZEOF); + COM.MoveMemory(ppvObject, new long /*int*/[] {iPropertyNotifySink.getAddress()}, OS.PTR_SIZEOF); AddRef(); return COM.S_OK; } - COM.MoveMemory(ppvObject, new int /*long*/[] {0}, OS.PTR_SIZEOF); + COM.MoveMemory(ppvObject, new long /*int*/[] {0}, OS.PTR_SIZEOF); return COM.E_NOINTERFACE; } int Release() { diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/Variant.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/Variant.java index d7a541f2cf..bee729e9ac 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/Variant.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/Variant.java @@ -37,7 +37,7 @@ public final class Variant { private float floatData; private double doubleData; private String stringData; - private int /*long*/ byRefPtr; + private long /*int*/ byRefPtr; private IDispatch dispatchData; private IUnknown unknownData; @@ -70,7 +70,7 @@ public final class Variant { * * @since 3.3 */ -public static void win32_copy (int /*long*/ pVarDest, Variant varSrc) { +public static void win32_copy (long /*int*/ pVarDest, Variant varSrc) { varSrc.getData (pVarDest); } @@ -93,7 +93,7 @@ public static void win32_copy (int /*long*/ pVarDest, Variant varSrc) { * * @since 3.3 */ -public static Variant win32_new (int /*long*/ pVariant) { +public static Variant win32_new (long /*int*/ pVariant) { Variant variant = new Variant (); variant.setData (pVariant); return variant; @@ -150,7 +150,7 @@ public Variant(double val) { * @param byRefType the type of the data being transferred such as OLE.VT_BSTR | OLE.VT_BYREF * */ -public Variant(int /*long*/ ptr, short byRefType) { +public Variant(long /*int*/ ptr, short byRefType) { type = byRefType; byRefPtr = ptr; } @@ -277,8 +277,8 @@ public OleAutomation getAutomation() { return new OleAutomation(dispatchData); } // try to coerce the value to the desired type - int /*long*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); - int /*long*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + long /*int*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + long /*int*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); try { getData(oldPtr); int result = COM.VariantChangeType(newPtr, oldPtr, (short) 0, COM.VT_DISPATCH); @@ -320,8 +320,8 @@ public IDispatch getDispatch() { return dispatchData; } // try to coerce the value to the desired type - int /*long*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); - int /*long*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + long /*int*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + long /*int*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); try { getData(oldPtr); int result = COM.VariantChangeType(newPtr, oldPtr, (short) 0, COM.VT_DISPATCH); @@ -362,8 +362,8 @@ public boolean getBoolean() { } // try to coerce the value to the desired type - int /*long*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); - int /*long*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + long /*int*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + long /*int*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); try { getData(oldPtr); int result = COM.VariantChangeType(newPtr, oldPtr, (short) 0, COM.VT_BOOL); @@ -387,7 +387,7 @@ public boolean getBoolean() { * @return a pointer to the referenced data represented by this Variant or 0 * */ -public int /*long*/ getByRef() { +public long /*int*/ getByRef() { if (type == COM.VT_EMPTY) { OLE.error(OLE.ERROR_CANNOT_CHANGE_VARIANT_TYPE, -1); } @@ -420,8 +420,8 @@ public byte getByte() { } // try to coerce the value to the desired type - int /*long*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); - int /*long*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + long /*int*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + long /*int*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); try { getData(oldPtr); int result = COM.VariantChangeType(newPtr, oldPtr, (short) 0, COM.VT_I1); @@ -460,8 +460,8 @@ public char getChar() { } // try to coerce the value to the desired type - int /*long*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); - int /*long*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + long /*int*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + long /*int*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); try { getData(oldPtr); int result = COM.VariantChangeType(newPtr, oldPtr, (short) 0, COM.VT_UI2); @@ -477,7 +477,7 @@ public char getChar() { OS.GlobalFree(newPtr); } } -void getData(int /*long*/ pData){ +void getData(long /*int*/ pData){ if (pData == 0) OLE.error(OLE.ERROR_OUT_OF_MEMORY); COM.VariantInit(pData); @@ -485,7 +485,7 @@ void getData(int /*long*/ pData){ if ((type & COM.VT_BYREF) == COM.VT_BYREF) { //TODO - use VARIANT structure COM.MoveMemory(pData, new short[] {type}, 2); - COM.MoveMemory(pData + 8, new int /*long*/[]{byRefPtr}, OS.PTR_SIZEOF); + COM.MoveMemory(pData + 8, new long /*int*/[]{byRefPtr}, OS.PTR_SIZEOF); return; } @@ -529,18 +529,18 @@ void getData(int /*long*/ pData){ case COM.VT_DISPATCH : dispatchData.AddRef(); COM.MoveMemory(pData, new short[] {type}, 2); - COM.MoveMemory(pData + 8, new int /*long*/[]{dispatchData.getAddress()}, OS.PTR_SIZEOF); + COM.MoveMemory(pData + 8, new long /*int*/[]{dispatchData.getAddress()}, OS.PTR_SIZEOF); break; case COM.VT_UNKNOWN : unknownData.AddRef(); COM.MoveMemory(pData, new short[] {type}, 2); - COM.MoveMemory(pData + 8, new int /*long*/[]{unknownData.getAddress()}, OS.PTR_SIZEOF); + COM.MoveMemory(pData + 8, new long /*int*/[]{unknownData.getAddress()}, OS.PTR_SIZEOF); break; case COM.VT_BSTR : COM.MoveMemory(pData, new short[] {type}, 2); char[] data = (stringData+"\0").toCharArray(); - int /*long*/ ptr = COM.SysAllocString(data); - COM.MoveMemory(pData + 8, new int /*long*/[] {ptr}, OS.PTR_SIZEOF); + long /*int*/ ptr = COM.SysAllocString(data); + COM.MoveMemory(pData + 8, new long /*int*/[] {ptr}, OS.PTR_SIZEOF); break; default : @@ -570,8 +570,8 @@ public double getDouble() { } // try to coerce the value to the desired type - int /*long*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); - int /*long*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + long /*int*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + long /*int*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); try { getData(oldPtr); int result = COM.VariantChangeType(newPtr, oldPtr, (short) 0, COM.VT_R8); @@ -609,8 +609,8 @@ public float getFloat() { } // try to coerce the value to the desired type - int /*long*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); - int /*long*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + long /*int*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + long /*int*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); try { getData(oldPtr); int result = COM.VariantChangeType(newPtr, oldPtr, (short) 0, COM.VT_R4); @@ -648,8 +648,8 @@ public int getInt() { } // try to coerce the value to the desired type - int /*long*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); - int /*long*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + long /*int*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + long /*int*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); try { getData(oldPtr); int result = COM.VariantChangeType(newPtr, oldPtr, (short) 0, COM.VT_I4); @@ -688,8 +688,8 @@ public long getLong() { } // try to coerce the value to the desired type - int /*long*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); - int /*long*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + long /*int*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + long /*int*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); try { getData(oldPtr); int result = COM.VariantChangeType(newPtr, oldPtr, (short) 0, COM.VT_I8); @@ -726,8 +726,8 @@ public short getShort() { } // try to coerce the value to the desired type - int /*long*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); - int /*long*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + long /*int*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + long /*int*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); try { getData(oldPtr); int result = COM.VariantChangeType(newPtr, oldPtr, (short) 0, COM.VT_I2); @@ -765,8 +765,8 @@ public String getString() { } // try to coerce the value to the desired type - int /*long*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); - int /*long*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + long /*int*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + long /*int*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); try { getData(oldPtr); int result = COM.VariantChangeType(newPtr, oldPtr, (short) 0, COM.VT_BSTR); @@ -819,8 +819,8 @@ public IUnknown getUnknown() { } // try to coerce the value to the desired type - int /*long*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); - int /*long*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + long /*int*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); + long /*int*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof); try { getData(oldPtr); int result = COM.VariantChangeType(newPtr, oldPtr, (short) 0, COM.VT_UNKNOWN); @@ -886,11 +886,11 @@ public void setByRef(float val) { * * @since 2.1 */ -public void setByRef(int /*long*/ val) { +public void setByRef(long /*int*/ val) { if ((type & COM.VT_BYREF) == 0 || (type & COM.VT_I4) == 0) { OLE.error(OLE.ERROR_CANNOT_CHANGE_VARIANT_TYPE); } - COM.MoveMemory(byRefPtr, new int /*long*/[]{val}, OS.PTR_SIZEOF); + COM.MoveMemory(byRefPtr, new long /*int*/[]{val}, OS.PTR_SIZEOF); } /** * Update the by reference value of this variant with a new short value. @@ -909,7 +909,7 @@ public void setByRef(short val) { } COM.MoveMemory(byRefPtr, new short[]{val}, 2); } -void setData(int /*long*/ pData){ +void setData(long /*int*/ pData){ if (pData == 0) OLE.error(OLE.ERROR_INVALID_ARGUMENT); //TODO - use VARIANT structure @@ -918,7 +918,7 @@ void setData(int /*long*/ pData){ type = dataType[0]; if ((type & COM.VT_BYREF) == COM.VT_BYREF) { - int /*long*/[] newByRefPtr = new int /*long*/[1]; + long /*int*/[] newByRefPtr = new long /*int*/[1]; OS.MoveMemory(newByRefPtr, pData + 8, OS.PTR_SIZEOF); byRefPtr = newByRefPtr[0]; return; @@ -969,7 +969,7 @@ void setData(int /*long*/ pData){ doubleData = newDoubleData[0]; break; case COM.VT_DISPATCH : { - int /*long*/[] ppvObject = new int /*long*/[1]; + long /*int*/[] ppvObject = new long /*int*/[1]; OS.MoveMemory(ppvObject, pData + 8, OS.PTR_SIZEOF); if (ppvObject[0] == 0) { type = COM.VT_EMPTY; @@ -980,7 +980,7 @@ void setData(int /*long*/ pData){ break; } case COM.VT_UNKNOWN : { - int /*long*/[] ppvObject = new int /*long*/[1]; + long /*int*/[] ppvObject = new long /*int*/[1]; OS.MoveMemory(ppvObject, pData + 8, OS.PTR_SIZEOF); if (ppvObject[0] == 0) { type = COM.VT_EMPTY; @@ -992,7 +992,7 @@ void setData(int /*long*/ pData){ } case COM.VT_BSTR : // get the address of the memory in which the string resides - int /*long*/[] hMem = new int /*long*/[1]; + long /*int*/[] hMem = new long /*int*/[1]; OS.MoveMemory(hMem, pData + 8, OS.PTR_SIZEOF); if (hMem[0] == 0) { type = COM.VT_EMPTY; @@ -1013,7 +1013,7 @@ void setData(int /*long*/ pData){ default : // try coercing it into one of the known forms - int /*long*/ newPData = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, sizeof); + long /*int*/ newPData = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, sizeof); if (COM.VariantChangeType(newPData, pData, (short) 0, COM.VT_R4) == COM.S_OK) { setData(newPData); } else if (COM.VariantChangeType(newPData, pData, (short) 0, COM.VT_I4) == COM.S_OK) { |