diff options
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt')
30 files changed, 469 insertions, 469 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebDownloadDelegate.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebDownloadDelegate.java index 56dba1e3ea..9013a91c7c 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebDownloadDelegate.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebDownloadDelegate.java @@ -46,25 +46,25 @@ int AddRef () { void createCOMInterfaces () { iWebDownloadDelegate = new COMObject (new int[] {2, 0, 0, 2, 2, 2, 2, 2, 2, 2, 3, 3, 4, 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 decideDestinationWithSuggestedFilename (args[0], args[1]);} - public int /*long*/ method4 (int /*long*/[] args) {return COM.E_NOTIMPL;} - public int /*long*/ method5 (int /*long*/[] args) {return COM.E_NOTIMPL;} - public int /*long*/ method6 (int /*long*/[] args) {return didFailWithError (args[0], args[1]);} - public int /*long*/ method7 (int /*long*/[] args) {return COM.E_NOTIMPL;} - public int /*long*/ method8 (int /*long*/[] args) {return didReceiveDataOfLength (args[0], (int)/*64*/args[1]);} - public int /*long*/ method9 (int /*long*/[] args) {return didReceiveResponse (args[0], args[1]);} - public int /*long*/ method10 (int /*long*/[] args) {return COM.E_NOTIMPL;} - public int /*long*/ method11 (int /*long*/[] args) {return COM.E_NOTIMPL;} - public int /*long*/ method12 (int /*long*/[] args) {return willSendRequest (args[0], args[1], args[2], args[3]);} - public int /*long*/ method13 (int /*long*/[] args) {return didBegin (args[0]);} - public int /*long*/ method14 (int /*long*/[] args) {return didFinish (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 decideDestinationWithSuggestedFilename (args[0], args[1]);} + public long /*int*/ method4 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long /*int*/ method5 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long /*int*/ method6 (long /*int*/[] args) {return didFailWithError (args[0], args[1]);} + public long /*int*/ method7 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long /*int*/ method8 (long /*int*/[] args) {return didReceiveDataOfLength (args[0], (int)/*64*/args[1]);} + public long /*int*/ method9 (long /*int*/[] args) {return didReceiveResponse (args[0], args[1]);} + public long /*int*/ method10 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long /*int*/ method11 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long /*int*/ method12 (long /*int*/[] args) {return willSendRequest (args[0], args[1], args[2], args[3]);} + public long /*int*/ method13 (long /*int*/[] args) {return didBegin (args[0]);} + public long /*int*/ method14 (long /*int*/[] args) {return didFinish (args[0]);} }; } -int decideDestinationWithSuggestedFilename (int /*long*/ download, int /*long*/ filename) { +int decideDestinationWithSuggestedFilename (long /*int*/ download, long /*int*/ filename) { String name = WebKit.extractBSTR (filename); FileDialog dialog = new FileDialog (browser.getShell(), SWT.SAVE); dialog.setText (SWT.getMessage ("SWT_FileDownload")); //$NON-NLS-1$ @@ -90,7 +90,7 @@ int decideDestinationWithSuggestedFilename (int /*long*/ download, int /*long*/ return COM.S_OK; } -int didBegin (int /*long*/ download) { +int didBegin (long /*int*/ download) { new IWebDownload (download).AddRef (); status = -1; size = 0; @@ -99,30 +99,30 @@ int didBegin (int /*long*/ download) { return COM.S_OK; } -int didFailWithError (int /*long*/ download, int /*long*/ error) { +int didFailWithError (long /*int*/ download, long /*int*/ error) { new IWebDownload (download).Release (); status = DOWNLOAD_ERROR; return COM.S_OK; } -int didFinish (int /*long*/ download) { +int didFinish (long /*int*/ download) { new IWebDownload (download).Release (); status = DOWNLOAD_FINISHED; return COM.S_OK; } -int didReceiveDataOfLength (int /*long*/ download, int length) { +int didReceiveDataOfLength (long /*int*/ download, int length) { size += length; return COM.S_OK; } -int didReceiveResponse (int /*long*/ download, int /*long*/ response) { +int didReceiveResponse (long /*int*/ download, long /*int*/ response) { if (response != 0) { IWebURLResponse urlResponse = new IWebURLResponse (response); long[] size = new long[1]; int hr = urlResponse.expectedContentLength (size); if (hr == COM.S_OK) totalSize = size[0]; - int /*long*/[] result = new int /*long*/[1]; + long /*int*/[] result = new long /*int*/[1]; hr = urlResponse.URL (result); if (hr == COM.S_OK && result[0] != 0) { url = WebKit.extractBSTR (result[0]); @@ -139,7 +139,7 @@ void disposeCOMInterfaces () { } } -int /*long*/ getAddress () { +long /*int*/ getAddress () { return iWebDownloadDelegate.getAddress (); } @@ -211,23 +211,23 @@ void openDownloadWindow (final IWebDownload download, String name) { shell.open (); } -int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) { +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*/[] {iWebDownloadDelegate.getAddress ()}, OS.PTR_SIZEOF); + COM.MoveMemory (ppvObject, new long /*int*/[] {iWebDownloadDelegate.getAddress ()}, OS.PTR_SIZEOF); new IUnknown (iWebDownloadDelegate.getAddress ()).AddRef (); return COM.S_OK; } if (COM.IsEqualGUID (guid, WebKit_win32.IID_IWebDownloadDelegate)) { - COM.MoveMemory (ppvObject, new int /*long*/[] {iWebDownloadDelegate.getAddress ()}, OS.PTR_SIZEOF); + COM.MoveMemory (ppvObject, new long /*int*/[] {iWebDownloadDelegate.getAddress ()}, OS.PTR_SIZEOF); new IUnknown (iWebDownloadDelegate.getAddress ()).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; } @@ -239,10 +239,10 @@ int Release () { return refCount; } -int willSendRequest (int /*long*/ download, int /*long*/ request, int /*long*/ redirectResponse, int /*long*/ finalRequest) { +int willSendRequest (long /*int*/ download, long /*int*/ request, long /*int*/ redirectResponse, long /*int*/ finalRequest) { IWebMutableURLRequest req = new IWebMutableURLRequest (request); req.AddRef (); - OS.MoveMemory (finalRequest, new int /*long*/[] {request}, C.PTR_SIZEOF); + OS.MoveMemory (finalRequest, new long /*int*/[] {request}, C.PTR_SIZEOF); return COM.S_OK; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebFrameLoadDelegate.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebFrameLoadDelegate.java index 6cd2e56879..ed7127f755 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebFrameLoadDelegate.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebFrameLoadDelegate.java @@ -84,38 +84,38 @@ int AddRef () { void createCOMInterfaces () { iWebFrameLoadDelegate = new COMObject (new int[] {2, 0, 0, 2, 2, 3, 2, 3, 3, 2, 3, 2, 5, 2, 2, 3, 4}) { - 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 didStartProvisionalLoadForFrame (args[0], args[1]);} - public int /*long*/ method4 (int /*long*/[] args) {return COM.E_NOTIMPL;} - public int /*long*/ method5 (int /*long*/[] args) {return didFailProvisionalLoadWithError (args[0], args[1], args[2]);} - public int /*long*/ method6 (int /*long*/[] args) {return didCommitLoadForFrame (args[0], args[1]);} - public int /*long*/ method7 (int /*long*/[] args) {return didReceiveTitle (args[0], args[1], args[2]);} - public int /*long*/ method8 (int /*long*/[] args) {return COM.E_NOTIMPL;} - public int /*long*/ method9 (int /*long*/[] args) {return didFinishLoadForFrame (args[0], args[1]);} - public int /*long*/ method10 (int /*long*/[] args){return COM.E_NOTIMPL;} - public int /*long*/ method11 (int /*long*/[] args){return didChangeLocationWithinPageForFrame (args[0], args[1]);} - public int /*long*/ method12 (int /*long*/[] args){return COM.S_OK;} - public int /*long*/ method13 (int /*long*/[] args){return COM.E_NOTIMPL;} - public int /*long*/ method14 (int /*long*/[] args){return COM.S_OK;} - public int /*long*/ method15 (int /*long*/[] args){return COM.S_OK;} - public int /*long*/ method16 (int /*long*/[] args){return didClearWindowObject (args[0], args[1], args[2], args[3]);} + 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 didStartProvisionalLoadForFrame (args[0], args[1]);} + public long /*int*/ method4 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long /*int*/ method5 (long /*int*/[] args) {return didFailProvisionalLoadWithError (args[0], args[1], args[2]);} + public long /*int*/ method6 (long /*int*/[] args) {return didCommitLoadForFrame (args[0], args[1]);} + public long /*int*/ method7 (long /*int*/[] args) {return didReceiveTitle (args[0], args[1], args[2]);} + public long /*int*/ method8 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long /*int*/ method9 (long /*int*/[] args) {return didFinishLoadForFrame (args[0], args[1]);} + public long /*int*/ method10 (long /*int*/[] args){return COM.E_NOTIMPL;} + public long /*int*/ method11 (long /*int*/[] args){return didChangeLocationWithinPageForFrame (args[0], args[1]);} + public long /*int*/ method12 (long /*int*/[] args){return COM.S_OK;} + public long /*int*/ method13 (long /*int*/[] args){return COM.E_NOTIMPL;} + public long /*int*/ method14 (long /*int*/[] args){return COM.S_OK;} + public long /*int*/ method15 (long /*int*/[] args){return COM.S_OK;} + public long /*int*/ method16 (long /*int*/[] args){return didClearWindowObject (args[0], args[1], args[2], args[3]);} }; /* Callbacks that take double parameters require custom callbacks that instead pass pointers to the doubles. */ - int /*long*/ ppVtable = iWebFrameLoadDelegate.ppVtable; - int /*long*/[] pVtable = new int /*long*/[1]; + long /*int*/ ppVtable = iWebFrameLoadDelegate.ppVtable; + long /*int*/[] pVtable = new long /*int*/[1]; COM.MoveMemory (pVtable, ppVtable, OS.PTR_SIZEOF); - int /*long*/[] funcs = new int /*long*/[17]; + long /*int*/[] funcs = new long /*int*/[17]; COM.MoveMemory (funcs, pVtable[0], OS.PTR_SIZEOF * funcs.length); funcs[12] = WebKit_win32.willPerformClientRedirectToURL_CALLBACK (funcs[12]); COM.MoveMemory (pVtable[0], funcs, OS.PTR_SIZEOF * funcs.length); } -int didChangeLocationWithinPageForFrame (int /*long*/ webView, int /*long*/ frame) { +int didChangeLocationWithinPageForFrame (long /*int*/ webView, long /*int*/ frame) { IWebFrame iwebframe = new IWebFrame (frame); - int /*long*/[] result = new int /*long*/[1]; + long /*int*/[] result = new long /*int*/[1]; int hr = iwebframe.dataSource (result); if (hr != COM.S_OK || result[0] == 0) { return COM.S_OK; @@ -181,18 +181,18 @@ int didChangeLocationWithinPageForFrame (int /*long*/ webView, int /*long*/ fram return COM.S_OK; } -int didClearWindowObject (int /*long*/ webView, int /*long*/ context, int /*long*/ windowScriptObject, int /*long*/ frame) { +int didClearWindowObject (long /*int*/ webView, long /*int*/ context, long /*int*/ windowScriptObject, long /*int*/ frame) { WebKit_win32.JSGlobalContextRetain (context); - int /*long*/ globalObject = WebKit_win32.JSContextGetGlobalObject (context); - int /*long*/ privateData = ((WebKit)browser.webBrowser).webViewData; - int /*long*/ externalObject = WebKit_win32.JSObjectMake (context, WebKit.ExternalClass, privateData); + long /*int*/ globalObject = WebKit_win32.JSContextGetGlobalObject (context); + long /*int*/ privateData = ((WebKit)browser.webBrowser).webViewData; + long /*int*/ externalObject = WebKit_win32.JSObjectMake (context, WebKit.ExternalClass, privateData); byte[] bytes = null; try { bytes = (OBJECTNAME_EXTERNAL + '\0').getBytes (WebKit.CHARSET_UTF8); } catch (UnsupportedEncodingException e) { bytes = (OBJECTNAME_EXTERNAL + '\0').getBytes (); } - int /*long*/ name = WebKit_win32.JSStringCreateWithUTF8CString (bytes); + long /*int*/ name = WebKit_win32.JSStringCreateWithUTF8CString (bytes); WebKit_win32.JSObjectSetProperty (context, globalObject, name, externalObject, 0, null); WebKit_win32.JSStringRelease (name); @@ -203,7 +203,7 @@ int didClearWindowObject (int /*long*/ webView, int /*long*/ context, int /*long } IWebView iwebView = new IWebView (webView); - int /*long*/[] mainFrame = new int /*long*/[1]; + long /*int*/[] mainFrame = new long /*int*/[1]; iwebView.mainFrame (mainFrame); boolean top = mainFrame[0] == frame; new IWebFrame (mainFrame[0]).Release (); @@ -211,9 +211,9 @@ int didClearWindowObject (int /*long*/ webView, int /*long*/ context, int /*long return COM.S_OK; } -int didCommitLoadForFrame (int /*long*/ webview, int /*long*/ frame) { +int didCommitLoadForFrame (long /*int*/ webview, long /*int*/ frame) { IWebFrame iWebFrame = new IWebFrame (frame); - int /*long*/[] result = new int /*long*/[1]; + long /*int*/[] result = new long /*int*/[1]; int hr = iWebFrame.dataSource (result); if (hr != COM.S_OK || result[0] == 0) { return COM.S_OK; @@ -309,14 +309,14 @@ int didCommitLoadForFrame (int /*long*/ webview, int /*long*/ frame) { return COM.S_OK; } -int didFailProvisionalLoadWithError (int /*long*/ webView, int /*long*/ error, int /*long*/ frame) { +int didFailProvisionalLoadWithError (long /*int*/ webView, long /*int*/ error, long /*int*/ frame) { IWebError iweberror = new IWebError (error); int[] errorCode = new int[1]; int hr = iweberror.code (errorCode); if (WebKit_win32.WebURLErrorBadURL < errorCode[0]) return COM.S_OK; String failingURLString = null; - int /*long*/[] failingURL = new int /*long*/[1]; + long /*int*/[] failingURL = new long /*int*/[1]; hr = iweberror.failingURL (failingURL); if (hr == COM.S_OK && failingURL[0] != 0) { failingURLString = WebKit.extractBSTR (failingURL[0]); @@ -324,7 +324,7 @@ int didFailProvisionalLoadWithError (int /*long*/ webView, int /*long*/ error, i } if (failingURLString != null && WebKit_win32.WebURLErrorServerCertificateNotYetValid <= errorCode[0] && errorCode[0] <= WebKit_win32.WebURLErrorSecureConnectionFailed) { /* handle invalid certificate error */ - int /*long*/[] result = new int /*long*/[1]; + long /*int*/[] result = new long /*int*/[1]; hr = iweberror.localizedDescription (result); if (hr != COM.S_OK || result[0] == 0) { return COM.S_OK; @@ -340,7 +340,7 @@ int didFailProvisionalLoadWithError (int /*long*/ webView, int /*long*/ error, i IWebErrorPrivate webErrorPrivate = new IWebErrorPrivate (result[0]); result[0] = 0; - int /*long*/[] certificate = new int /*long*/[1]; + long /*int*/[] certificate = new long /*int*/[1]; hr = webErrorPrivate.sslPeerCertificate (certificate); webErrorPrivate.Release (); if (hr != COM.S_OK || certificate[0] == 0) { @@ -364,7 +364,7 @@ int didFailProvisionalLoadWithError (int /*long*/ webView, int /*long*/ error, i } /* handle other types of errors */ - int /*long*/[] result = new int /*long*/[1]; + long /*int*/[] result = new long /*int*/[1]; hr = iweberror.localizedDescription (result); if (hr != COM.S_OK || result[0] == 0) { return COM.S_OK; @@ -381,9 +381,9 @@ int didFailProvisionalLoadWithError (int /*long*/ webView, int /*long*/ error, i return COM.S_OK; } -int didFinishLoadForFrame (int /*long*/ webview, int /*long*/ frame) { +int didFinishLoadForFrame (long /*int*/ webview, long /*int*/ frame) { IWebView iWebView = new IWebView (webview); - int /*long*/[] iWebFrame = new int /*long*/[1]; + long /*int*/[] iWebFrame = new long /*int*/[1]; int hr = iWebView.mainFrame (iWebFrame); if (hr != COM.S_OK || iWebFrame[0] == 0) { return COM.S_OK; @@ -399,8 +399,8 @@ int didFinishLoadForFrame (int /*long*/ webview, int /*long*/ frame) { if (html != null) { if (getUrl ().startsWith (WebKit.ABOUT_BLANK)) { ((WebKit)browser.webBrowser).loadingText = true; - int /*long*/ string = WebKit.createBSTR (html); - int /*long*/ URLString; + long /*int*/ string = WebKit.createBSTR (html); + long /*int*/ URLString; if (((WebKit)browser.webBrowser).untrustedText) { URLString = WebKit.createBSTR (WebKit.ABOUT_BLANK); } else { @@ -428,7 +428,7 @@ int didFinishLoadForFrame (int /*long*/ webview, int /*long*/ frame) { */ Display display = browser.getDisplay (); IWebFrame mainFrame = new IWebFrame (frame); - int /*long*/[] result = new int /*long*/[1]; + long /*int*/[] result = new long /*int*/[1]; hr = mainFrame.dataSource (result); if (hr != COM.S_OK || result[0] == 0) { return COM.S_OK; @@ -472,8 +472,8 @@ int didFinishLoadForFrame (int /*long*/ webview, int /*long*/ frame) { return COM.S_OK; } -int didReceiveTitle (int /*long*/ webView, int /*long*/ title, int /*long*/ frame) { - int /*long*/[] mainFrame = new int /*long*/[1]; +int didReceiveTitle (long /*int*/ webView, long /*int*/ title, long /*int*/ frame) { + long /*int*/[] mainFrame = new long /*int*/[1]; IWebView iWebView = new IWebView (webView); int hr = iWebView.mainFrame (mainFrame); if (hr != COM.S_OK || frame == 0) { @@ -494,7 +494,7 @@ int didReceiveTitle (int /*long*/ webView, int /*long*/ title, int /*long*/ fram return COM.S_OK; } -int didStartProvisionalLoadForFrame (int /*long*/ webView, int /*long*/ frame) { +int didStartProvisionalLoadForFrame (long /*int*/ webView, long /*int*/ frame) { return COM.S_OK; } @@ -505,7 +505,7 @@ void disposeCOMInterfaces () { } } -int /*long*/ getAddress () { +long /*int*/ getAddress () { return iWebFrameLoadDelegate.getAddress (); } @@ -515,23 +515,23 @@ String getUrl () { return url; } -int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) { +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*/[] {iWebFrameLoadDelegate.getAddress ()}, OS.PTR_SIZEOF); + COM.MoveMemory (ppvObject, new long /*int*/[] {iWebFrameLoadDelegate.getAddress ()}, OS.PTR_SIZEOF); new IUnknown (iWebFrameLoadDelegate.getAddress ()).AddRef (); return COM.S_OK; } if (COM.IsEqualGUID (guid, WebKit_win32.IID_IWebFrameLoadDelegate)) { - COM.MoveMemory (ppvObject, new int /*long*/[] {iWebFrameLoadDelegate.getAddress ()}, OS.PTR_SIZEOF); + COM.MoveMemory (ppvObject, new long /*int*/[] {iWebFrameLoadDelegate.getAddress ()}, OS.PTR_SIZEOF); new IUnknown (iWebFrameLoadDelegate.getAddress ()).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; } @@ -543,7 +543,7 @@ int Release () { return refCount; } -boolean showCertificateDialog (int /*long*/ webView, final String failingUrlString, final String description, final int /*long*/ certificate) { +boolean showCertificateDialog (long /*int*/ webView, final String failingUrlString, final String description, final long /*int*/ certificate) { Shell parent = browser.getShell (); final Shell shell = new Shell (parent, SWT.APPLICATION_MODAL | SWT.DIALOG_TRIM); shell.setText (Compatibility.getMessage ("SWT_InvalidCert_Title")); //$NON-NLS-1$ @@ -621,7 +621,7 @@ boolean showCertificateDialog (int /*long*/ webView, final String failingUrlStri return result[0]; } -void showCertificate (Shell parent, int /*long*/ certificate) { +void showCertificate (Shell parent, long /*int*/ certificate) { CERT_CONTEXT context = new CERT_CONTEXT (); OS.MoveMemory (context, certificate, CERT_CONTEXT.sizeof); CERT_INFO info = new CERT_INFO (); diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebKit.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebKit.java index 2d78f3ebb8..e15c49ca1f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebKit.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebKit.java @@ -25,7 +25,7 @@ import org.eclipse.swt.widgets.*; class WebKit extends WebBrowser { IWebView webView; - int /*long*/ webViewWindowHandle, webViewData; + long /*int*/ webViewWindowHandle, webViewData; int refCount = 0; int lastKeyCode, lastCharCode; @@ -44,7 +44,7 @@ class WebKit extends WebBrowser { BrowserFunction eventFunction; static int prefsIdentifier; - static int /*long*/ ExternalClass; + static long /*int*/ ExternalClass; static boolean LibraryLoaded = false; static String LibraryLoadError; static Callback JSObjectHasPropertyProc; @@ -145,24 +145,24 @@ static { NativeClearSessions = new Runnable () { public void run () { - int /*long*/[] result = new int /*long*/[1]; + long /*int*/[] result = new long /*int*/[1]; int hr = WebKit_win32.WebKitCreateInstance (WebKit_win32.CLSID_WebCookieManager, 0, WebKit_win32.IID_IWebCookieManager, result); if (hr != COM.S_OK || result[0] == 0) { return; } IWebCookieManager cookieManager = new IWebCookieManager (result[0]); - int /*long*/[] storage = new int /*long*/[1]; + long /*int*/[] storage = new long /*int*/[1]; hr = cookieManager.cookieStorage (storage); cookieManager.Release (); if (hr != COM.S_OK || storage[0] == 0) { return; } - int /*long*/ cookies = WebKit_win32.CFHTTPCookieStorageCopyCookies (storage[0]); + long /*int*/ cookies = WebKit_win32.CFHTTPCookieStorageCopyCookies (storage[0]); if (cookies != 0) { int count = WebKit_win32.CFArrayGetCount (cookies); for (int i = 0; i < count; i++) { - int /*long*/ cookie = WebKit_win32.CFArrayGetValueAtIndex (cookies, i); - int /*long*/ flags = WebKit_win32.CFHTTPCookieGetFlags (cookie); + long /*int*/ cookie = WebKit_win32.CFArrayGetValueAtIndex (cookies, i); + long /*int*/ flags = WebKit_win32.CFHTTPCookieGetFlags (cookie); if ((flags & WebKit_win32.CFHTTPCookieSessionOnlyFlag) != 0) { WebKit_win32.CFHTTPCookieStorageDeleteCookie (storage[0], cookie); } @@ -175,35 +175,35 @@ static { NativeGetCookie = new Runnable () { public void run () { - int /*long*/[] result = new int /*long*/[1]; + long /*int*/[] result = new long /*int*/[1]; int hr = WebKit_win32.WebKitCreateInstance (WebKit_win32.CLSID_WebCookieManager, 0, WebKit_win32.IID_IWebCookieManager, result); if (hr != COM.S_OK || result[0] == 0) { return; } IWebCookieManager cookieManager = new IWebCookieManager (result[0]); - int /*long*/[] storage = new int /*long*/[1]; + long /*int*/[] storage = new long /*int*/[1]; hr = cookieManager.cookieStorage (storage); cookieManager.Release (); if (hr != COM.S_OK || storage[0] == 0) { return; } char[] chars = CookieUrl.toCharArray (); - int /*long*/ string = WebKit_win32.CFStringCreateWithCharacters (0, chars, chars.length); + long /*int*/ string = WebKit_win32.CFStringCreateWithCharacters (0, chars, chars.length); if (string != 0) { - int /*long*/ cfUrl = WebKit_win32.CFURLCreateWithString (0, string, 0); + long /*int*/ cfUrl = WebKit_win32.CFURLCreateWithString (0, string, 0); if (cfUrl != 0) { boolean secure = CookieUrl.startsWith (PROTOCOL_HTTPS); - int /*long*/ cookiesArray = WebKit_win32.CFHTTPCookieStorageCopyCookiesForURL (storage[0], cfUrl, secure); + long /*int*/ cookiesArray = WebKit_win32.CFHTTPCookieStorageCopyCookiesForURL (storage[0], cfUrl, secure); if (cookiesArray != 0) { int count = WebKit_win32.CFArrayGetCount (cookiesArray); for (int i = 0; i < count; i++) { - int /*long*/ cookie = WebKit_win32.CFArrayGetValueAtIndex (cookiesArray, i); + long /*int*/ cookie = WebKit_win32.CFArrayGetValueAtIndex (cookiesArray, i); if (cookie != 0) { - int /*long*/ cookieName = WebKit_win32.CFHTTPCookieGetName (cookie); + long /*int*/ cookieName = WebKit_win32.CFHTTPCookieGetName (cookie); if (cookieName != 0) { String name = stringFromCFString (cookieName); if (CookieName.equals (name)) { - int /*long*/ value = WebKit_win32.CFHTTPCookieGetValue (cookie); + long /*int*/ value = WebKit_win32.CFHTTPCookieGetValue (cookie); if (value != 0) CookieValue = stringFromCFString (value); break; } @@ -222,13 +222,13 @@ static { NativeSetCookie = new Runnable () { public void run () { - int /*long*/[] result = new int /*long*/[1]; + long /*int*/[] result = new long /*int*/[1]; int hr = WebKit_win32.WebKitCreateInstance (WebKit_win32.CLSID_WebCookieManager, 0, WebKit_win32.IID_IWebCookieManager, result); if (hr != COM.S_OK || result[0] == 0) { return; } IWebCookieManager cookieManager = new IWebCookieManager (result[0]); - int /*long*/[] storage = new int /*long*/[1]; + long /*int*/[] storage = new long /*int*/[1]; hr = cookieManager.cookieStorage (storage); cookieManager.Release (); if (hr != COM.S_OK || storage[0] == 0) { @@ -236,21 +236,21 @@ static { } char[] chars = CookieUrl.toCharArray (); - int /*long*/ string = WebKit_win32.CFStringCreateWithCharacters (0, chars, chars.length); + long /*int*/ string = WebKit_win32.CFStringCreateWithCharacters (0, chars, chars.length); if (string != 0) { - int /*long*/ cfUrl = WebKit_win32.CFURLCreateWithString (0, string, 0); + long /*int*/ cfUrl = WebKit_win32.CFURLCreateWithString (0, string, 0); if (cfUrl != 0) { chars = CookieValue.toCharArray (); - int /*long*/ value = WebKit_win32.CFStringCreateWithCharacters (0, chars, chars.length); + long /*int*/ value = WebKit_win32.CFStringCreateWithCharacters (0, chars, chars.length); if (value != 0) { chars = HEADER_SETCOOKIE.toCharArray (); - int /*long*/ key = WebKit_win32.CFStringCreateWithCharacters (0, chars, chars.length); + long /*int*/ key = WebKit_win32.CFStringCreateWithCharacters (0, chars, chars.length); if (key != 0) { - int /*long*/ headers = WebKit_win32.CFDictionaryCreate (0, new int /*long*/[] {key}, new int /*long*/[] {value}, 1, WebKit_win32.kCFCopyStringDictionaryKeyCallBacks (), WebKit_win32.kCFTypeDictionaryValueCallBacks ()); + long /*int*/ headers = WebKit_win32.CFDictionaryCreate (0, new long /*int*/[] {key}, new long /*int*/[] {value}, 1, WebKit_win32.kCFCopyStringDictionaryKeyCallBacks (), WebKit_win32.kCFTypeDictionaryValueCallBacks ()); if (headers != 0) { - int /*long*/ cookies = WebKit_win32.CFHTTPCookieCreateWithResponseHeaderFields (0, headers, cfUrl); + long /*int*/ cookies = WebKit_win32.CFHTTPCookieCreateWithResponseHeaderFields (0, headers, cfUrl); if (cookies != 0) { - int /*long*/ cookie = WebKit_win32.CFArrayGetValueAtIndex (cookies, 0); + long /*int*/ cookie = WebKit_win32.CFArrayGetValueAtIndex (cookies, 0); if (cookie != 0) { WebKit_win32.CFHTTPCookieStorageSetCookie (storage[0], cookie); CookieResult = true; @@ -278,7 +278,7 @@ static { } } -static int /*long*/ createBSTR (String string) { +static long /*int*/ createBSTR (String string) { char[] data = (string + '\0').toCharArray (); return COM.SysAllocString (data); } @@ -287,7 +287,7 @@ static String error (int code) { throw new SWTError ("WebKit error " + code); //$NON-NLS-1$ } -static String extractBSTR (int /*long*/ bstrString) { +static String extractBSTR (long /*int*/ bstrString) { int size = COM.SysStringByteLen (bstrString); if (size == 0) return EMPTY_STRING; char[] buffer = new char[(size + 1) / 2]; // add one to avoid rounding errors @@ -295,10 +295,10 @@ static String extractBSTR (int /*long*/ bstrString) { return new String (buffer); } -static Browser findBrowser (int /*long*/ webView) { +static Browser findBrowser (long /*int*/ webView) { if (webView == 0) return null; IWebView iwebView = new IWebView (webView); - int /*long*/[] result = new int /*long*/[1]; + long /*int*/[] result = new long /*int*/[1]; int hr = iwebView.hostWindow (result); if (hr == COM.S_OK && result[0] != 0) { Widget widget = Display.getCurrent ().findWidget (result[0]); @@ -307,13 +307,13 @@ static Browser findBrowser (int /*long*/ webView) { return null; } -static int /*long*/ JSObjectCallAsFunctionProc (int /*long*/ ctx, int /*long*/ function, int /*long*/ thisObject, int /*long*/ argumentCount, int /*long*/ arguments, int /*long*/ exception) { +static long /*int*/ JSObjectCallAsFunctionProc (long /*int*/ ctx, long /*int*/ function, long /*int*/ thisObject, long /*int*/ argumentCount, long /*int*/ arguments, long /*int*/ exception) { WebKit_win32.JSGlobalContextRetain (ctx); if (WebKit_win32.JSValueIsObjectOfClass (ctx, thisObject, ExternalClass) == 0) { return WebKit_win32.JSValueMakeUndefined (ctx); } - int /*long*/ ptr = WebKit_win32.JSObjectGetPrivate (thisObject); - int /*long*/[] handle = new int /*long*/[1]; + long /*int*/ ptr = WebKit_win32.JSObjectGetPrivate (thisObject); + long /*int*/[] handle = new long /*int*/[1]; C.memmove (handle, ptr, C.PTR_SIZEOF); Browser browser = findBrowser (handle[0]); if (browser == null) return WebKit_win32.JSValueMakeUndefined (ctx); @@ -321,21 +321,21 @@ static int /*long*/ JSObjectCallAsFunctionProc (int /*long*/ ctx, int /*long*/ f return webkit.callJava (ctx, function, thisObject, argumentCount, arguments, exception); } -static int /*long*/ JSObjectGetPropertyProc (int /*long*/ ctx, int /*long*/ object, int /*long*/ propertyName, int /*long*/ exception) { +static long /*int*/ JSObjectGetPropertyProc (long /*int*/ ctx, long /*int*/ object, long /*int*/ propertyName, long /*int*/ exception) { byte[] bytes = null; try { bytes = (FUNCTIONNAME_CALLJAVA + '\0').getBytes (CHARSET_UTF8); } catch (UnsupportedEncodingException e) { bytes = (FUNCTIONNAME_CALLJAVA + '\0').getBytes (); } - int /*long*/ name = WebKit_win32.JSStringCreateWithUTF8CString (bytes); - int /*long*/ addr = WebKit_win32.JSObjectCallAsFunctionProc_CALLBACK (WebKit.JSObjectCallAsFunctionProc.getAddress ()); - int /*long*/ function = WebKit_win32.JSObjectMakeFunctionWithCallback (ctx, name, addr); + long /*int*/ name = WebKit_win32.JSStringCreateWithUTF8CString (bytes); + long /*int*/ addr = WebKit_win32.JSObjectCallAsFunctionProc_CALLBACK (WebKit.JSObjectCallAsFunctionProc.getAddress ()); + long /*int*/ function = WebKit_win32.JSObjectMakeFunctionWithCallback (ctx, name, addr); WebKit_win32.JSStringRelease (name); return function; } -static int /*long*/ JSObjectHasPropertyProc (int /*long*/ ctx, int /*long*/ object, int /*long*/ propertyName) { +static long /*int*/ JSObjectHasPropertyProc (long /*int*/ ctx, long /*int*/ object, long /*int*/ propertyName) { byte[] bytes = null; try { bytes = (FUNCTIONNAME_CALLJAVA + '\0').getBytes (CHARSET_UTF8); @@ -346,7 +346,7 @@ static int /*long*/ JSObjectHasPropertyProc (int /*long*/ ctx, int /*long*/ obje } static String readInstallDir (String keyString) { - int /*long*/[] phkResult = new int /*long*/[1]; + long /*int*/[] phkResult = new long /*int*/[1]; TCHAR key = new TCHAR (0, keyString, true); if (OS.RegOpenKeyEx (OS.HKEY_LOCAL_MACHINE, key, 0, OS.KEY_READ, phkResult) == 0) { int[] lpcbData = new int[1]; @@ -365,10 +365,10 @@ static String readInstallDir (String keyString) { return null; } -static String stringFromCFString (int /*long*/ cfString) { +static String stringFromCFString (long /*int*/ cfString) { if (cfString == 0) return null; int length = WebKit_win32.CFStringGetLength (cfString); - int /*long*/ ptr = WebKit_win32.CFStringGetCharactersPtr (cfString); + long /*int*/ ptr = WebKit_win32.CFStringGetCharactersPtr (cfString); char[] chars = new char[length]; if (ptr != 0) { OS.MoveMemory (chars, ptr, length); @@ -380,7 +380,7 @@ static String stringFromCFString (int /*long*/ cfString) { return new String (chars); } -static String stringFromJSString (int /*long*/ jsString) { +static String stringFromJSString (long /*int*/ jsString) { if (jsString == 0) return null; int length = WebKit_win32.JSStringGetLength (jsString); byte[] bytes = new byte[length + 1]; @@ -394,10 +394,10 @@ public boolean back () { return result[0] != 0; } -int /*long*/ callJava (int /*long*/ ctx, int /*long*/ func, int /*long*/ thisObject, int /*long*/ argumentCount, int /*long*/ arguments, int /*long*/ exception) { +long /*int*/ callJava (long /*int*/ ctx, long /*int*/ func, long /*int*/ thisObject, long /*int*/ argumentCount, long /*int*/ arguments, long /*int*/ exception) { Object returnValue = null; if (argumentCount == 3) { - int /*long*/[] result = new int /*long*/[1]; + long /*int*/[] result = new long /*int*/[1]; C.memmove (result, arguments, C.PTR_SIZEOF); int type = WebKit_win32.JSValueGetType (ctx, result[0]); if (type == WebKit_win32.kJSTypeNumber) { @@ -443,7 +443,7 @@ public boolean close () { return shouldClose (); } -Object convertToJava (int /*long*/ ctx, int /*long*/ value) { +Object convertToJava (long /*int*/ ctx, long /*int*/ value) { int type = WebKit_win32.JSValueGetType (ctx, value); switch (type) { case WebKit_win32.kJSTypeBoolean: { @@ -455,9 +455,9 @@ Object convertToJava (int /*long*/ ctx, int /*long*/ value) { return new Double (result); } case WebKit_win32.kJSTypeString: { - int /*long*/ string = WebKit_win32.JSValueToStringCopy (ctx, value, null); + long /*int*/ string = WebKit_win32.JSValueToStringCopy (ctx, value, null); if (string == 0) return ""; //$NON-NLS-1$ - int /*long*/ length = WebKit_win32.JSStringGetMaximumUTF8CStringSize (string); + long /*int*/ length = WebKit_win32.JSStringGetMaximumUTF8CStringSize (string); byte[] bytes = new byte[(int)/*64*/length]; length = WebKit_win32.JSStringGetUTF8CString (string, bytes, length); WebKit_win32.JSStringRelease (string); @@ -478,15 +478,15 @@ Object convertToJava (int /*long*/ ctx, int /*long*/ value) { } catch (UnsupportedEncodingException e) { bytes = (PROPERTY_LENGTH + '\0').getBytes (); } - int /*long*/ propertyName = WebKit_win32.JSStringCreateWithUTF8CString (bytes); - int /*long*/ valuePtr = WebKit_win32.JSObjectGetProperty (ctx, value, propertyName, null); + long /*int*/ propertyName = WebKit_win32.JSStringCreateWithUTF8CString (bytes); + long /*int*/ valuePtr = WebKit_win32.JSObjectGetProperty (ctx, value, propertyName, null); WebKit_win32.JSStringRelease (propertyName); type = WebKit_win32.JSValueGetType (ctx, valuePtr); if (type == WebKit_win32.kJSTypeNumber) { int length = (int)WebKit_win32.JSValueToNumber (ctx, valuePtr, null); Object[] result = new Object[length]; for (int i = 0; i < length; i++) { - int /*long*/ current = WebKit_win32.JSObjectGetPropertyAtIndex (ctx, value, i, null); + long /*int*/ current = WebKit_win32.JSObjectGetPropertyAtIndex (ctx, value, i, null); if (current != 0) { result[i] = convertToJava (ctx, current); } @@ -499,7 +499,7 @@ Object convertToJava (int /*long*/ ctx, int /*long*/ value) { return null; } -int /*long*/ convertToJS (int /*long*/ ctx, Object value) { +long /*int*/ convertToJS (long /*int*/ ctx, Object value) { if (value == null) { return WebKit_win32.JSValueMakeNull (ctx); } @@ -510,8 +510,8 @@ int /*long*/ convertToJS (int /*long*/ ctx, Object value) { } catch (UnsupportedEncodingException e) { bytes = ((String)value + '\0').getBytes (); } - int /*long*/ stringRef = WebKit_win32.JSStringCreateWithUTF8CString (bytes); - int /*long*/ result = WebKit_win32.JSValueMakeString (ctx, stringRef); + long /*int*/ stringRef = WebKit_win32.JSStringCreateWithUTF8CString (bytes); + long /*int*/ result = WebKit_win32.JSValueMakeString (ctx, stringRef); WebKit_win32.JSStringRelease (stringRef); return result; } @@ -524,10 +524,10 @@ int /*long*/ convertToJS (int /*long*/ ctx, Object value) { if (value instanceof Object[]) { Object[] arrayValue = (Object[]) value; int length = arrayValue.length; - int /*long*/[] arguments = new int /*long*/[length]; + long /*int*/[] arguments = new long /*int*/[length]; for (int i = 0; i < length; i++) { Object javaObject = arrayValue[i]; - int /*long*/ jsObject = convertToJS (ctx, javaObject); + long /*int*/ jsObject = convertToJS (ctx, javaObject); arguments[i] = jsObject; } return WebKit_win32.JSObjectMakeArray (ctx, length, arguments, null); @@ -549,18 +549,18 @@ public void create (Composite parent, int style) { OS.memmove (jsClassDefinition.className, bytes, bytes.length); /* custom callbacks for hasProperty, getProperty and callAsFunction */ - int /*long*/ addr = WebKit_win32.JSObjectHasPropertyProc_CALLBACK (JSObjectHasPropertyProc.getAddress ()); + long /*int*/ addr = WebKit_win32.JSObjectHasPropertyProc_CALLBACK (JSObjectHasPropertyProc.getAddress ()); jsClassDefinition.hasProperty = addr; addr = WebKit_win32.JSObjectGetPropertyProc_CALLBACK (JSObjectGetPropertyProc.getAddress ()); jsClassDefinition.getProperty = addr; - int /*long*/ classDefinitionPtr = C.malloc (JSClassDefinition.sizeof); + long /*int*/ classDefinitionPtr = C.malloc (JSClassDefinition.sizeof); WebKit_win32.memmove (classDefinitionPtr, jsClassDefinition, JSClassDefinition.sizeof); ExternalClass = WebKit_win32.JSClassCreate (classDefinitionPtr); WebKit_win32.JSClassRetain (ExternalClass); } - int /*long*/[] result = new int /*long*/[1]; + long /*int*/[] result = new long /*int*/[1]; int hr = WebKit_win32.WebKitCreateInstance (WebKit_win32.CLSID_WebView, 0, WebKit_win32.IID_IWebView, result); if (hr != COM.S_OK || result[0] == 0) { browser.dispose (); @@ -568,7 +568,7 @@ public void create (Composite parent, int style) { } webView = new IWebView (result[0]); webViewData = C.malloc (C.PTR_SIZEOF); - C.memmove (webViewData, new int /*long*/[] {webView.getAddress ()}, C.PTR_SIZEOF); + C.memmove (webViewData, new long /*int*/[] {webView.getAddress ()}, C.PTR_SIZEOF); hr = webView.setHostWindow (browser.handle); if (hr != COM.S_OK) { browser.dispose (); @@ -681,13 +681,13 @@ public void create (Composite parent, int style) { } public boolean execute (String script) { - int /*long*/[] result = new int /*long*/[1]; + long /*int*/[] result = new long /*int*/[1]; int hr = webView.mainFrame (result); if (hr != COM.S_OK || result[0] == 0) { return false; } IWebFrame frame = new IWebFrame (result[0]); - int /*long*/ context = frame.globalContext (); + long /*int*/ context = frame.globalContext (); frame.Release (); if (context == 0) { return false; @@ -698,19 +698,19 @@ public boolean execute (String script) { } catch (UnsupportedEncodingException e) { bytes = (script + '\0').getBytes (); } - int /*long*/ scriptString = WebKit_win32.JSStringCreateWithUTF8CString (bytes); + long /*int*/ scriptString = WebKit_win32.JSStringCreateWithUTF8CString (bytes); if (scriptString == 0) return false; try { bytes = (getUrl () + '\0').getBytes ("UTF-8"); //$NON-NLS-1$ } catch (UnsupportedEncodingException e) { bytes = (getUrl () + '\0').getBytes (); } - int /*long*/ urlString = WebKit_win32.JSStringCreateWithUTF8CString (bytes); + long /*int*/ urlString = WebKit_win32.JSStringCreateWithUTF8CString (bytes); if (urlString == 0) { WebKit_win32.JSStringRelease (scriptString); return false; } - int /*long*/ evalResult = WebKit_win32.JSEvaluateScript (context, scriptString, 0, urlString, 0, null); + long /*int*/ evalResult = WebKit_win32.JSEvaluateScript (context, scriptString, 0, urlString, 0, null); WebKit_win32.JSStringRelease (urlString); WebKit_win32.JSStringRelease (scriptString); return evalResult != 0; @@ -727,7 +727,7 @@ public String getBrowserType () { } public String getText () { - int /*long*/[] result = new int /*long*/[1]; + long /*int*/[] result = new long /*int*/[1]; int hr = webView.mainFrame (result); if (hr != COM.S_OK || result[0] == 0) { return EMPTY_STRING; @@ -1009,7 +1009,7 @@ boolean handleEvent (Object[] arguments) { } public boolean isBackEnabled () { - int /*long*/[] address = new int /*long*/[1]; + long /*int*/[] address = new long /*int*/[1]; int hr = webView.QueryInterface (WebKit_win32.IID_IWebIBActions, address); if (hr != COM.S_OK || address[0] == 0) { return false; @@ -1022,12 +1022,12 @@ public boolean isBackEnabled () { } public boolean isFocusControl () { - int /*long*/ hwndFocus = OS.GetFocus (); + long /*int*/ hwndFocus = OS.GetFocus (); return hwndFocus != 0 && hwndFocus == webViewWindowHandle; } public boolean isForwardEnabled () { - int /*long*/[] address = new int /*long*/[1]; + long /*int*/[] address = new long /*int*/[1]; int hr = webView.QueryInterface (WebKit_win32.IID_IWebIBActions, address); if (hr != COM.S_OK || address[0] == 0) { return false; @@ -1079,7 +1079,7 @@ void onDispose () { public void refresh () { webFrameLoadDelegate.html = null; - int /*long*/[] result = new int /*long*/[1]; + long /*int*/[] result = new long /*int*/[1]; int hr = webView.QueryInterface (WebKit_win32.IID_IWebIBActions, result); if (hr != COM.S_OK || result[0] == 0) { return; @@ -1138,7 +1138,7 @@ public boolean setText (String html, boolean trusted) { untrustedText = !trusted; if (blankLoading) return true; - int /*long*/[] result = new int /*long*/[1]; + long /*int*/[] result = new long /*int*/[1]; int hr = webView.mainFrame (result); if (hr != COM.S_OK || result[0] == 0) { return false; @@ -1153,7 +1153,7 @@ public boolean setText (String html, boolean trusted) { } IWebMutableURLRequest request = new IWebMutableURLRequest (result[0]); - int /*long*/ urlString = createBSTR (ABOUT_BLANK); + long /*int*/ urlString = createBSTR (ABOUT_BLANK); hr = request.setURL (urlString); COM.SysFreeString (urlString); @@ -1191,7 +1191,7 @@ public boolean setUrl (String url, String postData, String[] headers) { } webFrameLoadDelegate.html = null; lastNavigateURL = url; - int /*long*/[] result = new int /*long*/[1]; + long /*int*/[] result = new long /*int*/[1]; int hr = webView.mainFrame (result); if (hr != COM.S_OK || result[0] == 0) { return false; @@ -1208,7 +1208,7 @@ public boolean setUrl (String url, String postData, String[] headers) { if (postData != null) { //TODO: POST // webResourceLoadDelegate.postData = postData; -// int /*long*/ postString = createBSTR (POST); +// long /*int*/ postString = createBSTR (POST); // hr = request.setHTTPMethod (postString); // COM.SysFreeString (postString); // @@ -1218,12 +1218,12 @@ public boolean setUrl (String url, String postData, String[] headers) { // IWebMutableURLRequestPrivate requestPrivate = new IWebMutableURLRequestPrivate(result[0]); // int cfRequest = requestPrivate.cfRequest(); // byte[] bytes = postData.getBytes(); -// int /*long*/ data = WebKit_win32.CFDataCreate(0, bytes, bytes.length); +// long /*int*/ data = WebKit_win32.CFDataCreate(0, bytes, bytes.length); // if (data != 0)WebKit_win32.CFURLRequestSetHTTPRequestBody(cfRequest, data); // -// int /*long*/ dataGet = WebKit_win32.CFURLRequestCopyHTTPRequestBody(cfRequest); +// long /*int*/ dataGet = WebKit_win32.CFURLRequestCopyHTTPRequestBody(cfRequest); // int length = WebKit_win32.CFDataGetLength(dataGet); -// int /*long*/ bytePtr = WebKit_win32.CFDataGetBytePtr(dataGet); +// long /*int*/ bytePtr = WebKit_win32.CFDataGetBytePtr(dataGet); // } } hr = COM.S_OK; //TODO: once post code is completed, remove this line if not required @@ -1236,7 +1236,7 @@ public boolean setUrl (String url, String postData, String[] headers) { String key = current.substring (0, index).trim (); String value = current.substring (index + 1).trim (); if (key.length () > 0 && value.length () > 0) { - int /*long*/ valueString = createBSTR (value); + long /*int*/ valueString = createBSTR (value); if (key.equalsIgnoreCase (USER_AGENT)) { /* * Feature of WebKit. The user-agent header value cannot be overridden @@ -1245,7 +1245,7 @@ public boolean setUrl (String url, String postData, String[] headers) { */ hr = webView.setCustomUserAgent (valueString); } else { - int /*long*/ keyString = createBSTR (key); + long /*int*/ keyString = createBSTR (key); hr = request.setValue (valueString, keyString); COM.SysFreeString (keyString); } @@ -1256,7 +1256,7 @@ public boolean setUrl (String url, String postData, String[] headers) { } } if (hr == COM.S_OK) { - int /*long*/ urlString = createBSTR (url); + long /*int*/ urlString = createBSTR (url); hr = request.setURL (urlString); COM.SysFreeString (urlString); if (hr == COM.S_OK) { @@ -1272,7 +1272,7 @@ public boolean setUrl (String url, String postData, String[] headers) { boolean shouldClose () { if (!jsEnabled) return true; - int /*long*/[] address = new int /*long*/[1]; + long /*int*/[] address = new long /*int*/[1]; int hr = webView.QueryInterface (WebKit_win32.IID_IWebViewPrivate, address); if (hr != COM.S_OK || address[0] == 0) { return false; @@ -1287,7 +1287,7 @@ boolean shouldClose () { public void stop () { webFrameLoadDelegate.html = null; - int /*long*/[] result = new int /*long*/[1]; + long /*int*/[] result = new long /*int*/[1]; int hr = webView.QueryInterface (WebKit_win32.IID_IWebIBActions, result); if (hr != COM.S_OK || result[0] == 0) { return; @@ -1302,7 +1302,7 @@ void initializeWebViewPreferences () { * Try to create separate preferences for each webview using different identifier for each webview. * Otherwise all the webviews use the shared preferences. */ - int /*long*/[] result = new int /*long*/[1]; + long /*int*/[] result = new long /*int*/[1]; int hr = WebKit_win32.WebKitCreateInstance (WebKit_win32.CLSID_WebPreferences, 0, WebKit_win32.IID_IWebPreferences, result); if (hr == COM.S_OK && result[0] != 0) { IWebPreferences preferences = new IWebPreferences (result[0]); diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebPolicyDelegate.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebPolicyDelegate.java index 08a1ec413e..16f478b232 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebPolicyDelegate.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebPolicyDelegate.java @@ -36,17 +36,17 @@ int AddRef () { void createCOMInterfaces () { iWebPolicyDelegate = new COMObject (new int[] {2, 0, 0, 5, 5, 5, 3}) { - 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 decidePolicyForNavigationAction (args[0], args[1], args[2], args[3], args[4]);} - public int /*long*/ method4 (int /*long*/[] args) {return decidePolicyForNewWindowAction (args[0], args[1], args[2], args[3], args[4]);} - public int /*long*/ method5 (int /*long*/[] args) {return decidePolicyForMIMEType (args[0], args[1], args[2], args[3], args[4]);} - public int /*long*/ method6 (int /*long*/[] args) {return unableToImplementPolicyWithError (args[0], args[1], args[2]);} + public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);} + public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();} + public long /*int*/ method2 (long /*int*/[] args) {return Release ();} + public long /*int*/ method3 (long /*int*/[] args) {return decidePolicyForNavigationAction (args[0], args[1], args[2], args[3], args[4]);} + public long /*int*/ method4 (long /*int*/[] args) {return decidePolicyForNewWindowAction (args[0], args[1], args[2], args[3], args[4]);} + public long /*int*/ method5 (long /*int*/[] args) {return decidePolicyForMIMEType (args[0], args[1], args[2], args[3], args[4]);} + public long /*int*/ method6 (long /*int*/[] args) {return unableToImplementPolicyWithError (args[0], args[1], args[2]);} }; } -int decidePolicyForMIMEType (int /*long*/ webView, int /*long*/ type, int /*long*/ request, int /*long*/ frame, int /*long*/ listener) { +int decidePolicyForMIMEType (long /*int*/ webView, long /*int*/ type, long /*int*/ request, long /*int*/ frame, long /*int*/ listener) { IWebView iwebView = new IWebView (webView); int[] canShow = new int[1]; iwebView.canShowMIMEType (type, canShow); @@ -59,9 +59,9 @@ int decidePolicyForMIMEType (int /*long*/ webView, int /*long*/ type, int /*long return COM.S_OK; } -int decidePolicyForNavigationAction (int /*long*/ webView, int /*long*/ actionInformation, int /*long*/ request, int /*long*/ frame, int /*long*/ listener) { +int decidePolicyForNavigationAction (long /*int*/ webView, long /*int*/ actionInformation, long /*int*/ request, long /*int*/ frame, long /*int*/ listener) { IWebURLRequest iwebUrlRequest = new IWebURLRequest (request); - int /*long*/[] result = new int /*long*/[1]; + long /*int*/[] result = new long /*int*/[1]; int hr = iwebUrlRequest.URL (result); if (hr != COM.S_OK || result[0] == 0) { return COM.S_OK; @@ -132,7 +132,7 @@ int decidePolicyForNavigationAction (int /*long*/ webView, int /*long*/ actionIn return COM.S_OK; } -int decidePolicyForNewWindowAction (int /*long*/ webView, int /*long*/ actionInformation, int /*long*/ request, int /*long*/ frameName, int /*long*/ listener) { +int decidePolicyForNewWindowAction (long /*int*/ webView, long /*int*/ actionInformation, long /*int*/ request, long /*int*/ frameName, long /*int*/ listener) { IWebPolicyDecisionListener pdListener = new IWebPolicyDecisionListener (listener); pdListener.use(); return COM.S_OK; @@ -145,27 +145,27 @@ protected void disposeCOMInterfaces () { } } -int /*long*/ getAddress () { +long /*int*/ getAddress () { return iWebPolicyDelegate.getAddress (); } -int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) { +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*/[] {iWebPolicyDelegate.getAddress ()}, OS.PTR_SIZEOF); + COM.MoveMemory (ppvObject, new long /*int*/[] {iWebPolicyDelegate.getAddress ()}, OS.PTR_SIZEOF); new IUnknown (iWebPolicyDelegate.getAddress ()).AddRef (); return COM.S_OK; } if (COM.IsEqualGUID (guid, WebKit_win32.IID_IWebPolicyDelegate)) { - COM.MoveMemory (ppvObject, new int /*long*/[] {iWebPolicyDelegate.getAddress ()}, OS.PTR_SIZEOF); + COM.MoveMemory (ppvObject, new long /*int*/[] {iWebPolicyDelegate.getAddress ()}, OS.PTR_SIZEOF); new IUnknown (iWebPolicyDelegate.getAddress ()).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; } @@ -177,12 +177,12 @@ int Release () { return refCount; } -int unableToImplementPolicyWithError (int /*long*/ webView, int /*long*/ error, int /*long*/ frame) { +int unableToImplementPolicyWithError (long /*int*/ webView, long /*int*/ error, long /*int*/ frame) { if (browser.isDisposed ()) return COM.S_OK; IWebError iweberror = new IWebError (error); String failingURL = null; - int /*long*/[] result = new int /*long*/[1]; + long /*int*/[] result = new long /*int*/[1]; int hr = iweberror.failingURL (result); if (hr == COM.S_OK && result[0] != 0) { failingURL = WebKit.extractBSTR (result[0]); diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebResourceLoadDelegate.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebResourceLoadDelegate.java index eb4502e51c..f3e9a5785c 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebResourceLoadDelegate.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebResourceLoadDelegate.java @@ -39,22 +39,22 @@ int AddRef () { void createCOMInterfaces () { iWebResourceLoadDelegate = new COMObject (new int[] {2, 0, 0, 4, 6, 4, 4, 4, 4, 3, 4, 3}) { - 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 identifierForInitialRequest (args[0], args[1], args[2], args[3]);} - public int /*long*/ method4 (int /*long*/[] args) {return willSendRequest (args[0], args[1], args[2], args[3], args[4], args[5]);} - public int /*long*/ method5 (int /*long*/[] args) {return didReceiveAuthenticationChallenge (args[0], args[1], args[2], args[3]);} - public int /*long*/ method6 (int /*long*/[] args) {return COM.E_NOTIMPL;} - public int /*long*/ method7 (int /*long*/[] args) {return COM.S_OK;} - public int /*long*/ method8 (int /*long*/[] args) {return COM.S_OK;} - public int /*long*/ method9 (int /*long*/[] args) {return COM.S_OK;} - public int /*long*/ method10 (int /*long*/[] args) {return COM.S_OK;} - public int /*long*/ method11 (int /*long*/[] args) {return COM.E_NOTIMPL;} + 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 identifierForInitialRequest (args[0], args[1], args[2], args[3]);} + public long /*int*/ method4 (long /*int*/[] args) {return willSendRequest (args[0], args[1], args[2], args[3], args[4], args[5]);} + public long /*int*/ method5 (long /*int*/[] args) {return didReceiveAuthenticationChallenge (args[0], args[1], args[2], args[3]);} + public long /*int*/ method6 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long /*int*/ method7 (long /*int*/[] args) {return COM.S_OK;} + public long /*int*/ method8 (long /*int*/[] args) {return COM.S_OK;} + public long /*int*/ method9 (long /*int*/[] args) {return COM.S_OK;} + public long /*int*/ method10 (long /*int*/[] args) {return COM.S_OK;} + public long /*int*/ method11 (long /*int*/[] args) {return COM.E_NOTIMPL;} }; } -int didReceiveAuthenticationChallenge (int /*long*/ webView, int /*long*/ identifier, int /*long*/ challenge, int /*long*/ dataSource) { +int didReceiveAuthenticationChallenge (long /*int*/ webView, long /*int*/ identifier, long /*int*/ challenge, long /*int*/ dataSource) { IWebURLAuthenticationChallenge authenticationChallenge = new IWebURLAuthenticationChallenge (challenge); /* * Do not invoke the listeners if this challenge has been failed too many @@ -63,7 +63,7 @@ int didReceiveAuthenticationChallenge (int /*long*/ webView, int /*long*/ identi */ int[] count = new int[1]; int hr = authenticationChallenge.previousFailureCount (count); - int /*long*/[] result = new int /*long*/[1]; + long /*int*/[] result = new long /*int*/[1]; if (hr == COM.S_OK && count[0] < 3) { AuthenticationListener[] authenticationListeners = browser.webBrowser.authenticationListeners; for (int i = 0; i < authenticationListeners.length; i++) { @@ -89,8 +89,8 @@ int didReceiveAuthenticationChallenge (int /*long*/ webView, int /*long*/ identi hr = WebKit_win32.WebKitCreateInstance (WebKit_win32.CLSID_WebURLCredential, 0, WebKit_win32.IID_IWebURLCredential, result); if (hr == COM.S_OK && result[0] != 0) { IWebURLCredential credential = new IWebURLCredential (result[0]); - int /*long*/ user = WebKit.createBSTR (event.user); - int /*long*/ password = WebKit.createBSTR (event.password); + long /*int*/ user = WebKit.createBSTR (event.user); + long /*int*/ password = WebKit.createBSTR (event.password); credential.initWithUser (user, password, WebKit_win32.WebURLCredentialPersistenceForSession); challengeSender.useCredential (credential.getAddress (), challenge); credential.Release (); @@ -167,8 +167,8 @@ int didReceiveAuthenticationChallenge (int /*long*/ webView, int /*long*/ identi hr = WebKit_win32.WebKitCreateInstance (WebKit_win32.CLSID_WebURLCredential, 0, WebKit_win32.IID_IWebURLCredential, result); if (hr == COM.S_OK && result[0] != 0) { IWebURLCredential credential = new IWebURLCredential (result[0]); - int /*long*/ user = WebKit.createBSTR (userReturn[0]); - int /*long*/ password = WebKit.createBSTR (passwordReturn[0]); + long /*int*/ user = WebKit.createBSTR (userReturn[0]); + long /*int*/ password = WebKit.createBSTR (passwordReturn[0]); credential.initWithUser (user, password, WebKit_win32.WebURLCredentialPersistenceForSession); challengeSender.useCredential (credential.getAddress (), challenge); credential.Release (); @@ -184,23 +184,23 @@ void disposeCOMInterfaces () { } } -int /*long*/ getAddress () { +long /*int*/ getAddress () { return iWebResourceLoadDelegate.getAddress (); } -int identifierForInitialRequest (int /*long*/ webView, int /*long*/ request, int /*long*/ dataSource, int /*long*/ identifier) { +int identifierForInitialRequest (long /*int*/ webView, long /*int*/ request, long /*int*/ dataSource, long /*int*/ identifier) { if (browser.isDisposed ()) return COM.S_OK; /* send progress event iff request is for top-level frame */ IWebDataSource source = new IWebDataSource (dataSource); - int /*long*/[] frame = new int /*long*/[1]; + long /*int*/[] frame = new long /*int*/[1]; int hr = source.webFrame (frame); if (hr != COM.S_OK || frame[0] == 0) { return COM.S_OK; } new IWebFrame (frame[0]).Release (); - int /*long*/[] mainFrame = new int /*long*/[1]; + long /*int*/[] mainFrame = new long /*int*/[1]; IWebView iWebView = new IWebView (webView); hr = iWebView.mainFrame (mainFrame); if (hr != COM.S_OK || mainFrame[0] == 0) { @@ -208,7 +208,7 @@ int identifierForInitialRequest (int /*long*/ webView, int /*long*/ request, int } new IWebFrame (mainFrame[0]).Release (); if (frame[0] == mainFrame[0]) { - int /*long*/ ptr = OS.malloc (8); + long /*int*/ ptr = OS.malloc (8); iWebView.estimatedProgress (ptr); double[] estimate = new double[1]; OS.MoveMemory (estimate, ptr, 8); @@ -228,23 +228,23 @@ int identifierForInitialRequest (int /*long*/ webView, int /*long*/ request, int return COM.S_OK; } -int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) { +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*/[] {iWebResourceLoadDelegate.getAddress ()}, OS.PTR_SIZEOF); + COM.MoveMemory (ppvObject, new long /*int*/[] {iWebResourceLoadDelegate.getAddress ()}, OS.PTR_SIZEOF); new IUnknown (iWebResourceLoadDelegate.getAddress ()).AddRef (); return COM.S_OK; } if (COM.IsEqualGUID (guid, WebKit_win32.IID_IWebResourceLoadDelegate)) { - COM.MoveMemory (ppvObject, new int /*long*/[] {iWebResourceLoadDelegate.getAddress ()}, OS.PTR_SIZEOF); + COM.MoveMemory (ppvObject, new long /*int*/[] {iWebResourceLoadDelegate.getAddress ()}, OS.PTR_SIZEOF); new IUnknown (iWebResourceLoadDelegate.getAddress ()).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; } @@ -335,9 +335,9 @@ boolean showAuthenticationDialog (final String[] user, final String[] password, return result[0]; } -int willSendRequest (int /*long*/ webView, int /*long*/ identifier, int /*long*/ request, int /*long*/ redirectResponse, int /*long*/ dataSource, int /*long*/ newRequest) { +int willSendRequest (long /*int*/ webView, long /*int*/ identifier, long /*int*/ request, long /*int*/ redirectResponse, long /*int*/ dataSource, long /*int*/ newRequest) { IWebURLRequest req = new IWebURLRequest (request); - int /*long*/[] result = new int /*long*/ [1]; + long /*int*/[] result = new long /*int*/ [1]; int hr = req.URL (result); if (hr == COM.S_OK && result[0] != 0) { String url = WebKit.extractBSTR (result[0]); @@ -354,15 +354,15 @@ int willSendRequest (int /*long*/ webView, int /*long*/ identifier, int /*long*/ hr = req.mutableCopy (result); if (hr == COM.S_OK && result[0] != 0) { IWebMutableURLRequest mReq = new IWebMutableURLRequest (result[0]); - int /*long*/ urlString = WebKit.createBSTR (url); + long /*int*/ urlString = WebKit.createBSTR (url); mReq.setURL (urlString); - OS.MoveMemory (newRequest, new int /*long*/[] {mReq.getAddress ()}, C.PTR_SIZEOF); + OS.MoveMemory (newRequest, new long /*int*/[] {mReq.getAddress ()}, C.PTR_SIZEOF); return COM.S_OK; } } } req.AddRef (); - OS.MoveMemory (newRequest, new int /*long*/[] {request}, C.PTR_SIZEOF); + OS.MoveMemory (newRequest, new long /*int*/[] {request}, C.PTR_SIZEOF); return COM.S_OK; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebUIDelegate.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebUIDelegate.java index 7f9ee9c497..5a1de8b0d1 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebUIDelegate.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebUIDelegate.java @@ -42,12 +42,12 @@ int AddRef () { return refCount; } -int canTakeFocus (int /*long*/ sender, int forward, int /*long*/ result) { +int canTakeFocus (long /*int*/ sender, int forward, long /*int*/ result) { OS.MoveMemory (result, new int[] {1}, 4); /* BOOL */ return COM.S_OK; } -int contextMenuItemsForElement (int /*long*/ sender, int /*long*/ element, int /*long*/ defaultItemsHMenu, int /*long*/ resultHMenu) { +int contextMenuItemsForElement (long /*int*/ sender, long /*int*/ element, long /*int*/ defaultItemsHMenu, long /*int*/ resultHMenu) { Point pt = browser.getDisplay ().getCursorLocation (); Event event = new Event (); event.x = pt.x; @@ -61,86 +61,86 @@ int contextMenuItemsForElement (int /*long*/ sender, int /*long*/ element, int / } menu.setVisible (true); } else { - OS.MoveMemory (resultHMenu, new int /*long*/[] {defaultItemsHMenu}, C.PTR_SIZEOF); + OS.MoveMemory (resultHMenu, new long /*int*/[] {defaultItemsHMenu}, C.PTR_SIZEOF); return COM.S_OK; } } - OS.MoveMemory (resultHMenu, new int /*long*/[] {0}, C.PTR_SIZEOF); + OS.MoveMemory (resultHMenu, new long /*int*/[] {0}, C.PTR_SIZEOF); return COM.S_OK; } void createCOMInterfaces () { iWebUIDelegate = new COMObject (new int[] {2, 0, 0, 3, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 4, 4, 2, 3, 4, 4, 3, 3, 3, 3, 5, 3, 1, 3, 2, 2, 2, 2, 3, 2, 3, 1, 1, 0, 0, 1, 1, 2, 2, 2, 2, 3, 5, 2, 2, 3, 1, 2, 2, 4, 10, 3}) { - 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 createWebViewWithRequest (args[0], args[1], args[2]);} - public int /*long*/ method4 (int /*long*/[] args) {return webViewShow (args[0]);} - public int /*long*/ method5 (int /*long*/[] args) {return webViewClose (args[0]);} - public int /*long*/ method6 (int /*long*/[] args) {return COM.E_NOTIMPL;} - public int /*long*/ method7 (int /*long*/[] args) {return COM.E_NOTIMPL;} - public int /*long*/ method8 (int /*long*/[] args) {return COM.E_NOTIMPL;} - public int /*long*/ method9 (int /*long*/[] args) {return COM.E_NOTIMPL;} - public int /*long*/ method10 (int /*long*/[] args) {return setStatusText (args[0], args[1]);} - public int /*long*/ method11 (int /*long*/[] args) {return COM.E_NOTIMPL;} - public int /*long*/ method12 (int /*long*/[] args) {return COM.E_NOTIMPL;} - public int /*long*/ method13 (int /*long*/[] args) {return setToolbarsVisible (args[0], (int)/*64*/args[1]);} - public int /*long*/ method14 (int /*long*/[] args) {return COM.E_NOTIMPL;} - public int /*long*/ method15 (int /*long*/[] args) {return setStatusBarVisible (args[0], (int)/*64*/args[1]);} - public int /*long*/ method16 (int /*long*/[] args) {return COM.E_NOTIMPL;} - public int /*long*/ method17 (int /*long*/[] args) {return COM.E_NOTIMPL;} - public int /*long*/ method18 (int /*long*/[] args) {return setFrame (args[0], args[1]);} - public int /*long*/ method19 (int /*long*/[] args) {return COM.E_NOTIMPL;} - public int /*long*/ method20 (int /*long*/[] args) {return COM.E_NOTIMPL;} - public int /*long*/ method21 (int /*long*/[] args) {return COM.E_NOTIMPL;} - public int /*long*/ method22 (int /*long*/[] args) {return runJavaScriptAlertPanelWithMessage (args[0], args[1]);} - public int /*long*/ method23 (int /*long*/[] args) {return runJavaScriptConfirmPanelWithMessage (args[0], args[1], args[2]);} - public int /*long*/ method24 (int /*long*/[] args) {return runJavaScriptTextInputPanelWithPrompt (args[0], args[1], args[2], args[3]);} - public int /*long*/ method25 (int /*long*/[] args) {return runBeforeUnloadConfirmPanelWithMessage (args[0], args[1], args[2], args[3]);} - public int /*long*/ method26 (int /*long*/[] args) {return runOpenPanelForFileButtonWithResultListener (args[0], args[1]);} - public int /*long*/ method27 (int /*long*/[] args) {return mouseDidMoveOverElement (args[0], args[1], (int)/*64*/args[2]);} - public int /*long*/ method28 (int /*long*/[] args) {return contextMenuItemsForElement (args[0], args[1], args[2], args[3]);} - public int /*long*/ method29 (int /*long*/[] args) {return COM.E_NOTIMPL;} - public int /*long*/ method30 (int /*long*/[] args) {return COM.E_NOTIMPL;} - public int /*long*/ method31 (int /*long*/[] args) {return COM.E_NOTIMPL;} - public int /*long*/ method32 (int /*long*/[] args) {return COM.E_NOTIMPL;} - public int /*long*/ method33 (int /*long*/[] args) {return COM.E_NOTIMPL;} - public int /*long*/ method34 (int /*long*/[] args) {return COM.E_NOTIMPL;} - public int /*long*/ method35 (int /*long*/[] args) {return COM.E_NOTIMPL;} - public int /*long*/ method36 (int /*long*/[] args) {return COM.E_NOTIMPL;} - public int /*long*/ method37 (int /*long*/[] args) {return COM.E_NOTIMPL;} - public int /*long*/ method38 (int /*long*/[] args) {return COM.E_NOTIMPL;} - public int /*long*/ method39 (int /*long*/[] args) {return COM.E_NOTIMPL;} - public int /*long*/ method40 (int /*long*/[] args) {return COM.E_NOTIMPL;} - public int /*long*/ method41 (int /*long*/[] args) {return COM.E_NOTIMPL;} - public int /*long*/ method42 (int /*long*/[] args) {return canTakeFocus (args[0], (int)/*64*/args[1], args[2]);} - public int /*long*/ method43 (int /*long*/[] args) {return takeFocus (args[0], (int)/*64*/args[1]);} - public int /*long*/ method44 (int /*long*/[] args) {return COM.E_NOTIMPL;} - public int /*long*/ method45 (int /*long*/[] args) {return COM.S_OK;} - public int /*long*/ method46 (int /*long*/[] args) {return COM.E_NOTIMPL;} - public int /*long*/ method47 (int /*long*/[] args) {return COM.E_NOTIMPL;} - public int /*long*/ method48 (int /*long*/[] args) {return COM.E_NOTIMPL;} - public int /*long*/ method49 (int /*long*/[] args) {return COM.E_NOTIMPL;} - public int /*long*/ method50 (int /*long*/[] args) {return COM.E_NOTIMPL;} - public int /*long*/ method51 (int /*long*/[] args) {return printFrame (args[0], args[1]);} - public int /*long*/ method52 (int /*long*/[] args) {return COM.E_NOTIMPL;} - public int /*long*/ method53 (int /*long*/[] args) {return COM.E_NOTIMPL;} - public int /*long*/ method54 (int /*long*/[] args) {return COM.E_NOTIMPL;} - public int /*long*/ method55 (int /*long*/[] args) {return COM.E_NOTIMPL;} - public int /*long*/ method56 (int /*long*/[] args) {return COM.E_NOTIMPL;} - public int /*long*/ method57 (int /*long*/[] args) {return COM.E_NOTIMPL;} - public int /*long*/ method58 (int /*long*/[] args) {return COM.E_NOTIMPL;} - public int /*long*/ method59 (int /*long*/[] args) {return COM.E_NOTIMPL;} - public int /*long*/ method60 (int /*long*/[] args) {return COM.E_NOTIMPL;} - public int /*long*/ method61 (int /*long*/[] args) {return COM.E_NOTIMPL;} - public int /*long*/ method62 (int /*long*/[] args) {return setMenuBarVisible (args[0], (int)/*64*/args[1]);} - public int /*long*/ method63 (int /*long*/[] args) {return COM.E_NOTIMPL;} - public int /*long*/ method64 (int /*long*/[] args) {return COM.E_NOTIMPL;} - public int /*long*/ method65 (int /*long*/[] args) {return COM.E_NOTIMPL;} + 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 createWebViewWithRequest (args[0], args[1], args[2]);} + public long /*int*/ method4 (long /*int*/[] args) {return webViewShow (args[0]);} + public long /*int*/ method5 (long /*int*/[] args) {return webViewClose (args[0]);} + public long /*int*/ method6 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long /*int*/ method7 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long /*int*/ method8 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long /*int*/ method9 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long /*int*/ method10 (long /*int*/[] args) {return setStatusText (args[0], args[1]);} + public long /*int*/ method11 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long /*int*/ method12 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long /*int*/ method13 (long /*int*/[] args) {return setToolbarsVisible (args[0], (int)/*64*/args[1]);} + public long /*int*/ method14 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long /*int*/ method15 (long /*int*/[] args) {return setStatusBarVisible (args[0], (int)/*64*/args[1]);} + public long /*int*/ method16 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long /*int*/ method17 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long /*int*/ method18 (long /*int*/[] args) {return setFrame (args[0], args[1]);} + public long /*int*/ method19 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long /*int*/ method20 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long /*int*/ method21 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long /*int*/ method22 (long /*int*/[] args) {return runJavaScriptAlertPanelWithMessage (args[0], args[1]);} + public long /*int*/ method23 (long /*int*/[] args) {return runJavaScriptConfirmPanelWithMessage (args[0], args[1], args[2]);} + public long /*int*/ method24 (long /*int*/[] args) {return runJavaScriptTextInputPanelWithPrompt (args[0], args[1], args[2], args[3]);} + public long /*int*/ method25 (long /*int*/[] args) {return runBeforeUnloadConfirmPanelWithMessage (args[0], args[1], args[2], args[3]);} + public long /*int*/ method26 (long /*int*/[] args) {return runOpenPanelForFileButtonWithResultListener (args[0], args[1]);} + public long /*int*/ method27 (long /*int*/[] args) {return mouseDidMoveOverElement (args[0], args[1], (int)/*64*/args[2]);} + public long /*int*/ method28 (long /*int*/[] args) {return contextMenuItemsForElement (args[0], args[1], args[2], args[3]);} + public long /*int*/ method29 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long /*int*/ method30 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long /*int*/ method31 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long /*int*/ method32 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long /*int*/ method33 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long /*int*/ method34 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long /*int*/ method35 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long /*int*/ method36 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long /*int*/ method37 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long /*int*/ method38 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long /*int*/ method39 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long /*int*/ method40 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long /*int*/ method41 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long /*int*/ method42 (long /*int*/[] args) {return canTakeFocus (args[0], (int)/*64*/args[1], args[2]);} + public long /*int*/ method43 (long /*int*/[] args) {return takeFocus (args[0], (int)/*64*/args[1]);} + public long /*int*/ method44 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long /*int*/ method45 (long /*int*/[] args) {return COM.S_OK;} + public long /*int*/ method46 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long /*int*/ method47 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long /*int*/ method48 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long /*int*/ method49 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long /*int*/ method50 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long /*int*/ method51 (long /*int*/[] args) {return printFrame (args[0], args[1]);} + public long /*int*/ method52 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long /*int*/ method53 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long /*int*/ method54 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long /*int*/ method55 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long /*int*/ method56 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long /*int*/ method57 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long /*int*/ method58 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long /*int*/ method59 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long /*int*/ method60 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long /*int*/ method61 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long /*int*/ method62 (long /*int*/[] args) {return setMenuBarVisible (args[0], (int)/*64*/args[1]);} + public long /*int*/ method63 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long /*int*/ method64 (long /*int*/[] args) {return COM.E_NOTIMPL;} + public long /*int*/ method65 (long /*int*/[] args) {return COM.E_NOTIMPL;} }; } -int createWebViewWithRequest (int /*long*/ sender, int /*long*/ request, int /*long*/ webView) { +int createWebViewWithRequest (long /*int*/ sender, long /*int*/ request, long /*int*/ webView) { WindowEvent newEvent = new WindowEvent (browser); newEvent.display = browser.getDisplay (); newEvent.widget = browser; @@ -156,10 +156,10 @@ int createWebViewWithRequest (int /*long*/ sender, int /*long*/ request, int /*l } if (browser != null && !browser.isDisposed ()) { iwebview = ((WebKit)browser.webBrowser).webView; - OS.MoveMemory (webView, new int /*long*/[] {iwebview.getAddress ()}, OS.PTR_SIZEOF); + OS.MoveMemory (webView, new long /*int*/[] {iwebview.getAddress ()}, OS.PTR_SIZEOF); if (request != 0) { IWebURLRequest req = new IWebURLRequest (request); - int /*long*/[] result = new int /*long*/[1]; + long /*int*/[] result = new long /*int*/[1]; int hr = req.URL (result); if (hr != COM.S_OK || result[0] == 0) { return COM.S_OK; @@ -189,17 +189,17 @@ protected void disposeCOMInterfaces () { } } -int /*long*/ getAddress () { +long /*int*/ getAddress () { return iWebUIDelegate.getAddress (); } -int mouseDidMoveOverElement (int /*long*/ sender, int /*long*/ elementInformation, int modifierFlags) { +int mouseDidMoveOverElement (long /*int*/ sender, long /*int*/ elementInformation, int modifierFlags) { if (elementInformation == 0) return COM.S_OK; IPropertyBag info = new IPropertyBag (elementInformation); - int /*long*/ key = WebKit.createBSTR ("WebElementLinkURLKey"); //$NON-NLS-N$ - int /*long*/ hHeap = OS.GetProcessHeap (); - int /*long*/ resultPtr = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, VARIANT.sizeof); + long /*int*/ key = WebKit.createBSTR ("WebElementLinkURLKey"); //$NON-NLS-N$ + long /*int*/ hHeap = OS.GetProcessHeap (); + long /*int*/ resultPtr = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, VARIANT.sizeof); int hr = info.Read (key, resultPtr, null); if (hr != COM.S_OK || resultPtr == 0) { return COM.S_OK; @@ -235,15 +235,15 @@ int mouseDidMoveOverElement (int /*long*/ sender, int /*long*/ elementInformatio return COM.S_OK; } -int printFrame (int /*long*/ webView, int /*long*/ frame) { +int printFrame (long /*int*/ webView, long /*int*/ frame) { IWebFrame iwebFrame = new IWebFrame (frame); PRINTDLG pd = new PRINTDLG (); pd.lStructSize = PRINTDLG.sizeof; pd.Flags = OS.PD_RETURNDC; if (!OS.PrintDlg (pd)) return COM.S_OK; - int /*long*/ printDC = pd.hDC; + long /*int*/ printDC = pd.hDC; - int /*long*/[] result = new int /*long*/[1]; + long /*int*/[] result = new long /*int*/[1]; int hr = iwebFrame.QueryInterface (WebKit_win32.IID_IWebFramePrivate, result); if (hr != COM.S_OK || result[0] == 0) { return COM.S_OK; @@ -272,8 +272,8 @@ int printFrame (int /*long*/ webView, int /*long*/ frame) { } DOCINFO di = new DOCINFO (); di.cbSize = DOCINFO.sizeof; - int /*long*/ hHeap = OS.GetProcessHeap (); - int /*long*/ lpszDocName = 0; + long /*int*/ hHeap = OS.GetProcessHeap (); + long /*int*/ lpszDocName = 0; if (jobName != null && jobName.length () != 0) { /* Use the character encoding for the default locale */ TCHAR buffer = new TCHAR (0, jobName, true); @@ -297,23 +297,23 @@ int printFrame (int /*long*/ webView, int /*long*/ frame) { return COM.S_OK; } -int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) { +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*/[] {iWebUIDelegate.getAddress ()}, OS.PTR_SIZEOF); + COM.MoveMemory (ppvObject, new long /*int*/[] {iWebUIDelegate.getAddress ()}, OS.PTR_SIZEOF); new IUnknown (iWebUIDelegate.getAddress ()).AddRef (); return COM.S_OK; } if (COM.IsEqualGUID (guid, WebKit_win32.IID_IWebUIDelegate)) { - COM.MoveMemory (ppvObject, new int /*long*/[] {iWebUIDelegate.getAddress ()}, OS.PTR_SIZEOF); + COM.MoveMemory (ppvObject, new long /*int*/[] {iWebUIDelegate.getAddress ()}, OS.PTR_SIZEOF); new IUnknown (iWebUIDelegate.getAddress ()).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; } @@ -325,7 +325,7 @@ int Release () { return refCount; } -int runBeforeUnloadConfirmPanelWithMessage (int /*long*/ sender, int /*long*/ message, int /*long*/ initiatedByFrame, int /*long*/ result) { +int runBeforeUnloadConfirmPanelWithMessage (long /*int*/ sender, long /*int*/ message, long /*int*/ initiatedByFrame, long /*int*/ result) { if (!prompt) return COM.S_OK; Shell parent = browser.getShell (); @@ -343,13 +343,13 @@ int runBeforeUnloadConfirmPanelWithMessage (int /*long*/ sender, int /*long*/ me return COM.S_OK; } -int runJavaScriptAlertPanelWithMessage (int /*long*/ sender, int /*long*/ message) { +int runJavaScriptAlertPanelWithMessage (long /*int*/ sender, long /*int*/ message) { String messageString = WebKit.extractBSTR (message); showAlertMessage ("Javascript", messageString); //$NON-NLS-1$ return COM.S_OK; } -int runJavaScriptConfirmPanelWithMessage (int /*long*/ sender, int /*long*/ message, int /*long*/ result) { +int runJavaScriptConfirmPanelWithMessage (long /*int*/ sender, long /*int*/ message, long /*int*/ result) { String messageString = WebKit.extractBSTR (message); int[] response = new int[1]; response[0] = showConfirmPanel ("Javascript", messageString) == SWT.OK ? 1 : 0; //$NON-NLS-1$ @@ -357,11 +357,11 @@ int runJavaScriptConfirmPanelWithMessage (int /*long*/ sender, int /*long*/ mess return COM.S_OK; } -int runJavaScriptTextInputPanelWithPrompt (int /*long*/ sender, int /*long*/ message, int /*long*/ defaultText, int /*long*/ result) { +int runJavaScriptTextInputPanelWithPrompt (long /*int*/ sender, long /*int*/ message, long /*int*/ defaultText, long /*int*/ result) { String messageString = WebKit.extractBSTR (message); String defaultTextString = WebKit.extractBSTR (defaultText); String resultString = showTextPrompter ("Javascript", messageString, defaultTextString); //$NON-NLS-1$ - int /*long*/[] response = new int /*long*/[1]; + long /*int*/[] response = new long /*int*/[1]; if (resultString != null) { response[0] = WebKit.createBSTR (resultString); } @@ -369,7 +369,7 @@ int runJavaScriptTextInputPanelWithPrompt (int /*long*/ sender, int /*long*/ mes return COM.S_OK; } -int runOpenPanelForFileButtonWithResultListener (int /*long*/ sender, int /*long*/ resultListener) { +int runOpenPanelForFileButtonWithResultListener (long /*int*/ sender, long /*int*/ resultListener) { Shell parent = browser.getShell (); FileDialog dialog = new FileDialog (parent, SWT.NONE); String result = dialog.open (); @@ -382,7 +382,7 @@ int runOpenPanelForFileButtonWithResultListener (int /*long*/ sender, int /*long return COM.S_OK; } -int setFrame (int /*long*/ sender, int /*long*/ frame) { +int setFrame (long /*int*/ sender, long /*int*/ frame) { RECT rect = new RECT (); COM.MoveMemory (rect, frame, RECT.sizeof); /* convert to SWT system coordinates */ @@ -394,19 +394,19 @@ int setFrame (int /*long*/ sender, int /*long*/ frame) { return COM.S_OK; } -int setMenuBarVisible (int /*long*/ sender, int visible) { +int setMenuBarVisible (long /*int*/ sender, int visible) { /* Note. Webkit only emits the notification when the status bar should be hidden. */ menuBar = visible == 1; return COM.S_OK; } -int setStatusBarVisible (int /*long*/ sender, int visible) { +int setStatusBarVisible (long /*int*/ sender, int visible) { /* Note. Webkit only emits the notification when the status bar should be hidden. */ statusBar = visible == 1; return COM.S_OK; } -int setStatusText (int /*long*/ sender, int /*long*/ text) { +int setStatusText (long /*int*/ sender, long /*int*/ text) { String statusText = WebKit.extractBSTR (text); if (statusText.length () == 0) return COM.S_OK; StatusTextEvent statusTextEvent = new StatusTextEvent (browser); @@ -420,7 +420,7 @@ int setStatusText (int /*long*/ sender, int /*long*/ text) { return COM.S_OK; } -int setToolbarsVisible (int /*long*/ sender, int visible) { +int setToolbarsVisible (long /*int*/ sender, int visible) { /* Note. Webkit only emits the notification when the status bar should be hidden. */ toolBar = visible == 1; return COM.S_OK; @@ -604,14 +604,14 @@ String showTextPrompter (String title, String message, String defaultText) { return result[0]; } -int takeFocus (int /*long*/ sender, int forward) { +int takeFocus (long /*int*/ sender, int forward) { int traveralCode = forward == 0 ? SWT.TRAVERSE_TAB_PREVIOUS : SWT.TRAVERSE_TAB_NEXT; ((WebKit)browser.webBrowser).traverseOut = true; browser.traverse (traveralCode); return COM.S_OK; } -int webViewClose (int /*long*/ sender) { +int webViewClose (long /*int*/ sender) { WindowEvent newEvent = new WindowEvent (browser); newEvent.display = browser.getDisplay (); newEvent.widget = browser; @@ -623,13 +623,13 @@ int webViewClose (int /*long*/ sender) { return COM.S_OK; } -int webViewFrame (int /*long*/ sender, int /*long*/ frame) { +int webViewFrame (long /*int*/ sender, long /*int*/ frame) { RECT rect = new RECT (); OS.MoveMemory (frame, rect, RECT.sizeof); return COM.S_OK; } -int webViewShow (int /*long*/ sender) { +int webViewShow (long /*int*/ sender) { WindowEvent newEvent = new WindowEvent (browser); newEvent.display = browser.getDisplay (); newEvent.widget = browser; diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebCookieManager.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebCookieManager.java index d4397ab865..1ef7c4e79e 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebCookieManager.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebCookieManager.java @@ -15,11 +15,11 @@ import org.eclipse.swt.internal.ole.win32.*; public class IWebCookieManager extends IUnknown { -public IWebCookieManager (int /*long*/ address) { +public IWebCookieManager (long /*int*/ address) { super (address); } -public int cookieStorage (int /*long*/[] storage) { +public int cookieStorage (long /*int*/[] storage) { return COM.VtblCall (3, getAddress (), storage); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDataSource.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDataSource.java index 800f44fb4c..5ea4d166ce 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDataSource.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDataSource.java @@ -15,23 +15,23 @@ import org.eclipse.swt.internal.ole.win32.*; public class IWebDataSource extends IUnknown { -public IWebDataSource (int /*long*/ address) { +public IWebDataSource (long /*int*/ address) { super (address); } -public int representation (int /*long*/[] rep) { +public int representation (long /*int*/[] rep) { return COM.VtblCall (5, getAddress (), rep); } -public int webFrame (int /*long*/[] frame) { +public int webFrame (long /*int*/[] frame) { return COM.VtblCall (6, getAddress (), frame); } -public int request (int /*long*/[] request) { +public int request (long /*int*/[] request) { return COM.VtblCall (8, getAddress (), request); } -public int pageTitle (int /*long*/[] title) { +public int pageTitle (long /*int*/[] title) { return COM.VtblCall (12, getAddress (), title); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDocumentRepresentation.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDocumentRepresentation.java index f8c2518b65..2b6317c749 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDocumentRepresentation.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDocumentRepresentation.java @@ -15,11 +15,11 @@ import org.eclipse.swt.internal.ole.win32.*; public class IWebDocumentRepresentation extends IUnknown { -public IWebDocumentRepresentation (int /*long*/ address) { +public IWebDocumentRepresentation (long /*int*/ address) { super (address); } -public int documentSource (int /*long*/[] source) { +public int documentSource (long /*int*/[] source) { return COM.VtblCall (8, getAddress (), source); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDownload.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDownload.java index 6465774ec8..e2e3f9e52a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDownload.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDownload.java @@ -15,7 +15,7 @@ import org.eclipse.swt.internal.ole.win32.*; public class IWebDownload extends IUnknown { -public IWebDownload (int /*long*/ address) { +public IWebDownload (long /*int*/ address) { super (address); } @@ -27,7 +27,7 @@ public int setDeletesFileUponFailure (int deletesFileUponFailure) { return COM.VtblCall (12, getAddress (), deletesFileUponFailure); } -public int setDestination (int /*long*/ path, int allowOverwrite) { +public int setDestination (long /*int*/ path, int allowOverwrite) { return COM.VtblCall (13, getAddress(), path, allowOverwrite); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebError.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebError.java index 3b48b5b3bc..41d2c934cc 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebError.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebError.java @@ -15,7 +15,7 @@ import org.eclipse.swt.internal.ole.win32.*; public class IWebError extends IUnknown { -public IWebError (int /*long*/ address) { +public IWebError (long /*int*/ address) { super (address); } @@ -23,23 +23,23 @@ public int code (int[] result) { return COM.VtblCall (4, getAddress (), result); } -//public int domain (int /*long*/[] result) { +//public int domain (long /*int*/[] result) { // return COM.VtblCall (5, getAddress (), result); //} -public int localizedDescription (int /*long*/[] result) { +public int localizedDescription (long /*int*/[] result) { return COM.VtblCall (6, getAddress (), result); } -//public int localizedFailureReason (int /*long*/[] result) { +//public int localizedFailureReason (long /*int*/[] result) { // return COM.VtblCall (7, getAddress (), result); //} -//public int userInfo (int /*long*/[] result) { +//public int userInfo (long /*int*/[] result) { //return COM.VtblCall (11, getAddress (), result); //} -public int failingURL (int /*long*/[] result) { +public int failingURL (long /*int*/[] result) { return COM.VtblCall (12, getAddress (), result); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebErrorPrivate.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebErrorPrivate.java index cd69d6826f..caaedc1de6 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebErrorPrivate.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebErrorPrivate.java @@ -15,11 +15,11 @@ import org.eclipse.swt.internal.ole.win32.*; public class IWebErrorPrivate extends IUnknown { -public IWebErrorPrivate (int /*long*/ address) { +public IWebErrorPrivate (long /*int*/ address) { super (address); } -public int sslPeerCertificate (int /*long*/[] result) { +public int sslPeerCertificate (long /*int*/[] result) { return COM.VtblCall (3, getAddress (), result); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebFrame.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebFrame.java index eeb23725fa..88d36b0598 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebFrame.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebFrame.java @@ -15,23 +15,23 @@ import org.eclipse.swt.internal.ole.win32.*; public class IWebFrame extends IUnknown { -public IWebFrame (int /*long*/ address) { +public IWebFrame (long /*int*/ address) { super (address); } -public int loadRequest (int /*long*/ request) { +public int loadRequest (long /*int*/ request) { return COM.VtblCall (8, getAddress (), request); } -public int loadHTMLString (int /*long*/ string, int /*long*/ baseURL) { +public int loadHTMLString (long /*int*/ string, long /*int*/ baseURL) { return COM.VtblCall (10, getAddress (), string, baseURL); } -public int dataSource (int /*long*/[] source) { +public int dataSource (long /*int*/[] source) { return COM.VtblCall (13, getAddress (), source); } -public int /*long*/ globalContext () { +public long /*int*/ globalContext () { return COM.VtblCall (23, getAddress ()); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebFramePrivate.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebFramePrivate.java index f349a53d51..a41bcbc38f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebFramePrivate.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebFramePrivate.java @@ -15,19 +15,19 @@ import org.eclipse.swt.internal.ole.win32.*; public class IWebFramePrivate extends IUnknown { -public IWebFramePrivate (int /*long*/ address) { +public IWebFramePrivate (long /*int*/ address) { super (address); } -public int setInPrintingMode (int value, int /*long*/ printDC) { +public int setInPrintingMode (int value, long /*int*/ printDC) { return COM.VtblCall (8, getAddress (), value, printDC); } -public int getPrintedPageCount (int /*long*/ printDC, int[] pageCount) { +public int getPrintedPageCount (long /*int*/ printDC, int[] pageCount) { return COM.VtblCall (9, getAddress (), printDC, pageCount); } -public int spoolPages (int /*long*/ printDC, int startPage, int endPage, int /*long*/[] ctx) { +public int spoolPages (long /*int*/ printDC, int startPage, int endPage, long /*int*/[] ctx) { return COM.VtblCall (10, getAddress (), printDC, startPage, endPage, ctx); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebIBActions.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebIBActions.java index 5d74cc3132..b90419f4ca 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebIBActions.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebIBActions.java @@ -15,23 +15,23 @@ import org.eclipse.swt.internal.ole.win32.*; public class IWebIBActions extends IUnknown { -public IWebIBActions (int /*long*/ address) { +public IWebIBActions (long /*int*/ address) { super (address); } -public int stopLoading (int /*long*/ sender) { +public int stopLoading (long /*int*/ sender) { return COM.VtblCall (4, getAddress (), sender); } -public int reload (int /*long*/ sender) { +public int reload (long /*int*/ sender) { return COM.VtblCall (5, getAddress (), sender); } -public int canGoBack (int /*long*/ sender, int[] result) { +public int canGoBack (long /*int*/ sender, int[] result) { return COM.VtblCall (6, getAddress (), sender, result); } -public int canGoForward (int /*long*/ sender, int[] result) { +public int canGoForward (long /*int*/ sender, int[] result) { return COM.VtblCall (8, getAddress (), sender, result); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebMutableURLRequest.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebMutableURLRequest.java index 6fb7512916..6961d82c5b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebMutableURLRequest.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebMutableURLRequest.java @@ -15,15 +15,15 @@ import org.eclipse.swt.internal.ole.win32.*; public class IWebMutableURLRequest extends IWebURLRequest { -public IWebMutableURLRequest (int /*long*/ address) { +public IWebMutableURLRequest (long /*int*/ address) { super (address); } -//public int setHTTPBody (int /*long*/ data) { +//public int setHTTPBody (long /*int*/ data) { // return COM.VtblCall (21, getAddress (), data); //} -//public int setHTTPBodyStream (int /*long*/ data) { +//public int setHTTPBodyStream (long /*int*/ data) { // return COM.VtblCall (22, getAddress (), data); //} @@ -31,11 +31,11 @@ public int setHTTPMethod (int post) { return COM.VtblCall (23, getAddress (), post); } -public int setURL (int /*long*/ theUrl) { +public int setURL (long /*int*/ theUrl) { return COM.VtblCall (27, getAddress (), theUrl); } -public int setValue (int /*long*/ value, int /*long*/ field) { +public int setValue (long /*int*/ value, long /*int*/ field) { return COM.VtblCall (28, getAddress (), value, field); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebMutableURLRequestPrivate.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebMutableURLRequestPrivate.java index 802f713f96..92a1ec92f5 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebMutableURLRequestPrivate.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebMutableURLRequestPrivate.java @@ -15,11 +15,11 @@ import org.eclipse.swt.internal.ole.win32.*; public class IWebMutableURLRequestPrivate extends IUnknown { -public IWebMutableURLRequestPrivate (int /*long*/ address) { +public IWebMutableURLRequestPrivate (long /*int*/ address) { super (address); } -//public int setClientCertificate (int /*long*/ cert) { +//public int setClientCertificate (long /*int*/ cert) { //return COM.VtblCall (3, getAddress (), cert); //} diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebOpenPanelResultListener.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebOpenPanelResultListener.java index 9a36db3b00..261296426e 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebOpenPanelResultListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebOpenPanelResultListener.java @@ -14,11 +14,11 @@ import org.eclipse.swt.internal.ole.win32.*; public class IWebOpenPanelResultListener extends IUnknown { -public IWebOpenPanelResultListener (int /*long*/ address) { +public IWebOpenPanelResultListener (long /*int*/ address) { super (address); } -public int chooseFilename (int /*long*/ fileName) { +public int chooseFilename (long /*int*/ fileName) { return COM.VtblCall (3, getAddress (), fileName); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebPolicyDecisionListener.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebPolicyDecisionListener.java index e7e2116778..c1019a71d5 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebPolicyDecisionListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebPolicyDecisionListener.java @@ -15,7 +15,7 @@ import org.eclipse.swt.internal.ole.win32.*; public class IWebPolicyDecisionListener extends IUnknown{ -public IWebPolicyDecisionListener (int /*long*/ address) { +public IWebPolicyDecisionListener (long /*int*/ address) { super (address); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebPreferences.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebPreferences.java index ad45d3cf6e..c8b72a9dd0 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebPreferences.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebPreferences.java @@ -15,11 +15,11 @@ import org.eclipse.swt.internal.ole.win32.*; public class IWebPreferences extends IUnknown { -public IWebPreferences (int /*long*/ address) { +public IWebPreferences (long /*int*/ address) { super (address); } -public int initWithIdentifier (int /*long*/ identifier, int /*long*/[] preferences) { +public int initWithIdentifier (long /*int*/ identifier, long /*int*/[] preferences) { return COM.VtblCall (4, getAddress (), identifier, preferences); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLAuthenticationChallenge.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLAuthenticationChallenge.java index 0108468d45..69045ded2d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLAuthenticationChallenge.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLAuthenticationChallenge.java @@ -15,7 +15,7 @@ import org.eclipse.swt.internal.ole.win32.*; public class IWebURLAuthenticationChallenge extends IUnknown { -public IWebURLAuthenticationChallenge (int /*long*/ address) { +public IWebURLAuthenticationChallenge (long /*int*/ address) { super (address); } @@ -23,15 +23,15 @@ public int previousFailureCount (int[] result) { return COM.VtblCall (7, getAddress (), result); } -public int proposedCredential (int /*long*/[] result) { +public int proposedCredential (long /*int*/[] result) { return COM.VtblCall (8, getAddress (), result); } -public int protectionSpace (int /*long*/[] result) { +public int protectionSpace (long /*int*/[] result) { return COM.VtblCall (9, getAddress (), result); } -public int sender (int /*long*/[] sender) { +public int sender (long /*int*/[] sender) { return COM.VtblCall (10, getAddress (), sender); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLAuthenticationChallengeSender.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLAuthenticationChallengeSender.java index c5185b57f0..69339424db 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLAuthenticationChallengeSender.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLAuthenticationChallengeSender.java @@ -15,15 +15,15 @@ import org.eclipse.swt.internal.ole.win32.*; public class IWebURLAuthenticationChallengeSender extends IUnknown { -public IWebURLAuthenticationChallengeSender (int /*long*/ address) { +public IWebURLAuthenticationChallengeSender (long /*int*/ address) { super (address); } -public int cancelAuthenticationChallenge (int /*long*/ challenge) { +public int cancelAuthenticationChallenge (long /*int*/ challenge) { return COM.VtblCall (3, getAddress (), challenge); } -public int useCredential (int /*long*/ credential, int /*long*/ challenge) { +public int useCredential (long /*int*/ credential, long /*int*/ challenge) { return COM.VtblCall (5, getAddress (), credential, challenge); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLCredential.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLCredential.java index d2979c50e7..cfb5a2fbf2 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLCredential.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLCredential.java @@ -15,7 +15,7 @@ import org.eclipse.swt.internal.ole.win32.*; public class IWebURLCredential extends IUnknown { -public IWebURLCredential (int /*long*/ address) { +public IWebURLCredential (long /*int*/ address) { super (address); } @@ -23,15 +23,15 @@ public int hasPassword (int[] result) { return COM.VtblCall (3, getAddress (), result); } -public int initWithUser (int /*long*/ user, int /*long*/ password, int /*long*/ persistence) { +public int initWithUser (long /*int*/ user, long /*int*/ password, long /*int*/ persistence) { return COM.VtblCall (4, getAddress (), user, password, persistence); } -public int password (int /*long*/[] password) { +public int password (long /*int*/[] password) { return COM.VtblCall (5, getAddress (), password); } -public int user (int /*long*/[] result) { +public int user (long /*int*/[] result) { return COM.VtblCall (7, getAddress (), result); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLProtectionSpace.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLProtectionSpace.java index c802d16e9f..297a53fee3 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLProtectionSpace.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLProtectionSpace.java @@ -15,11 +15,11 @@ import org.eclipse.swt.internal.ole.win32.*; public class IWebURLProtectionSpace extends IUnknown { -public IWebURLProtectionSpace(int /*long*/ address) { +public IWebURLProtectionSpace(long /*int*/ address) { super(address); } -public int host (int /*long*/[] result) { +public int host (long /*int*/[] result) { return COM.VtblCall (4, getAddress (), result); } @@ -27,7 +27,7 @@ public int port (int[] result) { return COM.VtblCall (8, getAddress (), result); } -public int realm (int /*long*/[] result) { +public int realm (long /*int*/[] result) { return COM.VtblCall (11, getAddress (), result); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLRequest.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLRequest.java index 11eee695ea..6e14ff0bcc 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLRequest.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLRequest.java @@ -15,23 +15,23 @@ import org.eclipse.swt.internal.ole.win32.*; public class IWebURLRequest extends IUnknown { -public IWebURLRequest (int /*long*/ address) { +public IWebURLRequest (long /*int*/ address) { super (address); } -//public int HTTPBody (int /*long*/[] result) { +//public int HTTPBody (long /*int*/[] result) { // return COM.VtblCall (6, getAddress (), result); //} -public int HTTPMethod (int /*long*/[] result) { +public int HTTPMethod (long /*int*/[] result) { return COM.VtblCall (8, getAddress (), result); } -public int URL (int /*long*/[] result) { +public int URL (long /*int*/[] result) { return COM.VtblCall (13, getAddress (), result); } -public int mutableCopy (int /*long*/[] result) { +public int mutableCopy (long /*int*/[] result) { return COM.VtblCall (16, getAddress (), result); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLResponse.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLResponse.java index 85650589df..f0a9e84608 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLResponse.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLResponse.java @@ -15,7 +15,7 @@ import org.eclipse.swt.internal.ole.win32.*; public class IWebURLResponse extends IUnknown { -public IWebURLResponse (int /*long*/ address) { +public IWebURLResponse (long /*int*/ address) { super (address); } @@ -23,7 +23,7 @@ public int expectedContentLength (long[] result) { return COM.VtblCall (3, getAddress (), result); } -public int URL (int /*long*/[] result) { +public int URL (long /*int*/[] result) { return COM.VtblCall (8, getAddress (), result); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebView.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebView.java index efbc5d3a65..70d9d44d7a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebView.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebView.java @@ -16,39 +16,39 @@ import org.eclipse.swt.internal.win32.*; public class IWebView extends IUnknown { -public IWebView (int /*long*/ address) { +public IWebView (long /*int*/ address) { super (address); } -public int canShowMIMEType (int /*long*/ mimeType, int[] canShow) { +public int canShowMIMEType (long /*int*/ mimeType, int[] canShow) { return COM.VtblCall (3, getAddress (), mimeType, canShow); } -public int initWithFrame (RECT frame, int /*long*/ frameName, int /*long*/ groupName) { +public int initWithFrame (RECT frame, long /*int*/ frameName, long /*int*/ groupName) { return COM.VtblCall (9, getAddress(), frame, frameName, groupName); } -public int setUIDelegate (int /*long*/ delegate) { +public int setUIDelegate (long /*int*/ delegate) { return COM.VtblCall (10, getAddress (), delegate); } -public int setResourceLoadDelegate (int /*long*/ delegate) { +public int setResourceLoadDelegate (long /*int*/ delegate) { return COM.VtblCall (12, getAddress (), delegate); } -public int setDownloadDelegate (int /*long*/ delegate) { +public int setDownloadDelegate (long /*int*/ delegate) { return COM.VtblCall (14, getAddress (), delegate); } -public int setFrameLoadDelegate (int /*long*/ delegate) { +public int setFrameLoadDelegate (long /*int*/ delegate) { return COM.VtblCall (16, getAddress (), delegate); } -public int setPolicyDelegate (int /*long*/ delegate) { +public int setPolicyDelegate (long /*int*/ delegate) { return COM.VtblCall (18, getAddress (), delegate); } -public int mainFrame (int /*long*/[] frame) { +public int mainFrame (long /*int*/[] frame) { return COM.VtblCall (20, getAddress (), frame); } @@ -60,27 +60,27 @@ public int goForward (int[] succeeded) { return COM.VtblCall (25, getAddress(), succeeded); } -public int setCustomUserAgent (int /*long*/ valueString) { +public int setCustomUserAgent (long /*int*/ valueString) { return COM.VtblCall (31, getAddress (), valueString); } -public int setPreferences (int /*long*/ prefs) { +public int setPreferences (long /*int*/ prefs) { return COM.VtblCall (41, getAddress (), prefs); } -public int preferences (int /*long*/[] prefs) { +public int preferences (long /*int*/[] prefs) { return COM.VtblCall (42, getAddress (), prefs); } -public int setHostWindow (int /*long*/ window) { +public int setHostWindow (long /*int*/ window) { return COM.VtblCall (45, getAddress (), window); } -public int hostWindow (int /*long*/[] window) { +public int hostWindow (long /*int*/[] window) { return COM.VtblCall (46, getAddress (), window); } -public int estimatedProgress (int /*long*/ estimatedProgress) { +public int estimatedProgress (long /*int*/ estimatedProgress) { return COM.VtblCall (51, getAddress (), estimatedProgress); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebViewPrivate.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebViewPrivate.java index 3fe02eae3b..506f495209 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebViewPrivate.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebViewPrivate.java @@ -15,11 +15,11 @@ import org.eclipse.swt.internal.ole.win32.*; public class IWebViewPrivate extends IUnknown { -public IWebViewPrivate (int /*long*/ address) { +public IWebViewPrivate (long /*int*/ address) { super (address); } -public int viewWindow (int /*long*/[] window) { +public int viewWindow (long /*int*/[] window) { return COM.VtblCall (5, getAddress (), window); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/JSClassDefinition.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/JSClassDefinition.java index 86b3f63277..c1cba5e12f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/JSClassDefinition.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/JSClassDefinition.java @@ -17,35 +17,35 @@ public class JSClassDefinition { /** @field cast=(JSClassAttributes) */ public int attributes; /** @field cast=(const char*) */ - public int /*long*/ className; + public long /*int*/ className; /** @field cast=(JSClassRef) */ - public int /*long*/ parentClass; + public long /*int*/ parentClass; /** @field cast=(const JSStaticValue*) */ - public int /*long*/ staticValues; + public long /*int*/ staticValues; /** @field cast=(const JSStaticFunction*) */ - public int /*long*/ staticFunctions; + public long /*int*/ staticFunctions; /** @field cast=(JSObjectInitializeCallback) */ - public int /*long*/ initialize; + public long /*int*/ initialize; /** @field cast=(JSObjectFinalizeCallback) */ - public int /*long*/ finalize; + public long /*int*/ finalize; /** @field cast=(JSObjectHasPropertyCallback) */ - public int /*long*/ hasProperty; + public long /*int*/ hasProperty; /** @field cast=(JSObjectGetPropertyCallback) */ - public int /*long*/ getProperty; + public long /*int*/ getProperty; /** @field cast=(JSObjectSetPropertyCallback) */ - public int /*long*/ setProperty; + public long /*int*/ setProperty; /** @field cast=(JSObjectDeletePropertyCallback) */ - public int /*long*/ deleteProperty; + public long /*int*/ deleteProperty; /** @field cast=(JSObjectGetPropertyNamesCallback) */ - public int /*long*/ getPropertyNames; + public long /*int*/ getPropertyNames; /** @field cast=(JSObjectCallAsFunctionCallback) */ - public int /*long*/ callAsFunction; + public long /*int*/ callAsFunction; /** @field cast=(JSObjectCallAsConstructorCallback) */ - public int /*long*/ callAsConstructor; + public long /*int*/ callAsConstructor; /** @field cast=(JSObjectHasInstanceCallback) */ - public int /*long*/ hasInstance; + public long /*int*/ hasInstance; /** @field cast=(JSObjectConvertToTypeCallback) */ - public int /*long*/ convertToType; + public long /*int*/ convertToType; public static final int sizeof = WebKit_win32.JSClassDefinition_sizeof(); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/WebKit_win32.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/WebKit_win32.java index f9e9011187..fd42ae0ef4 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/WebKit_win32.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/WebKit_win32.java @@ -68,26 +68,26 @@ static GUID IIDFromString (String lpsz) { /** * @param theArray cast=(CFArrayRef) */ -public static final native int CFArrayGetCount (int /*long*/ theArray); +public static final native int CFArrayGetCount (long /*int*/ theArray); /** * @param theArray cast=(CFArrayRef) * @param idx cast=(CFIndex) */ -public static final native int /*long*/ CFArrayGetValueAtIndex (int /*long*/ theArray, int idx); +public static final native long /*int*/ CFArrayGetValueAtIndex (long /*int*/ theArray, int idx); /** * @param allocator cast=(CFAllocatorRef) * @param bytes cast=(const UInt8 *) * @param length cast=(CFIndex) */ -public static final native int /*long*/ CFDataCreate (int /*long*/ allocator, byte [] bytes, int length); +public static final native long /*int*/ CFDataCreate (long /*int*/ allocator, byte [] bytes, int length); /** * @param theData cast=(CFDataRef) */ -public static final native int /*long*/ CFDataGetBytePtr (int /*long*/ theData); +public static final native long /*int*/ CFDataGetBytePtr (long /*int*/ theData); /** * @param theData cast=(CFDataRef) */ -public static final native int CFDataGetLength (int /*long*/ theData); +public static final native int CFDataGetLength (long /*int*/ theData); /** * @param allocator cast=(CFAllocatorRef) * @param keys cast=(const void **) @@ -96,106 +96,106 @@ public static final native int CFDataGetLength (int /*long*/ theData); * @param keyCallBacks cast=(const CFDictionaryKeyCallBacks *) * @param valueCallBacks cast=(const CFDictionaryValueCallBacks *) */ -public static final native int /*long*/ CFDictionaryCreate (int /*long*/ allocator, int /*long*/[] keys, int /*long*/[] values, int numValues, int /*long*/ keyCallBacks, int /*long*/ valueCallBacks); +public static final native long /*int*/ CFDictionaryCreate (long /*int*/ allocator, long /*int*/[] keys, long /*int*/[] values, int numValues, long /*int*/ keyCallBacks, long /*int*/ valueCallBacks); /** * @param inAllocator cast=(CFAllocatorRef) * @param headerFields cast=(CFDictionaryRef) * @param inURL cast=(CFURLRef) */ -public static final native int /*long*/ CFHTTPCookieCreateWithResponseHeaderFields (int /*long*/ inAllocator, int /*long*/ headerFields, int /*long*/ inURL); +public static final native long /*int*/ CFHTTPCookieCreateWithResponseHeaderFields (long /*int*/ inAllocator, long /*int*/ headerFields, long /*int*/ inURL); /** * @param inCookie cast=(CFHTTPCookieRef) */ -public static final native int CFHTTPCookieGetFlags (int /*long*/ inCookie); +public static final native int CFHTTPCookieGetFlags (long /*int*/ inCookie); /** * @param inCookie cast=(CFHTTPCookieRef) */ -public static final native int /*long*/ CFHTTPCookieGetName (int /*long*/ inCookie); +public static final native long /*int*/ CFHTTPCookieGetName (long /*int*/ inCookie); /** * @param inCookie cast=(CFHTTPCookieRef) */ -public static final native int /*long*/ CFHTTPCookieGetValue (int /*long*/ inCookie); +public static final native long /*int*/ CFHTTPCookieGetValue (long /*int*/ inCookie); /** * @param inCookieStorage cast=(CFHTTPCookieStorageRef) */ -public static final native int /*long*/ CFHTTPCookieStorageCopyCookies (int /*long*/ inCookieStorage); +public static final native long /*int*/ CFHTTPCookieStorageCopyCookies (long /*int*/ inCookieStorage); /** * @param inCookieStorage cast=(CFHTTPCookieStorageRef) * @param inURL cast=(CFURLRef) * @param sendSecureCookies cast=(Boolean) */ -public static final native int /*long*/ CFHTTPCookieStorageCopyCookiesForURL (int /*long*/ inCookieStorage, int /*long*/ inURL, boolean sendSecureCookies); +public static final native long /*int*/ CFHTTPCookieStorageCopyCookiesForURL (long /*int*/ inCookieStorage, long /*int*/ inURL, boolean sendSecureCookies); /** * @param inCookieStorage cast=(CFHTTPCookieStorageRef) * @param inCookie cast=(CFHTTPCookieRef) */ -public static final native void CFHTTPCookieStorageDeleteCookie (int /*long*/ inCookieStorage, int /*long*/ inCookie); +public static final native void CFHTTPCookieStorageDeleteCookie (long /*int*/ inCookieStorage, long /*int*/ inCookie); /** * @param inCookieStorage cast=(CFHTTPCookieStorageRef) * @param inCookie cast=(CFHTTPCookieRef) */ -public static final native void CFHTTPCookieStorageSetCookie (int /*long*/ inCookieStorage, int /*long*/ inCookie); +public static final native void CFHTTPCookieStorageSetCookie (long /*int*/ inCookieStorage, long /*int*/ inCookie); /** * @param cf cast=(CFTypeRef) */ -public static final native void CFRelease (int /*long*/ cf); +public static final native void CFRelease (long /*int*/ cf); /** * @param alloc cast=(CFAllocatorRef) * @param chars cast=(const UniChar *) * @param numChars cast=(CFIndex) */ -public static final native int CFStringCreateWithCharacters (int /*long*/ alloc, char[] chars, int numChars); +public static final native int CFStringCreateWithCharacters (long /*int*/ alloc, char[] chars, int numChars); /** * @param theString cast=(CFStringRef) * @param idx cast=(CFIndex) */ -public static final native char CFStringGetCharacterAtIndex (int /*long*/ theString, int idx); +public static final native char CFStringGetCharacterAtIndex (long /*int*/ theString, int idx); /** * @param theString cast=(CFStringRef) */ -public static final native int /*long*/ CFStringGetCharactersPtr (int /*long*/ theString); +public static final native long /*int*/ CFStringGetCharactersPtr (long /*int*/ theString); /** * @param theString cast=(CFStringRef) */ -public static final native int CFStringGetLength (int /*long*/ theString); +public static final native int CFStringGetLength (long /*int*/ theString); /** * @param allocator cast=(CFAllocatorRef) * @param URLString cast=(CFStringRef) * @param baseURL cast=(CFURLRef) */ -public static final native int /*long*/ CFURLCreateWithString (int /*long*/ allocator, int /*long*/ URLString, int /*long*/ baseURL); +public static final native long /*int*/ CFURLCreateWithString (long /*int*/ allocator, long /*int*/ URLString, long /*int*/ baseURL); /** * @param alloc cast=(CFAllocatorRef) * @param origRequest cast=(CFURLRequestRef) */ -public static final native int /*long*/ CFURLRequestCreateMutableCopy (int /*long*/ alloc, int /*long*/ origRequest); +public static final native long /*int*/ CFURLRequestCreateMutableCopy (long /*int*/ alloc, long /*int*/ origRequest); /** * @param request cast=(CFURLRequestRef) */ -public static final native int /*long*/ CFURLRequestCopyHTTPRequestBody (int /*long*/ request); +public static final native long /*int*/ CFURLRequestCopyHTTPRequestBody (long /*int*/ request); /** * @param mutableHTTPRequest cast=(CFMutableURLRequestRef) * @param httpBody cast=(CFDataRef) */ -public static final native void CFURLRequestSetHTTPRequestBody (int /*long*/ mutableHTTPRequest, int /*long*/ httpBody); +public static final native void CFURLRequestSetHTTPRequestBody (long /*int*/ mutableHTTPRequest, long /*int*/ httpBody); /** * @param mutableRequest cast=(CFMutableURLRequestRef) * @param url cast=(CFURLRef) */ -public static final native void CFURLRequestSetURL (int /*long*/ mutableRequest, int /*long*/ url); +public static final native void CFURLRequestSetURL (long /*int*/ mutableRequest, long /*int*/ url); /** * @param definition cast=(const JSClassDefinition*) */ -public static final native int /*long*/ JSClassCreate (int /*long*/ definition); +public static final native long /*int*/ JSClassCreate (long /*int*/ definition); /** * @param jsClass cast=(JSClassRef) */ -public static final native int /*long*/ JSClassRetain (int /*long*/ jsClass); +public static final native long /*int*/ JSClassRetain (long /*int*/ jsClass); /** * @param ctx cast=(JSContextRef) */ -public static final native int /*long*/ JSContextGetGlobalObject (int /*long*/ ctx); +public static final native long /*int*/ JSContextGetGlobalObject (long /*int*/ ctx); /** * @param ctx cast=(JSContextRef) * @param script cast=(JSStringRef) @@ -203,48 +203,48 @@ public static final native int /*long*/ JSContextGetGlobalObject (int /*long*/ c * @param sourceURL cast=(JSStringRef) * @param exception cast=(JSValueRef *) */ -public static final native int /*long*/ JSEvaluateScript (int /*long*/ ctx, int /*long*/ script, int /*long*/ thisObject, int /*long*/ sourceURL, int startingLineNumber, int /*long*/[] exception); +public static final native long /*int*/ JSEvaluateScript (long /*int*/ ctx, long /*int*/ script, long /*int*/ thisObject, long /*int*/ sourceURL, int startingLineNumber, long /*int*/[] exception); /** * @param ctx cast=(JSGlobalContextRef) */ -public static final native int JSGlobalContextRetain (int /*long*/ ctx); +public static final native int JSGlobalContextRetain (long /*int*/ ctx); /** * @param object cast=(JSObjectRef) */ -public static final native int /*long*/ JSObjectGetPrivate (int /*long*/ object); +public static final native long /*int*/ JSObjectGetPrivate (long /*int*/ object); /** * @param ctx cast=(JSContextRef) * @param object cast=(JSObjectRef) * @param propertyName cast=(JSStringRef) * @param exception cast=(JSValueRef*) */ -public static final native int /*long*/ JSObjectGetProperty (int /*long*/ ctx, int /*long*/ object, int /*long*/ propertyName, int /*long*/[] exception); +public static final native long /*int*/ JSObjectGetProperty (long /*int*/ ctx, long /*int*/ object, long /*int*/ propertyName, long /*int*/[] exception); /** * @param ctx cast=(JSContextRef) * @param object cast=(JSObjectRef) * @param propertyIndex cast=(unsigned) * @param exception cast=(JSValueRef*) */ -public static final native int /*long*/ JSObjectGetPropertyAtIndex (int /*long*/ ctx, int /*long*/ object, int propertyIndex, int /*long*/[] exception); +public static final native long /*int*/ JSObjectGetPropertyAtIndex (long /*int*/ ctx, long /*int*/ object, int propertyIndex, long /*int*/[] exception); /** * @param ctx cast=(JSContextRef) * @param jsClass cast=(JSClassRef) * @param data cast=(void *) */ -public static final native int JSObjectMake (int /*long*/ ctx, int /*long*/ jsClass, int /*long*/ data); +public static final native int JSObjectMake (long /*int*/ ctx, long /*int*/ jsClass, long /*int*/ data); /** * @param ctx cast=(JSContextRef) * @param argumentCount cast=(size_t) * @param arguments cast=(const struct OpaqueJSValue * const*) * @param exception cast=(JSValueRef*) */ -public static final native int /*long*/ JSObjectMakeArray (int /*long*/ ctx, int /*long*/ argumentCount, int /*long*/[] arguments, int /*long*/[] exception); +public static final native long /*int*/ JSObjectMakeArray (long /*int*/ ctx, long /*int*/ argumentCount, long /*int*/[] arguments, long /*int*/[] exception); /** * @param ctx cast=(JSContextRef) * @param name cast=(JSStringRef) * @param callAsFunction cast=(JSObjectCallAsFunctionCallback) */ -public static final native int JSObjectMakeFunctionWithCallback (int /*long*/ ctx, int /*long*/ name, int /*long*/ callAsFunction); +public static final native int JSObjectMakeFunctionWithCallback (long /*int*/ ctx, long /*int*/ name, long /*int*/ callAsFunction); /** * @param ctx cast=(JSContextRef) * @param object cast=(JSObjectRef) @@ -253,84 +253,84 @@ public static final native int JSObjectMakeFunctionWithCallback (int /*long*/ ct * @param attributes cast=(JSPropertyAttributes) * @param exception cast=(JSValueRef *) */ -public static final native void JSObjectSetProperty (int /*long*/ ctx, int /*long*/ object, int /*long*/ propertyName, int /*long*/ value, int /*long*/ attributes, int /*long*/[] exception); +public static final native void JSObjectSetProperty (long /*int*/ ctx, long /*int*/ object, long /*int*/ propertyName, long /*int*/ value, long /*int*/ attributes, long /*int*/[] exception); /** * @param string cast=(const char*) */ -public static final native int /*long*/ JSStringCreateWithUTF8CString (byte[] string); +public static final native long /*int*/ JSStringCreateWithUTF8CString (byte[] string); /** * @param string cast=(JSStringRef) */ -public static final native int JSStringGetLength (int /*long*/ string); +public static final native int JSStringGetLength (long /*int*/ string); /** * @param string cast=(JSStringRef) */ -public static final native int /*long*/ JSStringGetMaximumUTF8CStringSize (int /*long*/ string); +public static final native long /*int*/ JSStringGetMaximumUTF8CStringSize (long /*int*/ string); /** * @param string cast=(JSStringRef) * @param buffer cast=(char *) * @param bufferSize cast=(size_t) */ -public static final native int JSStringGetUTF8CString (int /*long*/ string, byte[] buffer, int /*long*/ bufferSize); +public static final native int JSStringGetUTF8CString (long /*int*/ string, byte[] buffer, long /*int*/ bufferSize); /** * @param a cast=(JSStringRef) * @param b cast=(const char *) */ -public static final native int JSStringIsEqualToUTF8CString (int /*long*/ a, byte[] b); +public static final native int JSStringIsEqualToUTF8CString (long /*int*/ a, byte[] b); /** * @param string cast=(JSStringRef) */ -public static final native void JSStringRelease (int /*long*/ string); +public static final native void JSStringRelease (long /*int*/ string); /** * @param ctx cast=(JSContextRef) * @param value cast=(JSValueRef) */ -public static final native int JSValueGetType (int /*long*/ ctx, int /*long*/ value); +public static final native int JSValueGetType (long /*int*/ ctx, long /*int*/ value); /** * @param ctx cast=(JSContextRef) * @param value cast=(JSValueRef) * @param jsClass cast=(JSClassRef) */ -public static final native int JSValueIsObjectOfClass (int /*long*/ ctx, int /*long*/ value, int /*long*/ jsClass); +public static final native int JSValueIsObjectOfClass (long /*int*/ ctx, long /*int*/ value, long /*int*/ jsClass); /** * @param ctx cast=(JSContextRef) * @param b cast=(bool) */ -public static final native int /*long*/ JSValueMakeBoolean (int /*long*/ ctx, int /*long*/ b); +public static final native long /*int*/ JSValueMakeBoolean (long /*int*/ ctx, long /*int*/ b); /** * @param ctx cast=(JSContextRef) */ -public static final native int /*long*/ JSValueMakeNull (int /*long*/ ctx); +public static final native long /*int*/ JSValueMakeNull (long /*int*/ ctx); /** * @param ctx cast=(JSContextRef) * @param number cast=(double) */ -public static final native int /*long*/ JSValueMakeNumber (int /*long*/ ctx, double number); +public static final native long /*int*/ JSValueMakeNumber (long /*int*/ ctx, double number); /** * @param ctx cast=(JSContextRef) * @param string cast=(JSStringRef) */ -public static final native int /*long*/ JSValueMakeString (int /*long*/ ctx, int /*long*/ string); +public static final native long /*int*/ JSValueMakeString (long /*int*/ ctx, long /*int*/ string); /** * @param ctx cast=(JSContextRef) */ -public static final native int /*long*/ JSValueMakeUndefined (int /*long*/ ctx); +public static final native long /*int*/ JSValueMakeUndefined (long /*int*/ ctx); /** * @param ctx cast=(JSContextRef) * @param value cast=(JSValueRef) * @param exception cast=(JSValueRef*) */ -public static final native double JSValueToNumber (int /*long*/ ctx, int /*long*/ value, int /*long*/[] exception); +public static final native double JSValueToNumber (long /*int*/ ctx, long /*int*/ value, long /*int*/[] exception); /** * @param ctx cast=(JSContextRef) * @param value cast=(JSValueRef) * @param exception cast=(JSValueRef*) */ -public static final native int /*long*/ JSValueToStringCopy (int /*long*/ ctx, int /*long*/ value, int /*long*/[] exception); +public static final native long /*int*/ JSValueToStringCopy (long /*int*/ ctx, long /*int*/ value, long /*int*/[] exception); /** @method flags=const address*/ -public static final native int /*long*/ kCFCopyStringDictionaryKeyCallBacks (); +public static final native long /*int*/ kCFCopyStringDictionaryKeyCallBacks (); /** @method flags=const address*/ -public static final native int /*long*/ kCFTypeDictionaryValueCallBacks (); +public static final native long /*int*/ kCFTypeDictionaryValueCallBacks (); public static final native int JSClassDefinition_sizeof (); /** @@ -338,10 +338,10 @@ public static final native int JSClassDefinition_sizeof (); * @param src cast=(const void *),flags=no_out * @param size cast=(size_t) */ -public static final native void memmove (int /*long*/ dest, JSClassDefinition src, int /*long*/ size); +public static final native void memmove (long /*int*/ dest, JSClassDefinition src, long /*int*/ size); /** @method flags=no_gen */ -public static final native int WebKitCreateInstance (byte[] rclsid, int /*long*/ pUnkOuter, byte[] refiid, int /*long*/[] ppvObject); -public static final int WebKitCreateInstance (GUID clsid, int /*long*/ pUnkOuter, GUID iid, int /*long*/[] ppvObject) { +public static final native int WebKitCreateInstance (byte[] rclsid, long /*int*/ pUnkOuter, byte[] refiid, long /*int*/[] ppvObject); +public static final int WebKitCreateInstance (GUID clsid, long /*int*/ pUnkOuter, GUID iid, long /*int*/[] ppvObject) { byte[] rclsid = new byte[GUID.sizeof]; OS.IIDFromString ((clsid.toString () + '\0').toCharArray (), rclsid); byte[] refiid = new byte[GUID.sizeof]; @@ -350,12 +350,12 @@ public static final int WebKitCreateInstance (GUID clsid, int /*long*/ pUnkOuter } /** @method flags=no_gen */ -public static final native int /*long*/ JSObjectCallAsFunctionProc_CALLBACK (int /*long*/ func); +public static final native long /*int*/ JSObjectCallAsFunctionProc_CALLBACK (long /*int*/ func); /** @method flags=no_gen */ -public static final native int /*long*/ JSObjectGetPropertyProc_CALLBACK (int /*long*/ func); +public static final native long /*int*/ JSObjectGetPropertyProc_CALLBACK (long /*int*/ func); /** @method flags=no_gen */ -public static final native int /*long*/ JSObjectHasPropertyProc_CALLBACK (int /*long*/ func); +public static final native long /*int*/ JSObjectHasPropertyProc_CALLBACK (long /*int*/ func); /** @method flags=no_gen */ -public static final native int /*long*/ willPerformClientRedirectToURL_CALLBACK (int /*long*/ func); +public static final native long /*int*/ willPerformClientRedirectToURL_CALLBACK (long /*int*/ func); } |