# HG changeset patch
# User John Reimer <terminal.node@gmail.com>
# Date 1225081191 25200
# Node ID 942da4b6558ab1de7bb385b69337fc61f51aeba5
# Parent  3f4a5c7d138fa8cce489f9c08a2cb0e6b55aa3d0
Ongoing fixup for compile

diff -r 3f4a5c7d138f -r 942da4b6558a dwt/browser/Download.d
--- a/dwt/browser/Download.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/browser/Download.d	Sun Oct 26 21:19:51 2008 -0700
@@ -19,7 +19,7 @@
 import dwt.DWT;
 
 //import dwt.internal.Compatibility;
-import dwt.internal.mozilla.XPCOM;
+import XPCOM = dwt.internal.mozilla.XPCOM;
 import dwt.internal.mozilla.XPCOMObject;
 import dwt.internal.mozilla.nsID;
 import dwt.internal.mozilla.nsIDownload;
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/browser/DownloadFactory.d
--- a/dwt/browser/DownloadFactory.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/browser/DownloadFactory.d	Sun Oct 26 21:19:51 2008 -0700
@@ -12,95 +12,63 @@
 
 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.XPCOMObject;
 import dwt.internal.mozilla.nsID;
 import dwt.internal.mozilla.nsIFactory;
 import dwt.internal.mozilla.nsISupports;
 
-class DownloadFactory {
-    XPCOMObject supports;
-    XPCOMObject factory;
+class DownloadFactory : nsIFactory {
     int refCount = 0;
 
-DownloadFactory () {
-    createCOMInterfaces ();
-}
+this () {}
 
-int AddRef () {
+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 ();}
-    };
+nsresult QueryInterface (nsID* riid, void** ppvObject) {
+    if (riid is null || ppvObject is null) return XPCOM.NS_ERROR_NO_INTERFACE;
     
-    factory = new XPCOMObject (new int[] {2, 0, 0, 3, 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 CreateInstance (args[0], args[1], args[2]);}
-        public int /*long*/ method4 (int /*long*/[] args) {return LockFactory ((int)/*64*/args[0]);}
-    };
-}
-
-void disposeCOMInterfaces () {
-    if (supports !is null) {
-        supports.dispose ();
-        supports = null;
-    }   
-    if (factory !is null) {
-        factory.dispose ();
-        factory = null; 
-    }
-}
-
-int /*long*/ getAddress () {
-    return factory.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 (nsIFactory.NS_IFACTORY_IID)) {
-        XPCOM.memmove (ppvObject, new int /*long*/[] {factory.getAddress ()}, C.PTR_SIZEOF);
+    if (*riid == nsIFactory.IID) {
+        *ppvObject = cast(void*)cast(nsIFactory)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;
 }
     
 /* nsIFactory */
 
-int CreateInstance (int /*long*/ aOuter, int /*long*/ iid, int /*long*/ result) {
-    Download download = new Download ();
-    download.AddRef ();
-    XPCOM.memmove (result, new int /*long*/[] {download.getAddress ()}, C.PTR_SIZEOF);
-    return XPCOM.NS_OK;
+nsresult CreateInstance (nsISupports aOuter, nsID* iid, void** result) {
+    if (result is null) 
+        return XPCOM.NS_ERROR_INVALID_ARG;
+    auto download = new Download();
+    nsresult rv = download.QueryInterface( iid, result );
+    if (XPCOM.NS_FAILED(rv)) {
+        *result = null;
+        delete promptService;
+    }
+    return rv;
 }
 
-int LockFactory (int lock) {
+nsresult LockFactory (int lock) {
     return XPCOM.NS_OK;
 }
 }
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/browser/DownloadFactory_1_8.d
--- a/dwt/browser/DownloadFactory_1_8.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/browser/DownloadFactory_1_8.d	Sun Oct 26 21:19:51 2008 -0700
@@ -15,7 +15,8 @@
 import dwt.dwthelper.utils;
 
 //import dwt.internal.C;
-import dwt.internal.mozilla.XPCOM;
+import XPCOM = dwt.internal.mozilla.XPCOM;
+import dwt.internal.mozilla.Common;
 //import dwt.internal.mozilla.XPCOMObject;
 import dwt.internal.mozilla.nsID;
 import dwt.internal.mozilla.nsIFactory;
@@ -87,7 +88,7 @@
     return XPCOM.NS_ERROR_NO_INTERFACE;
 }
             
-int Release () {
+nsrefcnt Release () {
     refCount--;
     //if (refCount is 0) disposeCOMInterfaces ();
     return refCount;
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/browser/Download_1_8.d
--- a/dwt/browser/Download_1_8.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/browser/Download_1_8.d	Sun Oct 26 21:19:51 2008 -0700
@@ -17,7 +17,7 @@
 import dwt.DWT;
 
 // import dwt.internal.Compatibility;
-import dwt.internal.mozilla.XPCOM;
+import XPCOM = dwt.internal.mozilla.XPCOM;
 import dwt.internal.mozilla.nsICancelable;
 import dwt.internal.mozilla.nsID;
 import dwt.internal.mozilla.nsIDownload_1_8;
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/browser/FilePicker.d
--- a/dwt/browser/FilePicker.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/browser/FilePicker.d	Sun Oct 26 21:19:51 2008 -0700
@@ -16,6 +16,8 @@
 
 import dwt.DWT;
 
+import XPCOM = dwt.internal.mozilla.XPCOM;
+
 import dwt.internal.mozilla.nsEmbedString;
 import dwt.internal.mozilla.nsID;
 import dwt.internal.mozilla.nsIFilePicker;
@@ -53,7 +55,7 @@
         AddRef ();
         return NS_OK;
     }
-    if (riid == nsIFilePicker.IID)) {
+    if (riid == nsIFilePicker.IID) {
         *ppvObject = cast(void*)cast(nsIFilePicker) this;
         AddRef ();
         return NS_OK;
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/browser/FilePickerFactory.d
--- a/dwt/browser/FilePickerFactory.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/browser/FilePickerFactory.d	Sun Oct 26 21:19:51 2008 -0700
@@ -15,13 +15,14 @@
 import dwt.dwthelper.utils;
 
 //import dwt.internal.C;
-import dwt.internal.mozilla.XPCOM;
+import XPCOM = dwt.internal.mozilla.XPCOM;
 //import dwt.internal.mozilla.XPCOMObject;
+import dwt.internal.mozilla.Common;
 import dwt.internal.mozilla.nsID;
 import dwt.internal.mozilla.nsIFactory;
 import dwt.internal.mozilla.nsISupports;
 
-class FilePickerFactory : IFactory {
+class FilePickerFactory : nsIFactory {
     //XPCOMObject supports;
     //XPCOMObject factory;
     int refCount = 0;
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/browser/FilePickerFactory_1_8.d
--- a/dwt/browser/FilePickerFactory_1_8.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/browser/FilePickerFactory_1_8.d	Sun Oct 26 21:19:51 2008 -0700
@@ -15,8 +15,12 @@
 import dwt.dwthelper.utils;
 
 //import dwt.internal.C;
-import dwt.internal.mozilla.XPCOM;
+import XPCOM = dwt.internal.mozilla.XPCOM;
 import dwt.browser.FilePickerFactory;
+
+import dwt.internal.mozilla.Common;
+import dwt.internal.mozilla.nsID;
+import dwt.internal.mozilla.nsISupports;
 //import dwt.internal.mozilla.XPCOMObject;
 
 class FilePickerFactory_1_8 : FilePickerFactory {
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/browser/FilePicker_1_8.d
--- a/dwt/browser/FilePicker_1_8.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/browser/FilePicker_1_8.d	Sun Oct 26 21:19:51 2008 -0700
@@ -15,7 +15,7 @@
 import dwt.dwthelper.utils;
 
 import dwt.browser.FilePicker;
-import dwt.internal.mozilla.XPCOM;
+import XPCOM = dwt.internal.mozilla.XPCOM;
 import dwt.internal.mozilla.nsStringAPI;
 
 class FilePicker_1_8 : FilePicker {
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/browser/HelperAppLauncherDialog.d
--- a/dwt/browser/HelperAppLauncherDialog.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/browser/HelperAppLauncherDialog.d	Sun Oct 26 21:19:51 2008 -0700
@@ -18,7 +18,8 @@
 
 import dwt.DWT;
 //import dwt.internal.C;
-import dwt.internal.mozilla.XPCOM;
+import XPCOM = dwt.internal.mozilla.XPCOM;
+import dwt.internal.mozilla.Common;
 //import dwt.internal.mozilla.XPCOMObject;
 import dwt.internal.mozilla.nsEmbedString;
 import dwt.internal.mozilla.nsID;
@@ -27,10 +28,11 @@
 import dwt.internal.mozilla.nsIHelperAppLauncher_1_8;
 import dwt.internal.mozilla.nsIHelperAppLauncher_1_9;
 import dwt.internal.mozilla.nsISupports;
+import dwt.internal.mozilla.nsILocalFile;
 import dwt.widgets.FileDialog;
 import dwt.widgets.Shell;
 
-class HelperAppLauncherDialog : nsHelperAppLauncherDialog {
+class HelperAppLauncherDialog : nsIHelperAppLauncherDialog {
     //XPCOMObject supports;
     //XPCOMObject helperAppLauncherDialog;
     int refCount = 0;
@@ -203,19 +205,20 @@
         _retval = arg3;
     }
 
-    int span = XPCOM.strlen_PRUnichar (aDefaultFile);
+    //int span = XPCOM.strlen_PRUnichar (aDefaultFile);
     // XPCOM.memmove (dest, aDefaultFile, length * 2);
-    String defaultFile = Utf.toString (aDefaultFile[0 .. span]));
+    String defaultFile = aDefaultFile.fromString16z().toString();
 
-    span = XPCOM.strlen_PRUnichar (aSuggestedFileExtension);
+    //span = XPCOM.strlen_PRUnichar (aSuggestedFileExtension);
     //dest = new char[length];
     //XPCOM.memmove (dest, aSuggestedFileExtension, length * 2);
-    String suggestedFileExtension =  Utf.toString (aSuggestedFileExtension[0 .. span]);
+    String suggestedFileExtension =  aSuggestedFileExtension.fromString16z().toString();
 
     Shell shell = new Shell ();
     FileDialog fileDialog = new FileDialog (shell, DWT.SAVE);
     fileDialog.setFileName (defaultFile);
-    String[] tmp ~= suggestedFileExtension; 
+    String[] tmp;
+    tmp ~= suggestedFileExtension; 
     fileDialog.setFilterExtensions (tmp);
     String name = fileDialog.open ();
     shell.close ();
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/browser/HelperAppLauncherDialogFactory.d
--- a/dwt/browser/HelperAppLauncherDialogFactory.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/browser/HelperAppLauncherDialogFactory.d	Sun Oct 26 21:19:51 2008 -0700
@@ -15,12 +15,15 @@
 import dwt.dwthelper.utils;
 
 //import dwt.internal.C;
-import dwt.internal.mozilla.XPCOM;
+import XPCOM = dwt.internal.mozilla.XPCOM;
 //import dwt.internal.mozilla.XPCOMObject;
+import dwt.internal.mozilla.Common;
 import dwt.internal.mozilla.nsID;
 import dwt.internal.mozilla.nsIFactory;
 import dwt.internal.mozilla.nsISupports;
 
+import dwt.browser.HelperAppLauncherDialog;
+
 class HelperAppLauncherDialogFactory : nsIFactory {
     //XPCOMObject supports;
     //XPCOMObject factory;
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/browser/InputStream.d
--- a/dwt/browser/InputStream.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/browser/InputStream.d	Sun Oct 26 21:19:51 2008 -0700
@@ -16,7 +16,7 @@
 import dwt.dwthelper.utils;
 
 //import dwt.internal.C;
-import dwt.internal.mozilla.XPCOM;
+import XPCOM = dwt.internal.mozilla.XPCOM;
 //import dwt.internal.mozilla.XPCOMObject;
 import dwt.internal.mozilla.nsID;
 import dwt.internal.mozilla.nsIInputStream;
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/browser/Mozilla.d
--- a/dwt/browser/Mozilla.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/browser/Mozilla.d	Sun Oct 26 21:19:51 2008 -0700
@@ -23,6 +23,10 @@
 //import java.util.Vector;
 
 import tango.text.locale.Core;  // Necessary for Region/Culture/Locale code
+import tango.text.convert.Format;
+import tango.io.Console;
+import tango.sys.Environment;
+
 import dwt.internal.c.gtk;
 
 import dwt.DWT;
@@ -31,18 +35,26 @@
 import dwt.graphics.Point;
 import dwt.graphics.Rectangle;
 
+import dwt.browser.Browser;
+import dwt.browser.WebBrowser;
 import dwt.browser.MozillaDelegate;
 import dwt.browser.AppFileLocProvider;
 import dwt.browser.WindowCreator2;
+import dwt.browser.PromptService2Factory;
+import dwt.browser.HelperAppLauncherDialogFactory;
+import dwt.browser.DownloadFactory;
+import dwt.browser.DownloadFactory_1_8;
+import dwt.browser.FilePickerFactory;
+import dwt.browser.FilePickerFactory_1_8;
 
 import dwt.internal.Compatibility;
 import dwt.internal.LONG;
 import dwt.internal.Library;
 
-import dwt.internal.mozilla.XPCOM;
-import dwt.internal.mozilla.XPCOMInit;
+import XPCOM = dwt.internal.mozilla.XPCOM;
+import XPCOMInit = dwt.internal.mozilla.XPCOMInit;
+
 import dwt.internal.mozilla.Common;
-
 import dwt.internal.mozilla.nsEmbedString;
 import dwt.internal.mozilla.nsIAppShell;
 import dwt.internal.mozilla.nsIBaseWindow;
@@ -53,6 +65,7 @@
 import dwt.internal.mozilla.nsICookie;
 import dwt.internal.mozilla.nsICookieManager;
 import dwt.internal.mozilla.nsID;
+import dwt.internal.mozilla.nsIDOMNode;
 import dwt.internal.mozilla.nsIDOMEvent;
 import dwt.internal.mozilla.nsIDOMEventListener;
 import dwt.internal.mozilla.nsIDOMEventTarget;
@@ -62,12 +75,14 @@
 import dwt.internal.mozilla.nsIDOMSerializer_1_7;
 import dwt.internal.mozilla.nsIDOMWindow;
 import dwt.internal.mozilla.nsIDOMWindowCollection;
+import dwt.internal.mozilla.nsIDOMDocument;
 import dwt.internal.mozilla.nsIDirectoryService;
 import dwt.internal.mozilla.nsIDocShell;
 //import dwt.internal.mozilla.nsIDocShell_1_8;
 //import dwt.internal.mozilla.nsIDocShell_1_9;
 import dwt.internal.mozilla.nsIEmbeddingSiteWindow;
 import dwt.internal.mozilla.nsIFile;
+import dwt.internal.mozilla.nsIFactory;
 import dwt.internal.mozilla.nsIIOService;
 import dwt.internal.mozilla.nsIInterfaceRequestor;
 import dwt.internal.mozilla.nsIJSContextStack;
@@ -80,6 +95,7 @@
 import dwt.internal.mozilla.nsIRequest;
 import dwt.internal.mozilla.nsIServiceManager;
 import dwt.internal.mozilla.nsISimpleEnumerator;
+import dwt.internal.mozilla.nsIStreamListener;
 import dwt.internal.mozilla.nsISupports;
 //import dwt.internal.mozilla.nsISupportsWeakReference;
 import dwt.internal.mozilla.nsITooltipListener;
@@ -95,6 +111,9 @@
 import dwt.internal.mozilla.nsIWebProgress;
 import dwt.internal.mozilla.nsIWebProgressListener;
 import dwt.internal.mozilla.nsIWindowWatcher;
+import dwt.internal.mozilla.nsIWindowCreator;
+import dwt.internal.mozilla.nsStringAPI;
+
 import dwt.layout.FillLayout;
 import dwt.widgets.Composite;
 import dwt.widgets.Display;
@@ -103,13 +122,13 @@
 import dwt.widgets.Listener;
 import dwt.widgets.Menu;
 import dwt.widgets.Shell;
-import dwt.browser.WebBrowser;
+import dwt.widgets.Control;
 
 class Mozilla : WebBrowser, 
                 nsIWeakReference, 
                 nsIWebProgressListener, 
                 nsIWebBrowserChrome,
-                nsIWebBrowserFocus, 
+                nsIWebBrowserChromeFocus, 
                 nsIEmbeddingSiteWindow, 
                 nsIInterfaceRequestor, 
                 nsISupportsWeakReference, 
@@ -221,7 +240,7 @@
                 while (moreElements !is 0) {
                     //result[0] = 0;
                     nsICookie cookie;
-                    rc = enumerator.GetNext (cast(nsISupports)cookie);
+                    rc = enumerator.GetNext (cast(nsISupports*)&cookie);
                     if (rc !is XPCOM.NS_OK) error (rc);
                     //nsICookie cookie = new nsICookie (result[0]);
                     PRUint64 expires;
@@ -268,7 +287,7 @@
         }
         String mozillaPath = System.getProperty (XULRUNNER_PATH);
         if (mozillaPath is null) {
-            // we don't have to load an initial library in DWT, so set to "true"
+            // we don't need to load an initial library in DWT, so set to "true"
             initLoaded = true;
 /+
         if (mozillaPath is null) {
@@ -291,17 +310,17 @@
          
         if (initLoaded) {
             /* attempt to discover a XULRunner to use as the GRE */
-            GREVersionRange range;
+            XPCOMInit.GREVersionRange range;
             //byte[] bytes = MozillaDelegate.wcsToMbcs (null, GRERANGE_LOWER, true);
             //int /*long*/ lower = C.malloc (bytes.length);
             //C.memmove (lower, bytes, bytes.length);
-            range.lower = GRERANGE_LOWER;
+            range.lower = GRERANGE_LOWER.ptr;
             range.lowerInclusive = LowerRangeInclusive;
 
             //bytes = MozillaDelegate.wcsToMbcs (null, GRERANGE_UPPER, true);
             //int /*long*/ upper = C.malloc (bytes.length);
             //C.memmove (upper, bytes, bytes.length);
-            range.upper = GRERANGE_UPPER;
+            range.upper = GRERANGE_UPPER.ptr;
             range.upperInclusive = UpperRangeInclusive;
 
             //int length = XPCOMInit.PATH_MAX;
@@ -319,7 +338,7 @@
                 //bytes = MozillaDelegate.wcsToMbcs (null, GRERANGE_LOWER_FALLBACK, true);
                 //lower = C.malloc (bytes.length);
                 //C.memmove (lower, bytes, bytes.length);
-                range.lower = GRERANGE_LOWER_FALLBACK;
+                range.lower = GRERANGE_LOWER_FALLBACK.ptr;
                 rc = XPCOMInit.GRE_GetGREPathWithProperties (&range, 1, null, 0, greBuffer.ptr, greBuffer.length);
             }
 
@@ -348,9 +367,9 @@
                     rc = XPCOMInit.XPCOMGlueStartup (mozillaPath.ptr);
                     if (rc !is XPCOM.NS_OK) {
                         IsXULRunner = false;    /* failed */
-                        mozillaPath = mozillaPath[0 .. locatePrior( mozillaPath, SEPARATOR_OS )];
-                        //mozillaPath = mozillaPath.substring (0, mozillaPath.lastIndexOf (SEPARATOR_OS));
-                        if (Device.DEBUG) Stdout ("cannot use detected XULRunner: ") (mozillaPath).newline; //$NON-NLS-1$
+                        //mozillaPath = mozillaPath[0 .. locatePrior( mozillaPath, SEPARATOR_OS )];
+                        mozillaPath = mozillaPath.substring (0, mozillaPath.lastIndexOf (SEPARATOR_OS));
+                        if (Device.DEBUG) Cerr ("cannot use detected XULRunner: ") (mozillaPath).newline; //$NON-NLS-1$
                     } else {
                         XPCOMInitWasGlued = true;
                     }
@@ -360,7 +379,7 @@
         }
 
         if (IsXULRunner) {
-            if (Device.DEBUG) Stdout ("XULRunner path: ") (mozillaPath).newline; //$NON-NLS-1$
+            if (Device.DEBUG) Cerr ("XULRunner path: ") (mozillaPath).newline; //$NON-NLS-1$
 /+
             try {
                 Library.loadLibrary ("swt-xulrunner"); //$NON-NLS-1$
@@ -375,15 +394,16 @@
                 browser.dispose ();
                 error (rc);
             }
-+/          // No need for double layer initialization in DWT; glue is initialized -JJR
++/          // No need for double layer initialization in DWT; XPCOMInit was glued
+            // At this stage we know that XULRunner is available, but we don't know
+            // TODO: determine if 
             XPCOMWasGlued = true;
 
             /*
              * Remove the trailing xpcom lib name from mozillaPath because the
              * Mozilla.initialize and NS_InitXPCOM2 invocations require a directory name only.
              */
-            mozillaPath = mozillaPath[0 .. locatePrior( mozillaPath, SEPARATOR_OS )];
-            //mozillaPath = mozillaPath.substring (0, mozillaPath.lastIndexOf (SEPARATOR_OS));
+            mozillaPath = mozillaPath.substring (0, mozillaPath.lastIndexOf (SEPARATOR_OS));
         } else {
             if ((style & DWT.MOZILLA) !is 0) {
                 browser.dispose ();
@@ -394,7 +414,7 @@
             }
 
             /* attempt to use the GRE pointed at by MOZILLA_FIVE_HOME */
-            auto mozFiveHome = tango.sys.Environment.get(XPCOM.MOZILLA_FIVE_HOME);
+            auto mozFiveHome = Environment.get(XPCOM.MOZILLA_FIVE_HOME);
             if (mozFiveHome !is null) {
                 //int length = C.strlen (ptr);
                 //byte[] buffer = new byte[length];
@@ -404,7 +424,7 @@
                 browser.dispose ();
                 DWT.error (DWT.ERROR_NO_HANDLES, null, " [Unknown Mozilla path (MOZILLA_FIVE_HOME not set)]"); //$NON-NLS-1$
             }
-            if (Device.DEBUG) Stdout ("Mozilla path: ") (mozillaPath).newline; //$NON-NLS-1$
+            if (Device.DEBUG) Cerr ("Mozilla path: ") (mozillaPath).newline; //$NON-NLS-1$
 
             /*
             * Note.  Embedding a Mozilla GTK1.2 causes a crash.  The workaround
@@ -440,8 +460,8 @@
         }
 
         if (!Initialized) {
-            nsILocalFile file;
-            scope auto pathString = new nsEmbedString (mozillaPath);
+            nsILocalFile localFile;
+            scope auto pathString = new nsEmbedString (mozillaPath.toString16());
             nsresult rc = XPCOM.NS_NewLocalFile (cast(nsAString*)pathString, 1, &localFile);
             //pathString.dispose ();
             if (rc !is XPCOM.NS_OK) {
@@ -463,7 +483,7 @@
                 browser.dispose();
                 error(rc);
             }
-            rc = XPCOM.NS_InitXPCOM2 (null, cast(IFile*)&localFile, &directoryServiceProvider);
+            rc = XPCOM.NS_InitXPCOM2 (null, cast(nsIFile)localFile, directoryServiceProvider);
             localFile.Release ();
             LocationProvider.Release();
             if (rc !is XPCOM.NS_OK) {
@@ -519,7 +539,7 @@
         //result[0] = 0;
         if (mozDelegate.needsSpinup ()) {
             /* nsIAppShell is discontinued as of xulrunner 1.9, so do not fail if it is not found */
-            rc = componentManager.CreateInstance (XPCOM.NS_APPSHELL_CID.ptr, 0, &nsIAppShell.IID, cast(void**)&AppShell);
+            rc = componentManager.CreateInstance (&XPCOM.NS_APPSHELL_CID, null, &nsIAppShell.IID, cast(void**)&AppShell);
             if (rc !is XPCOM.NS_ERROR_NO_INTERFACE) {
                 if (rc !is XPCOM.NS_OK) {
                     browser.dispose ();
@@ -531,7 +551,7 @@
                 }
     
                 //AppShell = new nsIAppShell (result[0]);
-                rc = AppShell.Create (0, null);
+                rc = AppShell.Create (null, null);
                 if (rc !is XPCOM.NS_OK) {
                     browser.dispose ();
                     error (rc);
@@ -575,7 +595,7 @@
 
         //nsIWindowWatcher windowWatcher = new nsIWindowWatcher (result[0]);
         //result[0] = 0;
-        rc = windowWatcher.SetWindowCreator (&WindowCreator);
+        rc = windowWatcher.SetWindowCreator (cast(nsIWindowCreator)WindowCreator);
         if (rc !is XPCOM.NS_OK) {
             browser.dispose ();
             error (rc);
@@ -662,14 +682,14 @@
             //length = STARTUP.length ();
             //char[] chars = new char [length + 1];
             //STARTUP.getChars (0, length, chars, 0);
-            wchar[] chars = Utf.toString16(STARTUP).toString16z;
+            wchar* chars = STARTUP.toString16().toString16z();
             rc = observerService.NotifyObservers (null, PROFILE_DO_CHANGE.ptr, chars);
             if (rc !is XPCOM.NS_OK) {
                 browser.dispose ();
                 error (rc);
             }
             //buffer = MozillaDelegate.wcsToMbcs (null, PROFILE_AFTER_CHANGE, true);
-            rc = observerService.NotifyObservers (null, PROFILE_AFTER_CHANGE.ptr, chars.ptr);
+            rc = observerService.NotifyObservers (null, PROFILE_AFTER_CHANGE.ptr, chars);
             if (rc !is XPCOM.NS_OK) {
                 browser.dispose ();
                 error (rc);
@@ -684,7 +704,7 @@
          */
         //aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_PREFSERVICE_CONTRACTID, true);
         nsIPrefService prefService;
-        rc = serviceManager.GetServiceByContractID (XPCOM.NS_PREFSERVICE_CONTRACTID, &nsIPrefService.IID, cast(void**)&prefService);
+        rc = serviceManager.GetServiceByContractID (XPCOM.NS_PREFSERVICE_CONTRACTID.ptr, &nsIPrefService.IID, cast(void**)&prefService);
         serviceManager.Release ();
         if (rc !is XPCOM.NS_OK) {
             browser.dispose ();
@@ -794,7 +814,7 @@
             //newLocales.getChars (0, span, charBuffer, 0);
             if (localizedString is null) {
                 //byte[] contractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_PREFLOCALIZEDSTRING_CONTRACTID, true);
-                rc = componentManager.CreateInstanceByContractID (XPCOM.NS_PREFLOCALIZEDSTRING, null, &nsIPrefLocalizedString.IID, cast(void**)&localizedString);
+                rc = componentManager.CreateInstanceByContractID (XPCOM.NS_PREFLOCALIZEDSTRING_CONTRACTID.ptr, null, &nsIPrefLocalizedString.IID, cast(void**)&localizedString);
                 if (rc !is XPCOM.NS_OK) {
                     browser.dispose ();
                     error (rc);
@@ -806,8 +826,8 @@
                 //localizedString = new nsIPrefLocalizedString (result[0]);
                 //result[0] = 0;
             }
-            localizedString.SetDataWithLength (newLocales.length, Utf.toString16(newLocales).toString16z);
-            rc = prefBranch.SetComplexValue (PREFERENCES_LANGUAGES.ptr, nsIPrefLocalizedString.IID, cast(nsISupports)localizedString);
+            localizedString.SetDataWithLength (newLocales.length, newLocales.toString16().toString16z());
+            rc = prefBranch.SetComplexValue (PREFERENCE_LANGUAGES.ptr, &nsIPrefLocalizedString.IID, cast(nsISupports)localizedString);
         }
         if (localizedString !is null) {
             localizedString.Release ();
@@ -817,7 +837,7 @@
         /* get Mozilla's current charset preference value */
         String prefCharset = null;
         //buffer = MozillaDelegate.wcsToMbcs (null, PREFERENCE_CHARSET, true);
-        rc = prefBranch.GetComplexValue (PREFERENCE_CHARSET.ptr, nsIPrefLocalizedString.IID, cast(void**)&localizedString);
+        rc = prefBranch.GetComplexValue (PREFERENCE_CHARSET.ptr, &nsIPrefLocalizedString.IID, cast(void**)&localizedString);
         /* 
          * Feature of Debian.  For some reason attempting to query for the current charset
          * preference fails on Debian.  The workaround for this is to assume a value of
@@ -858,7 +878,7 @@
             //newCharset.getChars (0, length, charBuffer, 0);
             if (localizedString is null) {
                 //byte[] contractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_PREFLOCALIZEDSTRING_CONTRACTID, true);
-                rc = componentManager.CreateInstanceByContractID (XPCOM.NS_PREFLOCALIZEDSTRING_CONTRACTID, null, &nsIPrefLocalizedString.IID, cast(void**)&localizedString);
+                rc = componentManager.CreateInstanceByContractID (XPCOM.NS_PREFLOCALIZEDSTRING_CONTRACTID.ptr, null, &nsIPrefLocalizedString.IID, cast(void**)&localizedString);
                 if (rc !is XPCOM.NS_OK) {
                     browser.dispose ();
                     error (rc);
@@ -870,7 +890,7 @@
                 //localizedString = new nsIPrefLocalizedString (result[0]);
                 //result[0] = 0;
             }
-            localizedString.SetDataWithLength (newCharset.length, Utf.toString16(newCharset).toString16z);
+            localizedString.SetDataWithLength (newCharset.length, newCharset.toString16().toString16z());
             rc = prefBranch.SetComplexValue (PREFERENCE_CHARSET.ptr, &nsIPrefLocalizedString.IID, cast(nsISupports)localizedString);
         }
         if (localizedString !is null) localizedString.Release ();
@@ -894,7 +914,7 @@
 
         if (proxyHost !is null) {
             //byte[] contractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_PREFLOCALIZEDSTRING_CONTRACTID, true);
-            rc = componentManager.CreateInstanceByContractID (XPCOM.NS_PREFLOCALIZEDSTRING_CONTRACTID, null, &nsIPrefLocalizedString.IID, cast(void**)&localizedString);
+            rc = componentManager.CreateInstanceByContractID (XPCOM.NS_PREFLOCALIZEDSTRING_CONTRACTID.ptr, null, &nsIPrefLocalizedString.IID, cast(void**)&localizedString);
             if (rc !is XPCOM.NS_OK) error (rc);
             if (localizedString is null) error (XPCOM.NS_NOINTERFACE);
 
@@ -903,7 +923,7 @@
             //int length = proxyHost.length ();
             //char[] charBuffer = new char[length + 1];
             //proxyHost.getChars (0, length, charBuffer, 0);
-            rc = localizedString.SetDataWithLength (proxyHost.length, Utf.toString16(proxyHost).toString16z);
+            rc = localizedString.SetDataWithLength (proxyHost.length, proxyHost.toString16().toString16z());
             if (rc !is XPCOM.NS_OK) error (rc);
             //buffer = MozillaDelegate.wcsToMbcs (null, PREFERENCE_PROXYHOST_FTP, true);
             rc = prefBranch.SetComplexValue (PREFERENCE_PROXYHOST_FTP.ptr, &nsIPrefLocalizedString.IID, cast(nsISupports)localizedString);
@@ -979,7 +999,7 @@
         String aClassName = "Prompt Service"; 
         //byte[] aClassName = MozillaDelegate.wcsToMbcs (null, "Prompt Service", true); //$NON-NLS-1$
 
-        rc = componentRegistrar.RegisterFactory (XPCOM.NS_PROMPTSERVICE_CID, aClassName.ptr, XPCOM.NS_PROMPTSERVICE_CONTRACTID, cast(nsIFactory)factory);
+        rc = componentRegistrar.RegisterFactory (&XPCOM.NS_PROMPTSERVICE_CID, aClassName.ptr, XPCOM.NS_PROMPTSERVICE_CONTRACTID.ptr, cast(nsIFactory)factory);
 
         if (rc !is XPCOM.NS_OK) {
             browser.dispose ();
@@ -992,7 +1012,7 @@
         //aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_HELPERAPPLAUNCHERDIALOG_CONTRACTID, true);
         aClassName = "Helper App Launcher Dialog";
         //aClassName = MozillaDelegate.wcsToMbcs (null, "Helper App Launcher Dialog", true); //$NON-NLS-1$
-        rc = componentRegistrar.RegisterFactory (XPCOM.NS_HELPERAPPLAUNCHERDIALOG_CID, aClassName.ptr, XPCOM.NS_HELPERAPPLAUNCHERDIALOG_CONTRACTID, cast(nsIFactory)dialogFactory);
+        rc = componentRegistrar.RegisterFactory (&XPCOM.NS_HELPERAPPLAUNCHERDIALOG_CID, aClassName.ptr, XPCOM.NS_HELPERAPPLAUNCHERDIALOG_CONTRACTID.ptr, cast(nsIFactory)dialogFactory);
         if (rc !is XPCOM.NS_OK) {
             browser.dispose ();
             error (rc);
@@ -1011,7 +1031,7 @@
         //aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_DOWNLOAD_CONTRACTID, true);
         aClassName = "Download";
         //aClassName = MozillaDelegate.wcsToMbcs (null, "Download", true); //$NON-NLS-1$
-        rc = componentRegistrar.RegisterFactory (XPCOM.NS_DOWNLOAD_CID, aClassName.ptr, XPCOM.NS_DOWNLOAD_CONTRACTID, cast(nsIFactory)downloadFactory);
+        rc = componentRegistrar.RegisterFactory (&XPCOM.NS_DOWNLOAD_CID, aClassName.ptr, XPCOM.NS_DOWNLOAD_CONTRACTID.ptr, cast(nsIFactory)downloadFactory);
         if (rc !is XPCOM.NS_OK) {
             browser.dispose ();
             error (rc);
@@ -1023,7 +1043,7 @@
         //aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_FILEPICKER_CONTRACTID, true);
         aClassName = "FilePicker";
         //aClassName = MozillaDelegate.wcsToMbcs (null, "FilePicker", true); //$NON-NLS-1$
-        rc = componentRegistrar.RegisterFactory (XPCOM.NS_FILEPICKER_CID, aClassName.ptr, XPCOM.NS_FILEPICKER_CONTRACTID, cast(nsIFactory)pickerFactory);
+        rc = componentRegistrar.RegisterFactory (&XPCOM.NS_FILEPICKER_CID, aClassName.ptr, XPCOM.NS_FILEPICKER_CONTRACTID.ptr, cast(nsIFactory)pickerFactory);
         if (rc !is XPCOM.NS_OK) {
             browser.dispose ();
             error (rc);
@@ -1037,12 +1057,12 @@
     }
 
     if (display.getData (DISPOSE_LISTENER_HOOKED) is null) {
-        display.setData (DISPOSE_LISTENER_HOOKED, DISPOSE_LISTENER_HOOKED);
+        display.setData (DISPOSE_LISTENER_HOOKED, stringcast(DISPOSE_LISTENER_HOOKED));
         display.addListener (DWT.Dispose, new class() Listener {
             public void handleEvent (Event event) {
                 if (BrowserCount > 0) return; /* another display is still active */
 
-		nsIServiceManager serviceManager;
+                nsIServiceManager serviceManager;
                 //int /*long*/[] result = new int /*long*/[1];
                 int rc = XPCOM.NS_GetServiceManager (&serviceManager);
                 if (rc !is XPCOM.NS_OK) error (rc);
@@ -1051,8 +1071,8 @@
                 //nsIServiceManager serviceManager = new nsIServiceManager (result[0]);
                 //result[0] = 0;      
                 //byte[] buffer = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_OBSERVER_CONTRACTID, true);
-		nsIObserverService observerService;
-                rc = serviceManager.GetServiceByContractID (XPCOM.NS_OBSERVER_CONTRACTID, &nsIObserverService.IID, cast(void**)&observerService);
+                nsIObserverService observerService;
+                rc = serviceManager.GetServiceByContractID (XPCOM.NS_OBSERVER_CONTRACTID.ptr, &nsIObserverService.IID, cast(void**)&observerService);
                 if (rc !is XPCOM.NS_OK) error (rc);
                 if (observerService is null) error (XPCOM.NS_NOINTERFACE);
 
@@ -1062,13 +1082,13 @@
                 //int length = SHUTDOWN_PERSIST.length ();
                 //char[] chars = new char [length + 1];
                 //SHUTDOWN_PERSIST.getChars (0, length, chars, 0);
-                rc = observerService.NotifyObservers (null, PROFILE_BEFORE_CHANGE.ptr, Utf.toString16(SHUTDOWN_PERSIST).toString16z);
+                rc = observerService.NotifyObservers (null, PROFILE_BEFORE_CHANGE.ptr, SHUTDOWN_PERSIST.toString16().toString16z());
                 if (rc !is XPCOM.NS_OK) error (rc);
                 observerService.Release ();
 
                 if (LocationProvider !is null) {
                     String prefsLocation = LocationProvider.profilePath ~ AppFileLocProvider.PREFERENCES_FILE;
-                    scope auto pathString = new nsEmbedString (prefsLocation);
+                    scope auto pathString = new nsEmbedString (prefsLocation.toString16());
                     nsILocalFile localFile;
                     rc = XPCOM.NS_NewLocalFile (cast(nsAString*)pathString, 1, &localFile);
                     if (rc !is XPCOM.NS_OK) Mozilla.error (rc);
@@ -1078,7 +1098,7 @@
                     //nsILocalFile localFile = new nsILocalFile (result [0]);
                     //result[0] = 0;
                     nsIFile prefFile;
-                    rc = localFile.QueryInterface (&nsIFile.IID, &prefFile); 
+                    rc = localFile.QueryInterface (&nsIFile.IID, cast(void**)&prefFile); 
                     if (rc !is XPCOM.NS_OK) Mozilla.error (rc);
                     if (prefFile is null) Mozilla.error (XPCOM.NS_ERROR_NO_INTERFACE);
                     localFile.Release ();
@@ -1087,7 +1107,7 @@
                     //result[0] = 0;
                     nsIPrefService prefService;
                     //buffer = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_PREFSERVICE_CONTRACTID, true);
-                    rc = serviceManager.GetServiceByContractID (XPCOM.NS_PREFSERVICE_CONTRACTID, &nsIPrefService.IID, &prefService);
+                    rc = serviceManager.GetServiceByContractID (XPCOM.NS_PREFSERVICE_CONTRACTID.ptr, &nsIPrefService.IID, cast(void**)&prefService);
                     if (rc !is XPCOM.NS_OK) error (rc);
                     if (prefService is null) error (XPCOM.NS_NOINTERFACE);
 
@@ -1100,7 +1120,8 @@
                 serviceManager.Release ();
 
                 if (XPCOMWasGlued) {
-                    XPCOM.XPCOMGlueShutdown ();
+                    // TODO: is there a difference between two startup methhods? Glue functions are same.
+                    XPCOMInit.XPCOMGlueShutdown ();
                     XPCOMWasGlued = false;
                 }
                 if (XPCOMInitWasGlued) {
@@ -1162,7 +1183,7 @@
     }
             
     nsIBaseWindow baseWindow;
-    rc = webBrowser.QueryInterface (nsIBaseWindow.IID, cast(void**)&baseWindow);
+    rc = webBrowser.QueryInterface (&nsIBaseWindow.IID, cast(void**)&baseWindow);
     if (rc !is XPCOM.NS_OK) {
         browser.dispose ();
         error (rc);
@@ -1182,7 +1203,7 @@
 
     embedHandle = mozDelegate.getHandle ();
 
-    rc = baseWindow.InitWindow (embedHandle, 0, 0, 0, rect.width, rect.height);
+    rc = baseWindow.InitWindow (cast(void*)embedHandle, null, 0, 0, rect.width, rect.height);
     if (rc !is XPCOM.NS_OK) {
         browser.dispose ();
         error (XPCOM.NS_ERROR_FAILURE);
@@ -1258,8 +1279,8 @@
                 downloadFactory_1_8.AddRef ();
                 // byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_TRANSFER_CONTRACTID, true);
                 
-                // byte[] aClassName = MozillaDelegate.wcsToMbcs (null, "Transfer", true); //$NON-NLS-1$
-                rc = componentRegistrar.RegisterFactory (XPCOM.NS_DOWNLOAD_CID, aClassName.ptr, XPCOM.NS_TRANSFER_CONTRACTID, cast(nsIFactory)downloadFactory_1_8);
+                String aClassName = "Transfer"; //$NON-NLS-1$
+                rc = componentRegistrar.RegisterFactory (&XPCOM.NS_DOWNLOAD_CID, aClassName.ptr, XPCOM.NS_TRANSFER_CONTRACTID.ptr, cast(nsIFactory)downloadFactory_1_8);
                 if (rc !is XPCOM.NS_OK) {
                     browser.dispose ();
                     error (rc);
@@ -1289,7 +1310,7 @@
                 //nsIWebNavigation webNavigation = new nsIWebNavigation (result[0]);
                 //char[] uri = new char[ABOUT_BLANK.length () + 1];
                 //ABOUT_BLANK.getChars (0, ABOUT_BLANK.length (), uri, 0);
-                rc = webNavigation.LoadURI (Utf.toString16(ABOUT_BLANK).toString16z, nsIWebNavigation.LOAD_FLAGS_NONE, null, null, null);
+                rc = webNavigation.LoadURI (ABOUT_BLANK.toString16().toString16z(), nsIWebNavigation.LOAD_FLAGS_NONE, null, null, null);
                 webNavigation.Release ();
             }
         }
@@ -1297,8 +1318,10 @@
         interfaceRequestor.Release ();
     }
     componentManager.Release ();
+/*
+    // REMOVE: not necessary
+    nsIWeakReference weakReference;
 
-    nsIWeakReference weakReference;
     rc = this.QueryInterface(&nsIWeakReference.IID, cast(void**)&weakReference);
     if (rc !is XPCOM.NS_OK) {
         browser.dispose();
@@ -1308,17 +1331,16 @@
         browser.dispose();
         error(XPCOM.NS_ERROR_NO_INTERFACE);
     }
-
-    // TODO: Find appropriate place to "Release" weakReference -JJR
-    rc = webBrowser.AddWebBrowserListener (weakReference, &nsIWebProgressListener.IID);
+*/
+    rc = webBrowser.AddWebBrowserListener (cast(nsIWeakReference)this, &nsIWebProgressListener.IID);
     if (rc !is XPCOM.NS_OK) {
         browser.dispose ();
         error (rc);
     }
 
     // TODO: Find appropriate place to "Release" uriContentListener -JJR
-    nsIUriContentListener uriContentListener;
-    this.QueryInterface(&nsIUriContentListener.IID, cast(void**)&uriContentListener);
+    nsIURIContentListener uriContentListener;
+    this.QueryInterface(&nsIURIContentListener.IID, cast(void**)&uriContentListener);
     if (rc !is XPCOM.NS_OK) {
         browser.dispose();
         error(rc);
@@ -1338,6 +1360,7 @@
 
     listener = new class () Listener {
         public void handleEvent (Event event) {
+            Control control = cast(Control)this.outer.browser;
             switch (event.type) {
                 case DWT.Dispose: {
                     /* make this handler run after other dispose listeners */
@@ -1356,7 +1379,7 @@
                 case DWT.Activate: Activate (); break;
                 case DWT.Deactivate: {
                     Display display = event.display;
-                    if (this.browser is display.getFocusControl ()) Deactivate ();
+                    if (control is display.getFocusControl ()) Deactivate ();
                     break;
                 }
                 case DWT.Show: {
@@ -1421,7 +1444,7 @@
     //char[] arg = url.toCharArray (); 
     //char[] c = new char[arg.length+1];
     //System.arraycopy (arg, 0, c, 0, arg.length);
-    rc = webNavigation.LoadURI (Utf.toString16(url).toString16z, nsIWebNavigation.LOAD_FLAGS_NONE, null, null, null);
+    rc = webNavigation.LoadURI (url.toString16().toString16z(), nsIWebNavigation.LOAD_FLAGS_NONE, null, null, null);
     webNavigation.Release ();
     return rc is XPCOM.NS_OK;
 }
@@ -1450,7 +1473,7 @@
     if (awaitingNavigate) return ""; //$NON-NLS-1$
 
     //int /*long*/[] result = new int /*long*/[1];
-    nsIDOMWIndow window;
+    nsIDOMWindow window;
     int rc = webBrowser.GetContentDOMWindow (&window);
     if (rc !is XPCOM.NS_OK) error (rc);
     if (window is null) error (XPCOM.NS_NOINTERFACE);
@@ -1475,7 +1498,7 @@
     //byte[] contractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_DOMSERIALIZER_CONTRACTID, true);
     String chars = null;
     nsIDOMSerializer_1_7 serializer_1_7;
-    rc = componentManager.CreateInstanceByContractID (XPCOM.NS_DOMSERIALIZER_CONTRACTID, null, &nsIDOMSerializer_1_7.IID, cast(void**)&serializer_1_7);
+    rc = componentManager.CreateInstanceByContractID (XPCOM.NS_DOMSERIALIZER_CONTRACTID.ptr, null, &nsIDOMSerializer_1_7.IID, cast(void**)&serializer_1_7);
     if (rc is XPCOM.NS_OK) {    /* mozilla >= 1.7 */
         if (serializer_1_7 is null) error (XPCOM.NS_NOINTERFACE);
 
@@ -1490,10 +1513,10 @@
         //chars = new char[length];
         //XPCOM.memmove (chars, buffer, length * 2);
         //XPCOM.nsEmbedString_delete (string);
-        chars = string.toString;
+        chars = string.toString();
     } else {    /* mozilla < 1.7 */
         nsIDOMSerializer serializer;
-        rc = componentManager.CreateInstanceByContractID (XPCOM.NS_DOMSERIALIZER_CONTRACTID, null, &nsIDOMSerializer.IID, cast(void**)&serializer);
+        rc = componentManager.CreateInstanceByContractID (XPCOM.NS_DOMSERIALIZER_CONTRACTID.ptr, null, &nsIDOMSerializer.IID, cast(void**)&serializer);
         if (rc !is XPCOM.NS_OK) error (rc);
         if (serializer is null) error (XPCOM.NS_NOINTERFACE);
         // TODO: Lookup SerializeToString contract. Find out if the string must provide it's own memory to the method. -JJR
@@ -1506,7 +1529,7 @@
         //int length = XPCOM.strlen_PRUnichar (string);
         //chars = new char[length];
         //XPCOM.memmove (chars, result[0], length * 2);
-        chars = Utf.toString(string.fromString16z);
+        chars = Utf.toString(fromString16z(string));
     }
 
     componentManager.Release ();
@@ -1540,7 +1563,7 @@
         location = aSpec.toString;
         //XPCOM.memmove (dest, buffer, length);
         //XPCOM.nsEmbedCString_delete (aSpec);
-        uri.Release ();
+        aCurrentURI.Release ();
     }
     if (location is null) return ""; //$NON-NLS-1$
 
@@ -1614,14 +1637,14 @@
 }
 
 static String error (int code) {
-    throw new DWTError ("XPCOM error " ~ code); //$NON-NLS-1$
+    throw new DWTError ("XPCOM error " ~ Integer.toString(code)); //$NON-NLS-1$
 }
 
 void onDispose (Display display) {
-    int rc = webBrowser.RemoveWebBrowserListener (weakReference, &nsIWebProgressListener.IID);
+    int rc = webBrowser.RemoveWebBrowserListener (cast(nsIWeakReference)this, &nsIWebProgressListener.IID);
     if (rc !is XPCOM.NS_OK) error (rc);
 
-    rc = webBrowser.SetParentURIContentListener (0);
+    rc = webBrowser.SetParentURIContentListener (null);
     if (rc !is XPCOM.NS_OK) error (rc);
     
     unhookDOMListeners ();
@@ -2141,7 +2164,7 @@
 }
 
 nsresult GetWeakReference (void** ppvObject) {
-    *ppvObject = cast(void*)weakReference;
+    *ppvObject = cast(void*)cast(nsIWeakReference)this;
     //XPCOM.memmove (ppvObject, new int /*long*/[] {weakReference.getAddress ()}, C.PTR_SIZEOF);
     AddRef ();
     return XPCOM.NS_OK;
@@ -2290,7 +2313,7 @@
     return XPCOM.NS_OK;
 }
 
-nsresult OnProgressChange (nsIWebProgress aWebProgress, nsIRequest aRequest, PRint32 aCurSelfProgress, PRInt32 aMaxSelfProgress, PRInt32 aCurTotalProgress, PRInt32 aMaxTotalProgress) {
+nsresult OnProgressChange (nsIWebProgress aWebProgress, nsIRequest aRequest, PRInt32 aCurSelfProgress, PRInt32 aMaxSelfProgress, PRInt32 aCurTotalProgress, PRInt32 aMaxTotalProgress) {
     if (awaitingNavigate || super.progressListeners.length is 0) return XPCOM.NS_OK;
     ProgressEvent event = new ProgressEvent (browser);
     event.display = browser.getDisplay ();
@@ -2370,7 +2393,7 @@
     return XPCOM.NS_OK;
 }
 
-int OnStatusChange (nsIWebProgress aWebProgress, nsIRequest aRequest, nsresult aStatus, PRUnichar* aMessage) {
+nsresult OnStatusChange (nsIWebProgress aWebProgress, nsIRequest aRequest, nsresult aStatus, PRUnichar* aMessage) {
     if (awaitingNavigate || statusTextListeners.length is 0) return XPCOM.NS_OK;
     StatusTextEvent event = new StatusTextEvent (browser);
     event.display = browser.getDisplay ();
@@ -2385,13 +2408,13 @@
     return XPCOM.NS_OK;
 }       
 
-int OnSecurityChange (nsIWebProgress aWebProgress, nsIRequest aRequest, PRUint32 state) {
+nsresult OnSecurityChange (nsIWebProgress aWebProgress, nsIRequest aRequest, PRUint32 state) {
     return XPCOM.NS_OK;
 }
 
 /* nsIWebBrowserChrome */
 
-nsresult SetStatus (PRUint32 statusType, PRUinchar* status) {
+nsresult SetStatus (PRUint32 statusType, PRUnichar* status) {
     if (awaitingNavigate || statusTextListeners.length is 0) return XPCOM.NS_OK;
     StatusTextEvent event = new StatusTextEvent (browser);
     event.display = browser.getDisplay ();
@@ -2521,7 +2544,7 @@
     return XPCOM.NS_OK;
 }
 
-int GetDimensions (PRUint32 flags, PRInt32* x, PRInt32* y, PRInt32* cx, PRInt32* cy) {
+nsresult GetDimensions (PRUint32 flags, PRInt32* x, PRInt32* y, PRInt32* cx, PRInt32* cy) {
     if ((flags & nsIEmbeddingSiteWindow.DIM_FLAGS_POSITION) !is 0) {
         Point location = browser.getShell ().getLocation ();
         if (x !is null) *x = location.x; /* PRInt32 */
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/browser/MozillaDelegate.d
--- a/dwt/browser/MozillaDelegate.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/browser/MozillaDelegate.d	Sun Oct 26 21:19:51 2008 -0700
@@ -199,7 +199,7 @@
     return true;
 }
 
-void onDispose (int /*long*/ embedHandle) {
+void onDispose (GtkWidget* embedHandle) {
     if (listener !is null) {
         browser.getDisplay ().removeFilter (DWT.FocusIn, listener);
         browser.getShell ().removeListener (DWT.Deactivate, listener);
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/browser/PromptService2.d
--- a/dwt/browser/PromptService2.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/browser/PromptService2.d	Sun Oct 26 21:19:51 2008 -0700
@@ -14,13 +14,14 @@
 
 import tango.stdc.stdlib;
 
-//import dwt.dwthelper.utils;
+import dwt.dwthelper.utils;
 
 import dwt.DWT;
 //import dwt.internal.C;
 import dwt.internal.Compatibility;
-import dwt.internal.mozilla.XPCOM;
+import XPCOM = dwt.internal.mozilla.XPCOM;
 //import dwt.internal.mozilla.XPCOMObject;
+import dwt.internal.mozilla.Common;
 import dwt.internal.mozilla.nsEmbedString;
 import dwt.internal.mozilla.nsIAuthInformation;
 import dwt.internal.mozilla.nsIChannel;
@@ -35,8 +36,11 @@
 import dwt.internal.mozilla.nsIURI;
 import dwt.internal.mozilla.nsIWebBrowserChrome;
 import dwt.internal.mozilla.nsIWindowWatcher;
+import dwt.internal.mozilla.nsIAuthPromptCallback;
+import dwt.internal.mozilla.nsICancelable;
 import dwt.widgets.MessageBox;
 import dwt.widgets.Shell;
+import dwt.browser.Browser;
 
 class PromptService2 : nsIPromptService2 {
     int refCount = 0;
@@ -160,7 +164,7 @@
     int span = XPCOM.strlen_PRUnichar (aDialogTitle);
     //char[] dest = new char[length];
     //XPCOM.memmove (dest, aDialogTitle, length * 2);
-    String titleLabel = Utf.toString (aDialogTitle[0 .. span]));
+    String titleLabel = Utf.toString (aDialogTitle[0 .. span]);
 
     span = XPCOM.strlen_PRUnichar (aText);
     //dest = new char[length];
@@ -419,7 +423,7 @@
     String realm = ptr3.toString;
     //XPCOM.nsEmbedString_delete (ptr);
 
-    n///sIChannel channel = new nsIChannel (aChannel);
+    //nsIChannel channel = new nsIChannel (aChannel);
     nsIURI uri;
     rc = channel.GetURI (&uri);
     if (rc !is XPCOM.NS_OK) DWT.error (rc);
@@ -482,7 +486,7 @@
         titleLabel = Utf.toString (aDialogTitle[0 .. span]);
     } else {
         //titleLabel = DWT.getMessage ("SWT_Authentication_Required");    //$NON-NLS-1$
-        titleLable = "Authentication Required"
+        titleLabel = "Authentication Required";
     }
     
     span = XPCOM.strlen_PRUnichar (aText);
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/browser/PromptService2Factory.d
--- a/dwt/browser/PromptService2Factory.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/browser/PromptService2Factory.d	Sun Oct 26 21:19:51 2008 -0700
@@ -13,9 +13,9 @@
 module dwt.browser.PromptService2Factory;
 
 //import dwt.dwthelper.utils;
-
+import dwt.internal.mozilla.Common;
 //import dwt.internal.C;
-import dwt.internal.mozilla.XPCOM;
+import XPCOM = dwt.internal.mozilla.XPCOM;
 //import dwt.internal.mozilla.XPCOMObject;
 import dwt.internal.mozilla.nsID;
 import dwt.internal.mozilla.nsIFactory;
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/browser/SimpleEnumerator.d
--- a/dwt/browser/SimpleEnumerator.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/browser/SimpleEnumerator.d	Sun Oct 26 21:19:51 2008 -0700
@@ -15,7 +15,7 @@
 //import dwt.dwthelper.utils;
 
 //import dwt.internal.C;
-import dwt.internal.mozilla.XPCOM;
+import XPCOM = dwt.internal.mozilla.XPCOM;
 //import dwt.internal.mozilla.XPCOMObject;
 import dwt.internal.mozilla.nsID;
 import dwt.internal.mozilla.nsISimpleEnumerator;
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/Common.d
--- a/dwt/internal/mozilla/Common.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/Common.d	Sun Oct 26 21:19:51 2008 -0700
@@ -18,7 +18,7 @@
 
 ******************************************************************************/
 
-extern (System):
+//extern (System):
 
 alias ubyte PRUint8;
 alias byte  PRInt8;
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/XPCOMInit.d
--- a/dwt/internal/mozilla/XPCOMInit.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/XPCOMInit.d	Sun Oct 26 21:19:51 2008 -0700
@@ -29,7 +29,8 @@
  *******************************************************************************/
 module dwt.internal.mozilla.XPCOMInit;
 
-import dwt.internal.Platform;
+//import dwt.internal.Platform;
+import dwt.internal.mozilla.Common;
 
 extern(System) {
 
@@ -52,6 +53,6 @@
 
 extern(System):
 
-public static uint GRE_GetGREPathWithProperties(GREVersionRange *versions, int versionsLength, GREProperty *properties, uint propertiesLength, char *buffer, uint  buflen);
-public static uint XPCOMGlueStartup(char* xpcomFile);
-public static int XPCOMGlueShutdown ();
+nsresult GRE_GetGREPathWithProperties(GREVersionRange *versions, PRUint32 versionsLength, GREProperty *properties, PRUint32 propertiesLength, char *buffer, PRUint32 buflen);
+nsresult XPCOMGlueStartup(char* xpcomFile);
+nsresult XPCOMGlueShutdown ();
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/gfxIImageFrame.d
--- a/dwt/internal/mozilla/gfxIImageFrame.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/gfxIImageFrame.d	Sun Oct 26 21:19:51 2008 -0700
@@ -10,7 +10,7 @@
   {0xf6d00ee7, 0xdefc, 0x4101, 
     [ 0xb2, 0xdc, 0xe7, 0x2c, 0xf4, 0xc3, 0x7c, 0x3c ]};
 
-extern(System)
+//extern(System)
 
 interface gfxIImageFrame : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/imgIContainer.d
--- a/dwt/internal/mozilla/imgIContainer.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/imgIContainer.d	Sun Oct 26 21:19:51 2008 -0700
@@ -13,7 +13,7 @@
   {0x1a6290e6, 0x8285, 0x4e10, 
     [ 0x96, 0x3d, 0xd0, 0x01, 0xf8, 0xd3, 0x27, 0xb8 ]};
 
-extern(System)
+//extern(System)
 
 interface imgIContainer : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/imgIContainerObserver.d
--- a/dwt/internal/mozilla/imgIContainerObserver.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/imgIContainerObserver.d	Sun Oct 26 21:19:51 2008 -0700
@@ -13,7 +13,7 @@
   {0x53102f15, 0x0f53, 0x4939, 
     [ 0x95, 0x7e, 0xae, 0xa3, 0x53, 0xad, 0x27, 0x00 ]};
 
-extern(System)
+//extern(System)
 
 interface imgIContainerObserver : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIAppShell.d
--- a/dwt/internal/mozilla/nsIAppShell.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIAppShell.d	Sun Oct 26 21:19:51 2008 -0700
@@ -11,7 +11,7 @@
   {0xa0757c31, 0xeeac, 0x11d1, 
     [ 0x9e, 0xc1, 0x00, 0xaa, 0x00, 0x2f, 0xb8, 0x21 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIAppShell : nsISupports {
   static const char[] IID_STR = NS_IAPPSHELL_IID_STR;
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIAtom.d
--- a/dwt/internal/mozilla/nsIAtom.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIAtom.d	Sun Oct 26 21:19:51 2008 -0700
@@ -12,7 +12,7 @@
   {0x3d1b15b0, 0x93b4, 0x11d1, 
     [ 0x89, 0x5b, 0x00, 0x60, 0x08, 0x91, 0x1b, 0x81 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIAtom : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIAuthInformation.d
--- a/dwt/internal/mozilla/nsIAuthInformation.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIAuthInformation.d	Sun Oct 26 21:19:51 2008 -0700
@@ -11,7 +11,7 @@
    {0x0d73639c, 0x2a92, 0x4518, 
     [ 0x9f, 0x92, 0x28, 0xf7, 0x1f, 0xea, 0x5f, 0x20 ] };
 
-extern(System)
+//extern(System)
 
 interface nsIAuthInformation : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIAuthPrompt.d
--- a/dwt/internal/mozilla/nsIAuthPrompt.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIAuthPrompt.d	Sun Oct 26 21:19:51 2008 -0700
@@ -12,7 +12,7 @@
   {0x2f977d45, 0x5485, 0x11d4, 
     [ 0x87, 0xe2, 0x00, 0x10, 0xa4, 0xe7, 0x5e, 0xf2 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIAuthPrompt : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIAuthPromptCallback.d
--- a/dwt/internal/mozilla/nsIAuthPromptCallback.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIAuthPromptCallback.d	Sun Oct 26 21:19:51 2008 -0700
@@ -11,7 +11,7 @@
   {0xbdc387d7, 0x2d29, 0x4cac, 
     [ 0x92, 0xf1, 0xdd, 0x75, 0xd7, 0x86, 0x63, 0x1d ]};
 
-extern(System)
+//extern(System)
 
 interface nsIAuthPromptCallback : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIBaseWindow.d
--- a/dwt/internal/mozilla/nsIBaseWindow.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIBaseWindow.d	Sun Oct 26 21:19:51 2008 -0700
@@ -12,7 +12,7 @@
   {0x046bc8a0, 0x8015, 0x11d3, 
     [ 0xaf, 0x70, 0x00, 0xa0, 0x24, 0xff, 0xc0, 0x8c ]};
 
-extern(System)
+//extern(System)
 
 interface nsIBaseWindow : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIBinaryInputStream.d
--- a/dwt/internal/mozilla/nsIBinaryInputStream.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIBinaryInputStream.d	Sun Oct 26 21:19:51 2008 -0700
@@ -13,7 +13,7 @@
   {0x7b456cb0, 0x8772, 0x11d3, 
     [ 0x90, 0xcf, 0x00, 0x40, 0x05, 0x6a, 0x90, 0x6e ]};
 
-extern(System)
+//extern(System)
 
 interface nsIBinaryInputStream : nsIInputStream {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIBinaryOutputStream.d
--- a/dwt/internal/mozilla/nsIBinaryOutputStream.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIBinaryOutputStream.d	Sun Oct 26 21:19:51 2008 -0700
@@ -12,7 +12,7 @@
   {0x204ee610, 0x8765, 0x11d3, 
     [ 0x90, 0xcf, 0x00, 0x40, 0x05, 0x6a, 0x90, 0x6e ]};
 
-extern(System)
+//extern(System)
 
 interface nsIBinaryOutputStream : nsIOutputStream {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsICancelable.d
--- a/dwt/internal/mozilla/nsICancelable.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsICancelable.d	Sun Oct 26 21:19:51 2008 -0700
@@ -10,7 +10,7 @@
   {0xd94ac0a0, 0xbb18, 0x46b8, 
     [ 0x84, 0x4e, 0x84, 0x15, 0x90, 0x64, 0xb0, 0xbd ]};
 
-extern(System)
+//extern(System)
 
 interface nsICancelable : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsICategoryManager.d
--- a/dwt/internal/mozilla/nsICategoryManager.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsICategoryManager.d	Sun Oct 26 21:19:51 2008 -0700
@@ -11,7 +11,7 @@
   {0x3275b2cd, 0xaf6d, 0x429a, 
     [ 0x80, 0xd7, 0xf0, 0xc5, 0x12, 0x03, 0x42, 0xac ]};
 
-extern(System)
+//extern(System)
 
 interface nsICategoryManager : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIChannel.d
--- a/dwt/internal/mozilla/nsIChannel.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIChannel.d	Sun Oct 26 21:19:51 2008 -0700
@@ -16,7 +16,7 @@
   {0xc63a055a, 0xa676, 0x4e71, 
     [ 0xbf, 0x3c, 0x6c, 0xfa, 0x11, 0x08, 0x20, 0x18 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIChannel : nsIRequest {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIChromeEventHandler.d
--- a/dwt/internal/mozilla/nsIChromeEventHandler.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIChromeEventHandler.d	Sun Oct 26 21:19:51 2008 -0700
@@ -12,7 +12,7 @@
   {0x7bc08970, 0x9e6c, 0x11d3, 
     [ 0xaf, 0xb2, 0x00, 0xa0, 0x24, 0xff, 0xc0, 0x8c ]};
 
-extern(System)
+//extern(System)
 
 interface nsIChromeEventHandler : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsICollection.d
--- a/dwt/internal/mozilla/nsICollection.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsICollection.d	Sun Oct 26 21:19:51 2008 -0700
@@ -13,7 +13,7 @@
   {0x83b6019c, 0xcbc4, 0x11d2, 
     [ 0x8c, 0xca, 0x00, 0x60, 0xb0, 0xfc, 0x14, 0xa3 ]};
 
-extern(System)
+//extern(System)
 
 interface nsICollection : nsISerializable {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIComponentManager.d
--- a/dwt/internal/mozilla/nsIComponentManager.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIComponentManager.d	Sun Oct 26 21:19:51 2008 -0700
@@ -11,7 +11,7 @@
   {0xa88e5a60, 0x205a, 0x4bb1, 
     [ 0x94, 0xe1, 0x26, 0x28, 0xda, 0xf5, 0x1e, 0xae ]};
 
-extern(System)
+//extern(System)
 
 interface nsIComponentManager : nsISupports {
   static const char[] IID_STR = NS_ICOMPONENTMANAGER_IID_STR;
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIComponentRegistrar.d
--- a/dwt/internal/mozilla/nsIComponentRegistrar.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIComponentRegistrar.d	Sun Oct 26 21:19:51 2008 -0700
@@ -13,7 +13,7 @@
   {0x2417cbfe, 0x65ad, 0x48a6, 
     [ 0xb4, 0xb6, 0xeb, 0x84, 0xdb, 0x17, 0x43, 0x92 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIComponentRegistrar : nsISupports {
   static const char[] IID_STR = NS_ICOMPONENTREGISTRAR_IID_STR;
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIContentViewer.d
--- a/dwt/internal/mozilla/nsIContentViewer.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIContentViewer.d	Sun Oct 26 21:19:51 2008 -0700
@@ -17,7 +17,7 @@
   {0x6a7ddb40, 0x8a9e, 0x4576, 
     [ 0x8a, 0xd1, 0x71, 0xc5, 0x64, 0x1d, 0x87, 0x80 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIContentViewer : nsISupports {
 
@@ -63,7 +63,7 @@
   {0x51341ed4, 0xa3bf, 0x4fd5, 
     [ 0xae, 0x17, 0x5f, 0xd3, 0xec, 0x59, 0xdc, 0xab ]};
 
-extern(System)
+//extern(System)
 
 interface nsIContentViewer_MOZILLA_1_8_BRANCH : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIContextMenuListener.d
--- a/dwt/internal/mozilla/nsIContextMenuListener.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIContextMenuListener.d	Sun Oct 26 21:19:51 2008 -0700
@@ -12,7 +12,7 @@
   {0x3478b6b0, 0x3875, 0x11d4, 
     [ 0x94, 0xef, 0x00, 0x20, 0x18, 0x3b, 0xf1, 0x81 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIContextMenuListener : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIContextMenuListener2.d
--- a/dwt/internal/mozilla/nsIContextMenuListener2.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIContextMenuListener2.d	Sun Oct 26 21:19:51 2008 -0700
@@ -15,7 +15,7 @@
   {0x7fb719b3, 0xd804, 0x4964, 
     [ 0x95, 0x96, 0x77, 0xcf, 0x92, 0x4e, 0xe3, 0x14 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIContextMenuListener2 : nsISupports {
 
@@ -43,7 +43,7 @@
   {0x2f977d56, 0x5485, 0x11d4, 
     [ 0x87, 0xe2, 0x00, 0x10, 0xa4, 0xe7, 0x5e, 0xf2 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIContextMenuInfo : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsICookie.d
--- a/dwt/internal/mozilla/nsICookie.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsICookie.d	Sun Oct 26 21:19:51 2008 -0700
@@ -14,7 +14,7 @@
   {0xe9fcb9a4, 0xd376, 0x458f, 
     [ 0xb7, 0x20, 0xe6, 0x5e, 0x7d, 0xf5, 0x93, 0xbc ]};
 
-extern(System)
+//extern(System)
 
 interface nsICookie : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsICookie2.d
--- a/dwt/internal/mozilla/nsICookie2.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsICookie2.d	Sun Oct 26 21:19:51 2008 -0700
@@ -11,7 +11,7 @@
   {0xd3493503, 0x7854, 0x46ed, 
     [ 0x82, 0x84, 0x8a, 0xf5, 0x4a, 0x84, 0x7e, 0xfb ]};
 
-extern(System)
+//extern(System)
 
 interface nsICookie2 : nsICookie {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsICookieManager.d
--- a/dwt/internal/mozilla/nsICookieManager.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsICookieManager.d	Sun Oct 26 21:19:51 2008 -0700
@@ -12,7 +12,7 @@
   {0xaaab6710, 0x0f2c, 0x11d5, 
     [ 0xa5, 0x3b, 0x00, 0x10, 0xa4, 0x01, 0xeb, 0x10 ]};
 
-extern(System)
+//extern(System)
 
 interface nsICookieManager : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsICookieManager2.d
--- a/dwt/internal/mozilla/nsICookieManager2.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsICookieManager2.d	Sun Oct 26 21:19:51 2008 -0700
@@ -12,7 +12,7 @@
   {0x3e73ff5f, 0x154e, 0x494f, 
     [ 0xb6, 0x40, 0x3c, 0x65, 0x4b, 0xa2, 0xcc, 0x2b ]};
 
-extern(System)
+//extern(System)
 
 interface nsICookieManager2 : nsICookieManager {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIDOMAbstractView.d
--- a/dwt/internal/mozilla/nsIDOMAbstractView.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIDOMAbstractView.d	Sun Oct 26 21:19:51 2008 -0700
@@ -14,7 +14,7 @@
   {0xf51ebade, 0x8b1a, 0x11d3, 
     [ 0xaa, 0xe7, 0x00, 0x10, 0x83, 0x01, 0x23, 0xb4 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIDOMAbstractView : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIDOMAttr.d
--- a/dwt/internal/mozilla/nsIDOMAttr.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIDOMAttr.d	Sun Oct 26 21:19:51 2008 -0700
@@ -12,7 +12,7 @@
   {0xa6cf9070, 0x15b3, 0x11d2, 
     [ 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIDOMAttr : nsIDOMNode {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIDOMBarProp.d
--- a/dwt/internal/mozilla/nsIDOMBarProp.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIDOMBarProp.d	Sun Oct 26 21:19:51 2008 -0700
@@ -12,7 +12,7 @@
   {0x9eb2c150, 0x1d56, 0x11d3, 
     [ 0x82, 0x21, 0x00, 0x60, 0x08, 0x3a, 0x0b, 0xcf ]};
 
-extern(System)
+//extern(System)
 
 interface nsIDOMBarProp : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIDOMCDATASection.d
--- a/dwt/internal/mozilla/nsIDOMCDATASection.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIDOMCDATASection.d	Sun Oct 26 21:19:51 2008 -0700
@@ -11,7 +11,7 @@
   {0xa6cf9071, 0x15b3, 0x11d2, 
     [ 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIDOMCDATASection : nsIDOMText {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIDOMCharacterData.d
--- a/dwt/internal/mozilla/nsIDOMCharacterData.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIDOMCharacterData.d	Sun Oct 26 21:19:51 2008 -0700
@@ -12,7 +12,7 @@
   {0xa6cf9072, 0x15b3, 0x11d2, 
     [ 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIDOMCharacterData : nsIDOMNode {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIDOMComment.d
--- a/dwt/internal/mozilla/nsIDOMComment.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIDOMComment.d	Sun Oct 26 21:19:51 2008 -0700
@@ -11,7 +11,7 @@
   {0xa6cf9073, 0x15b3, 0x11d2, 
     [ 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIDOMComment : nsIDOMCharacterData {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIDOMDOMImplementation.d
--- a/dwt/internal/mozilla/nsIDOMDOMImplementation.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIDOMDOMImplementation.d	Sun Oct 26 21:19:51 2008 -0700
@@ -14,7 +14,7 @@
   {0xa6cf9074, 0x15b3, 0x11d2, 
     [ 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIDOMDOMImplementation : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIDOMDocument.d
--- a/dwt/internal/mozilla/nsIDOMDocument.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIDOMDocument.d	Sun Oct 26 21:19:51 2008 -0700
@@ -24,7 +24,7 @@
   {0xa6cf9075, 0x15b3, 0x11d2, 
     [ 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIDOMDocument : nsIDOMNode {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIDOMDocumentFragment.d
--- a/dwt/internal/mozilla/nsIDOMDocumentFragment.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIDOMDocumentFragment.d	Sun Oct 26 21:19:51 2008 -0700
@@ -11,7 +11,7 @@
   {0xa6cf9076, 0x15b3, 0x11d2, 
     [ 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 ]};
 
-extern(Windows)
+//extern(Windows)
 interface nsIDOMDocumentFragment : nsIDOMNode {
   static const char[] IID_STR = NS_IDOMDOCUMENTFRAGMENT_IID_STR;
   static const nsIID IID = NS_IDOMDOCUMENTFRAGMENT_IID;
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIDOMDocumentType.d
--- a/dwt/internal/mozilla/nsIDOMDocumentType.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIDOMDocumentType.d	Sun Oct 26 21:19:51 2008 -0700
@@ -13,7 +13,7 @@
   {0xa6cf9077, 0x15b3, 0x11d2, 
     [ 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIDOMDocumentType : nsIDOMNode {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIDOMDocumentView.d
--- a/dwt/internal/mozilla/nsIDOMDocumentView.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIDOMDocumentView.d	Sun Oct 26 21:19:51 2008 -0700
@@ -14,7 +14,7 @@
   {0x1acdb2ba, 0x1dd2, 0x11b2, 
     [ 0x95, 0xbc, 0x95, 0x42, 0x49, 0x5d, 0x25, 0x69 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIDOMDocumentView : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIDOMElement.d
--- a/dwt/internal/mozilla/nsIDOMElement.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIDOMElement.d	Sun Oct 26 21:19:51 2008 -0700
@@ -14,7 +14,7 @@
   {0xa6cf9078, 0x15b3, 0x11d2, 
     [ 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIDOMElement : nsIDOMNode {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIDOMEntityReference.d
--- a/dwt/internal/mozilla/nsIDOMEntityReference.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIDOMEntityReference.d	Sun Oct 26 21:19:51 2008 -0700
@@ -11,7 +11,7 @@
   {0xa6cf907a, 0x15b3, 0x11d2, 
     [ 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIDOMEntityReference : nsIDOMNode {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIDOMEvent.d
--- a/dwt/internal/mozilla/nsIDOMEvent.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIDOMEvent.d	Sun Oct 26 21:19:51 2008 -0700
@@ -14,7 +14,7 @@
   {0xa66b7b80, 0xff46, 0xbd97, 
     [ 0x00, 0x80, 0x5f, 0x8a, 0xe3, 0x8a, 0xdd, 0x32 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIDOMEvent : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIDOMEventGroup.d
--- a/dwt/internal/mozilla/nsIDOMEventGroup.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIDOMEventGroup.d	Sun Oct 26 21:19:51 2008 -0700
@@ -12,7 +12,7 @@
   {0x33347bee, 0x6620, 0x4841, 
     [ 0x81, 0x52, 0x36, 0x09, 0x1a, 0xe8, 0x0c, 0x7e ]};
 
-extern(System)
+//extern(System)
 
 interface nsIDOMEventGroup : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIDOMEventListener.d
--- a/dwt/internal/mozilla/nsIDOMEventListener.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIDOMEventListener.d	Sun Oct 26 21:19:51 2008 -0700
@@ -12,7 +12,7 @@
   {0xdf31c120, 0xded6, 0x11d1, 
     [ 0xbd, 0x85, 0x00, 0x80, 0x5f, 0x8a, 0xe3, 0xf4 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIDOMEventListener : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIDOMEventTarget.d
--- a/dwt/internal/mozilla/nsIDOMEventTarget.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIDOMEventTarget.d	Sun Oct 26 21:19:51 2008 -0700
@@ -15,7 +15,7 @@
   {0x1c773b30, 0xd1cf, 0x11d2, 
     [ 0xbd, 0x95, 0x00, 0x80, 0x5f, 0x8a, 0xe3, 0xf4 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIDOMEventTarget : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIDOMKeyEvent.d
--- a/dwt/internal/mozilla/nsIDOMKeyEvent.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIDOMKeyEvent.d	Sun Oct 26 21:19:51 2008 -0700
@@ -13,7 +13,7 @@
   {0x028e0e6e, 0x8b01, 0x11d3, 
     [ 0xaa, 0xe7, 0x00, 0x10, 0x83, 0x8a, 0x31, 0x23 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIDOMKeyEvent : nsIDOMUIEvent {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIDOMMouseEvent.d
--- a/dwt/internal/mozilla/nsIDOMMouseEvent.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIDOMMouseEvent.d	Sun Oct 26 21:19:51 2008 -0700
@@ -14,7 +14,7 @@
   {0xff751edc, 0x8b02, 0xaae7, 
     [ 0x00, 0x10, 0x83, 0x01, 0x83, 0x8a, 0x31, 0x23 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIDOMMouseEvent : nsIDOMUIEvent {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIDOMNamedNodeMap.d
--- a/dwt/internal/mozilla/nsIDOMNamedNodeMap.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIDOMNamedNodeMap.d	Sun Oct 26 21:19:51 2008 -0700
@@ -15,7 +15,7 @@
   {0xa6cf907b, 0x15b3, 0x11d2, 
     [ 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIDOMNamedNodeMap : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIDOMNode.d
--- a/dwt/internal/mozilla/nsIDOMNode.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIDOMNode.d	Sun Oct 26 21:19:51 2008 -0700
@@ -17,7 +17,7 @@
   {0xa6cf907c, 0x15b3, 0x11d2, 
     [ 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIDOMNode : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIDOMNodeList.d
--- a/dwt/internal/mozilla/nsIDOMNodeList.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIDOMNodeList.d	Sun Oct 26 21:19:51 2008 -0700
@@ -14,7 +14,7 @@
   {0xa6cf907d, 0x15b3, 0x11d2, 
     [ 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIDOMNodeList : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIDOMProcessingInstruction.d
--- a/dwt/internal/mozilla/nsIDOMProcessingInstruction.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIDOMProcessingInstruction.d	Sun Oct 26 21:19:51 2008 -0700
@@ -11,7 +11,7 @@
   {0xa6cf907f, 0x15b3, 0x11d2, 
     [ 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIDOMProcessingInstruction : nsIDOMNode {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIDOMRange.d
--- a/dwt/internal/mozilla/nsIDOMRange.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIDOMRange.d	Sun Oct 26 21:19:51 2008 -0700
@@ -14,7 +14,7 @@
   {0xa6cf90ce, 0x15b3, 0x11d2, 
     [ 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIDOMRange : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIDOMSerializer.d
--- a/dwt/internal/mozilla/nsIDOMSerializer.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIDOMSerializer.d	Sun Oct 26 21:19:51 2008 -0700
@@ -13,7 +13,7 @@
   {0xa6cf9123, 0x15b3, 0x11d2, 
     [ 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIDOMSerializer : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIDOMSerializer_1_7.d
--- a/dwt/internal/mozilla/nsIDOMSerializer_1_7.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIDOMSerializer_1_7.d	Sun Oct 26 21:19:51 2008 -0700
@@ -13,7 +13,7 @@
   {0x9fd4ba15, 0xe67c, 0x4c98, 
     [ 0xb5, 0x2c, 0x77, 0x15, 0xf6, 0x2c, 0x91, 0x96 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIDOMSerializer_1_7 : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIDOMStorage.d
--- a/dwt/internal/mozilla/nsIDOMStorage.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIDOMStorage.d	Sun Oct 26 21:19:51 2008 -0700
@@ -15,7 +15,7 @@
   {0x95cc1383, 0x3b62, 0x4b89, 
     [ 0xaa, 0xef, 0x10, 0x04, 0xa5, 0x13, 0xef, 0x47 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIDOMStorage : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIDOMStorageItem.d
--- a/dwt/internal/mozilla/nsIDOMStorageItem.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIDOMStorageItem.d	Sun Oct 26 21:19:51 2008 -0700
@@ -14,7 +14,7 @@
   {0x0cc37c78, 0x4c5f, 0x48e1, 
     [ 0xad, 0xfc, 0x74, 0x80, 0xb8, 0xfe, 0x9d, 0xc4 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIDOMStorageItem : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIDOMText.d
--- a/dwt/internal/mozilla/nsIDOMText.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIDOMText.d	Sun Oct 26 21:19:51 2008 -0700
@@ -11,7 +11,7 @@
   {0xa6cf9082, 0x15b3, 0x11d2, 
     [ 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIDOMText : nsIDOMCharacterData {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIDOMUIEvent.d
--- a/dwt/internal/mozilla/nsIDOMUIEvent.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIDOMUIEvent.d	Sun Oct 26 21:19:51 2008 -0700
@@ -13,7 +13,7 @@
   {0xa6cf90c3, 0x15b3, 0x11d2, 
     [ 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIDOMUIEvent : nsIDOMEvent {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIDOMWindow.d
--- a/dwt/internal/mozilla/nsIDOMWindow.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIDOMWindow.d	Sun Oct 26 21:19:51 2008 -0700
@@ -18,7 +18,7 @@
   {0xa6cf906b, 0x15b3, 0x11d2, 
     [ 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIDOMWindow : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIDOMWindow2.d
--- a/dwt/internal/mozilla/nsIDOMWindow2.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIDOMWindow2.d	Sun Oct 26 21:19:51 2008 -0700
@@ -11,7 +11,7 @@
   {0x65455132, 0xb96a, 0x40ec, 
     [ 0xad, 0xea, 0x52, 0xfa, 0x22, 0xb1, 0x02, 0x8c ]};
 
-extern(System)
+//extern(System)
 
 interface nsIDOMWindow2 : nsIDOMWindow {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIDOMWindowCollection.d
--- a/dwt/internal/mozilla/nsIDOMWindowCollection.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIDOMWindowCollection.d	Sun Oct 26 21:19:51 2008 -0700
@@ -14,7 +14,7 @@
   {0xa6cf906f, 0x15b3, 0x11d2, 
     [ 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIDOMWindowCollection : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIDebug.d
--- a/dwt/internal/mozilla/nsIDebug.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIDebug.d	Sun Oct 26 21:19:51 2008 -0700
@@ -10,7 +10,7 @@
   {0x3bf0c3d7, 0x3bd9, 0x4cf2, 
     [ 0xa9, 0x71, 0x33, 0x57, 0x2c, 0x50, 0x3e, 0x1e ]};
 
-extern(System)
+//extern(System)
 interface nsIDebug : nsISupports {
   static const char[] IID_STR = NS_IDEBUG_IID_STR;
   static const nsIID IID = NS_IDEBUG_IID;
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIDirectoryService.d
--- a/dwt/internal/mozilla/nsIDirectoryService.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIDirectoryService.d	Sun Oct 26 21:19:51 2008 -0700
@@ -16,7 +16,7 @@
   {0xbbf8cab0, 0xd43a, 0x11d3, 
     [ 0x8c, 0xc2, 0x00, 0x60, 0x97, 0x92, 0x27, 0x8c ]};
 
-extern(System)
+//extern(System)
 
 interface nsIDirectoryServiceProvider : nsISupports {
 
@@ -37,7 +37,7 @@
   {0x2f977d4b, 0x5485, 0x11d4, 
     [ 0x87, 0xe2, 0x00, 0x10, 0xa4, 0xe7, 0x5e, 0xf2 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIDirectoryServiceProvider2 : nsIDirectoryServiceProvider {
 
@@ -58,7 +58,7 @@
   {0x57a66a60, 0xd43a, 0x11d3, 
     [ 0x8c, 0xc2, 0x00, 0x60, 0x97, 0x92, 0x27, 0x8c ]};
 
-extern(System)
+//extern(System)
 
 interface nsIDirectoryService : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIDocShell.d
--- a/dwt/internal/mozilla/nsIDocShell.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIDocShell.d	Sun Oct 26 21:19:51 2008 -0700
@@ -32,7 +32,7 @@
   {0x9f0c7461, 0xb9a4, 0x47f6, 
     [ 0xb8, 0x8c, 0x42, 0x1d, 0xce, 0x1b, 0xce, 0x66 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIDocShell : nsISupports {
 
@@ -138,7 +138,7 @@
   {0x45988a14, 0xb240, 0x4d07, 
     [ 0xae, 0x64, 0x50, 0xec, 0xca, 0x26, 0xe6, 0xd8 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIDocShell_1_8 : nsISupports {
 
@@ -160,7 +160,7 @@
   {0x45988a14, 0xb240, 0x4d07, 
     [ 0xae, 0x64, 0x50, 0xec, 0xca, 0x26, 0xe6, 0xd8 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIDocShell_1_9 : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIDocShellLoadInfo.d
--- a/dwt/internal/mozilla/nsIDocShellLoadInfo.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIDocShellLoadInfo.d	Sun Oct 26 21:19:51 2008 -0700
@@ -16,7 +16,7 @@
   {0x4f813a88, 0x7aca, 0x4607, 
     [ 0x98, 0x96, 0xd9, 0x72, 0x70, 0xcd, 0xf1, 0x5e ]};
 
-extern(System)
+//extern(System)
 
 interface nsIDocShellLoadInfo : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIDocShellTreeItem.d
--- a/dwt/internal/mozilla/nsIDocShellTreeItem.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIDocShellTreeItem.d	Sun Oct 26 21:19:51 2008 -0700
@@ -12,7 +12,7 @@
   {0x7d935d63, 0x6d2a, 0x4600, 
     [ 0xaf, 0xb5, 0x9a, 0x4f, 0x7d, 0x68, 0xb8, 0x25 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIDocShellTreeItem : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIDocShellTreeOwner.d
--- a/dwt/internal/mozilla/nsIDocShellTreeOwner.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIDocShellTreeOwner.d	Sun Oct 26 21:19:51 2008 -0700
@@ -17,7 +17,7 @@
   {0x9e508466, 0x5ebb, 0x4618, 
     [ 0xab, 0xfa, 0x9a, 0xd4, 0x7b, 0xed, 0x0b, 0x2e ]};
 
-extern(System)
+//extern(System)
 
 interface nsIDocShellTreeOwner : nsISupports {
 
@@ -43,7 +43,7 @@
   {0x3c2a6927, 0xe923, 0x4ea8, 
     [ 0xbb, 0xda, 0xa3, 0x35, 0xc7, 0x68, 0xce, 0x4e ]};
 
-extern(System)
+//extern(System)
 
 interface nsIDocShellTreeOwner_MOZILLA_1_8_BRANCH : nsIDocShellTreeOwner {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIDocumentCharsetInfo.d
--- a/dwt/internal/mozilla/nsIDocumentCharsetInfo.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIDocumentCharsetInfo.d	Sun Oct 26 21:19:51 2008 -0700
@@ -12,7 +12,7 @@
   {0x2d40b291, 0x01e1, 0x11d4, 
     [ 0x9d, 0x0e, 0x00, 0x50, 0x04, 0x00, 0x07, 0xb2 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIDocumentCharsetInfo : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIDownload.d
--- a/dwt/internal/mozilla/nsIDownload.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIDownload.d	Sun Oct 26 21:19:51 2008 -0700
@@ -16,7 +16,7 @@
   {0x9e1fd9f2, 0x9727, 0x4926, 
     [ 0x85, 0xcd, 0xf1, 0x6c, 0x37, 0x5b, 0xba, 0x6d ]};
 
-extern(System)
+//extern(System)
 
 interface nsIDownload : nsISuppports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIDownload_1_8.d
--- a/dwt/internal/mozilla/nsIDownload_1_8.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIDownload_1_8.d	Sun Oct 26 21:19:51 2008 -0700
@@ -15,7 +15,7 @@
   {0x9e1fd9f2, 0x9727, 0x4926, 
     [ 0x85, 0xcd, 0xf1, 0x6c, 0x37, 0x5b, 0xba, 0x6d ]};
 
-extern(System)
+//extern(System)
 
 interface nsIDownload_1_8 : nsITransfer {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIEmbeddingSiteWindow.d
--- a/dwt/internal/mozilla/nsIEmbeddingSiteWindow.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIEmbeddingSiteWindow.d	Sun Oct 26 21:19:51 2008 -0700
@@ -10,7 +10,7 @@
   {0x3e5432cd, 0x9568, 0x4bd1, 
     [ 0x8c, 0xbe, 0xd5, 0x0a, 0xba, 0x11, 0x07, 0x43 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIEmbeddingSiteWindow : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIEmbeddingSiteWindow2.d
--- a/dwt/internal/mozilla/nsIEmbeddingSiteWindow2.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIEmbeddingSiteWindow2.d	Sun Oct 26 21:19:51 2008 -0700
@@ -10,7 +10,7 @@
   {0xe932bf55, 0x0a64, 0x4beb, 
     [ 0x92, 0x3a, 0x1f, 0x32, 0xd3, 0x66, 0x10, 0x44 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIEmbeddingSiteWindow2 : nsIEmbeddingSiteWindow {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIEnumerator.d
--- a/dwt/internal/mozilla/nsIEnumerator.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIEnumerator.d	Sun Oct 26 21:19:51 2008 -0700
@@ -14,7 +14,7 @@
   {0xad385286, 0xcbc4, 0x11d2, 
     [ 0x8c, 0xca, 0x00, 0x60, 0xb0, 0xfc, 0x14, 0xa3 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIEnumerator : nsISupports {
 
@@ -38,7 +38,7 @@
   {0x75f158a0, 0xcadd, 0x11d2, 
     [ 0x8c, 0xca, 0x00, 0x60, 0xb0, 0xfc, 0x14, 0xa3 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIBidirectionalEnumerator : nsIEnumerator {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIEventQueue.d
--- a/dwt/internal/mozilla/nsIEventQueue.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIEventQueue.d	Sun Oct 26 21:19:51 2008 -0700
@@ -9,7 +9,7 @@
   {0x176afb41, 0x00a4, 0x11d3, 
     [ 0x9f, 0x2a, 0x00, 0x40, 0x05, 0x53, 0xee, 0xf0 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIEventQueue : nsIEventTarget {
   static const char[] IID_STR = NS_IEVENTQUEUE_IID_STR;
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIEventTarget.d
--- a/dwt/internal/mozilla/nsIEventTarget.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIEventTarget.d	Sun Oct 26 21:19:51 2008 -0700
@@ -10,7 +10,7 @@
   {0xea99ad5b, 0xcc67, 0x4efb, 
     [ 0x97, 0xc9, 0x2e, 0xf6, 0x20, 0xa5, 0x9f, 0x2a ]};
 
-extern(System)
+//extern(System)
 
 interface nsIEventTarget : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIExternalHelperAppService.d
--- a/dwt/internal/mozilla/nsIExternalHelperAppService.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIExternalHelperAppService.d	Sun Oct 26 21:19:51 2008 -0700
@@ -25,7 +25,7 @@
   {0x0ea90cf3, 0x2dd9, 0x470f, 
     [ 0x8f, 0x76, 0xf1, 0x41, 0x74, 0x3c, 0x56, 0x78 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIExternalHelperAppService : nsISupports {
 
@@ -47,7 +47,7 @@
   {0xd0b5d7d3, 0x9565, 0x403d, 
     [ 0x9f, 0xb5, 0xe5, 0x08, 0x9c, 0x45, 0x67, 0xc6 ]};
 
-extern(System)
+//extern(System)
 
 interface nsPIExternalAppLauncher : nsISupports {
 
@@ -68,7 +68,7 @@
   {0x99a0882d, 0x2ff9, 0x4659, 
     [ 0x99, 0x52, 0x9a, 0xc5, 0x31, 0xba, 0x55, 0x92 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIHelperAppLauncher : nsICancelable {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIFactory.d
--- a/dwt/internal/mozilla/nsIFactory.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIFactory.d	Sun Oct 26 21:19:51 2008 -0700
@@ -11,7 +11,7 @@
   {0x00000001, 0x0000, 0x0000, 
     [ 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIFactory : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIFile.d
--- a/dwt/internal/mozilla/nsIFile.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIFile.d	Sun Oct 26 21:19:51 2008 -0700
@@ -12,7 +12,7 @@
   {0xc8c0a080, 0x0868, 0x11d3, 
     [ 0x91, 0x5f, 0xd9, 0xd8, 0x89, 0xd4, 0x8e, 0x3c ]};
 
-extern(System)
+//extern(System)
 
 interface nsIFile : nsISupports {
   static const char[] IID_STR = NS_IFILE_IID_STR;
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIFilePicker.d
--- a/dwt/internal/mozilla/nsIFilePicker.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIFilePicker.d	Sun Oct 26 21:19:51 2008 -0700
@@ -15,7 +15,7 @@
   {0x80faf095, 0xc807, 0x4558, 
     [ 0xa2, 0xcc, 0x18, 0x5e, 0xd7, 0x07, 0x54, 0xea ]};
 
-extern(System)
+//extern(System)
 
 interface nsIFilePicker : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIFileURL.d
--- a/dwt/internal/mozilla/nsIFileURL.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIFileURL.d	Sun Oct 26 21:19:51 2008 -0700
@@ -11,7 +11,7 @@
   {0xd26b2e2e, 0x1dd1, 0x11b2, 
     [ 0x88, 0xf3, 0x85, 0x45, 0xa7, 0xba, 0x79, 0x49 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIFileURL : nsIURL {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIHelperAppLauncher.d
--- a/dwt/internal/mozilla/nsIHelperAppLauncher.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIHelperAppLauncher.d	Sun Oct 26 21:19:51 2008 -0700
@@ -16,7 +16,7 @@
   {0x9503d0fe, 0x4c9d, 0x11d4, 
     [ 0x98, 0xd0, 0x00, 0x10, 0x83, 0x01, 0x0e, 0x9b ]};
 
-extern(System)
+//extern(System)
 
 interface nsIHelperAppLauncher : nsISupports {
 
@@ -31,6 +31,6 @@
   nsresult Cancel();
   nsresult SetWebProgressListener(nsIWebProgressListener aWebProgressListener);
   nsresult CloseProgressWindow();
-  nsresult GetDownloadInfo( nsIURI* aSourceUrl, PRTime* aTimeDownloadStarted, nsIFile* result)
+  nsresult GetDownloadInfo( nsIURI* aSourceUrl, PRTime* aTimeDownloadStarted, nsIFile* result);
 
 }
\ No newline at end of file
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIHelperAppLauncherDialog.d
--- a/dwt/internal/mozilla/nsIHelperAppLauncherDialog.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIHelperAppLauncherDialog.d	Sun Oct 26 21:19:51 2008 -0700
@@ -12,7 +12,7 @@
   {0x64355793, 0x988d, 0x40a5, 
     [ 0xba, 0x8e, 0xfc, 0xde, 0x78, 0xca, 0xc6, 0x31 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIHelperAppLauncherDialog : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIHelperAppLauncher_1_8.d
--- a/dwt/internal/mozilla/nsIHelperAppLauncher_1_8.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIHelperAppLauncher_1_8.d	Sun Oct 26 21:19:51 2008 -0700
@@ -16,7 +16,7 @@
   {0x99a0882d, 0x2ff9, 0x4659, 
     [ 0x99, 0x52, 0x9a, 0xc5, 0x31, 0xba, 0x55, 0x92 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIHelperAppLauncher_1_8 : nsICancelable {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIHelperAppLauncher_1_9.d
--- a/dwt/internal/mozilla/nsIHelperAppLauncher_1_9.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIHelperAppLauncher_1_9.d	Sun Oct 26 21:19:51 2008 -0700
@@ -16,7 +16,7 @@
   {0xcc75c21a, 0x0a79, 0x4f68, 
     [ 0x90, 0xe1, 0x56, 0x32, 0x53, 0xd0, 0xc5, 0x55 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIHelperAppLauncher_1_9 : nsICancelable {
 
@@ -31,6 +31,6 @@
   nsresult SetWebProgressListener(nsIWebProgressListener2 aWebProgressListener);
   nsresult CloseProgressWindow();
   nsresult GetTargetFile(nsIFile *aTargetFile);
-  nsresult GetTargetFileIsExecutable(PRBool* aTargetFileIsExecutable)
+  nsresult GetTargetFileIsExecutable(PRBool* aTargetFileIsExecutable);
   nsresult GetTimeDownloadStarted(PRTime *aTimeDownloadStarted);
 }
\ No newline at end of file
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIHistoryEntry.d
--- a/dwt/internal/mozilla/nsIHistoryEntry.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIHistoryEntry.d	Sun Oct 26 21:19:51 2008 -0700
@@ -12,7 +12,7 @@
   {0xa41661d4, 0x1417, 0x11d5, 
     [ 0x98, 0x82, 0x00, 0xc0, 0x4f, 0xa0, 0x2f, 0x40 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIHistoryEntry : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIIOService.d
--- a/dwt/internal/mozilla/nsIIOService.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIIOService.d	Sun Oct 26 21:19:51 2008 -0700
@@ -15,7 +15,7 @@
   {0xbddeda3f, 0x9020, 0x4d12, 
     [ 0x8c, 0x70, 0x98, 0x4e, 0xe9, 0xf7, 0x93, 0x5e ]};
 
-extern(System)
+//extern(System)
 
 interface nsIIOService : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIIOService2.d
--- a/dwt/internal/mozilla/nsIIOService2.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIIOService2.d	Sun Oct 26 21:19:51 2008 -0700
@@ -10,7 +10,7 @@
   {0xd44fe6d4, 0xee35, 0x4789, 
     [ 0x88, 0x6a, 0xeb, 0x8f, 0x05, 0x54, 0xd0, 0x4e ]};
 
-extern(System)
+//extern(System)
 
 interface nsIIOService2 : nsIIOService {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIInputStream.d
--- a/dwt/internal/mozilla/nsIInputStream.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIInputStream.d	Sun Oct 26 21:19:51 2008 -0700
@@ -17,7 +17,7 @@
   {0xfa9c7f6c, 0x61b3, 0x11d4, 
     [ 0x98, 0x77, 0x00, 0xc0, 0x4f, 0xa0, 0xcf, 0x4a ]};
 
-extern(System)
+//extern(System)
 
 interface nsIInputStream : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIInterfaceRequestor.d
--- a/dwt/internal/mozilla/nsIInterfaceRequestor.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIInterfaceRequestor.d	Sun Oct 26 21:19:51 2008 -0700
@@ -10,7 +10,7 @@
   {0x033a1470, 0x8b2a, 0x11d3, 
     [ 0xaf, 0x88, 0x00, 0xa0, 0x24, 0xff, 0xc0, 0x8c ]};
 
-extern(System)
+//extern(System)
 
 interface nsIInterfaceRequestor : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIJSContextStack.d
--- a/dwt/internal/mozilla/nsIJSContextStack.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIJSContextStack.d	Sun Oct 26 21:19:51 2008 -0700
@@ -14,7 +14,7 @@
   {0xc67d8270, 0x3189, 0x11d3, 
     [ 0x98, 0x85, 0x00, 0x60, 0x08, 0x96, 0x24, 0x22 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIJSContextStack : nsISupports {
 
@@ -38,7 +38,7 @@
   {0xc7e6b7aa, 0xfc12, 0x4ca7, 
     [ 0xb1, 0x40, 0x98, 0xc3, 0x8b, 0x69, 0x89, 0x61 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIJSContextStackIterator : nsISupports {
 
@@ -61,7 +61,7 @@
   {0xa1339ae0, 0x05c1, 0x11d4, 
     [ 0x8f, 0x92, 0x00, 0x10, 0xa4, 0xe7, 0x3d, 0x9a ]};
 
-extern(System)
+//extern(System)
 
 interface nsIThreadJSContextStack : nsIJSContextStack {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsILoadGroup.d
--- a/dwt/internal/mozilla/nsILoadGroup.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsILoadGroup.d	Sun Oct 26 21:19:51 2008 -0700
@@ -15,7 +15,7 @@
   {0x3de0a31c, 0xfeaf, 0x400f, 
     [ 0x9f, 0x1e, 0x4e, 0xf7, 0x1f, 0x8b, 0x20, 0xcc ]};
 
-extern(System)
+//extern(System)
 
 interface nsILoadGroup : nsIRequest {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsILocalFile.d
--- a/dwt/internal/mozilla/nsILocalFile.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsILocalFile.d	Sun Oct 26 21:19:51 2008 -0700
@@ -16,7 +16,7 @@
   {0xaa610f20, 0xa889, 0x11d3, 
     [ 0x8c, 0x81, 0x00, 0x00, 0x64, 0x65, 0x73, 0x74 ]};
 
-extern(System)
+//extern(System)
 
 interface nsILocalFile : nsIFile {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIMIMEInfo.d
--- a/dwt/internal/mozilla/nsIMIMEInfo.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIMIMEInfo.d	Sun Oct 26 21:19:51 2008 -0700
@@ -17,7 +17,7 @@
   {0x1448b42f, 0xcf0d, 0x466e, 
     [ 0x9a, 0x15, 0x64, 0xe8, 0x76, 0xeb, 0xe8, 0x57 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIMIMEInfo : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIMemory.d
--- a/dwt/internal/mozilla/nsIMemory.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIMemory.d	Sun Oct 26 21:19:51 2008 -0700
@@ -10,7 +10,7 @@
   {0x59e7e77a, 0x38e4, 0x11d4, 
     [ 0x8c, 0xf5, 0x00, 0x60, 0xb0, 0xfc, 0x14, 0xa3 ]};
 
-extern(System)
+//extern(System)
 interface nsIMemory : nsISupports {
   static const char[] IID_STR = NS_IMEMORY_IID_STR;
   static const nsIID IID = NS_IMEMORY_IID;
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIModule.d
--- a/dwt/internal/mozilla/nsIModule.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIModule.d	Sun Oct 26 21:19:51 2008 -0700
@@ -12,7 +12,7 @@
   {0x7392d032, 0x5371, 0x11d3, 
     [ 0x99, 0x4e, 0x00, 0x80, 0x5f, 0xd2, 0x6f, 0xee ]};
 
-extern(System)
+//extern(System)
 interface nsIModule : nsISupports {
   static const char[] IID_STR = NS_IMODULE_IID_STR;
   static const nsIID IID = NS_IMODULE_IID;
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIObjectInputStream.d
--- a/dwt/internal/mozilla/nsIObjectInputStream.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIObjectInputStream.d	Sun Oct 26 21:19:51 2008 -0700
@@ -12,7 +12,7 @@
   {0x6c248606, 0x4eae, 0x46fa, 
     [ 0x9d, 0xf0, 0xba, 0x58, 0x50, 0x23, 0x68, 0xeb ]};
 
-extern(System)
+//extern(System)
 
 interface nsIObjectInputStream : nsIBinaryInputStream {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIObjectOutputStream.d
--- a/dwt/internal/mozilla/nsIObjectOutputStream.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIObjectOutputStream.d	Sun Oct 26 21:19:51 2008 -0700
@@ -12,7 +12,7 @@
   {0x92c898ac, 0x5fde, 0x4b99, 
     [ 0x87, 0xb3, 0x5d, 0x48, 0x64, 0x22, 0x09, 0x4b ]};
 
-extern(System)
+//extern(System)
 
 interface nsIObjectOutputStream : nsIBinaryOutputStream {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIObserver.d
--- a/dwt/internal/mozilla/nsIObserver.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIObserver.d	Sun Oct 26 21:19:51 2008 -0700
@@ -10,7 +10,7 @@
   {0xdb242e01, 0xe4d9, 0x11d2, 
     [ 0x9d, 0xde, 0x00, 0x00, 0x64, 0x65, 0x73, 0x74 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIObserver : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIObserverService.d
--- a/dwt/internal/mozilla/nsIObserverService.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIObserverService.d	Sun Oct 26 21:19:51 2008 -0700
@@ -12,7 +12,7 @@
   {0xd07f5192, 0xe3d1, 0x11d2, 
     [ 0x8a, 0xcd, 0x00, 0x10, 0x5a, 0x1b, 0x88, 0x60 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIObserverService : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIOutputStream.d
--- a/dwt/internal/mozilla/nsIOutputStream.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIOutputStream.d	Sun Oct 26 21:19:51 2008 -0700
@@ -19,7 +19,7 @@
   {0x0d0acd2a, 0x61b4, 0x11d4, 
     [ 0x98, 0x77, 0x00, 0xc0, 0x4f, 0xa0, 0xcf, 0x4a ]};
 
-extern(System)
+//extern(System)
 
 interface nsIOutputStream : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIPrefBranch.d
--- a/dwt/internal/mozilla/nsIPrefBranch.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIPrefBranch.d	Sun Oct 26 21:19:51 2008 -0700
@@ -10,7 +10,7 @@
   {0x56c35506, 0xf14b, 0x11d3, 
     [ 0x99, 0xd3, 0xdd, 0xbf, 0xac, 0x2c, 0xcf, 0x65 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIPrefBranch : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIPrefBranch2.d
--- a/dwt/internal/mozilla/nsIPrefBranch2.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIPrefBranch2.d	Sun Oct 26 21:19:51 2008 -0700
@@ -12,7 +12,7 @@
   {0x74567534, 0xeb94, 0x4b1c, 
     [ 0x8f, 0x45, 0x38, 0x96, 0x43, 0xbf, 0xc5, 0x55 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIPrefBranch2 : nsIPrefBranch {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIPrefLocalizedString.d
--- a/dwt/internal/mozilla/nsIPrefLocalizedString.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIPrefLocalizedString.d	Sun Oct 26 21:19:51 2008 -0700
@@ -10,7 +10,7 @@
   {0xae419e24, 0x1dd1, 0x11b2, 
     [ 0xb3, 0x9a, 0xd3, 0xe5, 0xe7, 0x07, 0x38, 0x02 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIPrefLocalizedString : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIPrefService.d
--- a/dwt/internal/mozilla/nsIPrefService.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIPrefService.d	Sun Oct 26 21:19:51 2008 -0700
@@ -12,7 +12,7 @@
   {0xdecb9cc7, 0xc08f, 0x4ea5, 
     [ 0xbe, 0x91, 0xa8, 0xfc, 0x63, 0x7c, 0xe2, 0xd2 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIPrefService : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIProgressDialog.d
--- a/dwt/internal/mozilla/nsIProgressDialog.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIProgressDialog.d	Sun Oct 26 21:19:51 2008 -0700
@@ -13,7 +13,7 @@
   {0x88a478b3, 0xaf65, 0x440a, 
     [ 0x94, 0xdc, 0xed, 0x9b, 0x15, 0x4d, 0x29, 0x90 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIProgressDialog : nsIDownload {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIProgressDialog_1_8.d
--- a/dwt/internal/mozilla/nsIProgressDialog_1_8.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIProgressDialog_1_8.d	Sun Oct 26 21:19:51 2008 -0700
@@ -13,7 +13,7 @@
   {0x20e790a2, 0x76c6, 0x462d, 
     [ 0x85, 0x1a, 0x22, 0xab, 0x6c, 0xbb, 0xe4, 0x8b ]};
 
-extern(System)
+//extern(System)
 
 interface nsIProgressDialog_1_8 : nsIDownload_1_8 {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIPrompt.d
--- a/dwt/internal/mozilla/nsIPrompt.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIPrompt.d	Sun Oct 26 21:19:51 2008 -0700
@@ -10,7 +10,7 @@
   {0xa63f70c0, 0x148b, 0x11d3, 
     [ 0x93, 0x33, 0x00, 0x10, 0x4b, 0xa0, 0xfd, 0x40 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIPrompt : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIPromptService.d
--- a/dwt/internal/mozilla/nsIPromptService.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIPromptService.d	Sun Oct 26 21:19:51 2008 -0700
@@ -12,7 +12,7 @@
   {0x1630c61a, 0x325e, 0x49ca, 
     [ 0x87, 0x59, 0xa3, 0x1b, 0x16, 0xc4, 0x7a, 0xa5 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIPromptService : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIPromptService2.d
--- a/dwt/internal/mozilla/nsIPromptService2.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIPromptService2.d	Sun Oct 26 21:19:51 2008 -0700
@@ -3,8 +3,11 @@
 import dwt.internal.mozilla.Common;
 import dwt.internal.mozilla.nsID;
 import dwt.internal.mozilla.nsISupports;
+import dwt.internal.mozilla.nsICancelable;
 import dwt.internal.mozilla.nsIChannel;
 import dwt.internal.mozilla.nsIAuthInformation;
+import dwt.internal.mozilla.nsIAuthPromptCallback;
+import dwt.internal.mozilla.nsIPromptService;
 
 import dwt.internal.mozilla.nsIDOMWindow;
 
@@ -14,15 +17,15 @@
   {0xcf86d196, 0xdbee, 0x4482, 
     [ 0x9d, 0xfa, 0x34, 0x77, 0xaa, 0x12, 0x83, 0x19 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIPromptService2 : nsIPromptService {
 
   static const char[] IID_STR = NS_IPROMPTSERVICE2_IID_STR;
   static const nsIID IID = NS_IPROMPTSERVICE2_IID;
 
-    public int PromptAuth(nsIDOMWindow aParent, nsIChannel aChannel, PRUint32 level, nsIAuthInformation authInfo, PRUnichar* checkboxLabel, PRBool* checkValue, PRBool* _retval);
+    public nsresult PromptAuth(nsIDOMWindow aParent, nsIChannel aChannel, PRUint32 level, nsIAuthInformation authInfo, PRUnichar* checkboxLabel, PRBool* checkValue, PRBool* _retval);
 
-    public int AsyncPromptAuth(nsIDOMWindow aParent, nsIChannel aChannel, nsIAuthPromptCallback aCallback, nsISupports aContext, PRUint32 level, nsIAuthInformation authInfo, PRUnichar* checkboxLabel, PRBool* checkValue, nsICancelable* _retval);
+    public nsresult AsyncPromptAuth(nsIDOMWindow aParent, nsIChannel aChannel, nsIAuthPromptCallback aCallback, nsISupports aContext, PRUint32 level, nsIAuthInformation authInfo, PRUnichar* checkboxLabel, PRBool* checkValue, nsICancelable* _retval);
 
 }
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIProperties.d
--- a/dwt/internal/mozilla/nsIProperties.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIProperties.d	Sun Oct 26 21:19:51 2008 -0700
@@ -10,7 +10,7 @@
   {0x78650582, 0x4e93, 0x4b60, 
     [ 0x8e, 0x85, 0x26, 0xeb, 0xd3, 0xeb, 0x14, 0xca ]};
 
-extern(System)
+//extern(System)
 
 interface nsIProperties : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIProtocolHandler.d
--- a/dwt/internal/mozilla/nsIProtocolHandler.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIProtocolHandler.d	Sun Oct 26 21:19:51 2008 -0700
@@ -13,7 +13,7 @@
   {0x15fd6940, 0x8ea7, 0x11d3, 
     [ 0x93, 0xad, 0x00, 0x10, 0x4b, 0xa0, 0xfd, 0x40 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIProtocolHandler : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIRequest.d
--- a/dwt/internal/mozilla/nsIRequest.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIRequest.d	Sun Oct 26 21:19:51 2008 -0700
@@ -14,7 +14,7 @@
   {0xef6bfbd2, 0xfd46, 0x48d8, 
     [ 0x96, 0xb7, 0x9f, 0x8f, 0x0f, 0xd3, 0x87, 0xfe ]};
 
-extern(System)
+//extern(System)
 
 interface nsIRequest : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIRequestObserver.d
--- a/dwt/internal/mozilla/nsIRequestObserver.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIRequestObserver.d	Sun Oct 26 21:19:51 2008 -0700
@@ -12,7 +12,7 @@
   {0xfd91e2e0, 0x1481, 0x11d3, 
     [ 0x93, 0x33, 0x00, 0x10, 0x4b, 0xa0, 0xfd, 0x40 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIRequestObserver : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsISHEntry.d
--- a/dwt/internal/mozilla/nsISHEntry.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsISHEntry.d	Sun Oct 26 21:19:51 2008 -0700
@@ -18,7 +18,7 @@
   {0x542a98b9, 0x2889, 0x4922, 
     [ 0xaa, 0xf4, 0x02, 0xb6, 0x05, 0x6f, 0x41, 0x36 ]};
 
-extern(System)
+//extern(System)
 
 interface nsISHEntry : nsIHistoryEntry {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsISHistory.d
--- a/dwt/internal/mozilla/nsISHistory.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsISHistory.d	Sun Oct 26 21:19:51 2008 -0700
@@ -14,7 +14,7 @@
   {0x7294fe9b, 0x14d8, 0x11d5, 
     [ 0x98, 0x82, 0x00, 0xc0, 0x4f, 0xa0, 0x2f, 0x40 ]};
 
-extern(System)
+//extern(System)
 
 interface nsISHistory : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsISHistoryListener.d
--- a/dwt/internal/mozilla/nsISHistoryListener.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsISHistoryListener.d	Sun Oct 26 21:19:51 2008 -0700
@@ -12,7 +12,7 @@
   {0x3b07f591, 0xe8e1, 0x11d4, 
     [ 0x98, 0x82, 0x00, 0xc0, 0x4f, 0xa0, 0x2f, 0x40 ]};
 
-extern(System)
+//extern(System)
 
 interface nsISHistoryListener : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsISecureBrowserUI.d
--- a/dwt/internal/mozilla/nsISecureBrowserUI.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsISecureBrowserUI.d	Sun Oct 26 21:19:51 2008 -0700
@@ -13,7 +13,7 @@
   {0x081e31e0, 0xa144, 0x11d3, 
     [ 0x8c, 0x7c, 0x00, 0x60, 0x97, 0x92, 0x27, 0x8c ]};
 
-extern(System)
+//extern(System)
 
 interface nsISecureBrowserUI : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsISelection.d
--- a/dwt/internal/mozilla/nsISelection.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsISelection.d	Sun Oct 26 21:19:51 2008 -0700
@@ -13,7 +13,7 @@
   {0xb2c7ed59, 0x8634, 0x4352, 
     [ 0x9e, 0x37, 0x54, 0x84, 0xc8, 0xb6, 0xe4, 0xe1 ]};
 
-extern(System)
+//extern(System)
 
 interface nsISelection : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsISerializable.d
--- a/dwt/internal/mozilla/nsISerializable.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsISerializable.d	Sun Oct 26 21:19:51 2008 -0700
@@ -13,7 +13,7 @@
   {0x91cca981, 0xc26d, 0x44a8, 
     [ 0xbe, 0xbe, 0xd9, 0xed, 0x48, 0x91, 0x50, 0x3a ]};
 
-extern(System)
+//extern(System)
 
 interface nsISerializable : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIServiceManager.d
--- a/dwt/internal/mozilla/nsIServiceManager.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIServiceManager.d	Sun Oct 26 21:19:51 2008 -0700
@@ -9,7 +9,7 @@
   {0x8bb35ed9, 0xe332, 0x462d, 
     [ 0x91, 0x55, 0x4a, 0x00, 0x2a, 0xb5, 0xc9, 0x58 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIServiceManager : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsISimpleEnumerator.d
--- a/dwt/internal/mozilla/nsISimpleEnumerator.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsISimpleEnumerator.d	Sun Oct 26 21:19:51 2008 -0700
@@ -10,7 +10,7 @@
   {0xd1899240, 0xf9d2, 0x11d2, 
     [ 0xbd, 0xd6, 0x00, 0x00, 0x64, 0x65, 0x73, 0x74 ]};
 
-extern(System)
+//extern(System)
 
 interface nsISimpleEnumerator : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIStreamListener.d
--- a/dwt/internal/mozilla/nsIStreamListener.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIStreamListener.d	Sun Oct 26 21:19:51 2008 -0700
@@ -14,7 +14,7 @@
   {0x1a637020, 0x1482, 0x11d3, 
     [ 0x93, 0x33, 0x00, 0x10, 0x4b, 0xa0, 0xfd, 0x40 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIStreamListener : nsIRequestObserver {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIStringEnumerator.d
--- a/dwt/internal/mozilla/nsIStringEnumerator.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIStringEnumerator.d	Sun Oct 26 21:19:51 2008 -0700
@@ -16,7 +16,7 @@
   {0x50d3ef6c, 0x9380, 0x4f06, 
     [ 0x9f, 0xb2, 0x95, 0x48, 0x8f, 0x7d, 0x14, 0x1c ]};
 
-extern(System)
+//extern(System)
 
 interface nsIStringEnumerator : nsISupports {
 
@@ -38,7 +38,7 @@
   {0x9bdf1010, 0x3695, 0x4907, 
     [ 0x95, 0xed, 0x83, 0xd0, 0x41, 0x0e, 0xc3, 0x07 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIUTF8StringEnumerator : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsISupports.d
--- a/dwt/internal/mozilla/nsISupports.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsISupports.d	Sun Oct 26 21:19:51 2008 -0700
@@ -9,14 +9,14 @@
         { 0x00000000, 0x0000, 0x0000, 
           [ 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46 ] };
 
-extern(System) 
+//extern(System) 
 
-interface IUnknown 
+interface nsISupports 
 {
     static const char[] IID_STR = NS_ISUPPORTS_IID_STR;
     static const nsIID IID = NS_ISUPPORTS_IID;
 
-    nsresult QueryInterface(ref nsIID uuid, void **result);
+    nsresult QueryInterface( nsIID* uuid, void **result);
 
     nsrefcnt AddRef();
     nsrefcnt Release();
@@ -28,4 +28,4 @@
 // compatible with MS COM.  XPCOM's nsISupports interface is the exact equivalent
 // of IUnknown so we alias it here to take advantage of D's COM support. -JJR
 
-alias IUnknown nsISupports;
\ No newline at end of file
+//alias IUnknown nsISupports;
\ No newline at end of file
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsISupportsArray.d
--- a/dwt/internal/mozilla/nsISupportsArray.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsISupportsArray.d	Sun Oct 26 21:19:51 2008 -0700
@@ -14,7 +14,7 @@
   {0x791eafa0, 0xb9e6, 0x11d1, 
     [ 0x80, 0x31, 0x00, 0x60, 0x08, 0x15, 0x9b, 0x5a ]};
 
-extern(System)
+//extern(System)
 
 interface nsISupportsArray : nsICollection {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsITooltipListener.d
--- a/dwt/internal/mozilla/nsITooltipListener.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsITooltipListener.d	Sun Oct 26 21:19:51 2008 -0700
@@ -10,7 +10,7 @@
   {0x44b78386, 0x1dd2, 0x11b2, 
     [ 0x9a, 0xd2, 0xe4, 0xee, 0xe2, 0xca, 0x19, 0x16 ]};
 
-extern(System)
+//extern(System)
 
 interface nsITooltipListener : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsITraceRefcnt.d
--- a/dwt/internal/mozilla/nsITraceRefcnt.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsITraceRefcnt.d	Sun Oct 26 21:19:51 2008 -0700
@@ -10,7 +10,7 @@
   {0x273dc92f, 0x0fe6, 0x4545, 
     [ 0x96, 0xa9, 0x21, 0xbe, 0x77, 0x82, 0x80, 0x39 ]};
 
-extern(System)
+//extern(System)
 interface nsITraceRefcnt : nsISupports {
   static const char[] IID_STR = NS_ITRACEREFCNT_IID_STR;
   static const nsIID IID = NS_ITRACEREFCNT_IID;
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsITransfer.d
--- a/dwt/internal/mozilla/nsITransfer.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsITransfer.d	Sun Oct 26 21:19:51 2008 -0700
@@ -19,7 +19,7 @@
   {0x23c51569, 0xe9a1, 0x4a92, 
     [ 0xad, 0xeb, 0x37, 0x23, 0xdb, 0x82, 0xef, 0x7c ]};
 
-extern(System)
+//extern(System)
 
 interface nsITransfer : nsIWebProgressListener2 {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIURI.d
--- a/dwt/internal/mozilla/nsIURI.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIURI.d	Sun Oct 26 21:19:51 2008 -0700
@@ -11,7 +11,7 @@
   {0x07a22cc0, 0x0ce5, 0x11d3, 
     [ 0x93, 0x31, 0x00, 0x10, 0x4b, 0xa0, 0xfd, 0x40 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIURI : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIURIContentListener.d
--- a/dwt/internal/mozilla/nsIURIContentListener.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIURIContentListener.d	Sun Oct 26 21:19:51 2008 -0700
@@ -14,7 +14,7 @@
   {0x94928ab3, 0x8b63, 0x11d3, 
     [ 0x98, 0x9d, 0x00, 0x10, 0x83, 0x01, 0x0e, 0x9b ]};
 
-extern(System)
+//extern(System)
 
 interface nsIURIContentListener : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIURL.d
--- a/dwt/internal/mozilla/nsIURL.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIURL.d	Sun Oct 26 21:19:51 2008 -0700
@@ -11,7 +11,7 @@
   {0xd6116970, 0x8034, 0x11d3, 
     [ 0x93, 0x99, 0x00, 0x10, 0x4b, 0xa0, 0xfd, 0x40 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIURL : nsIURI {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIWeakReference.d
--- a/dwt/internal/mozilla/nsIWeakReference.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIWeakReference.d	Sun Oct 26 21:19:51 2008 -0700
@@ -14,7 +14,7 @@
   {0x9188bc85, 0xf92e, 0x11d2, 
     [ 0x81, 0xef, 0x00, 0x60, 0x08, 0x3a, 0x0b, 0xcf ]};
 
-extern(System)
+//extern(System)
 
 interface nsIWeakReference : nsISupports {
 
@@ -35,7 +35,7 @@
   {0x9188bc86, 0xf92e, 0x11d2, 
     [ 0x81, 0xef, 0x00, 0x60, 0x08, 0x3a, 0x0b, 0xcf ]};
 
-extern(System)
+//extern(System)
 
 interface nsISupportsWeakReference : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIWebBrowser.d
--- a/dwt/internal/mozilla/nsIWebBrowser.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIWebBrowser.d	Sun Oct 26 21:19:51 2008 -0700
@@ -15,7 +15,7 @@
   {0x69e5df00, 0x7b8b, 0x11d3, 
     [ 0xaf, 0x61, 0x00, 0xa0, 0x24, 0xff, 0xc0, 0x8c ]};
 
-extern(System)
+//extern(System)
 
 interface nsIWebBrowser : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIWebBrowserChrome.d
--- a/dwt/internal/mozilla/nsIWebBrowserChrome.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIWebBrowserChrome.d	Sun Oct 26 21:19:51 2008 -0700
@@ -12,7 +12,7 @@
   {0xba434c60, 0x9d52, 0x11d3, 
     [ 0xaf, 0xb0, 0x00, 0xa0, 0x24, 0xff, 0xc0, 0x8c ]};
 
-extern(System)
+//extern(System)
 
 interface nsIWebBrowserChrome : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIWebBrowserChromeFocus.d
--- a/dwt/internal/mozilla/nsIWebBrowserChromeFocus.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIWebBrowserChromeFocus.d	Sun Oct 26 21:19:51 2008 -0700
@@ -10,7 +10,7 @@
   {0xd2206418, 0x1dd1, 0x11b2, 
     [ 0x8e, 0x55, 0xac, 0xdd, 0xcd, 0x2b, 0xcf, 0xb8 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIWebBrowserChromeFocus : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIWebBrowserFocus.d
--- a/dwt/internal/mozilla/nsIWebBrowserFocus.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIWebBrowserFocus.d	Sun Oct 26 21:19:51 2008 -0700
@@ -12,7 +12,7 @@
   {0x9c5d3c58, 0x1dd1, 0x11b2, 
     [ 0xa1, 0xc9, 0xf3, 0x69, 0x92, 0x84, 0x65, 0x7a ]};
 
-extern(System)
+//extern(System)
 
 interface nsIWebBrowserFocus : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIWebNavigation.d
--- a/dwt/internal/mozilla/nsIWebNavigation.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIWebNavigation.d	Sun Oct 26 21:19:51 2008 -0700
@@ -15,7 +15,7 @@
   {0xf5d9e7b0, 0xd930, 0x11d3, 
     [ 0xb0, 0x57, 0x00, 0xa0, 0x24, 0xff, 0xc0, 0x8c ]};
 
-extern(System)
+//extern(System)
 
 interface nsIWebNavigation : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIWebNavigationInfo.d
--- a/dwt/internal/mozilla/nsIWebNavigationInfo.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIWebNavigationInfo.d	Sun Oct 26 21:19:51 2008 -0700
@@ -12,7 +12,7 @@
   {0x62a93afb, 0x93a1, 0x465c, 
     [ 0x84, 0xc8, 0x04, 0x32, 0x26, 0x42, 0x29, 0xde ]};
 
-extern(System)
+//extern(System)
 
 interface nsIWebNavigationInfo : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIWebProgress.d
--- a/dwt/internal/mozilla/nsIWebProgress.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIWebProgress.d	Sun Oct 26 21:19:51 2008 -0700
@@ -13,7 +13,7 @@
   {0x570f39d0, 0xefd0, 0x11d3, 
     [ 0xb0, 0x93, 0x00, 0xa0, 0x24, 0xff, 0xc0, 0x8c ]};
 
-extern(System)
+//extern(System)
 
 interface nsIWebProgress : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIWebProgressListener.d
--- a/dwt/internal/mozilla/nsIWebProgressListener.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIWebProgressListener.d	Sun Oct 26 21:19:51 2008 -0700
@@ -14,7 +14,7 @@
   {0x570f39d1, 0xefd0, 0x11d3, 
     [ 0xb0, 0x93, 0x00, 0xa0, 0x24, 0xff, 0xc0, 0x8c ]};
 
-extern(System)
+//extern(System)
 
 interface nsIWebProgressListener : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIWebProgressListener2.d
--- a/dwt/internal/mozilla/nsIWebProgressListener2.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIWebProgressListener2.d	Sun Oct 26 21:19:51 2008 -0700
@@ -13,7 +13,7 @@
   {0x3f24610d, 0x1e1f, 0x4151, 
     [ 0x9d, 0x2e, 0x23, 0x98, 0x84, 0x74, 0x23, 0x24 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIWebProgressListener2 : nsIWebProgressListener {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIWindowCreator.d
--- a/dwt/internal/mozilla/nsIWindowCreator.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIWindowCreator.d	Sun Oct 26 21:19:51 2008 -0700
@@ -12,7 +12,7 @@
   {0x30465632, 0xa777, 0x44cc, 
     [ 0x90, 0xf9, 0x81, 0x45, 0x47, 0x5e, 0xf9, 0x99 ]};
 
-extern(System)
+//extern(System)
 
 interface nsIWindowCreator : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIWindowCreator2.d
--- a/dwt/internal/mozilla/nsIWindowCreator2.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIWindowCreator2.d	Sun Oct 26 21:19:51 2008 -0700
@@ -13,7 +13,7 @@
   {0xf673ec81, 0xa4b0, 0x11d6, 
     [ 0x96, 0x4b, 0xeb, 0x5a, 0x2b, 0xf2, 0x16, 0xfc ]};
 
-extern(System)
+//extern(System)
 
 interface nsIWindowCreator2 : nsIWindowCreator {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsIWindowWatcher.d
--- a/dwt/internal/mozilla/nsIWindowWatcher.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsIWindowWatcher.d	Sun Oct 26 21:19:51 2008 -0700
@@ -18,7 +18,7 @@
   {0x002286a8, 0x494b, 0x43b3, 
     [ 0x8d, 0xdd, 0x49, 0xe3, 0xfc, 0x50, 0x62, 0x2b ]};
 
-extern(System)
+//extern(System)
 
 interface nsIWindowWatcher : nsISupports {
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsStringAPI.d
--- a/dwt/internal/mozilla/nsStringAPI.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsStringAPI.d	Sun Oct 26 21:19:51 2008 -0700
@@ -2,7 +2,7 @@
 
 import dwt.internal.mozilla.Common;
 
-extern (System):
+//extern (System):
 
 /******************************************************************************
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/nsXPCOMGlue.d
--- a/dwt/internal/mozilla/nsXPCOMGlue.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/nsXPCOMGlue.d	Sun Oct 26 21:19:51 2008 -0700
@@ -1,6 +1,6 @@
 module dwt.internal.mozilla.nsXPCOMGlue;
 
-extern(System):
+//extern(System):
 
 align(4):
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/prinrval.d
--- a/dwt/internal/mozilla/prinrval.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/prinrval.d	Sun Oct 26 21:19:51 2008 -0700
@@ -38,7 +38,7 @@
 
 import dwt.internal.mozilla.Common;
 
-extern (System):
+//extern (System):
 
 alias PRUint32 PRIntervalTime;
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/prio.d
--- a/dwt/internal/mozilla/prio.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/prio.d	Sun Oct 26 21:19:51 2008 -0700
@@ -4,7 +4,7 @@
 import dwt.internal.mozilla.prtime;
 import dwt.internal.mozilla.prinrval;
 
-extern (System):
+//extern (System):
 
 alias PRIntn PRDescIdentity;
 alias void   PRFilePrivate;
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/prlink.d
--- a/dwt/internal/mozilla/prlink.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/prlink.d	Sun Oct 26 21:19:51 2008 -0700
@@ -44,7 +44,7 @@
     void  function()fp;
 }
 
-extern (System):
+//extern (System):
 
 PRStatus  PR_SetLibraryPath(char *path);
 
diff -r 3f4a5c7d138f -r 942da4b6558a dwt/internal/mozilla/prtime.d
--- a/dwt/internal/mozilla/prtime.d	Sun Oct 26 08:09:00 2008 -0700
+++ b/dwt/internal/mozilla/prtime.d	Sun Oct 26 21:19:51 2008 -0700
@@ -44,7 +44,7 @@
 const PR_USEC_PER_MSEC = 1000U;
 const PR_NSEC_PER_MSEC = 1000000U;
 
-extern (System):
+//extern (System):
 
 alias PRInt64 PRTime;