--- a/dwt/internal/mozilla/nsIMemory.d	Fri Jan 16 12:19:08 2009 +0100
+++ b/dwt/internal/mozilla/nsIMemory.d	Fri Jan 16 12:49:08 2009 +0100
@@ -1,65 +1,24 @@
-/* ***** 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.nsIMemory;
 
-import dwt.dwthelper.utils;
-
-public class nsIMemory extends nsISupports {
-
-    static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 5;
+import dwt.internal.mozilla.Common;
+import dwt.internal.mozilla.nsID;
+import dwt.internal.mozilla.nsISupports;
 
-    public static final String NS_IMEMORY_IID_STR =
-        "59e7e77a-38e4-11d4-8cf5-0060b0fc14a3";
+const char[] 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);
-    }
+const nsIID NS_IMEMORY_IID= 
+  {0x59e7e77a, 0x38e4, 0x11d4, 
+    [ 0x8c, 0xf5, 0x00, 0x60, 0xb0, 0xfc, 0x14, 0xa3 ]};
 
-    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);
-    }
+interface nsIMemory : nsISupports {
+  static const char[] IID_STR = NS_IMEMORY_IID_STR;
+  static const nsIID IID = NS_IMEMORY_IID;
+  
+extern(System):
+  void *    Alloc(size_t size);
+  void *    Realloc(void * ptr, size_t newSize);
+  void      Free(void * ptr);
+  nsresult  HeapMinimize(PRBool immediate);
+  nsresult  IsLowMemory(PRBool *_retval);
+}
 
-    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);
-    }
-}