--- a/dwt/browser/FilePicker.d	Mon Oct 27 22:41:01 2008 -0700
+++ b/dwt/browser/FilePicker.d	Tue Oct 28 22:07:01 2008 -0700
@@ -30,6 +30,8 @@
 import dwt.internal.mozilla.nsISimpleEnumerator;
 import dwt.internal.mozilla.nsStringAPI;
 
+import dwt.browser.Mozilla;
+
 import dwt.widgets.DirectoryDialog;
 import dwt.widgets.Display;
 import dwt.widgets.FileDialog;
@@ -54,25 +56,25 @@
 }
 
 nsresult QueryInterface (nsID* riid, void** ppvObject) {
-    if (riid is null || ppvObject is null) return NS_ERROR_NO_INTERFACE;
+    if (riid is null || ppvObject is null) return XPCOM.NS_ERROR_NO_INTERFACE;
     
-    if (riid == nsISupports.IID) {
+    if (*riid == nsISupports.IID) {
         *ppvObject = cast(void*)cast(nsISupports) this;
         AddRef ();
-        return NS_OK;
+        return XPCOM.NS_OK;
     }
-    if (riid == nsIFilePicker.IID) {
+    if (*riid == nsIFilePicker.IID) {
         *ppvObject = cast(void*)cast(nsIFilePicker) this;
         AddRef ();
-        return NS_OK;
+        return XPCOM.NS_OK;
     }   
-    if (riid == nsIFilePicker_1_8.IID) {
+    if (*riid == nsIFilePicker_1_8.IID) {
         *ppvObject = cast(void*)cast(nsIFilePicker_1_8) this;
         AddRef ();
-        return NS_OK;
+        return XPCOM.NS_OK;
     }
     *ppvObject = null; 
-    return NS_ERROR_NO_INTERFACE;
+    return XPCOM.NS_ERROR_NO_INTERFACE;
 }
     
 nsrefcnt Release () {
@@ -99,11 +101,11 @@
     return XPCOM.NS_OK;
 }
 
-nsresult Show (PRUint32* _retval) {
+nsresult Show (PRInt16* _retval) {
     if (mode is nsIFilePicker.modeGetFolder) {
         /* picking a directory */
         int result = showDirectoryPicker ();
-        *_retval = cast(int)cast(short)result; /* PRInt16 */
+        *_retval = cast(int)cast(PRInt16)result; /* PRInt16 */
         return XPCOM.NS_OK;
     }
 
@@ -149,7 +151,7 @@
     return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
 
-nsresult GetFileURL ( nsIFileURL aFileURL ) {
+nsresult GetFileURL ( nsIFileURL* aFileURL ) {
     return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 }
 
@@ -157,7 +159,7 @@
     String filename = "";   //$NON-NLS-1$
     if (directory !is null) filename ~= directory ~ SEPARATOR;
     if (files !is null && files.length > 0) filename ~= files[0];
-    scope auto path = new nsEmbedString (filename);
+    scope auto path = new nsEmbedString (toString16(filename));
     int rc = XPCOM.NS_NewLocalFile (cast(nsAString*)path, 1, aFile);
     if (rc !is XPCOM.NS_OK) Mozilla.error (rc);
     if (aFile is null) Mozilla.error (XPCOM.NS_ERROR_NULL_POINTER);