--- a/dwt/browser/InputStream.d	Fri Jan 16 12:19:08 2009 +0100
+++ b/dwt/browser/InputStream.d	Fri Jan 16 12:49:08 2009 +0100
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*******************************************************************************
  * Copyright (c) 2003, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -7,20 +7,23 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ * Port to the D programming language:
+ *      John Reimer <terminal.node@gmail.com>
  *******************************************************************************/
 module dwt.browser.InputStream;
 
+import Math = tango.math.Math;
 import dwt.dwthelper.utils;
 
-import dwt.internal.C;
-import dwt.internal.mozilla.XPCOM;
-import dwt.internal.mozilla.XPCOMObject;
+import XPCOM = dwt.internal.mozilla.XPCOM;
+
 import dwt.internal.mozilla.nsID;
 import dwt.internal.mozilla.nsIInputStream;
 import dwt.internal.mozilla.nsISupports;
+import dwt.internal.mozilla.Common;
 
-class InputStream {
-    XPCOMObject inputStream;
+class InputStream : nsIInputStream {
+    //XPCOMObject inputStream;
     int refCount = 0;
 
     byte[] buffer;
@@ -29,107 +32,94 @@
 this (byte[] buffer) {
     this.buffer = buffer;
     index = 0;
-    createCOMInterfaces ();
 }
 
-int AddRef () {
+extern(System)
+nsrefcnt AddRef () {
     refCount++;
     return refCount;
 }
 
-void createCOMInterfaces () {
-    /* Create each of the interfaces that this object implements */
-    inputStream = new XPCOMObject (new int[] {2, 0, 0, 0, 1, 3, 4, 1}) {
-        public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-        public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-        public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-        public int /*long*/ method3 (int /*long*/[] args) {return Close ();}
-        public int /*long*/ method4 (int /*long*/[] args) {return Available (args[0]);}
-        public int /*long*/ method5 (int /*long*/[] args) {return Read (args[0], cast(int)/*64*/args[1], args[2]);}
-        public int /*long*/ method6 (int /*long*/[] args) {return ReadSegments (args[0], args[1], cast(int)/*64*/args[2], args[3]);}
-        public int /*long*/ method7 (int /*long*/[] args) {return IsNonBlocking (args[0]);}
-    };
-}
-
-void disposeCOMInterfaces () {
-    if (inputStream !is null) {
-        inputStream.dispose ();
-        inputStream = null; 
-    }
-}
-
-int /*long*/ getAddress () {
-    return inputStream.getAddress ();
-}
-
-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
-    if (riid is 0 || ppvObject is 0) return XPCOM.NS_ERROR_NO_INTERFACE;
-    nsID guid = new nsID ();
-    XPCOM.memmove (guid, riid, nsID.sizeof);
+extern(System)
+nsresult QueryInterface (nsID* riid, void** ppvObject) {
+    if (riid is null || ppvObject is null) return XPCOM.NS_ERROR_NO_INTERFACE;
+    //nsID guid = new nsID ();
+    //XPCOM.memmove (guid, riid, nsID.sizeof);
     
-    if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) {
-        XPCOM.memmove (ppvObject, new int /*long*/[] {inputStream.getAddress ()}, C.PTR_SIZEOF);
+    if (*riid == nsISupports.IID) {
+        *ppvObject = cast(void*)cast(nsISupports)this;
         AddRef ();
         return XPCOM.NS_OK;
     }
-    if (guid.Equals (nsIInputStream.NS_IINPUTSTREAM_IID)) {
-        XPCOM.memmove (ppvObject, new int /*long*/[] {inputStream.getAddress ()}, C.PTR_SIZEOF);
+    if (*riid == nsIInputStream.IID) {
+        *ppvObject = cast(void*)cast(nsIInputStream)this;
         AddRef ();
         return XPCOM.NS_OK;
     }   
-    XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
+    *ppvObject = null;
     return XPCOM.NS_ERROR_NO_INTERFACE;
 }
-            
-int Release () {
+
+extern(System)
+nsrefcnt Release () {
     refCount--;
-    if (refCount is 0) disposeCOMInterfaces ();
+    //if (refCount is 0) disposeCOMInterfaces ();
     return refCount;
 }
-    
+
 /* nsIInputStream implementation */
 
-int Close () {
+extern(System)
+nsresult Close () {
     buffer = null;
     index = 0;
     return XPCOM.NS_OK;
 }
 
-int Available (int /*long*/ _retval) {
-    int available = buffer is null ? 0 : buffer.length - index;
-    XPCOM.memmove (_retval, new int[] {available}, 4);
+extern(System)
+nsresult Available (PRUint32* _retval) {
+    PRUint32 available = buffer is null ? 0 : buffer.length - index;
+    *_retval = available;
+    //XPCOM.memmove (_retval, new int[] {available}, 4);
     return XPCOM.NS_OK;
 }
 
-int Read(int /*long*/ aBuf, int aCount, int /*long*/ _retval) {
+extern(System)
+nsresult Read(byte* aBuf, PRUint32 aCount, PRUint32* _retval) {
     int max = Math.min (aCount, buffer is null ? 0 : buffer.length - index);
+    if (aBuf is null)
+        assert(0);
     if (max > 0) {
-        byte[] src = new byte[max];
-        System.arraycopy (buffer, index, src, 0, max);
-        XPCOM.memmove (aBuf, src, max);
+        //byte[] src = new byte[max];
+        //System.arraycopy (buffer, index, src, 0, max);
+        //XPCOM.memmove (aBuf, src, max);
+        aBuf[0..max] = buffer[index..$];
         index += max;
     }
-    XPCOM.memmove(_retval, new int[] {max}, 4);
+    *_retval = max;
     return XPCOM.NS_OK;
 }
 
-int ReadSegments (int /*long*/ aWriter, int /*long*/ aClosure, int aCount, int /*long*/ _retval) {
+extern(System)
+nsresult ReadSegments (nsWriteSegmentFun aWriter, void* aClosure, PRUint32 aCount, PRUint32* _retval) {
     int max = Math.min (aCount, buffer is null ? 0 : buffer.length - index);
-    int cnt = max;
+    PRUint32 cnt = max;
     while (cnt > 0) {
-        int[] aWriteCount = new int[1];
-        int /*long*/ rc = XPCOM.Call (aWriter, getAddress (), aClosure, buffer, index, cnt, aWriteCount);
+        PRUint32 aWriteCount;
+        nsresult rc = aWriter (cast(nsIInputStream)this, aClosure, buffer.ptr, index, cnt, &aWriteCount);
         if (rc !is XPCOM.NS_OK) break;
-        index += aWriteCount[0];
-        cnt -= aWriteCount[0];
+        index += aWriteCount;
+        cnt -= aWriteCount;
     }
-    XPCOM.memmove (_retval, new int[] {max - cnt}, 4);
+    //XPCOM.memmove (_retval, new int[] {max - cnt}, 4);
+    *_retval = (max - cnt);
     return XPCOM.NS_OK;
 }
 
-int IsNonBlocking (int /*long*/ _retval) {
+extern(System)
+nsresult IsNonBlocking (PRBool* _retval) {
     /* blocking */
-    XPCOM.memmove (_retval, new int[] {0}, 4);
+    *_retval = 0;
     return XPCOM.NS_OK;
 }       
 }