Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSilenio Quarti2007-10-05 12:26:09 -0400
committerSilenio Quarti2007-10-05 12:26:09 -0400
commit7df5e984ec875f691308b6181eafc99590a0f0e2 (patch)
tree2316f48237c9bb92a5457acbe75a9ae34d7eba27
parentecf10c31c838b534a30e1a66862c413a0c5d161b (diff)
downloadeclipse.platform.swt-7df5e984ec875f691308b6181eafc99590a0f0e2.tar.gz
eclipse.platform.swt-7df5e984ec875f691308b6181eafc99590a0f0e2.tar.xz
eclipse.platform.swt-7df5e984ec875f691308b6181eafc99590a0f0e2.zip
XPCOM test
-rw-r--r--bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp13
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.cpp5
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.h1
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java1
5 files changed, 22 insertions, 2 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 8749ddba9c..5892c13ffb 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
@@ -874,6 +874,10 @@ XPCOM_nsEmbedCString_get_0=cast=(nsEmbedCString *)
XPCOM_nsEmbedCString_1new__=flags=new
+XPCOM_nsEmbedCString_1new__II=flags=new
+XPCOM_nsEmbedCString_1new__II_0=cast=(const char *)
+XPCOM_nsEmbedCString_1new__II_1=
+
XPCOM_nsEmbedCString_1new___3BI=flags=new
XPCOM_nsEmbedCString_1new___3BI_0=cast=(const char *)
XPCOM_nsEmbedCString_1new___3BI_1=
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 4996a3eff1..c77b240ec5 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
@@ -2238,6 +2238,19 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedCString_1new__)
}
#endif
+#ifndef NO_nsEmbedCString_1new__II
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedCString_1new__II)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedCString_1new__II)
+ (JNIEnv *env, jclass that, jint arg0, jint arg1)
+{
+ jint rc = 0;
+ XPCOM_NATIVE_ENTER(env, that, nsEmbedCString_1new__II_FUNC);
+ rc = (jint)new nsEmbedCString((const char *)arg0, arg1);
+ XPCOM_NATIVE_EXIT(env, that, nsEmbedCString_1new__II_FUNC);
+ return rc;
+}
+#endif
+
#ifndef NO_nsEmbedCString_1new___3BI
extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedCString_1new___3BI)(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1);
JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedCString_1new___3BI)
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 0a02004467..6ab4615b0e 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 = 130;
-int XPCOM_nativeFunctionCallCount[130];
+int XPCOM_nativeFunctionCount = 131;
+int XPCOM_nativeFunctionCallCount[131];
char * XPCOM_nativeFunctionNames[] = {
"Call",
"NS_1GetComponentManager",
@@ -137,6 +137,7 @@ char * XPCOM_nativeFunctionNames[] = {
"nsEmbedCString_1delete",
"nsEmbedCString_1get",
"nsEmbedCString_1new__",
+ "nsEmbedCString_1new__II",
"nsEmbedCString_1new___3BI",
"nsEmbedString_1Length",
"nsEmbedString_1delete",
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 7b3e822a32..54534c5c58 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
@@ -145,6 +145,7 @@ typedef enum {
nsEmbedCString_1delete_FUNC,
nsEmbedCString_1get_FUNC,
nsEmbedCString_1new___FUNC,
+ nsEmbedCString_1new__II_FUNC,
nsEmbedCString_1new___3BI_FUNC,
nsEmbedString_1Length_FUNC,
nsEmbedString_1delete_FUNC,
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java
index d7bface231..1fbb3769a0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java
@@ -128,6 +128,7 @@ public static final native int NS_NewLocalFile(int /*long*/ path, boolean follow
public static final native int strlen_PRUnichar(int /*long*/ s);
public static final native int /*long*/ nsEmbedCString_new();
public static final native int /*long*/ nsEmbedCString_new(byte[] aString, int length);
+public static final native int /*long*/ nsEmbedCString_new(int aString, int length);
public static final native void nsEmbedCString_delete(int /*long*/ ptr);
public static final native int nsEmbedCString_Length(int /*long*/ ptr);
public static final native int /*long*/ nsEmbedCString_get(int /*long*/ ptr);

Back to the top