--- a/dwt/browser/InputStream.d	Thu Jul 31 21:56:03 2008 -0700
+++ b/dwt/browser/InputStream.d	Tue Aug 05 10:11:58 2008 -0700
@@ -7,171 +7,129 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
- * Port to the D programming language:
- *     John Reimer <terminal.node@gmail.com>
  *******************************************************************************/
-
 module dwt.browser.InputStream;
 
 import dwt.dwthelper.utils;
 
-import dwt.internal.mozilla.nsError;
+import dwt.internal.C;
+import dwt.internal.mozilla.XPCOM;
+import dwt.internal.mozilla.XPCOMObject;
 import dwt.internal.mozilla.nsID;
 import dwt.internal.mozilla.nsIInputStream;
 import dwt.internal.mozilla.nsISupports;
 
-import Math = tango.math.Math;
-
-/******************************************************************************
-
-    COMMENTS: SWT implements this class as a replacement for the XPCOM 
-    implementation; it may be possible to use the XPCOM one instead 
-    (which also may be safer for D), but for now we'll follow SWT's example 
-    and use this reimplementation of InputStream. It should be trivial to
-    move over to strict XPCOM implementation should the need arise. It appears 
-    that the Java SWT source uses many workarounds in order to use the XPCOM 
-    interface. For D, I remove much of the Java layered callback
-    approach since it is no longer necessary.  -JJR
-
-******************************************************************************/
+class InputStream {
+    XPCOMObject inputStream;
+    int refCount = 0;
 
-class InputStream : nsIInputStream
-{
-    int     _refCount = 0;
-    int     _index     = 0;
-    byte[]  _buffer;
-
-    /**************************************************************************
-
-    **************************************************************************/
+    byte[] buffer;
+    int index = 0;
+    
+InputStream (byte[] buffer) {
+    this.buffer = buffer;
+    index = 0;
+    createCOMInterfaces ();
+}
 
-    this (byte[] buffer) 
-    {
-        this._buffer = buffer;
-        index = 0;
-    }
-
-    /**************************************************************************
-
-    **************************************************************************/
+int AddRef () {
+    refCount++;
+    return refCount;
+}
 
-    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], (int)/*64*/args[1], args[2]);}
+        public int /*long*/ method6 (int /*long*/[] args) {return ReadSegments (args[0], args[1], (int)/*64*/args[2], args[3]);}
+        public int /*long*/ method7 (int /*long*/[] args) {return IsNonBlocking (args[0]);}
+    };
+}
 
-    nsresult QueryInterface ( inout nsID riid, void** ppvObject) 
-    {
-        if (riid is null || ppvObject is null) 
-            return NS_ERROR_NO_INTERFACE;
-        
-        nsID guid = riid;
-    
-        if (guid == nsISupports.NS_ISUPPORTS_IID) 
-        {
-            *ppvObject = cast(void*)cast(nsISupports) this;
-            this.AddRef ();
-            return NS_OK;
-        }
+void disposeCOMInterfaces () {
+    if (inputStream !is null) {
+        inputStream.dispose ();
+        inputStream = null; 
+    }
+}
 
-        if (guid == nsIInputStream.NS_IINPUTSTREAM_IID) 
-        {
-            *ppvObject = cast(void*)cast(nsIInputStream) this;
-            this.AddRef ();
-            return NS_OK;
-        }   
-    
-        *ppvObject = null;
-        return NS_ERROR_NO_INTERFACE;
-    }
-
-    /**************************************************************************
-
-    **************************************************************************/
+int /*long*/ getAddress () {
+    return inputStream.getAddress ();
+}
 
-    nsrefcnt Release () 
-    {
-        _refCount--;
-        if (_refCount is 0) 
-            return 0 
-           // delete this;
-        return _refCount;
+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);
+    
+    if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) {
+        XPCOM.memmove (ppvObject, new int /*long*/[] {inputStream.getAddress ()}, C.PTR_SIZEOF);
+        AddRef ();
+        return XPCOM.NS_OK;
     }
+    if (guid.Equals (nsIInputStream.NS_IINPUTSTREAM_IID)) {
+        XPCOM.memmove (ppvObject, new int /*long*/[] {inputStream.getAddress ()}, C.PTR_SIZEOF);
+        AddRef ();
+        return XPCOM.NS_OK;
+    }   
+    XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
+    return XPCOM.NS_ERROR_NO_INTERFACE;
+}
+            
+int Release () {
+    refCount--;
+    if (refCount is 0) disposeCOMInterfaces ();
+    return refCount;
+}
     
-    /**************************************************************************
-
-    **************************************************************************/
+/* nsIInputStream implementation */
 
-    nsresult Close () 
-    {
-        _buffer = null;
-        _index = 0;
-        return NS_OK;
-    }
-
-    /**************************************************************************
-
-    **************************************************************************/
-
-    nsresult Available ( PRUint32* retval) 
-    {
-        PRUint32 available = buffer is null ? 0 : buffer.length - _index;
-        *retval = available;
-        return NS_OK;
-    }
-
-    /**************************************************************************
-
-    **************************************************************************/
+int Close () {
+    buffer = null;
+    index = 0;
+    return XPCOM.NS_OK;
+}
 
-    nsresult Read(byte* aBuf, PRUint32 aCount, PRUint32* retval) 
-    {
-        int max = Math.min (aCount, _buffer is null ? 0 : _buffer.length - _index);
-        
-        if (max > 0) 
-        {
-            aBuf[0..max] = _buffer[_index..$];
-            _index += max;
-        }
+int Available (int /*long*/ _retval) {
+    int available = buffer is null ? 0 : buffer.length - index;
+    XPCOM.memmove (_retval, new int[] {available}, 4);
+    return XPCOM.NS_OK;
+}
 
-        *retval = max;
-        return NS_OK;
+int Read(int /*long*/ aBuf, int aCount, int /*long*/ _retval) {
+    int max = Math.min (aCount, buffer is null ? 0 : buffer.length - index);
+    if (max > 0) {
+        byte[] src = new byte[max];
+        System.arraycopy (buffer, index, src, 0, max);
+        XPCOM.memmove (aBuf, src, max);
+        index += max;
     }
-
-    /**************************************************************************
-
-    **************************************************************************/
+    XPCOM.memmove(_retval, new int[] {max}, 4);
+    return XPCOM.NS_OK;
+}
 
-    nsresult ReadSegments (nsWriteSegmentFun aWriter, void* aClosure, PRUint32 aCount, PRUint32*  retval) 
-    {
-        int      max = Math.min (aCount, buffer is null ? 0 : buffer.length - _index);
-        PRUint32 cnt = max;
-        
-        while (cnt > 0) 
-        {
-            PRUint32 aWriteCount;
-            nsresult rc = aWriter ( cast(nsIInputStream)this, aClosure, buffer.ptr, _index, cnt, &aWriteCount);
-            if (rc !is NS_OK) break;
-            _index += aWriteCount;
-            cnt -= aWriteCount;
-        }
+int ReadSegments (int /*long*/ aWriter, int /*long*/ aClosure, int aCount, int /*long*/ _retval) {
+    int max = Math.min (aCount, buffer is null ? 0 : buffer.length - index);
+    int cnt = max;
+    while (cnt > 0) {
+        int[] aWriteCount = new int[1];
+        int /*long*/ rc = XPCOM.Call (aWriter, getAddress (), aClosure, buffer, index, cnt, aWriteCount);
+        if (rc !is XPCOM.NS_OK) break;
+        index += aWriteCount[0];
+        cnt -= aWriteCount[0];
+    }
+    XPCOM.memmove (_retval, new int[] {max - cnt}, 4);
+    return XPCOM.NS_OK;
+}
 
-        *retval = (max - cnt);
-        return NS_OK;
-    }
-
-    /**************************************************************************
-
-    **************************************************************************/
-
-    nsresult IsNonBlocking ( PRUint32* retval) 
-    {
-        *retval = 0;
-        return NS_OK;
-    } 
+int IsNonBlocking (int /*long*/ _retval) {
+    /* blocking */
+    XPCOM.memmove (_retval, new int[] {0}, 4);
+    return XPCOM.NS_OK;
+}       
 }