--- a/dwt/browser/HelperAppLauncherDialog.d	Fri Jan 16 12:19:08 2009 +0100
+++ b/dwt/browser/HelperAppLauncherDialog.d	Fri Jan 16 12:49:08 2009 +0100
@@ -1,5 +1,5 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
+/*******************************************************************************
+ * 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
  * which accompanies this distribution, and is available at
@@ -7,97 +7,74 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ * Port to the D programming language:
+ *      John Reimer <terminal.node@gmail.com>
  *******************************************************************************/
 module dwt.browser.HelperAppLauncherDialog;
 
 import dwt.dwthelper.utils;
 
+import Utf = tango.text.convert.Utf;
+
 import dwt.DWT;
-import dwt.internal.C;
-import dwt.internal.mozilla.XPCOM;
-import dwt.internal.mozilla.XPCOMObject;
+
+import XPCOM = dwt.internal.mozilla.XPCOM;
+
+import dwt.internal.mozilla.Common;
 import dwt.internal.mozilla.nsEmbedString;
 import dwt.internal.mozilla.nsID;
 import dwt.internal.mozilla.nsIHelperAppLauncher;
 import dwt.internal.mozilla.nsIHelperAppLauncherDialog;
 import dwt.internal.mozilla.nsIHelperAppLauncher_1_8;
 import dwt.internal.mozilla.nsISupports;
+import dwt.internal.mozilla.nsILocalFile;
+import dwt.internal.mozilla.nsStringAPI;
+
+import dwt.browser.Mozilla;
+
 import dwt.widgets.FileDialog;
 import dwt.widgets.Shell;
 
 /**
- * This class implements the nsIHelperAppLauncherDialog interface for mozilla
+ * This class implements the HelperAppLauncherDialog interface for mozilla
  * versions 1.4 - 1.8.x.  For mozilla versions >= 1.9 this interface is
  * implemented by class HelperAppLauncherDialog_1_9.  HelperAppLauncherDialogFactory
  * determines at runtime which of these classes to instantiate. 
  */
-class HelperAppLauncherDialog {
-    XPCOMObject supports;
-    XPCOMObject helperAppLauncherDialog;
+
+class HelperAppLauncherDialog : nsIHelperAppLauncherDialog {
     int refCount = 0;
 
-this () {
-    createCOMInterfaces ();
+this() {
 }
 
-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 ();}
-    };
+extern(System)
+nsresult QueryInterface (nsID* riid, void** ppvObject) {
+    if (riid is null || ppvObject is null) return XPCOM.NS_ERROR_NO_INTERFACE;
     
-    helperAppLauncherDialog = new XPCOMObject (new int[] {2, 0, 0, 3, 5}) {
-        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 Show (args[0], args[1], cast(int)/*64*/args[2]);}
-        public int /*long*/ method4 (int /*long*/[] args) {return PromptForSaveToFile (args[0], args[1], args[2], args[3], args[4]);}
-    };      
-}
-
-void disposeCOMInterfaces () {
-    if (supports !is null) {
-        supports.dispose ();
-        supports = null;
-    }   
-    if (helperAppLauncherDialog !is null) {
-        helperAppLauncherDialog.dispose ();
-        helperAppLauncherDialog = null; 
-    }
-}
-
-int /*long*/ getAddress () {
-    return helperAppLauncherDialog.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 (nsIHelperAppLauncherDialog.NS_IHELPERAPPLAUNCHERDIALOG_IID)) {
-        XPCOM.memmove (ppvObject, new int /*long*/[] {helperAppLauncherDialog.getAddress ()}, C.PTR_SIZEOF);
+    if (*riid == nsIHelperAppLauncherDialog.IID) {
+        *ppvObject = cast(void*)cast(nsIHelperAppLauncherDialog)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--;
     /*
     * Note.  This instance lives as long as the download it is binded to.
@@ -106,33 +83,36 @@
     * cancels the File Dialog, cancels or closes the Download Dialog
     * and when the Download Dialog goes away after the download is completed.
     */
-    if (refCount is 0) disposeCOMInterfaces ();
+    if (refCount is 0) return 0;
     return refCount;
 }
 
 /* nsIHelperAppLauncherDialog */
 
-int Show (int /*long*/ aLauncher, int /*long*/ aContext, int aReason) {
-    /*
+extern(System)
+nsresult Show(nsIHelperAppLauncher aLauncher, nsISupports aContext, PRUint32 aReason) {
+     /*
      * The interface for nsIHelperAppLauncher changed as of mozilla 1.8.  Query the received
      * nsIHelperAppLauncher for the new interface, and if it is not found then fall back to
      * the old interface. 
      */
-    nsISupports supports = new nsISupports (aLauncher);
-    int /*long*/[] result = new int /*long*/[1];
-    int rc = supports.QueryInterface (nsIHelperAppLauncher_1_8.NS_IHELPERAPPLAUNCHER_IID, result);
-    if (rc is XPCOM.NS_OK) {    /* >= 1.8 */
-        nsIHelperAppLauncher_1_8 helperAppLauncher = new nsIHelperAppLauncher_1_8 (aLauncher);
-        rc = helperAppLauncher.SaveToDisk (0, 0);
+
+    nsISupports supports = cast(nsISupports)aLauncher;
+    nsIHelperAppLauncher_1_8 helperAppLauncher;
+    nsresult rc = supports.QueryInterface (&nsIHelperAppLauncher_1_8.IID, cast(void**)&helperAppLauncher);
+    if (rc is 0) {
+        rc = helperAppLauncher.SaveToDisk (null, 0);
         helperAppLauncher.Release ();
         return rc;
     }
-    nsIHelperAppLauncher helperAppLauncher = new nsIHelperAppLauncher (aLauncher);  /* < 1.8 */
-    return helperAppLauncher.SaveToDisk (0, 0);
+
+    /* < 1.8 */
+    return aLauncher.SaveToDisk (null, 0);
+    // no Release for this? -JJR
 }
 
-int PromptForSaveToFile (int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ arg4) {
-    int /*long*/ aDefaultFile, aSuggestedFileExtension, _retval;
+extern(System)
+nsresult PromptForSaveToFile (nsIHelperAppLauncher aLauncher, nsISupports aWindowContext, PRUnichar* aDefaultFile, PRUnichar* aSuggestedFileExtension, nsILocalFile* _retval) {
     bool hasLauncher = false;
 
     /*
@@ -149,70 +129,78 @@
      * argument must be queried for both the old and new nsIHelperAppLauncher interfaces. 
      */
     bool using_1_8 = false;
-    nsISupports support = new nsISupports (arg0);
-    int /*long*/[] result = new int /*long*/[1];
-    int rc = support.QueryInterface (nsIHelperAppLauncher_1_8.NS_IHELPERAPPLAUNCHER_IID, result);
+    nsISupports support = cast(nsISupports)aLauncher; 
+    
+    if (aLauncher is null)
+        assert(0);
+
+    nsIHelperAppLauncher_1_8 helperAppLauncher1;
+    int rc = support.QueryInterface (&nsIHelperAppLauncher_1_8.IID, cast(void**)&helperAppLauncher1);
     if (rc is XPCOM.NS_OK) {
         using_1_8 = true;
         hasLauncher = true;
-        new nsISupports (result[0]).Release ();
+        helperAppLauncher1.Release ();
     } else {
-        result[0] = 0;
-        rc = support.QueryInterface (nsIHelperAppLauncher.NS_IHELPERAPPLAUNCHER_IID, result);
+        nsIHelperAppLauncher helperAppLauncher;
+        rc = support.QueryInterface (&nsIHelperAppLauncher.IID, cast(void**)&helperAppLauncher);
         if (rc is XPCOM.NS_OK) {
             hasLauncher = true;
-            new nsISupports (result[0]).Release ();
+            helperAppLauncher.Release;
         }
     }
-    result[0] = 0;
 
+/+
+    // In D port, no suppport for version >1.4 yet
     if (hasLauncher) {  /* >= 1.5 */
         aDefaultFile = arg2;
         aSuggestedFileExtension = arg3;
         _retval = arg4;
-    } else {            /* 1.4 */
+    } else {            /* 1.4 */  
+    // This call conversion probablywon't work for non-Java
+    // and shouldn't get called; fix it later. -JJR
         aDefaultFile = arg1;
         aSuggestedFileExtension = arg2;
         _retval = arg3;
     }
++/
+    //int span = XPCOM.strlen_PRUnichar (aDefaultFile);
+    // XPCOM.memmove (dest, aDefaultFile, length * 2);
+    String defaultFile = Utf.toString(fromString16z(aDefaultFile));
 
-    int length = XPCOM.strlen_PRUnichar (aDefaultFile);
-    char[] dest = new char[length];
-    XPCOM.memmove (dest, aDefaultFile, length * 2);
-    String defaultFile = new String (dest);
-
-    length = XPCOM.strlen_PRUnichar (aSuggestedFileExtension);
-    dest = new char[length];
-    XPCOM.memmove (dest, aSuggestedFileExtension, length * 2);
-    String suggestedFileExtension = new String (dest);
+    //span = XPCOM.strlen_PRUnichar (aSuggestedFileExtension);
+    //dest = new char[length];
+    //XPCOM.memmove (dest, aSuggestedFileExtension, length * 2);
+    String suggestedFileExtension =  Utf.toString(fromString16z(aSuggestedFileExtension));
 
     Shell shell = new Shell ();
     FileDialog fileDialog = new FileDialog (shell, DWT.SAVE);
     fileDialog.setFileName (defaultFile);
-    fileDialog.setFilterExtensions (new String[] {suggestedFileExtension});
+    String[] tmp;
+    tmp ~= suggestedFileExtension; 
+    fileDialog.setFilterExtensions (tmp);
     String name = fileDialog.open ();
     shell.close ();
     if (name is null) {
         if (hasLauncher) {
             if (using_1_8) {
-                nsIHelperAppLauncher_1_8 launcher = new nsIHelperAppLauncher_1_8 (arg0);
-                rc = launcher.Cancel (XPCOM.NS_BINDING_ABORTED);
+                rc = (cast(nsIHelperAppLauncher_1_8)aLauncher).Cancel (XPCOM.NS_BINDING_ABORTED);
             } else {
-                nsIHelperAppLauncher launcher = new nsIHelperAppLauncher (arg0);
-                rc = launcher.Cancel ();
+                rc = aLauncher.Cancel ();
             }
-            if (rc !is XPCOM.NS_OK) Mozilla.error (rc);
+            if (rc !is XPCOM.NS_OK) Mozilla.error (rc,__FILE__,__LINE__); 
             return XPCOM.NS_OK;
         }
         return XPCOM.NS_ERROR_FAILURE;
     }
-    nsEmbedString path = new nsEmbedString (name);
-    rc = XPCOM.NS_NewLocalFile (path.getAddress (), 1, result);
-    path.dispose ();
-    if (rc !is XPCOM.NS_OK) Mozilla.error (rc);
-    if (result[0] is 0) Mozilla.error (XPCOM.NS_ERROR_NULL_POINTER);
+    scope auto path = new nsEmbedString (name.toString16());
+    nsILocalFile localFile;
+    rc = XPCOM.NS_NewLocalFile (cast(nsAString*)path, 1, &localFile);
+    //path.dispose ();
+    if (rc !is XPCOM.NS_OK) Mozilla.error (rc,__FILE__,__LINE__);
+    if (localFile is null) Mozilla.error (XPCOM.NS_ERROR_NULL_POINTER,__FILE__,__LINE__);
     /* Our own nsIDownload has been registered during the Browser initialization. It will be invoked by Mozilla. */
-    XPCOM.memmove (_retval, result, C.PTR_SIZEOF);  
+    *_retval = localFile; 
+    //XPCOM.memmove (_retval, result, C.PTR_SIZEOF);  
     return XPCOM.NS_OK;
 }
 }