209428

51 files changed, 6273 insertions, 5014 deletions

diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties
index 0529830fb9..6330601471 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
@@ -94,18 +94,51 @@ XPCOM_VtblCall__IIIIIIII_5=
 XPCOM_VtblCall__IIIIIIII_6=
 XPCOM_VtblCall__IIIIIIII_7=
 
-XPCOM_VtblCall__IIIIIIII_3C_3Z_3I=
-XPCOM_VtblCall__IIIIIIII_3C_3Z_3I_0=
-XPCOM_VtblCall__IIIIIIII_3C_3Z_3I_1=
-XPCOM_VtblCall__IIIIIIII_3C_3Z_3I_2=
-XPCOM_VtblCall__IIIIIIII_3C_3Z_3I_3=
-XPCOM_VtblCall__IIIIIIII_3C_3Z_3I_4=
-XPCOM_VtblCall__IIIIIIII_3C_3Z_3I_5=
-XPCOM_VtblCall__IIIIIIII_3C_3Z_3I_6=
-XPCOM_VtblCall__IIIIIIII_3C_3Z_3I_7=
-XPCOM_VtblCall__IIIIIIII_3C_3Z_3I_8=
-XPCOM_VtblCall__IIIIIIII_3C_3Z_3I_9=
-XPCOM_VtblCall__IIIIIIII_3C_3Z_3I_10=
+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_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_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_VtblCall__IIIIIIJII=
 XPCOM_VtblCall__IIIIIIJII_0=
@@ -118,76 +151,59 @@ 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_3C_3Z_3Z=
-XPCOM_VtblCall__IIIIII_3C_3Z_3Z_0=
-XPCOM_VtblCall__IIIIII_3C_3Z_3Z_1=
-XPCOM_VtblCall__IIIIII_3C_3Z_3Z_2=
-XPCOM_VtblCall__IIIIII_3C_3Z_3Z_3=
-XPCOM_VtblCall__IIIIII_3C_3Z_3Z_4=
-XPCOM_VtblCall__IIIIII_3C_3Z_3Z_5=
-XPCOM_VtblCall__IIIIII_3C_3Z_3Z_6=
-XPCOM_VtblCall__IIIIII_3C_3Z_3Z_7=
-XPCOM_VtblCall__IIIIII_3C_3Z_3Z_8=
-
-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__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_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_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_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_VtblCall__IIIII_3C=
 XPCOM_VtblCall__IIIII_3C_0=
@@ -215,21 +231,6 @@ 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=
@@ -254,6 +255,16 @@ XPCOM_VtblCall__IIII_3CIJI_5=
 XPCOM_VtblCall__IIII_3CIJI_6=
 XPCOM_VtblCall__IIII_3CIJI_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_VtblCall__IIII_3I=
 XPCOM_VtblCall__IIII_3I_0=
 XPCOM_VtblCall__IIII_3I_1=
@@ -288,74 +299,19 @@ 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=
+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_VtblCall__III_3BI_3I=
 XPCOM_VtblCall__III_3BI_3I_0=
 XPCOM_VtblCall__III_3BI_3I_1=
@@ -364,13 +320,6 @@ 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=
@@ -388,12 +337,12 @@ 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_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_VtblCall__III_3C=
 XPCOM_VtblCall__III_3C_0=
@@ -415,49 +364,49 @@ 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_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_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_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_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_VtblCall__III_3C_3C_3I=
 XPCOM_VtblCall__III_3C_3C_3I_0=
@@ -467,36 +416,28 @@ 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_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_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_VtblCall__III_3I=
 XPCOM_VtblCall__III_3I_0=
@@ -513,12 +454,6 @@ 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=
@@ -530,6 +465,56 @@ XPCOM_VtblCall__IIJI_1=
 XPCOM_VtblCall__IIJI_2=
 XPCOM_VtblCall__IIJI_3=
 
+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_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_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_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_VtblCall__IIJJ=
 XPCOM_VtblCall__IIJJ_0=
 XPCOM_VtblCall__IIJJ_1=
@@ -543,6 +528,112 @@ XPCOM_VtblCall__IIJJI_2=
 XPCOM_VtblCall__IIJJI_3=
 XPCOM_VtblCall__IIJJI_4=
 
+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_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_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_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_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_VtblCall__IIJJJ=
+XPCOM_VtblCall__IIJJJ_0=
+XPCOM_VtblCall__IIJJJ_1=
+XPCOM_VtblCall__IIJJJ_2=
+XPCOM_VtblCall__IIJJJ_3=
+XPCOM_VtblCall__IIJJJ_4=
+
+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_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_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_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_VtblCall__IIJJJJJ=
 XPCOM_VtblCall__IIJJJJJ_0=
 XPCOM_VtblCall__IIJJJJJ_1=
@@ -552,12 +643,53 @@ 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__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_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_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_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_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_VtblCall__IIJJ_3I=
 XPCOM_VtblCall__IIJJ_3I_0=
@@ -566,6 +698,166 @@ XPCOM_VtblCall__IIJJ_3I_2=
 XPCOM_VtblCall__IIJJ_3I_3=
 XPCOM_VtblCall__IIJJ_3I_4=
 
+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_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_VtblCall__IIJ_3B=
+XPCOM_VtblCall__IIJ_3B_0=
+XPCOM_VtblCall__IIJ_3B_1=
+XPCOM_VtblCall__IIJ_3B_2=
+XPCOM_VtblCall__IIJ_3B_3=
+
+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_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_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_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_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_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_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_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_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_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_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_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_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_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_VtblCall__IIJ_3I=
+XPCOM_VtblCall__IIJ_3I_0=
+XPCOM_VtblCall__IIJ_3I_1=
+XPCOM_VtblCall__IIJ_3I_2=
+XPCOM_VtblCall__IIJ_3I_3=
+
+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_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=
@@ -580,6 +872,20 @@ XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_inte
 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_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_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_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=
@@ -587,12 +893,12 @@ XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_inter
 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_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_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI=
 XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_0=
@@ -612,34 +918,35 @@ 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_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_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_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__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_VtblCall__II_3B=
 XPCOM_VtblCall__II_3B_0=
@@ -652,6 +959,24 @@ XPCOM_VtblCall__II_3BI_1=
 XPCOM_VtblCall__II_3BI_2=
 XPCOM_VtblCall__II_3BI_3=
 
+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_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_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=
@@ -667,12 +992,36 @@ XPCOM_VtblCall__II_3BI_3I_2=
 XPCOM_VtblCall__II_3BI_3I_3=
 XPCOM_VtblCall__II_3BI_3I_4=
 
+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_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_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_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_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=
@@ -680,6 +1029,13 @@ 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_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_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=
@@ -687,29 +1043,12 @@ 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_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_VtblCall__II_3B_3B=
 XPCOM_VtblCall__II_3B_3B_0=
@@ -717,22 +1056,32 @@ 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_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_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_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_VtblCall__II_3B_3B_3I=
 XPCOM_VtblCall__II_3B_3B_3I_0=
@@ -741,6 +1090,13 @@ 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_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_VtblCall__II_3B_3I=
 XPCOM_VtblCall__II_3B_3I_0=
 XPCOM_VtblCall__II_3B_3I_1=
@@ -754,12 +1110,12 @@ 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_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_VtblCall__II_3B_3J=
 XPCOM_VtblCall__II_3B_3J_0=
@@ -767,18 +1123,12 @@ 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_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_VtblCall__II_3C=
 XPCOM_VtblCall__II_3C_0=
@@ -794,6 +1144,15 @@ XPCOM_VtblCall__II_3CIIII_4=
 XPCOM_VtblCall__II_3CIIII_5=
 XPCOM_VtblCall__II_3CIIII_6=
 
+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_VtblCall__II_3CI_3I=
 XPCOM_VtblCall__II_3CI_3I_0=
 XPCOM_VtblCall__II_3CI_3I_1=
@@ -801,11 +1160,12 @@ 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_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_VtblCall__II_3C_3C=
 XPCOM_VtblCall__II_3C_3C_0=
@@ -813,20 +1173,6 @@ 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=
@@ -871,21 +1217,30 @@ XPCOM_VtblCall__II_3I_3J_3I_2=
 XPCOM_VtblCall__II_3I_3J_3I_3=
 XPCOM_VtblCall__II_3I_3J_3I_4=
 
+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_VtblCall__II_3J=
 XPCOM_VtblCall__II_3J_0=
 XPCOM_VtblCall__II_3J_1=
 XPCOM_VtblCall__II_3J_2=
 
+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_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=
diff --git a/bundles/org.eclipse.swt.tools/Mozilla Generation/org/eclipse/swt/tools/internal/MozillaGenerator.java b/bundles/org.eclipse.swt.tools/Mozilla Generation/org/eclipse/swt/tools/internal/MozillaGenerator.java
index 9ad8c16bae..6269e01908 100644
--- a/bundles/org.eclipse.swt.tools/Mozilla Generation/org/eclipse/swt/tools/internal/MozillaGenerator.java
+++ b/bundles/org.eclipse.swt.tools/Mozilla Generation/org/eclipse/swt/tools/internal/MozillaGenerator.java
@@ -83,17 +83,17 @@ public class MozillaGenerator {
 
 	static String GECKO = "/bluebird/teamswt/swt-builddir/mozilla/1.4/linux_gtk2/mozilla/dist/include/";
 	static String TARGET_FOLDER = "/bluebird/teamswt/chrisx/amd64/workspace/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/";
-	static String[] XPCOM_HEADERS = { 
+	static String[] XPCOM_HEADERS = {
 		"profile/nsIProfile.h",
 		"widget/nsIAppShell.h",
-		"widget/nsIBaseWindow.h", 
+		"widget/nsIBaseWindow.h",
 		"xpcom/nsIComponentManager.h",
 		"xpcom/nsIComponentRegistrar.h",
 		"webbrwsr/nsIContextMenuListener.h", 
 		"docshell/nsIDocShell.h",
-		"dom/nsIDOMEvent.h", 
+		"dom/nsIDOMEvent.h",
 		"dom/nsIDOMMouseEvent.h",
-		"dom/nsIDOMUIEvent.h", 
+		"dom/nsIDOMUIEvent.h",
 		"dom/nsIDOMWindow.h",
 		"uriloader/nsIDownload.h", 
 		"webbrwsr/nsIEmbeddingSiteWindow.h",
@@ -673,7 +673,7 @@ public class MozillaGenerator {
 		+ " *\r\n" 
 		+ " * IBM\r\n"
 		+ " * -  Binding to permit interfacing between Mozilla and SWT\r\n"
-		+ " * -  Copyright (C) 2008 IBM Corp.  All Rights Reserved.\r\n"
+		+ " * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.\r\n"
 		+ " *\r\n" + " * ***** END LICENSE BLOCK ***** */";
 
 	static String PACKAGE_DECLARATION = "package org.eclipse.swt.internal.mozilla;";
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 53cd93f51a..9724cf1cc7 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
@@ -203,25 +203,51 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIIII)
 }
 #endif
 
-#ifndef NO_VtblCall__IIIIIIII_3C_3Z_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIIII_3C_3Z_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jcharArray arg8, jbooleanArray arg9, jintArray arg10);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIIII_3C_3Z_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jcharArray arg8, jbooleanArray arg9, jintArray arg10)
+#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)
+	(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);
+	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);
+	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)
+	(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);
+	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);
+	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)
+	(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;
-	jboolean *lparg9=NULL;
+	jint *lparg9=NULL;
 	jint *lparg10=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIIIII_3C_3Z_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIIIII_3C_3I_3I_FUNC);
 	if (arg8) if ((lparg8 = env->GetCharArrayElements(arg8, NULL)) == NULL) goto fail;
-	if (arg9) if ((lparg9 = env->GetBooleanArrayElements(arg9, 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;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint, jint, jint, jchar *, jboolean *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, lparg8, lparg9, lparg10);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint, jint, jint, jchar *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, lparg8, lparg9, lparg10);
 fail:
 	if (arg10 && lparg10) env->ReleaseIntArrayElements(arg10, lparg10, 0);
-	if (arg9 && lparg9) env->ReleaseBooleanArrayElements(arg9, lparg9, 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_3Z_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIIIII_3C_3I_3I_FUNC);
 	return rc;
 }
 #endif
@@ -239,120 +265,94 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIIJII)
 }
 #endif
 
-#ifndef NO_VtblCall__IIIIIIZ
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIIZ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jboolean arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIIZ)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jboolean arg6)
+#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)
+	(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__IIIIIIZ_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint, jboolean))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIIIZ_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__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;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint, jchar *, jint, jint, jint, jint, jint, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, arg7, arg8, arg9, arg10, arg11, lparg12, lparg13);
+fail:
+	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);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIIII_3C_3BIIIIZ_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIII_3C_3BIIIIZ_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, jboolean arg12, jintArray arg13, jintArray arg14);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIII_3C_3BIIIIZ_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, jboolean arg12, jintArray arg13, jintArray arg14)
+#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)
+	(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;
 	jbyte *lparg7=NULL;
 	jint *lparg13=NULL;
 	jint *lparg14=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIII_3C_3BIIIIZ_3I_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__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;
 	if (arg14) if ((lparg14 = env->GetIntArrayElements(arg14, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint, jchar *, jbyte *, jint, jint, jint, jint, jboolean, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, lparg7, arg8, arg9, arg10, arg11, arg12, lparg13, lparg14);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint, jchar *, jbyte *, jint, jint, jint, jint, jint, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, lparg7, arg8, arg9, arg10, arg11, arg12, lparg13, lparg14);
 fail:
 	if (arg14 && lparg14) env->ReleaseIntArrayElements(arg14, lparg14, 0);
 	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_3BIIIIZ_3I_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIII_3C_3BIIIII_3I_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIIII_3C_3Z_3Z
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIII_3C_3Z_3Z)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jbooleanArray arg7, jbooleanArray arg8);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIII_3C_3Z_3Z)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jbooleanArray arg7, jbooleanArray arg8)
+#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)
+	(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;
-	jboolean *lparg7=NULL;
-	jboolean *lparg8=NULL;
+	jint *lparg7=NULL;
+	jint *lparg8=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIII_3C_3Z_3Z_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIII_3C_3I_3I_FUNC);
 	if (arg6) if ((lparg6 = env->GetCharArrayElements(arg6, NULL)) == NULL) goto fail;
-	if (arg7) if ((lparg7 = env->GetBooleanArrayElements(arg7, NULL)) == NULL) goto fail;
-	if (arg8) if ((lparg8 = env->GetBooleanArrayElements(arg8, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint, jchar *, jboolean *, jboolean *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, lparg7, lparg8);
+	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, jchar *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, lparg7, lparg8);
 fail:
-	if (arg8 && lparg8) env->ReleaseBooleanArrayElements(arg8, lparg8, 0);
-	if (arg7 && lparg7) env->ReleaseBooleanArrayElements(arg7, lparg7, 0);
+	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_3Z_3Z_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIII_3C_3I_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIIII_3Z_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIII_3Z_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jbooleanArray arg6, jintArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIII_3Z_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jbooleanArray arg6, jintArray arg7)
+#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)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jintArray arg6, jintArray arg7)
 {
-	jboolean *lparg6=NULL;
+	jint *lparg6=NULL;
 	jint *lparg7=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIII_3Z_3I_FUNC);
-	if (arg6) if ((lparg6 = env->GetBooleanArrayElements(arg6, NULL)) == NULL) goto fail;
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__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, jboolean *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, lparg7);
+	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->ReleaseBooleanArrayElements(arg6, lparg6, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIII_3Z_3I_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_VtblCall__IIIIIZ
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIZ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jboolean arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIZ)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jboolean arg5)
-{
-	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIIZ_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jboolean))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIIZ_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_VtblCall__IIIIIZ_3CIIIIZ_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIZ_3CIIIIZ_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jboolean arg5, jcharArray arg6, jint arg7, jint arg8, jint arg9, jint arg10, jboolean arg11, jintArray arg12, jintArray arg13);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIZ_3CIIIIZ_3I_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jboolean arg5, jcharArray arg6, jint arg7, jint arg8, jint arg9, jint arg10, jboolean arg11, jintArray arg12, jintArray arg13)
-{
-	jchar *lparg6=NULL;
-	jint *lparg12=NULL;
-	jint *lparg13=NULL;
-	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIIZ_3CIIIIZ_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;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jboolean, jchar *, jint, jint, jint, jint, jboolean, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, arg7, arg8, arg9, arg10, arg11, lparg12, lparg13);
-fail:
-	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__IIIIIZ_3CIIIIZ_3I_3I_FUNC);
+	if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIII_3I_3I_FUNC);
 	return rc;
 }
 #endif
@@ -404,32 +404,6 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIJJJJ)
 }
 #endif
 
-#ifndef NO_VtblCall__IIIIJZ
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIJZ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jlong arg4, jboolean arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIJZ)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jlong arg4, jboolean arg5)
-{
-	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIJZ_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jlong, jboolean))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIJZ_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_VtblCall__IIIIZ
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIZ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jboolean arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIZ)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jboolean arg4)
-{
-	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIZ_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jboolean))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIZ_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)
@@ -481,6 +455,23 @@ fail:
 }
 #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)
+	(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);
+	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);
+	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)
@@ -565,88 +556,6 @@ fail:
 }
 #endif
 
-#ifndef NO_VtblCall__IIIZ
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIZ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jboolean arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIZ)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jboolean arg3)
-{
-	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIZ_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jboolean))(*(jint **)arg1)[arg0])(arg1, arg2, arg3);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIZ_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_VtblCall__IIIZZ
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIZZ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jboolean arg3, jboolean arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIZZ)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jboolean arg3, jboolean arg4)
-{
-	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIZZ_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jboolean, jboolean))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIZZ_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_VtblCall__IIIZZII
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIZZII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jboolean arg3, jboolean arg4, jint arg5, jint arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIZZII)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jboolean arg3, jboolean arg4, jint arg5, jint arg6)
-{
-	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIZZII_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jboolean, jboolean, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIZZII_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_VtblCall__IIIZZIIIIIIZZZZSI
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIZZIIIIIIZZZZSI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jboolean arg3, jboolean arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jboolean arg11, jboolean arg12, jboolean arg13, jboolean arg14, jshort arg15, jint arg16);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIZZIIIIIIZZZZSI)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jboolean arg3, jboolean arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jboolean arg11, jboolean arg12, jboolean arg13, jboolean arg14, jshort arg15, jint arg16)
-{
-	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIZZIIIIIIZZZZSI_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jboolean, jboolean, jint, jint, jint, jint, jint, jint, jboolean, jboolean, jboolean, jboolean, 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__IIIZZIIIIIIZZZZSI_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_VtblCall__IIIZZIZZZZII
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIZZIZZZZII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jboolean arg3, jboolean arg4, jint arg5, jboolean arg6, jboolean arg7, jboolean arg8, jboolean arg9, jint arg10, jint arg11);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIZZIZZZZII)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jboolean arg3, jboolean arg4, jint arg5, jboolean arg6, jboolean arg7, jboolean arg8, jboolean arg9, jint arg10, jint arg11)
-{
-	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIZZIZZZZII_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jboolean, jboolean, jint, jboolean, jboolean, jboolean, jboolean, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIZZIZZZZII_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_VtblCall__IIIZ_3Z
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIZ_3Z)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jboolean arg3, jbooleanArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIZ_3Z)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jboolean arg3, jbooleanArray arg4)
-{
-	jboolean *lparg4=NULL;
-	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIZ_3Z_FUNC);
-	if (arg4) if ((lparg4 = env->GetBooleanArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jboolean, jboolean *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
-fail:
-	if (arg4 && lparg4) env->ReleaseBooleanArrayElements(arg4, lparg4, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIZ_3Z_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)
@@ -664,39 +573,39 @@ fail:
 }
 #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)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jint arg4, jintArray arg5)
+#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)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jint arg4)
 {
 	jbyte *lparg3=NULL;
-	jint *lparg5=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3BI_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3BI_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);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jbyte *, jint))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, arg4);
 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, VtblCall__III_3BI_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__III_3BZ
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3BZ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jboolean arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3BZ)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jboolean arg4)
+#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)
+	(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_3BZ_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3BI_3I_FUNC);
 	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jbyte *, jboolean))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, arg4);
+	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_3BZ_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3BI_3I_FUNC);
 	return rc;
 }
 #endif
@@ -747,22 +656,22 @@ fail:
 }
 #endif
 
-#ifndef NO_VtblCall__III_3B_3Z
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3B_3Z)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jbooleanArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3B_3Z)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jbooleanArray arg4)
+#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)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jintArray arg4)
 {
 	jbyte *lparg3=NULL;
-	jboolean *lparg4=NULL;
+	jint *lparg4=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3B_3Z_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3B_3I_FUNC);
 	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = env->GetBooleanArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jbyte *, jboolean *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
+	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->ReleaseBooleanArrayElements(arg4, lparg4, 0);
+	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3B_3Z_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3B_3I_FUNC);
 	return rc;
 }
 #endif
@@ -821,10 +730,10 @@ fail:
 }
 #endif
 
-#ifndef NO_VtblCall__III_3C_3CI_3C_3C_3C_3C_3Z_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3CI_3C_3C_3C_3C_3Z_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, jbooleanArray arg10, jintArray arg11);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3CI_3C_3C_3C_3C_3Z_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, jbooleanArray arg10, jintArray arg11)
+#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)
+	(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;
 	jchar *lparg4=NULL;
@@ -832,113 +741,113 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3CI_3C_3C_3C_3C_3Z_3I)
 	jchar *lparg7=NULL;
 	jchar *lparg8=NULL;
 	jchar *lparg9=NULL;
-	jboolean *lparg10=NULL;
+	jint *lparg10=NULL;
 	jint *lparg11=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3C_3CI_3C_3C_3C_3C_3Z_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__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;
 	if (arg7) if ((lparg7 = env->GetCharArrayElements(arg7, NULL)) == NULL) goto fail;
 	if (arg8) if ((lparg8 = env->GetCharArrayElements(arg8, NULL)) == NULL) goto fail;
 	if (arg9) if ((lparg9 = env->GetCharArrayElements(arg9, NULL)) == NULL) goto fail;
-	if (arg10) if ((lparg10 = env->GetBooleanArrayElements(arg10, NULL)) == NULL) goto fail;
+	if (arg10) if ((lparg10 = env->GetIntArrayElements(arg10, NULL)) == NULL) goto fail;
 	if (arg11) if ((lparg11 = env->GetIntArrayElements(arg11, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jchar *, jchar *, jint, jchar *, jchar *, jchar *, jchar *, jboolean *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, arg5, lparg6, lparg7, lparg8, lparg9, lparg10, lparg11);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jchar *, jchar *, jint, jchar *, jchar *, jchar *, jchar *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, arg5, lparg6, lparg7, lparg8, lparg9, lparg10, lparg11);
 fail:
 	if (arg11 && lparg11) env->ReleaseIntArrayElements(arg11, lparg11, 0);
-	if (arg10 && lparg10) env->ReleaseBooleanArrayElements(arg10, lparg10, 0);
+	if (arg10 && lparg10) env->ReleaseIntArrayElements(arg10, lparg10, 0);
 	if (arg9 && lparg9) env->ReleaseCharArrayElements(arg9, lparg9, 0);
 	if (arg8 && lparg8) env->ReleaseCharArrayElements(arg8, lparg8, 0);
 	if (arg7 && lparg7) env->ReleaseCharArrayElements(arg7, lparg7, 0);
 	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_3Z_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__III_3C_3CI_3I_3I_3Z
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3CI_3I_3I_3Z)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jint arg5, jintArray arg6, jintArray arg7, jbooleanArray arg8);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3CI_3I_3I_3Z)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jint arg5, jintArray arg6, jintArray arg7, jbooleanArray arg8)
+#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)
+	(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;
 	jchar *lparg4=NULL;
 	jint *lparg6=NULL;
 	jint *lparg7=NULL;
-	jboolean *lparg8=NULL;
+	jint *lparg8=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3C_3CI_3I_3I_3Z_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__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;
 	if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
-	if (arg8) if ((lparg8 = env->GetBooleanArrayElements(arg8, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jchar *, jchar *, jint, jint *, jint *, jboolean *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, arg5, lparg6, lparg7, lparg8);
+	if (arg8) if ((lparg8 = env->GetIntArrayElements(arg8, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jchar *, jchar *, jint, jint *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, arg5, lparg6, lparg7, lparg8);
 fail:
-	if (arg8 && lparg8) env->ReleaseBooleanArrayElements(arg8, lparg8, 0);
+	if (arg8 && lparg8) env->ReleaseIntArrayElements(arg8, lparg8, 0);
 	if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
 	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_3Z_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3C_3CI_3I_3I_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__III_3C_3C_3C_3Z
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3C_3Z)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jbooleanArray arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3C_3Z)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jbooleanArray arg6)
+#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)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6)
 {
 	jchar *lparg3=NULL;
 	jchar *lparg4=NULL;
 	jchar *lparg5=NULL;
-	jboolean *lparg6=NULL;
+	jint *lparg6=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3C_3C_3C_3Z_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__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;
-	if (arg6) if ((lparg6 = env->GetBooleanArrayElements(arg6, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jchar *, jchar *, jchar *, jboolean *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6);
+	if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jchar *, jchar *, jchar *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6);
 fail:
-	if (arg6 && lparg6) env->ReleaseBooleanArrayElements(arg6, lparg6, 0);
+	if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
 	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_3Z_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3C_3C_3C_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__III_3C_3C_3C_3Z_3Z
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3C_3Z_3Z)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jbooleanArray arg6, jbooleanArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3C_3Z_3Z)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jbooleanArray arg6, jbooleanArray arg7)
+#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)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6, jintArray arg7)
 {
 	jchar *lparg3=NULL;
 	jchar *lparg4=NULL;
 	jchar *lparg5=NULL;
-	jboolean *lparg6=NULL;
-	jboolean *lparg7=NULL;
+	jint *lparg6=NULL;
+	jint *lparg7=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3C_3C_3C_3Z_3Z_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__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;
-	if (arg6) if ((lparg6 = env->GetBooleanArrayElements(arg6, NULL)) == NULL) goto fail;
-	if (arg7) if ((lparg7 = env->GetBooleanArrayElements(arg7, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jchar *, jchar *, jchar *, jboolean *, jboolean *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6, lparg7);
+	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, jchar *, jchar *, jchar *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6, lparg7);
 fail:
-	if (arg7 && lparg7) env->ReleaseBooleanArrayElements(arg7, lparg7, 0);
-	if (arg6 && lparg6) env->ReleaseBooleanArrayElements(arg6, lparg6, 0);
+	if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
+	if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
 	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_3Z_3Z_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3C_3C_3C_3I_3I_FUNC);
 	return rc;
 }
 #endif
@@ -966,92 +875,69 @@ fail:
 }
 #endif
 
-#ifndef NO_VtblCall__III_3C_3C_3I_3C_3Z_3Z
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3I_3C_3Z_3Z)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5, jcharArray arg6, jbooleanArray arg7, jbooleanArray arg8);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3I_3C_3Z_3Z)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5, jcharArray arg6, jbooleanArray arg7, jbooleanArray arg8)
+#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)
+	(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;
 	jchar *lparg4=NULL;
 	jint *lparg5=NULL;
 	jchar *lparg6=NULL;
-	jboolean *lparg7=NULL;
-	jboolean *lparg8=NULL;
+	jint *lparg7=NULL;
+	jint *lparg8=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3C_3C_3I_3C_3Z_3Z_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__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;
 	if (arg6) if ((lparg6 = env->GetCharArrayElements(arg6, NULL)) == NULL) goto fail;
-	if (arg7) if ((lparg7 = env->GetBooleanArrayElements(arg7, NULL)) == NULL) goto fail;
-	if (arg8) if ((lparg8 = env->GetBooleanArrayElements(arg8, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jchar *, jchar *, jint *, jchar *, jboolean *, jboolean *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6, lparg7, lparg8);
+	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, jchar *, jchar *, jint *, jchar *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6, lparg7, lparg8);
 fail:
-	if (arg8 && lparg8) env->ReleaseBooleanArrayElements(arg8, lparg8, 0);
-	if (arg7 && lparg7) env->ReleaseBooleanArrayElements(arg7, lparg7, 0);
+	if (arg8 && lparg8) env->ReleaseIntArrayElements(arg8, lparg8, 0);
+	if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
 	if (arg6 && lparg6) env->ReleaseCharArrayElements(arg6, lparg6, 0);
 	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_3Z_3Z_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3C_3C_3I_3C_3I_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__III_3C_3C_3I_3I_3C_3Z_3Z
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3I_3I_3C_3Z_3Z)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5, jintArray arg6, jcharArray arg7, jbooleanArray arg8, jbooleanArray arg9);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3I_3I_3C_3Z_3Z)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5, jintArray arg6, jcharArray arg7, jbooleanArray arg8, jbooleanArray arg9)
+#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)
+	(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;
 	jchar *lparg4=NULL;
 	jint *lparg5=NULL;
 	jint *lparg6=NULL;
 	jchar *lparg7=NULL;
-	jboolean *lparg8=NULL;
-	jboolean *lparg9=NULL;
+	jint *lparg8=NULL;
+	jint *lparg9=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3C_3C_3I_3I_3C_3Z_3Z_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__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;
 	if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
 	if (arg7) if ((lparg7 = env->GetCharArrayElements(arg7, NULL)) == NULL) goto fail;
-	if (arg8) if ((lparg8 = env->GetBooleanArrayElements(arg8, NULL)) == NULL) goto fail;
-	if (arg9) if ((lparg9 = env->GetBooleanArrayElements(arg9, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jchar *, jchar *, jint *, jint *, jchar *, jboolean *, jboolean *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6, lparg7, lparg8, lparg9);
+	if (arg8) if ((lparg8 = env->GetIntArrayElements(arg8, NULL)) == NULL) goto fail;
+	if (arg9) if ((lparg9 = env->GetIntArrayElements(arg9, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jchar *, jchar *, jint *, jint *, jchar *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6, lparg7, lparg8, lparg9);
 fail:
-	if (arg9 && lparg9) env->ReleaseBooleanArrayElements(arg9, lparg9, 0);
-	if (arg8 && lparg8) env->ReleaseBooleanArrayElements(arg8, lparg8, 0);
+	if (arg9 && lparg9) env->ReleaseIntArrayElements(arg9, lparg9, 0);
+	if (arg8 && lparg8) env->ReleaseIntArrayElements(arg8, lparg8, 0);
 	if (arg7 && lparg7) env->ReleaseCharArrayElements(arg7, lparg7, 0);
 	if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
 	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_3Z_3Z_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_VtblCall__III_3C_3C_3Z
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3Z)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jbooleanArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3Z)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jbooleanArray arg5)
-{
-	jchar *lparg3=NULL;
-	jchar *lparg4=NULL;
-	jboolean *lparg5=NULL;
-	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3C_3C_3Z_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->GetBooleanArrayElements(arg5, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jchar *, jchar *, jboolean *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5);
-fail:
-	if (arg5 && lparg5) env->ReleaseBooleanArrayElements(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_3Z_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3C_3C_3I_3I_3C_3I_3I_FUNC);
 	return rc;
 }
 #endif
@@ -1099,23 +985,6 @@ fail:
 }
 #endif
 
-#ifndef NO_VtblCall__III_3Z
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3Z)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbooleanArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3Z)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbooleanArray arg3)
-{
-	jboolean *lparg3=NULL;
-	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3Z_FUNC);
-	if (arg3) if ((lparg3 = env->GetBooleanArrayElements(arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jboolean *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3);
-fail:
-	if (arg3 && lparg3) env->ReleaseBooleanArrayElements(arg3, lparg3, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3Z_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)
@@ -1142,6 +1011,69 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJI)
 }
 #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)
+	(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);
+	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);
+	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)
+	(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);
+	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);
+	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)
+	(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);
+	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);
+	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)
+	(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);
+	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);
+	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)
@@ -1168,6 +1100,187 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJI)
 }
 #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)
+	(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);
+	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);
+	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)
+	(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);
+	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);
+	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)
+	(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);
+	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;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jint, jlong, jchar *, 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->ReleaseCharArrayElements(arg6, lparg6, 0);
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__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)
+	(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);
+	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);
+	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)
+	(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);
+	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);
+	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)
+	(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);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jlong))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4);
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__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)
+	(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);
+	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);
+	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)
+	(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);
+	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;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jlong, jint, jchar *, jlong, jlong, jint, jlong, jint, jlong *, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, arg7, arg8, arg9, arg10, arg11, lparg12, lparg13);
+fail:
+	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);
+	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)
+	(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;
+	jbyte *lparg7=NULL;
+	jlong *lparg13=NULL;
+	jlong *lparg14=NULL;
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__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;
+	if (arg14) if ((lparg14 = env->GetLongArrayElements(arg14, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jlong, jint, jchar *, jbyte *, jlong, jlong, jint, jlong, jint, jlong *, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, lparg7, arg8, arg9, arg10, arg11, arg12, lparg13, lparg14);
+fail:
+	if (arg14 && lparg14) env->ReleaseLongArrayElements(arg14, lparg14, 0);
+	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);
+	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)
+	(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);
+	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;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jlong, jlong, jint, jlong, jchar *, jint *, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, lparg8, lparg9, lparg10);
+fail:
+	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);
+	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)
@@ -1181,15 +1294,79 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJJJ)
 }
 #endif
 
-#ifndef NO_VtblCall__IIJJZ
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJZ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jboolean arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJZ)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jboolean arg4)
+#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)
+	(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__IIJJZ_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jboolean))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJZ_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__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);
+	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)
+	(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);
+	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);
+	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)
+	(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);
+	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);
+	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)
+	(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);
+	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);
+	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)
+	(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);
+	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);
 	return rc;
 }
 #endif
@@ -1211,6 +1388,449 @@ fail:
 }
 #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)
+	(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);
+	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);
+	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)
+	(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);
+	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);
+	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)
+	(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);
+	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);
+	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)
+	(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);
+	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);
+	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)
+	(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);
+	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);
+	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)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5, jlong arg6, jlongArray arg7)
+{
+	jbyte *lparg3=NULL;
+	jbyte *lparg4=NULL;
+	jbyte *lparg5=NULL;
+	jlong *lparg7=NULL;
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__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;
+	if (arg7) if ((lparg7 = env->GetLongArrayElements(arg7, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jbyte *, jbyte *, jbyte *, jlong, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, arg6, lparg7);
+fail:
+	if (arg7 && lparg7) env->ReleaseLongArrayElements(arg7, lparg7, 0);
+	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);
+	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)
+	(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);
+	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);
+	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)
+	(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);
+	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);
+	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)
+	(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);
+	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);
+	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)
+	(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;
+	jchar *lparg4=NULL;
+	jchar *lparg6=NULL;
+	jchar *lparg7=NULL;
+	jchar *lparg8=NULL;
+	jchar *lparg9=NULL;
+	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);
+	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;
+	if (arg7) if ((lparg7 = env->GetCharArrayElements(arg7, NULL)) == NULL) goto fail;
+	if (arg8) if ((lparg8 = env->GetCharArrayElements(arg8, NULL)) == NULL) goto fail;
+	if (arg9) if ((lparg9 = env->GetCharArrayElements(arg9, NULL)) == NULL) goto fail;
+	if (arg10) if ((lparg10 = env->GetIntArrayElements(arg10, NULL)) == NULL) goto fail;
+	if (arg11) if ((lparg11 = env->GetIntArrayElements(arg11, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jchar *, jchar *, jint, jchar *, jchar *, jchar *, jchar *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, arg5, lparg6, lparg7, lparg8, lparg9, lparg10, lparg11);
+fail:
+	if (arg11 && lparg11) env->ReleaseIntArrayElements(arg11, lparg11, 0);
+	if (arg10 && lparg10) env->ReleaseIntArrayElements(arg10, lparg10, 0);
+	if (arg9 && lparg9) env->ReleaseCharArrayElements(arg9, lparg9, 0);
+	if (arg8 && lparg8) env->ReleaseCharArrayElements(arg8, lparg8, 0);
+	if (arg7 && lparg7) env->ReleaseCharArrayElements(arg7, lparg7, 0);
+	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);
+	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)
+	(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;
+	jchar *lparg4=NULL;
+	jlong *lparg6=NULL;
+	jint *lparg7=NULL;
+	jint *lparg8=NULL;
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__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;
+	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, jchar *, jchar *, jint, jlong *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, 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->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);
+	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)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6)
+{
+	jchar *lparg3=NULL;
+	jchar *lparg4=NULL;
+	jchar *lparg5=NULL;
+	jint *lparg6=NULL;
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__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;
+	if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jchar *, jchar *, jchar *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6);
+fail:
+	if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
+	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);
+	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)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6, jintArray arg7)
+{
+	jchar *lparg3=NULL;
+	jchar *lparg4=NULL;
+	jchar *lparg5=NULL;
+	jint *lparg6=NULL;
+	jint *lparg7=NULL;
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__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;
+	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, jchar *, jchar *, jchar *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, 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->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);
+	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)
+	(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);
+	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;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jchar *, jchar *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5);
+fail:
+	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);
+	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)
+	(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);
+	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;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jchar *, jchar *, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5);
+fail:
+	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);
+	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)
+	(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;
+	jchar *lparg4=NULL;
+	jlong *lparg5=NULL;
+	jchar *lparg6=NULL;
+	jint *lparg7=NULL;
+	jint *lparg8=NULL;
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__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;
+	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;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jchar *, jchar *, jlong *, jchar *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6, lparg7, lparg8);
+fail:
+	if (arg8 && lparg8) env->ReleaseIntArrayElements(arg8, lparg8, 0);
+	if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
+	if (arg6 && lparg6) env->ReleaseCharArrayElements(arg6, lparg6, 0);
+	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);
+	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)
+	(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;
+	jchar *lparg4=NULL;
+	jlong *lparg5=NULL;
+	jlong *lparg6=NULL;
+	jchar *lparg7=NULL;
+	jint *lparg8=NULL;
+	jint *lparg9=NULL;
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__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;
+	if (arg6) if ((lparg6 = env->GetLongArrayElements(arg6, NULL)) == NULL) goto fail;
+	if (arg7) if ((lparg7 = env->GetCharArrayElements(arg7, NULL)) == NULL) goto fail;
+	if (arg8) if ((lparg8 = env->GetIntArrayElements(arg8, NULL)) == NULL) goto fail;
+	if (arg9) if ((lparg9 = env->GetIntArrayElements(arg9, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jchar *, jchar *, jlong *, jlong *, jchar *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6, lparg7, lparg8, lparg9);
+fail:
+	if (arg9 && lparg9) env->ReleaseIntArrayElements(arg9, lparg9, 0);
+	if (arg8 && lparg8) env->ReleaseIntArrayElements(arg8, lparg8, 0);
+	if (arg7 && lparg7) env->ReleaseCharArrayElements(arg7, lparg7, 0);
+	if (arg6 && lparg6) env->ReleaseLongArrayElements(arg6, lparg6, 0);
+	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);
+	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)
+	(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);
+	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);
+	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)
+	(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);
+	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);
+	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)
@@ -1251,6 +1871,46 @@ fail:
 }
 #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)
+	(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);
+	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);
+	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)
+	(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);
+	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;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, nsID *, jlong, nsID *, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5);
+fail:
+	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);
+	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)
@@ -1274,25 +1934,25 @@ fail:
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3Z
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3Z)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jobject arg3, jbooleanArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3Z)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jobject arg3, jbooleanArray arg4)
+#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)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jobject arg3, jlongArray arg4)
 {
 	nsID _arg2, *lparg2=NULL;
 	nsID _arg3, *lparg3=NULL;
-	jboolean *lparg4=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_3Z_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__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->GetBooleanArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, nsID *, nsID *, jboolean *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
+	if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, nsID *, nsID *, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
 fail:
-	if (arg4 && lparg4) env->ReleaseBooleanArrayElements(arg4, lparg4, 0);
+	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_3Z_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
 	return rc;
 }
 #endif
@@ -1349,85 +2009,94 @@ fail:
 }
 #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)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jintArray arg3)
+#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)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jlong arg5)
 {
 	nsID _arg2, *lparg2=NULL;
-	jint *lparg3=NULL;
+	jbyte *lparg3=NULL;
+	jbyte *lparg4=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__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->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, nsID *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3);
+	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
+	if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, nsID *, jbyte *, jbyte *, jlong))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, arg5);
 fail:
-	if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
+	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_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3Z
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3Z)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jbooleanArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3Z)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jbooleanArray arg3)
+#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)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jlong arg5, jbyteArray arg6, jbyteArray arg7)
 {
 	nsID _arg2, *lparg2=NULL;
-	jboolean *lparg3=NULL;
+	jbyte *lparg3=NULL;
+	jbyte *lparg4=NULL;
+	jbyte *lparg6=NULL;
+	jbyte *lparg7=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3Z_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__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->GetBooleanArrayElements(arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, nsID *, jboolean *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3);
+	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
+	if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
+	if (arg6) if ((lparg6 = env->GetByteArrayElements(arg6, NULL)) == NULL) goto fail;
+	if (arg7) if ((lparg7 = env->GetByteArrayElements(arg7, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, nsID *, jbyte *, jbyte *, jlong, jbyte *, jbyte *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, arg5, lparg6, lparg7);
 fail:
-	if (arg3 && lparg3) env->ReleaseBooleanArrayElements(arg3, lparg3, 0);
+	if (arg7 && lparg7) env->ReleaseByteArrayElements(arg7, lparg7, 0);
+	if (arg6 && lparg6) env->ReleaseByteArrayElements(arg6, lparg6, 0);
+	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_3Z_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_VtblCall__IIZ
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIZ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIZ)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2)
-{
-	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIZ_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jboolean))(*(jint **)arg1)[arg0])(arg1, arg2);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIZ_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIZI
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIZI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2, jint arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIZI)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2, jint arg3)
+#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)
+	(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__IIZI_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jboolean, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIZI_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__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);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIZ_3Z
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIZ_3Z)(JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2, jbooleanArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIZ_3Z)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2, jbooleanArray arg3)
+#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)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jlongArray arg3)
 {
-	jboolean *lparg3=NULL;
+	nsID _arg2, *lparg2=NULL;
+	jlong *lparg3=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIZ_3Z_FUNC);
-	if (arg3) if ((lparg3 = env->GetBooleanArrayElements(arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jboolean, jboolean *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3);
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__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->ReleaseBooleanArrayElements(arg3, lparg3, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIZ_3Z_FUNC);
+	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);
 	return rc;
 }
 #endif
@@ -1466,6 +2135,52 @@ fail:
 }
 #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)
+	(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);
+	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;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jint, jint, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, arg4, lparg5, lparg6);
+fail:
+	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);
+	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)
+	(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);
+	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;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jint, jlong, jlong *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, arg4, lparg5, lparg6);
+fail:
+	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);
+	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)
@@ -1509,6 +2224,52 @@ fail:
 }
 #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)
+	(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);
+	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;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, 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->ReleaseByteArrayElements(arg2, lparg2, 0);
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__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)
+	(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);
+	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;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jint, jlong *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5);
+fail:
+	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);
+	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)
@@ -1526,114 +2287,111 @@ fail:
 }
 #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)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jobject arg3, jint arg4)
+#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)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jlong arg3, jobject arg4, jlongArray arg5)
 {
 	jbyte *lparg2=NULL;
-	nsID _arg3, *lparg3=NULL;
+	nsID _arg4, *lparg4=NULL;
+	jlong *lparg5=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BJLorg_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;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, nsID *, jint))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, arg4);
+	if (arg4) if ((lparg4 = getnsIDFields(env, arg4, &_arg4)) == NULL) goto fail;
+	if (arg5) if ((lparg5 = env->GetLongArrayElements(arg5, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jlong, nsID *, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5);
 fail:
-	if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
+	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_3BLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_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)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jobject arg3, jintArray arg4)
+#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)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jobject arg3, jint 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, VtblCall__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;
-	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, nsID *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, nsID *, jint))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, arg4);
 fail:
-	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, VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3Z
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3Z)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jobject arg3, jbooleanArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3Z)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jobject arg3, jbooleanArray arg4)
+#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)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jobject arg3, jlong arg4)
 {
 	jbyte *lparg2=NULL;
 	nsID _arg3, *lparg3=NULL;
-	jboolean *lparg4=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3Z_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__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;
-	if (arg4) if ((lparg4 = env->GetBooleanArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, nsID *, jboolean *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, nsID *, jlong))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, arg4);
 fail:
-	if (arg4 && lparg4) env->ReleaseBooleanArrayElements(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_3Z_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3BZI_3I_3Z
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BZI_3I_3Z)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jboolean arg3, jint arg4, jintArray arg5, jbooleanArray arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BZI_3I_3Z)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jboolean arg3, jint arg4, jintArray arg5, jbooleanArray arg6)
+#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)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jobject arg3, jintArray arg4)
 {
 	jbyte *lparg2=NULL;
-	jint *lparg5=NULL;
-	jboolean *lparg6=NULL;
+	nsID _arg3, *lparg3=NULL;
+	jint *lparg4=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BZI_3I_3Z_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_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->GetBooleanArrayElements(arg6, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jboolean, jint, jint *, jboolean *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, arg4, lparg5, lparg6);
+	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, jbyte *, nsID *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
 fail:
-	if (arg6 && lparg6) env->ReleaseBooleanArrayElements(arg6, lparg6, 0);
-	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
+	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_3BZI_3I_3Z_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3BZ_3I_3Z
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BZ_3I_3Z)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jboolean arg3, jintArray arg4, jbooleanArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BZ_3I_3Z)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jboolean arg3, jintArray arg4, jbooleanArray arg5)
+#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)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jobject arg3, jlongArray arg4)
 {
 	jbyte *lparg2=NULL;
-	jint *lparg4=NULL;
-	jboolean *lparg5=NULL;
+	nsID _arg3, *lparg3=NULL;
+	jlong *lparg4=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BZ_3I_3Z_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J_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->GetBooleanArrayElements(arg5, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jboolean, jint *, jboolean *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5);
+	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, jbyte *, nsID *, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
 fail:
-	if (arg5 && lparg5) env->ReleaseBooleanArrayElements(arg5, lparg5, 0);
-	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
+	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_3BZ_3I_3Z_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
 	return rc;
 }
 #endif
@@ -1658,48 +2416,74 @@ fail:
 }
 #endif
 
-#ifndef NO_VtblCall__II_3B_3BZ
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3BZ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jboolean arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3BZ)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jboolean arg4)
+#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)
+	(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_3BZ_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__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 *, jboolean))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, arg4);
+	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_3BZ_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3B_3BI_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3B_3B_3BZZ_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3B_3BZZ_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4, jboolean arg5, jboolean arg6, jintArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3B_3BZZ_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4, jboolean arg5, jboolean arg6, jintArray arg7)
+#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)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jint arg6, jintArray arg7)
 {
 	jbyte *lparg2=NULL;
 	jbyte *lparg3=NULL;
 	jbyte *lparg4=NULL;
 	jint *lparg7=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3B_3B_3BZZ_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__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;
 	if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jbyte *, jbyte *, jboolean, jboolean, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, arg5, arg6, lparg7);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jbyte *, jbyte *, jint, jint, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, arg5, arg6, lparg7);
 fail:
 	if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
 	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_3BZZ_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__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)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jint arg6, jlongArray arg7)
+{
+	jbyte *lparg2=NULL;
+	jbyte *lparg3=NULL;
+	jbyte *lparg4=NULL;
+	jlong *lparg7=NULL;
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__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;
+	if (arg7) if ((lparg7 = env->GetLongArrayElements(arg7, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jbyte *, jbyte *, jint, jint, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, arg5, arg6, lparg7);
+fail:
+	if (arg7 && lparg7) env->ReleaseLongArrayElements(arg7, lparg7, 0);
+	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);
 	return rc;
 }
 #endif
@@ -1727,6 +2511,29 @@ fail:
 }
 #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)
+	(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);
+	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;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jbyte *, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
+fail:
+	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);
+	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)
@@ -1770,25 +2577,25 @@ fail:
 }
 #endif
 
-#ifndef NO_VtblCall__II_3B_3I_3Z
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3I_3Z)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jintArray arg3, jbooleanArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3I_3Z)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jintArray arg3, jbooleanArray arg4)
+#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)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jintArray arg3, jlongArray arg4)
 {
 	jbyte *lparg2=NULL;
 	jint *lparg3=NULL;
-	jboolean *lparg4=NULL;
+	jlong *lparg4=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3B_3I_3Z_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__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->GetBooleanArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jint *, jboolean *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
+	if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jint *, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
 fail:
-	if (arg4 && lparg4) env->ReleaseBooleanArrayElements(arg4, lparg4, 0);
+	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_3Z_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3B_3I_3J_FUNC);
 	return rc;
 }
 #endif
@@ -1813,45 +2620,25 @@ fail:
 }
 #endif
 
-#ifndef NO_VtblCall__II_3B_3Z
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3Z)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbooleanArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3Z)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbooleanArray arg3)
-{
-	jbyte *lparg2=NULL;
-	jboolean *lparg3=NULL;
-	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3B_3Z_FUNC);
-	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = env->GetBooleanArrayElements(arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jboolean *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3);
-fail:
-	if (arg3 && lparg3) env->ReleaseBooleanArrayElements(arg3, lparg3, 0);
-	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3B_3Z_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_VtblCall__II_3B_3Z_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3Z_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbooleanArray arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3Z_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbooleanArray arg3, jintArray arg4)
+#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)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jlongArray arg3, jintArray arg4)
 {
 	jbyte *lparg2=NULL;
-	jboolean *lparg3=NULL;
+	jlong *lparg3=NULL;
 	jint *lparg4=NULL;
 	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3B_3Z_3I_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3B_3J_3I_FUNC);
 	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = env->GetBooleanArrayElements(arg3, 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;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jboolean *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jlong *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
 fail:
 	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
-	if (arg3 && lparg3) env->ReleaseBooleanArrayElements(arg3, lparg3, 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_3Z_3I_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3B_3J_3I_FUNC);
 	return rc;
 }
 #endif
@@ -1890,6 +2677,23 @@ fail:
 }
 #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)
+	(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);
+	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);
+	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)
@@ -1910,19 +2714,22 @@ fail:
 }
 #endif
 
-#ifndef NO_VtblCall__II_3CZ
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3CZ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jboolean arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3CZ)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jboolean arg3)
+#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)
+	(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_3CZ_FUNC);
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3CJ_3J_FUNC);
 	if (arg2) if ((lparg2 = env->GetCharArrayElements(arg2, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jchar *, jboolean))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3);
+	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_3CZ_FUNC);
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3CJ_3J_FUNC);
 	return rc;
 }
 #endif
@@ -1947,49 +2754,6 @@ fail:
 }
 #endif
 
-#ifndef NO_VtblCall__II_3C_3C_3CZ
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3C_3C_3CZ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jcharArray arg3, jcharArray arg4, jboolean arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3C_3C_3CZ)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jcharArray arg3, jcharArray arg4, jboolean arg5)
-{
-	jchar *lparg2=NULL;
-	jchar *lparg3=NULL;
-	jchar *lparg4=NULL;
-	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3C_3C_3CZ_FUNC);
-	if (arg2) if ((lparg2 = env->GetCharArrayElements(arg2, NULL)) == NULL) goto fail;
-	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, jchar *, jchar *, jchar *, jboolean))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, arg5);
-fail:
-	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
-	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_3CZ_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_VtblCall__II_3C_3Z
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3C_3Z)(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jbooleanArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3C_3Z)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jbooleanArray arg3)
-{
-	jchar *lparg2=NULL;
-	jboolean *lparg3=NULL;
-	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3C_3Z_FUNC);
-	if (arg2) if ((lparg2 = env->GetCharArrayElements(arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = env->GetBooleanArrayElements(arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jchar *, jboolean *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3);
-fail:
-	if (arg3 && lparg3) env->ReleaseBooleanArrayElements(arg3, lparg3, 0);
-	if (arg2 && lparg2) env->ReleaseCharArrayElements(arg2, lparg2, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3C_3Z_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)
@@ -2136,6 +2900,29 @@ fail:
 }
 #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)
+	(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);
+	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;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint *, jlong *, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
+fail:
+	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);
+	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)
@@ -2153,6 +2940,29 @@ fail:
 }
 #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)
+	(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);
+	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;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong *, jlong *, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
+fail:
+	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);
+	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)
@@ -2170,23 +2980,6 @@ fail:
 }
 #endif
 
-#ifndef NO_VtblCall__II_3Z
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3Z)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbooleanArray arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3Z)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbooleanArray arg2)
-{
-	jboolean *lparg2=NULL;
-	jint rc = 0;
-	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3Z_FUNC);
-	if (arg2) if ((lparg2 = env->GetBooleanArrayElements(arg2, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jboolean *))(*(jint **)arg1)[arg0])(arg1, lparg2);
-fail:
-	if (arg2 && lparg2) env->ReleaseBooleanArrayElements(arg2, lparg2, 0);
-	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3Z_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)
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 76c9cc3895..3d933cd66c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.cpp
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.cpp
@@ -14,8 +14,8 @@
 
 #ifdef NATIVE_STATS
 
-int XPCOM_nativeFunctionCount = 134;
-int XPCOM_nativeFunctionCallCount[134];
+int XPCOM_nativeFunctionCount = 168;
+int XPCOM_nativeFunctionCallCount[168];
 char * XPCOM_nativeFunctionNames[] = {
 	"Call",
 	"NS_1GetComponentManager",
@@ -30,98 +30,131 @@ char * XPCOM_nativeFunctionNames[] = {
 	"VtblCall__IIIIII",
 	"VtblCall__IIIIIII",
 	"VtblCall__IIIIIIII",
-	"VtblCall__IIIIIIII_3C_3Z_3I",
+	"VtblCall__IIIIIIIIIIII",
+	"VtblCall__IIIIIIIIIIIIIIISI",
+	"VtblCall__IIIIIIII_3C_3I_3I",
 	"VtblCall__IIIIIIJII",
-	"VtblCall__IIIIIIZ",
-	"VtblCall__IIIIII_3C_3BIIIIZ_3I_3I",
-	"VtblCall__IIIIII_3C_3Z_3Z",
-	"VtblCall__IIIIII_3Z_3I",
-	"VtblCall__IIIIIZ",
-	"VtblCall__IIIIIZ_3CIIIIZ_3I_3I",
+	"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__IIIIJZ",
-	"VtblCall__IIIIZ",
 	"VtblCall__IIII_3B",
 	"VtblCall__IIII_3C",
 	"VtblCall__IIII_3CIJI",
+	"VtblCall__IIII_3CJJJ",
 	"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__IIIZ",
-	"VtblCall__IIIZZ",
-	"VtblCall__IIIZZII",
-	"VtblCall__IIIZZIIIIIIZZZZSI",
-	"VtblCall__IIIZZIZZZZII",
-	"VtblCall__IIIZ_3Z",
 	"VtblCall__III_3B",
+	"VtblCall__III_3BI",
 	"VtblCall__III_3BI_3I",
-	"VtblCall__III_3BZ",
 	"VtblCall__III_3B_3B_3BI_3I",
 	"VtblCall__III_3B_3C",
-	"VtblCall__III_3B_3Z",
+	"VtblCall__III_3B_3I",
 	"VtblCall__III_3C",
 	"VtblCall__III_3CI",
 	"VtblCall__III_3C_3C",
-	"VtblCall__III_3C_3CI_3C_3C_3C_3C_3Z_3I",
-	"VtblCall__III_3C_3CI_3I_3I_3Z",
-	"VtblCall__III_3C_3C_3C_3Z",
-	"VtblCall__III_3C_3C_3C_3Z_3Z",
+	"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_3Z_3Z",
-	"VtblCall__III_3C_3C_3I_3I_3C_3Z_3Z",
-	"VtblCall__III_3C_3C_3Z",
+	"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__III_3Z",
 	"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__IIJJZ",
+	"VtblCall__IIJJJJJJ",
+	"VtblCall__IIJJJJJJJ",
+	"VtblCall__IIJJ_3B",
+	"VtblCall__IIJJ_3CIJI",
+	"VtblCall__IIJJ_3CJJJ",
 	"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_3Z",
+	"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_3Z",
-	"VtblCall__IIZ",
-	"VtblCall__IIZI",
-	"VtblCall__IIZ_3Z",
+	"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_3Z",
-	"VtblCall__II_3BZI_3I_3Z",
-	"VtblCall__II_3BZ_3I_3Z",
+	"VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J",
 	"VtblCall__II_3B_3B",
-	"VtblCall__II_3B_3BZ",
-	"VtblCall__II_3B_3B_3BZZ_3I",
+	"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_3Z",
+	"VtblCall__II_3B_3I_3J",
 	"VtblCall__II_3B_3J",
-	"VtblCall__II_3B_3Z",
-	"VtblCall__II_3B_3Z_3I",
+	"VtblCall__II_3B_3J_3I",
 	"VtblCall__II_3C",
 	"VtblCall__II_3CIIII",
+	"VtblCall__II_3CIJJJ",
 	"VtblCall__II_3CI_3I",
-	"VtblCall__II_3CZ",
+	"VtblCall__II_3CJ_3J",
 	"VtblCall__II_3C_3C",
-	"VtblCall__II_3C_3C_3CZ",
-	"VtblCall__II_3C_3Z",
 	"VtblCall__II_3F",
 	"VtblCall__II_3I",
 	"VtblCall__II_3I_3I",
@@ -129,9 +162,10 @@ char * XPCOM_nativeFunctionNames[] = {
 	"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",
-	"VtblCall__II_3Z",
 	"XPCOMGlueShutdown",
 	"XPCOMGlueStartup",
 	"memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I",
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 bd2f41e4fa..0c509e7849 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
@@ -38,98 +38,131 @@ typedef enum {
 	VtblCall__IIIIII_FUNC,
 	VtblCall__IIIIIII_FUNC,
 	VtblCall__IIIIIIII_FUNC,
-	VtblCall__IIIIIIII_3C_3Z_3I_FUNC,
+	VtblCall__IIIIIIIIIIII_FUNC,
+	VtblCall__IIIIIIIIIIIIIIISI_FUNC,
+	VtblCall__IIIIIIII_3C_3I_3I_FUNC,
 	VtblCall__IIIIIIJII_FUNC,
-	VtblCall__IIIIIIZ_FUNC,
-	VtblCall__IIIIII_3C_3BIIIIZ_3I_3I_FUNC,
-	VtblCall__IIIIII_3C_3Z_3Z_FUNC,
-	VtblCall__IIIIII_3Z_3I_FUNC,
-	VtblCall__IIIIIZ_FUNC,
-	VtblCall__IIIIIZ_3CIIIIZ_3I_3I_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__IIIIJZ_FUNC,
-	VtblCall__IIIIZ_FUNC,
 	VtblCall__IIII_3B_FUNC,
 	VtblCall__IIII_3C_FUNC,
 	VtblCall__IIII_3CIJI_FUNC,
+	VtblCall__IIII_3CJJJ_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__IIIZ_FUNC,
-	VtblCall__IIIZZ_FUNC,
-	VtblCall__IIIZZII_FUNC,
-	VtblCall__IIIZZIIIIIIZZZZSI_FUNC,
-	VtblCall__IIIZZIZZZZII_FUNC,
-	VtblCall__IIIZ_3Z_FUNC,
 	VtblCall__III_3B_FUNC,
+	VtblCall__III_3BI_FUNC,
 	VtblCall__III_3BI_3I_FUNC,
-	VtblCall__III_3BZ_FUNC,
 	VtblCall__III_3B_3B_3BI_3I_FUNC,
 	VtblCall__III_3B_3C_FUNC,
-	VtblCall__III_3B_3Z_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_3Z_3I_FUNC,
-	VtblCall__III_3C_3CI_3I_3I_3Z_FUNC,
-	VtblCall__III_3C_3C_3C_3Z_FUNC,
-	VtblCall__III_3C_3C_3C_3Z_3Z_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_3Z_3Z_FUNC,
-	VtblCall__III_3C_3C_3I_3I_3C_3Z_3Z_FUNC,
-	VtblCall__III_3C_3C_3Z_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__III_3Z_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__IIJJZ_FUNC,
+	VtblCall__IIJJJJJJ_FUNC,
+	VtblCall__IIJJJJJJJ_FUNC,
+	VtblCall__IIJJ_3B_FUNC,
+	VtblCall__IIJJ_3CIJI_FUNC,
+	VtblCall__IIJJ_3CJJJ_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_3Z_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_3Z_FUNC,
-	VtblCall__IIZ_FUNC,
-	VtblCall__IIZI_FUNC,
-	VtblCall__IIZ_3Z_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_3Z_FUNC,
-	VtblCall__II_3BZI_3I_3Z_FUNC,
-	VtblCall__II_3BZ_3I_3Z_FUNC,
+	VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
 	VtblCall__II_3B_3B_FUNC,
-	VtblCall__II_3B_3BZ_FUNC,
-	VtblCall__II_3B_3B_3BZZ_3I_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_3Z_FUNC,
+	VtblCall__II_3B_3I_3J_FUNC,
 	VtblCall__II_3B_3J_FUNC,
-	VtblCall__II_3B_3Z_FUNC,
-	VtblCall__II_3B_3Z_3I_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_3CZ_FUNC,
+	VtblCall__II_3CJ_3J_FUNC,
 	VtblCall__II_3C_3C_FUNC,
-	VtblCall__II_3C_3C_3CZ_FUNC,
-	VtblCall__II_3C_3Z_FUNC,
 	VtblCall__II_3F_FUNC,
 	VtblCall__II_3I_FUNC,
 	VtblCall__II_3I_3I_FUNC,
@@ -137,9 +170,10 @@ typedef enum {
 	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,
-	VtblCall__II_3Z_FUNC,
 	XPCOMGlueShutdown_FUNC,
 	XPCOMGlueStartup_FUNC,
 	memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC,
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 079a843f00..d5e9cb26f8 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
@@ -106,7 +106,7 @@ int Show (int /*long*/ aLauncher, int /*long*/ aContext, int aReason) {
 	int rc = supports.QueryInterface (nsIHelperAppLauncher_1_9.NS_IHELPERAPPLAUNCHER_IID, result);
 	if (rc == 0) {
 		nsIHelperAppLauncher_1_9 helperAppLauncher = new nsIHelperAppLauncher_1_9 (aLauncher);
-		rc = helperAppLauncher.SaveToDisk (0, false);
+		rc = helperAppLauncher.SaveToDisk (0, 0);
 		helperAppLauncher.Release ();
 		return rc;
 	}
@@ -115,13 +115,13 @@ int Show (int /*long*/ aLauncher, int /*long*/ aContext, int aReason) {
 	rc = supports.QueryInterface (nsIHelperAppLauncher_1_8.NS_IHELPERAPPLAUNCHER_IID, result);
 	if (rc == 0) {
 		nsIHelperAppLauncher_1_8 helperAppLauncher = new nsIHelperAppLauncher_1_8 (aLauncher);
-		rc = helperAppLauncher.SaveToDisk (0, false);
+		rc = helperAppLauncher.SaveToDisk (0, 0);
 		helperAppLauncher.Release ();
 		return rc;
 	}
 
 	nsIHelperAppLauncher helperAppLauncher = new nsIHelperAppLauncher (aLauncher);	/* < 1.8 */
-	return helperAppLauncher.SaveToDisk (0, false);
+	return helperAppLauncher.SaveToDisk (0, 0);
 }
 
 int PromptForSaveToFile (int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ arg4) {
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 145ccbc92c..de71e209f4 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
@@ -116,10 +116,10 @@ class Mozilla extends WebBrowser {
 				manager.Release ();
 
 				nsISimpleEnumerator enumerator = new nsISimpleEnumerator (result[0]);
-				boolean[] moreElements = new boolean[1];
+				int[] moreElements = new int[1]; /* PRBool */
 				rc = enumerator.HasMoreElements (moreElements);
 				if (rc != XPCOM.NS_OK) error (rc);
-				while (moreElements[0]) {
+				while (moreElements[0] != 0) {
 					result[0] = 0;
 					rc = enumerator.GetNext (result);
 					if (rc != XPCOM.NS_OK) error (rc);
@@ -134,7 +134,7 @@ class Mozilla extends WebBrowser {
 						cookie.GetHost (domain);
 						cookie.GetName (name);
 						cookie.GetPath (path);
-						rc = manager.Remove (domain, name, path, false);
+						rc = manager.Remove (domain, name, path, 0);
 						XPCOM.nsEmbedCString_delete (domain);
 						XPCOM.nsEmbedCString_delete (name);
 						XPCOM.nsEmbedCString_delete (path);
@@ -1001,7 +1001,7 @@ public void create (Composite parent, int style) {
 		browser.dispose ();
 		error (XPCOM.NS_ERROR_FAILURE);
 	}
-	rc = baseWindow.SetVisibility (true);
+	rc = baseWindow.SetVisibility (1);
 	if (rc != XPCOM.NS_OK) {
 		browser.dispose ();
 		error (XPCOM.NS_ERROR_FAILURE);
@@ -1498,10 +1498,10 @@ public boolean isBackEnabled () {
 	if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
 	
 	nsIWebNavigation webNavigation = new nsIWebNavigation (result[0]);
-	boolean[] aCanGoBack = new boolean[1];
+	int[] aCanGoBack = new int[1]; /* PRBool */
 	rc = webNavigation.GetCanGoBack (aCanGoBack);	
 	webNavigation.Release ();
-	return aCanGoBack[0];
+	return aCanGoBack[0] != 0;
 }
 
 public boolean isForwardEnabled () {
@@ -1511,10 +1511,10 @@ public boolean isForwardEnabled () {
 	if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
 	
 	nsIWebNavigation webNavigation = new nsIWebNavigation (result[0]);
-	boolean[] aCanGoForward = new boolean[1];
+	int[] aCanGoForward = new int[1]; /* PRBool */
 	rc = webNavigation.GetCanGoForward (aCanGoForward);
 	webNavigation.Release ();
-	return aCanGoForward[0];
+	return aCanGoForward[0] != 0;
 }
 
 static String error (int code) {
@@ -1614,7 +1614,7 @@ void onResize () {
 
 	delegate.setSize (embedHandle, width, height);
 	nsIBaseWindow baseWindow = new nsIBaseWindow (result[0]);
-	rc = baseWindow.SetPositionAndSize (0, 0, width, height, true);
+	rc = baseWindow.SetPositionAndSize (0, 0, width, height, 1);
 	if (rc != XPCOM.NS_OK) error (rc);
 	baseWindow.Release ();
 }
@@ -1834,25 +1834,25 @@ void hookDOMListeners () {
 
 void hookDOMListeners (nsIDOMEventTarget target, boolean isTop) {
 	nsEmbedString string = new nsEmbedString (XPCOM.DOMEVENT_FOCUS);
-	target.AddEventListener (string.getAddress (), domEventListener.getAddress (), false);
+	target.AddEventListener (string.getAddress (), domEventListener.getAddress (), 0);
 	string.dispose ();
 	string = new nsEmbedString (XPCOM.DOMEVENT_UNLOAD);
-	target.AddEventListener (string.getAddress (), domEventListener.getAddress (), false);
+	target.AddEventListener (string.getAddress (), domEventListener.getAddress (), 0);
 	string.dispose ();
 	string = new nsEmbedString (XPCOM.DOMEVENT_MOUSEDOWN);
-	target.AddEventListener (string.getAddress (), domEventListener.getAddress (), false);
+	target.AddEventListener (string.getAddress (), domEventListener.getAddress (), 0);
 	string.dispose ();
 	string = new nsEmbedString (XPCOM.DOMEVENT_MOUSEUP);
-	target.AddEventListener (string.getAddress (), domEventListener.getAddress (), false);
+	target.AddEventListener (string.getAddress (), domEventListener.getAddress (), 0);
 	string.dispose ();
 	string = new nsEmbedString (XPCOM.DOMEVENT_MOUSEMOVE);
-	target.AddEventListener (string.getAddress (), domEventListener.getAddress (), false);
+	target.AddEventListener (string.getAddress (), domEventListener.getAddress (), 0);
 	string.dispose ();
 	string = new nsEmbedString (XPCOM.DOMEVENT_MOUSEWHEEL);
-	target.AddEventListener (string.getAddress (), domEventListener.getAddress (), false);
+	target.AddEventListener (string.getAddress (), domEventListener.getAddress (), 0);
 	string.dispose ();
 	string = new nsEmbedString (XPCOM.DOMEVENT_MOUSEDRAG);
-	target.AddEventListener (string.getAddress (), domEventListener.getAddress (), false);
+	target.AddEventListener (string.getAddress (), domEventListener.getAddress (), 0);
 	string.dispose ();
 
 	/*
@@ -1861,21 +1861,21 @@ void hookDOMListeners (nsIDOMEventTarget target, boolean isTop) {
 	*/
 	if (isTop && delegate.hookEnterExit ()) {
 		string = new nsEmbedString (XPCOM.DOMEVENT_MOUSEOVER);
-		target.AddEventListener (string.getAddress (), domEventListener.getAddress (), false);
+		target.AddEventListener (string.getAddress (), domEventListener.getAddress (), 0);
 		string.dispose ();
 		string = new nsEmbedString (XPCOM.DOMEVENT_MOUSEOUT);
-		target.AddEventListener (string.getAddress (), domEventListener.getAddress (), false);
+		target.AddEventListener (string.getAddress (), domEventListener.getAddress (), 0);
 		string.dispose ();
 	}
 
 	string = new nsEmbedString (XPCOM.DOMEVENT_KEYDOWN);
-	target.AddEventListener (string.getAddress (), domEventListener.getAddress (), false);
+	target.AddEventListener (string.getAddress (), domEventListener.getAddress (), 0);
 	string.dispose ();
 	string = new nsEmbedString (XPCOM.DOMEVENT_KEYPRESS);
-	target.AddEventListener (string.getAddress (), domEventListener.getAddress (), false);
+	target.AddEventListener (string.getAddress (), domEventListener.getAddress (), 0);
 	string.dispose ();
 	string = new nsEmbedString (XPCOM.DOMEVENT_KEYUP);
-	target.AddEventListener (string.getAddress (), domEventListener.getAddress (), false);
+	target.AddEventListener (string.getAddress (), domEventListener.getAddress (), 0);
 	string.dispose ();
 }
 
@@ -1932,40 +1932,40 @@ void unhookDOMListeners () {
 
 void unhookDOMListeners (nsIDOMEventTarget target) {
 	nsEmbedString string = new nsEmbedString (XPCOM.DOMEVENT_FOCUS);
-	target.RemoveEventListener (string.getAddress (), domEventListener.getAddress (), false);
+	target.RemoveEventListener (string.getAddress (), domEventListener.getAddress (), 0);
 	string.dispose ();
 	string = new nsEmbedString (XPCOM.DOMEVENT_UNLOAD);
-	target.RemoveEventListener (string.getAddress (), domEventListener.getAddress (), false);
+	target.RemoveEventListener (string.getAddress (), domEventListener.getAddress (), 0);
 	string.dispose ();
 	string = new nsEmbedString (XPCOM.DOMEVENT_MOUSEDOWN);
-	target.RemoveEventListener (string.getAddress (), domEventListener.getAddress (), false);
+	target.RemoveEventListener (string.getAddress (), domEventListener.getAddress (), 0);
 	string.dispose ();
 	string = new nsEmbedString (XPCOM.DOMEVENT_MOUSEUP);
-	target.RemoveEventListener (string.getAddress (), domEventListener.getAddress (), false);
+	target.RemoveEventListener (string.getAddress (), domEventListener.getAddress (), 0);
 	string.dispose ();
 	string = new nsEmbedString (XPCOM.DOMEVENT_MOUSEMOVE);
-	target.RemoveEventListener (string.getAddress (), domEventListener.getAddress (), false);
+	target.RemoveEventListener (string.getAddress (), domEventListener.getAddress (), 0);
 	string.dispose ();
 	string = new nsEmbedString (XPCOM.DOMEVENT_MOUSEWHEEL);
-	target.RemoveEventListener (string.getAddress (), domEventListener.getAddress (), false);
+	target.RemoveEventListener (string.getAddress (), domEventListener.getAddress (), 0);
 	string.dispose ();
 	string = new nsEmbedString (XPCOM.DOMEVENT_MOUSEDRAG);
-	target.RemoveEventListener (string.getAddress (), domEventListener.getAddress (), false);
+	target.RemoveEventListener (string.getAddress (), domEventListener.getAddress (), 0);
 	string.dispose ();
 	string = new nsEmbedString (XPCOM.DOMEVENT_MOUSEOVER);
-	target.RemoveEventListener (string.getAddress (), domEventListener.getAddress (), false);
+	target.RemoveEventListener (string.getAddress (), domEventListener.getAddress (), 0);
 	string.dispose ();
 	string = new nsEmbedString (XPCOM.DOMEVENT_MOUSEOUT);
-	target.RemoveEventListener (string.getAddress (), domEventListener.getAddress (), false);
+	target.RemoveEventListener (string.getAddress (), domEventListener.getAddress (), 0);
 	string.dispose ();
 	string = new nsEmbedString (XPCOM.DOMEVENT_KEYDOWN);
-	target.RemoveEventListener (string.getAddress (), domEventListener.getAddress (), false);
+	target.RemoveEventListener (string.getAddress (), domEventListener.getAddress (), 0);
 	string.dispose ();
 	string = new nsEmbedString (XPCOM.DOMEVENT_KEYPRESS);
-	target.RemoveEventListener (string.getAddress (), domEventListener.getAddress (), false);
+	target.RemoveEventListener (string.getAddress (), domEventListener.getAddress (), 0);
 	string.dispose ();
 	string = new nsEmbedString (XPCOM.DOMEVENT_KEYUP);
-	target.RemoveEventListener (string.getAddress (), domEventListener.getAddress (), false);
+	target.RemoveEventListener (string.getAddress (), domEventListener.getAddress (), 0);
 	string.dispose ();
 }
 
@@ -2844,7 +2844,7 @@ int HandleEvent (int /*long*/ event) {
 				case SWT.SCROLL_LOCK:
 				case SWT.COMMAND: {
 					/* keypress events will not be received for these keys, so send KeyDowns for them now */
-					boolean[] aAltKey = new boolean[1], aCtrlKey = new boolean[1], aShiftKey = new boolean[1], aMetaKey = new boolean[1]; 
+					int[] aAltKey = new int[1], aCtrlKey = new int[1], aShiftKey = new int[1], aMetaKey = new int[1]; /* PRBool */
 					rc = domKeyEvent.GetAltKey (aAltKey);
 					if (rc != XPCOM.NS_OK) error (rc);
 					rc = domKeyEvent.GetCtrlKey (aCtrlKey);
@@ -2858,7 +2858,7 @@ int HandleEvent (int /*long*/ event) {
 					keyEvent.widget = browser;
 					keyEvent.type = SWT.KeyDown;
 					keyEvent.keyCode = keyCode;
-					keyEvent.stateMask = (aAltKey[0] ? SWT.ALT : 0) | (aCtrlKey[0] ? SWT.CTRL : 0) | (aShiftKey[0] ? SWT.SHIFT : 0) | (aMetaKey[0] ? SWT.COMMAND : 0);
+					keyEvent.stateMask = (aAltKey[0] != 0 ? SWT.ALT : 0) | (aCtrlKey[0] != 0 ? SWT.CTRL : 0) | (aShiftKey[0] != 0 ? SWT.SHIFT : 0) | (aMetaKey[0] != 0 ? SWT.COMMAND : 0);
 					keyEvent.stateMask &= ~keyCode;		/* remove current keydown if it's a state key */
 					browser.notifyListeners (keyEvent.type, keyEvent);
 					if (!keyEvent.doit) {
@@ -2873,15 +2873,15 @@ int HandleEvent (int /*long*/ event) {
 					* does not have Meta as a modifier, or has Meta+Ctrl as a modifier, then then do nothing here
 					* because its KeyDown event will be sent from the keypress listener.
 					*/
-					boolean[] aMetaKey = new boolean[1]; 
+					int[] aMetaKey = new int[1]; /* PRBool */
 					rc = domKeyEvent.GetMetaKey (aMetaKey);
 					if (rc != XPCOM.NS_OK) error (rc);
-					if (aMetaKey[0]) {
-						boolean[] aCtrlKey = new boolean[1];
+					if (aMetaKey[0] != 0) {
+						int[] aCtrlKey = new int[1]; /* PRBool */
 						rc = domKeyEvent.GetCtrlKey (aCtrlKey);
 						if (rc != XPCOM.NS_OK) error (rc);
-						if (!aCtrlKey[0]) {
-							boolean[] aAltKey = new boolean[1], aShiftKey = new boolean[1]; 
+						if (aCtrlKey[0] == 0) {
+							int[] aAltKey = new int[1], aShiftKey = new int[1]; /* PRBool */
 							rc = domKeyEvent.GetAltKey (aAltKey);
 							if (rc != XPCOM.NS_OK) error (rc);
 							rc = domKeyEvent.GetShiftKey (aShiftKey);
@@ -2891,7 +2891,7 @@ int HandleEvent (int /*long*/ event) {
 							keyEvent.widget = browser;
 							keyEvent.type = SWT.KeyDown;
 							keyEvent.keyCode = lastKeyCode;
-							keyEvent.stateMask = (aAltKey[0] ? SWT.ALT : 0) | (aCtrlKey[0] ? SWT.CTRL : 0) | (aShiftKey[0] ? SWT.SHIFT : 0) | (aMetaKey[0] ? SWT.COMMAND : 0);
+							keyEvent.stateMask = (aAltKey[0] != 0 ? SWT.ALT : 0) | (aCtrlKey[0] != 0? SWT.CTRL : 0) | (aShiftKey[0] != 0? SWT.SHIFT : 0) | (aMetaKey[0] != 0? SWT.COMMAND : 0);
 							browser.notifyListeners (keyEvent.type, keyEvent);
 							if (!keyEvent.doit) {
 								domEvent.PreventDefault ();
@@ -2931,7 +2931,7 @@ int HandleEvent (int /*long*/ event) {
 		nsIDOMKeyEvent domKeyEvent = new nsIDOMKeyEvent (result[0]);
 		result[0] = 0;
 
-		boolean[] aAltKey = new boolean[1], aCtrlKey = new boolean[1], aShiftKey = new boolean[1], aMetaKey = new boolean[1]; 
+		int[] aAltKey = new int[1], aCtrlKey = new int[1], aShiftKey = new int[1], aMetaKey = new int[1]; /* PRBool */
 		rc = domKeyEvent.GetAltKey (aAltKey);
 		if (rc != XPCOM.NS_OK) error (rc);
 		rc = domKeyEvent.GetCtrlKey (aCtrlKey);
@@ -2955,7 +2955,7 @@ int HandleEvent (int /*long*/ event) {
 				case SWT.DEL: lastCharCode = SWT.DEL; break;
 			}
 		}
-		if (aCtrlKey[0] && (0 <= lastCharCode && lastCharCode <= 0x7F)) {
+		if (aCtrlKey[0] != 0 && (0 <= lastCharCode && lastCharCode <= 0x7F)) {
 			if ('a'  <= lastCharCode && lastCharCode <= 'z') lastCharCode -= 'a' - 'A';
 			if (64 <= lastCharCode && lastCharCode <= 95) lastCharCode -= 64;
 		}
@@ -2965,7 +2965,7 @@ int HandleEvent (int /*long*/ event) {
 		keyEvent.type = SWT.KeyDown;
 		keyEvent.keyCode = lastKeyCode;
 		keyEvent.character = (char)lastCharCode;
-		keyEvent.stateMask = (aAltKey[0] ? SWT.ALT : 0) | (aCtrlKey[0] ? SWT.CTRL : 0) | (aShiftKey[0] ? SWT.SHIFT : 0) | (aMetaKey[0] ? SWT.COMMAND : 0);
+		keyEvent.stateMask = (aAltKey[0] != 0 ? SWT.ALT : 0) | (aCtrlKey[0] != 0 ? SWT.CTRL : 0) | (aShiftKey[0] != 0 ? SWT.SHIFT : 0) | (aMetaKey[0] != 0 ? SWT.COMMAND : 0);
 		browser.notifyListeners (keyEvent.type, keyEvent);
 		if (!keyEvent.doit) {
 			domEvent.PreventDefault ();
@@ -2996,7 +2996,7 @@ int HandleEvent (int /*long*/ event) {
 			lastCharCode = 0;
 		}
 
-		boolean[] aAltKey = new boolean[1], aCtrlKey = new boolean[1], aShiftKey = new boolean[1], aMetaKey = new boolean[1]; 
+		int[] aAltKey = new int[1], aCtrlKey = new int[1], aShiftKey = new int[1], aMetaKey = new int[1]; /* PRBool */
 		rc = domKeyEvent.GetAltKey (aAltKey);
 		if (rc != XPCOM.NS_OK) error (rc);
 		rc = domKeyEvent.GetCtrlKey (aCtrlKey);
@@ -3012,7 +3012,7 @@ int HandleEvent (int /*long*/ event) {
 		keyEvent.type = SWT.KeyUp;
 		keyEvent.keyCode = lastKeyCode;
 		keyEvent.character = (char)lastCharCode;
-		keyEvent.stateMask = (aAltKey[0] ? SWT.ALT : 0) | (aCtrlKey[0] ? SWT.CTRL : 0) | (aShiftKey[0] ? SWT.SHIFT : 0) | (aMetaKey[0] ? SWT.COMMAND : 0);
+		keyEvent.stateMask = (aAltKey[0] != 0 ? SWT.ALT : 0) | (aCtrlKey[0] != 0 ? SWT.CTRL : 0) | (aShiftKey[0] != 0 ? SWT.SHIFT : 0) | (aMetaKey[0] != 0 ? SWT.COMMAND : 0);
 		switch (lastKeyCode) {
 			case SWT.SHIFT:
 			case SWT.CONTROL:
@@ -3064,7 +3064,7 @@ int HandleEvent (int /*long*/ event) {
 	short[] aButton = new short[1]; /* PRUint16 */
 	rc = domMouseEvent.GetButton (aButton);
 	if (rc != XPCOM.NS_OK) error (rc);
-	boolean[] aAltKey = new boolean[1], aCtrlKey = new boolean[1], aShiftKey = new boolean[1], aMetaKey = new boolean[1]; 
+	int[] aAltKey = new int[1], aCtrlKey = new int[1], aShiftKey = new int[1], aMetaKey = new int[1]; /* PRBool */
 	rc = domMouseEvent.GetAltKey (aAltKey);
 	if (rc != XPCOM.NS_OK) error (rc);
 	rc = domMouseEvent.GetCtrlKey (aCtrlKey);
@@ -3078,7 +3078,7 @@ int HandleEvent (int /*long*/ event) {
 	Event mouseEvent = new Event ();
 	mouseEvent.widget = browser;
 	mouseEvent.x = aClientX[0]; mouseEvent.y = aClientY[0];
-	mouseEvent.stateMask = (aAltKey[0] ? SWT.ALT : 0) | (aCtrlKey[0] ? SWT.CTRL : 0) | (aShiftKey[0] ? SWT.SHIFT : 0) | (aMetaKey[0] ? SWT.COMMAND : 0);
+	mouseEvent.stateMask = (aAltKey[0] != 0 ? SWT.ALT : 0) | (aCtrlKey[0] != 0 ? SWT.CTRL : 0) | (aShiftKey[0] != 0 ? SWT.SHIFT : 0) | (aMetaKey[0] != 0 ? SWT.COMMAND : 0);
 
 	if (XPCOM.DOMEVENT_MOUSEDOWN.equals (typeString)) {
 		delegate.handleMouseDown ();
@@ -3125,7 +3125,7 @@ int HandleEvent (int /*long*/ event) {
 		mouseEvent = new Event ();
 		mouseEvent.widget = browser;
 		mouseEvent.x = aClientX[0]; mouseEvent.y = aClientY[0];
-		mouseEvent.stateMask = (aAltKey[0] ? SWT.ALT : 0) | (aCtrlKey[0] ? SWT.CTRL : 0) | (aShiftKey[0] ? SWT.SHIFT : 0) | (aMetaKey[0] ? SWT.COMMAND : 0);
+		mouseEvent.stateMask = (aAltKey[0] != 0 ? SWT.ALT : 0) | (aCtrlKey[0] != 0 ? SWT.CTRL : 0) | (aShiftKey[0] != 0 ? SWT.SHIFT : 0) | (aMetaKey[0] != 0 ? SWT.COMMAND : 0);
 		mouseEvent.type = SWT.MouseDoubleClick;
 		mouseEvent.button = aButton[0] + 1;
 		mouseEvent.count = aDetail[0];
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 ed3865c312..482f90045f 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
@@ -151,8 +151,7 @@ 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);
 
 static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, boolean arg0);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, boolean[] arg0);
+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);
@@ -161,103 +160,145 @@ 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);
+
 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 /*long*/ arg0, int /*long*/[] arg1);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, boolean arg0, boolean[] arg1);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, boolean arg0, int /*long*/ arg1);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, boolean[] 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 /*long*/ arg0, boolean arg1);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0, boolean[] arg1);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0, nsID 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 /*long*/arg0, char[] arg1, int arg2);
 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, boolean[] arg1);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int /*long*/ arg1);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int /*long*/[] arg1);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0, boolean arg1, boolean arg2, int /*long*/ arg3, int arg4, int arg5, int arg6, int arg7, int arg8, boolean arg9, boolean arg10, boolean arg11, boolean arg12, short arg13, int /*long*/ arg14);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, boolean arg1);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, boolean[] 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, int /*long*/[] arg1, boolean[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int /*long*/[] arg0, int /*long*/[] arg1, int /*long*/[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[] arg1, int /*long*/[] arg2);
+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);
+
+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, boolean[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, int /*long*/[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int /*long*/ arg1, int /*long*/[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0, boolean arg1, boolean arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0, boolean arg1, boolean[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0, char[] arg1, char[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ 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 /*long*/ arg0, int arg1, int /*long*/[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int[] arg2); /* needed for 64-bit */
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0, nsID arg1, int /*long*/[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, boolean[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, boolean arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, boolean 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, boolean[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, nsID arg1, int /*long*/[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, boolean arg1, int /*long*/[] arg2, boolean[] arg3);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int /*long*/ arg1, nsID arg2, int /*long*/[] arg3);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0, byte[] arg1, int /*long*/ arg2, int /*long*/[] arg3);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0, char[] arg1, char[] arg2, boolean[] arg3);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0, char[] arg1, char[] arg2, int /*long*/[] arg3);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0, int /*long*/ arg1, int arg2, boolean arg3);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0, int /*long*/ arg1, long arg2, boolean arg3);	/* needed for 64-bit */
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0, int /*long*/ arg1, int arg2, char[] arg3);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0, int /*long*/ arg1, int arg2, int arg3);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0, int /*long*/ arg1, int arg2, int[] arg3);
+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);
+
+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 /*long*/ arg3);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int /*long*/ arg1, nsID arg2, int /*long*/[] arg3);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, char[] arg1, char[] arg2, boolean arg3);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, boolean arg1, int /*long*/ arg2, int /*long*/[] arg3, boolean[] arg4);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ arg4);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0, boolean arg1, boolean arg2, int /*long*/ arg3, int arg4);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0, char[] arg1, char[] arg2, char[] arg3, boolean[] arg4);
+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);
+
+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, boolean 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 /*long*/ arg0, byte[] arg1, byte[] arg2, byte[] arg3, int /*long*/ arg4, int /*long*/[] arg5);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0, char[] arg1, char[] arg2, char[] arg3, boolean[] arg4, boolean[] arg5);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0, int /*long*/ arg1, char[] arg2, int /*long*/ arg3, long arg4, int /*long*/ arg5);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0, int /*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 /*long*/ arg3, byte[] arg4, byte[] arg5);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0, char[] arg1, char[] arg2, int /*long*/[] arg3, char[] arg4, boolean[] arg5, boolean[] arg6);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0, char[] arg1, char[] arg2, int arg3, int /*long*/[] arg4, int[] arg5, boolean[] arg6);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0, char[] arg1, char[] arg2, int /*long*/[] arg3, int /*long*/[] arg4, char[] arg5, boolean[] arg6, boolean[] arg7);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0, char[] arg1, char[] arg2, int arg3, char[] arg4, char[] arg5, char[] arg6, char[] arg7, boolean[] arg8, int[] arg9);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, boolean arg3, char[] arg4, int /*long*/ arg5, int /*long*/ arg6, int arg7, int /*long*/ arg8, boolean arg9, int /*long*/[] arg10, int /*long*/[] arg11);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, boolean arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, int /*long*/[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, boolean arg3, boolean arg4, int /*long*/[] arg5);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[] arg1, int /*long*/[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, int /*long*/ arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0, int /*long*/ arg1, long arg2, long arg3, long arg4, long arg5);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, long arg4, int /*long*/ arg5, int /*long*/ arg6);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0, byte[] arg1);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0, byte[] arg1, boolean arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0, byte[] arg1, char[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, boolean[] arg1, int /*long*/[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0, int arg1, int arg2, int /*long*/ arg3, boolean[] arg4, int /*long*/[] arg5);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int arg3, char[] arg4, byte[] arg5, int /*long*/ arg6, int /*long*/ arg7, int arg8, int /*long*/ arg9, boolean arg10, int /*long*/[] arg11, int /*long*/[] arg12);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0, int /*long*/ arg1, byte[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0, boolean arg1, boolean arg2, int /*long*/ arg3, boolean arg4, boolean arg5, boolean arg6, boolean arg7, int arg8, int arg9);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0, int /*long*/ arg1, int arg2, int /*long*/ arg3, char[] arg4, boolean[] arg5, boolean[] arg6);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int arg4, int /*long*/ arg5, char[] arg6, boolean[] arg7, int /*long*/[] arg8);
+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);
+
+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, 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, 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);
 }
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 004003c7c3..71942b2944 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, 2005 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, boolean 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(boolean 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());
-	}
+/* ***** 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
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIAuthInformation.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIAuthInformation.java
index 09df412a60..204179092c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIAuthInformation.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIAuthInformation.java
@@ -22,7 +22,7 @@
  *
  * IBM
  * -  Binding to permit interfacing between Mozilla and SWT
- * -  Copyright (C) 2008 IBM Corp.  All Rights Reserved.
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
  *
  * ***** END LICENSE BLOCK ***** */
 package org.eclipse.swt.internal.mozilla;
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 2ed22755bb..958916dcf4 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, 2005 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, boolean 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, boolean 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(boolean 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(boolean[] aVisibility) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aVisibility);
-	}
-
-	public int SetVisibility(boolean aVisibility) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aVisibility);
-	}
-
-	public int GetEnabled(boolean[] aEnabled) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aEnabled);
-	}
-
-	public int SetEnabled(boolean aEnabled) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aEnabled);
-	}
-
-	public int GetBlurSuppression(boolean[] aBlurSuppression) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), aBlurSuppression);
-	}
-
-	public int SetBlurSuppression(boolean 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);
-	}
+/* ***** 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
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 1941ea3599..7e49f85287 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, 2005 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, boolean aPersist, boolean 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, boolean 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);
-	}
+/* ***** 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
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIChannel.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIChannel.java
index 646d92b874..5868a23a25 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIChannel.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIChannel.java
@@ -22,7 +22,7 @@
  *
  * IBM
  * -  Binding to permit interfacing between Mozilla and SWT
- * -  Copyright (C) 2008 IBM Corp.  All Rights Reserved.
+ * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
  *
  * ***** END LICENSE BLOCK ***** */
 package org.eclipse.swt.internal.mozilla;
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 0f639551b0..8f0032f529 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, 2005 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, boolean[] _retval) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aClass, _retval);
-	}
-
-	public int IsContractIDRegistered(byte[] aContractID, boolean[] _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);
-	}
+/* ***** 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
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 63be221790..5f0f734a81 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) 2005 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(boolean[] 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(boolean[] 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);
-	}
-}
+		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
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 cdf9e8350c..cda96b10b5 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) 2005 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, boolean aBlocked) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aDomain, aName, aPath, aBlocked);
-	}
-}
+/* ***** 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
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 8f7df68a45..755a708f1a 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) 2004, 2005 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(boolean[] aBubbles) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aBubbles);
-	}
-
-	public int GetCancelable(boolean[] 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, boolean canBubbleArg, boolean cancelableArg) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), eventTypeArg, canBubbleArg, cancelableArg);
-	}
+		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
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 6ae42fb8fb..3c8cac5779 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
@@ -22,7 +22,7 @@
  *

  * IBM

  * -  Binding to permit interfacing between Mozilla and SWT

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

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

  *

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

 package org.eclipse.swt.internal.mozilla;

@@ -41,15 +41,15 @@ public class nsIDOMEventTarget extends nsISupports {
 		super(address);

 	}

 

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

+	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, boolean 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, boolean[] _retval) {

+	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
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 47b246e5f7..05db310113 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) 2004, 2005 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(boolean[] aAltKey) {
-		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 3, getAddress(), aAltKey);
-	}
-
-	public int GetCtrlKey(boolean[] aCtrlKey) {
-		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 4, getAddress(), aCtrlKey);
-	}
-
-	public int GetShiftKey(boolean[] aShiftKey) {
-		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 5, getAddress(), aShiftKey);
-	}
-
-	public int GetMetaKey(boolean[] aMetaKey) {
-		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 6, getAddress(), aMetaKey);
-	}
-
-	public int InitKeyEvent(int /*long*/ typeArg, boolean canBubbleArg, boolean cancelableArg, int /*long*/ viewArg, boolean ctrlKeyArg, boolean altKeyArg, boolean shiftKeyArg, boolean metaKeyArg, int keyCodeArg, int charCodeArg) {
-		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 7, getAddress(), typeArg, canBubbleArg, cancelableArg, viewArg, ctrlKeyArg, altKeyArg, shiftKeyArg, metaKeyArg, keyCodeArg, charCodeArg);
-	}
-}
+/* ***** 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
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 bb51c19fc5..5bdb407adc 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) 2004, 2005 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(boolean[] aCtrlKey) {
-		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 5, getAddress(), aCtrlKey);
-	}
-
-	public int GetShiftKey(boolean[] aShiftKey) {
-		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 6, getAddress(), aShiftKey);
-	}
-
-	public int GetAltKey(boolean[] aAltKey) {
-		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 7, getAddress(), aAltKey);
-	}
-
-	public int GetMetaKey(boolean[] 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, boolean canBubbleArg, boolean cancelableArg, int /*long*/ viewArg, int detailArg, int screenXArg, int screenYArg, int clientXArg, int clientYArg, boolean ctrlKeyArg, boolean altKeyArg, boolean shiftKeyArg, boolean 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);
-	}
+/* ***** 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
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 3bdf983c6d..7c06e04e2c 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) 2004, 2005 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, boolean canBubbleArg, boolean cancelableArg, int /*long*/ viewArg, int detailArg) {
-		return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 3, getAddress(), typeArg, canBubbleArg, cancelableArg, viewArg, detailArg);
-	}
+/* ***** 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
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 c6950abe50..9b8051131e 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
@@ -22,7 +22,7 @@
  *

  * IBM

  * -  Binding to permit interfacing between Mozilla and SWT

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

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

  *

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

 package org.eclipse.swt.internal.mozilla;

@@ -41,7 +41,7 @@ public class nsIDirectoryServiceProvider extends nsISupports {
 		super(address);

 	}

 

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

+	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
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 4b8a93a3bf..6a9f19a274 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, 2005 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, boolean 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, boolean aInheritOwner, char[] aWindowTarget, int /*long*/ aPostDataStream, int /*long*/ aHeadersStream, int aLoadFlags, int /*long*/ aSHEntry, boolean 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(boolean[] aAllowPlugins) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aAllowPlugins);
-	}
-
-	public int SetAllowPlugins(boolean aAllowPlugins) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), aAllowPlugins);
-	}
-
-	public int GetAllowJavascript(boolean[] aAllowJavascript) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), aAllowJavascript);
-	}
-
-	public int SetAllowJavascript(boolean aAllowJavascript) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), aAllowJavascript);
-	}
-
-	public int GetAllowMetaRedirects(boolean[] aAllowMetaRedirects) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), aAllowMetaRedirects);
-	}
-
-	public int SetAllowMetaRedirects(boolean aAllowMetaRedirects) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), aAllowMetaRedirects);
-	}
-
-	public int GetAllowSubframes(boolean[] aAllowSubframes) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), aAllowSubframes);
-	}
-
-	public int SetAllowSubframes(boolean aAllowSubframes) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), aAllowSubframes);
-	}
-
-	public int GetAllowImages(boolean[] aAllowImages) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aAllowImages);
-	}
-
-	public int SetAllowImages(boolean 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(boolean[] aAllowAuth) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 31, getAddress(), aAllowAuth);
-	}
-
-	public int SetAllowAuth(boolean 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(boolean[] aHasFocus) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 39, getAddress(), aHasFocus);
-	}
-
-	public int SetHasFocus(boolean aHasFocus) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 40, getAddress(), aHasFocus);
-	}
-
-	public int GetCanvasHasFocus(boolean[] aCanvasHasFocus) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 41, getAddress(), aCanvasHasFocus);
-	}
-
-	public int SetCanvasHasFocus(boolean aCanvasHasFocus) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 42, getAddress(), aCanvasHasFocus);
-	}
-
-	public int TabToTreeOwner(boolean forward, boolean[] 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(boolean[] _retval) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 47, getAddress(), _retval);
-	}
-
-	public int GetIsExecutingOnLoadHandler(boolean[] 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(boolean[] aShouldSaveLayoutState) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 51, getAddress(), aShouldSaveLayoutState);
-	}
+/* ***** 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
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 68d86c9627..098cb25bed 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
@@ -22,7 +22,7 @@
  *

  * IBM

  * -  Binding to permit interfacing between Mozilla and SWT

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

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

  *

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

 package org.eclipse.swt.internal.mozilla;

@@ -41,7 +41,7 @@ public class nsIDocShell_1_8 extends nsISupports {
 		super(address);

 	}

 

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

+	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);

 	}

 

@@ -55,7 +55,7 @@ public class nsIDocShell_1_8 extends nsISupports {
 

 	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, boolean firstParty, int /*long*/[] aDocShell, int /*long*/[] aRequest) {

+	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);

 	}

 

@@ -71,7 +71,7 @@ public class nsIDocShell_1_8 extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aURI);

 	}

 

-	public int FirePageHideNotification(boolean isUnload) {

+	public int FirePageHideNotification(int isUnload) {

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

 	}

 

@@ -107,43 +107,43 @@ public class nsIDocShell_1_8 extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aDocumentCharsetInfo);

 	}

 

-	public int GetAllowPlugins(boolean[] aAllowPlugins) {

+	public int GetAllowPlugins(int[] aAllowPlugins) {

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

 	}

 

-	public int SetAllowPlugins(boolean aAllowPlugins) {

+	public int SetAllowPlugins(int aAllowPlugins) {

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

 	}

 

-	public int GetAllowJavascript(boolean[] aAllowJavascript) {

+	public int GetAllowJavascript(int[] aAllowJavascript) {

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

 	}

 

-	public int SetAllowJavascript(boolean aAllowJavascript) {

+	public int SetAllowJavascript(int aAllowJavascript) {

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

 	}

 

-	public int GetAllowMetaRedirects(boolean[] aAllowMetaRedirects) {

+	public int GetAllowMetaRedirects(int[] aAllowMetaRedirects) {

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

 	}

 

-	public int SetAllowMetaRedirects(boolean aAllowMetaRedirects) {

+	public int SetAllowMetaRedirects(int aAllowMetaRedirects) {

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

 	}

 

-	public int GetAllowSubframes(boolean[] aAllowSubframes) {

+	public int GetAllowSubframes(int[] aAllowSubframes) {

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

 	}

 

-	public int SetAllowSubframes(boolean aAllowSubframes) {

+	public int SetAllowSubframes(int aAllowSubframes) {

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

 	}

 

-	public int GetAllowImages(boolean[] aAllowImages) {

+	public int GetAllowImages(int[] aAllowImages) {

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

 	}

 

-	public int SetAllowImages(boolean aAllowImages) {

+	public int SetAllowImages(int aAllowImages) {

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

 	}

 

@@ -169,11 +169,11 @@ public class nsIDocShell_1_8 extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 28, getAddress(), aAppType);

 	}

 

-	public int GetAllowAuth(boolean[] aAllowAuth) {

+	public int GetAllowAuth(int[] aAllowAuth) {

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

 	}

 

-	public int SetAllowAuth(boolean aAllowAuth) {

+	public int SetAllowAuth(int aAllowAuth) {

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

 	}

 

@@ -201,23 +201,23 @@ public class nsIDocShell_1_8 extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 36, getAddress(), aMarginHeight);

 	}

 

-	public int GetHasFocus(boolean[] aHasFocus) {

+	public int GetHasFocus(int[] aHasFocus) {

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

 	}

 

-	public int SetHasFocus(boolean aHasFocus) {

+	public int SetHasFocus(int aHasFocus) {

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

 	}

 

-	public int GetCanvasHasFocus(boolean[] aCanvasHasFocus) {

+	public int GetCanvasHasFocus(int[] aCanvasHasFocus) {

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

 	}

 

-	public int SetCanvasHasFocus(boolean aCanvasHasFocus) {

+	public int SetCanvasHasFocus(int aCanvasHasFocus) {

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

 	}

 

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

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

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

 	}

 

@@ -247,11 +247,11 @@ public class nsIDocShell_1_8 extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 44, getAddress(), aLoadType);

 	}

 

-	public int IsBeingDestroyed(boolean[] _retval) {

+	public int IsBeingDestroyed(int[] _retval) {

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

 	}

 

-	public int GetIsExecutingOnLoadHandler(boolean[] aIsExecutingOnLoadHandler) {

+	public int GetIsExecutingOnLoadHandler(int[] aIsExecutingOnLoadHandler) {

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

 	}

 

@@ -263,7 +263,7 @@ public class nsIDocShell_1_8 extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 48, getAddress(), aLayoutHistoryState);

 	}

 

-	public int GetShouldSaveLayoutState(boolean[] aShouldSaveLayoutState) {

+	public int GetShouldSaveLayoutState(int[] aShouldSaveLayoutState) {

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

 	}

 

@@ -283,7 +283,7 @@ public class nsIDocShell_1_8 extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 53, getAddress());

 	}

 

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

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

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

 	}

 

@@ -291,15 +291,15 @@ public class nsIDocShell_1_8 extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 55, getAddress());

 	}

 

-	public int GetRestoringDocument(boolean[] aRestoringDocument) {

+	public int GetRestoringDocument(int[] aRestoringDocument) {

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

 	}

 

-	public int GetUseErrorPages(boolean[] aUseErrorPages) {

+	public int GetUseErrorPages(int[] aUseErrorPages) {

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

 	}

 

-	public int SetUseErrorPages(boolean aUseErrorPages) {

+	public int SetUseErrorPages(int aUseErrorPages) {

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

 	}

 

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
index 00017e406e..d5270ff312 100644
--- 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
@@ -1,345 +1,347 @@
-/* ***** 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) 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 =
-		"4b00222a-8d0a-46d7-a1fe-43bd89d19324";
-
-	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, boolean 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 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, boolean 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(boolean 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(boolean[] aAllowPlugins) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aAllowPlugins);
-	}
-
-	public int SetAllowPlugins(boolean aAllowPlugins) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aAllowPlugins);
-	}
-
-	public int GetAllowJavascript(boolean[] aAllowJavascript) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aAllowJavascript);
-	}
-
-	public int SetAllowJavascript(boolean aAllowJavascript) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), aAllowJavascript);
-	}
-
-	public int GetAllowMetaRedirects(boolean[] aAllowMetaRedirects) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), aAllowMetaRedirects);
-	}
-
-	public int SetAllowMetaRedirects(boolean aAllowMetaRedirects) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), aAllowMetaRedirects);
-	}
-
-	public int GetAllowSubframes(boolean[] aAllowSubframes) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), aAllowSubframes);
-	}
-
-	public int SetAllowSubframes(boolean aAllowSubframes) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), aAllowSubframes);
-	}
-
-	public int GetAllowImages(boolean[] aAllowImages) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), aAllowImages);
-	}
-
-	public int SetAllowImages(boolean 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(boolean[] aAllowAuth) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 29, getAddress(), aAllowAuth);
-	}
-
-	public int SetAllowAuth(boolean 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(boolean[] aHasFocus) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 37, getAddress(), aHasFocus);
-	}
-
-	public int SetHasFocus(boolean aHasFocus) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 38, getAddress(), aHasFocus);
-	}
-
-	public int GetCanvasHasFocus(boolean[] aCanvasHasFocus) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 39, getAddress(), aCanvasHasFocus);
-	}
-
-	public int SetCanvasHasFocus(boolean aCanvasHasFocus) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 40, getAddress(), aCanvasHasFocus);
-	}
-
-	public int TabToTreeOwner(boolean forward, boolean[] 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(boolean[] _retval) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 45, getAddress(), _retval);
-	}
-
-	public int GetIsExecutingOnLoadHandler(boolean[] 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(boolean[] 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, boolean 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(boolean[] aRestoringDocument) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 56, getAddress(), aRestoringDocument);
-	}
-
-	public int GetUseErrorPages(boolean[] aUseErrorPages) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 57, getAddress(), aUseErrorPages);
-	}
-
-	public int SetUseErrorPages(boolean 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(boolean[] aIsInUnload) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 66, getAddress(), aIsInUnload);
-	}
-
-	public int GetChannelIsUnsafe(boolean[] aChannelIsUnsafe) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 67, getAddress(), aChannelIsUnsafe);
-	}
-}
+/* ***** 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 =

+		"4b00222a-8d0a-46d7-a1fe-43bd89d19324";

+

+	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 24bf668e43..b036ae6123 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, 2005 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(boolean[] aVisibility) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aVisibility);
-	}
-
-	public int SetVisibility(boolean 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);
-	}
+/* ***** 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
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 224191dcbb..5e6f2d485c 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, 2005 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(boolean lock) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), lock);
-	}
+/* ***** 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
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 2bd9d08238..0897111404 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, 2005 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(boolean 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(boolean[] _retval) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 31, getAddress(), _retval);
-	}
-
-	public int IsWritable(boolean[] _retval) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 32, getAddress(), _retval);
-	}
-
-	public int IsReadable(boolean[] _retval) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 33, getAddress(), _retval);
-	}
-
-	public int IsExecutable(boolean[] _retval) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 34, getAddress(), _retval);
-	}
-
-	public int IsHidden(boolean[] _retval) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 35, getAddress(), _retval);
-	}
-
-	public int IsDirectory(boolean[] _retval) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 36, getAddress(), _retval);
-	}
-
-	public int IsFile(boolean[] _retval) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 37, getAddress(), _retval);
-	}
-
-	public int IsSymlink(boolean[] _retval) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 38, getAddress(), _retval);
-	}
-
-	public int IsSpecial(boolean[] _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, boolean[] _retval) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 42, getAddress(), inFile, _retval);
-	}
-
-	public int Contains(int /*long*/ inFile, boolean recur, boolean[] _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);
-	}
+/* ***** 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
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 b4f8237847..383669b973 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) 2004, 2005 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, boolean aRememberThisPreference) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aNewFileLocation, aRememberThisPreference);
-	}
-
-	public int LaunchWithApplication(int /*long*/ aApplication, boolean 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);
-	}
+/* ***** 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
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 8d3a337e78..1bb57c93a8 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 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, boolean aRememberThisPreference) {
-		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 4, getAddress(), aNewFileLocation, aRememberThisPreference);
-	}
-
-	public int LaunchWithApplication(int /*long*/ aApplication, boolean 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);
-	}
-}
+/* ***** 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
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 73ead293bc..eea409441c 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) 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, boolean aRememberThisPreference) {
-		return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 4, getAddress(), aNewFileLocation, aRememberThisPreference);
-	}
-
-	public int LaunchWithApplication(int /*long*/ aApplication, boolean 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(boolean[] 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);
-	}
-}
+/* ***** 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
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 ad377b3f08..961bdd8e92 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, 2005 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(boolean[] aOffline) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aOffline);
-	}
-
-	public int SetOffline(boolean aOffline) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aOffline);
-	}
-
-	public int AllowPort(int aPort, byte[] aScheme, boolean[] _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);
-	}
+/* ***** 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
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 f95ef69c66..49dbe03b45 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, 2005 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(boolean[] _retval) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), _retval);
-	}
+/* ***** 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
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 1f13be9820..39f7200a72 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, 2005 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(boolean[] aFollowLinks) {
-		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 4, getAddress(), aFollowLinks);
-	}
-
-	public int SetFollowLinks(boolean 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);
-	}
+/* ***** 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
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 99e9f2e4c4..4ff830a983 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, 2005 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(boolean immediate) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), immediate);
-	}
-
-	public int IsLowMemory(boolean[] _retval) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), _retval);
-	}
+/* ***** 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
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 de12a8c00d..61fd23fa47 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 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, boolean 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);
-	}
-}
+/* ***** 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
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 3cf5e5e9f3..a55aff5009 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) 2006 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, boolean[] _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, boolean[] _retval) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aPrefName, _retval);
-	}
-
-	public int PrefIsLocked(byte[] aPrefName, boolean[] _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);
-	}
-}
+	}

+

+	public int ResetBranch(byte[] aStartingAt) {

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

+	}

+}
\ No newline at end of file
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 4e803575a2..b9d3ab64af 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) 2004, 2005 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(boolean[] aCancelDownloadOnClose) {
-		return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 2, getAddress(), aCancelDownloadOnClose);
-	}
-
-	public int SetCancelDownloadOnClose(boolean 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);
-	}
+/* ***** 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
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 05fab1f7a8..75d23973f5 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 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(boolean[] aCancelDownloadOnClose) {
-		return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 2, getAddress(), aCancelDownloadOnClose);
-	}
-
-	public int SetCancelDownloadOnClose(boolean 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);
-	}
+

+	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
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 fd96140900..56192d7701 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
@@ -22,7 +22,7 @@
  *

  * IBM

  * -  Binding to permit interfacing between Mozilla and SWT

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

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

  *

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

 package org.eclipse.swt.internal.mozilla;

@@ -45,15 +45,15 @@ public class nsIPromptService extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aParent, aDialogTitle, aText);

 	}

 

-	public int AlertCheck(int /*long*/ aParent, char[] aDialogTitle, char[] aText, char[] aCheckMsg, boolean[] aCheckState) {

+	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, boolean[] _retval) {

+	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, boolean[] aCheckState, boolean[] _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);

 	}

 

@@ -90,24 +90,24 @@ public class nsIPromptService extends nsISupports {
 	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, boolean[] aCheckState, int[] _retval) {

+	

+	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, boolean[] aCheckState, boolean[] _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, boolean[] aCheckState, boolean[] _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, boolean[] aCheckState, boolean[] _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, boolean[] _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
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 ed88556185..d740e487d3 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) 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, boolean[] checkValue, boolean[] _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, boolean[] checkValue, int /*long*/[] _retval) {
-		return XPCOM.VtblCall(nsIPromptService.LAST_METHOD_ID + 2, getAddress(), aParent, aChannel, aCallback, aContext, level, authInfo, checkboxLabel, checkValue, _retval);
-	}
-}
+/* ***** 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
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 0e4e345cd5..e85449501e 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 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, boolean[] _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 fe2d1e11ad..31c9403d50 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, 2005 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(boolean[] _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;
-}
+		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
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 b3708cf0b9..9a09f904c0 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, 2005 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, boolean[] _retval) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aClass, aIID, _retval);
-	}
-
-	public int IsServiceInstantiatedByContractID(byte[] aContractID, nsID aIID, boolean[] _retval) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aContractID, aIID, _retval);
-	}
+/* ***** 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
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 66ee3f19de..0052864915 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) 2005 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(boolean[] _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);
-	}
-}
+/* ***** 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
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 c141bd370a..773db9a999 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, 2005 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, boolean[] _retval) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), other, _retval);
-	}
-
-	public int SchemeIs(byte[] scheme, boolean[] _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);
-	}
+/* ***** 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
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 b5918f51a6..ca9a72204d 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, 2005 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, boolean[] _retval) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aURI, _retval);
-	}
-
-	public int DoContent(byte[] aContentType, boolean aIsContentPreferred, int /*long*/ aRequest, int /*long*/[] aContentHandler, boolean[] _retval) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aContentType, aIsContentPreferred, aRequest, aContentHandler, _retval);
-	}
-
-	public int IsPreferred(byte[] aContentType, int /*long*/[] aDesiredContentType, boolean[] _retval) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aContentType, aDesiredContentType, _retval);
-	}
-
-	public int CanHandleContent(byte[] aContentType, boolean aIsContentPreferred, int /*long*/[] aDesiredContentType, boolean[] _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);
-	}
+/* ***** 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
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 afa01bf72f..140d7b5a75 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, 2005 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(boolean[] _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);
-	}
+

+	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
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 6a9b7f1fd9..a22736f7e4 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, 2005 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(boolean[] aCanGoBack) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aCanGoBack);
-	}
-
-	public int GetCanGoForward(boolean[] 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);
-	}
+/* ***** 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
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 c7f4eab77e..d211bf56e8 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, 2005 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(boolean[] aIsLoadingDocument) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aIsLoadingDocument);
-	}
+/* ***** 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
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 65bf318a16..be5282079c 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, 2005 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, boolean[] cancel, int /*long*/[] _retval) {
-		return XPCOM.VtblCall(nsIWindowCreator.LAST_METHOD_ID + 1, getAddress(), parent, chromeFlags, contextFlags, uri, cancel, _retval);
-	}
-}
+/* ***** 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