Mercurial > projects > dwt-linux
diff dwt/browser/InputStream.d @ 298:eec6ddb07873
More xpcom/mozilla port
author | John Reimer<terminal.node@gmail.com> |
---|---|
date | Sun, 10 Aug 2008 22:25:43 -0700 |
parents | 44258e0b6687 |
children | 942da4b6558a |
line wrap: on
line diff
--- a/dwt/browser/InputStream.d Fri Aug 08 15:25:08 2008 +0200 +++ b/dwt/browser/InputStream.d Sun Aug 10 22:25:43 2008 -0700 @@ -7,36 +7,39 @@ * * 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.C; import dwt.internal.mozilla.XPCOM; -import dwt.internal.mozilla.XPCOMObject; +//import dwt.internal.mozilla.XPCOMObject; import dwt.internal.mozilla.nsID; import dwt.internal.mozilla.nsIInputStream; import dwt.internal.mozilla.nsISupports; -class InputStream { - XPCOMObject inputStream; +class InputStream : nsIInputStream { + //XPCOMObject inputStream; int refCount = 0; byte[] buffer; int index = 0; -InputStream (byte[] buffer) { +this (byte[] buffer) { this.buffer = buffer; index = 0; - createCOMInterfaces (); + //createCOMInterfaces (); } -int AddRef () { +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}) { @@ -61,75 +64,80 @@ 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); ++/ +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 () { +nsrefcnt Release () { refCount--; - if (refCount is 0) disposeCOMInterfaces (); + //if (refCount is 0) disposeCOMInterfaces (); return refCount; } /* nsIInputStream implementation */ -int Close () { +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); +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) { +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) { +nsresult ReadSegments (nsWriteSegFun 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 = aWrite (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) { +nsresult IsNonBlocking (PRUint32* _retval) { /* blocking */ - XPCOM.memmove (_retval, new int[] {0}, 4); + *_retval = 0; return XPCOM.NS_OK; } }