Removed mapi dependency from xpfe/bootstarp

Checking in for kkhandrika@netscape.com


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

mozilla/mailnews/mapi/makefile.win

@@ -0,0 +1,28 @@
+# 
+# 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>
+# 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,335 @@
+/* ***** 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 <assert.h>
+#include <mapidefs.h>
+#include <mapi.h>
+#include "msgMapi.h"
+#include "msgMapiMain.h"
+
+#define MAX_RECIPS  100
+#define MAX_FILES   100
+
+const CLSID CLSID_nsMapiImp = {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(NULL);
+
+    hRes = ::CoCreateInstance(CLSID_nsMapiImp, 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 ;
+
+    hr = pNsMapi->SendMail (lhSession, lpMessage, 
+                            (short) lpMessage->nRecipCount, lpRecips,
+                            (short) lpMessage->nFileCount, lpFiles,
+                            flFlags, ulReserved);
+
+    if (bTempSession)
+        MAPILogoff (lhSession, ulUIParam, 0,0) ;
+
+    // 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)
+        return SUCCESS_SUCCESS;
+    
+    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;
+
+    hr = pNsMapi->SendDocuments(lhSession, (LPTSTR) lpszDelimChar, (LPTSTR) lpszFilePaths, 
+                                    (LPTSTR) lpszFileNames, ulReserved) ;
+
+    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,61 @@
+# ***** 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
+
+WIN_LIBS= ole32.lib
+
+include <$(DEPTH)\config\rules.mak>
+

mozilla/mailnews/mapi/mapihook/makefile.win

@@ -0,0 +1,26 @@
+#!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):  kkhandrika@netscape.com
+
+DEPTH=..\..\..
+
+DIRS= build public src
+
+include <$(DEPTH)\config\rules.mak>

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):
+ * 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 "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/nsMapiSupport.cpp

@@ -0,0 +1,174 @@
+/* ***** 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 "nsMapiSupport.h"
+#include "nsISupports.h"
+#include "nsMapiRegistry.h"
+#include "nsIGenericFactory.h"
+#include "nsIObserverService.h"
+#include "nsIAppStartupNotifier.h"
+#include "nsIServiceManager.h"
+#include "nsIComponentManager.h"
+#include "nsICategoryManager.h"
+
+const CLSID CLSID_nsMapiImp = {0x29f458be, 0x8866, 0x11d5, \
+                              {0xa3, 0xdd, 0x0, 0xb0, 0xd0, 0xf3, 0xba, 0xa7}};
+
+/** 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)
+{
+    if (!nsCRT::strcmp(aTopic, "profile-after-change"))
+        return InitializeMAPISupport();
+
+    if (!nsCRT::strcmp(aTopic, NS_XPCOM_SHUTDOWN_OBSERVER_ID))
+        return ShutdownMAPISupport();
+
+    nsresult 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);
+           
+    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 nsMapiFactory();
+
+        if (m_nsMapiFactory != nsnull)
+        {
+            HRESULT hr = ::CoRegisterClassObject(CLSID_nsMapiImp, \
+                                                 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/nsMapiSupport.h

@@ -0,0 +1,67 @@
+/* ***** 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 NS_MAPI_SUPPORT_H_
+#define NS_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;
+        nsMapiFactory *m_nsMapiFactory;
+};
+
+#endif  // NS_MAPI_SUPPORT_H_

mozilla/mailnews/mapi/old/hook/makefile.win

@@ -0,0 +1,64 @@
+# 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): 
+#
+
+DEPTH=..\..\..
+MODULE=mapiguts
+
+################################################################################
+## exports
+
+#EXPORTS =
+
+
+################################################################################
+## library
+
+LIBNAME = .\$(OBJDIR)\mapiguts
+
+!ifdef MOZ_STATIC_COMPONENT_LIBS
+LIB = $(LIBNAME).lib
+!else
+DLL = $(LIBNAME).dll
+!endif
+
+DEFINES= -NS_DEBUG
+
+OBJS=										\
+    .\$(OBJDIR)\mapihook.obj  \
+    .\$(OBJDIR)\mapimail.obj  \
+		$(NULL)
+
+LLIBS=										\
+			$(LLIBS)						\
+			$(LIBNSPR)						\
+			$(DIST)\lib\xppref32.lib		\
+			$(DIST)\lib\xpcom.lib       	\
+			$(DIST)\lib\mapiutils_s.lib  \
+			$(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+!ifdef MOZ_STATIC_COMPONENT_LIBS
+install:: $(LIb)
+	$(MAKE_INSTALL)  $(LIBNAME).$(LIB_SUFFIX) $(DIST)\bin\components
+!else
+install:: $(DLL)
+	$(MAKE_INSTALL)  $(LIBNAME).$(DLL_SUFFIX) $(DIST)\bin\components
+!endif

mozilla/mailnews/mapi/old/hook/mapihook.h

@@ -0,0 +1,48 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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 the Initial Developer are Copyright (C) 1998
+ * 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 NPL, 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 NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+#ifndef _MAPI_HOOK_H_
+#define _MAPI_HOOK_H_
+
+#include <structs.h>    // for MWContext
+
+//
+// This is the entry point to the MAPI session manager that lives
+// inside of Communicator.
+// 
+LONG ProcessNetscapeMAPIHook(WPARAM wParam, LPARAM lParam);
+
+#endif // _MAPI_HOOK_H_

mozilla/mailnews/mapi/old/hook/mapimail.cpp

@@ -0,0 +1,853 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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 the Initial Developer are Copyright (C) 1998
+ * 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 NPL, 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 NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+//
+//  More MAPI Hooks for Communicator
+//  Written by: Rich Pizzarro (rhp@netscape.com)
+//  November 1997
+//
+#include "windows.h"
+#include "template.h"
+#include "msgcom.h"
+#include "wfemsg.h"
+#include "compstd.h"
+#include "compbar.h"
+#include "compmisc.h"
+#include "compfrm.h"
+#include "prefapi.h"
+#include "intl_csi.h"
+#include "dlghtmrp.h"
+#include "dlghtmmq.h"
+
+// rhp - was breaking the optimized build!
+//#include "edt.h"
+//#include "edview.h"
+//#include "postal.h"
+//#include "apiaddr.h"
+//#include "mailmisc.h"
+
+extern "C" {
+#include "xpgetstr.h"
+extern int MK_MSG_MSG_COMPOSITION;
+};
+
+#include "mapimail.h"
+#include "nscpmapi.h"
+#include "mailpriv.h"
+#include "nsstrseq.h"
+
+MWContext             
+*GetUsableContext(void)
+{
+  CGenericFrame     *pFrame = (CGenericFrame * )FEU_GetLastActiveFrame();
+
+  ASSERT(pFrame != NULL);
+  if (pFrame == NULL)
+  {
+    return(NULL);
+  }
+
+  // Now return the context...
+  return((MWContext *) pFrame->GetMainContext());
+}
+
+//
+// This function will create a composition window and either do
+// a blind send or pop up the compose window for the user to 
+// complete the operation
+//
+// Return: appropriate MAPI return code...
+//
+// 
+extern "C" LONG
+DoFullMAPIMailOperation(MAPISendMailType      *sendMailPtr,
+											  const char            *pInitialText,
+                        BOOL                  winShowFlag)
+{   
+CGenericDoc             *pDocument;
+LPSTR                   subject;
+NSstringSeq             mailInfoSeq;
+DWORD                   stringCount = 6;
+DWORD                   i;
+CString                 csDefault;
+
+  // Get a context to use for this call...
+  MWContext *pOldContext = GetUsableContext();
+  if (!pOldContext)
+  {
+    return(MAPI_E_FAILURE);
+  }
+
+  // Don't allow a compose window to be created if the user hasn't 
+  // specified an email address
+  const char *real_addr = FE_UsersMailAddress();
+  if (MISC_ValidateReturnAddress(pOldContext, real_addr) < 0)
+  {
+    return(MAPI_E_FAILURE);
+  }
+
+  //
+  // Now, we must build the fields object...
+  //
+  mailInfoSeq = (NSstringSeq) &(sendMailPtr->dataBuf[0]);
+  subject = NSStrSeqGet(mailInfoSeq, 0);
+
+  // We should give it a subject to preven the prompt from coming
+  // up...
+  if ((!subject) || !(*subject))
+  {
+    csDefault.LoadString(IDS_COMPOSE_DEFAULTNOSUBJECT);
+    subject = csDefault.GetBuffer(2);
+  }
+
+  TRACE("MAPI: ProcessMAPISendMail() Subject   = [%s]\n", subject);
+  TRACE("MAPI: ProcessMAPISendMail() Text Size = [%d]\n", strlen((const char *)pInitialText));
+  TRACE("MAPI: ProcessMAPISendMail() # of Recipients  = [%d]\n", sendMailPtr->MSG_nRecipCount);
+
+
+  char  toString[1024] = "";
+  char  ccString[1024] = "";
+  char  bccString[1024] = "";
+
+  for (i=0; i<sendMailPtr->MSG_nRecipCount; i++)
+  {
+    LPSTR   ptr;
+    UCHAR   tempString[256];
+
+    ULONG addrType = atoi(NSStrSeqGet(mailInfoSeq, stringCount++));
+
+    // figure which type of address this is?
+    if (addrType == MAPI_CC)
+      ptr = ccString;
+    else if (addrType == MAPI_BCC)
+      ptr = bccString;
+    else
+      ptr = toString;
+      
+    LPSTR namePtr = (LPSTR) NSStrSeqGet(mailInfoSeq, stringCount++);
+    LPSTR emailPtr = (LPSTR) NSStrSeqGet(mailInfoSeq, stringCount++);
+    if ( (lstrlen(emailPtr) > 5) && (*(emailPtr + 4) == ':') )
+    {
+      emailPtr += 5;
+    }
+
+    // Now build the temp string to tack on in the format
+    // "Rich Pizzarro" <rhp@netscape.com>
+    wsprintf((LPSTR) tempString, "\"%s\" <%s>", namePtr, emailPtr);
+
+    // add a comma if not the first one
+    if (ptr[0] != '\0')
+      lstrcat(ptr, ",");
+
+    // tack on string!
+    lstrcat(ptr, (LPSTR) tempString);
+  }
+
+  BOOL    bEncrypt = FALSE;
+  BOOL    bSign    = FALSE;
+
+  PREF_GetBoolPref("mail.crypto_sign_outgoing_mail", &bSign);
+  PREF_GetBoolPref("mail.encrypt_outgoing_mail", &bEncrypt);
+  MSG_CompositionFields *fields =
+      MSG_CreateCompositionFields(real_addr, real_addr, 
+                  toString, 
+                  ccString, 
+                  bccString,
+									"", "", "",
+									"", subject, "",
+									"", "", "",
+									"", 
+                  bEncrypt,
+                  bSign);
+  if (!fields)
+  {
+    return(MAPI_E_FAILURE);
+  }
+
+  // RICHIE
+  // INTL_CharSetInfo csi = LO_GetDocumentCharacterSetInfo(pOldContext);
+  // int16 win_csid = INTL_GetCSIWinCSID(csi);
+  
+  pDocument = (CGenericDoc*)theApp.m_TextComposeTemplate->OpenDocumentFile(NULL, NULL, /*win_csid RICHIE*/ winShowFlag);
+  if ( !pDocument )
+  {
+    return(MAPI_E_FAILURE);
+  }
+  
+  CWinCX * pContext = (CWinCX*) pDocument->GetContext();
+  if ( !pContext ) 
+  {
+    return(MAPI_E_FAILURE);
+  }
+
+  MSG_CompositionPaneCallbacks Callbacks;
+  Callbacks.CreateRecipientsDialog = CreateRecipientsDialog;
+  Callbacks.CreateAskHTMLDialog = CreateAskHTMLDialog;
+
+  int16 doccsid;
+  MWContext *context = pContext->GetContext();
+  CComposeFrame *pCompose = (CComposeFrame *) pContext->GetFrame()->GetFrameWnd();
+
+  pCompose->SetComposeStuff(context, fields); // squirl away stuff for post-create
+
+  // This needs to be set TRUE if using the old non-HTML text frame
+  // to prevent dropping dragged URLs
+  pContext->m_bDragging = !pCompose->UseHtml();
+  if (!pCompose->UseHtml()) 
+  {
+    pCompose->SetMsgPane(
+      MSG_CreateCompositionPane(pContext->GetContext(), 
+                                context, 
+                                g_MsgPrefs.m_pMsgPrefs, 
+                                fields,
+                                WFE_MSGGetMaster())
+                        );
+  }
+
+  ASSERT(pCompose->GetMsgPane());
+  MSG_SetFEData(pCompose->GetMsgPane(),(void *)pCompose);  
+  pCompose->UpdateAttachmentInfo();
+
+  // Pass doccsid info to new context for MailToWin conversion
+  doccsid = INTL_GetCSIDocCSID(LO_GetDocumentCharacterSetInfo(context));
+  INTL_SetCSIDocCSID(LO_GetDocumentCharacterSetInfo(context), 
+    (doccsid ? doccsid : INTL_DefaultDocCharSetID(context)));
+
+  pCompose->DisplayHeaders(NULL);
+
+  CComposeBar * pBar = pCompose->GetComposeBar();
+  ASSERT(pBar);
+  LPADDRESSCONTROL pIAddressList = pBar->GetAddressWidgetInterface();
+
+  if (!pIAddressList->IsCreated()) 
+  {
+    pBar->CreateAddressingBlock();
+  }
+
+  // rhp - Deal with addressing the brute force way! This is a 
+  // "fix" for bad behavior when creating these windows and not
+  // showing them on the desktop.
+  if (!winShowFlag)      // Hack to fix the window not being mapped
+  {
+    pCompose->AppendAddress(MSG_TO_HEADER_MASK, "");
+    pCompose->AppendAddress(MSG_CC_HEADER_MASK, "");
+    pCompose->AppendAddress(MSG_BCC_HEADER_MASK, "");
+  }
+
+  // Always do plain text composition!
+  pCompose->CompleteComposeInitialization();
+
+  // Do this so we don't get popups on "empty" messages
+  if ( (!pInitialText) || (!(*pInitialText)) )
+    pInitialText = " ";
+
+  const char * pBody = pInitialText ? pInitialText : MSG_GetCompBody(pCompose->GetMsgPane());
+  if (pBody)
+  {
+    FE_InsertMessageCompositionText(context,pBody,TRUE);
+  }
+
+  // 
+  // Now set the message as being edited!    
+  //
+  pCompose->SetModified(TRUE);
+
+  //
+  // Finally deal with the attachments...
+  //
+  if (sendMailPtr->MSG_nFileCount > 0)
+  {
+    // Send this puppy when done with the attachments...
+    if (!winShowFlag)
+    {
+      pCompose->SetMAPISendMode(MAPI_SEND);
+    }
+
+    MSG_AttachmentData *pAttach = (MSG_AttachmentData *)
+                  XP_CALLOC((sendMailPtr->MSG_nFileCount + 1),
+                  sizeof(MSG_AttachmentData));
+    if (!pAttach)
+    {
+      return(MAPI_E_INSUFFICIENT_MEMORY);
+    }
+
+    memset(pAttach, 0, (sendMailPtr->MSG_nFileCount + 1) * 
+                                sizeof(MSG_AttachmentData));
+    for (i=0; i<sendMailPtr->MSG_nFileCount; i++)
+    {
+      CString cs;
+      // Create URL from filename...
+      WFE_ConvertFile2Url(cs, 
+          (const char *)NSStrSeqGet(mailInfoSeq, stringCount++));
+      pAttach[i].url = XP_STRDUP(cs);
+
+      // Now also include the "display" name...
+      StrAllocCopy(pAttach[i].real_name, NSStrSeqGet(mailInfoSeq, stringCount++));
+    }
+
+    // Set the list!
+    MSG_SetAttachmentList(pCompose->GetMsgPane(), pAttach);
+
+    // Now free everything...
+    for (i=0; i<sendMailPtr->MSG_nFileCount; i++)
+    {
+      if (pAttach[i].url)
+        XP_FREE(pAttach[i].url);
+
+      if (pAttach[i].real_name)
+        XP_FREE(pAttach[i].real_name);
+    }
+
+    XP_FREE(pAttach);
+  }
+
+  //
+  // Now, if we were supposed to do the blind send...do it, otherwise,
+  // just popup the window...
+  //
+  if (winShowFlag)      
+  {
+    // Post message to compose window to set the initial focus.
+    pCompose->PostMessage(WM_COMP_SET_INITIAL_FOCUS);
+  }
+  else if (sendMailPtr->MSG_nFileCount <= 0)  // Send NOW if no attachments!
+  {
+    pCompose->PostMessage(WM_COMMAND, IDM_SEND);
+  }
+
+  return(SUCCESS_SUCCESS);
+}
+
+//
+// This function will create a composition window and just attach
+// the attachments of interest and pop up the window...
+//
+// Return: appropriate MAPI return code...
+//
+//
+extern "C" LONG
+DoPartialMAPIMailOperation(MAPISendDocumentsType *sendDocPtr)
+{   
+CGenericDoc             *pDocument;
+
+  // Get a context to use for this call...
+  MWContext *pOldContext = GetUsableContext();
+  if (!pOldContext)
+  {
+    return(MAPI_E_FAILURE);
+  }
+
+  // Don't allow a compose window to be created if the user hasn't 
+  // specified an email address
+  const char *real_addr = FE_UsersMailAddress();
+  if (MISC_ValidateReturnAddress(pOldContext, real_addr) < 0)
+  {
+    return(MAPI_E_FAILURE);
+  }
+
+  //
+  // Now, build the fields object w/o much info...
+  //
+  BOOL    bEncrypt = FALSE;
+  BOOL    bSign    = FALSE;
+
+  PREF_GetBoolPref("mail.crypto_sign_outgoing_mail", &bSign);
+  PREF_GetBoolPref("mail.encrypt_outgoing_mail", &bEncrypt);
+
+  MSG_CompositionFields *fields =
+      MSG_CreateCompositionFields(real_addr, real_addr, NULL, 
+                  "", "",
+									"", "", "",
+									"", "", "",
+									"", "", "",
+									"", 
+                  bEncrypt,
+                  bSign);
+  if (!fields)
+  {
+    return(MAPI_E_FAILURE);
+  }
+
+  // RICHIE - INTL_CharSetInfo csi = LO_GetDocumentCharacterSetInfo(pOldContext);
+  // int16 win_csid = INTL_GetCSIWinCSID(csi);
+
+  pDocument = (CGenericDoc*)theApp.m_TextComposeTemplate->OpenDocumentFile(NULL, NULL, /*RICHIE win_csid,*/ TRUE);
+  if ( !pDocument )
+  {
+    // cleanup fields object
+    MSG_DestroyCompositionFields(fields);
+    return(MAPI_E_FAILURE);
+  }
+
+  CWinCX * pContext = (CWinCX*) pDocument->GetContext();
+  if ( !pContext ) 
+  {
+    return(MAPI_E_FAILURE);
+  }
+
+  MSG_CompositionPaneCallbacks Callbacks;
+  Callbacks.CreateRecipientsDialog = CreateRecipientsDialog;
+  Callbacks.CreateAskHTMLDialog = CreateAskHTMLDialog;
+
+  MWContext *context = pContext->GetContext();
+  CComposeFrame *pCompose = (CComposeFrame *) pContext->GetFrame()->GetFrameWnd();
+  pCompose->SetComposeStuff(context,fields); // squirl away stuff for post-create
+
+  // This needs to be set TRUE if using the old non-HTML text frame
+  // to prevent dropping dragged URLs
+  pContext->m_bDragging = !pCompose->UseHtml();
+  if (!pCompose->UseHtml()) 
+  {
+    pCompose->SetMsgPane(MSG_CreateCompositionPane(
+      pContext->GetContext(), 
+      context,
+      g_MsgPrefs.m_pMsgPrefs, fields,
+      WFE_MSGGetMaster()));
+  }
+
+  ASSERT(pCompose->GetMsgPane());
+  MSG_SetFEData(pCompose->GetMsgPane(),(void *)pCompose);
+
+  pCompose->UpdateAttachmentInfo();
+
+  // Pass doccsid info to new context for MailToWin conversion
+  /***
+  doccsid = INTL_GetCSIDocCSID(LO_GetDocumentCharacterSetInfo(pOldContext));
+
+  INTL_SetCSIDocCSID(LO_GetDocumentCharacterSetInfo(context), 
+    (doccsid ? doccsid : INTL_DefaultDocCharSetID(pOldContext)));
+  ****/
+
+  pCompose->DisplayHeaders(NULL);
+
+  CComposeBar * pBar = pCompose->GetComposeBar();
+  ASSERT(pBar);
+  LPADDRESSCONTROL pIAddressList = pBar->GetAddressWidgetInterface();
+
+  if (!pIAddressList->IsCreated()) 
+  {
+    pBar->CreateAddressingBlock();
+  }
+
+  // Always do plain text composition!
+  pCompose->CompleteComposeInitialization();
+
+  //
+  // Finally deal with the attachments...
+  //
+  NSstringSeq     mailInfoSeq = (NSstringSeq) &(sendDocPtr->dataBuf[0]);
+  DWORD           stringCount = 0;
+  DWORD           i;
+
+  TRACE("MAPI: ProcessMAPISendDocuments() # of Attachments = [%d]\n", sendDocPtr->nFileCount);
+
+  if (sendDocPtr->nFileCount > 0)
+  {
+      MSG_AttachmentData *pAttach = (MSG_AttachmentData *)
+                    XP_CALLOC((sendDocPtr->nFileCount + 1),
+                    sizeof(MSG_AttachmentData));
+      if (!pAttach)
+      {
+        return(MAPI_E_INSUFFICIENT_MEMORY);
+      }
+
+      memset(pAttach, 0, (sendDocPtr->nFileCount + 1) * 
+                                  sizeof(MSG_AttachmentData));
+      for (i=0; i<sendDocPtr->nFileCount; i++)
+      {
+        CString cs;
+        // Create URL from filename...
+        WFE_ConvertFile2Url(cs, 
+            (const char *)NSStrSeqGet(mailInfoSeq, stringCount++));
+        pAttach[i].url = XP_STRDUP(cs);
+
+        // Now also include the "display" name...
+        StrAllocCopy(pAttach[i].real_name, NSStrSeqGet(mailInfoSeq, stringCount++));
+      }
+
+      // Set the list!
+      MSG_SetAttachmentList(pCompose->GetMsgPane(), pAttach);
+
+      // Now free everything...
+      for (i=0; i<sendDocPtr->nFileCount; i++)
+      {
+        if (pAttach[i].url)
+          XP_FREE(pAttach[i].url);
+
+        if (pAttach[i].real_name)
+          XP_FREE(pAttach[i].real_name);
+      }
+
+      XP_FREE(pAttach);
+  }
+    
+  // 
+  // Now some checking for ... well I'm not sure...
+  //
+  if (MSG_GetAttachmentList(pCompose->GetMsgPane()))
+    pCompose->SetModified(TRUE);
+  else
+    pCompose->SetModified(FALSE);
+
+  // Post message to compose window to set the initial focus.
+  pCompose->PostMessage(WM_COMP_SET_INITIAL_FOCUS);
+
+  //
+  // Now, just popup the window...
+  //
+  pCompose->ShowWindow(TRUE);
+
+  // return pCompose->GetMsgPane(); rhp - used to return the MsgPane
+  return(SUCCESS_SUCCESS);
+}
+
+static void _GetMailCallback(HWND hwnd, MSG_Pane *pane, void *closure)
+{
+   if (pane != NULL)
+   {
+     ShowWindow(hwnd, SW_HIDE);
+     MSG_Command( pane, MSG_GetNewMail, NULL, 0 );
+   }
+}
+
+static void _GetMailDoneCallback(HWND hwnd, MSG_Pane *pane, void *closure)
+{
+	for(CGenericFrame * f = theApp.m_pFrameList; f; f = f->m_pNext)
+		f->PostMessage(WM_COMMAND, (WPARAM) ID_DONEGETTINGMAIL, (LPARAM) 0);
+}
+
+//
+// This will fire off a "get mail in background operation" in an
+// async. fashion.
+//
+extern "C" void
+MAPIGetNewMessagesInBackground(void)
+{
+CGenericFrame     *pFrame = (CGenericFrame * )FEU_GetLastActiveFrame();
+
+  // rhp - we should not hit the net if we are offline!
+  if (NET_IsOffline())
+    return;
+
+  if (!pFrame)
+    return;
+
+  MWContext *pOldContext = GetUsableContext();
+  if (!pOldContext)
+    return;
+
+  TRACE("MAPI: DOWNLOAD MAIL IN BACKGROUND\n");
+  new CProgressDialog(
+                pFrame->GetFrameWnd(), 
+                NULL, 
+                _GetMailCallback, NULL, NULL, 
+                _GetMailDoneCallback);
+}
+
+//
+// This function will save a message into the Communicator "Drafts"
+// folder with no UI showing.
+//
+// Return: appropriate MAPI return code...
+//
+//
+extern "C" LONG 
+DoMAPISaveMailOperation(MAPISendMailType      *sendMailPtr,
+											  const char            *pInitialText)
+{
+CGenericDoc             *pDocument;
+LPSTR                   subject;
+NSstringSeq             mailInfoSeq;
+DWORD                   stringCount = 6;
+DWORD                   i;
+BOOL                    winShowFlag = FALSE;
+
+  // Get a context to use for this call...
+  MWContext *pOldContext = GetUsableContext();
+  if (!pOldContext)
+  {
+    return(MAPI_E_FAILURE);
+  }
+
+  // Don't allow a compose window to be created if the user hasn't 
+  // specified an email address
+  const char *real_addr = FE_UsersMailAddress();
+  if (MISC_ValidateReturnAddress(pOldContext, real_addr) < 0)
+  {
+    return(MAPI_E_FAILURE);
+  }
+
+  //
+  // Now, we must build the fields object...
+  //
+  mailInfoSeq = (NSstringSeq) &(sendMailPtr->dataBuf[0]);
+  subject = NSStrSeqGet(mailInfoSeq, 0);
+
+  TRACE("MAPI: ProcessMAPISendMail() Subject   = [%s]\n", subject);
+  TRACE("MAPI: ProcessMAPISendMail() Text Size = [%d]\n", strlen((const char *)pInitialText));
+  TRACE("MAPI: ProcessMAPISendMail() # of Recipients  = [%d]\n", sendMailPtr->MSG_nRecipCount);
+
+
+  char  toString[1024] = "";
+  char  ccString[1024] = "";
+  char  bccString[1024] = "";
+
+  for (i=0; i<sendMailPtr->MSG_nRecipCount; i++)
+  {
+    LPSTR   ptr;
+    UCHAR   tempString[256];
+
+    ULONG addrType = atoi(NSStrSeqGet(mailInfoSeq, stringCount++));
+
+    // figure which type of address this is?
+    if (addrType == MAPI_CC)
+      ptr = ccString;
+    else if (addrType == MAPI_BCC)
+      ptr = bccString;
+    else
+      ptr = toString;
+
+    LPSTR namePtr = (LPSTR) NSStrSeqGet(mailInfoSeq, stringCount++);
+    LPSTR emailPtr = (LPSTR) NSStrSeqGet(mailInfoSeq, stringCount++);
+
+    if ( (!emailPtr) && (!namePtr))
+    {
+      return(MAPI_E_INVALID_RECIPS);
+    }
+
+    if (!emailPtr)
+      emailPtr = namePtr;
+
+    char *tptr = strchr(emailPtr, ':');
+    if (tptr != NULL)
+    {
+      if ( (*tptr != '\0') && (*(tptr+1) != '\0') )
+      {
+        emailPtr = (tptr + 1);
+      }
+    }
+/**
+    if ( (lstrlen(emailPtr) > 5) && (*(emailPtr + 4) == ':') )
+    {
+      emailPtr += 5;
+    }
+**/
+    // Now build the temp string to tack on in the format
+    // "Rich Pizzarro" <rhp@netscape.com>
+    wsprintf((LPSTR) tempString, "\"%s\" <%s>", namePtr, emailPtr);
+
+    // add a comma if not the first one
+    if (ptr[0] != '\0')
+      lstrcat(ptr, ",");
+
+    // tack on string!
+    lstrcat(ptr, (LPSTR) tempString);
+  }
+
+  BOOL    bEncrypt = FALSE;
+  BOOL    bSign    = FALSE;
+
+  PREF_GetBoolPref("mail.crypto_sign_outgoing_mail", &bSign);
+  PREF_GetBoolPref("mail.encrypt_outgoing_mail", &bEncrypt);
+  MSG_CompositionFields *fields =
+      MSG_CreateCompositionFields(real_addr, real_addr, 
+                  toString, 
+                  ccString, 
+                  bccString,
+									"", "", "",
+									"", subject, "",
+									"", "", "",
+									"", 
+                  bEncrypt,
+                  bSign);
+  if (!fields)
+  {
+    return(MAPI_E_FAILURE);
+  }
+
+  // RICHIE
+  // INTL_CharSetInfo csi = LO_GetDocumentCharacterSetInfo(pOldContext);
+  // int16 win_csid = INTL_GetCSIWinCSID(csi);
+  
+  pDocument = (CGenericDoc*)theApp.m_TextComposeTemplate->OpenDocumentFile(NULL, NULL, /*win_csid RICHIE*/ winShowFlag);
+  if ( !pDocument )
+  {
+    return(MAPI_E_FAILURE);
+  }
+  
+  CWinCX * pContext = (CWinCX*) pDocument->GetContext();
+  if ( !pContext ) 
+  {
+    return(MAPI_E_FAILURE);
+  }
+
+  MSG_CompositionPaneCallbacks Callbacks;
+  Callbacks.CreateRecipientsDialog = CreateRecipientsDialog;
+  Callbacks.CreateAskHTMLDialog = CreateAskHTMLDialog;
+
+  int16 doccsid;
+  MWContext *context = pContext->GetContext();
+  CComposeFrame *pCompose = (CComposeFrame *) pContext->GetFrame()->GetFrameWnd();
+
+  pCompose->SetComposeStuff(context, fields); // squirl away stuff for post-create
+
+  // This needs to be set TRUE if using the old non-HTML text frame
+  // to prevent dropping dragged URLs
+  pContext->m_bDragging = !pCompose->UseHtml();
+  if (!pCompose->UseHtml()) 
+  {
+    pCompose->SetMsgPane(
+      MSG_CreateCompositionPane(pContext->GetContext(), 
+                                context, 
+                                g_MsgPrefs.m_pMsgPrefs, 
+                                fields,
+                                WFE_MSGGetMaster())
+                        );
+  }
+
+  ASSERT(pCompose->GetMsgPane());
+  MSG_SetFEData(pCompose->GetMsgPane(),(void *)pCompose);  
+  pCompose->UpdateAttachmentInfo();
+
+  // Pass doccsid info to new context for MailToWin conversion
+  doccsid = INTL_GetCSIDocCSID(LO_GetDocumentCharacterSetInfo(context));
+  INTL_SetCSIDocCSID(LO_GetDocumentCharacterSetInfo(context), 
+    (doccsid ? doccsid : INTL_DefaultDocCharSetID(context)));
+
+  pCompose->DisplayHeaders(NULL);
+
+  CComposeBar * pBar = pCompose->GetComposeBar();
+  ASSERT(pBar);
+  LPADDRESSCONTROL pIAddressList = pBar->GetAddressWidgetInterface();
+
+  if (!pIAddressList->IsCreated()) 
+  {
+    pBar->CreateAddressingBlock();
+  }
+
+  // rhp - Deal with addressing the brute force way! This is a 
+  // "fix" for bad behavior when creating these windows and not
+  // showing them on the desktop.
+  if (!winShowFlag)      // Hack to fix the window not being mapped
+  {
+    pCompose->AppendAddress(MSG_TO_HEADER_MASK, "");
+    pCompose->AppendAddress(MSG_CC_HEADER_MASK, "");
+    pCompose->AppendAddress(MSG_BCC_HEADER_MASK, "");
+  }
+
+  // Always do plain text composition!
+  pCompose->CompleteComposeInitialization();
+
+  // Do this so we don't get popups on "empty" messages
+  if ( (!pInitialText) || (!(*pInitialText)) )
+    pInitialText = " ";
+
+  const char * pBody = pInitialText ? pInitialText : MSG_GetCompBody(pCompose->GetMsgPane());
+  if (pBody)
+  {
+    FE_InsertMessageCompositionText(context,pBody,TRUE);
+  }
+
+  // 
+  // Now set the message as being edited!    
+  //
+  pCompose->SetModified(TRUE);
+
+  //
+  // Finally deal with the attachments...
+  //
+  if (sendMailPtr->MSG_nFileCount > 0)
+  {
+    // Send this puppy when done with the attachments...
+    if (!winShowFlag)
+    {
+      pCompose->SetMAPISendMode(MAPI_SAVE);
+    }
+
+    MSG_AttachmentData *pAttach = (MSG_AttachmentData *)
+                  XP_CALLOC((sendMailPtr->MSG_nFileCount + 1),
+                  sizeof(MSG_AttachmentData));
+    if (!pAttach)
+    {
+      return(MAPI_E_INSUFFICIENT_MEMORY);
+    }
+
+    memset(pAttach, 0, (sendMailPtr->MSG_nFileCount + 1) * 
+                                sizeof(MSG_AttachmentData));
+    for (i=0; i<sendMailPtr->MSG_nFileCount; i++)
+    {
+      CString cs;
+      // Create URL from filename...
+      WFE_ConvertFile2Url(cs, 
+          (const char *)NSStrSeqGet(mailInfoSeq, stringCount++));
+      pAttach[i].url = XP_STRDUP(cs);
+
+      // Now also include the "display" name...
+      StrAllocCopy(pAttach[i].real_name, NSStrSeqGet(mailInfoSeq, stringCount++));
+    }
+
+    // Set the list!
+    MSG_SetAttachmentList(pCompose->GetMsgPane(), pAttach);
+
+    // Now free everything...
+    for (i=0; i<sendMailPtr->MSG_nFileCount; i++)
+    {
+      if (pAttach[i].url)
+        XP_FREE(pAttach[i].url);
+
+      if (pAttach[i].real_name)
+        XP_FREE(pAttach[i].real_name);
+    }
+
+    XP_FREE(pAttach);
+  }
+
+  //
+  // Now, if we were supposed to do the blind send...do it, otherwise,
+  // just popup the window...
+  //
+  if (winShowFlag)      
+  {
+    // Post message to compose window to set the initial focus.
+    pCompose->PostMessage(WM_COMP_SET_INITIAL_FOCUS);
+  }
+  else if (sendMailPtr->MSG_nFileCount <= 0)  // Send NOW if no attachments!
+  {
+    pCompose->PostMessage(WM_COMMAND, IDM_SAVEASDRAFT);
+  }
+
+  return(SUCCESS_SUCCESS);
+}

mozilla/mailnews/mapi/old/hook/mapimail.h

@@ -0,0 +1,89 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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 the Initial Developer are Copyright (C) 1998
+ * 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 NPL, 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 NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+#ifndef _MAPI_MAIL_H_
+#define _MAPI_MAIL_H_
+
+#include "nscpmapi.h"
+#include <structs.h>    // for MWContext
+
+//extern "C" {
+
+//
+// This function will create a composition window and either do
+// a blind send or pop up the compose window for the user to 
+// complete the operation
+//
+// Return: appropriate MAPI return code...
+//
+//
+extern "C" LONG
+DoFullMAPIMailOperation(MAPISendMailType      *sendMailPtr,
+											  const char            *pInitialText,
+                        BOOL                  winShowFlag);
+
+//
+// This function will create a composition window and just attach
+// the attachments of interest and pop up the window...
+//
+// Return: appropriate MAPI return code...
+//
+//
+extern "C" LONG
+DoPartialMAPIMailOperation(MAPISendDocumentsType *sendDocPtr);
+
+//
+// This function will save a message into the Communicator "Drafts"
+// folder with no UI showing.
+//
+// Return: appropriate MAPI return code...
+//
+//
+extern "C" LONG 
+DoMAPISaveMailOperation(MAPISendMailType      *sendMailPtr,
+											  const char            *pInitialText);
+
+//
+// This will fire off a "get mail in background operation" in an
+// async. fashion.
+//
+extern "C" void
+MAPIGetNewMessagesInBackground(void);
+
+
+// } // extern "C"
+
+#endif // _MAPI_MAIL_H_

mozilla/mailnews/mapi/old/lib/Makefile.win

@@ -0,0 +1,50 @@
+#!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): 
+
+DEPTH=..\..\..
+MODULE=mapiutils
+
+include <$(DEPTH)\config\config.mak>
+
+################################################################################
+## exports
+
+EXPORTS=	mapismem.h	\
+    		nsstrseq.h	\
+			$(NULL)
+
+################################################################################
+## library
+
+LIBRARY_NAME=mapiutils_s
+
+
+CPP_OBJS=   .\$(OBJDIR)\mapismem.obj		\
+			.\$(OBJDIR)\nsstrseq.obj		\
+			$(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+install:: $(LIBRARY)
+	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
+
+clobber::
+	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib

mozilla/mailnews/mapi/old/lib/mapismem.cpp

@@ -0,0 +1,173 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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 the Initial Developer are Copyright (C) 1998
+ * 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 NPL, 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 NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+//
+//  smem.cpp - This deals with all shared memory functions needed for 
+//  the MAPI component of Communicator
+//  Written by: Rich Pizzarro (rhp@netscape.com)
+//  November 1997
+//
+#include <windows.h>
+#include <windowsx.h>
+
+#include "mapismem.h"
+
+
+#ifndef ZeroMemory
+#include <memory.h>
+#define ZeroMemory(PTR, SIZE) memset(PTR, 0, SIZE)
+#endif // ZeroMemory
+
+// 
+// *create new* shared memory chunk 
+// once this is created, use the pointer
+// to the segment to to store data 
+// e.g.: 
+//     lpString = "string for communicator"; 
+//     lstrcpy((LPSTR)pData->m_buf[0], lpString); 
+//  
+CSharedMem *
+NSCreateSharedMemory(DWORD memSize, LPCTSTR memName, HANDLE *hSharedMemory)
+{
+#ifdef WIN32
+
+  BOOL bExistedBefore;
+  CSharedMem *pData;
+
+  LPCTSTR szObjectName = memName; 
+  DWORD dwSize = sizeof(CSharedMem) + memSize; 
+  *hSharedMemory = CreateFileMapping( 
+    (HANDLE)0xFFFFFFFF,0,PAGE_READWRITE,0,dwSize,szObjectName); 
+  if(*hSharedMemory == 0) 
+  { 
+    return NULL; 
+  } 
+  bExistedBefore = (GetLastError() == ERROR_ALREADY_EXISTS); 
+  if(bExistedBefore) 
+  { 
+  	return NULL;
+  } 
+
+  pData = (CSharedMem *)MapViewOfFile( 
+            *hSharedMemory, FILE_MAP_ALL_ACCESS, 0, 0, 0); 
+  if(pData == NULL) 
+  { 
+    return NULL; 
+  } 
+
+  ZeroMemory(pData, dwSize); 
+  pData->m_dwSize = memSize; 
+
+  return pData;
+#else
+  CSharedMem 	*sMemChunk = NULL;
+  DWORD dwSize = memSize = (sizeof(CSharedMem) + memSize); 
+
+  if (sMemChunk != NULL)
+	  return(sMemChunk);
+
+  sMemChunk = (CSharedMem *) GlobalAllocPtr(GMEM_MOVEABLE, dwSize);
+  ZeroMemory(sMemChunk, (size_t) dwSize);
+  sMemChunk->m_dwSize = dwSize;   // Missing in Communicator code!
+  return(sMemChunk);
+
+#endif // WIN32
+}
+
+// 
+// *open existing* shared memory chunk 
+// once you have the pointer to the new segment 
+// use this pointer to access data, e.g.: 
+// 
+CSharedMem *
+NSOpenExistingSharedMemory(LPCTSTR memName, HANDLE *hSharedMemory)
+{
+#ifdef WIN32
+  CSharedMem *pData;
+  DWORD dwSize;
+
+  LPCTSTR szObjectName = memName; 
+  *hSharedMemory = OpenFileMapping( 
+    FILE_MAP_WRITE,FALSE,szObjectName); 
+  if(*hSharedMemory == 0) 
+  { 
+    return NULL; 
+  } 
+
+  pData = (CSharedMem *)MapViewOfFile( 
+              *hSharedMemory,FILE_MAP_ALL_ACCESS,0,0,0); 
+  if(pData == NULL) 
+  { 
+    return NULL; 
+  } 
+  
+  dwSize = pData->m_dwSize; 
+  return pData;
+#else
+
+  return(NULL);   // In Win16, this is really meaningless...
+
+#endif
+}  
+
+// 
+// to close shared memory segment
+// 
+void
+NSCloseSharedMemory(CSharedMem *pData, HANDLE hSharedMemory)
+{
+#ifdef WIN32
+  if(pData != 0) 
+  { 
+    UnmapViewOfFile(pData); 
+    pData = 0; 
+  } 
+
+  if(hSharedMemory != 0) 
+  { 
+    CloseHandle(hSharedMemory); 
+    hSharedMemory = 0; 
+  } 
+#else
+
+	if (pData != NULL)
+	{
+		GlobalFreePtr(pData);
+		pData = NULL;
+	}
+
+#endif // WIN32
+}

mozilla/mailnews/mapi/old/lib/mapismem.h

@@ -0,0 +1,116 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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 the Initial Developer are Copyright (C) 1998
+ * 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 NPL, 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 NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+#ifndef __SMEM_HPP__
+#define __SMEM_HPP__
+
+//
+// Need this for Win16 since it is an undocumented message
+//
+#ifndef WIN32
+
+#define WM_COPYDATA                     0x004A
+
+/*
+ * lParam of WM_COPYDATA message points to...
+ */
+typedef struct tagCOPYDATASTRUCT {
+    DWORD         dwData;
+    DWORD         cbData;
+    LPVOID        lpData;
+} COPYDATASTRUCT, *PCOPYDATASTRUCT;
+
+# ifndef LPCTSTR
+#   define LPCTSTR LPCSTR
+# endif
+
+
+#endif // ifndef WIN32
+
+// The following structure will be stored in the shared memory 
+// and will be used to pass data back and forth 
+
+#pragma pack(4) 
+
+typedef struct  
+{ 
+  DWORD m_dwSize;       // size of the shared memory block 
+  BYTE  m_buf[1];       // this is the buffer of memory to be used
+} CSharedMem; 
+
+#pragma pack(4) 
+
+// ******************************************************
+// Public routines...
+// ******************************************************
+// 
+// 
+// *create new* shared memory chunk 
+// once this is created, use the pointer
+// to the segment to to store data 
+// e.g.: 
+//     lpString = "string for communicator"; 
+//     lstrcpy((LPSTR)pData->m_buf[0], lpString); 
+//     pData->m_dwBytesUsed = lstrlen(lpString) + 1; // count '\0' 
+//  
+CSharedMem *
+NSCreateSharedMemory(DWORD memSize, LPCTSTR memName, HANDLE *hSharedMemory);
+
+// 
+// *open existing* shared memory chunk 
+// once you have the pointer to the new segment 
+// use this pointer to access data, e.g.: 
+//
+// This will return the pointer to the memory chunk as well as
+// fill out the hSharedMemory argument that is needed for subsequent
+// operations.
+// 
+//  if(pData->m_dwBytesUsed > 0) 
+//  { 
+//    // use pData->m_buf here 
+//  } 
+//
+CSharedMem *
+NSOpenExistingSharedMemory(LPCTSTR memName, HANDLE *hSharedMemory);
+
+//
+// You must pass in the pointer to the memory chunk as well as
+// the hSharedMemory HANDLE to close shared memory segment
+// 
+void
+NSCloseSharedMemory(CSharedMem *pData, HANDLE hSharedMemory);
+
+#endif  // __SMEM_HPP__

mozilla/mailnews/mapi/old/lib/nsstrseq.cpp

@@ -0,0 +1,230 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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 the Initial Developer are Copyright (C) 1998
+ * 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 NPL, 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 NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+//
+//  This is a string sequence handling routine to take complex
+//  structures and merge them into a chunk of memory.
+//
+//  Written by: Rich Pizzarro (rhp@netscape.com)
+//  November 1997
+//
+#include <string.h>
+#include <stdlib.h>
+#include <windows.h>
+#include <windowsx.h>
+
+#include "nsstrseq.h"
+
+#ifndef NULL
+#define NULL '\0'
+#endif
+
+#define MARKER '\377'
+
+//
+// Delete an existing string sequence
+//
+void NSStrSeqDelete(NSstringSeq seq)
+{
+  if (seq != NULL)
+    free(seq);
+  
+  seq = NULL;
+}
+
+//
+// Allocate a new sequence, copying the given strings into it. 
+//
+NSstringSeq NSStrSeqNew(LPSTR strings[])
+{
+  int size;
+  if (!strings)
+  {
+    return NULL;
+  }
+  
+  {
+    int i;
+    for (i=0,size=0; strings[i]; i++)
+    {
+      size+=strlen(strings[i])+1;
+      switch (strings[i][0])
+      {
+        // Need to pad "" or anything starting with 255 
+        // to allow for multiple blank strings in a row
+      case 0:
+      case MARKER:
+        size++;
+        break;
+        
+      default:
+        break;
+      }
+    }
+  }
+  
+  {
+    NSstringSeq s=(NSstringSeq)malloc(size+1);
+    if (!s)
+    {	return NULL;}
+    
+    {
+      int i,offset;
+      for (i=0,offset=0; strings[i]; i++)
+      {
+        switch (strings[i][0])
+        {
+          // Need to pad "" or anything starting with 255
+        case 0:
+        case MARKER:
+          s[offset++]=MARKER;
+          break;
+          
+        default:
+          break;
+        }
+        strcpy(s+offset,strings[i]);
+        offset+=strlen(strings[i])+1;
+      }
+      s[offset]=0;
+    }
+    
+    return s;
+  }
+}
+
+//
+// Get the # of bytes required for the sequence 
+//
+LONG NSStrSeqSize(NSstringSeq seq)
+{
+  const char* s;
+  if (!seq)
+    {
+      return -1;
+    }
+
+  for (s=seq+1; ((*s) || (*(s-1))); s++)
+    ;
+
+  // At this point, s points to the second 0 
+  // of the double 0 at the end 
+  return (s-seq)+1;
+}
+
+//
+// Get the # of strings in the sequence 
+//
+LONG NSStrSeqNumStrs(NSstringSeq seq)
+{
+  const char* s;
+  int N;
+  if (!seq)
+  {
+    return -1;
+  }
+  
+  for (s=seq+1,N=0; ((*s) || (*(s-1))); s++)
+  {
+    if (!(*s))
+      N++;
+  }
+  
+  return N;
+}
+
+static LPSTR correct(LPSTR s)
+{
+  if (s[0]==MARKER)
+    return s+1;
+  else  // Anup , 4/96
+    return s;
+}
+
+//
+// Extract the index'th string in the sequence
+//
+LPSTR NSStrSeqGet(NSstringSeq seq, LONG index)
+{
+  char* s;
+  int N;
+
+  if (!seq)
+  {
+    return NULL;
+  }
+  
+  if (index<0)
+  {
+    return NULL;
+  }
+  
+  if (!index)
+    return correct(seq);
+  
+  for (s=seq+1,N=0; ((*s) || (*(s-1))) && (N<index); s++)
+  {
+    if (!(*s))
+      N++;
+  }
+  
+  if (N==index)
+    return correct(s);
+  
+  return NULL;
+}
+
+LPSTR * NSStrSeqGetAll(NSstringSeq seq)
+{
+  LONG N=NSStrSeqNumStrs(seq);
+  if (N<0)
+    return NULL;
+  
+  {
+    char** res=(char**)malloc( (size_t) ((N+1)*sizeof(char*)) );
+    int i;
+    
+    if (!res)
+    {
+      return NULL;
+    }
+    for (i=0; i<N; i++)
+      res[i]=NSStrSeqGet(seq,i);
+    res[N]=NULL;
+    
+    return res;
+  }
+}

mozilla/mailnews/mapi/old/lib/nsstrseq.h

@@ -0,0 +1,68 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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 the Initial Developer are Copyright (C) 1998
+ * 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 NPL, 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 NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+#ifndef __SEQUENCES_OF_STRINGS_H_
+#define __SEQUENCES_OF_STRINGS_H	
+
+
+typedef LPSTR NSstringSeq;
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+void NSStrSeqDelete(NSstringSeq seq);
+NSstringSeq NSStrSeqNew(LPSTR strings[]);
+
+// Get the # of bytes required for the sequence 
+LONG NSStrSeqSize(NSstringSeq seq);
+
+// Get the # of strings in the sequence
+LONG NSStrSeqNumStrs(NSstringSeq seq);
+
+// Extract the index'th string in the sequence
+LPSTR NSStrSeqGet(NSstringSeq seq, LONG index);
+
+// Build an array of all the strings in the sequence
+LPSTR *NSStrSeqGetAll(NSstringSeq seq);
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif // __sequences_of_strings_h_

mozilla/mailnews/mapi/old/makefile.win

@@ -0,0 +1,26 @@
+#!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): 
+
+DEPTH=..\..
+
+DIRS=public lib mapi32 tests hook
+
+include <$(DEPTH)\config\rules.mak>

mozilla/mailnews/mapi/old/mapi32/maindll.cpp

@@ -0,0 +1,100 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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 the Initial Developer are Copyright (C) 1998
+ * 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 NPL, 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 NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+//
+//  DLLMain to get a handle on an hInstance 
+//  Written by: Rich Pizzarro (rhp@netscape.com)
+//  November 1997
+#include <windows.h>
+
+//  
+// global variables
+//
+HINSTANCE hInstance;
+
+//
+// DLL entry
+//  
+#ifdef WIN32
+/****************************************************************************
+   FUNCTION: DllMain(HANDLE, DWORD, LPVOID)
+
+   PURPOSE:  DllMain is called by Windows when
+             the DLL is initialized, Thread Attached, and other times.
+             Refer to SDK documentation, as to the different ways this
+             may be called.
+             
+             The DllMain function should perform additional initialization
+             tasks required by the DLL.  In this example, no initialization
+             tasks are required.  DllMain should return a value of 1 if
+             the initialization is successful.
+           
+*******************************************************************************/
+BOOL APIENTRY DllMain(HANDLE hInstLocal, DWORD ul_reason_being_called, LPVOID lpReserved) 
+{
+  hInstance = (HINSTANCE)hInstLocal;
+
+  if (hInstance != NULL) 
+	  return 1;
+  else  
+	  return 0;
+}
+
+#else  // WIN16
+
+
+//--------------------------------------------------------------------
+// LibMain( hInstance, wDataSegment, wHeapSize, lpszCmdLine ) : WORD
+//
+//    hInstance      library instance handle
+//    wDataSegment   library data segment
+//    wHeapSize      default heap size
+//    lpszCmdLine    command line arguments
+//
+//--------------------------------------------------------------------
+
+int CALLBACK LibMain(HINSTANCE hInstLocal, WORD wDataSegment, WORD wHeapSize, LPSTR lpszCmdLine) 
+{
+  hInstance = hInstLocal;
+  /* return result 1 = success; 0 = fail */
+  if (hInstance != NULL) 
+	  return 1;
+  else
+	  return 0;
+}
+
+#endif // WIN16
+

mozilla/mailnews/mapi/old/mapi32/makefile.win

@@ -0,0 +1,70 @@
+# 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): 
+#
+
+DEPTH=..\..\..
+MODULE=mapi32
+
+################################################################################
+## exports
+
+#EXPORTS =
+
+
+################################################################################
+## library
+
+LIBNAME = .\$(OBJDIR)\mapi32
+DEFINES= -NS_DEBUG
+DEFFILE=MAPI32.def
+
+!ifdef MOZ_STATIC_COMPONENT_LIBS
+LIB = $(LIBNAME).lib
+!else
+DLL = $(LIBNAME).dll
+!endif
+
+OBJS=										\
+    .\$(OBJDIR)\maindll.obj  \
+    .\$(OBJDIR)\mapi32.obj  \
+    .\$(OBJDIR)\mapiipc.obj  \
+    .\$(OBJDIR)\mapimem.obj  \
+    .\$(OBJDIR)\mapiutl.obj  \
+    .\$(OBJDIR)\smem.obj  \
+    .\$(OBJDIR)\trace.obj  \
+    .\$(OBJDIR)\xpapi.obj  \
+		$(NULL)
+
+LLIBS=										\
+			$(LLIBS)						\
+			$(LIBNSPR)						\
+			$(DIST)\lib\xppref32.lib		\
+			$(DIST)\lib\xpcom.lib       	\
+			$(DIST)\lib\mapiutils_s.lib  \
+			$(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+!ifdef MOZ_STATIC_COMPONENT_LIBS
+install:: $(LIB)
+	$(MAKE_INSTALL)  $(LIBNAME).$(LIB_SUFFIX) $(DIST)\bin\components
+!else
+install:: $(DLL)
+	$(MAKE_INSTALL)  $(LIBNAME).$(DLL_SUFFIX) $(DIST)\bin\components
+!endif

mozilla/mailnews/mapi/old/mapi32/mapi32.def

@@ -0,0 +1,14 @@
+EXPORTS
+	MAPILogon
+	MAPILogoff
+	MAPISendMail
+	MAPISendDocuments
+	MAPIFreeBuffer
+	MAPIFindNext
+	MAPIReadMail
+	MAPISaveMail
+	MAPIDeleteMail
+	MAPIAddress
+	MAPIDetails
+	MAPIResolveName
+  MAPIGetNetscapeVersion

mozilla/mailnews/mapi/old/mapi32/mapi32.rc

@@ -0,0 +1,146 @@
+// Insert copyright and license here 1997
+//Microsoft Developer Studio generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+ID_DIALOG_MAPI DIALOGEX 0, 0, 186, 111
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_TOOLWINDOW
+CAPTION "Netscape MAPI Support"
+FONT 8, "MS Sans Serif"
+BEGIN
+    DEFPUSHBUTTON   "OK",IDOK,41,95,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,104,95,50,14
+    GROUPBOX        "Diagnostic Information",IDC_STATIC,2,2,182,91
+    CTEXT           "This window will contain MAPI relative\ninformation for Netscape Communicator",
+                    IDC_STATIC,11,14,159,30
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO DISCARDABLE 
+BEGIN
+    ID_DIALOG_MAPI, DIALOG
+    BEGIN
+        LEFTMARGIN, 2
+        RIGHTMARGIN, 184
+        TOPMARGIN, 2
+        BOTTOMMARGIN, 109
+    END
+END
+#endif    // APSTUDIO_INVOKED
+
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+#ifndef _MAC
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 5,0,0,1
+ PRODUCTVERSION 5,0,0,1
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "Comments", "Simple MAPI DLL\0"
+            VALUE "CompanyName", "Netscape Communications Corporation\0"
+            VALUE "FileDescription", "mapi32\0"
+            VALUE "FileVersion", "5, 0, 0, 1\0"
+            VALUE "InternalName", "mapi32\0"
+            VALUE "LegalCopyright", "Copyright © 1997\0"
+            VALUE "LegalTrademarks", "Netscape and Netscape Navigator are registered trademarks of Netscape Communications Corporation.\0"
+            VALUE "OriginalFilename", "mapi32.dll\0"
+            VALUE "ProductName", "Netscape Communications Simple MAPI\0"
+            VALUE "ProductVersion", "5, 0, 0, 1\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+#endif    // !_MAC
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+

mozilla/mailnews/mapi/old/mapi32/mapiipc.cpp

@@ -0,0 +1,249 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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 the Initial Developer are Copyright (C) 1998
+ * 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 NPL, 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 NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+//
+//  MAPI IPC Routines
+//  Written by: Rich Pizzarro (rhp@netscape.com)
+//  November 1997
+//
+#include <windows.h>
+#include <windowsx.h>
+#include <nscpmapi.h>   // Should live in Communicator
+
+#include "resource.h"
+#include "mapiipc.h"
+#include "mapismem.h"
+#include "trace.h"
+
+#ifndef WIN32
+#include <string.h>
+#endif 
+
+//
+// Necessary variables...
+//
+static LONG       instanceCount = 0;
+HWND				      hWndMAPI = NULL;
+char				      szClassName[] = "NetscapeMAPIClient";
+char              szWindowName[] = "NetscapeMAPI";
+
+//
+// External declares...
+//
+extern HINSTANCE  hInstance;
+
+void 
+ProcessCommand(HWND hWnd, int id, HWND hCtl, UINT codeNotify) 
+{ 
+	switch (id) 
+	{
+	case IDOK:   
+	case IDCANCEL:
+		{
+			ShowWindow(hWnd, SW_HIDE);
+		}
+		
+	default:
+		;
+	}
+}
+
+BOOL CALLBACK LOADDS 
+MyDlgProc(HWND hWndMain, UINT wMsg, WPARAM wParam, LPARAM lParam) 
+{
+  switch (wMsg) 
+  {
+  case WM_INITDIALOG: 
+    {
+      hWndMAPI = hWndMain;
+    }
+    break;
+    
+  case WM_CLOSE:
+//    DestroyWindow(hWndMain);
+    break;
+    
+  case WM_DESTROY:
+    hWndMain = NULL;
+    break;
+
+  case WM_COMMAND:
+	  HANDLE_WM_COMMAND(hWndMAPI, wParam, lParam, ProcessCommand);
+    break;
+
+  default:
+    return FALSE;
+  }
+
+  return TRUE;
+}
+
+BOOL 
+InitInstance(HINSTANCE hInstance)
+{
+  //
+  // Create a main window for this application instance.  
+  //
+  /* RICHIE - TRY SOME CHANGES!!!
+  hWndMAPI = CreateDialog((HINSTANCE) hInstance, 
+        MAKEINTRESOURCE(ID_DIALOG_QAHOOK),
+        (HWND) NULL, (DLGPROC) MyDlgProc);
+   ******/
+  hWndMAPI = CreateWindow(
+              szClassName,	// pointer to registered class name
+              szWindowName,	// pointer to window name
+              WS_CHILD,	    // window style
+              -10,          	// horizontal position of window
+              -10,	          // vertical position of window
+              1,	          // window width
+              1,	          // window height
+              GetDesktopWindow(),	// handle to parent or owner window
+              NULL,	        // handle to menu or child-window identifier
+              hInstance,	  // handle to application instance
+              NULL          // pointer to window-creation data
+              );
+  if (!hWndMAPI)
+    return FALSE;
+  else
+    return TRUE;
+}
+
+BOOL 
+InitApp(void)
+{
+#ifdef WIN32
+  WNDCLASS wc;
+  wc.style         = 0; 
+  wc.lpfnWndProc   = DefDlgProc; 
+  wc.cbClsExtra    = 0; 
+  wc.cbWndExtra    = DLGWINDOWEXTRA; 
+  wc.hInstance     = hInstance; 
+  wc.hIcon         = LoadIcon(hInstance, MAKEINTRESOURCE(ID_ICON_APP)); 
+  wc.hCursor       = LoadCursor(0, IDC_ARROW); 
+  wc.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1);
+  wc.lpszMenuName  = NULL; 
+  wc.lpszClassName = szClassName;
+  
+  if(!RegisterClass(&wc))
+    return FALSE;
+#endif
+  
+  return TRUE;
+} // end InitApp
+
+BOOL
+InitDLL(void)
+{
+  if (hWndMAPI != NULL)
+    return TRUE;
+
+  if (!InitApp()) 
+  { 
+    return FALSE;
+  }
+  
+  if (!InitInstance(hInstance)) 
+  {    
+    return FALSE;
+  }
+  
+//  ShowWindow(hWndMAPI, SW_SHOW);    Just for jollies
+  return(TRUE);
+}
+
+//*************************************************************
+//* Calls exposed for rest of DLL...
+//*************************************************************
+//
+// Purpose: Open the API
+// Return: 1 on success
+//         0 on failure
+//
+DWORD nsMAPI_OpenAPI(void)
+{
+  if (instanceCount > 0)
+  {
+    return(1);
+  }
+
+  ++instanceCount;
+  return(1);
+}
+
+//
+// Purpose: Close the API
+//
+void nsMAPI_CloseAPI(void)
+{
+  --instanceCount;
+  if (instanceCount <= 0)
+  {
+    instanceCount = 0;
+  }
+
+  return;
+}
+
+//
+// Send the actual request to Communicator
+//
+LRESULT
+SendMAPIRequest(HWND hWnd, 
+                DWORD mapiRequestID, 
+                MAPIIPCType *ipcInfo)
+{
+LRESULT         returnVal = 0;
+COPYDATASTRUCT  cds;
+
+  if (!InitDLL())
+  {
+    return 0;
+  }
+
+  cds.dwData = mapiRequestID;
+  cds.cbData = sizeof(MAPIIPCType);
+  cds.lpData = ipcInfo;
+
+  // Make the call into Communicator
+  returnVal = SendMessage(hWnd, WM_COPYDATA, (WPARAM) hWndMAPI, (LPARAM) &cds);
+
+  // Now kill the window...
+  DestroyWindow(hWndMAPI);
+  hWndMAPI = NULL;
+  UnregisterClass(szClassName, hInstance);
+  
+  return returnVal;
+}

mozilla/mailnews/mapi/old/mapi32/mapiipc.h

@@ -0,0 +1,63 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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 the Initial Developer are Copyright (C) 1998
+ * 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 NPL, 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 NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+#ifndef __MAPIIPC_HPP__
+#define __MAPIIPC_HPP__
+
+#include "port.h"
+#include <nscpmapi.h>
+
+//********************************************************
+// Open and close functions for API
+//********************************************************
+// Open the API
+// Return: 1 on success, 0 on failure
+//
+DWORD nsMAPI_OpenAPI(void);
+
+//
+// Purpose: Close the API
+//
+void  nsMAPI_CloseAPI(void);
+
+//
+// Send the actual request to Communicator
+//
+LRESULT   SendMAPIRequest(HWND hWnd, 
+                DWORD mapiRequestID, 
+                MAPIIPCType *ipcInfo);
+
+#endif // __MAPIIPC_HPP__

mozilla/mailnews/mapi/old/mapi32/mapimem.cpp

@@ -0,0 +1,363 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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 the Initial Developer are Copyright (C) 1998
+ * 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 NPL, 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 NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+//
+//  mem.cpp
+//  Written by: Rich Pizzarro (rhp@netscape.com)
+//  November 1997
+//  This implements various memory management functions for use with
+//  MAPI features of Communicator
+//
+#include <windows.h>     
+#include <memory.h> 
+#include <malloc.h>
+#include "mapimem.h"
+#include <nscpmapi.h>   // lives in communicator winfe
+#include "nsstrseq.h"
+#include "trace.h"
+#include "mapiutl.h"
+#include "xpapi.h"
+
+LPSTR
+CheckNullString(LPSTR inStr)
+{
+  static UCHAR  str[1];
+
+  str[0] = '\0';
+  if (inStr == NULL)
+    return((LPSTR)str);
+  else
+    return(inStr);
+}
+
+void
+FreeMAPIFile(lpMapiFileDesc pv)
+{
+  if (!pv)
+    return;
+
+  if (pv->lpszPathName != NULL)   
+    free(pv->lpszPathName);
+
+  if (pv->lpszFileName != NULL)   
+    free(pv->lpszFileName);
+}
+
+void
+FreeMAPIMessage(lpMapiMessage pv)
+{
+  ULONG i;
+
+  if (!pv)
+    return;
+
+  if (pv->lpszSubject != NULL)
+    free(pv->lpszSubject);
+
+  if (pv->lpszNoteText)
+      free(pv->lpszNoteText);
+  
+  if (pv->lpszMessageType)
+    free(pv->lpszMessageType);
+  
+  if (pv->lpszDateReceived)
+    free(pv->lpszDateReceived);
+  
+  if (pv->lpszConversationID)
+    free(pv->lpszConversationID);
+  
+  if (pv->lpOriginator)
+    FreeMAPIRecipient(pv->lpOriginator);
+  
+  for (i=0; i<pv->nRecipCount; i++)
+  {
+    if (&(pv->lpRecips[i]) != NULL)
+    {
+      FreeMAPIRecipient(&(pv->lpRecips[i]));
+    }
+  }
+
+  if (pv->lpRecips != NULL)
+  {
+    free(pv->lpRecips);
+  }
+
+  for (i=0; i<pv->nFileCount; i++)
+  {
+    if (&(pv->lpFiles[i]) != NULL)
+    {
+      FreeMAPIFile(&(pv->lpFiles[i]));
+    }
+  }
+
+  if (pv->lpFiles != NULL)
+  {
+    free(pv->lpFiles);
+  }
+  
+  free(pv);
+  pv = NULL;
+}
+
+void
+FreeMAPIRecipient(lpMapiRecipDesc pv)
+{
+  if (!pv)
+    return;
+
+  if (pv->lpszName != NULL)   
+    free(pv->lpszName);
+
+  if (pv->lpszAddress != NULL)
+    free(pv->lpszAddress);
+
+  if (pv->lpEntryID != NULL)
+    free(pv->lpEntryID);  
+}
+
+//
+// This routine will take an lpMapiMessage structure and "flatten" it into
+// one contiguous chunk of memory that can be easily passed around. After this
+// is done, "extract" routines will be written to get complicated string routines
+// out of the chunk of memory at the end.
+// 
+LPVOID
+FlattenMAPIMessageStructure(lpMapiMessage msg, DWORD *totalSize)
+{
+  MAPISendMailType    *mailPtr;
+  LPSTR               *strArray;
+  DWORD               strCount = 0;
+  DWORD               currentString = 0;
+  DWORD               arrayBufSize = 0;
+  DWORD               i;
+
+  *totalSize = 0;
+  if (!msg)
+    return(NULL);
+
+  //
+  // Allocate the initial structure to hold all of the mail info.
+  //
+  *totalSize = sizeof(MAPISendMailType);
+  mailPtr = (MAPISendMailType *) malloc(sizeof(MAPISendMailType));
+  if (!mailPtr)
+    return(NULL);
+  memset(mailPtr, 0, sizeof(MAPISendMailType));
+
+  //
+  // First, assign all of the easy numeric values...
+  //
+  mailPtr->MSG_flFlags = msg->flFlags;          // unread,return receipt
+  mailPtr->MSG_nRecipCount = msg->nRecipCount;  // Number of recipients
+  mailPtr->MSG_nFileCount = msg->nFileCount;    // # of file attachments
+  if (msg->lpOriginator != NULL)
+  {
+    mailPtr->MSG_ORIG_ulRecipClass = msg->lpOriginator->ulRecipClass; //  Recipient class - MAPI_TO, MAPI_CC, MAPI_BCC, MAPI_ORIG
+  }
+
+  //
+  // Now, figure out how many string pointers we need...
+  //
+  strCount = 4;     // These are the 4 KNOWN strings up front for a message
+  strCount += 2;    // This is for the originator name and address
+
+  strCount += msg->nRecipCount * 3; // Name, address & class (cc, bcc) for each recipient
+  strCount += msg->nFileCount  * 2; // filename and display name for each attachment
+
+  // 
+  // Now allocate a new string sequence...add one entry for NULL at the end
+  //  
+  arrayBufSize = sizeof(LPSTR) * (strCount + 1);
+
+#ifdef WIN16    // Check for max mem allocation...
+  if ((sizeof(MAPISendMailType) + arrayBufSize) > 64000)
+  {
+    free(mailPtr);
+    return NULL;
+  }
+#endif
+
+  //
+  // Allocate a buffer for the string pointers and if this fails, 
+  // cleanup and return.
+  // 
+  strArray = (LPSTR *)malloc( (size_t) arrayBufSize);
+  if (!strArray)
+  {
+    free(mailPtr);
+    return NULL;
+  }
+
+  memset(strArray, 0, (size_t) arrayBufSize);  // Set the array to NULL
+  strArray[currentString++] = CheckNullString(msg->lpszSubject);        // Message Subject
+  strArray[currentString++] = CheckNullString(msg->lpszNoteText);       // Message Text  
+  strArray[currentString++] = CheckNullString(msg->lpszDateReceived);   // in YYYY/MM/DD HH:MM format
+  strArray[currentString++] = CheckNullString(msg->lpszConversationID); // conversation thread ID
+
+  if (msg->lpOriginator)
+  {
+    strArray[currentString++] = CheckNullString(msg->lpOriginator[0].lpszName);
+    strArray[currentString++] = CheckNullString(msg->lpOriginator[0].lpszAddress);
+  }
+  else
+  {
+    strArray[currentString++] = CheckNullString(NULL);
+    strArray[currentString++] = CheckNullString(NULL);
+  }
+
+  //
+  // Assign pointers for the Name and address of each recipient
+  //
+  LPSTR toString  = "1";
+  LPSTR ccString  = "2";
+  LPSTR bccString = "3";
+
+  for (i=0; i<msg->nRecipCount; i++)
+  {
+    // rhp - need message class
+    if (msg->lpRecips[i].ulRecipClass == MAPI_BCC)
+      strArray[currentString++] = CheckNullString(bccString);
+    else if (msg->lpRecips[i].ulRecipClass == MAPI_CC)
+      strArray[currentString++] = CheckNullString(ccString);
+    else
+      strArray[currentString++] = CheckNullString(toString);
+
+    strArray[currentString++] = CheckNullString(msg->lpRecips[i].lpszName);
+    strArray[currentString++] = CheckNullString(msg->lpRecips[i].lpszAddress);  
+  }
+
+  BYTE    szNewFileName[_MAX_PATH];
+
+  for (i=0; i<msg->nFileCount; i++)
+  {
+    char *namePtr;
+    // have to copy/create temp files here of office won't work...
+
+    if ( 
+          (msg->lpFiles[i].lpszFileName != NULL) &&
+          (*msg->lpFiles[i].lpszFileName != '\0') 
+       )
+    {
+      namePtr = (char *)msg->lpFiles[i].lpszFileName;
+    }
+    else
+    {
+      namePtr = (char *)msg->lpFiles[i].lpszPathName;
+    }
+
+    if (GetTempMailNameWithExtension((char *)szNewFileName, namePtr) == 0)
+    {
+      free(strArray);
+      free(mailPtr);
+      return NULL;
+    }
+    
+    if (!XP_CopyFile((char *)msg->lpFiles[i].lpszPathName, (char *)szNewFileName, TRUE))
+    {
+      free(strArray);
+      free(mailPtr);
+      return NULL;
+    }
+
+    strArray[currentString++] = CheckNullString((char *)szNewFileName);
+    strArray[currentString++] = CheckNullString(msg->lpFiles[i].lpszFileName);
+
+    AddTempFile((LPSTR) szNewFileName);
+//    strArray[currentString++] = CheckNullString(msg->lpFiles[i].lpszPathName);
+//    strArray[currentString++] = CheckNullString(msg->lpFiles[i].lpszFileName);
+  }
+
+  if (currentString != strCount)
+  {
+    TRACE("MAPI PROBLEM!!!!!! FlattenMAPIMessageStructure() currentString != strCount\n");
+  }
+
+  strArray[strCount] = NULL;    // terminate at the end
+  NSstringSeq strSeq = NSStrSeqNew(strArray);
+  if (!strSeq)
+  {
+    free(strArray);
+    free(mailPtr);
+    return NULL;
+  }
+  
+  //
+  // Now we need to copy the structure into a big, contiguous chunk of memory
+  //
+  LONG totalArraySize = NSStrSeqSize(strSeq);
+  LONG totalMemSize = sizeof(MAPISendMailType) + totalArraySize;
+
+#ifdef WIN16
+  if (totalMemSize > 64000)
+  {
+    free(strArray);
+    NSStrSeqDelete(strSeq);
+    free(mailPtr);
+    return NULL;
+  }
+#endif
+
+  MAPISendMailType *newMailPtr = (MAPISendMailType *)malloc((size_t)totalMemSize);
+  if (!newMailPtr)
+  {
+    free(strArray);
+    NSStrSeqDelete(strSeq);
+    free(mailPtr);
+    return NULL;
+  }
+
+  memset(newMailPtr, 0, (size_t) totalMemSize);
+  //
+  // Finally do the copy...
+  //
+  memcpy(newMailPtr, mailPtr, sizeof(MAPISendMailType));
+  memcpy(newMailPtr->dataBuf, strSeq, (size_t) totalArraySize);
+  *totalSize = totalMemSize;
+
+  //
+  // Cleanup and scram...
+  //
+  if (strArray)
+    free(strArray);
+
+  if (strSeq)
+    NSStrSeqDelete(strSeq);
+
+  if (mailPtr)
+    free(mailPtr);
+
+  return(newMailPtr);
+}

mozilla/mailnews/mapi/old/mapi32/mapimem.h

@@ -0,0 +1,76 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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 the Initial Developer are Copyright (C) 1998
+ * 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 NPL, 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 NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+#ifndef __MY_MEM_HPP__
+#define __MY_MEM_HPP__
+
+#ifndef MAPI_OLE	// Because MSFT doesn't do this for us :-(
+#include <mapi.h>                                                 
+#endif
+
+//
+// Needed for turning NULL's into ""'s for string sequence routines...
+//
+LPSTR     CheckNullString(LPSTR inStr);
+
+//
+// Memory allocation functions...
+//
+
+//
+// This will free an lpMapiMessage structure allocated by this DLL
+//
+void      FreeMAPIMessage(lpMapiMessage pv);
+
+//
+// This will free an lpMapiRecipDesc structure allocated by this DLL
+//
+void      FreeMAPIRecipient(lpMapiRecipDesc pv);
+
+//
+// Frees a mapi file object...
+//
+void      FreeMAPIFile(lpMapiFileDesc pv);
+
+//
+// This routine will take an lpMapiMessage structure and "flatten" it into
+// one contiguous chunk of memory that can be easily passed around. 
+// 
+LPVOID    FlattenMAPIMessageStructure(lpMapiMessage msg, DWORD *totalSize);
+
+
+
+#endif  // __MY_MEM_HPP__

mozilla/mailnews/mapi/old/mapi32/mapiutl.cpp

@@ -0,0 +1,899 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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 the Initial Developer are Copyright (C) 1998
+ * 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 NPL, 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 NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+//
+//  Various utils needed for the MAPI functions
+//  Written by: Rich Pizzarro (rhp@netscape.com)
+//  November 1997
+//
+#include <windows.h> 
+#include <time.h> 
+#include <sys/stat.h>
+#include <io.h>
+#include "xpapi.h"
+#include "trace.h"
+#include "mapiipc.h"
+#include "mapiutl.h"
+
+//
+// Global variables
+//
+BOOL	  gLoggingEnabled = FALSE;
+
+void
+SetLoggingEnabled(BOOL val)
+{
+  gLoggingEnabled = val;
+}
+
+// Log File
+void 
+LogString(LPCSTR pStr1)
+{
+  // Off of the declaration line...
+  LPCSTR pStr2 = NULL;
+  BOOL useStr1 = TRUE;
+
+	if (gLoggingEnabled)
+	{
+		char tempPath[_MAX_PATH] = "";
+    if (getenv("TEMP"))
+    {
+      lstrcpy((LPSTR) tempPath, getenv("TEMP"));  // environmental variable
+    } 
+
+		int len = lstrlen(tempPath);
+		if ((len > 1) && tempPath[len - 1] != '\\')
+		{
+			lstrcat(tempPath, "\\");
+		}
+		lstrcat(tempPath, szMapiLog);
+		HFILE hFile = _lopen(tempPath, OF_WRITE);
+		if (hFile == HFILE_ERROR)
+		{
+			hFile = _lcreat(tempPath, 0);
+		}
+		if (hFile != HFILE_ERROR)
+		{
+			_llseek(hFile, 0, SEEK_END);		// seek to the end of the file
+			LPCSTR pTemp = useStr1 ? pStr1 : pStr2;
+			_lwrite(hFile, pTemp, lstrlen(pTemp));
+			_lclose(hFile);
+		}
+	}
+}
+
+//
+// Find Communicator and return an HWND, if not, start Communicator,
+// then find an HWND
+//
+HWND 
+GetCommunicatorIPCWindow(void)
+{
+  HWND  hWnd = NULL; 
+  DWORD timeCount = 0;
+  BOOL  launchTry = FALSE;
+
+  //
+  // This will wait for 10 seconds before giving up and failing
+  //
+  while ((hWnd == NULL) && (timeCount < 20))
+  {
+    if ((hWnd = FindWindow("AfxFrameOrView", NULL)) && !FindWindow("aHiddenFrameClass", NULL))
+      return(hWnd);
+    else if ((hWnd = FindWindow("aHiddenFrameClass", NULL)))
+      return(hWnd);
+
+    if (!launchTry)
+    {
+    char    szPath[_MAX_PATH] = "";
+		DWORD   nMAPIERROR; 
+
+      if ((nMAPIERROR = XP_GetInstallLocation(szPath, _MAX_PATH)) != SUCCESS_SUCCESS)
+      {
+        return(NULL); 
+      }
+		
+		  WORD nReturn = XP_CallProcess(szPath, " -MAPICLIENT");
+      launchTry = TRUE;
+    }
+
+    //
+    // Pause for 1/2 a second and try to connect again...
+    //
+#ifdef WIN32
+    Sleep(500);
+#else 
+    Yield();
+#endif        
+
+    timeCount++;
+  }
+
+	return(hWnd);
+}
+
+void
+BuildMemName(LPSTR name, ULONG winSeed)
+{
+  static DWORD    id = 0;
+
+  if (id == 0)
+  {
+    // Seed the random-number generator with current time so that
+    // the numbers will be different every time we run.
+    srand( (unsigned)time( NULL ) );
+    id = rand();
+  }
+
+  wsprintf(name, "MAPI_IPC_SMEM-%d", (winSeed + id++));
+  TRACE("Shared Memory Name = [%s]\n", name);
+}
+
+DWORD 
+ValidateFile(LPCSTR szFile) 
+{
+  	struct _stat buf;
+    int result;
+
+    result = _stat( szFile, &buf );
+    if (result != 0)
+      return(1);
+
+    if (!(buf.st_mode & S_IREAD))
+      return(2);
+
+    return(0);
+}
+
+//
+// return of zero is ok 
+// 1 = MAPI_E_ATTACHMENT_NOT_FOUND
+// 2 = MAPI_E_ATTACHMENT_OPEN_FAILURE
+//
+DWORD
+SanityCheckAttachmentFiles(lpMapiMessage lpMessage)
+{
+  ULONG i;
+  DWORD rc;
+
+  for (i=0; i<lpMessage->nFileCount; i++)
+  {
+    if ((rc = ValidateFile(lpMessage->lpFiles[i].lpszPathName)) != 0)
+    {
+      return(rc);
+    }
+  }
+
+  return(0);
+}
+
+DWORD 
+GetFileCount(LPSTR pFiles, LPSTR delimChar)
+{
+  DWORD   count = 1;
+	if ((!pFiles) || (!*pFiles))
+		return(0);
+
+  for (DWORD i=0; i<strlen(pFiles); i++)
+  {
+    if (pFiles[i] == delimChar[0])
+    {
+      ++count;
+    }
+  }
+
+  return(count);
+}
+
+//
+// Extract a filename from a string
+// Return TRUE if file found, else FALSE
+//
+BOOL
+ExtractFile(LPSTR pFiles, LPSTR delimChar, DWORD fIndex, LPSTR fName)
+{
+  LPSTR   ptr = pFiles;
+  DWORD   loc;
+  DWORD   count = 0;
+
+	if ((!pFiles) || (!*pFiles))
+		return(0);
+
+  // Get to the fIndex'th entry
+  for (loc=0; loc<strlen(pFiles); loc++)
+  {
+    if (count == fIndex)
+      break;
+    if (pFiles[loc] == delimChar[0])
+      count++;
+  }
+
+  if (loc >= strlen(pFiles))    // Got to the end of string!
+    return(FALSE);
+
+  lstrcpy(fName, (LPSTR)pFiles + loc);
+  //
+  // Truncate at 2nd delimiter
+  //
+  for (DWORD i=0; i<strlen(fName); i++)
+  {
+    if (fName[i] == delimChar[0])
+    {
+      fName[i] = '\0';
+      break;
+    }
+  }
+
+  return(TRUE);
+}
+
+ULONG
+GetFileSize(LPSTR fName)
+{
+  struct _stat buf;
+  int result;
+  
+  result = _stat( fName, &buf );
+  if (result != 0)
+    return(0);
+  
+  return(buf.st_size);
+}
+ 
+LPVOID
+LoadBlobToMemory(LPSTR fName)
+{
+  UCHAR     *ptr = NULL;
+  ULONG     bufSize = GetFileSize(fName);
+
+  if (bufSize == 0)
+  {
+    _unlink(fName);
+    return(NULL);
+  }
+
+  ptr = (UCHAR *)malloc( (size_t) bufSize);
+  if (!ptr)
+  {
+    _unlink(fName);
+    return(NULL);
+  }
+
+  HFILE hFile = _lopen(fName, OF_READ);
+  if (hFile == HFILE_ERROR)
+  {
+    _unlink(fName);
+    free(ptr);
+    return(NULL);
+  }
+
+  UINT numRead = _lread(hFile, ptr, (size_t) bufSize);
+  _lclose(hFile);
+
+  if (numRead != bufSize)
+  {
+    _unlink(fName);
+    free(ptr);
+    return(NULL);
+  }
+
+  _unlink(fName);
+	return(ptr);	
+}
+
+LONG
+WriteMemoryBufferToDisk(LPSTR fName, LONG bufSize, LPSTR buf)
+{
+  if (!buf)
+  {
+    return(-1);
+  }
+
+  HFILE hFile = _lcreat(fName, 0);
+  if (hFile == HFILE_ERROR)
+  {
+    return(-1);
+  }
+
+  LONG writeCount = _lwrite(hFile, buf, (size_t) bufSize);
+  _lclose(hFile);
+
+  if (writeCount != bufSize)
+  {
+    _unlink(fName);
+    return(-1);
+  }
+
+  return(0);
+}
+
+LPSTR
+GetTheTempDirectoryOnTheSystem(void)
+{
+ static UCHAR retPath[_MAX_PATH];
+  
+  if (getenv("TEMP"))
+  {
+    lstrcpy((LPSTR) retPath, getenv("TEMP"));  // environmental variable
+  } 
+  else if (getenv("TMP"))
+  {
+    lstrcpy((LPSTR) retPath, getenv("TMP"));  // How about this environmental variable?
+  }
+  else
+  {
+    GetWindowsDirectory((LPSTR) retPath, sizeof(retPath));
+  }
+
+  return((LPSTR) &(retPath[0]));
+}
+
+#ifdef WIN16
+int WINAPI EXPORT ISGetTempFileName(LPCSTR a_pDummyPath,  LPCSTR a_pPrefix, UINT a_uUnique, LPSTR a_pResultName)
+{
+#ifdef GetTempFileName	// we need the real thing comming up next...
+#undef GetTempFileName
+#endif
+	return GetTempFileName(0, a_pPrefix, a_uUnique, a_pResultName);
+}
+#endif
+
+LONG
+GetTempAttachmentName(LPSTR fName) 
+{
+  UINT        res;
+  static UINT uUnique = 1;
+
+  if (!fName)
+    return(-1);
+
+  LPSTR szTempPath = GetTheTempDirectoryOnTheSystem();
+
+TRYAGAIN:
+#ifdef WIN32
+  res = GetTempFileName(szTempPath, "MAPI", uUnique++, fName);
+#else
+  res = ISGetTempFileName(szTempPath, "MAPI", uUnique++, fName);
+#endif
+
+  if (ValidateFile(fName) != 1) 
+  {
+    if (uUnique < 32000)
+    {
+      goto TRYAGAIN;
+    }
+    else
+    {
+      return(-1);
+    }
+  }
+
+  return 0;
+}
+
+// RICHIE - strip all of the HTML stuff out of the message...
+int
+CheckForInlineHTML(char *noteBody, DWORD len, DWORD *curPos, char *newBody, DWORD *realLen)
+{
+  LPSTR   tags[] = {"&nbsp;", "&lt;", "&amp;", NULL};
+  UCHAR   tagsSubst[] = {' ', '<', '&', NULL};
+  int     x = 0;
+
+  while (tags[x])
+  {
+    // should we check for first tag
+    if ( (*curPos+strlen(tags[x])) < len)
+    {
+      if (strncmp(tags[x], noteBody, strlen(tags[x])) == 0)
+      {
+        *curPos += strlen(tags[x]) - 1;
+        newBody[*realLen] = tagsSubst[x];
+        *realLen += 1;
+        return(-1);
+      }
+    }
+
+    ++x;
+  }
+
+  return(0);
+}
+
+//
+// RICHIE - This is also temporary fix for now...
+//
+LPSTR
+StripSignedMessage(LPSTR noteText, DWORD totalCR) 
+{
+char    *newBuf;
+LPSTR   startTag = "<HTML>";
+LPSTR   endTag = "/HTML>";
+DWORD   i;
+DWORD   realLen = 0;
+DWORD   startPos = 0;
+DWORD   len = strlen(noteText);;
+
+  // create a new buffer...
+  newBuf = (char *) malloc((size_t)(len + totalCR));
+  if (!newBuf)
+    return(noteText);
+
+  newBuf[0] = '\0';
+
+  // First, find the start of the HTML for the message...
+  for (i=0; i<len; i++)
+  {
+    // should we check for first tag
+    if ( (i+strlen(startTag)) < len)
+    {
+      if (strncmp(startTag, (noteText + i), strlen(startTag)) == 0)
+      {
+        startPos = i + strlen(startTag);
+        break;
+      }
+    }
+  }
+
+  // Didn't find any HTML start tag
+  if (i == len)
+    return(noteText);
+
+  BOOL    inHTML = FALSE;
+  BOOL    firstChar = FALSE;
+
+  for (i=startPos; i<len; i++)
+  {
+    char  *ptr = (noteText + i);
+
+    if ( ((*ptr == 0x0D) || (*ptr == 0x20)) && (!firstChar) )
+      continue;
+    else
+      firstChar = TRUE;
+
+    // First, check for the end /HTML> tag
+    if ( (i+strlen(endTag)) < len)
+    {
+      if (strncmp(endTag, ptr, strlen(endTag)) == 0)
+      {
+        break;
+      }
+    }
+
+    // If we are in HTML, check for a ">"...
+    if (inHTML)
+    {
+      if (*ptr == '>')
+      {
+        inHTML = FALSE;
+      }
+      continue;
+    }
+
+    // Check for NEW HTML...
+    if (*ptr == '<')
+    {
+      inHTML = TRUE;
+      continue;
+    }
+
+    if (CheckForInlineHTML(ptr, len, &i, newBuf, &realLen))
+      continue;
+
+    newBuf[realLen++] = *ptr;
+    // Tack on a line feed if we hit a CR...
+    if ( *ptr == 0x0D )
+    {
+      newBuf[realLen++] = 0x0A;
+    }
+  }
+
+  // terminate the buffer - reallocate and move on...
+  newBuf[realLen++] = '\0';
+  newBuf = (LPSTR) realloc(newBuf, (size_t) realLen);
+
+  // check if the realloc worked and if so, free old memory and
+  // return...if not, just return the original buffer
+  if (!newBuf)
+  {
+    return(noteText);
+  }
+  else
+  {
+    free(noteText);
+    return(newBuf);
+  }
+}
+
+//
+// RICHIE - this is a temporary fix for now to get rid of
+// html stuff within the text of a message - if there was a
+// valid noteText buffer coming into this call, we need to 
+// free it on the way out.
+//
+LPSTR
+StripHTML(LPSTR noteText)
+{
+  char    *newBuf;
+  LPSTR   signTag = "This is a cryptographically signed message in MIME format.";
+  LPSTR   mimeTag = "This is a multi-part message in MIME format.";
+
+  DWORD   i;
+  DWORD   realLen = 0;
+  DWORD   totalCR = 0;
+
+  // do sanity checking...
+  if ((!noteText) || (!(*noteText)))
+    return(noteText);
+
+  // more sanity checking...
+  DWORD len = strlen(noteText) + 1;
+  if (len <= 0) 
+    return(noteText);
+
+  // Get the number of CR's in this message and add room for
+  // the LF's
+  for (i=0; i<len; i++)
+  {
+    if ( (*(noteText + i)) == 0x0D )
+      ++totalCR;
+  }
+
+  // This is a check for a signed message in the start of a message
+  // check for sign line...    
+  if ( strlen(signTag) < len)
+  {
+    if ( 
+        (strncmp(signTag, noteText, strlen(signTag)) == 0) ||
+        (strncmp(mimeTag, noteText, strlen(mimeTag)) == 0) 
+       )
+    {
+      return( StripSignedMessage(noteText, totalCR) );
+    }
+  }
+
+  // create a new buffer...
+  newBuf = (char *) malloc((size_t)(len + totalCR));
+  if (!newBuf)
+    return(noteText);
+
+  newBuf[0] = '\0';
+
+  BOOL    firstChar = FALSE;
+
+  // Now do the translation for the body of the note...
+  for (i=0; i<len; i++)
+  {
+    char  *ptr = (noteText + i);
+    
+    if ( ((*ptr == 0x0D) || (*ptr == 0x20)) && (!firstChar) )
+      continue;
+    else
+      firstChar = TRUE;
+
+    if (CheckForInlineHTML(ptr, len, &i, newBuf, &realLen))
+      continue;
+
+    newBuf[realLen++] = *ptr;
+    if ( *ptr == 0x0D )
+    {
+      newBuf[realLen++] = 0x0A;
+    }
+  }
+
+  // terminate the buffer - reallocate and move on...
+  newBuf[realLen++] = '\0';
+  newBuf = (LPSTR) realloc(newBuf, (size_t) realLen);
+
+  // check if the realloc worked and if so, free old memory and
+  // return...if not, just return the original buffer
+  if (!newBuf)
+  {
+    return(noteText);
+  }
+  else
+  {
+    free(noteText);
+    return(newBuf);
+  }
+}
+
+#ifdef WIN16
+
+void
+GetWin16TempName(LPSTR realFileName, LPSTR tempPath, 
+				 LPSTR szTempFileName, UINT uUnique)
+{
+  char	 *dotPtr = strrchr(realFileName, '.');
+  if (dotPtr != NULL)
+  {
+    *dotPtr = '\0';
+  }                
+  
+  int nameLen = lstrlen(realFileName); 
+  if (dotPtr != NULL)
+  {
+    *dotPtr = '.';
+  }
+  
+  if (nameLen <= 7)
+  {
+ 	wsprintf(szTempFileName, "%s\\%d%s", tempPath, uUnique, realFileName);
+  }
+  else
+  {
+  	wsprintf(szTempFileName, "%s\\%d%s", tempPath, uUnique, (realFileName + 1));
+  }
+}
+
+#endif
+
+#define MAXTRY  9999  // How many times do we try..
+
+UINT
+GetTempMailNameWithExtension(LPSTR szTempFileName, 
+                             LPSTR origName)
+{
+  UINT        res = 1;
+  UINT        uUnique = 0;
+  char        *szTempPath = GetTheTempDirectoryOnTheSystem();
+  char        *tmpPtr;
+  char        *realFileName = NULL;
+
+  if ( (origName != NULL) && (*origName != '\0') )
+  {
+    tmpPtr = origName;
+  }
+  else
+  {
+    tmpPtr = szTempFileName;
+  }
+
+  realFileName = strrchr(tmpPtr, '\\');
+  if (!realFileName)
+    realFileName = tmpPtr;
+  else
+    realFileName++;
+
+TRYAGAIN:
+
+#ifdef WIN32
+  if (uUnique == 0)
+  {
+    wsprintf(szTempFileName, "%s\\%s", szTempPath, realFileName);
+  }
+  else
+  {
+    wsprintf(szTempFileName, "%s\\%d_%s", 
+                szTempPath, uUnique, realFileName);
+  }
+#else // WIN16
+  if ( (uUnique == 0) && (strlen(realFileName) <= 12) )
+  {
+    wsprintf(szTempFileName, "%s\\%s", szTempPath, realFileName);
+  }
+  else
+  {              
+    if (uUnique < 10)
+    {
+      GetWin16TempName(realFileName, szTempPath, szTempFileName, uUnique);
+    }
+    else 
+    { 
+      res = ISGetTempFileName(szTempPath, "ns", uUnique++, szTempFileName);    
+    }
+
+    // Now add the correct extension...
+    char *origExt = strrchr(realFileName, '.');
+    if (origExt != NULL)
+    {
+      char *tmpExt = strrchr(szTempFileName, '.');
+      if (tmpExt != NULL)
+      {
+        origExt++;
+        tmpExt++;
+
+        while ( ((tmpExt) && (origExt)) && (*origExt != '\0') )
+        {
+          *tmpExt = *origExt;
+          tmpExt++;
+          origExt++;
+        }
+
+        *tmpExt = '\0';
+      }
+    }
+  }
+#endif
+
+  if ( (ValidateFile(szTempFileName) != 1) && (uUnique < MAXTRY) )
+  {
+    uUnique++;
+    if (uUnique >= MAXTRY)
+      return(1);
+    goto TRYAGAIN;
+  }
+
+  return res;
+}
+
+#define kMaxTempFiles   10
+#define kMaxListLength  (10 * _MAX_PATH)
+
+void GetTempFiles(LPSTR pBuf, int lenBuf)
+{
+  if (!GetConfigInfoStr(szMapiSection, szTempFiles, pBuf, lenBuf, HKEY_ROOT))
+  {
+    *pBuf = 0;
+  }
+}
+
+void WriteTempFiles(LPSTR pBuf)
+{
+  SetConfigInfoStr(szMapiSection, szTempFiles, pBuf, HKEY_ROOT);
+}
+
+void  AddTempFile(LPCSTR pFileName)
+{
+  if ( (!pFileName) || (pFileName[0] == '\0') )
+    return;
+
+  char *files = (char *)malloc(kMaxListLength);
+
+  if (!files)
+    return;
+
+  GetTempFiles(files, kMaxListLength);
+  if ((lstrlen(files) + lstrlen(pFileName) + 2) >= kMaxListLength)
+  {
+    free(files);
+    return;
+  }
+
+  if (lstrlen(files) != 0)
+  {
+          lstrcat(files, ";");
+  }
+
+  lstrcat(files, pFileName);
+  WriteTempFiles(files);
+  free(files);
+}
+
+void DeleteFirstTempFile(LPSTR pFiles)
+{
+  if (!*pFiles)
+    return;
+  LPSTR pTemp = strchr(pFiles, ';');
+  if (pTemp)
+  {
+    *pTemp = 0;
+  }
+ 
+//#ifndef _DEBUG  
+  _unlink(pFiles);
+//#endif
+
+  if (pTemp)
+  {
+    memmove(pFiles, pTemp + 1, lstrlen(pTemp + 1) + 1);
+  }
+  else
+  {
+    *pFiles = 0;
+  }
+}
+
+void 
+RemoveAllTempFiles(void)
+{
+  char *files = (char *)malloc(kMaxListLength);
+
+  if (!files)
+    return;
+
+  GetTempFiles(files, kMaxListLength);
+
+  while (*files)
+  {
+    DeleteFirstTempFile(files);
+  }
+
+  WriteTempFiles(files);
+  free(files);
+}
+
+void CheckAgeTempFiles(void)
+{
+  char *files = (char *)malloc(kMaxListLength);
+
+  if (!files)
+    return;
+
+  GetTempFiles(files, kMaxListLength);
+  int i = 0;
+  LPSTR pTemp = files;
+  while (TRUE)
+  {
+    pTemp = strchr(pTemp, ';');
+    if (!pTemp)
+      break;
+    ++pTemp;
+    ++i;
+  }
+
+  if (i >= 10)
+  {
+    DeleteFirstTempFile(files);
+    WriteTempFiles(files);
+  }
+
+  free(files);
+}
+
+void 
+CleanupMAPITempFiles(void)
+{
+  if (Is_16_OR_32_BIT_CommunitorRunning() == 0)
+  {
+    RemoveAllTempFiles();           // if Communicator not running, clean up all the temp files
+  }
+  else
+  {
+    CheckAgeTempFiles();
+  }
+}
+
+void *
+CleanMalloc(size_t mallocSize)
+{
+  void *ptr = malloc(mallocSize);
+  if (!ptr)
+    return(NULL);
+
+  memset(ptr, 0, mallocSize);
+  return(ptr);
+}
+
+void
+SafeFree(void *ptr)
+{
+  if (!ptr)
+    return;
+
+  free(ptr);
+  ptr = NULL;
+}

mozilla/mailnews/mapi/old/mapi32/mapiutl.h

@@ -0,0 +1,89 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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 the Initial Developer are Copyright (C) 1998
+ * 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 NPL, 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 NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+#ifndef __UTILS_
+#define __UTILS_
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#ifndef MAPI_OLE	// Because MSFT doesn't do this for us :-(
+#include <mapi.h>
+#endif
+
+//
+// Utility functions...
+//
+void    SetLoggingEnabled(BOOL val);    // Set a logging enabled flag
+void    LogString(LPCSTR pStr1);        // Log a string to a file...
+void    BuildMemName(LPSTR name, ULONG winSeed);  // Shared memory name
+HWND    GetCommunicatorIPCWindow(void);    // Get the IPC window we will use...
+DWORD   SanityCheckAttachmentFiles(lpMapiMessage lpMessage); // Check attachments
+DWORD   ValidateFile(LPCSTR szFile);       // Is this a valid file - 0=Yes 1 = NOT_FOUND 2 = OPEN_FAILURE
+
+DWORD   GetFileCount(LPSTR pFiles, LPSTR delimChar); // Get File count from string of file1;file2, etc..
+BOOL    ExtractFile(LPSTR pFiles, LPSTR delimChar, DWORD fIndex, LPSTR fName); // Extract a filename from a string
+
+LPVOID  LoadBlobToMemory(LPSTR fName);  // Load the blob into memory!
+LONG    GetTempAttachmentName(LPSTR fName); // Get a temp file name and put it in fName
+
+UINT    GetTempMailNameWithExtension(LPSTR szTempFileName, LPSTR origName);
+void    CleanupMAPITempFiles(void);
+void  AddTempFile(LPCSTR pFileName);
+
+void    *CleanMalloc(size_t mallocSize);
+void    SafeFree(void *ptr);
+
+//
+// RICHIE - this is a temporary fix for now to get rid of
+// html stuff within the text of a message - if there was a
+// valid noteText buffer coming into this call, we need to 
+// free it on the way out.
+//
+LPSTR   StripHTML(LPSTR noteText);
+
+//
+// Write a buffer to disk
+// Return 0 on success -1 on failure
+//
+LONG    WriteMemoryBufferToDisk(LPSTR fName, LONG bufSize, LPSTR buf); 
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // __UTILS_

mozilla/mailnews/mapi/old/mapi32/port.h

@@ -0,0 +1,303 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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 the Initial Developer are Copyright (C) 1998
+ * 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 NPL, 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 NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+//
+
+#ifndef PORT_H
+#define PORT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*****************************************************************\
+ *                                                               *
+ *  PORT.H                                                       *
+ *                                                               *
+ *  Win16/Win32 portability stuff                                *
+ *                                                               *
+ *  A.Sokolsky                                                   *
+ *      3.10.94 distilled into this header                       *
+ *                                                               *
+\*****************************************************************/
+
+/*
+ * calling conventions
+ */
+#include <assert.h>
+                                                      
+                                                      
+#ifndef CDECL
+#define CDECL __cdecl
+#endif  // CDECL
+
+#ifndef PASCAL
+#define PASCAL __pascal
+#endif  // PASCAL
+
+#ifdef FASTCALL
+#error FASTCALL defined
+#endif // FASTCALL
+
+
+#ifdef NDEBUG
+#define FASTCALL __fastcall
+#else
+#define FASTCALL PASCAL
+#endif // NDEBUG   
+
+
+
+#ifndef HWND2DWORD
+#  ifdef WIN32
+#    define HWND2DWORD(X_hWnd) ( (DWORD)(X_hWnd) )
+#  else // WIN16
+#    define HWND2DWORD(X_hWnd) ( (DWORD)MAKELONG(((WORD)(X_hWnd)), 0) )
+#  endif
+#endif // HWND2DWORD
+
+
+/*
+ * WIN16 - WIN32 compatibility stuff
+ */
+
+#ifdef WIN32
+
+# define DLLEXPORT    __declspec( dllexport )
+# define EXPORT
+# define LOADDS
+# define HUGE
+# ifndef FAR
+#  define FAR
+# endif // FAR
+# ifndef NEAR
+#  define NEAR
+# endif // NEAR 
+# ifdef UNICODE
+#  define SIZEOF(x)   (sizeof(x)/sizeof(WCHAR))
+# else
+#  define SIZEOF(x)   sizeof(x)
+# endif
+
+#else  // !WIN32 == WIN16
+
+# define DLLEXPORT    
+# define EXPORT       __export
+# define LOADDS       __loadds
+# define HUGE         __huge
+# ifndef FAR
+#   define FAR        __far
+#   define NEAR       __near
+# endif  // FAR
+# define CONST const
+# define SIZEOF(x)    sizeof(x)
+# define CHAR char
+# define TCHAR char
+# define WCHAR char
+# ifndef LPTSTR
+#   define LPTSTR LPSTR
+# endif
+# ifndef LPCTSTR 
+#   define LPCTSTR LPCSTR
+# endif
+# define UNREFERENCED_PARAMETER(x) x;
+# ifndef TEXT
+#   define TEXT(x) x
+# endif
+# define GetWindowTextW GetWindowText
+# define lstrcpyW lstrcpy   
+
+# define BN_DBLCLK BN_DOUBLECLICKED // ~~MRJ needed for custom control.
+// ~~MRJ begin Win95 backward compat section
+# define LPWSTR LPSTR
+# define LPCWSTR LPCSTR
+
+// button check state for WIN16
+#ifndef BST_UNCHECKED
+#define BST_UNCHECKED      0x0000
+#endif
+
+#ifndef BST_CHECKED
+#define BST_CHECKED        0x0001
+#endif
+
+
+#ifndef WIN95_COMPAT
+#  define WIN95_COMPAT
+#endif
+
+// ~~MRJ end Win95 compat section.
+
+// critical section API stubs
+typedef DWORD CRITICAL_SECTION;
+typedef CRITICAL_SECTION FAR * LPCRITICAL_SECTION; 
+#ifdef __cplusplus
+inline void InitializeCriticalSection(LPCRITICAL_SECTION lpSection) {}
+inline void DeleteCriticalSection(LPCRITICAL_SECTION lpSection) {}
+inline void EnterCriticalSection(LPCRITICAL_SECTION lpSection) {}
+inline void LeaveCriticalSection(LPCRITICAL_SECTION lpSection) {} 
+#endif // __cplusplus 
+
+// Added for nssock16 ---Neeti
+#ifndef ZeroMemory
+#include <memory.h>
+#define ZeroMemory(PTR, SIZE) memset(PTR, 0, SIZE)
+#endif // ZeroMemory
+
+#endif // WIN16
+
+/*
+ * unix - windows compatibility stuff
+ */
+typedef DWORD u_int32;
+typedef WORD  u_int16;
+typedef BYTE  u_int8;
+#ifdef WIN32
+typedef short int Bool16;
+#else  // WIN16
+typedef BOOL  Bool16;
+#endif // WIN16
+
+/*
+ * Cross Platform Compatibility
+ */
+#ifndef UNALIGNED
+# ifdef _M_ALPHA
+#  define UNALIGNED __unaligned
+# else  // !_M_ALPHA
+#  define UNALIGNED
+# endif // !_M_ALPHA
+#endif  // UNALIGNED
+
+//
+// RICHIE - for the Alpha port
+//
+#ifdef _M_ALPHA
+# undef pascal
+# undef PASCAL
+# if (_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED)
+#  define pascal __stdcall
+#  define PASCAL __stdcall
+# else
+#  define PASCAL
+# endif
+#endif
+
+
+/*
+ * Useful Types
+ */
+typedef char HUGE *HPSTR;
+typedef const char HUGE *HPCSTR;
+typedef unsigned char HUGE *HPBYTE;
+typedef WORD HUGE *HPWORD;
+typedef UINT FAR *LPUINT;
+typedef BOOL (CALLBACK *USERABORTPROC)();
+typedef BOOL (CALLBACK *PROGRESSPROC)(UINT uPos, UINT uRange);
+typedef int INT;   // ~~MRJ a function needed this defined.
+typedef MINMAXINFO FAR *LPMINMAXINFO; // ~~MRJ 
+
+//
+// stuff missing from windows.h
+//
+#ifndef MAKEWORD
+#define MAKEWORD(low, high)    ((WORD)(((BYTE)(low)) | (((WORD)((BYTE)(high))) << 8)))
+#endif // MAKEWORD
+
+#ifdef WIN32
+# ifndef hmemcpy
+#  define hmemcpy memcpy
+# endif // !defined(hmemcpy)
+# define _fmemset memset
+
+# include <malloc.h>
+
+#ifdef __cplusplus
+
+inline BOOL IsGDIObject(HGDIOBJ hObj) { return (hObj != 0); }
+inline void *_halloc(long num, unsigned int size) { return malloc(num * size); }
+inline void _hfree( void *memblock ) { free(memblock); } 
+/*
+inline BOOL IsInstance(HINSTANCE hInst) {
+# ifdef WIN32
+    return (hInst != 0);
+# else // WIN16
+    return (hInst > HINSTANCE_ERROR);
+# endif  
+}  
+*/
+
+#endif // __cplusplus
+
+  WINUSERAPI HANDLE WINAPI LoadImageA(HINSTANCE, LPCSTR, UINT, int, int, UINT);
+
+#endif // WIN32
+
+#ifdef __cplusplus 
+inline BOOL IsInstance(HINSTANCE hInst) {
+# ifdef WIN32
+    return (hInst != 0);
+# else // WIN16
+    return (hInst > HINSTANCE_ERROR);
+# endif  
+} 
+inline void SetWindowSmallIcon(HINSTANCE hInst, HWND hWnd, UINT uIconResourceId) {
+#ifdef WIN32
+# ifndef WM_SETICON
+#   define WM_SETICON 0x0080
+# endif  // WM_SETICON
+# ifndef IMAGE_ICON
+#   define IMAGE_ICON 1
+# endif
+  assert(IsWindow(hWnd));
+  HICON hIcon = (HICON)LoadImageA(hInst, MAKEINTRESOURCE(uIconResourceId), IMAGE_ICON,
+    16, 16, 0);
+  if(NULL != hIcon) {
+    SendMessage(hWnd, WM_SETICON, FALSE, (LPARAM)hIcon);
+  } else {
+    HICON hIcon = LoadIcon(hInst, MAKEINTRESOURCE(uIconResourceId));
+    assert(hIcon != 0);
+    SendMessage(hWnd, WM_SETICON, FALSE, (LPARAM)hIcon);
+  }
+#endif // WIN32
+}
+#endif // __cplusplus
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* PORT_H */

mozilla/mailnews/mapi/old/mapi32/resource.h

@@ -0,0 +1,54 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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 the Initial Developer are Copyright (C) 1998
+ * 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 NPL, 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 NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+//{{NO_DEPENDENCIES}}
+// Microsoft Developer Studio generated include file.
+// Used by mapi32.rc
+//
+#define ID_DIALOG_QAHOOK                101
+#define ID_DIALOG_MAPI                  101
+#define ID_ICON_APP                     102
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        103
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1000
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif

mozilla/mailnews/mapi/old/mapi32/smem.cpp

@@ -0,0 +1,172 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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 the Initial Developer are Copyright (C) 1998
+ * 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 NPL, 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 NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+//
+//  smem.cpp - This deals with all shared memory functions needed for 
+//  the MAPI component of Communicator
+//  Written by: Rich Pizzarro (rhp@netscape.com)
+//  November 1997
+//
+#include <windows.h>
+#include <windowsx.h>
+
+#include "mapismem.h"
+
+#ifndef ZeroMemory
+#include <memory.h>
+#define ZeroMemory(PTR, SIZE) memset(PTR, 0, SIZE)
+#endif // ZeroMemory
+
+// 
+// *create new* shared memory chunk 
+// once this is created, use the pointer
+// to the segment to to store data 
+// e.g.: 
+//     lpString = "string for communicator"; 
+//     lstrcpy((LPSTR)pData->m_buf[0], lpString); 
+//  
+CSharedMem *
+NSCreateSharedMemory(DWORD memSize, LPCTSTR memName, HANDLE *hSharedMemory)
+{
+#ifdef WIN32
+
+  BOOL bExistedBefore;
+  CSharedMem *pData;
+
+  LPCTSTR szObjectName = memName; 
+  DWORD dwSize = sizeof(CSharedMem) + memSize; 
+  *hSharedMemory = CreateFileMapping( 
+    (HANDLE)0xFFFFFFFF,0,PAGE_READWRITE,0,dwSize,szObjectName); 
+  if(*hSharedMemory == 0) 
+  { 
+    return NULL; 
+  } 
+  bExistedBefore = (GetLastError() == ERROR_ALREADY_EXISTS); 
+  if(bExistedBefore) 
+  { 
+  	return NULL;
+  } 
+
+  pData = (CSharedMem *)MapViewOfFile( 
+            *hSharedMemory, FILE_MAP_ALL_ACCESS, 0, 0, 0); 
+  if(pData == NULL) 
+  { 
+    return NULL; 
+  } 
+
+  ZeroMemory(pData, dwSize); 
+  pData->m_dwSize = memSize; 
+
+  return pData;
+#else
+  CSharedMem 	*sMemChunk = NULL;
+  DWORD dwSize = memSize = (sizeof(CSharedMem) + memSize); 
+
+  if (sMemChunk != NULL)
+	  return(sMemChunk);
+
+  sMemChunk = (CSharedMem *) GlobalAllocPtr(GMEM_MOVEABLE, dwSize);
+  ZeroMemory(sMemChunk, (size_t) dwSize);
+  sMemChunk->m_dwSize = dwSize;   // Missing in Communicator code!
+  return(sMemChunk);
+
+#endif // WIN32
+}
+
+// 
+// *open existing* shared memory chunk 
+// once you have the pointer to the new segment 
+// use this pointer to access data, e.g.: 
+// 
+CSharedMem *
+NSOpenExistingSharedMemory(LPCTSTR memName, HANDLE *hSharedMemory)
+{
+#ifdef WIN32
+  CSharedMem *pData;
+  DWORD dwSize;
+
+  LPCTSTR szObjectName = memName; 
+  *hSharedMemory = OpenFileMapping( 
+    PAGE_READWRITE,FALSE,szObjectName); 
+  if(*hSharedMemory == 0) 
+  { 
+    return NULL; 
+  } 
+
+  pData = (CSharedMem *)MapViewOfFile( 
+              *hSharedMemory,FILE_MAP_ALL_ACCESS,0,0,0); 
+  if(pData == NULL) 
+  { 
+    return NULL; 
+  } 
+  
+  dwSize = pData->m_dwSize; 
+  return pData;
+#else
+
+  return(NULL);   // In Win16, this is really meaningless...
+
+#endif
+}  
+
+// 
+// to close shared memory segment
+// 
+void
+NSCloseSharedMemory(CSharedMem *pData, HANDLE hSharedMemory)
+{
+#ifdef WIN32
+  if(pData != 0) 
+  { 
+    UnmapViewOfFile(pData); 
+    pData = 0; 
+  } 
+
+  if(hSharedMemory != 0) 
+  { 
+    CloseHandle(hSharedMemory); 
+    hSharedMemory = 0; 
+  } 
+#else
+
+	if (pData != NULL)
+	{
+		GlobalFreePtr(pData);
+		pData = NULL;
+	}
+
+#endif // WIN32
+}

mozilla/mailnews/mapi/old/mapi32/trace.cpp

@@ -0,0 +1,68 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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 the Initial Developer are Copyright (C) 1998
+ * 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 NPL, 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 NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+#include <windows.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <tchar.h>
+#include "trace.h"
+
+#ifdef _DEBUG 
+
+#ifndef WIN16
+void CDECL AfxTrace(LPCTSTR lpszFormat, ...)
+#else                                       
+void CDECL AfxTrace(LPCSTR lpszFormat, ...)
+#endif
+{
+  va_list args;
+	va_start(args, lpszFormat);
+
+	int nBuf;
+	TCHAR szBuffer[512];
+
+	nBuf = _vstprintf(szBuffer, lpszFormat, args);
+	va_end(args);
+  OutputDebugString(szBuffer); 
+  return;
+}
+
+BOOL AfxAssertFailedLine(LPCSTR lpszFileName, int nLine)
+{    
+	return TRUE;
+}
+
+#endif

mozilla/mailnews/mapi/old/mapi32/trace.h

@@ -0,0 +1,81 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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 the Initial Developer are Copyright (C) 1998
+ * 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 NPL, 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 NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+#include <windows.h>
+
+#ifdef _DEBUG
+BOOL AfxAssertFailedLine(LPCSTR lpszFileName, int nLine);
+
+#ifndef WIN16
+void CDECL AfxTrace(LPCTSTR lpszFormat, ...);
+#else
+void CDECL AfxTrace(LPCSTR lpszFormat, ...);
+#endif
+
+#define TRACE              ::AfxTrace
+#define THIS_FILE          __FILE__
+#define ASSERT(f) \
+	do \
+	{ \
+	if (!(f) && AfxAssertFailedLine(THIS_FILE, __LINE__)) \
+		AfxDebugBreak(); \
+	} while (0) \
+
+#define VERIFY(f)          ASSERT(f)
+#define TRACE_FN(name) LogFn __logFn(name)
+class LogFn
+{
+public:
+	LogFn(LPCSTR pFnName) {m_pFnName = pFnName; TRACE("--%s: In--\n", pFnName);}
+	~LogFn() {TRACE("--%s: Out--\n", m_pFnName);}
+private:
+	LPCSTR m_pFnName;
+};
+#else
+// NDEBUG
+#define ASSERT(f)          ((void)0)
+#define VERIFY(f)          ((void)(f))
+#define ASSERT_VALID(pOb)  ((void)0)
+#define DEBUG_ONLY(f)      ((void)0)   
+#ifdef WIN32
+inline void CDECL AfxTrace(LPCTSTR, ...) { }
+#else
+inline void CDECL AfxTrace(LPCSTR, ...) { }
+#endif
+#define TRACE              1 ? (void)0 : ::AfxTrace
+#define TRACE_FN(name)
+#endif // _DEBUG
+

mozilla/mailnews/mapi/old/mapi32/xpapi.cpp

@@ -0,0 +1,347 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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 the Initial Developer are Copyright (C) 1998
+ * 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 NPL, 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 NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+//
+//  XPAPI.CPP
+//  API implementation file for mapi16.dll and mapi32.dll
+//  Written by: Rich Pizzarro (rhp@netscape.com)
+//  November 1997
+//
+#include <windows.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include "xpapi.h"
+#include "mapiutl.h"
+
+WORD LOAD_DS XP_CallProcess(LPCSTR pPath, LPCSTR pCmdLine)
+{            
+	WORD wReturn = 0;
+#ifndef WIN16
+	STARTUPINFO startupInfo;
+	PROCESS_INFORMATION processInfo;
+
+	memset(&startupInfo, 0, sizeof(startupInfo));
+	startupInfo.cb = sizeof(startupInfo);
+	if (wReturn = CreateProcess(pPath, (LPTSTR)pCmdLine, NULL, NULL, FALSE, CREATE_DEFAULT_ERROR_MODE | CREATE_NEW_PROCESS_GROUP, NULL, NULL, &startupInfo, &processInfo))
+	{
+		WaitForInputIdle(processInfo.hProcess, 120000);
+	}
+#else       
+	// char szMsg[80];	
+	char szExecute[512];
+	lstrcpy(szExecute, pPath);
+	lstrcat(szExecute, " ");
+	lstrcat(szExecute, pCmdLine);
+	wReturn = WinExec(szExecute,SW_SHOW);
+	
+	if (wReturn < 32) 
+	{
+	    wReturn = 0;
+	}
+#endif
+	return wReturn;
+}
+
+HKEY LOAD_DS RegOpenParent(LPCSTR pSection, HKEY hRootKey, REGSAM access)
+{
+	HKEY hKey;
+#ifndef WIN16
+	if (RegOpenKeyEx(hRootKey, pSection, 0, access, &hKey) != ERROR_SUCCESS)
+	{
+		return(NULL);
+	}        
+#else
+    if (RegOpenKey(hRootKey, pSection, &hKey) != ERROR_SUCCESS)
+    {
+    	return(NULL);
+    }
+#endif
+	return(hKey);
+}
+
+HKEY LOAD_DS RegCreateParent(LPCSTR pSection, HKEY hMasterKey)
+{
+	HKEY hKey;
+	if (RegCreateKey(hMasterKey, pSection, &hKey) != ERROR_SUCCESS)
+	{
+		return(NULL);
+	}        
+	return(hKey);
+}
+
+BOOL LOAD_DS GetConfigInfoStr(LPCSTR pSection, LPCSTR pKey, LPSTR pBuf, int lenBuf, HKEY hMasterKey)
+{
+	HKEY hKey;
+	hKey = RegOpenParent(pSection, hMasterKey, KEY_QUERY_VALUE);
+	if (!hKey)
+	{
+		return(FALSE);
+	}
+
+	DWORD len = (DWORD)lenBuf;
+#ifndef WIN16
+	BOOL retVal = (RegQueryValueEx(hKey, pKey, NULL, NULL, (LPBYTE)pBuf, &len) == ERROR_SUCCESS);
+#else
+	BOOL retVal = (RegQueryValue(hKey, pKey, pBuf, (long far*)&len) == ERROR_SUCCESS);
+#endif
+	RegCloseKey(hKey);
+	return(retVal);
+}
+
+BOOL LOAD_DS GetConfigInfoNum(LPCSTR pSection, LPCSTR pKey, DWORD* pVal, HKEY hMasterKey)
+{
+	HKEY hKey;
+	hKey = RegOpenParent(pSection, hMasterKey, KEY_QUERY_VALUE);
+	if (!hKey)
+	{
+		return(FALSE);
+	}
+
+	DWORD len = sizeof(DWORD);
+#ifndef WIN16
+	BOOL retVal = (RegQueryValueEx(hKey, pKey, NULL, NULL, (LPBYTE)pVal, &len) == ERROR_SUCCESS);
+#else
+	BOOL retVal = (RegQueryValue(hKey, pKey, (char far*)pVal, (long far*)&len) == ERROR_SUCCESS);
+#endif
+	RegCloseKey(hKey);
+	return(retVal);
+}
+
+BOOL LOAD_DS SetConfigInfoStr(LPCSTR pSection, LPCSTR pKey, LPSTR pStr, HKEY hMasterKey)
+{
+	HKEY hKey;
+	hKey = RegCreateParent(pSection, hMasterKey);
+	if (!hKey)
+	{
+		return(FALSE);
+	}
+#ifndef WIN16
+	BOOL retVal = (RegSetValueEx(hKey, pKey, 0, REG_SZ, (LPBYTE)pStr, lstrlen(pStr) + 1) == ERROR_SUCCESS);
+#else
+	BOOL retVal = (RegSetValue(hKey, pKey, REG_SZ, pStr, lstrlen(pStr) + 1) == ERROR_SUCCESS);
+#endif
+	RegCloseKey(hKey);
+	return(retVal);
+}
+
+
+BOOL LOAD_DS XP_GetInstallDirectory(LPCSTR pcurVersionSection, LPCSTR pInstallDirKey, LPSTR path, UINT nSize, HKEY hKey)
+{   
+#ifdef WIN32   
+	if (!GetConfigInfoStr(pcurVersionSection, pInstallDirKey, path, nSize, hKey))
+	{  
+		return FALSE;
+	}
+	else
+	{
+		return TRUE;
+	}       
+#else
+	if ( 0 < GetPrivateProfileString(pcurVersionSection, pInstallDirKey,"ERROR", path, nSize, szNetscapeINI))
+	{
+		return TRUE;
+	}
+	else
+	{
+		return FALSE;
+	}
+#endif
+}
+
+
+BOOL LOAD_DS XP_GetVersionInfoString(LPCSTR pNavigatorSection, LPCSTR pCurrentVersionKey, LPSTR pcurVersionStr, UINT nSize, HKEY hKey)
+{ 
+#ifdef WIN32
+	if (!GetConfigInfoStr(pNavigatorSection, pCurrentVersionKey, pcurVersionStr, nSize, HKEY_LOCAL_MACHINE))
+	{
+		return FALSE;
+	}               
+	else
+	{
+		return TRUE;
+	}
+#else 
+	if ( 0 < GetPrivateProfileString(pNavigatorSection, pCurrentVersionKey,"ERROR", pcurVersionStr, nSize, szNetscapeINI))
+	{
+		return TRUE;
+	}
+	else
+	{
+		return FALSE;
+	}
+#endif
+
+}   
+
+DWORD LOAD_DS XP_GetInstallLocation(LPSTR pPath, UINT nSize)
+{           
+char curVersionStr[256]; 
+char curVersionSection[256];
+
+  if (!pPath) 
+    return  MAPI_E_LOGON_FAILURE;
+  
+#ifdef WIN32
+  if (!XP_GetVersionInfoString(szNavigatorSection, szCurrentVersionKey, curVersionStr, 
+    sizeof(curVersionStr), HKEY_LOCAL_MACHINE))
+  {
+    return (MAPI_E_LOGON_FAILURE);
+  }
+  
+  wsprintf(curVersionSection, szNavigatorCurVersionSection, curVersionStr);
+		
+  if (!XP_GetInstallDirectory(curVersionSection, szInstallDirKey, pPath, 
+    nSize, HKEY_LOCAL_MACHINE))
+  {
+    return (MAPI_E_ACCESS_DENIED);
+    
+  }
+  
+  lstrcat(pPath, "\\");
+  lstrcat(pPath, "Program\\netscape.exe");
+  
+  return SUCCESS_SUCCESS;
+#else
+  if (32 == Is_16_OR_32_BIT_CommunitorRunning())
+  {   
+    if (!GetConfigInfoStr("snews\\shell\\open", "command", curVersionStr, sizeof(curVersionStr), HKEY_CLASSES_ROOT))
+    {
+      return (MAPI_E_ACCESS_DENIED);
+    }
+    else
+    {	
+      char *pFind = strstr(curVersionStr,"-h");
+      
+      if (pFind)
+      {
+        *pFind=0;
+        lstrcpy(pPath,curVersionStr);
+      }
+      else
+      {
+        return (MAPI_E_ACCESS_DENIED);
+      }
+    }
+    
+    return SUCCESS_SUCCESS;
+  }
+  else //setup up to start navstart since we are a sixteen bit DLL.
+  {
+    if (!XP_GetVersionInfoString(szNavigatorSection, szCurrentVersionKey, curVersionStr, sizeof(curVersionStr), HKEY_LOCAL_MACHINE))
+    {
+      return (MAPI_E_LOGON_FAILURE);
+    }
+    
+    wsprintf(curVersionSection, szNavigatorCurVersionSection, curVersionStr);
+    
+    if (!XP_GetInstallDirectory(curVersionSection, szInstallDirKey, pPath,nSize, HKEY_LOCAL_MACHINE))
+    {
+      return (MAPI_E_ACCESS_DENIED);		
+    }
+    
+    lstrcat(pPath, "\\");
+    lstrcat(pPath, "NAVSTART.EXE");
+    return SUCCESS_SUCCESS;	
+  }
+#endif
+}
+
+int LOAD_DS Is_16_OR_32_BIT_CommunitorRunning()
+{
+  if (FindWindow("AfxFrameOrView", NULL) && !FindWindow("aHiddenFrameClass", NULL))
+		return(16);
+	else if (FindWindow("aHiddenFrameClass", NULL))
+		return(32);
+	else 
+		return 0;
+}
+
+// size of buffer to use for copying files.
+#define COPYBUFSIZE 1024
+
+#ifdef WIN16
+     
+BOOL Win16CopyFile(LPCSTR a_Src, LPCSTR a_Dest, BOOL a_bOverwrite)
+{
+	OFSTRUCT ofSrc, ofDest;
+	HFILE hSrc, hDest;
+	BOOL bResult;
+	
+	ofDest.cBytes = ofSrc.cBytes = sizeof(OFSTRUCT);
+	hDest = OpenFile(a_Dest, &ofDest, OF_EXIST);
+	if (hDest != HFILE_ERROR && !a_bOverwrite)
+		bResult = FALSE;	// file exists but caller doesn't want file overwritten
+	else { // file either doesn't exist, or caller wants it overwritten.
+		hSrc = OpenFile(a_Src, &ofSrc, OF_READ);
+		hDest = OpenFile(a_Dest, &ofDest, OF_WRITE | OF_CREATE);
+		if (hSrc != HFILE_ERROR && hDest != HFILE_ERROR) {
+			unsigned char buf[COPYBUFSIZE];
+			UINT bufsize =  COPYBUFSIZE;
+			UINT bytesread;
+			
+			bResult = TRUE;			
+			while (0 != (bytesread = _lread(hSrc, (LPVOID)buf, bufsize))) {
+				if ((bytesread == HFILE_ERROR) || 	// check for read error...
+											// and write error
+					(bytesread != _lwrite(hDest, (LPVOID)buf, bytesread))) {
+					bResult = FALSE; // could be out of diskspace
+					break;
+				}
+			}
+		}
+		else
+			bResult = FALSE;
+
+		if (hSrc != HFILE_ERROR)
+			_lclose(hSrc);
+		if (hDest != HFILE_ERROR)
+			_lclose(hDest);
+	}
+			
+	return bResult;
+}
+
+#endif  // WIN16
+
+BOOL LOAD_DS 
+XP_CopyFile(LPCSTR lpExistingFile, LPCSTR lpNewFile, BOOL bFailifExist)
+{                                                  
+#ifdef WIN32
+  return	CopyFile(lpExistingFile, lpNewFile, bFailifExist);
+#else                                                             
+  return    Win16CopyFile(lpExistingFile, lpNewFile, TRUE);
+#endif
+}    

mozilla/mailnews/mapi/old/mapi32/xpapi.h

@@ -0,0 +1,138 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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 the Initial Developer are Copyright (C) 1998
+ * 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 NPL, 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 NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+//
+//  Various routines for MAPI functions.
+//  Written by: Rich Pizzarro (rhp@netscape.com)
+//  November 1997
+//
+#ifndef __XPAPI_H
+#define __XPAPI_H
+
+#ifdef WIN16
+
+#include <string.h>
+#include <direct.h>
+#include <shellapi.h>
+#include <stdlib.h>
+#else
+#include <winreg.h>
+#endif 
+ 
+#ifdef WIN16
+extern "C" {
+#ifndef MAPI_OLE	// Because MSFT doesn't do this for us :-(
+#include <mapi.h>
+#endif 
+}           
+#else
+//#include <mapi.h>
+#endif
+
+
+#ifdef WIN32
+#define MAPI_IMPLEMENT(param) param PASCAL 
+#define LOAD_DS
+#else        
+#define LOAD_DS 	__loadds
+#define MAPI_IMPLEMENT(param) extern "C" param FAR PASCAL
+ 
+#endif   
+
+#ifdef WIN16
+#define _MAX_PATH 				260  /* max. length of full pathname*/
+#define MAPI_E_LOGON_FAILURE  	3 
+#define MAPI_E_ACCESS_DENIED	6  
+#define INVALID_HANDLE_VALUE 	(HANDLE)-1  
+#define KEY_QUERY_VALUE 		0x0001  
+#define HKEY_LOCAL_MACHINE 		((HKEY)0x80000002)
+#define HKEY_ROOT				HKEY_CLASSES_ROOT
+#else 
+#define HKEY_ROOT				((HKEY)0x80000002)
+#endif
+
+//
+// registry keys
+//
+#ifdef WIN32
+static char szNavigatorSection[] = "Software\\Netscape\\Netscape Navigator";
+static char szNavigatorCurVersionSection[] = "Software\\Netscape\\Netscape Navigator\\%s\\Main";
+static char szCurrentVersionKey[] = "CurrentVersion";
+static char szInstallDirKey[] = "Install Directory";
+static char szMapiSection[] = "Software\\Netscape\\Netscape Navigator\\MAPI";
+static char szTempFiles[] = "TempFiles";  
+static char szMapiLog[] = "NSMAPI32.LOG";
+#else 
+//32 bit key strings for trying to read the 32bit registry
+static char szNavigatorSection32[] = "Software\\Netscape\\Netscape Navigator";
+static char szNavigatorCurVersionSection32[] = "Software\\Netscape\\Netscape Navigator\\%s\\Main";
+static char szMapiSection32[] = "Software\\Netscape\\Netscape Navigator\\MAPI";
+
+// ini section and key strings 
+static char szNetscapeINI[] = "nscp.ini";
+static char szNavigatorSection[] = "Netscape Navigator";
+static char szNavigatorCurVersionSection[] = "Netscape Navigator-%s";
+static char szCurrentVersionKey[] = "CurrentVersion";
+static char szInstallDirKey[] = "Install Directory";
+static char szMapiSection[] = "MAPI";
+static char szTempFiles[] = "TempFiles";
+static char szExeName[] = "NAVSTART.EXE";
+static char szMapiLog[] = "NSMAPI16.LOG";
+#endif                                   
+
+//Since REGSAM is just an ACCESS_MASK which is just a DWORD and it's not 
+//declared in win16 we'll make one hear for the purpose of keeping parameters
+//the same even though the access rights don't get used for win16.
+
+typedef DWORD REGSAM;
+
+
+// XP declarations
+
+int 	LOAD_DS Is_16_OR_32_BIT_CommunitorRunning();
+WORD 	LOAD_DS XP_CallProcess(LPCSTR pPath, LPCSTR pCmdLine);
+HKEY LOAD_DS RegOpenParent(LPCSTR pSection, HKEY hRootKey, REGSAM access);
+HKEY LOAD_DS RegCreateParent(LPCSTR pSection, HKEY hMasterKey);
+BOOL LOAD_DS GetConfigInfoStr(LPCSTR pSection, LPCSTR pKey, LPSTR pBuf, int lenBuf, HKEY hMasterKey);
+BOOL LOAD_DS GetConfigInfoNum(LPCSTR pSection, LPCSTR pKey, DWORD* pVal, HKEY hMasterKey);
+BOOL LOAD_DS SetConfigInfoStr(LPCSTR pSection, LPCSTR pKey, LPSTR pStr, HKEY hMasterKey); 
+
+BOOL  LOAD_DS XP_GetInstallDirectory(LPCSTR pcurVersionSection, LPCSTR pInstallDirKey, LPSTR path, UINT nSize, HKEY hKey); 
+BOOL  LOAD_DS XP_GetVersionInfoString(LPCSTR pNavigatorSection, LPCSTR pCurrentVersionKey, LPSTR pcurVersionStr, UINT nSize, HKEY hKey);
+DWORD LOAD_DS XP_GetInstallLocation(LPSTR pPath, UINT nSize);
+BOOL LOAD_DS  XP_CopyFile(LPCSTR lpExistingFile, LPCSTR lpNewFile, BOOL bFailifExist);
+
+#endif    // __XPAPI_H

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

@@ -0,0 +1,31 @@
+#!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): 
+
+DEPTH=..\..\..
+MODULE=mime
+
+EXPORTS =							\
+	nscpmapi.h		\
+    $(NULL)
+
+
+include <$(DEPTH)\config\rules.mak>
+

mozilla/mailnews/mapi/old/public/nscpmapi.h

@@ -0,0 +1,351 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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 the Initial Developer are Copyright (C) 1998
+ * 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 NPL, 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 NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+//
+// This is a header file for the MAPI support within 
+// Communicator. 
+//
+// Written by: Rich Pizzarro (rhp@netscape.com)
+//
+#ifndef _NSCPMAPI
+#define _NSCPMAPI
+
+#ifndef MAPI_OLE	// Because MSFT doesn't do this for us :-(
+#include <mapi.h>     // for MAPI specific types...        
+#endif 
+
+#ifdef WIN16
+typedef unsigned char	UCHAR;
+#endif 
+
+
+#define           MAX_NAME_LEN    256
+#define           MAX_PW_LEN      256
+#define           MAX_MSGINFO_LEN 512
+#define           MAX_CON         4     // Maximum MAPI session supported
+#define           MAX_POINTERS    32
+
+//
+// The MAPI class that will act as the internal mechanism for 
+// Communicator to control multiple MAPI sessions.
+//
+class CMAPIConnection 
+{
+protected:
+  LONG        m_ID;
+  BOOL        m_defaultConnection;  
+  LONG        m_sessionCount;
+  LONG        m_messageIndex;
+  LPVOID      m_cookie;
+  UCHAR       m_messageFindInfo[MAX_MSGINFO_LEN];
+  UCHAR       m_profileName[MAX_NAME_LEN];
+  UCHAR       m_password[MAX_PW_LEN];
+
+  // Methods
+
+public:
+  CMAPIConnection  ( LONG, LPSTR, LPSTR );
+  ~CMAPIConnection ( );
+
+  // ID related methods
+  LONG   GetID( ) { return m_ID; } ;
+
+  // Dealing with the default session...
+  BOOL    IsDefault( ) { return m_defaultConnection; } ;
+  void    SetDefault( BOOL flag ) { m_defaultConnection = flag; } ;
+
+  // For handling multiple sessions on a profile name...
+  LONG    GetSessionCount( ) { return m_sessionCount; } ;
+  void    IncrementSessionCount() { ++m_sessionCount; } ;
+  void    DecrementSessionCount() { --m_sessionCount; } ;
+
+  // Information retrieval stuff...
+  LPSTR   GetProfileName( ) { return (LPSTR) m_profileName; };
+  LPSTR   GetPassword( ) { return (LPSTR) m_password; };
+
+  // Dealing with message information...
+  void    SetMessageIndex( LONG mIndex ) { m_messageIndex = mIndex; } ;
+  LONG    GetMessageIndex( ) { return m_messageIndex; };
+
+  void    SetMessageFindInfo( LPSTR info ) { lstrcpy((LPSTR)m_messageFindInfo, info); } ;
+  LPSTR   GetMessageFindInfo( ) { return (LPSTR) m_messageFindInfo; };
+
+  // For enumerating Messages...
+  void    SetMapiListContext( LPVOID cookie) { m_cookie = cookie; } ;
+  LPVOID  GetMapiListContext( ) { return m_cookie; };
+};
+
+//
+// Defines needed for requests being made with the WM_COPYDATA call...
+//
+typedef enum {
+    NSCP_MAPIStartRequestID = 0,
+    NSCP_MAPILogon,
+    NSCP_MAPILogoff,
+    NSCP_MAPIFree,
+    NSCP_MAPISendMail,
+    NSCP_MAPISendDocuments, 
+    NSCP_MAPIFindNext,
+    NSCP_MAPIReadMail,
+    NSCP_MAPISaveMail,
+    NSCP_MAPIDeleteMail,
+    NSCP_MAPIAddress,
+    NSCP_MAPIDetails,
+    NSCP_MAPIResolveName,
+    NSCP_MAPIEndRequestID       // Note: this is a marker for MAPI IPC requests
+} NSCP_IPC_REQUEST;
+
+//
+// This is to keep track of the pointers allocated in the MAPI DLL
+// and deal with them correctly.
+//
+#define   MAPI_MESSAGE_TYPE     0
+#define   MAPI_RECIPIENT_TYPE   1
+ 
+typedef struct {
+  LPVOID    lpMem;
+  UCHAR     memType;
+} memTrackerType;
+
+//
+// This is the generic message that WM_COPYDATA will send to the
+// Communicator product to allow it to attach to shared memory.
+// NOTE: On Win16, this will simply reference a pointer.
+//
+typedef struct {
+  UCHAR   smemName[64]; // Name of shared memory
+  DWORD   smemSize;     // Size of shared memory
+  LPVOID  lpsmem;       // Will be really used in Win16 only
+} MAPIIPCType;
+
+//
+// These are message specific structures that will be used for 
+// the various MAPI operations.
+//
+typedef struct {
+  ULONG     ulUIParam;
+  FLAGS     flFlags;
+  LHANDLE   lhSession;
+  DWORD     ipcWorked;      // Necessary for IPC check with Communicator
+// LPSTR     strSequence,  // LPSTR lpszProfileName, LPSTR lpszPassword
+// This is here to document the fact there will be a string sequence at 
+// this location
+} MAPILogonType;
+
+typedef struct {
+  LHANDLE   lhSession;
+  ULONG     ulUIParam;
+  FLAGS     flFlags;
+  DWORD     ipcWorked;      // Necessary for IPC check with Communicator
+} MAPILogoffType;
+
+typedef struct {
+  LHANDLE   lhSession;
+  ULONG     ulUIParam;
+  FLAGS     flFlags;
+  DWORD     ipcWorked;      // Necessary for IPC check with Communicator
+  // The following is the "FLAT" representation of the (lpMapiMessage lpMessage) 
+  // argument of this structure 
+  FLAGS     MSG_flFlags;          // unread,return receipt                  
+  ULONG     MSG_nRecipCount;      // Number of recipients                   
+  ULONG     MSG_nFileCount;       // # of file attachments                  
+  ULONG     MSG_ORIG_ulRecipClass; //  Recipient class - MAPI_TO, MAPI_CC, MAPI_BCC, MAPI_ORIG
+  BYTE      dataBuf[1];           // For easy referencing
+  //
+  // This is where it gets CONFUSING...the following buffer of memory is a
+  // contiguous chunk of memory for various strings that are part of this
+  // multilevel structure. For any of the following structure, any numbers
+  // are represented by strings that will have to be converted back to numeric
+  // values with atoi() calls.
+
+  // String 0: LPSTR lpszSubject;            // Message Subject
+  // String 1: LPSTR lpszNoteText FILE NAME; // Message Text will be
+  //           stored into a temp file and this will be the pointer to that file.
+  // String 2: LPSTR lpszDateReceived;       // in YYYY/MM/DD HH:MM format
+  // String 3: LPSTR lpszConversationID;     // conversation thread ID
+  //
+  // The following are for the originator of the message. Only ONE of these.
+  //
+  // String 4: LPSTR lpszName;             // Originator name                           
+  // String 5: LPSTR lpszAddress;          // Originator address (optional)             
+  //
+  // The following strings are for the recipients for this message. There are
+  // MSG_nRecipCount of these in a row:
+  //
+  // for (i=0; i<MSG_nRecipCount; i++)
+  //      String x: LPSTR lpszRecipClass (ULONG) // Recipient class - MAPI_TO, MAPI_CC, MAPI_BCC, MAPI_ORIG        
+  //      String x: LPSTR lpszName;     // Recipient N name                           
+  //      String x: LPSTR lpszAddress;  // Recipient N address (optional)             
+  //
+  // Now, finally, add the attachments for this beast. There are MSG_nFileCount
+  // attachments so it would look like the following:
+  //
+  // for (i=0; i<MSG_nFileCount; i++)
+  //
+  //      String x: LPSTR lpszPathName // Fully qualified path of the attached file. 
+  //                                   // This path should include the disk drive letter and directory name.
+  //      String x: LPSTR lpszFileName // The display name for the attached file
+  //
+} MAPISendMailType;
+
+typedef struct {
+    ULONG     ulUIParam;
+    ULONG     nFileCount;
+    DWORD     ipcWorked;      // Necessary for IPC check with Communicator
+    BYTE      dataBuf[1];     // For easy referencing
+    //
+    // The sequence of strings to follow are groups of PathName/FileName couples.
+    // The strings will be parsed in MAPI[32].DLL and then put into this format:
+    //
+    // for (i=0; i<nFileCount; i++)
+    //
+    //      String x: LPSTR lpszPathName // Fully qualified path of the attached file. 
+    //                                   // This path should include the disk drive letter and directory name.
+    //      String x: LPSTR lpszFileName // The display name for the attached file
+} MAPISendDocumentsType;
+
+typedef struct {
+  LHANDLE     lhSession;
+  ULONG       ulUIParam;
+  FLAGS       flFlags;
+  DWORD       ipcWorked;      // Necessary for IPC check with Communicator
+  UCHAR       lpszSeedMessageID[MAX_MSGINFO_LEN];
+  UCHAR       lpszMessageID[MAX_MSGINFO_LEN];
+} MAPIFindNextType;
+
+typedef struct {
+  LHANDLE     lhSession;
+  ULONG       ulUIParam;
+  DWORD       ipcWorked;      // Necessary for IPC check with Communicator
+  UCHAR       lpszMessageID[MAX_MSGINFO_LEN];
+} MAPIDeleteMailType;
+
+typedef struct {
+  LHANDLE     lhSession;
+  ULONG       ulUIParam;
+  FLAGS       flFlags;
+  DWORD       ipcWorked;      // Necessary for IPC check with Communicator
+  UCHAR       lpszName[MAX_NAME_LEN];
+  // These are returned by Communicator
+  UCHAR       lpszABookID[MAX_NAME_LEN];         
+  UCHAR       lpszABookName[MAX_NAME_LEN];            
+  UCHAR       lpszABookAddress[MAX_NAME_LEN];         
+} MAPIResolveNameType;
+
+typedef struct {
+  LHANDLE     lhSession;
+  ULONG       ulUIParam;
+  FLAGS       flFlags;
+  DWORD       ipcWorked;      // Necessary for IPC check with Communicator
+  UCHAR       lpszABookID[MAX_NAME_LEN];
+} MAPIDetailsType;
+
+typedef struct {
+  LHANDLE     lhSession;
+  ULONG       ulUIParam;
+  FLAGS       flFlags;
+  DWORD       ipcWorked;      // Necessary for IPC check with Communicator
+  UCHAR       lpszMessageID[MAX_MSGINFO_LEN];
+  //
+  // The following is the "FLAT" representation of the (lpMapiMessage lpMessage) 
+  // argument of this structure 
+  //
+  FLAGS     MSG_flFlags;          // unread, return or receipt                  
+  ULONG     MSG_nRecipCount;      // Number of recipients                   
+  ULONG     MSG_nFileCount;       // # of file attachments                  
+  ULONG     MSG_ORIG_ulRecipClass; //  Recipient class - MAPI_TO, MAPI_CC, MAPI_BCC, MAPI_ORIG
+  //
+  // Output parameter for blob of information that will live on disk. 
+  //
+  UCHAR       lpszBlob[MAX_MSGINFO_LEN];    // file name on disk
+  //
+  // The format of this blob of information will be:
+  //
+  // String 0: LPSTR lpszSubject;            // Message Subject
+  // String 1: LPSTR lpszNoteText FILE NAME; // Message Text will be
+  //           stored into a temp file and this will be the pointer to that file.
+  // String 2: LPSTR lpszDateReceived;       // in YYYY/MM/DD HH:MM format
+  // String 3: LPSTR lpszConversationID;     // conversation thread ID
+  //
+  // The following are for the originator of the message. Only ONE of these.
+  //
+  // String 4: LPSTR lpszName;             // Originator name                           
+  // String 5: LPSTR lpszAddress;          // Originator address (optional)             
+  //
+  // The following strings are for the recipients for this message. There are
+  // MSG_nRecipCount of these in a row:
+  //
+  // for (i=0; i<MSG_nRecipCount; i++)
+  //      String x: LPSTR lpszName;             // Recipient N name                           
+  //      String x: LPSTR lpszAddress;          // Recipient N address (optional)             
+  //      String x: LPSTR lpszRecipClass        // recipient class - sprintf of ULONG
+  //
+  // Now, finally, add the attachments for this beast. There are MSG_nFileCount
+  // attachments so it would look like the following:
+  //
+  // for (i=0; i<MSG_nFileCount; i++)
+  //
+  //      String x: LPSTR lpszPathName // Fully qualified path of the attached file. 
+  //                                   // This path should include the disk drive letter and directory name.
+  //      String x: LPSTR lpszFileName // The display name for the attached file
+  //
+} MAPIReadMailType;
+
+typedef struct {
+  LHANDLE   lhSession;
+  ULONG     ulUIParam;
+  FLAGS     flFlags;
+  UCHAR     lpszCaption[MAX_MSGINFO_LEN];
+  DWORD     ipcWorked;      // Necessary for IPC check with Communicator
+  // The following is the "FLAT" representation of the (lpMapiRecipDesc lpRecips) 
+  // argument of this structure 
+  ULONG     nRecips;              // number of recips to start with...
+  ULONG     nNewRecips;           // number of recips returned...
+  UCHAR     lpszBlob[MAX_MSGINFO_LEN];    // file name for blob of information 
+                                          // that will live on disk. 
+  BYTE      dataBuf[1];           // For easy referencing
+  //
+  // The following contiguous chunk of memory is the buffer that holds 
+  // the recipients to load into the address picker...
+  //
+  // for (i=0; i<MSG_nRecipCount; i++)
+  //      String x: LPSTR lpszRecipClass (ULONG) // Recipient class - MAPI_TO, MAPI_CC, MAPI_BCC, MAPI_ORIG        
+  //      String x: LPSTR lpszName;     // Recipient N name                           
+  //      String x: LPSTR lpszAddress;  // Recipient N address (optional)             
+  //
+} MAPIAddressType;
+
+#endif    // _NSCPMAPI

mozilla/mailnews/mapi/old/tests/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): 
+
+DEPTH=..\..\..
+
+
+DIRS=mapitest
+
+include <$(DEPTH)\config\rules.mak>

mozilla/mailnews/mapi/old/tests/mapitest/main.cpp

@@ -0,0 +1,239 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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 the Initial Developer are Copyright (C) 1998
+ * 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 NPL, 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 NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+//
+#include <windows.h>
+#include <windowsx.h>
+#include <string.h>
+#include <stdlib.h>
+#ifndef MAPI_OLE	// Because MSFT doesn't do this for us :-(
+#include <mapi.h>
+#endif
+
+#include "port.h"
+#include "resource.h"
+
+#ifndef WM_PAINTICON
+#define WM_PAINTICON              0x26
+#endif // WM_PAINTICON
+
+/* 
+ * Forward Declarations...
+ */
+BOOL      InitInstance(HINSTANCE hInstance, int nCmdShow);
+BOOL CALLBACK LOADDS MyDlgProc(HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam);
+extern void ProcessCommand(HWND hWnd, int id, HWND hCtl, UINT codeNotify);
+BOOL      OpenMAPI(void);
+void      CloseMAPI(void);
+
+/*  
+ * Global variables
+ */
+HINSTANCE   hInst;
+HWND      hWnd;    
+
+#ifdef WIN16
+HICON	hIconApp;
+#endif
+
+char NEAR szAppName[] = "Netscape QA Helper";
+char NEAR szShortAppName[] = "QAHelper";
+char szClassName[] = "Netscape_QAHelper_Class_Name";
+
+void
+AppCleanup(void)
+{
+  extern void    DoMAPILogoff(HWND hWnd);
+  static BOOL isDone = FALSE;
+
+  if (isDone)
+    return;
+
+  extern LHANDLE    mapiSession;
+
+  if (mapiSession != 0)
+  {
+    DoMAPILogoff(hWnd);
+  }
+
+  CloseMAPI();
+  isDone = TRUE;
+}
+
+BOOL 
+InitInstance(HINSTANCE hInstance, int nCmdShow)
+{
+  /* Create a main window for this application instance.  */
+  hWnd = CreateDialog((HINSTANCE) hInstance, 
+            MAKEINTRESOURCE(ID_DIALOG),
+            (HWND) NULL, (DLGPROC) MyDlgProc);
+  
+  if (!hWnd)
+    return FALSE;
+  else
+    return TRUE;
+}
+
+BOOL InitApp(void)
+{
+#ifndef WIN16
+  WNDCLASS wc;
+  wc.style         = 0; 
+  wc.lpfnWndProc   = DefDlgProc; 
+  wc.cbClsExtra    = 0; 
+  wc.cbWndExtra    = DLGWINDOWEXTRA; 
+  wc.hInstance     = hInst; 
+  wc.hIcon         = LoadIcon(hInst, MAKEINTRESOURCE(ID_ICON_APP)); 
+  wc.hCursor       = LoadCursor(0, IDC_ARROW); 
+  wc.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1);
+  wc.lpszMenuName  = NULL; 
+  wc.lpszClassName = szClassName;
+  
+  if(!RegisterClass(&wc))
+    return FALSE;
+
+#else                
+  hIconApp = LoadIcon(hInst, MAKEINTRESOURCE(ID_ICON_APP));
+#endif
+  
+  return TRUE;
+} // end InitApp
+
+// Win Main 
+int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
+{
+  MSG     msg;
+  
+  hInst = hInstance;
+  
+  if (!InitApp()) 
+  { 
+    return FALSE;
+  }
+  
+  if (!InitInstance(hInstance, nCmdShow)) 
+  {    
+    return FALSE;
+  }
+
+  if (!OpenMAPI()) 
+  {    
+    return FALSE;
+  }
+
+  ShowWindow(hWnd, SW_SHOW);
+  
+  // Start the application
+  while ((GetMessage(&msg, (HWND) NULL, (UINT) NULL, (UINT) NULL)))
+  {
+    if(IsDialogMessage(hWnd, &msg))
+      continue;
+    
+    TranslateMessage(&msg);
+    DispatchMessage(&msg);
+  }
+
+  return(msg.wParam);
+}
+
+BOOL CALLBACK LOADDS 
+MyDlgProc(HWND hWndMain, UINT wMsg, WPARAM wParam, LPARAM lParam) 
+{
+  switch (wMsg) 
+  {
+  case WM_INITDIALOG: 
+    {
+      hWnd = hWndMain;
+	    SetDlgItemText(hWnd, ID_EDIT_ROW, "0");
+    }
+    break;
+    
+  case WM_CLOSE:
+    {
+      DestroyWindow(hWnd);
+      break;
+    }
+
+  case WM_DESTROY:
+    {
+      AppCleanup();
+
+#ifndef WIN16
+      UnregisterClass(szClassName, hInst);
+#else              
+      // Destroy the 16 bit windows icon
+      if(hIconApp != 0)
+        DestroyIcon(hIconApp);
+#endif
+      
+      PostQuitMessage(0);
+      break;
+    }
+  case WM_COMMAND:
+    HANDLE_WM_COMMAND(hWnd, wParam, lParam, ProcessCommand);
+    break;
+    
+  case WM_QUERYDRAGICON:     
+#ifdef WIN16
+    return (BOOL)hIconApp;
+#endif
+    
+  case WM_PAINTICON:
+#ifdef WIN16    
+    SetClassWord(hWnd, GCW_HICON, 0);
+    
+    // fall trough
+  case WM_PAINT: 
+    {
+      if(!IsIconic(hWnd))
+        return FALSE;
+      PAINTSTRUCT ps;
+      HDC hDC = BeginPaint(hWnd, &ps);
+      SetMapMode(hDC, MM_TEXT);
+      DrawIcon(hDC, 2, 2, hIconApp);
+      EndPaint(hWnd, &ps);
+      break;
+    } 
+#endif //WIN16
+    break;    // RICHIE - if this is not here NT 3.51 Pukes!!!!  
+
+  default:
+    return FALSE;
+  }
+  
+  //~~av  return (DefWindowProc(hWnd, wMsg, wParam, lParam));
+  return TRUE;
+}

mozilla/mailnews/mapi/old/tests/mapitest/makefile.win

@@ -0,0 +1,240 @@
+# Microsoft Developer Studio Generated NMAKE File, Based on mapitest.dsp
+!IF "$(CFG)" == ""
+CFG=mapitest - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to mapitest - Win32 Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "mapitest - Win32 Release" && "$(CFG)" != "mapitest - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "mapitest.mak" CFG="mapitest - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "mapitest - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "mapitest - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+!IF  "$(CFG)" == "mapitest - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+ALL : "$(OUTDIR)\mapitest.exe"
+
+export :
+libs :
+install : 
+
+clobber_all : clobber
+
+clobber:
+	-@erase "$(INTDIR)\main.obj"
+	-@erase "$(INTDIR)\mapimail.obj"
+	-@erase "$(INTDIR)\mapiproc.obj"
+	-@erase "$(INTDIR)\mtest32.res"
+	-@erase "$(INTDIR)\readmail.obj"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(OUTDIR)\mapitest.exe"
+	-@erase "$(OUTDIR)\mapitest.pch"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /Fp"$(INTDIR)\mapitest.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\mtest32.res" /d "NDEBUG" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\mapitest.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /incremental:no /pdb:"$(OUTDIR)\mapitest.pdb" /machine:I386 /out:"$(OUTDIR)\mapitest.exe" 
+LINK32_OBJS= \
+	"$(INTDIR)\main.obj" \
+	"$(INTDIR)\mapimail.obj" \
+	"$(INTDIR)\mapiproc.obj" \
+	"$(INTDIR)\readmail.obj" \
+	"$(INTDIR)\mtest32.res"
+
+"$(OUTDIR)\mapitest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ELSEIF  "$(CFG)" == "mapitest - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+ALL : "$(OUTDIR)\mapitest.exe"
+
+export :
+libs :
+install : 
+
+clobber_all : clobber
+
+clobber :
+	-@erase "$(INTDIR)\main.obj"
+	-@erase "$(INTDIR)\mapimail.obj"
+	-@erase "$(INTDIR)\mapiproc.obj"
+	-@erase "$(INTDIR)\mtest32.res"
+	-@erase "$(INTDIR)\readmail.obj"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(INTDIR)\vc60.pdb"
+	-@erase "$(OUTDIR)\mapitest.exe"
+	-@erase "$(OUTDIR)\mapitest.ilk"
+	-@erase "$(OUTDIR)\mapitest.pdb"
+	-@erase "$(OUTDIR)\mapitest.pch"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /Fp"$(INTDIR)\mapitest.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\mtest32.res" /d "_DEBUG" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\mapitest.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /incremental:yes /pdb:"$(OUTDIR)\mapitest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mapitest.exe" /pdbtype:sept 
+LINK32_OBJS= \
+	"$(INTDIR)\main.obj" \
+	"$(INTDIR)\mapimail.obj" \
+	"$(INTDIR)\mapiproc.obj" \
+	"$(INTDIR)\readmail.obj" \
+	"$(INTDIR)\mtest32.res"
+
+"$(OUTDIR)\mapitest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("mapitest.dep")
+!INCLUDE "mapitest.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "mapitest.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "mapitest - Win32 Release" || "$(CFG)" == "mapitest - Win32 Debug"
+SOURCE=.\main.cpp
+
+"$(INTDIR)\main.obj" : $(SOURCE) "$(INTDIR)"
+
+
+SOURCE=.\mapimail.cpp
+
+"$(INTDIR)\mapimail.obj" : $(SOURCE) "$(INTDIR)"
+
+
+SOURCE=.\mapiproc.cpp
+
+"$(INTDIR)\mapiproc.obj" : $(SOURCE) "$(INTDIR)"
+
+
+SOURCE=.\mtest32.rc
+
+"$(INTDIR)\mtest32.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) $(RSC_PROJ) $(SOURCE)
+
+
+SOURCE=.\readmail.cpp
+
+"$(INTDIR)\readmail.obj" : $(SOURCE) "$(INTDIR)"
+
+
+
+!ENDIF 
+

mozilla/mailnews/mapi/old/tests/mapitest/mapimail.cpp

@@ -0,0 +1,772 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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 the Initial Developer are Copyright (C) 1998
+ * 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 NPL, 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 NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+//
+#include <windows.h>
+#include <windowsx.h>   
+#include <string.h>
+#include <mapi.h>         
+#include <stdlib.h>
+
+#include "port.h"
+#include "resource.h"
+
+//
+// Variables...
+// 
+extern HINSTANCE   m_hInstMapi;
+extern LHANDLE     mapiSession;
+
+// 
+// Forward declarations...
+//
+void          DoMAPIFreeBuffer(HWND hWnd, LPVOID buf, BOOL alert);
+extern void   ShowMessage(HWND hWnd, LPSTR msg);
+void          DoMAPISendMail(HWND hWnd);
+void          DoMAPISendDocuments(HWND hWnd);
+void          DoMAPISaveMail(HWND hWnd);
+void          DoMAPIAddress(HWND hWnd);
+extern void   SetFooter(LPSTR msg);
+extern LPSTR  GetMAPIError(LONG errorCode);
+
+void 
+ProcessMailCommand(HWND hWnd, int id, HWND hCtl, UINT codeNotify) 
+{ 
+  switch (id) 
+  {
+  case IDCANCEL:
+    EndDialog(hWnd, 0);
+    break;
+
+  case ID_BUTTON_MAPISENDMAIL:
+    DoMAPISendMail(hWnd);
+    break;
+
+  case ID_BUTTON_MAPISENDDOCUMENTS:
+    DoMAPISendDocuments(hWnd);
+    break;
+
+  case ID_BUTTON_MAPISAVEMAIL:
+    DoMAPISaveMail(hWnd);
+    break;
+
+  case ID_BUTTON_MAPIADDRESS:
+    DoMAPIAddress(hWnd);
+    break;
+
+  default:
+    break;
+  }
+}
+
+BOOL CALLBACK LOADDS 
+MailDlgProc(HWND hWndMain, UINT wMsg, WPARAM wParam, LPARAM lParam) 
+{
+  switch (wMsg) 
+  {
+  case WM_INITDIALOG: 
+    break;
+
+  case WM_COMMAND:
+    HANDLE_WM_COMMAND(hWndMain, wParam, lParam, ProcessMailCommand);
+    break;
+
+  default:
+    return FALSE;
+  }
+  
+  return TRUE;
+}
+
+static LPSTR lpszDelimChar = ";";
+
+void
+TackItOn(LPSTR fileBuf, LPSTR nameBuf, LPSTR addOn)
+{
+  if (addOn[0] != '\0')
+  {
+    lstrcat(fileBuf, addOn);
+    lstrcat(fileBuf, lpszDelimChar);
+
+    lstrcat(nameBuf, "NAMEOF.FILE");
+    lstrcat(nameBuf, lpszDelimChar);
+  }
+}
+
+void
+DoMAPISendDocuments(HWND hWnd)
+{
+  ULONG (FAR PASCAL *lpfnMAPISendDocuments) (ULONG ulUIParam, 
+          LPTSTR lpszDelimChar, LPTSTR lpszFullPaths, 
+          LPTSTR lpszFileNames, ULONG ulReserved);
+
+#ifdef WIN16		
+  (FARPROC&) lpfnMAPISendDocuments = GetProcAddress(m_hInstMapi, "MAPISENDDOCUMENTS"); 
+#else
+  (FARPROC&) lpfnMAPISendDocuments = GetProcAddress(m_hInstMapi, "MAPISendDocuments"); 
+#endif
+  
+  if (!lpfnMAPISendDocuments)
+  {
+    ShowMessage(hWnd, "Unable to locate MAPI function.");
+    return;
+  }
+
+  char  msg[1024];
+  char  tempFileName[_MAX_PATH] = "";
+  char  lpszFullPaths[(_MAX_PATH + 1) * 4] = "";
+  char  lpszFileNames[(_MAX_PATH + 1) * 4] = "";
+
+  // Now get the names of the files to attach...
+  GetDlgItemText(hWnd, ID_EDIT_ATTACH1, tempFileName, sizeof(tempFileName));
+  TackItOn(lpszFullPaths, lpszFileNames, tempFileName); 
+
+  GetDlgItemText(hWnd, ID_EDIT_ATTACH2, tempFileName, sizeof(tempFileName));
+  TackItOn(lpszFullPaths, lpszFileNames, tempFileName); 
+
+  GetDlgItemText(hWnd, ID_EDIT_ATTACH3, tempFileName, sizeof(tempFileName));
+  TackItOn(lpszFullPaths, lpszFileNames, tempFileName); 
+
+  GetDlgItemText(hWnd, ID_EDIT_ATTACH4, tempFileName, sizeof(tempFileName));
+  TackItOn(lpszFullPaths, lpszFileNames, tempFileName); 
+
+  LONG  rc = (*lpfnMAPISendDocuments)
+        ( (ULONG) hWnd,        
+          lpszDelimChar, 
+          lpszFullPaths, 
+          lpszFileNames, 
+          0);
+
+  if (rc == SUCCESS_SUCCESS)
+  {
+    ShowMessage(hWnd, "Success with MAPISendDocuments");
+    SetFooter("MAPISendDocuments success");
+  }
+  else
+  {
+    wsprintf(msg, "FAILURE: Return code %d from MAPISendDocuments\nError=[%s]", 
+                      rc, GetMAPIError(rc));
+    ShowMessage(hWnd, msg);
+    SetFooter("MAPISendDocuments failed");
+  }
+}
+
+void
+FreeMAPIFile(lpMapiFileDesc pv)
+{
+  if (!pv)
+    return;
+
+  if (pv->lpszPathName != NULL)   
+    free(pv->lpszPathName);
+
+  if (pv->lpszFileName != NULL)   
+    free(pv->lpszFileName);
+}
+
+void
+FreeMAPIRecipient(lpMapiRecipDesc pv)
+{
+  if (!pv)
+    return;
+
+  if (pv->lpszName != NULL)   
+    free(pv->lpszName);
+
+  if (pv->lpszAddress != NULL)
+    free(pv->lpszAddress);
+
+  if (pv->lpEntryID != NULL)
+    free(pv->lpEntryID);  
+}
+
+void
+FreeMAPIMessage(lpMapiMessage pv)
+{
+  ULONG i;
+
+  if (!pv)
+    return;
+
+  if (pv->lpszSubject != NULL)
+    free(pv->lpszSubject);
+
+  if (pv->lpszNoteText)
+      free(pv->lpszNoteText);
+  
+  if (pv->lpszMessageType)
+    free(pv->lpszMessageType);
+  
+  if (pv->lpszDateReceived)
+    free(pv->lpszDateReceived);
+  
+  if (pv->lpszConversationID)
+    free(pv->lpszConversationID);
+  
+  if (pv->lpOriginator)
+    FreeMAPIRecipient(pv->lpOriginator);
+  
+  for (i=0; i<pv->nRecipCount; i++)
+  {
+    if (&(pv->lpRecips[i]) != NULL)
+    {
+      FreeMAPIRecipient(&(pv->lpRecips[i]));
+    }
+  }
+
+  if (pv->lpRecips != NULL)
+  {
+    free(pv->lpRecips);
+  }
+
+  for (i=0; i<pv->nFileCount; i++)
+  {
+    if (&(pv->lpFiles[i]) != NULL)
+    {
+      FreeMAPIFile(&(pv->lpFiles[i]));
+    }
+  }
+
+  if (pv->lpFiles != NULL)
+  {
+    free(pv->lpFiles);
+  }
+  
+  free(pv);
+  pv = NULL;
+}
+
+void
+DoMAPISendMail(HWND hWnd)
+{
+  ULONG (FAR PASCAL *lpfnMAPISendMail) (LHANDLE lhSession, ULONG ulUIParam, 
+                  lpMapiMessage lpMessage, FLAGS flFlags, ULONG ulReserved);
+
+#ifdef WIN16		
+  (FARPROC&) lpfnMAPISendMail = GetProcAddress(m_hInstMapi, "MAPISENDMAIL"); 
+#else
+  (FARPROC&) lpfnMAPISendMail = GetProcAddress(m_hInstMapi, "MAPISendMail"); 
+#endif
+  
+  if (!lpfnMAPISendMail)
+  {
+    ShowMessage(hWnd, "Unable to locate MAPI function.");
+    return;
+  }          
+
+  FLAGS   flFlags = 0;
+  char    msg[512];
+  char    file1[_MAX_PATH] = "";
+  char    file2[_MAX_PATH] = "";
+  char    file3[_MAX_PATH] = "";
+  char    file4[_MAX_PATH] = "";
+  char    toAddr[128];
+  char    ccAddr[128];
+  char    bccAddr[128];
+  char    subject[128];
+  char    noteText[4096];
+  char    dateReceived[128] = "N/A";
+  char    threadID[128] = "N/A";;
+  char    origName[128] = "N/A";;
+  char    origAddress[128] = "N/A";;
+
+  GetDlgItemText(hWnd, ID_EDIT_TOADDRESS, toAddr, sizeof(toAddr));
+  GetDlgItemText(hWnd, ID_EDIT_CCADDRESS, ccAddr, sizeof(ccAddr));
+  GetDlgItemText(hWnd, ID_EDIT_BCCADDRESS, bccAddr, sizeof(bccAddr));
+  GetDlgItemText(hWnd, ID_EDIT_SUBJECT, subject, sizeof(subject));
+  GetDlgItemText(hWnd, ID_EDIT_NOTETEXT, noteText, sizeof(noteText));
+
+  // Do the one flag we support for this call...
+  if (BST_CHECKED == Button_GetCheck(GetDlgItem(hWnd, ID_CHECK_SHOWDIALOG)))
+  {
+    flFlags |= MAPI_DIALOG;
+  }
+
+  // Build the message to send off...
+  lpMapiMessage  msgPtr = (MapiMessage *)malloc(sizeof(MapiMessage));
+  if (msgPtr == NULL)
+  {
+    return;
+  }
+  
+  memset(msgPtr, 0, sizeof(MapiMessage)); 
+
+  //
+  // At this point, we need to populate the structure of information
+  // we are passing in via the *lppMessage
+  //
+
+  // Set all of the general information first!
+  msgPtr->lpszSubject = strdup(subject);
+  msgPtr->lpszNoteText = strdup(noteText);
+  msgPtr->lpszDateReceived = strdup(dateReceived);
+  msgPtr->lpszConversationID = strdup(threadID);
+  msgPtr->flFlags = flFlags;
+
+  // Now deal with the recipients of this message
+  DWORD       realRecips = 0;
+  if (toAddr[0] != '\0')    ++realRecips;
+  if (ccAddr[0] != '\0')    ++realRecips;
+  if (bccAddr[0] != '\0')   ++realRecips;
+
+  msgPtr->lpRecips = (lpMapiRecipDesc) malloc((size_t) (sizeof(MapiRecipDesc) * realRecips));
+  if (!msgPtr->lpRecips)
+  {
+    FreeMAPIMessage(msgPtr);
+    return;
+  }
+
+  msgPtr->nRecipCount = realRecips;
+  memset(msgPtr->lpRecips, 0, (size_t) (sizeof(MapiRecipDesc) * msgPtr->nRecipCount));
+
+  DWORD       rCount = 0;
+  if (toAddr[0] != '\0')
+  {
+    msgPtr->lpRecips[rCount].lpszName = strdup(toAddr);
+    msgPtr->lpRecips[rCount].lpszAddress = strdup(toAddr);
+    msgPtr->lpRecips[rCount].ulRecipClass = MAPI_TO;
+    rCount++;
+  }
+
+  if (ccAddr[0] != '\0')
+  {
+    msgPtr->lpRecips[rCount].lpszName = strdup(ccAddr);
+    msgPtr->lpRecips[rCount].lpszAddress = strdup(ccAddr);
+    msgPtr->lpRecips[rCount].ulRecipClass = MAPI_CC;    
+    rCount++;
+  }
+
+  if (bccAddr[0] != '\0')
+  {
+    msgPtr->lpRecips[rCount].lpszName = strdup(bccAddr);
+    msgPtr->lpRecips[rCount].lpszAddress = strdup(bccAddr);
+    msgPtr->lpRecips[rCount].ulRecipClass = MAPI_BCC;
+    rCount++;
+  }
+
+  // Now get the names of the files to attach...
+  GetDlgItemText(hWnd, ID_EDIT_ATTACH1, file1, sizeof(file1));
+  GetDlgItemText(hWnd, ID_EDIT_ATTACH2, file2, sizeof(file2));
+  GetDlgItemText(hWnd, ID_EDIT_ATTACH3, file3, sizeof(file3));
+  GetDlgItemText(hWnd, ID_EDIT_ATTACH4, file4, sizeof(file4));
+
+  DWORD       realFiles = 0;
+  if (file1[0] != '\0')    ++realFiles;
+  if (file2[0] != '\0')    ++realFiles;
+  if (file3[0] != '\0')    ++realFiles;
+  if (file4[0] != '\0')    ++realFiles;
+
+  // Now deal with the list of attachments! Since the nFileCount should be set
+  // correctly, this loop will automagically be correct
+  //
+  msgPtr->nFileCount = realFiles;
+  if (realFiles > 0)
+  {
+    msgPtr->lpFiles = (lpMapiFileDesc) malloc((size_t) (sizeof(MapiFileDesc) * realFiles));
+    if (!msgPtr->lpFiles)
+    {
+      FreeMAPIMessage(msgPtr);
+      return;
+    }
+
+    memset(msgPtr->lpFiles, 0, (size_t) (sizeof(MapiFileDesc) * msgPtr->nFileCount));
+  }
+
+  rCount = 0;
+  if (file1[0] != '\0')
+  {
+    msgPtr->lpFiles[rCount].lpszPathName = strdup((LPSTR)file1);
+    msgPtr->lpFiles[rCount].lpszFileName = strdup((LPSTR)file1);
+    ++rCount;
+  }
+
+  if (file2[0] != '\0')
+  {
+    msgPtr->lpFiles[rCount].lpszPathName = strdup((LPSTR)file2);
+    msgPtr->lpFiles[rCount].lpszFileName = strdup((LPSTR)file2);
+    ++rCount;
+  }
+
+  if (file3[0] != '\0')
+  {
+    msgPtr->lpFiles[rCount].lpszPathName = strdup((LPSTR)file3);
+    msgPtr->lpFiles[rCount].lpszFileName = strdup((LPSTR)file3);
+    ++rCount;
+  }
+
+  if (file4[0] != '\0')
+  {
+    msgPtr->lpFiles[rCount].lpszPathName = strdup((LPSTR)file4);
+    msgPtr->lpFiles[rCount].lpszFileName = strdup((LPSTR)file4);
+    ++rCount;
+  }
+
+  // Finally, make the call...
+  LONG  rc = (*lpfnMAPISendMail)
+           (mapiSession, 
+           (ULONG) hWnd, 
+           msgPtr, 
+           flFlags, 
+           0);
+
+  if (rc == SUCCESS_SUCCESS)
+  {
+    ShowMessage(hWnd, "Success with MAPISendMail");
+    SetFooter("MAPISendMail success");
+  }
+  else
+  {
+    wsprintf(msg, "FAILURE: Return code %d from MAPISendMail\nError=[%s]", 
+                      rc, GetMAPIError(rc));
+    ShowMessage(hWnd, msg);
+    SetFooter("MAPISendMail failed");
+  }
+
+  // Now cleanup and move on...
+  FreeMAPIMessage(msgPtr);
+}
+
+void
+DoMAPISaveMail(HWND hWnd)
+{
+  ULONG (FAR PASCAL *lpfnMAPISaveMail) (LHANDLE lhSession, ULONG ulUIParam, 
+                  lpMapiMessage lpMessage, FLAGS flFlags, ULONG ulReserved,
+                  LPTSTR lpszMessageID);
+
+#ifdef WIN16		
+  (FARPROC&) lpfnMAPISaveMail = GetProcAddress(m_hInstMapi, "MAPISAVEMAIL"); 
+#else
+  (FARPROC&) lpfnMAPISaveMail = GetProcAddress(m_hInstMapi, "MAPISaveMail"); 
+#endif
+  
+  if (!lpfnMAPISaveMail)
+  {
+    ShowMessage(hWnd, "Unable to locate MAPI function.");
+    return;
+  }          
+
+  FLAGS   flFlags = 0;
+  char    msg[512];
+  char    file1[_MAX_PATH] = "";
+  char    file2[_MAX_PATH] = "";
+  char    file3[_MAX_PATH] = "";
+  char    file4[_MAX_PATH] = "";
+  char    toAddr[128];
+  char    ccAddr[128];
+  char    bccAddr[128];
+  char    subject[128];
+  char    noteText[4096];
+  char    dateReceived[128] = "N/A";
+  char    threadID[128] = "N/A";;
+  char    origName[128] = "N/A";;
+  char    origAddress[128] = "N/A";;
+
+  GetDlgItemText(hWnd, ID_EDIT_TOADDRESS, toAddr, sizeof(toAddr));
+  GetDlgItemText(hWnd, ID_EDIT_CCADDRESS, ccAddr, sizeof(ccAddr));
+  GetDlgItemText(hWnd, ID_EDIT_BCCADDRESS, bccAddr, sizeof(bccAddr));
+  GetDlgItemText(hWnd, ID_EDIT_SUBJECT, subject, sizeof(subject));
+  GetDlgItemText(hWnd, ID_EDIT_NOTETEXT, noteText, sizeof(noteText));
+
+  // Build the message to send off...
+  lpMapiMessage  msgPtr = (MapiMessage *)malloc(sizeof(MapiMessage));
+  if (msgPtr == NULL)
+  {
+    return;
+  }
+  
+  memset(msgPtr, 0, sizeof(MapiMessage)); 
+
+  //
+  // At this point, we need to populate the structure of information
+  // we are passing in via the *lppMessage
+  //
+
+  // Set all of the general information first!
+  msgPtr->lpszSubject = strdup(subject);
+  msgPtr->lpszNoteText = strdup(noteText);
+  msgPtr->lpszDateReceived = strdup(dateReceived);
+  msgPtr->lpszConversationID = strdup(threadID);
+  msgPtr->flFlags = flFlags;
+
+  // Now deal with the recipients of this message
+  DWORD       realRecips = 0;
+  if (toAddr[0] != '\0')    ++realRecips;
+  if (ccAddr[0] != '\0')    ++realRecips;
+  if (bccAddr[0] != '\0')   ++realRecips;
+
+  msgPtr->lpRecips = (lpMapiRecipDesc) malloc((size_t) (sizeof(MapiRecipDesc) * realRecips));
+  if (!msgPtr->lpRecips)
+  {
+    FreeMAPIMessage(msgPtr);
+    return;
+  }
+
+  msgPtr->nRecipCount = realRecips;
+  memset(msgPtr->lpRecips, 0, (size_t) (sizeof(MapiRecipDesc) * msgPtr->nRecipCount));
+
+  DWORD       rCount = 0;
+  if (toAddr[0] != '\0')
+  {
+    msgPtr->lpRecips[rCount].lpszName = strdup(toAddr);
+    msgPtr->lpRecips[rCount].lpszAddress = strdup(toAddr);
+    msgPtr->lpRecips[rCount].ulRecipClass = MAPI_TO;
+    rCount++;
+  }
+
+  if (ccAddr[0] != '\0')
+  {
+    msgPtr->lpRecips[rCount].lpszName = strdup(ccAddr);
+    msgPtr->lpRecips[rCount].lpszAddress = strdup(ccAddr);
+    msgPtr->lpRecips[rCount].ulRecipClass = MAPI_CC;    
+    rCount++;
+  }
+
+  if (bccAddr[0] != '\0')
+  {
+    msgPtr->lpRecips[rCount].lpszName = strdup(bccAddr);
+    msgPtr->lpRecips[rCount].lpszAddress = strdup(bccAddr);
+    msgPtr->lpRecips[rCount].ulRecipClass = MAPI_BCC;
+    rCount++;
+  }
+
+  // Now get the names of the files to attach...
+  GetDlgItemText(hWnd, ID_EDIT_ATTACH1, file1, sizeof(file1));
+  GetDlgItemText(hWnd, ID_EDIT_ATTACH2, file2, sizeof(file2));
+  GetDlgItemText(hWnd, ID_EDIT_ATTACH3, file3, sizeof(file3));
+  GetDlgItemText(hWnd, ID_EDIT_ATTACH4, file4, sizeof(file4));
+
+  DWORD       realFiles = 0;
+  if (file1[0] != '\0')    ++realFiles;
+  if (file2[0] != '\0')    ++realFiles;
+  if (file3[0] != '\0')    ++realFiles;
+  if (file4[0] != '\0')    ++realFiles;
+
+  // Now deal with the list of attachments! Since the nFileCount should be set
+  // correctly, this loop will automagically be correct
+  //
+  msgPtr->nFileCount = realFiles;
+  if (realFiles > 0)
+  {
+    msgPtr->lpFiles = (lpMapiFileDesc) malloc((size_t) (sizeof(MapiFileDesc) * realFiles));
+    if (!msgPtr->lpFiles)
+    {
+      FreeMAPIMessage(msgPtr);
+      return;
+    }
+
+    memset(msgPtr->lpFiles, 0, (size_t) (sizeof(MapiFileDesc) * msgPtr->nFileCount));
+  }
+
+  rCount = 0;
+  if (file1[0] != '\0')
+  {
+    msgPtr->lpFiles[rCount].lpszPathName = strdup((LPSTR)file1);
+    msgPtr->lpFiles[rCount].lpszFileName = strdup((LPSTR)file1);
+    ++rCount;
+  }
+
+  if (file2[0] != '\0')
+  {
+    msgPtr->lpFiles[rCount].lpszPathName = strdup((LPSTR)file2);
+    msgPtr->lpFiles[rCount].lpszFileName = strdup((LPSTR)file2);
+    ++rCount;
+  }
+
+  if (file3[0] != '\0')
+  {
+    msgPtr->lpFiles[rCount].lpszPathName = strdup((LPSTR)file3);
+    msgPtr->lpFiles[rCount].lpszFileName = strdup((LPSTR)file3);
+    ++rCount;
+  }
+
+  if (file4[0] != '\0')
+  {
+    msgPtr->lpFiles[rCount].lpszPathName = strdup((LPSTR)file4);
+    msgPtr->lpFiles[rCount].lpszFileName = strdup((LPSTR)file4);
+    ++rCount;
+  }
+
+  // Finally, make the call...
+  LONG  rc = (*lpfnMAPISaveMail)
+           (mapiSession, 
+           (ULONG) hWnd, 
+           msgPtr, 
+           flFlags, 
+           0, NULL);
+
+  if (rc == SUCCESS_SUCCESS)
+  {
+    ShowMessage(hWnd, "Success with MAPISaveMail");
+    SetFooter("MAPISaveMail success");
+  }
+  else
+  {
+    wsprintf(msg, "FAILURE: Return code %d from MAPISaveMail\nError=[%s]", 
+                      rc, GetMAPIError(rc));
+    ShowMessage(hWnd, msg);
+    SetFooter("MAPISaveMail failed");
+  }
+
+  // Now cleanup and move on...
+  FreeMAPIMessage(msgPtr);
+}
+
+void          
+DoMAPIAddress(HWND hWnd)
+{
+  ULONG (FAR PASCAL *lpfnMAPIAddress) 
+                            (LHANDLE lhSession,
+                            ULONG ulUIParam,
+                            LPSTR lpszCaption,
+                            ULONG nEditFields,
+                            LPSTR lpszLabels,
+                            ULONG nRecips,
+                            lpMapiRecipDesc lpRecips,
+                            FLAGS flFlags,
+                            ULONG ulReserved,
+                            LPULONG lpnNewRecips,
+                            lpMapiRecipDesc FAR *lppNewRecips);
+
+
+#ifdef WIN16		
+  (FARPROC&) lpfnMAPIAddress = GetProcAddress(m_hInstMapi, "MAPIADDRESS"); 
+#else
+  (FARPROC&) lpfnMAPIAddress = GetProcAddress(m_hInstMapi, "MAPIAddress"); 
+#endif
+  
+  if (!lpfnMAPIAddress)
+  {
+    ShowMessage(hWnd, "Unable to locate MAPI function.");
+    return;
+  }          
+
+  DWORD   i;
+  FLAGS   flFlags = 0;
+  DWORD   addrCount = 0;
+  char    msg[512];
+  char    toAddr[128];
+  char    ccAddr[128];
+  char    bccAddr[128];
+
+  GetDlgItemText(hWnd, ID_EDIT_TOADDRESS, toAddr, sizeof(toAddr));
+  GetDlgItemText(hWnd, ID_EDIT_CCADDRESS, ccAddr, sizeof(ccAddr));
+  GetDlgItemText(hWnd, ID_EDIT_BCCADDRESS, bccAddr, sizeof(bccAddr));
+
+  if (toAddr[0]) ++addrCount;
+  if (ccAddr[0]) ++addrCount;
+  if (bccAddr[0]) ++addrCount;
+
+  lpMapiRecipDesc lpRecips = (lpMapiRecipDesc) malloc((size_t) (sizeof(MapiRecipDesc) * addrCount));
+  if (!lpRecips)
+  {
+    return;
+  }
+
+  memset(lpRecips, 0, (size_t) (sizeof(MapiRecipDesc) * addrCount));
+
+  DWORD       rCount = 0;
+  if (toAddr[0] != '\0')
+  {
+    lpRecips[rCount].lpszName = strdup("To Address Name");
+    lpRecips[rCount].lpszAddress = strdup(toAddr);
+    lpRecips[rCount].ulRecipClass = MAPI_TO;
+    rCount++;
+  }
+
+  if (ccAddr[0] != '\0')
+  {
+    lpRecips[rCount].lpszName = strdup("CC Address Name");
+    lpRecips[rCount].lpszAddress = strdup(ccAddr);
+    lpRecips[rCount].ulRecipClass = MAPI_CC;    
+    rCount++;
+  }
+
+  if (bccAddr[0] != '\0')
+  {
+    lpRecips[rCount].lpszName = strdup("BCC Address Name");
+    lpRecips[rCount].lpszAddress = strdup(bccAddr);
+    lpRecips[rCount].ulRecipClass = MAPI_BCC;
+    rCount++;
+  }
+  
+  ULONG             newRecips;
+  lpMapiRecipDesc   lpNewRecips;
+
+  // Finally, make the call...
+  LONG  rc = (*lpfnMAPIAddress)
+                     (mapiSession,
+                      0,
+                      "MAPI Test Address Picker",
+                      0,
+                      NULL,
+                      rCount,
+                      lpRecips,
+                      0,
+                      0,
+                      &newRecips,
+                      &lpNewRecips);
+  if (rc == SUCCESS_SUCCESS)
+  {
+    for (i=0; i<newRecips; i++)
+    {
+      char  tMsg[512];
+
+      wsprintf(tMsg, "User %d\nName=[%s]\nEmail=[%s]\nType=[%d]", 
+            i, 
+            lpNewRecips[i].lpszName, 
+            lpNewRecips[i].lpszAddress, 
+            lpNewRecips[i].ulRecipClass);
+      ShowMessage(hWnd, tMsg);
+    }
+
+    SetFooter("MAPIAddress success");
+
+    DoMAPIFreeBuffer(hWnd, lpNewRecips, TRUE);
+  }
+  else
+  {
+    wsprintf(msg, "FAILURE: Return code %d from MAPIAddress\nError=[%s]", 
+                      rc, GetMAPIError(rc));
+    ShowMessage(hWnd, msg);
+    SetFooter("MAPIAddress failed");
+  }
+
+  // Now cleanup and move on...
+  for (i=0; i<rCount; i++)
+  {
+    FreeMAPIRecipient(&(lpRecips[i]));
+  }
+}

mozilla/mailnews/mapi/old/tests/mapitest/mapiproc.cpp

@@ -0,0 +1,832 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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 the Initial Developer are Copyright (C) 1998
+ * 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 NPL, 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 NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+//
+#include <windows.h>
+#include <windowsx.h>      
+#include <string.h>
+
+#ifndef MAPI_OLE	// Because MSFT doesn't do this for us :-(
+#include <mapi.h>
+#endif
+
+#include "port.h"
+#include "resource.h"
+
+//
+// Variables...
+// 
+extern HINSTANCE  hInst;
+HINSTANCE         m_hInstMapi;
+LHANDLE           mapiSession = 0;
+
+// 
+// Forward declarations...
+//
+void    LoadNSCPVersionFunc(HWND hWnd);
+void    DoMAPILogon(HWND hWnd);
+void    DoMAPILogoff(HWND hWnd);
+void    DoMAPIFreeBuffer(HWND hWnd, LPVOID buf, BOOL alert);
+void    DoMAPISendMail(HWND hWnd);
+void    DoMAPISendDocuments(HWND hWnd);
+void    DoMAPIFindNext(HWND hWnd);
+void    DoMAPIReadMail(HWND hWnd);
+void    DoMAPIDeleteMail(HWND hWnd);
+void    DoMAPIDetails(HWND hWnd);
+void    DoMAPIResolveName(HWND hWnd);
+void    DoMAPIResolveNameFreeBuffer(HWND hWnd);
+void    SetFooter(LPSTR msg);
+void    DoMAPI_NSCP_Sync(HWND hWnd);
+LPSTR   GetMAPIError(LONG errorCode);
+extern void DisplayMAPIReadMail(HWND hWnd, lpMapiMessage msgPtr);
+lpMapiMessage   GetMessage(HWND hWnd, LPSTR id);
+
+void
+SetFooter(LPSTR msg)
+{
+  extern HWND   hWnd;
+
+  SetDlgItemText(hWnd, ID_STATIC_RESULT, msg);
+}
+
+char FAR *
+GetMAPIError(LONG errorCode)
+{
+  static char FAR msg[128];
+
+  switch (errorCode) {                            
+  case MAPI_E_FAILURE:
+    lstrcpy(msg, "General MAPI Failure");
+    break;
+
+  case MAPI_E_INSUFFICIENT_MEMORY:
+    strcpy(msg, "Insufficient Memory");
+    break;
+
+  case MAPI_E_LOGIN_FAILURE:
+    strcpy(msg, "Login Failure");
+    break;
+
+  case MAPI_E_TOO_MANY_SESSIONS:
+    strcpy(msg, "Too many MAPI sessions");
+    break;
+
+  case MAPI_E_INVALID_SESSION:
+    strcpy(msg, "Invalid Session!");
+    break;
+
+  case MAPI_E_INVALID_MESSAGE:
+    strcpy(msg, "Message identifier was bad!");
+    break;
+
+  case MAPI_E_NO_MESSAGES:
+    strcpy(msg, "No messages were found!");
+    break;
+
+  case MAPI_E_ATTACHMENT_WRITE_FAILURE:
+    strcpy(msg, "Attachment write failure!");
+    break;
+
+  case MAPI_E_DISK_FULL:
+    strcpy(msg, "Attachment write failure! DISK FULL");
+    break;
+
+  case MAPI_E_AMBIGUOUS_RECIPIENT:
+    strcpy(msg, "Recipient requested is not a unique address list entry.");
+    break;
+
+  case MAPI_E_UNKNOWN_RECIPIENT:
+    strcpy(msg, "Recipient requested does not exist.");
+    break;
+
+  case MAPI_E_NOT_SUPPORTED:
+    strcpy(msg, "Not supported by messaging system");
+    break;
+
+  case SUCCESS_SUCCESS:
+    strcpy(msg, "Success on MAPI operation");
+    break;
+
+  case MAPI_E_INVALID_RECIPS:
+    strcpy(msg, "Recipient specified in the lpRecip parameter was\nunknown. No dialog box was displayed.");
+    break;
+
+  case MAPI_E_ATTACHMENT_OPEN_FAILURE:
+    strcpy(msg, "One or more files could not be located. No message was sent.");    
+    break;
+
+  case MAPI_E_ATTACHMENT_NOT_FOUND:
+    strcpy(msg, "The specified attachment was not found. No message was sent.");
+    break;
+
+  case MAPI_E_BAD_RECIPTYPE:
+    strcpy(msg, "The type of a recipient was not MAPI_TO, MAPI_CC, or MAPI_BCC. No message was sent.");
+    break;
+
+  default:
+    strcpy(msg, "Unknown MAPI Return Code");
+    break;
+  }
+
+  return((LPSTR) &(msg[0]));
+}
+
+void
+ShowMessage(HWND hWnd, LPSTR msg)
+{
+  MessageBox(hWnd, msg, "Info Message", MB_ICONINFORMATION);
+}
+
+BOOL
+OpenMAPI(void)
+{
+#ifdef WIN16
+	m_hInstMapi = LoadLibrary("Y:\\ns\\cmd\\winfe\\mapi\\MAPI.DLL");	
+#else
+  m_hInstMapi = LoadLibrary(".\\COMPONENTS\\MAPI32.DLL");
+#endif
+
+  if (!m_hInstMapi)
+  {
+    ShowMessage(NULL, "Error Loading the MAPI DLL...Probably not found!");
+    return(FALSE);
+  }
+
+  return(TRUE);
+}
+
+void
+CloseMAPI(void)
+{
+  if(m_hInstMapi)
+  {
+    FreeLibrary(m_hInstMapi);
+  }
+}
+
+void 
+ProcessCommand(HWND hWnd, int id, HWND hCtl, UINT codeNotify) 
+{ 
+  switch (id) 
+  {
+  case ID_BUTTON_SYNC:
+    DoMAPI_NSCP_Sync(hWnd);
+    break;
+
+  case ID_BUTTON_NSCPVERSION:
+    LoadNSCPVersionFunc(hWnd);
+    break;
+
+  case ID_BUTTON_LOGON:
+    DoMAPILogon(hWnd);
+    break;
+
+  case ID_BUTTON_LOGOFF:
+    DoMAPILogoff(hWnd);
+    break;
+
+  case ID_BUTTON_FINDNEXT:
+  case ID_MENU_MAPIFINDNEXT:
+    DoMAPIFindNext(hWnd);
+    break;
+
+  case ID_BUTTON_READMAIL:
+  case ID_MENU_MAPIREADMAIL:
+    DoMAPIReadMail(hWnd);
+    break;
+
+  case ID_BUTTON_MAIL:
+    {
+    extern CALLBACK LOADDS 
+           MailDlgProc(HWND hWndMain, UINT wMsg, WPARAM wParam, LPARAM lParam);
+
+    DialogBox(hInst, MAKEINTRESOURCE(ID_DIALOG_MAIL), hWnd, 
+      (DLGPROC)MailDlgProc);
+    }
+    break;
+
+  case ID_BUTTON_DELETEMAIL:
+  case ID_MENU_MAPIDELETEMAIL:
+    DoMAPIDeleteMail(hWnd);
+    break;
+
+  case ID_MENU_MYEXIT:
+	  DestroyWindow(hWnd);
+	  break;
+
+  case ID_BUTTON_CLEAR:
+  case ID_MENU_CLEARRESULTS:
+    ListBox_ResetContent(GetDlgItem(hWnd, ID_LIST_RESULT));      
+	  break;
+
+  case ID_BUTTON_FREEBUFFER:
+    DoMAPIResolveNameFreeBuffer(hWnd);
+    break;
+
+  case ID_BUTTON_RESOLVENAME:
+    DoMAPIResolveName(hWnd);
+    break;
+
+  case ID_BUTTON_DETAILS:
+    DoMAPIDetails(hWnd);
+    break;
+
+  case ID_MENU_MYABOUT:
+	  MessageBox(hWnd,	
+			  "Netscape MAPI Test Harness\nWritten by: Rich Pizzarro (rhp@netscape.com)",	
+			  "About",
+			  MB_ICONINFORMATION);
+	  break;
+  
+  default:
+    break;
+  }
+}
+
+void
+DoMAPILogon(HWND hWnd)
+{
+  char  msg[1024];
+  char  user[128] = "";
+  char  pw[128] = "";
+
+  // Get Address of MAPI function...
+  ULONG (FAR PASCAL *lpfnMAPILogon)(ULONG, LPSTR, LPSTR, FLAGS, ULONG, LPLHANDLE);   
+  
+#ifdef WIN16		
+  (FARPROC&) lpfnMAPILogon = GetProcAddress(m_hInstMapi, "MAPILOGON"); 
+#else
+  (FARPROC&) lpfnMAPILogon = GetProcAddress(m_hInstMapi, "MAPILogon"); 
+#endif
+  
+  if (!lpfnMAPILogon)
+  {
+    ShowMessage(hWnd, "Unable to locate MAPI function.");
+    return;
+  }
+
+  GetDlgItemText(hWnd, ID_EDIT_USERNAME, user, sizeof(user));
+  GetDlgItemText(hWnd, ID_EDIT_PW, pw, sizeof(pw));
+
+  LONG  rc = (*lpfnMAPILogon)((ULONG) hWnd, user, pw, 
+                  MAPI_FORCE_DOWNLOAD | MAPI_NEW_SESSION, 0, &mapiSession);
+  if (rc == SUCCESS_SUCCESS)
+  {
+    wsprintf(msg, "Success with session = %d", mapiSession);
+    ShowMessage(hWnd, msg);
+    SetFooter("Logon success");
+  }
+  else
+  {
+    wsprintf(msg, "FAILURE: Return code %d from Logon\nError=[%s]", 
+                      rc, GetMAPIError(rc));
+    ShowMessage(hWnd, msg);
+    SetFooter("Logon failed");
+  }
+}
+
+void
+DoMAPILogoff(HWND hWnd)
+{
+  ULONG (FAR PASCAL *lpfnMAPILogoff) ( LHANDLE lhSession, ULONG ulUIParam, 
+                                FLAGS flFlags, ULONG ulReserved);
+
+#ifdef WIN16		
+  (FARPROC&) lpfnMAPILogoff = GetProcAddress(m_hInstMapi, "MAPILOGOFF"); 
+#else
+  (FARPROC&) lpfnMAPILogoff = GetProcAddress(m_hInstMapi, "MAPILogoff"); 
+#endif
+  
+  if (!lpfnMAPILogoff)
+  {
+    ShowMessage(hWnd, "Unable to locate MAPI function.");
+    return;
+  }
+
+  char  msg[1024];
+  LONG  rc = (*lpfnMAPILogoff)(mapiSession, (ULONG) hWnd, 0, 0);
+  if (rc == SUCCESS_SUCCESS)
+  {
+    wsprintf(msg, "Successful logoff");
+    ShowMessage(hWnd, msg);
+    SetFooter(msg);
+  }
+  else
+  {
+    wsprintf(msg, "FAILURE: Return code %d from Logoff\nError=[%s]", 
+                      rc, GetMAPIError(rc));
+
+    ShowMessage(hWnd, msg);
+    SetFooter("Logoff failed");
+  }
+
+  mapiSession = 0;
+}
+
+void
+DoMAPIFreeBuffer(HWND hWnd, LPVOID buf, BOOL alert)
+{
+  ULONG (FAR PASCAL *lpfnMAPIFreeBuffer) (LPVOID lpBuffer);
+
+#ifdef WIN16		
+  (FARPROC&) lpfnMAPIFreeBuffer = GetProcAddress(m_hInstMapi, "MAPIFREEBUFFER"); 
+#else
+  (FARPROC&) lpfnMAPIFreeBuffer = GetProcAddress(m_hInstMapi, "MAPIFreeBuffer"); 
+#endif
+  
+  if (!lpfnMAPIFreeBuffer)
+  {
+    ShowMessage(hWnd, "Unable to locate MAPI function.");
+    return;
+  }
+
+  char  msg[1024];
+  LONG  rc = (*lpfnMAPIFreeBuffer)(buf);
+#ifdef WIN32
+  if (rc == S_OK)
+#else
+  if (rc == SUCCESS_SUCCESS)
+#endif
+  {
+    wsprintf(msg, "Successful Free Buffer Operation");
+    if (alert)
+      ShowMessage(hWnd, msg);
+  }
+  else
+  {
+    wsprintf(msg, "FAILURE: Return code %d from Logoff", rc);
+    ShowMessage(hWnd, msg);
+  }
+}
+
+void
+DoMAPIFindNext(HWND hWnd)
+{
+  ULONG (FAR PASCAL *lpfnMAPIFindNext) (LHANDLE lhSession, ULONG ulUIParam, 
+           LPTSTR lpszMessageType, LPTSTR lpszSeedMessageID, FLAGS flFlags, 
+           ULONG ulReserved, LPTSTR lpszMessageID);
+
+#ifdef WIN16		
+  (FARPROC&) lpfnMAPIFindNext = GetProcAddress(m_hInstMapi, "MAPIFINDNEXT"); 
+#else
+  (FARPROC&) lpfnMAPIFindNext = GetProcAddress(m_hInstMapi, "MAPIFindNext"); 
+#endif
+
+  if (!lpfnMAPIFindNext)
+  {
+    ShowMessage(hWnd, "Unable to locate MAPI function.");
+    return;
+  }
+
+  // Clear the list before we start...
+  ListBox_ResetContent(GetDlgItem(hWnd, ID_LIST_RESULT));
+
+  char  msg[1024];
+  char  messageID[512];
+  LONG  rc;                                                               
+#ifdef WIN32
+  FLAGS	flags = MAPI_GUARANTEE_FIFO | MAPI_LONG_MSGID | MAPI_UNREAD_ONLY;
+#else                                                                     	
+  FLAGS	flags = MAPI_GUARANTEE_FIFO | MAPI_UNREAD_ONLY;
+#endif
+  
+  while ( (rc = (*lpfnMAPIFindNext) (mapiSession, 
+           (ULONG) hWnd, 
+           NULL, 
+           NULL, 
+		   flags,
+           0,
+           messageID)) == SUCCESS_SUCCESS)
+  {
+      // 
+
+      lpMapiMessage mapiMsg = GetMessage(hWnd, messageID);
+      if (mapiMsg != NULL)
+      {
+        wsprintf(msg, "%s: \"%s\" Sender: %s", 
+                  messageID, 
+                  mapiMsg->lpszSubject, 
+                  mapiMsg->lpOriginator->lpszName);
+        DoMAPIFreeBuffer(hWnd, mapiMsg, FALSE);
+      }
+      else
+      {
+        lstrcpy(msg, messageID);
+      }
+
+      ListBox_InsertString(GetDlgItem(hWnd, ID_LIST_RESULT), 0, msg);
+  }
+
+  wsprintf(msg, "Enumeration ended: Return code %d from MAPIFindNext\nCondition=[%s]", 
+                    rc, GetMAPIError(rc));
+  ShowMessage(hWnd, msg);
+  SetFooter("Enumeration ended");
+}
+
+void
+DoMAPIReadMail(HWND hWnd)
+{
+  ULONG (FAR PASCAL *lpfnMAPIReadMail) (LHANDLE lhSession, ULONG ulUIParam, 
+           LPTSTR lpszMessageID, FLAGS flFlags, ULONG ulReserved, 
+           lpMapiMessage FAR * lppMessage);
+
+#ifdef WIN16		
+  (FARPROC&) lpfnMAPIReadMail = GetProcAddress(m_hInstMapi, "MAPIREADMAIL"); 
+#else
+  (FARPROC&) lpfnMAPIReadMail = GetProcAddress(m_hInstMapi, "MAPIReadMail"); 
+#endif
+  
+  if (!lpfnMAPIReadMail)
+  {
+    ShowMessage(hWnd, "Unable to locate MAPI function.");
+    return;
+  }
+
+  char            msg[1024];
+  char            lpszMessageID[512];
+  lpMapiMessage   lpMessage = NULL;
+  FLAGS           flFlags = 0;
+
+  DWORD selected = ListBox_GetCurSel(GetDlgItem(hWnd, ID_LIST_RESULT));
+  if (selected == LB_ERR)
+  {
+    ShowMessage(hWnd, "You need to select a valid message. Make sure\nyou have done a MAPIFindNext and selected\none of the resulting messages.");
+    return;
+  }
+
+  ListBox_GetText(GetDlgItem(hWnd, ID_LIST_RESULT), selected, lpszMessageID);
+
+  // Do the various flags for this call...
+  if (BST_CHECKED == Button_GetCheck(GetDlgItem(hWnd, IDC_CHECK_BODYASFILE)))
+  {
+    flFlags |= MAPI_BODY_AS_FILE;
+  }
+
+  if (BST_CHECKED == Button_GetCheck(GetDlgItem(hWnd, IDC_CHECK_ENVELOPEONLY)))
+  {
+    flFlags |= MAPI_ENVELOPE_ONLY;
+  }
+
+  if (BST_CHECKED == Button_GetCheck(GetDlgItem(hWnd, IDC_CHECK_PEEK)))
+  {
+    flFlags |= MAPI_PEEK;
+  }
+  
+  if (BST_CHECKED == Button_GetCheck(GetDlgItem(hWnd, IDC_CHECK_SUPPRESSATTACH)))
+  {
+    flFlags |= MAPI_SUPPRESS_ATTACH;
+  }
+
+  char *ptr = strchr( (const char *) lpszMessageID, ':');
+  if (ptr) *ptr = '\0';
+
+  LONG  rc = (*lpfnMAPIReadMail)
+          (mapiSession, 
+          (ULONG) hWnd, 
+          lpszMessageID,
+          flFlags,
+          0, 
+          &lpMessage);
+
+  // Deal with error up front and return if need be...
+  if (rc != SUCCESS_SUCCESS)
+  {
+    wsprintf(msg, "FAILURE: Return code %d from MAPIReadMail\nError=[%s]", 
+                      rc, GetMAPIError(rc));
+
+    ShowMessage(hWnd, msg);
+    SetFooter("ReadMail failed");
+    return;
+  }
+
+  // Now display the message and then return...
+  DisplayMAPIReadMail(hWnd, lpMessage);
+  DoMAPIFreeBuffer(hWnd, lpMessage, TRUE);
+}
+
+void
+DoMAPIDeleteMail(HWND hWnd)
+{
+  ULONG (FAR PASCAL *lpfnMAPIDeleteMail) (LHANDLE lhSession, ULONG ulUIParam, 
+            LPTSTR lpszMessageID, FLAGS flFlags, ULONG ulReserved);
+
+#ifdef WIN16		
+  (FARPROC&) lpfnMAPIDeleteMail = GetProcAddress(m_hInstMapi, "MAPIDELETEMAIL"); 
+#else
+  (FARPROC&) lpfnMAPIDeleteMail = GetProcAddress(m_hInstMapi, "MAPIDeleteMail"); 
+#endif
+  
+  if (!lpfnMAPIDeleteMail)
+  {
+    ShowMessage(hWnd, "Unable to locate MAPI function.");
+    return;
+  }
+ 
+  char            msg[1024];
+  char            lpszMessageID[512];
+  lpMapiMessage   lpMessage = NULL;
+
+  DWORD selected = ListBox_GetCurSel(GetDlgItem(hWnd, ID_LIST_RESULT));
+  if (selected == LB_ERR)
+  {
+    ShowMessage(hWnd, "You need to select a valid message. Make sure\nyou have done a MAPIFindNext and selected\none of the resulting messages.");
+    return;
+  }
+
+  ListBox_GetText(GetDlgItem(hWnd, ID_LIST_RESULT), selected, lpszMessageID);
+
+  char *ptr = strchr( (const char *) lpszMessageID, ':');
+  if (ptr) *ptr = '\0';
+
+  LONG  rc = (*lpfnMAPIDeleteMail)
+          (mapiSession, 
+          (ULONG) hWnd,
+          lpszMessageID, 
+          0,
+          0);
+  
+  // Deal with the return code...
+  if (rc == SUCCESS_SUCCESS)
+  {
+    wsprintf(msg, "Successful deletion");
+    ShowMessage(hWnd, msg);
+    SetFooter(msg);  
+
+    // If it worked, refresh the list...
+    ShowMessage(hWnd, "The message list will now be refreshed\nsince one message was deleted.");
+    DoMAPIFindNext(hWnd);
+  }
+  else
+  {
+    wsprintf(msg, "FAILURE: Return code %d from MAPIDeleteMail\nError=[%s]", 
+                      rc, GetMAPIError(rc));
+
+    ShowMessage(hWnd, msg);
+    SetFooter("Logoff failed");
+  }
+}
+
+// This is for the name lookup stuff...
+lpMapiRecipDesc       lpRecip = NULL;
+
+void
+DoMAPIResolveName(HWND hWnd)
+{
+  ULONG (FAR PASCAL *lpfnMAPIResolveName) (LHANDLE lhSession, ULONG ulUIParam, 
+            LPTSTR lpszName, FLAGS flFlags, ULONG ulReserved, 
+            lpMapiRecipDesc FAR * lppRecip); 
+
+#ifdef WIN16		
+  (FARPROC&) lpfnMAPIResolveName = GetProcAddress(m_hInstMapi, "MAPIRESOLVENAME"); 
+#else
+  (FARPROC&) lpfnMAPIResolveName = GetProcAddress(m_hInstMapi, "MAPIResolveName"); 
+#endif
+  
+  if (!lpfnMAPIResolveName)
+  {
+    ShowMessage(hWnd, "Unable to locate MAPI function.");
+    return;
+  }
+
+  if (lpRecip != NULL)
+  {
+    ShowMessage(hWnd, "We need to free memory from a previous call...");
+    DoMAPIFreeBuffer(hWnd, lpRecip, TRUE);
+    lpRecip = NULL;
+  }
+
+  char        userName[512];
+  char        msg[1024];
+  FLAGS       flFlags = 0;    // We support none...
+
+  GetDlgItemText(hWnd, IDC_EDIT_RESOLVENAME, userName, sizeof(userName));
+  LONG  rc = (*lpfnMAPIResolveName)
+                      (mapiSession, 
+                       (ULONG) hWnd, 
+                       userName,
+                       flFlags, 
+                       0, 
+                       &lpRecip);
+
+  // Deal with error up front and return if need be...
+  if (rc != SUCCESS_SUCCESS)
+  {
+    wsprintf(msg, "FAILURE: Return code %d from DoMAPIResolveName\nError=[%s]", 
+                      rc, GetMAPIError(rc));
+
+    ShowMessage(hWnd, msg);
+    SetFooter("DoMAPIResolveName failed");
+    return;
+  }
+
+  // If we get here, we should probably show the information that we
+  // got back
+  wsprintf(msg, "Received information for %s\nName=[%s]\nAddress=[%s]\nID=[%s]",
+    userName, lpRecip->lpszName, lpRecip->lpszAddress, (LPSTR) lpRecip->lpEntryID);
+  ShowMessage(hWnd, msg);
+}
+
+void    
+DoMAPIResolveNameFreeBuffer(HWND hWnd)
+{
+  if (lpRecip == NULL)
+  {
+    ShowMessage(hWnd, "There is no memory allocated from MAPIResolveName()\nto be freed. Request ignored.");
+  }
+  else
+  {
+    DoMAPIFreeBuffer(hWnd, lpRecip, TRUE);
+    lpRecip = NULL;
+  }
+}
+
+void
+DoMAPIDetails(HWND hWnd)
+{
+  ULONG (FAR PASCAL *lpfnMAPIDetails) (LHANDLE lhSession, ULONG ulUIParam, 
+            lpMapiRecipDesc lpRecip, FLAGS flFlags, ULONG ulReserved);
+
+#ifdef WIN16		
+  (FARPROC&) lpfnMAPIDetails = GetProcAddress(m_hInstMapi, "MAPIDetails"); 
+#else
+  (FARPROC&) lpfnMAPIDetails = GetProcAddress(m_hInstMapi, "MAPIDetails"); 
+#endif
+  
+  if (!lpfnMAPIDetails)
+  {
+    ShowMessage(hWnd, "Unable to locate MAPI function.");
+    return;
+  }
+
+  char        msg[1024];
+  FLAGS       flFlags = 0;    // We really don't support these...
+
+  LONG  rc = (*lpfnMAPIDetails)
+              (mapiSession, 
+              (ULONG) hWnd,
+               lpRecip,
+               flFlags,
+               0);
+
+  if (rc == SUCCESS_SUCCESS)
+  {
+
+    wsprintf(msg, "MAPIDetails call succeeded");
+    ShowMessage(hWnd, msg);
+    SetFooter(msg);
+  }
+  else
+  {
+
+    wsprintf(msg, "FAILURE: Return code %d from MAPIDetails\nError=[%s]", 
+                      rc, GetMAPIError(rc));
+
+    if (lpRecip == NULL)
+    {
+      lstrcat(msg, "\nNOTE: There is no valid pointer from a MAPIResolveName()\ncall to show details about.");
+    }
+
+    ShowMessage(hWnd, msg);
+    SetFooter("MAPIDetails failed");
+  }
+}
+
+lpMapiMessage 
+GetMessage(HWND hWnd, LPSTR id)
+{
+  ULONG (FAR PASCAL *lpfnMAPIReadMail) (LHANDLE lhSession, ULONG ulUIParam, 
+           LPTSTR lpszMessageID, FLAGS flFlags, ULONG ulReserved, 
+           lpMapiMessage FAR * lppMessage);
+
+#ifdef WIN16		
+  (FARPROC&) lpfnMAPIReadMail = GetProcAddress(m_hInstMapi, "MAPIREADMAIL"); 
+#else
+  (FARPROC&) lpfnMAPIReadMail = GetProcAddress(m_hInstMapi, "MAPIReadMail"); 
+#endif
+  
+  if (!lpfnMAPIReadMail)
+  {
+    ShowMessage(hWnd, "Unable to locate MAPI function.");
+    return NULL;
+  }
+
+  char            msg[1024];
+  lpMapiMessage   lpMessage = NULL;
+  FLAGS           flFlags = 0;
+
+  flFlags |= MAPI_ENVELOPE_ONLY;
+  LONG  rc = (*lpfnMAPIReadMail)
+          (mapiSession, 
+          (ULONG) hWnd, 
+          id,
+          flFlags,
+          0, 
+          &lpMessage);
+
+  // Deal with error up front and return if need be...
+  if (rc != SUCCESS_SUCCESS)
+  {
+    wsprintf(msg, "FAILURE: Return code %d from MAPIReadMail\nError=[%s]", 
+                      rc, GetMAPIError(rc));
+
+    ShowMessage(hWnd, msg);
+    SetFooter("ReadMail failed");
+    return NULL;
+  }
+
+  return(lpMessage);
+}
+
+void    
+LoadNSCPVersionFunc(HWND hWnd)
+{
+  ULONG (FAR PASCAL *lpfnLoadNSCPVersion) ( void );
+
+#ifdef WIN16		
+  (FARPROC&) lpfnLoadNSCPVersion = GetProcAddress(m_hInstMapi, "MAPIGETNERSCAPEVERSION"); 
+#else
+  (FARPROC&) lpfnLoadNSCPVersion = GetProcAddress(m_hInstMapi, "MAPIGetNetscapeVersion"); 
+#endif
+  
+  if (!lpfnLoadNSCPVersion)
+  {
+    ShowMessage(hWnd, "Unable to locate MAPIGetNetscapeVersion() function.");
+  }
+  else
+  {
+    ShowMessage(hWnd, "MAPIGetNetscapeVersion() function was FOUND!");
+  }
+  return;
+}
+
+void    
+DoMAPI_NSCP_Sync(HWND hWnd)
+{
+ULONG (FAR PASCAL *lpfnNSCPSync) ( LHANDLE lhSession,
+                                          ULONG ulReserved );
+#ifdef WIN16		
+  (FARPROC&) lpfnNSCPSync = GetProcAddress(m_hInstMapi, "MAPI_NSCP_SYNCHRONIZECLIENT"); 
+#else
+  (FARPROC&) lpfnNSCPSync = GetProcAddress(m_hInstMapi, "MAPI_NSCP_SynchronizeClient"); 
+#endif
+
+  if (!lpfnNSCPSync)
+  {
+    ShowMessage(hWnd, "Unable to locate MAPI function.");
+    return;
+  }
+
+  LONG  rc = (*lpfnNSCPSync) (mapiSession, 0);
+
+  char    msg[256];
+
+  // Deal with error up front and return if need be...
+  if (rc != SUCCESS_SUCCESS)
+  {
+    wsprintf(msg, "FAILURE: Return code %d from MAPI_NSCP_SynchronizeClient\nError=[%s]", 
+                      rc, GetMAPIError(rc));
+
+    ShowMessage(hWnd, msg);
+    SetFooter("MAPI_NSCP_SynchronizeClient failed");
+    return;
+  }
+  else
+  {
+    wsprintf(msg, "Success for MAPI_NSCP_SynchronizeClient");    
+    ShowMessage(hWnd, msg);
+    SetFooter("MAPI_NSCP_SynchronizeClient success");
+  }
+}

mozilla/mailnews/mapi/old/tests/mapitest/mapitest.dep

@@ -0,0 +1,25 @@
+# Microsoft Developer Studio Generated Dependency File, included by mapitest.mak
+
+.\main.cpp : \
+	".\port.h"\
+	"c:\program files\msdev\vc98\include\basetsd.h"\
+	
+
+.\mapimail.cpp : \
+	".\port.h"\
+	"c:\program files\msdev\vc98\include\basetsd.h"\
+	
+
+.\mapiproc.cpp : \
+	".\port.h"\
+	"c:\program files\msdev\vc98\include\basetsd.h"\
+	
+
+.\mtest32.rc : \
+	".\nscicon.ico"\
+	
+
+.\readmail.cpp : \
+	".\port.h"\
+	"c:\program files\msdev\vc98\include\basetsd.h"\
+	

mozilla/mailnews/mapi/old/tests/mapitest/mapitest.dsp

@@ -0,0 +1,121 @@
+# Microsoft Developer Studio Project File - Name="mapitest" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Application" 0x0101
+
+CFG=mapitest - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "mapitest.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "mapitest.mak" CFG="mapitest - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "mapitest - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "mapitest - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "mapitest - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
+
+!ELSEIF  "$(CFG)" == "mapitest - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "mapitest - Win32 Release"
+# Name "mapitest - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\main.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\mapimail.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\mapiproc.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\mtest32.rc
+# End Source File
+# Begin Source File
+
+SOURCE=.\readmail.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project

mozilla/mailnews/mapi/old/tests/mapitest/mapitest.dsw

@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "mapitest"=.\mapitest.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+

mozilla/mailnews/mapi/old/tests/mapitest/mapitest.plg

@@ -0,0 +1,44 @@
+<html>
+<body>
+<pre>
+<h1>Build Log</h1>
+<h3>
+--------------------Configuration: mapitest - Win32 Debug--------------------
+</h3>
+<h3>Command Lines</h3>
+Creating command line "rc.exe /l 0x409 /fo"Debug/mtest32.res" /d "_DEBUG" "Y:\mozilla\mailnews\mapi\tests\mapitest\mtest32.rc"" 
+Creating temporary file "C:\TEMP\RSP38A.tmp" with contents
+[
+/nologo /MLd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /Fp"Debug/mapitest.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c 
+"Y:\mozilla\mailnews\mapi\tests\mapitest\readmail.cpp"
+"Y:\mozilla\mailnews\mapi\tests\mapitest\mapimail.cpp"
+"Y:\mozilla\mailnews\mapi\tests\mapitest\mapiproc.cpp"
+"Y:\mozilla\mailnews\mapi\tests\mapitest\main.cpp"
+]
+Creating command line "cl.exe @C:\TEMP\RSP38A.tmp" 
+Creating temporary file "C:\TEMP\RSP38B.tmp" with contents
+[
+kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /incremental:yes /pdb:"Debug/mapitest.pdb" /debug /machine:I386 /out:"Debug/mapitest.exe" /pdbtype:sept 
+.\Debug\readmail.obj
+.\Debug\mapimail.obj
+.\Debug\mapiproc.obj
+.\Debug\mtest32.res
+.\Debug\main.obj
+]
+Creating command line "link.exe @C:\TEMP\RSP38B.tmp"
+<h3>Output Window</h3>
+Compiling resources...
+Compiling...
+readmail.cpp
+mapimail.cpp
+mapiproc.cpp
+main.cpp
+Linking...
+
+
+
+<h3>Results</h3>
+mapitest.exe - 0 error(s), 0 warning(s)
+</pre>
+</body>
+</html>

mozilla/mailnews/mapi/old/tests/mapitest/mtest32.rc

@@ -0,0 +1,245 @@
+//Microsoft Developer Studio generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+ID_DIALOG DIALOG DISCARDABLE  0, 0, 344, 229
+STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Netscape MAPI Test Harness"
+MENU ID_MENU
+FONT 8, "MS Sans Serif"
+BEGIN
+    GROUPBOX        "Open/Close",IDC_STATIC,4,4,336,27
+    LTEXT           "User:",IDC_STATIC,9,17,18,11
+    EDITTEXT        ID_EDIT_USERNAME,28,15,41,12,ES_AUTOHSCROLL
+    LTEXT           "Password:",IDC_STATIC,74,17,38,11
+    EDITTEXT        ID_EDIT_PW,112,15,41,12,ES_PASSWORD | ES_AUTOHSCROLL
+    PUSHBUTTON      "MAPILogon",ID_BUTTON_LOGON,157,13,46,14
+    PUSHBUTTON      "MAPILogoff",ID_BUTTON_LOGOFF,209,13,46,14
+    GROUPBOX        "Mail Operations",IDC_STATIC,4,36,336,142
+    PUSHBUTTON      "MAPIFindNext",ID_BUTTON_FINDNEXT,17,50,57,14
+    PUSHBUTTON      "MAPIDeleteMail",ID_BUTTON_DELETEMAIL,80,50,57,14
+    PUSHBUTTON      "Clear Results",ID_BUTTON_CLEAR,143,50,57,14
+    PUSHBUTTON      "Send Mail",ID_BUTTON_MAIL,206,50,57,14
+    LISTBOX         ID_LIST_RESULT,9,66,325,56,LBS_SORT | 
+                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | 
+                    WS_TABSTOP
+    GROUPBOX        "User Information",IDC_STATIC,4,181,336,28
+    PUSHBUTTON      "MAPIResolveName",ID_BUTTON_RESOLVENAME,9,192,68,14
+    EDITTEXT        IDC_EDIT_RESOLVENAME,82,192,130,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "MAPIDetails",ID_BUTTON_DETAILS,219,192,48,14
+    LTEXT           "",ID_STATIC_RESULT,4,214,336,13,SS_SUNKEN
+    PUSHBUTTON      "MAPIReadMail",ID_BUTTON_READMAIL,34,142,57,14
+    CONTROL         "MAPI_BODY_AS_FILE - Body as attachment",
+                    IDC_CHECK_BODYASFILE,"Button",BS_AUTOCHECKBOX | 
+                    WS_TABSTOP,121,125,188,9
+    CONTROL         "MAPI_ENVELOPE_ONLY - Header information only",
+                    IDC_CHECK_ENVELOPEONLY,"Button",BS_AUTOCHECKBOX | 
+                    WS_TABSTOP,121,138,188,9
+    CONTROL         "MAPI_PEEK - Don't mark message as read",IDC_CHECK_PEEK,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,121,151,188,9
+    CONTROL         "MAPI_SUPPRESS_ATTACH - Suppress attachments",
+                    IDC_CHECK_SUPPRESSATTACH,"Button",BS_AUTOCHECKBOX | 
+                    WS_TABSTOP,121,164,188,9
+    PUSHBUTTON      "<- MAPIFreeBuffer",ID_BUTTON_FREEBUFFER,272,192,63,14
+    PUSHBUTTON      "MAPIGetNSCPVersion",ID_BUTTON_NSCPVERSION,261,13,76,14
+    PUSHBUTTON      "Synchronize",ID_BUTTON_SYNC,269,50,57,14
+END
+
+ID_DIALOG_MAIL DIALOG DISCARDABLE  0, 0, 285, 246
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Composition"
+FONT 8, "MS Sans Serif"
+BEGIN
+    GROUPBOX        "Address Information",IDC_STATIC,4,4,275,55
+    LTEXT           "To:",IDC_STATIC,21,19,12,8
+    EDITTEXT        ID_EDIT_TOADDRESS,36,16,239,13,ES_AUTOHSCROLL
+    EDITTEXT        ID_EDIT_CCADDRESS,36,30,239,13,ES_AUTOHSCROLL
+    EDITTEXT        ID_EDIT_BCCADDRESS,36,44,239,13,ES_AUTOHSCROLL
+    LTEXT           "Subject:",IDC_STATIC,5,65,29,9
+    EDITTEXT        ID_EDIT_SUBJECT,36,63,239,13,ES_AUTOHSCROLL
+    EDITTEXT        ID_EDIT_NOTETEXT,4,78,271,72,ES_MULTILINE | 
+                    ES_AUTOHSCROLL
+    GROUPBOX        "Attachments",IDC_STATIC,4,153,275,39
+    EDITTEXT        ID_EDIT_ATTACH1,16,162,122,13,ES_AUTOHSCROLL
+    EDITTEXT        ID_EDIT_ATTACH2,16,176,122,13,ES_AUTOHSCROLL
+    EDITTEXT        ID_EDIT_ATTACH3,147,162,122,13,ES_AUTOHSCROLL
+    EDITTEXT        ID_EDIT_ATTACH4,147,175,122,13,ES_AUTOHSCROLL
+    PUSHBUTTON      "MAPISendMail",ID_BUTTON_MAPISENDMAIL,70,204,58,14
+    PUSHBUTTON      "Cancel",IDCANCEL,50,225,84,14
+    PUSHBUTTON      "MAPISendDocuments",ID_BUTTON_MAPISENDDOCUMENTS,132,204,
+                    79,14
+    CONTROL         "Show Dialog",ID_CHECK_SHOWDIALOG,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,8,207,55,9
+    LTEXT           "cc:",IDC_STATIC,22,32,12,8
+    LTEXT           "bcc:",IDC_STATIC,18,47,15,8
+    GROUPBOX        "Send Operations",IDC_STATIC,4,196,275,26
+    PUSHBUTTON      "MAPISaveMail",ID_BUTTON_MAPISAVEMAIL,215,204,57,14
+    PUSHBUTTON      "MAPIAddress",ID_BUTTON_MAPIADDRESS,150,225,84,14
+END
+
+ID_DIALOG_READMAIL DIALOG DISCARDABLE  0, 0, 269, 266
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Mail Message"
+FONT 8, "MS Sans Serif"
+BEGIN
+    LTEXT           "Subject:",IDC_STATIC,5,71,27,9
+    EDITTEXT        IDC_EDIT_SUBJECT,36,69,229,12,ES_AUTOHSCROLL | 
+                    ES_READONLY
+    LISTBOX         IDC_LIST_ATTACHMENTS,4,211,261,37,LBS_SORT | 
+                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
+    EDITTEXT        IDC_EDIT_BODYTEXT,4,113,261,85,ES_MULTILINE | 
+                    ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | 
+                    ES_WANTRETURN
+    LISTBOX         IDC_LIST_RECIPIENTS,4,29,261,36,LBS_SORT | 
+                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "Recipients:",IDC_STATIC,4,19,43,9
+    LTEXT           "Attachments:",IDC_STATIC,4,202,43,9
+    EDITTEXT        IDC_EDIT_DATETIME,36,83,229,12,ES_AUTOHSCROLL | 
+                    ES_READONLY
+    LTEXT           "Date:",IDC_STATIC,13,84,19,9
+    PUSHBUTTON      "OK",ID_OK,114,249,42,13
+    EDITTEXT        IDC_EDIT_THREAD,36,97,229,12,ES_AUTOHSCROLL | 
+                    ES_READONLY
+    LTEXT           "Thread:",IDC_STATIC,6,99,25,9
+    LTEXT           "From:",IDC_STATIC,4,6,19,9
+    EDITTEXT        IDC_EDIT_FROM,27,4,238,12,ES_AUTOHSCROLL | ES_READONLY
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO DISCARDABLE 
+BEGIN
+    ID_DIALOG, DIALOG
+    BEGIN
+        LEFTMARGIN, 4
+        RIGHTMARGIN, 340
+        VERTGUIDE, 9
+        VERTGUIDE, 309
+        TOPMARGIN, 4
+        BOTTOMMARGIN, 227
+        HORZGUIDE, 206
+    END
+
+    ID_DIALOG_MAIL, DIALOG
+    BEGIN
+        LEFTMARGIN, 4
+        RIGHTMARGIN, 281
+        TOPMARGIN, 4
+        BOTTOMMARGIN, 239
+    END
+
+    ID_DIALOG_READMAIL, DIALOG
+    BEGIN
+        LEFTMARGIN, 4
+        RIGHTMARGIN, 265
+        TOPMARGIN, 4
+        BOTTOMMARGIN, 262
+    END
+END
+#endif    // APSTUDIO_INVOKED
+
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+ID_ICON_APP             ICON    DISCARDABLE     "nscicon.ico"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Menu
+//
+
+ID_MENU MENU DISCARDABLE 
+BEGIN
+    POPUP "&File"
+    BEGIN
+        MENUITEM "MAPI&FindNext",               ID_MENU_MAPIFINDNEXT
+        MENUITEM "MAPI&ReadMail",               ID_MENU_MAPIREADMAIL
+        MENUITEM SEPARATOR
+        MENUITEM "E&xit",                       ID_MENU_MYEXIT
+    END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "MAPI&DeleteMail",             ID_MENU_MAPIDELETEMAIL
+        MENUITEM "&Clear Results",              ID_MENU_CLEARRESULTS
+    END
+    POPUP "&Help"
+    BEGIN
+        MENUITEM "&About...",                   ID_MENU_MYABOUT
+    END
+END
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+

mozilla/mailnews/mapi/old/tests/mapitest/port.h

@@ -0,0 +1,303 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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 the Initial Developer are Copyright (C) 1998
+ * 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 NPL, 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 NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+//
+
+#ifndef PORT_H
+#define PORT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*****************************************************************\
+ *                                                               *
+ *  PORT.H                                                       *
+ *                                                               *
+ *  Win16/Win32 portability stuff                                *
+ *                                                               *
+ *  A.Sokolsky                                                   *
+ *      3.10.94 distilled into this header                       *
+ *                                                               *
+\*****************************************************************/
+
+/*
+ * calling conventions
+ */
+#include <assert.h>
+                                                      
+                                                      
+#ifndef CDECL
+#define CDECL __cdecl
+#endif  // CDECL
+
+#ifndef PASCAL
+#define PASCAL __pascal
+#endif  // PASCAL
+
+#ifdef FASTCALL
+#error FASTCALL defined
+#endif // FASTCALL
+
+
+#ifdef NDEBUG
+#define FASTCALL __fastcall
+#else
+#define FASTCALL PASCAL
+#endif // NDEBUG   
+
+
+
+#ifndef HWND2DWORD
+#  ifdef WIN32
+#    define HWND2DWORD(X_hWnd) ( (DWORD)(X_hWnd) )
+#  else // WIN16
+#    define HWND2DWORD(X_hWnd) ( (DWORD)MAKELONG(((WORD)(X_hWnd)), 0) )
+#  endif
+#endif // HWND2DWORD
+
+
+/*
+ * WIN16 - WIN32 compatibility stuff
+ */
+
+#ifdef WIN32
+
+# define DLLEXPORT    __declspec( dllexport )
+# define EXPORT
+# define LOADDS
+# define HUGE
+# ifndef FAR
+#  define FAR
+# endif // FAR
+# ifndef NEAR
+#  define NEAR
+# endif // NEAR 
+# ifdef UNICODE
+#  define SIZEOF(x)   (sizeof(x)/sizeof(WCHAR))
+# else
+#  define SIZEOF(x)   sizeof(x)
+# endif
+
+#else  // !WIN32 == WIN16
+
+# define DLLEXPORT    
+# define EXPORT       __export
+# define LOADDS       __loadds
+# define HUGE         __huge
+# ifndef FAR
+#   define FAR        __far
+#   define NEAR       __near
+# endif  // FAR
+# define CONST const
+# define SIZEOF(x)    sizeof(x)
+# define CHAR char
+# define TCHAR char
+# define WCHAR char
+# ifndef LPTSTR
+#   define LPTSTR LPSTR
+# endif
+# ifndef LPCTSTR 
+#   define LPCTSTR LPCSTR
+# endif
+# define UNREFERENCED_PARAMETER(x) x;
+# ifndef TEXT
+#   define TEXT(x) x
+# endif
+# define GetWindowTextW GetWindowText
+# define lstrcpyW lstrcpy   
+
+# define BN_DBLCLK BN_DOUBLECLICKED // ~~MRJ needed for custom control.
+// ~~MRJ begin Win95 backward compat section
+# define LPWSTR LPSTR
+# define LPCWSTR LPCSTR
+
+// button check state for WIN16
+#ifndef BST_UNCHECKED
+#define BST_UNCHECKED      0x0000
+#endif
+
+#ifndef BST_CHECKED
+#define BST_CHECKED        0x0001
+#endif
+
+
+#ifndef WIN95_COMPAT
+#  define WIN95_COMPAT
+#endif
+
+// ~~MRJ end Win95 compat section.
+
+// critical section API stubs
+typedef DWORD CRITICAL_SECTION;
+typedef CRITICAL_SECTION FAR * LPCRITICAL_SECTION; 
+#ifdef __cplusplus
+inline void InitializeCriticalSection(LPCRITICAL_SECTION lpSection) {}
+inline void DeleteCriticalSection(LPCRITICAL_SECTION lpSection) {}
+inline void EnterCriticalSection(LPCRITICAL_SECTION lpSection) {}
+inline void LeaveCriticalSection(LPCRITICAL_SECTION lpSection) {} 
+#endif // __cplusplus 
+
+// Added for nssock16 ---Neeti
+#ifndef ZeroMemory
+#include <memory.h>
+#define ZeroMemory(PTR, SIZE) memset(PTR, 0, SIZE)
+#endif // ZeroMemory
+
+#endif // WIN16
+
+/*
+ * unix - windows compatibility stuff
+ */
+typedef DWORD u_int32;
+typedef WORD  u_int16;
+typedef BYTE  u_int8;
+#ifdef WIN32
+typedef short int Bool16;
+#else  // WIN16
+typedef BOOL  Bool16;
+#endif // WIN16
+
+/*
+ * Cross Platform Compatibility
+ */
+#ifndef UNALIGNED
+# ifdef _M_ALPHA
+#  define UNALIGNED __unaligned
+# else  // !_M_ALPHA
+#  define UNALIGNED
+# endif // !_M_ALPHA
+#endif  // UNALIGNED
+
+//
+// RICHIE - for the Alpha port
+//
+#ifdef _M_ALPHA
+# undef pascal
+# undef PASCAL
+# if (_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED)
+#  define pascal __stdcall
+#  define PASCAL __stdcall
+# else
+#  define PASCAL
+# endif
+#endif
+
+
+/*
+ * Useful Types
+ */
+typedef char HUGE *HPSTR;
+typedef const char HUGE *HPCSTR;
+typedef unsigned char HUGE *HPBYTE;
+typedef WORD HUGE *HPWORD;
+typedef UINT FAR *LPUINT;
+typedef BOOL (CALLBACK *USERABORTPROC)();
+typedef BOOL (CALLBACK *PROGRESSPROC)(UINT uPos, UINT uRange);
+typedef int INT;   // ~~MRJ a function needed this defined.
+typedef MINMAXINFO FAR *LPMINMAXINFO; // ~~MRJ 
+
+//
+// stuff missing from windows.h
+//
+#ifndef MAKEWORD
+#define MAKEWORD(low, high)    ((WORD)(((BYTE)(low)) | (((WORD)((BYTE)(high))) << 8)))
+#endif // MAKEWORD
+
+#ifdef WIN32
+# ifndef hmemcpy
+#  define hmemcpy memcpy
+# endif // !defined(hmemcpy)
+# define _fmemset memset
+
+# include <malloc.h>
+
+#ifdef __cplusplus
+
+inline BOOL IsGDIObject(HGDIOBJ hObj) { return (hObj != 0); }
+inline void *_halloc(long num, unsigned int size) { return malloc(num * size); }
+inline void _hfree( void *memblock ) { free(memblock); } 
+/*
+inline BOOL IsInstance(HINSTANCE hInst) {
+# ifdef WIN32
+    return (hInst != 0);
+# else // WIN16
+    return (hInst > HINSTANCE_ERROR);
+# endif  
+}  
+*/
+
+#endif // __cplusplus
+
+  WINUSERAPI HANDLE WINAPI LoadImageA(HINSTANCE, LPCSTR, UINT, int, int, UINT);
+
+#endif // WIN32
+
+#ifdef __cplusplus 
+inline BOOL IsInstance(HINSTANCE hInst) {
+# ifdef WIN32
+    return (hInst != 0);
+# else // WIN16
+    return (hInst > HINSTANCE_ERROR);
+# endif  
+} 
+inline void SetWindowSmallIcon(HINSTANCE hInst, HWND hWnd, UINT uIconResourceId) {
+#ifdef WIN32
+# ifndef WM_SETICON
+#   define WM_SETICON 0x0080
+# endif  // WM_SETICON
+# ifndef IMAGE_ICON
+#   define IMAGE_ICON 1
+# endif
+  assert(IsWindow(hWnd));
+  HICON hIcon = (HICON)LoadImageA(hInst, MAKEINTRESOURCE(uIconResourceId), IMAGE_ICON,
+    16, 16, 0);
+  if(NULL != hIcon) {
+    SendMessage(hWnd, WM_SETICON, FALSE, (LPARAM)hIcon);
+  } else {
+    HICON hIcon = LoadIcon(hInst, MAKEINTRESOURCE(uIconResourceId));
+    assert(hIcon != 0);
+    SendMessage(hWnd, WM_SETICON, FALSE, (LPARAM)hIcon);
+  }
+#endif // WIN32
+}
+#endif // __cplusplus
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* PORT_H */

mozilla/mailnews/mapi/old/tests/mapitest/readmail.cpp

@@ -0,0 +1,137 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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 the Initial Developer are Copyright (C) 1998
+ * 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 NPL, 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 NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+//
+#include <windows.h>
+#include <windowsx.h>
+
+#ifndef MAPI_OLE	// Because MSFT doesn't do this for us :-(
+#include <mapi.h>
+#endif
+
+#include "port.h"
+#include "resource.h"
+
+//
+// Variables...
+// 
+extern HINSTANCE   hInst;
+extern HINSTANCE   m_hInstMapi;
+extern LHANDLE     mapiSession;
+
+// 
+// Forward declarations...
+//
+extern void   ShowMessage(HWND hWnd, LPSTR msg);
+extern void   SetFooter(LPSTR msg);
+extern LPSTR  GetMAPIError(LONG errorCode);
+lpMapiMessage mailPtr = NULL;
+
+void 
+ProcessReadMailCommand(HWND hWnd, int id, HWND hCtl, UINT codeNotify) 
+{ 
+  switch (id) 
+  {
+  case ID_OK:
+  case IDCANCEL:
+    EndDialog(hWnd, 0);
+    break;
+
+  default:
+    break;
+  }
+}
+
+BOOL CALLBACK LOADDS 
+ReadMailDlgProc(HWND hWndMail, UINT wMsg, WPARAM wParam, LPARAM lParam) 
+{
+  switch (wMsg) 
+  {
+  case WM_INITDIALOG: 
+    {
+      DWORD i;
+      // Do everything we need to display the message pointed to by
+      // mailPtr
+      if (!mailPtr)
+        break;
+
+      // Start with the basics...
+      SetDlgItemText(hWndMail, IDC_EDIT_SUBJECT, mailPtr->lpszSubject);
+      SetDlgItemText(hWndMail, IDC_EDIT_DATETIME, mailPtr->lpszDateReceived);
+      SetDlgItemText(hWndMail, IDC_EDIT_THREAD, mailPtr->lpszConversationID);
+      SetDlgItemText(hWndMail, IDC_EDIT_BODYTEXT, mailPtr->lpszNoteText);
+
+      char    buf[1024];
+      wsprintf(buf, "%s (%s)", mailPtr->lpOriginator->lpszName, 
+                              mailPtr->lpOriginator->lpszAddress);
+      SetDlgItemText(hWndMail, IDC_EDIT_FROM, buf);
+
+      for (i=0; i<mailPtr->nRecipCount; i++)
+      {
+          wsprintf(buf, "%s (%s)", mailPtr->lpRecips[i].lpszName, 
+                                   mailPtr->lpRecips[i].lpszAddress);
+          ListBox_InsertString(GetDlgItem(hWndMail, IDC_LIST_RECIPIENTS), 
+                  ListBox_GetCount(GetDlgItem(hWndMail, IDC_LIST_RECIPIENTS)), 
+                  buf);
+      }
+
+      for (i=0; i<mailPtr->nFileCount; i++)
+      {
+          ListBox_InsertString(GetDlgItem(hWndMail, IDC_LIST_ATTACHMENTS), 
+                ListBox_GetCount(GetDlgItem(hWndMail, IDC_LIST_ATTACHMENTS)), 
+                mailPtr->lpFiles[i].lpszPathName);
+      }
+    }
+    break;
+
+  case WM_COMMAND:
+    HANDLE_WM_COMMAND(hWndMail, wParam, lParam, ProcessReadMailCommand);
+    break;
+
+  default:
+    return FALSE;
+  }
+  
+  return TRUE;
+}
+
+void
+DisplayMAPIReadMail(HWND hWnd, lpMapiMessage msgPtr)
+{
+  mailPtr = msgPtr;
+  DialogBox(hInst, MAKEINTRESOURCE(ID_DIALOG_READMAIL), hWnd, 
+                (DLGPROC)ReadMailDlgProc);
+}

mozilla/mailnews/mapi/old/tests/mapitest/resource.h

@@ -0,0 +1,108 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Developer Studio generated include file.
+// Used by mtest32.rc
+//
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+#define ID_GUI_MESSAGE1                 1
+#define ID_BUTTON_MAPIADDRESS           3
+#define ID_DIALOG                       101
+#define ID_ICON_APP                     102
+#define ID_MENU                         104
+#define ID_DIALOG_MAIL                  105
+#define ID_DIALOG_READMAIL              106
+#define ID_SETFROMEDIT                  1000
+#define ID_SETTEXT                      1001
+#define ID_GETROWS                      1001
+#define ID_EDIT                         1002
+#define ID_EDIT_HWND                    1002
+#define ID_RESOURCETEXT                 1003
+#define ID_GETTEXT                      1003
+#define ID_STATIC_RESULT                1004
+#define ID_GETVISROWS                   1005
+#define ID_GETWINID                     1006
+#define ID_SETROWFOCUS                  1007
+#define ID_GETROWFOCUS                  1008
+#define ID_EDIT_ROW                     1009
+#define ID_LIST_RESULT                  1010
+#define ID_GETCOLCOUNT                  1011
+#define ID_BUTTON_LOGON                 1011
+#define ID_SETROWINVIEW                 1012
+#define ID_BUTTON_LOGOFF                1012
+#define ID_GETNUMCHILDREN               1013
+#define ID_EDIT_USERNAME                1013
+#define ID_CLEARRESULTS                 1014
+#define ID_EDIT_PW                      1014
+#define ID_BUTTON_FINDNEXT              1015
+#define ID_BUTTON_CLEAR                 1016
+#define ID_BUTTON_READMAIL              1017
+#define ID_BUTTON_DELETEMAIL            1018
+#define IDC_EDIT_RESOLVENAME            1019
+#define ID_BUTTON_MAPISENDMAIL          1020
+#define ID_BUTTON_NSCPVERSION           1020
+#define ID_BUTTON_RESOLVENAME           1021
+#define ID_BUTTON_MAPISENDDOCUMENTS     1021
+#define ID_EDIT_TOADDRESS               1022
+#define ID_EDIT_CCADDRESS               1023
+#define ID_BUTTON_DETAILS               1024
+#define ID_EDIT_BCCADDRESS              1024
+#define ID_EDIT_SUBJECT                 1025
+#define ID_BUTTON_MAIL                  1025
+#define ID_BUTTON_FREEBUFFER            1026
+#define ID_EDIT_NOTETEXT                1026
+#define ID_EDIT_ATTACH1                 1027
+#define ID_BUTTON_SYNC                  1027
+#define ID_EDIT_ATTACH2                 1028
+#define IDC_CHECK_BODYASFILE            1028
+#define ID_EDIT_ATTACH3                 1029
+#define IDC_CHECK_ENVELOPEONLY          1029
+#define IDC_LIST_ATTACHMENTS            1029
+#define ID_EDIT_ATTACH4                 1030
+#define IDC_CHECK_PEEK                  1030
+#define IDC_EDIT_BODYTEXT               1030
+#define IDC_CHECK_SUPPRESSATTACH        1031
+#define IDC_LIST_RECIPIENTS             1031
+#define ID_BUTTON_MAPISAVEMAIL          1031
+#define IDC_EDIT_SUBJECT                1032
+#define IDC_EDIT_DATETIME               1033
+#define ID_OK                           1034
+#define IDC_EDIT_THREAD                 1035
+#define ID_CHECK_SHOWDIALOG             1035
+#define IDC_EDIT_FROM                   1036
+#define ID_MENU_MYEXIT                  30001
+#define ID_MENU_CLEAR                   30002
+#define ID_MENU_MYABOUT                 30003
+#define ID_MENU_CLEARRESULTS            30004
+#define ID_MENU_MAPIDELETEMAIL          30005
+#define ID_MENU_MAPIFINDNEXT            30006
+#define ID_MENU_MAPIREADMAIL            30007
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        107
+#define _APS_NEXT_COMMAND_VALUE         30008
+#define _APS_NEXT_CONTROL_VALUE         1036
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif

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

@@ -0,0 +1,117 @@
+<?xml version="1.0"?>
+
+<!-- If you modify this file, please also update the following files -->
+<!-- mailnews/mapi/resources/content/contents.rdf in the ns tree -->
+
+<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"/>
+  </RDF:Seq>
+
+  <!-- package information -->
+  <RDF:Description about="urn:mozilla:package:messenger"
+        chrome:displayName="Messenger"
+        chrome:author="mozilla.org"
+        chrome:name="messenger"
+	chrome:localeVersion="0.9.4"
+		chrome:skinVersion="0.9.4">
+  </RDF:Description>
+
+  <!-- overlay information -->
+  <RDF:Seq about="urn:mozilla:overlays">
+    <RDF:li resource="chrome://communicator/content/pref/preftree.xul"/>
+    <RDF:li resource="chrome://communicator/content/pref/pref-appearance.xul"/>
+    <RDF:li resource="chrome://communicator/content/pref/pref-advanced.xul"/>
+    <RDF:li resource="chrome://communicator/content/tasksOverlay.xul"/>
+    <RDF:li resource="chrome://navigator/content/navigatorOverlay.xul"/>
+    <RDF:li resource="chrome://communicator/content/history/history.xul"/>
+    <RDF:li resource="chrome://communicator/content/bookmarks/bookmarks.xul"/>
+    <RDF:li resource="chrome://communicator/content/bookmarks/bm-find.xul"/>
+    <RDF:li resource="chrome://messenger/content/messenger.xul"/>
+    <RDF:li resource="chrome://messenger/content/mail3PaneWindowVertLayout.xul"/>
+    <RDF:li resource="chrome://messenger/content/messengercompose/messengercompose.xul"/>
+    <RDF:li resource="chrome://messenger/content/addressbook/addressbook.xul"/>
+    <RDF:li resource="chrome://messenger/content/addressbook/abSelectAddressesDialog.xul"/>
+    <RDF:li resource="chrome://editor/content/editor.xul"/>
+    <RDF:li resource="chrome://messenger/content/pref-mailnews.xul"/>
+  </RDF:Seq>
+
+
+  <!-- messenger preferences branches -->
+  <RDF:Seq about="chrome://communicator/content/pref/preftree.xul">
+    <RDF:li>chrome://messenger/content/mailPrefsOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <!-- messenger startup pref -->
+  <RDF:Seq about="chrome://communicator/content/pref/pref-appearance.xul">
+    <RDF:li>chrome://messenger/content/mailPrefsOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <!-- messenger js toggle pref -->
+  <RDF:Seq about="chrome://communicator/content/pref/pref-advanced.xul">
+    <RDF:li>chrome://messenger/content/mailPrefsOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <!-- messenger taskbar/tasks menu items -->
+  <RDF:Seq about="chrome://communicator/content/tasksOverlay.xul">
+    <RDF:li>chrome://messenger/content/mailTasksOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <!-- messenger items for History -->
+  <RDF:Seq about="chrome://communicator/content/history/history.xul">
+    <RDF:li>chrome://messenger/content/mailNavigatorOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <!-- messenger items for Bookmarks -->
+  <RDF:Seq about="chrome://communicator/content/bookmarks/bookmarks.xul">
+    <RDF:li>chrome://messenger/content/mailNavigatorOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <!-- messenger items for History -->
+  <RDF:Seq about="chrome://communicator/content/bookmarks/bm-find.xul">
+    <RDF:li>chrome://messenger/content/mailNavigatorOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <!-- messenger items for Navigator -->
+  <RDF:Seq about="chrome://navigator/content/navigatorOverlay.xul">
+    <RDF:li>chrome://messenger/content/mailNavigatorOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <!-- messenger items for Messenger -->
+  <RDF:Seq about="chrome://messenger/content/messenger.xul">
+    <RDF:li>chrome://messenger/content/mailMessengerOverlay.xul</RDF:li>
+  </RDF:Seq>
+  <RDF:Seq about="chrome://messenger/content/mail3PaneWindowVertLayout.xul">
+    <RDF:li>chrome://messenger/content/mailMessengerOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <!-- messenger items for Mail Compose -->
+  <RDF:Seq about="chrome://messenger/content/messengercompose/messengercompose.xul">
+    <RDF:li>chrome://messenger/content/mailMessengerComposeOverlay.xul</RDF:li>
+  </RDF:Seq>
+  
+  <!-- messenger items for Addressbook -->
+  <RDF:Seq about="chrome://messenger/content/addressbook/addressbook.xul">
+    <RDF:li>chrome://messenger/content/mailABOverlay.xul</RDF:li>
+  </RDF:Seq>
+  
+  <!-- messenger items for Select Addresses dialog -->
+  <RDF:Seq about="chrome://messenger/content/addressbook/abSelectAddressesDialog.xul">
+    <RDF:li>chrome://messenger/content/mailOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+
+  <!-- messenger items for Composer -->
+  <RDF:Seq about="chrome://editor/content/editor.xul">
+    <RDF:li>chrome://messenger/content/mailEditorOverlay.xul</RDF:li>
+  </RDF:Seq>
+  
+  <!-- mapi items for Mail And Newsgroups preferences pane -->
+  <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/jar.mn

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

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

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

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/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/content/pref-mailnewsOverlay.js"/>
+<hbox autostretch="never" id="mapi">
+  <checkbox id="mailnewsEnableMapi" label="&enableMapi.label;"
+            accesskey="&enableMapi.accesskey;"
+            oncommand="onEnableMapi();"
+            startFunc="mailnewsOverlayStartup();"/>
+</hbox>
+</overlay> 

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

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

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

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

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

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

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/mstone/Building

@@ -1,46 +0,0 @@
-Mstone building instructions
-
-For Unix, just "gmake" one of these
-	release		The usual optimized build
-	debug		Debug build includes some asserts
-
-	rpackage	Build the release and package it
-	dpackage	Build the debug version and package it
-
-	all_OPT		Build a multi-platform package
-	all_DBG		Build a multi-platform debug package
-
-For NT, run autobuild.bat.  This will build and package both the debug
-and optimized versions.  Perl must already be built and installed in
-\.  The NT build may be behind the Unix stuff.  Pull the build/package/*
-subdirectories into the main build/package before doing a 'make all_???'.
-
-You can build multiple OSes in the same tree.  Debug and optimized
-builds are kept separately.  The all_??? targets will combine whatever
-OSes are present into a multi-architecture package (including NT).
-Note that you have ot build and package each OS before doing the all_
-step.
-
-
-Helper components
-
-Linux usually comes with workable versions of gnuplot and perl.  Most
-other OSes don't.  Mstone can build and package perl, gnuplot, and gd
-with the right settings.  These will be automatically built and
-packaged if they are present.
-
-Unpack gd1.3 or later in the mstone directory.  You can probably find
-gd from here: http://www.boutell.com/gd/.  The directory should look
-like gd?.*.  Right now we need the (obsolete) version 1.3 to generate
-GIF files (without patented run-length coding).  The scripts need to
-be updated to be able to handle PNG or GIF files.
-
-Unpack gnuplot 3.7 or later in the mstone directory.  You can probably
-find gnuplot from http://www.cs.dartmouth.edu/gnuplot_info.html.  The
-directory should look like gnuplot-?.* (the exact version should not
-matter).  Gnuplot requres gd to generate GIFs (which is what we need).
-
-Unpack perl 5.005 or later in the mstone directory.  You can probably
-find perl from http://www.perl.com/pub/language/info/software.html.
-The directory should look like perl5.* (the exact version should
-not matter).

mozilla/mstone/ChangeLog

@@ -1,73 +0,0 @@
-2005-02-19  Dan Christian  <robodan@idiom.com>
-
-	* Merge big Sendmail patch see ChangeLog-Sendmail for details
-
-	* src/bench.h (VERSION): Start working toward version 5.0 (now 4.9)
-
-2004-09-07  Dan Christian  <robodan@idiom.com>
-
-	* data/*.msg: Updated with more realistic messages
-
-	* bin/args.pl: Really fix doc link to be relative
-
-	* src/smtp.c (sendSMTPLoop): Handle file lists (random selection)
-	(sendFile): New, send file with option offset and head/tail
-	(SmtpFilePrep): Split a glob pattern to a list
-	(SmtpFileInit): New, split out initial file scan
-
-	* src/bench.c (rangeNext): Get to last value in a random range
-
-2004-06-14  Dan Christian  <robodan@idiom.com>
-
-	* Makefile (VERSION): Bump version to 4.3
-
-	* Make build work on recent versions of Linux and Solaris
-
-	* Make ssh the default way to get a remote shell
-
-	* Support SVG graph output (not supported by all browsers)
-
-	* Use rfc822 style from addresses
-
-	* Fix documentation link on index page to be local
-
-2000-04-28  Dan Christian  <dac@x.cx>
-
-	* http and wmap now use common routines from http-util
-
-	* http is now separated from the pish command structure.
-
-2000-04-27  Dan Christian  <dac@x.cx>
-
-	* bin/genplot.pl: Support gnuplot generating images other than gif
-
-	* src/smtp.c (sendSMTPStart): Send domain name with HELO
-
-2000-04-05  Dan Christian <robodan@netscape.com>
-	* Fix bug in WMAP where the login field was reporting banner data.
-
-	* Add a reconnect concept to WMAP.  This separates out the
-	reconnect activity from the initial connections.  There is still a
-	bug/feature that the reconnect increments an error which can
-	eventually hit the maxErrors limit.  You have to record the error
-	or else you could not get the "connections" graph right.
-	
-2000-03-31  Dan Christian <robodan@netscape.com>
-	
-	* Merged setup and mstone into one script to reduce command
-	namespace polution.  "mstone setup" is the the same as "setup".
-
-	* Made setup try to be more tolerant of OSes that were not
-	include in the distribution.  SunOS 5.7 will fall back to 5.6.
-
-	* Now package conf/general.wld.in and only copy to general.wld if
-	there isn't one already in place.  This means that you can unpack
-	new bits over old bits without blowing away your configuration.
-	
-	* Added <includeOnce file> command to workloads.  This allows
-	tests to be used either as a stand alone or as part of another
-	test (e.g. smtp).
-
-	* Converted ChangeLog to more common formating
-
-	* Spilt off old ChangeLog entries to ChangeLog.1 and ChangeLog.2

mozilla/mstone/ChangeLog-Sendmail

@@ -1,86 +0,0 @@
-2005-02-03  Thom O'Connor <thom@sendmail.com>
-
-        * Merge Mozilla mstone HEAD with Sendmail,Inc. modifications. In
-          particular, this included some hand-waving around the bitwise
-          operators "leaveMailOnServer" in the Mozilla branch and the
-          dinst_t struct pish->leaveMailOnServerDist.
-
-2005-01-25  Thom O'Connor <thom@sendmail.com>
-
-        * Fix comments, properly attribute Sean O'Rourke's contributions.
-
-2004-09-21  Thom O'Connor <thom@sendmail.com>
-
-	* Modified config/config.mk to build SSL version of mailclient.
-
-2004-06-07  Thom O'Connor <thom@sendmail.com>
-
-	* Remove _thread_sys_poll defininition for poll in FreeBSD builds
-	(bench.h).
-
-2001-04-27  Sean O'Rourke  <sean@sendmail.com>
-
-	* distributions can now be truncated.  This is used to prevent
-	0-recipient messages, and could be used to prevent enormous
-	messages.
-
-	* throttling: Preload workloads use some additional mstone magic
-	to throttle delivery rate based on server responsiveness.  This is
-	still in the experimental phase, and may change.
-
-	* fix for parsing bug exposed by distribution truncation notation.
-	
-2001-03-10    Sean O'Rourke <sean@sendmail.com>
-
-	* clients: Fixed up code for specifying client counts on a
-	per-host or per-group basis.  This eliminates the need to force
-	the mozilla distribution code to do one's bidding.
-
-	* smtpsink.pl: Very basic threaded perl SMTP sink.  This may go
-	away to be replaced by the sink from smtpslam.  Needs much better
-	statistics.
-
-2001-02-24    Sean O'Rourke <sean@sendmail.com>
-
-	* checksums added.  See {checksum,md5}.{c,h}.  Auto-generated
-	messages can currently have checksums computed over the body, and
-	pop and multipop retrieval will verify the sum.
-
-2001-02-21    Sean O'Rourke <sean@sendmail.com>
-
-	* MIME generation changed to generate deep messages rather than
-	  several parts.  This should be a better test of MIME parsers,
-	  forcing them to save more state.
-
-2001-02-18    Sean O'Rourke <sean@sendmail.com>
-
-	* mstone_changes.html: update SSL documentation.
-
-	* wld, defaults.pm: divide the ever-expanding "config" section
-	  into more descriptive subparts: clients, server, sink, mstone.
-
-	* report: now in bin directory, where it should be.
-
-2001-02-17    Sean O'Rourke <sean@sendmail.com>
-
-	* client.c, main.c, parse.c: removed old throttling code, as it
-	  wasn't being used.
-	
-	* ALL: General code cleanup.
-	
-	* sysdep.c: simplified rlimit-bumping code, added increase for
-	  RLIM_NPROC, as threads are procs on some systems.
-
-	* imap4.c: removed silliness of malloc()ing a buffer the size of
-	  the entire message every time we retrieve a message.
-
-	* xalloc.c, xalloc.h: consolidated memory allocation so everyone
-	  handles OOM the same way (for now, dump core).
-
-	* constants.h: various assumptions and limits, were in bench.h.
-
-	* events: added event-queue model to reduce thread requirements.
-	  Eventually, it would be nice for a consultant to be able to run
-	  this off a laptop to test a small- to medium-sized box.  For
-	  now, at least, configuration remains the same.  This doesn't
-	  work on NT.  Oh, well.

mozilla/mstone/ChangeLog.1

@@ -1,129 +0,0 @@
-MailStone 4.1: Changes to since version 4.0
-	
-	* threads are used on all platforms reduces memory requirements by
-	10x for large numbers of clients must run as root for maximum
-	connections per process
-	
-	* massive internal code and script cleanup / rewrite performance
-	improvements for socket handling (blocking) and caching files and
-	name lookups
-	
-	* filename and path conventions restructuring '/mailstone'
-	hardwired path no longer required mailstone/results/index.html
-	(index of test runs) mailstone/results/<datestamp>/stderr (look
-	here for errors) mailstone/results/<datestamp>/results.html
-	mailstone/results/<datestamp>/results.txt
-	mailstone/results/<datestamp>/work.wld (workload config used)
-	mailstone/results/<datestamp>/testbed.tbd (testbed used)
-	mailstone/results/<datestamp>/summary.csv (per client summary)
-	mailstone/results/<datestamp>/*.gif (graphs)
-	mailstone/tmp/<datestamp>/*.out (raw results from each client)
-	mailstone/conf/*.wld (workload file) mailstone/conf/*.html
-	(machine descriptions for reports) mailstone/data/*.msg (sample
-	test messages)
-	
-	* periodic statistics reporting allows for trend analysis of many
-	variables per protocol.  sampling rate is automatically determined
-	by mailmaster Can now generate on-the-fly reports for above by
-	running "process"
-	
-	* The accountFormat directive is now obsolete.  Use loginFormat
-	and addressFormat instead.
-	
-	* The numAccounts and beginAccounts directives are now obsolete.
-	Use numLogins, firstLogin, numAddresses, and firstAddress instead.
-	
-	* The sequentialLogins directive disables random account number
-	selection.  This insures a predictable account sequence.
-	
-	* The checkMailInterval directive for IMAP is now obsolete.  Use
-	loopDelay instead.
-	
-	* The directives idleTime, loopDelay, and numLoops now apply to
-	all protocols.  See the manual for how loopDelay and numLoops are
-	used by each protocol.
-	
-	* a command directive such as <SMTP> without HOSTS=xxx will now
-	apply to all clients in the testbed
-	
-	* <include> directive for workload and testbed files (e.g. for
-	user profile)
-	
-	* workloads are now passed to 'mailclient' through stdin no test
-	specific files need to be copied to client machines more
-	synchonized test startup
-	
-	* 'setup' script will copy mailclient and test messages
-	(data/*.msg) to each testbed machine in /var/tmp
-	
-	* 'cleanup' form of setup will remove mailclient and test messages
-	from each testbed machine in /var/tmp
-	
-	* 'checktime' form of setup will (nearly) simultaneously retrieve
-	time from each client.  This lets you easily check for clock
-	problems.
-	
-	* 'timesync' form of setup will (nearly) simultaneously set time
-	on each client.  This only works on OSs that support setting
-	seconds through the "date" command.  rdate or ntpdate should be
-	used if available.  You must be the root user and be able to rsh
-	as root for timesync to work.
-	
-	* Improved reports in text and html (formatting and content)
-	
-	* The text version of the report is now only displayed
-	automatically if "-v" is given.
-	
-	* Graphs with more than one protocol will also display a "Total"
-	graph
-	
-	* The graphs can now be customized for each test (see sample.wld
-	for the default)
-	
-	* You can now add graphs (in addition to the default or configured
-	ones) by using "process timestamp -a conf/moregraph.wld".
-	
-	* An informative index of test runs is now generated in
-	results/index.html
-	
-	* The index is updated while the run is in progress to make
-	checking for errors easier.
-	
-	* The error log now displays times relative to test start.
-	
-	* Memory use while processing results has been greatly reduced.
-	
-	* A summary of the data from each process is now saved in a
-	Comma-separated-value (CSV) file.  results/timestamp/clients.csv
-	
-	* A summary of the data over time is now saved in a
-	Comma-separated-value (CSV) file.
-	results/timestamp/protocol-time.csv
-	
-	* new gnuplot binary included, can output directly to gif format
-	
-	* read and write performance numbers now reported separately
-	
-	* new runtime banners and copyrights (ooh boy)
-	
-	* idleTime option for IMAP fixed, plus now applies to all commands
-	
-	* blockTime now sets a delay between command blocks
-	
-	* Process model is as follows
-	  User runs the top-level 'mstone' script
-	  This calls 'conf/testname.pl' with command line arguments
-	  This calls 'mailmaster.pl' with config and command line arguments
-	  mailmaster uses 'rsh' or equivalent to launch mailclients
-          mailclient runs on each testbed and forks numprocs
-	  each proc spawns numthreads (one per client)
-
-          <run tests> (note: results are being sent continuously)
-
-          threads send results back through sockets to top mailclient
-	  mailclient forwards results back over stdout via rsh pipe
-          (for future work - do some data reduction/combining here)
-	  mailmaster directs output to each client-<hostname> file
-	  mailmaster launches report generator
-	
-	* sample LDIF fragment for a postmaster entry included

mozilla/mstone/ChangeLog.2

@@ -1,77 +0,0 @@
-MailStone 4.15: Changes to Mailstone since version 4.1
-	
-	* Setup now checks license acceptance and configures a basic
-	setup.  By default, it will also create a user LDIF file with a
-	'allusers' account.
-	
-	* All parameters and and testbed information may now be specified
-	in the workload files (*.wld).  New sections: CONFIG, CLIENT,
-	MONITOR, PRETEST, and POSTTEST.  Command line parameters still
-	override the files.  A complete copy of the configuration is saved
-	in results/<TIMESTAMP>/all.wld.
-	
-	* The '*.pl', '*.tbd', and 'config*' files in ./conf/ are
-	depreciated.  These should still work, but the new sections are
-	simpler and more flexible.
-	
-	* Any CONFIG parameter can now be specified on the command line
-	using the form: 'PARAMETER=value'.  Note that PARAMETER is case
-	insensitive.  No whitespace is allowed before or after the '='.
-	
-	* The new switch '-l' or CONFIG parameter 'ClientCount' can now
-	specify the total number of clients.  The 'MaxClients' and
-	'MaxThreads' parameters in each CLIENT section control load
-	balancing.  If the 'processes' and 'threads' parameters are set,
-	then the load for that CLIENT section will not be adjusted, but
-	will be taken into account when calculating other CLIENT sections.
-	If just 'processes' is set, then only the thread count will be
-	adjusted.  All hosts in a CLIENT section will run the same number
-	of processes and threads.
-	
-	* bin/makeusers.pl now creates users, broadcast account, etc.
-	Numbered passwords are now suppored.  The new user/password format
-	now replaces '%ld' with the user number to match the rest of
-	mailstone.  The ldif/ directory is obsolete.  Run "perl/bin/perl
-	bin/makeusers.pl -h" for usage.
-	
-	* NT client machines may now be used from a Unix test master.  See
-	conf/sample.wld for configuration details.
-	
-	* Commands can now be run for a specified block count, error
-	count, or time (whichever comes first).  Set 'maxBlocks' and/or
-	'maxErrors'.
-	
-	* Telemetry logging to /var/tmp/mstone-log.pn.tn is now performed
-	when "telemetry 1" is specified.
-	
-	* The name used in the "CLIENT" section is now used to match
-	"HOSTS=..." qualifier.  Compatibility with "hostname" is no longer
-	needed.
-	
-	* Config values can now use quoted characters such as \n, \r, \t
-	
-	* Config values can be continued using \ (backslash)
-	
-	* System configuration information (SYSCONFIG) can now be
-	specified entirely within a workload file by quoting the newlines.
-	
-	* Config values get enclosing double-quotes stripped
-	
-	* Preliminary support for HTTP and WMAP (WebMail) testing.
-	
-	* New table formats are easier to interpret and allow more protocols.
-	
-	* The new text format report is easier to machine processes.
-	
-	* The following command line switches are now obsolete: -f, -g,
-	-e, -p, and -l.  The same functionality can be obtained by
-	FREQUENCY=<interval>, GNUPLOT=<path>, RSH=<path>, RCP=<path>, and
-	TEMPDIR=<directory> respectively.
-	
-	* File backups are now created.  When ./process is run multiple
-	times, the old files are moved to the ./tmp/<TIMESTAMP>/
-	directory.
-	
-	* perl has been updated to include full perl5.005_03 install
-	package.  Perl support for each architecture is now under the
-	perl/ directory.

mozilla/mstone/INSTALL

@@ -1,222 +0,0 @@
-
-		Mstone 4.15 Quick Installation
-
-This version of Mstone runs on many current UNIX platforms and NT.
-Only a web browser and text editor are needed to view the results and
-configure tests.
-
-
-QUICK INSTALL
--------------
-
-IMPORTANT: If you have an existing mstone, save a copy of the
-mstone/conf directory to preserve any configuration files you may want
-to keep.
-
-Unpack distribution:
-
-	tar xzf /tmp/mstone_OPT.tar.gz
-or
-	gunzip -c /tmp/mstone_OPT.tar.gz | tar xf -
-or
-	unzip /tmp/mstone_OPT.zip
-
-	cd mstone
-
-Both the tar.gz file and the zip file are identical.  Use whichever is
-more convenient for you.
-
-This will create a sub-directory named "mstone" with files and
-directories under that.  
-
-cd mstone
-
-NOTE: all scripts must be run from the mstone directory.
-
-
-Do initial configuration:
-
-Run "mstone config".  It will ask you about your system configuration.
-Fill in the appropriate values and create the optional user accounts
-and broadcast account.  When it asks about client machines, enter them
-seperated by commas, with no spaces (e.g. host1,host2,host3).  If you
-need to re-configure, run "mstone config".
-
-The machine starting the test may also be a client.  For accurate
-results, clients should not be run on the test mailserver machine (or
-its directory server).  If all the client machines are not running
-the same operating system version, see "Configuring Client Machines"
-below to configure for different OSes.
-
-When the test master is on NT, only the local machine may be a client
-and only one process is allowed.  You will not be asked about client
-machines.
-
-Setup only configures the most important parameters.  If you have more
-advanced needs, edit conf/general.wld appropriately.
-
-Run "mstone setup".  It will now push the necessary files to each
-client machine.  If there are problems (i.e. with rsh permissions),
-fix them and re-run "mstone setup" until everything works.
-
-
-Install test accounts:
-
-Setup will create a file called conf/MAILHOST.ldif (where MAILHOST is the
-name of your mail server).  If you are not using Netscape Messaging
-and Directory Servers, then you may have to edit the ldif file or use
-alternate means to create the user accounts.
-
-To import these users into Netscape Messaging Server, use "add
-entries" from the directory console or use the ldapmodify command line
-utility.
-
-Note: imports will go faster if access logging is disabled.  For large
-user counts (more than 10,000 users), it may be much faster to export
-the current database, merge the files together manually, and then
-import the new database.
-
-Here is how the ldapmodify supplied with Netscape Messaging Server
-would be used.
-
-setenv LD_LIBRARY_PATH /usr/netscape/messaging/lib
-cd /usr/netscape/messaging
-shared/bin/ldapmodify -h mailhost -a -D 'cn=directory manager' -w d_m_password < conf/MAILHOST.ldif
-
-
-Check time consistency:
-
-IMPORTANT: The system time on each client machine must be synchronized
-within one second of each other for accurate results graphs.
-
-Run "checktime" to see the time on each client.  There should not be
-more than two seconds difference among the displayed time.
-
-The best way to synchronize clients is use NTP (Network Time Protocol)
-or similar protocols (like rdate or timeslave) that have sub second
-accuracy.
-
-A simple utility called "timesync" is provide to push the local
-system time to all clients.  You must be root and have root rsh
-permissions to use timesync.  Timesync only works on OSs that support
-setting seconds using "date MMDDhhmmCCYY.ss".  Timesync is only
-accurate to a second (at best) and should only be used if better
-protocols aren't available.
-
-When running the test master on NT, "checktime" and "timesync" are
-never needed (because there is only one client machine).  Timesync
-will be ignored for NT clients, another method must be used
-(e.g. timeserv or Dimension4).
-
-
-Run tests:
-
-Try it out.  Use small process and thread counts until everything is
-working.
-
-mstone pop -t 30s
-
-The script will tell you how many processes and threads it is running
-on each system and where errors are logged.  At the end of the test,
-it will print out a URL for the test results and an indication of the
-size of the errorlog file (stderr).
-
-The results of the mstone run will display statistics for each
-protocol that was tested.  The results are presented in both a HTML
-web page and a text file.  The text file is simple and uniform, while
-the web page is more user readable.  The web page has links to the
-test configuration files, error log, and the text version.
-
-For long tests run (e.g. 8 hours), the results can be updated while
-the test is running by using the "process" utility.  Don't run
-"process" near the very end of the test.
-
-If a test has to be aborted, then use "process" to generate a report
-using the available data.
-
-
-Customize tests:
-
-Copy and edit the scripts (e.g. "conf/pop.wld") to define new tests.
-The CONFIG section specifies all the attributes used in the test.
-Other sections specify the protocols to be tested and the parameters
-for them.
-
-All switches can be overridden on the command line to facilitate
-easier testing.  The exact configuration (include command line
-overrides) is stored with the results from each test.
-
-
-Maintenance:
-
-You can run "mstone setup" at any time (except during a test :-) to
-update the files on the client machines.
-
-Use "mstone cleanup" to remove the files created by "mstone setup".
-
-After the test is finished, the directories under "tmp/" can be
-compressed or deleted to save space.  All the information about a test
-run is stored in the "results/" directories.
-
-
-Configuring client machines:
-
-Edit conf/general.wld to include CLIENT sections for each machines to
-use.
-
-You can also specify the OS type for each client machine.  Set the
-"Arch" parameter in each CLIENT section as appropriate (e.g. SunOS5.6,
-Linux2.2_x86, AIX4.2, HP-UXB.11.00, IRIX6.5, OSF1V4.0, WINNT4.0). The
-directories under "bin" specify the available OS types.
-
-For NT4.0 clients with a UNIX test master, you will need to configure
-"command" and "tempDir" for proper operation.  See the "HOSTS=winnt01"
-example in conf/sample.wld.
-
-The total number of processes and threads that can be supported on a
-client is dependent on the number of commands in the test, the OS, and
-available memory.  Check the stderr log for messages about not being
-able to create processes or threads.  Check on the client machines
-during the test and make sure they aren't running out of CPU.  The
-UNIX programs "top" and "vmstat" are good for this.  If the client CPU
-is more than 75% busy, use more machines.
-
-Also watch out for network saturation.  You may have to use machines
-with separate networks to the server to reach full server load.
-
-
-Know problems:
-
-There can be extraneous errors or connections after the specified end
-of the test.  These are most likely do to stopping the test and should
-be ignored.
-
-At the end of the test, all current connections will logout without
-any delays.  This can cause very high peak loads.
-
-If one process exits early (due to misconfiguration or resource
-exhaustion) and the monitoring command did not specify a count (%c),
-then the monitoring tasks will be terminated early as well.
-
-Monitoring commands that specify a count (%c), may take longer than
-predicted and delay the processing of test results.  This is because
-vmstat actually delays the requested time plus the time needed to
-generate the statistics summary.
-
-If you are doing tests with large thread counts, you may have to run
-as root to allow mailclient to raise its resource limits.
-
-The telemetry logging for SMTP, POP3, and IMAP4 is incomplete.  Most
-commands are captured, but banners and message contents may be missing.
-
-The MaxBlocks parameter gets divided by the total number of processes
-before starting each client.  This doesn't account for clients that
-don't have commands to run.
-
-The HTTP protocol used by WMAP allows connections to be dropped and
-re-connected as needed.  WMAP logs this as an error and an additional
-connect.  The error log must be consulted to distinguish another types
-of connection errors (timeout or connection refused) from an automatic
-re-connect.
-
-The HTTP protocol test is experimental and subject to change.

mozilla/mstone/LICENSE

@@ -1,19 +0,0 @@
-The contents of this software package are subject to the Netscape
-Public License Version 1.1 (the "License"); you may not use this
-software 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.
-
-Alternatively, the this software package may be used under the terms
-of the GNU Public License (the "GPL"), in which case the provisions of
-the GPL are applicable instead of those above.  If you wish to allow
-use of your version of this file only under the terms of the GPL and
-not to allow others to use your version of this file under the NPL,
-indicate your decision by deleting the provisions above and replace
-them with the notice and other provisions required by the GPL.  If you
-do not delete the provisions above, a recipient may use your version
-of this file under either the NPL or the GPL.

mozilla/mstone/LICENSE.npl

@@ -1,535 +0,0 @@
-                          MOZILLA PUBLIC LICENSE
-                                Version 1.1
-
-                              ---------------
-
-1. Definitions.
-
-     1.0.1. "Commercial Use" means distribution or otherwise making the
-     Covered Code available to a third party.
-
-     1.1. "Contributor" means each entity that creates or contributes to
-     the creation of Modifications.
-
-     1.2. "Contributor Version" means the combination of the Original
-     Code, prior Modifications used by a Contributor, and the Modifications
-     made by that particular Contributor.
-
-     1.3. "Covered Code" means the Original Code or Modifications or the
-     combination of the Original Code and Modifications, in each case
-     including portions thereof.
-
-     1.4. "Electronic Distribution Mechanism" means a mechanism generally
-     accepted in the software development community for the electronic
-     transfer of data.
-
-     1.5. "Executable" means Covered Code in any form other than Source
-     Code.
-
-     1.6. "Initial Developer" means the individual or entity identified
-     as the Initial Developer in the Source Code notice required by Exhibit
-     A.
-
-     1.7. "Larger Work" means a work which combines Covered Code or
-     portions thereof with code not governed by the terms of this License.
-
-     1.8. "License" means this document.
-
-     1.8.1. "Licensable" means having the right to grant, to the maximum
-     extent possible, whether at the time of the initial grant or
-     subsequently acquired, any and all of the rights conveyed herein.
-
-     1.9. "Modifications" means any addition to or deletion from the
-     substance or structure of either the Original Code or any previous
-     Modifications. When Covered Code is released as a series of files, a
-     Modification is:
-          A. Any addition to or deletion from the contents of a file
-          containing Original Code or previous Modifications.
-
-          B. Any new file that contains any part of the Original Code or
-          previous Modifications.
-
-     1.10. "Original Code" means Source Code of computer software code
-     which is described in the Source Code notice required by Exhibit A as
-     Original Code, and which, at the time of its release under this
-     License is not already Covered Code governed by this License.
-
-     1.10.1. "Patent Claims" means any patent claim(s), now owned or
-     hereafter acquired, including without limitation,  method, process,
-     and apparatus claims, in any patent Licensable by grantor.
-
-     1.11. "Source Code" means the preferred form of the Covered Code for
-     making modifications to it, including all modules it contains, plus
-     any associated interface definition files, scripts used to control
-     compilation and installation of an Executable, or source code
-     differential comparisons against either the Original Code or another
-     well known, available Covered Code of the Contributor's choice. The
-     Source Code can be in a compressed or archival form, provided the
-     appropriate decompression or de-archiving software is widely available
-     for no charge.
-
-     1.12. "You" (or "Your")  means an individual or a legal entity
-     exercising rights under, and complying with all of the terms of, this
-     License or a future version of this License issued under Section 6.1.
-     For legal entities, "You" includes any entity which controls, is
-     controlled by, or is under common control with You. For purposes of
-     this definition, "control" means (a) the power, direct or indirect,
-     to cause the direction or management of such entity, whether by
-     contract or otherwise, or (b) ownership of more than fifty percent
-     (50%) of the outstanding shares or beneficial ownership of such
-     entity.
-
-2. Source Code License.
-
-     2.1. The Initial Developer Grant.
-     The Initial Developer hereby grants You a world-wide, royalty-free,
-     non-exclusive license, subject to third party intellectual property
-     claims:
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Initial Developer to use, reproduce,
-          modify, display, perform, sublicense and distribute the Original
-          Code (or portions thereof) with or without Modifications, and/or
-          as part of a Larger Work; and
-
-          (b) under Patents Claims infringed by the making, using or
-          selling of Original Code, to make, have made, use, practice,
-          sell, and offer for sale, and/or otherwise dispose of the
-          Original Code (or portions thereof).
-
-          (c) the licenses granted in this Section 2.1(a) and (b) are
-          effective on the date Initial Developer first distributes
-          Original Code under the terms of this License.
-
-          (d) Notwithstanding Section 2.1(b) above, no patent license is
-          granted: 1) for code that You delete from the Original Code; 2)
-          separate from the Original Code;  or 3) for infringements caused
-          by: i) the modification of the Original Code or ii) the
-          combination of the Original Code with other software or devices.
-
-     2.2. Contributor Grant.
-     Subject to third party intellectual property claims, each Contributor
-     hereby grants You a world-wide, royalty-free, non-exclusive license
-
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Contributor, to use, reproduce, modify,
-          display, perform, sublicense and distribute the Modifications
-          created by such Contributor (or portions thereof) either on an
-          unmodified basis, with other Modifications, as Covered Code
-          and/or as part of a Larger Work; and
-
-          (b) under Patent Claims infringed by the making, using, or
-          selling of  Modifications made by that Contributor either alone
-          and/or in combination with its Contributor Version (or portions
-          of such combination), to make, use, sell, offer for sale, have
-          made, and/or otherwise dispose of: 1) Modifications made by that
-          Contributor (or portions thereof); and 2) the combination of
-          Modifications made by that Contributor with its Contributor
-          Version (or portions of such combination).
-
-          (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
-          effective on the date Contributor first makes Commercial Use of
-          the Covered Code.
-
-          (d)    Notwithstanding Section 2.2(b) above, no patent license is
-          granted: 1) for any code that Contributor has deleted from the
-          Contributor Version; 2)  separate from the Contributor Version;
-          3)  for infringements caused by: i) third party modifications of
-          Contributor Version or ii)  the combination of Modifications made
-          by that Contributor with other software  (except as part of the
-          Contributor Version) or other devices; or 4) under Patent Claims
-          infringed by Covered Code in the absence of Modifications made by
-          that Contributor.
-
-3. Distribution Obligations.
-
-     3.1. Application of License.
-     The Modifications which You create or to which You contribute are
-     governed by the terms of this License, including without limitation
-     Section 2.2. The Source Code version of Covered Code may be
-     distributed only under the terms of this License or a future version
-     of this License released under Section 6.1, and You must include a
-     copy of this License with every copy of the Source Code You
-     distribute. You may not offer or impose any terms on any Source Code
-     version that alters or restricts the applicable version of this
-     License or the recipients' rights hereunder. However, You may include
-     an additional document offering the additional rights described in
-     Section 3.5.
-
-     3.2. Availability of Source Code.
-     Any Modification which You create or to which You contribute must be
-     made available in Source Code form under the terms of this License
-     either on the same media as an Executable version or via an accepted
-     Electronic Distribution Mechanism to anyone to whom you made an
-     Executable version available; and if made available via Electronic
-     Distribution Mechanism, must remain available for at least twelve (12)
-     months after the date it initially became available, or at least six
-     (6) months after a subsequent version of that particular Modification
-     has been made available to such recipients. You are responsible for
-     ensuring that the Source Code version remains available even if the
-     Electronic Distribution Mechanism is maintained by a third party.
-
-     3.3. Description of Modifications.
-     You must cause all Covered Code to which You contribute to contain a
-     file documenting the changes You made to create that Covered Code and
-     the date of any change. You must include a prominent statement that
-     the Modification is derived, directly or indirectly, from Original
-     Code provided by the Initial Developer and including the name of the
-     Initial Developer in (a) the Source Code, and (b) in any notice in an
-     Executable version or related documentation in which You describe the
-     origin or ownership of the Covered Code.
-
-     3.4. Intellectual Property Matters
-          (a) Third Party Claims.
-          If Contributor has knowledge that a license under a third party's
-          intellectual property rights is required to exercise the rights
-          granted by such Contributor under Sections 2.1 or 2.2,
-          Contributor must include a text file with the Source Code
-          distribution titled "LEGAL" which describes the claim and the
-          party making the claim in sufficient detail that a recipient will
-          know whom to contact. If Contributor obtains such knowledge after
-          the Modification is made available as described in Section 3.2,
-          Contributor shall promptly modify the LEGAL file in all copies
-          Contributor makes available thereafter and shall take other steps
-          (such as notifying appropriate mailing lists or newsgroups)
-          reasonably calculated to inform those who received the Covered
-          Code that new knowledge has been obtained.
-
-          (b) Contributor APIs.
-          If Contributor's Modifications include an application programming
-          interface and Contributor has knowledge of patent licenses which
-          are reasonably necessary to implement that API, Contributor must
-          also include this information in the LEGAL file.
-
-               (c)    Representations.
-          Contributor represents that, except as disclosed pursuant to
-          Section 3.4(a) above, Contributor believes that Contributor's
-          Modifications are Contributor's original creation(s) and/or
-          Contributor has sufficient rights to grant the rights conveyed by
-          this License.
-
-     3.5. Required Notices.
-     You must duplicate the notice in Exhibit A in each file of the Source
-     Code.  If it is not possible to put such notice in a particular Source
-     Code file due to its structure, then You must include such notice in a
-     location (such as a relevant directory) where a user would be likely
-     to look for such a notice.  If You created one or more Modification(s)
-     You may add your name as a Contributor to the notice described in
-     Exhibit A.  You must also duplicate this License in any documentation
-     for the Source Code where You describe recipients' rights or ownership
-     rights relating to Covered Code.  You may choose to offer, and to
-     charge a fee for, warranty, support, indemnity or liability
-     obligations to one or more recipients of Covered Code. However, You
-     may do so only on Your own behalf, and not on behalf of the Initial
-     Developer or any Contributor. You must make it absolutely clear than
-     any such warranty, support, indemnity or liability obligation is
-     offered by You alone, and You hereby agree to indemnify the Initial
-     Developer and every Contributor for any liability incurred by the
-     Initial Developer or such Contributor as a result of warranty,
-     support, indemnity or liability terms You offer.
-
-     3.6. Distribution of Executable Versions.
-     You may distribute Covered Code in Executable form only if the
-     requirements of Section 3.1-3.5 have been met for that Covered Code,
-     and if You include a notice stating that the Source Code version of
-     the Covered Code is available under the terms of this License,
-     including a description of how and where You have fulfilled the
-     obligations of Section 3.2. The notice must be conspicuously included
-     in any notice in an Executable version, related documentation or
-     collateral in which You describe recipients' rights relating to the
-     Covered Code. You may distribute the Executable version of Covered
-     Code or ownership rights under a license of Your choice, which may
-     contain terms different from this License, provided that You are in
-     compliance with the terms of this License and that the license for the
-     Executable version does not attempt to limit or alter the recipient's
-     rights in the Source Code version from the rights set forth in this
-     License. If You distribute the Executable version under a different
-     license You must make it absolutely clear that any terms which differ
-     from this License are offered by You alone, not by the Initial
-     Developer or any Contributor. You hereby agree to indemnify the
-     Initial Developer and every Contributor for any liability incurred by
-     the Initial Developer or such Contributor as a result of any such
-     terms You offer.
-
-     3.7. Larger Works.
-     You may create a Larger Work by combining Covered Code with other code
-     not governed by the terms of this License and distribute the Larger
-     Work as a single product. In such a case, You must make sure the
-     requirements of this License are fulfilled for the Covered Code.
-
-4. Inability to Comply Due to Statute or Regulation.
-
-     If it is impossible for You to comply with any of the terms of this
-     License with respect to some or all of the Covered Code due to
-     statute, judicial order, or regulation then You must: (a) comply with
-     the terms of this License to the maximum extent possible; and (b)
-     describe the limitations and the code they affect. Such description
-     must be included in the LEGAL file described in Section 3.4 and must
-     be included with all distributions of the Source Code. Except to the
-     extent prohibited by statute or regulation, such description must be
-     sufficiently detailed for a recipient of ordinary skill to be able to
-     understand it.
-
-5. Application of this License.
-
-     This License applies to code to which the Initial Developer has
-     attached the notice in Exhibit A and to related Covered Code.
-
-6. Versions of the License.
-
-     6.1. New Versions.
-     Netscape Communications Corporation ("Netscape") may publish revised
-     and/or new versions of the License from time to time. Each version
-     will be given a distinguishing version number.
-
-     6.2. Effect of New Versions.
-     Once Covered Code has been published under a particular version of the
-     License, You may always continue to use it under the terms of that
-     version. You may also choose to use such Covered Code under the terms
-     of any subsequent version of the License published by Netscape. No one
-     other than Netscape has the right to modify the terms applicable to
-     Covered Code created under this License.
-
-     6.3. Derivative Works.
-     If You create or use a modified version of this License (which you may
-     only do in order to apply it to code which is not already Covered Code
-     governed by this License), You must (a) rename Your license so that
-     the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
-     "MPL", "NPL" or any confusingly similar phrase do not appear in your
-     license (except to note that your license differs from this License)
-     and (b) otherwise make it clear that Your version of the license
-     contains terms which differ from the Mozilla Public License and
-     Netscape Public License. (Filling in the name of the Initial
-     Developer, Original Code or Contributor in the notice described in
-     Exhibit A shall not of themselves be deemed to be modifications of
-     this License.)
-
-7. DISCLAIMER OF WARRANTY.
-
-     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
-     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
-     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
-     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
-     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
-     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
-     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
-     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
-     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-8. TERMINATION.
-
-     8.1.  This License and the rights granted hereunder will terminate
-     automatically if You fail to comply with terms herein and fail to cure
-     such breach within 30 days of becoming aware of the breach. All
-     sublicenses to the Covered Code which are properly granted shall
-     survive any termination of this License. Provisions which, by their
-     nature, must remain in effect beyond the termination of this License
-     shall survive.
-
-     8.2.  If You initiate litigation by asserting a patent infringement
-     claim (excluding declatory judgment actions) against Initial Developer
-     or a Contributor (the Initial Developer or Contributor against whom
-     You file such action is referred to as "Participant")  alleging that:
-
-     (a)  such Participant's Contributor Version directly or indirectly
-     infringes any patent, then any and all rights granted by such
-     Participant to You under Sections 2.1 and/or 2.2 of this License
-     shall, upon 60 days notice from Participant terminate prospectively,
-     unless if within 60 days after receipt of notice You either: (i)
-     agree in writing to pay Participant a mutually agreeable reasonable
-     royalty for Your past and future use of Modifications made by such
-     Participant, or (ii) withdraw Your litigation claim with respect to
-     the Contributor Version against such Participant.  If within 60 days
-     of notice, a reasonable royalty and payment arrangement are not
-     mutually agreed upon in writing by the parties or the litigation claim
-     is not withdrawn, the rights granted by Participant to You under
-     Sections 2.1 and/or 2.2 automatically terminate at the expiration of
-     the 60 day notice period specified above.
-
-     (b)  any software, hardware, or device, other than such Participant's
-     Contributor Version, directly or indirectly infringes any patent, then
-     any rights granted to You by such Participant under Sections 2.1(b)
-     and 2.2(b) are revoked effective as of the date You first made, used,
-     sold, distributed, or had made, Modifications made by that
-     Participant.
-
-     8.3.  If You assert a patent infringement claim against Participant
-     alleging that such Participant's Contributor Version directly or
-     indirectly infringes any patent where such claim is resolved (such as
-     by license or settlement) prior to the initiation of patent
-     infringement litigation, then the reasonable value of the licenses
-     granted by such Participant under Sections 2.1 or 2.2 shall be taken
-     into account in determining the amount or value of any payment or
-     license.
-
-     8.4.  In the event of termination under Sections 8.1 or 8.2 above,
-     all end user license agreements (excluding distributors and resellers)
-     which have been validly granted by You or any distributor hereunder
-     prior to termination shall survive termination.
-
-9. LIMITATION OF LIABILITY.
-
-     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
-     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
-     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
-     ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
-     CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
-     WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
-     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
-     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
-     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
-     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
-     THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-
-10. U.S. GOVERNMENT END USERS.
-
-     The Covered Code is a "commercial item," as that term is defined in
-     48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
-     software" and "commercial computer software documentation," as such
-     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
-     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
-     all U.S. Government End Users acquire Covered Code with only those
-     rights set forth herein.
-
-11. MISCELLANEOUS.
-
-     This License represents the complete agreement concerning subject
-     matter hereof. If any provision of this License is held to be
-     unenforceable, such provision shall be reformed only to the extent
-     necessary to make it enforceable. This License shall be governed by
-     California law provisions (except to the extent applicable law, if
-     any, provides otherwise), excluding its conflict-of-law provisions.
-     With respect to disputes in which at least one party is a citizen of,
-     or an entity chartered or registered to do business in the United
-     States of America, any litigation relating to this License shall be
-     subject to the jurisdiction of the Federal Courts of the Northern
-     District of California, with venue lying in Santa Clara County,
-     California, with the losing party responsible for costs, including
-     without limitation, court costs and reasonable attorneys' fees and
-     expenses. The application of the United Nations Convention on
-     Contracts for the International Sale of Goods is expressly excluded.
-     Any law or regulation which provides that the language of a contract
-     shall be construed against the drafter shall not apply to this
-     License.
-
-12. RESPONSIBILITY FOR CLAIMS.
-
-     As between Initial Developer and the Contributors, each party is
-     responsible for claims and damages arising, directly or indirectly,
-     out of its utilization of rights under this License and You agree to
-     work with Initial Developer and Contributors to distribute such
-     responsibility on an equitable basis. Nothing herein is intended or
-     shall be deemed to constitute any admission of liability.
-
-13. MULTIPLE-LICENSED CODE.
-
-     Initial Developer may designate portions of the Covered Code as
-     "Multiple-Licensed".  "Multiple-Licensed" means that the Initial
-     Developer permits you to utilize portions of the Covered Code under
-     Your choice of the NPL or the alternative licenses, if any, specified
-     by the Initial Developer in the file described in Exhibit A.
-
-     EXHIBIT A-Netscape Public License.
-
-          "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 the Netscape Mailstone code, released
-          March 17, 2000.
-
-          The Initial Developer of the Original Code is Netscape
-          Communications Corporation. Portions created by Netscape are
-          Copyright (C) 1999-2000 Netscape Communications Corporation. All
-          Rights Reserved.
-
-          Contributor(s): Dan Christian <robodan@netscape.com>
-			  Marcel DePaolis <marcel@netscape.com>
-			  Jim Salter <jsalter@netscape.com>
-			  Mike Blakely, David Shak, Brain Williams
-
-          Alternatively, the contents of this file may be used under the
-          terms of the GNU General Public license Version 2 or later
-	  (the "GPL"), in which case the provisions of GPL are
-	  applicable instead of those above.  If you wish to allow use
- 	  of your version of this file only under the terms of the GPL
-	  and not to allow others to use your version of this file
-	  under the NPL, indicate your decision by deleting the
-	  provisions above and replace them with the notice and other
-	  provisions required by the GPL.  If you do not delete the
-	  provisions above, a recipient may use your version of this
-	  file under either the NPL or the GPL License."
-
-     ----------------------------------------------------------------------
-
-     AMENDMENTS
-
-     The Netscape Public License Version 1.1 ("NPL") consists of the
-     Mozilla Public License Version 1.1 with the following Amendments,
-     including Exhibit A-Netscape Public License.  Files identified with
-     "Exhibit A-Netscape Public License" are governed by the Netscape
-     Public License Version 1.1.
-
-     Additional Terms applicable to the Netscape Public License.
-          I. Effect.
-          These additional terms described in this Netscape Public
-          License -- Amendments shall apply to the Mozilla Communicator
-          client code and to all Covered Code under this License.
-
-          II. "Netscape's Branded Code" means Covered Code that Netscape
-          distributes and/or permits others to distribute under one or more
-          trademark(s) which are controlled by Netscape but which are not
-          licensed for use under this License.
-
-          III. Netscape and logo.
-          This License does not grant any rights to use the trademarks
-          "Netscape", the "Netscape N and horizon" logo or the "Netscape
-          lighthouse" logo, "Netcenter", "Gecko", "Java" or "JavaScript",
-          "Smart Browsing" even if such marks are included in the Original
-          Code or Modifications.
-
-          IV. Inability to Comply Due to Contractual Obligation.
-          Prior to licensing the Original Code under this License, Netscape
-          has licensed third party code for use in Netscape's Branded Code.
-          To the extent that Netscape is limited contractually from making
-          such third party code available under this License, Netscape may
-          choose to reintegrate such code into Covered Code without being
-          required to distribute such code in Source Code form, even if
-          such code would otherwise be considered "Modifications" under
-          this License.
-
-          V. Use of Modifications and Covered Code by Initial Developer.
-               V.1. In General.
-               The obligations of Section 3 apply to Netscape, except to
-               the extent specified in this Amendment, Section V.2 and V.3.
-
-               V.2. Other Products.
-               Netscape may include Covered Code in products other than the
-               Netscape's Branded Code which are released by Netscape
-               during the two (2) years following the release date of the
-               Original Code, without such additional products becoming
-               subject to the terms of this License, and may license such
-               additional products on different terms from those contained
-               in this License.
-
-               V.3. Alternative Licensing.
-               Netscape may license the Source Code of Netscape's Branded
-               Code, including Modifications incorporated therein, without
-               such Netscape Branded Code becoming subject to the terms of
-               this License, and may license such Netscape Branded Code on
-               different terms from those contained in this License.
-
-          VI. Litigation.
-          Notwithstanding the limitations of Section 11 above, the
-          provisions regarding litigation in Section 11(a), (b) and (c) of
-          the License shall apply to all disputes relating to this License.
-

mozilla/mstone/Makefile

@@ -1,246 +0,0 @@
-# Makefile for mstone
-# use gmake
-# Builds each of the components and then packages everything
-
-topsrcdir	= .
-
-CP := cp -p
-
-ifndef INCLUDED_CONFIG_MK
-include $(topsrcdir)/config/config.mk
-endif
-
-
-# dynamically find the optional directories names
-LIBGD_DIR	= $(wildcard gd?.*)
-GNUPLOT_DIR	= $(wildcard gnuplot-?.*)
-PERL_DIR	= $(wildcard perl5.*)
-
-# file that we package
-GDFILES		= gd.txt gd.html libgd.* gd.h demoin.gif gddemo giftogd webgif
-GNUPLOTFILES	= gnuplot Copyright gnuplot_x11 gnuplot.1 gnuplot.gih 
-
-VERSION		= 4.3
-TARBALL		= mstone-$(VERSION)-$(NSARCH)$(OBJDIR_TAG).tar.gz
-ZIPFILE		= mstone-$(VERSION)-$(NSARCH)$(OBJDIR_TAG).zip
-TARBALL_ALL	= mstone-$(VERSION)-all$(OBJDIR_TAG).tar.gz
-ZIPFILE_ALL	= mstone-$(VERSION)-all$(OBJDIR_TAG).zip
-
-NTFILES		= mstone.bat process.bat setup.bat
-
-all:: usage
-
-usage::
-	@$(ECHO) "gmake [ release | rpackage | debug | dpackage ]"
-	@$(ECHO) "      [ DIST=/m/dist/mailstone/1999xxxx dist ]"
-	@$(ECHO) "      [ all_DBG | all_OPT ]"
-	@$(ECHO) "perl is" $(PERL_DIR) ". gd is" $(LIBGD_DIR) ". gnuplot is" $(GNUPLOT_DIR) "."
-
-targets::	$(OBJDIR) mailclient
-
-ifneq (,$(LIBGD_DIR))
-targets::	libgd
-endif
-
-ifneq (,$(GNUPLOT_DIR))
-targets::	gnuplot
-endif
-
-ifneq (,$(PERL_DIR))
-targets::	perl
-endif
-
-$(OBJDIR):
-	-mkdir -p $(OBJDIR)
-
-mailclient::
-	@$(ECHO) "\n===== [`date`] making OS_CONFIG=$(NSARCH) BUILD_VARIANT=$(BUILD_VARIANT)\n"
-	cd src; $(MAKE) BUILD_VARIANT=$(BUILD_VARIANT) OBJDIR=../$(OBJDIR) PKGDIR=../$(PKGDIR) all
-
-# Use our top level makefiles to drive the component builds
-libgd $(OBJDIR)/gd/libgd.a::
-	$(MAKE) -f gd.mk LIBGD_DIR=$(LIBGD_DIR) libgd
-
-gnuplot $(OBJDIR)/gnuplot/gnuplot::
-	$(MAKE) -f gnuplot.mk LIBGD_DIR=$(LIBGD_DIR) GNUPLOT_DIR=$(GNUPLOT_DIR) gnuplot
-
-perl $(OBJDIR)/perl/perl::
-	$(MAKE) -f perl.mk PERL_DIR=$(PERL_DIR) perl
-
-# Create packaging binary directories
-# Note: dont make gd or gnuplot here.  For multi-OS, they are links
-mkpkgdirs::	$(PKGDIR)/bin $(PKGDIR)/conf $(PKGDIR)/data $(PKGDIR)/doc
-
-$(PKGDIR)/bin:
-	mkdir -p $(PKGDIR)/bin
-
-$(PKGDIR)/conf:
-	mkdir -p $(PKGDIR)/conf
-
-$(PKGDIR)/data:
-	mkdir -p $(PKGDIR)/data
-
-$(PKGDIR)/doc:
-	mkdir -p $(PKGDIR)/doc
-
-$(PKGDIR)/gd:
-	mkdir -p $(PKGDIR)/gd
-
-$(PKGDIR)/gnuplot:
-	mkdir -p $(PKGDIR)/gnuplot
-
-$(PKGDIR)/perl:
-	mkdir -p $(PKGDIR)/perl
-
-
-# operating system independent share-files (at least for Unix)
-pkg-share-files:: mkpkgdirs
-	@$(ECHO) "\n===== [`date`] making package share-files...\n"
-	$(CP) mstone process $(PKGDIR)
-	(cd $(PKGDIR); [ ! -f setup ] || rm -f setup; ln -s mstone setup)
-	(cd $(PKGDIR); [ ! -f cleanup ] || rm -f cleanup; ln -s mstone cleanup)
-	(cd $(PKGDIR); [ ! -f checktime ] || rm -f checktime; ln -s mstone checktime)
-	(cd $(PKGDIR); [ ! -f timesync ] || rm -f timesync; ln -s mstone timesync)
-	-$(CP) nsarch bin/*.pl $(PKGDIR)/bin
-	-$(CP) conf/*.wld conf/*.wld.in conf/*.html $(PKGDIR)/conf
-	-$(CP) data/*.msg $(PKGDIR)/data
-	-$(CP) doc/*.html doc/*.gif $(PKGDIR)/doc
-	-$(CP) INSTALL $(PKGDIR)
-	-$(CP) README $(PKGDIR)
-	-$(CP) ChangeLog $(PKGDIR)
-	-$(CP) LICENSE $(PKGDIR)
-
-# split out OS specific file so that combined packaging possible (set PKGDIR)
-pkg-arch-files-gd::	 $(PKGDIR)/gd $(OBJDIR)/gd/libgd.a
-	$(CP) $(addprefix $(OBJDIR)/gd/, $(GDFILES)) $(PKGDIR)/gd
-	-$(STRIP) $(PKGDIR)/gd/webgif $(PKGDIR)/gd/giftogd $(PKGDIR)/gd/gddemo
-
-pkg-arch-files-gnuplot::	$(PKGDIR)/gnuplot $(OBJDIR)/gnuplot/gnuplot
-	$(CP) $(addprefix $(OBJDIR)/gnuplot/, $(GNUPLOTFILES)) $(PKGDIR)/gnuplot
-	-$(STRIP) $(PKGDIR)/gnuplot/gnuplot $(PKGDIR)/gnuplot/gnuplot_x11
-
-ifneq (,$(LIBGD_DIR))
-pkg-arch-files::	pkg-arch-files-gd
-endif
-
-ifneq (,$(GNUPLOT_DIR))
-pkg-arch-files::	pkg-arch-files-gnuplot
-endif
-
-pkg-arch-files::	$(PKGDIR)/bin $(OBJDIR)/mailclient
-	@$(ECHO) "\n===== [`date`] making package arch-files...\n"
-	$(CP) $(OBJDIR)/mailclient $(PKGDIR)/bin
-	-$(STRIP) $(PKGDIR)/bin/mailclient
-
-pkg-perl-files:: $(PKGDIR)/bin $(OBJDIR)/perl/perl
-	@$(ECHO) "\n===== [`date`] making package perl-files...\n"
-	$(MAKE) -f perl.mk PERL_DIR=$(PERL_DIR) \
-		BUILD_VARIANT=$(BUILD_VARIANT) \
-		OBJDIR=$(OBJDIR) PKGDIR=$(PKGDIR) package-perl
-	find $(PKGDIR)/perl/lib -name .packlist -exec rm {} \; -print
-	-$(STRIP) $(PKGDIR)/perl/bin/perl
-	-$(STRIP) $(PKGDIR)/perl/bin/a2p
-
-# for combined packaging, this should not be part of pkg-arch-files
-# perl is handled seperately do to its size
-ifneq (,$(PERL_DIR))
-pkg::	pkg-perl-files
-endif
-
-pkg::	targets pkg-share-files pkg-arch-files
-
-tarball:	build/$(TARBALL)
-
-build/$(TARBALL):
-	@$(ECHO) "\n===== [`date`] making os tar file...\n"
-	-rm -f build/$(TARBALL)
-	cd $(dir $(PKGDIR)) && tar cf - . | gzip > ../../$(TARBALL)
-
-zipfile:	build/$(ZIPFILE)
-
-build/$(ZIPFILE):
-	@$(ECHO) "\n===== [`date`] making os zip file...\n"
-	-rm -f build/$(ZIPFILE)
-	cd $(dir $(PKGDIR)) && zip -r -q ../../$(ZIPFILE) .
-
-
-########################################################################
-# Generate a combined build for every Unix OS that is already packaged
-# NT has to be done seperately because it has different file names
-# We have to nuke some old parts, because permissions wont allow overwrites
-# Finally, dont ship perl development headers and libraries
-all_DBG all_OPT::
-	@$(ECHO) "===== [`date`] unified packaging for $@..."
-	$(MAKE) NSARCH=$@ OBJDIR_TAG='' \
-		PKGDIR=$(topsrcdir)/build/package/$@.OBJ/mstone pkg-share-files
-	./ospkg.sh $@.OBJ \
-	    $(notdir $(shell ls -d build/package/[A-Z]*$(subst all,,$@.OBJ)))
-	[ -d $(topsrcdir)/build/package/$@.OBJ/mstone/bin/WINNT4.0 ] \
-		&& cp -p $(NTFILES) $(topsrcdir)/build/package/$@.OBJ/mstone; :
-	-rm -f ./build/mstone-$(VERSION)-$@.tar.gz
-	cd ./build/package/$@.OBJ \
-		&& tar cf - . | gzip > ../../mstone-$(VERSION)-$@.tar.gz
-	-rm -f ./build/mstone-$(VERSION)-$@.zip
-	cd ./build/package/$@.OBJ \
-		&& zip -r -q ../../mstone-$(VERSION)-$@.zip .
-
-
-########################################################################
-# Copy all the packaged trees to the distribution site
-# Copy in the unified tarball and zip file
-# Link mstone to mailstone for Netscape back compatibility
-# Re-map short Linux name to standard Netscape convention
-dist::
-	@[ "$(DIST)" != "" ] || ($(MAKE) usage && /bin/false)
-	@[ ! -d "$(DIST)" ] || ($(ECHO) "Error: $(DIST) already exists" && \
-		$(MAKE) usage && /bin/false)
-	mkdir -p $(DIST)
-	cp -p build/mstone-$(VERSION)-all_*.*[a-z] $(DIST)/
-	(cd build/package; tar cf - *.OBJ) | (cd $(DIST); tar xf - )
-	for l in $(DIST)/*_???.OBJ ; do \
-		(cd $$l; ln -s mstone mailstone); done
-	cd $(DIST); for l in Linux*_???.OBJ ; do \
-		nn=`echo $$l | sed -e 's/_OPT/_glibc_PTH_OPT/' | sed -e 's/_DBG/_glibc_PTH_DBG/'`; \
-		ln -s $$l $$nn; done
-
-# since the default is release mode, this can just work off a dependency
-release::	targets
-#release::
-#	@$(ECHO) "\n===== [`date`] making release build..."
-#	$(MAKE) BUILD_VARIANT=release OBJDIR_TAG=_OPT targets
-	@$(ECHO) "\n===== [`date`] making release build done."
-
-rpackage:: release pkg #tarball zipfile
-#rpackage:: release
-#	@$(ECHO) "\n===== [`date`] making release package..."
-#	$(MAKE) BUILD_VARIANT=release OBJDIR_TAG=_OPT pkg tarball zipfile
-	@$(ECHO) "\n===== [`date`] making release package done."
-
-# since the default is release mode, start a make with the right mode
-debug::	
-	@$(ECHO) "\n===== [`date`] making debug build..."
-	$(MAKE) BUILD_VARIANT=debug OBJDIR_TAG=_DBG targets
-	@$(ECHO) "\n===== [`date`] making debug build done."
-
-# We dont usually bother to tar up a debug build
-dpackage:: debug
-	@$(ECHO) "\n===== [`date`] making debug package..."
-	$(MAKE) BUILD_VARIANT=debug OBJDIR_TAG=_DBG pkg
-	@$(ECHO) "\n===== [`date`] making debug package done."
-
-# These are old and may be broken
-cleanvariant::
-	(cd src; $(MAKE) OBJDIR=../$(OBJDIR) clean)
-	rm -rf $(PKGDIR)
-
-clean::
-	$(MAKE) BUILD_VARIANT=release OBJDIR_TAG=_OPT cleanvariant
-	$(MAKE) BUILD_VARIANT=debug OBJDIR_TAG=_DBG cleanvariant
-
-distcleanvariant::
-	(cd src; $(MAKE) OBJDIR=../$(OBJDIR) distclean)
-	rm -rf $(OBJDIR) $(PKGDIR)
-
-distclean:: clean
-	$(MAKE) BUILD_VARIANT=release OBJDIR_TAG=_OPT distcleanvariant
-	$(MAKE) BUILD_VARIANT=debug OBJDIR_TAG=_DBG distcleanvariant

mozilla/mstone/README

@@ -1,75 +0,0 @@
-
-                    MSTONE 4.2
-
-Mstone is a mail server performance testing tool designed to simulate
-the different types and volume of mail traffic a mail server would
-experience during a peak activity period.  Mstone was formerly known
-as Mailstone.
-
-A quick installation guide is available in INSTALL.
-
-The full Mailstone 4.15 user manual is available at
-http://lxr.mozilla.org/mozilla/source/mstone/doc/MailStone.html
-
-Testing strategy
-----------------
-
-Mstone is capable of opening SMTP, POP3, IMAP4, and other protocol
-connections to mail servers.  The number and type of connections made
-to the mail server is based on a weighted command list which provides
-the ability to test mail server implementation requirements.
-
-A series of perl script allow you to setup client machines, run tests,
-and then cleanup client machine files.  Each client machine has a copy
-of the mailclient program and SMTP message files.  When the test is
-run, the mailclient is started with the proper command line and work load.
-
-After experimenting with mstone loads, you will notice that there
-are a few factors that can distort server the byte and message
-throughput.  You will find that the server byte throughput is related
-to the average SMTP message (file) size.  Also, server throughput, in
-bytes and messages, is affected by larger than normal POP3/IMAP4
-mailboxes.  So it is important to approach the mstone command
-configuration with data collected from existing mail server
-implementations, for example, a customer might say "during our peak
-activity in the morning, we handle up to two thousand employees
-sending an average of 5 messages of 20K average size and receiving 25
-messages of same size". With input like this, you can begin tuning
-mstone to generate relevant data.
-
-There are two important things to consider when reviewing the results of
-mstone performance analysis:  Was the test run on target for
-simulating the type and volume of mail traffic; and did the server, both
-software and machine, handle the load within an acceptable margin?
-
-With this information, it can be determined: whether enough SMTP
-connections were made to the server during the run, and how many
-messages were downloaded over how many POP3/IMAP4 connections.  If the
-number of SMTP connections is not in the acceptable range, then
-consider adding more client processes/machines or checking the server
-performance during the run.  The message/connection ratio for
-POP3/IMAP4 should be checked for soundness, and adjustments should be
-made to the mailboxes before running the next test.
-
-Monitoring the server performance during test runs is crucial in
-understanding the results.  If the number of client connections is not
-being achieved and the server cpu usage and process run queue is not
-settling down after the initial spike, then modifications to the server
-architecture could be in order.
-
-The analysis of mstone results is an iterative process of client
-(mstone client) and server tuning.  The bottom line is to determine
-whether the messaging solution can handle the type of load expected in
-an acceptable manner.
-
-
-Server Log Tuning
------------------
-The Messaging and Directory server ship with access logging enabled by
-default.  This gives the most information about what is going on in
-the system, but can reduce performance.  You should test the way the
-system will be run.  
-
-Noticeable performance increases are often obtained by disabling access
-logging on the directory server and by reducing the logging level of
-the messaging servers from "Notice" to "Warning".

mozilla/mstone/README.Sendmail-contributions

@@ -1,16 +0,0 @@
-Under the terms of the Mozilla Public License, Version 1.1, granted
-by Mozilla, Sendmail Inc. is contributing the following Source Code
-changes to the Mozilla mstone source repository.
-
-Sendmail, Inc. is making available these source code modifications
-according to the Distribution Obligations as listed in section 3
-of the Mozilla Public License, Version 1.1
-
-The changes provided herein are described in the included files:
-
-  README.Sendmail-mstone_changes.html
-  ChangeLog-Sendmail
-
-All modifications are derived, directly or indirectly, from the original
-code as provided by Mozilla.
-

mozilla/mstone/README.Sendmail-mstone_changes.html

@@ -1,419 +0,0 @@
-<html>
-<head><title>Sendmail, Inc. Mstone changes</title></head>
-<body>
-
-<h3>Mstone modifications</h3>
-
-<ol>
-<li><h4>Random Variable Parameters</h4>
-
-In addition to taking on constant values, some parameters can now be
-sampled from probability distributions.  These variables are:
-<ul>
-<li><code>startDelay</code>
-<li><code>idleTime</code>
-<li><code>blockTime</code>
-<li><code>loopDelay</code>
-<li><code>numRecips</code>
-<li><code>size</code>
-<li><code>headers</code>
-<li><code>mime</code>
-<li><code>leaveMailOnServer</code>
-<li><code>bandwidth</code>
-<li><code>latency</code>
-</ul>
-
-<p>
-The following distributions are currently implemented:
-<ul>
-<li>Uniform (~unif(a, b))
-<li>Normal (~normal(a, b))
-<li>Log-Normal (~lognormal(a, b))
-<li>Weibull (~weib(a, b, c))
-<li>Exponential (~exp(a))
-<li>Constant (~const(a))
-<li>Binomial (~binomial(a))
-</ul>
-
-<p>
-Sampled values may also be constrained by a minimum and maximum value.
-This is particularly useful for e.g. the normal and lognormal
-distributions, though over-tight constraints will create a "lump" at
-the end of the generated distribution, and any constraints may change
-the distribution's characteristics (e.g. mean).  To specify
-constraints, do the following:
-
-<h5>getdist</h5>
-
-<p>
-There is also a helper tool called "getdist" in the Sendmail mstone
-distribution. Building getdist:
-
-<pre>
-  file: mstone/src/idle.c
-  # gcc -DTEST_PROB -Dxalloc=malloc -Dxfree=free -lm idle.c
-</pre>
-
-<p>
-Rename the resulting binary to "getdist"
-
-<p>
-<b>Using getdist</b>
-
-<p>
-To run it interactively:
-
-<ol>
-<li>Start up getdist</li>
-<li>Enter the distribution you want to see a sample and mean (ignore warning about 'gets()')</li>
-</ol>
-
-<p>
-Example:
-
-<pre>
-% getdist
-warning: this program uses gets(), which is unsafe.
-~lognormal(3,4.5)
-Samples:
-6.846493
-0.109578
-31.402784
-0.467486
-21.905714
-7.113645
-0.225102
-29.372181
-4.252427
-1.444493
-mean: 29.128932
-</pre>
-
-<p>
-It will only OUTPUT 10 samples as examples but the mean
-is calculated based on 2000 samples by default.  You can specify
-the mean sample size on the command line by giving it a -n option:
-
-<pre>
-% getdist -n 1000000
-</pre>
-
-<p>
-This will calculate the mean based on a sample of 1000000 entries.
-
-<p>
-The above data was calculated with 2M samples.
-
-<p>
-<i>Known Problems</i><BR>
-It appears (anecdotally) that the first set of samples returned by
-getdist are inaccurate. After starting the getdist program interactively,
-it may appear necessary to ignore the first set of output, but that entering
-the distribution again will return a more accurate result.<BR>
-
-<p>
-For example:
-
-<pre>
-# getdist
-~lognormal(10,2)
-Samples:
-670043.575395
-48.842052
-54.039792
-0.460849
-2.152179
-32.534664
-6.163511
-42.827706
-27.806642
-4.966444
-mean:   364.747532
-var:    224352671.855287
-stddev: 14978.406853
-~lognormal(10,2)
-Samples:
-1.842800
-39.760727
-4.798239
-10.722216
-27.052030
-28.923926
-61.504273
-20.743583
-5.373420
-42.195531
-mean:   25.510130
-var:    2674.124997
-stddev: 51.711942
-</pre>
-
-
-<dl>
-  <dt><code>~dist(...) : [min,]</code>
-  <dd>force all sampled values to be >= <code>min</code>
-  <dt><code>~dist(...) : [min,max]</code>
-  <dd>force all sampled values X to be <code>min</code> <= X <= <code>max</code>.
-  <dt><code>~dist(...) : [,max]</code>
-  <dd>force values to be <= <code>max</code>
-</dl>
-
-<li><h4>Parsing Changes</h4>
-
-All of the time-valued test parameters except <code>rampTime</code>
-and <code>time</code> now have millisecond values.  In particular,
-this means that a value of "17" parses to 17
-<strong>milliseconds</strong>, not 17 seconds.  Use "17s" instead.
-<p>
-
-    Size-valued parameters can have units of "k" or "m" to indicate
-kilobytes or megabytes, respectively.
-<p>
-
-    For parameters supporting random-variable values, a value starting
-with "~" will be interpreted as a random variable specification of the
-form "~NAME([ARGS ...])".  Unit suffixes (e.g. "s", and "m") apply to
-random variable parameters as well as constant values.  This implies
-that for unitless parameters, the suffixes corresponding to the random
-variable's units will still be recognized (i.e. the values will be
-multiplied by the appropriate factors).  This is probably best
-considered as a "bug" rather than excercised as a "feature."
-<p>
-
-    <code>blockTime</code>, <code>loopDelay</code>, and
-<code>idleTime</code> now refer to the total amount of time a command
-block, loop, and initialization phase should take, respectively, not
-the amount of time the simulation should stall after completing each
-phase.  For example, if a block takes 2 seconds to complete, and the
-block time is 4 seconds, the client thread will sleep for 2 seconds
-after finishing instead of the full 4.<p>
-
-<code>rampTime</code> is now solely for the benefit of the client
-machines, to control the rate at which threads are started.  The rate
-at which commands from a given protocol are started is now controlled
-by the <code>startDelay</code> variable, which is
-distribution-valued.  Thus the actual command loop now looks like
-this:
-
-<pre>
-wait for startDelay
-start counting idleTime
-start counting blockTime
-execute start function
-wait for remainder of idleTime
-for (1 ... numLoops)
-       	start counting loopDelay
-       	execute loop function
-       	wait for remainder of loopDelay
-execute	end function
-wait for remainder of blockTime
-</pre>
-
-<li><h4>Automatic Message Generation</h4>
-
-Both MIME and text/plain messages can now be generated automatically.
-To enable automatic message generation, set the <code>file</code>
-attribute of an SMTP block to "auto".  The messages will then have at
-least as many headers as the value of the <code>headers</code>
-attribute, have bodies <code>size</code> bytes long, and have
-<code>mime</code> MIME parts.  To generate text/plain messages, set
-<code>mime</code> to zero.
-
-<table border=1 cellpadding=2>
-<tr><th>Attribute</th><th>Description</th></tr>
-
-<tr>
-  <td><code>headers <i>N</i></code></td>
-  <td>(optional; default=5) Each automatically generated message will
-      have <code>min(<i>N</i>, min_hdrs)</code> headers, where
-      <code>min_hdrs</code> is 5 for text/plain, and about 7 for MIME
-      messages.  Additional headers are named
-      "X-generated-header-%d". </td>
-</tr>
-
-<tr>
-  <td><code>size <i>N</i></code></td>
-  <td>(required) Each generated message will have a body be <i>N</i>
-      bytes long.</td>
-</tr>
-
-<tr>
-  <td><code>mime <i>N</i></code></td>
-  <td>Each generated message will have <code>N</code> MIME parts.  If
-      the value of <code>size</code> does not allow <code>N</code> parts,
-      one part is generated.  If <code>N</code> is zero, the message is
-      text/plain.</td>
-</tr>
-
-<tr>
-  <td><code>checksum <i>{yes|no|save}</i></code></td>
-  <td>For SMTP: each generated message will have the MD5 sum of the
-  message body appended to the message unless the value is <i>no</i>.
-  For retrieval protocols, checksums will be verified.  (NOT
-  IMPLEMENTED: if <code>checksum</code> is <i>save</i>, messages with
-  incorrect checksums will be saved to temporary files for later
-  examination.) </td>
-</tr>
-
-</table>
-
-<li><h4>Linespeed Emulation</h4>
-
-SMTP, POP, and IMAP all support a form of linespeed emulation,
-controlled via the <code>latency</code> and <code>bandwidth</code>
-parameters.
-
-<table border=1 cellpadding=2>
-<tr><th>Attribute</th><th>Description</th></tr>
-
-<tr><td><code>latency <i>N</i></code></td>
-<td>Set the network latency to <code>N</code> milliseconds.</td></tr>
-
-<tr><td><code>bandwidth <i>N</i></code></td>
-
-<td>Transfer at most <code>N</code> bytes per second.</td></tr>
-
-</table>
-
-<li><h4>TLS support</h4>
-
-If you have openssl, mstone now supports STARTTLS for SMTP and IMAP,
-and STLS for POP (both old-style and MULTIPOP), as well as SSL
-tunneling.  This support is <strong>not</strong> well-tested, and TLS
-can be a bit tricky to set up, so use at your own risk.  TLS
-introduces several new attributes to the protocol blocks:
-
-<table border=1 cellpadding=2>
-<tr><th>Attribute</th><th>Description</th></tr>
-
-<tr><td><code>sslcert <i>filename</i></code></td>
-<td>Read the client's cert from <i>filename</i>, which should be in
-PEM format. </td></tr>
-
-<tr><td><code>sslkey <i>filename</i></code></td>
-
-<td>Read the client's private key from <i>filename</i>, which should
-be in PEM format.</td></tr>
-
-<tr><td><code>usetls {0|1}</code></td>
-
-<td>Turn STARTTLS/STLS on or off (default: off).  <b>Note</b>:
-<code>starttls</code> and <code>ssltunnel</code> are mutually
-exlcusive.</td></tr>
-
-<tr><td><code>ssltunnel {0|1}</code></td>
-
-<td>Turn SSL tunneling on or off (default: off).</td></tr>
-
-</table>
-
-<li><h4>"Multi-POP" protocol</h4>
-
-<b>Note</b>: multipop, always a band-aid, is hopefully obsoleted by
-the new event-queue execution model.  Though it has not been tested,
-it should be easier, more efficient, and more accurate to use the
-normal POP protocol with events to simulate a large number of users
-with a reasonable number of threads.  Once this has been tested,
-automatically-generated workloads should revert to using POP.
-
-<p>To simulate a large number of concurrently active POP users with
-Mstone's extravagant use of threads, and to simulate a period of
-activity comprised of several POP sessions one can use the MULTIPOP
-protocol to multiplex active users onto a single thread.  The protocol
-has all the same parameters as POP, plus the following:
-
-<table border=1 cellpadding=2>
-<tr><th>Attribute</th><th>Description</th></tr>
-
-<tr><td><code>userSpacing</code></td>
-
-    <td>Total time for each user's session.</td>
-</tr>
-<tr><td><code>usersPerModem</code></td>
-
-    <td>The maximum number of concurrently connected users is limited
-	to <code>users / usersPerModem</code></td>
-</tr>
-</table>
-
-<p>
-
-The protocol functions are substantially different.  Instead of
-simulating a single login-check-logout sequence, a protocol block
-simulates an entire active period for a set of users.  Each user
-checks mail once in the initialization function, once each time the
-loop body is executed, and once more in the protocol conclusion
-function.  
-<p>
-
-<li><h4>"Event-queue" implementation</h4>
-
-<p>
-Unless the "noevents" parameter in the "&lt;config&gt;" section is set to 1,
-or mailclient is not given the "-e" flag, mstone will run in
-"event-queue" mode.  Instead of creating one thread per client, it
-will multiplex clients over a much smaller number of threads.  This is
-intended to increase the tool's scalability.
-
-<p>
-Note that I/O is still synchronous with this model, so the number of
-threads required will approximately equal the maximum number of
-concurrent operations.  Also note that this change does not reduce the
-number of required file descriptors.
-
-<p>
-
-<li><h4>Other Minor Additions</h4>
-
-<ul>
-
-<li>IMAP now has a ramp-down time, enabled by defining
-<code>IMAP_RAMPDOWN</code>.  IMAP threads now exit uniformly between
-the time the test is supposed to be over and the time Mstone starts
-killing them.
-
-<li>Mstone used to always time out connections after 60 seconds.  The
-timeout value can now be configured on a per-block basis via the
-<code>timeout</code> parameter. The value of the timeout parameter must
-be defined in milliseconds, so the following value would mean a timeout
-of one (1) hour:<BR>
-
-&nbsp;&nbsp;&nbsp;timeout 3600000
-
-<li>Simplified client allocation.  It is now possible to specify the
-number of clients in each group by specifying a value for
-<code>clients</code> in each <code>&lt;CLIENT&gt;</code> section and
-<em>not</em> specifying a global <code>clientCount</code> in the
-<code>&lt;CONFIG&gt;</code> section.
-
-</ul>
-
-<li><h4>Bug Fixes</h4>
-
-<ul>
-
-<li>SMTP now ignores debugging output appearing over the connection.
-Before, Mstone would generate an error when talking to
-e.g. <code>sendmail -d64.5</code>.
-
-<li>(now it works...)  The old sequence of IMAP commands used by
-Mstone was incorrect.  Instead of only downloading unread messages, it
-would download all messages received since the start of the session
-each time a new messages was received.  Depending on what you were
-doing, this could have a serious effect on your results.
-
-</ul>
-
-<li><h4>Wish List</h4>
-
-<ul>
-  <li>Scriptable user behavior for POP and IMAP protocols.  While we should
-      probably not go overboard, adding more configuration options to Mstone
-      is probably not the answer.  There is already some support for more
-      complex behaviors in the IMAP code -- we may or may not want to make
-      use of it.  More to the point, wider coverage of the IMAP
-      protocol is vital to QA's use of the tool.
-</ul>
-
-</ol>
-</body></html>

mozilla/mstone/ToDo

@@ -1,189 +0,0 @@
-Mstone TODO List
-
-Updated:
-	3-20-2000	Dan Christian
-
-======================================================================
-Minor improvements
-
-Data reduction at each testbed client
-
-Test message generator (plain and MIME styles)
-
-More graphs for multiple runs
-
-Option to drop a fraction of connections
-
-IMAP delete without reading
-	Just get the message list and delete everything.  This could
-be the fastest way to drain out the store.
-
-
-Display MIN/MAX or standard deviation on graphs
-	Gnuplot can do data points with error bars.  You could either
-use MIN/MAX or the standard deviation for the error bars.  There are
-issues with calculating the standard deviation numbers throughout the
-graph that need to be addressed.
-
-
-Statistics reset
-	At least the MIN and MAX statistics could be easily reset
-during the test (after ramp up).  This keeps the transients during
-startup and shutdown from dominating these numbers.  The standard
-deviation statistics are much trickier to reset during the run.  It
-may be better to isolate sections in post processing.
-
-
-Perl web server
-	Sometimes it would be nice to include our own web server to
-provide the results (instead of using file: URLs).  This would also be
-a gateway to form based test configuration editing and allow results
-to be interactively updated during tests.  Perl with a socket library
-could handle this without too much trouble.
-
-
-Dynamic test loading
-	Finalize an API for dynamically loading tests.  This would
-allow tests to be added or updated separately from the core
-functionality.  This may be needed for some types of security testing.
-
-
-Link graphs to the results tables
-	There are already tags by each graph.  You should be able to
-link the appropriate results table entry to each graph.  This sort of
-tricky since graphs often combine multiple entries.
-
-
-Show statistics for every block
-	Statistics are actually kept for every block in every thread.
-There should be a way to view information at this detail.
-
-
-Man pages
-	The online docs are nice, but good 'ol man pages would be
-great in a different way.
-
-
-Reduce namespace polution
-	Scripts names like setup and cleanup are too general.  They
-
-should be part of the main 'mstone' script (e.g. mstone setup).
-
-Examples of script series
-	Include example scripts to run entire series of tests in a
-sane way.
-
-
-Fix FORMAT clash
-	At the start of a test, each client process outputs the
-information needed to report all its protocols.  When there are
-multiple processes on one client, these FORMAT lines can intermix and
-cause parsing errors.
-
-
-Set connection drop rate
-	Drop some percentage of the connections without a proper
-shutdown.  This tests how well a server can detect and recover from
-hard disconnects.
-
-
-Improve randomness
-	The way that we generate random numbers in a range may be not
-generate the proper randomness.  We are using lrand48()%range we
-should use (lrand48/RAND_RANGE)*range.  There are some end conditions
-that need to be thought about.  All of this is in the sequence code;
-one change should fix (or break :) everything.
-
-	Also, we may be generating numbers that are never used.  This
-may be costly, and can create holes in the proper sequence.
-
-
-Improve printing
-	The color graphs are great on screen, but tend to print
-poorly.  Either we need a better way to generate a printable version
-(maybe through a CGI button), or the seperate protocols need to be
-printed individually.  Also, Communicator does a lousy job of keeping
-title with tables or graphs.  Hopefully, Mozilla will do better.
-
-
-======================================================================
-Whole new protocol tests:
-
-ICQ
-	Test high volume instant messaging.  Very useful for the
-bridges and gateways that people are considering using.
-
-
-WAP
-	WAP is the emerging standard for mobile phones.
-
-
-WCAP
-	Web based calendar services
-
-
-LDAP
-	Use the LDAP SDK to do basic LDAP testing.  The SDK probably
-isn't fast enough to call this a real performance test, but you can at
-least test performance degredation due to load from a real application
-(like a mail server).
-
-
-DNS
-	Mail servers use DNS a lot.  You should at least be able to
-see if performance is degrading due to load.
-
-
-Disk/filesystem
-	Test read, write, sync, link, un-link, and append performance under
-multiple threads.
-
-
-Cert servers
-	Test certificate authenticity checking performance
-
-
-======================================================================
-Possible dummy servers:
-
-SMTP
-	Receive mail via SMTP and ignore it.  Usefull for SMTP relay
-testing.
-
-
-DNS
-	Simulate slow DNS server lookups.  Usefull for SMTP relay testing.
-
-
-======================================================================
-Major changes
-
-Throttling
-	Monitor and control transaction rates so that specific load
-levels can be easily specified.  The rates should be able to vary to
-simulate peek hour usage and disconnect-restore.
-
-
-NSPR threading
-	Use NSPR for threading and sockets.  This may allow other OSes
-to be used as clients.  This might be easy, since mstone does not need
-any locking, just simple thread creation and harvesting.  NSPR
-argument parsing and hashes may also be useful.
-
-
-SSL
-	Support SSL on the protocols that allow it.  May require NSPR.
-
-
-Line speed emulation
-	Simulate the variable delays and limited throughput of dial up
-connections.
-
-
-Scripting
-	Allow more detailed control of protocol tests.  It looks
-difficult to make this scalable and fast.
-
-
-Combined tests
-	Deliver mail over SMTP and then see when it arrives using IMAP.

mozilla/mstone/allbuild

@@ -1,462 +0,0 @@
-#!/bin/ksh
-########################################################################
-# buildall - automated multi-platform build tool
-#
-# 10/09/97 - marcel - created
-# 10/13/97 - marcel - support shared build tree
-#  2/11/98 - marcel - updated for 4.0 Beta builds (need -update)
-#  2/26/98 - marcel - added -r, -t and host specifiers
-#  7/01/99 - robodan - added VAR=value ability
-#  8/01/99 - robodan - explicitly know about building on localhost
-#  10/15/99 - robodan - remove older OSes from build list
-#  2000/4/7 - robodan - Created mstone version
-########################################################################
-#
-# This script is intended to do a set of UNIX builds for a
-# given CVS module.  It is designed to use 'rsh' between a
-# set of trusting hosts and use shared NFS storage with common
-# mount points (e.g. /u/username/...)
-#
-# To check if you have rights to rsh to a particular host, try:
-#   rsh hostname "echo $PATH"
-# You may have to edit your .rhosts or /etc/hosts.equiv
-#
-# A target directory will be created based on the current date.
-#
-# A set of global build logs plus a log per platform are kept
-# in a log directory under the target
-#
-# It will checkout a copy of the source, duplicate it for
-# each platform and perform a set of remote builds in parallel.
-# The script will exit when all the work has been completed.
-#
-# Example usage:
-#  cd ~/src; buildall msg
-# Result:
-#  ~/src/19980210_40.1/
-#  ~/src/19980210_40.1/logs/...
-#  ~/src/19980210_40.1/src/...
-#  ...
-#
-
-# Buildhosts
-DEFAULT_BUILDHOSTS="kimo nugget vsync shave purgatory trex0"
-
-usage() {
-  echo ""
-  echo "usage: buildall [ make assigns... ] < -t | target > [ -r ] [ buildhosts... ]"
-  echo "   [ -t | --test]:	just test rsh and report OS versions."
-  echo "  [-r | --respin]:	rebuild in place using existing source."
-  echo "  [-p | --postbuild]:	Execute post build command too."
-  echo "  [make assigns]:	e.g. VARIANT=release"
-  echo "         <target>:	one of: mstone42"
-  echo "  [buildhosts...]:	default [$DEFAULT_BUILDHOSTS]"
-  echo ""
-  exit 1
-}
-
-########################################################################
-# Set these defaults and options for your desired build
-########################################################################
-
-# Target base destination directory
-DESTBASE=`pwd`
-
-# Can we do multiple ARCH builds in same source tree
-SHARESRC=yes
-
-DESCRIPTION=""
-BUILDHOSTS=""
-RESPIN="no"
-POSTBUILD="no"
-JUST_TEST="no"
-DESTTYPE=""
-CO_CMD="cvs -d $CVSROOT -q checkout"
-CHECKOUT=""
-CHECKOUT2=""
-#MOZCVSROOT=':pserver:anonymous@cvs.mozilla.org:/cvsroot'
-MOZCVSROOT=':pserver:robodan%netscape.com@cvs.mozilla.org:/cvsroot'
-
-MAKE="gmake"
-MK_ARG=""
-
-ARGS="$@"
-
-for ARG in "$@"; do
-
-# If this is a make assignment (FOO=whatever), add it to make command
-# Arguments with quotes in them dont go all the way through.
-# Make args trick: 'FOO=nop -j 2'
-# The pre-post arg stuff uses hostnames as a switch, ugly calling syntax.
-if [[ -n "`echo z$ARG | egrep '^z[A-Z0-9_]+=[^ 	]'`" ]] ; then
-  if [[ -n "$DESCRIPTION" ]] ; then
-	echo "Arg after target is ignored! ($ARG)"
-	continue
-  fi
-  if [[ -z "$BUILDHOSTS" ]] ; then	# pre  args
-    MAKE="$MAKE $ARG"
-  else					# post args
-    MK_ARG="$MK_ARG $ARG"
-  fi
-  continue
-fi
-
-# should we just rebuild todays latest source...
-if [[ "$ARG" = "-r" || "$ARG" = "--respin" || "$ARG" = "respin" ]]; then
-  RESPIN="yes"
-  continue
-fi
-
-# should we just run post build command...
-if [[ "$ARG" = "-p" || "$ARG" = "--postbuild" || "$ARG" = "postbuild" ]]; then
-  POSTBUILD="yes"
-  continue
-fi
-
-# should we just test remote connectivity and execute permissions...
-if [[ "$ARG" = "-t" || "$ARG" = "--test" ]]; then
-  JUST_TEST="yes"
-  RESPIN="yes"
-  continue
-fi
-
-# We will pull source using: "$CHECKOUT"
-# And build on each machine: "cd $BUILDDIR && $BUILDCMD"
-
-
-# expand targets (but dont confuse hosts for targets (msg7))
-
-# These will build just mstone
-# expand targets (but dont confuse hosts for targets (msg7))
-if [[ "$BUILDCMD" = "" && "$ARG" = mailstone* ]]; then
-  case ${ARG#mstone} in
-	"")
-	"42")
-		DESTTYPE=_MSTONE42
-		MS_BRANCH=""
-		#BUILDCMD="$MAKE $MK_ARG debug release"
-		#POSTCMD="$MAKE $MK_ARG all_DBG.OBJ all_OPT.OBJ"
-		BUILDCMD="$MAKE $MK_ARG rpackage"
-		POSTCMD="$MAKE $MK_ARG all_OPT"
-		;;
-	*)
-		echo "Unknown mstone version in $ARG"
-		echo "Try mstone42"
-		exit 1;;
-  esac
-
-  DESCRIPTION="Mstone $MS_BRANCH"
-  BUILDDIR=./mozilla/mstone
-  CVSROOT=$MOZCVSROOT
-  CHECKOUT="$CO_CMD $MS_BRANCH mozilla/mstone"
-  # BUG No way to unpack perl, gd, and gnuplot before building
-  continue
-fi
-
-#########################
-# Other...
-#########################
-
-# These will print some tools info
-if [[ "$ARG" = "tools" ]]; then
-  CHECKOUT="$CO_CMD modules"
-  BUILDDIR=.
-  BUILDCMD="which gcc && ls -l /tools/ns/bin/gcc && which gcc-2.7.2.1 && ls -l /tools/ns/bin/gcc-2.7.2.1"
-  continue
-fi
-
-#########################
-# Everything else is assumed to be a hostname
-#########################
-
-BUILDHOSTS="$ARG $BUILDHOSTS"
-
-done # for ARG in $*; do
-
-if [[ "$BUILDHOSTS" = "" ]]; then
-  BUILDHOSTS=$DEFAULT_BUILDHOSTS
-fi
-
-if [[ "$BUILDCMD" = "" && "$JUST_TEST" = "no" ]]; then
-  usage
-fi
-
-########################################################################
-# You shouldn't have to modify stuff below here too much
-########################################################################
-
-# Who and Where are we
-PROG=buildall
-RSH=rsh
-SYS=`uname -s`
-echo SYS=$SYS
-if [[ "$SYS" = "HP-UX" ]]; then
-  RSH=remsh
-fi
-
-########################################################################
-# Simple log output function
-########################################################################
-
-log() {
-#  echo "[`date +\"%Y/%m/%d %H:%M:%S\"`] $PROG: $*"
-  echo "`date +\"%H:%M:%S\"` $PROG: $*"
-}
-
-########################################################################
-# Error
-########################################################################
-
-quit() {
-  log "$* (exiting)..."
-  exit 1
-}
-
-# Where should the work be done
-REV=1
-WORKDIR=$DESTBASE/`date +"%Y%m%d"`$DESTTYPE.$REV
-LASTWORKDIR=$WORKDIR
-LASTREV=$REV
-
-while [[ -d $WORKDIR ]]; do
-  LASTREV=$REV
-  let "REV= REV + 1"
-  LASTWORKDIR=$WORKDIR
-  WORKDIR=$DESTBASE/`date +"%Y%m%d"`$DESTTYPE.$REV
-done
-
-if [[ "$RESPIN" = "yes" ]]; then
-  WORKDIR=$LASTWORKDIR
-  REV=$LASTREV
-fi
-BUILDREV=$REV
-
-if [[ ! -d $WORKDIR && "$RESPIN" = "yes" ]]; then
-  quit "missing expected respin workdir ($WORKDIR)"
-fi
-
-mkdir -p $WORKDIR
-
-# Where to send logs
-LOGDIR=$WORKDIR/logs
-[[ -d $LOGDIR ]] || mkdir $LOGDIR
-
-# What tool to use for compressed tar
-if [[ -x /tools/ns/bin/tar ]] ; then	# ROBDAN 9-15-98 for Linux
-  TAR=/tools/ns/bin/tar
-else
-  TAR=tar
-fi
-
-SRCDIR=$WORKDIR/src
-SRCTAR=$WORKDIR/src.tar.gz
-
-########################################################################
-# The function which extracts the source and prepares for copies
-########################################################################
-
-prepare_source() {
-  log "Preparing source code..."
-  mkdir $SRCDIR
-  (cd $SRCDIR;
-   log "Extracting source in $SRCDIR...";
-   log "$CHECKOUT > $LOGDIR/cvs-co.txt";
-   $CHECKOUT > $LOGDIR/cvs-co.txt;
-   RET=$?
-   if [[ $RET -ne 0 ]]; then quit "### Failed($RET): $CHECKOUT"; fi
-   if [[ "$CHECKOUT2" != "" ]]; then
-      log "$CHECKOUT2 >> $LOGDIR/cvs-co.txt";
-      $CHECKOUT2 >> $LOGDIR/cvs-co.txt;
-      RET=$?
-      if [[ $RET -ne 0 ]]; then quit "### Failed($RET): $CHECKOUT2"; fi
-   fi
-   log "Listing source...";
-   ls -Rl > $LOGDIR/src-ls-Rl.txt
-   log "Archiving source..."
-   $TAR czf $SRCTAR .
-  )
-  RET=$?
-  if [[ $RET -ne 0 ]]; then
-    quit "### Failed($RET): cannot prepare source";
-  else
-    log "Source extraction complete";
-  fi
-}
-
-########################################################################
-# The function which does a build
-########################################################################
-
-do_rbuild() {
-  OSDEST=$1
-
-  if [ "$SHARESRC" = "yes" ]; then
-    RSRCDIR=$SRCDIR
-  else
-    RSRCDIR=$WORKDIR/$OSDEST
-  fi
-
-  [[ -d $RSRCDIR ]] || mkdir -p $RSRCDIR
-
-  cd $RSRCDIR;
-
-  # do any late variable expansions
-  RAWCMD=$BUILDCMD
-  BUILDCMD=$(eval echo $RAWCMD)
-  
-  if [[ $RHOST = localhost ]] ; then
-    log "Build locally for $OSDEST ($BUILDCMD)...";
-    cd $BUILDDIR && pwd && $BUILDCMD && echo $PROG: Success
-    RET=$?
-    if [[ $RET -ne 0 ]]; then quit "### Failed($RET): $OSDEST build"; fi
-
-    log "Completed local build..."
-    return
-  fi
-
-  if [[ "$SHARESRC" != "yes" ]]; then
-     log "Extracting source for $OSDEST...";
-     $RSH $RHOST -n "cd $RSRCDIR && pwd && $TAR xzf $SRCTAR";
-     RET=$?
-     if [[ $RET -ne 0 ]]; then quit "### Failed($RET): $OSDEST source extraction"; fi
-  else
-     log "Using common source in $RSRCDIR";
-  fi
-  
-  log "Building for $OSDEST ($BUILDCMD)...";
-  $RSH $RHOST -n "cd $RSRCDIR/$BUILDDIR && pwd && $BUILDCMD && echo $PROG: Success"
-  RET=$?
-  if [[ $RET -ne 0 ]]; then quit "### Failed($RET): $OSDEST build"; fi
-
-  log "Completed $OSDEST...";
-}
-
-buildhost() {
-  RHOST=$1
-
-  log "Query $RHOST configuration...";
-
-  if [[ $RHOST = localhost ]] ; then
-     uname -s > /tmp/$$.$RHOST 2>&1
-  else
-    $RSH $RHOST -n "uname -s" > /tmp/$$.$RHOST 2>&1
-    RET=$?
-    if [[ $RET -ne 0 ]]; then
-      quit "..[$RHOST] ### Failed($RET): $RSH $RHOST -n \"uname -s\"";
-    fi
-  fi
-  ROSTYPE=`tail -1 /tmp/$$.$RHOST`
-
-  if [[ "$ROSTYPE" = "AIX" ]]; then
-    $RSH $RHOST -n "uname -v" > /tmp/$$.$RHOST 2>&1
-    ROSTYPE=${ROSTYPE}`tail -1 /tmp/$$.$RHOST`
-  fi
-
-  if [[ $RHOST = localhost ]] ; then
-     uname -r > /tmp/$$.$RHOST 2>&1
-  else
-    $RSH $RHOST -n "uname -r" > /tmp/$$.$RHOST 2>&1
-  fi
-  ROSREV=`tail -1 /tmp/$$.$RHOST`
-  rm /tmp/$$.$RHOST
-
-  if [[ $RHOST = localhost ]] ; then
-    OSDEST=`hostname | cut -f1 -d.`-${ROSTYPE}${ROSREV}
-  else
-    OSDEST=${RHOST}-${ROSTYPE}${ROSREV}
-  fi
-  log "..Building on [$OSDEST]..."
-
-  REV=1				# find unique logfile name
-  OSLOG=$LOGDIR/$OSDEST.$REV
-  while [[ -f $OSLOG ]]; do
-    let "REV = REV + 1"
-    OSLOG=$LOGDIR/$OSDEST.$REV
-  done
-
-  if [[ "$JUST_TEST" = "yes" ]]; then
-    echo "$PROG: Success" > $OSLOG
-  else
-    ( do_rbuild $OSDEST ) > $OSLOG 2>&1
-  fi
-
-  grep "$PROG: Success" $OSLOG > /dev/null
-  RET=$?
-  if [[ $RET -eq 0 ]]; then
-    RESULT="SUCCESS";
-  else
-    RESULT="FAILURE($RET)";
-  fi
-  log "..Completed [$OSDEST] <$RESULT>.";
-}
-
-########################################################################
-# The function which initiates all the builds
-########################################################################
-
-do_builds() {
-  log "Launching builds..."
-
-  for HOST in $BUILDHOSTS; do
-    buildhost $HOST &
-  done
-}
-
-########################################################################
-# main
-########################################################################
-
-main() {
-  if [[ "$JUST_TEST" = "yes" ]]; then
-    log "Automated test starting..."
-  else
-    log "Automated build of [$DESCRIPTION] starting..."
-  fi
-  log ""
-  log "       ARGS = $ARGS"
-  log " BUILDHOSTS = $BUILDHOSTS"
-  log "    WORKDIR = $WORKDIR"
-  log "     SRCDIR = $SRCDIR"
-  log "     LOGDIR = $LOGDIR"
-  log "   CHECKOUT = $CHECKOUT"
-  log "   BUILDDIR = $BUILDDIR"
-  log "   BUILDCMD = $BUILDCMD"
-  log "     RESPIN = $RESPIN"
-  log ""
-
-  [[ "$RESPIN" = "no" ]] && prepare_source
-  do_builds
-  log "Waiting for all builds to complete..."
-  wait
-  log "All builds completed."
-
-  if [[ -n "$POSTCMD" && "$POSTBUILD" = "yes" ]] ; then
-	log "Running post build command."
-
-	REV=1				# find unique logfile name
-	POSTLOG=$LOGDIR/postbuild.$REV
-  	while [[ -f $POSTLOG ]]; do
- 	  let "REV = REV + 1"
- 	  POSTLOG=$LOGDIR/postbuild.$REV
-	done
-
-	echo "Dir $SRCDIR/$BUILDDIR" > $POSTLOG
-	echo "Cmd $POSTCMD" >> $POSTLOG
-	(cd $SRCDIR/$BUILDDIR && $POSTCMD && echo $PROG: Success) >> $POSTLOG 2>&1
-
-        log "Post build command completed."
-  elif [[ -n "$POSTCMD" ]] ; then
-	echo "Skipping post build command: $POSTCMD"
-  fi
-}
-
-REV=1
-PROGLOG=$LOGDIR/$PROG.$REV
-
-while [[ -f $PROGLOG ]]; do
-  REV=`expr $REV + 1`
-  PROGLOG=$LOGDIR/$PROG.$REV
-done
-
-main | tee $PROGLOG 2>&1
-exit 0

mozilla/mstone/autobuild.bat

@@ -1,164 +0,0 @@
-@if not "%echo%" == "on" echo off
-
-REM ************ simple autobuild for mailstone
-
-setlocal
-
-set BOTH=0
-
-if not "%1" == "" goto GetTag
-
-set BOTH=1
-set TAG=_OPT
-goto SetConfig
-
-:GetTag
-
-if %1 == dbg set TAG=_DBG
-if %1 == DBG set TAG=_DBG
-if %1 == Debug set TAG=_DBG
-if %1 == debug set TAG=_DBG
-if %1 == Release set TAG=_OPT
-if %1 == release set TAG=_OPT
-if %1 == opt set TAG=_OPT
-if %1 == OPT set TAG=_OPT
-if %1 == optimize set TAG=_OPT
-if %1 == Optimize set TAG=_OPT
-if %1 == optimized set TAG=_OPT
-if %1 == Optimized set TAG=_OPT
-if %1 == clean goto CleanBoth
-
-:SetConfig
-
-if %TAG% == _DBG set Config=Debug
-if %TAG% == _OPT set Config=Release
-
-set ARCH=WINNT4.0%TAG%.OBJ
-
-set FINAL_PATH=built\package\%ARCH%\mailstone
-
-if not "%2" == "clean" if not exist %FINAL_PATH%\nul mkdir %FINAL_PATH%
-
-
-REM ************ first, clean the binary release
-nmake /f mailstone.mak CFG="mailstone - Win32 %Config%" /nologo NO_EXTERNAL_DEPS=1 CLEAN
-
-if not "%2" == "clean" goto BuildMailstone
-
-if exist src\%Config%\nul echo y | rd /s src\%Config% > nul
-if exist src\gnuplot-3.7\%Config%\nul echo y | rd /s src\gnuplot-3.7\%Config% > nul
-if exist src\gd1.3\%Config%\nul echo y | rd /s src\gd1.3\%Config% > nul
-if exist built\%ARCH%\nul echo y | rd /s built\%ARCH% > nul
-if exist %FINAL_PATH%\nul echo y | rd /s %FINAL_PATH% > nul
-
-goto done
-
-:BuildMailstone
-
-REM **************** next, build it
-nmake /f mailstone.mak CFG="mailstone - Win32 %Config%" /nologo NO_EXTERNAL_DEPS=1
-if errorlevel 1 goto BadBuild
-
-REM ************ next, copy the top-level files
-copy mstone.bat %FINAL_PATH%
-copy setup.bat %FINAL_PATH%
-copy CHANGELOG %FINAL_PATH%
-copy INSTALL %FINAL_PATH%
-copy README %FINAL_PATH%
-copy LICENSE %FINAL_PATH%
-
-REM ************ now, copy the files for running mailstone into bin
-if not exist %FINAL_PATH%\bin\nul mkdir %FINAL_PATH%\bin
-copy built\%ARCH%\mailclient.exe %FINAL_PATH%\bin
-if exist built\package\%ARCH%\mailclient.exe copy built\package\%ARCH%\mailclient.exe %FINAL_PATH%\bin
-if exist built\package\%ARCH%\mailclient.exe del /f /q built\package\%ARCH%\mailclient.exe
-copy bin\*.pl %FINAL_PATH%\bin
-
-REM ************ now, copy the configuration files into conf
-if not exist %FINAL_PATH%\conf\nul mkdir %FINAL_PATH%\conf
-copy conf\*.* %FINAL_PATH%\conf
-
-REM ************ now, copy the data files into data
-if not exist %FINAL_PATH%\data\nul mkdir %FINAL_PATH%\data
-copy data\*.msg %FINAL_PATH%\data
-
-REM ************ now, copy the gd files into gd
-if not exist %FINAL_PATH%\gd\nul mkdir %FINAL_PATH%\gd
-copy src\gd1.3\index.html %FINAL_PATH%\gd\gd.html
-
-REM ************ now, copy the gnuplot files into gnuplot
-if not exist %FINAL_PATH%\gnuplot\nul mkdir %FINAL_PATH%\gnuplot
-copy built\%ARCH%\gnuplot\gnuplot.exe %FINAL_PATH%\gnuplot
-copy src\gnuplot-3.7\Copyright %FINAL_PATH%\gnuplot
-copy src\gnuplot-3.7\docs\gnuplot.1 %FINAL_PATH%\gnuplot
-
-REM ************ now, copy the perl files into perl
-if not exist %FINAL_PATH%\perl\nul mkdir %FINAL_PATH%\perl
-if not exist %FINAL_PATH%\perl\bin\nul mkdir %FINAL_PATH%\perl\bin
-if not exist %FINAL_PATH%\perl\lib\nul mkdir %FINAL_PATH%\perl\lib
-if not exist %FINAL_PATH%\perl\lib\5.00503\nul mkdir %FINAL_PATH%\perl\lib\5.00503
-if not exist %FINAL_PATH%\perl\lib\5.00503\MSWin32-x86\nul mkdir %FINAL_PATH%\perl\lib\5.00503\MSWin32-x86
-#copy built\%ARCH%\perl\perl.exe %FINAL_PATH%\perl\bin
-#rcp -b sandpit:/share/builds/components/perl5/WINNT-perl5/perl.exe %FINAL_PATH%\perl\bin\perl.exe
-#if errorlevel 1 goto BadRcp
-#if not exist %FINAL_PATH%\perl\perl.exe goto BadRcp
-#rcp -b sandpit:/share/builds/components/perl5/WINNT-perl5/perl300.dll %FINAL_PATH%\perl\bin\perl300.dll
-#if errorlevel 1 goto BadRcp
-#if not exist %FINAL_PATH%\perl\perl300.dll goto BadRcp
-
-copy src\perl5.005_03\Artistic %FINAL_PATH%\perl
-copy c:\perl\5.00503\bin\MSWin32-x86\perl.exe %FINAL_PATH%\perl\bin
-copy c:\perl\5.00503\bin\MSWin32-x86\perl.dll %FINAL_PATH%\perl\bin
-copy c:\perl\5.00503\lib\*.pm %FINAL_PATH%\perl\lib\5.00503
-copy c:\perl\5.00503\lib\*.pl %FINAL_PATH%\perl\lib\5.00503
-copy c:\perl\5.00503\lib\MSWin32-x86\*.pm %FINAL_PATH%\perl\lib\5.00503\MSWin32-x86
-
-
-goto end
-
-:CleanBoth
-
-echo.
-echo NOTICE: CLEANING debug build
-call autobuild.bat debug clean
-
-echo NOTICE: CLEANING optimized build
-call autobuild.bat release clean
-
-echo NOTICE: Removing generated dependency files
-del /s *.dep
-
-if exist built\nul echo y | rd /s built > nul
-
-goto done
-
-:BadRcp
-
-echo.
-echo ERROR: Failed to rcp perl files over to mailstone packaging
-echo ERROR: Two common causes of this are .rhosts permissions or a broken rcp.exe
-echo ERROR: Make sure you are not using rcp.exe from NT4.0 SP4
-echo ERROR: The SP5 version is available in \\cobra\engineering\bin\rcp_sp5.exe
-echo ERROR: Use this version to replace ...\system32\rcp.exe
-goto done
-
-:BadBuild
-
-echo.
-echo ERROR: Failed to build mailstone
-goto done
-
-:end
-
-echo.
-
-if %BOTH% == 0 goto done
-if %TAG% == _DBG goto done
-
-set TAG=_DBG
-goto SetConfig
-
-:done
-
-endlocal
-

mozilla/mstone/bin/args.pl

@@ -1,64 +0,0 @@
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is the Netscape Mailstone utility, 
-# released March 17, 2000.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation. Portions created by Netscape are
-# Copyright (C) 1997-2000 Netscape Communications Corporation. All
-# Rights Reserved.
-# 
-# Contributor(s):	Dan Christian <robodan@netscape.com>
-#			Marcel DePaolis <marcel@netcape.com>
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU Public License (the "GPL"), in which case the
-# provisions of the GPL are applicable instead of those above.
-# If you wish to allow use of your version of this file only
-# under the terms of the GPL and not to allow others to use your
-# version of this file under the NPL, indicate your decision by
-# deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL.  If you do not delete
-# the provisions above, a recipient may use your version of this
-# file under either the NPL or the GPL.
-#####################################################
-
-# This file does argument processing, file IO, and other utility routines
-
-# Where the online docs live
-#$mailstoneURL =
-#    "http://home.netscape.com/eng/server/messaging/4.1/mailston/stone.htm";
-#$mailstoneURL =
-#    "http://lxr.mozilla.org/mozilla/source/mstone/doc/MailStone.html";
-#$mailstoneURL =
-#    "http://docs.iplanet.com/docs/manuals/messaging/nms415/mailstone/stone.htm"
-$mailstoneURL = "doc/MailStone.html";
-
-# Subdirs for results (each under a timestamp dir).  Should just hardwire.
-$tmpbase = "tmp";
-$resultbase = "results";
-
-# This holds everything about the test and system configuration
-@workload = ();
-# Setup the special CONFIG section
-$params{"sectionTitle"} = "CONFIG";
-$params{"sectionParams"} = "";
-$params{"lineList"} = ();
-push @workload, \%params;
-
-# Get the lists discribing the data we process
-do 'protoconf.pl' || die "$@\n";
-
-%includedFiles = ();		# array of included files
-
-do 'util.pl' || die "$@\n";
-
-return 1;

mozilla/mstone/bin/genplot.pl

@@ -1,310 +0,0 @@
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is the Netscape Mailstone utility, 
-# released March 17, 2000.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation. Portions created by Netscape are
-# Copyright (C) 1997-2000 Netscape Communications Corporation. All
-# Rights Reserved.
-# 
-# Contributor(s):	Dan Christian <robodan@netscape.com>
-#			Marcel DePaolis <marcel@netcape.com>
-#			Sean O'Rourke <sean@sendmail.com>
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU Public License (the "GPL"), in which case the
-# provisions of the GPL are applicable instead of those above.
-# If you wish to allow use of your version of this file only
-# under the terms of the GPL and not to allow others to use your
-# version of this file under the NPL, indicate your decision by
-# deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL.  If you do not delete
-# the provisions above, a recipient may use your version of this
-# file under either the NPL or the GPL.
-#####################################################
-
-# This file deals with the graphs data only
-# Interfaces to gnuplot to generate gifs for HTML inclusion.
-
-do 'util.pl';
-sub warn_system;
-sub die_system;
-
-# Type of images to hold plots (e.g. png, gif, jpeg, svg, tiff, pbm, etc)
-unless ($params{IMAGETYPE}) {
-    # Should probe gnuplot and see if it can generate one of:
-    #	png, gif, jpeg, svg, tiff, or pbm.
-    # Not all the programs that use args.pl need this (or have gnuplot, yet)
-    my $outfile = "$tmpbase/termtypes.out";
-    my %types = ();		# hash of interesting types that we spot
-
-    unless (open(NEW, "<$outfile")) { # re-use old file if present
-	($params{DEBUG}) &&
-	    print "Asking gnuplot what output types it supports\n";
-
-	# SEAN: this appears to do what they want:
-	warn_system "echo 'set term' | $params{GNUPLOT} > $outfile";
-
-	open(NEW, "<$outfile") ||
-	    warn ": Could not open gnuplot output for parsing ($outfile): $!";
-    }
-
-    # now check through the output for terminal types we can use.
-    # I havent verified the jpeg or tiff types.  e-mail me success or failure
-    while (<NEW>) {
-	(/\spng\s/) && ++$types{"png"} && next;
-	(/\sgif\s/) && ++$types{"gif"} && next;
-	(/\sjpeg\s/) && ++$types{"jpeg"} && next;
-	(/\ssvg\s/) && ++$types{"svg"} && next;
-	(/\stiff\s/) && ++$types{"tiff"} && next;
-	(/\spbm\s/) && ++$types{"pbm"} && next;
-    }
-    close (NEW);
-
-    ($params{DEBUG}) &&
-	print "Found these gnuplot types: " . (join " ", (keys %types)) . "\n";
-
-    # The ordering here determines our preferences
-    # This list is by likely browser compatibility and image compactness
-    # png is about 10x smaller than gif
-    # svg is smooth and scalable but usually requires a plug-in
-    # jpeg will probably look bad, but will be directly supported
-    if ($types{"png"}) { $params{IMAGETYPE}="png"; }
-    elsif ($types{"gif"}) { $params{IMAGETYPE}="gif"; }
-    elsif ($types{"jpeg"}) { $params{IMAGETYPE}="jpeg"; }
-    elsif ($types{"svg"}) { $params{IMAGETYPE}="svg"; }
-    elsif ($types{"tiff"}) { $params{IMAGETYPE}="tiff"; }
-    elsif ($types{"pbm"}) { $params{IMAGETYPE}="pbm"; }
-    else {
-	warn "Gnuplot doesn't support any good image types.  Check $outfile.\n";
-	$params{IMAGETYPE} = undef;
-    }
-    # leave the output file around to speed up repeat runs
-}
-
-# sub function to write data files, fire off gnuscript, and clean up
-# Uses global startTime and endTime figured above
-# genPlot counterName title label \@protocols \@variables
-sub genPlot {
-    my $name = shift;
-    my $title = shift;
-    my $label = shift;
-    my $protos = shift || die "genPlot: '$name' missing protocols";
-    my $f = shift;
-    my $vars = shift || die "genPlot: '$name' missing vars";
-
-    my $runlist = "";
-    my $totPoints = 0;
-    my $totProtos = 0;
-    my @realProtos;
-    my @goodProtos;
-
-    # user fewer data points than pixels to look good.
-    #   on 640x480 gif, the graph is about 579x408
-    my $maxData = int (($params{CHARTWIDTH}-60) * 0.9);
-    my $averageCnt = int (($endTime - $startTime + ($maxData - 1))/$maxData);
-    if ($averageCnt < 1) { $averageCnt = 1; } # must be a positive int
-
-    ($params{DEBUG}) && print "$name: averageCnt=$averageCnt vars = @$vars \n";
-
-    foreach $p (@$protos) { # First see if there is anything to graph
-	($p =~ /^Total$/o) && next; # derived if needed
-	my $pPoints = 0;
-	my $gp = $graphs{$p};
-	ALLVAR: foreach $vm (@$vars) {
-	    my $vp =  ($f) ? $gp->{$vm}->{$f} : $gp->{$vm};
-
-	    unless (($vp) && (scalar %$vp)) {
-		#print "genplot Checking: $p $vm $f => NO\n";
-		next;
-	    }
-	    #print "genplot Checking: $p $vm $f => ";
-	    foreach $time (keys %$vp) {
-		next unless ($vp->{$time} != 0);
-		$totPoints++;
-		$pPoints++;
-		#print "VALUES\n";
-		last ALLVAR;
-	    }
-	    #print "nothing\n"
-	}
-	if ($pPoints > 0) {	# count how many protocols have non 0
-	    $totProtos++;
-	    push @goodProtos, $p;
-	}
-    }
-    ($params{DEBUG}) && print "\tprotocols: @goodProtos\n";
-
-    if ($totPoints == 0) {	# nothing in any protocol
-	print "No data for graph '$name', variables '@$vars'\n";
-	return 0;
-    }
-
-    foreach $p (@$protos) {
-	unlink ("$tmpdir/$name.$p"); # remove any previous runs
-
-	(($p =~ /^Total$/o) && ($totProtos <= 1))
-	    && next;		# skip Totally if only 1 protocol plus total
-
-	($p !~ /^Total$/o) && push @realProtos, $p; # everything but Total
-
-#  	if ($p =~ /^Total$/o) {	# move from last to first
-#  	    $runlist = "\'$name.$p\' with lines, " . $runlist;
-#  	    next;
-#  	}
-
-	$runlist .= ", " if ($runlist); # later ones
-
-	$runlist .= "\'$name.$p\' with lines";
-    }
-
-    $totPoints = 0;
-    foreach $p (@realProtos) {	# create the plot data files
-	open(DATA, ">$tmpdir/$name.$p") || 
-	    die "Can't open $tmpdir/$name.$p:$!";
-	my $gp = $graphs{$p};
-	my $n = 0;
-	my $s = 0.0;
-	my $sTime = 0.0;
-	my $vp = ($f) ? $gp->{$vars->[0]}->{$f} : $gp->{$vars->[0]};
-
-#	foreach $time (sort numeric keys %$vp) {
-	for (my $tm = $startTime; $tm <= $endTime; $tm++) {
-	    my $v = 0.0;
-	    foreach $vm (@$vars) {
-		$vp = ($f) ? $gp->{$vm}->{$f} : $gp->{$vm};
-
-		$totPoints++;
-
-		# due to optimization in updateDelta, 
-		#    0 entries are undefined (also avoids warning)
-		$v += ($vp->{$tm}) ? $vp->{$tm} : 0;
-
-		# if ($vp->{$tm} < 0) {
-		# print $name, ": proto=", $p, " var=", $vm,
-		# " value=", $vp->{$tm}, "\n";
-		# }
-	    }
-	    $s += $v;
-	    $n += 1;
-	    if ($n == 1) {	# NOTE: shifts left in sliding window
-		$sTime = $tm-$startTime;
-	    }
-	    if ($n >= $averageCnt) {
-		printf (DATA "%d %f\n", $sTime * $timeStep, $s/$n);
-		$n = 0;
-		$s = 0.0;
-	    }
-	}
-	if ($n > 0) {		# handle end case
-	    printf (DATA "%d %f\n", $sTime * $timeStep, $s/$n);
-	}
-	close(DATA);
-    }
-    #($params{DEBUG}) && print "\tpoints: $totPoints\n";
-
-    # need to handle "Total" case
-    # read the other files and write out the sum
-    # FIX: total my be mis-aligned with data
-    if (($#$protos > $#realProtos) && ($totProtos > 1)) { 
-	unlink ("$tmpdir/$name.Total");
-	open(DATA, ">$tmpdir/$name.Total") || 
-	    die "Can't open $tmpdir/$name.Total:$!";
-
-	foreach $r (@goodProtos) { # get file handles
-	    open($r, "$tmpdir/$name.$r")
-		|| die "Couldn't open $tmpdir/$name.$r: $!";
-	}
-				# ASSUMES files are identical in order
-	my $first = shift @goodProtos;
-	# print "First protocol: $first  Rest: @realProtos\n";
-	while (<$first>) {
-	    my ($t, $s) = split ' ', $_;
-	    foreach $r (@goodProtos) { # get file handles
-		$l = <$r>;
-		if ($l) {
-		    my ($tt, $v) = split ' ', $l;
-		    $t = $tt unless ($t); # in case first proto missing time
-		    $s += $v;
-		}
-	    }
-	    printf (DATA "%d %f\n", $t, $s);
-	}
-
-	foreach $r (@goodProtos) { close($r); }
-	close (DATA);
-    }
-
-    # SEAN: don't even try if we aren't generating images:
-    return 0 unless $params{IMAGETYPE};
-
-    # Create a script to feed to gnuplot, which creates a .gif graph.
-    $runTime = ($endTime - $startTime + 1) * $timeStep;
-    unlink("$tmpdir/$name.gpt");
-    open(SCRIPT, ">$tmpdir/$name.gpt")
-	|| die "Can't open $tmpdir/$name.gpt:$!";
-    
-    $gnuplot = $params{GNUPLOT};
-    return 1 unless $gnuplot;
-    if ($gnuplot !~ /^\//) {	# if not absolute, adjust for cd $tmpbase
-	$gnuplot = "../../$gnuplot"; # ASSUME $tmpbase is single dir
-    }
-    #print "gnuplot is $gnuplot $params{GNUPLOT}\n";
-
-    my $varstring = "";		# create display version of names
-    foreach $t (@$vars) {
-	$varstring .= ", " if ($varstring);
-	$varstring .= ($timerNames{$t}) ? $timerNames{$t} : $t;
-    }
-
-    # Setup output "terminal type"
-    if ($params{IMAGETYPE} eq "gif") { # gif type has different arguments
-	print SCRIPT "set terminal $params{IMAGETYPE} small size $params{CHARTWIDTH},$params{CHARTHEIGHT}\n";
-    } elsif ($params{IMAGETYPE} eq "svg") { # svg type has different args too
-	print SCRIPT "set terminal $params{IMAGETYPE} size $params{CHARTWIDTH} $params{CHARTHEIGHT}\n";
-    } else {			# most types work like this
-	print SCRIPT "set terminal $params{IMAGETYPE} small color\n";
-	if (($params{CHARTWIDTH} != 640) || ($params{CHARTHEIGHT} != 480)) {
-	    my $xscale = $params{CHARTWIDTH} / 640;
-	    my $yscale = $params{CHARTHEIGHT} / 480;
-	    print SCRIPT "set size $xscale,$yscale\n";
-	}
-    }
-    print SCRIPT<<"!GROK!THIS!";
-set output "../../$resultdir/$name.$params{IMAGETYPE}" # ASSUME $tmpbase is single dir
-set autoscale
-set xlabel "Test time (seconds)"
-set ylabel "$label"
-set title "$title ($varstring) -- $params{TSTAMP}"
-plot [0:$runTime] $runlist
-!GROK!THIS!
-    close(SCRIPT);
-
-    # run script from tmpbase to clean up line labeling
-#    my $olddir=getcwd();
-    chdir $tmpdir;
-    warn_system (split (/\s/, $gnuplot), "$name.gpt");
-    chdir "../..";
-#    chdir $olddir;
-
-    unless ($params{DEBUG}) {
-	# cleanup the plot data (or leave around for debugging)
-	foreach $p (@$protos) {
-	    unlink("$tmpdir/$name.$p");
-	}
-	unlink("$tmpdir/$name.gpt");
-    }
-    return 1;
-}
-
-
-return 1;

mozilla/mstone/bin/mailmaster.pl

@@ -1,629 +0,0 @@
-#!/usr/bin/env perl
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is the Netscape Mailstone utility, 
-# released March 17, 2000.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation. Portions created by Netscape are
-# Copyright (C) 1997-2000 Netscape Communications Corporation. All
-# Rights Reserved.
-# 
-# Contributor(s):	Dan Christian <robodan@netscape.com>
-#			Marcel DePaolis <marcel@netcape.com>
-#			Mike Blakely
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU Public License (the "GPL"), in which case the
-# provisions of the GPL are applicable instead of those above.
-# If you wish to allow use of your version of this file only
-# under the terms of the GPL and not to allow others to use your
-# version of this file under the NPL, indicate your decision by
-# deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL.  If you do not delete
-# the provisions above, a recipient may use your version of this
-# file under either the NPL or the GPL.
-#####################################################
-
-#  see setup.pl for full usage
-#	mailmaster [-d] [-c <config file>] ...
-
-# This script reads in the client configuration files and will
-# fork children to rsh the mailclient process on network clients,
-# each child will write test results to /mailstone directory before
-# dying.  The parent will the read and combine the results.
-#
-# Make sure the user running this script has rsh privilege across
-# all client machines
-
-print "Netscape Mailstone version 4.2\n";
-print "Copyright (c) Netscape Communications Corp. 1997-2000\n";
-
-# this parses the command line and config file
-do 'args.pl'|| die "$@\n";
-sub die_system;
-sub warn_system;
-
-parseArgs();			# parse command line
-
-{				# get unique date string
-    my ($sec, $min, $hour, $mday, $mon, $year) = localtime;
-    my $tstamp = sprintf ("%04d%02d%02d.%02d%02d",
-		       1900+$year, 1+$mon, $mday, $hour, $min);
-
-    if ( -d "$resultbase/$tstamp") { # check for runs within a minute
-	my $tail = 'a';
-	while ( -d "$resultbase/$tstamp$tail" ) { $tail++; }
-	$tstamp .= $tail;
-    }
-    $params{TSTAMP} = $tstamp;
-}
-
-$resultdir = "$resultbase/$params{TSTAMP}";
-$tmpdir = "$tmpbase/$params{TSTAMP}";
-$resultstxt = "$resultdir/results.txt";
-$resultshtml = "$resultdir/results.html";
-mkdir ("$resultbase", 0775);
-mkdir ("$tmpbase", 0775);
-mkdir ("$resultdir", 0775);
-mkdir ("$tmpdir", 0775);
-
-# Make sure we have everything
-die "Must specify the test time" unless $params{TIME};
-die "Must specify a workload file" unless $params{WORKLOAD};
-
-if ($params{TESTBED}) {		# BACK COMPATIBILITY
-    readTestbedFile ($params{TESTBED}) || die "Error reading testbed: $@\n";
-}
-
-$testsecs = figureTimeSeconds ($params{TIME}, "seconds");
-
-# figure out the processes and thread, given the desired number
-# takes into account all the constraints.  todo can be a float.
-sub figurePT {
-    my $sec = shift;
-    my $todo = shift;
-    my $p = 1;			# first guess
-    my $t = 1;
-    my $start = 1;		# initial process guess
-    my $end = 250;		# highest process guess
-
-    if ($todo < 1) {		# mark this client as inactive
-	$sec->{PROCESSES} = 0;
-	$sec->{THREADS} = 0;
-	return 0;
-    }
-
-    if (($section->{MAXCLIENTS}) && ($todo > $section->{MAXCLIENTS})) {
-	$todo = $section->{MAXCLIENTS};	# trim to max client per host
-    }
-    if ($section->{PROCESSES}) { # they set this part already
-	$start = int ($section->{PROCESSES});
-	$end = $start;
-	$p = $start;
-	my $slist = $section->{sectionParams};
-	$slist =~ s/HOSTS=\s*//; # strip off initial bit
-	print "Using specified $p processes for clients $slist\n";
-    }
-
-    $end = int ($section->{MAXPROCESSES})
-	if ($section->{MAXPROCESSES}); # they set a max
-    
-    if (($params{NT}) || ($section->{ARCH} eq "NT4.0")) {
-	$end = 1;		#  # NT is currently limited to 1 process
-	$start = 1;
-	$p = 1;
-    }
-
-    # step through some process counts
-    # it should first reduce errors due to MAXTHREADS,
-    # the it will reduce errors due to integer math.
-    # not optimal, just good enough
-    my $misses = 0;
-    for (my $n = $start; $n <= $end; $n++) { # try some process counts
-	my $tryt = int ($todo / $n);
-	if (($sec->{MAXTHREADS}) && ($tryt > $sec->{MAXTHREADS})) {
-	    $tryt = $sec->{MAXTHREADS};
-	}
-	# see if this is a better match than the last one
-	if (abs ($todo - ($n * $tryt)) < abs ($todo - ($p * $t))) {
-	    $p = $n;
-	    $t = $tryt;
-	    $misses = 0;
-	} else {
-	    $misses++;
-	    last if ($misses > 1); # getting worse
-	}
-    }
-    $sec->{PROCESSES} = $p;
-    $sec->{THREADS} = $t;
-    return $p * $t;
-}
-
-# Allocate CLIENTCOUNT to the client machines
-# try NOT to turn this into a massive linear programming project
-# works best to put bigger machines last
-if ($params{CLIENTCOUNT}) {
-    my $todo = $params{CLIENTCOUNT};
-    my $softcli = 0;		# how many can we play with
-
-    foreach $section (@workload) { # see which are already fixed
-	next unless ($section->{sectionTitle} =~ /CLIENT/i);
-	unless (($section->{PROCESSES}) && ($section->{THREADS})) {
-	    $softcli++;
-	    next;
-	}
-	my $slist = $section->{sectionParams};
-	$slist =~ s/HOSTS=\s*//; # strip off initial bit
-	my @hlist = split /[\s,]/, $slist;
-	my $hcnt = (1 + $#hlist);
-
-	# subtract fixed entries
-	my $tcount = ($section->{THREADS}) ? $section->{THREADS} : 1;
-	$todo -= $tcount * $section->{PROCESSES} * $hcnt;
-	$clientProcCount += $section->{PROCESSES} * $hcnt; # total processes
-	$params{DEBUG} &&
-	    print "Fixed load group with $hcnt hosts: $section->{PROCESSES} x $tcount\n";
-    }
-
-    $params{DEBUG} &&
-	    print "Allocating $todo clients over $softcli groups\n";
-    if ($softcli) {
-	foreach $section (@workload) {
-	    next unless ($section->{sectionTitle} =~ /CLIENT/i);
-	    next if (($section->{PROCESSES}) && ($section->{THREADS}));
-	    my $slist = $section->{sectionParams};
-	    $slist =~ s/HOSTS=\s*//; # strip off initial bit
-	    my @hlist = split /[\s,]/, $slist;
-	    my $hcnt = (1 + $#hlist);
-
-	    #print "todo=$todo softcli=$softcli hcnt=$hcnt\n";
-	    $todo -= $hcnt * figurePT ($section, $todo / ($softcli * $hcnt));
-	    $clientProcCount += $hcnt * $section->{PROCESSES}; # total procs
-
-	    $softcli--;
-	    last if ($softcli <= 0); # should not happen
-	}
-    }
-    if ($todo) {
-	print "Warning: Could not allocate $todo of $params{CLIENTCOUNT} clients.\n";
-	$params{CLIENTCOUNT} -= $todo;
-    }
-	    
-   
-} else {			# figure out the client count
-    my $cnt = 0;
-    foreach $section (@workload) { # see which are already fixed
-	next unless ($section->{sectionTitle} =~ /CLIENT/i);
-#  	next unless ($section->{PROCESSES});
-	next unless $section->{CLIENTS};
-
-	my $clients = $section->{CLIENTS};
-	my $slist = $section->{sectionParams};
-	$slist =~ s/HOSTS=\s*//; # strip off initial bit
-	my @hlist = split /[\s,]/, $slist;
-	my $hcnt = scalar @hlist;
-	
-	$clients /= $hcnt;
-	my $maxp = ($section->{MAXPROCESSES} || 10000);
-	my $maxt = ($section->{MAXTHREADS} || 10000);
-	if ($maxp * $maxt < $clients) {
-	    die <<EOS;
-Too many clients for hosts $section->{sectionParams}:
-clients 	= $section->{CLIENTS}
-maxThreads 	= $section->{MAXTHREADS}
-maxProcesses 	= $section->{MAXPROCESSES}
-EOS
-	}
-	my ($nt, $np);
-	if ($maxt >= $clients) {
-	    $nt = $clients;
-	    $np = 1;
-	} else {
-	    $np = int (($clients / $maxt) + (($clients % $maxt) ? 1 : 0));
-	    $nt = int ($clients / $np);
-	}
-
-	$section->{THREADS} = $nt;
-	$section->{PROCESSES} = $np;
-#  	$section->{CLIENTS} = $np * $nt * $hcnt;
-	$cnt += $nt * $np * $hcnt;
-	$clientProcCount += $np * $hcnt; # total processes
-    }
-    $params{CLIENTCOUNT} = $cnt;
-    die "No clients configured!\n" unless ($cnt > 0);
-}
-
-# This has to be written into save workload file for later processing
-unless ($params{FREQUENCY}) {	# unless frequency set on command line
-    my $chartp = ($params{CHARTPOINTS}) ? $params{CHARTPOINTS} : 464;
-
-    # approximate data points for good graphs (up to 2 times this)
-    $params{FREQUENCY} = int ($testsecs / $chartp);
-    if ($params{FREQUENCY} < 2) { # fastest is every 2 seconds
-	$params{FREQUENCY} = 2;
-    } elsif ($params{FREQUENCY} > 60) {	# slowest is every minute
-	$params{FREQUENCY} = 60;
-    }
-}
-
-{ # set a unique block id on every section
-    my $id = 0;
-    my $configSeen = 0;
-    my $defaultSeen = 0;
-    foreach $section (@workload) {
-	if ($section->{"sectionTitle"} =~ /^CONFIG$/) {
-	    next if $configSeen;
-	    $configSeen++;
-	}
-	if ($section->{"sectionTitle"} =~ /^DEFAULT$/) {
-	    next if $defaultSeen;
-	    $defaultSeen++;
-	}
-	$id++;			# number 1, 2, ...
-	if ($section->{"sectionTitle"} =~ /^(CONFIG|CLIENT)$/) {
-	    $section->{BLOCKID} = $id;
-	} else {
-	    push @{$section->{"lineList"}}, "blockID\t$id\n";
-	}
-    }
-}
-
-# Write the version we pass to mailclient
-writeWorkloadFile ("$resultdir/work.wld", \@workload,
-		   \@scriptWorkloadSections);
-
-# Write the complete inclusive version
-writeWorkloadFile ("$resultdir/all.wld", \@workload);
-
-# SEAN: copy the wld.in file to the result directory for later
-# statistics gathering.
-my $wld = $params{WORKLOAD};
-if (-f "$wld.in") {
-    die_system "cp $wld.in $resultdir/wld.in";
-} else {
-    unless ($wld !~ /\.preload_(new|old|touch)$/) {
-	warn "Can't find wld.in file for `$wld'\n" unless -f "$wld.in";
-    }
-}
-
-setConfigDefaults();		# pick up any missing defaults
-
-unless ($#protocolsAll > 0) {
-    die "No protocols found.  Test Failed!\n";
-}
-
-print "Starting: ", scalar(localtime), "\n";
-
-# redirect STDERR
-open SAVEERR, ">&STDERR";
-open(STDERR, ">$resultdir/stderr") || warn "Can't redirect STDERR:$!\n";
-
-$totalProcs = 0;		# number of clients started
-
-# iterate over every client in the testbed, complete the cmd and rsh
-if ($params{NT}) {		# single client on local host 
-    pathprint ("Starting clients (errors logged to $resultdir/stderr)\n");
-
-    foreach $section (@workload) {
-	next unless ($section->{sectionTitle} =~ /CLIENT/i);
-	my $tcount = ($section->{THREADS}) ? $section->{THREADS} : 1;
-
-
-	# Build the initial Mailclient command line
-	my $preCmd = ($section->{COMMAND})
-	    ? $section->{COMMAND} : $params{CLIENTCOMMAND};
-	$preCmd .= " -s -t $params{TIME} -f $params{FREQUENCY}";
-	$preCmd .= " -d" if ($params{DEBUG});
-	$preCmd .= " -r" if ($params{TELEMETRY});
-	$preCmd .= " -R $params{RAMPTIME}" if ($params{RAMPTIME});
-	$preCmd .= " -m $params{MAXERRORS}" if ($params{MAXERRORS});
-	$preCmd .= " -M $params{MAXBLOCKS}" if ($params{MAXBLOCKS});
-	$preCmd .= " -n 1 -N $tcount";
-	$preCmd .= ($params{USEGROUPS} && $section->{GROUP})
-	    ? " -H $section->{GROUP}" : " -H $cli";
-
-	my $stdout = "$tmpdir/localhost.out";
-
-	$totalProcs += $tcount;
-	do 'makeindex.pl' || warn "$@\n";	# html index
-
-	printf "\nTest duration: %d %s.  Rampup time: %d %s.  Number of clients: %d\n",
-	figureTimeNumber ($params{TIME}),
-	figureTimeUnits ($params{TIME}, "seconds"),
-	figureTimeNumber ($params{RAMPTIME}),
-	figureTimeUnits ($params{RAMPTIME}, "seconds"),
-	$totalProcs;
-
-	print STDERR  "localhost: cd $params{TEMPDIR}; $preCmd\n";
-
-	# Redirect STDIN, and STDOUT
-	#open SAVEIN, "<STDIN";
-	open STDIN, "<$resultdir/work.wld"
-	    || die "Coundn't open $resultdir/work.wld for input\n";
-	open SAVEOUT, ">&STDOUT";
-	open STDOUT, ">$stdout"
-	    || die "Couldnt open $stdout for output\n";
-
-	chdir $params{TEMPDIR} || die "Could not cd $params{TEMPDIR}: $!\n";
-	warn_system $preCmd;
-	close STDOUT;
-	open STDOUT, ">&SAVEOUT";
-	printf "Test done.\n";
-
-	chdir $cwd || die "Could not cd $cwd: $!\n";
-	last;			# only do the first one
-    }
-} else {			# not NT (forking works)
-
-    foreach $section (@workload) {	# do pre run commands
-	next unless ($section->{sectionTitle} =~ /PRETEST/i);
-	unless ($section->{COMMAND}) {
-	    print "PreTest with no Command for $section->{sectionParams}\n";
-	    next;
-	}
-
-	my $slist = $section->{sectionParams};
-	$slist =~ s/HOSTS=\s*//; # strip off initial bit
-	my $myCmd = $section->{COMMAND};
-	$myCmd =~ s/%f/$params{FREQUENCY}/; # fill in frequency variable
-	if ($myCmd =~ m/%c/o) { # dont force down if count is used
-	    $count = $testsecs / $params{FREQUENCY};
-	    $myCmd =~ s/%c/$count/; # fill in count variable
-	}
-	my $rsh = ($section->{RSH}) ? $section->{RSH} : $params{RSH};
-
-	foreach $cli (split /[\s,]/, $slist) {
-	    print "Running pre test command on $cli\n";
-	    open PRE, ">>$resultdir/$cli-pre.log";
-	    print PRE "========\n";
-	    print PRE "$myCmd\n";
-	    print PRE "========\n";
-	    close PRE;
-	    print STDERR "$cli: $myCmd\n"; # log the actual command
-	    forkproc ($rsh, $cli, $myCmd,
-		      "/dev/null", "$resultdir/$cli-pre.log");
-	}
-	foreach $cli (split /[\s,]/, $slist) {
-	    wait();		# run multiple PRETEST section sequentially
-	}
-    }
-
-    foreach $section (@workload) { # start monitors
-	next unless ($section->{sectionTitle} =~ /MONITOR/i);
-
-	my $slist = $section->{sectionParams};
-	$slist =~ s/HOSTS=\s*//; # strip off initial bit
-	my $myCmd = ($section->{COMMAND})
-	    ? $section->{COMMAND} : $params{MONITORCOMMAND};
-	my $forceDown = 0;
-	$myCmd =~ s/,/ /g;	# turn commas into spaces BACK COMPATIBIILITY
-	$myCmd =~ s/%f/$params{FREQUENCY}/; # fill in frequency variable
-
-	if ($myCmd =~ m/%c/o) { # dont force down if count is used
-	    $count = $testsecs / $params{FREQUENCY};
-	    $myCmd =~ s/%c/$count/; # fill in count variable
-	} else {
-	    $forceDown = 1;
-	}
-	my $rsh = ($section->{RSH}) ? $section->{RSH} : $params{RSH};
-
-	foreach $cli (split /[\s,]/, $slist) {
-	    printf "Monitoring on $cli\n";
-	    open PRE, ">>$resultdir/$cli-run.log";
-	    print PRE "========\n";
-	    print PRE "$myCmd\n";
-	    print PRE "========\n";
-	    close PRE;
-	    print STDERR "$cli: $myCmd\n"; # log the actual command
-	    $pid = forkproc ($rsh, $cli, $myCmd,
-			     "/dev/null", "$resultdir/$cli-run.log");
-	    push @forceDownPids, $pid if ($forceDown); # save PID for shutdown
-	}
-    }
-
-    print "Starting clients (errors logged to $resultdir/stderr)\n";
-    foreach $section (@workload) {
-	next unless ($section->{sectionTitle} =~ /CLIENT/i);
-	next unless ($section->{PROCESSES}); # unused client
-
-	my $slist = $section->{sectionParams};
-	$slist =~ s/HOSTS=\s*//; # strip off initial bit
-	my $rsh = ($section->{RSH}) ? $section->{RSH} : $params{RSH};
-	my $pcount = $section->{PROCESSES};
-	my $tcount = ($section->{THREADS}) ? $section->{THREADS} : 0;
-	my $tempdir;
-	if ($section->{TEMPDIR}) {
-	    $tempdir = $section->{TEMPDIR};
-	} elsif ($params{TEMPDIR}) {
-	    $tempdir = $params{TEMPDIR};
-	}
-	my $preCmd = "./" . (($section->{COMMAND})
-			     ? $section->{COMMAND} : $params{CLIENTCOMMAND});
-	$preCmd .= " -e" unless ($params{NOEVENTS});
-	$preCmd .= " -s -t $params{TIME} -f $params{FREQUENCY}";
-	$preCmd .= " -d" if ($params{DEBUG});
-	$preCmd .= " -r" if ($params{TELEMETRY});
-	$preCmd .= " -R $params{RAMPTIME}" if ($params{RAMPTIME});
-	if ($params{MAXERRORS}) {
-	    # distribute error count over processes, rounding up
-	    my $n = int (($params{MAXERRORS} + $clientProcCount - 1)
-			 / $clientProcCount);
-	    $n = 1 if ($n < 1);
-	    $preCmd .= " -m $n";
-	}
-	if ($params{MAXBLOCKS}) {
-	    # distribute block count over processes, rounding up
-	    my $n = int (($params{MAXBLOCKS} + $clientProcCount - 1)
-			 / $clientProcCount);
-	    $n = 1 if ($n < 1);
-	    $preCmd .= " -M $n";
-	}
-	$preCmd = "cd $tempdir; " . $preCmd if ($tempdir);
-	$preCmd =~ s!/!\\!g if ($section->{ARCH} eq "NT4.0");
-	$preCmd =~ s/;/&&/g if ($section->{ARCH} eq "NT4.0");
-
-        my $total_clients = $section->{CLIENTS};
-	my $residue = $total_clients - ($tcount * $pcount);
-	foreach $cli (split /[\s,]/, $slist) {
-	    my $stdout = getClientFilename ($cli, $section);
-	    my $myCmd = $preCmd;
- 	    $myCmd .= ($params{USEGROUPS} && $section->{GROUP})
-		? " -H $section->{GROUP}" : " -H $cli";
-	    my $foo = ($params{USEGROUPS} && $section->{GROUP})
-		? $section->{GROUP} : undef;
-
-	    if ($tcount) {
-		my $nt = $tcount;
-		if ($residue > 0) {
-		    ++$nt;
-		    $residue -= $pcount;
-		}
-		$myCmd .= " -n $pcount -N $nt";
-		printf "Starting $pcount x $nt on $cli%s\n", 
-		    $foo?" (group = $foo)":'';
-		$totalProcs += $pcount * $nt;
-	    } else {
-		my $np = $pcount;
-		if ($residue > 0) {
-		    ++$np;
-		    --$residue;
-		}
-		$myCmd .= " -n $np";
-		printf "Starting $np processes on $foo\n";
-		$totalProcs += $np;
-	    }
-
-	    print STDERR "$cli: $myCmd\n"; # log the actual command
-	    $pid = forkproc ($rsh, $cli, $myCmd,
-			     "$resultdir/work.wld", $stdout);
-	    push @localPids, $pid if ($cli =~ /^localhost$/i);
-	}
-    }
-
-    if (@localPids) {
-	# print "Trapping extraneous local signals\n";
-	# This doesnt trap quite right.  We dont die, but shell returns...
-	$SIG{ALRM} = 'IGNORE';	# in case we get an ALRM from the mailclient
-    }
-
-    printf "\nTest duration: %d %s.  Rampup time: %d %s.  Number of clients: %d\n",
-    figureTimeNumber ($params{TIME}),
-    figureTimeUnits ($params{TIME}, "seconds"),
-    figureTimeNumber ($params{RAMPTIME}),
-    figureTimeUnits ($params{RAMPTIME}, "seconds"),
-    $totalProcs;
-
-    do 'makeindex.pl' || warn "$@\n";	# html index
-
-    print "Waiting for test to finish.\n";
-    print "Waiting: ", scalar(localtime), "\n";
-    # wait for children to finish
-    $pid = wait();
-    if (@forceDownPids) {		# shut down after the first return.
-	print "Shutting down @forceDownPids\n";
-	kill 1 => @forceDownPids;	# sigHUP
-	# kill 9 => @forceDownPids;	# sigTERM
-    }
-    while ($pid != -1) {	# wait for all children
-	$pid = wait();
-    }
-
-    foreach $section (@workload) {	# do post test commands
-	next unless ($section->{sectionTitle} =~ /POSTTEST/i);
-	unless ($section->{COMMAND}) {
-	    print "PostTest with no command for $section->{sectionParams}\n";
-	    next;
-	}
-
-	my $slist = $section->{sectionParams};
-	$slist =~ s/HOSTS=\s*//; # strip off initial bit
-	my $myCmd = $section->{COMMAND};
-	$myCmd =~ s/%f/$params{FREQUENCY}/; # fill in frequency variable
-	if ($myCmd =~ m/%c/o) { # dont force down if count is used
-	    $count = $testsecs / $params{FREQUENCY};
-	    $myCmd =~ s/%c/$count/; # fill in count variable
-	}
-	my $rsh = ($section->{RSH}) ? $section->{RSH} : $params{RSH};
-
-	foreach $cli (split /[\s,]/, $slist) {
-	    printf "Running post test command on $cli\n";
-	    open PRE, ">>$resultdir/$cli-post.log";
-	    print PRE "========\n";
-	    print PRE "$myCmd\n";
-	    print PRE "========\n";
-	    close PRE;
-	    print STDERR "$cli: $myCmd\n"; # log the actual command
-	    forkproc ($rsh, $cli, $myCmd,
-		      "/dev/null", "$resultdir/$cli-post.log");
-	}
-	foreach $cli (split /[\s,]/, $slist) {
-	    wait();		# run multiple POSTTEST section sequentially
-	}
-    }
-
-}
-
-print STDERR "\nDone.\n";
-close(STDERR);
-open STDERR, ">&SAVEERR";
-
-print "\nClients done: ", scalar(localtime), "\n";
-print "Collecting results\n";
-
-do 'reduce.pl' || die "$@\n";	# generate graphs and sums
-
-print "Generating results pages\n";
-
-do 'report.pl' || die "$@\n";
-
-# Now display that data to console
-if ($params{VERBOSE}) {
-    fileShow ($resultstxt);
-    print "\n";
-}
-print "Processing done: ", scalar (localtime), "\n";
-
-pathprint ("\nResults (text):\t$resultstxt\n");
-pathprint (  "Results (HTML):\t$resultshtml\n");
-print        "Index of runs: \tfile://$cwd/$resultbase/index.html\n";
-
-
-# Now check for major problems in the stderr file
-if (open(RESULTSTXT, "$resultdir/stderr")) {
-    $ERRCNT=0;
-    while (<RESULTSTXT>) { $ERRCNT++; }
-    close(RESULTSTXT);
-    pathprint ("Error log ($ERRCNT lines):\t$resultdir/stderr\n");
-}
-
-{				# list user requested logging
-    my @logfiles = <$resultdir/*-pre.log>;
-    if (@logfiles) {
-	foreach $f (@logfiles) {
-	    print "Pre test log:   \t$f\n";
-	}
-    }
-    @logfiles = <$resultdir/*-run.log>;
-    if (@logfiles) {
-	foreach $f (@logfiles) {
-	    print "Monitoring log: \t$f\n";
-	}
-    }
-    @logfiles = <$resultdir/*-post.log>;
-    if (@logfiles) {
-	foreach $f (@logfiles) {
-	    print "Post test log:  \t$f\n";
-	}
-    }
-}
-
-print "Mailmaster done: ", scalar(localtime), "\n"; exit 0;

mozilla/mstone/bin/makeindex.pl

@@ -1,115 +0,0 @@
-#!/usr/bin/env perl
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is the Netscape Mailstone utility, 
-# released March 17, 2000.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation. Portions created by Netscape are
-# Copyright (C) 1997-2000 Netscape Communications Corporation. All
-# Rights Reserved.
-# 
-# Contributor(s):	Dan Christian <robodan@netscape.com>
-#			Marcel DePaolis <marcel@netcape.com>
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU Public License (the "GPL"), in which case the
-# provisions of the GPL are applicable instead of those above.
-# If you wish to allow use of your version of this file only
-# under the terms of the GPL and not to allow others to use your
-# version of this file under the NPL, indicate your decision by
-# deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL.  If you do not delete
-# the provisions above, a recipient may use your version of this
-# file under either the NPL or the GPL.
-#####################################################
-
-# usage: perl -Ibin makeindex.pl
-# Look at all the results files and create a top level index
-
-unless ($resultbase) {		# pick up systematic defaults, if needed
-    do 'args.pl'|| die $@;
-    parseArgs();		# parse command line
-}
-
-($testname = $params{WORKLOAD}) =~ s:conf/::;
-$testname =~ s:.wld::;
-
-my $entry = "";
-
-$entry .= "<TR><TD><BR><A HREF=\"$params{TSTAMP}/results.html\">$params{TSTAMP}</A></TD>";
-$entry .= "<TD>$testname</TD>\n";
-$entry .= "<TD>$params{TITLE}</TD>\n";
-$entry .= "<TD>$params{TIME}</TD>\n";
-$entry .= "<TD>$params{CLIENTCOUNT}</TD>\n";
-$entry .= "<TD><A HREF=\"$params{TSTAMP}/all.wld\">workload</A></TD>\n";
-$entry .= "<TD><A HREF=\"$params{TSTAMP}/stderr\">stderr</A></TD></TR>\n";
-
-if (-r "$resultbase/index.html") {
-    fileInsertAfter ("$resultbase/index.html",
-		     "^<!-- INSERT TAGS HERE",
-		     $entry);
-} else {			# create index from scratch
-    system ("cd $resultbase; ln -s ../doc .");
-    open(INDEXNEW, ">$resultbase/index.new") || 
-	die "Couldn't open $resultbase/index.new: $!";
-
-    print INDEXNEW <<END;
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
-<HTML>
-<TITLE>
-MailStone Results
-</TITLE>
-<HEAD>
-</HEAD>
-<BODY TEXT="#000000" BGCOLOR="#FFFFFF" LINK="#0000FF" VLINK="#FF0000" ALINK="#000088">
-<A HREF=$mailstoneURL>Mailstone documentation</A><BR>
-<TABLE BORDER=2>
-<CAPTION> Mozilla MailStone Results Index </CAPTION>
-<TR>
-<TH>Run</TH> <TH>Testname</TH> <TH> Title </TH>
-    <TH>Duration</TH> <TH>Clients</TH> <TH>Details</TH> <TH>Error log</TH> 
-</TR>
-<!-- INSERT TAGS HERE - DO NOT DELETE THIS LINE -->
-END
-
-    print INDEXNEW $entry;	# put in this entry
-
-    # Add in any existing entries
-    # get a list of all the results files
-    @resall = <$resultbase/*/results.html>;
-    # Write out all the links
-    # This could be rather slow, but we only do it when index.html is missing
-    foreach $filefull (reverse @resall) {
-	my $file = $filefull;
-	$file =~ s:$resultbase/::;
-	if ($file eq $params{TSTAMP}) { next; } # written above
-	my $dir = $file;
-	$dir =~ s:/results.html::;
-	# dont read in old workloads, it will override the current one
-	print INDEXNEW "<TR><TD><BR><A HREF=\"$file\">$dir</A></TD>\n";
-	print INDEXNEW "<TD>&nbsp;</TD><TD>&nbsp;</TD><TD>&nbsp;</TD><TD>&nbsp;</TD>\n";
-	print INDEXNEW "<TD><A HREF=\"$dir/all.wld\">workload</A></TD>\n";
-	print INDEXNEW "<TD><A HREF=\"$dir/stderr\">stderr</A></TD></TR>\n";
-    }
-
-    print INDEXNEW <<END;
-</TABLE>
-</BODY>
-</HTML>
-END
-    close (INDEXNEW);
-    fileBackup ("$resultbase/index.html");
-    rename ("$resultbase/index.new", "$resultbase/index.html");
-    print "Created $resultbase/index.html\n";
-}
-
-return 1;

mozilla/mstone/bin/makeusers.pl

@@ -1,414 +0,0 @@
-#!/usr/bin/perl
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is the Netscape Mailstone utility, 
-# released March 17, 2000.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation. Portions created by Netscape are
-# Copyright (C) 1997-2000 Netscape Communications Corporation. All
-# Rights Reserved.
-# 
-# Contributor(s):	Dan Christian <robodan@netscape.com>
-#			Marcel DePaolis <marcel@netcape.com>
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU Public License (the "GPL"), in which case the
-# provisions of the GPL are applicable instead of those above.
-# If you wish to allow use of your version of this file only
-# under the terms of the GPL and not to allow others to use your
-# version of this file under the NPL, indicate your decision by
-# deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL.  If you do not delete
-# the provisions above, a recipient may use your version of this
-# file under either the NPL or the GPL.
-#####################################################
-
-# script to create test user accounts for Netscape Messaging Server 3, 4
-#
-# Given a set of parameters, this script will create an LDIF file
-# for a number of email users of the form:
-#	test1, test2, test3, ...	
-#
-# usage: perl create_accounts_ldif [users] [broadcast] [postmaster] [ options ]
-#   [ -a allUsersAlias ]
-#   [ -b basedn ]
-#   [ -d maildomain ]
-#   [ -f firstaccount ]
-#   [ -k ]
-#   [ -m mailhost ]
-#   [ -n numaccounts ]
-#   [ -o outputfile ]
-#   [ -p password ]
-#   [ -s storebase ]
-#   [ -u username ]
-#   [ -v ]
-#   [ -w workload ]
-#   [ -x maxstores ]
-#   [ -3 ]
-#
-#perl -Ibin -- bin/makeusers.pl -d mailhost.example.com -m mailhost.example.com -b 'o=example.com' -u mailhost-test -n 100 -4 -o mailhost100.ldif
-
-# Create the ldif for the user accounts and/or broadcast, postmaster account.
-#
-# The ldif then must be added to 
-# the directory by hand (ldapadd, or through the dir admin server's
-# Database Mgmt->Add entries from an ldif file).  
-
-# A faster way
-# is to export the existing directory, append the results of
-# this script, and re-import the combined file.  This can be
-# done using the following Netscape Directory Server commands:
-#   stop-slapd
-#   db2ldif outputfile
-#   [ merge files ]
-#   ldif2db inputfile  # for DS4 you would typically use -noconfig
-#   start-sladp
-#
-
-print "Netscape Mailstone.\nCopyright (c) 1998,1999 Netscape Communications Corp.\n";
-
-# server to be used in the internet mail address of the users
-$domain = "newdomain.example.net";
-
-# machine that will act as the user's mailhost
-$mailhost = "mailhost.example.net";
-
-# base dn for the user entries, e.g. o=Ace Industry,c=US 
-$basedn = "o=Benchmark Lab, c=US";
-
-# name of broadcast account
-$bcastacct = "allusers";
-
-# name of broadcast account
-$postmasteraddr = "root\@localhost";
-
-# base name to build user names, will construct test0, test1, ...
-$username = "test%ld";
-
-# user passwds, in SHA format, the passwd below is 'netscape'
-#$userpassword =  "{SHA}aluWfd0LYY9ImsJb3h4afrI4AXk=";
-# these can also be imported as cleartext
-$userpassword = "netscape";
-
-# 0: no numbered passwords, 1: number with userID
-$maxpass = 0;
-
-# first account to use
-$firstaccount = 0;
-
-# number of user accounts to create ($first - $first+$num-1)
-$numaccounts = 1_000;
-
-# For larger systems, spreading the users over multiple partitions
-# is usually a good idea.  This example assumes you have
-# created partitions named p0, p1, etc.
-
-# store partition base name
-$storebase = "p%ld";
-
-# max store number (0 - maxstores-1), skip if 0
-$maxstores = 0;
-
-#default to msg 4 schemas
-$usemsg4schema = 1;
-
-#default to writing to stdout
-$outfile = STDOUT;
-
-# Initial UID for genpasswd
-$firstuid = 1000;
-
-sub usage {
-    print "Usage: perl -Ibin -- makeusers [users] [broadcast] [postmaster]\n";
-    print "\t[ -w workload ] [ -o outputFile ]\n";
-    print "\t[ -d mailDomain ] [ -m mailHost ] [ -b baseDN ]\n";
-    print "\t[ -u username ] [ -f firstAccount ] [ -n numAccounts ]\n";
-    print "\t[ -p password ] [ -k ]\n";
-    print "\t[ -s storeBase ] [ -x numStores ]\n";
-    print "\t[ -a allUsersAlias ] [ -t postmasterAddress ]\n";
-    print "\t[ -3 ]|[ -4 ]\n";
-}
-
-sub readWorkConfig {		# read the workload in, parse our params
-    my $workloadfile = shift || die "Workload file name expected\n";
-
-    do 'args.pl'|| die $@;
-    readWorkloadFile ($workloadfile, \@workload)
-	|| die "Error reading workload: $@\n";
-				# assign all the parameters from the config
-    $mailhost = $defaultSection->{SERVER}
-	if ($defaultSection->{SERVER});
-    if ($defaultSection->{ADDRESSFORMAT}) {
-	my $addr = $defaultSection->{ADDRESSFORMAT};
-	$addr =~ s/^.*@//;
-	$domain = $addr;
-    }
-    if ($defaultSection->{LOGINFORMAT}) {
-	my $user = $defaultSection->{LOGINFORMAT};
-	#$user =~ s/%ld$//;
-	$username = $user;
-    }
-    $numaccounts = $defaultSection->{NUMLOGINS}
-        if ($defaultSection->{NUMLOGINS});
-    $firstaccount = $defaultSection->{FIRSTLOGINS}
-        if ($defaultSection->{FIRSTLOGINS});
-
-    $userpassword = $defaultSection->{PASSWDFORMAT}
-    if ($defaultSection->{SERVER});
-
-    if ($userpassword =~ m/%ld/) { # see if numbered passwords
-	$maxpass++;
-	#$userpassword =~ s/%ld//g;
-    }
-
-    # what isnt set: basedn, storebase, maxstores, usemsg4schema
-}
-
-while (@ARGV) {
-    $arg = shift(@ARGV);
-
-    if ($arg =~ /^-a$/i) {	# allusers (broadcast) user name
-	$bcastacct = shift(@ARGV);
-	next;
-    }
-    if ($arg =~ /^-b$/i) {	# LDAP base DN
-	$basedn = shift(@ARGV);
-	next;
-    }
-    if ($arg =~ /^-d$/i) {	# mail domain
-	$domain = shift(@ARGV);
-	next;
-    }
-    if ($arg =~ /^-f$/i) {	# initial account
-	$firstaccount = shift(@ARGV);
-	next;
-    }
-    if ($arg =~ /^-k$/i) {	# use numbered passwords
-	$maxpass++;
-	next;
-    }
-    if ($arg =~ /^-h$/i) {	# help
-	usage();
-	exit 0;
-    }
-    if ($arg =~ /^-m$/i) {	# mail server name
-	$mailhost = shift(@ARGV);
-	next;
-    }
-    if ($arg =~ /^-n$/i) {	# number of accounts
-	$numaccounts = shift(@ARGV);
-	next;
-    }
-    if ($arg =~ /^-o$/i) {	# name output file
-	my $fname = shift || die "File name expected\n";
-	open OUTFILE, ">$fname" || die "Error opening file $@\n";
-	$outfile = OUTFILE;
-	next;			# use msg4 user admin schema
-    }
-    if ($arg =~ /^-p$/i) {	# password
-	$userpassword = shift(@ARGV);
-	next;
-    }
-    if ($arg =~ /^-s$/i) {	# base name for above
-	$storebase = shift(@ARGV);
-	next;
-    }
-    if ($arg =~ /^-t$/i) {	# postmaster address
-	$postmasteraddress = shift(@ARGV);
-	next;
-    }
-    if ($arg =~ /^-u$/i) {	# user name base
-	$username = shift(@ARGV);
-	next;
-    }
-    if ($arg =~ /^-v$/i) {	# be verbose
-	$verbose++;
-	next;
-    }
-    # do this when read, so that later switches can override
-    if ($arg =~ /^-w$/i) {	# get a workload file
-	readWorkConfig (shift(@ARGV));
-	next;
-    }
-    if ($arg =~ /^-x$/i) {	# number of partitions (0 to skip)
-	$maxstores = shift(@ARGV);
-	next;
-    }
-    if ($arg =~ /^-3$/) {	# no msg4 schema
-	$usemsg4schema = 0;
-	next;
-    }
-    if ($arg =~ /^-4$/) {	# use msg4 user admin schema
-	$usemsg4schema = 1;
-	next;
-    }
-    if ($arg =~ /^users$/i) {
-	$genusers++;
-	next;
-    }
-    if ($arg =~ /^broadcast$/i) {
-	$genbroadcast++;
-	next;
-    }
-    if ($arg =~ /^passwd$/i) {
-	$genpasswd++;
-	next;
-    }
-    if ($arg =~ /^postmaster$/i) {
-	$genpostmaster++;
-	next;
-    }
-
-    print STDERR "Unknown argument $arg.  Use -h for help.\n";
-    exit 1;
-}
-
-unless (($genusers) || ($genbroadcast) || ($genpasswd) || ($genpostmaster)) {
-    print STDERR "Must specify mode [users] [broadcast] [postmaster] ...\n";
-    usage();
-    exit 0;
-}
-
-# specify number fields, if needed
-unless ($username =~ /%ld/) {
-    $username .= '%ld';
-}
-if (($maxpass) && !($userpassword =~ /%ld/)) {
-    $userpassword .= '%ld';
-}
-if (($maxstores) && !($storename =~ /%ld/)) {
-    $storename .= '%ld';
-}
-
-if ($verbose) {
-    print STDERR "Here is the configuration:\n";
-    print STDERR "baseDN='$basedn' \t";
-    print STDERR (($usemsg4schema) ? "-4\n" : "-3\n");
-    print STDERR "mailHost='$mailhost' \tdomain='$domain'\n";
-    print STDERR "userName='$username' \tnumAccounts=$numaccounts \tfirstAccount=$firstaccount\n";
-    print STDERR "userPassword='$userpassword'\n";
-    print STDERR "allUsersAccount='$bcastacct'\n" if ($genbroadcast);
-    print STDERR "postmasterAddress='$postmasterAddress'\n" if ($genpostmaster);
-}
-
-
-if ($genusers) {		# Create the user accounts
-    $storenum=0;
-    for ($i = $firstaccount; $i < $firstaccount+$numaccounts; $i++) {
-	# build user account name
-	my $acctname = $username;
-	$acctname =~ s/%ld/$i/;	# insert user number
-	my $password = $userpassword;
-	$password =~ s/%ld/$i/;	# insert user number
-
-
-
-	# MAKE SURE THERE ARE NO TRAILING SPACES IN THE LDIF
-	my $extradata = "";
-
-	if ($maxstores > 0) {	# assign them to a store
-	    my $storename = $storebase;
-	    $storename =~ s/%ld/$storenum/;
-	    $extradata .= "mailmessagestore: $storename\n";
-	    $storenum++;
-	    $storenum=0 if ($storenum >= $maxstores);
-	}
-
-	$extradata .= "objectclass: nsMessagingServerUser\n"
-	    if ($usemsg4schema);
-
-print $outfile <<END;
-dn: uid=$acctname, $basedn
-userpassword: $password
-givenname: $acctname
-sn: $acctname
-cn: $acctname
-uid: $acctname
-mail: $acctname\@$domain
-mailhost: $mailhost
-maildeliveryoption: mailbox
-objectclass: top
-objectclass: person
-objectclass: organizationalPerson
-objectclass: inetOrgPerson
-objectclass: mailRecipient
-$extradata
-END
-    }
-}
-
-if ($genbroadcast) {		# Create the broadcast account
-    # MAKE SURE THERE ARE NO TRAILING SPACES IN THE LDIF
-    my $password = $userpassword;
-    $password =~ s/%ld//;	# strip user number
-    # initial part
-    print $outfile <<END;
-dn: uid=$bcastacct, $basedn
-userpassword: $password
-givenname: $bcastacct
-sn: $bcastacct
-cn: $bcastacct
-uid: $bcastacct
-mail: $bcastacct\@$domain
-mailhost: $mailhost
-maildeliveryoption: forward
-END
-
-    # now put in each address
-    for ($i = $firstaccount; $i < $firstaccount+$numaccounts; $i++) {
-	# build user account name
-	my $acctname = $username;
-	$acctname =~ s/%ld/$i/;	# insert user number
-
-	print $outfile "mailforwardingaddress: $acctname\@$domain\n";
-    }
-
-    # final part
-    print $outfile <<END;
-objectclass: top
-objectclass: person
-objectclass: organizationalPerson
-objectclass: inetOrgPerson
-objectclass: mailRecipient
-
-END
-}
-
-if ($genpostmaster) {		# Create the postmaster account
-    # MAKE SURE THERE ARE NO TRAILING SPACES IN THE LDIF
-    print $outfile <<END;
-dn: cn=postmaster, $basedn
-cn: postmaster
-mail: postmaster\@$domain
-mailalternateaddress: postmaster\@$mailhost
-mgrprfc822mailmember: $postmasterAddress
-objectclass: top
-objectclass: mailGroup
-objectclass: groupOfUniqueNames
-
-END
-}
-
-# mixing passwd output with the ldif output above would be quite silly
-if ($genpasswd) {		# Create passwd entries for makeusers
-    for ($i = $firstaccount; $i < $firstaccount+$numaccounts; $i++) {
-	# build user account name
-	my $acctname = $username;
-	$acctname =~ s/%ld/$i/;	# insert user number
-	my $password = $userpassword;
-	$password =~ s/%ld/$i/;	# insert user number
-	my $uid = $firstuid + $i;
-	print $outfile "$acctname:$password:$uid:$uid:Mail user $acctname:/home/$acctname:/bin/sh\n";
-    }
-}
-
-exit 0;

mozilla/mstone/bin/nsarch

@@ -1,147 +0,0 @@
-#!/bin/sh
-# 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 the Netscape Mailstone utility, 
-# released March 17, 2000.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation. Portions created by Netscape are
-# Copyright (C) 1999-2000 Netscape Communications Corporation. All
-# Rights Reserved.
-# 
-# Contributor(s):	Dan Christian <robodan@netscape.com>
-#			Marcel DePaolis <marcel@netcape.com>
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU Public License (the "GPL"), in which case the
-# provisions of the GPL are applicable instead of those above.
-# If you wish to allow use of your version of this file only
-# under the terms of the GPL and not to allow others to use your
-# version of this file under the NPL, indicate your decision by
-# deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL.  If you do not delete
-# the provisions above, a recipient may use your version of this
-# file under either the NPL or the GPL.
-#####################################################
-
-# Figure out standard system names
-
-UNAME_REPORTS=`uname`
-UNAME_OS_ARCH=`uname -s`
-UNAME_OS_RELEASE=`uname -r`
-
-OS_ARCH=$UNAME_OS_ARCH
-OS_RELEASE=$UNAME_OS_RELEASE
-OS_CONFIG=${OS_ARCH}${OS_RELEASE}
-
-if [ "$UNAME_OS_ARCH" = "SunOS" ]; then
-  PROCESSOR=`uname -p`
-  if [ "$PROCESSOR" = "i386" ]; then
-    BUILD_ARCH=x86
-  else
-    BUILD_ARCH=SPARC
-  fi
-  BUILD_OS=SOLARIS
-  if [ "$UNAME_OS_RELEASE" = "5.5" ]; then
-    BUILD_VER=2.5
-  elif [ "$UNAME_OS_RELEASE" = "5.5.1" ]; then
-    BUILD_VER=2.5
-  elif [ "$UNAME_OS_RELEASE" = "5.6" ]; then
-    BUILD_VER=2.6
-  elif [ "$UNAME_OS_RELEASE" = "5.7" ]; then
-    BUILD_VER=7
-  elif [ "$UNAME_OS_RELEASE" = "5.8" ]; then
-    BUILD_VER=8
-  fi
-
-elif [ "$UNAME_OS_ARCH" = "HP-UX" ]; then
-  BUILD_ARCH=HPPA
-  BUILD_OS=$UNAME_OS_ARCH
-  BUILD_VER=$OS_RELEASE
-
-elif [ "$UNAME_OS_ARCH" = "AIX" ]; then
-  BUILD_ARCH=POWER
-  BUILD_OS=$UNAME_OS_ARCH
-  BUILD_VER=`uname -v`.`uname -r`
-  OS_CONFIG=${BUILD_OS}${BUILD_VER}
-
-elif [ "$UNAME_OS_ARCH" = "OSF1" ]; then
-  BUILD_ARCH=ALPHA
-  BUILD_OS=$UNAME_OS_ARCH
-  BUILD_VER=$OS_RELEASE
-
-elif [ "$UNAME_OS_ARCH" = "IRIX64" -o "$UNAME_OS_ARCH" = "IRIX" ]; then
-  BUILD_ARCH=MIPS
-  BUILD_OS=IRIX
-  BUILD_VER=$OS_RELEASE
-  OS_CONFIG=${BUILD_OS}${OS_RELEASE}
-
-elif [ "$UNAME_OS_ARCH" = "BSD/386" ]; then
-  BUILD_ARCH=x86
-  BUILD_OS=BSDI
-  BUILD_VER=$OS_RELEASE
-
-elif [ "$UNAME_OS_ARCH" = "FreeBSD" ]; then
-  BUILD_ARCH=`uname -p`
-  BUILD_OS=$UNAME_OS_ARCH
-  BUILD_VER=$UNAME_OS_RELEASE
-  if [ "$BUILD_ARCH" = "i386" ]; then
-    BUILD_ARCH=x86
-  fi
-  OS_CONFIG=${BUILD_OS}${BUILD_VER}_${BUILD_ARCH}
-
-elif [ "$UNAME_OS_ARCH" = "SCO_SV" ]; then
-  BUILD_ARCH=x86
-  BUILD_OS=SCO
-  BUILD_VER=$OS_RELEASE
-
-elif [ "$UNAME_OS_ARCH" = "UNIX_SV" ]; then
-  # Check for braindamage
-  grep NCR /etc/bcheckrc > /dev/null 2>&1
-  BUILD_ARCH=x86
-  if [ $? = 0  ]; then
-      BUILD_OS=NCR
-  else
-      BUILD_OS=UNIXWARE
-  fi
-  BUILD_VER=$OS_RELEASE
-
-elif [ "$UNAME_OS_ARCH" = "NEWS-OS" ]; then
-  BUILD_ARCH=`uname -p`
-  BUILD_OS=SONY
-  BUILD_VER=$OS_RELEASE
-
-elif [ "$UNAME_OS_ARCH" = "UNIX_System_V" ]; then
-  BUILD_ARCH=`uname -p`
-  BUILD_OS=NEC
-  BUILD_VER=$OS_RELEASE
-
-elif [ $UNAME_OS_ARCH = Linux ]; then
-  BUILD_ARCH=`uname -m`
-  if [ -n "`echo $BUILD_ARCH | grep -e '86$'`" ] ; then
-	  BUILD_ARCH=x86
-  fi
-  BUILD_OS=$UNAME_OS_ARCH
-  BUILD_VER=`echo $OS_RELEASE | cut -f1,2 -d.`
-  OS_CONFIG=${BUILD_OS}${BUILD_VER}_${BUILD_ARCH}
-fi
-
-case "$UNAME_OS_ARCH" in
-SINIX*|ReliantUNIX*)
-  BUILD_ARCH=`uname -p`
-  BUILD_OS="ReliantUNIX"
-  BUILD_VER=$OS_RELEASE
-  ;;
-esac
-
-#PLATFORM=${BUILD_ARCH}_${BUILD_OS}_${BUILD_VER}
-#echo $PLATFORM
-echo $OS_CONFIG

mozilla/mstone/bin/process

@@ -1,70 +0,0 @@
-#!/bin/sh
-# The conZtents 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 the Netscape Mailstone utility, 
-# released March 17, 2000.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation. Portions created by Netscape are
-# Copyright (C) 1999-2000 Netscape Communications Corporation. All
-# Rights Reserved.
-# 
-# Contributor(s):	Dan Christian <robodan@netscape.com>
-#			Marcel DePaolis <marcel@netcape.com>
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU Public License (the "GPL"), in which case the
-# provisions of the GPL are applicable instead of those above.
-# If you wish to allow use of your version of this file only
-# under the terms of the GPL and not to allow others to use your
-# version of this file under the NPL, indicate your decision by
-# deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL.  If you do not delete
-# the provisions above, a recipient may use your version of this
-# file under either the NPL or the GPL.
-#####################################################
-
-# re-process a data run
-# by default, use the most recent one
-# Usage: process
-# or
-# Usage: process TIMESTAMP [args...]
-# or
-# Usage: process results/TIMESTAMP [args...]
-
-if [ ! -x perl/bin/perl -o ! -f .license ] ; then # see if setup was ever run
-   echo "Critical files are missing.  Run setup."
-   exit 2;
-fi
-
-if [ $# -lt 1 ] ; then		# do most recent run
-	# since the directories are time stamps with fixed fields,
-	#  alphabetical order is also time order
-	dir=`ls -d results/[0-9]*.[0-9]* | tail -1`
-else				# use specified run
-	if  [ -d results/$1 ] ; then	#  timestamp
- 	    dir=results/$1
-	    shift
-	elif  [ -d $1 ] ; then	# results/timestamp
- 	    dir=$1
-	    shift
-	fi
-fi
-
-if [ -n "$dir" ] ; then
-	if  [ -f $dir/all.wld ] ; then	# unified workload file
-		perl/bin/perl -Ibin -- bin/process.pl -w $dir/all.wld "$@"
-	else			# BACK COMPATIBILITY form
-		perl/bin/perl -Ibin -- bin/process.pl -c $dir/config.cfg "$@"
-	fi
-else				# pass in whatever they gave us
-	perl/bin/perl -Ibin -- bin/process.pl "$@"
-fi

mozilla/mstone/bin/process.pl

@@ -1,371 +0,0 @@
-#!/usr/bin/env perl
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is the Netscape Mailstone utility, 
-# released March 17, 2000.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation. Portions created by Netscape are
-# Copyright (C) 1997-2000 Netscape Communications Corporation. All
-# Rights Reserved.
-# 
-# Contributor(s):	Dan Christian <robodan@netscape.com>
-#			Marcel DePaolis <marcel@netcape.com>
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU Public License (the "GPL"), in which case the
-# provisions of the GPL are applicable instead of those above.
-# If you wish to allow use of your version of this file only
-# under the terms of the GPL and not to allow others to use your
-# version of this file under the NPL, indicate your decision by
-# deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL.  If you do not delete
-# the provisions above, a recipient may use your version of this
-# file under either the NPL or the GPL.
-#####################################################
-
-# Generate reports independently of mailmaster
-# Can be used during a run or after mailmaster has finished
-
-print "Netscape Mailstone\n";
-print "Copyright (c) 1997-2000 Netscape Communications Corp.\n";
-
-# this parses the command line and config file
-do 'args.pl'|| die $@;
-parseArgs();			# parse command line
-setConfigDefaults();		# pick up any missing defaults
-
-$resultdir = "$resultbase/$params{TSTAMP}";
-$tmpdir = "$tmpbase/$params{TSTAMP}";
-$resultstxt = "$resultdir/results.txt";
-$resultshtml = "$resultdir/results.html";
-
-if ($params{TESTBED}) {		# BACK COMPATIBILITY
-    $params{TESTBED} = "$resultdir/testbed.tbd"; # use saved testbed
-    # open the saved testbed conf file
-    readTestbedFile($params{TESTBED}) || die "$@\n";
-}
-
-# Convert old style to new.  Write the complete inclusive workload
-writeWorkloadFile ("$resultdir/all.wld", \@workload)
-    unless ((-r "$resultdir/all.wld") || (-r "$resultdir/all.wld.gz"));
-
-$testsecs = figureTimeSeconds ($params{TIME}, "minutes");
-
-print "Starting data reduction\n";
-
-sub readClientCSV {
-    my $file = shift;
-    my @fields;
-    my $line;
-
-    print "Reading client summary: $file\n";
-    open(CSV, "<$file")	||	# Summary of all clients
-	open(CSV, "gunzip -c $file.gz |") || 
-	    return 0;		# failed
-
-    # Title line: Verify that arguments are in the same order
-    $line = <CSV>;
-    unless ($line) {
-	print "readClientCSV: Error reading $file. \n";
-	return 0;
-    }
-    chomp $line;		# strip newline
-    @fields = split /,/, $line; # turn into an array
-    my $cli = shift @fields;	# pull off client header
-    my $cn = shift @fields;	# pull off num header
-    my $pro = shift @fields;	# pull off protocol header
-
-    # Client array, per variable, per protocol
-    foreach $p (@protocols) {
-	# This hash will hold the timers
-	$clidata{$p} = ArrayInstance->new();
-	foreach $t (@timers) {
-	    # This hash will hold the values in the timer
-	    $clidata{$p}->{$t} = ArrayInstance->new();
-	    foreach $f (@{$timerFields{$t}}) {
-		# This hash that will hold the actual values per client
-		$clidata{$p}->{$t}->{$f} = ArrayInstance->new();
-	    }
-	}
-	foreach $t (@scalarClientFields) { # non-timer fields
-	    # This hash that will hold the actual values per client
-	    $clidata{$p}->{$t} = ArrayInstance->new();
-	}
-    }
-
-    foreach $f (@commClientFields) { # proto independent
-	my $v = shift @fields;
-	if ($v !~ m/$f/i) {
-	    print "readClientCSV: Protocol order mismatch '$v', '$f' \n";
-	    return 0;
-	}
-    }
-    foreach $t (@timers) {	# timers
-	foreach $f (@{$timerFields{$t}}) {
-	    my $v = shift @fields;
-	    if ($v !~ m/$t:$f/i) {
-		print "readClientCSV: Protocol order mismatch '$v', '$t:$f' \n";
-		return 0;
-	    }
-	}
-    }
-    foreach $t (@scalarClientFields) { # scalars
-	my $v = shift @fields;
-	if ($v !~ m/$t/i) {
-	    print "readClientCSV: Protocol order mismatch '$v', '$t' \n";
-	    return 0;
-	}
-    }
-
-    # Now read actual data
-    while (<CSV>) {
-	chomp;			# strip newline
-	@fields = split /,/;	# turn into an array
-	my $cli = shift @fields; # pull off client header
-	my $cn = shift @fields;	# pull off num header
-	my $p = shift @fields;	# pull off protocol header
-	my $cp = $clidata{$p};
-
-	# Create the needed finals arrays
-	unless ($finals{$p}) {
-	    #print "Creating finals{$p}\n"; # DEBUG
-	    $finals{$p} = ArrayInstance->new();
-	    foreach $t (@timers) {
-		$finals{$p}->{$t} = ArrayInstance->new();
-	    }
-	}
-
-	foreach $f (@commClientFields) { # proto independent
-	    $cliGen{$f}->{$cn} = shift @fields;
-	}
-	foreach $t (@timers) {	# timers
-	    foreach $f (@{$timerFields{$t}}) {
-		$cp->{$t}->{$f}->{$cn} = shift @fields;
-		$finals{$p}->{$t}->{$f} += $cp->{$t}->{$f}->{$cn};
-	    }
-	}
-	foreach $t (@scalarClientFields) { # scalars
-	    $cp->{$t}->{$cn} = shift @fields;
-	    $finals{$p}->{$t} += $cp->{$t}->{$cn};
-	}
-
-	foreach $section (@workload) { # find thread count for this client
-	    next unless ($section->{sectionTitle} =~ /CLIENT/i);
-	    next unless ($section->{sectionParams} =~ /$cli/);
-	    #print "Process $cli has threads $section->{THREADS}\n";
-	    $reportingClients += ($section->{THREADS})
-		? $section->{THREADS} : 1;
-	    last;
-	}
-    }
-
-    close (CSV);
-    return 1;			# success
-}
-
-sub readTimeCSV {
-    my $file = shift;
-    my $p = shift;
-    my $gp = $graphs{$p};
-    my $line;
-
-    print "Reading time $p summary: $file\n";
-    open(CSV, "<$file")	||	# Summary over time
-	open(CSV, "gunzip -c $file.gz |") || 
-	    return 0;		# failed
-
-    # Verify that arguments are in the same order
-    $line = <CSV>;
-    unless ($line) {
-	print "readTimeCSV: Error reading $file. \n";
-	return 0;
-    }
-    chomp $line;		# strip newline
-    @fields = split /,/, $line;
-    my $t = shift @fields;	# pull off time header
-    foreach $t (@timers) {
-	foreach $f (@{$timerFields{$t}}) {
-	    my $v = shift @fields;
-	    if ($v !~ m/$t:$f/i) {
-		print "readTimeCSV: Protocol order mismatch '$v', '$t:$f' \n";
-		return 0;
-	    }
-	}
-    }
-    foreach $t (@scalarGraphFields) {
-	my $v = shift @fields;
-	if ($v !~ m/$t/i) {
-	    print "readTimeCSV: Protocol order mismatch '$v', '$t' \n";
-	    return 0;
-	}
-    }
-    while (<CSV>) {
-	chomp;
-	#print "LINE: $_\n";
-	@fields = split /,/;
-	my $tm = shift @fields;	# pull off time header
-	#print "t=$t ";
-	foreach $t (@timers) {
-	    foreach $f (@{$timerFields{$t}}) {
-		$gp->{$t}->{$f}->{$tm} = shift @fields;
-		#print "$v=$gp->{$v}->{$tm} ";
-	    }
-	}
-	foreach $t (@scalarGraphFields) {
-	    $gp->{$t}->{$tm} = shift @fields;
-	    #print "$v=$gp->{$v}->{$tm} ";
-	}
-	#print "\n";
-    }
-    close (CSV);
-    return 1;			# success
-}
-
-sub loadCSV {
-    my @csvs = <$resultdir/time-*.csv>;
-    @csvs = <$resultdir/time-*.csv.gz> unless (@csvs);
-    return 0 unless (@csvs);	# no time.csv files
-
-    # stuff normally done from reduce.pl (should all be in protoconf?)
-    # Basic sanity check
-    return 0 unless ($testsecs > 0);
-
-    $startTime = 0;			# these are timeInSeconds/$timeStep
-    $endTime = 0;
-
-    # keep graphs with somewhat more precision than sample rate;
-    $timeStep = int ($params{FREQUENCY} / 2);
-    if ($timeStep < 1) { $timeStep = 1; }
-
-    # global results initialization
-    $reportingClients = 0;
-    $totalProcs = 0;		# number of clients started
-
-    foreach $f (@commClientFields) { # protocol independent fields
-	$cliGen{$f} = ArrayInstance->new();
-    }
-
-    return 0 unless (readClientCSV ("$resultdir/clients.csv")); # client info
-
-    foreach $c (@csvs) { # read time info
-	$c =~ s/.gz$//;		# strip .gz extension
-	my $p = $c;		# strip down to protocol portion
-	$p =~ s/$resultdir\/time-//;
-	$p =~ s/.csv$//;
-	return 0 unless (readTimeCSV ($c, $p));
-    }
-
-    return 0 unless ($reportingClients > 0);
-
-    foreach $section (@workload) {
-	next unless ($section->{sectionTitle} =~ /CLIENT/i);
-	my $slist = $section->{sectionParams};
-	$slist =~ s/HOSTS=\s*//; # strip off initial bit
-	my @hlist = split /[\s,]/, $slist;
-	my $hcnt = (1 + $#hlist);
-	my $pcount = $section->{PROCESSES};
-	my $tcount = ($section->{THREADS}) ? $section->{THREADS} : 1;
-
-	$totalProcs += $pcount * $tcount * $hcnt;
-    }
-
-    # Find time extent for a key graph
-    ($startTime, $endTime) = dataMinMax ("blocks", \@protocols,
-					 $startTime, $endTime);
-
-    $realTestSecs = ($endTime - $startTime) * $timeStep;
-    $realTestSecs = 1 unless ($realTestSecs); # in case of small MaxBlocks
-    printf "Reported test duration %d seconds with %d second resolution\n",
-    $realTestSecs, $timeStep;
-    $realTestSecs = $testsecs if ($realTestSecs > $testsecs);
-
-    my @newProtos;	# figure real protocol list
-    foreach $p (@protocols) {
-	my $gp = $graphs{$p};
-	my $numValid = 0;
-	# See if there is real data here
-	CHECKVAL: foreach $t (@timers) {
-	    foreach $f (@{$timerFields{$t}}) {
-		my $vp = $gp->{$t}->{$f};
-		next unless ($vp);	# no data
-		next unless (scalar %$vp); # redundant???
-
-		#print "Checking: $p $t $f => ENTRIES\n";
-		$numValid++;
-		last CHECKVAL;
-	    }
-	}
-	($numValid > 0) || next;
-
-	push @newProtos, $p;
-    }
-    # update protocol list to only have what was used
-    @protocols = @newProtos;
-    @protocolsAll = @newProtos;
-    push @protocolsAll, "Total";
-}
-
-
-my $doFull = 1;			# re-processing is currently broken
-
-#  if (!((-f "$resultdir/clients.csv")
-#        || (-f "$resultdir/clients.csv.gz"))) { # no processing yet
-#      $doFull = 1;
-#  } else {			# see if any source is newer than csv
-#      foreach $section (@workload) {
-#  	next unless ($section->{sectionTitle} =~ /CLIENT/i);
-#  	my $slist = $section->{sectionParams};
-#  	$slist =~ s/HOSTS=\s*//; # strip off initial bit
-#  	foreach $cli (split /[\s,]/, $slist) {
-#  	    my $fname = getClientFilename ($cli, $section);
-#  	    if ((-r $fname)	# raw source exists
-#  		&& ((-M "$resultdir/clients.csv")
-#  		    > (-M $fname))) { # newer
-#  		#print "$fname is newer than $resultdir/clients.csv\n";
-#  		$doFull++;
-#  		last;
-#  	    }
-#  	}
-#      }
-#  }
-
-#  unless ($doFull) {		# do CSV load
-#      # if this is a csv only run, then these may not exist yet
-#      mkdir ("$tmpbase", 0775);
-#      mkdir ("$tmpdir", 0775);
-#      unless (-r "$resultbase/index.html") {
-#  	do 'makeindex.pl' || warn "$@\n";	# html index
-#      }
-
-#      $doFull = 1 unless (loadCSV); # if CSV fails, fall back to full processing
-#  }
-
-if ($doFull) {
-    do 'reduce.pl' || die "$@\n";
-}
-
-
-print "Generating results pages:\t", scalar (localtime), "\n";
-
-do 'report.pl' || die "$@\n";
-
-# Now display that data to console
-if ($params{VERBOSE}) {
-    fileShow ($resultstxt);
-    print "\n";
-}
-
-pathprint ("\nResults (text):\t$resultstxt\n");
-pathprint (  "Results (HTML):\t$resultshtml\n");
-print        "Index of runs: \tfile://$cwd/$resultbase/index.html\n";
-
-print "Process done:\t", scalar (localtime), "\n";

mozilla/mstone/bin/protoconf.pl

@@ -1,158 +0,0 @@
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is the Netscape Mailstone utility, 
-# released March 17, 2000.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation. Portions created by Netscape are
-# Copyright (C) 1997-2000 Netscape Communications Corporation. All
-# Rights Reserved.
-# 
-# Contributor(s):	Dan Christian <robodan@netscape.com>
-#			Marcel DePaolis <marcel@netcape.com>
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU Public License (the "GPL"), in which case the
-# provisions of the GPL are applicable instead of those above.
-# If you wish to allow use of your version of this file only
-# under the terms of the GPL and not to allow others to use your
-# version of this file under the NPL, indicate your decision by
-# deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL.  If you do not delete
-# the provisions above, a recipient may use your version of this
-# file under either the NPL or the GPL.
-#####################################################
-
-# This define the structures that hold summary, client, and graph data,
-
-# This sets the names used for display.  Can be internationalized.
-# All top level names are here (both timers and scalars).
-# Any unlisted names will map to themselves.
-%timerNames
-    = (
-       #internal name,	Printed name
-       "total",		"total",
-       "conn",		"connect",
-       "reconn",	"reconnect",
-       "banner",	"banner",
-       "login",		"login",
-       "cmd",		"command",
-       "submit",	"submit",
-       "retrieve",	"retrieve",
-       "logout",	"logout",
-       "idle",		"idle",
-       "connections",	"connections",
-       "blocks",	"blocks",
-       );
-
-# This sets the names used for display.  Can be internationalized.
-%fieldNames
-    = (
-       #internal name,	Printed name
-       "Try",		"Try",
-       "Error",		"Error",
-       "BytesR",	"BytesR",
-       "BytesW",	"BytesW",
-       "Time",		"Time",
-       "TimeMin",	"TMin",
-       "TimeMax",	"TMax",
-       "Time2",		"TStd",
-       );
-
-
-# hold time graphs for each protocol
-%graphs = ();
-
-# Totals are done during plotting, if needed
-%finals = ();			# create base finals hash
-
-# These are sections that dont get passed to mailclient (case insensitive)
-@scriptWorkloadSections
-    = (
-       "Config",		# special, references %params
-       "Client",		# testbed client(s)
-       "Graph",			# graph generation
-       "Setup",			# things to run with ./setup
-       "Startup",		# things to run before test
-       "Monitor",		# other performance monitoring
-       "PreTest",		# things to run before test
-       "PostTest",		# things to run after test
-       );
-
-# These are sections that arent protocols.  Anything else must be.
-@nonProtocolSections
-    = (@scriptWorkloadSections, ("Default"));
-
-# These are the known workload parameters (as they will print)
-# These are coerced to upper case internally (do NOT internationize)
-@workloadParameters
-    = (
-       "addressFormat",
-       "arch",
-       "blockID",
-       "blockTime",
-       "chartHeight",
-       "chartPoints",
-       "chartWidth",
-       "clientCount",
-       "command",
-       "comments",
-       "file",
-       "firstAddress",
-       "firstLogin",
-       "frequency",
-       "gnuplot",
-       "group",
-       "idleTime",
-       "leaveMailOnServer",
-       "loginFormat",
-       "loopDelay",
-       "numAddresses",
-       "numLogins",
-       "numLoops",
-       "numRecips",
-       "mailClient",
-       "maxBlocks",
-       "maxClients",
-       "maxErrors",
-       "maxThreads",
-       "maxProcesses",
-       "passwdFormat",
-       "processes",
-       "rampTime",
-       "rcp",
-       "rsh",
-       "sequentialAddresses",
-       "sequentialLogins",
-       "server",
-       "smtpMailFrom",
-       "sysConfig",
-       "threads",
-       "telemetry",
-       "tempDir",
-       "time",
-       "title",
-       "TStamp",
-       "useAuthLogin",
-       "useEHLO",
-       "weight",
-       "wmapBannerCmds",
-       "wmapClientHeader",
-       "wmapInBoxCmds",
-       "wmapLoginCmd",
-       "wmapLoginData",
-       "wmapLogoutCmds",
-       "wmapMsgReadCmds",
-       "wmapMsgWriteCmds",
-       "workload",
-       );
-       
-return 1;

mozilla/mstone/bin/report.pl

@@ -1,605 +0,0 @@
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is the Netscape Mailstone utility, 
-# released March 17, 2000.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation. Portions created by Netscape are
-# Copyright (C) 1997-2000 Netscape Communications Corporation. All
-# Rights Reserved.
-# 
-# Contributor(s):	Dan Christian <robodan@netscape.com>
-#			Marcel DePaolis <marcel@netcape.com>
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU Public License (the "GPL"), in which case the
-# provisions of the GPL are applicable instead of those above.
-# If you wish to allow use of your version of this file only
-# under the terms of the GPL and not to allow others to use your
-# version of this file under the NPL, indicate your decision by
-# deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL.  If you do not delete
-# the provisions above, a recipient may use your version of this
-# file under either the NPL or the GPL.
-#####################################################
-
-# This file deals with the summary data only
-
-# Should be packages
-do 'genplot.pl' || die "$@\n";
-
-sub walkSetupTotals {
-    my $a = shift; my $f = shift; my $p = shift;
-    if ($p =~ /(\w+):(\w+):$/) {
-	my $tm = $2;
-	if (!($finals{Total}->{$tm}->{$f})) {
-	    $finals{Total}->{$tm}->{$f} = $a;
-	} elsif ($f =~ /Min$/) {
-	    $finals{Total}->{$tm}->{$f} = $a
-		if (($a > 0.0) && ($a < $finals{Total}->{$tm}->{$f}));
-	} elsif ($f =~ /Max$/) {
-	    $finals{Total}->{$tm}->{$f} = $a if ($a > $finals{Total}->{$tm}->{$f});
-	} else {
-	    $finals{Total}->{$tm}->{$f} += $a;}
-    }
-    elsif ($p =~ /(\w+):$/) {
-	$finals{Total}->{$f} += $a;
-    }
-}
-
-sub setupTotals {
-    # Figure out combined timers for "Total" protocol
-    # We might do a smarter merge here (look at context and try to match order)
-    # As long as the first protocol is a superset, it wont matter
-    my @tnames;
-    foreach $proto (@protocols) {
-	foreach $n (@{$protocolFields{$proto}}) {
-	    my $t = $n;
-	    $t =~ s/([][{}*+?^.\/])/\\$1/g; # quote regex syntax
-	    my $found = 0;
-	    foreach $tn (@tnames) { # see if it is in the list already
-		next unless ($tn =~ /$t/);
-		$found = 1;
-		last;
-	    }
-	    #print "proto $proto: Found $n\n" if ($found > 0);
-	    next if ($found > 0);
-	    #print "proto $proto: Add $n\n";
-	    push @tnames, $n;	# add to list
-	}
-    }
-    #print "'Total' timers @tnames\n";
-    $protocolFields{"Total"} = \@tnames;
-
-    # Create "Total" hashes
-    $finals{Total} =  ArrayInstance->new();
-    foreach $n (@{$protocolFields{"Total"}}) { # all timers
-	my $t = $n;	# dont modify original list
-	if ($t =~ /^\[(\w+)\]$/) { # Timer case, strip off brackets
-	    $finals{Total}->{$1} = ArrayInstance->new();
-	    #print "Creating Total timer field $1\n";
-	} else {		# scalar
-	    $finals{Total}->{$n} = 0;
-	    #print "Creating Total scalar field $n\n";
-	}
-    }
-
-    # Total finals array
-    foreach $proto (@protocols) {
-	foreach $t (@{$protocolFields{$proto}}) {
-	    if ($t =~ /^\[(\w+)\]$/) { # Timer case, strip off brackets
-		my $tm = $1;
-		foreach $f (@timerFieldsAll) {
-		    my $a = $finals{$proto}->{$tm}->{$f};
-		    if (!($finals{Total}->{$tm}->{$f})) { # never touched
-			$finals{Total}->{$tm}->{$f} = $a;
-		    } elsif ($f =~ /Min$/) {
-			$finals{Total}->{$tm}->{$f} = $a
-			    if (($a > 0.0)
-				&& ($a < $finals{Total}->{$tm}->{$f}));
-		    } elsif ($f =~ /Max$/) {
-			$finals{Total}->{$tm}->{$f} = $a
-			    if ($a > $finals{Total}->{$tm}->{$f});
-		    } else {
-			$finals{Total}->{$tm}->{$f} += $a;
-		    }
-		}
-	    } else {
-		$finals{Total}->{$t} += $finals{$proto}->{$t};
-	    }
-	}
-    }    
-		    
-    # Convert Time2 to standard deviation
-    foreach $proto (@protocolsAll) {
-	foreach $n (@{$protocolFields{$proto}}) {
-	    my $t = $n;	# dont modify original list
-	    if ($t =~ /^\[(\w+)\]$/) { $t = $1; } # strip off brackets
-	    next unless ($finals{$proto}->{$t}); # proto doesnt have timer
-	    next unless ($finals{$proto}->{$t}->{Try});
-	    next unless ($finals{$proto}->{$t}->{Time2} > 0);
-	    my $ss = $finals{$proto}->{$t}->{Time2};
-	    my $tot = $finals{$proto}->{$t}->{Time};
-	    my $n = $finals{$proto}->{$t}->{Try};
-	    next unless ($n > 0); # skip if this is 0
-
-	    my $var = ($ss - (($tot * $tot) / $n)) / $n;
-	    print "$proto->$t var < 0: Time2=$ss Time=$tot n=$n\n"
-		if ($var < 0);
-	    $finals{$proto}->{$t}->{Time2} = ($var > 0) ? sqrt ($var) : 0.0;
-	}
-    }
-
-    # Divide total times by trys to get averate time
-    foreach $proto (@protocolsAll) {
-	foreach $n (@{$protocolFields{$proto}}) {
-	    my $t = $n;	# dont modify original list
-	    if ($t =~ /^\[(\w+)\]$/) { $t = $1; } # strip off brackets
-	    next unless ($finals{$proto}->{$t}); # proto doesnt have timer
-	    ($finals{$proto}->{$t}->{Try}) || next;
-	    $finals{$proto}->{$t}->{Time} /= $finals{$proto}->{$t}->{Try}
-	}
-    }
-}
-
-# The text version is designed to be machine processable
-# commify and kformat are not used
-sub genTextReport {
-    fileBackup ($resultstxt);	# if processing as we go, backup old file
-    # Open a text file to hold the results
-    open(RESULTSTXT, ">$resultstxt") || 
-	die "Couldn't open $resultstxt: $!";
-
-    # Store results as text
-    printf RESULTSTXT "---- Mozilla MailStone Results $params{TSTAMP} ----\n";
-
-    printf RESULTSTXT "\t\t%s\n", $params{TITLE};
-    printf RESULTSTXT "\t\t%s\n", $params{COMMENTS};
-    printf RESULTSTXT "\n";
-    printf RESULTSTXT "Test duration: %d %s.  Rampup: %d %s.  Reported duration %s seconds\n",
-    figureTimeNumber ($params{TIME}),
-    figureTimeUnits ($params{TIME}, "minutes"),
-    figureTimeNumber ($params{RAMPTIME}),
-    figureTimeUnits ($params{RAMPTIME}, "seconds"), $realTestSecs;
-    printf RESULTSTXT "Number of reporting clients: %s of %s\n",
-    $reportingClients, $totalProcs;
-
-    foreach $proto (@protocolsAll) {
-	# do op counters
-	printf RESULTSTXT "\n%-15s  ", $proto;
-	foreach $f (@timerFieldsAll) {
-	    #($f =~ m/^Time2$/o) && next;
-	    printf RESULTSTXT "%13s",
-	    ($fieldNames{$f}) ? $fieldNames{$f} : $f;
-	}
-	foreach $n (@{$protocolFields{$proto}}) {
-	    my $t = $n;	# dont modify original list
-	    unless ($t =~ /^\[(\w+)\]$/) { # scalar case
-		#next;		# skip scalars for now
-		# do scalar counters. Column should line up with "Try"
-		printf RESULTSTXT "\n%-15s  ",
-		$proto . ":" . (($timerNames{$t}) ? $timerNames{$t} : $t);
-		printf RESULTSTXT
-		    "%13s", $finals{$proto}->{$t};
-		next;
-	    } else {		# strip off brackets
-		$t = $1;
-	    }
-	    printf RESULTSTXT "\n%-15s  ",
-	    $proto . ":" . (($timerNames{$t}) ? $timerNames{$t} : $t);
-	    foreach $f (@timerFieldsAll) {
-		#($f =~ m/^Time2$/o) && next;
-		if ($f =~ m/Time/o) {
-		    printf RESULTSTXT
-			"%13.3f", $finals{$proto}->{$t}->{$f};
-		} elsif ($f =~ m/Bytes/o) {
-		    printf RESULTSTXT
-			"%13d", $finals{$proto}->{$t}->{$f};
-		} else {
-		    printf RESULTSTXT
-			"%13s", $finals{$proto}->{$t}->{$f};
-		}
-	    }
-	}
-
-	# do ops/sec
-	printf RESULTSTXT "\n\n%-15s  ", $proto;
-	foreach $f (@timerFieldsAll) {
-	    ($f =~ m/^Time/o) && next;
-	    printf RESULTSTXT "%9s/sec", 
-	    ($fieldNames{$f}) ? $fieldNames{$f} : $f;
-	}
-	foreach $n (@{$protocolFields{$proto}}) {
-	    my $t = $n;	# dont modify original list
-	    unless ($t =~ /^\[(\w+)\]$/) { # scalar case
-		#next;		# skip scalars for now
-		# do scalar counter/sec. Column should line up with "Try"
-		printf RESULTSTXT "\n%-15s  ",
-		$proto . ":" . (($timerNames{$t}) ? $timerNames{$t} : $t) . "/s";
-		printf RESULTSTXT
-		    "%13.3f", $finals{$proto}->{$t} / $realTestSecs;
-		next;
-	    } else {
-		$t = $1;
-	    }
-	    printf RESULTSTXT "\n%-15s  ",
-	    $proto . ":" . (($timerNames{$t}) ? $timerNames{$t} : $t) . "/s";
-	    foreach $f (@timerFieldsAll) {
-		($f =~ m/^Time/o) && next;
-		if ($f =~ m/Bytes/o) {
-		    printf RESULTSTXT
-			"%13d",
-			$finals{$proto}->{$t}->{$f} / $realTestSecs;
-		} else {
-		    printf RESULTSTXT
-			"%13.3f",
-			$finals{$proto}->{$t}->{$f} / $realTestSecs;
-		}
-	    }
-	}
-	printf RESULTSTXT "\n\n";
-    }
-
-    if ($params{SYSCONFIG}) {
-	print RESULTSTXT "\nSytem config details\n";
-	if (($params{SYSCONFIG} =~ m/^\S+$/o)
-	    && (open(SCFILE, "<$params{SYSCONFIG}"))) {
-	    while (<SCFILE>) {
-		(m/^<\S+>\s*$/o) && next; # skip HTML only on them
-		s/<\S+>//g;	# trim out obvious HTML commands
-		s/<!--.*-->//g;	# trim out HTML comments
-		print RESULTSTXT $_;
-	    }
-	    close(SCFILE);
-	} else {
-	    my $l = $params{SYSCONFIG};	# filter similar to above
-	    $l =~ s/<\S+>//g;	# trim out obvious HTML commands
-	    $l =~ s/<!--.*-->//g; # trim out HTML comments
-	    $l =~ s/\\\n/\n/g;	# turn quoted newline to plain newline
-	    print RESULTSTXT $l;
-	}
-    }
-
-    close(RESULTSTXT);
-}
-
-# Write the main part of the HTML page
-sub genHTMLReportStart {
-    fileBackup ($resultshtml);	# if processing as we go, backup old file
-    # Open an html file to hold the results
-    open(RESULTSHTML, ">$resultshtml") || 
-	die "Couldn't open $resultshtml: $!";
-
-    print RESULTSHTML <<END;
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
-<HTML>
-<A NAME=TitleSection>
-<TITLE>
-Mozilla MailStone Results $params{TSTAMP}
-</TITLE>
-</A>
-<HEAD>
-</HEAD>
-<BODY TEXT="#000000" BGCOLOR="#FFFFFF" LINK="#0000FF" VLINK="#FF0000" ALINK="#000088">
-<CENTER>
-<HR NOSHADE WIDTH="100%">
-<H1>Mozilla MailStone Results $params{TSTAMP}</H1>
-<H2>$params{TITLE}</H2>
-<I>$params{COMMENTS}</I>
-<HR WIDTH="100%">
-</CENTER>
-
-END
-    printf RESULTSHTML "<BR><B>Test duration:</B> %d %s.  ",
-    figureTimeNumber ($params{TIME}),
-    figureTimeUnits ($params{TIME}, "minutes");
-    printf RESULTSHTML "<B>Rampup:</B> %d %s.  ",
-    figureTimeNumber ($params{RAMPTIME}),
-    figureTimeUnits ($params{RAMPTIME}, "seconds");
-    printf RESULTSHTML "<B>Reported duration:</B> %s seconds\n",
-    commify ($realTestSecs);
-
-    printf RESULTSHTML "<BR><B>Reporting clients:</B> %s of %s\n",
-    commify ($reportingClients), commify ($totalProcs);
-
-    print RESULTSHTML <<END;
-<BR>
-Test <A HREF="all.wld">complete workload</a> description.  
-Filtered <A HREF="work.wld">workload</a> description.
-<BR>
-Plain <A HREF="results.txt">text version</a> of results.  
-Log of <A HREF="stderr">stderr</a> and debugging output.
-<BR>
-
-<A NAME=MonitoringSection></A>
-END
-
-    {				# list user requested logging
-	my @logfiles = <$resultdir/*-pre.log>;
-	if (@logfiles) {
-	    foreach $f (@logfiles) {
-		$f =~ s/$resultdir\///o; # strip directory out
-		$f =~ s/-pre\.log$//o; # strip extension off
-		print RESULTSHTML "Pre test log: <A HREF=\"$f-pre.log\">$f</a><BR>\n";
-	    }
-	}
-	@logfiles = <$resultdir/*-run.log>;
-	if (@logfiles) {
-	    foreach $f (@logfiles) {
-		$f =~ s/$resultdir\///o; # strip directory out
-		$f =~ s/-run\.log$//o; # strip extension off
-		print RESULTSHTML "Monitoring log: <A HREF=\"$f-run.log\">$f</a><BR>\n";
-	    }
-	}
-	@logfiles = <$resultdir/*-post.log>;
-	if (@logfiles) {
-	    foreach $f (@logfiles) {
-		$f =~ s/$resultdir\///o; # strip directory out
-		$f =~ s/-post\.log$//o; # strip extension off
-		print RESULTSHTML "Post test log: <A HREF=\"$f-post.log\">$f</a><BR>\n";
-	    }
-	}
-    }
-
-    #print RESULTSHTML
-	#"<CENTER><H2>Results per protocol</H2></CENTER>\n";
-
-    foreach $proto (@protocolsAll) {
-	printf RESULTSHTML "<A NAME=%sTable></A>\n", $proto;
-	printf RESULTSHTML
-	    "<TABLE BORDER=2 CELLSPACING=2 CELLPADDING=2 COLS=%d WIDTH=\"95%%\">",
-	    2+$#{@{$protocolFields{$proto}}};
-	print RESULTSHTML
-	    "<CAPTION>$proto Counters</CAPTION>\n";
-	# do op counters
-	print RESULTSHTML
-	    "<TR><TH>$proto</TH>\n";
-	foreach $f (@timerFieldsAll) {
-	    #($f =~ m/^Time2$/o) && next;
-	    printf RESULTSHTML "<TH>%s</TH> ",
-	    ($fieldNames{$f}) ? $fieldNames{$f} : $f;
-	}
-	print RESULTSHTML
-	    "</TR>\n";
-	foreach $n (@{$protocolFields{$proto}}) {
-	    my $t = $n;	# dont modify original list
-	    unless ($t =~ /^\[(\w+)\]$/) { # scalar case
-		next;		# skip scalars for now
-		# do scalar counters. Column should line up with "Try"
-		printf RESULTSHTML "<TR ALIGN=RIGHT><TH>%s</TH>\n",
-		($timerNames{$t}) ? $timerNames{$t} : $t;
-		printf RESULTSHTML
-		    "<TD>%s</TD> ",
-		    commify ($finals{$proto}->{$t});
-		next;
-	    } else {
-		$t = $1;
-	    }
-	    printf RESULTSHTML "<TR ALIGN=RIGHT><TH>%s</TH>\n",
-	    ($timerNames{$t}) ? $timerNames{$t} : $t;
-	    foreach $f (@timerFieldsAll) {
-		#($f =~ m/^Time2$/o) && next;
-		if ($f =~ m/Time/o) {
-		    printf RESULTSHTML
-			"<TD>%s</TD> ",
-			tformat ($finals{$proto}->{$t}->{$f});
-		} elsif ($f =~ m/Bytes/o) {
-		    printf RESULTSHTML
-			"<TD>%s</TD> ",
-			kformat ($finals{$proto}->{$t}->{$f});
-		} else {
-		    printf RESULTSHTML
-			"<TD>%s</TD> ",
-			commify ($finals{$proto}->{$t}->{$f});
-		}
-	    }
-	    print RESULTSHTML "</TR>\n";
-	}
-
-	# do ops/sec
-	print RESULTSHTML
-	    "<TR><TH>$proto</TH>\n";
-	foreach $f (@timerFieldsAll) {
-	    ($f =~ m/^Time/o) && next;
-	    printf RESULTSHTML "<TH>%s/sec</TH> ",
-	    ($fieldNames{$f}) ? $fieldNames{$f} : $f;
-	}
-	print RESULTSHTML
-	    "</TR>\n";
-	foreach $n (@{$protocolFields{$proto}}) {
-	    my $t = $n;	# dont modify original list
-	    unless ($t =~ /^\[(\w+)\]$/) { # scalar case
-		next;		# skip scalars for now
-		# do scalar counters. Column should line up with "Try"
-		printf RESULTSHTML "<TR ALIGN=RIGHT><TH>%s</TH>\n",
-		($timerNames{$t}) ? $timerNames{$t} : $t;
-		printf RESULTSHTML
-		    "<TD>%.3f</TD> ",
-		    $finals{$proto}->{$t} / $realTestSecs;
-		next;
-	    } else {
-		$t = $1;
-	    }
-	    printf RESULTSHTML "<TR ALIGN=RIGHT><TH>%s</TH>\n",
-	    ($timerNames{$t}) ? $timerNames{$t} : $t;
-	    foreach $f (@timerFieldsAll) {
-		($f =~ m/^Time/o) && next;
-		if ($f =~ m/Bytes/o) {
-		    printf RESULTSHTML
-			"<TD>%s</TD> ",
-			kformat ($finals{$proto}->{$t}->{$f} / $realTestSecs);
-		} else {
-		    printf RESULTSHTML
-			"<TD>%.3f</TD> ",
-			$finals{$proto}->{$t}->{$f} / $realTestSecs;
-		}
-	    }
-	    print RESULTSHTML "</TR>\n";
-	}
-	printf RESULTSHTML "</TABLE> <BR>\n\n";
-    }
-
-    print RESULTSHTML <<END;
-
-<BR>
-
-<CENTER>
-<A NAME=GraphSection></A>
-END
-}
-
-%genplotGraphs = ();
-
-# Call genplot; and, if a graph is generated, insert the HTML reference to it
-sub genHTMLReportGraph {
-    my $name = shift;
-    my $title = shift;
-    my $label = shift;
-    my $protos = shift || die "genHTMLReportGraph: '$name' missing protocols";
-    my $field = shift;
-    my $vars = shift || die "genHTMLReportGraph: '$name' missing vars";
-
-    if ($genplotGraphs{$name}) {
-	print "Graph $name has already been generated.\n";
-	return;
-    }
-
-    $genplotGraphs{$name} = $title;
-
-    # Delineate and tag each graph
-    print RESULTSHTML "<A NAME=$name><HR SIZE=4 WIDTH=\"90%\"></A>\n";
-    if (genPlot ($name, $title, $label, $protos, $field, $vars) > 0) {
-	print RESULTSHTML <<END;
-<P><H3>$title</H3>
-<IMG SRC=$name.$params{IMAGETYPE} ALT="$label"></P>
-END
-    } else {
-	print RESULTSHTML "<BR>Graph \"$name\" contained no data (@{$vars}).<BR>\n";
-    }
-	
-}
-
-# Write the final parts of the HTML page
-sub genHTMLReportEnd {
-    print RESULTSHTML <<END;
-<!-- INSERT IMAGES HERE - DO NOT DELETE THIS LINE -->
-</CENTER>
-<A NAME=EndSection></A>
-END
-
-    if ($params{SYSCONFIG}) {
-	print RESULTSHTML "<HR WIDTH=\"100%\">";
-	print RESULTSHTML "<CENTER><H2>Details</H2></CENTER>\n";
-	if (($params{SYSCONFIG} =~ m/^\S+$/o)
-	    && (open(SCFILE, "<$params{SYSCONFIG}"))) { # see if its a file
-	    while (<SCFILE>) {
-		print RESULTSHTML $_;
-	    }
-	    close(SCFILE);
-	} else {		# output text directly
-	    my $l = $params{SYSCONFIG};
-	    $l =~ s/\\\n/\n/g;	# turn quoted newline to plain newline
-	    print RESULTSHTML $l;
-	}
-    }
-
-    print RESULTSHTML <<END;
-
-<HR NOSHADE WIDTH="100%">
-
-</BODY>
-</HTML>
-END
-    close(RESULTSHTML);
-}
-
-
-# Actually generate the standard stuff
-setupTotals();
-genTextReport();
-
-
-genHTMLReportStart();
-
-my $graphCount = 0;
-foreach $section (@workload) {
-    next unless ($section->{sectionTitle} =~ /GRAPH/i);
-    my $name = $section->{sectionParams};
-    $name =~ s/name=\s*//;	# strip off initial bit
-    my @varlist = split (/[\s,]+/, $section->{VARIABLES});
-
-    $graphCount++;
-    genHTMLReportGraph ($name, $section->{TITLE}, $section->{LABEL}, 
-			($section->{FIELD} =~ /Time/o)
-			? \@protocols : \@protocolsAll,
-			$section->{FIELD}, \@varlist);
-}
-
-if ($graphCount <= 0) {		# use built ins
-
-# generate the graphs we want
-# NOTE: the first argument (name), must be unique; sets file name
-    genHTMLReportGraph ("connects",
-			"Number of connections attempted", "Connections/sec",
-			\@protocolsAll, "Try", ["conn" ]);
-    genHTMLReportGraph ("connections",
-			"Total connections", "Connections",
-			\@protocolsAll, "", ["connections" ]);
-    genHTMLReportGraph ("errors",
-			"Number of connection errors", "Errors/sec",
-			\@protocolsAll, "Error", ["conn", "banner", "login", "logout" ]);
-    genHTMLReportGraph ("retrieves",
-			"Number of messages read", "Messages/sec",
-			\@protocolsAll, "Try", ["retrieve" ]);
-    genHTMLReportGraph ("submits",
-			"Number of messages written", "Messages/sec",
-			\@protocolsAll, "Try", ["submit" ]);
-    genHTMLReportGraph ("commands",
-			"Protocol commands", "Commands/sec",
-			\@protocolsAll, "Try", ["cmd" ]);
-    genHTMLReportGraph ("readBytes",
-			"Bytes read", "Bytes/sec",
-			\@protocolsAll, "BytesR", ["login", "banner", "cmd", "retrieve", "submit", "logout" ]);
-    genHTMLReportGraph ("writeBytes",
-			"Bytes written", "Bytes/sec",
-			\@protocolsAll, "BytesW", ["login", "banner", "cmd", "retrieve", "submit", "logout" ]);
-    genHTMLReportGraph ("msgTime",
-			"Message transfer time", "Seconds per message",
-			\@protocols, "Time", ["cmd", "submit", "retrieve" ]);
-    genHTMLReportGraph ("setupTime",
-			"Connection setup time", "Seconds per connection",
-			\@protocols, "Time", ["conn", "banner", "login" ]);
-    genHTMLReportGraph ("blocks",
-			"Number of mailstone blocks executed", "Blocks/sec",
-			\@protocolsAll, "", ["blocks" ]);
-}
-
-if ($params{ADDGRAPHS}) {	# pick up additional graphs
-    my @graphs = ();
-    readWorkloadFile ($params{ADDGRAPHS}, \@graphs);
-    foreach $section (@graphs) {
-	next unless ($section->{sectionTitle} =~ /GRAPH/i);
-	my $name = $section->{sectionParams};
-	$name =~ s/name=\s*//;	# strip off initial bit
-	my @varlist = split (/[\s,]+/, $section->{VARIABLES});
-
-	$graphCount++;
-	genHTMLReportGraph ($name, $section->{TITLE}, $section->{LABEL}, 
-			    ($section->{FIELD} =~ /Time/o)
-			    ? \@protocols : \@protocolsAll,
-			    $section->{FIELD}, \@varlist);
-    }
-}
-
-
-genHTMLReportEnd();
-
-return 1;

mozilla/mstone/bin/series_utils.ksh

@@ -1,205 +0,0 @@
-#!/bin/ksh
-
-# global configuration parameters.
-# Fill in defaults for anything that is not already set
-
-# Look for testname$test_form, first
-export test_form=${test_form:-""}
-
-# string appended to every description
-export desc_conf=${desc_conf:-""}
-
-# extra arguments common to all tests
-export extra_args=${extra_args:-""}
-
-# error limit to abort sequence
-export error_limit=${error_limit:-100}
-
-# set this to only show what it will do
-export only_show_it=${only_show_it:-0}
-
-# time to allow the server to calm down after each run
-export sleep_time=${sleep_time:-5}
-
-# This is where we store the important runs
-export save_dir=${save_dir:-"results.save"}
-
-# Basic sanity test
-if [[ ! -x /usr/bin/perl || ! -f .license ]] ; then # see if setup was ever run
-   echo "Critical files are missing.  Run setup."
-   exit 2;
-fi
-
-find_timestamp () {		# find the timestamp string from latest run
-  #OLD timestamp=`ls -d results/[0-9]*.[0-9][0-9][0-9][0-9]?(a-z) | tail -1`
-
-  # list all directories with the timestamp pattern
-  timestamp=`echo results/[0-9]*.[0-9][0-9][0-9][0-9]?([a-z])`
-  # strip all but the last one
-  timestamp=${timestamp##* }
-
-  # strip the top directory name out
-  timestamp=${timestamp#results/}
-
-  # return it
-  echo $timestamp
-  return 0
-}
-
-
-# copy last mailstone run from the current directory to good results directory
-save_run () {
-
-  [[ -d $save_dir ]] || \
-	mkdir $save_dir
-
-  [[ $only_show_it -gt 0 ]] && return 0	# dont do anything important
-
-  if [[ -n "$last_timestamp" && -d "results/$last_timestamp/" ]] ; then
-	cp -pR results/$last_timestamp $save_dir/
-	# index probably has lots of extra junk, but its better than nothing
-	cp -pf results/index.html $save_dir/
-  fi
-}
-
-# Display and run a command.  Skip if in only_show mode.
-run () {
-  if [[ $only_show_it -gt 0 ]] ; then
-	echo  "Would run:" "$@"
-	return 0
-  fi
-  echo "Running: " "$@"
-  "$@"
-}
-
-# Sleep.  Skip if in only_show mode.
-run_sleep () {
-  if [[ $only_show_it -gt 0 ]] ; then
-	echo  "Would sleep:" "$@"
-	return 0
-  fi
-  echo "Sleeping: " "$@"
-  sleep "$@"
-}
-# for readability, just use sleep
-alias sleep=run_sleep
-
-
-# This runs the actual mstone run and check for errors
-# compress tmp files
-# Usage: run_test testname description [args...]
-run_test () {
-  testname="$1"; shift;
-  desc="$1"; shift;
-
-  # see if a special version of this test exists
-  if [[ -f conf/$testname$test_form.wld ]] ; then
-	testname=$testname$test_form
-  fi
-
-  #oldtimestamp=`find_timestamp`
-
-  if [[ $only_show_it -gt 0 ]] ; then
-	echo  "Would run:" mstone $testname -b "$desc $desc_conf" $extra_args "$@"
-	if [[ ! -f conf/$testname.wld ]] ; then
-	  echo "Configuration Error: No such test $testname"
-	fi
-	return 0
-  fi
-
-  echo "\n##########################################################"
-  if [[ ! -f conf/$testname.wld ]] ; then
-    echo "CONFIGURATION ERROR: No such test $testname"
-    exit 2
-  fi
-
-  echo  "\nRunning:" mstone $testname -b "$desc $desc_conf" $extra_args "$@"
-  # We actually bypass the mstone script
-  /usr/bin/perl -Ibin -- bin/mailmaster.pl -w conf/$testname.wld  -b "$desc $desc_conf" $extra_args "$@"
-  stat=$?
-
-  # BUG if another test is running at the same time, this is wrong
-  timestamp="`find_timestamp`"
-
-  # test failed to even run
-  if [[ $stat -ne 0 ]]
-  then
-	echo "ABORT! Test failed to start"
-        [[ -n "$mail_list" ]] && \
-	    mail_series "DotCom Failed run: `date`" "$mail_list"
-	exit 2
-  fi
-
-  # compress tmp files.  get the csv files, too.
-  gzip tmp/$timestamp/* results/$timestamp/*.csv
-
-  # stick the timestamp someplace global for a save_run
-  export last_timestamp=$timestamp
-  export all_timestamps="$all_timestamps $timestamp"
-
-  # save the results
-  save_run
-
-  # see how many errors we hit
-  totline=`grep 'Total:total ' results/$timestamp/results.txt`
-
-  # strip label and first field
-  errors=${totline##+([+-z])+( )+([+-9])+( )}
-  # strip trailing fields
-  errors=${errors%% *}
-
-  echo ""			# space things out
-
-  if [[ $errors -gt $error_limit ]] ; then
-	echo "ABORT! Errors ($errors) exceed error limit ($error_limit)"
-        [[ -n "$mail_list" ]] && \
-	    mail_series "DotCom Aborted run: `date`" "$mail_list"
-	exit 1
-  fi
-  echo "Run completed OK ($errors errors).  Timestamp $timestamp"
-
-  sleep $sleep_time
-
-  return 0
-}
-
-# Usage: mail_series subject "address,address,..."
-mail_series () {
-  subject=$1; shift
-  file=/tmp/series$$.tar
-
-  if [[ $only_show_it -gt 0 ]] ; then
-	echo  "Would mail results about $subject" to "$@"
-	return 0
-  fi
-  echo "Mailing results about $subject" to "$@"
-
-  tar cf $file $save_dir/index.html
-  for f in $all_timestamps ; do
-      tar rf $file $save_dir/$f
-  done
-  gzip $file
-  echo "$all_timestamps" | uuenview -b -30000 -s "$subject" -m "$@" $file.gz
-  rm -f $file.gz
-}
-
-# parse command line arguments
-while [[ -n "$1" ]]
-do
-  case $1 in
-  # -n mode, do not execute, just show
-  -n)	only_show_it=1; shift;;
-
-  # set test form
-  -f)	shift; test_form=$1; shift;;
-
-  # set test extra description
-  -d)	shift; desc_conf=$1; shift;;
-
-  # Rest are to be passed in exactly
-  --)	shift; break;;
-
-  #default, pick up as an extra arg
-  *)	extra_args="$extra_args $1"; shift;;
-  esac
-done

mozilla/mstone/bin/setup.pl

@@ -1,464 +0,0 @@
-#!/usr/bin/env perl
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is the Netscape Mailstone utility, 
-# released March 17, 2000.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation. Portions created by Netscape are
-# Copyright (C) 1999-2000 Netscape Communications Corporation. All
-# Rights Reserved.
-# 
-# Contributor(s):	Dan Christian <robodan@netscape.com>
-#			Marcel DePaolis <marcel@netcape.com>
-#			Jim Salter <jsalter@netscape.com>
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU Public License (the "GPL"), in which case the
-# provisions of the GPL are applicable instead of those above.
-# If you wish to allow use of your version of this file only
-# under the terms of the GPL and not to allow others to use your
-# version of this file under the NPL, indicate your decision by
-# deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL.  If you do not delete
-# the provisions above, a recipient may use your version of this
-# file under either the NPL or the GPL.
-#####################################################
-
-# usage: setup.pl setup|cleanup|checktime|timesync -m machine_file
-# message files are expected to be in ./data/ and end with ".msg"
-
-print "Netscape Mailstone.\nCopyright (c) 1997-2000 Netscape Communications Corp.\n";
-
-$mode = shift;			# mode must be first
-
-# this parses the command line for -m machinefile
-# also sets many defaults
-do 'args.pl'|| die $@;
-sub warn_system;
-sub die_system;
-
-parseArgs();			# parse command line
-
-setConfigDefaults();		# setup RSH and RCP
-
-$cpcmd = "cp";			# copy files... dir
-$rmcmd = "rm -f";		# remove files...
-
-die "Must specify workload file" unless (@workload);
-
-# Add or change client machines
-sub configClients {
-    print "\n    You can enter multiple machines like this: host1,host2\n";
-    my @d = <bin/*/bin>;
-    if (@d) {
-	my @d2;
-	foreach (@d2 = @d) { s/^bin\/// }
-	foreach (@d = @d2) { s/\/bin$// }
-	print "    These OS versions are available:\n@d\n";
-    }
-
-    foreach $section (@workload) {
-	next unless ($section->{sectionTitle} =~ /CLIENT/i);
-	my $slist = $section->{sectionParams};
-	$slist =~ s/HOSTS=\s*//; # strip off initial bit
-	my $arch = "default OS";
-	$arch = $section->{ARCH} if ($section->{ARCH});
-	print "\nWhat is the name of the client(s) for $arch [$slist]: ";
-	my $ans = <STDIN>; chomp $ans;
-	if ($ans) {
-	    $ans =~ s/\s//g;	# strip any whitespace
-	    fileReplaceText ($params{WORKLOAD}, "<CLIENT", $slist, $ans);
-	}
-    }
-    while (1) {
-	print "\nWhat additional client(s) [none]: ";
-	my $ans = <STDIN>; chomp $ans;
-	last unless ($ans);	# done
-	last if ($ans =~ /^none$/i);
-	$ans =~ s/\s//g;	# strip any whitespace
-	my $block = "\n<CLIENT HOSTS=$ans>\n";
-
-	print "What OS type [default]: ";
-	my $ans = <STDIN>; chomp $ans;
-	$block .= "  Arch\t$ans\n" if ($ans && !($ans =~ /^default$/i));
-
-	$block .= "</CLIENT>\n";
-	fileInsertAfter ($params{WORKLOAD}, "^</CLIENT>", $block);
-    }
-}
-
-# Create a user ldif file
-sub configUserLdif {
-    my $name = "conf/$defaultSection->{SERVER}.ldif";
-    print "\nWhat file to you want to create [$name]? ";
-    $ans = <STDIN>; chomp $ans;
-    $name = $ans if ($ans);
-
-    my $mode = "users";
-    print "\nDo you want to create a broadcast account [y]? ";
-    $ans = <STDIN>;
-    $mode .= " broadcast" unless ($ans =~ /^n/i);
-
-    my $basedn = $defaultSection->{SERVER};	# pick a default
-    $basedn =~ s/^.*?\.//;	# strip off before first dot
-    $basedn = "o=$basedn";
-
-    print "\nWhat is LDAP base DN [$basedn]? ";
-    $ans = <STDIN>; chomp $ans;
-    $basedn = $ans if ($ans);
-
-    my $args = $params{MAKEUSERSARGS};
-
-    print "\n    Common additional makeusers arguments:\n";
-    print "\t-s storeName -x storeCount \tMultiple store partitions\n";
-    print "\t[-3|-4]                    \tConfigure for NSMS 3.x or 4.x\n";
-    print "Any extra arguments to makeusers [$args]? ";
-    $ans = <STDIN>; chomp $ans;
-    $args = $ans if ($ans);
-
-    my $perlbin = "/usr/bin/perl";
-
-    $params{DEBUG} &&
-	print "$perlbin -Ibin -- bin/makeusers.pl $mode -w $params{WORKLOAD} -b '$basedn' -o $name $args\n";
-
-    print "\nGenerating $name (this can take a while)\n";
-    warn_system "$perlbin -Ibin -- bin/makeusers.pl $mode -w $params{WORKLOAD} -b '$basedn' -o $name $args";
-    print "LDIF generation complete.  See $name\n";
-    print "\tSee the manual or INSTALL to create users using the LDIF file.\n";
-}
-
-# This uses a match pattern plus text to text replacements.  
-# Could make all changes and then write out new workload
-# 	You would have to be carefull about sections with multi-line support.
-sub configWorkload {
-    my $ans;
-
-    print "\nWhat is the name of the mail host [$defaultSection->{SERVER}]: ";
-    $ans = <STDIN>; chomp $ans;
-    if ($ans) {
-	fileReplaceText ($params{WORKLOAD},
-			 "(SERVER|SMTPMAILFROM|ADDRESSFORMAT)", 
-			 $defaultSection->{SERVER}, $ans);
-	$defaultSection->{SERVER} = $ans; # needed for ldif generation
-    }
-    print "\nWhat is the user name pattern [$defaultSection->{LOGINFORMAT}]: ";
-    $ans = <STDIN>; chomp $ans;
-    if ($ans) {
-	fileReplaceText ($params{WORKLOAD},
-			 "(LOGINFORMAT|ADDRESSFORMAT)",
-			 $defaultSection->{LOGINFORMAT}, $ans);
-	$ans =~ s/%ld/0/;	# create smtpMailFrom user
-	my $olduser = $defaultSection->{SMTPMAILFROM};
-	$olduser =~ s/@.*$//;	# strip off after @
-	fileReplaceText ($params{WORKLOAD},
-			 "SMTPMAILFROM",
-			 $olduser, $ans);
-    }
-
-    print "\nWhat is the password pattern [$defaultSection->{PASSWDFORMAT}]: ";
-    $ans = <STDIN>; chomp $ans;
-    fileReplaceText ($params{WORKLOAD}, "PASSWDFORMAT", 
-		     $defaultSection->{PASSWDFORMAT}, $ans);
-
-    $defaultSection->{NUMLOGINS} = 100 unless ($defaultSection->{NUMLOGINS});
-    print "\nHow many users [$defaultSection->{NUMLOGINS}]: ";
-    $ans = <STDIN>; chomp $ans;
-    fileReplaceText ($params{WORKLOAD}, "(NUMADDRESSES|NUMLOGINS)",
-		     $defaultSection->{NUMLOGINS}, $ans);
-
-    $defaultSection->{FIRSTLOGIN} = 0 unless ($defaultSection->{FIRSTLOGIN});
-    print "\nWhat is the first user number [$defaultSection->{FIRSTLOGIN}]: ";
-    $ans = <STDIN>; chomp $ans;
-    fileReplaceText ($params{WORKLOAD}, "(FIRSTADDRESS|FIRSTLOGIN)",
-		     $defaultSection->{FIRSTLOGIN}, $ans);
-
-    unless ($params{NT}) {
-	configClients ();
-    }
-
-    print "\nDo you want to view the edited $params{WORKLOAD} [y]? ";
-    $ans = <STDIN>;
-    unless ($ans =~ /^n/i) {
-	print "Here is the edited $params{WORKLOAD}:\n\n";
-	fileShow ($params{WORKLOAD});
-	print "\n";
-    }
-
-    print "\nDo you want to generate a user LDIF file [y]? ";
-    $ans = <STDIN>;
-    unless ($ans =~ /^n/i) {
-	configUserLdif ();
-    }
-}
-
-# See if license file has been displayed
-if (($mode ne "cleanup") && (! -f ".license" )) {
-    fileShow ("LICENSE");
-    # SEAN: blow off annoying agreement message.
-#      print "\nDo you agree to the terms of the license? (yes/no) ";
-#      my $ans = <STDIN>;
-#      print "\n";
-#      unless ($ans =~ /^yes$/i) {
-#  	print "License not agreed to.\n";
-#  	exit 0;
-#      }
-    my ($sec, $min, $hour, $mday, $mon, $year) = localtime;
-    open (LIC, ">.license");
-    printf LIC "%04d$mon$mday$hour$min\n", $year+1900;
-    close (LIC);
-}
-
-if ($mode eq "config") {	# re-run config
-    configWorkload ();
-
-    print "\nMake any additional changes to $params{WORKLOAD} and then re-run 'setup'\n";
-    exit 0;
-} elsif ($mode ne "cleanup") {	# check if configured
-    my $unconf = 0; # see if default values are in use
-    foreach $section (@workload) {
-	($section->{SERVER})
-	    && ($section->{SERVER} =~ /example\.com$/)
-		&& $unconf++;
-	($section->{SMTPMAILFROM})
-	    && ($section->{SMTPMAILFROM} =~ /example\.com$/)
-		&& $unconf++;
-	($section->{ADDRESSFORMAT})
-	    && ($section->{ADDRESSFORMAT} =~ /example\.com$/)
-		&& $unconf++;
-	last if ($unconf > 0);
-    }
-    if ($unconf > 0) {
-	print "Server has not been configured (example.com is an invalid address).\n";
-	print "Do you want to setup a simple configuration now [y]?";
-	my $ans = <STDIN>;
-	if ($ans =~ /^n/i) {
-	    print "Re-run setup when you have edited the configuration.\n";
-	    exit 0;
-	}
-	configWorkload ();
-
-	print "\nMake any additional changes to $params{WORKLOAD} and then re-run 'setup'\n";
-	exit 0;
-    }
-}
-
-if ($mode eq "timesync") {
-    if ($params{NT}) {
-	print "Timesync has no effect on NT\n";
-	exit 0;
-    }
-    my ($sec, $min, $hour, $mday, $mon, $year) = localtime;
-    $mon += 1;			# adjust from 0 based to std
-    $systime = sprintf ("%02d%02d%02d%02d%04d.%02d",
-		     $mon, $mday, $hour, $min, 1900+$year, $sec);
-} elsif ($mode eq "checktime") {
-    if ($params{NT}) {		# if running on NT, then only single client
-	print "Checktime not needed on NT\n";
-	exit 0;
-    }
-    mkdir ("$resultbase", 0775);
-    mkdir ("$tmpbase", 0775);
-    foreach $section (@workload) {
-	next unless ($section->{sectionTitle} =~ /CLIENT/i);
-	my $slist = $section->{sectionParams};
-	$slist =~ s/HOSTS=\s*//; # strip off initial bit
-	foreach $cli (split /[\s,]/, $slist) {
-	    open MAKEIT, ">$tmpbase/$cli.tim";
-	    close MAKEIT;
-	}
-    }
-} elsif (($mode eq "setup") || ($mode eq "cleanup")) {
-    @msgs = <data/*.msg>;
-    foreach (@files = @msgs) { s/data\/// }
-    print "Found these message files:\n@files\n\n";
-    if ($params{NT}) {		# handle NT localhost here
-	exit 0 if ($mode =~ /cleanup$/);
-	my $clipath = "bin/WINNT4.0/bin/mailclient.exe";
-	print "Copying $clipath and message files to $cli\n";
-	die_system "copy $clipath $params{TEMPDIR}";
-	foreach $f (@files) {
-	    die_system "copy $f $params{TEMPDIR}";
-	}
-	exit 0;			# without perl:fork, no more to do
-    }
-}
-
-# iterate over every client in the testbed, complete the cmd and rsh
-foreach $section (@workload) {
-    next unless ($section->{sectionTitle} =~ /CLIENT/i);
-    my $slist = $section->{sectionParams};
-    $slist =~ s/HOSTS=\s*//; # strip off initial bit
-    foreach $cli (split /[\s,]/, $slist) {
-	my $rsh = ($section->{RSH}) ? $section->{RSH} : $params{RSH};
-	my $rcp = ($section->{RCP}) ? $section->{RCP} : $params{RCP};
-	my $tempdir;
-	if ($section->{TEMPDIR}) {
-	    $tempdir = $section->{TEMPDIR};
-	} elsif ($params{TEMPDIR}) {
-	    $tempdir = $params{TEMPDIR};
-	}
-
-	my $cliarch = $section->{ARCH};
-
-	# presumed architecture for bin/mailclient on localhost:
-	my $local_arch = `bin/nsarch`;
-	chomp $local_arch;
-
-	# Try to determine arch if it hasn't been explicitly set.
-	if (!$cliarch) {
-	    if ($cli =~ /localhost/) {
-		$cliarch = `bin/nsarch`;
-		chomp $cliarch;
-	    } else {
-		$cliarch = `$rsh $cli sh < bin/nsarch`;
-		chomp $cliarch;
-	    }
-	}
-
-	# most time critical first
-	if ($mode eq "timesync") {
-	    next if ($cli =~ /^localhost$/i); # dont reset our own time
-	    # run all these in parallel to minimize skew
-	    next if ($cliarch eq "NT4.0");
-	    forkproc ($rsh, $cli, "date $systime");
-	}
-
-	elsif ($mode eq "checktime") {
-	    # run all these in parallel to minimize skew
-	    forkproc ($rsh, $cli, ($cliarch eq "NT4.0")
-		      ? "time" : "date",
-		      "/dev/null", "$tmpbase/$cli.tim");
-	}
-
-	elsif ($mode eq "setup") {
-	    my ($clibin) = split /\s/, (($section->{COMMAND})
-					? $section->{COMMAND}
-					: $params{CLIENTCOMMAND});
-	    my $clipath = '';	# do nothing by default
-
-	    # Look for architecture-specific binary.
-	    if ($cliarch) {
-
-		# fallback to just os-name if we can't find an exact match.
-		my $approx = $cliarch;
-		$approx =~ s/^(\D+).*/$1/;
-		my $approx_bin = <"bin/${approx}*/bin/$clibin">;
-
-		if (-x "bin/$cliarch/bin/$clibin") {
-		    # exact match.
-		    $clipath = "bin/$cliarch/bin/$clibin";
-		} elsif (-x $approx_bin) {
-		    # approximate match
-		    $clipath = $approx_bin;
-		} elsif ($local_arch =~ /^$approx/) {
-		    # same arch as localhost
-		    $clipath = "bin/mailclient";
-		} else {
-		    print STDERR
-			"Requested OS $cliarch for $cli not found.  ",
-			"Not copying binary.\n";
-		}
-	    } else {
-		# arch not found
-		print STDERR "Cannot determine architecture for $cli.  ",
-		"Not copying binary.\n";
-	    }
-	    # See if we have anything to copy:
-	    if ("$clipath @files" !~ /\S/) {
-		print STDERR "Nothing to copy to $cli.  Skipping.\n";
-		next;
-	    }
-	    my $rdir = ($tempdir) ?  "$tempdir/" : ".";
-	    # chmod so that the remote files can be easily cleaned up
-	    my $rcmd = "chmod g+w @files $clibin; uname -a";
-	    $rcmd = "cd $tempdir; " . $rcmd if ($tempdir);
-	    $rdir =~ s!/!\\!g if ($cliarch eq "NT4.0");
-	    if ($cli =~ /^localhost$/i) {
-		die "TEMPDIR must be set for 'localhost'\n"
-		    unless ($tempdir);
-		die "Invalid local NT copy.  Should never get here.\n"
-		    if ($cliarch eq "NT4.0"); # should never happen
-		print "Copying $clipath and message files to $rdir\n";
-		die_system ("$cpcmd @msgs $clipath $rdir");
-		die_system ($rcmd);
-	    } else {
-		print "$rcp $clipath @msgs $cli:$rdir\n" if ($params{DEBUG});
-		print "Copying $clipath and message files to $cli:$rdir\n";
-		warn_system (split (/\s+/, $rcp), $clipath, @msgs, "$cli:$rdir");
-		next if ($cliarch eq "NT4.0"); # chmod not valid
-		print "rcmd='$rcmd'\n" if ($params{DEBUG});
-		die_system (split (/\s+/, $rsh), $cli, $rcmd);
-	    }
-	    print "\n";
-	}
-
-	elsif ($mode eq "cleanup") {
-	    if ($params{DEBUG}) {	# get debug files
-		print "Cleaning up debug files on $cli\n";
-		my $rcmd = ($cliarch eq "NT4.0") ? "DEL" : "$rmcmd";
-		$rmcmd .= " mstone-debug.[0-9]*";
-		$rcmd = "cd $tempdir; " . $rcmd if ($tempdir);
-		$rcmd =~ s/;/&&/g if ($cliarch eq "NT4.0");
-		if ($cli =~ /^localhost$/i) {
-		    die "TEMPDIR must be set for 'localhost'\n"
-			unless ($tempdir);
-		    warn_system ($rcmd);
-		} else {
-		    warn_system (split (/\s+/, $rsh), $cli, $rcmd);
-		}
-	    } else {
-		print "Cleaning $cli\n";
-		my $rcmd = ($cliarch eq "NT4.0") ? "DEL" : "$rmcmd";
-		$rcmd .= " $clibin @files";
-		$rcmd = "cd $tempdir; " . $rcmd if ($tempdir);
-		$rcmd =~ s/;/&&/g if ($cliarch eq "NT4.0");
-		if ($cli =~ /^localhost$/i) {
-		    die "TEMPDIR must be set for 'localhost'\n"
-			unless ($tempdir);
-		    warn_system ($rcmd);
-		} else {
-		    warn_system (split (/\s+/, $rsh), $cli, $rcmd);
-		}
-	    }
-	}
-
-	else {
-	    die "Couldn't recognize mode $mode!\n";
-	}
-    }
-}
-
-# wait for children to finish
-if (($mode eq "timesync") || ($mode eq "checktime")) {
-    $pid = wait();
-    while ($pid != -1) {
-	$pid = wait();
-    }
-}
-
-# Print the results of the time checks
-if ($mode eq "checktime") {
-    print "Time from each client:\n";
-    foreach $section (@workload) {
-	next unless ($section->{sectionTitle} =~ /CLIENT/i);
-	my $slist = $section->{sectionParams};
-	$slist =~ s/HOSTS=\s*//; # strip off initial bit
-	foreach $cli (split /[\s,]/, $slist) {
-	    open TIMEFILE, "$tmpbase/$cli.tim"
-		|| warn "Counldn't open $tmpbase/$cli.tim\n";
-	    printf "%32s: ", $cli;
-	    while (<TIMEFILE>) { print; last;} # single line (2 on NT)
-	    close(TIMEFILE);
-	    unlink "$tmpbase/$cli.tim";
-	}
-    }
-}

mozilla/mstone/bin/smtpsink.pl

@@ -1,280 +0,0 @@
-/*
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is the Netscape Mailstone utility,
- * released March 17, 2000.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1999-2000 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s):     Sean O'Rourke <sean@sendmail.com>
- *                     Thom O'Connor <thom@sendmail.com>
- *                     Sendmail, Inc.
- *
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU Public License Version 2 or later (the "GPL"), in
- * which case the provisions of the GPL are applicable instead of
- * those above.  If you wish to allow use of your version of this file
- * only under the terms of the GPL and not to allow others to use your
- * version of this file under the NPL, indicate your decision by
- * deleting the provisions above and replace them with the notice and
- * other provisions required by the GPL.  If you do not delete the
- * provisions above, a recipient may use your version of this file
- * under either the NPL or the GPL.
- */
-
-use Thread qw(async);
-use FileHandle qw(_IOLBF);
-use Socket;
-use strict;
-use Getopt::Long;
-
-# options
-my $maxconn = SOMAXCONN;
-my $t_banner = 0;
-my $t_from = 0;
-my $t_rcpt = 0;
-my $t_dot = 0;
-my $port = 25;
-my $cs = '';
-my $log = '';
-my $proto = getprotobyname('tcp');
-
-# statistics
-my ($cmds, $errs, $bytesw, $bytesr, $msgs);
-
-GetOptions('maxconn:i'		=> \$maxconn,
-	   'banner-delay:i'	=> \$t_banner,
-	   'from-delay:i'	=> \$t_from,
-	   'rcpt-delay:i'	=> \$t_rcpt,
-	   'dot-delay:i'	=> \$t_dot,
-	   'log:s'		=> \$log,
-	   'checksums:s'	=> sub { use Digest::MD5; $cs = $_[0]; })
-    || &usage;
-
-if (@ARGV == 1) {
-    ($port) = @ARGV;
-}
-
-if ($log) {
-    if (open(LOG, ">$log")) {
-	print STDERR "Logging messages to $log\n";
-    } else {
-	warn ("Cannot open logfile $log\n");
-	$log = '';
-    }
-}
-
-socket(S, PF_INET, SOCK_STREAM, $proto) || die $!;
-setsockopt(S, SOL_SOCKET, SO_REUSEADDR, pack("l", 1)) || die $!;
-
-(bind(S, sockaddr_in($port, INADDR_ANY))
- && listen(S, $maxconn))
-    || die $!;
-
-my $addr;
-my $fh = new FileHandle;
-my $cnt = 0;
-
-$SIG{INT} = sub { close(LOG); print STDERR "done\n"; exit 0; };
-
-while(my $addr = accept($fh, S)) {
-    if (++$cnt % 100 == 0) {
-	print STDERR "$cnt\r";
-    }
-    my $thr = async { do_smtp($addr, $fh); };
-    $thr->join;
-    $fh = new FileHandle;
-}
-
-sub usage
-{
-    print STDERR <<EOS;
-Usage: $0 [options] [port]
-EOS
-    exit -1;
-}
-
-sub netline
-{
-    my $fh = shift;
-    my $line = $fh->getline;
-    $line =~ s/\r\n$// if $line;
-    $line;
-}
-
-sub millisleep
-{
-    my $t = shift;
-    select(undef, undef, undef, $t) if $t > 0;
-}
-
-sub netprint($@)
-{
-    my ($fh, @stuff) = @_;
-    foreach (@_) {
-	s/([^\r])\n/$1\r\n/g;
-	$fh->print($_);
-    }
-}
-
-sub do_smtp
-{
-    my ($addr, $s) = @_;
-    my $buf;
-    my ($port, $iaddr) = sockaddr_in($addr);
-    my $name = gethostbyaddr($iaddr, AF_INET);
-    $s->setvbuf($buf, _IOLBF, 1024);
-
-    millisleep($t_banner);
-    $s->print("220 wazzup, bro?\r\n");
-    my %state = ('conn'		=> $s,
-		 'host'		=> $name);
-    my %funcs = ('helo'		=> \&do_helo,
-		 'ehlo'		=> \&do_helo,
-		 'word'		=> \&do_helo,
-
-		 'quit'		=> \&do_quit,
-		 'latr'		=> \&do_quit,
-
-		 'mail'		=> \&do_from,
-		 'rcpt'		=> \&do_rcpt,
-		 'data'		=> \&do_data,
-		 'rset'		=> \&do_ok,
-		 'vrfy'		=> \&do_ok,
-		 'noop'		=> \&do_ok,
-		);
-    while (my $line = netline($s))
-    {
-	my ($cmd, $arg) = ($line =~ /^\s*(\S+)\s*(.*)$/);
-	die "cmd = `$cmd'" unless ($cmd = lc($cmd));
-	# fail 1% of commands
-	if ($funcs{$cmd}) {
-	    &{$funcs{$cmd}}(\%state, $cmd, $arg, \%funcs);
-	} else {
-	    $s->print("500 5.0.0 no.  Just... no.\r\n");
-	}
-    }
-    return 0;
-}
-
-sub already_said_that
-{
-    my ($state, $cmd, $arg) = @_;
-    $state->{conn}->print("503 5.0.0 Dude, you already said that.\r\n");
-}
-
-sub do_helo
-{
-    my ($state, $cmd, $arg) = @_;
-    $state->{helohost} = $arg;
-    die unless $cmd;
-    if ($cmd eq 'helo') {
-	if ($arg eq $state->{host}) {
-	    $state->{conn}->print("221 hello Mr. Honest\r\n");
-	} else {
-	    $state->{conn}->print("221 We know where you live, $state->{iaddr}\r\n");
-	}
-    } elsif ($cmd eq 'ehlo') {
-	my $esmtp = <<EOS;
-250-localhost is pleased to make your acquaintance, and offers:
-250 8bitmime
-EOS
-	if ($arg) {
-	    netprint($state->{conn}, $esmtp);
-	} else {
-	    $state->{conn}->print("501 5.0.0 tell me more...\r\n");
-	    return;
-	}
-    } else {
-	$state->{conn}->print("221 2.0.0 peace brother\r\n");
-    }
-}
-
-sub do_quit
-{
-    my ($state, $cmd) = @_;
-    $state->{conn}->print( "221 2.0.0 drop in any time\r\n");
-    close ($state->{conn});
-}
-
-sub do_from
-{
-    my ($state, $cmd, $args, $funcs) = @_;
-    millisleep($t_from);
-    $state->{conn}->print( "250 2.1.0 Okay, keep talking\r\n");
-    $funcs->{rcpt} = \&do_rcpt;
-}
-
-sub do_rcpt
-{
-    my ($state, $cmd, $args, $funcs) = @_;
-    my ($rcpt) = ($args =~ /to\:\s*(.+)/i);
-    millisleep($t_rcpt);
-    $state->{conn}->print("250 2.1.5 ${rcpt}'s cool\r\n");
-    $funcs->{data} = \&do_data;
-}
-
-sub do_data
-{
-    my ($state, $cmd, $args, $funcs) = @_;
-    $state->{conn}->print( "354 up to the dot...\r\n");
-    if ($cs) {
-	my $line;
-	my $md5 = Digest::MD5->new;
-	# skip headers
-    header: while ($_ = netline($state->{conn})) {
-	    last header if /^$/;
-	    last body if /^\.$/;
-	}
-
-    body: while ($_ = $state->{conn}->getline) {
-	    if (/^=CS=MD5=(.+)\r/) {
-		my $sum = $1;
-		my $end = netline($state->{conn});
-
-		if ($end ne '.') {
-		    print STDERR "Fake checksum?: $sum\n";
-		    while (netline($state->{conn}) ne '.') { }
-		} elsif (lc($sum) eq lc($md5->hexdigest)) {
-#  		    print STDERR "MD5 sum OK.\n";
-		} else {
-		    print STDERR "MD5 sum mismatch: $sum, ",
-			$md5->hexdigest, "\n";
-		}
-		last body;
-	    } elsif (/^\.\r$/) {
-  		print STDERR "no checksum\n" if $cs =~ /^r/;
-		last body;
-	    }
-	    print LOG $_ if $log;
-	    $md5->add($_);
-	}
-	print LOG ".\r\n" if $log;
-    } else {
-	local ($/) = "\r\n.\r\n";
-	$state->{conn}->getline;
-    }
-    millisleep($t_dot);
-    if (rand() % 100 == 0) {
-	$state->{conn}->print("451 ohshit\r\n");
-    } else {
-	$state->{conn}->print("250 2.0.0 I will deliver\r\n");
-    }
-}
-
-sub do_ok
-{
-    my ($state) = @_;
-    $state->{conn}->print("220 uhhuh\r\n");
-}

mozilla/mstone/bin/util.pl

@@ -1,825 +0,0 @@
-# util.pl -- utilities which used to live in bin/args.pl
-
-sub my_system {
-    my ($file, $line);
-    $file = shift;
-    $line = shift;
-    my $ret;
-    if (($ret = system(@_)) != 0) {
-	my $msg = "$file:$line: @_\n\t";
-	my ($excode, $sig, $cored) = ($ret >> 8, $ret & 127, $ret & 128);
-	if ($sig) {
-	    $msg .= "died with signal $sig";
-	    $msg .= ' (core dumped)' if ($cored);
-	    $msg .= "\n";
-	} else {
-	    $msg .= "exited abnormally with code $excode\n";
-	}
-	return $msg;
-    }
-    undef;
-}
-
-sub warn_system {
-    my ($pack, $file, $line) = caller;
-    my $msg = my_system($file, $line, @_);
-    warn $msg if $msg;
-}
-
-sub die_system {
-    my ($pack, $file, $line) = caller;
-    my $msg = my_system($file, $line, @_);
-    die $msg if $msg;
-}
-
-# Utility functions
-# Create a unique hash array. Programming Perl, 2nd edition, p291 (p217?)
-package ArrayInstance;
-sub new {
-    my $type = shift;
-    my %params = @_;
-    my $self = {};
-    return bless $self, $type;
-}
-
-package main;
-
-# run a command in the background, return its PID
-# Uses fork: will not run on NT in perl 5.004
-# if the server is "localhost", ignore the rcmd part
-# if stdin, stdout, and/or stderr is set, redirect those for the sub process
-sub forkproc {
-    my $rcmd = shift;
-    my $server = shift;
-    my $command = shift;
-    my $stdin = shift;
-    my $stdout = shift;
-    my $stderr = shift;
-
-    if (my $pid = fork()) {
-	return $pid;		# parent
-    }
-
-    # rest of this is in the child
-    if ($stdin) {		# redirect stdin if needed
-	close (STDIN);
-	open STDIN, "<$stdin"
-	    || die "Couldn't open $stdin for input\n";
-    }
-
-    if ($stdout) {		# redirect stdout if needed
-	close (STDOUT);
-	open STDOUT, ">>$stdout"
-	    || die "Couldn't open $stdout for output\n";
-    }
-
-    if ($stderr) {		# redirect stderr if needed
-	close (STDERR);
-	open STDERR, ">>$stderr"
-	    || die "Couldn't open $stderr for output\n";
-    }
-
-    if ($server =~ /^localhost$/i) {
-	exec $command;
-	die "Coundn't exec $command:$!\n";
-    } else {
-	exec split (/\s+/, $rcmd), $server, $command;
-	die "Coundn't exec $rcmd $server $command:$!\n";
-    } 
-}
-
-# Relocate file to tmp directory (if it is in the results directory),
-#  and put a ~ on the end of it.
-# ASSUMES tmp and results are on the same partition (on NT, same drive).
-# Usage: fileBackup (filename)
-sub fileBackup {
-    my $filename = shift;
-    my $bfile = $filename;
-
-    (-f $filename) || return 0;	# file doent exist
-    $bfile =~ s/$resultbase/$tmpbase/; # move to tmp
-    $bfile .= "~";		# indicate that this is a backup
-    (-f $bfile) && unlink ($bfile);
-    #print "Backing up $filename to $bfile\n"; # DEBUG
-    rename ($filename, $bfile) || unlink ($filename);
-}
-
-# Insert text into a file after a tagline
-# fileInsertAfter (filename, tagstring, newtext)
-sub fileInsertAfter {
-    my $filename = shift || die "fileInsertAfter: missing filename";
-    my $tagline = shift || die "fileInsertAfter: missing tagline";
-    my $newtext = shift || die "fileInsertAfter: missing text";
-    my $foundit = 0;
-
-    open(OLD, "<$filename") ||
-	open(OLD, "gunzip -c $filename |") ||
-	    die "fileInsertAfter: Could not open input $filename: $!";
-    open(NEW, ">$filename+") ||
-	die "fileInsertAfter: Could not open output $filename+: $!";
-
-    while (<OLD>) {
-	print NEW $_;		# copy (including tagline)
-
-	next unless (/$tagline/); # matched tagline
-
-	print NEW $newtext;	# insert new text
-	$foundit++;
-	last;			# only change first occurance
-    }
-
-    if ($foundit) {		# copy rest of file
-	while (<OLD>) {
-	    print NEW $_;
-	}
-    }
-
-    close (OLD);
-    close (NEW);
-    if ($foundit) {
-	fileBackup ($filename);
-	rename ("$filename+", "$filename");
-	#print "Updated $filename\n"; # DEBUG
-	return $foundit;
-    } else {
-	($params{DEBUG}) && print "No change to $filename\n"; # DEBUG
-	unlink ("$filename+");
-	return 0;
-    }
-}
-
-# Do text for text replacements in a file.
-# Perl wildcards are automatically quoted.
-# fileReplace (filename, matchPat, oldtext, newtext)
-sub fileReplaceText {
-    my $filename = shift || die "fileReplaceText: missing filename";
-    my $tagline = shift || die "fileReplaceText: missing tagline ($filename)";
-    my $oldtext = shift;
-    my $newtext = shift;
-    my $foundit = 0;
-
-    return if ($newtext eq "");	# nothing to do
-    return if ($oldtext eq "");	# nothing can be done
-
-    open(OLD, "<$filename") ||
-	open(OLD, "gunzip -c $filename |") ||
-	    die "fileReplaceText: Could not open input $filename: $!";
-    open(NEW, ">$filename+") ||
-	die "fileReplaceText: Could not open output $filename+: $!";
-
-    $oldtext =~ s/([][{}*+?^.\/])/\\$1/g; # quote regex syntax
-
-    while (<OLD>) {
-	if (/$tagline/i) { # matched tagline
-	    $foundit++;
-	    s/$oldtext/$newtext/; # do the replace
-	}
-	print NEW $_;
-    }
-
-    close (OLD);
-    close (NEW);
-    if ($foundit) {
-	fileBackup ($filename);
-	rename ("$filename+", "$filename");
-	#print "Updated $filename\n"; # DEBUG
-	return $foundit;
-    } else {
-	($params{DEBUG}) && print "No change to $filename\n"; # DEBUG
-	unlink ("$filename+");
-	return 0;
-    }
-}
-
-# copy a file to a new name.  Handles possible compression.  OS independent.
-# fileCopy (filename, newname)
-sub fileCopy {
-    my $filename = shift || die "fileReplaceText: missing filename";
-    my $newname = shift || die "fileReplaceText: missing newname ($filename)";
-
-    open(OLD, "<$filename") ||
-	open(OLD, "gunzip -c $filename |") ||
-	    die "fileReplaceText: Could not open input $filename: $!";
-    open(NEW, ">$newname") ||
-	die "fileReplaceText: Could not open output $newname: $!";
-
-    while (<OLD>) {		# copy it
-	print NEW $_;
-    }
-
-    close (OLD);
-    close (NEW);
-    return 0;
-}
-
-# display a file to STDOUT.  Handles possible compression
-sub fileShow {
-    my $filename = shift || die "fileShow: missing filename";
-    open(SHOWIT, "<$filename") ||
-	open(SHOWIT, "gunzip -c $filename.gz |") ||
-	    die "fileShow: Couldn't open $filename: $!";
-    while (<SHOWIT>) { print; }
-    close(SHOWIT);
-}
-
-# sub function to figure time extents
-# (start, end) = dataMinMax counterName \@protocols oldstarttime oldendtime
-# Use 0 for uninitialized start or end
-sub dataMinMax {
-    my $name = shift;
-    my $protos = shift;
-    my $start = shift;
-    my $end = shift;
-    
-    # make global
-    # create the plot script and data files
-    # Figure out the encompassing time extent
-    foreach $p (@$protos) {	# create the plot data files
-	my @times = sort numeric keys %{ $graphs{$p}->{$name}};
-	if ($#times <= 0) {
-	    next;
-	}
-	if (($start == 0) || ($times[0] < $start)) {
-	    $start = $times[0];
-	}
-	if (($end == 0) || ($times[0] > $end)) {
-	    $end = $times[$#times];
-	}
-    }
-    #printf ("Data $name start=$start end=$end (%d points)...\n",
-	#    $end - $start);
-    return ($start, $end);
-}
-
-# simple function to formatted a number into n, n K, n M, or n G
-sub kformat {
-    my $n = shift;
-    my $r = "";
-    if ($n > (1024*1024*1024)) {
-	$r = sprintf "%.2fG", $n / (1024*1024*1024);
-    } elsif ($n > (1024*1024)) {
-	$r = sprintf "%.2fM", $n / (1024*1024);
-    } elsif ($n > 1024) {
-	$r = sprintf "%.2fK", $n / 1024;
-    } else {
-	$r = sprintf "%d ", $n;
-    }
-    return $r;
-}
-
-# simple function to formatted a time into Ns, Nms, or Nus
-# the goal is to make a table of timss uncluttered and easy to read
-# I dont convert to minutes or hours because the non-1000x multipliers
-#   are hard to back solve in your head for comparisons
-sub tformat {
-    my $n = shift;
-    my $r = "";
-    if ($n == 0.0) {
-	$r = "0.0";		# make exactly 0 explicit
-    } elsif ($n < 0.001) {
-	$r = sprintf "%.2fus", $n * 1000 * 1000;
-    } elsif ($n < 1.0) {
-	$r = sprintf "%.2fms", $n * 1000;
-    } elsif ($n >= 1000.0) {
-	$r = sprintf "%.0fs", $n;
-    } elsif ($n >= 100.0) {
-	$r = sprintf "%.1fs", $n;
-    } else {
-	$r = sprintf "%.3fs", $n;
-    }
-    return $r;
-}
-
-#Usage: commify (1234567) returns 1,234,567
-sub commify {			# perl cookbook p64-65
-    my $text = reverse $_[0];
-    $text  =~ s/(\d\d\d)(?=\d)(?!\d*\.)/$1,/g;
-    return scalar reverse $text;
-}
-
-# subroutine to enable numeric sorts.  Programming Perl p218
-# Use: sort numeric ...
-sub numeric { $a <=> $b; }
-
-# on NT, turn slash to backslash, then print.  Else print.
-sub pathprint {
-    my $str = shift;
-    $str =~ s!/!\\!g if ($params{NT});	# turn slash to back slash
-    print $str;
-}
-    
-# figureTimeNumber number
-# Given an number like: 60m, 1h, 100s, 4d, 200
-# Return 60, 1, 100, 4, 200
-sub figureTimeNumber {
-    my $arg = shift;
-
-    ($arg =~ /([0-9]+)(s|sec|second|seconds|m|min|minute|minutes|h|hr|hour|hours|d|day|days)$/i)
-	&& return $1;
-    return $arg;			# return default
-}
-
-# figureTimeUnits number, default
-# Given an number like: 60m, 1h, 100s, 4d
-# Return a string of minutes, hours, seconds, days
-# Else return the second argument
-sub figureTimeUnits {
-    my $arg = shift;
-
-    ($arg =~ /(s|sec|second|seconds)$/i)	&& return "seconds";
-    ($arg =~ /(m|min|minute|minutes)$/i)	&& return "minutes";
-    ($arg =~ /(h|hr|hour|hours)$/i)	&& return "hours";
-    ($arg =~ /(d|day|days)$/i)		&& return "days";
-
-    return shift;		# return default
-}
-
-# figureTimeSeconds number, defaultUnits
-# Given an number like: 60m, 2h, 100s, 4d
-# Return 60*60, 2*60*60, 100, 4*24*60*60
-sub figureTimeSeconds {
-    my $arg = shift;
-
-    ($arg =~ /([0-9]+)(s|sec|second|seconds)$/i)	&& return $1;
-    ($arg =~ /([0-9]+)(m|min|minute|minutes)$/i)	&& return (60*$1);
-    ($arg =~ /([0-9]+)(h|hr|hour|hours)$/i)	&& return (60*60*$1);
-    ($arg =~ /([0-9]+)(d|day|days)$/i)		&& return (24*60*60*$1);
-
-    if ($_) { 
-	my $def = shift;
-	return $arg * figureTimeSeconds ("1$def"); # return scaled by default
-    } else {
-	return $arg;		# return it
-    }
-}
-
-# BACK COMPATIBILITY (everything now in the workload file)
-# read the testbed conf file, convert to workload sections
-# machine, how many processes, how many threads/proc, arch
-# only the first 2 fields are required.  Lines starting with # are ignored.
-# You can include other files using <include conf/filename.tbd>
-# exampe:
-#	client1  5 10 SunOS5.5.1
-sub readTestbedFile {
-    my $filename = shift;
-    foreach $section (@workload) {
-	next unless ($section->{sectionTitle} =~ /CLIENT/i);
-	print "Testbed $filename skipped, clients read in workload\n";
-	return 1;			# clients already read in workload
-    }
-
-    my $level = 0;
-    if ($_) {
-	$level = 1 + shift;
-	die "Too many nested includes ($level) in $filename!"
-	    unless ($level < 100);
-    }
-    my $handle = "$filename$level";
-    open($handle, "<$filename") ||
-	open($handle, "gunzip -c $filename.gz |") ||
-	    die "Couldn't open testbed $filename: $!";
-
-    while(<$handle>) {
-	chomp;
-
-	s/#.*//;		# strip any comments from line
-
-	m/^\s*$/o &&  next; 	# continue if blank line
-
-	# handle include statement
-	if (m/^<(include|INCLUDE)\s+([^\s]+)\s*>/o) {
-	    #print "Including $2 from $filename\n";
-	    readTestbedFile ($2, $level) || die;
-	    next;
-	}
-
-	# get the server name and number of processes 
-	my @line = split(/\s+/);
-				# create CLIENT entry in workload
-	my $sparm = ArrayInstance->new();
-	if ($line[1]) {
-	    $sparm->{"sectionTitle"} = "CLIENT";
-	    $sparm->{"sectionParams"} = "HOSTS=$line[0]";
-	    $sparm->{"PROCESSES"} = $line[1];
-	    $sparm->{"THREADS"} = $line[2] if ($line[2]);
-	    $sparm->{"ARCH"} = $line[3] if ($line[3]);
-	} else {
-	    $sparm->{"sectionTitle"} = "MONITOR";
-	    $sparm->{"sectionParams"} = "HOSTS=$line[0]";
-	    $sparm->{"COMMAND"} = $line[2];
-	}
-	($params{DEBUG})
-	    && print "<$sparm->{sectionTitle} $sparm->{sectionParams}>\n";
-	push @workload, $sparm;
-    }
-    close ($handle);
-}
-
-# BACK COMPATIBILITY (everything now in the saved workload file)
-# This is now only needed to process mailstone4.1 runs
-sub readConfigFile {
-    my $filename = shift;
-    open(CONFIG, "<$filename") ||
-	open(CONFIG, "gunzip -c $filename.gz |") ||
-	    die "Couldn't open config file $filename: $!";
-
-    while(<CONFIG>) {
-	chomp;
-
-	s/#.*//;		# strip any comments from line
-
-	m/^\s*$/o && next; 	# continue if blank line
-
-	# get the property and value
-	my @line = split(/=/);
-	$params{$line[0]} = $line[1];
-    }
-    close CONFIG;
-}
-
-# read the workload file and store it as a list of hashes
-# Each hash always has the fields: sectionTitle and sectionParams
-# usage: readWorkloadFile filename, \@list
-sub readWorkloadFile {
-    my $filename = shift || die "readWorkloadFile: Missing file name";
-    my $plist = shift || die "readWorkloadFile: Missing return list";
-    my $level = 0;		# file inclusion level
-    my @handles;
-
-    my $fh = "$filename$level";
-
-    ($params{DEBUG}) && print "Reading workload from $filename.\n";
-    open($fh, "<$filename") ||
-	open($fh, "gunzip -c $filename.gz |") ||
-	    die "readWorkloadFile Couldn't open testbed $filename: $!";
-    $includedFiles{$filename} = 1; # mark file as included
-
-    my $sparm=0;
-    my $conline = "";
-    
-    while($fh) {
-	while(<$fh>) {
-	    s/#.*//;		# strip any comments from line (quoting?)
-	    s/\s*$//;		# strip trailing white space
-	    if ($conline) {	# utilize line continue
-		$_ = $conline . "\\\n" . $_;
-		$conline = "";
-	    }
-	    if (m/\\$/o) {	# check for quoted line continue
-		s/\\$//;	# 
-		$conline = $_;
-		next;
-	    }
-	    s/^\s*//;		# strip initial white space
-	    m/^$/o &&  next;	# continue if blank line
-
-	    # handle include and includeOnce statements
-	    if ((m/^<(include)\s+(\S+)\s*>/i)
-		|| (m/^<(includeonce)\s+(\S+)\s*>/i)) {
-		my $incfile = $2;
-		if (($1 =~ m/^includeonce/i) && ($includedFiles{$incfile})) {
-		    ($params{DEBUG})
-			&& print "readWorkloadFile:includeOnce $incfile already read.\n";
-		    next;
-		}
-		($params{DEBUG})
-		    && print "readWorkloadFile include $incfile from $filename.\n";
-		$includedFiles{$incfile} = 1; # mark file
-		push @handles, $fh; # push current handle on to stack
-		if ($level++ > 99) { # check recursion and make handles unique
-		    die "readWorkloadFile: include level too deep: $filename $level\n";
-		}
-		$fh = "$incfile$level";
-		open($fh, "<$incfile") ||
-		    open($fh, "gunzip -c $incfile.gz |") ||
-			die "readWorkloadFile Couldn't open testbed file $incfile: $!";
-		$filename = $incfile;	# for error messages
-		next;
-	    }
-
-	    if (m!^</(\w+)>$!o) { # end of section
-		my $end = $1;
-		unless ($sparm->{"sectionTitle"} =~ /$end/i) {
-		    die "readWorkloadFile Mismatched section $filename: $. '$sparm->{sectionTitle}' '$end'\n";
-		    return 0;
-		}
-		($params{DEBUG}) && print "</$sparm->{sectionTitle}>\n";
-		push @$plist, $sparm;
-		$sparm = 0;
-		next;
-	    }
-
-	    if (m!^<(\w+)\s*(.*)>$!o) { # start of section
-		my $sec = $1;
-		my $more = $2;
-
-		if ($sparm) {
-		    die "readWorkloadFile Missing section end $filename: $. '$sparm->{sectionTitle}'\n";
-		}
-		if ($sec =~ /CONFIG/i) { # special case, map to existing global
-		    $sparm = \%params;
-		} elsif ($sec =~ /DEFAULT/i) { # special case, only one DEFAULT
-		    if ($defaultSection) { # use existing defaultSection
-			$sparm = $defaultSection;
-		    } else {	# create a new one
-			$sparm = ArrayInstance->new();
-			$sparm->{"sectionTitle"} = uc $sec; # ignore case
-			$sparm->{"lineList"} = ();
-			$defaultSection = $sparm;
-		    }
-		} else {
-		    $sparm = ArrayInstance->new();
-		    $sparm->{"sectionTitle"} = uc $sec; # ignore case
-		    $sparm->{"lineList"} = ();
-		}
-		$sparm->{"sectionParams"} = $more; # take newest more info
-		($params{DEBUG})
-		    && print "<$sparm->{sectionTitle} $sparm->{sectionParams}>\n";
-		next;
-	    }
-
-	    # must be in a section, get parameters
-	    unless ($sparm) {
-		die "readWorkloadFile Entry encountered outside a section $filename: $. $_\n";
-		return 0;
-	    }
-	    my ($nm, $val) = split (/[\s=]+/, $_, 2);
-	    $nm = uc $nm;	# ignore case
-	    ($params{DEBUG}) && print "    $nm = $val\n";
-	    if ($nm =~ /ACCOUNTFORMAT/) { # BACK COMPATIBILITY
-		print "WARNING: 'accountFormat' is obsolete.  Use 'addressFormat' and 'loginFormat'\n";
-		$sparm->{"addressFormat"} = $val;
-		push @{$sparm->{"lineList"}}, "addressFormat $val";
-		$val =~ s/@.+$//; # strip at and everything after
-		$sparm->{"loginFormat"} = $val;
-		push @{$sparm->{"lineList"}}, "loginFormat $val";
-		next;
-	    } elsif ($nm =~ /NUMACCOUNTS/) { # BACK COMPATIBILITY
-		print "WARNING: 'numAccounts' is obsolete.  Use 'numAddresses' and 'numLogins'\n";
-		$sparm->{"numAddresses"} = $val;
-		push @{$sparm->{"lineList"}}, "numAddresses $val";
-		$sparm->{"numLogins"} = $val;
-		push @{$sparm->{"lineList"}}, "numLogins $val";
-		next;
-	    } elsif ($nm =~ /BEGINACCOUNTS/) { # BACK COMPATIBILITY
-		print "WARNING: 'beginAccounts' is obsolete.  Use 'firstAddress' and 'firstLogin'\n";
-		$sparm->{"firstAddress"} = $val;
-		push @{$sparm->{"lineList"}}, "firstAddress $val";
-		$sparm->{"firstLogin"} = $val;
-		push @{$sparm->{"lineList"}}, "firstLogin $val";
-		next;
-	    } 
-	    push @{$sparm->{"lineList"}}, $_; # save lines in original order
-	    $sparm->{$nm} = $val;
-	    next;
-	}
-	close ($fh);
-	$fh = pop @handles || last; # empty include stack
-	$filename = $fh;
-	$sparm = 0;		# can only include whole sections
-    }
-    return 1;			# success
-}
-
-# Write out a workload list to a file
-# Optionally, pass in a list of sectionTitle's it should ignore
-# usage: writeWorkloadFile filename \@list [\@skipList]
-sub writeWorkloadFile {
-    my $filename = shift || die "writeWorkloadFile: Missing file name";
-    my $plist = shift || die "writeWorkloadFile: Missing return list";
-    my $skip = shift;
-    my @skipH;
-    my $configSeen = 0;
-    my $defaultSeen = 0;
-    my @paramH;
-
-    if ($skip) {
-	foreach $s (@$skip) {	# turn list into a hash
-	    $skipH{(uc $s)} = $s; # fix case for index
-	}
-    }
-    foreach $s (@workloadParameters) { # turn list into a hash
-	$paramH{(uc $s)} = $s;	# fix case for index
-    }
-
-    ($params{DEBUG}) && print "Writing workload to $filename.\n";
-    unless (open(WORKOUT, ">$filename")) {
-	die "Couldn't open testbed $filename: $!";
-    }
-    
-    foreach $sparm (@$plist) {	# each hash reference in the list
-	if (($skip)
-	    && ($skipH{$sparm->{"sectionTitle"}})) {
-	    #($params{DEBUG}) &&
-	    #print "Skipping section $sparm->{sectionTitle}\n";
-	    next;
-	}
-	
-	# all CONFIG,DEFAULT sections point to the same hash, output once only
-	if ($sparm->{"sectionTitle"} =~ /^CONFIG$/) {
-	    next if $configSeen;
-	    $configSeen++;
-	}
-	if ($sparm->{"sectionTitle"} =~ /^DEFAULT$/) {
-	    next if $defaultSeen;
-	    $defaultSeen++;
-	}
-	if ($sparm->{sectionParams}) { # write section with extra args
-	    print WORKOUT "<$sparm->{sectionTitle} $sparm->{sectionParams}>\n";
-	} else {
-	    print WORKOUT "<$sparm->{sectionTitle}>\n";
-	}
-	if ($sparm->{"sectionTitle"} =~ /^(CONFIG|CLIENT)$/) {
-	    # for Config or Client, output the hash  to get computed config
-	    foreach $k (sort keys %$sparm) { # output each parameter
-		# skip sectionTitle and sectionParams
-		($k =~ /^(sectionTitle|sectionParams|lineList)$/) && next;
-		printf WORKOUT "  %s\t%s\n",
-		($paramH{$k}) ? $paramH{$k} : $k,
-		$sparm->{$k};
-	    }
-	} else {	# write out the line list
-	    foreach $l (@{$sparm->{"lineList"}}) {
-		print WORKOUT "  $l\n";
-	    }
-	}
-	print WORKOUT "</$sparm->{sectionTitle}>\n\n";
-    }
-    close WORKOUT;
-}
-
-# Usage: getClientFilename hostname section
-sub getClientFilename  {
-    my $cli = shift || die "Missing client name";
-    my $section = shift || die "Missing section hash";
-    return "$tmpdir/$cli-$section->{GROUP}.out"
-	if ($params{USEGROUPS} && $section->{GROUP});
-    return "$tmpdir/$cli.out"
-}
-
-sub setConfigDefaults {		# set CONFIG defaults
-    # These are set after writing out the test copy to avoid clutter
-
-    # Path to gnuplot executable
-    $params{GNUPLOT}="gnuplot/gnuplot"
-	unless ($params{GNUPLOT});
-
-    # This is the directory the client lives in
-    $params{TEMPDIR} = "/var/tmp"
-	unless($params{TEMPDIR});
-
-    # Set default remote shell
-    #$params{RSH} = "rsh"
-    $params{RSH} = "ssh"
-	unless($params{RSH});
-
-    # Set default remote copy
-    #$params{RCP} = "rcp"
-    $params{RCP} = "scp"
-	unless($params{RCP});
-
-    # Size of generated gifs
-    $params{CHARTHEIGHT} = 480
-	unless($params{CHARTHEIGHT});
-    $params{CHARTWIDTH} = 640
-	unless($params{CHARTWIDTH});
-    $params{CHARTPOINTS} = int (($params{CHARTWIDTH}-60)*0.8)
-	unless($params{CHARTPOINTS});
-
-
-    # The name of the remote executable
-    $params{CLIENTCOMMAND} = "mailclient"
-	unless ($params{CLIENTCOMMAND});
-
-    # Set default monitoring command
-    $params{MONITORCOMMAND} = "vmstat %f"
-	unless($params{MONITORCOMMAND});
-
-    # Set default switches to makeusers
-    $params{MAKEUSERSARGS} = "-4"
-	unless ($params{MAKEUSERSARGS});
-
-    # Figure out @protocols, this sets the report order
-    @protocols = ();
-    {
-	my %skipH;
-	foreach $s (@nonProtocolSections) { # turn list into a hash
-	    #print "$s ";
-	    $skipH{(uc $s)} = $s; # fix case for index
-	}
-	print "\n";
-	foreach $sparm (@workload) {	# each hash reference in the list
-	    next if ($skipH{$sparm->{"sectionTitle"}});
-
-	    ($params{DEBUG}) &&
-		print "Found protocol ". $sparm->{"sectionTitle"} . "\n";
-
-	    push @protocols, $sparm->{"sectionTitle"};
-				# add to skip list so only added once
-	    $skipH{(uc $sparm->{"sectionTitle"})} = $sparm->{"sectionTitle"};
-	}
-    }
-    @protocolsAll = @protocols;
-    push @protocolsAll, "Total";
-
-    # figure out the graphs ???
-}
-
-sub parseArgs {			# get args
-    while (@ARGV) {
-	my $arg = shift(@ARGV);
-
-	if ($arg =~ /^-a$/i) {	# was undocumented feature in 4.1
-	    $params{ADDGRAPHS} = shift(@ARGV); # extra graphs
-	    next;
-	}
-	if ($arg =~ /^-b$/i) {
-	    $params{TITLE} = shift(@ARGV); # banner
-	    next;
-	}
-
-	# BACK COMPATIBILITY (everything now in the saved workload file)
-	if ($arg =~ /^-c$/i) {	# config file, read when encountered
-	    my $configFile = shift(@ARGV);
-	    readConfigFile ($configFile);
-	    next;
-	}
-
-	if ($arg =~ /^-d$/i) {
-	    $params{DEBUG}++;	# Debug
-	    next;
-	}
-
-	if ($arg =~ /^-h$/i) {	# Help
-	    print "Usage: -w workfile [-t time] [-r ramptime] [-l load] [-v] [-d]\n";
-	    print "\t[-b banner] [-n notes] [-s sysconfigfile] [-a add_graphs_file]\n";
-	    print "\t[-c configfile] [-m machinefile] [-z] [PARAM=value]...\n";
-
-	    die "Usage";
-	}
-
-	if ($arg =~ /^-l$/i) {	# "load", FIX: naming conventions
-	    $params{CLIENTCOUNT} = shift(@ARGV); # desired client count
-	    next;
-	}
-
-	# BACK COMPATIBILITY (everything now in the saved workload file)
-	if ($arg =~ /^-m$/i) {
-	    $params{TESTBED} = shift(@ARGV);	# testbed machines file
-	    next;
-	}
-
-	if ($arg =~ /^-n$/i) {
-	    $params{COMMENTS} = shift(@ARGV); # notes
-	    next;
-	}
-
-	if ($arg =~ /^-r$/i) {
-	    $params{RAMPTIME} = shift(@ARGV); # ramptime
-	    next;
-	}
-	if ($arg =~ /^-s$/i) {
-	    $params{SYSCONFIG} = shift(@ARGV); # system config html file
-	    next;
-	}
-	if ($arg =~ /^-t$/i) {
-	    $params{TIME} = shift(@ARGV); # test time
-	    next;
-	}
-
-	if ($arg =~ /^-v$/i) {
-	    $params{VERBOSE} = 1;	# verbose mode
-	    next;
-	}
-
-	if ($arg =~ /^-w$/i) {	# workload file (may occur multiple times)
-	    my $f = shift(@ARGV);
-	    readWorkloadFile ($f, \@workload) || die "Error reading workload: $@\n";
-	    $params{WORKLOAD} = $f;
-	    next;
-	}
-
-	if ($arg =~ /^-z$/i) {
-	    $params{NT} = 1;		# NT mode
-	    next;
-	}
-
-	# any other CONFIG parameter: FIELD=value
-	if ($arg =~ /^(\w+)=(\S.*)$/) {
-	    my $field = uc $1;
-	    $params{$field} = $2;
-	    next;
-	}
-	die "Unknown argument '$arg'";
-    }
-
-    if ($params{NT}) {		# should use Cwd module
-	$cwd = `cd`;		# NT get current directory
-	$cwd = `pwd` unless ($cwd); # in case we are really on UNIX
-    } else {
-	$cwd = `pwd`;		# in case we are really on UNIX
-    }
-    chomp $cwd;		# strip NL
-}
-
-return 1;

mozilla/mstone/conf/README.wld.in

@@ -1,271 +0,0 @@
-I.   Format
-II.  Workload Configuration Sections
-III. Report Generation Sections
-
----------
-I. Format
----------
-
-The config-file format is very free-form -- for example, this text is
-skipped as a "comment" because it doesn't look like anything else.  A
-section always starts with a line ending in a colon.  Everything up to
-the next section, end-of-file, or `__END__' is part of the current
-section.
-
-Name/value pairs within a section are pairs starting with whitespace,
-and separated by a colon followed by whitespace.  So you can write
-something like this
-
-#	hello there:		     mister foo
-
-and it will be ignored.  Had the '#' before the "hello" not been
-there, the attribute name would have been `hello there' and its value
-would have been `mister foo'.  Leading and trailing whitespace is
-skipped, but internal whitespace is perfectly OK.  Note that the
-"comment" character doesn't have to be a '#', but can be anything you
-want (except whitespace).
-
-Leading whitespace also denotes continued values.  So
-
-	foo:				blah blah
-    and some more words which are part of foo's value.
-
-creates a variable named 'foo' with this value (including the \n) -- 
-"blah blah
-and some more words which are part of foo's value."
-
-Finally, anything after '__END__' on a line by itself gets inserted
-literally into each .wld file.  This is the place to put <monitor>
-sections.
-
---------------------------
-II. Workload Configuration
---------------------------
-
-Parameters with no default are required.
-
-Messages
---------
-
-Message attributes are defined in the `message' section.  
-
-Parameter	Default		Description
----------	-------		-----------
-size				size distribution (including headers).
-recipients		    	number of recipients
-headers		~unif(10, 30)	number of headers
-line length	60		line length
-mime	 	0		number of MIME parts
-
-Users
------
-
-User behavior parameters are described in the `user' section.
-
-Parameter	Default		Description
----------	-------		-----------
-messages per day
-protocol			mail read
-activity			`DURATION each TIME' or `START - STOP'
-check interval			how often user checks mail when active
-read messages	0		number of old msgs each user has
-read time	0		how long user takes to `read' a message
-keep		0		proportion of messages kept on server
-connection type <unlimited>	`latency = X ; bandwidth = X'
-drop rate	0		proportion of connections dropped before logout
-
-Delivery
---------
-
-Delivery parameters are described in the `delivery' section.
-
-Parameter		Default		Description
----------		-------		-----------
-messages per connection	1		messages sent per SMTP session
-percent remote		0		% mail going to remote host (sink)
-connection type		<unlimited>	
-fluctuation		<uniform>	`START - END = X % ; ...'
-
-Test
-----
-
-The `test' section configures the number of users, the time of day to
-be simulated, etc.
-
-Parameter		Default		Description
----------		-------		-----------
-start					time of day to start sim
-end					end time of day.
-length					duration.  Either length or end 
-					must be specified.
-users					total user base
-percent active				percentage of total user base active
-					during test period
-messages per second			messages per second to delivery for
-					SMTP-only simulation.  Either
-					`messages per second' or `users'
-					and `percent active' must be
-					specified.
-comments		<nothing>	notes on test.
-preparer		Anonymous	Name to use on reports.
-date			<ctime(3)>
-configuration		<nothing>	Configuration name for report.
-
-Environment Configuration
--------------------------
-
-Several sections describe the test environment:
-
-Sink
-----
-
-The `sink' section describes the remote mail sink.
-
-Parameter		Default		Description
----------		-------		-----------
-addressFormat		smuser%ld@	Like addressFormat, but used to 
-					generate remote addresses.
-					`hostname' will be appended if it
-					ends in `@'.
-hostname				host on which SMTP sink lives.  Used
-					for remote delivery.
-
-Server
-------
-
-The `server' section describes the mail server to be sized:
-
-Parameter		Default		Description
----------		-------		-----------
-smtp port		25
-pop port		110
-imap port		143
-web port		1066
-
-hostname				Mail server
-
-addressFormat		smuser%ld@	Passed to
-					sprintf(recipient, addressFormat,
-					        userNum, domainNum).  If
-					addressFormat ends in `@', `server'
-					is automatically appended.
-loginFormat		smuser%ld@	Same as addressFormat, but used to
-					generate usernames.
-passwdFormat		twang		passed to sprintf(passwd, passwdFormat,
-						          userNum, domainNum).
-firstAddress		0		first userNum for addresses
-firstLogin		0		first userNum for logins
-smtpMailFrom		$USER@$HOST	sending address on test mail.
-
-name					Printable server name for reports.
-hardware				Brief hardware description.
-software				Brief software description.
-
-Clients
--------
-
-The `clients' section describes test client configuration.
-
-Parameter		Default		Description
----------		-------		-----------
-smtp			localhost	client machines for SMTP
-imap			localhost	for IMAP
-pop			localhost	for POP3
-web			localhost	for WEBMAIL
-
-rsh			rsh		rsh program to start remote clients
-rcp			rcp		rcp program to distribute files
-command			mailclient	program to run to start clients
-
-cert file				file containing SSL certificate
-key file				file containing SSL key
-
-Ugly Mstone details
--------------------
-
-The `mstone' section controls low-level details of how the workload
-description is translated into mstone terms.  The parameters make some
-assumptions about the size of both the test clients and the server, so
-they may have to be tweaked.  For small- to mid-size configurations,
-the defaults should work.
-
-Parameter		Default		Description
----------		-------		-----------
-preload rate		5		msgs/sec to deliver during preload.
-preload per connection	100		messages per SMTP session
-preload delivery time	750		msec expected message delivery time.
-					used to control throttling.
-preload throttle	500		msec faster/slower than expected at
-					which to throttle
-throttleFactor		1.1		factor by which to increase/decrease
-					delivery rate when throttling
-
-read rate		40		msgs/sec to read when aging old
-					messages.
-read clients		5		test clients to use for aging
-read protocol		(user:protocol)	protocol to age messages (e.g. imap)
-
-rampTime		0		test rampup time
-smtp connection time	10s
-pop user spacing	10s		MULTIPOP: time between users
-pop connections per client 10		MULTIPOP: connections per client
-no event queues		false		use 1 thread per client
-max threads per proc	250
-clientCount		10000		artificial global clientCount
-
-----------------------
-III. Report Generation
-----------------------
-
-There are several additional configuration sections to provide
-additional information for sizing reports.  The code is in
-`lib/{sizing,hardware}_defaults.pm'.
-
-QoS Constraints
----------------
-
-Quality of Service constraints are specified in the `qos' section.
-See reports/qos.in for an example.  The qos section can have any
-number of members.  The name of each member is a description which
-will appear in the sizing report.  The value is a block of perl code
-which should return a pair of values when evaluated in a context where
-`$run' is a reference to a hash containing data on the test run to be
-evaluated.  The first value is a value corresponding to this
-constraint which will be printed in the report.  The second is true if
-the run passed this constraint.
-
-Hardware
---------
-
-The `machine' section describes the hardware under test.  Unlike
-previous, simple sections, it containts nested values (as hash refs).
-
-Parameter		Description
----------		-----------
-
-processors
-	speed
-	cache
-
-network
-
-storage
-	controllers
-	disks
-		type
-		speed
-		model
-		timing
-OS
-	parameters
-	disks
-	logging
-
-Software
---------
-
-The `software' section describes the software under test.  If multiple
-types of software are in use, multiple software sections should be
-specified.  The only default parameter for software is the `name'.
-Other parameters should describe configuration information, version,
-etc.

mozilla/mstone/conf/com.wld.in

@@ -1,53 +0,0 @@
-test:
-	start:			8 AM
-	length:			1h
-	users:			** Number of users here ***
-
-	percent active:		100
-
-	comments:		auto-generated Corporate workload.
-
--- mail server configuration --
-
-server:
-	hostname:		** SERVER **
-
-# defaults given below --
-#	addressFormat:		smuser%ld@
-#	loginFormat:		smuser%ld@
-#	passwdFormat:		twang
-
--- test client configuration --
-
-clients:
-	smtp:			** SMTP clients here **
-	imap:			** IMAP clients here **
-
-# defaults are `rsh' and `rcp'
-#	rsh:			ssh
-#	rcp:			scp
-
--- Don't edit between here and the `__END__' marker --
-
-mstone:
-	rampTime:		30s
-
-message:
-	size: 			~lognormal(4k,4.5)
-	recipients:		~lognormal(1,2)		: [1, ]
-	mime:			~binomial(0.3)
-
-delivery:
-	fluctuation: 		8 AM - 4 PM = 90%
-
-user:
-	messages per day: 	50
-	read messages:	  	50
-	protocol:	  	IMAP
-	check interval:	  	~unif(5m, 8m)
-	connection type:  	latency = 0; bandwidth = 56k
-	keep:		  	100%
-	activity: 		8 AM - 4 PM; arrival rate = ~normal(20m, 10m) 
-
-__END__
-# your monitor sections go here...

mozilla/mstone/conf/general.wld

@@ -1,2 +0,0 @@
-<client HOSTS=localhost>
-</client>