C++ side of fix for bug 100212 - move consumers of nsIFile.URL into nsIIOService. r=dougt, sr=darin

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

mozilla/mailnews/base/public/nsIMapiRegistry.idl

@@ -0,0 +1,70 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla 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/MPL/
+ *
+ * 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 the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Srilatha Moturi <srilatha@netscape.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsISupports.idl"
+
+interface nsIDOMWindow;
+
+/**
+ * This interface provides support for registering Mozilla as the default
+ * Mail Client. This interface can also be used to get/set the user preference
+ * for the default Mail Client.
+ * 
+ */
+[scriptable, uuid(c5be14ba-4e0a-4eec-a1b8-04363761d63c)]
+interface nsIMapiRegistry: nsISupports {
+
+   /** This is set to TRUE if Mozilla is the default Application
+    */
+   attribute boolean isDefaultMailClient;
+
+   /** This is set TRUE only once per session.
+    */
+   readonly attribute boolean showDialog;
+
+   /** This will bring the dialog asking the user if he/she wants to set
+    * Mozilla as default Mail Client.
+    * Call this only if Mozilla is not the default Mail client
+    */
+   void showMailIntegrationDialog(in nsIDOMWindow parentWindow);
+   
+};
+
+%{C++
+#define NS_IMAPIREGISTRY_CONTRACTID    "@mozilla.org/mapiregistry;1"
+#define NS_IMAPIREGISTRY_CLASSNAME "Mozilla MAPI Registry"
+%}

mozilla/mailnews/mapi/makefile.win

@@ -0,0 +1,27 @@
+#!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.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): Srilatha Moturi  <srilatha@netscape.com>
+#                 Krishna Mohan Khandrika <kkhandrika@netscape.com>
+
+DEPTH=..\..
+
+DIRS=mapihook resources mapiDll
+
+include <$(DEPTH)\config\rules.mak>

mozilla/mailnews/mapi/mapiDll/Mapi32.DEF

@@ -0,0 +1,54 @@
+; ***** BEGIN LICENSE BLOCK *****
+; Version: MPL 1.1/GPL 2.0/LGPL 2.1
+;
+; The contents of this file are subject to the Mozilla 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/MPL/
+;
+; 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.
+;
+; The Initial Developer of the Original Code is
+; Netscape Communications Corp.
+; Portions created by the Initial Developer are Copyright (C) 2001
+; the Initial Developer. All Rights Reserved.
+;
+; Contributor(s):  Krishna Mohan Khandrika (kkhandrika@netscape.com)
+;
+; Alternatively, the contents of this file may be used under the terms of
+; either the GNU General Public License Version 2 or later (the "GPL"), or
+; the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+; in which case the provisions of the GPL or the LGPL are applicable instead
+; of those above. If you wish to allow use of your version of this file only
+; under the terms of either the GPL or the LGPL, and not to allow others to
+; use your version of this file under the terms of the MPL, indicate your
+; decision by deleting the provisions above and replace them with the notice
+; and other provisions required by the GPL or the LGPL. If you do not delete
+; the provisions above, a recipient may use your version of this file under
+; the terms of any one of the MPL, the GPL or the LGPL.
+;
+; ***** END LICENSE BLOCK ***** 
+
+LIBRARY         mozMapi32.dll
+DESCRIPTION     'Mozilla Simple MAPI Support'
+
+EXPORTS
+        MAPILogon
+        MAPILogoff
+	MAPISendMail
+	MAPISendDocuments
+        MAPIFindNext
+        MAPIReadMail
+        MAPISaveMail
+        MAPIDeleteMail
+        MAPIAddress
+        MAPIDetails
+        MAPIResolveName
+        MAPIFreeBuffer
+        GetMapiDllVersion
+

mozilla/mailnews/mapi/mapiDll/MapiDll.cpp

@@ -0,0 +1,346 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla 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/MPL/
+ *
+ * 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
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corp.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
+ * Contributor(s): Rajiv Dayal (rdayal@netscape.com)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include <windows.h>
+#include <tchar.h>
+#include <mapidefs.h>
+#include <mapi.h>
+#include "msgMapi.h"
+#include "msgMapiMain.h"
+
+#define MAX_RECIPS  100
+#define MAX_FILES   100
+
+const CLSID CLSID_CMapiImp = {0x29f458be, 0x8866, 0x11d5,
+                              {0xa3, 0xdd, 0x0, 0xb0, 0xd0, 0xf3, 0xba, 0xa7}};
+const IID IID_nsIMapi = {0x6EDCD38E,0x8861,0x11d5,
+                        {0xA3,0xDD,0x00,0xB0,0xD0,0xF3,0xBA,0xA7}};
+
+DWORD tId = 0;
+
+BOOL WINAPI DllMain(HINSTANCE aInstance, DWORD aReason, LPVOID aReserved)
+{
+    switch (aReason)
+    {
+        case DLL_PROCESS_ATTACH : tId = TlsAlloc();
+                                  if (tId == 0xFFFFFFFF)
+                                      return FALSE;
+                                  break;
+
+        case DLL_PROCESS_DETACH : TlsFree(tId);
+                                  break;
+    }
+    return TRUE;
+}
+
+BOOL InitMozillaReference(nsIMapi **aRetValue)
+{
+    // Check wehther this thread has a valid Interface
+    // by looking into thread-specific-data variable
+
+    *aRetValue = (nsIMapi *)TlsGetValue(tId);
+
+    // Check whether the pointer actually resolves to
+    // a valid method call; otherwise mozilla is not running
+
+    if ((*aRetValue) && (*aRetValue)->IsValid() == S_OK)
+         return TRUE;
+
+    HRESULT hRes = ::CoInitialize(nsnull) ;
+
+    hRes = ::CoCreateInstance(CLSID_CMapiImp, NULL, CLSCTX_LOCAL_SERVER,
+                                         IID_nsIMapi, (LPVOID *)aRetValue);
+
+    if (hRes == S_OK && (*aRetValue)->Initialize() == S_OK)
+        if (TlsSetValue(tId, (LPVOID)(*aRetValue)))
+            return TRUE;
+
+    // Either CoCreate or TlsSetValue failed; so return FALSE
+
+    if ((*aRetValue))
+        (*aRetValue)->Release();
+
+            ::CoUninitialize();
+    return FALSE;
+}
+
+////////////////////////////////////////////////////////////////////////////////////////
+// The MAPILogon function begins a Simple MAPI session, loading the default message ////
+// store and address book providers                            ////
+////////////////////////////////////////////////////////////////////////////////////////
+
+ULONG FAR PASCAL MAPILogon(ULONG aUIParam, LPTSTR aProfileName,
+                            LPTSTR aPassword, FLAGS aFlags,
+                            ULONG aReserved, LPLHANDLE aSession)
+{
+    HRESULT hr = 0;
+    ULONG nSessionId = 0;
+    nsIMapi *pNsMapi = NULL;
+
+    if (!InitMozillaReference(&pNsMapi))
+        return MAPI_E_FAILURE;
+
+    if (!(aFlags & MAPI_UNICODE))
+    {
+        // Need to convert the parameters to Unicode.
+
+        char *pUserName = (char *) aProfileName;
+        char *pPassWord = (char *) aPassword;
+
+        TCHAR ProfileName[MAX_NAME_LEN] = {0};
+        TCHAR PassWord[MAX_PW_LEN] = {0};
+
+        if (pUserName != NULL)
+        {
+            if (!MultiByteToWideChar(CP_ACP, 0, pUserName, -1, ProfileName,
+                                                            MAX_NAME_LEN))
+                return MAPI_E_FAILURE;
+        }
+
+        if (pPassWord != NULL)
+        {
+            if (!MultiByteToWideChar(CP_ACP, 0, pPassWord, -1, PassWord,
+                                                            MAX_NAME_LEN))
+                return MAPI_E_FAILURE;
+        }
+
+        hr = pNsMapi->Login(aUIParam, ProfileName, PassWord, aFlags,
+                                                        &nSessionId);
+    }
+    else
+        hr = pNsMapi->Login(aUIParam, aProfileName, aPassword,
+                                                aFlags, &nSessionId);
+    if (hr == S_OK)
+        (*aSession) = (LHANDLE) nSessionId;
+    else
+        return nSessionId;
+
+    return SUCCESS_SUCCESS;
+}
+
+ULONG FAR PASCAL MAPILogoff (LHANDLE aSession, ULONG aUIParam,
+                                            FLAGS aFlags, ULONG aReserved)
+{
+    nsIMapi *pNsMapi = (nsIMapi *)TlsGetValue(tId);
+    if (pNsMapi != NULL)
+    {
+        if (pNsMapi->Logoff((ULONG) aSession) == S_OK)
+            pNsMapi->Release();
+        pNsMapi = NULL;
+    }
+
+    TlsSetValue(tId, NULL);
+
+    ::CoUninitialize();
+
+    return SUCCESS_SUCCESS;
+}
+
+ULONG FAR PASCAL MAPISendMail (LHANDLE lhSession, ULONG ulUIParam, lpnsMapiMessage lpMessage,
+                FLAGS flFlags, ULONG ulReserved )
+{
+    HRESULT hr = 0;
+    BOOL bTempSession = FALSE ;
+    nsIMapi *pNsMapi = NULL;
+
+    if (!InitMozillaReference(&pNsMapi))
+        return MAPI_E_FAILURE;
+
+    if (lpMessage->nRecipCount > MAX_RECIPS)
+        return MAPI_E_TOO_MANY_RECIPIENTS ;
+
+    if (lpMessage->nFileCount > MAX_FILES)
+        return MAPI_E_TOO_MANY_FILES ;
+
+    if ( (!(flFlags & MAPI_DIALOG)) && (lpMessage->lpRecips == NULL) )
+        return MAPI_E_UNKNOWN_RECIPIENT ;
+
+    if (!lhSession || pNsMapi->IsValidSession(lhSession) != S_OK)
+    {
+        FLAGS LoginFlag ;
+        if ( (flFlags & MAPI_LOGON_UI) && (flFlags & MAPI_NEW_SESSION) )
+            LoginFlag = MAPI_LOGON_UI | MAPI_NEW_SESSION ;
+        else if (flFlags & MAPI_LOGON_UI) 
+            LoginFlag = MAPI_LOGON_UI ;
+
+        hr = MAPILogon (ulUIParam, (LPTSTR) NULL, (LPTSTR) NULL, LoginFlag, 0, &lhSession) ;
+        if (hr != SUCCESS_SUCCESS)
+            return MAPI_E_LOGIN_FAILURE ;
+        bTempSession = TRUE ;
+    }
+
+    // we need to deal with null data passed in by MAPI clients, specially when MAPI_DIALOG is set.
+    // The MS COM type lib code generated by MIDL for the MS COM interfaces checks for these parameters
+    // to be non null, although null is a valid value for them here. 
+    nsMapiRecipDesc * lpRecips ;
+    nsMapiFileDesc * lpFiles ;
+
+    nsMapiMessage Message ;
+    memset (&Message, 0, sizeof (nsMapiMessage) ) ;
+    nsMapiRecipDesc Recipient ;
+    memset (&Recipient, 0, sizeof (nsMapiRecipDesc) );
+    nsMapiFileDesc Files ;
+    memset (&Files, 0, sizeof (nsMapiFileDesc) ) ;
+
+    if(!lpMessage)
+    {
+       lpMessage = &Message ;
+    }
+    if(!lpMessage->lpRecips)
+    {
+        lpRecips = &Recipient ;
+    }
+    else
+        lpRecips = lpMessage->lpRecips ;
+    if(!lpMessage->lpFiles)
+    {
+        lpFiles = &Files ;
+    }
+    else
+        lpFiles = lpMessage->lpFiles ;
+
+    HANDLE hEvent = CreateEvent (NULL, FALSE, FALSE, (LPCTSTR) MAPI_SENDCOMPLETE_EVENT) ;
+
+    hr = pNsMapi->SendMail (lhSession, lpMessage, 
+                            (short) lpMessage->nRecipCount, lpRecips,
+                            (short) lpMessage->nFileCount, lpFiles,
+                            flFlags, ulReserved);
+
+    // we are seeing a problem when using Word, although we return success from the MAPI support
+    // MS COM interface in mozilla, we are getting this error here. This is a temporary hack !!
+    if (hr == 0x800703e6)
+        hr = SUCCESS_SUCCESS;
+    
+    if (hr == SUCCESS_SUCCESS)
+        WaitForSingleObject (hEvent, INFINITE) ;
+    CloseHandle (hEvent) ;
+    
+    if (bTempSession)
+        MAPILogoff (lhSession, ulUIParam, 0,0) ;
+
+    return hr ; 
+}
+
+
+ULONG FAR PASCAL MAPISendDocuments(ULONG ulUIParam, LPTSTR lpszDelimChar, LPTSTR lpszFilePaths,
+                                LPTSTR lpszFileNames, ULONG ulReserved)
+{
+    LHANDLE lhSession ;
+    nsIMapi *pNsMapi = NULL;
+
+    if (!InitMozillaReference(&pNsMapi))
+        return MAPI_E_FAILURE;
+
+    unsigned long result = MAPILogon (ulUIParam, (LPTSTR) NULL, (LPTSTR) NULL, MAPI_LOGON_UI, 0, &lhSession) ;
+    if (result != SUCCESS_SUCCESS)
+        return MAPI_E_LOGIN_FAILURE ;
+
+    HRESULT hr;
+
+    HANDLE hEvent = CreateEvent (NULL, FALSE, FALSE, (LPCTSTR) MAPI_SENDCOMPLETE_EVENT) ;
+
+    hr = pNsMapi->SendDocuments(lhSession, (LPTSTR) lpszDelimChar, (LPTSTR) lpszFilePaths, 
+                                    (LPTSTR) lpszFileNames, ulReserved) ;
+
+    if (hr == SUCCESS_SUCCESS)
+        WaitForSingleObject (hEvent, INFINITE) ;
+    CloseHandle (hEvent) ;
+
+    MAPILogoff (lhSession, ulUIParam, 0,0) ;
+
+    return hr ;
+}
+
+ULONG FAR PASCAL MAPIFindNext(LHANDLE lhSession, ULONG ulUIParam, LPTSTR lpszMessageType,
+                              LPTSTR lpszSeedMessageID, FLAGS flFlags, ULONG ulReserved,
+                              LPTSTR lpszMessageID)
+{
+    return MAPI_E_FAILURE;
+}
+
+ULONG FAR PASCAL MAPIReadMail(LHANDLE lhSession, ULONG ulUIParam, LPTSTR lpszMessageID,
+                              FLAGS flFlags, ULONG ulReserved, lpMapiMessage FAR *lppMessage)
+{
+    return MAPI_E_FAILURE;
+}
+
+ULONG FAR PASCAL MAPISaveMail(LHANDLE lhSession, ULONG ulUIParam, lpMapiMessage lpMessage,
+                              FLAGS flFlags, ULONG ulReserved, LPTSTR lpszMessageID)
+{
+    return MAPI_E_FAILURE;
+}
+
+ULONG FAR PASCAL MAPIDeleteMail(LHANDLE lhSession, ULONG ulUIParam, LPTSTR lpszMessageID,
+                                FLAGS flFlags, ULONG ulReserved)
+{
+    return MAPI_E_FAILURE;
+}
+
+ULONG FAR PASCAL MAPIAddress(LHANDLE lhSession, ULONG ulUIParam, LPTSTR lpszCaption,
+                             ULONG nEditFields, LPTSTR lpszLabels, ULONG nRecips,
+                             lpMapiRecipDesc lpRecips, FLAGS flFlags,
+                             ULONG ulReserved, LPULONG lpnNewRecips,
+                             lpMapiRecipDesc FAR *lppNewRecips)
+{
+    return MAPI_E_FAILURE;
+}
+
+ULONG FAR PASCAL MAPIDetails(LHANDLE lhSession, ULONG ulUIParam, lpMapiRecipDesc lpRecip,
+                             FLAGS flFlags, ULONG ulReserved)
+{
+    return MAPI_E_FAILURE;
+}
+
+ULONG FAR PASCAL MAPIResolveName(LHANDLE lhSession, ULONG ulUIParam, LPTSTR lpszName,
+                                 FLAGS flFlags, ULONG ulReserved, lpMapiRecipDesc FAR *lppRecip)
+{
+    return MAPI_E_FAILURE;
+}
+
+ULONG FAR PASCAL MAPIFreeBuffer(LPVOID pv)
+{
+    return MAPI_E_FAILURE;
+}
+
+ULONG FAR PASCAL GetMapiDllVersion()
+{
+    return 94;
+}
+
+
+
+

mozilla/mailnews/mapi/mapiDll/makefile.win

@@ -0,0 +1,62 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla 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/MPL/
+#
+# 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.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corp.
+# Portions created by the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK ***** 
+
+DEPTH=..\..\..
+
+MODULE          = mozMapi32
+EXPORT_LIBRARY  = $(MODULE)
+LIBRARY_NAME    = $(MODULE)
+DEFFILE         = Mapi32.def
+
+REQUIRES	= MapiProxy \
+                  msgMapi \
+		  xpcom \
+		  string \
+		  $(NULL)
+
+include <$(DEPTH)\config\config.mak>
+###############################################################
+
+LCFLAGS=-DUNICODE -D_UNICODE
+
+OBJS= .\$(OBJDIR)\MapiDll.obj \
+	  $(NULL)
+
+WIN_LIBS= ole32.lib \
+          $(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+

mozilla/mailnews/mapi/mapihook/build/MapiProxy.def

@@ -0,0 +1,47 @@
+; ***** BEGIN LICENSE BLOCK *****
+; Version: MPL 1.1/GPL 2.0/LGPL 2.1
+;
+; The contents of this file are subject to the Mozilla 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/MPL/
+;
+; 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.
+;
+; The Initial Developer of the Original Code is
+; Netscape Communications Corp.
+; Portions created by the Initial Developer are Copyright (C) 2001
+; the Initial Developer. All Rights Reserved.
+;
+; Contributor(s):  Krishna Mohan Khandrika (kkhandrika@netscape.com)
+;
+; Alternatively, the contents of this file may be used under the terms of
+; either the GNU General Public License Version 2 or later (the "GPL"), or
+; the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+; in which case the provisions of the GPL or the LGPL are applicable instead
+; of those above. If you wish to allow use of your version of this file only
+; under the terms of either the GPL or the LGPL, and not to allow others to
+; use your version of this file under the terms of the MPL, indicate your
+; decision by deleting the provisions above and replace them with the notice
+; and other provisions required by the GPL or the LGPL. If you do not delete
+; the provisions above, a recipient may use your version of this file under
+; the terms of any one of the MPL, the GPL or the LGPL.
+;
+; ***** END LICENSE BLOCK ***** 
+
+LIBRARY         MapiProxy.dll
+DESCRIPTION     'Proxy/Stub DLL'
+
+EXPORTS
+                DllGetClassObject   @1  PRIVATE
+                DllCanUnloadNow     @2  PRIVATE
+                GetProxyDllInfo     @3  PRIVATE
+                DllRegisterServer   @4  PRIVATE
+                DllUnregisterServer @5  PRIVATE
+
+

mozilla/mailnews/mapi/mapihook/build/makefile.win

@@ -0,0 +1,68 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla 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/MPL/
+#
+# 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.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corp.
+# Portions created by the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):  Krishna Mohan Khandrika (kkhandrika@netscape.com)
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK ***** 
+
+DEPTH=..\..\..\..
+
+MODULE           = MapiProxy
+EXPORT_LIBRARY   = $(MODULE)
+LIBRARY_NAME     = $(MODULE)
+DEFFILE          = MapiProxy.def
+
+include <$(DEPTH)\config\config.mak>
+
+##################################################################
+
+LCFLAGS=-DREGISTER_PROXY_DLL -DUNICODE -D_UNICODE
+
+OBJS= .\$(OBJDIR)\dlldata.obj   \
+    .\$(OBJDIR)\msgMapi_p.obj     \
+    .\$(OBJDIR)\msgMapi_i.obj   \
+    $(NULL)
+
+WIN_LIBS= rpcrt4.lib
+
+EXPORTS= msgMapi.h  \
+     $(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+msgMapi.h msgMapi_p.c msgMapi_i.c dlldata.c : msgMapi.idl
+    midl $(UNICODE_FLAGS) msgMapi.idl
+
+clobber::
+	rm -f dlldata.c msgMapi_i.c msgMapi_p.c msgMapi.h
+
+

mozilla/mailnews/mapi/mapihook/build/msgMapi.idl

@@ -0,0 +1,114 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla 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/MPL/
+ *
+ * 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
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corp.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
+ * Contributor(s): Rajiv Dayal (rdayal@netscape.com)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+// This idl will be compiled by MIDL.  MS-COM is used 
+// as brdige between MAPI clients and the Mozilla.
+
+import "unknwn.idl";
+
+typedef wchar_t LOGIN_PW_TYPE[256];
+
+typedef struct
+{
+    unsigned long     ulReserved;            
+    unsigned long     flFlags;               /* Flags */
+    unsigned long     nPosition_NotUsed;     /* character in text to be replaced by attachment */
+    LPTSTR            lpszPathName;          /* Full path name including file name */
+    LPTSTR            lpszFileName;          /* Real (original) file name */
+    unsigned char *   lpFileType_NotUsed ;
+} nsMapiFileDesc, * lpnsMapiFileDesc;
+
+
+typedef struct
+{
+    unsigned long      ulReserved;           
+    unsigned long      ulRecipClass;  /* MAPI_TO, MAPI_CC, MAPI_BCC, MAPI_ORIG    */
+    LPTSTR             lpszName;      /* Recipient name to display */
+    LPTSTR             lpszAddress;   /* Recipient email address */
+    unsigned long      ulEIDSize_NotUsed;     
+    unsigned char  *   lpEntryID_NotUsed ;
+} nsMapiRecipDesc, * lpnsMapiRecipDesc;
+
+typedef struct
+{
+    unsigned long    ulReserved;					
+    LPTSTR           lpszSubject;  /* Message Subject */
+    LPTSTR           lpszNoteText; /* Message Text */
+    LPTSTR           lpszMessageType_NotUsed;		
+    LPTSTR           lpszDateReceived_notUsed;	 /* in YYYY/MM/DD HH:MM format */
+    LPTSTR           lpszConversationID_NotUsed; /* conversation thread ID */
+    unsigned long    flFlags; /* unread,return receipt */
+    lpnsMapiRecipDesc  lpOriginator;  /* Originator descriptor  */
+    unsigned long      nRecipCount;   /* Number of recipients   */
+    lpnsMapiRecipDesc  lpRecips;      /* Recipient descriptors  */
+    unsigned long      nFileCount;    /* # of file attachments  */
+    lpnsMapiFileDesc   lpFiles;       /* Attachment descriptors */
+} nsMapiMessage, * lpnsMapiMessage;
+
+
+[
+    object,
+    uuid(6EDCD38E-8861-11d5-A3DD-00B0D0F3BAA7),
+    helpstring("nsIMapi Inteface"),
+    pointer_default(unique)
+]
+
+interface nsIMapi : IUnknown
+{
+    HRESULT Login(unsigned long aUIArg, LOGIN_PW_TYPE aLogin,
+                  LOGIN_PW_TYPE aPassWord, unsigned long aFlags,
+                  [out] unsigned long *aSessionId);
+
+    HRESULT Initialize();
+    HRESULT IsValid();
+    HRESULT IsValidSession([in] unsigned long aSession);
+
+    HRESULT SendMail([in] unsigned long aSession, [in] lpnsMapiMessage aMessage,
+                  [in] short aRecipCount, [in, size_is(aRecipCount)] lpnsMapiRecipDesc aRecips, 
+                  [in] short aFileCount, [in, size_is(aFileCount)] lpnsMapiFileDesc aFiles, 
+                  [in] unsigned long aFlags, [in] unsigned long aReserved) ;
+
+    HRESULT SendDocuments( [in] unsigned long aSession, 
+                  [in] LPTSTR aDelimChar, [in] LPTSTR aFilePaths,
+                  [in] LPTSTR aFileNames, [in] ULONG aFlags ) ;
+
+    HRESULT Logoff (unsigned long aSession);
+    HRESULT CleanUp();
+};
+
+
+

mozilla/mailnews/mapi/mapihook/makefile.win

@@ -0,0 +1,41 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla 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/MPL/
+#
+# 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.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corp.
+# Portions created by the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):  Srilatha Moturi (srilatha@netscape.com)
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK ***** 
+
+DEPTH=..\..\..
+
+DIRS= build public src
+
+include <$(DEPTH)\config\rules.mak>

mozilla/mailnews/mapi/mapihook/public/makefile.win

@@ -0,0 +1,49 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla 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/MPL/
+#
+# 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 the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+# Srilatha Moturi <srilatha@netscape.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+DEPTH=..\..\..\..
+
+MODULE=msgMapi
+XPIDL_MODULE=mapihook
+
+XPIDLSRCS =	\
+           .\nsIMapiRegistry.idl \
+           .\nsIMapiSupport.idl  \
+            $(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+

mozilla/mailnews/mapi/mapihook/public/nsIMapiRegistry.idl

@@ -0,0 +1,70 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla 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/MPL/
+ *
+ * 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 the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Srilatha Moturi <srilatha@netscape.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsISupports.idl"
+
+interface nsIDOMWindow;
+
+/**
+ * This interface provides support for registering Mozilla as the default
+ * Mail Client. This interface can also be used to get/set the user preference
+ * for the default Mail Client.
+ * 
+ */
+[scriptable, uuid(c5be14ba-4e0a-4eec-a1b8-04363761d63c)]
+interface nsIMapiRegistry: nsISupports {
+
+   /** This is set to TRUE if Mozilla is the default Application
+    */
+   attribute boolean isDefaultMailClient;
+
+   /** This is set TRUE only once per session.
+    */
+   readonly attribute boolean showDialog;
+
+   /** This will bring the dialog asking the user if he/she wants to set
+    * Mozilla as default Mail Client.
+    * Call this only if Mozilla is not the default Mail client
+    */
+   void showMailIntegrationDialog(in nsIDOMWindow parentWindow);
+   
+};
+
+%{C++
+#define NS_IMAPIREGISTRY_CONTRACTID    "@mozilla.org/mapiregistry;1"
+#define NS_IMAPIREGISTRY_CLASSNAME "Mozilla MAPI Registry"
+%}

mozilla/mailnews/mapi/mapihook/public/nsIMapiSupport.idl

@@ -0,0 +1,64 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla 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/MPL/
+ *
+ * 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 the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsISupports.idl"
+
+/**
+ * This interface provides support for registering Mozilla as a COM component
+ * for extending the use of Mail/News through Simple MAPI.
+ * 
+ */
+
+[noscript, uuid(8967fed2-c8bb-11d5-a3e9-00b0d0f3baa7)]
+interface nsIMapiSupport : nsISupports {
+
+   /** Initiates MAPI support
+    */
+
+   void initializeMAPISupport();
+
+   /**  Shuts down the MAPI support
+    */
+
+   void shutdownMAPISupport();
+};
+
+%{C++
+#define NS_IMAPISUPPORT_CONTRACTID    "@mozilla.org/mapisupport;1"
+#define NS_IMAPISUPPORT_CLASSNAME     "Mozilla MAPI Support"
+%}
+
+

mozilla/mailnews/mapi/mapihook/src/Registry.cpp

@@ -0,0 +1,323 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla 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/MPL/
+ *
+ * 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
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corp.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Krishna Mohan Khandrika <kkhandrika@netscape.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#undef _UNICODE
+#undef UNICODE
+
+#include <objbase.h>
+#include "nsString.h"
+#include "Registry.h"
+
+#define MAPI_PROXY_DLL_NAME   "MapiProxy.dll"
+#define MAPI_STARTUP_ARG      " /MAPIStartUp"
+#define MAX_SIZE              2048
+
+// Size of a CLSID as a string
+const int CLSID_STRING_SIZE = 39;
+
+// Proxy/Stub Dll Routines
+
+typedef HRESULT (__stdcall ProxyServer)();
+
+
+// Convert a CLSID to a char string.
+
+BOOL CLSIDtochar(const CLSID& clsid, char* szCLSID,
+                 int length)
+{
+    LPOLESTR wszCLSID = NULL;
+
+    // Get CLSID
+    HRESULT hr = StringFromCLSID(clsid, &wszCLSID);
+    if (FAILED(hr))
+        return FALSE;
+
+    // Covert from wide characters to non-wide.
+    wcstombs(szCLSID, wszCLSID, length);
+
+    // Free memory.
+    CoTaskMemFree(wszCLSID);
+
+    return TRUE;
+}
+
+// Create a key and set its value.
+
+BOOL setKeyAndValue(nsCAutoString keyName, const char* subKey,
+                    const char* theValue)
+{
+    HKEY hKey;
+    BOOL retValue = TRUE;
+
+    nsCAutoString theKey(keyName);
+    if (subKey != NULL)
+    {
+        theKey += "\\";
+        theKey += subKey;
+    }
+
+    // Create and open key and subkey.
+    long lResult = RegCreateKeyEx(HKEY_CLASSES_ROOT, theKey.get(), 
+                                  0, NULL, REG_OPTION_NON_VOLATILE,
+                                  KEY_ALL_ACCESS, NULL, &hKey, NULL);
+    if (lResult != ERROR_SUCCESS)
+        return FALSE ;
+
+    // Set the Value.
+    if (theValue != NULL)
+    {
+       lResult = RegSetValueEx(hKey, NULL, 0, REG_SZ, (BYTE *)theValue, 
+                      strlen(theValue)+1);
+       if (lResult != ERROR_SUCCESS)
+           retValue = FALSE;
+    }
+
+    RegCloseKey(hKey);
+    return TRUE;
+}
+
+// Delete a key and all of its descendents.
+
+LONG recursiveDeleteKey(HKEY hKeyParent,           // Parent of key to delete
+                        const char* lpszKeyChild)  // Key to delete
+{
+    // Open the child.
+    HKEY hKeyChild ;
+    LONG lRes = RegOpenKeyEx(hKeyParent, lpszKeyChild, 0,
+                             KEY_ALL_ACCESS, &hKeyChild) ;
+    if (lRes != ERROR_SUCCESS)
+    {
+        return lRes ;
+    }
+
+    // Enumerate all of the decendents of this child.
+    FILETIME time ;
+    char szBuffer[MAX_SIZE] ;
+    DWORD dwSize = MAX_SIZE ;
+    while (RegEnumKeyEx(hKeyChild, 0, szBuffer, &dwSize, NULL,
+                        NULL, NULL, &time) == S_OK)
+    {
+        // Delete the decendents of this child.
+        lRes = recursiveDeleteKey(hKeyChild, szBuffer) ;
+        if (lRes != ERROR_SUCCESS)
+        {
+            // Cleanup before exiting.
+            RegCloseKey(hKeyChild) ;
+            return lRes;
+        }
+        dwSize = MAX_SIZE;
+    }
+
+    // Close the child.
+    RegCloseKey(hKeyChild) ;
+
+    // Delete this child.
+    return RegDeleteKey(hKeyParent, lpszKeyChild) ;
+}
+
+void RegisterProxy()
+{
+    HINSTANCE h = NULL;
+    ProxyServer *RegisterFunc = NULL;
+
+    char szModule[MAX_SIZE];
+    char *pTemp = NULL;
+
+    HMODULE hModule = GetModuleHandle(NULL);
+    DWORD dwResult  = ::GetModuleFileName(hModule, szModule,
+                                          sizeof(szModule)/sizeof(char));
+    if (dwResult == 0)
+        return;
+
+    pTemp = strrchr(szModule, '\\');
+    if (pTemp == NULL)
+        return;
+
+    *pTemp = '\0';
+    nsCAutoString proxyPath(szModule);
+
+    proxyPath += "\\";
+    proxyPath += MAPI_PROXY_DLL_NAME;
+
+    h = LoadLibrary(proxyPath.get());
+    if (h == NULL)
+        return;
+
+    RegisterFunc = (ProxyServer *) GetProcAddress(h, "DllRegisterServer");
+    if (RegisterFunc)
+        RegisterFunc();
+
+    FreeLibrary(h);
+}
+
+void UnRegisterProxy()
+{
+    HINSTANCE h = NULL;
+    ProxyServer *UnRegisterFunc = NULL;
+
+    char szModule[MAX_SIZE];
+    char *pTemp = NULL;
+
+    HMODULE hModule = GetModuleHandle(NULL);
+    DWORD dwResult  = ::GetModuleFileName(hModule, szModule,
+                                          sizeof(szModule)/sizeof(char));
+    if (dwResult == 0)
+        return;
+
+    pTemp = strrchr(szModule, '\\');
+    if (pTemp == NULL)
+        return;
+
+    *pTemp = '\0';
+    nsCAutoString proxyPath(szModule);
+
+    proxyPath += "\\";
+    proxyPath += MAPI_PROXY_DLL_NAME;
+
+    h = LoadLibrary(proxyPath.get());
+    if (h == NULL)
+        return;
+
+    UnRegisterFunc = (ProxyServer *) GetProcAddress(h, "DllUnregisterServer");
+    if (UnRegisterFunc)
+        UnRegisterFunc();
+
+    FreeLibrary(h);
+}
+
+// Register the component in the registry.
+
+HRESULT RegisterServer(const CLSID& clsid,         // Class ID
+                       const char* szFriendlyName, // Friendly Name
+                       const char* szVerIndProgID, // Programmatic
+                       const char* szProgID)       //   IDs
+{
+    HMODULE hModule = GetModuleHandle(NULL);
+    char szModuleName[MAX_SIZE];
+    char szCLSID[CLSID_STRING_SIZE];
+
+    nsCAutoString independentProgId(szVerIndProgID);
+    nsCAutoString progId(szProgID);
+
+    DWORD dwResult = ::GetModuleFileName(hModule, szModuleName,
+                              sizeof(szModuleName)/sizeof(char));
+
+    if (dwResult == 0)
+        return S_FALSE;
+
+    nsCAutoString moduleName(szModuleName);
+    nsCAutoString registryKey("CLSID\\");
+
+    moduleName += MAPI_STARTUP_ARG;
+
+    // Convert the CLSID into a char.
+
+    if (!CLSIDtochar(clsid, szCLSID, sizeof(szCLSID)))
+        return S_FALSE;
+    registryKey += szCLSID;
+
+    // Add the CLSID to the registry.
+    if (!setKeyAndValue(registryKey, NULL, szFriendlyName))
+        return S_FALSE;
+
+    if (!setKeyAndValue(registryKey, "LocalServer32", moduleName.get()))
+        return S_FALSE;
+
+    // Add the ProgID subkey under the CLSID key.
+    if (!setKeyAndValue(registryKey, "ProgID", szProgID))
+        return S_FALSE;
+
+    // Add the version-independent ProgID subkey under CLSID key.
+    if (!setKeyAndValue(registryKey, "VersionIndependentProgID", szVerIndProgID))
+        return S_FALSE;
+
+    // Add the version-independent ProgID subkey under HKEY_CLASSES_ROOT.
+    if (!setKeyAndValue(independentProgId, NULL, szFriendlyName))
+        return S_FALSE; 
+    if (!setKeyAndValue(independentProgId, "CLSID", szCLSID))
+        return S_FALSE;
+    if (!setKeyAndValue(independentProgId, "CurVer", szProgID))
+        return S_FALSE;
+
+    // Add the versioned ProgID subkey under HKEY_CLASSES_ROOT.
+    if (!setKeyAndValue(progId, NULL, szFriendlyName))
+        return S_FALSE; 
+    if (!setKeyAndValue(progId, "CLSID", szCLSID))
+        return S_FALSE;
+
+    RegisterProxy();
+
+    return S_OK;
+}
+
+LONG UnregisterServer(const CLSID& clsid,         // Class ID
+                      const char* szVerIndProgID, // Programmatic
+                      const char* szProgID)       //   IDs
+{
+    LONG lResult = S_OK;
+
+    // Convert the CLSID into a char.
+
+    char szCLSID[CLSID_STRING_SIZE];
+    if (!CLSIDtochar(clsid, szCLSID, sizeof(szCLSID)))
+        return S_FALSE;
+
+    UnRegisterProxy();
+
+    nsCAutoString registryKey("CLSID\\");
+    registryKey += szCLSID;
+
+    lResult = recursiveDeleteKey(HKEY_CLASSES_ROOT, registryKey.get());
+    if (lResult == ERROR_SUCCESS || lResult == ERROR_FILE_NOT_FOUND)
+        return lResult;
+
+    registryKey += "\\LocalServer32";
+
+    // Delete only the path for this server.
+
+    lResult = recursiveDeleteKey(HKEY_CLASSES_ROOT, registryKey.get());
+    if (lResult != ERROR_SUCCESS && lResult != ERROR_FILE_NOT_FOUND)
+        return lResult;
+
+    // Delete the version-independent ProgID Key.
+    lResult = recursiveDeleteKey(HKEY_CLASSES_ROOT, szVerIndProgID);
+    if (lResult != ERROR_SUCCESS && lResult != ERROR_FILE_NOT_FOUND)
+        return lResult;
+
+    lResult = recursiveDeleteKey(HKEY_CLASSES_ROOT, szProgID);
+
+    return lResult;
+}

mozilla/mailnews/mapi/mapihook/src/Registry.h

@@ -0,0 +1,56 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla 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/MPL/
+ *
+ * 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 the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Krishna Mohan Khandrika <kkhandrika@netscape.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef _REGISTRY_H_
+#define _REGISTRY_H_
+
+#include <objbase.h>
+
+// This function will register a component in the Registry.
+
+HRESULT RegisterServer(const CLSID& clsid, 
+                       const char* szFriendlyName,
+                       const char* szVerIndProgID,
+                       const char* szProgID) ;
+
+// This function will unregister a component.
+
+HRESULT UnregisterServer(const CLSID& clsid,
+                         const char* szVerIndProgID,
+                         const char* szProgID) ;
+
+#endif

mozilla/mailnews/mapi/mapihook/src/makefile.win

@@ -0,0 +1,107 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla 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/MPL/
+#
+# 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 the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+# Srilatha Moturi <srilatha@netscape.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+DEPTH=..\..\..\..
+
+MODULE          = msgMapi
+MAKE_OBJ_TYPE = DLL
+LIBRARY_NAME=$(MODULE)
+MODULE_NAME	= $(MODULE)
+
+REQUIRES        = xpcom \
+                  string \
+		  MapiProxy \
+		  appshell \
+		  windowwatcher \
+		  dom \
+		  profile \
+		  msgbase \
+		  pref \
+		  msgbaseutil \
+		  msgcompo \
+		  mailnews \
+		  necko \
+		  intl \
+		  editor \
+		  msgdb \
+		  uriloader \
+ 	          appstartup \
+	$(NULL)
+
+include <$(DEPTH)\config\config.mak>
+############################################################################
+
+LCFLAGS=-DUNICODE -D_UNICODE
+
+
+
+OBJS=   \
+    ..\build\$(OBJDIR)\msgMapi_i.obj    \
+    .\$(OBJDIR)\msgMapiFactory.obj  \
+    .\$(OBJDIR)\msgMapiHook.obj \
+    .\$(OBJDIR)\msgMapiImp.obj  \
+    .\$(OBJDIR)\msgMapiMain.obj \
+    .\$(OBJDIR)\msgMapiSupport.obj  \
+	.\$(OBJDIR)\nsMapiRegistry.obj	\
+	.\$(OBJDIR)\nsMapiRegistryUtils.obj \
+    .\$(OBJDIR)\Registry.obj  \
+	$(NULL)
+
+
+
+LLIBS=                               \
+ $(DIST)\lib\xpcom.lib               \
+ $(DIST)\lib\msgbsutl.lib            \
+ $(LIBNSPR)                          \
+ $(NULL)
+
+WIN_LIBS=       \
+	ole32.lib   \
+    $(NULL)
+
+EXPORTS=	\
+    msgMapiFactory.h    \
+    msgMapiHook.h       \
+    msgMapiImp.h        \
+    msgMapiMain.h       \
+    msgMapiSupport.h    \
+	nsMapiRegistry.h		\
+	nsMapiRegistryUtils.h   \
+    Registry.h \
+	$(NULL)
+
+include <$(DEPTH)\config\rules.mak>

mozilla/mailnews/mapi/mapihook/src/msgMapiFactory.cpp

@@ -0,0 +1,118 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla 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/MPL/
+ *
+ * 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
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corp.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#undef UNICODE
+#undef _UNICODE
+
+#include "msgMapiFactory.h"
+#include "msgMapiImp.h"
+#include "msgMapi.h"
+
+CMapiFactory ::CMapiFactory()
+: m_cRef(1)
+{
+}
+
+CMapiFactory::~CMapiFactory()
+{
+}
+
+STDMETHODIMP CMapiFactory::QueryInterface(const IID& aIid, void** aPpv)
+{    
+    if ((aIid == IID_IUnknown) || (aIid == IID_IClassFactory))
+    {
+        *aPpv = static_cast<IClassFactory*>(this); 
+    }
+    else
+    {
+        *aPpv = nsnull;
+        return E_NOINTERFACE;
+    }
+    reinterpret_cast<IUnknown*>(*aPpv)->AddRef();
+    return S_OK;
+}
+
+STDMETHODIMP_(ULONG) CMapiFactory::AddRef()
+{
+    return (PR_AtomicIncrement(&m_cRef));
+}
+
+STDMETHODIMP_(ULONG) CMapiFactory::Release() 
+{
+    PRInt32 temp;
+    temp = PR_AtomicDecrement(&m_cRef);
+    if (m_cRef == 0)
+    {
+        delete this;
+        return 0;
+    }
+
+    return temp;
+}
+
+STDMETHODIMP CMapiFactory::CreateInstance(IUnknown* aUnknownOuter,
+                                           const IID& aIid,
+                                           void** aPpv) 
+{
+    // Cannot aggregate.
+
+    if (aUnknownOuter != nsnull)
+    {
+        return CLASS_E_NOAGGREGATION ;
+    }
+
+    // Create component.
+
+    CMapiImp* pImp = new CMapiImp();
+    if (pImp == nsnull)
+    {
+        return E_OUTOFMEMORY ;
+    }
+
+    // Get the requested interface.
+    HRESULT hr = pImp->QueryInterface(aIid, aPpv);
+
+    // Release the IUnknown pointer.
+    // (If QueryInterface failed, component will delete itself.)
+
+    pImp->Release();
+    return hr;
+}
+
+STDMETHODIMP CMapiFactory::LockServer(PRBool aLock) 
+{
+    return S_OK ;
+}

mozilla/mailnews/mapi/mapihook/src/msgMapiFactory.h

@@ -0,0 +1,69 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla 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/MPL/
+ *
+ * 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
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corp.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef MSG_MAPI_FACTORY_H
+#define MSG_MAPI_FACTORY_H
+
+#include <windows.h>
+#include <objbase.h>
+#include "nspr.h"
+
+
+class CMapiFactory : public IClassFactory
+{
+public :
+
+    // IUnknown
+
+    STDMETHODIMP            QueryInterface (REFIID aIid, void** aPpv);
+    STDMETHODIMP_(ULONG)    AddRef(void);
+    STDMETHODIMP_(ULONG)    Release(void);
+
+    // IClassFactory
+
+    STDMETHODIMP        CreateInstance (LPUNKNOWN aUnkOuter, REFIID aIid, void **aPpv);
+    STDMETHODIMP        LockServer (BOOL aLock);
+
+    CMapiFactory ();
+    ~CMapiFactory ();
+
+private :
+
+    PRInt32 m_cRef;
+};
+
+#endif  // MSG_MAPI_FACTORY_H
+

mozilla/mailnews/mapi/mapihook/src/msgMapiHook.cpp

@@ -0,0 +1,777 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla 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/MPL/
+ *
+ * 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
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corp.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
+ * Contributor(s): Srilatha Moturi (srilatha@netscape.com)
+ * Contributor(s): Rajiv Dayal (rdayal@netscape.com)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#define MAPI_STARTUP_ARG       "/MAPIStartUp"
+
+#define MAPI_STARTUP_ARG       "/MAPIStartUp"
+
+#include <mapidefs.h>
+#include <mapi.h>
+#include <tchar.h>
+
+#include "nsCOMPtr.h"
+#include "nsIComponentManager.h"
+#include "nsIServiceManager.h"
+#include "nsISupports.h"
+#include "nsIPromptService.h"
+#include "nsAppShellCIDs.h"
+#include "nsIDOMWindowInternal.h"
+#include "nsIAppShellService.h"
+#include "nsINativeAppSupport.h"
+#include "nsICmdLineService.h"
+#include "nsIProfileInternal.h"
+#include "nsIMsgAccountManager.h"
+#include "nsIDOMWindowInternal.h"
+#include "nsXPIDLString.h"
+#include "nsReadableUtils.h"
+#include "nsMsgBaseCID.h"
+#include "nsIStringBundle.h"
+#include "nsIPref.h"
+#include "nsString.h"
+
+#include "nsIMsgAttachment.h"
+#include "nsIMsgCompFields.h"
+#include "nsIMsgComposeParams.h"
+#include "nsIMsgCompose.h"
+#include "nsMsgCompCID.h"
+#include "nsIMsgSend.h"
+#include "nsIProxyObjectManager.h"
+#include "nsIMsgComposeService.h"
+#include "nsProxiedService.h"
+#include "nsSpecialSystemDirectory.h"
+#include "nsMsgI18N.h"
+
+#include "msgMapi.h"
+#include "msgMapiHook.h"
+#include "msgMapiSupport.h"
+#include "msgMapiMain.h"
+#include "nsNetUtil.h"
+
+static NS_DEFINE_CID(kCmdLineServiceCID, NS_COMMANDLINE_SERVICE_CID);
+
+class nsMAPISendListener : public nsIMsgSendListener
+{
+public:
+
+    virtual ~nsMAPISendListener() { }
+
+    // nsISupports interface
+    NS_DECL_ISUPPORTS
+
+    /* void OnStartSending (in string aMsgID, in PRUint32 aMsgSize); */
+    NS_IMETHOD OnStartSending(const char *aMsgID, PRUint32 aMsgSize) { return NS_OK; }
+
+    /* void OnProgress (in string aMsgID, in PRUint32 aProgress, in PRUint32 aProgressMax); */
+    NS_IMETHOD OnProgress(const char *aMsgID, PRUint32 aProgress, PRUint32 aProgressMax) { return NS_OK;}
+
+    /* void OnStatus (in string aMsgID, in wstring aMsg); */
+    NS_IMETHOD OnStatus(const char *aMsgID, const PRUnichar *aMsg) { return NS_OK;}
+
+    /* void OnStopSending (in string aMsgID, in nsresult aStatus, in wstring aMsg, in nsIFileSpec returnFileSpec); */
+    NS_IMETHOD OnStopSending(const char *aMsgID, nsresult aStatus, const PRUnichar *aMsg, 
+                           nsIFileSpec *returnFileSpec) {
+        m_done = PR_TRUE;
+        HANDLE hEvent = CreateEvent (NULL, FALSE, FALSE, (LPCTSTR) MAPI_SENDCOMPLETE_EVENT) ;
+        SetEvent (hEvent) ;
+        CloseHandle (hEvent) ;
+        return NS_OK ;
+    }
+
+ /* void OnSendNotPerformed */
+ NS_IMETHOD OnSendNotPerformed(const char *aMsgID, nsresult aStatus)
+ {
+ return OnStopSending(aMsgID, aStatus, nsnull, nsnull) ;
+ }
+ 
+    /* void OnGetDraftFolderURI (); */
+    NS_IMETHOD OnGetDraftFolderURI(const char *aFolderURI) {return NS_OK;}
+
+    static nsresult CreateMAPISendListener( nsIMsgSendListener **ppListener);
+
+    PRBool IsDone() { return m_done ; }
+
+protected :
+    nsMAPISendListener() {
+        NS_INIT_REFCNT(); 
+        m_done = PR_FALSE;
+    }
+
+    PRBool          m_done;
+};
+
+
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsMAPISendListener, nsIMsgSendListener)
+
+nsresult nsMAPISendListener::CreateMAPISendListener( nsIMsgSendListener **ppListener)
+{
+    NS_ENSURE_ARG_POINTER(ppListener) ;
+
+    *ppListener = new nsMAPISendListener();
+    if (! *ppListener)
+        return NS_ERROR_OUT_OF_MEMORY;
+
+    NS_ADDREF(*ppListener);
+    return NS_OK;
+}
+
+PRBool nsMapiHook::isMapiService = PR_FALSE;
+
+PRBool nsMapiHook::Initialize()
+{
+    nsresult rv;
+    nsCOMPtr<nsINativeAppSupport> native;
+
+    nsCOMPtr<nsICmdLineService> cmdLineArgs(do_GetService(kCmdLineServiceCID, &rv));
+    if (NS_FAILED(rv)) return PR_FALSE;
+
+    nsCOMPtr<nsIAppShellService> appShell (do_GetService( "@mozilla.org/appshell/appShellService;1", &rv));
+    if (NS_FAILED(rv)) return PR_FALSE;
+
+    rv = appShell->GetNativeAppSupport( getter_AddRefs( native ));
+    if (NS_FAILED(rv)) return PR_FALSE;
+
+    rv = native->EnsureProfile(cmdLineArgs);
+    if (NS_FAILED(rv)) return PR_FALSE;
+
+    return PR_TRUE;
+}
+
+void nsMapiHook::CleanUp()
+{
+    // This routine will be fully implemented in future
+    // to cleanup mapi related stuff inside mozilla code.
+}
+
+PRBool nsMapiHook::DisplayLoginDialog(PRBool aLogin, PRUnichar **aUsername, \
+                      PRUnichar **aPassword)
+{
+    nsresult rv;
+    PRBool btnResult = PR_FALSE;
+
+    nsCOMPtr<nsIAppShellService> appShell(do_GetService( "@mozilla.org/appshell/appShellService;1", &rv));
+    if (NS_FAILED(rv) || !appShell) return PR_FALSE;
+   
+    nsCOMPtr<nsIPromptService> dlgService(do_GetService("@mozilla.org/embedcomp/prompt-service;1", &rv));
+    if (NS_SUCCEEDED(rv) && dlgService)
+    {
+        nsCOMPtr<nsIStringBundleService> bundleService(do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv));
+        if (NS_FAILED(rv) || !bundleService) return PR_FALSE;
+
+        nsCOMPtr<nsIStringBundle> bundle;
+        rv = bundleService->CreateBundle(MAPI_PROPERTIES_CHROME, getter_AddRefs(bundle));
+        if (NS_FAILED(rv) || !bundle) return PR_FALSE;
+
+        nsCOMPtr<nsIStringBundle> brandBundle;
+        rv = bundleService->CreateBundle(
+                        "chrome://global/locale/brand.properties",
+                        getter_AddRefs(brandBundle));
+        if (NS_FAILED(rv)) return PR_FALSE;
+
+        nsXPIDLString brandName;
+        rv = brandBundle->GetStringFromName(
+                           NS_LITERAL_STRING("brandShortName").get(),
+                           getter_Copies(brandName));
+        if (NS_FAILED(rv)) return PR_FALSE;
+        
+        nsXPIDLString loginTitle;
+        const PRUnichar *brandStrings[] = { brandName.get() };
+        NS_NAMED_LITERAL_STRING(loginTitlePropertyTag, "loginTitle");
+        const PRUnichar *dTitlePropertyTag = loginTitlePropertyTag.get();
+        rv = bundle->FormatStringFromName(dTitlePropertyTag, brandStrings, 1,
+                                          getter_Copies(loginTitle));
+        if (NS_FAILED(rv)) return PR_FALSE;
+        
+        if (aLogin)
+        {
+            nsXPIDLString loginText;
+            rv = bundle->GetStringFromName(NS_LITERAL_STRING("loginTextwithName").get(),
+                                           getter_Copies(loginText));
+            if (NS_FAILED(rv) || !loginText) return PR_FALSE;
+
+
+
+            rv = dlgService->PromptUsernameAndPassword(nsnull, loginTitle,
+                                                       loginText, aUsername, aPassword,
+                                                       nsnull, PR_FALSE, &btnResult);
+        }
+        else
+        {
+            //nsString loginString; 
+            nsXPIDLString loginText;
+            const PRUnichar *userNameStrings[] = { *aUsername };
+
+            NS_NAMED_LITERAL_STRING(loginTextPropertyTag, "loginText");
+            const PRUnichar *dpropertyTag = loginTextPropertyTag.get();
+            rv = bundle->FormatStringFromName(dpropertyTag, userNameStrings, 1,
+                                              getter_Copies(loginText));
+            if (NS_FAILED(rv)) return PR_FALSE;
+
+            rv = dlgService->PromptPassword(nsnull, loginTitle, loginText,
+                                            aPassword, nsnull, PR_FALSE, &btnResult);
+        }
+    }            
+
+    return btnResult;
+}
+
+PRBool nsMapiHook::VerifyUserName(const PRUnichar *aUsername, char **aIdKey)
+{
+    nsresult rv;
+
+    if (aUsername == nsnull)
+        return PR_FALSE;
+
+    nsCOMPtr<nsIMsgAccountManager> accountManager(do_GetService(NS_MSGACCOUNTMANAGER_CONTRACTID, &rv));
+    if (NS_FAILED(rv)) return PR_FALSE;
+    nsCOMPtr<nsISupportsArray> identities;
+    rv = accountManager->GetAllIdentities(getter_AddRefs(identities));
+    if (NS_FAILED(rv)) return PR_FALSE;
+    PRUint32 numIndentities;
+    identities->Count(&numIndentities);
+
+    for (PRUint32 i = 0; i < numIndentities; i++)
+    {
+        // convert supports->Identity
+        nsCOMPtr<nsISupports> thisSupports;
+        rv = identities->GetElementAt(i, getter_AddRefs(thisSupports));
+        if (NS_FAILED(rv)) continue;
+        nsCOMPtr<nsIMsgIdentity> thisIdentity(do_QueryInterface(thisSupports, &rv));
+        if (NS_SUCCEEDED(rv) && thisIdentity)
+        {
+            nsXPIDLCString email;
+            rv = thisIdentity->GetEmail(getter_Copies(email));
+            if (NS_FAILED(rv)) continue;
+
+            // get the username from the email and compare with the username
+            nsCAutoString aEmail(email.get());
+            PRInt32 index = aEmail.FindChar('@');
+            if (index != -1)
+                aEmail.Truncate(index);
+
+if (nsDependentString(aUsername) == NS_ConvertASCIItoUCS2(aEmail))  // == overloaded
+                return NS_SUCCEEDED(thisIdentity->GetKey(aIdKey));
+        }
+    }
+
+    return PR_FALSE;
+}
+
+PRBool 
+nsMapiHook::IsBlindSendAllowed()
+{
+    PRBool enabled = PR_FALSE;
+    PRBool warn = PR_TRUE;
+    nsCOMPtr<nsIPref> prefs = do_GetService(NS_PREF_CONTRACTID);
+    if (prefs) {
+	    prefs->GetBoolPref(PREF_MAPI_WARN_PRIOR_TO_BLIND_SEND,&warn);
+            prefs->GetBoolPref(PREF_MAPI_BLIND_SEND_ENABLED,&enabled);
+    } 
+    if (!enabled)
+        return PR_FALSE;
+
+    if (!warn)
+        return PR_TRUE; // Everything is okay.  
+
+    nsresult rv;
+    nsCOMPtr<nsIStringBundleService> bundleService(do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv));
+    if (NS_FAILED(rv) || !bundleService) return PR_FALSE;
+
+    nsCOMPtr<nsIStringBundle> bundle;
+    rv = bundleService->CreateBundle(MAPI_PROPERTIES_CHROME, getter_AddRefs(bundle));
+    if (NS_FAILED(rv) || !bundle) return PR_FALSE;
+
+    nsXPIDLString warningMsg;
+    rv = bundle->GetStringFromName(NS_LITERAL_STRING("mapiBlindSendWarning").get(),
+                                        getter_Copies(warningMsg));
+    if (NS_FAILED(rv)) return PR_FALSE;
+    
+   nsXPIDLString dontShowAgainMessage;
+    rv = bundle->GetStringFromName(NS_LITERAL_STRING("mapiBlindSendDontShowAgain").get(),
+                                        getter_Copies(dontShowAgainMessage));
+    if (NS_FAILED(rv)) return PR_FALSE;
+
+    nsCOMPtr<nsIPromptService> dlgService(do_GetService("@mozilla.org/embedcomp/prompt-service;1", &rv));
+    if (NS_FAILED(rv) || !dlgService) return PR_FALSE;
+    
+    PRBool continueToWarn = PR_TRUE;
+    PRBool okayToContinue = PR_FALSE;
+    dlgService->ConfirmCheck(nsnull, nsnull, warningMsg, dontShowAgainMessage, &continueToWarn, &okayToContinue);
+        
+    if (!continueToWarn && okayToContinue && prefs)
+        prefs->SetBoolPref(PREF_MAPI_WARN_PRIOR_TO_BLIND_SEND,PR_FALSE);
+    
+    return okayToContinue;
+        
+}
+
+// this is used for Send without UI
+nsresult nsMapiHook::BlindSendMail (unsigned long aSession, nsIMsgCompFields * aCompFields) 
+{
+    nsresult rv = NS_OK ;
+
+    if (!IsBlindSendAllowed())
+        return NS_ERROR_FAILURE;
+
+    /** create nsIMsgComposeParams obj and other fields to populate it **/    
+
+    // get parent window
+    nsCOMPtr<nsIAppShellService> appService = do_GetService( "@mozilla.org/appshell/appShellService;1", &rv);
+    if (NS_FAILED(rv)|| (!appService) ) return rv ;
+
+    nsCOMPtr<nsIDOMWindowInternal>  hiddenWindow;
+    rv = appService->GetHiddenDOMWindow(getter_AddRefs(hiddenWindow));
+
+    if ( NS_FAILED(rv) ) return rv ;
+
+    // smtp password and Logged in used IdKey from MapiConfig (session obj)
+    nsMAPIConfiguration * pMapiConfig = nsMAPIConfiguration::GetMAPIConfiguration() ;
+    if (!pMapiConfig) return NS_ERROR_FAILURE ;  // get the singelton obj
+    PRUnichar * password = pMapiConfig->GetPassword(aSession) ;
+    // password
+    nsCAutoString smtpPassword ;
+    smtpPassword.AssignWithConversion (password) ;
+    // Id key
+    char * MsgIdKey = pMapiConfig->GetIdKey(aSession) ;
+
+    // get the MsgIdentity for the above key using AccountManager
+    nsCOMPtr <nsIMsgAccountManager> accountManager = do_GetService (NS_MSGACCOUNTMANAGER_CONTRACTID) ;
+    if (NS_FAILED(rv) || (!accountManager) ) return rv ;
+
+    nsCOMPtr <nsIMsgIdentity> pMsgId ;
+    rv = accountManager->GetIdentity (MsgIdKey, getter_AddRefs(pMsgId)) ;
+    if (NS_FAILED(rv) ) return rv ;
+
+    // create a send listener to get back the send status
+    nsCOMPtr <nsIMsgSendListener> sendListener ;
+    rv = nsMAPISendListener::CreateMAPISendListener(getter_AddRefs(sendListener)) ; 
+    if (NS_FAILED(rv) || (!sendListener) ) return rv;
+
+    // create the compose params object 
+    nsCOMPtr<nsIMsgComposeParams> pMsgComposeParams (do_CreateInstance(NS_MSGCOMPOSEPARAMS_CONTRACTID, &rv));
+    if (NS_FAILED(rv) || (!pMsgComposeParams) ) return rv ;
+
+    // populate the compose params
+    pMsgComposeParams->SetType(nsIMsgCompType::New);
+    pMsgComposeParams->SetFormat(nsIMsgCompFormat::Default);
+    pMsgComposeParams->SetIdentity(pMsgId);
+    pMsgComposeParams->SetComposeFields(aCompFields); 
+    pMsgComposeParams->SetSendListener(sendListener) ;
+    pMsgComposeParams->SetSmtpPassword(smtpPassword.get());
+
+    // create the nsIMsgCompose object to send the object
+    nsCOMPtr<nsIMsgCompose> pMsgCompose (do_CreateInstance(NS_MSGCOMPOSE_CONTRACTID, &rv));
+    if (NS_FAILED(rv) || (!pMsgCompose) ) return rv ;
+
+    /** initialize nsIMsgCompose, Send the message, wait for send completion response **/
+
+    rv = pMsgCompose->Initialize(hiddenWindow, pMsgComposeParams) ;
+    if (NS_FAILED(rv)) return rv ;
+
+    pMsgCompose->SendMsg(nsIMsgSend::nsMsgDeliverNow, pMsgId, nsnull) ;
+    if (NS_FAILED(rv)) return rv ;
+
+    // assign to interface pointer from nsCOMPtr to facilitate typecast below
+    nsIMsgSendListener * pSendListener = sendListener ;  
+
+    // we need to wait here to make sure that we return only after send is completed
+    // so we will have a event loop here which will process the events till the Send IsDone.
+    nsCOMPtr<nsIEventQueueService> pEventQService = do_GetService(NS_EVENTQUEUESERVICE_CONTRACTID, &rv);
+    nsCOMPtr<nsIEventQueue> eventQueue;
+    pEventQService->GetThreadEventQueue(NS_CURRENT_THREAD,getter_AddRefs(eventQueue));
+    while ( !((nsMAPISendListener *) pSendListener)->IsDone() )
+        eventQueue->ProcessPendingEvents();
+
+    return rv ;
+}
+
+// this is used to populate comp fields with Unicode data
+nsresult nsMapiHook::PopulateCompFields(lpnsMapiMessage aMessage, 
+                                    nsIMsgCompFields * aCompFields)
+{
+    nsresult rv = NS_OK ;
+
+    if (aMessage->lpOriginator)
+    {
+        PRUnichar * From = aMessage->lpOriginator->lpszAddress ;
+        aCompFields->SetFrom (From) ;
+    }
+
+    nsAutoString To ;
+    nsAutoString Cc ; 
+    nsAutoString Bcc ;
+
+    nsAutoString Comma ;
+    Comma.AssignWithConversion(",");
+
+    if (aMessage->lpRecips)
+    {
+        for (int i=0 ; i < (int) aMessage->nRecipCount ; i++)
+        {
+            if (aMessage->lpRecips[i].lpszAddress)
+            {
+                switch (aMessage->lpRecips[i].ulRecipClass)
+                {
+                case MAPI_TO :
+                    if (To.Length() > 0)
+                        To += Comma ;
+                    To += (PRUnichar *) aMessage->lpRecips[i].lpszAddress ;
+                    break ;
+
+                case MAPI_CC :
+                    if (Cc.Length() > 0)
+                        Cc += Comma ;
+                    Cc += (PRUnichar *) aMessage->lpRecips[i].lpszAddress ; 
+                    break ;
+
+                case MAPI_BCC :
+                    if (Bcc.Length() > 0)
+                        Bcc += Comma ;
+                    Bcc += (PRUnichar *) aMessage->lpRecips[i].lpszAddress ; 
+                    break ;
+                }
+            }
+        }
+    }
+
+    // set To, Cc, Bcc
+    aCompFields->SetTo (To.get()) ;
+    aCompFields->SetCc (Cc.get()) ;
+    aCompFields->SetBcc (Bcc.get()) ;
+
+    // set subject
+    if (aMessage->lpszSubject)
+    {
+        PRUnichar * Subject = aMessage->lpszSubject ;
+        aCompFields->SetSubject(Subject) ;
+    }
+
+    // handle attachments as File URL
+    rv = HandleAttachments (aCompFields, aMessage->nFileCount, aMessage->lpFiles, PR_TRUE) ;
+    if (NS_FAILED(rv)) return rv ;    
+
+    // set body
+    if (aMessage->lpszNoteText)
+    {
+        PRUnichar * Body = aMessage->lpszNoteText ;
+        rv = aCompFields->SetBody(Body) ;
+    }
+
+#ifdef RAJIV_DEBUG
+    // testing what all was set in CompFields
+    printf ("To : %S \n", To.get()) ;
+    printf ("CC : %S \n", Cc.get() ) ;
+    printf ("BCC : %S \n", Bcc.get() ) ;
+#endif
+
+    return rv ;
+
+}
+
+nsresult nsMapiHook::HandleAttachments (nsIMsgCompFields * aCompFields, PRInt32 aFileCount, 
+                                        lpnsMapiFileDesc aFiles, BOOL aIsUnicode)
+{
+    nsresult rv = NS_OK ;
+
+    nsCAutoString Attachments ;
+    nsCAutoString TempFiles ;
+
+    nsCOMPtr <nsILocalFile> pFile = do_CreateInstance (NS_LOCAL_FILE_CONTRACTID, &rv) ;
+    if (NS_FAILED(rv) || (!pFile) ) return rv ;        
+
+    for (int i=0 ; i < aFileCount ; i++)
+    {
+        if (aFiles[i].lpszPathName)
+        {
+            // check if attachment exists
+            if (aIsUnicode)
+                pFile->InitWithUnicodePath (aFiles[i].lpszPathName) ; 
+            else
+                pFile->InitWithPath ((char *) aFiles[i].lpszPathName) ; 
+            PRBool bExist ;
+            rv = pFile->Exists(&bExist) ;
+            if (NS_FAILED(rv) || (!bExist) ) return NS_ERROR_FILE_TARGET_DOES_NOT_EXIST ;
+
+            // create Msg attachment object
+            nsCOMPtr<nsIMsgAttachment> attachment = do_CreateInstance(NS_MSGATTACHMENT_CONTRACTID, &rv);
+            if (NS_FAILED(rv) || (!attachment) ) return rv ;
+
+            // set url 
+            nsXPIDLCString pURL ;
+            NS_GetURLSpecFromFile(pFile, getter_Copies(pURL));
+            attachment->SetUrl(pURL) ;
+
+            if (aFiles[i].lpszFileName)
+            {
+                if (! aIsUnicode)
+                {
+                    nsAutoString realFileName ;
+                    realFileName.AssignWithConversion ((char *) aFiles[i].lpszFileName) ;
+                    attachment->SetName(realFileName.get()) ;
+                    // attachment->SetName( (nsDependentString(aFiles[i].lpszFileName)).get() );
+            }
+                else
+                    attachment->SetName(aFiles[i].lpszFileName) ;
+        }
+
+            attachment->SetTemporary(PR_FALSE) ;
+
+            rv = aCompFields->AddAttachment (attachment);
+        }
+    }
+    return rv ;
+}
+
+
+// this is used to convert non Unicode data and then populate comp fields
+nsresult nsMapiHook::PopulateCompFieldsWithConversion(lpnsMapiMessage aMessage, 
+                                    nsIMsgCompFields * aCompFields)
+{
+    nsresult rv = NS_OK ;
+
+    if (aMessage->lpOriginator)
+    {
+        nsAutoString From ;
+        From.AssignWithConversion((char *) aMessage->lpOriginator->lpszAddress);
+        aCompFields->SetFrom (From.get()) ;
+    }
+
+    nsAutoString To ;
+    nsAutoString Cc ; 
+    nsAutoString Bcc ;
+
+    nsAutoString Comma ;
+    Comma.AssignWithConversion(",");
+
+    if (aMessage->lpRecips)
+    {
+        for (int i=0 ; i < (int) aMessage->nRecipCount ; i++)
+        {
+            if (aMessage->lpRecips[i].lpszAddress)
+            {
+                switch (aMessage->lpRecips[i].ulRecipClass)
+                {
+                case MAPI_TO :
+                    if (To.Length() > 0)
+                        To += Comma ;
+                    To.AppendWithConversion ((char *) aMessage->lpRecips[i].lpszAddress);
+                    break ;
+
+                case MAPI_CC :
+                    if (Cc.Length() > 0)
+                        Cc += Comma ;
+                    Cc.AppendWithConversion ((char *) aMessage->lpRecips[i].lpszAddress); 
+                    break ;
+
+                case MAPI_BCC :
+                    if (Bcc.Length() > 0)
+                        Bcc += Comma ;
+                    Bcc.AppendWithConversion ((char *) aMessage->lpRecips[i].lpszAddress) ; 
+                    break ;
+                }
+            }
+        }
+    }
+    
+    // set To, Cc, Bcc
+    aCompFields->SetTo (To.get()) ;
+    aCompFields->SetCc (Cc.get()) ;
+    aCompFields->SetBcc (Bcc.get()) ;
+
+    nsCAutoString platformCharSet;
+    // set subject
+    if (aMessage->lpszSubject)
+    {
+        nsAutoString Subject ;
+        if (platformCharSet.IsEmpty())
+            platformCharSet.Assign(nsMsgI18NFileSystemCharset());
+        rv = ConvertToUnicode(platformCharSet.get(), (char *) aMessage->lpszSubject, Subject);
+        if (NS_FAILED(rv)) return rv ;         
+        aCompFields->SetSubject(Subject.get()) ;
+    }
+
+    // handle attachments as File URL
+    rv = HandleAttachments (aCompFields, aMessage->nFileCount, aMessage->lpFiles, PR_FALSE) ;
+    if (NS_FAILED(rv)) return rv ;    
+
+    // set body
+    if (aMessage->lpszNoteText)
+    {
+        nsAutoString Body ;
+        if (platformCharSet.IsEmpty())
+            platformCharSet.Assign(nsMsgI18NFileSystemCharset());
+        rv = ConvertToUnicode(platformCharSet.get(), (char *) aMessage->lpszNoteText, Body);
+        if (NS_FAILED(rv)) return rv ;
+        rv = aCompFields->SetBody(Body.get()) ;
+    }
+
+#ifdef RAJIV_DEBUG
+    // testing what all was set in CompFields
+    printf ("To : %S \n", To.get()) ;
+    printf ("CC : %S \n", Cc.get() ) ;
+    printf ("BCC : %S \n", Bcc.get() ) ;
+#endif
+
+    return rv ;
+}
+
+// this is used to populate the docs as attachments in the Comp fields for Send Documents
+nsresult nsMapiHook::PopulateCompFieldsForSendDocs(nsIMsgCompFields * aCompFields, ULONG aFlags, 
+                            PRUnichar * aDelimChar, PRUnichar * aFilePaths)
+{
+    nsAutoString strDelimChars ;
+    nsString strFilePaths;
+    nsresult rv = NS_OK ;
+
+    if (aFlags & MAPI_UNICODE)
+    {
+        if (aDelimChar)
+            strDelimChars.Assign (aDelimChar) ;
+        if (aFilePaths)
+            strFilePaths.Assign (aFilePaths) ;
+    }
+	else
+    {
+        if (aDelimChar)
+            strDelimChars.AssignWithConversion ((char*) aDelimChar) ;
+        if (aFilePaths)
+            strFilePaths.AssignWithConversion ((char *) aFilePaths) ;
+    }
+
+    // check for comma in filename 
+    if (strDelimChars.Find (",") == kNotFound)  // if comma is not in the delimiter specified by user
+    {
+        if (strFilePaths.Find(",") != kNotFound) // if comma found in filenames return error
+            return NS_ERROR_FILE_INVALID_PATH ;
+    }
+
+    nsCString Attachments ;
+
+    // only 1 file is to be sent, no delim specified
+    if ((!strDelimChars.Length()) && (strFilePaths.Length()>0))
+    {
+        nsCOMPtr <nsILocalFile> pFile = do_CreateInstance (NS_LOCAL_FILE_CONTRACTID, &rv) ;
+        if (NS_FAILED(rv) || (!pFile) ) return rv ;        
+        pFile->InitWithUnicodePath (strFilePaths.get()) ;
+
+        PRBool bExist ;
+        rv = pFile->Exists(&bExist) ;
+        if (NS_FAILED(rv) || (!bExist) ) return NS_ERROR_FILE_TARGET_DOES_NOT_EXIST ;
+
+        nsXPIDLCString pURL ;
+        NS_GetURLSpecFromFile(pFile, getter_Copies(pURL));
+        if (pURL)
+            Attachments.Assign(pURL) ;
+
+        // set attachments for comp field and return
+        rv = aCompFields->SetAttachments (Attachments.get());
+        return rv ;
+    }
+
+    // multiple files to be sent, delim specified
+    nsCOMPtr <nsILocalFile> pFile = do_CreateInstance (NS_LOCAL_FILE_CONTRACTID, &rv) ;
+    if (NS_FAILED(rv) || (!pFile) ) return rv ;        
+    PRInt32 offset = 0 ;
+    PRInt32 FilePathsLen = strFilePaths.Length() ;
+    if (FilePathsLen)
+    {
+        PRUnichar * newFilePaths = (PRUnichar *) strFilePaths.get() ;
+        while (offset != kNotFound)
+        {
+            nsString RemainingPaths ;
+            RemainingPaths.Assign(newFilePaths) ;
+            offset = RemainingPaths.Find (strDelimChars) ;
+            if (offset != kNotFound)
+            {
+                RemainingPaths.SetLength (offset) ;
+                if ((offset + strDelimChars.Length()) < FilePathsLen)
+                    newFilePaths += offset + strDelimChars.Length() ;
+            }
+
+            pFile->InitWithUnicodePath (RemainingPaths.get()) ;
+
+    #ifdef RAJIV_DEBUG
+            printf ("File : %S \n", RemainingPaths.get()) ; 
+    #endif 
+            PRBool bExist ;
+            rv = pFile->Exists(&bExist) ;
+            if (NS_FAILED(rv) || (!bExist) ) return NS_ERROR_FILE_TARGET_DOES_NOT_EXIST ;
+
+            nsXPIDLCString pURL ;
+            NS_GetURLSpecFromFile(pFile, getter_Copies(pURL));
+            if (pURL)
+            {
+				if (Attachments.Length() > 0)
+					Attachments.Append(",") ;
+                Attachments.Append(pURL) ;
+            }
+        }
+        rv = aCompFields->SetAttachments (Attachments.get());
+    }
+
+    return rv ;
+}
+
+// this used for Send with UI
+nsresult nsMapiHook::ShowComposerWindow (unsigned long aSession, nsIMsgCompFields * aCompFields) 
+{
+    nsresult rv = NS_OK ;
+
+    // create a send listener to get back the send status
+    nsCOMPtr <nsIMsgSendListener> sendListener ;
+    rv = nsMAPISendListener::CreateMAPISendListener(getter_AddRefs(sendListener)) ; 
+    if (NS_FAILED(rv) || (!sendListener) ) return rv ;
+
+    // create the compose params object 
+    nsCOMPtr<nsIMsgComposeParams> pMsgComposeParams (do_CreateInstance(NS_MSGCOMPOSEPARAMS_CONTRACTID, &rv));
+    if (NS_FAILED(rv) || (!pMsgComposeParams) ) return rv ;
+
+    // populate the compose params
+    pMsgComposeParams->SetType(nsIMsgCompType::New);
+    pMsgComposeParams->SetFormat(nsIMsgCompFormat::Default);
+    pMsgComposeParams->SetComposeFields(aCompFields); 
+    pMsgComposeParams->SetSendListener(sendListener) ;
+
+    /** get the nsIMsgComposeService object to open the compose window **/
+    nsCOMPtr <nsIMsgComposeService> compService = do_GetService (NS_MSGCOMPOSESERVICE_CONTRACTID) ;
+    if (NS_FAILED(rv)|| (!compService) ) return rv ;
+
+    rv = compService->OpenComposeWindowWithParams(nsnull, pMsgComposeParams) ;
+    if (NS_FAILED(rv)) return rv ;
+
+    return rv ;
+}

mozilla/mailnews/mapi/mapihook/src/msgMapiHook.h

@@ -0,0 +1,66 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla 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/MPL/
+ *
+ * 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
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corp.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef MSG_MAPI_HOOK_H_
+#define MSG_MAPI_HOOK_H_
+
+#include "prtypes.h"
+
+class nsMapiHook
+{
+    public :
+
+        static PRBool Initialize();
+        static PRBool DisplayLoginDialog(PRBool aLogin, PRUnichar **aUsername, 
+                        PRUnichar **aPassword);
+        static PRBool VerifyUserName(const PRUnichar *aUsername, char **aIdKey);
+
+        static PRBool IsBlindSendAllowed () ;
+        static nsresult BlindSendMail (unsigned long aSession, nsIMsgCompFields * aCompFields) ;
+        static nsresult ShowComposerWindow (unsigned long aSession, nsIMsgCompFields * aCompFields) ;
+        static nsresult PopulateCompFields(lpnsMapiMessage aMessage, nsIMsgCompFields * aCompFields) ;
+        static nsresult PopulateCompFieldsWithConversion(lpnsMapiMessage aMessage, 
+                                        nsIMsgCompFields * aCompFields) ;
+        static nsresult PopulateCompFieldsForSendDocs(nsIMsgCompFields * aCompFields, 
+                                        ULONG aFlags, LPTSTR aDelimChar, LPTSTR aFilePaths) ;
+        static nsresult HandleAttachments (nsIMsgCompFields * aCompFields, PRInt32 aFileCount, 
+                                        lpnsMapiFileDesc aFiles, BOOL aIsUnicode) ;
+        static void CleanUp();
+
+        static PRBool isMapiService;
+};
+
+#endif  // MSG_MAPI_HOOK_H_

mozilla/mailnews/mapi/mapihook/src/msgMapiImp.cpp

@@ -0,0 +1,266 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla 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/MPL/
+ *
+ * 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
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corp.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
+ * Contributor(s): Rajiv Dayal (rdayal@netscape.com)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include <mapidefs.h>
+#include <mapi.h>
+#include "msgMapi.h"
+#include "msgMapiImp.h"
+#include "msgMapiFactory.h"
+#include "msgMapiMain.h"
+
+#include "nsMsgCompFields.h"
+#include "msgMapiHook.h"
+#include "nsString.h"
+#include "nsCOMPtr.h"
+#include "nsISupports.h"
+#include "nsMsgCompCID.h"
+
+
+
+CMapiImp::CMapiImp()
+: m_cRef(1)
+{
+    m_Lock = PR_NewLock();
+}
+
+CMapiImp::~CMapiImp() 
+{ 
+    if (m_Lock)
+        PR_DestroyLock(m_Lock);
+}
+
+STDMETHODIMP CMapiImp::QueryInterface(const IID& aIid, void** aPpv)
+{    
+    if (aIid == IID_IUnknown)
+    {
+        *aPpv = static_cast<nsIMapi*>(this); 
+    }
+    else if (aIid == IID_nsIMapi)
+    {
+        *aPpv = static_cast<nsIMapi*>(this);
+    }
+    else
+    {
+        *aPpv = nsnull;
+        return E_NOINTERFACE;
+    }
+
+    reinterpret_cast<IUnknown*>(*aPpv)->AddRef();
+    return S_OK;
+}
+
+STDMETHODIMP_(ULONG) CMapiImp::AddRef()
+{
+    return PR_AtomicIncrement(&m_cRef);
+}
+
+STDMETHODIMP_(ULONG) CMapiImp::Release() 
+{
+    PRInt32 temp;
+    temp = PR_AtomicDecrement(&m_cRef);
+    if (m_cRef == 0)
+    {
+        delete this;
+        return 0;
+    }
+
+    return temp;
+}
+
+STDMETHODIMP CMapiImp::IsValid()
+{
+    return S_OK;
+}
+
+STDMETHODIMP CMapiImp::IsValidSession(unsigned long aSession)
+{
+    nsMAPIConfiguration *pConfig = nsMAPIConfiguration::GetMAPIConfiguration();
+    if (pConfig && pConfig->IsSessionValid(aSession))
+        return S_OK;
+
+    return E_FAIL;
+}
+
+STDMETHODIMP CMapiImp::Initialize()
+{
+    HRESULT hr = E_FAIL;
+
+    if (!m_Lock)
+        return E_FAIL;
+
+    PR_Lock(m_Lock);
+
+    // Initialize MAPI Configuration
+
+    nsMAPIConfiguration *pConfig = nsMAPIConfiguration::GetMAPIConfiguration();
+    if (pConfig != nsnull)
+        if (nsMapiHook::Initialize())
+            hr = S_OK;
+
+    PR_Unlock(m_Lock);
+
+    return hr;
+}
+
+STDMETHODIMP CMapiImp::Login(unsigned long aUIArg, LOGIN_PW_TYPE aLogin, LOGIN_PW_TYPE aPassWord,
+                unsigned long aFlags, unsigned long *aSessionId)
+{
+    HRESULT hr = E_FAIL;
+    PRBool bNewSession = PR_FALSE;
+    char *id_key = nsnull;
+
+    if (aFlags & MAPI_NEW_SESSION)
+        bNewSession = PR_TRUE;
+
+    // Check For Profile Name
+
+    if (aLogin != nsnull && aLogin[0] != '\0')
+    {
+        if (nsMapiHook::VerifyUserName(aLogin, &id_key) == PR_FALSE)
+    {
+        *aSessionId = MAPI_E_LOGIN_FAILURE;
+        return hr;
+    }
+    }
+
+    // finally register(create) the session.
+
+    PRUint32 nSession_Id;
+    PRInt16 nResult = 0;
+
+    nsMAPIConfiguration *pConfig = nsMAPIConfiguration::GetMAPIConfiguration();
+    if (pConfig != nsnull)
+        nResult = pConfig->RegisterSession(aUIArg, aLogin, aPassWord,
+                                           (aFlags & MAPI_FORCE_DOWNLOAD), bNewSession,
+                                           &nSession_Id, id_key);
+
+    switch (nResult)
+    {
+        case -1 :
+        {
+            *aSessionId = MAPI_E_TOO_MANY_SESSIONS;
+            return hr;
+        }
+        case 0 :
+        {
+            *aSessionId = MAPI_E_INSUFFICIENT_MEMORY;
+            return hr;
+        }
+        default :
+        {
+            *aSessionId = nSession_Id;
+            break;
+        }
+    }
+
+    return S_OK;
+}
+
+STDMETHODIMP CMapiImp::SendMail( unsigned long aSession, lpnsMapiMessage aMessage,
+     short aRecipCount, lpnsMapiRecipDesc aRecips , short aFileCount, lpnsMapiFileDesc aFiles , 
+     unsigned long aFlags, unsigned long aReserved)
+{
+    nsresult rv = NS_OK ;
+
+    // Assign the pointers in the aMessage struct to the array of Recips and Files
+    // recieved here from MS COM. These are used in BlindSendMail and ShowCompWin fns 
+    aMessage->lpRecips = aRecips ;
+    aMessage->lpFiles = aFiles ;
+
+    /** create nsIMsgCompFields obj and populate it **/
+    nsCOMPtr<nsIMsgCompFields> pCompFields = do_CreateInstance(NS_MSGCOMPFIELDS_CONTRACTID, &rv) ;
+    if (NS_FAILED(rv) || (!pCompFields) ) return MAPI_E_INSUFFICIENT_MEMORY ;
+
+    if (aFlags & MAPI_UNICODE)
+        rv = nsMapiHook::PopulateCompFields(aMessage, pCompFields) ;
+    else
+        rv = nsMapiHook::PopulateCompFieldsWithConversion(aMessage, pCompFields) ;
+    
+    if (NS_SUCCEEDED (rv))
+    {
+        // see flag to see if UI needs to be brought up
+        if (!(aFlags & MAPI_DIALOG))
+        {
+            rv = nsMapiHook::BlindSendMail(aSession, pCompFields);
+        }
+        else
+        {
+            rv = nsMapiHook::ShowComposerWindow(aSession, pCompFields);
+        }
+    }
+    
+    return nsMAPIConfiguration::GetMAPIErrorFromNSError (rv) ;
+}
+
+
+STDMETHODIMP CMapiImp::SendDocuments( unsigned long aSession, LPTSTR aDelimChar,
+                            LPTSTR aFilePaths, LPTSTR aFileNames, ULONG aFlags)
+{
+    nsresult rv = NS_OK ;
+
+    /** create nsIMsgCompFields obj and populate it **/
+    nsCOMPtr<nsIMsgCompFields> pCompFields = do_CreateInstance(NS_MSGCOMPFIELDS_CONTRACTID, &rv) ;
+    if (NS_FAILED(rv) || (!pCompFields) ) return MAPI_E_INSUFFICIENT_MEMORY ;
+
+    if (aFilePaths)
+    {
+        rv = nsMapiHook::PopulateCompFieldsForSendDocs(pCompFields, aFlags, aDelimChar, aFilePaths) ;
+    }
+
+    if (NS_SUCCEEDED (rv)) 
+        rv = nsMapiHook::ShowComposerWindow(aSession, pCompFields);
+
+    return nsMAPIConfiguration::GetMAPIErrorFromNSError (rv) ;
+}
+
+STDMETHODIMP CMapiImp::Logoff (unsigned long aSession)
+{
+    nsMAPIConfiguration *pConfig = nsMAPIConfiguration::GetMAPIConfiguration();
+
+    if (pConfig->UnRegisterSession((PRUint32)aSession))
+        return S_OK;
+
+    return E_FAIL;
+}
+
+STDMETHODIMP CMapiImp::CleanUp()
+{
+    nsMapiHook::CleanUp();
+    return S_OK;
+}
+
+

mozilla/mailnews/mapi/mapihook/src/msgMapiImp.h

@@ -0,0 +1,92 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla 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/MPL/
+ *
+ * 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
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corp.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef MSG_MAPI_IMP_H
+#define MSG_MAPI_IMP_H
+
+#include <windows.h>
+#include <mapi.h>
+#include "msgMapi.h"
+#include "nsXPIDLString.h"
+#include "nspr.h"
+
+const CLSID CLSID_CMapiImp = {0x29f458be, 0x8866, 0x11d5, {0xa3, 0xdd, 0x0, 0xb0, 0xd0, 0xf3, 0xba, 0xa7}};
+
+// this class implements the MS COM interface nsIMapi that provides the methods
+// called by mapi32.dll to perform the mail operations as specified by MAPI.
+// These class methods in turn use the Mozilla Mail XPCOM interfaces to do so.
+class CMapiImp : public nsIMapi
+{
+
+public :
+
+    // IUnknown
+
+    STDMETHODIMP            QueryInterface(const IID& aIid, void** aPpv);
+    STDMETHODIMP_(ULONG)    AddRef();
+    STDMETHODIMP_(ULONG)    Release();
+
+    // Interface INsMapi
+
+    STDMETHODIMP Login(unsigned long aUIArg, LOGIN_PW_TYPE aLogin, 
+                       LOGIN_PW_TYPE aPassWord, unsigned long aFlags,
+                       unsigned long *aSessionId);
+
+    STDMETHODIMP SendMail( unsigned long aSession, lpnsMapiMessage aMessage,
+         short aRecipCount, lpnsMapiRecipDesc aRecips , 
+         short aFileCount, lpnsMapiFileDesc aFiles , 
+         unsigned long aFlags, unsigned long aReserved) ;
+
+    STDMETHODIMP SendDocuments( unsigned long aSession, LPTSTR aDelimChar,
+                                LPTSTR aFilePaths, LPTSTR aFileNames, ULONG aFlags);
+
+    STDMETHODIMP Initialize();
+    STDMETHODIMP IsValid();
+    STDMETHODIMP IsValidSession(unsigned long aSession);
+
+    STDMETHODIMP Logoff (unsigned long aSession);
+    STDMETHODIMP CleanUp();
+
+    CMapiImp();
+    ~CMapiImp();
+
+private :
+
+    PRLock *m_Lock;
+    PRInt32 m_cRef;
+};
+
+#endif // MSG_MAPI_IMP_H

mozilla/mailnews/mapi/mapihook/src/msgMapiMain.cpp

@@ -0,0 +1,376 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla 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/MPL/
+ *
+ * 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
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corp.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include <mapidefs.h>
+#include <mapi.h>
+
+#include "msgCore.h"
+#include "nsMsgComposeStringBundle.h"
+#include "msgMapiMain.h"
+#include "nsIServiceManager.h"
+#include "nsCOMPtr.h"
+
+// move to xpcom bug 81956.
+class nsPRUintKey : public nsHashKey {
+protected:
+    PRUint32 mKey;
+public:
+    nsPRUintKey(PRUint32 key) : mKey(key) {}
+
+    PRUint32 HashCode(void) const {
+        return mKey;
+    }
+
+    PRBool Equals(const nsHashKey *aKey) const {
+        return mKey == ((const nsPRUintKey *) aKey)->mKey;
+    }
+    nsHashKey *Clone() const {
+        return new nsPRUintKey(mKey);
+    }
+    PRUint32 GetValue() { return mKey; }
+};
+//
+
+
+nsMAPIConfiguration *nsMAPIConfiguration::m_pSelfRef = nsnull;
+PRUint32 nsMAPIConfiguration::session_generator = 0;
+PRUint32 nsMAPIConfiguration::sessionCount = 0;
+
+nsMAPIConfiguration *nsMAPIConfiguration::GetMAPIConfiguration()
+{
+    if (m_pSelfRef == nsnull)
+        m_pSelfRef = new nsMAPIConfiguration();
+
+    return m_pSelfRef;
+}
+
+nsMAPIConfiguration::nsMAPIConfiguration()
+: m_nMaxSessions(MAX_SESSIONS)
+{
+    m_Lock = PR_NewLock();
+}
+
+static PRBool
+FreeSessionMapEntries(nsHashKey *aKey, void *aData, void* aClosure)
+{
+    nsMAPISession *pTemp = (nsMAPISession*) aData;
+    if (pTemp)
+    {
+    delete pTemp;
+    pTemp = nsnull;
+    }
+    return PR_TRUE;
+}
+
+static PRBool
+FreeProfileMapEntries(nsHashKey *aKey, void *aData, void* aClosure)
+{
+    return PR_TRUE;
+}
+
+nsMAPIConfiguration::~nsMAPIConfiguration()
+{
+    if (m_Lock)
+        PR_DestroyLock(m_Lock);
+
+    m_SessionMap.Reset(FreeSessionMapEntries);
+    m_ProfileMap.Reset(FreeProfileMapEntries);
+    }
+
+void nsMAPIConfiguration::OpenConfiguration()
+{
+    // No. of max. sessions is set to MAX_SESSIONS.  In future
+    // if it is decided to have configuration (registry)
+    // parameter, this function can be used to set the
+    // max sessions;
+
+    return;
+}
+
+PRInt16 nsMAPIConfiguration::RegisterSession(PRUint32 aHwnd,
+                const PRUnichar *aUserName, const PRUnichar *aPassword,
+                PRBool aForceDownLoad, PRBool aNewSession,
+                PRUint32 *aSession, char *aIdKey)
+{
+    PRInt16 nResult = 0;
+    PRUint32 n_SessionId = 0;
+
+    PR_Lock(m_Lock);
+
+    // Check whether max sessions is exceeded
+
+    if (sessionCount >= m_nMaxSessions)
+    {
+        PR_Unlock(m_Lock);
+        return -1;
+    }
+
+    if (aUserName != nsnull && aUserName[0] != '\0')
+    {
+    nsStringKey usernameKey(aUserName);
+    n_SessionId = (PRUint32) m_ProfileMap.Get(&usernameKey);
+    }
+
+    // try to share a session; if not create a session
+
+    if (n_SessionId > 0)
+    {
+        nsPRUintKey sessionKey(n_SessionId);
+        nsMAPISession *pTemp = (nsMAPISession *)m_SessionMap.Get(&sessionKey);
+        if (pTemp != nsnull)
+        {
+            pTemp->IncrementSession();
+            *aSession = n_SessionId;
+            nResult = 1;
+        }
+    }
+    else if (aNewSession || n_SessionId == 0) // checking for n_SessionId is a concession
+    {
+        // create a new session ; if new session is specified OR there is no session
+        nsMAPISession *pTemp = nsnull;
+        pTemp = new nsMAPISession(aHwnd, aUserName,
+                               aPassword, aForceDownLoad, aIdKey);
+
+        if (pTemp != nsnull)
+        {
+            session_generator++;
+
+            // I don't think there will be (2 power 32) sessions alive
+            // in a cycle.  This is an assumption
+
+            if (session_generator == 0)
+                session_generator++;
+
+            nsPRUintKey sessionKey(session_generator);
+            m_SessionMap.Put(&sessionKey, pTemp);
+            if (aUserName != nsnull && aUserName[0] != '\0')
+            {
+                nsStringKey usernameKey(aUserName);
+            m_ProfileMap.Put(&usernameKey, (void*)session_generator);
+            }
+
+            *aSession = session_generator;
+            sessionCount++;
+            nResult = 1;
+        }
+    }
+
+    PR_Unlock(m_Lock);
+    return nResult;
+}
+
+PRBool nsMAPIConfiguration::UnRegisterSession(PRUint32 aSessionID)
+{
+    PRBool bResult = PR_FALSE;
+
+    PR_Lock(m_Lock);
+
+    if (aSessionID != 0)
+    {
+        nsPRUintKey sessionKey(aSessionID);
+        nsMAPISession *pTemp = (nsMAPISession *)m_SessionMap.Get(&sessionKey);
+
+        if (pTemp != nsnull)
+        {
+            if (pTemp->DecrementSession() == 0)
+            {
+                if (pTemp->m_pProfileName.get() != nsnull)
+                {
+                nsStringKey stringKey(pTemp->m_pProfileName.get());
+                m_ProfileMap.Remove(&stringKey);
+                }
+                m_SessionMap.Remove(&sessionKey);
+                sessionCount--;
+                bResult = PR_TRUE;
+            }
+        }
+    }
+
+    PR_Unlock(m_Lock);
+    return bResult;
+}
+
+PRBool nsMAPIConfiguration::IsSessionValid(PRUint32 aSessionID)
+{
+    if (aSessionID == 0)
+        return PR_FALSE;
+
+    PRBool retValue = PR_FALSE;
+    nsPRUintKey sessionKey(aSessionID);
+
+    PR_Lock(m_Lock);
+
+    retValue = m_SessionMap.Exists(&sessionKey);
+        
+    PR_Unlock(m_Lock);
+
+    return retValue;
+}
+
+
+PRUnichar *nsMAPIConfiguration::GetPassword(PRUint32 aSessionID)
+{
+    PRUnichar *pResult = nsnull;
+
+    PR_Lock(m_Lock);
+
+    if (aSessionID != 0)
+    {
+        nsPRUintKey sessionKey(aSessionID);
+        nsMAPISession *pTemp = (nsMAPISession *)m_SessionMap.Get(&sessionKey);
+
+        if (pTemp)
+        {
+            pResult = pTemp->GetPassword();
+        }
+    }
+
+    PR_Unlock(m_Lock);
+
+    return pResult;
+}
+
+char *nsMAPIConfiguration::GetIdKey(PRUint32 aSessionID)
+{
+    char *pResult = nsnull;
+
+    PR_Lock(m_Lock);
+
+    if (aSessionID != 0)
+    {
+        nsPRUintKey sessionKey(aSessionID);
+        nsMAPISession *pTemp = (nsMAPISession *)m_SessionMap.Get(&sessionKey);
+        if (pTemp)
+        {
+           pResult = pTemp->GetIdKey();
+        }
+    }
+
+    PR_Unlock(m_Lock);
+    return pResult;
+}
+
+// util func
+HRESULT nsMAPIConfiguration::GetMAPIErrorFromNSError (nsresult res)
+{
+    HRESULT hr = SUCCESS_SUCCESS ;
+
+    if (NS_SUCCEEDED (hr)) return hr ;
+
+    // if failure return the related MAPI failure code
+    switch (res)
+    {
+        case NS_MSG_NO_RECIPIENTS :
+            hr = MAPI_E_BAD_RECIPTYPE ;
+            break ;
+        case NS_ERROR_COULD_NOT_GET_USERS_MAIL_ADDRESS :
+            hr = MAPI_E_INVALID_RECIPS ; 
+            break ;
+        case NS_ERROR_COULD_NOT_LOGIN_TO_SMTP_SERVER :
+            hr = MAPI_E_LOGIN_FAILURE ;
+            break ;
+        case NS_MSG_UNABLE_TO_OPEN_FILE :                 
+        case NS_MSG_UNABLE_TO_OPEN_TMP_FILE :
+        case NS_MSG_COULDNT_OPEN_FCC_FOLDER :
+        case NS_ERROR_FILE_INVALID_PATH :
+            hr = MAPI_E_ATTACHMENT_OPEN_FAILURE ;
+            break ;
+        case NS_ERROR_FILE_TARGET_DOES_NOT_EXIST :
+            hr = MAPI_E_ATTACHMENT_NOT_FOUND ;
+            break ;
+        case NS_MSG_CANCELLING :
+            hr = MAPI_E_USER_ABORT ;
+            break ;
+        case NS_MSG_ERROR_WRITING_FILE :
+        case NS_MSG_UNABLE_TO_SAVE_TEMPLATE :
+        case NS_MSG_UNABLE_TO_SAVE_DRAFT :
+            hr = MAPI_E_ATTACHMENT_WRITE_FAILURE ;
+            break ;
+        default :
+            hr = MAPI_E_FAILURE ;
+            break ;
+    }
+
+    return hr ;
+}
+
+
+nsMAPISession::nsMAPISession(PRUint32 aHwnd, const PRUnichar *aUserName,\
+                             const PRUnichar *aPassword, \
+                             PRBool aForceDownLoad, char *aKey)
+: m_bIsForcedDownLoad(aForceDownLoad),
+  m_hAppHandle(aHwnd),
+  m_nShared(1),
+  m_pIdKey(aKey)
+{
+    m_pProfileName.Assign(aUserName);
+    m_pPassword.Assign(aPassword);
+}
+
+nsMAPISession::~nsMAPISession()
+{
+    if (m_pIdKey != nsnull)
+    {
+        delete [] m_pIdKey;
+        m_pIdKey = nsnull;
+    }
+}
+
+PRUint32 nsMAPISession::IncrementSession()
+{
+    return ++m_nShared;
+}
+
+PRUint32 nsMAPISession::DecrementSession()
+{
+    return --m_nShared;
+}
+
+PRUint32 nsMAPISession::GetSessionCount()
+{
+    return m_nShared;
+}
+
+PRUnichar *nsMAPISession::GetPassword()
+{
+    return (PRUnichar *)m_pPassword.get();
+}
+
+char *nsMAPISession::GetIdKey()
+{
+    return m_pIdKey;
+}
+

mozilla/mailnews/mapi/mapihook/src/msgMapiMain.h

@@ -0,0 +1,112 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla 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/MPL/
+ *
+ * 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
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corp.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef MSG_MAPI_MAIN_H_
+#define NSG_MAPI_MAIN_H_
+
+#define        MAX_NAME_LEN    256
+#define        MAX_PW_LEN      256
+#define        MAX_SESSIONS    50
+#define        MAPI_SENDCOMPLETE_EVENT   "SendCompletionEvent"
+
+#define MAPI_PROPERTIES_CHROME "chrome://messenger-mapi/locale/mapi.properties"
+#define PREF_MAPI_WARN_PRIOR_TO_BLIND_SEND "mapi.blind-send.warn"
+#define PREF_MAPI_BLIND_SEND_ENABLED "mapi.blind-send.enabled"
+
+#include "nsXPIDLString.h"
+#include "nspr.h"
+#include "nsString.h"
+#include "nsHashtable.h"
+
+class nsMAPIConfiguration
+{
+private :
+
+    static PRUint32 session_generator;
+    static PRUint32 sessionCount;
+    static nsMAPIConfiguration *m_pSelfRef;
+    PRLock *m_Lock;
+    PRUint32  m_nMaxSessions;
+
+
+    nsHashtable m_ProfileMap;
+    nsHashtable m_SessionMap;
+    nsMAPIConfiguration();
+
+public :
+    static nsMAPIConfiguration *GetMAPIConfiguration();
+    void OpenConfiguration();
+    PRInt16 RegisterSession(PRUint32 aHwnd, const PRUnichar *aUserName, \
+                            const PRUnichar *aPassword, PRBool aForceDownLoad, \
+                            PRBool aNewSession, PRUint32 *aSession, char *aIdKey);
+    PRBool IsSessionValid(PRUint32 aSessionID);
+    PRBool UnRegisterSession(PRUint32 aSessionID);
+    PRUnichar *GetPassword(PRUint32 aSessionID);
+    char *GetIdKey(PRUint32 aSessionID);
+    ~nsMAPIConfiguration();
+
+    // a util func
+    static HRESULT GetMAPIErrorFromNSError (nsresult res) ;
+};
+
+class nsMAPISession
+{
+    friend class nsMAPIConfiguration;
+
+    private :
+
+        PRBool   m_bIsForcedDownLoad;
+        PRBool   m_bApp_or_Service;
+        PRUint32 m_hAppHandle;
+        PRUint32 m_nShared;
+        char     *m_pIdKey;
+        nsString m_pProfileName;
+        nsString m_pPassword;
+
+    public :
+
+        nsMAPISession(PRUint32 aHwnd, const PRUnichar *aUserName, \
+                      const PRUnichar *aPassword, \
+                      PRBool aForceDownLoad, char *aKey);
+        PRUint32 IncrementSession();
+        PRUint32 DecrementSession();
+        PRUint32 GetSessionCount();
+        PRUnichar *nsMAPISession::GetPassword();
+        char *nsMAPISession::GetIdKey();
+        ~nsMAPISession();
+};
+
+#endif    // MSG_MAPI_MAIN_H_

mozilla/mailnews/mapi/mapihook/src/msgMapiSupport.cpp

@@ -0,0 +1,209 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla 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/MPL/
+ *
+ * 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
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corp.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+#include "nsCOMPtr.h"
+#include "objbase.h"
+#include "nsISupports.h"
+
+#include "nsIGenericFactory.h"
+#include "nsIObserverService.h"
+#include "nsIAppStartupNotifier.h"
+#include "nsIServiceManager.h"
+#include "nsIComponentManager.h"
+#include "nsICategoryManager.h"
+
+#include "nsIPrefService.h"
+#include "nsIPrefBranch.h"
+#include "nsIPrefBranchInternal.h"
+
+#include "msgMapiSupport.h"
+#include "nsMapiRegistryUtils.h" 
+#include "nsMapiRegistry.h"
+#include "msgMapiImp.h"
+
+/** Implementation of the nsIMapiSupport interface.
+ *  Use standard implementation of nsISupports stuff.
+ */
+
+NS_IMPL_THREADSAFE_ISUPPORTS2(nsMapiSupport, nsIMapiSupport, nsIObserver);
+
+static NS_METHOD nsMapiRegistrationProc(nsIComponentManager *aCompMgr,
+                   nsIFile *aPath, const char *registryLocation, const char *componentType,
+                   const nsModuleComponentInfo *info)
+        {
+    
+  nsresult rv;
+
+  nsCOMPtr<nsICategoryManager> categoryManager(do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv));
+  if (NS_SUCCEEDED(rv)) 
+      rv = categoryManager->AddCategoryEntry(APPSTARTUP_CATEGORY, "Mapi Support", 
+                  "service," NS_IMAPISUPPORT_CONTRACTID, PR_TRUE, PR_TRUE, nsnull);
+ 
+  return rv ;
+
+}
+
+NS_IMETHODIMP
+nsMapiSupport::Observe(nsISupports *aSubject, const char *aTopic, const PRUnichar *aData)
+{
+    nsresult rv = NS_OK ;
+
+    if (!nsCRT::strcmp(aTopic, "profile-after-change"))
+        return InitializeMAPISupport();
+
+    if (!nsCRT::strcmp(aTopic, NS_XPCOM_SHUTDOWN_OBSERVER_ID))
+        return ShutdownMAPISupport();
+
+    if (!nsCRT::strcmp(aTopic, NS_PREFBRANCH_PREFCHANGE_TOPIC_ID))
+    {
+        nsCOMPtr<nsIPrefBranch> prefs = do_QueryInterface(aSubject, &rv);
+        if (NS_FAILED(rv))  return rv;
+        // which preference changed?
+        if (!nsCRT::strcmp(MAILNEWS_ALLOW_DEFAULT_MAIL_CLIENT, NS_ConvertUCS2toUTF8(aData).get()))
+        {
+            PRBool bIsDefault = PR_FALSE ;
+            rv = prefs->GetBoolPref(MAILNEWS_ALLOW_DEFAULT_MAIL_CLIENT, &bIsDefault);
+            if (NS_FAILED(rv)) return rv;
+            nsCOMPtr <nsIMapiRegistry> mapiRegistry = do_CreateInstance(NS_IMAPIREGISTRY_CONTRACTID, &rv) ;
+            if (NS_FAILED(rv)) return rv;
+            return mapiRegistry->SetIsDefaultMailClient(bIsDefault) ;
+        }
+        return rv ;
+    }
+
+    nsCOMPtr<nsIObserverService> observerService(do_GetService("@mozilla.org/observer-service;1", &rv));
+    if (NS_FAILED(rv)) return rv;
+ 
+    rv = observerService->AddObserver(this,"profile-after-change", PR_FALSE);
+    if (NS_FAILED(rv)) return rv;
+
+    rv = observerService->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, PR_FALSE);
+    if (NS_FAILED(rv))  return rv;
+
+     nsCOMPtr<nsIPrefService> prefs = do_GetService(NS_PREFSERVICE_CONTRACTID, &rv);
+    if (NS_FAILED(rv))  return rv;
+
+    nsCOMPtr<nsIPrefBranchInternal> prefInternal = do_QueryInterface(prefs, &rv);
+    if (NS_FAILED(rv))  return rv;
+
+    rv = prefInternal->AddObserver(MAILNEWS_ALLOW_DEFAULT_MAIL_CLIENT, this, PR_FALSE);
+    if (NS_FAILED(rv))  return rv;
+           
+    return rv;
+}
+
+
+nsMapiSupport::nsMapiSupport()
+: m_dwRegister(0),
+  m_nsMapiFactory(nsnull)
+{
+   NS_INIT_ISUPPORTS();
+}
+
+nsMapiSupport::~nsMapiSupport()
+{
+}
+
+NS_IMETHODIMP
+nsMapiSupport::InitializeMAPISupport()
+{
+    ::CoInitialize(nsnull) ;
+
+    if (m_nsMapiFactory == nsnull)    // No Registering if already done.  Sanity Check!!
+    {
+        m_nsMapiFactory = new CMapiFactory();
+
+        if (m_nsMapiFactory != nsnull)
+        {
+            HRESULT hr = ::CoRegisterClassObject(CLSID_CMapiImp, \
+                                                 m_nsMapiFactory, \
+                                                 CLSCTX_LOCAL_SERVER, \
+                                                 REGCLS_MULTIPLEUSE, \
+                                                 &m_dwRegister);
+
+            if (FAILED(hr))
+            {
+                m_nsMapiFactory->Release() ;
+                m_nsMapiFactory = nsnull;
+                return NS_ERROR_FAILURE;
+            }
+        }
+    }
+
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMapiSupport::ShutdownMAPISupport()
+{
+    if (m_dwRegister != 0)
+        ::CoRevokeClassObject(m_dwRegister);
+
+    if (m_nsMapiFactory != nsnull)
+    {
+        m_nsMapiFactory->Release();
+        m_nsMapiFactory = nsnull;
+    }
+
+    ::CoUninitialize();
+
+    return NS_OK ;
+}
+
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsMapiRegistry);
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsMapiSupport);
+
+// The list of components we register
+static nsModuleComponentInfo components[] = 
+{
+  {
+    NS_IMAPIREGISTRY_CLASSNAME, 
+    NS_IMAPIREGISTRY_CID,
+    NS_IMAPIREGISTRY_CONTRACTID, 
+    nsMapiRegistryConstructor
+  },
+
+{
+    NS_IMAPISUPPORT_CLASSNAME,
+    NS_IMAPISUPPORT_CID,
+    NS_IMAPISUPPORT_CONTRACTID,
+    nsMapiSupportConstructor,
+    nsMapiRegistrationProc,
+    nsnull
+}
+};
+
+NS_IMPL_NSGETMODULE(msgMapiModule, components);
+

mozilla/mailnews/mapi/mapihook/src/msgMapiSupport.h

@@ -0,0 +1,66 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla 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/MPL/
+ *
+ * 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
+ *
+ * The Initial Developer of the Original Code is 
+ # Netscape Communications Corp.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef MSG_MAPI_SUPPORT_H_
+#define MSG_MAPI_SUPPORT_H_
+
+#include "nsIObserver.h"
+#include "nsIMapiSupport.h"
+#include "msgMapiFactory.h"
+
+#define NS_IMAPISUPPORT_CID \
+  {0x8967fed2, 0xc8bb, 0x11d5, \
+    { 0xa3, 0xe9, 0x00, 0xb0, 0xd0, 0xf3, 0xba, 0xa7 }}
+
+class nsMapiSupport : public nsIMapiSupport,
+                      public nsIObserver
+{
+    public :
+        nsMapiSupport();
+        ~nsMapiSupport();
+
+        // Declare all interface methods we must implement.
+        NS_DECL_ISUPPORTS
+        NS_DECL_NSIOBSERVER
+        NS_DECL_NSIMAPISUPPORT
+
+    private :
+
+        DWORD   m_dwRegister;
+        CMapiFactory *m_nsMapiFactory;
+};
+
+#endif  // MSG_MAPI_SUPPORT_H_

mozilla/mailnews/mapi/mapihook/src/nsMapiRegistry.cpp

@@ -0,0 +1,167 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla 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/MPL/
+ *
+ * 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 the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Srilatha Moturi <srilatha@netscape.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+ 
+#include "nsIServiceManager.h"
+#include "nsXPIDLString.h"
+#include "nsIPromptService.h"
+#include "nsIProxyObjectManager.h"
+#include "nsProxiedService.h"
+
+#include "nsMapiRegistryUtils.h" 
+#include "nsMapiRegistry.h"
+
+static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID);
+
+/** Implementation of the nsIMapiRegistry interface.
+ *  Use standard implementation of nsISupports stuff.
+ */
+NS_IMPL_ISUPPORTS1(nsMapiRegistry, nsIMapiRegistry);
+
+nsMapiRegistry::nsMapiRegistry() {
+    NS_INIT_ISUPPORTS();
+    m_ShowDialog = ! m_registryUtils.verifyRestrictedAccess();
+    m_DefaultMailClient = m_registryUtils.IsDefaultMailClient();
+}
+
+nsMapiRegistry::~nsMapiRegistry() {
+}
+
+NS_IMETHODIMP
+nsMapiRegistry::GetIsDefaultMailClient(PRBool * retval) {
+    // we need to get the value from registry everytime
+    // because the registry settings can be changed from
+    // other mail applications.
+    *retval = m_registryUtils.IsDefaultMailClient();
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMapiRegistry::GetShowDialog(PRBool * retval) {
+    *retval = m_ShowDialog;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMapiRegistry::SetIsDefaultMailClient(PRBool aIsDefaultMailClient) 
+{
+    nsresult rv = NS_OK ;
+
+    if (aIsDefaultMailClient)
+    {
+        rv = m_registryUtils.setDefaultMailClient();
+    if (NS_SUCCEEDED(rv))
+        m_DefaultMailClient = PR_TRUE;
+    else
+            m_registryUtils.ShowMapiErrorDialog();
+}
+    else
+    {
+        rv = m_registryUtils.unsetDefaultMailClient();
+    if (NS_SUCCEEDED(rv))
+        m_DefaultMailClient = PR_FALSE;
+    else
+            m_registryUtils.ShowMapiErrorDialog();
+}
+
+    return rv ;
+}
+
+/** This will bring up the dialog box only once per session and 
+ * only if the current app is not default Mail Client.
+ * This also checks the registry if the registry key
+ * showMapiDialog is set
+ */
+NS_IMETHODIMP
+nsMapiRegistry::ShowMailIntegrationDialog(nsIDOMWindow *aParentWindow) {
+    nsresult rv;
+    if (!m_ShowDialog || !m_registryUtils.getShowDialog()) return NS_OK;
+    nsCOMPtr<nsIPromptService> promptService(do_GetService(
+                  "@mozilla.org/embedcomp/prompt-service;1", &rv));
+    if (NS_SUCCEEDED(rv) && promptService)
+    {
+        nsCOMPtr<nsIStringBundle> bundle;
+        rv = m_registryUtils.MakeMapiStringBundle (getter_AddRefs (bundle)) ;
+        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+
+        nsXPIDLString dialogTitle;
+        const PRUnichar *brandStrings[] = { m_registryUtils.brandName() };
+        NS_NAMED_LITERAL_STRING(dialogTitlePropertyTag, "dialogTitle");
+        rv = bundle->FormatStringFromName(dialogTitlePropertyTag.get(),
+                                          brandStrings, 1,
+                                          getter_Copies(dialogTitle));
+        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+        
+        nsXPIDLString dialogText;
+        NS_NAMED_LITERAL_STRING(dialogTextPropertyTag, "dialogText");
+        rv = bundle->FormatStringFromName(dialogTextPropertyTag.get(),
+                                          brandStrings, 1,
+                                          getter_Copies(dialogText));
+        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+
+        nsXPIDLString checkboxText;
+        rv = bundle->GetStringFromName(
+                           NS_LITERAL_STRING("checkboxText").get(),
+                           getter_Copies(checkboxText));
+        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+
+        PRBool checkValue = PR_FALSE;
+        PRInt32 buttonPressed = 0;
+        rv = promptService->ConfirmEx(aParentWindow,
+                                      dialogTitle,
+                                      dialogText.get(),
+                                      (nsIPromptService::BUTTON_TITLE_YES * 
+                                      nsIPromptService::BUTTON_POS_0) +
+                                      (nsIPromptService::BUTTON_TITLE_NO * 
+                                      nsIPromptService::BUTTON_POS_1),
+                                      nsnull,
+                                      nsnull,
+                                      nsnull,
+                                      checkboxText,
+                                      &checkValue,
+                                      &buttonPressed);
+        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+        rv = m_registryUtils.SetRegistryKey(HKEY_LOCAL_MACHINE, "Software\\Mozilla\\Desktop", 
+                                "showMapiDialog", (checkValue) ? "0" : "1");
+        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+
+        m_ShowDialog = PR_FALSE;
+        if (!buttonPressed)
+            rv = SetIsDefaultMailClient(PR_TRUE) ; // SetDefaultMailClient();
+    }
+    return rv;
+}
+

mozilla/mailnews/mapi/mapihook/src/nsMapiRegistry.h

@@ -0,0 +1,76 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla 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/MPL/
+ *
+ * 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 the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Srilatha Moturi <srilatha@netscape.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef nsmapiregistry_h____
+#define nsmapiregistry_h____
+
+#include "nsIMapiRegistry.h"
+
+#ifndef MAX_BUF
+#define MAX_BUF 4096
+#endif
+
+/* c5be14ba-4e0a-4eec-a1b8-04363761d63c */
+#define NS_IMAPIREGISTRY_CID \
+ { 0xc5be14ba, 0x4e0a, 0x4eec, {0xa1, 0xb8, 0x04, 0x36, 0x37, 0x61, 0xd6, 0x3c} }
+#define NS_IMAPIREGISTRY_CONTRACTID    "@mozilla.org/mapiregistry;1"
+#define NS_IMAPIREGISTRY_CLASSNAME "Mozilla MAPI Registry"
+
+#define MAILNEWS_ALLOW_DEFAULT_MAIL_CLIENT  "mailnews.default_mail_client"
+
+class nsMapiRegistry : public nsIMapiRegistry {
+public:
+    // ctor/dtor
+    nsMapiRegistry();
+    virtual ~nsMapiRegistry();
+
+    // Declare all interface methods we must implement.
+    NS_DECL_ISUPPORTS
+    NS_DECL_NSIMAPIREGISTRY
+
+protected:
+    
+    PRBool m_DefaultMailClient;
+    PRBool m_ShowDialog;
+    nsMapiRegistryUtils m_registryUtils ;
+
+private:
+    // Special member to handle initialization.
+    PRBool mHaveBeenSet;
+}; // nsMapiRegistry
+
+#endif // nsmapiregistry_h____

mozilla/mailnews/mapi/mapihook/src/nsMapiRegistryUtils.cpp

@@ -0,0 +1,743 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla 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/MPL/
+ *
+ * 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 the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Srilatha Moturi <srilatha@netscape.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#undef UNICODE
+#undef _UNICODE
+
+#include "nsIServiceManager.h"
+#include "msgMapiImp.h"
+#include "msgMapiMain.h"
+#include "nsMapiRegistryUtils.h"
+#include "nsString.h"
+#include "nsIStringBundle.h"
+#include "nsIPromptService.h"
+#include "nsXPIDLString.h"
+#include "nsSpecialSystemDirectory.h"
+#include "nsDirectoryService.h"
+#include "nsDirectoryServiceDefs.h"
+#include "nsAppDirectoryServiceDefs.h"
+#include "nsIPref.h"
+
+static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID);
+
+#define EXE_EXTENSION ".exe" 
+#define USERAGENT_VERSION_PREF "general.useragent.misc"
+#define USERAGENT_VERSION_NS_PREF "general.useragent.vendorSub"
+#define USERAGENT_PREF_PREFIX "rv:"
+
+nsMapiRegistryUtils::nsMapiRegistryUtils()
+{
+   m_mapiStringBundle = nsnull ;
+}
+    
+const char * nsMapiRegistryUtils::thisApplication()
+{
+    if (m_thisApp.IsEmpty()) {
+        char buffer[MAX_PATH] = {0};
+        DWORD len = ::GetModuleFileName(NULL, buffer, MAX_PATH);
+        if (!len) return nsnull ; 
+        char shortPathBuf[MAX_PATH] = {0};
+        len = ::GetShortPathName(buffer, shortPathBuf, MAX_PATH);
+        if (!len) return nsnull ; 
+        m_thisApp = buffer;
+        m_thisApp.ToUpperCase();
+    }
+
+    return m_thisApp.get() ;
+}
+
+const PRUnichar * nsMapiRegistryUtils::brandName() 
+{
+    nsresult rv;
+    if (m_brand.IsEmpty()) {
+        nsCOMPtr<nsIStringBundleService> bundleService(do_GetService(
+                                         kStringBundleServiceCID, &rv));
+        if (NS_SUCCEEDED(rv) && bundleService) {
+            nsCOMPtr<nsIStringBundle> brandBundle;
+            rv = bundleService->CreateBundle(
+                        "chrome://global/locale/brand.properties",
+                        getter_AddRefs(brandBundle));
+            if (NS_SUCCEEDED(rv)) {
+                nsXPIDLString brandName;
+                rv = brandBundle->GetStringFromName(
+                           NS_LITERAL_STRING("brandShortName").get(),
+                           getter_Copies(brandName));
+                if (NS_SUCCEEDED(rv)) {
+                    m_brand = brandName ;
+                }
+            }
+        }
+    }
+
+    return m_brand.get()  ;
+}
+
+const PRUnichar * nsMapiRegistryUtils::versionNo()
+{
+ if (!m_versionNo.IsEmpty())
+   return m_versionNo.get() ;
+
+ nsCOMPtr<nsIPref> prefs = do_GetService(NS_PREF_CONTRACTID);
+ if (prefs) {
+     nsXPIDLCString versionStr ;
+     nsresult rv = prefs->GetCharPref(USERAGENT_VERSION_NS_PREF, getter_Copies(versionStr));
+     if (NS_SUCCEEDED(rv) && versionStr)
+         m_versionNo.AssignWithConversion (versionStr.get()) ;
+     else {
+         rv = prefs->GetCharPref(USERAGENT_VERSION_PREF, getter_Copies(versionStr));
+         if (NS_SUCCEEDED(rv) && versionStr)  {
+             m_versionNo.AssignWithConversion (versionStr.get()) ;
+             m_versionNo.StripChars (USERAGENT_PREF_PREFIX) ;
+         }
+     }
+ }
+
+ return m_versionNo.get() ;
+}
+
+
+PRBool nsMapiRegistryUtils::verifyRestrictedAccess() {
+    char   subKey[] = "Software\\Mozilla - Test Key";
+    PRBool result = PR_FALSE;
+    DWORD  dwDisp = 0;
+    HKEY   key;
+    // Try to create/open a subkey under HKLM.
+    DWORD rc = ::RegCreateKeyEx(HKEY_LOCAL_MACHINE,
+                                subKey,
+                                0,
+                                NULL,
+                                REG_OPTION_NON_VOLATILE,
+                                KEY_WRITE,
+                                NULL,
+                                &key,
+                                &dwDisp);
+
+    if (rc == ERROR_SUCCESS) {
+        // Key was opened; first close it.
+        ::RegCloseKey(key);
+        // Delete it if we just created it.
+        switch(dwDisp) {
+            case REG_CREATED_NEW_KEY:
+                ::RegDeleteKey(HKEY_LOCAL_MACHINE, subKey);
+                break;
+            case REG_OPENED_EXISTING_KEY:
+                break;
+        }
+    } else {
+        // Can't create/open it; we don't have access.
+        result = PR_TRUE;
+    }
+    return result;
+}
+
+nsresult nsMapiRegistryUtils::SetRegistryKey(HKEY baseKey, const char * keyName, 
+                        const char * valueName, char * value)
+{
+    nsresult result = NS_ERROR_FAILURE;
+    HKEY   key;
+    LONG   rc = ::RegCreateKey(baseKey, keyName, &key);
+  
+    if (rc == ERROR_SUCCESS) {
+        rc = ::RegSetValueEx(key, valueName, NULL, REG_SZ, 
+                                 (LPBYTE)(const char*)value, strlen(value));
+        if (rc == ERROR_SUCCESS) {
+            result = NS_OK;
+        }
+        ::RegCloseKey(key);
+    }
+    return result;
+}
+
+nsresult nsMapiRegistryUtils::DeleteRegistryValue(HKEY baseKey, const char * keyName, 
+                        const char * valueName)
+{
+    nsresult result = NS_ERROR_FAILURE;
+    HKEY   key;
+    LONG   rc = ::RegOpenKey(baseKey, keyName, &key);
+  
+    if (rc == ERROR_SUCCESS) {
+        rc = ::RegDeleteValue(key, valueName);
+        if (rc == ERROR_SUCCESS)
+            result = NS_OK;
+        ::RegCloseKey(key);
+    }
+    return result;
+}
+
+void nsMapiRegistryUtils::GetRegistryKey(HKEY baseKey, const char * keyName, 
+                         const char * valueName, nsCAutoString & value)
+{
+    HKEY   key;
+    LONG   rc = ::RegOpenKey(baseKey, keyName, &key);
+    if (rc == ERROR_SUCCESS) {
+        char buffer[MAX_PATH] = {0};
+        DWORD len = sizeof buffer;
+        rc = ::RegQueryValueEx(key, valueName, NULL, NULL, 
+                               (LPBYTE)buffer, &len);
+        if (rc == ERROR_SUCCESS) {
+            if (len)
+                value = buffer;
+        }
+        ::RegCloseKey(key);
+     }
+}
+
+
+
+PRBool nsMapiRegistryUtils::IsDefaultMailClient()
+{
+    if (!isSmartDll() && !isMozDll()) 
+        return PR_FALSE;
+    nsCAutoString name; 
+    GetRegistryKey(HKEY_LOCAL_MACHINE, "Software\\Clients\\Mail", "", name);
+    if (!name.IsEmpty()) {
+         nsCAutoString keyName("Software\\Clients\\Mail\\");
+         keyName += name.get(); 
+         keyName += "\\protocols\\mailto\\shell\\open\\command";
+
+         nsCAutoString result;
+         GetRegistryKey(HKEY_LOCAL_MACHINE, keyName.get(), "", result);
+         if (!result.IsEmpty()) {
+             nsCAutoString strExtension;
+             strExtension.Assign(EXE_EXTENSION);
+             result.ToUpperCase();
+             strExtension.ToUpperCase();
+             PRInt32 index = result.RFind(strExtension.get());
+             if (index != kNotFound) {
+                 result.Truncate(index + strExtension.Length());
+             }
+             nsCAutoString thisApp (thisApplication()) ;
+             return (result == thisApp);
+        }
+    }
+    return PR_FALSE;
+
+}
+
+nsresult nsMapiRegistryUtils::saveDefaultMailClient()
+{
+    nsresult rv;
+    nsCAutoString name ;
+    GetRegistryKey(HKEY_LOCAL_MACHINE,"Software\\Clients\\Mail", "", name);
+    if (!name.IsEmpty()) {
+        rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                            "Software\\Mozilla\\Desktop", 
+                            "HKEY_LOCAL_MACHINE\\Software\\Clients\\Mail", 
+                            (char *)name.get());
+        if (NS_SUCCEEDED(rv)) {
+            nsCAutoString keyName("Software\\Clients\\Mail\\");
+            keyName += name.get(); 
+            keyName += "\\protocols\\mailto\\shell\\open\\command";
+            nsCAutoString appPath ;
+            GetRegistryKey(HKEY_LOCAL_MACHINE, keyName.get(), "", appPath);
+            if (!appPath.IsEmpty()) {
+                nsCAutoString stringName("HKEY_LOCAL_MACHINE\\");
+                stringName += keyName.get();
+                rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                                  "Software\\Mozilla\\Desktop", 
+                                  stringName.get(), (char *)appPath.get());
+            }
+        }
+    }
+    else
+        rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                            "Software\\Mozilla\\Desktop", 
+                            "HKEY_LOCAL_MACHINE\\Software\\Clients\\Mail", 
+                            "");
+    return rv;
+} 
+
+nsresult nsMapiRegistryUtils::saveUserDefaultMailClient()
+{
+    nsresult rv;
+    nsCAutoString name ;
+    GetRegistryKey(HKEY_CURRENT_USER,"Software\\Clients\\Mail", "", name);
+    if (!name.IsEmpty()) {
+        rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                            "Software\\Mozilla\\Desktop", 
+                            "HKEY_CURRENT_USER\\Software\\Clients\\Mail", 
+                            (char *)name.get());
+    }
+    else {
+        rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                            "Software\\Mozilla\\Desktop", 
+                            "HKEY_CURRENT_USER\\Software\\Clients\\Mail", 
+                            "");
+   }
+   return rv;
+}
+
+/**
+ * Check whether it is a smart dll or not. Smart dll is the one installed by
+ * IE5 or Outlook Express which forwards the MAPI calls to the dll based on the 
+ * registry key setttings.
+ * Returns TRUE if is a smart dll.
+ */
+
+typedef HRESULT (FAR PASCAL GetOutlookVersionFunc)(); 
+PRBool nsMapiRegistryUtils::isSmartDll() 
+{ 
+    char buffer[MAX_PATH] = {0};
+    if (GetSystemDirectory(buffer, sizeof(buffer)) == 0) 
+        return PR_FALSE;
+    PL_strcatn(buffer, sizeof(buffer), "\\Mapi32.dll");
+    
+    HINSTANCE hInst; 
+    GetOutlookVersionFunc *doesExist = nsnull;
+    hInst = LoadLibrary(buffer); 
+    if (hInst == nsnull) 
+        return PR_FALSE;
+        
+    doesExist = (GetOutlookVersionFunc *) GetProcAddress (hInst, "GetOutlookVersion"); 
+    FreeLibrary(hInst); 
+
+    return (doesExist != nsnull); 
+} 
+
+typedef HRESULT (FAR PASCAL GetMapiDllVersion)(); 
+/**
+ * Checks whether mapi32.dll is installed by this app. 
+ * Returns TRUE if it is.
+ */
+PRBool nsMapiRegistryUtils::isMozDll() 
+{ 
+    char buffer[MAX_PATH] = {0};
+    if (GetSystemDirectory(buffer, sizeof(buffer)) == 0) 
+        return PR_FALSE;
+    PL_strcatn(buffer, sizeof(buffer), "\\Mapi32.dll"); 
+
+    HINSTANCE hInst; 
+    GetMapiDllVersion *doesExist = nsnull;
+    hInst = LoadLibrary(buffer); 
+    if (hInst == nsnull) 
+        return PR_FALSE;
+        
+    doesExist = (GetMapiDllVersion *) GetProcAddress (hInst, "GetMapiDllVersion"); 
+    FreeLibrary(hInst); 
+
+    return (doesExist != nsnull); 
+} 
+
+/** Renames Mapi32.dl in system directory to Mapi32_moz_bak.dll
+ *  copies the mozMapi32.dll from bin directory to the system directory
+ */
+nsresult nsMapiRegistryUtils::CopyMozMapiToWinSysDir()
+{
+    nsresult rv;
+    char buffer[MAX_PATH] = {0};
+    if (GetSystemDirectory(buffer, sizeof(buffer)) == 0) 
+        return NS_ERROR_FAILURE;
+
+    nsCAutoString filePath(buffer);
+    filePath.Append("\\Mapi32_moz_bak.dll");
+
+    nsCOMPtr<nsILocalFile> pCurrentMapiFile = do_CreateInstance (NS_LOCAL_FILE_CONTRACTID, &rv);
+    if (NS_FAILED(rv) || !pCurrentMapiFile) return rv;        
+    pCurrentMapiFile->InitWithPath(filePath.get());
+
+    nsCOMPtr<nsIFile> pMozMapiFile;
+    nsCOMPtr<nsIProperties> directoryService =
+          do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv);
+    if (!directoryService) return NS_ERROR_FAILURE;
+    rv = directoryService->Get(NS_OS_CURRENT_PROCESS_DIR,
+                              NS_GET_IID(nsIFile),
+                              getter_AddRefs(pMozMapiFile));
+
+    if (NS_FAILED(rv)) return rv;
+    pMozMapiFile->Append("mozMapi32.dll");
+
+    PRBool bExist;
+    rv = pMozMapiFile->Exists(&bExist);
+    if (NS_FAILED(rv) || !bExist) return rv;
+
+    rv = pCurrentMapiFile->Exists(&bExist);
+    if (NS_SUCCEEDED(rv) && bExist)
+    {
+        rv = pCurrentMapiFile->Remove(PR_FALSE);
+    }
+    if (NS_FAILED(rv)) return rv;
+    filePath.Assign(buffer);
+    filePath.Append("\\Mapi32.dll");
+    pCurrentMapiFile->InitWithPath(filePath.get());
+    rv = pCurrentMapiFile->Exists(&bExist);
+    if (NS_SUCCEEDED(rv) && bExist)
+    {
+        rv = pCurrentMapiFile->MoveTo(nsnull, "Mapi32_moz_bak.dll");
+        if (NS_FAILED(rv)) return rv;
+        nsCAutoString fullFilePath(buffer);
+        fullFilePath.Append("\\Mapi32_moz_bak.dll");
+        rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                            "Software\\Mozilla\\Desktop", 
+                            "Mapi_backup_dll", 
+                            (char *)fullFilePath.get());
+        if (NS_FAILED(rv)) {
+             RestoreBackedUpMapiDll();
+             return rv;
+        }
+    }
+    
+    NS_NAMED_LITERAL_STRING(fileName, "Mapi32.dll");
+    filePath.Assign(buffer);
+    pCurrentMapiFile->InitWithPath(filePath.get());
+    rv = pMozMapiFile->CopyToUnicode(pCurrentMapiFile, fileName.get());
+    if (NS_FAILED(rv))
+        RestoreBackedUpMapiDll();
+    return rv;
+}
+
+/** deletes the Mapi32.dll in system directory and renames Mapi32_moz_bak.dll
+ *  to Mapi32.dll
+ */
+nsresult nsMapiRegistryUtils::RestoreBackedUpMapiDll()
+{
+    nsresult rv;
+    char buffer[MAX_PATH] = {0};
+    if (GetSystemDirectory(buffer, sizeof(buffer)) == 0) 
+        return NS_ERROR_FAILURE;
+
+    nsCAutoString filePath(buffer);
+    nsCAutoString previousFileName(buffer);
+    filePath.Append("\\Mapi32.dll");
+    previousFileName.Append("\\Mapi32_moz_bak.dll");
+
+    nsCOMPtr <nsILocalFile> pCurrentMapiFile = do_CreateInstance(NS_LOCAL_FILE_CONTRACTID, &rv);
+    if (NS_FAILED(rv) || !pCurrentMapiFile) return NS_ERROR_FAILURE;        
+    pCurrentMapiFile->InitWithPath(filePath.get());
+    
+    nsCOMPtr<nsILocalFile> pPreviousMapiFile = do_CreateInstance (NS_LOCAL_FILE_CONTRACTID, &rv);
+    if (NS_FAILED(rv) || !pPreviousMapiFile) return NS_ERROR_FAILURE;       
+    pPreviousMapiFile->InitWithPath(previousFileName.get());
+
+    PRBool bExist;
+    rv = pCurrentMapiFile->Exists(&bExist);
+    if (NS_SUCCEEDED(rv) && bExist) {
+        rv = pCurrentMapiFile->Remove(PR_FALSE);
+        if (NS_FAILED(rv)) return rv;
+    }
+
+    rv = pPreviousMapiFile->Exists(&bExist);
+    if (NS_SUCCEEDED(rv) && bExist)
+        rv = pPreviousMapiFile->MoveTo(nsnull, "Mapi32.dll");
+    if (NS_SUCCEEDED(rv))
+        DeleteRegistryValue(HKEY_LOCAL_MACHINE,
+                            "Software\\Mozilla\\Desktop", 
+                            "Mapi_backup_dll");
+    return rv;
+}
+
+/** Sets Mozilla as default Mail Client
+ */
+nsresult nsMapiRegistryUtils::setDefaultMailClient()
+{
+    nsresult rv;
+    nsresult mailKeySet=NS_ERROR_FAILURE;
+    if (verifyRestrictedAccess()) return NS_ERROR_FAILURE;
+    if (!isSmartDll()) {
+        if (NS_FAILED(CopyMozMapiToWinSysDir())) return NS_ERROR_FAILURE;
+    }
+    rv = saveDefaultMailClient();
+    if (NS_FAILED(saveUserDefaultMailClient()) ||
+        NS_FAILED(rv)) return NS_ERROR_FAILURE;
+    nsCAutoString keyName("Software\\Clients\\Mail\\");
+
+    nsCAutoString appName (NS_ConvertUCS2toUTF8(brandName()).get());
+    if (!appName.IsEmpty()) {
+        keyName.Append(appName.get());
+
+ nsCOMPtr<nsIStringBundle> bundle;
+ rv = MakeMapiStringBundle (getter_AddRefs (bundle)) ;
+ if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+
+ nsXPIDLString defaultMailTitle;
+ const PRUnichar *keyValuePrefixStr[] = { brandName(), versionNo() };
+ NS_NAMED_LITERAL_STRING(defaultMailTitleTag, "defaultMailDisplayTitle");
+ rv = bundle->FormatStringFromName(defaultMailTitleTag.get(),
+ keyValuePrefixStr, 2,
+ getter_Copies(defaultMailTitle));
+ if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+
+        rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                        keyName.get(), 
+ "", NS_CONST_CAST(char *, NS_ConvertUCS2toUTF8(defaultMailTitle).get()) ) ; 
+    }
+    else
+        rv = NS_ERROR_FAILURE;
+    if (NS_SUCCEEDED(rv)) {
+        nsCAutoString thisApp (thisApplication()) ;
+        if (NS_FAILED(rv)) return rv ;
+
+        nsCAutoString dllPath (thisApp) ;
+        PRInt32 index = dllPath.RFind("\\");
+        if (index != kNotFound)
+            dllPath.Truncate(index + 1);
+        dllPath += "mozMapi32.dll";
+        rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                            keyName.get(), "DLLPath", 
+                            (char *)dllPath.get());
+        if (NS_SUCCEEDED(rv)) {
+            keyName.Append("\\protocols\\mailto");
+            rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                                keyName.get(), 
+                                "", "URL:MailTo Protocol");
+            if (NS_SUCCEEDED(rv)) {
+                nsCAutoString appPath (thisApp);
+                appPath += " \"%1\"";
+                keyName.Append("\\shell\\open\\command");
+                rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                       keyName.get(), 
+                       "", (char *)appPath.get());
+                if (NS_SUCCEEDED(rv)) {
+                    rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                                        "Software\\Clients\\Mail", 
+                                        "", (char *)appName.get());
+                }
+                if (NS_SUCCEEDED(rv)) {
+                    nsCAutoString mailAppPath(thisApp);
+                    mailAppPath += " -mail";
+                    nsCAutoString appKeyName ("Software\\Clients\\Mail\\");
+                    appKeyName.Append(appName.get());
+                    appKeyName.Append("\\shell\\open\\command");
+                    rv = SetRegistryKey(HKEY_LOCAL_MACHINE,
+                                        appKeyName.get(),
+                                        "", (char *)mailAppPath.get());
+                }
+                if (NS_SUCCEEDED(rv)) {
+                    nsCAutoString iconPath(thisApp);
+                    iconPath += ",0";
+                    nsCAutoString iconKeyName ("Software\\Clients\\Mail\\");
+                    iconKeyName.Append(appName.get());
+                    iconKeyName.Append("\\DefaultIcon");
+                    mailKeySet = SetRegistryKey(HKEY_LOCAL_MACHINE,
+                                        iconKeyName.get(),
+                                        "", (char *)iconPath.get());
+                }
+            }            
+        }
+    }
+
+    if (NS_SUCCEEDED(mailKeySet)) {
+        nsresult desktopKeySet = SetRegistryKey(HKEY_CURRENT_USER, 
+                                                "Software\\Clients\\Mail",
+                                                "", (char *)appName.get());
+        if (NS_SUCCEEDED(desktopKeySet)) {
+            desktopKeySet = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                                           "Software\\Mozilla\\Desktop", 
+                                           "defaultMailHasBeenSet", "1");
+        }
+        ::SendMessage(HWND_BROADCAST, WM_SETTINGCHANGE, 0, 
+                     (LPARAM)"Software\\Clients\\Mail");
+        RegisterServer(CLSID_CMapiImp, "Mozilla MAPI", "mozMapi", "mozMapi.1");
+        return desktopKeySet;
+    }
+    
+    return mailKeySet;
+}
+
+/** Removes Mozilla as the default Mail client and restores the previous setting
+ */
+nsresult nsMapiRegistryUtils::unsetDefaultMailClient() {
+    nsresult result = NS_OK;
+    nsresult mailKeySet = NS_ERROR_FAILURE;
+    if (verifyRestrictedAccess()) return NS_ERROR_FAILURE;
+    if (!isSmartDll()) {
+        if (NS_FAILED(RestoreBackedUpMapiDll())) return NS_ERROR_FAILURE;
+    }
+    nsCAutoString name ;
+    GetRegistryKey(HKEY_LOCAL_MACHINE, "Software\\Mozilla\\Desktop", 
+                                      "HKEY_LOCAL_MACHINE\\Software\\Clients\\Mail", name);
+    nsCAutoString appName (NS_ConvertUCS2toUTF8(brandName()).get());
+
+    if (!name.IsEmpty() && !appName.IsEmpty() && name.Equals(appName)) {
+        nsCAutoString keyName("HKEY_LOCAL_MACHINE\\Software\\Clients\\Mail\\");
+        keyName.Append(appName.get());
+        keyName.Append("\\protocols\\mailto\\shell\\open\\command");
+        nsCAutoString appPath ;
+        GetRegistryKey(HKEY_LOCAL_MACHINE, "Software\\Mozilla\\Desktop", 
+                        keyName.get(), appPath);
+        if (!appPath.IsEmpty()) {
+            keyName.Assign("Software\\Clients\\Mail\\");
+            keyName.Append(appName.get());
+            keyName.Append("\\protocols\\mailto\\shell\\open\\command");
+            result = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                       keyName.get(), 
+                       "", (char *)appPath.get());
+            if (NS_SUCCEEDED(result)) {
+                PRInt32 index = appPath.RFind("\\");
+                if (index != kNotFound)
+                    appPath.Truncate(index + 1);
+                appPath += "mozMapi32.dll";
+                keyName.Assign("Software\\Clients\\Mail\\");
+                keyName.Append(appName.get());
+                result = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                                        keyName.get(), 
+                                        "DLLPath", (char *) appPath.get());
+            }
+        }
+    }
+    if (!name.IsEmpty()) {
+        if (NS_SUCCEEDED(result)) {
+            mailKeySet = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                                "Software\\Clients\\Mail", 
+                                "", (char *)name.get());
+        }
+    }
+    else
+        mailKeySet = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                                "Software\\Clients\\Mail", 
+                                "", "");
+
+    if (NS_SUCCEEDED(mailKeySet)) {
+        nsCAutoString userAppName ;
+        GetRegistryKey(HKEY_LOCAL_MACHINE, 
+                                  "Software\\Mozilla\\Desktop", 
+                                  "HKEY_CURRENT_USER\\Software\\Clients\\Mail", userAppName);
+        nsresult desktopKeySet = NS_OK;
+        if (!userAppName.IsEmpty()) {
+            desktopKeySet = SetRegistryKey(HKEY_CURRENT_USER, 
+                                           "Software\\Clients\\Mail", 
+                                           "", (char *)userAppName.get());
+        }
+        else {
+            DeleteRegistryValue(HKEY_CURRENT_USER, "Software\\Clients\\Mail", "");
+        }
+        if (NS_SUCCEEDED(desktopKeySet)) {
+            desktopKeySet = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                                           "Software\\Mozilla\\Desktop", 
+                                           "defaultMailHasBeenSet", "0");
+        }
+        ::SendMessage(HWND_BROADCAST, WM_SETTINGCHANGE, 0, 
+                     (LPARAM)"Software\\Clients\\Mail");
+        UnregisterServer(CLSID_CMapiImp, "mozMapi", "mozMapi.1");
+        return desktopKeySet;
+    }
+    return mailKeySet;
+}
+
+/** Returns FALSE if showMapiDialog is set to 0.
+ *  Returns TRUE otherwise
+ *  Also returns TRUE if the Mozilla has been set as the default mail client
+ *  and some other application has changed that setting.
+ *  This function gets called only if the current app is not the default mail
+ *  client
+ */
+PRBool nsMapiRegistryUtils::getShowDialog() {
+    PRBool rv = PR_FALSE;
+    nsCAutoString showDialog ;
+    GetRegistryKey(HKEY_LOCAL_MACHINE, "Software\\Mozilla\\Desktop", 
+                                        "showMapiDialog", showDialog);
+    // if the user has not selected the checkbox, show dialog 
+    if (showDialog.IsEmpty() || showDialog.Equals("1"))
+            rv = PR_TRUE;
+
+    if (!rv) {
+        // even if the user has selected the checkbox
+        // show it if some other application has changed the 
+        // default setting.
+        nsCAutoString setMailDefault ;
+        GetRegistryKey(HKEY_LOCAL_MACHINE,"Software\\Mozilla\\Desktop", 
+                                       "defaultMailHasBeenSet", setMailDefault);
+        if (setMailDefault.Equals("1")) {
+            // need to reset the defaultMailHasBeenSet to "0"
+            // so that after the dialog is displayed once,
+            // we do not keep displaying this dialog after the user has
+            // selected the checkbox
+            rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                                "Software\\Mozilla\\Desktop", 
+                                "defaultMailHasBeenSet", "0");
+            rv = PR_TRUE;
+        }
+    }
+    return rv;
+}
+
+nsresult nsMapiRegistryUtils::MakeMapiStringBundle(nsIStringBundle ** aMapiStringBundle)
+{
+    nsresult rv = NS_OK ;
+
+    if (m_mapiStringBundle)
+    {
+        *aMapiStringBundle = m_mapiStringBundle ;
+        NS_ADDREF(*aMapiStringBundle);
+        return rv ;
+    }
+
+    nsCOMPtr<nsIStringBundleService> bundleService(do_GetService(
+                                     kStringBundleServiceCID, &rv));
+    if (NS_FAILED(rv) || !bundleService) return NS_ERROR_FAILURE;
+
+    rv = bundleService->CreateBundle(
+ MAPI_PROPERTIES_CHROME,
+                    getter_AddRefs(m_mapiStringBundle));
+    if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+
+ NS_ADDREF(*aMapiStringBundle = m_mapiStringBundle) ;
+
+    return rv ;
+}
+
+nsresult nsMapiRegistryUtils::ShowMapiErrorDialog() 
+{
+    nsresult rv;
+    nsCOMPtr<nsIPromptService> promptService(do_GetService(
+                  "@mozilla.org/embedcomp/prompt-service;1", &rv));
+    if (NS_SUCCEEDED(rv) && promptService)
+    {
+        nsCOMPtr<nsIStringBundle> bundle;
+        rv = MakeMapiStringBundle (getter_AddRefs (bundle)) ;
+        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+
+        nsXPIDLString dialogTitle;
+        const PRUnichar *brandStrings[] = { brandName() };
+        NS_NAMED_LITERAL_STRING(dialogTitlePropertyTag, "errorMessageTitle");
+        rv = bundle->FormatStringFromName(dialogTitlePropertyTag.get(),
+                                          brandStrings, 1,
+                                          getter_Copies(dialogTitle));
+        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+
+        nsXPIDLString dialogText;
+        NS_NAMED_LITERAL_STRING(dialogTextPropertyTag, "errorMessage");
+        rv = bundle->FormatStringFromName(dialogTextPropertyTag.get(),
+                                          brandStrings, 1,
+                                          getter_Copies(dialogText));
+        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+
+        rv = promptService->Alert(nsnull, dialogTitle,
+                                  dialogText);
+    }
+    return rv;
+}
+

mozilla/mailnews/mapi/mapihook/src/nsMapiRegistryUtils.h

@@ -0,0 +1,112 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla 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/MPL/
+ *
+ * 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 the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Srilatha Moturi <srilatha@netscape.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef nsmapiregistryutils_h____
+#define nsmapiregistryutils_h____
+
+#include <windows.h>
+#include <string.h>
+#include <winreg.h>
+
+#include "Registry.h"
+#include "nsString.h"
+#include "nsIStringBundle.h"
+
+class nsMapiRegistryUtils
+{
+private :
+    nsCAutoString m_thisApp ;
+    nsAutoString m_brand ;
+ nsAutoString m_versionNo ;
+
+    nsCOMPtr<nsIStringBundle> m_mapiStringBundle ;
+public :
+    nsMapiRegistryUtils() ;
+
+    // returns TRUE if the Mapi32.dll is smart dll.
+    PRBool isSmartDll();
+    // returns TRUE if the Mapi32.dll is a Mozilla dll.
+    PRBool isMozDll();
+
+    // Returns the (fully-qualified) name of this executable.
+    const char * thisApplication() ; 
+    // This returns the brand name for this application
+    const PRUnichar * brandName() ;
+ // This returns the version no for this application
+ const PRUnichar * versionNo() ;
+    // verifyRestrictedAccess - Returns PR_TRUE if this user only has restricted access
+    // to the registry keys we need to modify.
+    PRBool verifyRestrictedAccess() ;
+
+    // set the Windows registry key
+nsresult SetRegistryKey(HKEY baseKey, const char * keyName, 
+                        const char * valueName, char * value);
+    // delete a registry key
+nsresult DeleteRegistryValue(HKEY baseKey, const char * keyName, 
+                        const char * valueName);
+    // get a Windows registry key
+    void GetRegistryKey(HKEY baseKey, const char * keyName, 
+                         const char * valueName, nsCAutoString & value) ;
+
+    // Returns TRUE if the current application is default mail client.
+PRBool IsDefaultMailClient();
+    // Sets Mozilla as default Mail Client
+    nsresult setDefaultMailClient() ;
+    // Removes Mozilla as the default Mail client and restores the previous setting
+    nsresult unsetDefaultMailClient() ;
+
+    // Saves the current setting of the default Mail Client in 
+    // HKEY_LOCAL_MACHINE\\Software\\Mozilla\\Desktop
+nsresult saveDefaultMailClient();
+    // Saves the current user setting of the default Mail Client in 
+    // HKEY_LOCAL_MACHINE\\Software\\Mozilla\\Desktop
+nsresult saveUserDefaultMailClient();
+
+nsresult CopyMozMapiToWinSysDir();
+nsresult RestoreBackedUpMapiDll();
+
+    // Returns FALSE if showMapiDialog is set to 0.
+    PRBool getShowDialog() ;
+
+    // create a string bundle for MAPI messages
+    nsresult MakeMapiStringBundle(nsIStringBundle ** aMapiStringBundle) ;
+    // display an error dialog for MAPI messages
+    nsresult ShowMapiErrorDialog() ;
+
+} ;
+
+#endif

mozilla/mailnews/mapi/resources/content/contents.rdf

@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+
+<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
+
+  <!-- list all the packages being supplied by this jar -->
+  <RDF:Seq about="urn:mozilla:package:root">
+    <RDF:li resource="urn:mozilla:package:messenger-mapi"/>
+  </RDF:Seq>
+
+  <!-- package information -->
+  <RDF:Description about="urn:mozilla:package:messenger-mapi"
+        chrome:displayName="Messenger"
+        chrome:author="mozilla.org"
+        chrome:name="messenger-mapi"
+        chrome:localeVersion="0.9.7"
+		chrome:skinVersion="0.9.4">
+  </RDF:Description>
+
+  <!-- overlay information -->
+  <RDF:Seq about="urn:mozilla:overlays">
+    <RDF:li resource="chrome://messenger/content/pref-mailnews.xul"/>
+  </RDF:Seq>
+
+  <!-- mapi items for Mail And Newsgroups preferences pane -->
+  <RDF:Seq about="chrome://messenger/content/pref-mailnews.xul">
+    <RDF:li>chrome://messenger-mapi/content/pref-mailnewsOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+</RDF:RDF>

mozilla/mailnews/mapi/resources/content/jar.mn

@@ -0,0 +1,3 @@
+messenger.jar:
+     content/messenger-mapi/pref-mailnewsOverlay.xul
+     content/messenger-mapi/contents.rdf                                

mozilla/mailnews/mapi/resources/content/makefile.win

@@ -0,0 +1,29 @@
+#!nmake
+# 
+# The contents of this file are subject to the Mozilla 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/MPL/
+# 
+# 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) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s): 
+# Srilatha Moturi <srilatha@netscape.com>
+#
+
+DEPTH=..\..\..\..
+
+include <$(DEPTH)\config\rules.mak>
+
+chrome::
+    $(REGCHROME) content messenger-mapi messenger.jar

mozilla/mailnews/mapi/resources/content/overlays.rdf

@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<RDF:RDF xmlns:chrome="http://www.mozilla.org/rdf/chrome#"
+         xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+
+   <!-- mapi items for mailnews preferences -->
+   <RDF:Seq about="urn:mozilla:overlays">
+     <RDF:li resource="chrome://messenger/content/pref-mailnews.xul"/>
+   </RDF:Seq>
+
+   <RDF:Seq about="chrome://messenger/content/pref-mailnews.xul">
+     <RDF:li>chrome://messenger/content/pref-mailnewsOverlay.xul</RDF:li>
+   </RDF:Seq>
+
+</RDF:RDF>

mozilla/mailnews/mapi/resources/content/pref-mailnewsOverlay.js

@@ -0,0 +1,104 @@
+/* 
+ * The contents of this file are subject to the Mozilla 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/MPL/
+ * 
+ * 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) 2001 Netscape Communications Corporation.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s): 
+ * Srilatha Moturi <srilatha@netscape.com>
+ */
+
+function mailnewsOverlayStartup() {
+    mailnewsOverlayInit();
+    parent.hPrefWindow.registerOKCallbackFunc(onOK);
+    if (!("mapiPref" in parent)) {
+        parent.mapiPref = new Object;
+        parent.mapiPref.isDefaultMailClient = 
+               document.getElementById("mailnewsEnableMapi").checked;
+    }
+    else { 
+        // when we switch between different panes
+        // set the checkbox based on the saved state
+        var mailnewsEnableMapi = document.getElementById("mailnewsEnableMapi");
+        if (parent.mapiPref.isDefaultMailClient)
+            mailnewsEnableMapi.setAttribute("checked", "true");
+        else
+            mailnewsEnableMapi.setAttribute("checked", "false");
+    }
+}
+
+function mailnewsOverlayInit() {
+    try {
+        var mapiRegistry = Components.classes[ "@mozilla.org/mapiregistry;1" ].
+                   getService( Components.interfaces.nsIMapiRegistry );
+    }
+    catch(ex){
+        mapiRegistry = null;
+    }
+
+    const prefbase = "system.windows.lock_ui.";
+    var mailnewsEnableMapi = document.getElementById("mailnewsEnableMapi");
+    if (mapiRegistry) {
+    // initialise preference component.
+    // While the data is coming from the system registry, we use a set
+    // of parallel preferences to indicate if the ui should be locked.
+        try { 
+            var prefService = Components.classes["@mozilla.org/preferences-service;1"]
+                          .getService()
+                          .QueryInterface(Components.interfaces.nsIPrefService);
+            var prefBranch = prefService.getBranch(prefbase);
+            if (prefBranch && prefBranch.prefIsLocked("default_mail_client")) {
+                if (prefBranch.getBoolPref("default_mail_client"))
+                    mapiRegistry.setDefaultMailClient();
+                else
+                    mapiRegistry.unsetDefaultMailClient();
+                mailnewsEnableMapi.setAttribute("disabled", "true");
+           }
+        }
+        catch(ex) {}
+        if (mapiRegistry.isDefaultMailClient)
+            mailnewsEnableMapi.setAttribute("checked", "true");
+        else
+            mailnewsEnableMapi.setAttribute("checked", "false");
+    }
+    else
+        mailnewsEnableMapi.setAttribute("disabled", "true");
+}
+
+function onEnableMapi() {
+    // save the state of the checkbox
+    if ("mapiPref" in parent)
+        parent.mapiPref.isDefaultMailClient = 
+               document.getElementById("mailnewsEnableMapi").checked;
+}
+
+function onOK()
+{
+    try {
+        var mapiRegistry = Components.classes[ "@mozilla.org/mapiregistry;1" ].
+                   getService( Components.interfaces.nsIMapiRegistry );
+    }
+    catch(ex){
+        mapiRegistry = null;
+    }
+    if (mapiRegistry &&
+        ("mapiPref" in parent) && 
+        (mapiRegistry.isDefaultMailClient != parent.mapiPref.isDefaultMailClient)) { 
+        if (parent.mapiPref.isDefaultMailClient)
+            mapiRegistry.setDefaultMailClient();
+        else
+            mapiRegistry.unsetDefaultMailClient();
+    }  
+}

mozilla/mailnews/mapi/resources/content/pref-mailnewsOverlay.xul

@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<!-- 
+The contents of this file are subject to the Mozilla 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/MPL/
+
+oftware 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) 2001 Netscape Communications Corporation.  All
+Rights Reserved.
+ 
+Contributor(s): 
+  Srilatha Moturi <srilatha@netscape.com>
+-->
+
+<!DOCTYPE window [
+<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
+%brandDTD;
+<!ENTITY % prefMailnewsOverlayDTD SYSTEM "chrome://messenger-mapi/locale/pref-mailnewsOverlay.dtd" >
+%prefMailnewsOverlayDTD;
+]>
+<overlay id="prefMailnewsOverlay"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+<script type="application/x-javascript">
+  <![CDATA[
+      _elementIDs.push("mailnewsEnableMapi");
+  ]]>
+</script>         
+<script type="application/x-javascript" src="chrome://messenger-mapi/content/pref-mailnewsOverlay.js"/>
+<hbox autostretch="never" id="mapi">
+  <checkbox id="mailnewsEnableMapi" label="&enableMapi.label;"
+            accesskey="&enableMapi.accesskey;"
+	        preftype="bool" prefstring="mailnews.default_mail_client" prefattribute="checked"/>
+
+</hbox>
+</overlay> 

mozilla/mailnews/mapi/resources/locale/en-US/contents.rdf

@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
+
+  <!-- list all the skins being supplied by this package -->
+  <RDF:Seq about="urn:mozilla:locale:root">
+    <RDF:li resource="urn:mozilla:locale:en-US"/>
+  </RDF:Seq>
+
+  <!-- locale information -->
+  <RDF:Description about="urn:mozilla:locale:en-US">
+    <chrome:packages>
+      <RDF:Seq about="urn:mozilla:locale:en-US:packages">
+        <RDF:li resource="urn:mozilla:locale:en-US:messenger-mapi"/>
+      </RDF:Seq>
+    </chrome:packages>
+  </RDF:Description>
+
+  <!-- Version Information.  State that we work only with major version of this
+       package. -->
+  <RDF:Description about="urn:mozilla:locale:en-US:messenger-mapi"
+	chrome:localeVersion="0.9.7"/>
+</RDF:RDF>

mozilla/mailnews/mapi/resources/locale/en-US/jar.mn

@@ -0,0 +1,4 @@
+en-US.jar:
+     locale/en-US/messenger-mapi/pref-mailnewsOverlay.dtd
+     locale/en-US/messenger-mapi/mapi.properties
+     locale/en-US/messenger-mapi/contents.rdf

mozilla/mailnews/mapi/resources/locale/en-US/makefile.win

@@ -0,0 +1,40 @@
+#!nmake
+# 
+# The contents of this file are subject to the Mozilla 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/MPL/
+# 
+# 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) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s): 
+# Srilatha Moturi <srilatha@netscape.com>
+# 
+
+DEPTH=..\..\..\..\..
+
+
+CHROME_DIR=locales\en-US
+CHROME_L10N_DIR=messenger\locale
+
+CHROME_L10N = \
+    .\pref-mailnewsOverlay.dtd \
+    .\mapi.properties \
+    .\contents.rdf  \
+    $(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+chrome::
+   $(REGCHROME) locale en-US/messenger-mapi en-US.jar
+

mozilla/mailnews/mapi/resources/locale/en-US/mapi.properties

@@ -0,0 +1,23 @@
+# Mail Integration Dialog
+dialogTitle=%S Mail
+dialogText=Do you want to use %S as the default mail application? 
+checkboxText=Do not display this dialog again
+
+# MAPI Messages
+loginText=Please enter your password for %S:
+loginTextwithName=Please enter your username and password 
+loginTitle=%S Mail
+PasswordTitle=%S Mail
+
+# MAPI Error Messages
+errorMessage=%S Mail could not be set as the default mail application because a registry key could not be updated. Verify with your system administrator that you have write access to your system registry, and then try again.
+errorMessageTitle=%S Mail
+
+# MAPI Security Messages
+mapiBlindSendWarning=Another application is attempting to send mail using your user profile. Are you sure you want to send mail?
+mapiBlindSendDontShowAgain=Warn me whenever other applications try to send mail from me
+
+#Default Mail Display String
+# localization note, $1%S is the app name, $2%S is the version 
+defaultMailDisplayTitle=%S %S Mail
+

mozilla/mailnews/mapi/resources/locale/en-US/pref-mailnewsOverlay.dtd

@@ -0,0 +1,3 @@
+<!ENTITY enableMapiTitle.label        "When sending mail from other applications">
+<!ENTITY enableMapi.label             "Use &vendorShortName; Mail as the default mail application.">
+<!ENTITY enableMapi.accesskey         "u">

mozilla/mailnews/mapi/resources/locale/makefile.win

@@ -0,0 +1,28 @@
+#!nmake
+# 
+# The contents of this file are subject to the Mozilla 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/MPL/
+# 
+# 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) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s): 
+# Srilatha Moturi <srilatha@netscape.com>
+#
+
+DEPTH=..\..\..\..
+
+DIRS=en-US
+
+include <$(DEPTH)\config\rules.mak>

mozilla/mailnews/mapi/resources/makefile.win

@@ -0,0 +1,27 @@
+# 
+# The contents of this file are subject to the Mozilla 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/MPL/
+# 
+# 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) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s): 
+# Srilatha Moturi <srilatha@netscape.com>
+#
+
+DEPTH=..\..\..
+
+DIRS=content locale
+
+include <$(DEPTH)\config\rules.mak>

mozilla/tools/tinderbox/INSTALL

@@ -1,26 +0,0 @@
-
-To install a fresh tinderbox:
-
-1) Checkout the latest copy of the tinderbox scripts
-	cd /builds/cvs; cvs -z3 co mozilla/tools/tinderbox
-
-2) Change to the location that you wish to run the tinderbox from.
-	cd /builds/tinderbox
-
-3) Create links from the cvs directory to your build directory
-	ln -s /builds/cvs/mozilla/tools/tinderbox/*.pl .
-	
-4) Create your tinderbox config file
-	perl ./build-seamonkey.pl --example-config > tinder-config.pl
-
-5) Create your mozconfig build file in the current dir
-	mozilla -remote http://webtools.mozilla.org/build/config.cgi
-
-6) Customize your tinderbox configuration
-	vi tinder-config.pl
-
-7) Test your tinderbox configuration on the test tree
-	perl ./build-seamonkey.pl --depend -t MozillaTest
-
-8) Once you are satisfied with the results run your tinderbox
-	perl ./build-seamonkey.pl --depend

mozilla/tools/tinderbox/README

@@ -1,74 +0,0 @@
-mozilla/tools/tinderbox
-===================
-
-This directory is for the scripts associated with the client-side of
-tinderbox (scripts to checkout, build, and report the status of the tree
-to a tinderbox server).
-
-
-Table of Contents
-=================
-
-* README 
-   This file.
-
-* build-seamonkey.pl
-   A perl script to drive the client side of tinderbox (unix variants).
-   usage:
-      build-seamonkey.pl [--clobber | --depend] [-t TreeName] [--testonly] [--once]
-
-* bloatdiff.pl
-    Script used to process leak data in the logs.
-
-* build-seamonkey-util.pl
-    Core unix tinderbox stuff.
-
-* post-mozilla-sample.pl
-    Example of post-build test script
-
-* tinder-defaults.pl
-    Default script variables.
-
-* gettime.pl
-    Wrapper to get hires time, if available.
-
-* tinderbox
-    Wrapper script to start unix builds.
-
-* install-links
-    Create links to a tinderbox install directory.
-
-
-Tinderbox example for SeaMonkey build
-=====================================
-
-Here is an example of how to set up a "SeaMonkey" tinderbox
-build of mozilla.
-
-  # Create tinderbox source files in mozilla,
-  # then SeaMonkey directory where mozilla tree will live.
-  cvs co mozilla/tools/tinderbox
-  mkdir SeaMonkey
-  cd SeaMonkey; ../mozilla/tools/tinderbox/install-links
-
-  #
-  # Create tinder-config.pl file in SeaMonkey directory.  
-  # Copy one from an existing build, or create a sample one and edit it:
-  #
-  ./build-seamonkey.pl --example-config > tinder-config.pl
-
-  #
-  # mozconfig.  If you have configure options, add them to a
-  # file named "mozconfig" in the SeaMonkey directory.
-  # Again, you can copy one from a build, or create one.
-  # For a default stock build, this file is not needed or
-  # can be blank.
-  #
-
-  # Start the tinderbox!  From the SeaMonkey directory:
-  ./tinderbox depend start
-
-  # You can watch the build run the first time with:
-  tail -f <objdir>/<logname>
-
-

mozilla/tools/tinderbox/bloatdiff.pl

@@ -1,332 +0,0 @@
-#!/usr/bin/perl -w
-
-#
-# Munges the output from 
-#   XPCOM_MEM_BLOAT_LOG=1; mozilla-bin -f bloaturls.txt
-# so that it does some summary and stats stuff.
-#
-# To show leak test results for a set of changes, do something like this:
-#
-#   XPCOM_MEM_BLOAT_LOG=1
-#   mozilla -f bloaturls.txt > a.out
-#     **make change**
-#   mozilla -f bloaturls.txt > b.out
-#   bloatdiff.pl a.out b.out
-#
-
-$OLDFILE = $ARGV[0];
-$NEWFILE = $ARGV[1];
-$LABEL   = $ARGV[2];
-
-sub processFile {
-    my ($filename, $map, $prevMap) = @_;
-    open(FH, $filename);
-    while (<FH>) {
-        if (m{
-              ^\s*(\d+)\s          # Line number
-              ([\w:]+)\s+          # Name
-              (-?\d+)\s+           # Size
-              (-?\d+)\s+           # Leaked
-              (-?\d+)\s+           # Objects Total
-              (-?\d+)\s+           # Objects Rem
-              \(\s*(-?[\d.]+)\s+   # Objects Mean
-                 \+/-\s+
-              ([\w.]+)\)\s+        # Objects StdDev
-              (-?\d+)\s+           # Reference Total
-              (-?\d+)\s+           # Reference Rem
-              \(\s*(-?[\d.]+)\s+   # Reference Mean
-                 \+/-\s+
-              ([\w\.]+)\)          # Reference StdDev
-             }x) {
-          $$map{$2} = { name => $2,
-                        size => $3,
-                        leaked => $4,
-                        objTotal => $5,
-                        objRem => $6,
-                        objMean => $7,
-                        objStdDev => $8,
-                        refTotal => $9,
-                        refRem => $10,
-                        refMean => $11,
-                        refStdDev => $12,
-                        bloat => $3 * $5 # size * objTotal
-                      };
-        } else {
-#            print "failed to parse: $_\n";
-        }
-    }
-    close(FH);
-}
-
-%oldMap = ();
-processFile($OLDFILE, \%oldMap);
-
-%newMap = ();
-processFile($NEWFILE, \%newMap);
-
-################################################################################
-
-$inf = 9999999.99;
-
-sub getLeaksDelta {
-    my ($key) = @_;
-    my $oldLeaks = $oldMap{$key}{leaked} || 0;
-    my $newLeaks = $newMap{$key}{leaked};
-    my $percentLeaks = 0;
-    if ($oldLeaks == 0) {
-        if ($newLeaks != 0) {
-            # there weren't any leaks before, but now there are!
-            $percentLeaks = $inf;
-        }
-    }
-    else {
-        $percentLeaks = ($newLeaks - $oldLeaks) / $oldLeaks * 100;
-    }
-    # else we had no record of this class before
-    return ($newLeaks - $oldLeaks, $percentLeaks);
-}
-    
-################################################################################
-
-sub getBloatDelta {
-    my ($key) = @_;
-    my $newBloat = $newMap{$key}{bloat};
-    my $percentBloat = 0;
-    my $oldSize = $oldMap{$key}{size} || 0;
-    my $oldTotal = $oldMap{$key}{objTotal} || 0;
-    my $oldBloat = $oldTotal * $oldSize;
-    if ($oldBloat == 0) {
-        if ($newBloat != 0) {
-            # this class wasn't used before, but now it is
-            $percentBloat = $inf;
-        }
-    }
-    else {
-        $percentBloat = ($newBloat - $oldBloat) / $oldBloat * 100;
-    }
-    # else we had no record of this class before
-    return ($newBloat - $oldBloat, $percentBloat);
-}
-
-################################################################################
-
-foreach $key (keys %newMap) {
-    my ($newLeaks, $percentLeaks) = getLeaksDelta($key);
-    my ($newBloat, $percentBloat) = getBloatDelta($key);
-    $newMap{$key}{leakDelta} = $newLeaks;
-    $newMap{$key}{leakPercent} = $percentLeaks;
-    $newMap{$key}{bloatDelta} = $newBloat;
-    $newMap{$key}{bloatPercent} = $percentBloat;
-}
-
-################################################################################
-
-# Print a value of bytes out in a reasonable
-# KB, MB, or GB form.  Copied from build-seamonkey-util.pl, sorry.  -mcafee
-sub PrintSize($) {
-
-    # print a number with 3 significant figures
-    sub PrintNum($) {
-        my ($num) = @_;
-        my $rv;
-        if ($num < 1) {
-            $rv = sprintf "%.3f", ($num);
-        } elsif ($num < 10) {
-            $rv = sprintf "%.2f", ($num);
-        } elsif ($num < 100) {
-            $rv = sprintf "%.1f", ($num);
-        } else {
-            $rv = sprintf "%d", ($num);
-        }
-    }
-
-    my ($size) = @_;
-    my $rv;
-    if ($size > 1000000000) {
-        $rv = PrintNum($size / 1000000000.0) . "G";
-    } elsif ($size > 1000000) {
-        $rv = PrintNum($size / 1000000.0) . "M";
-    } elsif ($size > 1000) {
-        $rv = PrintNum($size / 1000.0) . "K";
-    } else {
-        $rv = PrintNum($size);
-    }
-}
-
-
-print "Bloat/Leak Delta Report\n";
-print "--------------------------------------------------------------------------------------\n";
-print "Current file:  $NEWFILE\n";
-print "Previous file: $OLDFILE\n";
-print "----------------------------------------------leaks------leaks%------bloat------bloat%\n";
-printf "%-40s %10s %10.2f%% %10s %10.2f%%\n",
-       ("TOTAL",
-        $newMap{"TOTAL"}{leaked}, $newMap{"TOTAL"}{leakPercent},
-        $newMap{"TOTAL"}{bloat}, $newMap{"TOTAL"}{bloatPercent});
-
-################################################################################
-
-sub percentStr {
-    my ($p) = @_;
-    if ($p == $inf) {
-        return "-";
-    }
-    else {
-        return sprintf "%10.2f%%", $p;
-    }
-}
-
-# NEW LEAKS
-@keys = sort { $newMap{$b}{leakPercent} <=> $newMap{$a}{leakPercent} } keys %newMap;
-my $needsHeading = 1;
-my $total = 0;
-foreach $key (@keys) {
-    my $percentLeaks = $newMap{$key}{leakPercent};
-    my $leaks = $newMap{$key}{leaked};
-    if ($percentLeaks > 0 && $key !~ /TOTAL/) {
-        if ($needsHeading) {
-            printf "--NEW-LEAKS-----------------------------------leaks------leaks%%-----------------------\n";
-            $needsHeading = 0;
-        }
-        printf "%-40s %10s %10s\n", ($key, $leaks, percentStr($percentLeaks));
-        $total += $leaks;
-    }
-}
-if (!$needsHeading) {
-    printf "%-40s %10s\n", ("TOTAL", $total);
-}
-
-# FIXED LEAKS
-@keys = sort { $newMap{$b}{leakPercent} <=> $newMap{$a}{leakPercent} } keys %newMap;
-$needsHeading = 1;
-$total = 0;
-foreach $key (@keys) {
-    my $percentLeaks = $newMap{$key}{leakPercent};
-    my $leaks = $newMap{$key}{leaked};
-    if ($percentLeaks < 0 && $key !~ /TOTAL/) {
-        if ($needsHeading) {
-            printf "--FIXED-LEAKS---------------------------------leaks------leaks%%-----------------------\n";
-            $needsHeading = 0;
-        }
-        printf "%-40s %10s %10s\n", ($key, $leaks, percentStr($percentLeaks));
-        $total += $leaks;
-    }
-}
-if (!$needsHeading) {
-    printf "%-40s %10s\n", ("TOTAL", $total);
-}
-
-# NEW BLOAT
-@keys = sort { $newMap{$b}{bloatPercent} <=> $newMap{$a}{bloatPercent} } keys %newMap;
-$needsHeading = 1;
-$total = 0;
-foreach $key (@keys) {
-    my $percentBloat = $newMap{$key}{bloatPercent};
-    my $bloat = $newMap{$key}{bloat};
-    if ($percentBloat > 0  && $key !~ /TOTAL/) {
-        if ($needsHeading) {
-            printf "--NEW-BLOAT-----------------------------------bloat------bloat%%-----------------------\n";
-            $needsHeading = 0;
-        }
-        printf "%-40s %10s %10s\n", ($key, $bloat, percentStr($percentBloat));
-        $total += $bloat;
-    }
-}
-if (!$needsHeading) {
-    printf "%-40s %10s\n", ("TOTAL", $total);
-}
-
-# ALL LEAKS
-@keys = sort { $newMap{$b}{leaked} <=> $newMap{$a}{leaked} } keys %newMap;
-$needsHeading = 1;
-$total = 0;
-foreach $key (@keys) {
-    my $leaks = $newMap{$key}{leaked};
-    my $percentLeaks = $newMap{$key}{leakPercent};
-    if ($leaks > 0) {
-        if ($needsHeading) {
-            printf "--ALL-LEAKS-----------------------------------leaks------leaks%%-----------------------\n";
-            $needsHeading = 0;
-        }
-        printf "%-40s %10s %10s\n", ($key, $leaks, percentStr($percentLeaks));
-        if ($key !~ /TOTAL/) {
-            $total += $leaks;
-        }
-    }
-}
-if (!$needsHeading) {
-#    printf "%-40s %10s\n", ("TOTAL", $total);
-}
-
-# ALL BLOAT
-@keys = sort { $newMap{$b}{bloat} <=> $newMap{$a}{bloat} } keys %newMap;
-$needsHeading = 1;
-$total = 0;
-foreach $key (@keys) {
-    my $bloat = $newMap{$key}{bloat};
-    my $percentBloat = $newMap{$key}{bloatPercent};
-    if ($bloat > 0) {
-        if ($needsHeading) {
-            printf "--ALL-BLOAT-----------------------------------bloat------bloat%%-----------------------\n";
-            $needsHeading = 0;
-        }
-        printf "%-40s %10s %10s\n", ($key, $bloat, percentStr($percentBloat));
-        if ($key !~ /TOTAL/) {
-            $total += $bloat;
-        }
-    }
-}
-if (!$needsHeading) {
-#    printf "%-40s %10s\n", ("TOTAL", $total);
-}
-
-# NEW CLASSES
-@keys = sort { $newMap{$b}{bloatDelta} <=> $newMap{$a}{bloatDelta} } keys %newMap;
-$needsHeading = 1;
-my $ltotal = 0;
-my $btotal = 0;
-foreach $key (@keys) {
-    my $leaks = $newMap{$key}{leaked};
-    my $bloat = $newMap{$key}{bloat};
-    my $percentBloat = $newMap{$key}{bloatPercent};
-    if ($percentBloat == $inf && $key !~ /TOTAL/) {
-        if ($needsHeading) {
-            printf "--CLASSES-NOT-REPORTED-LAST-TIME--------------leaks------bloat------------------------\n";
-            $needsHeading = 0;
-        }
-        printf "%-40s %10s %10s\n", ($key, $leaks, $bloat);
-        if ($key !~ /TOTAL/) {
-            $ltotal += $leaks;
-            $btotal += $bloat;
-        }
-    }
-}
-if (!$needsHeading) {
-    printf "%-40s %10s %10s\n", ("TOTAL", $ltotal, $btotal);
-}
-
-# OLD CLASSES
-@keys = sort { ($oldMap{$b}{bloat} || 0) <=> ($oldMap{$a}{bloat} || 0) } keys %oldMap;
-$needsHeading = 1;
-$ltotal = 0;
-$btotal = 0;
-foreach $key (@keys) {
-    if (!defined($newMap{$key})) {
-        my $leaks = $oldMap{$key}{leaked};
-        my $bloat = $oldMap{$key}{bloat};
-        if ($needsHeading) {
-            printf "--CLASSES-THAT-WENT-AWAY----------------------leaks------bloat------------------------\n";
-            $needsHeading = 0;
-        }
-        printf "%-40s %10s %10s\n", ($key, $leaks, $bloat);
-        if ($key !~ /TOTAL/) {
-            $ltotal += $leaks;
-            $btotal += $bloat;
-        }
-    }
-}
-if (!$needsHeading) {
-    printf "%-40s %10s %10s\n", ("TOTAL", $ltotal, $btotal);
-}
-
-print "--------------------------------------------------------------------------------------\n";

mozilla/tools/tinderbox/build-camino.pl

@@ -1,488 +0,0 @@
-#!/usr/bin/perl
-# -*- Mode: perl; indent-tabs-mode: nil -*-
-#
-
-#
-# This script gets called after a full mozilla build & test.
-# Use this to build and test an embedded or commercial branding of Mozilla.
-#
-# ./build-seamonkey-utils.pl will call PostMozilla::main() after
-# a successful build and testing of mozilla.  This package can report
-# status via the $TinderUtils::build_status variable.  Yeah this is a hack,
-# but it works for now.  Feel free to improve this mechanism to properly
-# return values & stuff.  -mcafee
-#
-# Things to do:
-#   * Get pull by branch working
-#
-#
-use strict;
-use File::Path;     # for rmtree();
-
-package PostMozilla;
-
-sub checkout {
-  my ($mozilla_build_dir) = @_;
-
-  # chdir to build directory
-  chdir "$mozilla_build_dir";
-
-  # Next, do the checkout:
-  print "Settings::CVS = $Settings::CVS\n";
-  my $status = TinderUtils::run_shell_command("$Settings::CVS checkout mozilla/camino");
-
-  # hack in the camino prefs, if needed
-
-  return $status;
-}
-
-
-sub ReadHeapDumpToHash($$)
-{
-  my($dumpfile, $hashref) = @_;
-
-  local(*DUMP_FILE);
-  open(DUMP_FILE, "< $dumpfile") || die "Can't open heap output file $dumpfile\n";
-
-  my $section = 0;
-  my $zone = "";
-  my $default_zone_bytes = 0;
-  
-  while (<DUMP_FILE>)
-  {
-    my($line) = $_;
-    chomp($line);
-
-    if ($line =~ /^\#/ || $line =~ /^\s*$/ || $line =~ /------------------------/) {    # ignore comments and empty lines
-      next;
-    }
-    
-    # use the 'All zones' lines as section markers
-    if ($line =~ /^All zones:/) {
-      $section ++; 
-      next;
-    }
-    
-    if ($section == 2) # we're in the detailed section
-    {
-      if ($line =~ /^Zone ([^_]+).+\((\d+).+\)/)
-      {
-        $zone = $1;
-        if ($zone eq "DefaultMallocZone") {
-          $default_zone_bytes = $2;
-        }
-        TinderUtils::print_log("  $line\n");
-        next;
-      }
-      
-      if ($zone eq "DefaultMallocZone")
-      {
-        if ($line =~ /(\w+)\s*=\s*(\d+)\s*\((\d+).+\)/)
-        {
-          my(%entry_hash) = ("count", $2,
-                             "bytes", $3);
-          $hashref->{$1} = \%entry_hash;
-        }
-        elsif ($line =~ /^<not.+>\s*=\s*(\d+)\s*\((\d+).+\)/)
-        {
-          my(%entry_hash) = ("count", $1,
-                             "bytes", $2);
-          $hashref->{"malloc_block"} = \%entry_hash;
-        }
-      }
-    }
-  }
- 
-  close(DUMP_FILE);
-  
-  return $default_zone_bytes;
-}
-
-sub DumpHash($)
-{
-  my($hashref) = @_;
-  
-  print "Dumping values\n";
-  
-  my($key);
-  foreach $key (keys %{$hashref})
-  {
-    my($value) = $hashref->{$key};
-    print "Class $key count $value->{'count'} bytes $value->{'bytes'}\n";
-  }
-}
-
-sub ClassEntriesEqual($$)
-{
-  my($hashone, $hashtwo) = @_;
-  
-  return ($hashone->{"count"} == $hashtwo->{"count"}) and ($hashone->{"bytes"} == $hashtwo->{"bytes"})
-}
-
-
-sub DumpHashDiffs($$)
-{
-  my($beforehash, $afterhash) = @_;
-    
-  my($name_width) = 50;
-  my($print_format) = "%10s %-${name_width}s %8d %8d\n";
-
-  TinderUtils::print_log(sprintf "%10s %-${name_width}s %8s %8s\n", "", "Class", "Count", "Bytes");
-  TinderUtils::print_log("--------------------------------------------------------------------------------\n");
-  
-  my($key);
-  foreach $key (keys %{$beforehash})
-  {
-    my($beforevalue) = $beforehash->{$key};
-
-    if (exists $afterhash->{$key})
-    {
-      my($aftervalue) = $afterhash->{$key};
-      if (!ClassEntriesEqual($beforevalue, $aftervalue))
-      {
-        my($count_change) = $aftervalue->{"count"} - $beforevalue->{"count"};
-        my($bytes_change) = $aftervalue->{"bytes"} - $beforevalue->{"bytes"};
-        
-        if ($bytes_change > 0) {
-          TinderUtils::print_log(sprintf $print_format, "Leaked", $key, $count_change, $bytes_change);
-        } else {
-          TinderUtils::print_log(sprintf $print_format, "Freed", $key, $count_change, $bytes_change);
-        }
-      }
-    }
-    else
-    {
-      #$before_only{$key} = $beforevalue;
-      TinderUtils::print_log(sprintf $print_format, "Freed", $key, $beforevalue->{'count'}, $beforevalue->{'bytes'});
-    }
-  }
-
-  # now look for things only in the after cache
-  foreach $key (keys %{$afterhash})
-  {
-    my($value) = $afterhash->{$key};
-
-    if (!exists $beforehash->{$key})
-    {
-      #$after_only{$key} = $value;
-      TinderUtils::print_log(sprintf $print_format, "Leaked", $key, $value->{'count'}, $value->{'bytes'});
-    }
-  }
- 
-  TinderUtils::print_log("--------------------------------------------------------------------------------\n");
-
-}
-
-
-sub ParseHeapOutput($$)
-{
-  my($beforedump, $afterdump) = @_;
-  
-  TinderUtils::print_log("Before window open:\n");
-  my %before_data;
-  my $before_heap = ReadHeapDumpToHash($beforedump, \%before_data);
-  
-  TinderUtils::print_log("After window open and close:\n");
-  my %after_data;
-  my $after_heap = ReadHeapDumpToHash($afterdump, \%after_data);
-
-#  DumpHash(\%before_data);
-#  DumpHash(\%after_data);
-
-  TinderUtils::print_log("Open/close window leaks:\n");
-  DumpHashDiffs(\%before_data, \%after_data);
-
-  my $heap_diff = $after_heap - $before_heap;
-  TinderUtils::print_log("TinderboxPrint:<acronym title=\"Per-window leaks\">Lw:".TinderUtils::PrintSize($heap_diff, 3)."B</acronym>\n");
-}
-
-
-sub CaminoWindowLeaksTest($$$$$)
-{
-  my ($test_name, $build_dir, $binary, $args, $timeout_secs) = @_;
-
-  my($status) = 'success';
-
-  my $beforefile = "/tmp/nav_before_heap.dat";
-  my $afterfile  = "/tmp/nav_after_heap.dat";
-
-  my $run_test = 1;   # useful for testing parsing code
-  if ($run_test)
-  {
-    my $close_window_script =<<END_SCRIPT;
-tell application "Camino"
-  delay 5
-  close the first window
-end tell
-END_SCRIPT
-    
-    my $new_window_script =<<END_SCRIPT;
-tell application "Camino"
-  Get URL "about:blank"
-  delay 20
-  close the first window
-end tell
-END_SCRIPT
-  
-    TinderUtils::print_log("Window leak test\n");
-  
-    my $binary_basename = File::Basename::basename($binary);
-    my $binary_dir = File::Basename::dirname($binary);
-    my $binary_log = "$build_dir/$test_name.log";
-    my $cmd = $binary_basename;
-      
-    my $pid = TinderUtils::fork_and_log($build_dir, $binary_dir, $cmd, $binary_log);
-  
-    # close the existing window 
-    system("echo '$close_window_script' | osascript");
-    # open and close few window to get to a stable point
-    system("echo '$new_window_script' | osascript");
-  
-    # dump before data
-    system("heap $pid > $beforefile");
-  
-    # run the test
-    system("echo '$new_window_script' | osascript");
-  
-    # dump after data
-    system("heap $pid > $afterfile");
-    
-    my $result = TinderUtils::wait_for_pid($pid, $timeout_secs);
-  }
-  
-  ParseHeapOutput($beforefile, $afterfile);
-
-  return $status;
-}
-
-
-sub main {
-  my ($mozilla_build_dir) = @_;
-
-  TinderUtils::print_log("Starting camino build.\n");
-
-  # Tell camino to unbuffer stdio, otherwise when we kill the child process
-  # stdout & stderr won't get flushed.
-  $ENV{MOZ_UNBUFFERED_STDIO} = 1;
-
-  # Pending a config file, stuff things here.
-  my $post_status = 'success';  # Success until we report a failure.
-  my $status = 0;  # 0 = success
-
-  # Control tests from here, sorry no config file yet.
-  my $camino_alive_test              = 1;
-  my $camino_test8_test              = 1;
-  my $camino_layout_performance_test = 1;
-  my $camino_startup_test            = 1;
-  my $camino_window_leaks_test       = 0;
-
-  my $safari_layout_performance_test  = 0;
-
-  my $camino_clean_profile = 1;
-
-  # Build flags
-  my $camino_build_static = 0;
-  my $camino_build_opt    = 1;
-
-  my $camino_dir = "$mozilla_build_dir/mozilla/camino";
-  my $embedding_dir = "$mozilla_build_dir/mozilla/embedding/config";
-  my $camino_binary = "Camino";
-
-  unless ($Settings::TestOnly) {
-    # Checkout/update the camino code.
-    $status = checkout($mozilla_build_dir);
-    TinderUtils::print_log("Status from checkout: $status\n");
-    if ($status != 0) {
-      $post_status = 'busted';
-    }
-    
-    # Build camino if we passed the checkout command.
-    if ($post_status ne 'busted') {
-
-      #
-      # Build embedding/config.
-      #
-      
-      chdir $embedding_dir;
-      
-      if ($status == 0) {
-        $status = TinderUtils::run_shell_command("make");
-        TinderUtils::print_log("Status from make: $status\n");
-      }
-      
-      #
-      # Build camino.
-      #
-      
-      chdir $camino_dir;
-      
-      if ($status == 0) {
-        TinderUtils::print_log("Deleting binary...\n");
-        TinderUtils::DeleteBinary("$camino_dir/build/Camino.app/Contents/MacOS/$camino_binary");
-          
-        # Always do a clean build; gecko dependencies don't work correctly
-        # for Camino.
-          
-        TinderUtils::print_log("Clobbering camino...\n");
-        TinderUtils::run_shell_command("make clean");
-          
-        $status = TinderUtils::run_shell_command("make");
-        TinderUtils::print_log("Status from pbxbuild: $status\n");
-      }
-
-      TinderUtils::print_log("Testing build status...\n");
-      if ($status != 0) {
-        TinderUtils::print_log("busted, pbxbuild status non-zero\n");
-        $post_status = 'busted';
-      } elsif (not TinderUtils::BinaryExists("$camino_dir/build/Camino.app/Contents/MacOS/$camino_binary")) {
-        TinderUtils::print_log("Error: binary not found: $camino_dir/build/Camino.app/Contents/MacOS/$camino_binary\n");
-        $post_status = 'busted';
-      } else {
-        $post_status = 'success';
-      }
-    }  
-  }
-
-  #
-  # Tests...
-  #
-
-  # Clean profile out, if set.
-  # Assume Camino always uses ~/Library/Application Support/Chimera/Profiles/default for now.
-  if ($camino_clean_profile) {
-    # Warning: workaround camino bug, delete whole Camino dir.
-    my $chim_profile_dir = "$ENV{HOME}/Library/Application Support/Chimera";
-    #my $chim_profile_dir = "$ENV{HOME}/Library/Application Support/Chimera/Profiles/default";
-
-    TinderUtils::print_log("Deleting $chim_profile_dir...\n");
-    print "Deleting $chim_profile_dir...\n";
-    File::Path::rmtree([$chim_profile_dir], 0, 0);
-
-    if (-e "$chim_profile_dir") {
-      TinderUtils::print_log("Error: rmtree('$chim_profile_dir') failed\n");
-    }
-      
-    # Re-create profile.  We have no -CreateProfile, so we instead
-    # run the AliveTest first.
-  }
-
-  # AliveTest for camino, about:blank
-  if ($camino_alive_test and $post_status eq 'success') {
-
-    $post_status = TinderUtils::AliveTest("CaminoAliveTest",
-                                          "$camino_dir/build/Camino.app/Contents/MacOS",
-                                          ["Camino", "-url", "about:blank"],
-                                          45);
-  }
-
-  # Find the prefs file, remember we have the secret/random salt dir,
-  # e.g. /Users/cltbld/Library/Application Support/Chimera/Profiles/default/dyrs1ar8.slt/prefs.js
-  # so File::Path::find will find the prefs.js file.
-  #
-  my $pref_file = "prefs.js";
-  my $start_dir = "/Users/cltbld/Library/Application Support/Chimera/Profiles/default";
-  my $found = undef;
-  my $sub = sub {$pref_file = $File::Find::name, $found++ if $pref_file eq $_};
-
-  File::Find::find($sub, $start_dir);  # Find prefs.js, write this to $pref_file.
-
-  # Set up performance prefs.
-  if ($pref_file and ($camino_layout_performance_test or 1)) {
-
-      # Some tests need browser.dom.window.dump.enabled set to true, so
-      # that JS dump() will work in optimized builds.
-      if (system("\\grep -s browser.dom.window.dump.enabled $pref_file > /dev/null")) {
-	  TinderUtils::print_log("Setting browser.dom.window.dump.enabled\n");
-	  open PREFS, ">>$pref_file" or die "can't open $pref_file ($?)\n";
-	  print PREFS "user_pref(\"browser.dom.window.dump.enabled\", true);\n";
-	  close PREFS;
-        } else {
-            TinderUtils::print_log("Already set browser.dom.window.dump.enabled\n");
-        }
-
-      # Set security prefs to allow us to close our own window,
-      # pageloader test (and possibly other tests) needs this on.
-      if (system("\\grep -s dom.allow_scripts_to_close_windows $pref_file > /dev/null")) {
-          TinderUtils::print_log("Setting dom.allow_scripts_to_close_windows to true.\n");
-          open PREFS, ">>$pref_file" or die "can't open $pref_file ($?)\n";
-          print PREFS "user_pref(\"dom.allow_scripts_to_close_windows\", true);\n";
-          close PREFS;
-      } else {
-          TinderUtils::print_log("Already set dom.allow_scripts_to_close_windows\n");
-      }
-
-
-  }
-
-  # LayoutTest8
-  # resource:///res/samples/test8.html
-  if ($camino_test8_test and $post_status eq 'success') {
-
-      if(0) {
-          open STDOUT, ">/tmp/foo";
-          open STDERR, ">&/tmp/foo";
-          select STDOUT; $| = 1;  # make STDOUT unbuffered
-          select STDERR; $| = 1;  # make STDERR unbuffered
-          print STDERR "hello, world\n";
-          chdir("$camino_dir/build/Camino.app/Contents/MacOS");
-          exec "./Camino -url \"http://lxr.mozilla.org/seamonkey/source/webshell/tests/viewer/samples/test8.html\"";
-          #exec "foo";
-      } else {
-          $post_status = TinderUtils::AliveTest("CaminoLayoutTest8Test",
-                                                "$camino_dir/build/Camino.app/Contents/MacOS",
-                                                ["Camino", "-url", "http://lxr.mozilla.org/seamonkey/source/webshell/tests/viewer/samples/test8.html"],
-                                                20);
-      }
-  }
-  
-  # Pageload test.
-  if ($camino_layout_performance_test and $post_status eq 'success') {
-
-      $post_status = 
-        TinderUtils::LayoutPerformanceTest("CaminoLayoutPerformanceTest",
-                                           "$camino_dir/build/Camino.app/Contents/MacOS",
-                                           ["Camino", "-url"]);
-
-  }
-
-
-  # Pageload test -- Safari.
-  if ($safari_layout_performance_test) {
-      
-      TinderUtils::run_system_cmd("/Applications/Utilities/Safari.app/Contents/MacOS/Safari-wrap.pl http://$Settings::pageload_server/page-loader/loader.pl?delay=1000%26nocache=0%26maxcyc=4%26timeout=$Settings::LayoutPerformanceTestPageTimeout%26auto=1", 30);
-        
-        # This is a hack.
-        TinderUtils::run_system_cmd("sync; sleep 400", 405);
-
-        TinderUtils::run_system_cmd("/Applications/Utilities/Safari.app/Contents/MacOS/Safari-wrap.pl quit", 30);
-      
-        TinderUtils::print_log "TinderboxPrint:" .
-            "<a title=\"Avg of the median per url pageload time\" href=\"http://$Settings::results_server/graph/query.cgi?testname=pageload&tbox=" . ::hostname() . "-aux&autoscale=1&days=7&avg=1\">~Tp" . "</a>\n";
-        
-  }
-
-  # Startup test.
-  if ($camino_startup_test and $post_status eq 'success') {
-      $post_status =
-        TinderUtils::StartupPerformanceTest("CaminoStartupPerformanceTest",
-                                            "Camino",
-                                            "$camino_dir/build/Camino.app/Contents/MacOS",
-                                            ["-url"],
-                                            "file:$camino_dir/../../../startup-test.html");      
-  }
-  
-  if ($camino_window_leaks_test and $post_status eq 'success') {
-        $post_status = CaminoWindowLeaksTest("CaminoWindowLeakTest",
-                                              "$camino_dir/build/Camino.app/Contents/MacOS/",
-                                              "./Camino",
-                                              "-url \"http://www.mozilla.org\"",
-                                              20);
-
-  }
-  
-  # Pass our status back to calling script.
-  return $post_status;
-}
-
-# Need to end with a true value, (since we're using "require").
-1;

mozilla/tools/tinderbox/build-galeon.pl

@@ -1,148 +0,0 @@
-#!/usr/bin/perl
-#
-
-#
-# This script gets called after a full mozilla build & test.
-# Use this to build and test an embedded or commercial branding of Mozilla.
-#
-# ./build-seamonkey-utils.pl will call PostMozilla::main() after
-# a successful build and testing of mozilla.  This package can report
-# status via the $TinderUtils::build_status variable.  Yeah this is a hack,
-# but it works for now.  Feel free to improve this mechanism to properly
-# return values & stuff.  -mcafee
-#
-# Things to do:
-#   * Get pull by branch working
-#
-#
-use strict;
-
-package PostMozilla;
-
-sub checkout {
-  my ($mozilla_build_dir) = @_;
-
-  # chdir to build directory
-  chdir "$mozilla_build_dir";
-
-  # Hack to get around po/ChangeLog cvs conflict bug in gettext lib.
-  my $status = TinderUtils::run_shell_command("\\rm -f galeon/po/ChangeLog");
-
-  # Checkout galeon source.  First set up cvsroot:
-  # Both of these as of 10/2001 are kinda flakey:
-  #   $ENV{CVSROOT} = ":pserver:anonymous\@anoncvs.gnome.org:/cvs/gnome";
-  #   $ENV{CVSROOT} = ":pserver:anonymous@cvs.galeon.sourceforge.net:/cvsroot/galeon";
-  #
-  # Asked for direct cvs access and got it:
-  $ENV{CVSROOT} = ":pserver:mcafee\@cvs.gnome.org:/cvs/gnome";
-
-  # Next, actually do the checkout:
-  my $status = TinderUtils::run_shell_command("$Settings::CVS checkout galeon");
-
-  # hack in the galeon prefs, if needed
-
-  return $status;
-}
-
-
-sub main {
-  my ($mozilla_build_dir) = @_;
-
-  TinderUtils::print_log "Post-Mozilla build goes here.\n";
-
-  # Pending a config file, stuff things here.
-  my $post_status = 'success';  # Success until we report a failure.
-  my $status = 0;  # 0 = success
-  my $galeon_alive_test = 1;
-  my $galeon_test8_test = 1;
-  my $galeon_dir = "$mozilla_build_dir/galeon";
-  my $galeon_binary = "galeon-bin";
-
-  # Checkout/update the galeon code.
-  $status = checkout($mozilla_build_dir);
-  TinderUtils::print_log "Status from checkout: $status\n";
-  if ($status != 0) {
-  	$post_status = 'busted';
-  }
-
-  # Build galeon if we passed the checkout command.
-  if ($post_status ne 'busted') {
-    # Build galeon.
-    
-    chdir $galeon_dir;
-    
-    # Make sure we have a configure
-    unless (-e "configure" and $post_status ne 'busted') {
-      $status = TinderUtils::run_shell_command("./autogen.sh");
-      TinderUtils::print_log "Status from autogen: $status\n";
-    }
-    
-    # Not sure how to only do this when we need to.
-    # Force a configure for now.
-    if ($status == 0) {
-      TinderUtils::print_log "configuring...\n";
-      $status = TinderUtils::run_shell_command("./configure --sysconfdir=/etc --with-mozilla-libs=$mozilla_build_dir/mozilla/dist/bin --with-mozilla-includes=$mozilla_build_dir/mozilla/dist/include --with-nspr-includes=$mozilla_build_dir/mozilla/dist/include/nspr --with-mozilla-home=$mozilla_build_dir/mozilla/dist/bin");
-      TinderUtils::print_log "Status from configure: $status\n";
-    }
-    
-    if ($status == 0) {
-      TinderUtils::print_log "Deleting, gmake...\n";
-      TinderUtils::DeleteBinary("$galeon_dir/src/$galeon_binary");
-      
-      my $foo = Cwd::getcwd();
-      TinderUtils::print_log "cwd = $foo\n";
-      $status = TinderUtils::run_shell_command("gmake");
-      TinderUtils::print_log "Status from gmake: $status\n";
-    }
-    
-    TinderUtils::print_log "Testing build status...\n";
-    if ($status != 0) {
-      TinderUtils::print_log "busted, gmake status non-zero\n";
-      $post_status = 'busted';
-    } elsif (not TinderUtils::BinaryExists("$galeon_dir/src/$galeon_binary")) {
-      TinderUtils::print_log "Error: binary not found: $galeon_dir/src/$galeon_binary\n";
-      $post_status = 'busted';
-    } else {
-      $post_status = 'success';
-    }
-  }
-  
-  #
-  # Need a way to bypass initial setup dialog stuff, or
-  # we'll need to manually run this by hand the first time.
-  #
-  # Also, have to set crash_recovery=0 in ~/.gnome/galeon to avoid
-  # getting the crash dialog after the alive test times out.
-  #
-  
-  # Test galeon, about:blank
-  if ($galeon_alive_test and $post_status eq 'success') {
-    $post_status = TinderUtils::AliveTest("GaleonAliveTest",
-					  "$galeon_dir/src",
-					  ["galeon", "about:blank"],
-					  45);
-  }
-  
-  # Test galeon, test8
-  if ($galeon_test8_test and $post_status eq 'success') {
-    $post_status = TinderUtils::AliveTest("GaleonTest8Test",
-					  "$galeon_dir/src",
-					  ["galeon", "resource:///res/samples/test8.html"],
-					  45);
-  }
-  
-  # Startup test
-  if ($galeon_startup_test and $post_status eq 'success') {
-    TinderUtils::StartupPerformanceTest("GaleonStartupPerformanceTest",
-					"galeon",
-					"$galeon_dir/src",
-					["", "$galeon_dir/src/../../../startup-test.html"]);     
-    
-  }
-
-  # Pass our status back to calling script.
-  return $post_status;
-}
-
-# Need to end with a true value, (since we're using "require").
-1;

mozilla/tools/tinderbox/build-seamonkey-win32.pl

@@ -1,338 +0,0 @@
-
-#!d:/nstools/bin/perl5
-
-use Cwd;
-
-$build_depend=1;      #depend or clobber
-$build_tree = '';
-$build_tag = '';
-$build_name = '';
-$build_continue = 0;
-$build_sleep=10;
-$no32 = 0;
-$original_path = $ENV{'PATH'};
-$early_exit = 1;
-$doawt11 = 0;
-
-$do_clobber = '';
-$client_param = '';
-
-&parse_args;
-
-if( $build_test ){
-    $build_sleep=1;
-}
-
-$dirname = ($build_depend?'dep':'clob');
-
-
-$logfile = "${dirname}.log";
-
-if( $build_depend ){
-    $clobber_str = 'depend';
-}     
-else {
-    $clobber_str = 'clobber_all';
-}
-
-
-mkdir("$dirname", 0777);
-chdir("$dirname") || die "couldn't cd to $dirname";
-
-$start_dir = cwd;
-$start_dir =~ s/\//\\/ ;
-$last_time = 0;
-
-print "starting dir is: $start_dir\n";
-
-while( $early_exit ){
-    chdir("$start_dir");
-    if( time - $last_time < (60 * $build_sleep) ){
-        $sleep_time = (60 * $build_sleep) - (time - $last_time);
-        print "\n\nSleeping $sleep_time seconds ...\n";
-        sleep( $sleep_time );
-    }
-    $last_time = time;
-
-    $start_time = time;
-    $start_time = adjust_start_time($start_time);
-    $start_time_str = `unix_date +"%m/%d/%Y %H:%M"`;
-    chop($start_time_str);
-# call setup_env here in the loop, to update MOZ_DATE with each pass.
-# setup_env uses start_time_str for MOZ_DATE.
-    &setup_env;
-
-    $cur_dir = cwd;
-    $cur_dir =~ s/\//\\/ ;
-
-    if( $cur_dir ne $start_dir ){
-        print "startdir: $start_dir, curdir $cur_dir\n";
-        die "curdir != startdir";
-    }
-
-    if ($build_test) {
-        $early_exit = 0;        # stops this while loop after one pass.
-    }
-
-# strip_conf fails to strip any variables from the real environemnt
-#    &strip_config;
-    &do_build(1,$do_clobber);
-#    &restore_config;
-
-}
-
-sub setup32 {
-    local ($awt) = @_;
-
-    $ENV{"MOZ_BITS"}  = '32';
-    $ENV{"WINOS"}  = 'WINNT';
-    $ENV{"STANDALONE_IMAGE_LIB"} = '1';
-    $ENV{"MODULAR_NETLIB"} = '1';
-    $ENV{"OS_TARGET"} = 'WIN95';
-    $ENV{"PATH"}      = $original_path;
-    $ENV{"_MSC_VER"}      = '1200';
-    $moz_src          = $ENV{'MOZ_SRC'} = $start_dir;
-    $build_name       = 'Win32 VC6.0' . ($build_depend?'Depend':'Clobber');
-    $do_clobber       = $clobber_str;
-    $logname          = "win32.log";
-}
-
-
-sub do_build {
-    local ($pull, $do_clobber) = @_;
-    
-    print "pull = $pull, do_clobber = $do_clobber\n";
-    &start_build;
-
-    print "opening log file ${logname}\n";
-    open( LOG, ">${logname}" ) || print "can't open $logname\n";
-    print LOG "current dir is: $cur_dir\n";
-
-    &print_env;
-    $build_status = 0;
-    if( $pull ){
-        if ( $build_tag eq '' ){
-#           print LOG   "cvs -d %MOZ_CVSROOT% co -A mozilla/config 2>&1 |\n";
-#           open( PULL, "cvs -d %MOZ_CVSROOT% co -A mozilla/config 2>&1 |") || print "couldn't execute cvs\n";;
-            print LOG   "cvs -d $moz_cvsroot co -A mozilla/client.mak 2>&1 |\n";
-            open( PULL, "cvs -d $moz_cvsroot co -A mozilla/client.mak 2>&1 |") || print "couldn't execute cvs\n";;
-        } else{
-            print LOG   "cvs -d $moz_cvsroot co -A -r $build_tag mozilla/config 2>&1 |\n";
-            open( PULL, "cvs -d $moz_cvsroot co -A -r $build_tag mozilla/config 2>&1 |") || print "couldn't execute cvs\n";;
-            print LOG   "cvs -d $moz_cvsroot co -A -r $build_tag mozilla/client.mak 2>&1 |\n";
-            open( PULL, "cvs -d $moz_cvsroot co -A -r $build_tag mozilla/client.mak 2>&1 |") || print "couldn't execute cvs\n";;
-        }
-
-        # tee the output
-        while( <PULL> ){
-            print $_;
-            print LOG $_;
-        }
-        close( PULL );
-     
-        $build_status = $?;
-    }
-
-    chdir("$moz_src/mozilla") || die "couldn't chdir to '$moz_src/mozilla'";
-
-#    if( $do_clobber ne '' ){
-#        print LOG   "nmake -f client.mak $do_clobber |\n";
-#        print "nmake -f client.mak $do_clobber |\n";
-#        open( CLOBBER, "nmake -f client.mak $do_clobber 2>&1 |") || print "couldn't execute nmake\n";;
-
-        # tee the output
-#        while( <CLOBBER> ){
-#            print $_;
-#            print LOG $_;
-#        }
-#        close( CLOBBER );
-#    }
-
-
-    if (!$pull) {
-      $client_param = $do_clobber . ' build_all';
-    }
-    else {
-      $client_param = 'pull_all ' . $do_clobber . ' build_all';
-    }
-    
-    print LOG "nmake  -f client.mak $client_param 2>&1 |\n";
-    open( BUILD, "nmake -f client.mak $client_param 2>&1 |");
-
-    # tee the output
-    while( <BUILD> ){
-        print $_;
-        print LOG $_;
-    }
-    close( BUILD );
-    $build_status |= $?;
-    $build_status_str = ( $build_status ? 'busted' : 'success' );
-
-    print LOG "\n";
-    print LOG "tinderbox: tree: $build_tree\n";
-    print LOG "tinderbox: builddate: $start_time\n";
-    print LOG "tinderbox: status: $build_status_str\n";
-    print LOG "tinderbox: build: $build_name\n";
-    print LOG "tinderbox: errorparser: windows\n";
-    print LOG "tinderbox: buildfamily: windows\n";
-
-    close( LOG );
-    chdir("$start_dir");
-    system( "$nstools\\bin\\blat ${logname} -t tinderbox-daemon\@cvs-mirror.mozilla.org" );
-
- # we should save at least one log back
-    system("copy ${logname} last-${logname}");
-}
-
-sub cvs_time {
-    local( $ret_time );
-
-    ($sec,$minute,$hour,$mday,$mon,$year) = localtime( $_[0] );
-    $mon++; # month is 0 based.
-
-    sprintf("%02d/%02d/%04d %02d:%02d:00",
-        $mon,$mday,$year,$hour,$minute );
-}
-
-
-sub start_build {
-    open( LOG, ">logfile" );
-    print LOG "\n";
-    print LOG "tinderbox: tree: $build_tree\n";
-    print LOG "tinderbox: builddate: $start_time\n";
-    print LOG "tinderbox: status: building\n";
-    print LOG "tinderbox: build: $build_name\n";
-    print LOG "tinderbox: errorparser: windows\n";
-    print LOG "tinderbox: buildfamily: windows\n";
-    print LOG "\n";
-    close( LOG );
-    system("$nstools\\bin\\blat logfile -t tinderbox-daemon\@cvs-mirror.mozilla.org" );
-}
-
-sub parse_args {
-    local($i);
-
-    if( @ARGV == 0 ){
-        &usage;
-    }
-    $i = 0;
-    while( $i < @ARGV ){
-        if( $ARGV[$i] eq '--depend' ){
-            $build_depend = 1;
-        }
-        elsif ( $ARGV[$i] eq '--clobber' ){
-            $build_depend = 0;
-        }
-        elsif ( $ARGV[$i] eq '--continue' ){
-            $build_continue = 1;
-        }
-        elsif ( $ARGV[$i] eq '--test' ){
-            $build_test = 1;
-        }
-        elsif ( $ARGV[$i] eq '-tag' ){
-            $i++;
-            $build_tag = $ARGV[$i];
-            if( $build_tag eq '' || $build_tag eq '-t'){
-                &usage;
-            }
-                }
-        elsif ( $ARGV[$i] eq '-t' ){
-            $i++;
-            $build_tree = $ARGV[$i];
-            if( $build_tree eq '' ){
-                &usage;
-            }
-        }
-        $i++;
-    }
-    if( $build_tree eq '' ){
-        &usage;
-    }
-}
-
-sub usage {
-    die "usage: buildit.pl [--depend | --clobber] [--continue] [--test] [-tag TAGNAME] -t TREENAME\n";
-}
-
-sub setup_env {
-    local($p);
-
-#    $ENV{"MOZ_DEBUG"} = '1';
-    $ENV{"MOZ_MFC"} = '1';
-    $ENV{"CVSROOT"} = ':pserver:cltbld%netscape.com@cvs.mozilla.org:/cvsroot';
-    $moz_cvsroot = $ENV{"CVSROOT"};
-#    $ENV{"MOZ_EDITOR"} = '1';
-    $ENV{"VERBOSE"} = '1';
-    $ENV{"NGLAYOUT_PLUGINS"} = '1';
-    $nstools = $ENV{"MOZ_TOOLS"};
-    if( $nstools eq '' ){
-        print "warning: environment variable MOZ_TOOLS not set\n";
-        $ENV{"MOZ_TOOLS"} = 'C:\nstools';
-        $nstools = $ENV{"MOZ_TOOLS"};
-        print "using MOZ_TOOLS = $nstools \n";
-
-    }
-#    $msdev = $ENV{"MOZ_MSDEV"} = 'c:\msdev';
-#    if( $msdev eq '' ){
-#        die "error: environment variable MOZ_MSDEV not set\n";
-#    }
-#    $msvc = $ENV{"MOZ_MSVC"} = 'c:\msvc';
-#    if( $msvc eq '' ){
-#        die "error: environment variable MOZ_VC not set\n";
-#    }
-    if ( $build_tag ne '' ) {
-        $ENV{"MOZ_BRANCH"} = $build_tag;
-    }
-    $moz_src = $ENV{"MOZ_SRC"} = $start_dir;
-#    $ENV{"INCLUDE"}='c:\devstudio\vc\lib;C:\DevStudio\VC\INCLUDE;C:\DevStudio\VC\MFC\INCLUDE;C:\DevStudio\VC\lib;C:\DevStudio\VC\ATL\INCLUDE';
-#    $ENV{"LIB"}='C:\DevStudio\VC\MFC\LIB;C:\DevStudio\VC\lib';
-#    $ENV{"PATH"}='C:\DevStudio\SharedIDE\BIN;C:\DevStudio\VC\bin;C:\DevStudio\VC\lib;C:\DevStudio\VC\BIN\WINNT;.;%MOZ_TOOLS%\perl5\bin;C:\WINNT\system32;C:\WINNT;c:\usr\local\bin;%MOZ_TOOLS%\bin';
-##
-## We should pull by date to avoid mid-checkin disasters
-##
-    $ENV{"MOZ_DATE"} = $start_time_str;
-    
-    &setup32
-}
-
-sub print_env {
-    local( $k, $v);
-    print LOG "\nEnvironment\n";
-    print     "\nEnvironment\n";
-    for $k (sort keys %ENV){
-        $v = $ENV{$k};
-        print LOG "   $k=$v\n";
-        print     "   $k=$v\n";
-    }
-    print LOG "\n";
-    print     "\n";
-    system 'set';
-}
-
-sub strip_config {
-        $save_compname=$ENV{"COMPUTERNAME"};
-        $save_userdomain=$ENV{"USERDOMAIN"};
-        $save_username=$ENV{"USERNAME"};
-        $save_userprofile=$ENV{"USERPROFILE"};
-}
-
-sub restore_config {
-        $ENV{"COMPUTERNAME"}=$save_compname;
-        $ENV{"USERDOMAIN"}=$save_userdomain;
-        $ENV{"USERNAME"}=$save_username;
-        $ENV{"MSDevDir"}=$save_userprofile;
-        &print_env;
-}
-
-sub adjust_start_time {
-    # Allows the start time to match up with the update times of a mirror.
-    my ($start_time) = @_;
-
-    # Since we are not pulling for cvs-mirror anymore, just round times
-    # to 1 minute intervals to make them nice and even.
-    my $cycle = 1 * 60; # Updates every 1 minutes.
-    my $begin = 0 * 60; # Starts 0 minutes after the hour.
-    my $lag = 0 * 60; # Takes 0 minute to update.
-    return int(($start_time - $begin - $lag) / $cycle) * $cycle + $begin;
-}
-

mozilla/tools/tinderbox/build-seamonkey.pl

@@ -1,36 +0,0 @@
-#!/usr/bin/perl -w
-
-require 5.003;
-
-# This script has split some functions off into a util
-# script so they can be re-used by other scripts.
-require "build-seamonkey-util.pl";
-
-use strict;
-
-# "use strict" complains if we do not define these.
-# They are not initialized here. The default values are after "__END__".
-$TreeSpecific::name = $TreeSpecific::checkout_target = $TreeSpecific::checkout_clobber_target = $::Version = undef;
-
-$::Version = '$Revision: 1.100 $ ';
-
-{    
-    TinderUtils::Setup();
-    tree_specific_overides();
-    TinderUtils::Build();
-}
-
-# End of main
-#======================================================================
-
-
-
-sub tree_specific_overides {
-
-	$TreeSpecific::name = 'mozilla';
-	$TreeSpecific::checkout_target = '';
-	$TreeSpecific::checkout_clobber_target = "checkout realclean build";
-	
-}
-
-    

mozilla/tools/tinderbox/examples/mozconfig

@@ -1,18 +0,0 @@
-# Turning on security
-#
-ac_add_options --enable-crypto
-#
-# Add all extensions
-#
-ac_add_options --enable-extensions=all
-#
-# Optimized
-#
-ac_add_options --enable-optimize
-ac_add_options --disable-debug
-#
-# Bloat stats/optimized needs these:
-#
-#ac_add_options --enable-logrefcnt
-#ac_add_options --enable-perf-metrics
-#

mozilla/tools/tinderbox/examples/tinder-config.pl

@@ -1,38 +0,0 @@
-#- tinder-config.pl - Tinderbox configuration file.
-#-    Uncomment the variables you need to set.
-#-    The default values are the same as the commented variables
-
-#- PLEASE FILL THIS IN WITH YOUR PROPER EMAIL ADDRESS
-$BuildAdministrator = 'mcafee@mocha.com';
-
-#- You'll need to change these to suit your machine's needs
-$DisplayServer = ':0.0'; # costarica:0.0
-
-#- Until you get the script working. When it works,
-#- change to the tree you're actually building
-$BuildTree  = 'MozillaTest';
-#$BuildTree  = 'SeaMonkey';
-
-$AliveTest                = 1;
-$ViewerTest               = 0;
-$BloatTest                = 0;
-$BloatTest2               = 0;
-$DomToTextConversionTest  = 0;
-$EmbedTest                = 0;
-$MailNewsTest             = 0;
-$LayoutPerformanceTest    = 0;
-$StartupPerformanceTest   = 0;
-
-$MozProfileName = "default";
-$BloatTestTimeout  = 240;    # seconds
-$LayoutPerformanceTestTimeout  = 1400;    # seconds
-$StartupPerformanceTestTimeout = 60;      # seconds
-
-# Testing...
-# $TestOnly = 1;
-# $ObjDir = 'obj-i686-unknown-linux-gnu';
-
-$UserComment = "Sample tinder-config.pl, changeme!";
-
-# Need to end with a true value
-1;

mozilla/tools/tinderbox/examples/tinder-config.pl.branch

@@ -1,63 +0,0 @@
-#- tinder-config.pl - Tinderbox configuration file.
-#-    Uncomment the variables you need to set.
-#-    The default values are the same as the commented variables.
-
-#- PLEASE FILL THIS IN WITH YOUR PROPER EMAIL ADDRESS
-$BuildAdministrator = "mcafee\@netscape.com";
-
-#- You'll need to change these to suit your machine's needs
-$DisplayServer = 'costarica.mcom.com:0.0';
-
-#- Default values of command-line opts
-#-
-$BuildDepend       = 1;      # Depend or Clobber
-$ReportStatus      = 1;      # Send results to server, or not
-$ReportFinalStatus = 1;      # Finer control over $ReportStatus.
-$UseTimeStamp      = 0;      # Use the CVS 'pull-by-timestamp' option, or not
-#$BuildOnce         = 0;      # Build once, don't send results to server
-#$RunTest           = 1;      # Run the smoke tests on successful build, or not
-#$TestOnly          = 0;      # Only run tests, don't pull/build
-
-# Tests
-$AliveTest = 1;
-$ViewerTest = 1;
-$BloatTest = 1;
-$DomToTextConversionTest = 1;
-$MailNewsTest = 0;
-#$MozConfigFileName = 'mozconfig';
-#$MozProfileName = 'default';
-$BloatTestTimeout	= 240;
-$DomTestTimeout		= 45;
-
-#- Set these to what makes sense for your system
-$Make          = 'gmake';       # Must be GNU make
-#$MakeOverrides = '';
-$mail          = '/bin/mail';
-$CVS           = 'cvs -q';
-$CVSCO         = 'checkout -P';
-
-#- Set these proper values for your tinderbox server
-$Tinderbox_server = 'tinderbox-daemon@tinderbox.mozilla.org';
-
-#-
-#- The rest should not need to be changed
-#-
-
-#- Minimum wait period from start of build to start of next build in minutes.
-#$BuildSleep = 10;
-
-#- Until you get the script working. When it works,
-#- change to the tree you're actually building
-$BuildTree  = 'SeaMonkey-Branch'; 
-
-#$BuildName = '';
-$BuildTag = 'MOZILLA_0_9_1_BRANCH';
-#$BuildConfigDir = 'mozilla/config';
-#$Topsrcdir = 'mozilla';
-#$BinaryName = 'mozilla-bin';
-#$ShellOverride = ''; # Only used if the default shell is too stupid
-#$ConfigureArgs = '';
-#$ConfigureEnvArgs = '';
-#$Compiler = 'gcc';
-#$NSPRArgs = '';
-#$ShellOverride = '';

mozilla/tools/tinderbox/gettime.pl

@@ -1,73 +0,0 @@
-#!/usr/bin/perl
-#
-# Use high resolution routines if installed (on win32 or linux), using
-# eval as try/catch block around import of modules. Otherwise, just use 'time()'.
-#
-# 'Win32::API'  <http://www.activestate.com/PPMPackages/zips/5xx-builds-only/Win32-API.zip>
-# 'Time::HiRes' <http://search.cpan.org/search?dist=Time-HiRes> 
-#   (also: http://rpmfind.net/linux/rpm2html/search.php?query=perl-Time-HiRes)
-#
-package Time::PossiblyHiRes;
-
-use strict;
-
-#use Time::HiRes qw(gettimeofday);
-
-my $getLocalTime;                      # for win32
-my $lpSystemTime = pack("SSSSSSSS");   # for win32
-my $timesub;                           # code ref
-
-# returns 12 char string "'s'x9.'m'x3" which is milliseconds since epoch, 
-# although resolution may vary depending on OS and installed packages
-
-sub getTime () {
-
-    return &$timesub 
-	if $timesub;
-
-    $timesub = sub { time() . "000"; }; # default
-
-    return &$timesub 
-	if $^O eq "MacOS"; # don't know a better way on Mac
-
-    if ($^O eq "MSWin32") {
-	eval "use Win32::API;";
-	$timesub = sub { 
-	    # pass pointer to struct, void return 
-	    $getLocalTime = 
-		eval "new Win32::API('kernel32', 'GetLocalTime', [qw{P}], qw{V});"
-		    unless $getLocalTime;
-	    $getLocalTime->Call($lpSystemTime);
-	    my @t = unpack("SSSSSSSS", $lpSystemTime);
-	    sprintf("%9s%03s", time(), pop @t);
-	} if !$@;
-    } 
-
-    # ass-u-me if not mac/win32, then we're on a unix flavour
-    else {
-	eval "use Time::HiRes qw(gettimeofday);";
-	$timesub = sub { 
-	    my @t = gettimeofday();
-	    $t[0]*1000 + int($t[1]/1000);	    
-	} if !$@;
-    }
-
-    return &$timesub;
-
-} 
-
-#
-#
-# Test script to compare with low-res time:
-#
-# require "gettime.pl";
-#
-# use POSIX qw(strftime);
-#
-# print "hires  time = " . Time::PossiblyHiRes::getTime() . "\n";
-# print "lowres time = " . time()    . "\n";
-#
-
-
-# end package
-1;

mozilla/tools/tinderbox/install-links

@@ -1,14 +0,0 @@
-#! /bin/csh -f
-
-#
-# Create links to install tinderbox stuff.
-#
-
-ln -s ../mozilla/tools/tinderbox/tinderbox
-ln -s ../mozilla/tools/tinderbox/build-seamonkey.pl
-ln -s ../mozilla/tools/tinderbox/build-seamonkey-util.pl
-ln -s ../mozilla/tools/tinderbox/gettime.pl
-ln -s ../mozilla/tools/tinderbox/bloatdiff.pl
-ln -s ../mozilla/tools/tinderbox/tinder-defaults.pl
-ln -s ../mozilla/tools/tinderbox/reportdata.pl
-

mozilla/tools/tinderbox/multi-tinderbox.pl

@@ -1,75 +0,0 @@
-#!/usr/bin/perl
-# vim:sw=4:et:ts=4:ai:
-
-use strict;
-
-sub PrintUsage() {
-    die <<END_USAGE
-    usage: $0 [options]
-Options:
-  --example-config       Instead of running, print an example
-                           'multi-config.pl' to help get started.
-END_USAGE
-}
-
-sub PrintExample() {
-    print <<END_EXAMPLE
-# multi-config.pl
-\$BuildSleep = 10;                       # minutes
-\$Tinderboxes = [ { tree => "SeaMonkey", args => "--depend --mozconfig mozconfig" }, { tree => "SeaMonkey-Branch", args => "--depend --mozconfig mozconfig" } ];
-END_EXAMPLE
-    ;
-    exit;
-}
-
-sub HandleArgs() {
-    return if ($#ARGV == -1);
-    PrintUsage() if ($#ARGV != 0 || $ARGV[0] ne "--example-config");
-    PrintExample();
-}
-
-sub LoadConfig() {
-    if (-r 'multi-config.pl') {
-        no strict 'vars';
-
-        open CONFIG, 'multi-config.pl' or
-            print "can't open multi-config.pl, $?\n";
-
-        while (<CONFIG>) {
-            package Settings;
-            eval;
-        }
-
-        close CONFIG;
-    } else {
-        warn "Error: Need tinderbox config file, multi-config.pl\n";
-        exit;
-    }
-}
-
-
-sub Run() {
-    my $start_time = 0;
-    while (1) {
-        # $BuildSleep is the minimum amount of time a build is allowed to take.
-        # It prevents sending too many messages to the tinderbox server when
-        # something is broken.
-        my $sleep_time = ($Settings::BuildSleep * 60) - (time() - $start_time);
-        if ($sleep_time > 0) {
-            print "\n\nSleeping $sleep_time seconds ...\n";
-            sleep $sleep_time;
-        }
-        $start_time = time();
-
-        foreach my $treeentry (@{$Settings::Tinderboxes}) {
-            chdir($treeentry->{tree}) or
-                die "Tree $treeentry->{tree} does not exist";
-            system("./build-seamonkey.pl --once $treeentry->{args}");
-            chdir("..");
-        }
-    }
-}
-
-HandleArgs();
-LoadConfig();
-Run();

mozilla/tools/tinderbox/post-mozilla-linux-release.pl

@@ -1,179 +0,0 @@
-#!/usr/bin/perl
-#
-
-#
-# This script gets called after a full mozilla build & test.
-# Use this to build and test an embedded or commercial branding of Mozilla.
-#
-# Edit, and rename this file to post-mozilla.pl to activate.
-# ./build-seamonkey-utils.pl will call PostMozilla::main() after
-# a successful build and testing of mozilla.  This package can report
-# status via the $TinderUtils::build_status variable.  Yeah this is a hack,
-# but it works for now.  Feel free to improve this mechanism to properly
-# return values & stuff.  -mcafee
-#
-# Contributors: 
-# leaf@mozilla.org - release processing/packaging/uploading
-
-# Assumptions:
-#  no objdir 
-#  ssh-agent running or empty passphrase RSA key
-#  
-
-use strict;
-
-package PostMozilla;
-
-sub print_log {
-    my ($text) = @_;
-    print LOG $text;
-    print $text;
-}
-
-# Cache builds in a dated directory if:
-#  * The hour of the day is $Settings::build_hour or higher 
-#    (set in tinder-config.pl)
-#    -and-
-#  * the "last-built" file indicates a day before today's date
-#
-sub cacheit {
-  my ($c_hour, $c_yday, $target_hour, $last_build_day) = @_;
-  TinderUtils::print_log "current hour = $c_hour\n";
-  TinderUtils::print_log "target hour = $target_hour\n";
-  TinderUtils::print_log "current julian day = $c_yday\n";
-  TinderUtils::print_log "last build julian day = $last_build_day\n";
-  if (($c_hour > $target_hour) && 
-      (($last_build_day < $c_yday) || ($c_yday == 0))) {
-        return 1;
-      } else {
-	return 0;
-      }
-}
-
-
-
-sub returnStatus{
-  # build-anvil-util.pl expects an array, if no package is uploaded,
-  # a single-element array with 'busted', 'testfailed', or 'success' works.
-  my ($logtext, @status) = @_;
-  TinderUtils::print_log "$logtext\n";
-  return @status;
-}
-
-sub pushit {
-  my ($ssh_server,$upload_path,$upload_target) = @_;
-  # need to convert the path in case we're using activestate perl
-  # check for platform
-  #my $upload_target_dos = `cygpath -w $upload_target`;
-  #chop($upload_target_dos);
-
-  unless ( -e $upload_target) {
-    TinderUtils::print_log "No $upload_target to upload\n";
-    return 0;
-  }
-
-#for leaf
-  TinderUtils::run_shell_command "ssh -1 -i /home/leaf/.ssh/cltbld/.ssh/identity -l cltbld $ssh_server mkdir -p $upload_path";
-  TinderUtils::run_shell_command "scp -i /home/leaf/.ssh/cltbld/.ssh/identity -oProtocol=1 -r $upload_target cltbld\@$ssh_server:$upload_path";
-  TinderUtils::run_shell_command "ssh -1 -i /home/leaf/.ssh/cltbld/.ssh/identity -l cltbld $ssh_server chmod -R 755 $upload_path/$upload_target";
-
-# for cltbld
-  #TinderUtils::run_shell_command "ssh -1 -l cltbld $ssh_server mkdir -p $upload_path";
-  #TinderUtils::run_shell_command "scp -oProtocol=1 $upload_target cltbld\@$ssh_server:$upload_path";
-  #TinderUtils::run_shell_command "ssh -1 -l cltbld $ssh_server chmod -R 755 $upload_path";
-  return 1;
-}
-
-sub process_talkback {
-# this is where we
-# * generate a master.ini
-# * upload symbol-files
-# * shove talkback files into dist for packaging.
-# 
-
-}
-
-sub make_packages {
-  my ($build_dir, $build_date) = @_;
-  my $save_dir  = `pwd`;
-
-#DEBUG_LEAF
-    print_log "current directory is $save_dir\n";
-    print_log "cd to $build_dir/$Settings::Topsrcdir/xpinstall\n";
-#end DEBUG_LEAF
-
-  chdir "$build_dir/$Settings::Topsrcdir/xpinstall";
-  $ENV{"INSTALLER_URL"} = "http://ftp.mozilla.org/pub/mozilla.org/pub/mozilla/tinderbox-builds/$build_date";
-  system "make installer";
-#  if ($DEBUG_LEAF) {
-    print_log "post |make installer|\n";
-# DEBUG_LEAF
-  chdir $save_dir;
-
-}
-
-sub push_to_stage {
-  my ($build_dir, $build_date) = @_;
-  my $save_dir = `pwd`;
-  chdir "$build_dir/$Settings::Topsrcdir/installer";
-  mkdir $build_date;
-  system "cp sea/* $build_date"; 
-  system "cp stub/* $build_date";
-  system "cp -r raw/xpi $build_date/linux-xpi";
-  pushit ("stage.mozilla.org", "/home/ftp/pub/mozilla/tinderbox-builds", $build_date);
-  chdir $save_dir;
-
-}
-
-sub pad_digit {
-  my ($digit) = @_;
-  if ($digit < 10) { return "0" . $digit };
-  return $digit;
-}
-
-sub main {
-  # Get build directory from caller.
-  my ($mozilla_build_dir) = @_;
- 
-  #
-  # (0: $sec, 1: $min, 2: $hour, 3: $mday, 4: $mon, 5: $year, 
-  #  6: $wday, 7: $yday, 8: $isdst)
-  my ($hour, $mday, $mon, $year, $yday) = (localtime (time)) [2,3,4,5,7];
-  $year = $year + 1900;
-  $mon = $mon + 1;
-  $hour = pad_digit ($hour);
-  $mday = pad_digit ($mday);
-  $mon = pad_digit ($mon);
-  my $build_date = "$year-$mon-$mday-$hour";
-  #
-  my $last_build_day = -1;
-  if ( -e "$mozilla_build_dir/last-built"){
-    ($last_build_day) = (localtime((stat "$mozilla_build_dir/last-built")[9]))[7];
-  }
-  
-  print_log "build dir is $mozilla_build_dir \n";
-  TinderUtils::print_log "Post-Mozilla build goes here.\n";
-
-  # someday, we'll have talkback
-  #process_talkback;
-  
-  make_packages ($mozilla_build_dir, $build_date);
-  if (cacheit($hour, $yday, "8", $last_build_day)) { 
-    push_to_stage ($mozilla_build_dir, $build_date);
-    unlink "$mozilla_build_dir/last-built";
-    open BLAH, ">$mozilla_build_dir/last-built"; 
-    close BLAH;
-  }
-
-  # Report some kind of status to parent script.
-  #
-  #	 {'busted', 'testfailed', 'success'}
-  #
-
-  # Report a fake success, for example's sake.
-  # Eventually return an array 
-  &returnStatus (('success'));
-}
-
-# Need to end with a true value, (since we're using "require").
-1;

mozilla/tools/tinderbox/post-mozilla-sample.pl

@@ -1,46 +0,0 @@
-#!/usr/bin/perl
-#
-
-#
-# This script gets called after a full mozilla build & test.
-# Use this to build and test an embedded or commercial branding of Mozilla.
-#
-# Edit, and rename this file to post-mozilla.pl to activate.
-# ./build-seamonkey-utils.pl will call PostMozilla::main() after
-# a successful build and testing of mozilla.  This package can report
-# status via the $TinderUtils::build_status variable.  Yeah this is a hack,
-# but it works for now.  Feel free to improve this mechanism to properly
-# return values & stuff.  -mcafee
-#
-
-use strict;
-
-package PostMozilla;
-
-
-sub main {
-  # Get build directory from caller.
-  my ($mozilla_build_dir) = @_;
- 
-  
-  TinderUtils::print_log "Post-Mozilla build goes here.\n";
-
-  #
-  # Build script goes here.
-  #
-
-  # Report some kind of status to parent script.
-  #
-  #	 {'busted', 'testfailed', 'success'}
-  #
-
-  # Report a fake success, for example's sake.
-  # we return a list because sometimes we pass back a status *and*
-  # a url to a binary location, e.g.:
-  # return ('success', 'http://upload.host.org/path/to/binary');
-  # tinderbox processes the binary url and links to it in the log.
-  return ('success');
-}
-
-# Need to end with a true value, (since we're using "require").
-1;

mozilla/tools/tinderbox/qatest.pl

@@ -1,362 +0,0 @@
-#!/usr/bin/perl -w
-# -*- Mode: perl; indent-tabs-mode: nil -*-
-#
-###################################################################
-# Report Summary Generator for ARMS v2.0 by Vladimir Ermakov	
-###################################################################
-# This file parses through a results file and generates a
-# test summary giving the following info:
-#	  # of tcs passed
-#	  # of tcs failed
-#	  # of tcs died
-#	  % of pass and fail
-#	  List of testcases that failed.
-#	  Separates the results into suites with a convinient quick link
-#		 at the top of the page
-###################################################################
-# Questions Coments go to vladimire@netscape.com
-###################################################################
-
-sub PrintUsage {
-  die <<END_USAGE
-  usage: $0 <filename> ["express"]
-END_USAGE
-}
-
-if ($#ARGV < 0) {
-  PrintUsage();
-}
-
-my $DATAFILE = $ARGV[0];
-my $MODE;     
-
-if($#ARGV > 0) {
-  $MODE = $ARGV[1];
-} else {
-  $MODE = "";
-}
-
-my $express  = 0;
-
-if($MODE eq "express") {
-  $express = 1;
-}
-
-my $ngdir	= "http://geckoqa.mcom.com/ngdriver/"; #$input->url(-base=>1) . "/ngdriver/";
-my $ngsuites = $ngdir . "suites/";
-my $conffile = "ngdriver.conf";
-my $HTMLreport = "";
-
-unless ($express) {
-  print "Content-type: text/html\n\n";
-}
-
-&generateResults;
-
-$File{'SuiteList'} = \@suiteArray;
-
-&generateHTML;
-
-$File{'Project'} = "Buffy";
-
-print $HTMLreport;
-
-sub generateResults
-  {
-	if (!open(INFILE,$DATAFILE)) {
-	  print "DATAFILE = $DATAFILE\n";
-	  print "<H3> Cannot open $?, $!</H3>\n";
-	  return -1;
-	}
-
-	$File{'tcsPass'} = 0;
-	$File{'tcsFail'} = 0;
-	$File{'tcsDied'} = 0;
-	$File{'tcsTotal'} = 0;
-
-	$line = <INFILE>;
-	while ($line) {
-      my %Suite = ();
-
-      my @diedArray = ();
-      $Suite{'DiedList'} = \@diedArray;
-      my @testArray = ();
-      $Suite{'FailedList'} = \@testArray; 
-
-      # Skip to first anchor.
-      while (!($line =~ /<A NAME=".*?">/i) && $line) {
-        $line = <INFILE>;       # Go to next line.
-      }
-
-      # First anchor.
-      $line =~ /<A NAME="(.*?)"><H1>(.*?)<\/H1>/i;
-
-
-      my $name = $1;
-      my $title =$2;
-
-      $Suite{'Name'} = $name; 
-      $Suite{'Title'} = $title;
-
-      $Suite{'tcsPass'} = 0;
-      $Suite{'tcsFail'} = 0;
-      $Suite{'tcsDied'} = 0;
-      $Suite{'tcsTotal'} = 0;
-
-      do
-		{
-          while ($line && !($line =~ /<TC>/i) && !($line =~ /<A name=".*?">/i)) {
-            $line = <INFILE>;
-          }
-
-          if ($line && ($line =~ /<A name=\"(.*?)\">/i) && ($1 eq $Suite{'Name'})) {
-            $line = <INFILE>;  
-          }
-
-          # TC = test case.
-          if ($line && ($line =~ /<TC>/i)) {
-            while ($line && !($line =~ /<ENDTC>/i)) { 
-              $line1 = <INFILE>; 
-              if ($line1 =~ /<TC>/i) {
-                print "<H1>SOMETHING WRONG!</H1><BR>"; next; next;
-              }
-              $line .= $line1;
-            }
-
-            my ($tfName, $tcStat);
-            my @lines = split /<->/, $line;
-            $tfName = $lines[1];
-            $tcStat = $lines[3];
-			
-            # D=died, P=pass, F=failure
-            if ($tcStat eq 'D') {
-              $Suite{'tcsDied'} += 1;
-              push(@diedArray,$line);
-            }
-            if ($tcStat eq 'P') {
-              $Suite{'tcsPass'} += 1;
-              $Suite{'tcsTotal'} += 1;
-            }
-            if ($tcStat eq 'F') {
-              push(@testArray,$line);
-              $Suite{'tcsFail'} += 1;
-              $Suite{'tcsTotal'} += 1;
-            }
-            $line = <INFILE>;
-          }
-		} while ($line && !($line =~ /<A NAME=".*?">/i) && $line);
-
-      $File{'tcsPass'} += $Suite{'tcsPass'};
-      $File{'tcsFail'} += $Suite{'tcsFail'};
-      $File{'tcsTotal'} += $Suite{'tcsTotal'};
-      $File{'tcsDied'} += $Suite{'tcsDied'};
-      push(@suiteArray,\%Suite);
-	}
-	close INFILE;
-	1;
-  }
-
-sub generateHTML
-  {
-    my $prjExtension;
-    my %extList;
-
-    my $os = `uname -s`;        # Cheap OS id for now
-
-    my %Matrices;
-    
-    # Hard-coded from ngdriver.conf, I didn't want extra files in tree.
-    
-    $extList{"mb"}  = "http://cemicrobrowser.web.aol.com/bugReportDetail.php?RID=%";
-    $extList{"bs"}  = "http://bugscape.nscp.aoltw.net/show_bug.cgi?id=%";
-    $extList{"bz"}  = "http://bugzilla.mozilla.org/show_bug.cgi?id=%";
-    $extList{"bzx"} = "http://bugzilla.mozilla.org/show_bug.cgi?id=%";
-      
-    $prjExtension = "bz";       # Buffy hard-coded here.
-      
-    $Matricies{"dom-core"} = "http://geckoqa.mcom.com/browser/standards/dom1/tcmatrix/index.html";
-    $Matricies{"dom-html"} = "http://geckoqa.mcom.com/browser/standards/dom1/tcmatrix/index.html";
-    $Matricies{"domevents"} = "http://geckoqa.mcom.com/browser/standards/dom1/tcmatrix/index.html";
-    $Matricies{"javascript"} = "http://geckoqa.mcom.com/browser/standards/javascript/tcmatrix/index.html";
-    $Matricies{"forms"} = "http://geckoqa.mcom.com/browser/standards/form_submission/tcmatrix/index.html";
-    $Matricies{"formsec"} = "http://geckoqa.mcom.com/browser/standards/form_submission/tcmatrix/index.html";
-
-    unless ($express) {
-    $HTMLreport .= <<END_PRINT;
-		<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-		<html>
-			<head>
-			  <title>Test Result Summary on $File{'Platform'}</title>
-			  <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
-			</head>
-
-		<body>
-		  <center><u><font color="#990000"><h3>AUTOMATED TEST RESULTS</h3></font></u></center><br>						   
-		  <center>			   
-		   <table border="0" cols="3" width="90%">
-			<tbody>
-			 <tr align="Left" valign="CENTER">
-			   <td width="250" valign="Middle"><b>OS: </b><font color="#990000">$os</script></font></td>
-			 </tr>
-			</tbody>			 
-		   </table>
-		  </center>							
-		<hr>		 
- <h3><u>The Following Test Suites Were Run:</u></h3>
-<UL>
-END_PRINT
-    
-      for (my $var = 0;$File{'SuiteList'}->[$var]->{'Name'};$var++) {
-        if (my $href = $Matrices{$File{'SuiteList'}->[$var]->{'Name'}}) {
-          $HTMLreport .= "<li><a href=\"$href\">$File{'SuiteList'}->[$var]->{'Title'}</a></li>\n";
-        } else {
-          $HTMLreport .= "<li><a href=\"$ngsuites$File{'SuiteList'}->[$var]->{'Name'}\">$File{'SuiteList'}->[$var]->{'Title'}</a></li>\n";
-        }
-      }
-    
-    $HTMLreport .= <<END_PRINT;
-	</UL>
-
-	<h3><u>Test Result Summary:</u></h3>
-END_PRINT
-    } # !express
-
-
-    $HTMLreport .= <<END_PRINT;
-<table border=2 cellspacing=0>
-<tr valign=top bgcolor=#CCCCCC>
-<td bgcolor=#999999>&nbsp;</td>
-<td>Passed</td>
-<td>Failed</td>
-<td>Total</td>
-<td>Died</td>
-<td>% Passed</td>
-<td>% Failed</td>
-</tr>
-END_PRINT
-
-    for (my $var = 0;$File{'SuiteList'}->[$var]->{'Name'};$var++) {
-      $curSuite = $File{'SuiteList'}->[$var];
-
-      $HTMLreport .= "<tr valign=top>\n";
-      if($express) {
-        $HTMLreport .= "<td>$curSuite->{'Title'}</td>\n";
-      } else {
-        $HTMLreport .= "<td bgcolor=#cccccc><a href=\"#$curSuite->{'Name'}\">$curSuite->{'Title'}</a></td>\n";
-      }
-      $HTMLreport .= "<td>$File{'SuiteList'}->[$var]->{'tcsPass'}</td>\n";
-      $HTMLreport .= "<td>$File{'SuiteList'}->[$var]->{'tcsFail'}</td>\n";
-      $HTMLreport .= "<td>$File{'SuiteList'}->[$var]->{'tcsTotal'}</td>\n";
-      $HTMLreport .= "<td>${@{$File{'SuiteList'}}[$var]}{'tcsDied'}</td>\n";
-
-      my $pctPass = $File{'SuiteList'}->[$var]->{'tcsPass'} / $File{'SuiteList'}->[$var]->{'tcsTotal'};
-      $pctPass = int($pctPass*10000)/100;
-	
-      $HTMLreport .= "<td>$pctPass</td>\n";
-
-      my $pctFail = $File{'SuiteList'}->[$var]->{'tcsFail'} / $File{'SuiteList'}->[$var]->{'tcsTotal'};
-      $pctFail = int($pctFail*10000)/100;
-	
-      $HTMLreport .= "<td>$pctFail</td>\n";
-      $HTMLreport .= "</tr>\n";
-    }
-
-    $HTMLreport .= <<END_PRINT; 
-<tr valign=top bgcolor=#FFFFCC>
-<td>Total:</td>
-<td>$File{'tcsPass'}</td>
-<td>$File{'tcsFail'}</td>
-<td>$File{'tcsTotal'}</td>
-<td>$File{'tcsDied'}</td>
-END_PRINT
-	my $pctPass = $File{'tcsPass'} / $File{'tcsTotal'};
-	$pctPass = int($pctPass*10000)/100;
-	my $pctFail = $File{'tcsFail'} / $File{'tcsTotal'};
-	$pctFail = int($pctFail*10000)/100;
-
-	$HTMLreport .= <<END_PRINT; 
-<td>$pctPass</td>
-<td>$pctFail</td>
-</tr>
-</table>
-END_PRINT
-
-    unless ($express) {
-    $HTMLreport .= <<END_PRINT;
-<h3>Failed Testcases:</h3>
-END_PRINT
-
-    my $curSuite;
-    for (my $var=0;$File{'SuiteList'}->[$var]->{'Name'};$var++) {
-      $curSuite = $File{'SuiteList'}->[$var];
-
-      $HTMLreport .= <<END_PRINT;
-	<hr>
-	<h2>
-	<a NAME="$curSuite->{'Name'}"></a><u><font color="#666600">$curSuite->{'Title'}</font></u></h2>
-	<b><u>Died:</u></b>
-	<table>
-END_PRINT
-
-      for (my $dcnt = 0;$curFile = $File{'SuiteList'}->[$var]->{'DiedList'}->[$dcnt];$dcnt++) {
-		($none,$fName) = split(/<->/,$curFile);
-		$HTMLreport .= "<tr><td style=\"color: red;\"><A href='$ngsuites$curSuite->{'Name'}/$fName' target=\"new\">$fName</A></td></tr>\n";
-      }
-
-      $HTMLreport .= "</table><BR>\n";
-      $HTMLreport .= "<b><u>Failures:</u></b><br>";
-      $HTMLreport .= "<table BORDER CELLSPACING=0><TR>\n";
-
-      for ($fcnt = 0;$curFile = $File{'SuiteList'}->[$var]->{'FailedList'}->[$fcnt];$fcnt++) {
-		($none,$fName,$fDesc,$fStat,$fBug,$fExpected,$fActual) = split(/<->/,$curFile);
-		$HTMLreport.= "<TR><TD><A href=\"$ngsuites$curSuite->{'Name'}/$fName\" target=\"_new\">$fName</A></TD><TD>";
-
-		# Quiet perl warnings about unused variables.
-		my $tmp; $tmp = $fStat; $tmp = $fActual; $tmp = $fExpected;
-
-		#
-		# TEMPRORAY DISABLED.
-		#
-		my @bugList = split(/[\s+]|,/,$fBug);
-		my $bug = "";
-		my $index = 0; 
-
-		while ($bugList[$index]) {
-          if ($bugList[$index] =~ /(\d+)$prjExtension/i) {
-            $bugList[$index] =~ s/(\d+)($prjExtension)/makelink($1,$extList{$2})/ige; 
-            $bug .= $bugList[$index];
-          }
- 
-          $index++;
-		}
-		$HTMLreport.= "$bug</TD><TD>$fDesc</TD></TR>\n";
-
-        #		 $fBug =~ s/(\d+)($prjExtension)/makelink($1,$extList{$2})/ige; 
-        #		 $HTMLreport.= "$fBug</TD><TD>$fDesc</TD></TR>\n";
-
-      }
-      $HTMLreport .= "</table>\n";
-    }
-	
-    $HTMLreport .= <<END_PRINT;
-	</BODY>
-	</HTML>
-END_PRINT
-  } # !express
-
-    1;
-  }
-
-sub makelink
-  {
-	$bugNum = $_[0];
-	$bugLnk = $_[1];
-
-	
-	$bugLnk =~ s/%/$bugNum/ig;
-	$bugLnk = "<A href=\"$bugLnk\">$bugNum</A>";
-
-	return $bugLnk;
-  }
-
-1;

mozilla/tools/tinderbox/report-http-status.pl

@@ -1,165 +0,0 @@
-#!/usr/bin/perl
-# -*- Mode: perl; indent-tabs-mode: nil -*-
-
-#
-# Graph tree-open status, via tbox graph server.
-#
-
-
-# Location of this file.  Make sure that hand-runs and crontab-runs
-# of this script read/write the same data.
-my $script_dir = "/builds/tinderbox/mozilla/tools/tinderbox";
-
-my $graph_server = "coffee";
-
-# Send data to graph server via HTTP.
-require "$script_dir/reportdata.pl";
-
-use Sys::Hostname;  # for ::hostname()
-
-sub PrintUsage {
-    die <<END_USAGE
-Usage:
-
-  $0 <ip or hostname>
-
-END_USAGE
-}
-
-
-# Return true if httpd server is up.
-sub is_http_alive() {
-  my $url = "http://$ARGV[0]";
-
-  my $rv = 0; # Assume false.
-
-  my $res = 
-    eval q{
-           use LWP::UserAgent;
-           use HTTP::Request;
-           my $ua  = LWP::UserAgent->new;
-           $ua->timeout(10); # seconds
-           
-           my $req = HTTP::Request->new(GET => $url);
-           my $res = $ua->request($req);
-           return $res;
-          };
-  if ($@) {
-    warn "GET Failed: $@";
-    #print "GET Failed.\n";
-  } else {
-    # Debug.
-    #print "GET Succeeded: \n";
-    #print "status:\n", $res->status_line, "\n";
-    #print "content:\n",  $res->content, "\n";
-    #print "GET Succeeded.\n";
-
-    # This will be non-zero if http get went through ok.
-    if($res->content) {
-      $rv = 1;  
-    } else {
-      $rv = 0;
-    }
-  }
-
-  return $rv;
-}
-
-
-
-# main
-{
-  my $alive_time = 0;  # Hours http has been up.
-  my $alive = 0;
-  my $timefile = "$script_dir/http_alive_timefiles/$ARGV[0]";
-
-
-  # make sure directory exists
-  unless (-d $timefile) {
-    mkdir "$script_dir/http_alive_timefiles";
-  }
-
-  PrintUsage() if $#ARGV == -1;
-
-  $alive = is_http_alive();
-  
-  if ($alive) {
-    print "$ARGV[0] is alive\n";
-
-    #
-    # Record alive time.
-    #
-
-    # Was zero before, report zero here, write out the
-    # time for next cycle.
-    if (not (-e "$timefile")) {
-      print "no timefile found.\n";
-      open TIMEFILE, ">$timefile";
-      print TIMEFILE time();
-      close TIMEFILE;
-    } else {
-      # Timefile found, compute difference and report that number.
-      print "found timefile: $timefile!\n";     
-    
-      my $time_http_started = 0;
-      my $now = 0;
-  
-      open TIMEFILE, "$timefile";
-      while (<TIMEFILE>) {
-        chomp;
-        $time_http_started = $_;
-      }
-      close TIMEFILE;
-      print "time_http_started = $time_http_started\n";
-      
-      $now = time();
-      print "now = $now\n";
-
-      # Report time in hours.
-      $alive_time = ($now - $time_http_started)/3600;
-      print "alive_time (hours) = $alive_time\n";
-
-      # Clamp time to 20 hours so we don't get huge spikes for
-      # extended open times (weekends)
-      if ($alive_time > 20.0) {
-        $alive_time = 20.0;
-      }
-      
-    }
-    
-  } else {
-    print "$ARGV[0] is not responding.\n";
-
-    # Delete timefile if there is one.
-    if (-e "$timefile") {
-      unlink("$timefile");
-    }
-  }
-
-  # Shorten some machine names.
-  my $short_name = "$ARGV[0]";
-  $short_name =~ s/.websys.aol.com//g;
-
-  ReportData::send_results_to_server($graph_server,
-                                     "$alive_time",
-                                     ::hostname(),
-                                     "http_alive", 
-                                     "$ARGV[0]");
-
-  my $status = "";
-  if($alive) {
-    $status = "success";
-  } else {
-    $status = "busted";
-  }
-
-  # Hard-coded for now.
-  my $graph_url = "http://$graph_server/graph/query.cgi?tbox=$ARGV[0]&testname=http_alive&autoscale=&size=&days=7&units=hours&ltype=&points=&avg=&showpoint=";
-
-  ReportData::send_tbox_packet("tinderbox-daemon\@warp.mcom.com",
-                               "Talkback",
-                               $status,
-                               "TinderboxPrint:<a title=\"Hours httpd:80 has been alive.\" href=\"$graph_url\">Ta</a>",
-                               "$ARGV[0]",
-                               "$short_name HTTP Alive Test");
-}

mozilla/tools/tinderbox/report-tree-status.pl

@@ -1,160 +0,0 @@
-#!/usr/bin/perl
-# -*- Mode: perl; indent-tabs-mode: nil -*-
-
-#
-# Graph tree-open status, via tbox graph server.
-#
-
-# Location of this file.  Make sure that hand-runs and crontab-runs
-# of this script read/write the same data.
-my $script_dir = "/builds/tinderbox/mozilla/tools/tinderbox";  
-
-# Send data to graph server via HTTP.
-require "$script_dir/reportdata.pl";
-
-use Sys::Hostname;  # for ::hostname()
-
-my $sheriff_string;
-
-sub is_tree_open {
-  my $tbox_url = "http://tinderbox.mozilla.org/showbuilds.cgi?tree=SeaMonkey";
-
-  # Dump tbox page source into a file.
-  print "HTTP...";
-  system ("wget", "-q", "-O", "$script_dir/tbox.source", $tbox_url);
-  print "done\n";
-
-  my $rv = 0;
-
-  $sheriff_string = "";
-
-  # Scan file, looking for line that starts with <a NAME="open">
-  open TBOX_FILE, "$script_dir/tbox.source";
-  while (<TBOX_FILE>) {
-    # Scan for open string
-    if(/^<a NAME="open">/) {
-      # look for "open" string
-      if (/open<\/font>$/) {
-        print "open\n";
-        $rv = 1;
-      } else {
-        print "closed\n";
-        $rv = 0;
-      }
-    }
-
-    # Scan for sheriff string & save it off for HTTP submit later.
-    if(/^<br><a NAME="sheriff"><\/a>/) {
-      chomp;
-      $sheriff_string = $_;
-
-      # Strip out content to save space.
-
-      # Strip out permanent content.
-      $sheriff_string =~ s/^<br><a NAME="sheriff"><\/a>//;
-      
-      # Crude attempt at reducing the random html that shows up here.
-      # Order is important, pick off easy tags, then make it legal cgi,
-      # then shorten it up.
-      $sheriff_string =~ s/<[pP]>//g;
-      $sheriff_string =~ s/\015//g;   # ^M
-      $sheriff_string =~ s/<br>//g;
-      $sheriff_string =~ s/<\/a>//g;
-      $sheriff_string =~ s/<//g;
-      $sheriff_string =~ s/>//g;
-      $sheriff_string =~ s/"/ /g;
-      $sheriff_string =~ s/\///g;
-      $sheriff_string =~ s/\\//g;
-      $sheriff_string =~ s/#/[lb]/g;
-      $sheriff_string =~ s/mailto://g;
-      $sheriff_string =~ s/[aA][iI][mM]://g;
-      $sheriff_string =~ s/[iI][rR][cC]://g;
-      $sheriff_string =~ s/a href//g;
-      $sheriff_string =~ s/[sS]heriff//g;
-      $sheriff_string =~ s/[mM]onday//g;
-      $sheriff_string =~ s/[tT]uesday//g;
-      $sheriff_string =~ s/[wW]ednesday//g;
-      $sheriff_string =~ s/[tT]hursday//g;
-      $sheriff_string =~ s/[fF]riday//g;
-      $sheriff_string =~ s/[wW]eekend//g;
-      $sheriff_string =~ s/^[tT]he //g;
-      $sheriff_string =~ s/\/a//g;
-      $sheriff_string =~ s/netscape.com/nscp/g;
-      $sheriff_string =~ s/mozilla.org/moz/g;
-      $sheriff_string =~ s/ is / /g;
-      $sheriff_string =~ s/ for / /g;
-      $sheriff_string =~ s/ on / /g;
-      $sheriff_string =~ s/ in / /g;
-      $sheriff_string =~ s/ = / /g;
-      $sheriff_string =~ s/ - / /g;
-
-      $sheriff_string = substr($sheriff_string,0,60);
-      print "sheriff string = $sheriff_string\n";
-    }
-  }
-  close TBOX_FILE;
-
-  # Clean up.
-  unlink("$script_dir/tbox.source");
-
-  return $rv;
-}
-
-
-# main
-{
-  my $time_since_open = 0;
-  my $timefile = "$script_dir/treeopen_timefile";
-
-  # Get tree status.
-  if(is_tree_open()) {
-
-    # Record tree open time if not set.
-    if (not (-e "$timefile")) {
-      open TIMEFILE, ">$timefile";
-      print TIMEFILE time();
-      close TIMEFILE;
-    } else {
-      # Timefile found, compute difference and report that number.
-      print "found timefile: $timefile!\n";     
-      
-      my $time_tree_opened = 0;
-      my $now = 0;
-  
-      open TIMEFILE, "$timefile";
-      while (<TIMEFILE>) {
-        chomp;
-        $time_tree_opened = $_;
-      }
-      close TIMEFILE;
-      print "time_tree_opened = $time_tree_opened\n";
-      
-      $now = time();
-      print "now = $now\n";
-
-      # Report time in hours.
-      $time_since_open = ($now - $time_tree_opened)/3600;
-      print "time_since_open (hours) = $time_since_open\n";
-
-      # Clamp time to 20 hours so we don't get huge spikes for
-      # extended open times (weekends)
-      if($time_since_open > 20.0) {
-        $time_since_open = 20.0;
-      }
-      
-    }
-    
-  } else {
-    # tree is closed, leave tree_open_time at zero.
-
-    # Delete timefile if there is one.
-    if (-e "$timefile") {
-      unlink("$timefile");
-    }
-  }
-
-  ReportData::send_results_to_server("tegu.mozilla.org", 
-                                     "$time_since_open",
-                                     "$sheriff_string",
-                                     "treeopen", ::hostname());
-}

mozilla/tools/tinderbox/reportdata.pl

@@ -1,84 +0,0 @@
-#!/usr/bin/perl
-# -*- Mode: perl; indent-tabs-mode: nil -*-
-
-
-#
-# Utils used by tests to send data to graph server, or tinderbox.
-#
-
-require 5.003;
-
-use strict;
-
-$::Version = '$Revision: 1.3 $ ';
-
-package ReportData;
-
-# Send data to graph cgi via HTTP.
-sub send_results_to_server {
-    my ($server, $value, $data, $testname, $tbox) = @_;
-
-    my $tmpurl = "http://$server/graph/collect.cgi";
-    $tmpurl .= "?value=$value&data=$data&testname=$testname&tbox=$tbox";
-
-    print "send_results_to_server(): \n";
-    print "tmpurl = $tmpurl\n";
-
-    # libwww-perl has process control problems on windows,
-    # spawn wget instead.
-    if ($Settings::OS =~ /^WIN/) {
-        system ("wget", "-o", "/dev/null", $tmpurl);
-        print "send_results_to_server() succeeded.\n";
-    } else {
-        my $res = eval q{
-            use LWP::UserAgent;
-            use HTTP::Request;
-            my $ua  = LWP::UserAgent->new;
-            $ua->timeout(10); # seconds
-            my $req = HTTP::Request->new(GET => $tmpurl);
-            my $res = $ua->request($req);
-            return $res;
-        };
-        if ($@) {
-            warn "Failed to submit startup results: $@";
-            print "send_results_to_server() failed.\n";
-        } else {
-            print "Results submitted to server: \n",
-            $res->status_line, "\n", $res->content, "\n";
-            print "send_results_to_server() succeeded.\n";
-        }
-    }
-}
-
-# Fake a tinderbox message.
-sub send_tbox_packet {
-  my ($server_email, $tree, $status,
-      $log, $machine, $build_name) = @_;
-
-  my $foo;
-
-  my $now = time();
-
-  $foo .= <<END_PRINT;
-tinderbox: tree: $tree
-tinderbox: builddate: $now
-tinderbox: status: $status
-tinderbox: build: $build_name
-tinderbox: errorparser: unix
-tinderbox: buildfamily: unix
-tinderbox: END
-END_PRINT
-
-$foo .= $log;
-
-  print "foo = \n$foo\n";
-
-  open MSG, ">msg.$machine";
-  print MSG $foo;
-  close MSG;
-
-  system "/bin/mail  $server_email " . "< msg.$machine";
-
-
-  unlink "msg.$machine";
-}

mozilla/tools/tinderbox/tinder-defaults.pl

@@ -1,170 +0,0 @@
-#- PLEASE FILL THIS IN WITH YOUR PROPER EMAIL ADDRESS
-#$BuildAdministrator = "$ENV{USER}\@$ENV{HOST}";
-$BuildAdministrator = ($ENV{USER} || "cltbld") . "\@" . ($ENV{HOST} || "dhcp");
-
-#- You'll need to change these to suit your machine's needs
-$DisplayServer = ':0.0';
-
-#- Default values of command-line opts
-#-
-$BuildDepend       = 1;      # Depend or Clobber
-$BuildDebug        = 0;      # Debug or Opt (Darwin)
-$ReportStatus      = 1;      # Send results to server, or not
-$ReportFinalStatus = 1;      # Finer control over $ReportStatus.
-$UseTimeStamp      = 1;      # Use the CVS 'pull-by-timestamp' option, or not
-$BuildOnce         = 0;      # Build once, don't send results to server
-$TestOnly          = 0;      # Only run tests, don't pull/build
-$BuildEmbed        = 0;      # After building seamonkey, go build embed app.
-$SkipMozilla       = 0;      # Use to debug post-mozilla.pl scripts.
-
-# Tests
-$CleanProfile             = 0;
-$ResetHomeDirForTests     = 1;
-$ProductName              = "Mozilla";
-
-$RunMozillaTests          = 1;  # Allow turning off of all tests if needed.
-$RegxpcomTest             = 1;
-$AliveTest                = 1;
-$JavaTest                 = 0;
-$ViewerTest               = 0;
-$BloatTest                = 0;  # warren memory bloat test
-$BloatTest2               = 0;  # dbaron memory bloat test, require tracemalloc
-$DomToTextConversionTest  = 0;  
-$XpcomGlueTest            = 0;
-$CodesizeTest             = 0;  # Z,  require mozilla/tools/codesighs
-$EmbedCodesizeTest        = 0;  # mZ, require mozilla/tools/codesigns
-$MailBloatTest            = 0;
-$EmbedTest                = 0;  # Assumes you wanted $BuildEmbed=1
-$LayoutPerformanceTest    = 0;  # Tp
-$QATest                   = 0;  
-$XULWindowOpenTest        = 0;  # Txul
-$StartupPerformanceTest   = 0;  # Ts
-
-# Release Build options
-# requires an appropriate post-mozilla.pl
-$ReleaseBuild             = 0;  # Make a release build?
-$package_creation_path    = "mozilla/xpinstall/packager";
-$package_location         = "mozilla/dist/install";  
-$ftp_path = "/home/ftp/pub/mozilla/tinderbox-builds";
-$url_path = "http://ftp.mozilla.org/pub/mozilla.org/mozilla/tinderbox-builds";
-$build_hour               = "8";
-$ssh_server               = "stage.mozilla.org";
-$ssh_user                 = "cltbld";
-
-# end Release Build options
-
-$TestsPhoneHome           = 0;  # Should test report back to server?
-$results_server           = "axolotl.mozilla.org"; # was tegu
-$pageload_server          = "spider";  # localhost
-
-#
-# Timeouts, values are in seconds.
-#
-
-$CreateProfileTimeout             = 45;
-$RegxpcomTestTimeout              = 15;
-
-$AliveTestTimeout                 = 45;
-$ViewerTestTimeout                = 45;
-$EmbedTestTimeout                 = 45;
-$BloatTestTimeout                 = 120;   # seconds
-$MailBloatTestTimeout             = 120;   # seconds
-$JavaTestTimeout                  = 45;
-$DomTestTimeout	                  = 45;    # seconds
-$XpcomGlueTestTimeout             = 15;
-$CodesizeTestTimeout              = 900;     # seconds
-$CodesizeTestType                 = "auto";  # {"auto"|"base"}
-$LayoutPerformanceTestTimeout     = 1200;  # entire test, seconds
-$QATestTimeout                    = 1200;   # entire test, seconds
-$LayoutPerformanceTestPageTimeout = 30000; # each page, ms
-$StartupPerformanceTestTimeout    = 60;    # seconds
-$XULWindowOpenTestTimeout	      = 150;   # seconds
-
-
-$MozConfigFileName = 'mozconfig';
-
-$UseMozillaProfile = 1;
-$MozProfileName = 'default';
-
-#- Set these to what makes sense for your system
-$Make          = 'gmake';       # Must be GNU make
-$MakeOverrides = '';
-$mail          = '/bin/mail';
-$CVS           = 'cvs -q';
-$CVSCO         = 'checkout -P';
-
-# win32 usually doesn't have /bin/mail
-$blat           = 'c:/nstools/bin/blat';
-$use_blat       = 0;
-
-# Set moz_cvsroot to something like:
-# :pserver:$ENV{USER}%netscape.com\@cvs.mozilla.org:/cvsroot
-# :pserver:anonymous\@cvs-mirror.mozilla.org:/cvsroot
-#
-# Note that win32 may not need \@, depends on ' or ".
-# :pserver:$ENV{USER}%netscape.com@cvs.mozilla.org:/cvsroot
-
-$moz_cvsroot   = $ENV{CVSROOT};
-
-#- Set these proper values for your tinderbox server
-$Tinderbox_server = 'tinderbox-daemon@tinderbox.mozilla.org';
-
-# Allow for non-client builds, e.g. camino.
-$moz_client_mk = 'client.mk';
-
-# Allow for non-client builds, e.g. camino.
-$moz_client_mk = 'client.mk';
-
-#- Set if you want to build in a separate object tree
-$ObjDir = '';
-
-# Extra build name, if needed.
-$BuildNameExtra = '';
-
-# User comment, eg. ip address for dhcp builds.
-# ex: $UserComment = "ip = 208.12.36.108";
-$UserComment = 0;
-
-#-
-#- The rest should not need to be changed
-#-
-
-#- Minimum wait period from start of build to start of next build in minutes.
-$BuildSleep = 10;
-
-#- Until you get the script working. When it works,
-#- change to the tree you're actually building
-$BuildTree  = 'MozillaTest';
-
-$BuildName = '';
-$BuildTag = '';
-$BuildConfigDir = 'mozilla/config';
-$Topsrcdir = 'mozilla';
-
-$BinaryName = 'mozilla-bin';
-
-#
-# For embedding app, use:
-$EmbedBinaryName = 'TestGtkEmbed';
-$EmbedDistDir    = 'dist/bin'
-
-
-$ShellOverride = ''; # Only used if the default shell is too stupid
-$ConfigureArgs = '';
-$ConfigureEnvArgs = '';
-$Compiler = 'gcc';
-$NSPRArgs = '';
-$ShellOverride = '';
-
-# allow override of timezone value (for win32 POSIX::strftime)
-$Timezone = '';
-
-# Reboot the OS at the end of build-and-test cycle. This is primarily
-# intended for Win9x, which can't last more than a few cycles before
-# locking up (and testing would be suspect even after a couple of cycles).
-# Right now, there is only code to force the reboot for Win9x, so even
-# setting this to 1, will not have an effect on other platforms. Setting
-# up win9x to automatically logon and begin running tinderbox is left 
-# as an exercise to the reader. 
-$RebootSystem = 0;
-

mozilla/tools/tinderbox/tinderbox

@@ -1,118 +0,0 @@
-#!/bin/sh
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-#
-# 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.
-#
-# The Initial Developer of the Original Code is Chris McAfee.
-# Portions created by Chris McAfee are
-# Copyright (C) The Mozilla Organization.
-# All Rights Reserved.
-#
-# Contributor(s): Chris McAfee <mcafee@netscape.com>
-#
-
-#
-# Tinderbox control script.
-#
-# Assumes that at most two tinderboxes are running
-# simultaneously, depend and clobber.
-#
-# Assumes that if mozconfig exists, use it. Format:
-#   mk_add_options MOZ_MAKE_FLAGS=j8
-#   ac_add_options --disable-debug
-#   ac_add_options --enable-optimize
-#
-
-
-tinderbox_usage() {
-  echo "Usage: tinderbox [depend|clobber|multi] {start|stop|status|restart}"
-  exit 1
-}
-
-if [ $# != 2 ]; then
-  echo "Wrong number of arguments."
-  tinderbox_usage
-fi
-
-build_type="$1"
-build_action="$2"
-
-# Depend or clobber build?
-if [ "$build_type" != "depend" -a \
-     "$build_type" != "clobber" -a \
-     "$build_type" != "multi" ]; then
-    echo "Unknown option: $1"
-    tinderbox_usage
-fi
-
-# See how we were called.
-case "$build_action" in
-  start)
-    if test -f $build_type.pid; then
-      echo "$build_type build already running with PID "`cat $build_type.pid`
-    else
-      echo "Starting $build_type tinderbox..."
-
-	  # Say if we found post-mozilla.pl
-	  if test -f post-mozilla.pl; then
-	    echo "Found post-mozilla.pl"
-	  fi
-
-	  # Grab and use mozconfig if it exists.
-      if test "$build_type" = "multi"; then
-        nohup ./multi-tinderbox.pl &
-      elif test -f mozconfig; then
-        echo "Found mozconfig..."
-        nohup ./build-seamonkey.pl --$build_type --mozconfig mozconfig &
-      elif test -f .mozconfig; then
-        echo "Found .mozconfig..."
-        nohup ./build-seamonkey.pl --$build_type --mozconfig .mozconfig &
-      else
-        nohup ./build-seamonkey.pl --$build_type &
-      fi
-	  # Write out PID so we can shut things down later.
-	  # This needs to be right after the ./build-seamonkey.pl call to
-	  # get the right PID.
-      echo "PID $!"
-      echo $! > $build_type.pid
-	  \rm -f nohup.out
-    fi
-    ;;
-  stop)
-    if test -f $build_type.pid; then
-      pid=`cat $build_type.pid`
-      echo "Shutting down $build_type tinderbox, PID = $pid"
-      kill $pid
-      \rm $build_type.pid
-    else
-      echo "$build_type is not running."
-    fi
-    echo
-    ;;
-  status)
-    if test -f $build_type.pid; then
-      echo "$build_type build is running with PID of "`cat $build_type.pid`
-    else
-      echo "$build_type build is not running."
-    fi
-    ;;
-  restart)
-    echo "Restarting $build_type tinderbox:"
-    $0 $build_type stop
-    $0 $build_type start
-    ;;
-  *)
-    tinderbox_usage
-    exit 1
-esac
-
-exit 0