Changeset 589 in vbox for trunk/src/libs/xpcom18a4/xpcom

Timestamp:

Feb 4, 2007 12:25:57 PM (18 years ago)

Author:

vboxsync

Message:

Make it build and run on Mac OS X.

Location:

trunk/src/libs/xpcom18a4/xpcom

Files:

• MoreFiles/FSCopyObject.c (modified) (1 diff)
• MoreFiles/FSCopyObject.h (modified) (1 diff)
• MoreFiles/MoreFilesX.c (modified) (5 diffs)
• MoreFiles/MoreFilesX.h (modified) (4 diffs)
• io/nsILocalFileMac.idl (modified) (17 diffs)
• io/nsLocalFileOSX.cpp (modified) (124 diffs)
• io/nsLocalFileOSX.h (modified) (4 diffs)
• reflect/xptcall/src/md/unix/xptcinvoke_unixish_x86.cpp (modified) (4 diffs)
• reflect/xptcall/src/md/unix/xptcstubs_unixish_x86.cpp (modified) (4 diffs)
• tests/nsIFileTest.cpp (modified) (26 diffs)

trunk/src/libs/xpcom18a4/xpcom/MoreFiles/FSCopyObject.c

@@ -44 +44 @@
         Copyright © 2002 Apple Computer, Inc., All Rights Reserved
 */
+
+// Modified 2006-01-23 - added this comment.
 
 #include "FSCopyObject.h"

trunk/src/libs/xpcom18a4/xpcom/MoreFiles/FSCopyObject.h

@@ -42 +42 @@
 */
 
+// Modified 2006-01-23 - added this comment.
 
 #ifndef __FSCOPYOBJECT_H__

trunk/src/libs/xpcom18a4/xpcom/MoreFiles/MoreFilesX.c

@@ -69 +69 @@
                  <1>     1/25/02        JL              MoreFilesX 1.0
 */
+
+// Modified 2006-01-23 - added this comment.
 
 #if defined(__MACH__)
@@ -2125 +2127 @@
 /*****************************************************************************/
 
-OSErr
-FSLockRange(
+/* Renamed from FSLockRange to MFX_FSLockRange to avoid a conflict with
+ * the FSLockRange function present in the system library since Mac OS X
+ * 10.4. */
+
+OSErr
+MFX_FSLockRange(
         SInt16 refNum,
         SInt32 rangeLength,
@@ -2148 +2154 @@
 /*****************************************************************************/
 
-OSErr
-FSUnlockRange(
+/* Renamed from FSUnlockRange to MFX_FSUnlockRange to avoid a conflict with
+ * the FSUnlockRange function present in the system library since Mac OS X
+ * 10.4. */
+
+OSErr
+MFX_FSUnlockRange(
         SInt16 refNum,
         SInt32 rangeLength,
@@ -2307 +2317 @@
 /*****************************************************************************/
 
+// This function exists in Mac OS X 10.5, we cannot re-define it here.
+// We don't use this function, so just don't compile it.
+#if 0
 OSErr
 FSVolumeMount(
@@ -2330 +2343 @@
         return ( result );
 }
+#endif
 
 /*****************************************************************************/

trunk/src/libs/xpcom18a4/xpcom/MoreFiles/MoreFilesX.h

@@ -84 +84 @@
                                 do less work.
 */
+
+// Modified 2006-01-23 - added this comment.
 
 #ifndef __MOREFILESX__
@@ -1333 +1335 @@
 /*****************************************************************************/
 
-#pragma mark FSLockRange
-
-OSErr
-FSLockRange(
+#pragma mark MFX_FSLockRange
+/* Renamed from FSLockRange to MFX_FSLockRange to avoid a conflict with
+ * the FSLockRange function present in the system library since Mac OS X
+ * 10.4. */
+
+OSErr
+MFX_FSLockRange(
         SInt16 refNum,
         SInt32 rangeLength,
@@ -1356 +1361 @@
 /*****************************************************************************/
 
-#pragma mark FSUnlockRange
-
-OSErr
-FSUnlockRange(
+#pragma mark MFX_FSUnlockRange
+/* Renamed from FSUnlockRange to MFX_FSUnlockRange to avoid a conflict with
+ * the FSUnlockRange function present in the system library since Mac OS X
+ * 10.4. */
+
+OSErr
+MFX_FSUnlockRange(
         SInt16 refNum,
         SInt32 rangeLength,
@@ -1483 +1491 @@
 #pragma mark FSVolumeMount
 
+// This function exists in Mac OS X 10.5, we cannot re-define it here.
+// We don't use this function, so just don't compile it.
+#if 0
 OSErr
 FSVolumeMount(
         const void *volMountInfo,
         FSVolumeRefNum *volRefNum);
+#endif
 
 /*

trunk/src/libs/xpcom18a4/xpcom/io/nsILocalFileMac.idl

@@ -22 +22 @@
  * Contributor(s):
  *  Conrad Carlen <[email protected]>
+ *  Mark Mentovai <[email protected]>
  *
  * Alternatively, the contents of this file may be used under the terms of
@@ -51 +52 @@
       native CFURLRef(CFURLRef);
 
-[uuid(614c3010-1dd2-11b2-be04-bcd57a64ffc9)]
+[scriptable, uuid(748f3ffe-27d9-4402-9de9-494badbeebf4)]
 interface nsILocalFileMac : nsILocalFile
 {
@@ -65 +66 @@
     *
     */
-    void initWithCFURL(in CFURLRef aCFURL);
+  [noscript] void initWithCFURL(in CFURLRef aCFURL);
 
    /**
@@ -77 +78 @@
     *
     */
-    void initWithFSRef([const] in FSRefPtr aFSRef);
+  [noscript] void initWithFSRef([const] in FSRefPtr aFSRef);
 
    /**
@@ -88 +89 @@
     *
     */
-    void initWithFSSpec([const] in FSSpecPtr aFileSpec);
+  [noscript] void initWithFSSpec([const] in FSSpecPtr aFileSpec);
 
    /**
@@ -100 +101 @@
     *
     */
-    void initToAppWithCreatorCode(in OSType aAppCreator);
+  [noscript] void initToAppWithCreatorCode(in OSType aAppCreator);
 
     /**
@@ -116 +117 @@
     *
     * @return
-    *  
-    */ 
-    CFURLRef getCFURL();
- 
+    *
+    */
+  [noscript] CFURLRef getCFURL();
+
     /**
     * getFSRef
@@ -133 +134 @@
     *
     * @return
-    *  
-    */ 
-    FSRef getFSRef();
-   
+    *
+    */
+  [noscript] FSRef getFSRef();
+
    /**
     * getFSSpec
@@ -148 +149 @@
     *
     * @return
-    *  
-    */ 
-    FSSpec getFSSpec();
+    *
+    */
+  [noscript] FSSpec getFSSpec();
 
    /**
     * fileSizeWithResFork
-    * 
+    *
     * Returns the combined size of both the data fork and the resource
     * fork (if present) rather than just the size of the data fork
@@ -160 +161 @@
     *
     */
-    readonly attribute PRInt64 fileSizeWithResFork;
-    
+   readonly attribute PRInt64 fileSizeWithResFork;
+
    /**
     * Use with SetFileType() to specify the signature of current process
     */
-    const unsigned long CURRENT_PROCESS_CREATOR = 0x8000000;
-    
+   const unsigned long CURRENT_PROCESS_CREATOR = 0x8000000;
+
    /**
     * fileType, creator
@@ -173 +174 @@
     *
     */
-    attribute OSType fileType;
-    attribute OSType fileCreator;
-    
+   [noscript] attribute OSType fileType;
+   [noscript] attribute OSType fileCreator;
+
    /**
     * setFileTypeAndCreatorFromMIMEType
@@ -185 +186 @@
     *
     */
-    void setFileTypeAndCreatorFromMIMEType(in string aMIMEType);
-    
+   void setFileTypeAndCreatorFromMIMEType(in string aMIMEType);
+
    /**
     * setFileTypeAndCreatorFromExtension
@@ -196 +197 @@
     *
     */
-    void setFileTypeAndCreatorFromExtension(in string aExtension);
-    
+   void setFileTypeAndCreatorFromExtension(in string aExtension);
+
    /**
     * launchWithDoc
@@ -207 +208 @@
     *
     */
-    void launchWithDoc(in nsILocalFile aDocToLoad, in boolean aLaunchInBackground);
+   void launchWithDoc(in nsILocalFile aDocToLoad, in boolean aLaunchInBackground);
 
    /**
@@ -220 +221 @@
     *
     */
-    void openDocWithApp(in nsILocalFile aAppToOpenWith, in boolean aLaunchInBackground);
+   void openDocWithApp(in nsILocalFile aAppToOpenWith, in boolean aLaunchInBackground);
 
    /**
@@ -228 +229 @@
     *
     */
-    boolean isPackage();
+   boolean isPackage();
+
+   /**
+    * bundleDisplayName
+    *
+    * returns the display name of the application bundle (usually the human
+    * readable name of the application)
+    */
+   readonly attribute AString bundleDisplayName;
+
+   /**
+    * bundleIdentifier
+    *
+    * returns the identifier of the bundle
+    */
+   readonly attribute AUTF8String bundleIdentifier;
 };
 
@@ -240 +256 @@
 
 NS_EXPORT nsresult NS_NewLocalFileWithFSSpec(const FSSpec* inSpec, PRBool followSymlinks, nsILocalFileMac* *result);
+
+// NS_NewLocalFileWithFSRef is available since Mozilla 1.8.1.
+NS_EXPORT nsresult NS_NewLocalFileWithFSRef(const FSRef* aFSRef, PRBool aFollowSymlinks, nsILocalFileMac** result);
 }
 %}

trunk/src/libs/xpcom18a4/xpcom/io/nsLocalFileOSX.cpp

@@ -23 +23 @@
  *  Conrad Carlen <[email protected]>
  *  Jungshik Shin <[email protected]>
+ *  Asaf Romano <[email protected]>
+ *  Mark Mentovai <[email protected]>
  *
  * Alternatively, the contents of this file may be used under the terms of
@@ -39 +41 @@
 
 #include "nsLocalFile.h"
+#include "nsDirectoryServiceDefs.h"
 
 #include "nsString.h"
 #include "nsReadableUtils.h"
+#include "nsIDirectoryEnumerator.h"
 #include "nsISimpleEnumerator.h"
 #include "nsITimelineService.h"
@@ -49 +53 @@
 #include "prmem.h"
 #include "nsCRT.h"
+#include "nsHashKeys.h"
 
 #include "MoreFilesX.h"
 #include "FSCopyObject.h"
 #include "nsAutoBuffer.h"
+#include "nsTraceRefcntImpl.h"
 
 // Mac Includes
-#include <Aliases.h>
-#include <Gestalt.h>
-#include <AppleEvents.h>
-#include <AEDataModel.h>
-#include <Processes.h>
 #include <Carbon/Carbon.h>
 
 // Unix Includes
+#include <unistd.h>
 #include <sys/stat.h>
+#include <stdlib.h>
+
+#if !defined(MAC_OS_X_VERSION_10_4) || MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_4
+#define GetAliasSizeFromRecord(aliasRecord) aliasRecord.aliasSize
+#else
+#define GetAliasSizeFromRecord(aliasRecord) GetAliasSizeFromPtr(&aliasRecord)
+#endif
+
+#define CHECK_mBaseRef()                        \
+    PR_BEGIN_MACRO                              \
+        if (!mBaseRef)                          \
+            return NS_ERROR_NOT_INITIALIZED;    \
+    PR_END_MACRO
 
 //*****************************************************************************
@@ -108 +123 @@
         mFile.SetFollowLinks(mSavedState);
     }
-    
+
   private:
     nsLocalFile& mFile;
@@ -117 +132 @@
 #pragma mark [nsDirEnumerator]
 
-class nsDirEnumerator : public nsISimpleEnumerator
+class nsDirEnumerator : public nsISimpleEnumerator,
+                        public nsIDirectoryEnumerator
 {
     public:
@@ -130 +146 @@
         }
 
-        nsresult Init(nsILocalFileMac* parent) 
+        nsresult Init(nsILocalFileMac* parent)
         {
           NS_ENSURE_ARG(parent);
-          
+
           OSErr err;
           nsresult rv;
           FSRef parentRef;
-          
+
           rv = parent->GetFSRef(&parentRef);
           if (NS_FAILED(rv))
             return rv;
-          
+
           mFSRefsArray = (FSRef *)nsMemory::Alloc(sizeof(FSRef)
                                                   * kRequestCountPerIteration);
           if (!mFSRefsArray)
             return NS_ERROR_OUT_OF_MEMORY;
-          
+
           err = ::FSOpenIterator(&parentRef, kFSIterateFlat, &mIterator);
           if (err != noErr)
             return MacErrorMapper(err);
-                              
+
           return NS_OK;
         }
 
-        NS_IMETHOD HasMoreElements(PRBool *result) 
+        NS_IMETHOD HasMoreElements(PRBool *result)
         {
           if (mNext == nsnull) {
@@ -168 +184 @@
                                            nsnull,
                                            nsnull);
-            
+
               if (err == noErr || err == errFSNoMoreItems) {
                 mArrayCnt = actualCnt;
@@ -183 +199 @@
               mArrayIndex++;
               mNext = newFile;
-            } 
+            }
           }
           *result = mNext != nsnull;
+          if (!*result)
+            Close();
           return NS_OK;
         }
 
-        NS_IMETHOD GetNext(nsISupports **result) 
+        NS_IMETHOD GetNext(nsISupports **result)
         {
             NS_ENSURE_ARG_POINTER(result);
@@ -206 +224 @@
         }
 
+        NS_IMETHOD GetNextFile(nsIFile **result)
+        {
+            *result = nsnull;
+            PRBool hasMore = PR_FALSE;
+            nsresult rv = HasMoreElements(&hasMore);
+            if (NS_FAILED(rv) || !hasMore)
+                return rv;
+            *result = mNext;
+            NS_IF_ADDREF(*result);
+            mNext = nsnull;
+            return NS_OK;
+        }
+
+        NS_IMETHOD Close()
+        {
+          if (mIterator) {
+            ::FSCloseIterator(mIterator);
+            mIterator = nsnull;
+          }
+          if (mFSRefsArray) {
+            nsMemory::Free(mFSRefsArray);
+            mFSRefsArray = nsnull;
+          }
+          return NS_OK;
+        }
+
     private:
-        ~nsDirEnumerator() 
+        ~nsDirEnumerator()
         {
-          if (mIterator)
-            ::FSCloseIterator(mIterator);
-          if (mFSRefsArray)
-            nsMemory::Free(mFSRefsArray);
+          Close();
         }
 
@@ -221 +262 @@
           kRequestCountPerIteration = ((4096 * 4) / sizeof(FSRef))
         };
-        
+
         nsCOMPtr<nsILocalFileMac>   mNext;
-        
+
         FSIterator              mIterator;
         FSRef                   *mFSRefsArray;
@@ -229 +270 @@
 };
 
-NS_IMPL_ISUPPORTS1(nsDirEnumerator, nsISimpleEnumerator)
+NS_IMPL_ISUPPORTS2(nsDirEnumerator, nsISimpleEnumerator, nsIDirectoryEnumerator)
 
 #pragma mark -
@@ -242 +283 @@
       dataHandle = nil;
     }
-              
+
     ~StAEDesc()
     {
@@ -305 +346 @@
 #pragma mark [nsISupports]
 
-NS_IMPL_THREADSAFE_ISUPPORTS3(nsLocalFile,
+NS_IMPL_THREADSAFE_ISUPPORTS4(nsLocalFile,
                               nsILocalFileMac,
                               nsILocalFile,
-                              nsIFile)
-                              
+                              nsIFile,
+                              nsIHashable)
+
 NS_METHOD nsLocalFile::nsLocalFileConstructor(nsISupports* outer, const nsIID& aIID, void* *aInstancePtr)
 {
@@ -318 +360 @@
   if (inst == NULL)
     return NS_ERROR_OUT_OF_MEMORY;
-  
+
   nsresult rv = inst->QueryInterface(aIID, aInstancePtr);
   if (NS_FAILED(rv))
@@ -338 +380 @@
 NS_IMETHODIMP nsLocalFile::Append(const nsAString& aNode)
 {
-  return AppendNative(NS_ConvertUCS2toUTF8(aNode));
+  return AppendNative(NS_ConvertUTF16toUTF8(aNode));
 }
 
@@ -344 +386 @@
 NS_IMETHODIMP nsLocalFile::AppendNative(const nsACString& aNode)
 {
-  if (!mBaseRef)
-    return NS_ERROR_NOT_INITIALIZED;
+  // Check we are correctly initialized.
+  CHECK_mBaseRef();
 
   nsACString::const_iterator start, end;
@@ -372 +414 @@
 NS_IMETHODIMP nsLocalFile::Normalize()
 {
-    return NS_OK;
+  // Check we are correctly initialized.
+  CHECK_mBaseRef();
+
+  // CFURL doesn't doesn't seem to resolve paths containing relative
+  // components, so we'll nick the stdlib code from nsLocalFileUnix
+  UInt8 path[PATH_MAX] = "";
+  Boolean success;
+  success = ::CFURLGetFileSystemRepresentation(mBaseRef, true, path, PATH_MAX);
+  if (!success)
+    return NS_ERROR_FAILURE;
+
+  char resolved_path[PATH_MAX] = "";
+  char *resolved_path_ptr = nsnull;
+  resolved_path_ptr = realpath((char*)path, resolved_path);
+
+  // if there is an error, the return is null.
+  if (!resolved_path_ptr)
+      return NSRESULT_FOR_ERRNO();
+
+  // Need to know whether we're a directory to create a new CFURLRef
+  PRBool isDirectory;
+  nsresult rv = IsDirectory(&isDirectory);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  rv = NS_ERROR_FAILURE;
+  CFStringRef pathStrRef =
+    ::CFStringCreateWithCString(kCFAllocatorDefault,
+                                resolved_path,
+                                kCFStringEncodingUTF8);
+  if (pathStrRef) {
+    CFURLRef newURLRef =
+      ::CFURLCreateWithFileSystemPath(kCFAllocatorDefault, pathStrRef,
+                                      kCFURLPOSIXPathStyle, isDirectory);
+    if (newURLRef) {
+      SetBaseRef(newURLRef);
+      ::CFRelease(newURLRef);
+      rv = NS_OK;
+    }
+    ::CFRelease(pathStrRef);
+  }
+
+  return rv;
 }
 
@@ -380 +463 @@
   if (type != NORMAL_FILE_TYPE && type != DIRECTORY_TYPE)
     return NS_ERROR_FILE_UNKNOWN_TYPE;
-  if (!mBaseRef)
-    return NS_ERROR_NOT_INITIALIZED;
-  
+
+  // Check we are correctly initialized.
+  CHECK_mBaseRef();
+
   nsStringArray nonExtantNodes;
   CFURLRef pathURLRef = mBaseRef;
@@ -389 +473 @@
   nsAutoBuffer<UniChar, FILENAME_BUFFER_SIZE> buffer;
   Boolean success;
-  
+
   // Work backwards through the path to find the last node which
   // exists. Place the nodes which don't exist in an array and we'll
@@ -405 +489 @@
     ::CFRelease(leafStrRef);
     leafStrRef = nsnull;
-    
+
     // Get the parent of the leaf for the next go round
     CFURLRef parent = ::CFURLCreateCopyDeletingLastPathComponent(NULL, pathURLRef);
@@ -423 +507 @@
   if (nodesToCreate == 0)
     return NS_ERROR_FILE_ALREADY_EXISTS;
-  
-  OSErr err;    
+
+  OSErr err;
   nsAutoString nextNodeName;
   for (PRInt32 i = nodesToCreate - 1; i > 0; i--) {
@@ -451 +535 @@
                                     nsnull, nsnull, nsnull, nsnull);
   }
-            
+
   return MacErrorMapper(err);
 }
@@ -468 +552 @@
 NS_IMETHODIMP nsLocalFile::SetLeafName(const nsAString& aLeafName)
 {
-  return SetNativeLeafName(NS_ConvertUCS2toUTF8(aLeafName));
+  return SetNativeLeafName(NS_ConvertUTF16toUTF8(aLeafName));
 }
 
@@ -474 +558 @@
 NS_IMETHODIMP nsLocalFile::GetNativeLeafName(nsACString& aNativeLeafName)
 {
-  if (!mBaseRef)
-    return NS_ERROR_NOT_INITIALIZED;
+  // Check we are correctly initialized.
+  CHECK_mBaseRef();
+
   nsresult rv = NS_ERROR_FAILURE;
   CFStringRef leafStrRef = ::CFURLCopyLastPathComponent(mBaseRef);
@@ -482 +567 @@
     ::CFRelease(leafStrRef);
   }
-  return rv;                                  
+  return rv;
 }
 
 NS_IMETHODIMP nsLocalFile::SetNativeLeafName(const nsACString& aNativeLeafName)
 {
-  if (!mBaseRef)
-    return NS_ERROR_NOT_INITIALIZED;
+  // Check we are correctly initialized.
+  CHECK_mBaseRef();
+
   nsresult rv = NS_ERROR_FAILURE;
   CFURLRef parentURLRef = ::CFURLCreateCopyDeletingLastPathComponent(kCFAllocatorDefault, mBaseRef);
@@ -514 +600 @@
 NS_IMETHODIMP nsLocalFile::CopyTo(nsIFile *newParentDir, const nsAString& newName)
 {
-    return MoveCopy(newParentDir, newName, PR_TRUE, PR_FALSE);
+  return CopyInternal(newParentDir, newName, PR_FALSE);
 }
 
@@ -520 +606 @@
 NS_IMETHODIMP nsLocalFile::CopyToNative(nsIFile *newParentDir, const nsACString& newName)
 {
-    return MoveCopy(newParentDir, NS_ConvertUTF8toUCS2(newName), PR_TRUE, PR_FALSE);
+  return CopyInternal(newParentDir, NS_ConvertUTF8toUTF16(newName), PR_FALSE);
 }
 
@@ -526 +612 @@
 NS_IMETHODIMP nsLocalFile::CopyToFollowingLinks(nsIFile *newParentDir, const nsAString& newName)
 {
-    return MoveCopy(newParentDir, newName, PR_TRUE, PR_TRUE);
+  return CopyInternal(newParentDir, newName, PR_TRUE);
 }
 
@@ -532 +618 @@
 NS_IMETHODIMP nsLocalFile::CopyToFollowingLinksNative(nsIFile *newParentDir, const nsACString& newName)
 {
-    return MoveCopy(newParentDir, NS_ConvertUTF8toUCS2(newName), PR_TRUE, PR_TRUE);
+  return CopyInternal(newParentDir, NS_ConvertUTF8toUTF16(newName), PR_TRUE);
 }
 
@@ -538 +624 @@
 NS_IMETHODIMP nsLocalFile::MoveTo(nsIFile *newParentDir, const nsAString& newName)
 {
-    return MoveCopy(newParentDir, newName, FALSE, FALSE);
+  return MoveToNative(newParentDir, NS_ConvertUTF16toUTF8(newName));
 }
 
@@ -544 +630 @@
 NS_IMETHODIMP nsLocalFile::MoveToNative(nsIFile *newParentDir, const nsACString& newName)
 {
-    return MoveCopy(newParentDir, NS_ConvertUTF8toUCS2(newName), FALSE, FALSE);
+  // Check we are correctly initialized.
+  CHECK_mBaseRef();
+
+  StFollowLinksState followLinks(*this, PR_FALSE);
+
+  PRBool isDirectory;
+  nsresult rv = IsDirectory(&isDirectory);
+  if (NS_FAILED(rv))
+    return rv;
+
+  // Get the source path.
+  nsCAutoString srcPath;
+  rv = GetNativePath(srcPath);
+  if (NS_FAILED(rv))
+    return rv;
+
+  // Build the destination path.
+  nsCOMPtr<nsIFile> parentDir = newParentDir;
+  if (!parentDir) {
+    if (newName.IsEmpty())
+      return NS_ERROR_INVALID_ARG;
+    rv = GetParent(getter_AddRefs(parentDir));
+    if (NS_FAILED(rv))
+      return rv;
+  }
+  else {
+    PRBool exists;
+    rv = parentDir->Exists(&exists);
+    if (NS_FAILED(rv))
+      return rv;
+    if (!exists) {
+      rv = parentDir->Create(nsIFile::DIRECTORY_TYPE, 0777);
+      if (NS_FAILED(rv))
+        return rv;
+    }
+  }
+
+  nsCAutoString destPath;
+  rv = parentDir->GetNativePath(destPath);
+  if (NS_FAILED(rv))
+    return rv;
+
+  if (!newName.IsEmpty())
+    destPath.Append(NS_LITERAL_CSTRING("/") + newName);
+  else {
+    nsCAutoString leafName;
+    rv = GetNativeLeafName(leafName);
+    if (NS_FAILED(rv))
+      return rv;
+    destPath.Append(NS_LITERAL_CSTRING("/") + leafName);
+  }
+
+  // Perform the move.
+  if (rename(srcPath.get(), destPath.get()) != 0) {
+    if (errno == EXDEV) {
+      // Can't move across volume (device) boundaries.  Copy and remove.
+      rv = CopyToNative(parentDir, newName);
+      if (NS_SUCCEEDED(rv)) {
+        // Permit removal failure.
+        Remove(PR_TRUE);
+      }
+    }
+    else
+      rv = NSRESULT_FOR_ERRNO();
+
+    if (NS_FAILED(rv))
+      return rv;
+  }
+
+  // Update |this| to refer to the moved file.
+  CFURLRef newBaseRef =
+   ::CFURLCreateFromFileSystemRepresentation(NULL, (UInt8*)destPath.get(),
+                                             destPath.Length(), isDirectory);
+  if (!newBaseRef)
+    return NS_ERROR_FAILURE;
+  SetBaseRef(newBaseRef);
+  ::CFRelease(newBaseRef);
+
+  return rv;
 }
 
@@ -550 +714 @@
 NS_IMETHODIMP nsLocalFile::Remove(PRBool recursive)
 {
-  StFollowLinksState followLinks(*this, PR_FALSE); // XXX If we're an alias, never remove target
-  
+  // Check we are correctly initialized.
+  CHECK_mBaseRef();
+
+  // XXX If we're an alias, never remove target
+  StFollowLinksState followLinks(*this, PR_FALSE);
+
+  PRBool isDirectory;
+  nsresult rv = IsDirectory(&isDirectory);
+  if (NS_FAILED(rv))
+    return rv;
+
+  if (recursive && isDirectory) {
+    FSRef fsRef;
+    rv = GetFSRefInternal(fsRef);
+    if (NS_FAILED(rv))
+      return rv;
+
+    // Call MoreFilesX to do a recursive removal.
+    OSStatus err = ::FSDeleteContainer(&fsRef);
+    rv = MacErrorMapper(err);
+  }
+  else {
+    nsCAutoString path;
+    rv = GetNativePath(path);
+    if (NS_FAILED(rv))
+      return rv;
+
+    const char* pathPtr = path.get();
+    int status;
+    if (isDirectory)
+      status = rmdir(pathPtr);
+    else
+      status = unlink(pathPtr);
+
+    if (status != 0)
+      rv = NSRESULT_FOR_ERRNO();
+  }
+
+  mCachedFSRefValid = PR_FALSE;
+  return rv;
+}
+
+/* attribute unsigned long permissions; */
+NS_IMETHODIMP nsLocalFile::GetPermissions(PRUint32 *aPermissions)
+{
+  NS_ENSURE_ARG_POINTER(aPermissions);
+
   FSRef fsRef;
   nsresult rv = GetFSRefInternal(fsRef);
   if (NS_FAILED(rv))
     return rv;
-    
-  PRBool isDir;
-  rv = IsDirectory(&isDir);
-  if (NS_FAILED(rv))
-    return rv;
-  
-  OSErr err;
-  if (recursive && isDir)
-    err = ::FSDeleteContainer(&fsRef);
-  else
-    err = ::FSDeleteObject(&fsRef);
-  
-  mCachedFSRefValid = PR_FALSE;
-  return MacErrorMapper(err);
-}
-
-/* attribute unsigned long permissions; */
-NS_IMETHODIMP nsLocalFile::GetPermissions(PRUint32 *aPermissions)
-{
-  NS_ENSURE_ARG_POINTER(aPermissions);
-  
-  FSRef fsRef;
-  nsresult rv = GetFSRefInternal(fsRef);
-  if (NS_FAILED(rv))
-    return rv;
-    
+
   FSCatalogInfo catalogInfo;
   OSErr err = ::FSGetCatalogInfo(&fsRef, kFSCatInfoPermissions, &catalogInfo,
@@ -598 +782 @@
   if (NS_FAILED(rv))
     return rv;
-  
+
   FSCatalogInfo catalogInfo;
   OSErr err = ::FSGetCatalogInfo(&fsRef, kFSCatInfoPermissions, &catalogInfo,
@@ -626 +810 @@
 NS_IMETHODIMP nsLocalFile::GetLastModifiedTime(PRInt64 *aLastModifiedTime)
 {
+  // Check we are correctly initialized.
+  CHECK_mBaseRef();
+
   NS_ENSURE_ARG_POINTER(aLastModifiedTime);
-  
+
   FSRef fsRef;
   nsresult rv = GetFSRefInternal(fsRef);
   if (NS_FAILED(rv))
     return rv;
-    
+
   FSCatalogInfo catalogInfo;
   OSErr err = ::FSGetCatalogInfo(&fsRef, kFSCatInfoContentMod, &catalogInfo,
@@ -638 +825 @@
   if (err != noErr)
     return MacErrorMapper(err);
-  *aLastModifiedTime = HFSPlustoNSPRTime(catalogInfo.contentModDate);  
+  *aLastModifiedTime = HFSPlustoNSPRTime(catalogInfo.contentModDate);
   return NS_OK;
 }
@@ -644 +831 @@
 NS_IMETHODIMP nsLocalFile::SetLastModifiedTime(PRInt64 aLastModifiedTime)
 {
+  // Check we are correctly initialized.
+  CHECK_mBaseRef();
+
   OSErr err;
   nsresult rv;
@@ -661 +851 @@
   if (err != noErr)
     return MacErrorMapper(err);
-  
+
   /* Notify the parent if this is a file */
   notifyParent = (0 == (catalogInfo.nodeFlags & kFSNodeIsDirectoryMask));
@@ -695 +885 @@
   NS_ENSURE_ARG_POINTER(aFileSize);
   *aFileSize = 0;
-  
+
   FSRef fsRef;
   nsresult rv = GetFSRefInternal(fsRef);
   if (NS_FAILED(rv))
     return rv;
-      
+
   FSCatalogInfo catalogInfo;
   OSErr err = ::FSGetCatalogInfo(&fsRef, kFSCatInfoNodeFlags + kFSCatInfoDataSizes, &catalogInfo,
@@ -706 +896 @@
   if (err != noErr)
     return MacErrorMapper(err);
-  
+
   // FSGetCatalogInfo can return a bogus size for directories sometimes, so only
   // rely on the answer for files
@@ -716 +906 @@
 NS_IMETHODIMP nsLocalFile::SetFileSize(PRInt64 aFileSize)
 {
+  // Check we are correctly initialized.
+  CHECK_mBaseRef();
+
   FSRef fsRef;
   nsresult rv = GetFSRefInternal(fsRef);
   if (NS_FAILED(rv))
     return rv;
-  
-  SInt16 refNum;    
+
+  SInt16 refNum;
   OSErr err = ::FSOpenFork(&fsRef, 0, nsnull, fsWrPerm, &refNum);
   if (err != noErr)
     return MacErrorMapper(err);
   err = ::FSSetForkSize(refNum, fsFromStart, aFileSize);
-  ::FSCloseFork(refNum);  
-  
+  ::FSCloseFork(refNum);
+
   return MacErrorMapper(err);
 }
@@ -734 +927 @@
 NS_IMETHODIMP nsLocalFile::GetFileSizeOfLink(PRInt64 *aFileSizeOfLink)
 {
+  // Check we are correctly initialized.
+  CHECK_mBaseRef();
+
   NS_ENSURE_ARG_POINTER(aFileSizeOfLink);
-  
+
   StFollowLinksState followLinks(*this, PR_FALSE);
   return GetFileSize(aFileSizeOfLink);
@@ -768 +964 @@
 NS_IMETHODIMP nsLocalFile::GetNativePath(nsACString& aNativePath)
 {
-  if (!mBaseRef)
-    return NS_ERROR_NOT_INITIALIZED;
+  // Check we are correctly initialized.
+  CHECK_mBaseRef();
+
   nsresult rv = NS_ERROR_FAILURE;
   CFStringRef pathStrRef = ::CFURLCopyFileSystemPath(mBaseRef, kCFURLPOSIXPathStyle);
@@ -782 +979 @@
 NS_IMETHODIMP nsLocalFile::Exists(PRBool *_retval)
 {
+  // Check we are correctly initialized.
+  CHECK_mBaseRef();
+
   NS_ENSURE_ARG_POINTER(_retval);
   *_retval = PR_FALSE;
-  
+
   FSRef fsRef;
   if (NS_SUCCEEDED(GetFSRefInternal(fsRef, PR_TRUE))) {
     *_retval = PR_TRUE;
   }
-  
+
   return NS_OK;
 }
@@ -796 +996 @@
 NS_IMETHODIMP nsLocalFile::IsWritable(PRBool *_retval)
 {
+    // Check we are correctly initialized.
+    CHECK_mBaseRef();
+
     NS_ENSURE_ARG_POINTER(_retval);
     *_retval = PR_FALSE;
-    
+
     FSRef fsRef;
     nsresult rv = GetFSRefInternal(fsRef);
     if (NS_FAILED(rv))
       return rv;
-    if (::FSCheckLock(&fsRef) == noErr) {      
+    if (::FSCheckLock(&fsRef) == noErr) {
       PRUint32 permissions;
       rv = GetPermissions(&permissions);
@@ -816 +1019 @@
 NS_IMETHODIMP nsLocalFile::IsReadable(PRBool *_retval)
 {
+    // Check we are correctly initialized.
+    CHECK_mBaseRef();
+
     NS_ENSURE_ARG_POINTER(_retval);
     *_retval = PR_FALSE;
-    
+
     PRUint32 permissions;
     nsresult rv = GetPermissions(&permissions);
@@ -830 +1036 @@
 NS_IMETHODIMP nsLocalFile::IsExecutable(PRBool *_retval)
 {
+  // Check we are correctly initialized.
+  CHECK_mBaseRef();
+
   NS_ENSURE_ARG_POINTER(_retval);
   *_retval = PR_FALSE;
-  
+
   FSRef fsRef;
   nsresult rv = GetFSRefInternal(fsRef);
   if (NS_FAILED(rv))
     return rv;
-    
+
   LSRequestedInfo theInfoRequest = kLSRequestAllInfo;
   LSItemInfoRecord theInfo;
@@ -852 +1061 @@
   NS_ENSURE_ARG_POINTER(_retval);
   *_retval = PR_FALSE;
-  
+
   FSRef fsRef;
   nsresult rv = GetFSRefInternal(fsRef);
   if (NS_FAILED(rv))
     return rv;
-  
+
   FSCatalogInfo catalogInfo;
-  HFSUniStr255 leafName;  
-  OSErr err = ::FSGetCatalogInfo(&fsRef, kFSCatInfoNodeFlags, &catalogInfo,
+  HFSUniStr255 leafName;
+  OSErr err = ::FSGetCatalogInfo(&fsRef, kFSCatInfoFinderInfo, &catalogInfo,
                                 &leafName, nsnull, nsnull);
   if (err != noErr)
     return MacErrorMapper(err);
-      
+
   FileInfo *fInfoPtr = (FileInfo *)(catalogInfo.finderInfo); // Finder flags are in the same place whether we use FileInfo or FolderInfo
   if ((fInfoPtr->finderFlags & kIsInvisible) != 0) {
@@ -882 +1091 @@
   NS_ENSURE_ARG_POINTER(_retval);
   *_retval = PR_FALSE;
-  
+
   FSRef fsRef;
   nsresult rv = GetFSRefInternal(fsRef, PR_FALSE);
   if (NS_FAILED(rv))
     return rv;
-    
+
   FSCatalogInfo catalogInfo;
   OSErr err = ::FSGetCatalogInfo(&fsRef, kFSCatInfoNodeFlags, &catalogInfo,
@@ -902 +1111 @@
   NS_ENSURE_ARG_POINTER(_retval);
   *_retval = PR_FALSE;
-  
+
   FSRef fsRef;
   nsresult rv = GetFSRefInternal(fsRef, PR_FALSE);
   if (NS_FAILED(rv))
     return rv;
-    
+
   FSCatalogInfo catalogInfo;
   OSErr err = ::FSGetCatalogInfo(&fsRef, kFSCatInfoNodeFlags, &catalogInfo,
@@ -920 +1129 @@
 NS_IMETHODIMP nsLocalFile::IsSymlink(PRBool *_retval)
 {
+  // Check we are correctly initialized.
+  CHECK_mBaseRef();
+
   NS_ENSURE_ARG(_retval);
   *_retval = PR_FALSE;
-  if (!mBaseRef)
-    return NS_ERROR_NOT_INITIALIZED;
-  
+
+  // Check we are correctly initialized.
+  CHECK_mBaseRef();
+
   FSRef fsRef;
   if (::CFURLGetFSRef(mBaseRef, &fsRef)) {
@@ -950 +1163 @@
 
     NS_ADDREF(*_retval);
-    
+
     return NS_OK;
 }
@@ -957 +1170 @@
 NS_IMETHODIMP nsLocalFile::Equals(nsIFile *inFile, PRBool *_retval)
 {
+    return EqualsInternal(inFile, PR_TRUE, _retval);
+}
+
+nsresult
+nsLocalFile::EqualsInternal(nsISupports* inFile, PRBool aUpdateCache,
+                            PRBool *_retval)
+{
   NS_ENSURE_ARG_POINTER(_retval);
   *_retval = PR_FALSE;
-  
+
   nsCOMPtr<nsILocalFileMac> inMacFile(do_QueryInterface(inFile));
   if (!inFile)
     return NS_OK;
-    
+
+  nsLocalFile* inLF =
+      NS_STATIC_CAST(nsLocalFile*, (nsILocalFileMac*) inMacFile);
+
   // If both exist, compare FSRefs
   FSRef thisFSRef, inFSRef;
-  nsresult rv1 = GetFSRef(&thisFSRef);
-  nsresult rv2 = inMacFile->GetFSRef(&inFSRef);
+  nsresult rv1 = GetFSRefInternal(thisFSRef, aUpdateCache);
+  nsresult rv2 = inLF->GetFSRefInternal(inFSRef, aUpdateCache);
   if (NS_SUCCEEDED(rv1) && NS_SUCCEEDED(rv2)) {
     *_retval = (thisFSRef == inFSRef);
     return NS_OK;
   }
-  // If one exists and the other doesn't, not equal  
+  // If one exists and the other doesn't, not equal
   if (rv1 != rv2)
     return NS_OK;
-    
+
   // Arg, we have to get their paths and compare
   nsCAutoString thisPath, inPath;
@@ -983 +1206 @@
     return NS_ERROR_FAILURE;
   *_retval = thisPath.Equals(inPath);
-  
+
   return NS_OK;
 }
@@ -990 +1213 @@
 NS_IMETHODIMP nsLocalFile::Contains(nsIFile *inFile, PRBool recur, PRBool *_retval)
 {
+  // Check we are correctly initialized.
+  CHECK_mBaseRef();
+
   NS_ENSURE_ARG_POINTER(_retval);
   *_retval = PR_FALSE;
@@ -1009 +1235 @@
     if (inPath[thisPathLen] == kPathSepChar)
       *_retval = PR_TRUE;
-  }  
+  }
   return NS_OK;
 }
@@ -1018 +1244 @@
   NS_ENSURE_ARG_POINTER(aParent);
   *aParent = nsnull;
-  if (!mBaseRef)
-    return NS_ERROR_NOT_INITIALIZED;
-  
+
+  // Check we are correctly initialized.
+  CHECK_mBaseRef();
+
   nsLocalFile *newFile = nsnull;
 
@@ -1039 +1266 @@
     }
     ::CFRelease(parentURLRef);
-  }  
+  }
   return rv;
 }
@@ -1052 +1279 @@
   PRBool isDir;
   rv = IsDirectory(&isDir);
-  if (NS_FAILED(rv)) 
+  if (NS_FAILED(rv))
     return rv;
   if (!isDir)
@@ -1067 +1294 @@
   }
   *aDirectoryEntries = dirEnum;
-  
+
   return NS_OK;
 }
@@ -1081 +1308 @@
 NS_IMETHODIMP nsLocalFile::InitWithPath(const nsAString& filePath)
 {
-  return InitWithNativePath(NS_ConvertUCS2toUTF8(filePath));
+  return InitWithNativePath(NS_ConvertUTF16toUTF8(filePath));
 }
 
@@ -1087 +1314 @@
 NS_IMETHODIMP nsLocalFile::InitWithNativePath(const nsACString& filePath)
 {
-  if (filePath.IsEmpty() || filePath.First() != '/')
+  nsCAutoString fixedPath;
+  if (Substring(filePath, 0, 2).EqualsLiteral("~/")) {
+    nsCOMPtr<nsIFile> homeDir;
+    nsCAutoString homePath;
+    nsresult rv = NS_GetSpecialDirectory(NS_OS_HOME_DIR,
+                                        getter_AddRefs(homeDir));
+    NS_ENSURE_SUCCESS(rv, rv);
+    rv = homeDir->GetNativePath(homePath);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    fixedPath = homePath + Substring(filePath, 1, filePath.Length() - 1);
+  }
+  else if (filePath.IsEmpty() || filePath.First() != '/')
     return NS_ERROR_FILE_UNRECOGNIZED_PATH;
-  // On 10.2, huge paths crash CFURLGetFSRef()
-  if (filePath.Length() > PATH_MAX)
-    return NS_ERROR_FILE_NAME_TOO_LONG;
-  // And, a path with consecutive '/'s which are not between
-  // nodes also crashes CFURLGetFSRef(). Consecutive '/'s which
+  else
+    fixedPath.Assign(filePath);
+
+  // A path with consecutive '/'s which are not between
+  // nodes crashes CFURLGetFSRef(). Consecutive '/'s which
   // are between actual nodes are OK. So, convert consecutive
   // '/'s to a single one.
-  nsCAutoString fixedPath;
-  fixedPath.Assign(filePath);
   fixedPath.ReplaceSubstring("//", "/");
+
+  // On 10.2, huge paths also crash CFURLGetFSRef()
+  if (fixedPath.Length() > PATH_MAX)
+    return NS_ERROR_FILE_NAME_TOO_LONG;
 
   CFStringRef pathAsCFString;
@@ -1113 +1354 @@
   SetBaseRef(pathAsCFURL);
   ::CFRelease(pathAsCFURL);
+  ::CFRelease(pathAsCFString);
   return NS_OK;
 }
@@ -1120 +1362 @@
 {
   NS_ENSURE_ARG(aFile);
-  
+
   nsCOMPtr<nsILocalFileMac> aFileMac(do_QueryInterface(aFile));
   if (!aFileMac)
@@ -1137 +1379 @@
 {
   NS_ENSURE_ARG_POINTER(aFollowLinks);
-  
+
   *aFollowLinks = mFollowLinks;
   return NS_OK;
@@ -1160 +1402 @@
   if (NS_FAILED(rv))
     return rv;
-    
+
   *_retval = PR_Open(path.get(), flags, mode);
   if (! *_retval)
@@ -1177 +1419 @@
   if (NS_FAILED(rv))
     return rv;
-    
+
   *_retval = fopen(path.get(), mode);
   if (! *_retval)
@@ -1188 +1430 @@
 NS_IMETHODIMP nsLocalFile::Load(PRLibrary **_retval)
 {
+  // Check we are correctly initialized.
+  CHECK_mBaseRef();
+
   NS_ENSURE_ARG_POINTER(_retval);
 
@@ -1197 +1442 @@
     return rv;
 
+#ifdef NS_BUILD_REFCNT_LOGGING
+  nsTraceRefcntImpl::SetActivityIsLegal(PR_FALSE);
+#endif
+
   *_retval = PR_LoadLibrary(path.get());
+
+#ifdef NS_BUILD_REFCNT_LOGGING
+  nsTraceRefcntImpl::SetActivityIsLegal(PR_TRUE);
+#endif
 
   NS_TIMELINE_STOP_TIMER("PR_LoadLibrary");
@@ -1204 +1457 @@
   if (!*_retval)
     return NS_ERROR_FAILURE;
-  
+
   return NS_OK;
 }
@@ -1211 +1464 @@
 NS_IMETHODIMP nsLocalFile::GetDiskSpaceAvailable(PRInt64 *aDiskSpaceAvailable)
 {
+  // Check we are correctly initialized.
+  CHECK_mBaseRef();
+
   NS_ENSURE_ARG_POINTER(aDiskSpaceAvailable);
-  
+
   FSRef fsRef;
   nsresult rv = GetFSRefInternal(fsRef);
   if (NS_FAILED(rv))
     return rv;
-    
+
   OSErr err;
   FSCatalogInfo catalogInfo;
@@ -1224 +1480 @@
   if (err != noErr)
     return MacErrorMapper(err);
-  
-  FSVolumeInfo volumeInfo;  
+
+  FSVolumeInfo volumeInfo;
   err = ::FSGetVolumeInfo(catalogInfo.volume, 0, nsnull, kFSVolInfoSizes,
                           &volumeInfo, nsnull, nsnull);
   if (err != noErr)
     return MacErrorMapper(err);
-    
+
   *aDiskSpaceAvailable = volumeInfo.freeBytes;
   return NS_OK;
@@ -1238 +1494 @@
 NS_IMETHODIMP nsLocalFile::AppendRelativePath(const nsAString& relativeFilePath)
 {
-  return AppendRelativeNativePath(NS_ConvertUCS2toUTF8(relativeFilePath));
+  return AppendRelativeNativePath(NS_ConvertUTF16toUTF8(relativeFilePath));
 }
 
 /* [noscript] void appendRelativeNativePath (in ACString relativeFilePath); */
 NS_IMETHODIMP nsLocalFile::AppendRelativeNativePath(const nsACString& relativeFilePath)
-{  
+{
   if (relativeFilePath.IsEmpty())
     return NS_OK;
-  // No leading '/' 
+  // No leading '/'
   if (relativeFilePath.First() == '/')
     return NS_ERROR_FILE_UNRECOGNIZED_PATH;
@@ -1255 +1511 @@
   relativeFilePath.EndReading(pathEnd);
   nsACString::const_iterator nodeEnd(nodeBegin);
-  
+
   while (nodeEnd != pathEnd) {
     FindCharInReadable(kPathSepChar, nodeEnd, pathEnd);
@@ -1275 +1531 @@
   if (NS_FAILED(rv))
     return rv;
-    
+
   AliasHandle aliasH;
   OSErr err = ::FSNewAlias(nsnull, &fsRef, &aliasH);
   if (err != noErr)
     return MacErrorMapper(err);
-    
+
    PRUint32 bytes = ::GetHandleSize((Handle) aliasH);
    ::HLock((Handle) aliasH);
@@ -1287 +1543 @@
    ::DisposeHandle((Handle) aliasH);
    NS_ENSURE_TRUE(buf, NS_ERROR_OUT_OF_MEMORY);
-   
+
    aPersistentDescriptor = buf;
    PR_Free(buf);
@@ -1299 +1555 @@
     return NS_ERROR_INVALID_ARG;
 
+  // Support pathnames as user-supplied descriptors if they begin with '/'
+  // or '~'.  These characters do not collide with the base64 set used for
+  // encoding alias records.
+  char first = aPersistentDescriptor.First();
+  if (first == '/' || first == '~')
+    return InitWithNativePath(aPersistentDescriptor);
+
   nsresult rv = NS_OK;
-  
-  PRUint32 dataSize = aPersistentDescriptor.Length();    
+
+  PRUint32 dataSize = aPersistentDescriptor.Length();
   char* decodedData = PL_Base64Decode(PromiseFlatCString(aPersistentDescriptor).get(), dataSize, nsnull);
   if (!decodedData) {
@@ -1307 +1570 @@
     return NS_ERROR_FAILURE;
   }
-  
+
   // Cast to an alias record and resolve.
-  PRInt32               aliasSize = (dataSize * 3) / 4;
-  AliasRecord   aliasHeader = *(AliasPtr)decodedData;
-  if (aliasHeader.aliasSize > aliasSize) {              // be paranoid about having too few data
+  AliasRecord aliasHeader = *(AliasPtr)decodedData;
+  PRInt32 aliasSize = GetAliasSizeFromRecord(aliasHeader);
+  if (aliasSize > (dataSize * 3) / 4) { // be paranoid about having too few data
     PR_Free(decodedData);
     return NS_ERROR_FAILURE;
   }
-  
-  aliasSize = aliasHeader.aliasSize;
-  
+
   // Move the now-decoded data into the Handle.
   // The size of the decoded data is 3/4 the size of the encoded data. See plbase64.h
@@ -1330 +1591 @@
   FSRef resolvedFSRef;
   OSErr err = ::FSResolveAlias(nsnull, (AliasHandle)newHandle, &resolvedFSRef, &changed);
-    
+
   rv = MacErrorMapper(err);
   DisposeHandle(newHandle);
   if (NS_FAILED(rv))
     return rv;
- 
+
   return InitWithFSRef(&resolvedFSRef);
 }
@@ -1348 +1609 @@
   OSErr             err;
   ProcessSerialNumber   process;
-    
+
   nsresult rv = GetFSRefInternal(fsRefToReveal);
   if (NS_FAILED(rv))
     return rv;
-  
+
   err = ::FindRunningAppBySignature ('MACS', process);
-  if (err == noErr) { 
+  if (err == noErr) {
     err = ::AECreateDesc(typeProcessSerialNumber, (Ptr)&process, sizeof(process), &myAddressDesc);
     if (err == noErr) {
       // Create the FinderEvent
       err = ::AECreateAppleEvent(kAEMiscStandards, kAEMakeObjectsVisible, &myAddressDesc,
-                        kAutoGenerateReturnID, kAnyTransactionID, &aeEvent);   
+                        kAutoGenerateReturnID, kAnyTransactionID, &aeEvent);
       if (err == noErr) {
         // Create the file list
@@ -1381 +1642 @@
     }
   }
-    
+
   return NS_OK;
 }
@@ -1408 +1669 @@
 {
   NS_ENSURE_ARG(aCFURL);
-  
+
   SetBaseRef(aCFURL);
   return NS_OK;
@@ -1418 +1679 @@
   NS_ENSURE_ARG(aFSRef);
   nsresult rv = NS_ERROR_FAILURE;
-  
+
   CFURLRef newURLRef = ::CFURLCreateFromFSRef(kCFAllocatorDefault, aFSRef);
   if (newURLRef) {
@@ -1432 +1693 @@
 {
   NS_ENSURE_ARG(aFileSpec);
-  
+
   FSRef fsRef;
   OSErr err = ::FSpMakeFSRef(aFileSpec, &fsRef);
@@ -1440 +1701 @@
     CInfoPBRec  pBlock;
     FSSpec parentDirSpec;
-    
+
     memset(&pBlock, 0, sizeof(CInfoPBRec));
     parentDirSpec.name[0] = 0;
@@ -1450 +1711 @@
     if (err != noErr)
       return MacErrorMapper(err);
-    
+
     parentDirSpec.vRefNum = aFileSpec->vRefNum;
     parentDirSpec.parID = pBlock.dirInfo.ioDrParID;
@@ -1463 +1724 @@
     if (NS_FAILED(rv))
       return rv;
-    return Append(nsDependentString(unicodeName.unicode, unicodeName.length));  
+    return Append(nsDependentString(unicodeName.unicode, unicodeName.length));
   }
   return MacErrorMapper(err);
@@ -1500 +1761 @@
 {
   NS_ENSURE_ARG_POINTER(_retval);
-  if (!mBaseRef)
-    return NS_ERROR_NOT_INITIALIZED;
-  
+
+  // Check we are correctly initialized.
+  CHECK_mBaseRef();
+
   OSErr err;
   FSRef fsRef;
@@ -1510 +1772 @@
     err = ::FSGetCatalogInfo(&fsRef, kFSCatInfoNone,
               nsnull, nsnull, _retval, nsnull);
-    return MacErrorMapper(err); 
+    return MacErrorMapper(err);
   }
   else if (rv == NS_ERROR_FILE_NOT_FOUND) {
@@ -1532 +1794 @@
                           catalogInfo.nodeID == fsRtDirID,
                           hfsName)) == noErr)
-            err = ::FSMakeFSSpec(catalogInfo.volume, catalogInfo.nodeID, hfsName, _retval);        
+            err = ::FSMakeFSSpec(catalogInfo.volume, catalogInfo.nodeID, hfsName, _retval);
         }
       }
@@ -1546 +1808 @@
 {
   NS_ENSURE_ARG_POINTER(aFileSizeWithResFork);
-  
+
   FSRef fsRef;
   nsresult rv = GetFSRefInternal(fsRef);
   if (NS_FAILED(rv))
     return rv;
-      
+
   FSCatalogInfo catalogInfo;
   OSErr err = ::FSGetCatalogInfo(&fsRef, kFSCatInfoDataSizes + kFSCatInfoRsrcSizes,
@@ -1557 +1819 @@
   if (err != noErr)
     return MacErrorMapper(err);
-    
+
   *aFileSizeWithResFork = catalogInfo.dataLogicalSize + catalogInfo.rsrcLogicalSize;
   return NS_OK;
@@ -1566 +1828 @@
 {
   NS_ENSURE_ARG_POINTER(aFileType);
-  
+
   FSRef fsRef;
   nsresult rv = GetFSRefInternal(fsRef);
   if (NS_FAILED(rv))
     return rv;
-  
-  FinderInfo fInfo;  
+
+  FinderInfo fInfo;
   OSErr err = ::FSGetFinderInfo(&fsRef, &fInfo, nsnull, nsnull);
   if (err != noErr)
@@ -1586 +1848 @@
   if (NS_FAILED(rv))
     return rv;
-    
+
   OSErr err = ::FSChangeCreatorType(&fsRef, 0, aFileType);
   return MacErrorMapper(err);
@@ -1595 +1857 @@
 {
   NS_ENSURE_ARG_POINTER(aFileCreator);
-  
+
   FSRef fsRef;
   nsresult rv = GetFSRefInternal(fsRef);
   if (NS_FAILED(rv))
     return rv;
-  
-  FinderInfo fInfo;  
+
+  FinderInfo fInfo;
   OSErr err = ::FSGetFinderInfo(&fsRef, &fInfo, nsnull, nsnull);
   if (err != noErr)
@@ -1615 +1877 @@
   if (NS_FAILED(rv))
     return rv;
-    
+
   OSErr err = ::FSChangeCreatorType(&fsRef, aFileCreator, 0);
   return MacErrorMapper(err);
@@ -1657 +1919 @@
       return rv;
   }
-  
+
   LSLaunchFlags       theLaunchFlags = kLSLaunchDefaults;
   LSLaunchFSRefSpec   thelaunchSpec;
@@ -1701 +1963 @@
     if (!isExecutable)
       return NS_ERROR_FILE_EXECUTION_FAILED;
-    
+
     rv = appFileMac->GetFSRef(&appFSRef);
     if (NS_FAILED(rv))
@@ -1716 +1978 @@
       return MacErrorMapper(err);
   }
-  
+
   LSLaunchFlags       theLaunchFlags = kLSLaunchDefaults;
   LSLaunchFSRefSpec   thelaunchSpec;
@@ -1741 +2003 @@
   NS_ENSURE_ARG(_retval);
   *_retval = PR_FALSE;
-  
+
   FSRef fsRef;
   nsresult rv = GetFSRefInternal(fsRef);
@@ -1773 +2035 @@
 }
 
+NS_IMETHODIMP
+nsLocalFile::GetBundleDisplayName(nsAString& outBundleName)
+{
+  PRBool isPackage = PR_FALSE;
+  nsresult rv = IsPackage(&isPackage);
+  if (NS_FAILED(rv) || !isPackage)
+    return NS_ERROR_FAILURE;
+
+  nsAutoString name;
+  rv = GetLeafName(name);
+  if (NS_FAILED(rv))
+    return rv;
+
+  PRInt32 length = name.Length();
+  if (Substring(name, length - 4, length).EqualsLiteral(".app")) {
+    // 4 characters in ".app"
+    outBundleName = Substring(name, 0, length - 4);
+  }
+  else
+    outBundleName = name;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsLocalFile::GetBundleIdentifier(nsACString& outBundleIdentifier)
+{
+  nsresult rv = NS_ERROR_FAILURE;
+
+  CFURLRef urlRef;
+  if (NS_SUCCEEDED(GetCFURL(&urlRef))) {
+    CFBundleRef bundle = ::CFBundleCreate(NULL, urlRef);
+    if (bundle) {
+      CFStringRef bundleIdentifier = ::CFBundleGetIdentifier(bundle);
+      if (bundleIdentifier)
+        rv = CFStringReftoUTF8(bundleIdentifier, outBundleIdentifier);
+
+      ::CFRelease(bundle);
+    }
+    ::CFRelease(urlRef);
+  }
+
+  return rv;
+}
+
 
 //*****************************************************************************
@@ -1783 +2090 @@
 {
   NS_ENSURE_ARG(aCFURLRef);
-  
+
   ::CFRetain(aCFURLRef);
   if (mBaseRef)
@@ -1789 +2096 @@
   mBaseRef = aCFURLRef;
 
-  mFollowLinksDirty = PR_TRUE;  
+  mFollowLinksDirty = PR_TRUE;
   UpdateTargetRef();
   mCachedFSRefValid = PR_FALSE;
@@ -1797 +2104 @@
 nsresult nsLocalFile::UpdateTargetRef()
 {
-  if (!mBaseRef)
-    return NS_ERROR_NOT_INITIALIZED;
-  
+  // Check we are correctly initialized.
+  CHECK_mBaseRef();
+
   if (mFollowLinksDirty) {
     if (mTargetRef) {
@@ -1812 +2119 @@
       if (::CFURLGetFSRef(mBaseRef, &fsRef)) {
         Boolean targetIsFolder, wasAliased;
-        if (FSResolveAliasFile(&fsRef, true /*resolveAliasChains*/, 
+        if (FSResolveAliasFile(&fsRef, true /*resolveAliasChains*/,
             &targetIsFolder, &wasAliased) == noErr && wasAliased) {
           ::CFRelease(mTargetRef);
@@ -1848 +2155 @@
 {
   nsresult rv = NS_ERROR_FAILURE;
-  
+
   CFURLRef whichURLRef = mFollowLinks ? mTargetRef : mBaseRef;
   NS_ENSURE_TRUE(whichURLRef, NS_ERROR_NULL_POINTER);
-   
+
   CFStringRef pathStrRef = ::CFURLCopyFileSystemPath(whichURLRef, kCFURLPOSIXPathStyle);
   if (pathStrRef) {
@@ -1860 +2167 @@
 }
 
-nsresult nsLocalFile::MoveCopy(nsIFile* aParentDir, const nsAString& newName, PRBool isCopy, PRBool followLinks)
-{
+nsresult nsLocalFile::CopyInternal(nsIFile* aParentDir,
+                                   const nsAString& newName,
+                                   PRBool followLinks)
+{
+  // Check we are correctly initialized.
+  CHECK_mBaseRef();
+
   StFollowLinksState srcFollowState(*this, followLinks);
 
@@ -1867 +2179 @@
   OSErr err;
   FSRef srcFSRef, newFSRef;
-  
+
   rv = GetFSRefInternal(srcFSRef);
   if (NS_FAILED(rv))
     return rv;
-    
+
   nsCOMPtr<nsIFile> newParentDir = aParentDir;
-  CFURLRef newBaseURLRef;
 
   if (!newParentDir) {
@@ -1880 +2191 @@
     rv = GetParent(getter_AddRefs(newParentDir));
     if (NS_FAILED(rv))
-      return rv;    
-  }
-  
+      return rv;
+  }
+
   // If newParentDir does not exist, create it
   PRBool exists;
@@ -1889 +2200 @@
     return rv;
   if (!exists) {
-    rv = newParentDir->Create(nsIFile::DIRECTORY_TYPE, 0666);
+    rv = newParentDir->Create(nsIFile::DIRECTORY_TYPE, 0777);
     if (NS_FAILED(rv))
       return rv;
   }
-    
+
   FSRef destFSRef;
   nsCOMPtr<nsILocalFileMac> newParentDirMac(do_QueryInterface(newParentDir));
@@ -1901 +2212 @@
   if (NS_FAILED(rv))
     return rv;
-    
-  if (isCopy) {
-    err = ::FSCopyObject(&srcFSRef, &destFSRef,
-                         newName.Length(), newName.Length() ? PromiseFlatString(newName).get() : nsnull,
-                         0, kFSCatInfoNone, false, false, nsnull, nsnull, &newFSRef);
-    // don't update ourselves on a copy
-  }
-  else {
-    // According to the API: "If 'this' is a file, and the destination file already
-    // exists, moveTo will replace the old file."
-    FSCatalogInfo catalogInfo;
-    HFSUniStr255 leafName;
-    err = ::FSGetCatalogInfo(&srcFSRef, kFSCatInfoNodeFlags, &catalogInfo,
-                             newName.IsEmpty() ? &leafName : nsnull, nsnull, nsnull);
-    if (err == noErr) {      
-      if (!(catalogInfo.nodeFlags & kFSNodeIsDirectoryMask)) {
-        FSRef oldFileRef;
-        if (newName.IsEmpty())
-          err = ::FSMakeFSRefUnicode(&destFSRef, leafName.length, leafName.unicode,
-                    kTextEncodingUnknown, &oldFileRef);
-        else
-          err = ::FSMakeFSRefUnicode(&destFSRef, newName.Length(), PromiseFlatString(newName).get(),
-                    kTextEncodingUnknown, &oldFileRef);
-        if (err == noErr)
-          ::FSDeleteObject(&oldFileRef);
-      }
-    }
-    // First, try the quick way which works only within the same volume
-    err = ::FSMoveRenameObjectUnicode(&srcFSRef, &destFSRef,
-              newName.Length(), newName.Length() ? PromiseFlatString(newName).get() : nsnull,
-              kTextEncodingUnknown, &newFSRef);
-              
-    if (err == diffVolErr) {
-      // If on different volumes, resort to copy & delete
-      err = ::FSCopyObject(&srcFSRef, &destFSRef,
-                           newName.Length(), newName.Length() ? PromiseFlatString(newName).get() : nsnull,
-                           0, kFSCatInfoNone, false, false, nsnull, nsnull, &newFSRef);
-      ::FSDeleteObjects(&srcFSRef);
-    }
-    if (err == noErr) {
-      newBaseURLRef = ::CFURLCreateFromFSRef(kCFAllocatorDefault, &newFSRef);
-      if (!newBaseURLRef)
-        return NS_ERROR_FAILURE;
-      SetBaseRef(newBaseURLRef);
-      ::CFRelease(newBaseURLRef);
-    }
-  }
+
+  err =
+   ::FSCopyObject(&srcFSRef, &destFSRef, newName.Length(),
+                  newName.Length() ? PromiseFlatString(newName).get() : NULL,
+                  0, kFSCatInfoNone, false, false, NULL, NULL, &newFSRef);
+
   return MacErrorMapper(err);
 }
 
-const PRInt64 kMilisecsPerSec = 1000LL;
+const PRInt64 kMillisecsPerSec = 1000LL;
 const PRInt64 kUTCDateTimeFractionDivisor = 65535LL;
 
@@ -1957 +2227 @@
 {
   // Start with seconds since Jan. 1, 1904 GMT
-  PRInt64 result = ((PRInt64)utcTime.highSeconds << 32) + (PRInt64)utcTime.lowSeconds; 
+  PRInt64 result = ((PRInt64)utcTime.highSeconds << 32) + (PRInt64)utcTime.lowSeconds;
   // Subtract to convert to NSPR epoch of 1970
   result -= kJanuaryFirst1970Seconds;
-  // Convert to milisecs
-  result *= kMilisecsPerSec;
-  // Convert the fraction to milisecs and add it
-  result += ((PRInt64)utcTime.fraction * kMilisecsPerSec) / kUTCDateTimeFractionDivisor;
+  // Convert to millisecs
+  result *= kMillisecsPerSec;
+  // Convert the fraction to millisecs and add it
+  result += ((PRInt64)utcTime.fraction * kMillisecsPerSec) / kUTCDateTimeFractionDivisor;
 
   return result;
@@ -1970 +2240 @@
 void nsLocalFile::NSPRtoHFSPlusTime(PRInt64 nsprTime, UTCDateTime& utcTime)
 {
-  PRInt64 fraction = nsprTime % kMilisecsPerSec;
-  PRInt64 seconds = (nsprTime / kMilisecsPerSec) + kJanuaryFirst1970Seconds;
+  PRInt64 fraction = nsprTime % kMillisecsPerSec;
+  PRInt64 seconds = (nsprTime / kMillisecsPerSec) + kJanuaryFirst1970Seconds;
   utcTime.highSeconds = (UInt16)((PRUint64)seconds >> 32);
   utcTime.lowSeconds = (UInt32)seconds;
-  utcTime.fraction = (UInt16)((fraction * kUTCDateTimeFractionDivisor) / kMilisecsPerSec);
+  utcTime.fraction = (UInt16)((fraction * kUTCDateTimeFractionDivisor) / kMillisecsPerSec);
 }
 
@@ -1984 +2254 @@
                               kCFStringEncodingUTF8, 0, PR_FALSE, nsnull, 0, &usedBufLen);
   if (charsConverted == inStrLen) {
+#if 0 /* bird: too new? */
+    aOutStr.SetLength(usedBufLen);
+    if (aOutStr.Length() != usedBufLen)
+      return NS_ERROR_OUT_OF_MEMORY;
+    UInt8 *buffer = (UInt8*) aOutStr.BeginWriting();
+
+    ::CFStringGetBytes(aInStrRef, CFRangeMake(0, inStrLen),
+                       kCFStringEncodingUTF8, 0, false, buffer, usedBufLen, &usedBufLen);
+    rv = NS_OK;
+#else
     nsAutoBuffer<UInt8, FILENAME_BUFFER_SIZE> buffer;
     if (buffer.EnsureElemCapacity(usedBufLen + 1)) {
@@ -1992 +2272 @@
       rv = NS_OK;
     }
+#endif
   }
   return rv;
+}
+
+// nsIHashable
+
+NS_IMETHODIMP
+nsLocalFile::Equals(nsIHashable* aOther, PRBool *aResult)
+{
+    return EqualsInternal(aOther, PR_FALSE, aResult);
+}
+
+NS_IMETHODIMP
+nsLocalFile::GetHashCode(PRUint32 *aResult)
+{
+    CFStringRef pathStrRef = ::CFURLCopyFileSystemPath(mBaseRef, kCFURLPOSIXPathStyle);
+    nsCAutoString path;
+    CFStringReftoUTF8(pathStrRef, path);
+    *aResult = HashString(path);
+    return NS_OK;
 }
 
@@ -2032 +2331 @@
 nsresult NS_NewNativeLocalFile(const nsACString& path, PRBool followLinks, nsILocalFile **result)
 {
-    return NS_NewLocalFile(NS_ConvertUTF8toUCS2(path), followLinks, result);
+    return NS_NewLocalFile(NS_ConvertUTF8toUTF16(path), followLinks, result);
 }
 
@@ -2053 +2352 @@
 }
 
+nsresult NS_NewLocalFileWithFSRef(const FSRef* aFSRef, PRBool aFollowLinks, nsILocalFileMac** result)
+{
+    nsLocalFile* file = new nsLocalFile();
+    if (file == nsnull)
+        return NS_ERROR_OUT_OF_MEMORY;
+    NS_ADDREF(file);
+
+    file->SetFollowLinks(aFollowLinks);
+
+    nsresult rv = file->InitWithFSRef(aFSRef);
+    if (NS_FAILED(rv)) {
+        NS_RELEASE(file);
+        return rv;
+    }
+    *result = file;
+    return NS_OK;
+}
+
 //*****************************************************************************
 //  Static Functions
@@ -2060 +2377 @@
 {
     nsresult outErr;
-    
+
     switch (inErr)
     {
@@ -2074 +2391 @@
             outErr = NS_ERROR_FILE_ALREADY_EXISTS;
             break;
-        
+
         case dskFulErr:
             outErr = NS_ERROR_FILE_DISK_FULL;
             break;
-        
+
         case fLckdErr:
             outErr = NS_ERROR_FILE_IS_LOCKED;
             break;
-        
+
         // Can't find good map for some
         case bdNamErr:
@@ -2088 +2405 @@
             break;
 
-        default:    
+        default:
             outErr = NS_ERROR_FAILURE;
             break;
@@ -2099 +2416 @@
   ProcessInfoRec info;
   OSErr err = noErr;
-  
+
   outPsn.highLongOfPSN = 0;
   outPsn.lowLongOfPSN  = kNoProcess;
-  
+
   while (PR_TRUE)
   {
@@ -2116 +2433 @@
     if (err != noErr)
       return err;
-    
+
     if (info.processSignature == aAppSig)
       return noErr;
@@ -2147 +2464 @@
     if (!sUnicodeNormalizer) {  // OS X 10.2 or earlier
         CopyUTF8toUTF16(aSrc, aResult);
-        return;  
+        return;
     }
 
@@ -2159 +2476 @@
     if (!inStr) {
         CopyUTF8toUTF16(aSrc, aResult);
-        return;  
-    }
-     
-    ::CFStringAppendCString(inStr, inFlatSrc.get(), kCFStringEncodingUTF8); 
+        return;
+    }
+
+    ::CFStringAppendCString(inStr, inFlatSrc.get(), kCFStringEncodingUTF8);
 
     sUnicodeNormalizer(inStr, kCFStringNormalizationFormC);
@@ -2169 +2486 @@
     const UniChar* chars = CFStringGetCharactersPtr(inStr);
 
-    if (chars) 
+    if (chars)
         aResult.Assign(chars, length);
     else {

trunk/src/libs/xpcom18a4/xpcom/io/nsLocalFileOSX.h

@@ -42 +42 @@
 #include "nsILocalFileMac.h"
 #include "nsString.h"
+#include "nsIHashable.h"
 
 class nsDirEnumerator;
@@ -56 +57 @@
 //*****************************************************************************
 
-class NS_COM nsLocalFile : public nsILocalFileMac
+class NS_COM nsLocalFile : public nsILocalFileMac,
+                           public nsIHashable
 {
     friend class nsDirEnumerator;
@@ -71 +73 @@
     NS_DECL_NSILOCALFILE
     NS_DECL_NSILOCALFILEMAC
+    NS_DECL_NSIHASHABLE
 
 public:
@@ -88 +91 @@
     nsresult            GetFSRefInternal(FSRef& aFSSpec, PRBool bForceUpdateCache = PR_TRUE);
     nsresult            GetPathInternal(nsACString& path);  // Returns path WRT mFollowLinks
+    nsresult            EqualsInternal(nsISupports* inFile,
+                                       PRBool aUpdateCache, PRBool *_retval);
 
-    nsresult            MoveCopy(nsIFile* newParentDir, const nsAString &newName, PRBool isCopy, PRBool followLinks);
+    nsresult            CopyInternal(nsIFile* newParentDir,
+                                     const nsAString& newName,
+                                     PRBool followLinks);
 
     static PRInt64      HFSPlustoNSPRTime(const UTCDateTime& utcTime);

trunk/src/libs/xpcom18a4/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_x86.cpp

@@ -21 +21 @@
  *
  * Contributor(s):
+ *   Mark Mentovai <[email protected]>
  *
  * Alternatively, the contents of this file may be used under the terms of
@@ -79 +80 @@
 #ifdef __GNUC__            /* Gnu compiler. */
   PRUint32 result;
-  // Each param takes at most 2, 4-byte words
-  // It doesn't matter if we push too many words, and calculating the exact
-  // ammount takes time.
+  /* Each param takes at most 2, 4-byte words
+     It doesn't matter if we push too many words, and calculating the exact
+     amount takes time. */
   PRUint32 n = paramCount << 3;
   void (*fn_copy) (unsigned int, nsXPTCVariant *, PRUint32 *) = invoke_copy_to_stack;
-  int temp1, temp2, temp3;
- 
+  int temp1, temp2;
+
+  /* These are only significant when KEEP_STACK_16_BYTE_ALIGNED is
+     defined.  Otherwise, they're just placeholders to keep the parameter
+     indices the same for aligned and unaligned users in the inline asm
+     block. */
+  unsigned int saved_esp;
+
  __asm__ __volatile__(
+#ifdef KEEP_STACK_16_BYTE_ALIGNED
+    "movl  %%esp, %3\n\t"
+#endif
     "subl  %8, %%esp\n\t" /* make room for params */
+#ifdef KEEP_STACK_16_BYTE_ALIGNED
+    /* For the second CALL, there will be one parameter before the ones
+       copied by invoke_copy_to_stack.  Make sure that the stack will be
+       aligned for that CALL. */
+    "subl  $4, %%esp\n\t"
+    "andl  $0xfffffff0, %%esp\n\t"
+    /* For the first CALL, there are three parameters.  Leave padding to
+       ensure alignment. */
+    "subl  $4, %%esp\n\t"
+    /* The third parameter to invoke_copy_to_stack is the destination pointer.
+       It needs to point into the parameter area prepared for the second CALL,
+       leaving room for the |that| parameter.  This reuses |n|, which was
+       the stack space to reserve, but that's OK because it's no longer needed
+       if the stack is being kept aligned. */
+    "leal  8(%%esp), %8\n\t"
+    "pushl %8\n\t"
+#else
     "pushl %%esp\n\t"
+#endif
     "pushl %7\n\t"
     "pushl %6\n\t"
-    "call  *%0\n\t"       /* copy params */
+    "call  *%9\n\t"       /* copy params */
+#ifdef KEEP_STACK_16_BYTE_ALIGNED
+    /* The stack is still aligned from the first CALL.  Keep it aligned for
+       the next one by popping past the parameters from the first CALL and
+       leaving space for the first (|that|) parameter for the second CALL. */
+    "addl  $0x14, %%esp\n\t"
+#else
     "addl  $0xc, %%esp\n\t"
+#endif
     "movl  %4, %%ecx\n\t"
 #ifdef CFRONT_STYLE_THIS_ADJUST
@@ -115 +150 @@
 #endif
     "call  *(%%edx)\n\t"    /* safe to not cleanup esp */
+#ifdef KEEP_STACK_16_BYTE_ALIGNED
+    "movl  %3, %%esp\n\t"
+#else
     "addl  $4, %%esp\n\t"
     "addl  %8, %%esp"
+#endif
     : "=a" (result),        /* %0 */
       "=c" (temp1),         /* %1 */
       "=d" (temp2),         /* %2 */
-      "=g" (temp3)          /* %3 */
+#ifdef KEEP_STACK_16_BYTE_ALIGNED
+      "=&g" (saved_esp)     /* %3 */
+#else
+      /* Don't waste a register, this isn't used if alignment is unimportant */
+      "=m" (saved_esp)      /* %3 */
+#endif
     : "g" (that),           /* %4 */
       "g" (methodIndex),    /* %5 */
       "1" (paramCount),     /* %6 */
       "2" (params),         /* %7 */
+#ifdef KEEP_STACK_16_BYTE_ALIGNED
+      /* Must be in a register, it's the target of an LEA instruction */
+      "r" (n),              /* %8 */
+#else
       "g" (n),              /* %8 */
-      "0" (fn_copy)         /* %3 */
+#endif
+      "0" (fn_copy)         /* %9 */
     : "memory"
     );
-    
+
   return result;
 
@@ -136 +185 @@
 #endif /* __GNUC__ */
 
-}    
+}

trunk/src/libs/xpcom18a4/xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_x86.cpp

@@ -40 +40 @@
 #include "xptcprivate.h"
 #include "xptc_platforms_unixish_x86.h"
+/*#include "xptiprivate.h"*/
 
 static nsresult
@@ -104 +105 @@
 
 #ifdef __GNUC__         /* Gnu Compiler. */
+
+#ifdef KEEP_STACK_16_BYTE_ALIGNED
+/* Make sure the stack is 16-byte aligned.  Do that by aligning to 16 bytes and
+ * then subtracting 4 so the three subsequent pushes result in a 16-byte aligned
+ * stack. */
+#define ALIGN_STACK_DECL \
+  unsigned int saved_esp;
+
+#define ALIGN_STACK_SAVE \
+  "movl %%esp, %3\n\t"
+
+#define ALIGN_STACK_ALIGN \
+  "addl $0x4, %%esp\n\t" \
+  "andl $0xfffffff0, %%esp\n\t" \
+  "subl $0x4, %%esp\n\t"
+
+#define STACK_RESTORE \
+  "movl %3, %%esp\n"
+
+#define ALIGN_STACK_REGS_IN \
+  , "=r"(saved_esp) /* 3 */
+
+#define ALIGN_STACK_REGS_OUT \
+  , "3"(saved_esp)
+
+#else
+#define ALIGN_STACK_DECL
+#define ALIGN_STACK_SAVE
+#define ALIGN_STACK_ALIGN
+#define STACK_RESTORE \
+  "addl $12, %%esp\n"
+#define ALIGN_STACK_REGS_IN
+#define ALIGN_STACK_REGS_OUT
+#endif
+
 #define STUB_ENTRY(n) \
 nsresult nsXPTCStubBase::Stub##n() \
@@ -110 +146 @@
   int temp0, temp1; \
   register nsresult result; \
+  ALIGN_STACK_DECL \
   __asm__ __volatile__( \
+    ALIGN_STACK_SAVE \
+    ALIGN_STACK_ALIGN \
     "leal   0x0c(%%ebp), %%ecx\n\t"    /* args */ \
     "pushl  %%ecx\n\t" \
@@ -117 +156 @@
     "pushl  %%ecx\n\t" \
     "call   *%%edx\n\t"                /* PrepareAndDispatch */ \
-    "addl   $12, %%esp" \
+    STACK_RESTORE                      /* "addl $12, %%esp" or restore saved */ \
     : "=a" (result),    /* %0 */ \
       "=&c" (temp0),    /* %1 */ \
       "=d" (temp1)      /* %2 */ \
+      ALIGN_STACK_REGS_IN \
     : "2" (method)      /* %2 */ \
-    : "memory" ); \
+      ALIGN_STACK_REGS_OUT \
+    : "memory" \
+        ); \
     return result; \
 }

trunk/src/libs/xpcom18a4/xpcom/tests/nsIFileTest.cpp

@@ -1 +1 @@
 #include "nsILocalFile.h"
+#if 0 /* too new */
+#include "nsStringGlue.h"
+#else
 #include "nsString.h"
+#endif
 
 #include <stdio.h>
@@ -8 +12 @@
 #include "nsIServiceManager.h"
 #include "nsIMemory.h"
-#include "nsXPIDLString.h"
+
+#include "nsComponentManagerUtils.h"
+#include "nsCOMPtr.h"
 
 void Passed();
@@ -63 +69 @@
     rv = file->GetNativePath(pathName);
     VerifyResult(rv);
-    
+
     printf("filepath: %s\n", pathName.get());
 }
@@ -70 +76 @@
 {
     nsILocalFile* file = nsnull;
-    nsresult rv = nsComponentManager::CreateInstance(NS_LOCAL_FILE_CONTRACTID, 
-                                              nsnull, 
-                                              NS_GET_IID(nsILocalFile), 
-                                              (void**)&file);
-    
-    if (NS_FAILED(rv) || (!file)) 
+    nsresult rv = CallCreateInstance(NS_LOCAL_FILE_CONTRACTID, &file);
+
+
+    if (NS_FAILED(rv) || (!file))
     {
         printf("create nsILocalFile failed\n");
@@ -88 +92 @@
     rv = file->InitWithNativePath(nsDependentCString(creationPath));
     VerifyResult(rv);
-    
+
     printf("Getting Filename\n");
     rv = file->GetNativeLeafName(leafName);
@@ -105 +109 @@
     GetPaths(file);
 
-    
+
     printf("Check For Existence\n");
 
@@ -121 +125 @@
                   PRInt32 whatToCreate, PRInt32 perm)
 {
-    nsCOMPtr<nsILocalFile> file;
-    nsresult rv = 
-    nsComponentManager::CreateInstance(NS_LOCAL_FILE_CONTRACTID, 
-                                              nsnull, 
-                                              NS_GET_IID(nsILocalFile), 
-                                              (void **)getter_AddRefs(file));
-
-    if (NS_FAILED(rv) || (!file)) 
+    nsresult rv;
+    nsCOMPtr<nsILocalFile> file =
+        do_CreateInstance(NS_LOCAL_FILE_CONTRACTID, &rv);
+
+    if (NS_FAILED(rv) || (!file))
     {
         printf("create nsILocalFile failed\n");
@@ -139 +140 @@
     rv = file->InitWithNativePath(nsDependentCString(creationPath));
     VerifyResult(rv);
- 
+
     printf("Appending %s\n", appendPath);
     rv = file->AppendRelativeNativePath(nsDependentCString(appendPath));
     VerifyResult(rv);
-    
+
     printf("Check For Existence\n");
 
@@ -155 +156 @@
 
 
-    rv = file->Create(whatToCreate, perm);  
+    rv = file->Create(whatToCreate, perm);
     VerifyResult(rv);
 
@@ -161 +162 @@
     VerifyResult(rv);
 
-    
+
     if (!exists)
     {
@@ -167 +168 @@
         return;
     }
-    
-}    
+
+}
 
 void CreateUniqueTest(const char* creationPath, const char* appendPath,
                  PRInt32 whatToCreate, PRInt32 perm)
 {
-    nsCOMPtr<nsILocalFile> file;
-    nsresult rv = 
-    nsComponentManager::CreateInstance(NS_LOCAL_FILE_CONTRACTID, 
-                                              nsnull, 
-                                              NS_GET_IID(nsILocalFile), 
-                                              (void **)getter_AddRefs(file));
-
-    if (NS_FAILED(rv) || (!file)) 
+    nsresult rv;
+    nsCOMPtr<nsILocalFile> file =
+        do_CreateInstance(NS_LOCAL_FILE_CONTRACTID, &rv);
+
+    if (NS_FAILED(rv) || (!file))
     {
         printf("create nsILocalFile failed\n");
@@ -191 +189 @@
     rv = file->InitWithNativePath(nsDependentCString(creationPath));
     VerifyResult(rv);
- 
+
     printf("Appending %s\n", appendPath);
     rv = file->AppendNative(nsDependentCString(appendPath));
     VerifyResult(rv);
-    
+
     printf("Check For Existence\n");
 
@@ -207 +205 @@
 
 
-    rv = file->CreateUnique(whatToCreate, perm);  
+    rv = file->CreateUnique(whatToCreate, perm);
     VerifyResult(rv);
 
@@ -213 +211 @@
     VerifyResult(rv);
 
-    
+
     if (!exists)
     {
@@ -219 +217 @@
         return;
     }
-    
-}    
+
+}
 
 
@@ -226 +224 @@
 CopyTest(const char *testFile, const char *targetDir)
 {
-  nsCOMPtr<nsILocalFile> file;
-  nsCOMPtr<nsILocalFile> dir;
-
   printf("start copy test\n");
 
-  nsresult rv =
-    nsComponentManager::CreateInstance(NS_LOCAL_FILE_CONTRACTID, NULL,
-                                       NS_GET_IID(nsILocalFile), 
-                                       (void**)getter_AddRefs(file));
-    
-  if (NS_FAILED(rv) || (!file)) 
+  nsresult rv;
+  nsCOMPtr<nsILocalFile> file =
+      do_CreateInstance(NS_LOCAL_FILE_CONTRACTID, &rv);
+
+  if (NS_FAILED(rv) || (!file))
   {
     printf("create nsILocalFile failed\n");
@@ -244 +238 @@
   rv = file->InitWithNativePath(nsDependentCString(testFile));
   VerifyResult(rv);
-  
-  rv = nsComponentManager::CreateInstance(NS_LOCAL_FILE_CONTRACTID, NULL,
-                                          NS_GET_IID(nsILocalFile), 
-                                          (void**)getter_AddRefs(dir));
-
-  if (NS_FAILED(rv) || (!dir)) 
+
+  nsCOMPtr<nsILocalFile> dir =
+      do_CreateInstance(NS_LOCAL_FILE_CONTRACTID, &rv);
+
+  if (NS_FAILED(rv) || (!dir))
   {
     printf("create nsILocalFile failed\n");
@@ -263 +256 @@
   printf("end copy test\n");
 }
-    
+
 void
 DeletionTest(const char* creationPath, const char* appendPath, PRBool recursive)
 {
-    nsCOMPtr<nsILocalFile> file;
-    nsresult rv = 
-      nsComponentManager::CreateInstance(NS_LOCAL_FILE_CONTRACTID, NULL,
-                                         NS_GET_IID(nsILocalFile),
-                                         (void**)getter_AddRefs(file));
-    
-    if (NS_FAILED(rv) || (!file)) 
+    nsresult rv;
+    nsCOMPtr<nsILocalFile> file =
+            do_CreateInstance(NS_LOCAL_FILE_CONTRACTID, &rv);
+
+    if (NS_FAILED(rv) || (!file))
     {
         printf("create nsILocalFile failed\n");
@@ -284 +275 @@
     rv = file->InitWithNativePath(nsDependentCString(creationPath));
     VerifyResult(rv);
- 
+
     printf("Appending %s\n", appendPath);
     rv = file->AppendNative(nsDependentCString(appendPath));
     VerifyResult(rv);
-    
+
     printf("Check For Existance\n");
 
@@ -299 +290 @@
         printf("no.\n");
 
-    rv = file->Remove(recursive);  
+    rv = file->Remove(recursive);
     VerifyResult(rv);
 
     rv = file->Exists(&exists);
     VerifyResult(rv);
-    
+
     if (exists)
     {
@@ -310 +301 @@
         return;
     }
-    
-}
-
-void 
+
+}
+
+void
 MoveTest(const char *testFile, const char *targetDir)
 {
@@ -322 +313 @@
   nsresult rv;
   nsCOMPtr<nsILocalFile> file(do_CreateInstance(NS_LOCAL_FILE_CONTRACTID));
-     
-  if (!file) 
+
+  if (!file)
   {
     printf("create nsILocalFile failed\n");
@@ -331 +322 @@
   rv = file->InitWithNativePath(nsDependentCString(testFile));
   VerifyResult(rv);
-  
+
   nsCOMPtr<nsILocalFile> dir(do_CreateInstance(NS_LOCAL_FILE_CONTRACTID));
- 
-  if (!dir) 
+
+  if (!dir)
   {
     printf("create nsILocalFile failed\n");
@@ -352 +343 @@
 }
 
-
+// move up the number of directories in moveUpCount, then append "foo/bar"
+void
+NormalizeTest(const char *testPath, int moveUpCount,
+              const char *expected)
+{
+  Banner("Normalize Test");
+
+  nsresult rv;
+  nsCOMPtr<nsILocalFile> file(do_CreateInstance(NS_LOCAL_FILE_CONTRACTID));
+
+  if (!file)
+  {
+    printf("create nsILocalFile failed\n");
+    return;
+  }
+
+  rv = file->InitWithNativePath(nsDependentCString(testPath));
+  VerifyResult(rv);
+
+  nsCOMPtr<nsIFile> parent;
+  nsAutoString path;
+  for (int i=0; i < moveUpCount; i++)
+  {
+    rv = file->GetParent(getter_AddRefs(parent));
+    VerifyResult(rv);
+    rv = parent->GetPath(path);
+    VerifyResult(rv);
+    rv = file->InitWithPath(path);
+    VerifyResult(rv);
+  }
+
+  if (!parent) {
+    printf("Getting parent failed!\n");
+    return;
+  }
+
+  rv = parent->Append(NS_LITERAL_STRING("foo"));
+  VerifyResult(rv);
+  rv = parent->Append(NS_LITERAL_STRING("bar"));
+  VerifyResult(rv);
+
+  rv = parent->Normalize();
+  VerifyResult(rv);
+
+  nsCAutoString newPath;
+  rv = parent->GetNativePath(newPath);
+  VerifyResult(rv);
+
+  nsCOMPtr<nsILocalFile>
+    expectedFile(do_CreateInstance(NS_LOCAL_FILE_CONTRACTID));
+
+  if (!expectedFile)
+  {
+    printf("create nsILocalFile failed\n");
+    return;
+  }
+  rv = expectedFile->InitWithNativePath(nsDependentCString(expected));
+  VerifyResult(rv);
+
+  rv = expectedFile->Normalize();
+  VerifyResult(rv);
+
+  nsCAutoString expectedPath;
+  rv = expectedFile->GetNativePath(expectedPath);
+  VerifyResult(rv);
+
+  if (!newPath.Equals(expectedPath)) {
+    printf("ERROR: Normalize() test Failed!\n");
+    printf("     Got: %s\n", newPath.get());
+    printf("Expected: %s\n", expectedPath);
+  }
+
+  printf("end normalize test.\n");
+}
 
 int main(void)
@@ -361 +425 @@
     NS_ASSERTION(registrar, "Null nsIComponentRegistrar");
     registrar->AutoRegister(nsnull);
-  
+
 #if defined(XP_WIN) || defined(XP_OS2)
-    InitTest("c:\\temp\\", "sub1/sub2/");
-    InitTest("d:\\temp\\", "sub1\\sub2\\");
+    InitTest("c:\\temp\\", "sub1/sub2/"); // expect failure
+    InitTest("d:\\temp\\", "sub1\\sub2\\"); // expect failure
 
     CreationTest("c:\\temp\\", "file.txt", nsIFile::NORMAL_FILE_TYPE, 0644);
@@ -385 +449 @@
 #else
 #ifdef XP_UNIX
-    InitTest("/tmp/", "sub1/sub2/");
-    
+    InitTest("/tmp/", "sub1/sub2/"); // expect failure
+
     CreationTest("/tmp", "file.txt", nsIFile::NORMAL_FILE_TYPE, 0644);
     DeletionTest("/tmp/", "file.txt", PR_FALSE);
-    
+
     CreationTest("/tmp", "mumble/a/b/c/d/e/f/g/h/i/j/k/", nsIFile::DIRECTORY_TYPE, 0644);
     DeletionTest("/tmp", "mumble", PR_TRUE);
-    CopyTest("/tmp/test.txt", "/tmp/foo");
+
+    CreationTest("/tmp", "file", nsIFile::NORMAL_FILE_TYPE, 0644);
+    CopyTest("/tmp/file", "/tmp/newDir");
+    MoveTest("/tmp/file", "/tmp/newDir/anotherNewDir");
+    DeletionTest("/tmp", "newDir", PR_TRUE);
+
+    CreationTest("/tmp", "qux/quux", nsIFile::NORMAL_FILE_TYPE, 0644);
+    CreationTest("/tmp", "foo/bar", nsIFile::NORMAL_FILE_TYPE, 0644);
+    NormalizeTest("/tmp/qux/quux/..", 1, "/tmp/foo/bar");
+    DeletionTest("/tmp", "qux", PR_TRUE);
+    DeletionTest("/tmp", "foo", PR_TRUE);
 
 #endif /* XP_UNIX */