--- a/dwt/browser/AppFileLocProvider.d	Sat Oct 25 21:01:54 2008 -0700
+++ b/dwt/browser/AppFileLocProvider.d	Sun Oct 26 08:09:00 2008 -0700
@@ -16,17 +16,21 @@
 import tango.text.Util;
 
 import dwt.dwthelper.utils;
+import dwt.browser.Mozilla;
 
 import dwt.internal.Compatibility;
-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.nsISimpleEnumerator;
 import dwt.internal.mozilla.nsEmbedString;
 import dwt.internal.mozilla.nsID;
-import dwt.internal.mozilla.nsIDirectoryServiceProvider;
-import dwt.internal.mozilla.nsIDirectoryServiceProvider2;
+import dwt.internal.mozilla.nsIDirectoryService;
 import dwt.internal.mozilla.nsIFile;
 import dwt.internal.mozilla.nsILocalFile;
 import dwt.internal.mozilla.nsISupports;
+import dwt.internal.mozilla.nsStringAPI;
 
 class AppFileLocProvider : nsIDirectoryServiceProvider2 { 
     int refCount = 0;
@@ -53,10 +57,10 @@
     return refCount;
 }
 
-nsresult QueryInterface (nsID* riid, int void** ppvObject) {
+nsresult QueryInterface (nsID* riid, void** ppvObject) {
     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 XPCOM.NS_OK;
@@ -86,7 +90,7 @@
     profilePath = path;
     if (!Compatibility.fileExists (path, "")) { //$NON-NLS-1$
         nsILocalFile result;
-        scope auto nsEmbedString pathString = new nsEmbedString (path);
+        scope auto nsEmbedString pathString = new nsEmbedString (toString16(path));
         int rc = XPCOM.NS_NewLocalFile (cast(nsAString*)pathString, 1, &result);
         if (rc !is XPCOM.NS_OK) Mozilla.error (rc);
         if (result is null) Mozilla.error (XPCOM.NS_ERROR_NULL_POINTER);
@@ -100,7 +104,7 @@
 /* nsIDirectoryServiceProvider2 */
 
 nsresult GetFiles (char* prop, nsISimpleEnumerator* _retval) {
-    String propertyName = tango.stdc.stringz.fromStringz( prop );
+    String propertyName = prop.fromStringz;
     String[] propertyValues = null;
 
     if (propertyName == XPCOM.NS_APP_PLUGINS_DIR_LIST) {
@@ -230,7 +234,7 @@
         if (localFile is null) Mozilla.error (XPCOM.NS_ERROR_NULL_POINTER);
         
         nsIFile file;
-        rc = localFile.QueryInterface (&nsIFile.IID, cast(void**)&file)); 
+        rc = localFile.QueryInterface (&nsIFile.IID, cast(void**)&file); 
         if (rc !is XPCOM.NS_OK) Mozilla.error (rc);
         if (file is null) Mozilla.error (XPCOM.NS_ERROR_NO_INTERFACE);