Mercurial > projects > dwt-mac
diff dwt/browser/SimpleEnumerator.d @ 125:5583f8eeee6c
Synced mozilla with dwt-linux
author | Jacob Carlborg <doob@me.com> |
---|---|
date | Fri, 16 Jan 2009 12:49:08 +0100 |
parents | d8635bb48c7c |
children |
line wrap: on
line diff
--- a/dwt/browser/SimpleEnumerator.d Fri Jan 16 12:19:08 2009 +0100 +++ b/dwt/browser/SimpleEnumerator.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,21 +7,22 @@ * * Contributors: * IBM Corporation - initial API and implementation + * Port to the D programming language: + * John Reimer <terminal.node@gmail.com> *******************************************************************************/ module dwt.browser.SimpleEnumerator; -import dwt.dwthelper.utils; +//import dwt.dwthelper.utils; -import dwt.internal.C; -import dwt.internal.mozilla.XPCOM; -import dwt.internal.mozilla.XPCOMObject; +//import dwt.internal.C; +import XPCOM = dwt.internal.mozilla.XPCOM; + +import dwt.internal.mozilla.Common; import dwt.internal.mozilla.nsID; import dwt.internal.mozilla.nsISimpleEnumerator; import dwt.internal.mozilla.nsISupports; -class SimpleEnumerator { - XPCOMObject supports; - XPCOMObject simpleEnumerator; +class SimpleEnumerator : nsISimpleEnumerator{ int refCount = 0; nsISupports[] values; int index = 0; @@ -31,89 +32,55 @@ for (int i = 0; i < values.length; i++) { values[i].AddRef (); } - createCOMInterfaces (); } -int AddRef () { +extern(System) +nsrefcnt AddRef () { refCount++; return refCount; } -void createCOMInterfaces () { - /* Create each of the interfaces that this object implements */ - supports = new XPCOMObject (new int[] {2, 0, 0}) { - 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 ();} - }; - - simpleEnumerator = new XPCOMObject (new int[] {2, 0, 0, 1, 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 HasMoreElements (args[0]);} - public int /*long*/ method4 (int /*long*/[] args) {return GetNext (args[0]);} - }; -} +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); -void disposeCOMInterfaces () { - if (supports !is null) { - supports.dispose (); - supports = null; - } - if (simpleEnumerator !is null) { - simpleEnumerator.dispose (); - simpleEnumerator = null; - } - if (values !is null) { - for (int i = 0; i < values.length; i++) { - values[i].Release (); - } - values = null; - } -} - -int /*long*/ getAddress () { - return simpleEnumerator.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); - - if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) { - XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF); + if (*riid == nsISupports.IID) { + *ppvObject = cast(void*)cast(nsISupports)this; AddRef (); return XPCOM.NS_OK; } - if (guid.Equals (nsISimpleEnumerator.NS_ISIMPLEENUMERATOR_IID)) { - XPCOM.memmove (ppvObject, new int /*long*/[] {simpleEnumerator.getAddress ()}, C.PTR_SIZEOF); + if (*riid == nsISimpleEnumerator.IID) { + *ppvObject = cast(void*)cast(nsISimpleEnumerator)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) +nsresult Release () { refCount--; - if (refCount is 0) disposeCOMInterfaces (); + //if (refCount is 0) disposeCOMInterfaces (); return refCount; } -int HasMoreElements (int /*long*/ _retval) { +extern(System) +nsresult HasMoreElements (PRBool* _retval) { bool more = values !is null && index < values.length; - XPCOM.memmove (_retval, new int[] {more ? 1 : 0}, 4); /*PRBool */ + *_retval = more ? 1 : 0; /*PRBool */ return XPCOM.NS_OK; -} - -int GetNext (int /*long*/ _retval) { +} + +extern(System) +nsresult GetNext (nsISupports* _retval) { if (values is null || index is values.length) return XPCOM.NS_ERROR_UNEXPECTED; nsISupports value = values[index++]; value.AddRef (); - XPCOM.memmove (_retval, new int /*long*/[] {value.getAddress ()}, C.PTR_SIZEOF); + *_retval = value; return XPCOM.NS_OK; } }