Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSilenio Quarti2012-09-24 18:45:57 +0000
committerSilenio Quarti2012-09-24 18:45:57 +0000
commit5721cfd149c1026b4c21848f64c2b57027ac8c7e (patch)
treeb16600bca597a4a0dc9d27194d5761c53151a395 /bundles/org.eclipse.swt/Eclipse SWT WebKit
parentbc8036435837353efa5da8c19b6a3003dbb86045 (diff)
downloadeclipse.platform.swt-5721cfd149c1026b4c21848f64c2b57027ac8c7e.tar.gz
eclipse.platform.swt-5721cfd149c1026b4c21848f64c2b57027ac8c7e.tar.xz
eclipse.platform.swt-5721cfd149c1026b4c21848f64c2b57027ac8c7e.zip
Make 64-bit the default source code
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT WebKit')
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/carbon/org/eclipse/swt/browser/WebKit.java6
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/cocoa/org/eclipse/swt/browser/WebKit.java148
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java258
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/JSClassDefinition.java30
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java434
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebDownloadDelegate.java58
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebFrameLoadDelegate.java100
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebKit.java160
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebPolicyDelegate.java36
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebResourceLoadDelegate.java64
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebUIDelegate.java204
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebCookieManager.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDataSource.java10
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDocumentRepresentation.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDownload.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebError.java12
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebErrorPrivate.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebFrame.java10
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebFramePrivate.java8
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebIBActions.java10
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebMutableURLRequest.java10
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebMutableURLRequestPrivate.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebOpenPanelResultListener.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebPolicyDecisionListener.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebPreferences.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLAuthenticationChallenge.java8
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLAuthenticationChallengeSender.java6
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLCredential.java8
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLProtectionSpace.java6
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLRequest.java10
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLResponse.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebView.java30
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebViewPrivate.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/JSClassDefinition.java30
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/WebKit_win32.java120
35 files changed, 907 insertions, 907 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/carbon/org/eclipse/swt/browser/WebKit.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/carbon/org/eclipse/swt/browser/WebKit.java
index 1b01974b06..5035107e27 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/carbon/org/eclipse/swt/browser/WebKit.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/carbon/org/eclipse/swt/browser/WebKit.java
@@ -1020,7 +1020,7 @@ void createPanelDidEnd(int sheet, int returnCode, int contextInfo) {
Cocoa.objc_msgSend(contextInfo, Cocoa.S_autorelease);
if (returnCode != Cocoa.NSFileHandlingPanelOKButton) return; /* nothing more to do */
- int /*long*/ method = Cocoa.class_getClassMethod(Cocoa.C_NSURLRequest, Cocoa.S_setAllowsAnyHTTPSCertificate);
+ long /*int*/ method = Cocoa.class_getClassMethod(Cocoa.C_NSURLRequest, Cocoa.S_setAllowsAnyHTTPSCertificate);
if (method != 0) {
int host = Cocoa.objc_msgSend(contextInfo, Cocoa.S_host);
int urlString = Cocoa.objc_msgSend(contextInfo, Cocoa.S_absoluteString);
@@ -1621,7 +1621,7 @@ void webViewFocus() {
void webViewUnfocus() {
}
-int callRunBeforeUnloadConfirmPanelWithMessage(int /*long*/ messageID, int /*long*/ arg) {
+int callRunBeforeUnloadConfirmPanelWithMessage(long /*int*/ messageID, long /*int*/ arg) {
int result = runBeforeUnloadConfirmPanelWithMessage (messageID, 0);
return Cocoa.objc_msgSend (Cocoa.C_NSNumber, Cocoa.S_numberWithBool, result);
}
@@ -2165,7 +2165,7 @@ int convertToJS (Object value) {
return 0;
}
-int /*long*/ callJava (int /*long*/ index, int /*long*/ token, int /*long*/ args, int /*long*/ arg1) {
+long /*int*/ callJava (long /*int*/ index, long /*int*/ token, long /*int*/ args, long /*int*/ arg1) {
Object returnValue = null;
if (Cocoa.objc_msgSend (index, Cocoa.S_isKindOfClass, Cocoa.C_NSNumber) != 0) {
int functionIndex = Cocoa.objc_msgSend (index, Cocoa.S_intValue);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/cocoa/org/eclipse/swt/browser/WebKit.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/cocoa/org/eclipse/swt/browser/WebKit.java
index 146416bdb4..212cc767ae 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/cocoa/org/eclipse/swt/browser/WebKit.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/cocoa/org/eclipse/swt/browser/WebKit.java
@@ -27,7 +27,7 @@ class WebKit extends WebBrowser {
boolean loadingText, untrustedText;
String lastHoveredLinkURL, lastNavigateURL;
String html;
- int /*long*/ identifier;
+ long /*int*/ identifier;
int resourceCount;
String url = ""; //$NON-NLS-1$
Point location;
@@ -37,7 +37,7 @@ class WebKit extends WebBrowser {
//TEMPORARY CODE
// boolean doit;
- static int /*long*/ delegateClass;
+ static long /*int*/ delegateClass;
static boolean Initialized;
// the following Callbacks are never freed
static Callback Callback3, Callback4, Callback5, Callback6, Callback7;
@@ -123,21 +123,21 @@ public void create (Composite parent, int style) {
if (delegateClass == 0) {
Class webKitClass = this.getClass();
Callback3 = new Callback(webKitClass, "browserProc", 3); //$NON-NLS-1$
- int /*long*/ proc3 = Callback3.getAddress();
+ long /*int*/ proc3 = Callback3.getAddress();
if (proc3 == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
Callback4 = new Callback(webKitClass, "browserProc", 4); //$NON-NLS-1$
- int /*long*/ proc4 = Callback4.getAddress();
+ long /*int*/ proc4 = Callback4.getAddress();
if (proc4 == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
Callback5 = new Callback(webKitClass, "browserProc", 5); //$NON-NLS-1$
- int /*long*/ proc5 = Callback5.getAddress();
+ long /*int*/ proc5 = Callback5.getAddress();
if (proc5 == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
Callback6 = new Callback(webKitClass, "browserProc", 6); //$NON-NLS-1$
- int /*long*/ proc6 = Callback6.getAddress();
+ long /*int*/ proc6 = Callback6.getAddress();
if (proc6 == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
Callback7 = new Callback(webKitClass, "browserProc", 7); //$NON-NLS-1$
- int /*long*/ proc7 = Callback7.getAddress();
+ long /*int*/ proc7 = Callback7.getAddress();
if (proc7 == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
- int /*long*/ setFrameProc = OS.CALLBACK_webView_setFrame_(proc4);
+ long /*int*/ setFrameProc = OS.CALLBACK_webView_setFrame_(proc4);
if (setFrameProc == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
String className = "SWTWebViewDelegate"; //$NON-NLS-1$
@@ -188,7 +188,7 @@ public void create (Composite parent, int style) {
OS.class_addMethod(delegateClass, OS.sel_createPanelDidEnd, proc5, "@:@@@"); //$NON-NLS-1$
OS.objc_registerClassPair(delegateClass);
- int /*long*/ metaClass = OS.objc_getMetaClass (className);
+ long /*int*/ metaClass = OS.objc_getMetaClass (className);
OS.class_addMethod(metaClass, OS.sel_isSelectorExcludedFromWebScript_, proc3, "@:@"); //$NON-NLS-1$
OS.class_addMethod(metaClass, OS.sel_webScriptNameForSelector_, proc3, "@:@"); //$NON-NLS-1$
}
@@ -288,7 +288,7 @@ public boolean back() {
return webView.goBack();
}
-static int /*long*/ browserProc(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0) {
+static long /*int*/ browserProc(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
if (id == delegateClass) {
if (sel == OS.sel_isSelectorExcludedFromWebScript_) {
return isSelectorExcludedFromWebScript (arg0) ? 1 : 0;
@@ -316,7 +316,7 @@ static int /*long*/ browserProc(int /*long*/ id, int /*long*/ sel, int /*long*/
return 0;
}
-static int /*long*/ browserProc(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1) {
+static long /*int*/ browserProc(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1) {
Display d = Display.getCurrent();
if (d == null || d.isDisposed()) return 0;
Widget widget = d.findWidget(id);
@@ -360,7 +360,7 @@ static int /*long*/ browserProc(int /*long*/ id, int /*long*/ sel, int /*long*/
return 0;
}
-static int /*long*/ browserProc(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2) {
+static long /*int*/ browserProc(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2) {
Display d = Display.getCurrent();
if (d == null || d.isDisposed()) return 0;
Widget widget = d.findWidget(id);
@@ -392,7 +392,7 @@ static int /*long*/ browserProc(int /*long*/ id, int /*long*/ sel, int /*long*/
return 0;
}
-static int /*long*/ browserProc(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3) {
+static long /*int*/ browserProc(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3) {
Display d = Display.getCurrent();
if (d == null || d.isDisposed()) return 0;
Widget widget = d.findWidget(id);
@@ -409,7 +409,7 @@ static int /*long*/ browserProc(int /*long*/ id, int /*long*/ sel, int /*long*/
return 0;
}
-static int /*long*/ browserProc(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ arg4) {
+static long /*int*/ browserProc(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ arg4) {
Display d = Display.getCurrent();
if (d == null || d.isDisposed()) return 0;
Widget widget = d.findWidget(id);
@@ -427,11 +427,11 @@ static int /*long*/ browserProc(int /*long*/ id, int /*long*/ sel, int /*long*/
return 0;
}
-static boolean isSelectorExcludedFromWebScript (int /*long*/ aSelector) {
+static boolean isSelectorExcludedFromWebScript (long /*int*/ aSelector) {
return !(aSelector == OS.sel_callJava || aSelector == OS.sel_callRunBeforeUnloadConfirmPanelWithMessage);
}
-static int /*long*/ webScriptNameForSelector (int /*long*/ aSelector) {
+static long /*int*/ webScriptNameForSelector (long /*int*/ aSelector) {
if (aSelector == OS.sel_callJava) {
return NSString.stringWith ("callJava").id; //$NON-NLS-1$
}
@@ -472,7 +472,7 @@ boolean close (boolean showPrompters) {
public boolean execute (String script) {
WebFrame frame = webView.mainFrame();
- int /*long*/ context = frame.globalContext();
+ long /*int*/ context = frame.globalContext();
byte[] bytes = null;
try {
@@ -480,16 +480,16 @@ public boolean execute (String script) {
} catch (UnsupportedEncodingException e) {
bytes = (script + '\0').getBytes();
}
- int /*long*/ scriptString = OS.JSStringCreateWithUTF8CString(bytes);
+ long /*int*/ scriptString = OS.JSStringCreateWithUTF8CString(bytes);
try {
bytes = (getUrl() + '\0').getBytes("UTF-8"); //$NON-NLS-1$
} catch (UnsupportedEncodingException e) {
bytes = (getUrl() + '\0').getBytes();
}
- int /*long*/ urlString = OS.JSStringCreateWithUTF8CString(bytes);
+ long /*int*/ urlString = OS.JSStringCreateWithUTF8CString(bytes);
- int /*long*/ result = OS.JSEvaluateScript(context, scriptString, 0, urlString, 0, null);
+ long /*int*/ result = OS.JSEvaluateScript(context, scriptString, 0, urlString, 0, null);
OS.JSStringRelease(urlString);
OS.JSStringRelease(scriptString);
return result != 0;
@@ -564,7 +564,7 @@ public boolean setUrl(String url, String postData, String[] headers) {
NSString str = NSString.stringWith(url);
NSString unescapedStr = NSString.stringWith("%#"); //$NON-NLS-1$
- int /*long*/ ptr = OS.CFURLCreateStringByAddingPercentEscapes(0, str.id, unescapedStr.id, 0, OS.kCFStringEncodingUTF8);
+ long /*int*/ ptr = OS.CFURLCreateStringByAddingPercentEscapes(0, str.id, unescapedStr.id, 0, OS.kCFStringEncodingUTF8);
NSString escapedString = new NSString(ptr);
NSURL inURL = NSURL.URLWithString(escapedString);
OS.CFRelease(ptr);
@@ -616,7 +616,7 @@ boolean translateMnemonics() {
/* WebFrameLoadDelegate */
-void webView_didChangeLocationWithinPageForFrame(int /*long*/ sender, int /*long*/ frameID) {
+void webView_didChangeLocationWithinPageForFrame(long /*int*/ sender, long /*int*/ frameID) {
WebFrame frame = new WebFrame(frameID);
WebDataSource dataSource = frame.dataSource();
NSURLRequest request = dataSource.request();
@@ -660,7 +660,7 @@ void webView_didChangeLocationWithinPageForFrame(int /*long*/ sender, int /*long
}
}
-void webView_didFailProvisionalLoadWithError_forFrame(int /*long*/ sender, int /*long*/ error, int /*long*/ frame) {
+void webView_didFailProvisionalLoadWithError_forFrame(long /*int*/ sender, long /*int*/ error, long /*int*/ frame) {
if (frame == webView.mainFrame().id) {
/*
* Feature on WebKit. The identifier is used here as a marker for the events
@@ -679,7 +679,7 @@ void webView_didFailProvisionalLoadWithError_forFrame(int /*long*/ sender, int /
}
NSError nserror = new NSError(error);
- int /*long*/ errorCode = nserror.code();
+ long /*int*/ errorCode = nserror.code();
if (OS.NSURLErrorBadURL < errorCode) return;
NSURL failingURL = null;
@@ -693,9 +693,9 @@ void webView_didFailProvisionalLoadWithError_forFrame(int /*long*/ sender, int /
/* handle invalid certificate error */
id certificates = info.objectForKey(NSString.stringWith("NSErrorPeerCertificateChainKey")); //$NON-NLS-1$
- int /*long*/[] policySearch = new int /*long*/[1];
- int /*long*/[] policyRef = new int /*long*/[1];
- int /*long*/[] trustRef = new int /*long*/[1];
+ long /*int*/[] policySearch = new long /*int*/[1];
+ long /*int*/[] policyRef = new long /*int*/[1];
+ long /*int*/[] trustRef = new long /*int*/[1];
boolean success = false;
int result = OS.SecPolicySearchCreate(OS.CSSM_CERT_X_509v3, 0, 0, policySearch);
if (result == 0 && policySearch[0] != 0) {
@@ -734,19 +734,19 @@ void webView_didFailProvisionalLoadWithError_forFrame(int /*long*/ sender, int /
}
}
-void createPanelDidEnd(int /*long*/ sheet, int /*long*/ returnCode, int /*long*/ contextInfo) {
+void createPanelDidEnd(long /*int*/ sheet, long /*int*/ returnCode, long /*int*/ contextInfo) {
NSURL failingURL = new NSURL(contextInfo);
failingURL.autorelease();
if (returnCode != OS.NSFileHandlingPanelOKButton) return; /* nothing more to do */
- int /*long*/ method = OS.class_getClassMethod(OS.class_NSURLRequest, OS.sel_setAllowsAnyHTTPSCertificate);
+ long /*int*/ method = OS.class_getClassMethod(OS.class_NSURLRequest, OS.sel_setAllowsAnyHTTPSCertificate);
if (method != 0) {
OS.objc_msgSend(OS.class_NSURLRequest, OS.sel_setAllowsAnyHTTPSCertificate, 1, failingURL.host().id);
setUrl(failingURL.absoluteString().getString(), null, null);
}
}
-void webView_didFinishLoadForFrame(int /*long*/ sender, int /*long*/ frameID) {
+void webView_didFinishLoadForFrame(long /*int*/ sender, long /*int*/ frameID) {
if (frameID == webView.mainFrame().id) {
/*
* If html is not null then there is html from a previous setText() call
@@ -828,7 +828,7 @@ void webView_didFinishLoadForFrame(int /*long*/ sender, int /*long*/ frameID) {
}
}
-void hookDOMKeyListeners(int /*long*/ frameID) {
+void hookDOMKeyListeners(long /*int*/ frameID) {
WebFrame frame = new WebFrame(frameID);
DOMDocument document = frame.DOMDocument();
if (document == null) return;
@@ -840,7 +840,7 @@ void hookDOMKeyListeners(int /*long*/ frameID) {
document.addEventListener(type, delegate, false);
}
-void hookDOMMouseListeners(int /*long*/ frameID) {
+void hookDOMMouseListeners(long /*int*/ frameID) {
WebFrame frame = new WebFrame(frameID);
DOMDocument document = frame.DOMDocument();
if (document == null) return;
@@ -858,7 +858,7 @@ void hookDOMMouseListeners(int /*long*/ frameID) {
document.addEventListener(type, delegate, false);
}
-void webView_didReceiveTitle_forFrame(int /*long*/ sender, int /*long*/ titleID, int /*long*/ frameID) {
+void webView_didReceiveTitle_forFrame(long /*int*/ sender, long /*int*/ titleID, long /*int*/ frameID) {
if (frameID == webView.mainFrame().id) {
NSString title = new NSString(titleID);
String newTitle = title.getString();
@@ -872,7 +872,7 @@ void webView_didReceiveTitle_forFrame(int /*long*/ sender, int /*long*/ titleID,
}
}
-void webView_didStartProvisionalLoadForFrame(int /*long*/ sender, int /*long*/ frameID) {
+void webView_didStartProvisionalLoadForFrame(long /*int*/ sender, long /*int*/ frameID) {
/*
* This code is intentionally commented. WebFrameLoadDelegate:didStartProvisionalLoadForFrame is
* called before WebResourceLoadDelegate:willSendRequest and
@@ -885,7 +885,7 @@ void webView_didStartProvisionalLoadForFrame(int /*long*/ sender, int /*long*/ f
// }
}
-void webView_didCommitLoadForFrame(int /*long*/ sender, int /*long*/ frameID) {
+void webView_didCommitLoadForFrame(long /*int*/ sender, long /*int*/ frameID) {
WebFrame frame = new WebFrame(frameID);
WebDataSource dataSource = frame.dataSource();
NSURLRequest request = dataSource.request();
@@ -964,7 +964,7 @@ void webView_didCommitLoadForFrame(int /*long*/ sender, int /*long*/ frameID) {
}
}
-void webView_windowScriptObjectAvailable (int /*long*/ webView, int /*long*/ windowScriptObject) {
+void webView_windowScriptObjectAvailable (long /*int*/ webView, long /*int*/ windowScriptObject) {
NSObject scriptObject = new NSObject (windowScriptObject);
NSString key = NSString.stringWith ("external"); //$NON-NLS-1$
scriptObject.setValue (delegate, key);
@@ -972,7 +972,7 @@ void webView_windowScriptObjectAvailable (int /*long*/ webView, int /*long*/ win
/* WebResourceLoadDelegate */
-void webView_resource_didFinishLoadingFromDataSource(int /*long*/ sender, int /*long*/ identifier, int /*long*/ dataSource) {
+void webView_resource_didFinishLoadingFromDataSource(long /*int*/ sender, long /*int*/ identifier, long /*int*/ dataSource) {
/*
* Feature on WebKit. The identifier is used here as a marker for the events
* related to the top frame and the URL changes related to that top frame as
@@ -990,7 +990,7 @@ void webView_resource_didFinishLoadingFromDataSource(int /*long*/ sender, int /*
//if (this.identifier == identifier) this.identifier = 0;
}
-void webView_resource_didFailLoadingWithError_fromDataSource(int /*long*/ sender, int /*long*/ identifier, int /*long*/ error, int /*long*/ dataSource) {
+void webView_resource_didFailLoadingWithError_fromDataSource(long /*int*/ sender, long /*int*/ identifier, long /*int*/ error, long /*int*/ dataSource) {
/*
* Feature on WebKit. The identifier is used here as a marker for the events
* related to the top frame and the URL changes related to that top frame as
@@ -1008,7 +1008,7 @@ void webView_resource_didFailLoadingWithError_fromDataSource(int /*long*/ sender
//if (this.identifier == identifier) this.identifier = 0;
}
-void webView_resource_didReceiveAuthenticationChallenge_fromDataSource (int /*long*/ sender, int /*long*/ identifier, int /*long*/ challenge, int /*long*/ dataSource) {
+void webView_resource_didReceiveAuthenticationChallenge_fromDataSource (long /*int*/ sender, long /*int*/ identifier, long /*int*/ challenge, long /*int*/ dataSource) {
NSURLAuthenticationChallenge nsChallenge = new NSURLAuthenticationChallenge (challenge);
/*
@@ -1038,11 +1038,11 @@ void webView_resource_didReceiveAuthenticationChallenge_fromDataSource (int /*lo
}
/* no listener handled the challenge, so try to invoke the native panel */
- int /*long*/ cls = OS.class_WebPanelAuthenticationHandler;
+ long /*int*/ cls = OS.class_WebPanelAuthenticationHandler;
if (cls != 0) {
- int /*long*/ method = OS.class_getClassMethod (cls, OS.sel_sharedHandler);
+ long /*int*/ method = OS.class_getClassMethod (cls, OS.sel_sharedHandler);
if (method != 0) {
- int /*long*/ handler = OS.objc_msgSend (cls, OS.sel_sharedHandler);
+ long /*int*/ handler = OS.objc_msgSend (cls, OS.sel_sharedHandler);
if (handler != 0) {
OS.objc_msgSend (handler, OS.sel_startAuthentication, challenge, webView.window ().id);
return;
@@ -1148,7 +1148,7 @@ boolean showAuthenticationDialog (final String[] user, final String[] password,
return result[0];
}
-int /*long*/ webView_identifierForInitialRequest_fromDataSource(int /*long*/ sender, int /*long*/ request, int /*long*/ dataSourceID) {
+long /*int*/ webView_identifierForInitialRequest_fromDataSource(long /*int*/ sender, long /*int*/ request, long /*int*/ dataSourceID) {
ProgressEvent progress = new ProgressEvent(browser);
progress.display = browser.getDisplay();
progress.widget = browser;
@@ -1169,7 +1169,7 @@ int /*long*/ webView_identifierForInitialRequest_fromDataSource(int /*long*/ sen
}
-int /*long*/ webView_resource_willSendRequest_redirectResponse_fromDataSource(int /*long*/ sender, int /*long*/ identifier, int /*long*/ request, int /*long*/ redirectResponse, int /*long*/ dataSource) {
+long /*int*/ webView_resource_willSendRequest_redirectResponse_fromDataSource(long /*int*/ sender, long /*int*/ identifier, long /*int*/ request, long /*int*/ redirectResponse, long /*int*/ dataSource) {
NSURLRequest nsRequest = new NSURLRequest (request);
NSURL url = nsRequest.URL ();
if (url.isFileURL ()) {
@@ -1183,7 +1183,7 @@ int /*long*/ webView_resource_willSendRequest_redirectResponse_fromDataSource(in
/* UIDelegate */
-int /*long*/ webView_createWebViewWithRequest(int /*long*/ sender, int /*long*/ request) {
+long /*int*/ webView_createWebViewWithRequest(long /*int*/ sender, long /*int*/ request) {
WindowEvent newEvent = new WindowEvent(browser);
newEvent.display = browser.getDisplay();
newEvent.widget = browser;
@@ -1208,7 +1208,7 @@ int /*long*/ webView_createWebViewWithRequest(int /*long*/ sender, int /*long*/
return result != null ? result.id : 0;
}
-void webViewShow(int /*long*/ sender) {
+void webViewShow(long /*int*/ sender) {
/*
* Feature on WebKit. WebKit expects the application to
* create a new Window using the Objective C Cocoa API in response
@@ -1248,7 +1248,7 @@ void webViewShow(int /*long*/ sender) {
size = null;
}
-void webView_setFrame(int /*long*/ sender, int /*long*/ frame) {
+void webView_setFrame(long /*int*/ sender, long /*int*/ frame) {
NSRect rect = new NSRect();
OS.memmove(rect, frame, NSRect.sizeof);
/* convert to SWT system coordinates */
@@ -1257,18 +1257,18 @@ void webView_setFrame(int /*long*/ sender, int /*long*/ frame) {
size = new Point((int)rect.width, (int)rect.height);
}
-void webViewFocus(int /*long*/ sender) {
+void webViewFocus(long /*int*/ sender) {
}
-void webViewUnfocus(int /*long*/ sender) {
+void webViewUnfocus(long /*int*/ sender) {
}
-NSNumber callRunBeforeUnloadConfirmPanelWithMessage(int /*long*/ messageID, int /*long*/ arg) {
+NSNumber callRunBeforeUnloadConfirmPanelWithMessage(long /*int*/ messageID, long /*int*/ arg) {
boolean result = webView_runBeforeUnloadConfirmPanelWithMessage_initiatedByFrame (0, messageID, 0);
return NSNumber.numberWithBool (result);
}
-boolean webView_runBeforeUnloadConfirmPanelWithMessage_initiatedByFrame(int /*long*/ sender, int /*long*/ messageID, int /*long*/ frame) {
+boolean webView_runBeforeUnloadConfirmPanelWithMessage_initiatedByFrame(long /*int*/ sender, long /*int*/ messageID, long /*int*/ frame) {
NSString message = new NSString(messageID);
StringBuffer text = new StringBuffer(Compatibility.getMessage("SWT_OnBeforeUnload_Message1")); //$NON-NLS-1$
text.append("\n\n"); //$NON-NLS-1$
@@ -1280,7 +1280,7 @@ boolean webView_runBeforeUnloadConfirmPanelWithMessage_initiatedByFrame(int /*lo
return messageBox.open() == SWT.OK;
}
-void webView_runJavaScriptAlertPanelWithMessage(int /*long*/ sender, int /*long*/ messageID) {
+void webView_runJavaScriptAlertPanelWithMessage(long /*int*/ sender, long /*int*/ messageID) {
NSString message = new NSString(messageID);
String text = message.getString();
@@ -1290,7 +1290,7 @@ void webView_runJavaScriptAlertPanelWithMessage(int /*long*/ sender, int /*long*
messageBox.open();
}
-int webView_runJavaScriptConfirmPanelWithMessage(int /*long*/ sender, int /*long*/ messageID) {
+int webView_runJavaScriptConfirmPanelWithMessage(long /*int*/ sender, long /*int*/ messageID) {
NSString message = new NSString(messageID);
String text = message.getString();
@@ -1300,7 +1300,7 @@ int webView_runJavaScriptConfirmPanelWithMessage(int /*long*/ sender, int /*long
return messageBox.open() == SWT.OK ? 1 : 0;
}
-void webView_runOpenPanelForFileButtonWithResultListener(int /*long*/ sender, int /*long*/ resultListenerID) {
+void webView_runOpenPanelForFileButtonWithResultListener(long /*int*/ sender, long /*int*/ resultListenerID) {
FileDialog dialog = new FileDialog(browser.getShell(), SWT.NONE);
String result = dialog.open();
WebOpenPanelResultListener resultListener = new WebOpenPanelResultListener(resultListenerID);
@@ -1311,7 +1311,7 @@ void webView_runOpenPanelForFileButtonWithResultListener(int /*long*/ sender, in
resultListener.chooseFilename(NSString.stringWith(result));
}
-void webViewClose(int /*long*/ sender) {
+void webViewClose(long /*int*/ sender) {
Shell parent = browser.getShell();
WindowEvent newEvent = new WindowEvent(browser);
newEvent.display = browser.getDisplay();
@@ -1336,7 +1336,7 @@ void webViewClose(int /*long*/ sender) {
parent.setSize(pt.x, pt.y);
}
-int /*long*/ webView_contextMenuItemsForElement_defaultMenuItems(int /*long*/ sender, int /*long*/ element, int /*long*/ defaultMenuItems) {
+long /*int*/ webView_contextMenuItemsForElement_defaultMenuItems(long /*int*/ sender, long /*int*/ element, long /*int*/ defaultMenuItems) {
Point pt = browser.getDisplay().getCursorLocation();
Event event = new Event();
event.x = pt.x;
@@ -1354,12 +1354,12 @@ int /*long*/ webView_contextMenuItemsForElement_defaultMenuItems(int /*long*/ se
return defaultMenuItems;
}
-void webView_setStatusBarVisible(int /*long*/ sender, boolean visible) {
+void webView_setStatusBarVisible(long /*int*/ sender, boolean visible) {
/* Note. Webkit only emits the notification when the status bar should be hidden. */
statusBar = visible;
}
-void webView_setStatusText(int /*long*/ sender, int /*long*/ textID) {
+void webView_setStatusText(long /*int*/ sender, long /*int*/ textID) {
NSString text = new NSString(textID);
int length = (int)/*64*/text.length();
if (length == 0) return;
@@ -1373,15 +1373,15 @@ void webView_setStatusText(int /*long*/ sender, int /*long*/ textID) {
}
}
-void webView_setResizable(int /*long*/ sender, boolean visible) {
+void webView_setResizable(long /*int*/ sender, boolean visible) {
}
-void webView_setToolbarsVisible(int /*long*/ sender, boolean visible) {
+void webView_setToolbarsVisible(long /*int*/ sender, boolean visible) {
/* Note. Webkit only emits the notification when the tool bar should be hidden. */
toolBar = visible;
}
-void webView_mouseDidMoveOverElement_modifierFlags (int /*long*/ sender, int /*long*/ elementInformationID, int /*long*/ modifierFlags) {
+void webView_mouseDidMoveOverElement_modifierFlags (long /*int*/ sender, long /*int*/ elementInformationID, long /*int*/ modifierFlags) {
if (elementInformationID == 0) return;
NSString key = NSString.stringWith(WebElementLinkURLKey);
@@ -1421,7 +1421,7 @@ void webView_mouseDidMoveOverElement_modifierFlags (int /*long*/ sender, int /*l
}
}
-void webView_printFrameView (int /*long*/ sender, int /*long*/ frameViewID) {
+void webView_printFrameView (long /*int*/ sender, long /*int*/ frameViewID) {
WebFrameView view = new WebFrameView(frameViewID);
boolean viewPrint = view.documentViewShouldHandlePrint();
if (viewPrint) {
@@ -1435,7 +1435,7 @@ void webView_printFrameView (int /*long*/ sender, int /*long*/ frameViewID) {
/* PolicyDelegate */
-void webView_decidePolicyForMIMEType_request_frame_decisionListener(int /*long*/ sender, int /*long*/ type, int /*long*/ request, int /*long*/ frame, int /*long*/ listenerID) {
+void webView_decidePolicyForMIMEType_request_frame_decisionListener(long /*int*/ sender, long /*int*/ type, long /*int*/ request, long /*int*/ frame, long /*int*/ listenerID) {
boolean canShow = WebView.canShowMIMEType(new NSString(type));
WebPolicyDecisionListener listener = new WebPolicyDecisionListener(listenerID);
if (canShow) {
@@ -1445,7 +1445,7 @@ void webView_decidePolicyForMIMEType_request_frame_decisionListener(int /*long*/
}
}
-void webView_decidePolicyForNavigationAction_request_frame_decisionListener(int /*long*/ sender, int /*long*/ actionInformation, int /*long*/ request, int /*long*/ frame, int /*long*/ listenerID) {
+void webView_decidePolicyForNavigationAction_request_frame_decisionListener(long /*int*/ sender, long /*int*/ actionInformation, long /*int*/ request, long /*int*/ frame, long /*int*/ listenerID) {
NSURL url = new NSURLRequest(request).URL();
WebPolicyDecisionListener listener = new WebPolicyDecisionListener(listenerID);
@@ -1509,17 +1509,17 @@ void webView_decidePolicyForNavigationAction_request_frame_decisionListener(int
}
}
-void webView_decidePolicyForNewWindowAction_request_newFrameName_decisionListener(int /*long*/ sender, int /*long*/ actionInformation, int /*long*/ request, int /*long*/ frameName, int /*long*/ listenerID) {
+void webView_decidePolicyForNewWindowAction_request_newFrameName_decisionListener(long /*int*/ sender, long /*int*/ actionInformation, long /*int*/ request, long /*int*/ frameName, long /*int*/ listenerID) {
WebPolicyDecisionListener listener = new WebPolicyDecisionListener(listenerID);
listener.use();
}
-void webView_unableToImplementPolicyWithError_frame(int /*long*/ sender, int /*long*/ error, int /*long*/ frame) {
+void webView_unableToImplementPolicyWithError_frame(long /*int*/ sender, long /*int*/ error, long /*int*/ frame) {
}
/* WebDownload */
-void download_decideDestinationWithSuggestedFilename(int /*long*/ downloadId, int /*long*/ filename) {
+void download_decideDestinationWithSuggestedFilename(long /*int*/ downloadId, long /*int*/ filename) {
NSString string = new NSString(filename);
String name = string.getString();
FileDialog dialog = new FileDialog(browser.getShell(), SWT.SAVE);
@@ -1537,7 +1537,7 @@ void download_decideDestinationWithSuggestedFilename(int /*long*/ downloadId, in
/* DOMEventListener */
-void handleEvent(int /*long*/ evtId) {
+void handleEvent(long /*int*/ evtId) {
NSString string = new NSString(OS.objc_msgSend(evtId, OS.sel_type));
String type = string.getString();
@@ -1683,9 +1683,9 @@ void handleEvent(int /*long*/ evtId) {
/* external */
-Object convertToJava (int /*long*/ value) {
+Object convertToJava (long /*int*/ value) {
NSObject object = new NSObject (value);
- int /*long*/ clazz = OS.objc_lookUpClass ("NSString"); //$NON-NLS-1$
+ long /*int*/ clazz = OS.objc_lookUpClass ("NSString"); //$NON-NLS-1$
if (object.isKindOfClass (clazz)) {
NSString string = new NSString (value);
return string.getString ();
@@ -1693,7 +1693,7 @@ Object convertToJava (int /*long*/ value) {
clazz = OS.objc_lookUpClass ("NSNumber"); //$NON-NLS-1$
if (object.isKindOfClass (clazz)) {
NSNumber number = new NSNumber (value);
- int /*long*/ ptr = number.objCType ();
+ long /*int*/ ptr = number.objCType ();
byte[] type = new byte[1];
OS.memmove (type, ptr, 1);
if (type[0] == 'c' || type[0] == 'B') {
@@ -1731,7 +1731,7 @@ Object convertToJava (int /*long*/ value) {
NSObject convertToJS (Object value) {
if (value == null) {
- int /*long*/ result = OS.objc_msgSend (OS.class_NSNull, OS.sel_null);
+ long /*int*/ result = OS.objc_msgSend (OS.class_NSNull, OS.sel_null);
return result != 0 ? new NSObject (result) : null;
}
if (value instanceof String) {
@@ -1757,10 +1757,10 @@ NSObject convertToJS (Object value) {
return null;
}
-NSObject callJava (int /*long*/ index, int /*long*/ token, int /*long*/ args, int /*long*/ arg1) {
+NSObject callJava (long /*int*/ index, long /*int*/ token, long /*int*/ args, long /*int*/ arg1) {
Object returnValue = null;
NSObject object = new NSObject (index);
- int /*long*/ clazz = OS.objc_lookUpClass ("NSNumber"); //$NON-NLS-1$
+ long /*int*/ clazz = OS.objc_lookUpClass ("NSNumber"); //$NON-NLS-1$
if (object.isKindOfClass (clazz)) {
NSNumber number = new NSNumber (index);
Object key = new Integer (number.intValue ());
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java
index 0bae6647fb..9652dde95d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java
@@ -24,7 +24,7 @@ import org.eclipse.swt.layout.*;
import org.eclipse.swt.widgets.*;
class WebKit extends WebBrowser {
- int /*long*/ webView, webViewData, scrolledWindow;
+ long /*int*/ webView, webViewData, scrolledWindow;
int failureCount, lastKeyCode, lastCharCode;
String postData;
String[] headers;
@@ -33,7 +33,7 @@ class WebKit extends WebBrowser {
BrowserFunction eventFunction;
static int DisabledJSCount;
- static int /*long*/ ExternalClass, PostString, WebViewType;
+ static long /*int*/ ExternalClass, PostString, WebViewType;
static boolean IsWebKit14orNewer, LibraryLoaded;
static Hashtable WindowMappings = new Hashtable ();
@@ -125,16 +125,16 @@ class WebKit extends WebBrowser {
NativeClearSessions = new Runnable () {
public void run () {
if (!LibraryLoaded) return;
- int /*long*/ session = WebKitGTK.webkit_get_default_session ();
- int /*long*/ type = WebKitGTK.soup_cookie_jar_get_type ();
- int /*long*/ jar = WebKitGTK.soup_session_get_feature (session, type);
+ long /*int*/ session = WebKitGTK.webkit_get_default_session ();
+ long /*int*/ type = WebKitGTK.soup_cookie_jar_get_type ();
+ long /*int*/ jar = WebKitGTK.soup_session_get_feature (session, type);
if (jar == 0) return;
- int /*long*/ cookies = WebKitGTK.soup_cookie_jar_all_cookies (jar);
+ long /*int*/ cookies = WebKitGTK.soup_cookie_jar_all_cookies (jar);
int length = OS.g_slist_length (cookies);
- int /*long*/ current = cookies;
+ long /*int*/ current = cookies;
for (int i = 0; i < length; i++) {
- int /*long*/ cookie = OS.g_slist_data (current);
- int /*long*/ expires = WebKitGTK.SoupCookie_expires (cookie);
+ long /*int*/ cookie = OS.g_slist_data (current);
+ long /*int*/ expires = WebKitGTK.SoupCookie_expires (cookie);
if (expires == 0) {
/* indicates a session cookie */
WebKitGTK.soup_cookie_jar_delete_cookie (jar, cookie);
@@ -149,14 +149,14 @@ class WebKit extends WebBrowser {
NativeGetCookie = new Runnable () {
public void run () {
if (!LibraryLoaded) return;
- int /*long*/ session = WebKitGTK.webkit_get_default_session ();
- int /*long*/ type = WebKitGTK.soup_cookie_jar_get_type ();
- int /*long*/ jar = WebKitGTK.soup_session_get_feature (session, type);
+ long /*int*/ session = WebKitGTK.webkit_get_default_session ();
+ long /*int*/ type = WebKitGTK.soup_cookie_jar_get_type ();
+ long /*int*/ jar = WebKitGTK.soup_session_get_feature (session, type);
if (jar == 0) return;
byte[] bytes = Converter.wcsToMbcs (null, CookieUrl, true);
- int /*long*/ uri = WebKitGTK.soup_uri_new (bytes);
+ long /*int*/ uri = WebKitGTK.soup_uri_new (bytes);
if (uri == 0) return;
- int /*long*/ cookies = WebKitGTK.soup_cookie_jar_get_cookies (jar, uri, 0);
+ long /*int*/ cookies = WebKitGTK.soup_cookie_jar_get_cookies (jar, uri, 0);
WebKitGTK.soup_uri_free (uri);
if (cookies == 0) return;
int length = OS.strlen (cookies);
@@ -182,9 +182,9 @@ class WebKit extends WebBrowser {
NativeSetCookie = new Runnable () {
public void run () {
if (!LibraryLoaded) return;
- int /*long*/ session = WebKitGTK.webkit_get_default_session ();
- int /*long*/ type = WebKitGTK.soup_cookie_jar_get_type ();
- int /*long*/ jar = WebKitGTK.soup_session_get_feature (session, type);
+ long /*int*/ session = WebKitGTK.webkit_get_default_session ();
+ long /*int*/ type = WebKitGTK.soup_cookie_jar_get_type ();
+ long /*int*/ jar = WebKitGTK.soup_session_get_feature (session, type);
if (jar == 0) {
/* this happens if a navigation has not occurred yet */
WebKitGTK.soup_session_add_feature_by_type (session, type);
@@ -192,10 +192,10 @@ class WebKit extends WebBrowser {
}
if (jar == 0) return;
byte[] bytes = Converter.wcsToMbcs (null, CookieUrl, true);
- int /*long*/ uri = WebKitGTK.soup_uri_new (bytes);
+ long /*int*/ uri = WebKitGTK.soup_uri_new (bytes);
if (uri == 0) return;
bytes = Converter.wcsToMbcs (null, CookieValue, true);
- int /*long*/ cookie = WebKitGTK.soup_cookie_parse (bytes, uri);
+ long /*int*/ cookie = WebKitGTK.soup_cookie_parse (bytes, uri);
if (cookie != 0) {
WebKitGTK.soup_cookie_jar_add_cookie (jar, cookie);
// the following line is intentionally commented
@@ -213,9 +213,9 @@ class WebKit extends WebBrowser {
}
}
-static Browser FindBrowser (int /*long*/ webView) {
+static Browser FindBrowser (long /*int*/ webView) {
if (webView == 0) return null;
- int /*long*/ parent = OS.gtk_widget_get_parent (webView);
+ long /*int*/ parent = OS.gtk_widget_get_parent (webView);
parent = OS.gtk_widget_get_parent (parent);
return (Browser)Display.getCurrent ().findWidget (parent);
}
@@ -236,12 +236,12 @@ static boolean IsInstalled () {
(major == MIN_VERSION[0] && minor == MIN_VERSION[1] && micro >= MIN_VERSION[2]);
}
-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) {
if (WebKitGTK.JSValueIsObjectOfClass (ctx, thisObject, ExternalClass) == 0) {
return WebKitGTK.JSValueMakeUndefined (ctx);
}
- int /*long*/ ptr = WebKitGTK.JSObjectGetPrivate (thisObject);
- int /*long*/[] handle = new int /*long*/[1];
+ long /*int*/ ptr = WebKitGTK.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 0;
@@ -249,20 +249,20 @@ 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); //$NON-NLS-1$
} catch (UnsupportedEncodingException e) {
bytes = Converter.wcsToMbcs (null, FUNCTIONNAME_CALLJAVA, true);
}
- int /*long*/ name = WebKitGTK.JSStringCreateWithUTF8CString (bytes);
- int /*long*/ function = WebKitGTK.JSObjectMakeFunctionWithCallback (ctx, name, JSObjectCallAsFunctionProc.getAddress ());
+ long /*int*/ name = WebKitGTK.JSStringCreateWithUTF8CString (bytes);
+ long /*int*/ function = WebKitGTK.JSObjectMakeFunctionWithCallback (ctx, name, JSObjectCallAsFunctionProc.getAddress ());
WebKitGTK.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); //$NON-NLS-1$
@@ -272,7 +272,7 @@ static int /*long*/ JSObjectHasPropertyProc (int /*long*/ ctx, int /*long*/ obje
return WebKitGTK.JSStringIsEqualToUTF8CString (propertyName, bytes);
}
-static int /*long*/ JSDOMEventProc (int /*long*/ arg0, int /*long*/ event, int /*long*/ user_data) {
+static long /*int*/ JSDOMEventProc (long /*int*/ arg0, long /*int*/ event, long /*int*/ user_data) {
if (OS.GTK_IS_SCROLLED_WINDOW (arg0)) {
/*
* Stop the propagation of events that are not consumed by WebKit, before
@@ -342,15 +342,15 @@ static int /*long*/ JSDOMEventProc (int /*long*/ arg0, int /*long*/ event, int /
return webkit.handleDOMEvent (event, (int)user_data) ? 0 : STOP_PROPOGATE;
}
-static int /*long*/ Proc (int /*long*/ handle, int /*long*/ user_data) {
+static long /*int*/ Proc (long /*int*/ handle, long /*int*/ user_data) {
Browser browser = FindBrowser (handle);
if (browser == null) return 0;
WebKit webkit = (WebKit)browser.webBrowser;
return webkit.webViewProc (handle, user_data);
}
-static int /*long*/ Proc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ user_data) {
- int /*long*/ webView;
+static long /*int*/ Proc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) {
+ long /*int*/ webView;
if (OS.G_TYPE_CHECK_INSTANCE_TYPE (handle, WebKitGTK.webkit_web_frame_get_type ())) {
webView = WebKitGTK.webkit_web_frame_get_web_view (handle);
} else {
@@ -366,15 +366,15 @@ static int /*long*/ Proc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ u
}
}
-static int /*long*/ Proc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ user_data) {
+static long /*int*/ Proc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ user_data) {
Browser browser = FindBrowser (handle);
if (browser == null) return 0;
WebKit webkit = (WebKit)browser.webBrowser;
return webkit.webViewProc (handle, arg0, arg1, user_data);
}
-static int /*long*/ Proc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ user_data) {
- int /*long*/ webView;
+static long /*int*/ Proc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ user_data) {
+ long /*int*/ webView;
if (OS.G_TYPE_CHECK_INSTANCE_TYPE (handle, WebKitGTK.soup_session_get_type ())) {
webView = user_data;
} else {
@@ -390,14 +390,14 @@ static int /*long*/ Proc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ a
}
}
-static int /*long*/ Proc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ user_data) {
+static long /*int*/ Proc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ user_data) {
Browser browser = FindBrowser (handle);
if (browser == null) return 0;
WebKit webkit = (WebKit)browser.webBrowser;
return webkit.webViewProc (handle, arg0, arg1, arg2, arg3, user_data);
}
-int /*long*/ sessionProc (int /*long*/ session, int /*long*/ msg, int /*long*/ auth, int /*long*/ retrying, int /*long*/ user_data) {
+long /*int*/ sessionProc (long /*int*/ session, long /*int*/ msg, long /*int*/ auth, long /*int*/ retrying, long /*int*/ user_data) {
/* authentication challenges are currently the only notification received from the session */
if (retrying == 0) {
failureCount = 0;
@@ -405,8 +405,8 @@ int /*long*/ sessionProc (int /*long*/ session, int /*long*/ msg, int /*long*/ a
if (++failureCount >= 3) return 0;
}
- int /*long*/ uri = WebKitGTK.soup_message_get_uri (msg);
- int /*long*/ uriString = WebKitGTK.soup_uri_to_string (uri, 0);
+ long /*int*/ uri = WebKitGTK.soup_message_get_uri (msg);
+ long /*int*/ uriString = WebKitGTK.soup_uri_to_string (uri, 0);
int length = C.strlen (uriString);
byte[] bytes = new byte[length];
OS.memmove (bytes, uriString, length);
@@ -432,14 +432,14 @@ int /*long*/ sessionProc (int /*long*/ session, int /*long*/ msg, int /*long*/ a
return 0;
}
-int /*long*/ webFrameProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ user_data) {
+long /*int*/ webFrameProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) {
switch ((int)/*64*/user_data) {
case NOTIFY_LOAD_STATUS: return webframe_notify_load_status (handle, arg0);
default: return 0;
}
}
-int /*long*/ webViewProc (int /*long*/ handle, int /*long*/ user_data) {
+long /*int*/ webViewProc (long /*int*/ handle, long /*int*/ user_data) {
switch ((int)/*64*/user_data) {
case CLOSE_WEB_VIEW: return webkit_close_web_view (handle);
case WEB_VIEW_READY: return webkit_web_view_ready (handle);
@@ -447,7 +447,7 @@ int /*long*/ webViewProc (int /*long*/ handle, int /*long*/ user_data) {
}
}
-int /*long*/ webViewProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ user_data) {
+long /*int*/ webViewProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) {
switch ((int)/*64*/user_data) {
case CREATE_WEB_VIEW: return webkit_create_web_view (handle, arg0);
case DOWNLOAD_REQUESTED: return webkit_download_requested (handle, arg0);
@@ -460,14 +460,14 @@ int /*long*/ webViewProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ u
}
}
-int /*long*/ webViewProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ user_data) {
+long /*int*/ webViewProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ user_data) {
switch ((int)/*64*/user_data) {
case HOVERING_OVER_LINK: return webkit_hovering_over_link (handle, arg0, arg1);
default: return 0;
}
}
-int /*long*/ webViewProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ user_data) {
+long /*int*/ webViewProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ user_data) {
switch ((int)/*64*/user_data) {
case CONSOLE_MESSAGE: return webkit_console_message (handle, arg0, arg1, arg2);
case WINDOW_OBJECT_CLEARED: return webkit_window_object_cleared (handle, arg0, arg1, arg2);
@@ -475,7 +475,7 @@ int /*long*/ webViewProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ a
}
}
-int /*long*/ webViewProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ user_data) {
+long /*int*/ webViewProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ user_data) {
switch ((int)/*64*/user_data) {
case MIME_TYPE_POLICY_DECISION_REQUESTED: return webkit_mime_type_policy_decision_requested (handle, arg0, arg1, arg2, arg3);
case NAVIGATION_POLICY_DECISION_REQUESTED: return webkit_navigation_policy_decision_requested (handle, arg0, arg1, arg2, arg3);
@@ -498,7 +498,7 @@ public void create (Composite parent, int style) {
OS.memmove (jsClassDefinition.className, bytes, bytes.length);
jsClassDefinition.hasProperty = JSObjectHasPropertyProc.getAddress ();
jsClassDefinition.getProperty = JSObjectGetPropertyProc.getAddress ();
- int /*long*/ classDefinitionPtr = C.malloc (JSClassDefinition.sizeof);
+ long /*int*/ classDefinitionPtr = C.malloc (JSClassDefinition.sizeof);
WebKitGTK.memmove (classDefinitionPtr, jsClassDefinition, JSClassDefinition.sizeof);
ExternalClass = WebKitGTK.JSClassCreate (classDefinitionPtr);
@@ -511,7 +511,7 @@ public void create (Composite parent, int style) {
OS.gtk_scrolled_window_set_policy (scrolledWindow, OS.GTK_POLICY_AUTOMATIC, OS.GTK_POLICY_AUTOMATIC);
webView = WebKitGTK.webkit_web_view_new ();
webViewData = C.malloc (C.PTR_SIZEOF);
- C.memmove (webViewData, new int /*long*/[] {webView}, C.PTR_SIZEOF);
+ C.memmove (webViewData, new long /*int*/[] {webView}, C.PTR_SIZEOF);
OS.gtk_container_add (scrolledWindow, webView);
OS.gtk_container_add (browser.handle, scrolledWindow);
OS.gtk_widget_show (scrolledWindow);
@@ -553,7 +553,7 @@ public void create (Composite parent, int style) {
OS.g_signal_connect (scrolledWindow, OS.scroll_event, JSDOMEventProc.getAddress (), STOP_PROPOGATE);
OS.g_signal_connect (scrolledWindow, OS.motion_notify_event, JSDOMEventProc.getAddress (), STOP_PROPOGATE);
- int /*long*/ settings = WebKitGTK.webkit_web_view_get_settings (webView);
+ long /*int*/ settings = WebKitGTK.webkit_web_view_get_settings (webView);
OS.g_object_set (settings, WebKitGTK.javascript_can_open_windows_automatically, 1, 0);
OS.g_object_set (settings, WebKitGTK.enable_universal_access_from_file_uris, 1, 0);
byte[] bytes = Converter.wcsToMbcs (null, "UTF-8", true); // $NON-NLS-1$
@@ -595,8 +595,8 @@ public void create (Composite parent, int style) {
* queue by removing the default Authenticate listener, adding ours,
* and then re-adding the default listener.
*/
- int /*long*/ session = WebKitGTK.webkit_get_default_session ();
- int /*long*/ originalAuth = WebKitGTK.soup_session_get_feature (session, WebKitGTK.webkit_soup_auth_dialog_get_type ());
+ long /*int*/ session = WebKitGTK.webkit_get_default_session ();
+ long /*int*/ originalAuth = WebKitGTK.soup_session_get_feature (session, WebKitGTK.webkit_soup_auth_dialog_get_type ());
WebKitGTK.soup_session_feature_detach (originalAuth, session);
OS.g_signal_connect (session, WebKitGTK.authenticate, Proc5.getAddress (), webView);
WebKitGTK.soup_session_feature_attach (originalAuth, session);
@@ -622,7 +622,7 @@ public void create (Composite parent, int style) {
}
proxyHost += ":" + port; //$NON-NLS-1$
bytes = Converter.wcsToMbcs (null, proxyHost, true);
- int /*long*/ uri = WebKitGTK.soup_uri_new (bytes);
+ long /*int*/ uri = WebKitGTK.soup_uri_new (bytes);
if (uri != 0) {
OS.g_object_set (session, WebKitGTK.SOUP_SESSION_PROXY_URI, uri, 0);
WebKitGTK.soup_uri_free (uri);
@@ -646,7 +646,7 @@ public void create (Composite parent, int style) {
browser.setData (KEY_CHECK_SUBWINDOW, Boolean.FALSE);
}
-void addEventHandlers (int /*long*/ web_view, boolean top) {
+void addEventHandlers (long /*int*/ web_view, boolean top) {
/*
* If JS is disabled (causes DOM events to not be delivered) then do not add event
* listeners here, DOM events will be inferred from received GDK events instead.
@@ -654,7 +654,7 @@ void addEventHandlers (int /*long*/ web_view, boolean top) {
if (!jsEnabled) return;
if (top && IsWebKit14orNewer) {
- int /*long*/ domDocument = WebKitGTK.webkit_web_view_get_dom_document (web_view);
+ long /*int*/ domDocument = WebKitGTK.webkit_web_view_get_dom_document (web_view);
if (domDocument != 0) {
WindowMappings.put (new LONG (domDocument), new LONG (web_view));
WebKitGTK.webkit_dom_event_target_add_event_listener (domDocument, WebKitGTK.dragstart, JSDOMEventProc.getAddress (), 0, SWT.DragDetect);
@@ -766,8 +766,8 @@ boolean close (boolean showPrompters) {
}
public boolean execute (String script) {
- int /*long*/ frame = WebKitGTK.webkit_web_view_get_main_frame (webView);
- int /*long*/ context = WebKitGTK.webkit_web_frame_get_global_context (frame);
+ long /*int*/ frame = WebKitGTK.webkit_web_view_get_main_frame (webView);
+ long /*int*/ context = WebKitGTK.webkit_web_frame_get_global_context (frame);
byte[] bytes = null;
try {
@@ -775,16 +775,16 @@ public boolean execute (String script) {
} catch (UnsupportedEncodingException e) {
bytes = Converter.wcsToMbcs (null, script, true);
}
- int /*long*/ scriptString = WebKitGTK.JSStringCreateWithUTF8CString (bytes);
+ long /*int*/ scriptString = WebKitGTK.JSStringCreateWithUTF8CString (bytes);
try {
bytes = (getUrl () + '\0').getBytes (CHARSET_UTF8); //$NON-NLS-1$
} catch (UnsupportedEncodingException e) {
bytes = Converter.wcsToMbcs (null, getUrl (), true);
}
- int /*long*/ urlString = WebKitGTK.JSStringCreateWithUTF8CString (bytes);
+ long /*int*/ urlString = WebKitGTK.JSStringCreateWithUTF8CString (bytes);
- int /*long*/ result = WebKitGTK.JSEvaluateScript (context, scriptString, 0, urlString, 0, null);
+ long /*int*/ result = WebKitGTK.JSEvaluateScript (context, scriptString, 0, urlString, 0, null);
WebKitGTK.JSStringRelease (urlString);
WebKitGTK.JSStringRelease (scriptString);
return result != 0;
@@ -801,13 +801,13 @@ public String getBrowserType () {
}
public String getText () {
- int /*long*/ frame = WebKitGTK.webkit_web_view_get_main_frame (webView);
- int /*long*/ source = WebKitGTK.webkit_web_frame_get_data_source (frame);
+ long /*int*/ frame = WebKitGTK.webkit_web_view_get_main_frame (webView);
+ long /*int*/ source = WebKitGTK.webkit_web_frame_get_data_source (frame);
if (source == 0) return ""; //$NON-NLS-1$
- int /*long*/ data = WebKitGTK.webkit_web_data_source_get_data (source);
+ long /*int*/ data = WebKitGTK.webkit_web_data_source_get_data (source);
if (data == 0) return ""; //$NON-NLS-1$
- int /*long*/ encoding = WebKitGTK.webkit_web_data_source_get_encoding (source);
+ long /*int*/ encoding = WebKitGTK.webkit_web_data_source_get_encoding (source);
int length = OS.strlen (encoding);
byte[] bytes = new byte [length];
OS.memmove (bytes, encoding, length);
@@ -815,7 +815,7 @@ public String getText () {
length = OS.GString_len (data);
bytes = new byte[length];
- int /*long*/ string = OS.GString_str (data);
+ long /*int*/ string = OS.GString_str (data);
C.memmove (bytes, string, length);
try {
@@ -826,7 +826,7 @@ public String getText () {
}
public String getUrl () {
- int /*long*/ uri = WebKitGTK.webkit_web_view_get_uri (webView);
+ long /*int*/ uri = WebKitGTK.webkit_web_view_get_uri (webView);
/* WebKit auto-navigates to about:blank at startup */
if (uri == 0) return ABOUT_BLANK;
@@ -851,7 +851,7 @@ public String getUrl () {
return url;
}
-boolean handleDOMEvent (int /*long*/ event, int type) {
+boolean handleDOMEvent (long /*int*/ event, int type) {
/*
* This method handles JS events that are received through the DOM
* listener API that was introduced in WebKitGTK 1.4.
@@ -1206,7 +1206,7 @@ boolean handleMouseEvent (String type, int screenX, int screenY, int detail, int
return true;
}
-int /*long*/ handleLoadCommitted (int /*long*/ uri, boolean top) {
+long /*int*/ handleLoadCommitted (long /*int*/ uri, boolean top) {
int length = OS.strlen (uri);
byte[] bytes = new byte[length];
OS.memmove (bytes, uri, length);
@@ -1244,7 +1244,7 @@ int /*long*/ handleLoadCommitted (int /*long*/ uri, boolean top) {
return 0;
}
-int /*long*/ handleLoadFinished (int /*long*/ uri, boolean top) {
+long /*int*/ handleLoadFinished (long /*int*/ uri, boolean top) {
int length = OS.strlen (uri);
byte[] bytes = new byte[length];
OS.memmove (bytes, uri, length);
@@ -1296,8 +1296,8 @@ int /*long*/ handleLoadFinished (int /*long*/ uri, boolean top) {
* the event here with the page's url as the title.
*/
if (top) {
- int /*long*/ frame = WebKitGTK.webkit_web_view_get_main_frame (webView);
- int /*long*/ title = WebKitGTK.webkit_web_frame_get_title (frame);
+ long /*int*/ frame = WebKitGTK.webkit_web_view_get_main_frame (webView);
+ long /*int*/ title = WebKitGTK.webkit_web_frame_get_title (frame);
if (title == 0) {
TitleEvent newEvent = new TitleEvent (browser);
newEvent.display = browser.getDisplay ();
@@ -1363,7 +1363,7 @@ void onResize (Event e) {
OS.gtk_widget_set_size_request (scrolledWindow, rect.width, rect.height);
}
-void openDownloadWindow (final int /*long*/ webkitDownload) {
+void openDownloadWindow (final long /*int*/ webkitDownload) {
final Shell shell = new Shell ();
String msg = Compatibility.getMessage ("SWT_FileDownload"); //$NON-NLS-1$
shell.setText (msg);
@@ -1373,12 +1373,12 @@ void openDownloadWindow (final int /*long*/ webkitDownload) {
gridLayout.verticalSpacing = 20;
shell.setLayout (gridLayout);
- int /*long*/ name = WebKitGTK.webkit_download_get_suggested_filename (webkitDownload);
+ long /*int*/ name = WebKitGTK.webkit_download_get_suggested_filename (webkitDownload);
int length = OS.strlen (name);
byte[] bytes = new byte[length];
OS.memmove (bytes, name, length);
String nameString = new String (Converter.mbcsToWcs (null, bytes));
- int /*long*/ url = WebKitGTK.webkit_download_get_uri (webkitDownload);
+ long /*int*/ url = WebKitGTK.webkit_download_get_uri (webkitDownload);
length = OS.strlen (url);
bytes = new byte[length];
OS.memmove (bytes, url, length);
@@ -1510,7 +1510,7 @@ public boolean setUrl (String url, String postData, String[] headers) {
* set the value on the WebView when initiating the load request and then
* remove it afterwards.
*/
- int /*long*/ settings = WebKitGTK.webkit_web_view_get_settings (webView);
+ long /*int*/ settings = WebKitGTK.webkit_web_view_get_settings (webView);
if (headers != null) {
for (int i = 0; i < headers.length; i++) {
String current = headers[i];
@@ -1539,11 +1539,11 @@ public void stop () {
WebKitGTK.webkit_web_view_stop_loading (webView);
}
-int /*long*/ webframe_notify_load_status (int /*long*/ web_frame, int /*long*/ pspec) {
+long /*int*/ webframe_notify_load_status (long /*int*/ web_frame, long /*int*/ pspec) {
int status = WebKitGTK.webkit_web_frame_get_load_status (web_frame);
switch (status) {
case WebKitGTK.WEBKIT_LOAD_COMMITTED: {
- int /*long*/ uri = WebKitGTK.webkit_web_frame_get_uri (web_frame);
+ long /*int*/ uri = WebKitGTK.webkit_web_frame_get_uri (web_frame);
return handleLoadCommitted (uri, false);
}
case WebKitGTK.WEBKIT_LOAD_FINISHED: {
@@ -1553,9 +1553,9 @@ int /*long*/ webframe_notify_load_status (int /*long*/ web_frame, int /*long*/ p
* response to navigating to a main document containing frames) then
* treat this as a completed load.
*/
- int /*long*/ parentFrame = WebKitGTK.webkit_web_frame_get_parent (web_frame);
+ long /*int*/ parentFrame = WebKitGTK.webkit_web_frame_get_parent (web_frame);
if (WebKitGTK.webkit_web_frame_get_load_status (parentFrame) == WebKitGTK.WEBKIT_LOAD_FINISHED) {
- int /*long*/ uri = WebKitGTK.webkit_web_frame_get_uri (web_frame);
+ long /*int*/ uri = WebKitGTK.webkit_web_frame_get_uri (web_frame);
return handleLoadFinished (uri, false);
}
}
@@ -1563,7 +1563,7 @@ int /*long*/ webframe_notify_load_status (int /*long*/ web_frame, int /*long*/ p
return 0;
}
-int /*long*/ webkit_close_web_view (int /*long*/ web_view) {
+long /*int*/ webkit_close_web_view (long /*int*/ web_view) {
WindowEvent newEvent = new WindowEvent (browser);
newEvent.display = browser.getDisplay ();
newEvent.widget = browser;
@@ -1574,11 +1574,11 @@ int /*long*/ webkit_close_web_view (int /*long*/ web_view) {
return 0;
}
-int /*long*/ webkit_console_message (int /*long*/ web_view, int /*long*/ message, int /*long*/ line, int /*long*/ source_id) {
+long /*int*/ webkit_console_message (long /*int*/ web_view, long /*int*/ message, long /*int*/ line, long /*int*/ source_id) {
return 1; /* stop the message from being written to stderr */
}
-int /*long*/ webkit_create_web_view (int /*long*/ web_view, int /*long*/ frame) {
+long /*int*/ webkit_create_web_view (long /*int*/ web_view, long /*int*/ frame) {
WindowEvent newEvent = new WindowEvent (browser);
newEvent.display = browser.getDisplay ();
newEvent.widget = browser;
@@ -1598,14 +1598,14 @@ int /*long*/ webkit_create_web_view (int /*long*/ web_view, int /*long*/ frame)
return 0;
}
-int /*long*/ webkit_download_requested (int /*long*/ web_view, int /*long*/ download) {
- int /*long*/ name = WebKitGTK.webkit_download_get_suggested_filename (download);
+long /*int*/ webkit_download_requested (long /*int*/ web_view, long /*int*/ download) {
+ long /*int*/ name = WebKitGTK.webkit_download_get_suggested_filename (download);
int length = OS.strlen (name);
byte[] bytes = new byte[length];
OS.memmove (bytes, name, length);
final String nameString = new String (Converter.mbcsToWcs (null, bytes));
- final int /*long*/ request = WebKitGTK.webkit_download_get_network_request (download);
+ final long /*int*/ request = WebKitGTK.webkit_download_get_network_request (download);
OS.g_object_ref (request);
/*
@@ -1622,7 +1622,7 @@ int /*long*/ webkit_download_requested (int /*long*/ web_view, int /*long*/ down
String path = dialog.open ();
if (path != null) {
path = URI_FILEROOT + path;
- int /*long*/ newDownload = WebKitGTK.webkit_download_new (request);
+ long /*int*/ newDownload = WebKitGTK.webkit_download_new (request);
byte[] uriBytes = Converter.wcsToMbcs (null, path, true);
WebKitGTK.webkit_download_set_destination_uri (newDownload, uriBytes);
openDownloadWindow (newDownload);
@@ -1637,7 +1637,7 @@ int /*long*/ webkit_download_requested (int /*long*/ web_view, int /*long*/ down
return 1;
}
-int /*long*/ webkit_hovering_over_link (int /*long*/ web_view, int /*long*/ title, int /*long*/ uri) {
+long /*int*/ webkit_hovering_over_link (long /*int*/ web_view, long /*int*/ title, long /*int*/ uri) {
if (uri != 0) {
int length = OS.strlen (uri);
byte[] bytes = new byte[length];
@@ -1654,7 +1654,7 @@ int /*long*/ webkit_hovering_over_link (int /*long*/ web_view, int /*long*/ titl
return 0;
}
-int /*long*/ webkit_mime_type_policy_decision_requested (int /*long*/ web_view, int /*long*/ frame, int /*long*/ request, int /*long*/ mimetype, int /*long*/ policy_decision) {
+long /*int*/ webkit_mime_type_policy_decision_requested (long /*int*/ web_view, long /*int*/ frame, long /*int*/ request, long /*int*/ mimetype, long /*int*/ policy_decision) {
boolean canShow = WebKitGTK.webkit_web_view_can_show_mime_type (webView, mimetype) != 0;
if (!canShow) {
WebKitGTK.webkit_web_policy_decision_download (policy_decision);
@@ -1663,7 +1663,7 @@ int /*long*/ webkit_mime_type_policy_decision_requested (int /*long*/ web_view,
return 0;
}
-int /*long*/ webkit_navigation_policy_decision_requested (int /*long*/ web_view, int /*long*/ frame, int /*long*/ request, int /*long*/ navigation_action, int /*long*/ policy_decision) {
+long /*int*/ webkit_navigation_policy_decision_requested (long /*int*/ web_view, long /*int*/ frame, long /*int*/ request, long /*int*/ navigation_action, long /*int*/ policy_decision) {
if (loadingText) {
/*
* WebKit is auto-navigating to about:blank in response to a
@@ -1674,7 +1674,7 @@ int /*long*/ webkit_navigation_policy_decision_requested (int /*long*/ web_view,
return 0;
}
- int /*long*/ uri = WebKitGTK.webkit_network_request_get_uri (request);
+ long /*int*/ uri = WebKitGTK.webkit_network_request_get_uri (request);
int length = OS.strlen (uri);
byte[] bytes = new byte[length];
OS.memmove (bytes, uri, length);
@@ -1707,12 +1707,12 @@ int /*long*/ webkit_navigation_policy_decision_requested (int /*long*/ web_view,
if (jsEnabled != jsEnabledOnNextPage) {
jsEnabled = jsEnabledOnNextPage;
DisabledJSCount += !jsEnabled ? 1 : -1;
- int /*long*/ settings = WebKitGTK.webkit_web_view_get_settings (webView);
+ long /*int*/ settings = WebKitGTK.webkit_web_view_get_settings (webView);
OS.g_object_set (settings, WebKitGTK.enable_scripts, jsEnabled ? 1 : 0, 0);
}
/* hook status change signal if frame is a newly-created sub-frame */
- int /*long*/ mainFrame = WebKitGTK.webkit_web_view_get_main_frame (webView);
+ long /*int*/ mainFrame = WebKitGTK.webkit_web_view_get_main_frame (webView);
if (frame != mainFrame) {
int id = OS.g_signal_handler_find (frame, OS.G_SIGNAL_MATCH_FUNC | OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, Proc3.getAddress (), NOTIFY_LOAD_STATUS);
if (id == 0) {
@@ -1735,22 +1735,22 @@ int /*long*/ webkit_navigation_policy_decision_requested (int /*long*/ web_view,
return 0;
}
-int /*long*/ webkit_notify_load_status (int /*long*/ web_view, int /*long*/ pspec) {
+long /*int*/ webkit_notify_load_status (long /*int*/ web_view, long /*int*/ pspec) {
int status = WebKitGTK.webkit_web_view_get_load_status (webView);
switch (status) {
case WebKitGTK.WEBKIT_LOAD_COMMITTED: {
- int /*long*/ uri = WebKitGTK.webkit_web_view_get_uri (webView);
+ long /*int*/ uri = WebKitGTK.webkit_web_view_get_uri (webView);
return handleLoadCommitted (uri, true);
}
case WebKitGTK.WEBKIT_LOAD_FINISHED: {
- int /*long*/ uri = WebKitGTK.webkit_web_view_get_uri (webView);
+ long /*int*/ uri = WebKitGTK.webkit_web_view_get_uri (webView);
return handleLoadFinished (uri, true);
}
}
return 0;
}
-int /*long*/ webkit_notify_progress (int /*long*/ web_view, int /*long*/ pspec) {
+long /*int*/ webkit_notify_progress (long /*int*/ web_view, long /*int*/ pspec) {
ProgressEvent event = new ProgressEvent (browser);
event.display = browser.getDisplay ();
event.widget = browser;
@@ -1762,8 +1762,8 @@ int /*long*/ webkit_notify_progress (int /*long*/ web_view, int /*long*/ pspec)
return 0;
}
-int /*long*/ webkit_notify_title (int /*long*/ web_view, int /*long*/ pspec) {
- int /*long*/ title = WebKitGTK.webkit_web_view_get_title (webView);
+long /*int*/ webkit_notify_title (long /*int*/ web_view, long /*int*/ pspec) {
+ long /*int*/ title = WebKitGTK.webkit_web_view_get_title (webView);
String titleString;
if (title == 0) {
titleString = ""; //$NON-NLS-1$
@@ -1783,7 +1783,7 @@ int /*long*/ webkit_notify_title (int /*long*/ web_view, int /*long*/ pspec) {
return 0;
}
-int /*long*/ webkit_populate_popup (int /*long*/ web_view, int /*long*/ webkit_menu) {
+long /*int*/ webkit_populate_popup (long /*int*/ web_view, long /*int*/ webkit_menu) {
Point pt = browser.getDisplay ().getCursorLocation ();
Event event = new Event ();
event.x = pt.x;
@@ -1791,10 +1791,10 @@ int /*long*/ webkit_populate_popup (int /*long*/ web_view, int /*long*/ webkit_m
browser.notifyListeners (SWT.MenuDetect, event);
if (!event.doit) {
/* clear the menu */
- int /*long*/ children = OS.gtk_container_get_children (webkit_menu);
- int /*long*/ current = children;
+ long /*int*/ children = OS.gtk_container_get_children (webkit_menu);
+ long /*int*/ current = children;
while (current != 0) {
- int /*long*/ item = OS.g_list_data (current);
+ long /*int*/ item = OS.g_list_data (current);
OS.gtk_container_remove (webkit_menu, item);
current = OS.g_list_next (current);
}
@@ -1808,10 +1808,10 @@ int /*long*/ webkit_populate_popup (int /*long*/ web_view, int /*long*/ webkit_m
}
menu.setVisible (true);
/* clear the menu */
- int /*long*/ children = OS.gtk_container_get_children (webkit_menu);
- int /*long*/ current = children;
+ long /*int*/ children = OS.gtk_container_get_children (webkit_menu);
+ long /*int*/ current = children;
while (current != 0) {
- int /*long*/ item = OS.g_list_data (current);
+ long /*int*/ item = OS.g_list_data (current);
OS.gtk_container_remove (webkit_menu, item);
current = OS.g_list_next (current);
}
@@ -1820,18 +1820,18 @@ int /*long*/ webkit_populate_popup (int /*long*/ web_view, int /*long*/ webkit_m
return 0;
}
-int /*long*/ webkit_resource_request_starting (int /*long*/ web_view, int /*long*/ web_frame, int /*long*/ web_resource, int /*long*/ request, int /*long*/ response) {
+long /*int*/ webkit_resource_request_starting (long /*int*/ web_view, long /*int*/ web_frame, long /*int*/ web_resource, long /*int*/ request, long /*int*/ response) {
if (postData != null || headers != null) {
- int /*long*/ message = WebKitGTK.webkit_network_request_get_message (request);
+ long /*int*/ message = WebKitGTK.webkit_network_request_get_message (request);
if (message == 0) {
headers = null;
postData = null;
} else {
if (postData != null) {
WebKitGTK.SoupMessage_method (message, PostString);
- int /*long*/ body = WebKitGTK.SoupMessage_request_body (message);
+ long /*int*/ body = WebKitGTK.SoupMessage_request_body (message);
byte[] bytes = Converter.wcsToMbcs (null, postData, false);
- int /*long*/ data = C.malloc (bytes.length);
+ long /*int*/ data = C.malloc (bytes.length);
C.memmove (data, bytes, bytes.length);
WebKitGTK.soup_message_body_append (body, WebKitGTK.SOUP_MEMORY_TAKE, data, bytes.length);
WebKitGTK.soup_message_body_flatten (body);
@@ -1858,7 +1858,7 @@ int /*long*/ webkit_resource_request_starting (int /*long*/ web_view, int /*long
}
/* headers */
- int /*long*/ requestHeaders = WebKitGTK.SoupMessage_request_headers (message);
+ long /*int*/ requestHeaders = WebKitGTK.SoupMessage_request_headers (message);
for (int i = 0; i < headers.length; i++) {
String current = headers[i];
if (current != null) {
@@ -1881,7 +1881,7 @@ int /*long*/ webkit_resource_request_starting (int /*long*/ web_view, int /*long
return 0;
}
-int /*long*/ webkit_status_bar_text_changed (int /*long*/ web_view, int /*long*/ text) {
+long /*int*/ webkit_status_bar_text_changed (long /*int*/ web_view, long /*int*/ text) {
int length = OS.strlen (text);
byte[] bytes = new byte[length];
OS.memmove (bytes, text, length);
@@ -1895,12 +1895,12 @@ int /*long*/ webkit_status_bar_text_changed (int /*long*/ web_view, int /*long*/
return 0;
}
-int /*long*/ webkit_web_view_ready (int /*long*/ web_view) {
+long /*int*/ webkit_web_view_ready (long /*int*/ web_view) {
WindowEvent newEvent = new WindowEvent (browser);
newEvent.display = browser.getDisplay ();
newEvent.widget = browser;
- int /*long*/ settings = WebKitGTK.webkit_web_view_get_window_features (webView);
+ long /*int*/ settings = WebKitGTK.webkit_web_view_get_window_features (webView);
int[] result = new int[1];
OS.g_object_get (settings, WebKitGTK.locationbar_visible, result, 0);
newEvent.addressBar = result[0] != 0;
@@ -1938,16 +1938,16 @@ int /*long*/ webkit_web_view_ready (int /*long*/ web_view) {
return 0;
}
-int /*long*/ webkit_window_object_cleared (int /*long*/ web_view, int /*long*/ frame, int /*long*/ context, int /*long*/ window_object) {
- int /*long*/ globalObject = WebKitGTK.JSContextGetGlobalObject (context);
- int /*long*/ externalObject = WebKitGTK.JSObjectMake (context, ExternalClass, webViewData);
+long /*int*/ webkit_window_object_cleared (long /*int*/ web_view, long /*int*/ frame, long /*int*/ context, long /*int*/ window_object) {
+ long /*int*/ globalObject = WebKitGTK.JSContextGetGlobalObject (context);
+ long /*int*/ externalObject = WebKitGTK.JSObjectMake (context, ExternalClass, webViewData);
byte[] bytes = null;
try {
bytes = (OBJECTNAME_EXTERNAL + '\0').getBytes (CHARSET_UTF8);
} catch (UnsupportedEncodingException e) {
bytes = Converter.wcsToMbcs (null, OBJECTNAME_EXTERNAL, true);
}
- int /*long*/ name = WebKitGTK.JSStringCreateWithUTF8CString (bytes);
+ long /*int*/ name = WebKitGTK.JSStringCreateWithUTF8CString (bytes);
WebKitGTK.JSObjectSetProperty (context, globalObject, name, externalObject, 0, null);
WebKitGTK.JSStringRelease (name);
Enumeration elements = functions.elements ();
@@ -1955,16 +1955,16 @@ int /*long*/ webkit_window_object_cleared (int /*long*/ web_view, int /*long*/ f
BrowserFunction current = (BrowserFunction)elements.nextElement ();
execute (current.functionString);
}
- int /*long*/ mainFrame = WebKitGTK.webkit_web_view_get_main_frame (webView);
+ long /*int*/ mainFrame = WebKitGTK.webkit_web_view_get_main_frame (webView);
boolean top = mainFrame == frame;
addEventHandlers (web_view, top);
return 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 = WebKitGTK.JSValueGetType (ctx, result[0]);
if (type == WebKitGTK.kJSTypeNumber) {
@@ -2004,7 +2004,7 @@ int /*long*/ callJava (int /*long*/ ctx, int /*long*/ func, int /*long*/ thisObj
return convertToJS (ctx, returnValue);
}
-int /*long*/ convertToJS (int /*long*/ ctx, Object value) {
+long /*int*/ convertToJS (long /*int*/ ctx, Object value) {
if (value == null) {
return WebKitGTK.JSValueMakeUndefined (ctx);
}
@@ -2015,8 +2015,8 @@ int /*long*/ convertToJS (int /*long*/ ctx, Object value) {
} catch (UnsupportedEncodingException e) {
bytes = Converter.wcsToMbcs (null, (String)value, true);
}
- int /*long*/ stringRef = WebKitGTK.JSStringCreateWithUTF8CString (bytes);
- int /*long*/ result = WebKitGTK.JSValueMakeString (ctx, stringRef);
+ long /*int*/ stringRef = WebKitGTK.JSStringCreateWithUTF8CString (bytes);
+ long /*int*/ result = WebKitGTK.JSValueMakeString (ctx, stringRef);
WebKitGTK.JSStringRelease (stringRef);
return result;
}
@@ -2029,10 +2029,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 WebKitGTK.JSObjectMakeArray (ctx, length, arguments, null);
@@ -2041,7 +2041,7 @@ int /*long*/ convertToJS (int /*long*/ ctx, Object value) {
return 0;
}
-Object convertToJava (int /*long*/ ctx, int /*long*/ value) {
+Object convertToJava (long /*int*/ ctx, long /*int*/ value) {
int type = WebKitGTK.JSValueGetType (ctx, value);
switch (type) {
case WebKitGTK.kJSTypeBoolean: {
@@ -2053,9 +2053,9 @@ Object convertToJava (int /*long*/ ctx, int /*long*/ value) {
return new Double(result);
}
case WebKitGTK.kJSTypeString: {
- int /*long*/ string = WebKitGTK.JSValueToStringCopy (ctx, value, null);
+ long /*int*/ string = WebKitGTK.JSValueToStringCopy (ctx, value, null);
if (string == 0) return ""; //$NON-NLS-1$
- int /*long*/ length = WebKitGTK.JSStringGetMaximumUTF8CStringSize (string);
+ long /*int*/ length = WebKitGTK.JSStringGetMaximumUTF8CStringSize (string);
byte[] bytes = new byte[(int)/*64*/length];
length = WebKitGTK.JSStringGetUTF8CString (string, bytes, length);
WebKitGTK.JSStringRelease (string);
@@ -2076,15 +2076,15 @@ Object convertToJava (int /*long*/ ctx, int /*long*/ value) {
} catch (UnsupportedEncodingException e) {
bytes = Converter.wcsToMbcs (null, PROPERTY_LENGTH, true);
}
- int /*long*/ propertyName = WebKitGTK.JSStringCreateWithUTF8CString (bytes);
- int /*long*/ valuePtr = WebKitGTK.JSObjectGetProperty (ctx, value, propertyName, null);
+ long /*int*/ propertyName = WebKitGTK.JSStringCreateWithUTF8CString (bytes);
+ long /*int*/ valuePtr = WebKitGTK.JSObjectGetProperty (ctx, value, propertyName, null);
WebKitGTK.JSStringRelease (propertyName);
type = WebKitGTK.JSValueGetType (ctx, valuePtr);
if (type == WebKitGTK.kJSTypeNumber) {
int length = (int)WebKitGTK.JSValueToNumber (ctx, valuePtr, null);
Object[] result = new Object[length];
for (int i = 0; i < length; i++) {
- int /*long*/ current = WebKitGTK.JSObjectGetPropertyAtIndex (ctx, value, i, null);
+ long /*int*/ current = WebKitGTK.JSObjectGetPropertyAtIndex (ctx, value, i, null);
if (current != 0) {
result[i] = convertToJava (ctx, current);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/JSClassDefinition.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/JSClassDefinition.java
index 8c75e6918d..81580451fb 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/JSClassDefinition.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/JSClassDefinition.java
@@ -19,35 +19,35 @@ public class JSClassDefinition {
public int version;
public int attributes;
/** @field cast=(const char*) */
- public int /*long*/ className;
+ public long /*int*/ className;
/** @field cast=(void*) */
- public int /*long*/ parentClass;
+ public long /*int*/ parentClass;
/** @field cast=(const void*) */
- public int /*long*/ staticValues;
+ public long /*int*/ staticValues;
/** @field cast=(const void*) */
- public int /*long*/ staticFunctions;
+ public long /*int*/ staticFunctions;
/** @field cast=(void*) */
- public int /*long*/ initialize;
+ public long /*int*/ initialize;
/** @field cast=(void*) */
- public int /*long*/ finalize;
+ public long /*int*/ finalize;
/** @field cast=(void*) */
- public int /*long*/ hasProperty;
+ public long /*int*/ hasProperty;
/** @field cast=(void*) */
- public int /*long*/ getProperty;
+ public long /*int*/ getProperty;
/** @field cast=(void*) */
- public int /*long*/ setProperty;
+ public long /*int*/ setProperty;
/** @field cast=(void*) */
- public int /*long*/ deleteProperty;
+ public long /*int*/ deleteProperty;
/** @field cast=(void*) */
- public int /*long*/ getPropertyNames;
+ public long /*int*/ getPropertyNames;
/** @field cast=(void*) */
- public int /*long*/ callAsFunction;
+ public long /*int*/ callAsFunction;
/** @field cast=(void*) */
- public int /*long*/ callAsConstructor;
+ public long /*int*/ callAsConstructor;
/** @field cast=(void*) */
- public int /*long*/ hasInstance;
+ public long /*int*/ hasInstance;
/** @field cast=(void*) */
- public int /*long*/ convertToType;
+ public long /*int*/ convertToType;
public static final int sizeof = WebKitGTK.JSClassDefinition_sizeof();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java
index f40c98da38..029041b089 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java
@@ -90,8 +90,8 @@ protected static byte [] ascii (String name) {
/** @method flags=dynamic */
-public static final native int /*long*/ _JSClassCreate (int /*long*/ definition);
-public static final int /*long*/ JSClassCreate (int /*long*/ definition) {
+public static final native long /*int*/ _JSClassCreate (long /*int*/ definition);
+public static final long /*int*/ JSClassCreate (long /*int*/ definition) {
lock.lock();
try {
return _JSClassCreate (definition);
@@ -101,8 +101,8 @@ public static final int /*long*/ JSClassCreate (int /*long*/ definition) {
}
/** @method flags=dynamic */
-public static final native int /*long*/ _JSContextGetGlobalObject (int /*long*/ ctx);
-public static final int /*long*/ JSContextGetGlobalObject (int /*long*/ ctx) {
+public static final native long /*int*/ _JSContextGetGlobalObject (long /*int*/ ctx);
+public static final long /*int*/ JSContextGetGlobalObject (long /*int*/ ctx) {
lock.lock();
try {
return _JSContextGetGlobalObject (ctx);
@@ -112,8 +112,8 @@ public static final int /*long*/ JSContextGetGlobalObject (int /*long*/ ctx) {
}
/** @method flags=dynamic */
-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 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);
+public static final long /*int*/ JSEvaluateScript (long /*int*/ ctx, long /*int*/ script, long /*int*/ thisObject, long /*int*/ sourceURL, int startingLineNumber, long /*int*/[] exception) {
lock.lock();
try {
return _JSEvaluateScript (ctx, script, thisObject, sourceURL, startingLineNumber, exception);
@@ -123,8 +123,8 @@ public static final int /*long*/ JSEvaluateScript (int /*long*/ ctx, int /*long*
}
/** @method flags=dynamic */
-public static final native int /*long*/ _JSObjectGetPrivate (int /*long*/ object);
-public static final int /*long*/ JSObjectGetPrivate (int /*long*/ object) {
+public static final native long /*int*/ _JSObjectGetPrivate (long /*int*/ object);
+public static final long /*int*/ JSObjectGetPrivate (long /*int*/ object) {
lock.lock();
try {
return _JSObjectGetPrivate (object);
@@ -134,8 +134,8 @@ public static final int /*long*/ JSObjectGetPrivate (int /*long*/ object) {
}
/** @method flags=dynamic */
-public static final native int /*long*/ _JSObjectGetProperty (int /*long*/ ctx, int /*long*/ object, int /*long*/ propertyName, int /*long*/[] exception);
-public static final 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);
+public static final long /*int*/ JSObjectGetProperty (long /*int*/ ctx, long /*int*/ object, long /*int*/ propertyName, long /*int*/[] exception) {
lock.lock();
try {
return _JSObjectGetProperty (ctx, object, propertyName, exception);
@@ -145,8 +145,8 @@ public static final int /*long*/ JSObjectGetProperty (int /*long*/ ctx, int /*lo
}
/** @method flags=dynamic */
-public static final native int /*long*/ _JSObjectGetPropertyAtIndex (int /*long*/ ctx, int /*long*/ object, int propertyIndex, int /*long*/[] exception);
-public static final 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);
+public static final long /*int*/ JSObjectGetPropertyAtIndex (long /*int*/ ctx, long /*int*/ object, int propertyIndex, long /*int*/[] exception) {
lock.lock();
try {
return _JSObjectGetPropertyAtIndex (ctx, object, propertyIndex, exception);
@@ -156,8 +156,8 @@ public static final int /*long*/ JSObjectGetPropertyAtIndex (int /*long*/ ctx, i
}
/** @method flags=dynamic */
-public static final native int /*long*/ _JSObjectMake (int /*long*/ ctx, int /*long*/ jsClass, int /*long*/ data);
-public static final int /*long*/ JSObjectMake (int /*long*/ ctx, int /*long*/ jsClass, int /*long*/ data) {
+public static final native long /*int*/ _JSObjectMake (long /*int*/ ctx, long /*int*/ jsClass, long /*int*/ data);
+public static final long /*int*/ JSObjectMake (long /*int*/ ctx, long /*int*/ jsClass, long /*int*/ data) {
lock.lock();
try {
return _JSObjectMake (ctx, jsClass, data);
@@ -167,8 +167,8 @@ public static final int /*long*/ JSObjectMake (int /*long*/ ctx, int /*long*/ js
}
/** @method flags=dynamic */
-public static final native int /*long*/ _JSObjectMakeArray (int /*long*/ ctx, int /*long*/ argumentCount, int /*long*/[] arguments, int /*long*/[] exception);
-public static final 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);
+public static final long /*int*/ JSObjectMakeArray (long /*int*/ ctx, long /*int*/ argumentCount, long /*int*/[] arguments, long /*int*/[] exception) {
lock.lock();
try {
return _JSObjectMakeArray (ctx, argumentCount, arguments, exception);
@@ -178,8 +178,8 @@ public static final int /*long*/ JSObjectMakeArray (int /*long*/ ctx, int /*long
}
/** @method flags=dynamic */
-public static final native int /*long*/ _JSObjectMakeFunctionWithCallback (int /*long*/ ctx, int /*long*/ name, int /*long*/ callAsFunction);
-public static final int /*long*/ JSObjectMakeFunctionWithCallback (int /*long*/ ctx, int /*long*/ name, int /*long*/ callAsFunction) {
+public static final native long /*int*/ _JSObjectMakeFunctionWithCallback (long /*int*/ ctx, long /*int*/ name, long /*int*/ callAsFunction);
+public static final long /*int*/ JSObjectMakeFunctionWithCallback (long /*int*/ ctx, long /*int*/ name, long /*int*/ callAsFunction) {
lock.lock();
try {
return _JSObjectMakeFunctionWithCallback (ctx, name, callAsFunction);
@@ -189,8 +189,8 @@ public static final int /*long*/ JSObjectMakeFunctionWithCallback (int /*long*/
}
/** @method flags=dynamic */
-public static final native void _JSObjectSetProperty (int /*long*/ ctx, int /*long*/ object, int /*long*/ propertyName, int /*long*/ value, int attributes, int /*long*/[] exception);
-public static final void JSObjectSetProperty (int /*long*/ ctx, int /*long*/ object, int /*long*/ propertyName, int /*long*/ value, int attributes, int /*long*/[] exception) {
+public static final native void _JSObjectSetProperty (long /*int*/ ctx, long /*int*/ object, long /*int*/ propertyName, long /*int*/ value, int attributes, long /*int*/[] exception);
+public static final void JSObjectSetProperty (long /*int*/ ctx, long /*int*/ object, long /*int*/ propertyName, long /*int*/ value, int attributes, long /*int*/[] exception) {
lock.lock();
try {
_JSObjectSetProperty (ctx, object, propertyName, value, attributes, exception);
@@ -200,8 +200,8 @@ public static final void JSObjectSetProperty (int /*long*/ ctx, int /*long*/ obj
}
/** @method flags=dynamic */
-public static final native int /*long*/ _JSStringCreateWithUTF8CString (byte[] string);
-public static final int /*long*/ JSStringCreateWithUTF8CString (byte[] string) {
+public static final native long /*int*/ _JSStringCreateWithUTF8CString (byte[] string);
+public static final long /*int*/ JSStringCreateWithUTF8CString (byte[] string) {
lock.lock();
try {
return _JSStringCreateWithUTF8CString (string);
@@ -211,8 +211,8 @@ public static final int /*long*/ JSStringCreateWithUTF8CString (byte[] string) {
}
/** @method flags=dynamic */
-public static final native int /*long*/ _JSStringGetLength (int /*long*/ string);
-public static final int /*long*/ JSStringGetLength (int /*long*/ string) {
+public static final native long /*int*/ _JSStringGetLength (long /*int*/ string);
+public static final long /*int*/ JSStringGetLength (long /*int*/ string) {
lock.lock();
try {
return _JSStringGetLength (string);
@@ -222,8 +222,8 @@ public static final int /*long*/ JSStringGetLength (int /*long*/ string) {
}
/** @method flags=dynamic */
-public static final native int /*long*/ _JSStringGetMaximumUTF8CStringSize (int /*long*/ string);
-public static final int /*long*/ JSStringGetMaximumUTF8CStringSize (int /*long*/ string) {
+public static final native long /*int*/ _JSStringGetMaximumUTF8CStringSize (long /*int*/ string);
+public static final long /*int*/ JSStringGetMaximumUTF8CStringSize (long /*int*/ string) {
lock.lock();
try {
return _JSStringGetMaximumUTF8CStringSize (string);
@@ -233,8 +233,8 @@ public static final int /*long*/ JSStringGetMaximumUTF8CStringSize (int /*long*/
}
/** @method flags=dynamic */
-public static final native int /*long*/ _JSStringGetUTF8CString (int /*long*/ string, byte[] buffer, int /*long*/ bufferSize);
-public static final int /*long*/ JSStringGetUTF8CString (int /*long*/ string, byte[] buffer, int /*long*/ bufferSize) {
+public static final native long /*int*/ _JSStringGetUTF8CString (long /*int*/ string, byte[] buffer, long /*int*/ bufferSize);
+public static final long /*int*/ JSStringGetUTF8CString (long /*int*/ string, byte[] buffer, long /*int*/ bufferSize) {
lock.lock();
try {
return _JSStringGetUTF8CString (string, buffer, bufferSize);
@@ -244,8 +244,8 @@ public static final int /*long*/ JSStringGetUTF8CString (int /*long*/ string, by
}
/** @method flags=dynamic */
-public static final native int _JSStringIsEqualToUTF8CString (int /*long*/ a, byte[] b);
-public static final int JSStringIsEqualToUTF8CString (int /*long*/ a, byte[] b) {
+public static final native int _JSStringIsEqualToUTF8CString (long /*int*/ a, byte[] b);
+public static final int JSStringIsEqualToUTF8CString (long /*int*/ a, byte[] b) {
lock.lock();
try {
return _JSStringIsEqualToUTF8CString (a, b);
@@ -255,8 +255,8 @@ public static final int JSStringIsEqualToUTF8CString (int /*long*/ a, byte[] b)
}
/** @method flags=dynamic */
-public static final native void _JSStringRelease (int /*long*/ string);
-public static final void JSStringRelease (int /*long*/ string) {
+public static final native void _JSStringRelease (long /*int*/ string);
+public static final void JSStringRelease (long /*int*/ string) {
lock.lock();
try {
_JSStringRelease (string);
@@ -266,8 +266,8 @@ public static final void JSStringRelease (int /*long*/ string) {
}
/** @method flags=dynamic */
-public static final native int _JSValueGetType (int /*long*/ ctx, int /*long*/ value);
-public static final int JSValueGetType (int /*long*/ ctx, int /*long*/ value) {
+public static final native int _JSValueGetType (long /*int*/ ctx, long /*int*/ value);
+public static final int JSValueGetType (long /*int*/ ctx, long /*int*/ value) {
lock.lock();
try {
return _JSValueGetType (ctx, value);
@@ -277,8 +277,8 @@ public static final int JSValueGetType (int /*long*/ ctx, int /*long*/ value) {
}
/** @method flags=dynamic */
-public static final native int _JSValueIsObjectOfClass (int /*long*/ ctx, int /*long*/ value, int /*long*/ jsClass);
-public static final 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);
+public static final int JSValueIsObjectOfClass (long /*int*/ ctx, long /*int*/ value, long /*int*/ jsClass) {
lock.lock();
try {
return _JSValueIsObjectOfClass (ctx, value, jsClass);
@@ -288,8 +288,8 @@ public static final int JSValueIsObjectOfClass (int /*long*/ ctx, int /*long*/ v
}
/** @method flags=dynamic */
-public static final native int /*long*/ _JSValueMakeBoolean (int /*long*/ ctx, int bool);
-public static final int /*long*/ JSValueMakeBoolean (int /*long*/ ctx, int bool) {
+public static final native long /*int*/ _JSValueMakeBoolean (long /*int*/ ctx, int bool);
+public static final long /*int*/ JSValueMakeBoolean (long /*int*/ ctx, int bool) {
lock.lock();
try {
return _JSValueMakeBoolean (ctx, bool);
@@ -299,8 +299,8 @@ public static final int /*long*/ JSValueMakeBoolean (int /*long*/ ctx, int bool)
}
/** @method flags=dynamic */
-public static final native int /*long*/ _JSValueMakeNumber (int /*long*/ ctx, double number);
-public static final int /*long*/ JSValueMakeNumber (int /*long*/ ctx, double number) {
+public static final native long /*int*/ _JSValueMakeNumber (long /*int*/ ctx, double number);
+public static final long /*int*/ JSValueMakeNumber (long /*int*/ ctx, double number) {
lock.lock();
try {
return _JSValueMakeNumber (ctx, number);
@@ -310,8 +310,8 @@ public static final int /*long*/ JSValueMakeNumber (int /*long*/ ctx, double num
}
/** @method flags=dynamic */
-public static final native int /*long*/ _JSValueMakeString (int /*long*/ ctx, int /*long*/ string);
-public static final int /*long*/ JSValueMakeString (int /*long*/ ctx, int /*long*/ string) {
+public static final native long /*int*/ _JSValueMakeString (long /*int*/ ctx, long /*int*/ string);
+public static final long /*int*/ JSValueMakeString (long /*int*/ ctx, long /*int*/ string) {
lock.lock();
try {
return _JSValueMakeString (ctx, string);
@@ -321,8 +321,8 @@ public static final int /*long*/ JSValueMakeString (int /*long*/ ctx, int /*long
}
/** @method flags=dynamic */
-public static final native int /*long*/ _JSValueMakeUndefined (int /*long*/ ctx);
-public static final int /*long*/ JSValueMakeUndefined (int /*long*/ ctx) {
+public static final native long /*int*/ _JSValueMakeUndefined (long /*int*/ ctx);
+public static final long /*int*/ JSValueMakeUndefined (long /*int*/ ctx) {
lock.lock();
try {
return _JSValueMakeUndefined (ctx);
@@ -332,8 +332,8 @@ public static final int /*long*/ JSValueMakeUndefined (int /*long*/ ctx) {
}
/** @method flags=dynamic */
-public static final native double _JSValueToNumber (int /*long*/ ctx, int /*long*/ value, int /*long*/[] exception);
-public static final 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);
+public static final double JSValueToNumber (long /*int*/ ctx, long /*int*/ value, long /*int*/[] exception) {
lock.lock();
try {
return _JSValueToNumber (ctx, value, exception);
@@ -343,8 +343,8 @@ public static final double JSValueToNumber (int /*long*/ ctx, int /*long*/ value
}
/** @method flags=dynamic */
-public static final native int /*long*/ _JSValueToStringCopy (int /*long*/ ctx, int /*long*/ value, int /*long*/[] exception);
-public static final 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);
+public static final long /*int*/ JSValueToStringCopy (long /*int*/ ctx, long /*int*/ value, long /*int*/[] exception) {
lock.lock();
try {
return _JSValueToStringCopy (ctx, value, exception);
@@ -356,8 +356,8 @@ public static final int /*long*/ JSValueToStringCopy (int /*long*/ ctx, int /*lo
/* --------------------- start libsoup natives --------------------- */
/** @method flags=dynamic */
-public static final native void _soup_auth_authenticate (int /*long*/ auth, byte[] username, byte[] password);
-public static final void soup_auth_authenticate (int /*long*/ auth, byte[] username, byte[] password) {
+public static final native void _soup_auth_authenticate (long /*int*/ auth, byte[] username, byte[] password);
+public static final void soup_auth_authenticate (long /*int*/ auth, byte[] username, byte[] password) {
lock.lock();
try {
_soup_auth_authenticate (auth, username, password);
@@ -367,8 +367,8 @@ public static final void soup_auth_authenticate (int /*long*/ auth, byte[] usern
}
/** @method flags=dynamic */
-public static final native int /*long*/ _soup_auth_get_host (int /*long*/ auth);
-public static final int /*long*/ soup_auth_get_host (int /*long*/ auth) {
+public static final native long /*int*/ _soup_auth_get_host (long /*int*/ auth);
+public static final long /*int*/ soup_auth_get_host (long /*int*/ auth) {
lock.lock();
try {
return _soup_auth_get_host (auth);
@@ -378,8 +378,8 @@ public static final int /*long*/ soup_auth_get_host (int /*long*/ auth) {
}
/** @method flags=dynamic */
-public static final native int /*long*/ _soup_auth_get_scheme_name (int /*long*/ auth);
-public static final int /*long*/ soup_auth_get_scheme_name (int /*long*/ auth) {
+public static final native long /*int*/ _soup_auth_get_scheme_name (long /*int*/ auth);
+public static final long /*int*/ soup_auth_get_scheme_name (long /*int*/ auth) {
lock.lock();
try {
return _soup_auth_get_scheme_name (auth);
@@ -389,8 +389,8 @@ public static final int /*long*/ soup_auth_get_scheme_name (int /*long*/ auth) {
}
/** @method flags=dynamic */
-public static final native void _soup_cookie_free (int /*long*/ cookie);
-public static final void soup_cookie_free (int /*long*/ cookie) {
+public static final native void _soup_cookie_free (long /*int*/ cookie);
+public static final void soup_cookie_free (long /*int*/ cookie) {
lock.lock();
try {
_soup_cookie_free (cookie);
@@ -400,8 +400,8 @@ public static final void soup_cookie_free (int /*long*/ cookie) {
}
/** @method flags=dynamic */
-public static final native void _soup_cookie_jar_add_cookie (int /*long*/ jar, int /*long*/ cookie);
-public static final void soup_cookie_jar_add_cookie (int /*long*/ jar, int /*long*/ cookie) {
+public static final native void _soup_cookie_jar_add_cookie (long /*int*/ jar, long /*int*/ cookie);
+public static final void soup_cookie_jar_add_cookie (long /*int*/ jar, long /*int*/ cookie) {
lock.lock();
try {
_soup_cookie_jar_add_cookie (jar, cookie);
@@ -411,8 +411,8 @@ public static final void soup_cookie_jar_add_cookie (int /*long*/ jar, int /*lon
}
/** @method flags=dynamic */
-public static final native int /*long*/ _soup_cookie_jar_all_cookies (int /*long*/ jar);
-public static final int /*long*/ soup_cookie_jar_all_cookies (int /*long*/ jar) {
+public static final native long /*int*/ _soup_cookie_jar_all_cookies (long /*int*/ jar);
+public static final long /*int*/ soup_cookie_jar_all_cookies (long /*int*/ jar) {
lock.lock();
try {
return _soup_cookie_jar_all_cookies (jar);
@@ -422,8 +422,8 @@ public static final int /*long*/ soup_cookie_jar_all_cookies (int /*long*/ jar)
}
/** @method flags=dynamic */
-public static final native void _soup_cookie_jar_delete_cookie (int /*long*/ jar, int /*long*/ cookie);
-public static final void soup_cookie_jar_delete_cookie (int /*long*/ jar, int /*long*/ cookie) {
+public static final native void _soup_cookie_jar_delete_cookie (long /*int*/ jar, long /*int*/ cookie);
+public static final void soup_cookie_jar_delete_cookie (long /*int*/ jar, long /*int*/ cookie) {
lock.lock();
try {
_soup_cookie_jar_delete_cookie (jar, cookie);
@@ -433,8 +433,8 @@ public static final void soup_cookie_jar_delete_cookie (int /*long*/ jar, int /*
}
/** @method flags=dynamic */
-public static final native int /*long*/ _soup_cookie_jar_get_cookies (int /*long*/ jar, int /*long*/ uri, int for_http);
-public static final int /*long*/ soup_cookie_jar_get_cookies (int /*long*/ jar, int /*long*/ uri, int for_http) {
+public static final native long /*int*/ _soup_cookie_jar_get_cookies (long /*int*/ jar, long /*int*/ uri, int for_http);
+public static final long /*int*/ soup_cookie_jar_get_cookies (long /*int*/ jar, long /*int*/ uri, int for_http) {
lock.lock();
try {
return _soup_cookie_jar_get_cookies (jar, uri, for_http);
@@ -444,8 +444,8 @@ public static final int /*long*/ soup_cookie_jar_get_cookies (int /*long*/ jar,
}
/** @method flags=dynamic */
-public static final native int /*long*/ _soup_cookie_jar_get_type ();
-public static final int /*long*/ soup_cookie_jar_get_type () {
+public static final native long /*int*/ _soup_cookie_jar_get_type ();
+public static final long /*int*/ soup_cookie_jar_get_type () {
lock.lock();
try {
return _soup_cookie_jar_get_type ();
@@ -455,8 +455,8 @@ public static final int /*long*/ soup_cookie_jar_get_type () {
}
/** @method flags=dynamic */
-public static final native int /*long*/ _soup_cookie_parse (byte[] header, int /*long*/ origin);
-public static final int /*long*/ soup_cookie_parse (byte[] header, int /*long*/ origin) {
+public static final native long /*int*/ _soup_cookie_parse (byte[] header, long /*int*/ origin);
+public static final long /*int*/ soup_cookie_parse (byte[] header, long /*int*/ origin) {
lock.lock();
try {
return _soup_cookie_parse (header, origin);
@@ -466,8 +466,8 @@ public static final int /*long*/ soup_cookie_parse (byte[] header, int /*long*/
}
/** @method flags=dynamic */
-public static final native void _soup_message_body_append (int /*long*/ body, int use, int /*long*/ data, int /*long*/ length);
-public static final void soup_message_body_append (int /*long*/ body, int use, int /*long*/ data, int /*long*/ length) {
+public static final native void _soup_message_body_append (long /*int*/ body, int use, long /*int*/ data, long /*int*/ length);
+public static final void soup_message_body_append (long /*int*/ body, int use, long /*int*/ data, long /*int*/ length) {
lock.lock();
try {
_soup_message_body_append (body, use, data, length);
@@ -477,8 +477,8 @@ public static final void soup_message_body_append (int /*long*/ body, int use, i
}
/** @method flags=dynamic */
-public static final native void _soup_message_body_flatten (int /*long*/ body);
-public static final void soup_message_body_flatten (int /*long*/ body) {
+public static final native void _soup_message_body_flatten (long /*int*/ body);
+public static final void soup_message_body_flatten (long /*int*/ body) {
lock.lock();
try {
_soup_message_body_flatten (body);
@@ -488,8 +488,8 @@ public static final void soup_message_body_flatten (int /*long*/ body) {
}
/** @method flags=dynamic */
-public static final native int /*long*/ _soup_message_get_uri (int /*long*/ msg);
-public static final int /*long*/ soup_message_get_uri (int /*long*/ msg) {
+public static final native long /*int*/ _soup_message_get_uri (long /*int*/ msg);
+public static final long /*int*/ soup_message_get_uri (long /*int*/ msg) {
lock.lock();
try {
return _soup_message_get_uri (msg);
@@ -499,8 +499,8 @@ public static final int /*long*/ soup_message_get_uri (int /*long*/ msg) {
}
/** @method flags=dynamic */
-public static final native void _soup_message_headers_append (int /*long*/ headers, byte[] name, byte[] value);
-public static final void soup_message_headers_append (int /*long*/ headers, byte[] name, byte[] value) {
+public static final native void _soup_message_headers_append (long /*int*/ headers, byte[] name, byte[] value);
+public static final void soup_message_headers_append (long /*int*/ headers, byte[] name, byte[] value) {
lock.lock();
try {
_soup_message_headers_append (headers, name, value);
@@ -510,8 +510,8 @@ public static final void soup_message_headers_append (int /*long*/ headers, byte
}
/** @method flags=dynamic */
-public static final native void _soup_session_add_feature_by_type (int /*long*/ session, int /*long*/ type);
-public static final void soup_session_add_feature_by_type (int /*long*/ session, int /*long*/ type) {
+public static final native void _soup_session_add_feature_by_type (long /*int*/ session, long /*int*/ type);
+public static final void soup_session_add_feature_by_type (long /*int*/ session, long /*int*/ type) {
lock.lock();
try {
_soup_session_add_feature_by_type (session, type);
@@ -521,8 +521,8 @@ public static final void soup_session_add_feature_by_type (int /*long*/ session,
}
/** @method flags=dynamic */
-public static final native int /*long*/ _soup_session_get_feature (int /*long*/ session, int /*long*/ feature_type);
-public static final int /*long*/ soup_session_get_feature (int /*long*/ session, int /*long*/ feature_type) {
+public static final native long /*int*/ _soup_session_get_feature (long /*int*/ session, long /*int*/ feature_type);
+public static final long /*int*/ soup_session_get_feature (long /*int*/ session, long /*int*/ feature_type) {
lock.lock();
try {
return _soup_session_get_feature (session, feature_type);
@@ -532,8 +532,8 @@ public static final int /*long*/ soup_session_get_feature (int /*long*/ session,
}
/** @method flags=dynamic */
-public static final native void _soup_session_feature_attach (int /*long*/ feature, int /*long*/ session);
-public static final void soup_session_feature_attach (int /*long*/ feature, int /*long*/ session) {
+public static final native void _soup_session_feature_attach (long /*int*/ feature, long /*int*/ session);
+public static final void soup_session_feature_attach (long /*int*/ feature, long /*int*/ session) {
lock.lock();
try {
_soup_session_feature_attach (feature, session);
@@ -543,8 +543,8 @@ public static final void soup_session_feature_attach (int /*long*/ feature, int
}
/** @method flags=dynamic */
-public static final native int /*long*/ _soup_session_get_type ();
-public static final int /*long*/ soup_session_get_type () {
+public static final native long /*int*/ _soup_session_get_type ();
+public static final long /*int*/ soup_session_get_type () {
lock.lock();
try {
return _soup_session_get_type ();
@@ -554,8 +554,8 @@ public static final int /*long*/ soup_session_get_type () {
}
/** @method flags=dynamic */
-public static final native void _soup_session_feature_detach (int /*long*/ feature, int /*long*/ session);
-public static final void soup_session_feature_detach (int /*long*/ feature, int /*long*/ session) {
+public static final native void _soup_session_feature_detach (long /*int*/ feature, long /*int*/ session);
+public static final void soup_session_feature_detach (long /*int*/ feature, long /*int*/ session) {
lock.lock();
try {
_soup_session_feature_detach (feature, session);
@@ -565,8 +565,8 @@ public static final void soup_session_feature_detach (int /*long*/ feature, int
}
/** @method flags=dynamic */
-public static final native void _soup_uri_free (int /*long*/ uri);
-public static final void soup_uri_free (int /*long*/ uri) {
+public static final native void _soup_uri_free (long /*int*/ uri);
+public static final void soup_uri_free (long /*int*/ uri) {
lock.lock();
try {
_soup_uri_free (uri);
@@ -576,8 +576,8 @@ public static final void soup_uri_free (int /*long*/ uri) {
}
/** @method flags=dynamic */
-public static final native int /*long*/ _soup_uri_new (byte[] uri_string);
-public static final int /*long*/ soup_uri_new (byte[] uri_string) {
+public static final native long /*int*/ _soup_uri_new (byte[] uri_string);
+public static final long /*int*/ soup_uri_new (byte[] uri_string) {
lock.lock();
try {
return _soup_uri_new (uri_string);
@@ -587,8 +587,8 @@ public static final int /*long*/ soup_uri_new (byte[] uri_string) {
}
/** @method flags=dynamic */
-public static final native int /*long*/ _soup_uri_to_string (int /*long*/ uri, int just_path_and_query);
-public static final int /*long*/ soup_uri_to_string (int /*long*/ uri, int just_path_and_query) {
+public static final native long /*int*/ _soup_uri_to_string (long /*int*/ uri, int just_path_and_query);
+public static final long /*int*/ soup_uri_to_string (long /*int*/ uri, int just_path_and_query) {
lock.lock();
try {
return _soup_uri_to_string (uri, just_path_and_query);
@@ -600,8 +600,8 @@ public static final int /*long*/ soup_uri_to_string (int /*long*/ uri, int just_
/* --------------------- start WebKitGTK natives --------------------- */
/** @method flags=dynamic */
-public static final native int _webkit_dom_event_target_add_event_listener (int /*long*/ target, byte[] name, int /*long*/ handler, int bubble, int /*long*/ userData);
-public static final int webkit_dom_event_target_add_event_listener (int /*long*/ target, byte[] name, int /*long*/ handler, int bubble, int /*long*/ userData) {
+public static final native int _webkit_dom_event_target_add_event_listener (long /*int*/ target, byte[] name, long /*int*/ handler, int bubble, long /*int*/ userData);
+public static final int webkit_dom_event_target_add_event_listener (long /*int*/ target, byte[] name, long /*int*/ handler, int bubble, long /*int*/ userData) {
lock.lock();
try {
return _webkit_dom_event_target_add_event_listener (target, name, handler, bubble, userData);
@@ -611,8 +611,8 @@ public static final int webkit_dom_event_target_add_event_listener (int /*long*/
}
/** @method flags=dynamic */
-public static final native int _webkit_dom_mouse_event_get_alt_key (int /*long*/ self);
-public static final int webkit_dom_mouse_event_get_alt_key (int /*long*/ self) {
+public static final native int _webkit_dom_mouse_event_get_alt_key (long /*int*/ self);
+public static final int webkit_dom_mouse_event_get_alt_key (long /*int*/ self) {
lock.lock();
try {
return _webkit_dom_mouse_event_get_alt_key (self);
@@ -622,8 +622,8 @@ public static final int webkit_dom_mouse_event_get_alt_key (int /*long*/ self) {
}
/** @method flags=dynamic */
-public static final native short _webkit_dom_mouse_event_get_button (int /*long*/ self);
-public static final short webkit_dom_mouse_event_get_button (int /*long*/ self) {
+public static final native short _webkit_dom_mouse_event_get_button (long /*int*/ self);
+public static final short webkit_dom_mouse_event_get_button (long /*int*/ self) {
lock.lock();
try {
return _webkit_dom_mouse_event_get_button (self);
@@ -633,8 +633,8 @@ public static final short webkit_dom_mouse_event_get_button (int /*long*/ self)
}
/** @method flags=dynamic */
-public static final native int _webkit_dom_mouse_event_get_ctrl_key (int /*long*/ self);
-public static final int webkit_dom_mouse_event_get_ctrl_key (int /*long*/ self) {
+public static final native int _webkit_dom_mouse_event_get_ctrl_key (long /*int*/ self);
+public static final int webkit_dom_mouse_event_get_ctrl_key (long /*int*/ self) {
lock.lock();
try {
return _webkit_dom_mouse_event_get_ctrl_key (self);
@@ -644,8 +644,8 @@ public static final int webkit_dom_mouse_event_get_ctrl_key (int /*long*/ self)
}
/** @method flags=dynamic */
-public static final native int _webkit_dom_mouse_event_get_meta_key (int /*long*/ self);
-public static final int webkit_dom_mouse_event_get_meta_key (int /*long*/ self) {
+public static final native int _webkit_dom_mouse_event_get_meta_key (long /*int*/ self);
+public static final int webkit_dom_mouse_event_get_meta_key (long /*int*/ self) {
lock.lock();
try {
return _webkit_dom_mouse_event_get_meta_key (self);
@@ -655,8 +655,8 @@ public static final int webkit_dom_mouse_event_get_meta_key (int /*long*/ self)
}
/** @method flags=dynamic */
-public static final native long _webkit_dom_mouse_event_get_screen_x (int /*long*/ self);
-public static final long webkit_dom_mouse_event_get_screen_x (int /*long*/ self) {
+public static final native long _webkit_dom_mouse_event_get_screen_x (long /*int*/ self);
+public static final long webkit_dom_mouse_event_get_screen_x (long /*int*/ self) {
lock.lock();
try {
return _webkit_dom_mouse_event_get_screen_x (self);
@@ -666,8 +666,8 @@ public static final long webkit_dom_mouse_event_get_screen_x (int /*long*/ self)
}
/** @method flags=dynamic */
-public static final native long _webkit_dom_mouse_event_get_screen_y (int /*long*/ self);
-public static final long webkit_dom_mouse_event_get_screen_y (int /*long*/ self) {
+public static final native long _webkit_dom_mouse_event_get_screen_y (long /*int*/ self);
+public static final long webkit_dom_mouse_event_get_screen_y (long /*int*/ self) {
lock.lock();
try {
return _webkit_dom_mouse_event_get_screen_y (self);
@@ -677,8 +677,8 @@ public static final long webkit_dom_mouse_event_get_screen_y (int /*long*/ self)
}
/** @method flags=dynamic */
-public static final native int _webkit_dom_mouse_event_get_shift_key (int /*long*/ self);
-public static final int webkit_dom_mouse_event_get_shift_key (int /*long*/ self) {
+public static final native int _webkit_dom_mouse_event_get_shift_key (long /*int*/ self);
+public static final int webkit_dom_mouse_event_get_shift_key (long /*int*/ self) {
lock.lock();
try {
return _webkit_dom_mouse_event_get_shift_key (self);
@@ -688,8 +688,8 @@ public static final int webkit_dom_mouse_event_get_shift_key (int /*long*/ self)
}
/** @method flags=dynamic */
-public static final native long _webkit_dom_ui_event_get_char_code (int /*long*/ self);
-public static final long webkit_dom_ui_event_get_char_code (int /*long*/ self) {
+public static final native long _webkit_dom_ui_event_get_char_code (long /*int*/ self);
+public static final long webkit_dom_ui_event_get_char_code (long /*int*/ self) {
lock.lock();
try {
return _webkit_dom_ui_event_get_char_code (self);
@@ -699,8 +699,8 @@ public static final long webkit_dom_ui_event_get_char_code (int /*long*/ self) {
}
/** @method flags=dynamic */
-public static final native long _webkit_dom_ui_event_get_detail (int /*long*/ self);
-public static final long webkit_dom_ui_event_get_detail (int /*long*/ self) {
+public static final native long _webkit_dom_ui_event_get_detail (long /*int*/ self);
+public static final long webkit_dom_ui_event_get_detail (long /*int*/ self) {
lock.lock();
try {
return _webkit_dom_ui_event_get_detail (self);
@@ -710,8 +710,8 @@ public static final long webkit_dom_ui_event_get_detail (int /*long*/ self) {
}
/** @method flags=dynamic */
-public static final native long _webkit_dom_ui_event_get_key_code (int /*long*/ self);
-public static final long webkit_dom_ui_event_get_key_code (int /*long*/ self) {
+public static final native long _webkit_dom_ui_event_get_key_code (long /*int*/ self);
+public static final long webkit_dom_ui_event_get_key_code (long /*int*/ self) {
lock.lock();
try {
return _webkit_dom_ui_event_get_key_code (self);
@@ -721,8 +721,8 @@ public static final long webkit_dom_ui_event_get_key_code (int /*long*/ self) {
}
/** @method flags=dynamic */
-public static final native void _webkit_download_cancel (int /*long*/ download);
-public static final void webkit_download_cancel (int /*long*/ download) {
+public static final native void _webkit_download_cancel (long /*int*/ download);
+public static final void webkit_download_cancel (long /*int*/ download) {
lock.lock();
try {
_webkit_download_cancel (download);
@@ -732,8 +732,8 @@ public static final void webkit_download_cancel (int /*long*/ download) {
}
/** @method flags=dynamic */
-public static final native long _webkit_download_get_current_size (int /*long*/ download);
-public static final long webkit_download_get_current_size (int /*long*/ download) {
+public static final native long _webkit_download_get_current_size (long /*int*/ download);
+public static final long webkit_download_get_current_size (long /*int*/ download) {
lock.lock();
try {
return _webkit_download_get_current_size (download);
@@ -743,8 +743,8 @@ public static final long webkit_download_get_current_size (int /*long*/ download
}
/** @method flags=dynamic */
-public static final native int /*long*/ _webkit_download_get_network_request (int /*long*/ download);
-public static final int /*long*/ webkit_download_get_network_request (int /*long*/ download) {
+public static final native long /*int*/ _webkit_download_get_network_request (long /*int*/ download);
+public static final long /*int*/ webkit_download_get_network_request (long /*int*/ download) {
lock.lock();
try {
return _webkit_download_get_network_request (download);
@@ -754,8 +754,8 @@ public static final int /*long*/ webkit_download_get_network_request (int /*long
}
/** @method flags=dynamic */
-public static final native int _webkit_download_get_status (int /*long*/ download);
-public static final int webkit_download_get_status (int /*long*/ download) {
+public static final native int _webkit_download_get_status (long /*int*/ download);
+public static final int webkit_download_get_status (long /*int*/ download) {
lock.lock();
try {
return _webkit_download_get_status (download);
@@ -765,8 +765,8 @@ public static final int webkit_download_get_status (int /*long*/ download) {
}
/** @method flags=dynamic */
-public static final native int /*long*/ _webkit_download_get_suggested_filename (int /*long*/ download);
-public static final int /*long*/ webkit_download_get_suggested_filename (int /*long*/ download) {
+public static final native long /*int*/ _webkit_download_get_suggested_filename (long /*int*/ download);
+public static final long /*int*/ webkit_download_get_suggested_filename (long /*int*/ download) {
lock.lock();
try {
return _webkit_download_get_suggested_filename (download);
@@ -776,8 +776,8 @@ public static final int /*long*/ webkit_download_get_suggested_filename (int /*l
}
/** @method flags=dynamic */
-public static final native long _webkit_download_get_total_size (int /*long*/ download);
-public static final long webkit_download_get_total_size (int /*long*/ download) {
+public static final native long _webkit_download_get_total_size (long /*int*/ download);
+public static final long webkit_download_get_total_size (long /*int*/ download) {
lock.lock();
try {
return _webkit_download_get_total_size (download);
@@ -787,8 +787,8 @@ public static final long webkit_download_get_total_size (int /*long*/ download)
}
/** @method flags=dynamic */
-public static final native int /*long*/ _webkit_download_get_uri (int /*long*/ download);
-public static final int /*long*/ webkit_download_get_uri (int /*long*/ download) {
+public static final native long /*int*/ _webkit_download_get_uri (long /*int*/ download);
+public static final long /*int*/ webkit_download_get_uri (long /*int*/ download) {
lock.lock();
try {
return _webkit_download_get_uri (download);
@@ -798,8 +798,8 @@ public static final int /*long*/ webkit_download_get_uri (int /*long*/ download)
}
/** @method flags=dynamic */
-public static final native int /*long*/ _webkit_download_new (int /*long*/ request);
-public static final int /*long*/ webkit_download_new (int /*long*/ request) {
+public static final native long /*int*/ _webkit_download_new (long /*int*/ request);
+public static final long /*int*/ webkit_download_new (long /*int*/ request) {
lock.lock();
try {
return _webkit_download_new (request);
@@ -809,8 +809,8 @@ public static final int /*long*/ webkit_download_new (int /*long*/ request) {
}
/** @method flags=dynamic */
-public static final native void _webkit_download_set_destination_uri (int /*long*/ download, byte[] destination_uri);
-public static final void webkit_download_set_destination_uri (int /*long*/ download, byte[] destination_uri) {
+public static final native void _webkit_download_set_destination_uri (long /*int*/ download, byte[] destination_uri);
+public static final void webkit_download_set_destination_uri (long /*int*/ download, byte[] destination_uri) {
lock.lock();
try {
_webkit_download_set_destination_uri (download, destination_uri);
@@ -820,8 +820,8 @@ public static final void webkit_download_set_destination_uri (int /*long*/ downl
}
/** @method flags=dynamic */
-public static final native void _webkit_download_start (int /*long*/ download);
-public static final void webkit_download_start (int /*long*/ download) {
+public static final native void _webkit_download_start (long /*int*/ download);
+public static final void webkit_download_start (long /*int*/ download) {
lock.lock();
try {
_webkit_download_start (download);
@@ -831,8 +831,8 @@ public static final void webkit_download_start (int /*long*/ download) {
}
/** @method flags=dynamic */
-public static final native int /*long*/ _webkit_get_default_session ();
-public static final int /*long*/ webkit_get_default_session () {
+public static final native long /*int*/ _webkit_get_default_session ();
+public static final long /*int*/ webkit_get_default_session () {
lock.lock();
try {
return _webkit_get_default_session ();
@@ -875,8 +875,8 @@ public static final int webkit_minor_version () {
}
/** @method flags=dynamic */
-public static final native int /*long*/ _webkit_network_request_get_message (int /*long*/ request);
-public static final int /*long*/ webkit_network_request_get_message (int /*long*/ request) {
+public static final native long /*int*/ _webkit_network_request_get_message (long /*int*/ request);
+public static final long /*int*/ webkit_network_request_get_message (long /*int*/ request) {
lock.lock();
try {
return _webkit_network_request_get_message (request);
@@ -886,8 +886,8 @@ public static final int /*long*/ webkit_network_request_get_message (int /*long*
}
/** @method flags=dynamic */
-public static final native int /*long*/ _webkit_network_request_get_uri (int /*long*/ request);
-public static final int /*long*/ webkit_network_request_get_uri (int /*long*/ request) {
+public static final native long /*int*/ _webkit_network_request_get_uri (long /*int*/ request);
+public static final long /*int*/ webkit_network_request_get_uri (long /*int*/ request) {
lock.lock();
try {
return _webkit_network_request_get_uri (request);
@@ -897,8 +897,8 @@ public static final int /*long*/ webkit_network_request_get_uri (int /*long*/ re
}
/** @method flags=dynamic */
-public static final native int /*long*/ _webkit_network_request_new (byte[] uri);
-public static final int /*long*/ webkit_network_request_new (byte[] uri) {
+public static final native long /*int*/ _webkit_network_request_new (byte[] uri);
+public static final long /*int*/ webkit_network_request_new (byte[] uri) {
lock.lock();
try {
return _webkit_network_request_new (uri);
@@ -908,8 +908,8 @@ public static final int /*long*/ webkit_network_request_new (byte[] uri) {
}
/** @method flags=dynamic */
-public static final native int /*long*/ _webkit_soup_auth_dialog_get_type ();
-public static final int /*long*/ webkit_soup_auth_dialog_get_type () {
+public static final native long /*int*/ _webkit_soup_auth_dialog_get_type ();
+public static final long /*int*/ webkit_soup_auth_dialog_get_type () {
lock.lock();
try {
return _webkit_soup_auth_dialog_get_type ();
@@ -919,8 +919,8 @@ public static final int /*long*/ webkit_soup_auth_dialog_get_type () {
}
/** @method flags=dynamic */
-public static final native int /*long*/ _webkit_web_data_source_get_data (int /*long*/ data_source);
-public static final int /*long*/ webkit_web_data_source_get_data (int /*long*/ data_source) {
+public static final native long /*int*/ _webkit_web_data_source_get_data (long /*int*/ data_source);
+public static final long /*int*/ webkit_web_data_source_get_data (long /*int*/ data_source) {
lock.lock();
try {
return _webkit_web_data_source_get_data (data_source);
@@ -930,8 +930,8 @@ public static final int /*long*/ webkit_web_data_source_get_data (int /*long*/ d
}
/** @method flags=dynamic */
-public static final native int /*long*/ _webkit_web_data_source_get_encoding (int /*long*/ data_source);
-public static final int /*long*/ webkit_web_data_source_get_encoding (int /*long*/ data_source) {
+public static final native long /*int*/ _webkit_web_data_source_get_encoding (long /*int*/ data_source);
+public static final long /*int*/ webkit_web_data_source_get_encoding (long /*int*/ data_source) {
lock.lock();
try {
return _webkit_web_data_source_get_encoding (data_source);
@@ -941,8 +941,8 @@ public static final int /*long*/ webkit_web_data_source_get_encoding (int /*long
}
/** @method flags=dynamic */
-public static final native int /*long*/ _webkit_web_frame_get_data_source (int /*long*/ frame);
-public static final int /*long*/ webkit_web_frame_get_data_source (int /*long*/ frame) {
+public static final native long /*int*/ _webkit_web_frame_get_data_source (long /*int*/ frame);
+public static final long /*int*/ webkit_web_frame_get_data_source (long /*int*/ frame) {
lock.lock();
try {
return _webkit_web_frame_get_data_source (frame);
@@ -952,8 +952,8 @@ public static final int /*long*/ webkit_web_frame_get_data_source (int /*long*/
}
/** @method flags=dynamic */
-public static final native int /*long*/ _webkit_web_frame_get_global_context (int /*long*/ frame);
-public static final int /*long*/ webkit_web_frame_get_global_context (int /*long*/ frame) {
+public static final native long /*int*/ _webkit_web_frame_get_global_context (long /*int*/ frame);
+public static final long /*int*/ webkit_web_frame_get_global_context (long /*int*/ frame) {
lock.lock();
try {
return _webkit_web_frame_get_global_context (frame);
@@ -963,8 +963,8 @@ public static final int /*long*/ webkit_web_frame_get_global_context (int /*long
}
/** @method flags=dynamic */
-public static final native int _webkit_web_frame_get_load_status (int /*long*/ frame);
-public static final int webkit_web_frame_get_load_status (int /*long*/ frame) {
+public static final native int _webkit_web_frame_get_load_status (long /*int*/ frame);
+public static final int webkit_web_frame_get_load_status (long /*int*/ frame) {
lock.lock();
try {
return _webkit_web_frame_get_load_status (frame);
@@ -974,8 +974,8 @@ public static final int webkit_web_frame_get_load_status (int /*long*/ frame) {
}
/** @method flags=dynamic */
-public static final native int /*long*/ _webkit_web_frame_get_parent (int /*long*/ frame);
-public static final int /*long*/ webkit_web_frame_get_parent (int /*long*/ frame) {
+public static final native long /*int*/ _webkit_web_frame_get_parent (long /*int*/ frame);
+public static final long /*int*/ webkit_web_frame_get_parent (long /*int*/ frame) {
lock.lock();
try {
return _webkit_web_frame_get_parent (frame);
@@ -985,8 +985,8 @@ public static final int /*long*/ webkit_web_frame_get_parent (int /*long*/ frame
}
/** @method flags=dynamic */
-public static final native int /*long*/ _webkit_web_frame_get_title (int /*long*/ frame);
-public static final int /*long*/ webkit_web_frame_get_title (int /*long*/ frame) {
+public static final native long /*int*/ _webkit_web_frame_get_title (long /*int*/ frame);
+public static final long /*int*/ webkit_web_frame_get_title (long /*int*/ frame) {
lock.lock();
try {
return _webkit_web_frame_get_title (frame);
@@ -996,8 +996,8 @@ public static final int /*long*/ webkit_web_frame_get_title (int /*long*/ frame)
}
/** @method flags=dynamic */
-public static final native int /*long*/ _webkit_web_frame_get_type ();
-public static final int /*long*/ webkit_web_frame_get_type () {
+public static final native long /*int*/ _webkit_web_frame_get_type ();
+public static final long /*int*/ webkit_web_frame_get_type () {
lock.lock();
try {
return _webkit_web_frame_get_type ();
@@ -1007,8 +1007,8 @@ public static final int /*long*/ webkit_web_frame_get_type () {
}
/** @method flags=dynamic */
-public static final native int /*long*/ _webkit_web_frame_get_uri (int /*long*/ frame);
-public static final int /*long*/ webkit_web_frame_get_uri (int /*long*/ frame) {
+public static final native long /*int*/ _webkit_web_frame_get_uri (long /*int*/ frame);
+public static final long /*int*/ webkit_web_frame_get_uri (long /*int*/ frame) {
lock.lock();
try {
return _webkit_web_frame_get_uri (frame);
@@ -1018,8 +1018,8 @@ public static final int /*long*/ webkit_web_frame_get_uri (int /*long*/ frame) {
}
/** @method flags=dynamic */
-public static final native int /*long*/ _webkit_web_frame_get_web_view (int /*long*/ frame);
-public static final int /*long*/ webkit_web_frame_get_web_view (int /*long*/ frame) {
+public static final native long /*int*/ _webkit_web_frame_get_web_view (long /*int*/ frame);
+public static final long /*int*/ webkit_web_frame_get_web_view (long /*int*/ frame) {
lock.lock();
try {
return _webkit_web_frame_get_web_view (frame);
@@ -1029,8 +1029,8 @@ public static final int /*long*/ webkit_web_frame_get_web_view (int /*long*/ fra
}
/** @method flags=dynamic */
-public static final native void _webkit_web_policy_decision_download (int /*long*/ decision);
-public static final void webkit_web_policy_decision_download (int /*long*/ decision) {
+public static final native void _webkit_web_policy_decision_download (long /*int*/ decision);
+public static final void webkit_web_policy_decision_download (long /*int*/ decision) {
lock.lock();
try {
_webkit_web_policy_decision_download (decision);
@@ -1040,8 +1040,8 @@ public static final void webkit_web_policy_decision_download (int /*long*/ decis
}
/** @method flags=dynamic */
-public static final native void _webkit_web_policy_decision_ignore (int /*long*/ decision);
-public static final void webkit_web_policy_decision_ignore (int /*long*/ decision) {
+public static final native void _webkit_web_policy_decision_ignore (long /*int*/ decision);
+public static final void webkit_web_policy_decision_ignore (long /*int*/ decision) {
lock.lock();
try {
_webkit_web_policy_decision_ignore (decision);
@@ -1051,8 +1051,8 @@ public static final void webkit_web_policy_decision_ignore (int /*long*/ decisio
}
/** @method flags=dynamic */
-public static final native int _webkit_web_view_can_go_back (int /*long*/ web_view);
-public static final int webkit_web_view_can_go_back (int /*long*/ web_view) {
+public static final native int _webkit_web_view_can_go_back (long /*int*/ web_view);
+public static final int webkit_web_view_can_go_back (long /*int*/ web_view) {
lock.lock();
try {
return _webkit_web_view_can_go_back (web_view);
@@ -1062,8 +1062,8 @@ public static final int webkit_web_view_can_go_back (int /*long*/ web_view) {
}
/** @method flags=dynamic */
-public static final native int _webkit_web_view_can_go_forward (int /*long*/ web_view);
-public static final int webkit_web_view_can_go_forward (int /*long*/ web_view) {
+public static final native int _webkit_web_view_can_go_forward (long /*int*/ web_view);
+public static final int webkit_web_view_can_go_forward (long /*int*/ web_view) {
lock.lock();
try {
return _webkit_web_view_can_go_forward (web_view);
@@ -1073,8 +1073,8 @@ public static final int webkit_web_view_can_go_forward (int /*long*/ web_view) {
}
/** @method flags=dynamic */
-public static final native int _webkit_web_view_can_show_mime_type (int /*long*/ web_view, int /*long*/ mime_type);
-public static final int webkit_web_view_can_show_mime_type (int /*long*/ web_view, int /*long*/ mime_type) {
+public static final native int _webkit_web_view_can_show_mime_type (long /*int*/ web_view, long /*int*/ mime_type);
+public static final int webkit_web_view_can_show_mime_type (long /*int*/ web_view, long /*int*/ mime_type) {
lock.lock();
try {
return _webkit_web_view_can_show_mime_type (web_view, mime_type);
@@ -1084,8 +1084,8 @@ public static final int webkit_web_view_can_show_mime_type (int /*long*/ web_vie
}
/** @method flags=dynamic */
-public static final native void _webkit_web_view_execute_script (int /*long*/ web_view, byte[] script);
-public static final void webkit_web_view_execute_script (int /*long*/ web_view, byte[] script) {
+public static final native void _webkit_web_view_execute_script (long /*int*/ web_view, byte[] script);
+public static final void webkit_web_view_execute_script (long /*int*/ web_view, byte[] script) {
lock.lock();
try {
_webkit_web_view_execute_script (web_view, script);
@@ -1095,8 +1095,8 @@ public static final void webkit_web_view_execute_script (int /*long*/ web_view,
}
/** @method flags=dynamic */
-public static final native int /*long*/ _webkit_web_view_get_dom_document (int /*long*/ web_view);
-public static final int /*long*/ webkit_web_view_get_dom_document (int /*long*/ web_view) {
+public static final native long /*int*/ _webkit_web_view_get_dom_document (long /*int*/ web_view);
+public static final long /*int*/ webkit_web_view_get_dom_document (long /*int*/ web_view) {
lock.lock();
try {
return _webkit_web_view_get_dom_document (web_view);
@@ -1106,8 +1106,8 @@ public static final int /*long*/ webkit_web_view_get_dom_document (int /*long*/
}
/** @method flags=dynamic */
-public static final native int _webkit_web_view_get_load_status (int /*long*/ web_view);
-public static final int webkit_web_view_get_load_status (int /*long*/ web_view) {
+public static final native int _webkit_web_view_get_load_status (long /*int*/ web_view);
+public static final int webkit_web_view_get_load_status (long /*int*/ web_view) {
lock.lock();
try {
return _webkit_web_view_get_load_status (web_view);
@@ -1117,8 +1117,8 @@ public static final int webkit_web_view_get_load_status (int /*long*/ web_view)
}
/** @method flags=dynamic */
-public static final native int /*long*/ _webkit_web_view_get_main_frame (int /*long*/ web_view);
-public static final int /*long*/ webkit_web_view_get_main_frame (int /*long*/ web_view) {
+public static final native long /*int*/ _webkit_web_view_get_main_frame (long /*int*/ web_view);
+public static final long /*int*/ webkit_web_view_get_main_frame (long /*int*/ web_view) {
lock.lock();
try {
return _webkit_web_view_get_main_frame (web_view);
@@ -1128,8 +1128,8 @@ public static final int /*long*/ webkit_web_view_get_main_frame (int /*long*/ we
}
/** @method flags=dynamic */
-public static final native double _webkit_web_view_get_progress (int /*long*/ web_view);
-public static final double webkit_web_view_get_progress (int /*long*/ web_view) {
+public static final native double _webkit_web_view_get_progress (long /*int*/ web_view);
+public static final double webkit_web_view_get_progress (long /*int*/ web_view) {
lock.lock();
try {
return _webkit_web_view_get_progress (web_view);
@@ -1139,8 +1139,8 @@ public static final double webkit_web_view_get_progress (int /*long*/ web_view)
}
/** @method flags=dynamic */
-public static final native int /*long*/ _webkit_web_view_get_settings (int /*long*/ web_view);
-public static final int /*long*/ webkit_web_view_get_settings (int /*long*/ web_view) {
+public static final native long /*int*/ _webkit_web_view_get_settings (long /*int*/ web_view);
+public static final long /*int*/ webkit_web_view_get_settings (long /*int*/ web_view) {
lock.lock();
try {
return _webkit_web_view_get_settings (web_view);
@@ -1150,8 +1150,8 @@ public static final int /*long*/ webkit_web_view_get_settings (int /*long*/ web_
}
/** @method flags=dynamic */
-public static final native int /*long*/ _webkit_web_view_get_title (int /*long*/ web_view);
-public static final int /*long*/ webkit_web_view_get_title (int /*long*/ web_view) {
+public static final native long /*int*/ _webkit_web_view_get_title (long /*int*/ web_view);
+public static final long /*int*/ webkit_web_view_get_title (long /*int*/ web_view) {
lock.lock();
try {
return _webkit_web_view_get_title (web_view);
@@ -1161,8 +1161,8 @@ public static final int /*long*/ webkit_web_view_get_title (int /*long*/ web_vie
}
/** @method flags=dynamic */
-public static final native int /*long*/ _webkit_web_view_get_type ();
-public static final int /*long*/ webkit_web_view_get_type () {
+public static final native long /*int*/ _webkit_web_view_get_type ();
+public static final long /*int*/ webkit_web_view_get_type () {
lock.lock();
try {
return _webkit_web_view_get_type ();
@@ -1172,8 +1172,8 @@ public static final int /*long*/ webkit_web_view_get_type () {
}
/** @method flags=dynamic */
-public static final native int /*long*/ _webkit_web_view_get_uri (int /*long*/ web_view);
-public static final int /*long*/ webkit_web_view_get_uri (int /*long*/ web_view) {
+public static final native long /*int*/ _webkit_web_view_get_uri (long /*int*/ web_view);
+public static final long /*int*/ webkit_web_view_get_uri (long /*int*/ web_view) {
lock.lock();
try {
return _webkit_web_view_get_uri (web_view);
@@ -1183,8 +1183,8 @@ public static final int /*long*/ webkit_web_view_get_uri (int /*long*/ web_view)
}
/** @method flags=dynamic */
-public static final native int /*long*/ _webkit_web_view_get_window_features (int /*long*/ web_view);
-public static final int /*long*/ webkit_web_view_get_window_features (int /*long*/ web_view) {
+public static final native long /*int*/ _webkit_web_view_get_window_features (long /*int*/ web_view);
+public static final long /*int*/ webkit_web_view_get_window_features (long /*int*/ web_view) {
lock.lock();
try {
return _webkit_web_view_get_window_features (web_view);
@@ -1194,8 +1194,8 @@ public static final int /*long*/ webkit_web_view_get_window_features (int /*long
}
/** @method flags=dynamic */
-public static final native void _webkit_web_view_go_back (int /*long*/ web_view);
-public static final void webkit_web_view_go_back (int /*long*/ web_view) {
+public static final native void _webkit_web_view_go_back (long /*int*/ web_view);
+public static final void webkit_web_view_go_back (long /*int*/ web_view) {
lock.lock();
try {
_webkit_web_view_go_back (web_view);
@@ -1205,8 +1205,8 @@ public static final void webkit_web_view_go_back (int /*long*/ web_view) {
}
/** @method flags=dynamic */
-public static final native void _webkit_web_view_go_forward (int /*long*/ web_view);
-public static final void webkit_web_view_go_forward (int /*long*/ web_view) {
+public static final native void _webkit_web_view_go_forward (long /*int*/ web_view);
+public static final void webkit_web_view_go_forward (long /*int*/ web_view) {
lock.lock();
try {
_webkit_web_view_go_forward (web_view);
@@ -1216,8 +1216,8 @@ public static final void webkit_web_view_go_forward (int /*long*/ web_view) {
}
/** @method flags=dynamic */
-public static final native void _webkit_web_view_load_string (int /*long*/ web_view, byte[] content, byte[] mime_type, byte[] encoding, byte[] base_uri);
-public static final void webkit_web_view_load_string (int /*long*/ web_view, byte[] content, byte[] mime_type, byte[] encoding, byte[] base_uri) {
+public static final native void _webkit_web_view_load_string (long /*int*/ web_view, byte[] content, byte[] mime_type, byte[] encoding, byte[] base_uri);
+public static final void webkit_web_view_load_string (long /*int*/ web_view, byte[] content, byte[] mime_type, byte[] encoding, byte[] base_uri) {
lock.lock();
try {
_webkit_web_view_load_string (web_view, content, mime_type, encoding, base_uri);
@@ -1227,8 +1227,8 @@ public static final void webkit_web_view_load_string (int /*long*/ web_view, byt
}
/** @method flags=dynamic */
-public static final native void _webkit_web_view_load_uri (int /*long*/ web_view, byte[] uri);
-public static final void webkit_web_view_load_uri (int /*long*/ web_view, byte[] uri) {
+public static final native void _webkit_web_view_load_uri (long /*int*/ web_view, byte[] uri);
+public static final void webkit_web_view_load_uri (long /*int*/ web_view, byte[] uri) {
lock.lock();
try {
_webkit_web_view_load_uri (web_view, uri);
@@ -1238,8 +1238,8 @@ public static final void webkit_web_view_load_uri (int /*long*/ web_view, byte[]
}
/** @method flags=dynamic */
-public static final native int /*long*/ _webkit_web_view_new ();
-public static final int /*long*/ webkit_web_view_new () {
+public static final native long /*int*/ _webkit_web_view_new ();
+public static final long /*int*/ webkit_web_view_new () {
lock.lock();
try {
return _webkit_web_view_new ();
@@ -1249,8 +1249,8 @@ public static final int /*long*/ webkit_web_view_new () {
}
/** @method flags=dynamic */
-public static final native void _webkit_web_view_reload (int /*long*/ web_view);
-public static final void webkit_web_view_reload (int /*long*/ web_view) {
+public static final native void _webkit_web_view_reload (long /*int*/ web_view);
+public static final void webkit_web_view_reload (long /*int*/ web_view) {
lock.lock();
try {
_webkit_web_view_reload (web_view);
@@ -1260,8 +1260,8 @@ public static final void webkit_web_view_reload (int /*long*/ web_view) {
}
/** @method flags=dynamic */
-public static final native void _webkit_web_view_stop_loading (int /*long*/ web_view);
-public static final void webkit_web_view_stop_loading (int /*long*/ web_view) {
+public static final native void _webkit_web_view_stop_loading (long /*int*/ web_view);
+public static final void webkit_web_view_stop_loading (long /*int*/ web_view) {
lock.lock();
try {
_webkit_web_view_stop_loading (web_view);
@@ -1279,14 +1279,14 @@ 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=getter
* @param cookie cast=(SoupCookie *)
*/
-public static final native int /*long*/ _SoupCookie_expires (int /*long*/ cookie);
-public static final int /*long*/ SoupCookie_expires (int /*long*/ cookie) {
+public static final native long /*int*/ _SoupCookie_expires (long /*int*/ cookie);
+public static final long /*int*/ SoupCookie_expires (long /*int*/ cookie) {
lock.lock();
try {
return _SoupCookie_expires (cookie);
@@ -1300,8 +1300,8 @@ public static final int /*long*/ SoupCookie_expires (int /*long*/ cookie) {
* @param message cast=(SoupMessage *)
* @param method cast=(const char *)
*/
-public static final native void _SoupMessage_method (int /*long*/ message, int /*long*/ method);
-public static final void SoupMessage_method (int /*long*/ message, int /*long*/ method) {
+public static final native void _SoupMessage_method (long /*int*/ message, long /*int*/ method);
+public static final void SoupMessage_method (long /*int*/ message, long /*int*/ method) {
lock.lock();
try {
_SoupMessage_method (message, method);
@@ -1314,8 +1314,8 @@ public static final void SoupMessage_method (int /*long*/ message, int /*long*/
* @method flags=getter
* @param message cast=(SoupMessage *)
*/
-public static final native int /*long*/ _SoupMessage_request_body (int /*long*/ message);
-public static final int /*long*/ SoupMessage_request_body (int /*long*/ message) {
+public static final native long /*int*/ _SoupMessage_request_body (long /*int*/ message);
+public static final long /*int*/ SoupMessage_request_body (long /*int*/ message) {
lock.lock();
try {
return _SoupMessage_request_body (message);
@@ -1328,8 +1328,8 @@ public static final int /*long*/ SoupMessage_request_body (int /*long*/ message)
* @method flags=getter
* @param message cast=(SoupMessage *)
*/
-public static final native int /*long*/ _SoupMessage_request_headers (int /*long*/ message);
-public static final int /*long*/ SoupMessage_request_headers (int /*long*/ message) {
+public static final native long /*int*/ _SoupMessage_request_headers (long /*int*/ message);
+public static final long /*int*/ SoupMessage_request_headers (long /*int*/ message) {
lock.lock();
try {
return _SoupMessage_request_headers (message);
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);
}

Back to the top