backport xulrunner 1.9.1 support to 3.4 maintenance stream (post-3.4.2)
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 d0ebcb2..699a92f 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
@@ -8,1263 +8,1718 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-org_eclipse_swt_internal_mozilla_GREVersionRange=flags=no_gen
-GREVersionRange_lower=
-GREVersionRange_lowerInclusive=
-GREVersionRange_upper=
-GREVersionRange_upperInclusive=
-
 org_eclipse_swt_internal_mozilla_XPCOM=flags=cpp
-XPCOM_Call=
-XPCOM_Call_0=cast=(nsWriteSegmentFun)
-XPCOM_Call_1=cast=(nsIInputStream *)
-XPCOM_Call_2=cast=(void *)
-XPCOM_Call_3=cast=(const char *)
-XPCOM_Call_4=
-XPCOM_Call_5=
-XPCOM_Call_6=cast=(PRUint32 *)
+XPCOM__1Call__I=
+XPCOM__1Call__I_0=
 
-XPCOM_NS_GetComponentManager=
-XPCOM_NS_GetComponentManager_0=cast=(nsIComponentManager**)
+XPCOM__1Call__IIIIII=
+XPCOM__1Call__IIIIII_0=cast=(SWT_XREInitEmbedding)
+XPCOM__1Call__IIIIII_1=cast=(nsILocalFile *)
+XPCOM__1Call__IIIIII_2=cast=(nsILocalFile *)
+XPCOM__1Call__IIIIII_3=cast=(nsIDirectoryServiceProvider *)
+XPCOM__1Call__IIIIII_4=cast=(nsStaticModuleInfo const *)
+XPCOM__1Call__IIIIII_5=
 
-XPCOM_NS_GetServiceManager=
-XPCOM_NS_GetServiceManager_0=cast=(nsIServiceManager**)
+XPCOM__1Call__III_3BII_3I=
+XPCOM__1Call__III_3BII_3I_0=cast=(nsWriteSegmentFun)
+XPCOM__1Call__III_3BII_3I_1=cast=(nsIInputStream *)
+XPCOM__1Call__III_3BII_3I_2=cast=(void *)
+XPCOM__1Call__III_3BII_3I_3=cast=(const char *)
+XPCOM__1Call__III_3BII_3I_4=
+XPCOM__1Call__III_3BII_3I_5=
+XPCOM__1Call__III_3BII_3I_6=cast=(PRUint32 *)
 
-XPCOM_NS_InitXPCOM2=
-XPCOM_NS_InitXPCOM2_0=cast=(nsIServiceManager **)
-XPCOM_NS_InitXPCOM2_1=cast=(nsIFile *)
-XPCOM_NS_InitXPCOM2_2=cast=(nsIDirectoryServiceProvider *)
+XPCOM__JS_EvaluateUCScriptForPrincipals=flags=no_gen
+XPCOM__JS_EvaluateUCScriptForPrincipals_0=
+XPCOM__JS_EvaluateUCScriptForPrincipals_1=
+XPCOM__JS_EvaluateUCScriptForPrincipals_2=
+XPCOM__JS_EvaluateUCScriptForPrincipals_3=
+XPCOM__JS_EvaluateUCScriptForPrincipals_4=
+XPCOM__JS_EvaluateUCScriptForPrincipals_5=
+XPCOM__JS_EvaluateUCScriptForPrincipals_6=
+XPCOM__JS_EvaluateUCScriptForPrincipals_7=
+XPCOM__JS_EvaluateUCScriptForPrincipals_8=
 
-XPCOM_NS_NewLocalFile=
-XPCOM_NS_NewLocalFile_0=cast=(nsAString *),flags=struct
-XPCOM_NS_NewLocalFile_1=
-XPCOM_NS_NewLocalFile_2=cast=(nsILocalFile**)
+XPCOM__NS_GetComponentManager=
+XPCOM__NS_GetComponentManager_0=cast=(nsIComponentManager**)
 
-XPCOM_VtblCall__II=
-XPCOM_VtblCall__II_0=
-XPCOM_VtblCall__II_1=
+XPCOM__NS_GetServiceManager=
+XPCOM__NS_GetServiceManager_0=cast=(nsIServiceManager**)
 
-XPCOM_VtblCall__IIF=
-XPCOM_VtblCall__IIF_0=
-XPCOM_VtblCall__IIF_1=
-XPCOM_VtblCall__IIF_2=
+XPCOM__NS_InitXPCOM2=
+XPCOM__NS_InitXPCOM2_0=cast=(nsIServiceManager **)
+XPCOM__NS_InitXPCOM2_1=cast=(nsIFile *)
+XPCOM__NS_InitXPCOM2_2=cast=(nsIDirectoryServiceProvider *)
 
-XPCOM_VtblCall__III=
-XPCOM_VtblCall__III_0=
-XPCOM_VtblCall__III_1=
-XPCOM_VtblCall__III_2=
+XPCOM__NS_NewLocalFile=
+XPCOM__NS_NewLocalFile_0=cast=(nsAString *),flags=struct
+XPCOM__NS_NewLocalFile_1=
+XPCOM__NS_NewLocalFile_2=cast=(nsILocalFile**)
 
-XPCOM_VtblCall__IIII=
-XPCOM_VtblCall__IIII_0=
-XPCOM_VtblCall__IIII_1=
-XPCOM_VtblCall__IIII_2=
-XPCOM_VtblCall__IIII_3=
+XPCOM__1VtblCall__II=
+XPCOM__1VtblCall__II_0=
+XPCOM__1VtblCall__II_1=
 
-XPCOM_VtblCall__IIIII=
-XPCOM_VtblCall__IIIII_0=
-XPCOM_VtblCall__IIIII_1=
-XPCOM_VtblCall__IIIII_2=
-XPCOM_VtblCall__IIIII_3=
-XPCOM_VtblCall__IIIII_4=
+XPCOM__1VtblCall__IID=
+XPCOM__1VtblCall__IID_0=
+XPCOM__1VtblCall__IID_1=
+XPCOM__1VtblCall__IID_2=
 
-XPCOM_VtblCall__IIIIII=
-XPCOM_VtblCall__IIIIII_0=
-XPCOM_VtblCall__IIIIII_1=
-XPCOM_VtblCall__IIIIII_2=
-XPCOM_VtblCall__IIIIII_3=
-XPCOM_VtblCall__IIIIII_4=
-XPCOM_VtblCall__IIIIII_5=
+XPCOM__1VtblCall__IIF=
+XPCOM__1VtblCall__IIF_0=
+XPCOM__1VtblCall__IIF_1=
+XPCOM__1VtblCall__IIF_2=
 
-XPCOM_VtblCall__IIIIIII=
-XPCOM_VtblCall__IIIIIII_0=
-XPCOM_VtblCall__IIIIIII_1=
-XPCOM_VtblCall__IIIIIII_2=
-XPCOM_VtblCall__IIIIIII_3=
-XPCOM_VtblCall__IIIIIII_4=
-XPCOM_VtblCall__IIIIIII_5=
-XPCOM_VtblCall__IIIIIII_6=
+XPCOM__1VtblCall__III=
+XPCOM__1VtblCall__III_0=
+XPCOM__1VtblCall__III_1=
+XPCOM__1VtblCall__III_2=
 
-XPCOM_VtblCall__IIIIIIII=
-XPCOM_VtblCall__IIIIIIII_0=
-XPCOM_VtblCall__IIIIIIII_1=
-XPCOM_VtblCall__IIIIIIII_2=
-XPCOM_VtblCall__IIIIIIII_3=
-XPCOM_VtblCall__IIIIIIII_4=
-XPCOM_VtblCall__IIIIIIII_5=
-XPCOM_VtblCall__IIIIIIII_6=
-XPCOM_VtblCall__IIIIIIII_7=
+XPCOM__1VtblCall__IIII=
+XPCOM__1VtblCall__IIII_0=
+XPCOM__1VtblCall__IIII_1=
+XPCOM__1VtblCall__IIII_2=
+XPCOM__1VtblCall__IIII_3=
 
-XPCOM_VtblCall__IIIIIIIIIIII=
-XPCOM_VtblCall__IIIIIIIIIIII_0=
-XPCOM_VtblCall__IIIIIIIIIIII_1=
-XPCOM_VtblCall__IIIIIIIIIIII_2=
-XPCOM_VtblCall__IIIIIIIIIIII_3=
-XPCOM_VtblCall__IIIIIIIIIIII_4=
-XPCOM_VtblCall__IIIIIIIIIIII_5=
-XPCOM_VtblCall__IIIIIIIIIIII_6=
-XPCOM_VtblCall__IIIIIIIIIIII_7=
-XPCOM_VtblCall__IIIIIIIIIIII_8=
-XPCOM_VtblCall__IIIIIIIIIIII_9=
-XPCOM_VtblCall__IIIIIIIIIIII_10=
-XPCOM_VtblCall__IIIIIIIIIIII_11=
+XPCOM__1VtblCall__IIIII=
+XPCOM__1VtblCall__IIIII_0=
+XPCOM__1VtblCall__IIIII_1=
+XPCOM__1VtblCall__IIIII_2=
+XPCOM__1VtblCall__IIIII_3=
+XPCOM__1VtblCall__IIIII_4=
 
-XPCOM_VtblCall__IIIIIIIIIIIIIIISI=
-XPCOM_VtblCall__IIIIIIIIIIIIIIISI_0=
-XPCOM_VtblCall__IIIIIIIIIIIIIIISI_1=
-XPCOM_VtblCall__IIIIIIIIIIIIIIISI_2=
-XPCOM_VtblCall__IIIIIIIIIIIIIIISI_3=
-XPCOM_VtblCall__IIIIIIIIIIIIIIISI_4=
-XPCOM_VtblCall__IIIIIIIIIIIIIIISI_5=
-XPCOM_VtblCall__IIIIIIIIIIIIIIISI_6=
-XPCOM_VtblCall__IIIIIIIIIIIIIIISI_7=
-XPCOM_VtblCall__IIIIIIIIIIIIIIISI_8=
-XPCOM_VtblCall__IIIIIIIIIIIIIIISI_9=
-XPCOM_VtblCall__IIIIIIIIIIIIIIISI_10=
-XPCOM_VtblCall__IIIIIIIIIIIIIIISI_11=
-XPCOM_VtblCall__IIIIIIIIIIIIIIISI_12=
-XPCOM_VtblCall__IIIIIIIIIIIIIIISI_13=
-XPCOM_VtblCall__IIIIIIIIIIIIIIISI_14=
-XPCOM_VtblCall__IIIIIIIIIIIIIIISI_15=
-XPCOM_VtblCall__IIIIIIIIIIIIIIISI_16=
+XPCOM__1VtblCall__IIIIII=
+XPCOM__1VtblCall__IIIIII_0=
+XPCOM__1VtblCall__IIIIII_1=
+XPCOM__1VtblCall__IIIIII_2=
+XPCOM__1VtblCall__IIIIII_3=
+XPCOM__1VtblCall__IIIIII_4=
+XPCOM__1VtblCall__IIIIII_5=
 
-XPCOM_VtblCall__IIIIIIII_3C_3I_3I=
-XPCOM_VtblCall__IIIIIIII_3C_3I_3I_0=
-XPCOM_VtblCall__IIIIIIII_3C_3I_3I_1=
-XPCOM_VtblCall__IIIIIIII_3C_3I_3I_2=
-XPCOM_VtblCall__IIIIIIII_3C_3I_3I_3=
-XPCOM_VtblCall__IIIIIIII_3C_3I_3I_4=
-XPCOM_VtblCall__IIIIIIII_3C_3I_3I_5=
-XPCOM_VtblCall__IIIIIIII_3C_3I_3I_6=
-XPCOM_VtblCall__IIIIIIII_3C_3I_3I_7=
-XPCOM_VtblCall__IIIIIIII_3C_3I_3I_8=
-XPCOM_VtblCall__IIIIIIII_3C_3I_3I_9=
-XPCOM_VtblCall__IIIIIIII_3C_3I_3I_10=
+XPCOM__1VtblCall__IIIIIII=
+XPCOM__1VtblCall__IIIIIII_0=
+XPCOM__1VtblCall__IIIIIII_1=
+XPCOM__1VtblCall__IIIIIII_2=
+XPCOM__1VtblCall__IIIIIII_3=
+XPCOM__1VtblCall__IIIIIII_4=
+XPCOM__1VtblCall__IIIIIII_5=
+XPCOM__1VtblCall__IIIIIII_6=
 
-XPCOM_VtblCall__IIIIIIJII=
-XPCOM_VtblCall__IIIIIIJII_0=
-XPCOM_VtblCall__IIIIIIJII_1=
-XPCOM_VtblCall__IIIIIIJII_2=
-XPCOM_VtblCall__IIIIIIJII_3=
-XPCOM_VtblCall__IIIIIIJII_4=
-XPCOM_VtblCall__IIIIIIJII_5=
-XPCOM_VtblCall__IIIIIIJII_6=
-XPCOM_VtblCall__IIIIIIJII_7=
-XPCOM_VtblCall__IIIIIIJII_8=
+XPCOM__1VtblCall__IIIIIIII=
+XPCOM__1VtblCall__IIIIIIII_0=
+XPCOM__1VtblCall__IIIIIIII_1=
+XPCOM__1VtblCall__IIIIIIII_2=
+XPCOM__1VtblCall__IIIIIIII_3=
+XPCOM__1VtblCall__IIIIIIII_4=
+XPCOM__1VtblCall__IIIIIIII_5=
+XPCOM__1VtblCall__IIIIIIII_6=
+XPCOM__1VtblCall__IIIIIIII_7=
 
-XPCOM_VtblCall__IIIIII_3CIIIII_3I_3I=
-XPCOM_VtblCall__IIIIII_3CIIIII_3I_3I_0=
-XPCOM_VtblCall__IIIIII_3CIIIII_3I_3I_1=
-XPCOM_VtblCall__IIIIII_3CIIIII_3I_3I_2=
-XPCOM_VtblCall__IIIIII_3CIIIII_3I_3I_3=
-XPCOM_VtblCall__IIIIII_3CIIIII_3I_3I_4=
-XPCOM_VtblCall__IIIIII_3CIIIII_3I_3I_5=
-XPCOM_VtblCall__IIIIII_3CIIIII_3I_3I_6=
-XPCOM_VtblCall__IIIIII_3CIIIII_3I_3I_7=
-XPCOM_VtblCall__IIIIII_3CIIIII_3I_3I_8=
-XPCOM_VtblCall__IIIIII_3CIIIII_3I_3I_9=
-XPCOM_VtblCall__IIIIII_3CIIIII_3I_3I_10=
-XPCOM_VtblCall__IIIIII_3CIIIII_3I_3I_11=
-XPCOM_VtblCall__IIIIII_3CIIIII_3I_3I_12=
-XPCOM_VtblCall__IIIIII_3CIIIII_3I_3I_13=
+XPCOM__1VtblCall__IIIIIIIIIIII=
+XPCOM__1VtblCall__IIIIIIIIIIII_0=
+XPCOM__1VtblCall__IIIIIIIIIIII_1=
+XPCOM__1VtblCall__IIIIIIIIIIII_2=
+XPCOM__1VtblCall__IIIIIIIIIIII_3=
+XPCOM__1VtblCall__IIIIIIIIIIII_4=
+XPCOM__1VtblCall__IIIIIIIIIIII_5=
+XPCOM__1VtblCall__IIIIIIIIIIII_6=
+XPCOM__1VtblCall__IIIIIIIIIIII_7=
+XPCOM__1VtblCall__IIIIIIIIIIII_8=
+XPCOM__1VtblCall__IIIIIIIIIIII_9=
+XPCOM__1VtblCall__IIIIIIIIIIII_10=
+XPCOM__1VtblCall__IIIIIIIIIIII_11=
 
-XPCOM_VtblCall__IIIIII_3C_3BIIIII_3I_3I=
-XPCOM_VtblCall__IIIIII_3C_3BIIIII_3I_3I_0=
-XPCOM_VtblCall__IIIIII_3C_3BIIIII_3I_3I_1=
-XPCOM_VtblCall__IIIIII_3C_3BIIIII_3I_3I_2=
-XPCOM_VtblCall__IIIIII_3C_3BIIIII_3I_3I_3=
-XPCOM_VtblCall__IIIIII_3C_3BIIIII_3I_3I_4=
-XPCOM_VtblCall__IIIIII_3C_3BIIIII_3I_3I_5=
-XPCOM_VtblCall__IIIIII_3C_3BIIIII_3I_3I_6=
-XPCOM_VtblCall__IIIIII_3C_3BIIIII_3I_3I_7=
-XPCOM_VtblCall__IIIIII_3C_3BIIIII_3I_3I_8=
-XPCOM_VtblCall__IIIIII_3C_3BIIIII_3I_3I_9=
-XPCOM_VtblCall__IIIIII_3C_3BIIIII_3I_3I_10=
-XPCOM_VtblCall__IIIIII_3C_3BIIIII_3I_3I_11=
-XPCOM_VtblCall__IIIIII_3C_3BIIIII_3I_3I_12=
-XPCOM_VtblCall__IIIIII_3C_3BIIIII_3I_3I_13=
-XPCOM_VtblCall__IIIIII_3C_3BIIIII_3I_3I_14=
+XPCOM__1VtblCall__IIIIIIIIIIIIIIISI=
+XPCOM__1VtblCall__IIIIIIIIIIIIIIISI_0=
+XPCOM__1VtblCall__IIIIIIIIIIIIIIISI_1=
+XPCOM__1VtblCall__IIIIIIIIIIIIIIISI_2=
+XPCOM__1VtblCall__IIIIIIIIIIIIIIISI_3=
+XPCOM__1VtblCall__IIIIIIIIIIIIIIISI_4=
+XPCOM__1VtblCall__IIIIIIIIIIIIIIISI_5=
+XPCOM__1VtblCall__IIIIIIIIIIIIIIISI_6=
+XPCOM__1VtblCall__IIIIIIIIIIIIIIISI_7=
+XPCOM__1VtblCall__IIIIIIIIIIIIIIISI_8=
+XPCOM__1VtblCall__IIIIIIIIIIIIIIISI_9=
+XPCOM__1VtblCall__IIIIIIIIIIIIIIISI_10=
+XPCOM__1VtblCall__IIIIIIIIIIIIIIISI_11=
+XPCOM__1VtblCall__IIIIIIIIIIIIIIISI_12=
+XPCOM__1VtblCall__IIIIIIIIIIIIIIISI_13=
+XPCOM__1VtblCall__IIIIIIIIIIIIIIISI_14=
+XPCOM__1VtblCall__IIIIIIIIIIIIIIISI_15=
+XPCOM__1VtblCall__IIIIIIIIIIIIIIISI_16=
 
-XPCOM_VtblCall__IIIIII_3C_3I_3I=
-XPCOM_VtblCall__IIIIII_3C_3I_3I_0=
-XPCOM_VtblCall__IIIIII_3C_3I_3I_1=
-XPCOM_VtblCall__IIIIII_3C_3I_3I_2=
-XPCOM_VtblCall__IIIIII_3C_3I_3I_3=
-XPCOM_VtblCall__IIIIII_3C_3I_3I_4=
-XPCOM_VtblCall__IIIIII_3C_3I_3I_5=
-XPCOM_VtblCall__IIIIII_3C_3I_3I_6=
-XPCOM_VtblCall__IIIIII_3C_3I_3I_7=
-XPCOM_VtblCall__IIIIII_3C_3I_3I_8=
+XPCOM__1VtblCall__IIIIIIIII_3I=
+XPCOM__1VtblCall__IIIIIIIII_3I_0=
+XPCOM__1VtblCall__IIIIIIIII_3I_1=
+XPCOM__1VtblCall__IIIIIIIII_3I_2=
+XPCOM__1VtblCall__IIIIIIIII_3I_3=
+XPCOM__1VtblCall__IIIIIIIII_3I_4=
+XPCOM__1VtblCall__IIIIIIIII_3I_5=
+XPCOM__1VtblCall__IIIIIIIII_3I_6=
+XPCOM__1VtblCall__IIIIIIIII_3I_7=
+XPCOM__1VtblCall__IIIIIIIII_3I_8=
+XPCOM__1VtblCall__IIIIIIIII_3I_9=
 
-XPCOM_VtblCall__IIIIII_3I_3I=
-XPCOM_VtblCall__IIIIII_3I_3I_0=
-XPCOM_VtblCall__IIIIII_3I_3I_1=
-XPCOM_VtblCall__IIIIII_3I_3I_2=
-XPCOM_VtblCall__IIIIII_3I_3I_3=
-XPCOM_VtblCall__IIIIII_3I_3I_4=
-XPCOM_VtblCall__IIIIII_3I_3I_5=
-XPCOM_VtblCall__IIIIII_3I_3I_6=
-XPCOM_VtblCall__IIIIII_3I_3I_7=
+XPCOM__1VtblCall__IIIIIIII_3C_3I_3I=
+XPCOM__1VtblCall__IIIIIIII_3C_3I_3I_0=
+XPCOM__1VtblCall__IIIIIIII_3C_3I_3I_1=
+XPCOM__1VtblCall__IIIIIIII_3C_3I_3I_2=
+XPCOM__1VtblCall__IIIIIIII_3C_3I_3I_3=
+XPCOM__1VtblCall__IIIIIIII_3C_3I_3I_4=
+XPCOM__1VtblCall__IIIIIIII_3C_3I_3I_5=
+XPCOM__1VtblCall__IIIIIIII_3C_3I_3I_6=
+XPCOM__1VtblCall__IIIIIIII_3C_3I_3I_7=
+XPCOM__1VtblCall__IIIIIIII_3C_3I_3I_8=
+XPCOM__1VtblCall__IIIIIIII_3C_3I_3I_9=
+XPCOM__1VtblCall__IIIIIIII_3C_3I_3I_10=
 
-XPCOM_VtblCall__IIIII_3C=
-XPCOM_VtblCall__IIIII_3C_0=
-XPCOM_VtblCall__IIIII_3C_1=
-XPCOM_VtblCall__IIIII_3C_2=
-XPCOM_VtblCall__IIIII_3C_3=
-XPCOM_VtblCall__IIIII_3C_4=
-XPCOM_VtblCall__IIIII_3C_5=
+XPCOM__1VtblCall__IIIIIII_3I=
+XPCOM__1VtblCall__IIIIIII_3I_0=
+XPCOM__1VtblCall__IIIIIII_3I_1=
+XPCOM__1VtblCall__IIIIIII_3I_2=
+XPCOM__1VtblCall__IIIIIII_3I_3=
+XPCOM__1VtblCall__IIIIIII_3I_4=
+XPCOM__1VtblCall__IIIIIII_3I_5=
+XPCOM__1VtblCall__IIIIIII_3I_6=
+XPCOM__1VtblCall__IIIIIII_3I_7=
 
-XPCOM_VtblCall__IIIII_3I=
-XPCOM_VtblCall__IIIII_3I_0=
-XPCOM_VtblCall__IIIII_3I_1=
-XPCOM_VtblCall__IIIII_3I_2=
-XPCOM_VtblCall__IIIII_3I_3=
-XPCOM_VtblCall__IIIII_3I_4=
-XPCOM_VtblCall__IIIII_3I_5=
+XPCOM__1VtblCall__IIIIIIJII=
+XPCOM__1VtblCall__IIIIIIJII_0=
+XPCOM__1VtblCall__IIIIIIJII_1=
+XPCOM__1VtblCall__IIIIIIJII_2=
+XPCOM__1VtblCall__IIIIIIJII_3=
+XPCOM__1VtblCall__IIIIIIJII_4=
+XPCOM__1VtblCall__IIIIIIJII_5=
+XPCOM__1VtblCall__IIIIIIJII_6=
+XPCOM__1VtblCall__IIIIIIJII_7=
+XPCOM__1VtblCall__IIIIIIJII_8=
 
-XPCOM_VtblCall__IIIIJJJJ=
-XPCOM_VtblCall__IIIIJJJJ_0=
-XPCOM_VtblCall__IIIIJJJJ_1=
-XPCOM_VtblCall__IIIIJJJJ_2=
-XPCOM_VtblCall__IIIIJJJJ_3=
-XPCOM_VtblCall__IIIIJJJJ_4=
-XPCOM_VtblCall__IIIIJJJJ_5=
-XPCOM_VtblCall__IIIIJJJJ_6=
-XPCOM_VtblCall__IIIIJJJJ_7=
+XPCOM__1VtblCall__IIIIII_3CIIIII_3I_3I=
+XPCOM__1VtblCall__IIIIII_3CIIIII_3I_3I_0=
+XPCOM__1VtblCall__IIIIII_3CIIIII_3I_3I_1=
+XPCOM__1VtblCall__IIIIII_3CIIIII_3I_3I_2=
+XPCOM__1VtblCall__IIIIII_3CIIIII_3I_3I_3=
+XPCOM__1VtblCall__IIIIII_3CIIIII_3I_3I_4=
+XPCOM__1VtblCall__IIIIII_3CIIIII_3I_3I_5=
+XPCOM__1VtblCall__IIIIII_3CIIIII_3I_3I_6=
+XPCOM__1VtblCall__IIIIII_3CIIIII_3I_3I_7=
+XPCOM__1VtblCall__IIIIII_3CIIIII_3I_3I_8=
+XPCOM__1VtblCall__IIIIII_3CIIIII_3I_3I_9=
+XPCOM__1VtblCall__IIIIII_3CIIIII_3I_3I_10=
+XPCOM__1VtblCall__IIIIII_3CIIIII_3I_3I_11=
+XPCOM__1VtblCall__IIIIII_3CIIIII_3I_3I_12=
+XPCOM__1VtblCall__IIIIII_3CIIIII_3I_3I_13=
 
-XPCOM_VtblCall__IIII_3B=
-XPCOM_VtblCall__IIII_3B_0=
-XPCOM_VtblCall__IIII_3B_1=
-XPCOM_VtblCall__IIII_3B_2=
-XPCOM_VtblCall__IIII_3B_3=
-XPCOM_VtblCall__IIII_3B_4=
+XPCOM__1VtblCall__IIIIII_3C_3BIIIII_3I_3I=
+XPCOM__1VtblCall__IIIIII_3C_3BIIIII_3I_3I_0=
+XPCOM__1VtblCall__IIIIII_3C_3BIIIII_3I_3I_1=
+XPCOM__1VtblCall__IIIIII_3C_3BIIIII_3I_3I_2=
+XPCOM__1VtblCall__IIIIII_3C_3BIIIII_3I_3I_3=
+XPCOM__1VtblCall__IIIIII_3C_3BIIIII_3I_3I_4=
+XPCOM__1VtblCall__IIIIII_3C_3BIIIII_3I_3I_5=
+XPCOM__1VtblCall__IIIIII_3C_3BIIIII_3I_3I_6=
+XPCOM__1VtblCall__IIIIII_3C_3BIIIII_3I_3I_7=
+XPCOM__1VtblCall__IIIIII_3C_3BIIIII_3I_3I_8=
+XPCOM__1VtblCall__IIIIII_3C_3BIIIII_3I_3I_9=
+XPCOM__1VtblCall__IIIIII_3C_3BIIIII_3I_3I_10=
+XPCOM__1VtblCall__IIIIII_3C_3BIIIII_3I_3I_11=
+XPCOM__1VtblCall__IIIIII_3C_3BIIIII_3I_3I_12=
+XPCOM__1VtblCall__IIIIII_3C_3BIIIII_3I_3I_13=
+XPCOM__1VtblCall__IIIIII_3C_3BIIIII_3I_3I_14=
 
-XPCOM_VtblCall__IIII_3C=
-XPCOM_VtblCall__IIII_3C_0=
-XPCOM_VtblCall__IIII_3C_1=
-XPCOM_VtblCall__IIII_3C_2=
-XPCOM_VtblCall__IIII_3C_3=
-XPCOM_VtblCall__IIII_3C_4=
+XPCOM__1VtblCall__IIIIII_3C_3I_3I=
+XPCOM__1VtblCall__IIIIII_3C_3I_3I_0=
+XPCOM__1VtblCall__IIIIII_3C_3I_3I_1=
+XPCOM__1VtblCall__IIIIII_3C_3I_3I_2=
+XPCOM__1VtblCall__IIIIII_3C_3I_3I_3=
+XPCOM__1VtblCall__IIIIII_3C_3I_3I_4=
+XPCOM__1VtblCall__IIIIII_3C_3I_3I_5=
+XPCOM__1VtblCall__IIIIII_3C_3I_3I_6=
+XPCOM__1VtblCall__IIIIII_3C_3I_3I_7=
+XPCOM__1VtblCall__IIIIII_3C_3I_3I_8=
 
-XPCOM_VtblCall__IIII_3CIJI=
-XPCOM_VtblCall__IIII_3CIJI_0=
-XPCOM_VtblCall__IIII_3CIJI_1=
-XPCOM_VtblCall__IIII_3CIJI_2=
-XPCOM_VtblCall__IIII_3CIJI_3=
-XPCOM_VtblCall__IIII_3CIJI_4=
-XPCOM_VtblCall__IIII_3CIJI_5=
-XPCOM_VtblCall__IIII_3CIJI_6=
-XPCOM_VtblCall__IIII_3CIJI_7=
+XPCOM__1VtblCall__IIIIII_3I_3I=
+XPCOM__1VtblCall__IIIIII_3I_3I_0=
+XPCOM__1VtblCall__IIIIII_3I_3I_1=
+XPCOM__1VtblCall__IIIIII_3I_3I_2=
+XPCOM__1VtblCall__IIIIII_3I_3I_3=
+XPCOM__1VtblCall__IIIIII_3I_3I_4=
+XPCOM__1VtblCall__IIIIII_3I_3I_5=
+XPCOM__1VtblCall__IIIIII_3I_3I_6=
+XPCOM__1VtblCall__IIIIII_3I_3I_7=
 
-XPCOM_VtblCall__IIII_3CJJJ=
-XPCOM_VtblCall__IIII_3CJJJ_0=
-XPCOM_VtblCall__IIII_3CJJJ_1=
-XPCOM_VtblCall__IIII_3CJJJ_2=
-XPCOM_VtblCall__IIII_3CJJJ_3=
-XPCOM_VtblCall__IIII_3CJJJ_4=
-XPCOM_VtblCall__IIII_3CJJJ_5=
-XPCOM_VtblCall__IIII_3CJJJ_6=
-XPCOM_VtblCall__IIII_3CJJJ_7=
+XPCOM__1VtblCall__IIIIII_3I_3I_3I=
+XPCOM__1VtblCall__IIIIII_3I_3I_3I_0=
+XPCOM__1VtblCall__IIIIII_3I_3I_3I_1=
+XPCOM__1VtblCall__IIIIII_3I_3I_3I_2=
+XPCOM__1VtblCall__IIIIII_3I_3I_3I_3=
+XPCOM__1VtblCall__IIIIII_3I_3I_3I_4=
+XPCOM__1VtblCall__IIIIII_3I_3I_3I_5=
+XPCOM__1VtblCall__IIIIII_3I_3I_3I_6=
+XPCOM__1VtblCall__IIIIII_3I_3I_3I_7=
+XPCOM__1VtblCall__IIIIII_3I_3I_3I_8=
 
-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__1VtblCall__IIIII_3B_3BI=
+XPCOM__1VtblCall__IIIII_3B_3BI_0=
+XPCOM__1VtblCall__IIIII_3B_3BI_1=
+XPCOM__1VtblCall__IIIII_3B_3BI_2=
+XPCOM__1VtblCall__IIIII_3B_3BI_3=
+XPCOM__1VtblCall__IIIII_3B_3BI_4=
+XPCOM__1VtblCall__IIIII_3B_3BI_5=
+XPCOM__1VtblCall__IIIII_3B_3BI_6=
+XPCOM__1VtblCall__IIIII_3B_3BI_7=
 
-XPCOM_VtblCall__IIII_3I=
-XPCOM_VtblCall__IIII_3I_0=
-XPCOM_VtblCall__IIII_3I_1=
-XPCOM_VtblCall__IIII_3I_2=
-XPCOM_VtblCall__IIII_3I_3=
-XPCOM_VtblCall__IIII_3I_4=
+XPCOM__1VtblCall__IIIII_3C=
+XPCOM__1VtblCall__IIIII_3C_0=
+XPCOM__1VtblCall__IIIII_3C_1=
+XPCOM__1VtblCall__IIIII_3C_2=
+XPCOM__1VtblCall__IIIII_3C_3=
+XPCOM__1VtblCall__IIIII_3C_4=
+XPCOM__1VtblCall__IIIII_3C_5=
 
-XPCOM_VtblCall__IIII_3J=
-XPCOM_VtblCall__IIII_3J_0=
-XPCOM_VtblCall__IIII_3J_1=
-XPCOM_VtblCall__IIII_3J_2=
-XPCOM_VtblCall__IIII_3J_3=
-XPCOM_VtblCall__IIII_3J_4=
+XPCOM__1VtblCall__IIIII_3I=
+XPCOM__1VtblCall__IIIII_3I_0=
+XPCOM__1VtblCall__IIIII_3I_1=
+XPCOM__1VtblCall__IIIII_3I_2=
+XPCOM__1VtblCall__IIIII_3I_3=
+XPCOM__1VtblCall__IIIII_3I_4=
+XPCOM__1VtblCall__IIIII_3I_5=
 
-XPCOM_VtblCall__IIIJJ=
-XPCOM_VtblCall__IIIJJ_0=
-XPCOM_VtblCall__IIIJJ_1=
-XPCOM_VtblCall__IIIJJ_2=
-XPCOM_VtblCall__IIIJJ_3=
-XPCOM_VtblCall__IIIJJ_4=
+XPCOM__1VtblCall__IIIII_3I_3I_3I=
+XPCOM__1VtblCall__IIIII_3I_3I_3I_0=
+XPCOM__1VtblCall__IIIII_3I_3I_3I_1=
+XPCOM__1VtblCall__IIIII_3I_3I_3I_2=
+XPCOM__1VtblCall__IIIII_3I_3I_3I_3=
+XPCOM__1VtblCall__IIIII_3I_3I_3I_4=
+XPCOM__1VtblCall__IIIII_3I_3I_3I_5=
+XPCOM__1VtblCall__IIIII_3I_3I_3I_6=
+XPCOM__1VtblCall__IIIII_3I_3I_3I_7=
 
-XPCOM_VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2=
-XPCOM_VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_0=
-XPCOM_VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_1=
-XPCOM_VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_2=
-XPCOM_VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3=
+XPCOM__1VtblCall__IIIIJJJJ=
+XPCOM__1VtblCall__IIIIJJJJ_0=
+XPCOM__1VtblCall__IIIIJJJJ_1=
+XPCOM__1VtblCall__IIIIJJJJ_2=
+XPCOM__1VtblCall__IIIIJJJJ_3=
+XPCOM__1VtblCall__IIIIJJJJ_4=
+XPCOM__1VtblCall__IIIIJJJJ_5=
+XPCOM__1VtblCall__IIIIJJJJ_6=
+XPCOM__1VtblCall__IIIIJJJJ_7=
 
-XPCOM_VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I=
-XPCOM_VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I_0=
-XPCOM_VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I_1=
-XPCOM_VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I_2=
-XPCOM_VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I_3=
-XPCOM_VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I_4=
+XPCOM__1VtblCall__IIII_3B=
+XPCOM__1VtblCall__IIII_3B_0=
+XPCOM__1VtblCall__IIII_3B_1=
+XPCOM__1VtblCall__IIII_3B_2=
+XPCOM__1VtblCall__IIII_3B_3=
+XPCOM__1VtblCall__IIII_3B_4=
 
-XPCOM_VtblCall__III_3B=
-XPCOM_VtblCall__III_3B_0=
-XPCOM_VtblCall__III_3B_1=
-XPCOM_VtblCall__III_3B_2=
-XPCOM_VtblCall__III_3B_3=
+XPCOM__1VtblCall__IIII_3BI=
+XPCOM__1VtblCall__IIII_3BI_0=
+XPCOM__1VtblCall__IIII_3BI_1=
+XPCOM__1VtblCall__IIII_3BI_2=
+XPCOM__1VtblCall__IIII_3BI_3=
+XPCOM__1VtblCall__IIII_3BI_4=
+XPCOM__1VtblCall__IIII_3BI_5=
 
-XPCOM_VtblCall__III_3BI=
-XPCOM_VtblCall__III_3BI_0=
-XPCOM_VtblCall__III_3BI_1=
-XPCOM_VtblCall__III_3BI_2=
-XPCOM_VtblCall__III_3BI_3=
-XPCOM_VtblCall__III_3BI_4=
+XPCOM__1VtblCall__IIII_3BII=
+XPCOM__1VtblCall__IIII_3BII_0=
+XPCOM__1VtblCall__IIII_3BII_1=
+XPCOM__1VtblCall__IIII_3BII_2=
+XPCOM__1VtblCall__IIII_3BII_3=
+XPCOM__1VtblCall__IIII_3BII_4=
+XPCOM__1VtblCall__IIII_3BII_5=
+XPCOM__1VtblCall__IIII_3BII_6=
 
-XPCOM_VtblCall__III_3BI_3I=
-XPCOM_VtblCall__III_3BI_3I_0=
-XPCOM_VtblCall__III_3BI_3I_1=
-XPCOM_VtblCall__III_3BI_3I_2=
-XPCOM_VtblCall__III_3BI_3I_3=
-XPCOM_VtblCall__III_3BI_3I_4=
-XPCOM_VtblCall__III_3BI_3I_5=
+XPCOM__1VtblCall__IIII_3B_3B=
+XPCOM__1VtblCall__IIII_3B_3B_0=
+XPCOM__1VtblCall__IIII_3B_3B_1=
+XPCOM__1VtblCall__IIII_3B_3B_2=
+XPCOM__1VtblCall__IIII_3B_3B_3=
+XPCOM__1VtblCall__IIII_3B_3B_4=
+XPCOM__1VtblCall__IIII_3B_3B_5=
 
-XPCOM_VtblCall__III_3B_3B_3BI_3I=
-XPCOM_VtblCall__III_3B_3B_3BI_3I_0=
-XPCOM_VtblCall__III_3B_3B_3BI_3I_1=
-XPCOM_VtblCall__III_3B_3B_3BI_3I_2=
-XPCOM_VtblCall__III_3B_3B_3BI_3I_3=
-XPCOM_VtblCall__III_3B_3B_3BI_3I_4=
-XPCOM_VtblCall__III_3B_3B_3BI_3I_5=
-XPCOM_VtblCall__III_3B_3B_3BI_3I_6=
-XPCOM_VtblCall__III_3B_3B_3BI_3I_7=
+XPCOM__1VtblCall__IIII_3C=
+XPCOM__1VtblCall__IIII_3C_0=
+XPCOM__1VtblCall__IIII_3C_1=
+XPCOM__1VtblCall__IIII_3C_2=
+XPCOM__1VtblCall__IIII_3C_3=
+XPCOM__1VtblCall__IIII_3C_4=
 
-XPCOM_VtblCall__III_3B_3C=
-XPCOM_VtblCall__III_3B_3C_0=
-XPCOM_VtblCall__III_3B_3C_1=
-XPCOM_VtblCall__III_3B_3C_2=
-XPCOM_VtblCall__III_3B_3C_3=
-XPCOM_VtblCall__III_3B_3C_4=
+XPCOM__1VtblCall__IIII_3CIJI=
+XPCOM__1VtblCall__IIII_3CIJI_0=
+XPCOM__1VtblCall__IIII_3CIJI_1=
+XPCOM__1VtblCall__IIII_3CIJI_2=
+XPCOM__1VtblCall__IIII_3CIJI_3=
+XPCOM__1VtblCall__IIII_3CIJI_4=
+XPCOM__1VtblCall__IIII_3CIJI_5=
+XPCOM__1VtblCall__IIII_3CIJI_6=
+XPCOM__1VtblCall__IIII_3CIJI_7=
 
-XPCOM_VtblCall__III_3B_3I=
-XPCOM_VtblCall__III_3B_3I_0=
-XPCOM_VtblCall__III_3B_3I_1=
-XPCOM_VtblCall__III_3B_3I_2=
-XPCOM_VtblCall__III_3B_3I_3=
-XPCOM_VtblCall__III_3B_3I_4=
+XPCOM__1VtblCall__IIII_3CJJJ=
+XPCOM__1VtblCall__IIII_3CJJJ_0=
+XPCOM__1VtblCall__IIII_3CJJJ_1=
+XPCOM__1VtblCall__IIII_3CJJJ_2=
+XPCOM__1VtblCall__IIII_3CJJJ_3=
+XPCOM__1VtblCall__IIII_3CJJJ_4=
+XPCOM__1VtblCall__IIII_3CJJJ_5=
+XPCOM__1VtblCall__IIII_3CJJJ_6=
+XPCOM__1VtblCall__IIII_3CJJJ_7=
 
-XPCOM_VtblCall__III_3C=
-XPCOM_VtblCall__III_3C_0=
-XPCOM_VtblCall__III_3C_1=
-XPCOM_VtblCall__III_3C_2=
-XPCOM_VtblCall__III_3C_3=
+XPCOM__1VtblCall__IIII_3C_3CI_3I=
+XPCOM__1VtblCall__IIII_3C_3CI_3I_0=
+XPCOM__1VtblCall__IIII_3C_3CI_3I_1=
+XPCOM__1VtblCall__IIII_3C_3CI_3I_2=
+XPCOM__1VtblCall__IIII_3C_3CI_3I_3=
+XPCOM__1VtblCall__IIII_3C_3CI_3I_4=
+XPCOM__1VtblCall__IIII_3C_3CI_3I_5=
+XPCOM__1VtblCall__IIII_3C_3CI_3I_6=
+XPCOM__1VtblCall__IIII_3C_3CI_3I_7=
 
-XPCOM_VtblCall__III_3CI=
-XPCOM_VtblCall__III_3CI_0=
-XPCOM_VtblCall__III_3CI_1=
-XPCOM_VtblCall__III_3CI_2=
-XPCOM_VtblCall__III_3CI_3=
-XPCOM_VtblCall__III_3CI_4=
+XPCOM__1VtblCall__IIII_3I=
+XPCOM__1VtblCall__IIII_3I_0=
+XPCOM__1VtblCall__IIII_3I_1=
+XPCOM__1VtblCall__IIII_3I_2=
+XPCOM__1VtblCall__IIII_3I_3=
+XPCOM__1VtblCall__IIII_3I_4=
 
-XPCOM_VtblCall__III_3C_3C=
-XPCOM_VtblCall__III_3C_3C_0=
-XPCOM_VtblCall__III_3C_3C_1=
-XPCOM_VtblCall__III_3C_3C_2=
-XPCOM_VtblCall__III_3C_3C_3=
-XPCOM_VtblCall__III_3C_3C_4=
+XPCOM__1VtblCall__IIII_3I_3I=
+XPCOM__1VtblCall__IIII_3I_3I_0=
+XPCOM__1VtblCall__IIII_3I_3I_1=
+XPCOM__1VtblCall__IIII_3I_3I_2=
+XPCOM__1VtblCall__IIII_3I_3I_3=
+XPCOM__1VtblCall__IIII_3I_3I_4=
+XPCOM__1VtblCall__IIII_3I_3I_5=
 
-XPCOM_VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I=
-XPCOM_VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I_0=
-XPCOM_VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I_1=
-XPCOM_VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I_2=
-XPCOM_VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I_3=
-XPCOM_VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I_4=
-XPCOM_VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I_5=
-XPCOM_VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I_6=
-XPCOM_VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I_7=
-XPCOM_VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I_8=
-XPCOM_VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I_9=
-XPCOM_VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I_10=
-XPCOM_VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I_11=
+XPCOM__1VtblCall__IIII_3J=
+XPCOM__1VtblCall__IIII_3J_0=
+XPCOM__1VtblCall__IIII_3J_1=
+XPCOM__1VtblCall__IIII_3J_2=
+XPCOM__1VtblCall__IIII_3J_3=
+XPCOM__1VtblCall__IIII_3J_4=
 
-XPCOM_VtblCall__III_3C_3CI_3I_3I_3I=
-XPCOM_VtblCall__III_3C_3CI_3I_3I_3I_0=
-XPCOM_VtblCall__III_3C_3CI_3I_3I_3I_1=
-XPCOM_VtblCall__III_3C_3CI_3I_3I_3I_2=
-XPCOM_VtblCall__III_3C_3CI_3I_3I_3I_3=
-XPCOM_VtblCall__III_3C_3CI_3I_3I_3I_4=
-XPCOM_VtblCall__III_3C_3CI_3I_3I_3I_5=
-XPCOM_VtblCall__III_3C_3CI_3I_3I_3I_6=
-XPCOM_VtblCall__III_3C_3CI_3I_3I_3I_7=
-XPCOM_VtblCall__III_3C_3CI_3I_3I_3I_8=
+XPCOM__1VtblCall__IIIJJ=
+XPCOM__1VtblCall__IIIJJ_0=
+XPCOM__1VtblCall__IIIJJ_1=
+XPCOM__1VtblCall__IIIJJ_2=
+XPCOM__1VtblCall__IIIJJ_3=
+XPCOM__1VtblCall__IIIJJ_4=
 
-XPCOM_VtblCall__III_3C_3C_3C_3I=
-XPCOM_VtblCall__III_3C_3C_3C_3I_0=
-XPCOM_VtblCall__III_3C_3C_3C_3I_1=
-XPCOM_VtblCall__III_3C_3C_3C_3I_2=
-XPCOM_VtblCall__III_3C_3C_3C_3I_3=
-XPCOM_VtblCall__III_3C_3C_3C_3I_4=
-XPCOM_VtblCall__III_3C_3C_3C_3I_5=
-XPCOM_VtblCall__III_3C_3C_3C_3I_6=
+XPCOM__1VtblCall__IIIJJJJJJ_3J=
+XPCOM__1VtblCall__IIIJJJJJJ_3J_0=
+XPCOM__1VtblCall__IIIJJJJJJ_3J_1=
+XPCOM__1VtblCall__IIIJJJJJJ_3J_2=
+XPCOM__1VtblCall__IIIJJJJJJ_3J_3=
+XPCOM__1VtblCall__IIIJJJJJJ_3J_4=
+XPCOM__1VtblCall__IIIJJJJJJ_3J_5=
+XPCOM__1VtblCall__IIIJJJJJJ_3J_6=
+XPCOM__1VtblCall__IIIJJJJJJ_3J_7=
+XPCOM__1VtblCall__IIIJJJJJJ_3J_8=
+XPCOM__1VtblCall__IIIJJJJJJ_3J_9=
 
-XPCOM_VtblCall__III_3C_3C_3C_3I_3I=
-XPCOM_VtblCall__III_3C_3C_3C_3I_3I_0=
-XPCOM_VtblCall__III_3C_3C_3C_3I_3I_1=
-XPCOM_VtblCall__III_3C_3C_3C_3I_3I_2=
-XPCOM_VtblCall__III_3C_3C_3C_3I_3I_3=
-XPCOM_VtblCall__III_3C_3C_3C_3I_3I_4=
-XPCOM_VtblCall__III_3C_3C_3C_3I_3I_5=
-XPCOM_VtblCall__III_3C_3C_3C_3I_3I_6=
-XPCOM_VtblCall__III_3C_3C_3C_3I_3I_7=
+XPCOM__1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2=
+XPCOM__1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_0=
+XPCOM__1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_1=
+XPCOM__1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_2=
+XPCOM__1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3=
 
-XPCOM_VtblCall__III_3C_3C_3I=
-XPCOM_VtblCall__III_3C_3C_3I_0=
-XPCOM_VtblCall__III_3C_3C_3I_1=
-XPCOM_VtblCall__III_3C_3C_3I_2=
-XPCOM_VtblCall__III_3C_3C_3I_3=
-XPCOM_VtblCall__III_3C_3C_3I_4=
-XPCOM_VtblCall__III_3C_3C_3I_5=
+XPCOM__1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2II_3I=
+XPCOM__1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2II_3I_0=
+XPCOM__1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2II_3I_1=
+XPCOM__1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2II_3I_2=
+XPCOM__1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2II_3I_3=
+XPCOM__1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2II_3I_4=
+XPCOM__1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2II_3I_5=
+XPCOM__1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2II_3I_6=
+
+XPCOM__1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I=
+XPCOM__1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I_0=
+XPCOM__1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I_1=
+XPCOM__1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I_2=
+XPCOM__1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I_3=
+XPCOM__1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I_4=
+
+XPCOM__1VtblCall__III_3B=
+XPCOM__1VtblCall__III_3B_0=
+XPCOM__1VtblCall__III_3B_1=
+XPCOM__1VtblCall__III_3B_2=
+XPCOM__1VtblCall__III_3B_3=
+
+XPCOM__1VtblCall__III_3BI=
+XPCOM__1VtblCall__III_3BI_0=
+XPCOM__1VtblCall__III_3BI_1=
+XPCOM__1VtblCall__III_3BI_2=
+XPCOM__1VtblCall__III_3BI_3=
+XPCOM__1VtblCall__III_3BI_4=
+
+XPCOM__1VtblCall__III_3BI_3I=
+XPCOM__1VtblCall__III_3BI_3I_0=
+XPCOM__1VtblCall__III_3BI_3I_1=
+XPCOM__1VtblCall__III_3BI_3I_2=
+XPCOM__1VtblCall__III_3BI_3I_3=
+XPCOM__1VtblCall__III_3BI_3I_4=
+XPCOM__1VtblCall__III_3BI_3I_5=
+
+XPCOM__1VtblCall__III_3BS=
+XPCOM__1VtblCall__III_3BS_0=
+XPCOM__1VtblCall__III_3BS_1=
+XPCOM__1VtblCall__III_3BS_2=
+XPCOM__1VtblCall__III_3BS_3=
+XPCOM__1VtblCall__III_3BS_4=
+
+XPCOM__1VtblCall__III_3B_3B_3BI_3I=
+XPCOM__1VtblCall__III_3B_3B_3BI_3I_0=
+XPCOM__1VtblCall__III_3B_3B_3BI_3I_1=
+XPCOM__1VtblCall__III_3B_3B_3BI_3I_2=
+XPCOM__1VtblCall__III_3B_3B_3BI_3I_3=
+XPCOM__1VtblCall__III_3B_3B_3BI_3I_4=
+XPCOM__1VtblCall__III_3B_3B_3BI_3I_5=
+XPCOM__1VtblCall__III_3B_3B_3BI_3I_6=
+XPCOM__1VtblCall__III_3B_3B_3BI_3I_7=
+
+XPCOM__1VtblCall__III_3B_3C=
+XPCOM__1VtblCall__III_3B_3C_0=
+XPCOM__1VtblCall__III_3B_3C_1=
+XPCOM__1VtblCall__III_3B_3C_2=
+XPCOM__1VtblCall__III_3B_3C_3=
+XPCOM__1VtblCall__III_3B_3C_4=
+
+XPCOM__1VtblCall__III_3B_3I=
+XPCOM__1VtblCall__III_3B_3I_0=
+XPCOM__1VtblCall__III_3B_3I_1=
+XPCOM__1VtblCall__III_3B_3I_2=
+XPCOM__1VtblCall__III_3B_3I_3=
+XPCOM__1VtblCall__III_3B_3I_4=
+
+XPCOM__1VtblCall__III_3C=
+XPCOM__1VtblCall__III_3C_0=
+XPCOM__1VtblCall__III_3C_1=
+XPCOM__1VtblCall__III_3C_2=
+XPCOM__1VtblCall__III_3C_3=
+
+XPCOM__1VtblCall__III_3CI=
+XPCOM__1VtblCall__III_3CI_0=
+XPCOM__1VtblCall__III_3CI_1=
+XPCOM__1VtblCall__III_3CI_2=
+XPCOM__1VtblCall__III_3CI_3=
+XPCOM__1VtblCall__III_3CI_4=
+
+XPCOM__1VtblCall__III_3C_3C=
+XPCOM__1VtblCall__III_3C_3C_0=
+XPCOM__1VtblCall__III_3C_3C_1=
+XPCOM__1VtblCall__III_3C_3C_2=
+XPCOM__1VtblCall__III_3C_3C_3=
+XPCOM__1VtblCall__III_3C_3C_4=
+
+XPCOM__1VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I=
+XPCOM__1VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I_0=
+XPCOM__1VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I_1=
+XPCOM__1VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I_2=
+XPCOM__1VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I_3=
+XPCOM__1VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I_4=
+XPCOM__1VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I_5=
+XPCOM__1VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I_6=
+XPCOM__1VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I_7=
+XPCOM__1VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I_8=
+XPCOM__1VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I_9=
+XPCOM__1VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I_10=
+XPCOM__1VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I_11=
+
+XPCOM__1VtblCall__III_3C_3CI_3I_3I_3I=
+XPCOM__1VtblCall__III_3C_3CI_3I_3I_3I_0=
+XPCOM__1VtblCall__III_3C_3CI_3I_3I_3I_1=
+XPCOM__1VtblCall__III_3C_3CI_3I_3I_3I_2=
+XPCOM__1VtblCall__III_3C_3CI_3I_3I_3I_3=
+XPCOM__1VtblCall__III_3C_3CI_3I_3I_3I_4=
+XPCOM__1VtblCall__III_3C_3CI_3I_3I_3I_5=
+XPCOM__1VtblCall__III_3C_3CI_3I_3I_3I_6=
+XPCOM__1VtblCall__III_3C_3CI_3I_3I_3I_7=
+XPCOM__1VtblCall__III_3C_3CI_3I_3I_3I_8=
+
+XPCOM__1VtblCall__III_3C_3C_3C_3I=
+XPCOM__1VtblCall__III_3C_3C_3C_3I_0=
+XPCOM__1VtblCall__III_3C_3C_3C_3I_1=
+XPCOM__1VtblCall__III_3C_3C_3C_3I_2=
+XPCOM__1VtblCall__III_3C_3C_3C_3I_3=
+XPCOM__1VtblCall__III_3C_3C_3C_3I_4=
+XPCOM__1VtblCall__III_3C_3C_3C_3I_5=
+XPCOM__1VtblCall__III_3C_3C_3C_3I_6=
+
+XPCOM__1VtblCall__III_3C_3C_3C_3I_3I=
+XPCOM__1VtblCall__III_3C_3C_3C_3I_3I_0=
+XPCOM__1VtblCall__III_3C_3C_3C_3I_3I_1=
+XPCOM__1VtblCall__III_3C_3C_3C_3I_3I_2=
+XPCOM__1VtblCall__III_3C_3C_3C_3I_3I_3=
+XPCOM__1VtblCall__III_3C_3C_3C_3I_3I_4=
+XPCOM__1VtblCall__III_3C_3C_3C_3I_3I_5=
+XPCOM__1VtblCall__III_3C_3C_3C_3I_3I_6=
+XPCOM__1VtblCall__III_3C_3C_3C_3I_3I_7=
+
+XPCOM__1VtblCall__III_3C_3C_3I=
+XPCOM__1VtblCall__III_3C_3C_3I_0=
+XPCOM__1VtblCall__III_3C_3C_3I_1=
+XPCOM__1VtblCall__III_3C_3C_3I_2=
+XPCOM__1VtblCall__III_3C_3C_3I_3=
+XPCOM__1VtblCall__III_3C_3C_3I_4=
+XPCOM__1VtblCall__III_3C_3C_3I_5=
+
+XPCOM__1VtblCall__III_3C_3C_3I_3C_3I_3I=
+XPCOM__1VtblCall__III_3C_3C_3I_3C_3I_3I_0=
+XPCOM__1VtblCall__III_3C_3C_3I_3C_3I_3I_1=
+XPCOM__1VtblCall__III_3C_3C_3I_3C_3I_3I_2=
+XPCOM__1VtblCall__III_3C_3C_3I_3C_3I_3I_3=
+XPCOM__1VtblCall__III_3C_3C_3I_3C_3I_3I_4=
+XPCOM__1VtblCall__III_3C_3C_3I_3C_3I_3I_5=
+XPCOM__1VtblCall__III_3C_3C_3I_3C_3I_3I_6=
+XPCOM__1VtblCall__III_3C_3C_3I_3C_3I_3I_7=
+XPCOM__1VtblCall__III_3C_3C_3I_3C_3I_3I_8=
+
+XPCOM__1VtblCall__III_3C_3C_3I_3I_3C_3I_3I=
+XPCOM__1VtblCall__III_3C_3C_3I_3I_3C_3I_3I_0=
+XPCOM__1VtblCall__III_3C_3C_3I_3I_3C_3I_3I_1=
+XPCOM__1VtblCall__III_3C_3C_3I_3I_3C_3I_3I_2=
+XPCOM__1VtblCall__III_3C_3C_3I_3I_3C_3I_3I_3=
+XPCOM__1VtblCall__III_3C_3C_3I_3I_3C_3I_3I_4=
+XPCOM__1VtblCall__III_3C_3C_3I_3I_3C_3I_3I_5=
+XPCOM__1VtblCall__III_3C_3C_3I_3I_3C_3I_3I_6=
+XPCOM__1VtblCall__III_3C_3C_3I_3I_3C_3I_3I_7=
+XPCOM__1VtblCall__III_3C_3C_3I_3I_3C_3I_3I_8=
+XPCOM__1VtblCall__III_3C_3C_3I_3I_3C_3I_3I_9=
+
+XPCOM__1VtblCall__III_3C_3I=
+XPCOM__1VtblCall__III_3C_3I_0=
+XPCOM__1VtblCall__III_3C_3I_1=
+XPCOM__1VtblCall__III_3C_3I_2=
+XPCOM__1VtblCall__III_3C_3I_3=
+XPCOM__1VtblCall__III_3C_3I_4=
+
+XPCOM__1VtblCall__III_3I=
+XPCOM__1VtblCall__III_3I_0=
+XPCOM__1VtblCall__III_3I_1=
+XPCOM__1VtblCall__III_3I_2=
+XPCOM__1VtblCall__III_3I_3=
+
+XPCOM__1VtblCall__III_3II=
+XPCOM__1VtblCall__III_3II_0=
+XPCOM__1VtblCall__III_3II_1=
+XPCOM__1VtblCall__III_3II_2=
+XPCOM__1VtblCall__III_3II_3=
+XPCOM__1VtblCall__III_3II_4=
+
+XPCOM__1VtblCall__III_3IJ=
+XPCOM__1VtblCall__III_3IJ_0=
+XPCOM__1VtblCall__III_3IJ_1=
+XPCOM__1VtblCall__III_3IJ_2=
+XPCOM__1VtblCall__III_3IJ_3=
+XPCOM__1VtblCall__III_3IJ_4=
+
+XPCOM__1VtblCall__III_3I_3I_3I=
+XPCOM__1VtblCall__III_3I_3I_3I_0=
+XPCOM__1VtblCall__III_3I_3I_3I_1=
+XPCOM__1VtblCall__III_3I_3I_3I_2=
+XPCOM__1VtblCall__III_3I_3I_3I_3=
+XPCOM__1VtblCall__III_3I_3I_3I_4=
+XPCOM__1VtblCall__III_3I_3I_3I_5=
+
+XPCOM__1VtblCall__III_3I_3I_3I_3I=
+XPCOM__1VtblCall__III_3I_3I_3I_3I_0=
+XPCOM__1VtblCall__III_3I_3I_3I_3I_1=
+XPCOM__1VtblCall__III_3I_3I_3I_3I_2=
+XPCOM__1VtblCall__III_3I_3I_3I_3I_3=
+XPCOM__1VtblCall__III_3I_3I_3I_3I_4=
+XPCOM__1VtblCall__III_3I_3I_3I_3I_5=
+XPCOM__1VtblCall__III_3I_3I_3I_3I_6=
+
+XPCOM__1VtblCall__III_3I_3I_3J=
+XPCOM__1VtblCall__III_3I_3I_3J_0=
+XPCOM__1VtblCall__III_3I_3I_3J_1=
+XPCOM__1VtblCall__III_3I_3I_3J_2=
+XPCOM__1VtblCall__III_3I_3I_3J_3=
+XPCOM__1VtblCall__III_3I_3I_3J_4=
+XPCOM__1VtblCall__III_3I_3I_3J_5=
+
+XPCOM__1VtblCall__IIJ=
+XPCOM__1VtblCall__IIJ_0=
+XPCOM__1VtblCall__IIJ_1=
+XPCOM__1VtblCall__IIJ_2=
+
+XPCOM__1VtblCall__IIJI=
+XPCOM__1VtblCall__IIJI_0=
+XPCOM__1VtblCall__IIJI_1=
+XPCOM__1VtblCall__IIJI_2=
+XPCOM__1VtblCall__IIJI_3=
+
+XPCOM__1VtblCall__IIJIIJIIIIII=
+XPCOM__1VtblCall__IIJIIJIIIIII_0=
+XPCOM__1VtblCall__IIJIIJIIIIII_1=
+XPCOM__1VtblCall__IIJIIJIIIIII_2=
+XPCOM__1VtblCall__IIJIIJIIIIII_3=
+XPCOM__1VtblCall__IIJIIJIIIIII_4=
+XPCOM__1VtblCall__IIJIIJIIIIII_5=
+XPCOM__1VtblCall__IIJIIJIIIIII_6=
+XPCOM__1VtblCall__IIJIIJIIIIII_7=
+XPCOM__1VtblCall__IIJIIJIIIIII_8=
+XPCOM__1VtblCall__IIJIIJIIIIII_9=
+XPCOM__1VtblCall__IIJIIJIIIIII_10=
+XPCOM__1VtblCall__IIJIIJIIIIII_11=
+
+XPCOM__1VtblCall__IIJIIJIIIIIIIIISJ=
+XPCOM__1VtblCall__IIJIIJIIIIIIIIISJ_0=
+XPCOM__1VtblCall__IIJIIJIIIIIIIIISJ_1=
+XPCOM__1VtblCall__IIJIIJIIIIIIIIISJ_2=
+XPCOM__1VtblCall__IIJIIJIIIIIIIIISJ_3=
+XPCOM__1VtblCall__IIJIIJIIIIIIIIISJ_4=
+XPCOM__1VtblCall__IIJIIJIIIIIIIIISJ_5=
+XPCOM__1VtblCall__IIJIIJIIIIIIIIISJ_6=
+XPCOM__1VtblCall__IIJIIJIIIIIIIIISJ_7=
+XPCOM__1VtblCall__IIJIIJIIIIIIIIISJ_8=
+XPCOM__1VtblCall__IIJIIJIIIIIIIIISJ_9=
+XPCOM__1VtblCall__IIJIIJIIIIIIIIISJ_10=
+XPCOM__1VtblCall__IIJIIJIIIIIIIIISJ_11=
+XPCOM__1VtblCall__IIJIIJIIIIIIIIISJ_12=
+XPCOM__1VtblCall__IIJIIJIIIIIIIIISJ_13=
+XPCOM__1VtblCall__IIJIIJIIIIIIIIISJ_14=
+XPCOM__1VtblCall__IIJIIJIIIIIIIIISJ_15=
+XPCOM__1VtblCall__IIJIIJIIIIIIIIISJ_16=
+
+XPCOM__1VtblCall__IIJIIJ_3I_3J=
+XPCOM__1VtblCall__IIJIIJ_3I_3J_0=
+XPCOM__1VtblCall__IIJIIJ_3I_3J_1=
+XPCOM__1VtblCall__IIJIIJ_3I_3J_2=
+XPCOM__1VtblCall__IIJIIJ_3I_3J_3=
+XPCOM__1VtblCall__IIJIIJ_3I_3J_4=
+XPCOM__1VtblCall__IIJIIJ_3I_3J_5=
+XPCOM__1VtblCall__IIJIIJ_3I_3J_6=
+XPCOM__1VtblCall__IIJIIJ_3I_3J_7=
+
+XPCOM__1VtblCall__IIJII_3I=
+XPCOM__1VtblCall__IIJII_3I_0=
+XPCOM__1VtblCall__IIJII_3I_1=
+XPCOM__1VtblCall__IIJII_3I_2=
+XPCOM__1VtblCall__IIJII_3I_3=
+XPCOM__1VtblCall__IIJII_3I_4=
+XPCOM__1VtblCall__IIJII_3I_5=
+
+XPCOM__1VtblCall__IIJIJII=
+XPCOM__1VtblCall__IIJIJII_0=
+XPCOM__1VtblCall__IIJIJII_1=
+XPCOM__1VtblCall__IIJIJII_2=
+XPCOM__1VtblCall__IIJIJII_3=
+XPCOM__1VtblCall__IIJIJII_4=
+XPCOM__1VtblCall__IIJIJII_5=
+XPCOM__1VtblCall__IIJIJII_6=
+
+XPCOM__1VtblCall__IIJIJJ_3I_3I_3I=
+XPCOM__1VtblCall__IIJIJJ_3I_3I_3I_0=
+XPCOM__1VtblCall__IIJIJJ_3I_3I_3I_1=
+XPCOM__1VtblCall__IIJIJJ_3I_3I_3I_2=
+XPCOM__1VtblCall__IIJIJJ_3I_3I_3I_3=
+XPCOM__1VtblCall__IIJIJJ_3I_3I_3I_4=
+XPCOM__1VtblCall__IIJIJJ_3I_3I_3I_5=
+XPCOM__1VtblCall__IIJIJJ_3I_3I_3I_6=
+XPCOM__1VtblCall__IIJIJJ_3I_3I_3I_7=
+XPCOM__1VtblCall__IIJIJJ_3I_3I_3I_8=
+
+XPCOM__1VtblCall__IIJIJ_3I_3I_3I=
+XPCOM__1VtblCall__IIJIJ_3I_3I_3I_0=
+XPCOM__1VtblCall__IIJIJ_3I_3I_3I_1=
+XPCOM__1VtblCall__IIJIJ_3I_3I_3I_2=
+XPCOM__1VtblCall__IIJIJ_3I_3I_3I_3=
+XPCOM__1VtblCall__IIJIJ_3I_3I_3I_4=
+XPCOM__1VtblCall__IIJIJ_3I_3I_3I_5=
+XPCOM__1VtblCall__IIJIJ_3I_3I_3I_6=
+XPCOM__1VtblCall__IIJIJ_3I_3I_3I_7=
+
+XPCOM__1VtblCall__IIJI_3J=
+XPCOM__1VtblCall__IIJI_3J_0=
+XPCOM__1VtblCall__IIJI_3J_1=
+XPCOM__1VtblCall__IIJI_3J_2=
+XPCOM__1VtblCall__IIJI_3J_3=
+XPCOM__1VtblCall__IIJI_3J_4=
+
+XPCOM__1VtblCall__IIJJ=
+XPCOM__1VtblCall__IIJJ_0=
+XPCOM__1VtblCall__IIJJ_1=
+XPCOM__1VtblCall__IIJJ_2=
+XPCOM__1VtblCall__IIJJ_3=
+
+XPCOM__1VtblCall__IIJJI=
+XPCOM__1VtblCall__IIJJI_0=
+XPCOM__1VtblCall__IIJJI_1=
+XPCOM__1VtblCall__IIJJI_2=
+XPCOM__1VtblCall__IIJJI_3=
+XPCOM__1VtblCall__IIJJI_4=
+
+XPCOM__1VtblCall__IIJJII=
+XPCOM__1VtblCall__IIJJII_0=
+XPCOM__1VtblCall__IIJJII_1=
+XPCOM__1VtblCall__IIJJII_2=
+XPCOM__1VtblCall__IIJJII_3=
+XPCOM__1VtblCall__IIJJII_4=
+XPCOM__1VtblCall__IIJJII_5=
+
+XPCOM__1VtblCall__IIJJIIII=
+XPCOM__1VtblCall__IIJJIIII_0=
+XPCOM__1VtblCall__IIJJIIII_1=
+XPCOM__1VtblCall__IIJJIIII_2=
+XPCOM__1VtblCall__IIJJIIII_3=
+XPCOM__1VtblCall__IIJJIIII_4=
+XPCOM__1VtblCall__IIJJIIII_5=
+XPCOM__1VtblCall__IIJJIIII_6=
+XPCOM__1VtblCall__IIJJIIII_7=
+
+XPCOM__1VtblCall__IIJJIJ_3C_3I_3I=
+XPCOM__1VtblCall__IIJJIJ_3C_3I_3I_0=
+XPCOM__1VtblCall__IIJJIJ_3C_3I_3I_1=
+XPCOM__1VtblCall__IIJJIJ_3C_3I_3I_2=
+XPCOM__1VtblCall__IIJJIJ_3C_3I_3I_3=
+XPCOM__1VtblCall__IIJJIJ_3C_3I_3I_4=
+XPCOM__1VtblCall__IIJJIJ_3C_3I_3I_5=
+XPCOM__1VtblCall__IIJJIJ_3C_3I_3I_6=
+XPCOM__1VtblCall__IIJJIJ_3C_3I_3I_7=
+XPCOM__1VtblCall__IIJJIJ_3C_3I_3I_8=
+
+XPCOM__1VtblCall__IIJJI_3C=
+XPCOM__1VtblCall__IIJJI_3C_0=
+XPCOM__1VtblCall__IIJJI_3C_1=
+XPCOM__1VtblCall__IIJJI_3C_2=
+XPCOM__1VtblCall__IIJJI_3C_3=
+XPCOM__1VtblCall__IIJJI_3C_4=
+XPCOM__1VtblCall__IIJJI_3C_5=
+
+XPCOM__1VtblCall__IIJJI_3I=
+XPCOM__1VtblCall__IIJJI_3I_0=
+XPCOM__1VtblCall__IIJJI_3I_1=
+XPCOM__1VtblCall__IIJJI_3I_2=
+XPCOM__1VtblCall__IIJJI_3I_3=
+XPCOM__1VtblCall__IIJJI_3I_4=
+XPCOM__1VtblCall__IIJJI_3I_5=
+
+XPCOM__1VtblCall__IIJJJ=
+XPCOM__1VtblCall__IIJJJ_0=
+XPCOM__1VtblCall__IIJJJ_1=
+XPCOM__1VtblCall__IIJJJ_2=
+XPCOM__1VtblCall__IIJJJ_3=
+XPCOM__1VtblCall__IIJJJ_4=
+
+XPCOM__1VtblCall__IIJJJI=
+XPCOM__1VtblCall__IIJJJI_0=
+XPCOM__1VtblCall__IIJJJI_1=
+XPCOM__1VtblCall__IIJJJI_2=
+XPCOM__1VtblCall__IIJJJI_3=
+XPCOM__1VtblCall__IIJJJI_4=
+XPCOM__1VtblCall__IIJJJI_5=
+
+XPCOM__1VtblCall__IIJJJI_3CJJIJI_3J_3J=
+XPCOM__1VtblCall__IIJJJI_3CJJIJI_3J_3J_0=
+XPCOM__1VtblCall__IIJJJI_3CJJIJI_3J_3J_1=
+XPCOM__1VtblCall__IIJJJI_3CJJIJI_3J_3J_2=
+XPCOM__1VtblCall__IIJJJI_3CJJIJI_3J_3J_3=
+XPCOM__1VtblCall__IIJJJI_3CJJIJI_3J_3J_4=
+XPCOM__1VtblCall__IIJJJI_3CJJIJI_3J_3J_5=
+XPCOM__1VtblCall__IIJJJI_3CJJIJI_3J_3J_6=
+XPCOM__1VtblCall__IIJJJI_3CJJIJI_3J_3J_7=
+XPCOM__1VtblCall__IIJJJI_3CJJIJI_3J_3J_8=
+XPCOM__1VtblCall__IIJJJI_3CJJIJI_3J_3J_9=
+XPCOM__1VtblCall__IIJJJI_3CJJIJI_3J_3J_10=
+XPCOM__1VtblCall__IIJJJI_3CJJIJI_3J_3J_11=
+XPCOM__1VtblCall__IIJJJI_3CJJIJI_3J_3J_12=
+XPCOM__1VtblCall__IIJJJI_3CJJIJI_3J_3J_13=
+
+XPCOM__1VtblCall__IIJJJI_3C_3BJJIJI_3J_3J=
+XPCOM__1VtblCall__IIJJJI_3C_3BJJIJI_3J_3J_0=
+XPCOM__1VtblCall__IIJJJI_3C_3BJJIJI_3J_3J_1=
+XPCOM__1VtblCall__IIJJJI_3C_3BJJIJI_3J_3J_2=
+XPCOM__1VtblCall__IIJJJI_3C_3BJJIJI_3J_3J_3=
+XPCOM__1VtblCall__IIJJJI_3C_3BJJIJI_3J_3J_4=
+XPCOM__1VtblCall__IIJJJI_3C_3BJJIJI_3J_3J_5=
+XPCOM__1VtblCall__IIJJJI_3C_3BJJIJI_3J_3J_6=
+XPCOM__1VtblCall__IIJJJI_3C_3BJJIJI_3J_3J_7=
+XPCOM__1VtblCall__IIJJJI_3C_3BJJIJI_3J_3J_8=
+XPCOM__1VtblCall__IIJJJI_3C_3BJJIJI_3J_3J_9=
+XPCOM__1VtblCall__IIJJJI_3C_3BJJIJI_3J_3J_10=
+XPCOM__1VtblCall__IIJJJI_3C_3BJJIJI_3J_3J_11=
+XPCOM__1VtblCall__IIJJJI_3C_3BJJIJI_3J_3J_12=
+XPCOM__1VtblCall__IIJJJI_3C_3BJJIJI_3J_3J_13=
+XPCOM__1VtblCall__IIJJJI_3C_3BJJIJI_3J_3J_14=
+
+XPCOM__1VtblCall__IIJJJJIJ_3C_3I_3J=
+XPCOM__1VtblCall__IIJJJJIJ_3C_3I_3J_0=
+XPCOM__1VtblCall__IIJJJJIJ_3C_3I_3J_1=
+XPCOM__1VtblCall__IIJJJJIJ_3C_3I_3J_2=
+XPCOM__1VtblCall__IIJJJJIJ_3C_3I_3J_3=
+XPCOM__1VtblCall__IIJJJJIJ_3C_3I_3J_4=
+XPCOM__1VtblCall__IIJJJJIJ_3C_3I_3J_5=
+XPCOM__1VtblCall__IIJJJJIJ_3C_3I_3J_6=
+XPCOM__1VtblCall__IIJJJJIJ_3C_3I_3J_7=
+XPCOM__1VtblCall__IIJJJJIJ_3C_3I_3J_8=
+XPCOM__1VtblCall__IIJJJJIJ_3C_3I_3J_9=
+XPCOM__1VtblCall__IIJJJJIJ_3C_3I_3J_10=
+
+XPCOM__1VtblCall__IIJJJJJ=
+XPCOM__1VtblCall__IIJJJJJ_0=
+XPCOM__1VtblCall__IIJJJJJ_1=
+XPCOM__1VtblCall__IIJJJJJ_2=
+XPCOM__1VtblCall__IIJJJJJ_3=
+XPCOM__1VtblCall__IIJJJJJ_4=
+XPCOM__1VtblCall__IIJJJJJ_5=
+XPCOM__1VtblCall__IIJJJJJ_6=
+
+XPCOM__1VtblCall__IIJJJJJJ=
+XPCOM__1VtblCall__IIJJJJJJ_0=
+XPCOM__1VtblCall__IIJJJJJJ_1=
+XPCOM__1VtblCall__IIJJJJJJ_2=
+XPCOM__1VtblCall__IIJJJJJJ_3=
+XPCOM__1VtblCall__IIJJJJJJ_4=
+XPCOM__1VtblCall__IIJJJJJJ_5=
+XPCOM__1VtblCall__IIJJJJJJ_6=
+XPCOM__1VtblCall__IIJJJJJJ_7=
+
+XPCOM__1VtblCall__IIJJJJJJJ=
+XPCOM__1VtblCall__IIJJJJJJJ_0=
+XPCOM__1VtblCall__IIJJJJJJJ_1=
+XPCOM__1VtblCall__IIJJJJJJJ_2=
+XPCOM__1VtblCall__IIJJJJJJJ_3=
+XPCOM__1VtblCall__IIJJJJJJJ_4=
+XPCOM__1VtblCall__IIJJJJJJJ_5=
+XPCOM__1VtblCall__IIJJJJJJJ_6=
+XPCOM__1VtblCall__IIJJJJJJJ_7=
+XPCOM__1VtblCall__IIJJJJJJJ_8=
+
+XPCOM__1VtblCall__IIJJJJJ_3J=
+XPCOM__1VtblCall__IIJJJJJ_3J_0=
+XPCOM__1VtblCall__IIJJJJJ_3J_1=
+XPCOM__1VtblCall__IIJJJJJ_3J_2=
+XPCOM__1VtblCall__IIJJJJJ_3J_3=
+XPCOM__1VtblCall__IIJJJJJ_3J_4=
+XPCOM__1VtblCall__IIJJJJJ_3J_5=
+XPCOM__1VtblCall__IIJJJJJ_3J_6=
+XPCOM__1VtblCall__IIJJJJJ_3J_7=
+
+XPCOM__1VtblCall__IIJJJ_3B_3BJ=
+XPCOM__1VtblCall__IIJJJ_3B_3BJ_0=
+XPCOM__1VtblCall__IIJJJ_3B_3BJ_1=
+XPCOM__1VtblCall__IIJJJ_3B_3BJ_2=
+XPCOM__1VtblCall__IIJJJ_3B_3BJ_3=
+XPCOM__1VtblCall__IIJJJ_3B_3BJ_4=
+XPCOM__1VtblCall__IIJJJ_3B_3BJ_5=
+XPCOM__1VtblCall__IIJJJ_3B_3BJ_6=
+XPCOM__1VtblCall__IIJJJ_3B_3BJ_7=
+
+XPCOM__1VtblCall__IIJJJ_3I=
+XPCOM__1VtblCall__IIJJJ_3I_0=
+XPCOM__1VtblCall__IIJJJ_3I_1=
+XPCOM__1VtblCall__IIJJJ_3I_2=
+XPCOM__1VtblCall__IIJJJ_3I_3=
+XPCOM__1VtblCall__IIJJJ_3I_4=
+XPCOM__1VtblCall__IIJJJ_3I_5=
+
+XPCOM__1VtblCall__IIJJJ_3J=
+XPCOM__1VtblCall__IIJJJ_3J_0=
+XPCOM__1VtblCall__IIJJJ_3J_1=
+XPCOM__1VtblCall__IIJJJ_3J_2=
+XPCOM__1VtblCall__IIJJJ_3J_3=
+XPCOM__1VtblCall__IIJJJ_3J_4=
+XPCOM__1VtblCall__IIJJJ_3J_5=
+
+XPCOM__1VtblCall__IIJJ_3B=
+XPCOM__1VtblCall__IIJJ_3B_0=
+XPCOM__1VtblCall__IIJJ_3B_1=
+XPCOM__1VtblCall__IIJJ_3B_2=
+XPCOM__1VtblCall__IIJJ_3B_3=
+XPCOM__1VtblCall__IIJJ_3B_4=
+
+XPCOM__1VtblCall__IIJJ_3BJ=
+XPCOM__1VtblCall__IIJJ_3BJ_0=
+XPCOM__1VtblCall__IIJJ_3BJ_1=
+XPCOM__1VtblCall__IIJJ_3BJ_2=
+XPCOM__1VtblCall__IIJJ_3BJ_3=
+XPCOM__1VtblCall__IIJJ_3BJ_4=
+XPCOM__1VtblCall__IIJJ_3BJ_5=
+
+XPCOM__1VtblCall__IIJJ_3BJI=
+XPCOM__1VtblCall__IIJJ_3BJI_0=
+XPCOM__1VtblCall__IIJJ_3BJI_1=
+XPCOM__1VtblCall__IIJJ_3BJI_2=
+XPCOM__1VtblCall__IIJJ_3BJI_3=
+XPCOM__1VtblCall__IIJJ_3BJI_4=
+XPCOM__1VtblCall__IIJJ_3BJI_5=
+XPCOM__1VtblCall__IIJJ_3BJI_6=
+
+XPCOM__1VtblCall__IIJJ_3B_3B=
+XPCOM__1VtblCall__IIJJ_3B_3B_0=
+XPCOM__1VtblCall__IIJJ_3B_3B_1=
+XPCOM__1VtblCall__IIJJ_3B_3B_2=
+XPCOM__1VtblCall__IIJJ_3B_3B_3=
+XPCOM__1VtblCall__IIJJ_3B_3B_4=
+XPCOM__1VtblCall__IIJJ_3B_3B_5=
+
+XPCOM__1VtblCall__IIJJ_3CIJI=
+XPCOM__1VtblCall__IIJJ_3CIJI_0=
+XPCOM__1VtblCall__IIJJ_3CIJI_1=
+XPCOM__1VtblCall__IIJJ_3CIJI_2=
+XPCOM__1VtblCall__IIJJ_3CIJI_3=
+XPCOM__1VtblCall__IIJJ_3CIJI_4=
+XPCOM__1VtblCall__IIJJ_3CIJI_5=
+XPCOM__1VtblCall__IIJJ_3CIJI_6=
+XPCOM__1VtblCall__IIJJ_3CIJI_7=
+
+XPCOM__1VtblCall__IIJJ_3CJJJ=
+XPCOM__1VtblCall__IIJJ_3CJJJ_0=
+XPCOM__1VtblCall__IIJJ_3CJJJ_1=
+XPCOM__1VtblCall__IIJJ_3CJJJ_2=
+XPCOM__1VtblCall__IIJJ_3CJJJ_3=
+XPCOM__1VtblCall__IIJJ_3CJJJ_4=
+XPCOM__1VtblCall__IIJJ_3CJJJ_5=
+XPCOM__1VtblCall__IIJJ_3CJJJ_6=
+XPCOM__1VtblCall__IIJJ_3CJJJ_7=
+
+XPCOM__1VtblCall__IIJJ_3C_3CI_3J=
+XPCOM__1VtblCall__IIJJ_3C_3CI_3J_0=
+XPCOM__1VtblCall__IIJJ_3C_3CI_3J_1=
+XPCOM__1VtblCall__IIJJ_3C_3CI_3J_2=
+XPCOM__1VtblCall__IIJJ_3C_3CI_3J_3=
+XPCOM__1VtblCall__IIJJ_3C_3CI_3J_4=
+XPCOM__1VtblCall__IIJJ_3C_3CI_3J_5=
+XPCOM__1VtblCall__IIJJ_3C_3CI_3J_6=
+XPCOM__1VtblCall__IIJJ_3C_3CI_3J_7=
+
+XPCOM__1VtblCall__IIJJ_3I=
+XPCOM__1VtblCall__IIJJ_3I_0=
+XPCOM__1VtblCall__IIJJ_3I_1=
+XPCOM__1VtblCall__IIJJ_3I_2=
+XPCOM__1VtblCall__IIJJ_3I_3=
+XPCOM__1VtblCall__IIJJ_3I_4=
+
+XPCOM__1VtblCall__IIJJ_3I_3I=
+XPCOM__1VtblCall__IIJJ_3I_3I_0=
+XPCOM__1VtblCall__IIJJ_3I_3I_1=
+XPCOM__1VtblCall__IIJJ_3I_3I_2=
+XPCOM__1VtblCall__IIJJ_3I_3I_3=
+XPCOM__1VtblCall__IIJJ_3I_3I_4=
+XPCOM__1VtblCall__IIJJ_3I_3I_5=
+
+XPCOM__1VtblCall__IIJJ_3J=
+XPCOM__1VtblCall__IIJJ_3J_0=
+XPCOM__1VtblCall__IIJJ_3J_1=
+XPCOM__1VtblCall__IIJJ_3J_2=
+XPCOM__1VtblCall__IIJJ_3J_3=
+XPCOM__1VtblCall__IIJJ_3J_4=
+
+XPCOM__1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2=
+XPCOM__1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_0=
+XPCOM__1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_1=
+XPCOM__1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_2=
+XPCOM__1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3=
+
+XPCOM__1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2JJ_3J=
+XPCOM__1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2JJ_3J_0=
+XPCOM__1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2JJ_3J_1=
+XPCOM__1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2JJ_3J_2=
+XPCOM__1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2JJ_3J_3=
+XPCOM__1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2JJ_3J_4=
+XPCOM__1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2JJ_3J_5=
+XPCOM__1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2JJ_3J_6=
+
+XPCOM__1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J=
+XPCOM__1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_0=
+XPCOM__1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_1=
+XPCOM__1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_2=
+XPCOM__1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_3=
+XPCOM__1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_4=
+
+XPCOM__1VtblCall__IIJ_3B=
+XPCOM__1VtblCall__IIJ_3B_0=
+XPCOM__1VtblCall__IIJ_3B_1=
+XPCOM__1VtblCall__IIJ_3B_2=
+XPCOM__1VtblCall__IIJ_3B_3=
 
-XPCOM_VtblCall__III_3C_3C_3I_3C_3I_3I=
-XPCOM_VtblCall__III_3C_3C_3I_3C_3I_3I_0=
-XPCOM_VtblCall__III_3C_3C_3I_3C_3I_3I_1=
-XPCOM_VtblCall__III_3C_3C_3I_3C_3I_3I_2=
-XPCOM_VtblCall__III_3C_3C_3I_3C_3I_3I_3=
-XPCOM_VtblCall__III_3C_3C_3I_3C_3I_3I_4=
-XPCOM_VtblCall__III_3C_3C_3I_3C_3I_3I_5=
-XPCOM_VtblCall__III_3C_3C_3I_3C_3I_3I_6=
-XPCOM_VtblCall__III_3C_3C_3I_3C_3I_3I_7=
-XPCOM_VtblCall__III_3C_3C_3I_3C_3I_3I_8=
+XPCOM__1VtblCall__IIJ_3BI=
+XPCOM__1VtblCall__IIJ_3BI_0=
+XPCOM__1VtblCall__IIJ_3BI_1=
+XPCOM__1VtblCall__IIJ_3BI_2=
+XPCOM__1VtblCall__IIJ_3BI_3=
+XPCOM__1VtblCall__IIJ_3BI_4=
 
-XPCOM_VtblCall__III_3C_3C_3I_3I_3C_3I_3I=
-XPCOM_VtblCall__III_3C_3C_3I_3I_3C_3I_3I_0=
-XPCOM_VtblCall__III_3C_3C_3I_3I_3C_3I_3I_1=
-XPCOM_VtblCall__III_3C_3C_3I_3I_3C_3I_3I_2=
-XPCOM_VtblCall__III_3C_3C_3I_3I_3C_3I_3I_3=
-XPCOM_VtblCall__III_3C_3C_3I_3I_3C_3I_3I_4=
-XPCOM_VtblCall__III_3C_3C_3I_3I_3C_3I_3I_5=
-XPCOM_VtblCall__III_3C_3C_3I_3I_3C_3I_3I_6=
-XPCOM_VtblCall__III_3C_3C_3I_3I_3C_3I_3I_7=
-XPCOM_VtblCall__III_3C_3C_3I_3I_3C_3I_3I_8=
-XPCOM_VtblCall__III_3C_3C_3I_3I_3C_3I_3I_9=
+XPCOM__1VtblCall__IIJ_3BJ=
+XPCOM__1VtblCall__IIJ_3BJ_0=
+XPCOM__1VtblCall__IIJ_3BJ_1=
+XPCOM__1VtblCall__IIJ_3BJ_2=
+XPCOM__1VtblCall__IIJ_3BJ_3=
+XPCOM__1VtblCall__IIJ_3BJ_4=
 
-XPCOM_VtblCall__III_3I=
-XPCOM_VtblCall__III_3I_0=
-XPCOM_VtblCall__III_3I_1=
-XPCOM_VtblCall__III_3I_2=
-XPCOM_VtblCall__III_3I_3=
+XPCOM__1VtblCall__IIJ_3BJ_3J=
+XPCOM__1VtblCall__IIJ_3BJ_3J_0=
+XPCOM__1VtblCall__IIJ_3BJ_3J_1=
+XPCOM__1VtblCall__IIJ_3BJ_3J_2=
+XPCOM__1VtblCall__IIJ_3BJ_3J_3=
+XPCOM__1VtblCall__IIJ_3BJ_3J_4=
+XPCOM__1VtblCall__IIJ_3BJ_3J_5=
 
-XPCOM_VtblCall__III_3I_3I_3I_3I=
-XPCOM_VtblCall__III_3I_3I_3I_3I_0=
-XPCOM_VtblCall__III_3I_3I_3I_3I_1=
-XPCOM_VtblCall__III_3I_3I_3I_3I_2=
-XPCOM_VtblCall__III_3I_3I_3I_3I_3=
-XPCOM_VtblCall__III_3I_3I_3I_3I_4=
-XPCOM_VtblCall__III_3I_3I_3I_3I_5=
-XPCOM_VtblCall__III_3I_3I_3I_3I_6=
+XPCOM__1VtblCall__IIJ_3BS=
+XPCOM__1VtblCall__IIJ_3BS_0=
+XPCOM__1VtblCall__IIJ_3BS_1=
+XPCOM__1VtblCall__IIJ_3BS_2=
+XPCOM__1VtblCall__IIJ_3BS_3=
+XPCOM__1VtblCall__IIJ_3BS_4=
 
-XPCOM_VtblCall__IIJ=
-XPCOM_VtblCall__IIJ_0=
-XPCOM_VtblCall__IIJ_1=
-XPCOM_VtblCall__IIJ_2=
+XPCOM__1VtblCall__IIJ_3B_3B_3BJ_3J=
+XPCOM__1VtblCall__IIJ_3B_3B_3BJ_3J_0=
+XPCOM__1VtblCall__IIJ_3B_3B_3BJ_3J_1=
+XPCOM__1VtblCall__IIJ_3B_3B_3BJ_3J_2=
+XPCOM__1VtblCall__IIJ_3B_3B_3BJ_3J_3=
+XPCOM__1VtblCall__IIJ_3B_3B_3BJ_3J_4=
+XPCOM__1VtblCall__IIJ_3B_3B_3BJ_3J_5=
+XPCOM__1VtblCall__IIJ_3B_3B_3BJ_3J_6=
+XPCOM__1VtblCall__IIJ_3B_3B_3BJ_3J_7=
 
-XPCOM_VtblCall__IIJI=
-XPCOM_VtblCall__IIJI_0=
-XPCOM_VtblCall__IIJI_1=
-XPCOM_VtblCall__IIJI_2=
-XPCOM_VtblCall__IIJI_3=
+XPCOM__1VtblCall__IIJ_3B_3C=
+XPCOM__1VtblCall__IIJ_3B_3C_0=
+XPCOM__1VtblCall__IIJ_3B_3C_1=
+XPCOM__1VtblCall__IIJ_3B_3C_2=
+XPCOM__1VtblCall__IIJ_3B_3C_3=
+XPCOM__1VtblCall__IIJ_3B_3C_4=
 
-XPCOM_VtblCall__IIJIIJIIIIII=
-XPCOM_VtblCall__IIJIIJIIIIII_0=
-XPCOM_VtblCall__IIJIIJIIIIII_1=
-XPCOM_VtblCall__IIJIIJIIIIII_2=
-XPCOM_VtblCall__IIJIIJIIIIII_3=
-XPCOM_VtblCall__IIJIIJIIIIII_4=
-XPCOM_VtblCall__IIJIIJIIIIII_5=
-XPCOM_VtblCall__IIJIIJIIIIII_6=
-XPCOM_VtblCall__IIJIIJIIIIII_7=
-XPCOM_VtblCall__IIJIIJIIIIII_8=
-XPCOM_VtblCall__IIJIIJIIIIII_9=
-XPCOM_VtblCall__IIJIIJIIIIII_10=
-XPCOM_VtblCall__IIJIIJIIIIII_11=
+XPCOM__1VtblCall__IIJ_3CI=
+XPCOM__1VtblCall__IIJ_3CI_0=
+XPCOM__1VtblCall__IIJ_3CI_1=
+XPCOM__1VtblCall__IIJ_3CI_2=
+XPCOM__1VtblCall__IIJ_3CI_3=
+XPCOM__1VtblCall__IIJ_3CI_4=
 
-XPCOM_VtblCall__IIJIIJIIIIIIIIISJ=
-XPCOM_VtblCall__IIJIIJIIIIIIIIISJ_0=
-XPCOM_VtblCall__IIJIIJIIIIIIIIISJ_1=
-XPCOM_VtblCall__IIJIIJIIIIIIIIISJ_2=
-XPCOM_VtblCall__IIJIIJIIIIIIIIISJ_3=
-XPCOM_VtblCall__IIJIIJIIIIIIIIISJ_4=
-XPCOM_VtblCall__IIJIIJIIIIIIIIISJ_5=
-XPCOM_VtblCall__IIJIIJIIIIIIIIISJ_6=
-XPCOM_VtblCall__IIJIIJIIIIIIIIISJ_7=
-XPCOM_VtblCall__IIJIIJIIIIIIIIISJ_8=
-XPCOM_VtblCall__IIJIIJIIIIIIIIISJ_9=
-XPCOM_VtblCall__IIJIIJIIIIIIIIISJ_10=
-XPCOM_VtblCall__IIJIIJIIIIIIIIISJ_11=
-XPCOM_VtblCall__IIJIIJIIIIIIIIISJ_12=
-XPCOM_VtblCall__IIJIIJIIIIIIIIISJ_13=
-XPCOM_VtblCall__IIJIIJIIIIIIIIISJ_14=
-XPCOM_VtblCall__IIJIIJIIIIIIIIISJ_15=
-XPCOM_VtblCall__IIJIIJIIIIIIIIISJ_16=
+XPCOM__1VtblCall__IIJ_3C_3C=
+XPCOM__1VtblCall__IIJ_3C_3C_0=
+XPCOM__1VtblCall__IIJ_3C_3C_1=
+XPCOM__1VtblCall__IIJ_3C_3C_2=
+XPCOM__1VtblCall__IIJ_3C_3C_3=
+XPCOM__1VtblCall__IIJ_3C_3C_4=
 
-XPCOM_VtblCall__IIJIIJ_3I_3J=
-XPCOM_VtblCall__IIJIIJ_3I_3J_0=
-XPCOM_VtblCall__IIJIIJ_3I_3J_1=
-XPCOM_VtblCall__IIJIIJ_3I_3J_2=
-XPCOM_VtblCall__IIJIIJ_3I_3J_3=
-XPCOM_VtblCall__IIJIIJ_3I_3J_4=
-XPCOM_VtblCall__IIJIIJ_3I_3J_5=
-XPCOM_VtblCall__IIJIIJ_3I_3J_6=
-XPCOM_VtblCall__IIJIIJ_3I_3J_7=
+XPCOM__1VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I=
+XPCOM__1VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I_0=
+XPCOM__1VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I_1=
+XPCOM__1VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I_2=
+XPCOM__1VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I_3=
+XPCOM__1VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I_4=
+XPCOM__1VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I_5=
+XPCOM__1VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I_6=
+XPCOM__1VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I_7=
+XPCOM__1VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I_8=
+XPCOM__1VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I_9=
+XPCOM__1VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I_10=
+XPCOM__1VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I_11=
 
-XPCOM_VtblCall__IIJI_3J=
-XPCOM_VtblCall__IIJI_3J_0=
-XPCOM_VtblCall__IIJI_3J_1=
-XPCOM_VtblCall__IIJI_3J_2=
-XPCOM_VtblCall__IIJI_3J_3=
-XPCOM_VtblCall__IIJI_3J_4=
+XPCOM__1VtblCall__IIJ_3C_3CI_3J_3I_3I=
+XPCOM__1VtblCall__IIJ_3C_3CI_3J_3I_3I_0=
+XPCOM__1VtblCall__IIJ_3C_3CI_3J_3I_3I_1=
+XPCOM__1VtblCall__IIJ_3C_3CI_3J_3I_3I_2=
+XPCOM__1VtblCall__IIJ_3C_3CI_3J_3I_3I_3=
+XPCOM__1VtblCall__IIJ_3C_3CI_3J_3I_3I_4=
+XPCOM__1VtblCall__IIJ_3C_3CI_3J_3I_3I_5=
+XPCOM__1VtblCall__IIJ_3C_3CI_3J_3I_3I_6=
+XPCOM__1VtblCall__IIJ_3C_3CI_3J_3I_3I_7=
+XPCOM__1VtblCall__IIJ_3C_3CI_3J_3I_3I_8=
 
-XPCOM_VtblCall__IIJJ=
-XPCOM_VtblCall__IIJJ_0=
-XPCOM_VtblCall__IIJJ_1=
-XPCOM_VtblCall__IIJJ_2=
-XPCOM_VtblCall__IIJJ_3=
+XPCOM__1VtblCall__IIJ_3C_3C_3C_3I=
+XPCOM__1VtblCall__IIJ_3C_3C_3C_3I_0=
+XPCOM__1VtblCall__IIJ_3C_3C_3C_3I_1=
+XPCOM__1VtblCall__IIJ_3C_3C_3C_3I_2=
+XPCOM__1VtblCall__IIJ_3C_3C_3C_3I_3=
+XPCOM__1VtblCall__IIJ_3C_3C_3C_3I_4=
+XPCOM__1VtblCall__IIJ_3C_3C_3C_3I_5=
+XPCOM__1VtblCall__IIJ_3C_3C_3C_3I_6=
 
-XPCOM_VtblCall__IIJJI=
-XPCOM_VtblCall__IIJJI_0=
-XPCOM_VtblCall__IIJJI_1=
-XPCOM_VtblCall__IIJJI_2=
-XPCOM_VtblCall__IIJJI_3=
-XPCOM_VtblCall__IIJJI_4=
+XPCOM__1VtblCall__IIJ_3C_3C_3C_3I_3I=
+XPCOM__1VtblCall__IIJ_3C_3C_3C_3I_3I_0=
+XPCOM__1VtblCall__IIJ_3C_3C_3C_3I_3I_1=
+XPCOM__1VtblCall__IIJ_3C_3C_3C_3I_3I_2=
+XPCOM__1VtblCall__IIJ_3C_3C_3C_3I_3I_3=
+XPCOM__1VtblCall__IIJ_3C_3C_3C_3I_3I_4=
+XPCOM__1VtblCall__IIJ_3C_3C_3C_3I_3I_5=
+XPCOM__1VtblCall__IIJ_3C_3C_3C_3I_3I_6=
+XPCOM__1VtblCall__IIJ_3C_3C_3C_3I_3I_7=
 
-XPCOM_VtblCall__IIJJII=
-XPCOM_VtblCall__IIJJII_0=
-XPCOM_VtblCall__IIJJII_1=
-XPCOM_VtblCall__IIJJII_2=
-XPCOM_VtblCall__IIJJII_3=
-XPCOM_VtblCall__IIJJII_4=
-XPCOM_VtblCall__IIJJII_5=
+XPCOM__1VtblCall__IIJ_3C_3C_3I=
+XPCOM__1VtblCall__IIJ_3C_3C_3I_0=
+XPCOM__1VtblCall__IIJ_3C_3C_3I_1=
+XPCOM__1VtblCall__IIJ_3C_3C_3I_2=
+XPCOM__1VtblCall__IIJ_3C_3C_3I_3=
+XPCOM__1VtblCall__IIJ_3C_3C_3I_4=
+XPCOM__1VtblCall__IIJ_3C_3C_3I_5=
 
-XPCOM_VtblCall__IIJJIIII=
-XPCOM_VtblCall__IIJJIIII_0=
-XPCOM_VtblCall__IIJJIIII_1=
-XPCOM_VtblCall__IIJJIIII_2=
-XPCOM_VtblCall__IIJJIIII_3=
-XPCOM_VtblCall__IIJJIIII_4=
-XPCOM_VtblCall__IIJJIIII_5=
-XPCOM_VtblCall__IIJJIIII_6=
-XPCOM_VtblCall__IIJJIIII_7=
+XPCOM__1VtblCall__IIJ_3C_3C_3J=
+XPCOM__1VtblCall__IIJ_3C_3C_3J_0=
+XPCOM__1VtblCall__IIJ_3C_3C_3J_1=
+XPCOM__1VtblCall__IIJ_3C_3C_3J_2=
+XPCOM__1VtblCall__IIJ_3C_3C_3J_3=
+XPCOM__1VtblCall__IIJ_3C_3C_3J_4=
+XPCOM__1VtblCall__IIJ_3C_3C_3J_5=
 
-XPCOM_VtblCall__IIJJIJ_3C_3I_3I=
-XPCOM_VtblCall__IIJJIJ_3C_3I_3I_0=
-XPCOM_VtblCall__IIJJIJ_3C_3I_3I_1=
-XPCOM_VtblCall__IIJJIJ_3C_3I_3I_2=
-XPCOM_VtblCall__IIJJIJ_3C_3I_3I_3=
-XPCOM_VtblCall__IIJJIJ_3C_3I_3I_4=
-XPCOM_VtblCall__IIJJIJ_3C_3I_3I_5=
-XPCOM_VtblCall__IIJJIJ_3C_3I_3I_6=
-XPCOM_VtblCall__IIJJIJ_3C_3I_3I_7=
-XPCOM_VtblCall__IIJJIJ_3C_3I_3I_8=
+XPCOM__1VtblCall__IIJ_3C_3C_3J_3C_3I_3I=
+XPCOM__1VtblCall__IIJ_3C_3C_3J_3C_3I_3I_0=
+XPCOM__1VtblCall__IIJ_3C_3C_3J_3C_3I_3I_1=
+XPCOM__1VtblCall__IIJ_3C_3C_3J_3C_3I_3I_2=
+XPCOM__1VtblCall__IIJ_3C_3C_3J_3C_3I_3I_3=
+XPCOM__1VtblCall__IIJ_3C_3C_3J_3C_3I_3I_4=
+XPCOM__1VtblCall__IIJ_3C_3C_3J_3C_3I_3I_5=
+XPCOM__1VtblCall__IIJ_3C_3C_3J_3C_3I_3I_6=
+XPCOM__1VtblCall__IIJ_3C_3C_3J_3C_3I_3I_7=
+XPCOM__1VtblCall__IIJ_3C_3C_3J_3C_3I_3I_8=
 
-XPCOM_VtblCall__IIJJI_3C=
-XPCOM_VtblCall__IIJJI_3C_0=
-XPCOM_VtblCall__IIJJI_3C_1=
-XPCOM_VtblCall__IIJJI_3C_2=
-XPCOM_VtblCall__IIJJI_3C_3=
-XPCOM_VtblCall__IIJJI_3C_4=
-XPCOM_VtblCall__IIJJI_3C_5=
+XPCOM__1VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I=
+XPCOM__1VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I_0=
+XPCOM__1VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I_1=
+XPCOM__1VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I_2=
+XPCOM__1VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I_3=
+XPCOM__1VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I_4=
+XPCOM__1VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I_5=
+XPCOM__1VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I_6=
+XPCOM__1VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I_7=
+XPCOM__1VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I_8=
+XPCOM__1VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I_9=
 
-XPCOM_VtblCall__IIJJI_3I=
-XPCOM_VtblCall__IIJJI_3I_0=
-XPCOM_VtblCall__IIJJI_3I_1=
-XPCOM_VtblCall__IIJJI_3I_2=
-XPCOM_VtblCall__IIJJI_3I_3=
-XPCOM_VtblCall__IIJJI_3I_4=
-XPCOM_VtblCall__IIJJI_3I_5=
+XPCOM__1VtblCall__IIJ_3C_3J=
+XPCOM__1VtblCall__IIJ_3C_3J_0=
+XPCOM__1VtblCall__IIJ_3C_3J_1=
+XPCOM__1VtblCall__IIJ_3C_3J_2=
+XPCOM__1VtblCall__IIJ_3C_3J_3=
+XPCOM__1VtblCall__IIJ_3C_3J_4=
 
-XPCOM_VtblCall__IIJJJ=
-XPCOM_VtblCall__IIJJJ_0=
-XPCOM_VtblCall__IIJJJ_1=
-XPCOM_VtblCall__IIJJJ_2=
-XPCOM_VtblCall__IIJJJ_3=
-XPCOM_VtblCall__IIJJJ_4=
+XPCOM__1VtblCall__IIJ_3I=
+XPCOM__1VtblCall__IIJ_3I_0=
+XPCOM__1VtblCall__IIJ_3I_1=
+XPCOM__1VtblCall__IIJ_3I_2=
+XPCOM__1VtblCall__IIJ_3I_3=
 
-XPCOM_VtblCall__IIJJJI=
-XPCOM_VtblCall__IIJJJI_0=
-XPCOM_VtblCall__IIJJJI_1=
-XPCOM_VtblCall__IIJJJI_2=
-XPCOM_VtblCall__IIJJJI_3=
-XPCOM_VtblCall__IIJJJI_4=
-XPCOM_VtblCall__IIJJJI_5=
+XPCOM__1VtblCall__IIJ_3J=
+XPCOM__1VtblCall__IIJ_3J_0=
+XPCOM__1VtblCall__IIJ_3J_1=
+XPCOM__1VtblCall__IIJ_3J_2=
+XPCOM__1VtblCall__IIJ_3J_3=
 
-XPCOM_VtblCall__IIJJJI_3CJJIJI_3J_3J=
-XPCOM_VtblCall__IIJJJI_3CJJIJI_3J_3J_0=
-XPCOM_VtblCall__IIJJJI_3CJJIJI_3J_3J_1=
-XPCOM_VtblCall__IIJJJI_3CJJIJI_3J_3J_2=
-XPCOM_VtblCall__IIJJJI_3CJJIJI_3J_3J_3=
-XPCOM_VtblCall__IIJJJI_3CJJIJI_3J_3J_4=
-XPCOM_VtblCall__IIJJJI_3CJJIJI_3J_3J_5=
-XPCOM_VtblCall__IIJJJI_3CJJIJI_3J_3J_6=
-XPCOM_VtblCall__IIJJJI_3CJJIJI_3J_3J_7=
-XPCOM_VtblCall__IIJJJI_3CJJIJI_3J_3J_8=
-XPCOM_VtblCall__IIJJJI_3CJJIJI_3J_3J_9=
-XPCOM_VtblCall__IIJJJI_3CJJIJI_3J_3J_10=
-XPCOM_VtblCall__IIJJJI_3CJJIJI_3J_3J_11=
-XPCOM_VtblCall__IIJJJI_3CJJIJI_3J_3J_12=
-XPCOM_VtblCall__IIJJJI_3CJJIJI_3J_3J_13=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I_0=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I_1=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I_2=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I_3=
 
-XPCOM_VtblCall__IIJJJI_3C_3BJJIJI_3J_3J=
-XPCOM_VtblCall__IIJJJI_3C_3BJJIJI_3J_3J_0=
-XPCOM_VtblCall__IIJJJI_3C_3BJJIJI_3J_3J_1=
-XPCOM_VtblCall__IIJJJI_3C_3BJJIJI_3J_3J_2=
-XPCOM_VtblCall__IIJJJI_3C_3BJJIJI_3J_3J_3=
-XPCOM_VtblCall__IIJJJI_3C_3BJJIJI_3J_3J_4=
-XPCOM_VtblCall__IIJJJI_3C_3BJJIJI_3J_3J_5=
-XPCOM_VtblCall__IIJJJI_3C_3BJJIJI_3J_3J_6=
-XPCOM_VtblCall__IIJJJI_3C_3BJJIJI_3J_3J_7=
-XPCOM_VtblCall__IIJJJI_3C_3BJJIJI_3J_3J_8=
-XPCOM_VtblCall__IIJJJI_3C_3BJJIJI_3J_3J_9=
-XPCOM_VtblCall__IIJJJI_3C_3BJJIJI_3J_3J_10=
-XPCOM_VtblCall__IIJJJI_3C_3BJJIJI_3J_3J_11=
-XPCOM_VtblCall__IIJJJI_3C_3BJJIJI_3J_3J_12=
-XPCOM_VtblCall__IIJJJI_3C_3BJJIJI_3J_3J_13=
-XPCOM_VtblCall__IIJJJI_3C_3BJJIJI_3J_3J_14=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_0=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_1=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_2=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_3=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_4=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_5=
 
-XPCOM_VtblCall__IIJJJJIJ_3C_3I_3J=
-XPCOM_VtblCall__IIJJJJIJ_3C_3I_3J_0=
-XPCOM_VtblCall__IIJJJJIJ_3C_3I_3J_1=
-XPCOM_VtblCall__IIJJJJIJ_3C_3I_3J_2=
-XPCOM_VtblCall__IIJJJJIJ_3C_3I_3J_3=
-XPCOM_VtblCall__IIJJJJIJ_3C_3I_3J_4=
-XPCOM_VtblCall__IIJJJJIJ_3C_3I_3J_5=
-XPCOM_VtblCall__IIJJJJIJ_3C_3I_3J_6=
-XPCOM_VtblCall__IIJJJJIJ_3C_3I_3J_7=
-XPCOM_VtblCall__IIJJJJIJ_3C_3I_3J_8=
-XPCOM_VtblCall__IIJJJJIJ_3C_3I_3J_9=
-XPCOM_VtblCall__IIJJJJIJ_3C_3I_3J_10=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J_0=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J_1=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J_2=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J_3=
 
-XPCOM_VtblCall__IIJJJJJ=
-XPCOM_VtblCall__IIJJJJJ_0=
-XPCOM_VtblCall__IIJJJJJ_1=
-XPCOM_VtblCall__IIJJJJJ_2=
-XPCOM_VtblCall__IIJJJJJ_3=
-XPCOM_VtblCall__IIJJJJJ_4=
-XPCOM_VtblCall__IIJJJJJ_5=
-XPCOM_VtblCall__IIJJJJJ_6=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J_0=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J_1=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J_2=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J_3=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J_4=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J_5=
 
-XPCOM_VtblCall__IIJJJJJJ=
-XPCOM_VtblCall__IIJJJJJJ_0=
-XPCOM_VtblCall__IIJJJJJJ_1=
-XPCOM_VtblCall__IIJJJJJJ_2=
-XPCOM_VtblCall__IIJJJJJJ_3=
-XPCOM_VtblCall__IIJJJJJJ_4=
-XPCOM_VtblCall__IIJJJJJJ_5=
-XPCOM_VtblCall__IIJJJJJJ_6=
-XPCOM_VtblCall__IIJJJJJJ_7=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I_0=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I_1=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I_2=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I_3=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I_4=
 
-XPCOM_VtblCall__IIJJJJJJJ=
-XPCOM_VtblCall__IIJJJJJJJ_0=
-XPCOM_VtblCall__IIJJJJJJJ_1=
-XPCOM_VtblCall__IIJJJJJJJ_2=
-XPCOM_VtblCall__IIJJJJJJJ_3=
-XPCOM_VtblCall__IIJJJJJJJ_4=
-XPCOM_VtblCall__IIJJJJJJJ_5=
-XPCOM_VtblCall__IIJJJJJJJ_6=
-XPCOM_VtblCall__IIJJJJJJJ_7=
-XPCOM_VtblCall__IIJJJJJJJ_8=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J_0=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J_1=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J_2=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J_3=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J_4=
 
-XPCOM_VtblCall__IIJJ_3B=
-XPCOM_VtblCall__IIJJ_3B_0=
-XPCOM_VtblCall__IIJJ_3B_1=
-XPCOM_VtblCall__IIJJ_3B_2=
-XPCOM_VtblCall__IIJJ_3B_3=
-XPCOM_VtblCall__IIJJ_3B_4=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_0=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_1=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_2=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_4=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_5=
 
-XPCOM_VtblCall__IIJJ_3CIJI=
-XPCOM_VtblCall__IIJJ_3CIJI_0=
-XPCOM_VtblCall__IIJJ_3CIJI_1=
-XPCOM_VtblCall__IIJJ_3CIJI_2=
-XPCOM_VtblCall__IIJJ_3CIJI_3=
-XPCOM_VtblCall__IIJJ_3CIJI_4=
-XPCOM_VtblCall__IIJJ_3CIJI_5=
-XPCOM_VtblCall__IIJJ_3CIJI_6=
-XPCOM_VtblCall__IIJJ_3CIJI_7=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_0=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_1=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_2=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_3=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_4=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_5=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_6=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_7=
 
-XPCOM_VtblCall__IIJJ_3CJJJ=
-XPCOM_VtblCall__IIJJ_3CJJJ_0=
-XPCOM_VtblCall__IIJJ_3CJJJ_1=
-XPCOM_VtblCall__IIJJ_3CJJJ_2=
-XPCOM_VtblCall__IIJJ_3CJJJ_3=
-XPCOM_VtblCall__IIJJ_3CJJJ_4=
-XPCOM_VtblCall__IIJJ_3CJJJ_5=
-XPCOM_VtblCall__IIJJ_3CJJJ_6=
-XPCOM_VtblCall__IIJJ_3CJJJ_7=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_0=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_1=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_2=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_4=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_5=
 
-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__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B_0=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B_1=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B_2=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B_3=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B_4=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B_5=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B_6=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B_7=
 
-XPCOM_VtblCall__IIJJ_3I=
-XPCOM_VtblCall__IIJJ_3I_0=
-XPCOM_VtblCall__IIJJ_3I_1=
-XPCOM_VtblCall__IIJJ_3I_2=
-XPCOM_VtblCall__IIJJ_3I_3=
-XPCOM_VtblCall__IIJJ_3I_4=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I_0=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I_1=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I_2=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I_3=
 
-XPCOM_VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2=
-XPCOM_VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_0=
-XPCOM_VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_1=
-XPCOM_VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_2=
-XPCOM_VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J_0=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J_1=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J_2=
+XPCOM__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J_3=
 
-XPCOM_VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J=
-XPCOM_VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_0=
-XPCOM_VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_1=
-XPCOM_VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_2=
-XPCOM_VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_3=
-XPCOM_VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_4=
+XPCOM__1VtblCall__IISIII=
+XPCOM__1VtblCall__IISIII_0=
+XPCOM__1VtblCall__IISIII_1=
+XPCOM__1VtblCall__IISIII_2=
+XPCOM__1VtblCall__IISIII_3=
+XPCOM__1VtblCall__IISIII_4=
+XPCOM__1VtblCall__IISIII_5=
 
-XPCOM_VtblCall__IIJ_3B=
-XPCOM_VtblCall__IIJ_3B_0=
-XPCOM_VtblCall__IIJ_3B_1=
-XPCOM_VtblCall__IIJ_3B_2=
-XPCOM_VtblCall__IIJ_3B_3=
+XPCOM__1VtblCall__IISJIJ=
+XPCOM__1VtblCall__IISJIJ_0=
+XPCOM__1VtblCall__IISJIJ_1=
+XPCOM__1VtblCall__IISJIJ_2=
+XPCOM__1VtblCall__IISJIJ_3=
+XPCOM__1VtblCall__IISJIJ_4=
+XPCOM__1VtblCall__IISJIJ_5=
 
-XPCOM_VtblCall__IIJ_3BI=
-XPCOM_VtblCall__IIJ_3BI_0=
-XPCOM_VtblCall__IIJ_3BI_1=
-XPCOM_VtblCall__IIJ_3BI_2=
-XPCOM_VtblCall__IIJ_3BI_3=
-XPCOM_VtblCall__IIJ_3BI_4=
+XPCOM__1VtblCall__II_3B=
+XPCOM__1VtblCall__II_3B_0=
+XPCOM__1VtblCall__II_3B_1=
+XPCOM__1VtblCall__II_3B_2=
 
-XPCOM_VtblCall__IIJ_3BJ_3J=
-XPCOM_VtblCall__IIJ_3BJ_3J_0=
-XPCOM_VtblCall__IIJ_3BJ_3J_1=
-XPCOM_VtblCall__IIJ_3BJ_3J_2=
-XPCOM_VtblCall__IIJ_3BJ_3J_3=
-XPCOM_VtblCall__IIJ_3BJ_3J_4=
-XPCOM_VtblCall__IIJ_3BJ_3J_5=
+XPCOM__1VtblCall__II_3BI=
+XPCOM__1VtblCall__II_3BI_0=
+XPCOM__1VtblCall__II_3BI_1=
+XPCOM__1VtblCall__II_3BI_2=
+XPCOM__1VtblCall__II_3BI_3=
 
-XPCOM_VtblCall__IIJ_3B_3B_3BJ_3J=
-XPCOM_VtblCall__IIJ_3B_3B_3BJ_3J_0=
-XPCOM_VtblCall__IIJ_3B_3B_3BJ_3J_1=
-XPCOM_VtblCall__IIJ_3B_3B_3BJ_3J_2=
-XPCOM_VtblCall__IIJ_3B_3B_3BJ_3J_3=
-XPCOM_VtblCall__IIJ_3B_3B_3BJ_3J_4=
-XPCOM_VtblCall__IIJ_3B_3B_3BJ_3J_5=
-XPCOM_VtblCall__IIJ_3B_3B_3BJ_3J_6=
-XPCOM_VtblCall__IIJ_3B_3B_3BJ_3J_7=
+XPCOM__1VtblCall__II_3BII_3I_3I=
+XPCOM__1VtblCall__II_3BII_3I_3I_0=
+XPCOM__1VtblCall__II_3BII_3I_3I_1=
+XPCOM__1VtblCall__II_3BII_3I_3I_2=
+XPCOM__1VtblCall__II_3BII_3I_3I_3=
+XPCOM__1VtblCall__II_3BII_3I_3I_4=
+XPCOM__1VtblCall__II_3BII_3I_3I_5=
+XPCOM__1VtblCall__II_3BII_3I_3I_6=
 
-XPCOM_VtblCall__IIJ_3B_3C=
-XPCOM_VtblCall__IIJ_3B_3C_0=
-XPCOM_VtblCall__IIJ_3B_3C_1=
-XPCOM_VtblCall__IIJ_3B_3C_2=
-XPCOM_VtblCall__IIJ_3B_3C_3=
-XPCOM_VtblCall__IIJ_3B_3C_4=
+XPCOM__1VtblCall__II_3BIJ_3J_3I=
+XPCOM__1VtblCall__II_3BIJ_3J_3I_0=
+XPCOM__1VtblCall__II_3BIJ_3J_3I_1=
+XPCOM__1VtblCall__II_3BIJ_3J_3I_2=
+XPCOM__1VtblCall__II_3BIJ_3J_3I_3=
+XPCOM__1VtblCall__II_3BIJ_3J_3I_4=
+XPCOM__1VtblCall__II_3BIJ_3J_3I_5=
+XPCOM__1VtblCall__II_3BIJ_3J_3I_6=
 
-XPCOM_VtblCall__IIJ_3CI=
-XPCOM_VtblCall__IIJ_3CI_0=
-XPCOM_VtblCall__IIJ_3CI_1=
-XPCOM_VtblCall__IIJ_3CI_2=
-XPCOM_VtblCall__IIJ_3CI_3=
-XPCOM_VtblCall__IIJ_3CI_4=
+XPCOM__1VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I=
+XPCOM__1VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_0=
+XPCOM__1VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_1=
+XPCOM__1VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_2=
+XPCOM__1VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_3=
+XPCOM__1VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_4=
+XPCOM__1VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_5=
 
-XPCOM_VtblCall__IIJ_3C_3C=
-XPCOM_VtblCall__IIJ_3C_3C_0=
-XPCOM_VtblCall__IIJ_3C_3C_1=
-XPCOM_VtblCall__IIJ_3C_3C_2=
-XPCOM_VtblCall__IIJ_3C_3C_3=
-XPCOM_VtblCall__IIJ_3C_3C_4=
+XPCOM__1VtblCall__II_3BI_3I=
+XPCOM__1VtblCall__II_3BI_3I_0=
+XPCOM__1VtblCall__II_3BI_3I_1=
+XPCOM__1VtblCall__II_3BI_3I_2=
+XPCOM__1VtblCall__II_3BI_3I_3=
+XPCOM__1VtblCall__II_3BI_3I_4=
 
-XPCOM_VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I=
-XPCOM_VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I_0=
-XPCOM_VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I_1=
-XPCOM_VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I_2=
-XPCOM_VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I_3=
-XPCOM_VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I_4=
-XPCOM_VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I_5=
-XPCOM_VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I_6=
-XPCOM_VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I_7=
-XPCOM_VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I_8=
-XPCOM_VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I_9=
-XPCOM_VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I_10=
-XPCOM_VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I_11=
+XPCOM__1VtblCall__II_3BI_3I_3I=
+XPCOM__1VtblCall__II_3BI_3I_3I_0=
+XPCOM__1VtblCall__II_3BI_3I_3I_1=
+XPCOM__1VtblCall__II_3BI_3I_3I_2=
+XPCOM__1VtblCall__II_3BI_3I_3I_3=
+XPCOM__1VtblCall__II_3BI_3I_3I_4=
+XPCOM__1VtblCall__II_3BI_3I_3I_5=
 
-XPCOM_VtblCall__IIJ_3C_3CI_3J_3I_3I=
-XPCOM_VtblCall__IIJ_3C_3CI_3J_3I_3I_0=
-XPCOM_VtblCall__IIJ_3C_3CI_3J_3I_3I_1=
-XPCOM_VtblCall__IIJ_3C_3CI_3J_3I_3I_2=
-XPCOM_VtblCall__IIJ_3C_3CI_3J_3I_3I_3=
-XPCOM_VtblCall__IIJ_3C_3CI_3J_3I_3I_4=
-XPCOM_VtblCall__IIJ_3C_3CI_3J_3I_3I_5=
-XPCOM_VtblCall__IIJ_3C_3CI_3J_3I_3I_6=
-XPCOM_VtblCall__IIJ_3C_3CI_3J_3I_3I_7=
-XPCOM_VtblCall__IIJ_3C_3CI_3J_3I_3I_8=
+XPCOM__1VtblCall__II_3BI_3J_3I=
+XPCOM__1VtblCall__II_3BI_3J_3I_0=
+XPCOM__1VtblCall__II_3BI_3J_3I_1=
+XPCOM__1VtblCall__II_3BI_3J_3I_2=
+XPCOM__1VtblCall__II_3BI_3J_3I_3=
+XPCOM__1VtblCall__II_3BI_3J_3I_4=
+XPCOM__1VtblCall__II_3BI_3J_3I_5=
 
-XPCOM_VtblCall__IIJ_3C_3C_3C_3I=
-XPCOM_VtblCall__IIJ_3C_3C_3C_3I_0=
-XPCOM_VtblCall__IIJ_3C_3C_3C_3I_1=
-XPCOM_VtblCall__IIJ_3C_3C_3C_3I_2=
-XPCOM_VtblCall__IIJ_3C_3C_3C_3I_3=
-XPCOM_VtblCall__IIJ_3C_3C_3C_3I_4=
-XPCOM_VtblCall__IIJ_3C_3C_3C_3I_5=
-XPCOM_VtblCall__IIJ_3C_3C_3C_3I_6=
+XPCOM__1VtblCall__II_3BJ=
+XPCOM__1VtblCall__II_3BJ_0=
+XPCOM__1VtblCall__II_3BJ_1=
+XPCOM__1VtblCall__II_3BJ_2=
+XPCOM__1VtblCall__II_3BJ_3=
 
-XPCOM_VtblCall__IIJ_3C_3C_3C_3I_3I=
-XPCOM_VtblCall__IIJ_3C_3C_3C_3I_3I_0=
-XPCOM_VtblCall__IIJ_3C_3C_3C_3I_3I_1=
-XPCOM_VtblCall__IIJ_3C_3C_3C_3I_3I_2=
-XPCOM_VtblCall__IIJ_3C_3C_3C_3I_3I_3=
-XPCOM_VtblCall__IIJ_3C_3C_3C_3I_3I_4=
-XPCOM_VtblCall__IIJ_3C_3C_3C_3I_3I_5=
-XPCOM_VtblCall__IIJ_3C_3C_3C_3I_3I_6=
-XPCOM_VtblCall__IIJ_3C_3C_3C_3I_3I_7=
+XPCOM__1VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J=
+XPCOM__1VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_0=
+XPCOM__1VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_1=
+XPCOM__1VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_2=
+XPCOM__1VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_3=
+XPCOM__1VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_4=
+XPCOM__1VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_5=
 
-XPCOM_VtblCall__IIJ_3C_3C_3I=
-XPCOM_VtblCall__IIJ_3C_3C_3I_0=
-XPCOM_VtblCall__IIJ_3C_3C_3I_1=
-XPCOM_VtblCall__IIJ_3C_3C_3I_2=
-XPCOM_VtblCall__IIJ_3C_3C_3I_3=
-XPCOM_VtblCall__IIJ_3C_3C_3I_4=
-XPCOM_VtblCall__IIJ_3C_3C_3I_5=
+XPCOM__1VtblCall__II_3BJ_3I=
+XPCOM__1VtblCall__II_3BJ_3I_0=
+XPCOM__1VtblCall__II_3BJ_3I_1=
+XPCOM__1VtblCall__II_3BJ_3I_2=
+XPCOM__1VtblCall__II_3BJ_3I_3=
+XPCOM__1VtblCall__II_3BJ_3I_4=
 
-XPCOM_VtblCall__IIJ_3C_3C_3J=
-XPCOM_VtblCall__IIJ_3C_3C_3J_0=
-XPCOM_VtblCall__IIJ_3C_3C_3J_1=
-XPCOM_VtblCall__IIJ_3C_3C_3J_2=
-XPCOM_VtblCall__IIJ_3C_3C_3J_3=
-XPCOM_VtblCall__IIJ_3C_3C_3J_4=
-XPCOM_VtblCall__IIJ_3C_3C_3J_5=
+XPCOM__1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I=
+XPCOM__1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I_0=
+XPCOM__1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I_1=
+XPCOM__1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I_2=
+XPCOM__1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I_3=
+XPCOM__1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I_4=
 
-XPCOM_VtblCall__IIJ_3C_3C_3J_3C_3I_3I=
-XPCOM_VtblCall__IIJ_3C_3C_3J_3C_3I_3I_0=
-XPCOM_VtblCall__IIJ_3C_3C_3J_3C_3I_3I_1=
-XPCOM_VtblCall__IIJ_3C_3C_3J_3C_3I_3I_2=
-XPCOM_VtblCall__IIJ_3C_3C_3J_3C_3I_3I_3=
-XPCOM_VtblCall__IIJ_3C_3C_3J_3C_3I_3I_4=
-XPCOM_VtblCall__IIJ_3C_3C_3J_3C_3I_3I_5=
-XPCOM_VtblCall__IIJ_3C_3C_3J_3C_3I_3I_6=
-XPCOM_VtblCall__IIJ_3C_3C_3J_3C_3I_3I_7=
-XPCOM_VtblCall__IIJ_3C_3C_3J_3C_3I_3I_8=
+XPCOM__1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J=
+XPCOM__1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J_0=
+XPCOM__1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J_1=
+XPCOM__1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J_2=
+XPCOM__1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J_3=
+XPCOM__1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J_4=
 
-XPCOM_VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I=
-XPCOM_VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I_0=
-XPCOM_VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I_1=
-XPCOM_VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I_2=
-XPCOM_VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I_3=
-XPCOM_VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I_4=
-XPCOM_VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I_5=
-XPCOM_VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I_6=
-XPCOM_VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I_7=
-XPCOM_VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I_8=
-XPCOM_VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I_9=
+XPCOM__1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I=
+XPCOM__1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I_0=
+XPCOM__1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I_1=
+XPCOM__1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I_2=
+XPCOM__1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I_3=
+XPCOM__1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I_4=
 
-XPCOM_VtblCall__IIJ_3I=
-XPCOM_VtblCall__IIJ_3I_0=
-XPCOM_VtblCall__IIJ_3I_1=
-XPCOM_VtblCall__IIJ_3I_2=
-XPCOM_VtblCall__IIJ_3I_3=
+XPCOM__1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J=
+XPCOM__1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J_0=
+XPCOM__1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J_1=
+XPCOM__1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J_2=
+XPCOM__1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J_3=
+XPCOM__1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J_4=
 
-XPCOM_VtblCall__IIJ_3J=
-XPCOM_VtblCall__IIJ_3J_0=
-XPCOM_VtblCall__IIJ_3J_1=
-XPCOM_VtblCall__IIJ_3J_2=
-XPCOM_VtblCall__IIJ_3J_3=
+XPCOM__1VtblCall__II_3B_3B=
+XPCOM__1VtblCall__II_3B_3B_0=
+XPCOM__1VtblCall__II_3B_3B_1=
+XPCOM__1VtblCall__II_3B_3B_2=
+XPCOM__1VtblCall__II_3B_3B_3=
 
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I_0=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I_1=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I_2=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I_3=
+XPCOM__1VtblCall__II_3B_3BI=
+XPCOM__1VtblCall__II_3B_3BI_0=
+XPCOM__1VtblCall__II_3B_3BI_1=
+XPCOM__1VtblCall__II_3B_3BI_2=
+XPCOM__1VtblCall__II_3B_3BI_3=
+XPCOM__1VtblCall__II_3B_3BI_4=
 
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_0=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_1=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_2=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_3=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_4=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_5=
+XPCOM__1VtblCall__II_3B_3B_3BII_3I=
+XPCOM__1VtblCall__II_3B_3B_3BII_3I_0=
+XPCOM__1VtblCall__II_3B_3B_3BII_3I_1=
+XPCOM__1VtblCall__II_3B_3B_3BII_3I_2=
+XPCOM__1VtblCall__II_3B_3B_3BII_3I_3=
+XPCOM__1VtblCall__II_3B_3B_3BII_3I_4=
+XPCOM__1VtblCall__II_3B_3B_3BII_3I_5=
+XPCOM__1VtblCall__II_3B_3B_3BII_3I_6=
+XPCOM__1VtblCall__II_3B_3B_3BII_3I_7=
 
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J_0=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J_1=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J_2=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J_3=
+XPCOM__1VtblCall__II_3B_3B_3BII_3J=
+XPCOM__1VtblCall__II_3B_3B_3BII_3J_0=
+XPCOM__1VtblCall__II_3B_3B_3BII_3J_1=
+XPCOM__1VtblCall__II_3B_3B_3BII_3J_2=
+XPCOM__1VtblCall__II_3B_3B_3BII_3J_3=
+XPCOM__1VtblCall__II_3B_3B_3BII_3J_4=
+XPCOM__1VtblCall__II_3B_3B_3BII_3J_5=
+XPCOM__1VtblCall__II_3B_3B_3BII_3J_6=
+XPCOM__1VtblCall__II_3B_3B_3BII_3J_7=
 
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J_0=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J_1=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J_2=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J_3=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J_4=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J_5=
+XPCOM__1VtblCall__II_3B_3B_3I=
+XPCOM__1VtblCall__II_3B_3B_3I_0=
+XPCOM__1VtblCall__II_3B_3B_3I_1=
+XPCOM__1VtblCall__II_3B_3B_3I_2=
+XPCOM__1VtblCall__II_3B_3B_3I_3=
+XPCOM__1VtblCall__II_3B_3B_3I_4=
 
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I_0=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I_1=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I_2=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I_3=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I_4=
+XPCOM__1VtblCall__II_3B_3B_3J=
+XPCOM__1VtblCall__II_3B_3B_3J_0=
+XPCOM__1VtblCall__II_3B_3B_3J_1=
+XPCOM__1VtblCall__II_3B_3B_3J_2=
+XPCOM__1VtblCall__II_3B_3B_3J_3=
+XPCOM__1VtblCall__II_3B_3B_3J_4=
 
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J_0=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J_1=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J_2=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J_3=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J_4=
+XPCOM__1VtblCall__II_3B_3I=
+XPCOM__1VtblCall__II_3B_3I_0=
+XPCOM__1VtblCall__II_3B_3I_1=
+XPCOM__1VtblCall__II_3B_3I_2=
+XPCOM__1VtblCall__II_3B_3I_3=
 
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_0=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_1=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_2=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_4=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_5=
+XPCOM__1VtblCall__II_3B_3I_3I=
+XPCOM__1VtblCall__II_3B_3I_3I_0=
+XPCOM__1VtblCall__II_3B_3I_3I_1=
+XPCOM__1VtblCall__II_3B_3I_3I_2=
+XPCOM__1VtblCall__II_3B_3I_3I_3=
+XPCOM__1VtblCall__II_3B_3I_3I_4=
 
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_0=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_1=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_2=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_3=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_4=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_5=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_6=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_7=
+XPCOM__1VtblCall__II_3B_3I_3J=
+XPCOM__1VtblCall__II_3B_3I_3J_0=
+XPCOM__1VtblCall__II_3B_3I_3J_1=
+XPCOM__1VtblCall__II_3B_3I_3J_2=
+XPCOM__1VtblCall__II_3B_3I_3J_3=
+XPCOM__1VtblCall__II_3B_3I_3J_4=
 
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_0=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_1=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_2=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_4=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_5=
+XPCOM__1VtblCall__II_3B_3J=
+XPCOM__1VtblCall__II_3B_3J_0=
+XPCOM__1VtblCall__II_3B_3J_1=
+XPCOM__1VtblCall__II_3B_3J_2=
+XPCOM__1VtblCall__II_3B_3J_3=
 
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B_0=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B_1=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B_2=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B_3=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B_4=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B_5=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B_6=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B_7=
+XPCOM__1VtblCall__II_3B_3J_3I=
+XPCOM__1VtblCall__II_3B_3J_3I_0=
+XPCOM__1VtblCall__II_3B_3J_3I_1=
+XPCOM__1VtblCall__II_3B_3J_3I_2=
+XPCOM__1VtblCall__II_3B_3J_3I_3=
+XPCOM__1VtblCall__II_3B_3J_3I_4=
 
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I_0=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I_1=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I_2=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I_3=
+XPCOM__1VtblCall__II_3C=
+XPCOM__1VtblCall__II_3C_0=
+XPCOM__1VtblCall__II_3C_1=
+XPCOM__1VtblCall__II_3C_2=
 
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J_0=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J_1=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J_2=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J_3=
+XPCOM__1VtblCall__II_3CIIII=
+XPCOM__1VtblCall__II_3CIIII_0=
+XPCOM__1VtblCall__II_3CIIII_1=
+XPCOM__1VtblCall__II_3CIIII_2=
+XPCOM__1VtblCall__II_3CIIII_3=
+XPCOM__1VtblCall__II_3CIIII_4=
+XPCOM__1VtblCall__II_3CIIII_5=
+XPCOM__1VtblCall__II_3CIIII_6=
 
-XPCOM_VtblCall__II_3B=
-XPCOM_VtblCall__II_3B_0=
-XPCOM_VtblCall__II_3B_1=
-XPCOM_VtblCall__II_3B_2=
+XPCOM__1VtblCall__II_3CIJJJ=
+XPCOM__1VtblCall__II_3CIJJJ_0=
+XPCOM__1VtblCall__II_3CIJJJ_1=
+XPCOM__1VtblCall__II_3CIJJJ_2=
+XPCOM__1VtblCall__II_3CIJJJ_3=
+XPCOM__1VtblCall__II_3CIJJJ_4=
+XPCOM__1VtblCall__II_3CIJJJ_5=
+XPCOM__1VtblCall__II_3CIJJJ_6=
 
-XPCOM_VtblCall__II_3BI=
-XPCOM_VtblCall__II_3BI_0=
-XPCOM_VtblCall__II_3BI_1=
-XPCOM_VtblCall__II_3BI_2=
-XPCOM_VtblCall__II_3BI_3=
+XPCOM__1VtblCall__II_3CI_3I=
+XPCOM__1VtblCall__II_3CI_3I_0=
+XPCOM__1VtblCall__II_3CI_3I_1=
+XPCOM__1VtblCall__II_3CI_3I_2=
+XPCOM__1VtblCall__II_3CI_3I_3=
+XPCOM__1VtblCall__II_3CI_3I_4=
 
-XPCOM_VtblCall__II_3BII_3I_3I=
-XPCOM_VtblCall__II_3BII_3I_3I_0=
-XPCOM_VtblCall__II_3BII_3I_3I_1=
-XPCOM_VtblCall__II_3BII_3I_3I_2=
-XPCOM_VtblCall__II_3BII_3I_3I_3=
-XPCOM_VtblCall__II_3BII_3I_3I_4=
-XPCOM_VtblCall__II_3BII_3I_3I_5=
-XPCOM_VtblCall__II_3BII_3I_3I_6=
+XPCOM__1VtblCall__II_3CJ_3J=
+XPCOM__1VtblCall__II_3CJ_3J_0=
+XPCOM__1VtblCall__II_3CJ_3J_1=
+XPCOM__1VtblCall__II_3CJ_3J_2=
+XPCOM__1VtblCall__II_3CJ_3J_3=
+XPCOM__1VtblCall__II_3CJ_3J_4=
 
-XPCOM_VtblCall__II_3BIJ_3J_3I=
-XPCOM_VtblCall__II_3BIJ_3J_3I_0=
-XPCOM_VtblCall__II_3BIJ_3J_3I_1=
-XPCOM_VtblCall__II_3BIJ_3J_3I_2=
-XPCOM_VtblCall__II_3BIJ_3J_3I_3=
-XPCOM_VtblCall__II_3BIJ_3J_3I_4=
-XPCOM_VtblCall__II_3BIJ_3J_3I_5=
-XPCOM_VtblCall__II_3BIJ_3J_3I_6=
+XPCOM__1VtblCall__II_3C_3C=
+XPCOM__1VtblCall__II_3C_3C_0=
+XPCOM__1VtblCall__II_3C_3C_1=
+XPCOM__1VtblCall__II_3C_3C_2=
+XPCOM__1VtblCall__II_3C_3C_3=
 
-XPCOM_VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I=
-XPCOM_VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_0=
-XPCOM_VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_1=
-XPCOM_VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_2=
-XPCOM_VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_3=
-XPCOM_VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_4=
-XPCOM_VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_5=
+XPCOM__1VtblCall__II_3F=
+XPCOM__1VtblCall__II_3F_0=
+XPCOM__1VtblCall__II_3F_1=
+XPCOM__1VtblCall__II_3F_2=
 
-XPCOM_VtblCall__II_3BI_3I=
-XPCOM_VtblCall__II_3BI_3I_0=
-XPCOM_VtblCall__II_3BI_3I_1=
-XPCOM_VtblCall__II_3BI_3I_2=
-XPCOM_VtblCall__II_3BI_3I_3=
-XPCOM_VtblCall__II_3BI_3I_4=
+XPCOM__1VtblCall__II_3I=
+XPCOM__1VtblCall__II_3I_0=
+XPCOM__1VtblCall__II_3I_1=
+XPCOM__1VtblCall__II_3I_2=
 
-XPCOM_VtblCall__II_3BI_3I_3I=
-XPCOM_VtblCall__II_3BI_3I_3I_0=
-XPCOM_VtblCall__II_3BI_3I_3I_1=
-XPCOM_VtblCall__II_3BI_3I_3I_2=
-XPCOM_VtblCall__II_3BI_3I_3I_3=
-XPCOM_VtblCall__II_3BI_3I_3I_4=
-XPCOM_VtblCall__II_3BI_3I_3I_5=
+XPCOM__1VtblCall__II_3I_3I=
+XPCOM__1VtblCall__II_3I_3I_0=
+XPCOM__1VtblCall__II_3I_3I_1=
+XPCOM__1VtblCall__II_3I_3I_2=
+XPCOM__1VtblCall__II_3I_3I_3=
 
-XPCOM_VtblCall__II_3BI_3J_3I=
-XPCOM_VtblCall__II_3BI_3J_3I_0=
-XPCOM_VtblCall__II_3BI_3J_3I_1=
-XPCOM_VtblCall__II_3BI_3J_3I_2=
-XPCOM_VtblCall__II_3BI_3J_3I_3=
-XPCOM_VtblCall__II_3BI_3J_3I_4=
-XPCOM_VtblCall__II_3BI_3J_3I_5=
+XPCOM__1VtblCall__II_3I_3I_3I=
+XPCOM__1VtblCall__II_3I_3I_3I_0=
+XPCOM__1VtblCall__II_3I_3I_3I_1=
+XPCOM__1VtblCall__II_3I_3I_3I_2=
+XPCOM__1VtblCall__II_3I_3I_3I_3=
+XPCOM__1VtblCall__II_3I_3I_3I_4=
 
-XPCOM_VtblCall__II_3BJ=
-XPCOM_VtblCall__II_3BJ_0=
-XPCOM_VtblCall__II_3BJ_1=
-XPCOM_VtblCall__II_3BJ_2=
-XPCOM_VtblCall__II_3BJ_3=
+XPCOM__1VtblCall__II_3I_3I_3I_3I=
+XPCOM__1VtblCall__II_3I_3I_3I_3I_0=
+XPCOM__1VtblCall__II_3I_3I_3I_3I_1=
+XPCOM__1VtblCall__II_3I_3I_3I_3I_2=
+XPCOM__1VtblCall__II_3I_3I_3I_3I_3=
+XPCOM__1VtblCall__II_3I_3I_3I_3I_4=
+XPCOM__1VtblCall__II_3I_3I_3I_3I_5=
 
-XPCOM_VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J=
-XPCOM_VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_0=
-XPCOM_VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_1=
-XPCOM_VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_2=
-XPCOM_VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_3=
-XPCOM_VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_4=
-XPCOM_VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_5=
+XPCOM__1VtblCall__II_3I_3I_3I_3I_3I_3I=
+XPCOM__1VtblCall__II_3I_3I_3I_3I_3I_3I_0=
+XPCOM__1VtblCall__II_3I_3I_3I_3I_3I_3I_1=
+XPCOM__1VtblCall__II_3I_3I_3I_3I_3I_3I_2=
+XPCOM__1VtblCall__II_3I_3I_3I_3I_3I_3I_3=
+XPCOM__1VtblCall__II_3I_3I_3I_3I_3I_3I_4=
+XPCOM__1VtblCall__II_3I_3I_3I_3I_3I_3I_5=
+XPCOM__1VtblCall__II_3I_3I_3I_3I_3I_3I_6=
+XPCOM__1VtblCall__II_3I_3I_3I_3I_3I_3I_7=
 
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I=
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I_0=
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I_1=
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I_2=
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I_3=
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I_4=
+XPCOM__1VtblCall__II_3I_3J=
+XPCOM__1VtblCall__II_3I_3J_0=
+XPCOM__1VtblCall__II_3I_3J_1=
+XPCOM__1VtblCall__II_3I_3J_2=
+XPCOM__1VtblCall__II_3I_3J_3=
 
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J=
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J_0=
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J_1=
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J_2=
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J_3=
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J_4=
+XPCOM__1VtblCall__II_3I_3J_3I=
+XPCOM__1VtblCall__II_3I_3J_3I_0=
+XPCOM__1VtblCall__II_3I_3J_3I_1=
+XPCOM__1VtblCall__II_3I_3J_3I_2=
+XPCOM__1VtblCall__II_3I_3J_3I_3=
+XPCOM__1VtblCall__II_3I_3J_3I_4=
 
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I=
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I_0=
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I_1=
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I_2=
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I_3=
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I_4=
+XPCOM__1VtblCall__II_3I_3J_3J=
+XPCOM__1VtblCall__II_3I_3J_3J_0=
+XPCOM__1VtblCall__II_3I_3J_3J_1=
+XPCOM__1VtblCall__II_3I_3J_3J_2=
+XPCOM__1VtblCall__II_3I_3J_3J_3=
+XPCOM__1VtblCall__II_3I_3J_3J_4=
 
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J=
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J_0=
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J_1=
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J_2=
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J_3=
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J_4=
+XPCOM__1VtblCall__II_3J=
+XPCOM__1VtblCall__II_3J_0=
+XPCOM__1VtblCall__II_3J_1=
+XPCOM__1VtblCall__II_3J_2=
 
-XPCOM_VtblCall__II_3B_3B=
-XPCOM_VtblCall__II_3B_3B_0=
-XPCOM_VtblCall__II_3B_3B_1=
-XPCOM_VtblCall__II_3B_3B_2=
-XPCOM_VtblCall__II_3B_3B_3=
+XPCOM__1VtblCall__II_3J_3J=
+XPCOM__1VtblCall__II_3J_3J_0=
+XPCOM__1VtblCall__II_3J_3J_1=
+XPCOM__1VtblCall__II_3J_3J_2=
+XPCOM__1VtblCall__II_3J_3J_3=
 
-XPCOM_VtblCall__II_3B_3BI=
-XPCOM_VtblCall__II_3B_3BI_0=
-XPCOM_VtblCall__II_3B_3BI_1=
-XPCOM_VtblCall__II_3B_3BI_2=
-XPCOM_VtblCall__II_3B_3BI_3=
-XPCOM_VtblCall__II_3B_3BI_4=
+XPCOM__1VtblCall__II_3J_3J_3J=
+XPCOM__1VtblCall__II_3J_3J_3J_0=
+XPCOM__1VtblCall__II_3J_3J_3J_1=
+XPCOM__1VtblCall__II_3J_3J_3J_2=
+XPCOM__1VtblCall__II_3J_3J_3J_3=
+XPCOM__1VtblCall__II_3J_3J_3J_4=
 
-XPCOM_VtblCall__II_3B_3B_3BII_3I=
-XPCOM_VtblCall__II_3B_3B_3BII_3I_0=
-XPCOM_VtblCall__II_3B_3B_3BII_3I_1=
-XPCOM_VtblCall__II_3B_3B_3BII_3I_2=
-XPCOM_VtblCall__II_3B_3B_3BII_3I_3=
-XPCOM_VtblCall__II_3B_3B_3BII_3I_4=
-XPCOM_VtblCall__II_3B_3B_3BII_3I_5=
-XPCOM_VtblCall__II_3B_3B_3BII_3I_6=
-XPCOM_VtblCall__II_3B_3B_3BII_3I_7=
+XPCOM__1VtblCall__II_3J_3J_3J_3J_3J_3I=
+XPCOM__1VtblCall__II_3J_3J_3J_3J_3J_3I_0=
+XPCOM__1VtblCall__II_3J_3J_3J_3J_3J_3I_1=
+XPCOM__1VtblCall__II_3J_3J_3J_3J_3J_3I_2=
+XPCOM__1VtblCall__II_3J_3J_3J_3J_3J_3I_3=
+XPCOM__1VtblCall__II_3J_3J_3J_3J_3J_3I_4=
+XPCOM__1VtblCall__II_3J_3J_3J_3J_3J_3I_5=
+XPCOM__1VtblCall__II_3J_3J_3J_3J_3J_3I_6=
+XPCOM__1VtblCall__II_3J_3J_3J_3J_3J_3I_7=
 
-XPCOM_VtblCall__II_3B_3B_3BII_3J=
-XPCOM_VtblCall__II_3B_3B_3BII_3J_0=
-XPCOM_VtblCall__II_3B_3B_3BII_3J_1=
-XPCOM_VtblCall__II_3B_3B_3BII_3J_2=
-XPCOM_VtblCall__II_3B_3B_3BII_3J_3=
-XPCOM_VtblCall__II_3B_3B_3BII_3J_4=
-XPCOM_VtblCall__II_3B_3B_3BII_3J_5=
-XPCOM_VtblCall__II_3B_3B_3BII_3J_6=
-XPCOM_VtblCall__II_3B_3B_3BII_3J_7=
+XPCOM__1VtblCall__II_3S=
+XPCOM__1VtblCall__II_3S_0=
+XPCOM__1VtblCall__II_3S_1=
+XPCOM__1VtblCall__II_3S_2=
 
-XPCOM_VtblCall__II_3B_3B_3I=
-XPCOM_VtblCall__II_3B_3B_3I_0=
-XPCOM_VtblCall__II_3B_3B_3I_1=
-XPCOM_VtblCall__II_3B_3B_3I_2=
-XPCOM_VtblCall__II_3B_3B_3I_3=
-XPCOM_VtblCall__II_3B_3B_3I_4=
+XPCOM__1VtblCall__II_3SI_3I_3I=
+XPCOM__1VtblCall__II_3SI_3I_3I_0=
+XPCOM__1VtblCall__II_3SI_3I_3I_1=
+XPCOM__1VtblCall__II_3SI_3I_3I_2=
+XPCOM__1VtblCall__II_3SI_3I_3I_3=
+XPCOM__1VtblCall__II_3SI_3I_3I_4=
+XPCOM__1VtblCall__II_3SI_3I_3I_5=
 
-XPCOM_VtblCall__II_3B_3B_3J=
-XPCOM_VtblCall__II_3B_3B_3J_0=
-XPCOM_VtblCall__II_3B_3B_3J_1=
-XPCOM_VtblCall__II_3B_3B_3J_2=
-XPCOM_VtblCall__II_3B_3B_3J_3=
-XPCOM_VtblCall__II_3B_3B_3J_4=
+XPCOM__1VtblCall__II_3SJ_3I_3J=
+XPCOM__1VtblCall__II_3SJ_3I_3J_0=
+XPCOM__1VtblCall__II_3SJ_3I_3J_1=
+XPCOM__1VtblCall__II_3SJ_3I_3J_2=
+XPCOM__1VtblCall__II_3SJ_3I_3J_3=
+XPCOM__1VtblCall__II_3SJ_3I_3J_4=
+XPCOM__1VtblCall__II_3SJ_3I_3J_5=
 
-XPCOM_VtblCall__II_3B_3I=
-XPCOM_VtblCall__II_3B_3I_0=
-XPCOM_VtblCall__II_3B_3I_1=
-XPCOM_VtblCall__II_3B_3I_2=
-XPCOM_VtblCall__II_3B_3I_3=
+XPCOM__XPCOMGlueLoadXULFunctions=
+XPCOM__XPCOMGlueLoadXULFunctions_0=cast=(const nsDynamicFunctionLoad *)
 
-XPCOM_VtblCall__II_3B_3I_3I=
-XPCOM_VtblCall__II_3B_3I_3I_0=
-XPCOM_VtblCall__II_3B_3I_3I_1=
-XPCOM_VtblCall__II_3B_3I_3I_2=
-XPCOM_VtblCall__II_3B_3I_3I_3=
-XPCOM_VtblCall__II_3B_3I_3I_4=
+XPCOM__XPCOMGlueShutdown=
 
-XPCOM_VtblCall__II_3B_3I_3J=
-XPCOM_VtblCall__II_3B_3I_3J_0=
-XPCOM_VtblCall__II_3B_3I_3J_1=
-XPCOM_VtblCall__II_3B_3I_3J_2=
-XPCOM_VtblCall__II_3B_3I_3J_3=
-XPCOM_VtblCall__II_3B_3I_3J_4=
+XPCOM__XPCOMGlueStartup=
+XPCOM__XPCOMGlueStartup_0=cast=(const char *)
 
-XPCOM_VtblCall__II_3B_3J=
-XPCOM_VtblCall__II_3B_3J_0=
-XPCOM_VtblCall__II_3B_3J_1=
-XPCOM_VtblCall__II_3B_3J_2=
-XPCOM_VtblCall__II_3B_3J_3=
+XPCOM__nsEmbedCString_Length=flags=cpp
+XPCOM__nsEmbedCString_Length_0=cast=(nsEmbedCString *)
 
-XPCOM_VtblCall__II_3B_3J_3I=
-XPCOM_VtblCall__II_3B_3J_3I_0=
-XPCOM_VtblCall__II_3B_3J_3I_1=
-XPCOM_VtblCall__II_3B_3J_3I_2=
-XPCOM_VtblCall__II_3B_3J_3I_3=
-XPCOM_VtblCall__II_3B_3J_3I_4=
+XPCOM__nsEmbedCString_delete=flags=delete
+XPCOM__nsEmbedCString_delete_0=cast=(nsEmbedCString *)
 
-XPCOM_VtblCall__II_3C=
-XPCOM_VtblCall__II_3C_0=
-XPCOM_VtblCall__II_3C_1=
-XPCOM_VtblCall__II_3C_2=
+XPCOM__nsEmbedCString_get=flags=cpp
+XPCOM__nsEmbedCString_get_0=cast=(nsEmbedCString *)
 
-XPCOM_VtblCall__II_3CIIII=
-XPCOM_VtblCall__II_3CIIII_0=
-XPCOM_VtblCall__II_3CIIII_1=
-XPCOM_VtblCall__II_3CIIII_2=
-XPCOM_VtblCall__II_3CIIII_3=
-XPCOM_VtblCall__II_3CIIII_4=
-XPCOM_VtblCall__II_3CIIII_5=
-XPCOM_VtblCall__II_3CIIII_6=
+XPCOM__1nsEmbedCString_1new__=flags=new
 
-XPCOM_VtblCall__II_3CIJJJ=
-XPCOM_VtblCall__II_3CIJJJ_0=
-XPCOM_VtblCall__II_3CIJJJ_1=
-XPCOM_VtblCall__II_3CIJJJ_2=
-XPCOM_VtblCall__II_3CIJJJ_3=
-XPCOM_VtblCall__II_3CIJJJ_4=
-XPCOM_VtblCall__II_3CIJJJ_5=
-XPCOM_VtblCall__II_3CIJJJ_6=
+XPCOM__1nsEmbedCString_1new__II=flags=new
+XPCOM__1nsEmbedCString_1new__II_0=cast=(const char *)
+XPCOM__1nsEmbedCString_1new__II_1=
 
-XPCOM_VtblCall__II_3CI_3I=
-XPCOM_VtblCall__II_3CI_3I_0=
-XPCOM_VtblCall__II_3CI_3I_1=
-XPCOM_VtblCall__II_3CI_3I_2=
-XPCOM_VtblCall__II_3CI_3I_3=
-XPCOM_VtblCall__II_3CI_3I_4=
+XPCOM__1nsEmbedCString_1new___3BI=flags=new
+XPCOM__1nsEmbedCString_1new___3BI_0=cast=(const char *)
+XPCOM__1nsEmbedCString_1new___3BI_1=
 
-XPCOM_VtblCall__II_3CJ_3J=
-XPCOM_VtblCall__II_3CJ_3J_0=
-XPCOM_VtblCall__II_3CJ_3J_1=
-XPCOM_VtblCall__II_3CJ_3J_2=
-XPCOM_VtblCall__II_3CJ_3J_3=
-XPCOM_VtblCall__II_3CJ_3J_4=
+XPCOM__nsEmbedString_Length=flags=cpp
+XPCOM__nsEmbedString_Length_0=cast=(nsEmbedString *)
 
-XPCOM_VtblCall__II_3C_3C=
-XPCOM_VtblCall__II_3C_3C_0=
-XPCOM_VtblCall__II_3C_3C_1=
-XPCOM_VtblCall__II_3C_3C_2=
-XPCOM_VtblCall__II_3C_3C_3=
+XPCOM__nsEmbedString_delete=flags=delete
+XPCOM__nsEmbedString_delete_0=cast=(nsEmbedString *)
 
-XPCOM_VtblCall__II_3F=
-XPCOM_VtblCall__II_3F_0=
-XPCOM_VtblCall__II_3F_1=
-XPCOM_VtblCall__II_3F_2=
+XPCOM__nsEmbedString_get=flags=cpp
+XPCOM__nsEmbedString_get_0=cast=(nsEmbedString *)
 
-XPCOM_VtblCall__II_3I=
-XPCOM_VtblCall__II_3I_0=
-XPCOM_VtblCall__II_3I_1=
-XPCOM_VtblCall__II_3I_2=
+XPCOM__1nsEmbedString_1new__=flags=new
 
-XPCOM_VtblCall__II_3I_3I=
-XPCOM_VtblCall__II_3I_3I_0=
-XPCOM_VtblCall__II_3I_3I_1=
-XPCOM_VtblCall__II_3I_3I_2=
-XPCOM_VtblCall__II_3I_3I_3=
+XPCOM__1nsEmbedString_1new___3C=flags=new
+XPCOM__1nsEmbedString_1new___3C_0=cast=(PRUnichar *)
 
-XPCOM_VtblCall__II_3I_3I_3I=
-XPCOM_VtblCall__II_3I_3I_3I_0=
-XPCOM_VtblCall__II_3I_3I_3I_1=
-XPCOM_VtblCall__II_3I_3I_3I_2=
-XPCOM_VtblCall__II_3I_3I_3I_3=
-XPCOM_VtblCall__II_3I_3I_3I_4=
+XPCOM__nsID_Equals=flags=cpp
+XPCOM__nsID_Equals_0=cast=(nsID *)
+XPCOM__nsID_Equals_1=cast=(nsID *),flags=struct
 
-XPCOM_VtblCall__II_3I_3I_3I_3I=
-XPCOM_VtblCall__II_3I_3I_3I_3I_0=
-XPCOM_VtblCall__II_3I_3I_3I_3I_1=
-XPCOM_VtblCall__II_3I_3I_3I_3I_2=
-XPCOM_VtblCall__II_3I_3I_3I_3I_3=
-XPCOM_VtblCall__II_3I_3I_3I_3I_4=
-XPCOM_VtblCall__II_3I_3I_3I_3I_5=
+XPCOM__nsID_delete=flags=delete
+XPCOM__nsID_delete_0=cast=(nsID *)
 
-XPCOM_VtblCall__II_3I_3J=
-XPCOM_VtblCall__II_3I_3J_0=
-XPCOM_VtblCall__II_3I_3J_1=
-XPCOM_VtblCall__II_3I_3J_2=
-XPCOM_VtblCall__II_3I_3J_3=
+XPCOM__nsID_new=flags=new
 
-XPCOM_VtblCall__II_3I_3J_3I=
-XPCOM_VtblCall__II_3I_3J_3I_0=
-XPCOM_VtblCall__II_3I_3J_3I_1=
-XPCOM_VtblCall__II_3I_3J_3I_2=
-XPCOM_VtblCall__II_3I_3J_3I_3=
-XPCOM_VtblCall__II_3I_3J_3I_4=
+XPCOM__nsIMemory_Alloc=flags=cpp
+XPCOM__nsIMemory_Alloc_0=cast=(nsIMemory *)
+XPCOM__nsIMemory_Alloc_1=cast=(size_t)
 
-XPCOM_VtblCall__II_3I_3J_3J=
-XPCOM_VtblCall__II_3I_3J_3J_0=
-XPCOM_VtblCall__II_3I_3J_3J_1=
-XPCOM_VtblCall__II_3I_3J_3J_2=
-XPCOM_VtblCall__II_3I_3J_3J_3=
-XPCOM_VtblCall__II_3I_3J_3J_4=
+XPCOM__nsIMemory_Realloc=flags=cpp
+XPCOM__nsIMemory_Realloc_0=cast=(nsIMemory *)
+XPCOM__nsIMemory_Realloc_1=cast=(void *)
+XPCOM__nsIMemory_Realloc_2=cast=(size_t)
 
-XPCOM_VtblCall__II_3J=
-XPCOM_VtblCall__II_3J_0=
-XPCOM_VtblCall__II_3J_1=
-XPCOM_VtblCall__II_3J_2=
+XPCOM__nsIScriptContext_GetNativeContext=flags=cpp
+XPCOM__nsIScriptContext_GetNativeContext_0=cast=(nsIScriptContext *)
 
-XPCOM_VtblCall__II_3J_3J_3J=
-XPCOM_VtblCall__II_3J_3J_3J_0=
-XPCOM_VtblCall__II_3J_3J_3J_1=
-XPCOM_VtblCall__II_3J_3J_3J_2=
-XPCOM_VtblCall__II_3J_3J_3J_3=
-XPCOM_VtblCall__II_3J_3J_3J_4=
+XPCOM__nsIScriptGlobalObject_EnsureScriptEnvironment=flags=cpp
+XPCOM__nsIScriptGlobalObject_EnsureScriptEnvironment_0=cast=(nsIScriptGlobalObject *)
+XPCOM__nsIScriptGlobalObject_EnsureScriptEnvironment_1=
 
-XPCOM_VtblCall__II_3S=
-XPCOM_VtblCall__II_3S_0=
-XPCOM_VtblCall__II_3S_1=
-XPCOM_VtblCall__II_3S_2=
+XPCOM__nsIScriptGlobalObject_GetScriptContext=flags=cpp
+XPCOM__nsIScriptGlobalObject_GetScriptContext_0=cast=(nsIScriptGlobalObject *)
+XPCOM__nsIScriptGlobalObject_GetScriptContext_1=
 
-XPCOM_XPCOMGlueShutdown=
+XPCOM__nsIScriptGlobalObject_GetScriptGlobal=flags=cpp
+XPCOM__nsIScriptGlobalObject_GetScriptGlobal_0=cast=(nsIScriptGlobalObject *)
+XPCOM__nsIScriptGlobalObject_GetScriptGlobal_1=
 
-XPCOM_XPCOMGlueStartup=
-XPCOM_XPCOMGlueStartup_0=cast=(const char *)
+XPCOM_memmove__ILorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2I=
+XPCOM_memmove__ILorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2I_0=cast=(void *)
+XPCOM_memmove__ILorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2I_1=cast=(const void *),flags=no_out
+XPCOM_memmove__ILorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2I_2=cast=(size_t)
 
 XPCOM_memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I=
 XPCOM_memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I_0=cast=(void *)
@@ -1276,85 +1731,40 @@
 XPCOM_memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2II_1=cast=(const void *)
 XPCOM_memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2II_2=cast=(size_t)
 
-XPCOM_nsEmbedCString_Length=flags=cpp
-XPCOM_nsEmbedCString_Length_0=cast=(nsEmbedCString *)
-
-XPCOM_nsEmbedCString_delete=flags=delete
-XPCOM_nsEmbedCString_delete_0=cast=(nsEmbedCString *)
-
-XPCOM_nsEmbedCString_get=flags=cpp
-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=
-
-XPCOM_nsEmbedString_Length=flags=cpp
-XPCOM_nsEmbedString_Length_0=cast=(nsEmbedString *)
-
-XPCOM_nsEmbedString_delete=flags=delete
-XPCOM_nsEmbedString_delete_0=cast=(nsEmbedString *)
-
-XPCOM_nsEmbedString_get=flags=cpp
-XPCOM_nsEmbedString_get_0=cast=(nsEmbedString *)
-
-XPCOM_nsEmbedString_1new__=flags=new
-
-XPCOM_nsEmbedString_1new___3C=flags=new
-XPCOM_nsEmbedString_1new___3C_0=cast=(PRUnichar *)
-
-XPCOM_nsID_Equals=flags=cpp
-XPCOM_nsID_Equals_0=cast=(nsID *)
-XPCOM_nsID_Equals_1=cast=(nsID *),flags=struct
-
-XPCOM_nsID_delete=flags=delete
-XPCOM_nsID_delete_0=cast=(nsID *)
-
-XPCOM_nsID_new=flags=new
+XPCOM_nsDynamicFunctionLoad_sizeof=
 
 XPCOM_strlen_PRUnichar=flags=no_gen
 XPCOM_strlen_PRUnichar_0=
 
 
-org_eclipse_swt_internal_mozilla_XPCOMInit=flags=no_gen
-XPCOMInit_GREVersionRange_sizeof=
-
-XPCOMInit_GRE_GetGREPathWithProperties=
-XPCOMInit_GRE_GetGREPathWithProperties_0=
-XPCOMInit_GRE_GetGREPathWithProperties_1=
-XPCOMInit_GRE_GetGREPathWithProperties_2=
-XPCOMInit_GRE_GetGREPathWithProperties_3=
-XPCOMInit_GRE_GetGREPathWithProperties_4=
-XPCOMInit_GRE_GetGREPathWithProperties_5=
-
-XPCOMInit_XPCOMGlueShutdown=
-
-XPCOMInit_XPCOMGlueStartup=
-XPCOMInit_XPCOMGlueStartup_0=
-
-
 org_eclipse_swt_internal_mozilla_XPCOMObject=
 
+org_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad=
+nsDynamicFunctionLoad_functionName=cast=(const char *)
+nsDynamicFunctionLoad_function=cast=(NSFuncPtr  *)
+
 org_eclipse_swt_internal_mozilla_nsEmbedString=
 
 org_eclipse_swt_internal_mozilla_nsIAppShell=
 
 org_eclipse_swt_internal_mozilla_nsIAuthInformation=
 
+org_eclipse_swt_internal_mozilla_nsIBadCertListener2=
+
 org_eclipse_swt_internal_mozilla_nsIBaseWindow=
 
 org_eclipse_swt_internal_mozilla_nsICancelable=
 
 org_eclipse_swt_internal_mozilla_nsICategoryManager=
 
+org_eclipse_swt_internal_mozilla_nsICertOverrideService=
+
+org_eclipse_swt_internal_mozilla_nsICertificateDialogs=
+
 org_eclipse_swt_internal_mozilla_nsIChannel=
 
+org_eclipse_swt_internal_mozilla_nsIClassInfo=
+
 org_eclipse_swt_internal_mozilla_nsIComponentManager=
 
 org_eclipse_swt_internal_mozilla_nsIComponentRegistrar=
@@ -1365,6 +1775,10 @@
 
 org_eclipse_swt_internal_mozilla_nsICookieManager=
 
+org_eclipse_swt_internal_mozilla_nsICookieService=
+
+org_eclipse_swt_internal_mozilla_nsICookieService_11_19=
+
 org_eclipse_swt_internal_mozilla_nsID=flags=cpp
 nsID_m0=
 nsID_m1=
@@ -1389,6 +1803,8 @@
 
 org_eclipse_swt_internal_mozilla_nsIDOMWindowCollection=
 
+org_eclipse_swt_internal_mozilla_nsIDataType=
+
 org_eclipse_swt_internal_mozilla_nsIDirectoryService=
 
 org_eclipse_swt_internal_mozilla_nsIDirectoryServiceProvider=
@@ -1399,8 +1815,6 @@
 
 org_eclipse_swt_internal_mozilla_nsIDocShell_11_18=
 
-org_eclipse_swt_internal_mozilla_nsIDocShell_11_19=
-
 org_eclipse_swt_internal_mozilla_nsIDownload=
 
 org_eclipse_swt_internal_mozilla_nsIDownload_11_18=
@@ -1445,6 +1859,8 @@
 
 org_eclipse_swt_internal_mozilla_nsIPrefService=
 
+org_eclipse_swt_internal_mozilla_nsIPrincipal=
+
 org_eclipse_swt_internal_mozilla_nsIProgressDialog=
 
 org_eclipse_swt_internal_mozilla_nsIProgressDialog_11_18=
@@ -1457,6 +1873,16 @@
 
 org_eclipse_swt_internal_mozilla_nsIRequest=
 
+org_eclipse_swt_internal_mozilla_nsISSLStatus=
+
+org_eclipse_swt_internal_mozilla_nsIScriptSecurityManager_11_19=
+
+org_eclipse_swt_internal_mozilla_nsIScriptSecurityManager_11_19_11=
+
+org_eclipse_swt_internal_mozilla_nsISecurityCheckedComponent=
+
+org_eclipse_swt_internal_mozilla_nsISerializable=
+
 org_eclipse_swt_internal_mozilla_nsIServiceManager=
 
 org_eclipse_swt_internal_mozilla_nsISimpleEnumerator=
@@ -1473,6 +1899,8 @@
 
 org_eclipse_swt_internal_mozilla_nsIURIContentListener=
 
+org_eclipse_swt_internal_mozilla_nsIVariant=
+
 org_eclipse_swt_internal_mozilla_nsIWeakReference=
 
 org_eclipse_swt_internal_mozilla_nsIWebBrowser=
@@ -1483,6 +1911,10 @@
 
 org_eclipse_swt_internal_mozilla_nsIWebBrowserFocus=
 
+org_eclipse_swt_internal_mozilla_nsIWebBrowserSetup=
+
+org_eclipse_swt_internal_mozilla_nsIWebBrowserStream=
+
 org_eclipse_swt_internal_mozilla_nsIWebNavigation=
 
 org_eclipse_swt_internal_mozilla_nsIWebNavigationInfo=
@@ -1499,3 +1931,11 @@
 
 org_eclipse_swt_internal_mozilla_nsIWindowWatcher=
 
+org_eclipse_swt_internal_mozilla_nsIWritableVariant=
+
+org_eclipse_swt_internal_mozilla_nsIX509Cert=
+
+org_eclipse_swt_internal_mozilla_nsIX509CertValidity=
+
+org_eclipse_swt_internal_mozilla_nsIXPCSecurityManager=
+
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOMInit.properties b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOMInit.properties
deleted file mode 100644
index 1e996a0..0000000
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOMInit.properties
+++ /dev/null
@@ -1,1090 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2007 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
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-org_eclipse_swt_internal_mozilla_GREVersionRange=flags=cpp
-GREVersionRange_lower=cast=(const char *)
-GREVersionRange_lowerInclusive=
-GREVersionRange_upper=cast=(const char *)
-GREVersionRange_upperInclusive=
-
-org_eclipse_swt_internal_mozilla_XPCOM=flags=no_gen
-XPCOM_Call=
-XPCOM_Call_0=
-XPCOM_Call_1=
-XPCOM_Call_2=
-XPCOM_Call_3=
-XPCOM_Call_4=
-XPCOM_Call_5=
-XPCOM_Call_6=
-
-XPCOM_NS_GetComponentManager=
-XPCOM_NS_GetComponentManager_0=
-
-XPCOM_NS_GetServiceManager=
-XPCOM_NS_GetServiceManager_0=
-
-XPCOM_NS_InitXPCOM2=
-XPCOM_NS_InitXPCOM2_0=
-XPCOM_NS_InitXPCOM2_1=
-XPCOM_NS_InitXPCOM2_2=
-
-XPCOM_NS_NewLocalFile=
-XPCOM_NS_NewLocalFile_0=
-XPCOM_NS_NewLocalFile_1=
-XPCOM_NS_NewLocalFile_2=
-
-XPCOM_VtblCall__II=
-XPCOM_VtblCall__II_0=
-XPCOM_VtblCall__II_1=
-
-XPCOM_VtblCall__IIF=
-XPCOM_VtblCall__IIF_0=
-XPCOM_VtblCall__IIF_1=
-XPCOM_VtblCall__IIF_2=
-
-XPCOM_VtblCall__III=
-XPCOM_VtblCall__III_0=
-XPCOM_VtblCall__III_1=
-XPCOM_VtblCall__III_2=
-
-XPCOM_VtblCall__IIII=
-XPCOM_VtblCall__IIII_0=
-XPCOM_VtblCall__IIII_1=
-XPCOM_VtblCall__IIII_2=
-XPCOM_VtblCall__IIII_3=
-
-XPCOM_VtblCall__IIIII=
-XPCOM_VtblCall__IIIII_0=
-XPCOM_VtblCall__IIIII_1=
-XPCOM_VtblCall__IIIII_2=
-XPCOM_VtblCall__IIIII_3=
-XPCOM_VtblCall__IIIII_4=
-
-XPCOM_VtblCall__IIIIII=
-XPCOM_VtblCall__IIIIII_0=
-XPCOM_VtblCall__IIIIII_1=
-XPCOM_VtblCall__IIIIII_2=
-XPCOM_VtblCall__IIIIII_3=
-XPCOM_VtblCall__IIIIII_4=
-XPCOM_VtblCall__IIIIII_5=
-
-XPCOM_VtblCall__IIIIIII=
-XPCOM_VtblCall__IIIIIII_0=
-XPCOM_VtblCall__IIIIIII_1=
-XPCOM_VtblCall__IIIIIII_2=
-XPCOM_VtblCall__IIIIIII_3=
-XPCOM_VtblCall__IIIIIII_4=
-XPCOM_VtblCall__IIIIIII_5=
-XPCOM_VtblCall__IIIIIII_6=
-
-XPCOM_VtblCall__IIIIIIII=
-XPCOM_VtblCall__IIIIIIII_0=
-XPCOM_VtblCall__IIIIIIII_1=
-XPCOM_VtblCall__IIIIIIII_2=
-XPCOM_VtblCall__IIIIIIII_3=
-XPCOM_VtblCall__IIIIIIII_4=
-XPCOM_VtblCall__IIIIIIII_5=
-XPCOM_VtblCall__IIIIIIII_6=
-XPCOM_VtblCall__IIIIIIII_7=
-
-XPCOM_VtblCall__IIIIIIJII=
-XPCOM_VtblCall__IIIIIIJII_0=
-XPCOM_VtblCall__IIIIIIJII_1=
-XPCOM_VtblCall__IIIIIIJII_2=
-XPCOM_VtblCall__IIIIIIJII_3=
-XPCOM_VtblCall__IIIIIIJII_4=
-XPCOM_VtblCall__IIIIIIJII_5=
-XPCOM_VtblCall__IIIIIIJII_6=
-XPCOM_VtblCall__IIIIIIJII_7=
-XPCOM_VtblCall__IIIIIIJII_8=
-
-XPCOM_VtblCall__IIIIIIZ=
-XPCOM_VtblCall__IIIIIIZ_0=
-XPCOM_VtblCall__IIIIIIZ_1=
-XPCOM_VtblCall__IIIIIIZ_2=
-XPCOM_VtblCall__IIIIIIZ_3=
-XPCOM_VtblCall__IIIIIIZ_4=
-XPCOM_VtblCall__IIIIIIZ_5=
-XPCOM_VtblCall__IIIIIIZ_6=
-
-XPCOM_VtblCall__IIIIII_3C_3BIIIIZ_3I_3I=
-XPCOM_VtblCall__IIIIII_3C_3BIIIIZ_3I_3I_0=
-XPCOM_VtblCall__IIIIII_3C_3BIIIIZ_3I_3I_1=
-XPCOM_VtblCall__IIIIII_3C_3BIIIIZ_3I_3I_2=
-XPCOM_VtblCall__IIIIII_3C_3BIIIIZ_3I_3I_3=
-XPCOM_VtblCall__IIIIII_3C_3BIIIIZ_3I_3I_4=
-XPCOM_VtblCall__IIIIII_3C_3BIIIIZ_3I_3I_5=
-XPCOM_VtblCall__IIIIII_3C_3BIIIIZ_3I_3I_6=
-XPCOM_VtblCall__IIIIII_3C_3BIIIIZ_3I_3I_7=
-XPCOM_VtblCall__IIIIII_3C_3BIIIIZ_3I_3I_8=
-XPCOM_VtblCall__IIIIII_3C_3BIIIIZ_3I_3I_9=
-XPCOM_VtblCall__IIIIII_3C_3BIIIIZ_3I_3I_10=
-XPCOM_VtblCall__IIIIII_3C_3BIIIIZ_3I_3I_11=
-XPCOM_VtblCall__IIIIII_3C_3BIIIIZ_3I_3I_12=
-XPCOM_VtblCall__IIIIII_3C_3BIIIIZ_3I_3I_13=
-XPCOM_VtblCall__IIIIII_3C_3BIIIIZ_3I_3I_14=
-
-XPCOM_VtblCall__IIIIII_3Z_3I=
-XPCOM_VtblCall__IIIIII_3Z_3I_0=
-XPCOM_VtblCall__IIIIII_3Z_3I_1=
-XPCOM_VtblCall__IIIIII_3Z_3I_2=
-XPCOM_VtblCall__IIIIII_3Z_3I_3=
-XPCOM_VtblCall__IIIIII_3Z_3I_4=
-XPCOM_VtblCall__IIIIII_3Z_3I_5=
-XPCOM_VtblCall__IIIIII_3Z_3I_6=
-XPCOM_VtblCall__IIIIII_3Z_3I_7=
-
-XPCOM_VtblCall__IIIIIZ=
-XPCOM_VtblCall__IIIIIZ_0=
-XPCOM_VtblCall__IIIIIZ_1=
-XPCOM_VtblCall__IIIIIZ_2=
-XPCOM_VtblCall__IIIIIZ_3=
-XPCOM_VtblCall__IIIIIZ_4=
-XPCOM_VtblCall__IIIIIZ_5=
-
-XPCOM_VtblCall__IIIIIZ_3CIIIIZ_3I_3I=
-XPCOM_VtblCall__IIIIIZ_3CIIIIZ_3I_3I_0=
-XPCOM_VtblCall__IIIIIZ_3CIIIIZ_3I_3I_1=
-XPCOM_VtblCall__IIIIIZ_3CIIIIZ_3I_3I_2=
-XPCOM_VtblCall__IIIIIZ_3CIIIIZ_3I_3I_3=
-XPCOM_VtblCall__IIIIIZ_3CIIIIZ_3I_3I_4=
-XPCOM_VtblCall__IIIIIZ_3CIIIIZ_3I_3I_5=
-XPCOM_VtblCall__IIIIIZ_3CIIIIZ_3I_3I_6=
-XPCOM_VtblCall__IIIIIZ_3CIIIIZ_3I_3I_7=
-XPCOM_VtblCall__IIIIIZ_3CIIIIZ_3I_3I_8=
-XPCOM_VtblCall__IIIIIZ_3CIIIIZ_3I_3I_9=
-XPCOM_VtblCall__IIIIIZ_3CIIIIZ_3I_3I_10=
-XPCOM_VtblCall__IIIIIZ_3CIIIIZ_3I_3I_11=
-XPCOM_VtblCall__IIIIIZ_3CIIIIZ_3I_3I_12=
-XPCOM_VtblCall__IIIIIZ_3CIIIIZ_3I_3I_13=
-
-XPCOM_VtblCall__IIIII_3C=
-XPCOM_VtblCall__IIIII_3C_0=
-XPCOM_VtblCall__IIIII_3C_1=
-XPCOM_VtblCall__IIIII_3C_2=
-XPCOM_VtblCall__IIIII_3C_3=
-XPCOM_VtblCall__IIIII_3C_4=
-XPCOM_VtblCall__IIIII_3C_5=
-
-XPCOM_VtblCall__IIIII_3I=
-XPCOM_VtblCall__IIIII_3I_0=
-XPCOM_VtblCall__IIIII_3I_1=
-XPCOM_VtblCall__IIIII_3I_2=
-XPCOM_VtblCall__IIIII_3I_3=
-XPCOM_VtblCall__IIIII_3I_4=
-XPCOM_VtblCall__IIIII_3I_5=
-
-XPCOM_VtblCall__IIIIJJJJ=
-XPCOM_VtblCall__IIIIJJJJ_0=
-XPCOM_VtblCall__IIIIJJJJ_1=
-XPCOM_VtblCall__IIIIJJJJ_2=
-XPCOM_VtblCall__IIIIJJJJ_3=
-XPCOM_VtblCall__IIIIJJJJ_4=
-XPCOM_VtblCall__IIIIJJJJ_5=
-XPCOM_VtblCall__IIIIJJJJ_6=
-XPCOM_VtblCall__IIIIJJJJ_7=
-
-XPCOM_VtblCall__IIIIJZ=
-XPCOM_VtblCall__IIIIJZ_0=
-XPCOM_VtblCall__IIIIJZ_1=
-XPCOM_VtblCall__IIIIJZ_2=
-XPCOM_VtblCall__IIIIJZ_3=
-XPCOM_VtblCall__IIIIJZ_4=
-XPCOM_VtblCall__IIIIJZ_5=
-
-XPCOM_VtblCall__IIIIZ=
-XPCOM_VtblCall__IIIIZ_0=
-XPCOM_VtblCall__IIIIZ_1=
-XPCOM_VtblCall__IIIIZ_2=
-XPCOM_VtblCall__IIIIZ_3=
-XPCOM_VtblCall__IIIIZ_4=
-
-XPCOM_VtblCall__IIII_3B=
-XPCOM_VtblCall__IIII_3B_0=
-XPCOM_VtblCall__IIII_3B_1=
-XPCOM_VtblCall__IIII_3B_2=
-XPCOM_VtblCall__IIII_3B_3=
-XPCOM_VtblCall__IIII_3B_4=
-
-XPCOM_VtblCall__IIII_3C=
-XPCOM_VtblCall__IIII_3C_0=
-XPCOM_VtblCall__IIII_3C_1=
-XPCOM_VtblCall__IIII_3C_2=
-XPCOM_VtblCall__IIII_3C_3=
-XPCOM_VtblCall__IIII_3C_4=
-
-XPCOM_VtblCall__IIII_3CIJI=
-XPCOM_VtblCall__IIII_3CIJI_0=
-XPCOM_VtblCall__IIII_3CIJI_1=
-XPCOM_VtblCall__IIII_3CIJI_2=
-XPCOM_VtblCall__IIII_3CIJI_3=
-XPCOM_VtblCall__IIII_3CIJI_4=
-XPCOM_VtblCall__IIII_3CIJI_5=
-XPCOM_VtblCall__IIII_3CIJI_6=
-XPCOM_VtblCall__IIII_3CIJI_7=
-
-XPCOM_VtblCall__IIII_3I=
-XPCOM_VtblCall__IIII_3I_0=
-XPCOM_VtblCall__IIII_3I_1=
-XPCOM_VtblCall__IIII_3I_2=
-XPCOM_VtblCall__IIII_3I_3=
-XPCOM_VtblCall__IIII_3I_4=
-
-XPCOM_VtblCall__IIII_3J=
-XPCOM_VtblCall__IIII_3J_0=
-XPCOM_VtblCall__IIII_3J_1=
-XPCOM_VtblCall__IIII_3J_2=
-XPCOM_VtblCall__IIII_3J_3=
-XPCOM_VtblCall__IIII_3J_4=
-
-XPCOM_VtblCall__IIIJJ=
-XPCOM_VtblCall__IIIJJ_0=
-XPCOM_VtblCall__IIIJJ_1=
-XPCOM_VtblCall__IIIJJ_2=
-XPCOM_VtblCall__IIIJJ_3=
-XPCOM_VtblCall__IIIJJ_4=
-
-XPCOM_VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2=
-XPCOM_VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_0=
-XPCOM_VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_1=
-XPCOM_VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_2=
-XPCOM_VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3=
-
-XPCOM_VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I=
-XPCOM_VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I_0=
-XPCOM_VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I_1=
-XPCOM_VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I_2=
-XPCOM_VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I_3=
-XPCOM_VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I_4=
-
-XPCOM_VtblCall__IIIZ=
-XPCOM_VtblCall__IIIZ_0=
-XPCOM_VtblCall__IIIZ_1=
-XPCOM_VtblCall__IIIZ_2=
-XPCOM_VtblCall__IIIZ_3=
-
-XPCOM_VtblCall__IIIZZ=
-XPCOM_VtblCall__IIIZZ_0=
-XPCOM_VtblCall__IIIZZ_1=
-XPCOM_VtblCall__IIIZZ_2=
-XPCOM_VtblCall__IIIZZ_3=
-XPCOM_VtblCall__IIIZZ_4=
-
-XPCOM_VtblCall__IIIZZII=
-XPCOM_VtblCall__IIIZZII_0=
-XPCOM_VtblCall__IIIZZII_1=
-XPCOM_VtblCall__IIIZZII_2=
-XPCOM_VtblCall__IIIZZII_3=
-XPCOM_VtblCall__IIIZZII_4=
-XPCOM_VtblCall__IIIZZII_5=
-XPCOM_VtblCall__IIIZZII_6=
-
-XPCOM_VtblCall__IIIZZIIIIIIZZZZSI=
-XPCOM_VtblCall__IIIZZIIIIIIZZZZSI_0=
-XPCOM_VtblCall__IIIZZIIIIIIZZZZSI_1=
-XPCOM_VtblCall__IIIZZIIIIIIZZZZSI_2=
-XPCOM_VtblCall__IIIZZIIIIIIZZZZSI_3=
-XPCOM_VtblCall__IIIZZIIIIIIZZZZSI_4=
-XPCOM_VtblCall__IIIZZIIIIIIZZZZSI_5=
-XPCOM_VtblCall__IIIZZIIIIIIZZZZSI_6=
-XPCOM_VtblCall__IIIZZIIIIIIZZZZSI_7=
-XPCOM_VtblCall__IIIZZIIIIIIZZZZSI_8=
-XPCOM_VtblCall__IIIZZIIIIIIZZZZSI_9=
-XPCOM_VtblCall__IIIZZIIIIIIZZZZSI_10=
-XPCOM_VtblCall__IIIZZIIIIIIZZZZSI_11=
-XPCOM_VtblCall__IIIZZIIIIIIZZZZSI_12=
-XPCOM_VtblCall__IIIZZIIIIIIZZZZSI_13=
-XPCOM_VtblCall__IIIZZIIIIIIZZZZSI_14=
-XPCOM_VtblCall__IIIZZIIIIIIZZZZSI_15=
-XPCOM_VtblCall__IIIZZIIIIIIZZZZSI_16=
-
-XPCOM_VtblCall__IIIZZIZZZZII=
-XPCOM_VtblCall__IIIZZIZZZZII_0=
-XPCOM_VtblCall__IIIZZIZZZZII_1=
-XPCOM_VtblCall__IIIZZIZZZZII_2=
-XPCOM_VtblCall__IIIZZIZZZZII_3=
-XPCOM_VtblCall__IIIZZIZZZZII_4=
-XPCOM_VtblCall__IIIZZIZZZZII_5=
-XPCOM_VtblCall__IIIZZIZZZZII_6=
-XPCOM_VtblCall__IIIZZIZZZZII_7=
-XPCOM_VtblCall__IIIZZIZZZZII_8=
-XPCOM_VtblCall__IIIZZIZZZZII_9=
-XPCOM_VtblCall__IIIZZIZZZZII_10=
-XPCOM_VtblCall__IIIZZIZZZZII_11=
-
-XPCOM_VtblCall__IIIZ_3Z=
-XPCOM_VtblCall__IIIZ_3Z_0=
-XPCOM_VtblCall__IIIZ_3Z_1=
-XPCOM_VtblCall__IIIZ_3Z_2=
-XPCOM_VtblCall__IIIZ_3Z_3=
-XPCOM_VtblCall__IIIZ_3Z_4=
-
-XPCOM_VtblCall__III_3B=
-XPCOM_VtblCall__III_3B_0=
-XPCOM_VtblCall__III_3B_1=
-XPCOM_VtblCall__III_3B_2=
-XPCOM_VtblCall__III_3B_3=
-
-XPCOM_VtblCall__III_3BI_3I=
-XPCOM_VtblCall__III_3BI_3I_0=
-XPCOM_VtblCall__III_3BI_3I_1=
-XPCOM_VtblCall__III_3BI_3I_2=
-XPCOM_VtblCall__III_3BI_3I_3=
-XPCOM_VtblCall__III_3BI_3I_4=
-XPCOM_VtblCall__III_3BI_3I_5=
-
-XPCOM_VtblCall__III_3BZ=
-XPCOM_VtblCall__III_3BZ_0=
-XPCOM_VtblCall__III_3BZ_1=
-XPCOM_VtblCall__III_3BZ_2=
-XPCOM_VtblCall__III_3BZ_3=
-XPCOM_VtblCall__III_3BZ_4=
-
-XPCOM_VtblCall__III_3B_3B_3BI_3I=
-XPCOM_VtblCall__III_3B_3B_3BI_3I_0=
-XPCOM_VtblCall__III_3B_3B_3BI_3I_1=
-XPCOM_VtblCall__III_3B_3B_3BI_3I_2=
-XPCOM_VtblCall__III_3B_3B_3BI_3I_3=
-XPCOM_VtblCall__III_3B_3B_3BI_3I_4=
-XPCOM_VtblCall__III_3B_3B_3BI_3I_5=
-XPCOM_VtblCall__III_3B_3B_3BI_3I_6=
-XPCOM_VtblCall__III_3B_3B_3BI_3I_7=
-
-XPCOM_VtblCall__III_3B_3C=
-XPCOM_VtblCall__III_3B_3C_0=
-XPCOM_VtblCall__III_3B_3C_1=
-XPCOM_VtblCall__III_3B_3C_2=
-XPCOM_VtblCall__III_3B_3C_3=
-XPCOM_VtblCall__III_3B_3C_4=
-
-XPCOM_VtblCall__III_3B_3Z=
-XPCOM_VtblCall__III_3B_3Z_0=
-XPCOM_VtblCall__III_3B_3Z_1=
-XPCOM_VtblCall__III_3B_3Z_2=
-XPCOM_VtblCall__III_3B_3Z_3=
-XPCOM_VtblCall__III_3B_3Z_4=
-
-XPCOM_VtblCall__III_3C=
-XPCOM_VtblCall__III_3C_0=
-XPCOM_VtblCall__III_3C_1=
-XPCOM_VtblCall__III_3C_2=
-XPCOM_VtblCall__III_3C_3=
-
-XPCOM_VtblCall__III_3CI=
-XPCOM_VtblCall__III_3CI_0=
-XPCOM_VtblCall__III_3CI_1=
-XPCOM_VtblCall__III_3CI_2=
-XPCOM_VtblCall__III_3CI_3=
-XPCOM_VtblCall__III_3CI_4=
-
-XPCOM_VtblCall__III_3C_3C=
-XPCOM_VtblCall__III_3C_3C_0=
-XPCOM_VtblCall__III_3C_3C_1=
-XPCOM_VtblCall__III_3C_3C_2=
-XPCOM_VtblCall__III_3C_3C_3=
-XPCOM_VtblCall__III_3C_3C_4=
-
-XPCOM_VtblCall__III_3C_3CI_3C_3C_3C_3C_3Z_3I=
-XPCOM_VtblCall__III_3C_3CI_3C_3C_3C_3C_3Z_3I_0=
-XPCOM_VtblCall__III_3C_3CI_3C_3C_3C_3C_3Z_3I_1=
-XPCOM_VtblCall__III_3C_3CI_3C_3C_3C_3C_3Z_3I_2=
-XPCOM_VtblCall__III_3C_3CI_3C_3C_3C_3C_3Z_3I_3=
-XPCOM_VtblCall__III_3C_3CI_3C_3C_3C_3C_3Z_3I_4=
-XPCOM_VtblCall__III_3C_3CI_3C_3C_3C_3C_3Z_3I_5=
-XPCOM_VtblCall__III_3C_3CI_3C_3C_3C_3C_3Z_3I_6=
-XPCOM_VtblCall__III_3C_3CI_3C_3C_3C_3C_3Z_3I_7=
-XPCOM_VtblCall__III_3C_3CI_3C_3C_3C_3C_3Z_3I_8=
-XPCOM_VtblCall__III_3C_3CI_3C_3C_3C_3C_3Z_3I_9=
-XPCOM_VtblCall__III_3C_3CI_3C_3C_3C_3C_3Z_3I_10=
-XPCOM_VtblCall__III_3C_3CI_3C_3C_3C_3C_3Z_3I_11=
-
-XPCOM_VtblCall__III_3C_3CI_3I_3I_3Z=
-XPCOM_VtblCall__III_3C_3CI_3I_3I_3Z_0=
-XPCOM_VtblCall__III_3C_3CI_3I_3I_3Z_1=
-XPCOM_VtblCall__III_3C_3CI_3I_3I_3Z_2=
-XPCOM_VtblCall__III_3C_3CI_3I_3I_3Z_3=
-XPCOM_VtblCall__III_3C_3CI_3I_3I_3Z_4=
-XPCOM_VtblCall__III_3C_3CI_3I_3I_3Z_5=
-XPCOM_VtblCall__III_3C_3CI_3I_3I_3Z_6=
-XPCOM_VtblCall__III_3C_3CI_3I_3I_3Z_7=
-XPCOM_VtblCall__III_3C_3CI_3I_3I_3Z_8=
-
-XPCOM_VtblCall__III_3C_3C_3C_3Z=
-XPCOM_VtblCall__III_3C_3C_3C_3Z_0=
-XPCOM_VtblCall__III_3C_3C_3C_3Z_1=
-XPCOM_VtblCall__III_3C_3C_3C_3Z_2=
-XPCOM_VtblCall__III_3C_3C_3C_3Z_3=
-XPCOM_VtblCall__III_3C_3C_3C_3Z_4=
-XPCOM_VtblCall__III_3C_3C_3C_3Z_5=
-XPCOM_VtblCall__III_3C_3C_3C_3Z_6=
-
-XPCOM_VtblCall__III_3C_3C_3C_3Z_3Z=
-XPCOM_VtblCall__III_3C_3C_3C_3Z_3Z_0=
-XPCOM_VtblCall__III_3C_3C_3C_3Z_3Z_1=
-XPCOM_VtblCall__III_3C_3C_3C_3Z_3Z_2=
-XPCOM_VtblCall__III_3C_3C_3C_3Z_3Z_3=
-XPCOM_VtblCall__III_3C_3C_3C_3Z_3Z_4=
-XPCOM_VtblCall__III_3C_3C_3C_3Z_3Z_5=
-XPCOM_VtblCall__III_3C_3C_3C_3Z_3Z_6=
-XPCOM_VtblCall__III_3C_3C_3C_3Z_3Z_7=
-
-XPCOM_VtblCall__III_3C_3C_3I=
-XPCOM_VtblCall__III_3C_3C_3I_0=
-XPCOM_VtblCall__III_3C_3C_3I_1=
-XPCOM_VtblCall__III_3C_3C_3I_2=
-XPCOM_VtblCall__III_3C_3C_3I_3=
-XPCOM_VtblCall__III_3C_3C_3I_4=
-XPCOM_VtblCall__III_3C_3C_3I_5=
-
-XPCOM_VtblCall__III_3C_3C_3I_3C_3Z_3Z=
-XPCOM_VtblCall__III_3C_3C_3I_3C_3Z_3Z_0=
-XPCOM_VtblCall__III_3C_3C_3I_3C_3Z_3Z_1=
-XPCOM_VtblCall__III_3C_3C_3I_3C_3Z_3Z_2=
-XPCOM_VtblCall__III_3C_3C_3I_3C_3Z_3Z_3=
-XPCOM_VtblCall__III_3C_3C_3I_3C_3Z_3Z_4=
-XPCOM_VtblCall__III_3C_3C_3I_3C_3Z_3Z_5=
-XPCOM_VtblCall__III_3C_3C_3I_3C_3Z_3Z_6=
-XPCOM_VtblCall__III_3C_3C_3I_3C_3Z_3Z_7=
-XPCOM_VtblCall__III_3C_3C_3I_3C_3Z_3Z_8=
-
-XPCOM_VtblCall__III_3C_3C_3I_3I_3C_3Z_3Z=
-XPCOM_VtblCall__III_3C_3C_3I_3I_3C_3Z_3Z_0=
-XPCOM_VtblCall__III_3C_3C_3I_3I_3C_3Z_3Z_1=
-XPCOM_VtblCall__III_3C_3C_3I_3I_3C_3Z_3Z_2=
-XPCOM_VtblCall__III_3C_3C_3I_3I_3C_3Z_3Z_3=
-XPCOM_VtblCall__III_3C_3C_3I_3I_3C_3Z_3Z_4=
-XPCOM_VtblCall__III_3C_3C_3I_3I_3C_3Z_3Z_5=
-XPCOM_VtblCall__III_3C_3C_3I_3I_3C_3Z_3Z_6=
-XPCOM_VtblCall__III_3C_3C_3I_3I_3C_3Z_3Z_7=
-XPCOM_VtblCall__III_3C_3C_3I_3I_3C_3Z_3Z_8=
-XPCOM_VtblCall__III_3C_3C_3I_3I_3C_3Z_3Z_9=
-
-XPCOM_VtblCall__III_3C_3C_3Z=
-XPCOM_VtblCall__III_3C_3C_3Z_0=
-XPCOM_VtblCall__III_3C_3C_3Z_1=
-XPCOM_VtblCall__III_3C_3C_3Z_2=
-XPCOM_VtblCall__III_3C_3C_3Z_3=
-XPCOM_VtblCall__III_3C_3C_3Z_4=
-XPCOM_VtblCall__III_3C_3C_3Z_5=
-
-XPCOM_VtblCall__III_3I=
-XPCOM_VtblCall__III_3I_0=
-XPCOM_VtblCall__III_3I_1=
-XPCOM_VtblCall__III_3I_2=
-XPCOM_VtblCall__III_3I_3=
-
-XPCOM_VtblCall__III_3I_3I_3I_3I=
-XPCOM_VtblCall__III_3I_3I_3I_3I_0=
-XPCOM_VtblCall__III_3I_3I_3I_3I_1=
-XPCOM_VtblCall__III_3I_3I_3I_3I_2=
-XPCOM_VtblCall__III_3I_3I_3I_3I_3=
-XPCOM_VtblCall__III_3I_3I_3I_3I_4=
-XPCOM_VtblCall__III_3I_3I_3I_3I_5=
-XPCOM_VtblCall__III_3I_3I_3I_3I_6=
-
-XPCOM_VtblCall__III_3Z=
-XPCOM_VtblCall__III_3Z_0=
-XPCOM_VtblCall__III_3Z_1=
-XPCOM_VtblCall__III_3Z_2=
-XPCOM_VtblCall__III_3Z_3=
-
-XPCOM_VtblCall__IIJ=
-XPCOM_VtblCall__IIJ_0=
-XPCOM_VtblCall__IIJ_1=
-XPCOM_VtblCall__IIJ_2=
-
-XPCOM_VtblCall__IIJI=
-XPCOM_VtblCall__IIJI_0=
-XPCOM_VtblCall__IIJI_1=
-XPCOM_VtblCall__IIJI_2=
-XPCOM_VtblCall__IIJI_3=
-
-XPCOM_VtblCall__IIJJ=
-XPCOM_VtblCall__IIJJ_0=
-XPCOM_VtblCall__IIJJ_1=
-XPCOM_VtblCall__IIJJ_2=
-XPCOM_VtblCall__IIJJ_3=
-
-XPCOM_VtblCall__IIJJI=
-XPCOM_VtblCall__IIJJI_0=
-XPCOM_VtblCall__IIJJI_1=
-XPCOM_VtblCall__IIJJI_2=
-XPCOM_VtblCall__IIJJI_3=
-XPCOM_VtblCall__IIJJI_4=
-
-XPCOM_VtblCall__IIJJJJJ=
-XPCOM_VtblCall__IIJJJJJ_0=
-XPCOM_VtblCall__IIJJJJJ_1=
-XPCOM_VtblCall__IIJJJJJ_2=
-XPCOM_VtblCall__IIJJJJJ_3=
-XPCOM_VtblCall__IIJJJJJ_4=
-XPCOM_VtblCall__IIJJJJJ_5=
-XPCOM_VtblCall__IIJJJJJ_6=
-
-XPCOM_VtblCall__IIJJZ=
-XPCOM_VtblCall__IIJJZ_0=
-XPCOM_VtblCall__IIJJZ_1=
-XPCOM_VtblCall__IIJJZ_2=
-XPCOM_VtblCall__IIJJZ_3=
-XPCOM_VtblCall__IIJJZ_4=
-
-XPCOM_VtblCall__IIJJ_3I=
-XPCOM_VtblCall__IIJJ_3I_0=
-XPCOM_VtblCall__IIJJ_3I_1=
-XPCOM_VtblCall__IIJJ_3I_2=
-XPCOM_VtblCall__IIJJ_3I_3=
-XPCOM_VtblCall__IIJJ_3I_4=
-
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I_0=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I_1=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I_2=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I_3=
-
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_0=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_1=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_2=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_3=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_4=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_5=
-
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I_0=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I_1=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I_2=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I_3=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I_4=
-
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3Z=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3Z_0=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3Z_1=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3Z_2=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3Z_3=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3Z_4=
-
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_0=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_1=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_2=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_4=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_5=
-
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_0=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_1=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_2=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_3=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_4=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_5=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_6=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_7=
-
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I_0=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I_1=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I_2=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I_3=
-
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3Z=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3Z_0=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3Z_1=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3Z_2=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3Z_3=
-
-XPCOM_VtblCall__IIZ=
-XPCOM_VtblCall__IIZ_0=
-XPCOM_VtblCall__IIZ_1=
-XPCOM_VtblCall__IIZ_2=
-
-XPCOM_VtblCall__IIZI=
-XPCOM_VtblCall__IIZI_0=
-XPCOM_VtblCall__IIZI_1=
-XPCOM_VtblCall__IIZI_2=
-XPCOM_VtblCall__IIZI_3=
-
-XPCOM_VtblCall__IIZ_3Z=
-XPCOM_VtblCall__IIZ_3Z_0=
-XPCOM_VtblCall__IIZ_3Z_1=
-XPCOM_VtblCall__IIZ_3Z_2=
-XPCOM_VtblCall__IIZ_3Z_3=
-
-XPCOM_VtblCall__II_3B=
-XPCOM_VtblCall__II_3B_0=
-XPCOM_VtblCall__II_3B_1=
-XPCOM_VtblCall__II_3B_2=
-
-XPCOM_VtblCall__II_3BI=
-XPCOM_VtblCall__II_3BI_0=
-XPCOM_VtblCall__II_3BI_1=
-XPCOM_VtblCall__II_3BI_2=
-XPCOM_VtblCall__II_3BI_3=
-
-XPCOM_VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I=
-XPCOM_VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_0=
-XPCOM_VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_1=
-XPCOM_VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_2=
-XPCOM_VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_3=
-XPCOM_VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_4=
-XPCOM_VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_5=
-
-XPCOM_VtblCall__II_3BI_3I=
-XPCOM_VtblCall__II_3BI_3I_0=
-XPCOM_VtblCall__II_3BI_3I_1=
-XPCOM_VtblCall__II_3BI_3I_2=
-XPCOM_VtblCall__II_3BI_3I_3=
-XPCOM_VtblCall__II_3BI_3I_4=
-
-XPCOM_VtblCall__II_3BJ=
-XPCOM_VtblCall__II_3BJ_0=
-XPCOM_VtblCall__II_3BJ_1=
-XPCOM_VtblCall__II_3BJ_2=
-XPCOM_VtblCall__II_3BJ_3=
-
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I=
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I_0=
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I_1=
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I_2=
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I_3=
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I_4=
-
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I=
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I_0=
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I_1=
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I_2=
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I_3=
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I_4=
-
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3Z=
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3Z_0=
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3Z_1=
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3Z_2=
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3Z_3=
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3Z_4=
-
-XPCOM_VtblCall__II_3BZI_3I_3Z=
-XPCOM_VtblCall__II_3BZI_3I_3Z_0=
-XPCOM_VtblCall__II_3BZI_3I_3Z_1=
-XPCOM_VtblCall__II_3BZI_3I_3Z_2=
-XPCOM_VtblCall__II_3BZI_3I_3Z_3=
-XPCOM_VtblCall__II_3BZI_3I_3Z_4=
-XPCOM_VtblCall__II_3BZI_3I_3Z_5=
-XPCOM_VtblCall__II_3BZI_3I_3Z_6=
-
-XPCOM_VtblCall__II_3BZ_3I_3Z=
-XPCOM_VtblCall__II_3BZ_3I_3Z_0=
-XPCOM_VtblCall__II_3BZ_3I_3Z_1=
-XPCOM_VtblCall__II_3BZ_3I_3Z_2=
-XPCOM_VtblCall__II_3BZ_3I_3Z_3=
-XPCOM_VtblCall__II_3BZ_3I_3Z_4=
-XPCOM_VtblCall__II_3BZ_3I_3Z_5=
-
-XPCOM_VtblCall__II_3B_3B=
-XPCOM_VtblCall__II_3B_3B_0=
-XPCOM_VtblCall__II_3B_3B_1=
-XPCOM_VtblCall__II_3B_3B_2=
-XPCOM_VtblCall__II_3B_3B_3=
-
-XPCOM_VtblCall__II_3B_3BZ=
-XPCOM_VtblCall__II_3B_3BZ_0=
-XPCOM_VtblCall__II_3B_3BZ_1=
-XPCOM_VtblCall__II_3B_3BZ_2=
-XPCOM_VtblCall__II_3B_3BZ_3=
-XPCOM_VtblCall__II_3B_3BZ_4=
-
-XPCOM_VtblCall__II_3B_3B_3BZZ_3I=
-XPCOM_VtblCall__II_3B_3B_3BZZ_3I_0=
-XPCOM_VtblCall__II_3B_3B_3BZZ_3I_1=
-XPCOM_VtblCall__II_3B_3B_3BZZ_3I_2=
-XPCOM_VtblCall__II_3B_3B_3BZZ_3I_3=
-XPCOM_VtblCall__II_3B_3B_3BZZ_3I_4=
-XPCOM_VtblCall__II_3B_3B_3BZZ_3I_5=
-XPCOM_VtblCall__II_3B_3B_3BZZ_3I_6=
-XPCOM_VtblCall__II_3B_3B_3BZZ_3I_7=
-
-XPCOM_VtblCall__II_3B_3B_3I=
-XPCOM_VtblCall__II_3B_3B_3I_0=
-XPCOM_VtblCall__II_3B_3B_3I_1=
-XPCOM_VtblCall__II_3B_3B_3I_2=
-XPCOM_VtblCall__II_3B_3B_3I_3=
-XPCOM_VtblCall__II_3B_3B_3I_4=
-
-XPCOM_VtblCall__II_3B_3I=
-XPCOM_VtblCall__II_3B_3I_0=
-XPCOM_VtblCall__II_3B_3I_1=
-XPCOM_VtblCall__II_3B_3I_2=
-XPCOM_VtblCall__II_3B_3I_3=
-
-XPCOM_VtblCall__II_3B_3I_3I=
-XPCOM_VtblCall__II_3B_3I_3I_0=
-XPCOM_VtblCall__II_3B_3I_3I_1=
-XPCOM_VtblCall__II_3B_3I_3I_2=
-XPCOM_VtblCall__II_3B_3I_3I_3=
-XPCOM_VtblCall__II_3B_3I_3I_4=
-
-XPCOM_VtblCall__II_3B_3I_3Z=
-XPCOM_VtblCall__II_3B_3I_3Z_0=
-XPCOM_VtblCall__II_3B_3I_3Z_1=
-XPCOM_VtblCall__II_3B_3I_3Z_2=
-XPCOM_VtblCall__II_3B_3I_3Z_3=
-XPCOM_VtblCall__II_3B_3I_3Z_4=
-
-XPCOM_VtblCall__II_3B_3J=
-XPCOM_VtblCall__II_3B_3J_0=
-XPCOM_VtblCall__II_3B_3J_1=
-XPCOM_VtblCall__II_3B_3J_2=
-XPCOM_VtblCall__II_3B_3J_3=
-
-XPCOM_VtblCall__II_3B_3Z=
-XPCOM_VtblCall__II_3B_3Z_0=
-XPCOM_VtblCall__II_3B_3Z_1=
-XPCOM_VtblCall__II_3B_3Z_2=
-XPCOM_VtblCall__II_3B_3Z_3=
-
-XPCOM_VtblCall__II_3B_3Z_3I=
-XPCOM_VtblCall__II_3B_3Z_3I_0=
-XPCOM_VtblCall__II_3B_3Z_3I_1=
-XPCOM_VtblCall__II_3B_3Z_3I_2=
-XPCOM_VtblCall__II_3B_3Z_3I_3=
-XPCOM_VtblCall__II_3B_3Z_3I_4=
-
-XPCOM_VtblCall__II_3C=
-XPCOM_VtblCall__II_3C_0=
-XPCOM_VtblCall__II_3C_1=
-XPCOM_VtblCall__II_3C_2=
-
-XPCOM_VtblCall__II_3CIIII=
-XPCOM_VtblCall__II_3CIIII_0=
-XPCOM_VtblCall__II_3CIIII_1=
-XPCOM_VtblCall__II_3CIIII_2=
-XPCOM_VtblCall__II_3CIIII_3=
-XPCOM_VtblCall__II_3CIIII_4=
-XPCOM_VtblCall__II_3CIIII_5=
-XPCOM_VtblCall__II_3CIIII_6=
-
-XPCOM_VtblCall__II_3CI_3I=
-XPCOM_VtblCall__II_3CI_3I_0=
-XPCOM_VtblCall__II_3CI_3I_1=
-XPCOM_VtblCall__II_3CI_3I_2=
-XPCOM_VtblCall__II_3CI_3I_3=
-XPCOM_VtblCall__II_3CI_3I_4=
-
-XPCOM_VtblCall__II_3CZ=
-XPCOM_VtblCall__II_3CZ_0=
-XPCOM_VtblCall__II_3CZ_1=
-XPCOM_VtblCall__II_3CZ_2=
-XPCOM_VtblCall__II_3CZ_3=
-
-XPCOM_VtblCall__II_3C_3C=
-XPCOM_VtblCall__II_3C_3C_0=
-XPCOM_VtblCall__II_3C_3C_1=
-XPCOM_VtblCall__II_3C_3C_2=
-XPCOM_VtblCall__II_3C_3C_3=
-
-XPCOM_VtblCall__II_3C_3C_3CZ=
-XPCOM_VtblCall__II_3C_3C_3CZ_0=
-XPCOM_VtblCall__II_3C_3C_3CZ_1=
-XPCOM_VtblCall__II_3C_3C_3CZ_2=
-XPCOM_VtblCall__II_3C_3C_3CZ_3=
-XPCOM_VtblCall__II_3C_3C_3CZ_4=
-XPCOM_VtblCall__II_3C_3C_3CZ_5=
-
-XPCOM_VtblCall__II_3C_3Z=
-XPCOM_VtblCall__II_3C_3Z_0=
-XPCOM_VtblCall__II_3C_3Z_1=
-XPCOM_VtblCall__II_3C_3Z_2=
-XPCOM_VtblCall__II_3C_3Z_3=
-
-XPCOM_VtblCall__II_3F=
-XPCOM_VtblCall__II_3F_0=
-XPCOM_VtblCall__II_3F_1=
-XPCOM_VtblCall__II_3F_2=
-
-XPCOM_VtblCall__II_3I=
-XPCOM_VtblCall__II_3I_0=
-XPCOM_VtblCall__II_3I_1=
-XPCOM_VtblCall__II_3I_2=
-
-XPCOM_VtblCall__II_3I_3I=
-XPCOM_VtblCall__II_3I_3I_0=
-XPCOM_VtblCall__II_3I_3I_1=
-XPCOM_VtblCall__II_3I_3I_2=
-XPCOM_VtblCall__II_3I_3I_3=
-
-XPCOM_VtblCall__II_3I_3I_3I=
-XPCOM_VtblCall__II_3I_3I_3I_0=
-XPCOM_VtblCall__II_3I_3I_3I_1=
-XPCOM_VtblCall__II_3I_3I_3I_2=
-XPCOM_VtblCall__II_3I_3I_3I_3=
-XPCOM_VtblCall__II_3I_3I_3I_4=
-
-XPCOM_VtblCall__II_3I_3I_3I_3I=
-XPCOM_VtblCall__II_3I_3I_3I_3I_0=
-XPCOM_VtblCall__II_3I_3I_3I_3I_1=
-XPCOM_VtblCall__II_3I_3I_3I_3I_2=
-XPCOM_VtblCall__II_3I_3I_3I_3I_3=
-XPCOM_VtblCall__II_3I_3I_3I_3I_4=
-XPCOM_VtblCall__II_3I_3I_3I_3I_5=
-
-XPCOM_VtblCall__II_3I_3J=
-XPCOM_VtblCall__II_3I_3J_0=
-XPCOM_VtblCall__II_3I_3J_1=
-XPCOM_VtblCall__II_3I_3J_2=
-XPCOM_VtblCall__II_3I_3J_3=
-
-XPCOM_VtblCall__II_3I_3J_3I=
-XPCOM_VtblCall__II_3I_3J_3I_0=
-XPCOM_VtblCall__II_3I_3J_3I_1=
-XPCOM_VtblCall__II_3I_3J_3I_2=
-XPCOM_VtblCall__II_3I_3J_3I_3=
-XPCOM_VtblCall__II_3I_3J_3I_4=
-
-XPCOM_VtblCall__II_3J=
-XPCOM_VtblCall__II_3J_0=
-XPCOM_VtblCall__II_3J_1=
-XPCOM_VtblCall__II_3J_2=
-
-XPCOM_VtblCall__II_3S=
-XPCOM_VtblCall__II_3S_0=
-XPCOM_VtblCall__II_3S_1=
-XPCOM_VtblCall__II_3S_2=
-
-XPCOM_VtblCall__II_3Z=
-XPCOM_VtblCall__II_3Z_0=
-XPCOM_VtblCall__II_3Z_1=
-XPCOM_VtblCall__II_3Z_2=
-
-XPCOM_XPCOMGlueShutdown=
-
-XPCOM_XPCOMGlueStartup=
-XPCOM_XPCOMGlueStartup_0=
-
-XPCOM_memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I=
-XPCOM_memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I_0=
-XPCOM_memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I_1=
-XPCOM_memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I_2=
-
-XPCOM_memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2II=
-XPCOM_memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2II_0=
-XPCOM_memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2II_1=
-XPCOM_memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2II_2=
-
-XPCOM_nsEmbedCString_Length=
-XPCOM_nsEmbedCString_Length_0=
-
-XPCOM_nsEmbedCString_delete=
-XPCOM_nsEmbedCString_delete_0=
-
-XPCOM_nsEmbedCString_get=
-XPCOM_nsEmbedCString_get_0=
-
-XPCOM_nsEmbedCString_1new__=
-
-XPCOM_nsEmbedCString_1new__II=
-XPCOM_nsEmbedCString_1new__II_0=
-XPCOM_nsEmbedCString_1new__II_1=
-
-XPCOM_nsEmbedCString_1new___3BI=
-XPCOM_nsEmbedCString_1new___3BI_0=
-XPCOM_nsEmbedCString_1new___3BI_1=
-
-XPCOM_nsEmbedString_Length=
-XPCOM_nsEmbedString_Length_0=
-
-XPCOM_nsEmbedString_delete=
-XPCOM_nsEmbedString_delete_0=
-
-XPCOM_nsEmbedString_get=
-XPCOM_nsEmbedString_get_0=
-
-XPCOM_nsEmbedString_1new__=
-
-XPCOM_nsEmbedString_1new___3C=
-XPCOM_nsEmbedString_1new___3C_0=
-
-XPCOM_nsID_Equals=
-XPCOM_nsID_Equals_0=
-XPCOM_nsID_Equals_1=
-
-XPCOM_nsID_delete=
-XPCOM_nsID_delete_0=
-
-XPCOM_nsID_new=
-
-XPCOM_strlen_PRUnichar=
-XPCOM_strlen_PRUnichar_0=
-
-
-org_eclipse_swt_internal_mozilla_XPCOMInit=flags=cpp
-XPCOMInit_GREVersionRange_sizeof=
-
-XPCOMInit_GRE_GetGREPathWithProperties=
-XPCOMInit_GRE_GetGREPathWithProperties_0=cast=(const GREVersionRange *)
-XPCOMInit_GRE_GetGREPathWithProperties_1=
-XPCOMInit_GRE_GetGREPathWithProperties_2=cast=(const GREProperty *)
-XPCOMInit_GRE_GetGREPathWithProperties_3=
-XPCOMInit_GRE_GetGREPathWithProperties_4=cast=(char *)
-XPCOMInit_GRE_GetGREPathWithProperties_5=
-
-XPCOMInit_XPCOMGlueShutdown=
-
-XPCOMInit_XPCOMGlueStartup=
-XPCOMInit_XPCOMGlueStartup_0=cast=(const char *)
-
-
-org_eclipse_swt_internal_mozilla_XPCOMObject=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsEmbedString=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIAppShell=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIBaseWindow=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsICancelable=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsICategoryManager=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIComponentManager=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIComponentRegistrar=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIContextMenuListener=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsICookie=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsICookieManager=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsID=flags=no_gen
-nsID_m0=
-nsID_m1=
-nsID_m2=
-nsID_m3=
-
-org_eclipse_swt_internal_mozilla_nsIDOMEvent=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIDOMEventTarget=
-
-org_eclipse_swt_internal_mozilla_nsIDOMKeyEvent=
-
-org_eclipse_swt_internal_mozilla_nsIDOMMouseEvent=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIDOMSerializer=
-
-org_eclipse_swt_internal_mozilla_nsIDOMSerializer_11_17=
-
-org_eclipse_swt_internal_mozilla_nsIDOMUIEvent=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIDOMWindow=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIDOMWindowCollection=
-
-org_eclipse_swt_internal_mozilla_nsIDirectoryService=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIDirectoryServiceProvider=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIDirectoryServiceProvider2=
-
-org_eclipse_swt_internal_mozilla_nsIDocShell=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIDocShell_11_18=
-
-org_eclipse_swt_internal_mozilla_nsIDownload=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIDownload_11_18=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIEmbeddingSiteWindow=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIFactory=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIFile=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIFilePicker=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIFilePicker_11_18=
-
-org_eclipse_swt_internal_mozilla_nsIHelperAppLauncher=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIHelperAppLauncherDialog=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIHelperAppLauncher_11_18=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIIOService=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIInputStream=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIInterfaceRequestor=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIJSContextStack=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsILocalFile=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIMemory=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIObserverService=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIPrefBranch=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIPrefLocalizedString=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIPrefService=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIProgressDialog=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIProgressDialog_11_18=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIPromptService=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIProperties=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIRequest=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIServiceManager=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsISimpleEnumerator=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsISupports=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsISupportsWeakReference=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsITooltipListener=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsITransfer=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIURI=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIURIContentListener=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIWeakReference=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIWebBrowser=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIWebBrowserChrome=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIWebBrowserChromeFocus=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIWebBrowserFocus=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIWebNavigation=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIWebNavigationInfo=
-
-org_eclipse_swt_internal_mozilla_nsIWebProgress=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIWebProgressListener=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIWebProgressListener2=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIWindowCreator=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIWindowCreator2=
-
-org_eclipse_swt_internal_mozilla_nsIWindowWatcher=flags=no_gen
-
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.init.XPCOMInit.properties b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.init.XPCOMInit.properties
new file mode 100644
index 0000000..c8f1a20
--- /dev/null
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.init.XPCOMInit.properties
@@ -0,0 +1,33 @@
+###############################################################################
+# 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
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
+org_eclipse_swt_internal_mozilla_init_GREVersionRange=flags=cpp
+GREVersionRange_lower=cast=(const char *)
+GREVersionRange_lowerInclusive=
+GREVersionRange_upper=cast=(const char *)
+GREVersionRange_upperInclusive=
+
+org_eclipse_swt_internal_mozilla_init_XPCOMInit=flags=cpp
+XPCOMInit_GREVersionRange_sizeof=
+
+XPCOMInit__GRE_GetGREPathWithProperties=
+XPCOMInit__GRE_GetGREPathWithProperties_0=cast=(const GREVersionRange *)
+XPCOMInit__GRE_GetGREPathWithProperties_1=
+XPCOMInit__GRE_GetGREPathWithProperties_2=cast=(const GREProperty *)
+XPCOMInit__GRE_GetGREPathWithProperties_3=
+XPCOMInit__GRE_GetGREPathWithProperties_4=cast=(char *)
+XPCOMInit__GRE_GetGREPathWithProperties_5=
+
+XPCOMInit__XPCOMGlueShutdown=
+
+XPCOMInit__XPCOMGlueStartup=
+XPCOMInit__XPCOMGlueStartup_0=cast=(const char *)
+
+
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.properties b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.properties
index 2c74898..b21c28b 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.properties
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.properties
@@ -37,7 +37,7 @@
 org.eclipse.swt.internal.gtk.OS,../org.eclipse.swt/Eclipse SWT PI/gtk/library/,\
 org.eclipse.swt.internal.motif.OS,../org.eclipse.swt/Eclipse SWT PI/motif/library/,\
 org.eclipse.swt.internal.mozilla.XPCOM,../org.eclipse.swt/Eclipse SWT Mozilla/common/library/,\
-org.eclipse.swt.internal.mozilla.XPCOMInit,../org.eclipse.swt/Eclipse SWT Mozilla/common/library/,\
+org.eclipse.swt.internal.mozilla.init.XPCOMInit,../org.eclipse.swt/Eclipse SWT Mozilla/common/library/,\
 org.eclipse.swt.internal.ole.win32.COM,../org.eclipse.swt/Eclipse SWT PI/win32/library/,\
 org.eclipse.swt.internal.photon.OS,../org.eclipse.swt/Eclipse SWT PI/photon/library/,\
 org.eclipse.swt.internal.win32.OS,../org.eclipse.swt/Eclipse SWT PI/win32/library/,\
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/nsIScriptContext.h b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/nsIScriptContext.h
new file mode 100644
index 0000000..783cf3d
--- /dev/null
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/nsIScriptContext.h
@@ -0,0 +1,468 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998-1999
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/*
+ * This file is derived from the Original Code provided by mozilla.org,
+ * whose Initial Developer is Netscape Communications Corporation.  Changes
+ * to the original file were made by SWT on April 7, 2009 and are marked
+ * with trailing comment "//SWT-20090407".
+ */
+
+#ifndef nsIScriptContext_h__
+#define nsIScriptContext_h__
+
+#include "nscore.h"
+//#include "nsStringGlue.h" //SWT-20090407
+#include "nsISupports.h"
+#include "nsCOMPtr.h"
+#include "nsIProgrammingLanguage.h"
+
+class nsIScriptGlobalObject;
+class nsIScriptSecurityManager;
+class nsIPrincipal;
+class nsIAtom;
+class nsIArray;
+class nsIVariant;
+class nsIObjectInputStream;
+class nsIObjectOutputStream;
+class nsScriptObjectHolder;
+
+typedef void (*nsScriptTerminationFunc)(nsISupports* aRef);
+
+#define NS_ISCRIPTCONTEXT_IID \
+{ /* {e7b9871d-3adc-4bf7-850d-7fb9554886bf} */ \
+  0xe7b9871d, 0x3adc, 0x4bf7, \
+ { 0x85, 0x0d, 0x7f, 0xb9, 0x55, 0x48, 0x86, 0xbf } }
+
+/* This MUST match JSVERSION_DEFAULT.  This version stuff if we don't
+   know what language we have is a little silly... */
+#define SCRIPTVERSION_DEFAULT JSVERSION_DEFAULT
+
+/**
+ * It is used by the application to initialize a runtime and run scripts.
+ * A script runtime would implement this interface.
+ * <P><I>It does have a bit too much java script information now, that
+ * should be removed in a short time. Ideally this interface will be
+ * language neutral</I>
+ */
+class nsIScriptContext : public nsISupports
+{
+public:
+//NS_DECLARE_STATIC_IID_ACCESSOR(NS_ISCRIPTCONTEXT_IID) //SWT-20090407
+
+  /* Get the ID of this language. */
+  virtual PRUint32 GetScriptTypeID() = 0;
+
+  /**
+   * Compile and execute a script.
+   *
+   * @param aScript a string representing the script to be executed
+   * @param aScopeObject a script object for the scope to execute in, or
+   *                     nsnull to use a default scope
+   * @param aPrincipal the principal that produced the script
+   * @param aURL the URL or filename for error messages
+   * @param aLineNo the starting line number of the script for error messages
+   * @param aVersion the script language version to use when executing
+   * @param aRetValue the result of executing the script, or null for no result.
+   *        If this is a JS context, it's the caller's responsibility to
+   *        preserve aRetValue from GC across this call
+   * @param aIsUndefined true if the result of executing the script is the
+   *                     undefined value
+   *
+   * @return NS_OK if the script was valid and got executed
+   *
+   **/
+  virtual nsresult EvaluateString(const nsAString& aScript,
+                                  void *aScopeObject,
+                                  nsIPrincipal *aPrincipal,
+                                  const char *aURL,
+                                  PRUint32 aLineNo,
+                                  PRUint32 aVersion,
+                                  nsAString *aRetValue,
+                                  PRBool* aIsUndefined) = 0;
+
+  // Note JS bigotry remains here - 'void *aRetValue' is assumed to be a
+  // jsval.  This must move to JSObject before it can be made agnostic.
+  virtual nsresult EvaluateStringWithValue(const nsAString& aScript,
+                                           void *aScopeObject,
+                                           nsIPrincipal *aPrincipal,
+                                           const char *aURL,
+                                           PRUint32 aLineNo,
+                                           PRUint32 aVersion,
+                                           void* aRetValue,
+                                           PRBool* aIsUndefined) = 0;
+
+  /**
+   * Compile a script.
+   *
+   * @param aText a PRUnichar buffer containing script source
+   * @param aTextLength number of characters in aText
+   * @param aScopeObject an object telling the scope in which to execute,
+   *                     or nsnull to use a default scope
+   * @param aPrincipal the principal that produced the script
+   * @param aURL the URL or filename for error messages
+   * @param aLineNo the starting line number of the script for error messages
+   * @param aVersion the script language version to use when executing
+   * @param aScriptObject an executable object that's the result of compiling
+   *                      the script.
+   *
+   * @return NS_OK if the script source was valid and got compiled.
+   *
+   **/
+  virtual nsresult CompileScript(const PRUnichar* aText,
+                                 PRInt32 aTextLength,
+                                 void* aScopeObject,
+                                 nsIPrincipal* aPrincipal,
+                                 const char* aURL,
+                                 PRUint32 aLineNo,
+                                 PRUint32 aVersion,
+                                 nsScriptObjectHolder &aScriptObject) = 0;
+
+  /**
+   * Execute a precompiled script object.
+   *
+   * @param aScriptObject an object representing the script to be executed
+   * @param aScopeObject an object telling the scope in which to execute,
+   *                     or nsnull to use a default scope
+   * @param aRetValue the result of executing the script, may be null in
+   *                  which case no result string is computed
+   * @param aIsUndefined true if the result of executing the script is the
+   *                     undefined value, may be null for "don't care"
+   *
+   * @return NS_OK if the script was valid and got executed
+   *
+   */
+  virtual nsresult ExecuteScript(void* aScriptObject,
+                                 void* aScopeObject,
+                                 nsAString* aRetValue,
+                                 PRBool* aIsUndefined) = 0;
+
+  /**
+   * Compile the event handler named by atom aName, with function body aBody
+   * into a function object returned if ok via aHandler.  Does NOT bind the
+   * function to anything - BindCompiledEventHandler() should be used for that
+   * purpose.  Note that this event handler is always considered 'shared' and
+   * hence is compiled without principals.  Never call the returned object
+   * directly - it must be bound (and thereby cloned, and therefore have the 
+   * correct principals) before use!
+   *
+   * @param aName an nsIAtom pointer naming the function; it must be lowercase
+   *        and ASCII, and should not be longer than 63 chars.  This bound on
+   *        length is enforced only by assertions, so caveat caller!
+   * @param aEventName the name that the event object should be bound to
+   * @param aBody the event handler function's body
+   * @param aURL the URL or filename for error messages
+   * @param aLineNo the starting line number of the script for error messages
+   * @param aVersion the script language version to use when executing
+   * @param aHandler the out parameter in which a void pointer to the compiled
+   *        function object is stored on success
+   *
+   * @return NS_OK if the function body was valid and got compiled
+   */
+  virtual nsresult CompileEventHandler(nsIAtom* aName,
+                                       PRUint32 aArgCount,
+                                       const char** aArgNames,
+                                       const nsAString& aBody,
+                                       const char* aURL,
+                                       PRUint32 aLineNo,
+                                       PRUint32 aVersion,
+                                       nsScriptObjectHolder &aHandler) = 0;
+
+  /**
+   * Call the function object with given args and return its boolean result,
+   * or true if the result isn't boolean.
+   *
+   * @param aTarget the event target
+   * @param aScript an object telling the scope in which to call the compiled
+   *        event handler function.
+   * @param aHandler function object (function and static scope) to invoke.
+   * @param argv array of arguments.  Note each element is assumed to
+   *        be an nsIVariant.
+   * @param rval out parameter returning result
+   **/
+  virtual nsresult CallEventHandler(nsISupports* aTarget,
+                                    void *aScope, void* aHandler,
+                                    nsIArray *argv, nsIVariant **rval) = 0;
+
+  /**
+   * Bind an already-compiled event handler function to a name in the given
+   * scope object.  The same restrictions on aName (lowercase ASCII, not too
+   * long) applies here as for CompileEventHandler.  Scripting languages with
+   * static scoping must re-bind the scope chain for aHandler to begin (after
+   * the activation scope for aHandler itself, typically) with aTarget's scope.
+   *
+   * Logically, this 'bind' operation is more of a 'copy' - it simply
+   * stashes/associates the event handler function with the event target, so
+   * it can be fetched later with GetBoundEventHandler().
+   *
+   * @param aTarget an object telling the scope in which to bind the compiled
+   *        event handler function.  The context will presumably associate
+   *        this nsISupports with a native script object.
+   * @param aName an nsIAtom pointer naming the function; it must be lowercase
+   *        and ASCII, and should not be longer than 63 chars.  This bound on
+   *        length is enforced only by assertions, so caveat caller!
+   * @param aHandler the function object to name, created by an earlier call to
+   *        CompileEventHandler
+   * @return NS_OK if the function was successfully bound to the name
+   *
+   * XXXmarkh - fold this in with SetProperty?  Exactly the same concept!
+   */
+  virtual nsresult BindCompiledEventHandler(nsISupports* aTarget, void *aScope,
+                                            nsIAtom* aName,
+                                            void* aHandler) = 0;
+
+  /**
+   * Lookup a previously bound event handler for the specified target.  This
+   * will return an object equivilent to the one passed to
+   * BindCompiledEventHandler (although the pointer may not be the same).
+   *
+   */
+  virtual nsresult GetBoundEventHandler(nsISupports* aTarget, void *aScope,
+                                        nsIAtom* aName,
+                                        nsScriptObjectHolder &aHandler) = 0;
+
+  /**
+   * Compile a function that isn't used as an event handler.
+   *
+   * NOTE: Not yet language agnostic (main problem is XBL - not yet agnostic)
+   * Caller must make sure aFunctionObject is a JS GC root.
+   *
+   **/
+  virtual nsresult CompileFunction(void* aTarget,
+                                   const nsACString& aName,
+                                   PRUint32 aArgCount,
+                                   const char** aArgArray,
+                                   const nsAString& aBody,
+                                   const char* aURL,
+                                   PRUint32 aLineNo,
+                                   PRUint32 aVersion,
+                                   PRBool aShared,
+                                   void **aFunctionObject) = 0;
+
+  /**
+   * Set the default scripting language version for this context, which must
+   * be a context specific to a particular scripting language.
+   *
+   **/
+  virtual void SetDefaultLanguageVersion(PRUint32 aVersion) = 0;
+
+  /**
+   * Return the global object.
+   *
+   **/
+  virtual nsIScriptGlobalObject *GetGlobalObject() = 0;
+
+  /**
+   * Return the native script context
+   *
+   **/
+  virtual void *GetNativeContext() = 0;
+
+  /**
+   * Return the native global object for this context.
+   *
+   **/
+  virtual void *GetNativeGlobal() = 0;
+
+  /**
+   * Create a new global object that will be used for an inner window.
+   * Return the native global and an nsISupports 'holder' that can be used
+   * to manage the lifetime of it.
+   */
+  virtual nsresult CreateNativeGlobalForInner(
+                                      nsIScriptGlobalObject *aNewInner,
+                                      PRBool aIsChrome,
+                                      void **aNativeGlobal,
+                                      nsISupports **aHolder) = 0;
+
+  /**
+   * Connect this context to a new inner window, to allow "prototype"
+   * chaining from the inner to the outer.
+   * Called after both the the inner and outer windows are initialized
+   **/
+  virtual nsresult ConnectToInner(nsIScriptGlobalObject *aNewInner,
+                                  void *aOuterGlobal) = 0;
+
+
+  /**
+   * Init this context ready for use.  If aGlobalObject is not NULL, this
+   * function may initialize based on this global (for example, using the
+   * global to locate a chrome window, create a new 'scope' for this
+   * global, etc)
+   *
+   * @param aGlobalObject the gobal object, which may be nsnull.
+   *
+   * @return NS_OK if context initialization was successful
+   *
+   **/
+  virtual nsresult InitContext(nsIScriptGlobalObject *aGlobalObject) = 0;
+
+  /**
+   * Check to see if context is as yet intialized. Used to prevent
+   * reentrancy issues during the initialization process.
+   *
+   * @return PR_TRUE if initialized, PR_FALSE if not
+   *
+   */
+  virtual PRBool IsContextInitialized() = 0;
+
+  /**
+   * Called as the global object discards its reference to the context.
+   */
+  virtual void FinalizeContext() = 0;
+
+  /**
+   * For garbage collected systems, do a synchronous collection pass.
+   * May be a no-op on other systems
+   *
+   * @return NS_OK if the method is successful
+   */
+  virtual void GC() = 0;
+
+  /**
+   * Inform the context that a script was evaluated.
+   * A GC may be done if "necessary."
+   * This call is necessary if script evaluation is done
+   * without using the EvaluateScript method.
+   * @param aTerminated If true then call termination function if it was 
+   *    previously set. Within DOM this will always be true, but outside 
+   *    callers (such as xpconnect) who may do script evaluations nested
+   *    inside DOM script evaluations can pass false to avoid premature
+   *    calls to the termination function.
+   * @return NS_OK if the method is successful
+   */
+  virtual void ScriptEvaluated(PRBool aTerminated) = 0;
+
+  virtual nsresult Serialize(nsIObjectOutputStream* aStream,
+                             void *aScriptObject) = 0;
+  
+  /* Deserialize a script from a stream.
+   */
+  virtual nsresult Deserialize(nsIObjectInputStream* aStream,
+                               nsScriptObjectHolder &aResult) = 0;
+
+  /**
+   * JS only - this function need not be implemented by languages other
+   * than JS (ie, this should be moved to a private interface!)
+   * Called to specify a function that should be called when the current
+   * script (if there is one) terminates. Generally used if breakdown
+   * of script state needs to happen, but should be deferred till
+   * the end of script evaluation.
+   *
+   * @throws NS_ERROR_OUT_OF_MEMORY if that happens
+   */
+  virtual nsresult SetTerminationFunction(nsScriptTerminationFunc aFunc,
+                                          nsISupports* aRef) = 0;
+
+  /**
+   * Called to disable/enable script execution in this context.
+   */
+  virtual PRBool GetScriptsEnabled() = 0;
+  virtual void SetScriptsEnabled(PRBool aEnabled, PRBool aFireTimeouts) = 0;
+
+  // SetProperty is suspect and jst believes should not be needed.  Currenly
+  // used only for "arguments".
+  virtual nsresult SetProperty(void *aTarget, const char *aPropName, nsISupports *aVal) = 0;
+  /** 
+   * Called to set/get information if the script context is
+   * currently processing a script tag
+   */
+  virtual PRBool GetProcessingScriptTag() = 0;
+  virtual void SetProcessingScriptTag(PRBool aResult) = 0;
+
+  /**
+   * Tell the context whether or not to GC when destroyed.  An optimization
+   * used when the window is a [i]frame, so GC will happen anyway.
+   */
+  virtual void SetGCOnDestruction(PRBool aGCOnDestruction) = 0;
+
+  /**
+   * Initialize DOM classes on aGlobalObj, always call
+   * WillInitializeContext() before calling InitContext(), and always
+   * call DidInitializeContext() when a context is fully
+   * (successfully) initialized.
+   */
+  virtual nsresult InitClasses(void *aGlobalObj) = 0;
+
+  /**
+   * Clear the scope object - may be called either as we are being torn down,
+   * or before we are attached to a different document.
+   *
+   * aClearFromProtoChain is probably somewhat JavaScript specific.  It
+   * indicates that the global scope polluter should be removed from the
+   * prototype chain and that the objects in the prototype chain should
+   * also have their scopes cleared.  We don't do this all the time
+   * because the prototype chain is shared between inner and outer
+   * windows, and needs to stay with inner windows that we're keeping
+   * around.
+   */
+  virtual void ClearScope(void* aGlobalObj, PRBool aClearFromProtoChain) = 0;
+
+  /**
+   * Tell the context we're about to be reinitialize it.
+   */
+  virtual void WillInitializeContext() = 0;
+
+  /**
+   * Tell the context we're done reinitializing it.
+   */
+  virtual void DidInitializeContext() = 0;
+
+  /**
+   * Tell the context our global has a new document, and the scope
+   * used by it.  Use nsISupports to avoid dependency issues - but expect
+   * a QI for nsIDOMDocument and/or nsIDocument.
+   */
+  virtual void DidSetDocument(nsISupports *aDoc, void *aGlobal) = 0;
+
+  /* Memory managment for script objects.  Used by the implementation of
+   * nsScriptObjectHolder to manage the lifetimes of the held script objects.
+   *
+   * See also nsIScriptRuntime, which has identical methods and is useful
+   * in situations when you do not have an nsIScriptContext.
+   * 
+   */
+  virtual nsresult DropScriptObject(void *object) = 0;
+  virtual nsresult HoldScriptObject(void *object) = 0;
+
+  /* Report a pending exception if there is one on the native context */
+  virtual void ReportPendingException() = 0;
+};
+
+//NS_DEFINE_STATIC_IID_ACCESSOR(nsIScriptContext, NS_ISCRIPTCONTEXT_IID) //SWT-20090407
+
+#endif // nsIScriptContext_h__
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/nsIScriptGlobalObject.h b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/nsIScriptGlobalObject.h
new file mode 100644
index 0000000..276d40f
--- /dev/null
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/nsIScriptGlobalObject.h
@@ -0,0 +1,196 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=2 sw=2 et tw=80: */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/*
+ * This file is derived from the Original Code provided by mozilla.org,
+ * whose Initial Developer is Netscape Communications Corporation.  Changes
+ * to the original file were made by SWT on April 7, 2009 and are marked
+ * with trailing comment "//SWT-20090407".
+ */
+
+#ifndef nsIScriptGlobalObject_h__
+#define nsIScriptGlobalObject_h__
+
+#include "nsISupports.h"
+//#include "nsEvent.h" //SWT-20090407
+#include "nsIProgrammingLanguage.h"
+
+class nsIScriptContext;
+class nsIDOMDocument;
+class nsIDOMEvent;
+class nsPresContext;
+class nsIScriptGlobalObjectOwner;
+class nsIArray;
+class nsScriptErrorEvent;
+class nsIScriptGlobalObject;
+//enum nsEventStatus; //SWT-20090407
+struct JSObject; // until we finally remove GetGlobalJSObject...
+
+// Some helpers for working with integer "script type IDs", and specifically
+// for working with arrays of such objects. For example, it is common for
+// implementations supporting multiple script languages to keep each
+// language's nsIScriptContext in an array indexed by the language ID.
+
+// Implementation note: We always ignore nsIProgrammingLanguage::UNKNOWN and
+// nsIProgrammingLanguage::CPLUSPLUS - this gives javascript slot 0.  An
+// attempted micro-optimization tried to avoid us going all the way to 
+// nsIProgrammingLanguage::MAX; however:
+// * Someone is reportedly working on a PHP impl - that has value 9
+// * nsGenericElement therefore allows 4 bits for the value.
+// So there is no good reason for us to be more restrictive again...
+
+#define NS_STID_FIRST nsIProgrammingLanguage::JAVASCRIPT
+// like nsGenericElement, only 4 bits worth is valid...
+#define NS_STID_LAST (nsIProgrammingLanguage::MAX > 0x000FU ? \
+                      0x000FU : nsIProgrammingLanguage::MAX)
+
+// Use to declare the array size
+#define NS_STID_ARRAY_UBOUND (NS_STID_LAST-NS_STID_FIRST+1)
+
+// Is a language ID valid?
+#define NS_STID_VALID(langID) (langID >= NS_STID_FIRST && langID <= NS_STID_LAST)
+
+// Return an index for a given ID.
+#define NS_STID_INDEX(langID) (langID-NS_STID_FIRST)
+
+// Create a 'for' loop iterating over all possible language IDs (*not* indexes)
+#define NS_STID_FOR_ID(varName) \
+          for (varName=NS_STID_FIRST;varName<=NS_STID_LAST;varName++)
+
+// Create a 'for' loop iterating over all indexes (when you don't need to know
+// what language it is)
+#define NS_STID_FOR_INDEX(varName) \
+          for (varName=0;varName<=NS_STID_INDEX(NS_STID_LAST);varName++)
+
+// A helper function for nsIScriptGlobalObject implementations to use
+// when handling a script error.  Generally called by the global when a context
+// notifies it of an error via nsIScriptGlobalObject::HandleScriptError.
+// Returns PR_TRUE if HandleDOMEvent was actually called, in which case
+// aStatus will be filled in with the status.
+//PRBool //SWT-20090407
+//NS_HandleScriptError(nsIScriptGlobalObject *aScriptGlobal, //SWT-20090407
+//                     nsScriptErrorEvent *aErrorEvent, //SWT-20090407
+//                     nsEventStatus *aStatus); //SWT-20090407
+
+
+#define NS_ISCRIPTGLOBALOBJECT_IID \
+{ /* {6afecd40-0b9a-4cfd-8c42-0f645cd91829} */ \
+  0x6afecd40, 0x0b9a, 0x4cfd, \
+  { 0x8c, 0x42, 0x0f, 0x64, 0x5c, 0xd9, 0x18, 0x29 } }
+
+/**
++  * The global object which keeps a script context for each supported script
++  * language. This often used to store per-window global state.
+ */
+
+class nsIScriptGlobalObject : public nsISupports
+{
+public:
+//NS_DECLARE_STATIC_IID_ACCESSOR(NS_ISCRIPTGLOBALOBJECT_IID) //SWT-20090407
+
+  /**
+   * Ensure that the script global object is initialized for working with the
+   * specified script language ID.  This will set up the nsIScriptContext
+   * and 'script global' for that language, allowing these to be fetched
+   * and manipulated.
+   * @return NS_OK if successful; error conditions include that the language
+   * has not been registered, as well as 'normal' errors, such as
+   * out-of-memory
+   */
+  virtual nsresult EnsureScriptEnvironment(PRUint32 aLangID) = 0;
+  /**
+   * Get a script context (WITHOUT added reference) for the specified language.
+   */
+  virtual nsIScriptContext *GetScriptContext(PRUint32 lang) = 0;
+  
+  /**
+   * Get the opaque "global" object for the specified lang.
+   */
+  virtual void *GetScriptGlobal(PRUint32 lang) = 0;
+
+  // Set/GetContext deprecated methods - use GetScriptContext/Global
+  virtual JSObject *GetGlobalJSObject() {
+        return (JSObject *)GetScriptGlobal(nsIProgrammingLanguage::JAVASCRIPT);
+  }
+
+  virtual nsIScriptContext *GetContext() {
+        return GetScriptContext(nsIProgrammingLanguage::JAVASCRIPT);
+  }
+
+  /**
+   * Set a new language context for this global.  The native global for the
+   * context is created by the context's GetNativeGlobal() method.
+   */
+
+  virtual nsresult SetScriptContext(PRUint32 lang, nsIScriptContext *aContext) = 0;
+
+  /**
+   * Called when the global script for a language is finalized, typically as
+   * part of its GC process.  By the time this call is made, the
+   * nsIScriptContext for the language has probably already been removed.
+   * After this call, the passed object is dead - which should generally be the
+   * same object the global is using for a global for that language.
+   */
+
+  virtual void OnFinalize(PRUint32 aLangID, void *aScriptGlobal) = 0;
+
+  /**
+   * Called to enable/disable scripts.
+   */
+  virtual void SetScriptsEnabled(PRBool aEnabled, PRBool aFireTimeouts) = 0;
+
+  /** Set a new arguments object for this window. This will be set on
+   * the window right away (if there's an existing document) and it
+   * will also be installed on the window when the next document is
+   * loaded.  Each language impl is responsible for converting to
+   * an array of args as appropriate for that language.
+   */
+  virtual nsresult SetNewArguments(nsIArray *aArguments) = 0;
+
+  /** Handle a script error.  Generally called by a script context.
+   */
+//virtual nsresult HandleScriptError(nsScriptErrorEvent *aErrorEvent, //SWT-20090407
+//                                   nsEventStatus *aEventStatus) { //SWT-20090407
+//  return NS_HandleScriptError(this, aErrorEvent, aEventStatus); //SWT-20090407
+//}
+};
+
+//NS_DEFINE_STATIC_IID_ACCESSOR(nsIScriptGlobalObject, //SWT-20090407
+//                              NS_ISCRIPTGLOBALOBJECT_IID) //SWT-20090407
+
+#endif
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 07b9dce..4c589f3 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
@@ -15,230 +15,286 @@
 
 #define XPCOM_NATIVE(func) Java_org_eclipse_swt_internal_mozilla_XPCOM_##func
 
-#ifndef NO_Call
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(Call)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jint arg4, jint arg5, jintArray arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(Call)
+#ifndef NO__1Call__I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1Call__I)(JNIEnv *env, jclass that, jint arg0);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1Call__I)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1Call__I_FUNC);
+	rc = (jint)((jint (*)())arg0)();
+	XPCOM_NATIVE_EXIT(env, that, _1Call__I_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1Call__IIIIII
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1Call__IIIIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1Call__IIIIII)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+{
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1Call__IIIIII_FUNC);
+	rc = (jint)((SWT_XREInitEmbedding)arg0)((nsILocalFile *)arg1, (nsILocalFile *)arg2, (nsIDirectoryServiceProvider *)arg3, (nsStaticModuleInfo const *)arg4, arg5);
+	XPCOM_NATIVE_EXIT(env, that, _1Call__IIIIII_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1Call__III_3BII_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1Call__III_3BII_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jint arg4, jint arg5, jintArray arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1Call__III_3BII_3I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jint arg4, jint arg5, jintArray arg6)
 {
 	jbyte *lparg3=NULL;
 	jint *lparg6=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, Call_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1Call__III_3BII_3I_FUNC);
 	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
 	rc = (jint)((nsWriteSegmentFun)arg0)((nsIInputStream *)arg1, (void *)arg2, (const char *)lparg3, arg4, arg5, (PRUint32 *)lparg6);
 fail:
 	if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
 	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
-	XPCOM_NATIVE_EXIT(env, that, Call_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1Call__III_3BII_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_NS_1GetComponentManager
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1GetComponentManager)(JNIEnv *env, jclass that, jintArray arg0);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1GetComponentManager)
+#ifndef NO__1NS_1GetComponentManager
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1NS_1GetComponentManager)(JNIEnv *env, jclass that, jintArray arg0);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1NS_1GetComponentManager)
 	(JNIEnv *env, jclass that, jintArray arg0)
 {
 	jint *lparg0=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, NS_1GetComponentManager_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1NS_1GetComponentManager_FUNC);
 	if (arg0) if ((lparg0 = env->GetIntArrayElements(arg0, NULL)) == NULL) goto fail;
 	rc = (jint)NS_GetComponentManager((nsIComponentManager**)lparg0);
 fail:
 	if (arg0 && lparg0) env->ReleaseIntArrayElements(arg0, lparg0, 0);
-	XPCOM_NATIVE_EXIT(env, that, NS_1GetComponentManager_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1NS_1GetComponentManager_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_NS_1GetServiceManager
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1GetServiceManager)(JNIEnv *env, jclass that, jintArray arg0);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1GetServiceManager)
+#ifndef NO__1NS_1GetServiceManager
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1NS_1GetServiceManager)(JNIEnv *env, jclass that, jintArray arg0);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1NS_1GetServiceManager)
 	(JNIEnv *env, jclass that, jintArray arg0)
 {
 	jint *lparg0=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, NS_1GetServiceManager_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1NS_1GetServiceManager_FUNC);
 	if (arg0) if ((lparg0 = env->GetIntArrayElements(arg0, NULL)) == NULL) goto fail;
 	rc = (jint)NS_GetServiceManager((nsIServiceManager**)lparg0);
 fail:
 	if (arg0 && lparg0) env->ReleaseIntArrayElements(arg0, lparg0, 0);
-	XPCOM_NATIVE_EXIT(env, that, NS_1GetServiceManager_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1NS_1GetServiceManager_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_NS_1InitXPCOM2
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1InitXPCOM2)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1InitXPCOM2)
+#ifndef NO__1NS_1InitXPCOM2
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1NS_1InitXPCOM2)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1NS_1InitXPCOM2)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
 {
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, NS_1InitXPCOM2_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1NS_1InitXPCOM2_FUNC);
 	rc = (jint)NS_InitXPCOM2((nsIServiceManager **)arg0, (nsIFile *)arg1, (nsIDirectoryServiceProvider *)arg2);
-	XPCOM_NATIVE_EXIT(env, that, NS_1InitXPCOM2_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1NS_1InitXPCOM2_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_NS_1NewLocalFile
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1NewLocalFile)(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1NewLocalFile)
+#ifndef NO__1NS_1NewLocalFile
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1NS_1NewLocalFile)(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1NS_1NewLocalFile)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)
 {
 	jint *lparg2=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, NS_1NewLocalFile_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1NS_1NewLocalFile_FUNC);
 	if (arg2) if ((lparg2 = env->GetIntArrayElements(arg2, NULL)) == NULL) goto fail;
 	rc = (jint)NS_NewLocalFile(*(nsAString *)arg0, arg1, (nsILocalFile**)lparg2);
 fail:
 	if (arg2 && lparg2) env->ReleaseIntArrayElements(arg2, lparg2, 0);
-	XPCOM_NATIVE_EXIT(env, that, NS_1NewLocalFile_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1NS_1NewLocalFile_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II)(JNIEnv *env, jclass that, jint arg0, jint arg1);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II)
+#ifndef NO__1VtblCall__II
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1)
 {
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_FUNC);
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint))(*(jint **)arg1)[arg0])(arg1);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIF
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIF)(JNIEnv *env, jclass that, jint arg0, jint arg1, jfloat arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIF)
+#ifndef NO__1VtblCall__IID
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IID)(JNIEnv *env, jclass that, jint arg0, jint arg1, jdouble arg2);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IID)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jdouble arg2)
+{
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IID_FUNC);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jdouble))(*(jint **)arg1)[arg0])(arg1, arg2);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IID_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1VtblCall__IIF
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIF)(JNIEnv *env, jclass that, jint arg0, jint arg1, jfloat arg2);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIF)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jfloat arg2)
 {
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIF_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIF_FUNC);
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jfloat))(*(jint **)arg1)[arg0])(arg1, arg2);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIF_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIF_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__III
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III)
+#ifndef NO__1VtblCall__III
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
 {
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__III_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_FUNC);
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__III_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIII
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII)
+#ifndef NO__1VtblCall__IIII
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
 {
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIII_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIII_FUNC);
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIII_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIII_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIII
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIII)
+#ifndef NO__1VtblCall__IIIII
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIII)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
 {
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIII_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIII_FUNC);
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIII_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIII_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIIII
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIII)
+#ifndef NO__1VtblCall__IIIIII
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIII)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5)
 {
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIII_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIIII_FUNC);
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIII_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIIII_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIIIII
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIII)
+#ifndef NO__1VtblCall__IIIIIII
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIIII)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6)
 {
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIIII_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIIIII_FUNC);
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIIII_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIIIII_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIIIIII
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIIII)
+#ifndef NO__1VtblCall__IIIIIIII
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIIIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIIIII)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7)
 {
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIIIII_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIIIIII_FUNC);
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIIIII_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIIIIII_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIIIIIIIIII
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIIIIIIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIIIIIIII)
+#ifndef NO__1VtblCall__IIIIIIIIIIII
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIIIIIIIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIIIIIIIII)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11)
 {
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIIIIIIIII_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIIIIIIIIII_FUNC);
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIIIIIIIII_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIIIIIIIIII_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIIIIIIIIIIIIISI
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIIIIIIIIIIISI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13, jint arg14, jshort arg15, jint arg16);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIIIIIIIIIIISI)
+#ifndef NO__1VtblCall__IIIIIIIIIIIIIIISI
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIIIIIIIIIIIISI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13, jint arg14, jshort arg15, jint arg16);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIIIIIIIIIIIISI)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13, jint arg14, jshort arg15, jint arg16)
 {
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIIIIIIIIIIIISI_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIIIIIIIIIIIIISI_FUNC);
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jshort, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15, arg16);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIIIIIIIIIIIISI_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIIIIIIIIIIIIISI_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIIIIII_3C_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIIII_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jcharArray arg8, jintArray arg9, jintArray arg10);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIIII_3C_3I_3I)
+#ifndef NO__1VtblCall__IIIIIIIII_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIIIIII_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jintArray arg9);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIIIIII_3I)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jintArray arg9)
+{
+	jint *lparg9=NULL;
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIIIIIII_3I_FUNC);
+	if (arg9) if ((lparg9 = env->GetIntArrayElements(arg9, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint, jint, jint, jint, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, lparg9);
+fail:
+	if (arg9 && lparg9) env->ReleaseIntArrayElements(arg9, lparg9, 0);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIIIIIII_3I_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1VtblCall__IIIIIIII_3C_3I_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIIIII_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jcharArray arg8, jintArray arg9, jintArray arg10);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIIIII_3C_3I_3I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jcharArray arg8, jintArray arg9, jintArray arg10)
 {
 	jchar *lparg8=NULL;
 	jint *lparg9=NULL;
 	jint *lparg10=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIIIII_3C_3I_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIIIIII_3C_3I_3I_FUNC);
 	if (arg8) if ((lparg8 = env->GetCharArrayElements(arg8, NULL)) == NULL) goto fail;
 	if (arg9) if ((lparg9 = env->GetIntArrayElements(arg9, NULL)) == NULL) goto fail;
 	if (arg10) if ((lparg10 = env->GetIntArrayElements(arg10, NULL)) == NULL) goto fail;
@@ -247,34 +303,51 @@
 	if (arg10 && lparg10) env->ReleaseIntArrayElements(arg10, lparg10, 0);
 	if (arg9 && lparg9) env->ReleaseIntArrayElements(arg9, lparg9, 0);
 	if (arg8 && lparg8) env->ReleaseCharArrayElements(arg8, lparg8, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIIIII_3C_3I_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIIIIII_3C_3I_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIIIIJII
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIIJII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jlong arg6, jint arg7, jint arg8);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIIJII)
+#ifndef NO__1VtblCall__IIIIIII_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIIII_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jintArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIIII_3I)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jintArray arg7)
+{
+	jint *lparg7=NULL;
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIIIII_3I_FUNC);
+	if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint, jint, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, lparg7);
+fail:
+	if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIIIII_3I_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1VtblCall__IIIIIIJII
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIIIJII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jlong arg6, jint arg7, jint arg8);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIIIJII)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jlong arg6, jint arg7, jint arg8)
 {
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIIIJII_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIIIIJII_FUNC);
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint, jlong, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIIIJII_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIIIIJII_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIIII_3CIIIII_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIII_3CIIIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jintArray arg12, jintArray arg13);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIII_3CIIIII_3I_3I)
+#ifndef NO__1VtblCall__IIIIII_3CIIIII_3I_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIII_3CIIIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jintArray arg12, jintArray arg13);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIII_3CIIIII_3I_3I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jintArray arg12, jintArray arg13)
 {
 	jchar *lparg6=NULL;
 	jint *lparg12=NULL;
 	jint *lparg13=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIII_3CIIIII_3I_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIIII_3CIIIII_3I_3I_FUNC);
 	if (arg6) if ((lparg6 = env->GetCharArrayElements(arg6, NULL)) == NULL) goto fail;
 	if (arg12) if ((lparg12 = env->GetIntArrayElements(arg12, NULL)) == NULL) goto fail;
 	if (arg13) if ((lparg13 = env->GetIntArrayElements(arg13, NULL)) == NULL) goto fail;
@@ -283,14 +356,14 @@
 	if (arg13 && lparg13) env->ReleaseIntArrayElements(arg13, lparg13, 0);
 	if (arg12 && lparg12) env->ReleaseIntArrayElements(arg12, lparg12, 0);
 	if (arg6 && lparg6) env->ReleaseCharArrayElements(arg6, lparg6, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIII_3CIIIII_3I_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIIII_3CIIIII_3I_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIIII_3C_3BIIIII_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIII_3C_3BIIIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jbyteArray arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jintArray arg13, jintArray arg14);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIII_3C_3BIIIII_3I_3I)
+#ifndef NO__1VtblCall__IIIIII_3C_3BIIIII_3I_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIII_3C_3BIIIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jbyteArray arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jintArray arg13, jintArray arg14);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIII_3C_3BIIIII_3I_3I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jbyteArray arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jintArray arg13, jintArray arg14)
 {
 	jchar *lparg6=NULL;
@@ -298,7 +371,7 @@
 	jint *lparg13=NULL;
 	jint *lparg14=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIII_3C_3BIIIII_3I_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIIII_3C_3BIIIII_3I_3I_FUNC);
 	if (arg6) if ((lparg6 = env->GetCharArrayElements(arg6, NULL)) == NULL) goto fail;
 	if (arg7) if ((lparg7 = env->GetByteArrayElements(arg7, NULL)) == NULL) goto fail;
 	if (arg13) if ((lparg13 = env->GetIntArrayElements(arg13, NULL)) == NULL) goto fail;
@@ -309,21 +382,21 @@
 	if (arg13 && lparg13) env->ReleaseIntArrayElements(arg13, lparg13, 0);
 	if (arg7 && lparg7) env->ReleaseByteArrayElements(arg7, lparg7, 0);
 	if (arg6 && lparg6) env->ReleaseCharArrayElements(arg6, lparg6, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIII_3C_3BIIIII_3I_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIIII_3C_3BIIIII_3I_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIIII_3C_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIII_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jintArray arg7, jintArray arg8);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIII_3C_3I_3I)
+#ifndef NO__1VtblCall__IIIIII_3C_3I_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIII_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jintArray arg7, jintArray arg8);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIII_3C_3I_3I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jintArray arg7, jintArray arg8)
 {
 	jchar *lparg6=NULL;
 	jint *lparg7=NULL;
 	jint *lparg8=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIII_3C_3I_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIIII_3C_3I_3I_FUNC);
 	if (arg6) if ((lparg6 = env->GetCharArrayElements(arg6, NULL)) == NULL) goto fail;
 	if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
 	if (arg8) if ((lparg8 = env->GetIntArrayElements(arg8, NULL)) == NULL) goto fail;
@@ -332,156 +405,276 @@
 	if (arg8 && lparg8) env->ReleaseIntArrayElements(arg8, lparg8, 0);
 	if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
 	if (arg6 && lparg6) env->ReleaseCharArrayElements(arg6, lparg6, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIII_3C_3I_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIIII_3C_3I_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIIII_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jintArray arg6, jintArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIII_3I_3I)
+#ifndef NO__1VtblCall__IIIIII_3I_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jintArray arg6, jintArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIII_3I_3I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jintArray arg6, jintArray arg7)
 {
 	jint *lparg6=NULL;
 	jint *lparg7=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIII_3I_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIIII_3I_3I_FUNC);
 	if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
 	if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, lparg7);
 fail:
 	if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
 	if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIII_3I_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIIII_3I_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIII_3C
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIII_3C)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jcharArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIII_3C)
+#ifndef NO__1VtblCall__IIIIII_3I_3I_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIII_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jintArray arg6, jintArray arg7, jintArray arg8);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIII_3I_3I_3I)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jintArray arg6, jintArray arg7, jintArray arg8)
+{
+	jint *lparg6=NULL;
+	jint *lparg7=NULL;
+	jint *lparg8=NULL;
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIIII_3I_3I_3I_FUNC);
+	if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
+	if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
+	if (arg8) if ((lparg8 = env->GetIntArrayElements(arg8, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint, jint *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, lparg7, lparg8);
+fail:
+	if (arg8 && lparg8) env->ReleaseIntArrayElements(arg8, lparg8, 0);
+	if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
+	if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIIII_3I_3I_3I_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1VtblCall__IIIII_3B_3BI
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIII_3B_3BI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jbyteArray arg5, jbyteArray arg6, jint arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIII_3B_3BI)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jbyteArray arg5, jbyteArray arg6, jint arg7)
+{
+	jbyte *lparg5=NULL;
+	jbyte *lparg6=NULL;
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIII_3B_3BI_FUNC);
+	if (arg5) if ((lparg5 = env->GetByteArrayElements(arg5, NULL)) == NULL) goto fail;
+	if (arg6) if ((lparg6 = env->GetByteArrayElements(arg6, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jbyte *, jbyte *, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5, lparg6, arg7);
+fail:
+	if (arg6 && lparg6) env->ReleaseByteArrayElements(arg6, lparg6, 0);
+	if (arg5 && lparg5) env->ReleaseByteArrayElements(arg5, lparg5, 0);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIII_3B_3BI_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1VtblCall__IIIII_3C
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIII_3C)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jcharArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIII_3C)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jcharArray arg5)
 {
 	jchar *lparg5=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIII_3C_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIII_3C_FUNC);
 	if (arg5) if ((lparg5 = env->GetCharArrayElements(arg5, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jchar *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5);
 fail:
 	if (arg5 && lparg5) env->ReleaseCharArrayElements(arg5, lparg5, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIII_3C_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIII_3C_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIII_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIII_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIII_3I)
+#ifndef NO__1VtblCall__IIIII_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIII_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIII_3I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jintArray arg5)
 {
 	jint *lparg5=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIII_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIII_3I_FUNC);
 	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5);
 fail:
 	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIII_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIII_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIIJJJJ
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIJJJJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIJJJJ)
+#ifndef NO__1VtblCall__IIIII_3I_3I_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIII_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jintArray arg5, jintArray arg6, jintArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIII_3I_3I_3I)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jintArray arg5, jintArray arg6, jintArray arg7)
+{
+	jint *lparg5=NULL;
+	jint *lparg6=NULL;
+	jint *lparg7=NULL;
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIII_3I_3I_3I_FUNC);
+	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
+	if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
+	if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5, lparg6, lparg7);
+fail:
+	if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
+	if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
+	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIII_3I_3I_3I_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1VtblCall__IIIIJJJJ
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIJJJJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIJJJJ)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7)
 {
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIJJJJ_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIIJJJJ_FUNC);
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jlong, jlong, jlong, jlong))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIJJJJ_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIIJJJJ_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIII_3B
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3B)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jbyteArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3B)
+#ifndef NO__1VtblCall__IIII_3B
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3B)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jbyteArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3B)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jbyteArray arg4)
 {
 	jbyte *lparg4=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIII_3B_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIII_3B_FUNC);
 	if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jbyte *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
 fail:
 	if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIII_3B_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIII_3B_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIII_3C
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3C)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jcharArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3C)
+#ifndef NO__1VtblCall__IIII_3BI
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3BI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jbyteArray arg4, jint arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3BI)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jbyteArray arg4, jint arg5)
+{
+	jbyte *lparg4=NULL;
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIII_3BI_FUNC);
+	if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jbyte *, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5);
+fail:
+	if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIII_3BI_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1VtblCall__IIII_3BII
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3BII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jbyteArray arg4, jint arg5, jint arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3BII)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jbyteArray arg4, jint arg5, jint arg6)
+{
+	jbyte *lparg4=NULL;
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIII_3BII_FUNC);
+	if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jbyte *, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5, arg6);
+fail:
+	if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIII_3BII_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1VtblCall__IIII_3B_3B
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3B_3B)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jbyteArray arg4, jbyteArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3B_3B)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jbyteArray arg4, jbyteArray arg5)
+{
+	jbyte *lparg4=NULL;
+	jbyte *lparg5=NULL;
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIII_3B_3B_FUNC);
+	if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
+	if (arg5) if ((lparg5 = env->GetByteArrayElements(arg5, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jbyte *, jbyte *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4, lparg5);
+fail:
+	if (arg5 && lparg5) env->ReleaseByteArrayElements(arg5, lparg5, 0);
+	if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIII_3B_3B_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1VtblCall__IIII_3C
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3C)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jcharArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3C)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jcharArray arg4)
 {
 	jchar *lparg4=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIII_3C_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIII_3C_FUNC);
 	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jchar *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
 fail:
 	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIII_3C_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIII_3C_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIII_3CIJI
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3CIJI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jcharArray arg4, jint arg5, jlong arg6, jint arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3CIJI)
+#ifndef NO__1VtblCall__IIII_3CIJI
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3CIJI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jcharArray arg4, jint arg5, jlong arg6, jint arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3CIJI)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jcharArray arg4, jint arg5, jlong arg6, jint arg7)
 {
 	jchar *lparg4=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIII_3CIJI_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIII_3CIJI_FUNC);
 	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jchar *, jint, jlong, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5, arg6, arg7);
 fail:
 	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIII_3CIJI_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIII_3CIJI_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIII_3CJJJ
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3CJJJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jcharArray arg4, jlong arg5, jlong arg6, jlong arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3CJJJ)
+#ifndef NO__1VtblCall__IIII_3CJJJ
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3CJJJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jcharArray arg4, jlong arg5, jlong arg6, jlong arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3CJJJ)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jcharArray arg4, jlong arg5, jlong arg6, jlong arg7)
 {
 	jchar *lparg4=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIII_3CJJJ_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIII_3CJJJ_FUNC);
 	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jchar *, jlong, jlong, jlong))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5, arg6, arg7);
 fail:
 	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIII_3CJJJ_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIII_3CJJJ_FUNC);
 	return rc;
 }
 #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)
+#ifndef NO__1VtblCall__IIII_3C_3CI_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__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(_1VtblCall__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);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__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;
@@ -490,152 +683,226 @@
 	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);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__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)
+#ifndef NO__1VtblCall__IIII_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jintArray arg4)
 {
 	jint *lparg4=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIII_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIII_3I_FUNC);
 	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
 fail:
 	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIII_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIII_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIII_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jlongArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3J)
+#ifndef NO__1VtblCall__IIII_3I_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jintArray arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3I_3I)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jintArray arg4, jintArray arg5)
+{
+	jint *lparg4=NULL;
+	jint *lparg5=NULL;
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIII_3I_3I_FUNC);
+	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
+	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4, lparg5);
+fail:
+	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
+	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIII_3I_3I_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1VtblCall__IIII_3J
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jlongArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3J)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jlongArray arg4)
 {
 	jlong *lparg4=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIII_3J_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIII_3J_FUNC);
 	if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
 fail:
 	if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIII_3J_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIII_3J_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIJJ
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIJJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jlong arg3, jlong arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIJJ)
+#ifndef NO__1VtblCall__IIIJJ
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIJJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jlong arg3, jlong arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIJJ)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jlong arg3, jlong arg4)
 {
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIJJ_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIJJ_FUNC);
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jlong, jlong))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIJJ_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIJJ_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2)
+#ifndef NO__1VtblCall__IIIJJJJJJ_3J
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIJJJJJJ_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7, jlong arg8, jlongArray arg9);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIJJJJJJ_3J)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7, jlong arg8, jlongArray arg9)
+{
+	jlong *lparg9=NULL;
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIJJJJJJ_3J_FUNC);
+	if (arg9) if ((lparg9 = env->GetLongArrayElements(arg9, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jlong, jlong, jlong, jlong, jlong, jlong, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, lparg9);
+fail:
+	if (arg9 && lparg9) env->ReleaseLongArrayElements(arg9, lparg9, 0);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIJJJJJJ_3J_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
 {
 	nsID _arg3, *lparg3=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_FUNC);
 	if (arg3) if ((lparg3 = getnsIDFields(env, arg3, &_arg3)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, nsID *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3);
 fail:
 	if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I)
+#ifndef NO__1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2II_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2II_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3, jint arg4, jint arg5, jintArray arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2II_3I)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3, jint arg4, jint arg5, jintArray arg6)
+{
+	nsID _arg3, *lparg3=NULL;
+	jint *lparg6=NULL;
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2II_3I_FUNC);
+	if (arg3) if ((lparg3 = getnsIDFields(env, arg3, &_arg3)) == NULL) goto fail;
+	if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, nsID *, jint, jint, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, arg4, arg5, lparg6);
+fail:
+	if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
+	if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2II_3I_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3, jintArray arg4)
 {
 	nsID _arg3, *lparg3=NULL;
 	jint *lparg4=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
 	if (arg3) if ((lparg3 = getnsIDFields(env, arg3, &_arg3)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, nsID *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
 fail:
 	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__III_3B
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3B)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3B)
+#ifndef NO__1VtblCall__III_3B
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3B)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3B)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3)
 {
 	jbyte *lparg3=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3B_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3B_FUNC);
 	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jbyte *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3);
 fail:
 	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3B_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3B_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__III_3BI
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3BI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jint arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3BI)
+#ifndef NO__1VtblCall__III_3BI
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3BI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jint arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3BI)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jint arg4)
 {
 	jbyte *lparg3=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3BI_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3BI_FUNC);
 	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jbyte *, jint))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, arg4);
 fail:
 	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3BI_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3BI_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__III_3BI_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3BI_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jint arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3BI_3I)
+#ifndef NO__1VtblCall__III_3BI_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3BI_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jint arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3BI_3I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jint arg4, jintArray arg5)
 {
 	jbyte *lparg3=NULL;
 	jint *lparg5=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3BI_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3BI_3I_FUNC);
 	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jbyte *, jint, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, arg4, lparg5);
 fail:
 	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
 	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3BI_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3BI_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__III_3B_3B_3BI_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3B_3B_3BI_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5, jint arg6, jintArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3B_3B_3BI_3I)
+#ifndef NO__1VtblCall__III_3BS
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3BS)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jshort arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3BS)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jshort arg4)
+{
+	jbyte *lparg3=NULL;
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3BS_FUNC);
+	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jbyte *, jshort))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, arg4);
+fail:
+	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3BS_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1VtblCall__III_3B_3B_3BI_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3B_3B_3BI_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5, jint arg6, jintArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3B_3B_3BI_3I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5, jint arg6, jintArray arg7)
 {
 	jbyte *lparg3=NULL;
@@ -643,7 +910,7 @@
 	jbyte *lparg5=NULL;
 	jint *lparg7=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3B_3B_3BI_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3B_3B_3BI_3I_FUNC);
 	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = env->GetByteArrayElements(arg5, NULL)) == NULL) goto fail;
@@ -654,108 +921,108 @@
 	if (arg5 && lparg5) env->ReleaseByteArrayElements(arg5, lparg5, 0);
 	if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3B_3B_3BI_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3B_3B_3BI_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__III_3B_3C
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3B_3C)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jcharArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3B_3C)
+#ifndef NO__1VtblCall__III_3B_3C
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3B_3C)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jcharArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3B_3C)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jcharArray arg4)
 {
 	jbyte *lparg3=NULL;
 	jchar *lparg4=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3B_3C_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3B_3C_FUNC);
 	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jbyte *, jchar *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
 fail:
 	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3B_3C_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3B_3C_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__III_3B_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3B_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3B_3I)
+#ifndef NO__1VtblCall__III_3B_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3B_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3B_3I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jintArray arg4)
 {
 	jbyte *lparg3=NULL;
 	jint *lparg4=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3B_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3B_3I_FUNC);
 	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jbyte *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
 fail:
 	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3B_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3B_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__III_3C
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C)
+#ifndef NO__1VtblCall__III_3C
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3)
 {
 	jchar *lparg3=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3C_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3C_FUNC);
 	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jchar *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3);
 fail:
 	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3C_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3C_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__III_3CI
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3CI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jint arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3CI)
+#ifndef NO__1VtblCall__III_3CI
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3CI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jint arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3CI)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jint arg4)
 {
 	jchar *lparg3=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3CI_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3CI_FUNC);
 	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jchar *, jint))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, arg4);
 fail:
 	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3CI_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3CI_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__III_3C_3C
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C)
+#ifndef NO__1VtblCall__III_3C_3C
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C_3C)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C_3C)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4)
 {
 	jchar *lparg3=NULL;
 	jchar *lparg4=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3C_3C_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3C_3C_FUNC);
 	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jchar *, jchar *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
 fail:
 	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3C_3C_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3C_3C_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jint arg5, jcharArray arg6, jcharArray arg7, jcharArray arg8, jcharArray arg9, jintArray arg10, jintArray arg11);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I)
+#ifndef NO__1VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jint arg5, jcharArray arg6, jcharArray arg7, jcharArray arg8, jcharArray arg9, jintArray arg10, jintArray arg11);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jint arg5, jcharArray arg6, jcharArray arg7, jcharArray arg8, jcharArray arg9, jintArray arg10, jintArray arg11)
 {
 	jchar *lparg3=NULL;
@@ -767,7 +1034,7 @@
 	jint *lparg10=NULL;
 	jint *lparg11=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC);
 	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
 	if (arg6) if ((lparg6 = env->GetCharArrayElements(arg6, NULL)) == NULL) goto fail;
@@ -786,14 +1053,14 @@
 	if (arg6 && lparg6) env->ReleaseCharArrayElements(arg6, lparg6, 0);
 	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__III_3C_3CI_3I_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3CI_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jint arg5, jintArray arg6, jintArray arg7, jintArray arg8);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3CI_3I_3I_3I)
+#ifndef NO__1VtblCall__III_3C_3CI_3I_3I_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C_3CI_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jint arg5, jintArray arg6, jintArray arg7, jintArray arg8);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C_3CI_3I_3I_3I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jint arg5, jintArray arg6, jintArray arg7, jintArray arg8)
 {
 	jchar *lparg3=NULL;
@@ -802,7 +1069,7 @@
 	jint *lparg7=NULL;
 	jint *lparg8=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3C_3CI_3I_3I_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3C_3CI_3I_3I_3I_FUNC);
 	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
 	if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
@@ -815,14 +1082,14 @@
 	if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
 	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3C_3CI_3I_3I_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3C_3CI_3I_3I_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__III_3C_3C_3C_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3C_3I)
+#ifndef NO__1VtblCall__III_3C_3C_3C_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C_3C_3C_3I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6)
 {
 	jchar *lparg3=NULL;
@@ -830,7 +1097,7 @@
 	jchar *lparg5=NULL;
 	jint *lparg6=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3C_3C_3C_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3C_3C_3C_3I_FUNC);
 	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = env->GetCharArrayElements(arg5, NULL)) == NULL) goto fail;
@@ -841,14 +1108,14 @@
 	if (arg5 && lparg5) env->ReleaseCharArrayElements(arg5, lparg5, 0);
 	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3C_3C_3C_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3C_3C_3C_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__III_3C_3C_3C_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6, jintArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3C_3I_3I)
+#ifndef NO__1VtblCall__III_3C_3C_3C_3I_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6, jintArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C_3C_3C_3I_3I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6, jintArray arg7)
 {
 	jchar *lparg3=NULL;
@@ -857,7 +1124,7 @@
 	jint *lparg6=NULL;
 	jint *lparg7=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3C_3C_3C_3I_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3C_3C_3C_3I_3I_FUNC);
 	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = env->GetCharArrayElements(arg5, NULL)) == NULL) goto fail;
@@ -870,21 +1137,21 @@
 	if (arg5 && lparg5) env->ReleaseCharArrayElements(arg5, lparg5, 0);
 	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3C_3C_3C_3I_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3C_3C_3C_3I_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__III_3C_3C_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3I)
+#ifndef NO__1VtblCall__III_3C_3C_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C_3C_3I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5)
 {
 	jchar *lparg3=NULL;
 	jchar *lparg4=NULL;
 	jint *lparg5=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3C_3C_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3C_3C_3I_FUNC);
 	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
@@ -893,14 +1160,14 @@
 	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
 	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3C_3C_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3C_3C_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__III_3C_3C_3I_3C_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3I_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5, jcharArray arg6, jintArray arg7, jintArray arg8);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3I_3C_3I_3I)
+#ifndef NO__1VtblCall__III_3C_3C_3I_3C_3I_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C_3C_3I_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5, jcharArray arg6, jintArray arg7, jintArray arg8);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C_3C_3I_3C_3I_3I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5, jcharArray arg6, jintArray arg7, jintArray arg8)
 {
 	jchar *lparg3=NULL;
@@ -910,7 +1177,7 @@
 	jint *lparg7=NULL;
 	jint *lparg8=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3C_3C_3I_3C_3I_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3C_3C_3I_3C_3I_3I_FUNC);
 	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
@@ -925,14 +1192,14 @@
 	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
 	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3C_3C_3I_3C_3I_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3C_3C_3I_3C_3I_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__III_3C_3C_3I_3I_3C_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3I_3I_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5, jintArray arg6, jcharArray arg7, jintArray arg8, jintArray arg9);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3I_3I_3C_3I_3I)
+#ifndef NO__1VtblCall__III_3C_3C_3I_3I_3C_3I_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C_3C_3I_3I_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5, jintArray arg6, jcharArray arg7, jintArray arg8, jintArray arg9);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C_3C_3I_3I_3C_3I_3I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5, jintArray arg6, jcharArray arg7, jintArray arg8, jintArray arg9)
 {
 	jchar *lparg3=NULL;
@@ -943,7 +1210,7 @@
 	jint *lparg8=NULL;
 	jint *lparg9=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3C_3C_3I_3I_3C_3I_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3C_3C_3I_3I_3C_3I_3I_FUNC);
 	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
@@ -960,31 +1227,108 @@
 	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
 	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3C_3C_3I_3I_3C_3I_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3C_3C_3I_3I_3C_3I_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__III_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3I)
+#ifndef NO__1VtblCall__III_3C_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C_3I)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jintArray arg4)
+{
+	jchar *lparg3=NULL;
+	jint *lparg4=NULL;
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3C_3I_FUNC);
+	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
+	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jchar *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
+fail:
+	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
+	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3C_3I_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1VtblCall__III_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3)
 {
 	jint *lparg3=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3I_FUNC);
 	if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3);
 fail:
 	if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__III_3I_3I_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3I_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3, jintArray arg4, jintArray arg5, jintArray arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3I_3I_3I_3I)
+#ifndef NO__1VtblCall__III_3II
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3II)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3, jint arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3II)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3, jint arg4)
+{
+	jint *lparg3=NULL;
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3II_FUNC);
+	if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint *, jint))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, arg4);
+fail:
+	if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3II_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1VtblCall__III_3IJ
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3IJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3, jlong arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3IJ)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3, jlong arg4)
+{
+	jint *lparg3=NULL;
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3IJ_FUNC);
+	if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint *, jlong))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, arg4);
+fail:
+	if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3IJ_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1VtblCall__III_3I_3I_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3, jintArray arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3I_3I_3I)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3, jintArray arg4, jintArray arg5)
+{
+	jint *lparg3=NULL;
+	jint *lparg4=NULL;
+	jint *lparg5=NULL;
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3I_3I_3I_FUNC);
+	if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
+	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
+	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5);
+fail:
+	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
+	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
+	if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3I_3I_3I_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1VtblCall__III_3I_3I_3I_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3I_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3, jintArray arg4, jintArray arg5, jintArray arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3I_3I_3I_3I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3, jintArray arg4, jintArray arg5, jintArray arg6)
 {
 	jint *lparg3=NULL;
@@ -992,7 +1336,7 @@
 	jint *lparg5=NULL;
 	jint *lparg6=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3I_3I_3I_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3I_3I_3I_3I_FUNC);
 	if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
@@ -1003,162 +1347,261 @@
 	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
 	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3I_3I_3I_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3I_3I_3I_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJ
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ)
+#ifndef NO__1VtblCall__III_3I_3I_3J
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3I_3I_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3, jintArray arg4, jlongArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3I_3I_3J)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3, jintArray arg4, jlongArray arg5)
+{
+	jint *lparg3=NULL;
+	jint *lparg4=NULL;
+	jlong *lparg5=NULL;
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3I_3I_3J_FUNC);
+	if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
+	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
+	if (arg5) if ((lparg5 = env->GetLongArrayElements(arg5, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint *, jint *, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5);
+fail:
+	if (arg5 && lparg5) env->ReleaseLongArrayElements(arg5, lparg5, 0);
+	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
+	if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3I_3I_3J_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1VtblCall__IIJ
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2)
 {
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_FUNC);
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong))(*(jint **)arg1)[arg0])(arg1, arg2);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJI
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJI)
+#ifndef NO__1VtblCall__IIJI
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJI)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3)
 {
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJI_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJI_FUNC);
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJI_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJI_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJIIJIIIIII
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJIIJIIIIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJIIJIIIIII)
+#ifndef NO__1VtblCall__IIJIIJIIIIII
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJIIJIIIIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJIIJIIIIII)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11)
 {
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJIIJIIIIII_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJIIJIIIIII_FUNC);
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jint, jint, jlong, jint, jint, jint, jint, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJIIJIIIIII_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJIIJIIIIII_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJIIJIIIIIIIIISJ
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJIIJIIIIIIIIISJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13, jint arg14, jshort arg15, jlong arg16);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJIIJIIIIIIIIISJ)
+#ifndef NO__1VtblCall__IIJIIJIIIIIIIIISJ
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJIIJIIIIIIIIISJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13, jint arg14, jshort arg15, jlong arg16);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJIIJIIIIIIIIISJ)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13, jint arg14, jshort arg15, jlong arg16)
 {
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJIIJIIIIIIIIISJ_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJIIJIIIIIIIIISJ_FUNC);
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jint, jint, jlong, jint, jint, jint, jint, jint, jint, jint, jint, jint, jshort, jlong))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15, arg16);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJIIJIIIIIIIIISJ_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJIIJIIIIIIIIISJ_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJIIJ_3I_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJIIJ_3I_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jintArray arg6, jlongArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJIIJ_3I_3J)
+#ifndef NO__1VtblCall__IIJIIJ_3I_3J
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJIIJ_3I_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jintArray arg6, jlongArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJIIJ_3I_3J)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jintArray arg6, jlongArray arg7)
 {
 	jint *lparg6=NULL;
 	jlong *lparg7=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJIIJ_3I_3J_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJIIJ_3I_3J_FUNC);
 	if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
 	if (arg7) if ((lparg7 = env->GetLongArrayElements(arg7, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jint, jint, jlong, jint *, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, lparg7);
 fail:
 	if (arg7 && lparg7) env->ReleaseLongArrayElements(arg7, lparg7, 0);
 	if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJIIJ_3I_3J_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJIIJ_3I_3J_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJI_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJI_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3, jlongArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJI_3J)
+#ifndef NO__1VtblCall__IIJII_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJII_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3, jint arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJII_3I)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3, jint arg4, jintArray arg5)
+{
+	jint *lparg5=NULL;
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJII_3I_FUNC);
+	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jint, jint, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5);
+fail:
+	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJII_3I_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1VtblCall__IIJIJII
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJIJII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3, jlong arg4, jint arg5, jint arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJIJII)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3, jlong arg4, jint arg5, jint arg6)
+{
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJIJII_FUNC);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jint, jlong, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJIJII_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1VtblCall__IIJIJJ_3I_3I_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJIJJ_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3, jlong arg4, jlong arg5, jintArray arg6, jintArray arg7, jintArray arg8);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJIJJ_3I_3I_3I)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3, jlong arg4, jlong arg5, jintArray arg6, jintArray arg7, jintArray arg8)
+{
+	jint *lparg6=NULL;
+	jint *lparg7=NULL;
+	jint *lparg8=NULL;
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJIJJ_3I_3I_3I_FUNC);
+	if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
+	if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
+	if (arg8) if ((lparg8 = env->GetIntArrayElements(arg8, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jint, jlong, jlong, jint *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, lparg7, lparg8);
+fail:
+	if (arg8 && lparg8) env->ReleaseIntArrayElements(arg8, lparg8, 0);
+	if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
+	if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJIJJ_3I_3I_3I_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1VtblCall__IIJIJ_3I_3I_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJIJ_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3, jlong arg4, jintArray arg5, jintArray arg6, jintArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJIJ_3I_3I_3I)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3, jlong arg4, jintArray arg5, jintArray arg6, jintArray arg7)
+{
+	jint *lparg5=NULL;
+	jint *lparg6=NULL;
+	jint *lparg7=NULL;
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJIJ_3I_3I_3I_FUNC);
+	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
+	if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
+	if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jint, jlong, jint *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5, lparg6, lparg7);
+fail:
+	if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
+	if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
+	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJIJ_3I_3I_3I_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1VtblCall__IIJI_3J
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJI_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3, jlongArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJI_3J)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3, jlongArray arg4)
 {
 	jlong *lparg4=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJI_3J_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJI_3J_FUNC);
 	if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jint, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
 fail:
 	if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJI_3J_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJI_3J_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJJ
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ)
+#ifndef NO__1VtblCall__IIJJ
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3)
 {
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJ_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJ_FUNC);
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong))(*(jint **)arg1)[arg0])(arg1, arg2, arg3);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJ_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJ_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJJI
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJI)
+#ifndef NO__1VtblCall__IIJJI
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJI)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4)
 {
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJI_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJI_FUNC);
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJI_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJI_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJJII
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4, jint arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJII)
+#ifndef NO__1VtblCall__IIJJII
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4, jint arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJII)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4, jint arg5)
 {
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJII_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJII_FUNC);
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJII_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJII_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJJIIII
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJIIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4, jint arg5, jint arg6, jint arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJIIII)
+#ifndef NO__1VtblCall__IIJJIIII
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJIIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4, jint arg5, jint arg6, jint arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJIIII)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4, jint arg5, jint arg6, jint arg7)
 {
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJIIII_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJIIII_FUNC);
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jint, jint, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJIIII_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJIIII_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJJIJ_3C_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJIJ_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4, jlong arg5, jcharArray arg6, jintArray arg7, jintArray arg8);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJIJ_3C_3I_3I)
+#ifndef NO__1VtblCall__IIJJIJ_3C_3I_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJIJ_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4, jlong arg5, jcharArray arg6, jintArray arg7, jintArray arg8);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJIJ_3C_3I_3I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4, jlong arg5, jcharArray arg6, jintArray arg7, jintArray arg8)
 {
 	jchar *lparg6=NULL;
 	jint *lparg7=NULL;
 	jint *lparg8=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJIJ_3C_3I_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJIJ_3C_3I_3I_FUNC);
 	if (arg6) if ((lparg6 = env->GetCharArrayElements(arg6, NULL)) == NULL) goto fail;
 	if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
 	if (arg8) if ((lparg8 = env->GetIntArrayElements(arg8, NULL)) == NULL) goto fail;
@@ -1167,81 +1610,81 @@
 	if (arg8 && lparg8) env->ReleaseIntArrayElements(arg8, lparg8, 0);
 	if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
 	if (arg6 && lparg6) env->ReleaseCharArrayElements(arg6, lparg6, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJIJ_3C_3I_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJIJ_3C_3I_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJJI_3C
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJI_3C)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4, jcharArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJI_3C)
+#ifndef NO__1VtblCall__IIJJI_3C
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJI_3C)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4, jcharArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJI_3C)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4, jcharArray arg5)
 {
 	jchar *lparg5=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJI_3C_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJI_3C_FUNC);
 	if (arg5) if ((lparg5 = env->GetCharArrayElements(arg5, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jint, jchar *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5);
 fail:
 	if (arg5 && lparg5) env->ReleaseCharArrayElements(arg5, lparg5, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJI_3C_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJI_3C_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJJI_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJI_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJI_3I)
+#ifndef NO__1VtblCall__IIJJI_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJI_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJI_3I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4, jintArray arg5)
 {
 	jint *lparg5=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJI_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJI_3I_FUNC);
 	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jint, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5);
 fail:
 	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJI_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJI_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJJJ
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJ)
+#ifndef NO__1VtblCall__IIJJJ
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJ)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4)
 {
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJJ_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJJ_FUNC);
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jlong))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJJ_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJJ_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJJJI
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJI)
+#ifndef NO__1VtblCall__IIJJJI
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJI)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5)
 {
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJJI_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJJI_FUNC);
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jlong, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJJI_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJJI_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJJJI_3CJJIJI_3J_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJI_3CJJIJI_3J_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5, jcharArray arg6, jlong arg7, jlong arg8, jint arg9, jlong arg10, jint arg11, jlongArray arg12, jlongArray arg13);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJI_3CJJIJI_3J_3J)
+#ifndef NO__1VtblCall__IIJJJI_3CJJIJI_3J_3J
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJI_3CJJIJI_3J_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5, jcharArray arg6, jlong arg7, jlong arg8, jint arg9, jlong arg10, jint arg11, jlongArray arg12, jlongArray arg13);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJI_3CJJIJI_3J_3J)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5, jcharArray arg6, jlong arg7, jlong arg8, jint arg9, jlong arg10, jint arg11, jlongArray arg12, jlongArray arg13)
 {
 	jchar *lparg6=NULL;
 	jlong *lparg12=NULL;
 	jlong *lparg13=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJJI_3CJJIJI_3J_3J_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJJI_3CJJIJI_3J_3J_FUNC);
 	if (arg6) if ((lparg6 = env->GetCharArrayElements(arg6, NULL)) == NULL) goto fail;
 	if (arg12) if ((lparg12 = env->GetLongArrayElements(arg12, NULL)) == NULL) goto fail;
 	if (arg13) if ((lparg13 = env->GetLongArrayElements(arg13, NULL)) == NULL) goto fail;
@@ -1250,14 +1693,14 @@
 	if (arg13 && lparg13) env->ReleaseLongArrayElements(arg13, lparg13, 0);
 	if (arg12 && lparg12) env->ReleaseLongArrayElements(arg12, lparg12, 0);
 	if (arg6 && lparg6) env->ReleaseCharArrayElements(arg6, lparg6, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJJI_3CJJIJI_3J_3J_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJJI_3CJJIJI_3J_3J_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJJJI_3C_3BJJIJI_3J_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJI_3C_3BJJIJI_3J_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5, jcharArray arg6, jbyteArray arg7, jlong arg8, jlong arg9, jint arg10, jlong arg11, jint arg12, jlongArray arg13, jlongArray arg14);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJI_3C_3BJJIJI_3J_3J)
+#ifndef NO__1VtblCall__IIJJJI_3C_3BJJIJI_3J_3J
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJI_3C_3BJJIJI_3J_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5, jcharArray arg6, jbyteArray arg7, jlong arg8, jlong arg9, jint arg10, jlong arg11, jint arg12, jlongArray arg13, jlongArray arg14);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJI_3C_3BJJIJI_3J_3J)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5, jcharArray arg6, jbyteArray arg7, jlong arg8, jlong arg9, jint arg10, jlong arg11, jint arg12, jlongArray arg13, jlongArray arg14)
 {
 	jchar *lparg6=NULL;
@@ -1265,7 +1708,7 @@
 	jlong *lparg13=NULL;
 	jlong *lparg14=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJJI_3C_3BJJIJI_3J_3J_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJJI_3C_3BJJIJI_3J_3J_FUNC);
 	if (arg6) if ((lparg6 = env->GetCharArrayElements(arg6, NULL)) == NULL) goto fail;
 	if (arg7) if ((lparg7 = env->GetByteArrayElements(arg7, NULL)) == NULL) goto fail;
 	if (arg13) if ((lparg13 = env->GetLongArrayElements(arg13, NULL)) == NULL) goto fail;
@@ -1276,21 +1719,21 @@
 	if (arg13 && lparg13) env->ReleaseLongArrayElements(arg13, lparg13, 0);
 	if (arg7 && lparg7) env->ReleaseByteArrayElements(arg7, lparg7, 0);
 	if (arg6 && lparg6) env->ReleaseCharArrayElements(arg6, lparg6, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJJI_3C_3BJJIJI_3J_3J_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJJI_3C_3BJJIJI_3J_3J_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJJJJIJ_3C_3I_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJJIJ_3C_3I_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jint arg6, jlong arg7, jcharArray arg8, jintArray arg9, jlongArray arg10);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJJIJ_3C_3I_3J)
+#ifndef NO__1VtblCall__IIJJJJIJ_3C_3I_3J
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJJIJ_3C_3I_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jint arg6, jlong arg7, jcharArray arg8, jintArray arg9, jlongArray arg10);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJJIJ_3C_3I_3J)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jint arg6, jlong arg7, jcharArray arg8, jintArray arg9, jlongArray arg10)
 {
 	jchar *lparg8=NULL;
 	jint *lparg9=NULL;
 	jlong *lparg10=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJJJIJ_3C_3I_3J_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJJJIJ_3C_3I_3J_FUNC);
 	if (arg8) if ((lparg8 = env->GetCharArrayElements(arg8, NULL)) == NULL) goto fail;
 	if (arg9) if ((lparg9 = env->GetIntArrayElements(arg9, NULL)) == NULL) goto fail;
 	if (arg10) if ((lparg10 = env->GetLongArrayElements(arg10, NULL)) == NULL) goto fail;
@@ -1299,111 +1742,236 @@
 	if (arg10 && lparg10) env->ReleaseLongArrayElements(arg10, lparg10, 0);
 	if (arg9 && lparg9) env->ReleaseIntArrayElements(arg9, lparg9, 0);
 	if (arg8 && lparg8) env->ReleaseCharArrayElements(arg8, lparg8, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJJJIJ_3C_3I_3J_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJJJIJ_3C_3I_3J_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJJJJJ
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJJJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJJJ)
+#ifndef NO__1VtblCall__IIJJJJJ
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJJJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJJJ)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6)
 {
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJJJJ_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJJJJ_FUNC);
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jlong, jlong, jlong))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJJJJ_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJJJJ_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJJJJJJ
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJJJJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJJJJ)
+#ifndef NO__1VtblCall__IIJJJJJJ
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJJJJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJJJJ)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7)
 {
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJJJJJ_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJJJJJ_FUNC);
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jlong, jlong, jlong, jlong))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJJJJJ_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJJJJJ_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJJJJJJJ
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJJJJJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7, jlong arg8);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJJJJJ)
+#ifndef NO__1VtblCall__IIJJJJJJJ
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJJJJJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7, jlong arg8);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJJJJJ)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7, jlong arg8)
 {
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJJJJJJ_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJJJJJJ_FUNC);
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jlong, jlong, jlong, jlong, jlong))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJJJJJJ_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJJJJJJ_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJJ_3B
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ_3B)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jbyteArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ_3B)
+#ifndef NO__1VtblCall__IIJJJJJ_3J
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJJJ_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlongArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJJJ_3J)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlongArray arg7)
+{
+	jlong *lparg7=NULL;
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJJJJ_3J_FUNC);
+	if (arg7) if ((lparg7 = env->GetLongArrayElements(arg7, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jlong, jlong, jlong, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, lparg7);
+fail:
+	if (arg7 && lparg7) env->ReleaseLongArrayElements(arg7, lparg7, 0);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJJJJ_3J_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1VtblCall__IIJJJ_3B_3BJ
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJ_3B_3BJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jbyteArray arg5, jbyteArray arg6, jlong arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJ_3B_3BJ)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jbyteArray arg5, jbyteArray arg6, jlong arg7)
+{
+	jbyte *lparg5=NULL;
+	jbyte *lparg6=NULL;
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJJ_3B_3BJ_FUNC);
+	if (arg5) if ((lparg5 = env->GetByteArrayElements(arg5, NULL)) == NULL) goto fail;
+	if (arg6) if ((lparg6 = env->GetByteArrayElements(arg6, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jlong, jbyte *, jbyte *, jlong))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5, lparg6, arg7);
+fail:
+	if (arg6 && lparg6) env->ReleaseByteArrayElements(arg6, lparg6, 0);
+	if (arg5 && lparg5) env->ReleaseByteArrayElements(arg5, lparg5, 0);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJJ_3B_3BJ_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1VtblCall__IIJJJ_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJ_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJ_3I)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jintArray arg5)
+{
+	jint *lparg5=NULL;
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJJ_3I_FUNC);
+	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jlong, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5);
+fail:
+	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJJ_3I_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1VtblCall__IIJJJ_3J
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJ_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jlongArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJ_3J)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jlongArray arg5)
+{
+	jlong *lparg5=NULL;
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJJ_3J_FUNC);
+	if (arg5) if ((lparg5 = env->GetLongArrayElements(arg5, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jlong, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5);
+fail:
+	if (arg5 && lparg5) env->ReleaseLongArrayElements(arg5, lparg5, 0);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJJ_3J_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1VtblCall__IIJJ_3B
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3B)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jbyteArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3B)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jbyteArray arg4)
 {
 	jbyte *lparg4=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJ_3B_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJ_3B_FUNC);
 	if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jbyte *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
 fail:
 	if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJ_3B_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJ_3B_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJJ_3CIJI
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ_3CIJI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jcharArray arg4, jint arg5, jlong arg6, jint arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ_3CIJI)
+#ifndef NO__1VtblCall__IIJJ_3BJ
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3BJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jbyteArray arg4, jlong arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3BJ)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jbyteArray arg4, jlong arg5)
+{
+	jbyte *lparg4=NULL;
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJ_3BJ_FUNC);
+	if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jbyte *, jlong))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5);
+fail:
+	if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJ_3BJ_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1VtblCall__IIJJ_3BJI
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3BJI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jbyteArray arg4, jlong arg5, jint arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3BJI)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jbyteArray arg4, jlong arg5, jint arg6)
+{
+	jbyte *lparg4=NULL;
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJ_3BJI_FUNC);
+	if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jbyte *, jlong, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5, arg6);
+fail:
+	if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJ_3BJI_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1VtblCall__IIJJ_3B_3B
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3B_3B)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jbyteArray arg4, jbyteArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3B_3B)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jbyteArray arg4, jbyteArray arg5)
+{
+	jbyte *lparg4=NULL;
+	jbyte *lparg5=NULL;
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJ_3B_3B_FUNC);
+	if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
+	if (arg5) if ((lparg5 = env->GetByteArrayElements(arg5, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jbyte *, jbyte *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4, lparg5);
+fail:
+	if (arg5 && lparg5) env->ReleaseByteArrayElements(arg5, lparg5, 0);
+	if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJ_3B_3B_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1VtblCall__IIJJ_3CIJI
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3CIJI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jcharArray arg4, jint arg5, jlong arg6, jint arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3CIJI)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jcharArray arg4, jint arg5, jlong arg6, jint arg7)
 {
 	jchar *lparg4=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJ_3CIJI_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJ_3CIJI_FUNC);
 	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jchar *, jint, jlong, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5, arg6, arg7);
 fail:
 	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJ_3CIJI_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJ_3CIJI_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJJ_3CJJJ
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ_3CJJJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jcharArray arg4, jlong arg5, jlong arg6, jlong arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ_3CJJJ)
+#ifndef NO__1VtblCall__IIJJ_3CJJJ
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3CJJJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jcharArray arg4, jlong arg5, jlong arg6, jlong arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3CJJJ)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jcharArray arg4, jlong arg5, jlong arg6, jlong arg7)
 {
 	jchar *lparg4=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJ_3CJJJ_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJ_3CJJJ_FUNC);
 	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jchar *, jlong, jlong, jlong))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5, arg6, arg7);
 fail:
 	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJ_3CJJJ_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJ_3CJJJ_FUNC);
 	return rc;
 }
 #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)
+#ifndef NO__1VtblCall__IIJJ_3C_3CI_3J
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__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(_1VtblCall__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);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__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;
@@ -1412,122 +1980,213 @@
 	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);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__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)
+#ifndef NO__1VtblCall__IIJJ_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jintArray arg4)
 {
 	jint *lparg4=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJ_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJ_3I_FUNC);
 	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
 fail:
 	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJ_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJ_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jobject arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2)
+#ifndef NO__1VtblCall__IIJJ_3I_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jintArray arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3I_3I)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jintArray arg4, jintArray arg5)
+{
+	jint *lparg4=NULL;
+	jint *lparg5=NULL;
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJ_3I_3I_FUNC);
+	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
+	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4, lparg5);
+fail:
+	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
+	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJ_3I_3I_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1VtblCall__IIJJ_3J
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlongArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3J)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlongArray arg4)
+{
+	jlong *lparg4=NULL;
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJ_3J_FUNC);
+	if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
+fail:
+	if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJ_3J_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jobject arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jobject arg3)
 {
 	nsID _arg3, *lparg3=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_FUNC);
 	if (arg3) if ((lparg3 = getnsIDFields(env, arg3, &_arg3)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, nsID *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3);
 fail:
 	if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jobject arg3, jlongArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J)
+#ifndef NO__1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2JJ_3J
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2JJ_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jobject arg3, jlong arg4, jlong arg5, jlongArray arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2JJ_3J)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jobject arg3, jlong arg4, jlong arg5, jlongArray arg6)
+{
+	nsID _arg3, *lparg3=NULL;
+	jlong *lparg6=NULL;
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2JJ_3J_FUNC);
+	if (arg3) if ((lparg3 = getnsIDFields(env, arg3, &_arg3)) == NULL) goto fail;
+	if (arg6) if ((lparg6 = env->GetLongArrayElements(arg6, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, nsID *, jlong, jlong, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, arg4, arg5, lparg6);
+fail:
+	if (arg6 && lparg6) env->ReleaseLongArrayElements(arg6, lparg6, 0);
+	if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2JJ_3J_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jobject arg3, jlongArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jobject arg3, jlongArray arg4)
 {
 	nsID _arg3, *lparg3=NULL;
 	jlong *lparg4=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
 	if (arg3) if ((lparg3 = getnsIDFields(env, arg3, &_arg3)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, nsID *, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
 fail:
 	if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJ_3B
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3B)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jbyteArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3B)
+#ifndef NO__1VtblCall__IIJ_3B
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3B)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jbyteArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3B)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jbyteArray arg3)
 {
 	jbyte *lparg3=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3B_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3B_FUNC);
 	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jbyte *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3);
 fail:
 	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3B_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3B_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJ_3BI
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3BI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jbyteArray arg3, jint arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3BI)
+#ifndef NO__1VtblCall__IIJ_3BI
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3BI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jbyteArray arg3, jint arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3BI)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jbyteArray arg3, jint arg4)
 {
 	jbyte *lparg3=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3BI_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3BI_FUNC);
 	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jbyte *, jint))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, arg4);
 fail:
 	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3BI_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3BI_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJ_3BJ_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3BJ_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jbyteArray arg3, jlong arg4, jlongArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3BJ_3J)
+#ifndef NO__1VtblCall__IIJ_3BJ
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3BJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jbyteArray arg3, jlong arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3BJ)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jbyteArray arg3, jlong arg4)
+{
+	jbyte *lparg3=NULL;
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3BJ_FUNC);
+	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jbyte *, jlong))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, arg4);
+fail:
+	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3BJ_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1VtblCall__IIJ_3BJ_3J
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3BJ_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jbyteArray arg3, jlong arg4, jlongArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3BJ_3J)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jbyteArray arg3, jlong arg4, jlongArray arg5)
 {
 	jbyte *lparg3=NULL;
 	jlong *lparg5=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3BJ_3J_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3BJ_3J_FUNC);
 	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = env->GetLongArrayElements(arg5, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jbyte *, jlong, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, arg4, lparg5);
 fail:
 	if (arg5 && lparg5) env->ReleaseLongArrayElements(arg5, lparg5, 0);
 	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3BJ_3J_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3BJ_3J_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJ_3B_3B_3BJ_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3B_3B_3BJ_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5, jlong arg6, jlongArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3B_3B_3BJ_3J)
+#ifndef NO__1VtblCall__IIJ_3BS
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3BS)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jbyteArray arg3, jshort arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3BS)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jbyteArray arg3, jshort arg4)
+{
+	jbyte *lparg3=NULL;
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3BS_FUNC);
+	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jbyte *, jshort))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, arg4);
+fail:
+	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3BS_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1VtblCall__IIJ_3B_3B_3BJ_3J
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3B_3B_3BJ_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5, jlong arg6, jlongArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3B_3B_3BJ_3J)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5, jlong arg6, jlongArray arg7)
 {
 	jbyte *lparg3=NULL;
@@ -1535,7 +2194,7 @@
 	jbyte *lparg5=NULL;
 	jlong *lparg7=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3B_3B_3BJ_3J_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3B_3B_3BJ_3J_FUNC);
 	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = env->GetByteArrayElements(arg5, NULL)) == NULL) goto fail;
@@ -1546,71 +2205,71 @@
 	if (arg5 && lparg5) env->ReleaseByteArrayElements(arg5, lparg5, 0);
 	if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3B_3B_3BJ_3J_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3B_3B_3BJ_3J_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJ_3B_3C
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3B_3C)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jbyteArray arg3, jcharArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3B_3C)
+#ifndef NO__1VtblCall__IIJ_3B_3C
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3B_3C)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jbyteArray arg3, jcharArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3B_3C)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jbyteArray arg3, jcharArray arg4)
 {
 	jbyte *lparg3=NULL;
 	jchar *lparg4=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3B_3C_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3B_3C_FUNC);
 	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jbyte *, jchar *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
 fail:
 	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3B_3C_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3B_3C_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJ_3CI
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3CI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jint arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3CI)
+#ifndef NO__1VtblCall__IIJ_3CI
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3CI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jint arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3CI)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jint arg4)
 {
 	jchar *lparg3=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3CI_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3CI_FUNC);
 	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jchar *, jint))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, arg4);
 fail:
 	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3CI_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3CI_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJ_3C_3C
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C)
+#ifndef NO__1VtblCall__IIJ_3C_3C
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3C)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3C)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4)
 {
 	jchar *lparg3=NULL;
 	jchar *lparg4=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3C_3C_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3C_3C_FUNC);
 	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jchar *, jchar *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
 fail:
 	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3C_3C_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3C_3C_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jint arg5, jcharArray arg6, jcharArray arg7, jcharArray arg8, jcharArray arg9, jintArray arg10, jintArray arg11);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I)
+#ifndef NO__1VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jint arg5, jcharArray arg6, jcharArray arg7, jcharArray arg8, jcharArray arg9, jintArray arg10, jintArray arg11);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jint arg5, jcharArray arg6, jcharArray arg7, jcharArray arg8, jcharArray arg9, jintArray arg10, jintArray arg11)
 {
 	jchar *lparg3=NULL;
@@ -1622,7 +2281,7 @@
 	jint *lparg10=NULL;
 	jint *lparg11=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC);
 	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
 	if (arg6) if ((lparg6 = env->GetCharArrayElements(arg6, NULL)) == NULL) goto fail;
@@ -1641,14 +2300,14 @@
 	if (arg6 && lparg6) env->ReleaseCharArrayElements(arg6, lparg6, 0);
 	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJ_3C_3CI_3J_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3CI_3J_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jint arg5, jlongArray arg6, jintArray arg7, jintArray arg8);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3CI_3J_3I_3I)
+#ifndef NO__1VtblCall__IIJ_3C_3CI_3J_3I_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3CI_3J_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jint arg5, jlongArray arg6, jintArray arg7, jintArray arg8);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3CI_3J_3I_3I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jint arg5, jlongArray arg6, jintArray arg7, jintArray arg8)
 {
 	jchar *lparg3=NULL;
@@ -1657,7 +2316,7 @@
 	jint *lparg7=NULL;
 	jint *lparg8=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3C_3CI_3J_3I_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3C_3CI_3J_3I_3I_FUNC);
 	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
 	if (arg6) if ((lparg6 = env->GetLongArrayElements(arg6, NULL)) == NULL) goto fail;
@@ -1670,14 +2329,14 @@
 	if (arg6 && lparg6) env->ReleaseLongArrayElements(arg6, lparg6, 0);
 	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3C_3CI_3J_3I_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3C_3CI_3J_3I_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJ_3C_3C_3C_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3C_3I)
+#ifndef NO__1VtblCall__IIJ_3C_3C_3C_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3C_3C_3I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6)
 {
 	jchar *lparg3=NULL;
@@ -1685,7 +2344,7 @@
 	jchar *lparg5=NULL;
 	jint *lparg6=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3C_3C_3C_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3C_3C_3C_3I_FUNC);
 	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = env->GetCharArrayElements(arg5, NULL)) == NULL) goto fail;
@@ -1696,14 +2355,14 @@
 	if (arg5 && lparg5) env->ReleaseCharArrayElements(arg5, lparg5, 0);
 	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3C_3C_3C_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3C_3C_3C_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJ_3C_3C_3C_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6, jintArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3C_3I_3I)
+#ifndef NO__1VtblCall__IIJ_3C_3C_3C_3I_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6, jintArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3C_3C_3I_3I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6, jintArray arg7)
 {
 	jchar *lparg3=NULL;
@@ -1712,7 +2371,7 @@
 	jint *lparg6=NULL;
 	jint *lparg7=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3C_3C_3C_3I_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3C_3C_3C_3I_3I_FUNC);
 	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = env->GetCharArrayElements(arg5, NULL)) == NULL) goto fail;
@@ -1725,21 +2384,21 @@
 	if (arg5 && lparg5) env->ReleaseCharArrayElements(arg5, lparg5, 0);
 	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3C_3C_3C_3I_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3C_3C_3C_3I_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJ_3C_3C_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3I)
+#ifndef NO__1VtblCall__IIJ_3C_3C_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3C_3I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jintArray arg5)
 {
 	jchar *lparg3=NULL;
 	jchar *lparg4=NULL;
 	jint *lparg5=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3C_3C_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3C_3C_3I_FUNC);
 	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
@@ -1748,21 +2407,21 @@
 	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
 	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3C_3C_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3C_3C_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJ_3C_3C_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3J)
+#ifndef NO__1VtblCall__IIJ_3C_3C_3J
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3C_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3C_3J)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5)
 {
 	jchar *lparg3=NULL;
 	jchar *lparg4=NULL;
 	jlong *lparg5=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3C_3C_3J_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3C_3C_3J_FUNC);
 	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = env->GetLongArrayElements(arg5, NULL)) == NULL) goto fail;
@@ -1771,14 +2430,14 @@
 	if (arg5 && lparg5) env->ReleaseLongArrayElements(arg5, lparg5, 0);
 	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3C_3C_3J_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3C_3C_3J_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJ_3C_3C_3J_3C_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3J_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5, jcharArray arg6, jintArray arg7, jintArray arg8);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3J_3C_3I_3I)
+#ifndef NO__1VtblCall__IIJ_3C_3C_3J_3C_3I_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3C_3J_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5, jcharArray arg6, jintArray arg7, jintArray arg8);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3C_3J_3C_3I_3I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5, jcharArray arg6, jintArray arg7, jintArray arg8)
 {
 	jchar *lparg3=NULL;
@@ -1788,7 +2447,7 @@
 	jint *lparg7=NULL;
 	jint *lparg8=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3C_3C_3J_3C_3I_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3C_3C_3J_3C_3I_3I_FUNC);
 	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = env->GetLongArrayElements(arg5, NULL)) == NULL) goto fail;
@@ -1803,14 +2462,14 @@
 	if (arg5 && lparg5) env->ReleaseLongArrayElements(arg5, lparg5, 0);
 	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3C_3C_3J_3C_3I_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3C_3C_3J_3C_3I_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5, jlongArray arg6, jcharArray arg7, jintArray arg8, jintArray arg9);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I)
+#ifndef NO__1VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5, jlongArray arg6, jcharArray arg7, jintArray arg8, jintArray arg9);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5, jlongArray arg6, jcharArray arg7, jintArray arg8, jintArray arg9)
 {
 	jchar *lparg3=NULL;
@@ -1821,7 +2480,7 @@
 	jint *lparg8=NULL;
 	jint *lparg9=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I_FUNC);
 	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = env->GetLongArrayElements(arg5, NULL)) == NULL) goto fail;
@@ -1838,72 +2497,92 @@
 	if (arg5 && lparg5) env->ReleaseLongArrayElements(arg5, lparg5, 0);
 	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJ_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jintArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3I)
+#ifndef NO__1VtblCall__IIJ_3C_3J
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jlongArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3J)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jlongArray arg4)
+{
+	jchar *lparg3=NULL;
+	jlong *lparg4=NULL;
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3C_3J_FUNC);
+	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
+	if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jchar *, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
+fail:
+	if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
+	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3C_3J_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1VtblCall__IIJ_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jintArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jintArray arg3)
 {
 	jint *lparg3=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3I_FUNC);
 	if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3);
 fail:
 	if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJ_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlongArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3J)
+#ifndef NO__1VtblCall__IIJ_3J
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlongArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3J)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlongArray arg3)
 {
 	jlong *lparg3=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3J_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3J_FUNC);
 	if (arg3) if ((lparg3 = env->GetLongArrayElements(arg3, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3);
 fail:
 	if (arg3 && lparg3) env->ReleaseLongArrayElements(arg3, lparg3, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3J_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3J_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I)
+#ifndef NO__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3)
 {
 	nsID _arg2, *lparg2=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
 	if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, nsID *, jint))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3);
 fail:
 	if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3, jobject arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I)
+#ifndef NO__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3, jobject arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3, jobject arg4, jintArray arg5)
 {
 	nsID _arg2, *lparg2=NULL;
 	nsID _arg4, *lparg4=NULL;
 	jint *lparg5=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
 	if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = getnsIDFields(env, arg4, &_arg4)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
@@ -1912,38 +2591,38 @@
 	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
 	if (arg4 && lparg4) setnsIDFields(env, arg4, lparg4);
 	if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jlong arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J)
+#ifndef NO__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jlong arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jlong arg3)
 {
 	nsID _arg2, *lparg2=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC);
 	if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, nsID *, jlong))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3);
 fail:
 	if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jlong arg3, jobject arg4, jlongArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J)
+#ifndef NO__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jlong arg3, jobject arg4, jlongArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jlong arg3, jobject arg4, jlongArray arg5)
 {
 	nsID _arg2, *lparg2=NULL;
 	nsID _arg4, *lparg4=NULL;
 	jlong *lparg5=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
 	if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = getnsIDFields(env, arg4, &_arg4)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = env->GetLongArrayElements(arg5, NULL)) == NULL) goto fail;
@@ -1952,21 +2631,21 @@
 	if (arg5 && lparg5) env->ReleaseLongArrayElements(arg5, lparg5, 0);
 	if (arg4 && lparg4) setnsIDFields(env, arg4, lparg4);
 	if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jobject arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I)
+#ifndef NO__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jobject arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jobject arg3, jintArray arg4)
 {
 	nsID _arg2, *lparg2=NULL;
 	nsID _arg3, *lparg3=NULL;
 	jint *lparg4=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
 	if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getnsIDFields(env, arg3, &_arg3)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
@@ -1975,21 +2654,21 @@
 	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
 	if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jobject arg3, jlongArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J)
+#ifndef NO__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jobject arg3, jlongArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jobject arg3, jlongArray arg4)
 {
 	nsID _arg2, *lparg2=NULL;
 	nsID _arg3, *lparg3=NULL;
 	jlong *lparg4=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
 	if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getnsIDFields(env, arg3, &_arg3)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
@@ -1998,21 +2677,21 @@
 	if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
 	if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jint arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI)
+#ifndef NO__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jint arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jint arg5)
 {
 	nsID _arg2, *lparg2=NULL;
 	jbyte *lparg3=NULL;
 	jbyte *lparg4=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_FUNC);
 	if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
@@ -2021,14 +2700,14 @@
 	if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
 	if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jbyteArray arg6, jbyteArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B)
+#ifndef NO__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jbyteArray arg6, jbyteArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jbyteArray arg6, jbyteArray arg7)
 {
 	nsID _arg2, *lparg2=NULL;
@@ -2037,7 +2716,7 @@
 	jbyte *lparg6=NULL;
 	jbyte *lparg7=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_FUNC);
 	if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
@@ -2050,21 +2729,21 @@
 	if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
 	if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jlong arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ)
+#ifndef NO__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jlong arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jlong arg5)
 {
 	nsID _arg2, *lparg2=NULL;
 	jbyte *lparg3=NULL;
 	jbyte *lparg4=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_FUNC);
 	if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
@@ -2073,14 +2752,14 @@
 	if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
 	if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jlong arg5, jbyteArray arg6, jbyteArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B)
+#ifndef NO__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jlong arg5, jbyteArray arg6, jbyteArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jlong arg5, jbyteArray arg6, jbyteArray arg7)
 {
 	nsID _arg2, *lparg2=NULL;
@@ -2089,7 +2768,7 @@
 	jbyte *lparg6=NULL;
 	jbyte *lparg7=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B_FUNC);
 	if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
@@ -2102,95 +2781,121 @@
 	if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
 	if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jintArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I)
+#ifndef NO__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jintArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jintArray arg3)
 {
 	nsID _arg2, *lparg2=NULL;
 	jint *lparg3=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
 	if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, nsID *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3);
 fail:
 	if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
 	if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jlongArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J)
+#ifndef NO__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jlongArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jlongArray arg3)
 {
 	nsID _arg2, *lparg2=NULL;
 	jlong *lparg3=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
 	if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = env->GetLongArrayElements(arg3, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, nsID *, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3);
 fail:
 	if (arg3 && lparg3) env->ReleaseLongArrayElements(arg3, lparg3, 0);
 	if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3B
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B)
+#ifndef NO__1VtblCall__IISIII
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IISIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jshort arg2, jint arg3, jint arg4, jint arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IISIII)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jshort arg2, jint arg3, jint arg4, jint arg5)
+{
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IISIII_FUNC);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jshort, jint, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IISIII_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1VtblCall__IISJIJ
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IISJIJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jshort arg2, jlong arg3, jint arg4, jlong arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IISJIJ)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jshort arg2, jlong arg3, jint arg4, jlong arg5)
+{
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IISJIJ_FUNC);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jshort, jlong, jint, jlong))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IISJIJ_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1VtblCall__II_3B
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2)
 {
 	jbyte *lparg2=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3B_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3B_FUNC);
 	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *))(*(jint **)arg1)[arg0])(arg1, lparg2);
 fail:
 	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3B_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3B_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3BI
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BI)
+#ifndef NO__1VtblCall__II_3BI
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BI)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3)
 {
 	jbyte *lparg2=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BI_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3BI_FUNC);
 	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jint))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3);
 fail:
 	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3BI_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3BI_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3BII_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jint arg4, jintArray arg5, jintArray arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BII_3I_3I)
+#ifndef NO__1VtblCall__II_3BII_3I_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jint arg4, jintArray arg5, jintArray arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BII_3I_3I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jint arg4, jintArray arg5, jintArray arg6)
 {
 	jbyte *lparg2=NULL;
 	jint *lparg5=NULL;
 	jint *lparg6=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BII_3I_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3BII_3I_3I_FUNC);
 	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
 	if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
@@ -2199,21 +2904,21 @@
 	if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
 	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
 	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3BII_3I_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3BII_3I_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3BIJ_3J_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BIJ_3J_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jlong arg4, jlongArray arg5, jintArray arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BIJ_3J_3I)
+#ifndef NO__1VtblCall__II_3BIJ_3J_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BIJ_3J_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jlong arg4, jlongArray arg5, jintArray arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BIJ_3J_3I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jlong arg4, jlongArray arg5, jintArray arg6)
 {
 	jbyte *lparg2=NULL;
 	jlong *lparg5=NULL;
 	jint *lparg6=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BIJ_3J_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3BIJ_3J_3I_FUNC);
 	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = env->GetLongArrayElements(arg5, NULL)) == NULL) goto fail;
 	if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
@@ -2222,21 +2927,21 @@
 	if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
 	if (arg5 && lparg5) env->ReleaseLongArrayElements(arg5, lparg5, 0);
 	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3BIJ_3J_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3BIJ_3J_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jobject arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I)
+#ifndef NO__1VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jobject arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jobject arg4, jintArray arg5)
 {
 	jbyte *lparg2=NULL;
 	nsID _arg4, *lparg4=NULL;
 	jint *lparg5=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
 	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = getnsIDFields(env, arg4, &_arg4)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
@@ -2245,41 +2950,41 @@
 	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
 	if (arg4 && lparg4) setnsIDFields(env, arg4, lparg4);
 	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3BI_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BI_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BI_3I)
+#ifndef NO__1VtblCall__II_3BI_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BI_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BI_3I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jintArray arg4)
 {
 	jbyte *lparg2=NULL;
 	jint *lparg4=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BI_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3BI_3I_FUNC);
 	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jint, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, lparg4);
 fail:
 	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
 	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3BI_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3BI_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3BI_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BI_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jintArray arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BI_3I_3I)
+#ifndef NO__1VtblCall__II_3BI_3I_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BI_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jintArray arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BI_3I_3I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jintArray arg4, jintArray arg5)
 {
 	jbyte *lparg2=NULL;
 	jint *lparg4=NULL;
 	jint *lparg5=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BI_3I_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3BI_3I_3I_FUNC);
 	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
@@ -2288,21 +2993,21 @@
 	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
 	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
 	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3BI_3I_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3BI_3I_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3BI_3J_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BI_3J_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jlongArray arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BI_3J_3I)
+#ifndef NO__1VtblCall__II_3BI_3J_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BI_3J_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jlongArray arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BI_3J_3I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jlongArray arg4, jintArray arg5)
 {
 	jbyte *lparg2=NULL;
 	jlong *lparg4=NULL;
 	jint *lparg5=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BI_3J_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3BI_3J_3I_FUNC);
 	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
@@ -2311,38 +3016,38 @@
 	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
 	if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
 	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3BI_3J_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3BI_3J_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3BJ
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jlong arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BJ)
+#ifndef NO__1VtblCall__II_3BJ
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jlong arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BJ)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jlong arg3)
 {
 	jbyte *lparg2=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BJ_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3BJ_FUNC);
 	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jlong))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3);
 fail:
 	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3BJ_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3BJ_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jlong arg3, jobject arg4, jlongArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J)
+#ifndef NO__1VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jlong arg3, jobject arg4, jlongArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jlong arg3, jobject arg4, jlongArray arg5)
 {
 	jbyte *lparg2=NULL;
 	nsID _arg4, *lparg4=NULL;
 	jlong *lparg5=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
 	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = getnsIDFields(env, arg4, &_arg4)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = env->GetLongArrayElements(arg5, NULL)) == NULL) goto fail;
@@ -2351,61 +3056,81 @@
 	if (arg5 && lparg5) env->ReleaseLongArrayElements(arg5, lparg5, 0);
 	if (arg4 && lparg4) setnsIDFields(env, arg4, lparg4);
 	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jobject arg3, jint arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I)
+#ifndef NO__1VtblCall__II_3BJ_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BJ_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jlong arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BJ_3I)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jlong arg3, jintArray arg4)
+{
+	jbyte *lparg2=NULL;
+	jint *lparg4=NULL;
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3BJ_3I_FUNC);
+	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
+	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jlong, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, lparg4);
+fail:
+	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
+	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3BJ_3I_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jobject arg3, jint arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jobject arg3, jint arg4)
 {
 	jbyte *lparg2=NULL;
 	nsID _arg3, *lparg3=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
 	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getnsIDFields(env, arg3, &_arg3)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, nsID *, jint))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, arg4);
 fail:
 	if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
 	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jobject arg3, jlong arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J)
+#ifndef NO__1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jobject arg3, jlong arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jobject arg3, jlong arg4)
 {
 	jbyte *lparg2=NULL;
 	nsID _arg3, *lparg3=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC);
 	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getnsIDFields(env, arg3, &_arg3)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, nsID *, jlong))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, arg4);
 fail:
 	if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
 	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jobject arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I)
+#ifndef NO__1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jobject arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jobject arg3, jintArray arg4)
 {
 	jbyte *lparg2=NULL;
 	nsID _arg3, *lparg3=NULL;
 	jint *lparg4=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
 	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getnsIDFields(env, arg3, &_arg3)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
@@ -2414,21 +3139,21 @@
 	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
 	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jobject arg3, jlongArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J)
+#ifndef NO__1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jobject arg3, jlongArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jobject arg3, jlongArray arg4)
 {
 	jbyte *lparg2=NULL;
 	nsID _arg3, *lparg3=NULL;
 	jlong *lparg4=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
 	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getnsIDFields(env, arg3, &_arg3)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
@@ -2437,54 +3162,54 @@
 	if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
 	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3B_3B
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3B)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3B)
+#ifndef NO__1VtblCall__II_3B_3B
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3B)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3B)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3)
 {
 	jbyte *lparg2=NULL;
 	jbyte *lparg3=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3B_3B_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3B_3B_FUNC);
 	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jbyte *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3);
 fail:
 	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
 	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3B_3B_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3B_3B_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3B_3BI
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3BI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jint arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3BI)
+#ifndef NO__1VtblCall__II_3B_3BI
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3BI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jint arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3BI)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jint arg4)
 {
 	jbyte *lparg2=NULL;
 	jbyte *lparg3=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3B_3BI_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3B_3BI_FUNC);
 	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jbyte *, jint))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, arg4);
 fail:
 	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
 	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3B_3BI_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3B_3BI_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3B_3B_3BII_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3B_3BII_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jint arg6, jintArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3B_3BII_3I)
+#ifndef NO__1VtblCall__II_3B_3B_3BII_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3B_3BII_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jint arg6, jintArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3B_3BII_3I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jint arg6, jintArray arg7)
 {
 	jbyte *lparg2=NULL;
@@ -2492,7 +3217,7 @@
 	jbyte *lparg4=NULL;
 	jint *lparg7=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3B_3B_3BII_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3B_3B_3BII_3I_FUNC);
 	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
@@ -2503,14 +3228,14 @@
 	if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
 	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3B_3B_3BII_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3B_3B_3BII_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3B_3B_3BII_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3B_3BII_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jint arg6, jlongArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3B_3BII_3J)
+#ifndef NO__1VtblCall__II_3B_3B_3BII_3J
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3B_3BII_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jint arg6, jlongArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3B_3BII_3J)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jint arg6, jlongArray arg7)
 {
 	jbyte *lparg2=NULL;
@@ -2518,7 +3243,7 @@
 	jbyte *lparg4=NULL;
 	jlong *lparg7=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3B_3B_3BII_3J_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3B_3B_3BII_3J_FUNC);
 	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
@@ -2529,21 +3254,21 @@
 	if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
 	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3B_3B_3BII_3J_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3B_3B_3BII_3J_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3B_3B_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3B_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3B_3I)
+#ifndef NO__1VtblCall__II_3B_3B_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3B_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3B_3I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jintArray arg4)
 {
 	jbyte *lparg2=NULL;
 	jbyte *lparg3=NULL;
 	jint *lparg4=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3B_3B_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3B_3B_3I_FUNC);
 	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
@@ -2552,21 +3277,21 @@
 	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
 	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3B_3B_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3B_3B_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3B_3B_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3B_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jlongArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3B_3J)
+#ifndef NO__1VtblCall__II_3B_3B_3J
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3B_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jlongArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3B_3J)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jlongArray arg4)
 {
 	jbyte *lparg2=NULL;
 	jbyte *lparg3=NULL;
 	jlong *lparg4=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3B_3B_3J_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3B_3B_3J_FUNC);
 	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
@@ -2575,41 +3300,41 @@
 	if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
 	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3B_3B_3J_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3B_3B_3J_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3B_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jintArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3I)
+#ifndef NO__1VtblCall__II_3B_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jintArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jintArray arg3)
 {
 	jbyte *lparg2=NULL;
 	jint *lparg3=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3B_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3B_3I_FUNC);
 	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3);
 fail:
 	if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
 	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3B_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3B_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3B_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jintArray arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3I_3I)
+#ifndef NO__1VtblCall__II_3B_3I_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jintArray arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3I_3I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jintArray arg3, jintArray arg4)
 {
 	jbyte *lparg2=NULL;
 	jint *lparg3=NULL;
 	jint *lparg4=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3B_3I_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3B_3I_3I_FUNC);
 	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
@@ -2618,21 +3343,21 @@
 	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
 	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3B_3I_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3B_3I_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3B_3I_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3I_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jintArray arg3, jlongArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3I_3J)
+#ifndef NO__1VtblCall__II_3B_3I_3J
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3I_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jintArray arg3, jlongArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3I_3J)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jintArray arg3, jlongArray arg4)
 {
 	jbyte *lparg2=NULL;
 	jint *lparg3=NULL;
 	jlong *lparg4=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3B_3I_3J_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3B_3I_3J_FUNC);
 	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
@@ -2641,41 +3366,41 @@
 	if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
 	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3B_3I_3J_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3B_3I_3J_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3B_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jlongArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3J)
+#ifndef NO__1VtblCall__II_3B_3J
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jlongArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3J)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jlongArray arg3)
 {
 	jbyte *lparg2=NULL;
 	jlong *lparg3=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3B_3J_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3B_3J_FUNC);
 	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = env->GetLongArrayElements(arg3, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3);
 fail:
 	if (arg3 && lparg3) env->ReleaseLongArrayElements(arg3, lparg3, 0);
 	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3B_3J_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3B_3J_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3B_3J_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3J_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jlongArray arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3J_3I)
+#ifndef NO__1VtblCall__II_3B_3J_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3J_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jlongArray arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3J_3I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jlongArray arg3, jintArray arg4)
 {
 	jbyte *lparg2=NULL;
 	jlong *lparg3=NULL;
 	jint *lparg4=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3B_3J_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3B_3J_3I_FUNC);
 	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = env->GetLongArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
@@ -2684,186 +3409,186 @@
 	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseLongArrayElements(arg3, lparg3, 0);
 	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3B_3J_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3B_3J_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3C
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3C)(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3C)
+#ifndef NO__1VtblCall__II_3C
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3C)(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3C)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2)
 {
 	jchar *lparg2=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3C_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3C_FUNC);
 	if (arg2) if ((lparg2 = env->GetCharArrayElements(arg2, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jchar *))(*(jint **)arg1)[arg0])(arg1, lparg2);
 fail:
 	if (arg2 && lparg2) env->ReleaseCharArrayElements(arg2, lparg2, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3C_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3C_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3CIIII
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3CIIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jint arg3, jint arg4, jint arg5, jint arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3CIIII)
+#ifndef NO__1VtblCall__II_3CIIII
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3CIIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jint arg3, jint arg4, jint arg5, jint arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3CIIII)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jint arg3, jint arg4, jint arg5, jint arg6)
 {
 	jchar *lparg2=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3CIIII_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3CIIII_FUNC);
 	if (arg2) if ((lparg2 = env->GetCharArrayElements(arg2, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jchar *, jint, jint, jint, jint))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, arg6);
 fail:
 	if (arg2 && lparg2) env->ReleaseCharArrayElements(arg2, lparg2, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3CIIII_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3CIIII_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3CIJJJ
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3CIJJJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jint arg3, jlong arg4, jlong arg5, jlong arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3CIJJJ)
+#ifndef NO__1VtblCall__II_3CIJJJ
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3CIJJJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jint arg3, jlong arg4, jlong arg5, jlong arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3CIJJJ)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jint arg3, jlong arg4, jlong arg5, jlong arg6)
 {
 	jchar *lparg2=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3CIJJJ_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3CIJJJ_FUNC);
 	if (arg2) if ((lparg2 = env->GetCharArrayElements(arg2, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jchar *, jint, jlong, jlong, jlong))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, arg6);
 fail:
 	if (arg2 && lparg2) env->ReleaseCharArrayElements(arg2, lparg2, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3CIJJJ_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3CIJJJ_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3CI_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3CI_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jint arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3CI_3I)
+#ifndef NO__1VtblCall__II_3CI_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3CI_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jint arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3CI_3I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jint arg3, jintArray arg4)
 {
 	jchar *lparg2=NULL;
 	jint *lparg4=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3CI_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3CI_3I_FUNC);
 	if (arg2) if ((lparg2 = env->GetCharArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jchar *, jint, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, lparg4);
 fail:
 	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
 	if (arg2 && lparg2) env->ReleaseCharArrayElements(arg2, lparg2, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3CI_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3CI_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3CJ_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3CJ_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jlong arg3, jlongArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3CJ_3J)
+#ifndef NO__1VtblCall__II_3CJ_3J
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3CJ_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jlong arg3, jlongArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3CJ_3J)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jlong arg3, jlongArray arg4)
 {
 	jchar *lparg2=NULL;
 	jlong *lparg4=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3CJ_3J_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3CJ_3J_FUNC);
 	if (arg2) if ((lparg2 = env->GetCharArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jchar *, jlong, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, lparg4);
 fail:
 	if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
 	if (arg2 && lparg2) env->ReleaseCharArrayElements(arg2, lparg2, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3CJ_3J_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3CJ_3J_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3C_3C
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3C_3C)(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jcharArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3C_3C)
+#ifndef NO__1VtblCall__II_3C_3C
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3C_3C)(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jcharArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3C_3C)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jcharArray arg3)
 {
 	jchar *lparg2=NULL;
 	jchar *lparg3=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3C_3C_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3C_3C_FUNC);
 	if (arg2) if ((lparg2 = env->GetCharArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jchar *, jchar *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3);
 fail:
 	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
 	if (arg2 && lparg2) env->ReleaseCharArrayElements(arg2, lparg2, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3C_3C_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3C_3C_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3F
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3F)(JNIEnv *env, jclass that, jint arg0, jint arg1, jfloatArray arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3F)
+#ifndef NO__1VtblCall__II_3F
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3F)(JNIEnv *env, jclass that, jint arg0, jint arg1, jfloatArray arg2);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3F)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jfloatArray arg2)
 {
 	jfloat *lparg2=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3F_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3F_FUNC);
 	if (arg2) if ((lparg2 = env->GetFloatArrayElements(arg2, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jfloat *))(*(jint **)arg1)[arg0])(arg1, lparg2);
 fail:
 	if (arg2 && lparg2) env->ReleaseFloatArrayElements(arg2, lparg2, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3F_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3F_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I)
+#ifndef NO__1VtblCall__II_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)
 {
 	jint *lparg2=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3I_FUNC);
 	if (arg2) if ((lparg2 = env->GetIntArrayElements(arg2, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2);
 fail:
 	if (arg2 && lparg2) env->ReleaseIntArrayElements(arg2, lparg2, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3I)
+#ifndef NO__1VtblCall__II_3I_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3I_3I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3)
 {
 	jint *lparg2=NULL;
 	jint *lparg3=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3I_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3I_3I_FUNC);
 	if (arg2) if ((lparg2 = env->GetIntArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3);
 fail:
 	if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
 	if (arg2 && lparg2) env->ReleaseIntArrayElements(arg2, lparg2, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3I_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3I_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3I_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3I_3I)
+#ifndef NO__1VtblCall__II_3I_3I_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3I_3I_3I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3, jintArray arg4)
 {
 	jint *lparg2=NULL;
 	jint *lparg3=NULL;
 	jint *lparg4=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3I_3I_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3I_3I_3I_FUNC);
 	if (arg2) if ((lparg2 = env->GetIntArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
@@ -2872,14 +3597,14 @@
 	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
 	if (arg2 && lparg2) env->ReleaseIntArrayElements(arg2, lparg2, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3I_3I_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3I_3I_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3I_3I_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3, jintArray arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3I_3I_3I)
+#ifndef NO__1VtblCall__II_3I_3I_3I_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3I_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3, jintArray arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3I_3I_3I_3I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3, jintArray arg4, jintArray arg5)
 {
 	jint *lparg2=NULL;
@@ -2887,7 +3612,7 @@
 	jint *lparg4=NULL;
 	jint *lparg5=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3I_3I_3I_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3I_3I_3I_3I_FUNC);
 	if (arg2) if ((lparg2 = env->GetIntArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
@@ -2898,41 +3623,73 @@
 	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
 	if (arg2 && lparg2) env->ReleaseIntArrayElements(arg2, lparg2, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3I_3I_3I_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3I_3I_3I_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3I_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jlongArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3J)
+#ifndef NO__1VtblCall__II_3I_3I_3I_3I_3I_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3I_3I_3I_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3, jintArray arg4, jintArray arg5, jintArray arg6, jintArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3I_3I_3I_3I_3I_3I)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3, jintArray arg4, jintArray arg5, jintArray arg6, jintArray arg7)
+{
+	jint *lparg2=NULL;
+	jint *lparg3=NULL;
+	jint *lparg4=NULL;
+	jint *lparg5=NULL;
+	jint *lparg6=NULL;
+	jint *lparg7=NULL;
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3I_3I_3I_3I_3I_3I_FUNC);
+	if (arg2) if ((lparg2 = env->GetIntArrayElements(arg2, NULL)) == NULL) goto fail;
+	if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
+	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
+	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
+	if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
+	if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint *, jint *, jint *, jint *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, lparg5, lparg6, lparg7);
+fail:
+	if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
+	if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
+	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
+	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
+	if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
+	if (arg2 && lparg2) env->ReleaseIntArrayElements(arg2, lparg2, 0);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3I_3I_3I_3I_3I_3I_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1VtblCall__II_3I_3J
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3I_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jlongArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3I_3J)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jlongArray arg3)
 {
 	jint *lparg2=NULL;
 	jlong *lparg3=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3I_3J_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3I_3J_FUNC);
 	if (arg2) if ((lparg2 = env->GetIntArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = env->GetLongArrayElements(arg3, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint *, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3);
 fail:
 	if (arg3 && lparg3) env->ReleaseLongArrayElements(arg3, lparg3, 0);
 	if (arg2 && lparg2) env->ReleaseIntArrayElements(arg2, lparg2, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3I_3J_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3I_3J_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3I_3J_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3J_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jlongArray arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3J_3I)
+#ifndef NO__1VtblCall__II_3I_3J_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3I_3J_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jlongArray arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3I_3J_3I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jlongArray arg3, jintArray arg4)
 {
 	jint *lparg2=NULL;
 	jlong *lparg3=NULL;
 	jint *lparg4=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3I_3J_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3I_3J_3I_FUNC);
 	if (arg2) if ((lparg2 = env->GetIntArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = env->GetLongArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
@@ -2941,21 +3698,21 @@
 	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseLongArrayElements(arg3, lparg3, 0);
 	if (arg2 && lparg2) env->ReleaseIntArrayElements(arg2, lparg2, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3I_3J_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3I_3J_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3I_3J_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3J_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jlongArray arg3, jlongArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3J_3J)
+#ifndef NO__1VtblCall__II_3I_3J_3J
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3I_3J_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jlongArray arg3, jlongArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3I_3J_3J)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jlongArray arg3, jlongArray arg4)
 {
 	jint *lparg2=NULL;
 	jlong *lparg3=NULL;
 	jlong *lparg4=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3I_3J_3J_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3I_3J_3J_FUNC);
 	if (arg2) if ((lparg2 = env->GetIntArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = env->GetLongArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
@@ -2964,38 +3721,58 @@
 	if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseLongArrayElements(arg3, lparg3, 0);
 	if (arg2 && lparg2) env->ReleaseIntArrayElements(arg2, lparg2, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3I_3J_3J_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3I_3J_3J_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlongArray arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3J)
+#ifndef NO__1VtblCall__II_3J
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlongArray arg2);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3J)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlongArray arg2)
 {
 	jlong *lparg2=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3J_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3J_FUNC);
 	if (arg2) if ((lparg2 = env->GetLongArrayElements(arg2, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2);
 fail:
 	if (arg2 && lparg2) env->ReleaseLongArrayElements(arg2, lparg2, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3J_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3J_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3J_3J_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3J_3J_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlongArray arg2, jlongArray arg3, jlongArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3J_3J_3J)
+#ifndef NO__1VtblCall__II_3J_3J
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3J_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlongArray arg2, jlongArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3J_3J)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlongArray arg2, jlongArray arg3)
+{
+	jlong *lparg2=NULL;
+	jlong *lparg3=NULL;
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3J_3J_FUNC);
+	if (arg2) if ((lparg2 = env->GetLongArrayElements(arg2, NULL)) == NULL) goto fail;
+	if (arg3) if ((lparg3 = env->GetLongArrayElements(arg3, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong *, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3);
+fail:
+	if (arg3 && lparg3) env->ReleaseLongArrayElements(arg3, lparg3, 0);
+	if (arg2 && lparg2) env->ReleaseLongArrayElements(arg2, lparg2, 0);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3J_3J_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1VtblCall__II_3J_3J_3J
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3J_3J_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlongArray arg2, jlongArray arg3, jlongArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3J_3J_3J)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlongArray arg2, jlongArray arg3, jlongArray arg4)
 {
 	jlong *lparg2=NULL;
 	jlong *lparg3=NULL;
 	jlong *lparg4=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3J_3J_3J_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3J_3J_3J_FUNC);
 	if (arg2) if ((lparg2 = env->GetLongArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = env->GetLongArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
@@ -3004,58 +3781,425 @@
 	if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseLongArrayElements(arg3, lparg3, 0);
 	if (arg2 && lparg2) env->ReleaseLongArrayElements(arg2, lparg2, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3J_3J_3J_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3J_3J_3J_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3S
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3S)(JNIEnv *env, jclass that, jint arg0, jint arg1, jshortArray arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3S)
+#ifndef NO__1VtblCall__II_3J_3J_3J_3J_3J_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3J_3J_3J_3J_3J_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlongArray arg2, jlongArray arg3, jlongArray arg4, jlongArray arg5, jlongArray arg6, jintArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3J_3J_3J_3J_3J_3I)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlongArray arg2, jlongArray arg3, jlongArray arg4, jlongArray arg5, jlongArray arg6, jintArray arg7)
+{
+	jlong *lparg2=NULL;
+	jlong *lparg3=NULL;
+	jlong *lparg4=NULL;
+	jlong *lparg5=NULL;
+	jlong *lparg6=NULL;
+	jint *lparg7=NULL;
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3J_3J_3J_3J_3J_3I_FUNC);
+	if (arg2) if ((lparg2 = env->GetLongArrayElements(arg2, NULL)) == NULL) goto fail;
+	if (arg3) if ((lparg3 = env->GetLongArrayElements(arg3, NULL)) == NULL) goto fail;
+	if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
+	if (arg5) if ((lparg5 = env->GetLongArrayElements(arg5, NULL)) == NULL) goto fail;
+	if (arg6) if ((lparg6 = env->GetLongArrayElements(arg6, NULL)) == NULL) goto fail;
+	if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong *, jlong *, jlong *, jlong *, jlong *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, lparg5, lparg6, lparg7);
+fail:
+	if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
+	if (arg6 && lparg6) env->ReleaseLongArrayElements(arg6, lparg6, 0);
+	if (arg5 && lparg5) env->ReleaseLongArrayElements(arg5, lparg5, 0);
+	if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
+	if (arg3 && lparg3) env->ReleaseLongArrayElements(arg3, lparg3, 0);
+	if (arg2 && lparg2) env->ReleaseLongArrayElements(arg2, lparg2, 0);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3J_3J_3J_3J_3J_3I_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1VtblCall__II_3S
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3S)(JNIEnv *env, jclass that, jint arg0, jint arg1, jshortArray arg2);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3S)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jshortArray arg2)
 {
 	jshort *lparg2=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3S_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3S_FUNC);
 	if (arg2) if ((lparg2 = env->GetShortArrayElements(arg2, NULL)) == NULL) goto fail;
 	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jshort *))(*(jint **)arg1)[arg0])(arg1, lparg2);
 fail:
 	if (arg2 && lparg2) env->ReleaseShortArrayElements(arg2, lparg2, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3S_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3S_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_XPCOMGlueShutdown
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(XPCOMGlueShutdown)(JNIEnv *env, jclass that);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(XPCOMGlueShutdown)
+#ifndef NO__1VtblCall__II_3SI_3I_3I
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3SI_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jshortArray arg2, jint arg3, jintArray arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3SI_3I_3I)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jshortArray arg2, jint arg3, jintArray arg4, jintArray arg5)
+{
+	jshort *lparg2=NULL;
+	jint *lparg4=NULL;
+	jint *lparg5=NULL;
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3SI_3I_3I_FUNC);
+	if (arg2) if ((lparg2 = env->GetShortArrayElements(arg2, NULL)) == NULL) goto fail;
+	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
+	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jshort *, jint, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5);
+fail:
+	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
+	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
+	if (arg2 && lparg2) env->ReleaseShortArrayElements(arg2, lparg2, 0);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3SI_3I_3I_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1VtblCall__II_3SJ_3I_3J
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3SJ_3I_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jshortArray arg2, jlong arg3, jintArray arg4, jlongArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3SJ_3I_3J)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jshortArray arg2, jlong arg3, jintArray arg4, jlongArray arg5)
+{
+	jshort *lparg2=NULL;
+	jint *lparg4=NULL;
+	jlong *lparg5=NULL;
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3SJ_3I_3J_FUNC);
+	if (arg2) if ((lparg2 = env->GetShortArrayElements(arg2, NULL)) == NULL) goto fail;
+	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
+	if (arg5) if ((lparg5 = env->GetLongArrayElements(arg5, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jshort *, jlong, jint *, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5);
+fail:
+	if (arg5 && lparg5) env->ReleaseLongArrayElements(arg5, lparg5, 0);
+	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
+	if (arg2 && lparg2) env->ReleaseShortArrayElements(arg2, lparg2, 0);
+	XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3SJ_3I_3J_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1XPCOMGlueLoadXULFunctions
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1XPCOMGlueLoadXULFunctions)(JNIEnv *env, jclass that, jint arg0);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1XPCOMGlueLoadXULFunctions)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1XPCOMGlueLoadXULFunctions_FUNC);
+	rc = (jint)XPCOMGlueLoadXULFunctions((const nsDynamicFunctionLoad *)arg0);
+	XPCOM_NATIVE_EXIT(env, that, _1XPCOMGlueLoadXULFunctions_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1XPCOMGlueShutdown
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1XPCOMGlueShutdown)(JNIEnv *env, jclass that);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1XPCOMGlueShutdown)
 	(JNIEnv *env, jclass that)
 {
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, XPCOMGlueShutdown_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1XPCOMGlueShutdown_FUNC);
 	rc = (jint)XPCOMGlueShutdown();
-	XPCOM_NATIVE_EXIT(env, that, XPCOMGlueShutdown_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1XPCOMGlueShutdown_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_XPCOMGlueStartup
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(XPCOMGlueStartup)(JNIEnv *env, jclass that, jbyteArray arg0);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(XPCOMGlueStartup)
+#ifndef NO__1XPCOMGlueStartup
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1XPCOMGlueStartup)(JNIEnv *env, jclass that, jbyteArray arg0);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1XPCOMGlueStartup)
 	(JNIEnv *env, jclass that, jbyteArray arg0)
 {
 	jbyte *lparg0=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, XPCOMGlueStartup_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, _1XPCOMGlueStartup_FUNC);
 	if (arg0) if ((lparg0 = env->GetByteArrayElements(arg0, NULL)) == NULL) goto fail;
 	rc = (jint)XPCOMGlueStartup((const char *)lparg0);
 fail:
 	if (arg0 && lparg0) env->ReleaseByteArrayElements(arg0, lparg0, 0);
-	XPCOM_NATIVE_EXIT(env, that, XPCOMGlueStartup_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, _1XPCOMGlueStartup_FUNC);
 	return rc;
 }
 #endif
 
+#ifndef NO__1nsEmbedCString_1Length
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1nsEmbedCString_1Length)(JNIEnv *env, jclass that, jint arg0);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1nsEmbedCString_1Length)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1nsEmbedCString_1Length_FUNC);
+	rc = (jint)((nsEmbedCString *)arg0)->Length();
+	XPCOM_NATIVE_EXIT(env, that, _1nsEmbedCString_1Length_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1nsEmbedCString_1delete
+extern "C" JNIEXPORT void JNICALL XPCOM_NATIVE(_1nsEmbedCString_1delete)(JNIEnv *env, jclass that, jint arg0);
+JNIEXPORT void JNICALL XPCOM_NATIVE(_1nsEmbedCString_1delete)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	XPCOM_NATIVE_ENTER(env, that, _1nsEmbedCString_1delete_FUNC);
+	delete (nsEmbedCString *)arg0;
+	XPCOM_NATIVE_EXIT(env, that, _1nsEmbedCString_1delete_FUNC);
+}
+#endif
+
+#ifndef NO__1nsEmbedCString_1get
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1nsEmbedCString_1get)(JNIEnv *env, jclass that, jint arg0);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1nsEmbedCString_1get)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1nsEmbedCString_1get_FUNC);
+	rc = (jint)((nsEmbedCString *)arg0)->get();
+	XPCOM_NATIVE_EXIT(env, that, _1nsEmbedCString_1get_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1nsEmbedCString_1new__
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1nsEmbedCString_1new__)(JNIEnv *env, jclass that);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1nsEmbedCString_1new__)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1nsEmbedCString_1new___FUNC);
+	rc = (jint)new nsEmbedCString();
+	XPCOM_NATIVE_EXIT(env, that, _1nsEmbedCString_1new___FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1nsEmbedCString_1new__II
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1nsEmbedCString_1new__II)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1nsEmbedCString_1new__II)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+{
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1nsEmbedCString_1new__II_FUNC);
+	rc = (jint)new nsEmbedCString((const char *)arg0, arg1);
+	XPCOM_NATIVE_EXIT(env, that, _1nsEmbedCString_1new__II_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1nsEmbedCString_1new___3BI
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1nsEmbedCString_1new___3BI)(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1nsEmbedCString_1new___3BI)
+	(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1)
+{
+	jbyte *lparg0=NULL;
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1nsEmbedCString_1new___3BI_FUNC);
+	if (arg0) if ((lparg0 = env->GetByteArrayElements(arg0, NULL)) == NULL) goto fail;
+	rc = (jint)new nsEmbedCString((const char *)lparg0, arg1);
+fail:
+	if (arg0 && lparg0) env->ReleaseByteArrayElements(arg0, lparg0, 0);
+	XPCOM_NATIVE_EXIT(env, that, _1nsEmbedCString_1new___3BI_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1nsEmbedString_1Length
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1nsEmbedString_1Length)(JNIEnv *env, jclass that, jint arg0);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1nsEmbedString_1Length)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1nsEmbedString_1Length_FUNC);
+	rc = (jint)((nsEmbedString *)arg0)->Length();
+	XPCOM_NATIVE_EXIT(env, that, _1nsEmbedString_1Length_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1nsEmbedString_1delete
+extern "C" JNIEXPORT void JNICALL XPCOM_NATIVE(_1nsEmbedString_1delete)(JNIEnv *env, jclass that, jint arg0);
+JNIEXPORT void JNICALL XPCOM_NATIVE(_1nsEmbedString_1delete)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	XPCOM_NATIVE_ENTER(env, that, _1nsEmbedString_1delete_FUNC);
+	delete (nsEmbedString *)arg0;
+	XPCOM_NATIVE_EXIT(env, that, _1nsEmbedString_1delete_FUNC);
+}
+#endif
+
+#ifndef NO__1nsEmbedString_1get
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1nsEmbedString_1get)(JNIEnv *env, jclass that, jint arg0);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1nsEmbedString_1get)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1nsEmbedString_1get_FUNC);
+	rc = (jint)((nsEmbedString *)arg0)->get();
+	XPCOM_NATIVE_EXIT(env, that, _1nsEmbedString_1get_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1nsEmbedString_1new__
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1nsEmbedString_1new__)(JNIEnv *env, jclass that);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1nsEmbedString_1new__)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1nsEmbedString_1new___FUNC);
+	rc = (jint)new nsEmbedString();
+	XPCOM_NATIVE_EXIT(env, that, _1nsEmbedString_1new___FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1nsEmbedString_1new___3C
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1nsEmbedString_1new___3C)(JNIEnv *env, jclass that, jcharArray arg0);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1nsEmbedString_1new___3C)
+	(JNIEnv *env, jclass that, jcharArray arg0)
+{
+	jchar *lparg0=NULL;
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1nsEmbedString_1new___3C_FUNC);
+	if (arg0) if ((lparg0 = env->GetCharArrayElements(arg0, NULL)) == NULL) goto fail;
+	rc = (jint)new nsEmbedString((PRUnichar *)lparg0);
+fail:
+	if (arg0 && lparg0) env->ReleaseCharArrayElements(arg0, lparg0, 0);
+	XPCOM_NATIVE_EXIT(env, that, _1nsEmbedString_1new___3C_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1nsID_1Equals
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1nsID_1Equals)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1nsID_1Equals)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+{
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1nsID_1Equals_FUNC);
+	rc = (jint)((nsID *)arg0)->Equals(*(nsID *)arg1);
+	XPCOM_NATIVE_EXIT(env, that, _1nsID_1Equals_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1nsID_1delete
+extern "C" JNIEXPORT void JNICALL XPCOM_NATIVE(_1nsID_1delete)(JNIEnv *env, jclass that, jint arg0);
+JNIEXPORT void JNICALL XPCOM_NATIVE(_1nsID_1delete)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	XPCOM_NATIVE_ENTER(env, that, _1nsID_1delete_FUNC);
+	delete (nsID *)arg0;
+	XPCOM_NATIVE_EXIT(env, that, _1nsID_1delete_FUNC);
+}
+#endif
+
+#ifndef NO__1nsID_1new
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1nsID_1new)(JNIEnv *env, jclass that);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1nsID_1new)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1nsID_1new_FUNC);
+	rc = (jint)new nsID();
+	XPCOM_NATIVE_EXIT(env, that, _1nsID_1new_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1nsIMemory_1Alloc
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1nsIMemory_1Alloc)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1nsIMemory_1Alloc)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+{
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1nsIMemory_1Alloc_FUNC);
+	rc = (jint)((nsIMemory *)arg0)->Alloc((size_t)arg1);
+	XPCOM_NATIVE_EXIT(env, that, _1nsIMemory_1Alloc_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1nsIMemory_1Realloc
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1nsIMemory_1Realloc)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1nsIMemory_1Realloc)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+{
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1nsIMemory_1Realloc_FUNC);
+	rc = (jint)((nsIMemory *)arg0)->Realloc((void *)arg1, (size_t)arg2);
+	XPCOM_NATIVE_EXIT(env, that, _1nsIMemory_1Realloc_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1nsIScriptContext_1GetNativeContext
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1nsIScriptContext_1GetNativeContext)(JNIEnv *env, jclass that, jint arg0);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1nsIScriptContext_1GetNativeContext)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1nsIScriptContext_1GetNativeContext_FUNC);
+	rc = (jint)((nsIScriptContext *)arg0)->GetNativeContext();
+	XPCOM_NATIVE_EXIT(env, that, _1nsIScriptContext_1GetNativeContext_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1nsIScriptGlobalObject_1EnsureScriptEnvironment
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1nsIScriptGlobalObject_1EnsureScriptEnvironment)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1nsIScriptGlobalObject_1EnsureScriptEnvironment)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+{
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1nsIScriptGlobalObject_1EnsureScriptEnvironment_FUNC);
+	rc = (jint)((nsIScriptGlobalObject *)arg0)->EnsureScriptEnvironment(arg1);
+	XPCOM_NATIVE_EXIT(env, that, _1nsIScriptGlobalObject_1EnsureScriptEnvironment_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1nsIScriptGlobalObject_1GetScriptContext
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1nsIScriptGlobalObject_1GetScriptContext)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1nsIScriptGlobalObject_1GetScriptContext)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+{
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1nsIScriptGlobalObject_1GetScriptContext_FUNC);
+	rc = (jint)((nsIScriptGlobalObject *)arg0)->GetScriptContext(arg1);
+	XPCOM_NATIVE_EXIT(env, that, _1nsIScriptGlobalObject_1GetScriptContext_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1nsIScriptGlobalObject_1GetScriptGlobal
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1nsIScriptGlobalObject_1GetScriptGlobal)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1nsIScriptGlobalObject_1GetScriptGlobal)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+{
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1nsIScriptGlobalObject_1GetScriptGlobal_FUNC);
+	rc = (jint)((nsIScriptGlobalObject *)arg0)->GetScriptGlobal(arg1);
+	XPCOM_NATIVE_EXIT(env, that, _1nsIScriptGlobalObject_1GetScriptGlobal_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_memmove__ILorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2I
+extern "C" JNIEXPORT void JNICALL XPCOM_NATIVE(memmove__ILorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2I)(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2);
+JNIEXPORT void JNICALL XPCOM_NATIVE(memmove__ILorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2I)
+	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+{
+	nsDynamicFunctionLoad _arg1, *lparg1=NULL;
+	XPCOM_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2I_FUNC);
+	if (arg1) if ((lparg1 = getnsDynamicFunctionLoadFields(env, arg1, &_arg1)) == NULL) goto fail;
+	memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
+fail:
+	XPCOM_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2I_FUNC);
+}
+#endif
+
 #ifndef NO_memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I
 extern "C" JNIEXPORT void JNICALL XPCOM_NATIVE(memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I)(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2);
 JNIEXPORT void JNICALL XPCOM_NATIVE(memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I)
@@ -3086,186 +4230,15 @@
 }
 #endif
 
-#ifndef NO_nsEmbedCString_1Length
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedCString_1Length)(JNIEnv *env, jclass that, jint arg0);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedCString_1Length)
-	(JNIEnv *env, jclass that, jint arg0)
-{
-	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, nsEmbedCString_1Length_FUNC);
-	rc = (jint)((nsEmbedCString *)arg0)->Length();
-	XPCOM_NATIVE_EXIT(env, that, nsEmbedCString_1Length_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_nsEmbedCString_1delete
-extern "C" JNIEXPORT void JNICALL XPCOM_NATIVE(nsEmbedCString_1delete)(JNIEnv *env, jclass that, jint arg0);
-JNIEXPORT void JNICALL XPCOM_NATIVE(nsEmbedCString_1delete)
-	(JNIEnv *env, jclass that, jint arg0)
-{
-	XPCOM_NATIVE_ENTER(env, that, nsEmbedCString_1delete_FUNC);
-	delete (nsEmbedCString *)arg0;
-	XPCOM_NATIVE_EXIT(env, that, nsEmbedCString_1delete_FUNC);
-}
-#endif
-
-#ifndef NO_nsEmbedCString_1get
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedCString_1get)(JNIEnv *env, jclass that, jint arg0);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedCString_1get)
-	(JNIEnv *env, jclass that, jint arg0)
-{
-	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, nsEmbedCString_1get_FUNC);
-	rc = (jint)((nsEmbedCString *)arg0)->get();
-	XPCOM_NATIVE_EXIT(env, that, nsEmbedCString_1get_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_nsEmbedCString_1new__
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedCString_1new__)(JNIEnv *env, jclass that);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedCString_1new__)
+#ifndef NO_nsDynamicFunctionLoad_1sizeof
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(nsDynamicFunctionLoad_1sizeof)(JNIEnv *env, jclass that);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(nsDynamicFunctionLoad_1sizeof)
 	(JNIEnv *env, jclass that)
 {
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, nsEmbedCString_1new___FUNC);
-	rc = (jint)new nsEmbedCString();
-	XPCOM_NATIVE_EXIT(env, that, nsEmbedCString_1new___FUNC);
-	return rc;
-}
-#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)
-	(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1)
-{
-	jbyte *lparg0=NULL;
-	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, nsEmbedCString_1new___3BI_FUNC);
-	if (arg0) if ((lparg0 = env->GetByteArrayElements(arg0, NULL)) == NULL) goto fail;
-	rc = (jint)new nsEmbedCString((const char *)lparg0, arg1);
-fail:
-	if (arg0 && lparg0) env->ReleaseByteArrayElements(arg0, lparg0, 0);
-	XPCOM_NATIVE_EXIT(env, that, nsEmbedCString_1new___3BI_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_nsEmbedString_1Length
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedString_1Length)(JNIEnv *env, jclass that, jint arg0);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedString_1Length)
-	(JNIEnv *env, jclass that, jint arg0)
-{
-	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, nsEmbedString_1Length_FUNC);
-	rc = (jint)((nsEmbedString *)arg0)->Length();
-	XPCOM_NATIVE_EXIT(env, that, nsEmbedString_1Length_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_nsEmbedString_1delete
-extern "C" JNIEXPORT void JNICALL XPCOM_NATIVE(nsEmbedString_1delete)(JNIEnv *env, jclass that, jint arg0);
-JNIEXPORT void JNICALL XPCOM_NATIVE(nsEmbedString_1delete)
-	(JNIEnv *env, jclass that, jint arg0)
-{
-	XPCOM_NATIVE_ENTER(env, that, nsEmbedString_1delete_FUNC);
-	delete (nsEmbedString *)arg0;
-	XPCOM_NATIVE_EXIT(env, that, nsEmbedString_1delete_FUNC);
-}
-#endif
-
-#ifndef NO_nsEmbedString_1get
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedString_1get)(JNIEnv *env, jclass that, jint arg0);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedString_1get)
-	(JNIEnv *env, jclass that, jint arg0)
-{
-	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, nsEmbedString_1get_FUNC);
-	rc = (jint)((nsEmbedString *)arg0)->get();
-	XPCOM_NATIVE_EXIT(env, that, nsEmbedString_1get_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_nsEmbedString_1new__
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedString_1new__)(JNIEnv *env, jclass that);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedString_1new__)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, nsEmbedString_1new___FUNC);
-	rc = (jint)new nsEmbedString();
-	XPCOM_NATIVE_EXIT(env, that, nsEmbedString_1new___FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_nsEmbedString_1new___3C
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedString_1new___3C)(JNIEnv *env, jclass that, jcharArray arg0);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedString_1new___3C)
-	(JNIEnv *env, jclass that, jcharArray arg0)
-{
-	jchar *lparg0=NULL;
-	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, nsEmbedString_1new___3C_FUNC);
-	if (arg0) if ((lparg0 = env->GetCharArrayElements(arg0, NULL)) == NULL) goto fail;
-	rc = (jint)new nsEmbedString((PRUnichar *)lparg0);
-fail:
-	if (arg0 && lparg0) env->ReleaseCharArrayElements(arg0, lparg0, 0);
-	XPCOM_NATIVE_EXIT(env, that, nsEmbedString_1new___3C_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_nsID_1Equals
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(nsID_1Equals)(JNIEnv *env, jclass that, jint arg0, jint arg1);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(nsID_1Equals)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
-{
-	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, nsID_1Equals_FUNC);
-	rc = (jint)((nsID *)arg0)->Equals(*(nsID *)arg1);
-	XPCOM_NATIVE_EXIT(env, that, nsID_1Equals_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_nsID_1delete
-extern "C" JNIEXPORT void JNICALL XPCOM_NATIVE(nsID_1delete)(JNIEnv *env, jclass that, jint arg0);
-JNIEXPORT void JNICALL XPCOM_NATIVE(nsID_1delete)
-	(JNIEnv *env, jclass that, jint arg0)
-{
-	XPCOM_NATIVE_ENTER(env, that, nsID_1delete_FUNC);
-	delete (nsID *)arg0;
-	XPCOM_NATIVE_EXIT(env, that, nsID_1delete_FUNC);
-}
-#endif
-
-#ifndef NO_nsID_1new
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(nsID_1new)(JNIEnv *env, jclass that);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(nsID_1new)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, nsID_1new_FUNC);
-	rc = (jint)new nsID();
-	XPCOM_NATIVE_EXIT(env, that, nsID_1new_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, nsDynamicFunctionLoad_1sizeof_FUNC);
+	rc = (jint)nsDynamicFunctionLoad_sizeof();
+	XPCOM_NATIVE_EXIT(env, that, nsDynamicFunctionLoad_1sizeof_FUNC);
 	return rc;
 }
 #endif
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.h b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.h
index 130cb55..5e7e33d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.h
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 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
@@ -18,13 +18,26 @@
 #include "nsXPCOM.h"
 #include "nsEmbedString.h"
 #include "nsIInputStream.h"
+#include "nsIMemory.h"
 #include "nsISupportsUtils.h"
 #include "nsXPCOMGlue.h"
+#include "xpcom_custom.h"
+
+#ifndef nsIScriptContext_h__
+#include "nsIScriptContext.h"
+#include "nsIScriptGlobalObject.h"
+#endif /* nsIScriptContext_h__ */
 
 #ifdef _WIN32
 #define STDMETHODCALLTYPE __stdcall
-#else
+#define NO__1NS_1InitXPCOM2
+#else /* _WIN32 */
 #define STDMETHODCALLTYPE
-#endif
+#ifdef __APPLE__
+#define NO__1NS_1InitXPCOM2
+#endif /* __APPLE__ */
+#endif /* _WIN32 */
+
+#define SWT_XREInitEmbedding nsresult (*)(nsILocalFile *,nsILocalFile *,nsIDirectoryServiceProvider *,nsStaticModuleInfo const *,PRUint32)
 
 #endif /* INC_xpcom_H */
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_custom.cpp b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_custom.cpp
index cf6de2c..2c8f4b3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_custom.cpp
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_custom.cpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 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
@@ -35,4 +35,54 @@
 }
 #endif
 
+#ifndef NO__1JS_1EvaluateUCScriptForPrincipals
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1JS_1EvaluateUCScriptForPrincipals)
+	(JNIEnv *env, jclass that, jbyteArray mozillaPath, SWT_PTR arg0, SWT_PTR arg1, SWT_PTR arg2, jcharArray arg3, jint arg4, jbyteArray arg5, jint arg6, SWT_PTRArray arg7)
+{
+	jbyte *lpmozillaPath=NULL;
+	jchar *lparg3=NULL;
+	jbyte *lparg5=NULL;
+	SWT_PTR *lparg7=NULL;
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, _1JS_1EvaluateUCScriptForPrincipals_FUNC);
+	if (mozillaPath) if ((lpmozillaPath = env->GetByteArrayElements(mozillaPath, NULL)) == NULL) goto fail;
+	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
+	if (arg5) if ((lparg5 = env->GetByteArrayElements(arg5, NULL)) == NULL) goto fail;
+	if (arg7) if ((lparg7 = env->GetSWT_PTRArrayElements(arg7, NULL)) == NULL) goto fail;
+/*
+	rc = (jint)JS_EvaluateUCScriptForPrincipals(arg0, arg1, arg2, lparg3, arg4, lparg5, arg6, lparg7);
+*/
+	{
+	
+#ifdef _WIN32
+		LOAD_FUNCTION(fp, JS_EvaluateUCScriptForPrincipals)
+		if (fp) {
+			rc = (jint)((jint (*)(SWT_PTR, SWT_PTR, SWT_PTR, jchar *, jint, jbyte *, jint, SWT_PTR *))fp)(arg0, arg1, arg2, lparg3, arg4, lparg5, arg6, lparg7);
+		}
+#else
+#define CALLING_CONVENTION
+		static int initialized = 0;
+		static void *fp = NULL;
+		if (!initialized) {
+			void* handle = dlopen((const char *)lpmozillaPath, RTLD_LAZY);
+			if (handle) {
+				fp = dlsym(handle, "JS_EvaluateUCScriptForPrincipals");
+			}
+			initialized = 1;
+		}
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(SWT_PTR, SWT_PTR, SWT_PTR, jchar *, jint, jbyte *, jint, SWT_PTR *))fp)(arg0, arg1, arg2, lparg3, arg4, lparg5, arg6, lparg7);
+		}
+#endif /* _WIN32 */
+	}
+fail:
+	if (arg7 && lparg7) env->ReleaseSWT_PTRArrayElements(arg7, lparg7, 0);
+	if (arg5 && lparg5) env->ReleaseByteArrayElements(arg5, lparg5, 0);
+	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
+	if (mozillaPath && lpmozillaPath) env->ReleaseByteArrayElements(mozillaPath, lpmozillaPath, 0);
+	XPCOM_NATIVE_EXIT(env, that, _1JS_1EvaluateUCScriptForPrincipals_FUNC);
+	return rc;
+}
+#endif
+
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_custom.h b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_custom.h
new file mode 100644
index 0000000..c11fe30
--- /dev/null
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_custom.h
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2009 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+#ifdef _WIN32
+#include <windows.h>
+#define JS_EvaluateUCScriptForPrincipals_LIB "js3250.dll"
+#define XP_WIN
+#else
+#include <dlfcn.h>
+#endif
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 b276290..2c8ae27 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,178 +14,233 @@
 
 #ifdef NATIVE_STATS
 
-int XPCOM_nativeFunctionCount = 170;
-int XPCOM_nativeFunctionCallCount[170];
+int XPCOM_nativeFunctionCount = 225;
+int XPCOM_nativeFunctionCallCount[225];
 char * XPCOM_nativeFunctionNames[] = {
-	"Call",
-	"NS_1GetComponentManager",
-	"NS_1GetServiceManager",
-	"NS_1InitXPCOM2",
-	"NS_1NewLocalFile",
-	"VtblCall__II",
-	"VtblCall__IIF",
-	"VtblCall__III",
-	"VtblCall__IIII",
-	"VtblCall__IIIII",
-	"VtblCall__IIIIII",
-	"VtblCall__IIIIIII",
-	"VtblCall__IIIIIIII",
-	"VtblCall__IIIIIIIIIIII",
-	"VtblCall__IIIIIIIIIIIIIIISI",
-	"VtblCall__IIIIIIII_3C_3I_3I",
-	"VtblCall__IIIIIIJII",
-	"VtblCall__IIIIII_3CIIIII_3I_3I",
-	"VtblCall__IIIIII_3C_3BIIIII_3I_3I",
-	"VtblCall__IIIIII_3C_3I_3I",
-	"VtblCall__IIIIII_3I_3I",
-	"VtblCall__IIIII_3C",
-	"VtblCall__IIIII_3I",
-	"VtblCall__IIIIJJJJ",
-	"VtblCall__IIII_3B",
-	"VtblCall__IIII_3C",
-	"VtblCall__IIII_3CIJI",
-	"VtblCall__IIII_3CJJJ",
-	"VtblCall__IIII_3C_3CI_3I",
-	"VtblCall__IIII_3I",
-	"VtblCall__IIII_3J",
-	"VtblCall__IIIJJ",
-	"VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2",
-	"VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I",
-	"VtblCall__III_3B",
-	"VtblCall__III_3BI",
-	"VtblCall__III_3BI_3I",
-	"VtblCall__III_3B_3B_3BI_3I",
-	"VtblCall__III_3B_3C",
-	"VtblCall__III_3B_3I",
-	"VtblCall__III_3C",
-	"VtblCall__III_3CI",
-	"VtblCall__III_3C_3C",
-	"VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I",
-	"VtblCall__III_3C_3CI_3I_3I_3I",
-	"VtblCall__III_3C_3C_3C_3I",
-	"VtblCall__III_3C_3C_3C_3I_3I",
-	"VtblCall__III_3C_3C_3I",
-	"VtblCall__III_3C_3C_3I_3C_3I_3I",
-	"VtblCall__III_3C_3C_3I_3I_3C_3I_3I",
-	"VtblCall__III_3I",
-	"VtblCall__III_3I_3I_3I_3I",
-	"VtblCall__IIJ",
-	"VtblCall__IIJI",
-	"VtblCall__IIJIIJIIIIII",
-	"VtblCall__IIJIIJIIIIIIIIISJ",
-	"VtblCall__IIJIIJ_3I_3J",
-	"VtblCall__IIJI_3J",
-	"VtblCall__IIJJ",
-	"VtblCall__IIJJI",
-	"VtblCall__IIJJII",
-	"VtblCall__IIJJIIII",
-	"VtblCall__IIJJIJ_3C_3I_3I",
-	"VtblCall__IIJJI_3C",
-	"VtblCall__IIJJI_3I",
-	"VtblCall__IIJJJ",
-	"VtblCall__IIJJJI",
-	"VtblCall__IIJJJI_3CJJIJI_3J_3J",
-	"VtblCall__IIJJJI_3C_3BJJIJI_3J_3J",
-	"VtblCall__IIJJJJIJ_3C_3I_3J",
-	"VtblCall__IIJJJJJ",
-	"VtblCall__IIJJJJJJ",
-	"VtblCall__IIJJJJJJJ",
-	"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",
-	"VtblCall__IIJ_3B",
-	"VtblCall__IIJ_3BI",
-	"VtblCall__IIJ_3BJ_3J",
-	"VtblCall__IIJ_3B_3B_3BJ_3J",
-	"VtblCall__IIJ_3B_3C",
-	"VtblCall__IIJ_3CI",
-	"VtblCall__IIJ_3C_3C",
-	"VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I",
-	"VtblCall__IIJ_3C_3CI_3J_3I_3I",
-	"VtblCall__IIJ_3C_3C_3C_3I",
-	"VtblCall__IIJ_3C_3C_3C_3I_3I",
-	"VtblCall__IIJ_3C_3C_3I",
-	"VtblCall__IIJ_3C_3C_3J",
-	"VtblCall__IIJ_3C_3C_3J_3C_3I_3I",
-	"VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I",
-	"VtblCall__IIJ_3I",
-	"VtblCall__IIJ_3J",
-	"VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I",
-	"VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I",
-	"VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J",
-	"VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J",
-	"VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I",
-	"VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J",
-	"VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI",
-	"VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B",
-	"VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ",
-	"VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B",
-	"VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I",
-	"VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J",
-	"VtblCall__II_3B",
-	"VtblCall__II_3BI",
-	"VtblCall__II_3BII_3I_3I",
-	"VtblCall__II_3BIJ_3J_3I",
-	"VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I",
-	"VtblCall__II_3BI_3I",
-	"VtblCall__II_3BI_3I_3I",
-	"VtblCall__II_3BI_3J_3I",
-	"VtblCall__II_3BJ",
-	"VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J",
-	"VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I",
-	"VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J",
-	"VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I",
-	"VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J",
-	"VtblCall__II_3B_3B",
-	"VtblCall__II_3B_3BI",
-	"VtblCall__II_3B_3B_3BII_3I",
-	"VtblCall__II_3B_3B_3BII_3J",
-	"VtblCall__II_3B_3B_3I",
-	"VtblCall__II_3B_3B_3J",
-	"VtblCall__II_3B_3I",
-	"VtblCall__II_3B_3I_3I",
-	"VtblCall__II_3B_3I_3J",
-	"VtblCall__II_3B_3J",
-	"VtblCall__II_3B_3J_3I",
-	"VtblCall__II_3C",
-	"VtblCall__II_3CIIII",
-	"VtblCall__II_3CIJJJ",
-	"VtblCall__II_3CI_3I",
-	"VtblCall__II_3CJ_3J",
-	"VtblCall__II_3C_3C",
-	"VtblCall__II_3F",
-	"VtblCall__II_3I",
-	"VtblCall__II_3I_3I",
-	"VtblCall__II_3I_3I_3I",
-	"VtblCall__II_3I_3I_3I_3I",
-	"VtblCall__II_3I_3J",
-	"VtblCall__II_3I_3J_3I",
-	"VtblCall__II_3I_3J_3J",
-	"VtblCall__II_3J",
-	"VtblCall__II_3J_3J_3J",
-	"VtblCall__II_3S",
-	"XPCOMGlueShutdown",
-	"XPCOMGlueStartup",
+	"_1Call__I",
+	"_1Call__IIIIII",
+	"_1Call__III_3BII_3I",
+	"_1JS_1EvaluateUCScriptForPrincipals",
+	"_1NS_1GetComponentManager",
+	"_1NS_1GetServiceManager",
+	"_1NS_1InitXPCOM2",
+	"_1NS_1NewLocalFile",
+	"_1VtblCall__II",
+	"_1VtblCall__IID",
+	"_1VtblCall__IIF",
+	"_1VtblCall__III",
+	"_1VtblCall__IIII",
+	"_1VtblCall__IIIII",
+	"_1VtblCall__IIIIII",
+	"_1VtblCall__IIIIIII",
+	"_1VtblCall__IIIIIIII",
+	"_1VtblCall__IIIIIIIIIIII",
+	"_1VtblCall__IIIIIIIIIIIIIIISI",
+	"_1VtblCall__IIIIIIIII_3I",
+	"_1VtblCall__IIIIIIII_3C_3I_3I",
+	"_1VtblCall__IIIIIII_3I",
+	"_1VtblCall__IIIIIIJII",
+	"_1VtblCall__IIIIII_3CIIIII_3I_3I",
+	"_1VtblCall__IIIIII_3C_3BIIIII_3I_3I",
+	"_1VtblCall__IIIIII_3C_3I_3I",
+	"_1VtblCall__IIIIII_3I_3I",
+	"_1VtblCall__IIIIII_3I_3I_3I",
+	"_1VtblCall__IIIII_3B_3BI",
+	"_1VtblCall__IIIII_3C",
+	"_1VtblCall__IIIII_3I",
+	"_1VtblCall__IIIII_3I_3I_3I",
+	"_1VtblCall__IIIIJJJJ",
+	"_1VtblCall__IIII_3B",
+	"_1VtblCall__IIII_3BI",
+	"_1VtblCall__IIII_3BII",
+	"_1VtblCall__IIII_3B_3B",
+	"_1VtblCall__IIII_3C",
+	"_1VtblCall__IIII_3CIJI",
+	"_1VtblCall__IIII_3CJJJ",
+	"_1VtblCall__IIII_3C_3CI_3I",
+	"_1VtblCall__IIII_3I",
+	"_1VtblCall__IIII_3I_3I",
+	"_1VtblCall__IIII_3J",
+	"_1VtblCall__IIIJJ",
+	"_1VtblCall__IIIJJJJJJ_3J",
+	"_1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2",
+	"_1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2II_3I",
+	"_1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I",
+	"_1VtblCall__III_3B",
+	"_1VtblCall__III_3BI",
+	"_1VtblCall__III_3BI_3I",
+	"_1VtblCall__III_3BS",
+	"_1VtblCall__III_3B_3B_3BI_3I",
+	"_1VtblCall__III_3B_3C",
+	"_1VtblCall__III_3B_3I",
+	"_1VtblCall__III_3C",
+	"_1VtblCall__III_3CI",
+	"_1VtblCall__III_3C_3C",
+	"_1VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I",
+	"_1VtblCall__III_3C_3CI_3I_3I_3I",
+	"_1VtblCall__III_3C_3C_3C_3I",
+	"_1VtblCall__III_3C_3C_3C_3I_3I",
+	"_1VtblCall__III_3C_3C_3I",
+	"_1VtblCall__III_3C_3C_3I_3C_3I_3I",
+	"_1VtblCall__III_3C_3C_3I_3I_3C_3I_3I",
+	"_1VtblCall__III_3C_3I",
+	"_1VtblCall__III_3I",
+	"_1VtblCall__III_3II",
+	"_1VtblCall__III_3IJ",
+	"_1VtblCall__III_3I_3I_3I",
+	"_1VtblCall__III_3I_3I_3I_3I",
+	"_1VtblCall__III_3I_3I_3J",
+	"_1VtblCall__IIJ",
+	"_1VtblCall__IIJI",
+	"_1VtblCall__IIJIIJIIIIII",
+	"_1VtblCall__IIJIIJIIIIIIIIISJ",
+	"_1VtblCall__IIJIIJ_3I_3J",
+	"_1VtblCall__IIJII_3I",
+	"_1VtblCall__IIJIJII",
+	"_1VtblCall__IIJIJJ_3I_3I_3I",
+	"_1VtblCall__IIJIJ_3I_3I_3I",
+	"_1VtblCall__IIJI_3J",
+	"_1VtblCall__IIJJ",
+	"_1VtblCall__IIJJI",
+	"_1VtblCall__IIJJII",
+	"_1VtblCall__IIJJIIII",
+	"_1VtblCall__IIJJIJ_3C_3I_3I",
+	"_1VtblCall__IIJJI_3C",
+	"_1VtblCall__IIJJI_3I",
+	"_1VtblCall__IIJJJ",
+	"_1VtblCall__IIJJJI",
+	"_1VtblCall__IIJJJI_3CJJIJI_3J_3J",
+	"_1VtblCall__IIJJJI_3C_3BJJIJI_3J_3J",
+	"_1VtblCall__IIJJJJIJ_3C_3I_3J",
+	"_1VtblCall__IIJJJJJ",
+	"_1VtblCall__IIJJJJJJ",
+	"_1VtblCall__IIJJJJJJJ",
+	"_1VtblCall__IIJJJJJ_3J",
+	"_1VtblCall__IIJJJ_3B_3BJ",
+	"_1VtblCall__IIJJJ_3I",
+	"_1VtblCall__IIJJJ_3J",
+	"_1VtblCall__IIJJ_3B",
+	"_1VtblCall__IIJJ_3BJ",
+	"_1VtblCall__IIJJ_3BJI",
+	"_1VtblCall__IIJJ_3B_3B",
+	"_1VtblCall__IIJJ_3CIJI",
+	"_1VtblCall__IIJJ_3CJJJ",
+	"_1VtblCall__IIJJ_3C_3CI_3J",
+	"_1VtblCall__IIJJ_3I",
+	"_1VtblCall__IIJJ_3I_3I",
+	"_1VtblCall__IIJJ_3J",
+	"_1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2",
+	"_1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2JJ_3J",
+	"_1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J",
+	"_1VtblCall__IIJ_3B",
+	"_1VtblCall__IIJ_3BI",
+	"_1VtblCall__IIJ_3BJ",
+	"_1VtblCall__IIJ_3BJ_3J",
+	"_1VtblCall__IIJ_3BS",
+	"_1VtblCall__IIJ_3B_3B_3BJ_3J",
+	"_1VtblCall__IIJ_3B_3C",
+	"_1VtblCall__IIJ_3CI",
+	"_1VtblCall__IIJ_3C_3C",
+	"_1VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I",
+	"_1VtblCall__IIJ_3C_3CI_3J_3I_3I",
+	"_1VtblCall__IIJ_3C_3C_3C_3I",
+	"_1VtblCall__IIJ_3C_3C_3C_3I_3I",
+	"_1VtblCall__IIJ_3C_3C_3I",
+	"_1VtblCall__IIJ_3C_3C_3J",
+	"_1VtblCall__IIJ_3C_3C_3J_3C_3I_3I",
+	"_1VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I",
+	"_1VtblCall__IIJ_3C_3J",
+	"_1VtblCall__IIJ_3I",
+	"_1VtblCall__IIJ_3J",
+	"_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I",
+	"_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I",
+	"_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J",
+	"_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J",
+	"_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I",
+	"_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J",
+	"_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI",
+	"_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B",
+	"_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ",
+	"_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B",
+	"_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I",
+	"_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J",
+	"_1VtblCall__IISIII",
+	"_1VtblCall__IISJIJ",
+	"_1VtblCall__II_3B",
+	"_1VtblCall__II_3BI",
+	"_1VtblCall__II_3BII_3I_3I",
+	"_1VtblCall__II_3BIJ_3J_3I",
+	"_1VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I",
+	"_1VtblCall__II_3BI_3I",
+	"_1VtblCall__II_3BI_3I_3I",
+	"_1VtblCall__II_3BI_3J_3I",
+	"_1VtblCall__II_3BJ",
+	"_1VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J",
+	"_1VtblCall__II_3BJ_3I",
+	"_1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I",
+	"_1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J",
+	"_1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I",
+	"_1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J",
+	"_1VtblCall__II_3B_3B",
+	"_1VtblCall__II_3B_3BI",
+	"_1VtblCall__II_3B_3B_3BII_3I",
+	"_1VtblCall__II_3B_3B_3BII_3J",
+	"_1VtblCall__II_3B_3B_3I",
+	"_1VtblCall__II_3B_3B_3J",
+	"_1VtblCall__II_3B_3I",
+	"_1VtblCall__II_3B_3I_3I",
+	"_1VtblCall__II_3B_3I_3J",
+	"_1VtblCall__II_3B_3J",
+	"_1VtblCall__II_3B_3J_3I",
+	"_1VtblCall__II_3C",
+	"_1VtblCall__II_3CIIII",
+	"_1VtblCall__II_3CIJJJ",
+	"_1VtblCall__II_3CI_3I",
+	"_1VtblCall__II_3CJ_3J",
+	"_1VtblCall__II_3C_3C",
+	"_1VtblCall__II_3F",
+	"_1VtblCall__II_3I",
+	"_1VtblCall__II_3I_3I",
+	"_1VtblCall__II_3I_3I_3I",
+	"_1VtblCall__II_3I_3I_3I_3I",
+	"_1VtblCall__II_3I_3I_3I_3I_3I_3I",
+	"_1VtblCall__II_3I_3J",
+	"_1VtblCall__II_3I_3J_3I",
+	"_1VtblCall__II_3I_3J_3J",
+	"_1VtblCall__II_3J",
+	"_1VtblCall__II_3J_3J",
+	"_1VtblCall__II_3J_3J_3J",
+	"_1VtblCall__II_3J_3J_3J_3J_3J_3I",
+	"_1VtblCall__II_3S",
+	"_1VtblCall__II_3SI_3I_3I",
+	"_1VtblCall__II_3SJ_3I_3J",
+	"_1XPCOMGlueLoadXULFunctions",
+	"_1XPCOMGlueShutdown",
+	"_1XPCOMGlueStartup",
+	"_1nsEmbedCString_1Length",
+	"_1nsEmbedCString_1delete",
+	"_1nsEmbedCString_1get",
+	"_1nsEmbedCString_1new__",
+	"_1nsEmbedCString_1new__II",
+	"_1nsEmbedCString_1new___3BI",
+	"_1nsEmbedString_1Length",
+	"_1nsEmbedString_1delete",
+	"_1nsEmbedString_1get",
+	"_1nsEmbedString_1new__",
+	"_1nsEmbedString_1new___3C",
+	"_1nsID_1Equals",
+	"_1nsID_1delete",
+	"_1nsID_1new",
+	"_1nsIMemory_1Alloc",
+	"_1nsIMemory_1Realloc",
+	"_1nsIScriptContext_1GetNativeContext",
+	"_1nsIScriptGlobalObject_1EnsureScriptEnvironment",
+	"_1nsIScriptGlobalObject_1GetScriptContext",
+	"_1nsIScriptGlobalObject_1GetScriptGlobal",
+	"memmove__ILorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2I",
 	"memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I",
 	"memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2II",
-	"nsEmbedCString_1Length",
-	"nsEmbedCString_1delete",
-	"nsEmbedCString_1get",
-	"nsEmbedCString_1new__",
-	"nsEmbedCString_1new__II",
-	"nsEmbedCString_1new___3BI",
-	"nsEmbedString_1Length",
-	"nsEmbedString_1delete",
-	"nsEmbedString_1get",
-	"nsEmbedString_1new__",
-	"nsEmbedString_1new___3C",
-	"nsID_1Equals",
-	"nsID_1delete",
-	"nsID_1new",
+	"nsDynamicFunctionLoad_1sizeof",
 	"strlen_1PRUnichar",
 };
 
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 11990c6..dd5fe14 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
@@ -25,174 +25,229 @@
 #endif
 
 typedef enum {
-	Call_FUNC,
-	NS_1GetComponentManager_FUNC,
-	NS_1GetServiceManager_FUNC,
-	NS_1InitXPCOM2_FUNC,
-	NS_1NewLocalFile_FUNC,
-	VtblCall__II_FUNC,
-	VtblCall__IIF_FUNC,
-	VtblCall__III_FUNC,
-	VtblCall__IIII_FUNC,
-	VtblCall__IIIII_FUNC,
-	VtblCall__IIIIII_FUNC,
-	VtblCall__IIIIIII_FUNC,
-	VtblCall__IIIIIIII_FUNC,
-	VtblCall__IIIIIIIIIIII_FUNC,
-	VtblCall__IIIIIIIIIIIIIIISI_FUNC,
-	VtblCall__IIIIIIII_3C_3I_3I_FUNC,
-	VtblCall__IIIIIIJII_FUNC,
-	VtblCall__IIIIII_3CIIIII_3I_3I_FUNC,
-	VtblCall__IIIIII_3C_3BIIIII_3I_3I_FUNC,
-	VtblCall__IIIIII_3C_3I_3I_FUNC,
-	VtblCall__IIIIII_3I_3I_FUNC,
-	VtblCall__IIIII_3C_FUNC,
-	VtblCall__IIIII_3I_FUNC,
-	VtblCall__IIIIJJJJ_FUNC,
-	VtblCall__IIII_3B_FUNC,
-	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,
-	VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_FUNC,
-	VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
-	VtblCall__III_3B_FUNC,
-	VtblCall__III_3BI_FUNC,
-	VtblCall__III_3BI_3I_FUNC,
-	VtblCall__III_3B_3B_3BI_3I_FUNC,
-	VtblCall__III_3B_3C_FUNC,
-	VtblCall__III_3B_3I_FUNC,
-	VtblCall__III_3C_FUNC,
-	VtblCall__III_3CI_FUNC,
-	VtblCall__III_3C_3C_FUNC,
-	VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC,
-	VtblCall__III_3C_3CI_3I_3I_3I_FUNC,
-	VtblCall__III_3C_3C_3C_3I_FUNC,
-	VtblCall__III_3C_3C_3C_3I_3I_FUNC,
-	VtblCall__III_3C_3C_3I_FUNC,
-	VtblCall__III_3C_3C_3I_3C_3I_3I_FUNC,
-	VtblCall__III_3C_3C_3I_3I_3C_3I_3I_FUNC,
-	VtblCall__III_3I_FUNC,
-	VtblCall__III_3I_3I_3I_3I_FUNC,
-	VtblCall__IIJ_FUNC,
-	VtblCall__IIJI_FUNC,
-	VtblCall__IIJIIJIIIIII_FUNC,
-	VtblCall__IIJIIJIIIIIIIIISJ_FUNC,
-	VtblCall__IIJIIJ_3I_3J_FUNC,
-	VtblCall__IIJI_3J_FUNC,
-	VtblCall__IIJJ_FUNC,
-	VtblCall__IIJJI_FUNC,
-	VtblCall__IIJJII_FUNC,
-	VtblCall__IIJJIIII_FUNC,
-	VtblCall__IIJJIJ_3C_3I_3I_FUNC,
-	VtblCall__IIJJI_3C_FUNC,
-	VtblCall__IIJJI_3I_FUNC,
-	VtblCall__IIJJJ_FUNC,
-	VtblCall__IIJJJI_FUNC,
-	VtblCall__IIJJJI_3CJJIJI_3J_3J_FUNC,
-	VtblCall__IIJJJI_3C_3BJJIJI_3J_3J_FUNC,
-	VtblCall__IIJJJJIJ_3C_3I_3J_FUNC,
-	VtblCall__IIJJJJJ_FUNC,
-	VtblCall__IIJJJJJJ_FUNC,
-	VtblCall__IIJJJJJJJ_FUNC,
-	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,
-	VtblCall__IIJ_3B_FUNC,
-	VtblCall__IIJ_3BI_FUNC,
-	VtblCall__IIJ_3BJ_3J_FUNC,
-	VtblCall__IIJ_3B_3B_3BJ_3J_FUNC,
-	VtblCall__IIJ_3B_3C_FUNC,
-	VtblCall__IIJ_3CI_FUNC,
-	VtblCall__IIJ_3C_3C_FUNC,
-	VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC,
-	VtblCall__IIJ_3C_3CI_3J_3I_3I_FUNC,
-	VtblCall__IIJ_3C_3C_3C_3I_FUNC,
-	VtblCall__IIJ_3C_3C_3C_3I_3I_FUNC,
-	VtblCall__IIJ_3C_3C_3I_FUNC,
-	VtblCall__IIJ_3C_3C_3J_FUNC,
-	VtblCall__IIJ_3C_3C_3J_3C_3I_3I_FUNC,
-	VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I_FUNC,
-	VtblCall__IIJ_3I_FUNC,
-	VtblCall__IIJ_3J_FUNC,
-	VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC,
-	VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
-	VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC,
-	VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
-	VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
-	VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
-	VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_FUNC,
-	VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_FUNC,
-	VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_FUNC,
-	VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B_FUNC,
-	VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
-	VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
-	VtblCall__II_3B_FUNC,
-	VtblCall__II_3BI_FUNC,
-	VtblCall__II_3BII_3I_3I_FUNC,
-	VtblCall__II_3BIJ_3J_3I_FUNC,
-	VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
-	VtblCall__II_3BI_3I_FUNC,
-	VtblCall__II_3BI_3I_3I_FUNC,
-	VtblCall__II_3BI_3J_3I_FUNC,
-	VtblCall__II_3BJ_FUNC,
-	VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
-	VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC,
-	VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC,
-	VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
-	VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
-	VtblCall__II_3B_3B_FUNC,
-	VtblCall__II_3B_3BI_FUNC,
-	VtblCall__II_3B_3B_3BII_3I_FUNC,
-	VtblCall__II_3B_3B_3BII_3J_FUNC,
-	VtblCall__II_3B_3B_3I_FUNC,
-	VtblCall__II_3B_3B_3J_FUNC,
-	VtblCall__II_3B_3I_FUNC,
-	VtblCall__II_3B_3I_3I_FUNC,
-	VtblCall__II_3B_3I_3J_FUNC,
-	VtblCall__II_3B_3J_FUNC,
-	VtblCall__II_3B_3J_3I_FUNC,
-	VtblCall__II_3C_FUNC,
-	VtblCall__II_3CIIII_FUNC,
-	VtblCall__II_3CIJJJ_FUNC,
-	VtblCall__II_3CI_3I_FUNC,
-	VtblCall__II_3CJ_3J_FUNC,
-	VtblCall__II_3C_3C_FUNC,
-	VtblCall__II_3F_FUNC,
-	VtblCall__II_3I_FUNC,
-	VtblCall__II_3I_3I_FUNC,
-	VtblCall__II_3I_3I_3I_FUNC,
-	VtblCall__II_3I_3I_3I_3I_FUNC,
-	VtblCall__II_3I_3J_FUNC,
-	VtblCall__II_3I_3J_3I_FUNC,
-	VtblCall__II_3I_3J_3J_FUNC,
-	VtblCall__II_3J_FUNC,
-	VtblCall__II_3J_3J_3J_FUNC,
-	VtblCall__II_3S_FUNC,
-	XPCOMGlueShutdown_FUNC,
-	XPCOMGlueStartup_FUNC,
+	_1Call__I_FUNC,
+	_1Call__IIIIII_FUNC,
+	_1Call__III_3BII_3I_FUNC,
+	_1JS_1EvaluateUCScriptForPrincipals_FUNC,
+	_1NS_1GetComponentManager_FUNC,
+	_1NS_1GetServiceManager_FUNC,
+	_1NS_1InitXPCOM2_FUNC,
+	_1NS_1NewLocalFile_FUNC,
+	_1VtblCall__II_FUNC,
+	_1VtblCall__IID_FUNC,
+	_1VtblCall__IIF_FUNC,
+	_1VtblCall__III_FUNC,
+	_1VtblCall__IIII_FUNC,
+	_1VtblCall__IIIII_FUNC,
+	_1VtblCall__IIIIII_FUNC,
+	_1VtblCall__IIIIIII_FUNC,
+	_1VtblCall__IIIIIIII_FUNC,
+	_1VtblCall__IIIIIIIIIIII_FUNC,
+	_1VtblCall__IIIIIIIIIIIIIIISI_FUNC,
+	_1VtblCall__IIIIIIIII_3I_FUNC,
+	_1VtblCall__IIIIIIII_3C_3I_3I_FUNC,
+	_1VtblCall__IIIIIII_3I_FUNC,
+	_1VtblCall__IIIIIIJII_FUNC,
+	_1VtblCall__IIIIII_3CIIIII_3I_3I_FUNC,
+	_1VtblCall__IIIIII_3C_3BIIIII_3I_3I_FUNC,
+	_1VtblCall__IIIIII_3C_3I_3I_FUNC,
+	_1VtblCall__IIIIII_3I_3I_FUNC,
+	_1VtblCall__IIIIII_3I_3I_3I_FUNC,
+	_1VtblCall__IIIII_3B_3BI_FUNC,
+	_1VtblCall__IIIII_3C_FUNC,
+	_1VtblCall__IIIII_3I_FUNC,
+	_1VtblCall__IIIII_3I_3I_3I_FUNC,
+	_1VtblCall__IIIIJJJJ_FUNC,
+	_1VtblCall__IIII_3B_FUNC,
+	_1VtblCall__IIII_3BI_FUNC,
+	_1VtblCall__IIII_3BII_FUNC,
+	_1VtblCall__IIII_3B_3B_FUNC,
+	_1VtblCall__IIII_3C_FUNC,
+	_1VtblCall__IIII_3CIJI_FUNC,
+	_1VtblCall__IIII_3CJJJ_FUNC,
+	_1VtblCall__IIII_3C_3CI_3I_FUNC,
+	_1VtblCall__IIII_3I_FUNC,
+	_1VtblCall__IIII_3I_3I_FUNC,
+	_1VtblCall__IIII_3J_FUNC,
+	_1VtblCall__IIIJJ_FUNC,
+	_1VtblCall__IIIJJJJJJ_3J_FUNC,
+	_1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_FUNC,
+	_1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2II_3I_FUNC,
+	_1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
+	_1VtblCall__III_3B_FUNC,
+	_1VtblCall__III_3BI_FUNC,
+	_1VtblCall__III_3BI_3I_FUNC,
+	_1VtblCall__III_3BS_FUNC,
+	_1VtblCall__III_3B_3B_3BI_3I_FUNC,
+	_1VtblCall__III_3B_3C_FUNC,
+	_1VtblCall__III_3B_3I_FUNC,
+	_1VtblCall__III_3C_FUNC,
+	_1VtblCall__III_3CI_FUNC,
+	_1VtblCall__III_3C_3C_FUNC,
+	_1VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC,
+	_1VtblCall__III_3C_3CI_3I_3I_3I_FUNC,
+	_1VtblCall__III_3C_3C_3C_3I_FUNC,
+	_1VtblCall__III_3C_3C_3C_3I_3I_FUNC,
+	_1VtblCall__III_3C_3C_3I_FUNC,
+	_1VtblCall__III_3C_3C_3I_3C_3I_3I_FUNC,
+	_1VtblCall__III_3C_3C_3I_3I_3C_3I_3I_FUNC,
+	_1VtblCall__III_3C_3I_FUNC,
+	_1VtblCall__III_3I_FUNC,
+	_1VtblCall__III_3II_FUNC,
+	_1VtblCall__III_3IJ_FUNC,
+	_1VtblCall__III_3I_3I_3I_FUNC,
+	_1VtblCall__III_3I_3I_3I_3I_FUNC,
+	_1VtblCall__III_3I_3I_3J_FUNC,
+	_1VtblCall__IIJ_FUNC,
+	_1VtblCall__IIJI_FUNC,
+	_1VtblCall__IIJIIJIIIIII_FUNC,
+	_1VtblCall__IIJIIJIIIIIIIIISJ_FUNC,
+	_1VtblCall__IIJIIJ_3I_3J_FUNC,
+	_1VtblCall__IIJII_3I_FUNC,
+	_1VtblCall__IIJIJII_FUNC,
+	_1VtblCall__IIJIJJ_3I_3I_3I_FUNC,
+	_1VtblCall__IIJIJ_3I_3I_3I_FUNC,
+	_1VtblCall__IIJI_3J_FUNC,
+	_1VtblCall__IIJJ_FUNC,
+	_1VtblCall__IIJJI_FUNC,
+	_1VtblCall__IIJJII_FUNC,
+	_1VtblCall__IIJJIIII_FUNC,
+	_1VtblCall__IIJJIJ_3C_3I_3I_FUNC,
+	_1VtblCall__IIJJI_3C_FUNC,
+	_1VtblCall__IIJJI_3I_FUNC,
+	_1VtblCall__IIJJJ_FUNC,
+	_1VtblCall__IIJJJI_FUNC,
+	_1VtblCall__IIJJJI_3CJJIJI_3J_3J_FUNC,
+	_1VtblCall__IIJJJI_3C_3BJJIJI_3J_3J_FUNC,
+	_1VtblCall__IIJJJJIJ_3C_3I_3J_FUNC,
+	_1VtblCall__IIJJJJJ_FUNC,
+	_1VtblCall__IIJJJJJJ_FUNC,
+	_1VtblCall__IIJJJJJJJ_FUNC,
+	_1VtblCall__IIJJJJJ_3J_FUNC,
+	_1VtblCall__IIJJJ_3B_3BJ_FUNC,
+	_1VtblCall__IIJJJ_3I_FUNC,
+	_1VtblCall__IIJJJ_3J_FUNC,
+	_1VtblCall__IIJJ_3B_FUNC,
+	_1VtblCall__IIJJ_3BJ_FUNC,
+	_1VtblCall__IIJJ_3BJI_FUNC,
+	_1VtblCall__IIJJ_3B_3B_FUNC,
+	_1VtblCall__IIJJ_3CIJI_FUNC,
+	_1VtblCall__IIJJ_3CJJJ_FUNC,
+	_1VtblCall__IIJJ_3C_3CI_3J_FUNC,
+	_1VtblCall__IIJJ_3I_FUNC,
+	_1VtblCall__IIJJ_3I_3I_FUNC,
+	_1VtblCall__IIJJ_3J_FUNC,
+	_1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_FUNC,
+	_1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2JJ_3J_FUNC,
+	_1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
+	_1VtblCall__IIJ_3B_FUNC,
+	_1VtblCall__IIJ_3BI_FUNC,
+	_1VtblCall__IIJ_3BJ_FUNC,
+	_1VtblCall__IIJ_3BJ_3J_FUNC,
+	_1VtblCall__IIJ_3BS_FUNC,
+	_1VtblCall__IIJ_3B_3B_3BJ_3J_FUNC,
+	_1VtblCall__IIJ_3B_3C_FUNC,
+	_1VtblCall__IIJ_3CI_FUNC,
+	_1VtblCall__IIJ_3C_3C_FUNC,
+	_1VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC,
+	_1VtblCall__IIJ_3C_3CI_3J_3I_3I_FUNC,
+	_1VtblCall__IIJ_3C_3C_3C_3I_FUNC,
+	_1VtblCall__IIJ_3C_3C_3C_3I_3I_FUNC,
+	_1VtblCall__IIJ_3C_3C_3I_FUNC,
+	_1VtblCall__IIJ_3C_3C_3J_FUNC,
+	_1VtblCall__IIJ_3C_3C_3J_3C_3I_3I_FUNC,
+	_1VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I_FUNC,
+	_1VtblCall__IIJ_3C_3J_FUNC,
+	_1VtblCall__IIJ_3I_FUNC,
+	_1VtblCall__IIJ_3J_FUNC,
+	_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC,
+	_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
+	_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC,
+	_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
+	_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
+	_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
+	_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_FUNC,
+	_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_FUNC,
+	_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_FUNC,
+	_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B_FUNC,
+	_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
+	_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
+	_1VtblCall__IISIII_FUNC,
+	_1VtblCall__IISJIJ_FUNC,
+	_1VtblCall__II_3B_FUNC,
+	_1VtblCall__II_3BI_FUNC,
+	_1VtblCall__II_3BII_3I_3I_FUNC,
+	_1VtblCall__II_3BIJ_3J_3I_FUNC,
+	_1VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
+	_1VtblCall__II_3BI_3I_FUNC,
+	_1VtblCall__II_3BI_3I_3I_FUNC,
+	_1VtblCall__II_3BI_3J_3I_FUNC,
+	_1VtblCall__II_3BJ_FUNC,
+	_1VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
+	_1VtblCall__II_3BJ_3I_FUNC,
+	_1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC,
+	_1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC,
+	_1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
+	_1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
+	_1VtblCall__II_3B_3B_FUNC,
+	_1VtblCall__II_3B_3BI_FUNC,
+	_1VtblCall__II_3B_3B_3BII_3I_FUNC,
+	_1VtblCall__II_3B_3B_3BII_3J_FUNC,
+	_1VtblCall__II_3B_3B_3I_FUNC,
+	_1VtblCall__II_3B_3B_3J_FUNC,
+	_1VtblCall__II_3B_3I_FUNC,
+	_1VtblCall__II_3B_3I_3I_FUNC,
+	_1VtblCall__II_3B_3I_3J_FUNC,
+	_1VtblCall__II_3B_3J_FUNC,
+	_1VtblCall__II_3B_3J_3I_FUNC,
+	_1VtblCall__II_3C_FUNC,
+	_1VtblCall__II_3CIIII_FUNC,
+	_1VtblCall__II_3CIJJJ_FUNC,
+	_1VtblCall__II_3CI_3I_FUNC,
+	_1VtblCall__II_3CJ_3J_FUNC,
+	_1VtblCall__II_3C_3C_FUNC,
+	_1VtblCall__II_3F_FUNC,
+	_1VtblCall__II_3I_FUNC,
+	_1VtblCall__II_3I_3I_FUNC,
+	_1VtblCall__II_3I_3I_3I_FUNC,
+	_1VtblCall__II_3I_3I_3I_3I_FUNC,
+	_1VtblCall__II_3I_3I_3I_3I_3I_3I_FUNC,
+	_1VtblCall__II_3I_3J_FUNC,
+	_1VtblCall__II_3I_3J_3I_FUNC,
+	_1VtblCall__II_3I_3J_3J_FUNC,
+	_1VtblCall__II_3J_FUNC,
+	_1VtblCall__II_3J_3J_FUNC,
+	_1VtblCall__II_3J_3J_3J_FUNC,
+	_1VtblCall__II_3J_3J_3J_3J_3J_3I_FUNC,
+	_1VtblCall__II_3S_FUNC,
+	_1VtblCall__II_3SI_3I_3I_FUNC,
+	_1VtblCall__II_3SJ_3I_3J_FUNC,
+	_1XPCOMGlueLoadXULFunctions_FUNC,
+	_1XPCOMGlueShutdown_FUNC,
+	_1XPCOMGlueStartup_FUNC,
+	_1nsEmbedCString_1Length_FUNC,
+	_1nsEmbedCString_1delete_FUNC,
+	_1nsEmbedCString_1get_FUNC,
+	_1nsEmbedCString_1new___FUNC,
+	_1nsEmbedCString_1new__II_FUNC,
+	_1nsEmbedCString_1new___3BI_FUNC,
+	_1nsEmbedString_1Length_FUNC,
+	_1nsEmbedString_1delete_FUNC,
+	_1nsEmbedString_1get_FUNC,
+	_1nsEmbedString_1new___FUNC,
+	_1nsEmbedString_1new___3C_FUNC,
+	_1nsID_1Equals_FUNC,
+	_1nsID_1delete_FUNC,
+	_1nsID_1new_FUNC,
+	_1nsIMemory_1Alloc_FUNC,
+	_1nsIMemory_1Realloc_FUNC,
+	_1nsIScriptContext_1GetNativeContext_FUNC,
+	_1nsIScriptGlobalObject_1EnsureScriptEnvironment_FUNC,
+	_1nsIScriptGlobalObject_1GetScriptContext_FUNC,
+	_1nsIScriptGlobalObject_1GetScriptGlobal_FUNC,
+	memmove__ILorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2I_FUNC,
 	memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC,
 	memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2II_FUNC,
-	nsEmbedCString_1Length_FUNC,
-	nsEmbedCString_1delete_FUNC,
-	nsEmbedCString_1get_FUNC,
-	nsEmbedCString_1new___FUNC,
-	nsEmbedCString_1new__II_FUNC,
-	nsEmbedCString_1new___3BI_FUNC,
-	nsEmbedString_1Length_FUNC,
-	nsEmbedString_1delete_FUNC,
-	nsEmbedString_1get_FUNC,
-	nsEmbedString_1new___FUNC,
-	nsEmbedString_1new___3C_FUNC,
-	nsID_1Equals_FUNC,
-	nsID_1delete_FUNC,
-	nsID_1new_FUNC,
+	nsDynamicFunctionLoad_1sizeof_FUNC,
 	strlen_1PRUnichar_FUNC,
 } XPCOM_FUNCS;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_structs.cpp b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_structs.cpp
index f90f026..5460bc9 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_structs.cpp
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_structs.cpp
@@ -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
@@ -12,6 +12,40 @@
 #include "swt.h"
 #include "xpcom_structs.h"
 
+#ifndef NO_nsDynamicFunctionLoad
+typedef struct nsDynamicFunctionLoad_FID_CACHE {
+	int cached;
+	jclass clazz;
+	jfieldID functionName, function;
+} nsDynamicFunctionLoad_FID_CACHE;
+
+nsDynamicFunctionLoad_FID_CACHE nsDynamicFunctionLoadFc;
+
+void cachensDynamicFunctionLoadFields(JNIEnv *env, jobject lpObject)
+{
+	if (nsDynamicFunctionLoadFc.cached) return;
+	nsDynamicFunctionLoadFc.clazz = env->GetObjectClass(lpObject);
+	nsDynamicFunctionLoadFc.functionName = env->GetFieldID(nsDynamicFunctionLoadFc.clazz, "functionName", "I");
+	nsDynamicFunctionLoadFc.function = env->GetFieldID(nsDynamicFunctionLoadFc.clazz, "function", "I");
+	nsDynamicFunctionLoadFc.cached = 1;
+}
+
+nsDynamicFunctionLoad *getnsDynamicFunctionLoadFields(JNIEnv *env, jobject lpObject, nsDynamicFunctionLoad *lpStruct)
+{
+	if (!nsDynamicFunctionLoadFc.cached) cachensDynamicFunctionLoadFields(env, lpObject);
+	lpStruct->functionName = (const char *)env->GetIntField(lpObject, nsDynamicFunctionLoadFc.functionName);
+	lpStruct->function = (NSFuncPtr  *)env->GetIntField(lpObject, nsDynamicFunctionLoadFc.function);
+	return lpStruct;
+}
+
+void setnsDynamicFunctionLoadFields(JNIEnv *env, jobject lpObject, nsDynamicFunctionLoad *lpStruct)
+{
+	if (!nsDynamicFunctionLoadFc.cached) cachensDynamicFunctionLoadFields(env, lpObject);
+	env->SetIntField(lpObject, nsDynamicFunctionLoadFc.functionName, (jint)lpStruct->functionName);
+	env->SetIntField(lpObject, nsDynamicFunctionLoadFc.function, (jint)lpStruct->function);
+}
+#endif
+
 #ifndef NO_nsID
 typedef struct nsID_FID_CACHE {
 	int cached;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_structs.h b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_structs.h
index ff8c118..4d661d6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_structs.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_structs.h
@@ -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
@@ -11,6 +11,18 @@
 
 #include "xpcom.h"
 
+#ifndef NO_nsDynamicFunctionLoad
+void cachensDynamicFunctionLoadFields(JNIEnv *env, jobject lpObject);
+nsDynamicFunctionLoad *getnsDynamicFunctionLoadFields(JNIEnv *env, jobject lpObject, nsDynamicFunctionLoad *lpStruct);
+void setnsDynamicFunctionLoadFields(JNIEnv *env, jobject lpObject, nsDynamicFunctionLoad *lpStruct);
+#define nsDynamicFunctionLoad_sizeof() sizeof(nsDynamicFunctionLoad)
+#else
+#define cachensDynamicFunctionLoadFields(a,b)
+#define getnsDynamicFunctionLoadFields(a,b,c) NULL
+#define setnsDynamicFunctionLoadFields(a,b,c)
+#define nsDynamicFunctionLoad_sizeof() 0
+#endif
+
 #ifndef NO_nsID
 void cachensIDFields(JNIEnv *env, jobject lpObject);
 nsID *getnsIDFields(JNIEnv *env, jobject lpObject, nsID *lpStruct);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit.cpp b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit.cpp
index 8b8705d..32b5a59f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit.cpp
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit.cpp
@@ -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
@@ -13,7 +13,7 @@
 #include "xpcominit_structs.h"
 #include "xpcominit_stats.h"
 
-#define XPCOMInit_NATIVE(func) Java_org_eclipse_swt_internal_mozilla_XPCOMInit_##func
+#define XPCOMInit_NATIVE(func) Java_org_eclipse_swt_internal_mozilla_init_XPCOMInit_##func
 
 #ifndef NO_GREVersionRange_1sizeof
 extern "C" JNIEXPORT jint JNICALL XPCOMInit_NATIVE(GREVersionRange_1sizeof)(JNIEnv *env, jclass that);
@@ -28,49 +28,49 @@
 }
 #endif
 
-#ifndef NO_GRE_1GetGREPathWithProperties
-extern "C" JNIEXPORT jint JNICALL XPCOMInit_NATIVE(GRE_1GetGREPathWithProperties)(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5);
-JNIEXPORT jint JNICALL XPCOMInit_NATIVE(GRE_1GetGREPathWithProperties)
+#ifndef NO__1GRE_1GetGREPathWithProperties
+extern "C" JNIEXPORT jint JNICALL XPCOMInit_NATIVE(_1GRE_1GetGREPathWithProperties)(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5);
+JNIEXPORT jint JNICALL XPCOMInit_NATIVE(_1GRE_1GetGREPathWithProperties)
 	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5)
 {
 	GREVersionRange _arg0, *lparg0=NULL;
 	jint rc = 0;
-	XPCOMInit_NATIVE_ENTER(env, that, GRE_1GetGREPathWithProperties_FUNC);
+	XPCOMInit_NATIVE_ENTER(env, that, _1GRE_1GetGREPathWithProperties_FUNC);
 	if (arg0) if ((lparg0 = getGREVersionRangeFields(env, arg0, &_arg0)) == NULL) goto fail;
 	rc = (jint)GRE_GetGREPathWithProperties((const GREVersionRange *)lparg0, arg1, (const GREProperty *)arg2, arg3, (char *)arg4, arg5);
 fail:
 	if (arg0 && lparg0) setGREVersionRangeFields(env, arg0, lparg0);
-	XPCOMInit_NATIVE_EXIT(env, that, GRE_1GetGREPathWithProperties_FUNC);
+	XPCOMInit_NATIVE_EXIT(env, that, _1GRE_1GetGREPathWithProperties_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_XPCOMGlueShutdown
-extern "C" JNIEXPORT jint JNICALL XPCOMInit_NATIVE(XPCOMGlueShutdown)(JNIEnv *env, jclass that);
-JNIEXPORT jint JNICALL XPCOMInit_NATIVE(XPCOMGlueShutdown)
+#ifndef NO__1XPCOMGlueShutdown
+extern "C" JNIEXPORT jint JNICALL XPCOMInit_NATIVE(_1XPCOMGlueShutdown)(JNIEnv *env, jclass that);
+JNIEXPORT jint JNICALL XPCOMInit_NATIVE(_1XPCOMGlueShutdown)
 	(JNIEnv *env, jclass that)
 {
 	jint rc = 0;
-	XPCOMInit_NATIVE_ENTER(env, that, XPCOMGlueShutdown_FUNC);
+	XPCOMInit_NATIVE_ENTER(env, that, _1XPCOMGlueShutdown_FUNC);
 	rc = (jint)XPCOMGlueShutdown();
-	XPCOMInit_NATIVE_EXIT(env, that, XPCOMGlueShutdown_FUNC);
+	XPCOMInit_NATIVE_EXIT(env, that, _1XPCOMGlueShutdown_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_XPCOMGlueStartup
-extern "C" JNIEXPORT jint JNICALL XPCOMInit_NATIVE(XPCOMGlueStartup)(JNIEnv *env, jclass that, jbyteArray arg0);
-JNIEXPORT jint JNICALL XPCOMInit_NATIVE(XPCOMGlueStartup)
+#ifndef NO__1XPCOMGlueStartup
+extern "C" JNIEXPORT jint JNICALL XPCOMInit_NATIVE(_1XPCOMGlueStartup)(JNIEnv *env, jclass that, jbyteArray arg0);
+JNIEXPORT jint JNICALL XPCOMInit_NATIVE(_1XPCOMGlueStartup)
 	(JNIEnv *env, jclass that, jbyteArray arg0)
 {
 	jbyte *lparg0=NULL;
 	jint rc = 0;
-	XPCOMInit_NATIVE_ENTER(env, that, XPCOMGlueStartup_FUNC);
+	XPCOMInit_NATIVE_ENTER(env, that, _1XPCOMGlueStartup_FUNC);
 	if (arg0) if ((lparg0 = env->GetByteArrayElements(arg0, NULL)) == NULL) goto fail;
 	rc = (jint)XPCOMGlueStartup((const char *)lparg0);
 fail:
 	if (arg0 && lparg0) env->ReleaseByteArrayElements(arg0, lparg0, 0);
-	XPCOMInit_NATIVE_EXIT(env, that, XPCOMGlueStartup_FUNC);
+	XPCOMInit_NATIVE_EXIT(env, that, _1XPCOMGlueStartup_FUNC);
 	return rc;
 }
 #endif
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit_stats.c b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit_stats.c
new file mode 100644
index 0000000..f0b9069
--- /dev/null
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit_stats.c
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+#include "swt.h"
+#include "xpcominit_stats.h"
+
+#ifdef NATIVE_STATS
+
+int XPCOMInit_nativeFunctionCount = 4;
+int XPCOMInit_nativeFunctionCallCount[4];
+char * XPCOMInit_nativeFunctionNames[] = {
+	"GREVersionRange_1sizeof",
+	"_1GRE_1GetGREPathWithProperties",
+	"_1XPCOMGlueShutdown",
+	"_1XPCOMGlueStartup",
+};
+
+#define STATS_NATIVE(func) Java_org_eclipse_swt_tools_internal_NativeStats_##func
+
+JNIEXPORT jint JNICALL STATS_NATIVE(XPCOMInit_1GetFunctionCount)
+	(JNIEnv *env, jclass that)
+{
+	return XPCOMInit_nativeFunctionCount;
+}
+
+JNIEXPORT jstring JNICALL STATS_NATIVE(XPCOMInit_1GetFunctionName)
+	(JNIEnv *env, jclass that, jint index)
+{
+	return (*env)->NewStringUTF(env, XPCOMInit_nativeFunctionNames[index]);
+}
+
+JNIEXPORT jint JNICALL STATS_NATIVE(XPCOMInit_1GetFunctionCallCount)
+	(JNIEnv *env, jclass that, jint index)
+{
+	return XPCOMInit_nativeFunctionCallCount[index];
+}
+
+#endif
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit_stats.cpp b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit_stats.cpp
index ffb6bc3..687a29a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit_stats.cpp
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit_stats.cpp
@@ -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
@@ -18,9 +18,9 @@
 int XPCOMInit_nativeFunctionCallCount[4];
 char * XPCOMInit_nativeFunctionNames[] = {
 	"GREVersionRange_1sizeof",
-	"GRE_1GetGREPathWithProperties",
-	"XPCOMGlueShutdown",
-	"XPCOMGlueStartup",
+	"_1GRE_1GetGREPathWithProperties",
+	"_1XPCOMGlueShutdown",
+	"_1XPCOMGlueStartup",
 };
 
 #define STATS_NATIVE(func) Java_org_eclipse_swt_tools_internal_NativeStats_##func
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit_stats.h b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit_stats.h
index c20d074..048e3d7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit_stats.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit_stats.h
@@ -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
@@ -26,7 +26,7 @@
 
 typedef enum {
 	GREVersionRange_1sizeof_FUNC,
-	GRE_1GetGREPathWithProperties_FUNC,
-	XPCOMGlueShutdown_FUNC,
-	XPCOMGlueStartup_FUNC,
+	_1GRE_1GetGREPathWithProperties_FUNC,
+	_1XPCOMGlueShutdown_FUNC,
+	_1XPCOMGlueStartup_FUNC,
 } XPCOMInit_FUNCS;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit_structs.cpp b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit_structs.cpp
index 02b533b..b709dc6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit_structs.cpp
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit_structs.cpp
@@ -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
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit_structs.h b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit_structs.h
index 07b3ada..096a9da 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit_structs.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit_structs.h
@@ -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
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/AppFileLocProvider.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/AppFileLocProvider.java
index e609b5a..8971565 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/AppFileLocProvider.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/AppFileLocProvider.java
@@ -20,7 +20,7 @@
 	XPCOMObject directoryServiceProvider;
 	XPCOMObject directoryServiceProvider2;	
 	int refCount = 0;
-	String mozillaPath, profilePath;
+	String mozillaPath, profilePath, componentsPath;
 	String[] pluginDirs;
 	boolean isXULRunner;
 	
@@ -33,6 +33,13 @@
 	static final String PLUGINS_DIR = "plugins"; //$NON-NLS-1$
 	static final String USER_PLUGINS_DIR = ".mozilla" + SEPARATOR_OS + "plugins"; //$NON-NLS-1$ //$NON-NLS-2$
 	static final String PREFERENCES_FILE = "prefs.js"; //$NON-NLS-1$
+
+	static boolean IsSparc;
+	static {
+		String osName = System.getProperty ("os.name").toLowerCase (); //$NON-NLS-1$
+		String osArch = System.getProperty ("os.arch").toLowerCase (); //$NON-NLS-1$
+		IsSparc = (osName.startsWith ("sunos") || osName.startsWith ("solaris")) && osArch.startsWith("sparc"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+	}
 	
 AppFileLocProvider (String path) {
 	mozillaPath = path + SEPARATOR_OS;
@@ -118,6 +125,10 @@
 	return refCount;
 }
 
+void setComponentsPath (String path) {
+	componentsPath = path;
+}
+
 void setProfilePath (String path) {
 	profilePath = path;
 	if (!Compatibility.fileExists (path, "")) { //$NON-NLS-1$
@@ -170,18 +181,28 @@
 						if (segment.length () > 0) segments.addElement (segment);
 					} while (end != -1);
 					int segmentsSize = segments.size ();
-					pluginDirs = new String [segmentsSize + 2];
+					pluginDirs = new String [segmentsSize + (IsSparc ? 1 : 2)];
 					for (index = 0; index < segmentsSize; index++) {
 						pluginDirs[index] = (String)segments.elementAt (index);
 					}
 				}
 			}
 			if (pluginDirs == null) {
-				pluginDirs = new String[2];
+				pluginDirs = new String[IsSparc ? 1 : 2];
 			}
 
 			/* set the next value to the GRE path + "plugins" */
-			pluginDirs[index++] = mozillaPath + PLUGINS_DIR;
+
+			/*
+			* Bug on Solaris SPARC.  Attempting to start the java plug-in fails with an
+			* error indicating that PR_NewMonitor could not be found.  This is a well-
+			* known problem that many other apps have also encountered, with no
+			* resolution other than to remove this plug-in.  The Browser workaround is
+			* to not add the directory containing this plug-in to the plug-in search path. 
+			*/
+			if (!IsSparc) {
+				pluginDirs[index++] = mozillaPath + PLUGINS_DIR;
+			}
 
 			/* set the next value to the home directory + "/.mozilla/plugins" */
 			pluginDirs[index++] = System.getProperty("user.home") + SEPARATOR_OS + USER_PLUGINS_DIR;
@@ -264,7 +285,7 @@
 	} else if (propertyName.equals (XPCOM.NS_GRE_DIR)) {
 		propertyValue = mozillaPath;
 	} else if (propertyName.equals (XPCOM.NS_GRE_COMPONENT_DIR)) {
-		propertyValue = mozillaPath + COMPONENTS_DIR;
+		propertyValue = componentsPath != null ? componentsPath : mozillaPath + COMPONENTS_DIR;
 	} else if (propertyName.equals (XPCOM.NS_XPCOM_INIT_CURRENT_PROCESS_DIR)) {
 		propertyValue = mozillaPath;
 	} else if (propertyName.equals (XPCOM.NS_OS_CURRENT_PROCESS_DIR)) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Download.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Download.java
index 9608a96..b648b33 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Download.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Download.java
@@ -16,6 +16,12 @@
 import org.eclipse.swt.layout.*;
 import org.eclipse.swt.widgets.*;
 
+/**
+ * This class implements the nsIDownload interface for mozilla
+ * versions 1.4 - 1.7.x.  For mozilla version 1.8.x this interface
+ * is implemented by class nsIDownload_1_8.  Later versions of
+ * mozilla do not need to call this interface. 
+ */
 class Download {
 	XPCOMObject supports;
 	XPCOMObject download;
@@ -182,7 +188,7 @@
 	nsISupports supports = new nsISupports (aTarget);
 	int /*long*/[] result = new int /*long*/[1];
 	rc = supports.QueryInterface (nsIURI.NS_IURI_IID, result);
-	if (rc == 0) {	/* >= 1.7 */
+	if (rc == XPCOM.NS_OK) {	/* >= 1.7 */
 		nsIURI target = new nsIURI (result[0]);
 		result[0] = 0;
 		int /*long*/ aPath = XPCOM.nsEmbedCString_new ();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Download_1_8.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Download_1_8.java
index 5d10348..82819f1 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Download_1_8.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Download_1_8.java
@@ -16,6 +16,12 @@
 import org.eclipse.swt.layout.*;
 import org.eclipse.swt.widgets.*;
 
+/**
+ * This class implements the nsIDownload interface for mozilla
+ * version 1.8.x.  For mozilla versions 1.4 - 1.7.x this interface
+ * is implemented by class nsIDownload.  Mozilla versions later 
+ * than 1.8.x do not need to call this interface. 
+ */
 class Download_1_8 {
 	XPCOMObject supports;
 	XPCOMObject download;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/FilePicker.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/FilePicker.java
index 1e22fd9..cb7b397 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/FilePicker.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/FilePicker.java
@@ -112,6 +112,12 @@
 	return refCount;
 }
 
+Browser getBrowser (int /*long*/ aDOMWindow) {
+	if (aDOMWindow == 0) return null;
+	nsIDOMWindow window = new nsIDOMWindow (aDOMWindow);
+	return Mozilla.findBrowser (window);
+}
+
 /*
  * As of Mozilla 1.8 some of nsIFilePicker's string arguments changed type.  This method
  * answers a java string based on the type of string that is appropriate for the Mozilla
@@ -141,10 +147,12 @@
 	/* picking a file */
 	int style = mode == nsIFilePicker.modeSave ? SWT.SAVE : SWT.OPEN;
 	if (mode == nsIFilePicker.modeOpenMultiple) style |= SWT.MULTI;
-	Display display = Display.getCurrent ();
-	Shell parent = null; // TODO compute parent
-	if (parent == null) {
-		parent = new Shell (display);
+	Browser browser = getBrowser (parentHandle);
+	Shell parent = null;
+	if (browser != null) {
+		parent = browser.getShell ();
+	} else {
+		parent = new Shell ();
 	}
 	FileDialog dialog = new FileDialog (parent, style);
 	if (title != null) dialog.setText (title);
@@ -162,10 +170,12 @@
 }
 
 int showDirectoryPicker () {
-	Display display = Display.getCurrent ();
-	Shell parent = null; // TODO compute parent
-	if (parent == null) {
-		parent = new Shell (display);
+	Browser browser = getBrowser (parentHandle);
+	Shell parent = null;
+	if (browser != null) {
+		parent = browser.getShell ();
+	} else {
+		parent = new Shell ();
 	}
 	DirectoryDialog dialog = new DirectoryDialog (parent, SWT.NONE);
 	if (title != null) dialog.setText (title);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/HelperAppLauncherDialog.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/HelperAppLauncherDialog.java
index 7674704..706ec08 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/HelperAppLauncherDialog.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/HelperAppLauncherDialog.java
@@ -16,7 +16,7 @@
 import org.eclipse.swt.widgets.*;
 
 /**
- * This class implements the HelperAppLauncherDialog interface for mozilla
+ * This class implements the nsIHelperAppLauncherDialog interface for mozilla
  * versions 1.4 - 1.8.x.  For mozilla versions >= 1.9 this interface is
  * implemented by class HelperAppLauncherDialog_1_9.  HelperAppLauncherDialogFactory
  * determines at runtime which of these classes to instantiate. 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java
index 574bc03..21008f0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
+ * Copyright (c) 2003, 2009 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
@@ -17,7 +17,6 @@
 	XPCOMObject supports;
 	XPCOMObject factory;
 	int refCount = 0;
-	boolean isPre_1_9 = true;
 
 HelperAppLauncherDialogFactory () {
 	createCOMInterfaces ();
@@ -89,7 +88,7 @@
 /* nsIFactory */
 
 int CreateInstance (int /*long*/ aOuter, int /*long*/ iid, int /*long*/ result) {
-	if (isPre_1_9) {
+	if (Mozilla.IsPre_1_9) {
 		HelperAppLauncherDialog helperAppLauncherDialog = new HelperAppLauncherDialog ();
 		helperAppLauncherDialog.AddRef ();
 		XPCOM.memmove (result, new int /*long*/[] {helperAppLauncherDialog.getAddress ()}, C.PTR_SIZEOF);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java
index 25aec52..dd2e0cb 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java
@@ -15,6 +15,12 @@
 import org.eclipse.swt.internal.mozilla.*;
 import org.eclipse.swt.widgets.*;
 
+/**
+ * This class implements the nsIHelperAppLauncherDialog interface for mozilla
+ * versions >= 1.9.  For mozilla versions 1.4 - 1.8.x this interface is
+ * implemented by class HelperAppLauncherDialog.  HelperAppLauncherDialogFactory
+ * determines at runtime which of these classes to instantiate. 
+ */
 class HelperAppLauncherDialog_1_9 {
 	XPCOMObject supports;
 	XPCOMObject helperAppLauncherDialog;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java
index 0f9f7b8..30532fb 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
+ * Copyright (c) 2003, 2009 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
@@ -13,11 +13,13 @@
 import java.io.*;
 import java.lang.reflect.*;
 import java.util.*;
+
 import org.eclipse.swt.*;
 import org.eclipse.swt.widgets.*;
 import org.eclipse.swt.graphics.*;
 import org.eclipse.swt.internal.*;
 import org.eclipse.swt.internal.mozilla.*;
+import org.eclipse.swt.internal.mozilla.init.*;
 import org.eclipse.swt.layout.*;
 
 class Mozilla extends WebBrowser {
@@ -39,20 +41,24 @@
 	XPCOMObject uriContentListener;
 	XPCOMObject tooltipListener;
 	XPCOMObject domEventListener;
+	XPCOMObject badCertListener;
 	int chromeFlags = nsIWebBrowserChrome.CHROME_DEFAULT;
-	int refCount, lastKeyCode, lastCharCode;
+	int refCount, lastKeyCode, lastCharCode, authCount;
 	int /*long*/ request;
 	Point location, size;
-	boolean visible, isChild, ignoreDispose, awaitingNavigate;
+	boolean visible, isChild, ignoreDispose, isRetrievingBadCert, isViewingErrorPage;
 	Shell tip = null;
 	Listener listener;
 	Vector unhookedDOMWindows = new Vector ();
+	String lastNavigateURL;
+	byte[] htmlBytes;
 
 	static nsIAppShell AppShell;
 	static AppFileLocProvider LocationProvider;
 	static WindowCreator2 WindowCreator;
-	static int BrowserCount;
-	static boolean Initialized, IsPre_1_8, PerformedVersionCheck, XPCOMWasGlued, XPCOMInitWasGlued;
+	static int BrowserCount, NextJSFunctionIndex = 1;
+	static Hashtable AllFunctions = new Hashtable (); 
+	static boolean Initialized, IsPre_1_8, IsPre_1_9, PerformedVersionCheck, XPCOMWasGlued, XPCOMInitWasGlued;
 
 	/* XULRunner detect constants */
 	static final String GRERANGE_LOWER = "1.8.1.2"; //$NON-NLS-1$
@@ -113,7 +119,6 @@
 				result[0] = 0;
 				rc = manager.GetEnumerator (result);
 				if (rc != XPCOM.NS_OK) error (rc);
-				manager.Release ();
 
 				nsISimpleEnumerator enumerator = new nsISimpleEnumerator (result[0]);
 				int[] moreElements = new int[1]; /* PRBool */
@@ -145,6 +150,7 @@
 					if (rc != XPCOM.NS_OK) error (rc);
 				}
 				enumerator.Release ();
+				manager.Release ();
 			}
 		};
 	}
@@ -373,6 +379,35 @@
 		}
 
 		if (!Initialized) {
+			LocationProvider = new AppFileLocProvider (mozillaPath);
+			LocationProvider.AddRef ();
+
+			/* extract external.xpt to temp */
+			String tempPath = System.getProperty ("java.io.tmpdir"); //$NON-NLS-1$
+			File componentsDir = new File (tempPath, "eclipse/mozillaComponents"); //$NON-NLS-1$
+			java.io.InputStream is = Library.class.getResourceAsStream ("/external.xpt"); //$NON-NLS-1$
+			if (is != null) {
+				if (!componentsDir.exists ()) {
+					componentsDir.mkdirs ();
+				}
+				int read;
+				byte [] buffer = new byte [4096];
+				File file = new File (componentsDir, "external.xpt"); //$NON-NLS-1$
+				try {
+					FileOutputStream os = new FileOutputStream (file);
+					while ((read = is.read (buffer)) != -1) {
+						os.write(buffer, 0, read);
+					}
+					os.close ();
+					is.close ();
+				} catch (FileNotFoundException e) {
+				} catch (IOException e) {
+				}
+			}
+			if (componentsDir.exists () && componentsDir.isDirectory ()) {
+				LocationProvider.setComponentsPath (componentsDir.getAbsolutePath ());
+			}
+
 			int /*long*/[] retVal = new int /*long*/[1];
 			nsEmbedString pathString = new nsEmbedString (mozillaPath);
 			int rc = XPCOM.NS_NewLocalFile (pathString.getAddress (), 1, retVal);
@@ -386,20 +421,43 @@
 				error (XPCOM.NS_ERROR_NULL_POINTER);
 			}
 
-			LocationProvider = new AppFileLocProvider (mozillaPath);
-			LocationProvider.AddRef ();
-
 			nsIFile localFile = new nsILocalFile (retVal[0]);
-			rc = XPCOM.NS_InitXPCOM2 (0, localFile.getAddress(), LocationProvider.getAddress ());
+			if (IsXULRunner) {
+				int size = XPCOM.nsDynamicFunctionLoad_sizeof ();
+				/* alloc memory for two structs, the second is empty to signify the end of the list */
+				int /*long*/ ptr = C.malloc (size * 2);
+				C.memset (ptr, 0, size * 2);
+				nsDynamicFunctionLoad functionLoad = new nsDynamicFunctionLoad ();
+				byte[] bytes = MozillaDelegate.wcsToMbcs (null, "XRE_InitEmbedding", true); //$NON-NLS-1$
+				functionLoad.functionName = C.malloc (bytes.length);
+				C.memmove (functionLoad.functionName, bytes, bytes.length);
+				functionLoad.function = C.malloc (C.PTR_SIZEOF);
+				C.memmove (functionLoad.function, new int /*long*/[] {0} , C.PTR_SIZEOF);
+				XPCOM.memmove (ptr, functionLoad, XPCOM.nsDynamicFunctionLoad_sizeof ());
+				XPCOM.XPCOMGlueLoadXULFunctions (ptr);
+				C.memmove (result, functionLoad.function, C.PTR_SIZEOF);
+				int /*long*/ functionPtr = result[0];
+				result[0] = 0;
+				C.free (functionLoad.function);
+				C.free (functionLoad.functionName);
+				C.free (ptr);
+				if (functionPtr == 0) {
+            		browser.dispose ();
+            		error (XPCOM.NS_ERROR_NULL_POINTER);
+				}
+				rc = XPCOM.Call (functionPtr, localFile.getAddress (), localFile.getAddress (), LocationProvider.getAddress (), 0, 0);
+				if (rc == XPCOM.NS_OK) {
+					System.setProperty (XULRUNNER_PATH, mozillaPath);
+				}
+			} else {
+				rc = XPCOM.NS_InitXPCOM2 (0, localFile.getAddress(), LocationProvider.getAddress ());
+			}
 			localFile.Release ();
 			if (rc != XPCOM.NS_OK) {
 				browser.dispose ();
 				SWT.error (SWT.ERROR_NO_HANDLES, null, " [MOZILLA_FIVE_HOME may not point at an embeddable GRE] [NS_InitEmbedding " + mozillaPath + " error " + rc + "]"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 			}
 			System.setProperty (GRE_INITIALIZED, "true"); //$NON-NLS-1$
-			if (IsXULRunner) {
-				System.setProperty (XULRUNNER_PATH, mozillaPath);
-			}
 		}
 
 		/* If JavaXPCOM is detected then attempt to initialize it with the XULRunner being used */
@@ -593,6 +651,35 @@
 				error (rc);
 			}
 			observerService.Release ();
+
+	        if (IsXULRunner) {
+				int size = XPCOM.nsDynamicFunctionLoad_sizeof ();
+				/* alloc memory for two structs, the second is empty to signify the end of the list */
+				ptr = C.malloc (size * 2);
+				C.memset (ptr, 0, size * 2);
+				nsDynamicFunctionLoad functionLoad = new nsDynamicFunctionLoad ();
+				byte[] bytes = MozillaDelegate.wcsToMbcs (null, "XRE_NotifyProfile", true); //$NON-NLS-1$
+				functionLoad.functionName = C.malloc (bytes.length);
+				C.memmove (functionLoad.functionName, bytes, bytes.length);
+				functionLoad.function = C.malloc (C.PTR_SIZEOF);
+				C.memmove (functionLoad.function, new int /*long*/[] {0} , C.PTR_SIZEOF);
+				XPCOM.memmove (ptr, functionLoad, XPCOM.nsDynamicFunctionLoad_sizeof ());
+				XPCOM.XPCOMGlueLoadXULFunctions (ptr);
+				C.memmove (result, functionLoad.function, C.PTR_SIZEOF);
+				int /*long*/ functionPtr = result[0];
+				result[0] = 0;
+				C.free (functionLoad.function);
+				C.free (functionLoad.functionName);
+				C.free (ptr);
+				/* functionPtr == 0 for xulrunner < 1.9 */
+				if (functionPtr != 0) {
+					rc = XPCOM.Call (functionPtr);
+	            	if (rc != XPCOM.NS_OK) {
+	            		browser.dispose ();
+	            		error (rc);
+	            	}
+				}
+	        }
 		}
 
 		/*
@@ -602,7 +689,6 @@
 		 */
 		aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_PREFSERVICE_CONTRACTID, true);
 		rc = serviceManager.GetServiceByContractID (aContractID, nsIPrefService.NS_IPREFSERVICE_IID, result);
-		serviceManager.Release ();
 		if (rc != XPCOM.NS_OK) {
 			browser.dispose ();
 			error (rc);
@@ -886,6 +972,8 @@
 		
 		nsIComponentRegistrar componentRegistrar = new nsIComponentRegistrar (result[0]);
 		result[0] = 0;
+		componentRegistrar.AutoRegister (0);	 /* detect the External component */ 
+
 		aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_PROMPTSERVICE_CONTRACTID, true); 
 		byte[] aClassName = MozillaDelegate.wcsToMbcs (null, "Prompt Service", true); //$NON-NLS-1$
 		rc = componentRegistrar.RegisterFactory (XPCOM.NS_PROMPTSERVICE_CID, aClassName, aContractID, factory.getAddress ());
@@ -894,7 +982,20 @@
 			error (rc);
 		}
 		factory.Release ();
-		
+
+		rc = serviceManager.GetService (XPCOM.NS_CATEGORYMANAGER_CID, nsICategoryManager.NS_ICATEGORYMANAGER_IID, result);
+		if (rc != XPCOM.NS_OK) error (rc);
+		if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
+		serviceManager.Release ();
+
+		nsICategoryManager categoryManager = new nsICategoryManager (result[0]);
+		result[0] = 0;
+		byte[] category = MozillaDelegate.wcsToMbcs (null, "JavaScript global property", true); //$NON-NLS-1$
+		byte[] entry = MozillaDelegate.wcsToMbcs (null, "external", true); //$NON-NLS-1$
+		rc = categoryManager.AddCategoryEntry(category, entry, aContractID, 1, 1, result);
+		result[0] = 0;
+		categoryManager.Release ();
+
 		/*
 		* This Download factory will be used if the GRE version is < 1.8.
 		* If the GRE version is 1.8.x then the Download factory that is registered later for
@@ -1001,6 +1102,30 @@
 							XPCOM.XPCOMGlueShutdown ();
 						}
 					});
+
+					// the following is intentionally commented, because calling XRE_TermEmbedding
+					// causes subsequent browser instantiations within the process to fail
+
+//					int size = XPCOM.nsDynamicFunctionLoad_sizeof ();
+//					/* alloc memory for two structs, the second is empty to signify the end of the list */
+//					int /*long*/ ptr = C.malloc (size * 2);
+//					C.memset (ptr, 0, size * 2);
+//					nsDynamicFunctionLoad functionLoad = new nsDynamicFunctionLoad ();
+//					byte[] bytes = MozillaDelegate.wcsToMbcs (null, "XRE_TermEmbedding", true); //$NON-NLS-1$
+//					functionLoad.functionName = C.malloc (bytes.length);
+//					C.memmove (functionLoad.functionName, bytes, bytes.length);
+//					functionLoad.function = C.malloc (C.PTR_SIZEOF);
+//					C.memmove (functionLoad.function, new int /*long*/[] {0} , C.PTR_SIZEOF);
+//					XPCOM.memmove (ptr, functionLoad, XPCOM.nsDynamicFunctionLoad_sizeof ());
+//					XPCOM.XPCOMGlueLoadXULFunctions (ptr);
+//					C.memmove (result, functionLoad.function, C.PTR_SIZEOF);
+//					int /*long*/ functionPtr = result[0];
+//					result[0] = 0;
+//					C.free (functionLoad.function);
+//					C.free (functionLoad.functionName);
+//					C.free (ptr);
+//					XPCOM.Call (functionPtr);
+
 					XPCOMWasGlued = false;
 				}
 				if (XPCOMInitWasGlued) {
@@ -1073,7 +1198,7 @@
 		browser.dispose ();
 		error (XPCOM.NS_ERROR_FAILURE);
 	}
-	rc = baseWindow.Create ();
+	rc = delegate.createBaseWindow (baseWindow);
 	if (rc != XPCOM.NS_OK) {
 		browser.dispose ();
 		error (XPCOM.NS_ERROR_FAILURE);
@@ -1133,6 +1258,7 @@
 			new nsISupports (result[0]).Release ();
 		}
 		result[0] = 0;
+		IsPre_1_9 = true;
 
 		/*
 		* A Download factory for contract "Transfer" must be registered iff the GRE's version is 1.8.x.
@@ -1160,31 +1286,7 @@
 				}
 				downloadFactory_1_8.Release ();
 			} else { /* >= 1.9 */
-				/*
-				 * Bug in XULRunner 1.9.  Mozilla no longer clears its background before initial content has
-				 * been set.  As a result embedders appear broken if they do not immediately navigate to a url.
-				 * The workaround for this is to navigate to about:blank immediately so that the background is
-				 * cleared, but do not fire any corresponding events or allow Browser API calls to reveal this.
-				 * Once the client does a proper navigate with either setUrl() or setText() then resume as
-				 * normal.  The Mozilla bug for this is https://bugzilla.mozilla.org/show_bug.cgi?id=415789.
-				 */
-				awaitingNavigate = true;
-				rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
-				if (rc != XPCOM.NS_OK) {
-					browser.dispose ();
-					error (rc);
-				}
-				if (result[0] == 0) {
-					browser.dispose ();
-					error (XPCOM.NS_ERROR_NO_INTERFACE);
-				}
-				nsIWebNavigation webNavigation = new nsIWebNavigation (result[0]);
-			    char[] uri = new char[ABOUT_BLANK.length () + 1];
-			    ABOUT_BLANK.getChars (0, ABOUT_BLANK.length (), uri, 0);
-				rc = webNavigation.LoadURI (uri, nsIWebNavigation.LOAD_FLAGS_NONE, 0, 0, 0);
-				webNavigation.Release ();
-
-				dialogFactory.isPre_1_9 = false;
+				IsPre_1_9 = false;
 			}
 		}
 		result[0] = 0;
@@ -1193,6 +1295,18 @@
 	}
 	componentManager.Release ();
 
+	/*
+	 * Bug in XULRunner 1.9.  On win32, Mozilla does not clear its background before content has
+	 * been set into it.  As a result, embedders appear broken if they do not immediately display
+	 * a URL or text.  The Mozilla bug for this is https://bugzilla.mozilla.org/show_bug.cgi?id=453523.
+	 * 
+	 * The workaround is to subclass the Mozilla window and clear it whenever WM_ERASEBKGND is received.
+	 * This subclass should be removed once content has been set into the browser.
+	 */
+	if (!IsPre_1_9) {
+		delegate.addWindowSubclass ();
+	}
+
 	rc = webBrowser.AddWebBrowserListener (weakReference.getAddress (), nsIWebProgressListener.NS_IWEBPROGRESSLISTENER_IID);
 	if (rc != XPCOM.NS_OK) {
 		browser.dispose ();
@@ -1264,7 +1378,7 @@
 }
 
 public boolean back () {
-	if (awaitingNavigate) return false;
+	htmlBytes = null;
 
 	int /*long*/[] result = new int /*long*/[1];
 	int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
@@ -1390,6 +1504,13 @@
 		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
 		public int /*long*/ method3 (int /*long*/[] args) {return HandleEvent (args[0]);}
 	};
+
+	badCertListener = new XPCOMObject (new int[] {2, 0, 0, 4}) {
+		public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
+		public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
+		public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+		public int /*long*/ method3 (int /*long*/[] args) {return NotifyCertProblem (args[0], args[1], args[2], args[3]);}
+	};
 }
 
 void disposeCOMInterfaces () {
@@ -1441,13 +1562,138 @@
 		domEventListener.dispose ();
 		domEventListener = null;
 	}
+	if (badCertListener != null) {
+		badCertListener.dispose ();
+		badCertListener = null;
+	}
 }
 
 public boolean execute (String script) {
-	if (awaitingNavigate) return false;
+	/*
+	* This could be the first content that is set into the browser, so
+	* ensure that the custom subclass that works around Mozilla bug
+	* https://bugzilla.mozilla.org/show_bug.cgi?id=453523 is removed.
+	*/
+	delegate.removeWindowSubclass ();
+
+	/*
+	* As of mozilla 1.9 executing javascript via the javascript: protocol no
+	* longer happens synchronously.  As a result, the result of executing JS
+	* is not returned to the java side when expected by the client.  The
+	* workaround is to invoke the javascript handler directly via C++, which is
+	* exposed as of mozilla 1.9.
+	*/
+	int /*long*/[] result = new int /*long*/[1];
+	if (!IsPre_1_9) {
+		int rc = XPCOM.NS_GetServiceManager (result);
+		if (rc != XPCOM.NS_OK) error (rc);
+		if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
+
+		nsIServiceManager serviceManager = new nsIServiceManager (result[0]);
+		result[0] = 0;
+		nsIPrincipal principal = null;
+		byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_SCRIPTSECURITYMANAGER_CONTRACTID, true);
+		rc = serviceManager.GetServiceByContractID (aContractID, nsIScriptSecurityManager_1_9_1.NS_ISCRIPTSECURITYMANAGER_IID, result);
+		if (rc == XPCOM.NS_OK && result[0] != 0) {
+			nsIScriptSecurityManager_1_9_1 securityManager = new nsIScriptSecurityManager_1_9_1 (result[0]);
+			result[0] = 0;
+			rc = securityManager.GetSystemPrincipal (result);
+			if (rc != XPCOM.NS_OK) error (rc);
+			if (result[0] == 0) error (XPCOM.NS_ERROR_NULL_POINTER);
+			principal = new nsIPrincipal (result[0]);
+			result[0] = 0;
+			securityManager.Release ();
+		} else {
+			rc = serviceManager.GetServiceByContractID (aContractID, nsIScriptSecurityManager_1_9.NS_ISCRIPTSECURITYMANAGER_IID, result);
+			if (rc == XPCOM.NS_OK && result[0] != 0) {
+				nsIScriptSecurityManager_1_9 securityManager = new nsIScriptSecurityManager_1_9 (result[0]);
+				result[0] = 0;
+				rc = securityManager.GetSystemPrincipal (result);
+				if (rc != XPCOM.NS_OK) error (rc);
+				if (result[0] == 0) error (XPCOM.NS_ERROR_NULL_POINTER);
+				principal = new nsIPrincipal (result[0]);
+				result[0] = 0;
+				securityManager.Release ();
+			}
+		}
+
+		if (principal != null) {
+			rc = webBrowser.QueryInterface (nsIInterfaceRequestor.NS_IINTERFACEREQUESTOR_IID, result);
+			if (rc != XPCOM.NS_OK) error (rc);
+			if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
+
+			nsIInterfaceRequestor interfaceRequestor = new nsIInterfaceRequestor (result[0]);
+			result[0] = 0;
+			nsID scriptGlobalObjectNSID = new nsID ("6afecd40-0b9a-4cfd-8c42-0f645cd91829"); /* nsIScriptGlobalObject */ //$NON-NLS-1$
+			rc = interfaceRequestor.GetInterface (scriptGlobalObjectNSID, result);
+			interfaceRequestor.Release ();
+
+			if (rc == XPCOM.NS_OK && result[0] != 0) {
+				int /*long*/ scriptGlobalObject = result[0];
+				result[0] = 0;
+				rc = (int/*64*/)XPCOM.nsIScriptGlobalObject_EnsureScriptEnvironment (scriptGlobalObject, 2); /* nsIProgrammingLanguage.JAVASCRIPT */
+				if (rc != XPCOM.NS_OK) error (rc);
+				int /*long*/ scriptContext = XPCOM.nsIScriptGlobalObject_GetScriptContext (scriptGlobalObject, 2); /* nsIProgrammingLanguage.JAVASCRIPT */
+				int /*long*/ globalJSObject = XPCOM.nsIScriptGlobalObject_GetScriptGlobal (scriptGlobalObject, 2); /* nsIProgrammingLanguage.JAVASCRIPT */
+				new nsISupports (scriptGlobalObject).Release ();
+
+				if (scriptContext != 0 && globalJSObject != 0) {
+					/* ensure that the received nsIScriptContext implements the expected interface */
+					nsID scriptContextNSID = new nsID ("e7b9871d-3adc-4bf7-850d-7fb9554886bf"); /* nsIScriptContext */ //$NON-NLS-1$					
+					rc = new nsISupports (scriptContext).QueryInterface (scriptContextNSID, result);
+					if (rc == XPCOM.NS_OK && result[0] != 0) {
+						new nsISupports (result[0]).Release ();
+						result[0] = 0;
+
+						int /*long*/ nativeContext = XPCOM.nsIScriptContext_GetNativeContext (scriptContext);
+						if (nativeContext != 0) {
+							int length = script.length ();
+							char[] scriptChars = new char[length];
+							script.getChars(0, length, scriptChars, 0);
+							byte[] urlbytes = MozillaDelegate.wcsToMbcs (null, getUrl (), true);
+							rc = principal.GetJSPrincipals (nativeContext, result);
+							if (rc == XPCOM.NS_OK && result[0] != 0) {
+								int /*long*/ principals = result[0];
+								result[0] = 0;
+								principal.Release ();
+								String mozillaPath = LocationProvider.mozillaPath + delegate.getJSLibraryName () + '\0';
+								byte[] pathBytes = null;
+								try {
+									pathBytes = mozillaPath.getBytes ("UTF-8"); //$NON-NLS-1$
+								} catch (UnsupportedEncodingException e) {
+									pathBytes = mozillaPath.getBytes ();
+								}
+
+								aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_CONTEXTSTACK_CONTRACTID, true);
+								rc = serviceManager.GetServiceByContractID (aContractID, nsIJSContextStack.NS_IJSCONTEXTSTACK_IID, result);
+								if (rc != XPCOM.NS_OK) error (rc);
+								if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
+								serviceManager.Release ();
+
+								nsIJSContextStack stack = new nsIJSContextStack (result[0]);
+								result[0] = 0;
+								rc = stack.Push (nativeContext);
+								if (rc != XPCOM.NS_OK) error (rc);
+								boolean success = XPCOM.JS_EvaluateUCScriptForPrincipals (pathBytes, nativeContext, globalJSObject, principals, scriptChars, length, urlbytes, 0, result) != 0;
+								result[0] = 0;
+								rc = stack.Pop (result);
+								if (rc != XPCOM.NS_OK) error (rc);
+								stack.Release ();
+
+								return success;
+							}
+						}
+					}
+				}
+			}
+			principal.Release ();
+		}
+		serviceManager.Release ();
+	}
+
+	/* fall back to the pre-1.9 approach */
 
 	String url = PREFIX_JAVASCRIPT + script + ";void(0);";	//$NON-NLS-1$
-	int /*long*/[] result = new int /*long*/[1];
 	int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
 	if (rc != XPCOM.NS_OK) error (rc);
 	if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
@@ -1465,8 +1711,53 @@
 	return MozillaDelegate.findBrowser (handle);
 }
 
+static Browser findBrowser (nsIDOMWindow aDOMWindow) {
+	int /*long*/[] result = new int /*long*/[1];
+	int rc = XPCOM.NS_GetServiceManager (result);
+	if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+	if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
+
+	nsIServiceManager serviceManager = new nsIServiceManager (result[0]);
+	result[0] = 0;
+	byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_WINDOWWATCHER_CONTRACTID, true);
+	rc = serviceManager.GetServiceByContractID (aContractID, nsIWindowWatcher.NS_IWINDOWWATCHER_IID, result);
+	if (rc != XPCOM.NS_OK) Mozilla.error(rc);
+	if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);		
+	serviceManager.Release ();
+
+	nsIWindowWatcher windowWatcher = new nsIWindowWatcher (result[0]);
+	result[0] = 0;
+	/* the chrome will only be answered for the top-level nsIDOMWindow */
+	rc = aDOMWindow.GetTop (result);
+	if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+	if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
+	int /*long*/ topDOMWindow = result[0];
+	result[0] = 0;
+	rc = windowWatcher.GetChromeForWindow (topDOMWindow, result);
+	if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+	new nsISupports (topDOMWindow).Release ();
+	windowWatcher.Release ();
+	if (result[0] == 0) return null;	/* the parent chrome is disconnected */
+
+	nsIWebBrowserChrome webBrowserChrome = new nsIWebBrowserChrome (result[0]);
+	result[0] = 0;
+	rc = webBrowserChrome.QueryInterface (nsIEmbeddingSiteWindow.NS_IEMBEDDINGSITEWINDOW_IID, result);
+	if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+	if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);		
+	webBrowserChrome.Release ();
+
+	nsIEmbeddingSiteWindow embeddingSiteWindow = new nsIEmbeddingSiteWindow (result[0]);
+	result[0] = 0;
+	rc = embeddingSiteWindow.GetSiteWindow (result);
+	if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+	if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);		
+	embeddingSiteWindow.Release ();
+
+	return findBrowser (result[0]); 
+}
+
 public boolean forward () {
-	if (awaitingNavigate) return false;
+	htmlBytes = null;
 
 	int /*long*/[] result = new int /*long*/[1];
 	int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
@@ -1480,9 +1771,15 @@
 	return rc == XPCOM.NS_OK;
 }
 
-public String getText () {
-	if (awaitingNavigate) return ""; //$NON-NLS-1$
+public String getBrowserType () {
+	return "mozilla"; //$NON-NLS-1$
+}
 
+int getNextFunctionIndex () {
+	return NextJSFunctionIndex++;
+}
+
+public String getText () {
 	int /*long*/[] result = new int /*long*/[1];
 	int rc = webBrowser.GetContentDOMWindow (result);
 	if (rc != XPCOM.NS_OK) error (rc);
@@ -1542,8 +1839,6 @@
 }
 
 public String getUrl () {
-	if (awaitingNavigate) return ""; //$NON-NLS-1$
-
 	int /*long*/[] result = new int /*long*/[1];
 	int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
 	if (rc != XPCOM.NS_OK) error (rc);
@@ -1605,8 +1900,6 @@
 }
 
 public boolean isBackEnabled () {
-	if (awaitingNavigate) return false;
-
 	int /*long*/[] result = new int /*long*/[1];
 	int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
 	if (rc != XPCOM.NS_OK) error (rc);
@@ -1620,8 +1913,6 @@
 }
 
 public boolean isForwardEnabled () {
-	if (awaitingNavigate) return false;
-
 	int /*long*/[] result = new int /*long*/[1];
 	int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
 	if (rc != XPCOM.NS_OK) error (rc);
@@ -1645,6 +1936,9 @@
 	rc = webBrowser.SetParentURIContentListener (0);
 	if (rc != XPCOM.NS_OK) error (rc);
 	
+	rc = webBrowser.SetContainerWindow (0);
+	if (rc != XPCOM.NS_OK) error (rc);
+
 	unhookDOMListeners ();
 	if (listener != null) {
 		int[] folderEvents = new int[] {
@@ -1676,6 +1970,8 @@
 	webBrowser.Release ();
 	webBrowser = null;
 	webBrowserObject = null;
+	lastNavigateURL = null;
+	htmlBytes = null;
 
 	if (tip != null && !tip.isDisposed ()) tip.dispose ();
 	tip = null;
@@ -1706,7 +2002,7 @@
 	if (rc != XPCOM.NS_OK) error (rc);
 	webBrowserFocus.Release ();
 }
-	
+
 void Deactivate () {
 	int /*long*/[] result = new int /*long*/[1];
 	int rc = webBrowser.QueryInterface (nsIWebBrowserFocus.NS_IWEBBROWSERFOCUS_IID, result);
@@ -1737,7 +2033,7 @@
 }
 
 public void refresh () {
-	if (awaitingNavigate) return;
+	htmlBytes = null;
 
 	int /*long*/[] result = new int /*long*/[1];
 	int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
@@ -1789,101 +2085,126 @@
 		return false;
 	}
 
-	awaitingNavigate = false;
-
-	byte[] contentTypeBuffer = MozillaDelegate.wcsToMbcs (null, "text/html", true); // $NON-NLS-1$
-	int /*long*/ aContentType = XPCOM.nsEmbedCString_new (contentTypeBuffer, contentTypeBuffer.length);
-	byte[] contentCharsetBuffer = MozillaDelegate.wcsToMbcs (null, "UTF-8", true);	//$NON-NLS-1$
-	int /*long*/ aContentCharset = XPCOM.nsEmbedCString_new (contentCharsetBuffer, contentCharsetBuffer.length);
+	/*
+	 * This could be the first content that is set into the browser, so
+	 * ensure that the custom subclass that works around Mozilla bug
+	 * https://bugzilla.mozilla.org/show_bug.cgi?id=453523 is removed.
+	 */
+	delegate.removeWindowSubclass ();
 
 	int /*long*/[] result = new int /*long*/[1];
-	int rc = XPCOM.NS_GetServiceManager (result);
-	if (rc != XPCOM.NS_OK) error (rc);
-	if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
+	int rc = webBrowser.QueryInterface (nsIWebBrowserStream.NS_IWEBBROWSERSTREAM_IID, result);
+	if (rc == XPCOM.NS_OK && result[0] != 0) {
+		/*
+		* Setting mozilla's content through nsIWebBrowserStream does not cause a page
+		* load to occur, so the events that usually accompany a page change are not
+		* fired.  To make this behave as expected, navigate to about:blank first and
+		* then set the html content once the page has loaded.
+		*/
+		new nsISupports (result[0]).Release ();
+		result[0] = 0;
 
-	nsIServiceManager serviceManager = new nsIServiceManager (result[0]);
-	result[0] = 0;
-	rc = serviceManager.GetService (XPCOM.NS_IOSERVICE_CID, nsIIOService.NS_IIOSERVICE_IID, result);
-	if (rc != XPCOM.NS_OK) error (rc);
-	if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-	serviceManager.Release ();
+		/*
+		* If htmlBytes is not null then the about:blank page is already being loaded,
+		* so no Navigate is required.  Just set the html that is to be shown.
+		*/
+		boolean blankLoading = htmlBytes != null;
+		htmlBytes = data;
+		if (blankLoading) return true;
 
-	nsIIOService ioService = new nsIIOService (result[0]);
-	result[0] = 0;
-	/*
-	* Note.  Mozilla ignores LINK tags used to load CSS stylesheets
-	* when the URI protocol for the nsInputStreamChannel
-	* is about:blank.  The fix is to specify the file protocol.
-	*/
-	byte[] aString = MozillaDelegate.wcsToMbcs (null, URI_FROMMEMORY, false);
-	int /*long*/ aSpec = XPCOM.nsEmbedCString_new (aString, aString.length);
-	rc = ioService.NewURI (aSpec, null, 0, result);
-	if (rc != XPCOM.NS_OK) error (rc);
-	if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-	XPCOM.nsEmbedCString_delete (aSpec);
-	ioService.Release ();
-
-	nsIURI uri = new nsIURI (result[0]);
-	result[0] = 0;
-
-	rc = webBrowser.QueryInterface (nsIInterfaceRequestor.NS_IINTERFACEREQUESTOR_IID, result);
-	if (rc != XPCOM.NS_OK) error (rc);
-	if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-	nsIInterfaceRequestor interfaceRequestor = new nsIInterfaceRequestor (result[0]);
-	result[0] = 0;
-
-	/*
-	* Feature in Mozilla. LoadStream invokes the nsIInputStream argument
-	* through a different thread.  The callback mechanism must attach 
-	* a non java thread to the JVM otherwise the nsIInputStream Read and
-	* Close methods never get called.
-	*/
-	InputStream inputStream = new InputStream (data);
-	inputStream.AddRef ();
-
-	rc = interfaceRequestor.GetInterface (nsIDocShell_1_9.NS_IDOCSHELL_IID, result);
-	if (rc == XPCOM.NS_OK) {
+		/* navigate to about:blank */
+		rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
+		if (rc != XPCOM.NS_OK) error (rc);
 		if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-		nsIDocShell_1_9 docShell = new nsIDocShell_1_9 (result[0]);
+		nsIWebNavigation webNavigation = new nsIWebNavigation (result[0]);
+		result[0] = 0;
+	    char[] uri = new char[ABOUT_BLANK.length () + 1];
+	    ABOUT_BLANK.getChars (0, ABOUT_BLANK.length (), uri, 0);
+		rc = webNavigation.LoadURI (uri, nsIWebNavigation.LOAD_FLAGS_NONE, 0, 0, 0);
+		if (rc != XPCOM.NS_OK) error (rc);
+		webNavigation.Release ();
+	} else {
+		byte[] contentCharsetBuffer = MozillaDelegate.wcsToMbcs (null, "UTF-8", true);	//$NON-NLS-1$
+		int /*long*/ aContentCharset = XPCOM.nsEmbedCString_new (contentCharsetBuffer, contentCharsetBuffer.length);
+		byte[] contentTypeBuffer = MozillaDelegate.wcsToMbcs (null, "text/html", true); // $NON-NLS-1$
+		int /*long*/ aContentType = XPCOM.nsEmbedCString_new (contentTypeBuffer, contentTypeBuffer.length);
+
+		rc = XPCOM.NS_GetServiceManager (result);
+		if (rc != XPCOM.NS_OK) error (rc);
+		if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
+
+		nsIServiceManager serviceManager = new nsIServiceManager (result[0]);
+		result[0] = 0;
+		rc = serviceManager.GetService (XPCOM.NS_IOSERVICE_CID, nsIIOService.NS_IIOSERVICE_IID, result);
+		if (rc != XPCOM.NS_OK) error (rc);
+		if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
+		serviceManager.Release ();
+
+		nsIIOService ioService = new nsIIOService (result[0]);
+		result[0] = 0;
+		/*
+		* Note.  Mozilla ignores LINK tags used to load CSS stylesheets
+		* when the URI protocol for the nsInputStreamChannel
+		* is about:blank.  The fix is to specify the file protocol.
+		*/
+		byte[] aString = MozillaDelegate.wcsToMbcs (null, URI_FROMMEMORY, false);
+		int /*long*/ aSpec = XPCOM.nsEmbedCString_new (aString, aString.length);
+		rc = ioService.NewURI (aSpec, null, 0, result);
+		if (rc != XPCOM.NS_OK) error (rc);
+		if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
+		XPCOM.nsEmbedCString_delete (aSpec);
+		ioService.Release ();
+
+		nsIURI uri = new nsIURI (result[0]);
+		result[0] = 0;
+
+		rc = webBrowser.QueryInterface (nsIInterfaceRequestor.NS_IINTERFACEREQUESTOR_IID, result);
+		if (rc != XPCOM.NS_OK) error (rc);
+		if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
+		nsIInterfaceRequestor interfaceRequestor = new nsIInterfaceRequestor (result[0]);
+		result[0] = 0;
+
+		/*
+		* Feature in Mozilla. LoadStream invokes the nsIInputStream argument
+		* through a different thread.  The callback mechanism must attach 
+		* a non java thread to the JVM otherwise the nsIInputStream Read and
+		* Close methods never get called.
+		*/
+		InputStream inputStream = new InputStream (data);
+		inputStream.AddRef ();
+
+		rc = interfaceRequestor.GetInterface (nsIDocShell.NS_IDOCSHELL_IID, result);
+		if (rc != XPCOM.NS_OK) error (rc);
+		if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
+		nsIDocShell docShell = new nsIDocShell (result[0]);
+		result[0] = 0;
 		rc = docShell.LoadStream (inputStream.getAddress (), uri.getAddress (), aContentType,  aContentCharset, 0);
 		docShell.Release ();
-	} else {
-		result[0] = 0;
-		rc = interfaceRequestor.GetInterface (nsIDocShell_1_8.NS_IDOCSHELL_IID, result);
-		if (rc == XPCOM.NS_OK) {	
-			if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-			nsIDocShell_1_8 docShell = new nsIDocShell_1_8 (result[0]);
-			rc = docShell.LoadStream (inputStream.getAddress (), uri.getAddress (), aContentType,  aContentCharset, 0);
-			docShell.Release ();
-		} else {
-			result[0] = 0;
-			rc = interfaceRequestor.GetInterface (nsIDocShell.NS_IDOCSHELL_IID, result);
-			if (rc != XPCOM.NS_OK) error (rc);
-			if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-			nsIDocShell docShell = new nsIDocShell (result[0]);
-			rc = docShell.LoadStream (inputStream.getAddress (), uri.getAddress (), aContentType,  aContentCharset, 0);
-			docShell.Release ();
-		}
-	}
-	if (rc != XPCOM.NS_OK) error (rc);
-	result[0] = 0;
 
-	inputStream.Release ();
-	interfaceRequestor.Release ();
-	uri.Release ();
-	XPCOM.nsEmbedCString_delete (aContentCharset);
-	XPCOM.nsEmbedCString_delete (aContentType);
+		inputStream.Release ();
+		interfaceRequestor.Release ();
+		uri.Release ();
+		XPCOM.nsEmbedCString_delete (aContentType);
+		XPCOM.nsEmbedCString_delete (aContentCharset);
+	}
 	return true;
 }
 
 public boolean setUrl (String url) {
-	awaitingNavigate = false;
+	htmlBytes = null;
 
 	int /*long*/[] result = new int /*long*/[1];
 	int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
 	if (rc != XPCOM.NS_OK) error (rc);
 	if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
 
+	/*
+	 * This could be the first content that is set into the browser, so
+	 * ensure that the custom subclass that works around Mozilla bug
+	 * https://bugzilla.mozilla.org/show_bug.cgi?id=453523 is removed.
+	 */
+	delegate.removeWindowSubclass ();
+
 	nsIWebNavigation webNavigation = new nsIWebNavigation (result[0]);
     char[] uri = new char[url.length () + 1];
     url.getChars (0, url.length (), uri, 0);
@@ -1893,7 +2214,7 @@
 }
 
 public void stop () {
-	if (awaitingNavigate) return;
+	htmlBytes = null;
 
 	int /*long*/[] result = new int /*long*/[1];
 	int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
@@ -2106,6 +2427,11 @@
 		AddRef ();
 		return XPCOM.NS_OK;
 	}
+	if (guid.Equals (nsIBadCertListener2.NS_IBADCERTLISTENER2_IID)) {
+		XPCOM.memmove (ppvObject, new int /*long*/[] {badCertListener.getAddress ()}, C.PTR_SIZEOF);
+		AddRef ();
+		return XPCOM.NS_OK;
+	}
 	XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
 	return XPCOM.NS_ERROR_NO_INTERFACE;
 }
@@ -2155,22 +2481,39 @@
 int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateFlags, int aStatus) {
 	if ((aStateFlags & nsIWebProgressListener.STATE_IS_DOCUMENT) == 0) return XPCOM.NS_OK;
 	if ((aStateFlags & nsIWebProgressListener.STATE_START) != 0) {
-		if (request == 0) request = aRequest;
+		int /*long*/[] result = new int /*long*/[1];
 
-		if (!awaitingNavigate) {
-			/*
-			 * Add the page's nsIDOMWindow to the collection of windows that will
-			 * have DOM listeners added to them later on in the page loading
-			 * process.  These listeners cannot be added yet because the
-			 * nsIDOMWindow is not ready to take them at this stage.
-			 */
-			int /*long*/[] result = new int /*long*/[1];
-			nsIWebProgress progress = new nsIWebProgress (aWebProgress);
-			int rc = progress.GetDOMWindow (result);
+		/*
+		* When navigating to a site that is known to have a bad certificate, request notification
+		* callbacks on the channel so that our nsIBadCertListener2 will be invoked.
+		*/
+		if (isRetrievingBadCert) {
+			isRetrievingBadCert = false;
+			nsIRequest request = new nsIRequest (aRequest);
+			int rc = request.QueryInterface (nsIChannel.NS_ICHANNEL_IID, result);
 			if (rc != XPCOM.NS_OK) error (rc);
 			if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-			unhookedDOMWindows.addElement (new LONG (result[0]));
+
+			nsIChannel channel = new nsIChannel (result[0]);
+			result[0] = 0;
+			rc = channel.SetNotificationCallbacks (interfaceRequestor.getAddress ());
+			if (rc != XPCOM.NS_OK) error (rc);
+			channel.Release ();
+			return XPCOM.NS_OK;
 		}
+
+		if (request == 0) request = aRequest;
+		/*
+		 * Add the page's nsIDOMWindow to the collection of windows that will
+		 * have DOM listeners added to them later on in the page loading
+		 * process.  These listeners cannot be added yet because the
+		 * nsIDOMWindow is not ready to take them at this stage.
+		 */
+		nsIWebProgress progress = new nsIWebProgress (aWebProgress);
+		int rc = progress.GetDOMWindow (result);
+		if (rc != XPCOM.NS_OK) error (rc);
+		if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
+		unhookedDOMWindows.addElement (new LONG (result[0]));
 	} else if ((aStateFlags & nsIWebProgressListener.STATE_REDIRECTING) != 0) {
 		if (request == aRequest) request = 0;
 	} else if ((aStateFlags & nsIWebProgressListener.STATE_STOP) != 0) {
@@ -2215,6 +2558,117 @@
 			unhookedDOMWindows.remove (ptrObject);
 			new nsISupports (ptrObject.value).Release ();
 		}
+
+		boolean deferCompleted = false;
+		/*
+		 * If htmlBytes is not null then there is html from a previous setText() call
+		 * waiting to be set into the about:blank page once it has completed loading. 
+		 */
+		if (htmlBytes != null) {
+			nsIRequest req = new nsIRequest (aRequest);
+			int /*long*/ name = XPCOM.nsEmbedCString_new ();
+			rc = req.GetName (name);
+			if (rc != XPCOM.NS_OK) error (rc);
+			int length = XPCOM.nsEmbedCString_Length (name);
+			int /*long*/ buffer = XPCOM.nsEmbedCString_get (name);
+			byte[] dest = new byte[length];
+			XPCOM.memmove (dest, buffer, length);
+			String url = new String (dest);
+			XPCOM.nsEmbedCString_delete (name);
+
+			if (url.startsWith (ABOUT_BLANK)) {
+				/*
+				 * Setting mozilla's content with nsIWebBrowserStream invalidates the 
+				 * DOM listeners that were hooked on it (about:blank), so remove them and
+				 * add new ones after the content has been set.
+				 */
+				unhookDOMListeners ();
+
+				rc = XPCOM.NS_GetServiceManager (result);
+				if (rc != XPCOM.NS_OK) error (rc);
+				if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
+
+				nsIServiceManager serviceManager = new nsIServiceManager (result[0]);
+				result[0] = 0;
+				rc = serviceManager.GetService (XPCOM.NS_IOSERVICE_CID, nsIIOService.NS_IIOSERVICE_IID, result);
+				if (rc != XPCOM.NS_OK) error (rc);
+				if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
+				serviceManager.Release ();
+
+				nsIIOService ioService = new nsIIOService (result[0]);
+				result[0] = 0;
+				/*
+				* Note.  Mozilla ignores LINK tags used to load CSS stylesheets
+				* when the URI protocol for the nsInputStreamChannel
+				* is about:blank.  The fix is to specify the file protocol.
+				*/
+				byte[] aString = MozillaDelegate.wcsToMbcs (null, URI_FROMMEMORY, false);
+				int /*long*/ aSpec = XPCOM.nsEmbedCString_new (aString, aString.length);
+				rc = ioService.NewURI (aSpec, null, 0, result);
+				if (rc != XPCOM.NS_OK) error (rc);
+				if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
+				XPCOM.nsEmbedCString_delete (aSpec);
+				ioService.Release ();
+
+				nsIURI uri = new nsIURI (result[0]);
+				result[0] = 0;
+
+				rc = webBrowser.QueryInterface (nsIWebBrowserStream.NS_IWEBBROWSERSTREAM_IID, result);
+				if (rc != XPCOM.NS_OK) error (rc);
+				if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
+
+				nsIWebBrowserStream stream = new nsIWebBrowserStream (result[0]);
+				result[0] = 0;
+
+				byte[] contentTypeBuffer = MozillaDelegate.wcsToMbcs (null, "text/html", true); // $NON-NLS-1$
+				int /*long*/ aContentType = XPCOM.nsEmbedCString_new (contentTypeBuffer, contentTypeBuffer.length);
+
+				rc = stream.OpenStream (uri.getAddress (), aContentType);
+				if (rc != XPCOM.NS_OK) error (rc);
+				int /*long*/ ptr = C.malloc (htmlBytes.length);
+				XPCOM.memmove (ptr, htmlBytes, htmlBytes.length);
+				int pageSize = 8192;
+				int pageCount = htmlBytes.length / pageSize + 1;
+				int /*long*/ current = ptr;
+				for (int i = 0; i < pageCount; i++) {
+					length = i == pageCount - 1 ? htmlBytes.length % pageSize : pageSize;
+					if (length > 0) {
+						rc = stream.AppendToStream (current, length);
+						if (rc != XPCOM.NS_OK) error (rc);
+					}
+					current += pageSize;
+				}
+				rc = stream.CloseStream ();
+				if (rc != XPCOM.NS_OK) error (rc);
+				C.free (ptr);
+				XPCOM.nsEmbedCString_delete (aContentType);
+				stream.Release ();
+				uri.Release ();
+				htmlBytes = null;
+				/*
+				* Browser content that is set via nsIWebBrowserStream is not parsed immediately.
+				* Since clients depend on the Completed event to know when the browser's content
+				* is available, delay the sending of this event so that the stream content will
+				* be parsed first.
+				*/
+				deferCompleted = true;
+
+				rc = webBrowser.GetContentDOMWindow (result);
+				if (rc != XPCOM.NS_OK) error (rc);
+				if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
+				boolean isTop = result[0] == domWindow.getAddress ();
+				new nsISupports (result[0]).Release ();
+				result[0] = 0;
+
+				rc = domWindow.QueryInterface (nsIDOMEventTarget.NS_IDOMEVENTTARGET_IID, result);
+				if (rc != XPCOM.NS_OK) error (rc);
+				if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
+				nsIDOMEventTarget target = new nsIDOMEventTarget (result[0]);
+				result[0] = 0;
+				hookDOMListeners (target, isTop);
+				target.Release ();
+			}
+		}
 		domWindow.Release ();
 
 		/*
@@ -2228,20 +2682,30 @@
 		*/
 		if (request == aRequest || request == 0) {
 			request = 0;
-			if (!awaitingNavigate) {
-				StatusTextEvent event = new StatusTextEvent (browser);
-				event.display = browser.getDisplay ();
-				event.widget = browser;
-				event.text = ""; //$NON-NLS-1$
-				for (int i = 0; i < statusTextListeners.length; i++) {
-					statusTextListeners[i].changed (event);
+			StatusTextEvent event = new StatusTextEvent (browser);
+			event.display = browser.getDisplay ();
+			event.widget = browser;
+			event.text = ""; //$NON-NLS-1$
+			for (int i = 0; i < statusTextListeners.length; i++) {
+				statusTextListeners[i].changed (event);
+			}
+
+			final Display display = browser.getDisplay ();
+			final ProgressEvent event2 = new ProgressEvent (browser);
+			event2.display = display;
+			event2.widget = browser;
+			Runnable runnable = new Runnable () {
+				public void run () {
+					if (browser.isDisposed ()) return;
+					for (int i = 0; i < progressListeners.length; i++) {
+						progressListeners[i].completed (event2);
+					}
 				}
-				ProgressEvent event2 = new ProgressEvent (browser);
-				event2.display = browser.getDisplay ();
-				event2.widget = browser;
-				for (int i = 0; i < progressListeners.length; i++) {
-					progressListeners[i].completed (event2);
-				}
+			};
+			if (deferCompleted) {
+				display.asyncExec (runnable);
+			} else {
+				display.syncExec (runnable);
 			}
 		}
 	} else if ((aStateFlags & nsIWebProgressListener.STATE_TRANSFERRING) != 0) {
@@ -2289,7 +2753,7 @@
 }
 
 int OnProgressChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aCurSelfProgress, int aMaxSelfProgress, int aCurTotalProgress, int aMaxTotalProgress) {
-	if (awaitingNavigate || progressListeners.length == 0) return XPCOM.NS_OK;
+	if (progressListeners.length == 0) return XPCOM.NS_OK;
 	ProgressEvent event = new ProgressEvent (browser);
 	event.display = browser.getDisplay ();
 	event.widget = browser;
@@ -2313,7 +2777,7 @@
 	*/
 	if (request != 0 && request != aRequest) request = aRequest;
 
-	if (awaitingNavigate || locationListeners.length == 0) return XPCOM.NS_OK;
+	if (locationListeners.length == 0) return XPCOM.NS_OK;
 
 	nsIWebProgress webProgress = new nsIWebProgress (aWebProgress);
 	int /*long*/[] aDOMWindow = new int /*long*/[1];
@@ -2366,7 +2830,7 @@
 }
 
 int OnStatusChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStatus, int /*long*/ aMessage) {
-	if (awaitingNavigate || statusTextListeners.length == 0) return XPCOM.NS_OK;
+	if (statusTextListeners.length == 0) return XPCOM.NS_OK;
 	StatusTextEvent event = new StatusTextEvent (browser);
 	event.display = browser.getDisplay ();
 	event.widget = browser;
@@ -2387,7 +2851,7 @@
 /* nsIWebBrowserChrome */
 
 int SetStatus (int statusType, int /*long*/ status) {
-	if (awaitingNavigate || statusTextListeners.length == 0) return XPCOM.NS_OK;
+	if (statusTextListeners.length == 0) return XPCOM.NS_OK;
 	StatusTextEvent event = new StatusTextEvent (browser);
 	event.display = browser.getDisplay ();
 	event.widget = browser;
@@ -2600,7 +3064,7 @@
 }
  
 int SetTitle (int /*long*/ aTitle) {
-	if (awaitingNavigate || titleListeners.length == 0) return XPCOM.NS_OK;
+	if (titleListeners.length == 0) return XPCOM.NS_OK;
 	TitleEvent event = new TitleEvent (browser);
 	event.display = browser.getDisplay ();
 	event.widget = browser;
@@ -2672,8 +3136,6 @@
 /* nsIContextMenuListener */
 
 int OnShowContextMenu (int aContextFlags, int /*long*/ aEvent, int /*long*/ aNode) {
-	if (awaitingNavigate) return XPCOM.NS_OK;
-
 	nsIDOMEvent domEvent = new nsIDOMEvent (aEvent);
 	int /*long*/[] result = new int /*long*/[1];
 	int rc = domEvent.QueryInterface (nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID, result);
@@ -2706,10 +3168,9 @@
 /* nsIURIContentListener */
 
 int OnStartURIOpen (int /*long*/ aURI, int /*long*/ retval) {
-	if (awaitingNavigate || locationListeners.length == 0) {
-		XPCOM.memmove (retval, new int[] {0}, 4); /* PRBool */
-		return XPCOM.NS_OK;
-	}
+	if (isRetrievingBadCert) return XPCOM.NS_OK;
+	authCount = 0;
+
 	nsIURI location = new nsIURI (aURI);
 	int /*long*/ aSpec = XPCOM.nsEmbedCString_new ();
 	location.GetSpec (aSpec);
@@ -2720,27 +3181,48 @@
 	XPCOM.memmove (dest, buffer, length);
 	XPCOM.nsEmbedCString_delete (aSpec);
 	String value = new String (dest);
+
+	/*
+	* Navigating to "...aboutCertError.xhtml", or to "javascript:showSecuritySection()" when
+	* the page "netError.xhtml" is showing, indicates that the last attempted page view had
+	* an invalid certificate.  When this happens, veto the current navigate and re-navigate
+	* to the page with the bad certificate so that NotifyCertProblem will be invoked.
+	*/
+	if (value.indexOf ("aboutCertError.xhtml") != -1 || (isViewingErrorPage && value.indexOf ("javascript:showSecuritySection") != -1)) { //$NON-NLS-1$ //$NON-NLS-2$
+		XPCOM.memmove (retval, new int[] {1}, 4); /* PRBool */
+		isRetrievingBadCert = true;
+		setUrl (lastNavigateURL);
+		return XPCOM.NS_OK;
+	}
+	isViewingErrorPage = value.indexOf ("netError.xhtml") != -1; //$NON-NLS-1$
+
 	boolean doit = true;
 	if (request == 0) {
 		/* 
-		 * listeners should not be notified of internal transitions like "javascipt:..."
+		 * listeners should not be notified of internal transitions like "javascript:..."
 		 * because this is an implementation side-effect, not a true navigate
 		 */
 		if (!value.startsWith (PREFIX_JAVASCRIPT)) {
-			LocationEvent event = new LocationEvent (browser);
-			event.display = browser.getDisplay();
-			event.widget = browser;
-			event.location = value;
-			/*
-			 * If the URI indicates that the page is being rendered from memory
-			 * (via setText()) then set it to about:blank to be consistent with IE.
-			 */
-			if (event.location.equals (URI_FROMMEMORY)) event.location = ABOUT_BLANK;
-			event.doit = doit;
-			for (int i = 0; i < locationListeners.length; i++) {
-				locationListeners[i].changing (event);
+			if (locationListeners.length > 0) {
+				LocationEvent event = new LocationEvent (browser);
+				event.display = browser.getDisplay();
+				event.widget = browser;
+				event.location = value;
+				/*
+				 * If the URI indicates that the page is being rendered from memory
+				 * (via setText()) then set it to about:blank to be consistent with IE.
+				 */
+				if (event.location.equals (URI_FROMMEMORY)) event.location = ABOUT_BLANK;
+				event.doit = doit;
+				for (int i = 0; i < locationListeners.length; i++) {
+					locationListeners[i].changing (event);
+				}
+				doit = event.doit && !browser.isDisposed();
 			}
-			doit = event.doit && !browser.isDisposed();
+
+			if (doit) {
+				if (!isViewingErrorPage) lastNavigateURL = value;
+			}
 		}
 	}
 	XPCOM.memmove (retval, new int[] {doit ? 0 : 1}, 4); /* PRBool */
@@ -2832,8 +3314,6 @@
 /* nsITooltipListener */
 
 int OnShowTooltip (int aXCoords, int aYCoords, int /*long*/ aTipText) {
-	if (awaitingNavigate) return XPCOM.NS_OK;
-
 	int length = XPCOM.strlen_PRUnichar (aTipText);
 	char[] dest = new char[length];
 	XPCOM.memmove (dest, aTipText, length * 2);
@@ -3220,4 +3700,152 @@
 	}
 	return XPCOM.NS_OK;
 }
+
+/* nsIBadCertListener2 */
+
+int NotifyCertProblem (int /*long*/ socketInfo, int /*long*/ status, int /*long*/ targetSite, int /*long*/ _suppressError) {
+	/* determine the host name and port */
+	int length = XPCOM.nsEmbedCString_Length (targetSite);
+	int /*long*/ buffer = XPCOM.nsEmbedCString_get (targetSite);
+	byte[] dest = new byte[length];
+	XPCOM.memmove (dest, buffer, length);
+	final String urlPort = new String (dest);
+	int index = urlPort.indexOf (':');
+	final String host = urlPort.substring (0,index);
+	final int port = Integer.valueOf (urlPort.substring (index + 1)).intValue ();
+
+	/* create text descriptions of the certificate problem(s) */
+
+	int /*long*/[] result = new int /*long*/[1];
+	nsISupports supports = new nsISupports (status);
+	int rc = supports.QueryInterface (nsISSLStatus.NS_ISSLSTATUS_IID, result);
+	if (rc != XPCOM.NS_OK) error (rc);
+	if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
+
+	nsISSLStatus sslStatus = new nsISSLStatus (result[0]);
+	result[0] = 0;
+	rc = sslStatus.GetServerCert (result);
+	if (rc != XPCOM.NS_OK) error (rc);
+	if (result[0] == 0) error (XPCOM.NS_ERROR_NULL_POINTER);
+
+	final nsIX509Cert cert = new nsIX509Cert (result[0]);
+	result[0] = 0;
+	String[] problems = new String[3];
+	int problemCount = 0, flags = 0;
+	int[] intResult = new int[1];
+
+	rc = sslStatus.GetIsDomainMismatch (intResult);
+	if (intResult[0] != 0) {
+		int /*long*/ ptr = XPCOM.nsEmbedString_new ();
+		rc = cert.GetCommonName (ptr);
+		if (rc != XPCOM.NS_OK) SWT.error (rc);
+		length = XPCOM.nsEmbedString_Length (ptr);
+		buffer = XPCOM.nsEmbedString_get (ptr);
+		char[] chars = new char[length];
+		XPCOM.memmove (chars, buffer, length * 2);
+		String name = new String (chars);
+		problems[problemCount++] = Compatibility.getMessage ("SWT_InvalidCert_InvalidName", new String[] {name}); //$NON-NLS-1$
+		flags |= nsICertOverrideService.ERROR_MISMATCH;
+		XPCOM.nsEmbedString_delete (ptr);
+	}
+	intResult[0] = 0;
+
+	rc = sslStatus.GetIsNotValidAtThisTime (intResult);
+	if (intResult[0] != 0) {
+		rc = cert.GetValidity (result);
+		if (rc != XPCOM.NS_OK) SWT.error (rc);
+		if (result[0] == 0) error (XPCOM.NS_ERROR_NULL_POINTER);
+
+		nsIX509CertValidity validity = new nsIX509CertValidity(result[0]);
+		result[0] = 0;
+
+		int /*long*/ ptr = XPCOM.nsEmbedString_new ();
+		rc = validity.GetNotBeforeGMT (ptr);
+		if (rc != XPCOM.NS_OK) SWT.error (rc);
+		length = XPCOM.nsEmbedString_Length (ptr);
+		buffer = XPCOM.nsEmbedString_get (ptr);
+		char[] chars = new char[length];
+		XPCOM.memmove (chars, buffer, length * 2);
+		String notBefore = new String (chars);
+		XPCOM.nsEmbedString_delete (ptr);
+
+		ptr = XPCOM.nsEmbedString_new ();
+		rc = validity.GetNotAfterGMT (ptr);
+		if (rc != XPCOM.NS_OK) SWT.error (rc);
+		length = XPCOM.nsEmbedString_Length (ptr);
+		buffer = XPCOM.nsEmbedString_get (ptr);
+		chars = new char[length];
+		XPCOM.memmove (chars, buffer, length * 2);
+		String notAfter = new String (chars);
+		XPCOM.nsEmbedString_delete (ptr);
+
+		String range = notBefore + " - " + notAfter; //$NON-NLS-1$
+		problems[problemCount++] = Compatibility.getMessage ("SWT_InvalidCert_NotValid", new String[] {range}); //$NON-NLS-1$
+		flags |= nsICertOverrideService.ERROR_TIME;
+		validity.Release ();
+	}
+	intResult[0] = 0;
+
+	rc = sslStatus.GetIsUntrusted (intResult);
+	if (intResult[0] != 0) {
+		int /*long*/ ptr = XPCOM.nsEmbedString_new ();
+		rc = cert.GetIssuerCommonName (ptr);
+		if (rc != XPCOM.NS_OK) SWT.error (rc);
+		length = XPCOM.nsEmbedString_Length (ptr);
+		buffer = XPCOM.nsEmbedString_get (ptr);
+		char[] chars = new char[length];
+		XPCOM.memmove (chars, buffer, length * 2);
+		String name = new String (chars);
+		problems[problemCount++] = Compatibility.getMessage ("SWT_InvalidCert_NotTrusted", new String[] {name}); //$NON-NLS-1$
+		flags |= nsICertOverrideService.ERROR_UNTRUSTED;
+		XPCOM.nsEmbedString_delete (ptr);
+	}
+	intResult[0] = 0;
+	sslStatus.Release ();
+
+	/*
+	* The invalid certificate dialog must be shown asynchronously because
+	* NotifyCertProblem implementations cannot block.
+	*/
+	final int finalFlags = flags;
+	final String[] finalProblems = new String[problemCount];
+	System.arraycopy (problems, 0, finalProblems, 0, problemCount);
+	final String url = lastNavigateURL;
+	browser.getDisplay().asyncExec(new Runnable() {
+		public void run() {
+			if (browser.isDisposed ()) return;
+			if (!url.equals (lastNavigateURL)) return;	/* user has navigated elsewhere */
+
+			String message = Compatibility.getMessage ("SWT_InvalidCert_Message", new String[] {urlPort}); //$NON-NLS-1$
+			if (new PromptDialog (browser.getShell ()).invalidCert (browser, message, finalProblems, cert)) {
+				int /*long*/[] result = new int /*long*/[1];
+				int rc = XPCOM.NS_GetServiceManager (result);
+				if (rc != XPCOM.NS_OK) error (rc);
+				if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
+		
+				nsIServiceManager serviceManager = new nsIServiceManager (result[0]);
+				result[0] = 0;
+				byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_CERTOVERRIDE_CONTRACTID, true);
+				rc = serviceManager.GetServiceByContractID (aContractID, nsICertOverrideService.NS_ICERTOVERRIDESERVICE_IID, result);
+				if (rc != XPCOM.NS_OK) error (rc);
+				if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
+				serviceManager.Release ();
+		
+				nsICertOverrideService overrideService = new nsICertOverrideService (result[0]);
+				result[0] = 0;
+				byte[] hostBytes = MozillaDelegate.wcsToMbcs (null, host, false);
+				int /*long*/ hostString = XPCOM.nsEmbedCString_new (hostBytes, hostBytes.length);
+				rc = overrideService.RememberValidityOverride (hostString, port, cert.getAddress (), finalFlags, 1);
+				browser.setUrl (url);
+				XPCOM.nsEmbedCString_delete (hostString);
+				overrideService.Release ();
+			}
+			cert.Release ();
+		}
+	});
+
+	C.memmove (_suppressError, new int[] {1}, 4); /* PRInt32 */
+	return XPCOM.NS_OK;
+}
+
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptDialog.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptDialog.java
index f4558d0..9b29e51 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptDialog.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptDialog.java
@@ -11,6 +11,10 @@
 package org.eclipse.swt.browser;
 
 import org.eclipse.swt.*;
+import org.eclipse.swt.custom.*;
+import org.eclipse.swt.graphics.*;
+import org.eclipse.swt.internal.Compatibility;
+import org.eclipse.swt.internal.mozilla.*;
 import org.eclipse.swt.layout.*;
 import org.eclipse.swt.widgets.*;
 
@@ -69,6 +73,140 @@
 		}
 	}
 
+	boolean invalidCert(final Browser browser, String message, String[] problems, final nsIX509Cert cert) {
+		Shell parent = getParent();
+		Display display = parent.getDisplay();
+		Monitor monitor = parent.getMonitor();
+		int maxWidth = monitor.getBounds().width * 2 / 3;
+		final Shell shell = new Shell(parent, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
+		shell.setText(Compatibility.getMessage("SWT_InvalidCert_Title")); //$NON-NLS-1$
+		shell.setLayout(new GridLayout());
+
+		Composite messageComposite = new Composite(shell, SWT.NONE);
+		messageComposite.setLayout(new GridLayout(2, false));
+		Image image = display.getSystemImage(SWT.ICON_WARNING);
+		new Label(messageComposite, SWT.NONE).setImage(image);
+		Text text = new Text(messageComposite, SWT.WRAP);
+		text.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+		text.setEditable(false);
+		text.setBackground(shell.getBackground());
+		text.setText(message);
+		int width = messageComposite.computeSize(SWT.DEFAULT, SWT.DEFAULT).x;
+		GridData data = new GridData();
+		data.widthHint = Math.min(width, maxWidth);
+		data.horizontalAlignment = GridData.FILL;
+		data.grabExcessHorizontalSpace = true;
+		messageComposite.setLayoutData(data);
+
+		StyledText problemsText = new StyledText(shell, SWT.WRAP);
+//		problemsText.setMargins(30, 0, 30, 0);
+		problemsText.setEditable(false);
+		problemsText.setBackground(shell.getBackground());
+		for (int i = 0; i < problems.length; i++) {
+			problemsText.append(problems[i] + '\n');
+		}
+		StyleRange style = new StyleRange();
+		style.metrics = new GlyphMetrics(0, 0, 30);
+		Bullet bullet0 = new Bullet (style);
+		problemsText.setLineBullet(0, problems.length, bullet0);
+		width = problemsText.computeSize(SWT.DEFAULT, SWT.DEFAULT).x;
+		data = new GridData();
+		data.widthHint = Math.min(width, maxWidth);
+		data.horizontalAlignment = GridData.FILL;
+		data.grabExcessHorizontalSpace = true;
+		problemsText.setLayoutData(data);
+
+		text = new Text(shell, SWT.SINGLE);
+		text.setEditable(false);
+		text.setBackground(shell.getBackground());
+		text.setText(Compatibility.getMessage("SWT_InvalidCert_Connect")); //$NON-NLS-1$
+
+		new Label(shell, SWT.NONE); /* vertical spacer */
+
+		/*
+		* Create a local invisible Browser to be passed to the ViewCert call,
+		* so that this prompter can be the certificate view dialog's parent.
+		*/
+		final Browser localBrowser = new Browser(shell, browser.getStyle());
+		data = new GridData();
+		data.exclude = true;
+		localBrowser.setLayoutData(data);
+
+		Composite buttonsComposite = new Composite(shell, SWT.NONE);
+		buttonsComposite.setLayout(new GridLayout(3, true));
+		buttonsComposite.setLayoutData(new GridData(SWT.CENTER, SWT.CENTER, false, false));
+
+		Button viewCertButton = new Button(buttonsComposite, SWT.PUSH);
+		viewCertButton.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false));
+		viewCertButton.setText(Compatibility.getMessage("View Certificate")); //$NON-NLS-1$
+		viewCertButton.addListener(SWT.Selection, new Listener() {
+			public void handleEvent(Event event) {
+				int /*long*/[] result = new int /*long*/[1];
+				int rc = XPCOM.NS_GetServiceManager (result);
+				if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+				if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
+
+				nsIServiceManager serviceManager = new nsIServiceManager(result[0]);
+				result[0] = 0;
+				byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_CERTIFICATEDIALOGS_CONTRACTID, true);
+				rc = serviceManager.GetServiceByContractID (aContractID, nsICertificateDialogs.NS_ICERTIFICATEDIALOGS_IID, result);
+				if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+				if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
+				serviceManager.Release();
+				
+				nsICertificateDialogs dialogs = new nsICertificateDialogs(result[0]);
+				result[0] = 0;
+				
+				/*
+				* Bug in Mozilla.  The certificate viewer dialog does not show its content when
+				* opened.  The workaround is to periodically wake up the UI thread.
+				*/
+				Runnable runnable = new Runnable() {
+					public void run() {
+						browser.getDisplay().timerExec(1000, this);
+					}
+				};
+				runnable.run();
+
+				rc = ((Mozilla)localBrowser.webBrowser).webBrowser.GetContentDOMWindow(result);
+				if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+				if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
+				nsIDOMWindow window = new nsIDOMWindow(result[0]);
+				result[0] = 0;
+
+				rc = dialogs.ViewCert(window.getAddress(), cert.getAddress());
+				browser.getDisplay().timerExec(-1, runnable);
+				window.Release();
+				dialogs.Release();
+			}
+		});
+
+		final Button okButton = new Button(buttonsComposite, SWT.PUSH);
+		okButton.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false));
+		okButton.setText(Compatibility.getMessage("SWT_OK")); //$NON-NLS-1$
+		Button cancelButton = new Button(buttonsComposite, SWT.PUSH);
+		cancelButton.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false));
+		cancelButton.setText(Compatibility.getMessage("SWT_Cancel")); //$NON-NLS-1$
+		final boolean[] result = new boolean[1];
+		Listener listener = new Listener() {
+			public void handleEvent(Event event) {
+				shell.dispose();
+				result[0] = event.widget == okButton;
+			}
+		};
+		okButton.addListener(SWT.Selection, listener);
+		cancelButton.addListener(SWT.Selection, listener);
+
+		cancelButton.setFocus();
+		shell.setDefaultButton(cancelButton);
+		shell.pack();
+		shell.open();
+		while (!shell.isDisposed()) {
+			if (!display.readAndDispatch()) display.sleep();
+		}
+		return result[0];
+	}
+
 	void confirmEx(String title, String text, String check, String button0, String button1, String button2, int defaultIndex, final int[] checkValue, final int[] result) {
 		Shell parent = getParent();
 		final Shell shell = new Shell(parent, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptService2.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptService2.java
index 8fba3b7..afdac1e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptService2.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptService2.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
+ * Copyright (c) 2003, 2009 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
@@ -123,49 +123,8 @@
 
 Browser getBrowser (int /*long*/ aDOMWindow) {
 	if (aDOMWindow == 0) return null;
-
-	int /*long*/[] result = new int /*long*/[1];
-	int rc = XPCOM.NS_GetServiceManager (result);
-	if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-	if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
-	
-	nsIServiceManager serviceManager = new nsIServiceManager (result[0]);
-	result[0] = 0;
-	byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_WINDOWWATCHER_CONTRACTID, true);
-	rc = serviceManager.GetServiceByContractID (aContractID, nsIWindowWatcher.NS_IWINDOWWATCHER_IID, result);
-	if (rc != XPCOM.NS_OK) Mozilla.error(rc);
-	if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);		
-	serviceManager.Release ();
-	
-	nsIWindowWatcher windowWatcher = new nsIWindowWatcher (result[0]);
-	result[0] = 0;
-	/* the chrome will only be answered for the top-level nsIDOMWindow */
 	nsIDOMWindow window = new nsIDOMWindow (aDOMWindow);
-	rc = window.GetTop (result);
-	if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-	if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
-	aDOMWindow = result[0];
-	result[0] = 0;
-	rc = windowWatcher.GetChromeForWindow (aDOMWindow, result);
-	if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-	if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);		
-	windowWatcher.Release ();	
-	
-	nsIWebBrowserChrome webBrowserChrome = new nsIWebBrowserChrome (result[0]);
-	result[0] = 0;
-	rc = webBrowserChrome.QueryInterface (nsIEmbeddingSiteWindow.NS_IEMBEDDINGSITEWINDOW_IID, result);
-	if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-	if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);		
-	webBrowserChrome.Release ();
-	
-	nsIEmbeddingSiteWindow embeddingSiteWindow = new nsIEmbeddingSiteWindow (result[0]);
-	result[0] = 0;
-	rc = embeddingSiteWindow.GetSiteWindow (result);
-	if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-	if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);		
-	embeddingSiteWindow.Release ();
-	
-	return Mozilla.findBrowser (result[0]); 
+	return Mozilla.findBrowser (window);
 }
 
 String getLabel (int buttonFlag, int index, int /*long*/ buttonTitle) {
@@ -190,7 +149,7 @@
 /* nsIPromptService */
 
 int Alert (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText) {
-	Browser browser = getBrowser (aParent);
+	final Browser browser = getBrowser (aParent);
 	
 	int length = XPCOM.strlen_PRUnichar (aDialogTitle);
 	char[] dest = new char[length];
@@ -202,6 +161,26 @@
 	XPCOM.memmove (dest, aText, length * 2);
 	String textLabel = new String (dest);
 
+	/*
+	* If mozilla is showing its errors with dialogs (as opposed to pages) then the only
+	* opportunity to detect that a page has an invalid certificate, without receiving
+	* all notification callbacks on the channel, is to detect the displaying of an alert
+	* whose message contains an internal cert error code.  If a such a message is
+	* detected then instead of showing it, re-navigate to the page with the invalid
+	* certificate so that the browser's nsIBadCertListener2 will be invoked.
+	*/
+	if (textLabel.indexOf ("ssl_error_bad_cert_domain") != -1 ||
+		textLabel.indexOf ("sec_error_unknown_issuer") != -1 ||
+		textLabel.indexOf ("sec_error_untrusted_issuer") != -1 ||
+		textLabel.indexOf ("sec_error_expired_certificate") != -1) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+			if (browser != null) {
+				Mozilla mozilla = (Mozilla)browser.webBrowser;
+				mozilla.isRetrievingBadCert = true;
+				browser.setUrl (mozilla.lastNavigateURL);
+				return XPCOM.NS_OK;
+			}
+	}
+
 	Shell shell = browser == null ? new Shell () : browser.getShell (); 
 	MessageBox messageBox = new MessageBox (shell, SWT.OK | SWT.ICON_WARNING);
 	messageBox.setText (titleLabel);
@@ -358,37 +337,35 @@
 		* User selected OK. User name and password are returned as PRUnichar values. Any default
 		* value that we override must be freed using the nsIMemory service.
 		*/
-		int cnt, size;
-		int /*long*/ ptr;
-		char[] buffer;
-		int /*long*/[] result2 = new int /*long*/[1];
 		if (valueLabel[0] != null) {
-			cnt = valueLabel[0].length ();
-			buffer = new char[cnt + 1];
+			int /*long*/[] result2 = new int /*long*/[1];
+			int rc = XPCOM.NS_GetServiceManager (result2);
+			if (rc != XPCOM.NS_OK) SWT.error (rc);
+			if (result2[0] == 0) SWT.error (XPCOM.NS_NOINTERFACE);
+
+			nsIServiceManager serviceManager = new nsIServiceManager (result2[0]);
+			result2[0] = 0;
+			byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_MEMORY_CONTRACTID, true);
+			rc = serviceManager.GetServiceByContractID (aContractID, nsIMemory.NS_IMEMORY_IID, result2);
+			if (rc != XPCOM.NS_OK) SWT.error (rc);
+			if (result2[0] == 0) SWT.error (XPCOM.NS_NOINTERFACE);		
+			serviceManager.Release ();
+
+			nsIMemory memory = new nsIMemory (result2[0]);
+			result2[0] = 0;
+
+			int cnt = valueLabel[0].length ();
+			char[] buffer = new char[cnt + 1];
 			valueLabel[0].getChars (0, cnt, buffer, 0);
-			size = buffer.length * 2;
-			ptr = C.malloc (size);
+			int size = buffer.length * 2;
+			int /*long*/ ptr = memory.Alloc (size);
 			XPCOM.memmove (ptr, buffer, size);
 			XPCOM.memmove (aValue, new int /*long*/[] {ptr}, C.PTR_SIZEOF);
 
 			if (valueAddr[0] != 0) {
-				int rc = XPCOM.NS_GetServiceManager (result2);
-				if (rc != XPCOM.NS_OK) SWT.error (rc);
-				if (result2[0] == 0) SWT.error (XPCOM.NS_NOINTERFACE);
-			
-				nsIServiceManager serviceManager = new nsIServiceManager (result2[0]);
-				result2[0] = 0;
-				byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_MEMORY_CONTRACTID, true);
-				rc = serviceManager.GetServiceByContractID (aContractID, nsIMemory.NS_IMEMORY_IID, result2);
-				if (rc != XPCOM.NS_OK) SWT.error (rc);
-				if (result2[0] == 0) SWT.error (XPCOM.NS_NOINTERFACE);		
-				serviceManager.Release ();
-				
-				nsIMemory memory = new nsIMemory (result2[0]);
-				result2[0] = 0;
 				memory.Free (valueAddr[0]);
-				memory.Release ();
 			}
+			memory.Release ();
 		}
 	}
 	if (aCheckState != 0) XPCOM.memmove (aCheckState, check, 4);
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 a2f889c..168e926 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
@@ -29,6 +29,7 @@
 
 import org.eclipse.swt.internal.*;
 
+/** @jniclass flags=cpp */
 public class XPCOM extends C {
 	public static final String MOZILLA_FIVE_HOME = "MOZILLA_FIVE_HOME"; //$NON-NLS-1$
 	public static final String MOZILLA_PLUGIN_PATH = "MOZ_PLUGIN_PATH"; //$NON-NLS-1$
@@ -48,6 +49,7 @@
 	public static final String DOMEVENT_KEYPRESS = "keypress"; //$NON-NLS-1$
 	
 	/* CID constants */
+	public static final nsID EXTERNAL_CID = new nsID ("f2c59ad0-bd76-11dd-ad8b-0800200c9a66"); //$NON-NLS-1$
 	public static final nsID NS_APPSHELL_CID =	new nsID("2d96b3df-c051-11d1-a827-0040959a28c9"); //$NON-NLS-1$
 	public static final nsID NS_CATEGORYMANAGER_CID = new nsID("16d222a6-1dd2-11b2-b693-f38b02c021b2"); //$NON-NLS-1$
 	public static final nsID NS_DOWNLOAD_CID = new nsID("e3fa9D0a-1dd1-11b2-bdef-8c720b597445"); //$NON-NLS-1$
@@ -58,19 +60,25 @@
 	public static final nsID NS_LOADGROUP_CID = new nsID("e1c61582-2a84-11d3-8cce-0060b0fc14a3"); //$NON-NLS-1$
 	public static final nsID NS_PROMPTSERVICE_CID = new nsID("a2112d6a-0e28-421f-b46a-25c0b308cbd0"); //$NON-NLS-1$
 
+	public static final String EXTERNAL_CONTRACTID = "@eclipse.org/external;1"; //$NON-NLS-1$
+	public static final String NS_CERTOVERRIDE_CONTRACTID = "@mozilla.org/security/certoverride;1"; //$NON-NLS-1$
+	public static final String NS_CERTIFICATEDIALOGS_CONTRACTID = "@mozilla.org/nsCertificateDialogs;1"; //$NON-NLS-1$
 	public static final String NS_CONTEXTSTACK_CONTRACTID = "@mozilla.org/js/xpc/ContextStack;1"; //$NON-NLS-1$
 	public static final String NS_COOKIEMANAGER_CONTRACTID = "@mozilla.org/cookiemanager;1"; //$NON-NLS-1$
+	public static final String NS_COOKIESERVICE_CONTRACTID = "@mozilla.org/cookieService;1"; //$NON-NLS-1$
 	public static final String NS_DIRECTORYSERVICE_CONTRACTID = "@mozilla.org/file/directory_service;1"; //$NON-NLS-1$
 	public static final String NS_DOMSERIALIZER_CONTRACTID = "@mozilla.org/xmlextras/xmlserializer;1"; //$NON-NLS-1$
 	public static final String NS_DOWNLOAD_CONTRACTID = "@mozilla.org/download;1"; //$NON-NLS-1$
 	public static final String NS_FILEPICKER_CONTRACTID = "@mozilla.org/filepicker;1"; //$NON-NLS-1$
 	public static final String NS_HELPERAPPLAUNCHERDIALOG_CONTRACTID = "@mozilla.org/helperapplauncherdialog;1"; //$NON-NLS-1$
 	public static final String NS_MEMORY_CONTRACTID = "@mozilla.org/xpcom/memory-service;1"; //$NON-NLS-1$
+	public static final String NS_SCRIPTSECURITYMANAGER_CONTRACTID = "@mozilla.org/scriptsecuritymanager;1"; //$NON-NLS-1$
 	public static final String NS_OBSERVER_CONTRACTID = "@mozilla.org/observer-service;1"; //$NON-NLS-1$
 	public static final String NS_PREFLOCALIZEDSTRING_CONTRACTID = "@mozilla.org/pref-localizedstring;1"; //$NON-NLS-1$
 	public static final String NS_PREFSERVICE_CONTRACTID = "@mozilla.org/preferences-service;1"; //$NON-NLS-1$
 	public static final String NS_PROMPTSERVICE_CONTRACTID = "@mozilla.org/embedcomp/prompt-service;1"; //$NON-NLS-1$
 	public static final String NS_TRANSFER_CONTRACTID = "@mozilla.org/transfer;1"; //$NON-NLS-1$
+	public static final String NS_VARIANT_CONTRACTID = "@mozilla.org/variant;1"; //$NON-NLS-1$
 	public static final String NS_WEBNAVIGATIONINFO_CONTRACTID = "@mozilla.org/webnavigation-info;1"; //$NON-NLS-1$
 	public static final String NS_WINDOWWATCHER_CONTRACTID = "@mozilla.org/embedcomp/window-watcher;1"; //$NON-NLS-1$
 
@@ -124,183 +132,2131 @@
 	public static final int NS_ERROR_FILE_NOT_FOUND = 0x80520012;
 	public static final int NS_ERROR_FILE_UNRECOGNIZED_PATH = 0x80520001;
 
+public static final native int nsDynamicFunctionLoad_sizeof ();
+
+/**
+ * @param dest cast=(void *)
+ * @param src cast=(const void *),flags=no_out critical
+ * @param size cast=(size_t)
+ */
+public static final native void memmove (int /*long*/ dest, nsDynamicFunctionLoad src, int /*long*/ size);
+/**
+ * @param dest cast=(void *)
+ * @param src cast=(const void *)
+ * @param nbytes cast=(size_t)
+ */
 public static final native void memmove(nsID dest, int /*long*/ src, int nbytes);
+/**
+ * @param dest cast=(void *)
+ * @param src cast=(const void *)
+ * @param nbytes cast=(size_t)
+ */
 public static final native void memmove(int /*long*/ dest, nsID 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_InitXPCOM2(int /*long*/ result, int /*long*/ binDirectory, int /*long*/ appFileLocationProvider);
-public static final native int NS_NewLocalFile(int /*long*/ path, int followLinks, int /*long*/[] result);
+/** @method flags=no_gen */
 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);
-public static final native void nsID_delete(int /*long*/ ptr);
-public static final native int /*long*/ nsID_new();
-public static final native int nsID_Equals(int /*long*/ ptr, int /*long*/ other);
-public static final native int /*long*/ nsEmbedString_new();
-public static final native int /*long*/ nsEmbedString_new(char[] aString);
-public static final native void nsEmbedString_delete(int /*long*/ ptr);
-public static final native int nsEmbedString_Length(int /*long*/ ptr);
-public static final native int /*long*/ nsEmbedString_get(int /*long*/ ptr);
-public static final native int XPCOMGlueStartup(byte[] place);
-public static final native int XPCOMGlueShutdown();
 
-public static final native int /*long*/ Call(int /*long*/ ptr, int /*long*/ aInStream, int /*long*/ aClosure, byte[] aFromSegment, int aToOffset, int aCount, int[] aWriteCount);
+/** @method flags=no_gen */
+public static final native int _JS_EvaluateUCScriptForPrincipals(byte[] mozillaPath, int /*long*/ cx, int /*long*/ obj, int /*long*/ principals, char[] chars, int length, byte[] filename, int lineno, int /*long*/[] retVal);	
+public static final int JS_EvaluateUCScriptForPrincipals(byte[] mozillaPath, int /*long*/ cx, int /*long*/ obj, int /*long*/ principals, char[] chars, int length, byte[] filename, int lineno, int /*long*/[] retVal) {
+	lock.lock();
+	try {
+		return _JS_EvaluateUCScriptForPrincipals(mozillaPath, cx, obj, principals, chars, length, filename, lineno, retVal);
+	} finally {
+		lock.unlock();
+	}
+}
 
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, float arg0);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, float[] arg0);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long[] arg0);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0);
+/** @param result cast=(nsIComponentManager**) */
+public static final native int _NS_GetComponentManager(int /*long*/[] result);
+public static final int NS_GetComponentManager(int /*long*/[] result) {
+	lock.lock();
+	try {
+		return _NS_GetComponentManager(result);
+	} finally {
+		lock.unlock();
+	}
+}
+/** @param result cast=(nsIServiceManager**) */
+public static final native int _NS_GetServiceManager(int /*long*/[] result);
+public static final int NS_GetServiceManager(int /*long*/[] result) {
+	lock.lock();
+	try {
+		return _NS_GetServiceManager(result);
+	} finally {
+		lock.unlock();
+	}
+}
+/**
+ * @param result cast=(nsIServiceManager **)
+ * @param binDirectory cast=(nsIFile *)
+ * @param appFileLocationProvider cast=(nsIDirectoryServiceProvider *)
+ */
+public static final native int _NS_InitXPCOM2(int /*long*/ result, int /*long*/ binDirectory, int /*long*/ appFileLocationProvider);
+public static final int NS_InitXPCOM2(int /*long*/ result, int /*long*/ binDirectory, int /*long*/ appFileLocationProvider) {
+	lock.lock();
+	try {
+		return _NS_InitXPCOM2(result, binDirectory, appFileLocationProvider);
+	} finally {
+		lock.unlock();
+	}
+}
+/**
+ * @param path cast=(nsAString *),flags=struct
+ * @param result cast=(nsILocalFile**)
+ */
+public static final native int _NS_NewLocalFile(int /*long*/ path, int followLinks, int /*long*/[] result);
+public static final int NS_NewLocalFile(int /*long*/ path, int followLinks, int /*long*/[] result) {
+	lock.lock();
+	try {
+		return _NS_NewLocalFile(path, followLinks, result);
+	} finally {
+		lock.unlock();
+	}
+}
+/** @method flags=new */
+public static final native int /*long*/ _nsEmbedCString_new();
+public static final int /*long*/ nsEmbedCString_new() {
+	lock.lock();
+	try {
+		return _nsEmbedCString_new();
+	} finally {
+		lock.unlock();
+	}
+}
+/**
+ * @method flags=new
+ * @param aString cast=(const char *)
+ */
+public static final native int /*long*/ _nsEmbedCString_new(byte[] aString, int length);
+public static final int /*long*/ nsEmbedCString_new(byte[] aString, int length) {
+	lock.lock();
+	try {
+		return _nsEmbedCString_new(aString, length);
+	} finally {
+		lock.unlock();
+	}
+}
+/**
+ * @method flags=new
+ * @param aString cast=(const char *)
+ */
+public static final native int /*long*/ _nsEmbedCString_new(int /*long*/ aString, int length);
+public static final int /*long*/ nsEmbedCString_new(int /*long*/ aString, int length) {
+	lock.lock();
+	try {
+		return _nsEmbedCString_new(aString, length);
+	} finally {
+		lock.unlock();
+	}
+}
+/**
+ * @method flags=delete
+ * @param ptr cast=(nsEmbedCString *)
+ */
+public static final native void _nsEmbedCString_delete(int /*long*/ ptr);
+public static final void nsEmbedCString_delete(int /*long*/ ptr) {
+	lock.lock();
+	try {
+		_nsEmbedCString_delete(ptr);
+	} finally {
+		lock.unlock();
+	}
+}
+/**
+ * @method flags=cpp
+ * @param ptr cast=(nsEmbedCString *)
+ */
+public static final native int _nsEmbedCString_Length(int /*long*/ ptr);
+public static final int nsEmbedCString_Length(int /*long*/ ptr) {
+	lock.lock();
+	try {
+		return _nsEmbedCString_Length(ptr);
+	} finally {
+		lock.unlock();
+	}
+}
+/**
+ * @method flags=cpp
+ * @param ptr cast=(nsIScriptGlobalObject *)
+ */
+public static final native int _nsIScriptGlobalObject_EnsureScriptEnvironment(int /*long*/ ptr, int lang);
+public static final int nsIScriptGlobalObject_EnsureScriptEnvironment(int /*long*/ ptr, int lang) {
+	lock.lock();
+	try {
+		return _nsIScriptGlobalObject_EnsureScriptEnvironment(ptr, lang);
+	} finally {
+		lock.unlock();
+	}
+}
+/**
+ * @method flags=cpp
+ * @param ptr cast=(nsIScriptGlobalObject *)
+ */
+public static final native int /*long*/ _nsIScriptGlobalObject_GetScriptGlobal(int /*long*/ ptr, int lang);
+public static final int /*long*/ nsIScriptGlobalObject_GetScriptGlobal(int /*long*/ ptr, int lang) {
+	lock.lock();
+	try {
+		return _nsIScriptGlobalObject_GetScriptGlobal(ptr, lang);
+	} finally {
+		lock.unlock();
+	}
+}
+/**
+ * @method flags=cpp
+ * @param ptr cast=(nsIScriptGlobalObject *)
+ */
+public static final native int /*long*/ _nsIScriptGlobalObject_GetScriptContext(int /*long*/ ptr, int lang);
+public static final int /*long*/ nsIScriptGlobalObject_GetScriptContext(int /*long*/ ptr, int lang) {
+	lock.lock();
+	try {
+		return _nsIScriptGlobalObject_GetScriptContext(ptr, lang);
+	} finally {
+		lock.unlock();
+	}
+}
+/**
+ * @method flags=cpp
+ * @param ptr cast=(nsIScriptContext *)
+ */
+public static final native int /*long*/ _nsIScriptContext_GetNativeContext(int /*long*/ ptr);
+public static final int /*long*/ nsIScriptContext_GetNativeContext(int /*long*/ ptr) {
+	lock.lock();
+	try {
+		return _nsIScriptContext_GetNativeContext(ptr);
+	} finally {
+		lock.unlock();
+	}
+}
 
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long [] arg1);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int[] arg1);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[] arg1);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long[] arg1);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long arg1);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg1);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[] arg1);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int arg1);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long arg1);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int[] arg1);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long[] arg1);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, char[] arg1);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1);
+/**
+ * @method flags=cpp
+ * @param ptr cast=(nsEmbedCString *)
+ */
+public static final native int /*long*/ _nsEmbedCString_get(int /*long*/ ptr);
+public static final int /*long*/ nsEmbedCString_get(int /*long*/ ptr) {
+	lock.lock();
+	try {
+		return _nsEmbedCString_get(ptr);
+	} finally {
+		lock.unlock();
+	}
+}
+/**
+ * @method flags=delete
+ * @param ptr cast=(nsID *)
+ */
+public static final native void _nsID_delete(int /*long*/ ptr);
+public static final void nsID_delete(int /*long*/ ptr) {
+	lock.lock();
+	try {
+		_nsID_delete(ptr);
+	} finally {
+		lock.unlock();
+	}
+}
+/** @method flags=new */
+public static final native int /*long*/ _nsID_new();
+public static final int /*long*/ nsID_new() {
+	lock.lock();
+	try {
+		return _nsID_new();
+	} finally {
+		lock.unlock();
+	}
+}
+/**
+ * @method flags=cpp
+ * @param ptr cast=(nsID *)
+ * @param other cast=(nsID *),flags=struct
+ */
+public static final native int _nsID_Equals(int /*long*/ ptr, int /*long*/ other);
+public static final int nsID_Equals(int /*long*/ ptr, int /*long*/ other) {
+	lock.lock();
+	try {
+		return _nsID_Equals(ptr, other);
+	} finally {
+		lock.unlock();
+	}
+}
+/** @method flags=new */
+public static final native int /*long*/ _nsEmbedString_new();
+public static final int /*long*/ nsEmbedString_new() {
+	lock.lock();
+	try {
+		return _nsEmbedString_new();
+	} finally {
+		lock.unlock();
+	}
+}
+/**
+ * @method flags=new
+ * @param aString cast=(PRUnichar *)
+ */
+public static final native int /*long*/ _nsEmbedString_new(char[] aString);
+public static final int /*long*/ nsEmbedString_new(char[] aString) {
+	lock.lock();
+	try {
+		return _nsEmbedString_new(aString);
+	} finally {
+		lock.unlock();
+	}
+}
+/**
+ * @method flags=delete
+ * @param ptr cast=(nsEmbedString *)
+ */
+public static final native void _nsEmbedString_delete(int /*long*/ ptr);
+public static final void nsEmbedString_delete(int /*long*/ ptr) {
+	lock.lock();
+	try {
+		_nsEmbedString_delete(ptr);
+	} finally {
+		lock.unlock();
+	}
+}
+/**
+ * @method flags=cpp
+ * @param ptr cast=(nsEmbedString *)
+ */
+public static final native int _nsEmbedString_Length(int /*long*/ ptr);
+public static final int nsEmbedString_Length(int /*long*/ ptr) {
+	lock.lock();
+	try {
+		return _nsEmbedString_Length(ptr);
+	} finally {
+		lock.unlock();
+	}
+}
+/**
+ * @method flags=cpp
+ * @param ptr cast=(nsEmbedString *)
+ */
+public static final native int /*long*/ _nsEmbedString_get(int /*long*/ ptr);
+public static final int /*long*/ nsEmbedString_get(int /*long*/ ptr) {
+	lock.lock();
+	try {
+		return _nsEmbedString_get(ptr);
+	} finally {
+		lock.unlock();
+	}
+}
+/**
+ * @method flags=cpp
+ * @param ptr cast=(nsIMemory *)
+ * @param size cast=(size_t)
+ */
+public static final native int /*long*/ _nsIMemory_Alloc(int /*long*/ ptr, int size);
+public static final int /*long*/ nsIMemory_Alloc(int /*long*/ ptr, int size) {
+	lock.lock();
+	try {
+		return _nsIMemory_Alloc(ptr, size);
+	} finally {
+		lock.unlock();
+	}
+}
+/**
+ * @method flags=cpp
+ * @param ptr1 cast=(nsIMemory *)
+ * @param ptr2 cast=(void *)
+ * @param size cast=(size_t)
+ */
+public static final native int /*long*/ _nsIMemory_Realloc(int /*long*/ ptr1, int /*long*/ ptr2, int size);
+public static final int /*long*/ nsIMemory_Realloc(int /*long*/ ptr1, int /*long*/ ptr2, int size) {
+	lock.lock();
+	try {
+		return _nsIMemory_Realloc(ptr1, ptr2, size);
+	} finally {
+		lock.unlock();
+	}
+}
+/** @param functionLoad cast=(const nsDynamicFunctionLoad *) */
+public static final native int _XPCOMGlueLoadXULFunctions (int /*long*/ functionLoad);
+public static final int XPCOMGlueLoadXULFunctions (int /*long*/ functionLoad) {
+	lock.lock();
+	try {
+		return _XPCOMGlueLoadXULFunctions(functionLoad);
+	} finally {
+		lock.unlock();
+	}
+}
+/** @param place cast=(const char *) */
+public static final native int _XPCOMGlueStartup(byte[] place);
+public static final int XPCOMGlueStartup(byte[] place) {
+	lock.lock();
+	try {
+		return _XPCOMGlueStartup(place);
+	} finally {
+		lock.unlock();
+	}
+}
+public static final native int _XPCOMGlueShutdown();
+public static final int XPCOMGlueShutdown() {
+	lock.lock();
+	try {
+		return _XPCOMGlueShutdown();
+	} finally {
+		lock.unlock();
+	}
+}
 
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, int arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, int arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long [] arg0, long [] arg1, long [] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[] arg1, int[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[] arg1, long [] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, int[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, long [] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, int[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, int[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, long arg1, long [] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long arg1, long arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, long[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long [] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1, int[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg1, long [] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, nsID arg1, long[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, nsID arg1, int[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, int[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, long[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[] arg1, int[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[] arg1, long[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long[] arg1, int[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, int arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, long arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, char[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, char[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, int arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, int[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, int arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, int arg2);
+public static final native int _Call(int /*long*/ ptr);
+public static final int Call(int /*long*/ ptr) {
+	lock.lock();
+	try {
+		return _Call(ptr);
+	} finally {
+		lock.unlock();
+	}
+}
 
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, nsID arg2, int[] arg3);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long arg1, nsID arg2, long[] arg3);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, int arg2, int[] arg3);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, long arg2, long[] arg3);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long [] arg3);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int[] arg3);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, char[] arg3);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, char[] arg3);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, int arg3);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int arg3);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int[] arg3);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, int[] arg3);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2, int[] arg3);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, int arg3);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, long arg3);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int arg1, nsID arg2, int[] arg3);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long arg1, nsID arg2, long [] arg3);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, int[] arg2, int[] arg3);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, long [] arg2, int[] arg3);
+/**
+ * @param ptr cast=(nsWriteSegmentFun)
+ * @param aInStream cast=(nsIInputStream *)
+ * @param aClosure cast=(void *)
+ * @param aFromSegment cast=(const char *)
+ * @param aWriteCount cast=(PRUint32 *)
+ */
+public static final native int /*long*/ _Call(int /*long*/ ptr, int /*long*/ aInStream, int /*long*/ aClosure, byte[] aFromSegment, int aToOffset, int aCount, int[] aWriteCount);
+public static final int /*long*/ Call(int /*long*/ ptr, int /*long*/ aInStream, int /*long*/ aClosure, byte[] aFromSegment, int aToOffset, int aCount, int[] aWriteCount) {
+	lock.lock();
+	try {
+		return _Call(ptr, aInStream, aClosure, aFromSegment, aToOffset, aCount, aWriteCount);
+	} finally {
+		lock.unlock();
+	}
+}
 
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, int arg2, int arg3, int arg4);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, long arg2, long arg3, long arg4);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int[] arg2, int[] arg3, int[] arg4);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, int arg2, int[] arg3, int[] arg4);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, long arg2, long [] arg3, int[] arg4);
+/**
+ * @param ptr cast=(SWT_XREInitEmbedding)
+ * @param aLibXULDirectory cast=(nsILocalFile *)
+ * @param aAppDirectory cast=(nsILocalFile *)
+ * @param aAppDirProvider cast=(nsIDirectoryServiceProvider *)
+ * @param aStaticComponents cast=(nsStaticModuleInfo const *)
+ */
+public static final native int _Call(int /*long*/ ptr, int /*long*/ aLibXULDirectory, int /*long*/ aAppDirectory, int /*long*/ aAppDirProvider, int /*long*/ aStaticComponents, int aStaticComponentsCount);
+public static final int Call(int /*long*/ ptr, int /*long*/ aLibXULDirectory, int /*long*/ aAppDirectory, int /*long*/ aAppDirProvider, int /*long*/ aStaticComponents, int aStaticComponentsCount) {
+	lock.lock();
+	try {
+		return _Call(ptr, aLibXULDirectory, aAppDirectory, aAppDirProvider, aStaticComponents, aStaticComponentsCount);
+	} finally {
+		lock.unlock();
+	}
+}
 
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, byte[] arg2, byte[] arg3, int arg4, int[] arg5);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, byte[] arg2, byte[] arg3, long arg4, long [] arg5);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2, int arg3, long arg4, int arg5);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, char[] arg2, int arg3, long arg4, int arg5);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2, long arg3, long arg4, long arg5);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, char[] arg2, long arg3, long arg4, long arg5);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, int arg3, int arg4, int arg5);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, int arg3, byte[] arg4, byte[] arg5);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, long arg3, byte[] arg4, byte[] arg5);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, long arg2, long arg3, long arg4, long arg5);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4, int[] arg5);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4, int[] arg5);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, int arg3, int arg4, int[] arg5);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, int arg3, int arg4, long[] arg5);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4, int[] arg5);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int[] arg4, long [] arg5);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2, char[] arg3, int arg4, int [] arg5);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, char[] arg2, char[] arg3, int arg4, long[] arg5);
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl);
+	} finally {
+		lock.unlock();
+	}
+}
 
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int arg3, int[] arg4, int[] arg5, int[] arg6);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int arg3, long[] arg4, int[] arg5, int[] arg6);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3, char[] arg4, int[] arg5, int[] arg6);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long[] arg3, char[] arg4, int[] arg5, int[] arg6);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, int[] arg5, int[] arg6);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, long arg3, char[] arg4, int[] arg5, int[] arg6);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, long arg4, int arg5, int arg6);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6);
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, double arg0);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, double arg0) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, float arg0);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, float arg0) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, float[] arg0);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, float[] arg0) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long[] arg0);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long[] arg0) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0);
+	} finally {
+		lock.unlock();
+	}
+}
 
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3, int[] arg4, char[] arg5, int[] arg6, int[] arg7);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long[] arg3, long [] arg4, char[] arg5, int[] arg6, int[] arg7);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, char[] arg6, int[] arg7, int[] arg8);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, int arg4, long arg5, char[] arg6, int[] arg7, long [] arg8);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int arg3, char[] arg4, char[] arg5, char[] arg6, char[] arg7, int[] arg8, int[] arg9);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int arg3, char[] arg4, char[] arg5, char[] arg6, char[] arg7, int[] arg8, int[] arg9);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int[] arg10, int[] arg11);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int arg3, char[] arg4, long arg5, long arg6, int arg7, long arg8, int arg9, long [] arg10, long [] arg11);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, byte[] arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int[] arg11, int[] arg12);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int arg3, char[] arg4, byte[] arg5, long arg6, long arg7, int arg8, long arg9, int arg10, long [] arg11, long [] arg12);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, int arg14);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, long arg14);
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long [] arg1);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long [] arg1) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int[] arg1);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int[] arg1) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[] arg1);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[] arg1) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long[] arg1);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long[] arg1) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long arg1);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long arg1) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg1);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg1) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[] arg1);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[] arg1) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int arg1);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int arg1) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long arg1);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long arg1) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int[] arg1);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int[] arg1) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long[] arg1);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long[] arg1) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, char[] arg1);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, char[] arg1) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+	} finally {
+		lock.unlock();
+	}
+}
+
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, int arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, int arg2) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, int[] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, int[] arg2) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, long[] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, long[] arg2) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, int arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, int arg2) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long [] arg0, long [] arg1);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long [] arg0, long [] arg1) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int arg2) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, long arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, long arg2) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long [] arg0, long [] arg1, long [] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long [] arg0, long [] arg1, long [] arg2) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+	} finally {
+		lock.unlock();
+	}
+}
+
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, short arg0, int arg1, int arg2, int arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short arg0, int arg1, int arg2, int arg3) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, short arg0, long arg1, int arg2, long arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short arg0, long arg1, int arg2, long arg3) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+	} finally {
+		lock.unlock();
+	}
+}
+
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[] arg1, int[] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[] arg1, int[] arg2) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[] arg1, long [] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[] arg1, long [] arg2) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, int[] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, int[] arg2) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long arg1, int[] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long arg1, int[] arg2) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, long [] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, long [] arg2) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, int[] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, int[] arg2) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, int[] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, int[] arg2) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, long arg1, long [] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, long arg1, long [] arg2) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long arg1, long arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long arg1, long arg2) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, long[] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, long[] arg2) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int[] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int[] arg2) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long[] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long[] arg2) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long [] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long [] arg2) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int[] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int[] arg2) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1, int[] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1, int[] arg2) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg1, long [] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg1, long [] arg2) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, nsID arg1, long[] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, nsID arg1, long[] arg2) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, nsID arg1, int[] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, nsID arg1, int[] arg2) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, int[] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, int[] arg2) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, long[] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, long[] arg2) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[] arg1, int[] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[] arg1, int[] arg2) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[] arg1, long[] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[] arg1, long[] arg2) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long[] arg1, int[] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long[] arg1, int[] arg2) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, int arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, int arg2) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, long arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, long arg2) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, char[] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, char[] arg2) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, char[] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, char[] arg2) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, int arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, int arg2) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, int[] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, int[] arg2) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, long arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, long arg2) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, int arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, int arg2) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, int arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, int arg2) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, short arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, short arg2) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, short arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, short arg2) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+	} finally {
+		lock.unlock();
+	}
+}
+
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, nsID arg2, int[] arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, nsID arg2, int[] arg3) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long arg1, nsID arg2, long[] arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long arg1, nsID arg2, long[] arg3) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, int arg2, int[] arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, int arg2, int[] arg3) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, long arg2, long[] arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, long arg2, long[] arg3) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long [] arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long [] arg3) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int[] arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int[] arg3) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, char[] arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, char[] arg3) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, char[] arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, char[] arg3) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, int arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, int arg3) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int arg3) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int[] arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int[] arg3) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int[] arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int[] arg3) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long[] arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long[] arg3) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, int[] arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, int[] arg3) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2, int[] arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2, int[] arg3) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int[] arg2, int[] arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int[] arg2, int[] arg3) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int[] arg2, long[] arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int[] arg2, long[] arg3) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, int arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, int arg3) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, long arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, long arg3) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int arg1, nsID arg2, int[] arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int arg1, nsID arg2, int[] arg3) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long arg1, nsID arg2, long [] arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long arg1, nsID arg2, long [] arg3) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, int[] arg2, int[] arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, int[] arg2, int[] arg3) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, long [] arg2, int[] arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, long [] arg2, int[] arg3) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2, byte[] arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2, byte[] arg3) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2, byte[] arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2, byte[] arg3) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2, int arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2, int arg3) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2, long arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2, long arg3) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0, int arg1, int[] arg2, int[] arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0, int arg1, int[] arg2, int[] arg3) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0, long arg1, int[] arg2, long[] arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0, long arg1, int[] arg2, long[] arg3) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, int[] arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, int[] arg3) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int[] arg2, int[] arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int[] arg2, int[] arg3) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int[] arg2, int[] arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int[] arg2, int[] arg3) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+	} finally {
+		lock.unlock();
+	}
+}
+
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, int arg2, int arg3, int arg4);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, int arg2, int arg3, int arg4) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, long arg2, long arg3, long arg4);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, long arg2, long arg3, long arg4) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int[] arg2, int[] arg3, int[] arg4);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int[] arg2, int[] arg3, int[] arg4) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, int arg2, int[] arg3, int[] arg4);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, int arg2, int[] arg3, int[] arg4) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, long arg2, long [] arg3, int[] arg4);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, long arg2, long [] arg3, int[] arg4) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2, int arg3, int arg4);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2, int arg3, int arg4) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
+	} finally {
+		lock.unlock();
+	}
+}
+
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2, long arg3, int arg4);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2, long arg3, int arg4) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1, int arg2, int arg3, int[] arg4);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1, int arg2, int arg3, int[] arg4) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg1, long arg2, long arg3, long[] arg4);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg1, long arg2, long arg3, long[] arg4) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long arg2, int arg3, int arg4);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long arg2, int arg3, int arg4) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
+	} finally {
+		lock.unlock();
+	}
+}
+
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, byte[] arg2, byte[] arg3, int arg4, int[] arg5);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, byte[] arg2, byte[] arg3, int arg4, int[] arg5) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, byte[] arg2, byte[] arg3, long arg4, long[] arg5);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, byte[] arg2, byte[] arg3, long arg4, long[] arg5) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2, int arg3, long arg4, int arg5);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2, int arg3, long arg4, int arg5) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, char[] arg2, int arg3, long arg4, int arg5);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, char[] arg2, int arg3, long arg4, int arg5) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2, long arg3, long arg4, long arg5);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2, long arg3, long arg4, long arg5) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, char[] arg2, long arg3, long arg4, long arg5);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, char[] arg2, long arg3, long arg4, long arg5) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2, int[] arg3, int[] arg4, int[] arg5);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2, int[] arg3, int[] arg4, int[] arg5) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+	} finally {
+		lock.unlock();
+	}
+}
+
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long[] arg0, long[] arg1, long[] arg2, long[] arg3, long[] arg4, int[] arg5);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long[] arg0, long[] arg1, long[] arg2, long[] arg3, long[] arg4, int[] arg5) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, int arg3, int arg4, int arg5);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, int arg3, int arg4, int arg5) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int[] arg5);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int [] arg5) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+	} finally {
+		lock.unlock();
+	}
+}
+
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long[] arg5);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long[] arg5) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, int arg3, byte[] arg4, byte[] arg5);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, int arg3, byte[] arg4, byte[] arg5) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, long arg3, byte[] arg4, byte[] arg5);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, long arg3, byte[] arg4, byte[] arg5) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, long arg2, long arg3, long arg4, long arg5);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, long arg2, long arg3, long arg4, long arg5) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4, int[] arg5);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4, int[] arg5) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4, int[] arg5);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4, int[] arg5) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, int arg3, int arg4, int[] arg5);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, int arg3, int arg4, int[] arg5) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, int arg3, int arg4, long[] arg5);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, int arg3, int arg4, long[] arg5) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4, int[] arg5);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4, int[] arg5) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int[] arg4, long [] arg5);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int[] arg4, long [] arg5) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2, char[] arg3, int arg4, int [] arg5);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2, char[] arg3, int arg4, int [] arg5) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, char[] arg2, char[] arg3, int arg4, long[] arg5);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, char[] arg2, char[] arg3, int arg4, long[] arg5) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, byte[] arg3, byte[] arg4, int arg5);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, byte[] arg3, byte[] arg4, int arg5) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, byte[] arg3, byte[] arg4, long arg5);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, byte[] arg3, byte[] arg4, long arg5) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int[] arg3, int[] arg4, int[] arg5);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int[] arg3, int[] arg4, int[] arg5) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long arg2, int[] arg3, int[] arg4, int[] arg5);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long arg2, int[] arg3, int[] arg4, int[] arg5) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+	} finally {
+		lock.unlock();
+	}
+}
+
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int arg3, int[] arg4, int[] arg5, int[] arg6);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int arg3, int[] arg4, int[] arg5, int[] arg6) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int arg3, long[] arg4, int[] arg5, int[] arg6);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int arg3, long[] arg4, int[] arg5, int[] arg6) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3, char[] arg4, int[] arg5, int[] arg6);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3, char[] arg4, int[] arg5, int[] arg6) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long[] arg3, char[] arg4, int[] arg5, int[] arg6);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long[] arg3, char[] arg4, int[] arg5, int[] arg6) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, int[] arg5, int[] arg6);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, int[] arg5, int[] arg6) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, long arg3, char[] arg4, int[] arg5, int[] arg6);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, long arg3, char[] arg4, int[] arg5, int[] arg6) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, long arg4, int arg5, int arg6);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, long arg4, int arg5, int arg6) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4, int[] arg5, int[] arg6);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4, int[] arg5, int[] arg6) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long arg2, long arg3, int[] arg4, int[] arg5, int[] arg6);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long arg2, long arg3, int[] arg4, int[] arg5, int[] arg6) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
+	} finally {
+		lock.unlock();
+	}
+}
+
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3, int[] arg4, char[] arg5, int[] arg6, int[] arg7);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3, int[] arg4, char[] arg5, int[] arg6, int[] arg7) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long[] arg3, long [] arg4, char[] arg5, int[] arg6, int[] arg7);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long[] arg3, long [] arg4, char[] arg5, int[] arg6, int[] arg7) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int[] arg7);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int[] arg7) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6, long[] arg7);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6, long[] arg7) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+	} finally {
+		lock.unlock();
+	}
+}
+
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, char[] arg6, int[] arg7, int[] arg8);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, char[] arg6, int[] arg7, int[] arg8) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, int arg4, long arg5, char[] arg6, int[] arg7, long [] arg8);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, int arg4, long arg5, char[] arg6, int[] arg7, long [] arg8) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int arg3, char[] arg4, char[] arg5, char[] arg6, char[] arg7, int[] arg8, int[] arg9);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int arg3, char[] arg4, char[] arg5, char[] arg6, char[] arg7, int[] arg8, int[] arg9) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int arg3, char[] arg4, char[] arg5, char[] arg6, char[] arg7, int[] arg8, int[] arg9);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int arg3, char[] arg4, char[] arg5, char[] arg6, char[] arg7, int[] arg8, int[] arg9) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int[] arg10, int[] arg11);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int[] arg10, int[] arg11) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int arg3, char[] arg4, long arg5, long arg6, int arg7, long arg8, int arg9, long [] arg10, long [] arg11);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int arg3, char[] arg4, long arg5, long arg6, int arg7, long arg8, int arg9, long [] arg10, long [] arg11) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, byte[] arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int[] arg11, int[] arg12);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, byte[] arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int[] arg11, int[] arg12) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int arg3, char[] arg4, byte[] arg5, long arg6, long arg7, int arg8, long arg9, int arg10, long [] arg11, long [] arg12);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int arg3, char[] arg4, byte[] arg5, long arg6, long arg7, int arg8, long arg9, int arg10, long [] arg11, long [] arg12) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, int arg14);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, int arg14) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14);
+	} finally {
+		lock.unlock();
+	}
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, long arg14);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, long arg14) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14);
+	} finally {
+		lock.unlock();
+	}
+}
+
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOMInit.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOMInit.java
deleted file mode 100644
index 4cd6352..0000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOMInit.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation.  All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * -  Binding to permit interfacing between Mozilla and SWT
- * -  Copyright (C) 2003, 2006 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-import org.eclipse.swt.internal.Platform;
-
-public class XPCOMInit extends Platform {
-	public static final int PATH_MAX = 4096;
-	
-public static final native int GREVersionRange_sizeof ();
-public static final native int GRE_GetGREPathWithProperties (GREVersionRange versions, int versionsLength, int /*long*/ properties, int propertiesLength, int /*long*/ buffer, int buflen);
-public static final native int XPCOMGlueStartup (byte[] place);
-public static final native int XPCOMGlueShutdown ();
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOMObject.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOMObject.java
index 7f67a2f..bc22e54 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOMObject.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOMObject.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
+ * Copyright (c) 2003, 2009 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
@@ -15,28 +15,35 @@
 import org.eclipse.swt.internal.*;
 
 public class XPCOMObject {
-
-	private int /*long*/ ppVtable;
+	static boolean IsSolaris;
+	static {
+		String osName = System.getProperty ("os.name").toLowerCase (); //$NON-NLS-1$
+		IsSolaris = osName.startsWith ("sunos") || osName.startsWith("solaris"); //$NON-NLS-1$
+	}
 	
+	private int /*long*/ ppVtable;
+
 	static private final int MAX_ARG_COUNT = 12;
 	static private final int MAX_VTABLE_LENGTH = 80;
-	static private Callback[][] Callbacks = new Callback[MAX_VTABLE_LENGTH][MAX_ARG_COUNT];
+	static final int OS_OFFSET = IsSolaris ? 2 : 0;
+	static private Callback[][] Callbacks = new Callback[MAX_VTABLE_LENGTH + OS_OFFSET][MAX_ARG_COUNT];
 	static private Hashtable ObjectMap = new Hashtable ();
 	
+	
 public XPCOMObject (int[] argCounts) {
-	int /*long*/[] callbackAddresses = new int /*long*/[argCounts.length];
+	int /*long*/[] callbackAddresses = new int /*long*/[argCounts.length + OS_OFFSET];
 	synchronized (Callbacks) {
-		for (int i = 0, length = argCounts.length; i < length; i++){
-			if ((Callbacks[i][argCounts[i]]) == null) {
-				Callbacks[i][argCounts[i]] = new Callback (getClass (), "callback"+i, argCounts[i] + 1, true, XPCOM.NS_ERROR_FAILURE); //$NON-NLS-1$
+		for (int i = 0, length = argCounts.length; i < length; i++) {
+			if ((Callbacks[i + OS_OFFSET][argCounts[i]]) == null) {
+				Callbacks[i + OS_OFFSET][argCounts[i]] = new Callback (getClass (), "callback"+i, argCounts[i] + 1, true, XPCOM.NS_ERROR_FAILURE); //$NON-NLS-1$
 			}
-			callbackAddresses[i] = Callbacks[i][argCounts[i]].getAddress ();
-			if (callbackAddresses[i] == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
+			callbackAddresses[i + OS_OFFSET] = Callbacks[i + OS_OFFSET][argCounts[i]].getAddress ();
+			if (callbackAddresses[i + OS_OFFSET] == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
 		}
 	}
 
-	int /*long*/ pVtable = C.malloc (C.PTR_SIZEOF * argCounts.length);
-	XPCOM.memmove (pVtable, callbackAddresses, C.PTR_SIZEOF * argCounts.length);
+	int /*long*/ pVtable = C.malloc (C.PTR_SIZEOF * (argCounts.length + OS_OFFSET));
+	XPCOM.memmove (pVtable, callbackAddresses, C.PTR_SIZEOF * (argCounts.length + OS_OFFSET));
 	ppVtable = C.malloc (C.PTR_SIZEOF);
 	XPCOM.memmove (ppVtable, new int /*long*/[] {pVtable}, C.PTR_SIZEOF);
 	ObjectMap.put (new LONG (ppVtable), this);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/GREVersionRange.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/init/GREVersionRange.java
similarity index 71%
rename from bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/GREVersionRange.java
rename to bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/init/GREVersionRange.java
index 70838a0..da361dd0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/GREVersionRange.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/init/GREVersionRange.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
+ * Copyright (c) 2003, 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
@@ -8,12 +8,15 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.swt.internal.mozilla;
+package org.eclipse.swt.internal.mozilla.init;
 
+/** @jniclass flags=cpp */
 public class GREVersionRange {
-    public int /*long*/ lower;
+    /** @field cast=(const char *) */
+	public int /*long*/ lower;
     public boolean lowerInclusive;
-    public int /*long*/ upper;
+    /** @field cast=(const char *) */
+	public int /*long*/ upper;
     public boolean upperInclusive;
     public static final int sizeof = XPCOMInit.GREVersionRange_sizeof();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/init/XPCOMInit.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/init/XPCOMInit.java
new file mode 100644
index 0000000..a746934
--- /dev/null
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/init/XPCOMInit.java
@@ -0,0 +1,71 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2006 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla.init;
+
+import org.eclipse.swt.internal.Platform;
+
+/** @jniclass flags=cpp */
+public class XPCOMInit extends Platform {
+	public static final int PATH_MAX = 4096;
+	
+public static final native int GREVersionRange_sizeof ();
+
+/**
+ * @param versions cast=(const GREVersionRange *)
+ * @param properties cast=(const GREProperty *)
+ * @param buffer cast=(char *)
+ */
+public static final native int _GRE_GetGREPathWithProperties (GREVersionRange versions, int versionsLength, int /*long*/ properties, int propertiesLength, int /*long*/ buffer, int buflen);
+public static final int GRE_GetGREPathWithProperties (GREVersionRange versions, int versionsLength, int /*long*/ properties, int propertiesLength, int /*long*/ buffer, int buflen) {
+	lock.lock();
+	try {
+		return _GRE_GetGREPathWithProperties(versions, versionsLength, properties, propertiesLength, buffer, buflen);
+	} finally {
+		lock.unlock();
+	}
+}
+/** @param place cast=(const char *) */
+public static final native int _XPCOMGlueStartup (byte[] place);
+public static final int XPCOMGlueStartup (byte[] place) {
+	lock.lock();
+	try {
+		return _XPCOMGlueStartup(place);
+	} finally {
+		lock.unlock();
+	}
+}
+public static final native int _XPCOMGlueShutdown ();
+public static final int XPCOMGlueShutdown () {
+	lock.lock();
+	try {
+		return _XPCOMGlueShutdown();
+	} finally {
+		lock.unlock();
+	}
+}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/GREVersionRange.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsDynamicFunctionLoad.java
similarity index 64%
copy from bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/GREVersionRange.java
copy to bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsDynamicFunctionLoad.java
index 70838a0..7857539 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/GREVersionRange.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsDynamicFunctionLoad.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
+ * Copyright (c) 2003, 2009 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
@@ -10,10 +10,9 @@
  *******************************************************************************/
 package org.eclipse.swt.internal.mozilla;
 
-public class GREVersionRange {
-    public int /*long*/ lower;
-    public boolean lowerInclusive;
-    public int /*long*/ upper;
-    public boolean upperInclusive;
-    public static final int sizeof = XPCOMInit.GREVersionRange_sizeof();
+public class nsDynamicFunctionLoad {
+    /** @field cast=(const char *) */
+	public int /*long*/ functionName;
+	/** @field cast=(NSFuncPtr  *) */
+	public int /*long*/ function;
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIAppShell.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIAppShell.java
index 71942b2..9ce7481 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIAppShell.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIAppShell.java
@@ -1,75 +1,75 @@
-/* ***** BEGIN LICENSE BLOCK *****

- * Version: MPL 1.1

- *

- * The contents of this file are subject to the Mozilla Public License Version

- * 1.1 (the "License"); you may not use this file except in compliance with

- * the License. You may obtain a copy of the License at

- * http://www.mozilla.org/MPL/

- *

- * Software distributed under the License is distributed on an "AS IS" basis,

- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

- * for the specific language governing rights and limitations under the

- * License.

- *

- * The Original Code is Mozilla Communicator client code, released March 31, 1998.

- *

- * The Initial Developer of the Original Code is

- * Netscape Communications Corporation.

- * Portions created by Netscape are Copyright (C) 1998-1999

- * Netscape Communications Corporation.  All Rights Reserved.

- *

- * Contributor(s):

- *

- * IBM

- * -  Binding to permit interfacing between Mozilla and SWT

- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.

- *

- * ***** END LICENSE BLOCK ***** */

-package org.eclipse.swt.internal.mozilla;

-

-public class nsIAppShell extends nsISupports {

-

-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 8;

-

-	public static final String NS_IAPPSHELL_IID_STR =

-		"a0757c31-eeac-11d1-9ec1-00aa002fb821";

-

-	public static final nsID NS_IAPPSHELL_IID =

-		new nsID(NS_IAPPSHELL_IID_STR);

-

-	public nsIAppShell(int /*long*/ address) {

-		super(address);

-	}

-

-	public int Create(int /*long*/ argc, int /*long*/[] argv) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), argc, argv);

-	}

-

-	public int Run() {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress());

-	}

-

-	public int Spinup() {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress());

-	}

-

-	public int Spindown() {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress());

-	}

-

-	public int ListenToEventQueue(int /*long*/ aQueue, int aListen) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aQueue, aListen);

-	}

-

-	public int GetNativeEvent(int /*long*/ aRealEvent, int /*long*/[] aEvent) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aRealEvent, aEvent);

-	}

-

-	public int DispatchNativeEvent(int aRealEvent, int /*long*/ aEvent) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aRealEvent, aEvent);

-	}

-

-	public int Exit() {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress());

-	}

-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIAppShell extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 8;
+
+	public static final String NS_IAPPSHELL_IID_STR =
+		"a0757c31-eeac-11d1-9ec1-00aa002fb821";
+
+	public static final nsID NS_IAPPSHELL_IID =
+		new nsID(NS_IAPPSHELL_IID_STR);
+
+	public nsIAppShell(int /*long*/ address) {
+		super(address);
+	}
+
+	public int Create(int /*long*/ argc, int /*long*/[] argv) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), argc, argv);
+	}
+
+	public int Run() {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress());
+	}
+
+	public int Spinup() {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress());
+	}
+
+	public int Spindown() {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress());
+	}
+
+	public int ListenToEventQueue(int /*long*/ aQueue, int aListen) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aQueue, aListen);
+	}
+
+	public int GetNativeEvent(int /*long*/ aRealEvent, int /*long*/[] aEvent) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aRealEvent, aEvent);
+	}
+
+	public int DispatchNativeEvent(int aRealEvent, int /*long*/ aEvent) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aRealEvent, aEvent);
+	}
+
+	public int Exit() {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress());
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIBadCertListener2.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIBadCertListener2.java
new file mode 100644
index 0000000..c89994d
--- /dev/null
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIBadCertListener2.java
@@ -0,0 +1,47 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2009 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIBadCertListener2 extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 1;
+
+	public static final String NS_IBADCERTLISTENER2_IID_STR =
+		"2c3d268c-ad82-49f3-99aa-e9ffddd7a0dc";
+
+	public static final nsID NS_IBADCERTLISTENER2_IID =
+		new nsID(NS_IBADCERTLISTENER2_IID_STR);
+
+	public  nsIBadCertListener2(int /*long*/ address) {
+		super(address);
+	}
+
+	public int NotifyCertProblem(int /*long*/ socketInfo, int /*long*/ status, int /*long*/ targetSite, int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), socketInfo, status, targetSite, _retval);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIBaseWindow.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIBaseWindow.java
index 958916d..23c915b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIBaseWindow.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIBaseWindow.java
@@ -1,139 +1,139 @@
-/* ***** BEGIN LICENSE BLOCK *****

- * Version: MPL 1.1

- *

- * The contents of this file are subject to the Mozilla Public License Version

- * 1.1 (the "License"); you may not use this file except in compliance with

- * the License. You may obtain a copy of the License at

- * http://www.mozilla.org/MPL/

- *

- * Software distributed under the License is distributed on an "AS IS" basis,

- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

- * for the specific language governing rights and limitations under the

- * License.

- *

- * The Original Code is Mozilla Communicator client code, released March 31, 1998.

- *

- * The Initial Developer of the Original Code is

- * Netscape Communications Corporation.

- * Portions created by Netscape are Copyright (C) 1998-1999

- * Netscape Communications Corporation.  All Rights Reserved.

- *

- * Contributor(s):

- *

- * IBM

- * -  Binding to permit interfacing between Mozilla and SWT

- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.

- *

- * ***** END LICENSE BLOCK ***** */

-package org.eclipse.swt.internal.mozilla;

-

-public class nsIBaseWindow extends nsISupports {

-

-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 24;

-

-	public static final String NS_IBASEWINDOW_IID_STR =

-		"046bc8a0-8015-11d3-af70-00a024ffc08c";

-

-	public static final nsID NS_IBASEWINDOW_IID =

-		new nsID(NS_IBASEWINDOW_IID_STR);

-

-	public nsIBaseWindow(int /*long*/ address) {

-		super(address);

-	}

-

-	public int InitWindow(int /*long*/ parentNativeWindow, int /*long*/ parentWidget, int x, int y, int cx, int cy) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), parentNativeWindow, parentWidget, x, y, cx, cy);

-	}

-

-	public int Create() {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress());

-	}

-

-	public int Destroy() {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress());

-	}

-

-	public int SetPosition(int x, int y) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), x, y);

-	}

-

-	public int GetPosition(int[] x, int[] y) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), x, y);

-	}

-

-	public int SetSize(int cx, int cy, int fRepaint) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), cx, cy, fRepaint);

-	}

-

-	public int GetSize(int[] cx, int[] cy) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), cx, cy);

-	}

-

-	public int SetPositionAndSize(int x, int y, int cx, int cy, int fRepaint) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), x, y, cx, cy, fRepaint);

-	}

-

-	public int GetPositionAndSize(int[] x, int[] y, int[] cx, int[] cy) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), x, y, cx, cy);

-	}

-

-	public int Repaint(int force) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), force);

-	}

-

-	public int GetParentWidget(int /*long*/[] aParentWidget) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aParentWidget);

-	}

-

-	public int SetParentWidget(int /*long*/ aParentWidget) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aParentWidget);

-	}

-

-	public int GetParentNativeWindow(int /*long*/[] aParentNativeWindow) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aParentNativeWindow);

-	}

-

-	public int SetParentNativeWindow(int /*long*/ aParentNativeWindow) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aParentNativeWindow);

-	}

-

-	public int GetVisibility(int[] aVisibility) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aVisibility);

-	}

-

-	public int SetVisibility(int aVisibility) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aVisibility);

-	}

-

-	public int GetEnabled(int[] aEnabled) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aEnabled);

-	}

-

-	public int SetEnabled(int aEnabled) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aEnabled);

-	}

-

-	public int GetBlurSuppression(int[] aBlurSuppression) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), aBlurSuppression);

-	}

-

-	public int SetBlurSuppression(int aBlurSuppression) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), aBlurSuppression);

-	}

-

-	public int GetMainWidget(int /*long*/[] aMainWidget) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), aMainWidget);

-	}

-

-	public int SetFocus() {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress());

-	}

-

-	public int GetTitle(int /*long*/[] aTitle) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), aTitle);

-	}

-

-	public int SetTitle(char[] aTitle) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), aTitle);

-	}

-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIBaseWindow extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 24;
+
+	public static final String NS_IBASEWINDOW_IID_STR =
+		"046bc8a0-8015-11d3-af70-00a024ffc08c";
+
+	public static final nsID NS_IBASEWINDOW_IID =
+		new nsID(NS_IBASEWINDOW_IID_STR);
+
+	public nsIBaseWindow(int /*long*/ address) {
+		super(address);
+	}
+
+	public int InitWindow(int /*long*/ parentNativeWindow, int /*long*/ parentWidget, int x, int y, int cx, int cy) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), parentNativeWindow, parentWidget, x, y, cx, cy);
+	}
+
+	public int Create() {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress());
+	}
+
+	public int Destroy() {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress());
+	}
+
+	public int SetPosition(int x, int y) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), x, y);
+	}
+
+	public int GetPosition(int[] x, int[] y) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), x, y);
+	}
+
+	public int SetSize(int cx, int cy, int fRepaint) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), cx, cy, fRepaint);
+	}
+
+	public int GetSize(int[] cx, int[] cy) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), cx, cy);
+	}
+
+	public int SetPositionAndSize(int x, int y, int cx, int cy, int fRepaint) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), x, y, cx, cy, fRepaint);
+	}
+
+	public int GetPositionAndSize(int[] x, int[] y, int[] cx, int[] cy) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), x, y, cx, cy);
+	}
+
+	public int Repaint(int force) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), force);
+	}
+
+	public int GetParentWidget(int /*long*/[] aParentWidget) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aParentWidget);
+	}
+
+	public int SetParentWidget(int /*long*/ aParentWidget) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aParentWidget);
+	}
+
+	public int GetParentNativeWindow(int /*long*/[] aParentNativeWindow) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aParentNativeWindow);
+	}
+
+	public int SetParentNativeWindow(int /*long*/ aParentNativeWindow) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aParentNativeWindow);
+	}
+
+	public int GetVisibility(int[] aVisibility) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aVisibility);
+	}
+
+	public int SetVisibility(int aVisibility) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aVisibility);
+	}
+
+	public int GetEnabled(int[] aEnabled) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aEnabled);
+	}
+
+	public int SetEnabled(int aEnabled) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aEnabled);
+	}
+
+	public int GetBlurSuppression(int[] aBlurSuppression) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), aBlurSuppression);
+	}
+
+	public int SetBlurSuppression(int aBlurSuppression) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), aBlurSuppression);
+	}
+
+	public int GetMainWidget(int /*long*/[] aMainWidget) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), aMainWidget);
+	}
+
+	public int SetFocus() {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress());
+	}
+
+	public int GetTitle(int /*long*/[] aTitle) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), aTitle);
+	}
+
+	public int SetTitle(char[] aTitle) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), aTitle);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICategoryManager.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICategoryManager.java
index 7e49f85..8417352 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICategoryManager.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICategoryManager.java
@@ -1,67 +1,67 @@
-/* ***** BEGIN LICENSE BLOCK *****

- * Version: MPL 1.1

- *

- * The contents of this file are subject to the Mozilla Public License Version

- * 1.1 (the "License"); you may not use this file except in compliance with

- * the License. You may obtain a copy of the License at

- * http://www.mozilla.org/MPL/

- *

- * Software distributed under the License is distributed on an "AS IS" basis,

- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

- * for the specific language governing rights and limitations under the

- * License.

- *

- * The Original Code is Mozilla Communicator client code, released March 31, 1998.

- *

- * The Initial Developer of the Original Code is

- * Netscape Communications Corporation.

- * Portions created by Netscape are Copyright (C) 1998-1999

- * Netscape Communications Corporation.  All Rights Reserved.

- *

- * Contributor(s):

- *

- * IBM

- * -  Binding to permit interfacing between Mozilla and SWT

- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.

- *

- * ***** END LICENSE BLOCK ***** */

-package org.eclipse.swt.internal.mozilla;

-

-public class nsICategoryManager extends nsISupports {

-

-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 6;

-

-	public static final String NS_ICATEGORYMANAGER_IID_STR =

-		"3275b2cd-af6d-429a-80d7-f0c5120342ac";

-

-	public static final nsID NS_ICATEGORYMANAGER_IID =

-		new nsID(NS_ICATEGORYMANAGER_IID_STR);

-

-	public nsICategoryManager(int /*long*/ address) {

-		super(address);

-	}

-

-	public int GetCategoryEntry(byte[] aCategory, byte[] aEntry, int /*long*/[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aCategory, aEntry, _retval);

-	}

-

-	public int AddCategoryEntry(byte[] aCategory, byte[] aEntry, byte[] aValue, int aPersist, int aReplace, int /*long*/[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aCategory, aEntry, aValue, aPersist, aReplace, _retval);

-	}

-

-	public int DeleteCategoryEntry(byte[] aCategory, byte[] aEntry, int aPersist) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aCategory, aEntry, aPersist);

-	}

-

-	public int DeleteCategory(byte[] aCategory) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aCategory);

-	}

-

-	public int EnumerateCategory(byte[] aCategory, int /*long*/[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aCategory, _retval);

-	}

-

-	public int EnumerateCategories(int /*long*/[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), _retval);

-	}

-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsICategoryManager extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 6;
+
+	public static final String NS_ICATEGORYMANAGER_IID_STR =
+		"3275b2cd-af6d-429a-80d7-f0c5120342ac";
+
+	public static final nsID NS_ICATEGORYMANAGER_IID =
+		new nsID(NS_ICATEGORYMANAGER_IID_STR);
+
+	public nsICategoryManager(int /*long*/ address) {
+		super(address);
+	}
+
+	public int GetCategoryEntry(byte[] aCategory, byte[] aEntry, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aCategory, aEntry, _retval);
+	}
+
+	public int AddCategoryEntry(byte[] aCategory, byte[] aEntry, byte[] aValue, int aPersist, int aReplace, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aCategory, aEntry, aValue, aPersist, aReplace, _retval);
+	}
+
+	public int DeleteCategoryEntry(byte[] aCategory, byte[] aEntry, int aPersist) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aCategory, aEntry, aPersist);
+	}
+
+	public int DeleteCategory(byte[] aCategory) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aCategory);
+	}
+
+	public int EnumerateCategory(byte[] aCategory, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aCategory, _retval);
+	}
+
+	public int EnumerateCategories(int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), _retval);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICertOverrideService.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICertOverrideService.java
new file mode 100644
index 0000000..86507c6
--- /dev/null
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICertOverrideService.java
@@ -0,0 +1,73 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2009 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsICertOverrideService extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 6;
+
+	public static final String NS_ICERTOVERRIDESERVICE_IID_STR =
+		"31738d2a-77d3-4359-84c9-4be2f38fb8c5";
+
+	public static final nsID NS_ICERTOVERRIDESERVICE_IID =
+		new nsID(NS_ICERTOVERRIDESERVICE_IID_STR);
+
+	public  nsICertOverrideService(int /*long*/ address) {
+		super(address);
+	}
+
+	public static final int ERROR_UNTRUSTED = 1;
+
+	public static final int ERROR_MISMATCH = 2;
+
+	public static final int ERROR_TIME = 4;
+
+	public int RememberValidityOverride(int /*long*/ aHostName, int aPort, int /*long*/ aCert, int aOverrideBits, int aTemporary) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aHostName, aPort, aCert, aOverrideBits, aTemporary);
+	}
+
+	public int HasMatchingOverride(int /*long*/ aHostName, int aPort, int /*long*/ aCert, int[] aOverrideBits, int[] aIsTemporary, int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aHostName, aPort, aCert, aOverrideBits, aIsTemporary, _retval);
+	}
+
+	public int GetValidityOverride(int /*long*/ aHostName, int aPort, int /*long*/ aHashAlg, int /*long*/ aFingerprint, int[] aOverrideBits, int[] aIsTemporary, int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aHostName, aPort, aHashAlg, aFingerprint, aOverrideBits, aIsTemporary, _retval);
+	}
+
+	public int ClearValidityOverride(int /*long*/ aHostName, int aPort) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aHostName, aPort);
+	}
+
+	public int GetAllOverrideHostsWithPorts(int[] aCount, int /*long*/[] aHostsWithPortsArray) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aCount, aHostsWithPortsArray);
+	}
+
+	public int IsCertUsedForOverrides(int /*long*/ aCert, int aCheckTemporaries, int aCheckPermanents, int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aCert, aCheckTemporaries, aCheckPermanents, _retval);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICertificateDialogs.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICertificateDialogs.java
new file mode 100644
index 0000000..6faa4b8
--- /dev/null
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICertificateDialogs.java
@@ -0,0 +1,67 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2009 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsICertificateDialogs extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 6;
+
+	public static final String NS_ICERTIFICATEDIALOGS_IID_STR =
+		"a03ca940-09be-11d5-ac5d-000064657374";
+
+	public static final nsID NS_ICERTIFICATEDIALOGS_IID =
+		new nsID(NS_ICERTIFICATEDIALOGS_IID_STR);
+
+	public nsICertificateDialogs(int /*long*/ address) {
+		super(address);
+	}
+
+	public int ConfirmDownloadCACert(int /*long*/ ctx, int /*long*/ cert, int[] trust, int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), ctx, cert, trust, _retval);
+	}
+
+	public int NotifyCACertExists(int /*long*/ ctx) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), ctx);
+	}
+
+	public int SetPKCS12FilePassword(int /*long*/ ctx, int /*long*/ password, int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), ctx, password, _retval);
+	}
+
+	public int GetPKCS12FilePassword(int /*long*/ ctx, int /*long*/ password, int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), ctx, password, _retval);
+	}
+
+	public int ViewCert(int /*long*/ ctx, int /*long*/ cert) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), ctx, cert);
+	}
+
+	public int CrlImportStatusDialog(int /*long*/ ctx, int /*long*/ crl) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), ctx, crl);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIClassInfo.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIClassInfo.java
new file mode 100644
index 0000000..180f721
--- /dev/null
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIClassInfo.java
@@ -0,0 +1,91 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIClassInfo extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 8;
+
+	public static final String NS_ICLASSINFO_IID_STR =
+		"986c11d0-f340-11d4-9075-0010a4e73d9a";
+
+	public static final nsID NS_ICLASSINFO_IID =
+		new nsID(NS_ICLASSINFO_IID_STR);
+
+	public nsIClassInfo(int /*long*/ address) {
+		super(address);
+	}
+
+	public int GetInterfaces(int[] count, int /*long*/[] array) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), count, array);
+	}
+
+	public int GetHelperForLanguage(int language, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), language, _retval);
+	}
+
+	public int GetContractID(int /*long*/[] aContractID) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aContractID);
+	}
+
+	public int GetClassDescription(int /*long*/[] aClassDescription) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aClassDescription);
+	}
+
+	public int GetClassID(int /*long*/ aClassID) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aClassID);
+	}
+
+	public int GetImplementationLanguage(int[] aImplementationLanguage) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aImplementationLanguage);
+	}
+
+	public static final int SINGLETON = 1;
+
+	public static final int THREADSAFE = 2;
+
+	public static final int MAIN_THREAD_ONLY = 4;
+
+	public static final int DOM_OBJECT = 8;
+
+	public static final int PLUGIN_OBJECT = 16;
+
+	public static final int EAGER_CLASSINFO = 32;
+
+	public static final int CONTENT_NODE = 64;
+
+//	public static final int RESERVED = 2147483648;
+
+	public int GetFlags(int[] aFlags) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aFlags);
+	}
+
+	public int GetClassIDNoAlloc(int /*long*/ aClassIDNoAlloc) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aClassIDNoAlloc);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java
index 8f0032f..6ff0cff 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java
@@ -1,91 +1,91 @@
-/* ***** BEGIN LICENSE BLOCK *****

- * Version: MPL 1.1

- *

- * The contents of this file are subject to the Mozilla Public License Version

- * 1.1 (the "License"); you may not use this file except in compliance with

- * the License. You may obtain a copy of the License at

- * http://www.mozilla.org/MPL/

- *

- * Software distributed under the License is distributed on an "AS IS" basis,

- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

- * for the specific language governing rights and limitations under the

- * License.

- *

- * The Original Code is Mozilla Communicator client code, released March 31, 1998.

- *

- * The Initial Developer of the Original Code is

- * Netscape Communications Corporation.

- * Portions created by Netscape are Copyright (C) 1998-1999

- * Netscape Communications Corporation.  All Rights Reserved.

- *

- * Contributor(s):

- *

- * IBM

- * -  Binding to permit interfacing between Mozilla and SWT

- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.

- *

- * ***** END LICENSE BLOCK ***** */

-package org.eclipse.swt.internal.mozilla;

-

-public class nsIComponentRegistrar extends nsISupports {

-

-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 12;

-

-	public static final String NS_ICOMPONENTREGISTRAR_IID_STR =

-		"2417cbfe-65ad-48a6-b4b6-eb84db174392";

-

-	public static final nsID NS_ICOMPONENTREGISTRAR_IID =

-		new nsID(NS_ICOMPONENTREGISTRAR_IID_STR);

-

-	public nsIComponentRegistrar(int /*long*/ address) {

-		super(address);

-	}

-

-	public int AutoRegister(int /*long*/ aSpec) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aSpec);

-	}

-

-	public int AutoUnregister(int /*long*/ aSpec) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSpec);

-	}

-

-	public int RegisterFactory(nsID aClass, byte[] aClassName, byte[] aContractID, int /*long*/ aFactory) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aClass, aClassName, aContractID, aFactory);

-	}

-

-	public int UnregisterFactory(nsID aClass, int /*long*/ aFactory) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aClass, aFactory);

-	}

-

-	public int RegisterFactoryLocation(nsID aClass, byte[] aClassName, byte[] aContractID, int /*long*/ aFile, byte[] aLoaderStr, byte[] aType) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aClass, aClassName, aContractID, aFile, aLoaderStr, aType);

-	}

-

-	public int UnregisterFactoryLocation(nsID aClass, int /*long*/ aFile) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aClass, aFile);

-	}

-

-	public int IsCIDRegistered(nsID aClass, int[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aClass, _retval);

-	}

-

-	public int IsContractIDRegistered(byte[] aContractID, int[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aContractID, _retval);

-	}

-

-	public int EnumerateCIDs(int /*long*/[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), _retval);

-	}

-

-	public int EnumerateContractIDs(int /*long*/[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), _retval);

-	}

-

-	public int CIDToContractID(nsID aClass, int /*long*/[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aClass, _retval);

-	}

-

-	public int ContractIDToCID(byte[] aContractID, int /*long*/ _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aContractID, _retval);

-	}

-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIComponentRegistrar extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 12;
+
+	public static final String NS_ICOMPONENTREGISTRAR_IID_STR =
+		"2417cbfe-65ad-48a6-b4b6-eb84db174392";
+
+	public static final nsID NS_ICOMPONENTREGISTRAR_IID =
+		new nsID(NS_ICOMPONENTREGISTRAR_IID_STR);
+
+	public nsIComponentRegistrar(int /*long*/ address) {
+		super(address);
+	}
+
+	public int AutoRegister(int /*long*/ aSpec) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aSpec);
+	}
+
+	public int AutoUnregister(int /*long*/ aSpec) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSpec);
+	}
+
+	public int RegisterFactory(nsID aClass, byte[] aClassName, byte[] aContractID, int /*long*/ aFactory) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aClass, aClassName, aContractID, aFactory);
+	}
+
+	public int UnregisterFactory(nsID aClass, int /*long*/ aFactory) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aClass, aFactory);
+	}
+
+	public int RegisterFactoryLocation(nsID aClass, byte[] aClassName, byte[] aContractID, int /*long*/ aFile, byte[] aLoaderStr, byte[] aType) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aClass, aClassName, aContractID, aFile, aLoaderStr, aType);
+	}
+
+	public int UnregisterFactoryLocation(nsID aClass, int /*long*/ aFile) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aClass, aFile);
+	}
+
+	public int IsCIDRegistered(nsID aClass, int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aClass, _retval);
+	}
+
+	public int IsContractIDRegistered(byte[] aContractID, int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aContractID, _retval);
+	}
+
+	public int EnumerateCIDs(int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), _retval);
+	}
+
+	public int EnumerateContractIDs(int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), _retval);
+	}
+
+	public int CIDToContractID(nsID aClass, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aClass, _retval);
+	}
+
+	public int ContractIDToCID(byte[] aContractID, int /*long*/ _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aContractID, _retval);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookie.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookie.java
index 5f0f734..77eb6d2 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookie.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookie.java
@@ -1,101 +1,101 @@
-/* ***** BEGIN LICENSE BLOCK *****

- * Version: MPL 1.1

- *

- * The contents of this file are subject to the Mozilla Public License Version

- * 1.1 (the "License"); you may not use this file except in compliance with

- * the License. You may obtain a copy of the License at

- * http://www.mozilla.org/MPL/

- *

- * Software distributed under the License is distributed on an "AS IS" basis,

- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

- * for the specific language governing rights and limitations under the

- * License.

- *

- * The Original Code is Mozilla Communicator client code, released March 31, 1998.

- *

- * The Initial Developer of the Original Code is

- * Netscape Communications Corporation.

- * Portions created by Netscape are Copyright (C) 1998-1999

- * Netscape Communications Corporation.  All Rights Reserved.

- *

- * Contributor(s):

- *

- * IBM

- * -  Binding to permit interfacing between Mozilla and SWT

- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.

- *

- * ***** END LICENSE BLOCK ***** */

-package org.eclipse.swt.internal.mozilla;

-

-public class nsICookie extends nsISupports {

-

-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 9;

-

-	public static final String NS_ICOOKIE_IID_STR =

-		"e9fcb9a4-d376-458f-b720-e65e7df593bc";

-

-	public static final nsID NS_ICOOKIE_IID =

-		new nsID(NS_ICOOKIE_IID_STR);

-

-	public nsICookie(int /*long*/ address) {

-		super(address);

-	}

-

-	public int GetName(int /*long*/ aName) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aName);

-	}

-

-	public int GetValue(int /*long*/ aValue) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aValue);

-	}

-

-	public int GetIsDomain(int[] aIsDomain) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aIsDomain);

-	}

-

-	public int GetHost(int /*long*/ aHost) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aHost);

-	}

-

-	public int GetPath(int /*long*/ aPath) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aPath);

-	}

-

-	public int GetIsSecure(int[] aIsSecure) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aIsSecure);

-	}

-

+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsICookie extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 9;
+
+	public static final String NS_ICOOKIE_IID_STR =
+		"e9fcb9a4-d376-458f-b720-e65e7df593bc";
+
+	public static final nsID NS_ICOOKIE_IID =
+		new nsID(NS_ICOOKIE_IID_STR);
+
+	public nsICookie(int /*long*/ address) {
+		super(address);
+	}
+
+	public int GetName(int /*long*/ aName) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aName);
+	}
+
+	public int GetValue(int /*long*/ aValue) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aValue);
+	}
+
+	public int GetIsDomain(int[] aIsDomain) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aIsDomain);
+	}
+
+	public int GetHost(int /*long*/ aHost) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aHost);
+	}
+
+	public int GetPath(int /*long*/ aPath) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aPath);
+	}
+
+	public int GetIsSecure(int[] aIsSecure) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aIsSecure);
+	}
+
 	public int GetExpires(long[] aExpires) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aExpires);

-	}

-

-	public static final int STATUS_UNKNOWN = 0;

-

-	public static final int STATUS_ACCEPTED = 1;

-

-	public static final int STATUS_DOWNGRADED = 2;

-

-	public static final int STATUS_FLAGGED = 3;

-

-	public static final int STATUS_REJECTED = 4;

-

-	public int GetStatus(int /*long*/ aStatus) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aStatus);

-	}

-

-	public static final int POLICY_UNKNOWN = 0;

-

-	public static final int POLICY_NONE = 1;

-

-	public static final int POLICY_NO_CONSENT = 2;

-

-	public static final int POLICY_IMPLICIT_CONSENT = 3;

-

-	public static final int POLICY_EXPLICIT_CONSENT = 4;

-

-	public static final int POLICY_NO_II = 5;

-

-	public int GetPolicy(int /*long*/ aPolicy) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPolicy);

-	}

-}
\ No newline at end of file
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aExpires);
+	}
+
+	public static final int STATUS_UNKNOWN = 0;
+
+	public static final int STATUS_ACCEPTED = 1;
+
+	public static final int STATUS_DOWNGRADED = 2;
+
+	public static final int STATUS_FLAGGED = 3;
+
+	public static final int STATUS_REJECTED = 4;
+
+	public int GetStatus(int /*long*/ aStatus) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aStatus);
+	}
+
+	public static final int POLICY_UNKNOWN = 0;
+
+	public static final int POLICY_NONE = 1;
+
+	public static final int POLICY_NO_CONSENT = 2;
+
+	public static final int POLICY_IMPLICIT_CONSENT = 3;
+
+	public static final int POLICY_EXPLICIT_CONSENT = 4;
+
+	public static final int POLICY_NO_II = 5;
+
+	public int GetPolicy(int /*long*/ aPolicy) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPolicy);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookieManager.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookieManager.java
index cda96b1..a925dd8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookieManager.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookieManager.java
@@ -1,55 +1,55 @@
-/* ***** BEGIN LICENSE BLOCK *****

- * Version: MPL 1.1

- *

- * The contents of this file are subject to the Mozilla Public License Version

- * 1.1 (the "License"); you may not use this file except in compliance with

- * the License. You may obtain a copy of the License at

- * http://www.mozilla.org/MPL/

- *

- * Software distributed under the License is distributed on an "AS IS" basis,

- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

- * for the specific language governing rights and limitations under the

- * License.

- *

- * The Original Code is Mozilla Communicator client code, released March 31, 1998.

- *

- * The Initial Developer of the Original Code is

- * Netscape Communications Corporation.

- * Portions created by Netscape are Copyright (C) 1998-1999

- * Netscape Communications Corporation.  All Rights Reserved.

- *

- * Contributor(s):

- *

- * IBM

- * -  Binding to permit interfacing between Mozilla and SWT

- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.

- *

- * ***** END LICENSE BLOCK ***** */

-package org.eclipse.swt.internal.mozilla;

-

-public class nsICookieManager extends nsISupports {

-

-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 3;

-

-	public static final String NS_ICOOKIEMANAGER_IID_STR =

-		"aaab6710-0f2c-11d5-a53b-0010a401eb10";

-

-	public static final nsID NS_ICOOKIEMANAGER_IID =

-		new nsID(NS_ICOOKIEMANAGER_IID_STR);

-

-	public nsICookieManager(int /*long*/ address) {

-		super(address);

-	}

-

-	public int RemoveAll() {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress());

-	}

-

-	public int GetEnumerator(int /*long*/[] aEnumerator) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aEnumerator);

-	}

-

-	public int Remove(int /*long*/ aDomain, int /*long*/ aName, int /*long*/ aPath, int aBlocked) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aDomain, aName, aPath, aBlocked);

-	}

-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsICookieManager extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 3;
+
+	public static final String NS_ICOOKIEMANAGER_IID_STR =
+		"aaab6710-0f2c-11d5-a53b-0010a401eb10";
+
+	public static final nsID NS_ICOOKIEMANAGER_IID =
+		new nsID(NS_ICOOKIEMANAGER_IID_STR);
+
+	public nsICookieManager(int /*long*/ address) {
+		super(address);
+	}
+
+	public int RemoveAll() {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress());
+	}
+
+	public int GetEnumerator(int /*long*/[] aEnumerator) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aEnumerator);
+	}
+
+	public int Remove(int /*long*/ aDomain, int /*long*/ aName, int /*long*/ aPath, int aBlocked) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aDomain, aName, aPath, aBlocked);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookieService.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookieService.java
new file mode 100644
index 0000000..7c9e80d
--- /dev/null
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookieService.java
@@ -0,0 +1,64 @@
+package org.eclipse.swt.internal.mozilla;
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+
+public class nsICookieService extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 5;
+
+	public static final String NS_ICOOKIESERVICE_IID_STR =
+		"011c3190-1434-11d6-a618-0010a401eb10";
+
+	public static final nsID NS_ICOOKIESERVICE_IID =
+		new nsID(NS_ICOOKIESERVICE_IID_STR);
+
+	public nsICookieService(int /*long*/ address) {
+		super(address);
+	}
+
+	public int GetCookieString(int /*long*/ aURI, int /*long*/ aChannel, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aURI, aChannel, _retval);
+	}
+
+	public int GetCookieStringFromHttp(int /*long*/ aURI, int /*long*/ aFirstURI, int /*long*/ aChannel, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aURI, aFirstURI, aChannel, _retval);
+	}
+
+	public int SetCookieString(int /*long*/ aURI, int /*long*/ aPrompt, byte[] aCookie, int /*long*/ aChannel) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aURI, aPrompt, aCookie, aChannel);
+	}
+
+	public int SetCookieStringFromHttp(int /*long*/ aURI, int /*long*/ aFirstURI, int /*long*/ aPrompt, byte[] aCookie, byte[] aServerTime, int /*long*/ aChannel) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aURI, aFirstURI, aPrompt, aCookie, aServerTime, aChannel);
+	}
+
+	public int GetCookieIconIsVisible(int[] aCookieIconIsVisible) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aCookieIconIsVisible);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookieService_1_9.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookieService_1_9.java
new file mode 100644
index 0000000..429bba2
--- /dev/null
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookieService_1_9.java
@@ -0,0 +1,59 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class  nsICookieService_1_9 extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 4;
+
+	public static final String NS_ICOOKIESERVICE_IID_STR =
+		"2aaa897a-293c-4d2b-a657-8c9b7136996d";
+
+	public static final nsID NS_ICOOKIESERVICE_IID =
+		new nsID(NS_ICOOKIESERVICE_IID_STR);
+
+	public  nsICookieService_1_9(int /*long*/ address) {
+		super(address);
+	}
+
+	public int GetCookieString(int /*long*/ aURI, int /*long*/ aChannel, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aURI, aChannel, _retval);
+	}
+
+	public int GetCookieStringFromHttp(int /*long*/ aURI, int /*long*/ aFirstURI, int /*long*/ aChannel, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aURI, aFirstURI, aChannel, _retval);
+	}
+
+	public int SetCookieString(int /*long*/ aURI, int /*long*/ aPrompt, byte[] aCookie, int /*long*/ aChannel) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aURI, aPrompt, aCookie, aChannel);
+	}
+
+	public int SetCookieStringFromHttp(int /*long*/ aURI, int /*long*/ aFirstURI, int /*long*/ aPrompt, byte[] aCookie, byte[] aServerTime, int /*long*/ aChannel) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aURI, aFirstURI, aPrompt, aCookie, aServerTime, aChannel);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsID.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsID.java
index d92dbcf..a5fd6d8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsID.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsID.java
@@ -27,6 +27,7 @@
  * ***** END LICENSE BLOCK ***** */
 package org.eclipse.swt.internal.mozilla;
 
+/** @jniclass flags=cpp */
 public class nsID {
 	
 	public int m0;
@@ -43,18 +44,18 @@
 }
 
 public boolean Equals(nsID other) {
-	int /*long*/ ptr = XPCOM.nsID_new();
-	XPCOM.memmove(ptr, this, nsID.sizeof);
-	int /*long*/ otherPtr = XPCOM.nsID_new();
-	XPCOM.memmove(otherPtr, other, nsID.sizeof);
-	boolean result = XPCOM.nsID_Equals(ptr, otherPtr) != 0;
-	XPCOM.nsID_delete(ptr);
-	XPCOM.nsID_delete(otherPtr);
+	int /*long*/ ptr = XPCOM.nsID_new ();
+	XPCOM.memmove (ptr, this, nsID.sizeof);
+	int /*long*/ otherPtr = XPCOM.nsID_new ();
+	XPCOM.memmove (otherPtr, other, nsID.sizeof);
+	boolean result = XPCOM.nsID_Equals (ptr, otherPtr) != 0;
+	XPCOM.nsID_delete (ptr);
+	XPCOM.nsID_delete (otherPtr);
 	return result;
 }
 
 public void Parse (String aIDStr) {
-	if(aIDStr == null) throw new Error ();
+	if (aIDStr == null) throw new Error ();
 	int i = 0;
 	for (; i < 8; i++) m0 = (m0 << 4) + Integer.parseInt (aIDStr.substring (i, i + 1), 16);
 	if (aIDStr.charAt (i++) != '-') throw new Error ();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java
index 755a708..b07be67 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java
@@ -1,89 +1,89 @@
-/* ***** BEGIN LICENSE BLOCK *****

- * Version: MPL 1.1

- *

- * The contents of this file are subject to the Mozilla Public License Version

- * 1.1 (the "License"); you may not use this file except in compliance with

- * the License. You may obtain a copy of the License at

- * http://www.mozilla.org/MPL/

- *

- * Software distributed under the License is distributed on an "AS IS" basis,

- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

- * for the specific language governing rights and limitations under the

- * License.

- *

- * The Original Code is Mozilla Communicator client code, released March 31, 1998.

- *

- * The Initial Developer of the Original Code is

- * Netscape Communications Corporation.

- * Portions created by Netscape are Copyright (C) 1998-1999

- * Netscape Communications Corporation.  All Rights Reserved.

- *

- * Contributor(s):

- *

- * IBM

- * -  Binding to permit interfacing between Mozilla and SWT

- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.

- *

- * ***** END LICENSE BLOCK ***** */

-package org.eclipse.swt.internal.mozilla;

-

-public class nsIDOMEvent extends nsISupports {

-

-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 10;

-

-	public static final String NS_IDOMEVENT_IID_STR =

-		"a66b7b80-ff46-bd97-0080-5f8ae38add32";

-

-	public static final nsID NS_IDOMEVENT_IID =

-		new nsID(NS_IDOMEVENT_IID_STR);

-

-	public nsIDOMEvent(int /*long*/ address) {

-		super(address);

-	}

-

-	public static final int CAPTURING_PHASE = 1;

-

-	public static final int AT_TARGET = 2;

-

-	public static final int BUBBLING_PHASE = 3;

-

-	public int GetType(int /*long*/ aType) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aType);

-	}

-

-	public int GetTarget(int /*long*/[] aTarget) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aTarget);

-	}

-

-	public int GetCurrentTarget(int /*long*/[] aCurrentTarget) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aCurrentTarget);

-	}

-

-	public int GetEventPhase(short[] aEventPhase) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aEventPhase);

-	}

-

-	public int GetBubbles(int[] aBubbles) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aBubbles);

-	}

-

-	public int GetCancelable(int[] aCancelable) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aCancelable);

-	}

-

+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIDOMEvent extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 10;
+
+	public static final String NS_IDOMEVENT_IID_STR =
+		"a66b7b80-ff46-bd97-0080-5f8ae38add32";
+
+	public static final nsID NS_IDOMEVENT_IID =
+		new nsID(NS_IDOMEVENT_IID_STR);
+
+	public nsIDOMEvent(int /*long*/ address) {
+		super(address);
+	}
+
+	public static final int CAPTURING_PHASE = 1;
+
+	public static final int AT_TARGET = 2;
+
+	public static final int BUBBLING_PHASE = 3;
+
+	public int GetType(int /*long*/ aType) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aType);
+	}
+
+	public int GetTarget(int /*long*/[] aTarget) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aTarget);
+	}
+
+	public int GetCurrentTarget(int /*long*/[] aCurrentTarget) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aCurrentTarget);
+	}
+
+	public int GetEventPhase(short[] aEventPhase) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aEventPhase);
+	}
+
+	public int GetBubbles(int[] aBubbles) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aBubbles);
+	}
+
+	public int GetCancelable(int[] aCancelable) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aCancelable);
+	}
+
 	public int GetTimeStamp(int /*long*/[] aTimeStamp) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aTimeStamp);

-	}

-

-	public int StopPropagation() {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress());

-	}

-

-	public int PreventDefault() {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress());

-	}

-

-	public int InitEvent(int /*long*/ eventTypeArg, int canBubbleArg, int cancelableArg) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), eventTypeArg, canBubbleArg, cancelableArg);

-	}

-}
\ No newline at end of file
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aTimeStamp);
+	}
+
+	public int StopPropagation() {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress());
+	}
+
+	public int PreventDefault() {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress());
+	}
+
+	public int InitEvent(int /*long*/ eventTypeArg, int canBubbleArg, int cancelableArg) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), eventTypeArg, canBubbleArg, cancelableArg);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java
index 3c8cac5..fd08c33 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java
@@ -1,55 +1,55 @@
-/* ***** BEGIN LICENSE BLOCK *****

- * Version: MPL 1.1

- *

- * The contents of this file are subject to the Mozilla Public License Version

- * 1.1 (the "License"); you may not use this file except in compliance with

- * the License. You may obtain a copy of the License at

- * http://www.mozilla.org/MPL/

- *

- * Software distributed under the License is distributed on an "AS IS" basis,

- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

- * for the specific language governing rights and limitations under the

- * License.

- *

- * The Original Code is Mozilla Communicator client code, released March 31, 1998.

- *

- * The Initial Developer of the Original Code is

- * Netscape Communications Corporation.

- * Portions created by Netscape are Copyright (C) 1998-1999

- * Netscape Communications Corporation.  All Rights Reserved.

- *

- * Contributor(s):

- *

- * IBM

- * -  Binding to permit interfacing between Mozilla and SWT

- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.

- *

- * ***** END LICENSE BLOCK ***** */

-package org.eclipse.swt.internal.mozilla;

-

-public class nsIDOMEventTarget extends nsISupports {

-

-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 3;

-

-	public static final String NS_IDOMEVENTTARGET_IID_STR =

-		"1c773b30-d1cf-11d2-bd95-00805f8ae3f4";

-

-	public static final nsID NS_IDOMEVENTTARGET_IID =

-		new nsID(NS_IDOMEVENTTARGET_IID_STR);

-

-	public nsIDOMEventTarget(int /*long*/ address) {

-		super(address);

-	}

-

-	public int AddEventListener(int /*long*/ type, int /*long*/ listener, int useCapture) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), type, listener, useCapture);

-	}

-

-	public int RemoveEventListener(int /*long*/ type, int /*long*/ listener, int useCapture) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), type, listener, useCapture);

-	}

-

-	public int DispatchEvent(int /*long*/ evt, int[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), evt, _retval);

-	}

-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIDOMEventTarget extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 3;
+
+	public static final String NS_IDOMEVENTTARGET_IID_STR =
+		"1c773b30-d1cf-11d2-bd95-00805f8ae3f4";
+
+	public static final nsID NS_IDOMEVENTTARGET_IID =
+		new nsID(NS_IDOMEVENTTARGET_IID_STR);
+
+	public nsIDOMEventTarget(int /*long*/ address) {
+		super(address);
+	}
+
+	public int AddEventListener(int /*long*/ type, int /*long*/ listener, int useCapture) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), type, listener, useCapture);
+	}
+
+	public int RemoveEventListener(int /*long*/ type, int /*long*/ listener, int useCapture) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), type, listener, useCapture);
+	}
+
+	public int DispatchEvent(int /*long*/ evt, int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), evt, _retval);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java
index 05db310..906c132 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java
@@ -1,299 +1,299 @@
-/* ***** BEGIN LICENSE BLOCK *****

- * Version: MPL 1.1

- *

- * The contents of this file are subject to the Mozilla Public License Version

- * 1.1 (the "License"); you may not use this file except in compliance with

- * the License. You may obtain a copy of the License at

- * http://www.mozilla.org/MPL/

- *

- * Software distributed under the License is distributed on an "AS IS" basis,

- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

- * for the specific language governing rights and limitations under the

- * License.

- *

- * The Original Code is Mozilla Communicator client code, released March 31, 1998.

- *

- * The Initial Developer of the Original Code is

- * Netscape Communications Corporation.

- * Portions created by Netscape are Copyright (C) 1998-1999

- * Netscape Communications Corporation.  All Rights Reserved.

- *

- * Contributor(s):

- *

- * IBM

- * -  Binding to permit interfacing between Mozilla and SWT

- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.

- *

- * ***** END LICENSE BLOCK ***** */

-package org.eclipse.swt.internal.mozilla;

-

-public class nsIDOMKeyEvent extends nsIDOMUIEvent {

-

-	static final int LAST_METHOD_ID = nsIDOMUIEvent.LAST_METHOD_ID + 7;

-

-	public static final String NS_IDOMKEYEVENT_IID_STR =

-		"028e0e6e-8b01-11d3-aae7-0010838a3123";

-

-	public static final nsID NS_IDOMKEYEVENT_IID =

-		new nsID(NS_IDOMKEYEVENT_IID_STR);

-

-	public nsIDOMKeyEvent(int /*long*/ address) {

-		super(address);

-	}

-

-	public static final int DOM_VK_CANCEL = 3;

-

-	public static final int DOM_VK_HELP = 6;

-

-	public static final int DOM_VK_BACK_SPACE = 8;

-

-	public static final int DOM_VK_TAB = 9;

-

-	public static final int DOM_VK_CLEAR = 12;

-

-	public static final int DOM_VK_RETURN = 13;

-

-	public static final int DOM_VK_ENTER = 14;

-

-	public static final int DOM_VK_SHIFT = 16;

-

-	public static final int DOM_VK_CONTROL = 17;

-

-	public static final int DOM_VK_ALT = 18;

-

-	public static final int DOM_VK_PAUSE = 19;

-

-	public static final int DOM_VK_CAPS_LOCK = 20;

-

-	public static final int DOM_VK_ESCAPE = 27;

-

-	public static final int DOM_VK_SPACE = 32;

-

-	public static final int DOM_VK_PAGE_UP = 33;

-

-	public static final int DOM_VK_PAGE_DOWN = 34;

-

-	public static final int DOM_VK_END = 35;

-

-	public static final int DOM_VK_HOME = 36;

-

-	public static final int DOM_VK_LEFT = 37;

-

-	public static final int DOM_VK_UP = 38;

-

-	public static final int DOM_VK_RIGHT = 39;

-

-	public static final int DOM_VK_DOWN = 40;

-

-	public static final int DOM_VK_PRINTSCREEN = 44;

-

-	public static final int DOM_VK_INSERT = 45;

-

-	public static final int DOM_VK_DELETE = 46;

-

-	public static final int DOM_VK_0 = 48;

-

-	public static final int DOM_VK_1 = 49;

-

-	public static final int DOM_VK_2 = 50;

-

-	public static final int DOM_VK_3 = 51;

-

-	public static final int DOM_VK_4 = 52;

-

-	public static final int DOM_VK_5 = 53;

-

-	public static final int DOM_VK_6 = 54;

-

-	public static final int DOM_VK_7 = 55;

-

-	public static final int DOM_VK_8 = 56;

-

-	public static final int DOM_VK_9 = 57;

-

-	public static final int DOM_VK_SEMICOLON = 59;

-

-	public static final int DOM_VK_EQUALS = 61;

-

-	public static final int DOM_VK_A = 65;

-

-	public static final int DOM_VK_B = 66;

-

-	public static final int DOM_VK_C = 67;

-

-	public static final int DOM_VK_D = 68;

-

-	public static final int DOM_VK_E = 69;

-

-	public static final int DOM_VK_F = 70;

-

-	public static final int DOM_VK_G = 71;

-

-	public static final int DOM_VK_H = 72;

-

-	public static final int DOM_VK_I = 73;

-

-	public static final int DOM_VK_J = 74;

-

-	public static final int DOM_VK_K = 75;

-

-	public static final int DOM_VK_L = 76;

-

-	public static final int DOM_VK_M = 77;

-

-	public static final int DOM_VK_N = 78;

-

-	public static final int DOM_VK_O = 79;

-

-	public static final int DOM_VK_P = 80;

-

-	public static final int DOM_VK_Q = 81;

-

-	public static final int DOM_VK_R = 82;

-

-	public static final int DOM_VK_S = 83;

-

-	public static final int DOM_VK_T = 84;

-

-	public static final int DOM_VK_U = 85;

-

-	public static final int DOM_VK_V = 86;

-

-	public static final int DOM_VK_W = 87;

-

-	public static final int DOM_VK_X = 88;

-

-	public static final int DOM_VK_Y = 89;

-

-	public static final int DOM_VK_Z = 90;

-

-	public static final int DOM_VK_NUMPAD0 = 96;

-

-	public static final int DOM_VK_NUMPAD1 = 97;

-

-	public static final int DOM_VK_NUMPAD2 = 98;

-

-	public static final int DOM_VK_NUMPAD3 = 99;

-

-	public static final int DOM_VK_NUMPAD4 = 100;

-

-	public static final int DOM_VK_NUMPAD5 = 101;

-

-	public static final int DOM_VK_NUMPAD6 = 102;

-

-	public static final int DOM_VK_NUMPAD7 = 103;

-

-	public static final int DOM_VK_NUMPAD8 = 104;

-

-	public static final int DOM_VK_NUMPAD9 = 105;

-

-	public static final int DOM_VK_MULTIPLY = 106;

-

-	public static final int DOM_VK_ADD = 107;

-

-	public static final int DOM_VK_SEPARATOR = 108;

-

-	public static final int DOM_VK_SUBTRACT = 109;

-

-	public static final int DOM_VK_DECIMAL = 110;

-

-	public static final int DOM_VK_DIVIDE = 111;

-

-	public static final int DOM_VK_F1 = 112;

-

-	public static final int DOM_VK_F2 = 113;

-

-	public static final int DOM_VK_F3 = 114;

-

-	public static final int DOM_VK_F4 = 115;

-

-	public static final int DOM_VK_F5 = 116;

-

-	public static final int DOM_VK_F6 = 117;

-

-	public static final int DOM_VK_F7 = 118;

-

-	public static final int DOM_VK_F8 = 119;

-

-	public static final int DOM_VK_F9 = 120;

-

-	public static final int DOM_VK_F10 = 121;

-

-	public static final int DOM_VK_F11 = 122;

-

-	public static final int DOM_VK_F12 = 123;

-

-	public static final int DOM_VK_F13 = 124;

-

-	public static final int DOM_VK_F14 = 125;

-

-	public static final int DOM_VK_F15 = 126;

-

-	public static final int DOM_VK_F16 = 127;

-

-	public static final int DOM_VK_F17 = 128;

-

-	public static final int DOM_VK_F18 = 129;

-

-	public static final int DOM_VK_F19 = 130;

-

-	public static final int DOM_VK_F20 = 131;

-

-	public static final int DOM_VK_F21 = 132;

-

-	public static final int DOM_VK_F22 = 133;

-

-	public static final int DOM_VK_F23 = 134;

-

-	public static final int DOM_VK_F24 = 135;

-

-	public static final int DOM_VK_NUM_LOCK = 144;

-

-	public static final int DOM_VK_SCROLL_LOCK = 145;

-

-	public static final int DOM_VK_COMMA = 188;

-

-	public static final int DOM_VK_PERIOD = 190;

-

-	public static final int DOM_VK_SLASH = 191;

-

-	public static final int DOM_VK_BACK_QUOTE = 192;

-

-	public static final int DOM_VK_OPEN_BRACKET = 219;

-

-	public static final int DOM_VK_BACK_SLASH = 220;

-

-	public static final int DOM_VK_CLOSE_BRACKET = 221;

-

-	public static final int DOM_VK_QUOTE = 222;

-

-	public static final int DOM_VK_META = 224;

-

-	public int GetCharCode(int[] aCharCode) {

-		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 1, getAddress(), aCharCode);

-	}

-

-	public int GetKeyCode(int[] aKeyCode) {

-		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 2, getAddress(), aKeyCode);

-	}

-

-	public int GetAltKey(int[] aAltKey) {

-		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 3, getAddress(), aAltKey);

-	}

-

-	public int GetCtrlKey(int[] aCtrlKey) {

-		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 4, getAddress(), aCtrlKey);

-	}

-

-	public int GetShiftKey(int[] aShiftKey) {

-		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 5, getAddress(), aShiftKey);

-	}

-

-	public int GetMetaKey(int[] aMetaKey) {

-		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 6, getAddress(), aMetaKey);

-	}

-

-	public int InitKeyEvent(int /*long*/ typeArg, int canBubbleArg, int cancelableArg, int /*long*/ viewArg, int ctrlKeyArg, int altKeyArg, int shiftKeyArg, int metaKeyArg, int keyCodeArg, int charCodeArg) {

-		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 7, getAddress(), typeArg, canBubbleArg, cancelableArg, viewArg, ctrlKeyArg, altKeyArg, shiftKeyArg, metaKeyArg, keyCodeArg, charCodeArg);

-	}

-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIDOMKeyEvent extends nsIDOMUIEvent {
+
+	static final int LAST_METHOD_ID = nsIDOMUIEvent.LAST_METHOD_ID + 7;
+
+	public static final String NS_IDOMKEYEVENT_IID_STR =
+		"028e0e6e-8b01-11d3-aae7-0010838a3123";
+
+	public static final nsID NS_IDOMKEYEVENT_IID =
+		new nsID(NS_IDOMKEYEVENT_IID_STR);
+
+	public nsIDOMKeyEvent(int /*long*/ address) {
+		super(address);
+	}
+
+	public static final int DOM_VK_CANCEL = 3;
+
+	public static final int DOM_VK_HELP = 6;
+
+	public static final int DOM_VK_BACK_SPACE = 8;
+
+	public static final int DOM_VK_TAB = 9;
+
+	public static final int DOM_VK_CLEAR = 12;
+
+	public static final int DOM_VK_RETURN = 13;
+
+	public static final int DOM_VK_ENTER = 14;
+
+	public static final int DOM_VK_SHIFT = 16;
+
+	public static final int DOM_VK_CONTROL = 17;
+
+	public static final int DOM_VK_ALT = 18;
+
+	public static final int DOM_VK_PAUSE = 19;
+
+	public static final int DOM_VK_CAPS_LOCK = 20;
+
+	public static final int DOM_VK_ESCAPE = 27;
+
+	public static final int DOM_VK_SPACE = 32;
+
+	public static final int DOM_VK_PAGE_UP = 33;
+
+	public static final int DOM_VK_PAGE_DOWN = 34;
+
+	public static final int DOM_VK_END = 35;
+
+	public static final int DOM_VK_HOME = 36;
+
+	public static final int DOM_VK_LEFT = 37;
+
+	public static final int DOM_VK_UP = 38;
+
+	public static final int DOM_VK_RIGHT = 39;
+
+	public static final int DOM_VK_DOWN = 40;
+
+	public static final int DOM_VK_PRINTSCREEN = 44;
+
+	public static final int DOM_VK_INSERT = 45;
+
+	public static final int DOM_VK_DELETE = 46;
+
+	public static final int DOM_VK_0 = 48;
+
+	public static final int DOM_VK_1 = 49;
+
+	public static final int DOM_VK_2 = 50;
+
+	public static final int DOM_VK_3 = 51;
+
+	public static final int DOM_VK_4 = 52;
+
+	public static final int DOM_VK_5 = 53;
+
+	public static final int DOM_VK_6 = 54;
+
+	public static final int DOM_VK_7 = 55;
+
+	public static final int DOM_VK_8 = 56;
+
+	public static final int DOM_VK_9 = 57;
+
+	public static final int DOM_VK_SEMICOLON = 59;
+
+	public static final int DOM_VK_EQUALS = 61;
+
+	public static final int DOM_VK_A = 65;
+
+	public static final int DOM_VK_B = 66;
+
+	public static final int DOM_VK_C = 67;
+
+	public static final int DOM_VK_D = 68;
+
+	public static final int DOM_VK_E = 69;
+
+	public static final int DOM_VK_F = 70;
+
+	public static final int DOM_VK_G = 71;
+
+	public static final int DOM_VK_H = 72;
+
+	public static final int DOM_VK_I = 73;
+
+	public static final int DOM_VK_J = 74;
+
+	public static final int DOM_VK_K = 75;
+
+	public static final int DOM_VK_L = 76;
+
+	public static final int DOM_VK_M = 77;
+
+	public static final int DOM_VK_N = 78;
+
+	public static final int DOM_VK_O = 79;
+
+	public static final int DOM_VK_P = 80;
+
+	public static final int DOM_VK_Q = 81;
+
+	public static final int DOM_VK_R = 82;
+
+	public static final int DOM_VK_S = 83;
+
+	public static final int DOM_VK_T = 84;
+
+	public static final int DOM_VK_U = 85;
+
+	public static final int DOM_VK_V = 86;
+
+	public static final int DOM_VK_W = 87;
+
+	public static final int DOM_VK_X = 88;
+
+	public static final int DOM_VK_Y = 89;
+
+	public static final int DOM_VK_Z = 90;
+
+	public static final int DOM_VK_NUMPAD0 = 96;
+
+	public static final int DOM_VK_NUMPAD1 = 97;
+
+	public static final int DOM_VK_NUMPAD2 = 98;
+
+	public static final int DOM_VK_NUMPAD3 = 99;
+
+	public static final int DOM_VK_NUMPAD4 = 100;
+
+	public static final int DOM_VK_NUMPAD5 = 101;
+
+	public static final int DOM_VK_NUMPAD6 = 102;
+
+	public static final int DOM_VK_NUMPAD7 = 103;
+
+	public static final int DOM_VK_NUMPAD8 = 104;
+
+	public static final int DOM_VK_NUMPAD9 = 105;
+
+	public static final int DOM_VK_MULTIPLY = 106;
+
+	public static final int DOM_VK_ADD = 107;
+
+	public static final int DOM_VK_SEPARATOR = 108;
+
+	public static final int DOM_VK_SUBTRACT = 109;
+
+	public static final int DOM_VK_DECIMAL = 110;
+
+	public static final int DOM_VK_DIVIDE = 111;
+
+	public static final int DOM_VK_F1 = 112;
+
+	public static final int DOM_VK_F2 = 113;
+
+	public static final int DOM_VK_F3 = 114;
+
+	public static final int DOM_VK_F4 = 115;
+
+	public static final int DOM_VK_F5 = 116;
+
+	public static final int DOM_VK_F6 = 117;
+
+	public static final int DOM_VK_F7 = 118;
+
+	public static final int DOM_VK_F8 = 119;
+
+	public static final int DOM_VK_F9 = 120;
+
+	public static final int DOM_VK_F10 = 121;
+
+	public static final int DOM_VK_F11 = 122;
+
+	public static final int DOM_VK_F12 = 123;
+
+	public static final int DOM_VK_F13 = 124;
+
+	public static final int DOM_VK_F14 = 125;
+
+	public static final int DOM_VK_F15 = 126;
+
+	public static final int DOM_VK_F16 = 127;
+
+	public static final int DOM_VK_F17 = 128;
+
+	public static final int DOM_VK_F18 = 129;
+
+	public static final int DOM_VK_F19 = 130;
+
+	public static final int DOM_VK_F20 = 131;
+
+	public static final int DOM_VK_F21 = 132;
+
+	public static final int DOM_VK_F22 = 133;
+
+	public static final int DOM_VK_F23 = 134;
+
+	public static final int DOM_VK_F24 = 135;
+
+	public static final int DOM_VK_NUM_LOCK = 144;
+
+	public static final int DOM_VK_SCROLL_LOCK = 145;
+
+	public static final int DOM_VK_COMMA = 188;
+
+	public static final int DOM_VK_PERIOD = 190;
+
+	public static final int DOM_VK_SLASH = 191;
+
+	public static final int DOM_VK_BACK_QUOTE = 192;
+
+	public static final int DOM_VK_OPEN_BRACKET = 219;
+
+	public static final int DOM_VK_BACK_SLASH = 220;
+
+	public static final int DOM_VK_CLOSE_BRACKET = 221;
+
+	public static final int DOM_VK_QUOTE = 222;
+
+	public static final int DOM_VK_META = 224;
+
+	public int GetCharCode(int[] aCharCode) {
+		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 1, getAddress(), aCharCode);
+	}
+
+	public int GetKeyCode(int[] aKeyCode) {
+		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 2, getAddress(), aKeyCode);
+	}
+
+	public int GetAltKey(int[] aAltKey) {
+		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 3, getAddress(), aAltKey);
+	}
+
+	public int GetCtrlKey(int[] aCtrlKey) {
+		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 4, getAddress(), aCtrlKey);
+	}
+
+	public int GetShiftKey(int[] aShiftKey) {
+		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 5, getAddress(), aShiftKey);
+	}
+
+	public int GetMetaKey(int[] aMetaKey) {
+		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 6, getAddress(), aMetaKey);
+	}
+
+	public int InitKeyEvent(int /*long*/ typeArg, int canBubbleArg, int cancelableArg, int /*long*/ viewArg, int ctrlKeyArg, int altKeyArg, int shiftKeyArg, int metaKeyArg, int keyCodeArg, int charCodeArg) {
+		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 7, getAddress(), typeArg, canBubbleArg, cancelableArg, viewArg, ctrlKeyArg, altKeyArg, shiftKeyArg, metaKeyArg, keyCodeArg, charCodeArg);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java
index 5bdb407..71b7a73 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java
@@ -1,87 +1,87 @@
-/* ***** BEGIN LICENSE BLOCK *****

- * Version: MPL 1.1

- *

- * The contents of this file are subject to the Mozilla Public License Version

- * 1.1 (the "License"); you may not use this file except in compliance with

- * the License. You may obtain a copy of the License at

- * http://www.mozilla.org/MPL/

- *

- * Software distributed under the License is distributed on an "AS IS" basis,

- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

- * for the specific language governing rights and limitations under the

- * License.

- *

- * The Original Code is Mozilla Communicator client code, released March 31, 1998.

- *

- * The Initial Developer of the Original Code is

- * Netscape Communications Corporation.

- * Portions created by Netscape are Copyright (C) 1998-1999

- * Netscape Communications Corporation.  All Rights Reserved.

- *

- * Contributor(s):

- *

- * IBM

- * -  Binding to permit interfacing between Mozilla and SWT

- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.

- *

- * ***** END LICENSE BLOCK ***** */

-package org.eclipse.swt.internal.mozilla;

-

-public class nsIDOMMouseEvent extends nsIDOMUIEvent {

-

-	static final int LAST_METHOD_ID = nsIDOMUIEvent.LAST_METHOD_ID + 11;

-

-	public static final String NS_IDOMMOUSEEVENT_IID_STR =

-		"ff751edc-8b02-aae7-0010-8301838a3123";

-

-	public static final nsID NS_IDOMMOUSEEVENT_IID =

-		new nsID(NS_IDOMMOUSEEVENT_IID_STR);

-

-	public nsIDOMMouseEvent(int /*long*/ address) {

-		super(address);

-	}

-

-	public int GetScreenX(int[] aScreenX) {

-		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 1, getAddress(), aScreenX);

-	}

-

-	public int GetScreenY(int[] aScreenY) {

-		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 2, getAddress(), aScreenY);

-	}

-

-	public int GetClientX(int[] aClientX) {

-		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 3, getAddress(), aClientX);

-	}

-

-	public int GetClientY(int[] aClientY) {

-		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 4, getAddress(), aClientY);

-	}

-

-	public int GetCtrlKey(int[] aCtrlKey) {

-		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 5, getAddress(), aCtrlKey);

-	}

-

-	public int GetShiftKey(int[] aShiftKey) {

-		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 6, getAddress(), aShiftKey);

-	}

-

-	public int GetAltKey(int[] aAltKey) {

-		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 7, getAddress(), aAltKey);

-	}

-

-	public int GetMetaKey(int[] aMetaKey) {

-		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 8, getAddress(), aMetaKey);

-	}

-

-	public int GetButton(short[] aButton) {

-		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 9, getAddress(), aButton);

-	}

-

-	public int GetRelatedTarget(int /*long*/[] aRelatedTarget) {

-		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 10, getAddress(), aRelatedTarget);

-	}

-

-	public int InitMouseEvent(int /*long*/ typeArg, int canBubbleArg, int cancelableArg, int /*long*/ viewArg, int detailArg, int screenXArg, int screenYArg, int clientXArg, int clientYArg, int ctrlKeyArg, int altKeyArg, int shiftKeyArg, int metaKeyArg, short buttonArg, int /*long*/ relatedTargetArg) {

-		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 11, getAddress(), typeArg, canBubbleArg, cancelableArg, viewArg, detailArg, screenXArg, screenYArg, clientXArg, clientYArg, ctrlKeyArg, altKeyArg, shiftKeyArg, metaKeyArg, buttonArg, relatedTargetArg);

-	}

-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIDOMMouseEvent extends nsIDOMUIEvent {
+
+	static final int LAST_METHOD_ID = nsIDOMUIEvent.LAST_METHOD_ID + 11;
+
+	public static final String NS_IDOMMOUSEEVENT_IID_STR =
+		"ff751edc-8b02-aae7-0010-8301838a3123";
+
+	public static final nsID NS_IDOMMOUSEEVENT_IID =
+		new nsID(NS_IDOMMOUSEEVENT_IID_STR);
+
+	public nsIDOMMouseEvent(int /*long*/ address) {
+		super(address);
+	}
+
+	public int GetScreenX(int[] aScreenX) {
+		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 1, getAddress(), aScreenX);
+	}
+
+	public int GetScreenY(int[] aScreenY) {
+		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 2, getAddress(), aScreenY);
+	}
+
+	public int GetClientX(int[] aClientX) {
+		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 3, getAddress(), aClientX);
+	}
+
+	public int GetClientY(int[] aClientY) {
+		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 4, getAddress(), aClientY);
+	}
+
+	public int GetCtrlKey(int[] aCtrlKey) {
+		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 5, getAddress(), aCtrlKey);
+	}
+
+	public int GetShiftKey(int[] aShiftKey) {
+		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 6, getAddress(), aShiftKey);
+	}
+
+	public int GetAltKey(int[] aAltKey) {
+		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 7, getAddress(), aAltKey);
+	}
+
+	public int GetMetaKey(int[] aMetaKey) {
+		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 8, getAddress(), aMetaKey);
+	}
+
+	public int GetButton(short[] aButton) {
+		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 9, getAddress(), aButton);
+	}
+
+	public int GetRelatedTarget(int /*long*/[] aRelatedTarget) {
+		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 10, getAddress(), aRelatedTarget);
+	}
+
+	public int InitMouseEvent(int /*long*/ typeArg, int canBubbleArg, int cancelableArg, int /*long*/ viewArg, int detailArg, int screenXArg, int screenYArg, int clientXArg, int clientYArg, int ctrlKeyArg, int altKeyArg, int shiftKeyArg, int metaKeyArg, short buttonArg, int /*long*/ relatedTargetArg) {
+		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 11, getAddress(), typeArg, canBubbleArg, cancelableArg, viewArg, detailArg, screenXArg, screenYArg, clientXArg, clientYArg, ctrlKeyArg, altKeyArg, shiftKeyArg, metaKeyArg, buttonArg, relatedTargetArg);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java
index 7c06e04..3a35f4b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java
@@ -1,55 +1,55 @@
-/* ***** BEGIN LICENSE BLOCK *****

- * Version: MPL 1.1

- *

- * The contents of this file are subject to the Mozilla Public License Version

- * 1.1 (the "License"); you may not use this file except in compliance with

- * the License. You may obtain a copy of the License at

- * http://www.mozilla.org/MPL/

- *

- * Software distributed under the License is distributed on an "AS IS" basis,

- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

- * for the specific language governing rights and limitations under the

- * License.

- *

- * The Original Code is Mozilla Communicator client code, released March 31, 1998.

- *

- * The Initial Developer of the Original Code is

- * Netscape Communications Corporation.

- * Portions created by Netscape are Copyright (C) 1998-1999

- * Netscape Communications Corporation.  All Rights Reserved.

- *

- * Contributor(s):

- *

- * IBM

- * -  Binding to permit interfacing between Mozilla and SWT

- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.

- *

- * ***** END LICENSE BLOCK ***** */

-package org.eclipse.swt.internal.mozilla;

-

-public class nsIDOMUIEvent extends nsIDOMEvent {

-

-	static final int LAST_METHOD_ID = nsIDOMEvent.LAST_METHOD_ID + 3;

-

-	public static final String NS_IDOMUIEVENT_IID_STR =

-		"a6cf90c3-15b3-11d2-932e-00805f8add32";

-

-	public static final nsID NS_IDOMUIEVENT_IID =

-		new nsID(NS_IDOMUIEVENT_IID_STR);

-

-	public nsIDOMUIEvent(int /*long*/ address) {

-		super(address);

-	}

-

-	public int GetView(int /*long*/[] aView) {

-		return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 1, getAddress(), aView);

-	}

-

-	public int GetDetail(int[] aDetail) {

-		return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 2, getAddress(), aDetail);

-	}

-

-	public int InitUIEvent(int /*long*/ typeArg, int canBubbleArg, int cancelableArg, int /*long*/ viewArg, int detailArg) {

-		return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 3, getAddress(), typeArg, canBubbleArg, cancelableArg, viewArg, detailArg);

-	}

-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIDOMUIEvent extends nsIDOMEvent {
+
+	static final int LAST_METHOD_ID = nsIDOMEvent.LAST_METHOD_ID + 3;
+
+	public static final String NS_IDOMUIEVENT_IID_STR =
+		"a6cf90c3-15b3-11d2-932e-00805f8add32";
+
+	public static final nsID NS_IDOMUIEVENT_IID =
+		new nsID(NS_IDOMUIEVENT_IID_STR);
+
+	public nsIDOMUIEvent(int /*long*/ address) {
+		super(address);
+	}
+
+	public int GetView(int /*long*/[] aView) {
+		return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 1, getAddress(), aView);
+	}
+
+	public int GetDetail(int[] aDetail) {
+		return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 2, getAddress(), aDetail);
+	}
+
+	public int InitUIEvent(int /*long*/ typeArg, int canBubbleArg, int cancelableArg, int /*long*/ viewArg, int detailArg) {
+		return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 3, getAddress(), typeArg, canBubbleArg, cancelableArg, viewArg, detailArg);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java
index 6926f5a..663688a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java
@@ -1,55 +1,55 @@
-/* ***** BEGIN LICENSE BLOCK *****

- * Version: MPL 1.1

- *

- * The contents of this file are subject to the Mozilla Public License Version

- * 1.1 (the "License"); you may not use this file except in compliance with

- * the License. You may obtain a copy of the License at

- * http://www.mozilla.org/MPL/

- *

- * Software distributed under the License is distributed on an "AS IS" basis,

- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

- * for the specific language governing rights and limitations under the

- * License.

- *

- * The Original Code is Mozilla Communicator client code, released March 31, 1998.

- *

- * The Initial Developer of the Original Code is

- * Netscape Communications Corporation.

- * Portions created by Netscape are Copyright (C) 1998-1999

- * Netscape Communications Corporation.  All Rights Reserved.

- *

- * Contributor(s):

- *

- * IBM

- * -  Binding to permit interfacing between Mozilla and SWT

- * -  Copyright (C) 2003 IBM Corp.  All Rights Reserved.

- *

- * ***** END LICENSE BLOCK ***** */

-package org.eclipse.swt.internal.mozilla;

-

-public class nsIDOMWindowCollection extends nsISupports {

-

-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 3;

-

-	public static final String NS_IDOMWINDOWCOLLECTION_IID_STR =

-		"a6cf906f-15b3-11d2-932e-00805f8add32";

-

-	public static final nsID NS_IDOMWINDOWCOLLECTION_IID =

-		new nsID(NS_IDOMWINDOWCOLLECTION_IID_STR);

-

-	public nsIDOMWindowCollection(int /*long*/ address) {

-		super(address);

-	}

-

-	public int GetLength(int[] aLength) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aLength);

-	}

-

-	public int Item(int index, int /*long*/[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), index, _retval);

-	}

-

-	public int NamedItem(int /*long*/ name, int /*long*/[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), name, _retval);

-	}

-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIDOMWindowCollection extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 3;
+
+	public static final String NS_IDOMWINDOWCOLLECTION_IID_STR =
+		"a6cf906f-15b3-11d2-932e-00805f8add32";
+
+	public static final nsID NS_IDOMWINDOWCOLLECTION_IID =
+		new nsID(NS_IDOMWINDOWCOLLECTION_IID_STR);
+
+	public nsIDOMWindowCollection(int /*long*/ address) {
+		super(address);
+	}
+
+	public int GetLength(int[] aLength) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aLength);
+	}
+
+	public int Item(int index, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), index, _retval);
+	}
+
+	public int NamedItem(int /*long*/ name, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), name, _retval);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDataType.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDataType.java
new file mode 100644
index 0000000..88e6093
--- /dev/null
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDataType.java
@@ -0,0 +1,73 @@
+package org.eclipse.swt.internal.mozilla;
+
+
+public class nsIDataType extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 0;
+
+	public static final String NS_IDATATYPE_IID_STR =
+		"4d12e540-83d7-11d5-90ed-0010a4e73d9a";
+
+	public static final nsID NS_IDATATYPE_IID =
+		new nsID(NS_IDATATYPE_IID_STR);
+
+	public nsIDataType(int /*long*/ address) {
+		super(address);
+	}
+
+	public static final short VTYPE_INT8 = 0;
+
+	public static final short VTYPE_INT16 = 1;
+
+	public static final short VTYPE_INT32 = 2;
+
+	public static final short VTYPE_INT64 = 3;
+
+	public static final short VTYPE_UINT8 = 4;
+
+	public static final short VTYPE_UINT16 = 5;
+
+	public static final short VTYPE_UINT32 = 6;
+
+	public static final short VTYPE_UINT64 = 7;
+
+	public static final short VTYPE_FLOAT = 8;
+
+	public static final short VTYPE_DOUBLE = 9;
+
+	public static final short VTYPE_BOOL = 10;
+
+	public static final short VTYPE_CHAR = 11;
+
+	public static final short VTYPE_WCHAR = 12;
+
+	public static final short VTYPE_VOID = 13;
+
+	public static final short VTYPE_ID = 14;
+
+	public static final short VTYPE_DOMSTRING = 15;
+
+	public static final short VTYPE_CHAR_STR = 16;
+
+	public static final short VTYPE_WCHAR_STR = 17;
+
+	public static final short VTYPE_INTERFACE = 18;
+
+	public static final short VTYPE_INTERFACE_IS = 19;
+
+	public static final short VTYPE_ARRAY = 20;
+
+	public static final short VTYPE_STRING_SIZE_IS = 21;
+
+	public static final short VTYPE_WSTRING_SIZE_IS = 22;
+
+	public static final short VTYPE_UTF8STRING = 23;
+
+	public static final short VTYPE_CSTRING = 24;
+
+	public static final short VTYPE_ASTRING = 25;
+
+	public static final short VTYPE_EMPTY_ARRAY = 254;
+
+	public static final short VTYPE_EMPTY = 255;
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryService.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryService.java
index a96aadd..58aef5f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryService.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryService.java
@@ -1,55 +1,55 @@
-/* ***** BEGIN LICENSE BLOCK *****

- * Version: MPL 1.1

- *

- * The contents of this file are subject to the Mozilla Public License Version

- * 1.1 (the "License"); you may not use this file except in compliance with

- * the License. You may obtain a copy of the License at

- * http://www.mozilla.org/MPL/

- *

- * Software distributed under the License is distributed on an "AS IS" basis,

- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

- * for the specific language governing rights and limitations under the

- * License.

- *

- * The Original Code is Mozilla Communicator client code, released March 31, 1998.

- *

- * The Initial Developer of the Original Code is

- * Netscape Communications Corporation.

- * Portions created by Netscape are Copyright (C) 1998-1999

- * Netscape Communications Corporation.  All Rights Reserved.

- *

- * Contributor(s):

- *

- * IBM

- * -  Binding to permit interfacing between Mozilla and SWT

- * -  Copyright (C) 2003 IBM Corp.  All Rights Reserved.

- *

- * ***** END LICENSE BLOCK ***** */

-package org.eclipse.swt.internal.mozilla;

-

-public class nsIDirectoryService extends nsISupports {

-

-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 3;

-

-	public static final String NS_IDIRECTORYSERVICE_IID_STR =

-		"57a66a60-d43a-11d3-8cc2-00609792278c";

-

-	public static final nsID NS_IDIRECTORYSERVICE_IID =

-		new nsID(NS_IDIRECTORYSERVICE_IID_STR);

-

-	public nsIDirectoryService(int /*long*/ address) {

-		super(address);

-	}

-

-	public int Init() {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress());

-	}

-

-	public int RegisterProvider(int /*long*/ prov) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), prov);

-	}

-

-	public int UnregisterProvider(int /*long*/ prov) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), prov);

-	}

-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIDirectoryService extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 3;
+
+	public static final String NS_IDIRECTORYSERVICE_IID_STR =
+		"57a66a60-d43a-11d3-8cc2-00609792278c";
+
+	public static final nsID NS_IDIRECTORYSERVICE_IID =
+		new nsID(NS_IDIRECTORYSERVICE_IID_STR);
+
+	public nsIDirectoryService(int /*long*/ address) {
+		super(address);
+	}
+
+	public int Init() {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress());
+	}
+
+	public int RegisterProvider(int /*long*/ prov) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), prov);
+	}
+
+	public int UnregisterProvider(int /*long*/ prov) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), prov);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java
index 9b80511..8998396 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java
@@ -1,47 +1,47 @@
-/* ***** BEGIN LICENSE BLOCK *****

- * Version: MPL 1.1

- *

- * The contents of this file are subject to the Mozilla Public License Version

- * 1.1 (the "License"); you may not use this file except in compliance with

- * the License. You may obtain a copy of the License at

- * http://www.mozilla.org/MPL/

- *

- * Software distributed under the License is distributed on an "AS IS" basis,

- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

- * for the specific language governing rights and limitations under the

- * License.

- *

- * The Original Code is Mozilla Communicator client code, released March 31, 1998.

- *

- * The Initial Developer of the Original Code is

- * Netscape Communications Corporation.

- * Portions created by Netscape are Copyright (C) 1998-1999

- * Netscape Communications Corporation.  All Rights Reserved.

- *

- * Contributor(s):

- *

- * IBM

- * -  Binding to permit interfacing between Mozilla and SWT

- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.

- *

- * ***** END LICENSE BLOCK ***** */

-package org.eclipse.swt.internal.mozilla;

-

-public class nsIDirectoryServiceProvider extends nsISupports {

-

-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 1;

-

-	public static final String NS_IDIRECTORYSERVICEPROVIDER_IID_STR =

-		"bbf8cab0-d43a-11d3-8cc2-00609792278c";

-

-	public static final nsID NS_IDIRECTORYSERVICEPROVIDER_IID =

-		new nsID(NS_IDIRECTORYSERVICEPROVIDER_IID_STR);

-

-	public nsIDirectoryServiceProvider(int /*long*/ address) {

-		super(address);

-	}

-

-	public int GetFile(byte[] prop, int[] persistent, int /*long*/[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), prop, persistent, _retval);

-	}

-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIDirectoryServiceProvider extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 1;
+
+	public static final String NS_IDIRECTORYSERVICEPROVIDER_IID_STR =
+		"bbf8cab0-d43a-11d3-8cc2-00609792278c";
+
+	public static final nsID NS_IDIRECTORYSERVICEPROVIDER_IID =
+		new nsID(NS_IDIRECTORYSERVICEPROVIDER_IID_STR);
+
+	public nsIDirectoryServiceProvider(int /*long*/ address) {
+		super(address);
+	}
+
+	public int GetFile(byte[] prop, int[] persistent, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), prop, persistent, _retval);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDocShell.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDocShell.java
index 6a9f19a..bed487c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDocShell.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDocShell.java
@@ -1,269 +1,269 @@
-/* ***** BEGIN LICENSE BLOCK *****

- * Version: MPL 1.1

- *

- * The contents of this file are subject to the Mozilla Public License Version

- * 1.1 (the "License"); you may not use this file except in compliance with

- * the License. You may obtain a copy of the License at

- * http://www.mozilla.org/MPL/

- *

- * Software distributed under the License is distributed on an "AS IS" basis,

- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

- * for the specific language governing rights and limitations under the

- * License.

- *

- * The Original Code is Mozilla Communicator client code, released March 31, 1998.

- *

- * The Initial Developer of the Original Code is

- * Netscape Communications Corporation.

- * Portions created by Netscape are Copyright (C) 1998-1999

- * Netscape Communications Corporation.  All Rights Reserved.

- *

- * Contributor(s):

- *

- * IBM

- * -  Binding to permit interfacing between Mozilla and SWT

- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.

- *

- * ***** END LICENSE BLOCK ***** */

-package org.eclipse.swt.internal.mozilla;

-

-public class nsIDocShell extends nsISupports {

-

-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 51;

-

-	public static final String NS_IDOCSHELL_IID_STR =

-		"69e5de00-7b8b-11d3-af61-00a024ffc08c";

-

-	public static final nsID NS_IDOCSHELL_IID =

-		new nsID(NS_IDOCSHELL_IID_STR);

-

-	public nsIDocShell(int /*long*/ address) {

-		super(address);

-	}

-

-	public int LoadURI(int /*long*/ uri, int /*long*/ loadInfo, int aLoadFlags, int firstParty) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), uri, loadInfo, aLoadFlags, firstParty);

-	}

-

-	public int LoadStream(int /*long*/ aStream, int /*long*/ aURI, int /*long*/ aContentType, int /*long*/ aContentCharset, int /*long*/ aLoadInfo) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aStream, aURI, aContentType, aContentCharset, aLoadInfo);

-	}

-

-	public int InternalLoad(int /*long*/ aURI, int /*long*/ aReferrer, int /*long*/ aOwner, int aInheritOwner, char[] aWindowTarget, int /*long*/ aPostDataStream, int /*long*/ aHeadersStream, int aLoadFlags, int /*long*/ aSHEntry, int firstParty, int /*long*/[] aDocShell, int /*long*/[] aRequest) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aURI, aReferrer, aOwner, aInheritOwner, aWindowTarget, aPostDataStream, aHeadersStream, aLoadFlags, aSHEntry, firstParty, aDocShell, aRequest);

-	}

-

-	public int CreateLoadInfo(int /*long*/[] loadInfo) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), loadInfo);

-	}

-

-	public int PrepareForNewContentModel() {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress());

-	}

-

-	public int SetCurrentURI(int /*long*/ aURI) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aURI);

-	}

-

-	public int FireUnloadNotification() {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress());

-	}

-

-	public int GetPresContext(int /*long*/[] aPresContext) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aPresContext);

-	}

-

-	public int GetPresShell(int /*long*/[] aPresShell) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPresShell);

-	}

-

-	public int GetEldestPresShell(int /*long*/[] aEldestPresShell) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aEldestPresShell);

-	}

-

-	public int GetContentViewer(int /*long*/[] aContentViewer) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aContentViewer);

-	}

-

-	public int GetChromeEventHandler(int /*long*/[] aChromeEventHandler) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aChromeEventHandler);

-	}

-

-	public int SetChromeEventHandler(int /*long*/ aChromeEventHandler) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aChromeEventHandler);

-	}

-

-	public int GetParentURIContentListener(int /*long*/[] aParentURIContentListener) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aParentURIContentListener);

-	}

-

-	public int SetParentURIContentListener(int /*long*/ aParentURIContentListener) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aParentURIContentListener);

-	}

-

-	public int GetDocumentCharsetInfo(int /*long*/[] aDocumentCharsetInfo) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aDocumentCharsetInfo);

-	}

-

-	public int SetDocumentCharsetInfo(int /*long*/ aDocumentCharsetInfo) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aDocumentCharsetInfo);

-	}

-

-	public int GetAllowPlugins(int[] aAllowPlugins) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aAllowPlugins);

-	}

-

-	public int SetAllowPlugins(int aAllowPlugins) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), aAllowPlugins);

-	}

-

-	public int GetAllowJavascript(int[] aAllowJavascript) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), aAllowJavascript);

-	}

-

-	public int SetAllowJavascript(int aAllowJavascript) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), aAllowJavascript);

-	}

-

-	public int GetAllowMetaRedirects(int[] aAllowMetaRedirects) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), aAllowMetaRedirects);

-	}

-

-	public int SetAllowMetaRedirects(int aAllowMetaRedirects) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), aAllowMetaRedirects);

-	}

-

-	public int GetAllowSubframes(int[] aAllowSubframes) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), aAllowSubframes);

-	}

-

-	public int SetAllowSubframes(int aAllowSubframes) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), aAllowSubframes);

-	}

-

-	public int GetAllowImages(int[] aAllowImages) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aAllowImages);

-	}

-

-	public int SetAllowImages(int aAllowImages) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 27, getAddress(), aAllowImages);

-	}

-

-	public static final int ENUMERATE_FORWARDS = 0;

-

-	public static final int ENUMERATE_BACKWARDS = 1;

-

-	public int GetDocShellEnumerator(int aItemType, int aDirection, int /*long*/[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 28, getAddress(), aItemType, aDirection, _retval);

-	}

-

-	public static final int APP_TYPE_UNKNOWN = 0;

-

-	public static final int APP_TYPE_MAIL = 1;

-

-	public int GetAppType(int[] aAppType) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 29, getAddress(), aAppType);

-	}

-

-	public int SetAppType(int aAppType) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 30, getAddress(), aAppType);

-	}

-

-	public int GetAllowAuth(int[] aAllowAuth) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 31, getAddress(), aAllowAuth);

-	}

-

-	public int SetAllowAuth(int aAllowAuth) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 32, getAddress(), aAllowAuth);

-	}

-

-	public int GetZoom(float[] aZoom) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 33, getAddress(), aZoom);

-	}

-

-	public int SetZoom(float aZoom) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 34, getAddress(), aZoom);

-	}

-

-	public int GetMarginWidth(int[] aMarginWidth) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 35, getAddress(), aMarginWidth);

-	}

-

-	public int SetMarginWidth(int aMarginWidth) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 36, getAddress(), aMarginWidth);

-	}

-

-	public int GetMarginHeight(int[] aMarginHeight) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 37, getAddress(), aMarginHeight);

-	}

-

-	public int SetMarginHeight(int aMarginHeight) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 38, getAddress(), aMarginHeight);

-	}

-

-	public int GetHasFocus(int[] aHasFocus) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 39, getAddress(), aHasFocus);

-	}

-

-	public int SetHasFocus(int aHasFocus) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 40, getAddress(), aHasFocus);

-	}

-

-	public int GetCanvasHasFocus(int[] aCanvasHasFocus) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 41, getAddress(), aCanvasHasFocus);

-	}

-

-	public int SetCanvasHasFocus(int aCanvasHasFocus) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 42, getAddress(), aCanvasHasFocus);

-	}

-

-	public int TabToTreeOwner(int forward, int[] tookFocus) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 43, getAddress(), forward, tookFocus);

-	}

-

-	public static final int BUSY_FLAGS_NONE = 0;

-

-	public static final int BUSY_FLAGS_BUSY = 1;

-

-	public static final int BUSY_FLAGS_BEFORE_PAGE_LOAD = 2;

-

-	public static final int BUSY_FLAGS_PAGE_LOADING = 4;

-

-	public static final int LOAD_CMD_NORMAL = 1;

-

-	public static final int LOAD_CMD_RELOAD = 2;

-

-	public static final int LOAD_CMD_HISTORY = 4;

-

-	public int GetBusyFlags(int[] aBusyFlags) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 44, getAddress(), aBusyFlags);

-	}

-

-	public int GetLoadType(int[] aLoadType) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 45, getAddress(), aLoadType);

-	}

-

-	public int SetLoadType(int aLoadType) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 46, getAddress(), aLoadType);

-	}

-

-	public int IsBeingDestroyed(int[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 47, getAddress(), _retval);

-	}

-

-	public int GetIsExecutingOnLoadHandler(int[] aIsExecutingOnLoadHandler) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 48, getAddress(), aIsExecutingOnLoadHandler);

-	}

-

-	public int GetLayoutHistoryState(int /*long*/[] aLayoutHistoryState) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 49, getAddress(), aLayoutHistoryState);

-	}

-

-	public int SetLayoutHistoryState(int /*long*/ aLayoutHistoryState) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 50, getAddress(), aLayoutHistoryState);

-	}

-

-	public int GetShouldSaveLayoutState(int[] aShouldSaveLayoutState) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 51, getAddress(), aShouldSaveLayoutState);

-	}

-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIDocShell extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 51;
+
+	public static final String NS_IDOCSHELL_IID_STR =
+		"69e5de00-7b8b-11d3-af61-00a024ffc08c";
+
+	public static final nsID NS_IDOCSHELL_IID =
+		new nsID(NS_IDOCSHELL_IID_STR);
+
+	public nsIDocShell(int /*long*/ address) {
+		super(address);
+	}
+
+	public int LoadURI(int /*long*/ uri, int /*long*/ loadInfo, int aLoadFlags, int firstParty) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), uri, loadInfo, aLoadFlags, firstParty);
+	}
+
+	public int LoadStream(int /*long*/ aStream, int /*long*/ aURI, int /*long*/ aContentType, int /*long*/ aContentCharset, int /*long*/ aLoadInfo) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aStream, aURI, aContentType, aContentCharset, aLoadInfo);
+	}
+
+	public int InternalLoad(int /*long*/ aURI, int /*long*/ aReferrer, int /*long*/ aOwner, int aInheritOwner, char[] aWindowTarget, int /*long*/ aPostDataStream, int /*long*/ aHeadersStream, int aLoadFlags, int /*long*/ aSHEntry, int firstParty, int /*long*/[] aDocShell, int /*long*/[] aRequest) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aURI, aReferrer, aOwner, aInheritOwner, aWindowTarget, aPostDataStream, aHeadersStream, aLoadFlags, aSHEntry, firstParty, aDocShell, aRequest);
+	}
+
+	public int CreateLoadInfo(int /*long*/[] loadInfo) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), loadInfo);
+	}
+
+	public int PrepareForNewContentModel() {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress());
+	}
+
+	public int SetCurrentURI(int /*long*/ aURI) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aURI);
+	}
+
+	public int FireUnloadNotification() {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress());
+	}
+
+	public int GetPresContext(int /*long*/[] aPresContext) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aPresContext);
+	}
+
+	public int GetPresShell(int /*long*/[] aPresShell) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPresShell);
+	}
+
+	public int GetEldestPresShell(int /*long*/[] aEldestPresShell) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aEldestPresShell);
+	}
+
+	public int GetContentViewer(int /*long*/[] aContentViewer) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aContentViewer);
+	}
+
+	public int GetChromeEventHandler(int /*long*/[] aChromeEventHandler) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aChromeEventHandler);
+	}
+
+	public int SetChromeEventHandler(int /*long*/ aChromeEventHandler) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aChromeEventHandler);
+	}
+
+	public int GetParentURIContentListener(int /*long*/[] aParentURIContentListener) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aParentURIContentListener);
+	}
+
+	public int SetParentURIContentListener(int /*long*/ aParentURIContentListener) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aParentURIContentListener);
+	}
+
+	public int GetDocumentCharsetInfo(int /*long*/[] aDocumentCharsetInfo) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aDocumentCharsetInfo);
+	}
+
+	public int SetDocumentCharsetInfo(int /*long*/ aDocumentCharsetInfo) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aDocumentCharsetInfo);
+	}
+
+	public int GetAllowPlugins(int[] aAllowPlugins) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aAllowPlugins);
+	}
+
+	public int SetAllowPlugins(int aAllowPlugins) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), aAllowPlugins);
+	}
+
+	public int GetAllowJavascript(int[] aAllowJavascript) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), aAllowJavascript);
+	}
+
+	public int SetAllowJavascript(int aAllowJavascript) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), aAllowJavascript);
+	}
+
+	public int GetAllowMetaRedirects(int[] aAllowMetaRedirects) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), aAllowMetaRedirects);
+	}
+
+	public int SetAllowMetaRedirects(int aAllowMetaRedirects) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), aAllowMetaRedirects);
+	}
+
+	public int GetAllowSubframes(int[] aAllowSubframes) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), aAllowSubframes);
+	}
+
+	public int SetAllowSubframes(int aAllowSubframes) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), aAllowSubframes);
+	}
+
+	public int GetAllowImages(int[] aAllowImages) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aAllowImages);
+	}
+
+	public int SetAllowImages(int aAllowImages) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 27, getAddress(), aAllowImages);
+	}
+
+	public static final int ENUMERATE_FORWARDS = 0;
+
+	public static final int ENUMERATE_BACKWARDS = 1;
+
+	public int GetDocShellEnumerator(int aItemType, int aDirection, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 28, getAddress(), aItemType, aDirection, _retval);
+	}
+
+	public static final int APP_TYPE_UNKNOWN = 0;
+
+	public static final int APP_TYPE_MAIL = 1;
+
+	public int GetAppType(int[] aAppType) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 29, getAddress(), aAppType);
+	}
+
+	public int SetAppType(int aAppType) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 30, getAddress(), aAppType);
+	}
+
+	public int GetAllowAuth(int[] aAllowAuth) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 31, getAddress(), aAllowAuth);
+	}
+
+	public int SetAllowAuth(int aAllowAuth) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 32, getAddress(), aAllowAuth);
+	}
+
+	public int GetZoom(float[] aZoom) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 33, getAddress(), aZoom);
+	}
+
+	public int SetZoom(float aZoom) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 34, getAddress(), aZoom);
+	}
+
+	public int GetMarginWidth(int[] aMarginWidth) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 35, getAddress(), aMarginWidth);
+	}
+
+	public int SetMarginWidth(int aMarginWidth) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 36, getAddress(), aMarginWidth);
+	}
+
+	public int GetMarginHeight(int[] aMarginHeight) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 37, getAddress(), aMarginHeight);
+	}
+
+	public int SetMarginHeight(int aMarginHeight) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 38, getAddress(), aMarginHeight);
+	}
+
+	public int GetHasFocus(int[] aHasFocus) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 39, getAddress(), aHasFocus);
+	}
+
+	public int SetHasFocus(int aHasFocus) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 40, getAddress(), aHasFocus);
+	}
+
+	public int GetCanvasHasFocus(int[] aCanvasHasFocus) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 41, getAddress(), aCanvasHasFocus);
+	}
+
+	public int SetCanvasHasFocus(int aCanvasHasFocus) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 42, getAddress(), aCanvasHasFocus);
+	}
+
+	public int TabToTreeOwner(int forward, int[] tookFocus) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 43, getAddress(), forward, tookFocus);
+	}
+
+	public static final int BUSY_FLAGS_NONE = 0;
+
+	public static final int BUSY_FLAGS_BUSY = 1;
+
+	public static final int BUSY_FLAGS_BEFORE_PAGE_LOAD = 2;
+
+	public static final int BUSY_FLAGS_PAGE_LOADING = 4;
+
+	public static final int LOAD_CMD_NORMAL = 1;
+
+	public static final int LOAD_CMD_RELOAD = 2;
+
+	public static final int LOAD_CMD_HISTORY = 4;
+
+	public int GetBusyFlags(int[] aBusyFlags) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 44, getAddress(), aBusyFlags);
+	}
+
+	public int GetLoadType(int[] aLoadType) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 45, getAddress(), aLoadType);
+	}
+
+	public int SetLoadType(int aLoadType) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 46, getAddress(), aLoadType);
+	}
+
+	public int IsBeingDestroyed(int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 47, getAddress(), _retval);
+	}
+
+	public int GetIsExecutingOnLoadHandler(int[] aIsExecutingOnLoadHandler) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 48, getAddress(), aIsExecutingOnLoadHandler);
+	}
+
+	public int GetLayoutHistoryState(int /*long*/[] aLayoutHistoryState) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 49, getAddress(), aLayoutHistoryState);
+	}
+
+	public int SetLayoutHistoryState(int /*long*/ aLayoutHistoryState) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 50, getAddress(), aLayoutHistoryState);
+	}
+
+	public int GetShouldSaveLayoutState(int[] aShouldSaveLayoutState) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 51, getAddress(), aShouldSaveLayoutState);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java
index 098cb25..526c759 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java
@@ -1,317 +1,317 @@
-/* ***** BEGIN LICENSE BLOCK *****

- * Version: MPL 1.1

- *

- * The contents of this file are subject to the Mozilla Public License Version

- * 1.1 (the "License"); you may not use this file except in compliance with

- * the License. You may obtain a copy of the License at

- * http://www.mozilla.org/MPL/

- *

- * Software distributed under the License is distributed on an "AS IS" basis,

- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

- * for the specific language governing rights and limitations under the

- * License.

- *

- * The Original Code is Mozilla Communicator client code, released March 31, 1998.

- *

- * The Initial Developer of the Original Code is

- * Netscape Communications Corporation.

- * Portions created by Netscape are Copyright (C) 1998-1999

- * Netscape Communications Corporation.  All Rights Reserved.

- *

- * Contributor(s):

- *

- * IBM

- * -  Binding to permit interfacing between Mozilla and SWT

- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.

- *

- * ***** END LICENSE BLOCK ***** */

-package org.eclipse.swt.internal.mozilla;

-

-public class nsIDocShell_1_8 extends nsISupports {

-

-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 61;

-

-	public static final String NS_IDOCSHELL_IID_STR =

-		"9f0c7461-b9a4-47f6-b88c-421dce1bce66";

-

-	public static final nsID NS_IDOCSHELL_IID =

-		new nsID(NS_IDOCSHELL_IID_STR);

-

-	public nsIDocShell_1_8(int /*long*/ address) {

-		super(address);

-	}

-

-	public int LoadURI(int /*long*/ uri, int /*long*/ loadInfo, int aLoadFlags, int firstParty) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), uri, loadInfo, aLoadFlags, firstParty);

-	}

-

-	public int LoadStream(int /*long*/ aStream, int /*long*/ aURI, int /*long*/ aContentType, int /*long*/ aContentCharset, int /*long*/ aLoadInfo) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aStream, aURI, aContentType, aContentCharset, aLoadInfo);

-	}

-

-	public static final int INTERNAL_LOAD_FLAGS_NONE = 0;

-

-	public static final int INTERNAL_LOAD_FLAGS_INHERIT_OWNER = 1;

-

-	public static final int INTERNAL_LOAD_FLAGS_DONT_SEND_REFERRER = 2;

-

-	public int InternalLoad(int /*long*/ aURI, int /*long*/ aReferrer, int /*long*/ aOwner, int aFlags, char[] aWindowTarget, byte[] aTypeHint, int /*long*/ aPostDataStream, int /*long*/ aHeadersStream, int aLoadFlags, int /*long*/ aSHEntry, int firstParty, int /*long*/[] aDocShell, int /*long*/[] aRequest) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aURI, aReferrer, aOwner, aFlags, aWindowTarget, aTypeHint, aPostDataStream, aHeadersStream, aLoadFlags, aSHEntry, firstParty, aDocShell, aRequest);

-	}

-

-	public int CreateLoadInfo(int /*long*/[] loadInfo) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), loadInfo);

-	}

-

-	public int PrepareForNewContentModel() {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress());

-	}

-

-	public int SetCurrentURI(int /*long*/ aURI) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aURI);

-	}

-

-	public int FirePageHideNotification(int isUnload) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), isUnload);

-	}

-

-	public int GetPresContext(int /*long*/[] aPresContext) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aPresContext);

-	}

-

-	public int GetPresShell(int /*long*/[] aPresShell) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPresShell);

-	}

-

-	public int GetEldestPresShell(int /*long*/[] aEldestPresShell) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aEldestPresShell);

-	}

-

-	public int GetContentViewer(int /*long*/[] aContentViewer) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aContentViewer);

-	}

-

-	public int GetChromeEventHandler(int /*long*/[] aChromeEventHandler) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aChromeEventHandler);

-	}

-

-	public int SetChromeEventHandler(int /*long*/ aChromeEventHandler) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aChromeEventHandler);

-	}

-

-	public int GetDocumentCharsetInfo(int /*long*/[] aDocumentCharsetInfo) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aDocumentCharsetInfo);

-	}

-

-	public int SetDocumentCharsetInfo(int /*long*/ aDocumentCharsetInfo) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aDocumentCharsetInfo);

-	}

-

-	public int GetAllowPlugins(int[] aAllowPlugins) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aAllowPlugins);

-	}

-

-	public int SetAllowPlugins(int aAllowPlugins) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aAllowPlugins);

-	}

-

-	public int GetAllowJavascript(int[] aAllowJavascript) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aAllowJavascript);

-	}

-

-	public int SetAllowJavascript(int aAllowJavascript) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), aAllowJavascript);

-	}

-

-	public int GetAllowMetaRedirects(int[] aAllowMetaRedirects) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), aAllowMetaRedirects);

-	}

-

-	public int SetAllowMetaRedirects(int aAllowMetaRedirects) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), aAllowMetaRedirects);

-	}

-

-	public int GetAllowSubframes(int[] aAllowSubframes) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), aAllowSubframes);

-	}

-

-	public int SetAllowSubframes(int aAllowSubframes) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), aAllowSubframes);

-	}

-

-	public int GetAllowImages(int[] aAllowImages) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), aAllowImages);

-	}

-

-	public int SetAllowImages(int aAllowImages) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), aAllowImages);

-	}

-

-	public static final int ENUMERATE_FORWARDS = 0;

-

-	public static final int ENUMERATE_BACKWARDS = 1;

-

-	public int GetDocShellEnumerator(int aItemType, int aDirection, int /*long*/[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aItemType, aDirection, _retval);

-	}

-

-	public static final int APP_TYPE_UNKNOWN = 0;

-

-	public static final int APP_TYPE_MAIL = 1;

-

-	public static final int APP_TYPE_EDITOR = 2;

-

-	public int GetAppType(int[] aAppType) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 27, getAddress(), aAppType);

-	}

-

-	public int SetAppType(int aAppType) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 28, getAddress(), aAppType);

-	}

-

-	public int GetAllowAuth(int[] aAllowAuth) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 29, getAddress(), aAllowAuth);

-	}

-

-	public int SetAllowAuth(int aAllowAuth) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 30, getAddress(), aAllowAuth);

-	}

-

-	public int GetZoom(float[] aZoom) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 31, getAddress(), aZoom);

-	}

-

-	public int SetZoom(float aZoom) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 32, getAddress(), aZoom);

-	}

-

-	public int GetMarginWidth(int[] aMarginWidth) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 33, getAddress(), aMarginWidth);

-	}

-

-	public int SetMarginWidth(int aMarginWidth) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 34, getAddress(), aMarginWidth);

-	}

-

-	public int GetMarginHeight(int[] aMarginHeight) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 35, getAddress(), aMarginHeight);

-	}

-

-	public int SetMarginHeight(int aMarginHeight) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 36, getAddress(), aMarginHeight);

-	}

-

-	public int GetHasFocus(int[] aHasFocus) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 37, getAddress(), aHasFocus);

-	}

-

-	public int SetHasFocus(int aHasFocus) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 38, getAddress(), aHasFocus);

-	}

-

-	public int GetCanvasHasFocus(int[] aCanvasHasFocus) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 39, getAddress(), aCanvasHasFocus);

-	}

-

-	public int SetCanvasHasFocus(int aCanvasHasFocus) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 40, getAddress(), aCanvasHasFocus);

-	}

-

-	public int TabToTreeOwner(int forward, int[] tookFocus) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 41, getAddress(), forward, tookFocus);

-	}

-

-	public static final int BUSY_FLAGS_NONE = 0;

-

-	public static final int BUSY_FLAGS_BUSY = 1;

-

-	public static final int BUSY_FLAGS_BEFORE_PAGE_LOAD = 2;

-

-	public static final int BUSY_FLAGS_PAGE_LOADING = 4;

-

-	public static final int LOAD_CMD_NORMAL = 1;

-

-	public static final int LOAD_CMD_RELOAD = 2;

-

-	public static final int LOAD_CMD_HISTORY = 4;

-

-	public int GetBusyFlags(int[] aBusyFlags) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 42, getAddress(), aBusyFlags);

-	}

-

-	public int GetLoadType(int[] aLoadType) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 43, getAddress(), aLoadType);

-	}

-

-	public int SetLoadType(int aLoadType) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 44, getAddress(), aLoadType);

-	}

-

-	public int IsBeingDestroyed(int[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 45, getAddress(), _retval);

-	}

-

-	public int GetIsExecutingOnLoadHandler(int[] aIsExecutingOnLoadHandler) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 46, getAddress(), aIsExecutingOnLoadHandler);

-	}

-

-	public int GetLayoutHistoryState(int /*long*/[] aLayoutHistoryState) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 47, getAddress(), aLayoutHistoryState);

-	}

-

-	public int SetLayoutHistoryState(int /*long*/ aLayoutHistoryState) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 48, getAddress(), aLayoutHistoryState);

-	}

-

-	public int GetShouldSaveLayoutState(int[] aShouldSaveLayoutState) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 49, getAddress(), aShouldSaveLayoutState);

-	}

-

-	public int GetSecurityUI(int /*long*/[] aSecurityUI) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 50, getAddress(), aSecurityUI);

-	}

-

-	public int SetSecurityUI(int /*long*/ aSecurityUI) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 51, getAddress(), aSecurityUI);

-	}

-

-	public int SuspendRefreshURIs() {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 52, getAddress());

-	}

-

-	public int ResumeRefreshURIs() {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 53, getAddress());

-	}

-

-	public int BeginRestore(int /*long*/ viewer, int top) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 54, getAddress(), viewer, top);

-	}

-

-	public int FinishRestore() {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 55, getAddress());

-	}

-

-	public int GetRestoringDocument(int[] aRestoringDocument) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 56, getAddress(), aRestoringDocument);

-	}

-

-	public int GetUseErrorPages(int[] aUseErrorPages) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 57, getAddress(), aUseErrorPages);

-	}

-

-	public int SetUseErrorPages(int aUseErrorPages) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 58, getAddress(), aUseErrorPages);

-	}

-

-	public int GetPreviousTransIndex(int[] aPreviousTransIndex) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 59, getAddress(), aPreviousTransIndex);

-	}

-

-	public int GetLoadedTransIndex(int[] aLoadedTransIndex) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 60, getAddress(), aLoadedTransIndex);

-	}

-

-	public int HistoryPurged(int numEntries) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 61, getAddress(), numEntries);

-	}

-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIDocShell_1_8 extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 61;
+
+	public static final String NS_IDOCSHELL_IID_STR =
+		"9f0c7461-b9a4-47f6-b88c-421dce1bce66";
+
+	public static final nsID NS_IDOCSHELL_IID =
+		new nsID(NS_IDOCSHELL_IID_STR);
+
+	public nsIDocShell_1_8(int /*long*/ address) {
+		super(address);
+	}
+
+	public int LoadURI(int /*long*/ uri, int /*long*/ loadInfo, int aLoadFlags, int firstParty) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), uri, loadInfo, aLoadFlags, firstParty);
+	}
+
+	public int LoadStream(int /*long*/ aStream, int /*long*/ aURI, int /*long*/ aContentType, int /*long*/ aContentCharset, int /*long*/ aLoadInfo) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aStream, aURI, aContentType, aContentCharset, aLoadInfo);
+	}
+
+	public static final int INTERNAL_LOAD_FLAGS_NONE = 0;
+
+	public static final int INTERNAL_LOAD_FLAGS_INHERIT_OWNER = 1;
+
+	public static final int INTERNAL_LOAD_FLAGS_DONT_SEND_REFERRER = 2;
+
+	public int InternalLoad(int /*long*/ aURI, int /*long*/ aReferrer, int /*long*/ aOwner, int aFlags, char[] aWindowTarget, byte[] aTypeHint, int /*long*/ aPostDataStream, int /*long*/ aHeadersStream, int aLoadFlags, int /*long*/ aSHEntry, int firstParty, int /*long*/[] aDocShell, int /*long*/[] aRequest) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aURI, aReferrer, aOwner, aFlags, aWindowTarget, aTypeHint, aPostDataStream, aHeadersStream, aLoadFlags, aSHEntry, firstParty, aDocShell, aRequest);
+	}
+
+	public int CreateLoadInfo(int /*long*/[] loadInfo) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), loadInfo);
+	}
+
+	public int PrepareForNewContentModel() {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress());
+	}
+
+	public int SetCurrentURI(int /*long*/ aURI) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aURI);
+	}
+
+	public int FirePageHideNotification(int isUnload) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), isUnload);
+	}
+
+	public int GetPresContext(int /*long*/[] aPresContext) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aPresContext);
+	}
+
+	public int GetPresShell(int /*long*/[] aPresShell) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPresShell);
+	}
+
+	public int GetEldestPresShell(int /*long*/[] aEldestPresShell) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aEldestPresShell);
+	}
+
+	public int GetContentViewer(int /*long*/[] aContentViewer) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aContentViewer);
+	}
+
+	public int GetChromeEventHandler(int /*long*/[] aChromeEventHandler) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aChromeEventHandler);
+	}
+
+	public int SetChromeEventHandler(int /*long*/ aChromeEventHandler) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aChromeEventHandler);
+	}
+
+	public int GetDocumentCharsetInfo(int /*long*/[] aDocumentCharsetInfo) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aDocumentCharsetInfo);
+	}
+
+	public int SetDocumentCharsetInfo(int /*long*/ aDocumentCharsetInfo) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aDocumentCharsetInfo);
+	}
+
+	public int GetAllowPlugins(int[] aAllowPlugins) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aAllowPlugins);
+	}
+
+	public int SetAllowPlugins(int aAllowPlugins) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aAllowPlugins);
+	}
+
+	public int GetAllowJavascript(int[] aAllowJavascript) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aAllowJavascript);
+	}
+
+	public int SetAllowJavascript(int aAllowJavascript) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), aAllowJavascript);
+	}
+
+	public int GetAllowMetaRedirects(int[] aAllowMetaRedirects) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), aAllowMetaRedirects);
+	}
+
+	public int SetAllowMetaRedirects(int aAllowMetaRedirects) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), aAllowMetaRedirects);
+	}
+
+	public int GetAllowSubframes(int[] aAllowSubframes) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), aAllowSubframes);
+	}
+
+	public int SetAllowSubframes(int aAllowSubframes) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), aAllowSubframes);
+	}
+
+	public int GetAllowImages(int[] aAllowImages) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), aAllowImages);
+	}
+
+	public int SetAllowImages(int aAllowImages) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), aAllowImages);
+	}
+
+	public static final int ENUMERATE_FORWARDS = 0;
+
+	public static final int ENUMERATE_BACKWARDS = 1;
+
+	public int GetDocShellEnumerator(int aItemType, int aDirection, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aItemType, aDirection, _retval);
+	}
+
+	public static final int APP_TYPE_UNKNOWN = 0;
+
+	public static final int APP_TYPE_MAIL = 1;
+
+	public static final int APP_TYPE_EDITOR = 2;
+
+	public int GetAppType(int[] aAppType) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 27, getAddress(), aAppType);
+	}
+
+	public int SetAppType(int aAppType) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 28, getAddress(), aAppType);
+	}
+
+	public int GetAllowAuth(int[] aAllowAuth) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 29, getAddress(), aAllowAuth);
+	}
+
+	public int SetAllowAuth(int aAllowAuth) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 30, getAddress(), aAllowAuth);
+	}
+
+	public int GetZoom(float[] aZoom) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 31, getAddress(), aZoom);
+	}
+
+	public int SetZoom(float aZoom) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 32, getAddress(), aZoom);
+	}
+
+	public int GetMarginWidth(int[] aMarginWidth) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 33, getAddress(), aMarginWidth);
+	}
+
+	public int SetMarginWidth(int aMarginWidth) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 34, getAddress(), aMarginWidth);
+	}
+
+	public int GetMarginHeight(int[] aMarginHeight) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 35, getAddress(), aMarginHeight);
+	}
+
+	public int SetMarginHeight(int aMarginHeight) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 36, getAddress(), aMarginHeight);
+	}
+
+	public int GetHasFocus(int[] aHasFocus) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 37, getAddress(), aHasFocus);
+	}
+
+	public int SetHasFocus(int aHasFocus) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 38, getAddress(), aHasFocus);
+	}
+
+	public int GetCanvasHasFocus(int[] aCanvasHasFocus) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 39, getAddress(), aCanvasHasFocus);
+	}
+
+	public int SetCanvasHasFocus(int aCanvasHasFocus) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 40, getAddress(), aCanvasHasFocus);
+	}
+
+	public int TabToTreeOwner(int forward, int[] tookFocus) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 41, getAddress(), forward, tookFocus);
+	}
+
+	public static final int BUSY_FLAGS_NONE = 0;
+
+	public static final int BUSY_FLAGS_BUSY = 1;
+
+	public static final int BUSY_FLAGS_BEFORE_PAGE_LOAD = 2;
+
+	public static final int BUSY_FLAGS_PAGE_LOADING = 4;
+
+	public static final int LOAD_CMD_NORMAL = 1;
+
+	public static final int LOAD_CMD_RELOAD = 2;
+
+	public static final int LOAD_CMD_HISTORY = 4;
+
+	public int GetBusyFlags(int[] aBusyFlags) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 42, getAddress(), aBusyFlags);
+	}
+
+	public int GetLoadType(int[] aLoadType) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 43, getAddress(), aLoadType);
+	}
+
+	public int SetLoadType(int aLoadType) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 44, getAddress(), aLoadType);
+	}
+
+	public int IsBeingDestroyed(int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 45, getAddress(), _retval);
+	}
+
+	public int GetIsExecutingOnLoadHandler(int[] aIsExecutingOnLoadHandler) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 46, getAddress(), aIsExecutingOnLoadHandler);
+	}
+
+	public int GetLayoutHistoryState(int /*long*/[] aLayoutHistoryState) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 47, getAddress(), aLayoutHistoryState);
+	}
+
+	public int SetLayoutHistoryState(int /*long*/ aLayoutHistoryState) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 48, getAddress(), aLayoutHistoryState);
+	}
+
+	public int GetShouldSaveLayoutState(int[] aShouldSaveLayoutState) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 49, getAddress(), aShouldSaveLayoutState);
+	}
+
+	public int GetSecurityUI(int /*long*/[] aSecurityUI) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 50, getAddress(), aSecurityUI);
+	}
+
+	public int SetSecurityUI(int /*long*/ aSecurityUI) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 51, getAddress(), aSecurityUI);
+	}
+
+	public int SuspendRefreshURIs() {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 52, getAddress());
+	}
+
+	public int ResumeRefreshURIs() {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 53, getAddress());
+	}
+
+	public int BeginRestore(int /*long*/ viewer, int top) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 54, getAddress(), viewer, top);
+	}
+
+	public int FinishRestore() {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 55, getAddress());
+	}
+
+	public int GetRestoringDocument(int[] aRestoringDocument) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 56, getAddress(), aRestoringDocument);
+	}
+
+	public int GetUseErrorPages(int[] aUseErrorPages) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 57, getAddress(), aUseErrorPages);
+	}
+
+	public int SetUseErrorPages(int aUseErrorPages) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 58, getAddress(), aUseErrorPages);
+	}
+
+	public int GetPreviousTransIndex(int[] aPreviousTransIndex) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 59, getAddress(), aPreviousTransIndex);
+	}
+
+	public int GetLoadedTransIndex(int[] aLoadedTransIndex) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 60, getAddress(), aLoadedTransIndex);
+	}
+
+	public int HistoryPurged(int numEntries) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 61, getAddress(), numEntries);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDocShell_1_9.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDocShell_1_9.java
deleted file mode 100644
index b9aafb9..0000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDocShell_1_9.java
+++ /dev/null
@@ -1,347 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****

- * Version: MPL 1.1

- *

- * The contents of this file are subject to the Mozilla Public License Version

- * 1.1 (the "License"); you may not use this file except in compliance with

- * the License. You may obtain a copy of the License at

- * http://www.mozilla.org/MPL/

- *

- * Software distributed under the License is distributed on an "AS IS" basis,

- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

- * for the specific language governing rights and limitations under the

- * License.

- *

- * The Original Code is Mozilla Communicator client code, released March 31, 1998.

- *

- * The Initial Developer of the Original Code is

- * Netscape Communications Corporation.

- * Portions created by Netscape are Copyright (C) 1998-1999

- * Netscape Communications Corporation.  All Rights Reserved.

- *

- * Contributor(s):

- *

- * IBM

- * -  Binding to permit interfacing between Mozilla and SWT

- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.

- *

- * ***** END LICENSE BLOCK ***** */

-package org.eclipse.swt.internal.mozilla;

-

-public class nsIDocShell_1_9 extends nsISupports {

-

-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 67;

-

-	public static final String NS_IDOCSHELL_IID_STR =

-		"7d1cf6b9-daa3-476d-8f9f-9eb2a971a95c";

-

-	public static final nsID NS_IDOCSHELL_IID =

-		new nsID(NS_IDOCSHELL_IID_STR);

-

-	public nsIDocShell_1_9(int /*long*/ address) {

-		super(address);

-	}

-

-	public int LoadURI(int /*long*/ uri, int /*long*/ loadInfo, int aLoadFlags, int firstParty) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), uri, loadInfo, aLoadFlags, firstParty);

-	}

-

-	public int LoadStream(int /*long*/ aStream, int /*long*/ aURI, int /*long*/ aContentType, int /*long*/ aContentCharset, int /*long*/ aLoadInfo) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aStream, aURI, aContentType, aContentCharset, aLoadInfo);

-	}

-

-	public static final int INTERNAL_LOAD_FLAGS_NONE = 0;

-

-	public static final int INTERNAL_LOAD_FLAGS_INHERIT_OWNER = 1;

-

-	public static final int INTERNAL_LOAD_FLAGS_DONT_SEND_REFERRER = 2;

-

-	public static final int INTERNAL_LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP = 4;

-

-	public static final int INTERNAL_LOAD_FLAGS_FIRST_LOAD = 8;

-

-	public static final int INTERNAL_LOAD_FLAGS_BYPASS_CLASSIFIER = 16;

-

-	public int InternalLoad(int /*long*/ aURI, int /*long*/ aReferrer, int /*long*/ aOwner, int aFlags, char[] aWindowTarget, byte[] aTypeHint, int /*long*/ aPostDataStream, int /*long*/ aHeadersStream, int aLoadFlags, int /*long*/ aSHEntry, int firstParty, int /*long*/[] aDocShell, int /*long*/[] aRequest) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aURI, aReferrer, aOwner, aFlags, aWindowTarget, aTypeHint, aPostDataStream, aHeadersStream, aLoadFlags, aSHEntry, firstParty, aDocShell, aRequest);

-	}

-

-	public int CreateLoadInfo(int /*long*/[] loadInfo) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), loadInfo);

-	}

-

-	public int PrepareForNewContentModel() {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress());

-	}

-

-	public int SetCurrentURI(int /*long*/ aURI) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aURI);

-	}

-

-	public int FirePageHideNotification(int isUnload) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), isUnload);

-	}

-

-	public int GetPresContext(int /*long*/[] aPresContext) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aPresContext);

-	}

-

-	public int GetPresShell(int /*long*/[] aPresShell) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPresShell);

-	}

-

-	public int GetEldestPresShell(int /*long*/[] aEldestPresShell) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aEldestPresShell);

-	}

-

-	public int GetContentViewer(int /*long*/[] aContentViewer) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aContentViewer);

-	}

-

-	public int GetChromeEventHandler(int /*long*/[] aChromeEventHandler) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aChromeEventHandler);

-	}

-

-	public int SetChromeEventHandler(int /*long*/ aChromeEventHandler) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aChromeEventHandler);

-	}

-

-	public int GetDocumentCharsetInfo(int /*long*/[] aDocumentCharsetInfo) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aDocumentCharsetInfo);

-	}

-

-	public int SetDocumentCharsetInfo(int /*long*/ aDocumentCharsetInfo) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aDocumentCharsetInfo);

-	}

-

-	public int GetAllowPlugins(int[] aAllowPlugins) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aAllowPlugins);

-	}

-

-	public int SetAllowPlugins(int aAllowPlugins) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aAllowPlugins);

-	}

-

-	public int GetAllowJavascript(int[] aAllowJavascript) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aAllowJavascript);

-	}

-

-	public int SetAllowJavascript(int aAllowJavascript) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), aAllowJavascript);

-	}

-

-	public int GetAllowMetaRedirects(int[] aAllowMetaRedirects) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), aAllowMetaRedirects);

-	}

-

-	public int SetAllowMetaRedirects(int aAllowMetaRedirects) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), aAllowMetaRedirects);

-	}

-

-	public int GetAllowSubframes(int[] aAllowSubframes) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), aAllowSubframes);

-	}

-

-	public int SetAllowSubframes(int aAllowSubframes) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), aAllowSubframes);

-	}

-

-	public int GetAllowImages(int[] aAllowImages) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), aAllowImages);

-	}

-

-	public int SetAllowImages(int aAllowImages) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), aAllowImages);

-	}

-

-	public static final int ENUMERATE_FORWARDS = 0;

-

-	public static final int ENUMERATE_BACKWARDS = 1;

-

-	public int GetDocShellEnumerator(int aItemType, int aDirection, int /*long*/[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aItemType, aDirection, _retval);

-	}

-

-	public static final int APP_TYPE_UNKNOWN = 0;

-

-	public static final int APP_TYPE_MAIL = 1;

-

-	public static final int APP_TYPE_EDITOR = 2;

-

-	public int GetAppType(int[] aAppType) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 27, getAddress(), aAppType);

-	}

-

-	public int SetAppType(int aAppType) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 28, getAddress(), aAppType);

-	}

-

-	public int GetAllowAuth(int[] aAllowAuth) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 29, getAddress(), aAllowAuth);

-	}

-

-	public int SetAllowAuth(int aAllowAuth) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 30, getAddress(), aAllowAuth);

-	}

-

-	public int GetZoom(float[] aZoom) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 31, getAddress(), aZoom);

-	}

-

-	public int SetZoom(float aZoom) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 32, getAddress(), aZoom);

-	}

-

-	public int GetMarginWidth(int[] aMarginWidth) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 33, getAddress(), aMarginWidth);

-	}

-

-	public int SetMarginWidth(int aMarginWidth) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 34, getAddress(), aMarginWidth);

-	}

-

-	public int GetMarginHeight(int[] aMarginHeight) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 35, getAddress(), aMarginHeight);

-	}

-

-	public int SetMarginHeight(int aMarginHeight) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 36, getAddress(), aMarginHeight);

-	}

-

-	public int GetHasFocus(int[] aHasFocus) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 37, getAddress(), aHasFocus);

-	}

-

-	public int SetHasFocus(int aHasFocus) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 38, getAddress(), aHasFocus);

-	}

-

-	public int GetCanvasHasFocus(int[] aCanvasHasFocus) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 39, getAddress(), aCanvasHasFocus);

-	}

-

-	public int SetCanvasHasFocus(int aCanvasHasFocus) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 40, getAddress(), aCanvasHasFocus);

-	}

-

-	public int TabToTreeOwner(int forward, int[] tookFocus) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 41, getAddress(), forward, tookFocus);

-	}

-

-	public static final int BUSY_FLAGS_NONE = 0;

-

-	public static final int BUSY_FLAGS_BUSY = 1;

-

-	public static final int BUSY_FLAGS_BEFORE_PAGE_LOAD = 2;

-

-	public static final int BUSY_FLAGS_PAGE_LOADING = 4;

-

-	public static final int LOAD_CMD_NORMAL = 1;

-

-	public static final int LOAD_CMD_RELOAD = 2;

-

-	public static final int LOAD_CMD_HISTORY = 4;

-

-	public int GetBusyFlags(int[] aBusyFlags) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 42, getAddress(), aBusyFlags);

-	}

-

-	public int GetLoadType(int[] aLoadType) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 43, getAddress(), aLoadType);

-	}

-

-	public int SetLoadType(int aLoadType) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 44, getAddress(), aLoadType);

-	}

-

-	public int IsBeingDestroyed(int[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 45, getAddress(), _retval);

-	}

-

-	public int GetIsExecutingOnLoadHandler(int[] aIsExecutingOnLoadHandler) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 46, getAddress(), aIsExecutingOnLoadHandler);

-	}

-

-	public int GetLayoutHistoryState(int /*long*/[] aLayoutHistoryState) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 47, getAddress(), aLayoutHistoryState);

-	}

-

-	public int SetLayoutHistoryState(int /*long*/ aLayoutHistoryState) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 48, getAddress(), aLayoutHistoryState);

-	}

-

-	public int GetShouldSaveLayoutState(int[] aShouldSaveLayoutState) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 49, getAddress(), aShouldSaveLayoutState);

-	}

-

-	public int GetSecurityUI(int /*long*/[] aSecurityUI) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 50, getAddress(), aSecurityUI);

-	}

-

-	public int SetSecurityUI(int /*long*/ aSecurityUI) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 51, getAddress(), aSecurityUI);

-	}

-

-	public int SuspendRefreshURIs() {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 52, getAddress());

-	}

-

-	public int ResumeRefreshURIs() {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 53, getAddress());

-	}

-

-	public int BeginRestore(int /*long*/ viewer, int top) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 54, getAddress(), viewer, top);

-	}

-

-	public int FinishRestore() {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 55, getAddress());

-	}

-

-	public int GetRestoringDocument(int[] aRestoringDocument) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 56, getAddress(), aRestoringDocument);

-	}

-

-	public int GetUseErrorPages(int[] aUseErrorPages) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 57, getAddress(), aUseErrorPages);

-	}

-

-	public int SetUseErrorPages(int aUseErrorPages) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 58, getAddress(), aUseErrorPages);

-	}

-

-	public int GetPreviousTransIndex(int[] aPreviousTransIndex) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 59, getAddress(), aPreviousTransIndex);

-	}

-

-	public int GetLoadedTransIndex(int[] aLoadedTransIndex) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 60, getAddress(), aLoadedTransIndex);

-	}

-

-	public int HistoryPurged(int numEntries) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 61, getAddress(), numEntries);

-	}

-

-	public int GetSessionStorageForURI(int /*long*/ uri, int /*long*/[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 62, getAddress(), uri, _retval);

-	}

-

-	public int AddSessionStorage(int /*long*/ aDomain, int /*long*/ storage) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 63, getAddress(), aDomain, storage);

-	}

-

-	public int GetCurrentDocumentChannel(int /*long*/[] aCurrentDocumentChannel) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 64, getAddress(), aCurrentDocumentChannel);

-	}

-

-	public int SetChildOffset(int offset) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 65, getAddress(), offset);

-	}

-

-	public int GetIsInUnload(int[] aIsInUnload) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 66, getAddress(), aIsInUnload);

-	}

-

-	public int GetChannelIsUnsafe(int[] aChannelIsUnsafe) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 67, getAddress(), aChannelIsUnsafe);

-	}

-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java
index b036ae6..3bb3009 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java
@@ -1,81 +1,81 @@
-/* ***** BEGIN LICENSE BLOCK *****

- * Version: MPL 1.1

- *

- * The contents of this file are subject to the Mozilla Public License Version

- * 1.1 (the "License"); you may not use this file except in compliance with

- * the License. You may obtain a copy of the License at

- * http://www.mozilla.org/MPL/

- *

- * Software distributed under the License is distributed on an "AS IS" basis,

- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

- * for the specific language governing rights and limitations under the

- * License.

- *

- * The Original Code is Mozilla Communicator client code, released March 31, 1998.

- *

- * The Initial Developer of the Original Code is

- * Netscape Communications Corporation.

- * Portions created by Netscape are Copyright (C) 1998-1999

- * Netscape Communications Corporation.  All Rights Reserved.

- *

- * Contributor(s):

- *

- * IBM

- * -  Binding to permit interfacing between Mozilla and SWT

- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.

- *

- * ***** END LICENSE BLOCK ***** */

-package org.eclipse.swt.internal.mozilla;

-

-public class nsIEmbeddingSiteWindow extends nsISupports {

-

-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 8;

-

-	public static final String NS_IEMBEDDINGSITEWINDOW_IID_STR =

-		"3e5432cd-9568-4bd1-8cbe-d50aba110743";

-

-	public static final nsID NS_IEMBEDDINGSITEWINDOW_IID =

-		new nsID(NS_IEMBEDDINGSITEWINDOW_IID_STR);

-

-	public nsIEmbeddingSiteWindow(int /*long*/ address) {

-		super(address);

-	}

-

-	public static final int DIM_FLAGS_POSITION = 1;

-

-	public static final int DIM_FLAGS_SIZE_INNER = 2;

-

-	public static final int DIM_FLAGS_SIZE_OUTER = 4;

-

-	public int SetDimensions(int flags, int x, int y, int cx, int cy) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), flags, x, y, cx, cy);

-	}

-

-	public int GetDimensions(int flags, int[] x, int[] y, int[] cx, int[] cy) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), flags, x, y, cx, cy);

-	}

-

-	public int SetFocus() {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress());

-	}

-

-	public int GetVisibility(int[] aVisibility) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aVisibility);

-	}

-

-	public int SetVisibility(int aVisibility) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aVisibility);

-	}

-

-	public int GetTitle(int /*long*/[] aTitle) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aTitle);

-	}

-

-	public int SetTitle(char[] aTitle) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aTitle);

-	}

-

-	public int GetSiteWindow(int /*long*/[] aSiteWindow) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aSiteWindow);

-	}

-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIEmbeddingSiteWindow extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 8;
+
+	public static final String NS_IEMBEDDINGSITEWINDOW_IID_STR =
+		"3e5432cd-9568-4bd1-8cbe-d50aba110743";
+
+	public static final nsID NS_IEMBEDDINGSITEWINDOW_IID =
+		new nsID(NS_IEMBEDDINGSITEWINDOW_IID_STR);
+
+	public nsIEmbeddingSiteWindow(int /*long*/ address) {
+		super(address);
+	}
+
+	public static final int DIM_FLAGS_POSITION = 1;
+
+	public static final int DIM_FLAGS_SIZE_INNER = 2;
+
+	public static final int DIM_FLAGS_SIZE_OUTER = 4;
+
+	public int SetDimensions(int flags, int x, int y, int cx, int cy) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), flags, x, y, cx, cy);
+	}
+
+	public int GetDimensions(int flags, int[] x, int[] y, int[] cx, int[] cy) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), flags, x, y, cx, cy);
+	}
+
+	public int SetFocus() {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress());
+	}
+
+	public int GetVisibility(int[] aVisibility) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aVisibility);
+	}
+
+	public int SetVisibility(int aVisibility) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aVisibility);
+	}
+
+	public int GetTitle(int /*long*/[] aTitle) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aTitle);
+	}
+
+	public int SetTitle(char[] aTitle) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aTitle);
+	}
+
+	public int GetSiteWindow(int /*long*/[] aSiteWindow) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aSiteWindow);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFactory.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFactory.java
index 5e6f2d4..cd83018 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFactory.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFactory.java
@@ -1,51 +1,51 @@
-/* ***** BEGIN LICENSE BLOCK *****

- * Version: MPL 1.1

- *

- * The contents of this file are subject to the Mozilla Public License Version

- * 1.1 (the "License"); you may not use this file except in compliance with

- * the License. You may obtain a copy of the License at

- * http://www.mozilla.org/MPL/

- *

- * Software distributed under the License is distributed on an "AS IS" basis,

- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

- * for the specific language governing rights and limitations under the

- * License.

- *

- * The Original Code is Mozilla Communicator client code, released March 31, 1998.

- *

- * The Initial Developer of the Original Code is

- * Netscape Communications Corporation.

- * Portions created by Netscape are Copyright (C) 1998-1999

- * Netscape Communications Corporation.  All Rights Reserved.

- *

- * Contributor(s):

- *

- * IBM

- * -  Binding to permit interfacing between Mozilla and SWT

- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.

- *

- * ***** END LICENSE BLOCK ***** */

-package org.eclipse.swt.internal.mozilla;

-

-public class nsIFactory extends nsISupports {

-

-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 2;

-

-	public static final String NS_IFACTORY_IID_STR =

-		"00000001-0000-0000-c000-000000000046";

-

-	public static final nsID NS_IFACTORY_IID =

-		new nsID(NS_IFACTORY_IID_STR);

-

-	public nsIFactory(int /*long*/ address) {

-		super(address);

-	}

-

-	public int CreateInstance(int /*long*/ aOuter, nsID iid, int /*long*/[] result) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aOuter, iid, result);

-	}

-

-	public int LockFactory(int lock) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), lock);

-	}

-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIFactory extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 2;
+
+	public static final String NS_IFACTORY_IID_STR =
+		"00000001-0000-0000-c000-000000000046";
+
+	public static final nsID NS_IFACTORY_IID =
+		new nsID(NS_IFACTORY_IID_STR);
+
+	public nsIFactory(int /*long*/ address) {
+		super(address);
+	}
+
+	public int CreateInstance(int /*long*/ aOuter, nsID iid, int /*long*/[] result) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aOuter, iid, result);
+	}
+
+	public int LockFactory(int lock) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), lock);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFile.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFile.java
index 0897111..e5d51b0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFile.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFile.java
@@ -1,227 +1,227 @@
-/* ***** BEGIN LICENSE BLOCK *****

- * Version: MPL 1.1

- *

- * The contents of this file are subject to the Mozilla Public License Version

- * 1.1 (the "License"); you may not use this file except in compliance with

- * the License. You may obtain a copy of the License at

- * http://www.mozilla.org/MPL/

- *

- * Software distributed under the License is distributed on an "AS IS" basis,

- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

- * for the specific language governing rights and limitations under the

- * License.

- *

- * The Original Code is Mozilla Communicator client code, released March 31, 1998.

- *

- * The Initial Developer of the Original Code is

- * Netscape Communications Corporation.

- * Portions created by Netscape are Copyright (C) 1998-1999

- * Netscape Communications Corporation.  All Rights Reserved.

- *

- * Contributor(s):

- *

- * IBM

- * -  Binding to permit interfacing between Mozilla and SWT

- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.

- *

- * ***** END LICENSE BLOCK ***** */

-package org.eclipse.swt.internal.mozilla;

-

-public class nsIFile extends nsISupports {

-

-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 45;

-

-	public static final String NS_IFILE_IID_STR =

-		"c8c0a080-0868-11d3-915f-d9d889d48e3c";

-

-	public static final nsID NS_IFILE_IID =

-		new nsID(NS_IFILE_IID_STR);

-

-	public nsIFile(int /*long*/ address) {

-		super(address);

-	}

-

-	public static final int NORMAL_FILE_TYPE = 0;

-

-	public static final int DIRECTORY_TYPE = 1;

-

-	public int Append(int /*long*/ node) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), node);

-	}

-

-	public int AppendNative(int /*long*/ node) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), node);

-	}

-

-	public int Normalize() {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress());

-	}

-

-	public int Create(int type, int permissions) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), type, permissions);

-	}

-

-	public int GetLeafName(int /*long*/ aLeafName) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aLeafName);

-	}

-

-	public int SetLeafName(int /*long*/ aLeafName) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aLeafName);

-	}

-

-	public int GetNativeLeafName(int /*long*/ aNativeLeafName) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aNativeLeafName);

-	}

-

-	public int SetNativeLeafName(int /*long*/ aNativeLeafName) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aNativeLeafName);

-	}

-

-	public int CopyTo(int /*long*/ newParentDir, int /*long*/ newName) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), newParentDir, newName);

-	}

-

-	public int CopyToNative(int /*long*/ newParentDir, int /*long*/ newName) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), newParentDir, newName);

-	}

-

-	public int CopyToFollowingLinks(int /*long*/ newParentDir, int /*long*/ newName) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), newParentDir, newName);

-	}

-

-	public int CopyToFollowingLinksNative(int /*long*/ newParentDir, int /*long*/ newName) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), newParentDir, newName);

-	}

-

-	public int MoveTo(int /*long*/ newParentDir, int /*long*/ newName) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), newParentDir, newName);

-	}

-

-	public int MoveToNative(int /*long*/ newParentDir, int /*long*/ newName) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), newParentDir, newName);

-	}

-

-	public int Remove(int recursive) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), recursive);

-	}

-

-	public int GetPermissions(int[] aPermissions) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aPermissions);

-	}

-

-	public int SetPermissions(int aPermissions) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aPermissions);

-	}

-

-	public int GetPermissionsOfLink(int[] aPermissionsOfLink) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aPermissionsOfLink);

-	}

-

-	public int SetPermissionsOfLink(int aPermissionsOfLink) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), aPermissionsOfLink);

-	}

-

-	public int GetLastModifiedTime(long[] aLastModifiedTime) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), aLastModifiedTime);

-	}

-

-	public int SetLastModifiedTime(long aLastModifiedTime) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), aLastModifiedTime);

-	}

-

-	public int GetLastModifiedTimeOfLink(long[] aLastModifiedTimeOfLink) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), aLastModifiedTimeOfLink);

-	}

-

-	public int SetLastModifiedTimeOfLink(long aLastModifiedTimeOfLink) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), aLastModifiedTimeOfLink);

-	}

-

-	public int GetFileSize(long[] aFileSize) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), aFileSize);

-	}

-

-	public int SetFileSize(long aFileSize) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), aFileSize);

-	}

-

-	public int GetFileSizeOfLink(long[] aFileSizeOfLink) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aFileSizeOfLink);

-	}

-

-	public int GetTarget(int /*long*/ aTarget) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 27, getAddress(), aTarget);

-	}

-

-	public int GetNativeTarget(int /*long*/ aNativeTarget) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 28, getAddress(), aNativeTarget);

-	}

-

-	public int GetPath(int /*long*/ aPath) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 29, getAddress(), aPath);

-	}

-

-	public int GetNativePath(int /*long*/ aNativePath) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 30, getAddress(), aNativePath);

-	}

-

-	public int Exists(int[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 31, getAddress(), _retval);

-	}

-

-	public int IsWritable(int[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 32, getAddress(), _retval);

-	}

-

-	public int IsReadable(int[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 33, getAddress(), _retval);

-	}

-

-	public int IsExecutable(int[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 34, getAddress(), _retval);

-	}

-

-	public int IsHidden(int[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 35, getAddress(), _retval);

-	}

-

-	public int IsDirectory(int[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 36, getAddress(), _retval);

-	}

-

-	public int IsFile(int[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 37, getAddress(), _retval);

-	}

-

-	public int IsSymlink(int[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 38, getAddress(), _retval);

-	}

-

-	public int IsSpecial(int[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 39, getAddress(), _retval);

-	}

-

-	public int CreateUnique(int type, int permissions) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 40, getAddress(), type, permissions);

-	}

-

-	public int Clone(int /*long*/[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 41, getAddress(), _retval);

-	}

-

-	public int Equals(int /*long*/ inFile, int[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 42, getAddress(), inFile, _retval);

-	}

-

-	public int Contains(int /*long*/ inFile, int recur, int[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 43, getAddress(), inFile, recur, _retval);

-	}

-

-	public int GetParent(int /*long*/[] aParent) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 44, getAddress(), aParent);

-	}

-

-	public int GetDirectoryEntries(int /*long*/[] aDirectoryEntries) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 45, getAddress(), aDirectoryEntries);

-	}

-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIFile extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 45;
+
+	public static final String NS_IFILE_IID_STR =
+		"c8c0a080-0868-11d3-915f-d9d889d48e3c";
+
+	public static final nsID NS_IFILE_IID =
+		new nsID(NS_IFILE_IID_STR);
+
+	public nsIFile(int /*long*/ address) {
+		super(address);
+	}
+
+	public static final int NORMAL_FILE_TYPE = 0;
+
+	public static final int DIRECTORY_TYPE = 1;
+
+	public int Append(int /*long*/ node) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), node);
+	}
+
+	public int AppendNative(int /*long*/ node) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), node);
+	}
+
+	public int Normalize() {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress());
+	}
+
+	public int Create(int type, int permissions) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), type, permissions);
+	}
+
+	public int GetLeafName(int /*long*/ aLeafName) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aLeafName);
+	}
+
+	public int SetLeafName(int /*long*/ aLeafName) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aLeafName);
+	}
+
+	public int GetNativeLeafName(int /*long*/ aNativeLeafName) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aNativeLeafName);
+	}
+
+	public int SetNativeLeafName(int /*long*/ aNativeLeafName) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aNativeLeafName);
+	}
+
+	public int CopyTo(int /*long*/ newParentDir, int /*long*/ newName) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), newParentDir, newName);
+	}
+
+	public int CopyToNative(int /*long*/ newParentDir, int /*long*/ newName) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), newParentDir, newName);
+	}
+
+	public int CopyToFollowingLinks(int /*long*/ newParentDir, int /*long*/ newName) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), newParentDir, newName);
+	}
+
+	public int CopyToFollowingLinksNative(int /*long*/ newParentDir, int /*long*/ newName) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), newParentDir, newName);
+	}
+
+	public int MoveTo(int /*long*/ newParentDir, int /*long*/ newName) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), newParentDir, newName);
+	}
+
+	public int MoveToNative(int /*long*/ newParentDir, int /*long*/ newName) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), newParentDir, newName);
+	}
+
+	public int Remove(int recursive) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), recursive);
+	}
+
+	public int GetPermissions(int[] aPermissions) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aPermissions);
+	}
+
+	public int SetPermissions(int aPermissions) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aPermissions);
+	}
+
+	public int GetPermissionsOfLink(int[] aPermissionsOfLink) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aPermissionsOfLink);
+	}
+
+	public int SetPermissionsOfLink(int aPermissionsOfLink) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), aPermissionsOfLink);
+	}
+
+	public int GetLastModifiedTime(long[] aLastModifiedTime) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), aLastModifiedTime);
+	}
+
+	public int SetLastModifiedTime(long aLastModifiedTime) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), aLastModifiedTime);
+	}
+
+	public int GetLastModifiedTimeOfLink(long[] aLastModifiedTimeOfLink) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), aLastModifiedTimeOfLink);
+	}
+
+	public int SetLastModifiedTimeOfLink(long aLastModifiedTimeOfLink) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), aLastModifiedTimeOfLink);
+	}
+
+	public int GetFileSize(long[] aFileSize) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), aFileSize);
+	}
+
+	public int SetFileSize(long aFileSize) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), aFileSize);
+	}
+
+	public int GetFileSizeOfLink(long[] aFileSizeOfLink) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aFileSizeOfLink);
+	}
+
+	public int GetTarget(int /*long*/ aTarget) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 27, getAddress(), aTarget);
+	}
+
+	public int GetNativeTarget(int /*long*/ aNativeTarget) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 28, getAddress(), aNativeTarget);
+	}
+
+	public int GetPath(int /*long*/ aPath) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 29, getAddress(), aPath);
+	}
+
+	public int GetNativePath(int /*long*/ aNativePath) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 30, getAddress(), aNativePath);
+	}
+
+	public int Exists(int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 31, getAddress(), _retval);
+	}
+
+	public int IsWritable(int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 32, getAddress(), _retval);
+	}
+
+	public int IsReadable(int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 33, getAddress(), _retval);
+	}
+
+	public int IsExecutable(int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 34, getAddress(), _retval);
+	}
+
+	public int IsHidden(int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 35, getAddress(), _retval);
+	}
+
+	public int IsDirectory(int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 36, getAddress(), _retval);
+	}
+
+	public int IsFile(int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 37, getAddress(), _retval);
+	}
+
+	public int IsSymlink(int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 38, getAddress(), _retval);
+	}
+
+	public int IsSpecial(int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 39, getAddress(), _retval);
+	}
+
+	public int CreateUnique(int type, int permissions) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 40, getAddress(), type, permissions);
+	}
+
+	public int Clone(int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 41, getAddress(), _retval);
+	}
+
+	public int Equals(int /*long*/ inFile, int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 42, getAddress(), inFile, _retval);
+	}
+
+	public int Contains(int /*long*/ inFile, int recur, int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 43, getAddress(), inFile, recur, _retval);
+	}
+
+	public int GetParent(int /*long*/[] aParent) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 44, getAddress(), aParent);
+	}
+
+	public int GetDirectoryEntries(int /*long*/[] aDirectoryEntries) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 45, getAddress(), aDirectoryEntries);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java
index a7617ec..22b0ed3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java
@@ -1,118 +1,118 @@
-/* ***** BEGIN LICENSE BLOCK *****

- * Version: MPL 1.1

- *

- * The contents of this file are subject to the Mozilla Public License Version

- * 1.1 (the "License"); you may not use this file except in compliance with

- * the License. You may obtain a copy of the License at

- * http://www.mozilla.org/MPL/

- *

- * Software distributed under the License is distributed on an "AS IS" basis,

- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

- * for the specific language governing rights and limitations under the

- * License.

- *

- * The Original Code is Mozilla Communicator client code, released March 31, 1998.

- *

- * The Initial Developer of the Original Code is

- * Netscape Communications Corporation.

- * Portions created by Netscape are Copyright (C) 1998-1999

- * Netscape Communications Corporation.  All Rights Reserved.

- *

- * Contributor(s):

- *

- * IBM

- * -  Binding to permit interfacing between Mozilla and SWT

- * -  Copyright (C) 2003 IBM Corp.  All Rights Reserved.

- *

- * ***** END LICENSE BLOCK ***** */

-package org.eclipse.swt.internal.mozilla;

-

-public class nsIFilePicker_1_8 extends nsISupports {

-

-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 15;

-

-	public static final String NS_IFILEPICKER_IID_STR =

-		"80faf095-c807-4558-a2cc-185ed70754ea";

-

-	public static final nsID NS_IFILEPICKER_IID =

-		new nsID(NS_IFILEPICKER_IID_STR);

-

-	public nsIFilePicker_1_8(int /*long*/ address) {

-		super(address);

-	}

-

-	public static final int modeOpen = 0;

-	public static final int modeSave = 1;

-	public static final int modeGetFolder = 2;

-	public static final int modeOpenMultiple = 3;

-	public static final int returnOK = 0;

-	public static final int returnCancel = 1;

-	public static final int returnReplace = 2;

-	public static final int filterAll = 1;

-	public static final int filterHTML = 2;

-	public static final int filterText = 4;

-	public static final int filterImages = 8;

-	public static final int filterXML = 16;

-	public static final int filterXUL = 32;

-	public static final int filterApps = 64;

-

-	public int Init(int /*long*/ parent, int /*long*/ title, int mode) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), parent, title, mode);

-	}

-

-	public int AppendFilters(int filterMask) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), filterMask);

-	}

-

-	public int AppendFilter(int /*long*/ title, int /*long*/ filter) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), title, filter);

-	}

-

-	public int GetDefaultString(int /*long*/ aDefaultString) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aDefaultString);

-	}

-

-	public int SetDefaultString(int /*long*/ aDefaultString) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aDefaultString);

-	}

-

-	public int GetDefaultExtension(int /*long*/ aDefaultExtension) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aDefaultExtension);

-	}

-

-	public int SetDefaultExtension(int /*long*/ aDefaultExtension) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aDefaultExtension);

-	}

-

-	public int GetFilterIndex(int[] aFilterIndex) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aFilterIndex);

-	}

-

-	public int SetFilterIndex(int aFilterIndex) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aFilterIndex);

-	}

-

-	public int GetDisplayDirectory(int /*long*/[] aDisplayDirectory) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aDisplayDirectory);

-	}

-

-	public int SetDisplayDirectory(int /*long*/ aDisplayDirectory) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aDisplayDirectory);

-	}

-

-	public int GetFile(int /*long*/[] aFile) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aFile);

-	}

-

-	public int GetFileURL(int /*long*/[] aFileURL) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aFileURL);

-	}

-

-	public int GetFiles(int /*long*/[] aFiles) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aFiles);

-	}

-

-	public int Show(int /*long*/ _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), _retval);

-	}

-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIFilePicker_1_8 extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 15;
+
+	public static final String NS_IFILEPICKER_IID_STR =
+		"80faf095-c807-4558-a2cc-185ed70754ea";
+
+	public static final nsID NS_IFILEPICKER_IID =
+		new nsID(NS_IFILEPICKER_IID_STR);
+
+	public nsIFilePicker_1_8(int /*long*/ address) {
+		super(address);
+	}
+
+	public static final int modeOpen = 0;
+	public static final int modeSave = 1;
+	public static final int modeGetFolder = 2;
+	public static final int modeOpenMultiple = 3;
+	public static final int returnOK = 0;
+	public static final int returnCancel = 1;
+	public static final int returnReplace = 2;
+	public static final int filterAll = 1;
+	public static final int filterHTML = 2;
+	public static final int filterText = 4;
+	public static final int filterImages = 8;
+	public static final int filterXML = 16;
+	public static final int filterXUL = 32;
+	public static final int filterApps = 64;
+
+	public int Init(int /*long*/ parent, int /*long*/ title, int mode) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), parent, title, mode);
+	}
+
+	public int AppendFilters(int filterMask) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), filterMask);
+	}
+
+	public int AppendFilter(int /*long*/ title, int /*long*/ filter) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), title, filter);
+	}
+
+	public int GetDefaultString(int /*long*/ aDefaultString) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aDefaultString);
+	}
+
+	public int SetDefaultString(int /*long*/ aDefaultString) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aDefaultString);
+	}
+
+	public int GetDefaultExtension(int /*long*/ aDefaultExtension) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aDefaultExtension);
+	}
+
+	public int SetDefaultExtension(int /*long*/ aDefaultExtension) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aDefaultExtension);
+	}
+
+	public int GetFilterIndex(int[] aFilterIndex) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aFilterIndex);
+	}
+
+	public int SetFilterIndex(int aFilterIndex) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aFilterIndex);
+	}
+
+	public int GetDisplayDirectory(int /*long*/[] aDisplayDirectory) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aDisplayDirectory);
+	}
+
+	public int SetDisplayDirectory(int /*long*/ aDisplayDirectory) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aDisplayDirectory);
+	}
+
+	public int GetFile(int /*long*/[] aFile) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aFile);
+	}
+
+	public int GetFileURL(int /*long*/[] aFileURL) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aFileURL);
+	}
+
+	public int GetFiles(int /*long*/[] aFiles) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aFiles);
+	}
+
+	public int Show(int /*long*/ _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), _retval);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java
index 383669b..c003eb6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java
@@ -1,79 +1,79 @@
-/* ***** BEGIN LICENSE BLOCK *****

- * Version: MPL 1.1

- *

- * The contents of this file are subject to the Mozilla Public License Version

- * 1.1 (the "License"); you may not use this file except in compliance with

- * the License. You may obtain a copy of the License at

- * http://www.mozilla.org/MPL/

- *

- * Software distributed under the License is distributed on an "AS IS" basis,

- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

- * for the specific language governing rights and limitations under the

- * License.

- *

- * The Original Code is Mozilla Communicator client code, released March 31, 1998.

- *

- * The Initial Developer of the Original Code is

- * Netscape Communications Corporation.

- * Portions created by Netscape are Copyright (C) 1998-1999

- * Netscape Communications Corporation.  All Rights Reserved.

- *

- * Contributor(s):

- *

- * IBM

- * -  Binding to permit interfacing between Mozilla and SWT

- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.

- *

- * ***** END LICENSE BLOCK ***** */

-package org.eclipse.swt.internal.mozilla;

-

-public class nsIHelperAppLauncher extends nsISupports {

-

-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 9;

-

-	public static final String NS_IHELPERAPPLAUNCHER_IID_STR =

-		"9503d0fe-4c9d-11d4-98d0-001083010e9b";

-

-	public static final nsID NS_IHELPERAPPLAUNCHER_IID =

-		new nsID(NS_IHELPERAPPLAUNCHER_IID_STR);

-

-	public nsIHelperAppLauncher(int /*long*/ address) {

-		super(address);

-	}

-

-	public int GetMIMEInfo(int /*long*/[] aMIMEInfo) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aMIMEInfo);

-	}

-

-	public int GetSource(int /*long*/[] aSource) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSource);

-	}

-

-	public int GetSuggestedFileName(int /*long*/[] aSuggestedFileName) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aSuggestedFileName);

-	}

-

-	public int SaveToDisk(int /*long*/ aNewFileLocation, int aRememberThisPreference) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aNewFileLocation, aRememberThisPreference);

-	}

-

-	public int LaunchWithApplication(int /*long*/ aApplication, int aRememberThisPreference) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aApplication, aRememberThisPreference);

-	}

-

-	public int Cancel() {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress());

-	}

-

-	public int SetWebProgressListener(int /*long*/ aWebProgressListener) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aWebProgressListener);

-	}

-

-	public int CloseProgressWindow() {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress());

-	}

-

-	public int GetDownloadInfo(int /*long*/[] aSourceUrl, long[] aTimeDownloadStarted, int /*long*/[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aSourceUrl, aTimeDownloadStarted, _retval);

-	}

-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIHelperAppLauncher extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 9;
+
+	public static final String NS_IHELPERAPPLAUNCHER_IID_STR =
+		"9503d0fe-4c9d-11d4-98d0-001083010e9b";
+
+	public static final nsID NS_IHELPERAPPLAUNCHER_IID =
+		new nsID(NS_IHELPERAPPLAUNCHER_IID_STR);
+
+	public nsIHelperAppLauncher(int /*long*/ address) {
+		super(address);
+	}
+
+	public int GetMIMEInfo(int /*long*/[] aMIMEInfo) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aMIMEInfo);
+	}
+
+	public int GetSource(int /*long*/[] aSource) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSource);
+	}
+
+	public int GetSuggestedFileName(int /*long*/[] aSuggestedFileName) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aSuggestedFileName);
+	}
+
+	public int SaveToDisk(int /*long*/ aNewFileLocation, int aRememberThisPreference) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aNewFileLocation, aRememberThisPreference);
+	}
+
+	public int LaunchWithApplication(int /*long*/ aApplication, int aRememberThisPreference) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aApplication, aRememberThisPreference);
+	}
+
+	public int Cancel() {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress());
+	}
+
+	public int SetWebProgressListener(int /*long*/ aWebProgressListener) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aWebProgressListener);
+	}
+
+	public int CloseProgressWindow() {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress());
+	}
+
+	public int GetDownloadInfo(int /*long*/[] aSourceUrl, long[] aTimeDownloadStarted, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aSourceUrl, aTimeDownloadStarted, _retval);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.java
index 104e143..c97f263 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.java
@@ -54,4 +54,4 @@
 	public int PromptForSaveToFile(int /*long*/ aLauncher, int /*long*/ aWindowContext, char[] aDefaultFileName, char[] aSuggestedFileExtension, int aForcePrompt, int /*long*/[] _retval) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aLauncher, aWindowContext, aDefaultFileName, aSuggestedFileExtension, aForcePrompt, _retval);
 	}
-}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java
index 1bb57c9..1aca93b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java
@@ -1,79 +1,79 @@
-/* ***** BEGIN LICENSE BLOCK *****

- * Version: MPL 1.1

- *

- * The contents of this file are subject to the Mozilla Public License Version

- * 1.1 (the "License"); you may not use this file except in compliance with

- * the License. You may obtain a copy of the License at

- * http://www.mozilla.org/MPL/

- *

- * Software distributed under the License is distributed on an "AS IS" basis,

- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

- * for the specific language governing rights and limitations under the

- * License.

- *

- * The Original Code is Mozilla Communicator client code, released March 31, 1998.

- *

- * The Initial Developer of the Original Code is

- * Netscape Communications Corporation.

- * Portions created by Netscape are Copyright (C) 1998-1999

- * Netscape Communications Corporation.  All Rights Reserved.

- *

- * Contributor(s):

- *

- * IBM

- * -  Binding to permit interfacing between Mozilla and SWT

- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.

- *

- * ***** END LICENSE BLOCK ***** */

-package org.eclipse.swt.internal.mozilla;

-

-public class nsIHelperAppLauncher_1_8 extends nsICancelable {

-

-	static final int LAST_METHOD_ID = nsICancelable.LAST_METHOD_ID + 9;

-

-	public static final String NS_IHELPERAPPLAUNCHER_IID_STR =

-		"99a0882d-2ff9-4659-9952-9ac531ba5592";

-

-	public static final nsID NS_IHELPERAPPLAUNCHER_IID =

-		new nsID(NS_IHELPERAPPLAUNCHER_IID_STR);

-

-	public nsIHelperAppLauncher_1_8(int /*long*/ address) {

-		super(address);

-	}

-

-	public int GetMIMEInfo(int /*long*/[] aMIMEInfo) {

-		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 1, getAddress(), aMIMEInfo);

-	}

-

-	public int GetSource(int /*long*/[] aSource) {

-		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 2, getAddress(), aSource);

-	}

-

-	public int GetSuggestedFileName(int /*long*/ aSuggestedFileName) {

-		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 3, getAddress(), aSuggestedFileName);

-	}

-

-	public int SaveToDisk(int /*long*/ aNewFileLocation, int aRememberThisPreference) {

-		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 4, getAddress(), aNewFileLocation, aRememberThisPreference);

-	}

-

-	public int LaunchWithApplication(int /*long*/ aApplication, int aRememberThisPreference) {

-		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 5, getAddress(), aApplication, aRememberThisPreference);

-	}

-

-	public int SetWebProgressListener(int /*long*/ aWebProgressListener) {

-		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 6, getAddress(), aWebProgressListener);

-	}

-

-	public int CloseProgressWindow() {

-		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 7, getAddress());

-	}

-

-	public int GetTargetFile(int /*long*/[] aTargetFile) {

-		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 8, getAddress(), aTargetFile);

-	}

-

-	public int GetTimeDownloadStarted(int /*long*/ aTimeDownloadStarted) {

-		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 9, getAddress(), aTimeDownloadStarted);

-	}

-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIHelperAppLauncher_1_8 extends nsICancelable {
+
+	static final int LAST_METHOD_ID = nsICancelable.LAST_METHOD_ID + 9;
+
+	public static final String NS_IHELPERAPPLAUNCHER_IID_STR =
+		"99a0882d-2ff9-4659-9952-9ac531ba5592";
+
+	public static final nsID NS_IHELPERAPPLAUNCHER_IID =
+		new nsID(NS_IHELPERAPPLAUNCHER_IID_STR);
+
+	public nsIHelperAppLauncher_1_8(int /*long*/ address) {
+		super(address);
+	}
+
+	public int GetMIMEInfo(int /*long*/[] aMIMEInfo) {
+		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 1, getAddress(), aMIMEInfo);
+	}
+
+	public int GetSource(int /*long*/[] aSource) {
+		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 2, getAddress(), aSource);
+	}
+
+	public int GetSuggestedFileName(int /*long*/ aSuggestedFileName) {
+		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 3, getAddress(), aSuggestedFileName);
+	}
+
+	public int SaveToDisk(int /*long*/ aNewFileLocation, int aRememberThisPreference) {
+		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 4, getAddress(), aNewFileLocation, aRememberThisPreference);
+	}
+
+	public int LaunchWithApplication(int /*long*/ aApplication, int aRememberThisPreference) {
+		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 5, getAddress(), aApplication, aRememberThisPreference);
+	}
+
+	public int SetWebProgressListener(int /*long*/ aWebProgressListener) {
+		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 6, getAddress(), aWebProgressListener);
+	}
+
+	public int CloseProgressWindow() {
+		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 7, getAddress());
+	}
+
+	public int GetTargetFile(int /*long*/[] aTargetFile) {
+		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 8, getAddress(), aTargetFile);
+	}
+
+	public int GetTimeDownloadStarted(int /*long*/ aTimeDownloadStarted) {
+		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 9, getAddress(), aTimeDownloadStarted);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java
index eea4094..d277e75 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java
@@ -1,83 +1,83 @@
-/* ***** BEGIN LICENSE BLOCK *****

- * Version: MPL 1.1

- *

- * The contents of this file are subject to the Mozilla Public License Version

- * 1.1 (the "License"); you may not use this file except in compliance with

- * the License. You may obtain a copy of the License at

- * http://www.mozilla.org/MPL/

- *

- * Software distributed under the License is distributed on an "AS IS" basis,

- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

- * for the specific language governing rights and limitations under the

- * License.

- *

- * The Original Code is Mozilla Communicator client code, released March 31, 1998.

- *

- * The Initial Developer of the Original Code is

- * Netscape Communications Corporation.

- * Portions created by Netscape are Copyright (C) 1998-1999

- * Netscape Communications Corporation.  All Rights Reserved.

- *

- * Contributor(s):

- *

- * IBM

- * -  Binding to permit interfacing between Mozilla and SWT

- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.

- *

- * ***** END LICENSE BLOCK ***** */

-package org.eclipse.swt.internal.mozilla;

-

-public class nsIHelperAppLauncher_1_9 extends nsICancelable {

-

-	static final int LAST_METHOD_ID = nsICancelable.LAST_METHOD_ID + 10;

-

-	public static final String NS_IHELPERAPPLAUNCHER_IID_STR =

-		"cc75c21a-0a79-4f68-90e1-563253d0c555";

-

-	public static final nsID NS_IHELPERAPPLAUNCHER_IID =

-		new nsID(NS_IHELPERAPPLAUNCHER_IID_STR);

-

-	public nsIHelperAppLauncher_1_9(int /*long*/ address) {

-		super(address);

-	}

-

-	public int GetMIMEInfo(int /*long*/[] aMIMEInfo) {

-		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 1, getAddress(), aMIMEInfo);

-	}

-

-	public int GetSource(int /*long*/[] aSource) {

-		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 2, getAddress(), aSource);

-	}

-

-	public int GetSuggestedFileName(int /*long*/ aSuggestedFileName) {

-		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 3, getAddress(), aSuggestedFileName);

-	}

-

-	public int SaveToDisk(int /*long*/ aNewFileLocation, int aRememberThisPreference) {

-		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 4, getAddress(), aNewFileLocation, aRememberThisPreference);

-	}

-

-	public int LaunchWithApplication(int /*long*/ aApplication, int aRememberThisPreference) {

-		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 5, getAddress(), aApplication, aRememberThisPreference);

-	}

-

-	public int SetWebProgressListener(int /*long*/ aWebProgressListener) {

-		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 6, getAddress(), aWebProgressListener);

-	}

-

-	public int CloseProgressWindow() {

-		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 7, getAddress());

-	}

-

-	public int GetTargetFile(int /*long*/[] aTargetFile) {

-		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 8, getAddress(), aTargetFile);

-	}

-

-	public int GetTargetFileIsExecutable(int[] aTargetFileIsExecutable) {

-		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 9, getAddress(), aTargetFileIsExecutable);

-	}

-

-	public int GetTimeDownloadStarted(int /*long*/ aTimeDownloadStarted) {

-		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 10, getAddress(), aTimeDownloadStarted);

-	}

-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIHelperAppLauncher_1_9 extends nsICancelable {
+
+	static final int LAST_METHOD_ID = nsICancelable.LAST_METHOD_ID + 10;
+
+	public static final String NS_IHELPERAPPLAUNCHER_IID_STR =
+		"cc75c21a-0a79-4f68-90e1-563253d0c555";
+
+	public static final nsID NS_IHELPERAPPLAUNCHER_IID =
+		new nsID(NS_IHELPERAPPLAUNCHER_IID_STR);
+
+	public nsIHelperAppLauncher_1_9(int /*long*/ address) {
+		super(address);
+	}
+
+	public int GetMIMEInfo(int /*long*/[] aMIMEInfo) {
+		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 1, getAddress(), aMIMEInfo);
+	}
+
+	public int GetSource(int /*long*/[] aSource) {
+		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 2, getAddress(), aSource);
+	}
+
+	public int GetSuggestedFileName(int /*long*/ aSuggestedFileName) {
+		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 3, getAddress(), aSuggestedFileName);
+	}
+
+	public int SaveToDisk(int /*long*/ aNewFileLocation, int aRememberThisPreference) {
+		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 4, getAddress(), aNewFileLocation, aRememberThisPreference);
+	}
+
+	public int LaunchWithApplication(int /*long*/ aApplication, int aRememberThisPreference) {
+		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 5, getAddress(), aApplication, aRememberThisPreference);
+	}
+
+	public int SetWebProgressListener(int /*long*/ aWebProgressListener) {
+		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 6, getAddress(), aWebProgressListener);
+	}
+
+	public int CloseProgressWindow() {
+		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 7, getAddress());
+	}
+
+	public int GetTargetFile(int /*long*/[] aTargetFile) {
+		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 8, getAddress(), aTargetFile);
+	}
+
+	public int GetTargetFileIsExecutable(int[] aTargetFileIsExecutable) {
+		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 9, getAddress(), aTargetFileIsExecutable);
+	}
+
+	public int GetTimeDownloadStarted(int /*long*/ aTimeDownloadStarted) {
+		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 10, getAddress(), aTimeDownloadStarted);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIIOService.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIIOService.java
index 961bdd8..a4b52e1 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIIOService.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIIOService.java
@@ -1,83 +1,83 @@
-/* ***** BEGIN LICENSE BLOCK *****

- * Version: MPL 1.1

- *

- * The contents of this file are subject to the Mozilla Public License Version

- * 1.1 (the "License"); you may not use this file except in compliance with

- * the License. You may obtain a copy of the License at

- * http://www.mozilla.org/MPL/

- *

- * Software distributed under the License is distributed on an "AS IS" basis,

- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

- * for the specific language governing rights and limitations under the

- * License.

- *

- * The Original Code is Mozilla Communicator client code, released March 31, 1998.

- *

- * The Initial Developer of the Original Code is

- * Netscape Communications Corporation.

- * Portions created by Netscape are Copyright (C) 1998-1999

- * Netscape Communications Corporation.  All Rights Reserved.

- *

- * Contributor(s):

- *

- * IBM

- * -  Binding to permit interfacing between Mozilla and SWT

- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.

- *

- * ***** END LICENSE BLOCK ***** */

-package org.eclipse.swt.internal.mozilla;

-

-public class nsIIOService extends nsISupports {

-

-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 10;

-

-	public static final String NS_IIOSERVICE_IID_STR =

-		"bddeda3f-9020-4d12-8c70-984ee9f7935e";

-

-	public static final nsID NS_IIOSERVICE_IID =

-		new nsID(NS_IIOSERVICE_IID_STR);

-

-	public nsIIOService(int /*long*/ address) {

-		super(address);

-	}

-

-	public int GetProtocolHandler(byte[] aScheme, int /*long*/[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aScheme, _retval);

-	}

-

-	public int GetProtocolFlags(byte[] aScheme, int[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aScheme, _retval);

-	}

-

-	public int NewURI(int /*long*/ aSpec, byte[] aOriginCharset, int /*long*/ aBaseURI, int /*long*/[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aSpec, aOriginCharset, aBaseURI, _retval);

-	}

-

-	public int NewFileURI(int /*long*/ aFile, int /*long*/[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aFile, _retval);

-	}

-

-	public int NewChannelFromURI(int /*long*/ aURI, int /*long*/[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aURI, _retval);

-	}

-

-	public int NewChannel(int /*long*/ aSpec, byte[] aOriginCharset, int /*long*/ aBaseURI, int /*long*/[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aSpec, aOriginCharset, aBaseURI, _retval);

-	}

-

-	public int GetOffline(int[] aOffline) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aOffline);

-	}

-

-	public int SetOffline(int aOffline) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aOffline);

-	}

-

-	public int AllowPort(int aPort, byte[] aScheme, int[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPort, aScheme, _retval);

-	}

-

-	public int ExtractScheme(int /*long*/ urlString, int /*long*/ _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), urlString, _retval);

-	}

-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIIOService extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 10;
+
+	public static final String NS_IIOSERVICE_IID_STR =
+		"bddeda3f-9020-4d12-8c70-984ee9f7935e";
+
+	public static final nsID NS_IIOSERVICE_IID =
+		new nsID(NS_IIOSERVICE_IID_STR);
+
+	public nsIIOService(int /*long*/ address) {
+		super(address);
+	}
+
+	public int GetProtocolHandler(byte[] aScheme, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aScheme, _retval);
+	}
+
+	public int GetProtocolFlags(byte[] aScheme, int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aScheme, _retval);
+	}
+
+	public int NewURI(int /*long*/ aSpec, byte[] aOriginCharset, int /*long*/ aBaseURI, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aSpec, aOriginCharset, aBaseURI, _retval);
+	}
+
+	public int NewFileURI(int /*long*/ aFile, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aFile, _retval);
+	}
+
+	public int NewChannelFromURI(int /*long*/ aURI, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aURI, _retval);
+	}
+
+	public int NewChannel(int /*long*/ aSpec, byte[] aOriginCharset, int /*long*/ aBaseURI, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aSpec, aOriginCharset, aBaseURI, _retval);
+	}
+
+	public int GetOffline(int[] aOffline) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aOffline);
+	}
+
+	public int SetOffline(int aOffline) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aOffline);
+	}
+
+	public int AllowPort(int aPort, byte[] aScheme, int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPort, aScheme, _retval);
+	}
+
+	public int ExtractScheme(int /*long*/ urlString, int /*long*/ _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), urlString, _retval);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIInputStream.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIInputStream.java
index 49dbe03..62959ad 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIInputStream.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIInputStream.java
@@ -1,63 +1,63 @@
-/* ***** BEGIN LICENSE BLOCK *****

- * Version: MPL 1.1

- *

- * The contents of this file are subject to the Mozilla Public License Version

- * 1.1 (the "License"); you may not use this file except in compliance with

- * the License. You may obtain a copy of the License at

- * http://www.mozilla.org/MPL/

- *

- * Software distributed under the License is distributed on an "AS IS" basis,

- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

- * for the specific language governing rights and limitations under the

- * License.

- *

- * The Original Code is Mozilla Communicator client code, released March 31, 1998.

- *

- * The Initial Developer of the Original Code is

- * Netscape Communications Corporation.

- * Portions created by Netscape are Copyright (C) 1998-1999

- * Netscape Communications Corporation.  All Rights Reserved.

- *

- * Contributor(s):

- *

- * IBM

- * -  Binding to permit interfacing between Mozilla and SWT

- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.

- *

- * ***** END LICENSE BLOCK ***** */

-package org.eclipse.swt.internal.mozilla;

-

-public class nsIInputStream extends nsISupports {

-

-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 5;

-

-	public static final String NS_IINPUTSTREAM_IID_STR =

-		"fa9c7f6c-61b3-11d4-9877-00c04fa0cf4a";

-

-	public static final nsID NS_IINPUTSTREAM_IID =

-		new nsID(NS_IINPUTSTREAM_IID_STR);

-

-	public nsIInputStream(int /*long*/ address) {

-		super(address);

-	}

-

-	public int Close() {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress());

-	}

-

-	public int Available(int[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval);

-	}

-

-	public int Read(byte[] aBuf, int aCount, int[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aBuf, aCount, _retval);

-	}

-

-	public int ReadSegments(int /*long*/ aWriter, int /*long*/ aClosure, int aCount, int[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aWriter, aClosure, aCount, _retval);

-	}

-

-	public int IsNonBlocking(int[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), _retval);

-	}

-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIInputStream extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 5;
+
+	public static final String NS_IINPUTSTREAM_IID_STR =
+		"fa9c7f6c-61b3-11d4-9877-00c04fa0cf4a";
+
+	public static final nsID NS_IINPUTSTREAM_IID =
+		new nsID(NS_IINPUTSTREAM_IID_STR);
+
+	public nsIInputStream(int /*long*/ address) {
+		super(address);
+	}
+
+	public int Close() {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress());
+	}
+
+	public int Available(int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval);
+	}
+
+	public int Read(byte[] aBuf, int aCount, int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aBuf, aCount, _retval);
+	}
+
+	public int ReadSegments(int /*long*/ aWriter, int /*long*/ aClosure, int aCount, int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aWriter, aClosure, aCount, _retval);
+	}
+
+	public int IsNonBlocking(int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), _retval);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIJSContextStack.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIJSContextStack.java
index 4954e44..5dbedbe 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIJSContextStack.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIJSContextStack.java
@@ -1,59 +1,59 @@
-/* ***** BEGIN LICENSE BLOCK *****

- * Version: MPL 1.1

- *

- * The contents of this file are subject to the Mozilla Public License Version

- * 1.1 (the "License"); you may not use this file except in compliance with

- * the License. You may obtain a copy of the License at

- * http://www.mozilla.org/MPL/

- *

- * Software distributed under the License is distributed on an "AS IS" basis,

- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

- * for the specific language governing rights and limitations under the

- * License.

- *

- * The Original Code is Mozilla Communicator client code, released March 31, 1998.

- *

- * The Initial Developer of the Original Code is

- * Netscape Communications Corporation.

- * Portions created by Netscape are Copyright (C) 1998-1999

- * Netscape Communications Corporation.  All Rights Reserved.

- *

- * Contributor(s):

- *

- * IBM

- * -  Binding to permit interfacing between Mozilla and SWT

- * -  Copyright (C) 2003 IBM Corp.  All Rights Reserved.

- *

- * ***** END LICENSE BLOCK ***** */

-package org.eclipse.swt.internal.mozilla;

-

-public class nsIJSContextStack extends nsISupports {

-

-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 4;

-

-	public static final String NS_IJSCONTEXTSTACK_IID_STR =

-		"c67d8270-3189-11d3-9885-006008962422";

-

-	public static final nsID NS_IJSCONTEXTSTACK_IID =

-		new nsID(NS_IJSCONTEXTSTACK_IID_STR);

-

-	public nsIJSContextStack(int /*long*/ address) {

-		super(address);

-	}

-

-	public int GetCount(int[] aCount) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aCount);

-	}

-

-	public int Peek(int /*long*/[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval);

-	}

-

-	public int Pop(int /*long*/[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), _retval);

-	}

-

-	public int Push(int /*long*/ cx) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), cx);

-	}

-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIJSContextStack extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 4;
+
+	public static final String NS_IJSCONTEXTSTACK_IID_STR =
+		"c67d8270-3189-11d3-9885-006008962422";
+
+	public static final nsID NS_IJSCONTEXTSTACK_IID =
+		new nsID(NS_IJSCONTEXTSTACK_IID_STR);
+
+	public nsIJSContextStack(int /*long*/ address) {
+		super(address);
+	}
+
+	public int GetCount(int[] aCount) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aCount);
+	}
+
+	public int Peek(int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval);
+	}
+
+	public int Pop(int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), _retval);
+	}
+
+	public int Push(int /*long*/ cx) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), cx);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsILocalFile.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsILocalFile.java
index 39f7200..772bec8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsILocalFile.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsILocalFile.java
@@ -1,111 +1,111 @@
-/* ***** BEGIN LICENSE BLOCK *****

- * Version: MPL 1.1

- *

- * The contents of this file are subject to the Mozilla Public License Version

- * 1.1 (the "License"); you may not use this file except in compliance with

- * the License. You may obtain a copy of the License at

- * http://www.mozilla.org/MPL/

- *

- * Software distributed under the License is distributed on an "AS IS" basis,

- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

- * for the specific language governing rights and limitations under the

- * License.

- *

- * The Original Code is Mozilla Communicator client code, released March 31, 1998.

- *

- * The Initial Developer of the Original Code is

- * Netscape Communications Corporation.

- * Portions created by Netscape are Copyright (C) 1998-1999

- * Netscape Communications Corporation.  All Rights Reserved.

- *

- * Contributor(s):

- *

- * IBM

- * -  Binding to permit interfacing between Mozilla and SWT

- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.

- *

- * ***** END LICENSE BLOCK ***** */

-package org.eclipse.swt.internal.mozilla;

-

-public class nsILocalFile extends nsIFile {

-

-	static final int LAST_METHOD_ID = nsIFile.LAST_METHOD_ID + 17;

-

-	public static final String NS_ILOCALFILE_IID_STR =

-		"aa610f20-a889-11d3-8c81-000064657374";

-

-	public static final nsID NS_ILOCALFILE_IID =

-		new nsID(NS_ILOCALFILE_IID_STR);

-

-	public nsILocalFile(int /*long*/ address) {

-		super(address);

-	}

-

-	public int InitWithPath(int /*long*/ filePath) {

-		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 1, getAddress(), filePath);

-	}

-

-	public int InitWithNativePath(int /*long*/ filePath) {

-		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 2, getAddress(), filePath);

-	}

-

-	public int InitWithFile(int /*long*/ aFile) {

-		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 3, getAddress(), aFile);

-	}

-

-	public int GetFollowLinks(int[] aFollowLinks) {

-		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 4, getAddress(), aFollowLinks);

-	}

-

-	public int SetFollowLinks(int aFollowLinks) {

-		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 5, getAddress(), aFollowLinks);

-	}

-

-	public int OpenNSPRFileDesc(int flags, int mode, int /*long*/[] _retval) {

-		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 6, getAddress(), flags, mode, _retval);

-	}

-

-	public int OpenANSIFileDesc(byte[] mode, int /*long*/[] _retval) {

-		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 7, getAddress(), mode, _retval);

-	}

-

-	public int Load(int /*long*/[] _retval) {

-		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 8, getAddress(), _retval);

-	}

-

-	public int GetDiskSpaceAvailable(long[] aDiskSpaceAvailable) {

-		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 9, getAddress(), aDiskSpaceAvailable);

-	}

-

-	public int AppendRelativePath(int /*long*/ relativeFilePath) {

-		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 10, getAddress(), relativeFilePath);

-	}

-

-	public int AppendRelativeNativePath(int /*long*/ relativeFilePath) {

-		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 11, getAddress(), relativeFilePath);

-	}

-

-	public int GetPersistentDescriptor(int /*long*/ aPersistentDescriptor) {

-		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 12, getAddress(), aPersistentDescriptor);

-	}

-

-	public int SetPersistentDescriptor(int /*long*/ aPersistentDescriptor) {

-		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 13, getAddress(), aPersistentDescriptor);

-	}

-

-	public int Reveal() {

-		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 14, getAddress());

-	}

-

-	public int Launch() {

-		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 15, getAddress());

-	}

-

-	public int GetRelativeDescriptor(int /*long*/ fromFile, int /*long*/ _retval) {

-		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 16, getAddress(), fromFile, _retval);

-	}

-

-	public int SetRelativeDescriptor(int /*long*/ fromFile, int /*long*/ relativeDesc) {

-		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 17, getAddress(), fromFile, relativeDesc);

-	}

-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsILocalFile extends nsIFile {
+
+	static final int LAST_METHOD_ID = nsIFile.LAST_METHOD_ID + 17;
+
+	public static final String NS_ILOCALFILE_IID_STR =
+		"aa610f20-a889-11d3-8c81-000064657374";
+
+	public static final nsID NS_ILOCALFILE_IID =
+		new nsID(NS_ILOCALFILE_IID_STR);
+
+	public nsILocalFile(int /*long*/ address) {
+		super(address);
+	}
+
+	public int InitWithPath(int /*long*/ filePath) {
+		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 1, getAddress(), filePath);
+	}
+
+	public int InitWithNativePath(int /*long*/ filePath) {
+		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 2, getAddress(), filePath);
+	}
+
+	public int InitWithFile(int /*long*/ aFile) {
+		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 3, getAddress(), aFile);
+	}
+
+	public int GetFollowLinks(int[] aFollowLinks) {
+		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 4, getAddress(), aFollowLinks);
+	}
+
+	public int SetFollowLinks(int aFollowLinks) {
+		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 5, getAddress(), aFollowLinks);
+	}
+
+	public int OpenNSPRFileDesc(int flags, int mode, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 6, getAddress(), flags, mode, _retval);
+	}
+
+	public int OpenANSIFileDesc(byte[] mode, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 7, getAddress(), mode, _retval);
+	}
+
+	public int Load(int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 8, getAddress(), _retval);
+	}
+
+	public int GetDiskSpaceAvailable(long[] aDiskSpaceAvailable) {
+		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 9, getAddress(), aDiskSpaceAvailable);
+	}
+
+	public int AppendRelativePath(int /*long*/ relativeFilePath) {
+		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 10, getAddress(), relativeFilePath);
+	}
+
+	public int AppendRelativeNativePath(int /*long*/ relativeFilePath) {
+		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 11, getAddress(), relativeFilePath);
+	}
+
+	public int GetPersistentDescriptor(int /*long*/ aPersistentDescriptor) {
+		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 12, getAddress(), aPersistentDescriptor);
+	}
+
+	public int SetPersistentDescriptor(int /*long*/ aPersistentDescriptor) {
+		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 13, getAddress(), aPersistentDescriptor);
+	}
+
+	public int Reveal() {
+		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 14, getAddress());
+	}
+
+	public int Launch() {
+		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 15, getAddress());
+	}
+
+	public int GetRelativeDescriptor(int /*long*/ fromFile, int /*long*/ _retval) {
+		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 16, getAddress(), fromFile, _retval);
+	}
+
+	public int SetRelativeDescriptor(int /*long*/ fromFile, int /*long*/ relativeDesc) {
+		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 17, getAddress(), fromFile, relativeDesc);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIMemory.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIMemory.java
index 4ff830a..641777e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIMemory.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIMemory.java
@@ -1,63 +1,63 @@
-/* ***** BEGIN LICENSE BLOCK *****

- * Version: MPL 1.1

- *

- * The contents of this file are subject to the Mozilla Public License Version

- * 1.1 (the "License"); you may not use this file except in compliance with

- * the License. You may obtain a copy of the License at

- * http://www.mozilla.org/MPL/

- *

- * Software distributed under the License is distributed on an "AS IS" basis,

- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

- * for the specific language governing rights and limitations under the

- * License.

- *

- * The Original Code is Mozilla Communicator client code, released March 31, 1998.

- *

- * The Initial Developer of the Original Code is

- * Netscape Communications Corporation.

- * Portions created by Netscape are Copyright (C) 1998-1999

- * Netscape Communications Corporation.  All Rights Reserved.

- *

- * Contributor(s):

- *

- * IBM

- * -  Binding to permit interfacing between Mozilla and SWT

- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.

- *

- * ***** END LICENSE BLOCK ***** */

-package org.eclipse.swt.internal.mozilla;

-

-public class nsIMemory extends nsISupports {

-

-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 5;

-

-	public static final String NS_IMEMORY_IID_STR =

-		"59e7e77a-38e4-11d4-8cf5-0060b0fc14a3";

-

-	public static final nsID NS_IMEMORY_IID =

-		new nsID(NS_IMEMORY_IID_STR);

-

-	public nsIMemory(int /*long*/ address) {

-		super(address);

-	}

-

-	public int Alloc(int size) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), size);

-	}

-

-	public int Realloc(int /*long*/ ptr, int newSize) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), ptr, newSize);

-	}

-

-	public int Free(int /*long*/ ptr) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), ptr);

-	}

-

-	public int HeapMinimize(int immediate) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), immediate);

-	}

-

-	public int IsLowMemory(int[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), _retval);

-	}

-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIMemory extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 5;
+
+	public static final String NS_IMEMORY_IID_STR =
+		"59e7e77a-38e4-11d4-8cf5-0060b0fc14a3";
+
+	public static final nsID NS_IMEMORY_IID =
+		new nsID(NS_IMEMORY_IID_STR);
+
+	public nsIMemory(int /*long*/ address) {
+		super(address);
+	}
+
+	public int /*long*/ Alloc(int size) {
+		return XPCOM.nsIMemory_Alloc(getAddress(), size);
+	}
+
+	public int /*long*/ Realloc(int /*long*/ ptr, int newSize) {
+		return XPCOM.nsIMemory_Realloc(getAddress(), ptr, newSize);
+	}
+
+	public int Free(int /*long*/ ptr) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), ptr);
+	}
+
+	public int HeapMinimize(int immediate) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), immediate);
+	}
+
+	public int IsLowMemory(int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), _retval);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIObserverService.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIObserverService.java
index 61fd23f..5b3775d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIObserverService.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIObserverService.java
@@ -1,59 +1,59 @@
-/* ***** BEGIN LICENSE BLOCK *****

- * Version: MPL 1.1

- *

- * The contents of this file are subject to the Mozilla Public License Version

- * 1.1 (the "License"); you may not use this file except in compliance with

- * the License. You may obtain a copy of the License at

- * http://www.mozilla.org/MPL/

- *

- * Software distributed under the License is distributed on an "AS IS" basis,

- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

- * for the specific language governing rights and limitations under the

- * License.

- *

- * The Original Code is Mozilla Communicator client code, released March 31, 1998.

- *

- * The Initial Developer of the Original Code is

- * Netscape Communications Corporation.

- * Portions created by Netscape are Copyright (C) 1998-1999

- * Netscape Communications Corporation.  All Rights Reserved.

- *

- * Contributor(s):

- *

- * IBM

- * -  Binding to permit interfacing between Mozilla and SWT

- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.

- *

- * ***** END LICENSE BLOCK ***** */

-package org.eclipse.swt.internal.mozilla;

-

-public class nsIObserverService extends nsISupports {

-

-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 4;

-

-	public static final String NS_IOBSERVERSERVICE_IID_STR =

-		"d07f5192-e3d1-11d2-8acd-00105a1b8860";

-

-	public static final nsID NS_IOBSERVERSERVICE_IID =

-		new nsID(NS_IOBSERVERSERVICE_IID_STR);

-

-	public nsIObserverService(int /*long*/ address) {

-		super(address);

-	}

-

-	public int AddObserver(int /*long*/ anObserver, byte[] aTopic, int ownsWeak) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), anObserver, aTopic, ownsWeak);

-	}

-

-	public int RemoveObserver(int /*long*/ anObserver, byte[] aTopic) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), anObserver, aTopic);

-	}

-

-	public int NotifyObservers(int /*long*/ aSubject, byte[] aTopic, char[] someData) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aSubject, aTopic, someData);

-	}

-

-	public int EnumerateObservers(byte[] aTopic, int /*long*/[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aTopic, _retval);

-	}

-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIObserverService extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 4;
+
+	public static final String NS_IOBSERVERSERVICE_IID_STR =
+		"d07f5192-e3d1-11d2-8acd-00105a1b8860";
+
+	public static final nsID NS_IOBSERVERSERVICE_IID =
+		new nsID(NS_IOBSERVERSERVICE_IID_STR);
+
+	public nsIObserverService(int /*long*/ address) {
+		super(address);
+	}
+
+	public int AddObserver(int /*long*/ anObserver, byte[] aTopic, int ownsWeak) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), anObserver, aTopic, ownsWeak);
+	}
+
+	public int RemoveObserver(int /*long*/ anObserver, byte[] aTopic) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), anObserver, aTopic);
+	}
+
+	public int NotifyObservers(int /*long*/ aSubject, byte[] aTopic, char[] someData) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aSubject, aTopic, someData);
+	}
+
+	public int EnumerateObservers(byte[] aTopic, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aTopic, _retval);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java
index a55aff5..63ed2a3 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java
@@ -1,123 +1,123 @@
-/* ***** BEGIN LICENSE BLOCK *****

- * Version: MPL 1.1

- *

- * The contents of this file are subject to the Mozilla Public License Version

- * 1.1 (the "License"); you may not use this file except in compliance with

- * the License. You may obtain a copy of the License at

- * http://www.mozilla.org/MPL/

- *

- * Software distributed under the License is distributed on an "AS IS" basis,

- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

- * for the specific language governing rights and limitations under the

- * License.

- *

- * The Original Code is Mozilla Communicator client code, released March 31, 1998.

- *

- * The Initial Developer of the Original Code is

- * Netscape Communications Corporation.

- * Portions created by Netscape are Copyright (C) 1998-1999

- * Netscape Communications Corporation.  All Rights Reserved.

- *

- * Contributor(s):

- *

- * IBM

- * -  Binding to permit interfacing between Mozilla and SWT

- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.

- *

- * ***** END LICENSE BLOCK ***** */

-package org.eclipse.swt.internal.mozilla;

-

-public class nsIPrefBranch extends nsISupports {

-

-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 18;

-

-	public static final String NS_IPREFBRANCH_IID_STR =

-		"56c35506-f14b-11d3-99d3-ddbfac2ccf65";

-

-	public static final nsID NS_IPREFBRANCH_IID =

-		new nsID(NS_IPREFBRANCH_IID_STR);

-

-	public nsIPrefBranch(int /*long*/ address) {

-		super(address);

-	}

-

-	public static final int PREF_INVALID = 0;

-

-	public static final int PREF_STRING = 32;

-

-	public static final int PREF_INT = 64;

-

-	public static final int PREF_BOOL = 128;

-

-	public int GetRoot(int /*long*/[] aRoot) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aRoot);

-	}

-

-	public int GetPrefType(byte[] aPrefName, int[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aPrefName, _retval);

-	}

-

-	public int GetBoolPref(byte[] aPrefName, int[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aPrefName, _retval);

-	}

-

-	public int SetBoolPref(byte[] aPrefName, int aValue) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aPrefName, aValue);

-	}

-

-	public int GetCharPref(byte[] aPrefName, int /*long*/[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aPrefName, _retval);

-	}

-

-	public int SetCharPref(byte[] aPrefName, byte[] aValue) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aPrefName, aValue);

-	}

-

-	public int GetIntPref(byte[] aPrefName, int[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aPrefName, _retval);

-	}

-

-	public int SetIntPref(byte[] aPrefName, int aValue) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aPrefName, aValue);

-	}

-

-	public int GetComplexValue(byte[] aPrefName, nsID aType, int /*long*/[] aValue) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPrefName, aType, aValue);

-	}

-

-	public int SetComplexValue(byte[] aPrefName, nsID aType, int /*long*/ aValue) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aPrefName, aType, aValue);

-	}

-

-	public int ClearUserPref(byte[] aPrefName) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aPrefName);

-	}

-

-	public int LockPref(byte[] aPrefName) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aPrefName);

-	}

-

-	public int PrefHasUserValue(byte[] aPrefName, int[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aPrefName, _retval);

-	}

-

-	public int PrefIsLocked(byte[] aPrefName, int[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aPrefName, _retval);

-	}

-

-	public int UnlockPref(byte[] aPrefName) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aPrefName);

-	}

-

-	public int DeleteBranch(byte[] aStartingAt) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aStartingAt);

-	}

-

+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIPrefBranch extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 18;
+
+	public static final String NS_IPREFBRANCH_IID_STR =
+		"56c35506-f14b-11d3-99d3-ddbfac2ccf65";
+
+	public static final nsID NS_IPREFBRANCH_IID =
+		new nsID(NS_IPREFBRANCH_IID_STR);
+
+	public nsIPrefBranch(int /*long*/ address) {
+		super(address);
+	}
+
+	public static final int PREF_INVALID = 0;
+
+	public static final int PREF_STRING = 32;
+
+	public static final int PREF_INT = 64;
+
+	public static final int PREF_BOOL = 128;
+
+	public int GetRoot(int /*long*/[] aRoot) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aRoot);
+	}
+
+	public int GetPrefType(byte[] aPrefName, int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aPrefName, _retval);
+	}
+
+	public int GetBoolPref(byte[] aPrefName, int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aPrefName, _retval);
+	}
+
+	public int SetBoolPref(byte[] aPrefName, int aValue) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aPrefName, aValue);
+	}
+
+	public int GetCharPref(byte[] aPrefName, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aPrefName, _retval);
+	}
+
+	public int SetCharPref(byte[] aPrefName, byte[] aValue) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aPrefName, aValue);
+	}
+
+	public int GetIntPref(byte[] aPrefName, int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aPrefName, _retval);
+	}
+
+	public int SetIntPref(byte[] aPrefName, int aValue) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aPrefName, aValue);
+	}
+
+	public int GetComplexValue(byte[] aPrefName, nsID aType, int /*long*/[] aValue) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPrefName, aType, aValue);
+	}
+
+	public int SetComplexValue(byte[] aPrefName, nsID aType, int /*long*/ aValue) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aPrefName, aType, aValue);
+	}
+
+	public int ClearUserPref(byte[] aPrefName) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aPrefName);
+	}
+
+	public int LockPref(byte[] aPrefName) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aPrefName);
+	}
+
+	public int PrefHasUserValue(byte[] aPrefName, int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aPrefName, _retval);
+	}
+
+	public int PrefIsLocked(byte[] aPrefName, int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aPrefName, _retval);
+	}
+
+	public int UnlockPref(byte[] aPrefName) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aPrefName);
+	}
+
+	public int DeleteBranch(byte[] aStartingAt) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aStartingAt);
+	}
+
 	public int GetChildList(byte[] aStartingAt, int[] aCount, int /*long*/[] aChildArray) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aStartingAt, aCount, aChildArray);
-	}

-

-	public int ResetBranch(byte[] aStartingAt) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aStartingAt);

-	}

-}
\ No newline at end of file
+	}
+
+	public int ResetBranch(byte[] aStartingAt) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aStartingAt);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrincipal.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrincipal.java
new file mode 100644
index 0000000..a9aaff0
--- /dev/null
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrincipal.java
@@ -0,0 +1,143 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2009 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class  nsIPrincipal extends nsISerializable {
+
+	static final int LAST_METHOD_ID = nsISerializable.LAST_METHOD_ID + 23;
+
+	public static final String NS_IPRINCIPAL_IID_STR =
+		"b8268b9a-2403-44ed-81e3-614075c92034";
+
+	public static final nsID NS_IPRINCIPAL_IID =
+		new nsID(NS_IPRINCIPAL_IID_STR);
+
+	public  nsIPrincipal(int /*long*/ address) {
+		super(address);
+	}
+
+	public static final int ENABLE_DENIED = 1;
+
+	public static final int ENABLE_UNKNOWN = 2;
+
+	public static final int ENABLE_WITH_USER_PERMISSION = 3;
+
+	public static final int ENABLE_GRANTED = 4;
+
+	public int GetPreferences(int /*long*/[] prefBranch, int /*long*/[] id, int /*long*/[] subjectName, int /*long*/[] grantedList, int /*long*/[] deniedList, int[] isTrusted) {
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 1, getAddress(), prefBranch, id, subjectName, grantedList, deniedList, isTrusted);
+	}
+
+	public int Equals(int /*long*/ other, int[] _retval) {
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 2, getAddress(), other, _retval);
+	}
+
+	public int GetHashValue(int[] aHashValue) {
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 3, getAddress(), aHashValue);
+	}
+
+	public int GetJSPrincipals(int /*long*/ cx, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 4, getAddress(), cx, _retval);
+	}
+
+	public int GetSecurityPolicy(int /*long*/[] aSecurityPolicy) {
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 5, getAddress(), aSecurityPolicy);
+	}
+
+	public int SetSecurityPolicy(int /*long*/ aSecurityPolicy) {
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 6, getAddress(), aSecurityPolicy);
+	}
+
+	public int CanEnableCapability(byte[] capability, int /*long*/ _retval) {
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 7, getAddress(), capability, _retval);
+	}
+
+	public int SetCanEnableCapability(byte[] capability, short canEnable) {
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 8, getAddress(), capability, canEnable);
+	}
+
+	public int IsCapabilityEnabled(byte[] capability, int /*long*/ annotation, int[] _retval) {
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 9, getAddress(), capability, annotation, _retval);
+	}
+
+	public int EnableCapability(byte[] capability, int /*long*/[] annotation) {
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 10, getAddress(), capability, annotation);
+	}
+
+	public int RevertCapability(byte[] capability, int /*long*/[] annotation) {
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 11, getAddress(), capability, annotation);
+	}
+
+	public int DisableCapability(byte[] capability, int /*long*/[] annotation) {
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 12, getAddress(), capability, annotation);
+	}
+
+	public int GetURI(int /*long*/[] aURI) {
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 13, getAddress(), aURI);
+	}
+
+	public int GetDomain(int /*long*/[] aDomain) {
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 14, getAddress(), aDomain);
+	}
+
+	public int SetDomain(int /*long*/ aDomain) {
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 15, getAddress(), aDomain);
+	}
+
+	public int GetOrigin(int /*long*/[] aOrigin) {
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 16, getAddress(), aOrigin);
+	}
+
+	public int GetHasCertificate(int[] aHasCertificate) {
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 17, getAddress(), aHasCertificate);
+	}
+
+	public int GetFingerprint(int /*long*/ aFingerprint) {
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 18, getAddress(), aFingerprint);
+	}
+
+	public int GetPrettyName(int /*long*/ aPrettyName) {
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 19, getAddress(), aPrettyName);
+	}
+
+	public int Subsumes(int /*long*/ other, int[] _retval) {
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 20, getAddress(), other, _retval);
+	}
+
+	public int CheckMayLoad(int /*long*/ uri, int report) {
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 21, getAddress(), uri, report);
+	}
+
+	public int GetSubjectName(int /*long*/ aSubjectName) {
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 22, getAddress(), aSubjectName);
+	}
+
+	public int GetCertificate(int /*long*/[] aCertificate) {
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 23, getAddress(), aCertificate);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProgressDialog.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProgressDialog.java
index b9d3ab6..2cc99e4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProgressDialog.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProgressDialog.java
@@ -1,63 +1,63 @@
-/* ***** BEGIN LICENSE BLOCK *****

- * Version: MPL 1.1

- *

- * The contents of this file are subject to the Mozilla Public License Version

- * 1.1 (the "License"); you may not use this file except in compliance with

- * the License. You may obtain a copy of the License at

- * http://www.mozilla.org/MPL/

- *

- * Software distributed under the License is distributed on an "AS IS" basis,

- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

- * for the specific language governing rights and limitations under the

- * License.

- *

- * The Original Code is Mozilla Communicator client code, released March 31, 1998.

- *

- * The Initial Developer of the Original Code is

- * Netscape Communications Corporation.

- * Portions created by Netscape are Copyright (C) 1998-1999

- * Netscape Communications Corporation.  All Rights Reserved.

- *

- * Contributor(s):

- *

- * IBM

- * -  Binding to permit interfacing between Mozilla and SWT

- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.

- *

- * ***** END LICENSE BLOCK ***** */

-package org.eclipse.swt.internal.mozilla;

-

-public class nsIProgressDialog extends nsIDownload {

-

-	static final int LAST_METHOD_ID = nsIDownload.LAST_METHOD_ID + 5;

-

-	public static final String NS_IPROGRESSDIALOG_IID_STR =

-		"88a478b3-af65-440a-94dc-ed9b154d2990";

-

-	public static final nsID NS_IPROGRESSDIALOG_IID =

-		new nsID(NS_IPROGRESSDIALOG_IID_STR);

-

-	public nsIProgressDialog(int /*long*/ address) {

-		super(address);

-	}

-

-	public int Open(int /*long*/ aParent) {

-		return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 1, getAddress(), aParent);

-	}

-

-	public int GetCancelDownloadOnClose(int[] aCancelDownloadOnClose) {

-		return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 2, getAddress(), aCancelDownloadOnClose);

-	}

-

-	public int SetCancelDownloadOnClose(int aCancelDownloadOnClose) {

-		return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 3, getAddress(), aCancelDownloadOnClose);

-	}

-

-	public int GetDialog(int /*long*/[] aDialog) {

-		return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 4, getAddress(), aDialog);

-	}

-

-	public int SetDialog(int /*long*/ aDialog) {

-		return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 5, getAddress(), aDialog);

-	}

-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIProgressDialog extends nsIDownload {
+
+	static final int LAST_METHOD_ID = nsIDownload.LAST_METHOD_ID + 5;
+
+	public static final String NS_IPROGRESSDIALOG_IID_STR =
+		"88a478b3-af65-440a-94dc-ed9b154d2990";
+
+	public static final nsID NS_IPROGRESSDIALOG_IID =
+		new nsID(NS_IPROGRESSDIALOG_IID_STR);
+
+	public nsIProgressDialog(int /*long*/ address) {
+		super(address);
+	}
+
+	public int Open(int /*long*/ aParent) {
+		return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 1, getAddress(), aParent);
+	}
+
+	public int GetCancelDownloadOnClose(int[] aCancelDownloadOnClose) {
+		return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 2, getAddress(), aCancelDownloadOnClose);
+	}
+
+	public int SetCancelDownloadOnClose(int aCancelDownloadOnClose) {
+		return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 3, getAddress(), aCancelDownloadOnClose);
+	}
+
+	public int GetDialog(int /*long*/[] aDialog) {
+		return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 4, getAddress(), aDialog);
+	}
+
+	public int SetDialog(int /*long*/ aDialog) {
+		return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 5, getAddress(), aDialog);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java
index 75d2397..13c38f7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java
@@ -1,71 +1,71 @@
-/* ***** BEGIN LICENSE BLOCK *****

- * Version: MPL 1.1

- *

- * The contents of this file are subject to the Mozilla Public License Version

- * 1.1 (the "License"); you may not use this file except in compliance with

- * the License. You may obtain a copy of the License at

- * http://www.mozilla.org/MPL/

- *

- * Software distributed under the License is distributed on an "AS IS" basis,

- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

- * for the specific language governing rights and limitations under the

- * License.

- *

- * The Original Code is Mozilla Communicator client code, released March 31, 1998.

- *

- * The Initial Developer of the Original Code is

- * Netscape Communications Corporation.

- * Portions created by Netscape are Copyright (C) 1998-1999

- * Netscape Communications Corporation.  All Rights Reserved.

- *

- * Contributor(s):

- *

- * IBM

- * -  Binding to permit interfacing between Mozilla and SWT

- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.

- *

- * ***** END LICENSE BLOCK ***** */

-package org.eclipse.swt.internal.mozilla;

-

+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
 public class nsIProgressDialog_1_8 extends nsIDownload_1_8 {
-

+
 	static final int LAST_METHOD_ID = nsIDownload_1_8.LAST_METHOD_ID + 7;
-

-	public static final String NS_IPROGRESSDIALOG_IID_STR =

-		"20e790a2-76c6-462d-851a-22ab6cbbe48b";

-

-	public static final nsID NS_IPROGRESSDIALOG_IID =

-		new nsID(NS_IPROGRESSDIALOG_IID_STR);

-

-	public nsIProgressDialog_1_8(int /*long*/ address) {

-		super(address);

-	}

-

-	public int Open(int /*long*/ aParent) {

-		return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 1, getAddress(), aParent);

-	}

-

-	public int GetCancelDownloadOnClose(int[] aCancelDownloadOnClose) {

-		return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 2, getAddress(), aCancelDownloadOnClose);

-	}

-

-	public int SetCancelDownloadOnClose(int aCancelDownloadOnClose) {

-		return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 3, getAddress(), aCancelDownloadOnClose);

-	}

-

-	public int GetObserver(int /*long*/[] aObserver) {

-		return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 4, getAddress(), aObserver);

-	}

-

-	public int SetObserver(int /*long*/ aObserver) {

-		return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 5, getAddress(), aObserver);

-	}

-

-	public int GetDialog(int /*long*/[] aDialog) {

-		return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 6, getAddress(), aDialog);

-	}

-

-	public int SetDialog(int /*long*/ aDialog) {

-		return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 7, getAddress(), aDialog);

-	}

-}
\ No newline at end of file
+
+	public static final String NS_IPROGRESSDIALOG_IID_STR =
+		"20e790a2-76c6-462d-851a-22ab6cbbe48b";
+
+	public static final nsID NS_IPROGRESSDIALOG_IID =
+		new nsID(NS_IPROGRESSDIALOG_IID_STR);
+
+	public nsIProgressDialog_1_8(int /*long*/ address) {
+		super(address);
+	}
+
+	public int Open(int /*long*/ aParent) {
+		return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 1, getAddress(), aParent);
+	}
+
+	public int GetCancelDownloadOnClose(int[] aCancelDownloadOnClose) {
+		return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 2, getAddress(), aCancelDownloadOnClose);
+	}
+
+	public int SetCancelDownloadOnClose(int aCancelDownloadOnClose) {
+		return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 3, getAddress(), aCancelDownloadOnClose);
+	}
+
+	public int GetObserver(int /*long*/[] aObserver) {
+		return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 4, getAddress(), aObserver);
+	}
+
+	public int SetObserver(int /*long*/ aObserver) {
+		return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 5, getAddress(), aObserver);
+	}
+
+	public int GetDialog(int /*long*/[] aDialog) {
+		return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 6, getAddress(), aDialog);
+	}
+
+	public int SetDialog(int /*long*/ aDialog) {
+		return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 7, getAddress(), aDialog);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPromptService.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPromptService.java
index 56192d7..92577e4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPromptService.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPromptService.java
@@ -1,113 +1,113 @@
-/* ***** BEGIN LICENSE BLOCK *****

- * Version: MPL 1.1

- *

- * The contents of this file are subject to the Mozilla Public License Version

- * 1.1 (the "License"); you may not use this file except in compliance with

- * the License. You may obtain a copy of the License at

- * http://www.mozilla.org/MPL/

- *

- * Software distributed under the License is distributed on an "AS IS" basis,

- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

- * for the specific language governing rights and limitations under the

- * License.

- *

- * The Original Code is Mozilla Communicator client code, released March 31, 1998.

- *

- * The Initial Developer of the Original Code is

- * Netscape Communications Corporation.

- * Portions created by Netscape are Copyright (C) 1998-1999

- * Netscape Communications Corporation.  All Rights Reserved.

- *

- * Contributor(s):

- *

- * IBM

- * -  Binding to permit interfacing between Mozilla and SWT

- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.

- *

- * ***** END LICENSE BLOCK ***** */

-package org.eclipse.swt.internal.mozilla;

-

-public class nsIPromptService extends nsISupports {

-

-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 9;

-

-	public static final String NS_IPROMPTSERVICE_IID_STR =

-		"1630c61a-325e-49ca-8759-a31b16c47aa5";

-

-	public static final nsID NS_IPROMPTSERVICE_IID =

-		new nsID(NS_IPROMPTSERVICE_IID_STR);

-

-	public nsIPromptService(int /*long*/ address) {

-		super(address);

-	}

-

-	public int Alert(int /*long*/ aParent, char[] aDialogTitle, char[] aText) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aParent, aDialogTitle, aText);

-	}

-

-	public int AlertCheck(int /*long*/ aParent, char[] aDialogTitle, char[] aText, char[] aCheckMsg, int[] aCheckState) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aParent, aDialogTitle, aText, aCheckMsg, aCheckState);

-	}

-

-	public int Confirm(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aParent, aDialogTitle, aText, _retval);

-	}

-

-	public int ConfirmCheck(int /*long*/ aParent, char[] aDialogTitle, char[] aText, char[] aCheckMsg, int[] aCheckState, int[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aParent, aDialogTitle, aText, aCheckMsg, aCheckState, _retval);

-	}

-

-	public static final int BUTTON_POS_0 = 1;

-

-	public static final int BUTTON_POS_1 = 256;

-

-	public static final int BUTTON_POS_2 = 65536;

-

-	public static final int BUTTON_TITLE_OK = 1;

-

-	public static final int BUTTON_TITLE_CANCEL = 2;

-

-	public static final int BUTTON_TITLE_YES = 3;

-

-	public static final int BUTTON_TITLE_NO = 4;

-

-	public static final int BUTTON_TITLE_SAVE = 5;

-

-	public static final int BUTTON_TITLE_DONT_SAVE = 6;

-

-	public static final int BUTTON_TITLE_REVERT = 7;

-

-	public static final int BUTTON_TITLE_IS_STRING = 127;

-

-	public static final int BUTTON_POS_0_DEFAULT = 0;

-

-	public static final int BUTTON_POS_1_DEFAULT = 16777216;

-

-	public static final int BUTTON_POS_2_DEFAULT = 33554432;

-

-	public static final int BUTTON_DELAY_ENABLE = 67108864;

-

-	public static final int STD_OK_CANCEL_BUTTONS = 513;

-

-	public static final int STD_YES_NO_BUTTONS = 1027;

-	

-	public int ConfirmEx(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int aButtonFlags, char[] aButton0Title, char[] aButton1Title, char[] aButton2Title, char[] aCheckMsg, int[] aCheckState, int[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aParent, aDialogTitle, aText, aButtonFlags, aButton0Title, aButton1Title, aButton2Title, aCheckMsg, aCheckState, _retval);

-	}

-

-	public int Prompt(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int /*long*/[] aValue, char[] aCheckMsg, int[] aCheckState, int[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aParent, aDialogTitle, aText, aValue, aCheckMsg, aCheckState, _retval);

-	}

-

-	public int PromptUsernameAndPassword(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int /*long*/[] aUsername, int /*long*/[] aPassword, char[] aCheckMsg, int[] aCheckState, int[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aParent, aDialogTitle, aText, aUsername, aPassword, aCheckMsg, aCheckState, _retval);

-	}

-

-	public int PromptPassword(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int /*long*/[] aPassword, char[] aCheckMsg, int[] aCheckState, int[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aParent, aDialogTitle, aText, aPassword, aCheckMsg, aCheckState, _retval);

-	}

-

-	public int Select(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int aCount, int /*long*/[] aSelectList, int[] aOutSelection, int[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aParent, aDialogTitle, aText, aCount, aSelectList, aOutSelection, _retval);

-	}

-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIPromptService extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 9;
+
+	public static final String NS_IPROMPTSERVICE_IID_STR =
+		"1630c61a-325e-49ca-8759-a31b16c47aa5";
+
+	public static final nsID NS_IPROMPTSERVICE_IID =
+		new nsID(NS_IPROMPTSERVICE_IID_STR);
+
+	public nsIPromptService(int /*long*/ address) {
+		super(address);
+	}
+
+	public int Alert(int /*long*/ aParent, char[] aDialogTitle, char[] aText) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aParent, aDialogTitle, aText);
+	}
+
+	public int AlertCheck(int /*long*/ aParent, char[] aDialogTitle, char[] aText, char[] aCheckMsg, int[] aCheckState) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aParent, aDialogTitle, aText, aCheckMsg, aCheckState);
+	}
+
+	public int Confirm(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aParent, aDialogTitle, aText, _retval);
+	}
+
+	public int ConfirmCheck(int /*long*/ aParent, char[] aDialogTitle, char[] aText, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aParent, aDialogTitle, aText, aCheckMsg, aCheckState, _retval);
+	}
+
+	public static final int BUTTON_POS_0 = 1;
+
+	public static final int BUTTON_POS_1 = 256;
+
+	public static final int BUTTON_POS_2 = 65536;
+
+	public static final int BUTTON_TITLE_OK = 1;
+
+	public static final int BUTTON_TITLE_CANCEL = 2;
+
+	public static final int BUTTON_TITLE_YES = 3;
+
+	public static final int BUTTON_TITLE_NO = 4;
+
+	public static final int BUTTON_TITLE_SAVE = 5;
+
+	public static final int BUTTON_TITLE_DONT_SAVE = 6;
+
+	public static final int BUTTON_TITLE_REVERT = 7;
+
+	public static final int BUTTON_TITLE_IS_STRING = 127;
+
+	public static final int BUTTON_POS_0_DEFAULT = 0;
+
+	public static final int BUTTON_POS_1_DEFAULT = 16777216;
+
+	public static final int BUTTON_POS_2_DEFAULT = 33554432;
+
+	public static final int BUTTON_DELAY_ENABLE = 67108864;
+
+	public static final int STD_OK_CANCEL_BUTTONS = 513;
+
+	public static final int STD_YES_NO_BUTTONS = 1027;
+	
+	public int ConfirmEx(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int aButtonFlags, char[] aButton0Title, char[] aButton1Title, char[] aButton2Title, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aParent, aDialogTitle, aText, aButtonFlags, aButton0Title, aButton1Title, aButton2Title, aCheckMsg, aCheckState, _retval);
+	}
+
+	public int Prompt(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int /*long*/[] aValue, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aParent, aDialogTitle, aText, aValue, aCheckMsg, aCheckState, _retval);
+	}
+
+	public int PromptUsernameAndPassword(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int /*long*/[] aUsername, int /*long*/[] aPassword, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aParent, aDialogTitle, aText, aUsername, aPassword, aCheckMsg, aCheckState, _retval);
+	}
+
+	public int PromptPassword(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int /*long*/[] aPassword, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aParent, aDialogTitle, aText, aPassword, aCheckMsg, aCheckState, _retval);
+	}
+
+	public int Select(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int aCount, int /*long*/[] aSelectList, int[] aOutSelection, int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aParent, aDialogTitle, aText, aCount, aSelectList, aOutSelection, _retval);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPromptService2.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPromptService2.java
index d740e48..fec6bc5 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPromptService2.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPromptService2.java
@@ -1,51 +1,51 @@
-/* ***** BEGIN LICENSE BLOCK *****

- * Version: MPL 1.1

- *

- * The contents of this file are subject to the Mozilla Public License Version

- * 1.1 (the "License"); you may not use this file except in compliance with

- * the License. You may obtain a copy of the License at

- * http://www.mozilla.org/MPL/

- *

- * Software distributed under the License is distributed on an "AS IS" basis,

- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

- * for the specific language governing rights and limitations under the

- * License.

- *

- * The Original Code is Mozilla Communicator client code, released March 31, 1998.

- *

- * The Initial Developer of the Original Code is

- * Netscape Communications Corporation.

- * Portions created by Netscape are Copyright (C) 1998-1999

- * Netscape Communications Corporation.  All Rights Reserved.

- *

- * Contributor(s):

- *

- * IBM

- * -  Binding to permit interfacing between Mozilla and SWT

- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.

- *

- * ***** END LICENSE BLOCK ***** */

-package org.eclipse.swt.internal.mozilla;

-

-public class nsIPromptService2 extends nsIPromptService {

-

-	static final int LAST_METHOD_ID = nsIPromptService.LAST_METHOD_ID + 2;

-

-	public static final String NS_IPROMPTSERVICE2_IID_STR =

-		"cf86d196-dbee-4482-9dfa-3477aa128319";

-

-	public static final nsID NS_IPROMPTSERVICE2_IID =

-		new nsID(NS_IPROMPTSERVICE2_IID_STR);

-

-	public nsIPromptService2(int /*long*/ address) {

-		super(address);

-	}

-

-	public int PromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int level, int /*long*/ authInfo, char[] checkboxLabel, int[] checkValue, int[] _retval) {

-		return XPCOM.VtblCall(nsIPromptService.LAST_METHOD_ID + 1, getAddress(), aParent, aChannel, level, authInfo, checkboxLabel, checkValue, _retval);

-	}

-

-	public int AsyncPromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int /*long*/ aCallback, int /*long*/ aContext, int level, int /*long*/ authInfo, char[] checkboxLabel, int[] checkValue, int /*long*/[] _retval) {

-		return XPCOM.VtblCall(nsIPromptService.LAST_METHOD_ID + 2, getAddress(), aParent, aChannel, aCallback, aContext, level, authInfo, checkboxLabel, checkValue, _retval);

-	}

-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIPromptService2 extends nsIPromptService {
+
+	static final int LAST_METHOD_ID = nsIPromptService.LAST_METHOD_ID + 2;
+
+	public static final String NS_IPROMPTSERVICE2_IID_STR =
+		"cf86d196-dbee-4482-9dfa-3477aa128319";
+
+	public static final nsID NS_IPROMPTSERVICE2_IID =
+		new nsID(NS_IPROMPTSERVICE2_IID_STR);
+
+	public nsIPromptService2(int /*long*/ address) {
+		super(address);
+	}
+
+	public int PromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int level, int /*long*/ authInfo, char[] checkboxLabel, int[] checkValue, int[] _retval) {
+		return XPCOM.VtblCall(nsIPromptService.LAST_METHOD_ID + 1, getAddress(), aParent, aChannel, level, authInfo, checkboxLabel, checkValue, _retval);
+	}
+
+	public int AsyncPromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int /*long*/ aCallback, int /*long*/ aContext, int level, int /*long*/ authInfo, char[] checkboxLabel, int[] checkValue, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsIPromptService.LAST_METHOD_ID + 2, getAddress(), aParent, aChannel, aCallback, aContext, level, authInfo, checkboxLabel, checkValue, _retval);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProperties.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProperties.java
index e854495..6311098 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProperties.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProperties.java
@@ -1,63 +1,63 @@
-/* ***** BEGIN LICENSE BLOCK *****

- * Version: MPL 1.1

- *

- * The contents of this file are subject to the Mozilla Public License Version

- * 1.1 (the "License"); you may not use this file except in compliance with

- * the License. You may obtain a copy of the License at

- * http://www.mozilla.org/MPL/

- *

- * Software distributed under the License is distributed on an "AS IS" basis,

- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

- * for the specific language governing rights and limitations under the

- * License.

- *

- * The Original Code is Mozilla Communicator client code, released March 31, 1998.

- *

- * The Initial Developer of the Original Code is

- * Netscape Communications Corporation.

- * Portions created by Netscape are Copyright (C) 1998-1999

- * Netscape Communications Corporation.  All Rights Reserved.

- *

- * Contributor(s):

- *

- * IBM

- * -  Binding to permit interfacing between Mozilla and SWT

- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.

- *

- * ***** END LICENSE BLOCK ***** */

-package org.eclipse.swt.internal.mozilla;

-

-public class nsIProperties extends nsISupports {

-

-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 5;

-

-	public static final String NS_IPROPERTIES_IID_STR =

-		"78650582-4e93-4b60-8e85-26ebd3eb14ca";

-

-	public static final nsID NS_IPROPERTIES_IID =

-		new nsID(NS_IPROPERTIES_IID_STR);

-

-	public nsIProperties(int /*long*/ address) {

-		super(address);

-	}

-

-	public int Get(byte[] prop, nsID iid, int /*long*/[] result) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), prop, iid, result);

-	}

-

-	public int Set(byte[] prop, int /*long*/ value) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), prop, value);

-	}

-

-	public int Has(byte[] prop, int[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), prop, _retval);

-	}

-

-	public int Undefine(byte[] prop) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), prop);

-	}

-

+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIProperties extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 5;
+
+	public static final String NS_IPROPERTIES_IID_STR =
+		"78650582-4e93-4b60-8e85-26ebd3eb14ca";
+
+	public static final nsID NS_IPROPERTIES_IID =
+		new nsID(NS_IPROPERTIES_IID_STR);
+
+	public nsIProperties(int /*long*/ address) {
+		super(address);
+	}
+
+	public int Get(byte[] prop, nsID iid, int /*long*/[] result) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), prop, iid, result);
+	}
+
+	public int Set(byte[] prop, int /*long*/ value) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), prop, value);
+	}
+
+	public int Has(byte[] prop, int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), prop, _retval);
+	}
+
+	public int Undefine(byte[] prop) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), prop);
+	}
+
 	public int GetKeys(int[] count, int /*long*/[] keys) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), count, keys);
-	}

-}
\ No newline at end of file
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIRequest.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIRequest.java
index 31c9403..909ad0d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIRequest.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIRequest.java
@@ -1,101 +1,101 @@
-/* ***** BEGIN LICENSE BLOCK *****

- * Version: MPL 1.1

- *

- * The contents of this file are subject to the Mozilla Public License Version

- * 1.1 (the "License"); you may not use this file except in compliance with

- * the License. You may obtain a copy of the License at

- * http://www.mozilla.org/MPL/

- *

- * Software distributed under the License is distributed on an "AS IS" basis,

- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

- * for the specific language governing rights and limitations under the

- * License.

- *

- * The Original Code is Mozilla Communicator client code, released March 31, 1998.

- *

- * The Initial Developer of the Original Code is

- * Netscape Communications Corporation.

- * Portions created by Netscape are Copyright (C) 1998-1999

- * Netscape Communications Corporation.  All Rights Reserved.

- *

- * Contributor(s):

- *

- * IBM

- * -  Binding to permit interfacing between Mozilla and SWT

- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.

- *

- * ***** END LICENSE BLOCK ***** */

-package org.eclipse.swt.internal.mozilla;

-

-public class nsIRequest extends nsISupports {

-

-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 10;

-

-	public static final String NS_IREQUEST_IID_STR =

-		"ef6bfbd2-fd46-48d8-96b7-9f8f0fd387fe";

-

-	public static final nsID NS_IREQUEST_IID =

-		new nsID(NS_IREQUEST_IID_STR);

-

-	public nsIRequest(int /*long*/ address) {

-		super(address);

-	}

-

-	public int GetName(int /*long*/ aName) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aName);

-	}

-

-	public int IsPending(int[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval);

-	}

-

-	public int GetStatus(int /*long*/[] aStatus) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aStatus);

-	}

-

-	public int Cancel(int aStatus) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aStatus);

-	}

-

-	public int Suspend() {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress());

-	}

-

-	public int Resume() {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress());

-	}

-

-	public int GetLoadGroup(int /*long*/[] aLoadGroup) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aLoadGroup);

-	}

-

-	public int SetLoadGroup(int /*long*/ aLoadGroup) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aLoadGroup);

-	}

-

-	public int GetLoadFlags(int /*long*/[] aLoadFlags) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aLoadFlags);

-	}

-

+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIRequest extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 10;
+
+	public static final String NS_IREQUEST_IID_STR =
+		"ef6bfbd2-fd46-48d8-96b7-9f8f0fd387fe";
+
+	public static final nsID NS_IREQUEST_IID =
+		new nsID(NS_IREQUEST_IID_STR);
+
+	public nsIRequest(int /*long*/ address) {
+		super(address);
+	}
+
+	public int GetName(int /*long*/ aName) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aName);
+	}
+
+	public int IsPending(int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval);
+	}
+
+	public int GetStatus(int /*long*/[] aStatus) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aStatus);
+	}
+
+	public int Cancel(int aStatus) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aStatus);
+	}
+
+	public int Suspend() {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress());
+	}
+
+	public int Resume() {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress());
+	}
+
+	public int GetLoadGroup(int /*long*/[] aLoadGroup) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aLoadGroup);
+	}
+
+	public int SetLoadGroup(int /*long*/ aLoadGroup) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aLoadGroup);
+	}
+
+	public int GetLoadFlags(int /*long*/[] aLoadFlags) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aLoadFlags);
+	}
+
 	public int SetLoadFlags(int aLoadFlags) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aLoadFlags);

-	}

-

-	public static final int LOAD_NORMAL = 0;

-

-	public static final int LOAD_BACKGROUND = 1;

-

-	public static final int INHIBIT_CACHING = 128;

-

-	public static final int INHIBIT_PERSISTENT_CACHING = 256;

-

-	public static final int LOAD_BYPASS_CACHE = 512;

-

-	public static final int LOAD_FROM_CACHE = 1024;

-

-	public static final int VALIDATE_ALWAYS = 2048;

-

-	public static final int VALIDATE_NEVER = 4096;

-

-	public static final int VALIDATE_ONCE_PER_SESSION = 8192;

-}
\ No newline at end of file
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aLoadFlags);
+	}
+
+	public static final int LOAD_NORMAL = 0;
+
+	public static final int LOAD_BACKGROUND = 1;
+
+	public static final int INHIBIT_CACHING = 128;
+
+	public static final int INHIBIT_PERSISTENT_CACHING = 256;
+
+	public static final int LOAD_BYPASS_CACHE = 512;
+
+	public static final int LOAD_FROM_CACHE = 1024;
+
+	public static final int VALIDATE_ALWAYS = 2048;
+
+	public static final int VALIDATE_NEVER = 4096;
+
+	public static final int VALIDATE_ONCE_PER_SESSION = 8192;
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISSLStatus.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISSLStatus.java
new file mode 100644
index 0000000..9d3fc2d
--- /dev/null
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISSLStatus.java
@@ -0,0 +1,71 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2009 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsISSLStatus extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 7;
+
+	public static final String NS_ISSLSTATUS_IID_STR =
+		"cfede939-def1-49be-81ed-d401b3a07d1c";
+
+	public static final nsID NS_ISSLSTATUS_IID =
+		new nsID(NS_ISSLSTATUS_IID_STR);
+
+	public  nsISSLStatus(int /*long*/ address) {
+		super(address);
+	}
+
+	public int GetServerCert(int /*long*/[] aServerCert) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aServerCert);
+	}
+
+	public int GetCipherName(int /*long*/[] aCipherName) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aCipherName);
+	}
+
+	public int GetKeyLength(int[] aKeyLength) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aKeyLength);
+	}
+
+	public int GetSecretKeyLength(int[] aSecretKeyLength) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aSecretKeyLength);
+	}
+
+	public int GetIsDomainMismatch(int[] aIsDomainMismatch) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aIsDomainMismatch);
+	}
+
+	public int GetIsNotValidAtThisTime(int[] aIsNotValidAtThisTime) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aIsNotValidAtThisTime);
+	}
+
+	public int GetIsUntrusted(int[] aIsUntrusted) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aIsUntrusted);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9.java
new file mode 100644
index 0000000..78d3db6
--- /dev/null
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9.java
@@ -0,0 +1,159 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2009 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class  nsIScriptSecurityManager_1_9 extends nsIXPCSecurityManager {
+
+	static final int LAST_METHOD_ID = nsIXPCSecurityManager.LAST_METHOD_ID + 26;
+
+	public static final String NS_ISCRIPTSECURITYMANAGER_IID_STR =
+		"3fffd8e8-3fea-442e-a0ed-2ba81ae197d5";
+
+	public static final nsID NS_ISCRIPTSECURITYMANAGER_IID =
+		new nsID(NS_ISCRIPTSECURITYMANAGER_IID_STR);
+
+	public  nsIScriptSecurityManager_1_9(int /*long*/ address) {
+		super(address);
+	}
+
+//	public int CheckPropertyAccess(int /*long*/ aJSContext, int /*long*/ aJSObject, byte[] aClassName, !ERROR UNKNOWN C TYPE <jsval >! aProperty, int aAction) {
+//		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 1, getAddress(), aJSContext, aJSObject, aClassName, aProperty, aAction);
+//	}
+
+//	public int CheckConnect(int /*long*/ aJSContext, int /*long*/ aTargetURI, byte[] aClassName, byte[] aProperty) {
+//		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 2, getAddress(), aJSContext, aTargetURI, aClassName, aProperty);
+//	}
+
+	public int CheckLoadURIFromScript(int /*long*/ cx, int /*long*/ uri) {
+		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 3, getAddress(), cx, uri);
+	}
+
+	public static final int STANDARD = 0;
+
+	public static final int LOAD_IS_AUTOMATIC_DOCUMENT_REPLACEMENT = 1;
+
+	public static final int ALLOW_CHROME = 2;
+
+	public static final int DISALLOW_INHERIT_PRINCIPAL = 4;
+
+	public static final int DISALLOW_SCRIPT_OR_DATA = 4;
+
+	public static final int DISALLOW_SCRIPT = 8;
+
+	public int CheckLoadURIWithPrincipal(int /*long*/ aPrincipal, int /*long*/ uri, int flags) {
+		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 4, getAddress(), aPrincipal, uri, flags);
+	}
+
+	public int CheckLoadURI(int /*long*/ from, int /*long*/ uri, int flags) {
+		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 5, getAddress(), from, uri, flags);
+	}
+
+	public int CheckLoadURIStrWithPrincipal(int /*long*/ aPrincipal, int /*long*/ uri, int flags) {
+		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 6, getAddress(), aPrincipal, uri, flags);
+	}
+
+	public int CheckLoadURIStr(int /*long*/ from, int /*long*/ uri, int flags) {
+		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 7, getAddress(), from, uri, flags);
+	}
+
+	public int CheckFunctionAccess(int /*long*/ cx, int /*long*/ funObj, int /*long*/ targetObj) {
+		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 8, getAddress(), cx, funObj, targetObj);
+	}
+
+	public int CanExecuteScripts(int /*long*/ cx, int /*long*/ principal, int[] _retval) {
+		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 9, getAddress(), cx, principal, _retval);
+	}
+
+	public int GetSubjectPrincipal(int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 10, getAddress(), _retval);
+	}
+
+	public int GetSystemPrincipal(int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 11, getAddress(), _retval);
+	}
+
+//	public int GetCertificatePrincipal(int /*long*/ aCertFingerprint, int /*long*/ aSubjectName, int /*long*/ aPrettyName, int /*long*/ aCert, int /*long*/ aURI, int /*long*/[] _retval) {
+//		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 12, getAddress(), aCertFingerprint, aSubjectName, aPrettyName, aCert, aURI, _retval);
+//	}
+
+	public int GetCodebasePrincipal(int /*long*/ aURI, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 13, getAddress(), aURI, _retval);
+	}
+
+//	public int RequestCapability(int /*long*/ principal, byte[] capability, int /*long*/ _retval) {
+//		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 14, getAddress(), principal, capability, _retval);
+//	}
+
+	public int IsCapabilityEnabled(byte[] capability, int[] _retval) {
+		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 15, getAddress(), capability, _retval);
+	}
+
+	public int EnableCapability(byte[] capability) {
+		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 16, getAddress(), capability);
+	}
+
+	public int RevertCapability(byte[] capability) {
+		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 17, getAddress(), capability);
+	}
+
+	public int DisableCapability(byte[] capability) {
+		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 18, getAddress(), capability);
+	}
+
+//	public int SetCanEnableCapability(int /*long*/ certificateFingerprint, byte[] capability, !ERROR UNKNOWN C TYPE <PRInt16 >! canEnable) {
+//		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 19, getAddress(), certificateFingerprint, capability, canEnable);
+//	}
+
+	public int GetObjectPrincipal(int /*long*/ cx, int /*long*/ obj, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 20, getAddress(), cx, obj, _retval);
+	}
+
+	public int SubjectPrincipalIsSystem(int[] _retval) {
+		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 21, getAddress(), _retval);
+	}
+
+	public int CheckSameOrigin(int /*long*/ aJSContext, int /*long*/ aTargetURI) {
+		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 22, getAddress(), aJSContext, aTargetURI);
+	}
+
+	public int CheckSameOriginURI(int /*long*/ aSourceURI, int /*long*/ aTargetURI, int reportError) {
+		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 23, getAddress(), aSourceURI, aTargetURI, reportError);
+	}
+
+	public int GetPrincipalFromContext(int /*long*/ cx, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 24, getAddress(), cx, _retval);
+	}
+
+	public int GetChannelPrincipal(int /*long*/ aChannel, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 25, getAddress(), aChannel, _retval);
+	}
+
+	public int IsSystemPrincipal(int /*long*/ aPrincipal, int[] _retval) {
+		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 26, getAddress(), aPrincipal, _retval);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9_1.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9_1.java
new file mode 100644
index 0000000..f0ba3bc
--- /dev/null
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9_1.java
@@ -0,0 +1,159 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIScriptSecurityManager_1_9_1 extends nsIXPCSecurityManager {
+
+	static final int LAST_METHOD_ID = nsIXPCSecurityManager.LAST_METHOD_ID + 26;
+
+	public static final String NS_ISCRIPTSECURITYMANAGER_IID_STR =
+		"f8e350b9-9f31-451a-8c8f-d10fea26b780";
+
+	public static final nsID NS_ISCRIPTSECURITYMANAGER_IID =
+		new nsID(NS_ISCRIPTSECURITYMANAGER_IID_STR);
+
+	public  nsIScriptSecurityManager_1_9_1(int /*long*/ address) {
+		super(address);
+	}
+
+//	public int CheckPropertyAccess(int /*long*/ aJSContext, int /*long*/ aJSObject, byte[] aClassName, !ERROR UNKNOWN C TYPE <jsval >! aProperty, int aAction) {
+//		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 1, getAddress(), aJSContext, aJSObject, aClassName, aProperty, aAction);
+//	}
+
+	public int CheckConnect(int /*long*/ aJSContext, int /*long*/ aTargetURI, byte[] aClassName, byte[] aProperty) {
+		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 2, getAddress(), aJSContext, aTargetURI, aClassName, aProperty);
+	}
+
+	public int CheckLoadURIFromScript(int /*long*/ cx, int /*long*/ uri) {
+		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 3, getAddress(), cx, uri);
+	}
+
+	public static final int STANDARD = 0;
+
+	public static final int LOAD_IS_AUTOMATIC_DOCUMENT_REPLACEMENT = 1;
+
+	public static final int ALLOW_CHROME = 2;
+
+	public static final int DISALLOW_INHERIT_PRINCIPAL = 4;
+
+	public static final int DISALLOW_SCRIPT_OR_DATA = 4;
+
+	public static final int DISALLOW_SCRIPT = 8;
+
+	public int CheckLoadURIWithPrincipal(int /*long*/ aPrincipal, int /*long*/ uri, int flags) {
+		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 4, getAddress(), aPrincipal, uri, flags);
+	}
+
+	public int CheckLoadURI(int /*long*/ from, int /*long*/ uri, int flags) {
+		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 5, getAddress(), from, uri, flags);
+	}
+
+	public int CheckLoadURIStrWithPrincipal(int /*long*/ aPrincipal, int /*long*/ uri, int flags) {
+		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 6, getAddress(), aPrincipal, uri, flags);
+	}
+
+	public int CheckLoadURIStr(int /*long*/ from, int /*long*/ uri, int flags) {
+		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 7, getAddress(), from, uri, flags);
+	}
+
+	public int CheckFunctionAccess(int /*long*/ cx, int /*long*/ funObj, int /*long*/ targetObj) {
+		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 8, getAddress(), cx, funObj, targetObj);
+	}
+
+//	public int CanExecuteScripts(int /*long*/ cx, int /*long*/ principal, int[] _retval NS_OUTPARAM) {
+//		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 9, getAddress(), cx, principal, _retval NS_OUTPARAM);
+//	}
+
+//	public int GetSubjectPrincipal(int /*long*/[] _retval NS_OUTPARAM) {
+//		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 10, getAddress(), _retval NS_OUTPARAM);
+//	}
+
+	public int GetSystemPrincipal(int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 11, getAddress(), _retval);
+	}
+
+//	public int GetCertificatePrincipal(int /*long*/ aCertFingerprint, int /*long*/ aSubjectName, int /*long*/ aPrettyName, int /*long*/ aCert, int /*long*/ aURI, int /*long*/[] _retval NS_OUTPARAM) {
+//		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 12, getAddress(), aCertFingerprint, aSubjectName, aPrettyName, aCert, aURI, _retval NS_OUTPARAM);
+//	}
+
+//	public int GetCodebasePrincipal(int /*long*/ aURI, int /*long*/[] _retval NS_OUTPARAM) {
+//		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 13, getAddress(), aURI, _retval NS_OUTPARAM);
+//	}
+
+//	public int RequestCapability(int /*long*/ principal, byte[] capability, int /*long*/ _retval NS_OUTPARAM) {
+//		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 14, getAddress(), principal, capability, _retval NS_OUTPARAM);
+//	}
+
+//	public int IsCapabilityEnabled(byte[] capability, int[] _retval NS_OUTPARAM) {
+//		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 15, getAddress(), capability, _retval NS_OUTPARAM);
+//	}
+
+	public int EnableCapability(byte[] capability) {
+		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 16, getAddress(), capability);
+	}
+
+	public int RevertCapability(byte[] capability) {
+		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 17, getAddress(), capability);
+	}
+
+	public int DisableCapability(byte[] capability) {
+		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 18, getAddress(), capability);
+	}
+
+//	public int SetCanEnableCapability(int /*long*/ certificateFingerprint, byte[] capability, !ERROR UNKNOWN C TYPE <PRInt16 >! canEnable) {
+//		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 19, getAddress(), certificateFingerprint, capability, canEnable);
+//	}
+
+//	public int GetObjectPrincipal(int /*long*/ cx, int /*long*/ obj, int /*long*/[] _retval NS_OUTPARAM) {
+//		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 20, getAddress(), cx, obj, _retval NS_OUTPARAM);
+//	}
+
+//	public int SubjectPrincipalIsSystem(int[] _retval NS_OUTPARAM) {
+//		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 21, getAddress(), _retval NS_OUTPARAM);
+//	}
+
+	public int CheckSameOrigin(int /*long*/ aJSContext, int /*long*/ aTargetURI) {
+		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 22, getAddress(), aJSContext, aTargetURI);
+	}
+
+	public int CheckSameOriginURI(int /*long*/ aSourceURI, int /*long*/ aTargetURI, int reportError) {
+		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 23, getAddress(), aSourceURI, aTargetURI, reportError);
+	}
+
+//	public int GetPrincipalFromContext(int /*long*/ cx, int /*long*/[] _retval NS_OUTPARAM) {
+//		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 24, getAddress(), cx, _retval NS_OUTPARAM);
+//	}
+
+//	public int GetChannelPrincipal(int /*long*/ aChannel, int /*long*/[] _retval NS_OUTPARAM) {
+//		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 25, getAddress(), aChannel, _retval NS_OUTPARAM);
+//	}
+
+//	public int IsSystemPrincipal(int /*long*/ aPrincipal, int[] _retval NS_OUTPARAM) {
+//		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 26, getAddress(), aPrincipal, _retval NS_OUTPARAM);
+//	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISecurityCheckedComponent.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISecurityCheckedComponent.java
new file mode 100644
index 0000000..bc58ffa
--- /dev/null
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISecurityCheckedComponent.java
@@ -0,0 +1,33 @@
+package org.eclipse.swt.internal.mozilla;
+
+
+public class nsISecurityCheckedComponent extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 4;
+
+	public static final String NS_ISECURITYCHECKEDCOMPONENT_IID_STR =
+		"0dad9e8c-a12d-4dcb-9a6f-7d09839356e1";
+
+	public static final nsID NS_ISECURITYCHECKEDCOMPONENT_IID =
+		new nsID(NS_ISECURITYCHECKEDCOMPONENT_IID_STR);
+
+	public nsISecurityCheckedComponent(int /*long*/ address) {
+		super(address);
+	}
+
+	public int CanCreateWrapper(int /*long*/ iid, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), iid, _retval);
+	}
+
+	public int CanCallMethod(int /*long*/ iid, char[] methodName, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), iid, methodName, _retval);
+	}
+
+	public int CanGetProperty(int /*long*/ iid, char[] propertyName, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), iid, propertyName, _retval);
+	}
+
+	public int CanSetProperty(int /*long*/ iid, char[] propertyName, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), iid, propertyName, _retval);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISerializable.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISerializable.java
new file mode 100644
index 0000000..3b37b9f
--- /dev/null
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISerializable.java
@@ -0,0 +1,51 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2009 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class  nsISerializable extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 2;
+
+	public static final String NS_ISERIALIZABLE_IID_STR =
+		"91cca981-c26d-44a8-bebe-d9ed4891503a";
+
+	public static final nsID NS_ISERIALIZABLE_IID =
+		new nsID(NS_ISERIALIZABLE_IID_STR);
+
+	public  nsISerializable(int /*long*/ address) {
+		super(address);
+	}
+
+	public int Read(int /*long*/ aInputStream) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aInputStream);
+	}
+
+	public int Write(int /*long*/ aOutputStream) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aOutputStream);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIServiceManager.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIServiceManager.java
index 9a09f90..2f46a69 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIServiceManager.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIServiceManager.java
@@ -1,59 +1,59 @@
-/* ***** BEGIN LICENSE BLOCK *****

- * Version: MPL 1.1

- *

- * The contents of this file are subject to the Mozilla Public License Version

- * 1.1 (the "License"); you may not use this file except in compliance with

- * the License. You may obtain a copy of the License at

- * http://www.mozilla.org/MPL/

- *

- * Software distributed under the License is distributed on an "AS IS" basis,

- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

- * for the specific language governing rights and limitations under the

- * License.

- *

- * The Original Code is Mozilla Communicator client code, released March 31, 1998.

- *

- * The Initial Developer of the Original Code is

- * Netscape Communications Corporation.

- * Portions created by Netscape are Copyright (C) 1998-1999

- * Netscape Communications Corporation.  All Rights Reserved.

- *

- * Contributor(s):

- *

- * IBM

- * -  Binding to permit interfacing between Mozilla and SWT

- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.

- *

- * ***** END LICENSE BLOCK ***** */

-package org.eclipse.swt.internal.mozilla;

-

-public class nsIServiceManager extends nsISupports {

-

-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 4;

-

-	public static final String NS_ISERVICEMANAGER_IID_STR =

-		"8bb35ed9-e332-462d-9155-4a002ab5c958";

-

-	public static final nsID NS_ISERVICEMANAGER_IID =

-		new nsID(NS_ISERVICEMANAGER_IID_STR);

-

-	public nsIServiceManager(int /*long*/ address) {

-		super(address);

-	}

-

-	public int GetService(nsID aClass, nsID aIID, int /*long*/[] result) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aClass, aIID, result);

-	}

-

-	public int GetServiceByContractID(byte[] aContractID, nsID aIID, int /*long*/[] result) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aContractID, aIID, result);

-	}

-

-	public int IsServiceInstantiated(nsID aClass, nsID aIID, int[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aClass, aIID, _retval);

-	}

-

-	public int IsServiceInstantiatedByContractID(byte[] aContractID, nsID aIID, int[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aContractID, aIID, _retval);

-	}

-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIServiceManager extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 4;
+
+	public static final String NS_ISERVICEMANAGER_IID_STR =
+		"8bb35ed9-e332-462d-9155-4a002ab5c958";
+
+	public static final nsID NS_ISERVICEMANAGER_IID =
+		new nsID(NS_ISERVICEMANAGER_IID_STR);
+
+	public nsIServiceManager(int /*long*/ address) {
+		super(address);
+	}
+
+	public int GetService(nsID aClass, nsID aIID, int /*long*/[] result) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aClass, aIID, result);
+	}
+
+	public int GetServiceByContractID(byte[] aContractID, nsID aIID, int /*long*/[] result) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aContractID, aIID, result);
+	}
+
+	public int IsServiceInstantiated(nsID aClass, nsID aIID, int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aClass, aIID, _retval);
+	}
+
+	public int IsServiceInstantiatedByContractID(byte[] aContractID, nsID aIID, int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aContractID, aIID, _retval);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java
index 0052864..9f29e75 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java
@@ -1,51 +1,51 @@
-/* ***** BEGIN LICENSE BLOCK *****

- * Version: MPL 1.1

- *

- * The contents of this file are subject to the Mozilla Public License Version

- * 1.1 (the "License"); you may not use this file except in compliance with

- * the License. You may obtain a copy of the License at

- * http://www.mozilla.org/MPL/

- *

- * Software distributed under the License is distributed on an "AS IS" basis,

- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

- * for the specific language governing rights and limitations under the

- * License.

- *

- * The Original Code is Mozilla Communicator client code, released March 31, 1998.

- *

- * The Initial Developer of the Original Code is

- * Netscape Communications Corporation.

- * Portions created by Netscape are Copyright (C) 1998-1999

- * Netscape Communications Corporation.  All Rights Reserved.

- *

- * Contributor(s):

- *

- * IBM

- * -  Binding to permit interfacing between Mozilla and SWT

- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.

- *

- * ***** END LICENSE BLOCK ***** */

-package org.eclipse.swt.internal.mozilla;

-

-public class nsISimpleEnumerator extends nsISupports {

-

-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 2;

-

-	public static final String NS_ISIMPLEENUMERATOR_IID_STR =

-		"d1899240-f9d2-11d2-bdd6-000064657374";

-

-	public static final nsID NS_ISIMPLEENUMERATOR_IID =

-		new nsID(NS_ISIMPLEENUMERATOR_IID_STR);

-

-	public nsISimpleEnumerator(int /*long*/ address) {

-		super(address);

-	}

-

-	public int HasMoreElements(int[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), _retval);

-	}

-

-	public int GetNext(int /*long*/[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval);

-	}

-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsISimpleEnumerator extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 2;
+
+	public static final String NS_ISIMPLEENUMERATOR_IID_STR =
+		"d1899240-f9d2-11d2-bdd6-000064657374";
+
+	public static final nsID NS_ISIMPLEENUMERATOR_IID =
+		new nsID(NS_ISIMPLEENUMERATOR_IID_STR);
+
+	public nsISimpleEnumerator(int /*long*/ address) {
+		super(address);
+	}
+
+	public int HasMoreElements(int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), _retval);
+	}
+
+	public int GetNext(int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISupports.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISupports.java
index 5efb3ee..e5d3d7c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISupports.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISupports.java
@@ -29,8 +29,15 @@
 
 public class nsISupports {
 
-	static final int LAST_METHOD_ID = 2;
-
+	static final boolean IsSolaris;
+	static {
+		String osName = System.getProperty ("os.name").toLowerCase (); //$NON-NLS-1$
+		IsSolaris = osName.startsWith ("sunos") || osName.startsWith("solaris"); //$NON-NLS-1$
+	}
+	
+	static final int FIRST_METHOD_ID = IsSolaris ? 2 : 0;
+	static final int LAST_METHOD_ID = FIRST_METHOD_ID + 2;
+	
 	public static final String NS_ISUPPORTS_IID_STR =
 		"00000000-0000-0000-c000-000000000046";
 
@@ -48,14 +55,14 @@
 	}
 
 	public int QueryInterface(nsID uuid, int /*long*/[] result) {
-		return XPCOM.VtblCall(0, getAddress(), uuid, result);
+		return XPCOM.VtblCall(FIRST_METHOD_ID, getAddress(), uuid, result);
 	}
 
 	public int AddRef() {
-		return XPCOM.VtblCall(1, getAddress());
+		return XPCOM.VtblCall(FIRST_METHOD_ID + 1, getAddress());
 	}
 
 	public int Release() {
-		return XPCOM.VtblCall(2, getAddress());
+		return XPCOM.VtblCall(FIRST_METHOD_ID + 2, getAddress());
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIURI.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIURI.java
index 773db9a..6c4bc12 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIURI.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIURI.java
@@ -1,147 +1,147 @@
-/* ***** BEGIN LICENSE BLOCK *****

- * Version: MPL 1.1

- *

- * The contents of this file are subject to the Mozilla Public License Version

- * 1.1 (the "License"); you may not use this file except in compliance with

- * the License. You may obtain a copy of the License at

- * http://www.mozilla.org/MPL/

- *

- * Software distributed under the License is distributed on an "AS IS" basis,

- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

- * for the specific language governing rights and limitations under the

- * License.

- *

- * The Original Code is Mozilla Communicator client code, released March 31, 1998.

- *

- * The Initial Developer of the Original Code is

- * Netscape Communications Corporation.

- * Portions created by Netscape are Copyright (C) 1998-1999

- * Netscape Communications Corporation.  All Rights Reserved.

- *

- * Contributor(s):

- *

- * IBM

- * -  Binding to permit interfacing between Mozilla and SWT

- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.

- *

- * ***** END LICENSE BLOCK ***** */

-package org.eclipse.swt.internal.mozilla;

-

-public class nsIURI extends nsISupports {

-

-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 26;

-

-	public static final String NS_IURI_IID_STR =

-		"07a22cc0-0ce5-11d3-9331-00104ba0fd40";

-

-	public static final nsID NS_IURI_IID =

-		new nsID(NS_IURI_IID_STR);

-

-	public nsIURI(int /*long*/ address) {

-		super(address);

-	}

-

-	public int GetSpec(int /*long*/ aSpec) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aSpec);

-	}

-

-	public int SetSpec(int /*long*/ aSpec) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSpec);

-	}

-

-	public int GetPrePath(int /*long*/ aPrePath) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aPrePath);

-	}

-

-	public int GetScheme(int /*long*/ aScheme) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aScheme);

-	}

-

-	public int SetScheme(int /*long*/ aScheme) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aScheme);

-	}

-

-	public int GetUserPass(int /*long*/ aUserPass) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aUserPass);

-	}

-

-	public int SetUserPass(int /*long*/ aUserPass) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aUserPass);

-	}

-

-	public int GetUsername(int /*long*/ aUsername) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aUsername);

-	}

-

-	public int SetUsername(int /*long*/ aUsername) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aUsername);

-	}

-

-	public int GetPassword(int /*long*/ aPassword) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aPassword);

-	}

-

-	public int SetPassword(int /*long*/ aPassword) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aPassword);

-	}

-

-	public int GetHostPort(int /*long*/ aHostPort) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aHostPort);

-	}

-

-	public int SetHostPort(int /*long*/ aHostPort) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aHostPort);

-	}

-

-	public int GetHost(int /*long*/ aHost) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aHost);

-	}

-

-	public int SetHost(int /*long*/ aHost) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aHost);

-	}

-

-	public int GetPort(int[] aPort) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aPort);

-	}

-

-	public int SetPort(int aPort) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aPort);

-	}

-

-	public int GetPath(int /*long*/ aPath) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aPath);

-	}

-

-	public int SetPath(int /*long*/ aPath) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), aPath);

-	}

-

-	public int Equals(int /*long*/ other, int[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), other, _retval);

-	}

-

-	public int SchemeIs(byte[] scheme, int[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), scheme, _retval);

-	}

-

-	public int Clone(int /*long*/[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), _retval);

-	}

-

-	public int Resolve(int /*long*/ relativePath, int /*long*/ _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), relativePath, _retval);

-	}

-

-	public int GetAsciiSpec(int /*long*/ aAsciiSpec) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), aAsciiSpec);

-	}

-

-	public int GetAsciiHost(int /*long*/ aAsciiHost) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), aAsciiHost);

-	}

-

-	public int GetOriginCharset(int /*long*/ aOriginCharset) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aOriginCharset);

-	}

-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIURI extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 26;
+
+	public static final String NS_IURI_IID_STR =
+		"07a22cc0-0ce5-11d3-9331-00104ba0fd40";
+
+	public static final nsID NS_IURI_IID =
+		new nsID(NS_IURI_IID_STR);
+
+	public nsIURI(int /*long*/ address) {
+		super(address);
+	}
+
+	public int GetSpec(int /*long*/ aSpec) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aSpec);
+	}
+
+	public int SetSpec(int /*long*/ aSpec) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSpec);
+	}
+
+	public int GetPrePath(int /*long*/ aPrePath) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aPrePath);
+	}
+
+	public int GetScheme(int /*long*/ aScheme) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aScheme);
+	}
+
+	public int SetScheme(int /*long*/ aScheme) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aScheme);
+	}
+
+	public int GetUserPass(int /*long*/ aUserPass) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aUserPass);
+	}
+
+	public int SetUserPass(int /*long*/ aUserPass) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aUserPass);
+	}
+
+	public int GetUsername(int /*long*/ aUsername) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aUsername);
+	}
+
+	public int SetUsername(int /*long*/ aUsername) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aUsername);
+	}
+
+	public int GetPassword(int /*long*/ aPassword) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aPassword);
+	}
+
+	public int SetPassword(int /*long*/ aPassword) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aPassword);
+	}
+
+	public int GetHostPort(int /*long*/ aHostPort) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aHostPort);
+	}
+
+	public int SetHostPort(int /*long*/ aHostPort) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aHostPort);
+	}
+
+	public int GetHost(int /*long*/ aHost) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aHost);
+	}
+
+	public int SetHost(int /*long*/ aHost) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aHost);
+	}
+
+	public int GetPort(int[] aPort) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aPort);
+	}
+
+	public int SetPort(int aPort) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aPort);
+	}
+
+	public int GetPath(int /*long*/ aPath) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aPath);
+	}
+
+	public int SetPath(int /*long*/ aPath) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), aPath);
+	}
+
+	public int Equals(int /*long*/ other, int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), other, _retval);
+	}
+
+	public int SchemeIs(byte[] scheme, int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), scheme, _retval);
+	}
+
+	public int Clone(int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), _retval);
+	}
+
+	public int Resolve(int /*long*/ relativePath, int /*long*/ _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), relativePath, _retval);
+	}
+
+	public int GetAsciiSpec(int /*long*/ aAsciiSpec) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), aAsciiSpec);
+	}
+
+	public int GetAsciiHost(int /*long*/ aAsciiHost) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), aAsciiHost);
+	}
+
+	public int GetOriginCharset(int /*long*/ aOriginCharset) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aOriginCharset);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java
index ca9a722..aa6378e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java
@@ -1,75 +1,75 @@
-/* ***** BEGIN LICENSE BLOCK *****

- * Version: MPL 1.1

- *

- * The contents of this file are subject to the Mozilla Public License Version

- * 1.1 (the "License"); you may not use this file except in compliance with

- * the License. You may obtain a copy of the License at

- * http://www.mozilla.org/MPL/

- *

- * Software distributed under the License is distributed on an "AS IS" basis,

- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

- * for the specific language governing rights and limitations under the

- * License.

- *

- * The Original Code is Mozilla Communicator client code, released March 31, 1998.

- *

- * The Initial Developer of the Original Code is

- * Netscape Communications Corporation.

- * Portions created by Netscape are Copyright (C) 1998-1999

- * Netscape Communications Corporation.  All Rights Reserved.

- *

- * Contributor(s):

- *

- * IBM

- * -  Binding to permit interfacing between Mozilla and SWT

- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.

- *

- * ***** END LICENSE BLOCK ***** */

-package org.eclipse.swt.internal.mozilla;

-

-public class nsIURIContentListener extends nsISupports {

-

-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 8;

-

-	public static final String NS_IURICONTENTLISTENER_IID_STR =

-		"94928ab3-8b63-11d3-989d-001083010e9b";

-

-	public static final nsID NS_IURICONTENTLISTENER_IID =

-		new nsID(NS_IURICONTENTLISTENER_IID_STR);

-

-	public nsIURIContentListener(int /*long*/ address) {

-		super(address);

-	}

-

-	public int OnStartURIOpen(int /*long*/ aURI, int[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aURI, _retval);

-	}

-

-	public int DoContent(byte[] aContentType, int aIsContentPreferred, int /*long*/ aRequest, int /*long*/[] aContentHandler, int[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aContentType, aIsContentPreferred, aRequest, aContentHandler, _retval);

-	}

-

-	public int IsPreferred(byte[] aContentType, int /*long*/[] aDesiredContentType, int[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aContentType, aDesiredContentType, _retval);

-	}

-

-	public int CanHandleContent(byte[] aContentType, int aIsContentPreferred, int /*long*/[] aDesiredContentType, int[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aContentType, aIsContentPreferred, aDesiredContentType, _retval);

-	}

-

-	public int GetLoadCookie(int /*long*/[] aLoadCookie) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aLoadCookie);

-	}

-

-	public int SetLoadCookie(int /*long*/ aLoadCookie) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aLoadCookie);

-	}

-

-	public int GetParentContentListener(int /*long*/[] aParentContentListener) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aParentContentListener);

-	}

-

-	public int SetParentContentListener(int /*long*/ aParentContentListener) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aParentContentListener);

-	}

-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIURIContentListener extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 8;
+
+	public static final String NS_IURICONTENTLISTENER_IID_STR =
+		"94928ab3-8b63-11d3-989d-001083010e9b";
+
+	public static final nsID NS_IURICONTENTLISTENER_IID =
+		new nsID(NS_IURICONTENTLISTENER_IID_STR);
+
+	public nsIURIContentListener(int /*long*/ address) {
+		super(address);
+	}
+
+	public int OnStartURIOpen(int /*long*/ aURI, int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aURI, _retval);
+	}
+
+	public int DoContent(byte[] aContentType, int aIsContentPreferred, int /*long*/ aRequest, int /*long*/[] aContentHandler, int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aContentType, aIsContentPreferred, aRequest, aContentHandler, _retval);
+	}
+
+	public int IsPreferred(byte[] aContentType, int /*long*/[] aDesiredContentType, int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aContentType, aDesiredContentType, _retval);
+	}
+
+	public int CanHandleContent(byte[] aContentType, int aIsContentPreferred, int /*long*/[] aDesiredContentType, int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aContentType, aIsContentPreferred, aDesiredContentType, _retval);
+	}
+
+	public int GetLoadCookie(int /*long*/[] aLoadCookie) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aLoadCookie);
+	}
+
+	public int SetLoadCookie(int /*long*/ aLoadCookie) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aLoadCookie);
+	}
+
+	public int GetParentContentListener(int /*long*/[] aParentContentListener) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aParentContentListener);
+	}
+
+	public int SetParentContentListener(int /*long*/ aParentContentListener) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aParentContentListener);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIVariant.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIVariant.java
new file mode 100644
index 0000000..2de3baf
--- /dev/null
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIVariant.java
@@ -0,0 +1,147 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIVariant extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 26;
+
+	public static final String NS_IVARIANT_IID_STR =
+		"6c9eb060-8c6a-11d5-90f3-0010a4e73d9a";
+
+	public static final nsID NS_IVARIANT_IID =
+		new nsID(NS_IVARIANT_IID_STR);
+
+	public nsIVariant(int /*long*/ address) {
+		super(address);
+	}
+
+	public int GetDataType(short[] aDataType) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aDataType);
+	}
+
+	public int GetAsInt8(int /*long*/ _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval);
+	}
+
+	public int GetAsInt16(int /*long*/ _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), _retval);
+	}
+
+	public int GetAsInt32(int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), _retval);
+	}
+
+	public int GetAsInt64(long[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), _retval);
+	}
+
+	public int GetAsUint8(int /*long*/ _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), _retval);
+	}
+
+	public int GetAsUint16(short[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), _retval);
+	}
+
+	public int GetAsUint32(int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), _retval);
+	}
+
+	public int GetAsUint64(int /*long*/ _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), _retval);
+	}
+
+	public int GetAsFloat(float[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), _retval);
+	}
+
+	public int GetAsDouble(int /*long*/ _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), _retval);
+	}
+
+	public int GetAsBool(int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), _retval);
+	}
+
+	public int GetAsChar(byte[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), _retval);
+	}
+
+	public int GetAsWChar(char[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), _retval);
+	}
+
+	public int GetAsID(int /*long*/ retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), retval);
+	}
+
+	public int GetAsAString(int /*long*/ _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), _retval);
+	}
+
+	public int GetAsDOMString(int /*long*/ _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), _retval);
+	}
+
+	public int GetAsACString(int /*long*/ _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), _retval);
+	}
+
+	public int GetAsAUTF8String(int /*long*/ _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), _retval);
+	}
+
+	public int GetAsString(int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), _retval);
+	}
+
+	public int GetAsWString(int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), _retval);
+	}
+
+	public int GetAsISupports(int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), _retval);
+	}
+
+	public int GetAsInterface(int /*long*/[] iid, int /*long*/[] iface) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), iid, iface);
+	}
+
+	public int GetAsArray(short[] type, int /*long*/ iid, int[] count, int /*long*/[] ptr) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), type, iid, count, ptr);
+	}
+
+	public int GetAsStringWithSize(int[] size, int /*long*/[] str) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), size, str);
+	}
+
+	public int GetAsWStringWithSize(int[] size, int /*long*/[] str) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), size, str);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java
index 140d7b5..823c4a6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java
@@ -1,137 +1,137 @@
-/* ***** BEGIN LICENSE BLOCK *****

- * Version: MPL 1.1

- *

- * The contents of this file are subject to the Mozilla Public License Version

- * 1.1 (the "License"); you may not use this file except in compliance with

- * the License. You may obtain a copy of the License at

- * http://www.mozilla.org/MPL/

- *

- * Software distributed under the License is distributed on an "AS IS" basis,

- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

- * for the specific language governing rights and limitations under the

- * License.

- *

- * The Original Code is Mozilla Communicator client code, released March 31, 1998.

- *

- * The Initial Developer of the Original Code is

- * Netscape Communications Corporation.

- * Portions created by Netscape are Copyright (C) 1998-1999

- * Netscape Communications Corporation.  All Rights Reserved.

- *

- * Contributor(s):

- *

- * IBM

- * -  Binding to permit interfacing between Mozilla and SWT

- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.

- *

- * ***** END LICENSE BLOCK ***** */

-package org.eclipse.swt.internal.mozilla;

-

-public class nsIWebBrowserChrome extends nsISupports {

-

-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 10;

-

-	public static final String NS_IWEBBROWSERCHROME_IID_STR =

-		"ba434c60-9d52-11d3-afb0-00a024ffc08c";

-

-	public static final nsID NS_IWEBBROWSERCHROME_IID =

-		new nsID(NS_IWEBBROWSERCHROME_IID_STR);

-

-	public nsIWebBrowserChrome(int /*long*/ address) {

-		super(address);

-	}

-

-	public static final int STATUS_SCRIPT = 1;

-

-	public static final int STATUS_SCRIPT_DEFAULT = 2;

-

-	public static final int STATUS_LINK = 3;

-

-	public int SetStatus(int statusType, char[] status) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), statusType, status);

-	}

-

-	public int GetWebBrowser(int /*long*/[] aWebBrowser) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aWebBrowser);

-	}

-

-	public int SetWebBrowser(int /*long*/ aWebBrowser) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aWebBrowser);

-	}

-

-	public static final int CHROME_DEFAULT = 1;

-

-	public static final int CHROME_WINDOW_BORDERS = 2;

-

-	public static final int CHROME_WINDOW_CLOSE = 4;

-

-	public static final int CHROME_WINDOW_RESIZE = 8;

-

-	public static final int CHROME_MENUBAR = 16;

-

-	public static final int CHROME_TOOLBAR = 32;

-

-	public static final int CHROME_LOCATIONBAR = 64;

-

-	public static final int CHROME_STATUSBAR = 128;

-

-	public static final int CHROME_PERSONAL_TOOLBAR = 256;

-

-	public static final int CHROME_SCROLLBARS = 512;

-

-	public static final int CHROME_TITLEBAR = 1024;

-

-	public static final int CHROME_EXTRA = 2048;

-

-	public static final int CHROME_WITH_SIZE = 4096;

-

-	public static final int CHROME_WITH_POSITION = 8192;

-

-	public static final int CHROME_WINDOW_MIN = 16384;

-

-	public static final int CHROME_WINDOW_POPUP = 32768;

-

-	public static final int CHROME_WINDOW_RAISED = 33554432;

-

-	public static final int CHROME_WINDOW_LOWERED = 67108864;

-

-	public static final int CHROME_CENTER_SCREEN = 134217728;

-

-	public static final int CHROME_DEPENDENT = 268435456;

-

-	public static final int CHROME_MODAL = 536870912;

-

-	public static final int CHROME_OPENAS_DIALOG = 1073741824;

-

+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIWebBrowserChrome extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 10;
+
+	public static final String NS_IWEBBROWSERCHROME_IID_STR =
+		"ba434c60-9d52-11d3-afb0-00a024ffc08c";
+
+	public static final nsID NS_IWEBBROWSERCHROME_IID =
+		new nsID(NS_IWEBBROWSERCHROME_IID_STR);
+
+	public nsIWebBrowserChrome(int /*long*/ address) {
+		super(address);
+	}
+
+	public static final int STATUS_SCRIPT = 1;
+
+	public static final int STATUS_SCRIPT_DEFAULT = 2;
+
+	public static final int STATUS_LINK = 3;
+
+	public int SetStatus(int statusType, char[] status) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), statusType, status);
+	}
+
+	public int GetWebBrowser(int /*long*/[] aWebBrowser) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aWebBrowser);
+	}
+
+	public int SetWebBrowser(int /*long*/ aWebBrowser) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aWebBrowser);
+	}
+
+	public static final int CHROME_DEFAULT = 1;
+
+	public static final int CHROME_WINDOW_BORDERS = 2;
+
+	public static final int CHROME_WINDOW_CLOSE = 4;
+
+	public static final int CHROME_WINDOW_RESIZE = 8;
+
+	public static final int CHROME_MENUBAR = 16;
+
+	public static final int CHROME_TOOLBAR = 32;
+
+	public static final int CHROME_LOCATIONBAR = 64;
+
+	public static final int CHROME_STATUSBAR = 128;
+
+	public static final int CHROME_PERSONAL_TOOLBAR = 256;
+
+	public static final int CHROME_SCROLLBARS = 512;
+
+	public static final int CHROME_TITLEBAR = 1024;
+
+	public static final int CHROME_EXTRA = 2048;
+
+	public static final int CHROME_WITH_SIZE = 4096;
+
+	public static final int CHROME_WITH_POSITION = 8192;
+
+	public static final int CHROME_WINDOW_MIN = 16384;
+
+	public static final int CHROME_WINDOW_POPUP = 32768;
+
+	public static final int CHROME_WINDOW_RAISED = 33554432;
+
+	public static final int CHROME_WINDOW_LOWERED = 67108864;
+
+	public static final int CHROME_CENTER_SCREEN = 134217728;
+
+	public static final int CHROME_DEPENDENT = 268435456;
+
+	public static final int CHROME_MODAL = 536870912;
+
+	public static final int CHROME_OPENAS_DIALOG = 1073741824;
+
 	public static final int CHROME_OPENAS_CHROME = -2147483648;
-

-	public static final int CHROME_ALL = 4094;

-

-	public int GetChromeFlags(int[] aChromeFlags) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aChromeFlags);

-	}

-

-	public int SetChromeFlags(int aChromeFlags) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aChromeFlags);

-	}

-

-	public int DestroyBrowserWindow() {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress());

-	}

-

-	public int SizeBrowserTo(int aCX, int aCY) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aCX, aCY);

-	}

-

-	public int ShowAsModal() {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress());

-	}

-

-	public int IsWindowModal(int[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), _retval);

-	}

-

-	public int ExitModalEventLoop(int aStatus) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aStatus);

-	}

-}
\ No newline at end of file
+
+	public static final int CHROME_ALL = 4094;
+
+	public int GetChromeFlags(int[] aChromeFlags) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aChromeFlags);
+	}
+
+	public int SetChromeFlags(int aChromeFlags) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aChromeFlags);
+	}
+
+	public int DestroyBrowserWindow() {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress());
+	}
+
+	public int SizeBrowserTo(int aCX, int aCY) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aCX, aCY);
+	}
+
+	public int ShowAsModal() {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress());
+	}
+
+	public int IsWindowModal(int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), _retval);
+	}
+
+	public int ExitModalEventLoop(int aStatus) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aStatus);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserSetup.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserSetup.java
new file mode 100644
index 0000000..6ea241f
--- /dev/null
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserSetup.java
@@ -0,0 +1,63 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIWebBrowserSetup extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 1;
+
+	public static final String NS_IWEBBROWSERSETUP_IID_STR =
+		"f15398a0-8018-11d3-af70-00a024ffc08c";
+
+	public static final nsID NS_IWEBBROWSERSETUP_IID =
+		new nsID(NS_IWEBBROWSERSETUP_IID_STR);
+
+	public nsIWebBrowserSetup(int /*long*/ address) {
+		super(address);
+	}
+
+	public static final int SETUP_ALLOW_PLUGINS = 1;
+
+	public static final int SETUP_ALLOW_JAVASCRIPT = 2;
+
+	public static final int SETUP_ALLOW_META_REDIRECTS = 3;
+
+	public static final int SETUP_ALLOW_SUBFRAMES = 4;
+
+	public static final int SETUP_ALLOW_IMAGES = 5;
+
+	public static final int SETUP_FOCUS_DOC_BEFORE_CONTENT = 6;
+
+	public static final int SETUP_USE_GLOBAL_HISTORY = 256;
+
+	public static final int SETUP_IS_CHROME_WRAPPER = 7;
+
+	public int SetProperty(int aId, int aValue) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aId, aValue);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java
new file mode 100644
index 0000000..4b69ae8
--- /dev/null
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java
@@ -0,0 +1,55 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2009 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIWebBrowserStream extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 3;
+
+	public static final String NS_IWEBBROWSERSTREAM_IID_STR =
+		"86d02f0e-219b-4cfc-9c88-bd98d2cce0b8";
+
+	public static final nsID NS_IWEBBROWSERSTREAM_IID =
+		new nsID(NS_IWEBBROWSERSTREAM_IID_STR);
+
+	public nsIWebBrowserStream(int /*long*/ address) {
+		super(address);
+	}
+
+	public int OpenStream(int /*long*/ aBaseURI, int /*long*/ aContentType) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aBaseURI, aContentType);
+	}
+
+	public int AppendToStream(int /*long*/ aData, int aLen) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aData, aLen);
+	}
+
+	public int CloseStream() {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress());
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebNavigation.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebNavigation.java
index a22736f..24248d2 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebNavigation.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebNavigation.java
@@ -1,119 +1,119 @@
-/* ***** BEGIN LICENSE BLOCK *****

- * Version: MPL 1.1

- *

- * The contents of this file are subject to the Mozilla Public License Version

- * 1.1 (the "License"); you may not use this file except in compliance with

- * the License. You may obtain a copy of the License at

- * http://www.mozilla.org/MPL/

- *

- * Software distributed under the License is distributed on an "AS IS" basis,

- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

- * for the specific language governing rights and limitations under the

- * License.

- *

- * The Original Code is Mozilla Communicator client code, released March 31, 1998.

- *

- * The Initial Developer of the Original Code is

- * Netscape Communications Corporation.

- * Portions created by Netscape are Copyright (C) 1998-1999

- * Netscape Communications Corporation.  All Rights Reserved.

- *

- * Contributor(s):

- *

- * IBM

- * -  Binding to permit interfacing between Mozilla and SWT

- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.

- *

- * ***** END LICENSE BLOCK ***** */

-package org.eclipse.swt.internal.mozilla;

-

-public class nsIWebNavigation extends nsISupports {

-

-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 13;

-

-	public static final String NS_IWEBNAVIGATION_IID_STR =

-		"f5d9e7b0-d930-11d3-b057-00a024ffc08c";

-

-	public static final nsID NS_IWEBNAVIGATION_IID =

-		new nsID(NS_IWEBNAVIGATION_IID_STR);

-

-	public nsIWebNavigation(int /*long*/ address) {

-		super(address);

-	}

-

-	public int GetCanGoBack(int[] aCanGoBack) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aCanGoBack);

-	}

-

-	public int GetCanGoForward(int[] aCanGoForward) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aCanGoForward);

-	}

-

-	public int GoBack() {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress());

-	}

-

-	public int GoForward() {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress());

-	}

-

-	public int GotoIndex(int index) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), index);

-	}

-

-	public static final int LOAD_FLAGS_MASK = 65535;

-

-	public static final int LOAD_FLAGS_NONE = 0;

-

-	public static final int LOAD_FLAGS_IS_REFRESH = 16;

-

-	public static final int LOAD_FLAGS_IS_LINK = 32;

-

-	public static final int LOAD_FLAGS_BYPASS_HISTORY = 64;

-

-	public static final int LOAD_FLAGS_REPLACE_HISTORY = 128;

-

-	public static final int LOAD_FLAGS_BYPASS_CACHE = 256;

-

-	public static final int LOAD_FLAGS_BYPASS_PROXY = 512;

-

-	public static final int LOAD_FLAGS_CHARSET_CHANGE = 1024;

-

-	public int LoadURI(char[] uri, int loadFlags, int /*long*/ referrer, int /*long*/ postData, int /*long*/ headers) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), uri, loadFlags, referrer, postData, headers);

-	}

-

-	public int Reload(int reloadFlags) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), reloadFlags);

-	}

-

-	public static final int STOP_NETWORK = 1;

-

-	public static final int STOP_CONTENT = 2;

-

-	public static final int STOP_ALL = 3;

-

-	public int Stop(int stopFlags) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), stopFlags);

-	}

-

-	public int GetDocument(int /*long*/[] aDocument) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aDocument);

-	}

-

-	public int GetCurrentURI(int /*long*/[] aCurrentURI) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aCurrentURI);

-	}

-

-	public int GetReferringURI(int /*long*/[] aReferringURI) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aReferringURI);

-	}

-

-	public int GetSessionHistory(int /*long*/[] aSessionHistory) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aSessionHistory);

-	}

-

-	public int SetSessionHistory(int /*long*/ aSessionHistory) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aSessionHistory);

-	}

-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIWebNavigation extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 13;
+
+	public static final String NS_IWEBNAVIGATION_IID_STR =
+		"f5d9e7b0-d930-11d3-b057-00a024ffc08c";
+
+	public static final nsID NS_IWEBNAVIGATION_IID =
+		new nsID(NS_IWEBNAVIGATION_IID_STR);
+
+	public nsIWebNavigation(int /*long*/ address) {
+		super(address);
+	}
+
+	public int GetCanGoBack(int[] aCanGoBack) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aCanGoBack);
+	}
+
+	public int GetCanGoForward(int[] aCanGoForward) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aCanGoForward);
+	}
+
+	public int GoBack() {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress());
+	}
+
+	public int GoForward() {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress());
+	}
+
+	public int GotoIndex(int index) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), index);
+	}
+
+	public static final int LOAD_FLAGS_MASK = 65535;
+
+	public static final int LOAD_FLAGS_NONE = 0;
+
+	public static final int LOAD_FLAGS_IS_REFRESH = 16;
+
+	public static final int LOAD_FLAGS_IS_LINK = 32;
+
+	public static final int LOAD_FLAGS_BYPASS_HISTORY = 64;
+
+	public static final int LOAD_FLAGS_REPLACE_HISTORY = 128;
+
+	public static final int LOAD_FLAGS_BYPASS_CACHE = 256;
+
+	public static final int LOAD_FLAGS_BYPASS_PROXY = 512;
+
+	public static final int LOAD_FLAGS_CHARSET_CHANGE = 1024;
+
+	public int LoadURI(char[] uri, int loadFlags, int /*long*/ referrer, int /*long*/ postData, int /*long*/ headers) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), uri, loadFlags, referrer, postData, headers);
+	}
+
+	public int Reload(int reloadFlags) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), reloadFlags);
+	}
+
+	public static final int STOP_NETWORK = 1;
+
+	public static final int STOP_CONTENT = 2;
+
+	public static final int STOP_ALL = 3;
+
+	public int Stop(int stopFlags) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), stopFlags);
+	}
+
+	public int GetDocument(int /*long*/[] aDocument) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aDocument);
+	}
+
+	public int GetCurrentURI(int /*long*/[] aCurrentURI) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aCurrentURI);
+	}
+
+	public int GetReferringURI(int /*long*/[] aReferringURI) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aReferringURI);
+	}
+
+	public int GetSessionHistory(int /*long*/[] aSessionHistory) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aSessionHistory);
+	}
+
+	public int SetSessionHistory(int /*long*/ aSessionHistory) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aSessionHistory);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebProgress.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebProgress.java
index d211bf5..05fd351 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebProgress.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebProgress.java
@@ -1,79 +1,79 @@
-/* ***** BEGIN LICENSE BLOCK *****

- * Version: MPL 1.1

- *

- * The contents of this file are subject to the Mozilla Public License Version

- * 1.1 (the "License"); you may not use this file except in compliance with

- * the License. You may obtain a copy of the License at

- * http://www.mozilla.org/MPL/

- *

- * Software distributed under the License is distributed on an "AS IS" basis,

- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

- * for the specific language governing rights and limitations under the

- * License.

- *

- * The Original Code is Mozilla Communicator client code, released March 31, 1998.

- *

- * The Initial Developer of the Original Code is

- * Netscape Communications Corporation.

- * Portions created by Netscape are Copyright (C) 1998-1999

- * Netscape Communications Corporation.  All Rights Reserved.

- *

- * Contributor(s):

- *

- * IBM

- * -  Binding to permit interfacing between Mozilla and SWT

- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.

- *

- * ***** END LICENSE BLOCK ***** */

-package org.eclipse.swt.internal.mozilla;

-

-public class nsIWebProgress extends nsISupports {

-

-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 4;

-

-	public static final String NS_IWEBPROGRESS_IID_STR =

-		"570f39d0-efd0-11d3-b093-00a024ffc08c";

-

-	public static final nsID NS_IWEBPROGRESS_IID =

-		new nsID(NS_IWEBPROGRESS_IID_STR);

-

-	public nsIWebProgress(int /*long*/ address) {

-		super(address);

-	}

-

-	public static final int NOTIFY_STATE_REQUEST = 1;

-

-	public static final int NOTIFY_STATE_DOCUMENT = 2;

-

-	public static final int NOTIFY_STATE_NETWORK = 4;

-

-	public static final int NOTIFY_STATE_WINDOW = 8;

-

-	public static final int NOTIFY_STATE_ALL = 15;

-

-	public static final int NOTIFY_PROGRESS = 16;

-

-	public static final int NOTIFY_STATUS = 32;

-

-	public static final int NOTIFY_SECURITY = 64;

-

-	public static final int NOTIFY_LOCATION = 128;

-

-	public static final int NOTIFY_ALL = 255;

-

-	public int AddProgressListener(int /*long*/ listener, int aNotifyMask) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), listener, aNotifyMask);

-	}

-

-	public int RemoveProgressListener(int /*long*/ listener) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), listener);

-	}

-

-	public int GetDOMWindow(int /*long*/[] aDOMWindow) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aDOMWindow);

-	}

-

-	public int GetIsLoadingDocument(int[] aIsLoadingDocument) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aIsLoadingDocument);

-	}

-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIWebProgress extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 4;
+
+	public static final String NS_IWEBPROGRESS_IID_STR =
+		"570f39d0-efd0-11d3-b093-00a024ffc08c";
+
+	public static final nsID NS_IWEBPROGRESS_IID =
+		new nsID(NS_IWEBPROGRESS_IID_STR);
+
+	public nsIWebProgress(int /*long*/ address) {
+		super(address);
+	}
+
+	public static final int NOTIFY_STATE_REQUEST = 1;
+
+	public static final int NOTIFY_STATE_DOCUMENT = 2;
+
+	public static final int NOTIFY_STATE_NETWORK = 4;
+
+	public static final int NOTIFY_STATE_WINDOW = 8;
+
+	public static final int NOTIFY_STATE_ALL = 15;
+
+	public static final int NOTIFY_PROGRESS = 16;
+
+	public static final int NOTIFY_STATUS = 32;
+
+	public static final int NOTIFY_SECURITY = 64;
+
+	public static final int NOTIFY_LOCATION = 128;
+
+	public static final int NOTIFY_ALL = 255;
+
+	public int AddProgressListener(int /*long*/ listener, int aNotifyMask) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), listener, aNotifyMask);
+	}
+
+	public int RemoveProgressListener(int /*long*/ listener) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), listener);
+	}
+
+	public int GetDOMWindow(int /*long*/[] aDOMWindow) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aDOMWindow);
+	}
+
+	public int GetIsLoadingDocument(int[] aIsLoadingDocument) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aIsLoadingDocument);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java
index be52820..4bfec46 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java
@@ -1,49 +1,49 @@
-/* ***** BEGIN LICENSE BLOCK *****

- * Version: MPL 1.1

- *

- * The contents of this file are subject to the Mozilla Public License Version

- * 1.1 (the "License"); you may not use this file except in compliance with

- * the License. You may obtain a copy of the License at

- * http://www.mozilla.org/MPL/

- *

- * Software distributed under the License is distributed on an "AS IS" basis,

- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

- * for the specific language governing rights and limitations under the

- * License.

- *

- * The Original Code is Mozilla Communicator client code, released March 31, 1998.

- *

- * The Initial Developer of the Original Code is

- * Netscape Communications Corporation.

- * Portions created by Netscape are Copyright (C) 1998-1999

- * Netscape Communications Corporation.  All Rights Reserved.

- *

- * Contributor(s):

- *

- * IBM

- * -  Binding to permit interfacing between Mozilla and SWT

- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.

- *

- * ***** END LICENSE BLOCK ***** */

-package org.eclipse.swt.internal.mozilla;

-

-public class nsIWindowCreator2 extends nsIWindowCreator {

-

-	static final int LAST_METHOD_ID = nsIWindowCreator.LAST_METHOD_ID + 1;

-

-	public static final String NS_IWINDOWCREATOR2_IID_STR =

-		"f673ec81-a4b0-11d6-964b-eb5a2bf216fc";

-

-	public static final nsID NS_IWINDOWCREATOR2_IID =

-		new nsID(NS_IWINDOWCREATOR2_IID_STR);

-

-	public nsIWindowCreator2(int /*long*/ address) {

-		super(address);

-	}

-

-	public static final int PARENT_IS_LOADING_OR_RUNNING_TIMEOUT = 1;

-

-	public int CreateChromeWindow2(int /*long*/ parent, int chromeFlags, int contextFlags, int /*long*/ uri, int[] cancel, int /*long*/[] _retval) {

-		return XPCOM.VtblCall(nsIWindowCreator.LAST_METHOD_ID + 1, getAddress(), parent, chromeFlags, contextFlags, uri, cancel, _retval);

-	}

-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIWindowCreator2 extends nsIWindowCreator {
+
+	static final int LAST_METHOD_ID = nsIWindowCreator.LAST_METHOD_ID + 1;
+
+	public static final String NS_IWINDOWCREATOR2_IID_STR =
+		"f673ec81-a4b0-11d6-964b-eb5a2bf216fc";
+
+	public static final nsID NS_IWINDOWCREATOR2_IID =
+		new nsID(NS_IWINDOWCREATOR2_IID_STR);
+
+	public nsIWindowCreator2(int /*long*/ address) {
+		super(address);
+	}
+
+	public static final int PARENT_IS_LOADING_OR_RUNNING_TIMEOUT = 1;
+
+	public int CreateChromeWindow2(int /*long*/ parent, int chromeFlags, int contextFlags, int /*long*/ uri, int[] cancel, int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsIWindowCreator.LAST_METHOD_ID + 1, getAddress(), parent, chromeFlags, contextFlags, uri, cancel, _retval);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWritableVariant.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWritableVariant.java
new file mode 100644
index 0000000..30b340c
--- /dev/null
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWritableVariant.java
@@ -0,0 +1,141 @@
+package org.eclipse.swt.internal.mozilla;
+
+
+public class nsIWritableVariant extends nsIVariant {
+
+	static final int LAST_METHOD_ID = nsIVariant.LAST_METHOD_ID + 31;
+
+	public static final String NS_IWRITABLEVARIANT_IID_STR =
+		"5586a590-8c82-11d5-90f3-0010a4e73d9a";
+
+	public static final nsID NS_IWRITABLEVARIANT_IID =
+		new nsID(NS_IWRITABLEVARIANT_IID_STR);
+
+	public nsIWritableVariant(int /*long*/ address) {
+		super(address);
+	}
+
+	public int GetWritable(int[] aWritable) {
+		return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 1, getAddress(), aWritable);
+	}
+
+	public int SetWritable(int aWritable) {
+		return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 2, getAddress(), aWritable);
+	}
+
+//	public int SetAsInt8(!ERROR UNKNOWN C TYPE <PRUint8 >! aValue) {
+//		return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 3, getAddress(), aValue);
+//	}
+//
+//	public int SetAsInt16(!ERROR UNKNOWN C TYPE <PRInt16 >! aValue) {
+//		return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 4, getAddress(), aValue);
+//	}
+
+	public int SetAsInt32(int aValue) {
+		return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 5, getAddress(), aValue);
+	}
+
+	public int SetAsInt64(long aValue) {
+		return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 6, getAddress(), aValue);
+	}
+
+//	public int SetAsUint8(!ERROR UNKNOWN C TYPE <PRUint8 >! aValue) {
+//		return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 7, getAddress(), aValue);
+//	}
+
+	public int SetAsUint16(short aValue) {
+		return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 8, getAddress(), aValue);
+	}
+
+	public int SetAsUint32(int aValue) {
+		return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 9, getAddress(), aValue);
+	}
+
+//	public int SetAsUint64(!ERROR UNKNOWN C TYPE <PRUint64 >! aValue) {
+//		return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 10, getAddress(), aValue);
+//	}
+
+	public int SetAsFloat(float aValue) {
+		return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 11, getAddress(), aValue);
+	}
+
+	public int SetAsDouble(double aValue) {
+		return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 12, getAddress(), aValue);
+	}
+
+	public int SetAsBool(int aValue) {
+		return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 13, getAddress(), aValue);
+	}
+
+//	public int SetAsChar(!ERROR UNKNOWN C TYPE <char >! aValue) {
+//		return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 14, getAddress(), aValue);
+//	}
+//
+//	public int SetAsWChar(!ERROR UNKNOWN C TYPE <PRUnichar >! aValue) {
+//		return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 15, getAddress(), aValue);
+//	}
+
+	public int SetAsID(int /*long*/ aValue) {
+		return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 16, getAddress(), aValue);
+	}
+
+	public int SetAsAString(int /*long*/ aValue) {
+		return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 17, getAddress(), aValue);
+	}
+
+	public int SetAsDOMString(int /*long*/ aValue) {
+		return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 18, getAddress(), aValue);
+	}
+
+	public int SetAsACString(int /*long*/ aValue) {
+		return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 19, getAddress(), aValue);
+	}
+
+	public int SetAsAUTF8String(int /*long*/ aValue) {
+		return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 20, getAddress(), aValue);
+	}
+
+	public int SetAsString(byte[] aValue) {
+		return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 21, getAddress(), aValue);
+	}
+
+	public int SetAsWString(char[] aValue) {
+		return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 22, getAddress(), aValue);
+	}
+
+	public int SetAsISupports(int /*long*/ aValue) {
+		return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 23, getAddress(), aValue);
+	}
+
+	public int SetAsInterface(nsID iid, int /*long*/ iface) {
+		return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 24, getAddress(), iid, iface);
+	}
+
+	public int SetAsArray(short type, int /*long*/ iid, int count, int /*long*/ ptr) {
+		return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 25, getAddress(), type, iid, count, ptr);
+	}
+
+	public int SetAsStringWithSize(int size, byte[] str) {
+		return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 26, getAddress(), size, str);
+	}
+
+	public int SetAsWStringWithSize(int size, char[] str) {
+		return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 27, getAddress(), size, str);
+	}
+
+	public int SetAsVoid() {
+		return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 28, getAddress());
+	}
+
+	public int SetAsEmpty() {
+		return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 29, getAddress());
+	}
+
+	public int SetAsEmptyArray() {
+		return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 30, getAddress());
+	}
+
+	public int SetFromVariant(int /*long*/ aValue) {
+		return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 31, getAddress(), aValue);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIX509Cert.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIX509Cert.java
new file mode 100644
index 0000000..fd7d313
--- /dev/null
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIX509Cert.java
@@ -0,0 +1,203 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2009 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIX509Cert extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 27;
+
+	public static final String NS_IX509CERT_IID_STR =
+		"f0980f60-ee3d-11d4-998b-00b0d02354a0";
+
+	public static final nsID NS_IX509CERT_IID =
+		new nsID(NS_IX509CERT_IID_STR);
+
+	public  nsIX509Cert(int /*long*/ address) {
+		super(address);
+	}
+
+	public int GetNickname(int /*long*/ aNickname) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aNickname);
+	}
+
+	public int GetEmailAddress(int /*long*/ aEmailAddress) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aEmailAddress);
+	}
+
+	public int GetEmailAddresses(int[] length, int /*long*/[] addresses) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), length, addresses);
+	}
+
+	public int ContainsEmailAddress(int /*long*/ aEmailAddress, int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aEmailAddress, _retval);
+	}
+
+	public int GetSubjectName(int /*long*/ aSubjectName) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aSubjectName);
+	}
+
+	public int GetCommonName(int /*long*/ aCommonName) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aCommonName);
+	}
+
+	public int GetOrganization(int /*long*/ aOrganization) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aOrganization);
+	}
+
+	public int GetOrganizationalUnit(int /*long*/ aOrganizationalUnit) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aOrganizationalUnit);
+	}
+
+	public int GetSha1Fingerprint(int /*long*/ aSha1Fingerprint) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aSha1Fingerprint);
+	}
+
+	public int GetMd5Fingerprint(int /*long*/ aMd5Fingerprint) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aMd5Fingerprint);
+	}
+
+	public int GetTokenName(int /*long*/ aTokenName) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aTokenName);
+	}
+
+	public int GetIssuerName(int /*long*/ aIssuerName) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aIssuerName);
+	}
+
+	public int GetSerialNumber(int /*long*/ aSerialNumber) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aSerialNumber);
+	}
+
+	public int GetIssuerCommonName(int /*long*/ aIssuerCommonName) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aIssuerCommonName);
+	}
+
+	public int GetIssuerOrganization(int /*long*/ aIssuerOrganization) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aIssuerOrganization);
+	}
+
+	public int GetIssuerOrganizationUnit(int /*long*/ aIssuerOrganizationUnit) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aIssuerOrganizationUnit);
+	}
+
+	public int GetIssuer(int /*long*/[] aIssuer) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aIssuer);
+	}
+
+	public int GetValidity(int /*long*/[] aValidity) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aValidity);
+	}
+
+	public int GetDbKey(int /*long*/[] aDbKey) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), aDbKey);
+	}
+
+	public int GetWindowTitle(int /*long*/[] aWindowTitle) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), aWindowTitle);
+	}
+
+	public static final int UNKNOWN_CERT = 0;
+
+	public static final int CA_CERT = 1;
+
+	public static final int USER_CERT = 2;
+
+	public static final int EMAIL_CERT = 4;
+
+	public static final int SERVER_CERT = 8;
+
+	public static final int VERIFIED_OK = 0;
+
+	public static final int NOT_VERIFIED_UNKNOWN = 1;
+
+	public static final int CERT_REVOKED = 2;
+
+	public static final int CERT_EXPIRED = 4;
+
+	public static final int CERT_NOT_TRUSTED = 8;
+
+	public static final int ISSUER_NOT_TRUSTED = 16;
+
+	public static final int ISSUER_UNKNOWN = 32;
+
+	public static final int INVALID_CA = 64;
+
+	public static final int USAGE_NOT_ALLOWED = 128;
+
+	public static final int CERT_USAGE_SSLClient = 0;
+
+	public static final int CERT_USAGE_SSLServer = 1;
+
+	public static final int CERT_USAGE_SSLServerWithStepUp = 2;
+
+	public static final int CERT_USAGE_SSLCA = 3;
+
+	public static final int CERT_USAGE_EmailSigner = 4;
+
+	public static final int CERT_USAGE_EmailRecipient = 5;
+
+	public static final int CERT_USAGE_ObjectSigner = 6;
+
+	public static final int CERT_USAGE_UserCertImport = 7;
+
+	public static final int CERT_USAGE_VerifyCA = 8;
+
+	public static final int CERT_USAGE_ProtectedObjectSigner = 9;
+
+	public static final int CERT_USAGE_StatusResponder = 10;
+
+	public static final int CERT_USAGE_AnyCA = 11;
+
+	public int GetChain(int /*long*/[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), _retval);
+	}
+
+	public int GetUsagesArray(int ignoreOcsp, int[] verified, int[] count, int /*long*/[] usages) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), ignoreOcsp, verified, count, usages);
+	}
+
+	public int GetUsagesString(int ignoreOcsp, int[] verified, int /*long*/ usages) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), ignoreOcsp, verified, usages);
+	}
+
+	public int VerifyForUsage(int usage, int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), usage, _retval);
+	}
+
+	public int GetASN1Structure(int /*long*/[] aASN1Structure) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), aASN1Structure);
+	}
+
+	public int GetRawDER(int[] length, int /*long*/[] data) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), length, data);
+	}
+
+	public int Equals(int /*long*/ other, int[] _retval) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 27, getAddress(), other, _retval);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIX509CertValidity.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIX509CertValidity.java
new file mode 100644
index 0000000..faa024e
--- /dev/null
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIX509CertValidity.java
@@ -0,0 +1,75 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2009 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIX509CertValidity extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 8;
+
+	public static final String NS_IX509CERTVALIDITY_IID_STR =
+		"e701dfd8-1dd1-11b2-a172-ffa6cc6156ad";
+
+	public static final nsID NS_IX509CERTVALIDITY_IID =
+		new nsID(NS_IX509CERTVALIDITY_IID_STR);
+
+	public  nsIX509CertValidity(int /*long*/ address) {
+		super(address);
+	}
+
+	public int GetNotBefore(int /*long*/ aNotBefore) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aNotBefore);
+	}
+
+	public int GetNotBeforeLocalTime(int /*long*/ aNotBeforeLocalTime) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aNotBeforeLocalTime);
+	}
+
+	public int GetNotBeforeLocalDay(int /*long*/ aNotBeforeLocalDay) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aNotBeforeLocalDay);
+	}
+
+	public int GetNotBeforeGMT(int /*long*/ aNotBeforeGMT) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aNotBeforeGMT);
+	}
+
+	public int GetNotAfter(int /*long*/ aNotAfter) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aNotAfter);
+	}
+
+	public int GetNotAfterLocalTime(int /*long*/ aNotAfterLocalTime) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aNotAfterLocalTime);
+	}
+
+	public int GetNotAfterLocalDay(int /*long*/ aNotAfterLocalDay) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aNotAfterLocalDay);
+	}
+
+	public int GetNotAfterGMT(int /*long*/ aNotAfterGMT) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aNotAfterGMT);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java
new file mode 100644
index 0000000..55eab38
--- /dev/null
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java
@@ -0,0 +1,79 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation.  All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * -  Binding to permit interfacing between Mozilla and SWT
+ * -  Copyright (C) 2003, 2009 IBM Corp.  All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIXPCSecurityManager extends nsISupports {
+
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 4;
+
+	public static final String NS_IXPCSECURITYMANAGER_IID_STR =
+		"31431440-f1ce-11d2-985a-006008962422";
+
+	public static final nsID NS_IXPCSECURITYMANAGER_IID =
+		new nsID(NS_IXPCSECURITYMANAGER_IID_STR);
+
+	public nsIXPCSecurityManager(int /*long*/ address) {
+		super(address);
+	}
+
+	public static final int HOOK_CREATE_WRAPPER = 1;
+
+	public static final int HOOK_CREATE_INSTANCE = 2;
+
+	public static final int HOOK_GET_SERVICE = 4;
+
+	public static final int HOOK_CALL_METHOD = 8;
+
+	public static final int HOOK_GET_PROPERTY = 16;
+
+	public static final int HOOK_SET_PROPERTY = 32;
+
+	public static final int HOOK_ALL = 63;
+
+	public int CanCreateWrapper(int /*long*/ aJSContext, nsID aIID, int /*long*/ aObj, int /*long*/ aClassInfo, int /*long*/[] aPolicy) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aJSContext, aIID, aObj, aClassInfo, aPolicy);
+	}
+
+	public int CanCreateInstance(int /*long*/ aJSContext, nsID aCID) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aJSContext, aCID);
+	}
+
+	public int CanGetService(int /*long*/ aJSContext, nsID aCID) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aJSContext, aCID);
+	}
+
+	public static final int ACCESS_CALL_METHOD = 0;
+
+	public static final int ACCESS_GET_PROPERTY = 1;
+
+	public static final int ACCESS_SET_PROPERTY = 2;
+
+	public int CanAccess(int aAction, int /*long*/ aCallContext, int /*long*/ aJSContext, int /*long*/ aJSObject, int /*long*/ aObj, int /*long*/ aClassInfo, int /*long*/ aName, int /*long*/[] aPolicy) {
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aAction, aCallContext, aJSContext, aJSObject, aObj, aClassInfo, aName, aPolicy);
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/MozillaDelegate.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/MozillaDelegate.java
index 60e0df7..bea7ef8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/MozillaDelegate.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/MozillaDelegate.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
+ * Copyright (c) 2003, 2009 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
@@ -14,6 +14,7 @@
 import org.eclipse.swt.browser.Browser;
 import org.eclipse.swt.internal.*;
 import org.eclipse.swt.internal.gtk.*;
+import org.eclipse.swt.internal.mozilla.*;
 import org.eclipse.swt.widgets.*;
 
 class MozillaDelegate {
@@ -69,6 +70,13 @@
 	return Converter.wcsToMbcs (codePage, string, terminate);
 }
 
+void addWindowSubclass () {
+}
+
+int createBaseWindow (nsIBaseWindow baseWindow) {
+	return baseWindow.Create ();
+}
+
 int /*long*/ getHandle () {
 	/*
 	* Bug in Mozilla Linux GTK.  Embedding Mozilla into a GtkFixed
@@ -86,6 +94,10 @@
 	return embedHandle;
 }
 
+String getJSLibraryName () {
+	return "libmozjs.so"; //$NON-NLS-1$
+}
+
 String getLibraryName () {
 	return "libxpcom.so"; //$NON-NLS-1$
 }
@@ -195,6 +207,9 @@
 	browser = null;
 }
 
+void removeWindowSubclass () {
+}
+
 void setSize (int /*long*/ embedHandle, int width, int height) {
 	OS.gtk_widget_set_size_request (embedHandle, width, height);
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/common_j2me/org/eclipse/swt/internal/Library.java b/bundles/org.eclipse.swt/Eclipse SWT PI/common_j2me/org/eclipse/swt/internal/Library.java
index c458b89..4bd4193 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/common_j2me/org/eclipse/swt/internal/Library.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/common_j2me/org/eclipse/swt/internal/Library.java
@@ -22,7 +22,7 @@
 	/**
 	 * SWT Minor version number (must be in the range 0..999)
 	 */
-    static int MINOR_VERSION = 452;
+    static int MINOR_VERSION = 453;
 	
 	/**
 	 * SWT revision number (must be >= 0)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/common_j2se/org/eclipse/swt/internal/Library.java b/bundles/org.eclipse.swt/Eclipse SWT PI/common_j2se/org/eclipse/swt/internal/Library.java
index 4272ee4..9d5d518 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/common_j2se/org/eclipse/swt/internal/Library.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/common_j2se/org/eclipse/swt/internal/Library.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 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
@@ -24,7 +24,7 @@
 	/**
 	 * SWT Minor version number (must be in the range 0..999)
 	 */
-    static int MINOR_VERSION = 452;
+    static int MINOR_VERSION = 453;
 	
 	/**
 	 * SWT revision number (must be >= 0)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak
index 54384cf..c1bc1a1 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak
@@ -1,5 +1,5 @@
 #*******************************************************************************
-# Copyright (c) 2000, 2007 IBM Corporation and others.
+# Copyright (c) 2000, 2009 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
@@ -78,8 +78,17 @@
 	-I$(JAVA_HOME)/include/linux \
 	${SWT_PTR_CFLAGS}
 MOZILLALIBS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic
-MOZILLAEXCLUDES = -DNO_XPCOMGlueShutdown -DNO_XPCOMGlueStartup
-	
+MOZILLAEXCLUDES = -DNO__1XPCOMGlueShutdown \
+	-DNO__1XPCOMGlueStartup \
+	-DNO__1XPCOMGlueLoadXULFunctions \
+	-DNO_memmove__ILorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2I \
+	-DNO_memmove__JLorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2J \
+	-DNO_nsDynamicFunctionLoad_1sizeof \
+	-DNO__1Call__IIIIII \
+	-DNO__1Call__JJJJJI \
+	-DNO_nsDynamicFunctionLoad
+XULRUNNEREXCLUDES = -DNO__1NS_1InitXPCOM2
+
 SWT_OBJECTS = swt.o c.o c_stats.o callback.o
 CDE_OBJECTS = swt.o cde.o cde_structs.o cde_stats.o
 AWT_OBJECTS = swt_awt.o
@@ -213,13 +222,13 @@
 	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom.cpp
 
 xpcom_structs.o: xpcom_structs.cpp
-	$(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom_structs.cpp
+	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_structs.cpp
 	
 xpcom_custom.o: xpcom_custom.cpp
-	$(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom_custom.cpp
+	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_custom.cpp
 
 xpcom_stats.o: xpcom_stats.cpp
-	$(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom_stats.cpp
+	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_stats.cpp
 
 #
 # XULRunner lib
@@ -230,16 +239,16 @@
 	$(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS}
 
 xpcomxul.o: xpcom.cpp
-	$(CXX) -o xpcomxul.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom.cpp
+	$(CXX) -o xpcomxul.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom.cpp
 
 xpcomxul_structs.o: xpcom_structs.cpp
-	$(CXX) -o xpcomxul_structs.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom_structs.cpp
+	$(CXX) -o xpcomxul_structs.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_structs.cpp
 	
 xpcomxul_custom.o: xpcom_custom.cpp
-	$(CXX) -o xpcomxul_custom.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom_custom.cpp
+	$(CXX) -o xpcomxul_custom.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_custom.cpp
 
 xpcomxul_stats.o: xpcom_stats.cpp
-	$(CXX) -o xpcomxul_stats.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom_stats.cpp
+	$(CXX) -o xpcomxul_stats.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_stats.cpp
 
 #
 # XPCOMInit lib
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/library/make_common.mak b/bundles/org.eclipse.swt/Eclipse SWT/common/library/make_common.mak
index 7e128bd..9f6dccd 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/library/make_common.mak
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/library/make_common.mak
@@ -1,5 +1,5 @@
 #*******************************************************************************
-# Copyright (c) 2000, 2008 IBM Corporation and others.
+# Copyright (c) 2000, 2009 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
@@ -10,5 +10,5 @@
 #*******************************************************************************
 
 maj_ver=3
-min_ver=452
-comma_ver=3,4,5,2
+min_ver=453
+comma_ver=3,4,5,3
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/version.txt b/bundles/org.eclipse.swt/Eclipse SWT/common/version.txt
index 1198fb6..104d1ff 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/version.txt
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/version.txt
@@ -1 +1 @@
-version 3.452
\ No newline at end of file
+version 3.453
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common_j2se/org/eclipse/swt/internal/SWTMessages.properties b/bundles/org.eclipse.swt/Eclipse SWT/common_j2se/org/eclipse/swt/internal/SWTMessages.properties
index 6f5b8da..2fab195 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/common_j2se/org/eclipse/swt/internal/SWTMessages.properties
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common_j2se/org/eclipse/swt/internal/SWTMessages.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2008 IBM Corporation and others.
+# Copyright (c) 2000, 2009 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
@@ -73,3 +73,10 @@
 SWT_Download_Status=Download: {0,number,integer} KB of {1,number,integer} KB
 SWT_Authentication_Required=Authentication Required
 SWT_Enter_Username_and_Password=Enter user name and password for {0} at {1}
+SWT_Page_Load_Failed=Page load failed with error: {0}
+SWT_InvalidCert_Title=Invalid Certificate
+SWT_InvalidCert_Message=The security certificate presented by "{0}" has the following problem(s):
+SWT_InvalidCert_InvalidName=Certificate name is invalid or does not match site name.  Certificate issued to: "{0}". 
+SWT_InvalidCert_NotValid=Certificate is not currently valid.  Valid date range: "{0}".  
+SWT_InvalidCert_NotTrusted=Certificate is not from a trusted certifying authority.  Certificate issuer: "{0}".
+SWT_InvalidCert_Connect=Would you like to connect to this site anyways?