Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT WebKit/win32')
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library/webkit_win32.cpp458
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library/webkit_win32_structs.cpp92
-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.java164
-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
32 files changed, 746 insertions, 746 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library/webkit_win32.cpp b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library/webkit_win32.cpp
index 9c7e39ffb1..2382805596 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library/webkit_win32.cpp
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library/webkit_win32.cpp
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2016 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2009, 2019 IBM Corporation and others. All rights reserved.
* The contents of this file are made available under the terms
* of the GNU Lesser General Public License (LGPL) Version 2.1 that
* accompanies this distribution (lgpl-v21.txt). The LGPL is also
@@ -25,9 +25,9 @@
#endif
#ifndef NO_CFArrayGetCount
-extern "C" JNIEXPORT jint JNICALL WebKit_win32_NATIVE(CFArrayGetCount)(JNIEnv *env, jclass that, jintLong arg0);
+extern "C" JNIEXPORT jint JNICALL WebKit_win32_NATIVE(CFArrayGetCount)(JNIEnv *env, jclass that, jlong arg0);
JNIEXPORT jint JNICALL WebKit_win32_NATIVE(CFArrayGetCount)
- (JNIEnv *env, jclass that, jintLong arg0)
+ (JNIEnv *env, jclass that, jlong arg0)
{
jint rc = 0;
WebKit_win32_NATIVE_ENTER(env, that, CFArrayGetCount_FUNC);
@@ -38,28 +38,28 @@ JNIEXPORT jint JNICALL WebKit_win32_NATIVE(CFArrayGetCount)
#endif
#ifndef NO_CFArrayGetValueAtIndex
-extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(CFArrayGetValueAtIndex)(JNIEnv *env, jclass that, jintLong arg0, jint arg1);
-JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(CFArrayGetValueAtIndex)
- (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
+extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(CFArrayGetValueAtIndex)(JNIEnv *env, jclass that, jlong arg0, jint arg1);
+JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(CFArrayGetValueAtIndex)
+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
{
- jintLong rc = 0;
+ jlong rc = 0;
WebKit_win32_NATIVE_ENTER(env, that, CFArrayGetValueAtIndex_FUNC);
- rc = (jintLong)CFArrayGetValueAtIndex((CFArrayRef)arg0, (CFIndex)arg1);
+ rc = (jlong)CFArrayGetValueAtIndex((CFArrayRef)arg0, (CFIndex)arg1);
WebKit_win32_NATIVE_EXIT(env, that, CFArrayGetValueAtIndex_FUNC);
return rc;
}
#endif
#ifndef NO_CFDataCreate
-extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(CFDataCreate)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2);
-JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(CFDataCreate)
- (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2)
+extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(CFDataCreate)(JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jint arg2);
+JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(CFDataCreate)
+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jint arg2)
{
jbyte *lparg1=NULL;
- jintLong rc = 0;
+ jlong rc = 0;
WebKit_win32_NATIVE_ENTER(env, that, CFDataCreate_FUNC);
if (arg1) if ((lparg1 = env->GetByteArrayElements(arg1, NULL)) == NULL) goto fail;
- rc = (jintLong)CFDataCreate((CFAllocatorRef)arg0, (const UInt8 *)lparg1, (CFIndex)arg2);
+ rc = (jlong)CFDataCreate((CFAllocatorRef)arg0, (const UInt8 *)lparg1, (CFIndex)arg2);
fail:
if (arg1 && lparg1) env->ReleaseByteArrayElements(arg1, lparg1, 0);
WebKit_win32_NATIVE_EXIT(env, that, CFDataCreate_FUNC);
@@ -68,22 +68,22 @@ fail:
#endif
#ifndef NO_CFDataGetBytePtr
-extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(CFDataGetBytePtr)(JNIEnv *env, jclass that, jintLong arg0);
-JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(CFDataGetBytePtr)
- (JNIEnv *env, jclass that, jintLong arg0)
+extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(CFDataGetBytePtr)(JNIEnv *env, jclass that, jlong arg0);
+JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(CFDataGetBytePtr)
+ (JNIEnv *env, jclass that, jlong arg0)
{
- jintLong rc = 0;
+ jlong rc = 0;
WebKit_win32_NATIVE_ENTER(env, that, CFDataGetBytePtr_FUNC);
- rc = (jintLong)CFDataGetBytePtr((CFDataRef)arg0);
+ rc = (jlong)CFDataGetBytePtr((CFDataRef)arg0);
WebKit_win32_NATIVE_EXIT(env, that, CFDataGetBytePtr_FUNC);
return rc;
}
#endif
#ifndef NO_CFDataGetLength
-extern "C" JNIEXPORT jint JNICALL WebKit_win32_NATIVE(CFDataGetLength)(JNIEnv *env, jclass that, jintLong arg0);
+extern "C" JNIEXPORT jint JNICALL WebKit_win32_NATIVE(CFDataGetLength)(JNIEnv *env, jclass that, jlong arg0);
JNIEXPORT jint JNICALL WebKit_win32_NATIVE(CFDataGetLength)
- (JNIEnv *env, jclass that, jintLong arg0)
+ (JNIEnv *env, jclass that, jlong arg0)
{
jint rc = 0;
WebKit_win32_NATIVE_ENTER(env, that, CFDataGetLength_FUNC);
@@ -94,42 +94,42 @@ JNIEXPORT jint JNICALL WebKit_win32_NATIVE(CFDataGetLength)
#endif
#ifndef NO_CFDictionaryCreate
-extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(CFDictionaryCreate)(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1, jintLongArray arg2, jint arg3, jintLong arg4, jintLong arg5);
-JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(CFDictionaryCreate)
- (JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1, jintLongArray arg2, jint arg3, jintLong arg4, jintLong arg5)
+extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(CFDictionaryCreate)(JNIEnv *env, jclass that, jlong arg0, jlongArray arg1, jlongArray arg2, jint arg3, jlong arg4, jlong arg5);
+JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(CFDictionaryCreate)
+ (JNIEnv *env, jclass that, jlong arg0, jlongArray arg1, jlongArray arg2, jint arg3, jlong arg4, jlong arg5)
{
- jintLong *lparg1=NULL;
- jintLong *lparg2=NULL;
- jintLong rc = 0;
+ jlong *lparg1=NULL;
+ jlong *lparg2=NULL;
+ jlong rc = 0;
WebKit_win32_NATIVE_ENTER(env, that, CFDictionaryCreate_FUNC);
- if (arg1) if ((lparg1 = env->GetIntLongArrayElements(arg1, NULL)) == NULL) goto fail;
- if (arg2) if ((lparg2 = env->GetIntLongArrayElements(arg2, NULL)) == NULL) goto fail;
- rc = (jintLong)CFDictionaryCreate((CFAllocatorRef)arg0, (const void **)lparg1, (const void **)lparg2, (CFIndex)arg3, (const CFDictionaryKeyCallBacks *)arg4, (const CFDictionaryValueCallBacks *)arg5);
+ if (arg1) if ((lparg1 = env->GetLongArrayElements(arg1, NULL)) == NULL) goto fail;
+ if (arg2) if ((lparg2 = env->GetLongArrayElements(arg2, NULL)) == NULL) goto fail;
+ rc = (jlong)CFDictionaryCreate((CFAllocatorRef)arg0, (const void **)lparg1, (const void **)lparg2, (CFIndex)arg3, (const CFDictionaryKeyCallBacks *)arg4, (const CFDictionaryValueCallBacks *)arg5);
fail:
- if (arg2 && lparg2) env->ReleaseIntLongArrayElements(arg2, lparg2, 0);
- if (arg1 && lparg1) env->ReleaseIntLongArrayElements(arg1, lparg1, 0);
+ if (arg2 && lparg2) env->ReleaseLongArrayElements(arg2, lparg2, 0);
+ if (arg1 && lparg1) env->ReleaseLongArrayElements(arg1, lparg1, 0);
WebKit_win32_NATIVE_EXIT(env, that, CFDictionaryCreate_FUNC);
return rc;
}
#endif
#ifndef NO_CFHTTPCookieCreateWithResponseHeaderFields
-extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(CFHTTPCookieCreateWithResponseHeaderFields)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2);
-JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(CFHTTPCookieCreateWithResponseHeaderFields)
- (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
+extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(CFHTTPCookieCreateWithResponseHeaderFields)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2);
+JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(CFHTTPCookieCreateWithResponseHeaderFields)
+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2)
{
- jintLong rc = 0;
+ jlong rc = 0;
WebKit_win32_NATIVE_ENTER(env, that, CFHTTPCookieCreateWithResponseHeaderFields_FUNC);
- rc = (jintLong)CFHTTPCookieCreateWithResponseHeaderFields((CFAllocatorRef)arg0, (CFDictionaryRef)arg1, (CFURLRef)arg2);
+ rc = (jlong)CFHTTPCookieCreateWithResponseHeaderFields((CFAllocatorRef)arg0, (CFDictionaryRef)arg1, (CFURLRef)arg2);
WebKit_win32_NATIVE_EXIT(env, that, CFHTTPCookieCreateWithResponseHeaderFields_FUNC);
return rc;
}
#endif
#ifndef NO_CFHTTPCookieGetFlags
-extern "C" JNIEXPORT jint JNICALL WebKit_win32_NATIVE(CFHTTPCookieGetFlags)(JNIEnv *env, jclass that, jintLong arg0);
+extern "C" JNIEXPORT jint JNICALL WebKit_win32_NATIVE(CFHTTPCookieGetFlags)(JNIEnv *env, jclass that, jlong arg0);
JNIEXPORT jint JNICALL WebKit_win32_NATIVE(CFHTTPCookieGetFlags)
- (JNIEnv *env, jclass that, jintLong arg0)
+ (JNIEnv *env, jclass that, jlong arg0)
{
jint rc = 0;
WebKit_win32_NATIVE_ENTER(env, that, CFHTTPCookieGetFlags_FUNC);
@@ -140,61 +140,61 @@ JNIEXPORT jint JNICALL WebKit_win32_NATIVE(CFHTTPCookieGetFlags)
#endif
#ifndef NO_CFHTTPCookieGetName
-extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(CFHTTPCookieGetName)(JNIEnv *env, jclass that, jintLong arg0);
-JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(CFHTTPCookieGetName)
- (JNIEnv *env, jclass that, jintLong arg0)
+extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(CFHTTPCookieGetName)(JNIEnv *env, jclass that, jlong arg0);
+JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(CFHTTPCookieGetName)
+ (JNIEnv *env, jclass that, jlong arg0)
{
- jintLong rc = 0;
+ jlong rc = 0;
WebKit_win32_NATIVE_ENTER(env, that, CFHTTPCookieGetName_FUNC);
- rc = (jintLong)CFHTTPCookieGetName((CFHTTPCookieRef)arg0);
+ rc = (jlong)CFHTTPCookieGetName((CFHTTPCookieRef)arg0);
WebKit_win32_NATIVE_EXIT(env, that, CFHTTPCookieGetName_FUNC);
return rc;
}
#endif
#ifndef NO_CFHTTPCookieGetValue
-extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(CFHTTPCookieGetValue)(JNIEnv *env, jclass that, jintLong arg0);
-JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(CFHTTPCookieGetValue)
- (JNIEnv *env, jclass that, jintLong arg0)
+extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(CFHTTPCookieGetValue)(JNIEnv *env, jclass that, jlong arg0);
+JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(CFHTTPCookieGetValue)
+ (JNIEnv *env, jclass that, jlong arg0)
{
- jintLong rc = 0;
+ jlong rc = 0;
WebKit_win32_NATIVE_ENTER(env, that, CFHTTPCookieGetValue_FUNC);
- rc = (jintLong)CFHTTPCookieGetValue((CFHTTPCookieRef)arg0);
+ rc = (jlong)CFHTTPCookieGetValue((CFHTTPCookieRef)arg0);
WebKit_win32_NATIVE_EXIT(env, that, CFHTTPCookieGetValue_FUNC);
return rc;
}
#endif
#ifndef NO_CFHTTPCookieStorageCopyCookies
-extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(CFHTTPCookieStorageCopyCookies)(JNIEnv *env, jclass that, jintLong arg0);
-JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(CFHTTPCookieStorageCopyCookies)
- (JNIEnv *env, jclass that, jintLong arg0)
+extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(CFHTTPCookieStorageCopyCookies)(JNIEnv *env, jclass that, jlong arg0);
+JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(CFHTTPCookieStorageCopyCookies)
+ (JNIEnv *env, jclass that, jlong arg0)
{
- jintLong rc = 0;
+ jlong rc = 0;
WebKit_win32_NATIVE_ENTER(env, that, CFHTTPCookieStorageCopyCookies_FUNC);
- rc = (jintLong)CFHTTPCookieStorageCopyCookies((CFHTTPCookieStorageRef)arg0);
+ rc = (jlong)CFHTTPCookieStorageCopyCookies((CFHTTPCookieStorageRef)arg0);
WebKit_win32_NATIVE_EXIT(env, that, CFHTTPCookieStorageCopyCookies_FUNC);
return rc;
}
#endif
#ifndef NO_CFHTTPCookieStorageCopyCookiesForURL
-extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(CFHTTPCookieStorageCopyCookiesForURL)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2);
-JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(CFHTTPCookieStorageCopyCookiesForURL)
- (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2)
+extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(CFHTTPCookieStorageCopyCookiesForURL)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jboolean arg2);
+JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(CFHTTPCookieStorageCopyCookiesForURL)
+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jboolean arg2)
{
- jintLong rc = 0;
+ jlong rc = 0;
WebKit_win32_NATIVE_ENTER(env, that, CFHTTPCookieStorageCopyCookiesForURL_FUNC);
- rc = (jintLong)CFHTTPCookieStorageCopyCookiesForURL((CFHTTPCookieStorageRef)arg0, (CFURLRef)arg1, (Boolean)arg2);
+ rc = (jlong)CFHTTPCookieStorageCopyCookiesForURL((CFHTTPCookieStorageRef)arg0, (CFURLRef)arg1, (Boolean)arg2);
WebKit_win32_NATIVE_EXIT(env, that, CFHTTPCookieStorageCopyCookiesForURL_FUNC);
return rc;
}
#endif
#ifndef NO_CFHTTPCookieStorageDeleteCookie
-extern "C" JNIEXPORT void JNICALL WebKit_win32_NATIVE(CFHTTPCookieStorageDeleteCookie)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1);
+extern "C" JNIEXPORT void JNICALL WebKit_win32_NATIVE(CFHTTPCookieStorageDeleteCookie)(JNIEnv *env, jclass that, jlong arg0, jlong arg1);
JNIEXPORT void JNICALL WebKit_win32_NATIVE(CFHTTPCookieStorageDeleteCookie)
- (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
{
WebKit_win32_NATIVE_ENTER(env, that, CFHTTPCookieStorageDeleteCookie_FUNC);
CFHTTPCookieStorageDeleteCookie((CFHTTPCookieStorageRef)arg0, (CFHTTPCookieRef)arg1);
@@ -203,9 +203,9 @@ JNIEXPORT void JNICALL WebKit_win32_NATIVE(CFHTTPCookieStorageDeleteCookie)
#endif
#ifndef NO_CFHTTPCookieStorageSetCookie
-extern "C" JNIEXPORT void JNICALL WebKit_win32_NATIVE(CFHTTPCookieStorageSetCookie)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1);
+extern "C" JNIEXPORT void JNICALL WebKit_win32_NATIVE(CFHTTPCookieStorageSetCookie)(JNIEnv *env, jclass that, jlong arg0, jlong arg1);
JNIEXPORT void JNICALL WebKit_win32_NATIVE(CFHTTPCookieStorageSetCookie)
- (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
{
WebKit_win32_NATIVE_ENTER(env, that, CFHTTPCookieStorageSetCookie_FUNC);
CFHTTPCookieStorageSetCookie((CFHTTPCookieStorageRef)arg0, (CFHTTPCookieRef)arg1);
@@ -214,9 +214,9 @@ JNIEXPORT void JNICALL WebKit_win32_NATIVE(CFHTTPCookieStorageSetCookie)
#endif
#ifndef NO_CFRelease
-extern "C" JNIEXPORT void JNICALL WebKit_win32_NATIVE(CFRelease)(JNIEnv *env, jclass that, jintLong arg0);
+extern "C" JNIEXPORT void JNICALL WebKit_win32_NATIVE(CFRelease)(JNIEnv *env, jclass that, jlong arg0);
JNIEXPORT void JNICALL WebKit_win32_NATIVE(CFRelease)
- (JNIEnv *env, jclass that, jintLong arg0)
+ (JNIEnv *env, jclass that, jlong arg0)
{
WebKit_win32_NATIVE_ENTER(env, that, CFRelease_FUNC);
CFRelease((CFTypeRef)arg0);
@@ -225,9 +225,9 @@ JNIEXPORT void JNICALL WebKit_win32_NATIVE(CFRelease)
#endif
#ifndef NO_CFStringCreateWithCharacters
-extern "C" JNIEXPORT jint JNICALL WebKit_win32_NATIVE(CFStringCreateWithCharacters)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2);
+extern "C" JNIEXPORT jint JNICALL WebKit_win32_NATIVE(CFStringCreateWithCharacters)(JNIEnv *env, jclass that, jlong arg0, jcharArray arg1, jint arg2);
JNIEXPORT jint JNICALL WebKit_win32_NATIVE(CFStringCreateWithCharacters)
- (JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2)
+ (JNIEnv *env, jclass that, jlong arg0, jcharArray arg1, jint arg2)
{
jchar *lparg1=NULL;
jint rc = 0;
@@ -242,9 +242,9 @@ fail:
#endif
#ifndef NO_CFStringGetCharacterAtIndex
-extern "C" JNIEXPORT jchar JNICALL WebKit_win32_NATIVE(CFStringGetCharacterAtIndex)(JNIEnv *env, jclass that, jintLong arg0, jint arg1);
+extern "C" JNIEXPORT jchar JNICALL WebKit_win32_NATIVE(CFStringGetCharacterAtIndex)(JNIEnv *env, jclass that, jlong arg0, jint arg1);
JNIEXPORT jchar JNICALL WebKit_win32_NATIVE(CFStringGetCharacterAtIndex)
- (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
{
jchar rc = 0;
WebKit_win32_NATIVE_ENTER(env, that, CFStringGetCharacterAtIndex_FUNC);
@@ -255,22 +255,22 @@ JNIEXPORT jchar JNICALL WebKit_win32_NATIVE(CFStringGetCharacterAtIndex)
#endif
#ifndef NO_CFStringGetCharactersPtr
-extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(CFStringGetCharactersPtr)(JNIEnv *env, jclass that, jintLong arg0);
-JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(CFStringGetCharactersPtr)
- (JNIEnv *env, jclass that, jintLong arg0)
+extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(CFStringGetCharactersPtr)(JNIEnv *env, jclass that, jlong arg0);
+JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(CFStringGetCharactersPtr)
+ (JNIEnv *env, jclass that, jlong arg0)
{
- jintLong rc = 0;
+ jlong rc = 0;
WebKit_win32_NATIVE_ENTER(env, that, CFStringGetCharactersPtr_FUNC);
- rc = (jintLong)CFStringGetCharactersPtr((CFStringRef)arg0);
+ rc = (jlong)CFStringGetCharactersPtr((CFStringRef)arg0);
WebKit_win32_NATIVE_EXIT(env, that, CFStringGetCharactersPtr_FUNC);
return rc;
}
#endif
#ifndef NO_CFStringGetLength
-extern "C" JNIEXPORT jint JNICALL WebKit_win32_NATIVE(CFStringGetLength)(JNIEnv *env, jclass that, jintLong arg0);
+extern "C" JNIEXPORT jint JNICALL WebKit_win32_NATIVE(CFStringGetLength)(JNIEnv *env, jclass that, jlong arg0);
JNIEXPORT jint JNICALL WebKit_win32_NATIVE(CFStringGetLength)
- (JNIEnv *env, jclass that, jintLong arg0)
+ (JNIEnv *env, jclass that, jlong arg0)
{
jint rc = 0;
WebKit_win32_NATIVE_ENTER(env, that, CFStringGetLength_FUNC);
@@ -281,48 +281,48 @@ JNIEXPORT jint JNICALL WebKit_win32_NATIVE(CFStringGetLength)
#endif
#ifndef NO_CFURLCreateWithString
-extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(CFURLCreateWithString)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2);
-JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(CFURLCreateWithString)
- (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
+extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(CFURLCreateWithString)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2);
+JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(CFURLCreateWithString)
+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2)
{
- jintLong rc = 0;
+ jlong rc = 0;
WebKit_win32_NATIVE_ENTER(env, that, CFURLCreateWithString_FUNC);
- rc = (jintLong)CFURLCreateWithString((CFAllocatorRef)arg0, (CFStringRef)arg1, (CFURLRef)arg2);
+ rc = (jlong)CFURLCreateWithString((CFAllocatorRef)arg0, (CFStringRef)arg1, (CFURLRef)arg2);
WebKit_win32_NATIVE_EXIT(env, that, CFURLCreateWithString_FUNC);
return rc;
}
#endif
#ifndef NO_CFURLRequestCopyHTTPRequestBody
-extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(CFURLRequestCopyHTTPRequestBody)(JNIEnv *env, jclass that, jintLong arg0);
-JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(CFURLRequestCopyHTTPRequestBody)
- (JNIEnv *env, jclass that, jintLong arg0)
+extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(CFURLRequestCopyHTTPRequestBody)(JNIEnv *env, jclass that, jlong arg0);
+JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(CFURLRequestCopyHTTPRequestBody)
+ (JNIEnv *env, jclass that, jlong arg0)
{
- jintLong rc = 0;
+ jlong rc = 0;
WebKit_win32_NATIVE_ENTER(env, that, CFURLRequestCopyHTTPRequestBody_FUNC);
- rc = (jintLong)CFURLRequestCopyHTTPRequestBody((CFURLRequestRef)arg0);
+ rc = (jlong)CFURLRequestCopyHTTPRequestBody((CFURLRequestRef)arg0);
WebKit_win32_NATIVE_EXIT(env, that, CFURLRequestCopyHTTPRequestBody_FUNC);
return rc;
}
#endif
#ifndef NO_CFURLRequestCreateMutableCopy
-extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(CFURLRequestCreateMutableCopy)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1);
-JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(CFURLRequestCreateMutableCopy)
- (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(CFURLRequestCreateMutableCopy)(JNIEnv *env, jclass that, jlong arg0, jlong arg1);
+JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(CFURLRequestCreateMutableCopy)
+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
{
- jintLong rc = 0;
+ jlong rc = 0;
WebKit_win32_NATIVE_ENTER(env, that, CFURLRequestCreateMutableCopy_FUNC);
- rc = (jintLong)CFURLRequestCreateMutableCopy((CFAllocatorRef)arg0, (CFURLRequestRef)arg1);
+ rc = (jlong)CFURLRequestCreateMutableCopy((CFAllocatorRef)arg0, (CFURLRequestRef)arg1);
WebKit_win32_NATIVE_EXIT(env, that, CFURLRequestCreateMutableCopy_FUNC);
return rc;
}
#endif
#ifndef NO_CFURLRequestSetHTTPRequestBody
-extern "C" JNIEXPORT void JNICALL WebKit_win32_NATIVE(CFURLRequestSetHTTPRequestBody)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1);
+extern "C" JNIEXPORT void JNICALL WebKit_win32_NATIVE(CFURLRequestSetHTTPRequestBody)(JNIEnv *env, jclass that, jlong arg0, jlong arg1);
JNIEXPORT void JNICALL WebKit_win32_NATIVE(CFURLRequestSetHTTPRequestBody)
- (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
{
WebKit_win32_NATIVE_ENTER(env, that, CFURLRequestSetHTTPRequestBody_FUNC);
CFURLRequestSetHTTPRequestBody((CFMutableURLRequestRef)arg0, (CFDataRef)arg1);
@@ -331,9 +331,9 @@ JNIEXPORT void JNICALL WebKit_win32_NATIVE(CFURLRequestSetHTTPRequestBody)
#endif
#ifndef NO_CFURLRequestSetURL
-extern "C" JNIEXPORT void JNICALL WebKit_win32_NATIVE(CFURLRequestSetURL)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1);
+extern "C" JNIEXPORT void JNICALL WebKit_win32_NATIVE(CFURLRequestSetURL)(JNIEnv *env, jclass that, jlong arg0, jlong arg1);
JNIEXPORT void JNICALL WebKit_win32_NATIVE(CFURLRequestSetURL)
- (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
{
WebKit_win32_NATIVE_ENTER(env, that, CFURLRequestSetURL_FUNC);
CFURLRequestSetURL((CFMutableURLRequestRef)arg0, (CFURLRef)arg1);
@@ -342,13 +342,13 @@ JNIEXPORT void JNICALL WebKit_win32_NATIVE(CFURLRequestSetURL)
#endif
#ifndef NO_JSClassCreate
-extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSClassCreate)(JNIEnv *env, jclass that, jintLong arg0);
-JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSClassCreate)
- (JNIEnv *env, jclass that, jintLong arg0)
+extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSClassCreate)(JNIEnv *env, jclass that, jlong arg0);
+JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSClassCreate)
+ (JNIEnv *env, jclass that, jlong arg0)
{
- jintLong rc = 0;
+ jlong rc = 0;
WebKit_win32_NATIVE_ENTER(env, that, JSClassCreate_FUNC);
- rc = (jintLong)JSClassCreate((const JSClassDefinition*)arg0);
+ rc = (jlong)JSClassCreate((const JSClassDefinition*)arg0);
WebKit_win32_NATIVE_EXIT(env, that, JSClassCreate_FUNC);
return rc;
}
@@ -368,52 +368,52 @@ JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSClassDefinition_1sizeof)
#endif
#ifndef NO_JSClassRetain
-extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSClassRetain)(JNIEnv *env, jclass that, jintLong arg0);
-JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSClassRetain)
- (JNIEnv *env, jclass that, jintLong arg0)
+extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSClassRetain)(JNIEnv *env, jclass that, jlong arg0);
+JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSClassRetain)
+ (JNIEnv *env, jclass that, jlong arg0)
{
- jintLong rc = 0;
+ jlong rc = 0;
WebKit_win32_NATIVE_ENTER(env, that, JSClassRetain_FUNC);
- rc = (jintLong)JSClassRetain((JSClassRef)arg0);
+ rc = (jlong)JSClassRetain((JSClassRef)arg0);
WebKit_win32_NATIVE_EXIT(env, that, JSClassRetain_FUNC);
return rc;
}
#endif
#ifndef NO_JSContextGetGlobalObject
-extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSContextGetGlobalObject)(JNIEnv *env, jclass that, jintLong arg0);
-JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSContextGetGlobalObject)
- (JNIEnv *env, jclass that, jintLong arg0)
+extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSContextGetGlobalObject)(JNIEnv *env, jclass that, jlong arg0);
+JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSContextGetGlobalObject)
+ (JNIEnv *env, jclass that, jlong arg0)
{
- jintLong rc = 0;
+ jlong rc = 0;
WebKit_win32_NATIVE_ENTER(env, that, JSContextGetGlobalObject_FUNC);
- rc = (jintLong)JSContextGetGlobalObject((JSContextRef)arg0);
+ rc = (jlong)JSContextGetGlobalObject((JSContextRef)arg0);
WebKit_win32_NATIVE_EXIT(env, that, JSContextGetGlobalObject_FUNC);
return rc;
}
#endif
#ifndef NO_JSEvaluateScript
-extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSEvaluateScript)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jint arg4, jintLongArray arg5);
-JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSEvaluateScript)
- (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jint arg4, jintLongArray arg5)
+extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSEvaluateScript)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jint arg4, jlongArray arg5);
+JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSEvaluateScript)
+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jint arg4, jlongArray arg5)
{
- jintLong *lparg5=NULL;
- jintLong rc = 0;
+ jlong *lparg5=NULL;
+ jlong rc = 0;
WebKit_win32_NATIVE_ENTER(env, that, JSEvaluateScript_FUNC);
- if (arg5) if ((lparg5 = env->GetIntLongArrayElements(arg5, NULL)) == NULL) goto fail;
- rc = (jintLong)JSEvaluateScript((JSContextRef)arg0, (JSStringRef)arg1, (JSObjectRef)arg2, (JSStringRef)arg3, arg4, (JSValueRef *)lparg5);
+ if (arg5) if ((lparg5 = env->GetLongArrayElements(arg5, NULL)) == NULL) goto fail;
+ rc = (jlong)JSEvaluateScript((JSContextRef)arg0, (JSStringRef)arg1, (JSObjectRef)arg2, (JSStringRef)arg3, arg4, (JSValueRef *)lparg5);
fail:
- if (arg5 && lparg5) env->ReleaseIntLongArrayElements(arg5, lparg5, 0);
+ if (arg5 && lparg5) env->ReleaseLongArrayElements(arg5, lparg5, 0);
WebKit_win32_NATIVE_EXIT(env, that, JSEvaluateScript_FUNC);
return rc;
}
#endif
#ifndef NO_JSGlobalContextRetain
-extern "C" JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSGlobalContextRetain)(JNIEnv *env, jclass that, jintLong arg0);
+extern "C" JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSGlobalContextRetain)(JNIEnv *env, jclass that, jlong arg0);
JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSGlobalContextRetain)
- (JNIEnv *env, jclass that, jintLong arg0)
+ (JNIEnv *env, jclass that, jlong arg0)
{
jint rc = 0;
WebKit_win32_NATIVE_ENTER(env, that, JSGlobalContextRetain_FUNC);
@@ -424,56 +424,56 @@ JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSGlobalContextRetain)
#endif
#ifndef NO_JSObjectGetPrivate
-extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSObjectGetPrivate)(JNIEnv *env, jclass that, jintLong arg0);
-JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSObjectGetPrivate)
- (JNIEnv *env, jclass that, jintLong arg0)
+extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSObjectGetPrivate)(JNIEnv *env, jclass that, jlong arg0);
+JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSObjectGetPrivate)
+ (JNIEnv *env, jclass that, jlong arg0)
{
- jintLong rc = 0;
+ jlong rc = 0;
WebKit_win32_NATIVE_ENTER(env, that, JSObjectGetPrivate_FUNC);
- rc = (jintLong)JSObjectGetPrivate((JSObjectRef)arg0);
+ rc = (jlong)JSObjectGetPrivate((JSObjectRef)arg0);
WebKit_win32_NATIVE_EXIT(env, that, JSObjectGetPrivate_FUNC);
return rc;
}
#endif
#ifndef NO_JSObjectGetProperty
-extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSObjectGetProperty)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLongArray arg3);
-JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSObjectGetProperty)
- (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLongArray arg3)
+extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSObjectGetProperty)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlongArray arg3);
+JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSObjectGetProperty)
+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlongArray arg3)
{
- jintLong *lparg3=NULL;
- jintLong rc = 0;
+ jlong *lparg3=NULL;
+ jlong rc = 0;
WebKit_win32_NATIVE_ENTER(env, that, JSObjectGetProperty_FUNC);
- if (arg3) if ((lparg3 = env->GetIntLongArrayElements(arg3, NULL)) == NULL) goto fail;
- rc = (jintLong)JSObjectGetProperty((JSContextRef)arg0, (JSObjectRef)arg1, (JSStringRef)arg2, (JSValueRef*)lparg3);
+ if (arg3) if ((lparg3 = env->GetLongArrayElements(arg3, NULL)) == NULL) goto fail;
+ rc = (jlong)JSObjectGetProperty((JSContextRef)arg0, (JSObjectRef)arg1, (JSStringRef)arg2, (JSValueRef*)lparg3);
fail:
- if (arg3 && lparg3) env->ReleaseIntLongArrayElements(arg3, lparg3, 0);
+ if (arg3 && lparg3) env->ReleaseLongArrayElements(arg3, lparg3, 0);
WebKit_win32_NATIVE_EXIT(env, that, JSObjectGetProperty_FUNC);
return rc;
}
#endif
#ifndef NO_JSObjectGetPropertyAtIndex
-extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSObjectGetPropertyAtIndex)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLongArray arg3);
-JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSObjectGetPropertyAtIndex)
- (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLongArray arg3)
+extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSObjectGetPropertyAtIndex)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jlongArray arg3);
+JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSObjectGetPropertyAtIndex)
+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jlongArray arg3)
{
- jintLong *lparg3=NULL;
- jintLong rc = 0;
+ jlong *lparg3=NULL;
+ jlong rc = 0;
WebKit_win32_NATIVE_ENTER(env, that, JSObjectGetPropertyAtIndex_FUNC);
- if (arg3) if ((lparg3 = env->GetIntLongArrayElements(arg3, NULL)) == NULL) goto fail;
- rc = (jintLong)JSObjectGetPropertyAtIndex((JSContextRef)arg0, (JSObjectRef)arg1, (unsigned)arg2, (JSValueRef*)lparg3);
+ if (arg3) if ((lparg3 = env->GetLongArrayElements(arg3, NULL)) == NULL) goto fail;
+ rc = (jlong)JSObjectGetPropertyAtIndex((JSContextRef)arg0, (JSObjectRef)arg1, (unsigned)arg2, (JSValueRef*)lparg3);
fail:
- if (arg3 && lparg3) env->ReleaseIntLongArrayElements(arg3, lparg3, 0);
+ if (arg3 && lparg3) env->ReleaseLongArrayElements(arg3, lparg3, 0);
WebKit_win32_NATIVE_EXIT(env, that, JSObjectGetPropertyAtIndex_FUNC);
return rc;
}
#endif
#ifndef NO_JSObjectMake
-extern "C" JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSObjectMake)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2);
+extern "C" JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSObjectMake)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2);
JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSObjectMake)
- (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2)
{
jint rc = 0;
WebKit_win32_NATIVE_ENTER(env, that, JSObjectMake_FUNC);
@@ -484,29 +484,29 @@ JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSObjectMake)
#endif
#ifndef NO_JSObjectMakeArray
-extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSObjectMakeArray)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3);
-JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSObjectMakeArray)
- (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3)
+extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSObjectMakeArray)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlongArray arg2, jlongArray arg3);
+JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSObjectMakeArray)
+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlongArray arg2, jlongArray arg3)
{
- jintLong *lparg2=NULL;
- jintLong *lparg3=NULL;
- jintLong rc = 0;
+ jlong *lparg2=NULL;
+ jlong *lparg3=NULL;
+ jlong rc = 0;
WebKit_win32_NATIVE_ENTER(env, that, JSObjectMakeArray_FUNC);
- if (arg2) if ((lparg2 = env->GetIntLongArrayElements(arg2, NULL)) == NULL) goto fail;
- if (arg3) if ((lparg3 = env->GetIntLongArrayElements(arg3, NULL)) == NULL) goto fail;
- rc = (jintLong)JSObjectMakeArray((JSContextRef)arg0, (size_t)arg1, (const struct OpaqueJSValue * const*)lparg2, (JSValueRef*)lparg3);
+ if (arg2) if ((lparg2 = env->GetLongArrayElements(arg2, NULL)) == NULL) goto fail;
+ if (arg3) if ((lparg3 = env->GetLongArrayElements(arg3, NULL)) == NULL) goto fail;
+ rc = (jlong)JSObjectMakeArray((JSContextRef)arg0, (size_t)arg1, (const struct OpaqueJSValue * const*)lparg2, (JSValueRef*)lparg3);
fail:
- if (arg3 && lparg3) env->ReleaseIntLongArrayElements(arg3, lparg3, 0);
- if (arg2 && lparg2) env->ReleaseIntLongArrayElements(arg2, lparg2, 0);
+ if (arg3 && lparg3) env->ReleaseLongArrayElements(arg3, lparg3, 0);
+ if (arg2 && lparg2) env->ReleaseLongArrayElements(arg2, lparg2, 0);
WebKit_win32_NATIVE_EXIT(env, that, JSObjectMakeArray_FUNC);
return rc;
}
#endif
#ifndef NO_JSObjectMakeFunctionWithCallback
-extern "C" JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSObjectMakeFunctionWithCallback)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2);
+extern "C" JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSObjectMakeFunctionWithCallback)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2);
JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSObjectMakeFunctionWithCallback)
- (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2)
{
jint rc = 0;
WebKit_win32_NATIVE_ENTER(env, that, JSObjectMakeFunctionWithCallback_FUNC);
@@ -517,30 +517,30 @@ JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSObjectMakeFunctionWithCallback)
#endif
#ifndef NO_JSObjectSetProperty
-extern "C" JNIEXPORT void JNICALL WebKit_win32_NATIVE(JSObjectSetProperty)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLongArray arg5);
+extern "C" JNIEXPORT void JNICALL WebKit_win32_NATIVE(JSObjectSetProperty)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4, jlongArray arg5);
JNIEXPORT void JNICALL WebKit_win32_NATIVE(JSObjectSetProperty)
- (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLongArray arg5)
+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4, jlongArray arg5)
{
- jintLong *lparg5=NULL;
+ jlong *lparg5=NULL;
WebKit_win32_NATIVE_ENTER(env, that, JSObjectSetProperty_FUNC);
- if (arg5) if ((lparg5 = env->GetIntLongArrayElements(arg5, NULL)) == NULL) goto fail;
+ if (arg5) if ((lparg5 = env->GetLongArrayElements(arg5, NULL)) == NULL) goto fail;
JSObjectSetProperty((JSContextRef)arg0, (JSObjectRef)arg1, (JSStringRef)arg2, (JSValueRef)arg3, (JSPropertyAttributes)arg4, (JSValueRef *)lparg5);
fail:
- if (arg5 && lparg5) env->ReleaseIntLongArrayElements(arg5, lparg5, 0);
+ if (arg5 && lparg5) env->ReleaseLongArrayElements(arg5, lparg5, 0);
WebKit_win32_NATIVE_EXIT(env, that, JSObjectSetProperty_FUNC);
}
#endif
#ifndef NO_JSStringCreateWithUTF8CString
-extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSStringCreateWithUTF8CString)(JNIEnv *env, jclass that, jbyteArray arg0);
-JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSStringCreateWithUTF8CString)
+extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSStringCreateWithUTF8CString)(JNIEnv *env, jclass that, jbyteArray arg0);
+JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSStringCreateWithUTF8CString)
(JNIEnv *env, jclass that, jbyteArray arg0)
{
jbyte *lparg0=NULL;
- jintLong rc = 0;
+ jlong rc = 0;
WebKit_win32_NATIVE_ENTER(env, that, JSStringCreateWithUTF8CString_FUNC);
if (arg0) if ((lparg0 = env->GetByteArrayElements(arg0, NULL)) == NULL) goto fail;
- rc = (jintLong)JSStringCreateWithUTF8CString((const char*)lparg0);
+ rc = (jlong)JSStringCreateWithUTF8CString((const char*)lparg0);
fail:
if (arg0 && lparg0) env->ReleaseByteArrayElements(arg0, lparg0, 0);
WebKit_win32_NATIVE_EXIT(env, that, JSStringCreateWithUTF8CString_FUNC);
@@ -549,9 +549,9 @@ fail:
#endif
#ifndef NO_JSStringGetLength
-extern "C" JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSStringGetLength)(JNIEnv *env, jclass that, jintLong arg0);
+extern "C" JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSStringGetLength)(JNIEnv *env, jclass that, jlong arg0);
JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSStringGetLength)
- (JNIEnv *env, jclass that, jintLong arg0)
+ (JNIEnv *env, jclass that, jlong arg0)
{
jint rc = 0;
WebKit_win32_NATIVE_ENTER(env, that, JSStringGetLength_FUNC);
@@ -562,22 +562,22 @@ JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSStringGetLength)
#endif
#ifndef NO_JSStringGetMaximumUTF8CStringSize
-extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSStringGetMaximumUTF8CStringSize)(JNIEnv *env, jclass that, jintLong arg0);
-JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSStringGetMaximumUTF8CStringSize)
- (JNIEnv *env, jclass that, jintLong arg0)
+extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSStringGetMaximumUTF8CStringSize)(JNIEnv *env, jclass that, jlong arg0);
+JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSStringGetMaximumUTF8CStringSize)
+ (JNIEnv *env, jclass that, jlong arg0)
{
- jintLong rc = 0;
+ jlong rc = 0;
WebKit_win32_NATIVE_ENTER(env, that, JSStringGetMaximumUTF8CStringSize_FUNC);
- rc = (jintLong)JSStringGetMaximumUTF8CStringSize((JSStringRef)arg0);
+ rc = (jlong)JSStringGetMaximumUTF8CStringSize((JSStringRef)arg0);
WebKit_win32_NATIVE_EXIT(env, that, JSStringGetMaximumUTF8CStringSize_FUNC);
return rc;
}
#endif
#ifndef NO_JSStringGetUTF8CString
-extern "C" JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSStringGetUTF8CString)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2);
+extern "C" JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSStringGetUTF8CString)(JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlong arg2);
JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSStringGetUTF8CString)
- (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2)
+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlong arg2)
{
jbyte *lparg1=NULL;
jint rc = 0;
@@ -592,9 +592,9 @@ fail:
#endif
#ifndef NO_JSStringIsEqualToUTF8CString
-extern "C" JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSStringIsEqualToUTF8CString)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1);
+extern "C" JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSStringIsEqualToUTF8CString)(JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1);
JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSStringIsEqualToUTF8CString)
- (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1)
{
jbyte *lparg1=NULL;
jint rc = 0;
@@ -609,9 +609,9 @@ fail:
#endif
#ifndef NO_JSStringRelease
-extern "C" JNIEXPORT void JNICALL WebKit_win32_NATIVE(JSStringRelease)(JNIEnv *env, jclass that, jintLong arg0);
+extern "C" JNIEXPORT void JNICALL WebKit_win32_NATIVE(JSStringRelease)(JNIEnv *env, jclass that, jlong arg0);
JNIEXPORT void JNICALL WebKit_win32_NATIVE(JSStringRelease)
- (JNIEnv *env, jclass that, jintLong arg0)
+ (JNIEnv *env, jclass that, jlong arg0)
{
WebKit_win32_NATIVE_ENTER(env, that, JSStringRelease_FUNC);
JSStringRelease((JSStringRef)arg0);
@@ -620,9 +620,9 @@ JNIEXPORT void JNICALL WebKit_win32_NATIVE(JSStringRelease)
#endif
#ifndef NO_JSValueGetType
-extern "C" JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSValueGetType)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1);
+extern "C" JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSValueGetType)(JNIEnv *env, jclass that, jlong arg0, jlong arg1);
JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSValueGetType)
- (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
{
jint rc = 0;
WebKit_win32_NATIVE_ENTER(env, that, JSValueGetType_FUNC);
@@ -633,9 +633,9 @@ JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSValueGetType)
#endif
#ifndef NO_JSValueIsObjectOfClass
-extern "C" JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSValueIsObjectOfClass)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2);
+extern "C" JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSValueIsObjectOfClass)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2);
JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSValueIsObjectOfClass)
- (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2)
{
jint rc = 0;
WebKit_win32_NATIVE_ENTER(env, that, JSValueIsObjectOfClass_FUNC);
@@ -646,134 +646,134 @@ JNIEXPORT jint JNICALL WebKit_win32_NATIVE(JSValueIsObjectOfClass)
#endif
#ifndef NO_JSValueMakeBoolean
-extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSValueMakeBoolean)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1);
-JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSValueMakeBoolean)
- (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSValueMakeBoolean)(JNIEnv *env, jclass that, jlong arg0, jlong arg1);
+JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSValueMakeBoolean)
+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
{
- jintLong rc = 0;
+ jlong rc = 0;
WebKit_win32_NATIVE_ENTER(env, that, JSValueMakeBoolean_FUNC);
- rc = (jintLong)JSValueMakeBoolean((JSContextRef)arg0, (bool)arg1);
+ rc = (jlong)JSValueMakeBoolean((JSContextRef)arg0, (bool)arg1);
WebKit_win32_NATIVE_EXIT(env, that, JSValueMakeBoolean_FUNC);
return rc;
}
#endif
#ifndef NO_JSValueMakeNull
-extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSValueMakeNull)(JNIEnv *env, jclass that, jintLong arg0);
-JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSValueMakeNull)
- (JNIEnv *env, jclass that, jintLong arg0)
+extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSValueMakeNull)(JNIEnv *env, jclass that, jlong arg0);
+JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSValueMakeNull)
+ (JNIEnv *env, jclass that, jlong arg0)
{
- jintLong rc = 0;
+ jlong rc = 0;
WebKit_win32_NATIVE_ENTER(env, that, JSValueMakeNull_FUNC);
- rc = (jintLong)JSValueMakeNull((JSContextRef)arg0);
+ rc = (jlong)JSValueMakeNull((JSContextRef)arg0);
WebKit_win32_NATIVE_EXIT(env, that, JSValueMakeNull_FUNC);
return rc;
}
#endif
#ifndef NO_JSValueMakeNumber
-extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSValueMakeNumber)(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1);
-JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSValueMakeNumber)
- (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1)
+extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSValueMakeNumber)(JNIEnv *env, jclass that, jlong arg0, jdouble arg1);
+JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSValueMakeNumber)
+ (JNIEnv *env, jclass that, jlong arg0, jdouble arg1)
{
- jintLong rc = 0;
+ jlong rc = 0;
WebKit_win32_NATIVE_ENTER(env, that, JSValueMakeNumber_FUNC);
- rc = (jintLong)JSValueMakeNumber((JSContextRef)arg0, (double)arg1);
+ rc = (jlong)JSValueMakeNumber((JSContextRef)arg0, (double)arg1);
WebKit_win32_NATIVE_EXIT(env, that, JSValueMakeNumber_FUNC);
return rc;
}
#endif
#ifndef NO_JSValueMakeString
-extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSValueMakeString)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1);
-JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSValueMakeString)
- (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSValueMakeString)(JNIEnv *env, jclass that, jlong arg0, jlong arg1);
+JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSValueMakeString)
+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
{
- jintLong rc = 0;
+ jlong rc = 0;
WebKit_win32_NATIVE_ENTER(env, that, JSValueMakeString_FUNC);
- rc = (jintLong)JSValueMakeString((JSContextRef)arg0, (JSStringRef)arg1);
+ rc = (jlong)JSValueMakeString((JSContextRef)arg0, (JSStringRef)arg1);
WebKit_win32_NATIVE_EXIT(env, that, JSValueMakeString_FUNC);
return rc;
}
#endif
#ifndef NO_JSValueMakeUndefined
-extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSValueMakeUndefined)(JNIEnv *env, jclass that, jintLong arg0);
-JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSValueMakeUndefined)
- (JNIEnv *env, jclass that, jintLong arg0)
+extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSValueMakeUndefined)(JNIEnv *env, jclass that, jlong arg0);
+JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSValueMakeUndefined)
+ (JNIEnv *env, jclass that, jlong arg0)
{
- jintLong rc = 0;
+ jlong rc = 0;
WebKit_win32_NATIVE_ENTER(env, that, JSValueMakeUndefined_FUNC);
- rc = (jintLong)JSValueMakeUndefined((JSContextRef)arg0);
+ rc = (jlong)JSValueMakeUndefined((JSContextRef)arg0);
WebKit_win32_NATIVE_EXIT(env, that, JSValueMakeUndefined_FUNC);
return rc;
}
#endif
#ifndef NO_JSValueToNumber
-extern "C" JNIEXPORT jdouble JNICALL WebKit_win32_NATIVE(JSValueToNumber)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2);
+extern "C" JNIEXPORT jdouble JNICALL WebKit_win32_NATIVE(JSValueToNumber)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlongArray arg2);
JNIEXPORT jdouble JNICALL WebKit_win32_NATIVE(JSValueToNumber)
- (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2)
+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlongArray arg2)
{
- jintLong *lparg2=NULL;
+ jlong *lparg2=NULL;
jdouble rc = 0;
WebKit_win32_NATIVE_ENTER(env, that, JSValueToNumber_FUNC);
- if (arg2) if ((lparg2 = env->GetIntLongArrayElements(arg2, NULL)) == NULL) goto fail;
+ if (arg2) if ((lparg2 = env->GetLongArrayElements(arg2, NULL)) == NULL) goto fail;
rc = (jdouble)JSValueToNumber((JSContextRef)arg0, (JSValueRef)arg1, (JSValueRef*)lparg2);
fail:
- if (arg2 && lparg2) env->ReleaseIntLongArrayElements(arg2, lparg2, 0);
+ if (arg2 && lparg2) env->ReleaseLongArrayElements(arg2, lparg2, 0);
WebKit_win32_NATIVE_EXIT(env, that, JSValueToNumber_FUNC);
return rc;
}
#endif
#ifndef NO_JSValueToStringCopy
-extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSValueToStringCopy)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2);
-JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSValueToStringCopy)
- (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2)
+extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSValueToStringCopy)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlongArray arg2);
+JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSValueToStringCopy)
+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlongArray arg2)
{
- jintLong *lparg2=NULL;
- jintLong rc = 0;
+ jlong *lparg2=NULL;
+ jlong rc = 0;
WebKit_win32_NATIVE_ENTER(env, that, JSValueToStringCopy_FUNC);
- if (arg2) if ((lparg2 = env->GetIntLongArrayElements(arg2, NULL)) == NULL) goto fail;
- rc = (jintLong)JSValueToStringCopy((JSContextRef)arg0, (JSValueRef)arg1, (JSValueRef*)lparg2);
+ if (arg2) if ((lparg2 = env->GetLongArrayElements(arg2, NULL)) == NULL) goto fail;
+ rc = (jlong)JSValueToStringCopy((JSContextRef)arg0, (JSValueRef)arg1, (JSValueRef*)lparg2);
fail:
- if (arg2 && lparg2) env->ReleaseIntLongArrayElements(arg2, lparg2, 0);
+ if (arg2 && lparg2) env->ReleaseLongArrayElements(arg2, lparg2, 0);
WebKit_win32_NATIVE_EXIT(env, that, JSValueToStringCopy_FUNC);
return rc;
}
#endif
#ifndef NO_kCFCopyStringDictionaryKeyCallBacks
-extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(kCFCopyStringDictionaryKeyCallBacks)(JNIEnv *env, jclass that);
-JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(kCFCopyStringDictionaryKeyCallBacks)
+extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(kCFCopyStringDictionaryKeyCallBacks)(JNIEnv *env, jclass that);
+JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(kCFCopyStringDictionaryKeyCallBacks)
(JNIEnv *env, jclass that)
{
- jintLong rc = 0;
+ jlong rc = 0;
WebKit_win32_NATIVE_ENTER(env, that, kCFCopyStringDictionaryKeyCallBacks_FUNC);
- rc = (jintLong)&kCFCopyStringDictionaryKeyCallBacks;
+ rc = (jlong)&kCFCopyStringDictionaryKeyCallBacks;
WebKit_win32_NATIVE_EXIT(env, that, kCFCopyStringDictionaryKeyCallBacks_FUNC);
return rc;
}
#endif
#ifndef NO_kCFTypeDictionaryValueCallBacks
-extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(kCFTypeDictionaryValueCallBacks)(JNIEnv *env, jclass that);
-JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(kCFTypeDictionaryValueCallBacks)
+extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(kCFTypeDictionaryValueCallBacks)(JNIEnv *env, jclass that);
+JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(kCFTypeDictionaryValueCallBacks)
(JNIEnv *env, jclass that)
{
- jintLong rc = 0;
+ jlong rc = 0;
WebKit_win32_NATIVE_ENTER(env, that, kCFTypeDictionaryValueCallBacks_FUNC);
- rc = (jintLong)&kCFTypeDictionaryValueCallBacks;
+ rc = (jlong)&kCFTypeDictionaryValueCallBacks;
WebKit_win32_NATIVE_EXIT(env, that, kCFTypeDictionaryValueCallBacks_FUNC);
return rc;
}
#endif
#ifndef NO_memmove
-extern "C" JNIEXPORT void JNICALL WebKit_win32_NATIVE(memmove)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2);
+extern "C" JNIEXPORT void JNICALL WebKit_win32_NATIVE(memmove)(JNIEnv *env, jclass that, jlong arg0, jobject arg1, jlong arg2);
JNIEXPORT void JNICALL WebKit_win32_NATIVE(memmove)
- (JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+ (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jlong arg2)
{
JSClassDefinition _arg1, *lparg1=NULL;
WebKit_win32_NATIVE_ENTER(env, that, memmove_FUNC);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library/webkit_win32_structs.cpp b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library/webkit_win32_structs.cpp
index c0a9efea4c..782dc5e93b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library/webkit_win32_structs.cpp
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library/webkit_win32_structs.cpp
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2016 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2009, 2019 IBM Corporation and others. All rights reserved.
* The contents of this file are made available under the terms
* of the GNU Lesser General Public License (LGPL) Version 2.1 that
* accompanies this distribution (lgpl-v21.txt). The LGPL is also
@@ -34,21 +34,21 @@ void cacheJSClassDefinitionFields(JNIEnv *env, jobject lpObject)
JSClassDefinitionFc.clazz = env->GetObjectClass(lpObject);
JSClassDefinitionFc.version = env->GetFieldID(JSClassDefinitionFc.clazz, "version", "I");
JSClassDefinitionFc.attributes = env->GetFieldID(JSClassDefinitionFc.clazz, "attributes", "I");
- JSClassDefinitionFc.className = env->GetFieldID(JSClassDefinitionFc.clazz, "className", I_J);
- JSClassDefinitionFc.parentClass = env->GetFieldID(JSClassDefinitionFc.clazz, "parentClass", I_J);
- JSClassDefinitionFc.staticValues = env->GetFieldID(JSClassDefinitionFc.clazz, "staticValues", I_J);
- JSClassDefinitionFc.staticFunctions = env->GetFieldID(JSClassDefinitionFc.clazz, "staticFunctions", I_J);
- JSClassDefinitionFc.initialize = env->GetFieldID(JSClassDefinitionFc.clazz, "initialize", I_J);
- JSClassDefinitionFc.finalize = env->GetFieldID(JSClassDefinitionFc.clazz, "finalize", I_J);
- JSClassDefinitionFc.hasProperty = env->GetFieldID(JSClassDefinitionFc.clazz, "hasProperty", I_J);
- JSClassDefinitionFc.getProperty = env->GetFieldID(JSClassDefinitionFc.clazz, "getProperty", I_J);
- JSClassDefinitionFc.setProperty = env->GetFieldID(JSClassDefinitionFc.clazz, "setProperty", I_J);
- JSClassDefinitionFc.deleteProperty = env->GetFieldID(JSClassDefinitionFc.clazz, "deleteProperty", I_J);
- JSClassDefinitionFc.getPropertyNames = env->GetFieldID(JSClassDefinitionFc.clazz, "getPropertyNames", I_J);
- JSClassDefinitionFc.callAsFunction = env->GetFieldID(JSClassDefinitionFc.clazz, "callAsFunction", I_J);
- JSClassDefinitionFc.callAsConstructor = env->GetFieldID(JSClassDefinitionFc.clazz, "callAsConstructor", I_J);
- JSClassDefinitionFc.hasInstance = env->GetFieldID(JSClassDefinitionFc.clazz, "hasInstance", I_J);
- JSClassDefinitionFc.convertToType = env->GetFieldID(JSClassDefinitionFc.clazz, "convertToType", I_J);
+ JSClassDefinitionFc.className = env->GetFieldID(JSClassDefinitionFc.clazz, "className", "J");
+ JSClassDefinitionFc.parentClass = env->GetFieldID(JSClassDefinitionFc.clazz, "parentClass", "J");
+ JSClassDefinitionFc.staticValues = env->GetFieldID(JSClassDefinitionFc.clazz, "staticValues", "J");
+ JSClassDefinitionFc.staticFunctions = env->GetFieldID(JSClassDefinitionFc.clazz, "staticFunctions", "J");
+ JSClassDefinitionFc.initialize = env->GetFieldID(JSClassDefinitionFc.clazz, "initialize", "J");
+ JSClassDefinitionFc.finalize = env->GetFieldID(JSClassDefinitionFc.clazz, "finalize", "J");
+ JSClassDefinitionFc.hasProperty = env->GetFieldID(JSClassDefinitionFc.clazz, "hasProperty", "J");
+ JSClassDefinitionFc.getProperty = env->GetFieldID(JSClassDefinitionFc.clazz, "getProperty", "J");
+ JSClassDefinitionFc.setProperty = env->GetFieldID(JSClassDefinitionFc.clazz, "setProperty", "J");
+ JSClassDefinitionFc.deleteProperty = env->GetFieldID(JSClassDefinitionFc.clazz, "deleteProperty", "J");
+ JSClassDefinitionFc.getPropertyNames = env->GetFieldID(JSClassDefinitionFc.clazz, "getPropertyNames", "J");
+ JSClassDefinitionFc.callAsFunction = env->GetFieldID(JSClassDefinitionFc.clazz, "callAsFunction", "J");
+ JSClassDefinitionFc.callAsConstructor = env->GetFieldID(JSClassDefinitionFc.clazz, "callAsConstructor", "J");
+ JSClassDefinitionFc.hasInstance = env->GetFieldID(JSClassDefinitionFc.clazz, "hasInstance", "J");
+ JSClassDefinitionFc.convertToType = env->GetFieldID(JSClassDefinitionFc.clazz, "convertToType", "J");
JSClassDefinitionFc.cached = 1;
}
@@ -57,21 +57,21 @@ JSClassDefinition *getJSClassDefinitionFields(JNIEnv *env, jobject lpObject, JSC
if (!JSClassDefinitionFc.cached) cacheJSClassDefinitionFields(env, lpObject);
lpStruct->version = env->GetIntField(lpObject, JSClassDefinitionFc.version);
lpStruct->attributes = (JSClassAttributes)env->GetIntField(lpObject, JSClassDefinitionFc.attributes);
- lpStruct->className = (const char*)env->GetIntLongField(lpObject, JSClassDefinitionFc.className);
- lpStruct->parentClass = (JSClassRef)env->GetIntLongField(lpObject, JSClassDefinitionFc.parentClass);
- lpStruct->staticValues = (const JSStaticValue*)env->GetIntLongField(lpObject, JSClassDefinitionFc.staticValues);
- lpStruct->staticFunctions = (const JSStaticFunction*)env->GetIntLongField(lpObject, JSClassDefinitionFc.staticFunctions);
- lpStruct->initialize = (JSObjectInitializeCallback)env->GetIntLongField(lpObject, JSClassDefinitionFc.initialize);
- lpStruct->finalize = (JSObjectFinalizeCallback)env->GetIntLongField(lpObject, JSClassDefinitionFc.finalize);
- lpStruct->hasProperty = (JSObjectHasPropertyCallback)env->GetIntLongField(lpObject, JSClassDefinitionFc.hasProperty);
- lpStruct->getProperty = (JSObjectGetPropertyCallback)env->GetIntLongField(lpObject, JSClassDefinitionFc.getProperty);
- lpStruct->setProperty = (JSObjectSetPropertyCallback)env->GetIntLongField(lpObject, JSClassDefinitionFc.setProperty);
- lpStruct->deleteProperty = (JSObjectDeletePropertyCallback)env->GetIntLongField(lpObject, JSClassDefinitionFc.deleteProperty);
- lpStruct->getPropertyNames = (JSObjectGetPropertyNamesCallback)env->GetIntLongField(lpObject, JSClassDefinitionFc.getPropertyNames);
- lpStruct->callAsFunction = (JSObjectCallAsFunctionCallback)env->GetIntLongField(lpObject, JSClassDefinitionFc.callAsFunction);
- lpStruct->callAsConstructor = (JSObjectCallAsConstructorCallback)env->GetIntLongField(lpObject, JSClassDefinitionFc.callAsConstructor);
- lpStruct->hasInstance = (JSObjectHasInstanceCallback)env->GetIntLongField(lpObject, JSClassDefinitionFc.hasInstance);
- lpStruct->convertToType = (JSObjectConvertToTypeCallback)env->GetIntLongField(lpObject, JSClassDefinitionFc.convertToType);
+ lpStruct->className = (const char*)env->GetLongField(lpObject, JSClassDefinitionFc.className);
+ lpStruct->parentClass = (JSClassRef)env->GetLongField(lpObject, JSClassDefinitionFc.parentClass);
+ lpStruct->staticValues = (const JSStaticValue*)env->GetLongField(lpObject, JSClassDefinitionFc.staticValues);
+ lpStruct->staticFunctions = (const JSStaticFunction*)env->GetLongField(lpObject, JSClassDefinitionFc.staticFunctions);
+ lpStruct->initialize = (JSObjectInitializeCallback)env->GetLongField(lpObject, JSClassDefinitionFc.initialize);
+ lpStruct->finalize = (JSObjectFinalizeCallback)env->GetLongField(lpObject, JSClassDefinitionFc.finalize);
+ lpStruct->hasProperty = (JSObjectHasPropertyCallback)env->GetLongField(lpObject, JSClassDefinitionFc.hasProperty);
+ lpStruct->getProperty = (JSObjectGetPropertyCallback)env->GetLongField(lpObject, JSClassDefinitionFc.getProperty);
+ lpStruct->setProperty = (JSObjectSetPropertyCallback)env->GetLongField(lpObject, JSClassDefinitionFc.setProperty);
+ lpStruct->deleteProperty = (JSObjectDeletePropertyCallback)env->GetLongField(lpObject, JSClassDefinitionFc.deleteProperty);
+ lpStruct->getPropertyNames = (JSObjectGetPropertyNamesCallback)env->GetLongField(lpObject, JSClassDefinitionFc.getPropertyNames);
+ lpStruct->callAsFunction = (JSObjectCallAsFunctionCallback)env->GetLongField(lpObject, JSClassDefinitionFc.callAsFunction);
+ lpStruct->callAsConstructor = (JSObjectCallAsConstructorCallback)env->GetLongField(lpObject, JSClassDefinitionFc.callAsConstructor);
+ lpStruct->hasInstance = (JSObjectHasInstanceCallback)env->GetLongField(lpObject, JSClassDefinitionFc.hasInstance);
+ lpStruct->convertToType = (JSObjectConvertToTypeCallback)env->GetLongField(lpObject, JSClassDefinitionFc.convertToType);
return lpStruct;
}
@@ -80,21 +80,21 @@ void setJSClassDefinitionFields(JNIEnv *env, jobject lpObject, JSClassDefinition
if (!JSClassDefinitionFc.cached) cacheJSClassDefinitionFields(env, lpObject);
env->SetIntField(lpObject, JSClassDefinitionFc.version, (jint)lpStruct->version);
env->SetIntField(lpObject, JSClassDefinitionFc.attributes, (jint)lpStruct->attributes);
- env->SetIntLongField(lpObject, JSClassDefinitionFc.className, (jintLong)lpStruct->className);
- env->SetIntLongField(lpObject, JSClassDefinitionFc.parentClass, (jintLong)lpStruct->parentClass);
- env->SetIntLongField(lpObject, JSClassDefinitionFc.staticValues, (jintLong)lpStruct->staticValues);
- env->SetIntLongField(lpObject, JSClassDefinitionFc.staticFunctions, (jintLong)lpStruct->staticFunctions);
- env->SetIntLongField(lpObject, JSClassDefinitionFc.initialize, (jintLong)lpStruct->initialize);
- env->SetIntLongField(lpObject, JSClassDefinitionFc.finalize, (jintLong)lpStruct->finalize);
- env->SetIntLongField(lpObject, JSClassDefinitionFc.hasProperty, (jintLong)lpStruct->hasProperty);
- env->SetIntLongField(lpObject, JSClassDefinitionFc.getProperty, (jintLong)lpStruct->getProperty);
- env->SetIntLongField(lpObject, JSClassDefinitionFc.setProperty, (jintLong)lpStruct->setProperty);
- env->SetIntLongField(lpObject, JSClassDefinitionFc.deleteProperty, (jintLong)lpStruct->deleteProperty);
- env->SetIntLongField(lpObject, JSClassDefinitionFc.getPropertyNames, (jintLong)lpStruct->getPropertyNames);
- env->SetIntLongField(lpObject, JSClassDefinitionFc.callAsFunction, (jintLong)lpStruct->callAsFunction);
- env->SetIntLongField(lpObject, JSClassDefinitionFc.callAsConstructor, (jintLong)lpStruct->callAsConstructor);
- env->SetIntLongField(lpObject, JSClassDefinitionFc.hasInstance, (jintLong)lpStruct->hasInstance);
- env->SetIntLongField(lpObject, JSClassDefinitionFc.convertToType, (jintLong)lpStruct->convertToType);
+ env->SetLongField(lpObject, JSClassDefinitionFc.className, (jlong)lpStruct->className);
+ env->SetLongField(lpObject, JSClassDefinitionFc.parentClass, (jlong)lpStruct->parentClass);
+ env->SetLongField(lpObject, JSClassDefinitionFc.staticValues, (jlong)lpStruct->staticValues);
+ env->SetLongField(lpObject, JSClassDefinitionFc.staticFunctions, (jlong)lpStruct->staticFunctions);
+ env->SetLongField(lpObject, JSClassDefinitionFc.initialize, (jlong)lpStruct->initialize);
+ env->SetLongField(lpObject, JSClassDefinitionFc.finalize, (jlong)lpStruct->finalize);
+ env->SetLongField(lpObject, JSClassDefinitionFc.hasProperty, (jlong)lpStruct->hasProperty);
+ env->SetLongField(lpObject, JSClassDefinitionFc.getProperty, (jlong)lpStruct->getProperty);
+ env->SetLongField(lpObject, JSClassDefinitionFc.setProperty, (jlong)lpStruct->setProperty);
+ env->SetLongField(lpObject, JSClassDefinitionFc.deleteProperty, (jlong)lpStruct->deleteProperty);
+ env->SetLongField(lpObject, JSClassDefinitionFc.getPropertyNames, (jlong)lpStruct->getPropertyNames);
+ env->SetLongField(lpObject, JSClassDefinitionFc.callAsFunction, (jlong)lpStruct->callAsFunction);
+ env->SetLongField(lpObject, JSClassDefinitionFc.callAsConstructor, (jlong)lpStruct->callAsConstructor);
+ env->SetLongField(lpObject, JSClassDefinitionFc.hasInstance, (jlong)lpStruct->hasInstance);
+ env->SetLongField(lpObject, JSClassDefinitionFc.convertToType, (jlong)lpStruct->convertToType);
}
#endif
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 822938173a..eaf177a547 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
@@ -50,39 +50,39 @@ int AddRef () {
void createCOMInterfaces () {
iWebDownloadDelegate = new COMObject (new int[] {2, 0, 0, 2, 2, 2, 2, 2, 2, 2, 3, 3, 4, 1, 1}) {
@Override
- public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long method0 (long[] args) {return QueryInterface (args[0], args[1]);}
@Override
- public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long method1 (long[] args) {return AddRef ();}
@Override
- public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long method2 (long[] args) {return Release ();}
@Override
- public long /*int*/ method3 (long /*int*/[] args) {return decideDestinationWithSuggestedFilename (args[0], args[1]);}
+ public long method3 (long[] args) {return decideDestinationWithSuggestedFilename (args[0], args[1]);}
@Override
- public long /*int*/ method4 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long method4 (long[] args) {return COM.E_NOTIMPL;}
@Override
- public long /*int*/ method5 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long method5 (long[] args) {return COM.E_NOTIMPL;}
@Override
- public long /*int*/ method6 (long /*int*/[] args) {return didFailWithError (args[0], args[1]);}
+ public long method6 (long[] args) {return didFailWithError (args[0], args[1]);}
@Override
- public long /*int*/ method7 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long method7 (long[] args) {return COM.E_NOTIMPL;}
@Override
- public long /*int*/ method8 (long /*int*/[] args) {return didReceiveDataOfLength (args[0], (int)/*64*/args[1]);}
+ public long method8 (long[] args) {return didReceiveDataOfLength (args[0], (int)args[1]);}
@Override
- public long /*int*/ method9 (long /*int*/[] args) {return didReceiveResponse (args[0], args[1]);}
+ public long method9 (long[] args) {return didReceiveResponse (args[0], args[1]);}
@Override
- public long /*int*/ method10 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long method10 (long[] args) {return COM.E_NOTIMPL;}
@Override
- public long /*int*/ method11 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long method11 (long[] args) {return COM.E_NOTIMPL;}
@Override
- public long /*int*/ method12 (long /*int*/[] args) {return willSendRequest (args[0], args[1], args[2], args[3]);}
+ public long method12 (long[] args) {return willSendRequest (args[0], args[1], args[2], args[3]);}
@Override
- public long /*int*/ method13 (long /*int*/[] args) {return didBegin (args[0]);}
+ public long method13 (long[] args) {return didBegin (args[0]);}
@Override
- public long /*int*/ method14 (long /*int*/[] args) {return didFinish (args[0]);}
+ public long method14 (long[] args) {return didFinish (args[0]);}
};
}
-int decideDestinationWithSuggestedFilename (long /*int*/ download, long /*int*/ filename) {
+int decideDestinationWithSuggestedFilename (long download, long filename) {
String name = WebKit.extractBSTR (filename);
FileDialog dialog = new FileDialog (browser.getShell(), SWT.SAVE);
dialog.setText (SWT.getMessage ("SWT_FileDownload")); //$NON-NLS-1$
@@ -108,7 +108,7 @@ int decideDestinationWithSuggestedFilename (long /*int*/ download, long /*int*/
return COM.S_OK;
}
-int didBegin (long /*int*/ download) {
+int didBegin (long download) {
new IWebDownload (download).AddRef ();
status = -1;
size = 0;
@@ -117,30 +117,30 @@ int didBegin (long /*int*/ download) {
return COM.S_OK;
}
-int didFailWithError (long /*int*/ download, long /*int*/ error) {
+int didFailWithError (long download, long error) {
new IWebDownload (download).Release ();
status = DOWNLOAD_ERROR;
return COM.S_OK;
}
-int didFinish (long /*int*/ download) {
+int didFinish (long download) {
new IWebDownload (download).Release ();
status = DOWNLOAD_FINISHED;
return COM.S_OK;
}
-int didReceiveDataOfLength (long /*int*/ download, int length) {
+int didReceiveDataOfLength (long download, int length) {
size += length;
return COM.S_OK;
}
-int didReceiveResponse (long /*int*/ download, long /*int*/ response) {
+int didReceiveResponse (long download, long 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];
- long /*int*/[] result = new long /*int*/[1];
+ long[] result = new long[1];
hr = urlResponse.URL (result);
if (hr == COM.S_OK && result[0] != 0) {
url = WebKit.extractBSTR (result[0]);
@@ -157,7 +157,7 @@ void disposeCOMInterfaces () {
}
}
-long /*int*/ getAddress () {
+long getAddress () {
return iWebDownloadDelegate.getAddress ();
}
@@ -224,23 +224,23 @@ void openDownloadWindow (final IWebDownload download, String name) {
shell.open ();
}
-int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
+int QueryInterface (long riid, long 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)) {
- OS.MoveMemory (ppvObject, new long /*int*/[] {iWebDownloadDelegate.getAddress ()}, C.PTR_SIZEOF);
+ OS.MoveMemory (ppvObject, new long[] {iWebDownloadDelegate.getAddress ()}, C.PTR_SIZEOF);
new IUnknown (iWebDownloadDelegate.getAddress ()).AddRef ();
return COM.S_OK;
}
if (COM.IsEqualGUID (guid, WebKit_win32.IID_IWebDownloadDelegate)) {
- OS.MoveMemory (ppvObject, new long /*int*/[] {iWebDownloadDelegate.getAddress ()}, C.PTR_SIZEOF);
+ OS.MoveMemory (ppvObject, new long[] {iWebDownloadDelegate.getAddress ()}, C.PTR_SIZEOF);
new IUnknown (iWebDownloadDelegate.getAddress ()).AddRef ();
return COM.S_OK;
}
- OS.MoveMemory (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
+ OS.MoveMemory (ppvObject, new long[] {0}, C.PTR_SIZEOF);
return COM.E_NOINTERFACE;
}
@@ -252,10 +252,10 @@ int Release () {
return refCount;
}
-int willSendRequest (long /*int*/ download, long /*int*/ request, long /*int*/ redirectResponse, long /*int*/ finalRequest) {
+int willSendRequest (long download, long request, long redirectResponse, long finalRequest) {
IWebMutableURLRequest req = new IWebMutableURLRequest (request);
req.AddRef ();
- OS.MoveMemory (finalRequest, new long /*int*/[] {request}, C.PTR_SIZEOF);
+ OS.MoveMemory (finalRequest, new long[] {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 f15cfa6e31..6ab93ca60e 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
@@ -87,54 +87,54 @@ 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}) {
@Override
- public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long method0 (long[] args) {return QueryInterface (args[0], args[1]);}
@Override
- public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long method1 (long[] args) {return AddRef ();}
@Override
- public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long method2 (long[] args) {return Release ();}
@Override
- public long /*int*/ method3 (long /*int*/[] args) {return didStartProvisionalLoadForFrame (args[0], args[1]);}
+ public long method3 (long[] args) {return didStartProvisionalLoadForFrame (args[0], args[1]);}
@Override
- public long /*int*/ method4 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long method4 (long[] args) {return COM.E_NOTIMPL;}
@Override
- public long /*int*/ method5 (long /*int*/[] args) {return didFailProvisionalLoadWithError (args[0], args[1], args[2]);}
+ public long method5 (long[] args) {return didFailProvisionalLoadWithError (args[0], args[1], args[2]);}
@Override
- public long /*int*/ method6 (long /*int*/[] args) {return didCommitLoadForFrame (args[0], args[1]);}
+ public long method6 (long[] args) {return didCommitLoadForFrame (args[0], args[1]);}
@Override
- public long /*int*/ method7 (long /*int*/[] args) {return didReceiveTitle (args[0], args[1], args[2]);}
+ public long method7 (long[] args) {return didReceiveTitle (args[0], args[1], args[2]);}
@Override
- public long /*int*/ method8 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long method8 (long[] args) {return COM.E_NOTIMPL;}
@Override
- public long /*int*/ method9 (long /*int*/[] args) {return didFinishLoadForFrame (args[0], args[1]);}
+ public long method9 (long[] args) {return didFinishLoadForFrame (args[0], args[1]);}
@Override
- public long /*int*/ method10 (long /*int*/[] args){return COM.E_NOTIMPL;}
+ public long method10 (long[] args){return COM.E_NOTIMPL;}
@Override
- public long /*int*/ method11 (long /*int*/[] args){return didChangeLocationWithinPageForFrame (args[0], args[1]);}
+ public long method11 (long[] args){return didChangeLocationWithinPageForFrame (args[0], args[1]);}
@Override
- public long /*int*/ method12 (long /*int*/[] args){return COM.S_OK;}
+ public long method12 (long[] args){return COM.S_OK;}
@Override
- public long /*int*/ method13 (long /*int*/[] args){return COM.E_NOTIMPL;}
+ public long method13 (long[] args){return COM.E_NOTIMPL;}
@Override
- public long /*int*/ method14 (long /*int*/[] args){return COM.S_OK;}
+ public long method14 (long[] args){return COM.S_OK;}
@Override
- public long /*int*/ method15 (long /*int*/[] args){return COM.S_OK;}
+ public long method15 (long[] args){return COM.S_OK;}
@Override
- public long /*int*/ method16 (long /*int*/[] args){return didClearWindowObject (args[0], args[1], args[2], args[3]);}
+ public long method16 (long[] 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. */
- long /*int*/ ppVtable = iWebFrameLoadDelegate.ppVtable;
- long /*int*/[] pVtable = new long /*int*/[1];
+ long ppVtable = iWebFrameLoadDelegate.ppVtable;
+ long[] pVtable = new long[1];
OS.MoveMemory (pVtable, ppVtable, C.PTR_SIZEOF);
- long /*int*/[] funcs = new long /*int*/[17];
+ long[] funcs = new long[17];
OS.MoveMemory (funcs, pVtable[0], C.PTR_SIZEOF * funcs.length);
funcs[12] = WebKit_win32.willPerformClientRedirectToURL_CALLBACK (funcs[12]);
OS.MoveMemory (pVtable[0], funcs, C.PTR_SIZEOF * funcs.length);
}
-int didChangeLocationWithinPageForFrame (long /*int*/ webView, long /*int*/ frame) {
+int didChangeLocationWithinPageForFrame (long webView, long frame) {
IWebFrame iwebframe = new IWebFrame (frame);
- long /*int*/[] result = new long /*int*/[1];
+ long[] result = new long[1];
int hr = iwebframe.dataSource (result);
if (hr != COM.S_OK || result[0] == 0) {
return COM.S_OK;
@@ -200,13 +200,13 @@ int didChangeLocationWithinPageForFrame (long /*int*/ webView, long /*int*/ fram
return COM.S_OK;
}
-int didClearWindowObject (long /*int*/ webView, long /*int*/ context, long /*int*/ windowScriptObject, long /*int*/ frame) {
+int didClearWindowObject (long webView, long context, long windowScriptObject, long frame) {
WebKit_win32.JSGlobalContextRetain (context);
- long /*int*/ globalObject = WebKit_win32.JSContextGetGlobalObject (context);
- long /*int*/ privateData = ((WebKit)browser.webBrowser).webViewData;
- long /*int*/ externalObject = WebKit_win32.JSObjectMake (context, WebKit.ExternalClass, privateData);
+ long globalObject = WebKit_win32.JSContextGetGlobalObject (context);
+ long privateData = ((WebKit)browser.webBrowser).webViewData;
+ long externalObject = WebKit_win32.JSObjectMake (context, WebKit.ExternalClass, privateData);
byte[] bytes = (OBJECTNAME_EXTERNAL + '\0').getBytes (StandardCharsets.UTF_8);
- long /*int*/ name = WebKit_win32.JSStringCreateWithUTF8CString (bytes);
+ long name = WebKit_win32.JSStringCreateWithUTF8CString (bytes);
WebKit_win32.JSObjectSetProperty (context, globalObject, name, externalObject, 0, null);
WebKit_win32.JSStringRelease (name);
@@ -215,7 +215,7 @@ int didClearWindowObject (long /*int*/ webView, long /*int*/ context, long /*int
}
IWebView iwebView = new IWebView (webView);
- long /*int*/[] mainFrame = new long /*int*/[1];
+ long[] mainFrame = new long[1];
iwebView.mainFrame (mainFrame);
boolean top = mainFrame[0] == frame;
new IWebFrame (mainFrame[0]).Release ();
@@ -223,9 +223,9 @@ int didClearWindowObject (long /*int*/ webView, long /*int*/ context, long /*int
return COM.S_OK;
}
-int didCommitLoadForFrame (long /*int*/ webview, long /*int*/ frame) {
+int didCommitLoadForFrame (long webview, long frame) {
IWebFrame iWebFrame = new IWebFrame (frame);
- long /*int*/[] result = new long /*int*/[1];
+ long[] result = new long[1];
int hr = iWebFrame.dataSource (result);
if (hr != COM.S_OK || result[0] == 0) {
return COM.S_OK;
@@ -319,14 +319,14 @@ int didCommitLoadForFrame (long /*int*/ webview, long /*int*/ frame) {
return COM.S_OK;
}
-int didFailProvisionalLoadWithError (long /*int*/ webView, long /*int*/ error, long /*int*/ frame) {
+int didFailProvisionalLoadWithError (long webView, long error, long 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;
- long /*int*/[] failingURL = new long /*int*/[1];
+ long[] failingURL = new long[1];
hr = iweberror.failingURL (failingURL);
if (hr == COM.S_OK && failingURL[0] != 0) {
failingURLString = WebKit.extractBSTR (failingURL[0]);
@@ -334,7 +334,7 @@ int didFailProvisionalLoadWithError (long /*int*/ webView, long /*int*/ error, l
}
if (failingURLString != null && WebKit_win32.WebURLErrorServerCertificateNotYetValid <= errorCode[0] && errorCode[0] <= WebKit_win32.WebURLErrorSecureConnectionFailed) {
/* handle invalid certificate error */
- long /*int*/[] result = new long /*int*/[1];
+ long[] result = new long[1];
hr = iweberror.localizedDescription (result);
if (hr != COM.S_OK || result[0] == 0) {
return COM.S_OK;
@@ -350,7 +350,7 @@ int didFailProvisionalLoadWithError (long /*int*/ webView, long /*int*/ error, l
IWebErrorPrivate webErrorPrivate = new IWebErrorPrivate (result[0]);
result[0] = 0;
- long /*int*/[] certificate = new long /*int*/[1];
+ long[] certificate = new long[1];
hr = webErrorPrivate.sslPeerCertificate (certificate);
webErrorPrivate.Release ();
if (hr != COM.S_OK || certificate[0] == 0) {
@@ -374,7 +374,7 @@ int didFailProvisionalLoadWithError (long /*int*/ webView, long /*int*/ error, l
}
/* handle other types of errors */
- long /*int*/[] result = new long /*int*/[1];
+ long[] result = new long[1];
hr = iweberror.localizedDescription (result);
if (hr != COM.S_OK || result[0] == 0) {
return COM.S_OK;
@@ -391,9 +391,9 @@ int didFailProvisionalLoadWithError (long /*int*/ webView, long /*int*/ error, l
return COM.S_OK;
}
-int didFinishLoadForFrame (long /*int*/ webview, long /*int*/ frame) {
+int didFinishLoadForFrame (long webview, long frame) {
IWebView iWebView = new IWebView (webview);
- long /*int*/[] iWebFrame = new long /*int*/[1];
+ long[] iWebFrame = new long[1];
int hr = iWebView.mainFrame (iWebFrame);
if (hr != COM.S_OK || iWebFrame[0] == 0) {
return COM.S_OK;
@@ -409,8 +409,8 @@ int didFinishLoadForFrame (long /*int*/ webview, long /*int*/ frame) {
if (html != null) {
if (getUrl ().startsWith (WebKit.ABOUT_BLANK)) {
((WebKit)browser.webBrowser).loadingText = true;
- long /*int*/ string = WebKit.createBSTR (html);
- long /*int*/ URLString;
+ long string = WebKit.createBSTR (html);
+ long URLString;
if (((WebKit)browser.webBrowser).untrustedText) {
URLString = WebKit.createBSTR (WebKit.ABOUT_BLANK);
} else {
@@ -438,7 +438,7 @@ int didFinishLoadForFrame (long /*int*/ webview, long /*int*/ frame) {
*/
Display display = browser.getDisplay ();
IWebFrame mainFrame = new IWebFrame (frame);
- long /*int*/[] result = new long /*int*/[1];
+ long[] result = new long[1];
hr = mainFrame.dataSource (result);
if (hr != COM.S_OK || result[0] == 0) {
return COM.S_OK;
@@ -482,8 +482,8 @@ int didFinishLoadForFrame (long /*int*/ webview, long /*int*/ frame) {
return COM.S_OK;
}
-int didReceiveTitle (long /*int*/ webView, long /*int*/ title, long /*int*/ frame) {
- long /*int*/[] mainFrame = new long /*int*/[1];
+int didReceiveTitle (long webView, long title, long frame) {
+ long[] mainFrame = new long[1];
IWebView iWebView = new IWebView (webView);
int hr = iWebView.mainFrame (mainFrame);
if (hr != COM.S_OK || frame == 0) {
@@ -504,7 +504,7 @@ int didReceiveTitle (long /*int*/ webView, long /*int*/ title, long /*int*/ fram
return COM.S_OK;
}
-int didStartProvisionalLoadForFrame (long /*int*/ webView, long /*int*/ frame) {
+int didStartProvisionalLoadForFrame (long webView, long frame) {
return COM.S_OK;
}
@@ -515,7 +515,7 @@ void disposeCOMInterfaces () {
}
}
-long /*int*/ getAddress () {
+long getAddress () {
return iWebFrameLoadDelegate.getAddress ();
}
@@ -525,23 +525,23 @@ String getUrl () {
return url;
}
-int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
+int QueryInterface (long riid, long 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)) {
- OS.MoveMemory (ppvObject, new long /*int*/[] {iWebFrameLoadDelegate.getAddress ()}, C.PTR_SIZEOF);
+ OS.MoveMemory (ppvObject, new long[] {iWebFrameLoadDelegate.getAddress ()}, C.PTR_SIZEOF);
new IUnknown (iWebFrameLoadDelegate.getAddress ()).AddRef ();
return COM.S_OK;
}
if (COM.IsEqualGUID (guid, WebKit_win32.IID_IWebFrameLoadDelegate)) {
- OS.MoveMemory (ppvObject, new long /*int*/[] {iWebFrameLoadDelegate.getAddress ()}, C.PTR_SIZEOF);
+ OS.MoveMemory (ppvObject, new long[] {iWebFrameLoadDelegate.getAddress ()}, C.PTR_SIZEOF);
new IUnknown (iWebFrameLoadDelegate.getAddress ()).AddRef ();
return COM.S_OK;
}
- OS.MoveMemory (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
+ OS.MoveMemory (ppvObject, new long[] {0}, C.PTR_SIZEOF);
return COM.E_NOINTERFACE;
}
@@ -553,7 +553,7 @@ int Release () {
return refCount;
}
-boolean showCertificateDialog (long /*int*/ webView, final String failingUrlString, final String description, final long /*int*/ certificate) {
+boolean showCertificateDialog (long webView, final String failingUrlString, final String description, final long 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$
@@ -629,7 +629,7 @@ boolean showCertificateDialog (long /*int*/ webView, final String failingUrlStri
return result[0];
}
-void showCertificate (Shell parent, long /*int*/ certificate) {
+void showCertificate (Shell parent, long 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 829f49f037..e935db206b 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
@@ -29,7 +29,7 @@ import org.eclipse.swt.widgets.*;
class WebKit extends WebBrowser {
IWebView webView;
- long /*int*/ webViewWindowHandle, webViewData;
+ long webViewWindowHandle, webViewData;
int refCount = 0;
int lastKeyCode, lastCharCode;
@@ -48,7 +48,7 @@ class WebKit extends WebBrowser {
BrowserFunction eventFunction;
static int prefsIdentifier;
- static long /*int*/ ExternalClass;
+ static long ExternalClass;
static boolean LibraryLoaded = false;
static String LibraryLoadError;
static Callback JSObjectHasPropertyProc;
@@ -147,24 +147,24 @@ static {
if (JSObjectCallAsFunctionProc.getAddress () == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
NativeClearSessions = () -> {
- long /*int*/[] result = new long /*int*/[1];
+ long[] result = new long[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]);
- long /*int*/[] storage = new long /*int*/[1];
+ long[] storage = new long[1];
hr = cookieManager.cookieStorage (storage);
cookieManager.Release ();
if (hr != COM.S_OK || storage[0] == 0) {
return;
}
- long /*int*/ cookies = WebKit_win32.CFHTTPCookieStorageCopyCookies (storage[0]);
+ long cookies = WebKit_win32.CFHTTPCookieStorageCopyCookies (storage[0]);
if (cookies != 0) {
int count = WebKit_win32.CFArrayGetCount (cookies);
for (int i = 0; i < count; i++) {
- long /*int*/ cookie = WebKit_win32.CFArrayGetValueAtIndex (cookies, i);
- long /*int*/ flags = WebKit_win32.CFHTTPCookieGetFlags (cookie);
+ long cookie = WebKit_win32.CFArrayGetValueAtIndex (cookies, i);
+ long flags = WebKit_win32.CFHTTPCookieGetFlags (cookie);
if ((flags & WebKit_win32.CFHTTPCookieSessionOnlyFlag) != 0) {
WebKit_win32.CFHTTPCookieStorageDeleteCookie (storage[0], cookie);
}
@@ -175,35 +175,35 @@ static {
};
NativeGetCookie = () -> {
- long /*int*/[] result = new long /*int*/[1];
+ long[] result = new long[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]);
- long /*int*/[] storage = new long /*int*/[1];
+ long[] storage = new long[1];
hr = cookieManager.cookieStorage (storage);
cookieManager.Release ();
if (hr != COM.S_OK || storage[0] == 0) {
return;
}
char[] chars = CookieUrl.toCharArray ();
- long /*int*/ string = WebKit_win32.CFStringCreateWithCharacters (0, chars, chars.length);
+ long string = WebKit_win32.CFStringCreateWithCharacters (0, chars, chars.length);
if (string != 0) {
- long /*int*/ cfUrl = WebKit_win32.CFURLCreateWithString (0, string, 0);
+ long cfUrl = WebKit_win32.CFURLCreateWithString (0, string, 0);
if (cfUrl != 0) {
boolean secure = CookieUrl.startsWith (PROTOCOL_HTTPS);
- long /*int*/ cookiesArray = WebKit_win32.CFHTTPCookieStorageCopyCookiesForURL (storage[0], cfUrl, secure);
+ long cookiesArray = WebKit_win32.CFHTTPCookieStorageCopyCookiesForURL (storage[0], cfUrl, secure);
if (cookiesArray != 0) {
int count = WebKit_win32.CFArrayGetCount (cookiesArray);
for (int i = 0; i < count; i++) {
- long /*int*/ cookie = WebKit_win32.CFArrayGetValueAtIndex (cookiesArray, i);
+ long cookie = WebKit_win32.CFArrayGetValueAtIndex (cookiesArray, i);
if (cookie != 0) {
- long /*int*/ cookieName = WebKit_win32.CFHTTPCookieGetName (cookie);
+ long cookieName = WebKit_win32.CFHTTPCookieGetName (cookie);
if (cookieName != 0) {
String name = stringFromCFString (cookieName);
if (CookieName.equals (name)) {
- long /*int*/ value = WebKit_win32.CFHTTPCookieGetValue (cookie);
+ long value = WebKit_win32.CFHTTPCookieGetValue (cookie);
if (value != 0) CookieValue = stringFromCFString (value);
break;
}
@@ -220,13 +220,13 @@ static {
};
NativeSetCookie = () -> {
- long /*int*/[] result = new long /*int*/[1];
+ long[] result = new long[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]);
- long /*int*/[] storage = new long /*int*/[1];
+ long[] storage = new long[1];
hr = cookieManager.cookieStorage (storage);
cookieManager.Release ();
if (hr != COM.S_OK || storage[0] == 0) {
@@ -234,21 +234,21 @@ static {
}
char[] chars = CookieUrl.toCharArray ();
- long /*int*/ string = WebKit_win32.CFStringCreateWithCharacters (0, chars, chars.length);
+ long string = WebKit_win32.CFStringCreateWithCharacters (0, chars, chars.length);
if (string != 0) {
- long /*int*/ cfUrl = WebKit_win32.CFURLCreateWithString (0, string, 0);
+ long cfUrl = WebKit_win32.CFURLCreateWithString (0, string, 0);
if (cfUrl != 0) {
chars = CookieValue.toCharArray ();
- long /*int*/ value = WebKit_win32.CFStringCreateWithCharacters (0, chars, chars.length);
+ long value = WebKit_win32.CFStringCreateWithCharacters (0, chars, chars.length);
if (value != 0) {
chars = HEADER_SETCOOKIE.toCharArray ();
- long /*int*/ key = WebKit_win32.CFStringCreateWithCharacters (0, chars, chars.length);
+ long key = WebKit_win32.CFStringCreateWithCharacters (0, chars, chars.length);
if (key != 0) {
- long /*int*/ headers = WebKit_win32.CFDictionaryCreate (0, new long /*int*/[] {key}, new long /*int*/[] {value}, 1, WebKit_win32.kCFCopyStringDictionaryKeyCallBacks (), WebKit_win32.kCFTypeDictionaryValueCallBacks ());
+ long headers = WebKit_win32.CFDictionaryCreate (0, new long[] {key}, new long[] {value}, 1, WebKit_win32.kCFCopyStringDictionaryKeyCallBacks (), WebKit_win32.kCFTypeDictionaryValueCallBacks ());
if (headers != 0) {
- long /*int*/ cookies = WebKit_win32.CFHTTPCookieCreateWithResponseHeaderFields (0, headers, cfUrl);
+ long cookies = WebKit_win32.CFHTTPCookieCreateWithResponseHeaderFields (0, headers, cfUrl);
if (cookies != 0) {
- long /*int*/ cookie = WebKit_win32.CFArrayGetValueAtIndex (cookies, 0);
+ long cookie = WebKit_win32.CFArrayGetValueAtIndex (cookies, 0);
if (cookie != 0) {
WebKit_win32.CFHTTPCookieStorageSetCookie (storage[0], cookie);
CookieResult = true;
@@ -275,7 +275,7 @@ static {
}
}
-static long /*int*/ createBSTR (String string) {
+static long createBSTR (String string) {
char[] data = (string + '\0').toCharArray ();
return COM.SysAllocString (data);
}
@@ -284,7 +284,7 @@ static String error (int code) {
throw new SWTError ("WebKit error " + code); //$NON-NLS-1$
}
-static String extractBSTR (long /*int*/ bstrString) {
+static String extractBSTR (long 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
@@ -292,10 +292,10 @@ static String extractBSTR (long /*int*/ bstrString) {
return new String (buffer);
}
-static Browser findBrowser (long /*int*/ webView) {
+static Browser findBrowser (long webView) {
if (webView == 0) return null;
IWebView iwebView = new IWebView (webView);
- long /*int*/[] result = new long /*int*/[1];
+ long[] result = new long[1];
int hr = iwebView.hostWindow (result);
if (hr == COM.S_OK && result[0] != 0) {
Widget widget = Display.getCurrent ().findWidget (result[0]);
@@ -304,13 +304,13 @@ static Browser findBrowser (long /*int*/ webView) {
return null;
}
-static long /*int*/ JSObjectCallAsFunctionProc (long /*int*/ ctx, long /*int*/ function, long /*int*/ thisObject, long /*int*/ argumentCount, long /*int*/ arguments, long /*int*/ exception) {
+static long JSObjectCallAsFunctionProc (long ctx, long function, long thisObject, long argumentCount, long arguments, long exception) {
WebKit_win32.JSGlobalContextRetain (ctx);
if (WebKit_win32.JSValueIsObjectOfClass (ctx, thisObject, ExternalClass) == 0) {
return WebKit_win32.JSValueMakeUndefined (ctx);
}
- long /*int*/ ptr = WebKit_win32.JSObjectGetPrivate (thisObject);
- long /*int*/[] handle = new long /*int*/[1];
+ long ptr = WebKit_win32.JSObjectGetPrivate (thisObject);
+ long[] handle = new long[1];
C.memmove (handle, ptr, C.PTR_SIZEOF);
Browser browser = findBrowser (handle[0]);
if (browser == null) return WebKit_win32.JSValueMakeUndefined (ctx);
@@ -318,22 +318,22 @@ static long /*int*/ JSObjectCallAsFunctionProc (long /*int*/ ctx, long /*int*/ f
return webkit.callJava (ctx, function, thisObject, argumentCount, arguments, exception);
}
-static long /*int*/ JSObjectGetPropertyProc (long /*int*/ ctx, long /*int*/ object, long /*int*/ propertyName, long /*int*/ exception) {
+static long JSObjectGetPropertyProc (long ctx, long object, long propertyName, long exception) {
byte[] bytes = (FUNCTIONNAME_CALLJAVA + '\0').getBytes (StandardCharsets.UTF_8);
- 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);
+ long name = WebKit_win32.JSStringCreateWithUTF8CString (bytes);
+ long addr = WebKit_win32.JSObjectCallAsFunctionProc_CALLBACK (WebKit.JSObjectCallAsFunctionProc.getAddress ());
+ long function = WebKit_win32.JSObjectMakeFunctionWithCallback (ctx, name, addr);
WebKit_win32.JSStringRelease (name);
return function;
}
-static long /*int*/ JSObjectHasPropertyProc (long /*int*/ ctx, long /*int*/ object, long /*int*/ propertyName) {
+static long JSObjectHasPropertyProc (long ctx, long object, long propertyName) {
byte[] bytes = (FUNCTIONNAME_CALLJAVA + '\0').getBytes (StandardCharsets.UTF_8);
return WebKit_win32.JSStringIsEqualToUTF8CString (propertyName, bytes);
}
static String readInstallDir (String keyString) {
- long /*int*/[] phkResult = new long /*int*/[1];
+ long[] phkResult = new long[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];
@@ -352,10 +352,10 @@ static String readInstallDir (String keyString) {
return null;
}
-static String stringFromCFString (long /*int*/ cfString) {
+static String stringFromCFString (long cfString) {
if (cfString == 0) return null;
int length = WebKit_win32.CFStringGetLength (cfString);
- long /*int*/ ptr = WebKit_win32.CFStringGetCharactersPtr (cfString);
+ long ptr = WebKit_win32.CFStringGetCharactersPtr (cfString);
char[] chars = new char[length];
if (ptr != 0) {
OS.MoveMemory (chars, ptr, length);
@@ -367,7 +367,7 @@ static String stringFromCFString (long /*int*/ cfString) {
return new String (chars);
}
-static String stringFromJSString (long /*int*/ jsString) {
+static String stringFromJSString (long jsString) {
if (jsString == 0) return null;
int length = WebKit_win32.JSStringGetLength (jsString);
byte[] bytes = new byte[length + 1];
@@ -382,10 +382,10 @@ public boolean back () {
return result[0] != 0;
}
-long /*int*/ callJava (long /*int*/ ctx, long /*int*/ func, long /*int*/ thisObject, long /*int*/ argumentCount, long /*int*/ arguments, long /*int*/ exception) {
+long callJava (long ctx, long func, long thisObject, long argumentCount, long arguments, long exception) {
Object returnValue = null;
if (argumentCount == 3) {
- long /*int*/[] result = new long /*int*/[1];
+ long[] result = new long[1];
C.memmove (result, arguments, C.PTR_SIZEOF);
int type = WebKit_win32.JSValueGetType (ctx, result[0]);
if (type == WebKit_win32.kJSTypeNumber) {
@@ -431,7 +431,7 @@ public boolean close () {
return shouldClose ();
}
-Object convertToJava (long /*int*/ ctx, long /*int*/ value) {
+Object convertToJava (long ctx, long value) {
int type = WebKit_win32.JSValueGetType (ctx, value);
switch (type) {
case WebKit_win32.kJSTypeBoolean: {
@@ -443,29 +443,29 @@ Object convertToJava (long /*int*/ ctx, long /*int*/ value) {
return result;
}
case WebKit_win32.kJSTypeString: {
- long /*int*/ string = WebKit_win32.JSValueToStringCopy (ctx, value, null);
+ long string = WebKit_win32.JSValueToStringCopy (ctx, value, null);
if (string == 0) return ""; //$NON-NLS-1$
- long /*int*/ length = WebKit_win32.JSStringGetMaximumUTF8CStringSize (string);
- byte[] bytes = new byte[(int)/*64*/length];
+ long length = WebKit_win32.JSStringGetMaximumUTF8CStringSize (string);
+ byte[] bytes = new byte[(int)length];
length = WebKit_win32.JSStringGetUTF8CString (string, bytes, length);
WebKit_win32.JSStringRelease (string);
/* length-1 is needed below to exclude the terminator character */
- return new String (bytes, 0, (int)/*64*/length - 1, StandardCharsets.UTF_8);
+ return new String (bytes, 0, (int)length - 1, StandardCharsets.UTF_8);
}
case WebKit_win32.kJSTypeNull:
// FALL THROUGH
case WebKit_win32.kJSTypeUndefined: return null;
case WebKit_win32.kJSTypeObject: {
byte[] bytes = (PROPERTY_LENGTH + '\0').getBytes (StandardCharsets.UTF_8);
- long /*int*/ propertyName = WebKit_win32.JSStringCreateWithUTF8CString (bytes);
- long /*int*/ valuePtr = WebKit_win32.JSObjectGetProperty (ctx, value, propertyName, null);
+ long propertyName = WebKit_win32.JSStringCreateWithUTF8CString (bytes);
+ long 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++) {
- long /*int*/ current = WebKit_win32.JSObjectGetPropertyAtIndex (ctx, value, i, null);
+ long current = WebKit_win32.JSObjectGetPropertyAtIndex (ctx, value, i, null);
if (current != 0) {
result[i] = convertToJava (ctx, current);
}
@@ -478,14 +478,14 @@ Object convertToJava (long /*int*/ ctx, long /*int*/ value) {
return null;
}
-long /*int*/ convertToJS (long /*int*/ ctx, Object value) {
+long convertToJS (long ctx, Object value) {
if (value == null) {
return WebKit_win32.JSValueMakeNull (ctx);
}
if (value instanceof String) {
byte[] bytes = ((String)value + '\0').getBytes (StandardCharsets.UTF_8);
- long /*int*/ stringRef = WebKit_win32.JSStringCreateWithUTF8CString (bytes);
- long /*int*/ result = WebKit_win32.JSValueMakeString (ctx, stringRef);
+ long stringRef = WebKit_win32.JSStringCreateWithUTF8CString (bytes);
+ long result = WebKit_win32.JSValueMakeString (ctx, stringRef);
WebKit_win32.JSStringRelease (stringRef);
return result;
}
@@ -498,10 +498,10 @@ long /*int*/ convertToJS (long /*int*/ ctx, Object value) {
if (value instanceof Object[]) {
Object[] arrayValue = (Object[]) value;
int length = arrayValue.length;
- long /*int*/[] arguments = new long /*int*/[length];
+ long[] arguments = new long[length];
for (int i = 0; i < length; i++) {
Object javaObject = arrayValue[i];
- long /*int*/ jsObject = convertToJS (ctx, javaObject);
+ long jsObject = convertToJS (ctx, javaObject);
arguments[i] = jsObject;
}
return WebKit_win32.JSObjectMakeArray (ctx, length, arguments, null);
@@ -524,18 +524,18 @@ public void create (Composite parent, int style) {
C.memmove (jsClassDefinition.className, bytes, bytes.length);
/* custom callbacks for hasProperty, getProperty and callAsFunction */
- long /*int*/ addr = WebKit_win32.JSObjectHasPropertyProc_CALLBACK (JSObjectHasPropertyProc.getAddress ());
+ long addr = WebKit_win32.JSObjectHasPropertyProc_CALLBACK (JSObjectHasPropertyProc.getAddress ());
jsClassDefinition.hasProperty = addr;
addr = WebKit_win32.JSObjectGetPropertyProc_CALLBACK (JSObjectGetPropertyProc.getAddress ());
jsClassDefinition.getProperty = addr;
- long /*int*/ classDefinitionPtr = C.malloc (JSClassDefinition.sizeof);
+ long classDefinitionPtr = C.malloc (JSClassDefinition.sizeof);
WebKit_win32.memmove (classDefinitionPtr, jsClassDefinition, JSClassDefinition.sizeof);
ExternalClass = WebKit_win32.JSClassCreate (classDefinitionPtr);
WebKit_win32.JSClassRetain (ExternalClass);
}
- long /*int*/[] result = new long /*int*/[1];
+ long[] result = new long[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 ();
@@ -543,7 +543,7 @@ public void create (Composite parent, int style) {
}
webView = new IWebView (result[0]);
webViewData = C.malloc (C.PTR_SIZEOF);
- C.memmove (webViewData, new long /*int*/[] {webView.getAddress ()}, C.PTR_SIZEOF);
+ C.memmove (webViewData, new long[] {webView.getAddress ()}, C.PTR_SIZEOF);
hr = webView.setHostWindow (browser.handle);
if (hr != COM.S_OK) {
browser.dispose ();
@@ -656,27 +656,27 @@ public void create (Composite parent, int style) {
@Override
public boolean execute (String script) {
- long /*int*/[] result = new long /*int*/[1];
+ long[] result = new long[1];
int hr = webView.mainFrame (result);
if (hr != COM.S_OK || result[0] == 0) {
return false;
}
IWebFrame frame = new IWebFrame (result[0]);
- long /*int*/ context = frame.globalContext ();
+ long context = frame.globalContext ();
frame.Release ();
if (context == 0) {
return false;
}
byte[] bytes = (script + '\0').getBytes (StandardCharsets.UTF_8); //$NON-NLS-1$
- long /*int*/ scriptString = WebKit_win32.JSStringCreateWithUTF8CString (bytes);
+ long scriptString = WebKit_win32.JSStringCreateWithUTF8CString (bytes);
if (scriptString == 0) return false;
bytes = (getUrl () + '\0').getBytes (StandardCharsets.UTF_8); //$NON-NLS-1$
- long /*int*/ urlString = WebKit_win32.JSStringCreateWithUTF8CString (bytes);
+ long urlString = WebKit_win32.JSStringCreateWithUTF8CString (bytes);
if (urlString == 0) {
WebKit_win32.JSStringRelease (scriptString);
return false;
}
- long /*int*/ evalResult = WebKit_win32.JSEvaluateScript (context, scriptString, 0, urlString, 0, null);
+ long evalResult = WebKit_win32.JSEvaluateScript (context, scriptString, 0, urlString, 0, null);
WebKit_win32.JSStringRelease (urlString);
WebKit_win32.JSStringRelease (scriptString);
return evalResult != 0;
@@ -696,7 +696,7 @@ public String getBrowserType () {
@Override
public String getText () {
- long /*int*/[] result = new long /*int*/[1];
+ long[] result = new long[1];
int hr = webView.mainFrame (result);
if (hr != COM.S_OK || result[0] == 0) {
return EMPTY_STRING;
@@ -980,7 +980,7 @@ boolean handleEvent (Object[] arguments) {
@Override
public boolean isBackEnabled () {
- long /*int*/[] address = new long /*int*/[1];
+ long[] address = new long[1];
int hr = webView.QueryInterface (WebKit_win32.IID_IWebIBActions, address);
if (hr != COM.S_OK || address[0] == 0) {
return false;
@@ -994,13 +994,13 @@ public boolean isBackEnabled () {
@Override
public boolean isFocusControl () {
- long /*int*/ hwndFocus = OS.GetFocus ();
+ long hwndFocus = OS.GetFocus ();
return hwndFocus != 0 && hwndFocus == webViewWindowHandle;
}
@Override
public boolean isForwardEnabled () {
- long /*int*/[] address = new long /*int*/[1];
+ long[] address = new long[1];
int hr = webView.QueryInterface (WebKit_win32.IID_IWebIBActions, address);
if (hr != COM.S_OK || address[0] == 0) {
return false;
@@ -1053,7 +1053,7 @@ void onDispose () {
@Override
public void refresh () {
webFrameLoadDelegate.html = null;
- long /*int*/[] result = new long /*int*/[1];
+ long[] result = new long[1];
int hr = webView.QueryInterface (WebKit_win32.IID_IWebIBActions, result);
if (hr != COM.S_OK || result[0] == 0) {
return;
@@ -1114,7 +1114,7 @@ public boolean setText (String html, boolean trusted) {
untrustedText = !trusted;
if (blankLoading) return true;
- long /*int*/[] result = new long /*int*/[1];
+ long[] result = new long[1];
int hr = webView.mainFrame (result);
if (hr != COM.S_OK || result[0] == 0) {
return false;
@@ -1129,7 +1129,7 @@ public boolean setText (String html, boolean trusted) {
}
IWebMutableURLRequest request = new IWebMutableURLRequest (result[0]);
- long /*int*/ urlString = createBSTR (ABOUT_BLANK);
+ long urlString = createBSTR (ABOUT_BLANK);
hr = request.setURL (urlString);
COM.SysFreeString (urlString);
@@ -1168,7 +1168,7 @@ public boolean setUrl (String url, String postData, String[] headers) {
}
webFrameLoadDelegate.html = null;
lastNavigateURL = url;
- long /*int*/[] result = new long /*int*/[1];
+ long[] result = new long[1];
int hr = webView.mainFrame (result);
if (hr != COM.S_OK || result[0] == 0) {
return false;
@@ -1185,7 +1185,7 @@ public boolean setUrl (String url, String postData, String[] headers) {
if (postData != null) { //TODO: POST
// webResourceLoadDelegate.postData = postData;
-// long /*int*/ postString = createBSTR (POST);
+// long postString = createBSTR (POST);
// hr = request.setHTTPMethod (postString);
// COM.SysFreeString (postString);
//
@@ -1195,12 +1195,12 @@ public boolean setUrl (String url, String postData, String[] headers) {
// IWebMutableURLRequestPrivate requestPrivate = new IWebMutableURLRequestPrivate(result[0]);
// int cfRequest = requestPrivate.cfRequest();
// byte[] bytes = postData.getBytes();
-// long /*int*/ data = WebKit_win32.CFDataCreate(0, bytes, bytes.length);
+// long data = WebKit_win32.CFDataCreate(0, bytes, bytes.length);
// if (data != 0)WebKit_win32.CFURLRequestSetHTTPRequestBody(cfRequest, data);
//
-// long /*int*/ dataGet = WebKit_win32.CFURLRequestCopyHTTPRequestBody(cfRequest);
+// long dataGet = WebKit_win32.CFURLRequestCopyHTTPRequestBody(cfRequest);
// int length = WebKit_win32.CFDataGetLength(dataGet);
-// long /*int*/ bytePtr = WebKit_win32.CFDataGetBytePtr(dataGet);
+// long bytePtr = WebKit_win32.CFDataGetBytePtr(dataGet);
// }
}
hr = COM.S_OK; //TODO: once post code is completed, remove this line if not required
@@ -1213,7 +1213,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) {
- long /*int*/ valueString = createBSTR (value);
+ long valueString = createBSTR (value);
if (key.equalsIgnoreCase (USER_AGENT)) {
/*
* Feature of WebKit. The user-agent header value cannot be overridden
@@ -1222,7 +1222,7 @@ public boolean setUrl (String url, String postData, String[] headers) {
*/
hr = webView.setCustomUserAgent (valueString);
} else {
- long /*int*/ keyString = createBSTR (key);
+ long keyString = createBSTR (key);
hr = request.setValue (valueString, keyString);
COM.SysFreeString (keyString);
}
@@ -1233,7 +1233,7 @@ public boolean setUrl (String url, String postData, String[] headers) {
}
}
if (hr == COM.S_OK) {
- long /*int*/ urlString = createBSTR (url);
+ long urlString = createBSTR (url);
hr = request.setURL (urlString);
COM.SysFreeString (urlString);
if (hr == COM.S_OK) {
@@ -1249,7 +1249,7 @@ public boolean setUrl (String url, String postData, String[] headers) {
boolean shouldClose () {
if (!jsEnabled) return true;
- long /*int*/[] address = new long /*int*/[1];
+ long[] address = new long[1];
int hr = webView.QueryInterface (WebKit_win32.IID_IWebViewPrivate, address);
if (hr != COM.S_OK || address[0] == 0) {
return false;
@@ -1265,7 +1265,7 @@ boolean shouldClose () {
@Override
public void stop () {
webFrameLoadDelegate.html = null;
- long /*int*/[] result = new long /*int*/[1];
+ long[] result = new long[1];
int hr = webView.QueryInterface (WebKit_win32.IID_IWebIBActions, result);
if (hr != COM.S_OK || result[0] == 0) {
return;
@@ -1280,7 +1280,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.
*/
- long /*int*/[] result = new long /*int*/[1];
+ long[] result = new long[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 d09a8fd892..1c63764507 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
@@ -40,23 +40,23 @@ int AddRef () {
void createCOMInterfaces () {
iWebPolicyDelegate = new COMObject (new int[] {2, 0, 0, 5, 5, 5, 3}) {
@Override
- public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long method0 (long[] args) {return QueryInterface (args[0], args[1]);}
@Override
- public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long method1 (long[] args) {return AddRef ();}
@Override
- public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long method2 (long[] args) {return Release ();}
@Override
- public long /*int*/ method3 (long /*int*/[] args) {return decidePolicyForNavigationAction (args[0], args[1], args[2], args[3], args[4]);}
+ public long method3 (long[] args) {return decidePolicyForNavigationAction (args[0], args[1], args[2], args[3], args[4]);}
@Override
- public long /*int*/ method4 (long /*int*/[] args) {return decidePolicyForNewWindowAction (args[0], args[1], args[2], args[3], args[4]);}
+ public long method4 (long[] args) {return decidePolicyForNewWindowAction (args[0], args[1], args[2], args[3], args[4]);}
@Override
- public long /*int*/ method5 (long /*int*/[] args) {return decidePolicyForMIMEType (args[0], args[1], args[2], args[3], args[4]);}
+ public long method5 (long[] args) {return decidePolicyForMIMEType (args[0], args[1], args[2], args[3], args[4]);}
@Override
- public long /*int*/ method6 (long /*int*/[] args) {return unableToImplementPolicyWithError (args[0], args[1], args[2]);}
+ public long method6 (long[] args) {return unableToImplementPolicyWithError (args[0], args[1], args[2]);}
};
}
-int decidePolicyForMIMEType (long /*int*/ webView, long /*int*/ type, long /*int*/ request, long /*int*/ frame, long /*int*/ listener) {
+int decidePolicyForMIMEType (long webView, long type, long request, long frame, long listener) {
IWebView iwebView = new IWebView (webView);
int[] canShow = new int[1];
iwebView.canShowMIMEType (type, canShow);
@@ -69,9 +69,9 @@ int decidePolicyForMIMEType (long /*int*/ webView, long /*int*/ type, long /*int
return COM.S_OK;
}
-int decidePolicyForNavigationAction (long /*int*/ webView, long /*int*/ actionInformation, long /*int*/ request, long /*int*/ frame, long /*int*/ listener) {
+int decidePolicyForNavigationAction (long webView, long actionInformation, long request, long frame, long listener) {
IWebURLRequest iwebUrlRequest = new IWebURLRequest (request);
- long /*int*/[] result = new long /*int*/[1];
+ long[] result = new long[1];
int hr = iwebUrlRequest.URL (result);
if (hr != COM.S_OK || result[0] == 0) {
return COM.S_OK;
@@ -142,7 +142,7 @@ int decidePolicyForNavigationAction (long /*int*/ webView, long /*int*/ actionIn
return COM.S_OK;
}
-int decidePolicyForNewWindowAction (long /*int*/ webView, long /*int*/ actionInformation, long /*int*/ request, long /*int*/ frameName, long /*int*/ listener) {
+int decidePolicyForNewWindowAction (long webView, long actionInformation, long request, long frameName, long listener) {
IWebPolicyDecisionListener pdListener = new IWebPolicyDecisionListener (listener);
pdListener.use();
return COM.S_OK;
@@ -155,27 +155,27 @@ protected void disposeCOMInterfaces () {
}
}
-long /*int*/ getAddress () {
+long getAddress () {
return iWebPolicyDelegate.getAddress ();
}
-int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
+int QueryInterface (long riid, long 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)) {
- OS.MoveMemory (ppvObject, new long /*int*/[] {iWebPolicyDelegate.getAddress ()}, C.PTR_SIZEOF);
+ OS.MoveMemory (ppvObject, new long[] {iWebPolicyDelegate.getAddress ()}, C.PTR_SIZEOF);
new IUnknown (iWebPolicyDelegate.getAddress ()).AddRef ();
return COM.S_OK;
}
if (COM.IsEqualGUID (guid, WebKit_win32.IID_IWebPolicyDelegate)) {
- OS.MoveMemory (ppvObject, new long /*int*/[] {iWebPolicyDelegate.getAddress ()}, C.PTR_SIZEOF);
+ OS.MoveMemory (ppvObject, new long[] {iWebPolicyDelegate.getAddress ()}, C.PTR_SIZEOF);
new IUnknown (iWebPolicyDelegate.getAddress ()).AddRef ();
return COM.S_OK;
}
- OS.MoveMemory (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
+ OS.MoveMemory (ppvObject, new long[] {0}, C.PTR_SIZEOF);
return COM.E_NOINTERFACE;
}
@@ -187,12 +187,12 @@ int Release () {
return refCount;
}
-int unableToImplementPolicyWithError (long /*int*/ webView, long /*int*/ error, long /*int*/ frame) {
+int unableToImplementPolicyWithError (long webView, long error, long frame) {
if (browser.isDisposed ()) return COM.S_OK;
IWebError iweberror = new IWebError (error);
String failingURL = null;
- long /*int*/[] result = new long /*int*/[1];
+ long[] result = new long[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 3fccfff2c2..9924b6862d 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
@@ -43,33 +43,33 @@ int AddRef () {
void createCOMInterfaces () {
iWebResourceLoadDelegate = new COMObject (new int[] {2, 0, 0, 4, 6, 4, 4, 4, 4, 3, 4, 3}) {
@Override
- public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long method0 (long[] args) {return QueryInterface (args[0], args[1]);}
@Override
- public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long method1 (long[] args) {return AddRef ();}
@Override
- public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long method2 (long[] args) {return Release ();}
@Override
- public long /*int*/ method3 (long /*int*/[] args) {return identifierForInitialRequest (args[0], args[1], args[2], args[3]);}
+ public long method3 (long[] args) {return identifierForInitialRequest (args[0], args[1], args[2], args[3]);}
@Override
- public long /*int*/ method4 (long /*int*/[] args) {return willSendRequest (args[0], args[1], args[2], args[3], args[4], args[5]);}
+ public long method4 (long[] args) {return willSendRequest (args[0], args[1], args[2], args[3], args[4], args[5]);}
@Override
- public long /*int*/ method5 (long /*int*/[] args) {return didReceiveAuthenticationChallenge (args[0], args[1], args[2], args[3]);}
+ public long method5 (long[] args) {return didReceiveAuthenticationChallenge (args[0], args[1], args[2], args[3]);}
@Override
- public long /*int*/ method6 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long method6 (long[] args) {return COM.E_NOTIMPL;}
@Override
- public long /*int*/ method7 (long /*int*/[] args) {return COM.S_OK;}
+ public long method7 (long[] args) {return COM.S_OK;}
@Override
- public long /*int*/ method8 (long /*int*/[] args) {return COM.S_OK;}
+ public long method8 (long[] args) {return COM.S_OK;}
@Override
- public long /*int*/ method9 (long /*int*/[] args) {return COM.S_OK;}
+ public long method9 (long[] args) {return COM.S_OK;}
@Override
- public long /*int*/ method10 (long /*int*/[] args) {return COM.S_OK;}
+ public long method10 (long[] args) {return COM.S_OK;}
@Override
- public long /*int*/ method11 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long method11 (long[] args) {return COM.E_NOTIMPL;}
};
}
-int didReceiveAuthenticationChallenge (long /*int*/ webView, long /*int*/ identifier, long /*int*/ challenge, long /*int*/ dataSource) {
+int didReceiveAuthenticationChallenge (long webView, long identifier, long challenge, long dataSource) {
IWebURLAuthenticationChallenge authenticationChallenge = new IWebURLAuthenticationChallenge (challenge);
/*
* Do not invoke the listeners if this challenge has been failed too many
@@ -78,7 +78,7 @@ int didReceiveAuthenticationChallenge (long /*int*/ webView, long /*int*/ identi
*/
int[] count = new int[1];
int hr = authenticationChallenge.previousFailureCount (count);
- long /*int*/[] result = new long /*int*/[1];
+ long[] result = new long[1];
if (hr == COM.S_OK && count[0] < 3) {
AuthenticationListener[] authenticationListeners = browser.webBrowser.authenticationListeners;
for (int i = 0; i < authenticationListeners.length; i++) {
@@ -104,8 +104,8 @@ int didReceiveAuthenticationChallenge (long /*int*/ webView, long /*int*/ 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]);
- long /*int*/ user = WebKit.createBSTR (event.user);
- long /*int*/ password = WebKit.createBSTR (event.password);
+ long user = WebKit.createBSTR (event.user);
+ long password = WebKit.createBSTR (event.password);
credential.initWithUser (user, password, WebKit_win32.WebURLCredentialPersistenceForSession);
challengeSender.useCredential (credential.getAddress (), challenge);
credential.Release ();
@@ -182,8 +182,8 @@ int didReceiveAuthenticationChallenge (long /*int*/ webView, long /*int*/ 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]);
- long /*int*/ user = WebKit.createBSTR (userReturn[0]);
- long /*int*/ password = WebKit.createBSTR (passwordReturn[0]);
+ long user = WebKit.createBSTR (userReturn[0]);
+ long password = WebKit.createBSTR (passwordReturn[0]);
credential.initWithUser (user, password, WebKit_win32.WebURLCredentialPersistenceForSession);
challengeSender.useCredential (credential.getAddress (), challenge);
credential.Release ();
@@ -199,23 +199,23 @@ void disposeCOMInterfaces () {
}
}
-long /*int*/ getAddress () {
+long getAddress () {
return iWebResourceLoadDelegate.getAddress ();
}
-int identifierForInitialRequest (long /*int*/ webView, long /*int*/ request, long /*int*/ dataSource, long /*int*/ identifier) {
+int identifierForInitialRequest (long webView, long request, long dataSource, long identifier) {
if (browser.isDisposed ()) return COM.S_OK;
/* send progress event iff request is for top-level frame */
IWebDataSource source = new IWebDataSource (dataSource);
- long /*int*/[] frame = new long /*int*/[1];
+ long[] frame = new long[1];
int hr = source.webFrame (frame);
if (hr != COM.S_OK || frame[0] == 0) {
return COM.S_OK;
}
new IWebFrame (frame[0]).Release ();
- long /*int*/[] mainFrame = new long /*int*/[1];
+ long[] mainFrame = new long[1];
IWebView iWebView = new IWebView (webView);
hr = iWebView.mainFrame (mainFrame);
if (hr != COM.S_OK || mainFrame[0] == 0) {
@@ -223,7 +223,7 @@ int identifierForInitialRequest (long /*int*/ webView, long /*int*/ request, lon
}
new IWebFrame (mainFrame[0]).Release ();
if (frame[0] == mainFrame[0]) {
- long /*int*/ ptr = C.malloc (8);
+ long ptr = C.malloc (8);
iWebView.estimatedProgress (ptr);
double[] estimate = new double[1];
OS.MoveMemory (estimate, ptr, 8);
@@ -243,23 +243,23 @@ int identifierForInitialRequest (long /*int*/ webView, long /*int*/ request, lon
return COM.S_OK;
}
-int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
+int QueryInterface (long riid, long 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)) {
- OS.MoveMemory (ppvObject, new long /*int*/[] {iWebResourceLoadDelegate.getAddress ()}, C.PTR_SIZEOF);
+ OS.MoveMemory (ppvObject, new long[] {iWebResourceLoadDelegate.getAddress ()}, C.PTR_SIZEOF);
new IUnknown (iWebResourceLoadDelegate.getAddress ()).AddRef ();
return COM.S_OK;
}
if (COM.IsEqualGUID (guid, WebKit_win32.IID_IWebResourceLoadDelegate)) {
- OS.MoveMemory (ppvObject, new long /*int*/[] {iWebResourceLoadDelegate.getAddress ()}, C.PTR_SIZEOF);
+ OS.MoveMemory (ppvObject, new long[] {iWebResourceLoadDelegate.getAddress ()}, C.PTR_SIZEOF);
new IUnknown (iWebResourceLoadDelegate.getAddress ()).AddRef ();
return COM.S_OK;
}
- OS.MoveMemory (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
+ OS.MoveMemory (ppvObject, new long[] {0}, C.PTR_SIZEOF);
return COM.E_NOINTERFACE;
}
@@ -348,9 +348,9 @@ boolean showAuthenticationDialog (final String[] user, final String[] password,
return result[0];
}
-int willSendRequest (long /*int*/ webView, long /*int*/ identifier, long /*int*/ request, long /*int*/ redirectResponse, long /*int*/ dataSource, long /*int*/ newRequest) {
+int willSendRequest (long webView, long identifier, long request, long redirectResponse, long dataSource, long newRequest) {
IWebURLRequest req = new IWebURLRequest (request);
- long /*int*/[] result = new long /*int*/ [1];
+ long[] result = new long [1];
int hr = req.URL (result);
if (hr == COM.S_OK && result[0] != 0) {
String url = WebKit.extractBSTR (result[0]);
@@ -367,15 +367,15 @@ int willSendRequest (long /*int*/ webView, long /*int*/ identifier, long /*int*/
hr = req.mutableCopy (result);
if (hr == COM.S_OK && result[0] != 0) {
IWebMutableURLRequest mReq = new IWebMutableURLRequest (result[0]);
- long /*int*/ urlString = WebKit.createBSTR (url);
+ long urlString = WebKit.createBSTR (url);
mReq.setURL (urlString);
- OS.MoveMemory (newRequest, new long /*int*/[] {mReq.getAddress ()}, C.PTR_SIZEOF);
+ OS.MoveMemory (newRequest, new long[] {mReq.getAddress ()}, C.PTR_SIZEOF);
return COM.S_OK;
}
}
}
req.AddRef ();
- OS.MoveMemory (newRequest, new long /*int*/[] {request}, C.PTR_SIZEOF);
+ OS.MoveMemory (newRequest, new long[] {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 eb9892cf19..f73d6c67d8 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
@@ -45,12 +45,12 @@ int AddRef () {
return refCount;
}
-int canTakeFocus (long /*int*/ sender, int forward, long /*int*/ result) {
+int canTakeFocus (long sender, int forward, long result) {
OS.MoveMemory (result, new int[] {1}, 4); /* BOOL */
return COM.S_OK;
}
-int contextMenuItemsForElement (long /*int*/ sender, long /*int*/ element, long /*int*/ defaultItemsHMenu, long /*int*/ resultHMenu) {
+int contextMenuItemsForElement (long sender, long element, long defaultItemsHMenu, long resultHMenu) {
Point pt = browser.getDisplay ().getCursorLocation ();
Event event = new Event ();
event.x = pt.x;
@@ -64,152 +64,152 @@ int contextMenuItemsForElement (long /*int*/ sender, long /*int*/ element, long
}
menu.setVisible (true);
} else {
- OS.MoveMemory (resultHMenu, new long /*int*/[] {defaultItemsHMenu}, C.PTR_SIZEOF);
+ OS.MoveMemory (resultHMenu, new long[] {defaultItemsHMenu}, C.PTR_SIZEOF);
return COM.S_OK;
}
}
- OS.MoveMemory (resultHMenu, new long /*int*/[] {0}, C.PTR_SIZEOF);
+ OS.MoveMemory (resultHMenu, new long[] {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}) {
@Override
- public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long method0 (long[] args) {return QueryInterface (args[0], args[1]);}
@Override
- public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long method1 (long[] args) {return AddRef ();}
@Override
- public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long method2 (long[] args) {return Release ();}
@Override
- public long /*int*/ method3 (long /*int*/[] args) {return createWebViewWithRequest (args[0], args[1], args[2]);}
+ public long method3 (long[] args) {return createWebViewWithRequest (args[0], args[1], args[2]);}
@Override
- public long /*int*/ method4 (long /*int*/[] args) {return webViewShow (args[0]);}
+ public long method4 (long[] args) {return webViewShow (args[0]);}
@Override
- public long /*int*/ method5 (long /*int*/[] args) {return webViewClose (args[0]);}
+ public long method5 (long[] args) {return webViewClose (args[0]);}
@Override
- public long /*int*/ method6 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long method6 (long[] args) {return COM.E_NOTIMPL;}
@Override
- public long /*int*/ method7 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long method7 (long[] args) {return COM.E_NOTIMPL;}
@Override
- public long /*int*/ method8 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long method8 (long[] args) {return COM.E_NOTIMPL;}
@Override
- public long /*int*/ method9 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long method9 (long[] args) {return COM.E_NOTIMPL;}
@Override
- public long /*int*/ method10 (long /*int*/[] args) {return setStatusText (args[0], args[1]);}
+ public long method10 (long[] args) {return setStatusText (args[0], args[1]);}
@Override
- public long /*int*/ method11 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long method11 (long[] args) {return COM.E_NOTIMPL;}
@Override
- public long /*int*/ method12 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long method12 (long[] args) {return COM.E_NOTIMPL;}
@Override
- public long /*int*/ method13 (long /*int*/[] args) {return setToolbarsVisible (args[0], (int)/*64*/args[1]);}
+ public long method13 (long[] args) {return setToolbarsVisible (args[0], (int)args[1]);}
@Override
- public long /*int*/ method14 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long method14 (long[] args) {return COM.E_NOTIMPL;}
@Override
- public long /*int*/ method15 (long /*int*/[] args) {return setStatusBarVisible (args[0], (int)/*64*/args[1]);}
+ public long method15 (long[] args) {return setStatusBarVisible (args[0], (int)args[1]);}
@Override
- public long /*int*/ method16 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long method16 (long[] args) {return COM.E_NOTIMPL;}
@Override
- public long /*int*/ method17 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long method17 (long[] args) {return COM.E_NOTIMPL;}
@Override
- public long /*int*/ method18 (long /*int*/[] args) {return setFrame (args[0], args[1]);}
+ public long method18 (long[] args) {return setFrame (args[0], args[1]);}
@Override
- public long /*int*/ method19 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long method19 (long[] args) {return COM.E_NOTIMPL;}
@Override
- public long /*int*/ method20 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long method20 (long[] args) {return COM.E_NOTIMPL;}
@Override
- public long /*int*/ method21 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long method21 (long[] args) {return COM.E_NOTIMPL;}
@Override
- public long /*int*/ method22 (long /*int*/[] args) {return runJavaScriptAlertPanelWithMessage (args[0], args[1]);}
+ public long method22 (long[] args) {return runJavaScriptAlertPanelWithMessage (args[0], args[1]);}
@Override
- public long /*int*/ method23 (long /*int*/[] args) {return runJavaScriptConfirmPanelWithMessage (args[0], args[1], args[2]);}
+ public long method23 (long[] args) {return runJavaScriptConfirmPanelWithMessage (args[0], args[1], args[2]);}
@Override
- public long /*int*/ method24 (long /*int*/[] args) {return runJavaScriptTextInputPanelWithPrompt (args[0], args[1], args[2], args[3]);}
+ public long method24 (long[] args) {return runJavaScriptTextInputPanelWithPrompt (args[0], args[1], args[2], args[3]);}
@Override
- public long /*int*/ method25 (long /*int*/[] args) {return runBeforeUnloadConfirmPanelWithMessage (args[0], args[1], args[2], args[3]);}
+ public long method25 (long[] args) {return runBeforeUnloadConfirmPanelWithMessage (args[0], args[1], args[2], args[3]);}
@Override
- public long /*int*/ method26 (long /*int*/[] args) {return runOpenPanelForFileButtonWithResultListener (args[0], args[1]);}
+ public long method26 (long[] args) {return runOpenPanelForFileButtonWithResultListener (args[0], args[1]);}
@Override
- public long /*int*/ method27 (long /*int*/[] args) {return mouseDidMoveOverElement (args[0], args[1], (int)/*64*/args[2]);}
+ public long method27 (long[] args) {return mouseDidMoveOverElement (args[0], args[1], (int)args[2]);}
@Override
- public long /*int*/ method28 (long /*int*/[] args) {return contextMenuItemsForElement (args[0], args[1], args[2], args[3]);}
+ public long method28 (long[] args) {return contextMenuItemsForElement (args[0], args[1], args[2], args[3]);}
@Override
- public long /*int*/ method29 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long method29 (long[] args) {return COM.E_NOTIMPL;}
@Override
- public long /*int*/ method30 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long method30 (long[] args) {return COM.E_NOTIMPL;}
@Override
- public long /*int*/ method31 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long method31 (long[] args) {return COM.E_NOTIMPL;}
@Override
- public long /*int*/ method32 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long method32 (long[] args) {return COM.E_NOTIMPL;}
@Override
- public long /*int*/ method33 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long method33 (long[] args) {return COM.E_NOTIMPL;}
@Override
- public long /*int*/ method34 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long method34 (long[] args) {return COM.E_NOTIMPL;}
@Override
- public long /*int*/ method35 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long method35 (long[] args) {return COM.E_NOTIMPL;}
@Override
- public long /*int*/ method36 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long method36 (long[] args) {return COM.E_NOTIMPL;}
@Override
- public long /*int*/ method37 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long method37 (long[] args) {return COM.E_NOTIMPL;}
@Override
- public long /*int*/ method38 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long method38 (long[] args) {return COM.E_NOTIMPL;}
@Override
- public long /*int*/ method39 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long method39 (long[] args) {return COM.E_NOTIMPL;}
@Override
- public long /*int*/ method40 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long method40 (long[] args) {return COM.E_NOTIMPL;}
@Override
- public long /*int*/ method41 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long method41 (long[] args) {return COM.E_NOTIMPL;}
@Override
- public long /*int*/ method42 (long /*int*/[] args) {return canTakeFocus (args[0], (int)/*64*/args[1], args[2]);}
+ public long method42 (long[] args) {return canTakeFocus (args[0], (int)args[1], args[2]);}
@Override
- public long /*int*/ method43 (long /*int*/[] args) {return takeFocus (args[0], (int)/*64*/args[1]);}
+ public long method43 (long[] args) {return takeFocus (args[0], (int)args[1]);}
@Override
- public long /*int*/ method44 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long method44 (long[] args) {return COM.E_NOTIMPL;}
@Override
- public long /*int*/ method45 (long /*int*/[] args) {return COM.S_OK;}
+ public long method45 (long[] args) {return COM.S_OK;}
@Override
- public long /*int*/ method46 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long method46 (long[] args) {return COM.E_NOTIMPL;}
@Override
- public long /*int*/ method47 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long method47 (long[] args) {return COM.E_NOTIMPL;}
@Override
- public long /*int*/ method48 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long method48 (long[] args) {return COM.E_NOTIMPL;}
@Override
- public long /*int*/ method49 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long method49 (long[] args) {return COM.E_NOTIMPL;}
@Override
- public long /*int*/ method50 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long method50 (long[] args) {return COM.E_NOTIMPL;}
@Override
- public long /*int*/ method51 (long /*int*/[] args) {return printFrame (args[0], args[1]);}
+ public long method51 (long[] args) {return printFrame (args[0], args[1]);}
@Override
- public long /*int*/ method52 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long method52 (long[] args) {return COM.E_NOTIMPL;}
@Override
- public long /*int*/ method53 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long method53 (long[] args) {return COM.E_NOTIMPL;}
@Override
- public long /*int*/ method54 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long method54 (long[] args) {return COM.E_NOTIMPL;}
@Override
- public long /*int*/ method55 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long method55 (long[] args) {return COM.E_NOTIMPL;}
@Override
- public long /*int*/ method56 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long method56 (long[] args) {return COM.E_NOTIMPL;}
@Override
- public long /*int*/ method57 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long method57 (long[] args) {return COM.E_NOTIMPL;}
@Override
- public long /*int*/ method58 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long method58 (long[] args) {return COM.E_NOTIMPL;}
@Override
- public long /*int*/ method59 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long method59 (long[] args) {return COM.E_NOTIMPL;}
@Override
- public long /*int*/ method60 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long method60 (long[] args) {return COM.E_NOTIMPL;}
@Override
- public long /*int*/ method61 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long method61 (long[] args) {return COM.E_NOTIMPL;}
@Override
- public long /*int*/ method62 (long /*int*/[] args) {return setMenuBarVisible (args[0], (int)/*64*/args[1]);}
+ public long method62 (long[] args) {return setMenuBarVisible (args[0], (int)args[1]);}
@Override
- public long /*int*/ method63 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long method63 (long[] args) {return COM.E_NOTIMPL;}
@Override
- public long /*int*/ method64 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long method64 (long[] args) {return COM.E_NOTIMPL;}
@Override
- public long /*int*/ method65 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long method65 (long[] args) {return COM.E_NOTIMPL;}
};
}
-int createWebViewWithRequest (long /*int*/ sender, long /*int*/ request, long /*int*/ webView) {
+int createWebViewWithRequest (long sender, long request, long webView) {
WindowEvent newEvent = new WindowEvent (browser);
newEvent.display = browser.getDisplay ();
newEvent.widget = browser;
@@ -225,10 +225,10 @@ int createWebViewWithRequest (long /*int*/ sender, long /*int*/ request, long /*
}
if (browser != null && !browser.isDisposed ()) {
iwebview = ((WebKit)browser.webBrowser).webView;
- OS.MoveMemory (webView, new long /*int*/[] {iwebview.getAddress ()}, C.PTR_SIZEOF);
+ OS.MoveMemory (webView, new long[] {iwebview.getAddress ()}, C.PTR_SIZEOF);
if (request != 0) {
IWebURLRequest req = new IWebURLRequest (request);
- long /*int*/[] result = new long /*int*/[1];
+ long[] result = new long[1];
int hr = req.URL (result);
if (hr != COM.S_OK || result[0] == 0) {
return COM.S_OK;
@@ -258,17 +258,17 @@ protected void disposeCOMInterfaces () {
}
}
-long /*int*/ getAddress () {
+long getAddress () {
return iWebUIDelegate.getAddress ();
}
-int mouseDidMoveOverElement (long /*int*/ sender, long /*int*/ elementInformation, int modifierFlags) {
+int mouseDidMoveOverElement (long sender, long elementInformation, int modifierFlags) {
if (elementInformation == 0) return COM.S_OK;
IPropertyBag info = new IPropertyBag (elementInformation);
- 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);
+ long key = WebKit.createBSTR ("WebElementLinkURLKey"); //$NON-NLS-N$
+ long hHeap = OS.GetProcessHeap ();
+ long 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;
@@ -304,7 +304,7 @@ int mouseDidMoveOverElement (long /*int*/ sender, long /*int*/ elementInformatio
return COM.S_OK;
}
-int printFrame (long /*int*/ webView, long /*int*/ frame) {
+int printFrame (long webView, long frame) {
IWebFrame iwebFrame = new IWebFrame (frame);
PRINTDLG pd = new PRINTDLG ();
pd.lStructSize = PRINTDLG.sizeof;
@@ -314,9 +314,9 @@ int printFrame (long /*int*/ webView, long /*int*/ frame) {
boolean success = OS.PrintDlg (pd);
display.sendPostExternalEventDispatchEvent ();
if (!success) return COM.S_OK;
- long /*int*/ printDC = pd.hDC;
+ long printDC = pd.hDC;
- long /*int*/[] result = new long /*int*/[1];
+ long[] result = new long[1];
int hr = iwebFrame.QueryInterface (WebKit_win32.IID_IWebFramePrivate, result);
if (hr != COM.S_OK || result[0] == 0) {
return COM.S_OK;
@@ -345,8 +345,8 @@ int printFrame (long /*int*/ webView, long /*int*/ frame) {
}
DOCINFO di = new DOCINFO ();
di.cbSize = DOCINFO.sizeof;
- long /*int*/ hHeap = OS.GetProcessHeap ();
- long /*int*/ lpszDocName = 0;
+ long hHeap = OS.GetProcessHeap ();
+ long lpszDocName = 0;
if (jobName != null && jobName.length () != 0) {
/* Use the character encoding for the default locale */
TCHAR buffer = new TCHAR (0, jobName, true);
@@ -370,23 +370,23 @@ int printFrame (long /*int*/ webView, long /*int*/ frame) {
return COM.S_OK;
}
-int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
+int QueryInterface (long riid, long 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)) {
- OS.MoveMemory (ppvObject, new long /*int*/[] {iWebUIDelegate.getAddress ()}, C.PTR_SIZEOF);
+ OS.MoveMemory (ppvObject, new long[] {iWebUIDelegate.getAddress ()}, C.PTR_SIZEOF);
new IUnknown (iWebUIDelegate.getAddress ()).AddRef ();
return COM.S_OK;
}
if (COM.IsEqualGUID (guid, WebKit_win32.IID_IWebUIDelegate)) {
- OS.MoveMemory (ppvObject, new long /*int*/[] {iWebUIDelegate.getAddress ()}, C.PTR_SIZEOF);
+ OS.MoveMemory (ppvObject, new long[] {iWebUIDelegate.getAddress ()}, C.PTR_SIZEOF);
new IUnknown (iWebUIDelegate.getAddress ()).AddRef ();
return COM.S_OK;
}
- OS.MoveMemory (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
+ OS.MoveMemory (ppvObject, new long[] {0}, C.PTR_SIZEOF);
return COM.E_NOINTERFACE;
}
@@ -398,7 +398,7 @@ int Release () {
return refCount;
}
-int runBeforeUnloadConfirmPanelWithMessage (long /*int*/ sender, long /*int*/ message, long /*int*/ initiatedByFrame, long /*int*/ result) {
+int runBeforeUnloadConfirmPanelWithMessage (long sender, long message, long initiatedByFrame, long result) {
if (!prompt) return COM.S_OK;
Shell parent = browser.getShell ();
@@ -416,13 +416,13 @@ int runBeforeUnloadConfirmPanelWithMessage (long /*int*/ sender, long /*int*/ me
return COM.S_OK;
}
-int runJavaScriptAlertPanelWithMessage (long /*int*/ sender, long /*int*/ message) {
+int runJavaScriptAlertPanelWithMessage (long sender, long message) {
String messageString = WebKit.extractBSTR (message);
showAlertMessage ("Javascript", messageString); //$NON-NLS-1$
return COM.S_OK;
}
-int runJavaScriptConfirmPanelWithMessage (long /*int*/ sender, long /*int*/ message, long /*int*/ result) {
+int runJavaScriptConfirmPanelWithMessage (long sender, long message, long result) {
String messageString = WebKit.extractBSTR (message);
int[] response = new int[1];
response[0] = showConfirmPanel ("Javascript", messageString) == SWT.OK ? 1 : 0; //$NON-NLS-1$
@@ -430,11 +430,11 @@ int runJavaScriptConfirmPanelWithMessage (long /*int*/ sender, long /*int*/ mess
return COM.S_OK;
}
-int runJavaScriptTextInputPanelWithPrompt (long /*int*/ sender, long /*int*/ message, long /*int*/ defaultText, long /*int*/ result) {
+int runJavaScriptTextInputPanelWithPrompt (long sender, long message, long defaultText, long result) {
String messageString = WebKit.extractBSTR (message);
String defaultTextString = WebKit.extractBSTR (defaultText);
String resultString = showTextPrompter ("Javascript", messageString, defaultTextString); //$NON-NLS-1$
- long /*int*/[] response = new long /*int*/[1];
+ long[] response = new long[1];
if (resultString != null) {
response[0] = WebKit.createBSTR (resultString);
}
@@ -442,7 +442,7 @@ int runJavaScriptTextInputPanelWithPrompt (long /*int*/ sender, long /*int*/ mes
return COM.S_OK;
}
-int runOpenPanelForFileButtonWithResultListener (long /*int*/ sender, long /*int*/ resultListener) {
+int runOpenPanelForFileButtonWithResultListener (long sender, long resultListener) {
Shell parent = browser.getShell ();
FileDialog dialog = new FileDialog (parent, SWT.NONE);
String result = dialog.open ();
@@ -455,7 +455,7 @@ int runOpenPanelForFileButtonWithResultListener (long /*int*/ sender, long /*int
return COM.S_OK;
}
-int setFrame (long /*int*/ sender, long /*int*/ frame) {
+int setFrame (long sender, long frame) {
RECT rect = new RECT ();
COM.MoveMemory (rect, frame, RECT.sizeof);
/* convert to SWT system coordinates */
@@ -467,19 +467,19 @@ int setFrame (long /*int*/ sender, long /*int*/ frame) {
return COM.S_OK;
}
-int setMenuBarVisible (long /*int*/ sender, int visible) {
+int setMenuBarVisible (long 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 (long /*int*/ sender, int visible) {
+int setStatusBarVisible (long 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 (long /*int*/ sender, long /*int*/ text) {
+int setStatusText (long sender, long text) {
String statusText = WebKit.extractBSTR (text);
if (statusText.length () == 0) return COM.S_OK;
StatusTextEvent statusTextEvent = new StatusTextEvent (browser);
@@ -493,7 +493,7 @@ int setStatusText (long /*int*/ sender, long /*int*/ text) {
return COM.S_OK;
}
-int setToolbarsVisible (long /*int*/ sender, int visible) {
+int setToolbarsVisible (long sender, int visible) {
/* Note. Webkit only emits the notification when the status bar should be hidden. */
toolBar = visible == 1;
return COM.S_OK;
@@ -682,14 +682,14 @@ String showTextPrompter (String title, String message, String defaultText) {
return result[0];
}
-int takeFocus (long /*int*/ sender, int forward) {
+int takeFocus (long 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 (long /*int*/ sender) {
+int webViewClose (long sender) {
WindowEvent newEvent = new WindowEvent (browser);
newEvent.display = browser.getDisplay ();
newEvent.widget = browser;
@@ -701,13 +701,13 @@ int webViewClose (long /*int*/ sender) {
return COM.S_OK;
}
-int webViewFrame (long /*int*/ sender, long /*int*/ frame) {
+int webViewFrame (long sender, long frame) {
RECT rect = new RECT ();
OS.MoveMemory (frame, rect, RECT.sizeof);
return COM.S_OK;
}
-int webViewShow (long /*int*/ sender) {
+int webViewShow (long 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 228b878aa5..3f61ab39e6 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
@@ -19,11 +19,11 @@ import org.eclipse.swt.internal.win32.*;
public class IWebCookieManager extends IUnknown {
-public IWebCookieManager (long /*int*/ address) {
+public IWebCookieManager (long address) {
super (address);
}
-public int cookieStorage (long /*int*/[] storage) {
+public int cookieStorage (long[] storage) {
return OS.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 fa1760dd10..180bf8192e 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
@@ -19,23 +19,23 @@ import org.eclipse.swt.internal.win32.*;
public class IWebDataSource extends IUnknown {
-public IWebDataSource (long /*int*/ address) {
+public IWebDataSource (long address) {
super (address);
}
-public int representation (long /*int*/[] rep) {
+public int representation (long[] rep) {
return OS.VtblCall (5, getAddress (), rep);
}
-public int webFrame (long /*int*/[] frame) {
+public int webFrame (long[] frame) {
return OS.VtblCall (6, getAddress (), frame);
}
-public int request (long /*int*/[] request) {
+public int request (long[] request) {
return OS.VtblCall (8, getAddress (), request);
}
-public int pageTitle (long /*int*/[] title) {
+public int pageTitle (long[] title) {
return OS.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 973cde9c49..da31f88e59 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
@@ -19,11 +19,11 @@ import org.eclipse.swt.internal.win32.*;
public class IWebDocumentRepresentation extends IUnknown {
-public IWebDocumentRepresentation (long /*int*/ address) {
+public IWebDocumentRepresentation (long address) {
super (address);
}
-public int documentSource (long /*int*/[] source) {
+public int documentSource (long[] source) {
return OS.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 759fa19e07..832a74088f 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
@@ -19,7 +19,7 @@ import org.eclipse.swt.internal.win32.*;
public class IWebDownload extends IUnknown {
-public IWebDownload (long /*int*/ address) {
+public IWebDownload (long address) {
super (address);
}
@@ -31,7 +31,7 @@ public int setDeletesFileUponFailure (int deletesFileUponFailure) {
return OS.VtblCall (12, getAddress (), deletesFileUponFailure);
}
-public int setDestination (long /*int*/ path, int allowOverwrite) {
+public int setDestination (long path, int allowOverwrite) {
return OS.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 c5d2433082..1917d78f03 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
@@ -19,7 +19,7 @@ import org.eclipse.swt.internal.win32.*;
public class IWebError extends IUnknown {
-public IWebError (long /*int*/ address) {
+public IWebError (long address) {
super (address);
}
@@ -27,23 +27,23 @@ public int code (int[] result) {
return OS.VtblCall (4, getAddress (), result);
}
-//public int domain (long /*int*/[] result) {
+//public int domain (long[] result) {
// return COM.VtblCall (5, getAddress (), result);
//}
-public int localizedDescription (long /*int*/[] result) {
+public int localizedDescription (long[] result) {
return OS.VtblCall (6, getAddress (), result);
}
-//public int localizedFailureReason (long /*int*/[] result) {
+//public int localizedFailureReason (long[] result) {
// return COM.VtblCall (7, getAddress (), result);
//}
-//public int userInfo (long /*int*/[] result) {
+//public int userInfo (long[] result) {
//return COM.VtblCall (11, getAddress (), result);
//}
-public int failingURL (long /*int*/[] result) {
+public int failingURL (long[] result) {
return OS.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 e6cd5d2dcd..0666b4bbdd 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
@@ -19,11 +19,11 @@ import org.eclipse.swt.internal.win32.*;
public class IWebErrorPrivate extends IUnknown {
-public IWebErrorPrivate (long /*int*/ address) {
+public IWebErrorPrivate (long address) {
super (address);
}
-public int sslPeerCertificate (long /*int*/[] result) {
+public int sslPeerCertificate (long[] result) {
return OS.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 2c7cfc5771..750b457ed3 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
@@ -19,23 +19,23 @@ import org.eclipse.swt.internal.win32.*;
public class IWebFrame extends IUnknown {
-public IWebFrame (long /*int*/ address) {
+public IWebFrame (long address) {
super (address);
}
-public int loadRequest (long /*int*/ request) {
+public int loadRequest (long request) {
return OS.VtblCall (8, getAddress (), request);
}
-public int loadHTMLString (long /*int*/ string, long /*int*/ baseURL) {
+public int loadHTMLString (long string, long baseURL) {
return OS.VtblCall (10, getAddress (), string, baseURL);
}
-public int dataSource (long /*int*/[] source) {
+public int dataSource (long[] source) {
return OS.VtblCall (13, getAddress (), source);
}
-public long /*int*/ globalContext () {
+public long globalContext () {
return OS.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 944278a0c2..4e60f157fb 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
@@ -19,19 +19,19 @@ import org.eclipse.swt.internal.win32.*;
public class IWebFramePrivate extends IUnknown {
-public IWebFramePrivate (long /*int*/ address) {
+public IWebFramePrivate (long address) {
super (address);
}
-public int setInPrintingMode (int value, long /*int*/ printDC) {
+public int setInPrintingMode (int value, long printDC) {
return OS.VtblCall (8, getAddress (), value, printDC);
}
-public int getPrintedPageCount (long /*int*/ printDC, int[] pageCount) {
+public int getPrintedPageCount (long printDC, int[] pageCount) {
return OS.VtblCall (9, getAddress (), printDC, pageCount);
}
-public int spoolPages (long /*int*/ printDC, int startPage, int endPage, long /*int*/[] ctx) {
+public int spoolPages (long printDC, int startPage, int endPage, long[] ctx) {
return OS.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 b740a2884b..0117c86c61 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
@@ -19,23 +19,23 @@ import org.eclipse.swt.internal.win32.*;
public class IWebIBActions extends IUnknown {
-public IWebIBActions (long /*int*/ address) {
+public IWebIBActions (long address) {
super (address);
}
-public int stopLoading (long /*int*/ sender) {
+public int stopLoading (long sender) {
return OS.VtblCall (4, getAddress (), sender);
}
-public int reload (long /*int*/ sender) {
+public int reload (long sender) {
return OS.VtblCall (5, getAddress (), sender);
}
-public int canGoBack (long /*int*/ sender, int[] result) {
+public int canGoBack (long sender, int[] result) {
return OS.VtblCall (6, getAddress (), sender, result);
}
-public int canGoForward (long /*int*/ sender, int[] result) {
+public int canGoForward (long sender, int[] result) {
return OS.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 8d9ec4ecad..0d83f033be 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
@@ -18,15 +18,15 @@ import org.eclipse.swt.internal.win32.*;
public class IWebMutableURLRequest extends IWebURLRequest {
-public IWebMutableURLRequest (long /*int*/ address) {
+public IWebMutableURLRequest (long address) {
super (address);
}
-//public int setHTTPBody (long /*int*/ data) {
+//public int setHTTPBody (long data) {
// return COM.VtblCall (21, getAddress (), data);
//}
-//public int setHTTPBodyStream (long /*int*/ data) {
+//public int setHTTPBodyStream (long data) {
// return COM.VtblCall (22, getAddress (), data);
//}
@@ -34,11 +34,11 @@ public int setHTTPMethod (int post) {
return OS.VtblCall (23, getAddress (), post);
}
-public int setURL (long /*int*/ theUrl) {
+public int setURL (long theUrl) {
return OS.VtblCall (27, getAddress (), theUrl);
}
-public int setValue (long /*int*/ value, long /*int*/ field) {
+public int setValue (long value, long field) {
return OS.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 1511ff332d..ef531a2c57 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
@@ -19,11 +19,11 @@ import org.eclipse.swt.internal.win32.*;
public class IWebMutableURLRequestPrivate extends IUnknown {
-public IWebMutableURLRequestPrivate (long /*int*/ address) {
+public IWebMutableURLRequestPrivate (long address) {
super (address);
}
-//public int setClientCertificate (long /*int*/ cert) {
+//public int setClientCertificate (long 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 36ecccbdc1..5f3aef2a10 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
@@ -18,11 +18,11 @@ import org.eclipse.swt.internal.win32.*;
public class IWebOpenPanelResultListener extends IUnknown {
-public IWebOpenPanelResultListener (long /*int*/ address) {
+public IWebOpenPanelResultListener (long address) {
super (address);
}
-public int chooseFilename (long /*int*/ fileName) {
+public int chooseFilename (long fileName) {
return OS.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 58aaf99531..74520ba60a 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
@@ -19,7 +19,7 @@ import org.eclipse.swt.internal.win32.*;
public class IWebPolicyDecisionListener extends IUnknown{
-public IWebPolicyDecisionListener (long /*int*/ address) {
+public IWebPolicyDecisionListener (long 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 59129fb8e5..fdf79a49d4 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
@@ -19,11 +19,11 @@ import org.eclipse.swt.internal.win32.*;
public class IWebPreferences extends IUnknown {
-public IWebPreferences (long /*int*/ address) {
+public IWebPreferences (long address) {
super (address);
}
-public int initWithIdentifier (long /*int*/ identifier, long /*int*/[] preferences) {
+public int initWithIdentifier (long identifier, long[] 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 e3e3585095..17b3b9b07d 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
@@ -19,7 +19,7 @@ import org.eclipse.swt.internal.win32.*;
public class IWebURLAuthenticationChallenge extends IUnknown {
-public IWebURLAuthenticationChallenge (long /*int*/ address) {
+public IWebURLAuthenticationChallenge (long address) {
super (address);
}
@@ -27,15 +27,15 @@ public int previousFailureCount (int[] result) {
return OS.VtblCall (7, getAddress (), result);
}
-public int proposedCredential (long /*int*/[] result) {
+public int proposedCredential (long[] result) {
return OS.VtblCall (8, getAddress (), result);
}
-public int protectionSpace (long /*int*/[] result) {
+public int protectionSpace (long[] result) {
return OS.VtblCall (9, getAddress (), result);
}
-public int sender (long /*int*/[] sender) {
+public int sender (long[] sender) {
return OS.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 4204830d37..7bbac4d91a 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
@@ -19,15 +19,15 @@ import org.eclipse.swt.internal.win32.*;
public class IWebURLAuthenticationChallengeSender extends IUnknown {
-public IWebURLAuthenticationChallengeSender (long /*int*/ address) {
+public IWebURLAuthenticationChallengeSender (long address) {
super (address);
}
-public int cancelAuthenticationChallenge (long /*int*/ challenge) {
+public int cancelAuthenticationChallenge (long challenge) {
return OS.VtblCall (3, getAddress (), challenge);
}
-public int useCredential (long /*int*/ credential, long /*int*/ challenge) {
+public int useCredential (long credential, long challenge) {
return OS.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 20378ba106..7f50e2187c 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
@@ -19,7 +19,7 @@ import org.eclipse.swt.internal.win32.*;
public class IWebURLCredential extends IUnknown {
-public IWebURLCredential (long /*int*/ address) {
+public IWebURLCredential (long address) {
super (address);
}
@@ -27,15 +27,15 @@ public int hasPassword (int[] result) {
return OS.VtblCall (3, getAddress (), result);
}
-public int initWithUser (long /*int*/ user, long /*int*/ password, long /*int*/ persistence) {
+public int initWithUser (long user, long password, long persistence) {
return OS.VtblCall (4, getAddress (), user, password, persistence);
}
-public int password (long /*int*/[] password) {
+public int password (long[] password) {
return OS.VtblCall (5, getAddress (), password);
}
-public int user (long /*int*/[] result) {
+public int user (long[] result) {
return OS.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 aceab44449..93c4b36ab5 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
@@ -19,11 +19,11 @@ import org.eclipse.swt.internal.win32.*;
public class IWebURLProtectionSpace extends IUnknown {
-public IWebURLProtectionSpace(long /*int*/ address) {
+public IWebURLProtectionSpace(long address) {
super(address);
}
-public int host (long /*int*/[] result) {
+public int host (long[] result) {
return OS.VtblCall (4, getAddress (), result);
}
@@ -31,7 +31,7 @@ public int port (int[] result) {
return OS.VtblCall (8, getAddress (), result);
}
-public int realm (long /*int*/[] result) {
+public int realm (long[] result) {
return OS.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 8af8b64bba..a0b5b538ba 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
@@ -19,23 +19,23 @@ import org.eclipse.swt.internal.win32.*;
public class IWebURLRequest extends IUnknown {
-public IWebURLRequest (long /*int*/ address) {
+public IWebURLRequest (long address) {
super (address);
}
-//public int HTTPBody (long /*int*/[] result) {
+//public int HTTPBody (long[] result) {
// return COM.VtblCall (6, getAddress (), result);
//}
-public int HTTPMethod (long /*int*/[] result) {
+public int HTTPMethod (long[] result) {
return OS.VtblCall (8, getAddress (), result);
}
-public int URL (long /*int*/[] result) {
+public int URL (long[] result) {
return OS.VtblCall (13, getAddress (), result);
}
-public int mutableCopy (long /*int*/[] result) {
+public int mutableCopy (long[] result) {
return OS.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 bcff19fdfb..8a87223998 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
@@ -19,7 +19,7 @@ import org.eclipse.swt.internal.win32.*;
public class IWebURLResponse extends IUnknown {
-public IWebURLResponse (long /*int*/ address) {
+public IWebURLResponse (long address) {
super (address);
}
@@ -27,7 +27,7 @@ public int expectedContentLength (long[] result) {
return OS.VtblCall (3, getAddress (), result);
}
-public int URL (long /*int*/[] result) {
+public int URL (long[] result) {
return OS.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 9369d79767..99b8735956 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
@@ -19,39 +19,39 @@ import org.eclipse.swt.internal.win32.*;
public class IWebView extends IUnknown {
-public IWebView (long /*int*/ address) {
+public IWebView (long address) {
super (address);
}
-public int canShowMIMEType (long /*int*/ mimeType, int[] canShow) {
+public int canShowMIMEType (long mimeType, int[] canShow) {
return OS.VtblCall (3, getAddress (), mimeType, canShow);
}
-public int initWithFrame (RECT frame, long /*int*/ frameName, long /*int*/ groupName) {
+public int initWithFrame (RECT frame, long frameName, long groupName) {
return COM.VtblCall (9, getAddress(), frame, frameName, groupName);
}
-public int setUIDelegate (long /*int*/ delegate) {
+public int setUIDelegate (long delegate) {
return OS.VtblCall (10, getAddress (), delegate);
}
-public int setResourceLoadDelegate (long /*int*/ delegate) {
+public int setResourceLoadDelegate (long delegate) {
return OS.VtblCall (12, getAddress (), delegate);
}
-public int setDownloadDelegate (long /*int*/ delegate) {
+public int setDownloadDelegate (long delegate) {
return OS.VtblCall (14, getAddress (), delegate);
}
-public int setFrameLoadDelegate (long /*int*/ delegate) {
+public int setFrameLoadDelegate (long delegate) {
return OS.VtblCall (16, getAddress (), delegate);
}
-public int setPolicyDelegate (long /*int*/ delegate) {
+public int setPolicyDelegate (long delegate) {
return OS.VtblCall (18, getAddress (), delegate);
}
-public int mainFrame (long /*int*/[] frame) {
+public int mainFrame (long[] frame) {
return OS.VtblCall (20, getAddress (), frame);
}
@@ -63,27 +63,27 @@ public int goForward (int[] succeeded) {
return OS.VtblCall (25, getAddress(), succeeded);
}
-public int setCustomUserAgent (long /*int*/ valueString) {
+public int setCustomUserAgent (long valueString) {
return OS.VtblCall (31, getAddress (), valueString);
}
-public int setPreferences (long /*int*/ prefs) {
+public int setPreferences (long prefs) {
return OS.VtblCall (41, getAddress (), prefs);
}
-public int preferences (long /*int*/[] prefs) {
+public int preferences (long[] prefs) {
return OS.VtblCall (42, getAddress (), prefs);
}
-public int setHostWindow (long /*int*/ window) {
+public int setHostWindow (long window) {
return OS.VtblCall (45, getAddress (), window);
}
-public int hostWindow (long /*int*/[] window) {
+public int hostWindow (long[] window) {
return OS.VtblCall (46, getAddress (), window);
}
-public int estimatedProgress (long /*int*/ estimatedProgress) {
+public int estimatedProgress (long estimatedProgress) {
return OS.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 2e650be341..a620bd5e2b 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
@@ -19,11 +19,11 @@ import org.eclipse.swt.internal.win32.*;
public class IWebViewPrivate extends IUnknown {
-public IWebViewPrivate (long /*int*/ address) {
+public IWebViewPrivate (long address) {
super (address);
}
-public int viewWindow (long /*int*/[] window) {
+public int viewWindow (long[] window) {
return OS.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 dbfea019ee..595928e70a 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
@@ -20,35 +20,35 @@ public class JSClassDefinition {
/** @field cast=(JSClassAttributes) */
public int attributes;
/** @field cast=(const char*) */
- public long /*int*/ className;
+ public long className;
/** @field cast=(JSClassRef) */
- public long /*int*/ parentClass;
+ public long parentClass;
/** @field cast=(const JSStaticValue*) */
- public long /*int*/ staticValues;
+ public long staticValues;
/** @field cast=(const JSStaticFunction*) */
- public long /*int*/ staticFunctions;
+ public long staticFunctions;
/** @field cast=(JSObjectInitializeCallback) */
- public long /*int*/ initialize;
+ public long initialize;
/** @field cast=(JSObjectFinalizeCallback) */
- public long /*int*/ finalize;
+ public long finalize;
/** @field cast=(JSObjectHasPropertyCallback) */
- public long /*int*/ hasProperty;
+ public long hasProperty;
/** @field cast=(JSObjectGetPropertyCallback) */
- public long /*int*/ getProperty;
+ public long getProperty;
/** @field cast=(JSObjectSetPropertyCallback) */
- public long /*int*/ setProperty;
+ public long setProperty;
/** @field cast=(JSObjectDeletePropertyCallback) */
- public long /*int*/ deleteProperty;
+ public long deleteProperty;
/** @field cast=(JSObjectGetPropertyNamesCallback) */
- public long /*int*/ getPropertyNames;
+ public long getPropertyNames;
/** @field cast=(JSObjectCallAsFunctionCallback) */
- public long /*int*/ callAsFunction;
+ public long callAsFunction;
/** @field cast=(JSObjectCallAsConstructorCallback) */
- public long /*int*/ callAsConstructor;
+ public long callAsConstructor;
/** @field cast=(JSObjectHasInstanceCallback) */
- public long /*int*/ hasInstance;
+ public long hasInstance;
/** @field cast=(JSObjectConvertToTypeCallback) */
- public long /*int*/ convertToType;
+ public long 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 b266bd8c71..3f2a020812 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
@@ -71,26 +71,26 @@ static GUID IIDFromString (String lpsz) {
/**
* @param theArray cast=(CFArrayRef)
*/
-public static final native int CFArrayGetCount (long /*int*/ theArray);
+public static final native int CFArrayGetCount (long theArray);
/**
* @param theArray cast=(CFArrayRef)
* @param idx cast=(CFIndex)
*/
-public static final native long /*int*/ CFArrayGetValueAtIndex (long /*int*/ theArray, int idx);
+public static final native long CFArrayGetValueAtIndex (long theArray, int idx);
/**
* @param allocator cast=(CFAllocatorRef)
* @param bytes cast=(const UInt8 *)
* @param length cast=(CFIndex)
*/
-public static final native long /*int*/ CFDataCreate (long /*int*/ allocator, byte [] bytes, int length);
+public static final native long CFDataCreate (long allocator, byte [] bytes, int length);
/**
* @param theData cast=(CFDataRef)
*/
-public static final native long /*int*/ CFDataGetBytePtr (long /*int*/ theData);
+public static final native long CFDataGetBytePtr (long theData);
/**
* @param theData cast=(CFDataRef)
*/
-public static final native int CFDataGetLength (long /*int*/ theData);
+public static final native int CFDataGetLength (long theData);
/**
* @param allocator cast=(CFAllocatorRef)
* @param keys cast=(const void **)
@@ -99,106 +99,106 @@ public static final native int CFDataGetLength (long /*int*/ theData);
* @param keyCallBacks cast=(const CFDictionaryKeyCallBacks *)
* @param valueCallBacks cast=(const CFDictionaryValueCallBacks *)
*/
-public static final native long /*int*/ CFDictionaryCreate (long /*int*/ allocator, long /*int*/[] keys, long /*int*/[] values, int numValues, long /*int*/ keyCallBacks, long /*int*/ valueCallBacks);
+public static final native long CFDictionaryCreate (long allocator, long[] keys, long[] values, int numValues, long keyCallBacks, long valueCallBacks);
/**
* @param inAllocator cast=(CFAllocatorRef)
* @param headerFields cast=(CFDictionaryRef)
* @param inURL cast=(CFURLRef)
*/
-public static final native long /*int*/ CFHTTPCookieCreateWithResponseHeaderFields (long /*int*/ inAllocator, long /*int*/ headerFields, long /*int*/ inURL);
+public static final native long CFHTTPCookieCreateWithResponseHeaderFields (long inAllocator, long headerFields, long inURL);
/**
* @param inCookie cast=(CFHTTPCookieRef)
*/
-public static final native int CFHTTPCookieGetFlags (long /*int*/ inCookie);
+public static final native int CFHTTPCookieGetFlags (long inCookie);
/**
* @param inCookie cast=(CFHTTPCookieRef)
*/
-public static final native long /*int*/ CFHTTPCookieGetName (long /*int*/ inCookie);
+public static final native long CFHTTPCookieGetName (long inCookie);
/**
* @param inCookie cast=(CFHTTPCookieRef)
*/
-public static final native long /*int*/ CFHTTPCookieGetValue (long /*int*/ inCookie);
+public static final native long CFHTTPCookieGetValue (long inCookie);
/**
* @param inCookieStorage cast=(CFHTTPCookieStorageRef)
*/
-public static final native long /*int*/ CFHTTPCookieStorageCopyCookies (long /*int*/ inCookieStorage);
+public static final native long CFHTTPCookieStorageCopyCookies (long inCookieStorage);
/**
* @param inCookieStorage cast=(CFHTTPCookieStorageRef)
* @param inURL cast=(CFURLRef)
* @param sendSecureCookies cast=(Boolean)
*/
-public static final native long /*int*/ CFHTTPCookieStorageCopyCookiesForURL (long /*int*/ inCookieStorage, long /*int*/ inURL, boolean sendSecureCookies);
+public static final native long CFHTTPCookieStorageCopyCookiesForURL (long inCookieStorage, long inURL, boolean sendSecureCookies);
/**
* @param inCookieStorage cast=(CFHTTPCookieStorageRef)
* @param inCookie cast=(CFHTTPCookieRef)
*/
-public static final native void CFHTTPCookieStorageDeleteCookie (long /*int*/ inCookieStorage, long /*int*/ inCookie);
+public static final native void CFHTTPCookieStorageDeleteCookie (long inCookieStorage, long inCookie);
/**
* @param inCookieStorage cast=(CFHTTPCookieStorageRef)
* @param inCookie cast=(CFHTTPCookieRef)
*/
-public static final native void CFHTTPCookieStorageSetCookie (long /*int*/ inCookieStorage, long /*int*/ inCookie);
+public static final native void CFHTTPCookieStorageSetCookie (long inCookieStorage, long inCookie);
/**
* @param cf cast=(CFTypeRef)
*/
-public static final native void CFRelease (long /*int*/ cf);
+public static final native void CFRelease (long cf);
/**
* @param alloc cast=(CFAllocatorRef)
* @param chars cast=(const UniChar *)
* @param numChars cast=(CFIndex)
*/
-public static final native int CFStringCreateWithCharacters (long /*int*/ alloc, char[] chars, int numChars);
+public static final native int CFStringCreateWithCharacters (long alloc, char[] chars, int numChars);
/**
* @param theString cast=(CFStringRef)
* @param idx cast=(CFIndex)
*/
-public static final native char CFStringGetCharacterAtIndex (long /*int*/ theString, int idx);
+public static final native char CFStringGetCharacterAtIndex (long theString, int idx);
/**
* @param theString cast=(CFStringRef)
*/
-public static final native long /*int*/ CFStringGetCharactersPtr (long /*int*/ theString);
+public static final native long CFStringGetCharactersPtr (long theString);
/**
* @param theString cast=(CFStringRef)
*/
-public static final native int CFStringGetLength (long /*int*/ theString);
+public static final native int CFStringGetLength (long theString);
/**
* @param allocator cast=(CFAllocatorRef)
* @param URLString cast=(CFStringRef)
* @param baseURL cast=(CFURLRef)
*/
-public static final native long /*int*/ CFURLCreateWithString (long /*int*/ allocator, long /*int*/ URLString, long /*int*/ baseURL);
+public static final native long CFURLCreateWithString (long allocator, long URLString, long baseURL);
/**
* @param alloc cast=(CFAllocatorRef)
* @param origRequest cast=(CFURLRequestRef)
*/
-public static final native long /*int*/ CFURLRequestCreateMutableCopy (long /*int*/ alloc, long /*int*/ origRequest);
+public static final native long CFURLRequestCreateMutableCopy (long alloc, long origRequest);
/**
* @param request cast=(CFURLRequestRef)
*/
-public static final native long /*int*/ CFURLRequestCopyHTTPRequestBody (long /*int*/ request);
+public static final native long CFURLRequestCopyHTTPRequestBody (long request);
/**
* @param mutableHTTPRequest cast=(CFMutableURLRequestRef)
* @param httpBody cast=(CFDataRef)
*/
-public static final native void CFURLRequestSetHTTPRequestBody (long /*int*/ mutableHTTPRequest, long /*int*/ httpBody);
+public static final native void CFURLRequestSetHTTPRequestBody (long mutableHTTPRequest, long httpBody);
/**
* @param mutableRequest cast=(CFMutableURLRequestRef)
* @param url cast=(CFURLRef)
*/
-public static final native void CFURLRequestSetURL (long /*int*/ mutableRequest, long /*int*/ url);
+public static final native void CFURLRequestSetURL (long mutableRequest, long url);
/**
* @param definition cast=(const JSClassDefinition*)
*/
-public static final native long /*int*/ JSClassCreate (long /*int*/ definition);
+public static final native long JSClassCreate (long definition);
/**
* @param jsClass cast=(JSClassRef)
*/
-public static final native long /*int*/ JSClassRetain (long /*int*/ jsClass);
+public static final native long JSClassRetain (long jsClass);
/**
* @param ctx cast=(JSContextRef)
*/
-public static final native long /*int*/ JSContextGetGlobalObject (long /*int*/ ctx);
+public static final native long JSContextGetGlobalObject (long ctx);
/**
* @param ctx cast=(JSContextRef)
* @param script cast=(JSStringRef)
@@ -206,48 +206,48 @@ public static final native long /*int*/ JSContextGetGlobalObject (long /*int*/ c
* @param sourceURL cast=(JSStringRef)
* @param exception cast=(JSValueRef *)
*/
-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 native long JSEvaluateScript (long ctx, long script, long thisObject, long sourceURL, int startingLineNumber, long[] exception);
/**
* @param ctx cast=(JSGlobalContextRef)
*/
-public static final native int JSGlobalContextRetain (long /*int*/ ctx);
+public static final native int JSGlobalContextRetain (long ctx);
/**
* @param object cast=(JSObjectRef)
*/
-public static final native long /*int*/ JSObjectGetPrivate (long /*int*/ object);
+public static final native long JSObjectGetPrivate (long object);
/**
* @param ctx cast=(JSContextRef)
* @param object cast=(JSObjectRef)
* @param propertyName cast=(JSStringRef)
* @param exception cast=(JSValueRef*)
*/
-public static final native long /*int*/ JSObjectGetProperty (long /*int*/ ctx, long /*int*/ object, long /*int*/ propertyName, long /*int*/[] exception);
+public static final native long JSObjectGetProperty (long ctx, long object, long propertyName, long[] exception);
/**
* @param ctx cast=(JSContextRef)
* @param object cast=(JSObjectRef)
* @param propertyIndex cast=(unsigned)
* @param exception cast=(JSValueRef*)
*/
-public static final native long /*int*/ JSObjectGetPropertyAtIndex (long /*int*/ ctx, long /*int*/ object, int propertyIndex, long /*int*/[] exception);
+public static final native long JSObjectGetPropertyAtIndex (long ctx, long object, int propertyIndex, long[] exception);
/**
* @param ctx cast=(JSContextRef)
* @param jsClass cast=(JSClassRef)
* @param data cast=(void *)
*/
-public static final native int JSObjectMake (long /*int*/ ctx, long /*int*/ jsClass, long /*int*/ data);
+public static final native int JSObjectMake (long ctx, long jsClass, long 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 long /*int*/ JSObjectMakeArray (long /*int*/ ctx, long /*int*/ argumentCount, long /*int*/[] arguments, long /*int*/[] exception);
+public static final native long JSObjectMakeArray (long ctx, long argumentCount, long[] arguments, long[] exception);
/**
* @param ctx cast=(JSContextRef)
* @param name cast=(JSStringRef)
* @param callAsFunction cast=(JSObjectCallAsFunctionCallback)
*/
-public static final native int JSObjectMakeFunctionWithCallback (long /*int*/ ctx, long /*int*/ name, long /*int*/ callAsFunction);
+public static final native int JSObjectMakeFunctionWithCallback (long ctx, long name, long callAsFunction);
/**
* @param ctx cast=(JSContextRef)
* @param object cast=(JSObjectRef)
@@ -256,84 +256,84 @@ public static final native int JSObjectMakeFunctionWithCallback (long /*int*/ ct
* @param attributes cast=(JSPropertyAttributes)
* @param exception cast=(JSValueRef *)
*/
-public static final native void JSObjectSetProperty (long /*int*/ ctx, long /*int*/ object, long /*int*/ propertyName, long /*int*/ value, long /*int*/ attributes, long /*int*/[] exception);
+public static final native void JSObjectSetProperty (long ctx, long object, long propertyName, long value, long attributes, long[] exception);
/**
* @param string cast=(const char*)
*/
-public static final native long /*int*/ JSStringCreateWithUTF8CString (byte[] string);
+public static final native long JSStringCreateWithUTF8CString (byte[] string);
/**
* @param string cast=(JSStringRef)
*/
-public static final native int JSStringGetLength (long /*int*/ string);
+public static final native int JSStringGetLength (long string);
/**
* @param string cast=(JSStringRef)
*/
-public static final native long /*int*/ JSStringGetMaximumUTF8CStringSize (long /*int*/ string);
+public static final native long JSStringGetMaximumUTF8CStringSize (long string);
/**
* @param string cast=(JSStringRef)
* @param buffer cast=(char *)
* @param bufferSize cast=(size_t)
*/
-public static final native int JSStringGetUTF8CString (long /*int*/ string, byte[] buffer, long /*int*/ bufferSize);
+public static final native int JSStringGetUTF8CString (long string, byte[] buffer, long bufferSize);
/**
* @param a cast=(JSStringRef)
* @param b cast=(const char *)
*/
-public static final native int JSStringIsEqualToUTF8CString (long /*int*/ a, byte[] b);
+public static final native int JSStringIsEqualToUTF8CString (long a, byte[] b);
/**
* @param string cast=(JSStringRef)
*/
-public static final native void JSStringRelease (long /*int*/ string);
+public static final native void JSStringRelease (long string);
/**
* @param ctx cast=(JSContextRef)
* @param value cast=(JSValueRef)
*/
-public static final native int JSValueGetType (long /*int*/ ctx, long /*int*/ value);
+public static final native int JSValueGetType (long ctx, long value);
/**
* @param ctx cast=(JSContextRef)
* @param value cast=(JSValueRef)
* @param jsClass cast=(JSClassRef)
*/
-public static final native int JSValueIsObjectOfClass (long /*int*/ ctx, long /*int*/ value, long /*int*/ jsClass);
+public static final native int JSValueIsObjectOfClass (long ctx, long value, long jsClass);
/**
* @param ctx cast=(JSContextRef)
* @param b cast=(bool)
*/
-public static final native long /*int*/ JSValueMakeBoolean (long /*int*/ ctx, long /*int*/ b);
+public static final native long JSValueMakeBoolean (long ctx, long b);
/**
* @param ctx cast=(JSContextRef)
*/
-public static final native long /*int*/ JSValueMakeNull (long /*int*/ ctx);
+public static final native long JSValueMakeNull (long ctx);
/**
* @param ctx cast=(JSContextRef)
* @param number cast=(double)
*/
-public static final native long /*int*/ JSValueMakeNumber (long /*int*/ ctx, double number);
+public static final native long JSValueMakeNumber (long ctx, double number);
/**
* @param ctx cast=(JSContextRef)
* @param string cast=(JSStringRef)
*/
-public static final native long /*int*/ JSValueMakeString (long /*int*/ ctx, long /*int*/ string);
+public static final native long JSValueMakeString (long ctx, long string);
/**
* @param ctx cast=(JSContextRef)
*/
-public static final native long /*int*/ JSValueMakeUndefined (long /*int*/ ctx);
+public static final native long JSValueMakeUndefined (long ctx);
/**
* @param ctx cast=(JSContextRef)
* @param value cast=(JSValueRef)
* @param exception cast=(JSValueRef*)
*/
-public static final native double JSValueToNumber (long /*int*/ ctx, long /*int*/ value, long /*int*/[] exception);
+public static final native double JSValueToNumber (long ctx, long value, long[] exception);
/**
* @param ctx cast=(JSContextRef)
* @param value cast=(JSValueRef)
* @param exception cast=(JSValueRef*)
*/
-public static final native long /*int*/ JSValueToStringCopy (long /*int*/ ctx, long /*int*/ value, long /*int*/[] exception);
+public static final native long JSValueToStringCopy (long ctx, long value, long[] exception);
/** @method flags=const address*/
-public static final native long /*int*/ kCFCopyStringDictionaryKeyCallBacks ();
+public static final native long kCFCopyStringDictionaryKeyCallBacks ();
/** @method flags=const address*/
-public static final native long /*int*/ kCFTypeDictionaryValueCallBacks ();
+public static final native long kCFTypeDictionaryValueCallBacks ();
public static final native int JSClassDefinition_sizeof ();
/**
@@ -341,10 +341,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 (long /*int*/ dest, JSClassDefinition src, long /*int*/ size);
+public static final native void memmove (long dest, JSClassDefinition src, long size);
/** @method flags=no_gen */
-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) {
+public static final native int WebKitCreateInstance (byte[] rclsid, long pUnkOuter, byte[] refiid, long[] ppvObject);
+public static final int WebKitCreateInstance (GUID clsid, long pUnkOuter, GUID iid, long[] ppvObject) {
byte[] rclsid = new byte[GUID.sizeof];
OS.IIDFromString ((clsid.toString () + '\0').toCharArray (), rclsid);
byte[] refiid = new byte[GUID.sizeof];
@@ -353,12 +353,12 @@ public static final int WebKitCreateInstance (GUID clsid, long /*int*/ pUnkOuter
}
/** @method flags=no_gen */
-public static final native long /*int*/ JSObjectCallAsFunctionProc_CALLBACK (long /*int*/ func);
+public static final native long JSObjectCallAsFunctionProc_CALLBACK (long func);
/** @method flags=no_gen */
-public static final native long /*int*/ JSObjectGetPropertyProc_CALLBACK (long /*int*/ func);
+public static final native long JSObjectGetPropertyProc_CALLBACK (long func);
/** @method flags=no_gen */
-public static final native long /*int*/ JSObjectHasPropertyProc_CALLBACK (long /*int*/ func);
+public static final native long JSObjectHasPropertyProc_CALLBACK (long func);
/** @method flags=no_gen */
-public static final native long /*int*/ willPerformClientRedirectToURL_CALLBACK (long /*int*/ func);
+public static final native long willPerformClientRedirectToURL_CALLBACK (long func);
}

Back to the top