Blob Blame Raw
Index: Eclipse_SWT_Mozilla/common/library/xpcom_stats.h
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse_SWT_Mozilla/common/library/xpcom_stats.h,v
retrieving revision 1.14
diff -u -r1.14 xpcom_stats.h
--- plugins/org.eclipse.swt/Eclipse_SWT_Mozilla/common/library/xpcom_stats.h	9 May 2006 21:52:54 -0000	1.14
+++ plugins/org.eclipse.swt/Eclipse_SWT_Mozilla/common/library/xpcom_stats.h	9 Sep 2006 14:39:35 -0000
@@ -41,7 +41,7 @@
 	Call_FUNC,
 	NS_1GetComponentManager_FUNC,
 	NS_1GetServiceManager_FUNC,
-	NS_1InitEmbedding_FUNC,
+	NS_1InitXPCOM3_FUNC,
 	NS_1NewLocalFile_FUNC,
 	NS_1TermEmbedding_FUNC,
 	PR_1Free_FUNC,
Index: Eclipse_SWT_Mozilla/common/library/xpcom.cpp
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse_SWT_Mozilla/common/library/xpcom.cpp,v
retrieving revision 1.29
diff -u -r1.29 xpcom.cpp
--- plugins/org.eclipse.swt/Eclipse_SWT_Mozilla/common/library/xpcom.cpp	9 May 2006 21:52:54 -0000	1.29
+++ plugins/org.eclipse.swt/Eclipse_SWT_Mozilla/common/library/xpcom.cpp	9 Sep 2006 14:39:35 -0000
@@ -85,14 +85,16 @@
 }
 #endif
 
-#ifndef NO_NS_1InitEmbedding
-JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1InitEmbedding)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+#ifndef NO_NS_1InitXPCOM3
+JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1InitXPCOM3)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
 {
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, NS_1InitEmbedding_FUNC);
-	rc = (jint)NS_InitEmbedding((nsILocalFile *)arg0, (nsIDirectoryServiceProvider *)arg1);
-	XPCOM_NATIVE_EXIT(env, that, NS_1InitEmbedding_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, NS_1GetComponentRegistrar_FUNC);
+	rc = (jint)NS_InitXPCOM3((nsIServiceManager **)arg0, (nsIFile *)arg1,
+		(nsIDirectoryServiceProvider *)arg2, (nsStaticModuleInfo *)arg3,
+		(PRUint32) arg4);
+	XPCOM_NATIVE_EXIT(env, that, NS_1GetComponentRegistrar_FUNC);
 	return rc;
 }
 #endif
Index: Eclipse_SWT_Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse_SWT_Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java,v
retrieving revision 1.48
diff -u -r1.48 XPCOM.java
--- plugins/org.eclipse.swt/Eclipse_SWT_Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java	9 May 2006 18:54:24 -0000	1.48
+++ plugins/org.eclipse.swt/Eclipse_SWT_Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java	9 Sep 2006 14:39:36 -0000
@@ -102,7 +102,7 @@
 public static final native void memmove(byte[] dest, char[] src, int nbytes);
 public static final native int NS_GetComponentManager(int /*long*/[] result);
 public static final native int NS_GetServiceManager(int /*long*/[] result);
-public static final native int NS_InitEmbedding(int /*long*/ aMozBinDirectory, int /*long*/ aAppFileLocProvider);
+public static final native int NS_InitXPCOM3(int /*long*/ result, int /*long*/ binDirectory, int /*long*/ appFileLocationProvider, int /*long*/ staticComponents, int componentCount);
 public static final native int NS_NewLocalFile(int /*long*/ path, boolean followLinks, int /*long*/[] result);
 public static final native int NS_TermEmbedding();
 public static final native int strlen_PRUnichar(int /*long*/ s);
Index: Eclipse_SWT_Mozilla/gtk/org/eclipse/swt/browser/Browser.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse_SWT_Mozilla/gtk/org/eclipse/swt/browser/Browser.java,v
retrieving revision 1.61
diff -u -r1.61 Browser.java
--- plugins/org.eclipse.swt/Eclipse_SWT_Mozilla/gtk/org/eclipse/swt/browser/Browser.java	9 May 2006 19:47:09 -0000	1.61
+++ plugins/org.eclipse.swt/Eclipse_SWT_Mozilla/gtk/org/eclipse/swt/browser/Browser.java	9 Sep 2006 14:39:37 -0000
@@ -175,11 +175,11 @@
 		if (retVal[0] == 0) error(XPCOM.NS_ERROR_NULL_POINTER);
 		
 		nsILocalFile localFile = new nsILocalFile(retVal[0]);
-		rc = XPCOM.NS_InitEmbedding(localFile.getAddress(), 0);
+		rc = XPCOM.NS_InitXPCOM3(0, localFile.getAddress(), 0, 0, 0);
 		localFile.Release();
 		if (rc != XPCOM.NS_OK) {
 			dispose();
-			SWT.error(SWT.ERROR_NO_HANDLES, null, " [NS_InitEmbedding "+mozillaPath+" error "+rc+"]"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			SWT.error(SWT.ERROR_NO_HANDLES, null, " [NS_InitXPCOM3 "+mozillaPath+" error "+rc+"]"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 		}
 
 		rc = XPCOM.NS_GetComponentManager(result);
Index: JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties,v
retrieving revision 1.11
diff -u -r1.11 org.eclipse.swt.internal.mozilla.XPCOM.properties
--- plugins/org.eclipse.swt.tools/JNI_Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties	9 May 2006 21:53:07 -0000	1.11
+++ plugins/org.eclipse.swt.tools/JNI_Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties	9 Sep 2006 14:39:38 -0000
@@ -28,6 +28,13 @@
 XPCOM_NS_InitEmbedding_0=cast=(nsILocalFile *)
 XPCOM_NS_InitEmbedding_1=cast=(nsIDirectoryServiceProvider *)
 
+XPCOM_NS_InitXPCOM3=
+XPCOM_NS_InitXPCOM3_0=cast=(nsIServiceManager**)
+XPCOM_NS_InitXPCOM3_1=cast=(nsIFile *)
+XPCOM_NS_InitXPCOM3_2=cast=(nsIDirectoryServiceProvider *)
+XPCOM_NS_InitXPCOM3_3=cast=(const nsStaticModuleInfo *)
+XPCOM_NS_InitXPCOM3_4=cast=(PRUint32)
+
 XPCOM_NS_NewLocalFile=
 XPCOM_NS_NewLocalFile_0=cast=(nsAString *),flags=struct
 XPCOM_NS_NewLocalFile_1=