diff options
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDispatch.java')
-rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDispatch.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDispatch.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDispatch.java index afd9024614..28a9dfa9d0 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDispatch.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDispatch.java @@ -14,7 +14,7 @@ import org.eclipse.swt.internal.win32.*; public class IDispatch extends IUnknown { -public IDispatch(int address) { +public IDispatch(int /*long*/ address) { super(address); } public int GetIDsOfNames(GUID riid, String[] rgszNames, int cNames, int lcid, int[] rgDispId) { @@ -23,9 +23,9 @@ public int GetIDsOfNames(GUID riid, String[] rgszNames, int cNames, int lcid, in int size = rgszNames.length; // create an array to hold the addresses - int hHeap = OS.GetProcessHeap(); - int ppNames = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, size*4); - int[] memTracker = new int[size]; + int /*long*/ hHeap = OS.GetProcessHeap(); + int /*long*/ ppNames = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, size * OS.PTR_SIZEOF); + int /*long*/[] memTracker = new int /*long*/[size]; try { // add the address of each string to the array @@ -36,10 +36,10 @@ public int GetIDsOfNames(GUID riid, String[] rgszNames, int cNames, int lcid, in buffer = new char[nameSize +1]; rgszNames[i].getChars(0, nameSize, buffer, 0); // get the address of the start of the array of char - int pName = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, buffer.length * 2); + int /*long*/ pName = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, buffer.length * 2); OS.MoveMemory(pName, buffer, buffer.length * 2); // copy the address to the array of addresses - COM.MoveMemory(ppNames + 4*i, new int[]{pName}, 4); + COM.MoveMemory(ppNames + OS.PTR_SIZEOF * i, new int /*long*/[]{pName}, OS.PTR_SIZEOF); // keep track of the Global Memory so we can free it memTracker[i] = pName; } @@ -54,13 +54,13 @@ public int GetIDsOfNames(GUID riid, String[] rgszNames, int cNames, int lcid, in OS.HeapFree(hHeap, 0, ppNames); } } -public int GetTypeInfo(int iTInfo, int lcid, int[] ppTInfo ){ +public int GetTypeInfo(int iTInfo, int lcid, int /*long*/[] ppTInfo ){ return COM.VtblCall(4, address, iTInfo, lcid, ppTInfo); } public int GetTypeInfoCount(int[] pctinfo ){ return COM.VtblCall(3, address, pctinfo); } -public int Invoke(int dispIdMember, GUID riid, int lcid, int dwFlags, DISPPARAMS pDispParams, int pVarResult, EXCEPINFO pExcepInfo, int pArgErr[]) { +public int Invoke(int dispIdMember, GUID riid, int lcid, int dwFlags, DISPPARAMS pDispParams, int /*long*/ pVarResult, EXCEPINFO pExcepInfo, int[] pArgErr) { return COM.VtblCall(6, address, dispIdMember, riid, lcid, dwFlags, pDispParams, pVarResult, pExcepInfo, pArgErr); } } |