This commit was manufactured by cvs2svn to create tag 'XTech99Stable'.

git-svn-id: svn://10.0.0.236/tags/XTech99Stable@22624 18797224-902f-48f8-a5cc-f745e15eee43
Fix recursion problem
1999-03-02 23:22:06 +00:00 · 1999-03-01 19:06:27 +00:00 · 1999-03-01 18:56:20 +00:00 · 1999-03-01 18:38:26 +00:00 · 1999-03-01 18:09:13 +00:00 · 1999-03-01 18:07:22 +00:00
2867 changed files with 231772 additions and 106180 deletions
--- a/mozilla/Makefile.in
+++ b/mozilla/Makefile.in
@@ -26,17 +26,16 @@ include $(DEPTH)/config/autoconf.mk
 # nglayout test program. The order is important.
 DIRS =				\
  config			\
-  dbm				\
-  nsprpub			\
  $(NULL)

-ifndef MOZ_NATIVE_JPEG
+ifndef MOZ_NATIVE_NSPR
 DIRS +=				\
-  jpeg				\
+  nsprpub			\
  $(NULL)
 endif

 DIRS +=				\
+  dbm				\
  modules/libreg		\
  xpcom				\
  $(NULL)
@@ -47,23 +46,26 @@ DIRS +=				\
  $(NULL)
 endif

+ifndef MOZ_NATIVE_JPEG
+DIRS +=				\
+  jpeg				\
+  $(NULL)
+endif
+
 DIRS +=				\
  modules/libutil		\
+  base				\
  intl				\
-  sun-java			\
-  nav-java			\
  js				\
  modules/security/freenav	\
  modules/libpref		\
  modules/libimg		\
-  modules/oji		\
+  modules/oji			\
  modules/plugin		\
-  base				\
  caps				\
  lib/xp			\
  lib/libpwcac			\
  network			\
-  lib/liblayer/include		\
  htmlparser			\
  gfx				\
  dom				\
@@ -73,11 +75,17 @@ DIRS +=				\
  rdf				\
  webshell			\
  editor			\
-  silentdl
+  silentdl			\
+  sun-java			\
+  $(NULL)


 DIRS += xpfe

+ifdef MOZ_MAIL_NEWS
+DIRS += mailnews
+endif
+
 include $(topsrcdir)/config/config.mk

 include $(topsrcdir)/config/rules.mk
--- a/mozilla/aclocal.m4
+++ b/mozilla/aclocal.m4
@@ -3,5 +3,6 @@ dnl Local autoconf macros used with mozilla
 dnl The contents of this file are under the Public Domain.
 dnl 

-builtin(include, gtk.m4)dnl
+builtin(include, build/autoconf/gtk.m4)dnl
+builtin(include, build/autoconf/altoptions.m4)dnl

--- a/mozilla/allmakefiles.sh
+++ b/mozilla/allmakefiles.sh
@@ -0,0 +1,374 @@
+#! /bin/sh
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1999 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+# allmakefiles.sh - List of all makefiles. 
+#   This script outputs the list to the standard output.
+#   There is no need to rerun autoconf after adding makefiles.
+#   You only need to run configure.
+#
+#   Unused makefiles may be commented out with '#'.
+#   ('#' must be the first character on the line).
+
+# add_makefiles - Shell function to write non-commented lines to stdout
+add_makefiles() {
+  while read line; do
+    case $line in
+      \#*|dnl*) ;;
+      *) echo $line ;;
+    esac
+  done
+}
+
+add_makefiles <<END_NGMAKEFILES
+Makefile
+base/Makefile
+base/public/Makefile
+base/src/Makefile
+base/src/motif/Makefile
+base/src/rhapsody/Makefile
+base/src/gtk/Makefile
+base/tests/Makefile
+config/Makefile
+config/autoconf.mk
+config/mkdepend/Makefile
+config/mkdetect/Makefile
+config/ports/Makefile
+dbm/Makefile
+dbm/include/Makefile
+dbm/src/Makefile
+dbm/tests/Makefile
+dom/Makefile
+dom/public/Makefile
+dom/public/base/Makefile
+dom/public/coreDom/Makefile
+dom/public/coreEvents/Makefile
+dom/public/css/Makefile
+dom/public/events/Makefile
+dom/public/html/Makefile
+dom/src/Makefile
+dom/src/base/Makefile
+dom/src/build/Makefile
+dom/src/coreDOM/Makefile
+dom/src/css/Makefile
+dom/src/events/Makefile
+dom/src/html/Makefile
+dom/src/jsurl/Makefile
+dom/tools/Makefile
+editor/Makefile
+editor/public/Makefile
+gfx/Makefile
+gfx/public/Makefile
+gfx/src/Makefile
+gfx/src/gtk/Makefile
+gfx/src/motif/Makefile
+gfx/src/rhapsody/Makefile
+gfx/tests/Makefile
+htmlparser/Makefile
+htmlparser/robot/Makefile
+htmlparser/src/Makefile
+htmlparser/tests/Makefile
+htmlparser/tests/grabpage/Makefile
+htmlparser/tests/logparse/Makefile
+include/Makefile
+intl/Makefile
+intl/uconv/Makefile
+intl/uconv/public/Makefile
+intl/uconv/src/Makefile
+intl/uconv/tests/Makefile
+intl/uconv/ucvja/Makefile
+intl/uconv/ucvlatin/Makefile
+intl/uconv/ucvja2/Makefile
+intl/locale/Makefile
+intl/locale/public/Makefile
+intl/locale/src/Makefile
+intl/locale/src/unix/Makefile
+intl/locale/tests/Makefile
+intl/lwbrk/Makefile
+intl/lwbrk/src/Makefile
+intl/lwbrk/public/Makefile
+intl/lwbrk/tests/Makefile
+intl/unicharutil/Makefile
+intl/unicharutil/src/Makefile
+intl/unicharutil/public/Makefile
+intl/unicharutil/tests/Makefile
+intl/unicharutil/tools/Makefile
+intl/strres/Makefile
+intl/strres/public/Makefile
+intl/strres/src/Makefile
+intl/strres/tests/Makefile
+jpeg/Makefile
+js/Makefile
+js/jsd/Makefile
+js/jsd/classes/Makefile
+js/src/Makefile
+js/src/fdlibm/Makefile
+js/src/liveconnect/Makefile
+js/src/liveconnect/classes/Makefile
+js/src/xpcom/Makefile
+js/src/xpconnect/Makefile
+layout/Makefile
+layout/base/Makefile
+layout/base/public/Makefile
+layout/base/src/Makefile
+layout/base/tests/Makefile
+layout/build/Makefile
+layout/events/Makefile
+layout/events/public/Makefile
+layout/events/src/Makefile
+layout/html/Makefile
+layout/html/base/Makefile
+layout/html/base/src/Makefile
+layout/html/content/Makefile
+layout/html/content/public/Makefile
+layout/html/content/src/Makefile
+layout/html/document/Makefile
+layout/html/document/src/Makefile
+layout/html/forms/Makefile
+layout/html/forms/public/Makefile
+layout/html/forms/src/Makefile
+layout/html/style/Makefile
+layout/html/style/public/Makefile
+layout/html/style/src/Makefile
+layout/html/table/Makefile
+layout/html/table/public/Makefile
+layout/html/table/src/Makefile
+layout/html/tests/Makefile
+layout/tools/Makefile
+layout/xml/Makefile
+layout/xml/content/Makefile
+layout/xml/content/public/Makefile
+layout/xml/content/src/Makefile
+layout/xml/document/Makefile
+layout/xml/document/public/Makefile
+layout/xml/document/src/Makefile
+layout/xul/Makefile
+layout/xul/base/Makefile
+layout/xul/base/src/Makefile
+layout/xul/content/Makefile
+layout/xul/content/src/Makefile
+# lib/liblayer/Makefile
+# lib/liblayer/include/Makefile
+# lib/liblayer/src/Makefile
+lib/libpwcac/Makefile
+lib/xp/Makefile
+modules/libimg/Makefile
+modules/libimg/classes/Makefile
+modules/libimg/classes/netscape/Makefile
+modules/libimg/classes/netscape/libimg/Makefile
+modules/libimg/png/Makefile
+modules/libimg/public/Makefile
+modules/libimg/src/Makefile
+modules/libpref/Makefile
+modules/libpref/admin/Makefile
+modules/libpref/l10n/Makefile
+modules/libpref/public/Makefile
+modules/libpref/src/Makefile
+modules/libreg/Makefile
+modules/libreg/include/Makefile
+modules/libreg/src/Makefile
+modules/libutil/Makefile
+modules/libutil/public/Makefile
+modules/libutil/src/Makefile
+modules/oji/Makefile
+modules/oji/public/Makefile
+modules/oji/src/Makefile
+modules/plugin/Makefile
+modules/plugin/nglsrc/Makefile
+modules/plugin/public/Makefile
+modules/plugin/src/Makefile
+modules/plugin/test/Makefile
+modules/security/freenav/Makefile
+modules/zlib/Makefile
+modules/zlib/src/Makefile
+nav-java/Makefile
+nav-java/stubs/Makefile
+nav-java/stubs/include/Makefile
+nav-java/stubs/jri/Makefile
+nav-java/stubs/src/Makefile
+network/Makefile
+network/cache/Makefile
+network/cache/nu/Makefile
+network/cache/nu/include/Makefile
+network/cache/nu/public/Makefile
+network/cache/nu/src/Makefile
+network/cache/nu/tests/Makefile
+network/cache/nu/tests/fftest/Makefile
+network/client/Makefile
+network/cnvts/Makefile
+network/cstream/Makefile
+network/main/Makefile
+network/mimetype/Makefile
+network/public/Makefile
+network/module/Makefile
+network/module/tests/Makefile
+network/protocol/Makefile
+network/protocol/about/Makefile
+network/protocol/callback/Makefile
+network/protocol/dataurl/Makefile
+network/protocol/file/Makefile
+network/protocol/ftp/Makefile
+network/protocol/gopher/Makefile
+network/protocol/http/Makefile
+network/protocol/js/Makefile
+network/protocol/ldap/Makefile
+network/protocol/marimba/Makefile
+network/protocol/remote/Makefile
+network/protocol/sockstub/Makefile
+network/util/Makefile
+rdf/Makefile
+rdf/base/Makefile
+rdf/base/public/Makefile
+rdf/base/src/Makefile
+rdf/build/Makefile
+rdf/content/Makefile
+rdf/content/public/Makefile
+rdf/content/src/Makefile
+rdf/datasource/Makefile
+rdf/datasource/public/Makefile
+rdf/datasource/src/Makefile
+rdf/tests/Makefile
+rdf/tests/localfile/Makefile
+rdf/tests/rdfsink/Makefile
+sun-java/Makefile
+sun-java/stubs/Makefile
+sun-java/stubs/include/Makefile
+sun-java/stubs/jri/Makefile
+sun-java/stubs/src/Makefile
+caps/Makefile
+caps/include/Makefile
+caps/public/Makefile
+caps/src/Makefile
+view/Makefile
+view/public/Makefile
+view/src/Makefile
+webshell/Makefile
+webshell/public/Makefile
+webshell/src/Makefile
+webshell/tests/Makefile
+webshell/tests/viewer/Makefile
+webshell/tests/viewer/public/Makefile
+widget/Makefile
+widget/public/Makefile
+widget/src/Makefile
+widget/src/build/Makefile
+widget/src/motif/Makefile
+widget/src/rhapsody/Makefile
+widget/src/gtk/Makefile
+widget/src/xpwidgets/Makefile
+widget/tests/Makefile
+widget/tests/scribble/Makefile
+widget/tests/widget/Makefile
+xpcom/Makefile
+xpcom/public/Makefile
+xpcom/src/Makefile
+xpcom/tests/Makefile
+xpcom/tests/dynamic/Makefile
+xpcom/tools/Makefile
+xpcom/tools/xpidl/Makefile
+xpcom/libxpt/Makefile
+xpcom/libxpt/public/Makefile
+xpcom/libxpt/src/Makefile
+xpcom/libxpt/tests/Makefile
+xpcom/libxpt/tools/Makefile
+silentdl/Makefile
+xpfe/Makefile
+xpfe/AppCores/Makefile
+xpfe/AppCores/public/Makefile
+xpfe/AppCores/src/Makefile
+xpfe/AppCores/xul/Makefile
+xpfe/AppCores/idl/Makefile
+xpfe/browser/Makefile
+xpfe/browser/public/Makefile
+xpfe/browser/src/Makefile
+# xpfe/xpviewer/Makefile
+# xpfe/xpviewer/src/Makefile
+# xpfe/xpviewer/public/Makefile
+xpfe/appshell/Makefile
+xpfe/appshell/src/Makefile
+xpfe/appshell/public/Makefile
+xpfe/bootstrap/Makefile
+xpfe/browser/Makefile
+xpfe/browser/src/Makefile
+# xpfe/browser/public/Makefile
+END_NGMAKEFILES
+
+if [ "$MOZ_EDITOR" ]; then
+  add_makefiles <<END_EDITOR_MAKEFILES
+editor/base/Makefile
+editor/txmgr/Makefile
+editor/txmgr/public/Makefile
+editor/txmgr/src/Makefile
+editor/txmgr/tests/Makefile
+editor/guimgr/Makefile
+editor/guimgr/src/Makefile
+editor/guimgr/public/Makefile
+END_EDITOR_MAKEFILES
+fi
+
+if [ "$MOZ_MAIL_NEWS" ]; then
+  add_makefiles <<END_MAILNEWS_MAKEFILES
+network/protocol/certld/Makefile
+network/protocol/imap4/Makefile
+network/protocol/mailbox/Makefile
+network/protocol/nntp/Makefile
+network/protocol/pop3/Makefile
+network/protocol/smtp/Makefile
+mailnews/Makefile
+mailnews/base/Makefile
+mailnews/base/public/Makefile
+mailnews/base/src/Makefile
+mailnews/base/build/Makefile
+mailnews/base/tests/Makefile
+mailnews/db/Makefile
+mailnews/db/mdb/Makefile
+mailnews/db/mdb/public/Makefile
+mailnews/db/msgdb/Makefile
+mailnews/db/msgdb/public/Makefile
+mailnews/db/msgdb/src/Makefile
+mailnews/local/Makefile
+mailnews/local/public/Makefile
+mailnews/local/src/Makefile
+mailnews/local/tests/Makefile
+mailnews/local/tests/pop3/Makefile
+mailnews/local/tests/mailbox/Makefile
+mailnews/imap/Makefile
+mailnews/imap/public/Makefile
+mailnews/imap/src/Makefile
+mailnews/news/Makefile
+mailnews/news/public/Makefile
+mailnews/news/src/Makefile
+mailnews/news/tests/Makefile
+mailnews/mime/Makefile
+mailnews/mime/public/Makefile
+mailnews/mime/src/Makefile
+mailnews/compose/Makefile
+mailnews/compose/public/Makefile
+mailnews/compose/src/Makefile
+mailnews/compose/tests/Makefile
+mailnews/compose/tests/smtp/Makefile
+mailnews/compose/tests/compose/Makefile
+mailnews/ui/Makefile
+mailnews/ui/messenger/Makefile
+mailnews/ui/messenger/public/Makefile
+mailnews/ui/messenger/src/Makefile
+mailnews/ui/messenger/resources/Makefile
+mailnews/ui/compose/Makefile
+mailnews/ui/ab/Makefile
+mailnews/public/Makefile
+END_MAILNEWS_MAKEFILES
+fi
--- a/mozilla/base/Makefile.in
+++ b/mozilla/base/Makefile.in
@@ -22,9 +22,11 @@ srcdir		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-DIRS = public src
+DIRS = public src 

+ifdef ENABLE_TESTS
 DIRS += tests
+endif

 include $(topsrcdir)/config/config.mk

--- a/mozilla/base/macbuild/BaseDebugPrefix.h
+++ b/mozilla/base/macbuild/BaseDebugPrefix.h
@@ -0,0 +1,21 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#define _IMPL_NS_BASE 1
+
+#include "MacPrefix_debug.h"
--- a/mozilla/base/macbuild/BasePrefix.h
+++ b/mozilla/base/macbuild/BasePrefix.h
@@ -0,0 +1,21 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#define _IMPL_NS_BASE 1
+
+#include "MacPrefix.h"
--- a/mozilla/base/macbuild/TestFiles.mcp
+++ b/mozilla/base/macbuild/TestFiles.mcp
--- a/mozilla/base/macbuild/TestProperties.mcp
+++ b/mozilla/base/macbuild/TestProperties.mcp
--- a/mozilla/base/macbuild/base.mcp
+++ b/mozilla/base/macbuild/base.mcp
--- a/mozilla/base/macbuild/base.toc
+++ b/mozilla/base/macbuild/base.toc
@@ -2,6 +2,7 @@
 mozilla/base/src/mac/nsTimerMac.cpp
 mozilla/base/src/nsArena.cpp
 mozilla/base/src/nsAtomTable.cpp
+mozilla/base/src/nsBaseDLL.cpp
 mozilla/base/src/nsBTree.cpp
 mozilla/base/src/nsByteBuffer.cpp
 mozilla/base/src/nsCRT.cpp
@@ -10,6 +11,7 @@ mozilla/base/src/nsEscape.cpp
 mozilla/base/src/nsFileSpec.cpp
 mozilla/base/src/nsFileStream.cpp
 mozilla/base/src/nsRBTree.cpp
+mozilla/base/src/nsProperties.cpp
 mozilla/base/src/nsSizeOfHandler.cpp
 mozilla/base/src/nsString.cpp
 mozilla/base/src/nsUnicharBuffer.cpp
--- a/mozilla/base/makefile.win
+++ b/mozilla/base/makefile.win
@@ -18,6 +18,6 @@
 DEPTH=..
 IGNORE_MANIFEST=1

-DIRS=public src tests 
+DIRS=public src 

 include <$(DEPTH)\config\rules.mak>
--- a/mozilla/base/public/MANIFEST
+++ b/mozilla/base/public/MANIFEST
@@ -2,7 +2,11 @@
 # This is a list of local files which get copied to the mozilla:dist:base directory
 #

+nsAutoLock.h
 nsISizeOfHandler.h
 nsFileStream.h
+nsIFileStream.h
 nsFileSpec.h
-nsRepeater.h
+nsRepeater.h
+nsIProperties.h
+nsCaretProperties.h
--- a/mozilla/base/public/Makefile.in
+++ b/mozilla/base/public/Makefile.in
@@ -25,10 +25,14 @@ include $(DEPTH)/config/autoconf.mk
 DEFINES += -D_IMPL_NS_BASE

 EXPORTS =		\
+    nsAutoLock.h	\
+    nsIProperties.h	\
    nsISizeOfHandler.h	\
+    nsCaretProperties.h \
    nsEscape.h          \
    nsFileSpec.h        \
    nsFileStream.h      \
+    nsIFileStream.h     \
    $(NULL)

 EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
--- a/mozilla/base/public/makefile.win
+++ b/mozilla/base/public/makefile.win
@@ -20,12 +20,16 @@ IGNORE_MANIFEST=1

 DEFINES = -D_IMPL_NS_BASE

-EXPORTS =		\
-    nsIProperties.h	\
-    nsISizeOfHandler.h	\
-	nsFileSpec.h \
-	nsFileStream.h \
-    $(NULL)
+EXPORTS =                       \
+        nsAutoLock.h            \
+        nsCaretProperties.h     \
+        nsIProperties.h         \
+        nsISizeOfHandler.h      \
+        nsEscape.h              \
+        nsFileSpec.h            \
+        nsFileStream.h          \
+        nsIFileStream.h         \
+        $(NULL)

 MODULE = raptor 

--- a/mozilla/base/public/nsAutoLock.h
+++ b/mozilla/base/public/nsAutoLock.h
@@ -0,0 +1,116 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+
+/*
+
+  A stack-based lock object that makes using PRLock a bit more
+  convenient. It acquires the monitor when constructed, and releases
+  it when it goes out of scope.
+
+  For example,
+
+    class Foo {
+    private:
+        PRLock* mLock;
+
+    public:
+        Foo(void) {
+            mLock = PR_NewLock();
+        }
+
+        virtual ~Foo(void) {
+            PR_DestroyLock(mLock);
+        }
+
+        void ThreadSafeMethod(void) {
+            // we're don't hold the lock yet...
+
+            nsAutoLock lock(mLock);
+            // ...but now we do.
+
+            // we even can do wacky stuff like return from arbitrary places w/o
+            // worrying about forgetting to release the lock
+            if (some_weird_condition)
+                return;
+
+            // otherwise do some other stuff
+        }
+
+        void ThreadSafeBlockScope(void) {
+            // we're not in the lock here...
+
+            {
+                nsAutoLock lock(mLock);
+                // but we are now, at least until the block scope closes
+            }
+
+            // ...now we're not in the lock anymore
+        }
+    };
+
+ */
+
+#ifndef nsAutoLock_h__
+#define nsAutoLock_h__
+
+#include "nscore.h"
+#include "prlock.h"
+#include "prlog.h"
+
+// If you ever decide that you need to add a non-inline method to this
+// class, be sure to change the class declaration to "class NS_BASE
+// nsAutoLock".
+
+class nsAutoLock {
+private:
+    PRLock* mLock;
+
+    // Not meant to be implemented. This makes it a compiler error to
+    // construct or assign an nsAutoLock object incorrectly.
+    nsAutoLock(void) {}
+    nsAutoLock(nsAutoLock& aLock) {}
+    nsAutoLock& operator =(nsAutoLock& aLock) {
+        return *this;
+    }
+
+    // Not meant to be implemented. This makes it a compiler error to
+    // attempt to create an nsAutoLock object on the heap.
+    static void* operator new(size_t size) {
+        return nsnull;
+    }
+    static void operator delete(void* memory) {}
+
+public:
+    nsAutoLock(PRLock* aLock) : mLock(aLock) {
+        PR_ASSERT(mLock);
+
+        // This will assert deep in the bowels of NSPR if you attempt
+        // to re-enter the lock.
+        PR_Lock(mLock);
+    }
+
+
+    ~nsAutoLock(void) {
+        PR_Unlock(mLock);
+    }
+};
+
+
+#endif // nsAutoLock_h__
+
--- a/mozilla/base/public/nsCaretProperties.h
+++ b/mozilla/base/public/nsCaretProperties.h
@@ -0,0 +1,53 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+// this class is used to gather caret properties from the OS. It
+// must be implemented by each platform that wants more than
+// the generic caret properties.
+
+class nsCaretProperties
+{
+	
+	public:
+	
+												nsCaretProperties();
+		virtual							~nsCaretProperties() {}
+	
+		virtual PRUint32		GetCaretWidth() 		{ return mCaretWidth; }
+		virtual PRUint32		GetCaretBlinkRate()	{ return mBlinkRate; }
+		
+		
+	protected:
+
+	// have value for no blinking
+	
+		enum {
+			eDefaulBlinkRate					= 500,		// twice a second
+			eDefaultCaretWidth				= 1				// one pixel wide
+		};
+
+
+		PRUint32				mCaretWidth;			// caret width in twips
+		PRUint32				mBlinkRate;				// blink rate in milliseconds
+		
+		
+		// members for vertical placement & size?
+
+};
+
+NS_BASE nsCaretProperties* NewCaretProperties();
--- a/mozilla/base/public/nsEscape.h
+++ b/mozilla/base/public/nsEscape.h
@@ -22,6 +22,7 @@
 #define _ESCAPE_H_

 #include "prtypes.h"
+#include "nscore.h"

 /* valid mask values for NET_Escape() and NET_EscapedSize(). */
 typedef enum {
@@ -33,19 +34,20 @@ typedef enum {
 #ifdef __cplusplus
 extern "C" {
 #endif
-char * nsEscape(const char * str, nsEscapeMask mask);
+NS_BASE char * nsEscape(const char * str, nsEscapeMask mask);
 	/* Caller must use delete [] on the result */
-char * nsUnescape(char * str);
+
+NS_BASE char * nsUnescape(char * str);
 	/* decode % escaped hex codes into character values,
 	 * modifies the parameter, returns the same buffer
 	 */

-char * nsEscapeCount(const char * str, PRInt32 len, nsEscapeMask mask, PRInt32* out_len);
+NS_BASE char * nsEscapeCount(const char * str, PRInt32 len, nsEscapeMask mask, PRInt32* out_len);
 	/* Like nsEscape, but if out_len is non-null, return result string length
 	 * in *out_len, and uses len instead of NUL termination.
 	 * Caller must use delete [] on the result.
 	 */
-PRInt32 nsUnescapeCount (char * str);
+NS_BASE PRInt32 nsUnescapeCount (char * str);
 	/* decode % escaped hex codes into character values,
 	 * modifies the parameter buffer, returns the length of the result
 	 * (result may contain \0's).
--- a/mozilla/base/public/nsFileSpec.h
+++ b/mozilla/base/public/nsFileSpec.h
@@ -24,7 +24,17 @@
 //
 //  Classes defined:
 //
-//      nsFilePath, nsFileURL, nsNativeFileSpec.
+//      nsFilePath, nsFileURL, nsFileSpec, nsPersistentFileDescriptor
+//      nsDirectoryIterator. Oh, and a convenience class nsAutoCString.
+//
+//  Q.  How should I represent files at run time?
+//  A.  Use nsFileSpec.  Using char* will lose information on some platforms.
+//
+//  Q.  Then what are nsFilePath and nsFileURL for?
+//  A.  Only when you need a char* parameter for legacy code.
+//
+//  Q.  How should I represent files in a persistent way (eg, in a disk file)?
+//  A.  Use nsPersistentFileDescriptor.  Convert to and from nsFileSpec at run time.
 //
 //  This suite provides the following services:
 //
@@ -63,7 +73,7 @@
 //
 //              Initialize a native file spec from a URL
 //
-//                  nsNativeFileSpec fileSpec(fileURL);
+//                  nsFileSpec fileSpec(fileURL);
 //
 //              Make the spec unique (this one has no suffix).
 //
@@ -103,6 +113,8 @@
 #define _FILESPEC_H_

 #include "nscore.h"
+#include "nsError.h"
+#include "nsString.h"

 //========================================================================================
 //                          Compiler-specific macros, as needed
@@ -116,11 +128,13 @@
 #define NS_NAMESPACE_PROTOTYPE
 #define NS_NAMESPACE namespace
 #define NS_NAMESPACE_END
+#define NS_EXPLICIT explicit
 #else

 #define NS_NAMESPACE_PROTOTYPE static
 #define NS_NAMESPACE struct
 #define NS_NAMESPACE_END ;
+#define NS_EXPLICIT

 #endif
 //=========================== End Compiler-specific macros ===============================
@@ -137,33 +151,85 @@
 // Here are the allowable ways to describe a file.
 //========================================================================================

-class nsFilePath;                 // This can be passed to NSPR file I/O routines.
+class nsFileSpec;             // Preferred.  For i/o use nsInputFileStream, nsOutputFileStream
+class nsFilePath;             // This can be passed to NSPR file I/O routines, if you must.
 class nsFileURL;
-class nsNativeFileSpec;
+class nsPersistentFileDescriptor; // Used for storage across program launches.

 #define kFileURLPrefix "file://"
 #define kFileURLPrefixLength (7)

-class nsBasicOutStream;
+class nsOutputStream;
+class nsInputStream;
+class nsIOutputStream;
+class nsIInputStream;
+class nsOutputFileStream;
+class nsInputFileStream;
+class nsString;

 //========================================================================================
-class NS_BASE nsNativeFileSpec
+// Conversion of native file errors to nsresult values. These are really only for use
+// in the file module, clients of this interface shouldn't really need them.
+// Error results returned from this interface have, in the low-order 16 bits,
+// native errors that are masked to 16 bits.  Assumption: a native error of 0 is success
+// on all platforms. Note the way we define this using an inline function.  This
+// avoids multiple evaluation if people go NS_FILE_RESULT(function_call()).
+#define NS_FILE_RESULT(x) ns_file_convert_result((PRInt32)x)
+nsresult ns_file_convert_result(PRInt32 nativeErr);
+#define NS_FILE_FAILURE NS_FILE_RESULT(-1)
+
+//========================================================================================
+class NS_BASE nsAutoCString
+//
+// This should be in nsString.h, but the owner would not reply to my proposal.  After four
+// weeks, I decided to put it in here.
+//
+// This is a quiet little class that acts as a sort of autoptr for
+// a const char*.  If you used to call nsString::ToNewCString(), just
+// to pass the result a parameter list, it was a nuisance having to
+// call delete [] on the result after the call.  Now you can say
+//     nsString myStr;
+//     ...
+//     f(nsAutoCString(myStr));
+// where f is declared as void f(const char*);  This call will
+// make a temporary char* pointer on the stack and delete[] it
+// when the function returns.
+//========================================================================================
+{
+public:
+    NS_EXPLICIT                  nsAutoCString(const nsString& other) : mCString(other.ToNewCString()) {}
+    virtual                      ~nsAutoCString();    
+                                 operator const char*() const { return mCString; }
+                                 operator const char*() { return mCString; }
+protected:
+                                 const char* mCString;
+}; // class nsAutoCString
+
+//========================================================================================
+class NS_BASE nsFileSpec
 //    This is whatever each platform really prefers to describe files as.  Declared first
-//  because the other two types have an embeded nsNativeFileSpec object.
+//  because the other two types have an embeded nsFileSpec object.
 //========================================================================================
 {
    public:
-                                nsNativeFileSpec();
-        explicit                nsNativeFileSpec(const char* inString, bool inCreateDirs = false);
-        explicit                nsNativeFileSpec(const nsFilePath& inPath);
-        explicit                nsNativeFileSpec(const nsFileURL& inURL);
-                                nsNativeFileSpec(const nsNativeFileSpec& inPath);
-        virtual                 ~nsNativeFileSpec();
+                                nsFileSpec();
+        NS_EXPLICIT             nsFileSpec(const char* inString, PRBool inCreateDirs = PR_FALSE);
+        NS_EXPLICIT             nsFileSpec(const nsString& inString, PRBool inCreateDirs = PR_FALSE);
+        NS_EXPLICIT             nsFileSpec(const nsFilePath& inPath);
+        NS_EXPLICIT             nsFileSpec(const nsFileURL& inURL);
+        NS_EXPLICIT             nsFileSpec(const nsPersistentFileDescriptor& inURL);
+                                nsFileSpec(const nsFileSpec& inPath);
+        virtual                 ~nsFileSpec();

        void                    operator = (const char* inPath);
+        void                    operator = (const nsString& inPath)
+                                {
+                                    *this = nsAutoCString(inPath);
+                                }
        void                    operator = (const nsFilePath& inPath);
        void                    operator = (const nsFileURL& inURL);
-        void                    operator = (const nsNativeFileSpec& inOther);
+        void                    operator = (const nsFileSpec& inOther);
+        void                    operator = (const nsPersistentFileDescriptor& inOther);

 #ifndef XP_MAC
                                operator const char* () const { return mPath; }
@@ -175,23 +241,22 @@ class NS_BASE nsNativeFileSpec
 #ifdef XP_MAC
        // For Macintosh people, this is meant to be useful in its own right as a C++ version
        // of the FSSpec struct.        
-                                nsNativeFileSpec(
+                                nsFileSpec(
                                    short vRefNum,
                                    long parID,
                                    ConstStr255Param name);
-                                nsNativeFileSpec(const FSSpec& inSpec)
-                                    : mSpec(inSpec), mError(noErr) {}
+                                nsFileSpec(const FSSpec& inSpec)
+                                    : mSpec(inSpec), mError(NS_OK) {}

                                operator FSSpec* () { return &mSpec; }
                                operator const FSSpec* const () { return &mSpec; }
                                operator  FSSpec& () { return mSpec; }
                                operator const FSSpec& () const { return mSpec; }
-        OSErr                   Error() const { return mError; }
        void                    MakeAliasSafe();
                                    // Called for the spec of an alias.  Copies the alias to
                                    // a secret temp directory and modifies the spec to point
                                    // to it.  Sets mError.
-        void                    ResolveAlias(bool& wasAliased);
+        void                    ResolveAlias(PRBool& wasAliased);
                                    // Called for the spec of an alias.  Modifies the spec to
                                    // point to the original.  Sets mError.
        void                    MakeUnique(ConstStr255Param inSuggestedLeafName);
@@ -199,15 +264,15 @@ class NS_BASE nsNativeFileSpec
        ConstStr255Param        GetLeafPName() const { return mSpec.name; }
 #endif // end of Macintosh utility methods.

-#ifdef XP_MAC
-        bool                    Valid() const { return mError == noErr; }
-#else
-        bool                    Valid() const { return true; } // Fixme.
-#endif // XP_MAC
+        PRBool                  Valid() const { return NS_SUCCEEDED(Error()); }
+        nsresult                Error() const { return mError; }
+
+
+        friend                  NS_BASE nsOutputStream& operator << (
+                                    nsOutputStream& s,
+                                    const nsFileSpec& spec); // THIS IS FOR DEBUGGING ONLY.
+                                        // see PersistentFileDescriptor for the real deal.

-        friend                  NS_BASE nsBasicOutStream& operator << (
-                                    nsBasicOutStream& s,
-                                    const nsNativeFileSpec& spec);

        //--------------------------------------------------
        // Queries and path algebra.  These do not modify the disk.
@@ -217,8 +282,11 @@ class NS_BASE nsNativeFileSpec
        void                    SetLeafName(const char* inLeafName);
                                    // inLeafName can be a relative path, so this allows
                                    // one kind of concatenation of "paths".
-
-        void                    GetParent(nsNativeFileSpec& outSpec) const;
+        void                    SetLeafName(const nsString& inLeafName)
+                                {
+                                    SetLeafName(nsAutoCString(inLeafName));
+                                }
+        void                    GetParent(nsFileSpec& outSpec) const;
                                    // Return the filespec of the parent directory. Used
                                    // in conjunction with GetLeafName(), this lets you
                                    // parse a path into a list of node names.  Beware,
@@ -226,7 +294,11 @@ class NS_BASE nsNativeFileSpec
                                    // but a spec.  Volumes on Macintosh can have identical
                                    // names.  Perhaps could be used for an operator --() ?

-        nsNativeFileSpec        operator + (const char* inRelativePath) const;
+        nsFileSpec              operator + (const char* inRelativePath) const;
+        nsFileSpec              operator + (const nsString& inRelativePath) const
+                                {
+                                    return *this + nsAutoCString(inRelativePath);
+                                }
        void			        operator += (const char* inRelativePath);
                                    // Concatenate the relative path to this directory.
                                    // Used for constructing the filespec of a descendant.
@@ -236,23 +308,44 @@ class NS_BASE nsNativeFileSpec
                                    // away its leaf information, whereas this one assumes
                                    // this is a directory, and the relative path starts
                                    // "below" this.
+        void			        operator += (const nsString& inRelativePath)
+                                {
+                                    *this += nsAutoCString(inRelativePath);
+                                }

        void                    MakeUnique();
        void                    MakeUnique(const char* inSuggestedLeafName);
+        void                    MakeUnique(const nsString& inSuggestedLeafName)
+                                {
+                                    MakeUnique(nsAutoCString(inSuggestedLeafName));
+                                }
    
-        bool                    IsDirectory() const;
+        PRBool                  IsDirectory() const;
                                    // More stringent than Exists()
-        bool                    IsFile() const;
+        PRBool                  IsFile() const;
                                    // More stringent than Exists()
-        bool                    Exists() const;
+        PRBool                  Exists() const;

        //--------------------------------------------------
        // Creation and deletion of objects.  These can modify the disk.
        //--------------------------------------------------

        void                    CreateDirectory(int mode = 0700 /* for unix */);
-        void                    Delete(bool inRecursive);
+        void                    Delete(PRBool inRecursive) const;
        
+        nsresult                Rename(const char* inNewName); // not const: gets updated
+        nsresult                Rename(const nsString& inNewName)
+                                {
+                                    return Rename(nsAutoCString(inNewName));
+                                }
+        nsresult                Copy(const nsFileSpec& inNewParentDirectory) const;
+        nsresult                Move(const nsFileSpec& inNewParentDirectory) const;
+        nsresult                Execute(const char* args) const;
+        nsresult                Execute(const nsString& args) const
+                                {
+                                    return Execute(nsAutoCString(args));
+                                }
+
        //--------------------------------------------------
        // Data
        //--------------------------------------------------
@@ -261,11 +354,15 @@ class NS_BASE nsNativeFileSpec
                                friend class nsFilePath;
 #ifdef XP_MAC
        FSSpec                  mSpec;
-        OSErr                   mError;
 #else
        char*                   mPath;
 #endif
-}; // class nsNativeFileSpec
+        nsresult                mError;
+}; // class nsFileSpec
+
+// FOR HISTORICAL REASONS:
+
+typedef nsFileSpec nsNativeFileSpec;

 //========================================================================================
 class NS_BASE nsFileURL
@@ -276,9 +373,10 @@ class NS_BASE nsFileURL
 {
    public:
                                nsFileURL(const nsFileURL& inURL);
-        explicit                nsFileURL(const char* inString, bool inCreateDirs = false);
-        explicit                nsFileURL(const nsFilePath& inPath);
-        explicit                nsFileURL(const nsNativeFileSpec& inPath);
+        NS_EXPLICIT             nsFileURL(const char* inString, PRBool inCreateDirs = PR_FALSE);
+        NS_EXPLICIT             nsFileURL(const nsString& inString, PRBool inCreateDirs = PR_FALSE);
+        NS_EXPLICIT             nsFileURL(const nsFilePath& inPath);
+        NS_EXPLICIT             nsFileURL(const nsFileSpec& inPath);
        virtual                 ~nsFileURL();

 //        nsString             GetString() const { return mPath; }
@@ -287,15 +385,19 @@ class NS_BASE nsFileURL

        void                    operator = (const nsFileURL& inURL);
        void                    operator = (const char* inString);
+        void                    operator = (const nsString& inString)
+                                {
+                                    *this = nsAutoCString(inString);
+                                }
        void                    operator = (const nsFilePath& inOther);
-        void                    operator = (const nsNativeFileSpec& inOther);
+        void                    operator = (const nsFileSpec& inOther);

-        friend                  NS_BASE nsBasicOutStream& operator << (
-                                     nsBasicOutStream& s, const nsFileURL& spec);
+        friend                  NS_BASE nsOutputStream& operator << (
+                                     nsOutputStream& s, const nsFileURL& spec);

 #ifdef XP_MAC
-                                // Accessor to allow quick assignment to a mNativeFileSpec
-        const nsNativeFileSpec& GetNativeSpec() const { return mNativeFileSpec; }
+                                // Accessor to allow quick assignment to a mFileSpec
+        const nsFileSpec&       GetFileSpec() const { return mFileSpec; }
 #endif
    private:
        // Should not be defined (only nsFilePath is to be treated as strings.
@@ -306,8 +408,8 @@ class NS_BASE nsFileURL
        char*                   mURL;
 #ifdef XP_MAC
        // Since the path on the macintosh does not uniquely specify a file (volumes
-        // can have the same name), stash the secret nsNativeFileSpec, too.
-        nsNativeFileSpec        mNativeFileSpec;
+        // can have the same name), stash the secret nsFileSpec, too.
+        nsFileSpec              mFileSpec;
 #endif
 }; // class nsFileURL

@@ -319,9 +421,10 @@ class NS_BASE nsFilePath
 {
    public:
                                nsFilePath(const nsFilePath& inPath);
-        explicit                nsFilePath(const char* inString, bool inCreateDirs = false);
-        explicit                nsFilePath(const nsFileURL& inURL);
-        explicit                nsFilePath(const nsNativeFileSpec& inPath);
+        NS_EXPLICIT             nsFilePath(const char* inString, PRBool inCreateDirs = PR_FALSE);
+        NS_EXPLICIT             nsFilePath(const nsString& inString, PRBool inCreateDirs = PR_FALSE);
+        NS_EXPLICIT             nsFilePath(const nsFileURL& inURL);
+        NS_EXPLICIT             nsFilePath(const nsFileSpec& inPath);
        virtual                 ~nsFilePath();

                                
@@ -336,13 +439,17 @@ class NS_BASE nsFilePath

        void                    operator = (const nsFilePath& inPath);
        void                    operator = (const char* inString);
+        void                    operator = (const nsString& inString)
+                                {
+                                    *this = nsAutoCString(inString);
+                                }
        void                    operator = (const nsFileURL& inURL);
-        void                    operator = (const nsNativeFileSpec& inOther);
+        void                    operator = (const nsFileSpec& inOther);

 #ifdef XP_MAC
    public:
-                                // Accessor to allow quick assignment to a mNativeFileSpec
-        const nsNativeFileSpec& GetNativeSpec() const { return mNativeFileSpec; }
+                                // Accessor to allow quick assignment to a mFileSpec
+        const nsFileSpec&       GetFileSpec() const { return mFileSpec; }
 #endif

    private:
@@ -350,26 +457,62 @@ class NS_BASE nsFilePath
        char*                    mPath;
 #ifdef XP_MAC
        // Since the path on the macintosh does not uniquely specify a file (volumes
-        // can have the same name), stash the secret nsNativeFileSpec, too.
-        nsNativeFileSpec        mNativeFileSpec;
+        // can have the same name), stash the secret nsFileSpec, too.
+        nsFileSpec               mFileSpec;
 #endif
 }; // class nsFilePath

+//========================================================================================
+class NS_BASE nsPersistentFileDescriptor
+//========================================================================================
+{
+    public:
+                                nsPersistentFileDescriptor() : mDescriptorString(nsnull) {}
+                                    // For use prior to reading in from a stream
+                                nsPersistentFileDescriptor(const nsPersistentFileDescriptor& inPath);
+        virtual                 ~nsPersistentFileDescriptor();
+        void					operator = (const nsPersistentFileDescriptor& inPath);
+        
+        // Conversions
+                                nsPersistentFileDescriptor(const nsFileSpec& inPath);
+        void					operator = (const nsFileSpec& inPath);
+        
+    	nsresult                Read(nsIInputStream* aStream);
+    	nsresult                Write(nsIOutputStream* aStream);
+    	    // writes the data to a file
+    	friend NS_BASE nsInputStream& operator >> (nsInputStream&, nsPersistentFileDescriptor&);
+    		// reads the data from a file
+    	friend NS_BASE nsOutputStream& operator << (nsOutputStream&, const nsPersistentFileDescriptor&);
+    	    // writes the data to a file
+        friend class nsFileSpec;
+
+    private:
+        // Here are the ways to get data in and out of a file.
+        void                    GetData(void*& outData, PRInt32& outSize) const;
+                                     // DON'T FREE the returned data!
+        void                    SetData(const void* inData, PRInt32 inSize);
+
+    private:
+
+        char*                   mDescriptorString;
+
+}; // class nsPersistentFileDescriptor
+
 //========================================================================================
 class NS_BASE nsDirectoryIterator
 //  Example:
 //
-//       nsNativeFileSpec parentDir(...); // directory over whose children we shall iterate
+//       nsFileSpec parentDir(...); // directory over whose children we shall iterate
 //       for (nsDirectoryIterator i(parentDir); i; i++)
 //       {
-//              // do something with (const nsNativeFileSpec&)i
+//              // do something with (const nsFileSpec&)i
 //       }
 //
 //  or:
 //
-//       for (nsDirectoryIterator i(parentDir, false); i; i--)
+//       for (nsDirectoryIterator i(parentDir, PR_FALSE); i; i--)
 //       {
-//              // do something with (const nsNativeFileSpec&)i
+//              // do something with (const nsFileSpec&)i
 //       }
 //
 //  Currently, the only platform on which backwards iteration actually goes backwards
@@ -378,21 +521,21 @@ class NS_BASE nsDirectoryIterator
 {
 	public:
 	                            nsDirectoryIterator(
-	                            	const nsNativeFileSpec& parent,
+	                            	const nsFileSpec& parent,
 	                            	int iterateDirection = +1);
 #ifndef XP_MAC
 	// Macintosh currently doesn't allocate, so needn't clean up.
 	    virtual                 ~nsDirectoryIterator();
 #endif
-	                            operator bool() const { return mExists; }
+	    PRBool                  Exists() const { return mExists; }
 	    nsDirectoryIterator&    operator ++(); // moves to the next item, if any.
 	    nsDirectoryIterator&    operator ++(int) { return ++(*this); } // post-increment.
 	    nsDirectoryIterator&    operator --(); // moves to the previous item, if any.
 	    nsDirectoryIterator&    operator --(int) { return --(*this); } // post-decrement.
-	                            operator nsNativeFileSpec&() { return mCurrent; }
+	                            operator nsFileSpec&() { return mCurrent; }
 	private:
-	    nsNativeFileSpec        mCurrent;
-	    bool                    mExists;
+	    nsFileSpec              mCurrent;
+	    PRBool                  mExists;
 	      
 #if defined(XP_UNIX)
        DIR*                    mDir;
--- a/mozilla/base/public/nsFileStream.h
+++ b/mozilla/base/public/nsFileStream.h
@@ -19,14 +19,31 @@
 //    First checked in on 98/11/20 by John R. McMullen in the wrong directory.
 //    Checked in again 98/12/04.
 //    Polished version 98/12/08.
+//    Completely rewritten to integrate with nsIInputStream and nsIOutputStream (the
+//        xpcom stream objects.

 //========================================================================================
 //
 //  Classes defined:
 //
-//      single-byte char:
-//
+//          nsInputStream, nsOutputStream
+//                These are the lightweight STATICALLY LINKED wrappers for
+//                the xpcom objects nsIInputStream and nsIOutputstream.
+//             Possible uses:
+//                If you are implementing a function that accepts one of these xpcom
+//                streams, just make one of these little jobbies on the stack, and
+//                the handy << or >> notation can be yours.
+//                
 //          nsInputFileStream, nsOutputFileStream
+//                These are the STATICALLY LINKED versions of the file i/o streams,
+//                which wrap the NSPR file i/o plus console i/o.
+//
+//  Related files:
+//          prio.h             the NSPR file i/o C API), which is wrapped by
+//          THIS FILE          statically linked C++ wrappers, which in turn are wrapped by
+//          nsIFileStream.h    COM wrappers for this file, which are wrapped by
+//          nsAutoFileStream.h more easily used, nicer syntax wrappers for the
+//                             COMified ones.  Wrapper of a wrapper of a wrapper.
 //
 //  This suite provide the following services:
 //
@@ -41,13 +58,13 @@
 //
 //          Basic example:
 //
-//              nsFilePath myPath("/Development/iotest.txt");
+//              nsFileSpec myPath("/Development/iotest.txt");
 //
 //	            nsOutputFileStream testStream(myPath);
 //				testStream << "Hello World" << nsEndl;
 //
-//      4.  Requires streams to be constructed using typesafe nsFilePath specifier
-//          (not the notorious and bug prone const char*), namely nsFilePath.  See
+//      4.  Requires streams to be constructed using typesafe nsFileSpec specifier
+//          (not the notorious and bug prone const char*), namely nsFileSpec.  See
 //          nsFileSpec.h for more details.
 //
 //      5.  Fixes a bug that have been there for a long time, and
@@ -73,7 +90,13 @@
 #else
 #include "prio.h"
 #endif
-#include "nsFileSpec.h"
+
+#include "nsIFileStream.h"
+#include "nsCOMPtr.h"
+
+class nsFileSpec;
+class nsInputFileStream;
+class nsOutputFileStream;

 //========================================================================================
 //                          Compiler-specific macros, as needed
@@ -133,200 +156,467 @@ using std::ostream;
 //=========================== End Compiler-specific macros ===============================

 //========================================================================================
-class NS_BASE nsBasicFileStream
+class NS_BASE nsInputStream
+// This is a convenience class, for use on the STACK ("new" junkies: get detoxed first).
+// Given a COM-style stream, this allows you to use the >> operators.  It also acquires and
+// reference counts its stream.
+// Please read the comments at the top of this file
 //========================================================================================
 {
 public:
-                                      nsBasicFileStream();
-                                      nsBasicFileStream(PRFileDesc* desc, int nsprMode);
-                                      nsBasicFileStream(
-                                          const nsFilePath& inFile,
-                                          int nsprMode,
-                                          PRIntn accessMode);
-    virtual                           ~nsBasicFileStream();
-
-
-    inline PRBool                     is_open() const { return mFileDesc != 0; }
-    void                              open(
-                                           const nsFilePath& inFile,
-                                           int nsprMode,
-                                           PRIntn accessMode);
-    void                              close();
-    PRIntn                            tell() const;
-    void                              seek(PRInt32 offset) { seek(PR_SEEK_SET, offset); }
-    void                              seek(PRSeekWhence whence, PRInt32 offset);
-    PRBool                              eof() const { return mEOF; }
-    PRBool                            failed() const { return mFailed; }
-                                          // call PR_GetError() for details
-protected:
-
-	PRFileDesc*                       GetFileDescriptor() const { return mFileDesc; }
-    
-protected:
-    
-    friend class nsBasicInStream;
-    friend class nsBasicOutStream;
-    
-    PRFileDesc*                       mFileDesc;
-    int                               mNSPRMode;
-    PRBool                            mFailed;
-    PRBool                            mEOF;
-}; // class nsBasicFileStream
-
-//========================================================================================
-class NS_BASE nsBasicInStream
-//========================================================================================
-{
-protected:
-                                      nsBasicInStream(nsBasicFileStream& inStream, istream* stream);
-    
-public:
-
-    nsBasicInStream&                  operator >> (nsBasicInStream& (*pf)(nsBasicInStream&))
+                                      nsInputStream(nsIInputStream* inStream)
+                                      :   mInputStream(do_QueryInterface(inStream))
+                                      ,   mEOF(PR_FALSE)
+                                      {}
+    virtual                           ~nsInputStream();
+ 
+    nsCOMPtr<nsIInputStream>          GetIStream() const
                                      {
-                                           return pf(*this);
-                                       }
-    void                              get(char& c);
-    PRInt32                           read(void* s, PRInt32 n);
-    PRBool                            readline(char* s,  PRInt32 n);
-                                          // Result always null-terminated
-                                          // false result indicates line was truncated
-                                          // to fit buffer, or an error occurred.
+                                          return mInputStream;
+                                      }
+    char                              eof() const { return get_at_eof(); }
+    char                              get();
+    void                              close()
+                                      {
+                                          mInputStream->Close();
+                                      }
+    PRInt32                           read(void* s, PRInt32 n)
+                                      {
+                                          if (!mInputStream)
+                                              return 0;
+                                          PRInt32 result = 0;
+                                          mInputStream->Read((char*)s, 0, n, (PRUint32*)&result);
+                                          if (result < n)
+                                              set_at_eof(PR_TRUE);
+                                          return result;
+                                      }

-    // Input streamers.  Add more as needed
-    nsBasicInStream&                  operator >> (char& ch);
-    
-    istream*                          GetStandardStream() const { return mStdStream; }
+    // Input streamers.  Add more as needed (int&, unsigned int& etc). (but you have to
+    // add delegators to the derived classes, too, because these operators don't inherit).
+    nsInputStream&                    operator >> (char& ch);

-protected:
-
-    nsBasicFileStream&                mBase;    
-	istream*                          mStdStream;
-}; // class nsBasicInStream
-
-//========================================================================================
-class NS_BASE nsBasicOutStream
-//========================================================================================
-{
-protected:
-
-                                      nsBasicOutStream(nsBasicFileStream& inStream, ostream* stream);
-
-public:
-
-    nsBasicOutStream&                 operator << (nsBasicOutStream& (*pf)(nsBasicOutStream&))
+    // Support manipulators
+    nsInputStream&                    operator >> (nsInputStream& (*pf)(nsInputStream&))
                                      {
                                           return pf(*this);
                                      }
-    void                              put(char c);
-    PRInt32                           write(const void* s, PRInt32 n);
-    void                              flush();
-    
-    // Output streamers.  Add more as needed
-    nsBasicOutStream&                 operator << (const char* buf);
-    nsBasicOutStream&                 operator << (char ch);
-    nsBasicOutStream&                 operator << (short val);
-    nsBasicOutStream&                 operator << (unsigned short val);
-    nsBasicOutStream&                 operator << (long val);
-    nsBasicOutStream&                 operator << (unsigned long val);
-
-    ostream*                          GetStandardStream() const { return mStdStream; }

 protected:

-    nsBasicFileStream&                mBase;    
-	ostream*                          mStdStream;
-}; // class nsBasicOutStream
-
-//========================================================================================
-class NS_BASE nsInputFileStream
-//========================================================================================
-:	public nsBasicFileStream
-,	public nsBasicInStream
-{
-public:
-	enum  { kDefaultMode = PR_RDONLY };
-                                      nsInputFileStream(istream* stream = CONSOLE_IN);
-                                      nsInputFileStream(
-                                          const nsFilePath& inFile,
-                                          int nsprMode = kDefaultMode,
-                                          PRIntn accessMode = 00700) // <- OCTAL
-                                      : nsBasicFileStream(inFile, nsprMode, accessMode)
-                                      , nsBasicInStream(*this, 0)
-                                      {}
-
-    void                              open(
-                                           const nsFilePath& inFile,
-                                           int nsprMode = kDefaultMode,
-                                           PRIntn accessMode = 00700) // <- OCTAL
+   // These certainly need to be overridden, they give the best shot we can at detecting
+   // eof in a simple nsIInputStream.
+   virtual void                       set_at_eof(PRBool atEnd)
                                      {
-                                          nsBasicFileStream::open(inFile, nsprMode, accessMode);
+                                         mEOF = atEnd;
+                                      }
+   virtual PRBool                     get_at_eof() const
+                                      {
+                                          return mEOF;
                                      }
 private:

-    nsInputFileStream&                operator >> (char* buf); // TOO DANGEROUS. DON'T DEFINE.
+    nsInputStream&                    operator >> (char* buf); // TOO DANGEROUS. DON'T DEFINE.

+// DATA
+protected:
+    nsCOMPtr<nsIInputStream>          mInputStream;
+    PRBool                            mEOF;
+}; // class nsInputStream
+
+typedef nsInputStream nsBasicInStream; // historic support for this name
+
+//========================================================================================
+class NS_BASE nsOutputStream
+// This is a convenience class, for use on the STACK ("new" junkies, get detoxed first).
+// Given a COM-style stream, this allows you to use the << operators.  It also acquires and
+// reference counts its stream.
+// Please read the comments at the top of this file
+//========================================================================================
+{
+public:
+                                      nsOutputStream() {}
+                                      nsOutputStream(nsIOutputStream* inStream)
+                                      :   mOutputStream(do_QueryInterface(inStream))
+                                          {}
+
+    virtual                          ~nsOutputStream();
+
+    nsCOMPtr<nsIOutputStream>         GetIStream() const
+                                      {
+                                          return mOutputStream;
+                                      }
+    void                              close()
+                                      {
+                                          mOutputStream->Close();
+                                      }
+    void                              put(char c);
+    PRInt32                           write(const void* s, PRInt32 n)
+                                      {
+                                          if (!mOutputStream)
+                                              return 0;
+                                          PRInt32 result = 0;
+                                          mOutputStream->Write((char*)s, 0, n, (PRUint32*)&result);
+                                          return result;
+                                      }
+    virtual void                      flush();
+
+    // Output streamers.  Add more as needed (but you have to add delegators to the derived
+    // classes, too, because these operators don't inherit).
+    nsOutputStream&                   operator << (const char* buf);
+    nsOutputStream&                   operator << (char ch);
+    nsOutputStream&                   operator << (short val);
+    nsOutputStream&                   operator << (unsigned short val);
+    nsOutputStream&                   operator << (long val);
+    nsOutputStream&                   operator << (unsigned long val);
+
+    // Support manipulators
+    nsOutputStream&                   operator << (nsOutputStream& (*pf)(nsOutputStream&))
+                                      {
+                                           return pf(*this);
+                                      }
+
+// DATA
+protected:
+    nsCOMPtr<nsIOutputStream>          mOutputStream;
+}; // class nsOutputStream
+
+typedef nsOutputStream nsBasicOutStream; // Historic support for this name
+
+//========================================================================================
+class NS_BASE nsFileClient
+// Because COM does not allow us to write functions which return a boolean value etc,
+// this class is here to take care of the tedious "declare variable then call with
+// the address of the variable" chores.
+//========================================================================================
+{
+public:
+                                      nsFileClient() // for delayed opening
+                                      :   mResult(NS_OK)
+                                      {
+                                      }
+                                      nsFileClient(const nsCOMPtr<nsIFile>& inFile)
+                                      :   mFile(do_QueryInterface(inFile))
+                                      ,   mResult(NS_OK)
+                                      {
+                                      }
+    virtual                           ~nsFileClient() {}
+    
+    PRBool                            is_file() const
+                                      {
+                                          return mFile ? PR_TRUE : PR_FALSE;
+                                      }
+    void                              open(
+                                          const nsFileSpec& inFile,
+                                          int nsprMode,
+                                          PRIntn accessMode)
+                                      {
+                                          if (mFile)
+                                              mResult = mFile->Open(inFile, nsprMode, accessMode);
+                                      }
+    PRBool                            is_open() const
+                                      {
+                                          PRBool result = PR_FALSE;
+                                          if (mFile)
+                                              mFile->GetIsOpen(&result);
+                                          return result;
+                                      }
+    PRBool                            failed() const
+                                      {
+                                          return NS_FAILED(mResult);
+                                      }
+    void                              seek(PRInt32 offset)
+                                      {
+                                          seek(PR_SEEK_SET, offset);
+                                      }
+
+    void                              seek(PRSeekWhence whence, PRInt32 offset)
+                                      {
+                                          set_at_eof(PR_FALSE);
+                                          if (mFile)
+                                              mResult = mFile->Seek(whence, offset);
+                                      }
+    PRIntn                            tell()
+                                      {
+                                          PRIntn result = -1;
+                                          if (mFile)
+                                              mResult = mFile->Tell(&result);
+                                          return result;
+                                      }
+protected:
+
+   virtual PRBool                     get_at_eof() const
+                                      {
+                                          PRBool result;
+                                          if (mFile)
+                                              mFile->GetAtEOF(&result);
+                                          return result;
+                                      }
+
+   virtual void                       set_at_eof(PRBool atEnd)
+                                      {
+                                          if (mFile)
+                                              mFile->SetAtEOF(atEnd);
+                                      }
+
+// DATA
+protected:
+    nsCOMPtr<nsIFile>                 mFile;
+    PRBool                            mResult;
+}; // class nsFileClient
+
+//========================================================================================
+class NS_BASE nsInputFileStream
+// Please read the comments at the top of this file
+//========================================================================================
+:	public nsInputStream
+,	public nsFileClient
+{
+public:
+	enum  { kDefaultMode = PR_RDONLY };
+                                      nsInputFileStream(nsIInputStream* inStream)
+                                      :   nsInputStream(inStream)
+                                      ,   nsFileClient(do_QueryInterface(inStream))
+                                      ,   mFileInputStream(do_QueryInterface(inStream))
+                                      {
+                                      }
+                                      nsInputFileStream(
+                                          const nsFileSpec& inFile,
+                                          int nsprMode = kDefaultMode,
+                                          PRIntn accessMode = 00700) // <- OCTAL
+                                      :  nsInputStream(nsnull)
+                                      {
+                                          nsISupports* stream;
+                                          NS_NewIOFileStream(
+                                              &stream,
+                                              inFile, nsprMode, accessMode);
+                                          mFile = nsQueryInterface(stream);
+                                          mInputStream = nsQueryInterface(stream);
+                                          mFileInputStream = nsQueryInterface(stream);
+                                          NS_RELEASE(stream);
+                                      }
+
+    PRBool                            readline(char* s,  PRInt32 n);
+                                          // Result always null-terminated.
+                                          // Check eof() before each call.
+                                          // CAUTION: false result only indicates line was truncated
+                                          // to fit buffer, or an error occurred (OTHER THAN eof).
+
+    void                              Open(
+                                           const nsFileSpec& inFile,
+                                           int nsprMode = kDefaultMode,
+                                           PRIntn accessMode = 00700) // <- OCTAL
+                                      {
+                                          if (mFile)
+                                              mFile->Open(inFile, nsprMode, accessMode);
+                                      }
+
+    // Input streamers.  Unfortunately, they don't inherit!
+    nsInputStream&                    operator >> (char& ch)
+                                         { return nsInputStream::operator >>(ch); }
+    nsInputStream&                    operator >> (nsInputStream& (*pf)(nsInputStream&))
+                                         { return nsInputStream::operator >>(pf); }
+
+protected:
+
+   virtual PRBool                     get_at_eof() const
+                                      {
+                                          return nsFileClient::get_at_eof();
+                                      }
+
+   virtual void                       set_at_eof(PRBool atEnd)
+                                      {
+                                          nsFileClient::set_at_eof(atEnd);
+                                      }
+
+
+// DATA
+protected:
+    nsCOMPtr<nsIFileInputStream>      mFileInputStream;
 }; // class nsInputFileStream

 //========================================================================================
 class NS_BASE nsOutputFileStream
+// Please read the comments at the top of this file
 //========================================================================================
-:	public nsBasicFileStream
-,	public nsBasicOutStream
+:	public nsOutputStream
+,	public nsFileClient
 {
 public:
 	enum  { kDefaultMode = (PR_WRONLY | PR_CREATE_FILE | PR_TRUNCATE) };

-                                      nsOutputFileStream(ostream* stream = CONSOLE_OUT);
+                                      nsOutputFileStream() {}
+                                      nsOutputFileStream(nsIOutputStream* inStream)
+                                      :   nsOutputStream(inStream)
+                                      ,   nsFileClient(do_QueryInterface(inStream))
+                                      ,   mFileOutputStream(do_QueryInterface(inStream))
+                                      {
+                                      }
                                      nsOutputFileStream(
-                                           const nsFilePath& inFile,
+                                           const nsFileSpec& inFile,
                                           int nsprMode = kDefaultMode,
                                           PRIntn accessMode = 00700) // <- OCTAL
-                                      : nsBasicFileStream(inFile, nsprMode, accessMode)
-                                      , nsBasicOutStream(*this, 0)
-                                      {}
- 
-    inline void                       open(
-                                          const nsFilePath& inFile,
-                                          int nsprMode = kDefaultMode,
-                                          PRIntn accessMode = 00700) // <- OCTAL
+                                      :  nsOutputStream(nsnull)
                                      {
-                                          nsBasicFileStream::open(inFile, nsprMode, accessMode);
+                                          nsISupports* stream;
+                                          if (NS_FAILED(NS_NewIOFileStream(
+                                              &stream,
+                                              inFile, nsprMode, accessMode)))
+                                              return;
+                                          mFile = nsQueryInterface(stream);
+                                          mOutputStream = nsQueryInterface(stream);
+                                          mFileOutputStream = nsQueryInterface(stream);
+                                          NS_RELEASE(stream);
                                      }
+ 
+    virtual void                      flush();
+
+    // Output streamers.  Unfortunately, they don't inherit!
+    nsOutputStream&                   operator << (const char* buf)
+                                        { return nsOutputStream::operator << (buf); }
+    nsOutputStream&                   operator << (char ch)
+                                        { return nsOutputStream::operator << (ch); }
+    nsOutputStream&                   operator << (short val)
+                                        { return nsOutputStream::operator << (val); }
+    nsOutputStream&                   operator << (unsigned short val)
+                                        { return nsOutputStream::operator << (val); }
+    nsOutputStream&                   operator << (long val)
+                                        { return nsOutputStream::operator << (val); }
+    nsOutputStream&                   operator << (unsigned long val)
+                                        { return nsOutputStream::operator << (val); }
+    nsOutputStream&                   operator << (nsOutputStream& (*pf)(nsOutputStream&))
+                                        { return nsOutputStream::operator << (pf); }
+
+protected:
+
+   virtual PRBool                     get_at_eof() const
+                                      {
+                                          return nsFileClient::get_at_eof();
+                                      }
+
+   virtual void                       set_at_eof(PRBool atEnd)
+                                      {
+                                          nsFileClient::set_at_eof(atEnd);
+                                      }
+
+// DATA
+protected:
+    nsCOMPtr<nsIFileOutputStream>     mFileOutputStream;
 }; // class nsOutputFileStream

 //========================================================================================
-class NS_BASE nsIOFileStream
+class NS_BASE nsOutputConsoleStream
+// Please read the comments at the top of this file
 //========================================================================================
-:	public nsBasicFileStream
-,	public nsBasicOutStream
-,	public nsBasicInStream
+:	public nsOutputFileStream
+{
+public:
+
+                                      nsOutputConsoleStream()
+                                      {
+                                          nsISupports* stream;
+                                          if (NS_FAILED(NS_NewOutputConsoleStream(&stream)))
+                                              return;
+                                          mFile = nsQueryInterface(stream);
+                                          mOutputStream = nsQueryInterface(stream);
+                                          mFileOutputStream = nsQueryInterface(stream);
+                                          NS_RELEASE(stream);
+                                      }
+
+    // Output streamers.  Unfortunately, they don't inherit!
+    nsOutputStream&                   operator << (const char* buf)
+                                        { return nsOutputStream::operator << (buf); }
+    nsOutputStream&                   operator << (char ch)
+                                        { return nsOutputStream::operator << (ch); }
+    nsOutputStream&                   operator << (short val)
+                                        { return nsOutputStream::operator << (val); }
+    nsOutputStream&                   operator << (unsigned short val)
+                                        { return nsOutputStream::operator << (val); }
+    nsOutputStream&                   operator << (long val)
+                                        { return nsOutputStream::operator << (val); }
+    nsOutputStream&                   operator << (unsigned long val)
+                                        { return nsOutputStream::operator << (val); }
+    nsOutputStream&                   operator << (nsOutputStream& (*pf)(nsOutputStream&))
+                                        { return nsOutputStream::operator << (pf); }
+
+}; // class nsOutputConsoleStream
+
+//========================================================================================
+class NS_BASE nsIOFileStream
+// Please read the comments at the top of this file
+//========================================================================================
+:	public nsInputFileStream
+,	public nsOutputStream
 {
 public:
 	enum  { kDefaultMode = (PR_RDWR | PR_CREATE_FILE) };

                                      nsIOFileStream(
-                                           const nsFilePath& inFile,
+                                          nsIInputStream* inInputStream
+                                      ,   nsIOutputStream* inOutputStream)
+                                      :   nsInputFileStream(inInputStream)
+                                      ,   nsOutputStream(inOutputStream)
+                                      ,   mFileOutputStream(do_QueryInterface(inOutputStream))
+                                      {
+                                      }
+                                      nsIOFileStream(
+                                           const nsFileSpec& inFile,
                                           int nsprMode = kDefaultMode,
                                           PRIntn accessMode = 00700) // <- OCTAL
-                                      : nsBasicFileStream(inFile, nsprMode, accessMode)
-                                      , nsBasicInStream(*this, 0)
-                                      , nsBasicOutStream(*this, 0)
-                                      {}
- 
-    inline void                       open(
-                                          const nsFilePath& inFile,
-                                          int nsprMode = kDefaultMode,
-                                          PRIntn accessMode = 00700) // <- OCTAL
+                                      :  nsInputFileStream(nsnull)
+                                      ,  nsOutputStream(nsnull)
                                      {
-                                          nsBasicFileStream::open(inFile, nsprMode, accessMode);
+                                          nsISupports* stream;
+                                          if (NS_FAILED(NS_NewIOFileStream(
+                                              &stream,
+                                              inFile, nsprMode, accessMode)))
+                                              return;
+                                          mFile = nsQueryInterface(stream);
+                                          mInputStream = nsQueryInterface(stream);
+                                          mOutputStream = nsQueryInterface(stream);
+                                          mFileInputStream = nsQueryInterface(stream);
+                                          mFileOutputStream = nsQueryInterface(stream);
+                                          NS_RELEASE(stream);
+                                      }
+ 
+    virtual void                      close()
+                                      {
+                                          // Doesn't matter which of the two we close:
+                                          // they're hooked up to the same file.
+                                          nsInputFileStream::close();
                                      }
-}; // class nsIOFileStream

+     // Output streamers.  Unfortunately, they don't inherit!
+    nsOutputStream&                   operator << (const char* buf)
+                                        { return nsOutputStream::operator << (buf); }
+    nsOutputStream&                   operator << (char ch)
+                                        { return nsOutputStream::operator << (ch); }
+    nsOutputStream&                   operator << (short val)
+                                        { return nsOutputStream::operator << (val); }
+    nsOutputStream&                   operator << (unsigned short val)
+                                        { return nsOutputStream::operator << (val); }
+    nsOutputStream&                   operator << (long val)
+                                        { return nsOutputStream::operator << (val); }
+    nsOutputStream&                   operator << (unsigned long val)
+                                        { return nsOutputStream::operator << (val); }
+    nsOutputStream&                   operator << (nsOutputStream& (*pf)(nsOutputStream&))
+                                        { return nsOutputStream::operator << (pf); }
+
+    // Input streamers.  Unfortunately, they don't inherit!
+    nsInputStream&                    operator >> (char& ch)
+                                         { return nsInputStream::operator >>(ch); }
+    nsInputStream&                    operator >> (nsInputStream& (*pf)(nsInputStream&))
+                                         { return nsInputStream::operator >>(pf); }
+
+    // DATA
+protected:
+    nsCOMPtr<nsIFileOutputStream>     mFileOutputStream;
+}; // class nsIOFileStream
+ 
 //========================================================================================
 //        Manipulators
 //========================================================================================
-NS_BASE nsBasicOutStream& nsEndl(nsBasicOutStream& os);
- 
+
+NS_BASE nsOutputStream&     nsEndl(nsOutputStream& os); // outputs and FLUSHES.
+

 #endif /* _FILESTREAM_H_ */
--- a/mozilla/base/public/nsIFileStream.h
+++ b/mozilla/base/public/nsIFileStream.h
@@ -0,0 +1,131 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#ifndef nsIFileStream_h___
+#define nsIFileStream_h___
+
+#include "nsIInputStream.h"
+#include "nsIOutputStream.h"
+#include "prio.h"
+
+class nsFileSpec;
+
+/* a6cf90e8-15b3-11d2-932e-00805f8add32 */
+#define NS_IFILE_IID \
+{ 0xa6cf90e8, 0x15b3, 0x11d2, \
+    {0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32} }
+
+//========================================================================================
+class nsIFile
+// Represents a file, and supports Open, Tell etc.
+//========================================================================================
+: public nsISupports
+{
+public:
+    static const nsIID& IID() { static nsIID iid = NS_IFILE_IID; return iid; }
+	NS_IMETHOD                         Open(
+                                           const nsFileSpec& inFile,
+                                           int nsprMode,
+                                           PRIntn accessMode) = 0;
+                                           // Note: Open() is only needed after
+                                           // an explicit Close().  All file streams
+                                           // are automatically opened on construction.
+    NS_IMETHOD                         Seek(PRSeekWhence whence, PRInt32 offset) = 0;
+    NS_IMETHOD                         GetIsOpen(PRBool* outOpen) = 0;
+    NS_IMETHOD                         Tell(PRIntn* outWhere) = 0;
+
+/* "PROTECTED" */
+    NS_IMETHOD                         GetAtEOF(PRBool* outAtEOF) = 0;
+    NS_IMETHOD                         SetAtEOF(PRBool inAtEOF) = 0;
+}; // class nsIFile
+
+/* a6cf90e6-15b3-11d2-932e-00805f8add32 */
+#define NS_IFILEINPUTSTREAM_IID \
+{ 0xa6cf90e6, 0x15b3, 0x11d2, \
+    {0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32} }
+    
+//========================================================================================
+class nsIFileInputStream
+// These are additional file-specific methods that files have, above what
+// nsIInputStream supports.  The current implementation supports both
+// interfaces.
+//========================================================================================
+: public nsISupports
+{
+public:
+    static const nsIID& IID() { static nsIID iid = NS_IFILEINPUTSTREAM_IID; return iid; }
+}; // class nsIFileInputStream
+
+/* a6cf90e7-15b3-11d2-932e-00805f8add32 */
+#define NS_IFILEOUTPUTSTREAM_IID \
+{ 0xa6cf90e7, 0x15b3, 0x11d2, \
+    {0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32} }
+
+//========================================================================================
+class nsIFileOutputStream
+// These are additional file-specific methods that files have, above what
+// nsIOutputStream supports.  The current implementation supports both
+// interfaces.
+//========================================================================================
+: public nsISupports
+{
+public:
+    static const nsIID& IID() { static nsIID iid = NS_IFILEOUTPUTSTREAM_IID; return iid; }
+    NS_IMETHOD                         Flush() = 0;
+                                           // Forces a write to disk.
+}; // class nsIFileOutputStream
+
+//----------------------------------------------------------------------------------------
+extern "C" NS_BASE nsresult NS_NewTypicalInputFileStream(
+    nsISupports** aStreamResult,
+    const nsFileSpec& inFile
+    /*Default nsprMode == PR_RDONLY*/
+    /*Default accessmode = 0700 (octal)*/);
+// Factory method to get an nsInputStream from a file, using most common options
+
+//----------------------------------------------------------------------------------------
+extern "C" NS_BASE nsresult NS_NewOutputConsoleStream(
+    nsISupports** aStreamResult);
+    // Factory method to get an nsOutputStream to the console.
+
+//----------------------------------------------------------------------------------------
+extern "C" NS_BASE nsresult NS_NewTypicalOutputFileStream(
+    nsISupports** aStreamResult, // will implement all the above interfaces
+    const nsFileSpec& inFile
+    /*default nsprMode= (PR_WRONLY | PR_CREATE_FILE | PR_TRUNCATE)*/
+    /*Default accessMode= 0700 (octal)*/);
+    // Factory method to get an nsOutputStream to a file - most common case.
+
+//----------------------------------------------------------------------------------------
+extern "C" NS_BASE nsresult NS_NewTypicalIOFileStream(
+    nsISupports** aStreamResult, // will implement all the above interfaces
+    const nsFileSpec& inFile
+    /*default nsprMode = (PR_RDWR | PR_CREATE_FILE)*/
+    /*Default accessMode = 0700 (octal)*/);
+    // Factory method to get an object that implements both nsIInputStream
+    // and nsIOutputStream, associated with a single file.
+
+//----------------------------------------------------------------------------------------
+extern "C" NS_BASE nsresult NS_NewIOFileStream(
+    nsISupports** aStreamResult, // will implement all the above interfaces
+    const nsFileSpec& inFile,
+    PRInt32 nsprMode,
+    PRInt32 accessMode);
+    // Factory method to get an object that implements both nsIInputStream
+    // and nsIOutputStream, associated with a single file.
+
+#endif /* nsIFileStream_h___ */
--- a/mozilla/base/public/nsRepeater.h
+++ b/mozilla/base/public/nsRepeater.h
@@ -19,9 +19,11 @@
 #ifndef nsRepeater_h___
 #define nsRepeater_h___

+#include "nscore.h"
+
 class EventRecord;

-class Repeater {
+class NS_BASE Repeater {
  public:
  
    Repeater();
--- a/mozilla/base/src/Makefile.in
+++ b/mozilla/base/src/Makefile.in
@@ -31,6 +31,7 @@ LIBRARY_NAME = raptorbase
 CPPSRCS =                       \
    nsArena.cpp                 \
    nsAtomTable.cpp             \
+    nsBaseDLL.cpp               \
    nsBTree.cpp                 \
    nsByteBuffer.cpp            \
    nsCRT.cpp                   \
@@ -38,6 +39,8 @@ CPPSRCS =                       \
    nsEscape.cpp                \
    nsFileSpec.cpp              \
    nsFileStream.cpp            \
+    nsIFileStream.cpp            \
+    nsProperties.cpp            \
    nsRBTree.cpp                \
    nsSizeOfHandler.cpp		\
    nsString.cpp                \
--- a/mozilla/base/src/gtk/Makefile.in
+++ b/mozilla/base/src/gtk/Makefile.in
@@ -30,7 +30,10 @@ REQUIRES	= xpcom raptor

 DEFINES		+= -D_IMPL_NS_WIDGET

-CPPSRCS		= nsTimer.cpp
+CPPSRCS		= 									\
+		nsTimer.cpp								\
+		nsCaretProperties.cpp			\
+    $(NULL)

 include $(topsrcdir)/config/config.mk

--- a/mozilla/base/src/gtk/nsCaretProperties.cpp
+++ b/mozilla/base/src/gtk/nsCaretProperties.cpp
@@ -0,0 +1,40 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+
+#include "nscore.h"
+
+#include "nsCaretProperties.h"
+
+
+//-----------------------------------------------------------------------------
+nsCaretProperties::nsCaretProperties()
+:	mCaretWidth(eDefaultCaretWidth)
+,	mBlinkRate(eDefaulBlinkRate)
+{
+	// in your platform-specific class, get data from the OS in your constructor
+	
+	mBlinkRate = 0;			// don't blink the caret
+}
+
+
+//-----------------------------------------------------------------------------
+nsCaretProperties* NewCaretProperties()
+{
+	return new nsCaretProperties();
+}
--- a/mozilla/cmd/macfe/utility/CStLayerOriginSetter.cp
+++ b/mozilla/cmd/macfe/utility/CStLayerOriginSetter.cp
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 *
 * The contents of this file are subject to the Netscape Public License
 * Version 1.0 (the "NPL"); you may not use this file except in
@@ -16,24 +16,28 @@
 * Reserved.
 */

-#include "CStLayerOriginSetter.h"
+#include <Events.h>

-// See header file for documentation
+#include "nscore.h"

-CStLayerOriginSetter::CStLayerOriginSetter(CHTMLView *viewToSet, CL_Layer *the_layer)
- 																				 : mShouldChange(false) {
+#include "nsCaretProperties.h"

-	mViewToSet = viewToSet;
-	if (the_layer && mViewToSet) {
-		mViewToSet->GetLayerOrigin(&mOldx, &mOldy);
-		mViewToSet->SetLayerOrigin(CL_GetLayerXOrigin(the_layer), CL_GetLayerYOrigin(the_layer));
-		mShouldChange = true;
-	} 
+
+//-----------------------------------------------------------------------------
+nsCaretProperties::nsCaretProperties()
+:	mCaretWidth(eDefaultCaretWidth)
+,	mBlinkRate(eDefaulBlinkRate)
+{
+	// in your platform-specific class, get data from the OS in your constructor
+	
+	// MacOS calls
+	
+	mBlinkRate = ::GetCaretTime() * 1000 / 60;
 }

-CStLayerOriginSetter::~CStLayerOriginSetter() {

-	if (mShouldChange && mViewToSet) 
-		mViewToSet->SetLayerOrigin(mOldx, mOldy);
-	
-}
+//-----------------------------------------------------------------------------
+nsCaretProperties* NewCaretProperties()
+{
+	return new nsCaretProperties();
+}
--- a/mozilla/base/src/mac/nsFileSpecMac.cpp
+++ b/mozilla/base/src/mac/nsFileSpecMac.cpp
@@ -28,6 +28,7 @@
 #include <Folders.h>
 #include <Errors.h>
 #include <TextUtils.h>
+#include <Processes.h>

 const unsigned char* kAliasHavenFolderName = "\pnsAliasHaven";

@@ -74,7 +75,7 @@ namespace MacFileHelpers
 	// to support attaching of aliases in mail.
 	void							EnsureAliasHaven();
 	void							SetNoResolve(Boolean inResolve);
-	bool							IsAliasSafe(const FSSpec& inSpec);
+	PRBool							IsAliasSafe(const FSSpec& inSpec);
 	OSErr							MakeAliasSafe(FSSpec& inOutSpec);
 	OSErr							ResolveAliasFile(FSSpec& inOutSpec, Boolean& wasAliased);

@@ -131,8 +132,8 @@ char* MacFileHelpers::EncodeMacPath(
 //	Method: Swap ':' and '/', hex escape the result
 //-----------------------------------
 {
-	if (inPath == NULL)
-		return NULL;
+	if (inPath == nsnull)
+		return nsnull;
 	int pathSize = strlen(inPath);
 	
 	// XP code sometimes chokes if there's a final slash in the unix path.
@@ -145,8 +146,8 @@ char* MacFileHelpers::EncodeMacPath(
 		pathSize--;
 	}

-	char * newPath = NULL;
-	char * finalPath = NULL;
+	char * newPath = nsnull;
+	char * finalPath = nsnull;
 	
 	if (prependSlash)
 	{
@@ -188,10 +189,10 @@ OSErr MacFileHelpers::MakeAliasSafe(FSSpec& inOutSpec)
 //----------------------------------------------------------------------------------------
 {
 	EnsureAliasHaven();
-	nsNativeFileSpec dstDirSpec(sAliasHavenVRefNum, sAliasHavenDirID, "\p");
+	nsFileSpec dstDirSpec(sAliasHavenVRefNum, sAliasHavenDirID, "\p");

 	// Make sure its name is unique
-	nsNativeFileSpec havenSpec(sAliasHavenVRefNum, sAliasHavenDirID, "\pG'day");
+	nsFileSpec havenSpec(sAliasHavenVRefNum, sAliasHavenDirID, "\pG'day");
 	if (havenSpec.Valid())
 		havenSpec.MakeUnique(inOutSpec.name);
 	// Copy the file into the haven directory
@@ -221,9 +222,9 @@ char* MacFileHelpers::MacPathFromUnixPath(const char* unixPath)
 	{
 		char* dst = result;
 		const char* src = unixPath;
-		if (*src == '/')		 	// ¥ full path
+		if (*src == '/')		 	// * full path
 			src++;
-		else if (strchr(src, '/'))	// ¥ partial path, and not just a leaf name
+		else if (strchr(src, '/'))	// * partial path, and not just a leaf name
 			*dst++ = ':';
 		strcpy(dst, src);
 		nsUnescape(dst);	// Hex Decode
@@ -346,7 +347,7 @@ void MacFileHelpers::EnsureAliasHaven()
 } // MacFileHelpers::EnsureAliasHaven

 //----------------------------------------------------------------------------------------
-bool MacFileHelpers::IsAliasSafe(const FSSpec& inSpec)
+PRBool MacFileHelpers::IsAliasSafe(const FSSpec& inSpec)
 // Returns true if the alias is in the alias haven directory, or if alias resolution
 // has been turned off.
 //----------------------------------------------------------------------------------------
@@ -379,7 +380,7 @@ OSErr MacFileHelpers::FSSpecFromFullUnixPath(
 // then it is combined with inOutSpec's vRefNum and parID to form a new spec.
 //-----------------------------------
 {
-	if (unixPath == NULL)
+	if (unixPath == nsnull)
 		return badFidErr;
 	char* macPath = MacPathFromUnixPath(unixPath);
 	if (!macPath)
@@ -413,7 +414,7 @@ char* MacFileHelpers::PathNameFromFSSpec( const FSSpec& inSpec, Boolean wantLeaf
 	OSErr err = noErr;
 	
 	short fullPathLength = 0;
-	Handle fullPath = NULL;
+	Handle fullPath = nsnull;
 	
 	FSSpec tempSpec = inSpec;
 	if ( tempSpec.parID == fsRtParID )
@@ -471,7 +472,7 @@ char* MacFileHelpers::PathNameFromFSSpec( const FSSpec& inSpec, Boolean wantLeaf
 						tempSpec.name[tempSpec.name[0]] = ':';
 						
 						/* Add directory name to beginning of fullPath */
-						(void) Munger(fullPath, 0, NULL, 0, &tempSpec.name[1], tempSpec.name[0]);
+						(void) Munger(fullPath, 0, nsnull, 0, &tempSpec.name[1], tempSpec.name[0]);
 						err = MemError();
 					}
 				} while ( err == noErr && pb.dirInfo.ioDrDirID != fsRtDirID );
@@ -500,19 +501,19 @@ Clean:
 } // MacFileHelpers::PathNameFromFSSpec

 //========================================================================================
-//					Macintosh nsNativeFileSpec implementation
+//					Macintosh nsFileSpec implementation
 //========================================================================================

 //----------------------------------------------------------------------------------------
-nsNativeFileSpec::nsNativeFileSpec()
+nsFileSpec::nsFileSpec()
 //----------------------------------------------------------------------------------------
-:	mError(noErr)
+:	mError(NS_OK)
 {
 	mSpec.name[0] = '\0';
 }

 //----------------------------------------------------------------------------------------
-nsNativeFileSpec::nsNativeFileSpec(const nsNativeFileSpec& inSpec)
+nsFileSpec::nsFileSpec(const nsFileSpec& inSpec)
 //----------------------------------------------------------------------------------------
 :	mSpec(inSpec.mSpec)
 ,	mError(inSpec.Error())
@@ -520,87 +521,101 @@ nsNativeFileSpec::nsNativeFileSpec(const nsNativeFileSpec& inSpec)
 }

 //----------------------------------------------------------------------------------------
-nsNativeFileSpec::nsNativeFileSpec(const char* inString, bool inCreateDirs)
+nsFileSpec::nsFileSpec(const char* inString, PRBool inCreateDirs)
 //----------------------------------------------------------------------------------------
 {
-	mError = MacFileHelpers::FSSpecFromFullUnixPath(
-								inString, mSpec, true, true, inCreateDirs);
+	mError = NS_FILE_RESULT(MacFileHelpers::FSSpecFromFullUnixPath(
+								inString, mSpec, false, true, inCreateDirs));
 		// allow a partial path, create as necessary
-	if (mError == fnfErr)
-		mError = noErr;
-} // nsNativeFileSpec::nsNativeFileSpec
+	if (mError == NS_FILE_RESULT(fnfErr))
+		mError = NS_OK;
+} // nsFileSpec::nsFileSpec

 //----------------------------------------------------------------------------------------
-nsNativeFileSpec::nsNativeFileSpec(
+nsFileSpec::nsFileSpec(const nsString& inString, PRBool inCreateDirs)
+//----------------------------------------------------------------------------------------
+{
+	mError = NS_FILE_RESULT(MacFileHelpers::FSSpecFromFullUnixPath(
+								nsAutoCString(inString), mSpec, false, true, inCreateDirs));
+		// allow a partial path, create as necessary
+	if (mError == NS_FILE_RESULT(fnfErr))
+		mError = NS_OK;
+} // nsFileSpec::nsFileSpec
+
+//----------------------------------------------------------------------------------------
+nsFileSpec::nsFileSpec(
 	short vRefNum,
 	long parID,
 	ConstStr255Param name)
 //----------------------------------------------------------------------------------------
 {
-	mError = ::FSMakeFSSpec(vRefNum, parID, name, &mSpec);
-	if (mError == fnfErr)
+	mError = NS_FILE_RESULT(::FSMakeFSSpec(vRefNum, parID, name, &mSpec));
+	if (mError == NS_FILE_RESULT(fnfErr))
 		mError = noErr;
 }

 //----------------------------------------------------------------------------------------
-nsNativeFileSpec::nsNativeFileSpec(const nsFilePath& inPath)
+nsFileSpec::nsFileSpec(const nsFilePath& inPath)
 //----------------------------------------------------------------------------------------
 {
-	*this = inPath.GetNativeSpec();
+	*this = inPath.GetFileSpec();
 }

+#if DEBUG
 //----------------------------------------------------------------------------------------
-nsBasicOutStream& operator << (nsBasicOutStream& s, const nsNativeFileSpec& spec)
+nsOutputStream& operator << (nsOutputStream& s, const nsFileSpec& spec)
 //----------------------------------------------------------------------------------------
 {
 	s << spec.mSpec.vRefNum << ", " << spec.mSpec.parID << ", \"";
 	s.write((const char*)&spec.mSpec.name[1], spec.mSpec.name[0]);
 	return s << "\"";	
-} // nsOutputFileStream& operator << (nsOutputFileStream&, const nsNativeFileSpec&)
+} // nsOutputStream& operator << (nsOutputStream&, const nsFileSpec&)
+#endif

 //----------------------------------------------------------------------------------------
-void nsNativeFileSpec::operator = (const char* inString)
+void nsFileSpec::operator = (const char* inString)
 //----------------------------------------------------------------------------------------
 {
-	mError = MacFileHelpers::FSSpecFromFullUnixPath(inString, mSpec, true);
-} // nsNativeFileSpec::operator =
+	mError = NS_FILE_RESULT(MacFileHelpers::FSSpecFromFullUnixPath(inString, mSpec, false));
+} // nsFileSpec::operator =

 //----------------------------------------------------------------------------------------
-void nsNativeFileSpec::operator = (const nsNativeFileSpec& inSpec)
+void nsFileSpec::operator = (const nsFileSpec& inSpec)
 //----------------------------------------------------------------------------------------
 {
 	mSpec = inSpec.mSpec;
 	mError = inSpec.Error();
-} // nsNativeFileSpec::operator =
+} // nsFileSpec::operator =

 //----------------------------------------------------------------------------------------
-void nsNativeFileSpec::operator = (const nsFilePath& inPath)
+void nsFileSpec::operator = (const nsFilePath& inPath)
 //----------------------------------------------------------------------------------------
 {
-	*this = inPath.GetNativeSpec();
-} // nsNativeFileSpec::operator =
+	*this = inPath.GetFileSpec();
+} // nsFileSpec::operator =

 //----------------------------------------------------------------------------------------
-bool nsNativeFileSpec::Exists() const
+PRBool nsFileSpec::Exists() const
 //----------------------------------------------------------------------------------------
 {
 	FSSpec temp;
 	return ::FSMakeFSSpec(mSpec.vRefNum, mSpec.parID, mSpec.name, &temp) == noErr;
-} // nsNativeFileSpec::operator =
+} // nsFileSpec::operator =

 //----------------------------------------------------------------------------------------
-void nsNativeFileSpec::SetLeafName(const char* inLeafName)
+void nsFileSpec::SetLeafName(const char* inLeafName)
 // In leaf name can actually be a partial path...
 //----------------------------------------------------------------------------------------
 {
 	// what about long relative paths?  Hmm?
 	Str255 partialPath;
 	MacFileHelpers::PLstrcpy(partialPath, inLeafName);
-	mError = FSMakeFSSpec(mSpec.vRefNum, mSpec.parID, partialPath, &mSpec);
-} // nsNativeFileSpec::SetLeafName
+	mError = NS_FILE_RESULT(
+	    ::FSMakeFSSpec(mSpec.vRefNum, mSpec.parID, partialPath, &mSpec));
+} // nsFileSpec::SetLeafName

 //----------------------------------------------------------------------------------------
-char* nsNativeFileSpec::GetLeafName() const
+char* nsFileSpec::GetLeafName() const
 // Result needs to be delete[]ed.
 //----------------------------------------------------------------------------------------
 {
@@ -608,131 +623,219 @@ char* nsNativeFileSpec::GetLeafName() const
 	memcpy(leaf, &mSpec.name[1], mSpec.name[0]);
 	leaf[mSpec.name[0]] = '\0';
 	return nsFileSpecHelpers::StringDup(leaf);
-} // nsNativeFileSpec::GetLeafName
+} // nsFileSpec::GetLeafName

 //----------------------------------------------------------------------------------------
-void nsNativeFileSpec::MakeAliasSafe()
+void nsFileSpec::MakeAliasSafe()
 //----------------------------------------------------------------------------------------
 {
-	mError = MacFileHelpers::MakeAliasSafe(mSpec);
-} // nsNativeFileSpec::MakeAliasSafe
+	mError = NS_FILE_RESULT(MacFileHelpers::MakeAliasSafe(mSpec));
+} // nsFileSpec::MakeAliasSafe

 //----------------------------------------------------------------------------------------
-void nsNativeFileSpec::MakeUnique(ConstStr255Param inSuggestedLeafName)
+void nsFileSpec::MakeUnique(ConstStr255Param inSuggestedLeafName)
 //----------------------------------------------------------------------------------------
 {
 	if (inSuggestedLeafName[0] > 0)
 		MacFileHelpers::PLstrcpy(mSpec.name, inSuggestedLeafName);

 	MakeUnique();
-} // nsNativeFileSpec::MakeUnique
+} // nsFileSpec::MakeUnique

 //----------------------------------------------------------------------------------------
-void nsNativeFileSpec::ResolveAlias(bool& wasAliased)
+void nsFileSpec::ResolveAlias(PRBool& wasAliased)
 //----------------------------------------------------------------------------------------
 {
 	Boolean wasAliased2;
-	mError = MacFileHelpers::ResolveAliasFile(mSpec, wasAliased2);
+	mError = NS_FILE_RESULT(MacFileHelpers::ResolveAliasFile(mSpec, wasAliased2));
 	wasAliased = (wasAliased2 != false);
-} // nsNativeFileSpec::ResolveAlias
+} // nsFileSpec::ResolveAlias

 //----------------------------------------------------------------------------------------
-bool nsNativeFileSpec::IsFile() const
+PRBool nsFileSpec::IsFile() const
 //----------------------------------------------------------------------------------------
 {
 	long dirID;
 	Boolean isDirectory;
 	return (noErr == FSpGetDirectoryID(&mSpec, &dirID, &isDirectory) && !isDirectory);
-} // nsNativeFileSpec::IsFile
+} // nsFileSpec::IsFile

 //----------------------------------------------------------------------------------------
-bool nsNativeFileSpec::IsDirectory() const
+PRBool nsFileSpec::IsDirectory() const
 //----------------------------------------------------------------------------------------
 {
 	long dirID;
 	Boolean isDirectory;
 	return (noErr == FSpGetDirectoryID(&mSpec, &dirID, &isDirectory) && isDirectory);
-} // nsNativeFileSpec::IsDirectory
+} // nsFileSpec::IsDirectory

 //----------------------------------------------------------------------------------------
-void nsNativeFileSpec::GetParent(nsNativeFileSpec& outSpec) const
+void nsFileSpec::GetParent(nsFileSpec& outSpec) const
 //----------------------------------------------------------------------------------------
 {
-	if (mError == noErr)
-		outSpec.mError = FSMakeFSSpec(mSpec.vRefNum, mSpec.parID, NULL, outSpec);
-} // nsNativeFileSpec::GetParent
+	if (NS_SUCCEEDED(mError))
+		outSpec.mError
+		    = NS_FILE_RESULT(::FSMakeFSSpec(mSpec.vRefNum, mSpec.parID, nsnull, outSpec));
+} // nsFileSpec::GetParent

 //----------------------------------------------------------------------------------------
-void nsNativeFileSpec::operator += (const char* inRelativePath)
+void nsFileSpec::operator += (const char* inRelativePath)
 //----------------------------------------------------------------------------------------
 {
 	long dirID;
 	Boolean isDirectory;
-	mError = FSpGetDirectoryID(&mSpec, &dirID, &isDirectory);
-	if (mError == noErr && isDirectory)
+	mError = NS_FILE_RESULT(::FSpGetDirectoryID(&mSpec, &dirID, &isDirectory));
+	if (NS_SUCCEEDED(mError) && isDirectory)
 	{
-		mError = FSMakeFSSpec(mSpec.vRefNum, dirID, "\pG'day", *this);
-		if (mError == noErr)
-			SetLeafName(inRelativePath);
+		Str255 partialPath;
+		MacFileHelpers::PLstrcpy(partialPath, inRelativePath);
+		mError = NS_FILE_RESULT(::FSMakeFSSpec(mSpec.vRefNum, dirID, partialPath, *this));
+		//if (NS_SUCCEEDED(mError))
+		//	SetLeafName(inRelativePath);
 	}
-} // nsNativeFileSpec::operator +=
+} // nsFileSpec::operator +=

 //----------------------------------------------------------------------------------------
-void nsNativeFileSpec::CreateDirectory(int /* unix mode */)
+void nsFileSpec::CreateDirectory(int /* unix mode */)
 //----------------------------------------------------------------------------------------
 {
 	long ignoredDirID;
 	FSpDirCreate(&mSpec, smCurrentScript, &ignoredDirID);
-} // nsNativeFileSpec::CreateDirectory
+} // nsFileSpec::CreateDirectory

 //----------------------------------------------------------------------------------------
-void nsNativeFileSpec::Delete(bool inRecursive)
+void nsFileSpec::Delete(PRBool inRecursive) const
 //----------------------------------------------------------------------------------------
 {
+	nsresult& mutableError = const_cast<nsFileSpec*>(this)->mError;
 	if (inRecursive)
 	{
 		// MoreFilesExtras
-		mError = DeleteDirectory(
+		mutableError = NS_FILE_RESULT(::DeleteDirectory(
 					mSpec.vRefNum,
 					mSpec.parID,
-					const_cast<unsigned char*>(mSpec.name));
+					const_cast<unsigned char*>(mSpec.name)));
 	}
 	else
-		mError = FSpDelete(&mSpec);
-} // nsNativeFileSpec::Delete
+		mutableError = NS_FILE_RESULT(FSpDelete(&mSpec));
+} // nsFileSpec::Delete

+//----------------------------------------------------------------------------------------
+nsresult nsFileSpec::Rename(const char* inNewName)
+//----------------------------------------------------------------------------------------
+{
+    if (strchr(inNewName, '/'))
+        return -1; // no relative paths here!
+    Str255 pName;
+    MacFileHelpers::PLstrcpy(pName, inNewName);
+    if (FSpRename(&mSpec, pName) != noErr)
+        return -1;
+    SetLeafName(inNewName);
+    return 0;
+} // nsFileSpec::Rename
+
+//----------------------------------------------------------------------------------------
+nsresult nsFileSpec::Copy(const nsFileSpec& newParentDir) const
+//----------------------------------------------------------------------------------------
+{
+    // We can only copy into a directory, and (for now) can not copy entire directories
+
+    if (!newParentDir.IsDirectory() || (IsDirectory() ) )
+        return NS_FILE_FAILURE;
+
+    
+    nsresult result = NS_FILE_RESULT(::FSpFileCopy(   &mSpec,
+                            &newParentDir.mSpec,
+                            const_cast<StringPtr>(GetLeafPName()),
+                            nsnull,
+                            0,
+                            true));
+
+    return result;
+
+} // nsFileSpec::Copy
+
+//----------------------------------------------------------------------------------------
+nsresult nsFileSpec::Move(const nsFileSpec& newParentDir) const
+//----------------------------------------------------------------------------------------
+{
+    // We can only move into a directory
+    
+    if (!newParentDir.IsDirectory())
+    	return NS_FILE_FAILURE;
+ 
+    nsresult result = NS_FILE_RESULT(::FSpMoveRenameCompat(&mSpec,
+                                    &newParentDir.mSpec,
+                                    const_cast<StringPtr>(GetLeafPName())));
+    
+    return result;
+} // nsFileSpec::Move
+
+//----------------------------------------------------------------------------------------
+nsresult nsFileSpec::Execute(const char* /*args - how can this be cross-platform?  problem! */ ) const
+//----------------------------------------------------------------------------------------
+{
+    if (IsDirectory())
+        return NS_FILE_FAILURE;
+
+    LaunchParamBlockRec launchThis;
+    launchThis.launchAppSpec = const_cast<FSSpec*>(&mSpec);
+    launchThis.launchAppParameters = nsnull; // args;
+    /* launch the thing */
+    launchThis.launchBlockID    = extendedBlock;
+    launchThis.launchEPBLength  = extendedBlockLen;
+    launchThis.launchFileFlags  = nsnull;
+    launchThis.launchControlFlags = launchContinue + launchNoFileFlags + launchUseMinimum;
+    launchThis.launchControlFlags += launchDontSwitch;
+
+    nsresult result = NS_FILE_RESULT(::LaunchApplication(&launchThis));
+    return result;
+  
+} // nsFileSpec::Execute

 //========================================================================================
 //					Macintosh nsFilePath implementation
 //========================================================================================

 //----------------------------------------------------------------------------------------
-nsFilePath::nsFilePath(const char* inString, bool inCreateDirs)
+nsFilePath::nsFilePath(const char* inString, PRBool inCreateDirs)
 //----------------------------------------------------------------------------------------
 :    mPath(nsnull)
-,    mNativeFileSpec(inString, inCreateDirs)
+,    mFileSpec(inString, inCreateDirs)
 {
    // Make canonical and absolute.
-	char * path = MacFileHelpers::PathNameFromFSSpec( mNativeFileSpec, TRUE );
+	char * path = MacFileHelpers::PathNameFromFSSpec( mFileSpec, TRUE );
 	mPath = MacFileHelpers::EncodeMacPath(path, true, true);
 }
+
 //----------------------------------------------------------------------------------------
-nsFilePath::nsFilePath(const nsNativeFileSpec& inSpec)
+nsFilePath::nsFilePath(const nsString& inString, PRBool inCreateDirs)
 //----------------------------------------------------------------------------------------
-:	mNativeFileSpec(inSpec)
+:    mPath(nsnull)
+,    mFileSpec(nsAutoCString(inString), inCreateDirs)
+{
+    // Make canonical and absolute.
+	char * path = MacFileHelpers::PathNameFromFSSpec( mFileSpec, TRUE );
+	mPath = MacFileHelpers::EncodeMacPath(path, true, true);
+}
+
+//----------------------------------------------------------------------------------------
+nsFilePath::nsFilePath(const nsFileSpec& inSpec)
+//----------------------------------------------------------------------------------------
+:	mFileSpec(inSpec)
 {
 	char * path = MacFileHelpers::PathNameFromFSSpec( inSpec.mSpec, TRUE );
 	mPath = MacFileHelpers::EncodeMacPath(path, true, true);
 }

 //----------------------------------------------------------------------------------------
-void nsFilePath::operator = (const nsNativeFileSpec& inSpec)
+void nsFilePath::operator = (const nsFileSpec& inSpec)
 //----------------------------------------------------------------------------------------
 {
 	delete [] mPath;
 	char * path = MacFileHelpers::PathNameFromFSSpec( inSpec.mSpec, TRUE );
 	mPath = MacFileHelpers::EncodeMacPath(path, true, true);
-	mNativeFileSpec = inSpec;
+	mFileSpec = inSpec;
 } // nsFilePath::operator =

 //========================================================================================
@@ -740,14 +843,31 @@ void nsFilePath::operator = (const nsNativeFileSpec& inSpec)
 //========================================================================================

 //----------------------------------------------------------------------------------------
-nsFileURL::nsFileURL(const char* inString, bool inCreateDirs)
+nsFileURL::nsFileURL(const char* inString, PRBool inCreateDirs)
 //----------------------------------------------------------------------------------------
 :    mURL(nsnull)
-,    mNativeFileSpec(inString + kFileURLPrefixLength, inCreateDirs)
+,    mFileSpec(inString + kFileURLPrefixLength, inCreateDirs)
 {
    NS_ASSERTION(strstr(inString, kFileURLPrefix) == inString, "Not a URL!");
    // Make canonical and absolute.
-	char* path = MacFileHelpers::PathNameFromFSSpec( mNativeFileSpec, TRUE );
+	char* path = MacFileHelpers::PathNameFromFSSpec( mFileSpec, TRUE );
+	char* escapedPath = MacFileHelpers::EncodeMacPath(path, true, true);
+	mURL = nsFileSpecHelpers::StringDup(kFileURLPrefix, kFileURLPrefixLength + strlen(escapedPath));
+	strcat(mURL, escapedPath);
+	delete [] escapedPath;
+} // nsFileURL::nsFileURL
+
+//----------------------------------------------------------------------------------------
+nsFileURL::nsFileURL(const nsString& inString, PRBool inCreateDirs)
+//----------------------------------------------------------------------------------------
+:    mURL(nsnull)
+{
+    nsAutoCString aString(inString);
+    const char* aCString = (const char*)aString;
+    NS_ASSERTION(strstr(aCString, kFileURLPrefix) == aCString, "Not a URL!");
+    mFileSpec = aCString + kFileURLPrefixLength;
+    // Make canonical and absolute.
+	char* path = MacFileHelpers::PathNameFromFSSpec( mFileSpec, TRUE );
 	char* escapedPath = MacFileHelpers::EncodeMacPath(path, true, true);
 	mURL = nsFileSpecHelpers::StringDup(kFileURLPrefix, kFileURLPrefixLength + strlen(escapedPath));
 	strcat(mURL, escapedPath);
@@ -760,7 +880,7 @@ nsFileURL::nsFileURL(const char* inString, bool inCreateDirs)

 //----------------------------------------------------------------------------------------
 nsDirectoryIterator::nsDirectoryIterator(
-	const nsNativeFileSpec& inDirectory
+	const nsFileSpec& inDirectory
 ,	int inIterateDirection)
 //----------------------------------------------------------------------------------------
 	: mCurrent(inDirectory)
@@ -770,7 +890,7 @@ nsDirectoryIterator::nsDirectoryIterator(
 	CInfoPBRec pb;
 	DirInfo* dipb = (DirInfo*)&pb;
 	// Sorry about this, there seems to be a bug in CWPro 4:
-	const FSSpec& inSpec = inDirectory.nsNativeFileSpec::operator const FSSpec&();
+	const FSSpec& inSpec = inDirectory.nsFileSpec::operator const FSSpec&();
    Str255 outName;
    MacFileHelpers::PLstrcpy(outName, inSpec.name);
 	pb.hFileInfo.ioNamePtr = outName;
@@ -784,7 +904,7 @@ nsDirectoryIterator::nsDirectoryIterator(
 	if ( (err != noErr ) || !( dipb->ioFlAttrib & 0x0010 ) )
 		return;
 	// Sorry about this, there seems to be a bug in CWPro 4:
-	FSSpec& currentSpec = mCurrent.nsNativeFileSpec::operator FSSpec&();
+	FSSpec& currentSpec = mCurrent.nsFileSpec::operator FSSpec&();
 	currentSpec.vRefNum = inSpec.vRefNum;
 	currentSpec.parID = dipb->ioDrDirID;
 	mMaxIndex = pb.dirInfo.ioDrNmFls;
@@ -807,10 +927,10 @@ OSErr nsDirectoryIterator::SetToIndex()
 	CInfoPBRec cipb;
 	DirInfo	*dipb=(DirInfo *)&cipb;
 	Str255 objectName;
-	dipb->ioCompletion = NULL;
+	dipb->ioCompletion = nsnull;
 	dipb->ioFDirIndex = mIndex;
 	// Sorry about this, there seems to be a bug in CWPro 4:
-	FSSpec& currentSpec = mCurrent.nsNativeFileSpec::operator FSSpec&();
+	FSSpec& currentSpec = mCurrent.nsFileSpec::operator FSSpec&();
 	dipb->ioVRefNum = currentSpec.vRefNum; /* Might need to use vRefNum, not sure*/
 	dipb->ioDrDirID = currentSpec.parID;
 	dipb->ioNamePtr = objectName;
--- a/mozilla/base/src/mac/nsTimerMac.cpp
+++ b/mozilla/base/src/mac/nsTimerMac.cpp
@@ -39,12 +39,16 @@ class TimerImpl : public nsITimer
 // TimerImpl implements nsITimer API
 //========================================================================================
 {
+    friend class TimerPeriodical;
+    
  private:
    nsTimerCallbackFunc mCallbackFunc;
    nsITimerCallback * mCallbackObject;
    void * mClosure;
    PRUint32 mDelay;
    PRUint32 mFireTime;  // Timer should fire when TickCount >= this number
+    TimerImpl * mPrev; 
+    TimerImpl * mNext; 
  
  public:

@@ -103,10 +107,10 @@ class TimerPeriodical  : public Repeater
 // TimerPeriodical is a singleton Repeater subclass that fires
 // off TimerImpl. The firing is done on idle.
 //========================================================================================
-{  
+{      
    static TimerPeriodical * gPeriodical;
    
-        list<TimerImpl*> mTimers;
+    TimerImpl* mTimers;
  
  public:
    // Returns the singleton instance
@@ -140,6 +144,8 @@ TimerImpl::TimerImpl()
 ,  mClosure(nsnull)
 ,  mDelay(0)
 ,  mFireTime(0)
+,  mPrev(nsnull)
+,  mNext(nsnull)
 #if DEBUG
 ,  mSignature(eGoodTimerSignature)
 #endif
@@ -185,7 +191,6 @@ nsresult TimerImpl::Init(nsITimerCallback *aCallback,
 void TimerImpl::Cancel()
 //----------------------------------------------------------------------------------------
 {
-
  TimerPeriodical::GetPeriodical()->RemoveTimer(this);
 }

@@ -251,26 +256,70 @@ TimerPeriodical * TimerPeriodical::GetPeriodical()

 TimerPeriodical::TimerPeriodical()
 {
+  mTimers = nsnull;
 }

 TimerPeriodical::~TimerPeriodical()
 {
-  PR_ASSERT(mTimers.size() == 0);
+  PR_ASSERT(mTimers == 0);
 }

 nsresult TimerPeriodical::AddTimer( TimerImpl * aTimer)
 {
  // make sure it's not already there
-  mTimers.remove(aTimer);
-  mTimers.push_back(aTimer);
+  RemoveTimer(aTimer);
+  // keep list sorted by fire time
+  if (mTimers)
+  {
+    if (aTimer->GetFireTime() < mTimers->GetFireTime())
+    {
+      mTimers->mPrev = aTimer;
+      aTimer->mNext = mTimers;
+      mTimers = aTimer;
+    }
+    else
+    {
+      TimerImpl *t = mTimers;
+      TimerImpl *prevt;
+      // we know we will enter the while loop at least the first
+      // time, and thus prevt will be initialized
+      while (t && (t->GetFireTime() <= aTimer->GetFireTime()))
+      {
+        prevt = t;
+        t = t->mNext;
+      }
+      aTimer->mPrev = prevt;
+      aTimer->mNext = prevt->mNext;
+      prevt->mNext = aTimer;
+      if (aTimer->mNext) aTimer->mNext->mPrev = aTimer;
+    }
+  }
+  else mTimers = aTimer;
+  
  StartRepeating();
  return NS_OK;
 }

 nsresult TimerPeriodical::RemoveTimer( TimerImpl * aTimer)
 {
-  mTimers.remove(aTimer);
-  if ( mTimers.size() == 0 )
+  TimerImpl* t = mTimers;
+  TimerImpl* next_t = nsnull;
+  if (t) next_t = t->mNext;
+  while (t)
+  {
+    if (t == aTimer)
+    {
+      if (mTimers == t) mTimers = t->mNext;
+      if (t->mPrev) t->mPrev->mNext = t->mNext;
+      if (t->mNext) t->mNext->mPrev = t->mPrev;
+      t->mNext = nsnull;
+      t->mPrev = nsnull;
+    }
+    t = next_t;
+    if (t) next_t = t->mNext;
+  }
+ 
+  if ( mTimers == nsnull )
    StopRepeating();
  return NS_OK;
 }
@@ -280,33 +329,23 @@ nsresult TimerPeriodical::RemoveTimer( TimerImpl * aTimer)
 // fires off the appropriate ones
 void  TimerPeriodical::RepeatAction( const EventRecord &inMacEvent)
 {
-  list<TimerImpl*>::iterator iter = mTimers.begin();
-  list<TimerImpl*> fireList;
-  
-  while (iter != mTimers.end())
+  PRBool done = false;  
+  while (!done)
  {
-    TimerImpl* timer = *iter;
-    
-    NS_ASSERTION(timer->IsGoodTimer(), "Bad timer!");
-    
-    if (timer->GetFireTime() <= inMacEvent.when)
+    TimerImpl* t = mTimers;
+    while (t)
    {
-      mTimers.erase(iter++);
-      NS_ADDREF(timer);
-      fireList.push_back(timer);
-    }
-    else
+      NS_ASSERTION(t->IsGoodTimer(), "Bad timer!");
+    
+      if (t->GetFireTime() <= inMacEvent.when)
      {
-        iter++;
+        RemoveTimer(t);
+        t->Fire();
+        break;
      }
-  }
-  if ( mTimers.size() == 0 )
-     StopRepeating();
-     
-  for (iter=fireList.begin(); iter!=fireList.end(); iter++)
-  {
-    (*iter)->Fire();
-    NS_RELEASE(*iter);
+      t = t->mNext;
+    }
+    done = true;
  }
 }

--- a/mozilla/base/src/makefile.win
+++ b/mozilla/base/src/makefile.win
@@ -40,6 +40,8 @@ CPPSRCS =				\
 	nsVoidArray.cpp			\
 	nsFileSpec.cpp \
 	nsFileStream.cpp \
+	nsEscape.cpp				\
+    nsIFileStream.cpp \
 	$(NULL)

 CPP_OBJS =					\
@@ -59,6 +61,8 @@ CPP_OBJS =					\
 	.\$(OBJDIR)\nsVoidArray.obj		\
 	.\$(OBJDIR)\nsFileSpec.obj \
 	.\$(OBJDIR)\nsFileStream.obj \
+	.\$(OBJDIR)\nsEscape.obj			\
+    .\$(OBJDIR)\nsIFileStream.obj       \
 	$(NULL)

 EXPORTS=nscore.h nsIArena.h nsIAtom.h nsIByteBuffer.h \
@@ -71,16 +75,16 @@ EXPORTS=nscore.h nsIArena.h nsIAtom.h nsIByteBuffer.h \

 MODULE=raptor 

-REQUIRES=xpcom netlib raptor 
+REQUIRES=xpcom netlib raptor uconv

 LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\netlib \
-    -I$(PUBLIC)\raptor
+    -I$(PUBLIC)\raptor -I$(PUBLIC)\uconv -I$(PUBLIC)\unicharutil

 MAKE_OBJ_TYPE = DLL
 DLLNAME = raptorbase
 DLL=.\$(OBJDIR)\$(DLLNAME).dll

-OBJS = $(OBJS) .\$(OBJDIR)\nsTimer.obj
+OBJS = $(OBJS) .\$(OBJDIR)\nsTimer.obj .\$(OBJDIR)\nsCaretProperties.obj

 LCFLAGS = \
        $(LCFLAGS) \
--- a/mozilla/base/src/motif/Makefile.in
+++ b/mozilla/base/src/motif/Makefile.in
@@ -30,7 +30,10 @@ REQUIRES	= xpcom raptor

 DEFINES		+= -D_IMPL_NS_WIDGET 

-CPPSRCS		= nsTimer.cpp
+CPPSRCS		= 									\
+		nsTimer.cpp								\
+		nsCaretProperties.cpp			\
+    $(NULL)

 include $(topsrcdir)/config/rules.mk

--- a/mozilla/base/src/motif/nsCaretProperties.cpp
+++ b/mozilla/base/src/motif/nsCaretProperties.cpp
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 *
 * The contents of this file are subject to the Netscape Public License
 * Version 1.0 (the "NPL"); you may not use this file except in
@@ -16,22 +16,24 @@
 * Reserved.
 */

-// ===========================================================================
-//	UFontSwitcher.h
-// ===========================================================================
-//
-//	Authror: Frank Tang ftang@netscape.com
-#include "UFontSwitcher.h"

-void UFontSwitcher::TextFontSymbol()
+#include "nscore.h"
+
+#include "nsCaretProperties.h"
+
+
+
+//-----------------------------------------------------------------------------
+nsCaretProperties::nsCaretProperties()
+:	mCaretWidth(eDefaultCaretWidth)
+,	mBlinkRate(eDefaulBlinkRate)
 {
-	short family;
-	::GetFNum("\pSymbol", &family);
-	::TextFont(family);
+	// in your platform-specific class, get data from the OS in your constructor
 }
-void UFontSwitcher::TextFontDingbats()
+
+
+//-----------------------------------------------------------------------------
+nsCaretProperties* NewCaretProperties()
 {
-	short family;
-	::GetFNum("\pZapf Dingbats", &family);
-	::TextFont(family);	
+	return new nsCaretProperties();
 }
--- a/mozilla/base/src/nsAtomTable.cpp
+++ b/mozilla/base/src/nsAtomTable.cpp
@@ -130,7 +130,7 @@ NS_BASE nsIAtom* NS_NewAtom(const PRUnichar* us)
                                     (PLHashComparator) nsnull,
                                     nsnull, nsnull);
  }
-  PRInt32 uslen;
+  PRUint32 uslen;
  PRUint32 hashCode = nsCRT::HashValue(us, &uslen);
  PLHashEntry** hep = PL_HashTableRawLookup(gAtomHashTable, hashCode, us);
  PLHashEntry* he = *hep;
--- a/mozilla/base/src/nsBaseDLL.cpp
+++ b/mozilla/base/src/nsBaseDLL.cpp
@@ -22,17 +22,17 @@
 #include "nsProperties.h"
 #include "nsRepository.h"

-extern "C" PRInt32 gLockCount = 0;
+PRInt32 gLockCount = 0;

 NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);

 extern "C" NS_EXPORT nsresult
-NSRegisterSelf(const char* path)
+NSRegisterSelf(nsISupports* aServMgr, const char* path)
 {
  nsresult ret;

-  ret = nsRepository::RegisterFactory(kPropertiesCID, path, PR_TRUE,
-    PR_TRUE);
+  ret = nsRepository::RegisterComponent(kPropertiesCID, NULL, NULL,
+    path, PR_TRUE, PR_TRUE);
  if (NS_FAILED(ret)) {
    return ret;
  }
@@ -41,7 +41,7 @@ NSRegisterSelf(const char* path)
 }

 extern "C" NS_EXPORT nsresult
-NSUnregisterSelf(const char* path)
+NSUnregisterSelf(nsISupports* aServMgr, const char* path)
 {
  nsresult ret;

@@ -54,7 +54,11 @@ NSUnregisterSelf(const char* path)
 }

 extern "C" NS_EXPORT nsresult
-NSGetFactory(const nsCID& aClass, nsISupports* aServMgr, nsIFactory** aFactory)
+NSGetFactory(nsISupports* aServMgr, 
+             const nsCID& aClass,
+             const char *aClassName,
+             const char *aProgID,
+             nsIFactory** aFactory)
 {
  nsresult  res;

@@ -78,3 +82,9 @@ NSGetFactory(const nsCID& aClass, nsISupports* aServMgr, nsIFactory** aFactory)

  return NS_NOINTERFACE;
 }
+
+extern "C" NS_EXPORT PRBool
+NSCanUnload(nsISupports* serviceMgr)
+{
+  return PR_FALSE;      // XXX can we unload this?
+}
--- a/mozilla/base/src/nsBaseDLL.h
+++ b/mozilla/base/src/nsBaseDLL.h
@@ -21,6 +21,6 @@

 #include "prtypes.h"

-extern "C" PRInt32 gLockCount;
+extern PRInt32 gLockCount;

 #endif /* nsBaseDLL_h___ */
--- a/mozilla/base/src/nsCRT.cpp
+++ b/mozilla/base/src/nsCRT.cpp
@@ -33,6 +33,10 @@


 #include "nsCRT.h"
+#include "nsUnicharUtilCIID.h"
+#include "nsIServiceManager.h"
+#include "nsICaseConversion.h"
+

 // XXX Bug: These tables don't lowercase the upper 128 characters properly

@@ -109,21 +113,77 @@ static const PRUnichar kIsoLatin1ToUCS2[256] = {
 //----------------------------------------------------------------------

 #define TOLOWER(_ucs2) \
-  (((_ucs2) < 256) ? PRUnichar(kUpper2Lower[_ucs2]) : _ToLower(_ucs2))
+  (((_ucs2) < 128) ? PRUnichar(kUpper2Lower[_ucs2]) : _ToLower(_ucs2))

 #define TOUPPER(_ucs2) \
-  (((_ucs2) < 256) ? PRUnichar(kLower2Upper[_ucs2]) : _ToUpper(_ucs2))
+  (((_ucs2) < 128) ? PRUnichar(kLower2Upper[_ucs2]) : _ToUpper(_ucs2))
+
+class HandleCaseConversionShutdown : public nsIShutdownListener {
+public :
+   NS_IMETHOD OnShutdown(const nsCID& cid, nsISupports* service);
+   HandleCaseConversionShutdown(void) { NS_INIT_REFCNT(); }
+   virtual ~HandleCaseConversionShutdown(void) {}
+   NS_DECL_ISUPPORTS
+};
+static NS_DEFINE_CID(kUnicharUtilCID, NS_UNICHARUTIL_CID);
+static NS_DEFINE_IID(kICaseConversionIID, NS_ICASECONVERSION_IID);
+
+static nsICaseConversion * gCaseConv = NULL; 
+
+static NS_DEFINE_IID(kIShutdownListenerIID, NS_ISHUTDOWNLISTENER_IID);
+NS_IMPL_ISUPPORTS(HandleCaseConversionShutdown, kIShutdownListenerIID);
+
+nsresult
+HandleCaseConversionShutdown::OnShutdown(const nsCID& cid, nsISupports* service)
+{
+    if (cid.Equals(kUnicharUtilCID)) {
+        NS_ASSERTION(service == gCaseConv, "wrong service!");
+        nsrefcnt cnt = gCaseConv->Release();
+        gCaseConv = NULL;
+    }
+    return NS_OK;
+}
+
+static HandleCaseConversionShutdown* gListener = NULL;
+
+static void StartUpCaseConversion()
+{
+    nsresult err;
+
+    if ( NULL == gListener )
+    {
+      gListener = new HandleCaseConversionShutdown();
+      gListener->AddRef();
+    }
+    err = nsServiceManager::GetService(kUnicharUtilCID, kICaseConversionIID,
+                                        (nsISupports**) &gCaseConv, gListener);
+}
+static void CheckCaseConversion()
+{
+    if(NULL == gCaseConv )
+      StartUpCaseConversion();
+
+    NS_ASSERTION( gCaseConv != NULL , "cannot obtain UnicharUtil");
+   
+}

 static PRUnichar _ToLower(PRUnichar aChar)
 {
-  // XXX need i18n code here
-  return aChar;
+  PRUnichar oLower;
+  CheckCaseConversion();
+  nsresult err = gCaseConv->ToLower(aChar, &oLower);
+  NS_ASSERTION( NS_SUCCEEDED(err),  "failed to communicate to UnicharUtil");
+  return ( NS_SUCCEEDED(err) ) ? oLower : aChar ;
 }

 static PRUnichar _ToUpper(PRUnichar aChar)
 {
-  // XXX need i18n code here
-  return aChar;
+  nsresult err;
+  PRUnichar oUpper;
+  CheckCaseConversion();
+  err = gCaseConv->ToUpper(aChar, &oUpper);
+  NS_ASSERTION( NS_SUCCEEDED(err),  "failed to communicate to UnicharUtil");
+  return ( NS_SUCCEEDED(err) ) ? oUpper : aChar ;
 }

 //----------------------------------------------------------------------
@@ -138,9 +198,53 @@ PRUnichar nsCRT::ToLower(PRUnichar aChar)
  return TOLOWER(aChar);
 }

-PRInt32 nsCRT::strlen(const PRUnichar* s)
+////////////////////////////////////////////////////////////////////////////////
+// My lovely strtok routine
+
+#define IS_DELIM(m, c)          ((m)[(c) >> 3] & (1 << ((c) & 7)))
+#define SET_DELIM(m, c)         ((m)[(c) >> 3] |= (1 << ((c) & 7)))
+#define DELIM_TABLE_SIZE        32
+
+char* nsCRT::strtok(char* str, const char* delims, char* *newStr)
 {
-  PRInt32 len = 0;
+  NS_ASSERTION(str, "Unlike regular strtok, the first argument cannot be null.");
+
+  char delimTable[DELIM_TABLE_SIZE];
+  PRUint32 i;
+  char* result;
+
+  for (i = 0; i < DELIM_TABLE_SIZE; i++)
+    delimTable[i] = '\0';
+
+  for (i = 0; i < DELIM_TABLE_SIZE && delims[i]; i++) {
+    SET_DELIM(delimTable, delims[i]);
+  }
+  NS_ASSERTION(delims[i] == '\0', "too many delimiters");
+
+  // skip to beginning
+  while (*str && IS_DELIM(delimTable, *str)) {
+    str++;
+  }
+  result = str;
+
+  // fix up the end of the token
+  while (*str) {
+    if (IS_DELIM(delimTable, *str)) {
+      *str++ = '\0';
+      break;
+    }
+    str++;
+  }
+  *newStr = str;
+
+  return str == result ? NULL : result;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+PRUint32 nsCRT::strlen(const PRUnichar* s)
+{
+  PRUint32 len = 0;
  if(s) {
    while (*s++ != 0) {
      len++;
@@ -180,11 +284,11 @@ PRInt32 nsCRT::strcmp(const PRUnichar* s1, const PRUnichar* s2)
 * @param   s1 and s2 both point to unichar strings
 * @return  0 if they match, -1 if s1<s2; 1 if s1>s2
 */
-PRInt32 nsCRT::strncmp(const PRUnichar* s1, const PRUnichar* s2, PRInt32 n)
+PRInt32 nsCRT::strncmp(const PRUnichar* s1, const PRUnichar* s2, PRUint32 n)
 {
  if(s1 && s2) { 
-    if(0<n) {
-      while (--n >= 0) {
+    if(n != 0) {
+      do {
        PRUnichar c1 = *s1++;
        PRUnichar c2 = *s2++;
        if (c1 != c2) {
@@ -192,7 +296,7 @@ PRInt32 nsCRT::strncmp(const PRUnichar* s1, const PRUnichar* s2, PRInt32 n)
          return 1;
        }
        if ((0==c1) || (0==c2)) break;
-      }
+      } while (--n != 0);
    }
  }
  return 0;
@@ -234,7 +338,7 @@ PRInt32 nsCRT::strcasecmp(const PRUnichar* s1, const PRUnichar* s2)
 * @param   s1 and s2 both point to unichar strings
 * @return  0 if they match, -1 if s1<s2; 1 if s1>s2
 */
-PRInt32 nsCRT::strncasecmp(const PRUnichar* s1, const PRUnichar* s2, PRInt32 n)
+PRInt32 nsCRT::strncasecmp(const PRUnichar* s1, const PRUnichar* s2, PRUint32 n)
 {
  if(s1 && s2) {
    if(0<n){
@@ -290,11 +394,11 @@ PRInt32 nsCRT::strcmp(const PRUnichar* s1, const char* s2)
 * @param   s2 points to cstring
 * @return  0 if they match, -1 if s1<s2; 1 if s1>s2
 */
-PRInt32 nsCRT::strncmp(const PRUnichar* s1, const char* s2, PRInt32 n)
+PRInt32 nsCRT::strncmp(const PRUnichar* s1, const char* s2, PRUint32 n)
 {
  if(s1 && s2) {
-    if(0<n){
-      while (--n >= 0) {
+    if(n != 0){
+      do {
        PRUnichar c1 = *s1++;
        PRUnichar c2 = kIsoLatin1ToUCS2[*(const unsigned char*)s2++];
        if (c1 != c2) {
@@ -302,7 +406,7 @@ PRInt32 nsCRT::strncmp(const PRUnichar* s1, const char* s2, PRInt32 n)
          return 1;
        }
        if ((0==c1) || (0==c2)) break;
-      }
+      } while (--n != 0);
    }
  }
  return 0;
@@ -344,11 +448,11 @@ PRInt32 nsCRT::strcasecmp(const PRUnichar* s1, const char* s2)
 * @param   s2 points to cstring
 * @return  0 if they match, -1 if s1<s2; 1 if s1>s2
 */
-PRInt32 nsCRT::strncasecmp(const PRUnichar* s1, const char* s2, PRInt32 n)
+PRInt32 nsCRT::strncasecmp(const PRUnichar* s1, const char* s2, PRUint32 n)
 {
  if(s1 && s2){
-    if(0<n){
-      while (--n >= 0) {
+    if(n != 0){
+      do {
        PRUnichar c1 = *s1++;
        PRUnichar c2 = kIsoLatin1ToUCS2[*(const unsigned char*)s2++];
        if (c1 != c2) {
@@ -360,7 +464,7 @@ PRInt32 nsCRT::strncasecmp(const PRUnichar* s1, const char* s2, PRInt32 n)
          }
        }
        if (c1 == 0) break;
-      }
+      } while (--n != 0);
    }
  }
  return 0;
@@ -368,7 +472,7 @@ PRInt32 nsCRT::strncasecmp(const PRUnichar* s1, const char* s2, PRInt32 n)

 PRUnichar* nsCRT::strdup(const PRUnichar* str)
 {
-  PRInt32 len = nsCRT::strlen(str) + 1; // add one for null
+  PRUint32 len = nsCRT::strlen(str) + 1; // add one for null
  PRUnichar* rslt = new PRUnichar[len];
  if (rslt == NULL) return NULL;
  nsCRT::memcpy(rslt, str, len * sizeof(PRUnichar));
@@ -388,10 +492,10 @@ PRUint32 nsCRT::HashValue(const PRUnichar* us)
  return rv;
 }

-PRUint32 nsCRT::HashValue(const PRUnichar* us, PRInt32* uslenp)
+PRUint32 nsCRT::HashValue(const PRUnichar* us, PRUint32* uslenp)
 {
  PRUint32 rv = 0;
-  PRInt32 len = 0;
+  PRUint32 len = 0;
  PRUnichar ch;
  while ((ch = *us++) != 0) {
    // FYI: rv = rv*37 + ch
--- a/mozilla/base/src/nsCRT.h
+++ b/mozilla/base/src/nsCRT.h
@@ -23,28 +23,69 @@
 #include "plstr.h"
 #include "nscore.h"

+#define CR '\015'
+#define LF '\012'
+#define VTAB '\013'
+#define FF '\014'
+#define TAB '\011'
+#define CRLF "\015\012"     /* A CR LF equivalent string */
+
+
+// This macro can be used in a class declaration for classes that want
+// to ensure that their instance memory is zeroed.
+#define NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW \
+  void* operator new(size_t sz) {             \
+    void* rv = ::operator new(sz);            \
+    if (rv) {                                 \
+      nsCRT::zero(rv, sz);                    \
+    }                                         \
+    return rv;                                \
+  }                                           \
+  void operator delete(void* ptr) {           \
+    ::operator delete(ptr);                   \
+  }
+
+// This macro works with the next macro to declare a non-inlined
+// version of the above.
+#define NS_DECL_ZEROING_OPERATOR_NEW \
+  void* operator new(size_t sz);     \
+  void operator delete(void* ptr);
+
+#define NS_IMPL_ZEROING_OPERATOR_NEW(_class) \
+  void* _class::operator new(size_t sz) {    \
+    void* rv = ::operator new(sz);           \
+    if (rv) {                                \
+      nsCRT::zero(rv, sz);                   \
+    }                                        \
+    return rv;                               \
+  }                                          \
+  void _class::operator delete(void* ptr) {  \
+    ::operator delete(ptr);                  \
+  }
+
 /// This is a wrapper class around all the C runtime functions. 

 class NS_BASE nsCRT {
 public:
+
  /** Copy bytes from aSrc to aDest.
    @param aDest the destination address
    @param aSrc the source address
    @param aCount the number of bytes to copy
    */
-  static void memcpy(void* aDest, const void* aSrc, PRInt32 aCount) {
+  static void memcpy(void* aDest, const void* aSrc, PRUint32 aCount) {
    ::memcpy(aDest, aSrc, (size_t)aCount);
  }

-  static void memmove(void* aDest, const void* aSrc, PRInt32 aCount) {
+  static void memmove(void* aDest, const void* aSrc, PRUint32 aCount) {
    ::memmove(aDest, aSrc, (size_t)aCount);
  }

-  static void memset(void* aDest, PRUint8 aByte, PRInt32 aCount) {
+  static void memset(void* aDest, PRUint8 aByte, PRUint32 aCount) {
    ::memset(aDest, aByte, aCount);
  }

-  static void zero(void* aDest, PRInt32 aCount) {
+  static void zero(void* aDest, PRUint32 aCount) {
    ::memset(aDest, 0, (size_t)aCount);
  }

@@ -52,13 +93,18 @@ public:
   @param s the string in question
   @return the length of s
   */
-  static PRInt32 strlen(const char* s) {
-    return PRInt32(::strlen(s));
+  static PRUint32 strlen(const char* s) {
+    return PRUint32(::strlen(s));
  }

  /// Compare s1 and s2.
  static PRInt32 strcmp(const char* s1, const char* s2) {
-    return PRInt32(PL_strcmp(s1, s2));
+    return PRUint32(PL_strcmp(s1, s2));
+  }
+
+  static PRUint32 strncmp(const char* s1, const char* s2,
+                         PRUint32 aMaxLen) {
+    return PRInt32(PL_strncmp(s1, s2, aMaxLen));
  }

  /// Case-insensitive string comparison.
@@ -67,40 +113,63 @@ public:
  }

  /// Case-insensitive string comparison with length
-  static PRInt32 strncasecmp(const char* s1, const char* s2, PRInt32 aMaxLen) {
+  static PRInt32 strncasecmp(const char* s1, const char* s2, PRUint32 aMaxLen) {
    return PRInt32(PL_strncasecmp(s1, s2, aMaxLen));
  }

+  static PRInt32 strncmp(const char* s1, const char* s2, PRInt32 aMaxLen) {
+    return PRInt32(PL_strncmp(s1,s2,aMaxLen));
+  }
+  
  static char* strdup(const char* str) {
    return PL_strdup(str);
  }

+  /**
+    How to use this fancy (thread-safe) version of strtok: 
+
+    void main( void ) {
+      printf( "%s\n\nTokens:\n", string );
+      // Establish string and get the first token:
+      char* newStr;
+      token = nsCRT::strtok( string, seps, &newStr );   
+      while( token != NULL ) {
+        // While there are tokens in "string"
+        printf( " %s\n", token );
+        // Get next token:
+        token = nsCRT::strtok( newStr, seps, &newStr );
+      }
+    }
+
+  */
+  static char* strtok(char* str, const char* delims, char* *newStr); 
+
  /// Like strlen except for ucs2 strings
-  static PRInt32 strlen(const PRUnichar* s);
+  static PRUint32 strlen(const PRUnichar* s);

  /// Like strcmp except for ucs2 strings
  static PRInt32 strcmp(const PRUnichar* s1, const PRUnichar* s2);
  /// Like strcmp except for ucs2 strings
  static PRInt32 strncmp(const PRUnichar* s1, const PRUnichar* s2,
-                         PRInt32 aMaxLen);
+                         PRUint32 aMaxLen);

  /// Like strcasecmp except for ucs2 strings
  static PRInt32 strcasecmp(const PRUnichar* s1, const PRUnichar* s2);
  /// Like strncasecmp except for ucs2 strings
  static PRInt32 strncasecmp(const PRUnichar* s1, const PRUnichar* s2,
-                             PRInt32 aMaxLen);
+                             PRUint32 aMaxLen);

  /// Like strcmp with a char* and a ucs2 string
  static PRInt32 strcmp(const PRUnichar* s1, const char* s2);
  /// Like strncmp with a char* and a ucs2 string
  static PRInt32 strncmp(const PRUnichar* s1, const char* s2,
-                         PRInt32 aMaxLen);
+                         PRUint32 aMaxLen);

  /// Like strcasecmp with a char* and a ucs2 string
  static PRInt32 strcasecmp(const PRUnichar* s1, const char* s2);
  /// Like strncasecmp with a char* and a ucs2 string
  static PRInt32 strncasecmp(const PRUnichar* s1, const char* s2,
-                             PRInt32 aMaxLen);
+                             PRUint32 aMaxLen);

  // Note: uses new[] to allocate memory, so you must use delete[] to
  // free the memory
@@ -110,7 +179,7 @@ public:
  static PRUint32 HashValue(const PRUnichar* s1);

  /// Same as above except that we return the length in s1len
-  static PRUint32 HashValue(const PRUnichar* s1, PRInt32* s1len);
+  static PRUint32 HashValue(const PRUnichar* s1, PRUint32* s1len);

  /// String to integer.
  static PRInt32 atoi( const PRUnichar *string );
--- a/mozilla/base/src/nsDeque.cpp
+++ b/mozilla/base/src/nsDeque.cpp
@@ -28,8 +28,8 @@
 * @update	gess4/18/98
 * @return  new deque
 */
-nsDeque::nsDeque(nsDequeFunctor& aMemDestroyer) : mMemDestroyer(aMemDestroyer) {
-  mMemDestroyer=aMemDestroyer;
+nsDeque::nsDeque(nsDequeFunctor* aDeallocator) {
+  mDeallocator=aDeallocator;
  mCapacity=eGrowthDelta;
  mOrigin=mSize=0;
  mData=new void*[mCapacity];
@@ -44,6 +44,10 @@ nsDeque::~nsDeque() {
  Erase();
  delete [] mData;
  mData=0;
+  if(mDeallocator) {
+    delete mDeallocator;
+  }
+  mDeallocator=0;
 }


@@ -59,6 +63,13 @@ PRInt32 nsDeque::GetSize(void) const {
  return mSize;
 }

+void nsDeque::SetDeallocator(nsDequeFunctor* aDeallocator){
+  if(mDeallocator) {
+    delete mDeallocator;
+  }
+  mDeallocator=aDeallocator;
+}
+
 /**
 * Remove all items from container without destroying them.
 *
@@ -67,7 +78,9 @@ PRInt32 nsDeque::GetSize(void) const {
 * @return
 */
 nsDeque& nsDeque::Empty() {
-  nsCRT::zero(mData,mCapacity*sizeof(mData));
+  if((0<mCapacity) && (mData)) {
+    nsCRT::zero(mData,mCapacity*sizeof(mData));
+  }
  mSize=0;
  mOrigin=0;
  return *this;
@@ -80,7 +93,9 @@ nsDeque& nsDeque::Empty() {
 * @return  this
 */
 nsDeque& nsDeque::Erase() {
-  ForEach(mMemDestroyer);
+  if(mDeallocator) {
+    ForEach(*mDeallocator);
+  }
  return Empty();
 }

--- a/mozilla/base/src/nsDeque.h
+++ b/mozilla/base/src/nsDeque.h
@@ -71,7 +71,7 @@ public:
 class NS_BASE nsDeque {
 friend class nsDequeIterator;
  public:
-                       nsDeque(nsDequeFunctor& aMemDestroyer);
+                       nsDeque(nsDequeFunctor* aDeallocator);
                      ~nsDeque();
            
  /**
@@ -201,6 +201,8 @@ friend class nsDequeIterator;
   */
  const void* FirstThat(nsDequeFunctor& aFunctor) const;

+  void SetDeallocator(nsDequeFunctor* aDeallocator);
+
  /**
   * Perform automated selftest on the deque
   *
@@ -215,7 +217,7 @@ protected:
  PRInt32         mSize;
  PRInt32         mCapacity;
  PRInt32         mOrigin;
-  nsDequeFunctor& mMemDestroyer;
+  nsDequeFunctor* mDeallocator;
  void**          mData;


--- a/mozilla/base/src/nsEscape.cpp
+++ b/mozilla/base/src/nsEscape.cpp
@@ -53,7 +53,7 @@ const int netCharType[256] =
 #define HEX_ESCAPE '%'

 //----------------------------------------------------------------------------------------
-char* nsEscape(const char * str, nsEscapeMask mask)
+NS_BASE char* nsEscape(const char * str, nsEscapeMask mask)
 //----------------------------------------------------------------------------------------
 {
    if(!str)
@@ -62,7 +62,7 @@ char* nsEscape(const char * str, nsEscapeMask mask)
 }

 //----------------------------------------------------------------------------------------
-char* nsEscapeCount(const char * str, PRInt32 len, nsEscapeMask mask, PRInt32 * out_len)
+NS_BASE char* nsEscapeCount(const char * str, PRInt32 len, nsEscapeMask mask, PRInt32 * out_len)
 //----------------------------------------------------------------------------------------
 {
    int32       i, extra = 0;
@@ -109,7 +109,7 @@ char* nsEscapeCount(const char * str, PRInt32 len, nsEscapeMask mask, PRInt32 *
 }

 //----------------------------------------------------------------------------------------
-char* nsUnescape(char * str)
+NS_BASE char* nsUnescape(char * str)
 //----------------------------------------------------------------------------------------
 {
 	nsUnescapeCount(str);
@@ -117,7 +117,7 @@ char* nsUnescape(char * str)
 }

 //----------------------------------------------------------------------------------------
-PRInt32 nsUnescapeCount(char * str)
+NS_BASE PRInt32 nsUnescapeCount(char * str)
 //----------------------------------------------------------------------------------------
 {
    register char *src = str;
--- a/mozilla/base/src/nsFileSpec.cpp
+++ b/mozilla/base/src/nsFileSpec.cpp
@@ -22,6 +22,9 @@
 #include "nsDebug.h"

 #include "prtypes.h"
+#include "plstr.h"
+#include "plbase64.h"
+#include "prmem.h"

 #include <string.h>
 #include <stdio.h>
@@ -40,7 +43,7 @@ NS_NAMESPACE nsFileSpecHelpers
        char inSeparator,
        const char* inLeafName);
 #ifndef XP_MAC
-    NS_NAMESPACE_PROTOTYPE void Canonify(char*& ioPath, bool inMakeDirs);
+    NS_NAMESPACE_PROTOTYPE void Canonify(char*& ioPath, PRBool inMakeDirs);
    NS_NAMESPACE_PROTOTYPE void MakeAllDirectories(const char* inPath, int mode);
 #endif
    NS_NAMESPACE_PROTOTYPE char* GetLeaf(const char* inPath, char inSeparator); // allocated
@@ -54,6 +57,14 @@ NS_NAMESPACE nsFileSpecHelpers
 #endif
 } NS_NAMESPACE_END

+//----------------------------------------------------------------------------------------
+nsresult ns_file_convert_result(PRInt32 nativeErr)
+//----------------------------------------------------------------------------------------
+{
+    return nativeErr ?
+        NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_FILES,((nativeErr)&0xFFFF))
+        : NS_OK;
+}

 //----------------------------------------------------------------------------------------
 char* nsFileSpecHelpers::StringDup(
@@ -65,7 +76,7 @@ char* nsFileSpecHelpers::StringDup(
        allocLength = strlen(inString);
    char* newPath = inString || allocLength ? new char[allocLength + 1] : nsnull;
    if (!newPath)
-        return NULL;
+        return nsnull;
    strcpy(newPath, inString);
    return newPath;
 } // nsFileSpecHelpers::StringDup
@@ -77,7 +88,7 @@ char* nsFileSpecHelpers::AllocCat(
 //----------------------------------------------------------------------------------------
 {
    if (!inString1)
-        return inString2 ? StringDup(inString2) : (char*)NULL;
+        return inString2 ? StringDup(inString2) : (char*)nsnull;
    if (!inString2)
        return StringDup(inString1);
    char* outString = StringDup(inString1, strlen(inString1) + strlen(inString2));
@@ -95,7 +106,7 @@ char* nsFileSpecHelpers::StringAssign(
    if (!inString2)
    {
        delete [] ioString;
-        ioString = (char*)NULL;
+        ioString = (char*)nsnull;
        return ioString;
    }
    if (!ioString || (strlen(inString2) > strlen(ioString)))
@@ -125,8 +136,19 @@ void nsFileSpecHelpers::LeafReplace(
    }
    char* lastSeparator = strrchr(ioPath, inSeparator);
    int oldLength = strlen(ioPath);
-    *(++lastSeparator) = '\0'; // strip the current leaf name
-    int newLength = lastSeparator - ioPath + strlen(inLeafName);
+    PRBool trailingSeparator = (lastSeparator + 1 == ioPath + oldLength);
+    if (trailingSeparator)
+    {
+        *lastSeparator = '\0';
+        lastSeparator = strrchr(ioPath, inSeparator);
+    }
+    if (lastSeparator)
+        lastSeparator++; // point at the trailing string
+    else
+        lastSeparator = ioPath; // the full monty
+    *lastSeparator = '\0'; // strip the current leaf name
+
+    int newLength = (lastSeparator - ioPath) + strlen(inLeafName) + int(trailingSeparator);
    if (newLength > oldLength)
    {
        char* newPath = StringDup(ioPath, newLength + 1);
@@ -134,7 +156,14 @@ void nsFileSpecHelpers::LeafReplace(
        ioPath = newPath;
    }
    strcat(ioPath, inLeafName);
-} // nsNativeFileSpec::LeafReplace
+    if (trailingSeparator)
+    {
+        // If the original ended in a slash, then the new one should, too.
+        char sepStr[2] = "/";
+        *sepStr = inSeparator;
+        strcat(ioPath, sepStr);
+    }
+} // nsFileSpecHelpers::LeafReplace

 //----------------------------------------------------------------------------------------
 char* nsFileSpecHelpers::GetLeaf(const char* inPath, char inSeparator)
@@ -142,12 +171,32 @@ char* nsFileSpecHelpers::GetLeaf(const char* inPath, char inSeparator)
 //----------------------------------------------------------------------------------------
 {
    if (!inPath)
-        return NULL;
-    char* lastSeparator = strrchr(inPath, inSeparator);
-    if (lastSeparator)
-        return StringDup(++lastSeparator);
-    return StringDup(inPath);
-} // nsNativeFileSpec::GetLeaf
+        return nsnull;
+    const char* lastSeparator = strrchr(inPath, inSeparator);
+    
+    // If there was no separator, then return a copy of the caller's path.
+    if (!lastSeparator)
+        return StringDup(inPath);
+
+    // So there's at least one separator.  What's just after it?
+    // If the separator was not the last character, return the trailing string.
+    const char* leafPointer = lastSeparator + 1;
+    if (*leafPointer)
+        return StringDup(leafPointer);
+
+    // So now, separator was the last character. Poke in a null instead.
+    *(char*)lastSeparator = '\0'; // Should use const_cast, but Unix has old compiler.
+    leafPointer = strrchr(inPath, inSeparator);
+    char* result = leafPointer ? StringDup(leafPointer++) : StringDup(inPath);
+    // Restore the poked null before returning.
+    *(char*)lastSeparator = inSeparator;
+#ifdef XP_PC
+	// If it's a drive letter use the colon notation.
+	if (!leafPointer && strlen(result) == 2 && result[1] == '|')
+	    result[1] = ':';
+#endif
+    return result;
+} // nsFileSpecHelpers::GetLeaf

 #if defined(XP_UNIX) || defined(XP_PC)

@@ -177,7 +226,7 @@ void nsFileSpecHelpers::MakeAllDirectories(const char* inPath, int mode)
    if (currentEnd)
    {
 		*currentEnd = '\0';
-		nsNativeFileSpec spec(nsFilePath(pathCopy, false));
+		nsFileSpec spec(nsFilePath(pathCopy, PR_FALSE));
 		do
 		{
 			// If the node doesn't exist, and it is not the initial node in a full path,
@@ -209,7 +258,7 @@ char* nsFileSpecHelpers::ReallocCat(char*& ioString, const char* inString1)
    delete [] ioString;
    ioString = newString;
    return ioString;
-} // nsNativeFileSpec::ReallocCat
+} // nsFileSpecHelpers::ReallocCat

 #if defined(XP_PC)
 #include "windows/nsFileSpecWin.cpp" // Windows-specific implementations
@@ -225,7 +274,7 @@ char* nsFileSpecHelpers::ReallocCat(char*& ioString, const char* inString1)

 #ifndef XP_MAC
 //----------------------------------------------------------------------------------------
-nsFileURL::nsFileURL(const char* inString, bool inCreateDirs)
+nsFileURL::nsFileURL(const char* inString, PRBool inCreateDirs)
 //----------------------------------------------------------------------------------------
 :    mURL(nsnull)
 {
@@ -238,12 +287,29 @@ nsFileURL::nsFileURL(const char* inString, bool inCreateDirs)
 } // nsFileURL::nsFileURL
 #endif

+#ifndef XP_MAC
+//----------------------------------------------------------------------------------------
+nsFileURL::nsFileURL(const nsString& inString, PRBool inCreateDirs)
+//----------------------------------------------------------------------------------------
+:    mURL(nsnull)
+{
+    const nsAutoCString aString(inString);
+    const char* aCString = (const char*) aString;
+    if (!inString)
+    	return;
+    NS_ASSERTION(strstr(aCString, kFileURLPrefix) == aCString, "Not a URL!");
+    // Make canonical and absolute.
+	nsFilePath path(aCString + kFileURLPrefixLength, inCreateDirs);
+	*this = path;
+} // nsFileURL::nsFileURL
+#endif
+
 //----------------------------------------------------------------------------------------
 nsFileURL::nsFileURL(const nsFileURL& inOther)
 //----------------------------------------------------------------------------------------
 :    mURL(nsFileSpecHelpers::StringDup(inOther.mURL))
 #ifdef XP_MAC
-,    mNativeFileSpec(inOther.GetNativeSpec())
+,    mFileSpec(inOther.GetFileSpec())
 #endif
 {
 } // nsFileURL::nsFileURL
@@ -253,16 +319,16 @@ nsFileURL::nsFileURL(const nsFilePath& inOther)
 //----------------------------------------------------------------------------------------
 :    mURL(nsFileSpecHelpers::AllocCat(kFileURLPrefix, (const char*)inOther))
 #ifdef XP_MAC
-,    mNativeFileSpec(inOther.GetNativeSpec())
+,    mFileSpec(inOther.GetFileSpec())
 #endif
 {
 } // nsFileURL::nsFileURL

 //----------------------------------------------------------------------------------------
-nsFileURL::nsFileURL(const nsNativeFileSpec& inOther)
+nsFileURL::nsFileURL(const nsFileSpec& inOther)
 :    mURL(nsFileSpecHelpers::AllocCat(kFileURLPrefix, (const char*)nsFilePath(inOther)))
 #ifdef XP_MAC
-,    mNativeFileSpec(inOther)
+,    mFileSpec(inOther)
 #endif
 //----------------------------------------------------------------------------------------
 {
@@ -282,7 +348,7 @@ void nsFileURL::operator = (const char* inString)
    nsFileSpecHelpers::StringAssign(mURL, inString);
    NS_ASSERTION(strstr(inString, kFileURLPrefix) == inString, "Not a URL!");
 #ifdef XP_MAC
-    mNativeFileSpec = inString + kFileURLPrefixLength;
+    mFileSpec = inString + kFileURLPrefixLength;
 #endif
 } // nsFileURL::operator =

@@ -292,7 +358,7 @@ void nsFileURL::operator = (const nsFileURL& inOther)
 {
    mURL = nsFileSpecHelpers::StringAssign(mURL, inOther.mURL);
 #ifdef XP_MAC
-    mNativeFileSpec = inOther.GetNativeSpec();
+    mFileSpec = inOther.GetFileSpec();
 #endif
 } // nsFileURL::operator =

@@ -303,23 +369,24 @@ void nsFileURL::operator = (const nsFilePath& inOther)
    delete [] mURL;
    mURL = nsFileSpecHelpers::AllocCat(kFileURLPrefix, (const char*)inOther);
 #ifdef XP_MAC
-    mNativeFileSpec  = inOther.GetNativeSpec();
+    mFileSpec  = inOther.GetFileSpec();
 #endif
 } // nsFileURL::operator =

 //----------------------------------------------------------------------------------------
-void nsFileURL::operator = (const nsNativeFileSpec& inOther)
+void nsFileURL::operator = (const nsFileSpec& inOther)
 //----------------------------------------------------------------------------------------
 {
    delete [] mURL;
    mURL = nsFileSpecHelpers::AllocCat(kFileURLPrefix, (const char*)nsFilePath(inOther));
 #ifdef XP_MAC
-    mNativeFileSpec  = inOther;
+    mFileSpec  = inOther;
 #endif
 } // nsFileURL::operator =

+
 //----------------------------------------------------------------------------------------
-nsBasicOutStream& operator << (nsBasicOutStream& s, const nsFileURL& url)
+nsOutputStream& operator << (nsOutputStream& s, const nsFileURL& url)
 //----------------------------------------------------------------------------------------
 {
    return (s << url.mURL);
@@ -329,9 +396,17 @@ nsBasicOutStream& operator << (nsBasicOutStream& s, const nsFileURL& url)
 //                                nsFilePath implementation
 //========================================================================================

+nsFilePath::nsFilePath(const nsFilePath& inPath)
+    : mPath(nsFileSpecHelpers::StringDup(inPath.mPath))
+#ifdef XP_MAC
+    , mFileSpec(inPath.mFileSpec)
+#endif
+{
+}
+
 #ifndef XP_MAC
 //----------------------------------------------------------------------------------------
-nsFilePath::nsFilePath(const char* inString, bool inCreateDirs)
+nsFilePath::nsFilePath(const char* inString, PRBool inCreateDirs)
 //----------------------------------------------------------------------------------------
 :    mPath(nsFileSpecHelpers::StringDup(inString))
 {
@@ -349,19 +424,39 @@ nsFilePath::nsFilePath(const char* inString, bool inCreateDirs)
 }
 #endif

+#ifndef XP_MAC
+//----------------------------------------------------------------------------------------
+nsFilePath::nsFilePath(const nsString& inString, PRBool inCreateDirs)
+//----------------------------------------------------------------------------------------
+:    mPath(inString.ToNewCString())
+{
+    NS_ASSERTION(strstr(mPath, kFileURLPrefix) != mPath, "URL passed as path");
+
+#ifdef XP_PC
+    nsFileSpecHelpers::UnixToNative(mPath);
+#endif
+    // Make canonical and absolute.
+    nsFileSpecHelpers::Canonify(mPath, inCreateDirs);
+#ifdef XP_PC
+    NS_ASSERTION( mPath[1] == ':', "unexpected canonical path" );
+    nsFileSpecHelpers::NativeToUnix(mPath);
+#endif
+}
+#endif
+
 //----------------------------------------------------------------------------------------
 nsFilePath::nsFilePath(const nsFileURL& inOther)
 //----------------------------------------------------------------------------------------
 :    mPath(nsFileSpecHelpers::StringDup(inOther.mURL + kFileURLPrefixLength))
 #ifdef XP_MAC
-,    mNativeFileSpec(inOther.GetNativeSpec())
+,    mFileSpec(inOther.GetFileSpec())
 #endif
 {
 }

 #ifdef XP_UNIX
 //----------------------------------------------------------------------------------------
-nsFilePath::nsFilePath(const nsNativeFileSpec& inOther)
+nsFilePath::nsFilePath(const nsFileSpec& inOther)
 //----------------------------------------------------------------------------------------
 :    mPath(nsFileSpecHelpers::StringDup(inOther.mPath))
 {
@@ -377,7 +472,7 @@ nsFilePath::~nsFilePath()

 #ifdef XP_UNIX
 //----------------------------------------------------------------------------------------
-void nsFilePath::operator = (const nsNativeFileSpec& inOther)
+void nsFilePath::operator = (const nsFileSpec& inOther)
 //----------------------------------------------------------------------------------------
 {
    mPath = nsFileSpecHelpers::StringAssign(mPath, inOther.mPath);
@@ -390,14 +485,15 @@ void nsFilePath::operator = (const char* inString)
 {
    NS_ASSERTION(strstr(inString, kFileURLPrefix) != inString, "URL passed as path");
 #ifdef XP_MAC
-    mNativeFileSpec = inString;
-	nsFileSpecHelpers::StringAssign(mPath, (const char*)nsFilePath(mNativeFileSpec));
+    mFileSpec = inString;
+	nsFileSpecHelpers::StringAssign(mPath, (const char*)nsFilePath(mFileSpec));
 #else
+	nsFileSpecHelpers::StringAssign(mPath, inString);
 #ifdef XP_PC
 	nsFileSpecHelpers::UnixToNative(mPath);
 #endif
    // Make canonical and absolute.
-    nsFileSpecHelpers::Canonify(mPath, false /* XXX? */);
+    nsFileSpecHelpers::Canonify(mPath, PR_FALSE /* XXX? */);
 #ifdef XP_PC
 	nsFileSpecHelpers::NativeToUnix(mPath);
 #endif
@@ -410,45 +506,66 @@ void nsFilePath::operator = (const nsFileURL& inOther)
 {
    nsFileSpecHelpers::StringAssign(mPath, (const char*)nsFilePath(inOther));
 #ifdef XP_MAC
-    mNativeFileSpec = inOther.GetNativeSpec();
+    mFileSpec = inOther.GetFileSpec();
+#endif
+}
+
+//----------------------------------------------------------------------------------------
+void nsFilePath::operator = (const nsFilePath& inOther)
+//----------------------------------------------------------------------------------------
+{
+    nsFileSpecHelpers::StringAssign(mPath, inOther.mPath);
+#ifdef XP_MAC
+    mFileSpec = inOther.GetFileSpec();
 #endif
 }

 //========================================================================================
-//                                nsNativeFileSpec implementation
+//                                nsFileSpec implementation
 //========================================================================================

 #ifndef XP_MAC
 //----------------------------------------------------------------------------------------
-nsNativeFileSpec::nsNativeFileSpec()
+nsFileSpec::nsFileSpec()
 //----------------------------------------------------------------------------------------
-:    mPath(NULL)
+:    mPath(nsnull)
+,    mError(NS_OK)
 {
 }
 #endif

 //----------------------------------------------------------------------------------------
-nsNativeFileSpec::nsNativeFileSpec(const nsFileURL& inURL)
+nsFileSpec::nsFileSpec(const nsPersistentFileDescriptor& inDescriptor)
 //----------------------------------------------------------------------------------------
 #ifndef XP_MAC
-:    mPath(NULL)
+:    mPath(nsnull)
+#endif
+{
+	*this = inDescriptor;
+}
+
+//----------------------------------------------------------------------------------------
+nsFileSpec::nsFileSpec(const nsFileURL& inURL)
+//----------------------------------------------------------------------------------------
+#ifndef XP_MAC
+:    mPath(nsnull)
 #endif
 {
    *this = nsFilePath(inURL); // convert to unix path first
 }

 //----------------------------------------------------------------------------------------
-void nsNativeFileSpec::MakeUnique(const char* inSuggestedLeafName)
+void nsFileSpec::MakeUnique(const char* inSuggestedLeafName)
 //----------------------------------------------------------------------------------------
 {
    if (inSuggestedLeafName && *inSuggestedLeafName)
        SetLeafName(inSuggestedLeafName);

    MakeUnique();
-} // nsNativeFileSpec::MakeUnique
+} // nsFileSpec::MakeUnique

 //----------------------------------------------------------------------------------------
-void nsNativeFileSpec::MakeUnique()
+void nsFileSpec::MakeUnique()
 //----------------------------------------------------------------------------------------
 {
    if (!Exists())
@@ -467,7 +584,7 @@ void nsNativeFileSpec::MakeUnique()
    }
    const int kMaxRootLength
        = nsFileSpecHelpers::kMaxCoreLeafNameLength - strlen(suffix) - 1;
-    if (strlen(leafName) > kMaxRootLength)
+    if ((int)strlen(leafName) > (int)kMaxRootLength)
        leafName[kMaxRootLength] = '\0';
    for (short index = 1; index < 1000 && Exists(); index++)
    {
@@ -479,51 +596,94 @@ void nsNativeFileSpec::MakeUnique()
    if (*suffix)
        delete [] suffix;
    delete [] leafName;
-} // nsNativeFileSpec::MakeUnique
+} // nsFileSpec::MakeUnique

 //----------------------------------------------------------------------------------------
-void nsNativeFileSpec::operator = (const nsFileURL& inURL)
+void nsFileSpec::operator = (const nsFileURL& inURL)
 //----------------------------------------------------------------------------------------
 {
    *this = nsFilePath(inURL); // convert to unix path first
 }

+//----------------------------------------------------------------------------------------
+void nsFileSpec::operator = (const nsPersistentFileDescriptor& inDescriptor)
+//----------------------------------------------------------------------------------------
+{
+
+	void* data;
+	PRInt32 dataSize;
+    inDescriptor.GetData(data, dataSize);
+    
+#ifdef XP_MAC
+    char* decodedData = PL_Base64Decode((const char*)data, (int)dataSize, nsnull);
+    // Cast to an alias record and resolve.
+	AliasHandle aliasH = nsnull;
+	mError = NS_FILE_RESULT(PtrToHand(decodedData, &(Handle)aliasH, (dataSize * 3) / 4));
+	PR_Free(decodedData);
+	if (NS_SUCCEEDED(mError))
+		return; // not enough memory?
+
+	Boolean changed;
+	mError = NS_FILE_RESULT(::ResolveAlias(nsnull, aliasH, &mSpec, &changed));
+	DisposeHandle((Handle) aliasH);
+#else
+    nsFileSpecHelpers::StringAssign(mPath, (char*)data);
+    mError = NS_OK;
+#endif
+}
+
 //========================================================================================
-//                                UNIX & WIN nsNativeFileSpec implementation
+//                                UNIX & WIN nsFileSpec implementation
 //========================================================================================

 #ifdef XP_UNIX
 //----------------------------------------------------------------------------------------
-nsNativeFileSpec::nsNativeFileSpec(const nsFilePath& inPath)
+nsFileSpec::nsFileSpec(const nsFilePath& inPath)
 //----------------------------------------------------------------------------------------
 :    mPath(nsFileSpecHelpers::StringDup((const char*)inPath))
+,    mError(NS_OK)
 {
 }
 #endif // XP_UNIX

 #ifdef XP_UNIX
 //----------------------------------------------------------------------------------------
-void nsNativeFileSpec::operator = (const nsFilePath& inPath)
+void nsFileSpec::operator = (const nsFilePath& inPath)
 //----------------------------------------------------------------------------------------
 {
    nsFileSpecHelpers::StringAssign(mPath, (const char*)inPath);
+    mError = NS_OK;
 }
 #endif //XP_UNIX

 #if defined(XP_UNIX) || defined(XP_PC)
 //----------------------------------------------------------------------------------------
-nsNativeFileSpec::nsNativeFileSpec(const nsNativeFileSpec& inSpec)
+nsFileSpec::nsFileSpec(const nsFileSpec& inSpec)
 //----------------------------------------------------------------------------------------
 :    mPath(nsFileSpecHelpers::StringDup(inSpec.mPath))
+,    mError(NS_OK)
 {
 }
 #endif //XP_UNIX

 #if defined(XP_UNIX) || defined(XP_PC)
 //----------------------------------------------------------------------------------------
-nsNativeFileSpec::nsNativeFileSpec(const char* inString, bool inCreateDirs)
+nsFileSpec::nsFileSpec(const char* inString, PRBool inCreateDirs)
 //----------------------------------------------------------------------------------------
 :    mPath(nsFileSpecHelpers::StringDup(inString))
+,    mError(NS_OK)
+{
+    // Make canonical and absolute.
+    nsFileSpecHelpers::Canonify(mPath, inCreateDirs);
+}
+#endif //XP_UNIX,PC
+
+#if defined(XP_UNIX) || defined(XP_PC)
+//----------------------------------------------------------------------------------------
+nsFileSpec::nsFileSpec(const nsString& inString, PRBool inCreateDirs)
+//----------------------------------------------------------------------------------------
+:    mPath(inString.ToNewCString())
+,    mError(NS_OK)
 {
    // Make canonical and absolute.
    nsFileSpecHelpers::Canonify(mPath, inCreateDirs);
@@ -531,7 +691,7 @@ nsNativeFileSpec::nsNativeFileSpec(const char* inString, bool inCreateDirs)
 #endif //XP_UNIX,PC

 //----------------------------------------------------------------------------------------
-nsNativeFileSpec::~nsNativeFileSpec()
+nsFileSpec::~nsFileSpec()
 //----------------------------------------------------------------------------------------
 {
 #ifndef XP_MAC
@@ -541,28 +701,30 @@ nsNativeFileSpec::~nsNativeFileSpec()

 #if defined(XP_UNIX) || defined(XP_PC)
 //----------------------------------------------------------------------------------------
-void nsNativeFileSpec::operator = (const nsNativeFileSpec& inSpec)
+void nsFileSpec::operator = (const nsFileSpec& inSpec)
 //----------------------------------------------------------------------------------------
 {
    mPath = nsFileSpecHelpers::StringAssign(mPath, inSpec.mPath);
+    mError = inSpec.Error();
 }
 #endif //XP_UNIX


 #if defined(XP_UNIX) || defined(XP_PC)
 //----------------------------------------------------------------------------------------
-void nsNativeFileSpec::operator = (const char* inString)
+void nsFileSpec::operator = (const char* inString)
 //----------------------------------------------------------------------------------------
 {
    mPath = nsFileSpecHelpers::StringAssign(mPath, inString);
    // Make canonical and absolute.
-    nsFileSpecHelpers::Canonify(mPath, true /* XXX? */);
+    nsFileSpecHelpers::Canonify(mPath, PR_TRUE /* XXX? */);
+    mError = NS_OK;
 }
 #endif //XP_UNIX

 #if (defined(XP_UNIX) || defined(XP_PC))
 //----------------------------------------------------------------------------------------
-nsBasicOutStream& operator << (nsBasicOutStream& s, const nsNativeFileSpec& spec)
+nsOutputStream& operator << (nsOutputStream& s, const nsFileSpec& spec)
 //----------------------------------------------------------------------------------------
 {
    return (s << (const char*)spec.mPath);
@@ -570,10 +732,158 @@ nsBasicOutStream& operator << (nsBasicOutStream& s, const nsNativeFileSpec& spec
 #endif // DEBUG && XP_UNIX

 //----------------------------------------------------------------------------------------
-nsNativeFileSpec nsNativeFileSpec::operator + (const char* inRelativePath) const
+nsFileSpec nsFileSpec::operator + (const char* inRelativePath) const
 //----------------------------------------------------------------------------------------
 {
-    nsNativeFileSpec result = *this;
+    nsFileSpec result = *this;
    result += inRelativePath;
    return result;
-} // nsNativeFileSpec::operator +
+} // nsFileSpec::operator +
+
+//========================================================================================
+//	class nsPersistentFileDescriptor
+//========================================================================================
+
+//----------------------------------------------------------------------------------------
+nsPersistentFileDescriptor::nsPersistentFileDescriptor(const nsPersistentFileDescriptor& inDesc)
+//----------------------------------------------------------------------------------------
+    : mDescriptorString(nsFileSpecHelpers::StringDup(inDesc.mDescriptorString))
+{
+} // nsPersistentFileDescriptor::nsPersistentFileDescriptor
+
+//----------------------------------------------------------------------------------------
+void nsPersistentFileDescriptor::operator = (const nsPersistentFileDescriptor& inDesc)
+//----------------------------------------------------------------------------------------
+{
+    nsFileSpecHelpers::StringAssign(mDescriptorString, inDesc.mDescriptorString);
+} // nsPersistentFileDescriptor::operator =
+
+//----------------------------------------------------------------------------------------
+nsPersistentFileDescriptor::nsPersistentFileDescriptor(const nsFileSpec& inSpec)
+//----------------------------------------------------------------------------------------
+    : mDescriptorString(nsnull)
+{
+	*this = inSpec;
+} // nsPersistentFileDescriptor::nsPersistentFileDescriptor
+
+//----------------------------------------------------------------------------------------
+void nsPersistentFileDescriptor::operator = (const nsFileSpec& inSpec)
+//----------------------------------------------------------------------------------------
+{
+#ifdef XP_MAC
+    if (inSpec.Error())
+    	return;
+	AliasHandle	aliasH;
+/*
+        This is killing the tree.  mcmullen will need to look at this.
+
+	OSErr err = NewAlias(nil, inSpec.operator const FSSpec* const (), &aliasH);
+	if (err != noErr)
+		return;
+*/
+
+	PRUint32 bytes = GetHandleSize((Handle) aliasH);
+	HLock((Handle) aliasH);
+	char* buf = PL_Base64Encode((const char*)*aliasH, bytes, nsnull);
+	DisposeHandle((Handle) aliasH);
+
+    nsFileSpecHelpers::StringAssign(mDescriptorString, buf);
+    PR_Free(buf);
+#else
+    nsFileSpecHelpers::StringAssign(mDescriptorString, inSpec);
+#endif // XP_MAC
+} // nsPersistentFileDescriptor::operator =
+
+//----------------------------------------------------------------------------------------
+nsPersistentFileDescriptor::~nsPersistentFileDescriptor()
+//----------------------------------------------------------------------------------------
+{
+    delete [] mDescriptorString;
+} // nsPersistentFileDescriptor::~nsPersistentFileDescriptor
+
+//----------------------------------------------------------------------------------------
+void nsPersistentFileDescriptor::GetData(void*& outData, PRInt32& outSize) const
+//----------------------------------------------------------------------------------------
+{
+    outSize = PL_strlen(mDescriptorString);
+    outData = mDescriptorString;
+}
+
+//----------------------------------------------------------------------------------------
+void nsPersistentFileDescriptor::SetData(const void* inData, PRInt32 inSize)
+//----------------------------------------------------------------------------------------
+{
+	delete [] mDescriptorString;
+	mDescriptorString = new char[1 + inSize];
+	if (!mDescriptorString)
+	    return;
+	memcpy(mDescriptorString, inData, inSize);
+	mDescriptorString[inSize] = '\0';
+}
+
+#define MAX_PERSISTENT_DATA_SIZE 1000
+
+//----------------------------------------------------------------------------------------
+nsresult nsPersistentFileDescriptor::Read(nsIInputStream* aStream)
+//----------------------------------------------------------------------------------------
+{
+    nsInputStream(aStream) >> *this;
+    return NS_OK;
+}
+
+//----------------------------------------------------------------------------------------
+nsresult nsPersistentFileDescriptor::Write(nsIOutputStream* aStream)
+//----------------------------------------------------------------------------------------
+{
+    nsOutputStream(aStream) << *this;
+    return NS_OK;
+}
+
+//----------------------------------------------------------------------------------------
+nsInputStream& operator >> (nsInputStream& s, nsPersistentFileDescriptor& d)
+// reads the data from a file
+//----------------------------------------------------------------------------------------
+{
+	char bigBuffer[MAX_PERSISTENT_DATA_SIZE + 1];
+	// The first 8 bytes of the data should be a hex version of the data size to follow.
+	PRInt32 bytesRead = 8;
+	bytesRead = s.read(bigBuffer, bytesRead);
+	if (bytesRead != 8)
+		return s;
+	bigBuffer[8] = '\0';
+	sscanf(bigBuffer, "%lx", &bytesRead);
+	if (bytesRead > MAX_PERSISTENT_DATA_SIZE)
+		return s; // preposterous.
+	// Now we know how many bytes to read, do it.
+	s.read(bigBuffer, bytesRead);
+	d.SetData(bigBuffer, bytesRead);
+	return s;
+}
+
+//----------------------------------------------------------------------------------------
+nsOutputStream& operator << (nsOutputStream& s, const nsPersistentFileDescriptor& d)
+// writes the data to a file
+//----------------------------------------------------------------------------------------
+{
+	char littleBuf[9];
+	PRInt32 dataSize;
+	void* data;
+	d.GetData(data, dataSize);
+	// First write (in hex) the length of the data to follow.  Exactly 8 bytes
+	sprintf(littleBuf, "%0.8x", dataSize);
+	s << littleBuf;
+	// Now write the data itself
+	s << d.mDescriptorString;
+	return s;
+}
+
+//========================================================================================
+//	class nsAutoCString
+//========================================================================================
+
+//----------------------------------------------------------------------------------------
+nsAutoCString::~nsAutoCString()
+//----------------------------------------------------------------------------------------
+{
+	delete [] (char*)mCString;
+}
--- a/mozilla/base/src/nsFileStream.cpp
+++ b/mozilla/base/src/nsFileStream.cpp
@@ -22,332 +22,76 @@

 #include "nsFileStream.h"

+
 #include <string.h>
 #include <stdio.h>

-#ifdef XP_MAC
-#include <Errors.h>
-#endif

 //========================================================================================
-//          nsBasicFileStream
+//          nsInputStream
 //========================================================================================

 //----------------------------------------------------------------------------------------
-nsBasicFileStream::nsBasicFileStream()
+nsInputStream::~nsInputStream()
 //----------------------------------------------------------------------------------------
-    :    mFileDesc(0)
-    ,    mNSPRMode(0)
-    ,    mFailed(false)
-    ,    mEOF(false)
 {
 }

 //----------------------------------------------------------------------------------------
-nsBasicFileStream::nsBasicFileStream(
-    const nsFilePath& inFile, 
-    int nsprMode,
-    PRIntn accessMode)
+char nsInputStream::get()
 //----------------------------------------------------------------------------------------
-    :    mFileDesc(0)
-    ,    mNSPRMode(0)
-    ,    mFailed(false)
-    ,    mEOF(false)
 {
-    open(inFile, nsprMode, accessMode);
+	char c;
+    read(&c, sizeof(c));
+    return c;
 }

 //----------------------------------------------------------------------------------------
-nsBasicFileStream::nsBasicFileStream(PRFileDesc* desc, int nsprMode)
+static void TidyEndOfLine(char*& cp)
+// Assumes that cp is pointing at \n or \r.  Nulls out the character, checks for
+// a second terminator (of the opposite persuasion), and returns cp pointing past the
+// entire eol construct (one or two characters).
 //----------------------------------------------------------------------------------------
-    :    mFileDesc(desc)
-    ,    mNSPRMode(nsprMode)
-    ,    mFailed(false)
-    ,    mEOF(false)
 {
+    char ch = *cp;
+    *cp++ = '\0'; // terminate at the newline, then skip past it
+    if ((ch == '\n' && *cp == '\r') || (ch == '\r' && *cp == '\n'))
+        cp++; // possibly a pair.
 }

 //----------------------------------------------------------------------------------------
-nsBasicFileStream::~nsBasicFileStream()
+nsInputStream& nsInputStream::operator >> (char& c)
 //----------------------------------------------------------------------------------------
 {
-	close();
-}
-
-//----------------------------------------------------------------------------------------
-void nsBasicFileStream::open(
-	const nsFilePath& inFile,
-    int nsprMode,
-    PRIntn accessMode)
-//----------------------------------------------------------------------------------------
-{
-    if (mFileDesc)
-        return;
-        
-    const int nspr_modes[]={
-        PR_WRONLY | PR_CREATE_FILE,
-        PR_WRONLY | PR_CREATE_FILE | PR_APPEND,
-        PR_WRONLY | PR_CREATE_FILE | PR_TRUNCATE,
-        PR_RDONLY,
-        PR_RDONLY | PR_APPEND,
-        PR_RDWR | PR_CREATE_FILE,
-        PR_RDWR | PR_CREATE_FILE | PR_TRUNCATE,
-//      "wb",
-//      "ab", 
-//      "wb",
-//      "rb",
-//      "r+b",
-//      "w+b",
-        0 };
-    const int* currentLegalMode = nspr_modes;
-    while (*currentLegalMode && nsprMode != *currentLegalMode)
-        ++currentLegalMode;
-    if (!*currentLegalMode) 
-        return;
-
-#ifdef XP_MAC
-     // Use the file spec to open the file, because one path can be common to
-     // several files on the Macintosh (you can have several volumes with the
-     // same name, see).
-    mFileDesc = 0;
-    if (inFile.GetNativeSpec().Error() != noErr)
-        return;
-    OSErr err = noErr;
-#if DEBUG
-	const OSType kCreator = 'CWIE';
-#else
-    const OSType kCreator = 'MOSS';
-#endif
-	nsNativeFileSpec nativeSpec = inFile.GetNativeSpec();
-    FSSpec* spec = (FSSpec*)nativeSpec;
-    if (nsprMode & PR_CREATE_FILE)
-    	err = FSpCreate(spec, kCreator, 'TEXT', 0);
-    if (err == dupFNErr)
-    	err = noErr;
-    if (err != noErr)
-       return;
-    
-    SInt8 perm;
-    if (nsprMode & PR_RDWR)
-       perm = fsRdWrPerm;
-    else if (nsprMode & PR_WRONLY)
-       perm = fsWrPerm;
-    else
-       perm = fsRdPerm;
-
-    short refnum;
-    err = FSpOpenDF(spec, perm, &refnum);
-
-    if (err == noErr && (nsprMode & PR_TRUNCATE))
-    	err = SetEOF(refnum, 0);
-    if (err == noErr && (nsprMode & PR_APPEND))
-    	err = SetFPos(refnum, fsFromLEOF, 0);
-    if (err != noErr)
-       return;
-
-    if ((mFileDesc = PR_ImportFile(refnum)) == 0)
-    	return;
-#else
-	//	Platforms other than Macintosh...
-	//  Another bug in NSPR: Mac PR_Open assumes a unix style path, but Win PR_Open assumes
-	//  a windows path.
-    if ((mFileDesc = PR_Open((const char*)nsNativeFileSpec(inFile), nsprMode, accessMode)) == 0)
-    	return;
-#endif
-     mNSPRMode = nsprMode;
-} // nsFileStreamHelpers::open
-
-//----------------------------------------------------------------------------------------
-void nsBasicFileStream::close()
-// Must precede the destructor because both are inline.
-//----------------------------------------------------------------------------------------
-{
-    if (mFileDesc==PR_STDIN || mFileDesc==PR_STDOUT || mFileDesc==PR_STDERR || mFileDesc == 0) 
-       return;
-    if (PR_Close(mFileDesc) == PR_SUCCESS)
-    	mFileDesc = 0;
-} // nsBasicFileStream::close
-
-//----------------------------------------------------------------------------------------
-void nsBasicFileStream::seek(PRSeekWhence whence, PRInt32 offset)
-// Must precede the destructor because both are inline.
-//----------------------------------------------------------------------------------------
-{
-    if (mFileDesc==PR_STDIN || mFileDesc==PR_STDOUT || mFileDesc==PR_STDERR || mFileDesc == 0) 
-       return;
-    mFailed = false; // reset on a seek.
-    mEOF = false; // reset on a seek.
-    PRInt32 position = PR_Seek(mFileDesc, 0, PR_SEEK_CUR);
-    PRInt32 available = PR_Available(mFileDesc);
-    PRInt32 fileSize = position + available;
-    PRInt32 newPosition;
-    switch (whence)
-    {
-    	case PR_SEEK_CUR: newPosition = position + offset; break;
-    	case PR_SEEK_SET: newPosition = offset; break;
-    	case PR_SEEK_END: newPosition = fileSize + offset; break;
-    }
-    if (newPosition < 0)
-    {
-    	newPosition = 0;
-    	mFailed = true;
-    }
-    else if (newPosition >= fileSize)
-    {
-    	newPosition = fileSize;
-    	mEOF = true;
-    }
-    if (PR_Seek(mFileDesc, newPosition, PR_SEEK_SET) < 0)
-    	mFailed = true;
-} // nsBasicFileStream::seek
-
-//----------------------------------------------------------------------------------------
-PRIntn nsBasicFileStream::tell() const
-// Must precede the destructor because both are inline.
-//----------------------------------------------------------------------------------------
-{
-    if (mFileDesc==PR_STDIN || mFileDesc==PR_STDOUT || mFileDesc==PR_STDERR || mFileDesc == 0) 
-       return -1;
-    return PR_Seek(mFileDesc, 0, PR_SEEK_CUR);
-} // nsBasicFileStream::tell
-
-//========================================================================================
-//          nsBasicInStream
-//========================================================================================
-
-//----------------------------------------------------------------------------------------
-nsBasicInStream::nsBasicInStream(nsBasicFileStream& inBasicStream, istream* inStream)
-//----------------------------------------------------------------------------------------
-	: mBase(inBasicStream)
-	, mStdStream(inStream)
-{
-}
-//----------------------------------------------------------------------------------------
-void nsBasicInStream::get(char& c)
-//----------------------------------------------------------------------------------------
-{
-    read(&c, sizeof(char));
-}
-
-//----------------------------------------------------------------------------------------
-PRBool nsBasicInStream::readline(char* s, PRInt32 n)
-// This will truncate if the buffer is too small.  Result will always be null-terminated.
-//----------------------------------------------------------------------------------------
-{
-    PRBool bufferLargeEnough = true; // result
-    if (!s || !n)
-        return true;
-    PRIntn position = mBase.tell();
-    if (position < 0)
-        return false;
-    PRInt32 bytesRead = read(s, n - 1);
-    if (mBase.failed())
-        return false;
-    s[bytesRead] = '\0'; // always terminate at the end of the buffer
-    char* tp = strpbrk(s, "\n\r");
-    if (tp)
-    {
-        char ch = *tp;
-        *tp++ = '\0'; // terminate at the newline, then skip past it
-        if ((ch == '\n' && *tp == '\r') || (ch == '\r' && *tp == '\n'))
-            tp++; // possibly a pair.
-        bytesRead = (tp - s);
-    }
-    else if (!mBase.eof())
-        bufferLargeEnough = false;
-    position += bytesRead;
-    mBase.seek(position);
-    return bufferLargeEnough;
-} // nsBasicInStream::getline
-
-//----------------------------------------------------------------------------------------
-PRInt32 nsBasicInStream::read(void* s, PRInt32 n)
-//----------------------------------------------------------------------------------------
-{
-#ifndef NS_USE_PR_STDIO
-    // Calling PR_Read on stdin is sure suicide on Macintosh.
-    if (GetStandardStream())
-    {
-    	GetStandardStream()->read((char*)s, n);
-    	return n;
-    }
-#endif
-    if (!mBase.is_open() || mBase.failed())
-        return -1;
-    PRInt32 bytesRead = PR_Read(mBase.GetFileDescriptor(), s, n);
-    if (bytesRead < 0)
-        mBase.mFailed = true;
-    else if (bytesRead < n)
-        mBase.mEOF = true;
-    return bytesRead;
-}
-
-//----------------------------------------------------------------------------------------
-nsBasicInStream& nsBasicInStream::operator >> (char& c)
-//----------------------------------------------------------------------------------------
-{
-	get(c);
+	c = get();
 	return *this;
 }

 //========================================================================================
-//          nsInputFileStream
+//          nsOutputStream
 //========================================================================================

 //----------------------------------------------------------------------------------------
-nsInputFileStream::nsInputFileStream(istream* stream)
+nsOutputStream::~nsOutputStream()
 //----------------------------------------------------------------------------------------
-#ifndef NS_USE_PR_STDIO
-    : nsBasicFileStream(0, kDefaultMode)
-    , nsBasicInStream(*this, stream)
-#else
-    : nsBasicFileStream(PR_STDIN, kDefaultMode)
-    , nsBasicInStream(*this, 0)
-#endif
-{
-}
-
-//========================================================================================
-//          nsBasicOutStream
-//========================================================================================
-
-//----------------------------------------------------------------------------------------
-nsBasicOutStream::nsBasicOutStream(nsBasicFileStream& inBase, ostream* stream)
-//----------------------------------------------------------------------------------------
-    : mBase(inBase)
-    , mStdStream(stream)
 {
 }

 //----------------------------------------------------------------------------------------
-void nsBasicOutStream::put(char c)
+void nsOutputStream::put(char c)
 //----------------------------------------------------------------------------------------
 {
    write(&c, sizeof(c));
 }

 //----------------------------------------------------------------------------------------
-PRInt32 nsBasicOutStream::write(const void* s, PRInt32 n)
+void nsOutputStream::flush()
 //----------------------------------------------------------------------------------------
 {
-#ifndef NS_USE_PR_STDIO
-    // Calling PR_Write on stdout is sure suicide.
-    if (mStdStream)
-    {
-    	mStdStream->write((const char*)s, n);
-        return n;
-    }
-#endif
-    if (!mBase.mFileDesc || mBase.failed())
-       return -1;
-    PRInt32 bytesWrit = PR_Write(mBase.mFileDesc, s, n);
-    if (bytesWrit != n)
-        mBase.mFailed = true;
-    return bytesWrit;
 }

 //----------------------------------------------------------------------------------------
-nsBasicOutStream& nsBasicOutStream::operator << (char c)
+nsOutputStream& nsOutputStream::operator << (char c)
 //----------------------------------------------------------------------------------------
 {
 	put(c);
@@ -355,7 +99,7 @@ nsBasicOutStream& nsBasicOutStream::operator << (char c)
 }

 //----------------------------------------------------------------------------------------
-nsBasicOutStream& nsBasicOutStream::operator << (const char* s)
+nsOutputStream& nsOutputStream::operator << (const char* s)
 //----------------------------------------------------------------------------------------
 {
 	write(s, strlen(s));
@@ -363,78 +107,84 @@ nsBasicOutStream& nsBasicOutStream::operator << (const char* s)
 }

 //----------------------------------------------------------------------------------------
-nsBasicOutStream& nsBasicOutStream::operator << (short val)
+nsOutputStream& nsOutputStream::operator << (short val)
 //----------------------------------------------------------------------------------------
 {
 	char buf[30];
 	sprintf(buf, "%d", val);
-	return *this << buf;
+	return (*this << buf);
 }

 //----------------------------------------------------------------------------------------
-nsBasicOutStream& nsBasicOutStream::operator << (unsigned short val)
+nsOutputStream& nsOutputStream::operator << (unsigned short val)
 //----------------------------------------------------------------------------------------
 {
 	char buf[30];
 	sprintf(buf, "%ud", val);
-	return *this << buf;
+	return (*this << buf);
 }

 //----------------------------------------------------------------------------------------
-nsBasicOutStream& nsBasicOutStream::operator << (long val)
+nsOutputStream& nsOutputStream::operator << (long val)
 //----------------------------------------------------------------------------------------
 {
 	char buf[30];
 	sprintf(buf, "%ld", val);
-	return *this << buf;
+	return (*this << buf);
 }

 //----------------------------------------------------------------------------------------
-nsBasicOutStream& nsBasicOutStream::operator << (unsigned long val)
+nsOutputStream& nsOutputStream::operator << (unsigned long val)
 //----------------------------------------------------------------------------------------
 {
 	char buf[30];
 	sprintf(buf, "%uld", val);
-	return *this << buf;
+	return (*this << buf);
 }

+//========================================================================================
+//          nsInputFileStream
+//========================================================================================
+
 //----------------------------------------------------------------------------------------
-void nsBasicOutStream::flush()
-// Must precede the destructor because both are inline.
+PRBool nsInputFileStream::readline(char* s, PRInt32 n)
+// This will truncate if the buffer is too small.  Result will always be null-terminated.
 //----------------------------------------------------------------------------------------
 {
-#ifndef NS_USE_PR_STDIO
-    if (mStdStream)
+    PRBool bufferLargeEnough = PR_TRUE; // result
+    if (!s || !n)
+        return PR_TRUE;
+
+    PRIntn position = tell();
+    if (position < 0)
+        return PR_FALSE;
+    PRInt32 bytesRead = read(s, n - 1);
+    if (failed())
+        return PR_FALSE;
+    s[bytesRead] = '\0'; // always terminate at the end of the buffer
+    char* tp = strpbrk(s, "\n\r");
+    if (tp)
    {
-        mStdStream->flush();
-        return;
+        TidyEndOfLine(tp);
+        bytesRead = (tp - s);
    }
-#endif
-    if (mBase.mFileDesc == 0) 
-        return;
-    PRBool itFailed = PR_Sync(mBase.mFileDesc) != PR_SUCCESS;
-#ifdef XP_MAC
-    // On unix, it seems to fail always.
-    if (itFailed)
-    	mBase.mFailed = true;
-#endif
-} // nsBasicOutStream::flush
+    else if (!eof())
+        bufferLargeEnough = PR_FALSE;
+    position += bytesRead;
+    seek(position);
+    return bufferLargeEnough;
+} // nsInputStream::readline

 //========================================================================================
 //          nsOutputFileStream
 //========================================================================================

 //----------------------------------------------------------------------------------------
-nsOutputFileStream::nsOutputFileStream(ostream* stream)
+void nsOutputFileStream::flush()
 //----------------------------------------------------------------------------------------
-#ifndef NS_USE_PR_STDIO
-    : nsBasicFileStream(0, kDefaultMode)
-    , nsBasicOutStream(*this, stream)
-#else
-    : nsBasicFileStream(PR_STDOUT, kDefaultMode)
-    , nsBasicOutStream(*this, 0)
-#endif
 {
+	if (mFileOutputStream)
+		mFileOutputStream->Flush();
 }

 //========================================================================================
@@ -442,19 +192,10 @@ nsOutputFileStream::nsOutputFileStream(ostream* stream)
 //========================================================================================

 //----------------------------------------------------------------------------------------
-nsBasicOutStream& nsEndl(nsBasicOutStream& os)
+nsOutputStream& nsEndl(nsOutputStream& os)
 //----------------------------------------------------------------------------------------
 {
-#ifndef NS_USE_PR_STDIO
-    // Calling PR_Write on stdout is sure suicide on Macintosh.
-    ostream* stream = os.GetStandardStream();
-    if (stream)
-    {
-        *stream << std::endl;
-        return os;
-    }
-#endif
-     os.put('\n');
-     os.flush();
-     return os;
-}
+    os.put('\n');
+    os.flush();
+    return os;
+} // nsEndl
--- a/mozilla/base/src/nsGenericCaretProperties.cpp
+++ b/mozilla/base/src/nsGenericCaretProperties.cpp
@@ -0,0 +1,22 @@
+
+
+#include "nscore.h"
+
+#include "nsCaretProperties.h"
+
+
+
+//-----------------------------------------------------------------------------
+nsCaretProperties::nsCaretProperties()
+:	mCaretWidth(eDefaultCaretWidth)
+,	mBlinkRate(eDefaulBlinkRate)
+{
+	// in your platform-specific class, get data from the OS in your constructor
+}
+
+
+//-----------------------------------------------------------------------------
+nsCaretProperties* NewCaretProperties()
+{
+	return new nsCaretProperties();
+}
--- a/mozilla/base/src/nsIAtom.h
+++ b/mozilla/base/src/nsIAtom.h
@@ -35,6 +35,8 @@ class nsISizeOfHandler;
 */
 class nsIAtom : public nsISupports {
 public:
+  static const nsIID& IID() { static nsIID iid = NS_IATOM_IID; return iid; }
+
  /**
   * Translate the unicode string into the stringbuf.
   */
--- a/mozilla/base/src/nsIBaseStream.h
+++ b/mozilla/base/src/nsIBaseStream.h
@@ -31,6 +31,8 @@
 class nsIBaseStream : public nsISupports {
 public:

+    static const nsIID& IID() { static nsIID iid = NS_IBASESTREAM_IID; return iid; }
+
    /** Close the stream. */
    NS_IMETHOD
    Close(void) = 0;
--- a/mozilla/base/src/nsIFileStream.cpp
+++ b/mozilla/base/src/nsIFileStream.cpp
@@ -0,0 +1,462 @@
+#include "nsIFileStream.h"
+#include "nsFileSpec.h"
+
+#include "prerror.h"
+
+#ifdef XP_MAC
+#include "pprio.h" // To get PR_ImportFile
+#else
+#include "prio.h"
+#endif
+
+#ifdef XP_MAC
+#include <Errors.h>
+#include <iostream>
+#endif
+
+//========================================================================================
+class FileImpl
+    : public nsIOutputStream
+    , public nsIInputStream
+    , public nsIFileOutputStream
+    , public nsIFileInputStream
+    , public nsIFile
+//========================================================================================
+{
+    public:
+                                        FileImpl(PRFileDesc* inDesc)
+                                            : mFileDesc(inDesc)
+                                            , mFailed(PR_FALSE)
+                                            , mEOF(PR_FALSE)
+                                            , mLength(-1)
+                                        {
+                                            NS_INIT_REFCNT();
+                                        }
+                                        FileImpl(
+                                            const nsFileSpec& inFile,
+                                            int nsprMode,
+                                            PRIntn accessMode)
+                                            : mFileDesc(nsnull)
+                                            , mFailed(PR_FALSE)
+                                            , mEOF(PR_FALSE)
+                                        {
+                                            NS_INIT_REFCNT();
+                                            Open(inFile, nsprMode, accessMode);
+                                        }
+        virtual                         ~FileImpl()
+                                        {
+                                            Close();
+                                        }
+        
+        // nsISupports interface
+                                        NS_DECL_ISUPPORTS
+
+		// nsIFile interface
+        NS_IMETHOD                      Open(
+                                            const nsFileSpec& inFile,
+                                            int nsprMode,
+                                            PRIntn accessMode);
+        NS_IMETHOD                      Close();
+        NS_IMETHOD                      Seek(PRSeekWhence whence, PRInt32 offset);
+
+        NS_IMETHOD                      GetIsOpen(PRBool* outOpen)
+                                        {
+                                            *outOpen = (mFileDesc != nsnull);
+                                            return NS_OK;
+                                        }
+        NS_IMETHOD                      Tell(PRIntn* outWhere);
+
+		// nsIInputStream interface
+        NS_IMETHOD                      GetLength(PRUint32 *aLength)
+                                        {
+                                            NS_PRECONDITION(aLength != nsnull, "null ptr");
+                                            if (!aLength)
+                                                return NS_ERROR_NULL_POINTER;
+                                            if (mLength < 0)
+                                                return NS_FILE_RESULT(NS_ERROR_UNEXPECTED);
+                                            *aLength = mLength;
+                                            return NS_OK;
+                                        }
+		NS_IMETHOD                      Read(char* aBuf,
+					                        PRUint32 aOffset,
+			                                PRUint32 aCount,
+					                        PRUint32 *aReadCount)
+								        {
+								            NS_PRECONDITION(aBuf != nsnull, "null ptr");
+								            if (!aBuf)
+								                return NS_ERROR_NULL_POINTER;
+								            NS_PRECONDITION(aReadCount != nsnull, "null ptr");
+								            if (!aReadCount)
+								                return NS_ERROR_NULL_POINTER;
+								            if (!mFileDesc)
+								                return NS_FILE_RESULT(PR_BAD_DESCRIPTOR_ERROR);
+								            if (mFailed)
+								                return NS_ERROR_FAILURE;
+								            if (aOffset)
+								                PR_Seek(mFileDesc, aOffset, PR_SEEK_CUR);
+								            PRInt32 bytesRead = PR_Read(mFileDesc, aBuf, aCount);
+								            if (bytesRead < 0)
+								            {
+								                *aReadCount = 0;
+								                mFailed = PR_TRUE;
+								                return NS_FILE_RESULT(PR_GetError());
+								            }
+								            *aReadCount = bytesRead;
+								            return NS_OK;
+								        }
+		// nsIOutputStream interface
+		NS_IMETHOD                      Write(const char* aBuf,
+					                        PRUint32 aOffset,
+			                                PRUint32 aCount,
+					                        PRUint32 *aWriteCount)
+								        {
+								            NS_PRECONDITION(aBuf != nsnull, "null ptr");
+								            NS_PRECONDITION(aWriteCount != nsnull, "null ptr");
+
+
+								#ifdef XP_MAC
+								            // Calling PR_Write on stdout is sure suicide.
+								            if (mFileDesc == PR_STDOUT || mFileDesc == PR_STDERR)
+								            {
+								                cout.write(aBuf, aCount);
+								                *aWriteCount = aCount;
+								                return NS_OK;
+								            }
+								#endif
+								            if (!mFileDesc)
+								                return NS_FILE_RESULT(PR_BAD_DESCRIPTOR_ERROR);
+								            if (mFailed)
+								               return NS_ERROR_FAILURE;
+								            if (aOffset)
+								                PR_Seek(mFileDesc, aOffset, PR_SEEK_CUR);
+								            PRInt32 bytesWrit = PR_Write(mFileDesc, aBuf, aCount);
+								            if (bytesWrit != aCount)
+								            {
+								                mFailed = PR_TRUE;
+								                *aWriteCount = 0;
+								                return NS_FILE_RESULT(PR_GetError());
+								            }
+								            *aWriteCount = bytesWrit;
+								            return NS_OK;
+								        }
+        NS_IMETHOD                      Flush();
+
+        NS_IMETHOD                      GetAtEOF(PRBool* outAtEOF)
+        						        {
+        						            *outAtEOF = mEOF;
+        						            return NS_OK;
+        						        }
+        NS_IMETHOD                      SetAtEOF(PRBool inAtEOF)
+        						        {
+        						            mEOF = inAtEOF;
+        						            return NS_OK;
+        						        }
+
+    protected:
+    
+        PRFileDesc*                             mFileDesc;
+        int                                     mNSPRMode;
+        PRBool                                  mFailed;
+        PRBool                                  mEOF;
+        PRInt32                                 mLength;
+}; // class FileImpl
+
+#define SAY_I_IMPLEMENT(classname)        \
+  if (aIID.Equals(classname::IID()))                  \
+  {                                            \
+      *aInstancePtr = (void*)((classname*)this); \
+      NS_ADDREF_THIS();                        \
+      return NS_OK;                            \
+  }
+
+NS_IMPL_RELEASE(FileImpl)
+NS_IMPL_ADDREF(FileImpl)
+
+//----------------------------------------------------------------------------------------
+NS_IMETHODIMP FileImpl::QueryInterface(REFNSIID aIID, void** aInstancePtr)
+//----------------------------------------------------------------------------------------
+{
+  if (!aInstancePtr)
+    return NS_ERROR_NULL_POINTER;
+
+  *aInstancePtr = nsnull;
+
+  SAY_I_IMPLEMENT(nsIFile)
+  SAY_I_IMPLEMENT(nsIOutputStream)
+  SAY_I_IMPLEMENT(nsIInputStream)
+  SAY_I_IMPLEMENT(nsIFileInputStream)
+  SAY_I_IMPLEMENT(nsIFileOutputStream)
+  // Note that we derive from two copies of nsIBaseStream (and hence
+  // of nsISupports), one through
+  // nsIOutputStream, the other through nsIInputStream.  Resolve this
+  // by giving them a specific one
+  if (aIID.Equals(((nsIBaseStream*)(nsIOutputStream*)this)->IID()))
+  {
+      *aInstancePtr = (void*)((nsIBaseStream*)(nsIOutputStream*)this);
+      NS_ADDREF_THIS();
+      return NS_OK;
+  }
+  if (aIID.Equals(((nsISupports*)(nsIOutputStream*)this)->IID()))
+  {
+      *aInstancePtr = (void*)((nsISupports*)(nsIOutputStream*)this);
+      NS_ADDREF_THIS();
+      return NS_OK;
+  }
+  return NS_NOINTERFACE;
+} // FileImpl::QueryInterface
+
+//----------------------------------------------------------------------------------------
+NS_IMETHODIMP FileImpl::Open(
+    const nsFileSpec& inFile,
+    int nsprMode,
+    PRIntn accessMode)
+//----------------------------------------------------------------------------------------
+{
+    if (mFileDesc)
+        if ((nsprMode & mNSPRMode) == nsprMode)
+            return NS_OK;
+        else
+            return NS_FILE_RESULT(PR_ILLEGAL_ACCESS_ERROR);
+        
+    const int nspr_modes[]={
+        PR_WRONLY | PR_CREATE_FILE,
+        PR_WRONLY | PR_CREATE_FILE | PR_APPEND,
+        PR_WRONLY | PR_CREATE_FILE | PR_TRUNCATE,
+        PR_RDONLY,
+        PR_RDONLY | PR_APPEND,
+        PR_RDWR | PR_CREATE_FILE,
+        PR_RDWR | PR_CREATE_FILE | PR_TRUNCATE,
+//      "wb",
+//      "ab", 
+//      "wb",
+//      "rb",
+//      "r+b",
+//      "w+b",
+        0 };
+    const int* currentLegalMode = nspr_modes;
+    while (*currentLegalMode && nsprMode != *currentLegalMode)
+        ++currentLegalMode;
+    if (!*currentLegalMode) 
+        return NS_FILE_RESULT(PR_ILLEGAL_ACCESS_ERROR);
+
+#ifdef XP_MAC
+     // Use the file spec to open the file, because one path can be common to
+     // several files on the Macintosh (you can have several volumes with the
+     // same name, see).
+    mFileDesc = 0;
+    if (inFile.Error() != noErr)
+        return NS_FILE_RESULT(inFile.Error());
+    OSErr err = noErr;
+#if DEBUG
+    const OSType kCreator = 'CWIE';
+#else
+    const OSType kCreator = 'MOSS';
+#endif
+    // Resolve the alias to the original file.
+    nsFileSpec original = inFile;
+    PRBool ignoredResult;
+    original.ResolveAlias(ignoredResult);
+    const FSSpec& spec = original.operator const FSSpec&();
+    if (nsprMode & PR_CREATE_FILE)
+        err = FSpCreate(&spec, kCreator, 'TEXT', 0);
+    if (err == dupFNErr)
+        err = noErr;
+    if (err != noErr)
+        return NS_FILE_RESULT(err);
+    
+    SInt8 perm;
+    if (nsprMode & PR_RDWR)
+       perm = fsRdWrPerm;
+    else if (nsprMode & PR_WRONLY)
+       perm = fsWrPerm;
+    else
+       perm = fsRdPerm;
+
+    short refnum;
+    err = FSpOpenDF(&spec, perm, &refnum);
+
+    if (err == noErr && (nsprMode & PR_TRUNCATE))
+        err = SetEOF(refnum, 0);
+    if (err == noErr && (nsprMode & PR_APPEND))
+        err = SetFPos(refnum, fsFromLEOF, 0);
+    if (err != noErr)
+        return NS_FILE_RESULT(err);
+
+    if ((mFileDesc = PR_ImportFile(refnum)) == 0)
+        return NS_FILE_RESULT(PR_GetError());
+#else
+    //    Platforms other than Macintosh...
+    //  Another bug in NSPR: Mac PR_Open assumes a unix style path, but Win PR_Open assumes
+    //  a windows path.
+    if ((mFileDesc = PR_Open((const char*)nsFileSpec(inFile), nsprMode, accessMode)) == 0)
+        return NS_FILE_RESULT(PR_GetError());
+#endif
+     mNSPRMode = nsprMode;
+     mLength = PR_Available(mFileDesc);
+     return NS_OK;
+} // FileImpl::Open
+
+//----------------------------------------------------------------------------------------
+NS_IMETHODIMP FileImpl::Seek(PRSeekWhence whence, PRInt32 offset)
+//----------------------------------------------------------------------------------------
+{
+    if (mFileDesc==PR_STDIN || mFileDesc==PR_STDOUT || mFileDesc==PR_STDERR || !mFileDesc) 
+       return NS_FILE_RESULT(PR_BAD_DESCRIPTOR_ERROR);
+    mFailed = PR_FALSE; // reset on a seek.
+    mEOF = PR_FALSE; // reset on a seek.
+    PRInt32 position = PR_Seek(mFileDesc, 0, PR_SEEK_CUR);
+    PRInt32 available = PR_Available(mFileDesc);
+    PRInt32 fileSize = position + available;
+    PRInt32 newPosition;
+    switch (whence)
+    {
+        case PR_SEEK_CUR: newPosition = position + offset; break;
+        case PR_SEEK_SET: newPosition = offset; break;
+        case PR_SEEK_END: newPosition = fileSize + offset; break;
+    }
+    if (newPosition < 0)
+    {
+        newPosition = 0;
+        mFailed = PR_TRUE;
+    }
+    else if (newPosition >= fileSize)
+    {
+        newPosition = fileSize;
+        mEOF = PR_TRUE;
+    }
+    if (PR_Seek(mFileDesc, newPosition, PR_SEEK_SET) < 0)
+        mFailed = PR_TRUE;
+    return NS_OK;
+} // FileImpl::Seek
+
+//----------------------------------------------------------------------------------------
+NS_IMETHODIMP FileImpl::Tell(PRIntn* outWhere)
+//----------------------------------------------------------------------------------------
+{
+    if (mFileDesc==PR_STDIN || mFileDesc==PR_STDOUT || mFileDesc==PR_STDERR || !mFileDesc) 
+       return NS_FILE_RESULT(PR_BAD_DESCRIPTOR_ERROR);
+    *outWhere = PR_Seek(mFileDesc, 0, PR_SEEK_CUR);
+    return NS_OK;
+} // FileImpl::Tell
+
+//----------------------------------------------------------------------------------------
+NS_IMETHODIMP FileImpl::Close()
+//----------------------------------------------------------------------------------------
+{
+    if (mFileDesc==PR_STDIN || mFileDesc==PR_STDOUT || mFileDesc==PR_STDERR || !mFileDesc) 
+       return NS_OK;
+    if (PR_Close(mFileDesc) == PR_SUCCESS)
+        mFileDesc = 0;
+    else
+        return NS_FILE_RESULT(PR_GetError());
+    return NS_OK;
+} // FileImpl::close
+
+//----------------------------------------------------------------------------------------
+NS_IMETHODIMP FileImpl::Flush()
+//----------------------------------------------------------------------------------------
+{
+#ifdef XP_MAC
+    if (mFileDesc == PR_STDOUT || mFileDesc == PR_STDERR)
+    {
+        cout.flush();
+        return NS_OK;
+    }
+#endif
+    if (!mFileDesc) 
+        return NS_FILE_RESULT(PR_BAD_DESCRIPTOR_ERROR);
+    PRBool itFailed = PR_Sync(mFileDesc) != PR_SUCCESS;
+#ifdef XP_MAC
+    // On unix, it seems to fail always.
+    if (itFailed)
+        mFailed = PR_TRUE;
+#endif
+    return NS_OK;
+} // FileImpl::flush
+
+//----------------------------------------------------------------------------------------
+NS_BASE nsresult NS_NewTypicalInputFileStream(
+    nsISupports** aResult,
+    const nsFileSpec& inFile
+    /*Default nsprMode == PR_RDONLY*/
+    /*Default accessmode = 0700 (octal)*/)
+// Factory method to get an nsInputStream from a file, using most common options
+//----------------------------------------------------------------------------------------
+{
+    return NS_NewIOFileStream(aResult, inFile, PR_RDONLY, 0700);
+}
+
+//----------------------------------------------------------------------------------------
+NS_BASE nsresult NS_NewOutputConsoleStream(
+    nsISupports** aResult)
+// Factory method to get an nsOutputStream to the console.
+//----------------------------------------------------------------------------------------
+{
+    NS_PRECONDITION(aResult != nsnull, "null ptr");
+    if (! aResult)
+        return NS_ERROR_NULL_POINTER;
+
+    FileImpl* stream = new FileImpl(PR_STDOUT);
+    if (! stream)
+        return NS_ERROR_OUT_OF_MEMORY;
+
+    NS_ADDREF(stream);
+    *aResult = (nsISupports*)(void*)stream;
+    return NS_OK;
+}
+
+//----------------------------------------------------------------------------------------
+NS_BASE nsresult NS_NewTypicalOutputFileStream(
+    nsISupports** aResult,
+    const nsFileSpec& inFile
+    /*default nsprMode= (PR_WRONLY | PR_CREATE_FILE | PR_TRUNCATE)*/
+    /*Default accessMode= 0700 (octal)*/)
+// Factory method to get an nsOutputStream to a file - most common case.
+//----------------------------------------------------------------------------------------
+{
+    return NS_NewIOFileStream(
+        aResult,
+        inFile,
+        (PR_WRONLY | PR_CREATE_FILE | PR_TRUNCATE),
+        0700);
+}
+
+//----------------------------------------------------------------------------------------
+NS_BASE nsresult NS_NewIOFileStream(
+    nsISupports** aResult,
+    const nsFileSpec& inFile,
+    PRInt32 nsprMode /*default = (PR_WRONLY | PR_CREATE_FILE | PR_TRUNCATE)*/,
+    PRInt32 accessMode /*Default = 0700 (octal)*/)
+    // Factory method to get an object that implements both nsIInputStream
+    // and nsIOutputStream, associated with a file.
+//----------------------------------------------------------------------------------------
+{
+    NS_PRECONDITION(aResult != nsnull, "null ptr");
+    if (!aResult)
+        return NS_ERROR_NULL_POINTER;
+
+    FileImpl* stream = new FileImpl(inFile, nsprMode, accessMode);
+    if (! stream)
+        return NS_ERROR_OUT_OF_MEMORY;
+
+    NS_ADDREF(stream);
+    *aResult = (nsISupports*)(void*)stream;
+    return NS_OK;
+}
+
+//----------------------------------------------------------------------------------------
+NS_BASE nsresult NS_NewTypicalIOFileStream(
+    nsISupports** aResult,
+    const nsFileSpec& inFile
+    /*default nsprMode= (PR_RDWR | PR_CREATE_FILE)*/
+    /*Default accessMode= 0700 (octal)*/)
+    // Factory method to get an object that implements both nsIInputStream
+    // and nsIOutputStream, associated with a single file.
+//----------------------------------------------------------------------------------------
+{
+    return NS_NewIOFileStream(
+        aResult,
+        inFile,
+        (PR_RDWR | PR_CREATE_FILE),
+        0700);
+}
--- a/mozilla/base/src/nsIInputStream.h
+++ b/mozilla/base/src/nsIInputStream.h
@@ -28,6 +28,8 @@
 class nsIInputStream : public nsIBaseStream {
 public:

+    static const nsIID& IID() { static nsIID iid = NS_IINPUTSTREAM_IID; return iid; }
+
    /** Return the number of bytes in the stream
     *  @param aLength out parameter to hold the length
     *         of the stream. if an error occurs, the length
--- a/mozilla/base/src/nsIOutputStream.h
+++ b/mozilla/base/src/nsIOutputStream.h
@@ -29,6 +29,8 @@
 class nsIOutputStream : public nsIBaseStream {
 public:

+    static const nsIID& IID() { static nsIID iid = NS_IOUTPUTSTREAM_IID; return iid; }
+
    /** Write data into the stream.
     *  @param aBuf the buffer into which the data is read
     *  @param aOffset the start offset of the data
--- a/mozilla/base/src/nsIUnicharInputStream.h
+++ b/mozilla/base/src/nsIUnicharInputStream.h
@@ -25,11 +25,6 @@ class nsString;
 { 0x2d97fbf0, 0x93b5, 0x11d1,        \
  {0x89, 0x5b, 0x00, 0x60, 0x08, 0x91, 0x1b, 0x81} }

-#define NS_IB2UCONVERTER_IID  \
-{ 0x35e40290, 0x93b5, 0x11d1, \
-  {0x89, 0x5b, 0x00, 0x60, 0x08, 0x91, 0x1b, 0x81} }
-
-
 /** Abstract unicode character input stream
 *  @see nsIInputStream
 */
@@ -52,21 +47,6 @@ extern NS_BASE nsresult
  NS_NewStringUnicharInputStream(nsIUnicharInputStream** aInstancePtrResult,
                                 nsString* aString);

-/// Abstract interface for converting from bytes to unicode characters
-class nsIB2UConverter : public nsISupports {
-public:
-  /** aDstLen is updated to indicate how much data was translated into
-   * aDst; aSrcLen is updated to indicate how much data was used in
-   * the source buffer.
-   */
-  NS_IMETHOD Convert(PRUnichar* aDst,
-                     PRUint32 aDstOffset,
-                     PRUint32& aDstLen,
-                     const char* aSrc,
-                     PRUint32 aSrcOffset,
-                     PRUint32& aSrcLen) = 0;
-};
-
 /** Create a new nsUnicharInputStream that provides a converter for the
 * byte input stream aStreamToWrap. If no converter can be found then
 * nsnull is returned and the error code is set to
@@ -79,13 +59,4 @@ extern NS_BASE nsresult
                        PRInt32 aBufferSize = 0,
                        nsString* aCharSet = nsnull);

-/** Create a new nsB2UConverter for the given character set. When given
- * nsnull, the converter for iso-latin1 to unicode is provided. If no
- * converter can be found, nsnull is returned.
- */
-extern NS_BASE nsresult
-  NS_NewB2UConverter(nsIB2UConverter** aInstancePtrResult,
-                     nsISupports* aOuter,
-                     nsString* aCharSet = nsnull);
-
 #endif /* nsUnicharInputStream_h___ */
--- a/mozilla/base/src/nsProperties.cpp
+++ b/mozilla/base/src/nsProperties.cpp
@@ -32,7 +32,7 @@ class nsProperties : public nsIProperties
 {
 public:
  nsProperties();
-  ~nsProperties();
+  virtual ~nsProperties();

  NS_DECL_ISUPPORTS

@@ -61,9 +61,19 @@ nsProperties::nsProperties()
  mTable = nsnull;
 }

+PR_CALLBACK PRIntn
+FreeHashEntries(PLHashEntry* he, PRIntn i, void* arg)
+{
+  delete[] (PRUnichar*)he->key;
+  delete[] (PRUnichar*)he->value;
+  return HT_ENUMERATE_REMOVE;
+}
+
 nsProperties::~nsProperties()
 {
  if (mTable) {
+    // Free the PRUnicode* pointers contained in the hash table entries
+    PL_HashTableEnumerateEntries(mTable, FreeHashEntries, 0);
    PL_HashTableDestroy(mTable);
    mTable = nsnull;
  }
@@ -126,7 +136,8 @@ nsProperties::Load(nsIInputStream *aIn)
    }
  }
  mIn->Close();
-  mIn = nsnull;
+  NS_RELEASE(mIn);
+  NS_ASSERTION(!mIn, "unexpected remaining reference");

  return NS_OK;
 }
@@ -147,7 +158,11 @@ NS_IMETHODIMP
 nsProperties::SetProperty(const nsString& aKey, nsString& aNewValue,
  nsString& aOldValue)
 {
+  // XXX The ToNewCString() calls allocate memory using "new" so this code
+  // causes a memory leak...
+#if 0
  cout << "will add " << aKey.ToNewCString() << "=" << aNewValue.ToNewCString() << endl;
+#endif
  if (!mTable) {
    mTable = PL_NewHashTable(8, (PLHashFunction) HashKey,
      (PLHashComparator) CompareKeys,
@@ -157,16 +172,16 @@ nsProperties::SetProperty(const nsString& aKey, nsString& aNewValue,
    }
  }

-  PRUnichar *key = aKey.ToNewUnicode();
-  PRInt32 len;
+  const PRUnichar *key = aKey.GetUnicode();  // returns internal pointer (not a copy)
+  PRUint32 len;
  PRUint32 hashValue = nsCRT::HashValue(key, &len);
  PLHashEntry **hep = PL_HashTableRawLookup(mTable, hashValue, key);
  PLHashEntry *he = *hep;
  if (he && aOldValue) {
    // XXX fix me
  }
-  PL_HashTableRawAdd(mTable, hep, hashValue, key,
-    new nsString(aNewValue.ToNewUnicode()));
+  PL_HashTableRawAdd(mTable, hep, hashValue, aKey.ToNewUnicode(),
+                     aNewValue.ToNewUnicode());

  return NS_OK;
 }
@@ -190,13 +205,13 @@ nsProperties::Subclass(nsIProperties* aSubclass)
 NS_IMETHODIMP
 nsProperties::GetProperty(const nsString& aKey, nsString& aValue)
 {
-  PRUnichar *key = aKey;
-  PRInt32 len;
+  const PRUnichar *key = aKey;
+  PRUint32 len;
  PRUint32 hashValue = nsCRT::HashValue(key, &len);
  PLHashEntry **hep = PL_HashTableRawLookup(mTable, hashValue, key);
  PLHashEntry *he = *hep;
  if (he) {
-    ((nsString *) he->value)->Copy(aValue);
+    aValue = (const PRUnichar*)he->value;
    return NS_OK;
  }

@@ -247,6 +262,15 @@ nsProperties::SkipLine(PRInt32 c)
  return c;
 }

+nsPropertiesFactory::nsPropertiesFactory()
+{
+  NS_INIT_REFCNT();
+}
+
+nsPropertiesFactory::~nsPropertiesFactory()
+{
+}
+
 NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);

 NS_IMPL_ISUPPORTS(nsPropertiesFactory, kIFactoryIID);
--- a/mozilla/base/src/nsProperties.h
+++ b/mozilla/base/src/nsProperties.h
@@ -21,9 +21,12 @@

 #include "nsIFactory.h"

-class nsPropertiesFactory : nsIFactory
+class nsPropertiesFactory : public nsIFactory
 {
 public:
+  nsPropertiesFactory();
+  virtual ~nsPropertiesFactory();
+
  NS_DECL_ISUPPORTS

  NS_IMETHOD CreateInstance(nsISupports* aOuter, REFNSIID aIID,
--- a/mozilla/base/src/nsString.cpp
+++ b/mozilla/base/src/nsString.cpp
@@ -27,6 +27,11 @@
 #include "prdtoa.h"
 #include "nsISizeOfHandler.h"

+
+#include "nsUnicharUtilCIID.h"
+#include "nsIServiceManager.h"
+#include "nsICaseConversion.h"
+
 const PRInt32 kGrowthDelta = 8;
 const PRInt32 kNotFound = -1;
 PRUnichar gBadChar = 0;
@@ -96,6 +101,57 @@ public:
 };
 static CTableConstructor gTableConstructor;

+//---- XPCOM code to connect with UnicharUtil
+
+class HandleCaseConversionShutdown2 : public nsIShutdownListener {
+public :
+   NS_IMETHOD OnShutdown(const nsCID& cid, nsISupports* service);
+   HandleCaseConversionShutdown2(void) { NS_INIT_REFCNT(); }
+   virtual ~HandleCaseConversionShutdown2(void) {}
+   NS_DECL_ISUPPORTS
+};
+static NS_DEFINE_CID(kUnicharUtilCID, NS_UNICHARUTIL_CID);
+static NS_DEFINE_IID(kICaseConversionIID, NS_ICASECONVERSION_IID);
+
+static nsICaseConversion * gCaseConv = NULL; 
+
+static NS_DEFINE_IID(kIShutdownListenerIID, NS_ISHUTDOWNLISTENER_IID);
+NS_IMPL_ISUPPORTS(HandleCaseConversionShutdown2, kIShutdownListenerIID);
+
+nsresult
+HandleCaseConversionShutdown2::OnShutdown(const nsCID& cid, nsISupports* service)
+{
+    if (cid.Equals(kUnicharUtilCID)) {
+        NS_ASSERTION(service == gCaseConv, "wrong service!");
+        nsrefcnt cnt = gCaseConv->Release();
+        gCaseConv = NULL;
+    }
+    return NS_OK;
+}
+
+static HandleCaseConversionShutdown2* gListener = NULL;
+
+static void StartUpCaseConversion()
+{
+    nsresult err;
+
+    if ( NULL == gListener )
+    {
+      gListener = new HandleCaseConversionShutdown2();
+      gListener->AddRef();
+    }
+    err = nsServiceManager::GetService(kUnicharUtilCID, kICaseConversionIID,
+                                        (nsISupports**) &gCaseConv, gListener);
+}
+static void CheckCaseConversion()
+{
+    if(NULL == gCaseConv )
+      StartUpCaseConversion();
+
+    NS_ASSERTION( gCaseConv != NULL , "cannot obtain UnicharUtil");
+   
+}
+
 /***********************************************************************
  IMPLEMENTATION NOTES:

@@ -294,7 +350,7 @@ const PRUnichar* nsString::GetUnicode(void) const{
  return mStr;
 }

-nsString::operator PRUnichar*() const{
+nsString::operator const PRUnichar*() const{
  return mStr;
 }

@@ -431,6 +487,14 @@ nsString nsString::operator+(PRUnichar aChar) {
 */
 void nsString::ToLowerCase()
 {
+  // I18N code begin
+  CheckCaseConversion();
+  nsresult err = gCaseConv->ToLower(mStr, mStr, mLength);
+  if( NS_SUCCEEDED(err))
+    return;
+  // I18N code end
+
+  // somehow UnicharUtil return failed, fallback to the old ascii only code
  chartype* cp = mStr;
  chartype* end = cp + mLength;
  while (cp < end) {
@@ -448,6 +512,14 @@ void nsString::ToLowerCase()
 */
 void nsString::ToUpperCase()
 {
+  // I18N code begin
+  CheckCaseConversion();
+  nsresult err = gCaseConv->ToUpper(mStr, mStr, mLength);
+  if( NS_SUCCEEDED(err))
+    return;
+  // I18N code end
+
+  // somehow UnicharUtil return failed, fallback to the old ascii only code
  chartype* cp = mStr;
  chartype* end = cp + mLength;
  while (cp < end) {
@@ -468,7 +540,8 @@ void nsString::ToUCS2(PRInt32 aStartOffset){
    chartype* end = cp + mLength;
    while (cp < end) {
      unsigned char ch = (unsigned char)*cp;
-      *cp=gToUCS2[ch];
+      if( 0x0080 == (0xFFE0 & (*cp)) ) // limit to only 0x0080 to 0x009F
+        *cp=gToUCS2[ch];
      cp++;
    }
  }
@@ -486,6 +559,17 @@ void nsString::ToLowerCase(nsString& aOut) const
 {
  aOut.EnsureCapacityFor(mLength);
  aOut.mLength = mLength;
+
+  // I18N code begin
+  CheckCaseConversion();
+  nsresult err = gCaseConv->ToLower(mStr, aOut.mStr, mLength);
+  (*(aOut.mStr+mLength)) = 0;
+  if( NS_SUCCEEDED(err))
+    return;
+  // I18N code end
+
+  // somehow UnicharUtil return failed, fallback to the old ascii only code
+
  chartype* to = aOut.mStr;
  chartype* from = mStr;
  chartype* end = from + mLength;
@@ -509,6 +593,16 @@ void nsString::ToUpperCase(nsString& aOut) const
 {
  aOut.EnsureCapacityFor(mLength);
  aOut.mLength = mLength;
+
+  // I18N code begin
+  CheckCaseConversion();
+  nsresult err = gCaseConv->ToUpper(mStr, aOut.mStr, mLength);
+  (*(aOut.mStr+mLength)) = 0;
+  if( NS_SUCCEEDED(err))
+    return;
+  // I18N code end
+
+  // somehow UnicharUtil return failed, fallback to the old ascii only code
  chartype* to = aOut.mStr;
  chartype* from = mStr;
  chartype* end = from + mLength;
@@ -664,10 +758,11 @@ PRInt32 nsString::ToInteger(PRInt32* aErrorCode,PRInt32 aRadix) const {
      result=-result;
      break;
    }
-    else if('+'==theChar) { //stop in a good state if you see this...
+    else if(('+'==theChar) || (' '==theChar)) { //stop in a good state if you see this...
      break;
    }
-    else if(' '==theChar){ //stop in a good state if you see this...
+    else if((('x'==theChar) || ('X'==theChar)) && (16==aRadix)) {  
+      //stop in a good state.
      break;
    }
    else{
@@ -1264,12 +1359,13 @@ nsString& nsString::Trim(const char* aTrimSet,
 nsString& nsString::CompressWhitespace( PRBool aEliminateLeading,
                                              PRBool aEliminateTrailing)
 {
+  
+  Trim(" \r\n\t",aEliminateLeading,aEliminateTrailing);
+
  PRUnichar* from = mStr;
  PRUnichar* end = mStr + mLength;
  PRUnichar* to = from;

-  Trim(" \r\n\t",aEliminateLeading,aEliminateTrailing);
-
    //this code converts /n, /t, /r into normal space ' ';
    //it also eliminates runs of whitespace...
  while (from < end) {
@@ -1305,6 +1401,28 @@ nsString& nsString::StripWhitespace()
  return StripChars("\r\t\n");
 }

+/**
+ *  This method is used to replace all occurances of the
+ *  given source char with the given dest char
+ *  
+ *  @param  
+ *  @return *this 
+ */
+nsString& nsString::ReplaceChar(PRUnichar aSourceChar, PRUnichar aDestChar) {
+  PRUnichar* from = mStr;
+  PRUnichar* end = mStr + mLength;
+
+  while (from < end) {
+    PRUnichar ch = *from;
+    if(ch==aSourceChar) {
+      *from = aDestChar;
+    }
+    from++;
+  }
+
+  return *this;
+}
+
 /**
 *  Search for given character within this string.
 *  This method does so by using a binary search,
@@ -1681,6 +1799,7 @@ PRInt32 nsString::Compare(const PRUnichar* aString,PRBool aIgnoreCase,PRInt32 aL
 PRBool nsString::operator==(const nsString &S) const {return Equals(S);}      
 PRBool nsString::operator==(const char *s) const {return Equals(s);}
 PRBool nsString::operator==(const PRUnichar *s) const {return Equals(s);}
+PRBool nsString::operator==(PRUnichar *s) const {return Equals(s);}
 PRBool nsString::operator!=(const nsString &S) const {return PRBool(Compare(S)!=0);}
 PRBool nsString::operator!=(const char *s) const {return PRBool(Compare(s)!=0);}
 PRBool nsString::operator!=(const PRUnichar *s) const {return PRBool(Compare(s)!=0);}
@@ -2032,7 +2151,6 @@ ostream& operator<<(ostream& os,nsAutoString& aString){
 }


-
 /**
 * 
 * @update	gess 7/27/98
@@ -2052,7 +2170,7 @@ NS_BASE int fputs(const nsString& aString, FILE* out)
  if(len>0)
    ::fwrite(cp, 1, len, out);
  if (cp != buf) {
-    delete cp;
+    delete [] cp;
  }
  return (int) len;
 }
--- a/mozilla/base/src/nsString.h
+++ b/mozilla/base/src/nsString.h
@@ -136,7 +136,7 @@ const PRUnichar* GetUnicode(void) const;
 * @param 
 * @return
 */
-operator PRUnichar*() const;
+operator const PRUnichar*() const;

 /**
 * Retrieve unicode char at given index
@@ -499,6 +499,15 @@ nsString& Cut(PRInt32 anOffset,PRInt32 aCount);
 */
 nsString& StripChars(const char* aSet);

+/**
+ *  This method is used to replace all occurances of the
+ *  given source char with the given dest char
+ *  
+ *  @param  
+ *  @return *this 
+ */
+nsString& ReplaceChar(PRUnichar aSourceChar, PRUnichar aDestChar);
+
 /**
 *  This method strips whitespace throughout the string
 *  
@@ -648,6 +657,7 @@ virtual PRInt32 Compare(const PRUnichar *aString,PRBool aIgnoreCase=PR_FALSE,PRI
 PRBool  operator==(const nsString &aString) const;
 PRBool  operator==(const char *aString) const;
 PRBool  operator==(const PRUnichar* aString) const;
+PRBool  operator==(PRUnichar* aString) const;

 /**
 * These methods perform a !compare of a given string type to this 
@@ -776,6 +786,7 @@ public:
  virtual       ~nsAutoString();

  nsAutoString& operator=(const nsString& aString) {nsString::operator=(aString); return *this;}
+  nsAutoString& operator=(const nsAutoString& aString) {nsString::operator=(aString); return *this;}
  nsAutoString& operator=(const char* aCString) {nsString::operator=(aCString); return *this;}
  nsAutoString& operator=(char aChar) {nsString::operator=(aChar); return *this;}
  nsAutoString& operator=(const PRUnichar* aBuffer) {nsString::operator=(aBuffer); return *this;}
--- a/mozilla/base/src/nsTime.h
+++ b/mozilla/base/src/nsTime.h
@@ -44,6 +44,18 @@ public:
    nsTime(void) : mValue(PR_Now()) {
    }

+    /**
+     * Construct the time from a string.
+     */
+    nsTime(const char* dateStr, PRBool defaultToGMT) {
+        PRInt64 time;
+        PRStatus status = PR_ParseTimeString(dateStr, defaultToGMT, &time);
+        if (status == PR_SUCCESS)
+            mValue = time;
+        else
+            mValue = LL_ZERO;
+    }
+
    /**
     * Construct a time from a PRTime.
     */
--- a/mozilla/base/src/nsUnicharInputStream.cpp
+++ b/mozilla/base/src/nsUnicharInputStream.cpp
@@ -15,9 +15,14 @@
 * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 * Reserved.
 */
+
+#define NS_IMPL_IDS
 #include "nsIUnicharInputStream.h"
 #include "nsIByteBuffer.h"
 #include "nsIUnicharBuffer.h"
+#include "nsIServiceManager.h"
+#include "nsICharsetConverterManager.h"
+#include "nsIUnicodeDecoder.h"
 #include "nsString.h"
 #include "nsCRT.h"
 #include <fcntl.h>
@@ -115,66 +120,36 @@ NS_NewStringUnicharInputStream(nsIUnicharInputStream** aInstancePtrResult,

 //----------------------------------------------------------------------

-class IsoLatin1Converter : public nsIB2UConverter {
-public:
-  IsoLatin1Converter();
+/**
+ * This function used to be public, with the NS_BASE declaration. I am 
+ * changing it right now into a module private visibility because there are
+ * better and more xpcom-like ways to get a Converter.
+ */

-  NS_DECL_ISUPPORTS
-  NS_IMETHOD Convert(PRUnichar* aDst,
-                     PRUint32 aDstOffset,
-                     PRUint32& aDstLen,
-                     const char* aSrc,
-                     PRUint32 aSrcOffset,
-                     PRUint32& aSrcLen);
-};
-
-IsoLatin1Converter::IsoLatin1Converter()
-{
-  NS_INIT_REFCNT();
-}
-
-NS_DEFINE_IID(kIB2UConverterIID, NS_IB2UCONVERTER_IID);
-NS_IMPL_ISUPPORTS(IsoLatin1Converter,kIB2UConverterIID);
-
-nsresult IsoLatin1Converter::Convert(PRUnichar* aDst,
-                                    PRUint32 aDstOffset,
-                                    PRUint32& aDstLen,
-                                    const char* aSrc,
-                                    PRUint32 aSrcOffset,
-                                    PRUint32& aSrcLen)
-{
-  PRUint32 amount = aSrcLen;
-  if (aSrcLen > aDstLen) {
-    amount = aDstLen;
-  }
-  const char* end = aSrc + amount;
-  while (aSrc < end) {
-    PRUint8 isoLatin1 = PRUint8(*aSrc++);
-    /* XXX insert table based lookup converter here */
-    *aDst++ = isoLatin1;
-  }
-  aDstLen = amount;
-  aSrcLen = amount;
-  return NS_OK;
-}
-
-NS_BASE nsresult
-NS_NewB2UConverter(nsIB2UConverter** aInstancePtrResult,
+nsresult NS_NewB2UConverter(nsIUnicodeDecoder** aInstancePtrResult, nsISupports* aOuter, nsString* aCharSet);
+nsresult
+NS_NewB2UConverter(nsIUnicodeDecoder** aInstancePtrResult,
                   nsISupports* aOuter,
                   nsString* aCharSet)
 {
  if (nsnull != aOuter) {
    return NS_ERROR_NO_AGGREGATION;
  }
-  // We cannot use enum to pass charset id
-  if ((nsnull != aCharSet) && (! aCharSet->EqualsIgnoreCase( "iso-8859-1" ))){
-      return NS_BASE_STREAM_NO_CONVERTER;
-  }
-  IsoLatin1Converter* it = new IsoLatin1Converter();
-  if (nsnull == it) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-  return it->QueryInterface(kIB2UConverterIID, (void**)aInstancePtrResult);
+
+  // Create converter
+  nsresult res;
+  nsICharsetConverterManager * ccm;
+  nsAutoString defaultCharset("ISO-8859-1");
+
+  if (aCharSet == nsnull) aCharSet = &defaultCharset;
+  res = nsServiceManager::GetService(kCharsetConverterManagerCID, 
+      kICharsetConverterManagerIID, (nsISupports**)&ccm);
+  if (NS_FAILED(res)) return res;
+
+  res = ccm->GetUnicodeDecoder(aCharSet, aInstancePtrResult);
+  nsServiceManager::ReleaseService(kCharsetConverterManagerCID, ccm);
+
+  return res;
 }

 //----------------------------------------------------------------------
@@ -182,7 +157,7 @@ NS_NewB2UConverter(nsIB2UConverter** aInstancePtrResult,
 class ConverterInputStream : public nsIUnicharInputStream {
 public:
  ConverterInputStream(nsIInputStream* aStream,
-                       nsIB2UConverter* aConverter,
+                       nsIUnicodeDecoder* aConverter,
                       PRUint32 aBufSize);
  ~ConverterInputStream();

@@ -197,7 +172,7 @@ protected:
  PRInt32 Fill(nsresult * aErrorCode);

  nsIInputStream* mInput;
-  nsIB2UConverter* mConverter;
+  nsIUnicodeDecoder* mConverter;
  nsIByteBuffer* mByteData;
  PRUint32 mByteDataOffset;
  nsIUnicharBuffer* mUnicharData;
@@ -206,7 +181,7 @@ protected:
 };

 ConverterInputStream::ConverterInputStream(nsIInputStream* aStream,
-                                           nsIB2UConverter* aConverter,
+                                           nsIUnicodeDecoder* aConverter,
                                           PRUint32 aBufferSize)
 {
  NS_INIT_REFCNT();
@@ -300,10 +275,10 @@ PRInt32 ConverterInputStream::Fill(nsresult * aErrorCode)
  NS_ASSERTION(remainder + nb == mByteData->GetLength(), "bad nb");

  // Now convert as much of the byte buffer to unicode as possible
-  PRUint32 dstLen = mUnicharData->GetBufferSize();
-  PRUint32 srcLen = remainder + nb;
-  *aErrorCode = mConverter->Convert(mUnicharData->GetBuffer(), 0, dstLen,
-                                    mByteData->GetBuffer(), 0, srcLen);
+  PRInt32 dstLen = mUnicharData->GetBufferSize();
+  PRInt32 srcLen = remainder + nb;
+  *aErrorCode = mConverter->Convert(mUnicharData->GetBuffer(), 0, &dstLen,
+                                    mByteData->GetBuffer(), 0, &srcLen);
  mUnicharDataOffset = 0;
  mUnicharDataLength = dstLen;
  mByteDataOffset += srcLen;
@@ -323,7 +298,7 @@ NS_NewConverterStream(nsIUnicharInputStream** aInstancePtrResult,
  }

  // Create converter
-  nsIB2UConverter* converter;
+  nsIUnicodeDecoder* converter;
  nsresult rv = NS_NewB2UConverter(&converter, nsnull, aCharSet);
  if (NS_OK != rv) {
    return rv;
@@ -332,7 +307,7 @@ NS_NewConverterStream(nsIUnicharInputStream** aInstancePtrResult,
  // Create converter input stream
  ConverterInputStream* it =
    new ConverterInputStream(aStreamToWrap, converter, aBufferSize);
-  converter->Release();
+  NS_RELEASE(converter);
  if (nsnull == it) {
    return NS_ERROR_OUT_OF_MEMORY;
  }
--- a/mozilla/base/src/nscore.h
+++ b/mozilla/base/src/nscore.h
@@ -146,12 +146,12 @@ typedef PRUcs2 PRUnichar;
 /* ------------------------------------------------------------------------ */
 // Casting macros for hiding C++ features from older compilers

-#define HAS_C_PLUS_PLUS_CASTS // we'll be optimistic.
-#if defined(__sgi) && !defined(__GNUC__)
-#undef HAS_C_PLUS_PLUS_CASTS
+// unix now determines this automatically
+#ifndef XP_UNIX
+#define HAVE_CPP_NEW_CASTS // we'll be optimistic.
 #endif

-#if defined(HAS_C_PLUS_PLUS_CASTS)
+#if defined(HAVE_CPP_NEW_CASTS)
 #define NS_STATIC_CAST(__type, __ptr)      static_cast<__type>(__ptr)
 #define NS_CONST_CAST(__type, __ptr)       const_cast<__type>(__ptr)
 #define NS_REINTERPRET_CAST(__type, __ptr) reinterpret_cast<__type>(__ptr)
@@ -164,5 +164,8 @@ typedef PRUcs2 PRUnichar;
 // No sense in making an NS_DYNAMIC_CAST() macro: you can't duplicate
 // the semantics. So if you want to dynamic_cast, then just use it
 // "straight", no macro.
+#if defined(AIX)
+#define explicit
+#endif

 #endif /* nscore_h___ */
--- a/mozilla/base/src/rhapsody/nsCaretProperties.cpp
+++ b/mozilla/base/src/rhapsody/nsCaretProperties.cpp
@@ -0,0 +1,39 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+
+#include "nscore.h"
+
+#include "nsCaretProperties.h"
+
+
+
+//-----------------------------------------------------------------------------
+nsCaretProperties::nsCaretProperties()
+:	mCaretWidth(eDefaultCaretWidth)
+,	mBlinkRate(eDefaulBlinkRate)
+{
+	// in your platform-specific class, get data from the OS in your constructor
+}
+
+
+//-----------------------------------------------------------------------------
+nsCaretProperties* NewCaretProperties()
+{
+	return new nsCaretProperties();
+}
--- a/mozilla/base/src/unix/nsFileSpecUnix.cpp
+++ b/mozilla/base/src/unix/nsFileSpecUnix.cpp
@@ -25,9 +25,10 @@
 #include <dirent.h>
 #include <unistd.h>
 #include <stdlib.h>
+#include "nsError.h"

 //----------------------------------------------------------------------------------------
-void nsFileSpecHelpers::Canonify(char*& ioPath, bool inMakeDirs)
+void nsFileSpecHelpers::Canonify(char*& ioPath, PRBool inMakeDirs)
 // Canonify, make absolute, and check whether directories exist
 //----------------------------------------------------------------------------------------
 {
@@ -76,75 +77,78 @@ void nsFileSpecHelpers::Canonify(char*& ioPath, bool inMakeDirs)
 } // nsFileSpecHelpers::Canonify

 //----------------------------------------------------------------------------------------
-void nsNativeFileSpec::SetLeafName(const char* inLeafName)
+void nsFileSpec::SetLeafName(const char* inLeafName)
 //----------------------------------------------------------------------------------------
 {
    nsFileSpecHelpers::LeafReplace(mPath, '/', inLeafName);
-} // nsNativeFileSpec::SetLeafName
+} // nsFileSpec::SetLeafName

 //----------------------------------------------------------------------------------------
-char* nsNativeFileSpec::GetLeafName() const
+char* nsFileSpec::GetLeafName() const
 //----------------------------------------------------------------------------------------
 {
    return nsFileSpecHelpers::GetLeaf(mPath, '/');
-} // nsNativeFileSpec::GetLeafName
+} // nsFileSpec::GetLeafName

 //----------------------------------------------------------------------------------------
-bool nsNativeFileSpec::Exists() const
+PRBool nsFileSpec::Exists() const
 //----------------------------------------------------------------------------------------
 {
    struct stat st;
    return 0 == stat(mPath, &st); 
-} // nsNativeFileSpec::Exists
+} // nsFileSpec::Exists

 //----------------------------------------------------------------------------------------
-bool nsNativeFileSpec::IsFile() const
+PRBool nsFileSpec::IsFile() const
 //----------------------------------------------------------------------------------------
 {
    struct stat st;
    return 0 == stat(mPath, &st) && S_ISREG(st.st_mode); 
-} // nsNativeFileSpec::IsFile
+} // nsFileSpec::IsFile

 //----------------------------------------------------------------------------------------
-bool nsNativeFileSpec::IsDirectory() const
+PRBool nsFileSpec::IsDirectory() const
 //----------------------------------------------------------------------------------------
 {
    struct stat st;
    return 0 == stat(mPath, &st) && S_ISDIR(st.st_mode); 
-} // nsNativeFileSpec::IsDirectory
+} // nsFileSpec::IsDirectory

 //----------------------------------------------------------------------------------------
-void nsNativeFileSpec::GetParent(nsNativeFileSpec& outSpec) const
+void nsFileSpec::GetParent(nsFileSpec& outSpec) const
 //----------------------------------------------------------------------------------------
 {
    nsFileSpecHelpers::StringAssign(outSpec.mPath, mPath);
    char* cp = strrchr(outSpec.mPath, '/');
    if (cp)
        *cp = '\0';
-} // nsNativeFileSpec::GetParent
+} // nsFileSpec::GetParent

 //----------------------------------------------------------------------------------------
-void nsNativeFileSpec::operator += (const char* inRelativePath)
+void nsFileSpec::operator += (const char* inRelativePath)
 //----------------------------------------------------------------------------------------
 {
    if (!inRelativePath || !mPath)
        return;
    
-    if (mPath[strlen(mPath) - 1] != '/')
-        char* newPath = nsFileSpecHelpers::ReallocCat(mPath, "/");
+    char endChar = mPath[strlen(mPath) - 1];
+    if (endChar == '/')
+        nsFileSpecHelpers::ReallocCat(mPath, "x");
+    else
+        nsFileSpecHelpers::ReallocCat(mPath, "/x");
    SetLeafName(inRelativePath);
-} // nsNativeFileSpec::operator +=
+} // nsFileSpec::operator +=

 //----------------------------------------------------------------------------------------
-void nsNativeFileSpec::CreateDirectory(int mode)
+void nsFileSpec::CreateDirectory(int mode)
 //----------------------------------------------------------------------------------------
 {
    // Note that mPath is canonical!
    mkdir(mPath, mode);
-} // nsNativeFileSpec::CreateDirectory
+} // nsFileSpec::CreateDirectory

 //----------------------------------------------------------------------------------------
-void nsNativeFileSpec::Delete(bool inRecursive)
+void nsFileSpec::Delete(PRBool inRecursive) const
 // To check if this worked, call Exists() afterwards, see?
 //----------------------------------------------------------------------------------------
 {
@@ -152,9 +156,9 @@ void nsNativeFileSpec::Delete(bool inRecursive)
    {
        if (inRecursive)
        {
-            for (nsDirectoryIterator i(*this); i; i++)
+            for (nsDirectoryIterator i(*this); i.Exists(); i++)
            {
-                nsNativeFileSpec& child = (nsNativeFileSpec&)i;
+                nsFileSpec& child = (nsFileSpec&)i;
                child.Delete(inRecursive);
            }        
        }
@@ -162,7 +166,151 @@ void nsNativeFileSpec::Delete(bool inRecursive)
    }
    else
        remove(mPath);
-} // nsNativeFileSpec::Delete
+} // nsFileSpec::Delete
+
+
+
+//----------------------------------------------------------------------------------------
+nsresult nsFileSpec::Rename(const char* inNewName)
+//----------------------------------------------------------------------------------------
+{
+    // This function should not be used to move a file on disk. 
+    if (strchr(inNewName, '/')) 
+        return NS_FILE_FAILURE;
+
+    if (PR_Rename(mPath, inNewName) != 0)
+    {
+        return NS_FILE_FAILURE;
+    }
+    SetLeafName(inNewName);
+    return NS_OK;
+} // nsFileSpec::Rename
+
+//----------------------------------------------------------------------------------------
+static int CrudeFileCopy(const char* in, const char* out)
+//----------------------------------------------------------------------------------------
+{
+	struct stat in_stat;
+	int stat_result = -1;
+
+	char	buf [1024];
+	FILE	*ifp, *ofp;
+	int	rbytes, wbytes;
+
+	if (!in || !out)
+		return -1;
+
+	stat_result = stat (in, &in_stat);
+
+	ifp = fopen (in, "r");
+	if (!ifp) 
+	{
+		return -1;
+	}
+
+	ofp = fopen (out, "w");
+	if (!ofp)
+	{
+		fclose (ifp);
+		return -1;
+	}
+
+	while ((rbytes = fread (buf, 1, sizeof(buf), ifp)) > 0)
+	{
+		while (rbytes > 0)
+		{
+			if ( (wbytes = fwrite (buf, 1, rbytes, ofp)) < 0 )
+			{
+				fclose (ofp);
+				fclose (ifp);
+				unlink(out);
+				return -1;
+			}
+			rbytes -= wbytes;
+		}
+	}
+	fclose (ofp);
+	fclose (ifp);
+
+	if (stat_result == 0)
+		{
+		chmod (out, in_stat.st_mode & 0777);
+		}
+
+	return 0;
+} // nsFileSpec::Rename
+
+//----------------------------------------------------------------------------------------
+nsresult nsFileSpec::Copy(const nsFileSpec& inParentDirectory) const
+//----------------------------------------------------------------------------------------
+{
+    // We can only copy into a directory, and (for now) can not copy entire directories
+    nsresult result = NS_FILE_FAILURE;
+
+    if (inParentDirectory.IsDirectory() && (! IsDirectory() ) )
+    {
+        char *leafname = GetLeafName();
+        char* destPath = nsFileSpecHelpers::StringDup(inParentDirectory,  ( strlen(inParentDirectory) + 1 + strlen(leafname) ) );
+        strcat(destPath, "/");
+        strcat(destPath, leafname);
+        delete [] leafname;
+
+        result = NS_FILE_RESULT(CrudeFileCopy(*this, destPath));
+        
+        delete [] destPath;
+    }
+    return result;
+} // nsFileSpec::Copy
+
+//----------------------------------------------------------------------------------------
+nsresult nsFileSpec::Move(const nsFileSpec& inNewParentDirectory) const
+//----------------------------------------------------------------------------------------
+{
+    // We can only copy into a directory, and (for now) can not copy entire directories
+    nsresult result = NS_FILE_FAILURE;
+
+    if (inNewParentDirectory.IsDirectory() && (! IsDirectory() ) )
+    {
+        char *leafname = GetLeafName();
+        char* destPath
+            = nsFileSpecHelpers::StringDup(
+                inNewParentDirectory,
+                strlen(inNewParentDirectory) + 1 + strlen(leafname));
+        strcat(destPath, "/");
+        strcat(destPath, leafname);
+        delete [] leafname;
+
+        result = NS_FILE_RESULT(CrudeFileCopy(*this, destPath));
+        if (result == NS_OK)
+	{
+    // cast to fix const-ness
+		((nsFileSpec*)this)->Delete(PR_FALSE);
+	}
+	delete [] destPath;
+    }
+    return result;
+} 
+
+//----------------------------------------------------------------------------------------
+nsresult nsFileSpec::Execute(const char* inArgs ) const
+//----------------------------------------------------------------------------------------
+{
+    nsresult result = NS_FILE_FAILURE;
+    
+    if (! IsDirectory())
+    {
+        char* fileNameWithArgs
+	        = nsFileSpecHelpers::StringDup(mPath, strlen(mPath) + 1 + strlen(inArgs));
+        strcat(fileNameWithArgs, " ");
+        strcat(fileNameWithArgs, inArgs);
+
+        result = NS_FILE_RESULT(system(fileNameWithArgs));
+        delete [] fileNameWithArgs; 
+    } 
+
+    return result;
+
+} // nsFileSpec::Execute

 //========================================================================================
 //                                nsDirectoryIterator
@@ -170,12 +318,12 @@ void nsNativeFileSpec::Delete(bool inRecursive)

 //----------------------------------------------------------------------------------------
 nsDirectoryIterator::nsDirectoryIterator(
-    const nsNativeFileSpec& inDirectory
+    const nsFileSpec& inDirectory
 ,    int inIterateDirection)
 //----------------------------------------------------------------------------------------
    : mCurrent(inDirectory)
+    , mExists(PR_FALSE)
    , mDir(nsnull)
-    , mExists(false)
 {
    mCurrent += "sysygy"; // prepare the path for SetLeafName
    mDir = opendir((const char*)nsFilePath(inDirectory));
@@ -194,7 +342,7 @@ nsDirectoryIterator::~nsDirectoryIterator()
 nsDirectoryIterator& nsDirectoryIterator::operator ++ ()
 //----------------------------------------------------------------------------------------
 {
-    mExists = false;
+    mExists = PR_FALSE;
    if (!mDir)
        return *this;
    char* dot    = ".";
@@ -206,7 +354,7 @@ nsDirectoryIterator& nsDirectoryIterator::operator ++ ()
        entry = readdir(mDir);
    if (entry)
    {
-        mExists = true;
+        mExists = PR_TRUE;
        mCurrent.SetLeafName(entry->d_name);
    }
    return *this;
--- a/mozilla/base/src/windows/makefile.win
+++ b/mozilla/base/src/windows/makefile.win
@@ -23,9 +23,13 @@ LIBRARY_NAME=gmbase
 MODULE=raptor 
 REQUIRES=xpcom raptor 

-CPPSRCS=nsTimer.cpp 
-
-CPP_OBJS=.\$(OBJDIR)\nsTimer.obj 
+CPPSRCS=	nsTimer.cpp 						\
+					nsCaretProperties.cpp		\
+					$(NULL)
+					
+CPP_OBJS=	.\$(OBJDIR)\nsTimer.obj 						\
+					.\$(OBJDIR)\nsCaretProperties.obj 	\
+					$(NULL)

 LINCS=-I$(XPDIST)\public\xpcom -I$(XPDIST)\public\raptor 

@@ -38,3 +42,4 @@ include <$(DEPTH)\config\rules.mak>

 libs:: $(OBJS)
 	$(MAKE_INSTALL) $(OBJDIR)\nsTimer.obj ..\$(OBJDIR)
+	$(MAKE_INSTALL) $(OBJDIR)\nsCaretProperties.obj ..\$(OBJDIR)
--- a/mozilla/base/src/windows/nsCaretProperties.cpp
+++ b/mozilla/base/src/windows/nsCaretProperties.cpp
@@ -0,0 +1,40 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+
+#include "nscore.h"
+
+#include "nsCaretProperties.h"
+
+
+
+//-----------------------------------------------------------------------------
+nsCaretProperties::nsCaretProperties()
+:	mCaretWidth(eDefaultCaretWidth)
+,	mBlinkRate(eDefaulBlinkRate)
+{
+	// in your platform-specific class, get data from the OS in your constructor
+	mCaretWidth = 2;			// 2 pixel caret on Windows
+}
+
+
+//-----------------------------------------------------------------------------
+nsCaretProperties* NewCaretProperties()
+{
+	return new nsCaretProperties();
+}
--- a/mozilla/base/src/windows/nsFileSpecWin.cpp
+++ b/mozilla/base/src/windows/nsFileSpecWin.cpp
@@ -23,9 +23,18 @@
 #include <direct.h>
 #include <stdlib.h>
 #include "prio.h"
+#include "nsError.h"
+
+#include "windows.h"
+
+#ifdef UNICODE
+#define CreateDirectoryW  CreateDirectory
+#else
+#define CreateDirectoryA  CreateDirectory
+#endif 

 //----------------------------------------------------------------------------------------
-void nsFileSpecHelpers::Canonify(char*& ioPath, bool inMakeDirs)
+void nsFileSpecHelpers::Canonify(char*& ioPath, PRBool inMakeDirs)
 // Canonify, make absolute, and check whether directories exist. This
 // takes a (possibly relative) native path and converts it into a
 // fully qualified native path.
@@ -125,7 +134,7 @@ void nsFileSpecHelpers::NativeToUnix(char*& ioPath)
 }

 //----------------------------------------------------------------------------------------
-nsNativeFileSpec::nsNativeFileSpec(const nsFilePath& inPath)
+nsFileSpec::nsFileSpec(const nsFilePath& inPath)
 //----------------------------------------------------------------------------------------
 :	mPath(NULL)
 {
@@ -133,15 +142,16 @@ nsNativeFileSpec::nsNativeFileSpec(const nsFilePath& inPath)
 }

 //----------------------------------------------------------------------------------------
-void nsNativeFileSpec::operator = (const nsFilePath& inPath)
+void nsFileSpec::operator = (const nsFilePath& inPath)
 //----------------------------------------------------------------------------------------
 {
 	nsFileSpecHelpers::StringAssign(mPath, (const char*)inPath);
 	nsFileSpecHelpers::UnixToNative(mPath);
-} // nsNativeFileSpec::operator =
+	mError = NS_OK;
+} // nsFileSpec::operator =

 //----------------------------------------------------------------------------------------
-nsFilePath::nsFilePath(const nsNativeFileSpec& inSpec)
+nsFilePath::nsFilePath(const nsFileSpec& inSpec)
 //----------------------------------------------------------------------------------------
 :	mPath(NULL)
 {
@@ -149,7 +159,7 @@ nsFilePath::nsFilePath(const nsNativeFileSpec& inSpec)
 } // nsFilePath::nsFilePath

 //----------------------------------------------------------------------------------------
-void nsFilePath::operator = (const nsNativeFileSpec& inSpec)
+void nsFilePath::operator = (const nsFileSpec& inSpec)
 //----------------------------------------------------------------------------------------
 {
 	nsFileSpecHelpers::StringAssign(mPath, inSpec.mPath);
@@ -157,94 +167,195 @@ void nsFilePath::operator = (const nsNativeFileSpec& inSpec)
 } // nsFilePath::operator =

 //----------------------------------------------------------------------------------------
-void nsNativeFileSpec::SetLeafName(const char* inLeafName)
+void nsFileSpec::SetLeafName(const char* inLeafName)
 //----------------------------------------------------------------------------------------
 {
 	nsFileSpecHelpers::LeafReplace(mPath, '\\', inLeafName);
-} // nsNativeFileSpec::SetLeafName
+} // nsFileSpec::SetLeafName

 //----------------------------------------------------------------------------------------
-char* nsNativeFileSpec::GetLeafName() const
+char* nsFileSpec::GetLeafName() const
 //----------------------------------------------------------------------------------------
 {
 	return nsFileSpecHelpers::GetLeaf(mPath, '\\');
-} // nsNativeFileSpec::GetLeafName
+} // nsFileSpec::GetLeafName

 //----------------------------------------------------------------------------------------
-bool nsNativeFileSpec::Exists() const
+PRBool nsFileSpec::Exists() const
 //----------------------------------------------------------------------------------------
 {
 	struct stat st;
 	return 0 == stat(mPath, &st); 
-} // nsNativeFileSpec::Exists
+} // nsFileSpec::Exists

 //----------------------------------------------------------------------------------------
-bool nsNativeFileSpec::IsFile() const
+PRBool nsFileSpec::IsFile() const
 //----------------------------------------------------------------------------------------
 {
  struct stat st;
  return 0 == stat(mPath, &st) && (_S_IFREG & st.st_mode); 
-} // nsNativeFileSpec::IsFile
+} // nsFileSpec::IsFile

 //----------------------------------------------------------------------------------------
-bool nsNativeFileSpec::IsDirectory() const
+PRBool nsFileSpec::IsDirectory() const
 //----------------------------------------------------------------------------------------
 {
 	struct stat st;
 	return 0 == stat(mPath, &st) && (_S_IFDIR & st.st_mode); 
-} // nsNativeFileSpec::IsDirectory
+} // nsFileSpec::IsDirectory

 //----------------------------------------------------------------------------------------
-void nsNativeFileSpec::GetParent(nsNativeFileSpec& outSpec) const
+void nsFileSpec::GetParent(nsFileSpec& outSpec) const
 //----------------------------------------------------------------------------------------
 {
 	nsFileSpecHelpers::StringAssign(outSpec.mPath, mPath);
 	char* cp = strrchr(outSpec.mPath, '\\');
 	if (cp)
 		*cp = '\0';
-} // nsNativeFileSpec::GetParent
+} // nsFileSpec::GetParent

 //----------------------------------------------------------------------------------------
-void nsNativeFileSpec::operator += (const char* inRelativePath)
+void nsFileSpec::operator += (const char* inRelativePath)
 //----------------------------------------------------------------------------------------
 {
 	if (!inRelativePath || !mPath)
 		return;
 	
-	if (mPath[strlen(mPath) - 1] != '\\')
-		char* newPath = nsFileSpecHelpers::ReallocCat(mPath, "\\");
+	if (mPath[strlen(mPath) - 1] == '\\')
+		nsFileSpecHelpers::ReallocCat(mPath, "x");
+	else
+		nsFileSpecHelpers::ReallocCat(mPath, "\\x");
 	SetLeafName(inRelativePath);
-} // nsNativeFileSpec::operator +=
+} // nsFileSpec::operator +=

 //----------------------------------------------------------------------------------------
-void nsNativeFileSpec::CreateDirectory(int /*mode*/)
+void nsFileSpec::CreateDirectory(int /*mode*/)
 //----------------------------------------------------------------------------------------
 {
 	// Note that mPath is canonical!
 	mkdir(mPath);
-} // nsNativeFileSpec::CreateDirectory
+} // nsFileSpec::CreateDirectory

 //----------------------------------------------------------------------------------------
-void nsNativeFileSpec::Delete(bool inRecursive)
+void nsFileSpec::Delete(PRBool inRecursive) const
 //----------------------------------------------------------------------------------------
 {
-  if (IsDirectory())
+    if (IsDirectory())
    {
 	    if (inRecursive)
        {
-          for (nsDirectoryIterator i(*this); i; i++)
-            {
-              nsNativeFileSpec& child = (nsNativeFileSpec&)i;
-              child.Delete(inRecursive);
-            }		
+            for (nsDirectoryIterator i(*this); i.Exists(); i++)
+                {
+                    nsFileSpec& child = (nsFileSpec&)i;
+                    child.Delete(inRecursive);
+                }		
        }
 	    rmdir(mPath);
    }
 	else
    {
-      remove(mPath);
+        remove(mPath);
    }
-} // nsNativeFileSpec::Delete
+} // nsFileSpec::Delete
+
+
+//----------------------------------------------------------------------------------------
+nsresult nsFileSpec::Rename(const char* inNewName)
+//----------------------------------------------------------------------------------------
+{
+    // This function should not be used to move a file on disk. 
+    if (strchr(inNewName, '/')) 
+        return NS_FILE_FAILURE;
+
+    if (PR_Rename(*this, inNewName) != NS_OK)
+    {
+        return NS_FILE_FAILURE;
+    }
+    SetLeafName(inNewName);
+    return NS_OK;
+} // nsFileSpec::Rename
+
+//----------------------------------------------------------------------------------------
+nsresult nsFileSpec::Copy(const nsFileSpec& inParentDirectory) const
+//----------------------------------------------------------------------------------------
+{
+    // We can only copy into a directory, and (for now) can not copy entire directories
+
+    if (inParentDirectory.IsDirectory() && (! IsDirectory() ) )
+    {
+        char *leafname = GetLeafName();
+        char* destPath = nsFileSpecHelpers::StringDup(inParentDirectory, ( strlen(inParentDirectory) + 1 + strlen(leafname) ) );
+        strcat(destPath, "\\");
+        strcat(destPath, leafname);
+        delete [] leafname;
+        
+        // CopyFile returns non-zero if succeeds
+        int copyOK = CopyFile(*this, destPath, true);
+
+        delete[] destPath;
+
+        if (copyOK)
+        {
+            return NS_OK;
+        }
+    }
+
+    return NS_FILE_FAILURE;
+} // nsFileSpec::Copy
+
+//----------------------------------------------------------------------------------------
+nsresult nsFileSpec::Move(const nsFileSpec& nsNewParentDirectory) const
+//----------------------------------------------------------------------------------------
+{
+    // We can only copy into a directory, and (for now) can not copy entire directories
+
+    if (nsNewParentDirectory.IsDirectory() && (! IsDirectory() ) )
+    {
+        char *leafname = GetLeafName();
+        char *destPath = nsFileSpecHelpers::StringDup(nsNewParentDirectory, ( strlen(nsNewParentDirectory) + 1 + strlen(leafname) ));
+        strcat(destPath, "\\");
+        strcat(destPath, leafname);
+        delete [] leafname;
+
+        // MoveFile returns non-zero if succeeds
+        int copyOK = MoveFile(*this, destPath);
+ 
+        delete [] destPath;
+
+        if (copyOK)
+        {
+            return NS_OK;
+        }
+    }
+
+    return NS_FILE_FAILURE;
+} // nsFileSpec::Move
+
+//----------------------------------------------------------------------------------------
+nsresult nsFileSpec::Execute(const char* inArgs ) const
+//----------------------------------------------------------------------------------------
+{
+    
+    if (! IsDirectory())
+    {
+        char* fileNameWithArgs = NULL;
+
+	    fileNameWithArgs = nsFileSpecHelpers::StringDup(mPath, ( strlen(mPath) + 1 + strlen(inArgs) ) );
+        strcat(fileNameWithArgs, " ");
+        strcat(fileNameWithArgs, inArgs);
+
+        int execResult = WinExec( fileNameWithArgs, SW_NORMAL );
+        
+        delete [] fileNameWithArgs;
+
+        if (execResult > 31)
+        {
+            return NS_OK;
+        }
+    }
+
+    return NS_FILE_FAILURE;
+} // nsFileSpec::Execute

 //========================================================================================
 //								nsDirectoryIterator
@@ -252,12 +363,12 @@ void nsNativeFileSpec::Delete(bool inRecursive)

 //----------------------------------------------------------------------------------------
 nsDirectoryIterator::nsDirectoryIterator(
-	const nsNativeFileSpec& inDirectory
+	const nsFileSpec& inDirectory
 ,	int inIterateDirection)
 //----------------------------------------------------------------------------------------
 	: mCurrent(inDirectory)
 	, mDir(nsnull)
-	, mExists(false)
+	, mExists(PR_FALSE)
 {
    mDir = PR_OpenDir(inDirectory);
 	mCurrent += "dummy";
@@ -276,13 +387,13 @@ nsDirectoryIterator::~nsDirectoryIterator()
 nsDirectoryIterator& nsDirectoryIterator::operator ++ ()
 //----------------------------------------------------------------------------------------
 {
-	mExists = false;
+	mExists = PR_FALSE;
 	if (!mDir)
 		return *this;
-  PRDirEntry* entry = PR_ReadDir(mDir, PR_SKIP_BOTH); // Ignore '.' && '..'
+    PRDirEntry* entry = PR_ReadDir(mDir, PR_SKIP_BOTH); // Ignore '.' && '..'
 	if (entry)
    {
-      mExists = true;
+      mExists = PR_TRUE;
      mCurrent.SetLeafName(entry->name);
    }
 	return *this;
--- a/mozilla/base/tests/FilesTest.cpp
+++ b/mozilla/base/tests/FilesTest.cpp
@@ -1,7 +1,27 @@
-#include "string.h"
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
 #include "nsFileSpec.h"
 #include "nsFileStream.h"

+//#include "string.h"
+//void* operator new(size_t n) { return malloc(n); }
+
 struct FilesTest
 {
 	FilesTest() : mConsole() {}
@@ -12,18 +32,25 @@ struct FilesTest
 	int InputStream(const char* relativePath);
 	int OutputStream(const char* relativePath);
 	int IOStream(const char* relativePath);
-	int Parent(const char* relativePath, nsNativeFileSpec& outParent);
-	int Delete(nsNativeFileSpec& victim);
-	int CreateDirectory(nsNativeFileSpec& victim);
-	int IterateDirectoryChildren(nsNativeFileSpec& startChild);
+	int Parent(const char* relativePath, nsFileSpec& outParent);
+	int Delete(nsFileSpec& victim);
+	int CreateDirectory(nsFileSpec& victim);
+	int IterateDirectoryChildren(nsFileSpec& startChild);
 	int CanonicalPath(const char* relativePath);
+	int Persistence(const char* relativePath);
+
+    int Copy(const char*  sourceFile, const char* targDir);
+    int Move(const char*  sourceFile, const char*  targDir);
+    int Rename(const char*  sourceFile, const char* newName);
+
+    int Execute(const char* appName, const char* args);

 	void Banner(const char* bannerString);
 	void Passed();
 	void Failed();
 	void Inspect();
 		
-	nsOutputFileStream mConsole;
+	nsOutputConsoleStream mConsole;
 };

 //----------------------------------------------------------------------------------------
@@ -41,7 +68,8 @@ void FilesTest::Banner(const char* bannerString)
 void FilesTest::Passed()
 //----------------------------------------------------------------------------------------
 {
-	mConsole << "Test passed." << nsEndl;
+	((nsOutputStream&)mConsole) << "Test passed.";
+	mConsole << nsEndl;
 }

 //----------------------------------------------------------------------------------------
@@ -63,7 +91,7 @@ void FilesTest::WriteStuff(nsOutputFileStream& s)
 //----------------------------------------------------------------------------------------
 {
 	// Initialize a URL from a string without suffix.  Change the path to suit your machine.
-	nsFileURL fileURL("file:///Development/MPW/MPW%20Shell", false);
+	nsFileURL fileURL("file:///Development/MPW/MPW%20Shell", PR_FALSE);
 	s << "File URL initialized to:     \"" << fileURL << "\""<< nsEndl;
 	
 	// Initialize a Unix path from a URL
@@ -71,7 +99,7 @@ void FilesTest::WriteStuff(nsOutputFileStream& s)
 	s << "As a unix path:              \"" << (const char*)filePath << "\""<< nsEndl;
 	
 	// Initialize a native file spec from a URL
-	nsNativeFileSpec fileSpec(fileURL);
+	nsFileSpec fileSpec(fileURL);
 	s << "As a file spec:               " << fileSpec << nsEndl;
 	
 	// Make the spec unique (this one has no suffix).
@@ -99,12 +127,12 @@ void FilesTest::WriteStuff(nsOutputFileStream& s)
 int FilesTest::OutputStream(const char* relativePath)
 //----------------------------------------------------------------------------------------
 {
-	nsFilePath myTextFilePath(relativePath, true); // relative path.
+	nsFilePath myTextFilePath(relativePath, PR_TRUE); // relative path.
 	const char* pathAsString = (const char*)myTextFilePath;
-	nsNativeFileSpec mySpec(myTextFilePath);
+	nsFileSpec mySpec(myTextFilePath);
 	{
 		mConsole << "WRITING IDENTICAL OUTPUT TO " << pathAsString << nsEndl << nsEndl;
-		nsOutputFileStream testStream(myTextFilePath);
+		nsOutputFileStream testStream(mySpec);
 		if (!testStream.is_open())
 		{
 			mConsole
@@ -134,11 +162,12 @@ int FilesTest::OutputStream(const char* relativePath)
 int FilesTest::IOStream(const char* relativePath)
 //----------------------------------------------------------------------------------------
 {
-	nsFilePath myTextFilePath(relativePath, true); // relative path.
+	nsFilePath myTextFilePath(relativePath, PR_TRUE); // relative path.
 	const char* pathAsString = (const char*)myTextFilePath;
+	nsFileSpec mySpec(myTextFilePath);
 	mConsole
 		<< "Replacing \"path\" by \"ZUUL\" in " << pathAsString << nsEndl << nsEndl;
-	nsIOFileStream testStream(myTextFilePath);
+	nsIOFileStream testStream(mySpec);
 	if (!testStream.is_open())
 	{
 		mConsole
@@ -148,7 +177,7 @@ int FilesTest::IOStream(const char* relativePath)
 		    << nsEndl;
 		return -1;
 	}
-	char line[1000];
+	char line[5000]; // Use a buffer longer than the file!
 	testStream.seek(0); // check that the seek compiles
 	while (!testStream.eof())
 	{
@@ -165,14 +194,66 @@ int FilesTest::IOStream(const char* relativePath)
 	return 0;
 }

+//----------------------------------------------------------------------------------------
+int FilesTest::Persistence(
+	const char* relativePathToWrite)
+//----------------------------------------------------------------------------------------
+{
+	nsFilePath myTextFilePath(relativePathToWrite, PR_TRUE);
+	const char* pathAsString = (const char*)myTextFilePath;
+	nsFileSpec mySpec(myTextFilePath);
+
+	nsIOFileStream testStream(mySpec, (PR_RDWR | PR_CREATE_FILE | PR_TRUNCATE));
+	if (!testStream.is_open())
+	{
+		mConsole
+		    << "ERROR: File "
+		    << pathAsString
+		    << " could not be opened for input+output"
+		    << nsEndl;
+		return -1;
+	}
+	
+	nsPersistentFileDescriptor myPersistent(mySpec);
+	mConsole
+		<< "Writing persistent file data " << pathAsString << nsEndl << nsEndl;
+	
+	testStream.seek(0); // check that the seek compiles
+	testStream << myPersistent;
+	
+	testStream.seek(0);
+	
+	nsPersistentFileDescriptor mySecondPersistent;
+	testStream >> mySecondPersistent;
+	
+	mySpec = mySecondPersistent;
+#ifdef XP_MAC
+    if (mySpec.Error())
+	{
+		Failed();
+		return -1;
+	}
+#endif
+
+    if (!mySpec.Exists())
+	{
+		Failed();
+		return -1;
+	}
+    
+	Passed();
+	return 0;
+}
+
 //----------------------------------------------------------------------------------------
 int FilesTest::InputStream(const char* relativePath)
 //----------------------------------------------------------------------------------------
 {
-	nsFilePath myTextFilePath(relativePath, true);
+	nsFilePath myTextFilePath(relativePath, PR_TRUE);
 	const char* pathAsString = (const char*)myTextFilePath;
 	mConsole << "READING BACK DATA FROM " << pathAsString << nsEndl << nsEndl;
-	nsInputFileStream testStream2(myTextFilePath);
+	nsFileSpec mySpec(myTextFilePath);
+	nsInputFileStream testStream2(mySpec);
 	if (!testStream2.is_open())
 	{
 		mConsole
@@ -197,12 +278,12 @@ int FilesTest::InputStream(const char* relativePath)
 //----------------------------------------------------------------------------------------
 int FilesTest::Parent(
 	const char* relativePath,
-	nsNativeFileSpec& outParent)
+	nsFileSpec& outParent)
 //----------------------------------------------------------------------------------------
 {
-	nsFilePath myTextFilePath(relativePath, true);
+	nsFilePath myTextFilePath(relativePath, PR_TRUE);
 	const char* pathAsString = (const char*)myTextFilePath;
-	nsNativeFileSpec mySpec(myTextFilePath);
+	nsFileSpec mySpec(myTextFilePath);

    mySpec.GetParent(outParent);
    nsFilePath parentPath(outParent);
@@ -217,7 +298,7 @@ int FilesTest::Parent(
 }

 //----------------------------------------------------------------------------------------
-int FilesTest::Delete(nsNativeFileSpec& victim)
+int FilesTest::Delete(nsFileSpec& victim)
 //----------------------------------------------------------------------------------------
 {
 	// - Test of non-recursive delete
@@ -228,7 +309,7 @@ int FilesTest::Delete(nsNativeFileSpec& victim)
 		<< "\n\t" << (const char*)victimPath
 		<< "\n without recursive option (should fail)"	
 		<< nsEndl;
-	victim.Delete(false);	
+	victim.Delete(PR_FALSE);	
 	if (victim.Exists())
 		Passed();
 	else
@@ -250,7 +331,7 @@ int FilesTest::Delete(nsNativeFileSpec& victim)
 		<< "\n\t" << (const char*)victimPath
 		<< "\n with recursive option"
 		<< nsEndl;
-	victim.Delete(true);
+	victim.Delete(PR_TRUE);
 	if (victim.Exists())
 	{
 		mConsole
@@ -266,7 +347,7 @@ int FilesTest::Delete(nsNativeFileSpec& victim)
 }

 //----------------------------------------------------------------------------------------
-int FilesTest::CreateDirectory(nsNativeFileSpec& dirSpec)
+int FilesTest::CreateDirectory(nsFileSpec& dirSpec)
 //----------------------------------------------------------------------------------------
 {
    nsFilePath dirPath(dirSpec);
@@ -283,32 +364,32 @@ int FilesTest::CreateDirectory(nsNativeFileSpec& dirSpec)
 		Failed();
 		return -1;
 	}
-	dirSpec.Delete(true);
+	dirSpec.Delete(PR_TRUE);
 	return 0;
 }

 //----------------------------------------------------------------------------------------
-int FilesTest::IterateDirectoryChildren(nsNativeFileSpec& startChild)
+int FilesTest::IterateDirectoryChildren(nsFileSpec& startChild)
 //----------------------------------------------------------------------------------------
 {
 	// - Test of directory iterator

-    nsNativeFileSpec grandparent;
+    nsFileSpec grandparent;
    startChild.GetParent(grandparent); // should be the original default directory.
    nsFilePath grandparentPath(grandparent);
    
    mConsole << "Forwards listing of " << (const char*)grandparentPath << ":" << nsEndl;
-    for (nsDirectoryIterator i(grandparent, +1); i; i++)
+    for (nsDirectoryIterator i(grandparent, +1); i.Exists(); i++)
    {
-    	char* itemName = ((nsNativeFileSpec&)i).GetLeafName();
+    	char* itemName = ((nsFileSpec&)i).GetLeafName();
    	mConsole << '\t' << itemName << nsEndl;
    	delete [] itemName;
    }

    mConsole << "Backwards listing of " << (const char*)grandparentPath << ":" << nsEndl;
-    for (nsDirectoryIterator j(grandparent, -1); j; j--)
+    for (nsDirectoryIterator j(grandparent, -1); j.Exists(); j--)
    {
-    	char* itemName = ((nsNativeFileSpec&)j).GetLeafName();
+    	char* itemName = ((nsFileSpec&)j).GetLeafName();
    	mConsole << '\t' << itemName << nsEndl;
    	delete [] itemName;
    }
@@ -321,7 +402,7 @@ int FilesTest::CanonicalPath(
 	const char* relativePath)
 //----------------------------------------------------------------------------------------
 {
-	nsFilePath myTextFilePath(relativePath, true);
+	nsFilePath myTextFilePath(relativePath, PR_TRUE);
 	const char* pathAsString = (const char*)myTextFilePath;
 	if (*pathAsString != '/')
 	{
@@ -337,6 +418,110 @@ int FilesTest::CanonicalPath(
 	return 0;
 }

+//----------------------------------------------------------------------------------------
+int FilesTest::Copy(const char* file, const char* dir)
+//----------------------------------------------------------------------------------------
+{
+    nsFileSpec dirPath(dir, PR_TRUE);
+		
+	dirPath.CreateDirectory();
+    if (! dirPath.Exists())
+	{
+		Failed();
+		return -1;
+	}
+    
+
+    nsFileSpec mySpec(file, PR_TRUE); // relative path.
+    {
+	    nsIOFileStream testStream(mySpec); // creates the file
+	    // Scope ends here, file gets closed
+    }
+    
+    nsFileSpec filePath(file);
+    if (! filePath.Exists())
+	{
+		Failed();
+		return -1;
+	}
+   
+    nsresult error = filePath.Copy(dirPath);
+
+    dirPath += filePath.GetLeafName();
+    if (! dirPath.Exists() || ! filePath.Exists() || NS_FAILED(error))
+	{
+		Failed();
+		return -1;
+	}
+
+   Passed();
+   
+   return 0;
+}
+
+//----------------------------------------------------------------------------------------
+int FilesTest::Move(const char* file, const char* dir)
+//----------------------------------------------------------------------------------------
+{
+    nsFileSpec dirPath(dir, PR_TRUE);
+		
+	dirPath.CreateDirectory();
+    if (! dirPath.Exists())
+	{
+		Failed();
+		return -1;
+	}
+    
+
+    nsFileSpec srcSpec(file, PR_TRUE); // relative path.
+    {
+       nsIOFileStream testStream(srcSpec); // creates the file
+       // file gets closed here because scope ends here.
+    };
+    
+    if (! srcSpec.Exists())
+	{
+		Failed();
+		return -1;
+	}
+   
+    nsresult error = srcSpec.Move(dirPath);
+
+
+    dirPath += srcSpec.GetLeafName();
+    if (! dirPath.Exists() || srcSpec.Exists() || NS_FAILED(error))
+	{
+		Failed();
+		return -1;
+	}
+
+    Passed();
+    return 0;
+}
+
+//----------------------------------------------------------------------------------------
+int FilesTest::Execute(const char* appName, const char* args)
+//----------------------------------------------------------------------------------------
+{
+    nsFileSpec appPath(appName, PR_FALSE);
+    if (!appPath.Exists())
+	{
+		Failed();
+		return -1;
+	}
+	
+    nsresult error = appPath.Execute(args);    
+    if (NS_FAILED(error))
+	{
+		Failed();
+		return -1;
+	}
+
+   Passed();
+
+    return 0;
+}
+
 //----------------------------------------------------------------------------------------
 int FilesTest::RunAllTests()
 // For use with DEBUG defined.
@@ -371,7 +556,7 @@ int FilesTest::RunAllTests()
 		return -1;
 	
 	Banner("Parent");
-	nsNativeFileSpec parent;
+	nsFileSpec parent;
 	if (Parent("mumble/iotest.txt", parent) != 0)
 		return -1;
 		
@@ -387,6 +572,36 @@ int FilesTest::RunAllTests()
 	if (IterateDirectoryChildren(parent) != 0)
 		return -1;

+    Banner("Copy");
+    if (Copy("mumble/copyfile.txt", "mumble/copy") != 0)
+        return -1;
+    
+    Banner("Move");
+    if (Move("mumble/moveFile.txt", "mumble/move") != 0)
+        return -1;
+
+    Banner("Execute");
+#ifdef XP_MAC
+	// This path is hard-coded to test on jrm's machine.  Finding an app
+	// on an arbitrary Macintosh would cost more trouble than it's worth.
+	// Change path to suit.
+    if NS_FAILED(Execute("/Projects/Nav45_BRANCH/ns/cmd/macfe/"\
+        "projects/client45/Client45PPC", ""))
+#elif XP_PC
+    if NS_FAILED(Execute("c:\\windows\\notepad.exe", ""))
+#else
+    if NS_FAILED(Execute("/bin/ls", "/"))
+#endif
+        return -1;
+
+	Banner("Persistence");
+	if (Persistence("mumble/filedesc.dat") != 0)
+		return -1;
+
+	Banner("Delete again (to clean up our mess)");
+	if (Delete(parent) != 0)
+		return -1;
+		
    return 0;
 }

@@ -395,7 +610,6 @@ int main()
 // For use with DEBUG defined.
 //----------------------------------------------------------------------------------------
 {
-
 	FilesTest tester;
 	return tester.RunAllTests();
 } // main
--- a/mozilla/base/tests/Makefile.in
+++ b/mozilla/base/tests/Makefile.in
@@ -21,13 +21,33 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-REQUIRES	= xpcom netlib
-
-CPPSRCS		= TestAtoms.cpp TestCRT.cpp FilesTest.cpp
+CPPSRCS = TestAtoms.cpp TestCRT.cpp CvtURL.cpp FilesTest.cpp PropertiesTest.cpp TestAutoLock.cpp

 LIBS		= \
+	-lnetlib \
+	-labouturl \
+	-lfileurl \
+	-lremoturl \
+	-lgophurl \
+	-lnetcnvts \
+	-lsockstuburl \
+	-lftpurl \
+	-lmimetype \
+	-lpwcac \
+	-lhttpurl \
+	-lnetwork \
+	-lnetutil \
+	-lnetcache \
+	-lgmbase$(MOZ_TOOLKIT) \
+	$(TK_LIBS) \
+	-lpref \
+	-lsecfree \
+	-ljs \
+	-lxp \
 	-lraptorbase \
 	-lxpcom \
+	-lreg \
+	$(ZLIB_LIBS) \
 	$(NSPR_LIBS) \
 	$(NULL)

--- a/mozilla/base/tests/PropertiesTest.cpp
+++ b/mozilla/base/tests/PropertiesTest.cpp
@@ -31,23 +31,43 @@

 #define TEST_URL "resource:/res/test.properties"

+#ifdef XP_PC
 #define NETLIB_DLL "netlib.dll"
 #define RAPTORBASE_DLL "raptorbase.dll"
 #define XPCOM_DLL "xpcom32.dll"
-
+#else
+#ifdef XP_MAC
+#define NETLIB_DLL "NETLIB_DLL"
+#define RAPTORBASE_DLL "base.shlb"
+#define XPCOM_DLL "XPCOM_DLL"
+#else
+#define NETLIB_DLL "libnetlib.so"
+#define RAPTORBASE_DLL "libraptorbase.so"
+#define XPCOM_DLL "libxpcom32.so"
+#endif
+#endif
 static NS_DEFINE_IID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
 static NS_DEFINE_IID(kIEventQueueServiceIID, NS_IEVENTQUEUESERVICE_IID);
 static NS_DEFINE_IID(kINetServiceIID, NS_INETSERVICE_IID);
 static NS_DEFINE_IID(kIPropertiesIID, NS_IPROPERTIES_IID);
 static NS_DEFINE_IID(kNetServiceCID, NS_NETSERVICE_CID);

+
+#ifdef XP_MAC  // have not build this on PC and UNIX yet so make it #ifdef XP_MAC
+extern "C" void NS_SetupRegistry();
+#endif
+
 int
 main(int argc, char *argv[])
 {
-  nsRepository::RegisterFactory(kNetServiceCID, NETLIB_DLL, PR_FALSE,
-    PR_FALSE);
-  nsRepository::RegisterFactory(kEventQueueServiceCID, XPCOM_DLL,
+  nsRepository::RegisterComponent(kNetServiceCID, NULL, NULL, NETLIB_DLL,
    PR_FALSE, PR_FALSE);
+  nsRepository::RegisterComponent(kEventQueueServiceCID, NULL, NULL, XPCOM_DLL,
+    PR_FALSE, PR_FALSE);
+#ifdef XP_MAC    // have not build this on PC and UNIX yet so make it #ifdef XP_MAC
+  NS_SetupRegistry(); 
+#endif
+  
  nsresult ret;
  nsIEventQueueService* pEventQueueService = nsnull;
  ret = nsServiceManager::GetService(kEventQueueServiceCID,
--- a/mozilla/base/tests/TestAutoLock.cpp
+++ b/mozilla/base/tests/TestAutoLock.cpp
@@ -0,0 +1,72 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/*
+
+  Some tests for nsAutoLock.
+
+ */
+
+#include "nsAutoLock.h"
+#include "prthread.h"
+
+PRLock* gLock;
+int gCount;
+
+static void run(void* arg)
+{
+    for (int i = 0; i < 1000000; ++i) {
+        nsAutoLock guard(gLock);
+        ++gCount;
+        PR_ASSERT(gCount == 1);
+        --gCount;
+    }
+}
+
+
+int main(int argc, char** argv)
+{
+    gLock = PR_NewLock();
+    gCount = 0;
+
+    // This shouldn't compile
+    //nsAutoLock* l1 = new nsAutoLock(theLock);
+    //delete l1;
+
+    // Create a block-scoped lock. This should compile.
+    {
+        nsAutoLock l2(gLock);
+    }
+
+    // Fork a thread to access the shared variable in a tight loop
+    PRThread* t1 =
+        PR_CreateThread(PR_SYSTEM_THREAD,
+                        run,
+                        nsnull,
+                        PR_PRIORITY_NORMAL,
+                        PR_GLOBAL_THREAD,
+                        PR_JOINABLE_THREAD,
+                        0);
+
+    // ...and now do the same thing ourselves
+    run(nsnull);
+
+    // Wait for the background thread to finish, if necessary.
+    PR_JoinThread(t1);
+    return 0;
+}
--- a/mozilla/base/tests/makefile.win
+++ b/mozilla/base/tests/makefile.win
@@ -24,6 +24,7 @@ PROG2 = .\$(OBJDIR)\CvtURL.exe
 PROG3 = .\$(OBJDIR)\TestCRT.exe
 PROG4 = .\$(OBJDIR)\FilesTest.exe
 PROG5 = .\$(OBJDIR)\PropertiesTest.exe
+PROG6 = .\$(OBJDIR)\TestAutoLock.exe
 RESFILE = timer.res
 PROGRAMS = $(PROG0) $(PROG1) \
 !ifdef MODULAR_NETLIB
@@ -32,6 +33,7 @@ PROGRAMS = $(PROG0) $(PROG1) \
 	$(PROG5) \
 !endif
 	$(PROG4) \
+        $(PROG6) \
 	$(NULL)

 LINCS=-I..\src -I$(PUBLIC)\xpcom -I$(PUBLIC)\netlib -I$(PUBLIC)\raptor
@@ -61,6 +63,7 @@ install:: $(PROGRAMS)
 	$(MAKE_INSTALL) test.properties $(DIST)\bin\res
 !endif
 	$(MAKE_INSTALL) $(PROG4) $(DIST)\bin
+        $(MAKE_INSTALL) $(PROG6) $(DIST)\bin

 clobber::
 	rm -f $(DIST)\bin\TimerTest.exe
@@ -72,6 +75,7 @@ clobber::
 	rm -f $(DIST)\bin\res\test.properties
 !endif
 	rm -f $(DIST)\bin\FilesTest.exe
+        rm -f $(DIST)\bin\TestAutoLock.exe

 # Move this into config/obj.inc when it's allowed
 .cpp{.\$(OBJDIR)\}.exe:
@@ -102,3 +106,7 @@ $(PROG3): $(OBJDIR) TestCRT.cpp

 $(PROG5): $(OBJDIR) PropertiesTest.cpp
 !endif
+
+$(PROG6): $(OBJDIR) TestAutoLock.cpp
+
+
--- a/mozilla/build/autoconf/altoptions.m4
+++ b/mozilla/build/autoconf/altoptions.m4
@@ -0,0 +1,109 @@
+dnl The contents of this file are subject to the Netscape Public License
+dnl Version 1.0 (the "NPL"); you may not use this file except in
+dnl compliance with the NPL.  You may obtain a copy of the NPL at
+dnl http://www.mozilla.org/NPL/
+dnl
+dnl Software distributed under the NPL is distributed on an "AS IS" basis,
+dnl WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+dnl for the specific language governing rights and limitations under the
+dnl NPL.
+dnl
+dnl The Initial Developer of this code under the NPL is Netscape
+dnl Communications Corporation.  Portions created by Netscape are
+dnl Copyright (C) 1999 Netscape Communications Corporation.  All Rights
+dnl Reserved.
+dnl
+
+dnl altoptions.m4 - An alternative way of specifying command-line options.
+dnl    These macros are needed to support a menu-based configurator.
+dnl    This file also includes the macro, AM_READ_MYCONFIG, for reading
+dnl    the 'myconfig.m4' file.
+
+dnl Send comments, improvements, bugs to Steve Lamm (slamm@netscape.com).
+
+
+dnl MOZ_ARG_ENABLE_BOOL(           NAME, HELP, IF-YES [, IF-NO [, ELSE]])
+dnl MOZ_ARG_DISABLE_BOOL(          NAME, HELP, IF-NO [, IF-YES [, ELSE]])
+dnl MOZ_ARG_ENABLE_STRING(         NAME, HELP, IF-SET [, ELSE])
+dnl MOZ_ARG_ENABLE_BOOL_OR_STRING( NAME, HELP, IF-YES, IF-NO, IF-SET[, ELSE]]])
+dnl MOZ_ARG_WITH_BOOL(             NAME, HELP, IF-YES [, IF-NO [, ELSE])
+dnl MOZ_ARG_WITHOUT_BOOL(          NAME, HELP, IF-NO [, IF-YES [, ELSE])
+dnl MOZ_ARG_WITH_STRING(           NAME, HELP, IF-SET [, ELSE])
+dnl MOZ_READ_MYCONFIG() - Read in 'myconfig.sh' file
+
+
+dnl MOZ_TWO_STRING_TEST(NAME, STR1, IF-STR1, STR2, IF-STR2 [, ELSE])
+AC_DEFUN(MOZ_TWO_STRING_TEST,
+[if test "$enableval" = "[$2]"; then
+    ifelse([$3], , :, [$3])
+  elif test "$enableval" = "[$4]"; then
+    ifelse([$5], , :, [$5])
+  else
+    ifelse([$6], ,
+      [AC_MSG_ERROR([Option, [$1], does not take an argument ($enableval).])],
+      [$6])
+  fi])
+
+dnl MOZ_ARG_ENABLE_BOOL(NAME, HELP, IF-YES [, IF-NO [, ELSE]])
+AC_DEFUN(MOZ_ARG_ENABLE_BOOL,
+[AC_ARG_ENABLE([$1], [$2], 
+ [MOZ_TWO_STRING_TEST([$1], yes, [$3], no, [$4])],
+ [$5])])
+
+dnl MOZ_ARG_DISABLE_BOOL(NAME, HELP, IF-NO [, IF-YES [, ELSE]])
+AC_DEFUN(MOZ_ARG_DISABLE_BOOL,
+[AC_ARG_ENABLE([$1], [$2],
+ [MOZ_TWO_STRING_TEST([$1], no, [$3], yes, [$4])],
+ [$5])])
+
+dnl MOZ_ARG_ENABLE_STRING(NAME, HELP, IF-SET [, ELSE])
+AC_DEFUN(MOZ_ARG_ENABLE_STRING,
+[AC_ARG_ENABLE([$1], [$2], [$3], [$4])])
+
+dnl MOZ_ARG_ENABLE_BOOL_OR_STRING(NAME, HELP, IF-YES, IF-NO, IF-SET[, ELSE]]])
+AC_DEFUN(MOZ_ARG_ENABLE_BOOL_OR_STRING,
+[ifelse([$5], , 
+ [errprint([Option, $1, needs an "IF-SET" argument.
+])
+  m4exit(1)],
+ [AC_ARG_ENABLE([$1], [$2],
+  [MOZ_TWO_STRING_TEST([$1], yes, [$3], no, [$4], [$5])],
+  [$6])])])
+
+dnl MOZ_ARG_WITH_BOOL(NAME, HELP, IF-YES [, IF-NO [, ELSE])
+AC_DEFUN(MOZ_ARG_WITH_BOOL,
+[AC_ARG_WITH([$1], [$2],
+ [MOZ_TWO_STRING_TEST([$1], yes, [$3], no, [$4])],
+ [$5])])
+
+dnl MOZ_ARG_WITHOUT_BOOL(NAME, HELP, IF-NO [, IF-YES [, ELSE])
+AC_DEFUN(MOZ_ARG_WITHOUT_BOOL,
+[AC_ARG_WITH([$1], [$2],
+ [MOZ_TWO_STRING_TEST([$1], no, [$3], yes, [$4])],
+ [$5])])
+
+dnl MOZ_ARG_WITH_STRING(NAME, HELP, IF-SET [, ELSE])
+AC_DEFUN(MOZ_ARG_WITH_STRING,
+[AC_ARG_WITH([$1], [$2], [$3], [$4])])
+
+
+
+dnl MOZ_READ_MYCONFIG() - Read in 'myconfig.sh' file
+AC_DEFUN(MOZ_READ_MYCONFIG,
+[AC_REQUIRE([AC_INIT_BINSH])dnl
+# Read in 'myconfig.sh' script to set the initial options.
+# See the load-myconfig.sh script for more details.
+_topsrcdir=`dirname [$]0`
+_load_myconfig=$_topsrcdir/build/autoconf/load-myconfig.sh
+if test "$MOZ_MYCONFIG"; then
+  . $_load_myconfig
+elif test -f myconfig.sh; then
+   MOZ_MYCONFIG=myconfig.sh
+   . $_load_myconfig
+elif test -f $_topsrcdir/myconfig.sh; then
+   MOZ_MYCONFIG=$_topsrcdir/myconfig.sh
+   . $_load_myconfig
+fi])
+
+dnl This gets inserted at the top of the configure script
+MOZ_READ_MYCONFIG
--- a/mozilla/build/autoconf/load-myconfig.sh
+++ b/mozilla/build/autoconf/load-myconfig.sh
@@ -0,0 +1,81 @@
+# sh
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1999 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+# load-myconfig.sh - Loads options from myconfig.sh onto configure's
+#    command-line. The myconfig.sh is searched for in the following
+#    order: $MOZ_MYCONFIG, $objdir/myconfig.sh, $topsrcdir/myconfig.sh.
+#
+#    The options from myconfig.sh are inserted into the command-line
+#    before the real command-line options. This way the real options
+#    will override any myconfig.sh options.
+#
+# myconfig.sh is a shell script. To add an option to configure's
+#    command-line use the pre-defined function, ac_add_options,
+#
+#       ac_add_options  <configure-option> [<configure-option> ... ]
+#
+#    For example,
+#
+#       ac_add_options --with-pthreads --enable-debug
+#
+# ac_add_options can be called multiple times in myconfig.sh.
+#    Each call adds more options to configure's command-line.
+#
+# Send comments, improvements, bugs to Steve Lamm (slamm@netscape.com).
+
+
+ac_add_options() {
+  for _opt
+  do
+    # Escape shell characters, space, tab, dollar, quote, backslash.
+    _opt=`echo $_opt | sed -e 's/\([\ \	\$\"\\]\)/\\\\\1/g;'`
+
+    config_file_options="$config_file_options $_opt"
+  done
+}
+
+ac_echo_options() {
+  echo "Adding options from `pwd`/myconfig.sh:"
+  eval "set -- $config_file_options"
+  for opt
+  do
+    echo "  $opt"
+  done
+}
+
+#
+# Define load the options
+#
+ac_options=
+config_file_options=
+
+# Save the real command-line options
+for _opt
+do
+  # Escape shell characters, space, tab, dollar, quote, backslash.
+  _opt=`echo $_opt | sed -e 's/\([\ \	\$\"\\]\)/\\\\\1/g;'`
+
+  ac_options="$ac_options \"$_opt\""
+done
+
+. $MOZ_MYCONFIG
+
+ac_echo_options 1>&2
+
+eval "set -- $config_file_options $ac_options"
+
--- a/mozilla/build/autoconf/update-makefile.sh
+++ b/mozilla/build/autoconf/update-makefile.sh
@@ -29,47 +29,30 @@
 # Send comments, improvements, bugs to ramiro@netscape.com
 # 

-# Make sure a Makefile.in exists
-if [ ! -f Makefile.in ]
+# Make sure a Makefile exists
+if [ ! -f Makefile ]
 then
 	echo
-	echo "There ain't no 'Makefile.in' over here: $pwd"
+	echo "There ain't no 'Makefile' over here: $pwd"
 	echo

 	exit
 fi

-# Use DEPTH in the Makefile.in to determine the depth
-depth=`grep -w DEPTH Makefile.in  | grep -e "\.\." | awk -F"=" '{ print $2; }'`
+# Use DEPTH in the Makefile to determine the depth
+depth=`egrep '^DEPTH[ 	]*=[ 	]*\.' Makefile | awk -F= '{ print $2; }'`

-# Determine the depth count
-n=`echo $depth | tr '/' ' ' | wc -w`
-
-# Determine the path (strip anything before the mozilla/ root)
-path=`pwd | awk -v count=$n -F"/" '\
-{ for(i=NF-count+1; i <= NF ; i++) \
-{ \
-if (i!=NF) \
-  { printf "%s/", $i } \
-else \
-  { printf "%s", $i } \
-} \
-}'`
-
-dir=$path
-
-# Add a slash only to dirs where depth >= mozilla_root
-if [ $n -gt 0 ]
-then
-	dir=${dir}"/"
-fi
-
-back=`pwd`
-
-makefile=${dir}"Makefile"
+# Get the full path to the Makefile
+makefile=`pwd`/Makefile

+# 'cd' to the root of the tree
+echo depth=$depth
 cd $depth

+# Strip the tree root off the Makefile's path
+root_path=`pwd`
+makefile=`expr $makefile : $root_path'/\(.*\)'`
+
 # Make sure config.status exists
 if [ -f config.status ]
 then
@@ -79,5 +62,3 @@ else
 	echo "There ain't no 'config.status' over here: $pwd"
 	echo
 fi
-
-cd $back
--- a/mozilla/build/mac/CustomLib/CustomLib.mcp
+++ b/mozilla/build/mac/CustomLib/CustomLib.mcp
--- a/mozilla/build/mac/Moz.pm
+++ b/mozilla/build/mac/Moz.pm
@@ -30,6 +30,7 @@ B<Moz> comprises the routines needed to slap CodeWarrior around, force it to bui

 package			Moz;
 require			Exporter;
+use Mac::Events;

@ISA				= qw(Exporter);
@EXPORT			= qw(BuildProject BuildProjectClean OpenErrorLog MakeAlias StopForErrors DontStopForErrors InstallFromManifest SetBuildNumber SetAgentString SetTimeBomb Delay);
@@ -245,7 +246,7 @@ sub build_project($$$)
 		$had_errors = CodeWarriorLib::build_project(
 			$project_path, $target_name, $recent_errors_file, $clean_build
 		);
-
+		WaitNextEvent();

 #		$had_errors =
 #MacPerl::DoAppleScript(<<END_OF_APPLESCRIPT);
@@ -253,7 +254,7 @@ sub build_project($$$)
 #END_OF_APPLESCRIPT

 			# Append any errors to the globally accumulated log file
-		if ( $had_errors )
+#		if ( $had_errors ) # Removed this test, because we want warnings, too.  -- jrm
 			{
 				log_recent_errors($project_path);
 			}
@@ -342,6 +343,8 @@ sub InstallFromManifest($;$)

 		chop($dest_dir) if $dest_dir =~ m/:$/;

+		#Mac::Events->import();
+		WaitNextEvent();
 		print "Doing manifest on \"$manifest_file\"\n" unless $QUIET;
 		
 		my $read = maniread(full_path_to($manifest_file));
--- a/mozilla/build/mac/NGLayoutBuildList.pm
+++ b/mozilla/build/mac/NGLayoutBuildList.pm
@@ -175,8 +175,17 @@ sub BuildDist()
    InstallFromManifest(":mozilla:nsprpub:lib:libc:include:MANIFEST",				"$distdirectory:nspr:");		
    InstallFromManifest(":mozilla:nsprpub:lib:msgc:include:MANIFEST",				"$distdirectory:nspr:");

-	#UCONV
+	#INTL
 	InstallFromManifest(":mozilla:intl:uconv:public:MANIFEST",						"$distdirectory:uconv:");
+	InstallFromManifest(":mozilla:intl:uconv:ucvlatin:MANIFEST",					"$distdirectory:uconv:");
+	InstallFromManifest(":mozilla:intl:uconv:ucvja:MANIFEST",						"$distdirectory:uconv:");
+	InstallFromManifest(":mozilla:intl:uconv:ucvja2:MANIFEST",						"$distdirectory:uconv:");
+
+	InstallFromManifest(":mozilla:intl:unicharutil:public:MANIFEST",				"$distdirectory:unicharutil");
+	InstallFromManifest(":mozilla:intl:locale:public:MANIFEST",						"$distdirectory:locale:");
+
+	#STRRES
+	InstallFromManifest(":mozilla:intl:strres:public:MANIFEST",						"$distdirectory:strres:");

 	#JPEG
    InstallFromManifest(":mozilla:jpeg:MANIFEST",									"$distdirectory:jpeg:");
@@ -206,6 +215,10 @@ sub BuildDist()

 	#LIVECONNECT
 	InstallFromManifest(":mozilla:js:src:liveconnect:MANIFEST",						"$distdirectory:liveconnect:");
+	
+	#CAPS
+	InstallFromManifest(":mozilla:caps:public:MANIFEST",							"$distdirectory:caps:");
+	InstallFromManifest(":mozilla:caps:include:MANIFEST",							"$distdirectory:caps:");

 	#SECURITY_freenav
    InstallFromManifest(":mozilla:modules:security:freenav:MANIFEST",				"$distdirectory:security:");
@@ -265,10 +278,12 @@ sub BuildDist()
 	#LAYOUT
    InstallFromManifest(":mozilla:layout:build:MANIFEST",							"$distdirectory:layout:");
    InstallFromManifest(":mozilla:layout:base:public:MANIFEST",						"$distdirectory:layout:");
+        InstallFromManifest(":mozilla:layout:html:document:src:MANIFEST",                               "$distdirectory:layout:");
    InstallFromManifest(":mozilla:layout:html:style:public:MANIFEST",				"$distdirectory:layout:");
    InstallFromManifest(":mozilla:layout:html:style:src:MANIFEST",					"$distdirectory:layout:");
    InstallFromManifest(":mozilla:layout:html:base:src:MANIFEST",					"$distdirectory:layout:");
 	InstallFromManifest(":mozilla:layout:html:forms:public:MANIFEST",				"$distdirectory:layout:");
+    InstallFromManifest(":mozilla:layout:html:table:public:MANIFEST",		"$distdirectory:layout:");
    InstallFromManifest(":mozilla:layout:base:src:MANIFEST",						"$distdirectory:layout:");
 	InstallFromManifest(":mozilla:layout:events:public:MANIFEST",					"$distdirectory:layout:");
 	InstallFromManifest(":mozilla:layout:events:src:MANIFEST",						"$distdirectory:layout:");
@@ -288,12 +303,14 @@ sub BuildDist()

 	#DOM
   InstallFromManifest(":mozilla:dom:public:MANIFEST",								"$distdirectory:dom:");
+   InstallFromManifest(":mozilla:dom:public:base:MANIFEST",							"$distdirectory:dom:");
   InstallFromManifest(":mozilla:dom:public:coreDom:MANIFEST",						"$distdirectory:dom:");
   InstallFromManifest(":mozilla:dom:public:coreEvents:MANIFEST",					"$distdirectory:dom:");
   InstallFromManifest(":mozilla:dom:public:events:MANIFEST",						"$distdirectory:dom:");
   InstallFromManifest(":mozilla:dom:public:html:MANIFEST",							"$distdirectory:dom:");
   InstallFromManifest(":mozilla:dom:public:css:MANIFEST",							"$distdirectory:dom:");
   InstallFromManifest(":mozilla:dom:src:jsurl:MANIFEST",							"$distdirectory:dom:");
+   InstallFromManifest(":mozilla:dom:src:base:MANIFEST",							"$distdirectory:dom:");

 	#HTMLPARSER
   InstallFromManifest(":mozilla:htmlparser:src:MANIFEST",							"$distdirectory:htmlparser:");
@@ -327,6 +344,10 @@ sub BuildDist()
 		}
 	}

+	# XPAPPS
+   InstallFromManifest(":mozilla:xpfe:AppCores:public:MANIFEST",						"$distdirectory:xpfe:");
+   InstallFromManifest(":mozilla:xpfe:appshell:public:MANIFEST",						"$distdirectory:xpfe:");
+
 	#// To get out defines in all the project, dummy alias NGLayoutConfigInclude.h into MacConfigInclude.h
 	MakeAlias(":mozilla:config:mac:NGLayoutConfigInclude.h",	":mozilla:dist:config:MacConfigInclude.h");
 }
@@ -438,6 +459,10 @@ sub BuildCommonProjects()
 	BuildOneProject(":mozilla:js:macbuild:LiveConnect.mcp",						"LiveConnect$D.shlb", "", 1, $main::ALIAS_SYM_FILES);

 	BuildOneProject(":mozilla:modules:zlib:macbuild:zlib.mcp",					"zlib$D.shlb", "zlib.toc", 1, $main::ALIAS_SYM_FILES);
+	
+	BuildOneProject(":mozilla:caps:macbuild:Caps.mcp",						 	"Caps$D.shlb", "", 1, $main::ALIAS_SYM_FILES);
+	
+	BuildOneProject(":mozilla:modules:oji:macbuild:oji.mcp",					"oji$D.shlb", "", 1, $main::ALIAS_SYM_FILES);

 	BuildOneProject(":mozilla:modules:libpref:macbuild:libpref.mcp",			"libpref$D.shlb", "libpref.toc", 1, $main::ALIAS_SYM_FILES);

@@ -448,6 +473,15 @@ sub BuildCommonProjects()
 	BuildOneProject(":mozilla:intl:uconv:macbuild:ucvlatin.mcp",				"ucvlatin$D.shlb", "uconvlatin.toc", 1, $main::ALIAS_SYM_FILES);

 	BuildOneProject(":mozilla:intl:uconv:macbuild:ucvja.mcp",					"ucvja$D.shlb", "ucvja.toc", 1, $main::ALIAS_SYM_FILES);
+		
+	BuildOneProject(":mozilla:intl:unicharutil:macbuild:unicharutil.mcp",		"unicharutil$D.shlb", "unicharutil.toc", 1, $main::ALIAS_SYM_FILES);
+
+	BuildOneProject(":mozilla:intl:locale:macbuild:locale.mcp",					"nslocale$D.shlb", "nslocale.toc", 1, $main::ALIAS_SYM_FILES);
+	
+
+    BuildOneProject(":mozilla:intl:strres:macbuild:strres.mcp",					"strres$D.shlb", "strres.toc", 1, $main::ALIAS_SYM_FILES);
+
+

 #// removing powerplant - long live powerplant
 #	BuildOneProject(":mozilla:lib:mac:PowerPlant:PowerPlant.mcp",				"PowerPlant$D.shlb", "", 1, $main::ALIAS_SYM_FILES);
@@ -461,7 +495,8 @@ sub BuildCommonProjects()

 	BuildOneProject(":mozilla:network:macbuild:network.mcp",					"NetworkModular$D.shlb", "network.toc", 1, $main::ALIAS_SYM_FILES);

-	BuildOneProject(":mozilla:rdf:macbuild:rdf.mcp",							"rdf$D.shlb", "rdf.toc", 1, $main::ALIAS_SYM_FILES);
+#// XXX moved this TEMPORARILY to layout while we sort out a dependency
+#	BuildOneProject(":mozilla:rdf:macbuild:rdf.mcp",							"rdf$D.shlb", "rdf.toc", 1, $main::ALIAS_SYM_FILES);
 }


@@ -508,6 +543,7 @@ sub MakeResouceAliases()
 	#//
 	my($resource_dir) = "$dist_dir" . "res:";
 	MakeAlias(":mozilla:layout:html:document:src:ua.css",								"$resource_dir");
+	MakeAlias(":mozilla:webshell:tests:viewer:resources:viewer.properties",								"$resource_dir");

 	my($html_dir) = "$resource_dir" . "html:";
 	MakeAlias(":mozilla:layout:html:base:src:broken-image.gif",							"$html_dir");
@@ -531,6 +567,8 @@ sub MakeResouceAliases()
 	
 	# NOTE: this will change as we move the toolbar/appshell chrome files to a real place
 	BuildFolderResourceAliases(":mozilla:xpfe:browser:src:", 							"$samples_dir");
+	BuildFolderResourceAliases(":mozilla:xpfe:AppCores:xul:",							"$samples_dir");
+	BuildFolderResourceAliases(":mozilla:xpfe:AppCores:xul:resources:",					"$toolbar_dir");
 }


@@ -586,7 +624,11 @@ sub BuildLayoutProjects()
 	BuildOneProject(":mozilla:widget:macbuild:widget.mcp",						"widget$D.shlb", "widget.toc", 1, $main::ALIAS_SYM_FILES);

 	BuildOneProject(":mozilla:webshell:macbuild:webshell.mcp",					"webshell$D.shlb", "webshell.toc", 1, $main::ALIAS_SYM_FILES);
-	
+
+	BuildOneProject(":mozilla:webshell:embed:mac:RaptorShell.mcp",					"RaptorShell$D.shlb", "RaptorShell.toc", 1, $main::ALIAS_SYM_FILES);
+
+	#// XXX this is here because of a very TEMPORARY dependency
+	BuildOneProject(":mozilla:rdf:macbuild:rdf.mcp",							"rdf$D.shlb", "rdf.toc", 1, $main::ALIAS_SYM_FILES);
 }


@@ -628,7 +670,6 @@ sub BuildViewerProjects()
 	BuildOneProject(":mozilla:webshell:tests:viewer:mac:viewer.mcp",			"viewer$D", "viewer.toc", 0, 0);

 #	BuildOneProject(":mozilla:xpfe:macbuild:xpfeviewer.mcp",					"xpfeviewer$D.shlb", "xpfeviewer.toc", 0, 0);
-
 }


@@ -647,6 +688,8 @@ sub BuildXPAppProjects()

 	BuildOneProject(":mozilla:xpfe:appshell:macbuild:AppShell.mcp",				"AppShell$D.shlb", "AppShell.toc", 1, $main::ALIAS_SYM_FILES);

+	BuildOneProject(":mozilla:xpfe:AppCores:macbuild:AppCores.mcp",				"AppCores$D.shlb", "AppCores.toc", 1, $main::ALIAS_SYM_FILES);
+
 	BuildOneProject(":mozilla:xpfe:bootstrap:macbuild:apprunner.mcp",			"apprunner$D", "apprunner.toc", 0, 0);

 }
--- a/mozilla/build/mac/TinderboxNGLayoutOpt.pl
+++ b/mozilla/build/mac/TinderboxNGLayoutOpt.pl
@@ -0,0 +1,84 @@
+#!perl
+
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+#
+# nglayout build script (debug)
+#
+use NGLayoutBuildList;
+use Cwd;
+use Moz;
+
+
+# configuration variables
+
+$DEBUG = 0;
+$ALIAS_SYM_FILES = 0;
+$CLOBBER_LIBS = 0;
+$MOZ_FULLCIRCLE = 0;
+
+$pull{all} = 1;
+$pull{lizard} = 0;
+$pull{xpcom} = 0;
+$pull{imglib} = 0;
+$pull{netlib} = 0;
+$pull{nglayout} = 0;
+$pull{mac} = 0;
+
+$build{all} = 1;
+$build{dist} = 0;
+$build{stubs} = 0;
+$build{common} = 0;
+$build{nglayout} = 0;
+$build{resources} = 0;
+$build{editor} = 0;
+$build{viewer} = 0;
+$build{xpapp} = 0;
+
+
+# script
+
+
+if ($pull{all})
+{
+	foreach $k (keys(%pull))
+	{
+		$pull{$k} = 1;
+	}
+}
+if ($build{all})
+{
+	foreach $k (keys(%build))
+	{
+		$build{$k} = 1;
+	}
+}
+
+# do the work
+
+OpenErrorLog("::::Mozilla.BuildLog");		# Tinderbox requires that name
+
+chdir("::::");
+
+Checkout();
+
+BuildDist();
+
+BuildProjects();
+
+print "Build NGLayout complete\n";
--- a/mozilla/build/mac/test/README
+++ b/mozilla/build/mac/test/README
@@ -0,0 +1,2 @@
+This directory is merely here to test the project editor server. It will go away after
+it is validated. For more information, see http://camelot.
--- a/mozilla/build/mac/test/test.mcp
+++ b/mozilla/build/mac/test/test.mcp
--- a/mozilla/build/mac/test/test1.cpp
+++ b/mozilla/build/mac/test/test1.cpp
@@ -0,0 +1 @@
+// test1.cpp
--- a/mozilla/build/mac/test/test2.cpp
+++ b/mozilla/build/mac/test/test2.cpp
@@ -0,0 +1 @@
+// test2.cpp
--- a/mozilla/build/mac/test/test2.mcp
+++ b/mozilla/build/mac/test/test2.mcp
--- a/mozilla/build/mac/test/test3.mcp
+++ b/mozilla/build/mac/test/test3.mcp
--- a/mozilla/build/mac/test/test4.mcp
+++ b/mozilla/build/mac/test/test4.mcp
--- a/mozilla/caps/macbuild/Caps.mcp
+++ b/mozilla/caps/macbuild/Caps.mcp
--- a/mozilla/caps/public/nsICapsManager.h
+++ b/mozilla/caps/public/nsICapsManager.h
@@ -267,5 +267,5 @@ public:
    0x307f,                                          \
    0x11d2,                                          \
    {0x97, 0xf0, 0x00, 0x80, 0x5f, 0x8a, 0x28, 0xd0} \
-};
+}
 #endif // nsICapsManager_h___
--- a/mozilla/caps/src/admin.cpp
+++ b/mozilla/caps/src/admin.cpp
@@ -18,7 +18,6 @@


 #include "prtypes.h"
-#include "nspr.h"
 #include "prmem.h"
 #include "prmon.h"
 #include "prlog.h"
--- a/mozilla/caps/src/nsCCapsManagerFactory.cpp
+++ b/mozilla/caps/src/nsCCapsManagerFactory.cpp
@@ -16,7 +16,6 @@
 * Reserved.
 */
 #include "prtypes.h"
-#include "nspr.h"
 #include "prmem.h"
 #include "prmon.h"
 #include "prlog.h"
@@ -40,7 +39,11 @@ nsIFactory  *nsCCapsManagerFactory::m_pNSIFactory = NULL;
 +++++++++++++++++++++++++++++++++++++++++++++++++*/

 extern "C" NS_EXPORT nsresult
-NSGetFactory(const nsCID &aClass, nsISupports* servMgr, nsIFactory **aFactory)
+NSGetFactory(nsISupports* servMgr,
+             const nsCID &aClass,
+             const char *aClassName,
+             const char *aProgID,
+             nsIFactory **aFactory)
 {
    
    if (!aClass.Equals(kCCapsManagerCID)) {
@@ -55,7 +58,7 @@ NSGetFactory(const nsCID &aClass, nsISupports* servMgr, nsIFactory **aFactory)
 }

 extern "C" NS_EXPORT PRBool
-NSCanUnload(void)
+NSCanUnload(nsISupports* serviceMgr)
 {
    return PR_FALSE;
 }
@@ -134,8 +137,8 @@ nsCCapsManagerFactory::nsCCapsManagerFactory(void)
      if ( (err == NS_OK) && (m_pNSIFactory != NULL) )
      {
         NS_DEFINE_CID(kCCapsManagerCID, NS_CCAPSMANAGER_CID);
-         nsRepository::RegisterFactory(kCCapsManagerCID, m_pNSIFactory,
-                                     PR_FALSE);
+         nsRepository::RegisterFactory(kCCapsManagerCID, 0, 0,
+                                       m_pNSIFactory, PR_FALSE);
      }
 }

--- a/mozilla/caps/src/nsCaps.cpp
+++ b/mozilla/caps/src/nsCaps.cpp
@@ -18,7 +18,6 @@


 #include "prtypes.h"
-#include "nspr.h"
 #include "prmem.h"
 #include "prmon.h"
 #include "prlog.h"
--- a/mozilla/caps/src/nsPrincipal.cpp
+++ b/mozilla/caps/src/nsPrincipal.cpp
@@ -729,7 +729,6 @@ PRInt32 nsPrincipal::computeHashCode(void)

 char * nsPrincipal::saveCert(void)
 {
-  int result;
  if (itsType == nsPrincipalType_CertChain) {
    return NULL;
  }
@@ -738,6 +737,7 @@ char * nsPrincipal::saveCert(void)
  }

 #ifdef MOZ_SECURITY
+  int result;
  result = SOB_stash_cert((ZIG *)itsZig, itsKeyLen, itsKey);
  if (result < 0) {
    return SOB_get_error(result);
@@ -751,8 +751,6 @@ char * nsPrincipal::saveCert(void)
 char *
 nsPrincipal::getCertAttribute(int attrib)
 {
-    void *result;
-    unsigned long length;
    char *attrStr = "Untrusted certificate (unknown attributes)";
    ZIG *zig = NULL;

@@ -799,6 +797,8 @@ nsPrincipal::getCertAttribute(int attrib)
    }
    
 #ifdef MOZ_SECURITY
+    void *result;
+    unsigned long length;
    if (SOB_cert_attribute(attrib, zig, 
                           itsKeyLen, itsKey, 
                           &result, &length) < 0) {
--- a/mozilla/caps/src/nsPrivilegeManager.cpp
+++ b/mozilla/caps/src/nsPrivilegeManager.cpp
@@ -1277,10 +1277,10 @@ nsPrivilegeManager::getClassPrincipalsFromStack(void* context, PRInt32 callerDep
  int depth = 0;
  struct NSJSJavaFrameWrapper *wrapper = NULL;

-  if (*nsCapsNewNSJSJavaFrameWrapperCallback == NULL) {
+  if (nsCapsNewNSJSJavaFrameWrapperCallback == NULL) {
    return NULL;
  }
-  wrapper = (nsCapsNewNSJSJavaFrameWrapperCallback)(context);
+  wrapper = (*nsCapsNewNSJSJavaFrameWrapperCallback)(context);
  if (wrapper == NULL)
    return NULL;

--- a/mozilla/caps/src/nsUserDialogHelper.cpp
+++ b/mozilla/caps/src/nsUserDialogHelper.cpp
@@ -38,8 +38,8 @@ extern int CAPS_TARGET_HELP_URL;
 //
 char * JavaSecUI_targetRiskStr(int risk) 
 {
-  char * str;
 #ifdef XXX
+  char * str;
  if (risk <= nsRiskType_LowRisk) {
    str = XP_GetString(CAPS_TARGET_RISK_STR_LOW);
  } else if (risk <= nsRiskType_MediumRisk) {
--- a/mozilla/caps/src/nsZip.c
+++ b/mozilla/caps/src/nsZip.c
@@ -310,7 +310,7 @@ static PRBool
 nsZipFindEnd(ns_zip_t *zip, char *endbuf)
 {
    char buf[INBUFSIZ+SIGSIZ], *bp;
-    PRInt32 len, off, mark;
+    PRUint32 len, off, mark;

    /* Need to search backwards from end of file */
    if ((len = PR_Seek(zip->fd, 0, SEEK_END)) == -1) {
--- a/mozilla/client.mak
+++ b/mozilla/client.mak
@@ -86,7 +86,7 @@ pull_lizard:
 	$(CVSCO_LIZARD) $(MOZ_TOP)/lib/liblayer
 	$(CVSCO_LIZARD) $(MOZ_TOP)/modules/zlib
 	$(CVSCO_LIZARD) $(MOZ_TOP)/modules/libutil
-	$(CVSCO_TAG) -r NSPRPUB_RELEASE_3_0 $(MOZ_TOP)/nsprpub
+	$(CVSCO_LIZARD) $(MOZ_TOP)/nsprpub
 	$(CVSCO_LIZARD) $(MOZ_TOP)/sun-java
 	$(CVSCO_LIZARD) $(MOZ_TOP)/nav-java
 	$(CVSCO_LIZARD) $(MOZ_TOP)/js
@@ -146,8 +146,12 @@ clobber_nglayout:
 	@cd $(MOZ_SRC)\mozilla\.
 	nmake -f nglayout.mak clobber_all $(NGLAYOUT_ENV_VARS)

-build_all: build_seamonkey
+build_all: build_seamonkey build_apprunner

 build_seamonkey:
 	@cd $(MOZ_SRC)\mozilla\.
 	nmake -f nglayout.mak all
+
+build_apprunner:
+	@cd $(MOZ_SRC)\mozilla\xpfe\.
+	nmake -f makefile.win
--- a/mozilla/cmd/macfe/central/CIconCache.h
+++ b/mozilla/cmd/macfe/central/CIconCache.h
@@ -1,130 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-//
-// CIconCache.h
-// Mike Pinkerton, Netscape Communications
-//
-// Contains the implementation of the CImageCache class which is a small cache of
-// images which the FE can pull from with a low overhead. It's good for things
-// such as using images for icons in the chrome. Note that this is very
-// different from the XP image cache.
-//
-// The filename is old, owing back to the original name for this class, CIconCache
-//
-
-#pragma once
-
-#include <map>
-#include <string>
-#include "CIconContext.h"
-#include "il_types.h"
-#include "mimages.h"
-
-
-//
-// class ImageCacheData
-//
-// Contains all the relevant data for an image loaded from a url (not an FE icon). The
-// context controls the loading and notification of when the image has been loaded
-// and keeps copies of the FE pixmap data so when imageLib cleans house, we're still ok.
-//
-class ImageCacheData : public LBroadcaster {
-public:
-	ImageCacheData ( const string & inURL ) ;
-	~ImageCacheData ( ) ;
-
-		// Hold on tight to whatever we need to draw, making copies if necessary.
-	void CacheThese ( IL_Pixmap* inImage, IL_Pixmap* inMask )  ;
-	
-	CIconContext* IconContext ( ) const { return mContext; } ;
-	void IconContextHasGoneAway ( ) { mContext = NULL; } ;
-
-	bool ImageAvailable ( ) { return mImage != NULL; } ;
-	
-	NS_PixMap* Image ( ) const { return mImage; }
-	NS_PixMap* Mask ( ) const { return mMask; }
-	
-private:
-
-		// declare these as private so no one can do them.
-	ImageCacheData ( const ImageCacheData & ) ;
-	ImageCacheData & operator= ( const ImageCacheData & ) ;
-	
-	NS_PixMap*	mImage;
-	NS_PixMap*	mMask;
-
-	CIconContext* mContext;
-
-}; // struct ImageCacheData
-
-
-//
-// class CImageCache
-//
-// There should only be one of these in the entire application. Users make a request
-// by asking the cache for a particular URL. If the URL is not loaded, a new icon context
-// will be created and the caller will be placed on a list of listeners for when that
-// image is ready to draw. If the image has already been loaded, the caller will either
-// be placed on that listener list (for animating images) or be given the data directly
-// (for static images).
-//
-class CImageCache : public LListener
-{
-public:
-	enum ELoadResult { kDataPresent, kPutOnWaitingList, kEmptyURL } ;
-	
-	CImageCache ( ) ;
-	virtual ~CImageCache ( ) ;
-	
-		// Make a request for an icon. Will start loading if not present. If an
-		// empty string is passed in, this will return |kEmptyURL| and nothing
-		// will be loaded.
-	ELoadResult RequestIcon ( const string & inURL, const LListener* inClient ) ;
-	
-		// For images that are already loaded (RequestIcon() returned |kDataPresent|,
-		// get the data.
-	void FetchImageData ( const string & inURL, NS_PixMap** outImage, NS_PixMap** outMask ) ;
-	
-		// Housecleaning. When a static image is finished, the context should go away
-		// but the data should remain.
-	void ContextFinished ( const MWContext* inContext ) ;
-	
-		// a view might be going away before an image is finished loading. If that is
-		// the case, it needs to be removed from the context's listener list so we don't
-		// go telling dead objects their image has arrived.
-	void ListenerGoingAway ( const string & inURL, LListener* inObjectGoingAway ) ;
-	
-private:
-
-		// declare these private so no one can make a copy of the cache
-	CImageCache ( const CImageCache & ) ;
-	CImageCache & operator= ( const CImageCache & ) ;
-	
-	void ListenToMessage ( MessageT inMessage, void* inData ) ;
-	
-		// clean out the cache when it gets too big.
-	void Flush() ;
-	
-	map<string, ImageCacheData*>	mCache;
-	
-}; // class CImageCache
-
-
-// global declaration of our icon cache
-CImageCache& gImageCache ( ) ;
--- a/mozilla/cmd/macfe/projects/dummies/MakeDummies.mcp
+++ b/mozilla/cmd/macfe/projects/dummies/MakeDummies.mcp
--- a/mozilla/cmd/macfe/projects/interfaceLib/Interface.mcp
+++ b/mozilla/cmd/macfe/projects/interfaceLib/Interface.mcp
--- a/mozilla/cmd/macfe/utility/CAutoPtr.h
+++ b/mozilla/cmd/macfe/utility/CAutoPtr.h
@@ -1,65 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-/*	CAutoPtr.h	*/
-
-
-#ifndef CAutoPtr_H
-#define CAutoPtr_H
-#pragma once
-
-template<class T>
-class CAutoPtr
-{
-	public:
-		CAutoPtr(T* p = 0) : p_(p) { }
-		
-		CAutoPtr(const CAutoPtr& r) : p_(r.release()) { }
-		
-		~CAutoPtr() { delete p_; }
-		
-		CAutoPtr& operator = (const CAutoPtr& r) {
-			if ((void *)&r != (void *) this) {
-				delete p_;
-				p_ = r.release();
-			}
-			return *this;
-		}
-
-		T& operator*(void) const{ return *p_; }
-		
-		T* operator->(void) const { return p_; }
-		
-		T* get(void) const { return p_; }
-		
-		void reset(T* p = 0) {
-			delete p_;
-			p_ = p;
-		}
-		
-		T* release(void) const { 
-			T* old = p_;
-			const_cast<CAutoPtr*>(this)->p_ = 0;
-			return old; 
-		}
-
-	private:
-		T*	p_;
-};
-
-#endif
--- a/mozilla/cmd/macfe/utility/CAutoPtrXP.h
+++ b/mozilla/cmd/macfe/utility/CAutoPtrXP.h
@@ -1,77 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-/*	CAutoPtrXP.h */
-
-#ifndef CAutoPtrXP_H
-#define CAutoPtrXP_H
-#pragma once
-
-#include "xp_mem.h"
-
-template<class T>
-class CAutoPtrXP
-{
-	public:
-		CAutoPtrXP(T* p = 0) : p_(p) { }
-		
-		CAutoPtrXP(const CAutoPtrXP& r) : p_(r.release()) { }
-		
-		~CAutoPtrXP() {
-			if (p_)
-			{
-				XP_FREE(p_);
-			}
-		}
-		
-		CAutoPtrXP& operator = (const CAutoPtrXP& r) {
-			if ((void *)&r != (void *) this) {
-				if (p_)
-				{
-					XP_FREE(p_);
-				}
-				p_ = r.release();
-			}
-			return *this;
-		}
-
-		T& operator*(void) const{ return *p_; }
-		
-		T* operator->(void) const { return p_; }
-		
-		T* get(void) const { return p_; }
-		
-		void reset(T* p = 0) {
-			if (p_)
-			{
-				XP_FREE(p_);
-			}
-			p_ = p;
-		}
-		
-		T* release() const { 
-			T* old = p_;
-			const_cast<CAutoPtrXP*>(this)->p_ = 0;
-			return old; 
-		}
-
-	private:
-		T*	p_;
-};
-
-#endif
--- a/mozilla/cmd/macfe/utility/CDefaultFontFontSwitcher.cp
+++ b/mozilla/cmd/macfe/utility/CDefaultFontFontSwitcher.cp
@@ -1,47 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-// ===========================================================================
-//	CDefaultFontFontSwitcher.cp
-// ===========================================================================
-//
-//	Authror: Frank Tang ftang@netscape.com
-#include "CDefaultFontFontSwitcher.h"
-#include "uintl.h"
-
-INTL_Encoding_ID CDefaultFontFontSwitcher::gEncodingOfDefaultFont = 0;
-
-CDefaultFontFontSwitcher::CDefaultFontFontSwitcher(UFontSwitcher* delegate)
-{
-	GrafPtr port;
-	::GetPort(&port);
-	mDefaultFont = port->txFont;
-	if(0 == gEncodingOfDefaultFont)
-	{
-		gEncodingOfDefaultFont = ScriptToEncoding(::GetScriptManagerVariable( smSysScript ) );
-	}
-	mDelegate = delegate;
-	
-}
-void CDefaultFontFontSwitcher::EncodingTextFont(INTL_Encoding_ID encoding)
-{
-	if(gEncodingOfDefaultFont == encoding)
-			::TextFont(mDefaultFont);
-	else
-		mDelegate->EncodingTextFont(encoding);
-}
--- a/mozilla/cmd/macfe/utility/CDefaultFontFontSwitcher.h
+++ b/mozilla/cmd/macfe/utility/CDefaultFontFontSwitcher.h
@@ -1,42 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-// ===========================================================================
-//	CDefaultFontFontSwitcher.h
-// ===========================================================================
-//
-//	Authror: Frank Tang ftang@netscape.com
-
-/*-----------------------------------------------------------------------------
-	CDefaultFontFontSwitcher
-	Class know how to switch font depend on CPrefs:CCharSet
- */
-#pragma once
-#include "UPropFontSwitcher.h"
-
-class CDefaultFontFontSwitcher : public UFontSwitcher {
-
-	public:
-		virtual void EncodingTextFont(INTL_Encoding_ID encoding);
-		CDefaultFontFontSwitcher(UFontSwitcher* delegate);
-		void RestoreDefaultFont() {::TextFont(mDefaultFont); }
-	private:
-		static INTL_Encoding_ID gEncodingOfDefaultFont;
-		UFontSwitcher* mDelegate;
-		short mDefaultFont;
-};
--- a/mozilla/cmd/macfe/utility/CLibMsgPeriodical.cp
+++ b/mozilla/cmd/macfe/utility/CLibMsgPeriodical.cp
@@ -1,50 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-//	CLibMsgPeriodical.cp
-
-#include "CLibMsgPeriodical.h"
-#include "msgcom.h"
-
-// ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ
-//	¥¥¥
-//	¥	Class CLibMsgPeriodical
-//	¥¥¥
-//
-//	This is a subclass of LPeriodical which calls the new libmsg init, exit,
-//	and idle routines.
-// ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ
-
-CLibMsgPeriodical::CLibMsgPeriodical() :
-LPeriodical()
-{
-	MSG_InitMsgLib();
-	
-	/* use less memory! */
-	MSG_SetDBCacheSize ( 512 * 1024L );
-}
-
-CLibMsgPeriodical::~CLibMsgPeriodical()
-{
-	MSG_ShutdownMsgLib();
-}
-
-void CLibMsgPeriodical::SpendTime(const EventRecord& /* inMacEvent */)
-{
-	MSG_OnIdle();
-}
--- a/mozilla/cmd/macfe/utility/CLibMsgPeriodical.h
+++ b/mozilla/cmd/macfe/utility/CLibMsgPeriodical.h
@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-//	CLibMsgPeriodical.h					
-
-#pragma once
-
-#include <LPeriodical.h>
-
-// ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ
-//	¥¥¥
-//	¥	Class CLibMsgPeriodical
-//	¥¥¥
-//
-//	This is a subclass of LThread which calls the new libmsg init, exit, and
-//	idle routines. Since we have to call an idle time routine, it seems like
-//	this would be a good candidate to be in a thread
-// ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ
-
-class CLibMsgPeriodical : public LPeriodical
-{
-	public:
-						CLibMsgPeriodical();
-		virtual			~CLibMsgPeriodical();
-
-	protected:
-		virtual void	SpendTime(const EventRecord& inMacEvent);
-};
--- a/mozilla/cmd/macfe/utility/CLibMsgThread.cp
+++ b/mozilla/cmd/macfe/utility/CLibMsgThread.cp
@@ -1,54 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-//	CLibMsgThread.cp
-
-
-#include "CLibMsgThread.h"
-#include "msgcom.h"
-
-// ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ
-//	¥¥¥
-//	¥	Class CLibMsgThread
-//	¥¥¥
-//
-//	This is a subclass of LThread which calls the new libmsg init, exit, and
-//	idle routines. Since we have to call an idle time routine, it seems like
-//	this would be a good candidate as any to be in a thread
-// ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ
-
-CLibMsgThread::CLibMsgThread() :
-LThread(false)
-{
-	MSG_InitMsgLib();
-}
-
-CLibMsgThread::~CLibMsgThread()
-{
-	MSG_ShutdownMsgLib();
-}
-
-void *CLibMsgThread::Run()
-{
-	while(true) {
-		LThread::Yield();
-		MSG_OnIdle();
-		LThread::Yield();
-	}
-	return NULL;
-}
--- a/mozilla/cmd/macfe/utility/CSaveWindowStatus.cp
+++ b/mozilla/cmd/macfe/utility/CSaveWindowStatus.cp
@@ -1,388 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-/*======================================================================================
-	AUTHOR:			Ted Morris <tmorris@netscape.com> - 08 NOV 96
-
-	MODIFICATIONS:
-
-	Date			Person			Description
-	----			------			-----------
-======================================================================================*/
-
-
-/*====================================================================================*/
-	#pragma mark INCLUDE FILES
-/*====================================================================================*/
-
-#include "CSaveWindowStatus.h"
-
-#include "uprefd.h"
-#include "macutil.h"
-
-
-#pragma mark -
-/*====================================================================================*/
-	#pragma mark TYPEDEFS
-/*====================================================================================*/
-
-
-#pragma mark -
-/*====================================================================================*/
-	#pragma mark CONSTANTS
-/*====================================================================================*/
-
-
-#pragma mark -
-/*====================================================================================*/
-	#pragma mark INTERNAL FUNCTION PROTOTYPES
-/*====================================================================================*/
-
-
-#pragma mark -
-/*====================================================================================*/
-	#pragma mark INTERNAL CLASS DECLARATIONS
-/*====================================================================================*/
-
-
-#pragma mark -
-/*====================================================================================*/
-	#pragma mark CLASS IMPLEMENTATIONS
-/*====================================================================================*/
-
-#pragma mark -
-/*======================================================================================
-	Find the global bounds for the pane.
-======================================================================================*/
-
-void CSaveWindowStatus::GetPaneGlobalBounds(LPane *inPane, Rect *outBounds) {
-
-	inPane->CalcPortFrameRect(*outBounds);
-	inPane->PortToGlobalPoint(topLeft(*outBounds));
-	inPane->PortToGlobalPoint(botRight(*outBounds));
-}
-
-
-/*======================================================================================
-	Move this window to an alert position on the main screen.
-======================================================================================*/
-
-void CSaveWindowStatus::MoveWindowToAlertPosition(LWindow *inWindow) {
-
-	Rect bounds;
-	
-	GetPaneGlobalBounds(inWindow, &bounds);
-	
-	GDHandle dominantDevice;
-	LWindow *frontWindowP = UDesktop::FetchTopRegular();
-	
-	if ( frontWindowP ) {
-		dominantDevice = UWindows::FindDominantDevice(
-							UWindows::GetWindowStructureRect(frontWindowP->GetMacPort()));
-	} else {
-		dominantDevice = ::GetMainDevice();
-	}
-	
-	Rect screenRect = (**dominantDevice).gdRect;
-	if ( dominantDevice == ::GetMainDevice() ) {
-		screenRect.top += GetMBarHeight();
-	}
-
-	::OffsetRect(&bounds, screenRect.left + ((screenRect.right - screenRect.left - (bounds.right - bounds.left)) / 2) - bounds.left,
-						  screenRect.top + ((screenRect.bottom - screenRect.top - (bounds.bottom - bounds.top)) / 3) - bounds.top);
-	
-	inWindow->DoSetBounds(bounds);
-}
-
-
-/*======================================================================================
-	Move this window to a new position on the main screen.
-======================================================================================*/
-
-void CSaveWindowStatus::MoveWindowTo(LWindow *inWindow, Point inGlobalTopLeft) {
-
-	Rect bounds;
-	GetPaneGlobalBounds(inWindow, &bounds);
-	
-	::OffsetRect(&bounds, inGlobalTopLeft.h - bounds.left, 
-						  inGlobalTopLeft.v - bounds.top);
-	
-	VerifyWindowBounds(inWindow, &bounds);
-	inWindow->DoSetBounds(bounds);
-}
-
-
-/*======================================================================================
-	Verify the specified bounds against the window min/max sizes and the desktop
-	bounds.
-======================================================================================*/
-static
-inline
-Int16
-pin( const Int16& lo, const Int16& x, const Int16& hi )
-	{
-		return (x<lo) ? lo : ((hi<x) ? hi : x);
-	}
-
-
-void CSaveWindowStatus::VerifyWindowBounds(LWindow *inWindow, Rect *ioGlobalBounds)
-	/*
-		Make sure the entire window is on-screen [for roughly rectangular desktops].
-
-		|ioGlobalBounds| is the proposed content rect of the window, in global coordinates.  It
-		is not necessarily related to the current actual content rect of the window.
-	*/
-{
-			/*
-				First, calculate the rectangle within which the windows content rect must fit,
-				for that window to be entirely on-screen.  Note: we explicitly don't handle the
-				Ôfunny desktopÕ case.  This may be required.
-			*/
-		Int16 desktopMinTop, desktopMaxBottom, desktopMaxWidth;
-		Int16 desktopMinLeft, desktopMaxRight, desktopMaxHeight;
-		{
-				// The bounding box of Ôthe gray regionÕ is the rectangle we want our window to fit entirely within.
-			Rect desktopRect = (**::GetGrayRgn()).rgnBBox;
-
-				// Calculate how much the windows structure region ÔpadsÕ its content region...
-			Rect structureRect	= UWindows::GetWindowStructureRect(inWindow->GetMacPort());
-			Rect contentRect		= UWindows::GetWindowContentRect(inWindow->GetMacPort());
-
-			Int16	topPadding		= contentRect.top - structureRect.top;
-			Int16 bottomPadding	= structureRect.bottom - contentRect.bottom;
-			Int16	leftPadding		= contentRect.left - structureRect.left;
-			Int16	rightPadding	= structureRect.right - contentRect.right;
-
-				// ...and shrink |desktopRect| accordingly (so it is relative to our content rect, instead of our structure rect).
-			desktopRect.top			+= cWindowDesktopMargin + topPadding;
-			desktopRect.bottom	-= cWindowDesktopMargin + bottomPadding;
-			desktopRect.left		+= cWindowDesktopMargin + leftPadding;
-			desktopRect.right		-= cWindowDesktopMargin + rightPadding;
-
-			desktopMinTop			= desktopRect.top;										// windows content rect top must not be above this this
-			desktopMaxBottom	= desktopRect.bottom;									//	...nor its bottom below this
-			desktopMaxHeight	= desktopMaxBottom - desktopMinTop;		//	...nor its height greater than this
-
-			desktopMinLeft		= desktopRect.left;										//	...
-			desktopMaxRight		= desktopRect.right;
-			desktopMaxWidth		= desktopMaxRight - desktopMinLeft;
-		}
-
-			/*
-				Second, calculate the minimum and maximum size of the window based on its own min/max settings
-				and the limits imposed by the screen.
-			*/
-		Int16 minHeight, maxHeight, minWidth, maxWidth;
-		{
-			Rect windowLimits;
-			inWindow->GetMinMaxSize(windowLimits);
-
-			minHeight = pin(0,					windowLimits.top,			desktopMaxHeight);
-			maxHeight = pin(minHeight,	windowLimits.bottom,	desktopMaxHeight);
-			minWidth	= pin(0,					windowLimits.left,		desktopMaxWidth);
-			maxWidth	= pin(minWidth,		windowLimits.right,		desktopMaxWidth);
-		}
-
-			/*
-				Third, pin the windows size to its calculated limits.
-			*/
-		Int16 height	= pin(minHeight, ioGlobalBounds->bottom-ioGlobalBounds->top, maxHeight);
-		Int16 width		= pin(minWidth, ioGlobalBounds->right-ioGlobalBounds->left, maxWidth);
-
-
-			/*
-				Fourth (and finally), now that we know its size, pin its location onto the screen, and
-				stuff the calculated results back into |ioGlobalBounds|.
-			*/
-		ioGlobalBounds->top			= pin(desktopMinTop, ioGlobalBounds->top, desktopMaxBottom - height);
-		ioGlobalBounds->left		= pin(desktopMinLeft, ioGlobalBounds->left, desktopMaxRight - width);
-
-		ioGlobalBounds->bottom	= ioGlobalBounds->top + height;
-		ioGlobalBounds->right		= ioGlobalBounds->left + width;
-}
-
-
-/*======================================================================================
-	Better create window with saved status ID.
-======================================================================================*/
-
-LWindow *CSaveWindowStatus::CreateWindow(ResIDT inWindowID, LCommander *inSuperCommander) {
-
-	LCommander::SetDefaultCommander(inSuperCommander);
-	LAttachable::SetDefaultAttachable(nil);
-
-	LWindow	*theWindow = (LWindow *) UReanimator::ReadObjects('PPob', inWindowID);
-	
-	try
-	{
-		FailNIL_(theWindow);
-		theWindow->FinishCreate();
-		if ( theWindow->HasAttribute(windAttr_ShowNew) ) {
-			theWindow->Show();
-		}
-	}
-	catch(...)
-	{
-		delete theWindow;
-		throw;
-	} 
-	return theWindow;
-}
-
-/*======================================================================================
-	Do basic initialization of the window. Should be called from the window's 
-	FinishCreateSelf().
-======================================================================================*/
-
-void CSaveWindowStatus::FinishCreateWindow()
-{
-	Handle statusInfoH = CPrefs::ReadWindowData(GetStatusResID());
-	Boolean doAdjustNIL = true;
-	
-	try {
-	
-		// Validate stored state info
-		if ( statusInfoH ) {
-			LHandleStream statusStream(statusInfoH);
-			UInt16 bogusVersion, version;
-			// As of 97/10/13, we are writing out zero as the first version data,
-			// because Communicator 4.0x was checking version >= GetValidStatusVersion(),
-			// and thus trying to decode future versions of the status, and crashing.
-			statusStream >> bogusVersion; // and discard this zero.
-			statusStream >> version;
-			if ( bogusVersion == 0 && version == GetValidStatusVersion() ) {
-				doAdjustNIL = false;
-				ReadWindowStatus(&statusStream);
-			}
-		}
-	}
-	catch ( ExceptionCode inErr) {
-		
-		Assert_(false); // Just catch it, don't do anything!
-	}
-	catch ( OSErr inErr ) { }		// probably bad status version. Again, do nothing
-	
-	if ( doAdjustNIL ) ReadWindowStatus(nil);
-}
-
-void CSaveWindowStatus::FinishCreateWindow(CSaveWindowStatus* inTemplateWindow)
-{
-	ThrowIfNot_(inTemplateWindow->GetStatusResID() == GetStatusResID());
-	ThrowIfNot_(inTemplateWindow->GetValidStatusVersion() == GetValidStatusVersion());
-	LHandleStream statusStream;
-	inTemplateWindow->WriteWindowStatus(&statusStream);
-	statusStream.SetMarker(0, streamFrom_Start);
-	this->ReadWindowStatus(&statusStream);
-	// Stagger.
-	Rect bounds;
-	GetPaneGlobalBounds(mWindowSelf, &bounds);
-	OffsetRect(&bounds, 20, 20);
-	VerifyWindowBounds(mWindowSelf, &bounds);
-	mWindowSelf->DoSetBounds(bounds);
-}
-
-/*======================================================================================
-	Try to close a Window as a result of direct user action. Save window status. Should
-	be called from the window's AttemptClose() or DoClose() method as follows:
-	
-	virtual void		AttemptClose() {
-							AttemptCloseWindow();
-							inherited::AttemptClose();
-						}
-	virtual void		DoClose() {
-							AttemptCloseWindow();
-							inherited::DoClose();
-						}
-======================================================================================*/
-
-void CSaveWindowStatus::AttemptCloseWindow() {
-
-	Assert_(mWindowSelf->GetSuperCommander() != nil);
-	
-	if ( mWindowSelf->GetSuperCommander()->AllowSubRemoval(mWindowSelf) ) {
-		SaveStatusInfo();
-	}
-}
-
-
-/*======================================================================================
-	Adjust the window to stored preferences. This method should be overriden in subclasses to 
-	read data from the stream as stored preferences. Make sure to call this method
-	first.
-======================================================================================*/
-
-void CSaveWindowStatus::ReadWindowStatus(LStream *inStatusData)
-{
-	if ( inStatusData != nil )
-	{
-		mHasSavedStatus = true;			
-
-		Rect bounds;
-		*inStatusData >> bounds;
-		VerifyWindowBounds(mWindowSelf, &bounds);
-		mWindowSelf->DoSetBounds(bounds);
-	}
-	// Don't center the window in the default case, because not all clients
-	// want this.
-}
-
-
-/*======================================================================================
-	Get window stored preferences. This method should be overriden in subclasses to 
-	write data to the stream that needs to be stored. Make sure to call this method
-	first.
-======================================================================================*/
-
-void CSaveWindowStatus::WriteWindowStatus(LStream *outStatusData)
-{
-	mHasSavedStatus = true;			
-	
-	Rect bounds;
-	GetPaneGlobalBounds(mWindowSelf, &bounds);
-
-	*outStatusData << bounds;
-}
-
-
-/*======================================================================================
-	Store window preferences.
-======================================================================================*/
-
-void CSaveWindowStatus::SaveStatusInfo()
-{
-	if ( !mCanSaveStatus ) return;
-	
-	try
-	{
-		LHandleStream statusStream;
-		UInt16 bogusVersion = 0; // so that Communicator 4.0x will not use the data.
-		statusStream << bogusVersion;
-		statusStream << GetValidStatusVersion();
-		
-		WriteWindowStatus(&statusStream);
-		
-		CPrefs::WriteWindowData(statusStream.GetDataHandle(), GetStatusResID());
-	}
-	catch(...)
-	{
-		
-		Assert_(false); // Just catch it, don't do anything!
-	}
-}
-
-
--- a/mozilla/cmd/macfe/utility/CSaveWindowStatus.h
+++ b/mozilla/cmd/macfe/utility/CSaveWindowStatus.h
@@ -1,106 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#ifndef __H_CSaveWindowStatus
-#define __H_CSaveWindowStatus
-#pragma once
-
-/*======================================================================================
-	AUTHOR:			Ted Morris <tmorris@netscape.com> - 08 NOV 96
-
-	DESCRIPTION:	Defines a mix-in class for saving a window's status to the preferences
-					file.
-
-	MODIFICATIONS:
-
-	Date			Person			Description
-	----			------			-----------
-======================================================================================*/
-
-
-/*====================================================================================*/
-	#pragma mark INCLUDE FILES
-/*====================================================================================*/
-
-class LWindow;
-class LStream;
-
-
-#pragma mark -
-/*====================================================================================*/
-	#pragma mark CLASS DECLARATIONS
-/*====================================================================================*/
-
-class CSaveWindowStatus {
-					  
-public:
-
-						CSaveWindowStatus(LWindow *inWindow) {
-							mWindowSelf = inWindow;
-							mCanSaveStatus = true;
-							mHasSavedStatus = false;
-							Assert_(mWindowSelf != nil);
-						}
-
-	Boolean				CanSaveStatus() {
-							return mCanSaveStatus;
-						}
-	void				SetCanSaveStatus(Boolean inCanSave) {
-							mCanSaveStatus = inCanSave;
-						}
-	
-						enum { 
-							cWindowDesktopMargin = 4
-						,	cMinSavedStatusSize = sizeof(Int16) + sizeof(Rect)
-						};
-
-	static void			GetPaneGlobalBounds(LPane *inPane, Rect *outBounds);
-	static void			MoveWindowToAlertPosition(LWindow *inWindow);
-	static void			MoveWindowTo(LWindow *inWindow, Point inGlobalTopLeft);
-	static void			VerifyWindowBounds(LWindow *inWindow, Rect *ioGlobalBounds);
-	static LWindow		*CreateWindow(ResIDT inWindowID, LCommander *inSuperCommander);
-	
-protected:
-
-	void				FinishCreateWindow(); // from disk
-	void				FinishCreateWindow(CSaveWindowStatus* templateStatus);
-	void				AttemptCloseWindow();
-	void				SaveStatusInfo();
-	
-						// It is only valid to call HasSavedStatus() after
-						// the window has been properly created (i.e. after
-						// calling FinishCreateWindow() ).
-						
-	Boolean				HasSavedStatus()
-						{
-							return mHasSavedStatus;
-						}
-
-	virtual ResIDT		GetStatusResID() const = 0; // client must provide!
-	virtual UInt16		GetValidStatusVersion() const = 0; // client must provide!
-	virtual void		ReadWindowStatus(LStream *inStatusData);
-	virtual void		WriteWindowStatus(LStream *outStatusData);
-	
-	LWindow				*mWindowSelf;
-	Boolean				mCanSaveStatus;
-	
-private:
-	Boolean				mHasSavedStatus;
-};
-#endif // __H_CSaveWindowStatus
-
--- a/Show More
+++ b/Show More