--- a/dwt/internal/mozilla/nsILocalFile.d	Fri Jan 16 12:19:08 2009 +0100
+++ b/dwt/internal/mozilla/nsILocalFile.d	Fri Jan 16 12:49:08 2009 +0100
@@ -1,113 +1,43 @@
-/* ***** 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.nsILocalFile;
 
-import dwt.dwthelper.utils;
-
-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";
+import dwt.internal.mozilla.Common;
+import dwt.internal.mozilla.prlink;
+import dwt.internal.mozilla.prio;
+import dwt.internal.mozilla.prtime;
+import dwt.internal.mozilla.nsID;
+import dwt.internal.mozilla.nsIFile;
+import dwt.internal.mozilla.nsStringAPI;
 
-    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);
-    }
+import tango.stdc.stdio : FILE;
 
-    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);
-    }
+const char[] NS_ILOCALFILE_IID_STR = "aa610f20-a889-11d3-8c81-000064657374";
 
-    public int GetFollowLinks(int[] aFollowLinks) {
-        return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 4, getAddress(), aFollowLinks);
-    }
+const nsIID NS_ILOCALFILE_IID= 
+  {0xaa610f20, 0xa889, 0x11d3, 
+    [ 0x8c, 0x81, 0x00, 0x00, 0x64, 0x65, 0x73, 0x74 ]};
 
-    public int SetFollowLinks(int aFollowLinks) {
-        return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 5, getAddress(), aFollowLinks);
-    }
+interface nsILocalFile : nsIFile {
 
-    public int OpenNSPRFileDesc(int flags, int mode, int /*long*/[] _retval) {
-        return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 6, getAddress(), flags, mode, _retval);
-    }
+    static const char[] IID_STR = NS_ILOCALFILE_IID_STR;
+    static const nsIID IID = NS_ILOCALFILE_IID;
 
-    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);
-    }
+extern(System):
+    nsresult InitWithPath(nsAString * filePath);
+    nsresult InitWithNativePath(nsACString * filePath);
+    nsresult InitWithFile(nsILocalFile aFile);
+    nsresult GetFollowLinks(PRBool *aFollowLinks);
+    nsresult SetFollowLinks(PRBool aFollowLinks);
+    nsresult OpenNSPRFileDesc(PRInt32 flags, PRInt32 mode, PRFileDesc * *_retval);
+    nsresult OpenANSIFileDesc(char *mode, FILE * *_retval);
+    nsresult Load(PRLibrary * *_retval);
+    nsresult GetDiskSpaceAvailable(PRInt64 *aDiskSpaceAvailable);
+    nsresult AppendRelativePath(nsAString * relativeFilePath);
+    nsresult AppendRelativeNativePath(nsACString * relativeFilePath);
+    nsresult GetPersistentDescriptor(nsACString * aPersistentDescriptor);
+    nsresult SetPersistentDescriptor(nsACString * aPersistentDescriptor);
+    nsresult Reveal();
+    nsresult Launch();
+    nsresult GetRelativeDescriptor(nsILocalFile fromFile, nsACString * _retval);
+    nsresult SetRelativeDescriptor(nsILocalFile fromFile, nsACString * relativeDesc);
+}
 
-    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);
-    }
-}