--- a/dwt/internal/mozilla/nsICookie.d	Fri Jan 16 12:19:08 2009 +0100
+++ b/dwt/internal/mozilla/nsICookie.d	Fri Jan 16 12:49:08 2009 +0100
@@ -1,103 +1,48 @@
-/* ***** 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 DWT
- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
 module dwt.internal.mozilla.nsICookie;
 
-import dwt.dwthelper.utils;
-
-public class nsICookie extends nsISupports {
-
-    static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 9;
+import dwt.internal.mozilla.Common;
+import dwt.internal.mozilla.nsID;
+import dwt.internal.mozilla.nsISupports;
+import dwt.internal.mozilla.nsStringAPI;
 
-    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);
-    }
+alias PRInt32 nsCookieStatus;
+alias PRInt32 nsCookiePolicy;
 
-    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);
-    }
+const char[] NS_ICOOKIE_IID_STR = "e9fcb9a4-d376-458f-b720-e65e7df593bc";
 
-    public int GetIsDomain(int[] aIsDomain) {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aIsDomain);
-    }
+const nsIID NS_ICOOKIE_IID= 
+  {0xe9fcb9a4, 0xd376, 0x458f, 
+    [ 0xb7, 0x20, 0xe6, 0x5e, 0x7d, 0xf5, 0x93, 0xbc ]};
 
-    public int GetHost(int /*long*/ aHost) {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aHost);
-    }
+interface nsICookie : nsISupports {
 
-    public int GetPath(int /*long*/ aPath) {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aPath);
-    }
+  static const char[] IID_STR = NS_ICOOKIE_IID_STR;
+  static const nsIID IID = NS_ICOOKIE_IID;
 
-    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;
+extern(System):
+  nsresult GetName(nsACString * aName);
+  nsresult GetValue(nsACString * aValue);
+  nsresult GetIsDomain(PRBool *aIsDomain);
+  nsresult GetHost(nsACString * aHost);
+  nsresult GetPath(nsACString * aPath);
+  nsresult GetIsSecure(PRBool *aIsSecure);
+  nsresult GetExpires(PRUint64 *aExpires);
 
-    public int GetStatus(int /*long*/ aStatus) {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aStatus);
-    }
+  enum { STATUS_UNKNOWN = 0 };
+  enum { STATUS_ACCEPTED = 1 };
+  enum { STATUS_DOWNGRADED = 2 };
+  enum { STATUS_FLAGGED = 3 };
+  enum { STATUS_REJECTED = 4 };
 
-    public static final int POLICY_UNKNOWN = 0;
-
-    public static final int POLICY_NONE = 1;
-
-    public static final int POLICY_NO_CONSENT = 2;
+  nsresult GetStatus(nsCookieStatus *aStatus);
 
-    public static final int POLICY_IMPLICIT_CONSENT = 3;
-
-    public static final int POLICY_EXPLICIT_CONSENT = 4;
+  enum { POLICY_UNKNOWN = 0 };
+  enum { POLICY_NONE = 1 };
+  enum { POLICY_NO_CONSENT = 2 };
+  enum { POLICY_IMPLICIT_CONSENT = 3 };
+  enum { POLICY_EXPLICIT_CONSENT = 4 };
+  enum { POLICY_NO_II = 5 };
 
-    public static final int POLICY_NO_II = 5;
+  nsresult GetPolicy(nsCookiePolicy *aPolicy);
+}
 
-    public int GetPolicy(int /*long*/ aPolicy) {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPolicy);
-    }
-}