Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGrant Gayed2008-08-21 12:17:07 -0400
committerGrant Gayed2008-08-21 12:17:07 -0400
commitbf5c8b81d42eec4571c559ba1d3088600b46768f (patch)
tree133f88d64e3e65871e6d8cbdfc6d886798168549
parentf8c77d293664fda2c335221cc2e89072d032593c (diff)
downloadeclipse.platform.swt-bf5c8b81d42eec4571c559ba1d3088600b46768f.tar.gz
eclipse.platform.swt-bf5c8b81d42eec4571c559ba1d3088600b46768f.tar.xz
eclipse.platform.swt-bf5c8b81d42eec4571c559ba1d3088600b46768f.zip
242644 - eclipse crashes when downloading a file in the internal browser
-rw-r--r--bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties24
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp46
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.cpp6
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.h2
4 files changed, 75 insertions, 3 deletions
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties
index 6330601471..d0ebcb280b 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2000, 2007 IBM Corporation and others.
+# Copyright (c) 2000, 2008 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -265,6 +265,16 @@ XPCOM_VtblCall__IIII_3CJJJ_5=
XPCOM_VtblCall__IIII_3CJJJ_6=
XPCOM_VtblCall__IIII_3CJJJ_7=
+XPCOM_VtblCall__IIII_3C_3CI_3I=
+XPCOM_VtblCall__IIII_3C_3CI_3I_0=
+XPCOM_VtblCall__IIII_3C_3CI_3I_1=
+XPCOM_VtblCall__IIII_3C_3CI_3I_2=
+XPCOM_VtblCall__IIII_3C_3CI_3I_3=
+XPCOM_VtblCall__IIII_3C_3CI_3I_4=
+XPCOM_VtblCall__IIII_3C_3CI_3I_5=
+XPCOM_VtblCall__IIII_3C_3CI_3I_6=
+XPCOM_VtblCall__IIII_3C_3CI_3I_7=
+
XPCOM_VtblCall__IIII_3I=
XPCOM_VtblCall__IIII_3I_0=
XPCOM_VtblCall__IIII_3I_1=
@@ -691,6 +701,16 @@ XPCOM_VtblCall__IIJJ_3CJJJ_5=
XPCOM_VtblCall__IIJJ_3CJJJ_6=
XPCOM_VtblCall__IIJJ_3CJJJ_7=
+XPCOM_VtblCall__IIJJ_3C_3CI_3J=
+XPCOM_VtblCall__IIJJ_3C_3CI_3J_0=
+XPCOM_VtblCall__IIJJ_3C_3CI_3J_1=
+XPCOM_VtblCall__IIJJ_3C_3CI_3J_2=
+XPCOM_VtblCall__IIJJ_3C_3CI_3J_3=
+XPCOM_VtblCall__IIJJ_3C_3CI_3J_4=
+XPCOM_VtblCall__IIJJ_3C_3CI_3J_5=
+XPCOM_VtblCall__IIJJ_3C_3CI_3J_6=
+XPCOM_VtblCall__IIJJ_3C_3CI_3J_7=
+
XPCOM_VtblCall__IIJJ_3I=
XPCOM_VtblCall__IIJJ_3I_0=
XPCOM_VtblCall__IIJJ_3I_1=
@@ -1399,6 +1419,8 @@ org_eclipse_swt_internal_mozilla_nsIHelperAppLauncher=
org_eclipse_swt_internal_mozilla_nsIHelperAppLauncherDialog=
+org_eclipse_swt_internal_mozilla_nsIHelperAppLauncherDialog_11_19=
+
org_eclipse_swt_internal_mozilla_nsIHelperAppLauncher_11_18=
org_eclipse_swt_internal_mozilla_nsIHelperAppLauncher_11_19=
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp
index 1903027c5f..07b9dce31f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp
@@ -472,6 +472,29 @@ fail:
}
#endif
+#ifndef NO_VtblCall__IIII_3C_3CI_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3C_3CI_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jcharArray arg4, jcharArray arg5, jint arg6, jintArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3C_3CI_3I)
+ (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jcharArray arg4, jcharArray arg5, jint arg6, jintArray arg7)
+{
+ jchar *lparg4=NULL;
+ jchar *lparg5=NULL;
+ jint *lparg7=NULL;
+ jint rc = 0;
+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IIII_3C_3CI_3I_FUNC);
+ if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
+ if (arg5) if ((lparg5 = env->GetCharArrayElements(arg5, NULL)) == NULL) goto fail;
+ if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jchar *, jchar *, jint, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4, lparg5, arg6, lparg7);
+fail:
+ if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
+ if (arg5 && lparg5) env->ReleaseCharArrayElements(arg5, lparg5, 0);
+ if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IIII_3C_3CI_3I_FUNC);
+ return rc;
+}
+#endif
+
#ifndef NO_VtblCall__IIII_3I
extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jintArray arg4);
JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3I)
@@ -1371,6 +1394,29 @@ fail:
}
#endif
+#ifndef NO_VtblCall__IIJJ_3C_3CI_3J
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ_3C_3CI_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jcharArray arg4, jcharArray arg5, jint arg6, jlongArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ_3C_3CI_3J)
+ (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jcharArray arg4, jcharArray arg5, jint arg6, jlongArray arg7)
+{
+ jchar *lparg4=NULL;
+ jchar *lparg5=NULL;
+ jlong *lparg7=NULL;
+ jint rc = 0;
+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJ_3C_3CI_3J_FUNC);
+ if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
+ if (arg5) if ((lparg5 = env->GetCharArrayElements(arg5, NULL)) == NULL) goto fail;
+ if (arg7) if ((lparg7 = env->GetLongArrayElements(arg7, NULL)) == NULL) goto fail;
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jchar *, jchar *, jint, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4, lparg5, arg6, lparg7);
+fail:
+ if (arg7 && lparg7) env->ReleaseLongArrayElements(arg7, lparg7, 0);
+ if (arg5 && lparg5) env->ReleaseCharArrayElements(arg5, lparg5, 0);
+ if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJ_3C_3CI_3J_FUNC);
+ return rc;
+}
+#endif
+
#ifndef NO_VtblCall__IIJJ_3I
extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jintArray arg4);
JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ_3I)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.cpp b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.cpp
index ad2aad3aa4..b276290c48 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.cpp
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.cpp
@@ -14,8 +14,8 @@
#ifdef NATIVE_STATS
-int XPCOM_nativeFunctionCount = 168;
-int XPCOM_nativeFunctionCallCount[168];
+int XPCOM_nativeFunctionCount = 170;
+int XPCOM_nativeFunctionCallCount[170];
char * XPCOM_nativeFunctionNames[] = {
"Call",
"NS_1GetComponentManager",
@@ -45,6 +45,7 @@ char * XPCOM_nativeFunctionNames[] = {
"VtblCall__IIII_3C",
"VtblCall__IIII_3CIJI",
"VtblCall__IIII_3CJJJ",
+ "VtblCall__IIII_3C_3CI_3I",
"VtblCall__IIII_3I",
"VtblCall__IIII_3J",
"VtblCall__IIIJJ",
@@ -92,6 +93,7 @@ char * XPCOM_nativeFunctionNames[] = {
"VtblCall__IIJJ_3B",
"VtblCall__IIJJ_3CIJI",
"VtblCall__IIJJ_3CJJJ",
+ "VtblCall__IIJJ_3C_3CI_3J",
"VtblCall__IIJJ_3I",
"VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2",
"VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J",
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.h b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.h
index 0bdefb5e64..11990c6ae7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.h
@@ -53,6 +53,7 @@ typedef enum {
VtblCall__IIII_3C_FUNC,
VtblCall__IIII_3CIJI_FUNC,
VtblCall__IIII_3CJJJ_FUNC,
+ VtblCall__IIII_3C_3CI_3I_FUNC,
VtblCall__IIII_3I_FUNC,
VtblCall__IIII_3J_FUNC,
VtblCall__IIIJJ_FUNC,
@@ -100,6 +101,7 @@ typedef enum {
VtblCall__IIJJ_3B_FUNC,
VtblCall__IIJJ_3CIJI_FUNC,
VtblCall__IIJJ_3CJJJ_FUNC,
+ VtblCall__IIJJ_3C_3CI_3J_FUNC,
VtblCall__IIJJ_3I_FUNC,
VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_FUNC,
VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,

Back to the top