put this here

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

mozilla/mailnews/base/src/nsMsgMailSession.cpp

@@ -0,0 +1,298 @@
+/* -*- 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/MANIFEST

@@ -0,0 +1,35 @@
+# 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 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
+

mozilla/mailnews/base/util/Makefile.in

@@ -0,0 +1,75 @@
+#
+# 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/macbuild/msgUtilPrefix.h

@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+/* -*- 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
@@ -16,10 +16,6 @@
  * Reserved.
  */
 
-#ifndef __NS_JSFILEOBJ_H__
-#define __NS_JSFILEOBJ_H__
 
-PRInt32 
-InitFileSpecObjectPrototype(JSContext *jscontext, JSObject *global, JSObject **fileSpecObjectPrototype);
 
-#endif
+#include "MacPrefix.h"

mozilla/mailnews/base/util/macbuild/msgUtilPrefixDebug.h

@@ -0,0 +1,21 @@
+/* -*- 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 "MacPrefix_debug.h"

mozilla/mailnews/base/util/makefile.win

@@ -0,0 +1,87 @@
+#!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

@@ -0,0 +1,76 @@
+/* -*- 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

@@ -0,0 +1,46 @@
+/* -*- 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

@@ -0,0 +1,509 @@
+/* -*- 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

@@ -0,0 +1,113 @@
+/* -*- 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

@@ -0,0 +1,530 @@
+/* -*- 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

@@ -0,0 +1,80 @@
+/* -*- 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

@@ -0,0 +1,268 @@
+/* -*- 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

@@ -0,0 +1,598 @@
+/* -*- 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

@@ -0,0 +1,160 @@
+/* -*- 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

@@ -0,0 +1,363 @@
+/* -*- 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

@@ -0,0 +1,49 @@
+/* -*- 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

@@ -0,0 +1,356 @@
+/* -*- 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

@@ -0,0 +1,110 @@
+/* -*- 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

@@ -0,0 +1,603 @@
+/* -*- 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

@@ -0,0 +1,70 @@
+/* -*- 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

@@ -0,0 +1,115 @@
+/* -*- 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

@@ -0,0 +1,384 @@
+/* -*- 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

@@ -0,0 +1,113 @@
+/* -*- 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

@@ -0,0 +1,399 @@
+/* -*- 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

@@ -0,0 +1,66 @@
+/* -*- 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

@@ -0,0 +1,369 @@
+/* -*- 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

@@ -0,0 +1,108 @@
+/* -*- 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

@@ -0,0 +1,99 @@
+/* -*- 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

@@ -0,0 +1,57 @@
+/* -*- 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

@@ -0,0 +1,326 @@
+/* -*- 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

@@ -0,0 +1,67 @@
+/* -*- 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

@@ -0,0 +1,71 @@
+/* -*- 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

@@ -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 "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

@@ -0,0 +1,277 @@
+/* -*- 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

@@ -0,0 +1,73 @@
+/* -*- 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/packager/windows/browser.jst

@@ -1,239 +0,0 @@
-function createShortcuts() 
-{
-  var subkey;
-  var valname;
-  var szStartMenuPrograms;
-  var szStartMenu;
-  var szFolderDesktop;
-  var szFolderQuickLaunch;
-  var szFolderSendTo;
-  var winreg;
-  var fWindows;
-  var fTemp;
-  var fCommunicator;
-  var fileExe;
-  var scExeDesc;
-  var scProfileDesc;
-  var scProfileDescParam;
-  var scFolderName;
-  var fFolderPath;
-  var fFolderPathStr;
-  var is_winnt;
-  var szCurrentVersion;
-
-  winreg               = getWinRegistry();
-  fWindows             = getFolder("Windows");
-  fCommunicator        = getFolder("Communicator");
-  fTemp                = fCommunicator + "\\mozilla.exe";
-  fileExe              = getFolder("file:///", fTemp);
-  scExeDesc            = "Mozilla Seamonkey";
-  scProfileDesc        = "Profile Manager";
-  scProfileDescParam   = "-ProfileManager";
-  scFolderName         = "Mozilla Seamonkey";
-  if(winreg != null) 
-  {
-    winreg.setRootKey(winreg.HKEY_LOCAL_MACHINE);
-    subkey              = "SOFTWARE\\Mozilla\\Mozilla Seamonkey\\$UserAgent$\\Main";
-    valname             = "Program Folder Path";
-    fFolderPathStr      = winreg.getValueString(subkey, valname);
-    if((fFolderPathStr == "") || (fFolderPathStr == null))
-    {
-      /* determine if the script is running under NT or not */
-      winreg.setRootKey(winreg.HKEY_LOCAL_MACHINE);
-      subkey              = "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion";
-      valname             = "CurrentVersion";
-      szCurrentVersion    = winreg.getValueString(subkey, valname);
-      logComment("szCurrentVersion: " + szCurrentVersion);
-      if((szCurrentVersion == "") || (szCurrentVersion == null))
-      {
-        is_winnt = false;
-      }
-      else
-      {
-        is_winnt = true;
-      }
-
-      if(is_winnt == false)
-      {
-        logComment("is_winnt is false: " + is_winnt);
-
-        winreg.setRootKey(winreg.HKEY_CURRENT_USER);
-        subkey              = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders";
-        valname             = "Programs";
-        szStartMenuPrograms = winreg.getValueString(subkey, valname);
-        valname             = "Start Menu";
-        szStartMenu         = winreg.getValueString(subkey, valname);
-        valname             = "Desktop";
-        szFolderDesktop     = winreg.getValueString(subkey, valname);
-      }
-      else
-      {
-        logComment("is_winnt is true: " + is_winnt);
-
-        winreg.setRootKey(winreg.HKEY_LOCAL_MACHINE);
-        subkey              = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders";
-        valname             = "Common Programs";
-        szStartMenuPrograms = winreg.getValueString(subkey, valname);
-        valname             = "Common Start Menu";
-        szStartMenu         = winreg.getValueString(subkey, valname);
-        valname             = "Common Desktop";
-        szFolderDesktop     = winreg.getValueString(subkey, valname);
-      }
-
-      winreg.setRootKey(winreg.HKEY_CURRENT_USER);
-      subkey              = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders";
-      valname             = "SendTo";
-      szFolderSendTo      = winreg.getValueString(subkey, valname);
-
-      subkey              = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\GrpConv\\MapGroups";
-      valname             = "Quick Launch";
-      szFolderQuickLaunch = winreg.getValueString(subkey, valname);
-
-      fTemp        = szStartMenuPrograms + "\\" + scFolderName;
-      fFolderPath  = getFolder("file:///", fTemp);
-
-      logComment("Folder StartMenuPrograms: " + szStartMenuPrograms);
-      logComment("Folder StartMenu: "         + szStartMenu);
-      logComment("Folder FolderDesktop: "     + szFolderDesktop);
-      logComment("Folder FolderSendTo: "      + szFolderSendTo);
-      logComment("Folder FolderQuickLaunch: " + szFolderQuickLaunch);
-    }
-    else
-    {
-      /* convert the path string to a path folder object */
-      fFolderPath = getFolder("file:///", fFolderPathStr);
-    }
-
-    logComment("fileExe: "                  + fileExe);
-    logComment("fFolderPath: "              + fFolderPath);
-    logComment("scExeDesc: "                + scExeDesc);
-    logComment("fCommunicator : "           + fCommunicator);
-
-    /* explicitly create the fFolderPath even though the windowsShortcut function creates the folder.
-     * This is so that the folder creation gets logged for uninstall to remove it. */
-    File.dirCreate(fFolderPath);
-
-    /* create the shortcuts */
-    File.windowsShortcut(fileExe, fFolderPath, scExeDesc,     fCommunicator,  "",                 fileExe, 0);
-    File.windowsShortcut(fileExe, fFolderPath, scProfileDesc, fCommunicator,  scProfileDescParam, fileExe, 0);
-
-    /* set the Program Folder Path in the Mozilla key in the Windows Registry */
-    winreg.setRootKey(winreg.HKEY_LOCAL_MACHINE);
-    subkey  = "SOFTWARE\\Mozilla";
-    winreg.createKey(subkey,"");
-
-    valname = "CurrentVersion";
-    subkey  = "SOFTWARE\\Mozilla\\Mozilla Seamonkey";
-    winreg.createKey(subkey,"");
-
-    valname = "CurrentVersion";
-    value   = "$UserAgent$";
-    err     = winreg.setValueString(subkey, valname, value);
-
-    subkey  = "SOFTWARE\\Mozilla\\Mozilla Seamonkey\\$UserAgent$";
-    winreg.createKey(subkey,"");
-
-    subkey  = "SOFTWARE\\Mozilla\\Mozilla Seamonkey\\$UserAgent$\\Main";
-    winreg.createKey(subkey,"");
-
-    valname = "Program Folder Path";
-    value   = fFolderPath;
-    err     = winreg.setValueString(subkey, valname, value);
-
-  }
-  else
-  {
-    logComment("winreg is null");
-  }
-}
-
-function updateWinReg()
-{
-  //Notes:
-  // can't use a double backslash before subkey - Windows already puts it in.
-  // subkeys have to exist before values can be put in.
-  var winreg = getWinRegistry();
-  var subkey;  //the name of the subkey you are poking around in
-  var valname; // the name of the value you want to look at
-  var value;   //the data in the value you want to look at.
-
-  if(winreg != null) 
-  {
-    winreg.setRootKey(winreg.HKEY_LOCAL_MACHINE);
-    subkey  = "SOFTWARE\\Mozilla";
-    winreg.createKey(subkey,"");
-
-    subkey  = "SOFTWARE\\Mozilla\\Mozilla Seamonkey";
-    winreg.createKey(subkey,"");
-
-    valname = "CurrentVersion";
-    value   = "$UserAgent$";
-    err     = winreg.setValueString(subkey, valname, value);
-
-    subkey  = "SOFTWARE\\Mozilla\\Mozilla Seamonkey\\$UserAgent$";
-    winreg.createKey(subkey,"");
-
-    subkey  = "SOFTWARE\\Mozilla\\Mozilla Seamonkey\\$UserAgent$\\Main";
-    winreg.createKey(subkey,"");
-
-    valname = "Install Directory";
-    value   = fCommunicator;
-    err     = winreg.setValueString(subkey, valname, value);
-
-    // set the App Paths key here
-    subkey  = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\mozilla.exe";
-    winreg.createKey(subkey,"");
-    valname = "";
-    value   = fCommunicator + "\\mozilla.exe";
-    err     = winreg.setValueString(subkey, valname, value);
-
-    valname = "Path";
-    value   = fCommunicator;
-    err     = winreg.setValueString(subkey, valname, value);
-  }
-}
-
-// main
-var srDest;
-var err;
-var fCommunicator;
-var fWindowsSystem;
-var fileComponentRegStr;
-var fileComponentReg;
-
-srDest = $SpaceRequired$:bin;
-err    = startInstall("Mozilla Seamonkey", "Browser", "$Version$"); 
-logComment("startInstall: " + err);
-
-fCommunicator   = getFolder("Communicator");
-fWindowsSystem  = getFolder("Win System");
-logComment("fCommunicator: " + fCommunicator);
-
-if(verifyDiskSpace(fCommunicator, srDest) == true)
-{
-  setPackageFolder(fCommunicator);
-  err = addDirectory("",
-                     "$Version$",
-                     "bin",              // dir name in jar to extract 
-                     fCommunicator,      // Where to put this file (Returned from GetFolder) 
-                     "",                 // subdir name to create relative to fCommunicator
-                     true);              // Force Flag 
-  logComment("addDirectory() of Program returned: " + err);
-
-  // check return value
-  if(!checkError(err))
-  {
-    fileComponentRegStr = fCommunicator + "\\component.reg";
-    fileComponentReg    = getFolder("file:///", fileComponentRegStr);
-    err                 = fileDelete(fileComponentReg);
-    logComment("fileDelete() returned: " + err);
-
-    updateWinReg();
-    createShortcuts();
-
-    err = finalizeInstall(); 
-    logComment("finalizeInstall() returned: " + err);
-  }
-}
-
-// end main

mozilla/xpinstall/packager/windows/config.it

@@ -1,494 +0,0 @@
-[General]
-; Run Mode values:
-;   Normal - Shows all dialogs.  Requires user input.
-;   Auto   - Shows some dialogs, but none requiring user input.  It will
-;            automatically install the product using default values.
-;   Silent - Show no dialogs at all.  It will install product using default
-;            values.
-Run Mode=Normal
-
-Product Name=Mozilla Seamonkey
-
-; Destination Path values:
-;   PROGRAMFILESDIR
-;   WINDISK
-;   WINDIR
-;   WINSYSDIR
-Path=[PROGRAMFILESDIR]\Mozilla\Seamonkey
-
-; Program Folder Path values:
-;   COMMON_STARTUP
-;   COMMON_PROGRAMS
-;   COMMON_STARTMENU
-;   COMMON_DESKTOP
-;
-;   PERSONAL_STARTUP
-;   PERSONAL_PROGRAMS
-;   PERSONAL_STARTMENU
-;   PERSONAL_DESKTOP
-;
-;   PERSONAL_APPDATA
-;   PERSONAL_CACHE
-;   PERSONAL_COOKIES
-;   PERSONAL_FAVORITES
-;   PERSONAL_FONTS
-;   PERSONAL_HISTORY
-;   PERSONAL_NETHOOD
-;   PERSONAL_PERSONAL
-;   PERSONAL_PRINTHOOD (supported only under Windows NT)
-;   PERSONAL_RECENT
-;   PERSONAL_SENDTO
-;   PERSONAL_TEMPLATES
-;
-;   PROGRAMFILESDIR
-;   COMMONFILESDIR
-;   MEDIAPATH
-;   CONFIGPATH (supported only under Windows95 and Windows98)
-;   DEVICEPATH
-Program Folder Name=Mozilla Seamonkey
-Program Folder Path=[COMMON_PROGRAMS]
-
-; Default Setup Type values:
-;   Setup Type 0 - first radio button (default)
-;   Setup Type 1 - second radio button
-;   Setup Type 2 - third radio button
-;   Setup Type 3 - fourth radio button (usually the Custom option)
-Default Setup Type=Setup Type 0
-
-; Default Font Size is 32
-; Default Font Color is WHITE (of BLACK and GREEN)
-; Default Font Shadow is TRUE
-Setup Title0=Mozilla Seamonkey Pr2 Setup
-Setup Title0 Font Size=
-Setup Title0 Font Color=
-Setup Title0 Font Shadow=TRUE
-Setup Title1=Build $Version$
-Setup Title1 Font Size=12
-Setup Title1 Font Color=BLACK
-Setup Title1 Font Shadow=FALSE
-Setup Title2=
-Setup Title2 Font Size=
-Setup Title2 Font Color=
-Setup Title2 Font Shadow=TRUE
-
-; HKey:              valid decryptable setup keys are [Mozilla Seamonkey CurrentVersion]
-;                    and [Mozilla Seamonkey CurrentVersion].
-; Decrypt HKey:      there are times when '[' and ']' are valid part of windows registry key names.
-; Contains Filename: tells setup that the path contains filename needed to be removed before
-;                    using it as a path.
-; Verify Existance:  FILE or PATH
-;
-[Locate Previous Product Path0]
-HRoot=HKEY_LOCAL_MACHINE
-HKey=[Netscape Seamonkey CurrentVersion]\Main
-Name=Install Directory
-Decrypt HKey=TRUE
-Contains Filename=FALSE
-Verify Existance=
-
-; This section checks for legacy files.
-; If the file(s), indicated by the Filename= key, is found to have a version of less than the value
-; indicated by the Version= key, then display the string in the Message= key.
-[Legacy Check0]
-Filename=[SETUP PATH]\mozilla.exe
-Version=6.0.0.0
-Message=Setup has detected an old version of Mozilla in the chosen destination directory that may pose compatibility issues.  It is highly recommended that a different destination directory be used.  Would you like to choose a different directory?
-
-[Dialog Welcome]
-Show Dialog=TRUE
-Title=Welcome
-Message0=Welcome to %s Setup.
-Message1=It is strongly recommended that you exit all Windows programs before running this Setup program.
-Message2=Click Cancel to quit Setup and then close any programs you have running.  Click Next to continue the Setup program.
-
-[Dialog License]
-Show Dialog=FALSE
-Title=Software License Agreement
-License File=license.txt
-Message0=Please read the following license agreement.  Use the scroll bar to view the rest of this agreement.
-Message1=Click Accept if you accept the terms of the preceeding license agreement.  If No is clicked, setup will quit.
-
-[Dialog Setup Type]
-Show Dialog=TRUE
-Title=Setup Type
-Message0=Click the type of setup you prefer, then click Next.
-Readme Filename=readme.txt
-Readme App=notepad.exe
-
-; at least one Setup Type needs to be set, and up to 4 can be
-; set (Setup Type0, Setup Type1, Setup Type2, Setup Type3).
-[Setup Type0]
-Description Short=B&ase
-Description Long=Program will be installed with the minimal options.
-
-; List of components to install/enable for this Setup Type.
-; All other components not listed here will be disabled if
-; this Setup Type is selected.
-C0=Component0
-C1=Component1
-
-[Setup Type1]
-Description Short=C&omplete
-Description Long=Program will be installed with the most common options.
-
-; List of components to install/enable for this Setup Type.
-; All other components not listed here will be disabled if
-; this Setup Type is selected.
-C0=Component0
-C1=Component1
-C2=Component2
-
-[Setup Type2]
-Description Short=C&ustom
-Description Long=You may choose the options you want to install.  Recommended for advanced users only.
-;Description Short=&Pro
-;Description Long=Program will be installed with all the options available.
-
-; List of components to install/enable for this Setup Type.
-; All other components not listed here will be disabled if
-; this Setup Type is selected.
-C0=Component0
-C1=Component1
-C2=Component2
-
-;[Setup Type3]
-;Description Short=C&ustom
-;Description Long=You may choose the options you want to install.  Recommended for advanced users.
-
-; List of components to install/enable for this Setup Type.
-; All other components not listed here will be disabled if
-; this Setup Type is selected.
-;C0=Component0
-;C1=Component1
-;C2=Component2
-;C3=Component3
-
-[Dialog Select Components]
-Show Dialog=TRUE
-Title=Select Components
-Message0=The browser is always installed.  Select or clear the additional components you want to install.
-
-[Dialog Windows Integration]
-Show Dialog=FALSE
-Title=Windows Integration
-Message0=Check the Mozilla Preference options you would like Setup to perform.
-Message1=These settings allow you to set default Internet preferences for browsing and searching.  They affect browsers installed on your machine, including Mozilla Communicator and Microsoft Internet Explorer.
-
-; Only a maximum of 4 "Windows Integration-Item"s are allowded.  Each Item
-; shows up as a checkbox in the Windows Integration dialog.
-[Windows Integration-Item0]
-CheckBoxState=FALSE
-Description=Make Mozilla Communicator my default Internet browser
-Archive=
-
-[Windows Integration-Item1]
-CheckBoxState=FALSE
-Description=Make Mozilla Netcenter my home page
-Archive=
-
-[Windows Integration-Item2]
-CheckBoxState=FALSE
-Description=Use Mozilla Netcenter to search the Web
-Archive=
-
-[Dialog Program Folder]
-Show Dialog=TRUE
-Title=Select Program Folder
-Message0=Setup will add program icons to the Program Folder listed below.  You may type a new folder name, or select one from the Existing Folder list.  Click Install to begin installation.
-
-[Dialog Site Selector]
-Show Dialog=FALSE
-Title=Site Selector
-Message0=Select the region you wish to download from, or leave it on Default for Setup to automatically determine the best place to download from relative to where you are.
-
-[Dialog Start Install]
-Show Dialog=FALSE
-Title=Start Install
-Message0=Setup has enough information to start copying the program files.  If you want to review or change settings, click Back.  If you are satisfied with the current settings, click Install to begin copying files.
-
-[Dialog Reboot]
-; Show Dialog values are:
-;   TRUE  - Always show
-;   FALSE - Don't show unless at least one component has its reboot show value set
-;           to TRUE.  This will not show even if some files were in use and a reboot
-;           is necessary.
-;   AUTO  - Don't show unless a component has its reboot show value set to
-;           TRUE or there was at least one file in use and a reboot is
-;           is required for the file to be replaced correctly.
-Show Dialog=AUTO
-
-; These SmartDownload sections contain information to configure SmartDownload.
-; The info is applied to all components to be downloaded.
-[SmartDownload-Netscape Install]
-;core_file=base.zip
-;core_dir=[SETUP PATH]
-no_ads=true
-silent=false
-execution=false
-confirm_install=false
-;extract_msg=Uncompressing Seamonkey.  Please wait...
-
-[SmartDownload-Proxy]
-
-[SmartDownload-Execution]
-exe=
-exe_param=
-
-[Check Instance0]
-Class Name=NetscapeWindowClass
-Window Name=
-Message=Setup has detected that an instance of Seamonkey is currently running.  Please quit Seamonkey before continuing Setup.
-
-[Check Instance1]
-Process Name=psm.exe
-Message=Setup has detected that an instance of Personal Security Manager is currently running.  Personal Security Manager will quit by itself when there are no other applications running that require it.  A reboot might be necessary.  Setup will then be able to continue.
-
-; These are the components to be offered to the user (shown in the Select
-; Components dialog) for installation.
-; There is no limit to the number of components to install.
-[Component0]
-Description Short=Mozilla Xpinstall Engine
-Description Long=Install Engine
-Archive=core.xpi
-$InstallSize$:core
-$InstallSizeSystem$
-$InstallSizeArchive$:core.xpi
-;Dependency0=
-Dependee0=Mozilla Seamonkey
-; Attributes can be the following values:
-;   SELECTED  - the component is selected to be installed by default.
-;   INVISIBLE - the component is not shown in the Select Components dialog.
-Attributes=SELECTED|INVISIBLE
-; url keys can be as many as needed.  url0 is attempted first.  if it fails,
-; the next url key is tried in sequential order.
-; The url should not contain the filename.  Setup will assemble the complete url
-; using the url keys and the Archive key.
-Domain0=$Domain$
-Server Path0=$ServerPath$
-
-[Component1]
-Description Short=Mozilla Seamonkey
-Description Long=Browser software for the internet
-Archive=browser.xpi
-$InstallSize$:browser
-$InstallSizeSystem$
-$InstallSizeArchive$:browser.xpi
-;Dependency0=
-; Attributes can be the following values:
-;   SELECTED  - the component is selected to be installed by default.
-;   INVISIBLE - the component is not shown in the Select Components dialog.
-Attributes=SELECTED|DISABLED
-; url keys can be as many as needed.  url0 is attempted first.  if it fails,
-; the next url key is tried in sequential order.
-; The url should not contain the filename.  Setup will assemble the complete url
-; using the url keys and the Archive key.
-Domain0=$Domain$
-Server Path0=$ServerPath$
-;url0=$URLPath$
-
-[Component2]
-Description Short=Mail & News
-Description Long=Seamonkey Mail && News
-Archive=mail.xpi
-$InstallSize$:mail
-$InstallSizeSystem$
-$InstallSizeArchive$:mail.xpi
-;Dependency0=
-; Attributes can be the following values:
-;   SELECTED  - the component is selected to be installed by default.
-;   INVISIBLE - the component is not shown in the Select Components dialog.
-Attributes=SELECTED
-Parameter=
-; url keys can be as many as needed.  url0 is attempted first.  if it fails,
-; the next url key is tried in sequential order.
-; The url should not contain the filename.  Setup will assemble the complete url
-; using the url keys and the Archive key.
-Domain0=$Domain$
-Server Path0=$ServerPath$
-;url0=$URLPath$
-
-[Core]
-Source=[XPI PATH]\core.xpi
-Destination=[WIZTEMP]\core.ns
-$InstallSize$:core
-Cleanup=TRUE
-Message=Preparing Install, please wait...
-
-[Redirect]
-Status=Enabled
-url0=$RedirIniUrl$
-Description=
-Message=
-
-; The Timing key needs to be one of the following values:
-;   pre download     - process before any files have been downloaded.
-;   post download    - process after all files have been downloaded.
-;   pre core         - process before the core file has been uncompressed.
-;   post core        - process after the core file has been uncompressed.
-;   pre smartupdate  - process before the smartupdate engine has been launched.
-;   post smartupdate - process after the smartupdate engine has been launched.
-;   pre launchapp    - process before the launching of executables.
-;   post launchapp   - process after the launching of executables.
-;   depend reboot    - process depending on if a reboot is necessary or not.
-;                      if reboot is necessary, installer can set it up so
-;                      the app runs once upon windows reboot.
-
-;Uncompress FileX sections
-;[Uncompress File0]
-;Timing=post download
-;Source=[XPI PATH]\core.xpi
-;Destination=[SETUP PATH]
-;Message=Configuring Seamonkey, please wait...
-
-;[Uncompress File1]
-;Timing=post download
-;Source=[XPI PATH]\extratest.xpi
-;Destination=[SETUP PATH]
-;Message=Configuring Extra test files, please wait...
-
-;Move FileX sections
-;[Move File0]
-;Timing=post download
-;Source=[SETUP PATH]\bin\*
-;Destination=[SETUP PATH]\program
-
-;[Move File1]
-;Timing=post download
-;Source=[SETUP PATH]\ftmain\*
-;Destination=[SETUP PATH]\program
-
-;Copy FileX sections
-[Copy File0]
-Timing=post launchapp
-Source=[JRE BIN PATH]\npjava*.dll
-Destination=[SETUP PATH]\Plugins
-Fail If Exists=FALSE
-
-;[Copy File1]
-;Timing=post launchapp
-;Source=[TEMP]\xtratest\bin\*.*
-;Destination=[SETUP PATH]
-;Fail If Exists=FALSE
-
-;[Copy File1]
-;Timing=post download
-;Source=[SETUP PATH]\bin\*.exe
-;Destination=[TEMP]
-;Fail If Exists=
-
-;Create DirectoryX sections
-[Create Directory0]
-Timing=post download
-Destination=[SETUP PATH]\Plugins
-
-;[Create Directory1]
-;Timing=post download
-;Destination=[TEMP]\Test\temp
-
-;Delete FileX sections
-[Delete File0]
-Timing=post download
-Destination=[COMMON_PROGRAMS]\Mozilla Seamonkey\Mozilla AppRunner.lnk
-
-;Remove DirectoryX sections
-;[Remove Directory0]
-;Timing=post launchapp
-;Destination=[TEMP]\xtratest
-;Remove subdirs=TRUE
-
-;RunAppX sections
-[RunApp0]
-Timing=depend reboot
-Wait=FALSE
-Target=[SETUP PATH]\mozilla.exe
-Parameters=-installer
-WorkingDir=[SETUP PATH]
-
-[Windows Registry0]
-Root Key=HKEY_LOCAL_MACHINE
-Key=Software\Mozilla\Mozilla Seamonkey\$UserAgent$\Main
-Name=Program Folder Path
-Name Value=[Default Folder]
-Type=REG_SZ
-Decrypt Key=FALSE
-Decrypt Name=FALSE
-Decrypt Name Value=TRUE
-Overwrite Key=TRUE
-Overwrite Name=TRUE
-Timing=pre smartupdate
-
-; Values for Show Folder:
-;   HIDE             Hides the window and activates another window.
-;   MAXIMIZE         Maximizes the specified window.
-;   MINIMIZE         Minimizes the specified window and activates the next
-;                    top-level window in the z-order.
-;   RESTORE          Activates and displays the window. If the window is
-;                    minimized or maximized, Windows restores it to its
-;                    original size and position. An application should specify
-;                    this flag when restoring a minimized window.
-;   SHOW             Activates the window and displays it in its current size
-;                    and position.
-;   SHOWMAXIMIZED    Activates the window and displays it as a maximized
-;                    window.
-;   SHOWMINIMIZED    Activates the window and displays it as a minimized
-;                    window.
-;   SHOWMINNOACTIVE  Displays the window as a minimized window. The active
-;                    window remains active.
-;   SHOWNA           Displays the window in its current state. The active
-;                    window remains active.
-;   SHOWNOACTIVATE   Displays a window in its most recent size and position.
-;                    The active window remains active.
-;   SHOWNORMAL       Activates and displays a window. If the window is
-;                    minimized or maximized, Windows restores it to its
-;                    original size and position. An application should specify
-;                    this flag when displaying the window for the first time.
-[Program Folder0]
-Timing=post smartupdate
-Show Folder=SHOW
-Program Folder=[Default Folder]
-
-;[Program Folder0-Shortcut0]
-;File=[SETUP PATH]\mozilla.exe
-;Arguments=
-;Working Dir=[SETUP PATH]
-;Description=Mozilla Seamonkey
-;Icon Path=[SETUP PATH]\mozilla.exe
-;Icon Id=0
-
-;[Program Folder0-Shortcut1]
-;File=[SETUP PATH]\mozilla.exe
-;Arguments=-ProfileManager
-;Working Dir=[SETUP PATH]
-;Description=Profile Manager
-;Icon Path=[SETUP PATH]\mozilla.exe
-;Icon Id=0
-
-;[Program Folder0-Shortcut2]
-;File=[SETUP PATH]\bin\Net2fone.exe
-;Arguments=
-;Working Dir=[SETUP PATH]
-;Description=Net2Fone
-;Icon Path=[SETUP PATH]\bin\Net2fone.exe
-;Icon Id=0
-
-;[Program Folder1]
-;Timing=post download
-;Show Folder=SHOW
-;Program Folder=[Default Folder]\lala land
-
-;[Program Folder1-Shortcut0]
-;File=c:\bin\getver.exe
-;Arguments=
-;Working Dir=[TEMP]
-;Description=Getver Test
-;Icon Path=[WINDISK]\4nt\4nt.exe
-;Icon Id=0
-
-;[Program Folder1-Shortcut1]
-;File=c:\perl\bin\perl.exe
-;Arguments=
-;Working Dir=[WINSYS]
-;Description=Perl
-;Icon Path=c:\perl\bin\perl.exe
-;Icon Id=0
-

mozilla/xpinstall/packager/windows/core.jst

@@ -1,41 +0,0 @@
-// main
-var srDest;
-var err;
-var communicatorFolder;
-var fWindowsSystem;
-var fileComponentRegStr;
-var fileComponentReg;
-
-srDest = $SpaceRequired$:bin;
-err    = startInstall("Mozilla XPCom", "XPCom", "$Version$"); 
-logComment("startInstall: " + err);
-
-communicatorFolder = getFolder("Communicator");
-fWindowsSystem     = getFolder("Win System");
-logComment("communicatorFolder: " + communicatorFolder);
-
-if(verifyDiskSpace(communicatorFolder, srDest) == true)
-{
-  setPackageFolder(communicatorFolder);
-  err = addDirectory("",
-                     "$Version$",
-                     "bin",              // dir name in jar to extract 
-                     communicatorFolder, // Where to put this file (Returned from GetFolder) 
-                     "",                 // subdir name to create relative to communicatorFolder
-                     true);              // Force Flag 
-  logComment("addDirectory() of Program returned: " + err);
-
-  // check return value
-  if(!checkError(err))
-  {
-    fileComponentRegStr = communicatorFolder + "\\component.reg";
-    fileComponentReg    = getFolder("file:///", fileComponentRegStr);
-    err                 = fileDelete(fileComponentReg);
-    logComment("fileDelete() returned: " + err);
-
-    err = finalizeInstall(); 
-    logComment("finalizeInstall() returned: " + err);
-  }
-}
-
-// end main

mozilla/xpinstall/packager/windows/editor.jst

@@ -1,18 +0,0 @@
-var err = StartInstall("Mozilla Editor", "Seamonkey", "$Version$"); 
-LogComment("StartInstall: " + err);
-
-var communicatorFolder = Install.GetFolder("Communicator");
-LogComment("communicatorFolder: " + communicatorFolder);
-
-err = AddDirectory("Program",
-                   "$Version$",
-                   "bin",              // fileName in jar, 
-                   communicatorFolder, // Where to put this file (Returned from GetFolder) 
-                   "",                 // fileName in jar, 
-                   true);              // Force Flag 
-
-LogComment("AddDirectory() returned: " + err);
-
-err = FinalizeInstall(); 
-LogComment("FinalizeInstall() returned: " + err);
-

mozilla/xpinstall/packager/windows/mail.jst

@@ -1,34 +0,0 @@
-// main
-var srDest;
-var err;
-var communicatorFolder;
-
-srDest = $SpaceRequired$:bin;
-err    = startInstall("Mozilla Mail", "Mail", "$Version$"); 
-logComment("startInstall: " + err);
-// check return value
-checkError(err);
-
-communicatorFolder = getFolder("Communicator");
-logComment("communicatorFolder: " + communicatorFolder);
-
-if(verifyDiskSpace(communicatorFolder, srDest) == true)
-{
-  setPackageFolder(communicatorFolder);
-  err = addDirectory("",
-                     "$Version$",
-                     "bin",              // dir name in jar to extract 
-                     communicatorFolder, // Where to put this file (Returned from GetFolder) 
-                     "",                 // subdir name to create relative to communicatorFolder
-                     true);              // Force Flag 
-  logComment("addDirectory() returned: " + err);
-
-  // check return value
-  if(!checkError(err))
-  {
-    err = finalizeInstall(); 
-    logComment("finalizeInstall() returned: " + err);
-  }
-}
-
-// end main

mozilla/xpinstall/packager/windows/makeall.pl

@@ -1,134 +0,0 @@
-#!c:\perl\bin\perl
-# 
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (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-1999 Netscape Communications Corporation. All
-# Rights Reserved.
-# 
-# Contributor(s): 
-# Sean Su <ssu@netscape.com>
-# 
-
-#
-# This perl script builds the xpi, config.ini, and js files.
-#
-
-# Make sure there are at least four arguments
-if($#ARGV < 2)
-{
-  die "usage: $0 <default version> <staging path> <dist install path>
-
-       default version   : y2k compliant based date version.
-                           ie: 5.0.0.2000040413
-
-       staging path      : full path to where the components are staged at
-
-       dist install path : full path to where the dist install dir is at.
-                           ie: d:\\builds\\mozilla\\dist\\win32_o.obj\\install
-       \n";
-}
-
-$inDefaultVersion     = $ARGV[0];
-$inStagePath          = $ARGV[1];
-$inDistPath           = $ARGV[2];
-
-$inRedirIniUrl        = "ftp://not.needed.com/because/the/xpi/files/will/be/located/in/the/same/dir/as/the/installer";
-$inXpiUrl             = "ftp://not.needed.com/because/the/xpi/files/will/be/located/in/the/same/dir/as/the/installer";
-
-$seiFileNameGeneric   = "nsinstall.exe";
-$seiFileNameSpecific  = "mozilla-win32-installer.exe";
-$userAgent            = "5.0b2 (en)";
-
-# Check for existance of staging path
-if(!(-e "$inStagePath"))
-{
-  die "invalid path: $inStagePath\n";
-}
-
-# Make sure inDestPath exists
-if(!(-e "$inDistPath"))
-{
-  mkdir ("$inDestPath",0775);
-}
-
-# Make .js files
-MakeJsFile("core");
-MakeJsFile("browser");
-MakeJsFile("mail");
-
-# Make .xpi files
-MakeXpiFile("core");
-MakeXpiFile("browser");
-MakeXpiFile("mail");
-
-MakeConfigFile();
-
-if(-e "$inDistPath\\setup")
-{
-  unlink <$inDistPath\\setup\\*>;
-}
-else
-{
-  mkdir ("$inDistPath\\setup",0775);
-}
-
-# Copy the setup files to the dist setup directory.
-system("xcopy /f config.ini                 $inDistPath\\");
-system("xcopy /f config.ini                 $inDistPath\\setup\\");
-system("xcopy /f $inDistPath\\setup.exe     $inDistPath\\setup\\");
-system("xcopy /f $inDistPath\\setuprsc.dll  $inDistPath\\setup\\");
-
-# build the self-extracting .exe file.
-print "\nbuilding self-extracting installer ($seiFileNameSpecific)...\n";
-system("copy $inDistPath\\$seiFileNameGeneric $inDistPath\\$seiFileNameSpecific");
-system("$inDistPath\\nszip.exe $inDistPath\\$seiFileNameSpecific $inDistPath\\setup\\*.* $inDistPath\\xpi\\*.*");
-
-print " done!\n";
-
-# end of script
-exit(0);
-
-sub MakeConfigFile
-{
-  # Make config.ini file
-  if(system("perl makecfgini.pl config.it $inDefaultVersion \"$userAgent\" $inStagePath $inDistPath\\xpi $inRedirIniUrl $inXpiUrl") != 0)
-  {
-    exit(1);
-  }
-}
-
-sub MakeJsFile
-{
-  my($componentName) = @_;
-
-  # Make .js file
-  if(system("perl makejs.pl $componentName.jst $inDefaultVersion \"$userAgent\" $inStagePath\\$componentName") != 0)
-  {
-    exit(1);
-  }
-}
-
-sub MakeXpiFile
-{
-  my($componentName) = @_;
-
-  # Make .xpi file
-  if(system("perl makexpi.pl $componentName $inStagePath $inDistPath\\xpi") != 0)
-  {
-    exit(1);
-  }
-}
-

mozilla/xpinstall/packager/windows/makecfgini.pl

@@ -1,277 +0,0 @@
-#!c:\perl\bin\perl
-# 
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (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-1999 Netscape Communications Corporation. All
-# Rights Reserved.
-# 
-# Contributor(s): 
-# Sean Su <ssu@netscape.com>
-# 
-
-#
-# This perl script parses the input file for special variables
-# in the format of $Variable$ and replace it with the appropriate
-# value(s).
-#
-# Input: .it file
-#             - which is a .ini template
-#
-#        version
-#             - version to display on the blue background
-#
-#        UserAgent
-#             - user agent to use in the windows registry.  should be the same as the one
-#               built into the browser (ie "6.0b2 (en)")
-#
-#        Path to staging area
-#             - path on where the seamonkey built bits are staged to
-#
-#        xpi path
-#             - path on where xpi files will be located at
-#
-#        redirect file url
-#             - url to where the redirect.ini file will be staged at.
-#               Either ftp:// or http:// can be used
-#               ie: ftp://ftp.netscape.com/pub/seamonkey
-#
-#        xpi url
-#             - url to where the .xpi files will be staged at.
-#               Either ftp:// or http:// can be used
-#               ie: ftp://ftp.netscape.com/pub/seamonkey/xpi
-#
-#   ie: perl makecfgini.pl config.it 5.0.0.1999120608 "5.0b1 (en)" k:\windows\32bit\5.0 d:\builds\mozilla\dist\win32_o.obj\install\xpi ftp://ftp.netscape.com/pub/seamonkey/windows/32bit/x86/1999-09-13-10-M10 ftp://ftp.netscape.com/pub/seamonkey/windows/32bit/x86/1999-09-13-10-M10/xpi
-#
-#
-
-# Make sure there are at least two arguments
-if($#ARGV < 6)
-{
-  die "usage: $0 <.it file> <version> <UserAgent> <staging path> <.xpi path> <redirect file url> <xpi url>
-
-       .it file      : input ini template file
-
-       version       : version to be shown in setup.  Typically the same version
-                       as show in mozilla.exe.
-
-       UserAgent     : user agent to use in the windows registry.  should be the same as the one
-                       built into the browser (ie \"6.0b2 (en)\")
-
-       staging path  : path to where the components are staged at
-
-       .xpi path     : path to where the .xpi files have been built to
-                       ie: d:\\builds\\mozilla\\dist\\win32_o.obj\\install\\xpi
-
-       redirect file : url to where the redirect.ini file will be staged at.
-       url             Either ftp:// or http:// can be used
-                       ie: ftp://ftp.netscape.com/pub/seamonkey
-       xpi url       : url to where the .xpi files will be staged at.
-                       Either ftp:// or http:// can be used
-                       ie: ftp://ftp.netscape.com/pub/seamonkey/xpi
-       \n";
-}
-
-$inItFile         = $ARGV[0];
-$inVersion        = $ARGV[1];
-$inUserAgent      = $ARGV[2];
-$inStagePath      = $ARGV[3];
-$inXpiPath        = $ARGV[4];
-$inRedirIniUrl    = $ARGV[5];
-$inUrl            = $ARGV[6];
-
-$inDomain;
-$inServerPath;
-
-($inDomain, $inServerPath) = ParseDomainAndPath($inUrl);
-
-# Get the name of the file replacing the .it extension with a .ini extension
-@inItFileSplit    = split(/\./,$inItFile);
-$outIniFile       = $inItFileSplit[0];
-$outIniFile      .= ".ini";
-
-# Open the input file
-open(fpInIt, $inItFile) || die "\ncould not open $ARGV[0]: $!\n";
-
-# Open the output file
-open(fpOutIni, ">$outIniFile") || die "\nCould not open $outIniFile: $!\n";
-
-print "\n Making $outIniFile...\n";
-
-# While loop to read each line from input file
-while($line = <fpInIt>)
-{
-  # For each line read, search and replace $InstallSize$ with the calculated size
-  if($line =~ /\$InstallSize\$/i)
-  {
-    $installSize          = 0;
-    $installSizeSystem    = 0;
-
-    # split read line by ":" deliminator
-    @colonSplit = split(/:/, $line);
-    if($#colonSplit >= 0)
-    {
-      $componentName    = $colonSplit[1];
-      chop($componentName);
-
-      $installSize      = OutputInstallSize("$inStagePath\\$componentName");
-
-      # special oji consideration here.  Since it's an installer that 
-      # seamonkey installer will be calling, the disk space allocation
-      # needs to be adjusted by an expansion factor of 3.62.
-      if($componentName =~ /oji/i)
-      {
-        $installSize = int($installSize * 3.62);
-      }
-    }
-
-    # Read the next line to calculate for the "Install Size System="
-    if($line = <fpInIt>)
-    {
-      if($line =~ /\$InstallSizeSystem\$/i)
-      {
-        $installSizeSystem = OutputInstallSizeSystem($line, "$inStagePath\\$componentName");
-      }
-    }
-
-    $installSize -= $installSizeSystem;
-    print fpOutIni "Install Size=$installSize\n";
-    print fpOutIni "Install Size System=$installSizeSystem\n";
-  }
-  elsif($line =~ /\$InstallSizeArchive\$/i)
-  {
-    $installSizeArchive = 0;
-
-    # split read line by ":" deliminator
-    @colonSplit = split(/:/, $line);
-    if($#colonSplit >= 0)
-    {
-      $componentName = $colonSplit[1];
-      chop($componentName);
-
-      $installSizeArchive = OutputInstallSizeArchive("$inXpiPath\\$componentName");
-    }
-
-    print fpOutIni "Install Size Archive=$installSizeArchive\n";
-  }
-  else
-  {
-    # For each line read, search and replace $Version$ with the version passed in
-    $line =~ s/\$Version\$/$inVersion/i;
-    $line =~ s/\$Domain\$/$inDomain/i;
-    $line =~ s/\$ServerPath\$/$inServerPath/i;
-    $line =~ s/\$RedirIniUrl\$/$inRedirIniUrl/i;
-    $line =~ s/\$UserAgent\$/$inUserAgent/i;
-    print fpOutIni $line;
-  }
-}
-
-print " done!\n";
-
-# end of script
-exit(0);
-
-sub ParseDomainAndPath()
-{
-  my($aUrl) = @_;
-  my($aDomain, $aServerPath);
-
-  @slashSplit = split(/\//, $aUrl);
-  if($#slashSplit >= 0)
-  {
-    for($i = 0; $i <= $#slashSplit; $i++)
-    {
-      if($i <= 2)
-      {
-        if($aDomain eq "")
-        {
-          $aDomain = "$slashSplit[$i]";
-        }
-        else
-        {
-          $aDomain = "$aDomain/$slashSplit[$i]";
-        }
-      }
-      else
-      {
-        if($aServerPath eq "")
-        {
-          $aServerPath = "/$slashSplit[$i]";
-        }
-        else
-        {
-          $aServerPath = "$aServerPath/$slashSplit[$i]";
-        }
-      }
-    }
-  }
-
-  return($aDomain, $aServerPath);
-}
-
-sub OutputInstallSize()
-{
-  my($inPath) = @_;
-  my($installSize);
-
-  print "   calculating size for $inPath\n";
-  $installSize    = `ds32.exe /D /L0 /A /S /C 32768 $inPath`;
-  $installSize   += 32768; # take into account install.js
-  $installSize    = int($installSize / 1024);
-  $installSize   += 1;
-  return($installSize);
-}
-
-sub OutputInstallSizeArchive()
-{
-  my($inPath) = @_;
-  my($installSizeArchive);
-  my($dev, $ino, $mode, $nlink, $uid, $gui, $rdev, $size, $atime, $mtime, $ctime, $blksize, $blocks);
-
-  print "   calculating size for $inPath\n";
-  ($dev, $ino, $mode, $nlink, $uid, $gui, $rdev, $size, $atime, $mtime, $ctime, $blksize, $blocks) = stat $inPath;
-  $installSizeArchive   += 32768; # take into account install.js
-  $installSizeArchive    = int($size / 1024);
-  $installSizeArchive   += 1;
-  return($installSizeArchive);
-}
-
-sub OutputInstallSizeSystem()
-{
-  my($inLine, $inPath) = @_;
-  my($installSizeSystem) = 0;
-
-  # split read line by ":" deliminator
-  @colonSplit = split(/:/, $inLine);
-  if($#colonSplit >= 0)
-  {
-    # split line by "," deliminator
-    @commaSplit = split(/\,/, $colonSplit[1]);
-    if($#commaSplit >= 0)
-    {
-      foreach(@commaSplit)
-      {
-        # calculate the size of component installed using ds32.exe in Kbytes
-        print "   calculating size for $inPath\\$_";
-        $installSizeSystem += `ds32.exe /D /L0 /A /S /C 32768 $inPath\\$_`;
-      }
-    }
-  }
-
-  $installSizeSystem  = int($installSizeSystem / 1024);
-  $installSizeSystem += 1;
-  return($installSizeSystem);
-}
-

mozilla/xpinstall/packager/windows/makejs.pl

@@ -1,122 +0,0 @@
-#!c:\perl\bin\perl
-# 
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (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-1999 Netscape Communications Corporation. All
-# Rights Reserved.
-# 
-# Contributor(s): 
-# Sean Su <ssu@netscape.com>
-# 
-
-#
-# This perl script parses the input file for special variables
-# in the format of $Variable$ and replace it with the appropriate
-# value(s).
-#
-# Input: .jst file              - which is a .js template
-#        default version        - a julian date in the form of:
-#                                 major.minor.release.yydoy
-#                                 ie: 5.0.0.99256
-#        user agent             - user agent of product
-#        component staging path - path to where the components are staged at
-#
-#        ie: perl makejs.pl core.jst 5.0.0.99256
-#
-
-# Make sure there are at least two arguments
-if($#ARGV < 3)
-{
-  die "usage: $0 <.jst file> <default version> <UserAgent> <staging path>
-
-       .jst file              : .js template input file
-       default version        : default julian base version number to use in the
-                                form of: major.minor.release.yydoy
-                                ie: 5.0.0.99256
-       user agent             : user agent of product (5.0b1 [en])
-       component staging path : path to where this component is staged at
-                                ie: z:\\stage\\windows\\32bit\\en\\5.0\\core
-       \n";
-}
-
-$inJstFile        = $ARGV[0];
-$inVersion        = $ARGV[1];
-$inUserAgent      = $ARGV[2];
-$inStagePath      = $ARGV[3];
-
-# Get the name of the file replacing the .jst extension with a .js extension
-@inJstFileSplit   = split(/\./,$inJstFile);
-$outJsFile        = $inJstFileSplit[0];
-$outJsFile       .= ".js";
-$outTempFile      = $inJstFileSplit[0];
-$outTempFile     .= ".template";
-
-system("copy ..\\common\\share.t $outTempFile");
-system("cat $inJstFile >> $outTempFile");
-
-# Open the input .template file
-open(fpInTemplate, $outTempFile) || die "\ncould not open $outTempFile: $!\n";
-
-# Open the output .js file
-open(fpOutJs, ">$outJsFile") || die "\nCould not open $outJsFile: $!\n";
-
-# While loop to read each line from input file
-while($line = <fpInTemplate>)
-{
-  # For each line read, search and replace $Version$ with the version passed in
-  if($line =~ /\$Version\$/i)
-  {
-    $line =~ s/\$Version\$/$inVersion/i;
-  }
-  elsif($line =~ /\$UserAgent\$/i)
-  {
-    $line =~ s/\$UserAgent\$/$inUserAgent/i;
-  }
-  elsif($line =~ /\$SpaceRequired\$/i) # For each line read, search and replace $InstallSize$ with the calculated size
-  {
-    $spaceRequired = 0;
-
-    # split read line by ":" deliminator
-    @colonSplit = split(/:/, $line);
-    if($#colonSplit > 0)
-    {
-      @semiColonSplit = split(/;/, $colonSplit[1]);
-      $subDir         = $semiColonSplit[0];
-      $spaceRequired  = GetSpaceRequired("$inStagePath\\$subDir");
-      $line =~ s/\$SpaceRequired\$:$subDir/$spaceRequired/i;
-    }
-    else
-    {
-      $spaceRequired = GetSpaceRequired("$inStagePath");
-      $line =~ s/\$SpaceRequired\$/$spaceRequired/i;
-    }
-  }
-
-  print fpOutJs $line;
-}
-
-sub GetSpaceRequired()
-{
-  my($inPath) = @_;
-  my($spaceRequired);
-
-  print "   calulating size for $inPath\n";
-  $spaceRequired    = `ds32.exe /D /L0 /A /S /C 32768 $inPath`;
-  $spaceRequired    = int($spaceRequired / 1024);
-  $spaceRequired   += 1;
-  return($spaceRequired);
-}
-

mozilla/xpinstall/packager/windows/makexpi.pl

@@ -1,114 +0,0 @@
-#!c:\perl\bin\perl
-# 
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (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-1999 Netscape Communications Corporation. All
-# Rights Reserved.
-# 
-# Contributor(s): 
-# Sean Su <ssu@netscape.com>
-# 
-
-#
-# This perl script creates .xpi files given component input name
-#
-# Input: component name
-#             - name of the component directory located in the staging path
-#        staging path
-#             - path to where the built files are staged at
-#        dest path
-#             - path to where the .xpi files are are to be created at.
-#               ** MUST BE AN ABSOLUTE PATH, NOT A RELATIVE PATH **
-#
-#   ie: perl makexpi.pl core z:\exposed\windows\32bit\en\5.0 d:\build\mozilla\dist\win32_o.obj\install\working
-#
-
-use File::Copy;
-use Cwd;
-
-# Make sure there are at least three arguments
-if($#ARGV < 2)
-{
-  die "usage: $0 <component name> <staging path> <dest path>
-
-       component name : name of component directory within staging path
-       staging path   : path to where the components are staged at
-       dest path      : path to where the .xpi files are to be created at
-       \n";
-}
-
-$inComponentName  = $ARGV[0];
-$inStagePath      = $ARGV[1];
-$inDestPath       = $ARGV[2];
-
-# check for existance of staging component path
-if(!(-e "$inStagePath\\$inComponentName"))
-{
-  die "invalid path: $inStagePath\\$inComponentName\n";
-}
-
-# check for existance of .js script
-if(!(-e "$inComponentName.js"))
-{
-  die "missing .js script: $inComponentName.js\n";
-}
-
-# delete component .xpi file
-if(-e "$inDestPath\\$inComponentName.xpi")
-{
-  unlink("$inDestPath\\$inComponentName.xpi");
-}
-if(-e "$inStagePath\\$incomponentName\\$inComponentName.xpi")
-{
-  unlink("$inDestPath\\$inComponentName.xpi");
-}
-
-# delete install.js
-if(-e "install.js")
-{
-  unlink("install.js");
-}
-
-# make sure inDestPath exists
-if(!(-e "$inDestPath"))
-{
-  system("mkdir $inDestPath");
-}
-
-print "\n Making $inComponentName.xpi...\n";
-
-$saveCwdir = cwd();
-
-# change directory to where the files are, else zip will store
-# unwanted path information.
-chdir("$inStagePath\\$inComponentName");
-system("zip -r $inDestPath\\$inComponentName.xpi *");
-chdir("$saveCwdir");
-
-copy("$inComponentName.js", "install.js");
-system("zip -g $inDestPath\\$inComponentName.xpi install.js");
-
-# delete install.js
-if(-e "install.js")
-{
-  unlink("install.js");
-}
-
-print " done!\n";
-
-# end of script
-exit(0);
-

mozilla/xpinstall/packager/windows/rdir.pl

@@ -1,111 +0,0 @@
-#!c:\perl\bin\perl
-# 
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (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-1999 Netscape Communications Corporation. All
-# Rights Reserved.
-# 
-# Contributor(s): 
-# Sean Su <ssu@netscape.com>
-# 
-
-use Cwd;
-
-if($#ARGV < 0)
-{
-    print_usage();
-    exit(1);
-}
-
-print "removing directory:\n";
-for($i = 0; $i <= $#ARGV; $i++)
-{
-    print "  $ARGV[$i]";
-    remove_dir_structure($ARGV[$i]);
-    print "\n";
-}
-
-exit(0);
-# end
-
-sub remove_dir_structure
-{
-    my($curr_dir) = @_;
-    $save_cwd     = cwd();
-    $save_cwd     =~ s/\//\\/g;
-    if((-e "$curr_dir") && (-d "$curr_dir"))
-    {
-        remove_all_dir($curr_dir);
-        chdir($save_cwd);
-        remove_directory($curr_dir);
-        print " done!";
-    }
-    else
-    {
-        if(!(-e "$curr_dir"))
-        {
-            print "\n";
-            print "$curr_dir does not exist!";
-        }
-        elsif(!(-d "$curr_dir"))
-        {
-            print "\n";
-            print "$curr_dir is not a valid directory!";
-        }
-    }
-}
-
-sub remove_all_dir
-{
-    my($curr_dir) = @_;
-    my(@dirlist);
-    my($dir);
-
-    chdir("$curr_dir");
-    @dirlist = <*>;
-    foreach $dir (@dirlist)
-    {
-        if(-d "$dir")
-        {
-            print ".";
-            remove_all_dir($dir);
-        }
-    }
-    chdir("..");
-    remove_directory($curr_dir);
-}
-
-sub remove_directory
-{
-    my($directory) = @_;
-    my($save_cwd);
-
-    $save_cwd = cwd();
-    $save_cwd =~ s/\//\\/g;
-
-    if(-e "$directory")
-    {
-        chdir($directory);
-        unlink <*>; # remove files
-        chdir($save_cwd);
-        rmdir $directory;         # remove directory
-    }
-}
-
-sub print_usage
-{
-    print "usage: $0 <dir1> [dir2 dir3...]\n";
-}

mozilla/xpinstall/src/Makefile.in

@@ -1,83 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (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.
-#
-# Contributor(s): 
-#     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
-LIBRARY_NAME	= xpinstall
-SHORT_LIBNAME	= xpinstal
-IS_COMPONENT	= 1
-
-EXTRA_DSO_LIBS	= jsdom
-
-REQUIRES	= dom js netlib raptor xpcom
-
-# XXX shouldn't need to export this
-EXPORTS		= nsXPITriggerInfo.h
-
-CPPSRCS		= \
-		nsInstall.cpp \
-		nsInstallTrigger.cpp \
-		nsInstallVersion.cpp \
-		nsInstallFolder.cpp \
-		nsJSInstall.cpp \
-		nsJSFile.cpp \
-		nsJSInstallTriggerGlobal.cpp \
-		nsJSInstallVersion.cpp \
-		nsSoftwareUpdate.cpp \
-		nsSoftwareUpdateRun.cpp \
-		nsInstallFile.cpp \
-		nsInstallDelete.cpp \
-		nsInstallExecute.cpp \
-		nsInstallPatch.cpp \
-		nsInstallUninstall.cpp \
-		nsInstallResources.cpp \
-		nsTopProgressNotifier.cpp \
-		nsLoggingProgressNotifier.cpp \
-		ScheduledTasks.cpp \
-		nsInstallProgressDialog.cpp \
-		nsXPITriggerInfo.cpp \
-		nsXPInstallManager.cpp \
-		nsInstallFileOpItem.cpp \
-		nsJSFileSpecObj.cpp \
-		$(NULL)
-
-LOCAL_INCLUDES	= -I$(srcdir)/../public
-
-EXTRA_DSO_LDOPTS = \
-		$(MOZ_REGISTRY_LIBS) \
-		-L$(DIST)/bin \
-		$(EXTRA_DSO_LIBS) \
-		$(MOZ_JS_LIBS) \
-		$(MOZ_COMPONENT_LIBS) \
-		$(ZLIB_LIBS) \
-		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/xpinstall/src/PatchableAppleSingle.cpp

@@ -1,924 +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.1 (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.
- *
- * Contributor(s): 
- *     Douglas Turner <dougt@netscape.com>
- */
-#include "PatchableAppleSingle.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-OSErr PAS_EncodeFile(FSSpec *inSpec, FSSpec *outSpec);
-OSErr PAS_DecodeFile(FSSpec *inSpec, FSSpec *outSpec);
-
-OSErr PAS_encodeResource(FSSpec *inFile, short outRefNum);
-OSErr PAS_decodeResource(PASEntry *entry, FSSpec *outFile, short inRefNum);
-
-OSErr PAS_encodeMisc(FSSpec *inFile, short outRefNum);
-OSErr PAS_decodeMisc(PASEntry *entry, FSSpec *outFile, short inRefNum);
-
-OSErr PAS_encodeData(FSSpec *inFile, short outRefNum);
-OSErr PAS_decodeData(PASEntry *entry, FSSpec *outFile, short inRefNum);
-
-OSErr PAS_encodeHeader(short refnum);
-OSErr PAS_decodeHeader(short refNum, PASHeader *header);
-
-
-unsigned long PAS_getDataSize(FSSpec *spec);
-short PAS_getResourceID(Handle resource);
-
-OSErr PAS_flattenResource(ResType type, short *ids, long count, short source, short dest);
-OSErr PAS_unflattenResource(PASResource *pasRes, Ptr buffer);
-
-void PAS_sortTypes(short sourceRefNum, ResType **resTypePtr, long *count);
-void PAS_sortIDs(short sourceRefNum, OSType theType, short **IdPtr, long *count);
-void PAS_bubbleSortResType(ResType *types, long count);
-void PAS_bubbleSortIDS(short *ids, long count);
-
-OSErr PAS_EncodeFile(FSSpec *inSpec, FSSpec *outSpec)
-{
-	OSErr		err;
-	short		outRefNum;
-	
-	PASEntry 	dataEntry, miscEntry, resourceEntry;
-	long		sizeOfEntry;
-
-
-	if (inSpec == NULL || outSpec == NULL)
-		return paramErr;
-		
-
-	memset(&dataEntry, 0, sizeof(PASEntry));
-	memset(&miscEntry, 0, sizeof(PASEntry));
-	memset(&resourceEntry, 0, sizeof(PASEntry));
-	
-	FSpDelete( outSpec ) ;
-	
-	err = FSpCreate( outSpec, kCreator, kType ,smSystemScript );
-	
-	if (err != noErr) 	return err;
-	
-	
-	err = FSpOpenDF(outSpec, fsRdWrPerm, &outRefNum);
-	
-	if (err != noErr)  goto error;
-	
-
-	// Write Out Header
-		
-	err = PAS_encodeHeader(outRefNum);
-	if (err != noErr)  goto error;
-	
-	/* Why am I using three (3)?
-		
-		E stand for entry.
-		
-	   The data for the entry is after the THREE headers 
-	
-		|---------|----|----|----|---------------------->
-		   header    E    E    E
-	
-	*/
-	
-	
-	// Write Out Data Entry 
-	dataEntry.entryID		=	ePas_Data;
-	dataEntry.entryLength	=	PAS_getDataSize(inSpec);
-	dataEntry.entryOffset	=	sizeof(PASHeader) + (3 * sizeof(PASEntry));
-	
-	sizeOfEntry			=	sizeof(PASEntry);
-	if(dataEntry.entryLength < 0)
-	{
-		err	= dataEntry.entryLength;
-		goto error;
-	}
-	
-	err = FSWrite(outRefNum, &sizeOfEntry, &dataEntry);
-	if (err != noErr) 	goto error;
-	
-	
-	
-	// Write Out Misc Entry 
-	miscEntry.entryID		=	ePas_Misc;
-	miscEntry.entryLength	=	sizeof(PASMiscInfo);
-	miscEntry.entryOffset	=	sizeof(PASHeader) + (3 * sizeof(PASEntry)) + dataEntry.entryLength;
-
-	sizeOfEntry			=	sizeof(PASEntry);
-	err = FSWrite(outRefNum, &sizeOfEntry, &miscEntry);
-	if (err != noErr) 	goto error;
-	
-	
-	// Write Out Resource Entry 
-	resourceEntry.entryID		=	ePas_Resource;
-	resourceEntry.entryLength	=	-1;
-	resourceEntry.entryOffset	=	sizeof(PASHeader) + (3 * sizeof(PASEntry)) + dataEntry.entryLength + miscEntry.entryLength;
-
-
-	sizeOfEntry			=	sizeof(PASEntry);
-	err = FSWrite(outRefNum, &sizeOfEntry, &resourceEntry);
-	if (err != noErr) 	goto error;
-	
-	err =  PAS_encodeData(inSpec, outRefNum);	
-	if (err != noErr) 	goto error;
-	
-	
-	err =  PAS_encodeMisc(inSpec, outRefNum);	
-	if (err != noErr) 	goto error;
-	
-	err =  PAS_encodeResource(inSpec, outRefNum);	
-	
-	if (err == kResFileNotOpened)
-	{
-		// there was no resource fork
-		err = noErr;
-	}
-	else if (err != noErr)
-	{
-		goto error;
-	}
-		
-	FSClose(outRefNum);
-	
-	return noErr;
-	
-	
-	
-error:
-		
-		
-	if (outRefNum != kResFileNotOpened)
-	{
-		FSClose(outRefNum);
-	}
-		
-	FSpDelete( outSpec ) ;
-	 
-	return err;
-
-}
-
-
-
-OSErr PAS_DecodeFile(FSSpec *inSpec, FSSpec *outSpec)
-{
-	OSErr		err;
-	short		inRefNum;
-	
-	PASHeader	header;
-	
-	PASEntry 	dataEntry, miscEntry, resourceEntry;
-	long		sizeOfEntry;
-
-	if (inSpec == NULL || outSpec == NULL)
-		return paramErr;
-		
-		
-	FSpDelete( outSpec ) ;
-	
-	err = FSpCreate( outSpec, kCreator, kType ,smSystemScript );
-	
-	if (err != noErr) 	return err;
-	
-	
-	
-	err = FSpOpenDF(inSpec, fsRdPerm, &inRefNum);
-	
-	if (err != noErr)  goto error;
-
-	
-	// Read Header 
-		
-	err	= PAS_decodeHeader(inRefNum, &header);
-	if (err != noErr)  goto error;
-	
-	if(	header.magicNum != PAS_MAGIC_NUM ||
-		header.versionNum != PAS_VERSION)
-	{
-		err = -1;
-		goto error;
-	}
-	
-	
-	
-	// Read Data Entry 
-	
-	
-	err = SetFPos(inRefNum, fsFromStart, sizeof(PASHeader));
-	if (err != noErr) 	goto error;
-	
-	sizeOfEntry			=	sizeof(PASEntry);
-
-	err = FSRead(inRefNum, &sizeOfEntry, &dataEntry);
-	if (err != noErr) 	goto error;
-	
-	
-	
-	
-	// Read Misc Entry 
-	
-	
-	err = SetFPos(inRefNum, fsFromStart, (sizeof(PASHeader) + sizeof(PASEntry)));
-	if (err != noErr) 	goto error;
-	
-	sizeOfEntry			=	sizeof(PASEntry);
-
-	err = FSRead(inRefNum, &sizeOfEntry, &miscEntry);
-	if (err != noErr) 	goto error;
-	
-
-	// Read Resource Entry 
-	
-	
-	err = SetFPos(inRefNum, fsFromStart, (sizeof(PASHeader) + (2 * sizeof(PASEntry)))) ;
-	if (err != noErr) 	goto error;
-	
-	sizeOfEntry			=	sizeof(PASEntry);
-
-	err = FSRead(inRefNum, &sizeOfEntry, &resourceEntry);
-	if (err != noErr) 	goto error;
-
-
-
-
-
-	err =  PAS_decodeData(&dataEntry, outSpec, inRefNum);	
-	if (err != noErr) 	goto error;
-
-	err =  PAS_decodeMisc(&miscEntry, outSpec, inRefNum);
-	if (err != noErr) 	goto error;
-
-	err =  PAS_decodeResource(&resourceEntry, outSpec, inRefNum);	
-	if (err == kResFileNotOpened)
-	{
-		// there was no resource fork
-		err = noErr;
-	}
-	else if (err != noErr)
-	{
-		goto error;
-	}
-
-	
-	FSClose(inRefNum);
-	
-	return noErr;
-	
-	
-	
-error:
-
-	if (inRefNum != kResFileNotOpened)
-	{
-		FSClose(inRefNum);
-	}
-		
-	FSpDelete( outSpec ) ;
-	
-	return err;
-	
-}
-
-
-
-
-#pragma mark -
-
-
-OSErr PAS_encodeResource(FSSpec *inFile, short outRefNum)
-{
-	OSErr 			err;	
-	short			inRefNum;
-	PASResFork		resInfo;
-	SInt32			currentWrite;
-	
-	ResType 		*resTypes;
-	long			typeCount;
-	
-	short			*ids;
-	long			idCount;
-	
-	short			oldResFile;
-	
-	oldResFile=CurResFile();
-	inRefNum = FSpOpenResFile(inFile, fsRdPerm);
-	if (inRefNum < noErr)	return inRefNum;
-
-	UseResFile(inRefNum);
-		
-	memset(&resInfo, 0, sizeof(PASResFork));   
-	
-	PAS_sortTypes(inRefNum, &resTypes, &typeCount);
-
-	resInfo.NumberOfTypes	=	typeCount;
-	
-	currentWrite	= sizeof(PASResFork);
-	
-	err = FSWrite(outRefNum, &currentWrite, &resInfo);
-	if (err != noErr)	return err;
-	
-	for (typeCount = 0; ((typeCount < resInfo.NumberOfTypes) && (err == noErr)); typeCount++)
-	{
-		PAS_sortIDs(inRefNum, resTypes[typeCount], &ids, &idCount);
-		err = PAS_flattenResource(resTypes[typeCount], ids, idCount, inRefNum, outRefNum);
-		DisposePtr((Ptr)ids);
-	}
-	
-	DisposePtr((Ptr)resTypes);
-	
-	
-	UseResFile(oldResFile);		
-	CloseResFile(inRefNum);
-	
-	return err;
-}
-
-OSErr PAS_decodeResource(PASEntry *entry, FSSpec *outFile, short inRefNum)
-{
-	OSErr 			err = noErr;	
-	short			outRefNum;
-	PASResFork		info;
-	SInt32			infoSize;
-	short			oldResFile;
-	
-	PASResource		pasRes;
-	SInt32			pasResSize;
-	
-	long			bufSize;
-	Handle			buffer;
-	long			counter=0;
-	
-	infoSize	=	sizeof(PASResFork);
-	
-	err = SetFPos(inRefNum, fsFromStart, (*entry).entryOffset );
-	if (err != noErr)	return err;
-
-	err	= FSRead( inRefNum, &infoSize, &info);
-	if (err != noErr)	return err;
-
-	if(infoSize != sizeof(PASResFork))
-	{
-		err = -1;
-		goto error;
-	}
-	
-	oldResFile=CurResFile();
-	
-	outRefNum = FSpOpenResFile(outFile, fsRdWrPerm);
-	if (outRefNum < noErr)	return outRefNum;
-				
-	UseResFile(outRefNum);
-	
-	
-	while (1)
-	{
-		pasResSize	=	sizeof(PASResource);
-		err	= FSRead( inRefNum, &pasResSize, &pasRes);
-		
-		if (err != noErr)
-		{
-			if(err == eofErr)
-				err = noErr;
-				
-			break;
-		}
-		
-		bufSize	=	pasRes.length;
-		buffer	=	NewHandle(bufSize);
-		HLock(buffer);
-		
-		if(buffer == NULL)
-		{
-			//  if we did not get our memory, try updateresfile 
-		
-			HUnlock(buffer);
-
-
-			UpdateResFile(outRefNum);
-			counter=0;
-			
-			buffer	=	NewHandle(bufSize);
-			HLock(buffer);
-			
-			if(buffer == NULL)
-			{
-				err = memFullErr;
-				break;
-			}
-		}
-		
-		err	= FSRead( inRefNum, &bufSize, &(**buffer));
-		if (err != noErr && err != eofErr)	break;
-		
-		AddResource(buffer, pasRes.attrType, pasRes.attrID, pasRes.attrName);
-		WriteResource(buffer);
-		
-		SetResAttrs(buffer, pasRes.attr);
-		ChangedResource(buffer);	
-		WriteResource(buffer);
-		
-		ReleaseResource(buffer);	
-		
-		if (counter++ > 100)
-		{
-			UpdateResFile(outRefNum);
-			counter=0;
-		}
-	
-	}
-
-error:
-		
-	UseResFile(oldResFile);	
-	CloseResFile(outRefNum);
-		
-	return err;
-}
-
-#pragma mark -
-
-OSErr PAS_encodeMisc(FSSpec *inFile, short outRefNum)
-{
-	OSErr 		err;	
-	short		inRefNum;
-	PASMiscInfo	infoBlock;
-	FInfo		fInfo;
-	SInt32		currentRead;
-	
-	err = FSpOpenDF(inFile, fsRdPerm, &inRefNum);
-	if (err != noErr)	return err;
-	
-	memset(&infoBlock, 0, sizeof(PASMiscInfo));   
-	
-	err = FSpGetFInfo(inFile, &fInfo);
-	if (err != noErr)	return err;
-	
-	infoBlock.fileType		=	fInfo.fdType;
-	infoBlock.fileCreator	=	fInfo.fdCreator;
-	infoBlock.fileFlags		=	fInfo.fdFlags;
-	
-		
-	FSClose(inRefNum);
-	
-	
-	inRefNum = FSpOpenResFile(inFile, fsRdPerm);
-	if (inRefNum > noErr)
-	{
-		infoBlock.fileHasResFork	= 1;
-		infoBlock.fileResAttrs 		= GetResFileAttrs(inRefNum);
-		FSClose(inRefNum);
-	}
-	else
-	{
-		infoBlock.fileHasResFork	= 0;
-		infoBlock.fileResAttrs 		= 0;
-	}
-	currentRead	= sizeof(PASMiscInfo);
-	
-	err = FSWrite(outRefNum, &currentRead, &infoBlock);
-	if (err != noErr)	return err;
-		
-	CloseResFile(inRefNum);
-	
-	return noErr;
-}
-
-
-OSErr PAS_decodeMisc(PASEntry *entry, FSSpec *outFile, short inRefNum)
-{
-	OSErr 		err = noErr;	
-	short		outRefNum;
-	PASMiscInfo	info;
-	SInt32		infoSize;
-	FInfo		theFInfo;
-		
-	
-	infoSize	=	sizeof(PASMiscInfo);
-	
-	err = SetFPos(inRefNum, fsFromStart, (*entry).entryOffset );
-	if (err != noErr)	return err;
-
-	err	= FSRead( inRefNum, &infoSize, &info);
-	if (err != noErr)	return err;
-
-	if(infoSize != sizeof(PASMiscInfo))
-	{
-		return -1;
-	}
-
-	err = FSpOpenDF(outFile, fsRdWrPerm, &outRefNum);
-	if (err != noErr)	return err;
-	
-	memset(&theFInfo, 0, sizeof(FInfo));   
-		
-	theFInfo.fdType		=	info.fileType;
-	theFInfo.fdCreator	=	info.fileCreator;	
-	theFInfo.fdFlags	=	info.fileFlags;
-	
-	err = FSpSetFInfo(outFile, &theFInfo);
-	if (err != noErr)	return err;
-		
-	FSClose(outRefNum);
-	
-	if (info.fileHasResFork)
-	{
-		outRefNum = FSpOpenResFile(outFile, fsRdWrPerm);
-		if (outRefNum < noErr)
-		{
-			// maybe it does not have one!
-			
-			FSpCreateResFile(outFile, info.fileCreator, info.fileType, smSystemScript);
-			
-			outRefNum = FSpOpenResFile(outFile, fsRdWrPerm);	
-			if (outRefNum < noErr) 
-			{
-				return outRefNum;
-			}
-		}
-		
-		SetResFileAttrs(outRefNum, info.fileResAttrs);
-		
-		
-		CloseResFile(outRefNum);
-	}	
-	
-	
-	if(info.fileType == 'APPL')
-	{
-		// we need to add applications to the desktop database.
-		
-/*	FIX :: need to find DTSetAPPL() function	
-		err = DTSetAPPL( NULL,
-                    	 outFile->vRefNum,
-			             info.fileCreator,
-			             outFile->parID,
-                         outFile->name);
-*/	}
-	
-	
-	return err;
-	
-	
-
-}
-
-#pragma mark -
-
-OSErr PAS_encodeData(FSSpec *inFile, short outRefNum)
-{
-	OSErr 		err;	
-	short		inRefNum;
-	Ptr 		buffer;
-	SInt32 		currentRead = 	PAS_BUFFER_SIZE;
-		
-	buffer	=	NewPtr(currentRead);
-
-	err = FSpOpenDF(inFile, fsRdPerm, &inRefNum);
-	if (err != noErr)	return err;
-	
-	while ( currentRead > 0 )
-    {
-		err	= FSRead( inRefNum, &currentRead, buffer);
-		if (err != noErr && err != eofErr)	return err;
-		
-		err = FSWrite(outRefNum, &currentRead, buffer);
-		if (err != noErr)	return err;
-	}
-	
-	FSClose(inRefNum);
-	
-	DisposePtr(buffer);
-	
-	return noErr;
-}
-
-OSErr PAS_decodeData(PASEntry *entry, FSSpec *outFile, short inRefNum)
-{
-	OSErr 		err;	
-	short		outRefNum;
-	Ptr 		buffer;
-	SInt32 		currentWrite = 	PAS_BUFFER_SIZE;
-	SInt32		totalSize;
-	
-	
-	buffer = NewPtr(currentWrite);
-	
-	
-	err = FSpOpenDF(outFile, fsRdWrPerm, &outRefNum);
-	if (err != noErr)	return err;
-	
-	
-	err = SetFPos(inRefNum, fsFromStart, (*entry).entryOffset );
-	if (err != noErr)	return err;
-	
-	err = SetFPos(outRefNum, fsFromStart, 0 );
-	if (err != noErr)	return err;
-	
-	totalSize = (*entry).entryLength;
-	
-	while(totalSize > 0)
-	{	
-		currentWrite = PAS_BUFFER_SIZE;
-
-		if (totalSize < currentWrite)
-		{
-			currentWrite = totalSize;
-		}
-
-		err	= FSRead( inRefNum, &currentWrite, buffer);
-		if (err != noErr && err != eofErr)	return err;
-	
-		err = FSWrite(outRefNum, &currentWrite, buffer);
-		if (err != noErr)	return err;
-		
-		totalSize = totalSize - currentWrite;
-
-	}
-	
-	FSClose(outRefNum);
-	
-	DisposePtr(buffer);
-	
-	return noErr;
-
-}
-
-#pragma mark -
-
-OSErr PAS_encodeHeader(short refnum)
-{
-	PASHeader 	header;
-	long		sizeOfHeader;
-	OSErr		err;
-	
-	
-	sizeOfHeader = sizeof(PASHeader);
-		
-	memset(&header, 0, sizeOfHeader);   
-	
-	header.magicNum 	= PAS_MAGIC_NUM;
-	header.versionNum 	= PAS_VERSION;
-	header.numEntries 	= 3;
-	
-	// Write Out Header 
-	err = FSWrite(refnum, &sizeOfHeader, &header);
-	
-	return err;
-
-}
-
-OSErr PAS_decodeHeader(short refNum, PASHeader *header)
-{
-	OSErr 	err;
-	long 	sizeOfHeader = sizeof(PASHeader);
-	
-	memset(header, 0, sizeOfHeader);   
-	
-	err = FSRead(refNum, &sizeOfHeader, header);
-	
-	return err;
-}
-
-#pragma mark -
-
-
-unsigned long PAS_getDataSize(FSSpec *spec)
-{
-	short		refNum;
-	OSErr		err;
-	Str255 		temp;	
-	CInfoPBRec 	cbrec;
-	err = FSpOpenDF(spec, fsRdPerm, &refNum);
-
-	memcpy( temp, spec->name, spec->name[0] + 1);
-
-	cbrec.hFileInfo.ioNamePtr 		= temp;
-	cbrec.hFileInfo.ioDirID 		= spec->parID;
-	cbrec.hFileInfo.ioVRefNum 		= spec->vRefNum;
-	cbrec.hFileInfo.ioFDirIndex     = 0;
-
-	err = PBGetCatInfoSync(&cbrec);
-	FSClose(refNum);
-	
-	if(err != noErr)
-	{
-		cbrec.hFileInfo.ioFlLgLen = err;
-	}
-
-	return (cbrec.hFileInfo.ioFlLgLen);
-}
-
-short PAS_getResourceID(Handle resource)
-{
-	ResType			theType;
-	Str255			name;
-	short			theID;
-	
-	memset(&name, 0, sizeof(Str255));  
-			
-	GetResInfo(resource, &theID, &theType, name);
-	
-	return theID;
-}
-
-
-#pragma mark -
-OSErr PAS_flattenResource(ResType type, short *ids, long count, short source, short dest)
-{
-	long 			idIndex;
-	
-	
-	Handle			resToCopy;
-	long			handleLength;
-	
-	PASResource		pasResource;
-	long			pasResLen;
-	
-	OSErr			err;
-	
-	for (idIndex=0; idIndex < count; idIndex++)
-	{
-		if( (type == 'SIZE') && ( ids[idIndex] == 1 || ids[idIndex] == 0  ) )
-		{
-			/* 	
-				We do not want to encode/flatten SIZE 0 or 1 because this
-				is the resource that the user can modify.  Most applications
-				will not be affected if we remove these resources
-			*/
-		}
-		else
-		{	
-			resToCopy=Get1Resource(type,ids[idIndex]);
-					
-			if(!resToCopy)	
-			{
-				return resNotFound;
-			}	
-				
-			memset(&pasResource, 0, sizeof(PASResource));	
-				
-			GetResInfo(	resToCopy, 	
-						&pasResource.attrID, 
-						&pasResource.attrType, 
-						pasResource.attrName);	
-			
-			pasResource.attr = GetResAttrs(resToCopy);
-			
-			DetachResource(resToCopy);	
-			HLock(resToCopy);
-			
-			pasResource.length 	= GetHandleSize(resToCopy);
-			handleLength 		= pasResource.length;
-			
-			pasResLen			=	sizeof(PASResource);
-			
-			err = FSWrite(dest, &pasResLen, &pasResource);
-			
-			if(err != noErr) 
-			{
-				return err;
-			}
-			
-			err = FSWrite(dest, &handleLength, &(**resToCopy));
-
-			if(err != noErr) 
-			{
-				return err;
-			}
-			
-			HUnlock(resToCopy);
-			DisposeHandle(resToCopy);		
-		}
-	}
-	
-	
-	return noErr;
-}
-
-
-#pragma mark -
-
-void PAS_sortTypes(short sourceRefNum, ResType **resTypePtr, long *count)
-{
-	short				oldRef;
-	short				typeIndex;
-	short				numberOfTypes;
-		
-	*count	=	-1;
-	
-	oldRef = CurResFile();
-		
-	UseResFile(sourceRefNum);
-
-	numberOfTypes = Count1Types();
-	
-	*resTypePtr	=	(ResType*) NewPtrClear( numberOfTypes * sizeof(OSType) );
-	
-	for (typeIndex=1; typeIndex <= numberOfTypes; typeIndex++)
-	{
-		Get1IndType(&(*resTypePtr)[typeIndex-1], typeIndex);
-	}
-	
-	UseResFile(oldRef);
-	
-	PAS_bubbleSortResType(*resTypePtr, numberOfTypes);
-	
-	*count = numberOfTypes;
-}	
-
-
-void PAS_sortIDs(short sourceRefNum, OSType theType, short **IdPtr, long *count)
-{
-	short				oldRef;
-	Handle				theHandle;
-	short				resCount;
-	short				resIndex;
-	
-	*count	=	-1;
-	
-	oldRef = CurResFile();
-		
-	UseResFile(sourceRefNum);
-
-	resCount = Count1Resources(theType);
-	
-	*IdPtr	=	(short*) NewPtrClear( resCount * sizeof(short) );
-	
-	for (resIndex=1; resIndex <= resCount; resIndex++)
-	{
-		theHandle = Get1IndResource(theType, resIndex);
-		
-		if(theHandle == NULL) return;
-	
-		(*IdPtr)[resIndex-1] = PAS_getResourceID(theHandle);
-		
-		ReleaseResource(theHandle);
-	}
-	
-	UseResFile(oldRef);
-	
-	PAS_bubbleSortIDS(*IdPtr, resCount);
-	
-	
-	*count = resCount;
-}
-
-#pragma mark -
-
-void
-PAS_bubbleSortResType(ResType *types, long count)
-{
-	long 	x, y;
-	OSType	temp;
-	
-	for (x=0; x < count-1; x++)      
-	{
-    	for (y=0; y < count-x-1; y++)        
-		{
-        	if (types[y] > types[y+1])        
-	        {  
-				temp=types[y];  
-            	types[y]=types[y+1];  
-            	types[y+1]=temp;        
-        	} 
-		}
-	}
-}
-
-void
-PAS_bubbleSortIDS(short *ids, long count)
-{
-	long 	x, y;
-	short	temp;
-	
-	for (x=0; x < count-1; x++)      
-	{
-    	for (y=0; y < count-x-1; y++)        
-		{
-        	if (ids[y] > ids[y+1])        
-	        {  
-				temp=ids[y];  
-            	ids[y]=ids[y+1];  
-            	ids[y+1]=temp;        
-        	} 
-		}
-	}
-}

mozilla/xpinstall/src/PatchableAppleSingle.h

@@ -1,117 +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.1 (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.
- *
- * Contributor(s): 
- *     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

@@ -1,481 +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.1 (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.
- *
- * Contributor(s): 
- *     Daniel Veditz <dveditz@netscape.com>
- *     Douglas Turner <dougt@netscape.com>
- */
-
-#include "nscore.h"
-#include "nsFileSpec.h"
-#include "nsFileStream.h"
-#include "nsInstall.h" // for error codes
-#include "prmem.h"
-#include "ScheduledTasks.h"
-
-
-
-static nsresult 
-GetPersistentStringFromSpec(const nsFileSpec& inSpec, char **string)
-{
-    if (!string) return NS_ERROR_NULL_POINTER;
-
-    nsCOMPtr<nsIFileSpec> spec;
-#ifdef XP_MAC
-    nsFileSpec interim = inSpec.GetFSSpec(); /* XXX get rid of mError in nsFileSpec */
-    nsresult rv = NS_NewFileSpecWithSpec(interim, getter_AddRefs(spec));
-#else
-    nsresult rv = NS_NewFileSpecWithSpec(inSpec, getter_AddRefs(spec));
-#endif
-    if (NS_SUCCEEDED(rv)) {
-        rv = spec->GetPersistentDescriptorString(string);
-    } 
-    else {
-        *string = nsnull;
-    }
-    return rv;
-}
-
-
-
-
-
-#ifdef _WINDOWS
-#include <sys/stat.h>
-#include <windows.h>
-
-PRInt32 ReplaceExistingWindowsFile(const nsFileSpec& currentSpec, const nsFileSpec& finalSpec)
-{
-    // this routine is now for DOS-based windows only. WinNT should 
-    // be taken care of by the XP code
-    //
-    // NOTE for WINNT:
-    //
-    // the MOVEFILE_DELAY_UNTIL_REBOOT option doesn't work on
-    // NT 3.51 SP4 or on NT 4.0 until SP2. On the broken versions
-    // of NT 4.0 Microsoft warns using it can lead to an irreparably 
-    // corrupt  windows' registry "after an unknown number of calls".
-    // Time to reinstall windows when that happens.
-    //
-    // I don't want to risk it, I also don't want two separate code
-    // paths to test, so we do it the lame way on all NT systems
-    // until such time as there are few enough old revs around to
-    // make it worth switching back to MoveFileEx().
-
-    PRInt32 err = -1;
-
-    /* Get OS version info */
-    DWORD dwVersion = GetVersion();
-
-    /* Get build numbers for Windows NT or Win32s */
-
-    if (dwVersion > 0x80000000)
-    {
-        // 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
-
-        char* final   = strdup(finalSpec.GetNativePathCString());
-        char* current = strdup(currentSpec.GetNativePathCString());
-
-        strlen = GetShortPathName( (LPCTSTR)current, (LPTSTR)Src, (DWORD)sizeof(Src) );
-        if ( strlen > 0 ) 
-        {
-            free(current);
-            current   = strdup(Src);
-        }
-
-        strlen = GetShortPathName( (LPCTSTR) final, (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
-
-
-
-
-PRInt32 DeleteFileNowOrSchedule(const nsFileSpec& filename)
-{
-
-    PRInt32 result = nsInstall::SUCCESS;
-
-    filename.Delete(PR_FALSE);
-    if (filename.Exists())
-    {
-        // could not delete, schedule it for later
-
-        RKEY newkey;
-        HREG reg;
-        REGERR  err;
-        result = nsInstall::UNEXPECTED_ERROR;
-
-        err = NR_RegOpen("", &reg) ;
-        if ( err == REGERR_OK )
-        {
-            err = NR_RegAddKey(reg,ROOTKEY_PRIVATE,REG_DELETE_LIST_KEY,&newkey);
-            if ( err == REGERR_OK )
-            {
-                char    valname[20];
-                char*   fnamestr = nsnull;
-
-                err = NR_RegGetUniqueName( reg, valname, sizeof(valname) );
-                if ( err == REGERR_OK )
-                {
-                    nsresult rv;
-                    rv = GetPersistentStringFromSpec( filename, &fnamestr );
-                    if ( NS_SUCCEEDED(rv) && fnamestr )
-                    {
-
-                        err = NR_RegSetEntry( reg, newkey, valname, 
-                                              REGTYPE_ENTRY_BYTES, 
-                                              (void*)fnamestr, 
-                                              strlen(fnamestr)+1);
-
-                        if ( err == REGERR_OK )
-                            result = nsInstall::REBOOT_NEEDED;
-                    }
-                }
-            }
-
-            NR_RegClose(reg);
-        }
-    }
-
-    return result;
-}
-
-
-
-
-PRInt32 ReplaceFileNow(nsFileSpec& replacementFile, nsFileSpec& doomedFile )
-{
-    // replacement file must exist, doomed file doesn't have to
-    if ( !replacementFile.Exists() )
-        return nsInstall::DOES_NOT_EXIST;
-
-    // don't have to do anything if the files are the same
-    if ( replacementFile == doomedFile )
-        return nsInstall::SUCCESS;
-
-
-    PRInt32 result = nsInstall::ACCESS_DENIED;
-
-    // first try to rename the doomed file out of the way (if it exists)
-    char*   leafname;
-    nsFileSpec tmpFile( doomedFile );
-    if ( tmpFile.Exists() )
-    {
-        tmpFile.MakeUnique();
-        leafname = tmpFile.GetLeafName();
-        tmpFile = doomedFile;
-        tmpFile.Rename( leafname );
-        nsCRT::free( leafname );
-    }
-
-
-    // if doomedFile is gone move new file into place
-    nsresult rv;
-    if ( !doomedFile.Exists() )
-    {
-        nsFileSpec parentofFinalFile;
-        nsFileSpec parentofReplacementFile;
-
-        doomedFile.GetParent(parentofFinalFile);
-        replacementFile.GetParent(parentofReplacementFile);
-
-        // XXX looks dangerous, the replacement file name may NOT be unique in the
-        // target directory if we have to move it! Either we should never move the
-        // files like this (i.e. error if not in the same dir) or we need to take
-        // a little more care in the move.
-        if(parentofReplacementFile != parentofFinalFile)
-        {
-            NS_WARN_IF_FALSE( 0, "File unpacked into a non-dest dir" );
-            rv = replacementFile.MoveToDir(parentofFinalFile);
-        }
-        else
-        	rv = NS_OK;
-        	
-        leafname = doomedFile.GetLeafName();
-        if ( NS_SUCCEEDED(rv) )
-            rv = replacementFile.Rename( leafname );
-
-        if ( NS_SUCCEEDED(rv) ) 
-        {
-            // we replaced the old file OK, now we have to
-            // get rid of it permanently
-            result = DeleteFileNowOrSchedule( tmpFile );
-        }
-        else
-        {
-            // couldn't rename file, try to put old file back
-            tmpFile.Rename( leafname );
-        }
-        nsCRT::free( leafname );
-    }
-
-    return result;
-}
-
-
-
-
-
-PRInt32 ReplaceFileNowOrSchedule(nsFileSpec& replacementFile, nsFileSpec& doomedFile )
-{
-    PRInt32 result = ReplaceFileNow( replacementFile, doomedFile );
-
-    if ( result == nsInstall::ACCESS_DENIED )
-    {
-        // if we couldn't replace the file schedule it for later
-#ifdef _WINDOWS
-        if ( ReplaceExistingWindowsFile(replacementFile, doomedFile) == 0 )
-            return nsInstall::REBOOT_NEEDED;
-#endif
-
-        RKEY    listkey;
-        RKEY    filekey;
-        HREG    reg;
-        REGERR  err;
-
-        if ( REGERR_OK == NR_RegOpen("", &reg) ) 
-        {
-            err = NR_RegAddKey( reg, ROOTKEY_PRIVATE, REG_REPLACE_LIST_KEY, &listkey );
-            if ( err == REGERR_OK ) 
-            {
-                char     valname[20];
-                char*    fsrc = nsnull;
-                char*    fdest = nsnull;
-                REGERR   err2;
-                nsresult rv, rv2;
-
-                err = NR_RegGetUniqueName( reg, valname, sizeof(valname) );
-                if ( err == REGERR_OK )
-                {
-                    err = NR_RegAddKey( reg, listkey, valname, &filekey );
-                    if ( REGERR_OK == err )
-                    {
-                        rv = GetPersistentStringFromSpec(replacementFile, &fsrc);
-                        rv2 = GetPersistentStringFromSpec(doomedFile, &fdest);
-                        if ( NS_SUCCEEDED(rv) && NS_SUCCEEDED(rv2) )
-                        {
-
-                            err = NR_RegSetEntry( reg, filekey, 
-                                                  REG_REPLACE_SRCFILE,
-                                                  REGTYPE_ENTRY_BYTES, 
-                                                  (void*)fsrc, 
-                                                  strlen(fsrc));
-
-                            err2 = NR_RegSetEntry(reg, filekey,
-                                                  REG_REPLACE_DESTFILE,
-                                                  REGTYPE_ENTRY_BYTES,
-                                                  (void*)fdest,
-                                                  strlen(fdest));
-
-                            if ( err == REGERR_OK && err2 == REGERR_OK )
-                                result = nsInstall::REBOOT_NEEDED;
-                            else
-                                NR_RegDeleteKey( reg, listkey, valname );
-                        }
-
-                        if (NS_SUCCEEDED(rv))
-                            nsCRT::free(fsrc);
-
-                        if (NS_SUCCEEDED(rv2))
-                            nsCRT::free(fdest);
-                    }
-                }
-            }
-
-            NR_RegClose(reg);
-        }
-    }
-
-    return result;
-}
-
-
-
-
-//-----------------------------------------------------------------------------
-//
-//          STARTUP: DO SCHEDULED ACTIONS
-//
-//-----------------------------------------------------------------------------
-
-void DeleteScheduledFiles(HREG);
-void ReplaceScheduledFiles(HREG);
-
-void PerformScheduledTasks(HREG reg)
-{
-    DeleteScheduledFiles( reg );
-    ReplaceScheduledFiles( reg );
-}
-
-
-
-void DeleteScheduledFiles( HREG reg )
-{
-    REGERR  err;
-    RKEY    key;
-    REGENUM state = 0;
-
-    /* perform scheduled file deletions  */
-    if (REGERR_OK == NR_RegGetKey(reg,ROOTKEY_PRIVATE,REG_DELETE_LIST_KEY,&key))
-    {
-        // the delete key exists, so we loop through its children
-        // and try to delete all the listed files
-
-        char    namebuf[MAXREGNAMELEN];
-        char    valbuf[MAXREGPATHLEN];
-
-        nsFileSpec              doomedFile;
-        nsCOMPtr<nsIFileSpec>   spec;
-
-        nsresult rv = NS_NewFileSpec(getter_AddRefs(spec));
-        if (NS_SUCCEEDED(rv))
-        {
-            while (REGERR_OK == NR_RegEnumEntries( reg, key, &state, namebuf,
-                                                   sizeof(namebuf), 0 ) )
-            {
-                uint32 bufsize = sizeof(valbuf); // gets changed, must reset
-                err = NR_RegGetEntry( reg, key, namebuf, valbuf, &bufsize );
-                if ( err == REGERR_OK )
-                {
-                    // no need to check return value of 
-                    // SetPersistentDescriptorString, it's always NS_OK
-                    spec->SetPersistentDescriptorString(valbuf);
-                    rv = spec->GetFileSpec(&doomedFile);
-                    if (NS_SUCCEEDED(rv)) 
-                    {
-                        doomedFile.Delete(PR_FALSE);
-                        if ( !doomedFile.Exists() )
-                        {
-                            // deletion successful, don't have to retry
-                            NR_RegDeleteEntry( reg, key, namebuf );
-                        }
-                    }
-                }
-            }
-
-            /* delete list node if empty */
-            state = 0;
-            err = NR_RegEnumEntries(reg, key, &state, namebuf, sizeof(namebuf), 0);
-            if ( err == REGERR_NOMORE )
-            {
-                NR_RegDeleteKey(reg, ROOTKEY_PRIVATE, REG_DELETE_LIST_KEY);
-            }
-        }
-    }
-}
-
-
-
-void ReplaceScheduledFiles( HREG reg )
-{
-    RKEY    key;
-
-    /* replace files if any listed */
-    if (REGERR_OK == NR_RegGetKey(reg,ROOTKEY_PRIVATE,REG_REPLACE_LIST_KEY,&key))
-    {
-        char keyname[MAXREGNAMELEN];
-        char doomedFile[MAXREGPATHLEN];
-        char srcFile[MAXREGPATHLEN];
-
-        nsFileSpec              doomedSpec;
-        nsFileSpec              srcSpec;
-        nsCOMPtr<nsIFileSpec>   src;
-        nsCOMPtr<nsIFileSpec>   dest;
-        nsresult                rv1, rv2;
-
-        rv1 = NS_NewFileSpec(getter_AddRefs(src));
-        rv2 = NS_NewFileSpec(getter_AddRefs(dest));
-        if (NS_SUCCEEDED(rv1) && NS_SUCCEEDED(rv2))
-        {
-            uint32 bufsize;
-            REGENUM state = 0;
-            while (REGERR_OK == NR_RegEnumSubkeys( reg, key, &state, 
-                                   keyname, sizeof(keyname), REGENUM_CHILDREN))
-            {
-                bufsize = sizeof(srcFile);
-                REGERR err1 = NR_RegGetEntry( reg, (RKEY)state,
-                                    REG_REPLACE_SRCFILE, srcFile, &bufsize);
-
-                bufsize = sizeof(doomedFile);
-                REGERR err2 = NR_RegGetEntry( reg, (RKEY)state,
-                                    REG_REPLACE_DESTFILE, doomedFile, &bufsize);
-
-                if ( err1 == REGERR_OK && err2 == REGERR_OK )
-                {
-                    src->SetPersistentDescriptorString(srcFile);
-                    rv1 = src->GetFileSpec(&srcSpec);
-
-                    dest->SetPersistentDescriptorString(doomedFile);
-                    rv2 = dest->GetFileSpec(&doomedSpec);
-
-                    if (NS_SUCCEEDED(rv1) && NS_SUCCEEDED(rv2))
-                    {
-                        // finally now try to do the replace
-                        PRInt32 result = ReplaceFileNow( srcSpec, doomedSpec );
-
-                        if ( result == nsInstall::DOES_NOT_EXIST ||
-                             result == nsInstall::SUCCESS )
-                        {
-                            // This one is done
-                            NR_RegDeleteKey( reg, key, keyname );
-                        }
-                    }
-                }
-            }
-
-
-            /* delete list node if empty */
-            state = 0;
-            if (REGERR_NOMORE == NR_RegEnumSubkeys( reg, key, &state, keyname,
-                                          sizeof(keyname), REGENUM_CHILDREN ))
-            {
-                NR_RegDeleteKey(reg, ROOTKEY_PRIVATE, REG_REPLACE_LIST_KEY);
-            }
-        }
-    }
-}

mozilla/xpinstall/src/ScheduledTasks.h

@@ -1,44 +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.1 (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.
- *
- * Contributor(s): 
- *     Daniel Veditz <dveditz@netscape.com>
- *     Douglas Turner <dougt@netscape.com>
- */
-
-#ifndef __SCHEDULEDTASKS_H__
-#define __SCHEDULEDTASKS_H__
-
-
-#include "NSReg.h"
-//#include "mozreg.h"
-#include "nsFileSpec.h"
-
-PR_BEGIN_EXTERN_C
-
-PRInt32 DeleteFileNowOrSchedule(const nsFileSpec& filename);
-PRInt32 ReplaceFileNowOrSchedule(nsFileSpec& tmpfile, nsFileSpec& target );
-
-
-void PerformScheduledTasks(HREG reg);
-
-PR_END_EXTERN_C
-
-#endif

mozilla/xpinstall/src/gdiff.h

@@ -1,139 +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.1 (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.org 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.
- *
- * Contributor(s): 
- */
-/*--------------------------------------------------------------
- * 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

@@ -1,106 +0,0 @@
-
-#!nmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (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.
-#
-# Contributor(s): 
-#     Daniel Veditz <dveditz@netscape.com>
-#     Douglas Turner <dougt@netscape.com>
-
-
-DEPTH=..\..
-
-include <$(DEPTH)/config/config.mak>
-
-MAKE_OBJ_TYPE = DLL
-MODULE=xpinstal
-XPIDL_MODULE=xpinstall
-
-DLL=.\$(OBJDIR)\$(MODULE).dll
-
-DEFINES=-D_IMPL_NS_DOM -DWIN32_LEAN_AND_MEAN
-
-LCFLAGS =          \
-        $(LCFLAGS) \
-        $(DEFINES) \
-        $(NULL)
-
-
-LLIBS =                                \
-        $(DIST)\lib\xpcom.lib          \
-        $(DIST)\lib\js3250.lib         \
-        $(DIST)\lib\jsdombase_s.lib    \
-        $(DIST)\lib\jsdomevents_s.lib  \
-		$(DIST)\lib\zlib.lib           \
-        $(DIST)\lib\strres.lib         \
-        $(LIBNSPR)                     \
-        $(DIST)\lib\mozreg.lib         \
-        $(NULL)
-
-
-OBJS =                                          \
-       .\$(OBJDIR)\nsInstall.obj                \
-       .\$(OBJDIR)\nsInstallTrigger.obj         \
-       .\$(OBJDIR)\nsInstallVersion.obj         \
-       .\$(OBJDIR)\nsInstallFolder.obj          \
-       .\$(OBJDIR)\nsJSInstall.obj              \
-       .\$(OBJDIR)\nsJSFile.obj                 \
-       .\$(OBJDIR)\nsJSInstallTriggerGlobal.obj \
-       .\$(OBJDIR)\nsJSInstallVersion.obj       \
-       .\$(OBJDIR)\nsSoftwareUpdate.obj         \
-       .\$(OBJDIR)\nsSoftwareUpdateRun.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)\nsXPITriggerInfo.obj         \
-       .\$(OBJDIR)\nsXPInstallManager.obj       \
-       .\$(OBJDIR)\nsInstallFileOpItem.obj      \
-       .\$(OBJDIR)\nsWinShortcut.obj            \
-	   .\$(OBJDIR)\nsJSFileSpecObj.obj          \
-#     .\$(OBJDIR)\nsUpdateNotification.obj     \
-       $(NULL)
-
-WIN_LIBS=                                       \
-       ole32.lib                                \
-       $(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) $(DIST)\lib\$(MODULE).lib
-        $(RM) $(DIST)\bin\components\$(MODULE).dll
-

mozilla/xpinstall/src/nsAppleSingleDecoder.cpp

@@ -1,744 +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.1 (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) 1999
- * Netscape Communications Corporation. All Rights Reserved.  
- * 
- * Contributors:
- *     Samir Gehani <sgehani@netscape.com>
- */
-
-
-#ifndef _NS_APPLESINGLEDECODER_H_
-	#include "nsAppleSingleDecoder.h"
-#endif
-
-#include "MoreFilesExtras.h"
-#include "MoreDesktopMgr.h"
-#include "IterateDirectory.h"
-#include "nsISupportsUtils.h"
-
-/*----------------------------------------------------------------------*
- *   Constructors/Destructor
- *----------------------------------------------------------------------*/
-MOZ_DECL_CTOR_COUNTER(nsAppleSingleDecoder);
-
-nsAppleSingleDecoder::nsAppleSingleDecoder(FSSpec *inSpec, FSSpec *outSpec)
-: mInSpec(NULL), 
-  mOutSpec(NULL),
-  mInRefNum(0),
-  mRenameReqd(false)
-{
-    MOZ_COUNT_CTOR(nsAppleSingleDecoder);
-
-    if (inSpec && outSpec)
-	{
-		/* merely point to FSSpecs, not own 'em */
-		mInSpec = inSpec;
-		mOutSpec = outSpec;
-	}
-}
-
-nsAppleSingleDecoder::nsAppleSingleDecoder()
-: mInSpec(NULL), 
-  mOutSpec(NULL),
-  mInRefNum(0),
-  mRenameReqd(false)
-{
-    MOZ_COUNT_CTOR(nsAppleSingleDecoder);
-}
-
-nsAppleSingleDecoder::~nsAppleSingleDecoder()
-{
-	/* not freeing FSSpecs since we don't own 'em */
-    MOZ_COUNT_DTOR(nsAppleSingleDecoder);
-}
-
-
-/*----------------------------------------------------------------------*
- *   Public methods
- *----------------------------------------------------------------------*/
-OSErr
-nsAppleSingleDecoder::Decode()
-{
-	OSErr		err = noErr;
- 	ASHeader 	header;
- 	long		bytesRead = sizeof(header);
- 	
- 	// param check
- 	if (!mInSpec || !mOutSpec)
- 		return paramErr;
- 		
- 	// check for existence	
- 	FSSpec tmp;
-	err = FSMakeFSSpec(mInSpec->vRefNum, mInSpec->parID, mInSpec->name, &tmp);
-	if (err == fnfErr)
-		return err;
-		
-	MAC_ERR_CHECK(FSpOpenDF( mInSpec, fsRdPerm, &mInRefNum ));
-	MAC_ERR_CHECK(FSRead( mInRefNum, &bytesRead, &header ));
-	
-	if ( (bytesRead != sizeof(header)) ||
-		 (header.magicNum != 0x00051600) ||
-		 (header.versionNum != 0x00020000) ||
-		 (header.numEntries == 0) ) // empty file?
-		 return -1;
-	
-	// create the outSpec which we'll rename correctly later
-	err = FSMakeFSSpec( mInSpec->vRefNum, mInSpec->parID, "\pdecode", mOutSpec );
-	if (err!=noErr && err!=fnfErr)
-		return err;
-	MAC_ERR_CHECK(FSMakeUnique( mOutSpec ));
-	MAC_ERR_CHECK(FSpCreate( mOutSpec, 'MOZZ', '????', 0 ));
-	
-	
-	/* Loop through the entries, processing each.
-	** Set the time/date stamps last, because otherwise they'll 
-	** be destroyed	when we write.
-	*/	
-	{
-		Boolean hasDateEntry = false;
-		ASEntry dateEntry;
-		long offset;
-		ASEntry entry;
-		
-		for ( int i=0; i < header.numEntries; i++ )
-		{	
-			offset = sizeof( ASHeader ) + sizeof( ASEntry ) * i;
-			MAC_ERR_CHECK(SetFPos( mInRefNum, fsFromStart, offset ));
-			
-			bytesRead = sizeof(entry);
-			MAC_ERR_CHECK(FSRead( mInRefNum, &bytesRead, &entry ));
-			if (bytesRead != sizeof(entry))
-				return -1;
-				
- 			if ( entry.entryID == AS_FILEDATES )
- 			{
- 				hasDateEntry = true;
- 				dateEntry = entry;
- 			}
- 			else
-	 			MAC_ERR_CHECK(ProcessASEntry( entry ));
-		}
-		if ( hasDateEntry )
-			MAC_ERR_CHECK(ProcessASEntry( dateEntry ));
-	}
-	
-	// close the inSpec
-	FSClose( mInRefNum );
-	
-	// rename if need be
-	if (mRenameReqd)
-	{
-		FSSpec old;		// delete old version of target file
-		
-		FSMakeFSSpec(mInSpec->vRefNum, mInSpec->parID, mInSpec->name, &old);
-		MAC_ERR_CHECK(FSpDelete(&old));
-		MAC_ERR_CHECK(FSpRename(mOutSpec, mInSpec->name));
-		
-		// reflect change in outSpec
-		nsAppleSingleDecoder::PLstrncpy( mOutSpec->name, mInSpec->name, mInSpec->name[0] );
-		mOutSpec->name[0] = mInSpec->name[0];
-		mRenameReqd = false; // XXX redundant reinit?
-	}
-	
- 	return err;
-}
-
-OSErr
-nsAppleSingleDecoder::Decode(FSSpec *inSpec, FSSpec *outSpec)
-{
-	OSErr 	err = noErr;
-	
-	// param check
-	if (inSpec && outSpec)
-	{
-		mInSpec = inSpec;		// reinit
-		mOutSpec = outSpec;
-		mRenameReqd = false; 
-	}
-	else
-		return paramErr;
-		
-	err = Decode();
-	
-	return err;
-}
-
-pascal void
-DecodeDirIterateFilter(const CInfoPBRec * const cpbPtr, Boolean *quitFlag, void *yourDataPtr)
-{	
-	OSErr					err = noErr;
-	FSSpec 					currFSp, outFSp;
-	nsAppleSingleDecoder* 	thisObj = NULL;
-	Boolean					isDir = false;
-	long					dummy;
-	
-	// param check
-	if (!yourDataPtr || !cpbPtr || !quitFlag)
-		return;
-		
-	*quitFlag = false;
-	
-	// extract 'this' -- an nsAppleSingleDecoder instance
-	thisObj = (nsAppleSingleDecoder*) yourDataPtr;
-	
-	// make an FSSpec from the CInfoPBRec*
-	err = FSMakeFSSpec(cpbPtr->hFileInfo.ioVRefNum, cpbPtr->hFileInfo.ioFlParID, 
-						cpbPtr->hFileInfo.ioNamePtr, &currFSp);
-	if (err == noErr)
-	{
-		FSpGetDirectoryID(&currFSp, &dummy, &isDir);
-		
-		// if current FSSpec is file
-		if (!isDir)
-		{
-			// if file is in AppleSingle format
-			if (nsAppleSingleDecoder::IsAppleSingleFile(&currFSp))
-			{
-				// decode file
-				thisObj->Decode(&currFSp, &outFSp);
-			}
-		}
-		else
-		{
-			// else if current FSSpec is folder ignore
-			// XXX never reached?
-			return;
-		}
-	}
-}
-
-OSErr 
-nsAppleSingleDecoder::DecodeFolder(FSSpec *aFolder)
-{
-	OSErr	err = noErr;
-	long	dummy;
-	Boolean	isDir = false;
-	
-	// check that FSSpec is folder
-	if (aFolder)
-	{
-		FSpGetDirectoryID(aFolder, &dummy, &isDir);
-		if (!isDir)
-			return dirNFErr;
-	}
-	
-	// recursively enumerate contents of folder (maxLevels=0 means recurse all)
-	FSpIterateDirectory(aFolder, 0, DecodeDirIterateFilter, (void*)this);
-			
-	return err;
-}
-
-Boolean
-nsAppleSingleDecoder::IsAppleSingleFile(FSSpec *inSpec)
-{
-	OSErr	err;
-	Boolean bAppleSingle = false;
-	short	inRefNum;
-	UInt32	magic;
-	long 	bytesRead = sizeof(magic);
-	
-	// param checks
-	if (!inSpec)
-		return false;
-		
-	// check for existence
-	FSSpec tmp;
-	err = FSMakeFSSpec(inSpec->vRefNum, inSpec->parID, inSpec->name, &tmp);
-	if (err!=noErr)
-		return false;
-	
-	// open and read the magic number len bytes	
-	err = FSpOpenDF( inSpec, fsRdPerm, &inRefNum );
-	if (err!=noErr)
-		return false;
-		
-	err = FSRead( inRefNum, &bytesRead, &magic );
-	if (err!=noErr)
-		return false;
-		
-	FSClose(inRefNum);
-	if (bytesRead != sizeof(magic))
-		return false;
-
-	// check if bytes read match magic number	
-	bAppleSingle = (magic == 0x00051600);
-	return bAppleSingle;
-}
-
-
-/*----------------------------------------------------------------------*
- *   Private methods
- *----------------------------------------------------------------------*/
-OSErr
-nsAppleSingleDecoder::ProcessASEntry(ASEntry inEntry)
-{
-	switch (inEntry.entryID)
-	{
-		case AS_DATA:
-			return ProcessDataFork( inEntry );
-			break;
-		case AS_RESOURCE:
-			return ProcessResourceFork( inEntry );
-			break;
-		case AS_REALNAME:
-			ProcessRealName( inEntry );
-			break;
-			// return 0;	// Ignore these errors in ASD   <--- XXX remove
-		case AS_COMMENT:
-//			return ProcessComment( inEntry );
-			break;
-		case AS_ICONBW:
-//			return ProcessIconBW( inEntry );
-			break;
-		case AS_ICONCOLOR:
-//			return ProcessIconColor( inEntry );
-			break;
-		case AS_FILEDATES:
-			return ProcessFileDates( inEntry );
-			break;
-		case AS_FINDERINFO:
-			return ProcessFinderInfo( inEntry );
-			break;
-		case AS_MACINFO:
-			return ProcessMacInfo( inEntry );
-			break;
-		case AS_PRODOSINFO:
-		case AS_MSDOSINFO:
-		case AS_AFPNAME:
-		case AS_AFPINFO:
-		case AS_AFPDIRID:
-		default:
-			return 0;
-	}
-	return 0;
-}
-
-OSErr
-nsAppleSingleDecoder::ProcessDataFork(ASEntry inEntry)
-{
-	OSErr	err = noErr;
-	SInt16	refNum;
-	
-	/* Setup the files */
-	err = FSpOpenDF (mOutSpec, fsWrPerm,  &refNum);
-
-	if ( err == noErr )
-		err = EntryToMacFile( inEntry, refNum );
-	
-	FSClose( refNum );
-	return err;
-}
-
-OSErr
-nsAppleSingleDecoder::ProcessResourceFork(ASEntry inEntry)
-{
-	OSErr	err = noErr;
-	SInt16	refNum;
-		
-	err = FSpOpenRF(mOutSpec, fsWrPerm,  &refNum);
-
-	if ( err == noErr )
-		err = EntryToMacFile( inEntry, refNum );
-	
-	FSClose( refNum );
-	return err;
-}
-
-OSErr
-nsAppleSingleDecoder::ProcessRealName(ASEntry inEntry)
-{
-	OSErr	err = noErr;
-	Str255	newName;
-	long	bytesRead;
-	
-	if ( inEntry.entryLength > 32 )	/* Max file name length for the Mac */
-		return -1;
-
-	MAC_ERR_CHECK(SetFPos(mInRefNum, fsFromStart, inEntry.entryOffset));
-	
-	bytesRead = inEntry.entryLength;
-	MAC_ERR_CHECK(FSRead(mInRefNum, &bytesRead, &newName[1]));
-	if (bytesRead != inEntry.entryLength)
-		return -1;
-		
-	newName[0] = inEntry.entryLength;
-	err = FSpRename(mOutSpec, newName);
-	if (err == dupFNErr)
-	{
-		// if we are trying to rename temp decode file to src name, rename later
-		if (nsAppleSingleDecoder::PLstrcmp(newName, mInSpec->name))
-		{
-			mRenameReqd = true;
-			return noErr;
-		}
-		
-		FSSpec old;		// delete old version of target file
-		
-		FSMakeFSSpec(mOutSpec->vRefNum, mOutSpec->parID, newName, &old);
-		MAC_ERR_CHECK(FSpDelete(&old));
-		MAC_ERR_CHECK(FSpRename(mOutSpec, newName));
-	}
-	nsAppleSingleDecoder::PLstrncpy( mOutSpec->name, newName, inEntry.entryLength );
-	mOutSpec->name[0] = inEntry.entryLength;
-
-	return err;
-}
-
-OSErr
-nsAppleSingleDecoder::ProcessFileDates(ASEntry inEntry)
-{
-	OSErr		err = noErr;
-	ASFileDates dates;
-	long		bytesRead;
-	
-	if ( inEntry.entryLength != sizeof(dates) )	/* Max file name length for the Mac */
-		return -1;
-	
-	MAC_ERR_CHECK(SetFPos(mInRefNum, fsFromStart, inEntry.entryOffset));
-	
-	bytesRead = inEntry.entryLength;
-	MAC_ERR_CHECK(FSRead(mInRefNum, &bytesRead, &dates));
-	if (bytesRead != inEntry.entryLength)
-		return -1;
-		
-	Str31 name;
-	nsAppleSingleDecoder::PLstrncpy(name, mOutSpec->name, mOutSpec->name[0]);
-	name[0] = mOutSpec->name[0];
-	CInfoPBRec pb;
-	pb.hFileInfo.ioNamePtr = &name[0];
-	pb.hFileInfo.ioVRefNum = mOutSpec->vRefNum;
-	pb.hFileInfo.ioDirID = mOutSpec->parID;
-	pb.hFileInfo.ioFDirIndex = 0;	/* use ioNamePtr and ioDirID */
-	err = PBGetCatInfoSync(&pb);
-	if ( err != noErr )
-		return -1;
-#define YR_2000_SECONDS 3029529600
-	pb.hFileInfo.ioFlCrDat = dates.create + YR_2000_SECONDS;
-	pb.hFileInfo.ioFlMdDat = dates.modify + YR_2000_SECONDS;
-	pb.hFileInfo.ioFlBkDat = dates.backup + YR_2000_SECONDS;
-	/* Not sure if mac has the last access time */
-	
-	nsAppleSingleDecoder::PLstrncpy(name, mOutSpec->name, mOutSpec->name[0]);
-	name[0] = mOutSpec->name[0];
-	pb.hFileInfo.ioNamePtr = name;
-	pb.hFileInfo.ioVRefNum = mOutSpec->vRefNum;
-	pb.hFileInfo.ioDirID = mOutSpec->parID;
-	pb.hFileInfo.ioFDirIndex = 0;	/* use ioNamePtr and ioDirID */
-	err = PBSetCatInfo(&pb, false);
-	
-	return err;
-}
-
-OSErr
-nsAppleSingleDecoder::ProcessFinderInfo(ASEntry inEntry)
-{
-	OSErr			err = noErr;
-	ASFinderInfo 	info;
-	long			bytesRead;
-	
-	if (inEntry.entryLength != sizeof( ASFinderInfo ))
-		return -1;
-
-	MAC_ERR_CHECK(SetFPos(mInRefNum, fsFromStart, inEntry.entryOffset));
-
-	bytesRead = sizeof(info);
-	MAC_ERR_CHECK(FSRead(mInRefNum, &bytesRead, &info));
-	if (bytesRead != inEntry.entryLength)
-		return -1;
-		
-	err = FSpSetFInfo(mOutSpec, &info.ioFlFndrInfo);
-	if (err!=noErr && err!=fnfErr)
-		return err;
-
-	Str31 name;
-	nsAppleSingleDecoder::PLstrncpy(name, mOutSpec->name, mOutSpec->name[0]);
-	name[0] = mOutSpec->name[0];
-	CInfoPBRec pb;
-	pb.hFileInfo.ioNamePtr = name;
-	pb.hFileInfo.ioVRefNum = mOutSpec->vRefNum;
-	pb.hFileInfo.ioDirID = mOutSpec->parID;
-	pb.hFileInfo.ioFDirIndex = 0;	/* use ioNamePtr and ioDirID */
-	MAC_ERR_CHECK(PBGetCatInfoSync(&pb));
-	
-	pb.hFileInfo.ioNamePtr = name;
-	pb.hFileInfo.ioVRefNum = mOutSpec->vRefNum;
-	pb.hFileInfo.ioDirID = mOutSpec->parID;
-	pb.hFileInfo.ioFDirIndex = 0;	/* use ioNamePtr and ioDirID */
-	pb.hFileInfo.ioFlXFndrInfo = info.ioFlXFndrInfo;
-	err = PBSetCatInfo(&pb, false);
-    
-    
-
-    if (info.ioFlFndrInfo.fdType == 'APPL')
-    {
-        // need to register in desktop database or bad things will happen
-
-        DTSetAPPL(  NULL, 
-                    mOutSpec->vRefNum,
-                    info.ioFlFndrInfo.fdCreator,
-                    mOutSpec->parID,
-                    mOutSpec->name );
-
-    }
-
-
-	return err;
-}
-
-OSErr
-nsAppleSingleDecoder::ProcessMacInfo(ASEntry inEntry)
-{
-	OSErr		err = noErr;
-	ASMacInfo 	info;
-	long 		bytesRead;
-	
-	if (inEntry.entryLength != sizeof( ASMacInfo ))
-		return -1;
-
-	MAC_ERR_CHECK(SetFPos(mInRefNum, fsFromStart, inEntry.entryOffset));
-
-	bytesRead = sizeof(info);
-	MAC_ERR_CHECK(FSRead(mInRefNum, &bytesRead, &info));
-	if (bytesRead != inEntry.entryLength)
-		return -1;
-	
-	Str31 name;
-	nsAppleSingleDecoder::PLstrncpy(name, mOutSpec->name, mOutSpec->name[0]);
-	name[0] = mOutSpec->name[0];
-	CInfoPBRec pb;
-	pb.hFileInfo.ioNamePtr = name;
-	pb.hFileInfo.ioVRefNum = mOutSpec->vRefNum;
-	pb.hFileInfo.ioDirID = mOutSpec->parID;
-	pb.hFileInfo.ioFDirIndex = 0;	/* use ioNamePtr and ioDirID */
-	MAC_ERR_CHECK(PBGetCatInfoSync(&pb));
-	
-	pb.hFileInfo.ioNamePtr = name;
-	pb.hFileInfo.ioVRefNum = mOutSpec->vRefNum;
-	pb.hFileInfo.ioDirID = mOutSpec->parID;
-	pb.hFileInfo.ioFlAttrib = info.ioFlAttrib;
-	err = PBSetCatInfo(&pb, false);
-	
-	return err;
-}
-
-OSErr
-nsAppleSingleDecoder::EntryToMacFile(ASEntry inEntry, UInt16 inTargetSpecRefNum)
-{
-#define BUFFER_SIZE 8192
-
-	OSErr	err = noErr;
-	char 	buffer[BUFFER_SIZE];
-	long 	totalRead = 0, bytesRead, bytesToWrite;
-
-	MAC_ERR_CHECK(SetFPos( mInRefNum, fsFromStart, inEntry.entryOffset ));
-
-	while ( totalRead < inEntry.entryLength )
-	{
-// Should we yield in here?
-		bytesRead = BUFFER_SIZE;
-		err = FSRead( mInRefNum, &bytesRead, buffer );
-		if (err!=noErr && err!=eofErr)
-			return err;
-			
-		if ( bytesRead <= 0 )
-			return -1;
-		bytesToWrite = totalRead + bytesRead > inEntry.entryLength ? 
-									inEntry.entryLength - totalRead :
-									bytesRead;
-
-		totalRead += bytesRead;
-		MAC_ERR_CHECK(FSWrite(inTargetSpecRefNum, &bytesToWrite, buffer));
-	}	
-	
-	return err;
-}
-
-OSErr DTSetAPPL(Str255 volName,
-                short vRefNum,
-                OSType creator,
-                long applParID,
-                Str255 applName)
-{
-    OSErr err;
-    DTPBRec *pb = NULL;
-    short dtRefNum;
-    short realVRefNum;
-    Boolean newDTDatabase;
-    /* get the real vRefnum */
-    err = DetermineVRefNum(volName, vRefNum, &realVRefNum);
-    if (err == noErr)
-    {
-        err = DTOpen(volName, vRefNum, &dtRefNum, &newDTDatabase);
-        if (err == noErr && !newDTDatabase)
-        {
-            pb = (DTPBRec*) NewPtrClear( sizeof(DTPBRec) );
-            
-            if (pb==NULL) return -1;
-
-            pb->ioNamePtr      =   applName;
-            pb->ioDTRefNum     =   dtRefNum;
-            pb->ioDirID        =   applParID;
-            pb->ioFileCreator  =   creator;
-
-            err = PBDTAddAPPLSync(pb);
-            
-            if (pb) DisposePtr((Ptr)pb);
-        }        
-    }
-    return err;
-}
-
-OSErr
-nsAppleSingleDecoder::FSMakeUnique(FSSpec *ioSpec)
-{
-	OSErr			err = noErr;
-	Boolean 		bUnique = false;
-	FSSpec			tmp;
-	long				uniqueID = 0;
-	Str255			name;
-	short			i, j;
-	unsigned char	puniqueID[16];
-	char			*cuniqueIDPtr;
-
-	// grab suggested name from in-out FSSpec
-	nsAppleSingleDecoder::PLstrncpy(name, ioSpec->name, ioSpec->name[0]);
-	name[0] = ioSpec->name[0];
-	
-	for (i=0; i<65536; i++)		// prevent infinite loop
-	{	
-		if (!bUnique)
-		{
-			err = FSMakeFSSpec( ioSpec->vRefNum, ioSpec->parID, name, &tmp );
-			if (err == fnfErr)
-			{
-				bUnique = true;
-				break;
-			}
-			else if (err == noErr)	// file already exists
-			{
-				// grab suggested name from in-out FSSpec
-				nsAppleSingleDecoder::PLstrncpy(name, ioSpec->name, ioSpec->name[0]);
-				name[0] = ioSpec->name[0];
-				
-				// attempt to create a new unique file name
-				nsAppleSingleDecoder::PLstrncat( name, "\p-", 1 );
-				
-				// tack on digit(s)
-				cuniqueIDPtr = nsAppleSingleDecoder::ltoa(uniqueID++);
-				puniqueID[0] = strlen(cuniqueIDPtr);
-				for (j=0; j<strlen(cuniqueIDPtr); j++)
-				{
-					puniqueID[j+1] = cuniqueIDPtr[j];
-				}
-				
-				nsAppleSingleDecoder::PLstrncat( name, puniqueID, puniqueID[0] );
-				DisposePtr((Ptr)cuniqueIDPtr);
-			}
-			else
-				return err;
-		}
-	}
-	
-	// put back unique name into in-out FSSpec
-	nsAppleSingleDecoder::PLstrncpy(ioSpec->name, name, name[0]);
-	ioSpec->name[0] = name[0];
-	
-	return noErr;
-}		
-
-/*----------------------------------------------------------------------*
- *   Utilities
- *----------------------------------------------------------------------*/
-char *
-nsAppleSingleDecoder::ltoa(long n)
-{
-	char *s;
-	int i, j, sign, tmp;
-	
-	/* check sign and convert to positive to stringify numbers */
-	if ( (sign = n) < 0)
-		n = -n;
-	i = 0;
-	s = (char*) malloc(sizeof(char));
-	
-	/* grow string as needed to add numbers from powers of 10 down till none left */
-	do
-	{
-		s = (char*) realloc(s, (i+1)*sizeof(char));
-		s[i++] = n % 10 + '0';  /* '0' or 30 is where ASCII numbers start from */
-		s[i] = '\0';
-	}
-	while( (n /= 10) > 0);	
-	
-	/* tack on minus sign if we found earlier that this was negative */
-	if (sign < 0)
-	{
-		s = (char*) realloc(s, (i+1)*sizeof(char));
-		s[i++] = '-';
-	}
-	s[i] = '\0';
-	
-	/* pop numbers (and sign) off of string to push back into right direction */
-	for (i = 0, j = strlen(s) - 1; i < j; i++, j--)
-	{
-		tmp = s[i];
-		s[i] = s[j];
-		s[j] = tmp;
-	}
-	
-	return s;
-}
-
-StringPtr 	
-nsAppleSingleDecoder::PLstrncpy(StringPtr dst, ConstStr255Param src, short max)
-{
-	int srcLen = src[0];
-	if (srcLen > max)
-		srcLen = max;
-	dst[0] = srcLen;	
-	memcpy(&dst[1], &src[1], srcLen);
-	return dst;	
-}
-
-StringPtr 	
-nsAppleSingleDecoder::PLstrncat(StringPtr dst, ConstStr255Param src, short max)
-{
-	int srcLen = src[0], dstLen = dst[0];
-	if (srcLen > max)
-		srcLen = max;
-	dst[0] += srcLen;
-	memcpy(&dst[dstLen+1], &src[1], srcLen);
-	return dst;
-}
-
-Boolean
-nsAppleSingleDecoder::PLstrcmp(StringPtr str1, StringPtr str2)
-{
-	Boolean	bEqual = true;
-	
-	// check for same length
-	if (str1[0] == str2[0])
-	{
-		// verify mem blocks match
-		if (0 != memcmp(&str1[1], &str2[1], str1[0]))
-			bEqual = false;
-	}
-	else
-		bEqual = false;
-		
-	return bEqual;
-}

mozilla/xpinstall/src/nsAppleSingleDecoder.h

@@ -1,222 +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.1 (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) 1999
- * Netscape Communications Corporation. All Rights Reserved.  
- * 
- * Contributors:
- *     Samir Gehani <sgehani@netscape.com>
- */
-
-
-/*----------------------------------------------------------------------*
- *   Implements a simple AppleSingle decoder, as described in RFC1740 
- *	 http://andrew2.andrew.cmu.edu/rfc/rfc1740.html
- *----------------------------------------------------------------------*/
-
-#ifndef macintosh
-#error Sorry! This is Mac only functionality!
-#endif
-
-#pragma options align=mac68k
-
-#ifndef _NS_APPLESINGLEDECODER_H_
-#define _NS_APPLESINGLEDECODER_H_
-
-#include <stdlib.h>
-#include <string.h>
-#include <Files.h>
-#include <Errors.h>
-
-
-/*----------------------------------------------------------------------*
- *   Struct definitions from RFC1740
- *----------------------------------------------------------------------*/
-typedef struct ASHeader /* header portion of AppleSingle */ 
-{
-    /* AppleSingle = 0x00051600; AppleDouble = 0x00051607 */
-       UInt32 magicNum; 	/* internal file type tag */ 
-       UInt32 versionNum; 	/* format version: 2 = 0x00020000 */ 
-       UInt8 filler[16]; 	/* filler, currently all bits 0 */ 
-       UInt16 numEntries; 	/* number of entries which follow */
-} ASHeader ; /* ASHeader */ 
-
-typedef struct ASEntry /* one AppleSingle entry descriptor */ 
-{
-	UInt32 entryID; 	/* entry type: see list, 0 invalid */
-	UInt32 entryOffset; /* offset, in octets, from beginning */
-	                    /* of file to this entry's data */
-	UInt32 entryLength; /* length of data in octets */
-} ASEntry; /* ASEntry */
-
-typedef struct ASFinderInfo
-{
-	FInfo ioFlFndrInfo; 	/* PBGetFileInfo() or PBGetCatInfo() */
-	FXInfo ioFlXFndrInfo; 	/* PBGetCatInfo() (HFS only) */
-} ASFinderInfo; /* ASFinderInfo */
-
-typedef struct ASMacInfo        /* entry ID 10, Macintosh file information */
-{
-       UInt8 filler[3]; 	/* filler, currently all bits 0 */ 
-       UInt8 ioFlAttrib; 	/* PBGetFileInfo() or PBGetCatInfo() */
-} ASMacInfo;
-
-typedef struct ASFileDates      /* entry ID 8, file dates info */
-{
-	SInt32 create; /* file creation date/time */
-	SInt32 modify; /* last modification date/time */
-	SInt32 backup; /* last backup date/time */
-	SInt32 access; /* last access date/time */
-} ASFileDates; /* ASFileDates */
-
-/* entryID list */
-#define AS_DATA         1 /* data fork */
-#define AS_RESOURCE     2 /* resource fork */
-#define AS_REALNAME     3 /* File's name on home file system */
-#define AS_COMMENT      4 /* standard Mac comment */
-#define AS_ICONBW       5 /* Mac black & white icon */
-#define AS_ICONCOLOR    6 /* Mac color icon */
-   		/*              7       /* not used */
-#define AS_FILEDATES    8 /* file dates; create, modify, etc */
-#define AS_FINDERINFO   9 /* Mac Finder info & extended info */
-#define AS_MACINFO      10 /* Mac file info, attributes, etc */
-#define AS_PRODOSINFO   11 /* Pro-DOS file info, attrib., etc */
-#define AS_MSDOSINFO    12 /* MS-DOS file info, attributes, etc */
-#define AS_AFPNAME      13 /* Short name on AFP server */
-#define AS_AFPINFO      14 /* AFP file info, attrib., etc */
-
-#define AS_AFPDIRID     15 /* AFP directory ID */
-
-
-/*----------------------------------------------------------------------*
- *   Macros
- *----------------------------------------------------------------------*/
-#define MAC_ERR_CHECK(_funcCall) 	\
-	err = _funcCall; 				\
-	if (err!=noErr) 				\
-			return err;
-	
-	
-
-class nsAppleSingleDecoder 
-{
-
-public:
-	nsAppleSingleDecoder(FSSpec *inSpec, FSSpec *outSpec);
-	nsAppleSingleDecoder();
-	~nsAppleSingleDecoder();
-		
-	/** 
-	 * Decode
-	 *
-	 * Takes an "in" FSSpec for the source file in AppleSingle
-	 * format to decode and write out to an "out" FSSpec.
-	 * This form is used when the Decode(void) method has already
-	 * been invoked once and this object is reused to decode 
-	 * another AppleSingled file: useful in iteration to avoid
-	 * nsAppleSingleDecoder object instantiation per file.
-	 *
-	 * @param  inSpec 	the AppleSingled file to decode
-	 * @param  outSpec 	the destination file in which the decoded
-	 *					data was written out (empty when passed in
-	 *					and filled on return)
-	 * @return err		a standard MacOS OSErr where noErr means OK
-	 */
-	OSErr Decode(FSSpec *inSpec, FSSpec *outSpec);
-		
-	/**
-	 * Decode
-	 *
-	 * Decodes the AppleSingled file passed in to the constructor
-	 * and writes out the decoded data to the outSpec passed to the 
-	 * constructor.
-	 *
-	 * @return err		a standard MacOS OSErr where noErr = OK
-	 */
-	OSErr Decode();
-	
-    /**
-     * DecodeFolder
-     *
-     * Traverses arbitrarily nested subdirs decoding any files
-     * in AppleSingle format and leaving other files alone.
-     *
-     * @param   aFolder  the folder whose contents to decode
-     * @return  err	     a standard MacOS err (dirNFErr if invalid dir, noErr = OK)
-     */
-    OSErr DecodeFolder(FSSpec *aFolder);
-     
-	/**
-	 * IsAppleSingleFile
-	 *
-	 * Checks the file header to see whether this is an AppleSingle
-	 * version 2 file by matching the magicNum field in the header.
-	 *
-	 * @param  inSpec			the file to check
-	 * @return bAppleSingle		a Boolean where true indicates this is
-	 *							in fact an AppleSingle file
-	 */
-	static Boolean IsAppleSingleFile(FSSpec *inSpec);
-	
-	/**
-	 * String utilities to ensure building standalone
-	 * since Mozilla doesn't use PLStringFuncs.
-	 */
-	static StringPtr PLstrncpy(StringPtr dst, ConstStr255Param src, short max);
-	static StringPtr PLstrncat(StringPtr dst, ConstStr255Param src, short max);
-	static Boolean   PLstrcmp(StringPtr str1, StringPtr str2);
-	
-	/**
- 	 * ltoa -- long to ascii
- 	 *
- 	 * Converts a long to a C string. We allocate 
- 	 * a string of the appropriate size and the caller
- 	 * should assume ownership of the returned pointer.
- 	 */
-	static char *ltoa(long n);
-	
-private:
-	FSSpec	*mInSpec;
-	FSSpec	*mOutSpec;
-	short	mInRefNum;	// cache since it's used through the life of one Decode cycle
-	Boolean	mRenameReqd;
-	
-	OSErr	ProcessASEntry(ASEntry inEntry);	
-	OSErr	ProcessDataFork(ASEntry inEntry);
-	OSErr	ProcessResourceFork(ASEntry inEntry);
-	OSErr	ProcessRealName(ASEntry inEntry);
-	OSErr	ProcessFileDates(ASEntry inEntry);
-	OSErr	ProcessFinderInfo(ASEntry inEntry);
-	OSErr	ProcessMacInfo(ASEntry inEntry);
-	OSErr	EntryToMacFile(ASEntry inEntry, UInt16 inTargetSpecRefNum);
-	
-	OSErr	FSMakeUnique(FSSpec *ioSpec);
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-OSErr DTSetAPPL(Str255 volName,short vRefNum,OSType creator,long applParID,Str255 applName);
-pascal void
-DecodeDirIterateFilter(const CInfoPBRec * const cpbPtr, Boolean *quitFlag, void *yourDataPtr);
-
-#ifdef __cplusplus
-}
-#endif
-
-#pragma options align=reset
-
-#endif /* _NS_APPLESINGLEDECODER_H_ */

mozilla/xpinstall/src/nsInstall.h

@@ -1,323 +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.1 (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.
- *
- * Contributor(s): 
- *     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 "nsVoidArray.h"
-#include "nsHashtable.h"
-#include "nsCOMPtr.h"
-
-#include "nsSoftwareUpdate.h"
-
-#include "nsInstallObject.h"
-#include "nsInstallVersion.h"
-#include "nsInstallFolder.h"
-
-#include "nsIXPINotifier.h"
-
-#include "nsIStringBundle.h"
-#include "nsILocale.h"
-#include "nsIEventQueueService.h"
-#include "nsIServiceManager.h"
-#include "nsIComponentManager.h"
-#include "nsIPersistentProperties.h"
-#include "nsIEnumerator.h"
-#include "nsIZipReader.h"
-
-class nsInstallInfo
-{
-  public:
-    
-    nsInstallInfo( nsIFileSpec*     aFile, 
-                   const PRUnichar* aURL, 
-                   const PRUnichar* aArgs, 
-                   long             aFlags, 
-                   nsIXPINotifier*  aNotifier);
-
-    virtual ~nsInstallInfo();
-
-    nsresult GetLocalFile(nsFileSpec& aSpec);
-
-    void GetURL(nsString& aURL) { aURL = mURL; }
-
-    void GetArguments(nsString& aArgs) { aArgs = mArgs; }
-    
-    long GetFlags() { return mFlags; }
-
-    nsIXPINotifier* GetNotifier() { return mNotifier; };
-    
-  private:
-    
-    nsresult  mError;
-
-    long       mFlags;
-    nsString   mURL;
-    nsString   mArgs;
-
-    nsCOMPtr<nsIFileSpec>       mFile;
-    nsCOMPtr<nsIXPINotifier>    mNotifier;
-};
-
-#ifdef XP_PC
-#define FILESEP '\\'
-#elif defined XP_MAC
-#define FILESEP ':'
-#elif defined XP_BEOS
-#define FILESEP '/'
-#else
-#define FILESEP '/'
-#endif
-
-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_INSTALL_SCRIPT           = -204,
-            NO_CERTIFICATE              = -205,
-            NO_MATCHING_CERTIFICATE     = -206,
-            CANT_READ_ARCHIVE           = -207,
-            INVALID_ARGUMENTS           = -208,
-            ILLEGAL_RELATIVE_PATH       = -209,
-            USER_CANCELLED              = -210,
-            INSTALL_NOT_STARTED         = -211,
-            SILENT_MODE_DENIED          = -212,
-            NO_SUCH_COMPONENT           = -213,
-            DOES_NOT_EXIST              = -214,
-            READ_ONLY                   = -215,
-            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,
-            PACKAGE_FOLDER_NOT_SET      = -224,
-            EXTRACTION_FAILED           = -225,
-            FILENAME_ALREADY_USED       = -226,
-            ABORT_INSTALL               = -227,
-            DOWNLOAD_ERROR              = -228,
-            SCRIPT_ERROR                = -229,
-
-            ALREADY_EXISTS              = -230,
-            IS_FILE                     = -231,
-            SOURCE_DOES_NOT_EXIST       = -232,
-            SOURCE_IS_DIRECTORY         = -233,
-            SOURCE_IS_FILE              = -234,
-            INSUFFICIENT_DISK_SPACE     = -235,
-            FILENAME_TOO_LONG           = -236,
-            
-            OUT_OF_MEMORY               = -299,
-
-            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(nsIZipReader * theJARFile);
-        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 aErrorNumber);
-        
-        PRInt32    AddDirectory(const nsString& aRegName, const nsString& aVersion, const nsString& aJarSource, nsInstallFolder* aFolder, const nsString& aSubdir, PRInt32 aMode, PRInt32* aReturn);
-        PRInt32    AddDirectory(const nsString& aRegName, const nsString& aVersion, const nsString& aJarSource, nsInstallFolder* aFolder, const nsString& aSubdir, PRInt32* aReturn);
-        PRInt32    AddDirectory(const nsString& aRegName, const nsString& aJarSource, nsInstallFolder* aFolder, const nsString& aSubdir, PRInt32* aReturn);
-        PRInt32    AddDirectory(const nsString& aJarSource, PRInt32* aReturn);
-        
-        PRInt32    AddSubcomponent(const nsString& aRegName, const nsString& aVersion, const nsString& aJarSource, nsInstallFolder *aFolder, const nsString& aTargetName, PRInt32 aMode, PRInt32* aReturn);
-        PRInt32    AddSubcomponent(const nsString& aRegName, const nsString& aVersion, const nsString& aJarSource, nsInstallFolder *aFolder, const nsString& aTargetName, PRInt32* aReturn);
-        PRInt32    AddSubcomponent(const nsString& aRegName, const nsString& aJarSource, nsInstallFolder *aFolder, const nsString& aTargetName, PRInt32* aReturn);
-        PRInt32    AddSubcomponent(const nsString& aJarSource, PRInt32* aReturn);
-        
-        PRInt32    DeleteComponent(const nsString& aRegistryName, PRInt32* aReturn);
-        PRInt32    DeleteFile(nsInstallFolder* aFolder, const nsString& aRelativeFileName, PRInt32* aReturn);
-        PRInt32    DiskSpaceAvailable(const nsString& aFolder, PRInt64* 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, nsInstallFolder** aFolder);
-        PRInt32    GetComponentFolder(const nsString& aComponentName, nsInstallFolder** aFolder);
-        
-        PRInt32    GetFolder(nsInstallFolder& aTargetFolder, const nsString& aSubdirectory, nsInstallFolder** aFolder);
-        PRInt32    GetFolder(const nsString& aTargetFolder, const nsString& aSubdirectory, nsInstallFolder** aFolder);
-        PRInt32    GetFolder(const nsString& aTargetFolder, nsInstallFolder** 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	   LoadResources(JSContext* cx, const nsString& aBaseName, jsval* aReturn);
-        PRInt32    Patch(const nsString& aRegName, const nsString& aVersion, const nsString& aJarSource, nsInstallFolder* aFolder, const nsString& aTargetName, PRInt32* aReturn);
-        PRInt32    Patch(const nsString& aRegName, const nsString& aJarSource, nsInstallFolder* aFolder, const nsString& aTargetName, PRInt32* aReturn);
-        PRInt32    ResetError();
-        PRInt32    SetPackageFolder(nsInstallFolder& aFolder);
-        PRInt32    StartInstall(const nsString& aUserPackageName, const nsString& aPackageName, const nsString& aVersion, PRInt32* aReturn);
-        PRInt32    Uninstall(const nsString& aPackageName, PRInt32* aReturn);
-        
-        PRInt32    FileOpDirCreate(nsInstallFolder& aTarget, PRInt32* aReturn);
-        PRInt32    FileOpDirGetParent(nsInstallFolder& aTarget, nsFileSpec* aReturn);
-        PRInt32    FileOpDirRemove(nsInstallFolder& aTarget, PRInt32 aFlags, PRInt32* aReturn);
-        PRInt32    FileOpDirRename(nsInstallFolder& aSrc, nsString& aTarget, PRInt32* aReturn);
-        PRInt32    FileOpFileCopy(nsInstallFolder& aSrc, nsInstallFolder& aTarget, PRInt32* aReturn);
-        PRInt32    FileOpFileDelete(nsInstallFolder& aTarget, PRInt32 aFlags, PRInt32* aReturn);
-        PRInt32    FileOpFileExists(nsInstallFolder& aTarget, PRBool* aReturn);
-        PRInt32    FileOpFileExecute(nsInstallFolder& aTarget, nsString& aParams, PRInt32* aReturn);
-        PRInt32    FileOpFileGetNativeVersion(nsInstallFolder& aTarget, nsString* aReturn);
-        PRInt32    FileOpFileGetDiskSpaceAvailable(nsInstallFolder& aTarget, PRInt64* aReturn);
-        PRInt32    FileOpFileGetModDate(nsInstallFolder& aTarget, nsFileSpec::TimeStamp* aReturn);
-        PRInt32    FileOpFileGetSize(nsInstallFolder& aTarget, PRUint32* aReturn);
-        PRInt32    FileOpFileIsDirectory(nsInstallFolder& aTarget, PRBool* aReturn);
-        PRInt32    FileOpFileIsFile(nsInstallFolder& aTarget, PRBool* aReturn);
-        PRInt32    FileOpFileModDateChanged(nsInstallFolder& aTarget, nsFileSpec::TimeStamp& aOldStamp, PRBool* aReturn);
-        PRInt32    FileOpFileMove(nsInstallFolder& aSrc, nsInstallFolder& aTarget, PRInt32* aReturn);
-        PRInt32    FileOpFileRename(nsInstallFolder& aSrc, nsString& aTarget, PRInt32* aReturn);
-        PRInt32    FileOpFileWindowsShortcut(nsFileSpec& aTarget, nsFileSpec& aShortcutPath, nsString& aDescription, nsFileSpec& aWorkingPath, nsString& aParams, nsFileSpec& aIcon, PRInt32 aIconId, PRInt32* aReturn);
-        PRInt32    FileOpFileMacAlias(nsString& aSourcePath, nsString& aAliasPath, PRInt32* aReturn);
-        PRInt32    FileOpFileUnixLink(nsInstallFolder& aTarget, PRInt32 aFlags, PRInt32* aReturn);
-
-        void       LogComment(nsString& aComment);
-
-        PRInt32    ExtractFileFromJar(const nsString& aJarfile, nsFileSpec* aSuggestedName, nsFileSpec** aRealName);
-        char*      GetResourcedString(const nsString& aResName);
-        void       AddPatch(nsHashKey *aKey, nsFileSpec* fileName);
-        void       GetPatch(nsHashKey *aKey, nsFileSpec** fileName);
-        
-        void       GetJarFileLocation(nsString& aFile);
-        void       SetJarFileLocation(const nsFileSpec& aFile);
-
-        void       GetInstallArguments(nsString& args);
-        void       SetInstallArguments(const nsString& args);
-
-        void       GetInstallURL(nsString& url);
-        void       SetInstallURL(const nsString& url);
-
-        PRBool     GetStatusSent() { return mStatusSent; }
-        PRBool     InInstallTransaction(void) { return mInstalledFiles != nsnull; }
-        
-        PRInt32    Alert(nsString& string);
-        PRInt32    Confirm(nsString& string, PRBool* aReturn);
-        void       InternalAbort(PRInt32 errcode);
-
-        PRInt32    SaveError(PRInt32 errcode);
-
-    private:
-        JSObject*           mScriptObject;
-        
-        JSObject*           mWinRegObject;
-        JSObject*           mWinProfileObject;
-
-        
-        nsFileSpec          mJarFileLocation;
-        nsIZipReader*       mJarFileData;
-        
-        nsString            mInstallArguments;
-        nsString            mInstallURL;
-        nsInstallFolder*    mPackageFolder;
-
-        PRBool              mUserCancelled;
-        PRBool              mStatusSent;
-        
-        PRBool              mUninstallPackage;
-        PRBool              mRegisterPackage;
-        PRBool              mStartInstallCompleted;
-
-        nsString            mRegistryPackageName;   /* Name of the package we are installing */
-        nsString            mUIName;                /* User-readable package name */
-        nsInstallVersion*   mVersionInfo;           /* Component version info */
-        
-        nsVoidArray*        mInstalledFiles;        
-        nsHashtable*        mPatchList;
-        
-        nsIXPINotifier      *mNotifier;
-
-        nsCOMPtr<nsIStringBundle>   mStringBundle;
-
-        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);
-
-        void        CleanUp();
-
-        PRInt32     ExtractDirEntries(const nsString& directory, nsVoidArray *paths);
-
-        PRInt32     ScheduleForInstall(nsInstallObject* ob);
-
-        static void DeleteVector(nsVoidArray* vector);    
-};
-
-#endif

mozilla/xpinstall/src/nsInstallDelete.cpp

@@ -1,291 +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.1 (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.
- *
- * Contributor(s): 
- *     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"
-
-MOZ_DECL_CTOR_COUNTER(nsInstallDelete);
-
-nsInstallDelete::nsInstallDelete( nsInstall* inInstall,
-                                  nsInstallFolder* folderSpec,
-                                  const nsString& inPartialPath,
-                                  PRInt32 *error)
-
-: nsInstallObject(inInstall)
-{
-    MOZ_COUNT_CTOR(nsInstallDelete);
-
-    if ((folderSpec == nsnull) || (inInstall == nsnull)) 
-    {
-        *error = nsInstall::INVALID_ARGUMENTS;
-        return;
-    }
-    
-    mDeleteStatus = DELETE_FILE;
-    mFinalFile      = nsnull;
-    mRegistryName   = "";
-    
-    nsFileSpec* tmp = folderSpec->GetFileSpec();
-    if (!tmp)
-    {
-        *error = nsInstall::INVALID_ARGUMENTS;
-        return;
-    }
-
-    mFinalFile = new nsFileSpec(*tmp);
-    if (mFinalFile == nsnull)
-    {
-        *error = nsInstall::OUT_OF_MEMORY;
-        return;
-    }
-    
-    *mFinalFile += inPartialPath;
-
-    *error = ProcessInstallDelete();
-}
-
-nsInstallDelete::nsInstallDelete( nsInstall* inInstall,
-                                  const nsString& inComponentName,
-                                  PRInt32 *error)
-
-: nsInstallObject(inInstall)
-{
-    MOZ_COUNT_CTOR(nsInstallDelete);
-
-    if (inInstall == NULL) 
-    {
-        *error = nsInstall::INVALID_ARGUMENTS;
-        return;
-    }
-    
-    mDeleteStatus = DELETE_COMPONENT;
-    mFinalFile    = nsnull;
-    mRegistryName = inComponentName;
-
-    *error = ProcessInstallDelete();
-}
-
-
-nsInstallDelete::~nsInstallDelete()
-{
-    if (mFinalFile == nsnull)
-        delete mFinalFile;
-
-    MOZ_COUNT_DTOR(nsInstallDelete);
-}
-
-
-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();
-        if (temp)
-        {
-            err = VR_Remove(temp);
-            Recycle(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];
-    char* rsrcVal = nsnull;
-    
-    if (buffer == nsnull || !mInstall)
-        return nsnull;
-
-    if (mDeleteStatus == DELETE_COMPONENT)
-    {
-        char* temp = mRegistryName.ToNewCString();
-        rsrcVal = mInstall->GetResourcedString("DeleteComponent");
-
-        if (rsrcVal)
-        {
-            sprintf( buffer, rsrcVal, temp);
-            nsCRT::free(rsrcVal);
-        }
-        if (temp)
-            Recycle(temp);
-    }
-    else
-    {
-        if (mFinalFile)
-        {
-            rsrcVal = mInstall->GetResourcedString("DeleteComponent");
-
-            if (rsrcVal)
-            {
-                sprintf( buffer, rsrcVal, mFinalFile->GetCString());
-                nsCRT::free(rsrcVal);
-            }
-        }
-    }
-
-    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();
-        
-        if (tempCString == nsnull)
-                return nsInstall::OUT_OF_MEMORY;
-
-        err = VR_InRegistry( tempCString );
-                
-        if (err != REGERR_OK) 
-        {
-            return err;
-        } 
-        else 
-        {
-            char* tempRegistryString;
-
-            tempRegistryString = (char*)PR_Calloc(MAXREGPATHLEN, sizeof(char));
-            
-            if (tempRegistryString == nsnull)
-                return nsInstall::OUT_OF_MEMORY;
-
-            err = VR_GetPath( tempCString , MAXREGPATHLEN, tempRegistryString);
-            
-            if (err == REGERR_OK)
-            {
-                if (mFinalFile)
-                    delete mFinalFile;
-
-                mFinalFile = new nsFileSpec(tempRegistryString);
-                
-                if (mFinalFile == nsnull)
-                    return nsInstall::OUT_OF_MEMORY;
-                
-            }
-
-            PR_FREEIF(tempRegistryString);
-        }
-    }
-    
-    if(tempCString)
-        Recycle(tempCString);
-
-    if (mFinalFile->Exists())
-    {
-        if (mFinalFile->IsFile())
-        {
-            err = nsInstall::SUCCESS;
-        }
-        else
-        {
-            err = nsInstall::IS_DIRECTORY;
-        }
-    }
-    else
-    {
-        err = nsInstall::DOES_NOT_EXIST;
-    }
-
-    return err;
-}
-
-
-
-PRInt32 nsInstallDelete::NativeComplete()
-{
-    NS_WARN_IF_FALSE(mFinalFile->Exists(),"nsInstallDelete::Complete -- file should exist!");
-    if (mFinalFile->Exists())
-    {
-        if (mFinalFile->IsFile())
-        {
-           return DeleteFileNowOrSchedule(*mFinalFile);
-        }
-        else
-        {
-            NS_ASSERTION(0,"nsInstallDelete::Complete -- expected file was a directory!");
-            return nsInstall::IS_DIRECTORY;
-        }
-    }
-    
-    return nsInstall::DOES_NOT_EXIST;
-}
-

mozilla/xpinstall/src/nsInstallDelete.h

@@ -1,78 +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.1 (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.
- *
- * Contributor(s): 
- *     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,
-                          nsInstallFolder* 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

@@ -1,159 +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.1 (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.
- *
- * Contributor(s): 
- *     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"
-
-MOZ_DECL_CTOR_COUNTER(nsInstallExecute);
-
-nsInstallExecute:: nsInstallExecute(  nsInstall* inInstall,
-                                      const nsString& inJarLocation,
-                                      const nsString& inArgs,
-                                      PRInt32 *error)
-
-: nsInstallObject(inInstall)
-{
-    MOZ_COUNT_CTOR(nsInstallExecute);
-
-    if ((inInstall == nsnull) || (inJarLocation.Equals("")) )
-    {
-        *error = nsInstall::INVALID_ARGUMENTS;
-        return;
-    }
-
-    mJarLocation        = inJarLocation;
-    mArgs               = inArgs;
-    mExecutableFile     = nsnull;
-
-}
-
-
-nsInstallExecute::~nsInstallExecute()
-{
-    if (mExecutableFile)
-        delete mExecutableFile;
-
-    MOZ_COUNT_DTOR(nsInstallExecute);
-}
-
-
-
-PRInt32 nsInstallExecute::Prepare()
-{
-    if (mInstall == NULL || mJarLocation.Equals("")) 
-        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];
-    char* rsrcVal = nsnull;
-
-    if (buffer == nsnull || !mInstall)
-        return nsnull;
-
-    // if the FileSpec is NULL, just us the in jar file name.
-
-    if (mExecutableFile == nsnull)
-    {
-        char *tempString = mJarLocation.ToNewCString();
-        rsrcVal = mInstall->GetResourcedString("Execute");
-
-        if (rsrcVal)
-        {
-            sprintf( buffer, rsrcVal, tempString);
-            nsCRT::free(rsrcVal);
-        }
-        
-        if (tempString)
-            Recycle(tempString);
-    }
-    else
-    {
-        rsrcVal = mInstall->GetResourcedString("Execute");
-
-        if (rsrcVal)
-        {
-            sprintf( buffer, rsrcVal, mExecutableFile->GetCString());
-            nsCRT::free(rsrcVal);
-        }
-    }
-    return buffer;
-}
-
-
-PRBool
-nsInstallExecute::CanUninstall()
-{
-    return PR_FALSE;
-}
-
-PRBool
-nsInstallExecute::RegisterPackageNode()
-{
-    return PR_FALSE;
-}
-

mozilla/xpinstall/src/nsInstallExecute.h

@@ -1,73 +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.1 (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.
- *
- * Contributor(s): 
- *     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

@@ -1,452 +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.1 (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.
- *
- * Contributor(s): 
- *     Daniel Veditz <dveditz@netscape.com>
- *     Douglas Turner <dougt@netscape.com>
- */
-
-#include "prprf.h"
-#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
-*/
-
-MOZ_DECL_CTOR_COUNTER(nsInstallFile);
-
-nsInstallFile::nsInstallFile(nsInstall* inInstall,
-                             const nsString& inComponentName,
-                             const nsString& inVInfo,
-                             const nsString& inJarLocation,
-                             nsInstallFolder *folderSpec,
-                             const nsString& inPartialPath,
-                             PRInt32 mode,
-                             PRInt32 *error) 
-  : nsInstallObject(inInstall),
-    mVersionInfo(nsnull),
-    mJarLocation(nsnull),
-    mExtractedFile(nsnull),
-    mFinalFile(nsnull),
-    mVersionRegistryName(nsnull),
-    mReplaceFile(PR_FALSE),
-    mChildFile(PR_TRUE),
-    mUpgradeFile(PR_FALSE),
-    mSkipInstall(PR_FALSE),
-    mMode(mode)
-{
-    MOZ_COUNT_CTOR(nsInstallFile);
-
-    if ((folderSpec == nsnull) || (inInstall == NULL))
-    {
-        *error = nsInstall::INVALID_ARGUMENTS;
-        return;
-    }
-
-    *error = nsInstall::SUCCESS;
-    
-    /* Check for existence of the newer	version	*/
-#if 0 // XXX need to re-implement force mode in the opposite sense
-
-    char* qualifiedRegNameString = inComponentName.ToNewCString();
-
-    // --------------------------------------------------------------------
-    // we always install if forceInstall is true, or the new file's
-    // version is null, or the file doesn't previously exist.
-    //
-    // IFF it's not force, AND the new file has a version, AND it's been
-    // previously installed, THEN we have to do the version comparing foo.
-    // --------------------------------------------------------------------
-    if ( !(mode & INSTALL_NO_COMPARE ) && (inVInfo !=  "") && 
-          ( VR_ValidateComponent( qualifiedRegNameString ) == 0 ) ) 
-    {
-        nsInstallVersion *newVersion = new nsInstallVersion();
-        
-        if (newVersion == nsnull)
-        {
-            Recycle(qualifiedRegNameString);
-            *error = nsInstall::OUT_OF_MEMORY;
-            return;
-        }
-
-        newVersion->Init(inVInfo);
-        
-        VERSION versionStruct;
-        
-        VR_GetVersion( qualifiedRegNameString, &versionStruct );
-        
-        nsInstallVersion* oldVersion = new nsInstallVersion();
-        
-        if (oldVersion == nsnull)
-        {
-            Recycle(qualifiedRegNameString);
-            delete oldVersion;
-            *error = nsInstall::OUT_OF_MEMORY;
-            return;
-        }
-
-        oldVersion->Init(versionStruct.major,
-                         versionStruct.minor,
-                         versionStruct.release,
-                         versionStruct.build);
-
-        PRInt32 areTheyEqual;
-        newVersion->CompareTo(oldVersion, &areTheyEqual);
-        
-        delete oldVersion;
-        delete newVersion;
-
-        if ( areTheyEqual < 0 )
-        {
-            // the file to be installed is OLDER than what is on disk.
-            // Don't install it.
-            mSkipInstall = PR_TRUE;
-        }
-    }
-
-    Recycle(qualifiedRegNameString);
-#endif
-
-    nsFileSpec* tmp = folderSpec->GetFileSpec();
-    if (!tmp)
-    {
-        *error = nsInstall::INVALID_ARGUMENTS;
-        return;
-    }
-
-    mFinalFile = new nsFileSpec(*tmp);
-    if (mFinalFile == nsnull)
-    {
-        *error = nsInstall::OUT_OF_MEMORY;
-        return;
-    }
-
-    if ( mFinalFile->Exists() )
-    {
-        // is there a file with the same name as the proposed folder?
-        if ( mFinalFile->IsFile() ) 
-        {
-            *error = nsInstall::FILENAME_ALREADY_USED;
-            return;
-        }
-        // else this directory already exists, so do nothing
-    }
-    else
-    {
-        /* the nsFileSpecMac.cpp operator += requires "this" (the nsFileSpec)
-         * to be an existing dir
-         */
-        int dirPermissions = 0755; // std default for UNIX, ignored otherwise
-        mFinalFile->CreateDir(dirPermissions);
-    }
-
-    *mFinalFile += inPartialPath;
-    
-    mReplaceFile = mFinalFile->Exists();
-    
-    if (mReplaceFile == PR_FALSE)
-    {
-       /* although it appears that we are creating the dir _again_ it is necessary
-        * when inPartialPath has arbitrary levels of nested dirs before the leaf
-        */
-        nsFileSpec parent;
-        mFinalFile->GetParent(parent);
-        nsFileSpec makeDirs(parent.GetCString(), PR_TRUE);
-    }
-
-    mVersionRegistryName    = new nsString(inComponentName);
-    mJarLocation            = new nsString(inJarLocation);
-    mVersionInfo	        = new nsString(inVInfo);
-     
-    if (mVersionRegistryName == nsnull ||
-        mJarLocation         == nsnull ||
-        mVersionInfo         == nsnull )
-    {
-        *error = nsInstall::OUT_OF_MEMORY;
-        return;
-    }
-
-    nsString regPackageName;
-    mInstall->GetRegPackageName(regPackageName);
-    
-    // determine Child status
-    if ( regPackageName.IsEmpty() ) 
-    {
-        // in the "current communicator package" absolute pathnames (start
-        // with slash) indicate shared files -- all others are children
-        mChildFile = ( mVersionRegistryName->CharAt(0) != '/' );
-    } 
-    else 
-    {
-        mChildFile = mVersionRegistryName->Equals( regPackageName,
-                                                   PR_FALSE,
-                                                   regPackageName.Length() );
-    }
-}
-
-
-nsInstallFile::~nsInstallFile()
-{
-    if (mVersionRegistryName)
-        delete mVersionRegistryName;
-  
-    if (mJarLocation)
-        delete mJarLocation;
-  
-    if (mExtractedFile)
-        delete mExtractedFile;
-
-    if (mFinalFile)
-        delete mFinalFile;
-  
-    if (mVersionInfo)
-      delete mVersionInfo;
-
-    MOZ_COUNT_DTOR(nsInstallFile);
-}
-
-/* Prepare
- * Extracts file out of the JAR archive
- */
-PRInt32 nsInstallFile::Prepare()
-{
-    if (mSkipInstall)
-        return nsInstall::SUCCESS;
-
-    if (mInstall == nsnull || mFinalFile == nsnull || mJarLocation == nsnull )
-        return nsInstall::INVALID_ARGUMENTS;
-
-    return mInstall->ExtractFileFromJar(*mJarLocation, mFinalFile, &mExtractedFile);
-}
-
-/* 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;
-    }
-   
-    if (mSkipInstall)
-        return nsInstall::SUCCESS;
-
-    err = CompleteFileMove();
-    
-    if ( 0 == err || nsInstall::REBOOT_NEEDED == err ) 
-    {
-        // XXX Don't register individual files for now -- crucial performance
-        // speed up on the Mac, and we'll switch uninstall schemes after beta
-
-        // RegisterInVersionRegistry();
-    }
-    
-    return err;
-
-}
-
-void nsInstallFile::Abort()
-{
-    if (mExtractedFile != nsnull)
-        mExtractedFile->Delete(PR_FALSE);
-}
-
-#define RESBUFSIZE 1024
-char* nsInstallFile::toString()
-{
-    char* buffer = new char[RESBUFSIZE];
-    char* rsrcVal = nsnull;
-    const char* fname = nsnull;
-
-    if (buffer == nsnull || !mInstall)
-        return nsnull;
-    else
-        buffer[0] = '\0';
-    
-    if (mReplaceFile)
-    {
-        rsrcVal = mInstall->GetResourcedString("ReplaceFile");
-    }
-    else if (mSkipInstall)
-    {
-        rsrcVal = mInstall->GetResourcedString("SkipFile");
-    }
-    else
-    {
-        rsrcVal = mInstall->GetResourcedString("InstallFile");
-    }
-
-    if (rsrcVal)
-    {
-        if (mFinalFile)
-            fname = mFinalFile->GetCString();
-
-        PR_snprintf( buffer, RESBUFSIZE, rsrcVal, fname );
-
-        Recycle(rsrcVal);
-    }
-
-    return buffer;
-}
-
-
-PRInt32 nsInstallFile::CompleteFileMove()
-{
-    int result = 0;
-    
-    if (mExtractedFile == nsnull) 
-    {
-        return nsInstall::UNEXPECTED_ERROR;
-    }
-   	
-    if ( *mExtractedFile == *mFinalFile ) 
-    {
-        /* No need to rename, they are the same */
-        result = nsInstall::SUCCESS;
-    } 
-    else 
-    {
-        result = ReplaceFileNowOrSchedule(*mExtractedFile, *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.IsEmpty()) 
-        {
-            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.IsEmpty()) 
-        { 
-            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 PR_TRUE;
-}
-
-/* RegisterPackageNode
-* InstallFile() installs files which need to be registered,
-* hence this function returns true.
-*/
-PRBool
-nsInstallFile::RegisterPackageNode()
-{
-    return PR_TRUE;
-}

mozilla/xpinstall/src/nsInstallFile.h

@@ -1,105 +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.1 (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.
- *
- * Contributor(s): 
- *     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"
-
-
-/* Global defines for file handling mode bitfield values */
-#define INSTALL_NO_COMPARE        0x1
-#define INSTALL_IF_NEWER          0x2
-#define INSTALL_IF_EQUAL_OR_NEWER 0x4
-
-
-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,
-                        nsInstallFolder *folderSpec,
-                        const nsString& inPartialPath,
-                        PRInt32 mode,
-                        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*   mExtractedFile;	  /* 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 */
-        PRBool      mSkipInstall;    /* if true don't install this file */
-        
-        PRInt32    mMode;            /* an integer used like a bitfield to control *
-                                      * how a file is installed or registered      */
-
-        PRInt32     CompleteFileMove();
-        PRInt32     RegisterInVersionRegistry();
-    
-
-};
-
-#endif /* nsInstallFile_h__ */

mozilla/xpinstall/src/nsInstallFileOpEnums.h

@@ -1,42 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (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.org 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.
- *
- * Contributor(s): 
- */
-
-#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       = 8,
-  NS_FOP_MAC_ALIAS          = 9,
-  NS_FOP_UNIX_LINK          = 10,
-  NS_FOP_FILE_SET_STAT      = 11
-
-} nsInstallFileOpEnums;
-
-#endif /* nsInstallFileOpEnums_h__ */

mozilla/xpinstall/src/nsInstallFileOpItem.h

@@ -1,156 +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.1 (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.org 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.
- *
- * Contributor(s): 
- */
-
-#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 */
-    enum 
-    {
-      ACTION_NONE                 = -401,
-      ACTION_SUCCESS              = -402,
-      ACTION_FAILED               = -403
-    };
-
-
-    /* Public Methods */
-    // used by:
-    //   FileOpFileDelete()
-    nsInstallFileOpItem(nsInstall*    installObj,
-                        PRInt32       aCommand,
-                        nsFileSpec&   aTarget,
-                        PRInt32       aFlags,
-                        PRInt32*      aReturn);
-
-    // used by:
-    //   FileOpDirRemove()
-    //   FileOpFileCopy()
-    //   FileOpFileMove()
-    //   FileMacAlias()
-    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:
-    //   FileOpDirRename()
-    //   FileOpFileExecute()
-    //   FileOpFileRename()
-    nsInstallFileOpItem(nsInstall*    aInstallObj,
-                        PRInt32       aCommand,
-                        nsFileSpec&   a1,
-                        nsString&     a2,
-                        PRInt32*      aReturn);
-
-    // used by:
-    //   WindowsShortcut()
-    nsInstallFileOpItem(nsInstall*     aInstallObj,
-                        PRInt32        aCommand,
-                        nsFileSpec&    aTarget,
-                        nsFileSpec&    aShortcutPath,
-                        nsString&      aDescription,
-                        nsFileSpec&    aWorkingPath,
-                        nsString&      aParams,
-                        nsFileSpec&    aIcon,
-                        PRInt32        aIconId,
-                        PRInt32*       aReturn);
-
-    virtual ~nsInstallFileOpItem();
-
-    PRInt32       Prepare(void);
-    PRInt32       Complete();
-    char*         toString();
-    void          Abort();
-    
-  /* should these be protected? */
-    PRBool        CanUninstall();
-    PRBool        RegisterPackageNode();
-      
-  private:
-    
-    /* Private Fields */
-    
-    nsInstall*    mIObj;        // initiating Install object
-    nsFileSpec*   mSrc;
-    nsFileSpec*   mTarget;
-    nsFileSpec*   mShortcutPath;
-    nsFileSpec*   mWorkingPath;
-    nsFileSpec*   mIcon;
-    nsString*     mDescription;
-    nsString*     mStrTarget;
-    nsString*     mParams;
-    long          mFStat;
-    PRInt32       mFlags;
-    PRInt32       mIconId;
-    PRInt32       mCommand;
-    PRInt32       mAction;
-    
-    /* Private Methods */
-
-    PRInt32       NativeFileOpDirCreatePrepare();
-    PRInt32       NativeFileOpDirCreateAbort();
-    PRInt32       NativeFileOpDirRemovePrepare();
-    PRInt32       NativeFileOpDirRemoveComplete();
-    PRInt32       NativeFileOpDirRenamePrepare();
-    PRInt32       NativeFileOpDirRenameComplete();
-    PRInt32       NativeFileOpDirRenameAbort();
-    PRInt32       NativeFileOpFileCopyPrepare();
-    PRInt32       NativeFileOpFileCopyComplete();
-    PRInt32       NativeFileOpFileCopyAbort();
-    PRInt32       NativeFileOpFileDeletePrepare();
-    PRInt32       NativeFileOpFileDeleteComplete(nsFileSpec *aTarget);
-    PRInt32       NativeFileOpFileExecutePrepare();
-    PRInt32       NativeFileOpFileExecuteComplete();
-    PRInt32       NativeFileOpFileMovePrepare();
-    PRInt32       NativeFileOpFileMoveComplete();
-    PRInt32       NativeFileOpFileMoveAbort();
-    PRInt32       NativeFileOpFileRenamePrepare();
-    PRInt32       NativeFileOpFileRenameComplete();
-    PRInt32       NativeFileOpFileRenameAbort();
-    PRInt32       NativeFileOpWindowsShortcutComplete();
-    PRInt32       NativeFileOpWindowsShortcutAbort();
-    PRInt32       NativeFileOpMacAliasComplete();
-    PRInt32       NativeFileOpMacAliasAbort();
-    PRInt32       NativeFileOpUnixLink();
-
-};
-
-#endif /* nsInstallFileOpItem_h__ */
-

mozilla/xpinstall/src/nsInstallFolder.cpp

@@ -1,467 +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.1 (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.
- *
- * Contributor(s): 
- *     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 "nsIFileSpec.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  }
-};
-
-
-MOZ_DECL_CTOR_COUNTER(nsInstallFolder);
-
-nsInstallFolder::nsInstallFolder(const nsString& aFolderID)
-{
-    nsInstallFolder( aFolderID, "" );
-}
-
-nsInstallFolder::nsInstallFolder(const nsString& aFolderID, const nsString& aRelativePath)
-{
-    MOZ_COUNT_CTOR(nsInstallFolder);
-
-    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.  
-    */
-
-    SetDirectoryPath( aFolderID, aRelativePath );
-
-    // check to see if that worked
-    if ( !mFileSpec )
-    {
-        // it didn't, so aFolderID is not one of the magic strings.
-        // maybe it's already a pathname? If so it had better be a directory
-        // if it already exists...
-        nsFileSpec dirCheck(aFolderID);
-        if ( (dirCheck.Error() == NS_OK) && 
-             ( dirCheck.IsDirectory() || !dirCheck.Exists() ) )
-        {
-            mFileSpec = new nsFileSpec( dirCheck );
-
-            if (mFileSpec && aRelativePath.Length() > 0 )
-            {
-                // we've got a subdirectory to tack on
-                nsString morePath(aRelativePath);
-
-                if ( morePath.Last() != '/' || morePath.Last() != '\\' )
-                    morePath += '/';
-
-                *mFileSpec += morePath;
-            }
-
-            // make sure that the directory is created. 
-            // XXX: **why** are we creating these? they might not be used!
-            nsFileSpec(mFileSpec->GetCString(), PR_TRUE);
-        }
-    }
-}
-
-
-nsInstallFolder::nsInstallFolder(nsInstallFolder& inFolder, const nsString& subString)
-{
-    MOZ_COUNT_CTOR(nsInstallFolder);
-
-    mFileSpec = new nsFileSpec();
-    if (mFileSpec != nsnull)
-    {
-        *mFileSpec = *inFolder.mFileSpec;
-
-        if (!subString.IsEmpty())
-            *mFileSpec += subString;
-    }
-}
-
-
-nsInstallFolder::~nsInstallFolder()
-{
-    if (mFileSpec != nsnull)
-        delete mFileSpec;
-
-    MOZ_COUNT_DTOR(nsInstallFolder);
-}
-
-void 
-nsInstallFolder::GetDirectoryPath(nsString& aDirectoryPath)
-{
-	aDirectoryPath = "";
-    
-    if (mFileSpec != nsnull)
-    {
-        // We want the a NATIVE path.
-       aDirectoryPath.Assign(mFileSpec->GetCString());
-
-       if (mFileSpec->IsDirectory())
-       {
-          if (aDirectoryPath.Last() != FILESEP)
-              aDirectoryPath.Append(FILESEP);
-       }
-    }
-}
-
-void
-nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRelativePath)
-{
-    if ( aFolderID.EqualsIgnoreCase("User Pick") )
-    {
-        PickDefaultDirectory();
-        return;
-    }
-    else if ( aFolderID.EqualsIgnoreCase("Installed") )
-    {   
-        // XXX block from users or remove "Installed"
-        // XXX the filespec creation will fail due to unix slashes on Mac
-        mFileSpec = new nsFileSpec(aRelativePath, PR_TRUE);  // creates the directories to the relative path.
-        return;
-    }
-    else
-    {
-        nsresult rv = NS_OK;
-        PRInt32 folderDirSpecID = MapNameToEnum(aFolderID);
-        
-        switch (folderDirSpecID) 
-		{
-            case 100: ///////////////////////////////////////////////////////////  Plugins
-                if (!nsSoftwareUpdate::GetProgramDirectory())
-                {
-                    SetAppShellDirectory(nsSpecialFileSpec::App_PluginsDirectory );
-                }
-                else
-                {
-                    mFileSpec = new nsFileSpec();
-                    if ( !mFileSpec )
-                        rv = NS_ERROR_OUT_OF_MEMORY;
-                    else
-                        rv = nsSoftwareUpdate::GetProgramDirectory()->GetFileSpec(mFileSpec);
-
-                    if (NS_SUCCEEDED(rv))
-                    {
-#ifdef XP_MAC
-                        *mFileSpec += "Plugins";
-#else
-                        *mFileSpec += "plugins";
-#endif
-                    }
-                    else
-                        mFileSpec = nsnull;
-                }
-                break; 
-
-            case 101: ///////////////////////////////////////////////////////////  Program
-            case 102: ///////////////////////////////////////////////////////////  Communicator
-                if (!nsSoftwareUpdate::GetProgramDirectory())
-                    mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::OS_CurrentProcessDirectory ));
-                else
-                {
-                    mFileSpec = new nsFileSpec();
-                    if ( !mFileSpec )
-                        rv = NS_ERROR_OUT_OF_MEMORY;
-                    else
-                        rv = nsSoftwareUpdate::GetProgramDirectory()->GetFileSpec(mFileSpec);
-
-                    if (!NS_SUCCEEDED(rv))
-                        mFileSpec = nsnull;
-                }
-                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
-                {
-                    if (aRelativePath.IsEmpty())
-                    {
-                        mFileSpec = nsnull;
-                        return;
-                    }
-
-                    nsString tempFileURLString = aFolderID;
-                    tempFileURLString += aRelativePath;
-                    mFileSpec = new nsFileSpec( nsFileURL(tempFileURLString) );
-
-                    // file:// is a special case where it returns and does not
-                    // go to the standard relative path code below.  This is
-                    // so that nsFile(Spec|Path) will work properly.  (ie. Passing
-                    // just "file://" to the nsFileSpec && nsFileURL is wrong).
-
-                    return;
-
-                }
-                break;
-
-            case 110: ///////////////////////////////////////////////////////////  Components
-                if (!nsSoftwareUpdate::GetProgramDirectory())
-                    SetAppShellDirectory(nsSpecialFileSpec::App_ComponentsDirectory );
-                else
-                {
-                    mFileSpec = new nsFileSpec();
-                    if ( !mFileSpec )
-                        rv = NS_ERROR_OUT_OF_MEMORY;
-                    else
-                        rv = nsSoftwareUpdate::GetProgramDirectory()->GetFileSpec(mFileSpec);
-
-                    if (NS_SUCCEEDED(rv))
-                    {
-#ifdef XP_MAC
-                        *mFileSpec += "Components";
-#else
-                        *mFileSpec += "components";
-#endif
-                    }
-                }
-                break;
-            
-            case 111: ///////////////////////////////////////////////////////////  Chrome
-                if (!nsSoftwareUpdate::GetProgramDirectory())
-                    SetAppShellDirectory(nsSpecialFileSpec::App_ChromeDirectory );
-                else
-                {
-                    mFileSpec = new nsFileSpec();
-                    if ( !mFileSpec )
-                        rv = NS_ERROR_OUT_OF_MEMORY;
-                    else
-                        rv = nsSoftwareUpdate::GetProgramDirectory()->GetFileSpec(mFileSpec);
-
-                    if (NS_SUCCEEDED(rv))
-                    {
-#ifdef XP_MAC
-                        *mFileSpec += "Chrome";
-#else
-                        *mFileSpec += "chrome";
-#endif
-                    }
-                }
-                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_ShutdownDirectory ));
-                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;
-		}
-
-        if (aRelativePath.Length() > 0 && mFileSpec)
-        {
-            nsString tempPath(aRelativePath);
-
-            if (aRelativePath.Last() != '/' || aRelativePath.Last() != '\\')
-                tempPath += '/';
-
-            *mFileSpec += tempPath;
-        }
-    }
-}
-
-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.Equals(""))
-        return -1;
-
-	while ( DirectoryTable[i].directoryName[0] != 0 )
-	{
-		if ( name.EqualsIgnoreCase(DirectoryTable[i].directoryName) )
-			return DirectoryTable[i].folderEnum;
-		i++;
-	}
-	return -1;
-}
-
-void
-nsInstallFolder::SetAppShellDirectory(PRUint32 value)
-{
-    nsIFileSpec* fs = NS_LocateFileOrDirectory(value);
-    if ( fs )
-    {
-        mFileSpec = new nsFileSpec();
-        fs->GetFileSpec(mFileSpec);
-	    NS_RELEASE(fs);
-    }
-}
-
-nsFileSpec*
-nsInstallFolder::GetFileSpec()
-{
-  if (mFileSpec == nsnull)
-    return nsnull;
-  return mFileSpec;
-}
-
-PRInt32
-nsInstallFolder::ToString(nsAutoString* outString)
-{
-  //XXX: May need to fix. Native charset paths will be converted into Unicode when the get to JS
-  //     This will appear to work on Latin-1 charsets but won't work on Mac or other charsets.
-
-  *outString = mFileSpec->GetCString();
-  return NS_OK;
-}

mozilla/xpinstall/src/nsInstallFolder.h

@@ -1,61 +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.1 (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.
- *
- * Contributor(s): 
- *     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(nsInstallFolder& inFolder, const nsString& subString);
-       nsInstallFolder(const nsString& aFolderID, const nsString& aRelativePath);
-       virtual ~nsInstallFolder();
-
-       void GetDirectoryPath(nsString& aDirectoryPath);
-       nsFileSpec* GetFileSpec();
-       PRInt32 ToString(nsAutoString* outString);
-       
-    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

@@ -1,57 +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.1 (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.org 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.
- *
- * Contributor(s): 
- */
-
-#ifndef nsInstallObject_h__
-#define nsInstallObject_h__
-
-#include "prtypes.h"
-
-class nsInstall;
-
-class nsInstallObject 
-{
-    public:
-        /* Public Methods */
-        nsInstallObject(nsInstall* inInstall) {mInstall = inInstall; }
-        virtual ~nsInstallObject() {}
-
-        /* 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.h

@@ -1,83 +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.1 (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.org 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.
- *
- * Contributor(s): 
- */
-
-#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,
-                        nsInstallFolder* 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

@@ -1,364 +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.1 (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.
- *
- * Contributor(s): 
- *     Douglas Turner <dougt@netscape.com>
- *     Pierre Phaneuf <pp@ludusdesign.com>
- */
-
-
-#include "nsIXPINotifier.h"
-#include "nsInstallProgressDialog.h"
-
-#include "nsIAppShellComponentImpl.h"
-
-
-#include "nsIDOMWindow.h"
-#include "nsIServiceManager.h"
-#include "nsIDocumentViewer.h"
-#include "nsIContent.h"
-#include "nsINameSpaceManager.h"
-#include "nsIContentViewer.h"
-#include "nsIDOMElement.h"
-#include "nsNetUtil.h"
-#include "nsIURL.h"
-#include "nsIWebShell.h"
-#include "nsIWebShellWindow.h"
-#include "nsPIXPIManagerCallbacks.h"
-
-static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
-static NS_DEFINE_IID( kAppShellServiceCID, NS_APPSHELL_SERVICE_CID );
-
-static NS_DEFINE_CID(kDialogParamBlockCID, NS_DialogParamBlock_CID);
-
-nsInstallProgressDialog::nsInstallProgressDialog(nsPIXPIManagerCallbacks *aManager)
-  : mManager(aManager)
-{
-    NS_INIT_ISUPPORTS();
-}
-
-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(NS_GET_IID(nsIXPINotifier))) {
-    *aInstancePtr = (void*) ((nsIXPINotifier*)this);
-    NS_ADDREF_THIS();
-    return NS_OK;
-  }
-  if (aIID.Equals(NS_GET_IID(nsIXPIProgressDlg))) {
-    *aInstancePtr = (void*) ((nsIXPIProgressDlg*)this);
-    NS_ADDREF_THIS();
-    return NS_OK;
-  }
-  if (aIID.Equals(kISupportsIID)) {
-    *aInstancePtr = (void*) (nsISupports*)((nsIXPINotifier*)this);
-    NS_ADDREF_THIS();
-    return NS_OK;
-  }
-
-  return NS_ERROR_NO_INTERFACE;
-}
-
-NS_IMETHODIMP 
-nsInstallProgressDialog::BeforeJavascriptEvaluation(const PRUnichar *URL)
-{
-    return NS_OK;
-}
-
-NS_IMETHODIMP 
-nsInstallProgressDialog::AfterJavascriptEvaluation(const PRUnichar *URL)
-{
-    return NS_OK;
-}
-
-NS_IMETHODIMP 
-nsInstallProgressDialog::InstallStarted(const PRUnichar *URL, const PRUnichar *UIPackageName)
-{
-    return SetHeading( UIPackageName );
-}
-
-NS_IMETHODIMP 
-nsInstallProgressDialog::ItemScheduled(const PRUnichar *message)
-{
-    return SetActionText( message );
-}
-
-NS_IMETHODIMP 
-nsInstallProgressDialog::FinalizeProgress(const PRUnichar *message, PRInt32 itemNum, PRInt32 totNum)
-{
-
-    nsresult rv = SetActionText( message );
-
-    if (NS_SUCCEEDED(rv))
-        rv = SetProgress( itemNum, totNum, 'n' );
-    
-    return rv;
-}
-
-NS_IMETHODIMP 
-nsInstallProgressDialog::FinalStatus(const PRUnichar *URL, PRInt32 status)
-{
-    return NS_OK;
-}
-
-
-NS_IMETHODIMP 
-nsInstallProgressDialog::LogComment(const PRUnichar* comment)
-{
-    return NS_OK;
-}
-
-
-
-NS_IMETHODIMP
-nsInstallProgressDialog::Open(nsIDialogParamBlock* ioParamBlock)
-{
-    nsresult rv = NS_OK;
-    
-    // Now do the stuff to create a window and pass the JS args to it.
-    NS_WITH_SERVICE(nsIAppShellService, appShell, kAppShellServiceCID, &rv );
-    if ( NS_SUCCEEDED( rv ) ) 
-    {
-        nsCOMPtr<nsIDOMWindow> hiddenWindow;
-        JSContext* jsContext;
-        rv = appShell->GetHiddenWindowAndJSContext( getter_AddRefs(hiddenWindow), &jsContext);
-        if (NS_SUCCEEDED(rv))
-        {
-            nsCOMPtr<nsPIXPIManagerCallbacks> mgr = do_QueryInterface(mManager);
-
-            void* stackPtr;
-            jsval *argv = JS_PushArguments( jsContext,
-                                            &stackPtr,
-                                            "sss%ip%ip",
-                                            "chrome://xpinstall/content/xpistatus.xul",
-                                            "_blank",
-                                            "chrome",
-                                            (const nsIID*)&NS_GET_IID(nsIDialogParamBlock),
-                                            (nsISupports*)ioParamBlock,
-                                            (const nsIID*)&NS_GET_IID(nsPIXPIManagerCallbacks),
-                                            (nsISupports*)mgr
-                                            );
-            if (argv)
-            {
-                rv = hiddenWindow->OpenDialog( jsContext,
-                                               argv,
-                                               5,
-                                               getter_AddRefs( mWindow ));
-            }
-
-            JS_PopArguments( jsContext, stackPtr);  
-        }
-        
-    }
-    return rv;
-}
-
-
-NS_IMETHODIMP
-nsInstallProgressDialog::Close()
-{
-    mWindow->Close();
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsInstallProgressDialog::SetTitle(const PRUnichar * aTitle)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsInstallProgressDialog::SetHeading(const PRUnichar * aHeading)
-{
-    return setDlgAttribute( "dialog.uiPackageName", "value", nsString(aHeading) );
-}
-
-NS_IMETHODIMP
-nsInstallProgressDialog::SetActionText(const PRUnichar * aActionText)
-{
-    const PRInt32 maxChars = 50;
-
-    nsString theMessage(aActionText);
-    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);
-    }
-
-    return setDlgAttribute( "dialog.currentAction", "value", theMessage );
-}
-
-NS_IMETHODIMP
-nsInstallProgressDialog::SetProgress(PRInt32 aValue, PRInt32 aMax, char mode)
-{
-    char buf[16];
-    static char modeFlag = 'n';
-    nsresult rv;
-    static PRInt32 previousMax;
-
-    //First check to see if the max value changed so we don't
-    //have to send a max value across the proxy every time.
-    if ( aMax != previousMax)
-    {
-        previousMax = aMax;
-
-        PR_snprintf( buf, sizeof buf, "%lu", aMax );
-        rv = setDlgAttribute( "dialog.progress", "max", buf );
-    }
-    
-    //I use this modeFlag business so I don't have to send
-    //progressmeter mode information across the proxy every time.
-    if ( mode != modeFlag )
-    {
-        modeFlag = mode;
-        if ( modeFlag == 'n' )
-            rv = setDlgAttribute( "dialog.progress", "mode", "normal");
-        else
-            rv = setDlgAttribute( "dialog.progress", "mode", "undetermined");
-    }
-
-    if ( NS_SUCCEEDED(rv))
-    {
-        if (aMax != 0)
-            PR_snprintf( buf, sizeof buf, "%lu", 100 * aValue/aMax );
-        else
-            PR_snprintf( buf, sizeof buf, "%lu", 0 );
-
-        rv = setDlgAttribute( "dialog.progress", "value", buf );
-    }
-    return rv;
-}
-
-NS_IMETHODIMP
-nsInstallProgressDialog::StartInstallPhase()
-{
-    nsresult rv = NS_OK;
-
-    // don't care if this fails
-    setDlgAttribute("dialog.cancel", "disabled", nsString("true"));
-
-    return rv;
-}
-
-NS_IMETHODIMP
-nsInstallProgressDialog::GetCancelStatus(PRBool *_retval)
-{
-    *_retval = PR_FALSE;
-    return NS_OK;
-}
-
-// Utility to set element attribute.
-nsresult nsInstallProgressDialog::setDlgAttribute( const char *id,
-                                                   const char *name,
-                                                   const nsString &value )
-{
-    nsresult rv = NS_OK;
-
-    if (!mDocument)
-    {
-        nsCOMPtr<nsIDOMDocument> doc;
-        rv = mWindow->GetDocument( getter_AddRefs(doc) );
-        if (NS_SUCCEEDED(rv))
-        {
-            mDocument = do_QueryInterface(doc,&rv);
-        }
-        NS_WARN_IF_FALSE(rv == NS_OK,"couldn't get nsIDOMXULDocument from nsXPIProgressDlg");
-    }
-
-    if ( mDocument ) {
-        // Find specified element.
-        nsCOMPtr<nsIDOMElement> elem;
-        rv = mDocument->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.
-nsresult nsInstallProgressDialog::getDlgAttribute(  const char *id,
-                                                    const char *name,
-                                                    nsString &value ) 
-{
-    nsresult rv = NS_OK;
-
-    if (!mDocument)
-    {
-        nsCOMPtr<nsIDOMDocument> doc;
-        rv = mWindow->GetDocument( getter_AddRefs(doc) );
-        if (NS_SUCCEEDED(rv))
-        {
-            mDocument = do_QueryInterface(doc,&rv);
-        }
-        NS_WARN_IF_FALSE(rv == NS_OK,"couldn't get nsIDOMXULDocument from nsXPIProgressDlg");
-    }
-
-    if ( mDocument ) {
-        // Find specified element.
-        nsCOMPtr<nsIDOMElement> elem;
-        rv = mDocument->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: GetAttribute 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;
-}

mozilla/xpinstall/src/nsInstallProgressDialog.h

@@ -1,72 +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.1 (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.
- *
- * Contributor(s): 
- *     Douglas Turner <dougt@netscape.com>
- */
-#ifndef __nsInstallProgressDialog_h__
-#define __nsInstallProgressDialog_h__
-
-#include "nscore.h"
-#include "nsIXPINotifier.h"
-#include "nsIXPIProgressDlg.h"
-#include "nsISupports.h"
-#include "nsISupportsUtils.h"
-
-#include "nsCOMPtr.h"
-
-#include "nsIWebShell.h"
-#include "nsIWebShellWindow.h"
-#include "nsPIXPIManagerCallbacks.h"    
-
-#include "nsIDocument.h"
-#include "nsIDOMWindow.h"
-#include "nsIDOMDocument.h"
-#include "nsIDOMXULDocument.h"
-
-
-class nsInstallProgressDialog : public nsIXPINotifier,
-                                public nsIXPIProgressDlg
-{
-    public: 
-
-        nsInstallProgressDialog(nsPIXPIManagerCallbacks *aManager);
-        virtual ~nsInstallProgressDialog();
-        
-        NS_DECL_ISUPPORTS
-
-        // implement nsIXPINotifier
-        NS_DECL_NSIXPINOTIFIER
-
-        // implement nsIXPIProgressDlg
-        NS_DECL_NSIXPIPROGRESSDLG
-
-//        void SetWindow(nsISupports* aWindow);
-
-    protected:
-        nsresult setDlgAttribute(const char *id, const char *name, const nsString &value);
-        nsresult getDlgAttribute(const char *id, const char *name, nsString &value);
-
-    private:
-        nsPIXPIManagerCallbacks*       mManager;
-        nsCOMPtr<nsIDOMXULDocument>    mDocument;   // Should this be a weak reference?
-        nsCOMPtr<nsIDOMWindow>         mWindow;     // Should this be a weak reference?
-};
-#endif

mozilla/xpinstall/src/nsInstallResources.cpp

@@ -1,83 +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.1 (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.
- *
- * Contributor(s): 
- *     Daniel Veditz <dveditz@netscape.com>
- *     Douglas Turner <dougt@netscape.com>
- *     Samir Gehani <sgehani@netscape.com>
- */
-
-#include <string.h>
-#include "nscore.h"
-#include "nsInstallResources.h"
-
-static nsXPIResourceTableItem XPIResTable[] = 
-{
-    /*---------------------------------------------------------------------*
-     *   Install Actions 
-     *---------------------------------------------------------------------*/
-    { "InstallFile",        "Installing: %s" },
-    { "ReplaceFile",        "Replacing: %s" },
-    { "SkipFile",           "Skipping: %s" },
-    { "DeleteFile",         "Deleting file: %s" },
-    { "DeleteComponent",    "Deleting component: %s" },
-    { "Execute",            "Executing: %s" },
-    { "ExecuteWithArgs",    "Executing: %s with argument: %s" },
-    { "Patch",              "Patching: %s" },
-    { "Uninstall",          "Uninstalling: %s" },
-
-    // XXX FileOp*() action strings
-    // XXX WinReg and WinProfile action strings
-
-    /*---------------------------------------------------------------------*
-     *   Dialog Messages 
-     *---------------------------------------------------------------------*/
-    { "FinishingInstallMsg", "Finishing install... please wait." },
-
-    /*---------------------------------------------------------------------*
-     *    Miscellaneous 
-     *---------------------------------------------------------------------*/
-    { "ERROR", "ERROR" },
-
-    { NS_XPI_EOT, "" }
-};
-
-char* 
-nsInstallResources::GetDefaultVal(const char* aResName)
-{
-    char    *currResName = XPIResTable[0].resName;
-    char    *currResVal = nsnull;
-    PRInt32 idx, len = 0;
-
-    for (idx = 0; 0 != strcmp(currResName, NS_XPI_EOT); idx++)
-    {
-        currResName = XPIResTable[idx].resName;
-        len = strlen(currResName);
-
-        if (0 == strncmp(currResName, aResName, len))
-        {
-            currResVal = XPIResTable[idx].defaultString;
-            break;
-        }
-    }
-
-    return currResVal;
-}
-

mozilla/xpinstall/src/nsInstallResources.h

@@ -1,48 +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.1 (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.
- *
- * Contributor(s): 
- *     Daniel Veditz <dveditz@netscape.com>
- *     Douglas Turner <dougt@netscape.com>
- *     Samir Gehani <sgehani@netscape.com>
- */
-
-
-#ifndef __NS_INSTALLRESOURCES_H__
-#define __NS_INSTALLRESOURCES_H__
-
-#define NS_XPI_EOT "___END_OF_TABLE___"
-
-typedef struct _nsXPIResourceTableItem
-{
-    char *resName;
-    char *defaultString;
-} nsXPIResourceTableItem;
-
-
-class nsInstallResources
-{
-    public:
-        
-       static char* GetDefaultVal(const char* aResName);
-};
-
-
-#endif

mozilla/xpinstall/src/nsInstallTrigger.cpp

@@ -1,489 +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.1 (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.
- *
- * Contributor(s): 
- */
-
-#include "nsSoftwareUpdate.h"
-#include "nsXPInstallManager.h"
-#include "nsInstallTrigger.h"
-#include "nsInstallVersion.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"
-
-#include "VerReg.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*) XPINSTALL_ENABLE_PREF, aReturn);
-
-        if (NS_FAILED(rv))
-        {
-            *aReturn = PR_FALSE;
-        }
-
-        NS_RELEASE(prefs);
-    }
-    else
-    {
-        *aReturn = PR_FALSE;  /* no prefs manager.  set to false */
-    }
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsInstallTrigger::Install(nsXPITriggerInfo* aTrigger, PRBool* aReturn)
-{
-    nsresult rv;
-    *aReturn = PR_FALSE;
-
-    PRBool enabled;
-    UpdateEnabled(&enabled);
-    if (!enabled) 
-    {
-        delete aTrigger;
-        return NS_OK;
-    }
-
-    nsXPInstallManager *mgr = new nsXPInstallManager();
-    if (mgr)
-    {
-        // The Install manager will delete itself when done
-        rv = mgr->InitManager( aTrigger );
-        if (NS_SUCCEEDED(rv))
-            *aReturn = PR_TRUE;
-    }
-    else
-    {
-        delete aTrigger;
-        rv = NS_ERROR_OUT_OF_MEMORY;
-    }
-
-
-    return rv;
-}
-
-
-NS_IMETHODIMP    
-nsInstallTrigger::StartSoftwareUpdate(const nsString& aURL, PRInt32 aFlags, PRBool* aReturn)
-{
-    PRBool enabled;
-    nsresult rv = NS_ERROR_OUT_OF_MEMORY;
-    *aReturn = PR_FALSE;
-
-    UpdateEnabled(&enabled);
-    if (!enabled)
-        return NS_OK;
-
-    // The Install manager will delete itself when done, once we've called
-    // InitManager. Before then **WE** must delete it
-    nsXPInstallManager *mgr = new nsXPInstallManager();
-    if (mgr)
-    {
-        nsXPITriggerInfo* trigger = new nsXPITriggerInfo();
-        if ( trigger )
-        {
-            nsXPITriggerItem* item = new nsXPITriggerItem(0,aURL.GetUnicode());
-            if (item)
-            {
-                trigger->Add( item );
-                // The Install manager will delete itself when done
-                rv = mgr->InitManager( trigger );
-                *aReturn = PR_TRUE;
-            }
-            else
-            {
-                rv = NS_ERROR_OUT_OF_MEMORY;
-                delete trigger;
-                delete mgr;
-            }
-        }
-        else
-        {
-            rv = NS_ERROR_OUT_OF_MEMORY;
-            delete mgr;
-        }
-    }
-
-    return rv;
-}
-
-NS_IMETHODIMP    
-nsInstallTrigger::ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, PRInt32 aDiffLevel, const nsString& aVersion, PRInt32 aMode, PRInt32* aReturn)
-{
-    nsInstallVersion inVersion;
-    inVersion.Init(aVersion);
-    return ConditionalSoftwareUpdate(aURL, aRegName, aDiffLevel, &inVersion, aMode, aReturn);
-}
-
-NS_IMETHODIMP    
-nsInstallTrigger::ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, PRInt32 aDiffLevel, nsIDOMInstallVersion* aVersion, PRInt32 aMode, PRInt32* aReturn)
-{
-    PRBool needJar = PR_FALSE;
-
-    PRBool enabled;
-
-    UpdateEnabled(&enabled);
-    if (!enabled)
-        return NS_OK;
-
-    if (aURL.IsEmpty() || aVersion == nsnull)
-    {
-        needJar = PR_TRUE;
-    }
-    else
-    {
-        char * regNameCString = aRegName.ToNewCString();
-
-        REGERR status = VR_ValidateComponent( regNameCString );
-        
-        if ( status == REGERR_NOFIND || status == REGERR_NOFILE )
-        {
-            // either component is not in the registry or it's a file
-            // node and the physical file is missing
-            needJar = PR_TRUE;
-        }
-        else
-        {
-            VERSION oldVersion;
-            PRInt32 diffValue;
-
-            status = VR_GetVersion( regNameCString, &oldVersion );
-            nsInstallVersion oldInstallVersion;
-
-            oldInstallVersion.Init(oldVersion.major, 
-                                oldVersion.minor, 
-                                oldVersion.release, 
-                                oldVersion.build);
-
-
-            if ( status != REGERR_OK )
-                needJar = PR_TRUE;
-            else if ( aDiffLevel < 0 )
-            {
-                aVersion->CompareTo(&oldInstallVersion, &diffValue); 
-                needJar = (diffValue <= aDiffLevel);
-            }
-            else
-            {
-                aVersion->CompareTo(&oldInstallVersion, &diffValue);
-                needJar = (diffValue >= aDiffLevel);
-            }
-        }
-    }
-
-    if (needJar)
-        return StartSoftwareUpdate(aURL, aMode, aReturn);
-    else
-        *aReturn = 0;
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP    
-nsInstallTrigger::ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, nsIDOMInstallVersion* aVersion, PRInt32 aMode, PRInt32* aReturn)
-{
-    return ConditionalSoftwareUpdate(aURL, aRegName, BLD_DIFF, aVersion, aMode, aReturn);
-}
-
-NS_IMETHODIMP    
-nsInstallTrigger::ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, const nsString& aVersion, PRInt32 aMode, PRInt32* aReturn)
-{
-    nsInstallVersion inVersion;
-    inVersion.Init(aVersion);
-    return ConditionalSoftwareUpdate(aURL, aRegName, BLD_DIFF, &inVersion, aMode, aReturn);
-}
-
-NS_IMETHODIMP    
-nsInstallTrigger::ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, const nsString& aVersion, PRInt32* aReturn)
-{
-    nsInstallVersion inVersion;
-    inVersion.Init(aVersion);;
-    return ConditionalSoftwareUpdate(aURL, aRegName, BLD_DIFF, &inVersion, 0, aReturn);
-}
-
-NS_IMETHODIMP    
-nsInstallTrigger::ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, nsIDOMInstallVersion* aVersion, PRInt32* aReturn)
-{
-    return ConditionalSoftwareUpdate(aURL, aRegName, BLD_DIFF, aVersion, 0, aReturn);
-}
-
-NS_IMETHODIMP    
-nsInstallTrigger::CompareVersion(const nsString& aRegName, PRInt32 aMajor, PRInt32 aMinor, PRInt32 aRelease, PRInt32 aBuild, PRInt32* aReturn)
-{
-    nsInstallVersion inVersion;
-    inVersion.Init(aMajor, aMinor, aRelease, aBuild);
-
-    return CompareVersion(aRegName, &inVersion, aReturn);
-}
-
-NS_IMETHODIMP    
-nsInstallTrigger::CompareVersion(const nsString& aRegName, const nsString& aVersion, PRInt32* aReturn)
-{
-    nsInstallVersion inVersion;
-    inVersion.Init(aVersion);
-
-    return CompareVersion(aRegName, &inVersion, aReturn);
-}
-
-NS_IMETHODIMP    
-nsInstallTrigger::CompareVersion(const nsString& aRegName, nsIDOMInstallVersion* aVersion, PRInt32* aReturn)
-{
-    *aReturn = EQUAL;  // assume failure.
-
-    PRBool enabled;
-
-    UpdateEnabled(&enabled);
-    if (!enabled)
-        return NS_OK;
-
-    VERSION              cVersion;
-    char*                tempCString;
-    REGERR               status;
-    nsInstallVersion     regNameVersion;
-    
-    tempCString = aRegName.ToNewCString();
-
-    status = VR_GetVersion( tempCString, &cVersion );
-
-    /* if we got the version */
-    if ( status == REGERR_OK ) 
-    {
-        if ( VR_ValidateComponent( tempCString ) == REGERR_NOFILE ) 
-        {
-            regNameVersion.Init(0,0,0,0);
-        }
-        else
-        {
-            regNameVersion.Init(cVersion.major, 
-                                cVersion.minor, 
-                                cVersion.release, 
-                                cVersion.build);
-        }
-    }
-    else
-        regNameVersion.Init(0,0,0,0);
-        
-    regNameVersion.CompareTo( aVersion, aReturn );
-
-    if (tempCString)
-        Recycle(tempCString);
-    
-    return NS_OK;
-}
-
-NS_IMETHODIMP    
-nsInstallTrigger::GetVersion(const nsString& component, nsString& version)
-{
-    PRBool enabled;
-
-    UpdateEnabled(&enabled);
-    if (!enabled)
-        return NS_OK;
-
-    VERSION              cVersion;
-    char*                tempCString;
-    REGERR               status;
-    
-    tempCString = component.ToNewCString();
-
-    status = VR_GetVersion( tempCString, &cVersion );
-
-    version.Truncate();
-
-    /* if we got the version */
-    if ( status == REGERR_OK && VR_ValidateComponent( tempCString ) == REGERR_OK) 
-    {
-        nsInstallVersion regNameVersion;
-        
-        regNameVersion.Init(cVersion.major, 
-                            cVersion.minor, 
-                            cVersion.release, 
-                            cVersion.build);
-
-        regNameVersion.ToString(version);
-    }
-    
-    if (tempCString)
-         Recycle(tempCString);
-
-    return NS_OK;
-}
-
-
-// this will take a nsIURI, 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:/", 6) )
-    {       
-        tempFileString.Assign( nsNSPRPath(nsFileURL(aURL)) );
-    }
-    else
-    {
-        nsSpecialSystemDirectory tempFile(nsSpecialSystemDirectory::OS_TemporaryDirectory);
-    
-        PRInt32 result = aURL.RFindChar('/');
-        if (result != -1)
-        {    
-            nsString jarName;
-                       
-            aURL.Right(jarName, (aURL.Length() - result) );
-            
-            PRInt32 argOffset = jarName.RFindChar('?');
-
-            if (argOffset != -1)
-            {
-                // we need to remove ? and everything after it
-                jarName.Truncate(argOffset);
-            }
-            
-            
-            tempFile += jarName;
-        }
-        else
-        {   
-            tempFile += "xpinstall.jar";
-        }
-
-        tempFile.MakeUnique();
-
-        tempFileString.Assign( nsNSPRPath( nsFilePath(tempFile) ) );
-    }
-}
-
-

mozilla/xpinstall/src/nsInstallTrigger.h

@@ -1,55 +0,0 @@
-#ifndef __NS_INSTALLTRIGGER_H__
-#define __NS_INSTALLTRIGGER_H__
-
-#include "nscore.h"
-#include "nsString.h"
-#include "nsIFactory.h"
-#include "nsISupports.h"
-#include "nsIScriptObjectOwner.h"
-
-#include "prtypes.h"
-#include "nsHashtable.h"
-
-#include "nsIDOMInstallTriggerGlobal.h"
-#include "nsSoftwareUpdate.h"
-#include "nsXPITriggerInfo.h"
-
-
-
-
-class nsInstallTrigger: public nsIScriptObjectOwner, public nsIDOMInstallTriggerGlobal
-{
-    public:
-        static const nsIID& IID() { static nsIID iid = NS_SoftwareUpdateInstallTrigger_CID; return iid; }
-
-        nsInstallTrigger();
-        virtual ~nsInstallTrigger();
-        
-        NS_DECL_ISUPPORTS
-
-        NS_IMETHOD    GetScriptObject(nsIScriptContext *aContext, void** aScriptObject);
-        NS_IMETHOD    SetScriptObject(void* aScriptObject);
-
-        NS_IMETHOD    UpdateEnabled(PRBool* aReturn);
-        NS_IMETHOD    Install(nsXPITriggerInfo *aInfo, PRBool* aReturn);
-        NS_IMETHOD    StartSoftwareUpdate(const nsString& aURL, PRInt32 aFlags, 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);
-        NS_IMETHOD    GetVersion(const nsString& component, nsString& version);
-
-        
-    private:
-        void *mScriptObject;
-        void CreateTempFileFromURL(const nsString& aURL, nsString& tempFileString);
-
-};
-
-#define NS_INSTALLTRIGGERCOMPONENT_PROGID NS_IXPINSTALLCOMPONENT_PROGID "/installtrigger"
-#endif

mozilla/xpinstall/src/nsInstallUninstall.cpp

@@ -1,216 +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.1 (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.
- *
- * Contributor(s): 
- *     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);
-
-MOZ_DECL_CTOR_COUNTER(nsInstallUninstall);
-
-nsInstallUninstall::nsInstallUninstall( nsInstall* inInstall,
-                                        const nsString& regName,
-                                        PRInt32 *error)
-
-: nsInstallObject(inInstall)
-{
-    MOZ_COUNT_CTOR(nsInstallUninstall);
-
-    if (regName.Equals("")) 
-    {
-        *error = nsInstall::INVALID_ARGUMENTS;
-        return;
-    }
-    
-    mRegName.Assign(regName);
-
-    char* userName = (char*)PR_Malloc(MAXREGPATHLEN);
-    PRInt32 err = VR_GetUninstallUserName( (char*) (const char*) nsAutoCString(regName), 
-                                           userName, 
-                                           MAXREGPATHLEN );
-    
-    mUIName.Assign(userName);
-    
-    if (err != REGERR_OK)
-    {
-        *error = nsInstall::NO_SUCH_COMPONENT;
-    }
-    
-    PR_FREEIF(userName);
-    
-}
-
-nsInstallUninstall::~nsInstallUninstall()
-{
-    MOZ_COUNT_CTOR(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* rsrcVal = nsnull;
-
-    if (buffer == nsnull || !mInstall)
-        return buffer;
-    
-    char* temp = mUIName.ToNewCString();
-    
-    if (temp)
-    {
-        rsrcVal = mInstall->GetResourcedString("Uninstall");
-
-        if (rsrcVal)
-        {
-            sprintf( buffer, rsrcVal, temp);
-            nsCRT::free(rsrcVal);
-        }
-    }
-
-    if (temp)
-         Recycle(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

@@ -1,63 +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.1 (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.
- *
- * Contributor(s): 
- *     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

@@ -1,341 +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.1 (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.
- *
- * Contributor(s): 
- */
-
-#include "nsSoftwareUpdate.h"
-
-#include "nsInstallVersion.h"
-#include "nsIDOMInstallVersion.h"
-
-#include "nscore.h"
-#include "nsIFactory.h"
-#include "nsISupports.h"
-#include "nsIScriptGlobalObject.h"
-
-#include "prprf.h"
-#include "prmem.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& aString, PRInt32* aReturn)
-{
-    nsInstallVersion inVersion;
-    inVersion.Init(aString);
-
-    return CompareTo(&inVersion, aReturn);
-}
-
-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.Assign(result);
-
-    PR_FREEIF(result);
-
-    return NS_OK;
-}
-
-
-nsresult
-nsInstallVersion::StringToVersionNumbers(const nsString& version, PRInt32 *aMajor, PRInt32 *aMinor, PRInt32 *aRelease, PRInt32 *aBuild)    
-{
-    PRInt32 errorCode;
-
-    int dot = version.FindChar('.', PR_FALSE,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.FindChar('.',PR_FALSE,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.FindChar('.',PR_FALSE,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;
-}
-

mozilla/xpinstall/src/nsInstallVersion.h

@@ -1,60 +0,0 @@
-#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;
-};
-
-
-#define NS_INSTALLVERSIONCOMPONENT_PROGID NS_IXPINSTALLCOMPONENT_PROGID "/installversion"
-#endif

mozilla/xpinstall/src/nsJSFile.h

@@ -1,93 +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.1 (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.org 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.
- *
- * Contributor(s): 
- */
-
-#ifndef __NS_JSFILE_H__
-#define __NS_JSFILE_H__
-
-#include "jsapi.h"
-#include "nsJSUtils.h"
-#include "nscore.h"
-
-
-JSBool PR_CALLBACK
-InstallFileOpDirCreate(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpDirGetParent(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpDirRemove(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpDirRename(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpFileCopy(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpFileDelete(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpFileExists(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpFileExecute(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpFileGetNativeVersion(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpFileGetDiskSpaceAvailable(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpFileGetModDate(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpFileGetSize(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpFileIsDirectory(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpFileIsFile(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpFileModDateChanged(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpFileMove(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpFileRename(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpFileWindowsShortcut(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpFileMacAlias(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpFileUnixLink(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-PRInt32 InitXPFileOpObjectPrototype(JSContext *jscontext, JSObject *global, JSObject **fileOpObjectPrototype);
-
-#endif

mozilla/xpinstall/src/nsJSFileSpecObj.cpp

@@ -1,150 +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.
- */
-
-#include "jsapi.h"
-#include "nsJSUtils.h"
-#include "nscore.h"
-#include "nsIScriptContext.h"
-
-#include "nsString.h"
-#include "nsInstall.h"
-#include "nsJSFileSpecObj.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);
-
-
-
-/***********************************************************************************/
-// Native methods for FileSpecObj functions
-
-/*
- * Native method fso_ToString
- */
-PR_STATIC_CALLBACK(JSBool)
-fso_ToString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-
-  nsInstallFolder *nativeThis = (nsInstallFolder*)JS_GetPrivate(cx, obj);
-  nsAutoString stringReturned;
-
-  *rval = JSVAL_NULL;
-
-  // If there's no private data, this must be the prototype, so ignore
-  if(nsnull == nativeThis)
-  {
-    return JS_TRUE;
-  }
-
-    if(NS_OK != nativeThis->ToString(&stringReturned))
-      return JS_FALSE;
-    nsJSUtils::nsConvertStringToJSVal(stringReturned, cx, rval);
-
-  return JS_TRUE;
-}
-
-
-/*
- * Native method fso_AppendString
- */
-PR_STATIC_CALLBACK(JSBool)
-fso_AppendPath(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  return JS_TRUE;
-}
-
-
-/*
- * FileSpecObj destructor
- */
-static void PR_CALLBACK FileSpecObjectCleanup(JSContext *cx, JSObject *obj)
-{
-    nsInstallFolder *nativeThis = (nsInstallFolder*)JS_GetPrivate(cx, obj);
-    if (nativeThis != nsnull)
-       delete nativeThis;
-}
-
-/***********************************************************************/
-//
-// class for FileObj
-//
-JSClass FileSpecObjectClass = {
-  "FileSpecObject",
-  JSCLASS_HAS_PRIVATE,
-  JS_PropertyStub,
-  JS_PropertyStub,
-  JS_PropertyStub,
-  JS_PropertyStub,
-  JS_EnumerateStub,
-  JS_ResolveStub,
-  JS_ConvertStub,
-  FileSpecObjectCleanup
-};
-
-
-//
-// FileObj class methods
-//
-static JSFunctionSpec fileSpecObjMethods[] = 
-{
-  {"appendPath",       fso_AppendPath,     1},
-  {"toString",         fso_ToString,       0},
-  {0}
-};
-
-
-PRInt32  InitFileSpecObjectPrototype(JSContext *jscontext, 
-                                      JSObject *global, 
-                                      JSObject **fileSpecObjectPrototype)
-{
-  *fileSpecObjectPrototype  = JS_InitClass( jscontext,         // context
-                                            global,            // global object
-                                            nsnull,            // parent proto 
-                                            &FileSpecObjectClass, // JSClass
-                                            nsnull,            // JSNative ctor
-                                            0,                 // ctor args
-                                            nsnull,            // proto props
-                                            fileSpecObjMethods,// proto funcs
-                                            nsnull,            // ctor props (static)
-                                            nsnull);           // ctor funcs (static)
-
-  if (nsnull == *fileSpecObjectPrototype) 
-  {
-      return NS_ERROR_FAILURE;
-  }
-
- 
-  return NS_OK;
-}
-
-

mozilla/xpinstall/src/nsJSInstallTriggerGlobal.cpp

@@ -1,719 +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.1 (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.org 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.
- *
- * Contributor(s): 
- */
-
-#include "jsapi.h"
-#include "nsJSUtils.h"
-#include "nscore.h"
-#include "nsIScriptContext.h"
-#include "nsIJSScriptObject.h"
-#include "nsIScriptObjectOwner.h"
-#include "nsIScriptGlobalObject.h"
-#include "nsCRT.h"
-#include "nsString.h"
-#include "nsIDOMInstallVersion.h"
-#include "nsIDOMInstallTriggerGlobal.h"
-#include "nsXPITriggerInfo.h"
-
-#include "nsRepository.h"
-
-#include "nsSoftwareUpdateIIDs.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);
-
-//
-// InstallTriggerGlobal finalizer
-//
-PR_STATIC_CALLBACK(void)
-FinalizeInstallTriggerGlobal(JSContext *cx, JSObject *obj)
-{
-  nsJSUtils::nsGenericFinalize(cx, obj);
-}
-
-static NS_DEFINE_IID(kIDOMInstallTriggerIID, NS_IDOMINSTALLTRIGGERGLOBAL_IID);
-static NS_DEFINE_IID(kInstallTrigger_CID, NS_SoftwareUpdateInstallTrigger_CID);
-
-static JSBool CreateNativeObject(JSContext *cx, JSObject *obj, nsIDOMInstallTriggerGlobal **aResult)
-{
-    nsresult result;
-    nsIScriptObjectOwner *owner = nsnull;
-    nsIDOMInstallTriggerGlobal *nativeThis;
-
-    result = nsRepository::CreateInstance(kInstallTrigger_CID,
-                                        nsnull,
-                                        kIDOMInstallTriggerIID,
-                                        (void **)&nativeThis);
-
-    if (NS_OK != result) return JS_FALSE;
-    
-    result = nativeThis->QueryInterface(kIScriptObjectOwnerIID, (void **)&owner);
-
-    if (NS_OK != result) 
-    {
-        NS_RELEASE(nativeThis);
-        return JS_FALSE;
-    }
-
-    owner->SetScriptObject((void *)obj);
-    JS_SetPrivate(cx, obj, nativeThis);
-    
-    *aResult = nativeThis;
-    
-    NS_RELEASE(nativeThis);  // we only want one refcnt. JSUtils cleans us up.
-    return JS_TRUE;
-}
-
-//
-// 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);
-  PRBool nativeRet;
-
-  *rval = JSVAL_NULL;
-
-  if (nsnull == nativeThis  &&  (JS_FALSE == CreateNativeObject(cx, obj, &nativeThis)) )
-    return JS_FALSE;
-
-  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 Install
-//
-PR_STATIC_CALLBACK(JSBool)
-InstallTriggerGlobalInstall(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsIDOMInstallTriggerGlobal *nativeThis = (nsIDOMInstallTriggerGlobal*)JS_GetPrivate(cx, obj);
-
-  *rval = JSVAL_FALSE;
-
-  if (nsnull == nativeThis  &&  (JS_FALSE == CreateNativeObject(cx, obj, &nativeThis)) )
-    return JS_FALSE;
-
-
-  // make sure XPInstall is enabled, return false if not
-  PRBool enabled = PR_FALSE;
-  nativeThis->UpdateEnabled(&enabled);
-  if (!enabled)
-      return JS_TRUE;
-
-
-  // get window.location to construct relative URLs
-  nsString baseURL;
-  JSObject* global = JS_GetGlobalObject(cx);
-  if (global)
-  {
-    jsval v;
-    if (JS_GetProperty(cx,global,"location",&v))
-    {
-      ConvertJSValToStr( baseURL, cx, v );
-      PRInt32 lastslash = baseURL.RFindChar('/');
-      if (lastslash != kNotFound)
-      {
-        baseURL.Truncate(lastslash+1);
-      }
-    }
-  }
-
-  
-  // parse associative array of installs
-  if ( argc >= 1 && JSVAL_IS_OBJECT(argv[0]) )
-  {
-    nsXPITriggerInfo *trigger = new nsXPITriggerInfo();
-    if (!trigger)
-      return JS_FALSE;
-
-    JSIdArray *ida = JS_Enumerate( cx, JSVAL_TO_OBJECT(argv[0]) );
-    if ( ida ) 
-    {
-      jsval v;
-      PRUnichar *name, *URL;
-
-      for (int i = 0; i < ida->length; i++ )
-      {
-        JS_IdToValue( cx, ida->vector[i], &v );
-        name = JS_GetStringChars( JS_ValueToString( cx, v ) );
-
-        JS_GetUCProperty( cx, JSVAL_TO_OBJECT(argv[0]), name, nsCRT::strlen(name), &v );
-        URL = JS_GetStringChars( JS_ValueToString( cx, v ) );
-
-        if ( name && URL )
-        {
-            nsXPITriggerItem *item = new nsXPITriggerItem( name, URL );
-            if ( item )
-            {
-                if ( item->IsRelativeURL() )
-                {
-                  item->mURL.Insert( baseURL, 0 );
-                }
-                trigger->Add( item );
-            }
-            else
-                ; // XXX signal error somehow
-        }
-        else
-            ; // XXX need to signal error
-      }
-      JS_DestroyIdArray( cx, ida );
-    }
-
-
-    // save callback function if any (ignore bad args for now)
-    if ( argc >= 2 && JS_TypeOfValue(cx,argv[1]) == JSTYPE_FUNCTION )
-    {
-      trigger->SaveCallback( cx, argv[1] );
-    }
-
-
-    // pass on only if good stuff found
-    if (trigger->Size() > 0)
-    {
-        PRBool result;
-        nativeThis->Install(trigger,&result);
-        *rval = BOOLEAN_TO_JSVAL(result);
-        return JS_TRUE;
-    }
-    else
-        delete trigger;
-  }
-
-  JS_ReportError(cx, "Incorrect arguments to InstallTrigger.Install()");
-  return JS_FALSE;
-}
-
-//
-// 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);
-  PRBool       nativeRet;
-  nsAutoString b0;
-  PRInt32      b1 = 0;
-
-  *rval = JSVAL_FALSE;
-
-  if (nsnull == nativeThis  &&  (JS_FALSE == CreateNativeObject(cx, obj, &nativeThis)) )
-    return JS_FALSE;
-
-  if ( argc >= 1 )
-  {
-    ConvertJSValToStr(b0, cx, argv[0]);
-
-    if (argc >= 2 && !JS_ValueToInt32(cx, argv[1], (int32 *)&b1))
-    {
-        JS_ReportError(cx, "StartSoftwareUpdate() 2nd parameter must be a number");
-        return JS_FALSE;
-    }
-
-    if(NS_OK != nativeThis->StartSoftwareUpdate(b0, b1, &nativeRet))
-    {
-      return JS_FALSE;
-    }
-    *rval = BOOLEAN_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);
-  PRInt32 nativeRet;
-  nsAutoString b0;
-  nsAutoString b1;
-  nsAutoString b2str;
-  PRInt32      b2int;
-  nsAutoString b3str;
-  PRInt32      b3int;
-  PRInt32      b4;
-
-  *rval = JSVAL_NULL;
-
-  if (nsnull == nativeThis  &&  (JS_FALSE == CreateNativeObject(cx, obj, &nativeThis)) )
-    return JS_FALSE;
-
-  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);
-  PRInt32 nativeRet;
-  nsAutoString regname;
-  nsAutoString version;
-  int32        major,minor,release,build;
-
-  *rval = JSVAL_NULL;
-
-  if (nsnull == nativeThis  &&  (JS_FALSE == CreateNativeObject(cx, obj, &nativeThis)) )
-    return JS_FALSE;
-
-  if (argc < 2 )
-  {
-    JS_ReportError(cx, "CompareVersion requires at least 2 parameters");
-    return JS_FALSE;
-  }
-  else if ( !JSVAL_IS_STRING(argv[0]) )
-  {
-    JS_ReportError(cx, "Invalid parameter passed to CompareVersion");
-    return JS_FALSE;
-  }
-
-  // get the registry name argument
-  ConvertJSValToStr(regname, cx, argv[0]);
-
-  if (argc == 2 )
-  {
-    //  public int CompareVersion(String registryName, String version)
-    //  --OR-- CompareVersion(String registryNamve, InstallVersion version)
-
-    ConvertJSValToStr(version, cx, argv[1]);
-    if(NS_OK != nativeThis->CompareVersion(regname, version, &nativeRet))
-    {
-          return JS_FALSE;
-    }
-  }
-  else
-  {
-    //  public int CompareVersion(String registryName,
-    //                            int    major,
-    //                            int    minor,
-    //                            int    release,
-    //                            int    build);
-    //
-    //  minor, release, and build values are optional
-
-    major = minor = release = build = 0;
-
-    if(!JS_ValueToInt32(cx, argv[1], &major))
-    {
-      JS_ReportError(cx, "2th parameter must be a number");
-      return JS_FALSE;
-    }
-    if( argc > 2 && !JS_ValueToInt32(cx, argv[2], &minor) )
-    {
-      JS_ReportError(cx, "3th parameter must be a number");
-      return JS_FALSE;
-    }
-    if( argc > 3 && !JS_ValueToInt32(cx, argv[3], &release) )
-    {
-      JS_ReportError(cx, "4th parameter must be a number");
-      return JS_FALSE;
-    }
-    if( argc > 4 && !JS_ValueToInt32(cx, argv[4], &build) )
-    {
-      JS_ReportError(cx, "5th parameter must be a number");
-      return JS_FALSE;
-    }
-
-    if(NS_OK != nativeThis->CompareVersion(regname, major, minor, release, build, &nativeRet))
-    {
-      return JS_FALSE;
-    }
-  }
-
-  *rval = INT_TO_JSVAL(nativeRet);
-  return JS_TRUE;
-}
-
-//
-// Native method GetVersion
-//
-PR_STATIC_CALLBACK(JSBool)
-InstallTriggerGlobalGetVersion(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsIDOMInstallTriggerGlobal *nativeThis = (nsIDOMInstallTriggerGlobal*)JS_GetPrivate(cx, obj);
-  
-  nsAutoString regname;
-  nsAutoString version;
-
-  *rval = JSVAL_NULL;
-
-  if (nsnull == nativeThis  &&  (JS_FALSE == CreateNativeObject(cx, obj, &nativeThis)) )
-    return JS_FALSE;
-
-  // get the registry name argument
-  ConvertJSValToStr(regname, cx, argv[0]);
-
-  if(NS_OK != nativeThis->GetVersion(regname, version))
-  {
-        return JS_FALSE;
-  }
-  
-  if(version.Equals(""))
-      *rval = JSVAL_NULL;
-    else
-      ConvertStrToJSVal(version, cx, rval);
-
-  return JS_TRUE;
-}
-
-/***********************************************************************/
-//
-// class for InstallTriggerGlobal
-//
-JSClass InstallTriggerGlobalClass = {
-  "InstallTrigger", 
-  JSCLASS_HAS_PRIVATE,
-  JS_PropertyStub,
-  JS_PropertyStub,
-  JS_PropertyStub,
-  JS_PropertyStub,
-  JS_EnumerateStub,
-  JS_ResolveStub,
-  JS_ConvertStub,
-  FinalizeInstallTriggerGlobal
-};
-
-//
-// InstallTriggerGlobal class methods
-//
-static JSFunctionSpec InstallTriggerGlobalMethods[] = 
-{
-  {"UpdateEnabled",             InstallTriggerGlobalUpdateEnabled,             0},
-  {"Install",                   InstallTriggerGlobalInstall,                   2},
-  {"StartSoftwareUpdate",       InstallTriggerGlobalStartSoftwareUpdate,       2},
-  {"ConditionalSoftwareUpdate", InstallTriggerGlobalConditionalSoftwareUpdate, 5},
-  {"CompareVersion",            InstallTriggerGlobalCompareVersion,            5},
-  {"GetVersion",                InstallTriggerGlobalGetVersion,                2},
-  // -- new forms to match JS style --
-  {"updateEnabled",             InstallTriggerGlobalUpdateEnabled,             0},
-  {"install",                   InstallTriggerGlobalInstall,                   2},
-  {"startSoftwareUpdate",       InstallTriggerGlobalStartSoftwareUpdate,       2},
-  {"conditionalSoftwareUpdate", InstallTriggerGlobalConditionalSoftwareUpdate, 5},
-  {"compareVersion",            InstallTriggerGlobalCompareVersion,            5},
-  {"getVersion",                InstallTriggerGlobalGetVersion,                2},
-  {0}
-};
-
-
-static JSConstDoubleSpec diff_constants[] = 
-{
-    { nsIDOMInstallTriggerGlobal::MAJOR_DIFF,    "MAJOR_DIFF" },
-    { nsIDOMInstallTriggerGlobal::MINOR_DIFF,    "MINOR_DIFF" },
-    { nsIDOMInstallTriggerGlobal::REL_DIFF,      "REL_DIFF"   },
-    { nsIDOMInstallTriggerGlobal::BLD_DIFF,      "BLD_DIFF"   },
-    { nsIDOMInstallTriggerGlobal::EQUAL,         "EQUAL"      },
-    {0}
-};
-
-
-
-nsresult InitInstallTriggerGlobalClass(JSContext *jscontext, JSObject *global, void** prototype)
-{
-  JSObject *proto = nsnull;
-  
-  if (prototype != nsnull)
-    *prototype = nsnull;
-
-    proto = JS_InitClass(jscontext,                       // context
-                         global,                          // global object
-                         nsnull,                          // parent proto 
-                         &InstallTriggerGlobalClass,      // JSClass
-                         nsnull,                          // JSNative ctor
-                         nsnull,                          // ctor args
-                         nsnull,                          // proto props
-                         nsnull,                          // proto funcs
-                         nsnull,                          // ctor props (static)
-                         InstallTriggerGlobalMethods);    // ctor funcs (static)
-    
-    
-    if (nsnull == proto) return NS_ERROR_FAILURE;
-    
-    if ( PR_FALSE == JS_DefineConstDoubles(jscontext, proto, diff_constants) )
-            return NS_ERROR_FAILURE;
-
-    if (prototype != nsnull)
-      *prototype = proto;
-  
-  return NS_OK;
-}
-
-
-
-//
-// InstallTriggerGlobal class initialization
-//
-nsresult NS_InitInstallTriggerGlobalClass(nsIScriptContext *aContext, void **aPrototype)
-{
-  JSContext *jscontext = (JSContext *)aContext->GetNativeContext();
-  JSObject *proto = nsnull;
-  JSObject *constructor = 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)) 
-  {
-    nsresult rv = InitInstallTriggerGlobalClass(jscontext, global, (void**)&proto);
-    if (NS_FAILED(rv)) return rv;
-  }
-  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;
-}

mozilla/xpinstall/src/nsJSInstallVersion.cpp

@@ -1,651 +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.1 (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.org 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.
- *
- * Contributor(s): 
- */
-/* 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 "nsString.h"
-#include "nsIDOMInstallVersion.h"
-#include "nsIScriptNameSpaceManager.h"
-#include "nsRepository.h"
-#include "nsDOMCID.h"
-
-#include "nsSoftwareUpdateIIDs.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);
-
-void ConvertJSvalToVersionString(nsString& versionString, JSContext* cx, jsval* argument);
-
-
-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(kIInstallVersionIID, NS_IDOMINSTALLVERSION_IID);
-
-//
-// InstallVersion property ids
-//
-enum InstallVersion_slots {
-  INSTALLVERSION_MAJOR = -1,
-  INSTALLVERSION_MINOR = -2,
-  INSTALLVERSION_RELEASE = -3,
-  INSTALLVERSION_BUILD = -4
-};
-
-/***********************************************************************/
-//
-// InstallVersion Properties Getter
-//
-PR_STATIC_CALLBACK(JSBool)
-GetInstallVersionProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
-{
-  nsIDOMInstallVersion *a = (nsIDOMInstallVersion*)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 INSTALLVERSION_MAJOR:
-      {
-        PRInt32 prop;
-        if (NS_OK == a->GetMajor(&prop)) {
-          *vp = INT_TO_JSVAL(prop);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case INSTALLVERSION_MINOR:
-      {
-        PRInt32 prop;
-        if (NS_OK == a->GetMinor(&prop)) {
-          *vp = INT_TO_JSVAL(prop);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case INSTALLVERSION_RELEASE:
-      {
-        PRInt32 prop;
-        if (NS_OK == a->GetRelease(&prop)) {
-          *vp = INT_TO_JSVAL(prop);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case INSTALLVERSION_BUILD:
-      {
-        PRInt32 prop;
-        if (NS_OK == a->GetBuild(&prop)) {
-          *vp = INT_TO_JSVAL(prop);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      default:
-        return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, obj, id, vp);
-    }
-  }
-  else {
-    return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, obj, id, vp);
-  }
-
-  return PR_TRUE;
-}
-
-/***********************************************************************/
-//
-// InstallVersion Properties Setter
-//
-PR_STATIC_CALLBACK(JSBool)
-SetInstallVersionProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
-{
-  nsIDOMInstallVersion *a = (nsIDOMInstallVersion*)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 INSTALLVERSION_MAJOR:
-      {
-        PRInt32 prop;
-        int32 temp;
-        if (JSVAL_IS_NUMBER(*vp) && JS_ValueToInt32(cx, *vp, &temp)) {
-          prop = (PRInt32)temp;
-        }
-        else {
-          JS_ReportError(cx, "Parameter must be a number");
-          return JS_FALSE;
-        }
-      
-        a->SetMajor(prop);
-        
-        break;
-      }
-      case INSTALLVERSION_MINOR:
-      {
-        PRInt32 prop;
-        int32 temp;
-        if (JSVAL_IS_NUMBER(*vp) && JS_ValueToInt32(cx, *vp, &temp)) {
-          prop = (PRInt32)temp;
-        }
-        else {
-          JS_ReportError(cx, "Parameter must be a number");
-          return JS_FALSE;
-        }
-      
-        a->SetMinor(prop);
-        
-        break;
-      }
-      case INSTALLVERSION_RELEASE:
-      {
-        PRInt32 prop;
-        int32 temp;
-        if (JSVAL_IS_NUMBER(*vp) && JS_ValueToInt32(cx, *vp, &temp)) {
-          prop = (PRInt32)temp;
-        }
-        else {
-          JS_ReportError(cx, "Parameter must be a number");
-          return JS_FALSE;
-        }
-      
-        a->SetRelease(prop);
-        
-        break;
-      }
-      case INSTALLVERSION_BUILD:
-      {
-        PRInt32 prop;
-        int32 temp;
-        if (JSVAL_IS_NUMBER(*vp) && JS_ValueToInt32(cx, *vp, &temp)) {
-          prop = (PRInt32)temp;
-        }
-        else {
-          JS_ReportError(cx, "Parameter must be a number");
-          return JS_FALSE;
-        }
-      
-        a->SetBuild(prop);
-        
-        break;
-      }
-      default:
-        return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, obj, id, vp);
-    }
-  }
-  else {
-    return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, obj, id, vp);
-  }
-
-  return PR_TRUE;
-}
-
-
-//
-// InstallVersion finalizer
-//
-PR_STATIC_CALLBACK(void)
-FinalizeInstallVersion(JSContext *cx, JSObject *obj)
-{
-  nsJSUtils::nsGenericFinalize(cx, obj);
-}
-
-
-//
-// InstallVersion enumerate
-//
-PR_STATIC_CALLBACK(JSBool)
-EnumerateInstallVersion(JSContext *cx, JSObject *obj)
-{
-  return nsJSUtils::nsGenericEnumerate(cx, obj);
-}
-
-
-//
-// InstallVersion resolve
-//
-PR_STATIC_CALLBACK(JSBool)
-ResolveInstallVersion(JSContext *cx, JSObject *obj, jsval id)
-{
-  return nsJSUtils::nsGenericResolve(cx, obj, id);
-}
-
-
-//
-// Native method Init
-//
-PR_STATIC_CALLBACK(JSBool)
-InstallVersionInit(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsIDOMInstallVersion *nativeThis = (nsIDOMInstallVersion*)JS_GetPrivate(cx, obj);
-  nsAutoString b0;
-
-  *rval = JSVAL_NULL;
-
-  // If there's no private data, this must be the prototype, so ignore
-  if (nsnull == nativeThis) {
-    return JS_TRUE;
-  }
-
-  if (argc == 1) 
-  {
-      nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]);
-  }
-  else 
-  {
-      b0 = "0.0.0.0";
-  }
-    
-  if (NS_OK != nativeThis->Init(b0)) 
-        return JS_FALSE;
-  
-  *rval = JSVAL_VOID;
-
-  return JS_TRUE;
-}
-
-
-//
-// Native method ToString
-//
-PR_STATIC_CALLBACK(JSBool)
-InstallVersionToString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsIDOMInstallVersion *nativeThis = (nsIDOMInstallVersion*)JS_GetPrivate(cx, obj);
-  nsAutoString 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->ToString(nativeRet)) {
-      return JS_FALSE;
-    }
-
-    nsJSUtils::nsConvertStringToJSVal(nativeRet, cx, rval);
-  }
-  else {
-    JS_ReportError(cx, "Function toString requires 0 parameters");
-    return JS_FALSE;
-  }
-
-  return JS_TRUE;
-}
-
-
-//
-// Native method CompareTo
-//
-PR_STATIC_CALLBACK(JSBool)
-InstallVersionCompareTo(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsIDOMInstallVersion *nativeThis = (nsIDOMInstallVersion*)JS_GetPrivate(cx, obj);
-  PRInt32                 nativeRet;
-  nsString                b0str;
-  PRInt32                 b0int;
-  PRInt32                 b1int;
-  PRInt32                 b2int;
-  PRInt32                 b3int;
-
-  *rval = JSVAL_NULL;
-
-  // If there's no private data, this must be the prototype, so ignore
-  if (nsnull == nativeThis) {
-    return JS_TRUE;
-  }
-
-  if(argc >= 4)
-  {
-    //  public int CompareTo(int    major,
-    //                       int    minor,
-    //                       int    release,
-    //                       int    build);
-
-    if(!JSVAL_IS_INT(argv[0]))
-    {
-        JS_ReportError(cx, "1st parameter must be a number");
-        return JS_FALSE;
-    }
-    else if(!JSVAL_IS_INT(argv[1]))
-    {
-        JS_ReportError(cx, "2nd parameter must be a number");
-        return JS_FALSE;
-    }
-    else if(!JSVAL_IS_INT(argv[2]))
-    {
-        JS_ReportError(cx, "3rd parameter must be a number");
-        return JS_FALSE;
-    }
-    else if(!JSVAL_IS_INT(argv[3]))
-    {
-        JS_ReportError(cx, "4th parameter must be a number");
-        return JS_FALSE;
-    }
-
-    b0int = JSVAL_TO_INT(argv[0]);
-    b1int = JSVAL_TO_INT(argv[1]);
-    b2int = JSVAL_TO_INT(argv[2]);
-    b3int = JSVAL_TO_INT(argv[3]);
-
-    if(NS_OK != nativeThis->CompareTo(b0int, b1int, b2int, b3int, &nativeRet))
-    {
-      return JS_FALSE;
-    }
-
-    *rval = INT_TO_JSVAL(nativeRet);
-  }
-  else if(argc >= 1)
-  {
-     //   public int AddDirectory(String version);  --OR--  VersionInfo version
-
-    if(JSVAL_IS_OBJECT(argv[0]))
-    {
-        nsCOMPtr<nsIDOMInstallVersion> versionObj;
-
-        if(JS_FALSE == ConvertJSValToObj(getter_AddRefs(versionObj),
-                                         kIInstallVersionIID,
-                                         "InstallVersion",
-                                         cx,
-                                         argv[0]))
-        {
-          return JS_FALSE;
-        }
-
-        if(NS_OK != nativeThis->CompareTo(versionObj, &nativeRet))
-        {
-          return JS_FALSE;
-        }
-    }
-    else
-    {
-        ConvertJSValToStr(b0str, cx, argv[0]);
-
-        if(NS_OK != nativeThis->CompareTo(b0str, &nativeRet))
-        {
-          return JS_FALSE;
-        }
-    }
-
-    *rval = INT_TO_JSVAL(nativeRet);
-  }
-  else
-  {
-    JS_ReportError(cx, "Function compareTo requires 4 parameters");
-    return JS_FALSE;
-  }
-
-  return JS_TRUE;
-}
-
-
-/***********************************************************************/
-//
-// class for InstallVersion
-//
-JSClass InstallVersionClass = {
-  "InstallVersion", 
-  JSCLASS_HAS_PRIVATE,
-  JS_PropertyStub,
-  JS_PropertyStub,
-  GetInstallVersionProperty,
-  SetInstallVersionProperty,
-  EnumerateInstallVersion,
-  ResolveInstallVersion,
-  JS_ConvertStub,
-  FinalizeInstallVersion
-};
-
-
-//
-// InstallVersion class properties
-//
-static JSPropertySpec InstallVersionProperties[] =
-{
-  {"major",    INSTALLVERSION_MAJOR,    JSPROP_ENUMERATE},
-  {"minor",    INSTALLVERSION_MINOR,    JSPROP_ENUMERATE},
-  {"release",  INSTALLVERSION_RELEASE,  JSPROP_ENUMERATE},
-  {"build",    INSTALLVERSION_BUILD,    JSPROP_ENUMERATE},
-  {0}
-};
-
-
-//
-// InstallVersion class methods
-//
-static JSFunctionSpec InstallVersionMethods[] = 
-{
-  {"init",          InstallVersionInit,       1},
-  {"toString",      InstallVersionToString,   0},
-  {"compareTo",     InstallVersionCompareTo,  1},
-  {0}
-};
-
-static JSConstDoubleSpec version_constants[] = 
-{
-    { nsIDOMInstallVersion::EQUAL,                  "EQUAL"              },
-    { nsIDOMInstallVersion::BLD_DIFF,               "BLD_DIFF"           },
-    { nsIDOMInstallVersion::BLD_DIFF_MINUS,         "BLD_DIFF_MINUS"     },
-    { nsIDOMInstallVersion::REL_DIFF,               "REL_DIFF"           },
-    { nsIDOMInstallVersion::REL_DIFF_MINUS,         "REL_DIFF_MINUS"     },
-    { nsIDOMInstallVersion::MINOR_DIFF,             "MINOR_DIFF"         },
-    { nsIDOMInstallVersion::MINOR_DIFF_MINUS,       "MINOR_DIFF_MINUS"   },
-    { nsIDOMInstallVersion::MAJOR_DIFF,             "MAJOR_DIFF"         },
-    { nsIDOMInstallVersion::MAJOR_DIFF_MINUS,       "MAJOR_DIFF_MINUS"   },
-    {0}
-};
-
-
-
-//
-// InstallVersion constructor
-//
-PR_STATIC_CALLBACK(JSBool)
-InstallVersion(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsresult result;
-  
-  nsIDOMInstallVersion *nativeThis;
-  nsIScriptObjectOwner *owner = nsnull;
-
-  static NS_DEFINE_IID(kIDOMInstallVersionIID, NS_IDOMINSTALLVERSION_IID);
-  static NS_DEFINE_IID(kInstallVersion_CID, NS_SoftwareUpdateInstallVersion_CID);
-
-  result = nsRepository::CreateInstance(kInstallVersion_CID,
-                                        nsnull,
-                                        kIDOMInstallVersionIID,
-                                        (void **)&nativeThis);
-  if (NS_OK != result) return JS_FALSE;
-
-            
-  result = nativeThis->QueryInterface(kIScriptObjectOwnerIID, (void **)&owner);
-  if (NS_OK != result) {
-    NS_RELEASE(nativeThis);
-    return JS_FALSE;
-  }
-
-  owner->SetScriptObject((void *)obj);
-  JS_SetPrivate(cx, obj, nativeThis);
-
-  NS_RELEASE(owner);
-   
-  jsval ignore;
-  InstallVersionInit(cx, obj, argc, argv, &ignore);
-
-  return JS_TRUE;
-}
-
-nsresult InitInstallVersionClass(JSContext *jscontext, JSObject *global, void** prototype)
-{
-  JSObject *proto = nsnull;
-
-  if (prototype != nsnull)
-    *prototype = nsnull;
-
-  proto = JS_InitClass(jscontext,     // context
-                       global,        // global object
-                       nsnull,  // parent proto 
-                       &InstallVersionClass,      // JSClass
-                       InstallVersion,            // JSNative ctor
-                       0,             // ctor args
-                       InstallVersionProperties,  // proto props
-                       InstallVersionMethods,     // proto funcs
-                       nsnull,        // ctor props (static)
-                       nsnull);       // ctor funcs (static)
-  
-  if (nsnull == proto)
-      return NS_ERROR_FAILURE;
-  
-  
-  if ( PR_FALSE == JS_DefineConstDoubles(jscontext, proto, version_constants) )
-            return NS_ERROR_FAILURE;
-  
-  if (prototype != nsnull)
-      *prototype = proto;
-  
-  return NS_OK;
-}
-
-//
-// InstallVersion class initialization
-//
-nsresult NS_InitInstallVersionClass(nsIScriptContext *aContext, void **aPrototype)
-{
-  JSContext *jscontext = (JSContext *)aContext->GetNativeContext();
-  JSObject *proto = nsnull;
-  JSObject *constructor = nsnull;
-  JSObject *global = JS_GetGlobalObject(jscontext);
-  jsval vp;
-
-  if ((PR_TRUE != JS_LookupProperty(jscontext, global, "InstallVersion", &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)) 
-  {
-    nsresult rv = InitInstallVersionClass(jscontext, global, (void**)&proto);
-    if (NS_FAILED(rv)) return rv;
-  }
-  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 InstallVersion JavaScript object
-//
-extern "C" NS_DOM nsresult NS_NewScriptInstallVersion(nsIScriptContext *aContext, nsISupports *aSupports, nsISupports *aParent, void **aReturn)
-{
-  NS_PRECONDITION(nsnull != aContext && nsnull != aSupports && nsnull != aReturn, "null argument to NS_NewScriptInstallVersion");
-  JSObject *proto;
-  JSObject *parent;
-  nsIScriptObjectOwner *owner;
-  JSContext *jscontext = (JSContext *)aContext->GetNativeContext();
-  nsresult result = NS_OK;
-  nsIDOMInstallVersion *aInstallVersion;
-
-  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_InitInstallVersionClass(aContext, (void **)&proto)) {
-    return NS_ERROR_FAILURE;
-  }
-
-  result = aSupports->QueryInterface(kIInstallVersionIID, (void **)&aInstallVersion);
-  if (NS_OK != result) {
-    return result;
-  }
-
-  // create a js object for this class
-  *aReturn = JS_NewObject(jscontext, &InstallVersionClass, proto, parent);
-  if (nsnull != *aReturn) {
-    // connect the native object to the js object
-    JS_SetPrivate(jscontext, (JSObject *)*aReturn, aInstallVersion);
-  }
-  else {
-    NS_RELEASE(aInstallVersion);
-    return NS_ERROR_FAILURE; 
-  }
-
-  return NS_OK;
-}

mozilla/xpinstall/src/nsJSWinProfile.cpp

@@ -1,211 +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.1 (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.org 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.
- *
- * Contributor(s): 
- */
-
-#include "jsapi.h"
-#include "nscore.h"
-#include "nsIScriptContext.h"
-
-#include "nsString.h"
-#include "nsInstall.h"
-#include "nsWinProfile.h"
-#include "nsJSWinProfile.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 void PR_CALLBACK WinProfileCleanup(JSContext *cx, JSObject *obj)
-{
-    nsWinProfile *nativeThis = (nsWinProfile*)JS_GetPrivate(cx, obj);
-    delete nativeThis;
-}
-
-/***********************************************************************************/
-// Native mothods for WinProfile functions
-
-//
-// Native method GetString
-//
-PR_STATIC_CALLBACK(JSBool)
-WinProfileGetString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsWinProfile *nativeThis = (nsWinProfile*)JS_GetPrivate(cx, obj);
-  nsString     nativeRet;
-  nsAutoString b0;
-  nsAutoString 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 getString ( String section,
-    //                         String key);
-
-    ConvertJSValToStr(b0, cx, argv[0]);
-    ConvertJSValToStr(b1, cx, argv[1]);
-
-    nativeThis->GetString(b0, b1, &nativeRet);
-
-    ConvertStrToJSVal(nativeRet, cx, rval);
-  }
-  else
-  {
-    JS_ReportError(cx, "WinProfile.getString() parameters error");
-    return JS_FALSE;
-  }
-
-  return JS_TRUE;
-}
-
-//
-// Native method WriteString
-//
-PR_STATIC_CALLBACK(JSBool)
-WinProfileWriteString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsWinProfile *nativeThis = (nsWinProfile*)JS_GetPrivate(cx, obj);
-  PRInt32 nativeRet;
-  nsAutoString b0;
-  nsAutoString b1;
-  nsAutoString b2;
-
-  *rval = JSVAL_NULL;
-
-  // If there's no private data, this must be the prototype, so ignore
-  if(nsnull == nativeThis)
-  {
-    return JS_TRUE;
-  }
-
-  if(argc >= 3)
-  {
-    //  public int writeString ( String section,
-    //                           String key,
-    //                           String value);
-
-    ConvertJSValToStr(b0, cx, argv[0]);
-    ConvertJSValToStr(b1, cx, argv[1]);
-    ConvertJSValToStr(b2, cx, argv[2]);
-
-    if(NS_OK != nativeThis->WriteString(b0, b1, b2, &nativeRet))
-    {
-      return JS_FALSE;
-    }
-
-    *rval = INT_TO_JSVAL(nativeRet);
-  }
-  else
-  {
-    JS_ReportError(cx, "WinProfile.writeString() parameters error");
-    return JS_FALSE;
-  }
-
-  return JS_TRUE;
-}
-
-//
-// WinProfile constructor
-//
-PR_STATIC_CALLBACK(JSBool)
-WinProfile(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  return JS_FALSE;
-}
-
-/***********************************************************************/
-//
-// class for WinProfile
-//
-JSClass WinProfileClass = {
-  "WinProfile",
-  JSCLASS_HAS_PRIVATE,
-  JS_PropertyStub,
-  JS_PropertyStub,
-  JS_PropertyStub,
-  JS_PropertyStub,
-  JS_EnumerateStub,
-  JS_ResolveStub,
-  JS_ConvertStub,
-  WinProfileCleanup
-};
-
-
-static JSConstDoubleSpec winprofile_constants[] = 
-{
-    {0}
-};
-
-//
-// WinProfile class methods
-//
-static JSFunctionSpec WinProfileMethods[] = 
-{
-  {"getString",                  WinProfileGetString,                 2},
-  {"writeString",                WinProfileWriteString,               3},
-  {0}
-};
-
-PRInt32
-InitWinProfilePrototype(JSContext *jscontext, JSObject *global, JSObject **winProfilePrototype)
-{
-  *winProfilePrototype = JS_InitClass( jscontext,          // context
-                                       global,             // global object
-                                       nsnull,             // parent proto 
-                                       &WinProfileClass,   // JSClass
-                                       nsnull,             // JSNative ctor
-                                       0,                  // ctor args
-                                       nsnull,             // proto props
-                                       nsnull,             // proto funcs
-                                       nsnull,             // ctor props (static)
-                                       WinProfileMethods); // ctor funcs (static)
-
-  if(nsnull == *winProfilePrototype) 
-  {
-    return NS_ERROR_FAILURE;
-  }
-
-  if(PR_FALSE == JS_DefineConstDoubles(jscontext, *winProfilePrototype, winprofile_constants))
-    return NS_ERROR_FAILURE;
-
-  return NS_OK;
-}

mozilla/xpinstall/src/nsJSWinProfile.h

@@ -1,29 +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.1 (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.org 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.
- *
- * Contributor(s): 
- */
-
-#ifndef __NS_JSWINPROTOTYPE_H__
-#define __NS_JSWINPROTOTYPE_H__
-
-PRInt32
-InitWinProfilePrototype(JSContext *jscontext, JSObject *global, JSObject **winRegPrototype);
-
-#endif

mozilla/xpinstall/src/nsJSWinReg.cpp

@@ -1,593 +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.1 (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.org 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.
- *
- * Contributor(s): 
- */
-
-#include "jsapi.h"
-#include "nscore.h"
-#include "nsIScriptContext.h"
-
-#include "nsString.h"
-#include "nsInstall.h"
-#include "nsWinReg.h"
-#include "nsJSWinReg.h"
-
-static void PR_CALLBACK WinRegCleanup(JSContext *cx, JSObject *obj);
-
-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 void PR_CALLBACK WinRegCleanup(JSContext *cx, JSObject *obj)
-{
-    nsWinReg *nativeThis = (nsWinReg*)JS_GetPrivate(cx, obj);
-    delete nativeThis;
-}
-
-/***********************************************************************************/
-// Native mothods for WinReg functions
-
-//
-// Native method SetRootKey
-//
-PR_STATIC_CALLBACK(JSBool)
-WinRegSetRootKey(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsWinReg *nativeThis  = (nsWinReg*)JS_GetPrivate(cx, obj);
-  JSBool   rBool        = JS_FALSE;
-  PRInt32  b0;
-
-  *rval = JSVAL_NULL;
-
-  // If there's no private data, this must be the prototype, so ignore
-  if(nsnull == nativeThis)
-  {
-    return JS_TRUE;
-  }
-
-  if(argc >= 1)
-  {
-    //  public int setRootKey(PRInt32 key);
-
-    if(!JS_ValueToInt32(cx, argv[0], (int32 *)&b0))
-    {
-      JS_ReportError(cx, "Parameter must be a number");
-      return JS_FALSE;
-    }
-
-    if(NS_OK != nativeThis->SetRootKey(b0))
-    {
-      return JS_FALSE;
-    }
-
-    *rval = JSVAL_VOID;
-  }
-  else
-  {
-    JS_ReportError(cx, "Function SetRootKey requires 1 parameters");
-    return JS_FALSE;
-  }
-
-  return JS_TRUE;
-}
-
-
-//
-// Native method CreateKey
-//
-PR_STATIC_CALLBACK(JSBool)
-WinRegCreateKey(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsWinReg *nativeThis = (nsWinReg*)JS_GetPrivate(cx, obj);
-  PRInt32 nativeRet;
-  nsAutoString b0;
-  nsAutoString 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 createKey ( String subKey,
-    //                         String className);
-
-    ConvertJSValToStr(b0, cx, argv[0]);
-    ConvertJSValToStr(b1, cx, argv[1]);
-
-    if(NS_OK != nativeThis->CreateKey(b0, b1, &nativeRet))
-    {
-      return JS_FALSE;
-    }
-
-    *rval = INT_TO_JSVAL(nativeRet);
-  }
-  else
-  {
-    JS_ReportError(cx, "WinReg.CreateKey() parameters error");
-    return JS_FALSE;
-  }
-
-  return JS_TRUE;
-}
-
-//
-// Native method DeleteKey
-//
-PR_STATIC_CALLBACK(JSBool)
-WinRegDeleteKey(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsWinReg *nativeThis = (nsWinReg*)JS_GetPrivate(cx, obj);
-  PRInt32 nativeRet;
-  nsAutoString b0;
-
-  *rval = JSVAL_NULL;
-
-  // If there's no private data, this must be the prototype, so ignore
-  if(nsnull == nativeThis)
-  {
-    return JS_TRUE;
-  }
-
-  if(argc >= 1)                             
-  {
-    //  public int deleteKey ( String subKey);
-
-    ConvertJSValToStr(b0, cx, argv[0]);
-
-    if(NS_OK != nativeThis->DeleteKey(b0, &nativeRet))
-    {
-      return JS_FALSE;
-    }
-
-    *rval = INT_TO_JSVAL(nativeRet);
-  }
-  else
-  {
-    JS_ReportError(cx, "WinReg.DeleteKey() parameters error");
-    return JS_FALSE;
-  }
-
-  return JS_TRUE;
-}
-
-
-//
-// Native method DeleteValue
-//
-PR_STATIC_CALLBACK(JSBool)
-WinRegDeleteValue(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsWinReg *nativeThis = (nsWinReg*)JS_GetPrivate(cx, obj);
-  PRInt32 nativeRet;
-  nsString b0;
-  nsString 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 deleteValue ( String subKey,
-    //                           String valueName);
-
-    ConvertJSValToStr(b0, cx, argv[0]);
-    ConvertJSValToStr(b1, cx, argv[1]);
-
-    if(NS_OK != nativeThis->DeleteValue(b0, b1, &nativeRet))
-    {
-      return JS_FALSE;
-    }
-
-    *rval = INT_TO_JSVAL(nativeRet);
-  }
-  else
-  {
-    JS_ReportError(cx, "WinReg.DeleteValue() parameters error");
-    return JS_FALSE;
-  }
-
-  return JS_TRUE;
-}
-
-//
-// Native method SetValueString
-//
-PR_STATIC_CALLBACK(JSBool)
-WinRegSetValueString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsWinReg *nativeThis = (nsWinReg*)JS_GetPrivate(cx, obj);
-  PRInt32 nativeRet;
-  nsAutoString b0;
-  nsAutoString b1;
-  nsAutoString b2;
-
-  *rval = JSVAL_NULL;
-
-  // If there's no private data, this must be the prototype, so ignore
-  if(nsnull == nativeThis)
-  {
-    return JS_TRUE;
-  }
-
-  if(argc >= 3)
-  {
-    //  public int setValueString ( String subKey,
-    //                              String valueName,
-    //                              String value);
-
-    ConvertJSValToStr(b0, cx, argv[0]);
-    ConvertJSValToStr(b1, cx, argv[1]);
-    ConvertJSValToStr(b2, cx, argv[2]);
-
-    if(NS_OK != nativeThis->SetValueString(b0, b1, b2, &nativeRet))
-    {
-      return JS_FALSE;
-    }
-
-    *rval = INT_TO_JSVAL(nativeRet);
-  }
-  else
-  {
-    JS_ReportError(cx, "WinReg.SetValueString() parameters error");
-    return JS_FALSE;
-  }
-
-  return JS_TRUE;
-}
-
-//
-// Native method GetValueString
-//
-PR_STATIC_CALLBACK(JSBool)
-WinRegGetValueString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsWinReg*    nativeThis = (nsWinReg*)JS_GetPrivate(cx, obj);
-  nsString     nativeRet;
-  nsAutoString b0;
-  nsAutoString 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 getValueString ( String subKey,
-    //                              String valueName);
-
-    ConvertJSValToStr(b0, cx, argv[0]);
-    ConvertJSValToStr(b1, cx, argv[1]);
-
-    if(NS_OK != nativeThis->GetValueString(b0, b1, &nativeRet))
-    {
-      return JS_FALSE;
-    }
-
-    ConvertStrToJSVal(nativeRet, cx, rval);
-  }
-  else
-  {
-    JS_ReportError(cx, "WinReg.GetValueString() parameters error");
-    return JS_FALSE;
-  }
-
-  return JS_TRUE;
-}
-
-//
-// Native method SetValueNumber
-//
-PR_STATIC_CALLBACK(JSBool)
-WinRegSetValueNumber(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsWinReg *nativeThis = (nsWinReg*)JS_GetPrivate(cx, obj);
-  PRInt32 nativeRet;
-  nsAutoString b0;
-  nsAutoString b1;
-//  nsAutoString b2;
-  PRInt32      ib2;
-
-  *rval = JSVAL_NULL;
-
-  // If there's no private data, this must be the prototype, so ignore
-  if(nsnull == nativeThis)
-  {
-    return JS_TRUE;
-  }
-
-  if(argc >= 3)
-  {
-    //  public int setValueNumber ( String subKey,
-    //                              String valueName,
-    //                              Number value);
-
-    ConvertJSValToStr(b0, cx, argv[0]);
-    ConvertJSValToStr(b1, cx, argv[1]);
-
-    if(JSVAL_IS_INT(argv[2])) 
-    {
-      ib2 = JSVAL_TO_INT(argv[2]);
-//      ConvertJSValToStr(b2, cx, argv[2]);
-    }
-    else
-    {
-      JS_ReportError(cx, "Parameter 3 must be a number");
-      return JS_FALSE;
-    }
-
-    if(NS_OK != nativeThis->SetValueNumber(b0, b1, ib2, &nativeRet))
-    {
-      return JS_FALSE;
-    }
-
-    *rval = INT_TO_JSVAL(nativeRet);
-  }
-  else
-  {
-    JS_ReportError(cx, "WinReg.SetValueNumber() parameters error");
-    return JS_FALSE;
-  }
-
-  return JS_TRUE;
-}
-
-//
-// Native method GetValueNumber
-//
-PR_STATIC_CALLBACK(JSBool)
-WinRegGetValueNumber(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsWinReg*    nativeThis = (nsWinReg*)JS_GetPrivate(cx, obj);
-  PRInt32      nativeRet;
-  nsAutoString b0;
-  nsAutoString 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 getValueNumber ( String subKey,
-    //                              Number valueName);
-
-    ConvertJSValToStr(b0, cx, argv[0]);
-    ConvertJSValToStr(b1, cx, argv[1]);
-
-    if(NS_OK != nativeThis->GetValueNumber(b0, b1, &nativeRet))
-    {
-      return JS_FALSE;
-    }
-
-    *rval = INT_TO_JSVAL(nativeRet);
-  }
-  else
-  {
-    JS_ReportError(cx, "WinReg.GetValueNumber() parameters error");
-    return JS_FALSE;
-  }
-
-  return JS_TRUE;
-}
-
-//
-// Native method SetValue
-//
-PR_STATIC_CALLBACK(JSBool)
-WinRegSetValue(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsWinReg *nativeThis = (nsWinReg*)JS_GetPrivate(cx, obj);
-//  PRInt32 nativeRet;
-  nsAutoString b0;
-  nsAutoString b1;
-//  nsWinRegItem *b2;
-
-  *rval = JSVAL_NULL;
-
-  // If there's no private data, this must be the prototype, so ignore
-  if(nsnull == nativeThis)
-  {
-    return JS_TRUE;
-  }
-
-  if(argc >= 3)
-  {
-    //  public int setValue ( String        subKey,
-    //                        String        valueName,
-    //                        nsWinRegItem  *value);
-
-    ConvertJSValToStr(b0, cx, argv[0]);
-    ConvertJSValToStr(b1, cx, argv[1]);
-
-    // fix: this parameter is an object, not a string.
-    // A way needs to be figured out to convert the JSVAL to this object type
-//    ConvertJSValToStr(b2, cx, argv[2]);
-
-//    if(NS_OK != nativeThis->SetValue(b0, b1, b2, &nativeRet))
-//    {
-//      return JS_FALSE;
-//    }
-
-//    *rval = INT_TO_JSVAL(nativeRet);
-  }
-  else
-  {
-    JS_ReportError(cx, "WinReg.SetValue() parameters error");
-    return JS_FALSE;
-  }
-
-  return JS_TRUE;
-}
-
-//
-// Native method GetValue
-//
-PR_STATIC_CALLBACK(JSBool)
-WinRegGetValue(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsWinReg      *nativeThis = (nsWinReg*)JS_GetPrivate(cx, obj);
-  nsWinRegValue *nativeRet;
-  nsAutoString  b0;
-  nsAutoString  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 getValue ( String subKey,
-    //                        String valueName);
-
-    ConvertJSValToStr(b0, cx, argv[0]);
-    ConvertJSValToStr(b1, cx, argv[1]);
-
-    if(NS_OK != nativeThis->GetValue(b0, b1, &nativeRet))
-    {
-      return JS_FALSE;
-    }
-
-    *rval = INT_TO_JSVAL(nativeRet);
-  }
-  else
-  {
-    JS_ReportError(cx, "WinReg.GetValue() parameters error");
-    return JS_FALSE;
-  }
-
-  return JS_TRUE;
-}
-
-
-//
-// WinReg constructor
-//
-PR_STATIC_CALLBACK(JSBool)
-WinReg(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  return JS_FALSE;
-}
-
-
-/***********************************************************************/
-//
-// class for WinReg
-//
-JSClass WinRegClass = {
-  "WinReg",
-  JSCLASS_HAS_PRIVATE,
-  JS_PropertyStub,
-  JS_PropertyStub,
-  JS_PropertyStub,
-  JS_PropertyStub,
-  JS_EnumerateStub,
-  JS_ResolveStub,
-  JS_ConvertStub,
-  WinRegCleanup
-};
-
-static JSConstDoubleSpec winreg_constants[] = 
-{
-    { nsWinReg::HKEY_CLASSES_ROOT,           "HKEY_CLASSES_ROOT"            },
-    { nsWinReg::HKEY_CURRENT_USER,           "HKEY_CURRENT_USER"            },
-    { nsWinReg::HKEY_LOCAL_MACHINE,          "HKEY_LOCAL_MACHINE"           },
-    { nsWinReg::HKEY_USERS,                  "HKEY_USERS"                   },
-    {0}
-};
-
-//
-// WinReg class methods
-//
-static JSFunctionSpec WinRegMethods[] = 
-{
-  {"setRootKey",                WinRegSetRootKey,               1},
-  {"createKey",                 WinRegCreateKey,                2},
-  {"deleteKey",                 WinRegDeleteKey,                1},
-  {"deleteValue",               WinRegDeleteValue,              2},
-  {"setValueString",            WinRegSetValueString,           3},
-  {"getValueString",            WinRegGetValueString,           2},
-  {"setValueNumber",            WinRegSetValueNumber,           3},
-  {"getValueNumber",            WinRegGetValueNumber,           2},
-  {"setValue",                  WinRegSetValue,                 3},
-  {"getValue",                  WinRegGetValue,                 2},
-  {0}
-};
-
-PRInt32
-InitWinRegPrototype(JSContext *jscontext, JSObject *global, JSObject **winRegPrototype)
-{
-  *winRegPrototype = JS_InitClass( jscontext,         // context
-                                  global,            // global object
-                                  nsnull,            // parent proto 
-                                  &WinRegClass,      // JSClass
-                                  nsnull,            // JSNative ctor
-                                  0,                 // ctor args
-                                  nsnull,            // proto props
-                                  nsnull,            // proto funcs
-                                  nsnull,            // ctor props (static)
-                                  WinRegMethods);    // ctor funcs (static)
-
-  if(nsnull == *winRegPrototype) 
-  {
-    return NS_ERROR_FAILURE;
-  }
-
-  if(PR_FALSE == JS_DefineConstDoubles(jscontext, *winRegPrototype, winreg_constants))
-    return NS_ERROR_FAILURE;
-
-  return NS_OK;
-}

mozilla/xpinstall/src/nsJSWinReg.h

@@ -1,29 +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.1 (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.org 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.
- *
- * Contributor(s): 
- */
-
-#ifndef __NS_JSWINREG_H__
-#define __NS_JSWINREG_H__
-
-PRInt32
-InitWinRegPrototype(JSContext *jscontext, JSObject *global, JSObject **winRegPrototype);
-
-#endif

mozilla/xpinstall/src/nsLoggingProgressNotifier.cpp

@@ -1,198 +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.1 (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.
- *
- * Contributor(s): 
- *     Douglas Turner <dougt@netscape.com>
- *     Pierre Phaneuf <pp@ludusdesign.com>
- */
-
-#include "nsIXPINotifier.h"
-#include "nsLoggingProgressNotifier.h"
-
-#include "nsInstall.h"
-
-#include "nsFileSpec.h"
-#include "nsFileStream.h"
-#include "nsSpecialSystemDirectory.h"
-
-#include "nspr.h"
-
-
-
-nsLoggingProgressNotifier::nsLoggingProgressNotifier()
-    : mLogStream(0)
-{
-    NS_INIT_ISUPPORTS();
-}
-
-nsLoggingProgressNotifier::~nsLoggingProgressNotifier()
-{
-    if (mLogStream)
-    {
-        NS_WARN_IF_FALSE(PR_FALSE, "We're being destroyed before script finishes!");
-        mLogStream->close();
-        delete mLogStream;
-        mLogStream = 0;
-    }
-}
-
-NS_IMPL_ISUPPORTS(nsLoggingProgressNotifier, NS_GET_IID(nsIXPINotifier));
-
-NS_IMETHODIMP
-nsLoggingProgressNotifier::BeforeJavascriptEvaluation(const PRUnichar *URL)
-{
-    nsSpecialSystemDirectory logFile(nsSpecialSystemDirectory::OS_CurrentProcessDirectory);
-#ifdef XP_MAC
-    logFile += "Install Log";
-#else
-    logFile += "install.log";
-#endif
-
-    mLogStream = new nsOutputFileStream(logFile, PR_WRONLY | PR_CREATE_FILE | PR_APPEND, 0744 );
-    if (!mLogStream) 
-        return NS_ERROR_NULL_POINTER;
-
-    char* time;
-    GetTime(&time);
-
-    mLogStream->seek(logFile.GetFileSize());
-
-    *mLogStream << "-------------------------------------------------------------------------------" << nsEndl;
-    *mLogStream << nsAutoCString(URL) << "  --  " << time << nsEndl;
-    *mLogStream << "-------------------------------------------------------------------------------" << nsEndl;
-    *mLogStream << nsEndl;
-
-    PL_strfree(time);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsLoggingProgressNotifier::AfterJavascriptEvaluation(const PRUnichar *URL)
-{
-    if (mLogStream == nsnull) return NS_ERROR_NULL_POINTER;
-    
-    char* time;
-    GetTime(&time);
-
-//    *mLogStream << nsEndl;
-    *mLogStream << "     Finished Installation  " << time << nsEndl << nsEndl;
-
-    PL_strfree(time);
-
-    mLogStream->close();
-    delete mLogStream;
-    mLogStream = nsnull;
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsLoggingProgressNotifier::InstallStarted(const PRUnichar *URL, const PRUnichar* UIPackageName)
-{
-    if (mLogStream == nsnull) return NS_ERROR_NULL_POINTER;
-
-//    char* time;
-//    GetTime(&time);
-
-    nsCString name(UIPackageName);
-    nsCString uline;
-    uline.SetCapacity(name.Length());
-    for ( unsigned int i=0; i < name.Length(); ++i)
-        uline.Append('-');
-
-    *mLogStream << "     " << name.GetBuffer() << nsEndl;
-    *mLogStream << "     " << uline.GetBuffer() << nsEndl;
-
-    *mLogStream << nsEndl;
-//    *mLogStream << "     Starting Installation at " << time << nsEndl;   
-//    *mLogStream << nsEndl;
-
-
-//    PL_strfree(time);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsLoggingProgressNotifier::ItemScheduled(const PRUnichar* message )
-{
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsLoggingProgressNotifier::FinalizeProgress(const PRUnichar* message, PRInt32 itemNum, PRInt32 totNum )
-{
-    if (mLogStream == nsnull) return NS_ERROR_NULL_POINTER;
-
-    *mLogStream << "     [" << (itemNum) << "/" << totNum << "]\t" << nsAutoCString(message) << nsEndl;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsLoggingProgressNotifier::FinalStatus(const PRUnichar *URL, PRInt32 status)
-{
-    if (mLogStream == nsnull) return NS_ERROR_NULL_POINTER;
-
-    *mLogStream << nsEndl;
-
-    switch (status)
-    {
-    case nsInstall::SUCCESS:
-        *mLogStream << "     Install completed successfully" << nsEndl;
-        break;
-
-    case nsInstall::REBOOT_NEEDED:
-        *mLogStream << "     Install completed successfully, restart required" << nsEndl;
-        break;
-
-    case nsInstall::ABORT_INSTALL:
-        *mLogStream << "     Install script aborted" << nsEndl;
-        break;
-
-    case nsInstall::USER_CANCELLED:
-        *mLogStream << "     Install cancelled by user" << nsEndl;
-        break;
-
-    default:
-        *mLogStream << "     Install **FAILED** with error " << status << nsEndl;
-        break;
-    }
-
-    return NS_OK;
-}
-
-void 
-nsLoggingProgressNotifier::GetTime(char** aString)
-{
-    PRExplodedTime et;
-    char line[256];
-    PR_ExplodeTime(PR_Now(), PR_LocalTimeParameters, &et);
-    PR_FormatTimeUSEnglish(line, sizeof(line), "%m/%d/%Y %H:%M:%S", &et);
-    *aString = PL_strdup(line);
-}
-
-NS_IMETHODIMP
-nsLoggingProgressNotifier::LogComment(const PRUnichar* comment)
-{
-    if (mLogStream == nsnull) return NS_ERROR_NULL_POINTER;
-
-    *mLogStream << "     ** " << nsAutoCString(comment) << nsEndl;    
-    return NS_OK;
-}
-

mozilla/xpinstall/src/nsLoggingProgressNotifier.h

@@ -1,51 +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.1 (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.
- *
- * Contributor(s): 
- *     Daniel Veditz <dveditz@netscape.com>
- *     Douglas Turner <dougt@netscape.com>
- */
-
-
-#ifndef nsLoggingProgressNotifier_H__
-#define nsLoggingProgressNotifier_H__
-
-#include "nsIXPINotifier.h"
-#include "nsFileStream.h"
-
-
-class nsLoggingProgressNotifier : public nsIXPINotifier
-{
-    public:
-        
-        nsLoggingProgressNotifier();
-        virtual ~nsLoggingProgressNotifier();
-        
-        NS_DECL_ISUPPORTS
-
-        // nsIXPINotifier interfaces
-        NS_DECL_NSIXPINOTIFIER
-   
-     private:
-        void GetTime(char** aString);
-        nsOutputFileStream  *mLogStream;
-};
-
-#endif

mozilla/xpinstall/src/nsSoftwareUpdate.cpp

@@ -1,655 +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.1 (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.
- *
- * Contributor(s): 
- *   Pierre Phaneuf <pp@ludusdesign.com>
- */
-
-
-#include "nscore.h"
-#include "nsIGenericFactory.h"
-#include "nsIFactory.h"
-#include "nsISupports.h"
-#include "nsIComponentManager.h"
-#include "nsIServiceManager.h"
-#include "nsCOMPtr.h"
-#include "nsCRT.h"
-
-#include "nspr.h"
-#include "prlock.h"
-#include "NSReg.h"
-#include "VerReg.h"
-#include "nsSpecialSystemDirectory.h"
-
-#include "nsInstall.h"
-#include "nsSoftwareUpdateIIDs.h"
-#include "nsSoftwareUpdate.h"
-#include "nsSoftwareUpdateRun.h"
-#include "nsInstallTrigger.h"
-#include "nsInstallVersion.h"
-#include "ScheduledTasks.h"
-
-#include "nsTopProgressNotifier.h"
-#include "nsLoggingProgressNotifier.h"
-
-#include "nsIAppShellComponent.h"
-#include "nsIRegistry.h"
-#include "nsBuildID.h"
-
-/* For Javascript Namespace Access */
-#include "nsDOMCID.h"
-#include "nsIServiceManager.h"
-#include "nsINameSpaceManager.h"
-#include "nsIScriptObjectOwner.h"
-#include "nsIScriptGlobalObject.h"
-#include "nsIScriptNameSetRegistry.h"
-#include "nsIScriptNameSpaceManager.h"
-#include "nsIScriptExternalNameSet.h"
-
-#include "nsIEventQueueService.h"
-#include "nsProxyObjectManager.h"
-
-
-////////////////////////////////////////////////////////////////////////////////
-// Globals
-////////////////////////////////////////////////////////////////////////////////
-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_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID);
-
-static NS_DEFINE_IID(kIScriptNameSetRegistryIID, NS_ISCRIPTNAMESETREGISTRY_IID);
-static NS_DEFINE_CID(kCScriptNameSetRegistryCID, NS_SCRIPT_NAMESET_REGISTRY_CID);
-static NS_DEFINE_IID(kIScriptExternalNameSetIID, NS_ISCRIPTEXTERNALNAMESET_IID);
-
-static NS_DEFINE_IID(kISoftwareUpdate_IID, NS_ISOFTWAREUPDATE_IID);
-
-static NS_DEFINE_IID(kIInstallTrigger_IID, NS_IDOMINSTALLTRIGGERGLOBAL_IID);
-static NS_DEFINE_CID(kInstallTrigger_CID, NS_SoftwareUpdateInstallTrigger_CID);
-
-static NS_DEFINE_IID(kIInstallVersion_IID, NS_IDOMINSTALLVERSION_IID);
-static NS_DEFINE_CID(kInstallVersion_CID, NS_SoftwareUpdateInstallVersion_CID);
-
-static NS_DEFINE_CID(knsRegistryCID, NS_REGISTRY_CID);
-
-nsSoftwareUpdate* nsSoftwareUpdate::mInstance = nsnull;
-nsIFileSpec*      nsSoftwareUpdate::mProgramDir = nsnull;
-
-#if NOTIFICATION_ENABLE
-#include "nsUpdateNotification.h"
-static NS_DEFINE_CID(kUpdateNotificationCID, NS_XPI_UPDATE_NOTIFIER_CID);
-nsIUpdateNotification*      nsSoftwareUpdate::mUpdateNotifier= nsnull;
-#endif
-
-
-nsSoftwareUpdate *
-nsSoftwareUpdate::GetInstance()
-{
-    if (mInstance == nsnull) 
-        mInstance = new nsSoftwareUpdate();
-
-    NS_IF_ADDREF(mInstance);
-    return mInstance;
-}
-
-
-
-nsSoftwareUpdate::nsSoftwareUpdate()
-: mInstalling(PR_FALSE),
-  mStubLockout(PR_FALSE),
-  mReg(0)
-{
-    NS_INIT_ISUPPORTS();
-
-    mLock = PR_NewLock();
-
-    /***************************************/
-    /* Startup the Version Registry        */
-    /***************************************/
-
-    NR_StartupRegistry();   /* startup the registry; if already started, this will essentially be a noop */
-
-    nsSpecialSystemDirectory appDir(nsSpecialSystemDirectory::OS_CurrentProcessDirectory);
-    VR_SetRegDirectory( appDir.GetNativePathCString() );
-}
-
-
-
-
-
-nsSoftwareUpdate::~nsSoftwareUpdate()
-{
-    PR_Lock(mLock);
-
-    nsInstallInfo* element;
-    for (PRInt32 i=0; i < mJarInstallQueue.Count(); i++)
-    {
-        element = (nsInstallInfo*)mJarInstallQueue.ElementAt(i);
-        //FIX:  need to add to registry....
-        delete element;
-    }
-
-    mJarInstallQueue.Clear();
-
-    PR_Unlock(mLock);
-    PR_DestroyLock(mLock);
-
-    NR_ShutdownRegistry();
-
-    NS_IF_RELEASE( mProgramDir );
-
-    mInstance = nsnull;
-}
-
-
-//------------------------------------------------------------------------
-//  nsISupports implementation
-//------------------------------------------------------------------------
-NS_IMPL_THREADSAFE_ADDREF( nsSoftwareUpdate );
-NS_IMPL_THREADSAFE_RELEASE( nsSoftwareUpdate );
-
-
-NS_IMETHODIMP
-nsSoftwareUpdate::QueryInterface( REFNSIID anIID, void **anInstancePtr )
-{
-    nsresult rv = NS_OK;
-    /* Check for place to return result. */
-    
-    if ( !anInstancePtr )
-    {
-        rv = NS_ERROR_NULL_POINTER;
-    }
-    else
-    {
-        /* Check for IIDs we support and cast this appropriately. */
-        if ( anIID.Equals( NS_GET_IID(nsISoftwareUpdate) ) ) 
-            *anInstancePtr = (void*) ( (nsISoftwareUpdate*)this );
-        else if ( anIID.Equals( NS_GET_IID(nsIAppShellComponent) ) ) 
-            *anInstancePtr = (void*) ( (nsIAppShellComponent*)this );
-        else if (anIID.Equals( NS_GET_IID(nsPIXPIStubHook) ) )
-            *anInstancePtr = (void*) ( (nsPIXPIStubHook*)this );
-        else if ( anIID.Equals( kISupportsIID ) )
-            *anInstancePtr = (void*) ( (nsISupports*) (nsISoftwareUpdate*) this );
-        else
-        {
-            /* Not an interface we support. */
-            *anInstancePtr = 0;
-            rv = NS_NOINTERFACE;
-        }
-    }
-
-    if (NS_SUCCEEDED(rv))
-        NS_ADDREF_THIS();
-
-    return rv;
-}
-
-
-NS_IMETHODIMP
-nsSoftwareUpdate::Initialize( nsIAppShellService *anAppShell, nsICmdLineService  *aCmdLineService ) 
-{
-    // Close the registry if open. We left it open through most of startup
-    // so it wouldn't get opened and closed a lot by different services
-    if (mReg) 
-        NR_RegClose(mReg);
-
-    // prevent use of nsPIXPIStubHook by browser
-    mStubLockout = PR_TRUE;
-
-    /***************************************/
-    /* Add us to the Javascript Name Space */
-    /***************************************/
-
-    RegisterNameset();
-
-    /***************************************/
-    /* Register us with NetLib             */
-    /***************************************/
-        // FIX 
-
-
-    /***************************************/
-    /* Create a top level observer         */
-    /***************************************/
-
-    nsLoggingProgressNotifier *logger = new nsLoggingProgressNotifier();
-    RegisterNotifier(logger);
-    
-#if NOTIFICATION_ENABLE
-    /***************************************/
-    /* Create a Update notification object */
-    /***************************************/
-    NS_IF_RELEASE(mUpdateNotifier);
-
-    nsComponentManager::CreateInstance(kUpdateNotificationCID,
-                                       nsnull,
-                                       NS_GET_IID(nsIUpdateNotification),
-                                       (void**)&mUpdateNotifier);
-
-#endif
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSoftwareUpdate::Shutdown()
-{
-#if NOTIFICATION_ENABLED
-    if (mUpdateNotifier)
-    {
-        mUpdateNotifier->DisplayUpdateDialog();
-        NS_RELEASE(mUpdateNotifier);
-    }
-#endif
-
-    // nothing to do here. Should we UnregisterService?
-    return NS_OK;
-}
-
-
-NS_IMETHODIMP 
-nsSoftwareUpdate::RegisterNotifier(nsIXPINotifier *notifier)
-{
-    // we are going to ignore the returned ID and enforce that once you 
-    // register a notifier, you can not remove it.  This should at some
-    // point be fixed.
-
-    (void) mMasterNotifier.RegisterNotifier(notifier);
-    
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSoftwareUpdate::GetMasterNotifier(nsIXPINotifier **notifier)
-{
-    NS_ASSERTION(notifier, "getter has invalid return pointer");
-    if (!notifier)
-        return NS_ERROR_NULL_POINTER;
-
-    *notifier = &mMasterNotifier;
-    return NS_OK;
-}
-
-
-NS_IMETHODIMP
-nsSoftwareUpdate::SetActiveNotifier(nsIXPINotifier *notifier)
-{
-    mMasterNotifier.SetActiveNotifier(notifier);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSoftwareUpdate::InstallJar(  nsIFileSpec* aLocalFile,
-                               const PRUnichar* aURL,
-                               const PRUnichar* aArguments,
-                               long flags,
-                               nsIXPINotifier* aNotifier)
-{
-    if ( !aLocalFile )
-        return NS_ERROR_NULL_POINTER;
-
-    nsInstallInfo *info =
-        new nsInstallInfo( aLocalFile, aURL, aArguments, flags, aNotifier );
-    
-    if (!info)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    PR_Lock(mLock);
-    mJarInstallQueue.AppendElement( info );
-    PR_Unlock(mLock);
-    RunNextInstall();
-
-    return NS_OK;
-}
-
-
-NS_IMETHODIMP
-nsSoftwareUpdate::InstallJarCallBack()
-{
-    PR_Lock(mLock);
-
-    nsInstallInfo *nextInstall = (nsInstallInfo*)mJarInstallQueue.ElementAt(0);
-    if (nextInstall != nsnull)
-        delete nextInstall;
-
-    mJarInstallQueue.RemoveElementAt(0);
-    mInstalling = PR_FALSE;
-
-    PR_Unlock(mLock);
-
-    return RunNextInstall();
-}
-
-
-NS_IMETHODIMP
-nsSoftwareUpdate::StartupTasks( PRBool *needAutoreg )
-{
-    PRBool  autoReg = PR_FALSE;
-    RKEY    xpiRoot;
-    REGERR  err;
-
-    *needAutoreg = PR_TRUE;
-
-    // First do any left-over file replacements and deletes
-
-    // NOTE: we leave the registry open until later to prevent
-    // having to load and unload it many times at startup
-
-    if ( REGERR_OK == NR_RegOpen("", &mReg) )
-    {
-        // XXX get a return val and if not all replaced autoreg again later
-        PerformScheduledTasks(mReg);
-
-        // now look for an autoreg flag left behind by XPInstall
-        err = NR_RegGetKey( mReg, ROOTKEY_COMMON, XPI_ROOT_KEY, &xpiRoot);
-        if ( err == REGERR_OK )
-        {
-            char buf[8];
-            err = NR_RegGetEntryString( mReg, xpiRoot, XPI_AUTOREG_VAL,
-                                        buf, sizeof(buf) );
-
-            if ( err == REGERR_OK && !strcmp( buf, "yes" ) )
-                autoReg = PR_TRUE;
-        }
-    }
-
-    // Also check for build number changes
-    nsresult rv;
-    PRInt32 buildID = 0;
-    nsRegistryKey idKey = 0;
-    nsCOMPtr<nsIRegistry> reg = do_GetService(knsRegistryCID,&rv);
-    if (NS_SUCCEEDED(rv))
-    {
-        rv = reg->OpenWellKnownRegistry(nsIRegistry::ApplicationComponentRegistry);
-        if (NS_SUCCEEDED(rv))
-        {
-            rv = reg->GetSubtree(nsIRegistry::Common,XPCOM_KEY,&idKey);
-            if (NS_SUCCEEDED(rv))
-            {
-                rv = reg->GetInt( idKey, XPI_AUTOREG_VAL, &buildID );
-            }
-        }
-    }
-
-    // Autoregister if we found the XPInstall flag, the stored BuildID
-    // is not the actual BuildID, or if we couldn't get the BuildID
-    if ( autoReg || NS_FAILED(rv) || buildID != NS_BUILD_ID )
-    {
-        rv = nsComponentManager::AutoRegister(nsIComponentManager::NS_Startup,0);
-
-        if (NS_SUCCEEDED(rv))
-        {
-            *needAutoreg = PR_FALSE;
-
-            // Now store back into the registries so we don't do this again
-            if ( autoReg )
-                NR_RegSetEntryString( mReg, xpiRoot, XPI_AUTOREG_VAL, "no" );
-
-            if ( buildID != NS_BUILD_ID && idKey != 0 )
-                reg->SetInt( idKey, XPI_AUTOREG_VAL, NS_BUILD_ID );
-        }
-    }
-    else
-    {
-        //We don't need to autoreg, we're up to date
-        *needAutoreg = PR_FALSE;
-#ifdef DEBUG
-        // debug (developer) builds should always autoreg
-        *needAutoreg = PR_TRUE;
-#endif
-    }
-
-    return rv;
-}
-
-
-nsresult
-nsSoftwareUpdate::RunNextInstall()
-{
-    nsresult        rv = NS_OK;
-    nsInstallInfo*  info = nsnull;
-
-    PR_Lock(mLock);
-    if (!mInstalling) 
-    {
-        if ( mJarInstallQueue.Count() > 0 )
-        {
-            info = (nsInstallInfo*)mJarInstallQueue.ElementAt(0);
-
-            if ( info )
-                mInstalling = PR_TRUE;
-            else 
-            {
-                // bogus elements got into the queue
-                NS_ERROR("leaks remaining nsInstallInfos, please file bug!");
-                rv = NS_ERROR_NULL_POINTER;
-                VR_Close();
-            }
-        }
-        else
-        {
-            // nothing more to do
-            VR_Close();
-        }
-    }
-    PR_Unlock(mLock);
-
-    // make sure to RunInstall() outside of locked section due to callbacks
-    if (info)
-        RunInstall( info );
-
-    return rv;
-}
-
-
-nsresult
-nsSoftwareUpdate::RegisterNameset()
-{
-    nsresult rv;
-    nsCOMPtr<nsIScriptNameSetRegistry> namesetService = 
-        do_GetService( kCScriptNameSetRegistryCID, &rv );
-
-    if (NS_SUCCEEDED(rv))
-    {
-        nsSoftwareUpdateNameSet* nameset = new nsSoftwareUpdateNameSet();
-        // the NameSet service will AddRef this one
-        namesetService->AddExternalNameSet( nameset );
-    }
-
-    return rv;
-}
-
-
-NS_IMETHODIMP
-nsSoftwareUpdate::StubInitialize(nsIFileSpec *aDir)
-{
-    if (mStubLockout)
-        return NS_ERROR_ABORT;
-    else if ( !aDir )
-        return NS_ERROR_NULL_POINTER;
-
-    // only allow once, it could be a mess if we've already started installing
-    mStubLockout = PR_TRUE;
-
-    // fix GetFolder return path
-    mProgramDir = aDir;
-    NS_ADDREF(mProgramDir);
-
-    // make sure registry updates go to the right place
-    nsFileSpec instDir;
-    if (NS_SUCCEEDED( aDir->GetFileSpec( &instDir ) ) )
-        VR_SetRegDirectory( instDir.GetNativePathCString() );
-
-    // Create the logfile observer
-    nsLoggingProgressNotifier *logger = new nsLoggingProgressNotifier();
-    RegisterNotifier(logger);
-
-    // setup version registry path
-    char*    path;
-    nsresult rv = aDir->GetNativePath( &path );
-    if (NS_SUCCEEDED(rv))
-    {
-        VR_SetRegDirectory( path );
-        nsCRT::free( path );
-    }
-
-    return rv;
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-// nsSoftwareUpdateNameSet
-////////////////////////////////////////////////////////////////////////////////
-
-nsSoftwareUpdateNameSet::nsSoftwareUpdateNameSet()
-{
-    NS_INIT_ISUPPORTS();
-}
-
-nsSoftwareUpdateNameSet::~nsSoftwareUpdateNameSet()
-{
-}
-
-NS_IMPL_ISUPPORTS(nsSoftwareUpdateNameSet, kIScriptExternalNameSetIID);
-
-
-NS_IMETHODIMP
-nsSoftwareUpdateNameSet::InitializeClasses(nsIScriptContext* aScriptContext)
-{
-    nsresult result = NS_OK;
-
-    result = NS_InitInstallVersionClass(aScriptContext, nsnull);
-    if (NS_FAILED(result)) return result;
-
-    result = NS_InitInstallTriggerGlobalClass(aScriptContext, nsnull);
-
-    return result;
-}
-
-
-NS_IMETHODIMP
-nsSoftwareUpdateNameSet::AddNameSet(nsIScriptContext* aScriptContext)
-{
-    nsresult result = NS_OK;
-    nsIScriptNameSpaceManager* manager;
-
-    result = aScriptContext->GetNameSpaceManager(&manager);
-    if (NS_SUCCEEDED(result)) 
-    {
-        result = manager->RegisterGlobalName("InstallVersion", 
-                                             kInstallVersion_CID, 
-                                             PR_TRUE);
-        
-        if (NS_FAILED(result))  return result;
-        
-        result = manager->RegisterGlobalName("InstallTrigger", 
-                                             kInstallTrigger_CID, 
-                                             PR_FALSE);
-
-    }
-    
-    if (manager != nsnull)
-        NS_RELEASE(manager);
-
-    return result;
-}
-            
-//----------------------------------------------------------------------
-
-// Functions used to create new instances of a given object by the
-// generic factory.
-
-NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsSoftwareUpdate,nsSoftwareUpdate::GetInstance);
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsInstallTrigger);
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsInstallVersion);
-//----------------------------------------------------------------------
-
-
-
-static NS_METHOD 
-RegisterSoftwareUpdate( nsIComponentManager *aCompMgr,
-                        nsIFile *aPath,
-                        const char *registryLocation,
-                        const char *componentType)
-{
-    // get the registry
-    nsIRegistry* registry;
-    nsresult rv = nsServiceManager::GetService(NS_REGISTRY_PROGID,
-                                               NS_GET_IID(nsIRegistry),
-                                               (nsISupports**)&registry);
-    if ( NS_SUCCEEDED( rv ) ) 
-    {
-        registry->OpenWellKnownRegistry(nsIRegistry::ApplicationComponentRegistry);
-        char buffer[256];
-        char *cid = nsSoftwareUpdate::GetCID().ToString();
-        PR_snprintf( buffer,
-                     sizeof buffer,
-                     "%s/%s",
-                     NS_IAPPSHELLCOMPONENT_KEY,
-                     cid ? cid : "unknown" );
-        nsCRT::free(cid);
-
-        nsRegistryKey key;
-        rv = registry->AddSubtree( nsIRegistry::Common,
-                                   buffer,
-                                   &key );
-        nsServiceManager::ReleaseService(NS_REGISTRY_PROGID, registry);
-    }
-    return rv;
-
-}
-
-
-// The list of components we register
-static nsModuleComponentInfo components[] = 
-{
-    { "SoftwareUpdate Component", 
-       NS_SoftwareUpdate_CID,
-       NS_IXPINSTALLCOMPONENT_PROGID,
-       nsSoftwareUpdateConstructor,
-       RegisterSoftwareUpdate
-    },
-	   
-    { "InstallTrigger Component", 
-       NS_SoftwareUpdateInstallTrigger_CID,
-       NS_INSTALLTRIGGERCOMPONENT_PROGID, 
-       nsInstallTriggerConstructor
-    },
-    
-    { "InstallVersion Component", 
-       NS_SoftwareUpdateInstallVersion_CID,
-       NS_INSTALLVERSIONCOMPONENT_PROGID,
-       nsInstallVersionConstructor 
-    },
-
-#if NOTIFICATION_ENABLED 
-    { "XPInstall Update Notifier", 
-      NS_XPI_UPDATE_NOTIFIER_CID,
-      NS_XPI_UPDATE_NOTIFIER_PROGID, 
-      nsXPINotifierImpl::New
-    },
-#endif
-
-};
-
-
-
-NS_IMPL_NSGETMODULE("nsSoftwareUpdate", components)
-

mozilla/xpinstall/src/nsSoftwareUpdate.h

@@ -1,114 +0,0 @@
-
-#ifndef nsSoftwareUpdate_h___
-#define nsSoftwareUpdate_h___
-
-#include "nsSoftwareUpdateIIDs.h"
-#include "nsISoftwareUpdate.h"
-
-#include "nscore.h"
-#include "nsIFactory.h"
-#include "nsISupports.h"
-#include "nsString.h"
-#include "nsVoidArray.h"
-#include "prlock.h"
-//#include "mozreg.h"
-#include "NSReg.h"
-
-class nsInstallInfo;
-
-#include "nsIScriptExternalNameSet.h"
-#include "nsIAppShellComponent.h"
-#include "nsIXPINotifier.h"
-#include "nsPIXPIStubHook.h"
-#include "nsTopProgressNotifier.h"
-
-#if NOTIFICATION_ENABLE
-#include "nsIUpdateNotification.h"
-#endif
-
-
-#define XPI_ROOT_KEY    "software/mozilla/xpinstall"
-#define XPI_AUTOREG_VAL "Autoreg"
-#define XPCOM_KEY       "software/mozilla/XPCOM"
-
-class nsSoftwareUpdate: public nsIAppShellComponent, 
-                        public nsISoftwareUpdate, 
-                        public nsPIXPIStubHook
-{
-    public:
-        
-        NS_DEFINE_STATIC_CID_ACCESSOR( NS_SoftwareUpdate_CID );
-
-        static nsSoftwareUpdate *GetInstance();
-
-        /** GetProgramDirectory
-         *  information used within the XPI module -- not
-         *  available through any interface
-         */
-        static nsIFileSpec* GetProgramDirectory() { return mProgramDir; }
-
-        NS_DECL_ISUPPORTS
-        NS_DECL_NSIAPPSHELLCOMPONENT
-        
-        NS_IMETHOD InstallJar( nsIFileSpec* localFile,
-                               const PRUnichar* URL,
-                               const PRUnichar* arguments,
-                               long flags = 0,
-                               nsIXPINotifier* notifier = 0);  
-
-        NS_IMETHOD RegisterNotifier(nsIXPINotifier *notifier);
-        
-        NS_IMETHOD InstallJarCallBack();
-        NS_IMETHOD GetMasterNotifier(nsIXPINotifier **notifier);
-        NS_IMETHOD SetActiveNotifier(nsIXPINotifier *notifier);
-        NS_IMETHOD StartupTasks( PRBool* needAutoreg );
-
-        /** StubInitialize() is private for the Install Wizard.
-         *  The mStubLockout property makes sure this is only called
-         *  once, and is also set by the AppShellComponent initialize
-         *  so it can't be called during a normal Mozilla run
-         */
-        NS_IMETHOD StubInitialize(nsIFileSpec *dir);
-
-        nsSoftwareUpdate();
-        virtual ~nsSoftwareUpdate();
-
-
-    private:
-        static   nsSoftwareUpdate* mInstance;
-        static   nsIFileSpec*      mProgramDir;
-
-#if NOTIFICATION_ENABLE
-        static   nsIUpdateNotification *mUpdateNotifier;
-#endif
-        
-        nsresult RunNextInstall();
-        nsresult RegisterNameset();
-        
-        PRLock*           mLock;
-        PRBool            mInstalling;
-        PRBool            mStubLockout;
-        nsVoidArray       mJarInstallQueue;
-        nsTopProgressNotifier   mMasterNotifier;
-
-        HREG              mReg;
-        
-        
-
-};
-
-
-class nsSoftwareUpdateNameSet : public nsIScriptExternalNameSet 
-{
-    public:
-        nsSoftwareUpdateNameSet();
-        virtual ~nsSoftwareUpdateNameSet();
-
-        // nsISupports
-        NS_DECL_ISUPPORTS
-
-        // nsIScriptExternalNameSet
-        NS_IMETHOD InitializeClasses(nsIScriptContext* aScriptContext);
-        NS_IMETHOD AddNameSet(nsIScriptContext* aScriptContext);
-};
-#endif

mozilla/xpinstall/src/nsSoftwareUpdateRun.cpp

@@ -1,448 +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.1 (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.
- *
- * Contributor(s): 
- *     Daniel Veditz <dveditz@netscape.com>
- *     Douglas Turner <dougt@netscape.com>
- */
-
-#include "nsSoftwareUpdate.h"
-#include "nsSoftwareUpdateRun.h"
-#include "nsSoftwareUpdateIIDs.h"
-
-#include "nsInstall.h"
-
-#include "nsRepository.h"
-#include "nsIServiceManager.h"
-
-#include "nsSpecialSystemDirectory.h"
-#include "nsFileStream.h"
-
-#include "nspr.h"
-#include "jsapi.h"
-
-#include "nsIEventQueueService.h"
-#include "nsIEnumerator.h"
-#include "nsIZipReader.h"
-#include "nsIJSRuntimeService.h"
-#include "nsCOMPtr.h"
-
-#include "nsIEventQueueService.h"
-#include "nsILocalFile.h"
-
-static NS_DEFINE_CID(kSoftwareUpdateCID,  NS_SoftwareUpdate_CID);
-static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
-
-extern JSObject *InitXPInstallObjects(JSContext *jscontext, JSObject *global, const nsFileSpec& jarfile, const PRUnichar* url, const PRUnichar* args, nsIZipReader* hZip);
-extern nsresult InitInstallVersionClass(JSContext *jscontext, JSObject *global, void** prototype);
-extern nsresult InitInstallTriggerGlobalClass(JSContext *jscontext, JSObject *global, void** prototype);
-
-// Defined in this file:
-static void     XPInstallErrorReporter(JSContext *cx, const char *message, JSErrorReport *report);
-static PRInt32  GetInstallScriptFromJarfile(nsIZipReader* hZip, nsFileSpec& jarFile, char** scriptBuffer, PRUint32 *scriptLength);
-static nsresult SetupInstallContext(nsIZipReader* hZip, const nsFileSpec& jarFile, const PRUnichar* url, const PRUnichar* args, JSRuntime *jsRT, JSContext **jsCX, JSObject **jsGlob);
-
-extern "C" void RunInstallOnThread(void *data);
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////
-// Function name    : XPInstallErrorReporter
-// Description      : Prints error message to stdout
-// Return type      : void
-// Argument         : JSContext *cx
-// Argument         : const char *message
-// Argument         : JSErrorReport *report
-///////////////////////////////////////////////////////////////////////////////////////////////
-static void
-XPInstallErrorReporter(JSContext *cx, const char *message, JSErrorReport *report)
-{
-    int i, j, k, n;
-
-    fputs("xpinstall: ", stderr);
-    if (!report) 
-    {
-        fprintf(stderr, "%s\n", message);
-        return;
-    }
-
-    if (report->filename)
-        fprintf(stderr, "%s, ", report->filename);
-    if (report->lineno)
-        fprintf(stderr, "line %u: ", report->lineno);
-    fputs(message, stderr);
-    if (!report->linebuf) 
-    {
-        putc('\n', stderr);
-        return;
-    }
-
-    fprintf(stderr, ":\n%s\n", report->linebuf);
-    n = report->tokenptr - report->linebuf;
-    for (i = j = 0; i < n; i++) {
-        if (report->linebuf[i] == '\t') {
-            for (k = (j + 8) & ~7; j < k; j++)
-                putc('.', stderr);
-            continue;
-        }
-        putc('.', stderr);
-        j++;
-    }
-    fputs("^\n", stderr);
-}
-
-
-
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////
-// Function name    : GetInstallScriptFromJarfile
-// Description      : Extracts and reads in a install.js file from a passed jar file.
-// Return type      : static PRInt32 
-// Argument         : const char* jarFile     - **NSPR** filepath
-// Argument         : char** scriptBuffer     - must be deleted via delete []
-// Argument         : PRUint32 *scriptLength
-///////////////////////////////////////////////////////////////////////////////////////////////
-
-static PRInt32
-GetInstallScriptFromJarfile(nsIZipReader* hZip, nsFileSpec& jarFile, char** scriptBuffer, PRUint32 *scriptLength)
-{
-    PRInt32 result = NS_OK;
-    
-    *scriptBuffer = nsnull;
-    *scriptLength = 0;
-
-    nsCOMPtr<nsILocalFile> jFile;
-    nsresult rv = NS_NewLocalFile(jarFile, getter_AddRefs(jFile));
-    if (NS_SUCCEEDED(rv))
-      rv = hZip->Init(jFile);
-
-    if (NS_FAILED(rv))
-        return nsInstall::CANT_READ_ARCHIVE;
-
-    rv = hZip->Open();
-    if (NS_FAILED(rv))
-        return nsInstall::CANT_READ_ARCHIVE;
-
-    // Extract the install.js file to the temporary directory
-    nsSpecialSystemDirectory installJSFileSpec(nsSpecialSystemDirectory::OS_TemporaryDirectory);
-    installJSFileSpec += "install.js";
-    installJSFileSpec.MakeUnique();
-
-    // Extract the install.js file.
-    nsCOMPtr<nsILocalFile> iFile;
-    rv = NS_NewLocalFile(installJSFileSpec, getter_AddRefs(iFile));
-    if (NS_SUCCEEDED(rv))
-      rv = hZip->Extract("install.js", iFile);
-    if ( NS_SUCCEEDED(rv) )
-    {
-        // Read it into a buffer
-        char* buffer;
-        PRUint32 bufferLength;
-        PRUint32 readLength;
-        result = nsInstall::CANT_READ_ARCHIVE;
-
-        nsInputFileStream fileStream(installJSFileSpec);
-        nsCOMPtr<nsIInputStream> instream = fileStream.GetIStream();
-
-        if ( instream )
-        {
-            instream->Available(&bufferLength);
-            buffer = new char[bufferLength + 1];
-
-            if (buffer != nsnull)
-            {
-                rv = instream->Read(buffer, bufferLength, &readLength);
-
-                if (NS_SUCCEEDED(rv) && readLength > 0)
-                {
-                    *scriptBuffer = buffer;
-                    *scriptLength = readLength;
-                    result = NS_OK;
-                }
-                else
-                {
-                    delete [] buffer;
-                }
-            }
-
-            fileStream.close();
-        }
-
-        installJSFileSpec.Delete(PR_FALSE);
-    }
-    else
-    {
-        result = nsInstall::NO_INSTALL_SCRIPT;
-    }
-
-    return result;   
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////
-// Function name    : SetupInstallContext
-// Description      : Creates a Javascript context and adds our xpinstall objects to it.
-// Return type      : static nsresult
-// Argument         : nsIZipReader hZip - the handle to the open archive file
-// Argument         : const char* jarFile - native filepath to where jar exists on disk 
-// Argument         : const PRUnichar* url  - URL of where this package came from
-// Argument         : const PRUnichar* args    - any arguments passed into the javascript context
-// Argument         : JSRuntime *jsRT    - A valid JS Runtime
-// Argument         : JSContext **jsCX   - Created context, destroy via JS_DestroyContext
-// Argument         : JSObject **jsGlob  - created global object
-///////////////////////////////////////////////////////////////////////////////////////////////
-static nsresult SetupInstallContext(nsIZipReader* hZip,
-                                    const nsFileSpec& jarFile,
-                                    const PRUnichar* url,
-                                    const PRUnichar* args, 
-                                    JSRuntime *rt, 
-                                    JSContext **jsCX, 
-                                    JSObject **jsGlob)
-{
-    JSContext   *cx;
-    JSObject    *glob;
-    
-    *jsCX   = nsnull;
-    *jsGlob = nsnull;
-
-    if (!rt) 
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    cx = JS_NewContext(rt, 8192);
-    if (!cx)
-    {
-        return NS_ERROR_OUT_OF_MEMORY;
-    }
-
-    JS_SetErrorReporter(cx, XPInstallErrorReporter);
-
-
-    glob = InitXPInstallObjects(cx, nsnull, jarFile, url, args, hZip);
-    // Init standard classes
-    JS_InitStandardClasses(cx, glob);
-
-    // Add our Install class to this context
-    InitInstallVersionClass(cx, glob, nsnull);
-    InitInstallTriggerGlobalClass(cx, glob, nsnull);
-
-    *jsCX   = cx;
-    *jsGlob = glob;
-
-    return NS_OK;
-}
-
-
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////
-// Function name	: RunInstall
-// Description	    : Creates our Install Thread.
-// Return type		: PRInt32 
-// Argument         : nsInstallInfo *installInfo
-///////////////////////////////////////////////////////////////////////////////////////////////
-PRInt32 RunInstall(nsInstallInfo *installInfo)
-{   
-    if (installInfo->GetFlags() & XPI_NO_NEW_THREAD)
-    {
-        RunInstallOnThread((void *)installInfo);
-    }
-    else
-    {
-        PR_CreateThread(PR_USER_THREAD,
-                        RunInstallOnThread,
-                        (void*)installInfo, 
-                        PR_PRIORITY_NORMAL, 
-                        PR_GLOBAL_THREAD, 
-                        PR_UNJOINABLE_THREAD,
-                        0);  
-    }
-    return 0;
-}
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////
-// Function name	: RunInstallOnThread
-// Description	    : called by starting thread.  It directly calls the C api for xpinstall, 
-//                  : and once that returns, it calls the completion routine to notify installation
-//                  : completion.
-// Return type		: extern "C" 
-// Argument         : void *data
-///////////////////////////////////////////////////////////////////////////////////////////////
-extern "C" void RunInstallOnThread(void *data)
-{
-    nsInstallInfo *installInfo = (nsInstallInfo*)data;
-    
-    char        *scriptBuffer = nsnull;
-    PRUint32    scriptLength;
-
-    JSRuntime   *rt;
-    JSContext   *cx;
-    JSObject    *glob;
-
-    nsCOMPtr<nsIZipReader> hZip;
-
-    static NS_DEFINE_IID(kIZipReaderIID, NS_IZIPREADER_IID);
-    static NS_DEFINE_IID(kZipReaderCID,  NS_ZIPREADER_CID);
-    nsresult rv = nsComponentManager::CreateInstance(kZipReaderCID, nsnull, kIZipReaderIID, 
-                                                     getter_AddRefs(hZip));
-
-    if (NS_FAILED(rv))
-        return;
-
-    // we will plan on sending a failure status back from here unless we
-    // find positive acknowledgement that the script sent the status
-    PRInt32     finalStatus;
-    PRBool      sendStatus = PR_TRUE;
-
-    nsIXPINotifier *notifier;
-
-    // lets set up an eventQ so that our xpcom/proxies will not have to:
-    nsCOMPtr<nsIEventQueue> eventQ;
-    NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv);
-    if (NS_SUCCEEDED(rv)) 
-    {   
-        eventQService->CreateThreadEventQueue();
-        eventQService->GetThreadEventQueue(NS_CURRENT_THREAD, getter_AddRefs(eventQ));
-    }
-
-    NS_WITH_SERVICE(nsISoftwareUpdate, softwareUpdate, kSoftwareUpdateCID, &rv );
-
-    if (!NS_SUCCEEDED(rv))
-    {
-        NS_WARNING("shouldn't have RunInstall() if we can't get SoftwareUpdate");
-        return;
-    }
-
-    softwareUpdate->SetActiveNotifier( installInfo->GetNotifier() );
-    softwareUpdate->GetMasterNotifier(&notifier);
-    
-    nsString url;
-    installInfo->GetURL(url);
-
-    if(notifier)
-        notifier->BeforeJavascriptEvaluation( url.GetUnicode() );
-    
-    nsString args;
-    installInfo->GetArguments(args);
-
-    nsFileSpec jarpath;
-    rv = installInfo->GetLocalFile(jarpath);
-    if (NS_SUCCEEDED(rv))
-	{
-        finalStatus = GetInstallScriptFromJarfile( hZip,
-                                                   jarpath,
-                                                   &scriptBuffer, 
-                                                   &scriptLength);
-
-        if ( finalStatus == NS_OK && scriptBuffer )
-        {
-            PRBool ownRuntime = PR_FALSE;
-
-            NS_WITH_SERVICE(nsIJSRuntimeService, rtsvc, "nsJSRuntimeService", &rv);
-            if(NS_FAILED(rv) || NS_FAILED(rtsvc->GetRuntime(&rt)))
-            {
-                // service not available (wizard context?)
-                // create our own runtime
-                ownRuntime = PR_TRUE;
-	            rt = JS_Init(4L * 1024L * 1024L);
-            }
-
-            rv = SetupInstallContext( hZip, jarpath, 
-                                      url.GetUnicode(),
-                                      args.GetUnicode(), 
-                                      rt, &cx, &glob);
-
-            if (NS_SUCCEEDED(rv))
-            {
-                // Go ahead and run!!
-                jsval rval;
-                jsval installedFiles;
-
-                PRBool ok = JS_EvaluateScript(  cx, 
-                                                glob,
-                                                scriptBuffer, 
-                                                scriptLength,
-                                                nsnull,
-                                                0,
-                                                &rval);
-
-
-                if(!ok)
-                {
-                    // problem compiling or running script
-                    if(JS_GetProperty(cx, glob, "_installedFiles", &installedFiles) &&
-                       JSVAL_TO_BOOLEAN(installedFiles))
-                    {
-                        nsInstall *a = (nsInstall*)JS_GetPrivate(cx, glob);
-                        a->InternalAbort(nsInstall::SCRIPT_ERROR);
-                    }
-
-                    finalStatus = nsInstall::SCRIPT_ERROR;
-                }
-                else
-                {
-                    // check to make sure the script sent back a status
-                    jsval sent;
-
-                    if(JS_GetProperty(cx, glob, "_installedFiles", &installedFiles) &&
-                       JSVAL_TO_BOOLEAN(installedFiles))
-                    {
-                      nsInstall *a = (nsInstall*)JS_GetPrivate(cx, glob);
-                      a->InternalAbort(nsInstall::SCRIPT_ERROR);
-                    }
-
-                    if ( JS_GetProperty( cx, glob, "_statusSent", &sent ) &&
-                         JSVAL_TO_BOOLEAN(sent) )
-                        sendStatus = PR_FALSE;
-                    else
-                        finalStatus = nsInstall::SCRIPT_ERROR;
-                }
-
-                JS_DestroyContext(cx);
-            }
-            else
-            {
-                // couldn't initialize install context
-                finalStatus = nsInstall::UNEXPECTED_ERROR;
-            }
-
-            // clean up Runtime if we created it ourselves
-            if ( ownRuntime ) 
-                JS_DestroyRuntime(rt);
-        }
-    }
-    else 
-    {
-        // no path to local jar archive
-        finalStatus = nsInstall::DOWNLOAD_ERROR;
-    }
-
-    if(notifier) 
-    {
-        if ( sendStatus )
-            notifier->FinalStatus( url.GetUnicode(), finalStatus );
-
-        notifier->AfterJavascriptEvaluation( url.GetUnicode() );
-    }
-
-    if (scriptBuffer) delete [] scriptBuffer;
-
-    softwareUpdate->SetActiveNotifier(0);
-    softwareUpdate->InstallJarCallBack();
-}

mozilla/xpinstall/src/nsSoftwareUpdateRun.h

@@ -1,6 +0,0 @@
-#ifndef __NS_SoftwareUpdateRun_H__
-#define __NS_SoftwareUpdateRun_H__
-
-PRInt32 RunInstall(nsInstallInfo *installInfo);
-
-#endif