1 files changed, 49 insertions, 29 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrincipal.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrincipal.java
index 4486b3cb27..dd55e933a3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrincipal.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrincipal.java
@@ -27,26 +27,31 @@
  * ***** END LICENSE BLOCK ***** */
 package org.eclipse.swt.internal.mozilla;
 
-public class  nsIPrincipal extends nsISerializable {
+import org.eclipse.swt.internal.ole.win32.COM;
 
-	static final int LAST_METHOD_ID = nsISerializable.LAST_METHOD_ID + 26;
+public class nsIPrincipal extends nsISerializable {
+
+	static final int LAST_METHOD_ID = nsISerializable.LAST_METHOD_ID + (Is8 ? 26 : 23);
 
 	public static final String NS_IPRINCIPAL_IID_STR =
-		"b406a2db-e547-4c95-b8e2-ad09ecb54ce0";
+		"b8268b9a-2403-44ed-81e3-614075c92034";
 
 	public static final nsID NS_IPRINCIPAL_IID =
 		new nsID(NS_IPRINCIPAL_IID_STR);
 
-	public  nsIPrincipal(int /*long*/ address) {
+	public static final String NS_IPRINCIPAL_8_IID_STR =
+		"b406a2db-e547-4c95-b8e2-ad09ecb54ce0";
+
+	public static final nsID NS_IPRINCIPAL_8_IID =
+		new nsID(NS_IPRINCIPAL_8_IID_STR);
+
+	public nsIPrincipal(int /*long*/ address) {
 		super(address);
 	}
 
 	public static final int ENABLE_DENIED = 1;
-
 	public static final int ENABLE_UNKNOWN = 2;
-
 	public static final int ENABLE_WITH_USER_PERMISSION = 3;
-
 	public static final int ENABLE_GRANTED = 4;
 
 	public int GetPreferences(int /*long*/[] prefBranch, int /*long*/[] id, int /*long*/[] subjectName, int /*long*/[] grantedList, int /*long*/[] deniedList, int[] isTrusted) {
@@ -57,87 +62,102 @@ public class  nsIPrincipal extends nsISerializable {
 		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 2, getAddress(), other, _retval);
 	}
 
+	public int EqualsIgnoringDomain(int /*long*/ other, int[] _retval) {
+		if (!Is8) return COM.S_FALSE;
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 3, getAddress(), other, _retval);
+	}
+
 	public int GetHashValue(int[] aHashValue) {
-		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 4, getAddress(), aHashValue);
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (Is8 ? 4 : 3), getAddress(), aHashValue);
 	}
 
 	public int GetJSPrincipals(int /*long*/ cx, int /*long*/[] _retval) {
-		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 5, getAddress(), cx, _retval);
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (Is8 ? 5 : 4), getAddress(), cx, _retval);
 	}
 
 	public int GetSecurityPolicy(int /*long*/[] aSecurityPolicy) {
-		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 6, getAddress(), aSecurityPolicy);
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (Is8 ? 6 : 5), getAddress(), aSecurityPolicy);
 	}
 
 	public int SetSecurityPolicy(int /*long*/ aSecurityPolicy) {
-		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 7, getAddress(), aSecurityPolicy);
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (Is8 ? 7 : 6), getAddress(), aSecurityPolicy);
 	}
 
 	public int CanEnableCapability(byte[] capability, int /*long*/ _retval) {
-		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 8, getAddress(), capability, _retval);
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (Is8 ? 8 : 7), getAddress(), capability, _retval);
 	}
 
 	public int SetCanEnableCapability(byte[] capability, short canEnable) {
-		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 9, getAddress(), capability, canEnable);
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (Is8 ? 9 : 8), getAddress(), capability, canEnable);
 	}
 
 	public int IsCapabilityEnabled(byte[] capability, int /*long*/ annotation, int[] _retval) {
-		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 10, getAddress(), capability, annotation, _retval);
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (Is8 ? 10 : 9), getAddress(), capability, annotation, _retval);
 	}
 
 	public int EnableCapability(byte[] capability, int /*long*/[] annotation) {
-		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 11, getAddress(), capability, annotation);
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (Is8 ? 11 : 10), getAddress(), capability, annotation);
 	}
 
 	public int RevertCapability(byte[] capability, int /*long*/[] annotation) {
-		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 12, getAddress(), capability, annotation);
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (Is8 ? 12 : 11), getAddress(), capability, annotation);
 	}
 
 	public int DisableCapability(byte[] capability, int /*long*/[] annotation) {
-		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 13, getAddress(), capability, annotation);
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (Is8 ? 13 : 12), getAddress(), capability, annotation);
 	}
 
 	public int GetURI(int /*long*/[] aURI) {
-		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 14, getAddress(), aURI);
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (Is8 ? 14 : 13), getAddress(), aURI);
 	}
 
 	public int GetDomain(int /*long*/[] aDomain) {
-		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 15, getAddress(), aDomain);
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (Is8 ? 15 : 14), getAddress(), aDomain);
 	}
 
 	public int SetDomain(int /*long*/ aDomain) {
-		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 16, getAddress(), aDomain);
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (Is8 ? 16 : 15), getAddress(), aDomain);
 	}
 
 	public int GetOrigin(int /*long*/[] aOrigin) {
-		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 17, getAddress(), aOrigin);
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (Is8 ? 17 : 16), getAddress(), aOrigin);
 	}
 
 	public int GetHasCertificate(int[] aHasCertificate) {
-		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 18, getAddress(), aHasCertificate);
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (Is8 ? 18 : 17), getAddress(), aHasCertificate);
 	}
 
 	public int GetFingerprint(int /*long*/ aFingerprint) {
-		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 19, getAddress(), aFingerprint);
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (Is8 ? 19 : 18), getAddress(), aFingerprint);
 	}
 
 	public int GetPrettyName(int /*long*/ aPrettyName) {
-		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 20, getAddress(), aPrettyName);
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (Is8 ? 20 : 19), getAddress(), aPrettyName);
 	}
 
 	public int Subsumes(int /*long*/ other, int[] _retval) {
-		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 21, getAddress(), other, _retval);
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (Is8 ? 21 : 20), getAddress(), other, _retval);
 	}
 
 	public int CheckMayLoad(int /*long*/ uri, int report) {
-		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 22, getAddress(), uri, report);
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (Is8 ? 22 : 21), getAddress(), uri, report);
 	}
 
 	public int GetSubjectName(int /*long*/ aSubjectName) {
-		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 23, getAddress(), aSubjectName);
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (Is8 ? 23 : 22), getAddress(), aSubjectName);
 	}
 
 	public int GetCertificate(int /*long*/[] aCertificate) {
-		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 24, getAddress(), aCertificate);
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (Is8 ? 24 : 23), getAddress(), aCertificate);
+	}
+	
+	public int GetCsp(int /*long*/[] aCsp) {
+		if (!Is8) return COM.S_FALSE;
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 25, getAddress(), aCsp);
+	}
+
+	public int SetCsp(int /*long*/ aCsp) {
+		if (!Is8) return COM.S_FALSE;
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 26, getAddress(), aCsp);
 	}
-}
\ No newline at end of file
+}