This commit was manufactured by cvs2svn to create branch 'src'.

git-svn-id: svn://10.0.0.236/branches/src@33658 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/mailnews/base/src/nsMsgMailSession.cpp

@@ -1,298 +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.
- */
-
-#include "msgCore.h" // for pre-compiled headers
-//#include "nsIMsgIdentity.h"
-#include "nsIMsgAccountManager.h"
-//#include "nsIPop3IncomingServer.h"
-#include "nsMsgMailSession.h"
-#include "nsMsgLocalCID.h"
-#include "nsMsgBaseCID.h"
-#include "nsCOMPtr.h"
-#include "nsMsgFolderCache.h"
-#include "nsIFileLocator.h"
-#include "nsFileLocations.h"
-#include "nsIMsgStatusFeedback.h"
-
-NS_IMPL_ISUPPORTS(nsMsgMailSession, nsCOMTypeInfo<nsIMsgMailSession>::GetIID());
-
-static NS_DEFINE_CID(kMsgAccountManagerCID, NS_MSGACCOUNTMANAGER_CID);
-static NS_DEFINE_CID(kMsgFolderCacheCID, NS_MSGFOLDERCACHE_CID);
-static NS_DEFINE_IID(kIFileLocatorIID,      NS_IFILELOCATOR_IID);
-static NS_DEFINE_CID(kFileLocatorCID,       NS_FILELOCATOR_CID);
- 
-//static NS_DEFINE_CID(kMsgIdentityCID, NS_MSGIDENTITY_CID);
-//static NS_DEFINE_CID(kPop3IncomingServerCID, NS_POP3INCOMINGSERVER_CID);
-//static NS_DEFINE_CID(kPrefCID, NS_PREF_CID);
-    
-
-nsMsgMailSession::nsMsgMailSession():
-  mRefCnt(0),
-  m_accountManager(0),
-  m_msgFolderCache(0)
-{
-
-	NS_INIT_REFCNT();
-}
-
-
-nsMsgMailSession::~nsMsgMailSession()
-{
-	Shutdown();
-}
-
-nsresult nsMsgMailSession::Init()
-{
-	nsresult rv = NS_NewISupportsArray(getter_AddRefs(mListeners));
-
-	return rv;
-
-}
-
-nsresult nsMsgMailSession::Shutdown()
-{
-  if(m_accountManager)
-  {
-	  if (m_msgFolderCache)
-		m_accountManager->WriteToFolderCache(m_msgFolderCache);
-	  m_accountManager->CloseCachedConnections();
-	  m_accountManager->UnloadAccounts();
-  }
-
-  NS_IF_RELEASE(m_accountManager);
-
-  NS_IF_RELEASE(m_msgFolderCache);
-
-  return NS_OK;
-}
-
-// nsIMsgMailSession
-nsresult nsMsgMailSession::GetCurrentIdentity(nsIMsgIdentity ** aIdentity)
-{
-  nsresult rv;
-
-  nsCOMPtr<nsIMsgAccountManager> accountManager;
-  rv = GetAccountManager(getter_AddRefs(accountManager));
-  if (NS_FAILED(rv)) return rv;
-
-  nsCOMPtr<nsIMsgAccount> defaultAccount;
-  rv = accountManager->GetDefaultAccount(getter_AddRefs(defaultAccount));
-  if (NS_FAILED(rv)) return rv;
-  
-  rv = defaultAccount->GetDefaultIdentity(aIdentity);
-  if (NS_SUCCEEDED(rv))
-  	NS_ADDREF(*aIdentity);
-  
-  return rv;
-}
-
-nsresult nsMsgMailSession::GetCurrentServer(nsIMsgIncomingServer ** aServer)
-{
-  nsresult rv=NS_ERROR_UNEXPECTED;
-
-  nsCOMPtr<nsIMsgAccountManager> accountManager;
-  rv = GetAccountManager(getter_AddRefs(accountManager));
-  if (NS_FAILED(rv)) return rv;
-  
-  nsCOMPtr<nsIMsgAccount> defaultAccount;
-  rv = accountManager->GetDefaultAccount(getter_AddRefs(defaultAccount));
-  if (NS_FAILED(rv)) return rv;
-
-  //if successful aServer will be addref'd by GetIncomingServer
-  rv = defaultAccount->GetIncomingServer(aServer);
-
-  return rv;
-}
-
-nsresult nsMsgMailSession::GetAccountManager(nsIMsgAccountManager* *aAM)
-{
-  NS_ENSURE_ARG_POINTER(aAM);
-
-  nsresult rv;
-  
-  NS_WITH_SERVICE(nsIMsgAccountManager, accountManager, kMsgAccountManagerCID, &rv);
-  if (NS_FAILED(rv)) return rv;
-  accountManager->LoadAccounts();
-    
-  *aAM = accountManager;
-  NS_IF_ADDREF(*aAM);
-  return NS_OK;
-}
-
-nsresult nsMsgMailSession::GetFolderCache(nsIMsgFolderCache* *aFolderCache)
-{
-  if (!aFolderCache) return NS_ERROR_NULL_POINTER;
-
-  nsresult rv = NS_OK;
-
-  if (!m_msgFolderCache)
-  {
-    rv = nsComponentManager::CreateInstance(kMsgFolderCacheCID,
-                                            NULL,
-                                            nsCOMTypeInfo<nsIMsgFolderCache>::GetIID(),
-                                            (void **)&m_msgFolderCache);
-    if (NS_FAILED(rv))
-		return rv;
-
-    nsCOMPtr <nsIFileSpec> cacheFile;
-    NS_WITH_SERVICE(nsIFileLocator, locator, kFileLocatorCID, &rv);
-    if (NS_FAILED(rv)) return rv;
-
-    rv = locator->GetFileLocation(nsSpecialFileSpec::App_MessengerFolderCache50, getter_AddRefs(cacheFile));
-    if (NS_FAILED(rv)) return rv;
-
-    m_msgFolderCache->Init(cacheFile);
-
-  }
-
-  *aFolderCache = m_msgFolderCache;
-  NS_IF_ADDREF(*aFolderCache);
-  return rv;
-}
-
-nsresult nsMsgMailSession::GetTemporaryMsgStatusFeedback(nsIMsgStatusFeedback* *aMsgStatusFeedback)
-{
-  if (!aMsgStatusFeedback) return NS_ERROR_NULL_POINTER;
-  
-  *aMsgStatusFeedback = m_temporaryMsgStatusFeedback;
-  NS_IF_ADDREF(*aMsgStatusFeedback);
-  return NS_OK;
-}
-
-
-nsresult nsMsgMailSession::SetTemporaryMsgStatusFeedback(nsIMsgStatusFeedback* aMsgStatusFeedback)
-{
-  m_temporaryMsgStatusFeedback = do_QueryInterface(aMsgStatusFeedback);
-  return NS_OK;
-}
-
-
-NS_IMETHODIMP nsMsgMailSession::AddFolderListener(nsIFolderListener * listener)
-{
-  mListeners->AppendElement(listener);
-  return NS_OK;
-
-}
-
-NS_IMETHODIMP nsMsgMailSession::RemoveFolderListener(nsIFolderListener * listener)
-{
-  mListeners->RemoveElement(listener);
-  return NS_OK;
-
-}
-
-NS_IMETHODIMP
-nsMsgMailSession::NotifyFolderItemPropertyChanged(nsISupports *item,
-                                                  const char *property,
-                                                  const char* oldValue,
-                                                  const char* newValue)
-{
-	nsresult rv;
-	PRUint32 count;
-	rv = mListeners->Count(&count);
-	if (NS_FAILED(rv)) return rv;
-
-	
-	for(PRUint32 i = 0; i < count; i++)
-	{
-		nsCOMPtr<nsIFolderListener> listener = getter_AddRefs((nsIFolderListener*)mListeners->ElementAt(i));
-		listener->OnItemPropertyChanged(item, property, oldValue, newValue);
-	}
-
-	return NS_OK;
-
-}
-
-NS_IMETHODIMP
-nsMsgMailSession::NotifyFolderItemPropertyFlagChanged(nsISupports *item,
-                                                      const char *property,
-                                                      PRUint32 oldValue,
-                                                      PRUint32 newValue)
-{
-	nsresult rv;
-	PRUint32 count;
-	rv = mListeners->Count(&count);
-	if (NS_FAILED(rv)) return rv;
-
-	
-	for(PRUint32 i = 0; i < count; i++)
-	{
-		nsCOMPtr<nsIFolderListener> listener = getter_AddRefs((nsIFolderListener*)mListeners->ElementAt(i));
-		listener->OnItemPropertyFlagChanged(item, property, oldValue, newValue);
-	}
-
-	return NS_OK;
-
-}
-
-NS_IMETHODIMP nsMsgMailSession::NotifyFolderItemAdded(nsIFolder *folder, nsISupports *item)
-{
-	nsresult rv;
-	PRUint32 count;
-	rv = mListeners->Count(&count);
-	if (NS_FAILED(rv)) return rv;
-
-	
-	for(PRUint32 i = 0; i < count; i++)
-	{
-		nsCOMPtr<nsIFolderListener> listener = getter_AddRefs((nsIFolderListener*)mListeners->ElementAt(i));
-		listener->OnItemAdded(folder, item);
-	}
-
-	return NS_OK;
-
-}
-
-NS_IMETHODIMP nsMsgMailSession::NotifyFolderItemDeleted(nsIFolder *folder, nsISupports *item)
-{
-	nsresult rv;
-	PRUint32 count;
-	rv = mListeners->Count(&count);
-	if (NS_FAILED(rv)) return rv;
-
-	
-	for(PRUint32 i = 0; i < count; i++)
-	{
-		nsCOMPtr<nsIFolderListener> listener = getter_AddRefs((nsIFolderListener*)mListeners->ElementAt(i));
-		listener->OnItemRemoved(folder, item);
-	}
-	return NS_OK;
-
-}
-
-NS_IMETHODIMP  nsMsgMailSession::NotifyFolderLoaded(nsIFolder *folder)
-{
-
-	nsresult rv;
-	PRUint32 count;
-	rv = mListeners->Count(&count);
-	if (NS_FAILED(rv)) return rv;
-
-	
-	for(PRUint32 i = 0; i < count; i++)
-	{
-		nsCOMPtr<nsIFolderListener> listener = getter_AddRefs((nsIFolderListener*)mListeners->ElementAt(i));
-		listener->OnFolderLoaded(folder);
-	}
-	return NS_OK;
-
-
-}
-
-
-

mozilla/mailnews/base/util/Makefile.in

@@ -1,75 +0,0 @@
-#
-# 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.
-#
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= msgbaseutil
-LIBRARY_NAME	= msgbaseutil
-
-CPPSRCS		= \
-		nsMsgGroupRecord.cpp \
-		nsMsgLineBuffer.cpp \
-		nsMsgFolder.cpp \
-		nsMsgDBFolder.cpp \
-		nsUInt32Array.cpp \
-		nsMsgKeySet.cpp \
-		nsLocalFolderSummarySpec.cpp \
-		nsNewsSummarySpec.cpp \
-		nsMsgIdentity.cpp \
-		nsMsgIncomingServer.cpp \
-		nsMsgUtils.cpp \
-		nsMessage.cpp \
-		nsMsgProtocol.cpp \
-		nsMsgMailNewsUrl.cpp \
-		nsMsgTxn.cpp \
-		nsMsgI18N.cpp \
-		$(NULL)
-
-EXPORTS		= \
-		nsMsgGroupRecord.h \
-		nsMsgLineBuffer.h \
-		nsUInt32Array.h \
-		nsMsgKeySet.h \
-		nsMsgFolder.h \
-		nsMsgDBFolder.h \
-		nsLocalFolderSummarySpec.h \
-		nsNewsSummarySpec.h \
-		nsMsgIdentity.h \
-		nsMsgIncomingServer.h \
-		nsMsgUtils.h \
-		nsMessage.h \
-		nsMsgProtocol.h \
-		nsMsgMailNewsUrl.h \
-		nsMsgTxn.h \
-		nsMsgI18N.h \
-		$(NULL)
-
-EXTRA_DSO_LDOPTS = \
-	-L$(DIST)/bin \
-	-L$(DIST)/lib \
-	-lxpcom \
-	-lrdfutil_s \
-	$(NSPR_LIBS) \
-	$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/mailnews/base/util/makefile.win

@@ -1,87 +0,0 @@
-#!nmake
-#
-# 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.
-
-DEPTH=..\..\..
-MODULE= msgbsutl
-
-include <$(DEPTH)\config\config.mak>
-
-################################################################################
-## exports
-
-EXPORTS=                \
-	nsMsgLineBuffer.h	\
-	nsMsgGroupRecord.h  \
-	nsUInt32Array.h	\
-	nsMsgKeySet.h			\
-	nsMsgFolder.h			\
-	nsMsgDBFolder.h			\
-	nsLocalFolderSummarySpec.h	\
-	nsMsgIdentity.h			\
-	nsMsgIncomingServer.h	\
-	nsNewsSummarySpec.h \
-	nsMsgUtils.h \
-	nsMessage.h \
-	nsMsgProtocol.h \
-	nsMsgMailNewsUrl.h \
-	nsMsgTxn.h \
-	nsMsgI18N.h \
-	$(NULL)
-
-################################################################################
-## library
-
-LIBNAME = .\$(OBJDIR)\msgbsutl
-DLL = $(LIBNAME).dll
-
-DEFINES=-D_IMPL_NS_MSG_BASE
-
-LCFLAGS =		   \
-        $(LCFLAGS) \
-        $(DEFINES) \
-        $(NULL)
-
-CPP_OBJS=                               \
-	.\$(OBJDIR)\nsMsgGroupRecord.obj    \
-	.\$(OBJDIR)\nsMsgLineBuffer.obj     \
-	.\$(OBJDIR)\nsUInt32Array.obj		\
-	.\$(OBJDIR)\nsMsgKeySet.obj			\
-	.\$(OBJDIR)\nsMsgFolder.obj			\
-	.\$(OBJDIR)\nsMsgDBFolder.obj		\
-	.\$(OBJDIR)\nsLocalFolderSummarySpec.obj	\
-	.\$(OBJDIR)\nsMsgIdentity.obj		\
-	.\$(OBJDIR)\nsMsgIncomingServer.obj	\
-	.\$(OBJDIR)\nsNewsSummarySpec.obj	\
-	.\$(OBJDIR)\nsMsgUtils.obj			\
-	.\$(OBJDIR)\nsMessage.obj			\
-	.\$(OBJDIR)\nsMsgProtocol.obj		\
-	.\$(OBJDIR)\nsMsgMailNewsUrl.obj	\
-	.\$(OBJDIR)\nsMsgTxn.obj			\
-	.\$(OBJDIR)\nsMsgI18N.obj			\
-	$(NULL)
-
-LLIBS=								\
-	$(DIST)\lib\xpcom.lib			\
-	$(DIST)\lib\rdfutil_s.lib		\
-	$(LIBNSPR)						\
-	$(NULL)
-
-include <$(DEPTH)/config/rules.mak>
-
-libs:: $(DLL)
-	$(MAKE_INSTALL)  $(LIBNAME).$(DLL_SUFFIX) $(DIST)\bin
-	$(MAKE_INSTALL)  $(LIBNAME).$(LIB_SUFFIX) $(DIST)\lib

mozilla/mailnews/base/util/nsLocalFolderSummarySpec.cpp

@@ -1,76 +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) 1999 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "nsLocalFolderSummarySpec.h"
-#include "plstr.h"
-#include "nsString.h"
-
-MOZ_DECL_CTOR_COUNTER(nsLocalFolderSummarySpec);
-
-nsLocalFolderSummarySpec::~nsLocalFolderSummarySpec()
-{
-	MOZ_COUNT_DTOR(nsLocalFolderSummarySpec);
-
-}
-
-nsLocalFolderSummarySpec::nsLocalFolderSummarySpec()
-{
-	MOZ_COUNT_CTOR(nsLocalFolderSummarySpec);
-}
-
-nsLocalFolderSummarySpec::nsLocalFolderSummarySpec(const char *folderPath, PRBool create)
-  : nsFileSpec(folderPath, create)
-{
-	MOZ_COUNT_CTOR(nsLocalFolderSummarySpec);
-	CreateSummaryFileName();
-}
-
-nsLocalFolderSummarySpec::nsLocalFolderSummarySpec(const nsFileSpec& inFolderPath)
-: nsFileSpec(inFolderPath)
-{
-	MOZ_COUNT_CTOR(nsLocalFolderSummarySpec);
-	CreateSummaryFileName();
-}
-
-nsLocalFolderSummarySpec::nsLocalFolderSummarySpec(const nsFilePath &inFolderPath, PRBool create) : nsFileSpec(inFolderPath, create)
-{
-	MOZ_COUNT_CTOR(nsLocalFolderSummarySpec);
-	CreateSummaryFileName();
-}
-
-void nsLocalFolderSummarySpec::SetFolderName(const char *folderPath)
-{
-	*this = folderPath;
-}
-
-void nsLocalFolderSummarySpec::	CreateSummaryFileName()
-{
-	char *leafName = GetLeafName();
-
-	nsString fullLeafName(leafName);
-
-	// Append .msf (msg summary file) this is what windows will want.
-	// Mac and Unix can decide for themselves.
-
-	fullLeafName += ".msf";				// message summary file
-	char *cLeafName = fullLeafName.ToNewCString();
-	SetLeafName(cLeafName);
-    nsAllocator::Free(cLeafName);
-	PL_strfree(leafName);
-}
-

mozilla/mailnews/base/util/nsLocalFolderSummarySpec.h

@@ -1,46 +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) 1999 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#ifndef _nsLocalFolderSummarySpec_H
-#define _nsLocalFolderSummarySpec_H
-
-#include "msgCore.h"
-#include "nsFileSpec.h"
-
-// Class to name a summary file for a local mail folder,
-// given a full folder file spec. For windows, this just means tacking .msf on the end.
-// For Unix, it might mean something like putting a '.' on the front and .msgsummary on the end.
-// Note this class expects the invoking code to fully specify the folder path. 
-// This class does NOT prepend the local folder directory, or put .sbd on the containing
-// directory names.
-class NS_MSG_BASE nsLocalFolderSummarySpec : public nsFileSpec
-{
-public:
-			virtual ~nsLocalFolderSummarySpec();
-			nsLocalFolderSummarySpec();
-			nsLocalFolderSummarySpec(const char *folderPath, PRBool create = PR_FALSE);
-			nsLocalFolderSummarySpec(const nsFileSpec& inFolderPath);
-			nsLocalFolderSummarySpec(const nsFilePath &inFolderPath, PRBool create = PR_FALSE);
-			void SetFolderName(const char *folderPath);
-
-protected:
-	void	CreateSummaryFileName();
-
-};
-
-#endif

mozilla/mailnews/base/util/nsMessage.cpp

@@ -1,509 +0,0 @@
-/* -*- 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) 1999 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "msgCore.h"    // precompiled header...
-#include "nsMessage.h"
-#include "nsIMsgFolder.h"
-
-
-nsMessage::nsMessage(void)
-  : nsRDFResource(), mFolder(nsnull)
-{
-
-}
-
-nsMessage::~nsMessage(void)
-{
-	//Member variables are either nsCOMPtr's or ptrs we don't want to own.
-}
-
-NS_IMPL_ADDREF_INHERITED(nsMessage, nsRDFResource)
-NS_IMPL_RELEASE_INHERITED(nsMessage, nsRDFResource)                        
-
-NS_IMETHODIMP nsMessage::QueryInterface(REFNSIID aIID, void** aInstancePtr)
-{
-	if (!aInstancePtr) return NS_ERROR_NULL_POINTER;
-	*aInstancePtr = nsnull;
-	if (aIID.Equals(nsCOMTypeInfo<nsIMessage>::GetIID()) || aIID.Equals(nsCOMTypeInfo<nsIDBMessage>::GetIID()))
-	{
-		*aInstancePtr = NS_STATIC_CAST(nsIDBMessage*, this);
-	}              
-	if(*aInstancePtr)
-	{
-		AddRef();
-		return NS_OK;
-	}
-
-	return nsRDFResource::QueryInterface(aIID, aInstancePtr);
-}
-
-NS_IMETHODIMP
-nsMessage::Init(const char* aURI)
-{
-
-	return nsRDFResource::Init(aURI);
-}
-
-
-NS_IMETHODIMP nsMessage::GetProperty(const char *propertyName, nsString &resultProperty)
-{
-	if(mMsgHdr)
-		return mMsgHdr->GetProperty(propertyName, resultProperty);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::SetProperty(const char *propertyName, nsString &propertyStr)
-{
-	if(mMsgHdr)
-		return mMsgHdr->SetProperty(propertyName, propertyStr);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::GetUint32Property(const char *propertyName, PRUint32 *pResult)
-{
-	if(mMsgHdr)
-		return mMsgHdr->GetUint32Property(propertyName, pResult);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::SetUint32Property(const char *propertyName, PRUint32 propertyVal)
-{
-	if(mMsgHdr)
-		return mMsgHdr->SetUint32Property(propertyName, propertyVal);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::GetNumReferences(PRUint16 *result)
-{
-	if(mMsgHdr)
-		return mMsgHdr->GetNumReferences(result);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::GetStringReference(PRInt32 refNum, nsCString &resultReference)
-{
-	if(mMsgHdr)
-		return mMsgHdr->GetStringReference(refNum, resultReference);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::GetDate(PRTime *result)
-{
-	if(mMsgHdr)
-		return mMsgHdr->GetDate(result);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::SetDate(PRTime date)
-{
-	if(mMsgHdr)
-		return mMsgHdr->SetDate(date);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::SetMessageId(const char *messageId)
-{
-	if(mMsgHdr)
-		return mMsgHdr->SetMessageId(messageId);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::SetReferences(const char *references)
-{
-	if(mMsgHdr)
-		return mMsgHdr->SetReferences(references);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::SetCCList(const char *ccList)
-{
-	if(mMsgHdr)
-		return mMsgHdr->SetCCList(ccList);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::SetRecipients(const char *recipients, PRBool recipientsIsNewsgroup)
-{
-	if(mMsgHdr)
-		return mMsgHdr->SetRecipients(recipients, recipientsIsNewsgroup);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::SetRecipientsArray(const char *names, const char *addresses, PRUint32 numAddresses)
-{
-	if(mMsgHdr)
-		return mMsgHdr->SetRecipientsArray(names, addresses, numAddresses);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::SetCCListArray(const char *names, const char *addresses, PRUint32 numAddresses)
-{
-	if(mMsgHdr)
-		return mMsgHdr->SetCCListArray(names, addresses, numAddresses);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::SetAuthor(const char *author)
-{
-	if(mMsgHdr)
-		return mMsgHdr->SetAuthor(author);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::SetSubject(const char *subject)
-{
-	if(mMsgHdr)
-		return mMsgHdr->SetSubject(subject);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::SetStatusOffset(PRUint32 statusOffset)
-{
-	if(mMsgHdr)
-		return mMsgHdr->SetStatusOffset(statusOffset);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-
-NS_IMETHODIMP nsMessage::GetAuthor(nsString *resultAuthor)
-{
-	if(mMsgHdr)
-		return mMsgHdr->GetAuthor(resultAuthor);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::GetSubject(nsString *resultSubject)
-{
-	if(mMsgHdr)
-		return mMsgHdr->GetSubject(resultSubject);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::GetRecipients(nsString *resultRecipients)
-{
-	if(mMsgHdr)
-		return mMsgHdr->GetRecipients(resultRecipients);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::GetCCList(nsString *ccList)
-{
-	if(mMsgHdr)
-		return mMsgHdr->GetCCList(ccList);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::GetMessageId(nsCString *resultMessageId)
-{
-	if(mMsgHdr)
-		return mMsgHdr->GetMessageId(resultMessageId);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-
-NS_IMETHODIMP nsMessage::GetMime2DecodedAuthor(nsString *resultAuthor)
-{
-	if(mMsgHdr)
-		return mMsgHdr->GetMime2DecodedAuthor(resultAuthor);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::GetMime2DecodedSubject(nsString *resultSubject)
-{
-	if(mMsgHdr)
-		return mMsgHdr->GetMime2DecodedSubject(resultSubject);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::GetMime2DecodedRecipients(nsString *resultRecipients)
-{
-	if(mMsgHdr)
-		return mMsgHdr->GetMime2DecodedRecipients(resultRecipients);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-
-NS_IMETHODIMP nsMessage::GetAuthorCollationKey(nsString *resultAuthor)
-{
-	if(mMsgHdr)
-		return mMsgHdr->GetAuthorCollationKey(resultAuthor);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::GetSubjectCollationKey(nsString *resultSubject)
-{
-	if(mMsgHdr)
-		return mMsgHdr->GetSubjectCollationKey(resultSubject);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::GetRecipientsCollationKey(nsString *resultRecipients)
-{
-	if(mMsgHdr)
-		return mMsgHdr->GetRecipientsCollationKey(resultRecipients);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-
-NS_IMETHODIMP nsMessage::GetFlags(PRUint32 *result)
-{
-	if(mMsgHdr)
-		return mMsgHdr->GetFlags(result);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::SetFlags(PRUint32 flags)
-{
-	if(mMsgHdr)
-		return mMsgHdr->SetFlags(flags);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::OrFlags(PRUint32 flags, PRUint32 *result)
-{
-	if(mMsgHdr)
-		return mMsgHdr->OrFlags(flags, result);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::AndFlags(PRUint32 flags, PRUint32 *result)
-{
-	if(mMsgHdr)
-		return mMsgHdr->AndFlags(flags, result);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::MarkRead(PRBool bRead)
-{
-	if(mMsgHdr)
-		return mMsgHdr->MarkRead(bRead);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::MarkFlagged(PRBool bFlagged)
-{
-	if(mMsgHdr)
-		return mMsgHdr->MarkFlagged(bFlagged);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::GetMessageKey(nsMsgKey *result)
-{
-	if(mMsgHdr)
-		return mMsgHdr->GetMessageKey(result);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::GetThreadId(nsMsgKey *result)
-{
-	if(mMsgHdr)
-		return mMsgHdr->GetThreadId(result);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::SetThreadId(nsMsgKey inKey)
-{
-	if(mMsgHdr)
-		return mMsgHdr->SetThreadId(inKey);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::SetMessageKey(nsMsgKey inKey)
-{
-	if(mMsgHdr)
-		return mMsgHdr->SetMessageKey(inKey);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::GetMessageSize(PRUint32 *result)
-{
-	if(mMsgHdr)
-		return mMsgHdr->GetMessageSize(result);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::GetLineCount(PRUint32 *result)
-{
-	if(mMsgHdr)
-		return mMsgHdr->GetLineCount(result);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::SetMessageSize(PRUint32 messageSize)
-{
-	if(mMsgHdr)
-		return mMsgHdr->SetMessageSize(messageSize);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::SetLineCount(PRUint32 lineCount)
-{
-	if(mMsgHdr)
-		return mMsgHdr->SetLineCount(lineCount);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::SetPriority(nsMsgPriority priority)
-{
-	if(mMsgHdr)
-		return mMsgHdr->SetPriority(priority);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::SetPriority(const char *priority)
-{
-	if(mMsgHdr)
-		return mMsgHdr->SetPriority(priority);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::GetPriority(nsMsgPriority *result)
-{
-	if(mMsgHdr)
-		return mMsgHdr->GetPriority(result);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-
-NS_IMETHODIMP nsMessage::GetMessageOffset(PRUint32 *result)
-{
-	if(mMsgHdr)
-		return mMsgHdr->GetMessageOffset(result);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::GetStatusOffset(PRUint32 *result)
-{
-	if(mMsgHdr)
-		return mMsgHdr->GetStatusOffset(result);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::GetCharSet(nsString *result)
-{
-	if(mMsgHdr)
-		return mMsgHdr->GetCharSet(result);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::GetThreadParent(nsMsgKey *result)
-{
-	if(mMsgHdr)
-		return mMsgHdr->GetThreadParent(result);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsMessage::SetThreadParent(nsMsgKey inKey)
-{
-	if(mMsgHdr)
-		return mMsgHdr->SetThreadParent(inKey);
-	else
-		return NS_ERROR_FAILURE;
-}
-
-
-NS_IMETHODIMP nsMessage::GetMsgFolder(nsIMsgFolder **folder)
-{
-	if(!folder)
-		return NS_ERROR_NULL_POINTER;
-	*folder = mFolder;
-	if(mFolder)
-	{
-		NS_ADDREF(mFolder);
-		return NS_OK;
-	}
-	else
-		return NS_ERROR_NULL_POINTER;
-}
-
-
-NS_IMETHODIMP nsMessage::SetMsgFolder(nsIMsgFolder *folder)
-{
-	mFolder = folder;
-	//We don't want to own folder, so don't AddRef
-	return NS_OK;
-}
-
-
-NS_IMETHODIMP nsMessage::SetMsgDBHdr(nsIMsgDBHdr *hdr)
-{
-	mMsgHdr = dont_QueryInterface(hdr);
-	return NS_OK;
-}
-
-NS_IMETHODIMP nsMessage::GetMsgDBHdr(nsIMsgDBHdr **hdr)
-{
-	*hdr = mMsgHdr;
-	if(*hdr)
-	{
-		NS_ADDREF(*hdr);
-		return NS_OK;
-	}
-	else
-		return NS_ERROR_NULL_POINTER;
-}
-

mozilla/mailnews/base/util/nsMessage.h

@@ -1,113 +0,0 @@
-/* -*- 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) 1999 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-/********************************************************************************************************
- 
-   Interface for representing Messenger folders.
- 
-*********************************************************************************************************/
-
-#ifndef nsMessage_h__
-#define nsMessage_h__
-
-#include "msgCore.h"
-#include "nsIMessage.h" /* include the interface we are going to support */
-#include "nsRDFResource.h"
-#include "nsIMsgHdr.h"
-#include "nsCOMPtr.h"
-
-
-class NS_MSG_BASE nsMessage: public nsRDFResource, public nsIDBMessage
-{
-public: 
-	nsMessage(void);
-	virtual ~nsMessage(void);
-
-	NS_DECL_ISUPPORTS_INHERITED
-  NS_DECL_NSIMESSAGE
-  NS_DECL_NSIDBMESSAGE
-
-	NS_IMETHOD Init(const char *aURI);
-	//nsIMsgHdr
-	NS_IMETHOD GetProperty(const char *propertyName, nsString &resultProperty);
-    NS_IMETHOD SetProperty(const char *propertyName, nsString &propertyStr);
-    NS_IMETHOD GetUint32Property(const char *propertyName, PRUint32 *pResult);
-    NS_IMETHOD SetUint32Property(const char *propertyName, PRUint32 propertyVal);
-    NS_IMETHOD GetNumReferences(PRUint16 *result);
-    NS_IMETHOD GetStringReference(PRInt32 refNum, nsCString &resultReference);
-    NS_IMETHOD GetDate(PRTime *result);
-    NS_IMETHOD SetDate(PRTime date);
-    NS_IMETHOD SetMessageId(const char *messageId);
-    NS_IMETHOD SetReferences(const char *references);
-    NS_IMETHOD SetCCList(const char *ccList);
-    NS_IMETHOD SetRecipients(const char *recipients, PRBool recipientsIsNewsgroup);
-	NS_IMETHOD SetRecipientsArray(const char *names, const char *addresses, PRUint32 numAddresses);
-    NS_IMETHOD SetCCListArray(const char *names, const char *addresses, PRUint32 numAddresses);
-    NS_IMETHOD SetAuthor(const char *author);
-    NS_IMETHOD SetSubject(const char *subject);
-    NS_IMETHOD SetStatusOffset(PRUint32 statusOffset);
-
-	NS_IMETHOD GetAuthor(nsString *resultAuthor);
-	NS_IMETHOD GetSubject(nsString *resultSubject);
-	NS_IMETHOD GetRecipients(nsString *resultRecipients);
-	NS_IMETHOD GetCCList(nsString *ccList);
-	NS_IMETHOD GetMessageId(nsCString *resultMessageId);
-
-	NS_IMETHOD GetMime2DecodedAuthor(nsString *resultAuthor);
-	NS_IMETHOD GetMime2DecodedSubject(nsString *resultSubject);
-	NS_IMETHOD GetMime2DecodedRecipients(nsString *resultRecipients);
-
-	NS_IMETHOD GetAuthorCollationKey(nsString *resultAuthor);
-	NS_IMETHOD GetSubjectCollationKey(nsString *resultSubject);
-	NS_IMETHOD GetRecipientsCollationKey(nsString *resultRecipients);
-
-    // flag handling routines
-    NS_IMETHOD GetFlags(PRUint32 *result);
-    NS_IMETHOD SetFlags(PRUint32 flags);
-    NS_IMETHOD OrFlags(PRUint32 flags, PRUint32 *result);
-    NS_IMETHOD AndFlags(PRUint32 flags, PRUint32 *result);
-
-	// Mark message routines
-	NS_IMETHOD MarkRead(PRBool bRead);
-	NS_IMETHOD MarkFlagged(PRBool bFlagged);
-
-    NS_IMETHOD GetMessageKey(nsMsgKey *result);
-    NS_IMETHOD GetThreadId(nsMsgKey *result);
-    NS_IMETHOD SetThreadId(nsMsgKey inKey);
-    NS_IMETHOD SetMessageKey(nsMsgKey inKey);
-    NS_IMETHOD GetMessageSize(PRUint32 *result);
-    NS_IMETHOD SetMessageSize(PRUint32 messageSize);
-    NS_IMETHOD GetLineCount(PRUint32 *result);
-    NS_IMETHOD SetLineCount(PRUint32 lineCount);
-    NS_IMETHOD SetPriority(nsMsgPriority priority);
-    NS_IMETHOD SetPriority(const char *priority);
-    NS_IMETHOD GetMessageOffset(PRUint32 *result);
-    NS_IMETHOD GetStatusOffset(PRUint32 *result); 
-	NS_IMETHOD GetCharSet(nsString *result);
-    NS_IMETHOD GetPriority(nsMsgPriority *result);
-    NS_IMETHOD GetThreadParent(nsMsgKey *result);
-    NS_IMETHOD SetThreadParent(nsMsgKey inKey);
-
-protected:
-	nsIMsgFolder *mFolder;
-	nsCOMPtr<nsIMsgDBHdr> mMsgHdr;
-
-};
-
-#endif //nsMessage_h__
-

mozilla/mailnews/base/util/nsMsgDBFolder.cpp

@@ -1,530 +0,0 @@
-/* -*- 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) 1999 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "msgCore.h"
-#include "nsIMessage.h"
-#include "nsMsgDBFolder.h"
-#include "nsMsgFolderFlags.h"
-#include "nsIPref.h"
-#include "nsIMsgFolderCache.h"
-#include "nsIMsgFolderCacheElement.h"
-#include "nsIMsgMailSession.h"
-#include "nsMsgBaseCID.h"
-#include "nsIMsgMailNewsUrl.h"
-
-static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID);
-static NS_DEFINE_CID(kMsgMailSessionCID, NS_MSGMAILSESSION_CID);
-
-NS_IMPL_ADDREF_INHERITED(nsMsgDBFolder, nsMsgFolder)
-NS_IMPL_RELEASE_INHERITED(nsMsgDBFolder, nsMsgFolder)
-
-NS_IMETHODIMP nsMsgDBFolder::QueryInterface(REFNSIID aIID, void** aInstancePtr)
-{
-	if (!aInstancePtr) return NS_ERROR_NULL_POINTER;
-	*aInstancePtr = nsnull;
-	if (aIID.Equals(nsCOMTypeInfo<nsIDBChangeListener>::GetIID()))
-	{
-		*aInstancePtr = NS_STATIC_CAST(nsIDBChangeListener*, this);
-	}              
-	else if (aIID.Equals(nsCOMTypeInfo<nsIUrlListener>::GetIID()))
-	{
-		*aInstancePtr = NS_STATIC_CAST(nsIUrlListener*, this);
-	}              
-
-	if(*aInstancePtr)
-	{
-		AddRef();
-		return NS_OK;
-	}
-
-	return nsRDFResource::QueryInterface(aIID, aInstancePtr);
-}
-
-nsMsgDBFolder::nsMsgDBFolder(void)
-: mCharset(""), mAddListener(PR_TRUE)
-{
-
-}
-
-nsMsgDBFolder::~nsMsgDBFolder(void)
-{
-	if(mDatabase)
-	{
-		mDatabase->RemoveListener(this);
-		mDatabase->Close(PR_TRUE);
-	}
-}
-
-NS_IMETHODIMP nsMsgDBFolder::StartFolderLoading(void)
-{
-	if(mDatabase)
-		mDatabase->RemoveListener(this);
-	mAddListener = PR_FALSE;
-	return NS_OK;
-}
-
-NS_IMETHODIMP nsMsgDBFolder::EndFolderLoading(void)
-{
-	if(mDatabase)
-		mDatabase->AddListener(this);
-	mAddListener = PR_TRUE;
-	return NS_OK;
-}
-
-NS_IMETHODIMP nsMsgDBFolder::GetThreads(nsISimpleEnumerator** threadEnumerator)
-{
-	nsresult rv = GetDatabase();
-	
-	if(NS_SUCCEEDED(rv))
-		return mDatabase->EnumerateThreads(threadEnumerator);
-	else
-		return rv;
-}
-
-NS_IMETHODIMP
-nsMsgDBFolder::GetThreadForMessage(nsIMessage *message, nsIMsgThread **thread)
-{
-	nsresult rv = GetDatabase();
-	if(NS_SUCCEEDED(rv))
-	{
-		nsCOMPtr<nsIMsgDBHdr> msgDBHdr;
-		nsCOMPtr<nsIDBMessage> dbMessage(do_QueryInterface(message, &rv));
-		if(NS_SUCCEEDED(rv))
-			rv = dbMessage->GetMsgDBHdr(getter_AddRefs(msgDBHdr));
-		if(NS_SUCCEEDED(rv))
-		{
-			rv = mDatabase->GetThreadContainingMsgHdr(msgDBHdr, thread);
-		}
-	}
-	return rv;
-
-}
-
-NS_IMETHODIMP
-nsMsgDBFolder::HasMessage(nsIMessage *message, PRBool *hasMessage)
-{
-	if(!hasMessage)
-		return NS_ERROR_NULL_POINTER;
-
-	nsresult rv = GetDatabase();
-
-	if(NS_SUCCEEDED(rv))
-	{
-		nsCOMPtr<nsIMsgDBHdr> msgDBHdr, msgDBHdrForKey;
-		nsCOMPtr<nsIDBMessage> dbMessage(do_QueryInterface(message, &rv));
-		nsMsgKey key;
-		if(NS_SUCCEEDED(rv))
-			rv = dbMessage->GetMsgDBHdr(getter_AddRefs(msgDBHdr));
-		if(NS_SUCCEEDED(rv))
-			rv = msgDBHdr->GetMessageKey(&key);
-		if(NS_SUCCEEDED(rv))
-			rv = mDatabase->ContainsKey(key, hasMessage);
-		
-	}
-	return rv;
-
-}
-
-NS_IMETHODIMP nsMsgDBFolder::GetCharset(PRUnichar * *aCharset)
-{
-	nsresult rv = NS_OK;
-	if(!aCharset)
-		return NS_ERROR_NULL_POINTER;
-
-	if(mCharset == "")
-	{
-		NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &rv);
-
-		char *prefCharset = nsnull;
-		if (NS_SUCCEEDED(rv))
-		{
-			rv = prefs->CopyCharPref("intl.character_set_name", &prefCharset);
-		}
-  
-		nsString prefCharsetStr;
-		if(prefCharset)
-		{
-			prefCharsetStr = prefCharset;
-			PR_Free(prefCharset);
-		}
-		else
-		{
-			prefCharsetStr = "us-ascii";
-		}
-		*aCharset = prefCharsetStr.ToNewUnicode();
-	}
-	else
-	{
-		*aCharset = mCharset.ToNewUnicode();
-	}
-	return rv;
-}
-
-NS_IMETHODIMP nsMsgDBFolder::SetCharset(const PRUnichar * aCharset)
-{
-	nsresult rv;
-
-	nsCOMPtr<nsIDBFolderInfo> folderInfo;
-	nsCOMPtr<nsIMsgDatabase> db; 
-	rv = GetDBFolderInfoAndDB(getter_AddRefs(folderInfo), getter_AddRefs(db));
-	if(NS_SUCCEEDED(rv))
-	{
-		nsString charset(aCharset);
-		rv = folderInfo->SetCharacterSet(&charset);
-		db->Commit(nsMsgDBCommitType::kLargeCommit);
-	}
-	return rv;
-}
-
-nsresult nsMsgDBFolder::ReadDBFolderInfo(PRBool force)
-{
-	// Since it turns out to be pretty expensive to open and close
-	// the DBs all the time, if we have to open it once, get everything
-	// we might need while we're here
-
-	nsresult result;
-
-	nsCOMPtr <nsIMsgFolderCache> folderCache;
-
-	NS_WITH_SERVICE(nsIMsgMailSession, mailSession, kMsgMailSessionCID, &result); 
-	if(NS_SUCCEEDED(result))
-	{
-		result = mailSession->GetFolderCache(getter_AddRefs(folderCache));
-		if (NS_SUCCEEDED(result) && folderCache)
-		{
-			char *uri;
-
-			result = GetURI(&uri);
-			if (NS_SUCCEEDED(result) && uri)
-			{
-				nsCOMPtr <nsIMsgFolderCacheElement> cacheElement;
-				result = folderCache->GetCacheElement(uri, PR_FALSE, getter_AddRefs(cacheElement));
-				if (NS_SUCCEEDED(result) && cacheElement)
-				{
-					result = ReadFromFolderCache(cacheElement);
-				}
-				PR_Free(uri);
-			}
-
-		}
-	}
-//	if (m_master->InitFolderFromCache (this))
-//		return err;
-
-	if (force || !(mPrefFlags & MSG_FOLDER_PREF_CACHED))
-    {
-        nsCOMPtr<nsIDBFolderInfo> folderInfo;
-        nsCOMPtr<nsIMsgDatabase> db; 
-        result = GetDBFolderInfoAndDB(getter_AddRefs(folderInfo), getter_AddRefs(db));
-        if(NS_SUCCEEDED(result))
-        {
-			mIsCachable = PR_TRUE;
-            if (folderInfo)
-            {
-
-	            folderInfo->GetFlags(&mPrefFlags);
-                mPrefFlags |= MSG_FOLDER_PREF_CACHED;
-                folderInfo->SetFlags(mPrefFlags);
-
-				folderInfo->GetNumMessages(&mNumTotalMessages);
-				folderInfo->GetNumNewMessages(&mNumUnreadMessages);
-
-				//These should be put in IMAP folder only.
-				//folderInfo->GetImapTotalPendingMessages(&mNumPendingTotalMessages);
-				//folderInfo->GetImapUnreadPendingMessages(&mNumPendingUnreadMessages);
-
-				folderInfo->GetCharacterSet(&mCharset);
-        
-				if (db) {
-					PRBool hasnew;
-					nsresult rv;
-					rv = db->HasNew(&hasnew);
-					if (NS_FAILED(rv)) return rv;
-					if (!hasnew && mNumPendingUnreadMessages <= 0) {
-						ClearFlag(MSG_FOLDER_FLAG_GOT_NEW);
-					}
-				}
-            }
-
-        }
-        if (db)
-	        db->Close(PR_FALSE);
-    }
-
-	return result;
-	
-}
-
-nsresult nsMsgDBFolder::SendFlagNotifications(nsISupports *item, PRUint32 oldFlags, PRUint32 newFlags)
-{
-	nsresult rv = NS_OK;
-
-	PRUint32 changedFlags = oldFlags ^ newFlags;
-	if((changedFlags & MSG_FLAG_READ) || (changedFlags & MSG_FLAG_REPLIED)
-		|| (changedFlags & MSG_FLAG_FORWARDED)|| (changedFlags & MSG_FLAG_NEW))
-	{
-		rv = NotifyPropertyFlagChanged(item, "Status", oldFlags, newFlags);
-	}
-	else if((changedFlags & MSG_FLAG_MARKED))
-	{
-		rv = NotifyPropertyFlagChanged(item, "Flagged", oldFlags, newFlags);
-	}
-		return rv;
-}
-
-NS_IMETHODIMP
-nsMsgDBFolder::GetMsgDatabase(nsIMsgDatabase** aMsgDatabase)
-{
-    if (!aMsgDatabase || !mDatabase)
-        return NS_ERROR_NULL_POINTER;
-    *aMsgDatabase = mDatabase;
-    NS_ADDREF(*aMsgDatabase);
-    return NS_OK;
-}
-
-NS_IMETHODIMP nsMsgDBFolder::OnKeyChange(nsMsgKey aKeyChanged, PRUint32 aOldFlags, PRUint32 aNewFlags, 
-                         nsIDBChangeListener * aInstigator)
-{
-	nsCOMPtr<nsIMsgDBHdr> pMsgDBHdr;
-	nsresult rv = mDatabase->GetMsgHdrForKey(aKeyChanged, getter_AddRefs(pMsgDBHdr));
-	if(NS_SUCCEEDED(rv) && pMsgDBHdr)
-	{
-		nsCOMPtr<nsIMessage> message;
-		rv = CreateMessageFromMsgDBHdr(pMsgDBHdr, getter_AddRefs(message));
-		if(NS_SUCCEEDED(rv))
-		{
-			nsCOMPtr<nsISupports> msgSupports(do_QueryInterface(message, &rv));
-			if(NS_SUCCEEDED(rv))
-			{
-				SendFlagNotifications(msgSupports, aOldFlags, aNewFlags);
-			}
-			UpdateSummaryTotals(PR_TRUE);
-		}
-	}
-	return NS_OK;
-}
-
-NS_IMETHODIMP nsMsgDBFolder::OnKeyDeleted(nsMsgKey aKeyChanged, nsMsgKey  aParentKey, PRInt32 aFlags, 
-                          nsIDBChangeListener * aInstigator)
-{
-	nsCOMPtr<nsIMsgDBHdr> pMsgDBHdr;
-	nsresult rv = mDatabase->GetMsgHdrForKey(aKeyChanged, getter_AddRefs(pMsgDBHdr));
-	if(NS_SUCCEEDED(rv) && pMsgDBHdr)
-	{
-		nsCOMPtr<nsIMessage> message;
-		rv = CreateMessageFromMsgDBHdr(pMsgDBHdr, getter_AddRefs(message));
-		if(NS_SUCCEEDED(rv))
-		{
-			nsCOMPtr<nsISupports> msgSupports(do_QueryInterface(message, &rv));
-			if(NS_SUCCEEDED(rv))
-			{
-				NotifyItemDeleted(msgSupports);
-			}
-			UpdateSummaryTotals(PR_TRUE);
-		}
-	}
-
-	return NS_OK;
-}
-
-NS_IMETHODIMP nsMsgDBFolder::OnKeyAdded(nsMsgKey aKeyChanged, nsMsgKey  aParentKey , PRInt32 aFlags, 
-                        nsIDBChangeListener * aInstigator)
-{
-	nsresult rv;
-	nsCOMPtr<nsIMsgDBHdr> msgDBHdr;
-	rv = mDatabase->GetMsgHdrForKey(aKeyChanged, getter_AddRefs(msgDBHdr));
-	if(NS_SUCCEEDED(rv) && msgDBHdr)
-	{
-		nsCOMPtr<nsIMessage> message;
-		rv = CreateMessageFromMsgDBHdr(msgDBHdr, getter_AddRefs(message));
-		if(NS_SUCCEEDED(rv))
-		{
-			nsCOMPtr<nsISupports> msgSupports(do_QueryInterface(message));
-			if(msgSupports)
-			{
-				NotifyItemAdded(msgSupports);
-			}
-			UpdateSummaryTotals(PR_TRUE);
-		}
-	}
-	return NS_OK;
-}
-
-NS_IMETHODIMP nsMsgDBFolder::OnParentChanged(nsMsgKey aKeyChanged, nsMsgKey oldParent, nsMsgKey newParent, 
-						nsIDBChangeListener * aInstigator)
-{
-	return NS_OK;
-}
-
-
-NS_IMETHODIMP nsMsgDBFolder::OnAnnouncerGoingAway(nsIDBChangeAnnouncer *
-													 instigator)
-{
-    if (mDatabase)
-    {
-        mDatabase->RemoveListener(this);
-        mDatabase = null_nsCOMPtr();
-    }
-    return NS_OK;
-}
-
-NS_IMETHODIMP nsMsgDBFolder::ManyHeadersToDownload(PRBool *retval)
-{
-	PRInt32 numTotalMessages;
-
-	if (!retval)
-		return NS_ERROR_NULL_POINTER;
-	if (!mDatabase)
-		*retval = PR_TRUE;
-	else if (NS_SUCCEEDED(GetTotalMessages(PR_FALSE, &numTotalMessages)) && numTotalMessages <= 0)
-		*retval = PR_TRUE;
-	else
-		*retval = PR_FALSE;
-	return NS_OK;
-}
-
-
-nsresult nsMsgDBFolder::ReadFromFolderCache(nsIMsgFolderCacheElement *element)
-{
-	nsresult rv = NS_OK;
-	char *charset;
-
-	element->GetInt32Property("flags", &mPrefFlags);
-	element->GetInt32Property("totalMsgs", &mNumTotalMessages);
-	element->GetInt32Property("totalUnreadMsgs", &mNumUnreadMessages);
-
-	element->GetStringProperty("charset", &charset);
-
-#ifdef DEBUG_bienvenu1
-	char *uri;
-
-	GetURI(&uri);
-	printf("read total %ld for %s\n", mNumTotalMessages, uri);
-	PR_Free(uri);
-#endif
-	mCharset = charset;
-	PR_FREEIF(charset);
-
-    mPrefFlags |= MSG_FOLDER_PREF_CACHED;
-	return rv;
-}
-
-NS_IMETHODIMP nsMsgDBFolder::WriteToFolderCache(nsIMsgFolderCache *folderCache)
-{
-	nsCOMPtr <nsIEnumerator> aEnumerator;
-
-	nsresult rv = GetSubFolders(getter_AddRefs(aEnumerator));
-	if(NS_FAILED(rv)) 
-		return rv;
-
-	char *uri = nsnull;
-	rv = GetURI(&uri);
-
-	if (folderCache)
-	{
-		nsCOMPtr <nsIMsgFolderCacheElement> cacheElement;
-		rv = folderCache->GetCacheElement(uri, PR_TRUE, getter_AddRefs(cacheElement));
-		if (NS_SUCCEEDED(rv) && cacheElement)
-			rv = WriteToFolderCacheElem(cacheElement);
-	}
-	PR_FREEIF(uri);
-
-	
-	nsCOMPtr<nsISupports> aItem;
-
-	rv = aEnumerator->First();
-	if (!NS_SUCCEEDED(rv))
-		return NS_OK;	// it's OK, there are no sub-folders.
-
-	while(NS_SUCCEEDED(rv))
-	{
-		rv = aEnumerator->CurrentItem(getter_AddRefs(aItem));
-		if (NS_FAILED(rv)) break;
-		nsCOMPtr<nsIMsgFolder> aMsgFolder(do_QueryInterface(aItem, &rv));
-		if (NS_SUCCEEDED(rv))
-		{
-			if (folderCache)
-			{
-				rv = aMsgFolder->WriteToFolderCache(folderCache);
-				if (!NS_SUCCEEDED(rv))
-					break;
-			}
-		}
-		rv = aEnumerator->Next();
-		if (!NS_SUCCEEDED(rv))
-		{
-			rv = NS_OK;
-			break;
-		}
-	}
-	return rv;
-}
-
-NS_IMETHODIMP nsMsgDBFolder::WriteToFolderCacheElem(nsIMsgFolderCacheElement *element)
-{
-	nsresult rv = NS_OK;
-
-	element->SetInt32Property("flags", mPrefFlags);
-	element->SetInt32Property("totalMsgs", mNumTotalMessages);
-	element->SetInt32Property("totalUnreadMsgs", mNumUnreadMessages);
-
-	element->SetStringProperty("charset", (const char *) nsCAutoString(mCharset));
-
-#ifdef DEBUG_bienvenu1
-	char *uri;
-
-	GetURI(&uri);
-	printf("writing total %ld for %s\n", mNumTotalMessages, uri);
-	PR_Free(uri);
-#endif
-	return rv;
-}
-
-NS_IMETHODIMP
-nsMsgDBFolder::MarkAllMessagesRead(void)
-{
-	nsresult rv = GetDatabase();
-	
-	if(NS_SUCCEEDED(rv))
-		return mDatabase->MarkAllRead(nsnull);
-
-	return rv;
-}
-
-NS_IMETHODIMP
-nsMsgDBFolder::OnStartRunningUrl(nsIURI *aUrl)
-{
-	NS_PRECONDITION(aUrl, "just a sanity check");
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMsgDBFolder::OnStopRunningUrl(nsIURI *aUrl, nsresult aExitCode)
-{
-	NS_PRECONDITION(aUrl, "just a sanity check");
-	nsCOMPtr<nsIMsgMailNewsUrl> mailUrl = do_QueryInterface(aUrl);
-	if (mailUrl)
-	{
-		PRBool updatingFolder = PR_FALSE;
-		if (NS_SUCCEEDED(mailUrl->GetUpdatingFolder(&updatingFolder)) && updatingFolder)
-		{
-			NotifyFolderLoaded();
-		}
-	}
-    return NS_OK;
-}

mozilla/mailnews/base/util/nsMsgDBFolder.h

@@ -1,80 +0,0 @@
-/* -*- 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) 1999 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#ifndef nsMsgDBFolder_h__
-#define nsMsgDBFolder_h__
-
-#include "msgCore.h"
-#include "nsMsgFolder.h" 
-#include "nsIDBFolderInfo.h"
-#include "nsIMsgDatabase.h"
-#include "nsIMessage.h"
-#include "nsCOMPtr.h"
-#include "nsIDBChangeListener.h"
-#include "nsIUrlListener.h"
-
-class nsIMsgFolderCacheElement;
- /* 
-  * nsMsgDBFolder
-  * class derived from nsMsgFolder for those folders that use an nsIMsgDatabase
-  */ 
-
-class NS_MSG_BASE nsMsgDBFolder:  public nsMsgFolder,
-                                        public nsIDBChangeListener,
-                                        public nsIUrlListener
-{
-public: 
-	nsMsgDBFolder(void);
-	virtual ~nsMsgDBFolder(void);
-  NS_DECL_NSIDBCHANGELISTENER
-  
-	NS_IMETHOD  StartFolderLoading(void);
-	NS_IMETHOD  EndFolderLoading(void);
-	NS_IMETHOD GetThreads(nsISimpleEnumerator** threadEnumerator);
-	NS_IMETHOD GetThreadForMessage(nsIMessage *message, nsIMsgThread **thread);
-	NS_IMETHOD HasMessage(nsIMessage *message, PRBool *hasMessage);
-	NS_IMETHOD GetCharset(PRUnichar * *aCharset);
-	NS_IMETHOD SetCharset(const PRUnichar * aCharset);
-
-  NS_IMETHOD GetMsgDatabase(nsIMsgDatabase** aMsgDatabase);
-
-	NS_DECL_ISUPPORTS_INHERITED
-
-	NS_DECL_NSIURLLISTENER
-
-	NS_IMETHOD WriteToFolderCache(nsIMsgFolderCache *folderCache);
-	NS_IMETHOD WriteToFolderCacheElem(nsIMsgFolderCacheElement *element);
-	NS_IMETHOD ManyHeadersToDownload(PRBool *_retval);
-
-	NS_IMETHOD MarkAllMessagesRead(void);
-
-protected:
-	virtual nsresult ReadDBFolderInfo(PRBool force);
-	virtual nsresult GetDatabase() = 0;
-	virtual nsresult SendFlagNotifications(nsISupports *item, PRUint32 oldFlags, PRUint32 newFlags);
-	nsresult ReadFromFolderCache(nsIMsgFolderCacheElement *element);
-
-protected:
-	nsCOMPtr<nsIMsgDatabase> mDatabase;  
-	nsString mCharset;
-	PRBool mAddListener;
-
-
-};
-
-#endif

mozilla/mailnews/base/util/nsMsgFolder.h

@@ -1,268 +0,0 @@
-/* -*- 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.
- */
-
-/********************************************************************************************************
- 
-   Interface for representing Messenger folders.
- 
-*********************************************************************************************************/
-
-#ifndef nsMsgFolder_h__
-#define nsMsgFolder_h__
-
-#include "msgCore.h"
-#include "nsIMsgFolder.h" /* include the interface we are going to support */
-#include "nsRDFResource.h"
-#include "nsIDBFolderInfo.h"
-#include "nsIMsgDatabase.h"
-#include "nsIMsgIncomingServer.h"
-#include "nsCOMPtr.h"
-#include "nsIURL.h"
- /* 
-  * MsgFolder
-  */ 
-
-class NS_MSG_BASE nsMsgFolder: public nsRDFResource, public nsIMsgFolder
-{
-public: 
-  nsMsgFolder(void);
-  virtual ~nsMsgFolder(void);
-
-  NS_DECL_ISUPPORTS_INHERITED
-
-  NS_DECL_NSICOLLECTION
-  NS_DECL_NSIFOLDER
-  // eventually this will be an instantiable class, and we should
-  // use this macro:
-  // NS_DECL_NSIMSGFOLDER
-  
-  // right now a few of these methods are left abstract, and
-  // are commented out below
-  
-  // begin NS_DECL_NSIMSGFOLDER
-  NS_IMETHOD AddUnique(nsISupports *element);
-  NS_IMETHOD ReplaceElement(nsISupports *element, nsISupports *newElement);
-  NS_IMETHOD GetMessages(nsISimpleEnumerator **_retval);
-  NS_IMETHOD GetThreads(nsISimpleEnumerator **_retval);
-  NS_IMETHOD StartFolderLoading(void);
-  NS_IMETHOD EndFolderLoading(void);
-  NS_IMETHOD UpdateFolder(void);
-  NS_IMETHOD GetThreadForMessage(nsIMessage *message, nsIMsgThread **_retval);
-  NS_IMETHOD HasMessage(nsIMessage *message, PRBool *_retval);
-  NS_IMETHOD GetVisibleSubFolders(nsIEnumerator **_retval);
-  NS_IMETHOD GetPrettiestName(PRUnichar * *aPrettiestName);
-  NS_IMETHOD GetFolderURL(char * *aFolderURL);
-  NS_IMETHOD GetDeleteIsMoveToTrash(PRBool *aDeleteIsMoveToTrash);
-  NS_IMETHOD GetShowDeletedMessages(PRBool *aShowDeletedMessages);
-  NS_IMETHOD GetServer(nsIMsgIncomingServer * *aServer);
-  NS_IMETHOD GetIsServer(PRBool *aIsServer);
-  NS_IMETHOD OnCloseFolder(void);
-  NS_IMETHOD Delete(void);
-  NS_IMETHOD DeleteSubFolders(nsISupportsArray *folders);
-  NS_IMETHOD PropagateDelete(nsIMsgFolder *folder, PRBool deleteStorage);
-  NS_IMETHOD RecursiveDelete(PRBool deleteStorage);
-  NS_IMETHOD CreateSubfolder(const char *folderName);
-  NS_IMETHOD Compact(void);
-  NS_IMETHOD EmptyTrash(void);
-  NS_IMETHOD Rename(const char *name);
-  NS_IMETHOD Adopt(nsIMsgFolder *srcFolder, PRUint32 *outPos);
-  NS_IMETHOD ContainsChildNamed(const char *name, PRBool *_retval);
-  NS_IMETHOD IsAncestorOf(nsIMsgFolder *folder, PRBool *_retval);
-  NS_IMETHOD GenerateUniqueSubfolderName(const char *prefix, nsIMsgFolder *otherFolder, char **_retval); 
-  NS_IMETHOD UpdateSummaryTotals(PRBool force);
-  NS_IMETHOD SummaryChanged(void);
-  NS_IMETHOD GetNumUnread(PRBool deep, PRInt32 *_retval);
-  NS_IMETHOD GetTotalMessages(PRBool deep, PRInt32 *_retval);
-  NS_IMETHOD GetExpungedBytesCount(PRUint32 *aExpungedBytesCount);
-  NS_IMETHOD GetDeletable(PRBool *aDeletable);
-  NS_IMETHOD GetCanCreateChildren(PRBool *aCanCreateChildren);
-  NS_IMETHOD GetCanBeRenamed(PRBool *aCanBeRenamed);
-  NS_IMETHOD GetRequiresCleanup(PRBool *aRequiresCleanup);
-  NS_IMETHOD ClearRequiresCleanup(void);
-  NS_IMETHOD ManyHeadersToDownload(PRBool *_retval);
-  NS_IMETHOD GetKnowsSearchNntpExtension(PRBool *aKnowsSearchNntpExtension);
-  NS_IMETHOD GetAllowsPosting(PRBool *aAllowsPosting);
-  NS_IMETHOD GetDisplayRecipients(PRBool *aDisplayRecipients);
-   NS_IMETHOD GetRelativePathName(char * *aRelativePathName);
-  NS_IMETHOD GetSizeOnDisk(PRUint32 *aSizeOnDisk);
-  NS_IMETHOD RememberPassword(const char *password);
-  NS_IMETHOD GetRememberedPassword(char * *aRememberedPassword);
-  NS_IMETHOD UserNeedsToAuthenticateForFolder(PRBool displayOnly, PRBool *_retval);
-  NS_IMETHOD GetUsername(char * *aUsername);
-  NS_IMETHOD GetHostname(char * *aHostname);
-  NS_IMETHOD SetFlag(PRUint32 flag);
-  NS_IMETHOD ClearFlag(PRUint32 flag);
-  NS_IMETHOD GetFlag(PRUint32 flag, PRBool *_retval);
-  NS_IMETHOD ToggleFlag(PRUint32 flag);
-  NS_IMETHOD OnFlagChange(PRUint32 flag);
-  NS_IMETHOD GetFlags(PRUint32 *aFlags);
-  NS_IMETHOD GetFoldersWithFlag(PRUint32 flags, nsIMsgFolder **result, PRUint32 resultsize, PRUint32 *numFolders);
-  NS_IMETHOD GetExpansionArray(nsISupportsArray *expansionArray);
-  // NS_IMETHOD DeleteMessages(nsISupportsArray *message, nsITransactionManager *txnMgr, PRBool deleteStorage);
-  NS_IMETHOD CopyMessages(nsIMsgFolder *srcFolder, nsISupportsArray *messages, PRBool isMove, nsITransactionManager *txnMgr, nsIMsgCopyServiceListener *listener);
-  NS_IMETHOD CopyFileMessage(nsIFileSpec *fileSpec, nsIMessage *msgToReplace, PRBool isDraft, nsITransactionManager *txnMgr, nsIMsgCopyServiceListener *listener);
-  NS_IMETHOD AcquireSemaphore(nsISupports *semHolder);
-  NS_IMETHOD ReleaseSemaphore(nsISupports *semHolder);
-  NS_IMETHOD TestSemaphore(nsISupports *semHolder, PRBool *_retval);
-  NS_IMETHOD GetLocked(PRBool *aLocked);
-  // NS_IMETHOD CreateMessageFromMsgDBHdr(nsIMsgDBHdr *msgDBHdr, nsIMessage **_retval);
-  NS_IMETHOD GetNewMessages(void);
-  // NS_IMETHOD WriteToFolderCache(nsIMsgFolderCache *folderCache);
-  // NS_IMETHOD GetCharset(PRUnichar * *aCharset);
-  // NS_IMETHOD SetCharset(const PRUnichar * aCharset);
-  NS_IMETHOD GetBiffState(PRUint32 *aBiffState);
-  NS_IMETHOD SetBiffState(PRUint32 aBiffState);
-  NS_IMETHOD GetNumNewMessages(PRInt32 *aNumNewMessages);
-  NS_IMETHOD SetNumNewMessages(PRInt32 aNumNewMessages);
-  NS_IMETHOD GetNewMessagesNotificationDescription(PRUnichar * *aNewMessagesNotificationDescription);
-  NS_IMETHOD GetRootFolder(nsIMsgFolder * *aRootFolder);
-  NS_IMETHOD GetMsgDatabase(nsIMsgDatabase * *aMsgDatabase);
-  NS_IMETHOD GetPath(nsIFileSpec * *aPath);
-  NS_IMETHOD MarkMessagesRead(nsISupportsArray *messages, PRBool markRead);
-  NS_IMETHOD MarkAllMessagesRead(void);
-  NS_IMETHOD MarkMessagesFlagged(nsISupportsArray *messages, PRBool markFlagged);
-  NS_IMETHOD GetChildWithURI(const char *uri, PRBool deep, nsIMsgFolder **_retval); 
-
-  // end NS_DECL_NSIMSGFOLDER
-  
-  // nsRDFResource overrides
-  NS_IMETHOD Init(const char* aURI);
-  
-#if 0
-  static nsresult GetRoot(nsIMsgFolder* *result);
-#endif
-  // Gets the URL that represents the given message.  Returns a newly
-  // created string that must be free'd using XP_FREE().
-  // If the db is NULL, then returns a URL that represents the entire
-  // folder as a whole.
-#ifdef HAVE_DB
-  NS_IMETHOD BuildUrl(nsMsgDatabase *db, nsMsgKey key, char ** url);
-  
-  // updates num messages and num unread - should be pure virtual
-  // when I get around to implementing in all subclasses?
-  NS_IMETHOD GetTotalMessagesInDB(PRUint32 *totalMessages) const;					// How many messages in database.
-	// These functions are used for tricking the front end into thinking that we have more 
-	// messages than are really in the DB.  This is usually after and IMAP message copy where
-	// we don't want to do an expensive select until the user actually opens that folder
-	// These functions are called when MSG_Master::GetFolderLineById is populating a MSG_FolderLine
-	// struct used by the FE
-	int32			GetNumPendingUnread(PRBool deep = PR_FALSE);
-	int32			GetNumPendingTotalMessages(PRBool deep = PR_FALSE);
-	
-  void			ChangeNumPendingUnread(int32 delta);
-  void			ChangeNumPendingTotalMessages(int32 delta);
-
-
-  NS_IMETHOD SetFolderPrefFlags(PRUint32 flags);
-  NS_IMETHOD GetFolderPrefFlags(PRUint32 *flags);
-
-
-  NS_IMETHOD SetLastMessageLoaded(nsMsgKey lastMessageLoaded);
-  NS_IMETHOD GetLastMessageLoaded();
-#endif
-
-
-#ifdef HAVE_ADMINURL
-  NS_IMETHOD GetAdminUrl(MWContext *context, MSG_AdminURLType type);
-  NS_IMETHOD HaveAdminUrl(MSG_AdminURLType type, PRBool *hadAdminUrl);
-#endif
-
-
-#ifdef HAVE_PANE
-  NS_IMETHOD	MarkAllRead(MSG_Pane *pane, PRBool deep);
-  NS_IMETHOD SetFlagInAllFolderPanes(PRUint32 which);
-#endif
-
-#ifdef HAVE_NET
-  NS_IMETHOD EscapeMessageId(const char *messageId, const char **escapeMessageID);
-  NS_IMETHOD ShouldPerformOperationOffline(PRBool *performOffline);
-#endif
-
-#ifdef HAVE_CACHE
-	virtual nsresult WriteToCache(XP_File);
-	virtual nsresult ReadFromCache(char *);
-	virtual PRBool IsCachable();
-	void SkipCacheTokens(char **ppBuf, int numTokens);
-#endif
-
-#ifdef DOES_FOLDEROPERATIONS
-	int DownloadToTempFileAndUpload(MessageCopyInfo *copyInfo, nsMsgKeyArray &keysToSave, MSG_FolderInfo *dstFolder, nsMsgDatabase *sourceDB);
-	void UpdateMoveCopyStatus(MWContext *context, PRBool isMove, int32 curMsgCount, int32 totMessages);
-#endif
-
-	virtual nsresult GetDBFolderInfoAndDB(nsIDBFolderInfo **folderInfo, nsIMsgDatabase **db) = 0;
-
-
-	NS_IMETHOD MatchName(nsString *name, PRBool *matches);
-
-
-protected:
-	nsresult NotifyPropertyChanged(char *property, char* oldValue, char* newValue);
-	nsresult NotifyPropertyFlagChanged(nsISupports *item, char *property, PRUint32 oldValue,
-												PRUint32 newValue);
-	nsresult NotifyItemAdded(nsISupports *item);
-	nsresult NotifyItemDeleted(nsISupports *item);
-
-	nsresult NotifyFolderLoaded();
-	// this is a little helper function that is not part of the public interface. 
-	// we use it to get the IID of the incoming server for the derived folder.
-	// w/out a function like this we would have to implement GetServer in each
-	// derived folder class.
-	virtual const char* GetIncomingServerType() = 0;
-
-protected:
-  PRUint32 mFlags;
-  nsIFolder *mParent;     //This won't be refcounted for ownership reasons.
-  PRInt32 mNumUnreadMessages;        /* count of unread messages (-1 means
-                                         unknown; -2 means unknown but we already
-                                         tried to find out.) */
-  PRInt32 mNumTotalMessages;         /* count of existing messages. */
-  nsCOMPtr<nsISupportsArray> mSubFolders;
-  nsVoidArray *mListeners; //This can't be an nsISupportsArray because due to
-													 //ownership issues, listeners can't be AddRef'd
-
-  PRInt32 mPrefFlags;       // prefs like MSG_PREF_OFFLINE, MSG_PREF_ONE_PANE, etc
-  nsISupports *mSemaphoreHolder; // set when the folder is being written to
-								//Due to ownership issues, this won't be AddRef'd.
-
-  nsIMsgIncomingServer* m_server; //this won't be addrefed....ownership issue here
-
-#ifdef HAVE_DB
-  nsMsgKey	m_lastMessageLoaded;
-#endif
-  // These values are used for tricking the front end into thinking that we have more 
-  // messages than are really in the DB.  This is usually after and IMAP message copy where
-  // we don't want to do an expensive select until the user actually opens that folder
-  PRInt32 mNumPendingUnreadMessages;
-  PRInt32 mNumPendingTotalMessages;
-
-  PRUint32	mBiffState;
-  PRInt32	mNumNewBiffMessages;
-
-  PRBool mIsCachable;
-
-  //
-  // stuff from the uri
-  //
-  
-  PRBool mIsServer;
-  nsString mName;
-  
-};
-
-#endif

mozilla/mailnews/base/util/nsMsgGroupRecord.cpp

@@ -1,598 +0,0 @@
-/* -*- 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.
- */
-
-#include "msgCore.h"    // precompiled header...
-#include "prlog.h"
-
-#include "nsMsgGroupRecord.h"
-
-#include "plstr.h"
-#include "prmem.h"
-#include "nsEscape.h"
-#include "nsCRT.h"
-
-// mscott: this is lame...I know....
-#define MK_OUT_OF_MEMORY  1
-
-const PRUint32 F_ISGROUP			 = 0x00000001;
-const PRUint32 F_EXPANDED			 = 0x00000002;
-const PRUint32 F_CATCONT			 = 0x00000004;
-const PRUint32 F_VIRTUAL			 = 0x00000008;
-const PRUint32 F_DIRTY			 = 0x00000010;
-const PRUint32 F_DESCENDENTSLOADED = 0x00000020;
-const PRUint32 F_HTMLOKGROUP		 = 0x00000040;
-const PRUint32 F_HTMLOKTREE		 = 0x00000080;
-const PRUint32 F_NEEDEXTRAINFO	 = 0x00000100;
-const PRUint32 F_DOESNOTEXIST		 = 0x00000200;
-const PRUint32 RUNTIMEFLAGS =		// Flags to be sure *not* to write to disk.
-	F_DIRTY | F_DESCENDENTSLOADED | F_EXPANDED;
-
-
-
-int
-nsMsgGroupRecord::GroupNameCompare(const char* name1, const char* name2,
-								  char delimiter, PRBool caseInsensitive)
-{
-	if (caseInsensitive)
-	{
-		while (*name1 && (nsCRT::ToUpper(*name1) == nsCRT::ToUpper(*name2))) {
-			name1++;
-			name2++;
-		}		
-	}
-	else
-	{
-		while (*name1 && *name1 == *name2) {
-			name1++;
-			name2++;
-		}
-	}
-
-	if (*name1 && *name2) {
-		if (*name1 == delimiter) return -1;
-		if (*name2 == delimiter) return 1;
-	}
-
-	if (caseInsensitive)
-		return int(nsCRT::ToUpper(*name1)) - int(nsCRT::ToUpper(*name2));
-	else
-		return int(*name1) - int(*name2);
-}
-
-
-nsMsgGroupRecord*
-nsMsgGroupRecord::Create(nsMsgGroupRecord* parent, const char* partname,
-						PRInt64 aTime, PRInt32 uniqueid, PRInt32 fileoffset)
-{
-	nsMsgGroupRecord* result = new nsMsgGroupRecord(parent, partname,
-												  aTime, uniqueid, fileoffset);
-	if (result && partname && !result->m_partname) {
-		// We ran out of memory.
-		delete result;
-		result = NULL;
-	}
-	result->InitializeSibling();
-	return result;
-}
-
-MOZ_DECL_CTOR_COUNTER(nsMsgGroupRecord);
-
-nsMsgGroupRecord::nsMsgGroupRecord(nsMsgGroupRecord* parent, const char* partname,
-								 PRInt64 aTime, PRInt32 uniqueid, PRInt32 fileoffset,
-								 char delimiter /* = '.' */)
-{
-	MOZ_COUNT_CTOR(nsMsgGroupRecord);
-	int length;
-	m_prettyname = NULL;
-	m_parent = parent;
-	m_children = NULL;
-	m_sibling = NULL;
-	m_flags = 0;
-	m_partname = NULL;
-	m_addtime = aTime;
-	m_uniqueId = uniqueid;
-	m_fileoffset = fileoffset;
-	m_delimiter = delimiter;
-	if (partname) {
-		length = PL_strlen(partname);
-		// PR_ASSERT(parent != NULL);
-		m_partname = new char [length + 1];
-		if (!m_partname) {
-			m_parent = NULL;
-			return;
-		}
-		PL_strcpy(m_partname, partname);
-	}
-}
-
-
-nsMsgGroupRecord::~nsMsgGroupRecord()
-{
-	MOZ_COUNT_DTOR(nsMsgGroupRecord);
-	delete [] m_partname;
-	m_partname = NULL;
-	delete [] m_prettyname;
-	m_prettyname = NULL;
-	while (m_children) {
-		delete m_children;
-	}
-	m_children = NULL;
-	if (m_parent) {
-		nsMsgGroupRecord** ptr;
-		for (ptr = &(m_parent->m_children);
-			 *ptr;
-			 ptr = &((*ptr)->m_sibling)) {
-			if (*ptr == this) {
-				*ptr = m_sibling;
-				break;
-			}
-		}
-	}
-}
-
-void nsMsgGroupRecord::InitializeSibling()
-{
-	if (m_parent) {
-		PR_ASSERT(m_partname != NULL);
-		nsMsgGroupRecord** ptr;
-		for (ptr = &(m_parent->m_children) ; *ptr ; ptr = &((*ptr)->m_sibling)) {
-			int comp = GroupNameCompare((*ptr)->m_partname, m_partname, m_delimiter, IsIMAPGroupRecord());
-			PR_ASSERT(comp != 0);
-			if (comp >= 0) break;
-		}
-		m_sibling = *ptr;
-		*ptr = this;
-	}
-}
-
-
-nsMsgGroupRecord*
-nsMsgGroupRecord::FindDescendant(const char* name)
-{
-	if (!name || !*name) return this;
-	char* ptr = PL_strchr(name, m_delimiter);
-	if (ptr) *ptr = '\0';
-	nsMsgGroupRecord* child;
-	for (child = m_children ; child ; child = child->m_sibling) {
-		if (PL_strcmp(child->m_partname, name) == 0) {
-			break;
-		}
-	}
-	if (ptr) {
-		*ptr++ = m_delimiter;
-		if (child) {
-			return child->FindDescendant(ptr);
-		}
-	}
-	return child;
-}
-
-
-nsMsgGroupRecord*
-nsMsgGroupRecord::GetSiblingOrAncestorSibling()
-{
-	if (m_sibling) return m_sibling;
-	if (m_parent) return m_parent->GetSiblingOrAncestorSibling();
-	return NULL;
-}
-
-nsMsgGroupRecord*
-nsMsgGroupRecord::GetNextAlphabetic()
-{
-	nsMsgGroupRecord* result;
-	if (m_children) result = m_children;
-	else result = GetSiblingOrAncestorSibling();
-#ifdef DEBUG_slowAndParanoid
-	if (result) {
-		char* ptr1 = GetFullName();
-		char* ptr2 = result->GetFullName();
-		PR_ASSERT(GroupNameCompare(ptr1, ptr2) < 0);
-		delete [] ptr1;
-		delete [] ptr2;
-	}
-#endif
-	return result;
-}
-
-nsMsgGroupRecord*
-nsMsgGroupRecord::GetNextAlphabeticNoCategories()
-{
-	if (IsCategoryContainer()) {
-		return GetSiblingOrAncestorSibling();
-	} else {
-		return GetNextAlphabetic();
-	}
-}
-
-
-char*
-nsMsgGroupRecord::GetFullName()
-{
-	int length = 0;
-	nsMsgGroupRecord* ptr;
-	for (ptr = this ; ptr ; ptr = ptr->m_parent) {
-		if (ptr->m_partname) length += PL_strlen(ptr->m_partname) + 1;
-	}
-	PR_ASSERT(length > 0);
-	if (length <= 0) return NULL;
-	char* result = new char [length];
-	if (result) {
-		SuckInName(result);
-		PR_ASSERT(int(PL_strlen(result)) + 1 == length);
-	}
-	return result;
-}
-
-
-char* 
-nsMsgGroupRecord::SuckInName(char* ptr)
-{
-	if (m_parent && m_parent->m_partname) {
-		ptr = m_parent->SuckInName(ptr);
-		*ptr++ = m_delimiter;
-	}
-	PL_strcpy(ptr, m_partname);
-	return ptr + PL_strlen(ptr);
-}
-
-
-
-int
-nsMsgGroupRecord::SetPrettyName(const char* name)
-{
-	if (name == NULL && m_prettyname == NULL) return 0;
-	m_flags |= F_DIRTY;
-	delete [] m_prettyname;
-	m_prettyname = NULL;
-	if (!name || !*name) {
-		return 0;
-	}
-	int length = PL_strlen(name);
-	m_prettyname = new char [length + 1];
-	if (!m_prettyname) {
-		return MK_OUT_OF_MEMORY;
-	}
-	PL_strcpy(m_prettyname, name);
-	return 1;
-}
-
-
-PRBool
-nsMsgGroupRecord::IsCategory()
-{
-	return GetCategoryContainer() != NULL;
-}
-
-PRBool
-nsMsgGroupRecord::IsCategoryContainer()
-{
-	return (m_flags & F_CATCONT) != 0;
-}
-
-PRBool
-nsMsgGroupRecord::NeedsExtraInfo()
-{
-	return (m_flags & F_NEEDEXTRAINFO) != 0;
-}
-
-int
-nsMsgGroupRecord::SetNeedsExtraInfo(PRBool value)
-{
-	return TweakFlag(F_NEEDEXTRAINFO, value);
-}
-
-
-int
-nsMsgGroupRecord::SetIsCategoryContainer(PRBool value)
-{
-	// refuse to set a group to be a category container if it has a parent
-	// that's a category container.
-	if (! (value && GetCategoryContainer()))
-		return TweakFlag(F_CATCONT, value);
-	else
-		return 0;
-}
-
-
-nsMsgGroupRecord*
-nsMsgGroupRecord::GetCategoryContainer()
-{
-	if (IsCategoryContainer()) return NULL;
-	for (nsMsgGroupRecord* ptr = m_parent ; ptr ; ptr = ptr->m_parent) {
-		if (ptr->IsCategoryContainer()) return ptr;
-	}
-	return NULL;
-}
-
-
-nsresult
-nsMsgGroupRecord::IsVirtual(PRBool *retval)
-{
-	*retval =( (m_flags & F_VIRTUAL) != 0);
-    return NS_OK;
-}
-
-nsresult
-nsMsgGroupRecord::SetIsVirtual(PRBool value)
-{
-	TweakFlag(F_VIRTUAL, value);
-    return NS_OK;
-}
-
-
-
-PRBool
-nsMsgGroupRecord::IsExpanded()
-{
-	return (m_flags & F_EXPANDED) != 0;
-}
-
-int
-nsMsgGroupRecord::SetIsExpanded(PRBool value)
-{
-	return TweakFlag(F_EXPANDED, value);
-}
-
-
-PRBool
-nsMsgGroupRecord::IsHTMLOKGroup()
-{
-	return (m_flags & F_HTMLOKGROUP) != 0;
-}
-
-int
-nsMsgGroupRecord::SetIsHTMLOKGroup(PRBool value)
-{
-	return TweakFlag(F_HTMLOKGROUP, value);
-}
-
-
-
-PRBool
-nsMsgGroupRecord::IsHTMLOKTree()
-{
-	return (m_flags & F_HTMLOKTREE) != 0;
-}
-
-int
-nsMsgGroupRecord::SetIsHTMLOKTree(PRBool value)
-{
-	return TweakFlag(F_HTMLOKTREE, value);
-}
-
-
-
-PRBool
-nsMsgGroupRecord::IsGroup()
-{
-	return (m_flags & F_ISGROUP) != 0;
-}
-
-int
-nsMsgGroupRecord::SetIsGroup(PRBool value)
-{
-	return TweakFlag(F_ISGROUP, value);
-}
-
-
-PRBool
-nsMsgGroupRecord::IsDescendentsLoaded()
-{
-	return (m_flags & F_DESCENDENTSLOADED) != 0;
-}
-
-
-int
-nsMsgGroupRecord::SetIsDescendentsLoaded(PRBool value)
-{
-	PR_ASSERT(value);			// No reason we'd ever unset this.
-	TweakFlag(F_DESCENDENTSLOADED, PR_TRUE);
-	nsMsgGroupRecord* child;
-	for (child = m_children ; child ; child = child->m_sibling) {
-		child->SetIsDescendentsLoaded(value);
-	}
-	return 0;
-}
-
-PRBool nsMsgGroupRecord::DoesNotExistOnServer()
-{
-	return (m_flags & F_DOESNOTEXIST) != 0;
-}
-
-int nsMsgGroupRecord::SetDoesNotExistOnServer(PRBool value)
-{
-	if (value)		// turn off group flag if doesn't exist on server.
-		TweakFlag(F_ISGROUP, PR_FALSE);
-	return TweakFlag(F_DOESNOTEXIST, value);
-}
-
-int
-nsMsgGroupRecord::TweakFlag(PRUint32 flagbit, PRBool value)
-{
-	if (value) {
-		if (!(m_flags & flagbit)) {
-			m_flags |= flagbit;
-			if (flagbit & ~RUNTIMEFLAGS)
-				m_flags |= F_DIRTY;
-			return 1;
-		}
-	} else {
-		if (m_flags & flagbit) {
-			m_flags &= ~flagbit;
-			if (flagbit & ~RUNTIMEFLAGS)
-				m_flags |= F_DIRTY;
-			return 1;
-		}
-	}
-	return 0;
-}
-
-
-PRInt32
-nsMsgGroupRecord::GetNumKids()
-{
-	PRInt32 result = 0;
-	nsMsgGroupRecord* child;
-	for (child = m_children ; child ; child = child->m_sibling) {
-		if (IsIMAPGroupRecord())
-			result++;
-		else
-			if (child->m_flags & F_ISGROUP) result++;
-
-		if (!IsIMAPGroupRecord())
-			result += child->GetNumKids();
-	}
-	return result;
-}
-
-
-
-
-char*
-nsMsgGroupRecord::GetSaveString()
-{
-	char* pretty = NULL;
-	char* result = nsnull;
-	
-	if (m_prettyname) {
-		pretty = nsEscape(m_prettyname, url_XAlphas);
-		if (!pretty) return NULL;
-	}
-	char* fullname = GetFullName();
-	if (!fullname) return NULL; {
-		long nAddTime;
-		LL_L2I(nAddTime, m_addtime);
-        result = PR_smprintf("%s,%s,%lx,%lx,%lx" MSG_LINEBREAK,
-							   fullname, pretty ? pretty : "",
-							   (long) (m_flags & ~RUNTIMEFLAGS),
-							   nAddTime,
-							   (long) m_uniqueId);
-	}
-	delete [] fullname;
-	if (pretty) nsCRT::free(pretty);
-	m_flags &= ~F_DIRTY;
-	return result;
-}
-
-
-PRBool
-nsMsgGroupRecord::IsDirty()
-{
-	return (m_flags & F_DIRTY) != 0;
-}
-
-
-PRInt32
-nsMsgGroupRecord::GetDepth()
-{
-	PRInt32 result = 0;
-	nsMsgGroupRecord* tmp = m_parent;
-	while (tmp) {
-		tmp = tmp->m_parent;
-		result++;
-	}
-	return result;
-}
-
-
-
-
-nsMsgGroupRecord*
-nsMsgGroupRecord::Create(nsMsgGroupRecord* parent, const char* saveline,
-						PRInt32 savelinelength, PRInt32 fileoffset)
-{
-	char* tmp;
-	char* ptr;
-	char* endptr;
-	char* partname;
-	char* prettyname;
-	PRInt32 flags;
-	PRInt32 addtime;
-	PRInt32 uniqueid;
-	nsMsgGroupRecord* result = NULL;
-
-	if (savelinelength < 0) savelinelength = PL_strlen(saveline);
-	tmp = (char*) PR_Malloc(savelinelength + 1);
-	if (!tmp) return NULL;
-	PL_strncpy(tmp, saveline, savelinelength);
-	tmp[savelinelength] = '\0';
-	ptr = PL_strchr(tmp, ',');
-	PR_ASSERT(ptr);
-	if (!ptr) goto FAIL;
-	*ptr++ = '\0';
-	partname = PL_strrchr(tmp, '.');
-	if (!partname) partname = tmp;
-	else partname++;
-
-#ifdef DEBUG_slowAndParanoid
-	if (parent->m_partname) {
-		char* parentname = parent->GetFullName();
-		PR_ASSERT(partname > tmp && partname[-1] == '.');
-		partname[-1] = '\0';
-		PR_ASSERT(PL_strcmp(parentname, tmp) == 0);
-		partname[-1] = '.';
-		delete [] parentname;
-		parentname = NULL;
-	} else {
-		PR_ASSERT(partname == tmp);
-	}
-#endif
-
-	endptr = PL_strchr(ptr, ',');
-	PR_ASSERT(endptr);
-	if (!endptr) goto FAIL;
-	*endptr++ = '\0';
-	prettyname = nsUnescape(ptr);
-
-	ptr = endptr;
-	endptr = PL_strchr(ptr, ',');
-	PR_ASSERT(endptr);
-	if (!endptr) goto FAIL;
-	*endptr++ = '\0';
-	flags = strtol(ptr, NULL, 16);
-
-	ptr = endptr;
-	endptr = PL_strchr(ptr, ',');
-	PR_ASSERT(endptr);
-	if (!endptr) goto FAIL;
-	*endptr++ = '\0';
-	addtime = strtol(ptr, NULL, 16);
-
-	ptr = endptr;
-	uniqueid = strtol(ptr, NULL, 16);
-
-	PRInt64 llAddtime;
-	LL_I2L(llAddtime, addtime);
-	result = Create(parent, partname, llAddtime, uniqueid, fileoffset);
-	if (result) {
-		PRBool maybeCategoryContainer = flags & F_CATCONT;
-		flags &= ~F_CATCONT;
-		result->m_flags = flags;
-		if (maybeCategoryContainer)
-			result->SetIsCategoryContainer(PR_TRUE);
-		if (prettyname && *prettyname) result->SetPrettyName(prettyname);
-	}
-
-FAIL:
-	PR_Free(tmp);
-	return result;
-	
-}
-
-
-

mozilla/mailnews/base/util/nsMsgGroupRecord.h

@@ -1,160 +0,0 @@
-/* -*- 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.
- */
-
-// This class should only be used by the subscribe UI and by newshost.cpp.
-// And, well, a bit by the category code.  Everyone else should use the stuff
-// in newshost.h.
-
-#ifndef _nsMsgGroupRecord_h_
-#define _nsMsgGroupRecord_h__
-
-#include "msgCore.h"
-#include "prtypes.h"
-#include "nsISupports.h"
-
-class nsIMAPGroupRecord;
-
-class NS_MSG_BASE nsMsgGroupRecord {
-public:
-	static nsMsgGroupRecord* Create(nsMsgGroupRecord* parent,
-								   const char* partname,
-                                   PRInt64 m_addtime,
-								   PRInt32 uniqueid,
-								   PRInt32 fileoffset);
-	static nsMsgGroupRecord* Create(nsMsgGroupRecord* parent,
-								   const char* saveline,
-								   PRInt32 savelinelength,
-								   PRInt32 fileoffset);
-
-
-	virtual void	InitializeSibling();
-	virtual PRBool IsIMAPGroupRecord() { return PR_FALSE; }
-	virtual nsIMAPGroupRecord *GetIMAPGroupRecord() { return 0; }
-	
-	// This is just like PL_strcmp(), except it works on news group names.
-	// A container groupname is always less than any contained groups.
-	// So, "netscape.devs-client-technical" > "netscape.devs.directory", even
-	// though PL_strcmp says otherwise.  (YICK!)
-	static int GroupNameCompare(const char* name1,
-								const char* name2,
-								char delimiter = '.',
-								PRBool caseInsensitive = PR_FALSE);
-
-
-	virtual ~nsMsgGroupRecord();
-
-	nsMsgGroupRecord* FindDescendant(const char* name);
-
-	nsMsgGroupRecord* GetParent() {return m_parent;}
-	nsMsgGroupRecord* GetChildren() {return m_children;}
-	nsMsgGroupRecord* GetSibling() {return m_sibling;}
-	nsMsgGroupRecord* GetSiblingOrAncestorSibling();
-	nsMsgGroupRecord* GetNextAlphabetic();
-
-	nsMsgGroupRecord* GetNextAlphabeticNoCategories();
-
-	const char* GetPartName() {return m_partname;}
-
-	// The resulting string must be free'd using delete[].
-	char* GetFullName();
-
-	const char* GetPrettyName() {return m_prettyname;}
-	int SetPrettyName(const char* prettyname);
-
-	PRInt64 GetAddTime() {return m_addtime;}
-
-	virtual PRBool IsCategory();
-	virtual PRBool IsCategoryContainer();
-	virtual int SetIsCategoryContainer(PRBool value);
-
-	nsMsgGroupRecord* GetCategoryContainer();
-
-	// Get/Set whether this is a virtual newsgroup.
-	nsresult IsVirtual(PRBool *retval);
-    nsresult SetIsVirtual(PRBool value);
-
-	// Get/Set whether this is really a newsgroup (and not just a container
-	// for newsgroups).
-	virtual PRBool IsGroup();
-	int SetIsGroup(PRBool value);
-
-	PRBool IsDescendentsLoaded();
-	int SetIsDescendentsLoaded(PRBool value);
-
-	PRBool IsExpanded();
-	int SetIsExpanded(PRBool value);
-
-	PRBool IsHTMLOKGroup();
-	int SetIsHTMLOKGroup(PRBool value);
-
-	PRBool IsHTMLOKTree();
-	int SetIsHTMLOKTree(PRBool value);
-
-	PRBool NeedsExtraInfo();
-	int SetNeedsExtraInfo(PRBool value);
-
-	PRBool DoesNotExistOnServer();
-	int SetDoesNotExistOnServer(PRBool value);
-
-	PRInt32 GetUniqueID() {return m_uniqueId;}
-
-	PRInt32 GetFileOffset() {return m_fileoffset;}
-	int SetFileOffset(PRInt32 value) {m_fileoffset = value; return 0;}
-
-	// Get the number of descendents (not including ourself) that are
-	// really newsgroups.
-	PRInt32 GetNumKids();
-
-	// Gets the string that represents this group in the save file.  The
-	// resulting string must be free'd with PR_Free().
-	char* GetSaveString();
-
-	PRBool IsDirty();			// Whether this record has had changes made
-								// to it.  Cleared by calls to GetSaveString().
-
-	PRInt32 GetDepth();			// Returns how deep in the heirarchy we are.
-								// Basically, the number of dots in the full
-								// newsgroup name, plus 1.
-	virtual char GetHierarchySeparator() { return '.'; }
-
-protected:
-	nsMsgGroupRecord(nsMsgGroupRecord* parent,
-								   const char* partname,
-								   PRInt64 m_addtime,
-								   PRInt32 uniqueid,
-								   PRInt32 fileoffset,
-								   char delimiter = '.');
-	int TweakFlag(PRUint32 flagbit, PRBool value);
-	char* SuckInName(char* ptr);
-
-	char* m_partname;
-	char* m_prettyname;
-	nsMsgGroupRecord* m_parent;
-	nsMsgGroupRecord* m_children;
-	nsMsgGroupRecord* m_sibling;
-	PRUint32 m_flags;
-	PRInt64 m_addtime;
-	PRInt32 m_uniqueId;
-	PRInt32 m_fileoffset;
-	char m_delimiter;
-};
-
-
-
-
-#endif /* _grec_h_ */

mozilla/mailnews/base/util/nsMsgI18N.cpp

@@ -1,363 +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.
- */ 
-
-// as does this
-#define NS_IMPL_IDS
-#include "nsIServiceManager.h"
-#include "nsICharsetConverterManager.h"
-
-#include "nsISupports.h"
-#include "nsIPref.h"
-#include "nsIMimeConverter.h"
-#include "msgCore.h"
-#include "rosetta_mailnews.h"
-#include "nsMsgI18N.h"
-#include "nsFileSpec.h"
-#include "nsFileStream.h"
-#include "nsMsgMimeCID.h"
-#include "nsMimeTypes.h"
-#include "nsIEntityConverter.h"
-#include "nsISaveAsCharset.h"
-
-static NS_DEFINE_CID(kPrefCID, NS_PREF_CID);
-static NS_DEFINE_CID(kCMimeConverterCID, NS_MIME_CONVERTER_CID);
-static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID);
-static NS_DEFINE_CID(kEntityConverterCID, NS_ENTITYCONVERTER_CID);
-static NS_DEFINE_CID(kSaveAsCharsetCID, NS_SAVEASCHARSET_CID);
-
-//
-// International functions necessary for composition
-//
-
-// Convert an unicode string to a C string with a given charset.
-nsresult ConvertFromUnicode(const nsString& aCharset, 
-                            const nsString& inString,
-                            char** outCString)
-{
-  nsresult res;
-
-  NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &res); 
-
-  if(NS_SUCCEEDED(res) && (nsnull != ccm)) {
-    nsIUnicodeEncoder* encoder = nsnull;
-    nsString convCharset;
-
-    // map to converter charset
-    if (aCharset.EqualsIgnoreCase("us-ascii")) {
-      convCharset.SetString("iso-8859-1");
-    }
-    else {
-      convCharset = aCharset; 
-    }
-
-    // get an unicode converter
-    res = ccm->GetUnicodeEncoder(&convCharset, &encoder);
-    if(NS_SUCCEEDED(res) && (nsnull != encoder)) {
-      PRUnichar *unichars = (PRUnichar *) inString.GetUnicode();
-      PRInt32 unicharLength = inString.Length();
-      PRInt32 dstLength;
-      res = encoder->GetMaxLength(unichars, unicharLength, &dstLength);
-      // allocale an output buffer
-      *outCString = (char *) PR_Malloc(dstLength + 1);
-      if (nsnull != *outCString) {
-        PRInt32 oldUnicharLength = unicharLength;
-        char *tempCString = *outCString;
-        PRInt32 totalCLength = 0;
-        while (1) {
-          res = encoder->Convert(unichars, &unicharLength, tempCString, &dstLength);
-
-          // increment for destination
-          tempCString += dstLength;
-          totalCLength += dstLength;
-
-          // break: this is usually the case
-          // source length <= zero and no error or unrecoverable error
-          if (0 >= unicharLength || NS_ERROR_UENC_NOMAPPING != res) {
-            break;
-          }
-          // could not map unicode to the destination charset, skip one unichar and continue
-          // increment for source unicode, skip one unichar
-          unichars += unicharLength + 1;
-          oldUnicharLength -= (unicharLength + 1);
-          unicharLength = oldUnicharLength;
-          // estimate target length again
-          (void) encoder->GetMaxLength(unichars, unicharLength, &dstLength);
-        }
-        (*outCString)[totalCLength] = '\0';
-      }
-      else {
-        res = NS_ERROR_OUT_OF_MEMORY;
-      }
-      NS_IF_RELEASE(encoder);
-    }    
-  }
-  return res;
-}
-
-// Convert a C string to an unicode string.
-nsresult ConvertToUnicode(const nsString& aCharset, 
-                          const char* inCString, 
-                          nsString& outString)
-{
-  nsresult res;
-  NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &res); 
-
-  if(NS_SUCCEEDED(res) && (nsnull != ccm)) {
-    nsIUnicodeDecoder* decoder = nsnull;
-    PRUnichar *unichars;
-    PRInt32 unicharLength;
-    nsString convCharset;
-
-    // map to converter charset
-    if (aCharset.EqualsIgnoreCase("us-ascii")) {
-      convCharset.SetString("iso-8859-1");
-    }
-    else {
-      convCharset = aCharset; 
-    }
-    // get an unicode converter
-    res = ccm->GetUnicodeDecoder(&convCharset, &decoder);
-    if(NS_SUCCEEDED(res) && (nsnull != decoder)) {
-      PRInt32 srcLen = PL_strlen(inCString);
-      res = decoder->GetMaxLength(inCString, srcLen, &unicharLength);
-      // allocale an output buffer
-      unichars = (PRUnichar *) PR_Malloc(unicharLength * sizeof(PRUnichar));
-      if (unichars != nsnull) {
-        // convert to unicode
-        res = decoder->Convert(inCString, &srcLen, unichars, &unicharLength);
-        outString.SetString(unichars, unicharLength);
-        PR_Free(unichars);
-      }
-      else {
-        res = NS_ERROR_OUT_OF_MEMORY;
-      }
-      NS_IF_RELEASE(decoder);
-    }    
-  }  
-  return res;
-}
-
-// Charset to be used for the internatl processing.
-const char *msgCompHeaderInternalCharset()
-{
-  // UTF-8 is a super set of us-ascii. 
-  // We can use the same string manipulation methods as us-ascii without breaking non us-ascii characters. 
-  return "UTF-8";
-}
-
-// MIME encoder, output string should be freed by PR_FREE
-char * nsMsgI18NEncodeMimePartIIStr(const char *header, const char *charset, PRBool bUseMime) 
-{
-  // No MIME, just duplicate the string.
-  if (PR_FALSE == bUseMime) {
-    return PL_strdup(header);
-  }
-
-  char *encodedString = nsnull;
-  nsIMimeConverter *converter;
-  nsresult res = nsComponentManager::CreateInstance(kCMimeConverterCID, nsnull, 
-                                           nsCOMTypeInfo<nsIMimeConverter>::GetIID(), (void **)&converter);
-  if (NS_SUCCEEDED(res) && nsnull != converter) {
-    res = converter->EncodeMimePartIIStr_UTF8(header, charset, kMIME_ENCODED_WORD_SIZE, &encodedString);
-    NS_RELEASE(converter);
-  }
-  return NS_SUCCEEDED(res) ? encodedString : nsnull;
-}
-
-// MIME decoder
-nsresult nsMsgI18NDecodeMimePartIIStr(const nsString& header, nsString& charset, nsString& decodedString)
-{
-  nsIMimeConverter *converter;
-  nsresult res = nsComponentManager::CreateInstance(kCMimeConverterCID, nsnull, 
-                                                    nsCOMTypeInfo<nsIMimeConverter>::GetIID(), (void **)&converter);
-  if (NS_SUCCEEDED(res) && nsnull != converter) {
-    res = converter->DecodeMimePartIIStr(header, charset, decodedString);
-    NS_RELEASE(converter);
-  }
-  return res;
-}
-
-// Get a default mail character set.
-char * nsMsgI18NGetDefaultMailCharset()
-{
-  nsresult res = NS_OK;
-  char * retVal = nsnull;
-  NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &res); 
-  if (nsnull != prefs && NS_SUCCEEDED(res))
-  {
-      char *prefValue;
-	  res = prefs->CopyCharPref("intl.character_set_name", &prefValue);
-	  
-	  if (NS_SUCCEEDED(res)) 
-	  {
-  		//TODO: map to mail charset (e.g. Shift_JIS -> ISO-2022-JP) bug#3941.
-  		 retVal = prefValue;
-	  }
-	  else 
-		  retVal = PL_strdup("iso-8859-1");
-  }
-
-  return (nsnull != retVal) ? retVal : PL_strdup("iso-8859-1");
-}
-
-// Return True if a charset is stateful (e.g. JIS).
-PRBool nsMsgI18Nstateful_charset(const char *charset)
-{
-  //TODO: use charset manager's service
-  return (PL_strcasecmp(charset, "iso-2022-jp") == 0);
-}
-
-// Check 7bit in a given buffer.
-// This is expensive (both memory and performance).
-// The check would be very simple if applied to an unicode text (e.g. nsString or utf-8).
-// Possible optimazaion is to search ESC(0x1B) in case of iso-2022-jp and iso-2022-kr.
-// Or convert and check line by line.
-PRBool nsMsgI18N7bit_data_part(const char *charset, const char *inString, const PRUint32 size)
-{
-  char *aCString;
-  nsString aCharset(charset);
-  nsString outString;
-  nsresult res;
-  
-  aCString = (char *) PR_Malloc(size + 1);
-  if (nsnull != aCString) {
-    PL_strncpy(aCString, inString, size); // make a C string
-    res = ConvertToUnicode(aCharset, aCString, outString);
-    PR_Free(aCString);
-    if (NS_SUCCEEDED(res)) {
-      for (PRInt32 i = 0; i < outString.Length(); i++) {
-        if (outString.CharAt(i) > 127) {
-          return PR_FALSE;
-        }
-      }
-    }
-  }
-  return PR_TRUE;  // all 7 bit
-}
-
-// Simple parser to parse META charset. 
-// It only supports the case when the description is within one line. 
-const char * 
-nsMsgI18NParseMetaCharset(nsFileSpec* fileSpec) 
-{ 
-  static char charset[65]; 
-  char buffer[512]; 
-  nsInputFileStream fileStream(*fileSpec); 
-
-  *charset = '\0'; 
-
-  while (!fileStream.eof() && !fileStream.failed() && 
-         fileStream.is_open()) { 
-    fileStream.readline(buffer, 512); 
-    if (*buffer == CR || *buffer == LF || *buffer == 0) 
-      continue; 
-
-    for (int i = 0; i < (int)PL_strlen(buffer); i++) { 
-      buffer[i] = toupper(buffer[i]); 
-    } 
-
-    if (PL_strstr(buffer, "/HEAD")) 
-      break; 
-
-    if (PL_strstr(buffer, "META") && 
-        PL_strstr(buffer, "HTTP-EQUIV") && 
-        PL_strstr(buffer, "CONTENT-TYPE") && 
-        PL_strstr(buffer, "CHARSET") 
-        ) 
-    { 
-      char *cp = PL_strstr(PL_strstr(buffer, "CHARSET"), "=") + 1; 
-      char seps[]   = " \"\'"; 
-      char *token; 
-      char* newStr; 
-      token = nsCRT::strtok(cp, seps, &newStr); 
-      if (token != NULL) 
-      { 
-        PL_strcpy(charset, token); 
-      } 
-    } 
-  } 
-
-  return charset; 
-} 
-
-nsresult nsMsgI18NConvertToEntity(const nsString& inString, nsString* outString)
-{
-  nsresult res;
-
-  outString->SetString("");
-  nsCOMPtr <nsIEntityConverter> entityConv;
-  res = nsComponentManager::CreateInstance(kEntityConverterCID, NULL, 
-                                           nsIEntityConverter::GetIID(), getter_AddRefs(entityConv));
-  if(NS_SUCCEEDED(res)) {
-    PRUnichar *entities = NULL;
-    res = entityConv->ConvertToEntities(inString.GetUnicode(), nsIEntityConverter::html40Latin1, &entities);
-    if (NS_SUCCEEDED(res) && (NULL != entities)) {
-      outString->SetString(entities);
-      nsAllocator::Free(entities);
-     }
-   }
- 
-  return res;
-}
-
-nsresult nsMsgI18NSaveAsCharset(const char* contentType, const char *charset, const PRUnichar* inString, char** outString)
-{
-  NS_ASSERTION(contentType, "null ptr- contentType");
-  NS_ASSERTION(charset, "null ptr- charset");
-  NS_ASSERTION(outString, "null ptr- outString");
-  if(!contentType || !charset || !outString)
-    return NS_ERROR_NULL_POINTER;
-  *outString = NULL;
-
-  PRBool bTEXT_HTML = PR_FALSE;
-  nsresult res;
-
-  if (!nsCRT::strcasecmp(contentType, TEXT_HTML)) {
-    bTEXT_HTML = PR_TRUE;
-  }
-  else if (nsCRT::strcasecmp(contentType, TEXT_PLAIN)) {
-    return NS_ERROR_ILLEGAL_VALUE;  // not supported type
-  }
-
-  nsCOMPtr <nsISaveAsCharset> aConv;  // charset converter plus entity, NCR generation
-  res = nsComponentManager::CreateInstance(kSaveAsCharsetCID, NULL, 
-                                           nsISaveAsCharset::GetIID(), getter_AddRefs(aConv));
-  if(NS_SUCCEEDED(res)) {
-    // attribute: 
-    // html text - charset conv then fallback to entity or NCR
-    // plain text - charset conv then fallback to '?'
-    res = aConv->Init(charset, 
-                      bTEXT_HTML ? 
-                      nsISaveAsCharset::attr_EntityAfterCharsetConv + nsISaveAsCharset::attr_FallbackDecimalNCR : 
-                      nsISaveAsCharset::attr_plainTextDefault + nsISaveAsCharset::attr_FallbackQuestionMark, 
-                      nsIEntityConverter::html40);
-    if (NS_SUCCEEDED(res)) {
-      res = aConv->Convert(inString, outString);
-    }
-  }
- 
-  return res;
-}
-
-// RICHIE - not sure about this one?? need to see what it did in the old
-// world.
-char *
-nsMsgI18NGetAcceptLanguage(void)
-{
-  return "en";
-}

mozilla/mailnews/base/util/nsMsgI18N.h

@@ -1,49 +0,0 @@
-/* -*- 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 _nsMsgI18N_H_
-#define _nsMsgI18N_H_
-
-#include "nscore.h"
-#include "msgCore.h"
-
-
-NS_MSG_BASE char      *nsMsgI18NEncodeMimePartIIStr(const char *header, const char *charset, PRBool bUseMime);
-NS_MSG_BASE PRBool    nsMsgI18Nstateful_charset(const char *charset);
-NS_MSG_BASE PRBool    nsMsgI18N7bit_data_part(const char *charset, const char *string, const PRUint32 size);
-NS_MSG_BASE char      *nsMsgI18NGetAcceptLanguage(void); 
-
-NS_MSG_BASE const char *msgCompHeaderInternalCharset(void);
-
-NS_MSG_BASE char * nsMsgI18NGetDefaultMailCharset(void);
-NS_MSG_BASE nsresult ConvertFromUnicode(const nsString& aCharset, 
-                                   const nsString& inString,
-                                   char** outCString);
-NS_MSG_BASE nsresult ConvertToUnicode(const nsString& aCharset, 
-                                 const char* inCString, 
-                                 nsString& outString);
-
-NS_MSG_BASE nsresult nsMsgI18NDecodeMimePartIIStr(const nsString& header, nsString& charset, nsString& decodedString);
-
-NS_MSG_BASE const char *nsMsgI18NParseMetaCharset(nsFileSpec* fileSpec);
-
-NS_MSG_BASE nsresult nsMsgI18NConvertToEntity(const nsString& inString, nsString* outString);
-
-NS_MSG_BASE nsresult nsMsgI18NSaveAsCharset(const char* contentType, const char* charset, const PRUnichar* inString, char** outString);
-
-#endif /* _nsMsgI18N_H_ */

mozilla/mailnews/base/util/nsMsgIdentity.cpp

@@ -1,356 +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.
- */
-
-#include "msgCore.h" // for pre-compiled headers
-#include "nsMsgIdentity.h"
-#include "nsIPref.h"
-#include "nsXPIDLString.h"
-
-static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID);
-
-NS_IMPL_ISUPPORTS2(nsMsgIdentity,
-                   nsIMsgIdentity,
-                   nsIShutdownListener)
-
-nsMsgIdentity::nsMsgIdentity():
-  m_signature(0),
-  m_vCard(0),
-  m_identityKey(0),
-  m_prefs(0)
-{
-	NS_INIT_REFCNT();
-}
-
-nsMsgIdentity::~nsMsgIdentity()
-{
-  PR_FREEIF(m_identityKey);
-  if (m_prefs) nsServiceManager::ReleaseService(kPrefServiceCID,
-                                                m_prefs,
-                                                nsnull);
-}
-
-nsresult
-nsMsgIdentity::getPrefService()
-{
-  if (m_prefs) return NS_OK;
-  return nsServiceManager::GetService(kPrefServiceCID,
-                                      nsCOMTypeInfo<nsIPref>::GetIID(),
-                                      (nsISupports**)&m_prefs,
-                                      this);
-}
-
-
-/* called if the prefs service goes offline */
-NS_IMETHODIMP
-nsMsgIdentity::OnShutdown(const nsCID& aClass, nsISupports *service)
-{
-  if (aClass.Equals(kPrefServiceCID)) {
-    if (m_prefs) nsServiceManager::ReleaseService(kPrefServiceCID, m_prefs);
-    m_prefs = nsnull;
-  }
-
-  return NS_OK;
-}
-
-/*
- * accessors for pulling values directly out of preferences
- * instead of member variables, etc
- */
-
-/* convert an identity key and preference name
-   to mail.identity.<identityKey>.<prefName>
-*/
-char *
-nsMsgIdentity::getPrefName(const char *identityKey,
-                           const char *prefName)
-{
-  return PR_smprintf("mail.identity.%s.%s", identityKey, prefName);
-}
-
-// this will be slightly faster than the above, and allows
-// the "default" identity preference root to be set in one place
-char *
-nsMsgIdentity::getDefaultPrefName(const char *fullPrefName)
-{
-  return PR_smprintf("mail.identity.default.%s", fullPrefName);
-}
-
-/* The following are equivalent to the nsIPref's Get/CopyXXXPref
-   except they construct the preference name with the above function
-*/
-nsresult
-nsMsgIdentity::getBoolPref(const char *prefname,
-                           PRBool *val)
-{
-  nsresult rv = getPrefService();
-  if (NS_FAILED(rv)) return rv;
-  
-  char *fullPrefName = getPrefName(m_identityKey, prefname);
-  rv = m_prefs->GetBoolPref(fullPrefName, val);
-  PR_Free(fullPrefName);
-
-  if (NS_FAILED(rv))
-    rv = getDefaultBoolPref(prefname, val);
-  
-  return rv;
-}
-
-nsresult
-nsMsgIdentity::getDefaultBoolPref(const char *prefname,
-                                        PRBool *val) {
-  
-  nsresult rv = getPrefService();
-  if (NS_FAILED(rv)) return rv;
-  
-  char *fullPrefName = getDefaultPrefName(prefname);
-  rv = m_prefs->GetBoolPref(fullPrefName, val);
-  PR_Free(fullPrefName);
-
-  if (NS_FAILED(rv)) {
-    *val = PR_FALSE;
-    rv = NS_OK;
-  }
-  return rv;
-}
-
-nsresult
-nsMsgIdentity::setBoolPref(const char *prefname,
-                           PRBool val)
-{
-  nsresult rv = getPrefService();
-  if (NS_FAILED(rv)) return rv;
-  
-  char *prefName = getPrefName(m_identityKey, prefname);
-  rv = m_prefs->SetBoolPref(prefName, val);
-  PR_Free(prefName);
-  return rv;
-}
-
-nsresult
-nsMsgIdentity::getCharPref(const char *prefname,
-                           char **val)
-{
-  nsresult rv = getPrefService();
-  if (NS_FAILED(rv)) return rv;
-  
-  char *fullPrefName = getPrefName(m_identityKey, prefname);
-  rv = m_prefs->CopyCharPref(fullPrefName, val);
-  PR_Free(fullPrefName);
-
-  if (NS_FAILED(rv))
-    rv = getDefaultCharPref(prefname, val);
-
-  return rv;
-}
-
-nsresult
-nsMsgIdentity::getDefaultCharPref(const char *prefname,
-                                        char **val)
-{
-  nsresult rv = getPrefService();
-  if (NS_FAILED(rv)) return rv;
-  
-  char *fullPrefName = getDefaultPrefName(prefname);
-  rv = m_prefs->CopyCharPref(fullPrefName, val);
-  PR_Free(fullPrefName);
-
-  if (NS_FAILED(rv)) {
-    *val = nsnull;              // null is ok to return here
-    rv = NS_OK;
-  }
-  return rv;
-}
-
-nsresult
-nsMsgIdentity::setCharPref(const char *prefname,
-                           const char *val)
-{
-  nsresult rv = getPrefService();
-  if (NS_FAILED(rv)) return rv;
-  
-  rv = NS_OK;
-  char *prefName = getPrefName(m_identityKey, prefname);
-  if (val) 
-    rv = m_prefs->SetCharPref(prefName, val);
-  else
-    m_prefs->ClearUserPref(prefName);
-  PR_Free(prefName);
-  return rv;
-}
-
-nsresult
-nsMsgIdentity::getIntPref(const char *prefname,
-                                PRInt32 *val)
-{
-  nsresult rv = getPrefService();
-  if (NS_FAILED(rv)) return rv;
-  
-  char *fullPrefName = getPrefName(m_identityKey, prefname);
-  rv = m_prefs->GetIntPref(fullPrefName, val);
-  PR_Free(fullPrefName);
-
-  if (NS_FAILED(rv))
-	rv = getDefaultIntPref(prefname, val);
-
-  return rv;
-}
-
-nsresult
-nsMsgIdentity::getDefaultIntPref(const char *prefname,
-                                        PRInt32 *val) {
-  
-  nsresult rv = getPrefService();
-  if (NS_FAILED(rv)) return rv;
-  
-  char *fullPrefName = getDefaultPrefName(prefname);
-  rv = m_prefs->GetIntPref(fullPrefName, val);
-  PR_Free(fullPrefName);
-
-  if (NS_FAILED(rv)) {
-    *val = 0;
-    rv = NS_OK;
-  }
-  
-  return rv;
-}
-
-nsresult
-nsMsgIdentity::setIntPref(const char *prefname,
-                                 PRInt32 val)
-{
-  nsresult rv = getPrefService();
-  if (NS_FAILED(rv)) return rv;
-  
-  char *prefName = getPrefName(m_identityKey, prefname);
-  rv = m_prefs->SetIntPref(prefName, val);
-  PR_Free(prefName);
-  return rv;
-}
-
-nsresult
-nsMsgIdentity::SetKey(const char* identityKey)
-{
-  PR_FREEIF(m_identityKey);
-  m_identityKey = PL_strdup(identityKey);
-  return NS_OK;
-}
-
-nsresult
-nsMsgIdentity::GetIdentityName(char **idName) {
-  if (!idName) return NS_ERROR_NULL_POINTER;
-
-  *idName = nsnull;
-  nsresult rv = getCharPref("identityName",idName);
-  if (NS_FAILED(rv)) return rv;
-
-  // there's probably a better way of doing this
-  // thats unicode friendly?
-  if (!(*idName)) {
-    nsXPIDLCString fullName;
-    rv = GetFullName(getter_Copies(fullName));
-    if (NS_FAILED(rv)) return rv;
-    
-    nsXPIDLCString email;
-    rv = GetEmail(getter_Copies(email));
-    if (NS_FAILED(rv)) return rv;
-    
-    *idName = PR_smprintf("%s <%s>", (const char*)fullName,
-                          (const char*)email);
-    rv = NS_OK;
-  }
-
-  return rv;
-}
-
-nsresult nsMsgIdentity::SetIdentityName(const char *idName) {
-  return setCharPref("identityName", idName);
-}
-
-NS_IMETHODIMP
-nsMsgIdentity::ToString(PRUnichar **aResult)
-{
-  nsString idname("[nsIMsgIdentity: ");
-  idname += m_identityKey;
-  idname += "]";
-
-  *aResult = idname.ToNewUnicode();
-  return NS_OK;
-}
-
-/* Identity attribute accessors */
-
-// XXX - these are a COM objects, use NS_ADDREF
-//NS_IMPL_GETSET(nsMsgIdentity, Signature, nsIMsgSignature*, m_signature);
-NS_IMETHODIMP
-nsMsgIdentity::GetSignature(nsIFileSpec **sig) {
-  nsresult rv = getPrefService();
-  if (NS_FAILED(rv)) return rv;
-  
-  char *prefName = getPrefName(m_identityKey, "sig_file");
-  rv = m_prefs->GetFilePref(prefName, sig);
-  if (NS_FAILED(rv))
-    *sig = nsnull;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMsgIdentity::SetSignature(nsIFileSpec *sig)
-{
-
-  nsresult rv = getPrefService();
-  if (NS_FAILED(rv)) return rv;
-  
-  rv = NS_OK;
-  char *prefName = getPrefName(m_identityKey, "sig_file");
-  if (sig) 
-    rv = m_prefs->SetFilePref(NS_CONST_CAST(const char*,prefName), sig,
-                              PR_FALSE);
-  /*
-  else
-    m_prefs->ClearFilePref(prefName);
-  */
-  PR_Free(prefName);
-  return rv;
-  
-  return NS_OK;
-}
-
-NS_IMPL_GETSET(nsMsgIdentity, VCard, nsIMsgVCard*, m_vCard);
-  
-NS_IMPL_GETTER_STR(nsMsgIdentity::GetKey, m_identityKey);
-
-NS_IMPL_IDPREF_STR(FullName, "fullName");
-NS_IMPL_IDPREF_STR(Email, "useremail");
-NS_IMPL_IDPREF_STR(ReplyTo, "reply_to");
-NS_IMPL_IDPREF_STR(Organization, "organization");
-NS_IMPL_IDPREF_BOOL(ComposeHtml, "compose_html");
-NS_IMPL_IDPREF_BOOL(AttachVCard, "attach_vcard");
-NS_IMPL_IDPREF_BOOL(AttachSignature, "attach_signature");
-
-NS_IMPL_IDPREF_BOOL(DoFcc, "fcc");
-NS_IMPL_IDPREF_STR(FccFolder, "fcc_folder");
-
-NS_IMPL_IDPREF_BOOL(BccSelf, "bcc_self");
-NS_IMPL_IDPREF_BOOL(BccOthers, "bcc_other");
-NS_IMPL_IDPREF_STR (BccList, "bcc_other_list");
-
-NS_IMPL_IDPREF_STR (DraftFolder, "draft_folder");
-NS_IMPL_IDPREF_STR (StationaryFolder, "stationary_folder");
-NS_IMPL_IDPREF_STR (JunkMailFolder, "spam_folder");
-
-

mozilla/mailnews/base/util/nsMsgIdentity.h

@@ -1,110 +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 nsMsgIdentity_h___
-#define nsMsgIdentity_h___
-
-#include "nsIMsgIdentity.h"
-#include "nsIPref.h"
-#include "msgCore.h"
-
-///////////////////////////////////////////////////////////////////////////////////
-// an identity is an object designed to encapsulate all the information we need 
-// to know about a user identity. I expect this interface to grow and change a lot
-// as we flesh out our thoughts on multiple identities and what properties go into
-// these identities.
-//////////////////////////////////////////////////////////////////////////////////
-
-
-class NS_MSG_BASE nsMsgIdentity : public nsIMsgIdentity,
-                                  public nsIShutdownListener
-{
-public:
-  nsMsgIdentity();
-  virtual ~nsMsgIdentity();
-  
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIMSGIDENTITY
-
-  // nsIShutdownListener
-  
-  NS_IMETHOD OnShutdown(const nsCID& aClass, nsISupports *service);
-  
-private:
-  nsIMsgSignature* m_signature;
-  nsIMsgVCard* m_vCard;
-  char *m_identityKey;
-  nsIPref *m_prefs;
-
-protected:
-  nsresult getPrefService();
-  char *getPrefName(const char *identityKey, const char *pref);
-  char *getDefaultPrefName(const char *pref);
-  nsresult getCharPref(const char *pref, char **);
-  nsresult getDefaultCharPref(const char *pref, char **);
-  nsresult setCharPref(const char *pref, const char *);
-
-  nsresult getBoolPref(const char *pref, PRBool *);
-  nsresult getDefaultBoolPref(const char *pref, PRBool *);
-  nsresult setBoolPref(const char *pref, PRBool);
-
-  nsresult getIntPref(const char *pref, PRInt32 *);
-  nsresult getDefaultIntPref(const char *pref, PRInt32 *);
-  nsresult setIntPref(const char *pref, PRInt32);
-
-};
-
-
-#define NS_IMPL_IDPREF_STR(_postfix, _prefname)	\
-NS_IMETHODIMP								   	\
-nsMsgIdentity::Get##_postfix(char **retval)   	\
-{											   	\
-  return getCharPref(_prefname, retval);		\
-}												\
-NS_IMETHODIMP	   								\
-nsMsgIdentity::Set##_postfix(const char *value)		\
-{												\
-  return setCharPref(_prefname, value);\
-}
-
-#define NS_IMPL_IDPREF_BOOL(_postfix, _prefname)\
-NS_IMETHODIMP								   	\
-nsMsgIdentity::Get##_postfix(PRBool *retval)   	\
-{											   	\
-  return getBoolPref(_prefname, retval);		\
-}												\
-NS_IMETHODIMP	   								\
-nsMsgIdentity::Set##_postfix(PRBool value)		\
-{												\
-  return setBoolPref(_prefname, value);			\
-}
-
-#define NS_IMPL_IDPREF_INT(_postfix, _prefname) \
-NS_IMETHODIMP								   	\
-nsMsgIdentity::Get##_postfix(PRInt32 *retval)   \
-{											   	\
-  return getIntPref(_prefname, retval);		\
-}												\
-NS_IMETHODIMP	   								\
-nsMsgIdentity::Set##_postfix(PRInt32 value)		\
-{												\
-  return setIntPref(_prefname, value);			\
-}
-
-
-#endif /* nsMsgIdentity_h___ */

mozilla/mailnews/base/util/nsMsgIncomingServer.cpp

@@ -1,603 +0,0 @@
-/* -*- 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.
- */
-
-#include "nsMsgIncomingServer.h"
-#include "nscore.h"
-#include "nsCom.h"
-#include "plstr.h"
-#include "prmem.h"
-#include "prprf.h"
-
-#include "nsIServiceManager.h"
-#include "nsIPref.h"
-#include "nsCOMPtr.h"
-#include "nsIMsgFolder.h"
-#include "nsIMsgFolderCache.h"
-#include "nsIMsgFolderCacheElement.h"
-#include "nsINetSupportDialogService.h"
-#include "nsIPrompt.h"
-#include "nsXPIDLString.h"
-#include "nsIRDFService.h"
-#include "nsIMsgProtocolInfo.h"
-#include "nsRDFCID.h"
-
-static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID);
-static NS_DEFINE_CID(kNetSupportDialogCID, NS_NETSUPPORTDIALOG_CID);
-static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
-
-MOZ_DECL_CTOR_COUNTER(nsMsgIncomingServer);
-
-nsMsgIncomingServer::nsMsgIncomingServer():
-    m_prefs(0),
-    m_serverKey(0),
-    m_rootFolder(0)
-{
-  MOZ_COUNT_CTOR(nsMsgIncomingServer);
-
-  NS_INIT_REFCNT();
-  m_serverBusy = PR_FALSE;
-  m_password = "";
-}
-
-nsMsgIncomingServer::~nsMsgIncomingServer()
-{
-	
-	MOZ_COUNT_DTOR(nsMsgIncomingServer);
-
-    if (m_prefs) nsServiceManager::ReleaseService(kPrefServiceCID,
-                                                  m_prefs,
-                                                  nsnull);
-    PR_FREEIF(m_serverKey)
-}
-
-NS_IMPL_ISUPPORTS1(nsMsgIncomingServer, nsIMsgIncomingServer)
-
-NS_IMPL_GETSET(nsMsgIncomingServer, ServerBusy, PRBool, m_serverBusy)
-NS_IMPL_GETTER_STR(nsMsgIncomingServer::GetKey, m_serverKey)
-
-
-NS_IMETHODIMP
-nsMsgIncomingServer::SetKey(const char * serverKey)
-{
-    nsresult rv = NS_OK;
-    // in order to actually make use of the key, we need the prefs
-    if (!m_prefs)
-        rv = nsServiceManager::GetService(kPrefServiceCID,
-                                          nsCOMTypeInfo<nsIPref>::GetIID(),
-                                          (nsISupports**)&m_prefs);
-
-    PR_FREEIF(m_serverKey);
-    m_serverKey = PL_strdup(serverKey);
-    return rv;
-}
-    
-NS_IMETHODIMP
-nsMsgIncomingServer::SetRootFolder(nsIFolder * aRootFolder)
-{
-	m_rootFolder = aRootFolder;
-	return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMsgIncomingServer::GetRootFolder(nsIFolder * *aRootFolder)
-{
-	if (!aRootFolder)
-		return NS_ERROR_NULL_POINTER;
-    if (m_rootFolder) {
-      *aRootFolder = m_rootFolder;
-      NS_ADDREF(*aRootFolder);
-    } else {
-      nsresult rv = CreateRootFolder();
-      if (NS_FAILED(rv)) return rv;
-      
-      *aRootFolder = m_rootFolder;
-      NS_IF_ADDREF(*aRootFolder);
-    }
-	return NS_OK;
-}
-  
-NS_IMETHODIMP
-nsMsgIncomingServer::PerformBiff()
-{
-	//This had to be implemented in the derived class, but in case someone doesn't implement it
-	//just return not implemented.
-	return NS_ERROR_NOT_IMPLEMENTED;	
-}
-
-NS_IMETHODIMP nsMsgIncomingServer::WriteToFolderCache(nsIMsgFolderCache *folderCache)
-{
-	nsresult rv = NS_OK;
-	if (m_rootFolder)
-	{
-		nsCOMPtr <nsIMsgFolder> msgFolder = do_QueryInterface(m_rootFolder, &rv);
-		if (NS_SUCCEEDED(rv) && msgFolder)
-			rv = msgFolder->WriteToFolderCache(folderCache);
-	}
-	return rv;
-}
-
-NS_IMETHODIMP
-nsMsgIncomingServer::CloseCachedConnections()
-{
-	// derived class should override if they cache connections.
-	return NS_OK;
-}
-
-
-NS_IMETHODIMP
-nsMsgIncomingServer::GetServerURI(char **)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-nsresult
-nsMsgIncomingServer::CreateRootFolder()
-{
-	nsresult rv;
-			  // get the URI from the incoming server
-  nsXPIDLCString serverUri;
-  rv = GetServerURI(getter_Copies(serverUri));
-  if (NS_FAILED(rv)) return rv;
-
-  NS_WITH_SERVICE(nsIRDFService, rdf,
-                        kRDFServiceCID, &rv);
-
-  // get the corresponding RDF resource
-  // RDF will create the server resource if it doesn't already exist
-  nsCOMPtr<nsIRDFResource> serverResource;
-  rv = rdf->GetResource(serverUri, getter_AddRefs(serverResource));
-  if (NS_FAILED(rv)) return rv;
-
-  // make incoming server know about its root server folder so we 
-  // can find sub-folders given an incoming server.
-  m_rootFolder = do_QueryInterface(serverResource, &rv);
-  return rv;
-}
-
-char *
-nsMsgIncomingServer::getPrefName(const char *serverKey,
-                                 const char *fullPrefName)
-{
-  return PR_smprintf("mail.server.%s.%s", serverKey, fullPrefName);
-}
-
-// this will be slightly faster than the above, and allows
-// the "default" server preference root to be set in one place
-char *
-nsMsgIncomingServer::getDefaultPrefName(const char *fullPrefName)
-{
-  return PR_smprintf("mail.server.default.%s", fullPrefName);
-}
-
-
-nsresult
-nsMsgIncomingServer::GetBoolValue(const char *prefname,
-                                 PRBool *val)
-{
-  char *fullPrefName = getPrefName(m_serverKey, prefname);
-  nsresult rv = m_prefs->GetBoolPref(fullPrefName, val);
-  PR_Free(fullPrefName);
-  
-  if (NS_FAILED(rv))
-    rv = getDefaultBoolPref(prefname, val);
-  
-  return rv;
-}
-
-nsresult
-nsMsgIncomingServer::getDefaultBoolPref(const char *prefname,
-                                        PRBool *val) {
-  
-  char *fullPrefName = getDefaultPrefName(prefname);
-  nsresult rv = m_prefs->GetBoolPref(fullPrefName, val);
-  PR_Free(fullPrefName);
-
-  if (NS_FAILED(rv)) {
-    *val = PR_FALSE;
-    rv = NS_OK;
-  }
-  return rv;
-}
-
-nsresult
-nsMsgIncomingServer::SetBoolValue(const char *prefname,
-                                 PRBool val)
-{
-  nsresult rv;
-  char *fullPrefName = getPrefName(m_serverKey, prefname);
-
-  PRBool defaultValue;
-  rv = getDefaultBoolPref(prefname, &defaultValue);
-
-  if (NS_SUCCEEDED(rv) &&
-      val == defaultValue)
-    m_prefs->ClearUserPref(fullPrefName);
-  else
-    rv = m_prefs->SetBoolPref(fullPrefName, val);
-  
-  PR_Free(fullPrefName);
-  
-  return rv;
-}
-
-nsresult
-nsMsgIncomingServer::GetIntValue(const char *prefname,
-                                PRInt32 *val)
-{
-  char *fullPrefName = getPrefName(m_serverKey, prefname);
-  nsresult rv = m_prefs->GetIntPref(fullPrefName, val);
-  PR_Free(fullPrefName);
-
-  if (NS_FAILED(rv))
-    rv = getDefaultIntPref(prefname, val);
-  
-  return rv;
-}
-
-nsresult
-nsMsgIncomingServer::GetFileValue(const char* prefname,
-                                  nsIFileSpec **spec)
-{
-  char *fullPrefName = getPrefName(m_serverKey, prefname);
-  nsresult rv = m_prefs->GetFilePref(fullPrefName, spec);
-  PR_Free(fullPrefName);
-
-  return rv;
-}
-
-nsresult
-nsMsgIncomingServer::SetFileValue(const char* prefname,
-                                    nsIFileSpec *spec)
-{
-  char *fullPrefName = getPrefName(m_serverKey, prefname);
-  nsresult rv = m_prefs->SetFilePref(fullPrefName, spec, PR_FALSE);
-  PR_Free(fullPrefName);
-
-  return rv;
-}
-
-nsresult
-nsMsgIncomingServer::getDefaultIntPref(const char *prefname,
-                                        PRInt32 *val) {
-  
-  char *fullPrefName = getDefaultPrefName(prefname);
-  nsresult rv = m_prefs->GetIntPref(fullPrefName, val);
-  PR_Free(fullPrefName);
-
-  if (NS_FAILED(rv)) {
-    *val = 0;
-    rv = NS_OK;
-  }
-  
-  return rv;
-}
-
-nsresult
-nsMsgIncomingServer::SetIntValue(const char *prefname,
-                                 PRInt32 val)
-{
-  nsresult rv;
-  char *fullPrefName = getPrefName(m_serverKey, prefname);
-  
-  PRInt32 defaultVal;
-  rv = getDefaultIntPref(prefname, &defaultVal);
-  
-  if (NS_SUCCEEDED(rv) && defaultVal == val)
-    m_prefs->ClearUserPref(fullPrefName);
-  else
-    rv = m_prefs->SetIntPref(fullPrefName, val);
-  
-  PR_Free(fullPrefName);
-  
-  return rv;
-}
-
-nsresult
-nsMsgIncomingServer::GetCharValue(const char *prefname,
-                                 char  **val)
-{
-  char *fullPrefName = getPrefName(m_serverKey, prefname);
-  nsresult rv = m_prefs->CopyCharPref(fullPrefName, val);
-  PR_Free(fullPrefName);
-  
-  if (NS_FAILED(rv))
-    rv = getDefaultCharPref(prefname, val);
-  
-  return rv;
-}
-
-nsresult
-nsMsgIncomingServer::getDefaultCharPref(const char *prefname,
-                                        char **val) {
-  
-  char *fullPrefName = getDefaultPrefName(prefname);
-  nsresult rv = m_prefs->CopyCharPref(fullPrefName, val);
-  PR_Free(fullPrefName);
-
-  if (NS_FAILED(rv)) {
-    *val = nsnull;              // null is ok to return here
-    rv = NS_OK;
-  }
-  return rv;
-}
-
-nsresult
-nsMsgIncomingServer::SetCharValue(const char *prefname,
-                                 const char * val)
-{
-  nsresult rv;
-  char *fullPrefName = getPrefName(m_serverKey, prefname);
-
-  if (!val) {
-    m_prefs->ClearUserPref(fullPrefName);
-    return NS_OK;
-  }
-  
-  char *defaultVal=nsnull;
-  rv = getDefaultCharPref(prefname, &defaultVal);
-  
-  if (NS_SUCCEEDED(rv) &&
-      PL_strcmp(defaultVal, val) == 0)
-    m_prefs->ClearUserPref(fullPrefName);
-  else
-    rv = m_prefs->SetCharPref(fullPrefName, val);
-  
-  PR_FREEIF(defaultVal);
-  PR_Free(fullPrefName);
-  
-  return rv;
-}
-
-// pretty name is the display name to show to the user
-NS_IMETHODIMP
-nsMsgIncomingServer::GetPrettyName(PRUnichar **retval) {
-
-  char *val=nsnull;
-  nsresult rv = GetCharValue("name", &val);
-  if (NS_FAILED(rv)) return rv;
-
-  nsString prettyName;
-  
-  // if there's no name, then just return the hostname
-  if (val) {
-    prettyName = val;
-  } else {
-    
-    nsXPIDLCString username;
-    rv = GetUsername(getter_Copies(username));
-    if (NS_FAILED(rv)) return rv;
-    if ((const char*)username &&
-        PL_strcmp((const char*)username, "")!=0) {
-      prettyName = username;
-      prettyName += " on ";
-    }
-    
-    nsXPIDLCString hostname;
-    rv = GetHostName(getter_Copies(hostname));
-    if (NS_FAILED(rv)) return rv;
-
-
-    prettyName += hostname;
-  }
-
-  *retval = prettyName.ToNewUnicode();
-  
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMsgIncomingServer::SetPrettyName(const PRUnichar *value) {
-  // this is lossy. Not sure what to do.
-  nsCString str(value);
-  return SetCharValue("name", str.GetBuffer());
-}
-
-NS_IMETHODIMP
-nsMsgIncomingServer::ToString(PRUnichar** aResult) {
-  nsString servername("[nsIMsgIncomingServer: ");
-  servername += m_serverKey;
-  servername += "]";
-  
-  *aResult = servername.ToNewUnicode();
-  NS_ASSERTION(*aResult, "no server name!");
-  return NS_OK;
-}
-  
-
-NS_IMETHODIMP nsMsgIncomingServer::SetPassword(const char * aPassword)
-{
-	// if remember password is turned on, write the password to preferences
-	// otherwise, just set the password so we remember it for the rest of the current
-	// session.
-
-	PRBool rememberPassword = PR_FALSE;
-	GetRememberPassword(&rememberPassword);
-	
-	if (rememberPassword)
-	{
-		SetPrefPassword((char *) aPassword);
-	}
-
-	m_password = aPassword;
-
-	return NS_OK;
-}
-
-NS_IMETHODIMP nsMsgIncomingServer::GetPassword(char ** aPassword)
-{
-	nsresult rv = NS_OK;
-	PRBool rememberPassword = PR_FALSE;
-	// okay, here's the scoop for this messs...
-	// (1) if we have a password already, go ahead and use it!
-	// (2) if remember password is turned on, try reading in from the prefs and if we have one, go ahead
-	//	   and use it
-	// (3) otherwise prompt the user for a password and then remember that password in the server
-
-	if (m_password.IsEmpty())
-	{
-
-		// case (2)
-		GetRememberPassword(&rememberPassword);
-		if (rememberPassword)
-		{
-			nsXPIDLCString password;
-			GetPrefPassword(getter_Copies(password));
-			m_password = password;
-		}
-	}
-    
-	*aPassword = m_password.ToNewCString();
-    return rv;
-}
-
-NS_IMETHODIMP
-nsMsgIncomingServer::GetPasswordWithUI(const PRUnichar * aPromptMessage, char **aPassword) 
-{
-
-    nsXPIDLCString prefvalue;
-    GetPassword(getter_Copies(prefvalue));
-
-    nsresult rv = NS_OK;
-    if (m_password.IsEmpty()) {
-		// prompt the user for the password
-		NS_WITH_SERVICE(nsIPrompt, dialog, kNetSupportDialogCID, &rv);
-		if (NS_SUCCEEDED(rv))
-		{
-			PRUnichar * uniPassword;
-			PRBool okayValue = PR_TRUE;
-			dialog->PromptPassword(aPromptMessage, &uniPassword, &okayValue);
-				
-			if (!okayValue) // if the user pressed cancel, just return NULL;
-			{
-				*aPassword = nsnull;
-				return rv;
-			}
-
-			// we got a password back...so remember it
-			nsCString aCStr(uniPassword); 
-
-			SetPassword((const char *) aCStr);
-		} // if we got a prompt dialog
-	} // if the password is empty
-
-	*aPassword = m_password.ToNewCString();
-	return rv;
-}
-
-NS_IMETHODIMP
-nsMsgIncomingServer::SetDefaultLocalPath(nsIFileSpec *aDefaultLocalPath)
-{
-    nsresult rv;
-    nsXPIDLCString type;
-    GetType(getter_Copies(type));
-
-    nsCAutoString progid(NS_MSGPROTOCOLINFO_PROGID_PREFIX);
-    progid += type;
-
-    NS_WITH_SERVICE(nsIMsgProtocolInfo, protocolInfo, progid, &rv);
-    if (NS_FAILED(rv)) return rv;
-
-    rv = protocolInfo->SetDefaultLocalPath(aDefaultLocalPath);
-    return rv;
-}
-
-NS_IMETHODIMP
-nsMsgIncomingServer::GetLocalPath(nsIFileSpec **aLocalPath)
-{
-    nsresult rv;
-
-    // if the local path has already been set, use it
-    rv = GetFileValue("directory", aLocalPath);
-    if (NS_SUCCEEDED(rv) && *aLocalPath) return rv;
-    
-    // otherwise, create the path using.  note we are using the
-    // server key instead of the hostname
-    //
-    // TODO:  handle the case where they migrated a server of hostname "server4"
-    // and we create a server (with the account wizard) with key "server4"
-    // we'd get a collision.
-    // need to modify the code that creates keys to check for disk collision
-    nsXPIDLCString type;
-    GetType(getter_Copies(type));
-
-    nsCAutoString progid(NS_MSGPROTOCOLINFO_PROGID_PREFIX);
-    progid += type;
-
-    NS_WITH_SERVICE(nsIMsgProtocolInfo, protocolInfo, progid, &rv);
-    if (NS_FAILED(rv)) return rv;
-    
-    nsCOMPtr<nsIFileSpec> path;
-    rv = protocolInfo->GetDefaultLocalPath(getter_AddRefs(path));
-    if (NS_FAILED(rv)) return rv;
-    
-    path->CreateDir();
-    
-    nsXPIDLCString key;
-    rv = GetKey(getter_Copies(key));
-    if (NS_FAILED(rv)) return rv;
-    rv = path->AppendRelativeUnixPath(key);
-    if (NS_FAILED(rv)) return rv;
-    rv = SetLocalPath(path);
-    if (NS_FAILED(rv)) return rv;
-
-    *aLocalPath = path;
-    NS_ADDREF(*aLocalPath);
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMsgIncomingServer::SetLocalPath(nsIFileSpec *spec)
-{
-    if (spec) {
-        spec->CreateDir();
-        return SetFileValue("directory", spec);
-    }
-    else {
-        return NS_ERROR_NULL_POINTER;
-    }
-}
-
-NS_IMETHODIMP
-nsMsgIncomingServer::SetRememberPassword(PRBool value)
-{
-    if (value)
-        SetPrefPassword(m_password);
-    else
-        SetPrefPassword(nsnull);
-    return SetBoolValue("remember_password", value);
-}
-
-NS_IMETHODIMP
-nsMsgIncomingServer::GetRememberPassword(PRBool* value)
-{
-    return GetBoolValue("remember_password", value);
-}
-
-// use the convenience macros to implement the accessors
-NS_IMPL_SERVERPREF_STR(nsMsgIncomingServer, HostName, "hostname");
-NS_IMPL_SERVERPREF_STR(nsMsgIncomingServer, Username, "userName");
-NS_IMPL_SERVERPREF_STR(nsMsgIncomingServer, PrefPassword, "password");
-NS_IMPL_SERVERPREF_BOOL(nsMsgIncomingServer, DoBiff, "check_new_mail");
-NS_IMPL_SERVERPREF_INT(nsMsgIncomingServer, BiffMinutes, "check_time");
-NS_IMPL_SERVERPREF_STR(nsMsgIncomingServer, Type, "type");
-
-/* what was this called in 4.x? */
-// pref("mail.pop3_gets_new_mail",				true);
-
-NS_IMPL_SERVERPREF_BOOL(nsMsgIncomingServer, DownloadOnBiff, "download_on_biff");

mozilla/mailnews/base/util/nsMsgIncomingServer.h

@@ -1,70 +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 nsMsgIncomingServer_h__
-#define nsMsgIncomingServer_h__
-
-#include "nsIMsgIncomingServer.h"
-#include "nsIPref.h"
-#include "msgCore.h"
-#include "nsIFolder.h"
-#include "nsCOMPtr.h"
-
-class nsIMsgFolderCache;
-
-/*
- * base class for nsIMsgIncomingServer - derive your class from here
- * if you want to get some free implementation
- * 
- * this particular implementation is not meant to be used directly.
- */
-
-class NS_MSG_BASE nsMsgIncomingServer : public nsIMsgIncomingServer {
- public:
-  nsMsgIncomingServer();
-  virtual ~nsMsgIncomingServer();
-
-  NS_DECL_ISUPPORTS
-
-  NS_DECL_NSIMSGINCOMINGSERVER
-  
-private:
-  nsIPref *m_prefs;
-  char *m_serverKey;
-  nsCString m_password;
-  PRBool m_serverBusy;
-
-protected:
-  char *getPrefName(const char *serverKey, const char *pref);
-  char *getDefaultPrefName(const char *pref);
-
-  // these are private pref getters and setters for the password
-  // field. Callers should be using Get/Set Password
-  NS_IMETHOD GetPrefPassword(char * *aPassword);
-  NS_IMETHOD SetPrefPassword(const char * aPassword);
-  
-  nsCOMPtr <nsIFolder> m_rootFolder;
-  nsresult getDefaultCharPref(const char *pref, char **);
-  nsresult getDefaultBoolPref(const char *pref, PRBool *);
-  nsresult getDefaultIntPref(const char *pref, PRInt32 *);
-  
-  nsresult CreateRootFolder();
-
-};
-
-#endif // nsMsgIncomingServer_h__

mozilla/mailnews/base/util/nsMsgKeySet.h

@@ -1,115 +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 _nsMsgKeySet_H_
-#define _nsMsgKeySet_H_
-
-#include "msgCore.h"
-
-// nsMsgKeySet represents a set of articles.  Typically, it is the set of
-// read articles from a .newsrc file, but it can be used for other purposes
-// too.
-
-#if 0
-// If a MSG_NewsHost* is supplied to the creation routine, then that
-// MSG_NewsHost will be notified whenever a change is made to set.
-class MSG_NewsHost;
-#endif
-
-class NS_MSG_BASE nsMsgKeySet {
-public:
-  // Creates an empty set.
-  static nsMsgKeySet* Create(/* MSG_NewsHost* host = NULL*/);
-
-  // Creates a set from the list of numbers, as might be found in a
-  // newsrc file.
-  static nsMsgKeySet* Create(const char* str/* , MSG_NewsHost* host = NULL*/);
-  ~nsMsgKeySet();
-  
-  // FirstNonMember() returns the lowest non-member of the set that is
-  // greater than 0.
-  PRInt32 FirstNonMember();
-
-  // Output() converts to a string representation suitable for writing to a
-  // .newsrc file.  (The result must be freed by the caller using delete[].)
-  char* Output();		
-
-  // IsMember() returns whether the given article is a member of this set.
-  PRBool IsMember(PRInt32 art);
-  
-  // Add() adds the given article to the set.  (Returns 1 if a change was
-  // made, 0 if it was already there, and negative on error.)
-  int Add(PRInt32 art);
-  
-  // Remove() removes the given article from the set. 
-  int Remove(PRInt32 art);
-  
-  // AddRange() adds the (inclusive) given range of articles to the set.
-  int AddRange(PRInt32 first, PRInt32 last);
-  
-  // CountMissingInRange() takes an inclusive range of articles and returns
-  // the number of articles in that range which are not in the set.
-  PRInt32 CountMissingInRange(PRInt32 start, PRInt32 end);
-  
-  // FirstMissingRange() takes an inclusive range and finds the first range
-  // of articles that are not in the set.  If none, return zeros. 
-  int FirstMissingRange(PRInt32 min, PRInt32 max, PRInt32* first, PRInt32* last);
-  
-
-  // LastMissingRange() takes an inclusive range and finds the last range
-  // of articles that are not in the set.  If none, return zeros. 
-  int LastMissingRange(PRInt32 min, PRInt32 max, PRInt32* first, PRInt32* last);
-  
-  PRInt32 GetLastMember();
-  PRInt32 GetFirstMember();
-  void  SetLastMember(PRInt32 highWaterMark);
-  // For debugging only...
-  PRInt32 getLength() {return m_length;}
-  
-#ifdef DEBUG
-  static void RunTests();
-#endif
-
-protected:
-  nsMsgKeySet(/* MSG_NewsHost* host */);
-  nsMsgKeySet(const char* /* , MSG_NewsHost* host */);
-  PRBool Grow();
-  PRBool Optimize();
-  
-#ifdef DEBUG
-  static void test_decoder(const char*);
-  static void test_adder();
-  static void test_ranges();
-  static void test_member(PRBool with_cache);
-#endif
-  
-  PRInt32 *m_data;					/* the numbers composing the `chunks' */
-  PRInt32 m_data_size;				/* size of that malloc'ed block */
-  PRInt32 m_length;				/* active area */
-  
-  PRInt32 m_cached_value;			/* a potential set member, or -1 if unset*/
-  PRInt32 m_cached_value_index;		/* the index into `data' at which a search
-									   to determine whether `cached_value' was
-									   a member of the set ended. */
-#ifdef NEWSRC_DOES_HOST_STUFF
-  MSG_NewsHost* m_host;
-#endif
-};
-
-
-#endif /* _nsMsgKeySet_H_ */

mozilla/mailnews/base/util/nsMsgLineBuffer.cpp

@@ -1,384 +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) 1999 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "msgCore.h"
-#include "prlog.h"
-#include "nsMsgLineBuffer.h"
-
-#include "nsIInputStream.h" // used by nsMsgLineStreamBuffer
-
-MOZ_DECL_CTOR_COUNTER(nsByteArray);
-
-nsByteArray::nsByteArray()
-{
-	MOZ_COUNT_CTOR(nsByteArray);
-	m_buffer = NULL;
-	m_bufferSize = 0;
-	m_bufferPos = 0;
-}
-
-nsByteArray::~nsByteArray()
-{
-	MOZ_COUNT_DTOR(nsByteArray);
-	PR_FREEIF(m_buffer);
-}
-
-nsresult nsByteArray::GrowBuffer(PRUint32 desired_size, PRUint32 quantum)
-{
-	if (m_bufferSize < desired_size)
-	{
-		char *new_buf;
-		PRUint32 increment = desired_size - m_bufferSize;
-		if (increment < quantum) /* always grow by a minimum of N bytes */
-			increment = quantum;
-
-
-		new_buf = (m_buffer
-				 ? (char *) PR_REALLOC (m_buffer, (m_bufferSize + increment))
-				 : (char *) PR_MALLOC (m_bufferSize + increment));
-		if (! new_buf)
-			return NS_ERROR_OUT_OF_MEMORY;
-		m_buffer = new_buf;
-		m_bufferSize += increment;
-	}
-  return 0;
-}
-
-nsresult nsByteArray::AppendString(const char *string)
-{
-	PRUint32 strLength = (string) ? PL_strlen(string) : 0;
-	return AppendBuffer(string, strLength);
-
-}
-
-nsresult nsByteArray::AppendBuffer(const char *buffer, PRUint32 length)
-{
-	nsresult ret = NS_OK;
-	if (m_bufferPos + length > m_bufferSize)
-		ret = GrowBuffer(m_bufferPos + length, 1024);
-	if (ret == NS_OK)
-	{
-		memcpy(m_buffer + m_bufferPos, buffer, length);
-		m_bufferPos += length;
-	}
-	return ret;
-}
-
-MOZ_DECL_CTOR_COUNTER(nsMsgLineBuffer);
-
-nsMsgLineBuffer::nsMsgLineBuffer(nsMsgLineBufferHandler *handler, PRBool convertNewlinesP)
-{
-	MOZ_COUNT_CTOR(nsMsgLineBuffer);
-	m_handler = handler;
-	m_convertNewlinesP = convertNewlinesP;
-    m_lookingForCRLF = PR_TRUE;
-}
-
-nsMsgLineBuffer::~nsMsgLineBuffer()
-{
-	MOZ_COUNT_DTOR(nsMsgLineBuffer);
-}
-
-void
-nsMsgLineBuffer::SetLookingForCRLF(PRBool b)
-{
-  m_lookingForCRLF = b;
-}
-
-PRInt32	nsMsgLineBuffer::BufferInput(const char *net_buffer, PRInt32 net_buffer_size)
-{
-    int status = 0;
-    if (m_bufferPos > 0 && m_buffer && m_buffer[m_bufferPos - 1] == CR &&
-        net_buffer_size > 0 && net_buffer[0] != LF) {
-        /* The last buffer ended with a CR.  The new buffer does not start
-           with a LF.  This old buffer should be shipped out and discarded. */
-        PR_ASSERT(m_bufferSize > m_bufferPos);
-        if (m_bufferSize <= m_bufferPos) return -1;
-        status = ConvertAndSendBuffer();
-        if (status < 0) 
-			return status;
-        m_bufferPos = 0;
-    }
-    while (net_buffer_size > 0)
-	{
-        const char *net_buffer_end = net_buffer + net_buffer_size;
-        const char *newline = 0;
-        const char *s;
-        
-        
-        for (s = net_buffer; s < net_buffer_end; s++)
-		{
-          if (m_lookingForCRLF) {
-            /* Move forward in the buffer until the first newline.
-               Stop when we see CRLF, CR, or LF, or the end of the buffer.
-               *But*, if we see a lone CR at the *very end* of the buffer,
-               treat this as if we had reached the end of the buffer without
-               seeing a line terminator.  This is to catch the case of the
-               buffers splitting a CRLF pair, as in "FOO\r\nBAR\r" "\nBAZ\r\n".
-            */
-            if (*s == CR || *s == LF) {
-              newline = s;
-              if (newline[0] == CR) {
-                if (s == net_buffer_end - 1) {
-                  /* CR at end - wait for the next character. */
-                  newline = 0;
-                  break;
-                }
-                else if (newline[1] == LF) {
-                  /* CRLF seen; swallow both. */
-                  newline++;
-                }
-              }
-              newline++;
-              break;
-			}
-          }
-          else {
-            /* if not looking for a CRLF, stop at CR or LF.  (for example, when parsing the newsrc file).  this fixes #9896, where we'd lose the last line of anything we'd parse that used CR as the line break. */
-            if (*s == CR || *s == LF) {
-              newline = s;
-              newline++;
-              break;
-            }
-          }
-		}
-        
-        /* Ensure room in the net_buffer and append some or all of the current
-           chunk of data to it. */
-        {
-            const char *end = (newline ? newline : net_buffer_end);
-            PRUint32 desired_size = (end - net_buffer) + m_bufferPos + 1;
-            
-            if (desired_size >= m_bufferSize)
-            {
-                status = GrowBuffer (desired_size, 1024);
-                if (status < 0) 
-					return status;
-            }
-            memcpy (m_buffer + m_bufferPos, net_buffer, (end - net_buffer));
-            m_bufferPos += (end - net_buffer);
-        }
-        
-        /* Now m_buffer contains either a complete line, or as complete
-           a line as we have read so far.
-           
-           If we have a line, process it, and then remove it from `m_buffer'.
-           Then go around the loop again, until we drain the incoming data.
-           */
-        if (!newline)
-            return 0;
-        
-        status = ConvertAndSendBuffer();
-        if (status < 0) return status;
-        
-        net_buffer_size -= (newline - net_buffer);
-        net_buffer = newline;
-        m_bufferPos = 0;
-	}
-#ifdef DEBUG_bienvenu
-	printf("returning from buffer input m_bufferPos = %ld\n", m_bufferPos);
-#endif	
-    return 0;
-}
-
-PRInt32 nsMsgLineBuffer::HandleLine(char *line, PRUint32 line_length)
-{
-	NS_ASSERTION(PR_FALSE, "must override this method if you don't provide a handler");
-	return 0;
-}
-
-PRInt32 nsMsgLineBuffer::ConvertAndSendBuffer()
-{
-    /* Convert the line terminator to the native form.
-     */
-
-	char *buf = m_buffer;
-	PRInt32 length = m_bufferPos;
-
-    char* newline;
-    
-    PR_ASSERT(buf && length > 0);
-    if (!buf || length <= 0) 
-		return -1;
-    newline = buf + length;
-    
-    PR_ASSERT(newline[-1] == CR || newline[-1] == LF);
-    if (newline[-1] != CR && newline[-1] != LF)
-		return -1;
-    
-    if (!m_convertNewlinesP)
-	{
-	}
-#if (MSG_LINEBREAK_LEN == 1)
-    else if ((newline - buf) >= 2 &&
-             newline[-2] == CR &&
-             newline[-1] == LF)
-	{
-        /* CRLF -> CR or LF */
-        buf [length - 2] = MSG_LINEBREAK[0];
-        length--;
-	}
-    else if (newline > buf + 1 &&
-             newline[-1] != MSG_LINEBREAK[0])
-	{
-        /* CR -> LF or LF -> CR */
-        buf [length - 1] = MSG_LINEBREAK[0];
-	}
-#else
-    else if (((newline - buf) >= 2 && newline[-2] != CR) ||
-             ((newline - buf) >= 1 && newline[-1] != LF))
-	{
-        /* LF -> CRLF or CR -> CRLF */
-        length++;
-        buf[length - 2] = MSG_LINEBREAK[0];
-        buf[length - 1] = MSG_LINEBREAK[1];
-	}
-#endif
-    
-    return (m_handler) ? m_handler->HandleLine(buf, length) : HandleLine(buf, length);
-}
-
-// If there's still some data (non CRLF terminated) flush it out
-PRInt32 nsMsgLineBuffer::FlushLastLine()
-{
-	char *buf = m_buffer + m_bufferPos;
-	PRInt32 length = m_bufferPos - 1;
-	if (length > 0)
-		return (m_handler) ? m_handler->HandleLine(buf, length) : HandleLine(buf, length);
-	else
-		return 0;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// This is a utility class used to efficiently extract lines from an input stream by buffering
-// read but unprocessed stream data in a buffer. 
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-nsMsgLineStreamBuffer::nsMsgLineStreamBuffer(PRUint32 aBufferSize, const char * aEndOfLineToken, 
-											 PRBool aAllocateNewLines, PRBool aEatCRLFs) 
-											: m_eatCRLFs(aEatCRLFs), m_allocateNewLines(aAllocateNewLines),
-											  m_endOfLineToken(aEndOfLineToken)
-{
-	NS_PRECONDITION(aBufferSize > 0, "invalid buffer size!!!");
-	m_dataBuffer = nsnull;
-	m_startPos = nsnull;
-
-	// used to buffer incoming data by ReadNextLineFromInput
-	if (aBufferSize > 0)
-	{
-		m_dataBuffer = (char *) PR_CALLOC(sizeof(char) * aBufferSize);
-		m_startPos = m_dataBuffer;
-	}
-
-	m_dataBufferSize = aBufferSize;
-}
-
-nsMsgLineStreamBuffer::~nsMsgLineStreamBuffer()
-{
-	PR_FREEIF(m_dataBuffer); // release our buffer...
-}
-
-// the design for this method has an inherit bug: if the length of the line is greater than the size of m_dataBufferSize, 
-// then we'll never find the next line because we can't hold the whole line in memory. 
-// aInputStream - the input stream we want to read a line from
-// aPauseForMoreData is returned as PR_TRUE if the stream does not yet contain a line and we must wait for more
-// data to come into the stream.
-
-// Note to people wishing to modify this function: Be *VERY CAREFUL* this is a critical function used by all of
-// our mail protocols including imap, nntp, and pop. If you screw it up, you could break a lot of stuff.....
-
-char * nsMsgLineStreamBuffer::ReadNextLine(nsIInputStream * aInputStream, PRUint32 &aNumBytesInLine, PRBool &aPauseForMoreData)
-{
-	// try to extract a line from m_inputBuffer. If we don't have an entire line, 
-	// then read more bytes out from the stream. If the stream is empty then wait
-	// on the monitor for more data to come in.
-
-	NS_PRECONDITION(m_startPos && m_dataBufferSize > 0, "invalid input arguments for read next line from input");
-	
-	// initialize out values
-	aPauseForMoreData = PR_FALSE;
-	aNumBytesInLine = 0;
-	char * endOfLine = nsnull;
-
-	PRUint32 numBytesInBuffer = PL_strlen(m_startPos);
-	
-	if (numBytesInBuffer > 0) // any data in our internal buffer?
-		endOfLine = PL_strstr(m_startPos, m_endOfLineToken); // see if we already have a line ending...
-
-	// it's possible that we got here before the first time we receive data from the server
-	// so aInputStream will be nsnull...
-	if (!endOfLine && aInputStream) // get some more data from the server
-	{
-		PRUint32 numBytesInStream = 0;
-		PRUint32 numBytesCopied = 0;
-		aInputStream->Available(&numBytesInStream);
-		// if the number of bytes we want to read from the stream, is greater than the number
-		// of bytes left in our buffer, then we need to shift the start pos and its contents
-		// down to the beginning of m_dataBuffer...
-		PRUint32 numFreeBytesInBuffer = (m_dataBuffer + m_dataBufferSize) - (m_startPos + numBytesInBuffer);
-		if (numBytesInStream >= numFreeBytesInBuffer)
-		{
-			nsCRT::memcpy(m_dataBuffer, m_startPos, numBytesInBuffer);
-			m_dataBuffer[numBytesInBuffer] = '\0'; // make sure the end of the buffer is terminated
-			m_startPos = m_dataBuffer; // update the new start position
-			// update the number of free bytes in the buffer
-			numFreeBytesInBuffer = m_dataBufferSize - numBytesInBuffer;
-		}
-
-		PRUint32 numBytesToCopy = PR_MIN(numFreeBytesInBuffer - 1 /* leave one for a null terminator */, numBytesInStream);
-		// read the data into the end of our data buffer
-		if (numBytesToCopy > 0)
-		{
-			aInputStream->Read(m_startPos + numBytesInBuffer, numBytesToCopy, &numBytesCopied);
-			m_startPos[numBytesInBuffer + numBytesCopied] = '\0';
-		}
-
-		// okay, now that we've tried to read in more data from the stream, look for another end of line 
-		// character 
-		endOfLine = PL_strstr(m_startPos, m_endOfLineToken);
-
-	}
-
-	// okay, now check again for endOfLine.
-	if (endOfLine)
-	{
-		if (!m_eatCRLFs)
-			endOfLine += PL_strlen(m_endOfLineToken); // count for CRLF
-
-		// PR_CALLOC zeros out the allocated line
-		char* newLine = (char*) PR_CALLOC(endOfLine-m_startPos+1);
-		if (!newLine)
-			return nsnull;
-
-		nsCRT::memcpy(newLine, m_startPos, endOfLine-m_startPos); // copy the string into the new line buffer
-		aNumBytesInLine = endOfLine - m_startPos;
-
-		if (m_eatCRLFs)
-			endOfLine += PL_strlen(m_endOfLineToken); // advance past CRLF if we haven't already done so...
-
-		// now we need to update the data buffer to go past the line we just read out. 
-		if (PL_strlen(endOfLine) <= 0) // if no more data in the buffer, then just zero out the buffer...
-			m_startPos[0] = '\0';
-		else  // advance 
-			m_startPos = endOfLine; // move us up to the end of the line
-		return newLine;
-	}
-
-	aPauseForMoreData = PR_TRUE;
-	return nsnull; // if we somehow got here. we don't have another line in the buffer yet...need to wait for more data...
-}

mozilla/mailnews/base/util/nsMsgLineBuffer.h

@@ -1,113 +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) 1999 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-#ifndef _nsMsgLineBuffer_H
-#define _nsMsgLineBuffer_H
-
-#include "msgCore.h"    // precompiled header...
-
-// I can't believe I have to have this stupid class, but I can't find
-// anything suitable (nsStrImpl might be, when its done). nsIByteBuffer
-// would do, if I had a stream for input, which I don't.
-
-class NS_MSG_BASE nsByteArray 
-{
-public:
-	nsByteArray();
-	virtual ~nsByteArray();
-	PRUint32	GetSize() {return m_bufferSize;}
-	PRUint32	GetBufferPos() {return m_bufferPos;}
-	nsresult	GrowBuffer(PRUint32 desired_size, PRUint32 quantum = 1024);
-	nsresult	AppendString(const char *string);
-	nsresult	AppendBuffer(const char *buffer, PRUint32 length);
-	void		ResetWritePos() {m_bufferPos = 0;}
-	char		*GetBuffer() {return m_buffer;}
-protected:
-	char		*m_buffer;
-	PRUint32	m_bufferSize;
-	PRUint32	m_bufferPos;	// write Pos in m_buffer - where the next byte should go.
-};
-
-
-class NS_MSG_BASE nsMsgLineBufferHandler : public nsByteArray
-{
-public:
-	virtual PRInt32 HandleLine(char *line, PRUint32 line_length) = 0;
-};
-
-class NS_MSG_BASE nsMsgLineBuffer : public nsByteArray
-{
-public:
-	nsMsgLineBuffer(nsMsgLineBufferHandler *handler, PRBool convertNewlinesP);
-
-	virtual ~nsMsgLineBuffer();
-	PRInt32	BufferInput(const char *net_buffer, PRInt32 net_buffer_size);
-	// Not sure why anyone cares, by NNTPHost seems to want to know the buf pos.
-	PRUint32	GetBufferPos() {return m_bufferPos;}
-
-	virtual PRInt32 HandleLine(char *line, PRUint32 line_length);
-	// flush last line, though it won't be CRLF terminated.
-	virtual PRInt32 FlushLastLine();
-protected:
-	nsMsgLineBuffer(PRBool convertNewlinesP);
-
-	PRInt32 ConvertAndSendBuffer();
-    void SetLookingForCRLF(PRBool b);
-
-	nsMsgLineBufferHandler *m_handler;
-	PRBool		m_convertNewlinesP;
-    PRBool      m_lookingForCRLF; 
-};
-
-// I'm adding this utility class here for lack of a better place. This utility class is similar to nsMsgLineBuffer
-// except it works from an input stream. It is geared towards efficiently parsing new lines out of a stream by storing
-// read but unprocessed bytes in a buffer. I envision the primary use of this to be our mail protocols such as imap, news and
-// pop which need to process line by line data being returned in the form of a proxied stream from the server.
-
-class nsIInputStream;
-
-class NS_MSG_BASE nsMsgLineStreamBuffer
-{
-public:
-	// aBufferSize -- size of the buffer you want us to use for buffering stream data
-	// aEndOfLinetoken -- The delimeter string to be used for determining the end of line. This 
-	//				      allows us to parse platform specific end of line endings by making it
-	//					  a parameter.
-	// aAllocateNewLines -- PR_TRUE if you want calls to ReadNextLine to allocate new memory for the line. 
-	//						if false, the char * returned is just a ptr into the buffer. Subsequent calls to
-	//						ReadNextLine will alter the data so your ptr only has a life time of a per call.
-	// aEatCRLFs  -- PR_TRUE if you don't want to see the CRLFs on the lines returned by ReadNextLine. 
-	//				 PR_FALSE if you do want to see them.
-	nsMsgLineStreamBuffer(PRUint32 aBufferSize, const char * aEndOfLineToken, PRBool aAllocateNewLines, PRBool aEatCRLFs = PR_TRUE); // specify the size of the buffer you want the class to use....
-	virtual ~nsMsgLineStreamBuffer();
-
-	// Caller must free the line returned using PR_Free
-	// aEndOfLinetoken -- delimeter used to denote the end of a line.
-	// aNumBytesInLine -- The number of bytes in the line returned
-	// aPauseForMoreData -- There is not enough data in the stream to make a line at this time...
-	char * ReadNextLine(nsIInputStream * aInputStream, PRUint32 &anumBytesInLine, PRBool &aPauseForMoreData);
-protected:
-	PRBool m_eatCRLFs;
-	PRBool m_allocateNewLines;
-	char * m_dataBuffer;
-	char * m_startPos;
-	const char * m_endOfLineToken;
-	PRUint32 m_dataBufferSize;
-};
-
-
-#endif

mozilla/mailnews/base/util/nsMsgMailNewsUrl.cpp

@@ -1,399 +0,0 @@
-/* -*- 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) 1999 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "msgCore.h"
-#include "nsMsgMailNewsUrl.h"
-#include "nsMsgBaseCID.h"
-#include "nsIMsgMailSession.h"
-#include "nsXPIDLString.h"
-
-static NS_DEFINE_CID(kUrlListenerManagerCID, NS_URLLISTENERMANAGER_CID);
-static NS_DEFINE_CID(kStandardUrlCID, NS_STANDARDURL_CID);
-static NS_DEFINE_CID(kMsgMailSessionCID, NS_MSGMAILSESSION_CID);
-
-nsMsgMailNewsUrl::nsMsgMailNewsUrl()
-{
-    NS_INIT_REFCNT();
- 
-	// nsIURI specific state
-	m_errorMessage = nsnull;
-	m_runningUrl = PR_FALSE;
-	m_updatingFolder = PR_FALSE;
-
-	nsComponentManager::CreateInstance(kUrlListenerManagerCID, nsnull, nsCOMTypeInfo<nsIUrlListenerManager>::GetIID(), (void **) getter_AddRefs(m_urlListeners));
-	nsComponentManager::CreateInstance(kStandardUrlCID, nsnull, nsCOMTypeInfo<nsIURL>::GetIID(), (void **) getter_AddRefs(m_baseURL));
-}
- 
-nsMsgMailNewsUrl::~nsMsgMailNewsUrl()
-{
-	PR_FREEIF(m_errorMessage);
-}
-  
-NS_IMPL_ADDREF(nsMsgMailNewsUrl);
-NS_IMPL_RELEASE(nsMsgMailNewsUrl);
-
-nsresult nsMsgMailNewsUrl::QueryInterface(const nsIID &aIID, void** aInstancePtr)
-{
-    if (NULL == aInstancePtr) {
-        return NS_ERROR_NULL_POINTER;
-    }
-    if (aIID.Equals(nsCOMTypeInfo<nsIURI>::GetIID())) {
-        *aInstancePtr = (void*) ((nsIURI*)this);
-        NS_ADDREF_THIS();
-        return NS_OK;
-    }
-	if (aIID.Equals(nsCOMTypeInfo<nsIURL>::GetIID())) {
-        *aInstancePtr = (void*) ((nsIURL*)this);
-        NS_ADDREF_THIS();
-        return NS_OK;
-    }
-	if (aIID.Equals(nsCOMTypeInfo<nsIMsgMailNewsUrl>::GetIID()))
-	{
-		*aInstancePtr = (void *) ((nsIMsgMailNewsUrl*) this);
-		NS_ADDREF_THIS();
-		return NS_OK;
-	}
- 
-	if (aIID.Equals(nsCOMTypeInfo<nsISupports>::GetIID()))    
-	{
-		*aInstancePtr = (void *) ((nsIMsgMailNewsUrl*) this);
-		NS_ADDREF_THIS();
-		return NS_OK;
-	}
-#if defined(NS_DEBUG)
-    /*
-     * Check for the debug-only interface indicating thread-safety
-     */
-    static NS_DEFINE_IID(kIsThreadsafeIID, NS_ISTHREADSAFE_IID);
-    if (aIID.Equals(kIsThreadsafeIID)) {
-        return NS_OK;
-    }
-#endif
-    return NS_NOINTERFACE;
-}
-
-////////////////////////////////////////////////////////////////////////////////////
-// Begin nsIMsgMailNewsUrl specific support
-////////////////////////////////////////////////////////////////////////////////////
-
-nsresult nsMsgMailNewsUrl::GetUrlState(PRBool * aRunningUrl)
-{
-	if (aRunningUrl)
-		*aRunningUrl = m_runningUrl;
-
-	return NS_OK;
-}
-
-nsresult nsMsgMailNewsUrl::SetUrlState(PRBool aRunningUrl, nsresult aExitCode)
-{
-	m_runningUrl = aRunningUrl;
-	nsCOMPtr <nsIMsgStatusFeedback> statusFeedback;
-
-	if (NS_SUCCEEDED(GetStatusFeedback(getter_AddRefs(statusFeedback))) && statusFeedback)
-	{
-		if (m_runningUrl)
-			statusFeedback->StartMeteors();
-		else
-		{
-			statusFeedback->ShowProgress(0);
-			statusFeedback->StopMeteors();
-		}
-	}
-	if (m_urlListeners)
-	{
-		if (m_runningUrl)
-		{
-			m_urlListeners->OnStartRunningUrl(this);
-		}
-		else
-		{
-			m_urlListeners->OnStopRunningUrl(this, aExitCode);
-		}
-	}
-
-	return NS_OK;
-}
-
-nsresult nsMsgMailNewsUrl::RegisterListener (nsIUrlListener * aUrlListener)
-{
-	if (m_urlListeners)
-		m_urlListeners->RegisterListener(aUrlListener);
-	return NS_OK;
-}
-
-nsresult nsMsgMailNewsUrl::UnRegisterListener (nsIUrlListener * aUrlListener)
-{
-	if (m_urlListeners)
-		m_urlListeners->UnRegisterListener(aUrlListener);
-	return NS_OK;
-}
-
-nsresult nsMsgMailNewsUrl::SetErrorMessage (const char * errorMessage)
-{
-	// functionality has been moved to nsIMsgStatusFeedback
-	return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-nsresult nsMsgMailNewsUrl::GetErrorMessage (char ** errorMessage)
-{
-	// functionality has been moved to nsIMsgStatusFeedback
-	return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::GetServer(nsIMsgIncomingServer ** aIncomingServer)
-{
-	// mscott --> we could cache a copy of the server here....but if we did, we run
-	// the risk of leaking the server if any single url gets leaked....of course that
-	// shouldn't happen...but it could. so i'm going to look it up every time and
-	// we can look at caching it later.
-
-	nsXPIDLCString host;
-	nsXPIDLCString scheme;
-
-	nsresult rv = GetHost(getter_Copies(host));
-	rv = GetScheme(getter_Copies(scheme));
-    if (NS_SUCCEEDED(rv))
-    {
-        NS_WITH_SERVICE(nsIMsgMailSession, session, kMsgMailSessionCID, &rv); 
-        if (NS_FAILED(rv)) return rv;
-        
-        nsCOMPtr<nsIMsgAccountManager> accountManager;
-        rv = session->GetAccountManager(getter_AddRefs(accountManager));
-        if(NS_FAILED(rv)) return rv;
-        
-        nsCOMPtr<nsIMsgIncomingServer> server;
-        rv = accountManager->FindServer(GetUserName(),
-                                        host,
-                                        scheme,
-                                        aIncomingServer);
-    }
-
-    return rv;
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::SetStatusFeedback(nsIMsgStatusFeedback *aMsgFeedback)
-{
-	if (aMsgFeedback)
-		m_statusFeedback = do_QueryInterface(aMsgFeedback);
-	return NS_OK;
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::GetStatusFeedback(nsIMsgStatusFeedback **aMsgFeedback)
-{
-	nsresult rv = NS_OK;
-	// note: it is okay to return a null status feedback and not return an error
-	// it's possible the url really doesn't have status feedback
-	if (!m_statusFeedback)
-	{
-		NS_WITH_SERVICE(nsIMsgMailSession, mailSession, kMsgMailSessionCID, &rv); 
-
-		if(NS_SUCCEEDED(rv))
-			mailSession->GetTemporaryMsgStatusFeedback(getter_AddRefs(m_statusFeedback));
-	}
-	if (aMsgFeedback)
-	{
-		*aMsgFeedback = m_statusFeedback;
-		NS_IF_ADDREF(*aMsgFeedback);
-	}
-	else
-		rv = NS_ERROR_NULL_POINTER;
-	return rv;
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::GetUpdatingFolder(PRBool *aResult)
-{
-	if (!aResult)
-		return NS_ERROR_NULL_POINTER;
-	*aResult = m_updatingFolder;
-	return NS_OK;
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::SetUpdatingFolder(PRBool updatingFolder)
-{
-	m_updatingFolder = updatingFolder;
-	return NS_OK;
-}
-
-
-////////////////////////////////////////////////////////////////////////////////////
-// End nsIMsgMailNewsUrl specific support
-////////////////////////////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////////////////////////////////
-// Begin nsIURI support
-////////////////////////////////////////////////////////////////////////////////////
-
-
-NS_IMETHODIMP nsMsgMailNewsUrl::GetSpec(char * *aSpec)
-{
-	return m_baseURL->GetSpec(aSpec);
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::SetSpec(const char * aSpec)
-{
-	return m_baseURL->SetSpec(aSpec);
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::GetScheme(char * *aScheme)
-{
-	return m_baseURL->GetScheme(aScheme);
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::SetScheme(const char * aScheme)
-{
-	return m_baseURL->SetScheme(aScheme);
-}
-
-
-NS_IMETHODIMP nsMsgMailNewsUrl::GetPreHost(char * *aPreHost)
-{
-	return m_baseURL->GetPreHost(aPreHost);
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::SetPreHost(const char * aPreHost)
-{
-	return m_baseURL->SetPreHost(aPreHost);
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::GetHost(char * *aHost)
-{
-	return m_baseURL->GetHost(aHost);
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::SetHost(const char * aHost)
-{
-	return m_baseURL->SetHost(aHost);
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::GetPort(PRInt32 *aPort)
-{
-	return m_baseURL->GetPort(aPort);
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::SetPort(PRInt32 aPort)
-{
-	return m_baseURL->SetPort(aPort);
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::GetPath(char * *aPath)
-{
-	return m_baseURL->GetPath(aPath);
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::SetPath(const char * aPath)
-{
-	return m_baseURL->SetPath(aPath);
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::Equals(nsIURI *other, PRBool *_retval)
-{
-	return m_baseURL->Equals(other, _retval);
-}
-
-
-NS_IMETHODIMP nsMsgMailNewsUrl::Clone(nsIURI **_retval)
-{
-	return m_baseURL->Clone(_retval);
-}	
-
-NS_IMETHODIMP nsMsgMailNewsUrl::SetRelativePath(const char *i_RelativePath)
-{
-	return m_baseURL->SetRelativePath(i_RelativePath);
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::GetDirectory(char * *aDirectory)
-{
-	return m_baseURL->GetDirectory(aDirectory);
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::SetDirectory(const char *aDirectory)
-{
-
-	return m_baseURL->SetDirectory(aDirectory);
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::GetFileName(char * *aFileName)
-{
-	return m_baseURL->GetFileName(aFileName);
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::GetFileBaseName(char * *aFileBaseName)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::SetFileBaseName(const char * aFileBaseName)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::GetFileExtension(char * *aFileExtension)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::SetFileExtension(const char * aFileExtension)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::SetFileName(const char * aFileName)
-{
-	return m_baseURL->SetFileName(aFileName);
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::GetParam(char * *aParam)
-{
-	return m_baseURL->GetParam(aParam);
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::SetParam(const char *aParam)
-{
-	return m_baseURL->SetParam(aParam);
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::GetQuery(char * *aQuery)
-{
-	return m_baseURL->GetQuery(aQuery);
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::SetQuery(const char *aQuery)
-{
-	return m_baseURL->SetQuery(aQuery);
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::GetRef(char * *aRef)
-{
-	return m_baseURL->GetRef(aRef);
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::SetRef(const char *aRef)
-{
-	return m_baseURL->SetRef(aRef);
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::GetFilePath(char **o_DirFile)
-{
-	return m_baseURL->GetFilePath(o_DirFile);
-}
-
-NS_IMETHODIMP nsMsgMailNewsUrl::SetFilePath(const char *i_DirFile)
-{
-	return m_baseURL->SetFilePath(i_DirFile);
-}
-

mozilla/mailnews/base/util/nsMsgMailNewsUrl.h

@@ -1,66 +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 nsMsgMailNewsUrl_h___
-#define nsMsgMailNewsUrl_h___
-
-#include "nscore.h"
-#include "nsISupports.h"
-#include "nsIUrlListener.h"
-#include "nsIUrlListenerManager.h"
-#include "nsIMsgStatusFeedback.h"
-#include "nsCOMPtr.h"
-#include "nsIMsgMailNewsUrl.h"
-#include "nsIURL.h"
-
-///////////////////////////////////////////////////////////////////////////////////
-// Okay, I found that all of the mail and news url interfaces needed to support
-// several common interfaces (in addition to those provided through nsIURI). 
-// So I decided to group them all in this implementation so we don't have to
-// duplicate the code.
-//
-//////////////////////////////////////////////////////////////////////////////////
-
-class NS_MSG_BASE nsMsgMailNewsUrl : public nsIMsgMailNewsUrl
-{
-public:
-	nsMsgMailNewsUrl();
-
-	NS_DECL_ISUPPORTS
-    NS_DECL_NSIMSGMAILNEWSURL
-    NS_DECL_NSIURI
-    NS_DECL_NSIURL
-
-protected:
-	virtual ~nsMsgMailNewsUrl();
-
-	// a helper function I needed from derived urls...
-	virtual const char * GetUserName() = 0;
-
-	nsCOMPtr<nsIURL> m_baseURL;
-	nsCOMPtr<nsIMsgStatusFeedback> m_statusFeedback;
-	char		*m_errorMessage;
-	PRBool		m_runningUrl;
-	PRBool		m_updatingFolder;
-
-	// manager of all of current url listeners....
-	nsCOMPtr<nsIUrlListenerManager> m_urlListeners;
-};
-
-
-#endif /* nsMsgMailNewsUrl_h___ */

mozilla/mailnews/base/util/nsMsgProtocol.cpp

@@ -1,369 +0,0 @@
-/* -*- 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.
- */
-
-#include "msgCore.h"
-#include "nsMsgProtocol.h"
-#include "nsIMsgMailNewsUrl.h"
-#include "nsISocketTransportService.h"
-#include "nsXPIDLString.h"
-#include "nsSpecialSystemDirectory.h"
-#include "nsILoadGroup.h"
-#include "nsIIOService.h"
-
-static NS_DEFINE_CID(kSocketTransportServiceCID, NS_SOCKETTRANSPORTSERVICE_CID);
-static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
-
-NS_IMPL_ISUPPORTS3(nsMsgProtocol, nsIStreamListener, nsIStreamObserver, nsIChannel)
-
-nsMsgProtocol::nsMsgProtocol()
-{
-	NS_INIT_REFCNT();
-	m_flags = 0;
-	m_startPosition = 0;
-	m_readCount = 0;
-	m_socketIsOpen = PR_FALSE;
-		
-	m_tempMsgFileSpec = nsSpecialSystemDirectory(nsSpecialSystemDirectory::OS_TemporaryDirectory);
-	m_tempMsgFileSpec += "tempMessage.eml";
-}
-
-nsMsgProtocol::~nsMsgProtocol()
-{}
-
-nsresult nsMsgProtocol::OpenNetworkSocket(nsIURI * aURL) // open a connection on this url
-{
-	nsresult rv = NS_OK;
-	nsXPIDLCString hostName;
-	PRInt32 port = 0;
-
-	m_readCount = -1; // with socket connections we want to read as much data as arrives
-	m_startPosition = 0;
-
-    NS_WITH_SERVICE(nsISocketTransportService, socketService, kSocketTransportServiceCID, &rv);
-
-	if (NS_SUCCEEDED(rv) && aURL)
-	{
-		aURL->GetPort(&port);
-		aURL->GetHost(getter_Copies(hostName));
-
-		rv = socketService->CreateTransport(hostName, port, nsnull, getter_AddRefs(m_channel));
-		if (NS_SUCCEEDED(rv) && m_channel)
-		{
-			m_socketIsOpen = PR_FALSE;
-			rv = SetupTransportState();
-		}
-	}
-
-	return rv;
-}
-
-nsresult nsMsgProtocol::OpenFileSocket(nsIURI * aURL, const nsFileSpec * aFileSpec, PRUint32 aStartPosition, PRInt32 aReadCount)
-{
-	// mscott - file needs to be encoded directly into aURL. I should be able to get
-	// rid of this method completely.
-
-	nsresult rv = NS_OK;
-	m_startPosition = aStartPosition;
-	m_readCount = aReadCount;
-
-    NS_WITH_SERVICE(nsIIOService, netService, kIOServiceCID, &rv);
-	if (NS_SUCCEEDED(rv) && aURL)
-	{
-		// extract the file path from the uri...
-		nsXPIDLCString filePath;
-		aURL->GetPath(getter_Copies(filePath));
-		char * urlSpec = PR_smprintf("file://%s", (const char *) filePath);
-
-		rv = netService->NewChannel("Load", urlSpec, 
-                                    nsnull,     // null base URI
-                                    nsnull,     // null load group
-                                    nsnull,     // null eventsink getter
-                                    getter_AddRefs(m_channel));
-		PR_FREEIF(urlSpec);
-
-		if (NS_SUCCEEDED(rv) && m_channel)
-		{
-			m_socketIsOpen = PR_FALSE;
-			// rv = SetupTransportState();
-		}
-	}
-
-	return rv;
-}
-
-nsresult nsMsgProtocol::SetupTransportState()
-{
-	nsresult rv = NS_OK;
-
-	if (!m_socketIsOpen && m_channel)
-	{
-		rv = m_channel->OpenOutputStream(0 /* start position */, getter_AddRefs(m_outputStream));
-
-		NS_ASSERTION(NS_SUCCEEDED(rv), "unable to create an output stream");
-		// we want to open the stream 
-	} // if m_transport
-
-	return rv;
-}
-
-nsresult nsMsgProtocol::CloseSocket()
-{
-	// release all of our socket state
-	m_socketIsOpen = PR_FALSE;
-	m_outputStream = null_nsCOMPtr();
-	m_channel = null_nsCOMPtr();
-
-	return NS_OK;
-}
-
-/*
- * Writes the data contained in dataBuffer into the current output stream. It also informs
- * the transport layer that this data is now available for transmission.
- * Returns a positive number for success, 0 for failure (not all the bytes were written to the
- * stream, etc). We need to make another pass through this file to install an error system (mscott)
- */
-
-PRInt32 nsMsgProtocol::SendData(nsIURI * aURL, const char * dataBuffer)
-{
-	PRUint32 writeCount = 0; 
-	PRInt32 status = 0; 
-
-//	NS_PRECONDITION(m_outputStream, "oops....we don't have an output stream...how did that happen?");
-	if (dataBuffer && m_outputStream)
-	{
-		status = m_outputStream->Write(dataBuffer, PL_strlen(dataBuffer), &writeCount);
-	}
-
-	return status;
-}
-
-// Whenever data arrives from the connection, core netlib notifices the protocol by calling
-// OnDataAvailable. We then read and process the incoming data from the input stream. 
-NS_IMETHODIMP nsMsgProtocol::OnDataAvailable(nsIChannel * /* aChannel */, nsISupports *ctxt, nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count)
-{
-	// right now, this really just means turn around and churn through the state machine
-	nsCOMPtr<nsIURI> uri = do_QueryInterface(ctxt);
-	return ProcessProtocolState(uri, inStr, sourceOffset, count);
-}
-
-NS_IMETHODIMP nsMsgProtocol::OnStartRequest(nsIChannel * aChannel, nsISupports *ctxt)
-{
-	nsresult rv = NS_OK;
-	nsCOMPtr <nsIMsgMailNewsUrl> aMsgUrl = do_QueryInterface(ctxt, &rv);
-	if (NS_SUCCEEDED(rv) && aMsgUrl)
-		rv = aMsgUrl->SetUrlState(PR_TRUE, NS_OK);
-
-	// if we are set up as a channel, we should notify our channel listener that we are starting...
-	// so pass in ourself as the channel and not the underlying socket or file channel the protocol
-	// happens to be using
-	if (m_channelListener)
-		rv = m_channelListener->OnStartRequest(this, m_channelContext);
-
-	return rv;
-}
-
-// stop binding is a "notification" informing us that the stream associated with aURL is going away. 
-NS_IMETHODIMP nsMsgProtocol::OnStopRequest(nsIChannel * aChannel, nsISupports *ctxt, nsresult aStatus, const PRUnichar* aMsg)
-{
-	nsresult rv = NS_OK;
-	nsCOMPtr <nsIMsgMailNewsUrl> aMsgUrl = do_QueryInterface(ctxt, &rv);
-	if (NS_SUCCEEDED(rv) && aMsgUrl)
-		rv = aMsgUrl->SetUrlState(PR_FALSE, aStatus);
-
-	// if we are set up as a channel, we should notify our channel listener that we are starting...
-	// so pass in ourself as the channel and not the underlying socket or file channel the protocol
-	// happens to be using
-	if (m_channelListener)
-		rv = m_channelListener->OnStopRequest(this, m_channelContext, aStatus, aMsg);
-
-	return rv;
-}
-
-nsresult nsMsgProtocol::LoadUrl(nsIURI * aURL, nsISupports * aConsumer)
-{
-	// okay now kick us off to the next state...
-	// our first state is a process state so drive the state machine...
-	nsresult rv = NS_OK;
-	nsCOMPtr <nsIMsgMailNewsUrl> aMsgUrl = do_QueryInterface(aURL);
-
-	if (NS_SUCCEEDED(rv))
-	{
-		rv = aMsgUrl->SetUrlState(PR_TRUE, NS_OK); // set the url as a url currently being run...
-
-    // if the url is given a stream consumer then we should use it to forward calls to...
-    if (!m_channelListener && aConsumer) // if we don't have a registered listener already
-    {
-      m_channelListener = do_QueryInterface(aConsumer);
-      if (!m_channelContext)
-        m_channelContext = do_QueryInterface(aURL);
-    }
-
-		if (!m_socketIsOpen)
-		{
-			nsCOMPtr<nsISupports> urlSupports = do_QueryInterface(aURL);
-
-			// put us in a state where we are always notified of incoming data
-			m_channel->AsyncRead(m_startPosition, m_readCount, urlSupports ,this /* stream observer */);
-			m_socketIsOpen = PR_TRUE; // mark the channel as open
-		} // if we got an event queue service
-		else  // the connection is already open so we should begin processing our new url...
-			rv = ProcessProtocolState(aURL, nsnull, 0, 0); 
-	}
-
-	return rv;
-}
-
-///////////////////////////////////////////////////////////////////////
-// The rest of this file is mostly nsIChannel mumbo jumbo stuff
-///////////////////////////////////////////////////////////////////////
-
-nsresult nsMsgProtocol::SetUrl(nsIURI * aURL)
-{
-	m_url = dont_QueryInterface(aURL);
-	return NS_OK;
-}
-
-nsresult nsMsgProtocol::SetLoadGroup(nsILoadGroup * aLoadGroup)
-{
-	m_loadGroup = dont_QueryInterface(aLoadGroup);
-	return NS_OK;
-}
-
-NS_IMETHODIMP nsMsgProtocol::GetURI(nsIURI * *aURI)
-{
-	nsresult rv = NS_OK;
-	if (aURI)
-	{
-		if (m_url)
-			rv = m_url->QueryInterface(NS_GET_IID(nsIURI), (void **) aURI);
-		else
-			*aURI = nsnull;
-	}
-	else
-		rv = NS_ERROR_NULL_POINTER;
-	return rv;
-}
- 
-NS_IMETHODIMP nsMsgProtocol::OpenInputStream(PRUint32 startPosition, PRInt32 readCount, nsIInputStream **_retval)
-{
-	return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMsgProtocol::OpenOutputStream(PRUint32 startPosition, nsIOutputStream **_retval)
-{
-	return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMsgProtocol::AsyncOpen(nsIStreamObserver *observer, nsISupports* ctxt)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMsgProtocol::AsyncRead(PRUint32 startPosition, PRInt32 readCount, nsISupports *ctxt, nsIStreamListener *listener)
-{
-	// set the stream listener and then load the url
-	m_channelContext = ctxt;
-	m_channelListener = listener;
-
-	// the following load group code is completely bogus....
-	nsresult rv = NS_OK;
-	if (m_loadGroup)
-	{
-		nsCOMPtr<nsILoadGroupListenerFactory> factory;
-		//
-		// Create a load group "proxy" listener...
-		//
-		rv = m_loadGroup->GetGroupListenerFactory(getter_AddRefs(factory));
-		if (factory) 
-		{
-			nsCOMPtr<nsIStreamListener> newListener;
-			rv = factory->CreateLoadGroupListener(m_channelListener, getter_AddRefs(newListener));
-			if (NS_SUCCEEDED(rv)) 
-				m_channelListener = newListener;
-		}
-	} // if aLoadGroup
-
-	return LoadUrl(m_url, nsnull);
-}
-
-NS_IMETHODIMP nsMsgProtocol::AsyncWrite(nsIInputStream *fromStream, PRUint32 startPosition, PRInt32 writeCount, nsISupports *ctxt, nsIStreamObserver *observer)
-{
-	return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMsgProtocol::GetLoadAttributes(nsLoadFlags *aLoadAttributes)
-{
-	return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMsgProtocol::SetLoadAttributes(nsLoadFlags aLoadAttributes)
-{
-	return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMsgProtocol::GetContentType(char * *aContentType)
-{
-	*aContentType = nsCRT::strdup("message/rfc822");
-	return NS_OK;
-}
-
-NS_IMETHODIMP nsMsgProtocol::GetContentLength(PRInt32 * aContentLength)
-{
-  *aContentLength = -1;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsMsgProtocol::GetOwner(nsISupports * *aPrincipal)
-{
-	return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMsgProtocol::SetOwner(nsISupports * aPrincipal)
-{
-	return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMsgProtocol::GetLoadGroup(nsILoadGroup * *aLoadGroup)
-{
-	return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// From nsIRequest
-////////////////////////////////////////////////////////////////////////////////
-
-NS_IMETHODIMP nsMsgProtocol::IsPending(PRBool *result)
-{
-    *result = PR_TRUE;
-    return NS_OK; 
-}
-
-NS_IMETHODIMP nsMsgProtocol::Cancel()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMsgProtocol::Suspend()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMsgProtocol::Resume()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}

mozilla/mailnews/base/util/nsMsgProtocol.h

@@ -1,108 +0,0 @@
-/* -*- 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.
- */
-
-#ifndef nsMsgProtocol_h__
-#define nsMsgProtocol_h__
-
-#include "nsIStreamListener.h"
-#include "nsIInputStream.h"
-#include "nsIOutputStream.h"
-#include "nsIEventQueue.h"
-#include "nsIChannel.h"
-#include "nsIURL.h"
-#include "nsILoadGroup.h"
-#include "nsCOMPtr.h"
-
-// This is a helper class used to encapsulate code shared between all of the
-// mailnews protocol objects (imap, news, pop, smtp, etc.) In particular,
-// it unifies the core networking code for the protocols. My hope is that
-// this will make unification with Necko easier as we'll only have to change
-// this class and not all of the mailnews protocols.
-class NS_MSG_BASE nsMsgProtocol : public nsIStreamListener, public nsIChannel
-{
-public:
-	nsMsgProtocol();
-	virtual ~nsMsgProtocol();
-
-	NS_DECL_ISUPPORTS
-	// nsIChannel support
-	NS_DECL_NSICHANNEL
-	NS_DECL_NSIREQUEST
-  
-  NS_DECL_NSISTREAMLISTENER
-  NS_DECL_NSISTREAMOBSERVER
-
-	// LoadUrl -- A protocol typically overrides this function, sets up any local state for the url and
-	// then calls the base class which opens the socket if it needs opened. If the socket is 
-	// already opened then we just call ProcessProtocolState to start the churning process.
-	// aConsumer is the consumer for the url. It can be null if this argument is not appropriate
-	virtual nsresult LoadUrl(nsIURI * aURL, nsISupports * aConsumer = nsnull);
-
-	virtual nsresult SetUrl(nsIURI * aURL); // sometimes we want to set the url before we load it
-	virtual nsresult SetLoadGroup(nsILoadGroup * aLoadGroup);
-
-	// Flag manipulators
-	PRBool TestFlag  (PRUint32 flag) {return flag & m_flags;}
-	void   SetFlag   (PRUint32 flag) { m_flags |= flag; }
-	void   ClearFlag (PRUint32 flag) { m_flags &= ~flag; }
-
-protected:
-	// methods for opening and closing a socket with core netlib....
-	// mscott -okay this is lame. I should break this up into a file protocol and a socket based
-	// protocool class instead of cheating and putting both methods here...
-	virtual nsresult OpenNetworkSocket(nsIURI * aURL); // open a connection on this url
-	virtual nsresult OpenFileSocket(nsIURI * aURL, const nsFileSpec * aFileSpec, PRUint32 aStartPosition, PRInt32 aReadCount); // used to open a file socket connection
-
-	// a Protocol typically overrides this method. They free any of their own connection state and then
-	// they call up into the base class to free the generic connection objects
-	virtual nsresult CloseSocket(); 
-
-	virtual nsresult SetupTransportState(); // private method used by OpenNetworkSocket and OpenFileSocket
-
-	// ProcessProtocolState - This is the function that gets churned by calls to OnDataAvailable. 
-	// As data arrives on the socket, OnDataAvailable calls ProcessProtocolState.
-	
-	virtual nsresult ProcessProtocolState(nsIURI * url, nsIInputStream * inputStream, 
-									      PRUint32 sourceOffset, PRUint32 length) = 0;
-
-	// SendData -- Writes the data contained in dataBuffer into the current output stream. 
-	// It also informs the transport layer that this data is now available for transmission.
-	// Returns a positive number for success, 0 for failure (not all the bytes were written to the
-	// stream, etc). 
-	virtual PRInt32 SendData(nsIURI * aURL, const char * dataBuffer);
-
-	// Ouput stream for writing commands to the socket
-	nsCOMPtr<nsIChannel>		m_channel; 
-	nsCOMPtr<nsIOutputStream>	m_outputStream;   // this will be obtained from the transport interface
-
-	PRBool	  m_socketIsOpen; // mscott: we should look into keeping this state in the nsSocketTransport...
-							  // I'm using it to make sure I open the socket the first time a URL is loaded into the connection
-	PRUint32	m_flags; // used to store flag information
-	PRUint32	m_startPosition;
-	PRInt32		m_readCount;
-
-	nsFileSpec	m_tempMsgFileSpec;  // we currently have a hack where displaying a msg involves writing it to a temp file first
-
-	// the following is a catch all for nsIChannel related data
-	nsCOMPtr<nsIURI>  m_url; // the running url
-	nsCOMPtr<nsIStreamListener> m_channelListener;
-	nsCOMPtr<nsISupports>		m_channelContext;
-	nsCOMPtr<nsILoadGroup>		m_loadGroup;
-};
-
-#endif /* nsMsgProtocol_h__ */

mozilla/mailnews/base/util/nsMsgTxn.cpp

@@ -1,99 +0,0 @@
-/* -*- 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, 1999 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "nsMsgTxn.h"
-static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
-static NS_DEFINE_IID(kITransactionIID, NS_ITRANSACTION_IID);
-
-NS_IMPL_ADDREF(nsMsgTxn)
-NS_IMPL_RELEASE(nsMsgTxn)
-
-// note that aEditor is not refcounted
-nsMsgTxn::nsMsgTxn()
-{
-  NS_INIT_REFCNT();
-}
-
-nsMsgTxn::~nsMsgTxn()
-{
-}
-
-NS_IMETHODIMP nsMsgTxn::Do(void)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsMsgTxn::GetIsTransient(PRBool *aIsTransient)
-{
-  if (nsnull!=aIsTransient)
-    *aIsTransient = PR_FALSE;
-  else
-	  return NS_ERROR_NULL_POINTER;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsMsgTxn::Merge(PRBool *aDidMerge, nsITransaction *aTransaction)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMsgTxn::Write(nsIOutputStream *aOutputStream)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMsgTxn::GetUndoString(nsString *aString)
-{
-  if (nsnull!=aString)
-    *aString="Undo";
-  else
-	  return NS_ERROR_NULL_POINTER;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsMsgTxn::GetRedoString(nsString *aString)
-{
-  if (nsnull!=aString)
-    *aString="Redo";
-  else
-	  return NS_ERROR_NULL_POINTER;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMsgTxn::QueryInterface(REFNSIID aIID, void** aInstancePtr)
-{
-  if (NULL == aInstancePtr) {
-    return NS_ERROR_NULL_POINTER;
-  }
-  if (aIID.Equals(kISupportsIID)) {
-    *aInstancePtr = (void*)(nsISupports*)this;
-    NS_ADDREF_THIS();
-    return NS_OK;
-  }
-  if (aIID.Equals(kITransactionIID)) {
-    *aInstancePtr = (void*)(nsITransaction*)this;
-    NS_ADDREF_THIS();
-    return NS_OK;
-  }
-  *aInstancePtr = 0;
-  return NS_NOINTERFACE;
-}
-
-
-

mozilla/mailnews/base/util/nsMsgTxn.h

@@ -1,57 +0,0 @@
-/* -*- 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, 1999 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#ifndef nsMsgTxn_h__
-#define nsMsgTxn_h__
-
-#include "nsITransaction.h"
-#include "msgCore.h"
-
-#define NS_MESSAGETRANSACTION_IID \
-{ /* da621b30-1efc-11d3-abe4-00805f8ac968 */ \
-    0xda621b30, 0x1efc, 0x11d3, \
-	{ 0xab, 0xe4, 0x00, 0x80, 0x5f, 0x8a, 0xc9, 0x68 } }
-/**
- * base class for all message undo/redo transactions.
- */
-class NS_MSG_BASE nsMsgTxn : public nsITransaction
-{
-    NS_DECL_ISUPPORTS 
-
-    nsMsgTxn();
-    virtual ~nsMsgTxn();
-
-    NS_IMETHOD Do(void);
-    
-    NS_IMETHOD Undo(void) = 0;
-    
-    NS_IMETHOD Redo(void) = 0;
-    
-    NS_IMETHOD GetIsTransient(PRBool *aIsTransient);
-
-    NS_IMETHOD Merge(PRBool *aDidMerge, nsITransaction *aTransaction);
-
-    NS_IMETHOD Write(nsIOutputStream *aOutputStream);
-
-    NS_IMETHOD GetUndoString(nsString *aString);
-
-    NS_IMETHOD GetRedoString(nsString *aString);
-
-};
-
-#endif

mozilla/mailnews/base/util/nsMsgUtils.cpp

@@ -1,326 +0,0 @@
-/* -*- 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) 1999 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "msgCore.h"
-#include "nsIMessage.h"
-#include "nsIMsgHdr.h"
-#include "nsMsgUtils.h"
-#include "nsString.h"
-#include "nsFileSpec.h"
-#include "nsIServiceManager.h"
-#include "nsCOMPtr.h"
-#include "nsString.h"
-#include "nsIImapUrl.h"
-#include "nsIMailboxUrl.h"
-#include "nsINntpUrl.h"
-#include "nsMsgNewsCID.h"
-#include "nsMsgLocalCID.h"
-#include "nsMsgBaseCID.h"
-#include "nsMsgImapCID.h"
-
-static NS_DEFINE_CID(kImapUrlCID, NS_IMAPURL_CID);
-static NS_DEFINE_CID(kCMailboxUrl, NS_MAILBOXURL_CID);
-static NS_DEFINE_CID(kCNntpUrlCID, NS_NNTPURL_CID);
-
-#if defined(DEBUG_sspitzer_) || defined(DEBUG_seth_)
-#define DEBUG_NS_MsgHashIfNecessary 1
-#endif
-
-nsresult GetMessageServiceProgIDForURI(const char *uri, nsString &progID)
-{
-
-	nsresult rv = NS_OK;
-	//Find protocol
-	nsString uriStr = uri;
-	PRInt32 pos = uriStr.FindChar(':');
-	if(pos == -1)
-		return NS_ERROR_FAILURE;
-	nsString protocol;
-	uriStr.Left(protocol, pos);
-
-	//Build message service progid
-	progID = "component://netscape/messenger/messageservice;type=";
-	progID += protocol;
-
-	return rv;
-}
-
-nsresult GetMessageServiceFromURI(const char *uri, nsIMsgMessageService **messageService)
-{
-
-	nsAutoString progID;
-	nsresult rv;
-
-	rv = GetMessageServiceProgIDForURI(uri, progID);
-
-	if(NS_SUCCEEDED(rv))
-	{
-		rv = nsServiceManager::GetService((const char *) nsCAutoString(progID), nsCOMTypeInfo<nsIMsgMessageService>::GetIID(),
-		           (nsISupports**)messageService, nsnull);
-	}
-
-	return rv;
-}
-
-
-nsresult ReleaseMessageServiceFromURI(const char *uri, nsIMsgMessageService *messageService)
-{
-	nsAutoString progID;
-	nsresult rv;
-
-	rv = GetMessageServiceProgIDForURI(uri, progID);
-	if(NS_SUCCEEDED(rv))
-		rv = nsServiceManager::ReleaseService(nsCAutoString(progID), messageService);
-	return rv;
-}
-
-
-nsresult CreateStartupUrl(char *uri, nsIURI** aUrl)
-{
-    nsresult rv = NS_ERROR_NULL_POINTER;
-    if (!uri || !*uri || !aUrl) return rv;
-    *aUrl = nsnull;
-    if (PL_strncasecmp(uri, "imap", 4) == 0)
-    {
-        nsCOMPtr<nsIImapUrl> imapUrl;
-        rv = nsComponentManager::CreateInstance(kImapUrlCID, nsnull,
-                                                nsIImapUrl::GetIID(),
-                                                getter_AddRefs(imapUrl));
-        if (NS_SUCCEEDED(rv) && imapUrl)
-            rv = imapUrl->QueryInterface(nsCOMTypeInfo<nsIURI>::GetIID(),
-                                         (void**) aUrl);
-    }
-    else if (PL_strncasecmp(uri, "mailbox", 7) == 0)
-    {
-        nsCOMPtr<nsIMailboxUrl> mailboxUrl;
-        rv = nsComponentManager::CreateInstance(kCMailboxUrl, nsnull,
-                                                nsIMailboxUrl::GetIID(),
-                                                getter_AddRefs(mailboxUrl));
-        if (NS_SUCCEEDED(rv) && mailboxUrl)
-            rv = mailboxUrl->QueryInterface(nsCOMTypeInfo<nsIURI>::GetIID(),
-                                            (void**) aUrl);
-    }
-    else if (PL_strncasecmp(uri, "news", 4) == 0)
-    {
-        nsCOMPtr<nsINntpUrl> nntpUrl;
-        rv = nsComponentManager::CreateInstance(kCNntpUrlCID, nsnull,
-                                                nsINntpUrl::GetIID(),
-                                                getter_AddRefs(nntpUrl));
-        if (NS_SUCCEEDED(rv) && nntpUrl)
-            rv = nntpUrl->QueryInterface(nsCOMTypeInfo<nsIURI>::GetIID(),
-                                         (void**) aUrl);
-    }
-    if (*aUrl)
-        (*aUrl)->SetSpec(uri);
-    return rv;
-}
-
-
-NS_IMPL_ISUPPORTS(nsMessageFromMsgHdrEnumerator, nsCOMTypeInfo<nsISimpleEnumerator>::GetIID())
-
-nsMessageFromMsgHdrEnumerator::nsMessageFromMsgHdrEnumerator(nsISimpleEnumerator *srcEnumerator,
-															 nsIMsgFolder *folder)
-{
-    NS_INIT_REFCNT();
-
-	mSrcEnumerator = dont_QueryInterface(srcEnumerator);
-	mFolder = dont_QueryInterface(folder);
-
-}
-
-nsMessageFromMsgHdrEnumerator::~nsMessageFromMsgHdrEnumerator()
-{
-	//member variables are nsCOMPtr's
-}
-
-
-NS_IMETHODIMP nsMessageFromMsgHdrEnumerator::GetNext(nsISupports **aItem)
-{
-	nsCOMPtr<nsISupports> currentItem;
-	nsCOMPtr<nsIMsgDBHdr> msgDBHdr;
-	nsCOMPtr<nsIMessage> message;
-	nsresult rv;
-
-	rv = mSrcEnumerator->GetNext(getter_AddRefs(currentItem));
-	if(NS_SUCCEEDED(rv))
-	{
-		msgDBHdr = do_QueryInterface(currentItem, &rv);
-	}
-
-	if(NS_SUCCEEDED(rv))
-	{
-		rv = mFolder->CreateMessageFromMsgDBHdr(msgDBHdr, getter_AddRefs(message));
-	}
-
-	if(NS_SUCCEEDED(rv))
-	{
-		currentItem = do_QueryInterface(message, &rv);
-		*aItem = currentItem;
-		NS_IF_ADDREF(*aItem);
-	}
-
-	NS_ASSERTION(NS_SUCCEEDED(rv),"getnext shouldn't fail");
-	return rv;
-}
-
-NS_IMETHODIMP nsMessageFromMsgHdrEnumerator::HasMoreElements(PRBool *aResult)
-{
-	return mSrcEnumerator->HasMoreElements(aResult);
-}
-
-nsresult NS_NewMessageFromMsgHdrEnumerator(nsISimpleEnumerator *srcEnumerator,
-										   nsIMsgFolder *folder,	
-										   nsMessageFromMsgHdrEnumerator **messageEnumerator)
-{
-	if(!messageEnumerator)
-		return NS_ERROR_NULL_POINTER;
-
-	*messageEnumerator =	new nsMessageFromMsgHdrEnumerator(srcEnumerator, folder);
-
-	if(!messageEnumerator)
-		return NS_ERROR_OUT_OF_MEMORY;
-
-	NS_ADDREF(*messageEnumerator);
-	return NS_OK;
-
-}
-
-// Where should this live? It's a utility used to convert a string priority, e.g., "High, Low, Normal" to an enum.
-// Perhaps we should have an interface that groups together all these utilities...
-nsresult NS_MsgGetPriorityFromString(const char *priority, nsMsgPriority *outPriority)
-{
-	if (!outPriority)
-		return NS_ERROR_NULL_POINTER;
-
-	nsMsgPriority retPriority = nsMsgPriorityNormal;
-
-	if (PL_strcasestr(priority, "Normal") != NULL)
-		retPriority = nsMsgPriorityNormal;
-	else if (PL_strcasestr(priority, "Lowest") != NULL)
-		retPriority = nsMsgPriorityLowest;
-	else if (PL_strcasestr(priority, "Highest") != NULL)
-		retPriority = nsMsgPriorityHighest;
-	else if (PL_strcasestr(priority, "High") != NULL || 
-			 PL_strcasestr(priority, "Urgent") != NULL)
-		retPriority = nsMsgPriorityHigh;
-	else if (PL_strcasestr(priority, "Low") != NULL ||
-			 PL_strcasestr(priority, "Non-urgent") != NULL)
-		retPriority = nsMsgPriorityLow;
-	else if (PL_strcasestr(priority, "1") != NULL)
-		retPriority = nsMsgPriorityHighest;
-	else if (PL_strcasestr(priority, "2") != NULL)
-		retPriority = nsMsgPriorityHigh;
-	else if (PL_strcasestr(priority, "3") != NULL)
-		retPriority = nsMsgPriorityNormal;
-	else if (PL_strcasestr(priority, "4") != NULL)
-		retPriority = nsMsgPriorityLow;
-	else if (PL_strcasestr(priority, "5") != NULL)
-	    retPriority = nsMsgPriorityLowest;
-	else
-		retPriority = nsMsgPriorityNormal;
-	*outPriority = retPriority;
-	return NS_OK;
-		//return nsMsgNoPriority;
-}
-
-
-nsresult NS_MsgGetUntranslatedPriorityName (nsMsgPriority p, nsString *outName)
-{
-	if (!outName)
-		return NS_ERROR_NULL_POINTER;
-	switch (p)
-	{
-	case nsMsgPriorityNotSet:
-	case nsMsgPriorityNone:
-		*outName = "None";
-		break;
-	case nsMsgPriorityLowest:
-		*outName = "Lowest";
-		break;
-	case nsMsgPriorityLow:
-		*outName = "Low";
-		break;
-	case nsMsgPriorityNormal:
-		*outName = "Normal";
-		break;
-	case nsMsgPriorityHigh:
-		*outName = "High";
-		break;
-	case nsMsgPriorityHighest:
-		*outName = "Highest";
-		break;
-	default:
-		NS_ASSERTION(PR_FALSE, "invalid priority value");
-	}
-	return NS_OK;
-}
-
-/* this used to be XP_StringHash2 from xp_hash.c */
-/* phong's linear congruential hash  */
-static PRUint32 StringHash(const char *ubuf)
-{
-  unsigned char * buf = (unsigned char*) ubuf;
-  PRUint32 h=1;
-  while(*buf) {
-    h = 0x63c63cd9*h + 0x9c39c33d + (int32)*buf;
-    buf++;
-  }
-  return h;
-}
-
-nsresult NS_MsgHashIfNecessary(nsCAutoString &name)
-{
-#if defined(XP_WIN16) || defined(XP_OS2)
-  const PRUint32 MAX_LEN = 8;
-#elif defined(XP_MAC)
-  const PRUint32 MAX_LEN = 25;
-#elif defined(XP_UNIX) || defined(XP_PC) || defined(XP_BEOS)
-  const PRUint32 MAX_LEN = 55;
-#else
-#error need_to_define_your_max_filename_length
-#endif
-  nsCAutoString str(name);
-
-#ifdef DEBUG_NS_MsgHashIfNecessary
-  printf("in: %s\n",str.GetBuffer());
-#endif
-
-  // Given a name, use either that name, if it fits on our
-  // filesystem, or a hashified version of it, if the name is too
-  // long to fit.
-  char hashedname[MAX_LEN + 1];
-  PRBool needshash = PL_strlen(str.GetBuffer()) > MAX_LEN;
-#if defined(XP_WIN16)  || defined(XP_OS2)
-  if (!needshash) {
-    needshash = PL_strchr(str.GetBuffer(), '.') != NULL ||
-      PL_strchr(str.GetBuffer(), ':') != NULL;
-  }
-#endif
-  PL_strncpy(hashedname, str.GetBuffer(), MAX_LEN + 1);
-  if (needshash) {
-    PR_snprintf(hashedname + MAX_LEN - 8, 9, "%08lx",
-                (unsigned long) StringHash(str.GetBuffer()));
-  }
-  name = hashedname;
-#ifdef DEBUG_NS_MsgHashIfNecessary
-  printf("out: %s\n",hashedname);
-#endif
-  
-  return NS_OK;
-}
-

mozilla/mailnews/base/util/nsMsgUtils.h

@@ -1,67 +0,0 @@
-/* -*- 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) 1999 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#ifndef _NSMSGUTILS_H
-#define _NSMSGUTILS_H
-
-#include "nsIURL.h"
-#include "nsIMsgMessageService.h"
-#include "nsString.h"
-#include "nsIEnumerator.h"
-#include "nsIMsgFolder.h"
-#include "msgCore.h"
-#include "nsCOMPtr.h"
-
-//These are utility functions that can used throughout the mailnews code
-
-//Utilities for getting a message service.
-NS_MSG_BASE nsresult GetMessageServiceProgIDForURI(const char *uri, nsString &progID);
-//Use ReleaseMessageServiceFromURI to release the service.
-NS_MSG_BASE nsresult GetMessageServiceFromURI(const char *uri, nsIMsgMessageService **messageService);
-NS_MSG_BASE nsresult ReleaseMessageServiceFromURI(const char *uri, nsIMsgMessageService *messageService);
-
-NS_MSG_BASE nsresult CreateStartupUrl(char *uri, nsIURI** aUrl);
-
-//An enumerator for converting nsIMsgHdrs to nsIMessages.
-class NS_MSG_BASE nsMessageFromMsgHdrEnumerator: public nsISimpleEnumerator
-{
-protected:
-	nsCOMPtr<nsISimpleEnumerator> mSrcEnumerator;
-	nsCOMPtr<nsIMsgFolder> mFolder;
-
-public:
-	NS_DECL_ISUPPORTS
-	nsMessageFromMsgHdrEnumerator(nsISimpleEnumerator *srcEnumerator, nsIMsgFolder *folder);
-	nsMessageFromMsgHdrEnumerator(){} //Default constructor that does nothing so nsComPtr will work.
-	virtual ~nsMessageFromMsgHdrEnumerator();
-
-  NS_DECL_NSISIMPLEENUMERATOR
-};
-
-NS_MSG_BASE nsresult NS_NewMessageFromMsgHdrEnumerator(nsISimpleEnumerator *srcEnumerator,
-										   nsIMsgFolder *folder,	
-										   nsMessageFromMsgHdrEnumerator **messageEnumerator);
-
-NS_MSG_BASE nsresult NS_MsgGetPriorityFromString(const char *priority, nsMsgPriority *outPriority);
-
-NS_MSG_BASE nsresult NS_MsgGetUntranslatedPriorityName (nsMsgPriority p, nsString *outName);
-
-NS_MSG_BASE nsresult NS_MsgHashIfNecessary(nsCAutoString &name);
-
-#endif
-

mozilla/mailnews/base/util/nsNewsSummarySpec.cpp

@@ -1,71 +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) 1999 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "nsNewsSummarySpec.h"
-#include "plstr.h"
-#include "nsString.h"
-
-MOZ_DECL_CTOR_COUNTER(nsNewsSummarySpec);
-
-nsNewsSummarySpec::~nsNewsSummarySpec()
-{
-	MOZ_COUNT_DTOR(nsNewsSummarySpec);
-}
-
-nsNewsSummarySpec::nsNewsSummarySpec()
-{
-	MOZ_COUNT_CTOR(nsNewsSummarySpec);
-}
-
-nsNewsSummarySpec::nsNewsSummarySpec(const char *folderPath)
-  : nsFileSpec(folderPath)
-{
-	MOZ_COUNT_CTOR(nsNewsSummarySpec);
-	CreateSummaryFileName();
-}
-
-nsNewsSummarySpec::nsNewsSummarySpec(const nsFileSpec& inFolderPath)
-: nsFileSpec(inFolderPath)
-{
-	MOZ_COUNT_CTOR(nsNewsSummarySpec);
-	CreateSummaryFileName();
-}
-
-nsNewsSummarySpec::nsNewsSummarySpec(const nsFilePath &inFolderPath) : nsFileSpec(inFolderPath)
-{
-	MOZ_COUNT_CTOR(nsNewsSummarySpec);
-	CreateSummaryFileName();
-}
-
-void nsNewsSummarySpec::SetFolderName(const char *folderPath)
-{
-	*this = folderPath;
-}
-
-void nsNewsSummarySpec::CreateSummaryFileName()
-{
-	char *leafName = GetLeafName();
-
-    nsCAutoString fullLeafName((const char*)leafName);
-
-	// Append .msf (message summary file) 
-	fullLeafName += ".msf";	
-
-	SetLeafName(fullLeafName.GetBuffer());
-	PL_strfree(leafName);
-}

mozilla/mailnews/base/util/nsNewsSummarySpec.h

@@ -1,45 +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) 1999 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#ifndef _nsNewsSummarySpec_H
-#define _nsNewsSummarySpec_H
-
-#include "nsFileSpec.h"
-#include "msgCore.h"
-
-// Class to name a summary file for a newsgroup,
-// given a full folder file spec. 
-// Note this class expects the invoking code to fully specify the folder path. 
-// This class does NOT prepend the local folder directory, or put .sbd on the containing
-// directory names.
-class NS_MSG_BASE nsNewsSummarySpec : public nsFileSpec
-{
-public:
-  nsNewsSummarySpec();
-  nsNewsSummarySpec(const char *folderPath);
-  nsNewsSummarySpec(const nsFileSpec& inFolderPath);
-  nsNewsSummarySpec(const nsFilePath &inFolderPath);
-  ~nsNewsSummarySpec();
-  void SetFolderName(const char *folderPath);
-
-protected:
-  void	CreateSummaryFileName();
-  
-};
-
-#endif /* _nsNewsSummarySpec_H */

mozilla/mailnews/base/util/nsUInt32Array.cpp

@@ -1,277 +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.
- */
-
-#include "msgCore.h"    // precompiled header...
-#include "prlog.h"
-
-#include "MailNewsTypes.h"
-#include "nsUInt32Array.h"
-#include "nsQuickSort.h"
-
-MOZ_DECL_CTOR_COUNTER(nsUInt32Array);
-
-nsUInt32Array::nsUInt32Array()
-{
-	MOZ_COUNT_CTOR(nsUInt32Array);
-	m_nSize = 0;
-	m_nMaxSize = 0;
-	m_nGrowBy = 0;
-	m_pData = NULL;
-}
-
-nsUInt32Array::~nsUInt32Array()
-{
-	MOZ_COUNT_DTOR(nsUInt32Array);
-	SetSize(0);
-}
-
-/////////////////////////////////////////////////////////////////////////////
-
-PRUint32 nsUInt32Array::GetSize() const
-{
-	return m_nSize;
-}
-
-PRBool nsUInt32Array::SetSize(PRUint32 nSize,
-                              PRBool adjustGrowth,
-                              PRUint32 nGrowBy)
-{
-	if (adjustGrowth)
-		m_nGrowBy = nGrowBy;
-
-#ifdef MAX_ARR_ELEMS
-	if (nSize > MAX_ARR_ELEMS);
-	{
-		PR_ASSERT(nSize <= MAX_ARR_ELEMS); // Will fail
-		return PR_FALSE;
-	}
-#endif
-
-	if (nSize == 0)
-	{
-		// Remove all elements
-		PR_Free(m_pData);
-		m_nSize = 0;
-		m_nMaxSize = 0;
-		m_pData = NULL;
-	}
-	else if (m_pData == NULL)
-	{
-		// Create a new array
-		m_nMaxSize = PR_MAX(8, nSize);
-		m_pData = (PRUint32 *)PR_Calloc(1, m_nMaxSize * sizeof(PRUint32));
-		if (m_pData)
-			m_nSize = nSize;
-		else
-			m_nSize = m_nMaxSize = 0;
-	}
-	else if (nSize <= m_nMaxSize)
-	{
-		// The new size is within the current maximum size, make sure new
-		// elements are to initialized to zero
-		if (nSize > m_nSize)
-			nsCRT::memset(&m_pData[m_nSize], 0, (nSize - m_nSize) * sizeof(PRUint32));
-
-		m_nSize = nSize;
-	}
-	else
-	{
-		// The array needs to grow, figure out how much
-		PRUint32 nMaxSize;
-		nGrowBy  = PR_MAX(m_nGrowBy, PR_MIN(1024, PR_MAX(8, m_nSize / 8)));
-		nMaxSize = PR_MAX(nSize, m_nMaxSize + nGrowBy);
-#ifdef MAX_ARR_ELEMS
-		nMaxSize = PR_MIN(MAX_ARR_ELEMS, nMaxSize);
-#endif
-
-		PRUint32 *pNewData = (PRUint32 *)PR_Malloc(nMaxSize * sizeof(PRUint32));
-		if (pNewData)
-		{
-			// Copy the data from the old array to the new one
-			nsCRT::memcpy(pNewData, m_pData, m_nSize * sizeof(PRUint32));
-
-			// Zero out the remaining elements
-			nsCRT::memset(&pNewData[m_nSize], 0, (nSize - m_nSize) * sizeof(PRUint32));
-			m_nSize = nSize;
-			m_nMaxSize = nMaxSize;
-
-			// Free the old array
-			PR_Free(m_pData);
-			m_pData = pNewData;
-		}
-	}
-
-	return nSize == m_nSize;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-
-PRUint32 &nsUInt32Array::ElementAt(PRUint32 nIndex)
-{
-	PR_ASSERT(nIndex < m_nSize);
-	return m_pData[nIndex];
-}
-
-PRUint32 nsUInt32Array::GetAt(PRUint32 nIndex) const
-{
-	PR_ASSERT(nIndex < m_nSize);
-	return m_pData[nIndex];
-}
-
-PRUint32 *nsUInt32Array::GetData() 
-{
-	return m_pData;
-}
-
-void nsUInt32Array::SetAt(PRUint32 nIndex, PRUint32 newElement)
-{
-	PR_ASSERT(nIndex < m_nSize);
-	m_pData[nIndex] = newElement;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-
-PRUint32 nsUInt32Array::Add(PRUint32 newElement)
-{
-	PRUint32 nIndex = m_nSize;
-
-#ifdef MAX_ARR_ELEMS
-	if (nIndex >= MAX_ARR_ELEMS) 
-		return -1;	     
-#endif			
-
-	SetAtGrow(nIndex, newElement);
-	return nIndex;
-}
-
-PRUint32 nsUInt32Array::Add(PRUint32 *elementPtr, PRUint32 numElements) 
-{ 
-	if (SetSize(m_nSize + numElements))
-		nsCRT::memcpy(m_pData + m_nSize, elementPtr, numElements * sizeof(PRUint32)); 
-
-	return m_nSize; 
-} 
-
-PRUint32 *nsUInt32Array::CloneData() 
-{ 
-	PRUint32 *copyOfData = (PRUint32 *)PR_Malloc(m_nSize * sizeof(PRUint32)); 
-	if (copyOfData) 
-		nsCRT::memcpy(copyOfData, m_pData, m_nSize * sizeof(PRUint32)); 
-
-	return copyOfData; 
-} 
-
-void nsUInt32Array::InsertAt(PRUint32 nIndex, PRUint32 newElement, PRUint32 nCount)
-{
-	PR_ASSERT(nCount > 0);
-
-	if (nIndex >= m_nSize)
-	{
-		// If the new element is after the end of the array, grow the array
-		SetSize(nIndex + nCount);
-	}
-	else
-	{
-		// The element is being insert inside the array
-		int nOldSize = m_nSize;
-		SetSize(m_nSize + nCount);
-
-		// Move the data after the insertion point
-		nsCRT::memmove(&m_pData[nIndex + nCount], &m_pData[nIndex],
-			       (nOldSize - nIndex) * sizeof(PRUint32));
-	}
-
-	// Insert the new elements
-	PR_ASSERT(nIndex + nCount <= m_nSize);
-	while (nCount--)
-		m_pData[nIndex++] = newElement;
-}
-
-void nsUInt32Array::InsertAt(PRUint32 nStartIndex, const nsUInt32Array *pNewArray)
-{
-	PR_ASSERT(pNewArray != NULL);
-
-	if (pNewArray->GetSize() > 0)
-	{
-		InsertAt(nStartIndex, pNewArray->GetAt(0), pNewArray->GetSize());
-		for (PRUint32 i = 1; i < pNewArray->GetSize(); i++)
-			m_pData[nStartIndex + i] = pNewArray->GetAt(i);
-	}
-}
-
-void nsUInt32Array::RemoveAll()
-{
-	SetSize(0);
-}
-
-void nsUInt32Array::RemoveAt(PRUint32 nIndex, PRUint32 nCount)
-{
-	PR_ASSERT(nIndex + nCount <= m_nSize);
-
-	if (nCount > 0)
-	{
-		// Make sure not to overstep the end of the array
-		int nMoveCount = m_nSize - (nIndex + nCount);
-		if (nCount && nMoveCount)
-			nsCRT::memmove(&m_pData[nIndex], &m_pData[nIndex + nCount],
-		               nMoveCount * sizeof(PRUint32));
-
-		m_nSize -= nCount;
-	}
-}
-
-void nsUInt32Array::SetAtGrow(PRUint32 nIndex, PRUint32 newElement)
-{
-	if (nIndex >= m_nSize)
-		SetSize(nIndex+1);
-	m_pData[nIndex] = newElement;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-
-void nsUInt32Array::CopyArray(nsUInt32Array *oldA)
-{
-	CopyArray(*oldA);
-}
-
-void nsUInt32Array::CopyArray(nsUInt32Array &oldA)
-{
-	if (m_pData)
-		PR_Free(m_pData);
-	m_nSize = oldA.m_nSize;
-	m_nMaxSize = oldA.m_nMaxSize;
-	m_pData = (PRUint32 *)PR_Malloc(m_nSize * sizeof(PRUint32));
-	if (m_pData)
-		nsCRT::memcpy(m_pData, oldA.m_pData, m_nSize * sizeof(PRUint32));
-}
-
-/////////////////////////////////////////////////////////////////////////////
-
-static int CompareDWord (const void *v1, const void *v2, void *)
-{
-	// QuickSort callback to compare array values
-	PRUint32 i1 = *(PRUint32 *)v1;
-	PRUint32 i2 = *(PRUint32 *)v2;
-	return i1 - i2;
-}
-
-void nsUInt32Array::QuickSort (int (*compare) (const void *elem1, const void *elem2, void *data))
-{
-	if (m_nSize > 1)
-		NS_QuickSort(m_pData, m_nSize, sizeof(void*), compare ? compare : CompareDWord, nsnull);
-}

mozilla/mailnews/base/util/nsUInt32Array.h

@@ -1,73 +0,0 @@
-/* -*- 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.
- */
-#ifndef _nsUInt32Array_H_
-#define _nsUInt32Array_H_
-
-#include "nscore.h"
-#include "nsCRT.h"
-#include "prmem.h"
-#include "msgCore.h"
-
-class NS_MSG_BASE nsUInt32Array
-{
-public:
-	// Construction/destruction
-    nsUInt32Array();
-    virtual ~nsUInt32Array();
-
-	// State/attribute member functions
-	PRUint32          GetSize() const;
-	PRBool            SetSize(PRUint32 nNewSize, PRBool AdjustGrowth=PR_FALSE, PRUint32 nGrowBy = 0);
-
-	// Accessor member functions
-	PRUint32            &ElementAt(PRUint32 nIndex);
-	PRUint32             GetAt(PRUint32 nIndex) const;
-	PRUint32            *GetData();
-	void               SetAt(PRUint32 nIndex, PRUint32 newElement);
-
-	// Insertion/deletion member functions
-	PRUint32			Add(PRUint32 newElement);
-	PRUint32           Add(PRUint32 *elementPtr, PRUint32 numElements); 
-	void	           InsertAt(PRUint32 nIndex, PRUint32 newElement, PRUint32 nCount = 1);
-	void               InsertAt(PRUint32 nStartIndex, const nsUInt32Array *pNewArray);
-	void               RemoveAll();
-	void               RemoveAt(PRUint32 nIndex, PRUint32 nCount = 1);
-	void               SetAtGrow(PRUint32 nIndex, PRUint32 newElement);
-
-	// Sorting member functions
-	void               QuickSort(int (*compare) (const void *elem1, const void *elem2, void *) = NULL);
-
-	// Overloaded operators
-	PRUint32             operator[](PRUint32 nIndex) const { return GetAt(nIndex); }
-	PRUint32            &operator[](PRUint32 nIndex) { return ElementAt(nIndex); }
-
-	// Miscellaneous member functions
-	PRUint32            *CloneData(); 
-	void               CopyArray(nsUInt32Array *oldA);
-	void               CopyArray(nsUInt32Array &oldA);
-
-protected:
-    // Member data
-	PRUint32 m_nSize;
-	PRUint32 m_nMaxSize;
-	PRUint32 m_nGrowBy;
-	PRUint32* m_pData;
-};
-
-
-#endif // _DWordArray_H_

mozilla/xpinstall/Makefile.in

@@ -0,0 +1,39 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "License"); you may not use this file except in
+# compliance with the License.  You may obtain a copy of the License at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is Mozilla Communicator client code, 
+# released March 31, 1998. 
+#
+# The Initial Developer of the Original Code is Netscape Communications 
+# Corporation.  Portions created by Netscape are 
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+# Contributors:
+#     Daniel Veditz <dveditz@netscape.com>
+#     Douglas Turner <dougt@netscape.com>
+
+
+DEPTH = ..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS = public
+
+include $(topsrcdir)/config/config.mk
+
+include $(topsrcdir)/config/rules.mk
+
+

mozilla/xpinstall/makefile.win

@@ -0,0 +1,30 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "License"); you may not use this file except in
+# compliance with the License.  You may obtain a copy of the License at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is Mozilla Communicator client code, 
+# released March 31, 1998. 
+#
+# The Initial Developer of the Original Code is Netscape Communications 
+# Corporation.  Portions created by Netscape are 
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+# Contributors:
+#     Daniel Veditz <dveditz@netscape.com>
+#     Douglas Turner <dougt@netscape.com>
+
+
+DEPTH=..
+
+DIRS= public res src 
+
+include <$(DEPTH)\config\rules.mak>

mozilla/xpinstall/notifier/SoftwareUpdate-Source-1.rdf

@@ -0,0 +1,33 @@
+<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:NC="http://home.netscape.com/NC-rdf#">
+
+  <RDF:Bag ID="NC:SoftwareUpdateRoot">
+    <RDF:li>
+       <RDF:Bag ID="NC:NewSoftwareToday" NC:title="New Software">
+
+    <RDF:li>
+        <RDF:Description ID="AimUpdate344">
+         <NC:type resource="http://home.netscape.com/NC-rdf#SoftwarePackage" />
+         <NC:title>AOL AIM</NC:title>
+         <NC:description>An Instant Message Client</NC:description>
+         <NC:version>3.4.1.12</NC:version>
+         <NC:registryKey>/AOL/AIM/</NC:registryKey>
+         <NC:url>http://home.netscape.com/index.html</NC:url>
+       </RDF:Description>
+    </RDF:li>
+    
+    <RDF:li>
+       <RDF:Description ID="PGPPlugin345">
+         <NC:type resource="http://home.netscape.com/NC-rdf#SoftwarePackage" />
+         <NC:title>PGP Plugin For Mozilla</NC:title>
+         <NC:description>A high grade encryption plugin</NC:description>
+         <NC:version>1.1.2.0</NC:version>
+         <NC:registryKey>/PGP/ROCKS/</NC:registryKey>
+         <NC:url>http://home.netscape.com/index.html</NC:url>
+       </RDF:Description>
+    </RDF:li>
+
+       </RDF:Bag>
+     </RDF:li>
+  </RDF:Bag>
+</RDF:RDF>

mozilla/xpinstall/notifier/SoftwareUpdate.css

@@ -0,0 +1,57 @@
+window { 
+ display: block; 
+} 
+
+tree { 
+ display: table; 
+ background-color: #FFFFFF; 
+ border: none; 
+ border-spacing: 0px; 
+ width: 100%;
+}
+
+treecol {
+ display: table-column;
+ width: 200px;
+}
+
+treeitem { 
+ display: table-row; 
+} 
+
+treehead { 
+ display: table-header-group; 
+} 
+
+treebody { 
+ display: table-row-group; 
+} 
+
+treecell { 
+ display: table-cell; 
+ font-family: Verdana, Sans-Serif;
+ font-size: 8pt;
+} 
+
+treecell[selectedcell] {
+ background-color: yellow;
+ }
+ 
+
+treehead treeitem treecell { 
+ background-color: #c0c0c0; 
+ border: outset 1px;
+ border-color: white #707070 #707070 white;
+ padding-left: 4px;
+}
+
+treeitem[type="http://home.netscape.com/NC-rdf#SoftwarePackage"] > treecell > titledbutton {
+ list-style-image: url("resource:/res/rdf/SoftwareUpdatePackage.gif");
+}
+
+treeitem[type="http://home.netscape.com/NC-rdf#Folder"] > treecell > titledbutton {
+ list-style-image: url("resource:/res/rdf/bookmark-folder-closed.gif");
+
+treeitem[type="http://home.netscape.com/NC-rdf#Folder"][open="true"] > treecell > titledbutton {
+ list-style-image: url("resource:/res/rdf/bookmark-folder-open.gif");
+}

mozilla/xpinstall/notifier/SoftwareUpdate.js

@@ -0,0 +1,123 @@
+    // the rdf service
+    var RDF = Components.classes['component://netscape/rdf/rdf-service'].getService();
+    RDF = RDF.QueryInterface(Components.interfaces.nsIRDFService);
+
+    function getAttr(registry,service,attr_name) 
+    {
+        var attr = registry.GetTarget(service,
+                                      RDF.GetResource('http://home.netscape.com/NC-rdf#' + attr_name),
+                                      true);
+        if (attr)
+            attr = attr.QueryInterface(Components.interfaces.nsIRDFLiteral);
+  
+        if (attr)
+            attr = attr.Value;
+        
+        return attr;
+    }
+
+    function Init()
+    {
+        // this is the main rdf file.
+        
+        var mainRegistry = RDF.GetDataSource('resource://res/rdf/SoftwareUpdates.rdf');
+        
+        var mainContainer = Components.classes['component://netscape/rdf/container'].createInstance();
+        mainContainer = mainContainer.QueryInterface(Components.interfaces.nsIRDFContainer);
+
+        mainContainer.Init(mainRegistry, RDF.GetResource('NC:SoftwareUpdateDataSources'));
+
+        // Now enumerate all of the softwareupdate datasources.
+        var mainEnumerator = mainContainer.GetElements();
+        while (mainEnumerator.HasMoreElements()) 
+        {
+            var aDistributor = mainEnumerator.GetNext();
+            aDistributor = aDistributor.QueryInterface(Components.interfaces.nsIRDFResource);
+
+            var distributorContainer = Components.classes['component://netscape/rdf/container'].createInstance();
+            distributorContainer = distributorContainer.QueryInterface(Components.interfaces.nsIRDFContainer);
+            
+            var distributorRegistry = RDF.GetDataSource(aDistributor.Value);
+            var distributorResource = RDF.GetResource('NC:SoftwareUpdateRoot');
+
+            distributorContainer.Init(distributorRegistry, distributorResource);
+
+            // Now enumerate all of the distributorContainer's packages.
+            
+            var distributorEnumerator = distributorContainer.GetElements();
+            
+            while (distributorEnumerator.HasMoreElements()) 
+            {
+                 var aPackage = distributorEnumerator.GetNext();
+                 aPackage = aPackage.QueryInterface(Components.interfaces.nsIRDFResource);
+                 
+                 // remove any that we do not want.
+            
+                 if (getAttr(distributorRegistry, aPackage, 'title') == "AOL AIM")
+                 {
+                    //distributorContainer.RemoveElement(aPackage, true);
+                 }
+            }
+            var tree = document.getElementById('tree');
+
+            // Add it to the tree control's composite datasource.
+            tree.database.AddDataSource(distributorRegistry);
+
+        }
+        
+        // Install all of the stylesheets in the softwareupdate Registry into the
+        // panel.
+
+        // TODO
+
+        // XXX hack to force the tree to rebuild
+        var treebody = document.getElementById('NC:SoftwareUpdateRoot');
+        treebody.setAttribute('id', 'NC:SoftwareUpdateRoot');
+    }
+
+
+    function OpenURL(event, node)
+    {
+        if (node.getAttribute('type') == "http://home.netscape.com/NC-rdf#SoftwarePackage") 
+        {
+            url = node.getAttribute('url');
+     
+            /*window.open(url,'bookmarks');*/
+  
+            var toolkitCore = XPAppCoresManager.Find("ToolkitCore");
+            if (!toolkitCore) 
+            {
+                toolkitCore = new ToolkitCore();
+                if (toolkitCore) 
+                {
+                    toolkitCore.Init("ToolkitCore");
+                }
+            }
+        
+            if (toolkitCore) 
+            {
+                toolkitCore.ShowWindow(url,window);
+            }
+
+            dump("OpenURL(" + url + ")\n");
+        
+            return true;        
+        }
+        return false;
+    }
+
+
+    // To get around "window.onload" not working in viewer.
+    function Boot()
+    {
+        var tree = document.getElementById('tree');
+        if (tree == null) {
+            setTimeout(Boot, 0);
+        }
+        else {
+            Init();
+        }
+    }
+
+    setTimeout('Boot()', 0);
+

mozilla/xpinstall/notifier/SoftwareUpdate.xul

@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="resource:/res/rdf/sidebar.css" type="text/css"?>
+<?xml-stylesheet href="resource:/res/rdf/SoftwareUpdate.css" type="text/css"?>
+<window
+  xmlns:html="http://www.w3.org/TR/REC-html40"
+  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <html:script src="SoftwareUpdate.js"/>
+  
+  <tree id="tree"
+        flex="100%"
+        datasources="rdf:softwareupdates"
+        ondblclick="return OpenURL(event, event.target.parentNode);">
+
+    <treecol rdf:resource="http://home.netscape.com/NC-rdf#title" />
+    <treecol rdf:resource="http://home.netscape.com/NC-rdf#description" />
+    <treecol rdf:resource="http://home.netscape.com/NC-rdf#version" />
+
+    <treehead>
+      <treeitem>
+        <treecell>Title</treecell>
+        <treecell>Description</treecell>
+        <treecell>Version</treecell>
+      </treeitem>
+    </treehead>
+
+    <treebody id="NC:SoftwareUpdateRoot" rdf:containment="http://home.netscape.com/NC-rdf#child" />
+  </tree>
+</window>

mozilla/xpinstall/notifier/SoftwareUpdates.rdf

@@ -0,0 +1,7 @@
+<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:NC="http://home.netscape.com/softwareupdate-schema#">
+
+  <RDF:Bag ID="NC:SoftwareUpdateDataSources">
+    <RDF:li resource="resource:/res/rdf/SoftwareUpdate-Source-1.rdf" />
+  </RDF:Bag>
+</RDF:RDF>

mozilla/xpinstall/public/MANIFEST

@@ -0,0 +1,6 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+nsISoftwareUpdate.h
+nsSoftwareUpdateIIDs.h

mozilla/xpinstall/public/Makefile.in

@@ -0,0 +1,47 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "License"); you may not use this file except in
+# compliance with the License.  You may obtain a copy of the License at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is Mozilla Communicator client code, 
+# released March 31, 1998. 
+#
+# The Initial Developer of the Original Code is Netscape Communications 
+# Corporation.  Portions created by Netscape are 
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+# Contributors:
+#     Daniel Veditz <dveditz@netscape.com>
+#     Douglas Turner <dougt@netscape.com>
+
+DEPTH = ../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE = xpinstall
+
+XPIDLSRCS = nsIXPInstallProgress.idl
+
+EXPORTS =		             \
+        nsIDOMInstallTriggerGlobal.h \
+        nsIDOMInstallVersion.h       \
+        nsSoftwareUpdateIIDs.h       \
+        nsISoftwareUpdate.h          \
+        $(NULL)
+
+EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
+
+include $(topsrcdir)/config/config.mk
+
+include $(topsrcdir)/config/rules.mk

mozilla/xpinstall/public/idl/Install.idl

@@ -0,0 +1,113 @@
+interface Install
+{
+/* IID: { 0x18c2f988, 0xb09f, 0x11d2, \
+  {0xbc, 0xde, 0x00, 0x80, 0x5f, 0x0e, 0x13, 0x53}} */
+
+	const int BAD_PACKAGE_NAME          = -200;
+	const int UNEXPECTED_ERROR          = -201;
+	const int ACCESS_DENIED             = -202;
+	const int TOO_MANY_CERTIFICATES     = -203; /* Installer file must have 1 certificate */
+	const int NO_INSTALLER_CERTIFICATE  = -204; /* Installer file must have a certificate */
+	const int NO_CERTIFICATE            = -205; /* Extracted file is not signed */
+	const int NO_MATCHING_CERTIFICATE   = -206; /* Extracted file does not match installer certificate */
+	const int UNKNOWN_JAR_FILE          = -207; /* JAR file has not been opened */
+	const int INVALID_ARGUMENTS         = -208; /* Bad arguments to a function */
+	const int ILLEGAL_RELATIVE_PATH     = -209; /* Illegal relative path */
+	const int USER_CANCELLED            = -210; /* User cancelled */
+	const int INSTALL_NOT_STARTED       = -211;
+	const int SILENT_MODE_DENIED        = -212;
+	const int NO_SUCH_COMPONENT         = -213; /* no such component in the registry. */
+	const int FILE_DOES_NOT_EXIST       = -214; /* File cannot be deleted as it does not exist */
+	const int FILE_READ_ONLY            = -215; /* File cannot be deleted as it is read only. */
+	const int FILE_IS_DIRECTORY         = -216; /* File cannot be deleted as it is a directory */
+	const int NETWORK_FILE_IS_IN_USE    = -217; /* File on the network is in-use */
+	const int APPLE_SINGLE_ERR          = -218; /* error in AppleSingle unpacking */
+	const int INVALID_PATH_ERR          = -219; /* GetFolder() did not like the folderID */
+	const int PATCH_BAD_DIFF            = -220; /* error in GDIFF patch */
+	const int PATCH_BAD_CHECKSUM_TARGET = -221; /* source file doesn't checksum  */
+	const int PATCH_BAD_CHECKSUM_RESULT = -222; /* final patched file fails checksum  */
+	const int UNINSTALL_FAILED          = -223; /* error while uninstalling a package  */
+	const int GESTALT_UNKNOWN_ERR       = -5550;         
+	const int GESTALT_INVALID_ARGUMENT  = -5551;
+
+	const int SUCCESS					  = 0;
+	const int REBOOT_NEEDED               = 999;
+
+	/* install types */
+	const int LIMITED_INSTALL             = 0;
+	const int FULL_INSTALL                = 1;
+	const int NO_STATUS_DLG				  = 2;
+	const int NO_FINALIZE_DLG			  = 4;
+
+	// these should not be public...
+	/* message IDs*/
+	const int SU_INSTALL_FILE_UNEXPECTED_MSG_ID  = 0;
+	const int SU_DETAILS_REPLACE_FILE_MSG_ID  = 1;
+	const int SU_DETAILS_INSTALL_FILE_MSG_ID  = 2;
+    //////////////////////////
+	
+	readonly attribute wstring UserPackageName;
+	readonly attribute wstring RegPackageName;
+
+	void Install();
+
+	void AbortInstall();
+
+	long AddDirectory(	   in wstring regName, 
+						   in wstring version, 
+						   in wstring jarSource,         
+						   in InstallFolder folder, 
+						   in wstring subdir, 
+						   in boolean forceMode );
+
+
+	long AddSubcomponent(  in wstring regName, 
+						   in wstring version, 
+						   in wstring jarSource,         
+						   in InstallFolder folder, 
+						   in wstring targetName, 
+						   in boolean forceMode );
+
+	long DeleteComponent(  in wstring registryName);
+
+	long DeleteFile(       in InstallFolder folder,
+						   in wstring relativeFileName );
+	
+	long DiskSpaceAvailable( in InstallFolder folder );
+	
+	long Execute(in wstring jarSource, in wstring args);
+	
+	long FinalizeInstall();
+
+	long Gestalt (in wstring selector);
+
+	InstallFolder GetComponentFolder( in wstring regName, 
+						              in wstring subdirectory);
+
+	InstallFolder GetFolder(in wstring targetFolder, 
+				            in wstring subdirectory);
+
+	long GetLastError();
+
+	long GetWinProfile(in InstallFolder folder, in wstring file);
+	
+	long GetWinRegistry();
+
+	long Patch( in wstring regName, 
+				in wstring version, 
+				in wstring jarSource,
+				in InstallFolder folder, 
+				in wstring targetName );
+	
+	void ResetError();
+
+	void SetPackageFolder( in InstallFolder folder );
+	
+	long StartInstall( in wstring userPackageName,
+					   in wstring packageName, 
+					   in wstring version, 
+					   in long flags );
+
+	long Uninstall( in wstring packageName);
+
+};

mozilla/xpinstall/public/idl/InstallTrigger.idl

@@ -0,0 +1,24 @@
+interface InstallTriggerGlobal
+{
+/* IID: { 0x18c2f987, 0xb09f, 0x11d2, \
+  {0xbc, 0xde, 0x00, 0x80, 0x5f, 0x0e, 0x13, 0x53}} */
+	
+	const int MAJOR_DIFF =  4;
+    const int MINOR_DIFF =  3;
+    const int REL_DIFF   =  2;
+    const int BLD_DIFF   =  1;
+    const int EQUAL      =  0;	
+
+	boolean UpdateEnabled ();
+
+	long StartSoftwareUpdate(in wstring URL);
+
+	long ConditionalSoftwareUpdate(	in wstring URL, 
+									in wstring regName,
+									in long diffLevel, 
+									in wstring version, 
+									in long mode);
+
+	long CompareVersion( in wstring regName, in wstring version );
+
+};

mozilla/xpinstall/public/idl/InstallVersion.idl

@@ -0,0 +1,34 @@
+interface InstallVersion
+{
+/* IID: { 0x18c2f986, 0xb09f, 0x11d2, \
+  {0xbc, 0xde, 0x00, 0x80, 0x5f, 0x0e, 0x13, 0x53}} */
+	 
+	const int EQUAL				=  0;
+    const int BLD_DIFF			=  1;
+	const int BLD_DIFF_MINUS		= -1;
+    const int REL_DIFF			=  2;
+	const int REL_DIFF_MINUS		= -2;
+    const int MINOR_DIFF			=  3;
+	const int MINOR_DIFF_MINUS   = -3;
+    const int MAJOR_DIFF			=  4;
+	const int MAJOR_DIFF_MINUS   = -4;
+	
+	attribute int major;
+	attribute int minor;
+	attribute int release;
+	attribute int build;
+
+	void InstallVersion();
+
+	void init(in wstring versionString);	
+/*
+	void init(in int major, in int minor, in int release, in int build);	
+*/
+	wstring toString();
+
+/*	int compareTo(in wstring version);
+	int compareTo(in int major, in int minor, in int release, in int build);
+*/
+	int compareTo(in InstallVersion versionObject);
+
+};

mozilla/xpinstall/public/makefile.win

@@ -0,0 +1,36 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "License"); you may not use this file except in
+# compliance with the License.  You may obtain a copy of the License at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is Mozilla Communicator client code, 
+# released March 31, 1998. 
+#
+# The Initial Developer of the Original Code is Netscape Communications 
+# Corporation.  Portions created by Netscape are 
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+# Contributors:
+#     Daniel Veditz <dveditz@netscape.com>
+#     Douglas Turner <dougt@netscape.com>
+
+MODULE=xpinstall 
+DEPTH=..\..
+
+EXPORTS=    nsIDOMInstallTriggerGlobal.h \
+			nsIDOMInstallVersion.h       \
+            nsSoftwareUpdateIIDs.h       \
+			nsISoftwareUpdate.h
+
+XPIDLSRCS = .\nsIXPInstallProgress.idl        
+
+include <$(DEPTH)\config\config.mak>
+include <$(DEPTH)\config\rules.mak>

mozilla/xpinstall/public/nsIDOMInstall.h

@@ -0,0 +1 @@
+#error

mozilla/xpinstall/public/nsIDOMInstallTriggerGlobal.h

@@ -0,0 +1,96 @@
+/* -*- 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.
+ */
+/* AUTO-GENERATED. DO NOT EDIT!!! */
+
+#ifndef nsIDOMInstallTriggerGlobal_h__
+#define nsIDOMInstallTriggerGlobal_h__
+
+#include "nsISupports.h"
+#include "nsString.h"
+#include "nsIScriptContext.h"
+
+
+#define NS_IDOMINSTALLTRIGGERGLOBAL_IID \
+ { 0x18c2f987, 0xb09f, 0x11d2, \
+  {0xbc, 0xde, 0x00, 0x80, 0x5f, 0x0e, 0x13, 0x53}} 
+
+class nsIDOMInstallTriggerGlobal : public nsISupports {
+public:
+  static const nsIID& IID() { static nsIID iid = NS_IDOMINSTALLTRIGGERGLOBAL_IID; return iid; }
+  enum {
+    MAJOR_DIFF = 4,
+    MINOR_DIFF = 3,
+    REL_DIFF = 2,
+    BLD_DIFF = 1,
+    EQUAL = 0
+  };
+
+  NS_IMETHOD    UpdateEnabled(PRBool* aReturn)=0;
+
+  NS_IMETHOD    StartSoftwareUpdate(const nsString& aURL, PRInt32* aReturn)=0;
+  NS_IMETHOD    StartSoftwareUpdate(const nsString& aURL, PRInt32 aFlags, PRInt32* aReturn)=0;
+
+  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, PRInt32 aDiffLevel, const nsString& aVersion, PRInt32 aMode, PRInt32* aReturn)=0;
+  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, PRInt32 aDiffLevel, nsIDOMInstallVersion* aVersion, PRInt32 aMode, PRInt32* aReturn)=0;
+  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, nsIDOMInstallVersion* aVersion, PRInt32 aMode, PRInt32* aReturn)=0;
+  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, const nsString& aVersion, PRInt32 aMode, PRInt32* aReturn)=0;
+  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, const nsString& aVersion, PRInt32* aReturn)=0;
+  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, nsIDOMInstallVersion* aVersion, PRInt32* aReturn)=0;
+
+  NS_IMETHOD    CompareVersion(const nsString& aRegName, PRInt32 aMajor, PRInt32 aMinor, PRInt32 aRelease, PRInt32 aBuild, PRInt32* aReturn)=0;
+  NS_IMETHOD    CompareVersion(const nsString& aRegName, const nsString& aVersion, PRInt32* aReturn)=0;
+  NS_IMETHOD    CompareVersion(const nsString& aRegName, nsIDOMInstallVersion* aVersion, PRInt32* aReturn)=0;
+};
+
+
+#define NS_DECL_IDOMINSTALLTRIGGERGLOBAL   \
+  NS_IMETHOD    UpdateEnabled(PRBool* aReturn);  \
+  NS_IMETHOD    StartSoftwareUpdate(const nsString& aURL, PRInt32 aFlags, PRInt32* aReturn);  \
+  NS_IMETHOD    StartSoftwareUpdate(const nsString& aURL, PRInt32* aReturn);  \
+  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, PRInt32 aDiffLevel, const nsString& aVersion, PRInt32 aMode, PRInt32* aReturn);  \
+  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, PRInt32 aDiffLevel, nsIDOMInstallVersion* aVersion, PRInt32 aMode, PRInt32* aReturn);  \
+  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, nsIDOMInstallVersion* aVersion, PRInt32 aMode, PRInt32* aReturn);  \
+  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, const nsString& aVersion, PRInt32 aMode, PRInt32* aReturn);  \
+  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, const nsString& aVersion, PRInt32* aReturn);  \
+  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, nsIDOMInstallVersion* aVersion, PRInt32* aReturn);  \
+  NS_IMETHOD    CompareVersion(const nsString& aRegName, PRInt32 aMajor, PRInt32 aMinor, PRInt32 aRelease, PRInt32 aBuild, PRInt32* aReturn);  \
+  NS_IMETHOD    CompareVersion(const nsString& aRegName, const nsString& aVersion, PRInt32* aReturn);  \
+  NS_IMETHOD    CompareVersion(const nsString& aRegName, nsIDOMInstallVersion* aVersion, PRInt32* aReturn);  \
+
+
+
+#define NS_FORWARD_IDOMINSTALLTRIGGERGLOBAL(_to)  \
+  NS_IMETHOD    UpdateEnabled(PRBool* aReturn) { return _to##UpdateEnabled(aReturn); }  \
+  NS_IMETHOD    StartSoftwareUpdate(const nsString& aURL, PRInt32 aFlags, PRInt32* aReturn) { return _to##StartSoftwareUpdate(aURL, aFlags, aReturn); }  \
+  NS_IMETHOD    StartSoftwareUpdate(const nsString& aURL, PRInt32* aReturn) { return _to##StartSoftwareUpdate(aURL, aReturn); }  \
+  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, PRInt32 aDiffLevel, const nsString& aVersion, PRInt32 aMode, PRInt32* aReturn) { return _to##ConditionalSoftwareUpdate(aURL, aRegName, aDiffLevel, aVersion, aMode, aReturn); }  \
+  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, PRInt32 aDiffLevel, nsIDOMInstallVersion* aVersion, PRInt32 aMode, PRInt32* aReturn) { return _to##ConditionalSoftwareUpdate(aURL, aRegName, aDiffLevel, aVersion, aMode, aReturn); }  \
+  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, nsIDOMInstallVersion* aRegName, const nsString& aVersion, PRInt32 aMode, PRInt32* aReturn) { return _to##ConditionalSoftwareUpdate(aURL, aDiffLevel, aVersion, aMode, aReturn); }  \
+  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, const nsString& aVersion, PRInt32 aMode, PRInt32* aReturn) { return _to##ConditionalSoftwareUpdate(aURL, aDiffLevel, aVersion, aMode, aReturn); }  \
+  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, const nsString& aVersion, PRInt32* aReturn) { return _to##ConditionalSoftwareUpdate(aURL, aDiffLevel, aVersion, aReturn); }  \
+  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, nsIDOMInstallVersion* aVersion, PRInt32* aReturn) { return _to##ConditionalSoftwareUpdate(aURL, aDiffLevel, aVersion, aReturn); }  \
+  NS_IMETHOD    CompareVersion(const nsString& aRegName, PRInt32 aMajor, PRInt32 aMinor, PRInt32 aRelease, PRInt32 aBuild, PRInt32* aReturn) { return _to##CompareVersion(aRegName, aMajor, aMinor, aRelease, aBuild, aReturn); }  \
+  NS_IMETHOD    CompareVersion(const nsString& aRegName, const nsString& aVersion, PRInt32* aReturn) { return _to##CompareVersion(aRegName, aVersion, aReturn); }  \
+  NS_IMETHOD    CompareVersion(const nsString& aRegName, nsIDOMInstallVersion* aVersion, PRInt32* aReturn) { return _to##CompareVersion(aRegName, aVersion, aReturn); }  \
+
+
+extern nsresult NS_InitInstallTriggerGlobalClass(nsIScriptContext *aContext, void **aPrototype);
+
+extern "C" NS_DOM nsresult NS_NewScriptInstallTriggerGlobal(nsIScriptContext *aContext, nsISupports *aSupports, nsISupports *aParent, void **aReturn);
+
+#endif // nsIDOMInstallTriggerGlobal_h__

mozilla/xpinstall/public/nsIDOMInstallVersion.h

@@ -0,0 +1,107 @@
+/* -*- 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.
+ */
+/* AUTO-GENERATED. DO NOT EDIT!!! */
+
+#ifndef nsIDOMInstallVersion_h__
+#define nsIDOMInstallVersion_h__
+
+#include "nsISupports.h"
+#include "nsString.h"
+#include "nsIScriptContext.h"
+
+class nsIDOMInstallVersion;
+
+#define NS_IDOMINSTALLVERSION_IID \
+ { 0x18c2f986, 0xb09f, 0x11d2, \
+  {0xbc, 0xde, 0x00, 0x80, 0x5f, 0x0e, 0x13, 0x53}} 
+
+class nsIDOMInstallVersion : public nsISupports {
+public:
+  static const nsIID& IID() { static nsIID iid = NS_IDOMINSTALLVERSION_IID; return iid; }
+  enum {
+    EQUAL = 0,
+    BLD_DIFF = 1,
+    BLD_DIFF_MINUS = -1,
+    REL_DIFF = 2,
+    REL_DIFF_MINUS = -2,
+    MINOR_DIFF = 3,
+    MINOR_DIFF_MINUS = -3,
+    MAJOR_DIFF = 4,
+    MAJOR_DIFF_MINUS = -4
+  };
+
+  NS_IMETHOD    GetMajor(PRInt32* aMajor)=0;
+  NS_IMETHOD    SetMajor(PRInt32 aMajor)=0;
+
+  NS_IMETHOD    GetMinor(PRInt32* aMinor)=0;
+  NS_IMETHOD    SetMinor(PRInt32 aMinor)=0;
+
+  NS_IMETHOD    GetRelease(PRInt32* aRelease)=0;
+  NS_IMETHOD    SetRelease(PRInt32 aRelease)=0;
+
+  NS_IMETHOD    GetBuild(PRInt32* aBuild)=0;
+  NS_IMETHOD    SetBuild(PRInt32 aBuild)=0;
+
+  NS_IMETHOD    Init(const nsString& aVersionString)=0;
+
+  NS_IMETHOD    ToString(nsString& aReturn)=0;
+
+  NS_IMETHOD    CompareTo(nsIDOMInstallVersion* aVersionObject, PRInt32* aReturn)=0;
+  NS_IMETHOD    CompareTo(const nsString& aString, PRInt32* aReturn)=0;
+  NS_IMETHOD    CompareTo(PRInt32 aMajor, PRInt32 aMinor, PRInt32 aRelease, PRInt32 aBuild, PRInt32* aReturn)=0;
+};
+
+
+#define NS_DECL_IDOMINSTALLVERSION   \
+  NS_IMETHOD    GetMajor(PRInt32* aMajor);  \
+  NS_IMETHOD    SetMajor(PRInt32 aMajor);  \
+  NS_IMETHOD    GetMinor(PRInt32* aMinor);  \
+  NS_IMETHOD    SetMinor(PRInt32 aMinor);  \
+  NS_IMETHOD    GetRelease(PRInt32* aRelease);  \
+  NS_IMETHOD    SetRelease(PRInt32 aRelease);  \
+  NS_IMETHOD    GetBuild(PRInt32* aBuild);  \
+  NS_IMETHOD    SetBuild(PRInt32 aBuild);  \
+  NS_IMETHOD    Init(const nsString& aVersionString);  \
+  NS_IMETHOD    ToString(nsString& aReturn);  \
+  NS_IMETHOD    CompareTo(nsIDOMInstallVersion* aVersionObject, PRInt32* aReturn);  \
+  NS_IMETHOD    CompareTo(const nsString& aString, PRInt32* aReturn);  \
+  NS_IMETHOD    CompareTo(PRInt32 aMajor, PRInt32 aMinor, PRInt32 aRelease, PRInt32 aBuild, PRInt32* aReturn);  \
+
+
+
+#define NS_FORWARD_IDOMINSTALLVERSION(_to)  \
+  NS_IMETHOD    GetMajor(PRInt32* aMajor) { return _to##GetMajor(aMajor); } \
+  NS_IMETHOD    SetMajor(PRInt32 aMajor) { return _to##SetMajor(aMajor); } \
+  NS_IMETHOD    GetMinor(PRInt32* aMinor) { return _to##GetMinor(aMinor); } \
+  NS_IMETHOD    SetMinor(PRInt32 aMinor) { return _to##SetMinor(aMinor); } \
+  NS_IMETHOD    GetRelease(PRInt32* aRelease) { return _to##GetRelease(aRelease); } \
+  NS_IMETHOD    SetRelease(PRInt32 aRelease) { return _to##SetRelease(aRelease); } \
+  NS_IMETHOD    GetBuild(PRInt32* aBuild) { return _to##GetBuild(aBuild); } \
+  NS_IMETHOD    SetBuild(PRInt32 aBuild) { return _to##SetBuild(aBuild); } \
+  NS_IMETHOD    Init(const nsString& aVersionString) { return _to##Init(aVersionString); }  \
+  NS_IMETHOD    ToString(nsString& aReturn) { return _to##ToString(aReturn); }  \
+  NS_IMETHOD    CompareTo(nsIDOMInstallVersion* aVersionObject, PRInt32* aReturn) { return _to##CompareTo(aVersionObject, aReturn); }  \
+  NS_IMETHOD    CompareTo(const nsString& aString, PRInt32* aReturn) { return _to##CompareTo(aString, aReturn); }  \
+  NS_IMETHOD    CompareTo(PRInt32 aMajor, PRInt32 aMinor, PRInt32 aRelease, PRInt32 aBuild, PRInt32* aReturn) { return _to##CompareTo(aMajor, aMinor, aRelease, aBuild, aReturn); }  \
+
+
+extern nsresult NS_InitInstallVersionClass(nsIScriptContext *aContext, void **aPrototype);
+
+extern "C" NS_DOM nsresult NS_NewScriptInstallVersion(nsIScriptContext *aContext, nsISupports *aSupports, nsISupports *aParent, void **aReturn);
+
+#endif // nsIDOMInstallVersion_h__

mozilla/xpinstall/public/nsISoftwareUpdate.h

@@ -0,0 +1,85 @@
+/* -*- 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 "License"); you may not use this file except in
+ * compliance with the License.  You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, 
+ * released March 31, 1998. 
+ *
+ * The Initial Developer of the Original Code is Netscape Communications 
+ * Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ *
+ * Contributors:
+ *     Daniel Veditz <dveditz@netscape.com>
+ *     Douglas Turner <dougt@netscape.com>
+ */
+
+#ifndef nsISoftwareUpdate_h__
+#define nsISoftwareUpdate_h__
+
+#include "nsISupports.h"
+#include "nsIFactory.h"
+#include "nsString.h"
+
+#include "nsIXPInstallProgress.h"
+
+#define NS_IXPINSTALLCOMPONENT_PROGID NS_IAPPSHELLCOMPONENT_PROGID "/xpinstall"
+#define NS_IXPINSTALLCOMPONENT_CLASSNAME "Mozilla XPInstall Component"
+
+
+#define NS_ISOFTWAREUPDATE_IID                   \
+{ 0x18c2f992, 									 \
+  0xb09f, 										 \
+  0x11d2,						                 \
+ {0xbc, 0xde, 0x00, 0x80, 0x5f, 0x0e, 0x13, 0x53}\
+} 
+
+
+class nsISoftwareUpdate : public nsISupports  
+{
+    public:
+        	NS_DEFINE_STATIC_IID_ACCESSOR(NS_ISOFTWAREUPDATE_IID)
+            
+            NS_IMETHOD InstallJar(const nsString& fromURL,
+                                  const nsString& localFile,
+                                  long  flags) = 0; 
+            
+            NS_IMETHOD RegisterNotifier(nsIXPInstallProgress *notifier) = 0;
+            
+            NS_IMETHOD InstallPending(void) = 0;
+
+            /* FIX: these should be in a private interface */
+            NS_IMETHOD InstallJarCallBack()                   = 0; 
+            NS_IMETHOD GetTopLevelNotifier(nsIXPInstallProgress **notifier) = 0;
+};
+
+
+class nsSoftwareUpdateFactory : public nsIFactory 
+{
+    public:
+        
+        nsSoftwareUpdateFactory();
+        virtual ~nsSoftwareUpdateFactory();
+        
+        NS_DECL_ISUPPORTS
+
+              NS_IMETHOD CreateInstance(nsISupports *aOuter,
+                                        REFNSIID aIID,
+                                        void **aResult);
+
+              NS_IMETHOD LockFactory(PRBool aLock);
+
+};
+
+
+#endif // nsISoftwareUpdate_h__
+

mozilla/xpinstall/public/nsIXPInstallProgress.idl

@@ -0,0 +1,30 @@
+/* -*- Mode: IDL; 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.
+ */
+
+#include "nsISupports.idl"
+
+[uuid(eea90d40-b059-11d2-915e-c12b696c9333)]
+interface nsIXPInstallProgress : nsISupports
+{
+        void BeforeJavascriptEvaluation();
+        void AfterJavascriptEvaluation();
+        void InstallStarted([const] in string UIPackageName);
+        void ItemScheduled([const] in string message );
+        void InstallFinalization([const] in string message, in long itemNum, in long totNum );
+        void InstallAborted();
+};

mozilla/xpinstall/public/nsIXPInstallProgressNotifier.h

@@ -0,0 +1,93 @@
+/* -*- 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 "License"); you may not use this file except in
+ * compliance with the License.  You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, 
+ * released March 31, 1998. 
+ *
+ * The Initial Developer of the Original Code is Netscape Communications 
+ * Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ *
+ * Contributors:
+ *     Douglas Turner <dougt@netscape.com>
+ */
+
+
+#ifndef nsIXPInstallProgressNotifier_h__
+#define nsIXPInstallProgressNotifier_h__
+
+
+class nsIXPInstallProgressNotifier
+{
+     public:
+        
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////
+        // Function name	: BeforeJavascriptEvaluation
+        // Description	    : This will be called when prior to the install script being evaluate
+        // Return type		: void 
+        // Argument         : void
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////
+
+        virtual void BeforeJavascriptEvaluation(void) = 0;
+        
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////
+        // Function name	: AfterJavascriptEvaluation
+        // Description	    : This will be called after the install script has being evaluated
+        // Return type		: void 
+        // Argument         : void
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////
+         
+        virtual void AfterJavascriptEvaluation(void) = 0;
+
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////
+        // Function name	: InstallStarted
+        // Description	    : This will be called when StartInstall has been called
+        // Return type		: void
+        // Argument         : char* UIPackageName - User Package Name
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////
+
+        virtual void InstallStarted(const char* UIPackageName) = 0;
+        
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////
+        // Function name	: ItemScheduled
+        // Description	    : This will be called when items are being scheduled 
+        // Return type		: Any value returned other than zero, will be treated as an error and the script will be aborted
+        // Argument         : The message that should be displayed to the user
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////
+
+        virtual long ItemScheduled( const char* message ) = 0;
+        
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////
+        // Function name	: InstallFinalization
+        // Description	    : This will be called when the installation is in its Finalize stage 
+        // Return type		: void 
+        // Argument         : char* message - The message that should be displayed to the user
+        // Argument         : long itemNum  - This is the current item number
+        // Argument         : long totNum   - This is the total number of items
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////
+
+        virtual void InstallFinalization( const char* message, long itemNum, long totNum ) = 0;
+
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////
+        // Function name	: InstallAborted
+        // Description	    : This will be called when the install is aborted 
+        // Return type		: void
+        // Argument         : void
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////
+
+        virtual void InstallAborted(void) = 0;
+
+};
+
+
+#endif

mozilla/xpinstall/public/nsSoftwareUpdateIIDs.h

@@ -0,0 +1,64 @@
+/* -*- 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 "License"); you may not use this file except in
+ * compliance with the License.  You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, 
+ * released March 31, 1998. 
+ *
+ * The Initial Developer of the Original Code is Netscape Communications 
+ * Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ *
+ * Contributors:
+ *     Daniel Veditz <dveditz@netscape.com>
+ *     Douglas Turner <dougt@netscape.com>
+ */
+
+#ifndef nsSoftwareUpdateIIDs_h___
+#define nsSoftwareUpdateIIDs_h___
+
+#define NS_SoftwareUpdate_CID                        \
+{ /* 18c2f989-b09f-11d2-bcde-00805f0e1353 */         \
+    0x18c2f989,                                      \
+    0xb09f,                                          \
+    0x11d2,                                          \
+    {0xbc, 0xde, 0x00, 0x80, 0x5f, 0x0e, 0x13, 0x53} \
+}
+
+#define NS_SoftwareUpdateInstall_CID                 \
+{ /* 18c2f98b-b09f-11d2-bcde-00805f0e1353 */         \
+    0x18c2f98b,                                      \
+    0xb09f,                                          \
+    0x11d2,                                          \
+    {0xbc, 0xde, 0x00, 0x80, 0x5f, 0x0e, 0x13, 0x53} \
+}
+
+#define NS_SoftwareUpdateInstallTrigger_CID          \
+{ /* 18c2f98d-b09f-11d2-bcde-00805f0e1353 */         \
+    0x18c2f98d,                                      \
+    0xb09f,                                          \
+    0x11d2,                                          \
+    {0xbc, 0xde, 0x00, 0x80, 0x5f, 0x0e, 0x13, 0x53} \
+}
+
+#define NS_SoftwareUpdateInstallVersion_CID          \
+{ /* 18c2f98f-b09f-11d2-bcde-00805f0e1353 */         \
+    0x18c2f98f,                                      \
+    0xb09f,                                          \
+    0x11d2,                                          \
+    {0xbc, 0xde, 0x00, 0x80, 0x5f, 0x0e, 0x13, 0x53} \
+}
+
+
+
+#endif /* nsSoftwareUpdateIIDs_h___ */
+

mozilla/xpinstall/res/MANIFEST

@@ -0,0 +1,3 @@
+progress.xul
+progress.css
+progress.html

mozilla/xpinstall/res/Makefile.in

@@ -1,3 +1,5 @@
+#!gmake
+#
 # 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
@@ -12,24 +14,21 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
-#
-# This is a list of local files which get copied to the mozilla:dist:mailnews directory
-#
 
-nsMsgLineBuffer.h
-nsMsgGroupRecord.h
-nsUInt32Array.h
-nsMsgKeySet.h
-nsMsgFolder.h
-nsMsgDBFolder.h
-nsLocalFolderSummarySpec.h
-nsMsgIdentity.h
-nsMsgIncomingServer.h
-nsNewsSummarySpec.h
-nsMsgUtils.h
-nsMessage.h
-nsMsgProtocol.h
-nsMsgTxn.h
-nsMsgMailNewsUrl.h
-nsMsgI18N.h
+DEPTH=../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
 
+include $(DEPTH)/config/autoconf.mk
+include $(topsrcdir)/config/config.mk
+include $(topsrcdir)/config/rules.mk
+
+EXPORT_RESOURCE_XPINSTALL = \
+	$(srcdir)/progress.xul \
+	$(srcdir)/progress.html \
+	$(srcdir)/progress.css \
+	$(NULL)
+
+install:: 
+	$(INSTALL) $(EXPORT_RESOURCE_XPINSTALL) $(DIST)/bin/res/xpinstall

mozilla/xpinstall/res/makefile.win

@@ -0,0 +1,31 @@
+#!nmake
+#
+# 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.
+
+DEPTH=..\..
+IGNORE_MANIFEST=1
+
+include <$(DEPTH)\config\rules.mak>
+
+install:: $(DLL)
+	$(MAKE_INSTALL) progress.xul $(DIST)\bin\res\xpinstall
+    $(MAKE_INSTALL) progress.css $(DIST)\bin\res\xpinstall
+    $(MAKE_INSTALL) progress.html $(DIST)\bin\res\xpinstall
+
+clobber::
+	rm -f $(DIST)\res\xpinstall\progress.xul
+    rm -f $(DIST)\res\xpinstall\progress.css
+    rm -f $(DIST)\res\xpinstall\progress.html

mozilla/xpinstall/res/progress.css

@@ -0,0 +1,3 @@
+TD {
+    font: 10pt sans-serif;
+}

mozilla/xpinstall/res/progress.html

@@ -0,0 +1,16 @@
+<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<html>
+<body bgcolor="#C0C0C0"  style="overflow:visible; margin: 0px; color-background: rgb(192,192,192);">
+<center>
+<table BORDER COLS=5 WIDTH="99%" style="color-background:rgb(192,192,192);">
+<tr>
+<td WIDTH="3%"  NOWRAP style="border: 1px inset rgb(192,192,192);">&nbsp</td>
+<td WIDTH="3%"  NOWRAP style="border: 1px inset rgb(192,192,192);">&nbsp</td>
+<td WIDTH="3%"  NOWRAP style="border: 1px inset rgb(192,192,192);">&nbsp</td>
+<td WIDTH="10%" NOWRAP style="border: 1px inset rgb(192,192,192);">&nbsp</td>
+<td WIDTH="81%" NOWRAP style="border: 1px inset rgb(192,192,192);">&nbsp</td>
+</tr>
+</table>
+</center>
+</body>
+</html>

mozilla/xpinstall/res/progress.xul

@@ -0,0 +1,67 @@
+<?xml version="1.0"?> 
+<?xml-stylesheet href="../samples/xul.css" type="text/css"?> 
+<?xml-stylesheet href="progress.css" type="text/css"?> 
+
+<!DOCTYPE window
+[
+<!ENTITY downloadWindow.title "XPInstall Progress"> 
+<!ENTITY  status "Status:"> 
+<!ENTITY  cancelButtonTitle "Cancel">
+]
+> 
+
+<window xmlns:html="http://www.w3.org/TR/REC-html40"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        title="XPInstall Progress"
+        width="425"
+        height="225">
+
+    <data>
+        <broadcaster id="data.canceled" type="string" value="false"/>
+    </data>
+
+
+    <html:script>
+ 
+         function cancelInstall() 
+         {
+            var cancelData = document.getElementById("data.canceled");
+            cancelData.setAttribute( "value", "true");
+         }
+
+    </html:script>
+
+<html:center>
+  <html:table style="width:100%;">
+
+    <html:tr>
+      <html:td align="center">
+        <html:input id="dialog.uiPackageName" readonly="" style="background-color:lightgray;width:300px;"/>
+      </html:td>
+    </html:tr>
+
+    <html:tr>
+      <html:td nowrap="" style="border: 1px rgb(192,192,192);" align="center">
+        <html:input id="dialog.currentAction" readonly="" style="background-color:lightgray;width:450px;"/>
+      </html:td>
+    </html:tr>
+
+
+    <html:tr>
+      <html:td align="center" width="15%" nowrap="" style="border: 1px rgb(192,192,192);">
+        <progressmeter id="dialog.progress" mode="undetermined" style="width:300px;height:16px;">
+        </progressmeter>
+	  </html:td>
+    </html:tr>
+
+    <html:tr>
+      <html:td align="center" width="3%"  nowrap="" style="border: 1px rgb(192,192,192);">
+        <html:button onclick="cancelInstall()" height="12">
+          &cancelButtonTitle;
+        </html:button>
+      </html:td>
+    </html:tr>
+  </html:table>
+
+</html:center>
+</window>

mozilla/xpinstall/src/Makefile.in

@@ -0,0 +1,61 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "License"); you may not use this file except in
+# compliance with the License.  You may obtain a copy of the License at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is Mozilla Communicator client code, 
+# released March 31, 1998. 
+#
+# The Initial Developer of the Original Code is Netscape Communications 
+# Corporation.  Portions created by Netscape are 
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+# Contributors:
+#     Daniel Veditz <dveditz@netscape.com>
+#     Douglas Turner <dougt@netscape.com>
+
+DEPTH           = ../..
+topsrcdir       = @top_srcdir@
+VPATH           = @srcdir@
+srcdir          = @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= xpinstall
+LIBRARY_NAME	= xpinstall
+IS_COMPONENT	= 1
+REQUIRES        = dom js netlib raptor xpcom
+
+CPPSRCS = \
+    nsSoftwareUpdate.cpp        \
+    nsInstall.cpp               \
+    nsInstallDelete.cpp         \
+    nsInstallExecute.cpp        \
+    nsInstallFile.cpp           \
+    nsInstallFolder.cpp         \
+    nsInstallPatch.cpp          \
+    nsInstallUninstall.cpp      \
+    nsInstallTrigger.cpp        \
+    nsInstallResources.cpp      \
+    nsJSInstall.cpp             \
+    nsJSInstallTriggerGlobal.cpp\
+    nsSoftwareUpdateRun.cpp     \
+    nsSoftwareUpdateStream.cpp  \
+    nsTopProgressNotifier.cpp   \
+    nsLoggingProgressNotifier   \
+    ScheduledTasks.cpp          \
+    nsInstallFileOpItem.cpp     \
+    $(NULL)
+
+INCLUDES += -I$(srcdir)/../public
+
+include $(topsrcdir)/config/rules.mk
+

mozilla/xpinstall/src/PatchableAppleSingle.h

@@ -0,0 +1,233 @@
+/* -*- 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 "License"); you may not use this file except in
+
+ * compliance with the License.  You may obtain a copy of the License at
+
+ * http://www.mozilla.org/NPL/
+
+ *
+
+ * Software distributed under the License is distributed on an "AS IS" basis,
+
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+
+ * for the specific language governing rights and limitations under the
+
+ * License.
+
+ *
+
+ * The Original Code is Mozilla Communicator client code, 
+
+ * released March 31, 1998. 
+
+ *
+
+ * The Initial Developer of the Original Code is Netscape Communications 
+
+ * Corporation.  Portions created by Netscape are 
+
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+
+ * Reserved.
+
+ *
+
+ * Contributors:
+
+ *     Douglas Turner <dougt@netscape.com>
+
+ */
+
+ 
+
+#ifndef SU_PAS_H
+
+#define SU_PAS_H
+
+
+
+
+
+#include <Errors.h>
+
+#include <Types.h>
+
+#include <Files.h>
+
+#include <Script.h>
+
+#include <Resources.h>
+
+
+
+typedef struct PASHeader /* header portion of Patchable AppleSingle */
+
+{
+
+       UInt32 magicNum; 	/* internal file type tag = 0x00244200*/
+
+       UInt32 versionNum; 	/* format version: 1 = 0x00010000 */
+
+       UInt8 filler[16]; 	/* filler */
+
+       UInt16 numEntries; 	/* number of entries which follow */
+
+} PASHeader ; 
+
+
+
+
+
+typedef struct PASEntry 	/* one Patchable AppleSingle entry descriptor */
+
+{
+
+        UInt32 entryID; 	/* entry type: see list, 0 invalid 		*/
+
+        UInt32 entryOffset; /* offset, in bytes, from beginning 	*/
+
+                            /* of file to this entry's data 		*/
+
+        UInt32 entryLength; /* length of data in octets 			*/
+
+        
+
+} PASEntry; 
+
+
+
+
+
+typedef struct PASMiscInfo
+
+{
+
+	short	fileHasResFork;
+
+	short	fileResAttrs;
+
+	OSType 	fileType;
+
+	OSType	fileCreator;
+
+	UInt32	fileFlags;
+
+
+
+} PASMiscInfo; 
+
+
+
+
+
+typedef struct PASResFork
+
+{
+
+	short	NumberOfTypes;
+
+	
+
+} PASResFork; 
+
+
+
+
+
+typedef struct PASResource
+
+{
+
+	short			attr;
+
+	short			attrID;
+
+	OSType			attrType;
+
+	Str255			attrName;
+
+	unsigned long	length;
+
+		
+
+} PASResource; 
+
+
+
+
+
+
+
+#if PRAGMA_ALIGN_SUPPORTED
+
+#pragma options align=reset
+
+#endif
+
+
+
+
+
+#define kCreator	'MOSS'
+
+#define kType		'PASf'
+
+#define PAS_BUFFER_SIZE (1024*512)
+
+
+
+#define PAS_MAGIC_NUM	(0x00244200)
+
+#define PAS_VERSION		(0x00010000)
+
+
+
+enum
+
+{
+
+	ePas_Data	=	1,
+
+	ePas_Misc,
+
+	ePas_Resource
+
+};
+
+
+
+#ifdef __cplusplus
+
+extern "C" {
+
+#endif
+
+
+
+/* Prototypes */
+
+OSErr PAS_EncodeFile(FSSpec *inSpec, FSSpec *outSpec);
+
+OSErr PAS_DecodeFile(FSSpec *inSpec, FSSpec *outSpec);
+
+
+
+
+
+
+
+#ifdef __cplusplus
+
+}
+
+#endif
+
+
+
+#endif /* SU_PAS_H */

mozilla/xpinstall/src/ScheduledTasks.cpp

@@ -0,0 +1,380 @@
+/* -*- 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 "License"); you may not use this file except in
+ * compliance with the License.  You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, 
+ * released March 31, 1998. 
+ *
+ * The Initial Developer of the Original Code is Netscape Communications 
+ * Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ *
+ * Contributors:
+ *     Daniel Veditz <dveditz@netscape.com>
+ *     Douglas Turner <dougt@netscape.com>
+ */
+
+#include "nscore.h"
+#include "NSReg.h"
+#include "nsFileSpec.h"
+#include "nsFileStream.h"
+#include "nsInstall.h" // for error codes
+#include "prmem.h"
+#include "ScheduledTasks.h"
+
+#ifdef _WINDOWS
+#include <sys/stat.h>
+#include <windows.h>
+
+BOOL WIN32_IsMoveFileExBroken()
+{
+    /* the NT option MOVEFILE_DELAY_UNTIL_REBOOT is broken on 
+     * Windows NT 3.51 Service Pack 4 and NT 4.0 before Service Pack 2
+     */
+    BOOL broken = FALSE;
+    OSVERSIONINFO osinfo;
+
+    // they *all* appear broken--better to have one way that works.
+    return TRUE;
+
+    osinfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+    if (GetVersionEx(&osinfo) && osinfo.dwPlatformId == VER_PLATFORM_WIN32_NT)
+    {
+        if ( osinfo.dwMajorVersion == 3 && osinfo.dwMinorVersion == 51 )
+        {
+            if ( 0 == stricmp(osinfo.szCSDVersion,"Service Pack 4"))
+            {
+                broken = TRUE;
+            }
+        }
+        else if ( osinfo.dwMajorVersion == 4 )
+        {
+            if (osinfo.szCSDVersion[0] == '\0' || 
+                (0 == stricmp(osinfo.szCSDVersion,"Service Pack 1")))
+            {
+                broken = TRUE;
+            }
+        }
+    }
+
+    return broken;
+}
+
+
+PRInt32 DoWindowsReplaceExistingFileStuff(const char* currentName, const char* finalName)
+{
+    PRInt32 err = 0;
+
+    char* final   = strdup(finalName);
+    char* current = strdup(currentName);
+
+    /* couldn't delete, probably in use. Schedule for later */
+     DWORD	dwVersion, dwWindowsMajorVersion;
+
+    /* Get OS version info */
+    dwVersion = GetVersion();
+    dwWindowsMajorVersion =  (DWORD)(LOBYTE(LOWORD(dwVersion)));
+
+    /* Get build numbers for Windows NT or Win32s */
+
+    if (dwVersion < 0x80000000)                // Windows NT
+    {
+    	/* On Windows NT */
+        if ( WIN32_IsMoveFileExBroken() )
+        {
+            /* the MOVEFILE_DELAY_UNTIL_REBOOT option doesn't work on
+             * NT 3.51 SP4 or on NT 4.0 until SP2
+             */
+            struct stat statbuf;
+            PRBool nameFound = PR_FALSE;
+            char tmpname[_MAX_PATH];
+            
+            strncpy( tmpname, finalName, _MAX_PATH );
+            int len = strlen(tmpname);
+            while (!nameFound && len < _MAX_PATH ) 
+            {
+                    tmpname[len-1] = '~';
+                    tmpname[len] = '\0';
+                    if ( stat(tmpname, &statbuf) != 0 )
+                        nameFound = TRUE;
+                    else
+                        len++;
+            }
+
+            if ( nameFound ) 
+            {
+                if ( MoveFile( finalName, tmpname ) ) 
+                {
+                    if ( MoveFile( currentName, finalName ) ) 
+                    {
+                        DeleteFileNowOrSchedule(nsFileSpec(tmpname));
+                    }
+                    else 
+                    {
+                        /* 2nd move failed, put old file back */
+                        MoveFile( tmpname, finalName );
+                    }
+                }
+                else
+                {
+                    /* non-executable in use; schedule for later */
+                    return -1;  // let the start registry stuff do our work!
+                }
+            }
+        }
+        else if ( MoveFileEx(currentName, finalName, MOVEFILE_DELAY_UNTIL_REBOOT) )
+        {
+		    err = 0;
+        }
+    }
+	else // Windows 95 or Win16
+	{
+        /*
+ 		 * Place an entry in the WININIT.INI file in the Windows directory
+		 * to delete finalName and rename currentName to be finalName at reboot
+ 		 */
+
+        int strlen;
+ 		char	Src[_MAX_PATH];   // 8.3 name
+ 		char	Dest[_MAX_PATH];  // 8.3 name
+
+        strlen = GetShortPathName( (LPCTSTR)currentName, (LPTSTR)Src, (DWORD)sizeof(Src) );
+        if ( strlen > 0 ) 
+        {
+            free(current);
+            current   = strdup(Src);
+        }
+
+		strlen = GetShortPathName( (LPCTSTR) finalName, (LPTSTR) Dest, (DWORD) sizeof(Dest));
+        if ( strlen > 0 ) 
+        {
+            free(final);
+            final   = strdup(Dest);
+        }
+        
+        /* NOTE: use OEM filenames! Even though it looks like a Windows
+         *       .INI file, WININIT.INI is processed under DOS 
+         */
+        
+        AnsiToOem( final, final );
+        AnsiToOem( current, current );
+
+        if ( WritePrivateProfileString( "Rename", final, current, "WININIT.INI" ) )
+		    err = 0;
+    }
+    
+    free(final);
+    free(current);
+
+    return err;
+}
+#endif
+
+
+
+
+
+
+REGERR DeleteFileNowOrSchedule(nsFileSpec& filename)
+{
+
+    REGERR result = 0;
+    
+    filename.Delete(false);
+    
+    if (filename.Exists())
+    {
+        RKEY newkey;
+        HREG reg;
+        if ( REGERR_OK == NR_RegOpen("", &reg) ) 
+        {
+            if (REGERR_OK == NR_RegAddKey( reg, ROOTKEY_PRIVATE, REG_DELETE_LIST_KEY, &newkey) )
+            {
+                // FIX should be using nsPersistentFileDescriptor!!!
+
+                result = NR_RegSetEntry( reg, newkey, (char*)(const char*)filename.GetNativePathCString(), REGTYPE_ENTRY_FILE, nsnull, 0);
+                if (result == REGERR_OK)
+                    result = nsInstall::REBOOT_NEEDED;
+            }
+
+            NR_RegClose(reg);
+        }
+    }
+
+    return result;
+}
+/* tmp file is the bad one that we want to replace with target. */
+
+REGERR ReplaceFileNowOrSchedule(nsFileSpec& replacementFile, nsFileSpec& doomedFile )
+{
+    REGERR result = 0;
+    
+    if(replacementFile == doomedFile)
+    {
+        /* do not have to do anything */
+        return result;
+    }
+
+    doomedFile.Delete(false);
+
+    if (! doomedFile.Exists() )
+    {
+        // Now that we have move the existing file, we can move the mExtracedFile into place.
+        nsFileSpec parentofFinalFile;
+
+        doomedFile.GetParent(parentofFinalFile);
+        result = replacementFile.Move(parentofFinalFile);
+        if ( NS_SUCCEEDED(result) )
+        {
+            char* leafName = doomedFile.GetLeafName();
+            replacementFile.Rename(leafName);
+            nsCRT::free(leafName);
+        }
+    }
+    else
+    {
+#ifdef _WINDOWS
+        if (DoWindowsReplaceExistingFileStuff(replacementFile.GetNativePathCString(), doomedFile.GetNativePathCString()) == 0)
+            return 0;
+#endif
+
+        RKEY newkey;
+        HREG reg;
+
+        if ( REGERR_OK == NR_RegOpen("", &reg) ) 
+        {
+            result = NR_RegAddKey( reg, ROOTKEY_PRIVATE, REG_REPLACE_LIST_KEY, &newkey);
+            if ( result == REGERR_OK ) 
+            {
+                char* replacementFileName = (char*)(const char*)replacementFile.GetNativePathCString();
+                result = NR_RegSetEntry( reg, newkey, (char*)(const char*)doomedFile.GetNativePathCString(), REGTYPE_ENTRY_FILE, replacementFileName, strlen(replacementFileName));
+                if (result == REGERR_OK)
+                    result = nsInstall::REBOOT_NEEDED;
+            }
+
+            NR_RegClose(reg);
+        }
+    }
+
+    return result;
+}
+
+void DeleteScheduledFiles(void);
+void ReplaceScheduledFiles(void);
+
+extern "C" void PerformScheduledTasks(void *data)
+{
+    DeleteScheduledFiles();
+    ReplaceScheduledFiles();
+}
+
+
+void DeleteScheduledFiles(void)
+{
+    HREG reg;
+
+    if (REGERR_OK == NR_RegOpen("", &reg))
+    {
+        RKEY    key;
+	    REGENUM state;
+
+        /* perform scheduled file deletions and replacements (PC only) */
+        if (REGERR_OK ==  NR_RegGetKey(reg, ROOTKEY_PRIVATE, REG_DELETE_LIST_KEY,&key))
+        {
+            char buf[MAXREGNAMELEN];
+
+            while (REGERR_OK == NR_RegEnumEntries(reg, key, &state, buf, sizeof(buf), NULL ))
+            {
+                nsFileSpec doomedFile(buf);
+
+                doomedFile.Delete(PR_FALSE);
+                
+                if (! doomedFile.Exists()) 
+                {
+                    NR_RegDeleteEntry( reg, key, buf );
+                }
+            }
+
+            /* delete list node if empty */
+			if (REGERR_NOMORE == NR_RegEnumEntries( reg, key, &state, buf, sizeof(buf), NULL ))
+            {
+                NR_RegDeleteKey(reg, ROOTKEY_PRIVATE, REG_DELETE_LIST_KEY);
+            }
+        }
+        
+        NR_RegClose(reg);
+    }
+}
+
+void ReplaceScheduledFiles(void)
+{
+    HREG reg;
+     
+    if (REGERR_OK == NR_RegOpen("", &reg))
+    {
+        RKEY    key;
+	    REGENUM state;
+
+        /* replace files if any listed */
+        if (REGERR_OK ==  NR_RegGetKey(reg, ROOTKEY_PRIVATE, REG_REPLACE_LIST_KEY, &key))
+        {
+            char tmpfile[MAXREGNAMELEN];
+            char target[MAXREGNAMELEN];
+
+            state = 0;
+            while (REGERR_OK == NR_RegEnumEntries(reg, key, &state, tmpfile, sizeof(tmpfile), NULL ))
+            {
+
+                nsFileSpec replaceFile(tmpfile);
+
+                if (! replaceFile.Exists() )
+                {
+                    NR_RegDeleteEntry( reg, key, tmpfile );
+                }
+                else if ( REGERR_OK != NR_RegGetEntryString( reg, key, tmpfile, target, sizeof(target) ) )
+                {
+                    /* can't read target filename, corruption? */
+                    NR_RegDeleteEntry( reg, key, tmpfile );
+                }
+                else 
+                {
+                    nsFileSpec targetFile(target);
+                
+                    targetFile.Delete(PR_FALSE);
+                
+                    if (!targetFile.Exists())
+                    {
+                        nsFileSpec parentofTarget;
+                        targetFile.GetParent(parentofTarget);                                           
+                    
+                        nsresult result = replaceFile.Move(parentofTarget);
+                        if ( NS_SUCCEEDED(result) )
+                        {
+                            char* leafName = targetFile.GetLeafName();
+                            replaceFile.Rename(leafName);
+                            nsCRT::free(leafName);
+                            
+                            NR_RegDeleteEntry( reg, key, tmpfile );
+                        }
+                    }
+                }
+            }
+            /* delete list node if empty */
+            if (REGERR_NOMORE == NR_RegEnumEntries(reg, key, &state, tmpfile, sizeof(tmpfile), NULL )) 
+            {
+                NR_RegDeleteKey(reg, ROOTKEY_PRIVATE, REG_REPLACE_LIST_KEY);
+            }
+        }
+        
+        NR_RegClose(reg);
+    }
+}

mozilla/xpinstall/src/ScheduledTasks.h

@@ -0,0 +1,42 @@
+/* -*- 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 "License"); you may not use this file except in
+ * compliance with the License.  You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, 
+ * released March 31, 1998. 
+ *
+ * The Initial Developer of the Original Code is Netscape Communications 
+ * Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ *
+ * Contributors:
+ *     Daniel Veditz <dveditz@netscape.com>
+ *     Douglas Turner <dougt@netscape.com>
+ */
+
+
+#ifndef __SCHEDULEDTASKS_H__
+#define __SCHEDULEDTASKS_H__
+
+
+#include "NSReg.h"
+#include "nsFileSpec.h"
+
+
+REGERR DeleteFileNowOrSchedule(nsFileSpec& filename);
+REGERR ReplaceFileNowOrSchedule(nsFileSpec& tmpfile, nsFileSpec& target );
+
+
+extern "C" void PerformScheduledTasks(void *data);
+
+
+#endif

mozilla/xpinstall/src/gdiff.h

@@ -0,0 +1,135 @@
+/* -*- 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.
+ */
+/*--------------------------------------------------------------
+ * GDIFF.H
+ *
+ * Constants used in processing the GDIFF format
+ *--------------------------------------------------------------*/
+
+
+#include "prio.h"
+#include "nsFileSpec.h"
+
+#define GDIFF_MAGIC         "\xD1\xFF\xD1\xFF"
+#define GDIFF_MAGIC_LEN     4
+#define GDIFF_VER           5
+#define GDIFF_EOF           "\0"
+
+#define GDIFF_VER_POS       4
+#define GDIFF_CS_POS        5
+#define GDIFF_CSLEN_POS     6
+
+#define GDIFF_HEADERSIZE    7
+#define GDIFF_APPDATALEN    4
+
+#define GDIFF_CS_NONE       0
+#define GDIFF_CS_MD5        1
+#define GDIFF_CS_SHA        2
+#define GDIFF_CS_CRC32      32
+
+#define CRC32_LEN           4
+
+/*--------------------------------------
+ *  GDIFF opcodes
+ *------------------------------------*/
+#define ENDDIFF     0
+#define ADD8MAX     246
+#define ADD16       247
+#define ADD32       248
+#define COPY16BYTE  249
+#define COPY16SHORT 250
+#define COPY16LONG  251
+#define COPY32BYTE  252
+#define COPY32SHORT 253
+#define COPY32LONG  254
+#define COPY64      255
+
+/* instruction sizes */
+#define ADD16SIZE           2
+#define ADD32SIZE           4
+#define COPY16BYTESIZE      3
+#define COPY16SHORTSIZE     4
+#define COPY16LONGSIZE      6
+#define COPY32BYTESIZE      5
+#define COPY32SHORTSIZE     6
+#define COPY32LONGSIZE      8
+#define COPY64SIZE          12
+
+
+/*--------------------------------------
+ *  error codes
+ *------------------------------------*/
+#define GDIFF_OK                0
+#define GDIFF_ERR_UNKNOWN       -1
+#define GDIFF_ERR_ARGS          -2
+#define GDIFF_ERR_ACCESS        -3
+#define GDIFF_ERR_MEM           -4
+#define GDIFF_ERR_HEADER        -5
+#define GDIFF_ERR_BADDIFF       -6
+#define GDIFF_ERR_OPCODE        -7
+#define GDIFF_ERR_OLDFILE       -8
+#define GDIFF_ERR_CHKSUMTYPE    -9
+#define GDIFF_ERR_CHECKSUM      -10
+#define GDIFF_ERR_CHECKSUM_TARGET  -11
+#define GDIFF_ERR_CHECKSUM_RESULT  -12
+
+
+/*--------------------------------------
+ *  types
+ *------------------------------------*/
+#ifndef AIX
+#ifdef OSF1
+#include <sys/types.h>
+#else
+typedef unsigned char uchar;
+#endif
+#endif
+
+typedef struct _diffdata {
+    PRFileDesc*	fSrc;
+    PRFileDesc*	fOut;
+    PRFileDesc*	fDiff;
+    uint8       checksumType;
+    uint8       checksumLength;
+    uchar*      oldChecksum;
+    uchar*      newChecksum;
+    PRBool      bMacAppleSingle;
+    PRBool      bWin32BoundImage;
+    uchar*      databuf;
+    uint32      bufsize;
+} DIFFDATA;
+
+typedef DIFFDATA* pDIFFDATA;
+
+
+/*--------------------------------------
+ *  miscellaneous
+ *------------------------------------*/
+
+#define APPFLAG_W32BOUND        "autoinstall:Win32PE"
+#define APPFLAG_APPLESINGLE     "autoinstall:AppleSingle"
+
+#ifndef TRUE
+  #define TRUE  1
+#endif
+
+#ifndef FALSE
+  #define FALSE 0
+#endif
+
+

mozilla/xpinstall/src/makefile.win

@@ -0,0 +1,111 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "License"); you may not use this file except in
+# compliance with the License.  You may obtain a copy of the License at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is Mozilla Communicator client code, 
+# released March 31, 1998. 
+#
+# The Initial Developer of the Original Code is Netscape Communications 
+# Corporation.  Portions created by Netscape are 
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+# Contributors:
+#     Daniel Veditz <dveditz@netscape.com>
+#     Douglas Turner <dougt@netscape.com>
+
+
+DEPTH=..\..
+IGNORE_MANIFEST=1
+
+MAKE_OBJ_TYPE = DLL
+MODULE=xpinstall
+
+DLL=.\$(OBJDIR)\$(MODULE).dll
+
+DEFINES=-D_IMPL_NS_DOM -DWIN32_LEAN_AND_MEAN
+
+LCFLAGS =          \
+        $(LCFLAGS) \
+        $(DEFINES) \
+        $(NULL)
+
+LINCS=                          \
+        -I$(PUBLIC)\xpinstall   \
+        -I$(PUBLIC)\jar         \
+        -I$(PUBLIC)\libreg      \
+        -I$(PUBLIC)\netlib      \
+        -I$(PUBLIC)\xpcom       \
+        -I$(PUBLIC)\pref        \
+        -I$(PUBLIC)\rdf         \
+        -I$(PUBLIC)\js          \
+        -I$(PUBLIC)\dom         \
+        -I$(PUBLIC)\raptor      \
+        -I$(PUBLIC)\nspr2       \
+		-I$(PUBLIC)\zlib        \
+        -I$(PUBLIC)\xpfe\components \
+        $(NULL)
+
+LLIBS =                                \
+        $(DIST)\lib\jar50.lib          \
+        $(DIST)\lib\libreg32.lib       \
+        $(DIST)\lib\netlib.lib         \
+        $(DIST)\lib\xpcom.lib        \
+        $(DIST)\lib\js3250.lib         \
+        $(DIST)\lib\jsdombase_s.lib    \
+        $(DIST)\lib\jsdomevents_s.lib  \
+		$(DIST)\lib\zlib.lib           \
+		$(DIST)\lib\plc3.lib           \
+        $(LIBNSPR)                     \
+        $(NULL)
+
+
+OBJS =                                          \
+       .\$(OBJDIR)\nsInstall.obj                \
+       .\$(OBJDIR)\nsInstallTrigger.obj         \
+       .\$(OBJDIR)\nsInstallVersion.obj         \
+       .\$(OBJDIR)\nsInstallFolder.obj          \
+       .\$(OBJDIR)\nsJSInstall.obj              \
+       .\$(OBJDIR)\nsJSInstallTriggerGlobal.obj \
+       .\$(OBJDIR)\nsJSInstallVersion.obj       \
+       .\$(OBJDIR)\nsSoftwareUpdate.obj         \
+       .\$(OBJDIR)\nsSoftwareUpdateRun.obj      \
+       .\$(OBJDIR)\nsSoftwareUpdateStream.obj   \
+       .\$(OBJDIR)\nsInstallFile.obj            \
+       .\$(OBJDIR)\nsInstallDelete.obj          \
+       .\$(OBJDIR)\nsInstallExecute.obj         \
+       .\$(OBJDIR)\nsInstallPatch.obj           \
+       .\$(OBJDIR)\nsInstallUninstall.obj       \
+       .\$(OBJDIR)\nsInstallResources.obj       \
+       .\$(OBJDIR)\nsTopProgressNotifier.obj    \
+       .\$(OBJDIR)\nsLoggingProgressNotifier.obj\
+       .\$(OBJDIR)\ScheduledTasks.obj           \
+       .\$(OBJDIR)\nsWinReg.obj                 \
+       .\$(OBJDIR)\nsJSWinReg.obj               \
+       .\$(OBJDIR)\nsWinRegItem.obj             \
+       .\$(OBJDIR)\nsWinRegValue.obj            \
+       .\$(OBJDIR)\nsWinProfile.obj             \
+       .\$(OBJDIR)\nsJSWinProfile.obj           \
+       .\$(OBJDIR)\nsWinProfileItem.obj         \
+       .\$(OBJDIR)\nsInstallProgressDialog.obj  \
+       .\$(OBJDIR)\nsInstallFileOpItem.obj      \
+       $(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+install:: $(DLL)
+    $(MAKE_INSTALL) .\$(OBJDIR)\$(MODULE).lib $(DIST)\lib
+    $(MAKE_INSTALL) .\$(OBJDIR)\$(MODULE).dll $(DIST)\bin\components
+
+clobber::
+        rm -f $(DIST)\lib\$(MODULE).lib
+        rm -f $(DIST)\bin\components\$(MODULE).dll
+

mozilla/xpinstall/src/nsInstall.h

@@ -0,0 +1,265 @@
+/* -*- 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 "License"); you may not use this file except in
+ * compliance with the License.  You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, 
+ * released March 31, 1998. 
+ *
+ * The Initial Developer of the Original Code is Netscape Communications 
+ * Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ *
+ * Contributors:
+ *     Daniel Veditz <dveditz@netscape.com>
+ *     Douglas Turner <dougt@netscape.com>
+ */
+
+
+#ifndef __NS_INSTALL_H__
+#define __NS_INSTALL_H__
+
+#include "nscore.h"
+#include "nsISupports.h"
+
+#include "jsapi.h"
+
+#include "plevent.h"
+
+#include "nsString.h"
+#include "nsFileSpec.h"
+#include "nsVector.h"
+#include "nsHashtable.h"
+
+#include "nsSoftwareUpdate.h"
+
+#include "nsInstallObject.h"
+#include "nsInstallVersion.h"
+
+#include "nsIXPInstallProgress.h"
+
+
+class nsInstallInfo
+{
+  public:
+    
+    nsInstallInfo(const nsString& fromURL, const nsString& localFile, long flags);
+
+    nsInstallInfo(nsVector* fromURL, nsVector* localFiles, long flags);
+    
+    virtual ~nsInstallInfo();
+
+    nsString& GetFromURL(PRUint32 index = 0);
+    
+    nsString& GetLocalFile(PRUint32 index = 0);
+
+    void GetArguments(nsString& args, PRUint32 index = 0);
+    
+    long GetFlags();
+    
+    PRBool    IsMultipleTrigger();
+
+    static void DeleteVector(nsVector* vector);    
+    
+  private:
+    
+    
+    PRBool    mMultipleTrigger;
+    nsresult  mError;
+
+    long       mFlags;
+    nsVector  *mFromURLs;
+    nsVector  *mLocalFiles;
+};
+
+
+
+class nsInstall
+{
+    friend class nsWinReg;
+    friend class nsWinProfile;
+
+    public:
+       
+        enum 
+        {
+            BAD_PACKAGE_NAME            = -200,
+            UNEXPECTED_ERROR            = -201,
+            ACCESS_DENIED               = -202,
+            TOO_MANY_CERTIFICATES       = -203,
+            NO_INSTALLER_CERTIFICATE    = -204,
+            NO_CERTIFICATE              = -205,
+            NO_MATCHING_CERTIFICATE     = -206,
+            UNKNOWN_JAR_FILE            = -207,
+            INVALID_ARGUMENTS           = -208,
+            ILLEGAL_RELATIVE_PATH       = -209,
+            USER_CANCELLED              = -210,
+            INSTALL_NOT_STARTED         = -211,
+            SILENT_MODE_DENIED          = -212,
+            NO_SUCH_COMPONENT           = -213,
+            FILE_DOES_NOT_EXIST         = -214,
+            FILE_READ_ONLY              = -215,
+            FILE_IS_DIRECTORY           = -216,
+            NETWORK_FILE_IS_IN_USE      = -217,
+            APPLE_SINGLE_ERR            = -218,
+            INVALID_PATH_ERR            = -219,
+            PATCH_BAD_DIFF              = -220,
+            PATCH_BAD_CHECKSUM_TARGET   = -221,
+            PATCH_BAD_CHECKSUM_RESULT   = -222,
+            UNINSTALL_FAILED            = -223,
+            GESTALT_UNKNOWN_ERR         = -5550,
+            GESTALT_INVALID_ARGUMENT    = -5551,
+            
+            SUCCESS                     = 0,
+            REBOOT_NEEDED               = 999,
+            
+            LIMITED_INSTALL             = 0,
+            FULL_INSTALL                = 1,
+            NO_STATUS_DLG               = 2,
+            NO_FINALIZE_DLG             = 4,
+
+            INSTALL_FILE_UNEXPECTED_MSG_ID = 0,
+            DETAILS_REPLACE_FILE_MSG_ID = 1,
+            DETAILS_INSTALL_FILE_MSG_ID = 2
+        };
+
+
+        nsInstall();
+        virtual ~nsInstall();
+        
+        PRInt32    SetScriptObject(void* aScriptObject);
+
+        PRInt32    SaveWinRegPrototype(void* aScriptObject);
+        PRInt32    SaveWinProfilePrototype(void* aScriptObject);
+        
+        JSObject*  RetrieveWinRegPrototype(void);
+        JSObject*  RetrieveWinProfilePrototype(void);
+
+        PRInt32    GetUserPackageName(nsString& aUserPackageName);
+        PRInt32    GetRegPackageName(nsString& aRegPackageName);
+
+        PRInt32    AbortInstall();
+        
+        PRInt32    AddDirectory(const nsString& aRegName, const nsString& aVersion, const nsString& aJarSource, const nsString& aFolder, const nsString& aSubdir, PRBool aForceMode, PRInt32* aReturn);
+        PRInt32    AddDirectory(const nsString& aRegName, const nsString& aVersion, const nsString& aJarSource, const nsString& aFolder, const nsString& aSubdir, PRInt32* aReturn);
+        PRInt32    AddDirectory(const nsString& aRegName, const nsString& aJarSource, const nsString& aFolder, const nsString& aSubdir, PRInt32* aReturn);
+        PRInt32    AddDirectory(const nsString& aJarSource, PRInt32* aReturn);
+        
+        PRInt32    AddSubcomponent(const nsString& aRegName, const nsString& aVersion, const nsString& aJarSource, const nsString& aFolder, const nsString& aTargetName, PRBool aForceMode, PRInt32* aReturn);
+        PRInt32    AddSubcomponent(const nsString& aRegName, const nsString& aVersion, const nsString& aJarSource, const nsString& aFolder, const nsString& aTargetName, PRInt32* aReturn);
+        PRInt32    AddSubcomponent(const nsString& aRegName, const nsString& aJarSource, const nsString& aFolder, const nsString& aTargetName, PRInt32* aReturn);
+        PRInt32    AddSubcomponent(const nsString& aJarSource, PRInt32* aReturn);
+        
+        PRInt32    DeleteComponent(const nsString& aRegistryName, PRInt32* aReturn);
+        PRInt32    DeleteFile(const nsString& aFolder, const nsString& aRelativeFileName, PRInt32* aReturn);
+        PRInt32    DiskSpaceAvailable(const nsString& aFolder, PRInt32* aReturn);
+        PRInt32    Execute(const nsString& aJarSource, const nsString& aArgs, PRInt32* aReturn);
+        PRInt32    Execute(const nsString& aJarSource, PRInt32* aReturn);
+        PRInt32    FinalizeInstall(PRInt32* aReturn);
+        PRInt32    Gestalt(const nsString& aSelector, PRInt32* aReturn);
+        PRInt32    GetComponentFolder(const nsString& aComponentName, const nsString& aSubdirectory, nsString** aFolder);
+        PRInt32    GetComponentFolder(const nsString& aComponentName, nsString** aFolder);
+        PRInt32    GetFolder(const nsString& aTargetFolder, const nsString& aSubdirectory, nsString** aFolder);
+        PRInt32    GetFolder(const nsString& aTargetFolder, nsString** aFolder);
+        PRInt32    GetLastError(PRInt32* aReturn);
+        PRInt32    GetWinProfile(const nsString& aFolder, const nsString& aFile, JSContext* jscontext, JSClass* WinProfileClass, jsval* aReturn);
+        PRInt32    GetWinRegistry(JSContext* jscontext, JSClass* WinRegClass, jsval* aReturn);
+        PRInt32    Patch(const nsString& aRegName, const nsString& aVersion, const nsString& aJarSource, const nsString& aFolder, const nsString& aTargetName, PRInt32* aReturn);
+        PRInt32    Patch(const nsString& aRegName, const nsString& aJarSource, const nsString& aFolder, const nsString& aTargetName, PRInt32* aReturn);
+        PRInt32    ResetError();
+        PRInt32    SetPackageFolder(const nsString& aFolder);
+        PRInt32    StartInstall(const nsString& aUserPackageName, const nsString& aPackageName, const nsString& aVersion, PRInt32* aReturn);
+        PRInt32    Uninstall(const nsString& aPackageName, PRInt32* aReturn);
+        
+        PRInt32    FileOpDirCreate(nsFileSpec& aTarget, PRInt32* aReturn);
+        PRInt32    FileOpDirGetParent(nsFileSpec& aTarget, nsFileSpec* aReturn);
+        PRInt32    FileOpDirRemove(nsFileSpec& aTarget, PRInt32 aFlags, PRInt32* aReturn);
+        PRInt32    FileOpDirRename(nsFileSpec& aSrc, nsFileSpec& aTarget, PRInt32* aReturn);
+        PRInt32    FileOpFileCopy(nsFileSpec& aSrc, nsFileSpec& aTarget, PRInt32* aReturn);
+        PRInt32    FileOpFileDelete(nsFileSpec& aTarget, PRInt32 aFlags, PRInt32* aReturn);
+        PRInt32    FileOpFileExists(nsFileSpec& aTarget, PRBool* aReturn);
+        PRInt32    FileOpFileExecute(nsFileSpec& aTarget, nsString& aParams, PRInt32* aReturn);
+        PRInt32    FileOpFileGetNativeVersion(nsFileSpec& aTarget, nsString* aReturn);
+        PRInt32    FileOpFileGetDiskSpaceAvailable(nsFileSpec& aTarget, PRUint32* aReturn);
+        PRInt32    FileOpFileGetModDate(nsFileSpec& aTarget, nsFileSpec::TimeStamp* aReturn);
+        PRInt32    FileOpFileGetSize(nsFileSpec& aTarget, PRUint32* aReturn);
+        PRInt32    FileOpFileIsDirectory(nsFileSpec& aTarget, PRBool* aReturn);
+        PRInt32    FileOpFileIsFile(nsFileSpec& aTarget, PRBool* aReturn);
+        PRInt32    FileOpFileModDateChanged(nsFileSpec& aTarget, nsFileSpec::TimeStamp& aOldStamp, PRBool* aReturn);
+        PRInt32    FileOpFileMove(nsFileSpec& aSrc, nsFileSpec& aTarget, PRInt32* aReturn);
+        PRInt32    FileOpFileRename(nsFileSpec& aSrc, nsFileSpec& aTarget, PRInt32* aReturn);
+        PRInt32    FileOpFileWinShortcutCreate(nsFileSpec& aTarget, PRInt32 aFlags, PRInt32* aReturn);
+        PRInt32    FileOpFileMacAliasCreate(nsFileSpec& aTarget, PRInt32 aFlags, PRInt32* aReturn);
+        PRInt32    FileOpFileUnixLinkCreate(nsFileSpec& aTarget, PRInt32 aFlags, PRInt32* aReturn);
+
+        PRInt32    ExtractFileFromJar(const nsString& aJarfile, nsFileSpec* aSuggestedName, nsFileSpec** aRealName);
+        void       AddPatch(nsHashKey *aKey, nsFileSpec* fileName);
+        void       GetPatch(nsHashKey *aKey, nsFileSpec* fileName);
+        
+        void       GetJarFileLocation(nsString& aFile);
+        void       SetJarFileLocation(const nsString& aFile);
+
+        void       GetInstallArguments(nsString& args);
+        void       SetInstallArguments(const nsString& args);
+
+
+    private:
+        JSObject*           mScriptObject;
+        
+        JSObject*           mWinRegObject;
+        JSObject*           mWinProfileObject;
+        
+        nsString            mJarFileLocation;
+        void*               mJarFileData;
+        
+        nsString            mInstallArguments;
+
+        PRBool              mUserCancelled;
+        
+        PRBool              mUninstallPackage;
+        PRBool              mRegisterPackage;
+
+        nsString            mRegistryPackageName;   /* Name of the package we are installing */
+        nsString            mUIName;                /* User-readable package name */
+
+        nsInstallVersion*   mVersionInfo;           /* Component version info */
+        
+        nsVector*           mInstalledFiles;        
+        nsHashtable*        mPatchList;
+        
+        nsIXPInstallProgress *mNotifier;
+        
+        PRInt32             mLastError;
+
+        void        ParseFlags(int flags);
+        PRInt32     SanityCheck(void);
+        void        GetTime(nsString &aString);
+
+        
+        PRInt32     GetQualifiedRegName(const nsString& name, nsString& qualifiedRegName );
+        PRInt32     GetQualifiedPackageName( const nsString& name, nsString& qualifiedName );
+        
+        void        CurrentUserNode(nsString& userRegNode);
+        PRBool      BadRegName(const nsString& regName);
+        PRInt32     SaveError(PRInt32 errcode);
+
+        void        CleanUp();
+
+        PRInt32     OpenJARFile(void);
+        void        CloseJARFile(void);
+        PRInt32     ExtractDirEntries(const nsString& directory, nsVector *paths);
+
+        PRInt32     ScheduleForInstall(nsInstallObject* ob);
+        
+
+};
+
+#endif

mozilla/xpinstall/src/nsInstallDelete.cpp

@@ -0,0 +1,235 @@
+/* -*- 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 "License"); you may not use this file except in
+ * compliance with the License.  You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, 
+ * released March 31, 1998. 
+ *
+ * The Initial Developer of the Original Code is Netscape Communications 
+ * Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ *
+ * Contributors:
+ *     Daniel Veditz <dveditz@netscape.com>
+ *     Douglas Turner <dougt@netscape.com>
+ */
+
+
+#include "prmem.h"
+
+#include "nsFileSpec.h"
+
+#include "VerReg.h"
+#include "ScheduledTasks.h"
+#include "nsInstallDelete.h"
+#include "nsInstallResources.h"
+
+#include "nsInstall.h"
+#include "nsIDOMInstallVersion.h"
+
+nsInstallDelete::nsInstallDelete( nsInstall* inInstall,
+                                  const nsString& folderSpec,
+                                  const nsString& inPartialPath,
+                                  PRInt32 *error)
+
+: nsInstallObject(inInstall)
+{
+    if ((folderSpec == "null") || (inInstall == NULL)) 
+    {
+        *error = nsInstall::INVALID_ARGUMENTS;
+        return;
+    }
+    
+    mDeleteStatus = DELETE_FILE;
+    mFinalFile      = nsnull;
+    mRegistryName   = "";
+    
+
+    mFinalFile = new nsFileSpec(folderSpec);
+    *mFinalFile += inPartialPath;
+
+    *error = ProcessInstallDelete();
+}
+
+nsInstallDelete::nsInstallDelete( nsInstall* inInstall,
+                                  const nsString& inComponentName,
+                                  PRInt32 *error)
+
+: nsInstallObject(inInstall)
+{
+    if (inInstall == NULL) 
+    {
+        *error = nsInstall::INVALID_ARGUMENTS;
+        return;
+    }
+    
+    mDeleteStatus = DELETE_COMPONENT;
+    mFinalFile    = nsnull;
+    mRegistryName = inComponentName;
+
+    *error = ProcessInstallDelete();
+}
+
+
+nsInstallDelete::~nsInstallDelete()
+{
+    if (mFinalFile == nsnull)
+        delete mFinalFile;
+}
+
+
+PRInt32 nsInstallDelete::Prepare()
+{
+    // no set-up necessary
+    return nsInstall::SUCCESS;
+}
+
+PRInt32 nsInstallDelete::Complete()
+{
+    PRInt32 err = nsInstall::SUCCESS;
+
+    if (mInstall == NULL) 
+       return nsInstall::INVALID_ARGUMENTS;
+
+    if (mDeleteStatus == DELETE_COMPONENT) 
+    {
+        char* temp = mRegistryName.ToNewCString();
+        err = VR_Remove(temp);
+        delete [] temp;
+    }
+
+    if ((mDeleteStatus == DELETE_FILE) || (err == REGERR_OK)) 
+    {
+        err = NativeComplete();
+    }	
+    else 
+    {
+        err = nsInstall::UNEXPECTED_ERROR;
+    }
+
+    
+    return err;
+}
+
+void nsInstallDelete::Abort()
+{
+}
+
+char* nsInstallDelete::toString()
+{
+    char* buffer = new char[1024];
+    
+    if (mDeleteStatus == DELETE_COMPONENT)
+    {
+        sprintf( buffer, nsInstallResources::GetDeleteComponentString(), nsAutoCString(mRegistryName));
+    }
+    else
+    {
+        if (mFinalFile)
+            sprintf( buffer, nsInstallResources::GetDeleteFileString(), mFinalFile->GetCString());
+    }
+
+    return buffer;
+}
+
+
+PRBool
+nsInstallDelete::CanUninstall()
+{
+    return PR_FALSE;
+}
+
+PRBool
+nsInstallDelete::RegisterPackageNode()
+{
+    return PR_FALSE;
+}
+
+
+PRInt32 nsInstallDelete::ProcessInstallDelete()
+{
+    PRInt32 err;
+    
+    char* tempCString = nsnull;
+
+    if (mDeleteStatus == DELETE_COMPONENT) 
+    {
+        /* Check if the component is in the registry */
+        tempCString = mRegistryName.ToNewCString();
+
+        err = VR_InRegistry( tempCString );
+                
+        if (err != REGERR_OK) 
+        {
+            return err;
+        } 
+        else 
+        {
+            char* tempRegistryString;
+
+            tempRegistryString = (char*)PR_Calloc(MAXREGPATHLEN, sizeof(char));
+            
+            err = VR_GetPath( tempCString , MAXREGPATHLEN, tempRegistryString);
+            
+            if (err == REGERR_OK)
+            {
+                if (mFinalFile)
+                    delete mFinalFile;
+
+                mFinalFile = new nsFileSpec(tempRegistryString);
+            }
+
+            PR_FREEIF(tempRegistryString);
+        }
+    }
+    
+    if(tempCString)
+        delete [] tempCString;
+
+    if (mFinalFile->Exists())
+    {
+        if (mFinalFile->IsFile())
+        {
+            err = nsInstall::SUCCESS;
+        }
+        else
+        {
+            err = nsInstall::FILE_IS_DIRECTORY;
+        }
+    }
+    else
+    {
+        err = nsInstall::FILE_DOES_NOT_EXIST;
+    }
+
+    return err;
+}
+
+
+
+PRInt32 nsInstallDelete::NativeComplete()
+{
+    if (mFinalFile->Exists())
+    {
+        if (mFinalFile->IsFile())
+        {
+           return DeleteFileNowOrSchedule(*mFinalFile);
+        }
+        else
+        {
+            return nsInstall::FILE_IS_DIRECTORY;
+        }
+    }
+    
+    return nsInstall::FILE_DOES_NOT_EXIST;
+}
+

mozilla/xpinstall/src/nsInstallDelete.h

@@ -0,0 +1,78 @@
+/* -*- 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 "License"); you may not use this file except in
+ * compliance with the License.  You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, 
+ * released March 31, 1998. 
+ *
+ * The Initial Developer of the Original Code is Netscape Communications 
+ * Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ *
+ * Contributors:
+ *     Daniel Veditz <dveditz@netscape.com>
+ *     Douglas Turner <dougt@netscape.com>
+ */
+
+
+#ifndef nsInstallDelete_h__
+#define nsInstallDelete_h__
+
+#include "prtypes.h"
+#include "nsString.h"
+
+#include "nsInstallObject.h"
+
+#include "nsInstall.h"
+
+#define DELETE_COMPONENT 1
+#define DELETE_FILE      2
+
+class nsInstallDelete : public nsInstallObject 
+{
+    public:
+
+        nsInstallDelete(  nsInstall* inInstall,
+                          const nsString& folderSpec,
+                          const nsString& inPartialPath,
+                          PRInt32 *error);
+
+        nsInstallDelete(  nsInstall* inInstall,
+                          const nsString& ,
+                          PRInt32 *error);
+
+        virtual ~nsInstallDelete();
+
+        PRInt32 Prepare();
+        PRInt32 Complete();
+        void    Abort();
+        char*   toString();
+
+        PRBool CanUninstall();
+        PRBool RegisterPackageNode();
+	    
+  
+    private:
+
+        /* Private Fields */
+
+        nsFileSpec* mFinalFile;
+        
+        nsString    mRegistryName;
+        PRInt32     mDeleteStatus;
+
+        PRInt32 ProcessInstallDelete();
+        PRInt32 NativeComplete();
+        
+};
+
+#endif /* nsInstallDelete_h__ */

mozilla/xpinstall/src/nsInstallExecute.cpp

@@ -0,0 +1,136 @@
+/* -*- 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 "License"); you may not use this file except in
+ * compliance with the License.  You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, 
+ * released March 31, 1998. 
+ *
+ * The Initial Developer of the Original Code is Netscape Communications 
+ * Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ *
+ * Contributors:
+ *     Daniel Veditz <dveditz@netscape.com>
+ *     Douglas Turner <dougt@netscape.com>
+ */
+
+
+
+#include "prmem.h"
+
+#include "nsFileSpec.h"
+
+#include "VerReg.h"
+#include "nsInstallExecute.h"
+#include "nsInstallResources.h"
+#include "ScheduledTasks.h"
+
+#include "nsInstall.h"
+#include "nsIDOMInstallVersion.h"
+
+nsInstallExecute:: nsInstallExecute(  nsInstall* inInstall,
+                                      const nsString& inJarLocation,
+                                      const nsString& inArgs,
+                                      PRInt32 *error)
+
+: nsInstallObject(inInstall)
+{
+    if ((inInstall == nsnull) || (inJarLocation == "null"))
+    {
+        *error = nsInstall::INVALID_ARGUMENTS;
+        return;
+    }
+
+    mJarLocation        = inJarLocation;
+    mArgs               = inArgs;
+    mExecutableFile     = nsnull;
+
+}
+
+
+nsInstallExecute::~nsInstallExecute()
+{
+    if (mExecutableFile)
+        delete mExecutableFile;
+}
+
+
+
+PRInt32 nsInstallExecute::Prepare()
+{
+    if (mInstall == NULL || mJarLocation == "null") 
+        return nsInstall::INVALID_ARGUMENTS;
+
+    return mInstall->ExtractFileFromJar(mJarLocation, nsnull, &mExecutableFile);
+}
+
+PRInt32 nsInstallExecute::Complete()
+{
+    if (mExecutableFile == nsnull)
+        return nsInstall::INVALID_ARGUMENTS;
+
+    nsFileSpec app( *mExecutableFile);
+    
+    if (!app.Exists())
+	{
+		return nsInstall::INVALID_ARGUMENTS;
+	}
+
+    PRInt32 result = app.Execute( mArgs );
+    
+    DeleteFileNowOrSchedule( app );
+    
+    return result;
+}
+
+void nsInstallExecute::Abort()
+{
+    /* Get the names */
+    if (mExecutableFile == nsnull) 
+        return;
+
+    DeleteFileNowOrSchedule(*mExecutableFile);
+}
+
+char* nsInstallExecute::toString()
+{
+    char* buffer = new char[1024];
+    
+    // if the FileSpec is NULL, just us the in jar file name.
+
+    if (mExecutableFile == nsnull)
+    {
+        char *tempString = mJarLocation.ToNewCString();
+        sprintf( buffer, nsInstallResources::GetExecuteString(), tempString);
+        delete [] tempString;
+    }
+    else
+    {
+        sprintf( buffer, nsInstallResources::GetExecuteString(), mExecutableFile->GetCString());
+    }
+    return buffer;
+
+}
+
+
+PRBool
+nsInstallExecute::CanUninstall()
+{
+    return PR_FALSE;
+}
+
+PRBool
+nsInstallExecute::RegisterPackageNode()
+{
+    return PR_FALSE;
+}
+

mozilla/xpinstall/src/nsInstallExecute.h

@@ -0,0 +1,73 @@
+/* -*- 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 "License"); you may not use this file except in
+ * compliance with the License.  You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, 
+ * released March 31, 1998. 
+ *
+ * The Initial Developer of the Original Code is Netscape Communications 
+ * Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ *
+ * Contributors:
+ *     Daniel Veditz <dveditz@netscape.com>
+ *     Douglas Turner <dougt@netscape.com>
+ */
+
+
+#ifndef nsInstallExecute_h__
+#define nsInstallExecute_h__
+
+#include "prtypes.h"
+#include "nsString.h"
+
+#include "nsInstallObject.h"
+
+#include "nsInstall.h"
+#include "nsIDOMInstallVersion.h"
+
+
+class nsInstallExecute : public nsInstallObject 
+{
+    public:
+          
+        nsInstallExecute( nsInstall* inInstall,
+                          const nsString& inJarLocation,
+                          const nsString& inArgs,
+                          PRInt32 *error);
+
+
+        virtual ~nsInstallExecute();
+
+        PRInt32 Prepare();
+        PRInt32 Complete();
+        void  Abort();
+        char* toString();
+
+        PRBool CanUninstall();
+        PRBool RegisterPackageNode();
+	  
+  
+    private:
+          
+        nsString mJarLocation; // Location in the JAR
+        nsString mArgs;        // command line arguments
+        
+        nsFileSpec *mExecutableFile;    // temporary file location
+        
+
+        PRInt32 NativeComplete(void);
+        void NativeAbort(void);
+
+};
+
+#endif /* nsInstallExecute_h__ */

mozilla/xpinstall/src/nsInstallFile.cpp

@@ -0,0 +1,366 @@
+/* -*- 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 "License"); you may not use this file except in
+ * compliance with the License.  You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, 
+ * released March 31, 1998. 
+ *
+ * The Initial Developer of the Original Code is Netscape Communications 
+ * Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ *
+ * Contributors:
+ *     Daniel Veditz <dveditz@netscape.com>
+ *     Douglas Turner <dougt@netscape.com>
+ */
+
+#include "nsInstallFile.h"
+#include "nsFileSpec.h"
+#include "VerReg.h"
+#include "ScheduledTasks.h"
+#include "nsInstall.h"
+#include "nsIDOMInstallVersion.h"
+#include "nsInstallResources.h"
+
+/* Public Methods */
+
+/*	Constructor
+        inInstall    - softUpdate object we belong to
+        inComponentName	- full path of the registry component
+        inVInfo	        - full version info
+        inJarLocation   - location inside the JAR file
+        inFinalFileSpec	- final	location on disk
+*/
+
+
+nsInstallFile::nsInstallFile(nsInstall* inInstall,
+                             const nsString& inComponentName,
+                             const nsString& inVInfo,
+                             const nsString& inJarLocation,
+                             const nsString& folderSpec,
+                             const nsString& inPartialPath,
+                             PRBool forceInstall,
+                             PRInt32 *error) 
+: nsInstallObject(inInstall)
+{
+    mVersionRegistryName = nsnull;
+    mJarLocation         = nsnull;
+    mExtracedFile        = nsnull;
+    mFinalFile           = nsnull;
+    mVersionInfo         = nsnull;
+
+    mUpgradeFile = PR_FALSE;
+    
+    if ((folderSpec == "null") || (inInstall == NULL)) 
+    {
+        *error = nsInstall::INVALID_ARGUMENTS;
+        return;
+    }
+
+    /* Check for existence of the newer	version	*/
+    
+    PRBool versionNewer = PR_FALSE;  // Is this a newer version
+    char* qualifiedRegNameString = inComponentName.ToNewCString();
+
+    if ( (forceInstall == PR_FALSE ) && (inVInfo !=  "") && ( VR_ValidateComponent( qualifiedRegNameString ) == 0 ) ) 
+    {
+        nsInstallVersion *newVersion = new nsInstallVersion();
+        newVersion->Init(inVInfo);
+        
+        VERSION versionStruct;
+        
+        VR_GetVersion( qualifiedRegNameString, &versionStruct );
+        
+        nsInstallVersion* oldVersion = new nsInstallVersion();
+
+        oldVersion->Init(versionStruct.major,
+                         versionStruct.minor,
+                         versionStruct.release,
+                         versionStruct.build);
+
+        PRInt32 areTheyEqual;
+        newVersion->CompareTo(oldVersion, &areTheyEqual);
+        
+        delete oldVersion;
+        delete newVersion;
+
+        if (areTheyEqual == nsIDOMInstallVersion::MAJOR_DIFF_MINUS ||
+            areTheyEqual == nsIDOMInstallVersion::MINOR_DIFF_MINUS ||
+            areTheyEqual == nsIDOMInstallVersion::REL_DIFF_MINUS   ||
+            areTheyEqual == nsIDOMInstallVersion::BLD_DIFF_MINUS   )
+        {
+            // the file to be installed is OLDER than what is on disk.  Return error
+            delete qualifiedRegNameString;
+            *error = areTheyEqual;
+            return;
+        }
+    }
+
+    delete qualifiedRegNameString;
+
+    
+     mFinalFile = new nsFileSpec(folderSpec);
+    *mFinalFile += inPartialPath;
+    
+    mReplaceFile = mFinalFile->Exists();
+    
+    if (mReplaceFile == PR_FALSE)
+    {
+        nsFileSpec parent;
+        mFinalFile->GetParent(parent);
+        nsFileSpec makeDirs(parent.GetCString(), PR_TRUE);
+    }
+
+    mForceInstall           = forceInstall;
+    
+    mVersionRegistryName    = new nsString(inComponentName);
+    mJarLocation            = new nsString(inJarLocation);
+    mVersionInfo	        = new nsString(inVInfo);
+        
+    nsString regPackageName;
+    mInstall->GetRegPackageName(regPackageName);
+    
+    // determine Child status
+    if ( regPackageName == "" ) 
+    {
+        // in the "current communicator package" absolute pathnames (start
+        // with slash) indicate shared files -- all others are children
+        mChildFile = ( mVersionRegistryName->CharAt(0) != '/' );
+    } 
+    else 
+    {
+        
+        // there is no "starts with" api in nsString.  LAME!
+        nsString startsWith;
+        mVersionRegistryName->Left(startsWith, regPackageName.Length());
+
+        if (startsWith.Equals(regPackageName))
+        {
+            mChildFile = true;
+        }
+        else
+        {
+            mChildFile = false;
+        }
+    }
+}
+
+
+nsInstallFile::~nsInstallFile()
+{
+    if (mVersionRegistryName)
+        delete mVersionRegistryName;
+  
+    if (mJarLocation)
+        delete mJarLocation;
+  
+    if (mExtracedFile)
+        delete mExtracedFile;
+
+    if (mFinalFile)
+        delete mFinalFile;
+  
+    if (mVersionInfo)
+      delete mVersionInfo;
+}
+
+/* Prepare
+ * Extracts file out of the JAR archive
+ */
+PRInt32 nsInstallFile::Prepare()
+{
+    if (mInstall == nsnull || mFinalFile == nsnull || mJarLocation == nsnull ) 
+        return nsInstall::INVALID_ARGUMENTS;
+
+    return mInstall->ExtractFileFromJar(*mJarLocation, mFinalFile, &mExtracedFile);
+}
+
+/* Complete
+ * Completes the install:
+ * - move the downloaded file to the final location
+ * - updates the registry
+ */
+PRInt32 nsInstallFile::Complete()
+{
+    PRInt32 err;
+
+    if (mInstall == nsnull || mVersionRegistryName == nsnull || mFinalFile == nsnull ) 
+    {
+       return nsInstall::INVALID_ARGUMENTS;
+    }
+
+    err = CompleteFileMove();
+    
+    if ( 0 == err || nsInstall::REBOOT_NEEDED == err ) 
+    {
+        err = RegisterInVersionRegistry();
+    }
+    
+    return err;
+
+}
+
+void nsInstallFile::Abort()
+{
+    if (mExtracedFile != nsnull)
+        mExtracedFile->Delete(PR_FALSE);
+}
+
+char* nsInstallFile::toString()
+{
+    char* buffer = new char[1024];
+    
+    if (mFinalFile == nsnull)
+    {
+        sprintf( buffer, nsInstallResources::GetInstallFileString(), nsnull);
+    }
+    else if (mReplaceFile)
+    {
+        // we are replacing this file.
+
+        sprintf( buffer, nsInstallResources::GetReplaceFileString(), mFinalFile->GetCString());
+    }
+    else
+    {
+        sprintf( buffer, nsInstallResources::GetInstallFileString(), mFinalFile->GetCString());
+    }
+
+    return buffer;
+}
+
+
+PRInt32 nsInstallFile::CompleteFileMove()
+{
+    int result = 0;
+    
+    if (mExtracedFile == nsnull) 
+    {
+        return -1;
+    }
+   	
+    if ( *mExtracedFile == *mFinalFile ) 
+    {
+        /* No need to rename, they are the same */
+        result = 0;
+    } 
+    else 
+    {
+        result = ReplaceFileNowOrSchedule(*mExtracedFile, *mFinalFile );
+    }
+
+  return result;  
+}
+
+PRInt32
+nsInstallFile::RegisterInVersionRegistry()
+{
+    int refCount;
+    nsString regPackageName;
+    mInstall->GetRegPackageName(regPackageName);
+    
+  
+    // Register file and log for Uninstall
+  
+    if (!mChildFile) 
+    {
+        int found;
+        if (regPackageName != "") 
+        {
+            found = VR_UninstallFileExistsInList( (char*)(const char*)nsAutoCString(regPackageName) , 
+                                                  (char*)(const char*)nsAutoCString(*mVersionRegistryName));
+        } 
+        else 
+        {
+            found = VR_UninstallFileExistsInList( "", (char*)(const char*)nsAutoCString(*mVersionRegistryName) );
+        }
+        
+        if (found != REGERR_OK)
+            mUpgradeFile = PR_FALSE;
+        else
+            mUpgradeFile = PR_TRUE;
+    } 
+    else if (REGERR_OK == VR_InRegistry( (char*)(const char*)nsAutoCString(*mVersionRegistryName))) 
+    {
+        mUpgradeFile = PR_TRUE;
+    } 
+    else 
+    {
+        mUpgradeFile = PR_FALSE;
+    }
+
+    if ( REGERR_OK != VR_GetRefCount( (char*)(const char*)nsAutoCString(*mVersionRegistryName), &refCount )) 
+    {
+        refCount = 0;
+    }
+
+    VR_Install( (char*)(const char*)nsAutoCString(*mVersionRegistryName), 
+                (char*)(const char*)mFinalFile->GetNativePathCString(),  // DO NOT CHANGE THIS. 
+                (char*)(const char*)nsAutoCString(*mVersionInfo), 
+                PR_FALSE );
+
+    if (mUpgradeFile) 
+    {
+        if (refCount == 0) 
+            VR_SetRefCount( (char*)(const char*)nsAutoCString(*mVersionRegistryName), 1 );
+        else 
+            VR_SetRefCount( (char*)(const char*)nsAutoCString(*mVersionRegistryName), refCount );  //FIX?? what should the ref count be/
+    }
+    else
+    {
+        if (refCount != 0) 
+        {
+            VR_SetRefCount( (char*)(const char*)nsAutoCString(*mVersionRegistryName), refCount + 1 );
+        } 
+        else 
+        {
+            if (mReplaceFile)
+                VR_SetRefCount( (char*)(const char*)nsAutoCString(*mVersionRegistryName), 2 );
+            else
+                VR_SetRefCount( (char*)(const char*)nsAutoCString(*mVersionRegistryName), 1 );
+        }
+    }
+    
+    if ( !mChildFile && !mUpgradeFile ) 
+    {
+        if (regPackageName != "") 
+        { 
+            VR_UninstallAddFileToList( (char*)(const char*)nsAutoCString(regPackageName), 
+                                       (char*)(const char*)nsAutoCString(*mVersionRegistryName));
+        } 
+        else 
+        {
+            VR_UninstallAddFileToList( "", (char*)(const char*)nsAutoCString(*mVersionRegistryName) );
+        }
+    }
+
+    return nsInstall::SUCCESS;
+}
+
+/* CanUninstall
+* InstallFile() installs files which can be uninstalled,
+* hence this function returns true. 
+*/
+PRBool
+nsInstallFile::CanUninstall()
+{
+    return TRUE;
+}
+
+/* RegisterPackageNode
+* InstallFile() installs files which need to be registered,
+* hence this function returns true.
+*/
+PRBool
+nsInstallFile::RegisterPackageNode()
+{
+    return TRUE;
+}

mozilla/xpinstall/src/nsInstallFile.h

@@ -0,0 +1,93 @@
+/* -*- 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 "License"); you may not use this file except in
+ * compliance with the License.  You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, 
+ * released March 31, 1998. 
+ *
+ * The Initial Developer of the Original Code is Netscape Communications 
+ * Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ *
+ * Contributors:
+ *     Daniel Veditz <dveditz@netscape.com>
+ *     Douglas Turner <dougt@netscape.com>
+ */
+
+
+#ifndef nsInstallFile_h__
+#define nsInstallFile_h__
+
+#include "prtypes.h"
+#include "nsString.h"
+
+#include "nsInstallObject.h"
+
+#include "nsInstall.h"
+#include "nsInstallVersion.h"
+
+class nsInstallFile : public nsInstallObject 
+{
+    public:
+
+      /*************************************************************
+       * Public Methods 
+       *
+       *	Constructor
+       *    inSoftUpdate    - softUpdate object we belong to
+       *    inComponentName	- full path of the registry component
+       *    inVInfo	        - full version info
+       *    inJarLocation   - location inside the JAR file
+       *    inFinalFileSpec	- final	location on	disk
+       *************************************************************/
+        nsInstallFile(  nsInstall* inInstall,
+                        const nsString& inVRName,
+                        const nsString& inVInfo,
+                        const nsString& inJarLocation,
+                        const nsString& folderSpec,
+                        const nsString& inPartialPath,
+                        PRBool forceInstall,
+                        PRInt32 *error);
+
+        virtual ~nsInstallFile();
+
+        PRInt32 Prepare();
+        PRInt32 Complete();
+        void  Abort();
+        char* toString();
+
+        PRBool CanUninstall();
+        PRBool RegisterPackageNode();
+	  
+  
+    private:
+
+        /* Private Fields */
+        nsString*     mVersionInfo;	  /* Version info for this file*/
+        
+        nsString*     mJarLocation;	      /* Location in the JAR */
+        nsFileSpec*   mExtracedFile;	  /* temporary file location */
+        nsFileSpec*   mFinalFile;	      /* final file destination */
+
+        nsString*   mVersionRegistryName; /* full version path */
+        
+        PRBool      mForceInstall;   /* whether install is forced */
+        PRBool      mReplaceFile;    /* whether file exists */
+        PRBool      mChildFile;      /* whether file is a child */
+        PRBool      mUpgradeFile;    /* whether file is an upgrade */
+
+
+        PRInt32     CompleteFileMove();
+        PRInt32     RegisterInVersionRegistry();
+};
+
+#endif /* nsInstallFile_h__ */

mozilla/xpinstall/src/nsInstallFileOpEnums.h

@@ -0,0 +1,38 @@
+/* -*- 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 nsInstallFileOpEnums_h__
+#define nsInstallFileOpEnums_h__
+
+typedef enum nsInstallFileOpEnums {
+  NS_FOP_DIR_CREATE = 0,
+  NS_FOP_DIR_REMOVE = 1,
+  NS_FOP_DIR_RENAME = 2,
+  NS_FOP_FILE_COPY = 3,
+  NS_FOP_FILE_DELETE = 4,
+  NS_FOP_FILE_EXECUTE = 5,
+  NS_FOP_FILE_MOVE = 6,
+  NS_FOP_FILE_RENAME = 7,
+  NS_FOP_WIN_SHORTCUT_CREATE = 8,
+  NS_FOP_MAC_ALIAS_CREATE = 9,
+  NS_FOP_UNIX_LINK_CREATE = 10,
+  NS_FOP_FILE_SET_STAT = 11
+
+} nsInstallFileOpEnums;
+
+#endif /* nsInstallFileOpEnums_h__ */

mozilla/xpinstall/src/nsInstallFileOpItem.cpp

@@ -0,0 +1,316 @@
+/* -*- 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.
+ */
+
+#include "nspr.h"
+#include "nsInstall.h"
+#include "nsInstallFileOpEnums.h"
+#include "nsInstallFileOpItem.h"
+
+/* Public Methods */
+
+nsInstallFileOpItem::nsInstallFileOpItem(nsInstall*     aInstallObj,
+                                         PRInt32        aCommand,
+                                         nsFileSpec&    aTarget,
+                                         PRInt32        aFlags,
+                                         PRInt32*       aReturn)
+:nsInstallObject(aInstallObj)
+{
+	mIObj    = aInstallObj;
+	mCommand = aCommand;
+	mFlags   = aFlags;
+	mSrc     = nsnull;
+  mParams  = nsnull;
+	mTarget  = new nsFileSpec(aTarget);
+
+  *aReturn = NS_OK;
+}
+
+nsInstallFileOpItem::nsInstallFileOpItem(nsInstall*     aInstallObj,
+                                         PRInt32        aCommand,
+                                         nsFileSpec&    aSrc,
+                                         nsFileSpec&    aTarget,
+                                         PRInt32*       aReturn)
+:nsInstallObject(aInstallObj)
+{
+	mIObj    = aInstallObj;
+	mCommand = aCommand;
+	mFlags   = 0;
+	mSrc     = new nsFileSpec(aSrc);
+  mParams  = nsnull;
+	mTarget  = new nsFileSpec(aTarget);
+
+  *aReturn = NS_OK;
+}
+
+nsInstallFileOpItem::nsInstallFileOpItem(nsInstall*     aInstallObj,
+                                         PRInt32        aCommand,
+                                         nsFileSpec&    aTarget,
+                                         PRInt32*       aReturn)
+:nsInstallObject(aInstallObj)
+{
+	mIObj    = aInstallObj;
+	mCommand = aCommand;
+	mFlags   = 0;
+	mSrc     = nsnull;
+  mParams  = nsnull;
+	mTarget  = new nsFileSpec(aTarget);
+
+  *aReturn = NS_OK;
+}
+
+nsInstallFileOpItem::nsInstallFileOpItem(nsInstall*     aInstallObj,
+                                         PRInt32        aCommand,
+                                         nsFileSpec&    aTarget,
+                                         nsString&      aParams,
+                                         PRInt32*       aReturn)
+:nsInstallObject(aInstallObj)
+{
+	mIObj    = aInstallObj;
+	mCommand = aCommand;
+	mFlags   = 0;
+	mSrc     = nsnull;
+  mParams  = new nsString(aParams);
+	mTarget  = new nsFileSpec(aTarget);
+
+  *aReturn = NS_OK;
+}
+
+nsInstallFileOpItem::~nsInstallFileOpItem()
+{
+  if(mSrc)
+    delete mSrc;
+  if(mTarget)
+    delete mTarget;
+}
+
+PRInt32 nsInstallFileOpItem::Complete()
+{
+  PRInt32 aReturn = NS_OK;
+
+  switch(mCommand)
+  {
+    case NS_FOP_DIR_CREATE:
+      NativeFileOpDirCreate(mTarget);
+      break;
+    case NS_FOP_DIR_REMOVE:
+      NativeFileOpDirRemove(mTarget, mFlags);
+      break;
+    case NS_FOP_DIR_RENAME:
+      NativeFileOpDirRename(mSrc, mTarget);
+      break;
+    case NS_FOP_FILE_COPY:
+      NativeFileOpFileCopy(mSrc, mTarget);
+      break;
+    case NS_FOP_FILE_DELETE:
+      NativeFileOpFileDelete(mTarget, mFlags);
+      break;
+    case NS_FOP_FILE_EXECUTE:
+      NativeFileOpFileExecute(mTarget, mParams);
+      break;
+    case NS_FOP_FILE_MOVE:
+      NativeFileOpFileMove(mSrc, mTarget);
+      break;
+    case NS_FOP_FILE_RENAME:
+      NativeFileOpFileRename(mSrc, mTarget);
+      break;
+    case NS_FOP_WIN_SHORTCUT_CREATE:
+      NativeFileOpWinShortcutCreate();
+      break;
+    case NS_FOP_MAC_ALIAS_CREATE:
+      NativeFileOpMacAliasCreate();
+      break;
+    case NS_FOP_UNIX_LINK_CREATE:
+      NativeFileOpUnixLinkCreate();
+      break;
+  }
+	return aReturn;
+}
+  
+float nsInstallFileOpItem::GetInstallOrder()
+{
+	return 3;
+}
+
+char* nsInstallFileOpItem::toString()
+{
+	nsString result;
+  char*    resultCString;
+
+  switch(mCommand)
+  {
+    case NS_FOP_FILE_COPY:
+      result = "Copy file: ";
+      result.Append(mSrc->GetNativePathCString());
+      result.Append(" to ");
+      result.Append(mTarget->GetNativePathCString());
+      resultCString = result.ToNewCString();
+      break;
+    case NS_FOP_FILE_DELETE:
+      result = "Delete file: ";
+      result.Append(mTarget->GetNativePathCString());
+      resultCString = result.ToNewCString();
+      break;
+    case NS_FOP_FILE_MOVE:
+      result = "Move file: ";
+      result.Append(mSrc->GetNativePathCString());
+      result.Append(" to ");
+      result.Append(mTarget->GetNativePathCString());
+      resultCString = result.ToNewCString();
+      break;
+    case NS_FOP_FILE_RENAME:
+      result = "Rename file: ";
+      result.Append(mTarget->GetNativePathCString());
+      resultCString = result.ToNewCString();
+      break;
+    case NS_FOP_DIR_CREATE:
+      result = "Create Folder: ";
+      result.Append(mTarget->GetNativePathCString());
+      resultCString = result.ToNewCString();
+      break;
+    case NS_FOP_DIR_REMOVE:
+      result = "Remove Folder: ";
+      result.Append(mTarget->GetNativePathCString());
+      resultCString = result.ToNewCString();
+      break;
+    case NS_FOP_WIN_SHORTCUT_CREATE:
+      break;
+    case NS_FOP_MAC_ALIAS_CREATE:
+      break;
+    case NS_FOP_UNIX_LINK_CREATE:
+      break;
+    case NS_FOP_FILE_SET_STAT:
+      result = "Set file stat: ";
+      result.Append(mTarget->GetNativePathCString());
+      resultCString = result.ToNewCString();
+      break;
+    default:
+      result = "Unkown file operation command!";
+      resultCString = result.ToNewCString();
+      break;
+  }
+  return resultCString;
+}
+
+PRInt32 nsInstallFileOpItem::Prepare()
+{
+	return NULL;
+}
+
+void nsInstallFileOpItem::Abort()
+{
+}
+
+/* Private Methods */
+
+/* CanUninstall
+* InstallFileOpItem() does not install any files which can be uninstalled,
+* hence this function returns false. 
+*/
+PRBool
+nsInstallFileOpItem::CanUninstall()
+{
+    return FALSE;
+}
+
+/* RegisterPackageNode
+* InstallFileOpItem() does notinstall files which need to be registered,
+* hence this function returns false.
+*/
+PRBool
+nsInstallFileOpItem::RegisterPackageNode()
+{
+    return FALSE;
+}
+
+//
+// File operation functions begin here
+//
+PRInt32
+nsInstallFileOpItem::NativeFileOpDirCreate(nsFileSpec* aTarget)
+{
+  aTarget->CreateDirectory();
+  return NS_OK;
+}
+
+PRInt32
+nsInstallFileOpItem::NativeFileOpDirRemove(nsFileSpec* aTarget, PRInt32 aFlags)
+{
+  aTarget->Delete(aFlags);
+  return NS_OK;
+}
+
+PRInt32
+nsInstallFileOpItem::NativeFileOpDirRename(nsFileSpec* aSrc, nsFileSpec* aTarget)
+{
+  aSrc->Rename(*aTarget);
+  return NS_OK;
+}
+
+PRInt32
+nsInstallFileOpItem::NativeFileOpFileCopy(nsFileSpec* aSrc, nsFileSpec* aTarget)
+{
+  aSrc->Copy(*aTarget);
+  return NS_OK;
+}
+
+PRInt32
+nsInstallFileOpItem::NativeFileOpFileDelete(nsFileSpec* aTarget, PRInt32 aFlags)
+{
+  aTarget->Delete(aFlags);
+  return NS_OK;
+}
+
+PRInt32
+nsInstallFileOpItem::NativeFileOpFileExecute(nsFileSpec* aTarget, nsString* aParams)
+{
+  aTarget->Execute(*aParams);
+  return NS_OK;
+}
+
+PRInt32
+nsInstallFileOpItem::NativeFileOpFileMove(nsFileSpec* aSrc, nsFileSpec* aTarget)
+{
+  aSrc->Move(*aTarget);
+  return NS_OK;
+}
+
+PRInt32
+nsInstallFileOpItem::NativeFileOpFileRename(nsFileSpec* aSrc, nsFileSpec* aTarget)
+{
+  aSrc->Rename(*aTarget);
+  return NS_OK;
+}
+
+PRInt32
+nsInstallFileOpItem::NativeFileOpWinShortcutCreate()
+{
+  return NS_OK;
+}
+
+PRInt32
+nsInstallFileOpItem::NativeFileOpMacAliasCreate()
+{
+  return NS_OK;
+}
+
+PRInt32
+nsInstallFileOpItem::NativeFileOpUnixLinkCreate()
+{
+  return NS_OK;
+}
+

mozilla/xpinstall/src/nsInstallFileOpItem.h

@@ -0,0 +1,111 @@
+/* -*- 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 nsInstallFileOpItem_h__
+#define nsInstallFileOpItem_h__
+
+#include "prtypes.h"
+
+#include "nsFileSpec.h"
+#include "nsSoftwareUpdate.h"
+#include "nsInstallObject.h"
+#include "nsInstall.h"
+
+class nsInstallFileOpItem : public nsInstallObject
+{
+  public:
+    /* Public Fields */
+
+    /* Public Methods */
+    // used by:
+    //   FileOpFileDelete()
+    nsInstallFileOpItem(nsInstall*    installObj,
+                        PRInt32       aCommand,
+                        nsFileSpec&   aTarget,
+                        PRInt32       aFlags,
+                        PRInt32*      aReturn);
+
+    // used by:
+    //   FileOpDirRemove()
+    //   FileOpDirRename()
+    //   FileOpFileCopy()
+    //   FileOpFileMove()
+    //   FileOpFileRename()
+    nsInstallFileOpItem(nsInstall*    installObj,
+                        PRInt32       aCommand,
+                        nsFileSpec&   aSrc,
+                        nsFileSpec&   aTarget,
+                        PRInt32*      aReturn);
+
+    // used by:
+    //   FileOpDirCreate()
+    nsInstallFileOpItem(nsInstall*    aInstallObj,
+                        PRInt32       aCommand,
+                        nsFileSpec&   aTarget,
+                        PRInt32*      aReturn);
+
+    // used by:
+    //   FileOpFileExecute()
+    nsInstallFileOpItem(nsInstall*    aInstallObj,
+                        PRInt32       aCommand,
+                        nsFileSpec&   aTarget,
+                        nsString&     aParams,
+                        PRInt32*      aReturn);
+
+    ~nsInstallFileOpItem();
+
+    PRInt32       Prepare(void);
+    PRInt32       Complete();
+    char*         toString();
+    void          Abort();
+    float         GetInstallOrder();
+    
+  /* should these be protected? */
+    PRBool        CanUninstall();
+    PRBool        RegisterPackageNode();
+      
+  private:
+    
+    /* Private Fields */
+    
+    nsInstall*    mIObj;        // initiating Install object
+    nsFileSpec*   mSrc;
+    nsFileSpec*   mTarget;
+    nsString*     mParams;
+    long          mFStat;
+    PRInt32       mFlags;
+    PRInt32       mCommand;
+    
+    /* Private Methods */
+
+    PRInt32       NativeFileOpDirCreate(nsFileSpec* aTarget);
+    PRInt32       NativeFileOpDirRemove(nsFileSpec* aTarget, PRInt32 aFlags);
+    PRInt32       NativeFileOpDirRename(nsFileSpec* aSrc, nsFileSpec* aTarget);
+    PRInt32       NativeFileOpFileCopy(nsFileSpec* aSrc, nsFileSpec* aTarget);
+    PRInt32       NativeFileOpFileDelete(nsFileSpec* aTarget, PRInt32 aFlags);
+    PRInt32       NativeFileOpFileExecute(nsFileSpec* aTarget, nsString* aParams);
+    PRInt32       NativeFileOpFileMove(nsFileSpec* aSrc, nsFileSpec* aTarget);
+    PRInt32       NativeFileOpFileRename(nsFileSpec* aSrc, nsFileSpec* aTarget);
+    PRInt32       NativeFileOpWinShortcutCreate();
+    PRInt32       NativeFileOpMacAliasCreate();
+    PRInt32       NativeFileOpUnixLinkCreate();
+
+};
+
+#endif /* nsInstallFileOpItem_h__ */
+

mozilla/xpinstall/src/nsInstallFolder.cpp

@@ -0,0 +1,336 @@
+/* -*- 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 "License"); you may not use this file except in
+ * compliance with the License.  You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, 
+ * released March 31, 1998. 
+ *
+ * The Initial Developer of the Original Code is Netscape Communications 
+ * Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ *
+ * Contributors:
+ *     Daniel Veditz <dveditz@netscape.com>
+ *     Douglas Turner <dougt@netscape.com>
+ */
+
+#include "nsInstall.h"
+#include "nsInstallFolder.h"
+
+#include "nscore.h"
+#include "prtypes.h"
+#include "nsRepository.h"
+
+#include "nsString.h"
+#include "nsFileSpec.h"
+#include "nsSpecialSystemDirectory.h"
+
+#include "nsFileLocations.h"
+#include "nsIFileLocator.h"
+
+struct DirectoryTable
+{
+	char *  directoryName;			/* The formal directory name */
+	PRInt32 folderEnum;		        /* Directory ID */
+};
+
+struct DirectoryTable DirectoryTable[] = 
+{
+    {"Plugins",             100 },
+	{"Program",             101 },
+	{"Communicator",        102 },
+	{"User Pick",           103 },
+	{"Temporary",           104 },
+	{"Installed",           105 },
+	{"Current User",        106 },
+	{"Preferences",         107 },
+	{"OS Drive",            108 },
+	{"file:///",            109 },
+
+    {"Components",          110 },
+    {"Chrome",              111 },
+
+	{"Win System",          200 },
+	{"Windows",             201 },
+
+	{"Mac System",          300 },
+	{"Mac Desktop",         301 },
+	{"Mac Trash",           302 },
+	{"Mac Startup",         303 },
+	{"Mac Shutdown",        304 },
+	{"Mac Apple Menu",      305 },
+	{"Mac Control Panel",   306 },
+	{"Mac Extension",       307 },
+	{"Mac Fonts",           308 },
+	{"Mac Preferences",     309 },
+    {"Mac Documents",       310 },
+
+	{"Unix Local",          400 },
+	{"Unix Lib",            401 },
+
+	{"",                    -1  }
+};
+
+
+
+nsInstallFolder::nsInstallFolder(const nsString& aFolderID)
+{
+    mFileSpec = nsnull;
+    SetDirectoryPath( aFolderID, "");
+}
+
+nsInstallFolder::nsInstallFolder(const nsString& aFolderID, const nsString& aRelativePath)
+{
+    mFileSpec = nsnull;
+
+    /*
+        aFolderID can be either a Folder enum in which case we merely pass it to SetDirectoryPath, or
+        it can be a Directory.  If it is the later, it must already exist and of course be a directory
+        not a file.  
+    */
+    
+    nsFileSpec dirCheck(aFolderID);
+    if ( (dirCheck.Error() == NS_OK) && (dirCheck.IsDirectory()) && (dirCheck.Exists()))
+    {
+        nsString tempString = aFolderID;
+        tempString += aRelativePath;
+        mFileSpec = new nsFileSpec(tempString);
+
+        // make sure that the directory is created.
+        nsFileSpec(mFileSpec->GetCString(), PR_TRUE);
+    }
+    else
+    {
+        SetDirectoryPath( aFolderID, aRelativePath);
+    }
+}
+
+
+nsInstallFolder::~nsInstallFolder()
+{
+    if (mFileSpec != nsnull)
+        delete mFileSpec;
+}
+        
+void 
+nsInstallFolder::GetDirectoryPath(nsString& aDirectoryPath)
+{
+	aDirectoryPath = "";
+    
+    if (mFileSpec != nsnull)
+    {
+        // We want the a NATIVE path.
+       aDirectoryPath.SetString(mFileSpec->GetCString());
+    }
+}
+
+void
+nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRelativePath)
+{
+    if ( aFolderID.EqualsIgnoreCase("User Pick") )
+    {
+        PickDefaultDirectory();
+        return;
+    }
+    else if ( aFolderID.EqualsIgnoreCase("Installed") )
+    {   
+        mFileSpec = new nsFileSpec(aRelativePath, PR_TRUE);  // creates the directories to the relative path.
+        return;
+    }
+    else
+    {
+        PRInt32 folderDirSpecID = MapNameToEnum(aFolderID);
+        
+        switch (folderDirSpecID) 
+		{
+            case 100: ///////////////////////////////////////////////////////////  Plugins
+                SetAppShellDirectory(nsSpecialFileSpec::App_PluginsDirectory );
+                break; 
+
+            case 101: ///////////////////////////////////////////////////////////  Program
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::OS_CurrentProcessDirectory ));
+                break;
+            
+            case 102: ///////////////////////////////////////////////////////////  Communicator
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::OS_CurrentProcessDirectory ));
+                break;
+
+            case 103: ///////////////////////////////////////////////////////////  User Pick
+                // we should never be here.
+                mFileSpec = nsnull;
+                break;
+
+            case 104: ///////////////////////////////////////////////////////////  Temporary
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::OS_TemporaryDirectory ));
+                break;
+
+            case 105: ///////////////////////////////////////////////////////////  Installed
+                // we should never be here.
+                mFileSpec = nsnull;
+                break;
+
+            case 106: ///////////////////////////////////////////////////////////  Current User
+                SetAppShellDirectory(nsSpecialFileSpec::App_UserProfileDirectory50 );
+                break;
+
+            case 107: ///////////////////////////////////////////////////////////  Preferences
+                SetAppShellDirectory(nsSpecialFileSpec::App_PrefsDirectory50 );
+                break;
+
+            case 108: ///////////////////////////////////////////////////////////  OS Drive
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::OS_DriveDirectory ));
+                break;
+
+            case 109: ///////////////////////////////////////////////////////////  File URL
+                {
+                    nsString tempFileURLString = aFolderID;
+                    tempFileURLString += aRelativePath;
+                    mFileSpec = new nsFileSpec( nsFileURL(tempFileURLString) );
+                }
+                break;
+
+            case 110: ///////////////////////////////////////////////////////////  Components
+                SetAppShellDirectory(nsSpecialFileSpec::App_ComponentsDirectory );
+                break;
+            
+            case 111: ///////////////////////////////////////////////////////////  Chrome
+                SetAppShellDirectory(nsSpecialFileSpec::App_ChromeDirectory );
+                break;
+
+            case 200: ///////////////////////////////////////////////////////////  Win System
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Win_SystemDirectory ));
+                break;
+
+            case 201: ///////////////////////////////////////////////////////////  Windows
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Win_WindowsDirectory ));
+                break;
+
+            case 300: ///////////////////////////////////////////////////////////  Mac System
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_SystemDirectory ));
+                break;
+
+            case 301: ///////////////////////////////////////////////////////////  Mac Desktop
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_DesktopDirectory ));
+                break;
+
+            case 302: ///////////////////////////////////////////////////////////  Mac Trash
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_TrashDirectory ));
+                break;
+
+            case 303: ///////////////////////////////////////////////////////////  Mac Startup
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_StartupDirectory ));
+                break;
+
+            case 304: ///////////////////////////////////////////////////////////  Mac Shutdown
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_StartupDirectory ));
+                break;
+
+            case 305: ///////////////////////////////////////////////////////////  Mac Apple Menu
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_AppleMenuDirectory ));
+                break;
+
+            case 306: ///////////////////////////////////////////////////////////  Mac Control Panel
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_ControlPanelDirectory ));
+                break;
+
+            case 307: ///////////////////////////////////////////////////////////  Mac Extension
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_ExtensionDirectory ));
+                break;
+
+            case 308: ///////////////////////////////////////////////////////////  Mac Fonts
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_FontsDirectory ));
+                break;
+
+            case 309: ///////////////////////////////////////////////////////////  Mac Preferences
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_PreferencesDirectory ));
+                break;
+                    
+            case 310: ///////////////////////////////////////////////////////////  Mac Documents
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_DocumentsDirectory ));
+                break;
+                    
+            case 400: ///////////////////////////////////////////////////////////  Unix Local
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Unix_LocalDirectory ));
+                break;
+
+            case 401: ///////////////////////////////////////////////////////////  Unix Lib
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Unix_LibDirectory ));
+                break;
+
+
+            case -1:
+		    default:
+                mFileSpec = nsnull;
+			   return;
+		}
+#ifndef XP_MAC
+        if (aRelativePath.Length() > 0)
+        {
+            nsString tempPath(aRelativePath);
+
+            if (aRelativePath.Last() != '/' || aRelativePath.Last() != '\\')
+                tempPath += '/';
+
+            *mFileSpec += tempPath;
+        }
+#endif
+            // make sure that the directory is created.
+        nsFileSpec(mFileSpec->GetCString(), PR_TRUE);
+    }
+}
+
+void nsInstallFolder::PickDefaultDirectory()
+{
+    //FIX:  Need to put up a dialog here and set mFileSpec
+    return;   
+}
+
+/* MapNameToEnum
+ * maps name from the directory table to its enum */
+PRInt32 
+nsInstallFolder::MapNameToEnum(const nsString& name)
+{
+	int i = 0;
+
+	if ( name == "null")
+        return -1;
+
+	while ( DirectoryTable[i].directoryName[0] != 0 )
+	{
+		if ( name.EqualsIgnoreCase(DirectoryTable[i].directoryName) )
+			return DirectoryTable[i].folderEnum;
+		i++;
+	}
+	return -1;
+}
+
+
+static NS_DEFINE_IID(kFileLocatorIID, NS_IFILELOCATOR_IID);
+static NS_DEFINE_IID(kFileLocatorCID, NS_FILELOCATOR_CID);
+
+void
+nsInstallFolder::SetAppShellDirectory(PRUint32 value)
+{
+    nsIFileLocator * appShellLocator;
+    
+    nsresult rv = nsComponentManager::CreateInstance(kFileLocatorCID, 
+                                                     nsnull,
+                                                     kFileLocatorIID,
+                                                     (void**) &appShellLocator);
+
+    if ( NS_SUCCEEDED(rv) )
+    {
+        mFileSpec = new nsFileSpec();
+        appShellLocator->GetFileLocation(value, mFileSpec);
+        NS_RELEASE(appShellLocator);
+    }
+}

mozilla/xpinstall/src/nsInstallFolder.h

@@ -0,0 +1,58 @@
+/* -*- 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 "License"); you may not use this file except in
+ * compliance with the License.  You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, 
+ * released March 31, 1998. 
+ *
+ * The Initial Developer of the Original Code is Netscape Communications 
+ * Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ *
+ * Contributors:
+ *     Daniel Veditz <dveditz@netscape.com>
+ *     Douglas Turner <dougt@netscape.com>
+ */
+
+
+#ifndef __NS_INSTALLFOLDER_H__
+#define __NS_INSTALLFOLDER_H__
+
+#include "nscore.h"
+#include "prtypes.h"
+
+#include "nsString.h"
+#include "nsFileSpec.h"
+#include "nsSpecialSystemDirectory.h"
+
+class nsInstallFolder
+{
+    public:
+        
+       nsInstallFolder(const nsString& aFolderID);
+       nsInstallFolder(const nsString& aFolderID, const nsString& aRelativePath);
+       virtual ~nsInstallFolder();
+
+       void GetDirectoryPath(nsString& aDirectoryPath);
+       
+    private:
+        
+        nsFileSpec*  mFileSpec;
+
+		void         SetDirectoryPath(const nsString& aFolderID, const nsString& aRelativePath);
+        void         PickDefaultDirectory();
+        PRInt32      MapNameToEnum(const nsString&  name);
+        void         SetAppShellDirectory(PRUint32 value);
+};
+
+
+#endif

mozilla/xpinstall/src/nsInstallObject.h

@@ -0,0 +1,52 @@
+/* -*- 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 nsInstallObject_h__
+#define nsInstallObject_h__
+
+#include "prtypes.h"
+
+class nsInstall;
+
+class nsInstallObject 
+{
+    public:
+        /* Public Methods */
+        nsInstallObject(nsInstall* inInstall) {mInstall = inInstall; }
+
+        /* Override with your set-up action */
+        virtual PRInt32 Prepare() = 0;
+
+        /* Override with your Completion action */
+        virtual PRInt32 Complete() = 0;
+
+        /* Override with an explanatory string for the progress dialog */
+        virtual char* toString() = 0;
+
+        /* Override with your clean-up function */
+        virtual void Abort() = 0;
+
+        /* should these be protected? */
+        virtual PRBool CanUninstall() = 0;
+        virtual PRBool RegisterPackageNode() = 0;
+
+    protected:
+        nsInstall* mInstall;
+};
+
+#endif /* nsInstallObject_h__ */

mozilla/xpinstall/src/nsInstallPatch.cpp

@@ -0,0 +1,986 @@
+/* -*- 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.
+ */
+
+#include "nsFileSpec.h"
+#include "prmem.h"
+#include "nsInstall.h"
+#include "nsInstallPatch.h"
+#include "nsInstallResources.h"
+#include "nsIDOMInstallVersion.h"
+#include "zlib.h"
+
+#include "gdiff.h"
+
+#include "VerReg.h"
+#include "ScheduledTasks.h"
+#include "plstr.h"
+#include "xp_file.h" /* for XP_PlatformFileToURL */
+
+
+#ifdef XP_MAC
+#include "PatchableAppleSingle.h"
+#endif
+
+#define BUFSIZE     32768
+#define OPSIZE      1
+#define MAXCMDSIZE  12
+#define SRCFILE     0
+#define OUTFILE     1
+
+#define getshort(s) (uint16)( ((uchar)*(s) << 8) + ((uchar)*((s)+1)) )
+
+#define getlong(s)  \
+            (uint32)( ((uchar)*(s) << 24) + ((uchar)*((s)+1) << 16 ) + \
+                      ((uchar)*((s)+2) << 8) + ((uchar)*((s)+3)) )
+
+
+
+static int32   gdiff_parseHeader( pDIFFDATA dd );
+static int32   gdiff_validateFile( pDIFFDATA dd, int file );
+static int32   gdiff_valCRC32( pDIFFDATA dd, PRFileDesc* fh, uint32 chksum );
+static int32   gdiff_ApplyPatch( pDIFFDATA dd );
+static int32   gdiff_getdiff( pDIFFDATA dd, uchar *buffer, uint32 length );
+static int32   gdiff_add( pDIFFDATA dd, uint32 count );
+static int32   gdiff_copy( pDIFFDATA dd, uint32 position, uint32 count );
+static int32   gdiff_validateFile( pDIFFDATA dd, int file );
+
+
+nsInstallPatch::nsInstallPatch( nsInstall* inInstall,
+                                const nsString& inVRName,
+                                const nsString& inVInfo,
+                                const nsString& inJarLocation,
+                                PRInt32 *error)
+
+: nsInstallObject(inInstall)
+{
+    char tempTargetFile[MAXREGPATHLEN];
+    char* tempVersionString = inVRName.ToNewCString();
+
+    PRInt32 err = VR_GetPath(tempVersionString, MAXREGPATHLEN, tempTargetFile );
+    
+    delete [] tempVersionString;
+    
+    if (err != REGERR_OK)
+    {
+        *error = nsInstall::NO_SUCH_COMPONENT;
+        return;
+    }
+	nsString folderSpec(tempTargetFile);
+
+    mPatchFile      =   nsnull;
+    mTargetFile     =   nsnull;
+    mPatchedFile    =   nsnull;
+    mRegistryName   =   new nsString(inVRName);
+    mJarLocation    =   new nsString(inJarLocation);
+    mTargetFile     =   new nsFileSpec(folderSpec);
+    
+    mVersionInfo    =   new nsInstallVersion();
+    
+    mVersionInfo->Init(inVInfo);
+    
+}
+
+
+nsInstallPatch::nsInstallPatch( nsInstall* inInstall,
+                                const nsString& inVRName,
+                                const nsString& inVInfo,
+                                const nsString& inJarLocation,
+                                const nsString& folderSpec,
+                                const nsString& inPartialPath,
+                                PRInt32 *error)
+
+: nsInstallObject(inInstall)
+{
+    if ((inInstall == nsnull) || (inVRName == "null") || (inJarLocation == "null")) 
+    {
+        *error = nsInstall::INVALID_ARGUMENTS;
+        return;
+    }
+    
+    mPatchFile      =   nsnull;
+    mTargetFile     =   nsnull;
+    mPatchedFile    =   nsnull;
+    mRegistryName   =   new nsString(inVRName);
+    mJarLocation    =   new nsString(inJarLocation);
+    mVersionInfo    =   new nsInstallVersion();
+    
+    mVersionInfo->Init(inVInfo);
+    
+    mTargetFile = new nsFileSpec(folderSpec);
+    if(inPartialPath != "null")
+        *mTargetFile += inPartialPath;
+}
+
+nsInstallPatch::~nsInstallPatch()
+{
+    if (mVersionInfo)
+        delete mVersionInfo;
+
+    if (mTargetFile)
+        delete mTargetFile;
+
+    if (mJarLocation)
+        delete mJarLocation;
+    
+    if (mRegistryName)
+        delete mRegistryName;
+
+    if (mPatchedFile)
+        delete mPatchedFile;
+    
+    if (mPatchFile)
+        delete mPatchFile;
+
+}
+
+
+PRInt32 nsInstallPatch::Prepare()
+{
+    PRInt32 err;
+    PRBool deleteOldSrc;
+    
+    if (mTargetFile == nsnull)
+        return  nsInstall::INVALID_ARGUMENTS;
+
+    if (mTargetFile->Exists())
+    {
+        if (mTargetFile->IsFile())
+        {
+            err = nsInstall::SUCCESS;
+        }
+        else
+        {
+            err = nsInstall::FILE_IS_DIRECTORY;
+        }
+    }
+    else
+    {
+        err = nsInstall::FILE_DOES_NOT_EXIST;
+    }
+
+    if (err != nsInstall::SUCCESS)
+    {   
+        return err;
+    }
+
+    err =  mInstall->ExtractFileFromJar(*mJarLocation, mTargetFile, &mPatchFile);
+   
+    
+    nsFileSpec *fileName = nsnull;
+    nsVoidKey ikey( HashFilePath( nsFilePath(*mTargetFile) ) );
+    
+    mInstall->GetPatch(&ikey, fileName);
+
+    if (fileName != nsnull) 
+    {
+        deleteOldSrc = PR_TRUE;
+    } 
+    else 
+    {
+        fileName     = mTargetFile;
+        deleteOldSrc = PR_FALSE;
+    }
+
+    err = NativePatch(  *fileName,           // the file to patch
+                        *mPatchFile,         // the patch that was extracted from the jarfile
+                        &mPatchedFile);     // the new patched file
+    
+    if (err != nsInstall::SUCCESS)
+    {   
+        return err;
+    }
+
+    PR_ASSERT(mPatchedFile != nsnull);
+	mInstall->AddPatch(&ikey, mPatchedFile );
+	
+    if ( deleteOldSrc ) 
+    {
+		DeleteFileNowOrSchedule(*fileName );
+    }
+  
+    return err;
+}
+
+PRInt32 nsInstallPatch::Complete()
+{  
+    if ((mInstall == nsnull) || (mVersionInfo == nsnull) || (mPatchedFile == nsnull) || (mTargetFile == nsnull)) 
+    {
+        return nsInstall::INVALID_ARGUMENTS;
+    }
+    
+    PRInt32 err = nsInstall::SUCCESS;
+
+    nsFileSpec *fileName = nsnull;
+    nsVoidKey ikey( HashFilePath( nsFilePath(*mTargetFile) )  );
+    
+    mInstall->GetPatch(&ikey, fileName);
+    
+    if (fileName != nsnull && (*fileName == *mPatchedFile) )
+    {
+        // the patch has not been superceded--do final replacement
+		err = ReplaceFileNowOrSchedule( *mTargetFile, *mPatchedFile);
+        if ( 0 == err || nsInstall::REBOOT_NEEDED == err ) 
+        {
+            nsString tempVersionString;
+            mVersionInfo->ToString(tempVersionString);
+            
+            char* tempRegName = mRegistryName->ToNewCString();
+            char* tempVersion = tempVersionString.ToNewCString();
+
+            err = VR_Install( tempRegName, 
+							  (char*) (const char *) nsNSPRPath(*mTargetFile),
+                              tempVersion, 
+                              PR_FALSE );
+            
+            delete [] tempRegName;
+            delete [] tempVersion;
+
+        }
+        else
+        {
+            err = nsInstall::UNEXPECTED_ERROR;
+        }
+    }
+    else
+    {
+        // nothing -- old intermediate patched file was
+        // deleted by a superceding patch
+    }
+
+    return err;
+}
+
+void nsInstallPatch::Abort()
+{
+    nsFileSpec *fileName = nsnull;
+    nsVoidKey ikey( HashFilePath( nsFilePath(*mTargetFile) ) );
+
+    mInstall->GetPatch(&ikey, fileName);
+
+    if (fileName != nsnull && (*fileName == *mPatchedFile) )
+    {
+        DeleteFileNowOrSchedule( *mPatchedFile );
+    }
+}
+
+char* nsInstallPatch::toString()
+{
+	char* buffer = new char[1024];
+
+	// FIX!  sprintf( buffer, nsInstallResources::GetPatchFileString(), mPatchedFile->GetCString());
+
+	return buffer;
+}
+
+
+PRBool
+nsInstallPatch::CanUninstall()
+{
+    return PR_FALSE;
+}
+
+PRBool
+nsInstallPatch::RegisterPackageNode()
+{
+    return PR_FALSE;
+}
+
+
+PRInt32
+nsInstallPatch::NativePatch(const nsFileSpec &sourceFile, const nsFileSpec &patchFile, nsFileSpec **newFile)
+{
+
+	DIFFDATA	*dd;
+	PRInt32		status		= GDIFF_ERR_MEM;
+	char 		*tmpurl		= NULL;
+	char 		*realfile	= PL_strdup(nsNSPRPath(sourceFile)); // needs to be sourceFile!!!
+	nsFileSpec  outFileSpec = sourceFile;
+
+	dd = (DIFFDATA *)PR_Calloc( 1, sizeof(DIFFDATA));
+	if (dd != NULL)
+	{
+		dd->databuf = (uchar*)PR_Malloc(BUFSIZE);
+		if (dd->databuf == NULL) 
+		{
+			status = GDIFF_ERR_MEM;
+			goto cleanup;
+		}
+
+
+		dd->bufsize = BUFSIZE;
+
+		// validate patch header & check for special instructions
+		dd->fDiff = PR_Open (nsNSPRPath(patchFile), PR_RDONLY, 0666);
+
+
+		if (dd->fDiff != NULL)
+		{
+			status = gdiff_parseHeader(dd);
+		} else {
+			status = GDIFF_ERR_ACCESS;
+		}
+
+#ifdef dono
+#ifdef WIN32
+
+        /* unbind Win32 images */
+        if ( dd->bWin32BoundImage && status == GDIFF_OK ) {
+            tmpurl = WH_TempName( xpURL, NULL );
+            if ( tmpurl != NULL ) {
+                if (su_unbind( srcfile, srctype, tmpurl, xpURL ))  	
+				{
+                    PL_strfree(realfile);
+					realfile = tmpurl;
+                    realtype = xpURL;
+                    
+                }
+            }
+            else
+                status = GDIFF_ERR_MEM;
+        }
+#endif
+#endif
+
+#ifdef XP_MAC
+
+		if ( dd->bMacAppleSingle && status == GDIFF_OK ) 
+		{
+           // create a tmp file, so that we can AppleSingle the src file
+           nsSpecialSystemDirectory tempMacFile(nsSpecialSystemDirectory::OS_TemporaryDirectory);
+           nsString srcName = sourceFile.GetLeafName();
+           tempMacFile.SetLeafName(srcName);
+           tempMacFile.MakeUnique();
+           
+           // Encode! 
+		   // Encode src file, and put into temp file
+		   FSSpec sourceSpec = sourceFile.GetFSSpec();
+		   FSSpec tempSpec   = tempMacFile.GetFSSpec();
+		    
+			status = PAS_EncodeFile(&sourceSpec, &tempSpec);   
+				
+			if (status == noErr)
+			{
+				// set
+                PL_strfree(realfile);
+				realfile = PL_strdup(nsNSPRPath(tempMacFile));
+			}
+		}
+#endif 
+
+
+
+		if (status != NS_OK)
+			goto cleanup;
+
+		// make a unique file at the same location of our source file  (FILENAME-ptch.EXT)
+        nsString patchFileName = "-ptch";
+		nsString newFileName = sourceFile.GetLeafName();
+
+        PRInt32 index;
+		if ((index = newFileName.RFind(".")) > 0)
+		{
+            nsString extention;
+            nsString fileName;
+            newFileName.Right(extention, (newFileName.Length() - index) );        
+            newFileName.Left(fileName, (newFileName.Length() - (newFileName.Length() - index)));
+            newFileName = fileName + patchFileName + extention;
+
+        } else {
+            newFileName += patchFileName;
+        }
+        
+
+		outFileSpec.SetLeafName(newFileName); //????
+		outFileSpec.MakeUnique();
+
+        char *outFile = PL_strdup(nsNSPRPath(outFileSpec));
+
+		// apply patch to the source file
+		dd->fSrc = PR_Open ( realfile, PR_RDONLY, 0666);
+		dd->fOut = PR_Open ( outFile, PR_RDWR|PR_CREATE_FILE|PR_TRUNCATE, 0666);
+
+		if (dd->fSrc != NULL && dd->fOut != NULL)
+		{
+			status = gdiff_validateFile (dd, SRCFILE);
+
+			// specify why diff failed
+			if (status == GDIFF_ERR_CHECKSUM)
+				status = GDIFF_ERR_CHECKSUM_TARGET;
+
+			if (status == GDIFF_OK)
+				status = gdiff_ApplyPatch(dd);
+
+			if (status == GDIFF_OK)
+				status = gdiff_validateFile (dd, OUTFILE);
+
+			if (status == GDIFF_ERR_CHECKSUM)
+				status = GDIFF_ERR_CHECKSUM_RESULT;
+
+            if (status == GDIFF_OK)
+            {
+                *newFile = &outFileSpec;
+                if ( outFile != nsnull)
+                    PL_strfree( outFile );
+            }
+
+		} else {
+
+			status = GDIFF_ERR_ACCESS;
+		}		
+	}
+
+
+
+#ifdef XP_MAC
+	if ( dd->bMacAppleSingle && status == GDIFF_OK ) 
+	{
+        // create another file, so that we can decode somewhere
+        nsFileSpec anotherName = outFileSpec;
+        anotherName.MakeUnique();
+        
+		// Close the out file so that we can read it 		
+		PR_Close( dd->fOut );
+		dd->fOut = NULL;
+		
+		
+		FSSpec outSpec = outFileSpec.GetFSSpec();
+		FSSpec anotherSpec   = anotherName.GetFSSpec();
+		
+			
+        status =  PAS_DecodeFile(&outSpec, &anotherSpec);
+		if (status != noErr)
+		{
+		   	goto cleanup;
+        }
+		
+        nsFileSpec parent;
+        
+        outFileSpec.GetParent(parent);
+        
+        outFileSpec.Delete(PR_FALSE);
+        anotherName.Copy(parent);
+        
+        *newFile = &anotherName;
+	}
+	
+#endif 
+
+
+cleanup:
+    if ( dd != NULL ) 
+    {
+        if ( dd->fSrc != nsnull )
+            PR_Close( dd->fSrc );
+
+
+        if ( dd->fDiff != nsnull )
+            PR_Close( dd->fDiff );
+		
+		if ( dd->fOut != nsnull )
+        {
+            PR_Close( dd->fOut );
+        }
+        
+        if ( status != GDIFF_OK )
+		   	//XP_FileRemove( outfile, outtype );
+			newFile = NULL;
+		        
+		PR_FREEIF( dd->databuf );
+        PR_FREEIF( dd->oldChecksum );
+        PR_FREEIF( dd->newChecksum );
+        PR_DELETE(dd);
+    }
+
+	if ( tmpurl != NULL ) {
+        //XP_FileRemove( tmpurl, xpURL );
+		tmpurl = NULL;
+        PR_DELETE( tmpurl );
+    }
+    
+	/* lets map any GDIFF error to nice SU errors */
+
+	switch (status)
+	{
+        case GDIFF_OK:
+                break;
+		case GDIFF_ERR_HEADER:
+		case GDIFF_ERR_BADDIFF:
+		case GDIFF_ERR_OPCODE:
+		case GDIFF_ERR_CHKSUMTYPE:
+				status = nsInstall::PATCH_BAD_DIFF;
+				break;
+		case GDIFF_ERR_CHECKSUM_TARGET:
+				status = nsInstall::PATCH_BAD_CHECKSUM_TARGET;
+				break;
+		case GDIFF_ERR_CHECKSUM_RESULT:
+				status = nsInstall::PATCH_BAD_CHECKSUM_RESULT;
+				break;
+		case GDIFF_ERR_OLDFILE:
+		case GDIFF_ERR_ACCESS:
+		case GDIFF_ERR_MEM:
+		case GDIFF_ERR_UNKNOWN:
+		default:
+				status = nsInstall::UNEXPECTED_ERROR;
+				break;
+	}
+
+    return status;
+
+	// return -1;	//old return value
+}
+
+
+void* 
+nsInstallPatch::HashFilePath(const nsFilePath& aPath)
+{
+    PRUint32 rv = 0;
+
+	char* cPath = PL_strdup(nsNSPRPath(aPath));
+    
+    if(cPath != nsnull) 
+    {
+        char  ch;
+        char* filePath = PL_strdup(cPath);
+        PRUint32 cnt=0;
+
+        while ((ch = *filePath++) != 0) 
+        {
+            // FYI: rv = rv*37 + ch
+            rv = ((rv << 5) + (rv << 2) + rv) + ch;
+            cnt++;
+        }
+        
+        for (PRUint32 i=0; i<=cnt; i++)
+            *filePath--;
+		PL_strfree(filePath);
+    }
+
+	PL_strfree(cPath);
+
+    return (void*)rv;
+}
+
+
+
+
+/*---------------------------------------------------------
+ *  gdiff_parseHeader()
+ *
+ *  reads and validates the GDIFF header info
+ *---------------------------------------------------------
+ */
+static
+int32 gdiff_parseHeader( pDIFFDATA dd )
+{
+    int32   err = GDIFF_OK;
+    uint8   cslen;
+    uint8   oldcslen;
+    uint8   newcslen;
+    uint32  nRead;
+    uchar   header[GDIFF_HEADERSIZE];
+
+    /* Read the fixed-size part of the header */
+
+	nRead = PR_Read (dd->fDiff, header, GDIFF_HEADERSIZE);
+    if ( nRead != GDIFF_HEADERSIZE ||
+         memcmp( header, GDIFF_MAGIC, GDIFF_MAGIC_LEN ) != 0  ||
+         header[GDIFF_VER_POS] != GDIFF_VER )
+    {
+        err = GDIFF_ERR_HEADER;
+    }
+    else
+    {
+        /* get the checksum information */
+
+        dd->checksumType = header[GDIFF_CS_POS];
+        cslen = header[GDIFF_CSLEN_POS];
+
+        if ( cslen > 0 )
+        {
+            oldcslen = cslen / 2;
+            newcslen = cslen - oldcslen;
+            PR_ASSERT( newcslen == oldcslen );
+
+            dd->checksumLength = oldcslen;
+            dd->oldChecksum = (uchar*)PR_MALLOC(oldcslen);
+            dd->newChecksum = (uchar*)PR_MALLOC(newcslen);
+
+            if ( dd->oldChecksum != NULL && dd->newChecksum != NULL )
+            {
+				nRead = PR_Read (dd->fDiff, dd->oldChecksum, oldcslen);
+                if ( nRead == oldcslen )
+                {
+					nRead = PR_Read (dd->fDiff, dd->newChecksum, newcslen);
+                    if ( nRead != newcslen ) {
+                        err = GDIFF_ERR_HEADER;
+                    }
+                }
+                else {
+                    err = GDIFF_ERR_HEADER;
+                }
+            }
+            else {
+                err = GDIFF_ERR_MEM;
+            }
+        }
+
+
+        /* get application data, if any */
+
+        if ( err == GDIFF_OK )
+        {
+            uint32  appdataSize;
+            uchar   *buf;
+            uchar   lenbuf[GDIFF_APPDATALEN];
+
+			nRead = PR_Read(dd->fDiff, lenbuf, GDIFF_APPDATALEN);
+            if ( nRead == GDIFF_APPDATALEN ) 
+            {
+                appdataSize = getlong(lenbuf);
+
+                if ( appdataSize > 0 ) 
+                {
+                    buf = (uchar *)PR_MALLOC( appdataSize );
+
+                    if ( buf != NULL )
+                    {
+						nRead = PR_Read (dd->fDiff, buf, appdataSize);
+                        if ( nRead == appdataSize ) 
+                        {
+                            if ( 0 == memcmp( buf, APPFLAG_W32BOUND, appdataSize ) )
+                                dd->bWin32BoundImage = TRUE;
+
+                            if ( 0 == memcmp( buf, APPFLAG_APPLESINGLE, appdataSize ) )
+                                dd->bMacAppleSingle = TRUE;
+                        }
+                        else {
+                            err = GDIFF_ERR_HEADER;
+                        }
+
+                        PR_DELETE( buf );
+                    }
+                    else {
+                        err = GDIFF_ERR_MEM;
+                    }
+                }
+            }
+            else {
+                err = GDIFF_ERR_HEADER;
+            }
+        }
+    }
+
+    return (err);
+}
+
+
+/*---------------------------------------------------------
+ *  gdiff_validateFile()
+ *
+ *  computes the checksum of the file and compares it to 
+ *  the value stored in the GDIFF header
+ *---------------------------------------------------------
+ */
+static 
+int32 gdiff_validateFile( pDIFFDATA dd, int file )
+{
+    int32		result;
+    PRFileDesc*	fh;
+    uchar*		chksum;
+
+    /* which file are we dealing with? */
+    if ( file == SRCFILE ) {
+        fh = dd->fSrc;
+        chksum = dd->oldChecksum;
+    }
+    else { /* OUTFILE */
+        fh = dd->fOut;
+        chksum = dd->newChecksum;
+    }
+
+    /* make sure file's at beginning */
+    PR_Seek( fh, 0, PR_SEEK_SET );
+
+    /* calculate appropriate checksum */
+    switch (dd->checksumType)
+    {
+        case GDIFF_CS_NONE:
+            result = GDIFF_OK;
+            break;
+
+
+        case GDIFF_CS_CRC32:
+            if ( dd->checksumLength == CRC32_LEN )
+                result = gdiff_valCRC32( dd, fh, getlong(chksum) );
+            else
+                result = GDIFF_ERR_HEADER;
+            break;
+
+
+        case GDIFF_CS_MD5:
+
+
+        case GDIFF_CS_SHA:
+
+
+        default:
+            /* unsupported checksum type */
+            result = GDIFF_ERR_CHKSUMTYPE;
+            break;
+    }
+
+    /* reset file position to beginning and return status */
+    PR_Seek( fh, 0, PR_SEEK_SET );
+    return (result);
+}
+
+
+/*---------------------------------------------------------
+ *  gdiff_valCRC32()
+ *
+ *  computes the checksum of the file and compares it to 
+ *  the passed in checksum.  Assumes file is positioned at
+ *  beginning.
+ *---------------------------------------------------------
+ */
+static 
+int32 gdiff_valCRC32( pDIFFDATA dd, PRFileDesc* fh, uint32 chksum )
+{
+    uint32 crc;
+    uint32 nRead;
+
+    crc = crc32(0L, Z_NULL, 0);
+
+	nRead = PR_Read (fh, dd->databuf, dd->bufsize);
+    while ( nRead > 0 ) 
+    {
+        crc = crc32( crc, dd->databuf, nRead );
+		nRead = PR_Read (fh, dd->databuf, dd->bufsize);
+    }
+
+    if ( crc == chksum )
+        return GDIFF_OK;
+    else
+        return GDIFF_ERR_CHECKSUM;
+}
+
+
+/*---------------------------------------------------------
+ *  gdiff_ApplyPatch()
+ *
+ *  Combines patch data with source file to produce the
+ *  new target file.  Assumes all three files have been
+ *  opened, GDIFF header read, and all other setup complete
+ *
+ *  The GDIFF patch is processed sequentially which random
+ *  access is neccessary for the source file.
+ *---------------------------------------------------------
+ */
+static
+int32 gdiff_ApplyPatch( pDIFFDATA dd )
+{
+    int32   err;
+    XP_Bool done;
+    uint32  position;
+    uint32  count;
+    uchar   opcode;
+    uchar   cmdbuf[MAXCMDSIZE];
+
+    done = FALSE;
+    while ( !done ) {
+        err = gdiff_getdiff( dd, &opcode, OPSIZE );
+        if ( err != GDIFF_OK )
+            break;
+
+        switch (opcode)
+        {
+            case ENDDIFF:
+                done = TRUE;
+                break;
+
+            case ADD16:
+                err = gdiff_getdiff( dd, cmdbuf, ADD16SIZE );
+                if ( err == GDIFF_OK ) {
+                    err = gdiff_add( dd, getshort( cmdbuf ) );
+                }
+                break;
+
+            case ADD32:
+                err = gdiff_getdiff( dd, cmdbuf, ADD32SIZE );
+                if ( err == GDIFF_OK ) {
+                    err = gdiff_add( dd, getlong( cmdbuf ) );
+                }
+                break;
+
+            case COPY16BYTE:
+                err = gdiff_getdiff( dd, cmdbuf, COPY16BYTESIZE );
+                if ( err == GDIFF_OK ) {
+                    position = getshort( cmdbuf );
+                    count = *(cmdbuf + sizeof(short));
+                    err = gdiff_copy( dd, position, count );
+                }
+                break;
+
+            case COPY16SHORT:
+                err = gdiff_getdiff( dd, cmdbuf, COPY16SHORTSIZE );
+                if ( err == GDIFF_OK ) {
+                    position = getshort( cmdbuf );
+                    count = getshort(cmdbuf + sizeof(short));
+                    err = gdiff_copy( dd, position, count );
+                }
+                break;
+
+            case COPY16LONG:
+                err = gdiff_getdiff( dd, cmdbuf, COPY16LONGSIZE );
+                if ( err == GDIFF_OK ) {
+                    position = getshort( cmdbuf );
+                    count =  getlong(cmdbuf + sizeof(short));
+                    err = gdiff_copy( dd, position, count );
+                }
+                break;
+
+            case COPY32BYTE:
+                err = gdiff_getdiff( dd, cmdbuf, COPY32BYTESIZE );
+                if ( err == GDIFF_OK ) {
+                    position = getlong( cmdbuf );
+                    count = *(cmdbuf + sizeof(long));
+                    err = gdiff_copy( dd, position, count );
+                }
+                break;
+
+            case COPY32SHORT:
+                err = gdiff_getdiff( dd, cmdbuf, COPY32SHORTSIZE );
+                if ( err == GDIFF_OK ) {
+                    position = getlong( cmdbuf );
+                    count = getshort(cmdbuf + sizeof(long));
+                    err = gdiff_copy( dd, position, count );
+                }
+                break;
+
+            case COPY32LONG:
+                err = gdiff_getdiff( dd, cmdbuf, COPY32LONGSIZE );
+                if ( err == GDIFF_OK ) {
+                    position = getlong( cmdbuf );
+                    count = getlong(cmdbuf + sizeof(long));
+                    err = gdiff_copy( dd, position, count );
+                }
+                break;
+
+            case COPY64:
+                /* we don't support 64-bit file positioning yet */
+                err = GDIFF_ERR_OPCODE;
+                break;
+
+            default:
+                err = gdiff_add( dd, opcode );
+                break;
+        }
+
+        if ( err != GDIFF_OK )
+            done = TRUE;
+    }
+
+    /* return status */
+    return (err);
+}
+
+
+/*---------------------------------------------------------
+ *  gdiff_getdiff()
+ *
+ *  reads the next "length" bytes of the diff into "buffer"
+ *
+ *  XXX: need a diff buffer to optimize reads!
+ *---------------------------------------------------------
+ */
+static
+int32 gdiff_getdiff( pDIFFDATA dd, uchar *buffer, uint32 length )
+{
+    uint32 bytesRead;
+
+	bytesRead = PR_Read (dd->fDiff, buffer, length);
+    if ( bytesRead != length )
+        return GDIFF_ERR_BADDIFF;
+
+    return GDIFF_OK;
+}
+
+
+/*---------------------------------------------------------
+ *  gdiff_add()
+ *
+ *  append "count" bytes from diff file to new file
+ *---------------------------------------------------------
+ */
+static
+int32 gdiff_add( pDIFFDATA dd, uint32 count )
+{
+    int32   err = GDIFF_OK;
+    uint32  nRead;
+    uint32  chunksize;
+
+    while ( count > 0 ) {
+        chunksize = ( count > dd->bufsize) ? dd->bufsize : count;
+		nRead = PR_Read (dd->fDiff, dd->databuf, chunksize);
+        if ( nRead != chunksize ) {
+            err = GDIFF_ERR_BADDIFF;
+            break;
+        }
+
+		PR_Write (dd->fOut, dd->databuf, chunksize);
+
+        count -= chunksize;
+    }
+
+    return (err);
+}
+
+
+
+/*---------------------------------------------------------
+ *  gdiff_copy()
+ *
+ *  copy "count" bytes from "position" in source file
+ *---------------------------------------------------------
+ */
+static
+int32 gdiff_copy( pDIFFDATA dd, uint32 position, uint32 count )
+{
+    int32 err = GDIFF_OK;
+    uint32 nRead;
+    uint32 chunksize;
+
+	PR_Seek (dd->fSrc, position, PR_SEEK_SET);
+
+    while ( count > 0 ) {
+        chunksize = (count > dd->bufsize) ? dd->bufsize : count;
+
+		nRead = PR_Read (dd->fSrc, dd->databuf, chunksize);
+        if ( nRead != chunksize ) {
+            err = GDIFF_ERR_OLDFILE;
+            break;
+        }
+
+		PR_Write (dd->fOut, dd->databuf, chunksize);
+
+        count -= chunksize;
+    }
+
+    return (err);
+}
+

mozilla/xpinstall/src/nsInstallPatch.h

@@ -0,0 +1,79 @@
+/* -*- 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 nsInstallPatch_h__
+#define nsInstallPatch_h__
+
+#include "prtypes.h"
+#include "nsString.h"
+
+#include "nsInstallObject.h"
+
+#include "nsInstall.h"
+#include "nsInstallFolder.h"
+#include "nsInstallVersion.h"
+
+
+class nsInstallPatch : public nsInstallObject 
+{
+    public:
+
+        nsInstallPatch( nsInstall* inInstall,
+                        const nsString& inVRName,
+                        const nsString& inVInfo,
+                        const nsString& inJarLocation,
+                        const nsString& folderSpec,
+                        const nsString& inPartialPath,
+                        PRInt32 *error);
+
+        nsInstallPatch( nsInstall* inInstall,
+                        const nsString& inVRName,
+                        const nsString& inVInfo,
+                        const nsString& inJarLocation,
+                        PRInt32 *error);
+
+        virtual ~nsInstallPatch();
+
+        PRInt32 Prepare();
+        PRInt32 Complete();
+        void  Abort();
+        char* toString();
+
+        PRBool CanUninstall();
+        PRBool RegisterPackageNode();
+	  
+  
+    private:
+        
+        
+        nsInstallVersion        *mVersionInfo;
+        
+        nsFileSpec              *mTargetFile;
+        nsFileSpec              *mPatchFile;
+        nsFileSpec              *mPatchedFile;
+
+        nsString                *mJarLocation;
+        nsString                *mRegistryName;
+        
+       
+
+        PRInt32  NativePatch(const nsFileSpec &sourceFile, const nsFileSpec &patchfile, nsFileSpec **newFile);
+        void*    HashFilePath(const nsFilePath& aPath);
+};
+
+#endif /* nsInstallPatch_h__ */

mozilla/xpinstall/src/nsInstallProgressDialog.cpp

@@ -0,0 +1,343 @@
+/* -*- 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 "License"); you may not use this file except in
+ * compliance with the License.  You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, 
+ * released March 31, 1998. 
+ *
+ * The Initial Developer of the Original Code is Netscape Communications 
+ * Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ *
+ * Contributors:
+ *     Douglas Turner <dougt@netscape.com>
+ */
+
+
+#include "nsIXPInstallProgress.h"
+#include "nsInstallProgressDialog.h"
+
+#include "nsIAppShellComponentImpl.h"
+
+#include "nsIServiceManager.h"
+#include "nsIDocumentViewer.h"
+#include "nsIContent.h"
+#include "nsINameSpaceManager.h"
+#include "nsIContentViewer.h"
+#include "nsIDOMElement.h"
+#include "nsINetService.h"
+
+#include "nsIWebShell.h"
+#include "nsIWebShellWindow.h"
+
+static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
+static NS_DEFINE_IID( kAppShellServiceCID, NS_APPSHELL_SERVICE_CID );
+static NS_DEFINE_IID( kNetServiceCID,      NS_NETSERVICE_CID );
+
+// Utility to set element attribute.
+static nsresult setAttribute( nsIDOMXULDocument *doc,
+                              const char *id,
+                              const char *name,
+                              const nsString &value ) {
+    nsresult rv = NS_OK;
+
+    if ( doc ) {
+        // Find specified element.
+        nsCOMPtr<nsIDOMElement> elem;
+        rv = doc->GetElementById( id, getter_AddRefs( elem ) );
+        if ( elem ) {
+            // Set the text attribute.
+            rv = elem->SetAttribute( name, value );
+            if ( NS_SUCCEEDED( rv ) ) {
+            } else {
+                 DEBUG_PRINTF( PR_STDOUT, "%s %d: SetAttribute failed, rv=0x%X\n",
+                               __FILE__, (int)__LINE__, (int)rv );
+            }
+        } else {
+            DEBUG_PRINTF( PR_STDOUT, "%s %d: GetElementById failed, rv=0x%X\n",
+                          __FILE__, (int)__LINE__, (int)rv );
+        }
+    } else {
+        rv = NS_ERROR_NULL_POINTER;
+    }
+
+    return rv;
+}
+
+
+// Utility to get element attribute.
+static nsresult getAttribute( nsIDOMXULDocument *doc,
+                              const char *id,
+                              const char *name,
+                              nsString &value ) {
+    nsresult rv = NS_OK;
+
+    if ( doc ) {
+        // Find specified element.
+        nsCOMPtr<nsIDOMElement> elem;
+        rv = doc->GetElementById( id, getter_AddRefs( elem ) );
+        if ( elem ) {
+            // Set the text attribute.
+            rv = elem->GetAttribute( name, value );
+            if ( NS_SUCCEEDED( rv ) ) {
+            } else {
+                 DEBUG_PRINTF( PR_STDOUT, "%s %d: SetAttribute failed, rv=0x%X\n",
+                               __FILE__, (int)__LINE__, (int)rv );
+            }
+        } else {
+            DEBUG_PRINTF( PR_STDOUT, "%s %d: GetElementById failed, rv=0x%X\n",
+                          __FILE__, (int)__LINE__, (int)rv );
+        }
+    } else {
+        rv = NS_ERROR_NULL_POINTER;
+    }
+
+    return rv;
+}
+
+
+nsInstallProgressDialog::nsInstallProgressDialog()
+{
+    NS_INIT_REFCNT();
+    mWindow = nsnull;
+    mDocument = nsnull;
+
+}
+
+nsInstallProgressDialog::~nsInstallProgressDialog()
+{
+}
+
+
+NS_IMPL_ADDREF( nsInstallProgressDialog );
+NS_IMPL_RELEASE( nsInstallProgressDialog );
+
+NS_IMETHODIMP 
+nsInstallProgressDialog::QueryInterface(REFNSIID aIID,void** aInstancePtr)
+{
+  if (aInstancePtr == NULL) {
+    return NS_ERROR_NULL_POINTER;
+  }
+
+  // Always NULL result, in case of failure
+  *aInstancePtr = NULL;
+
+  if (aIID.Equals(nsIXPInstallProgress::GetIID())) {
+    *aInstancePtr = (void*) ((nsInstallProgressDialog*)this);
+    NS_ADDREF_THIS();
+    return NS_OK;
+  }
+  if (aIID.Equals(nsIXULWindowCallbacks::GetIID())) {
+    *aInstancePtr = (void*) ((nsIXULWindowCallbacks*)this);
+    NS_ADDREF_THIS();
+    return NS_OK;
+  }
+  if (aIID.Equals(kISupportsIID)) {
+    *aInstancePtr = (void*) (nsISupports*)((nsIXPInstallProgress*)this);
+    NS_ADDREF_THIS();
+    return NS_OK;
+  }
+
+  return NS_ERROR_NO_INTERFACE;
+}
+
+NS_IMETHODIMP 
+nsInstallProgressDialog::BeforeJavascriptEvaluation()
+{
+    nsresult rv = NS_OK;
+
+    // Get app shell service.
+    nsIAppShellService *appShell;
+    rv = nsServiceManager::GetService( kAppShellServiceCID,
+                                       nsIAppShellService::GetIID(),
+                                       (nsISupports**)&appShell );
+
+    if ( NS_SUCCEEDED( rv ) ) 
+    {
+        // Open "progress" dialog.
+        nsIURL *url;
+        rv = NS_NewURL( &url, "resource:/res/xpinstall/progress.xul" );
+        
+        if ( NS_SUCCEEDED(rv) ) 
+        {
+        
+            nsIWebShellWindow *newWindow;
+
+            rv = appShell->CreateTopLevelWindow( nsnull,
+                                                 url,
+                                                 PR_TRUE,
+                                                 newWindow,
+                                                 nsnull,
+                                                 this,  // callbacks??
+                                                 0,
+                                                 0 );
+
+            if ( NS_SUCCEEDED( rv ) ) 
+            {
+                mWindow = newWindow;
+                NS_RELEASE( newWindow );
+
+                 if (mWindow != nsnull)
+                    mWindow->Show(PR_TRUE);
+            }
+            else 
+            {
+                DEBUG_PRINTF( PR_STDOUT, "Error creating progress dialog, rv=0x%X\n", (int)rv );
+            }
+            NS_RELEASE( url );
+        }
+        
+        nsServiceManager::ReleaseService( kAppShellServiceCID, appShell );
+    } 
+    else 
+    {
+        DEBUG_PRINTF( PR_STDOUT, "Unable to get app shell service, rv=0x%X\n", (int)rv );
+    }
+    return NS_OK;
+}
+
+NS_IMETHODIMP 
+nsInstallProgressDialog::AfterJavascriptEvaluation()
+{
+    if (mWindow)
+    {
+        mWindow->Close();
+    }
+
+    return NS_OK;
+}
+
+NS_IMETHODIMP 
+nsInstallProgressDialog::InstallStarted(const char *UIPackageName)
+{
+    setAttribute( mDocument, "dialog.uiPackageName", "value", nsString(UIPackageName) );
+    return NS_OK;
+}
+
+NS_IMETHODIMP 
+nsInstallProgressDialog::ItemScheduled(const char *message)
+{
+    PRInt32 maxChars = 40;
+
+    nsString theMessage(message);
+    PRInt32 len = theMessage.Length();
+    if (len > maxChars)
+    {
+        PRInt32 offset = (len/2) - ((len - maxChars)/2);
+        PRInt32 count  = (len - maxChars);
+        theMessage.Cut(offset, count); 
+        theMessage.Insert(nsString("..."), offset);
+    }
+    setAttribute( mDocument, "dialog.currentAction", "value", theMessage );
+    
+    nsString aValue;
+    getAttribute( mDocument, "data.canceled", "value", aValue );
+
+    if (aValue.EqualsIgnoreCase("true"))
+        return -1;
+
+    return NS_OK;
+}
+
+NS_IMETHODIMP 
+nsInstallProgressDialog::InstallFinalization(const char *message, PRInt32 itemNum, PRInt32 totNum)
+{
+
+    PRInt32 maxChars = 40;
+
+    nsString theMessage(message);
+    PRInt32 len = theMessage.Length();
+    if (len > maxChars)
+    {
+        PRInt32 offset = (len/2) - ((len - maxChars)/2);
+        PRInt32 count  = (len - maxChars);
+        theMessage.Cut(offset, count);  
+        theMessage.Insert(nsString("..."), offset);
+    }
+
+    setAttribute( mDocument, "dialog.currentAction", "value", theMessage );
+
+    nsresult rv = NS_OK;
+    char buf[16];
+    
+    PR_snprintf( buf, sizeof buf, "%lu", totNum );
+    setAttribute( mDocument, "dialog.progress", "max", buf );
+   
+    if (totNum != 0)
+    {
+        PR_snprintf( buf, sizeof buf, "%lu", ((totNum-itemNum)/totNum) );
+    }
+    else
+    {
+        PR_snprintf( buf, sizeof buf, "%lu", 0 );
+    }
+    setAttribute( mDocument, "dialog.progress", "value", buf );
+    
+    return NS_OK;
+}
+
+NS_IMETHODIMP 
+nsInstallProgressDialog::InstallAborted()
+{
+    return NS_OK;
+}
+
+
+
+
+// Do startup stuff from C++ side.
+NS_IMETHODIMP
+nsInstallProgressDialog::ConstructBeforeJavaScript(nsIWebShell *aWebShell) 
+{
+    nsresult rv = NS_OK;
+
+    // Get content viewer from the web shell.
+    nsCOMPtr<nsIContentViewer> contentViewer;
+    rv = aWebShell ? aWebShell->GetContentViewer(getter_AddRefs(contentViewer))
+                   : NS_ERROR_NULL_POINTER;
+
+    if ( contentViewer ) {
+        // Up-cast to a document viewer.
+        nsCOMPtr<nsIDocumentViewer> docViewer( do_QueryInterface( contentViewer, &rv ) );
+        if ( docViewer ) {
+            // Get the document from the doc viewer.
+            nsCOMPtr<nsIDocument> document;
+            rv = docViewer->GetDocument(*getter_AddRefs(document));
+            if ( document ) {
+                // Upcast to XUL document.
+                mDocument = do_QueryInterface( document, &rv );
+                if ( ! mDocument ) 
+                {
+                    DEBUG_PRINTF( PR_STDOUT, "%s %d: Upcast to nsIDOMXULDocument failed, rv=0x%X\n",
+                                  __FILE__, (int)__LINE__, (int)rv );
+                }
+            } 
+            else 
+            {
+                DEBUG_PRINTF( PR_STDOUT, "%s %d: GetDocument failed, rv=0x%X\n",
+                              __FILE__, (int)__LINE__, (int)rv );
+            }
+        } 
+        else 
+        {
+            DEBUG_PRINTF( PR_STDOUT, "%s %d: Upcast to nsIDocumentViewer failed, rv=0x%X\n",
+                          __FILE__, (int)__LINE__, (int)rv );
+        }
+    } 
+    else 
+    {
+        DEBUG_PRINTF( PR_STDOUT, "%s %d: GetContentViewer failed, rv=0x%X\n",
+                      __FILE__, (int)__LINE__, (int)rv );
+    }
+
+    return rv;
+}

mozilla/xpinstall/src/nsInstallProgressDialog.h

@@ -0,0 +1,67 @@
+/* -*- 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 "License"); you may not use this file except in
+ * compliance with the License.  You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, 
+ * released March 31, 1998. 
+ *
+ * The Initial Developer of the Original Code is Netscape Communications 
+ * Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ *
+ * Contributors:
+ *     Douglas Turner <dougt@netscape.com>
+ */
+#ifndef __nsInstallProgressDialog_h__
+#define __nsInstallProgressDialog_h__
+
+#include "nsIXPInstallProgress.h"
+#include "nsISupports.h"
+#include "nsISupportsUtils.h"
+
+#include "nsCOMPtr.h"
+
+#include "nsIWebShell.h"
+#include "nsIWebShellWindow.h"
+#include "nsIXULWindowCallbacks.h"    
+
+#include "nsIDocument.h"
+#include "nsIDOMXULDocument.h"
+
+
+class nsInstallProgressDialog : public nsIXPInstallProgress, public nsIXULWindowCallbacks
+{
+    public: 
+
+        nsInstallProgressDialog();
+        virtual ~nsInstallProgressDialog();
+        
+        NS_DECL_ISUPPORTS
+
+        
+        NS_IMETHOD BeforeJavascriptEvaluation();
+        NS_IMETHOD AfterJavascriptEvaluation();
+        NS_IMETHOD InstallStarted(const char *UIPackageName);
+        NS_IMETHOD ItemScheduled(const char *message);
+        NS_IMETHOD InstallFinalization(const char *message, PRInt32 itemNum, PRInt32 totNum);
+        NS_IMETHOD InstallAborted();
+
+        // Declare implementations of nsIXULWindowCallbacks interface functions.
+        NS_IMETHOD ConstructBeforeJavaScript(nsIWebShell *aWebShell);
+        NS_IMETHOD ConstructAfterJavaScript(nsIWebShell *aWebShell) { return NS_OK; }
+
+    private:
+
+        nsCOMPtr<nsIDOMXULDocument>  mDocument;
+        nsCOMPtr<nsIWebShellWindow>  mWindow;
+};
+#endif

mozilla/xpinstall/src/nsInstallResources.cpp

@@ -0,0 +1,67 @@
+ /* -*- 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 "License"); you may not use this file except in
+ * compliance with the License.  You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, 
+ * released March 31, 1998. 
+ *
+ * The Initial Developer of the Original Code is Netscape Communications 
+ * Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ *
+ * Contributors:
+ *     Daniel Veditz <dveditz@netscape.com>
+ *     Douglas Turner <dougt@netscape.com>
+ */
+
+#include "nsInstallResources.h"
+
+char* nsInstallResources::GetInstallFileString(void)
+{ 
+    return "Installing: %s"; 
+}
+
+char* nsInstallResources::GetReplaceFileString(void)
+{ 
+    return "Replacing %s"; 
+}     
+
+char* nsInstallResources::GetDeleteFileString(void)
+{ 
+    return "Deleting file: %s"; 
+} 
+
+char* nsInstallResources::GetDeleteComponentString(void) 
+{ 
+    return "Deleting component: %s"; 
+}
+
+char* nsInstallResources::GetExecuteString(void)         
+{ 
+    return "Executing: %s"; 
+}
+
+char* nsInstallResources::GetExecuteWithArgsString(void) 
+{ 
+    return "Executing: %s with argument: %s"; 
+}
+
+char* nsInstallResources::GetPatchFileString(void)       
+{ 
+    return "Patching: %s"; 
+}
+
+char* nsInstallResources::GetUninstallString(void)       
+{ 
+    return "Uninstalling: %s"; 
+}
+

mozilla/xpinstall/src/nsInstallResources.h

@@ -0,0 +1,45 @@
+/* -*- 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 "License"); you may not use this file except in
+ * compliance with the License.  You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, 
+ * released March 31, 1998. 
+ *
+ * The Initial Developer of the Original Code is Netscape Communications 
+ * Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ *
+ * Contributors:
+ *     Daniel Veditz <dveditz@netscape.com>
+ *     Douglas Turner <dougt@netscape.com>
+ */
+
+
+#ifndef __NS_INSTALLRESOURCES_H__
+#define __NS_INSTALLRESOURCES_H__
+
+class nsInstallResources
+{
+    public:
+       
+       static char* GetInstallFileString(void);
+       static char* GetReplaceFileString(void);     
+       static char* GetDeleteFileString(void);      
+       static char* GetDeleteComponentString(void); 
+       static char* GetExecuteString(void);         
+       static char* GetExecuteWithArgsString(void); 
+       static char* GetPatchFileString(void);       
+       static char* GetUninstallString(void);       
+};
+
+
+#endif

mozilla/xpinstall/src/nsInstallTrigger.cpp

@@ -0,0 +1,359 @@
+/* -*- 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 "License"); you may not use this file except in
+ * compliance with the License.  You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.  See
+ * the License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * The Original Code is Mozilla Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+
+#include "nsSoftwareUpdate.h"
+#include "nsSoftwareUpdateStream.h"
+#include "nsInstallTrigger.h"
+#include "nsIDOMInstallTriggerGlobal.h"
+
+#include "nscore.h"
+#include "nsIFactory.h"
+#include "nsISupports.h"
+#include "nsIScriptGlobalObject.h"
+
+#include "nsIPref.h"
+
+#include "nsRepository.h"
+#include "nsIServiceManager.h"
+
+#include "nsSpecialSystemDirectory.h"
+
+static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
+static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);
+static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID);
+
+static NS_DEFINE_IID(kIInstallTrigger_IID, NS_IDOMINSTALLTRIGGERGLOBAL_IID);
+static NS_DEFINE_IID(kIInstallTrigger_CID, NS_SoftwareUpdateInstallTrigger_CID);
+
+
+
+
+
+
+nsInstallTrigger::nsInstallTrigger()
+{
+    mScriptObject   = nsnull;
+    NS_INIT_REFCNT();
+}
+
+nsInstallTrigger::~nsInstallTrigger()
+{
+}
+
+NS_IMETHODIMP 
+nsInstallTrigger::QueryInterface(REFNSIID aIID,void** aInstancePtr)
+{
+    if (aInstancePtr == NULL)
+    {
+        return NS_ERROR_NULL_POINTER;
+    }
+
+    // Always NULL result, in case of failure
+    *aInstancePtr = NULL;
+
+    if ( aIID.Equals(kIScriptObjectOwnerIID))
+    {
+        *aInstancePtr = (void*) ((nsIScriptObjectOwner*)this);
+        AddRef();
+        return NS_OK;
+    }
+    else if ( aIID.Equals(kIInstallTrigger_IID) )
+    {
+        *aInstancePtr = (void*) ((nsIDOMInstallTriggerGlobal*)this);
+        AddRef();
+        return NS_OK;
+    }
+    else if ( aIID.Equals(kISupportsIID) )
+    {
+        *aInstancePtr = (void*)(nsISupports*)(nsIScriptObjectOwner*)this;
+        AddRef();
+        return NS_OK;
+    }
+
+     return NS_NOINTERFACE;
+}
+
+NS_IMPL_ADDREF(nsInstallTrigger)
+NS_IMPL_RELEASE(nsInstallTrigger)
+
+
+
+NS_IMETHODIMP 
+nsInstallTrigger::GetScriptObject(nsIScriptContext *aContext, void** aScriptObject)
+{
+    NS_PRECONDITION(nsnull != aScriptObject, "null arg");
+    nsresult res = NS_OK;
+    
+    if (nsnull == mScriptObject) 
+    {
+         nsIScriptGlobalObject *global = aContext->GetGlobalObject();
+
+        res = NS_NewScriptInstallTriggerGlobal(  aContext, 
+                                                (nsISupports *)(nsIDOMInstallTriggerGlobal*)this, 
+                                                (nsISupports *)global, 
+                                                &mScriptObject);
+        NS_IF_RELEASE(global);
+
+    }
+  
+
+    *aScriptObject = mScriptObject;
+    return res;
+}
+
+NS_IMETHODIMP 
+nsInstallTrigger::SetScriptObject(void *aScriptObject)
+{
+  mScriptObject = aScriptObject;
+  return NS_OK;
+}
+
+static NS_DEFINE_IID(kPrefsIID, NS_IPREF_IID);
+static NS_DEFINE_IID(kPrefsCID,  NS_PREF_CID);
+
+NS_IMETHODIMP    
+nsInstallTrigger::UpdateEnabled(PRBool* aReturn)
+{
+    nsIPref * prefs;
+    
+    nsresult rv = nsServiceManager::GetService(kPrefsCID, 
+                                               kPrefsIID,
+                                               (nsISupports**) &prefs);
+
+
+    if ( NS_SUCCEEDED(rv) )
+    {
+        rv = prefs->GetBoolPref( (const char*) AUTOUPDATE_ENABLE_PREF, aReturn);
+
+        if (NS_FAILED(rv))
+        {
+            *aReturn = PR_FALSE;
+        }
+
+        NS_RELEASE(prefs);
+    }
+    else
+    {
+        *aReturn = PR_FALSE;  /* no prefs manager.  set to false */
+    }
+    
+    //FIX!!!!!!!!!!  
+    *aReturn = PR_TRUE; 
+    return NS_OK;
+}
+
+
+NS_IMETHODIMP    
+nsInstallTrigger::StartSoftwareUpdate(const nsString& aURL, PRInt32 aFlags, PRInt32* aReturn)
+{
+    nsString localFile;
+    CreateTempFileFromURL(aURL, localFile);
+
+    // start the download (this will clean itself up)
+    nsSoftwareUpdateListener *downloader = new nsSoftwareUpdateListener(aURL, localFile, aFlags);
+
+    *aReturn = NS_OK;  // maybe we should do something more.
+    return NS_OK;
+}
+
+NS_IMETHODIMP    
+nsInstallTrigger::StartSoftwareUpdate(const nsString& aURL, PRInt32* aReturn)
+{
+    nsString localFile;
+    CreateTempFileFromURL(aURL, localFile);
+
+    // start the download (this will clean itself up)
+    nsSoftwareUpdateListener *downloader = new nsSoftwareUpdateListener(aURL, localFile, 0);
+
+    *aReturn = NS_OK;  // maybe we should do something more.
+    return NS_OK;
+}
+
+NS_IMETHODIMP    
+nsInstallTrigger::ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, PRInt32 aDiffLevel, const nsString& aVersion, PRInt32 aMode, PRInt32* aReturn)
+{
+    return NS_OK;
+}
+
+NS_IMETHODIMP    
+nsInstallTrigger::ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, PRInt32 aDiffLevel, nsIDOMInstallVersion* aVersion, PRInt32 aMode, PRInt32* aReturn)
+{
+    return NS_OK;
+}
+
+NS_IMETHODIMP    
+nsInstallTrigger::ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, nsIDOMInstallVersion* aVersion, PRInt32 aMode, PRInt32* aReturn)
+{
+    return NS_OK;
+}
+
+NS_IMETHODIMP    
+nsInstallTrigger::ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, const nsString& aVersion, PRInt32 aMode, PRInt32* aReturn)
+{
+    return NS_OK;
+}
+
+NS_IMETHODIMP    
+nsInstallTrigger::ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, const nsString& aVersion, PRInt32* aReturn)
+{
+    return NS_OK;
+}
+
+NS_IMETHODIMP    
+nsInstallTrigger::ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, nsIDOMInstallVersion* aVersion, PRInt32* aReturn)
+{
+    return NS_OK;
+}
+
+NS_IMETHODIMP    
+nsInstallTrigger::CompareVersion(const nsString& aRegName, PRInt32 aMajor, PRInt32 aMinor, PRInt32 aRelease, PRInt32 aBuild, PRInt32* aReturn)
+{
+    return NS_OK;
+}
+
+NS_IMETHODIMP    
+nsInstallTrigger::CompareVersion(const nsString& aRegName, const nsString& aVersion, PRInt32* aReturn)
+{
+    return NS_OK;
+}
+
+NS_IMETHODIMP    
+nsInstallTrigger::CompareVersion(const nsString& aRegName, nsIDOMInstallVersion* aVersion, PRInt32* aReturn)
+{
+    return NS_OK;
+}
+
+
+
+// this will take a nsIUrl, and create a temporary file.  If it is local, we just us it.
+ 
+void
+nsInstallTrigger::CreateTempFileFromURL(const nsString& aURL, nsString& tempFileString)
+{
+    // Checking to see if the url is local
+
+    if ( aURL.EqualsIgnoreCase("file://", 7) )
+    {       
+        tempFileString.SetString( nsNSPRPath(nsFileURL(aURL)) );
+    }
+    else
+    {
+        nsSpecialSystemDirectory tempFile(nsSpecialSystemDirectory::OS_TemporaryDirectory);
+    
+        PRInt32 result = aURL.RFind("/");
+        if (result != -1)
+        {    
+            nsString jarName;
+                       
+            aURL.Right(jarName, (aURL.Length() - result) );
+            
+            PRInt32 argOffset = jarName.RFind("?");
+
+            if (argOffset != -1)
+            {
+                // we need to remove ? and everything after it
+                jarName.Truncate(argOffset);
+            }
+            
+            
+            tempFile += jarName;
+        }
+        else
+        {   
+            tempFile += "xpinstall.jar";
+        }
+
+        tempFile.MakeUnique();
+
+        tempFileString.SetString( nsNSPRPath( nsFilePath(tempFile) ) );
+    }
+}
+
+
+/////////////////////////////////////////////////////////////////////////
+// 
+/////////////////////////////////////////////////////////////////////////
+
+
+
+nsInstallTriggerFactory::nsInstallTriggerFactory(void)
+{
+    NS_INIT_REFCNT();
+}
+
+nsInstallTriggerFactory::~nsInstallTriggerFactory(void)
+{
+    NS_ASSERTION(mRefCnt == 0, "non-zero refcnt at destruction");
+}
+
+NS_IMETHODIMP
+nsInstallTriggerFactory::QueryInterface(const nsIID &aIID, void **aResult)
+{
+    if (! aResult)
+        return NS_ERROR_NULL_POINTER;
+
+    // Always NULL result, in case of failure
+    *aResult = nsnull;
+
+    if (aIID.Equals(kISupportsIID)) {
+        *aResult = NS_STATIC_CAST(nsISupports*, this);
+        AddRef();
+        return NS_OK;
+    } else if (aIID.Equals(kIFactoryIID)) {
+        *aResult = NS_STATIC_CAST(nsIFactory*, this);
+        AddRef();
+        return NS_OK;
+    }
+
+    return NS_NOINTERFACE;
+}
+
+NS_IMPL_ADDREF(nsInstallTriggerFactory);
+NS_IMPL_RELEASE(nsInstallTriggerFactory);
+
+NS_IMETHODIMP
+nsInstallTriggerFactory::CreateInstance(nsISupports *aOuter, REFNSIID aIID, void **aResult)
+{
+   if (! aResult)
+        return NS_ERROR_NULL_POINTER;
+
+    *aResult = nsnull;
+
+    nsresult rv;
+
+    nsInstallTrigger *inst = new nsInstallTrigger();
+    
+    if (! inst)
+        return NS_ERROR_OUT_OF_MEMORY;
+
+    if (NS_FAILED(rv = inst->QueryInterface(aIID, aResult))) 
+    {
+        // We didn't get the right interface.
+        NS_ERROR("didn't support the interface you wanted");
+    }
+    return rv;
+}
+
+    
+NS_IMETHODIMP
+nsInstallTriggerFactory::LockFactory(PRBool aLock)
+{
+    // Not implemented in simplest case.
+    return NS_OK;
+}

mozilla/xpinstall/src/nsInstallTrigger.h

@@ -0,0 +1,72 @@
+#ifndef __NS_INSTALLTRIGGER_H__
+#define __NS_INSTALLTRIGGER_H__
+
+#include "nscore.h"
+#include "nsString.h"
+#include "nsIFactory.h"
+#include "nsISupports.h"
+#include "nsIScriptObjectOwner.h"
+
+#include "nsIDOMInstallTriggerGlobal.h"
+#include "nsSoftwareUpdate.h"
+
+#include "prtypes.h"
+#include "nsHashtable.h"
+#include "nsVector.h"
+
+
+
+
+
+class nsInstallTrigger: public nsIScriptObjectOwner, public nsIDOMInstallTriggerGlobal
+{
+    public:
+        static const nsIID& IID() { static nsIID iid = NS_SoftwareUpdateInstallTrigger_CID; return iid; }
+
+        nsInstallTrigger();
+        ~nsInstallTrigger();
+        
+        NS_DECL_ISUPPORTS
+
+        NS_IMETHOD    GetScriptObject(nsIScriptContext *aContext, void** aScriptObject);
+        NS_IMETHOD    SetScriptObject(void* aScriptObject);
+
+        NS_IMETHOD    UpdateEnabled(PRBool* aReturn);
+        NS_IMETHOD    StartSoftwareUpdate(const nsString& aURL, PRInt32 aFlags, PRInt32* aReturn);
+        NS_IMETHOD    StartSoftwareUpdate(const nsString& aURL, PRInt32* aReturn);
+        NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, PRInt32 aDiffLevel, const nsString& aVersion, PRInt32 aMode, PRInt32* aReturn);
+        NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, PRInt32 aDiffLevel, nsIDOMInstallVersion* aVersion, PRInt32 aMode, PRInt32* aReturn);
+        NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, nsIDOMInstallVersion* aVersion, PRInt32 aMode, PRInt32* aReturn);
+        NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, const nsString& aVersion, PRInt32 aMode, PRInt32* aReturn);
+        NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, const nsString& aVersion, PRInt32* aReturn);
+        NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, nsIDOMInstallVersion* aVersion, PRInt32* aReturn);
+        NS_IMETHOD    CompareVersion(const nsString& aRegName, PRInt32 aMajor, PRInt32 aMinor, PRInt32 aRelease, PRInt32 aBuild, PRInt32* aReturn);
+        NS_IMETHOD    CompareVersion(const nsString& aRegName, const nsString& aVersion, PRInt32* aReturn);
+        NS_IMETHOD    CompareVersion(const nsString& aRegName, nsIDOMInstallVersion* aVersion, PRInt32* aReturn);
+
+        
+    private:
+        void *mScriptObject;
+        void CreateTempFileFromURL(const nsString& aURL, nsString& tempFileString);
+
+};
+
+
+class nsInstallTriggerFactory : public nsIFactory 
+{
+    public:
+        
+        nsInstallTriggerFactory();
+        ~nsInstallTriggerFactory();
+        
+        NS_DECL_ISUPPORTS
+
+              NS_IMETHOD CreateInstance(nsISupports *aOuter,
+                                        REFNSIID aIID,
+                                        void **aResult);
+
+              NS_IMETHOD LockFactory(PRBool aLock);
+
+};
+
+#endif

mozilla/xpinstall/src/nsInstallUninstall.cpp

@@ -0,0 +1,196 @@
+/* -*- 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 "License"); you may not use this file except in
+ * compliance with the License.  You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, 
+ * released March 31, 1998. 
+ *
+ * The Initial Developer of the Original Code is Netscape Communications 
+ * Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ *
+ * Contributors:
+ *     Daniel Veditz <dveditz@netscape.com>
+ *     Douglas Turner <dougt@netscape.com>
+ */
+
+#include "nsInstall.h"
+#include "nsInstallUninstall.h"
+#include "nsInstallResources.h"
+#include "VerReg.h"
+#include "prmem.h"
+#include "nsFileSpec.h"
+#include "ScheduledTasks.h"
+
+extern "C" NS_EXPORT PRInt32 SU_Uninstall(char *regPackageName);
+REGERR su_UninstallProcessItem(char *component_path);
+
+
+nsInstallUninstall::nsInstallUninstall( nsInstall* inInstall,
+                                        const nsString& regName,
+                                        PRInt32 *error)
+
+: nsInstallObject(inInstall)
+{
+    if (regName == "null") 
+    {
+        *error = nsInstall::INVALID_ARGUMENTS;
+        return;
+    }
+    
+    mRegName.SetString(regName);
+
+    char* userName = (char*)PR_Malloc(MAXREGPATHLEN);
+    PRInt32 err = VR_GetUninstallUserName( (char*) (const char*) nsAutoCString(regName), 
+                                           userName, 
+                                           MAXREGPATHLEN );
+    
+    mUIName.SetString(userName);
+    
+    if (err != REGERR_OK)
+    {
+        *error = nsInstall::NO_SUCH_COMPONENT;
+    }
+    
+    PR_FREEIF(userName);
+    
+}
+
+nsInstallUninstall::~nsInstallUninstall()
+{
+}
+
+
+PRInt32 nsInstallUninstall::Prepare()
+{
+    // no set-up necessary
+    return nsInstall::SUCCESS;
+}
+
+PRInt32 nsInstallUninstall::Complete()
+{
+    PRInt32 err = nsInstall::SUCCESS;
+
+    if (mInstall == NULL) 
+       return nsInstall::INVALID_ARGUMENTS;
+
+    err = SU_Uninstall( (char*)(const char*) nsAutoCString(mRegName) );
+    
+    return err;
+}
+
+void nsInstallUninstall::Abort()
+{
+}
+
+char* nsInstallUninstall::toString()
+{
+    char* buffer = new char[1024];
+    
+    char* temp = mUIName.ToNewCString();
+    sprintf( buffer, nsInstallResources::GetUninstallString(), temp);
+    delete [] temp;
+
+    return buffer;
+}
+
+
+PRBool
+nsInstallUninstall::CanUninstall()
+{
+    return PR_FALSE;
+}
+
+PRBool
+nsInstallUninstall::RegisterPackageNode()
+{
+    return PR_FALSE;
+}
+
+extern "C" NS_EXPORT PRInt32 SU_Uninstall(char *regPackageName)
+{
+    REGERR status = REGERR_FAIL;
+    char pathbuf[MAXREGPATHLEN+1] = {0};
+    char sharedfilebuf[MAXREGPATHLEN+1] = {0};
+    REGENUM state = 0;
+    int32 length;
+    int32 err;
+
+    if (regPackageName == NULL)
+        return REGERR_PARAM;
+
+    if (pathbuf == NULL)
+        return REGERR_PARAM;
+
+    /* Get next path from Registry */
+    status = VR_Enum( regPackageName, &state, pathbuf, MAXREGPATHLEN );
+
+    /* if we got a good path */
+    while (status == REGERR_OK)
+    {
+        char component_path[2*MAXREGPATHLEN+1] = {0};
+        strcat(component_path, regPackageName);
+        length = strlen(regPackageName);
+        if (component_path[length - 1] != '/')
+            strcat(component_path, "/");
+        strcat(component_path, pathbuf);
+        err = su_UninstallProcessItem(component_path);
+        status = VR_Enum( regPackageName, &state, pathbuf, MAXREGPATHLEN );  
+    }
+    
+    err = VR_Remove(regPackageName);
+    // there is a problem here.  It looks like if the file is refcounted, we still blow away the reg key
+    // FIX!
+    state = 0;
+    status = VR_UninstallEnumSharedFiles( regPackageName, &state, sharedfilebuf, MAXREGPATHLEN );
+    while (status == REGERR_OK)
+    {
+        err = su_UninstallProcessItem(sharedfilebuf);
+        err = VR_UninstallDeleteFileFromList(regPackageName, sharedfilebuf);
+        status = VR_UninstallEnumSharedFiles( regPackageName, &state, sharedfilebuf, MAXREGPATHLEN );
+    }
+
+    err = VR_UninstallDeleteSharedFilesKey(regPackageName);
+    err = VR_UninstallDestroy(regPackageName);
+    return err;
+}
+
+REGERR su_UninstallProcessItem(char *component_path)
+{
+    int refcount;
+    int err;
+    char filepath[MAXREGPATHLEN];
+
+    err = VR_GetPath(component_path, sizeof(filepath), filepath);
+    if ( err == REGERR_OK )
+    {
+        err = VR_GetRefCount(component_path, &refcount);  
+        if ( err == REGERR_OK )
+        {
+            --refcount;
+            if (refcount > 0)
+                err = VR_SetRefCount(component_path, refcount);  
+            else 
+            {
+                err = VR_Remove(component_path);
+                DeleteFileNowOrSchedule(nsFileSpec(filepath));
+            }
+        }
+        else
+        {
+            /* delete node and file */
+            err = VR_Remove(component_path);
+            DeleteFileNowOrSchedule(nsFileSpec(filepath));
+        }
+    }
+    return err;
+}

mozilla/xpinstall/src/nsInstallUninstall.h

@@ -0,0 +1,63 @@
+/* -*- 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 "License"); you may not use this file except in
+ * compliance with the License.  You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, 
+ * released March 31, 1998. 
+ *
+ * The Initial Developer of the Original Code is Netscape Communications 
+ * Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ *
+ * Contributors:
+ *     Daniel Veditz <dveditz@netscape.com>
+ *     Douglas Turner <dougt@netscape.com>
+ */
+
+
+#ifndef nsInstallUninstall_h__
+#define nsInstallUninstall_h__
+
+#include "prtypes.h"
+#include "nsString.h"
+#include "nsInstallObject.h"
+#include "nsInstall.h"
+
+class nsInstallUninstall : public nsInstallObject 
+{
+    public:
+          
+        nsInstallUninstall( nsInstall* inInstall,
+                            const nsString& regName,
+                            PRInt32 *error);
+
+
+        virtual ~nsInstallUninstall();
+
+        PRInt32 Prepare();
+        PRInt32 Complete();
+        void  Abort();
+        char* toString();
+
+        PRBool CanUninstall();
+        PRBool RegisterPackageNode();
+	  
+  
+    private:
+          
+        nsString mRegName;        // Registry name of package
+        nsString mUIName;         // User name of package
+
+        
+};
+
+#endif /* nsInstallUninstall_h__ */

mozilla/xpinstall/src/nsInstallVersion.cpp

@@ -0,0 +1,399 @@
+/* -*- 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 "License"); you may not use this file except in
+ * compliance with the License.  You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.  See
+ * the License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * The Original Code is Mozilla Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+
+#include "nsSoftwareUpdate.h"
+
+#include "nsInstallVersion.h"
+#include "nsIDOMInstallVersion.h"
+
+#include "nscore.h"
+#include "nsIFactory.h"
+#include "nsISupports.h"
+#include "nsIScriptGlobalObject.h"
+
+#include "prprf.h"
+
+static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
+static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);
+static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID);
+
+static NS_DEFINE_IID(kIInstallVersion_IID, NS_IDOMINSTALLVERSION_IID);
+
+
+nsInstallVersion::nsInstallVersion()
+{
+    mScriptObject   = nsnull;
+    NS_INIT_REFCNT();
+}
+
+nsInstallVersion::~nsInstallVersion()
+{
+}
+
+NS_IMETHODIMP 
+nsInstallVersion::QueryInterface(REFNSIID aIID,void** aInstancePtr)
+{
+    if (aInstancePtr == NULL)
+    {
+        return NS_ERROR_NULL_POINTER;
+    }
+
+    // Always NULL result, in case of failure
+    *aInstancePtr = NULL;
+
+    if ( aIID.Equals(kIScriptObjectOwnerIID))
+    {
+        *aInstancePtr = (void*) ((nsIScriptObjectOwner*)this);
+        AddRef();
+        return NS_OK;
+    }
+    else if ( aIID.Equals(kIInstallVersion_IID) )
+    {
+        *aInstancePtr = (void*) ((nsIDOMInstallVersion*)this);
+        AddRef();
+        return NS_OK;
+    }
+    else if ( aIID.Equals(kISupportsIID) )
+    {
+        *aInstancePtr = (void*)(nsISupports*)(nsIScriptObjectOwner*)this;
+        AddRef();
+        return NS_OK;
+    }
+
+     return NS_NOINTERFACE;
+}
+
+
+NS_IMPL_ADDREF(nsInstallVersion)
+NS_IMPL_RELEASE(nsInstallVersion)
+
+
+
+NS_IMETHODIMP 
+nsInstallVersion::GetScriptObject(nsIScriptContext *aContext, void** aScriptObject)
+{
+    NS_PRECONDITION(nsnull != aScriptObject, "null arg");
+    nsresult res = NS_OK;
+    
+    if (nsnull == mScriptObject) 
+    {
+        res = NS_NewScriptInstallVersion(aContext, 
+                                         (nsISupports *)(nsIDOMInstallVersion*)this, 
+                                         nsnull, 
+                                         &mScriptObject);
+    }
+  
+
+    *aScriptObject = mScriptObject;
+    return res;
+}
+
+NS_IMETHODIMP 
+nsInstallVersion::SetScriptObject(void *aScriptObject)
+{
+  mScriptObject = aScriptObject;
+  return NS_OK;
+}
+
+//  this will go away when our constructors can have parameters.
+NS_IMETHODIMP    
+nsInstallVersion::Init(PRInt32 aMajor, PRInt32 aMinor, PRInt32 aRelease, PRInt32 aBuild)
+{
+    major   = aMajor;
+    minor   = aMinor;
+    release = aRelease;
+    build   = aBuild;
+
+    return NS_OK;
+}
+
+NS_IMETHODIMP    
+nsInstallVersion::Init(const nsString& version)
+{
+    PRInt32 errorCode;
+    PRInt32 aMajor, aMinor, aRelease, aBuild;
+
+    major = minor = release = build = 0;
+    
+    errorCode = nsInstallVersion::StringToVersionNumbers(version, &aMajor, &aMinor, &aRelease, &aBuild);    
+    if (NS_SUCCEEDED(errorCode)) 
+    {
+        Init(aMajor, aMinor, aRelease, aBuild);
+    }
+    
+    return NS_OK;
+}
+
+
+NS_IMETHODIMP    
+nsInstallVersion::GetMajor(PRInt32* aMajor)
+{
+    *aMajor = major;
+    return NS_OK;
+}
+
+NS_IMETHODIMP    
+nsInstallVersion::SetMajor(PRInt32 aMajor)
+{
+    major = aMajor;
+    return NS_OK;
+}
+
+NS_IMETHODIMP    
+nsInstallVersion::GetMinor(PRInt32* aMinor)
+{
+    *aMinor = minor;
+    return NS_OK;
+}
+
+NS_IMETHODIMP    
+nsInstallVersion::SetMinor(PRInt32 aMinor)
+{
+    minor = aMinor;
+    return NS_OK;
+}
+
+NS_IMETHODIMP    
+nsInstallVersion::GetRelease(PRInt32* aRelease)
+{
+    *aRelease = release;
+    return NS_OK;
+}
+
+NS_IMETHODIMP    
+nsInstallVersion::SetRelease(PRInt32 aRelease)
+{
+    release = aRelease;
+    return NS_OK;
+}
+
+NS_IMETHODIMP    
+nsInstallVersion::GetBuild(PRInt32* aBuild)
+{
+    *aBuild = build;
+    return NS_OK;
+}
+
+NS_IMETHODIMP    
+nsInstallVersion::SetBuild(PRInt32 aBuild)
+{
+    build = aBuild;
+    return NS_OK;
+}
+
+
+NS_IMETHODIMP    
+nsInstallVersion::CompareTo(nsIDOMInstallVersion* aVersion, PRInt32* aReturn)
+{
+    PRInt32 aMajor, aMinor, aRelease, aBuild;
+    
+    aVersion->GetMajor(&aMajor);
+    aVersion->GetMinor(&aMinor);
+    aVersion->GetRelease(&aRelease);
+    aVersion->GetBuild(&aBuild);
+
+    CompareTo(aMajor, aMinor, aRelease, aBuild, aReturn);
+    
+    return NS_OK;
+}
+
+
+NS_IMETHODIMP    
+nsInstallVersion::CompareTo(const nsString& aAString, PRInt32* aReturn)
+{
+    return NS_OK;
+}
+
+NS_IMETHODIMP    
+nsInstallVersion::CompareTo(PRInt32 aMajor, PRInt32 aMinor, PRInt32 aRelease, PRInt32 aBuild, PRInt32* aReturn)
+{
+    int diff;
+    
+    if ( major == aMajor ) 
+    {
+        if ( minor == aMinor ) 
+        {
+            if ( release == aRelease ) 
+            {
+                if ( build == aBuild )
+                    diff = EQUAL;
+                else if ( build > aBuild )
+                    diff = BLD_DIFF;
+                else
+                    diff = BLD_DIFF_MINUS;
+            }
+            else if ( release > aRelease )
+                diff = REL_DIFF;
+            else
+                diff = REL_DIFF_MINUS;
+        }
+        else if (  minor > aMinor )
+            diff = MINOR_DIFF;
+        else
+            diff = MINOR_DIFF_MINUS;
+    }
+    else if ( major > aMajor )
+        diff = MAJOR_DIFF;
+    else
+        diff = MAJOR_DIFF_MINUS;
+
+    *aReturn = diff;
+
+    return NS_OK;
+}
+
+
+NS_IMETHODIMP    
+nsInstallVersion::ToString(nsString& aReturn)
+{
+    char *result=NULL;
+    result = PR_sprintf_append(result, "%d.%d.%d.%d", major, minor, release, build);
+    
+    aReturn = result;
+
+    return NS_OK;
+}
+
+
+nsresult
+nsInstallVersion::StringToVersionNumbers(const nsString& version, PRInt32 *aMajor, PRInt32 *aMinor, PRInt32 *aRelease, PRInt32 *aBuild)    
+{
+    PRInt32 errorCode;
+
+    int dot = version.Find('.', 0);
+    
+    if ( dot == -1 ) 
+    {
+        *aMajor = version.ToInteger(&errorCode);
+    }
+    else  
+    {
+        nsString majorStr;
+        version.Mid(majorStr, 0, dot);
+        *aMajor  = majorStr.ToInteger(&errorCode);
+
+        int prev = dot+1;
+        dot = version.Find('.',prev);
+        if ( dot == -1 ) 
+        {
+            nsString minorStr;
+            version.Mid(minorStr, prev, version.Length() - prev);
+            *aMinor = minorStr.ToInteger(&errorCode);
+        }
+        else 
+        {
+            nsString minorStr;
+            version.Mid(minorStr, prev, dot - prev);
+            *aMinor = minorStr.ToInteger(&errorCode);
+
+            prev = dot+1;
+            dot = version.Find('.',prev);
+            if ( dot == -1 ) 
+            {
+                nsString releaseStr;
+                version.Mid(releaseStr, prev, version.Length() - prev);
+                *aRelease = releaseStr.ToInteger(&errorCode);
+            }
+            else 
+            {
+                nsString releaseStr;
+                version.Mid(releaseStr, prev, dot - prev);
+                *aRelease = releaseStr.ToInteger(&errorCode);
+    
+                prev = dot+1;
+                if ( version.Length() > dot ) 
+                {
+                    nsString buildStr;
+                    version.Mid(buildStr, prev, version.Length() - prev);
+                    *aBuild = buildStr.ToInteger(&errorCode);
+               }
+            }
+        }
+    }
+
+    return errorCode;
+}
+
+/////////////////////////////////////////////////////////////////////////
+// 
+/////////////////////////////////////////////////////////////////////////
+
+nsInstallVersionFactory::nsInstallVersionFactory(void)
+{
+    NS_INIT_REFCNT();
+}
+
+nsInstallVersionFactory::~nsInstallVersionFactory(void)
+{
+    NS_ASSERTION(mRefCnt == 0, "non-zero refcnt at destruction");
+}
+
+NS_IMETHODIMP
+nsInstallVersionFactory::QueryInterface(const nsIID &aIID, void **aResult)
+{
+    if (! aResult)
+        return NS_ERROR_NULL_POINTER;
+
+    // Always NULL result, in case of failure
+    *aResult = nsnull;
+
+    if (aIID.Equals(kISupportsIID)) {
+        *aResult = NS_STATIC_CAST(nsISupports*, this);
+        AddRef();
+        return NS_OK;
+    } else if (aIID.Equals(kIFactoryIID)) {
+        *aResult = NS_STATIC_CAST(nsIFactory*, this);
+        AddRef();
+        return NS_OK;
+    }
+    return NS_NOINTERFACE;
+}
+
+NS_IMPL_ADDREF(nsInstallVersionFactory);
+NS_IMPL_RELEASE(nsInstallVersionFactory);
+
+NS_IMETHODIMP
+nsInstallVersionFactory::CreateInstance(nsISupports *aOuter, REFNSIID aIID, void **aResult)
+{
+    if (aResult == NULL)
+    {
+        return NS_ERROR_NULL_POINTER;
+    }
+
+    *aResult = NULL;
+
+    /* do I have to use iSupports? */
+    nsInstallVersion *inst = new nsInstallVersion();
+
+    if (inst == NULL)
+        return NS_ERROR_OUT_OF_MEMORY;
+
+    nsresult result =  inst->QueryInterface(aIID, aResult);
+
+    if (NS_FAILED(result)) 
+        delete inst;
+
+    return result;
+}
+
+NS_IMETHODIMP
+nsInstallVersionFactory::LockFactory(PRBool aLock)
+{
+  return NS_OK;
+}

mozilla/xpinstall/src/nsInstallVersion.h

@@ -0,0 +1,76 @@
+#ifndef __NS_INSTALLVERSION_H__
+#define __NS_INSTALLVERSION_H__
+
+#include "nscore.h"
+#include "nsString.h"
+#include "nsIFactory.h"
+#include "nsISupports.h"
+#include "nsIScriptObjectOwner.h"
+
+#include "nsIDOMInstallVersion.h"
+#include "nsSoftwareUpdate.h"
+
+#include "prtypes.h"
+
+class nsInstallVersion: public nsIScriptObjectOwner, public nsIDOMInstallVersion
+{
+    public:
+        static const nsIID& IID() { static nsIID iid = NS_SoftwareUpdateInstallVersion_CID; return iid; }
+
+        nsInstallVersion();
+        virtual ~nsInstallVersion();
+        
+        NS_DECL_ISUPPORTS
+
+        NS_IMETHOD    GetScriptObject(nsIScriptContext *aContext, void** aScriptObject);
+        NS_IMETHOD    SetScriptObject(void* aScriptObject);
+        
+        NS_IMETHOD    Init(PRInt32 aMajor, PRInt32 aMinor, PRInt32 aRelease, PRInt32 aBuild);
+        NS_IMETHOD    Init(const nsString& aVersionString);
+
+        NS_IMETHOD    GetMajor(PRInt32* aMajor);
+        NS_IMETHOD    SetMajor(PRInt32 aMajor);
+
+        NS_IMETHOD    GetMinor(PRInt32* aMinor);
+        NS_IMETHOD    SetMinor(PRInt32 aMinor);
+
+        NS_IMETHOD    GetRelease(PRInt32* aRelease);
+        NS_IMETHOD    SetRelease(PRInt32 aRelease);
+
+        NS_IMETHOD    GetBuild(PRInt32* aBuild);
+        NS_IMETHOD    SetBuild(PRInt32 aBuild);
+        
+        NS_IMETHOD    ToString(nsString& aReturn);
+        NS_IMETHOD    CompareTo(nsIDOMInstallVersion* aVersion, PRInt32* aReturn);
+        NS_IMETHOD    CompareTo(const nsString& aString, PRInt32* aReturn);
+        NS_IMETHOD    CompareTo(PRInt32 aMajor, PRInt32 aMinor, PRInt32 aRelease, PRInt32 aBuild, PRInt32* aReturn);
+
+        static nsresult StringToVersionNumbers(const nsString& version, PRInt32 *aMajor, PRInt32 *aMinor, PRInt32 *aRelease, PRInt32 *aBuild);
+
+    private:
+        void *mScriptObject;
+        PRInt32 major;
+        PRInt32 minor;
+        PRInt32 release;
+        PRInt32 build;
+};
+
+
+class nsInstallVersionFactory : public nsIFactory 
+{
+    public:
+        
+        nsInstallVersionFactory();
+        virtual ~nsInstallVersionFactory();
+        
+        NS_DECL_ISUPPORTS
+
+              NS_IMETHOD CreateInstance(nsISupports *aOuter,
+                                        REFNSIID aIID,
+                                        void **aResult);
+
+              NS_IMETHOD LockFactory(PRBool aLock);
+
+};
+
+#endif

mozilla/xpinstall/src/nsJSInstallTriggerGlobal.cpp

@@ -0,0 +1,665 @@
+/* -*- 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.
+ */
+/* AUTO-GENERATED. DO NOT EDIT!!! */
+
+#include "jsapi.h"
+#include "nsJSUtils.h"
+#include "nscore.h"
+#include "nsIScriptContext.h"
+#include "nsIJSScriptObject.h"
+#include "nsIScriptObjectOwner.h"
+#include "nsIScriptGlobalObject.h"
+#include "nsIPtr.h"
+#include "nsString.h"
+#include "nsIDOMInstallVersion.h"
+#include "nsIDOMInstallTriggerGlobal.h"
+
+extern void ConvertJSValToStr(nsString&  aString,
+                             JSContext* aContext,
+                             jsval      aValue);
+
+extern void ConvertStrToJSVal(const nsString& aProp,
+                             JSContext* aContext,
+                             jsval* aReturn);
+
+extern PRBool ConvertJSValToBool(PRBool* aProp,
+                                JSContext* aContext,
+                                jsval aValue);
+
+extern PRBool ConvertJSValToObj(nsISupports** aSupports,
+                               REFNSIID aIID,
+                               const nsString& aTypeName,
+                               JSContext* aContext,
+                               jsval aValue);
+
+static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID);
+static NS_DEFINE_IID(kIJSScriptObjectIID, NS_IJSSCRIPTOBJECT_IID);
+static NS_DEFINE_IID(kIScriptGlobalObjectIID, NS_ISCRIPTGLOBALOBJECT_IID);
+static NS_DEFINE_IID(kIInstallTriggerGlobalIID, NS_IDOMINSTALLTRIGGERGLOBAL_IID);
+
+NS_DEF_PTR(nsIDOMInstallTriggerGlobal);
+
+
+/***********************************************************************/
+//
+// InstallTriggerGlobal Properties Getter
+//
+PR_STATIC_CALLBACK(JSBool)
+GetInstallTriggerGlobalProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
+{
+  nsIDOMInstallTriggerGlobal *a = (nsIDOMInstallTriggerGlobal*)JS_GetPrivate(cx, obj);
+
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == a) {
+    return JS_TRUE;
+  }
+
+  if (JSVAL_IS_INT(id)) {
+    switch(JSVAL_TO_INT(id)) {
+      case 0:
+      default:
+        return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp);
+    }
+  }
+  else {
+    return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp);
+  }
+
+  return PR_TRUE;
+}
+
+/***********************************************************************/
+//
+// InstallTriggerGlobal Properties Setter
+//
+PR_STATIC_CALLBACK(JSBool)
+SetInstallTriggerGlobalProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
+{
+  nsIDOMInstallTriggerGlobal *a = (nsIDOMInstallTriggerGlobal*)JS_GetPrivate(cx, obj);
+
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == a) {
+    return JS_TRUE;
+  }
+
+  if (JSVAL_IS_INT(id)) {
+    switch(JSVAL_TO_INT(id)) {
+      case 0:
+      default:
+        return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp);
+    }
+  }
+  else {
+    return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp);
+  }
+
+  return PR_TRUE;
+}
+
+
+//
+// InstallTriggerGlobal finalizer
+//
+PR_STATIC_CALLBACK(void)
+FinalizeInstallTriggerGlobal(JSContext *cx, JSObject *obj)
+{
+  nsJSUtils::nsGenericFinalize(cx, obj);
+}
+
+
+//
+// InstallTriggerGlobal enumerate
+//
+PR_STATIC_CALLBACK(JSBool)
+EnumerateInstallTriggerGlobal(JSContext *cx, JSObject *obj)
+{
+  return nsJSUtils::nsGenericEnumerate(cx, obj);
+}
+
+
+//
+// InstallTriggerGlobal resolve
+//
+PR_STATIC_CALLBACK(JSBool)
+ResolveInstallTriggerGlobal(JSContext *cx, JSObject *obj, jsval id)
+{
+  return nsJSUtils::nsGenericResolve(cx, obj, id);
+}
+
+//
+// Native method UpdateEnabled
+//
+PR_STATIC_CALLBACK(JSBool)
+InstallTriggerGlobalUpdateEnabled(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  nsIDOMInstallTriggerGlobal *nativeThis = (nsIDOMInstallTriggerGlobal*)JS_GetPrivate(cx, obj);
+  JSBool rBool = JS_FALSE;
+  PRBool nativeRet;
+
+  *rval = JSVAL_NULL;
+
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == nativeThis) {
+    return JS_TRUE;
+  }
+
+  if (argc >= 0) {
+
+    if (NS_OK != nativeThis->UpdateEnabled(&nativeRet)) {
+      return JS_FALSE;
+    }
+
+    *rval = BOOLEAN_TO_JSVAL(nativeRet);
+  }
+  else {
+    JS_ReportError(cx, "Function UpdateEnabled requires 0 parameters");
+    return JS_FALSE;
+  }
+
+  return JS_TRUE;
+}
+
+
+//
+// Native method StartSoftwareUpdate
+//
+PR_STATIC_CALLBACK(JSBool)
+InstallTriggerGlobalStartSoftwareUpdate(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  nsIDOMInstallTriggerGlobal *nativeThis = (nsIDOMInstallTriggerGlobal*)JS_GetPrivate(cx, obj);
+  JSBool       rBool = JS_FALSE;
+  PRInt32      nativeRet;
+  nsAutoString b0;
+  PRInt32      b1;
+
+  *rval = JSVAL_NULL;
+
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == nativeThis) {
+    return JS_TRUE;
+  }
+
+  if (argc >= 2)
+  {
+    //  public int StartSoftwareUpdate(String url,
+    //                                 int flag);
+
+    ConvertJSValToStr(b0, cx, argv[0]);
+
+    if(!JS_ValueToInt32(cx, argv[1], (int32 *)&b1))
+    {
+      JS_ReportError(cx, "2nd parameter must be a number");
+      return JS_FALSE;
+    }
+
+    if(NS_OK != nativeThis->StartSoftwareUpdate(b0, b1, &nativeRet))
+    {
+      return JS_FALSE;
+    }
+
+    *rval = INT_TO_JSVAL(nativeRet);
+  }
+  else if(argc >= 1)
+  {
+    //  public int StartSoftwareUpdate(String url);
+
+    ConvertJSValToStr(b0, cx, argv[0]);
+
+    if(NS_OK != nativeThis->StartSoftwareUpdate(b0, &nativeRet))
+    {
+      return JS_FALSE;
+    }
+
+    *rval = INT_TO_JSVAL(nativeRet);
+  }
+  else
+  {
+    JS_ReportError(cx, "Function StartSoftwareUpdate requires 2 parameters");
+    return JS_FALSE;
+  }
+
+  return JS_TRUE;
+}
+
+
+//
+// Native method ConditionalSoftwareUpdate
+//
+PR_STATIC_CALLBACK(JSBool)
+InstallTriggerGlobalConditionalSoftwareUpdate(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  nsIDOMInstallTriggerGlobal *nativeThis = (nsIDOMInstallTriggerGlobal*)JS_GetPrivate(cx, obj);
+  JSBool rBool = JS_FALSE;
+  PRInt32 nativeRet;
+  nsAutoString b0;
+  nsAutoString b1;
+  nsAutoString b2str;
+  PRInt32      b2int;
+  nsAutoString b3str;
+  PRInt32      b3int;
+  PRInt32      b4;
+
+  *rval = JSVAL_NULL;
+
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == nativeThis) {
+    return JS_TRUE;
+  }
+
+  if(argc >= 5)
+  {
+    //  public int ConditionalSoftwareUpdate(String url,
+    //                                       String registryName,
+    //                                       int    diffLevel,
+    //                                       String version, --OR-- VersionInfo version
+    //                                       int    mode);
+
+    ConvertJSValToStr(b0, cx, argv[0]);
+    ConvertJSValToStr(b1, cx, argv[1]);
+
+    if(!JS_ValueToInt32(cx, argv[2], (int32 *)&b2int))
+    {
+      JS_ReportError(cx, "3rd parameter must be a number");
+      return JS_FALSE;
+    }
+
+    if(!JS_ValueToInt32(cx, argv[4], (int32 *)&b4))
+    {
+      JS_ReportError(cx, "5th parameter must be a number");
+      return JS_FALSE;
+    }
+    
+    if(JSVAL_IS_OBJECT(argv[3]))
+    {
+        JSObject* jsobj = JSVAL_TO_OBJECT(argv[3]);
+        JSClass* jsclass = JS_GetClass(cx, jsobj);
+        if((nsnull != jsclass) && (jsclass->flags & JSCLASS_HAS_PRIVATE)) 
+        {
+          nsIDOMInstallVersion* version = (nsIDOMInstallVersion*)JS_GetPrivate(cx, jsobj);
+
+          if(NS_OK != nativeThis->ConditionalSoftwareUpdate(b0, b1, b2int, version, b4, &nativeRet))
+          {
+                return JS_FALSE;
+          }
+        }
+    }
+    else
+    {
+        ConvertJSValToStr(b3str, cx, argv[3]);
+        if(NS_OK != nativeThis->ConditionalSoftwareUpdate(b0, b1, b2int, b3str, b4, &nativeRet))
+        {
+          return JS_FALSE;
+        }
+    }
+
+    *rval = INT_TO_JSVAL(nativeRet);
+  }
+  else if(argc >= 4)
+  {
+    //  public int ConditionalSoftwareUpdate(String url,
+    //                                       String registryName,
+    //                                       String version,  --OR-- VersionInfo version
+    //                                       int    mode);
+
+    ConvertJSValToStr(b0, cx, argv[0]);
+    ConvertJSValToStr(b1, cx, argv[1]);
+
+    if(!JS_ValueToInt32(cx, argv[3], (int32 *)&b3int))
+    {
+      JS_ReportError(cx, "4th parameter must be a number");
+      return JS_FALSE;
+    }
+
+    if(JSVAL_IS_OBJECT(argv[2]))
+    {
+        JSObject* jsobj = JSVAL_TO_OBJECT(argv[2]);
+        JSClass* jsclass = JS_GetClass(cx, jsobj);
+        if((nsnull != jsclass) && (jsclass->flags & JSCLASS_HAS_PRIVATE)) 
+        {
+          nsIDOMInstallVersion* version = (nsIDOMInstallVersion*)JS_GetPrivate(cx, jsobj);
+
+          if(NS_OK != nativeThis->ConditionalSoftwareUpdate(b0, b1, version, b3int, &nativeRet))
+          {
+                return JS_FALSE;
+          }
+        }
+    }
+    else
+    {
+        ConvertJSValToStr(b2str, cx, argv[2]);
+        if(NS_OK != nativeThis->ConditionalSoftwareUpdate(b0, b1, b2str, b3int, &nativeRet))
+        {
+          return JS_FALSE;
+        }
+    }
+        
+    *rval = INT_TO_JSVAL(nativeRet);
+  }
+  else if(argc >= 3)
+  {
+    //  public int ConditionalSoftwareUpdate(String url,
+    //                                       String registryName,
+    //                                       String version);  --OR-- VersionInfo version
+
+    ConvertJSValToStr(b0, cx, argv[0]);
+    ConvertJSValToStr(b1, cx, argv[1]);
+
+    if(JSVAL_IS_OBJECT(argv[2]))
+    {
+        JSObject* jsobj = JSVAL_TO_OBJECT(argv[2]);
+        JSClass* jsclass = JS_GetClass(cx, jsobj);
+        if((nsnull != jsclass) && (jsclass->flags & JSCLASS_HAS_PRIVATE)) 
+        {
+          nsIDOMInstallVersion* version = (nsIDOMInstallVersion*)JS_GetPrivate(cx, jsobj);
+
+          if(NS_OK != nativeThis->ConditionalSoftwareUpdate(b0, b1, version, &nativeRet))
+          {
+                return JS_FALSE;
+          }
+        }
+    }
+    else
+    {
+        ConvertJSValToStr(b2str, cx, argv[2]);
+        if(NS_OK != nativeThis->ConditionalSoftwareUpdate(b0, b1, b2str, &nativeRet))
+        {
+          return JS_FALSE;
+        }
+    }
+        
+    *rval = INT_TO_JSVAL(nativeRet);
+  }
+  else
+  {
+    JS_ReportError(cx, "Function ConditionalSoftwareUpdate requires 5 parameters");
+    return JS_FALSE;
+  }
+
+  return JS_TRUE;
+}
+
+
+//
+// Native method CompareVersion
+//
+PR_STATIC_CALLBACK(JSBool)
+InstallTriggerGlobalCompareVersion(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  nsIDOMInstallTriggerGlobal *nativeThis = (nsIDOMInstallTriggerGlobal*)JS_GetPrivate(cx, obj);
+  JSBool rBool = JS_FALSE;
+  PRInt32 nativeRet;
+  nsAutoString b0;
+  nsAutoString b1str;
+  PRInt32      b1int;
+  PRInt32      b2int;
+  PRInt32      b3int;
+  PRInt32      b4int;
+
+  *rval = JSVAL_NULL;
+
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == nativeThis) {
+    return JS_TRUE;
+  }
+
+  if(argc >= 5)
+  {
+    //  public int CompareVersion(String registryName,
+    //                            int    major,
+    //                            int    minor,
+    //                            int    release,
+    //                            int    build);
+
+    ConvertJSValToStr(b0, cx, argv[0]);
+
+    if(!JS_ValueToInt32(cx, argv[1], (int32 *)&b1int))
+    {
+      JS_ReportError(cx, "2th parameter must be a number");
+      return JS_FALSE;
+    }
+    if(!JS_ValueToInt32(cx, argv[2], (int32 *)&b2int))
+    {
+      JS_ReportError(cx, "3th parameter must be a number");
+      return JS_FALSE;
+    }
+    if(!JS_ValueToInt32(cx, argv[3], (int32 *)&b3int))
+    {
+      JS_ReportError(cx, "4th parameter must be a number");
+      return JS_FALSE;
+    }
+    if(!JS_ValueToInt32(cx, argv[4], (int32 *)&b4int))
+    {
+      JS_ReportError(cx, "5th parameter must be a number");
+      return JS_FALSE;
+    }
+
+    if(NS_OK != nativeThis->CompareVersion(b0, b1int, b2int, b3int, b4int, &nativeRet))
+    {
+      return JS_FALSE;
+    }
+
+    *rval = INT_TO_JSVAL(nativeRet);
+  }
+  else if(argc >= 2)
+  {
+    //  public int CompareVersion(String registryName,
+    //                            String version); --OR-- VersionInfo version
+
+    ConvertJSValToStr(b0, cx, argv[0]);
+
+    if(JSVAL_IS_OBJECT(argv[1]))
+    {
+        JSObject* jsobj = JSVAL_TO_OBJECT(argv[1]);
+        JSClass* jsclass = JS_GetClass(cx, jsobj);
+        if((nsnull != jsclass) && (jsclass->flags & JSCLASS_HAS_PRIVATE)) 
+        {
+          nsIDOMInstallVersion* version = (nsIDOMInstallVersion*)JS_GetPrivate(cx, jsobj);
+
+          if(NS_OK != nativeThis->CompareVersion(b0, version, &nativeRet))
+          {
+                return JS_FALSE;
+          }
+        }
+    }
+    else
+    {
+        ConvertJSValToStr(b1str, cx, argv[1]);
+        if(NS_OK != nativeThis->CompareVersion(b0, b1str, &nativeRet))
+        {
+          return JS_FALSE;
+        }
+    }
+
+    *rval = INT_TO_JSVAL(nativeRet);
+  }
+  else
+  {
+    JS_ReportError(cx, "Function CompareVersion requires 5 parameters");
+    return JS_FALSE;
+  }
+
+  return JS_TRUE;
+}
+
+
+/***********************************************************************/
+//
+// class for InstallTriggerGlobal
+//
+JSClass InstallTriggerGlobalClass = {
+  "InstallTriggerGlobal", 
+  JSCLASS_HAS_PRIVATE,
+  JS_PropertyStub,
+  JS_PropertyStub,
+  GetInstallTriggerGlobalProperty,
+  SetInstallTriggerGlobalProperty,
+  EnumerateInstallTriggerGlobal,
+  ResolveInstallTriggerGlobal,
+  JS_ConvertStub,
+  FinalizeInstallTriggerGlobal
+};
+
+
+//
+// InstallTriggerGlobal class properties
+//
+static JSPropertySpec InstallTriggerGlobalProperties[] =
+{
+  {0}
+};
+
+
+//
+// InstallTriggerGlobal class methods
+//
+static JSFunctionSpec InstallTriggerGlobalMethods[] = 
+{
+  {"UpdateEnabled",          InstallTriggerGlobalUpdateEnabled,     0},
+  {"StartSoftwareUpdate",          InstallTriggerGlobalStartSoftwareUpdate,     2},
+  {"ConditionalSoftwareUpdate",          InstallTriggerGlobalConditionalSoftwareUpdate,     5},
+  {"CompareVersion",          InstallTriggerGlobalCompareVersion,     5},
+  {0}
+};
+
+
+//
+// InstallTriggerGlobal constructor
+//
+PR_STATIC_CALLBACK(JSBool)
+InstallTriggerGlobal(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  return JS_FALSE;
+}
+
+
+//
+// InstallTriggerGlobal class initialization
+//
+nsresult NS_InitInstallTriggerGlobalClass(nsIScriptContext *aContext, void **aPrototype)
+{
+  JSContext *jscontext = (JSContext *)aContext->GetNativeContext();
+  JSObject *proto = nsnull;
+  JSObject *constructor = nsnull;
+  JSObject *parent_proto = nsnull;
+  JSObject *global = JS_GetGlobalObject(jscontext);
+  jsval vp;
+
+  if ((PR_TRUE != JS_LookupProperty(jscontext, global, "InstallTriggerGlobal", &vp)) ||
+      !JSVAL_IS_OBJECT(vp) ||
+      ((constructor = JSVAL_TO_OBJECT(vp)) == nsnull) ||
+      (PR_TRUE != JS_LookupProperty(jscontext, JSVAL_TO_OBJECT(vp), "prototype", &vp)) || 
+      !JSVAL_IS_OBJECT(vp)) {
+
+    proto = JS_InitClass(jscontext,     // context
+                         global,        // global object
+                         parent_proto,  // parent proto 
+                         &InstallTriggerGlobalClass,      // JSClass
+                         InstallTriggerGlobal,            // JSNative ctor
+                         0,             // ctor args
+                         InstallTriggerGlobalProperties,  // proto props
+                         InstallTriggerGlobalMethods,     // proto funcs
+                         nsnull,        // ctor props (static)
+                         nsnull);       // ctor funcs (static)
+    if (nsnull == proto) {
+      return NS_ERROR_FAILURE;
+    }
+
+    if ((PR_TRUE == JS_LookupProperty(jscontext, global, "InstallTriggerGlobal", &vp)) &&
+        JSVAL_IS_OBJECT(vp) &&
+        ((constructor = JSVAL_TO_OBJECT(vp)) != nsnull)) {
+      vp = INT_TO_JSVAL(nsIDOMInstallTriggerGlobal::MAJOR_DIFF);
+      JS_SetProperty(jscontext, constructor, "MAJOR_DIFF", &vp);
+
+      vp = INT_TO_JSVAL(nsIDOMInstallTriggerGlobal::MINOR_DIFF);
+      JS_SetProperty(jscontext, constructor, "MINOR_DIFF", &vp);
+
+      vp = INT_TO_JSVAL(nsIDOMInstallTriggerGlobal::REL_DIFF);
+      JS_SetProperty(jscontext, constructor, "REL_DIFF", &vp);
+
+      vp = INT_TO_JSVAL(nsIDOMInstallTriggerGlobal::BLD_DIFF);
+      JS_SetProperty(jscontext, constructor, "BLD_DIFF", &vp);
+
+      vp = INT_TO_JSVAL(nsIDOMInstallTriggerGlobal::EQUAL);
+      JS_SetProperty(jscontext, constructor, "EQUAL", &vp);
+
+    }
+
+  }
+  else if ((nsnull != constructor) && JSVAL_IS_OBJECT(vp)) {
+    proto = JSVAL_TO_OBJECT(vp);
+  }
+  else {
+    return NS_ERROR_FAILURE;
+  }
+
+  if (aPrototype) {
+    *aPrototype = proto;
+  }
+  return NS_OK;
+}
+
+
+//
+// Method for creating a new InstallTriggerGlobal JavaScript object
+//
+extern "C" NS_DOM nsresult NS_NewScriptInstallTriggerGlobal(nsIScriptContext *aContext, nsISupports *aSupports, nsISupports *aParent, void **aReturn)
+{
+  NS_PRECONDITION(nsnull != aContext && nsnull != aSupports && nsnull != aReturn, "null argument to NS_NewScriptInstallTriggerGlobal");
+  JSObject *proto;
+  JSObject *parent;
+  nsIScriptObjectOwner *owner;
+  JSContext *jscontext = (JSContext *)aContext->GetNativeContext();
+  nsresult result = NS_OK;
+  nsIDOMInstallTriggerGlobal *aInstallTriggerGlobal;
+
+  if (nsnull == aParent) {
+    parent = nsnull;
+  }
+  else if (NS_OK == aParent->QueryInterface(kIScriptObjectOwnerIID, (void**)&owner)) {
+    if (NS_OK != owner->GetScriptObject(aContext, (void **)&parent)) {
+      NS_RELEASE(owner);
+      return NS_ERROR_FAILURE;
+    }
+    NS_RELEASE(owner);
+  }
+  else {
+    return NS_ERROR_FAILURE;
+  }
+
+  if (NS_OK != NS_InitInstallTriggerGlobalClass(aContext, (void **)&proto)) {
+    return NS_ERROR_FAILURE;
+  }
+
+  result = aSupports->QueryInterface(kIInstallTriggerGlobalIID, (void **)&aInstallTriggerGlobal);
+  if (NS_OK != result) {
+    return result;
+  }
+
+  // create a js object for this class
+  *aReturn = JS_NewObject(jscontext, &InstallTriggerGlobalClass, proto, parent);
+  if (nsnull != *aReturn) {
+    // connect the native object to the js object
+    JS_SetPrivate(jscontext, (JSObject *)*aReturn, aInstallTriggerGlobal);
+  }
+  else {
+    NS_RELEASE(aInstallTriggerGlobal);
+    return NS_ERROR_FAILURE; 
+  }
+
+  return NS_OK;
+}