diff options
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleEventSink.java')
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleEventSink.java | 26 |
1 files changed, 13 insertions, 13 deletions
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() { |