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

@@ -1,3 +1,4 @@
+#!nmake
 #
 # The contents of this file are subject to the Netscape Public
 # License Version 1.1 (the "License"); you may not use this file
@@ -16,15 +17,10 @@
 # Copyright (C) 1998 Netscape Communications Corporation. All
 # Rights Reserved.
 #
-# Contributor(s): 
-#  Brian Ryner <bryner@netscape.com>
-# 
+# Contributor(s):  kkhandrika@netscape.com
 
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
+DEPTH=..\..\..
 
-DIRS		= resources src public
+DIRS= build public src
 
-include $(topsrcdir)/config/rules.mk
+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

@@ -1,3 +1,4 @@
+#!nmake
 #
 # The contents of this file are subject to the Netscape Public
 # License Version 1.1 (the "License"); you may not use this file
@@ -17,17 +18,33 @@
 # Rights Reserved.
 #
 # Contributor(s): 
-#  Terry Hayes <thayes@netscape.com>
-# 
 
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
+DEPTH=..\..\..
+MODULE=mapiutils
 
-include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/rules.mk
+include <$(DEPTH)\config\config.mak>
 
-install::
-	$(REGCHROME) content pippki pippki.jar
-	$(REGCHROME) locale en-US/pippki en-US.jar
+################################################################################
+## 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

@@ -19,11 +19,8 @@
 #
 # Contributor(s): 
 
-DEPTH=..
-include <$(DEPTH)/config/config.mak>
+DEPTH=..\..
 
-DIRS = nss \
-	manager \
-	$(NULL)
+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

@@ -1,3 +1,4 @@
+#!nmake
 #
 # The contents of this file are subject to the Netscape Public
 # License Version 1.1 (the "License"); you may not use this file
@@ -17,15 +18,14 @@
 # Rights Reserved.
 #
 # Contributor(s): 
-#
 
-DEPTH		= ..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
+DEPTH=..\..\..
+MODULE=mime
 
-include $(DEPTH)/config/autoconf.mk
+EXPORTS =							\
+	nscpmapi.h		\
+    $(NULL)
 
-DIRS		= manager
 
-include $(topsrcdir)/config/rules.mk
+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

@@ -1,3 +1,4 @@
+#!nmake
 #
 # The contents of this file are subject to the Netscape Public
 # License Version 1.1 (the "License"); you may not use this file
@@ -17,14 +18,10 @@
 # Rights Reserved.
 #
 # Contributor(s): 
-#  Terry Hayes <thayes@netscape.com>
-# 
 
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
+DEPTH=..\..\..
 
-DIRS		= public resources src
 
-include $(topsrcdir)/config/rules.mk
+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/nsprpub/Makefile.in

@@ -1,144 +0,0 @@
-#! gmake
-
-# 
-# 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 the Netscape Portable Runtime (NSPR).
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# 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 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 MPL,
-# 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 MPL or the
-# GPL.
-# 
-
-
-MOD_DEPTH	= .
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(MOD_DEPTH)/config/autoconf.mk
-
-DIRS = config pr lib
-
-ifdef MOZILLA_CLIENT
-PR_CLIENT_BUILD = 1
-PR_CLIENT_BUILD_UNIX = 1
-endif
-
-DIST_GARBAGE = config.cache config.log config.status
-
-all:: config.status export
-
-include $(topsrcdir)/config/rules.mk
-
-config.status:: configure
-ifeq ($(OS_ARCH),WINNT)
-	sh $(srcdir)/configure --no-create --no-recursion
-else
-	./config.status --recheck && ./config.status
-endif
-
-#
-# The -ll option of zip converts CR LF to LF.
-#
-ifeq ($(OS_ARCH),WINNT)
-ZIP_ASCII_OPT = -ll
-endif
-
-ifdef PR_CLIENT_BUILD
-export::
-	rm -r -f $(DIST)/../public/nspr
-ifdef PR_CLIENT_BUILD_UNIX
-	rm -f $(dist_libdir)/libnspr.a
-	rm -f $(dist_bindir)/libnspr.$(DLL_SUFFIX)
-endif
-endif
-
-# Delete config/autoconf.mk last because it is included by every makefile.
-distclean::
-	@echo "cd pr/tests; $(MAKE) $@"
-	@$(MAKE) -C pr/tests $@
-	rm -f config/autoconf.mk
-
-release::
-	echo $(BUILD_NUMBER) > $(RELEASE_DIR)/$(BUILD_NUMBER)/version.df
-	@if test -f imports.df; then \
-	    echo "cp -f imports.df $(RELEASE_DIR)/$(BUILD_NUMBER)/imports.df"; \
-	    cp -f imports.df $(RELEASE_DIR)/$(BUILD_NUMBER)/imports.df; \
-	else \
-	    echo "echo > $(RELEASE_DIR)/$(BUILD_NUMBER)/imports.df"; \
-	    echo > $(RELEASE_DIR)/$(BUILD_NUMBER)/imports.df; \
-	fi
-	cd $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME); \
-	rm -rf META-INF; mkdir META-INF; cd META-INF; \
-	echo "Manifest-Version: 1.0" > MANIFEST.MF; \
-	echo "" >> MANIFEST.MF; \
-	cd ..; rm -f mdbinary.jar; zip -r mdbinary.jar META-INF bin lib; \
-	rm -rf META-INF; \
-	cd include; \
-	rm -rf META-INF; mkdir META-INF; cd META-INF; \
-	echo "Manifest-Version: 1.0" > MANIFEST.MF; \
-	echo "" >> MANIFEST.MF; \
-	cd ..; rm -f mdheader.jar; zip $(ZIP_ASCII_OPT) -r mdheader.jar *; \
-	rm -rf META-INF
-ifeq ($(OS_ARCH),WINNT)
-	@if test ! -d $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER); then \
-		rm -rf $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER); \
-		echo "making directory $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER)"; \
-		config/prmkdir.bat $(MDIST_DOS)\\$(MOD_NAME)\\$(BUILD_NUMBER); \
-	fi
-	@if test ! -d $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER)/$(RELEASE_OBJDIR_NAME); then \
-		rm -rf $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER)/$(RELEASE_OBJDIR_NAME); \
-		echo "making directory $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER)/$(RELEASE_OBJDIR_NAME)"; \
-		config/prmkdir.bat $(MDIST_DOS)\\$(MOD_NAME)\\$(BUILD_NUMBER)\\$(RELEASE_OBJDIR_NAME); \
-	fi
-else
-	@if test ! -d $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER); then \
-		rm -rf $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER); \
-		echo "making directory $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER)"; \
-		$(NSINSTALL) -D $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER); \
-		chmod 775 $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER); \
-	fi
-	@if test ! -d $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER)/$(RELEASE_OBJDIR_NAME); then \
-		rm -rf $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER)/$(RELEASE_OBJDIR_NAME); \
-		echo "making directory $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER)/$(RELEASE_OBJDIR_NAME)"; \
-		$(NSINSTALL) -D $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER)/$(RELEASE_OBJDIR_NAME); \
-		chmod 775 $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER)/$(RELEASE_OBJDIR_NAME); \
-	fi
-endif
-	cd $(RELEASE_DIR)/$(BUILD_NUMBER); \
-	cp -f version.df imports.df $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER); \
-	chmod 664 $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER)/version.df; \
-	chmod 664 $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER)/imports.df; \
-	cd $(OBJDIR_NAME); \
-	cp -f mdbinary.jar $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER)/$(RELEASE_OBJDIR_NAME); \
-	chmod 664 $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER)/$(RELEASE_OBJDIR_NAME)/mdbinary.jar; \
-	cd include; \
-	cp -f mdheader.jar $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER)/$(RELEASE_OBJDIR_NAME); \
-	chmod 664 $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER)/$(RELEASE_OBJDIR_NAME)/mdheader.jar
-
-depend:
-	@echo "NSPR20 has no dependencies.  Skipped."

mozilla/nsprpub/admin/explode.pl

@@ -1,70 +0,0 @@
-#!/bin/perl
-# 
-# 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 the Netscape Portable Runtime (NSPR).
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998-2001 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# 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 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 MPL,
-# 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 MPL or the
-# GPL.
-# 
-# -----------------------------------------------------------------
-#
-# explode.pl -- Unpack .jar files into bin, lib, include directories
-#
-# syntax: perl explode.pl
-#
-# Description:
-# explode.pl unpacks the .jar files created by the NSPR build   
-# procedure. 
-#
-# Suggested use: After copying the platform directories to
-# /s/b/c/nspr20/<release>. CD to /s/b/c/nspr20/<release> and
-# run explode.pl. This will unpack the jar files into bin, lib,
-# include directories.
-#
-# -----------------------------------------------------------------
-
-@dirs = `ls -d *.OBJ*`;
-
-foreach $dir (@dirs) {
-    chop($dir);
-    if (-l $dir) {
-        print "Skipping symbolic link $dir\n";
-        next;
-    }
-    print "Unzipping $dir/mdbinary.jar\n";
-    system ("unzip", "-o", "$dir/mdbinary.jar",
-            "-d", "$dir");
-    system ("rm", "-rf", "$dir/META-INF");
-    mkdir "$dir/include", 0755;
-    print "Unzipping $dir/mdheader.jar\n";
-    system ("unzip", "-o", "-aa",
-            "$dir/mdheader.jar",
-            "-d", "$dir/include");
-    system ("rm", "-rf", "$dir/include/META-INF");
-}
-# --- end explode.pl ----------------------------------------------

mozilla/nsprpub/admin/makeTargetDirs.sh

@@ -1,73 +0,0 @@
-#!/bin/sh
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is the Netscape Portable Runtime (NSPR).
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998-2001 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# 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 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 MPL,
-# 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 MPL or the
-# GPL.
-# 
-# -----------------------------------------------------------------
-# makeTargetDirs.sh -- Create target directories for building NSPR
-#
-# syntax: makeTargetDirs.sh
-#
-# Description:
-# makeTargetDirs.sh creates a set of directories intended for use
-# with NSPR's autoconf based build system.
-#     
-# The enumerated directories are the same as those built for NSPR
-# 4.1.1. Adjust as needed.
-#
-# -----------------------------------------------------------------
-mkdir  AIX4.3_64_DBG.OBJ
-mkdir  AIX4.3_64_OPT.OBJ
-mkdir  AIX4.3_DBG.OBJ
-mkdir  AIX4.3_OPT.OBJ
-mkdir  HP-UXB.11.00_64_DBG.OBJ
-mkdir  HP-UXB.11.00_64_OPT.OBJ
-mkdir  HP-UXB.11.00_DBG.OBJ
-mkdir  HP-UXB.11.00_OPT.OBJ
-mkdir  IRIX6.5_n32_PTH_DBG.OBJ
-mkdir  IRIX6.5_n32_PTH_OPT.OBJ
-mkdir  Linux2.2_x86_glibc_PTH_DBG.OBJ
-mkdir  Linux2.2_x86_glibc_PTH_OPT.OBJ
-mkdir  Linux2.4_x86_glibc_PTH_DBG.OBJ
-mkdir  Linux2.4_x86_glibc_PTH_OPT.OBJ
-mkdir  OSF1V4.0D_DBG.OBJ
-mkdir  OSF1V4.0D_OPT.OBJ
-mkdir  SunOS5.6_DBG.OBJ
-mkdir  SunOS5.6_OPT.OBJ
-mkdir  SunOS5.7_64_DBG.OBJ
-mkdir  SunOS5.7_64_OPT.OBJ
-mkdir  WIN954.0_DBG.OBJ
-mkdir  WIN954.0_DBG.OBJD
-mkdir  WIN954.0_OPT.OBJ
-mkdir  WINNT4.0_DBG.OBJ
-mkdir  WINNT4.0_DBG.OBJD
-mkdir  WINNT4.0_OPT.OBJ
-# --- end makeTargetDirs.sh ---------------------------------------

mozilla/nsprpub/admin/repackage.sh

@@ -1,207 +0,0 @@
-#! /bin/sh
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is the Netscape Portable Runtime (NSPR).
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998-2001 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# 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 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 MPL,
-# 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 MPL or the
-# GPL.
-# ------------------------------------------------------------------
-# repackage.sh -- Repackage NSPR from /s/b/c to mozilla.org format
-#
-# syntax: repackage.sh
-#
-# Description:
-# repackage.sh creates NSPR binary distributions for mozilla.org from
-# the internal binary distributions in /share/builds/components/nspr20.
-# There are reasons why we can't just push the internal binary distributions
-# to mozilla.org. External developers prefer to use the common archive 
-# file format for their platforms, rather than the jar files we use internally.
-#
-# On Unix, we create a tar.gz file.  On Windows, we create a zip file.
-# For example: NSPR 4.1.1, these would be nspr-4.1.1.tar.gz and nspr-4.1.1.zip.
-#
-# When unpacked, nspr-4.1.1.tar.gz or nspr-4.1.1.zip should expand to a
-# nspr-4.1.1 directory that contains three subdirectories: include, lib,
-# and bin.  The header files, with the correct line endings for the
-# platform, are in nspr-4.1.1/include.  The libraries are in nspr-4.1.1/lib.
-# The executable programs are in nspr-4.1.1/bin.
-# 
-# Note! Files written with Gnu tar are not readable by some non-Gnu
-# versions. Sun, in particular.
-# 
-# 
-# 
-# 
-# ------------------------------------------------------------------
-#
-# These variables should be modified for each NSPR release.
-#
-FROMTOP=/share/builds/components/nspr20/v4.1.1
-TOTOP=./v4.1.1
-NSPRDIR=nspr-4.1.1
-SOURCETAG=NSPRPUB_RELEASE_4_1_1
-
-#
-# enumerate Unix object directories on /s/b/c
-UNIX_OBJDIRS="
-AIX4.3_64_DBG.OBJ
-AIX4.3_64_OPT.OBJ
-AIX4.3_DBG.OBJ
-AIX4.3_OPT.OBJ
-HP-UXB.11.00_64_DBG.OBJ
-HP-UXB.11.00_64_OPT.OBJ
-HP-UXB.11.00_DBG.OBJ
-HP-UXB.11.00_OPT.OBJ
-IRIX6.5_n32_PTH_DBG.OBJ
-IRIX6.5_n32_PTH_OPT.OBJ
-Linux2.2_x86_glibc_PTH_DBG.OBJ
-Linux2.2_x86_glibc_PTH_OPT.OBJ
-OSF1V4.0D_DBG.OBJ
-OSF1V4.0D_OPT.OBJ
-SunOS5.6_DBG.OBJ
-SunOS5.6_OPT.OBJ
-SunOS5.7_64_DBG.OBJ
-SunOS5.7_64_OPT.OBJ
-"
-#
-# enumerate Windows object directories on /s/b/c
-WIN_OBJDIRS="
-WIN954.0_DBG.OBJ
-WIN954.0_DBG.OBJD
-WIN954.0_OPT.OBJ
-WINNT4.0_DBG.OBJ
-WINNT4.0_DBG.OBJD
-WINNT4.0_OPT.OBJ
-"
-
-#
-# Create the destination directory.
-#
-echo "removing directory $TOTOP"
-rm -rf $TOTOP
-echo "creating directory $TOTOP"
-mkdir -p $TOTOP
-
-#
-# Generate the tar.gz files for Unix platforms.
-#
-for OBJDIR in $UNIX_OBJDIRS; do
-    echo "removing directory $NSPRDIR"
-    rm -rf $NSPRDIR
-    echo "creating directory $NSPRDIR"
-    mkdir $NSPRDIR
-
-    echo "creating directory $NSPRDIR/include"
-    mkdir $NSPRDIR/include
-    echo "copying $FROMTOP/$OBJDIR/include"
-    cp -r $FROMTOP/$OBJDIR/include $NSPRDIR
-
-    echo "copying $FROMTOP/$OBJDIR/lib"
-    cp -r $FROMTOP/$OBJDIR/lib $NSPRDIR
-
-    echo "copying $FROMTOP/$OBJDIR/bin"
-    cp -r $FROMTOP/$OBJDIR/bin $NSPRDIR
-
-    echo "creating directory $TOTOP/$OBJDIR"
-    mkdir $TOTOP/$OBJDIR
-    echo "creating $TOTOP/$OBJDIR/$NSPRDIR.tar"
-    tar cvf $TOTOP/$OBJDIR/$NSPRDIR.tar $NSPRDIR
-    echo "gzipping $TOTOP/$OBJDIR/$NSPRDIR.tar"
-    gzip $TOTOP/$OBJDIR/$NSPRDIR.tar
-done
-
-#
-# Generate the zip files for Windows platforms.
-#
-for OBJDIR in $WIN_OBJDIRS; do
-    echo "removing directory $NSPRDIR"
-    rm -rf $NSPRDIR
-    echo "creating directory $NSPRDIR"
-    mkdir $NSPRDIR
-
-    echo "creating directory $NSPRDIR/include"
-    mkdir $NSPRDIR/include
-    echo "creating directory $NSPRDIR/include/private"
-    mkdir $NSPRDIR/include/private
-    echo "creating directory $NSPRDIR/include/obsolete"
-    mkdir $NSPRDIR/include/obsolete
-
-    # copy headers and adjust unix line-end to Windows line-end
-    # Note: Watch out for the "sed" command line.
-    # when editing the command, take care to preserve the "^M" as the literal
-    # cntl-M character! in vi, use "cntl-v cntl-m" to enter it!
-    #
-    headers=`ls $FROMTOP/$OBJDIR/include/*.h`
-    for header in $headers; do
-        sed -e 's/$/
-/g' $header > $NSPRDIR/include/`basename $header`
-    done
-    headers=`ls $FROMTOP/$OBJDIR/include/obsolete/*.h`
-    for header in $headers; do
-        sed -e 's/$/
-/g' $header > $NSPRDIR/include/obsolete/`basename $header`
-    done
-    headers=`ls $FROMTOP/$OBJDIR/include/private/*.h`
-    for header in $headers; do
-        sed -e 's/$/
-/g' $header > $NSPRDIR/include/private/`basename $header`
-    done
-
-    echo "copying $FROMTOP/$OBJDIR/lib"
-    cp -r $FROMTOP/$OBJDIR/lib $NSPRDIR
-
-    echo "copying $FROMTOP/$OBJDIR/bin"
-    cp -r $FROMTOP/$OBJDIR/bin $NSPRDIR
-
-    echo "creating directory $TOTOP/$OBJDIR"
-    mkdir $TOTOP/$OBJDIR
-    echo "creating $TOTOP/$OBJDIR/$NSPRDIR.zip"
-    zip -r $TOTOP/$OBJDIR/$NSPRDIR.zip $NSPRDIR
-done
-
-#
-# package the source from CVS
-#
-echo "Packaging source"
-echo "removing directory $NSPRDIR"
-rm -rf $NSPRDIR
-echo "creating directory $NSPRDIR"
-mkdir $NSPRDIR
-myWD=`pwd`
-cd $NSPRDIR
-echo "Pulling source from CVS with tag $SOURCETAG"
-cvs co -r $SOURCETAG mozilla/nsprpub
-cd $myWD
-mkdir $TOTOP/src
-echo "Creating source tar file: $TOTOP/src/$NSPRDIR.tar"
-tar cvf $TOTOP/src/$NSPRDIR.tar $NSPRDIR
-echo "gzip $TOTOP/src/$NSPRDIR.tar"
-gzip $TOTOP/src/$NSPRDIR.tar
-
-#
-# Remove the working directory.
-#

mozilla/nsprpub/admin/symlinks.sh

@@ -1,69 +0,0 @@
-#!/bin/sh
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is the Netscape Portable Runtime (NSPR).
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998-2001 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# 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 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 MPL,
-# 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 MPL or the
-# GPL.
-# -----------------------------------------------------------------
-# symlinks.sh -- create links from NSPR builds
-#
-# syntax: symlinks.sh
-# 
-# Description:
-# symlinks.sh creates some symbolic links for NSPR build targets
-# that are not actually build, but for which there are NSPR
-# binaries suitable for running on the intended target. ... got
-# that?
-# 
-# Suggested use: After copying NSPR binaries to
-# /s/b/c/nspr20/<platform> run symlinks.sh to create the links
-# for all supported platforms.
-#
-# The symlinks in this script correspond to the NSPR 4.1.1
-# release. Adjust as necessary.
-#
-# -----------------------------------------------------------------
-
-ln -s SunOS5.6_DBG.OBJ SunOS5.7_DBG.OBJ
-ln -s SunOS5.6_OPT.OBJ SunOS5.7_OPT.OBJ
-
-ln -s SunOS5.6_DBG.OBJ SunOS5.8_DBG.OBJ
-ln -s SunOS5.6_OPT.OBJ SunOS5.8_OPT.OBJ
-
-ln -s SunOS5.7_64_DBG.OBJ SunOS5.8_64_DBG.OBJ
-ln -s SunOS5.7_64_OPT.OBJ SunOS5.8_64_OPT.OBJ
-
-ln -s OSF1V4.0D_DBG.OBJ OSF1V5.0_DBG.OBJ
-ln -s OSF1V4.0D_OPT.OBJ OSF1V5.0_OPT.OBJ
-
-ln -s WINNT4.0_DBG.OBJ WINNT5.0_DBG.OBJ
-ln -s WINNT4.0_DBG.OBJD WINNT5.0_DBG.OBJD
-ln -s WINNT4.0_OPT.OBJ WINNT5.0_OPT.OBJ
-# --- end symlinks.sh ---------------------------------------------
-

mozilla/nsprpub/build/autoconf/install-sh

@@ -1,119 +0,0 @@
-#!/bin/sh
-
-#
-# install - install a program, script, or datafile
-# This comes from X11R5; it is not part of GNU.
-#
-# $XConsortium: install.sh,v 1.2 89/12/18 14:47:22 jim Exp $
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.
-#
-
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-
-instcmd="$mvprog"
-chmodcmd=""
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=""
-dst=""
-
-while [ x"$1" != x ]; do
-    case $1 in
-	-c) instcmd="$cpprog"
-	    shift
-	    continue;;
-
-	-m) chmodcmd="$chmodprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-o) chowncmd="$chownprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-g) chgrpcmd="$chgrpprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-s) stripcmd="$stripprog"
-	    shift
-	    continue;;
-
-	*)  if [ x"$src" = x ]
-	    then
-		src=$1
-	    else
-		dst=$1
-	    fi
-	    shift
-	    continue;;
-    esac
-done
-
-if [ x"$src" = x ]
-then
-	echo "install:  no input file specified"
-	exit 1
-fi
-
-if [ x"$dst" = x ]
-then
-	echo "install:  no destination specified"
-	exit 1
-fi
-
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
-if [ -d $dst ]
-then
-	dst="$dst"/`basename $src`
-fi
-
-# Make a temp file name in the proper directory.
-
-dstdir=`dirname $dst`
-dsttmp=$dstdir/#inst.$$#
-
-# Move or copy the file name to the temp name
-
-$doit $instcmd $src $dsttmp
-
-# and set any options; do chmod last to preserve setuid bits
-
-if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; fi
-if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; fi
-if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; fi
-if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; fi
-
-# Now rename the file to the real destination.
-
-$doit $rmcmd $dst
-$doit $mvcmd $dsttmp $dst
-
-
-exit 0

mozilla/nsprpub/config/AIX.mk

@@ -1,171 +0,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/
-# 
-# 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 Portable Runtime (NSPR).
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# 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 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 MPL,
-# 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 MPL or the
-# GPL.
-# 
-
-#
-# Config stuff for AIX.
-#
-
-include $(MOD_DEPTH)/config/UNIX.mk
-
-#
-# XXX
-# Temporary define for the Client; to be removed when binary release is used
-#
-ifdef MOZILLA_CLIENT
-ifneq ($(USE_PTHREADS),1)
-CLASSIC_NSPR = 1
-endif
-endif
-
-#
-# There are three implementation strategies available on AIX:
-# pthreads, classic, and pthreads-user.
-#
-# On AIX 3.2, classic nspr is the default (and only) implementation
-# strategy.  On AIX 4.1 and later, the default is pthreads.
-# 
-ifeq ($(OS_RELEASE),3.2)
-CLASSIC_NSPR = 1
-endif
-
-ifeq ($(CLASSIC_NSPR),1)
-	PTHREADS_USER =
-	USE_PTHREADS =
-	IMPL_STRATEGY = _EMU
-	DEFINES += -D_PR_LOCAL_THREADS_ONLY
-else
-ifeq ($(PTHREADS_USER),1)
-	USE_PTHREADS =
-	IMPL_STRATEGY = _PTH_USER
-else
-	USE_PTHREADS = 1
-	IMPL_STRATEGY = _PTH
-endif
-endif
-
-# IPv6 support part of the standard AIX 4.3 release.
-ifneq (,$(filter-out 3.2 4.1 4.2,$(OS_RELEASE)))
-USE_IPV6 = 1
-endif
-
-ifeq ($(CLASSIC_NSPR),1)
-CC		= xlC
-CCC		= xlC
-else
-CC		= xlC_r
-CCC		= xlC_r
-endif
-OS_CFLAGS	= -qro -qroconst
-ifeq ($(USE_64),1)
-OBJECT_MODE	= 64
-export OBJECT_MODE
-COMPILER_TAG	= _64
-else
-COMPILER_TAG	= _32
-endif
-
-CPU_ARCH	= rs6000
-
-RANLIB		= ranlib
-
-OS_CFLAGS 	+= -DAIX -DSYSV
-ifeq ($(CC),xlC_r)
-OS_CFLAGS 	+= -qarch=com
-endif
-
-ifneq ($(OS_RELEASE),3.2)
-OS_CFLAGS	+= -DAIX_HAVE_ATOMIC_OP_H -DAIX_TIMERS
-endif
-
-ifeq (,$(filter-out 3.2 4.1,$(OS_RELEASE)))
-ifndef USE_PTHREADS
-OS_CFLAGS	+= -DAIX_RENAME_SELECT
-endif
-endif
-
-ifeq (,$(filter-out 3.2 4.1,$(OS_RELEASE)))
-OS_CFLAGS	+= -D_PR_NO_LARGE_FILES
-else
-OS_CFLAGS	+= -D_PR_HAVE_OFF64_T
-endif
-
-ifeq ($(OS_RELEASE),4.1)
-OS_CFLAGS	+= -DAIX4_1
-else
-DSO_LDOPTS	= -brtl -bM:SRE -bnoentry -bexpall
-MKSHLIB		= $(LD) $(DSO_LDOPTS)
-ifeq ($(OS_RELEASE),4.3)
-OS_CFLAGS	+= -DAIX4_3
-endif
-endif
-
-# Have the socklen_t data type
-ifeq ($(OS_RELEASE),4.3)
-OS_CFLAGS	+= -DHAVE_SOCKLEN_T
-endif
-
-ifneq (,$(filter-out 3.2 4.1 4.2,$(OS_RELEASE)))
-OS_CFLAGS	+= -DHAVE_FCNTL_FILE_LOCKING
-endif
-
-ifeq (,$(filter-out 4.2 4.3,$(OS_RELEASE)))
-# On these OS revisions, localtime_r() is declared if _THREAD_SAFE
-# is defined.
-ifneq ($(CLASSIC_NSPR),1)
-OS_CFLAGS	+= -DHAVE_POINTER_LOCALTIME_R
-endif
-endif
-
-ifeq (,$(filter-out 4.3,$(OS_RELEASE)))
-# On these OS revisions, gethostbyXXX() returns result in thread
-# specific storage.
-ifeq ($(USE_PTHREADS),1)
-OS_CFLAGS	+= -D_PR_HAVE_THREADSAFE_GETHOST
-endif
-endif
-
-#
-# Special link info for constructing AIX programs. On AIX we have to
-# statically link programs that use NSPR into a single .o, rewriting the
-# calls to select to call "aix". Once that is done we then can
-# link that .o with a .o built in nspr which implements the system call.
-#
-ifneq (,$(filter-out 3.2 4.1,$(OS_RELEASE)))
-AIX_LINK_OPTS	= -brtl -bnso -berok
-else
-AIX_LINK_OPTS	= -bnso -berok
-#AIX_LINK_OPTS	= -bnso -berok -brename:.select,.wrap_select -brename:.poll,.wrap_poll -bI:/usr/lib/syscalls.exp
-endif
-
-AIX_WRAP	= $(DIST)/lib/aixwrap.o
-AIX_TMP		= $(OBJDIR)/_aix_tmp.o

mozilla/nsprpub/config/BSD_OS.mk

@@ -1,91 +0,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/
-# 
-# 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 Portable Runtime (NSPR).
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# 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 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 MPL,
-# 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 MPL or the
-# GPL.
-# 
-
-#
-# Config stuff for BSD/OS Unix.
-#
-
-include $(MOD_DEPTH)/config/UNIX.mk
-
-ifeq (,$(filter-out 1.1 4.%,$(OS_RELEASE)))
-CC		= gcc -Wall -Wno-format
-CCC		= g++
-else
-CC		= shlicc2
-CCC		= shlicc2
-endif
-RANLIB		= ranlib
-
-ifeq ($(USE_PTHREADS),1)
-IMPL_STRATEGY = _PTH
-DEFINES		+= -D_PR_NEED_PTHREAD_INIT
-else
-IMPL_STRATEGY = _EMU
-DEFINES		+= -D_PR_LOCAL_THREADS_ONLY
-endif
-
-OS_CFLAGS	= $(DSO_CFLAGS) -DBSDI -DHAVE_STRERROR -DNEED_BSDREGEX
-
-ifeq (86,$(findstring 86,$(OS_TEST)))
-CPU_ARCH	= x86
-endif
-ifeq (sparc,$(findstring sparc,$(OS_TEST)))
-CPU_ARCH	= sparc
-endif
-
-ifeq ($(OS_RELEASE),2.1)
-OS_CFLAGS	+= -D_PR_TIMESPEC_HAS_TS_SEC
-endif
-
-ifeq (,$(filter-out 1.1 2.1,$(OS_RELEASE)))
-OS_CFLAGS	+= -D_PR_BSDI_JMPBUF_IS_ARRAY
-else
-OS_CFLAGS	+= -D_PR_SELECT_CONST_TIMEVAL -D_PR_BSDI_JMPBUF_IS_STRUCT
-endif
-
-NOSUCHFILE	= /no-such-file
-
-ifeq ($(OS_RELEASE),1.1)
-OS_CFLAGS	+= -D_PR_STAT_HAS_ONLY_ST_ATIME -D_PR_NEED_H_ERRNO
-else
-OS_CFLAGS	+= -DHAVE_DLL -DUSE_DLFCN -D_PR_STAT_HAS_ST_ATIMESPEC
-OS_LIBS		= -ldl
-ifeq (,$(filter-out 4.%,$(OS_RELEASE)))
-MKSHLIB		= $(CC) $(DSO_LDOPTS)
-DSO_CFLAGS	= -fPIC
-DSO_LDOPTS	= -shared -Wl,-soname,$(@:$(OBJDIR)/%.so=%.so)
-else
-MKSHLIB		= $(LD) $(DSO_LDOPTS)
-DSO_LDOPTS	= -r
-endif
-endif

mozilla/nsprpub/config/BeOS.mk

@@ -1,139 +0,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/
-# 
-# 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 Portable Runtime (NSPR).
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# 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 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 MPL,
-# 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 MPL or the
-# GPL.
-# 
-
-
-######################################################################
-# Config stuff for BeOS (all architectures)
-######################################################################
-
-######################################################################
-# Version-independent
-######################################################################
-
-DEFINES			+= 
-XP_DEFINE		= -DXP_BEOS
-
-OBJ_SUFFIX              = o
-LIB_SUFFIX              = a
-DLL_SUFFIX              = so
-AR                      = ar cr $@
-STRIP			= strip
-
-ifdef BUILD_OPT
-DEFINES                 = -UDEBUG -DNDEBUG
-OBJDIR_TAG              = _OPT
-else
-DEFINES                 = -DDEBUG -UNDEBUG
-OBJDIR_TAG              = _DBG
-endif
-
-ifeq (PC,$(findstring PC,$(OS_TEST)))
-CPU_ARCH		= x86
-CC                      = gcc
-CCC                     = g++
-LD                      = gcc
-RANLIB                  = ranlib
-DSO_LDOPTS              = -nostart
-PORT_FLAGS		= -DHAVE_STRERROR
-ifdef BUILD_OPT
-OPTIMIZER		= -O2
-LDFLAGS			+= -s
-else
-OPTIMIZER		= -gdwarf-2 -O0
-endif
-else
-CPU_ARCH		= ppc
-CC                      = mwcc
-CCC                     = mwcc
-LD                      = mwld
-RANLIB                  = ranlib
-DSO_LDOPTS              = -xms -export pragma \
-					-init _init_routine_ \
-					-term _term_routine_ \
-					-lroot -lnet \
-					/boot/develop/lib/ppc/glue-noinit.a \
-					/boot/develop/lib/ppc/init_term_dyn.o \
-					/boot/develop/lib/ppc/start_dyn.o 
-
-PORT_FLAGS		= -DHAVE_STRERROR -D_POSIX_SOURCE
-ifdef BUILD_OPT
-OPTIMIZER		= -O2
-else
-OPTIMIZER		= -g -O0
-endif
-endif
-CPU_ARCH_TAG		= _$(CPU_ARCH)
-
-OS_INCLUDES		=  -I- -I. 
-#G++INCLUDES		= -I/usr/include/g++
-
-PLATFORM_FLAGS		= -DBeOS -DBEOS $(OS_INCLUDES)
-
-OS_CFLAGS		= $(DSO_CFLAGS) $(PLATFORM_FLAGS) $(PORT_FLAGS)
-
-USE_BTHREADS = 1
-
-MKSHLIB			= $(LD) $(DSO_LDOPTS)
-
-OBJDIR_NAME	= $(OS_CONFIG)_$(CPU_ARCH)$(OBJDIR_TAG).OBJ
-
-####################################################################
-#
-# One can define the makefile variable NSDISTMODE to control
-# how files are published to the 'dist' directory.  If not
-# defined, the default is "install using relative symbolic
-# links".  The two possible values are "copy", which copies files
-# but preserves source mtime, and "absolute_symlink", which
-# installs using absolute symbolic links.  The "absolute_symlink"
-# option requires NFSPWD.
-#
-####################################################################
-
-NSINSTALL       = $(MOD_DEPTH)/config/$(OBJDIR_NAME)/nsinstall
-
-ifeq ($(NSDISTMODE),copy)
-# copy files, but preserve source mtime
-INSTALL         = $(NSINSTALL) -t
-else
-ifeq ($(NSDISTMODE),absolute_symlink)
-# install using absolute symbolic links
-INSTALL         = $(NSINSTALL) -L `$(NFSPWD)`
-else
-# install using relative symbolic links
-INSTALL         = $(NSINSTALL) -R
-endif
-endif
-
-define MAKE_OBJDIR
-if test ! -d $(@D); then rm -rf $(@D); $(NSINSTALL) -D $(@D); fi
-endef

mozilla/nsprpub/config/DGUX.mk

@@ -1,63 +0,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/
-# 
-# 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 Portable Runtime (NSPR).
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# 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 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 MPL,
-# 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 MPL or the
-# GPL.
-# 
-
-#
-# Config stuff for Data General DG/UX
-#
-# Initial DG/UX port by Marc Fraioli <fraioli@dg-rtp.dg.com>
-#
-
-include $(MOD_DEPTH)/config/UNIX.mk
-
-CC		= gcc
-CCC		= g++
-
-RANLIB		= true
-
-DEFINES		+= -D_PR_LOCAL_THREADS_ONLY 
-OS_CFLAGS	= -DSVR4 -DSYSV -DDGUX -D_DGUX_SOURCE -D_POSIX4A_DRAFT6_SOURCE 
-
-MKSHLIB		= $(LD) $(DSO_LDOPTS)
-DSO_LDOPTS	= -G 
-
-CPU_ARCH	= x86
-ARCH		= dgux
-
-NOSUCHFILE	= /no-such-file
-
-ifdef BUILD_OPT
-OPTIMIZER	= -O2
-else
-# -g would produce a huge executable.
-OPTIMIZER	=
-endif

mozilla/nsprpub/config/FreeBSD.mk

@@ -1,82 +0,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/
-# 
-# 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 Portable Runtime (NSPR).
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# 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 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 MPL,
-# 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 MPL or the
-# GPL.
-# 
-
-#
-# Config stuff for FreeBSD
-#
-
-include $(MOD_DEPTH)/config/UNIX.mk
-
-CC			= gcc
-CCC			= g++
-RANLIB			= ranlib
-
-ifeq ($(OS_TEST),alpha)
-CPU_ARCH		= alpha
-else
-OS_REL_CFLAGS		= -Di386
-CPU_ARCH		= x86
-endif
-CPU_ARCH_TAG		= _$(CPU_ARCH)
-
-OS_CFLAGS		= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe $(THREAD_FLAG) -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
-
-#
-# The default implementation strategy for FreeBSD is pthreads.
-#
-ifeq ($(CLASSIC_NSPR),1)
-IMPL_STRATEGY		= _EMU
-DEFINES			+= -D_PR_LOCAL_THREADS_ONLY
-else
-USE_PTHREADS		= 1
-IMPL_STRATEGY		= _PTH
-DEFINES			+= -D_THREAD_SAFE
-THREAD_FLAG		+= -pthread
-endif
-
-ARCH			= freebsd
-
-MOZ_OBJFORMAT          := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout)
-
-ifeq ($(MOZ_OBJFORMAT),elf)
-DLL_SUFFIX		= so
-else
-DLL_SUFFIX		= so.1.0
-endif
-
-DSO_CFLAGS		= -fPIC
-DSO_LDOPTS		= -Bshareable
-
-MKSHLIB			= $(LD) $(DSO_LDOPTS)
-
-G++INCLUDES		= -I/usr/include/g++

mozilla/nsprpub/config/HP-UX.mk

@@ -1,203 +0,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/
-# 
-# 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 Portable Runtime (NSPR).
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# 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 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 MPL,
-# 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 MPL or the
-# GPL.
-# 
-
-#
-# Config stuff for HP-UX
-#
-
-include $(MOD_DEPTH)/config/UNIX.mk
-
-DLL_SUFFIX	= sl
-
-ifdef NS_USE_GCC
-	CC			        = gcc
-	CCC			        = g++
-	OS_CFLAGS		    =
-	COMPILER_TAG        = _gcc
-else
-	CC			        = cc -Ae
-	CCC			        = CC -ext
-	OS_CFLAGS           = +ESlit
-endif
-
-RANLIB			= echo
-
-CPU_ARCH		= hppa
-
-OS_CFLAGS		+= $(DSO_CFLAGS) -DHPUX -D$(CPU_ARCH) -D_HPUX_SOURCE
-
-#
-# The header netdb.h on HP-UX 9 does not declare h_errno.
-# On 10.10 and 10.20, netdb.h declares h_errno only if
-# _XOPEN_SOURCE_EXTENDED is defined.  So we need to declare
-# h_errno ourselves.
-#
-ifeq ($(basename $(OS_RELEASE)),A.09)
-OS_CFLAGS		+= -D_PR_NEED_H_ERRNO
-endif
-ifeq (,$(filter-out B.10.10 B.10.20,$(OS_RELEASE)))
-OS_CFLAGS		+= -D_PR_NEED_H_ERRNO
-endif
-
-# Do we have localtime_r()?  Does it return 'int' or 'struct tm *'?
-ifeq (,$(filter-out B.10.10 B.10.20,$(OS_RELEASE)))
-OS_CFLAGS		+= -DHAVE_INT_LOCALTIME_R
-endif
-ifeq (,$(filter-out B.10.30 B.11.00,$(OS_RELEASE)))
-OS_CFLAGS		+= -DHAVE_POINTER_LOCALTIME_R
-endif
-
-#
-# XXX
-# Temporary define for the Client; to be removed when binary release is used
-#
-ifdef MOZILLA_CLIENT
-CLASSIC_NSPR = 1
-endif
-
-#
-# On HP-UX 9, the default (and only) implementation strategy is
-# classic nspr.
-#
-# On HP-UX 10.10 and 10.20, the default implementation strategy is
-# pthreads (actually DCE threads).  Classic nspr is also available.
-#
-# On HP-UX 10.30 and 11.00, the default implementation strategy is
-# pthreads.  Classic nspr and pthreads-user are also available.
-#
-ifeq ($(basename $(OS_RELEASE)),A.09)
-OS_CFLAGS		+= -DHPUX9
-DEFAULT_IMPL_STRATEGY = _EMU
-endif
-
-ifeq ($(OS_RELEASE),B.10.01)
-OS_CFLAGS		+= -DHPUX10
-DEFAULT_IMPL_STRATEGY = _EMU
-endif
-
-ifeq ($(OS_RELEASE),B.10.10)
-OS_CFLAGS		+= -DHPUX10 -DHPUX10_10
-DEFAULT_IMPL_STRATEGY = _PTH
-endif
-
-ifeq ($(OS_RELEASE),B.10.20)
-OS_CFLAGS		+= -DHPUX10 -DHPUX10_20
-ifndef NS_USE_GCC
-OS_CFLAGS		+= +DAportable +DS1.1
-endif
-DEFAULT_IMPL_STRATEGY = _PTH
-endif
-
-#
-# On 10.30 and 11.00, we use the new ANSI C++ compiler aCC.
-#
-
-ifeq ($(OS_RELEASE),B.10.30)
-ifndef NS_USE_GCC
-CCC			= /opt/aCC/bin/aCC -ext
-OS_CFLAGS		+= +DAportable +DS1.1
-endif
-OS_CFLAGS		+= -DHPUX10 -DHPUX10_30
-DEFAULT_IMPL_STRATEGY = _PTH
-endif
-
-# 11.00 is similar to 10.30.
-ifeq ($(OS_RELEASE),B.11.00)
-	ifndef NS_USE_GCC
-		CCC			        = /opt/aCC/bin/aCC -ext
-		ifeq ($(USE_64), 1)
-			OS_CFLAGS       += +DA2.0W +DS2.0
-			COMPILER_TAG    = _64
-		else
-			OS_CFLAGS       += +DAportable +DS2.0
-			COMPILER_TAG    = _32
-		endif
-	endif
-OS_CFLAGS		+= -DHPUX10 -DHPUX11 -D_LARGEFILE64_SOURCE -D_PR_HAVE_OFF64_T -DHAVE_FCNTL_FILE_LOCKING
-DEFAULT_IMPL_STRATEGY = _PTH
-endif
-
-ifeq ($(DEFAULT_IMPL_STRATEGY),_EMU)
-CLASSIC_NSPR = 1
-endif
-
-ifeq ($(DEFAULT_IMPL_STRATEGY),_PTH)
-USE_PTHREADS = 1
-IMPL_STRATEGY = _PTH
-ifeq ($(CLASSIC_NSPR),1)
-USE_PTHREADS =
-IMPL_STRATEGY = _EMU
-endif
-ifeq ($(PTHREADS_USER),1)
-USE_PTHREADS =
-IMPL_STRATEGY = _PTH_USER
-endif
-endif
-
-ifeq ($(CLASSIC_NSPR),1)
-DEFINES			+= -D_PR_LOCAL_THREADS_ONLY
-endif
-
-ifeq (,$(filter-out A.09 B.10,$(basename $(OS_RELEASE))))
-DEFINES			+= -D_PR_NO_LARGE_FILES
-endif
-
-#
-# To use the true pthread (kernel thread) library on 10.30 and
-# 11.00, we should define _POSIX_C_SOURCE to be 199506L.
-# The _REENTRANT macro is deprecated.
-#
-
-ifdef USE_PTHREADS
-ifeq (,$(filter-out B.10.10 B.10.20,$(OS_RELEASE)))
-OS_CFLAGS		+= -D_REENTRANT -D_PR_DCETHREADS
-else
-OS_CFLAGS		+= -D_POSIX_C_SOURCE=199506L -D_PR_HAVE_THREADSAFE_GETHOST
-endif
-endif
-
-ifdef PTHREADS_USER
-OS_CFLAGS		+= -D_POSIX_C_SOURCE=199506L
-endif
-
-MKSHLIB			= $(LD) $(DSO_LDOPTS)
-
-DSO_LDOPTS		= -b +h $(notdir $@)
-
-# -fPIC or +Z generates position independent code for use in shared
-# libraries.
-ifdef NS_USE_GCC
-DSO_CFLAGS		= -fPIC
-else
-DSO_CFLAGS		= +Z
-endif

mozilla/nsprpub/config/IRIX.mk

@@ -1,158 +0,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/
-# 
-# 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 Portable Runtime (NSPR).
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# 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 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 MPL,
-# 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 MPL or the
-# GPL.
-# 
-
-#
-# Config stuff for IRIX
-#
-
-include $(MOD_DEPTH)/config/UNIX.mk
-
-#
-# XXX
-# Temporary define for the Client; to be removed when binary release is used
-#
-ifdef MOZILLA_CLIENT
-ifneq ($(USE_PTHREADS),1)
-CLASSIC_NSPR = 1
-endif
-endif
-
-#
-# On IRIX 5.x, classic nspr (user-level threads on top of sprocs)
-# is the default (and only) implementation strategy.
-#
-# On IRIX 6.x and later, the default implementation strategy is
-# pthreads.  Classic nspr is also available.
-#
-ifeq ($(basename $(OS_RELEASE)),5)
-CLASSIC_NSPR = 1
-endif
-
-ifeq ($(CLASSIC_NSPR),1)
-	IMPL_STRATEGY = _MxN
-else
-	USE_PTHREADS = 1
-	USE_N32 = 1
-	IMPL_STRATEGY = _PTH
-endif
-
-ifdef NS_USE_GCC
-	CC			= gcc
-	COMPILER_TAG		= _gcc
-	AS			= $(CC) -x assembler-with-cpp -D_ASM -mips2
-	ODD_CFLAGS		= -Wall -Wno-format
-	ifdef BUILD_OPT
-		OPTIMIZER		= -O6
-	endif
-else
-	CC			= cc
-	CCC         = CC
-	ODD_CFLAGS		= -fullwarn -xansi
-	ifdef BUILD_OPT
-		ifneq ($(USE_N32),1)
-			OPTIMIZER		= -O -Olimit 4000
-		else
-			OPTIMIZER		= -O -OPT:Olimit=4000
-		endif
-	endif
-
-#
-# The default behavior is still -o32 generation, hence the explicit tests
-# for -n32 and -64 and implicitly assuming -o32. If that changes, ...
-#
-	ifeq ($(basename $(OS_RELEASE)),6)
-		ODD_CFLAGS += -multigot
-		SHLIB_LD_OPTS = -no_unresolved
-		ifeq ($(USE_N32),1)
-			ODD_CFLAGS += -n32 -woff 1209
-			COMPILER_TAG = _n32
-			LDOPTS += -n32
-        	SHLIB_LD_OPTS += -n32
-			ifeq ($(OS_RELEASE), 6_2)
-				LDOPTS += -Wl,-woff,85
-				SHLIB_LD_OPTS += -woff 85
-			endif
-		else
-			ifeq ($(USE_64),1)
-				ODD_CFLAGS +=  -64
-				COMPILER_TAG = _64
-			else
-				ODD_CFLAGS +=  -32
-				COMPILER_TAG = _o32
-			endif
-		endif
-	else
-		ODD_CFLAGS += -xgot
-	endif
-endif
-
-ODD_CFLAGS		+= -DSVR4 -DIRIX -DHAVE_FCNTL_FILE_LOCKING
-
-CPU_ARCH		= mips
-
-RANLIB			= /bin/true
-
-# For purify
-# XXX: should always define _SGI_MP_SOURCE
-NOMD_OS_CFLAGS		= $(ODD_CFLAGS) -D_SGI_MP_SOURCE
-
-ifeq ($(OS_RELEASE),5.3)
-OS_CFLAGS		+= -DIRIX5_3
-endif
-
-ifneq ($(basename $(OS_RELEASE)),5)
-OS_CFLAGS		+= -D_PR_HAVE_SGI_PRDA_PROCMASK
-endif
-
-ifeq (,$(filter-out 6.5,$(OS_RELEASE)))
-ifndef NS_USE_GCC
-OS_CFLAGS		+= -mips3
-endif
-OS_CFLAGS		+= -D_PR_HAVE_GETPROTO_R -D_PR_HAVE_GETPROTO_R_POINTER
-ifeq ($(USE_PTHREADS),1)
-OS_CFLAGS		+= -D_PR_HAVE_GETHOST_R -D_PR_HAVE_GETHOST_R_POINTER
-endif
-endif
-
-ifndef NO_MDUPDATE
-OS_CFLAGS		+= $(NOMD_OS_CFLAGS) -MDupdate $(DEPENDENCIES)
-else
-OS_CFLAGS		+= $(NOMD_OS_CFLAGS)
-endif
-
-# -rdata_shared is an ld option that puts string constants and
-# const data into the text segment, where they will be shared
-# across processes and be read-only.
-MKSHLIB			= $(LD) $(SHLIB_LD_OPTS) -rdata_shared -shared -soname $(notdir $@)
-
-DSO_LDOPTS		= -elf -shared -all

mozilla/nsprpub/config/Linux.mk

@@ -1,131 +0,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/
-# 
-# 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 Portable Runtime (NSPR).
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# 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 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 MPL,
-# 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 MPL or the
-# GPL.
-# 
-
-######################################################################
-# Config stuff for Linux (all architectures)
-######################################################################
-
-######################################################################
-# Version-independent
-######################################################################
-
-include $(MOD_DEPTH)/config/UNIX.mk
-
-#
-# XXX
-# Temporary define for the Client; to be removed when binary release is used
-#
-ifdef MOZILLA_CLIENT
-ifneq ($(USE_PTHREADS),1)
-CLASSIC_NSPR = 1
-endif
-endif
-
-#
-# The default implementation strategy for Linux is pthreads.
-#
-ifeq ($(CLASSIC_NSPR),1)
-IMPL_STRATEGY		= _EMU
-DEFINES			+= -D_PR_LOCAL_THREADS_ONLY
-else
-USE_PTHREADS		= 1
-IMPL_STRATEGY		= _PTH
-DEFINES			+= -D_REENTRANT
-endif
-
-ifeq (86,$(findstring 86,$(OS_TEST)))
-CPU_ARCH		:= x86
-else
-ifeq (,$(filter-out arm% sa110,$(OS_TEST)))
-CPU_ARCH		:= arm
-else
-CPU_ARCH		:= $(OS_TEST)
-endif
-endif
-CPU_ARCH_TAG		= _$(CPU_ARCH)
-
-CC			= gcc
-CCC			= g++
-RANLIB			= ranlib
-
-OS_INCLUDES		=
-G++INCLUDES		= -I/usr/include/g++
-
-PLATFORM_FLAGS		= -ansi -Wall -pipe -DLINUX -Dlinux
-PORT_FLAGS		= -D_POSIX_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -DHAVE_STRERROR -DHAVE_FCNTL_FILE_LOCKING
-
-OS_CFLAGS		= $(DSO_CFLAGS) $(PLATFORM_FLAGS) $(PORT_FLAGS)
-
-######################################################################
-# Version-specific stuff
-######################################################################
-
-ifeq ($(CPU_ARCH),alpha)
-PLATFORM_FLAGS		+= -D_ALPHA_ -D__alpha -mieee
-endif
-ifeq ($(CPU_ARCH),x86)
-PLATFORM_FLAGS		+= -Di386
-endif
-ifeq ($(CPU_ARCH),m68k)
-#
-# gcc on Linux/m68k either has a bug or triggers a code-sequence
-# bug in the 68060 which causes gcc to crash.  The simplest way to
-# avoid this is to enable a minimum level of optimization.
-#
-ifndef BUILD_OPT
-OPTIMIZER		+= -O
-endif
-PLATFORM_FLAGS		+= -m68020-40
-endif
-
-#
-# Linux 2.x has shared libraries.
-#
-
-MKSHLIB			= $(LD) $(DSO_LDOPTS) -soname $(notdir $@)
-ifdef BUILD_OPT
-OPTIMIZER		= -O2
-#   invoke 'strip' on *.so files in optimized builds
-STRIP = strip
-endif
-
-######################################################################
-# Overrides for defaults in config.mk (or wherever)
-######################################################################
-
-######################################################################
-# Other
-######################################################################
-
-DSO_CFLAGS		= -fPIC
-DSO_LDOPTS		= -shared

mozilla/nsprpub/config/Makefile.in

@@ -1,143 +0,0 @@
-#! gmake
-# 
-# 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 the Netscape Portable Runtime (NSPR).
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# 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 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 MPL,
-# 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 MPL or the
-# GPL.
-# 
-
-MOD_DEPTH	= ..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(MOD_DEPTH)/config/autoconf.mk
-
-# Indicate that this directory builds build tools.
-INTERNAL_TOOLS	= 1
-
-# autoconf.mk must be deleted last (from the top-level directory)
-# because it is included by every makefile.
-DIST_GARBAGE	= nsprincl.mk nsprincl.sh nspr-config
-
-RELEASE_BINS	= nspr-config
-
-include $(topsrcdir)/config/config.mk
-
-CSRCS	= now.c
-
-# This version hasn't been ported for us; the one in mozilla/config has
-ifneq ($(OS_ARCH),OS2)
-CSRCS  += nsinstall.c
- 
-PLSRCS	= nfspwd.pl
-endif
-
-ifeq (,$(filter-out WINNT OS2,$(OS_ARCH)))
-PROG_SUFFIX = .exe
-else
-PROG_SUFFIX =
-endif
-
-# Temporary workaround to disable the generation of
-# library build time because now.c uses the 'long long'
-# data type that's not available on some platforms.
-ifeq (,$(filter-out NEC NEXTSTEP QNX SCOOS UNIXWARE,$(OS_ARCH)))
-DEFINES += -DOMIT_LIB_BUILD_TIME
-endif
-
-ifeq ($(OS_ARCH), IRIX)
-    ifeq ($(basename $(OS_RELEASE)),6)
-        ifndef NS_USE_GCC
-            ifeq ($(USE_N32),1)
-                XLDOPTS += -n32 -Wl,-woff,85
-            else
-                ifeq ($(USE_64),1)
-                    XLDOPTS += -64
-                else
-                    XLDOPTS += -32
-                endif
-            endif
-        endif
-    endif
-endif
-
-ifeq ($(OS_ARCH), HP-UX)
-    ifeq ($(USE_64),1)
-        XLDOPTS += +DA2.0W
-    endif
-endif
-
-ifeq ($(MOZ_OS2_TOOLS),EMX)
-XCFLAGS = $(OS_CFLAGS)
-ifeq ($(MOZ_OS2_EMX_OBJECTFORMAT),OMF)
-XLDOPTS = -Zlinker /PM:VIO
-endif
-endif
-
-ifeq ($(MOZ_OS2_TOOLS),PGCC)
-XCFLAGS = $(OS_CFLAGS)
-XLDOPTS = -Zlinker /PM:VIO
-endif
-
-include $(topsrcdir)/config/rules.mk
-
-PROGS	= $(OBJDIR)/now$(PROG_SUFFIX)
-
-ifeq (,$(filter-out OS2 WINNT,$(OS_ARCH)))
-TARGETS = $(PROGS)
-else
-PROGS	+= $(OBJDIR)/nsinstall$(PROG_SUFFIX)
-TARGETS = $(PROGS) $(PLSRCS:.pl=)
-endif
-
-OUTOPTION = -o # end of the line
-ifeq (,$(filter-out WINNT WIN95,$(OS_TARGET)))
-OUTOPTION = /Fe
-endif
-
-# Redefine MAKE_OBJDIR for just this directory
-define MAKE_OBJDIR
-if test ! -d $(@D); then rm -rf $(@D); mkdir $(@D); else true; fi
-endef
-
-export:: $(TARGETS)
-	rm -f $(dist_bindir)/nspr-config
-
-$(OBJDIR)/%$(PROG_SUFFIX): $(OBJDIR)/%.$(OBJ_SUFFIX)
-	@$(MAKE_OBJDIR)
-ifeq ($(MOZ_OS2_TOOLS),VACPP)
-	$(LD) $(EXEFLAGS) $<
-else
-	$(CC) $(XCFLAGS) $< $(XLDOPTS) $(OUTOPTION)$@
-endif
-
-real_install:: nspr.m4
-	$(NSINSTALL) -D $(DESTDIR)$(datadir)/aclocal
-	$(NSINSTALL) -t -m 0644 $< $(DESTDIR)$(datadir)/aclocal

mozilla/nsprpub/config/NCR.mk

@@ -1,97 +0,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/
-# 
-# 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 Portable Runtime (NSPR).
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# 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 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 MPL,
-# 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 MPL or the
-# GPL.
-# 
-
-#
-# Config stuff for NCR SVR4 MP-RAS
-#
-
-include $(MOD_DEPTH)/config/UNIX.mk
-###
-NS_USE_NATIVE = 1
-
-# NS_USE_GCC = 1
-
-export PATH:=$(PATH):/opt/ncc/bin
-###
-
-RANLIB          = true
-GCC_FLAGS_EXTRA = -pipe
-
-DEFINES		+= -DSVR4 -DSYSV -DHAVE_STRERROR -DNCR -D_PR_LOCAL_THREADS_ONLY
-
-ifeq (,$(filter-out 2.03,$(OS_RELEASE)))
-DEFINES		+= -D_PR_STAT_HAS_ST_ATIM
-else
-DEFINES		+= -D_PR_STAT_HAS_ST_ATIM_UNION
-endif
-
-ifdef NS_USE_NATIVE
-CC              = cc
-CCC             = ncc
-OS_CFLAGS	= -Hnocopyr
-#OS_LIBS         = -L/opt/ncc/lib 
-else
-#OS_LIBS		=
-endif
-
-CCC	= g++
-
-#OS_LIBS	       += -lsocket -lnsl -ldl -lc
-
-MKSHLIB		= $(LD) $(DSO_LDOPTS)
-#DSO_LDOPTS	= -G -z defs
-DSO_LDOPTS	= -G
-
-CPU_ARCH	= x86
-ARCH		= ncr
-
-NOSUCHFILE	= /no-such-file
-
-# now take care of default GCC (rus@5/5/97)
- 
-ifdef NS_USE_GCC
-# if gcc-settings are redefined already - don't touch it
-#
-ifeq (,$(findstring gcc, $(CC)))
-CC      = gcc
-CCC     = g++
-CXX     = g++
-COMPILER_TAG = _gcc
-# always use -fPIC - some makefiles are still broken and don't distinguish
-# situation when they build shared and static libraries
-CFLAGS  += -fPIC -Wall $(GCC_FLAGS_EXTRA)
-#OS_LIBS += -L/usr/local/lib -lstdc++ -lg++ -lgcc
-endif
-endif
-###
-

mozilla/nsprpub/config/NEC.mk

@@ -1,61 +0,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/
-# 
-# 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 Portable Runtime (NSPR).
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# 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 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 MPL,
-# 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 MPL or the
-# GPL.
-# 
-
-#
-# Config stuff for NEC Mips SYSV
-#
-
-include $(MOD_DEPTH)/config/UNIX.mk
-
-CPU_ARCH		= mips
-
-ifdef NS_USE_GCC
-CC			= gcc
-CCC			= g++
-else
-CC			= $(NSDEPTH)/build/hcc cc -Xa -KGnum=0 -KOlimit=4000
-CCC			= g++
-endif
-
-MKSHLIB			= $(LD) $(DSO_LDOPTS)
-
-RANLIB			= /bin/true
-
-DEFINES			+= -D_PR_LOCAL_THREADS_ONLY
-OS_CFLAGS		= $(ODD_CFLAGS) -DSVR4 -D__SVR4 -DNEC -Dnec_ews -DHAVE_STRERROR
-OS_LIBS			= -lsocket -lnsl -ldl $(LDOPTIONS)
-LDOPTIONS		= -lc -L/usr/ucblib -lucb
-
-NOSUCHFILE		= /no-such-file
-
-DSO_LDOPTS		= -G

mozilla/nsprpub/config/NEWS-OS.mk

@@ -1,74 +0,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/
-# 
-# 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 Portable Runtime (NSPR).
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# 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 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 MPL,
-# 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 MPL or the
-# GPL.
-# 
-
-######################################################################
-# Config stuff for Sony NEWS-OS
-######################################################################
- 
-######################################################################
-# Version-independent
-######################################################################
-
-include $(MOD_DEPTH)/config/UNIX.mk
-
-ARCH			:= sony
-CPU_ARCH		:= mips
- 
-CC			= cc
-CCC			= CC
-RANLIB			= /bin/true
-
-OS_INCLUDES		= -I/usr/include
-G++INCLUDES		=
-#OS_LIBS			= -lsocket -lnsl -lgen -lresolv
-
-PLATFORM_FLAGS		= -Xa -fullwarn -DSONY
-PORT_FLAGS		= -DSYSV -DSVR4 -D__svr4 -D__svr4__ -D_PR_LOCAL_THREADS_ONLY -DHAVE_SVID_GETTOD
-
-OS_CFLAGS		= $(PLATFORM_FLAGS) $(PORT_FLAGS)
-
-######################################################################
-# Version-specific stuff
-######################################################################
-
-######################################################################
-# Overrides for defaults in config.mk (or wherever)
-######################################################################
-
-######################################################################
-# Other
-######################################################################
-
-MKSHLIB			= $(LD) $(DSO_LDOPTS)
- 
-DSO_LDOPTS		= -G

mozilla/nsprpub/config/NEXTSTEP.mk

@@ -1,68 +0,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/
-# 
-# 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 Portable Runtime (NSPR).
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# 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 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 MPL,
-# 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 MPL or the
-# GPL.
-# 
-
-#
-# Config stuff for NEXTSTEP
-#
-
-include $(MOD_DEPTH)/config/UNIX.mk
-
-CC			= cc
-CCC			= cc++
-
-RANLIB			= ranlib
-
-OS_REL_CFLAGS		= -D$(shell uname -p)
-CPU_ARCH		:= $(shell uname -p)
-
-# "Commons" are tentative definitions in a global scope, like this:
-#     int x;
-# The meaning of a common is ambiguous.  It may be a true definition:
-#     int x = 0;
-# or it may be a declaration of a symbol defined in another file:
-#     extern int x;
-# Use the -fno-common option to force all commons to become true
-# definitions so that the linker can catch multiply-defined symbols.
-# Also, common symbols are not allowed with Rhapsody dynamic libraries.
-
-OS_CFLAGS		= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -Wall -fno-common -pipe -DNEXTSTEP -DHAVE_STRERROR -DHAVE_BSD_FLOCK -D_POSIX_SOURCE -traditional-cpp -posix
-
-DEFINES			+= -D_PR_LOCAL_THREADS_ONLY
-
-ARCH			= $(CPU_ARCH)
-
-# May override this with -bundle to create a loadable module.
-#DSO_LDOPTS		= -dynamiclib
-
-#MKSHLIB			= $(CC) -arch $(CPU_ARCH) $(DSO_LDOPTS)
-DLL_SUFFIX		= dylib

mozilla/nsprpub/config/NTO.mk

@@ -1,90 +0,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/
-# 
-# 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 Portable Runtime (NSPR).
-# 
-# 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):
-# 
-# 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 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 MPL,
-# 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 MPL or the
-# GPL.
-# 
-
-######################################################################
-# Config stuff for Neutrino
-######################################################################
-
-include $(MOD_DEPTH)/config/UNIX.mk
-
-#
-# XXX
-# Temporary define for the Client; to be removed when binary release is used
-#
-ifdef MOZILLA_CLIENT
-ifneq ($(USE_PTHREADS),1)
-CLASSIC_NSPR = 1
-endif
-endif
-
-#
-# The default implementation strategy for Linux is pthreads.
-#
-ifeq ($(CLASSIC_NSPR),1)
-IMPL_STRATEGY		= _EMU
-DEFINES			+= -D_PR_LOCAL_THREADS_ONLY
-else
-USE_PTHREADS		= 1
-IMPL_STRATEGY		= _PTH
-DEFINES			+= -D_REENTRANT
-endif
-
-
-AR			 = qcc -Vgcc_ntox86 -M -a $@
-CC			 = qcc -Vgcc_ntox86
-LD			 = $(CC)
-CCC			 = $(CC)
-
-# Old Flags  -DNO_REGEX   -DSTRINGS_ALIGNED
-
-OS_CFLAGS	 = -Wc,-Wall -Wc,-Wno-parentheses -DNTO  \
-			   -D_QNX_SOURCE -DHAVE_POINTER_LOCALTIME_R -shared
-
-COMPILER_TAG = _qcc
-MKSHLIB		 = qcc -Vgcc_ntox86 -shared -Wl,-h$(@:$(OBJDIR)/%.so=%.so) -M
-
-RANLIB		 = ranlib
-G++INCLUDES	 =
-OS_LIBS		 =
-EXTRA_LIBS  = -lsocket
-
-ifdef BUILD_OPT
-OPTIMIZER = -O1
-else
-OPTIMIZER = -O1 -gstabs
-endif
-
-NOSUCHFILE	= /no-such-file
-
-GARBAGE		+= *.map
-

mozilla/nsprpub/config/NetBSD.mk

@@ -1,89 +0,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/
-# 
-# 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 Portable Runtime (NSPR).
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# 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 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 MPL,
-# 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 MPL or the
-# GPL.
-# 
-
-#
-# Config stuff for NetBSD
-#
-
-include $(MOD_DEPTH)/config/UNIX.mk
-
-CC			= gcc
-CCC			= g++
-RANLIB			= ranlib
-
-ifndef OBJECT_FMT
-OBJECT_FMT		:= $(shell if echo __ELF__ | $${CC:-cc} -E - | grep -q __ELF__ ; then echo a.out ; else echo ELF ; fi)
-endif
-
-OS_REL_CFLAGS		=
-ifeq (86,$(findstring 86,$(OS_TEST)))
-CPU_ARCH		= x86
-else
-CPU_ARCH		= $(OS_TEST)
-endif
-
-OS_CFLAGS		= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe -DNETBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
-
-ifeq ($(USE_PTHREADS),1)
-OS_LIBS			= -lc_r
-# XXX probably should define _THREAD_SAFE too.
-else
-OS_LIBS			= -lc
-DEFINES			+= -D_PR_LOCAL_THREADS_ONLY
-endif
-
-ARCH			= netbsd
-
-ifeq ($(OBJECT_FMT),ELF)
-DLL_SUFFIX		= so
-else
-DLL_SUFFIX		= so.1.0
-# XXX work around a bug in the a.out ld(1).
-OS_LIBS			=
-endif
-
-DSO_CFLAGS		= -fPIC -DPIC
-DSO_LDOPTS		= -shared
-ifeq ($(OBJECT_FMT),ELF)
-DSO_LDOPTS		+=-Wl,-soname,lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
-endif
-
-ifdef LIBRUNPATH
-#DSO_LDOPTS		+= -R$(LIBRUNPATH)
-DSO_LDOPTS		+= -Wl,-R$(LIBRUNPATH)
-endif
-
-#MKSHLIB		= $(LD) $(DSO_LDOPTS)
-MKSHLIB			= $(CC) $(DSO_LDOPTS)
-
-G++INCLUDES		= -I/usr/include/g++

mozilla/nsprpub/config/OS2.mk

@@ -1,171 +0,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/
-# 
-# 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 Portable Runtime (NSPR).
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# 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 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 MPL,
-# 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 MPL or the
-# GPL.
-# 
-
-#
-# Configuration common to all (supported) versions of OS/2
-#
-# OS_CFLAGS is the command line options for the compiler when
-#   building the .DLL object files.
-# OS_EXE_CFLAGS is the command line options for the compiler
-#   when building the .EXE object files; this is for the test
-#   programs.
-# the macro OS_CFLAGS is set to OS_EXE_CFLAGS inside of the
-#   makefile for the pr/tests directory. ... Hack.
-
-# Specify toolset.  Default to EMX.
-ifeq ($(MOZ_OS2_TOOLS),VACPP)
-XP_OS2_VACPP = 1
-else
-ifeq ($(MOZ_OS2_TOOLS),PGCC)
-XP_OS2_EMX   = 1
-else
-MOZ_OS2_TOOLS = EMX
-XP_OS2_EMX   = 1
-endif
-endif
-
-ifeq ($(XP_OS2_EMX),1)
-MOZ_EMXTAG = $(subst .,,$(MOZ_OS2_EMX_OBJECTFORMAT))
-endif
-
-#
-# On OS/2 we proudly support gbash...
-#
-SHELL := GBASH.EXE
-
-CC			= icc -q -DXP_OS2 -N10
-CCC			= icc -q -DXP_OS2 -DOS2=4 -N10
-LINK			= -ilink
-AR			= -ilib /noignorecase /nologo /Out:$(subst /,\\,$@)
-RANLIB 			= @echo RANLIB
-BSDECHO 		= @echo BSDECHO
-STRIP			= @echo STRIP
-NSINSTALL 		= nsinstall
-INSTALL			= $(NSINSTALL)
-MAKE_OBJDIR 		= if test ! -d $(OBJDIR); then mkdir $(OBJDIR); fi
-IMPLIB 			= implib -nologo -noignorecase
-FILTER 			= cppfilt -b -p -q
-RC 			= rc.exe
-
-GARBAGE =
-
-XP_DEFINE 		= -DXP_PC
-LIB_SUFFIX 		= lib
-DLL_SUFFIX 		= dll
-OBJ_SUFFIX		= obj
-
-OS_CFLAGS     		= -W3 -Wcnd- -gm -gd+ -sd- -su4 -ge- -Mp
-OS_EXE_CFLAGS 		= -W3 -Wcnd- -gm -gd+ -sd- -su4 -Mp
-AR_EXTRA_ARGS 		= 
-
-ifdef BUILD_OPT
-OPTIMIZER		= -O+ -Oi 
-DEFINES 		= -UDEBUG -U_DEBUG -DNDEBUG
-DLLFLAGS		= -DLL -OUT:$@ -MAP:$(@:.dll=.map)
-EXEFLAGS    		= -PMTYPE:VIO -OUT:$@ -MAP:$(@:.exe=.map) -nologo -NOE
-OBJDIR_TAG 		= _OPT
-else
-OPTIMIZER		= -Ti+ -DE
-DEFINES 		= -DDEBUG -D_DEBUG -DDEBUGPRINTS
-DLLFLAGS		= -DEBUG -DLL -OUT:$@ -MAP:$(@:.dll=.map)
-EXEFLAGS    		= -DEBUG -PMTYPE:VIO -OUT:$@ -MAP:$(@:.exe=.map) -nologo -NOE
-OBJDIR_TAG 		= _DBG
-LDFLAGS 		= -DEBUG 
-endif
-
-DEFINES += -DOS2=4
-DEFINES += -D_X86_
-DEFINES += -D_PR_GLOBAL_THREADS_ONLY -DBSD_SELECT
-
-# Name of the binary code directories
-ifdef MOZ_LITE
-OBJDIR_NAME 		= $(subst OS2,NAV,$(OS_CONFIG))_$(MOZ_OS2_TOOLS)$(MOZ_EMXTAG)$(OBJDIR_TAG).OBJ
-else
-OBJDIR_NAME 		= $(OS_CONFIG)_$(MOZ_OS2_TOOLS)$(MOZ_EMXTAG)$(OBJDIR_TAG).OBJ
-endif
-
-OS_DLLFLAGS 		= -nologo -DLL -FREE -NOE
-
-ifdef XP_OS2_VACPP
-
-OS_LIBS 		= so32dll.lib tcp32dll.lib
-
-DEFINES += -DXP_OS2_VACPP -DTCPV40HDRS
-
-else
-CC			= gcc
-CCC			= gcc
-LINK			= gcc
-RC 			= rc.exe
-FILTER  		= emxexp
-IMPLIB  		= emximp -o
-
-# Determine which object format to use.  Two choices:
-# a.out and omf.  We default to omf.
-ifeq ($(MOZ_OS2_EMX_OBJECTFORMAT), A.OUT)
-AR      	= ar -q $@
-LIB_SUFFIX	= a
-else
-OMF_FLAG 	= -Zomf
-AR		= emxomfar r $@
-LIB_SUFFIX	= lib
-endif
-
-OS_LIBS     		= -lsocket -lemxio
-
-DEFINES += -DXP_OS2 -DXP_OS2_EMX -DOS2EMX_PLAIN_CHAR
-
-OS_CFLAGS     		= $(OMF_FLAG) -Wall -Wno-unused -Zmtd
-OS_EXE_CFLAGS 		= $(OMF_FLAG) -Wall -Wno-unused -Zmtd
-OS_DLLFLAGS 		= $(OMF_FLAG) -Zmt -Zdll -Zcrtdll -o $@
-ifeq ($(MOZ_OS2_EMX_OBJECTFORMAT),OMF)
-EXEFLAGS                += -Zlinker /DE
-endif
-
-ifdef BUILD_OPT
-OPTIMIZER		= -O3
-DLLFLAGS		= 
-EXEFLAGS    		= -Zmtd -o $@
-else
-OPTIMIZER		= -g #-s
-DLLFLAGS		= -g #-s
-EXEFLAGS		= -g $(OMF_FLAG) -Zmtd -L$(DIST)/lib -o $@   # -s
-ifeq ($(MOZ_OS2_EMX_OBJECTFORMAT),OMF)
-EXEFLAGS                += -Zlinker /DE
-endif
-endif
-
-AR_EXTRA_ARGS 		=
-endif
-
-

mozilla/nsprpub/config/OSF1.mk

@@ -1,122 +0,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/
-# 
-# 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 Portable Runtime (NSPR).
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# 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 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 MPL,
-# 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 MPL or the
-# GPL.
-# 
-
-#
-# Config stuff for DEC OSF/1
-#
-
-#
-# The Bourne shell (sh) on OSF1 doesn't handle "set -e" correctly,
-# which we use to stop LOOP_OVER_DIRS submakes as soon as any
-# submake fails.  So we use the Korn shell instead.
-#
-SHELL			:= /usr/bin/ksh
-
-include $(MOD_DEPTH)/config/UNIX.mk
-
-#
-# XXX
-# Temporary define for the Client; to be removed when binary release is used
-#
-ifdef MOZILLA_CLIENT
-ifneq ($(USE_PTHREADS),1)
-CLASSIC_NSPR = 1
-endif
-endif
-
-#
-# Prior to OSF1 V4.0, classic nspr is the default (and only) implementation
-# strategy.
-#
-# On OSF1 V4.0, pthreads is the default implementation strategy.
-# Classic nspr is also available.
-#
-ifeq (,$(filter-out V2.0 V3.2,$(OS_RELEASE)))
-CLASSIC_NSPR = 1
-endif
-
-ifeq ($(CLASSIC_NSPR), 1)
-	IMPL_STRATEGY = _EMU
-	DEFINES += -D_PR_LOCAL_THREADS_ONLY
-else
-	USE_PTHREADS = 1
-	IMPL_STRATEGY = _PTH
-endif
-
-CC			= cc $(NON_LD_FLAGS) -std1
-ifneq ($(OS_RELEASE),V2.0)
-CC			+= -readonly_strings
-endif
-# The C++ compiler cxx has -readonly_strings on by default.
-CCC			= cxx
-
-RANLIB			= /bin/true
-
-CPU_ARCH		= alpha
-
-ifdef BUILD_OPT
-OPTIMIZER		+= -Olimit 4000
-endif
-
-NON_LD_FLAGS		= -ieee_with_inexact
-
-OS_CFLAGS		= -DOSF1 -D_REENTRANT
-
-ifneq (,$(filter-out V2.0 V3.2,$(OS_RELEASE)))
-OS_CFLAGS		+= -DOSF1_HAVE_MACHINE_BUILTINS_H
-endif
-
-ifneq (,$(filter-out V2.0 V3.2,$(OS_RELEASE)))
-OS_CFLAGS		+= -DHAVE_FCNTL_FILE_LOCKING
-endif
-
-ifeq (,$(filter-out V2.0 V3.2,$(OS_RELEASE)))
-OS_CFLAGS		+= -DHAVE_INT_LOCALTIME_R
-else
-OS_CFLAGS		+= -DHAVE_POINTER_LOCALTIME_R
-endif
-
-ifeq (,$(filter-out V4.0%,$(OS_RELEASE)))
-OS_CFLAGS		+= -DOSF1V4_MAP_PRIVATE_BUG
-endif
-
-ifeq ($(USE_PTHREADS),1)
-OS_CFLAGS		+= -pthread
-ifneq (,$(filter-out V2.0 V3.2,$(OS_RELEASE)))
-OS_CFLAGS		+= -D_PR_HAVE_THREADSAFE_GETHOST
-endif
-endif
-
-# The command to build a shared library on OSF1.
-MKSHLIB = ld -shared -all -expect_unresolved "*" -soname $(notdir $@)
-DSO_LDOPTS		= -shared

mozilla/nsprpub/config/OpenBSD.mk

@@ -1,78 +0,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/
-# 
-# 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 Portable Runtime (NSPR).
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# 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 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 MPL,
-# 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 MPL or the
-# GPL.
-# 
-
-#
-# Config stuff for OpenBSD
-#
-
-include $(MOD_DEPTH)/config/UNIX.mk
-
-CC                     = gcc
-CCC                    = g++
-RANLIB                 = ranlib
-
-OS_REL_CFLAGS          =
-ifeq (86,$(findstring 86,$(OS_TEST)))
-CPU_ARCH               = x86
-else
-CPU_ARCH               = $(OS_TEST)
-endif
-
-OS_CFLAGS              = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe $(THREAD_FLAG) -DOPENBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
-
-ifeq ($(USE_PTHREADS),1)
-THREAD_FLAG		+= -pthread
-# XXX probably should define _THREAD_SAFE too.
-else
-DEFINES                        += -D_PR_LOCAL_THREADS_ONLY
-endif
-
-ARCH                   = openbsd
-
-DLL_SUFFIX             = so.1.0
-
-DSO_CFLAGS             = -fPIC
-DSO_LDOPTS             = -Bshareable
-ifeq ($(OS_TEST),alpha)
-DSO_LDOPTS             = -shared
-endif
-ifeq ($(OS_TEST),mips)
-DSO_LDOPTS             = -shared
-endif
-ifeq ($(OS_TEST),pmax)  
-DSO_LDOPTS             = -shared
-endif
-
-MKSHLIB                        = $(LD) $(DSO_LDOPTS)
-
-G++INCLUDES            = -I/usr/include/g++

mozilla/nsprpub/config/OpenVMS.mk

@@ -1,67 +0,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/
-# 
-# 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 Portable Runtime (NSPR).
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# 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 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 MPL,
-# 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 MPL or the
-# GPL.
-# 
-
-#
-# Config stuff for Compaq OpenVMS
-#
-
-include $(MOD_DEPTH)/config/UNIX.mk
-
-ifdef INTERNAL_TOOLS
-CC			= c89
-CCC			= cxx
-OPTIMIZER		= -O
-else
-CC			= ccc
-CCC			= ccc
-endif
-
-RANLIB			= /bin/true
-
-CPU_ARCH_TAG		= _$(CPU_ARCH)
-
-OS_CFLAGS              = -DVMS -DVMS_AS_IS -Wc,names=\(short,as\) \
-                         -DGENERIC_PTHREAD_REDEFINES -D_SOCKADDR_LEN
-OS_CXXFLAGS            = -DVMS -DVMS_AS_IS -Wc,names=\(short,as\) \
-                         -DGENERIC_PTHREAD_REDEFINES -D_SOCKADDR_LEN
-
-#
-# XCFLAGS are the only CFLAGS that are used during a link operation. Defining
-# OPTIMIZER in XCFLAGS means that each compilation line gets OPTIMIZER
-# included twice, but at least we get OPTIMIZER included in the link
-# operations; and OpenVMS needs it!
-#
-XCFLAGS                        += $(OPTIMIZER)
-
-# The command to build a shared library in POSIX on OpenVMS.
-MKSHLIB = vmsld $(OPTIMIZER)

mozilla/nsprpub/config/QNX.mk

@@ -1,57 +0,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/
-# 
-# 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 Portable Runtime (NSPR).
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# 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 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 MPL,
-# 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 MPL or the
-# GPL.
-# 
-
-######################################################################
-# Config stuff for QNX.
-######################################################################
-
-include $(MOD_DEPTH)/config/UNIX.mk
-
-CPU_ARCH	= x86
-
-ifndef NS_USE_GCC
-CC		= cc
-CCC		= cc
-endif
-RANLIB		= true
-
-G++INCLUDES	=
-OS_LIBS		=
-XLDOPTS		= -lunix
-
-OS_CFLAGS	= -DQNX -Di386 -D_PR_LOCAL_THREADS_ONLY -D_PR_NEED_H_ERRNO
-#IMPL_STRATEGY	= _EMU
-
-NOSUCHFILE	= /no-such-file
-
-GARBAGE		= $(wildcard *.err)

mozilla/nsprpub/config/Rhapsody.mk

@@ -1,83 +0,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/
-# 
-# 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 Portable Runtime (NSPR).
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# 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 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 MPL,
-# 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 MPL or the
-# GPL.
-# 
-
-#
-# Config stuff for Rhapsody
-#
-
-include $(MOD_DEPTH)/config/UNIX.mk
-
-#
-# The default implementation strategy for Rhapsody is pthreads.
-#
-ifeq ($(CLASSIC_NSPR),1)
-IMPL_STRATEGY   = _EMU
-DEFINES         += -D_PR_LOCAL_THREADS_ONLY
-else
-USE_PTHREADS    = 1
-IMPL_STRATEGY   = _PTH
-endif
-
-CC              = cc
-CCC             = c++
-RANLIB			= ranlib
-
-ifeq (86,$(findstring 86,$(OS_TEST)))
-OS_REL_CFLAGS   = -mno-486 -Di386
-CPU_ARCH        = i386
-else
-OS_REL_CFLAGS   = -Dppc
-CPU_ARCH		= ppc
-endif
-
-# "Commons" are tentative definitions in a global scope, like this:
-#     int x;
-# The meaning of a common is ambiguous.  It may be a true definition:
-#     int x = 0;
-# or it may be a declaration of a symbol defined in another file:
-#     extern int x;
-# Use the -fno-common option to force all commons to become true
-# definitions so that the linker can catch multiply-defined symbols.
-# Also, common symbols are not allowed with Rhapsody dynamic libraries.
-
-OS_CFLAGS		= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -Wmost -fno-common -pipe -DRHAPSODY -DHAVE_STRERROR -DHAVE_BSD_FLOCK
-
-ARCH			= rhapsody
-
-# May override this with -bundle to create a loadable module.
-DSO_LDOPTS		= -dynamiclib -compatibility_version 1 -current_version 1 -all_load
-
-MKSHLIB			= $(CC) -arch $(CPU_ARCH) $(DSO_LDOPTS)
-DLL_SUFFIX		= dylib
-
-G++INCLUDES		= -I/usr/include/g++

mozilla/nsprpub/config/SCOOS.mk

@@ -1,63 +0,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/
-# 
-# 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 Portable Runtime (NSPR).
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# 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 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 MPL,
-# 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 MPL or the
-# GPL.
-# 
-
-#
-# Config stuff for SCO OpenServer for x86.
-# SCO OpenServer 5, based on SVR3.2, is intended for small to
-# medium customers.
-#
-
-include $(MOD_DEPTH)/config/UNIX.mk
-
-CC			= cc -b elf -KPIC
-CCC			= $(NSDEPTH)/build/hcpp CC +.cpp +w
-RANLIB			= /bin/true
-
-DEFINES			+= -D_PR_LOCAL_THREADS_ONLY
-#
-# -DSCO - Changes to Netscape source (consistent with AIX, LINUX, etc..)
-# -Dsco - Needed for /usr/include/X11/*
-#
-OS_CFLAGS		= -DSYSV -D_SVID3 -DHAVE_STRERROR -D_PR_NEED_H_ERRNO -DSCO -Dsco
-#OS_LIBS			= -lpmapi -lsocket -lc
-
-MKSHLIB			= $(LD) $(DSO_LDOPTS)
-
-CPU_ARCH		= x86
-ARCH			= sco
-
-NOSUCHFILE		= /no-such-file
-
-BSDECHO			= /bin/echo
-
-DSO_LDOPTS		= -b elf -G

mozilla/nsprpub/config/SINIX.mk

@@ -1,108 +0,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/
-# 
-# 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 Portable Runtime (NSPR).
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# 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 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 MPL,
-# 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 MPL or the
-# GPL.
-# 
-
-#
-# Config stuff for SNI SINIX (aka ReliantUNIX)
-#
-
-include $(MOD_DEPTH)/config/UNIX.mk
-
-ifeq (86,$(findstring 86,$(OS_TEST)))
-CPU_ARCH		= x86
-else
-CPU_ARCH		= mips
-endif
-CPU_ARCH_TAG		= _$(CPU_ARCH)
-
-# use gcc -tf-
-NS_USE_GCC		= 1
-
-ifeq ($(NS_USE_GCC),1)
-## gcc-2.7.2 homebrewn
-CC			= gcc
-COMPILER_TAG		= _gcc
-CCC			= g++
-AS			= $(CC) -x assembler-with-cpp
-ifeq ($(CPU_ARCH),mips)
-LD			= gld
-endif
-ODD_CFLAGS		= -Wall -Wno-format
-ifeq ($(CPU_ARCH),mips)
-# The -pipe flag only seems to work on the mips version of SINIX.
-ODD_CFLAGS		+= -pipe
-endif
-ifdef BUILD_OPT
-OPTIMIZER		= -O
-#OPTIMIZER		= -O6
-endif
-MKSHLIB			= $(LD) -G -z defs -h $(@:$(OBJDIR)/%.so=%.so)
-#DSO_LDOPTS		= -G -Xlinker -Blargedynsym
-else
-## native compiler (CDS++ 1.0)
-CC			= /usr/bin/cc
-CCC			= /usr/bin/CC
-AS			= /usr/bin/cc
-#ODD_CFLAGS		= -fullwarn -xansi
-ODD_CFLAGS		= 
-ifdef BUILD_OPT
-#OPTIMIZER		= -Olimit 4000
-OPTIMIZER		= -O -F Olimit,4000
-endif
-MKSHLIB			= $(LD) -G -z defs -h $(@:$(OBJDIR)/%.so=%.so)
-#DSO_LDOPTS		= -G -W l,-Blargedynsym
-endif
-
-ifeq ($(CPU_ARCH),x86)
-DEFINES			+= -Di386
-endif
-
-ODD_CFLAGS		+= -DSVR4 -DSNI -DRELIANTUNIX -Dsinix -DHAVE_SVID_GETTOD
-
-# On SINIX 5.43, need to define IP_MULTICAST in order to get the
-# IP multicast macro and struct definitions in netinet/in.h.
-# (SINIX 5.42 does not have IP multicast at all.)
-ifeq ($(OS_RELEASE),5.43)
-ODD_CFLAGS		+= -DIP_MULTICAST
-endif
-
-RANLIB			= /bin/true
-
-# For purify
-NOMD_OS_CFLAGS		= $(ODD_CFLAGS)
-
-# we do not have -MDupdate ...
-OS_CFLAGS		= $(NOMD_OS_CFLAGS)
-OS_LIBS			= -lsocket -lnsl -lresolv -ldl -lc
-NOSUCHFILE		= /no-such-file
-
-DEFINES			+= -D_PR_LOCAL_THREADS_ONLY

mozilla/nsprpub/config/SunOS.mk

@@ -1,42 +0,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/
-# 
-# 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 Portable Runtime (NSPR).
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# 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 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 MPL,
-# 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 MPL or the
-# GPL.
-# 
-
-#
-# Config stuff for SunOS.
-# 4 and 5 are vastly different, so we use 2 different files.
-#
-ifeq ($(basename $(OS_RELEASE)),4.1)
-include $(MOD_DEPTH)/config/SunOS4.mk
-else
-include $(MOD_DEPTH)/config/SunOS5.mk
-endif

mozilla/nsprpub/config/SunOS4.mk

@@ -1,68 +0,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/
-# 
-# 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 Portable Runtime (NSPR).
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# 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 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 MPL,
-# 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 MPL or the
-# GPL.
-# 
-
-#
-# Config stuff for SunOS4.1
-#
-
-include $(MOD_DEPTH)/config/UNIX.mk
-
-# SunOS 4 _requires_ that shared libs have a version number.
-# XXX FIXME: Version number should use NSPR_VERSION_NUMBER?
-DLL_SUFFIX	= so.1.0
-
-CC			= gcc
-CCC			= g++
-COMPILER_TAG		= _gcc
-
-RANLIB			= ranlib
-
-CPU_ARCH		= sparc
-
-DEFINES			+= -D_PR_LOCAL_THREADS_ONLY
-# Purify doesn't like -MDupdate
-NOMD_OS_CFLAGS		= -Wall -Wno-format -DSUNOS4
-
-ifdef NO_MDUPDATE
-OS_CFLAGS		= $(DSO_CFLAGS) $(NOMD_OS_CFLAGS)
-else
-OS_CFLAGS		= $(DSO_CFLAGS) $(NOMD_OS_CFLAGS) -MDupdate $(DEPENDENCIES)
-endif
-
-MKSHLIB			= $(LD) $(DSO_LDOPTS)
-
-NOSUCHFILE		= /no-such-file
-
-DSO_LDOPTS		=
-# -fPIC generates position-independent code for use in a shared library.
-DSO_CFLAGS		= -fPIC