This commit was manufactured by cvs2svn to create branch

'PSM_CLIENT_BRENACH'.

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

mozilla/mailnews/mapi/makefile.win

@@ -1,28 +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 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

@@ -1,54 +0,0 @@
-; ***** 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

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

@@ -1,61 +0,0 @@
-# ***** 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/public/nsIMapiSupport.idl

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

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

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

@@ -1,64 +0,0 @@
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is 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

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

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

@@ -1,89 +0,0 @@
-/* -*- 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,50 +0,0 @@
-#!nmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-DEPTH=..\..\..
-MODULE=mapiutils
-
-include <$(DEPTH)\config\config.mak>
-
-################################################################################
-## exports
-
-EXPORTS=	mapismem.h	\
-    		nsstrseq.h	\
-			$(NULL)
-
-################################################################################
-## library
-
-LIBRARY_NAME=mapiutils_s
-
-
-CPP_OBJS=   .\$(OBJDIR)\mapismem.obj		\
-			.\$(OBJDIR)\nsstrseq.obj		\
-			$(NULL)
-
-include <$(DEPTH)\config\rules.mak>
-
-install:: $(LIBRARY)
-	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
-
-clobber::
-	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib

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

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

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

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

@@ -1,68 +0,0 @@
-/* -*- 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/mapi32/maindll.cpp

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

@@ -1,70 +0,0 @@
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,138 +0,0 @@
-/* -*- 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/nscpmapi.h

@@ -1,351 +0,0 @@
-/* -*- 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/mapitest/main.cpp

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,117 +0,0 @@
-<?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

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

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

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

@@ -1,14 +0,0 @@
-<?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

@@ -1,104 +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 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

@@ -1,44 +0,0 @@
-<?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

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

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

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

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

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

@@ -1,27 +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 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/security/Makefile.in

@@ -1,4 +1,3 @@
-#!nmake
 #
 # The contents of this file are subject to the Netscape Public
 # License Version 1.1 (the "License"); you may not use this file
@@ -18,10 +17,15 @@
 # Rights Reserved.
 #
 # Contributor(s): 
+#
 
-DEPTH=..\..\..
+DEPTH		= ..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
 
+include $(DEPTH)/config/autoconf.mk
 
-DIRS=mapitest
+DIRS		= psm
 
-include <$(DEPTH)\config\rules.mak>
+include $(topsrcdir)/config/rules.mk

mozilla/security/psm/Makefile

@@ -0,0 +1,88 @@
+#! 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 security libraries.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 1994-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.
+#
+
+#######################################################################
+# (1) Include initial platform-independent assignments (MANDATORY).   #
+#######################################################################
+
+include manifest.mn
+
+#######################################################################
+# (2) Include "global" configuration information. (OPTIONAL)          #
+#######################################################################
+
+include $(CORE_DEPTH)/coreconf/config.mk
+
+#######################################################################
+# (3) Include "component" configuration information. (OPTIONAL)       #
+#######################################################################
+
+
+
+#######################################################################
+# (4) Include "local" platform-dependent assignments (OPTIONAL).      #
+#######################################################################
+
+
+
+#######################################################################
+# (5) Execute "global" rules. (OPTIONAL)                              #
+#######################################################################
+
+include $(CORE_DEPTH)/coreconf/rules.mk
+
+#######################################################################
+# (6) Execute "component" rules. (OPTIONAL)                           #
+#######################################################################
+
+
+
+#######################################################################
+# (7) Execute "local" rules. (OPTIONAL).                              #
+#######################################################################
+
+psm_RelEng_srvr_bld:
+	cd ../coreconf; gmake
+	cd ../../nsprpub; $(MAKE) OBJDIR_NAME=$(OBJDIR_NAME)
+	cd ../nss; gmake import IMPORTS=dbm/DBM_1_54
+	cd ../nss; gmake 
+ifeq ($(OS_ARCH), WINNT)
+	gmake import IMPORTS=nlslayer/m16
+else
+	gmake import IMPORTS=nlslayer/PR3 RELEASE_TREE=/h/tortoise/export/share/builds/components
+endif
+	cd ui;gmake
+	gmake
+	cd server;gmake build_xpi
+

mozilla/security/psm/Makefile.in

@@ -0,0 +1,118 @@
+#
+# 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		= ../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+
+CORE_DEPTH=$(topsrcdir)/security
+
+include $(CORE_DEPTH)/coreconf/arch.mk
+ifeq (,$(filter-out NetBSD,$(OS_TARGET)))
+include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk
+else
+include $(CORE_DEPTH)/coreconf/$(OS_CONFIG).mk
+endif
+include $(CORE_DEPTH)/coreconf/prefix.mk
+CPU_TAG = _$(CPU_ARCH)
+LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX)
+CORECONF_OBJDIR=$(OBJDIR_NAME)
+
+include $(DEPTH)/config/autoconf.mk
+
+ifndef MOZ_DEBUG
+OPT_GMAKE_FLAGS = BUILD_OPT=1
+BUILD_OPT=1
+OBJDIR_TAG=_OPT
+endif
+
+DEFAULT_GMAKE_FLAGS = -f Makefile $(OPT_GMAKE_FLAGS) 
+
+CORECONF_INSTALL     = $(DIST)/$(CORECONF_OBJDIR)
+CORECONF_DIST        = $(MOZ_BUILD_ROOT)/dist/$(CORECONF_OBJDIR)
+DEFAULT_GMAKE_FLAGS += DIST=$(CORECONF_DIST) 
+DEFAULT_GMAKE_FLAGS += SOURCE_LIB_DIR=$(CORECONF_DIST)/lib
+DEFAULT_GMAKE_FLAGS += SOURCE_BIN_DIR=$(CORECONF_DIST)/bin
+DEFAULT_GMAKE_FLAGS += SOURCE_XP_DIR=$(CORECONF_DIST)
+
+
+DIRS		= lib
+
+include $(topsrcdir)/config/rules.mk
+
+ABS_topsrcdir	:= $(shell cd $(topsrcdir); pwd)
+
+install::
+ifneq ($(ABS_topsrcdir),$(MOZ_BUILD_ROOT))
+	if test ! -d $(MOZ_BUILD_ROOT)/security/nss; then                   \
+		cp -r $(topsrcdir)/security/nss $(MOZ_BUILD_ROOT)/security; \
+	fi;
+	if test ! -d $(MOZ_BUILD_ROOT)/security/coreconf; then              \
+		cp -r $(topsrcdir)/security/coreconf $(MOZ_BUILD_ROOT)/security; \
+	fi;
+	if test ! -d $(MOZ_BUILD_ROOT)/security/psm/server; then            \
+		cp -r $(topsrcdir)/security/psm/server $(MOZ_BUILD_ROOT)/security/psm/server; \
+	fi;
+	if test ! -d $(MOZ_BUILD_ROOT)/security/psm/ui; then        \
+		cp -r $(topsrcdir)/security/psm/ui $(MOZ_BUILD_ROOT)/security/psm/; \
+	fi;
+	if test ! -d $(MOZ_BUILD_ROOT)/security/psm/doc; then       \
+		cp -r $(topsrcdir)/security/psm/doc $(MOZ_BUILD_ROOT)/security/psm/; \
+	fi;
+endif
+	cd $(MOZ_BUILD_ROOT)/security/coreconf; gmake $(DEFAULT_GMAKE_FLAGS)
+	cd $(MOZ_BUILD_ROOT)/security/nss; gmake $(DEFAULT_GMAKE_FLAGS) moz_import
+	cd $(MOZ_BUILD_ROOT)/security/nss/lib; gmake $(DEFAULT_GMAKE_FLAGS)
+	cd $(MOZ_BUILD_ROOT)/security/psm/ui; gmake $(DEFAULT_GMAKE_FLAGS)
+	cd $(MOZ_BUILD_ROOT)/security/psm/server; gmake $(DEFAULT_GMAKE_FLAGS)
+	$(INSTALL) -m 755 $(CORECONF_INSTALL)/bin/psm $(DIST)/bin/
+	$(INSTALL) -m 755 $(CORECONF_INSTALL)/bin/psmdata $(DIST)/bin
+	$(INSTALL) -m 755 $(CORECONF_INSTALL)/bin/start-psm $(DIST)/bin
+	$(INSTALL) -m 755 $(CORECONF_INSTALL)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
+
+clean clobber clobber_all realclean distclean::
+ifeq ($(ABS_topsrcdir),$(MOZ_BUILD_ROOT))
+	cd $(MOZ_BUILD_ROOT)/security/coreconf; gmake $(DEFAULT_GMAKE_FLAGS) clean
+	cd $(MOZ_BUILD_ROOT)/security/nss; gmake $(DEFAULT_GMAKE_FLAGS) clean
+	cd $(MOZ_BUILD_ROOT)/security/psm/ui; gmake $(DEFAULT_GMAKE_FLAGS) clean
+	cd $(MOZ_BUILD_ROOT)/security/psm/server; gmake $(DEFAULT_GMAKE_FLAGS) clean
+else
+	if test -d $(MOZ_BUILD_ROOT)/security/nss; then \
+		rm -rf $(MOZ_BUILD_ROOT)/security/nss;  \
+	fi;
+	if test -d $(MOZ_BUILD_ROOT)/security/coreconf; then    \
+		rm -rf $(MOZ_BUILD_ROOT)/security/coreconf;     \
+	fi;
+	if test -d $(MOZ_BUILD_ROOT)/security/psm/server; then  \
+		rm -rf $(MOZ_BUILD_ROOT)/security/psm/server;   \
+	fi;
+	if test -d $(MOZ_BUILD_ROOT)/security/psm/ui; then      \
+		rm -rf $(MOZ_BUILD_ROOT)/security/psm/ui;       \
+	fi;
+	if test -d $(MOZ_BUILD_ROOT)/security/psm/doc; then     \
+		rm -rf $(MOZ_BUILD_ROOT)/security/psm/doc;      \
+	fi;
+	if test -d $(MOZ_BUILD_ROOT)/dist/$(CORECONF_OBJDIR); then      \
+		rm -rf $(MOZ_BUILD_ROOT)/dist/$(CORECONF_OBJDIR);       \
+	fi;
+endif

mozilla/security/psm/doc/cmcjavascriptapi.html

@@ -0,0 +1,494 @@
+<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<html>
+<head>
+   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+   <meta name="GENERATOR" content="Mozilla/4.7 [en] (WinNT; U) [Netscape]">
+   <title>Javascript API for Client Certificate Management</title>
+</head>
+<body>
+<h2><font face="Arial,Helvetica">Netscape Personal Security Manager</font></h2>
+
+<h2><font face="Arial,Helvetica">JavaScript API for Client Certificate Management</font></h2>
+
+Version 0.3 - 10/27/1999
+<br>Comments to: <a href="mailto:psmfeedback@netscape.com?subject=JavaScript%20API%20Feedback">psmfeedback@netscape.com</a>
+<p>This document describes a new JavaScript API for performing user certificate
+management operations within a client. The JavaScript runs in the context
+of a web page operated by a Certificate Authority (CA) or Registration
+Authority (RA). The API allows the CA or RA to instruct the client to perform
+PKI operations such as key generation, certificate request generation,
+key escrow, import of user certificates, key recovery, and revocation requests.
+<p>These properties and methods reflect behavior currently implemented
+in Personal Security Manager 1.0.
+<p>The messages imported by or generated by these JavaScript methods are
+defined in the CRMF, CMMF, and CMC internet drafts.
+<h2>
+<font face="Arial,Helvetica">Overview of New Cert Issuing Process</font></h2>
+
+<ol>
+<li>
+User fills out enrollment form</li>
+
+<li>
+User action initiates script</li>
+
+<li>
+Script calls key generation method</li>
+
+<li>
+Signing and Encryption keys are generated</li>
+
+<li>
+Encryption Private Key is wrapped with public key of Key Recovery Authority
+(KRA) (passed in in the form of a certificate as part of the script, and
+checked against a pre-installed certificate copy in the local certificate
+database)</li>
+
+<li>
+The public keys, wrapped encryption private key, and text string from the
+script (possibly containing naming or enrollment info) are signed by the
+user</li>
+
+<li>
+Signed blob is returned to the script</li>
+
+<li>
+Script submits signed blob and any other necessary info to the CA/RA</li>
+
+<li>
+CA/RA verifies signature on signed blob</li>
+
+<li>
+CA/RA validates identity of user</li>
+
+<li>
+CA/RA sends wrapped encryption private key to KRA</li>
+
+<li>
+KRA sends escrow verification back to CA</li>
+
+<li>
+CA creates and signs certificates</li>
+
+<li>
+CA sends certificates back to Communicator</li>
+</ol>
+
+<h2>
+<font face="Arial,Helvetica">JavaScript API</font></h2>
+
+<h3>
+<font face="Arial,Helvetica">Properties</font></h3>
+<tt>crypto.algorithms.dh.keySizes</tt>
+<br><tt>crypto.algorithms.dsa.keySizes</tt>
+<br><tt>crypto.algorithms.rsa.signing.keySizes</tt>
+<br><tt>crypto.algorithms.rsa.keyEx.keySizes</tt>
+<p><tt>keySizes</tt> is an an array that describes the available key sizes
+for the particular algorithms and operations.
+<p>The table below describes the key sizes that will be supported in the
+US and Export versions of Communicator.
+<br>&nbsp;
+<table BORDER WIDTH="100%" >
+<tr>
+<td ALIGN=CENTER><b>Algorithm</b></td>
+
+<td ALIGN=CENTER><b>US Version Key Sizes</b></td>
+
+<td ALIGN=CENTER><b>Export Version Key Sizes</b></td>
+</tr>
+
+<tr>
+<td>DSA Signing Only</td>
+
+<td>1024, 2048</td>
+
+<td>1024, 2048</td>
+</tr>
+
+<tr>
+<td>RSA Signing Only</td>
+
+<td>1024, 2048</td>
+
+<td>1024, 2048</td>
+</tr>
+
+<tr>
+<td>RSA Encryption Only</td>
+
+<td>1024, 2048</td>
+
+<td>512,1024</td>
+</tr>
+
+<tr>
+<td>RSA Dual Use Signing And Encryption</td>
+
+<td>1024, 2048</td>
+
+<td>512,1024</td>
+</tr>
+
+<tr>
+<td>DH Key Exchange</td>
+
+<td>1024, 2048</td>
+
+<td>512,1024</td>
+</tr>
+</table>
+
+<h3>
+<font face="Arial,Helvetica">Methods</font></h3>
+
+<h4>
+<font face="Arial,Helvetica">generateCRMFRequest()</font></h4>
+<tt>crmfObject = crypto.generateCRMFRequest(<i>"requestedDN", "regToken",
+"authenticator","escrowAuthorityCert", "KeyGen Done Code",keySize1, "keyParams1",
+"keyGenAlg1",..., keySizeN, "keyParamsN", "keyGenAlgN");</i></tt>
+<p>This method will generate a sequence of CRMF requests that has N requests.&nbsp;
+One request for each key pair that is generated.&nbsp; The first three
+parameters will be applied to every request.&nbsp; the "escrowAuthorityCert"
+parameter will only be used for requests that pertain to a key that is
+being escrowed.&nbsp; After the "escrowAuthorityCert" parameter, the method
+takes some JavaScript code that&nbsp; is invoked when the CRMF request
+is ready. Finally, there are 1 or more sets of key generation arguments.&nbsp;
+Each key generation will be associated with its own request.&nbsp; All
+the requests will have the same DN.
+<br>&nbsp;
+<table BORDER WIDTH="100%" >
+<tr>
+<td ALIGN=CENTER VALIGN=TOP><b>Argument</b></td>
+
+<td ALIGN=CENTER><b>Description</b></td>
+</tr>
+
+<tr>
+<td><i><tt>"requestedDN"</tt></i></td>
+
+<td>An RFC1485 formatted DN to include in the certificate request.</td>
+</tr>
+
+<tr>
+<td><i><tt>"regToken"</tt></i></td>
+
+<td>A value used to authenticate the user to the RA/CA.</td>
+</tr>
+
+<tr>
+<td><i><tt>"authenticator"</tt></i></td>
+
+<td>A value that the user can authenticate with in the future when their
+private key is not available. Can be used for key recovery or revocation
+requests.</td>
+</tr>
+
+<tr>
+<td><i><tt>"escrowAuthorityCert"</tt></i></td>
+
+<td>If this value is NULL, then no key escrow will be performed. This value
+specifies which KRA certificate should be used to wrap the private key
+being escrowed. The user will be prompted for confirmation whenever a key
+will be escrowed.&nbsp; Only key exchange keys will be escrowed. If a dual
+use key is being generated, it will not be escrowed.&nbsp; The value of
+this argument is a base-64 encoded certificate.</td>
+</tr>
+
+<tr>
+<td><i><tt>"CRMF Generation Done Code"</tt></i></td>
+
+<td>This parameter is JavaScript to execute when the CRMF generation is
+complete.&nbsp;</td>
+</tr>
+
+<tr>
+<td VALIGN=TOP><i><tt>keySizeN</tt></i></td>
+
+<td>The size in bits of the Nth key to generate</td>
+</tr>
+
+<tr>
+<td VALIGN=TOP><i><tt>"keyParamsN"</tt></i></td>
+
+<td>This string is an optional algorithm dependent parameter value. For
+Diffie-Hellman it is used to specify p and g parameters.&nbsp; For DSA,
+it will be used to specify pqg. If the key generation requires parameters
+and the value passed in is NULL, then the client will generate the parameters
+on its own. Currently, this value is ignored.</td>
+</tr>
+
+<tr>
+<td VALIGN=TOP><i><tt>"keyGenAlgN"</tt></i></td>
+
+<td>Which algorithm the generated key will support. Acceptable values are
+(the mentioned values for keyUsage pertain to the keyUsage value of the
+Certificate Extension that will ultimately be in the issued certificate):&nbsp;
+<ul>
+<li>
+"rsa-ex" - generate an RSA key for key exchange only (This will have keyEncipherment
+set for keyUsage.)</li>
+
+<li>
+"rsa-dual-use" - generate a single RSA key for both signing and encryption.&nbsp;
+(This will have digitalSignature, keyEncipherment, and nonRepudiation set
+for keyUsage.)</li>
+
+<li>
+"rsa-sign" - generate an RSA key for signing only. (This will have digitalSignature
+set for keyUsage.)</li>
+
+<li>
+"rsa-nonrepudiation" - generate a single RSA key for nonRepudiation only.
+(This will have non-repudiation set for keyUsage.)</li>
+
+<li>
+"rsa-sign-nonrepudiation" - generate a single RSA key use for both signing
+and nonRepudiation. (This will have both digitalSignature and nonRepudiation
+set for keyUsage.)</li>
+
+<li>
+"dsa-sign" - generate a single DSA key for signing only. (This will have
+digitalSignature set for keyUsage.)</li>
+
+<li>
+"dsa-nonrepudiation" - generate a single DSA key for nonRepudiation. (This
+will have nonRepudiation set for keyUsage.)</li>
+
+<li>
+"dsa-sign-nonrepudiation" - generate a single DSA key for signing and non-repudiation.
+(This will have digitalSignature and nonRepudiation set for keyUsage.)</li>
+</ul>
+</td>
+</tr>
+</table>
+
+<p>The <b>generateCRMFRequest()</b> method will cause the user to be presented
+with a key generation dialog. The dialog describes the key generation process
+and gives the user the opportunity to cancel the operation.
+<p>The method <b>generateCRMFRequest() </b>will return an instance of a
+CRMF object. The JavaScript passed in as the <i><tt>"CRMF Generation Done
+Code"</tt></i> parameter should look at the attribute <i>request </i>of
+the returned object to get the result of the CRMF generation.
+<p>The string found by accessing <i><tt>crmfObject.request</tt></i> is
+the base-64 encoded CRMF message to be sent to the CA/RA, or an error string.
+The possible error strings are:
+<br>&nbsp;
+<table BORDER WIDTH="100%" >
+<tr>
+<td ALIGN=CENTER><b>Error String</b></td>
+
+<td ALIGN=CENTER><b>Description</b></td>
+</tr>
+
+<tr>
+<td>"error:invalidParameter:XXX"</td>
+
+<td>The parameter XXX was an invalid value.</td>
+</tr>
+
+<tr>
+<td>"error:userCancel"</td>
+
+<td>the user has canceled the key generation operation</td>
+</tr>
+
+<tr>
+<td>"error:internalError"</td>
+
+<td>the software encountered some internal error, such as out of memory</td>
+</tr>
+</table>
+
+<h4>
+<font face="Arial,Helvetica">importUserCertificates()</font></h4>
+<tt><i>resultString</i> = crypto.importUserCertificates(<i>"nicknameString"</i>,
+<i>"certString"</i>,
+<i>allowBackup</i>)</tt>
+<br>&nbsp;
+<br>&nbsp;
+<table BORDER WIDTH="100%" >
+<tr>
+<td ALIGN=CENTER><b>Argument</b></td>
+
+<td ALIGN=CENTER><b>Description</b></td>
+</tr>
+
+<tr>
+<td VALIGN=TOP><i><tt>"nicknameString"</tt></i></td>
+
+<td>This is the nickname that will be used to describe the certificate
+in the client's certificate management UI.&nbsp; It should serve to uniquely
+identify the certificate to the user. For example, "John Smith's VeriSign
+Class 3 Digital ID" or "John Smith's Ford ID Certificate". However, if
+this certificate has the same DN as one or more certificates that already
+exist in the user's certificate store, the nickname associated with the
+certificate(s) of the same DN in the certificate store is used, and the
+<tt>"nicknameString"</tt> parameter is ignored. If the string is null and
+no certificate with the same DN exists in the user's certificate store,
+Personal Security Manager uses the following pattern to derive the nickname:
+<tt>&lt;Common Name>'s &lt;Issuer Name> ID</tt>.</td>
+</tr>
+
+<tr>
+<td VALIGN=TOP><i><tt>"certRepString"</tt></i></td>
+
+<td>This string is the CMMF Certification Response from the CA that contains
+the user's certificate(s). The response is base-64 encoded.</td>
+</tr>
+
+<tr>
+<td><i><tt>allowBackup</tt></i></td>
+
+<td>This is a Boolean argument. It allows the CA or RA to indicate to the
+client whether to force the user to back up a newly issued certificate
+(PKCS #12).</td>
+</tr>
+</table>
+
+<p>The <b>importUserCertificates()</b> method is used to import newly issued
+certificates for the user. The private key for the certificates must already
+reside in the user's personal private key database.
+<p>The request ID in the response being imported must match the request
+ID in the associated Certification Request or Recovery Request.
+<p>If the import operation succeeds, an empty string will be returned.&nbsp;
+If it fails, one of the following error strings will be returned:
+<br>&nbsp;
+<br>&nbsp;
+<table BORDER WIDTH="100%" >
+<tr>
+<td ALIGN=CENTER><b>Error String</b></td>
+
+<td ALIGN=CENTER><b>Description</b></td>
+</tr>
+
+<tr>
+<td>"error:userCancel"</td>
+
+<td>The user canceled the import operation</td>
+</tr>
+
+<tr>
+<td>"error:invalidCertificate"</td>
+
+<td>One of the certificate packages was incorrectly formatted</td>
+</tr>
+
+<tr>
+<td>"error:internalError"</td>
+
+<td>The software encountered some internal error, such as out of memory</td>
+</tr>
+
+<tr>
+<td>"error:invalidRequestID"</td>
+
+<td>The request ID in the response message does not match any outstanding
+request</td>
+</tr>
+</table>
+
+<h4>
+<font face="Arial,Helvetica">popChallengeResponse()</font></h4>
+<tt><i>resultString</i> = crypto.popChallengeResponse(<i>"challengeString"</i>);</tt>
+<br>&nbsp;
+<table BORDER WIDTH="100%" >
+<tr>
+<td ALIGN=CENTER VALIGN=TOP><b>Argument</b></td>
+
+<td ALIGN=CENTER><b>Description</b></td>
+</tr>
+
+<tr>
+<td VALIGN=TOP><i><tt>"challengeString"</tt></i></td>
+
+<td>A base-64 encoded CMMF POPODecKeyChallContent message. The current
+implementation does not conform to that defined in the CMMF draft, and
+we intend to change this implementation to that defined in the CMC RFC..
+See below for the current implementation.</td>
+</tr>
+</table>
+
+<p>The resultString will either be a base-64 encoded POPODecKeyRespContent
+message, or one of the following error strings:
+<br>&nbsp;
+<br>&nbsp;
+<table BORDER WIDTH="100%" >
+<tr>
+<td ALIGN=CENTER><b>Error String</b></td>
+
+<td ALIGN=CENTER><b>Description</b></td>
+</tr>
+
+<tr>
+<td>"error:invalidParameter:XXX"</td>
+
+<td>The parameter XXX was an invalid value.</td>
+</tr>
+
+<tr>
+<td>"error:internalError"</td>
+
+<td>the software encountered some internal error, such as out of memory</td>
+</tr>
+</table>
+
+<p><b>Challenge-Response Proof Of Possession</b>
+<p><tt>Expected Input:</tt>
+<p><tt>POPODecKeyChallContent ::= SEQUENCE OF Challenge</tt>
+<br><tt>&nbsp;&nbsp;&nbsp; -- One Challenge per encryption key certification
+request (in the</tt>
+<br><tt>&nbsp;&nbsp;&nbsp; -- same order as these requests appear in FullCertTemplates).</tt>
+<p><tt>Challenge ::= SEQUENCE {</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; owf&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+AlgorithmIdentifier&nbsp; OPTIONAL,</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -- MUST be present in the first
+Challenge; MAY be omitted in any</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -- subsequent Challenge in POPODecKeyChallContent
+(if omitted,</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -- then the owf used in the immediately
+preceding Challenge is</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -- to be used).</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; witness&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+OCTET STRING,</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -- the result of applying the one-way
+function (owf) to a</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -- randomly-generated INTEGER, A.&nbsp;
+[Note that a different</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -- INTEGER MUST be used for each
+Challenge.]</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; sender&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+GeneralName,</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -- the name of the sender.</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; key&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+OCTET STRING,</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -- the public key used to encrypt
+the challenge.&nbsp; This will allow</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -- the client to find the appropriate
+key to do the decryption.</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; challenge&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+OCTET STRING</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -- the encryption (under the public
+key for which the cert.</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -- request is being made) of Rand,
+where Rand is specified as</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; --&nbsp;&nbsp; Rand ::= SEQUENCE
+{</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; --&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+int&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; INTEGER,</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; --&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+- the randomly-generated INTEGER A (above)</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; --&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+senderHash&nbsp; OCTET STRING</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; --&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+- the result of applying the one-way function (owf) to</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; --&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+- the sender's general name</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; --&nbsp;&nbsp; }</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -- the size of "int" must be small
+enough such that "Rand" can be</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -- contained within a single PKCS
+#1 encryption block.</tt>
+<br><tt>&nbsp; }</tt>
+<p>&copy; Copyright 1999 Netscape Communications Corporation
+</body>
+</html>

mozilla/security/psm/doc/contents.htm

@@ -0,0 +1,171 @@
+<html><head>
+<title></title>
+
+</HEAD>
+
+
+<FONT FACE="arial, helvetica, sans-serif"  size="-1">
+<a name="TOP">
+<IMG SRC="cartbanner.gif" WIDTH="432" HEIGHT="36" HSPACE="0" VSPACE="0">
+<table bgcolor="#cccccc" width="100%">
+<tr><td><IMG SRC="w.gif" WIDTH=1 HEIGHT=3 BORDER=0></td></tr>
+</table>
+<BR><BR>
+
+
+
+<TABLE CELLPADDING=5 CELLSPACING=2 border=0>
+<TR>
+
+<TD> <a href="help.htm">Next<IMG SRC="next.gif" WIDTH=16 
+
+HEIGHT=14 ALIGN="texttop" BORDER=0></a></FONT></TD>   
+<TD BGCOLOR="#FFFFFF"><a href="contents.htm">Topics</a></FONT></TD>
+
+
+</TR>
+</TABLE>
+</TD></TR> 
+</TABLE>
+
+<BR> <BR>
+
+</a>
+</DIV>
+
+</P>
+<h1>Contents</h1>
+
+<B><a href="help.htm#1024926"> 	
+</B> </A> <p>
+<p><b>
+<a href="help.htm#1057187">
+ Introduction to Personal Security Manager 	
+</a></b><br><DD>
+
+<a href="help.htm#1044573">
+ About Personal Security Manager Help 	
+</a><br><DD>
+
+<a href="help.htm#1043598">
+ What You Can Do with Personal Security Manager 	
+</a><br><DD>
+
+<a href="help.htm#1026014">
+ Understanding Network Security 	
+</a><br>
+<p><b>
+<a href="help.htm#1045279">
+ Information Tab 	
+</a></b><br><DD>
+
+<a href="help.htm#1041627">
+ Information About Web Pages 	
+</a><br><DD>
+
+<a href="help.htm#1046060">
+ Information About Stored Email Messages 	
+</a><br><DD>
+
+<a href="help.htm#1046671">
+ Information About Email Messages You Are Composing 	
+</a><br>
+<p><b>
+<a href="help.htm#1030083">
+ Applications Tab 	
+</a></b><br><DD>
+
+<a href="help.htm#1030967">
+ Navigator 	
+</a><br><DD>
+
+<a href="help.htm#1031452">
+ Messenger 	
+</a><br><DD>
+
+<a href="help.htm#1031152">
+ Java/JavaScript 	
+</a><br>
+<p><b>
+<a href="help.htm#1030743">
+ Certificates Tab 	
+</a></b><br><DD>
+
+<a href="help.htm#1047547">
+ Certificates&#151;Mine 	
+</a><br><DD>
+
+<a href="help.htm#1031428">
+ Certificates&#151;Others 	
+</a><br><DD>
+
+<a href="help.htm#1031432">
+ Certificates&#151;Web Sites 	
+</a><br><DD>
+
+<a href="help.htm#1031434">
+ Certificates&#151;Authorities 	
+</a><br>
+<p><b>
+<a href="help.htm#1036138">
+ Advanced Tab 	
+</a></b><br><DD>
+
+<a href="help.htm#1036162">
+ Modules 	
+</a><br><DD>
+
+<a href="help.htm#1036164">
+ Options 	
+</a><br>
+<p><b>
+<a href="help.htm#1056728">
+ Other Personal Security Manager Windows 	
+</a></b><br><DD>
+
+<a href="help.htm#1055385">
+ Certificate Information 	
+</a><br><DD>
+
+<a href="help.htm#1035650">
+ Choose Security Device 	
+</a><br><DD>
+
+<a href="help.htm#1041171">
+ Enrollment Information 	
+</a><br><DD>
+
+<a href="help.htm#1055232">
+ Certificate Renewal 	
+</a><br><DD>
+
+<a href="help.htm#1041200">
+ Choosing a Certificate 	
+</a><br><DD>
+
+<a href="help.htm#1036401">
+ New Certificate Authority 	
+</a><br><DD>
+
+<a href="help.htm#1041248">
+ Web Site Certificates 	
+</a><br><DD>
+
+<a href="help.htm#1036488">
+ Request for Signature 	
+</a><br><FONT FACE="sans-Serif" SIZE=+1>&nbsp;<BR>
+<a href="glossary.htm#996904">
+Glossary 	
+</a>
+</A> </FONT>
+
+<BR><BR><BR>
+
+&copy; Copyright 2000 Netscape Communications Corporation
+</FONT> </CENTER>
+
+<BR>
+
+</BODY>
+
+</HTML>

mozilla/security/psm/doc/glossary.htm

@@ -0,0 +1,417 @@
+<html><head>
+<title></title>
+
+<script languag=javascript> 
+
+  <!-- 
+  if (typeof(crypto.disableRightClick) == "function") { 
+      crypto.disableRightClick(); 
+  } 
+  // --> 
+
+</script>
+</HEAD>
+
+<FONT FACE="arial, helvetica, sans-serif" size="-1">
+<a name="TOP">
+
+<IMG SRC="cartbanner.gif" WIDTH="432" HEIGHT="36" HSPACE="0" VSPACE="0">
+<table bgcolor="#cccccc" width="100%">
+<tr><td><IMG SRC="w.gif" WIDTH=1 HEIGHT=3 BORDER=0></td></tr>
+</table>
+
+<BR><BR>
+<TABLE CELLPADDING=5 CELLSPACING=2 border=0>
+<TR><TD BGCOLOR="#FFFFFF"><a href="help.htm"><IMG SRC="prev.gif" WIDTH=16 
+
+HEIGHT=14 ALIGN="texttop" BORDER=0>Previous</a>
+  </TD>
+
+ 
+<TD BGCOLOR="#FFFFFF"><a href="contents.htm">Topics</a></TD>
+
+
+</TR>
+</TABLE>
+
+<BR> <BR>
+
+</a>
+</DIV>
+
+</P>
+<h1><A NAME="
+"></A><A NAME="996904">
+Glossary 
+</A></h1><dl>
+<A NAME="authentication"></A><A NAME="998782">
+<B>authentication.</B>&nbsp;
+</A><A NAME="1013907">
+Assurance that a party to a computerized transaction is not an impostor. Authentication typically involves the use of a password, certificate, personal identification number (PIN), or other information that can be used to validate identity over a computer network. See also <a href="glossary.htm#1014123">password-based authentication</a>, <a href="glossary.htm#1018581">certificate-based authentication</a>, <a href="glossary.htm#1021054">client authentication</a>, <a href="glossary.htm#1031070">server authentication</a>.<P>
+</A>
+<A NAME="CA"></A><A NAME="1021395">
+<B>CA.</B>&nbsp;
+</A><A NAME="1021418">
+See <a href="glossary.htm#1020903"></a><a href="glossary.htm#1020903">certificate authority (CA)</a>.<P>
+</A>
+<A NAME="CA certificate"></A><A NAME="1017503">
+<B>CA certificate.</B>&nbsp;
+</A><A NAME="1017507">
+A certificate that identifies a certificate authority. See also <a href="glossary.htm#1020903">certificate authority (CA)</a>, <a href="glossary.htm#999541">subordinate CA</a>, <a href="glossary.htm#1015631">root CA</a>.<P>
+</A>
+<A NAME="certificate"></A><A NAME="1018895">
+<B>certificate.</B>&nbsp;
+</A><A NAME="1018896">
+The digital equivalent of an ID card. A certificate specifies the name of an individual, company, or other entity and certifies that a public key, which is included in the certificate, belongs to that entity. When you digitally sign a message or other data, the digital signature for that message is created with the aid of the private key that corresponds to the public key in your certificate. A certificate is issued and digitally signed by a <a href="glossary.htm#1020903">certificate authority (CA)</a>. A certificate's validity can be verified by checking the CA's <a href="glossary.htm#1013995">digital signature</a>. Also called digital ID, digital passport, public-key certificate X.509 certificate, and security certificate. See also <a href="glossary.htm#1019178">public-key cryptography</a>.<P>
+</A>
+<A NAME="certificate authority (CA)"></A><A NAME="1020903">
+<B>certificate authority (CA).</B>&nbsp;
+</A><A NAME="1020904">
+A service that issues a certificate after verifying the identity of the person or entity the certificate is intended to identify. A CA also renews and revokes certificates and generates a list of revoked certificates at regular intervals. CAs can be independent vendors (such as the CAs listed at <a href= "https://certs.netscape.com/client.html" TARGET="_blank">Certificate Authority Services</a>) or a person or organization using certificate-issuing server software (such as Netscape Certificate Management System). See also <a href="glossary.htm#1018895">certificate</a>, <a href="glossary.htm#1019940">certificate revocation list (CRL)</a>.<P>
+</A>
+<A NAME="certificate-based authentication"></A><A NAME="1018581">
+<B>certificate-based authentication.</B>&nbsp;
+</A><A NAME="1018582">
+Verification of identity based on certificates and public-key cryptography. See also <a href="glossary.htm#1014123">password-based authentication</a>.<P>
+</A>
+<A NAME="certificate chain"></A><A NAME="1018500">
+<B>certificate chain.</B>&nbsp;
+</A><A NAME="1019929">
+A hierarchical series of certificates signed by successive certificate authorities. A CA certificate identifies a <a href="glossary.htm#1020903">certificate authority (CA)</a> and is used to sign certificates issued by that authority. A CA certificate can in turn be signed by the CA certificate of a parent CA and so on up to a <a href="glossary.htm#1015631">root CA</a>. <P>
+</A>
+<A NAME="certificate fingerprint"></A><A NAME="1020297">
+<B>certificate fingerprint.</B>&nbsp;
+</A><A NAME="1020326">
+A unique number associated with a certificate. The number is not part of the certificate itself but is produced by applying a mathematical function to the contents of the certificate. If the contents of the certificate change, even by a single character, the function produces a different number. Certificate fingerprints can therefore be used to verify that certificates have not been tampered with.<P>
+</A>
+<A NAME="certificate renewal"></A><A NAME="1031319">
+<B>certificate renewal.</B>&nbsp;
+</A><A NAME="1031323">
+The process of renewing a <a href="glossary.htm#1018895">certificate</a> that is about to expire.<P>
+</A>
+<A NAME="certificate revocation list (CRL)"></A><A NAME="1019940">
+<B>certificate revocation list (CRL).</B>&nbsp;
+</A><A NAME="1021047">
+A list of revoked certificates that is generated and signed by a <a href="glossary.htm#1020903">certificate authority (CA)</a>. You can download the latest CRL to your browser or to a server, then check against it to make sure that certificates are still valid before permitting their use for authentication. <P>
+</A>
+<A NAME="certificate store"></A><A NAME="1023462">
+<B>certificate store.</B>&nbsp;
+</A><A NAME="1032978">
+The collection of certificates, or electronic IDs, maintained by Personal Security Manager on your behalf. These include your own certificates stored on one or more security devices, other people's certificates, web site certificates, and <a href="glossary.htm#1020903"></a>CA certificates. See also <a href="glossary.htm#1020903">certificate authority (CA)</a>, <a href="glossary.htm#1018895">certificate</a>, <a href="glossary.htm#1028962">security device</a>.<P>
+</A>
+<A NAME="certificate verification"></A><A NAME="1025527">
+<B>certificate verification.</B>&nbsp;
+</A><A NAME="1025531">
+When Personal Security Manager verifies a certificate, it confirms that the digital signature was created by a CA whose own CA certificate is both present in the certificate store and marked as trusted for issuing that kind of certificate. It also confirms that the certificate being verified has not been marked as untrusted in the certificate store. Finally, if the <a href="glossary.htm#1029304">Online Certificate Status Protocol (OCSP)</a> has been activated (from the Options panel under the Advanced tab), Personal Security Manager also performs an on-line check. It does so by looking up the certificate in a list of valid certificates maintained at a URL that is specified either in the certificate itself or in the OCSP Settings window. If any of these checks fail, Personal Security Manager marks the certificate as unverified and won't recognize the identity it certifies.<P>
+</A>
+<A NAME="cipher"></A><A NAME="1021048">
+<B>cipher.</B>&nbsp;
+</A><A NAME="1021052">
+See <a href="glossary.htm#1019976">cryptographic algorithm</a>.<P>
+</A>
+<A NAME="client"></A><A NAME="1029510">
+<B>client.</B>&nbsp;
+</A><A NAME="1029547">
+Software (such as browser software) that sends requests to and receives information from a <a href="glossary.htm#1029749">server</a>, which is usually running on a different computer. A computer on which client software runs is also described as a client.<P>
+</A>
+<A NAME="client authentication"></A><A NAME="1021054">
+<B>client authentication.</B>&nbsp;
+</A><A NAME="1014557">
+The process of identifying a <a href="glossary.htm#1029510">client</a> to a <a href="glossary.htm#1029749">server</a>, for example with a name and password or with a <a href="glossary.htm#1014561">client SSL certificate</a> and some digitally signed data. See also <a href="glossary.htm#999463">Secure Sockets Layer (SSL)</a>, <a href="glossary.htm#1031070">server authentication</a>.<P>
+</A>
+<A NAME="client SSL certificate"></A><A NAME="1014561">
+<B>client SSL certificate.</B>&nbsp;
+</A><A NAME="1014562">
+A certificate that a <a href="glossary.htm#1029510">client</a> (for example, browser software such as Netscape Communicator) presents to a <a href="glossary.htm#1029749">server</a> to authenticate the identity of the client (or the identity of the person using the client) using the <a href="glossary.htm#999463">Secure Sockets Layer (SSL)</a> protocol. See also <a href="glossary.htm#1021054">client authentication</a>.<P>
+</A>
+<A NAME="cryptographic algorithm"></A><A NAME="1019976">
+<B>cryptographic algorithm.</B>&nbsp;
+</A><A NAME="1019985">
+A set of rules or directions used to perform cryptographic operations such as <a href="glossary.htm#999078">encryption</a> and <a href="glossary.htm#998999">decryption</a>. Sometimes called a <I>cipher.</I><P>
+</A>
+<A NAME="cryptography"></A><A NAME="1026002">
+<B>cryptography.</B>&nbsp;
+</A><A NAME="1026018">
+The art and practice of scrambling (encrypting) and unscrambling (decrypting) information. For example, cryptographic techniques are used to scramble an unscramble information flowing between commercial web sites and your browser. See also <a href="glossary.htm#1019178">public-key cryptography</a>.<P>
+</A>
+<A NAME="decryption"></A><A NAME="998999">
+<B>decryption.</B>&nbsp;
+</A><A NAME="999005">
+The process of unscrambling data that has been encrypted. See also <a href="glossary.htm#999078">encryption</a>.<P>
+</A>
+<A NAME="digital ID"></A><A NAME="999011">
+<B>digital ID.</B>&nbsp;
+</A><A NAME="999017">
+See <a href="glossary.htm#1018895">certificate</a>.<P>
+</A>
+<A NAME="digital signature"></A><A NAME="1013995">
+<B>digital signature.</B>&nbsp;
+</A><A NAME="1013996">
+A code created from both the data to be signed and the private key of the signer. This code is unique for each new piece of data. Even a single comma added to a message changes the digital signature for that message. Successful validation of your digital signature by appropriate software not only provides evidence that you approved the transaction or message, but also provides evidence that the data has not changed since you digitally signed it. A digital signature has nothing to do with a handwritten signature, although it can sometimes be used for similar legal purposes. See also <a href="glossary.htm#999248">nonrepudiation</a>, <a href="glossary.htm#999618">tamper detection</a>.<P>
+</A>
+<A NAME="distinguished name (DN)"></A><A NAME="1022191">
+<B>distinguished name (DN).</B>&nbsp;
+</A><A NAME="1022194">
+A specially formatted name that uniquely identifies the subject of a certificate.<P>
+</A>
+<A NAME="dual key pairs"></A><A NAME="1020489">
+<B>dual key pairs.</B>&nbsp;
+</A><A NAME="1020619">
+Two public-private key pairs--four keys altogether--corresponding to two separate certificates. The private key of one pair is used for signing operations, and the public and private keys of the other pair are used for encryption and decryption operations. Each pair corresponds to a separate <a href="glossary.htm#1018895">certificate</a>. See also <a href="glossary.htm#1019178">public-key cryptography</a>.<P>
+</A>
+<A NAME="eavesdropping"></A><A NAME="1020620">
+<B>eavesdropping.</B>&nbsp;
+</A><A NAME="1013975">
+Surreptitious interception of information sent over a network by an entity for which the information is not intended.<P>
+</A>
+<A NAME="encryption"></A><A NAME="999078">
+<B>encryption.</B>&nbsp;
+</A><A NAME="1024038">
+The process of scrambling information in a way that disguises its meaning. For example, encrypted connections between computers make it very difficult for third-parties to unscramble, or <I>decrypt,</I> information flowing over the connection. Encrypted information can be decrypted only by someone who possesses the appropriate key. See also <a href="glossary.htm#1019178">public-key cryptography</a>.<P>
+</A>
+<A NAME="encryption certificate"></A><A NAME="1024953">
+<B>encryption certificate.</B>&nbsp;
+</A><A NAME="1024978">
+A certificate whose public key corresponds to a private key used for encryption only. Encryption certificates are not used for signing operations. See also <a href="glossary.htm#1020489">dual key pairs</a>, <a href="glossary.htm#999493">signing certificate</a>.<P>
+</A>
+<A NAME="encryption key"></A><A NAME="1021254">
+<B>encryption key.</B>&nbsp;
+</A><A NAME="1021255">
+A private key used for encryption only. An encryption key and its equivalent public key, plus a <a href="glossary.htm#1021282">signing key</a> and its equivalent public key, constitute a <a href="glossary.htm#1020489">dual key pairs</a>.<P>
+</A>
+<A NAME="fingerprint"></A><A NAME="1020434">
+<B>fingerprint.</B>&nbsp;
+</A><A NAME="1020450">
+See <a href="glossary.htm#1020297">certificate fingerprint</a>.<P>
+</A>
+<A NAME="FIPS PUBS 140-1"></A><A NAME="1025742">
+<B>FIPS PUBS 140-1.</B>&nbsp;
+</A><A NAME="1025743">
+Federal Information Processing Standards Publications (FIPS PUBS) 140-1 is a US government standard for implementations of cryptographic modules--that is, hardware or software that encrypts and decrypts data or performs other cryptographic operations (such as creating or verifying digital signatures). Many products sold to the US government must comply with one or more of the FIPS standards.<P>
+</A>
+<A NAME="key"></A><A NAME="999203">
+<B>key.</B>&nbsp;
+</A><A NAME="999212">
+A large number used by a <a href="glossary.htm#1019976">cryptographic algorithm</a> to encrypt or decrypt data. A person's public key, for example, allows other people to encrypt messages to that person. The encrypted messages must be decrypted with the corresponding private key. See also <a href="glossary.htm#1019178">public-key cryptography</a>.<P>
+</A>
+<A NAME="Lightweight Directory Access Protocol (LDAP)"></A><A NAME="1022286">
+<B>Lightweight Directory Access Protocol (LDAP).</B>&nbsp;
+</A><A NAME="1022287">
+A protocol for accessing directory services across multiple platforms. LDAP is a simplified version of Directory Access Protocol (DAP), used to access X.500 directories. <P>
+</A>
+<A NAME="master key"></A><A NAME="1032598">
+<B>master key.</B>&nbsp;
+</A><A NAME="1032639">
+A symmetric key used by Personal Security Manager to encrypt information on behalf of other applications. For example, Netscape 6 uses Personal Security Manager and your master key to encrypt email passwords, web site passwords, and other stored sensitive information. See also <a href="glossary.htm#999604">symmetric encryption</a>.<P>
+</A>
+<A NAME="misrepresentation"></A><A NAME="1014057">
+<B>misrepresentation.</B>&nbsp;
+</A><A NAME="1014058">
+Presentation of an entity as a person or organization that it is not. For example, a web site might pretend to be a furniture store when it is really just a site that takes credit card payments but never sends any goods. See also <a href="glossary.htm#1014366">spoofing</a>.<P>
+</A>
+<A NAME="Netscape Certificate Management System"></A><A NAME="1018306">
+<B>Netscape Certificate Management System.</B>&nbsp;
+</A><A NAME="1018308">
+A highly configurable set of software components and tools for creating, deploying, and managing certificates. You enroll with the system to obtain certificates of all kinds; the system maintains information about the certificates it issues.<P>
+</A>
+<A NAME="nonrepudiation"></A><A NAME="999248">
+<B>nonrepudiation.</B>&nbsp;
+</A><A NAME="999254">
+The inability, of the sender of a message, to deny having sent the message. A regular hand-written signature provides one form of nonrepudiation. A <a href="glossary.htm#1013995">digital signature</a> provides another.<P>
+</A>
+<A NAME="object signing"></A><A NAME="1014095">
+<B>object signing.</B>&nbsp;
+</A><A NAME="1014096">
+A technology that allows software developers to sign Java code, JavaScript scripts, or any kind of file, and that allows users to identify the signers and control access by signed code to local system resources.<P>
+</A>
+<A NAME="object-signing certificate"></A><A NAME="1014097">
+<B>object-signing certificate.</B>&nbsp;
+</A><A NAME="1014098">
+A certificate whose corresponding private key is used to sign objects such as code files. See also <a href="glossary.htm#1014095">object signing</a>.<P>
+</A>
+<A NAME="Online Certificate Status Protocol (OCSP)"></A><A NAME="1029304">
+<B>Online Certificate Status Protocol (OCSP).</B>&nbsp;
+</A><A NAME="1029312">
+A set of rules that Personal Security Manager follows to perform an online check of an email certificate's validity each time the certificate is used. This process involves checking the certificate against a list of valid certificates maintained at a specified web site. Your computer must be online for OCSP to work.<P>
+</A>
+<A NAME="password-based authentication"></A><A NAME="1014123">
+<B>password-based authentication.</B>&nbsp;
+</A><A NAME="1014124">
+Confident identification by means of a name and password. See also <a href="glossary.htm#998782">authentication</a>.<P>
+</A>
+<A NAME="Personal Security Password"></A><A NAME="1032744">
+<B>Personal Security Password.</B>&nbsp;
+</A><A NAME="1032748">
+A password used by Personal Security Manager to protect the master key and/or private keys stored on a <a href="glossary.htm#1028962">security device</a>. Personal Security Manager needs to access your private keys, for example, when you sign email messages or use one of your own certificates to identify yourself to a web site. It needs to access your master key when it encrypts or decrypts information on behalf of another application&#151;for example, when Netscape 6 needs to store or access your email password. You can set or change your personal security password from the Certificates tab in Personal Security Manager. Each security device requires a separate Personal Security Password. See also <a href="glossary.htm#1015387">private key</a>, <a href="glossary.htm#1032598">master key</a>.<P>
+</A>
+<A NAME="PKCS #11"></A><A NAME="1025194">
+<B>PKCS #11.</B>&nbsp;
+</A><A NAME="1025195">
+The public-key cryptography standard that governs security devices such as smart cards. See also <a href="glossary.htm#1028962">security device</a>, <a href="glossary.htm#1027625">smart card</a>.<P>
+</A>
+<A NAME="PKCS #11 module"></A><A NAME="1025197">
+<B>PKCS #11 module.</B>&nbsp;
+</A><A NAME="1025271">
+A program on your computer that manages cryptographic services such as encryption and decryption using the PKCS #11 standard. PKCS #11 modules (also called <I>cryptographic modules</I>, <I>cryptographic service providers,</I> or <I>security modules</I>) can be thought of as drivers for cryptographic devices that can be implemented in either hardware or software. A PKCS #11 module always controls one or more slots<B>,</B> which may be implemented as physical hardware slots in some form of physical reader (for example, for smart cards) or as conceptual slots in software. Each slot for a PKCS #11 module can in turn contain a <a href="glossary.htm#1028962">security device</a> (also called <I>token</I>)<B>,</B> which is the hardware or software device that actually provides cryptographic services and optionally stores certificates and keys. Personal Security Manager provides a built-in PKCS #11 module. You may install additional modules on your computer to control smart card readers or other hardware devices.<P>
+</A>
+<A NAME="portable security password"></A><A NAME="1024655">
+<B>portable security password.</B>&nbsp;
+</A><A NAME="1024670">
+A password that protects a certificate that you are backing up or have previously backed up. Personal Security Manager asks you to set this password when you back up a certificate, and requests it when you attempt to restore a certificate that has previously been backed up. <P>
+</A>
+<A NAME="private key"></A><A NAME="1015387">
+<B>private key.</B>&nbsp;
+</A><A NAME="1015391">
+One of a pair of keys used in public-key cryptography. The private key is kept secret and is used to decrypt data that has been encrypted with the corresponding public key.<P>
+</A>
+<A NAME="PSM Private Keys security device"></A><A NAME="1032045">
+<B>PSM Private Keys security device.</B>&nbsp;
+</A><A NAME="1032110">
+The default <a href="glossary.htm#1028962">security device</a> used by Personal Security Manager to store private keys associated with your certificates. In addition to private keys, the PSM Private Keys security device stores the master key used by Netscape 6 to encrypt email passwords, web site passwords, and other sensitive information. See also <a href="glossary.htm#1015387">private key</a>, <a href="glossary.htm#1032598">master key</a>.<P>
+</A>
+<A NAME="public key"></A><A NAME="1019172">
+<B>public key.</B>&nbsp;
+</A><A NAME="1019173">
+One of a pair of keys used in public-key cryptography. The public key is distributed freely and published as part of a <a href="glossary.htm#1018895">certificate</a>. It is typically used to encrypt data sent to the public key's owner, who then decrypts the data with the corresponding private key.<P>
+</A>
+<A NAME="public-key cryptography"></A><A NAME="1019178">
+<B>public-key cryptography.</B>&nbsp;
+</A><A NAME="1023765">
+A set of well-established techniques and standards that allow an entity (such as a person, an organization, or hardware such as a router) to verify its identity electronically or to sign and encrypt electronic data. Two keys are involved: a <a href="glossary.htm#1019172">public key</a> and a <a href="glossary.htm#1015387">private key</a>. The public key is published as part of a <a href="glossary.htm#1018895">certificate</a>, which associates that key with a particular identity. The corresponding private key is kept secret. Data encrypted with the public key can be decrypted only with the private key. <P>
+</A>
+<A NAME="public-key infrastructure (PKI)"></A><A NAME="999412">
+<B>public-key infrastructure (PKI).</B>&nbsp;
+</A><A NAME="1014263">
+The standards and services that facilitate the use of public-key cryptography and certificates in a networked environment.<P>
+</A>
+<A NAME="root CA"></A><A NAME="1015631">
+<B>root CA.</B>&nbsp;
+</A><A NAME="1015635">
+The <a href="glossary.htm#1020903">certificate authority (CA)</a> with a self-signed certificate at the top of a <a href="glossary.htm#1018500">certificate chain</a>. See also <a href="glossary.htm#999541">subordinate CA</a>.<P>
+</A>
+<A NAME="Secure Sockets Layer (SSL)"></A><A NAME="999463">
+<B>Secure Sockets Layer (SSL).</B>&nbsp;
+</A><A NAME="999472">
+A protocol that allows mutual authentication between a <a href="glossary.htm#1029510">client</a> and a <a href="glossary.htm#1029749">server</a> for the purpose of establishing an authenticated and encrypted connection. SSL runs above TCP/IP and below HTTP, LDAP, IMAP, NNTP, and other high-level network protocols. The new Internet Engineering Task Force (IETF) standard called Transport Layer Security (TLS) is based on SSL. See also <a href="glossary.htm#998782">authentication</a>, <a href="glossary.htm#999078">encryption</a>.<P>
+</A>
+<A NAME="security certificate"></A><A NAME="1028900">
+<B>security certificate.</B>&nbsp;
+</A><A NAME="1028904">
+See <a href="glossary.htm#1018895">certificate</a>.<P>
+</A>
+<A NAME="security device"></A><A NAME="1028962">
+<B>security device.</B>&nbsp;
+</A><A NAME="1028963">
+A hardware or software device that provides cryptographic services such as encryption and decryption and can store certificates and keys. A smart card is one example of a hardware security device. Personal Security Manager contains its own internal security device, called the <a href="glossary.htm#1032045">PSM Private Keys security device</a>, that is implemented in software. Each security device is protected by its own <a href="glossary.htm#1032744">Personal Security Password</a>.<P>
+</A>
+<A NAME="security module"></A><A NAME="1029083">
+<B>security module.</B>&nbsp;
+</A><A NAME="1029097">
+See <a href="glossary.htm#1025197">PKCS #11 module</a>.<P>
+</A>
+<A NAME="security token"></A><A NAME="1028905">
+<B>security token.</B>&nbsp;
+</A><A NAME="1028909">
+See <a href="glossary.htm#1028962">security device</a>.<P>
+</A>
+<A NAME="server"></A><A NAME="1029749">
+<B>server.</B>&nbsp;
+</A><A NAME="1029869">
+Software (such as software that serves up web pages) that receives requests from and sends information to a <a href="glossary.htm#1029510">client</a>, which is usually running on a different computer. A computer on which server software runs is also described as a server.<P>
+</A>
+<A NAME="server authentication"></A><A NAME="1031070">
+<B>server authentication.</B>&nbsp;
+</A><A NAME="1031080">
+The process of identifying a <a href="glossary.htm#1029749">server</a> to a <a href="glossary.htm#1029510">client</a> by using a <a href="glossary.htm#1029874">server SSL certificate</a>. See also <a href="glossary.htm#1021054">client authentication</a>, <a href="glossary.htm#999463">Secure Sockets Layer (SSL)</a>.<P>
+</A>
+<A NAME="server SSL certificate"></A><A NAME="1029874">
+<B>server SSL certificate.</B>&nbsp;
+</A><A NAME="999500">
+A certificate that a <a href="glossary.htm#1029749">server</a> presents to a <a href="glossary.htm#1029510">client</a> to authenticate the server's identity using the <a href="glossary.htm#999463">Secure Sockets Layer (SSL)</a> protocol.<P>
+</A>
+<A NAME="signing certificate"></A><A NAME="999493">
+<B>signing certificate.</B>&nbsp;
+</A><A NAME="999507">
+A certificate whose corresponding <a href="glossary.htm#1015387">private key</a> is used to sign transmitted data, so that the receiver can verify the identity of the sender. Certificate authorities (CAs) often issue a signing certificate that will be used to sign email messages at the same time as an <a href="glossary.htm#1024953">encryption certificate</a> that will be used to encrypt email messages. See also <a href="glossary.htm#1020489">dual key pairs</a>, <a href="glossary.htm#1013995">digital signature</a>.<P>
+</A>
+<A NAME="signing key"></A><A NAME="1021282">
+<B>signing key.</B>&nbsp;
+</A><A NAME="1021283">
+A private key used for signing only. A signing key and its equivalent public key, together with an <a href="glossary.htm#1021254">encryption key</a> and its equivalent public key, constitute <a href="glossary.htm#1020489">dual key pairs</a>.<P>
+</A>
+<A NAME="slot"></A><A NAME="1025218">
+<B>slot.</B>&nbsp;
+</A><A NAME="1025222">
+A piece of hardware, or its equivalent in software, that is controlled by a <a href="glossary.htm#1025197">PKCS #11 module</a> and designed to contain a <a href="glossary.htm#1028962">security device</a>. <P>
+</A>
+<A NAME="smart card"></A><A NAME="1027625">
+<B>smart card.</B>&nbsp;
+</A><A NAME="1027626">
+A small device, typically about the size of a credit card, that contains a microprocessor and is capable of storing cryptographic information (such as keys and certificates) and performing cryptographic operations. Smart cards use the <a href="glossary.htm#1025194">PKCS #11</a> standard. A smart card is one kind of <a href="glossary.htm#1028962">security device</a>. <P>
+</A>
+<A NAME="spoofing"></A><A NAME="1014366">
+<B>spoofing.</B>&nbsp;
+</A><A NAME="1014367">
+Pretending to be someone else. For example, a person can pretend to have the email address <FONT FACE="courier, courier new, monospace">jdoe@mozilla.com</FONT>, or a computer can identify itself as a site called <FONT FACE="courier, courier new, monospace">www.mozilla.com</FONT> when it is not. Spoofing is one form of <a href="glossary.htm#1014057">misrepresentation</a>.<P>
+</A>
+<A NAME="SSL"></A><A NAME="999533">
+<B>SSL.</B>&nbsp;
+</A><A NAME="999539">
+See <a href="glossary.htm#999463">Secure Sockets Layer (SSL)</a>. <P>
+</A>
+<A NAME="subject"></A><A NAME="1013880">
+<B>subject.</B>&nbsp;
+</A><A NAME="1013881">
+The entity (such as a person, organization, or router) identified by a <a href="glossary.htm#1018895">certificate</a>. In particular, the subject field of a certificate contains the certified entity's <a href="glossary.htm#1021328">subject name</a> and other characteristics.<P>
+</A>
+<A NAME="subject name"></A><A NAME="1021328">
+<B>subject name.</B>&nbsp;
+</A><A NAME="1021338">
+A <a href="glossary.htm#1022191">distinguished name (DN)</a> that uniquely describes the <a href="glossary.htm#1013880">subject</a> of a <a href="glossary.htm#1018895">certificate</a>.<P>
+</A>
+<A NAME="subordinate CA"></A><A NAME="999541">
+<B>subordinate CA.</B>&nbsp;
+</A><A NAME="999591">
+A <a href="glossary.htm#1020903">certificate authority (CA)</a> whose certificate is signed by another subordinate CA or by the root CA. See also <a href="glossary.htm#1018500">certificate chain</a>, <a href="glossary.htm#1015631">root CA</a>.<P>
+</A>
+<A NAME="symmetric encryption"></A><A NAME="999604">
+<B>symmetric encryption.</B>&nbsp;
+</A><A NAME="999625">
+An encryption method that uses a single cryptographic key to both encrypt and decrypt a given message.<P>
+</A>
+<A NAME="tamper detection"></A><A NAME="999618">
+<B>tamper detection.</B>&nbsp;
+</A><A NAME="999631">
+A mechanism ensuring that data received in electronic form has not been tampered with; that is, that the data received corresponds entirely with the original version of the same data.<P>
+</A>
+<A NAME="TLS"></A><A NAME="1027427">
+<B>TLS.</B>&nbsp;
+</A><A NAME="1027428">
+See <a href="glossary.htm#999463">Secure Sockets Layer (SSL)</a>.<P>
+</A>
+<A NAME="token"></A><A NAME="1024528">
+<B>token.</B>&nbsp;
+</A><A NAME="1024586">
+See <a href="glossary.htm#1028962">security device</a>.<P>
+</A>
+<A NAME="trust"></A><A NAME="1019748">
+<B>trust.</B>&nbsp;
+</A><A NAME="1020186">
+Confident reliance on a person or other entity. In the context of <a href="glossary.htm#999412">public-key infrastructure (PKI)</a>, trust usually refers to the relationship between the user of a certificate and the <a href="glossary.htm#1020903">certificate authority (CA)</a> that issued the certificate. If you use Personal Security Manager to specify that you trust a CA, Personal Security Manager trusts valid certificates issued by that CA unless you specify otherwise in the settings for individual certificates. You use the Authorities panel of the Certificates tab in Personal Security Manager to specify the kinds of certificates you trust or don't trust different CAs to issue. <P>
+</A>
+<A NAME="1028719">
+<B></B><a href="glossary.htm#1028962"></a><P>
+</A>
+</dl>
+
+
+<BR>
+
+&copy; Copyright 2000 Netscape Communications Corporation
+</FONT> </CENTER>
+
+<BR>
+
+</BODY>
+
+</HTML>

mozilla/security/psm/doc/license.txt

@@ -0,0 +1,343 @@
+
+NETSCAPE CLIENT PRODUCTS LICENSE AGREEMENT
+Redistribution Or Rental Not Permitted
+
+These terms apply to Personal Security Manager.
+
+BY CLICKING THE ACCEPTANCE BUTTON OR INSTALLING OR
+USING PERSONAL SECURITY MANAGER SOFTWARE (THE "PRODUCT"), 
+THE INDIVIDUAL OR ENTITY LICENSING THE PRODUCT
+("LICENSEE") IS CONSENTING TO BE BOUND BY AND IS
+BECOMING A PARTY TO THIS AGREEMENT.  IF LICENSEE DOES
+NOT AGREE TO ALL OF THE TERMS OF THIS AGREEMENT, THE
+BUTTON INDICATING NON-ACCEPTANCE MUST BE
+SELECTED, AND LICENSEE MUST NOT INSTALL OR USE
+THE SOFTWARE.
+
+1. LICENSE AGREEMENT.  As used in this Agreement, for
+residents of Europe, the Middle East or Africa,
+"Netscape" shall mean Netscape Communications Ireland
+Limited; for residents of Japan, "Netscape" shall
+mean Netscape Communications (Japan), Ltd.; for
+residents of all other countries, "Netscape" shall
+mean Netscape Communications Corporation.  In this
+Agreement "Licensor" shall mean Netscape except under
+the following circumstances: (i) if Licensee acquired
+the Product as a bundled component of a third party
+product or service, then such third party shall be
+Licensor; and (ii) if any third party software is
+included as part of the default installation and no
+license is presented for acceptance the first time
+that third party software is invoked, then the use of
+that third party software shall be governed by this
+Agreement, but the term "Licensor," with respect to
+such third party software, shall mean the
+manufacturer of that software and not Netscape.  With
+the exception of the situation described in (ii)
+above, the use of any included third party software
+product shall be governed by the third party's
+license agreement and not by this Agreement, whether
+that license agreement is presented for acceptance
+the first time that the third party software is
+invoked, is included in a file in electronic form, or
+is included in the package in printed form.  If more
+than one license agreement was provided for the
+Product, and the terms vary, the order of precedence
+of those license agreements is as follows: a signed
+agreement, a license agreement available for review
+on the Netscape website, a printed or electronic
+agreement that states clearly that it supersedes
+other agreements, a printed agreement provided with
+the Product, an electronic agreement provided with
+the Product.
+
+2. LICENSE GRANT.  Licensor grants Licensee a
+non-exclusive and non-transferable license to
+reproduce and use for personal or internal business
+purposes the executable code version of the Product,
+provided any copy must contain all of the original
+proprietary notices.  This license does not entitle
+Licensee to receive from Netscape hard-copy
+documentation, technical support, telephone
+assistance, or enhancements or updates to the
+Product.  Licensee may not customize the Product
+unless Licensee has also licensed the Netscape
+Client Customization Kit ("CCK"), and then only to
+the extent permitted in the license agreement for CCK,
+as applicable.  Licensee may not redistribute the
+Product unless Licensee has separately entered into a
+distribution agreement with Netscape such as the
+Unlimited Distribution Program Agreement.
+
+3. RESTRICTIONS.  Except as otherwise expressly
+permitted in this Agreement, or in another Netscape
+agreement to which Licensee is a party such as the
+CCK license agreement or a distribution agreement,
+Licensee may not: (i) modify or create any derivative
+works of the Product or documentation, including translation
+or localization; (ii) decompile, disassemble, reverse engineer,
+or otherwise attempt to derive the source code for the
+Product (except to the extent applicable laws
+specifically prohibit such restriction or as provided by the
+Netscape Public License or Mozilla Public License
+for portions of the product governed by those licenses);
+(iii) redistribute, encumber, sell, rent, lease,
+sublicense, or otherwise transfer rights to the
+Product; (iv) remove or alter any trademark, logo,
+copyright or other proprietary notices, legends,
+symbols or labels in the Product; or (v) publish any
+results of benchmark tests run on the Product to a
+third party without Netscape's prior written
+consent.
+
+4. FEES.  There is no license fee for the Product.
+If Licensee wishes to receive the Product on media,
+there may be a small charge for the media and for
+shipping and handling.  Licensee is responsible for
+any and all taxes.
+
+5. TERMINATION.  Without prejudice to any other
+rights, Licensor may terminate this Agreement if
+Licensee breaches any of its terms and conditions.
+Upon termination, Licensee shall destroy all copies
+of the Product.
+
+6. PROPRIETARY RIGHTS.  Title, ownership rights, and
+intellectual property rights in the Product shall
+remain in Netscape and/or its suppliers.  Licensee
+acknowledges such ownership and intellectual property
+rights and will not take any action to jeopardize,
+limit or interfere in any manner with Netscape's or
+its suppliers' ownership of or rights with respect to
+the Product.  The Product is protected by copyright
+and other intellectual property laws and by
+international treaties.  Title and related rights in
+the content accessed through the Product is the
+property of the applicable content owner and is
+protected by applicable law.  The license granted
+under this Agreement gives Licensee no rights to such
+content.
+
+7. USE AND AVAILABILITY OF OPEN SOURCE
+CODE. Portions of Personal Security Manager were created using source
+code governed by the Netscape Public License (NPL) and
+the Mozilla Public License (MPL).  The source code for
+the portions of Personal Security Manager governed by the NPL and MPL
+is available from http://www.mozilla.org under those licenses.
+
+8. DISCLAIMER OF WARRANTY.  THE PRODUCT IS PROVIDED
+FREE OF CHARGE, AND, THEREFORE, ON AN "AS IS" BASIS,
+WITHOUT WARRANTY OF ANY KIND, INCLUDING WITHOUT
+LIMITATION THE WARRANTIES THAT IT IS FREE OF DEFECTS,
+MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR
+NON-INFRINGING.  THE ENTIRE RISK AS TO THE QUALITY
+AND PERFORMANCE OF THE PRODUCT IS BORNE BY LICENSEE.
+SHOULD THE PRODUCT PROVE DEFECTIVE IN ANY RESPECT,
+LICENSEE AND NOT LICENSOR OR ITS SUPPLIERS OR
+RESELLERS OR ANY CONTRIBUTORS TO THE SOURCE CODE
+OF THE PORTIONS OF PERSONAL SECURITY MANAGER AVAILABLE FROM
+HTTP://WWW.MOZILLA.ORG ASSUMES THE ENTIRE COST
+OF ANY SERVICE AND REPAIR.  IN ADDITION, THE SECURITY
+MECHANISMS IMPLEMENTED BY THE PRODUCT HAVE
+INHERENT LIMITATIONS, AND LICENSEE MUST DETERMINE
+THAT THE PRODUCT SUFFICIENTLY MEETS ITS REQUIREMENTS.
+THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL
+PART OF THIS AGREEMENT.  NO USE OF THE PRODUCT IS
+AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+9. LIMITATION OF LIABILITY.  TO THE MAXIMUM EXTENT
+PERMITTED BY APPLICABLE LAW, IN NO EVENT WILL
+LICENSOR OR ITS SUPPLIERS OR RESELLERS OR ANY
+CONTRIBUTORS TO THE SOURCE CODE OF THE PORTIONS OF 
+PERSONAL SECURITY MANAGER AVAILABLE FROM
+HTTP://WWW.MOZILLA.ORG BE LIABLE FOR
+ANY INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL
+DAMAGES ARISING OUT OF THE USE OF OR INABILITY TO USE
+THE PRODUCT, INCLUDING, WITHOUT LIMITATION, DAMAGES
+FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE
+OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL
+DAMAGES OR LOSSES, EVEN IF ADVISED OF THE POSSIBILITY
+THEREOF, AND REGARDLESS OF THE LEGAL OR EQUITABLE
+THEORY (CONTRACT, TORT OR OTHERWISE) UPON WHICH THE
+CLAIM IS BASED.  IN ANY CASE, LICENSOR'S ENTIRE
+LIABILITY UNDER ANY PROVISION OF THIS AGREEMENT SHALL
+NOT EXCEED IN THE AGGREGATE THE SUM OF THE FEES
+LICENSEE PAID FOR THIS LICENSE (IF ANY) AND FEES FOR
+SUPPORT OF THE PRODUCT RECEIVED BY NETSCAPE UNDER A
+SEPARATE SUPPORT AGREEMENT (IF ANY), WITH THE
+EXCEPTION OF DEATH OR PERSONAL INJURY CAUSED BY THE
+NEGLIGENCE OF LICENSOR TO THE EXTENT APPLICABLE LAW
+PROHIBITS THE LIMITATION OF DAMAGES IN SUCH CASES.
+SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR
+LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
+THIS EXCLUSION AND LIMITATION MAY NOT BE APPLICABLE.
+NETSCAPE IS NOT RESPONSIBLE FOR ANY LIABILITY ARISING
+OUT OF CONTENT PROVIDED BY LICENSEE OR A THIRD PARTY
+THAT IS ACCESSED THROUGH THE PRODUCT AND/OR ANY
+MATERIAL LINKED THROUGH SUCH CONTENT.
+
+10. ENCRYPTION.  If Licensee wishes to use the
+cryptographic features of the Product, then Licensee
+may need to obtain and install a signed digital
+certificate from a certificate authority or a
+certificate server.  Licensee may be charged
+additional fees for certification services.  Licensee
+is responsible for maintaining the security of the
+environment in which the Product is used and the
+integrity of the private key file used with the
+Product.  In addition, the use of digital
+certificates is subject to the terms specified by the
+certificate provider, and there are inherent
+limitations in the capabilities of digital
+certificates.  If Licensee is sending or receiving
+digital certificates, Licensee is responsible for
+familiarizing itself with and evaluating such terms
+and limitations.  If the Product is a version with
+FORTEZZA, Licensee will need to obtain PC Card
+Readers and FORTEZZA Crypto Cards from another vendor
+to enable the FORTEZZA features.
+
+11. EXPORT CONTROL.  Licensee agrees to comply with
+all export laws and restrictions and regulations of
+the United States or foreign agencies or authorities,
+and not to export or re-export the Product or any
+direct product thereof in violation of any such
+restrictions, laws or regulations, or without all
+necessary approvals.  As applicable, each party shall
+obtain and bear all expenses relating to any
+necessary licenses and/or exemptions with respect to
+its own export of the Product from the U.S.  Neither
+the Product nor the underlying information or
+technology may be downloaded or otherwise exported or
+re-exported (i) into Cuba, Iran, Iraq, Libya, North
+Korea, Sudan, Syria or any other country subject to
+U.S. trade sanctions covering the Product, to
+individuals or entities controlled by such countries,
+or to nationals or residents of such countries other
+than nationals who are lawfully admitted permanent
+residents of countries not subject to such sanctions;
+or (ii) to anyone on the U.S. Treasury Department's
+list of Specially Designated Nationals and Blocked
+Persons or the U.S. Commerce Department's Table of
+Denial Orders.  By downloading or using the Product,
+Licensee agrees to the foregoing and represents and
+warrants that it complies with these conditions.
+
+12. HIGH RISK ACTIVITIES.  The Product is not
+fault-tolerant and is not designed, manufactured or
+intended for use or resale as on-line control
+equipment in hazardous environments requiring
+fail-safe performance, such as in the operation of
+nuclear facilities, aircraft navigation or
+communication systems, air traffic control, direct
+life support machines, or weapons systems, in which
+the failure of the Product could lead directly to
+death, personal injury, or severe physical or
+environmental damage ("High Risk Activities").
+Accordingly, Licensor and its suppliers specifically
+disclaim any express or implied warranty of fitness
+for High Risk Activities.  Licensee agrees that
+Licensor and its suppliers will not be liable for any
+claims or damages arising from the use of the Product
+in such applications.
+
+13. U.S. GOVERNMENT END USERS.  The Product is a
+"commercial item," as that term is defined in 48
+C.F.R. 2.101 (Oct. 1995), consisting of "commercial
+computer software" and "commercial computer software
+documentation," as such terms are used in 48 C.F.R.
+12.212 (Sept.  1995).  Consistent with 48 C.F.R.
+12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4
+(June 1995), all U.S. Government End Users acquire
+the Product with only those rights set forth herein.
+
+13. MISCELLANEOUS.  (a) This Agreement constitutes
+the entire agreement between the parties concerning
+the subject matter hereof.  (b) This Agreement may be
+amended only by a writing signed by both parties.
+(c) Except to the extent applicable law, if any,
+provides otherwise, this Agreement shall be governed
+by the laws of the State of California, U.S.A.,
+excluding its conflict of law provisions.  (d) Unless
+otherwise agreed in writing, all disputes relating to
+this Agreement (excepting any dispute relating to
+intellectual property rights) shall be subject to
+final and binding arbitration in Santa Clara County,
+California, under the auspices of JAMS/EndDispute,
+with the losing party paying all costs of
+arbitration.  (e) This Agreement shall not be
+governed by the United Nations Convention on
+Contracts for the International Sale of Goods.  (f)
+If any provision in this Agreement should be held
+illegal or unenforceable by a court having
+jurisdiction, such provision shall be modified to the
+extent necessary to render it enforceable without
+losing its intent, or severed from this Agreement if
+no such modification is possible, and other
+provisions of this Agreement shall remain in full
+force and effect.  (g) The controlling language of
+this Agreement is English.  If Licensee has received
+a translation into another language, it has been
+provided for Licensee's convenience only.  (h) A
+waiver by either party of any term or condition of
+this Agreement or any breach thereof, in any one
+instance, shall not waive such term or condition or
+any subsequent breach thereof.  (i) The provisions of
+this Agreement which require or contemplate
+performance after the expiration or termination of
+this Agreement shall be enforceable notwithstanding
+said expiration or termination.  (j) Licensee may not
+assign or otherwise transfer by operation of law or
+otherwise this Agreement or any rights or obligations
+herein except in the case of a merger or the sale of
+all or substantially all of Licensee's assets to
+another entity.  (k) This Agreement shall be binding
+upon and shall inure to the benefit of the parties,
+their successors and permitted assigns.  (l) Neither
+party shall be in default or be liable for any delay,
+failure in performance (excepting the obligation to
+pay) or interruption of service resulting directly or
+indirectly from any cause beyond its reasonable
+control.  (m) The relationship between Licensor and
+Licensee is that of independent contractors and
+neither Licensee nor its agents shall have any
+authority to bind Licensor in any way.  (n) If any
+dispute arises under this Agreement, the prevailing
+party shall be reimbursed by the other party for any
+and all legal fees and costs associated therewith.
+(o) If any Netscape professional services are being
+provided, then such professional services are
+provided pursuant to the terms of a separate
+Professional Services Agreement between Netscape and
+Licensee.  The parties acknowledge that such services
+are acquired independently of the Product licensed
+hereunder, and that provision of such services is not
+essential to the functionality of such Product.  (p)
+The headings to the sections of this Agreement are
+used for convenience only and shall have no
+substantive meaning.  (q) Licensor may use Licensee's
+name in any customer reference list or in any press
+release issued by Licensor regarding the licensing of
+the Product and/or provide Licensee's name and the
+names of the Product licensed by Licensee to third
+parties.
+
+14. LICENSEE OUTSIDE THE U.S.  If Licensee is located
+outside the U.S., then the provisions of this Section
+shall apply.  (i) Les parties aux presentes
+confirment leur volonte que cette convention de meme
+que tous les documents y compris tout avis qui s'y
+rattache, soient rediges en langue anglaise.
+(translation: "The parties confirm that this
+Agreement and all related documentation is and will
+be in the English language.")  (ii) Licensee is
+responsible for complying with any local laws in its
+jurisdiction which might impact its right to import,
+export or use the Product, and Licensee represents
+that it has complied with any regulations or
+registration procedures required by applicable law to
+make this license enforceable.
+
+
+Netscape Client Software EULA           Rev. [022500]
+

mozilla/security/psm/doc/psmtest.html

@@ -0,0 +1,29 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<head>
+  <title>Personal Security Manager Detection Page</title>
+  <script language=javascript>
+
+    function init_title()
+    {
+      with(window.frames.the_frame) {
+        document.write('<BODY><H1>Personal Security Manager Detection Page</H1><P><P>');
+        if (typeof(crypto.version) == "undefined") {
+          document.write('<FONT color="#ff0000">Personal Security Manager not loaded</FONT>');
+        } else {
+          document.write('<FONT color="#007700">Personal Security Manager&nbsp;Running&nbsp;(version ', crypto.version); 
+          document.write(')</FONT>'); 
+        }
+        document.write('</BODY>');
+        document.close();
+      }
+    }
+  
+
+
+</script>
+</head>
+
+<frameset rows="*,1" border=0 onload="init_title()">
+  <frame src="about:blank" name="the_frame">
+  <frame src="about:blank">
+</frameset>

mozilla/security/psm/doc/release_notes.html

@@ -0,0 +1,297 @@
+<!DOCTYPE html PUBLIC "-//w3c//dtd html 4.0 transitional//en">
+<html>
+<head>
+   
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+   
+  <meta name="GENERATOR" content="Mozilla/4.75 [en] (WinNT; U) [Netscape]">
+   
+  <meta name="Author" content="Sean Cotter">
+  <title>Personal Security Manager Release Notes</title>
+</head>
+<body>
+<center>
+<h1><img src="bannerrn.gif" height="32" width="468" align="Center"></h1>
+</center>
+<center>
+<h2>Netscape Personal Security Manager</h2>
+</center>
+<center>
+<h2>Release 1.4</h2>
+</center>
+<center>
+<h2>12/18/2000</h2>
+</center>
+<center>
+<hr width="100%"></center>
+These release notes contain the most recent information about this release
+of Netscape Personal Security Manager. Please read these notes before using
+the software.
+<p>These notes include information for IS professionals who are thoroughly
+familiar with security and public-key infrastructure (PKI) issues.</p>
+<p>Use of this product is subject to the terms detailed in the license agreement
+at <a href="http://docs.iplanet.com/docs/manuals/psm/14/license.txt.">http://docs.iplanet.com/docs/manuals/psm/14/license.txt.</a></p>
+<p></p>
+<hr width="100%">
+<h2>Contents</h2>
+<a href="#Documentation">Documentation</a><br>
+<a href="#Changes Since PSM 1.3">Changes Since Personal Security Manager 1.3</a>
+<br>
+<a href="#Software/Hardware Requirements">Software/Hardware Requirements</a>
+<br>
+<a href="#unpacking">Installing Personal Security Manager</a><br>
+<a href="#Using the Test Bed">Using Personal Security Manager</a><br>
+<a href="#Known Bugs/Issues for 14 Release">Known Bugs/Issues for Personal
+Security Manager 1.4</a><br>
+<a href="#Feedback">Feedback</a>
+<p></p>
+<hr width="100%">
+<h2><a name="Documentation"></a>Documentation</h2>
+The following documentation is available with Personal Security Manager:
+<ul>
+  <li><a href="contents.htm">Personal Security Manager Help</a> -- This online
+help system can also be accessed by clicking the Help button in any personal
+Security Manager window.</li>
+  <li><a href="cmcjavascriptapi.html">JavaScript API for Client Certificate
+Management</a> -- This reference describes a new Javascript API for performing
+user certificate management operations with Personal Security Manager, including
+one-click issuance, forced certificate backup by end users, and automatic
+archival of encryption private keys.</li>
+</ul>
+For the latest release notes, deployment guide, and other information,see
+<a href="http://docs.iPlanet.com/docs/manuals/psm.html">http://docs.iPlanet.com/docs/manuals/psm.html</a><a href="http://developer.iPlanet.com/docs/manuals/psm.html">
+.</a>
+<p></p>
+<hr width="100%">
+<h2><a name="Changes Since PSM 1.3"></a>Changes Since Personal Security Manager
+1.3</h2>
+The <a href="http://www.ietf.org/rfc/rfc2246.txt">Transport Layer Security
+(TLS)</a> protocol is turned on by default in Personal Security Manager1.4.
+To turn TLS off, open Personal Security Manager, click the Advanced tab, click
+Options in the left frame, then deselect the checkbox labeled "Enable TLS."
+<p>TLS is an IETF standard based on the Secure Sockets Layer (SSL) protocol.
+It can be thought of as SSL version 3.1. Some servers that do not implement
+SSL correctly cannot negotiate the SSL handshake with client software (such
+as Personal Security Manager) that supports TLS. To allow Personal Security
+Manager to use SSL with such TLS-intolerant servers, you must disable TLS
+as described above.</p>
+<p>Most other changes since Personal Security Manager 1.3 involve minor bug
+fixes and optimizations.</p>
+<p>This version of Netscape Personal Security Manager ships with Netscape
+6 and also works with Mozilla and Communicator 4.7x. </p>
+<p></p>
+<hr width="100%">
+<h4><a name="Software/Hardware Requirements"></a><font size="+2">Software/Hardware
+Requirements</font></h4>
+<b>Operating systems supported:</b> Windows NT, Windows 95, Windows 98, Windows
+2000; Solaris 2.6, 2.7, 2.8; and Red Hat Linux 6.1.
+<p></p>
+<hr width="100%">
+<h2><a name="unpacking"></a>Installing Personal Security Manager</h2>
+Netscape Personal Security Manager 1.4 is installed with Netscape 6 and recent versions
+of Mozilla. 
+
+<p>When you install Netscape 6 on Windows, Personal Security Manager is installed
+in the directory <tt>C:\Program Files\Common Files\Netscape Shared\Security\</tt>.
+
+<p>When you install Netscape 6 on Unix, Personal Security Manager is installed
+in a directory called <tt>psm</tt> in the same directory where the <tt>netscape</tt>
+executable resides.<br>
+
+<p>The sections that follow describe how to install the Personal Security Manager 
+files for use with Communicator 4.7x.</p>
+<h3>Installing on Windows 95/98/2000/NT for Use With Communicator 4.7x</h3>
+
+To install Netscape Personal Security Manager on Windows 95/98/2000/NT for use with
+Communicator 4.7 or later, save the file in a convenient location with the
+specified filename, then drag the file's icon into a Navigator window (that
+is, a browser window displayed by Communicator). Dropping the file's icon
+over the browser window initiates SmartUpdate, which automatically installs
+Personal Security Manager. Afterinstallation is complete, exit Communicator
+and relaunch it. If your copy of Communicator is installed in the default
+location, SmartUpdate installs the Personal Security Manager files in the
+directory<tt>C:\Program Files\CommonFiles\Netscape Shared\Security\</tt>
+and adds the file <tt>cmnav.dll</tt>in the directory <tt>C:\Program Files\Netscape\Communicator\Program</tt>.<br>
+<h3>Installing on Unix for Use With Communicator 4.7x</h3>
+
+To install Personal Security Manager for use with Communicator 4.7 or later on Unix, you
+must be logged in as the same Unix user you will be logged in as when you
+run Communicator. For the Unix installation to succeed, you must have write
+privileges for both the directory where the Netscape executable resides and
+the directory where the installation script creates the directory containing
+the Personal Security Manager files. To install Personal Security Manager for
+use with Communicator 4.7x, download the tar file for the version of the product
+that you want to install and follow these steps:<br>
+<ol>
+  <li>Exit Communicator, if it is running.</li>
+  <li>Decompress the downloaded file to some convenient location.</li>
+  <li>Run the psm-install program.</li>
+</ol>
+The psm-install program allows you to specify the directory in which Personal
+Security Manager will be installed. In this release, you must install Personal
+Security Manager locally. To do so, you can either install it in the default
+location (<tt>/opt/netscape/security</tt>) or in some other local location. However,
+if you install Personal Security Manager anywhere other than the default
+location, Communicator must also be installed locally. To run Personal Security
+Manager on Unix, you must be logged in as the same Unix user you were logged
+in as when you installed it.<br>
+<h3>Disabling Personal Security Manager</h3>
+To <b>disable</b> Personal Security Manager temporarily, exit the browser,
+then:
+<ul>
+  <li>on Unix, remove the directory<tt>psm</tt> from the directory where
+the<tt>netscape</tt>executable resides.</li>
+  <li>on Windows, rename the directory <tt>C:\Program Files\Common Files\Netscape
+Shared\Security</tt> to something else.</li>
+</ul>
+<hr width="100%">
+<h2><a name="Using the Test Bed"></a>Using Personal Security Manager</h2>
+The sections that follow describe how to test some of the features of Personal
+Security Manager that are available with this release:
+<ul>
+  <li><a href="#Start Up Personal Security Manager with">Start Up Personal
+SecurityManager with Netscape 6</a></li>
+  <li><a href="#Use SSL with Server Authentication">Test Basic SSL</a></li>
+  <li><a href="#Get a Certificate">Get an SSL Client Certificate</a></li>
+  <li><a href="#View Your Personal Certificate">View Your Certificate</a></li>
+  <li><a href="#Using Your Personal Certificate for Client">Test Client Authentication</a></li>
+  <li><a href="#Validate Certificates Using OSCP">Validate Certificates Using
+OCSP</a></li>
+</ul>
+The sections that follow briefly describe how to test some of the features
+listed above.
+<p>For information on the JavaScript API supported by Personal SecurityManager,
+see <a href="cmcjavascriptapi.html">JavaScript API for ClientCertificate
+Management</a> and the Personal Security Manager DeploymentGuide. For the
+latest versions of these documents, see <a href="http://docs.iPlanet.com/docs/manuals/psm.html">
+http://docs.iPlanet.com/docs/manuals/psm.html</a>.</p>
+<h3><a name="Start Up Personal Security Manager with"></a>Use Personal Security
+Manager with Netscape 6</h3>
+Personal Security Manager starts automatically the first time Netscape 6
+needs to perform some action involving security, such as handling anSSL session.
+<p>Follow these steps to view your security settings and confirm that&nbsp;
+Personal Security Manager is running:</p>
+<ol>
+  <li>Launch Netscape 6.</li>
+  <li>Choose Security &amp; Privacy from the Tasks menu, then choose Security
+Manager to view your Personal Security Manager settings.</li>
+  <li>Close the Personal Security Manager window.</li>
+  <li>Go to the page <a href="psmtest.html">psmtest.html</a> (in the same
+directoryas these release notes), then choose Page Source from the View menu
+tosee the JavaScript code that a web programmer can use to detect Personal
+Security Manager and its version number.</li>
+</ol>
+Note that the version number has two parts. The first is the version ofthe
+PSM client library, and the second is the version of the PSM serverlibrary.
+<br>
+&nbsp;
+<h3><a name="Use SSL with Server Authentication"></a>Test Basic SSL</h3>
+Go to any online store, banking service, brokerage account, or other website
+that supports SSL. Verify that the lock in the lower-left corner ofthe browser
+window is closed when you reach the pages for which SSL shouldbe enabled,
+for example a page where you are asked to give your creditcard number.
+<h3><a name="Get a Certificate"></a>Get an SSL Client Certificate</h3>
+Go to any public or private CA and apply for an SSL client certificate.
+<p>To test one-click certificate issuance, dual key-pair certificates,and
+other Personal Security Manager features, system administrators shoulddownload,
+install, and configure Netscape Certificate Management System.For complete
+CMS documentation and other information, see <a href="http://docs.iPlanet.com/docs/manuals/cms.html">
+http://docs.iPlanet.com/docs/manuals/cms.html</a>.To download the latest
+version of CMS, see <a href="http://www.iplanet.com/downloads/download/">
+http://www.iplanet.com/downloads/download/</a>.</p>
+<h3><a name="View Your Personal Certificate"></a>View Your Certificate</h3>
+After you have obtained a certificate, follow these steps to view it:
+<ol>
+  <li>Click the Security icon in the Navigator toolbar.</li>
+  <li>Click the Certificates tab.</li>
+  <li>Click to select your certificate.</li>
+  <li>Click View.</li>
+</ol>
+You should see information about your new certificate.
+<h3><a name="Using Your Personal Certificate for Client"></a><font size="+1">
+TestClient Authentication</font></h3>
+Personal Security Manager allows the SSL server and client to negotiatewhich
+certificate to use, and in most cases they can agree on a singlecorrect certificate
+for the client to present. When this happens, the usercan access an SSL site
+that requires client authentication with zero additionalclicks.
+<p>To test client authentication with Netscape Enterprise Server, systemadministrators
+should follow these steps:</p>
+<ul>
+  <li>Install an Enterprise Server and configure it for client authentication
+as described in <a href="http://docs.iplanet.com/docs/manuals/cms/41/dep_gide/entsrv.htm">
+AppendixD, Using SSL with Enterprise Server 3.x</a>, of <i>Netscape Certificate
+Management System Installation and Deployment Guide</i>.</li>
+  <li>Test the Enterprise Server installation as described at the end of
+AppendixD using Personal Security Manager.</li>
+</ul>
+<h3><a name="Validate Certificates Using OSCP"></a>Validate Certificates
+UsingOSCP</h3>
+Personal Security Manager supports the use of the On-Line Certificate Status
+Protocol (OSCP) to check the validity of certificates in real time. Information
+about this protocol and how configure Personal Security Manager 1.3 andNetscape
+Certificate Management System 4.2 to support it is available from<a href="http://docs.iPlanet.com/docs/manuals/psm/12/psmdply.htm">
+http://docs.iPlanet.com/docs/manuals/psm/12/psmdply.htm</a>
+<p>It's important to note that Personal Security Manager will accept signatures
+from responders only under the following conditions:</p>
+<ul>
+  <li>The response was signed by a delegated responder--that is, the responder's
+certificate was signed by the same CA as the certificate&nbsp; you're trying
+to verify and has the <tt>extendedKeyUsage</tt> bit set indicating thatthe
+certificate is an OCSP response signer. The certificate should be thesame
+as a CA certificate with the addition of the <tt>extendedKeyUsage</tt>bit.</li>
+  <li>The user has designated a default responder in the OCSP Settings dialog
+box (available from the Advanced tab under Options).</li>
+</ul>
+Common problems include the following:
+<ul>
+  <li>Time drift between the client and server machine. Personal Security
+Managerexpects the time of the response to be within the past 24 hours. If
+thereis a difference in the clocks between the machine used to sign the response,
+so the response looks to Personal Security Manager like it was signed inthe
+future, Personal Security Manager interprets this as an error. Runntp on
+both machines to fix this problem.</li>
+  <li>The response doesn't include the certificates required to complete
+thechain needed to verify the signer's certificate. The client frequently
+doesn't have all the certificates in the database that are needed to verify
+the signer's certificate, in which case Personal Security Manager can'tverify
+the signer's certificate and OCSP fails. Make sure the entire chainis included
+with every response. This is the safest way to avoid this problem.</li>
+  <li>If you are using ValiCert, misconfiguration may cause the Validation
+Authoritynot to send the certificate chain (including the CA root certificate
+andthe OCSP responder's certificate) correctly.</li>
+</ul>
+<hr width="100%">
+<h2><a name="Known Bugs/Issues for 14 Release"></a>Known Bugs/Issues for
+Personal Security Manager 1.4</h2>
+<ul>
+  <li>To run Personal Security Manager on Unix with Netscape 6 or Communicator,
+you must be logged in as thesame Unix user you were logged in as when the
+browser was installed.</li>
+  <li>FORTEZZA is not guaranteed to work with this release. [# 94220]</li>
+  <li>In some unusual circumstances you may encounter problems such as valid
+certificates not being verified or the browser freezing up. If you encounter
+a problem that doesn't appear to have a logical explanation, try the following
+as a last resort:</li>
+  <ol>
+    <li>Exit the browser, then relaunch it. If necessary, use Control-Alt-Delete
+on Windows 95/98/2000/NT to bring up the Task Manager and click End Process
+for both <tt>psm.exe</tt> and <tt>netscp6.exe</tt>.</li>
+    <li><b>Warning:</b> <b>Before taking this step, back up your own certificates
+stored internally by Personal Security Manager.</b> If exiting and relaunching
+the browser doesn't take care of the problem, in some rare cases it maywork
+to exit the browser, then delete or rename your <tt>cert7.db</tt> and<tt>
+key3.db</tt>files (located in your user profile directory on Windows 95/98/2000/NT,
+or in the directory in which the Netscape or Mozilla executable resideson
+Unix) and relaunch the browser. You should also look for all otherfiles in
+the same directory that begin with <tt>cert</tt> or<tt>key</tt>and end in
+      <tt>.db</tt> and delete those files as well before relaunchingthe browser.</li>
+  </ol>
+</ul>
+<hr width="100%">
+<h2><a name="Feedback"></a>Feedback</h2>
+To send feedback to the Personal Security Manager development team, send email
+to <a href="mailto:psmfeedback@netscape.com">psmfeedback@netscape.com</a>. 
+Feedback back sent to this address will be read by the team, but you will
+not receive a personal response.
+</body>
+</html>

mozilla/security/psm/lib/Makefile

@@ -0,0 +1,74 @@
+#! 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 security libraries.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 1994-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.
+#
+
+#######################################################################
+# (1) Include initial platform-independent assignments (MANDATORY).   #
+#######################################################################
+
+include manifest.mn
+
+#######################################################################
+# (2) Include "global" configuration information. (OPTIONAL)          #
+#######################################################################
+
+include $(CORE_DEPTH)/coreconf/config.mk
+
+#######################################################################
+# (3) Include "component" configuration information. (OPTIONAL)       #
+#######################################################################
+
+
+
+#######################################################################
+# (4) Include "local" platform-dependent assignments (OPTIONAL).      #
+#######################################################################
+
+
+
+#######################################################################
+# (5) Execute "global" rules. (OPTIONAL)                              #
+#######################################################################
+
+include $(CORE_DEPTH)/coreconf/rules.mk
+
+#######################################################################
+# (6) Execute "component" rules. (OPTIONAL)                           #
+#######################################################################
+
+
+
+#######################################################################
+# (7) Execute "local" rules. (OPTIONAL).                              #
+#######################################################################
+

mozilla/security/psm/lib/Makefile.in

@@ -1,4 +1,3 @@
-#!nmake
 #
 # The contents of this file are subject to the Netscape Public
 # License Version 1.1 (the "License"); you may not use this file
@@ -18,9 +17,16 @@
 # Rights Reserved.
 #
 # Contributor(s): 
+#
 
-DEPTH=..\..
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
 
-DIRS=public lib mapi32 tests hook
+include $(DEPTH)/config/autoconf.mk
+
+DIRS		= protocol client nlslayer
+
+include $(topsrcdir)/config/rules.mk
 
-include <$(DEPTH)\config\rules.mak>

mozilla/security/psm/lib/client/MANIFEST

@@ -0,0 +1,3 @@
+cmtclist.h
+cmtcmn.h
+cmtjs.h

mozilla/security/psm/lib/client/Makefile

@@ -0,0 +1,74 @@
+#! 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 security libraries.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 1994-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.
+#
+
+#######################################################################
+# (1) Include initial platform-independent assignments (MANDATORY).   #
+#######################################################################
+
+include manifest.mn
+
+#######################################################################
+# (2) Include "global" configuration information. (OPTIONAL)          #
+#######################################################################
+
+include $(CORE_DEPTH)/coreconf/config.mk
+
+#######################################################################
+# (3) Include "component" configuration information. (OPTIONAL)       #
+#######################################################################
+
+
+
+#######################################################################
+# (4) Include "local" platform-dependent assignments (OPTIONAL).      #
+#######################################################################
+include config.mk
+
+
+#######################################################################
+# (5) Execute "global" rules. (OPTIONAL)                              #
+#######################################################################
+
+include $(CORE_DEPTH)/coreconf/rules.mk
+
+#######################################################################
+# (6) Execute "component" rules. (OPTIONAL)                           #
+#######################################################################
+
+
+
+#######################################################################
+# (7) Execute "local" rules. (OPTIONAL).                              #
+#######################################################################
+

mozilla/security/psm/lib/client/Makefile.in

@@ -0,0 +1,74 @@
+#! 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 security libraries.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 1994-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.
+# 
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+LIBRARY_NAME	= cmt
+
+EXPORTS = \
+	cmtcmn.h \
+	cmtjs.h  \
+	cmtclist.h \
+	$(NULL)
+
+MODULE = security
+
+CSRCS = cmtinit.c  \
+	cmtssl.c   \
+	cmtutils.c \
+	cmtcert.c  \
+	cmthash.c  \
+	cmtpkcs7.c \
+	cmtres.c   \
+	cmtjs.c    \
+	cmtevent.c \
+        cmtpasswd.c \
+	cmtadvisor.c \
+	cmtrng.c \
+	cmtsdr.c \
+	$(NULL)
+
+ifeq ($(MOZ_OS2_TOOLS),VACPP)
+EXTRA_DSO_LDOPTS	+= $(DIST)/lib/protocol.$(LIB_SUFFIX)
+else
+EXTRA_DSO_LDOPTS	+= -L$(DIST)/lib -lprotocol
+endif
+
+include $(topsrcdir)/config/rules.mk
+

mozilla/security/psm/lib/client/cmtadvisor.c

@@ -0,0 +1,99 @@
+/* 
+ * 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 security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1994-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.
+ */
+#include "cmtcmn.h"
+#include "cmtutils.h"
+#include "messages.h"
+#ifdef XP_MAC
+#include "cmtmac.h"
+#endif
+
+CMTStatus CMT_SecurityAdvisor(PCMT_CONTROL control, CMTSecurityAdvisorData* data, CMUint32 *resID)
+{
+    CMTItem message = {0, NULL, 0};
+    SecurityAdvisorRequest request;
+    SingleNumMessage reply;
+
+    if (!control) {
+        return CMTFailure;
+    }
+
+    if (!data) {
+        return CMTFailure;
+    }
+
+    request.infoContext = data->infoContext;
+    request.resID = data->resID;
+    request.hostname = data->hostname;
+	request.senderAddr = data->senderAddr;
+	request.encryptedP7CInfo = data->encryptedP7CInfo;
+	request.signedP7CInfo = data->signedP7CInfo;
+	request.decodeError = data->decodeError;
+	request.verifyError = data->verifyError;
+	request.encryptthis = data->encryptthis;
+	request.signthis = data->signthis;
+	request.numRecipients = data->numRecipients;
+	request.recipients = data->recipients;
+    message.type = SSM_REQUEST_MESSAGE | SSM_SECURITY_ADVISOR;
+
+    if (CMT_EncodeMessage(SecurityAdvisorRequestTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Send the message and get the response */
+	if (CMT_SendMessage(control, &message) != CMTSuccess) {
+        goto loser;
+	}
+
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_SECURITY_ADVISOR)) {
+        goto loser;
+    }
+
+    /* Decode the message */
+    if (CMT_DecodeMessage(SingleNumMessageTemplate, &reply, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+    *resID = reply.value;
+
+    return CMTSuccess;
+loser:
+
+    if (message.data) {
+        free(message.data);
+    }
+    return CMTFailure;
+}
+
+
+
+

mozilla/security/psm/lib/client/cmtclist.h

@@ -0,0 +1,111 @@
+/* 
+ * 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 security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1994-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.
+ */
+#ifndef cmtclist_h___
+#define cmtclist_h___
+
+typedef struct CMTCListStr CMTCList;
+/*
+** Circular linked list
+*/
+struct CMTCListStr {
+    CMTCList	*next;
+    CMTCList	*prev;
+};
+
+/*
+** Insert element "_e" into the list, before "_l".
+*/
+#define CMT_INSERT_BEFORE(_e,_l)	 \
+	(_e)->next = (_l);	 \
+	(_e)->prev = (_l)->prev; \
+	(_l)->prev->next = (_e); \
+	(_l)->prev = (_e);	 \
+
+/*
+** Insert element "_e" into the list, after "_l".
+*/
+#define CMT_INSERT_AFTER(_e,_l)	 \
+	(_e)->next = (_l)->next; \
+	(_e)->prev = (_l);	 \
+	(_l)->next->prev = (_e); \
+	(_l)->next = (_e);	 \
+
+/*
+** Append an element "_e" to the end of the list "_l"
+*/
+#define CMT_APPEND_LINK(_e,_l) CMT_INSERT_BEFORE(_e,_l)
+
+/*
+** Insert an element "_e" at the head of the list "_l"
+*/
+#define CMT_INSERT_LINK(_e,_l) CMT_INSERT_AFTER(_e,_l)
+
+/* Return the head/tail of the list */
+#define CMT_LIST_HEAD(_l) (_l)->next
+#define CMT_LIST_TAIL(_l) (_l)->prev
+
+/*
+** Remove the element "_e" from it's circular list.
+*/
+#define CMT_REMOVE_LINK(_e)	       \
+	(_e)->prev->next = (_e)->next; \
+	(_e)->next->prev = (_e)->prev; \
+
+/*
+** Remove the element "_e" from it's circular list. Also initializes the
+** linkage.
+*/
+#define CMT_REMOVE_AND_INIT_LINK(_e)    \
+	(_e)->prev->next = (_e)->next; \
+	(_e)->next->prev = (_e)->prev; \
+	(_e)->next = (_e);	       \
+	(_e)->prev = (_e);	       \
+
+/*
+** Return non-zero if the given circular list "_l" is empty, zero if the
+** circular list is not empty
+*/
+#define CMT_CLIST_IS_EMPTY(_l) \
+    ((_l)->next == (_l))
+
+/*
+** Initialize a circular list
+*/
+#define CMT_INIT_CLIST(_l)  \
+	(_l)->next = (_l); \
+	(_l)->prev = (_l); \
+
+#define CMT_INIT_STATIC_CLIST(_l) \
+    {(_l), (_l)}
+
+#endif /* cmtclist_h___ */

mozilla/security/psm/lib/client/cmtevent.c

@@ -0,0 +1,480 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* 
+ * 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 security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1994-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.
+ */
+#include "cmtcmn.h"
+#include "cmtutils.h"
+#include "messages.h"
+#include <string.h>
+#ifdef XP_UNIX
+#include <sys/time.h>
+#endif
+
+/* Typedefs */
+typedef void (*taskcompleted_handler_fn)(CMUint32 resourceID, CMUint32 numReqProcessed, CMUint32 resultCode, void* data);
+
+CMTStatus CMT_SetUIHandlerCallback(PCMT_CONTROL control, 
+                                   uiHandlerCallback_fn f, void *data)
+{
+    return CMT_RegisterEventHandler(control, SSM_UI_EVENT, 0,
+                                    (void_fun)f, data);
+}
+
+void CMT_SetFilePathPromptCallback(PCMT_CONTROL control,
+                                   filePathPromptCallback_fn f, void* arg)
+{
+    control->userFuncs.promptFilePath = f;
+    control->userFuncs.filePromptArg  = arg;
+}
+
+void CMT_SetPromptCallback(PCMT_CONTROL control, 
+                           promptCallback_fn f, void *arg)
+{
+    control->userFuncs.promptCallback = f;
+    control->userFuncs.promptArg      = arg;
+}
+
+void CMT_SetSavePrefsCallback(PCMT_CONTROL control, savePrefsCallback_fn f)
+{
+    control->userFuncs.savePrefs = f;
+}
+
+CMTStatus CMT_RegisterEventHandler(PCMT_CONTROL control, CMUint32 type, 
+                                   CMUint32 resourceID, void_fun handler, 
+                                   void* data)
+{
+    PCMT_EVENT ptr;
+
+    /* This is the first connection */
+    if (control->cmtEventHandlers == NULL) {
+        control->cmtEventHandlers = ptr = 
+            (PCMT_EVENT)calloc(sizeof(CMT_EVENT), 1);
+        if (!ptr) {
+            goto loser;
+        }
+    } else {
+        /* Look for another event handler of the same type.  Make sure the
+           event handler with a rsrcid of 0 is farther down the list so
+	   that it doesn't get chosen when there's an event handler for
+	   a specific rsrcid.
+	 */
+	for (ptr=control->cmtEventHandlers; ptr != NULL; ptr = ptr->next) {
+            if (ptr->type == type && resourceID != 0) {
+                /* So we've got an event handler that wants to over-ride
+                   an existing event handler.  We'll put it before the one
+                   that's already here.
+                 */
+                if (ptr->previous == NULL) {
+                    /* We're going to insert at the front of the list*/
+                    control->cmtEventHandlers = ptr->previous = 
+                        (PCMT_EVENT)calloc(sizeof(CMT_EVENT), 1);
+                    if (ptr->previous == NULL) {
+                        goto loser;
+		    }
+		    ptr->previous->next = ptr;
+		    ptr = control->cmtEventHandlers;
+		} else {
+		    /* We want to insert in the middle of the list */
+		    PCMT_EVENT tmpEvent;
+		    
+		    tmpEvent = (PCMT_EVENT)calloc(sizeof(CMT_EVENT), 1);
+		    if (tmpEvent == NULL) {
+		        goto loser;
+		    }
+		    tmpEvent->previous  = ptr->previous;
+		    ptr->previous->next = tmpEvent;
+		    tmpEvent->next      = ptr;
+		    ptr->previous       = tmpEvent;
+		    ptr = tmpEvent;
+		}
+		break;
+	    }
+	    if (ptr->next == NULL) break;
+	}
+	if (ptr == NULL) {
+	    goto loser;	
+	}
+	if (ptr->next == NULL) {
+	    /* We're adding the event handler at the end of the list. */
+	    ptr->next = (PCMT_EVENT)calloc(sizeof(CMT_EVENT), 1);
+	    if (!ptr->next) {
+	        goto loser;
+	    } 
+	    /* Fix up the pointers */
+	    ptr->next->previous = ptr;
+	    ptr = ptr->next;
+	}
+    }
+
+    /* Fill in the data */
+    ptr->type = type;
+    ptr->resourceID = resourceID;
+    ptr->handler = handler;
+    ptr->data = data;
+    
+    return CMTSuccess;
+ loser:
+    return CMTFailure;
+}
+
+CMTStatus CMT_UnregisterEventHandler(PCMT_CONTROL control, CMUint32 type, 
+                                     CMUint32 resourceID) 
+{
+    PCMT_EVENT ptr, pptr = NULL;
+    
+    for (ptr = control->cmtEventHandlers; ptr != NULL;
+	 pptr = ptr, ptr = ptr->next) {
+        if ((ptr->type == type) && (ptr->resourceID == resourceID)) {
+	    if (pptr == NULL) {
+	        /* node is at head */
+	        control->cmtEventHandlers = ptr->next;
+            if (control->cmtEventHandlers != NULL) {
+                control->cmtEventHandlers->previous = NULL;
+            }
+            free(ptr);
+            return CMTSuccess;
+	    }
+	    /* node is elsewhere */
+	    pptr->next = ptr->next;
+        if (ptr->next != NULL) {
+            ptr->next->previous = pptr;
+        }
+	    free(ptr);
+	    return CMTSuccess;
+        }
+    }
+    return CMTFailure;
+}
+
+PCMT_EVENT CMT_GetEventHandler(PCMT_CONTROL control, CMUint32 type, 
+                               CMUint32 resourceID)
+{
+    PCMT_EVENT ptr;
+    
+    for (ptr = control->cmtEventHandlers; ptr != NULL; ptr = ptr->next) {
+        if ((ptr->type == type) && ((ptr->resourceID == resourceID) || 
+                                    !ptr->resourceID)) {
+            return ptr;
+        }
+    }
+    return NULL;
+}
+
+PCMT_EVENT CMT_GetFirstEventHandler(PCMT_CONTROL control, CMUint32 type, 
+                                    CMUint32 resourceID)
+{
+    PCMT_EVENT ptr;
+
+    for (ptr = control->cmtEventHandlers; ptr != NULL; ptr = ptr->next) {
+        if ((ptr->type == type) && ((ptr->resourceID == resourceID) || 
+                                    !ptr->resourceID)) {
+            return ptr;
+        }
+    }
+    return NULL;
+}
+
+PCMT_EVENT CMT_GetNextEventHandler(PCMT_CONTROL control, PCMT_EVENT e)
+{
+    PCMT_EVENT ptr;
+
+    for (ptr = control->cmtEventHandlers; ptr != NULL || ptr == e; 
+         ptr = ptr->next) {
+    }
+
+    for (; ptr != NULL; ptr = ptr->next) {
+        if ((ptr->type == e->type) && ((ptr->resourceID == e->resourceID) || 
+                                       !ptr->resourceID)) {
+            return ptr;
+        }
+    }
+    return NULL;
+}
+
+void CMT_ProcessEvent(PCMT_CONTROL cm_control)
+{
+    CMTSocket sock; 
+    CMTItem eventData={ 0, NULL, 0 };
+
+    /* Get the control socket */
+    sock = cm_control->sock;
+
+    /* Acquire a lock on the control connection */
+    CMT_LOCK(cm_control->mutex);
+    /* Do another select here to be sure 
+       that the socket is readable */
+    if (cm_control->sockFuncs.select(&sock, 1, 1) != sock) {
+        /* There's no event. */
+        goto done;
+    }
+
+    /* Read the event */
+    if (CMT_ReceiveMessage(cm_control, &eventData) == CMTFailure) {
+        goto done;
+    }
+    CMT_UNLOCK(cm_control->mutex);
+    /* Dispatch the event */
+    CMT_DispatchEvent(cm_control, &eventData);
+    return;
+done:
+    /* Release the lock on the control connection */
+    CMT_UNLOCK(cm_control->mutex);
+}
+
+void CMT_EventLoop(PCMT_CONTROL cm_control)
+{
+    CMTSocket sock;
+
+    /* Get the control socket */
+    sock = cm_control->sock;
+    CMT_ReferenceControlConnection(cm_control);
+    /* Select on the control socket to see if it's readable */
+    while(cm_control->sockFuncs.select(&sock, 1, 0)) {
+      CMT_ProcessEvent(cm_control);
+    }
+    CMT_CloseControlConnection(cm_control);
+    return;
+}
+
+void
+CMT_PromptUser(PCMT_CONTROL cm_control, CMTItem *eventData)
+{
+    char *promptReply  = NULL;
+    CMTItem   response={ 0, NULL, 0 };
+    PromptRequest request;
+    PromptReply reply;
+    void * clientContext;
+
+    /* Decode the message */
+    if (CMT_DecodeMessage(PromptRequestTemplate, &request, eventData) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Copy the client context to a pointer */
+    clientContext = CMT_CopyItemToPtr(request.clientContext);
+
+    if (cm_control->userFuncs.promptCallback == NULL) {
+        goto loser;
+    }
+    promptReply = 
+        cm_control->userFuncs.promptCallback(cm_control->userFuncs.promptArg, 
+                                             request.prompt, clientContext, 1);
+
+    response.type = SSM_EVENT_MESSAGE | SSM_PROMPT_EVENT;
+    if (!promptReply) {
+        /* the user canceled the prompt or other errors occurred */
+        reply.cancel = CM_TRUE;
+    }
+    else {
+        /* note that this includes an empty string (zero length) password */
+        reply.cancel = CM_FALSE;
+    }
+    reply.resID = request.resID;
+    reply.promptReply = promptReply;
+
+    /* Encode the message */
+    if (CMT_EncodeMessage(PromptReplyTemplate, &response, &reply) != CMTSuccess) {
+        goto loser;
+    }
+
+    CMT_TransmitMessage(cm_control, &response);
+ loser:
+    if (promptReply != NULL) {
+      cm_control->userFuncs.userFree(promptReply);
+    }
+    return;
+}
+
+void CMT_GetFilePath(PCMT_CONTROL cm_control, CMTItem * eventData)
+{
+    char *fileName=NULL;
+    CMTItem response = { 0, NULL, 0 };
+    FilePathRequest request;
+    FilePathReply reply;
+
+    /* Decode the request */
+    if (CMT_DecodeMessage(FilePathRequestTemplate, &request, eventData) != CMTSuccess) {
+        goto loser;
+    }
+
+    if (cm_control->userFuncs.promptFilePath == NULL) {
+        goto loser;
+    }
+    fileName = 
+     cm_control->userFuncs.promptFilePath(cm_control->userFuncs.filePromptArg,
+                                          request.prompt, request.fileRegEx, 
+                                          request.getExistingFile);
+
+    response.type = SSM_EVENT_MESSAGE | SSM_FILE_PATH_EVENT;
+    reply.resID = request.resID;
+    reply.filePath = fileName;
+
+    /* Encode the reply */
+    if (CMT_EncodeMessage(FilePathReplyTemplate, &response, &reply) != CMTSuccess) {
+        goto loser;
+    }
+
+    CMT_TransmitMessage(cm_control, &response);
+    cm_control->userFuncs.userFree(fileName); 
+loser:
+   return;
+}
+
+void CMT_SavePrefs(PCMT_CONTROL cm_control, CMTItem* eventData)
+{
+    SetPrefListMessage request;
+    int i;
+
+    /* decode the request */
+    if (CMT_DecodeMessage(SetPrefListMessageTemplate, &request, eventData) !=
+        CMTSuccess) {
+        return;
+    }
+
+    if (cm_control->userFuncs.savePrefs == NULL) {
+        /* callback was not registered: bail */
+        return;
+    }
+    cm_control->userFuncs.savePrefs(request.length, 
+                                    (CMTSetPrefElement*)request.list);
+
+    for (i = 0; i < request.length; i++) {
+        if (request.list[i].key != NULL) {
+            free(request.list[i].key);
+        }
+        if (request.list[i].value != NULL) {
+            free(request.list[i].value);
+        }
+    }
+    return;
+}
+
+void CMT_DispatchEvent(PCMT_CONTROL cm_control, CMTItem * eventData)
+{
+    CMUint32 eventType;
+    CMTItem msgCopy;
+
+    /* Init the msgCopy */
+    msgCopy.data = 0;    
+
+    /* Get the event type */
+    if ((eventData->type & SSM_CATEGORY_MASK) != SSM_EVENT_MESSAGE) {
+        /* Somehow there was a message on the socket that was not 
+         * an event message.  Dropping it on the floor.
+         */
+        goto loser;
+    }
+    eventType = (eventData->type & SSM_TYPE_MASK);
+
+    /* We must now dispatch the event based on it's type */
+    switch (eventType) {
+        case SSM_UI_EVENT:
+        {
+            PCMT_EVENT p;
+            UIEvent event;
+            void * clientContext = NULL;
+
+	    /* Copy the message to allow a second try with the old format */
+	    msgCopy.len = eventData->len;
+	    msgCopy.data = calloc(msgCopy.len, 1);
+	    if (msgCopy.data) {
+              memcpy(msgCopy.data, eventData->data, eventData->len);
+	    }
+
+            /* Get the event data first */
+            if (CMT_DecodeMessage(UIEventTemplate, &event, eventData) != CMTSuccess) {
+		/* Attempt to decode using the old format.  Modal is True */
+		if (!msgCopy.data || 
+		    CMT_DecodeMessage(OldUIEventTemplate, &event, &msgCopy) != CMTSuccess) {
+                  goto loser;
+                }
+
+                /* Set default modal value */
+                event.isModal = CM_TRUE;
+            }
+
+            /* Convert the client context to a pointer */
+            clientContext = CMT_CopyItemToPtr(event.clientContext);
+
+            /* Call any handlers for this event */
+            p = CMT_GetEventHandler(cm_control, eventType, event.resourceID);
+            if (!p) {
+                goto loser;
+            }
+            (*(uiHandlerCallback_fn)(p->handler))(event.resourceID, 
+                                                  clientContext, event.width,
+                                                  event.height, event.isModal, event.url, 
+                                                  p->data);
+            break;
+        }
+
+        case SSM_TASK_COMPLETED_EVENT:
+        {
+           PCMT_EVENT p;
+           TaskCompletedEvent event;
+
+            /* Get the event data */
+            if (CMT_DecodeMessage(TaskCompletedEventTemplate, &event, eventData) != CMTSuccess) {
+                goto loser;
+            }
+
+            /* Call handler for this event */
+            p = CMT_GetEventHandler(cm_control, eventType, event.resourceID);
+            if (!p) {
+                goto loser;
+            }
+            (*(taskcompleted_handler_fn)(p->handler))(event.resourceID, 
+                                                      event.numTasks, 
+                                                      event.result, p->data);
+            break;
+        }
+        case SSM_AUTH_EVENT: 
+             CMT_ServicePasswordRequest(cm_control, eventData);
+             break;
+        case SSM_FILE_PATH_EVENT:
+    	     CMT_GetFilePath(cm_control, eventData);
+             break;
+        case SSM_PROMPT_EVENT:
+	         CMT_PromptUser(cm_control, eventData);
+	         break;
+        case SSM_SAVE_PREF_EVENT:
+            CMT_SavePrefs(cm_control, eventData);
+            break;
+        default:
+            break;
+    }
+loser:
+    free(eventData->data);
+    free(msgCopy.data);
+    return;
+}
+

mozilla/security/psm/lib/client/cmthash.c

@@ -0,0 +1,216 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* 
+ * 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 security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1994-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.
+ */
+#if defined(XP_UNIX) || defined(XP_BEOS) || defined(XP_OS2)
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#else
+#ifdef XP_MAC
+#include "macsocket.h"
+#include "string.h"
+#else
+#include <windows.h>
+#include <winsock.h>
+#endif
+#endif
+#include <errno.h>
+#include "cmtcmn.h"
+#include "cmtutils.h"
+#include "messages.h"
+#include "rsrcids.h"
+
+CMTStatus CMT_HashCreate(PCMT_CONTROL control, CMUint32 algID, 
+                         CMUint32 * connID)
+{
+    CMTItem message;
+    SingleNumMessage request;
+    DataConnectionReply reply;
+
+    /* Check passed in parameters */
+    if (!control) {
+        goto loser;
+    }
+
+    /* Set up the request */
+    request.value = algID;
+
+    /* Encode the request */
+    if (CMT_EncodeMessage(SingleNumMessageTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_DATA_CONNECTION | SSM_HASH_STREAM;
+
+    /* Send the message and get the response */
+    if (CMT_SendMessage(control, &message) == CMTFailure) {
+        goto loser;
+    }
+
+    /* Validate the response */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_DATA_CONNECTION | SSM_HASH_STREAM)) {
+        goto loser;
+    }
+
+    /* Decode the reply */
+    if (CMT_DecodeMessage(DataConnectionReplyTemplate, &reply, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Success */
+    if (reply.result == 0) {
+        CMTSocket sock;
+
+        sock = control->sockFuncs.socket(0);
+        if(sock == NULL) {
+            goto loser;
+        }
+        
+        if (control->sockFuncs.connect(sock, reply.port, NULL) != CMTSuccess) {
+            goto loser;
+        }
+        /* Send the hello message */
+		control->sockFuncs.send(sock, control->nonce.data, control->nonce.len);
+
+        /* Save connection info */
+        if (CMT_AddDataConnection(control, sock, reply.connID)
+		    != CMTSuccess) {
+            goto loser;
+        }
+
+        /* Set the connection ID */
+        *connID = reply.connID;
+        return CMTSuccess;
+	} 
+loser:
+    *connID = 0;
+	return CMTFailure;
+}
+
+CMTStatus CMT_HASH_Destroy(PCMT_CONTROL control, CMUint32 connectionID)
+{
+    if (!control) {
+        goto loser;
+    }
+
+    /* Get the cotext implementation data */
+    if (CMT_CloseDataConnection(control, connectionID) == CMTFailure) {
+        goto loser;
+    }
+
+    return CMTSuccess;
+
+loser:
+
+    return CMTFailure;
+}
+
+CMTStatus CMT_HASH_Begin(PCMT_CONTROL control, CMUint32 connectionID)
+{
+    return CMTSuccess;
+}
+
+CMTStatus CMT_HASH_Update(PCMT_CONTROL control, CMUint32 connectionID, const unsigned char * buf, CMUint32 len)
+{
+    CMTSocket sock;
+    CMUint32 sent;
+
+    /* Do some parameter checking */
+    if (!control || !buf) {
+        goto loser;
+    }
+
+    /* Get the data socket */
+    if (CMT_GetDataSocket(control, connectionID, &sock) == CMTFailure) {
+        goto loser;
+    }
+
+    /* Write the data to the socket */
+    sent = CMT_WriteThisMany(control, sock, (void*)buf, len);
+    if (sent != len) {
+        goto loser;
+    }
+
+    return CMTSuccess;
+
+loser:
+
+    return CMTFailure;
+}
+
+CMTStatus CMT_HASH_End(PCMT_CONTROL control, CMUint32 connectionID, 
+                       unsigned char * result, CMUint32 * resultlen, 
+                       CMUint32 maxLen)
+{
+    CMTItem hash = { 0, NULL, 0 };
+
+    /* Do some parameter checking */
+    if (!control || !result || !resultlen) {
+        goto loser;
+    }
+
+    /* Close the connection */
+    if (CMT_CloseDataConnection(control, connectionID) == CMTFailure) {
+        goto loser;
+    }
+
+    /* Get the context info */
+    if (CMT_GetStringAttribute(control, connectionID, SSM_FID_HASHCONN_RESULT,
+                               &hash) == CMTFailure) {
+        goto loser;
+    }
+    if (!hash.data) {
+        goto loser;
+    }
+
+    *resultlen = hash.len;
+    if (hash.len > maxLen) {
+        memcpy(result, hash.data, maxLen);
+    } else {
+        memcpy(result, hash.data, hash.len);
+    }   
+
+    if (hash.data) {
+        free(hash.data);
+    }
+
+    return CMTSuccess;
+
+loser:
+    if (hash.data) {
+        free(hash.data);
+    }
+
+    return CMTFailure;
+}

mozilla/security/psm/lib/client/cmtimpl.h

@@ -0,0 +1,56 @@
+/* 
+ * 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 security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1994-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.
+ */
+#ifndef __CMTIMPL_H_
+#define __CMTIMPL_H_
+
+typedef unsigned long CMT_HANDLE;
+
+struct _CMTControl {
+  CMT_HANDLE channelID;
+  int socketID;
+  CMTStatus (* cmtEventCallback)(struct _CMTControl * control, 
+				 CMTItem * event,  void * arg);
+  void * cmtEventCallbackArg;
+  struct _CMTData * cmtDataConnection;
+} _CMTControl;
+
+
+
+struct _CMTData {
+  CMT_HANDLE channelID;
+  int socketID;
+  struct _CMTData * next;
+  struct _CMTData * previous;
+};
+
+#endif /*__CMTIMPL_H_*/

mozilla/security/psm/lib/client/cmtinit.c

@@ -0,0 +1,490 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* 
+ * 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 security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1994-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.
+ */
+#if defined(XP_UNIX) || defined(XP_BEOS) || defined(XP_OS2)
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <sys/stat.h>
+#ifndef XP_BEOS
+#include <netinet/tcp.h>
+#endif
+#else
+#ifdef XP_MAC
+#include <Events.h> // for WaitNextEvent
+#else /* Windows */
+#include <windows.h>
+#include <winsock.h>
+#include <direct.h>
+#include <sys/stat.h>
+#endif
+#endif
+
+#include "messages.h"
+#include "cmtcmn.h"
+#include "cmtutils.h"
+#include <string.h>
+
+#if defined(XP_UNIX) || defined(XP_BEOS)
+#define DIRECTORY_SEPARATOR '/'
+#elif defined(WIN32) || defined(XP_OS2)
+#define DIRECTORY_SEPARATOR '\\'
+#elif defined XP_MAC
+#define DIRECTORY_SEPARATOR ':'
+#endif
+
+/* Local defines */
+#define CARTMAN_PORT	11111
+#define MAX_PATH_LEN    256
+
+/* write to the cmnav.log */
+#if 0
+#define LOG(x); do { FILE *f; f=fopen("cmnav.log","a+"); if (f) { \
+   fprintf(f, x); fclose(f); } } while(0);
+#define LOG_S(x); do { FILE *f; f=fopen("cmnav.log","a+"); if (f) { \
+   fprintf(f, "%s", x); fclose(f); } } while(0);
+#define ASSERT(x); if (!(x)) { LOG("ASSERT:"); LOG(#x); LOG("\n"); exit(-1); }
+#else
+#define LOG(x); ;
+#define LOG_S(x); ;
+#define ASSERT(x); ;
+#endif
+
+static char*
+getCurrWorkDir(char *buf, int maxLen)
+{
+#if defined WIN32
+    return _getcwd(buf, maxLen);
+#elif defined(XP_UNIX) || defined(XP_BEOS)
+    return getcwd(buf, maxLen);
+#else
+    return NULL;
+#endif
+}
+
+static void
+setWorkingDir(char *path)
+{
+#if defined WIN32
+    _chdir(path);
+#elif defined(XP_UNIX) || defined(XP_BEOS)
+    chdir(path);
+#else
+    return;
+#endif
+}
+
+static CMTStatus
+launch_psm(char *executable)
+{
+#ifndef XP_MAC
+    char command[MAX_PATH_LEN];
+#endif
+#ifdef WIN32
+    STARTUPINFO sui;
+    PROCESS_INFORMATION pi;
+    UNALIGNED long *posfhnd;
+    int i;
+    char *posfile;
+
+    sprintf(command,"%s > psmlog", executable);
+    ZeroMemory( &sui, sizeof(sui) );
+    sui.cb = sizeof(sui);
+    sui.cbReserved2 = (WORD)(sizeof( int ) + (3 * (sizeof( char ) + 
+                                                   sizeof( long ))));
+    sui.lpReserved2 = calloc( sui.cbReserved2, 1 );
+    *((UNALIGNED int *)(sui.lpReserved2)) = 3;
+    posfile = (char *)(sui.lpReserved2 + sizeof( int ));
+    posfhnd = (UNALIGNED long *)(sui.lpReserved2 + sizeof( int ) + 
+                                 (3 * sizeof( char )));
+    
+    for ( i = 0, posfile = (char *)(sui.lpReserved2 + sizeof( int )),
+              posfhnd = (UNALIGNED long *)(sui.lpReserved2 + sizeof( int ) + (3 * sizeof( char ))) ;
+          i < 3 ; i++, posfile++, posfhnd++ ) {
+        
+        *posfile = 0;
+        *posfhnd = (long)INVALID_HANDLE_VALUE;
+    }
+    /* Now, fire up PSM */
+    if (!CreateProcess(NULL, command, NULL, NULL, TRUE, DETACHED_PROCESS, 
+                       NULL, NULL, &sui, &pi)) {
+        goto loser;
+    }
+
+    return CMTSuccess;
+ loser:
+    return CMTFailure;
+#elif defined(XP_UNIX) || defined(XP_BEOS)
+    sprintf(command,"./%s &", executable);
+    if (system(command) == -1) {
+        goto loser;
+    }
+    return CMTSuccess;
+ loser:
+    return CMTFailure;
+#else
+    return CMTFailure;
+#endif
+}
+
+PCMT_CONTROL CMT_EstablishControlConnection(char            *inPath, 
+                                            CMT_SocketFuncs *sockFuncs,
+                                            CMT_MUTEX       *mutex)
+{
+    PCMT_CONTROL control;
+#ifndef XP_MAC
+    char *executable;
+    char *newWorkingDir;
+    char oldWorkingDir[MAX_PATH_LEN];
+    size_t stringLen;
+#endif    
+    int i;
+    char *path = NULL;
+
+    /*	On the Mac, we do special magic in the Seamonkey PSM component, so
+    	if PSM isn't launched by the time we reach this point, we're not doing well. */
+#ifndef XP_MAC
+
+    struct stat stbuf;
+    
+    /*
+     * Create our own copy of path.
+     * I'd like to do a straight strdup here, but that caused problems
+     * for https.
+     */
+    stringLen = strlen(inPath);
+
+    path = (char*) malloc(stringLen+1);
+    memcpy(path, inPath, stringLen);
+    path[stringLen] = '\0';
+
+    control = CMT_ControlConnect(mutex, sockFuncs);
+    if (control != NULL) {
+        return control;
+    }
+    /*
+     * We have to try to launch it now, so it better be a valid 
+     * path.
+     */
+    if (stat(path, &stbuf) == -1) {
+        goto loser;
+    }
+    /*
+     * Now we have to parse the path and launch the psm server.
+     */
+    executable = strrchr(path, DIRECTORY_SEPARATOR);
+    if (executable != NULL) {
+        *executable = '\0';
+        executable ++;
+        newWorkingDir = path;
+    } else {
+        executable = path;
+        newWorkingDir = NULL;
+    }
+    if (getCurrWorkDir(oldWorkingDir, MAX_PATH_LEN) == NULL) {
+        goto loser;
+    }
+    setWorkingDir(newWorkingDir);
+    if (launch_psm(executable) != CMTSuccess) {
+        goto loser;
+    }
+    setWorkingDir(oldWorkingDir);
+#endif
+
+    /*
+     * Now try to connect to the psm server.  We will try to connect
+     * a maximum of 30 times and then give up.
+     */
+#ifdef WIN32
+    for (i=0; i<30; i++) {
+        Sleep(1000);
+        control = CMT_ControlConnect(mutex, sockFuncs);
+        if (control != NULL) {
+            break;
+        }
+    }
+#elif defined(XP_UNIX) || defined(XP_BEOS)
+    i = 0;
+    while (i<1000) {
+        i += sleep(10);
+	control = CMT_ControlConnect(mutex, sockFuncs);
+	if (control != NULL) {
+	  break;
+	}
+    }
+#elif defined(XP_MAC)
+	for (i=0; i<30; i++) 
+	{
+		EventRecord theEvent;
+		WaitNextEvent(0, &theEvent, 30, NULL);
+		control = CMT_ControlConnect(mutex, sockFuncs);
+		if (control != NULL) 
+			break;
+	}
+
+#else
+    /*
+     * Figure out how to sleep for a while first
+     */
+    for (i=0; i<30; i++) {
+      control = CMT_ControlConnect(mutex, sockFuncs);
+      if (control!= NULL) {
+	break;
+      }
+    }
+#endif
+    if (control == NULL) {
+        goto loser;
+    }
+    if (path) {
+        free (path);
+    }
+    return control;
+ loser:
+    if (control != NULL) {
+        CMT_CloseControlConnection(control);
+    }
+    if (path) {
+        free(path);
+    }
+    return NULL;
+}
+
+
+PCMT_CONTROL CMT_ControlConnect(CMT_MUTEX *mutex, CMT_SocketFuncs *sockFuncs)
+{
+    PCMT_CONTROL control = NULL; 
+    CMTSocket sock=NULL;
+#ifdef XP_UNIX
+    int unixSock = 1;
+    char path[20];
+#else
+    int unixSock = 0;
+    char *path=NULL;
+#endif
+
+    if (sockFuncs == NULL) {
+        return NULL;
+    }
+#ifdef XP_UNIX
+    sprintf(path, "/tmp/.nsmc-%d", (int)geteuid());
+#endif    
+
+    sock = sockFuncs->socket(unixSock);
+    if (sock == NULL) {
+        LOG("Could not create a socket to connect to Control Connection.\n");
+        goto loser;
+    }
+    /* Connect to the psm process */
+    if (sockFuncs->connect(sock, CARTMAN_PORT, path)) {
+	  LOG("Could not connect to Cartman\n");
+	  goto loser;
+    }
+
+#ifdef XP_UNIX
+    if (sockFuncs->verify(sock) != CMTSuccess) {
+        goto loser;
+    }
+#endif
+
+	LOG("Connected to Cartman\n");
+	
+	/* fill in the CMTControl struct */
+	control = (PCMT_CONTROL)calloc(sizeof(CMT_CONTROL), 1);
+	if (control == NULL ) {
+		goto loser;
+	}
+	control->sock = sock;
+    if (mutex != NULL) {
+        control->mutex = (CMT_MUTEX*)calloc(sizeof(CMT_MUTEX),1);
+        if (control->mutex == NULL) {
+            goto loser;
+        }
+        *control->mutex = *mutex;
+    }
+    memcpy(&control->sockFuncs, sockFuncs, sizeof(CMT_SocketFuncs));
+    control->refCount = 1;
+	goto done;
+    
+ loser:
+	if (control != NULL) {
+		free(control);
+    }
+    if (sock != NULL) {
+        sockFuncs->close(sock);
+    }
+	control = NULL;
+    
+ done:
+	return control;
+}
+
+CMTStatus CMT_CloseControlConnection(PCMT_CONTROL control)
+{
+	/* XXX Don't know what to do here yet */
+    if (control != NULL) {
+        CMInt32 refCount;
+        CMT_LOCK(control->mutex);
+        control->refCount--;
+        refCount = control->refCount;
+        CMT_UNLOCK(control->mutex);
+        if (refCount <= 0) {
+            if (control->mutex != NULL) {
+                free (control->mutex);
+            }
+            control->sockFuncs.close(control->sock);
+            free(control);
+        }
+    }
+    
+	return CMTSuccess;
+}
+
+CMTStatus CMT_Hello(PCMT_CONTROL control, CMUint32 version, char* profile, 
+                    char* profileDir)
+{
+	CMTItem message;
+    PCMT_EVENT eventHandler;
+    CMBool doesUI;
+    HelloRequest request;
+    HelloReply reply;
+
+	/* Check the passed parameters */
+	if (!control) {
+		return CMTFailure;
+	}
+	if (!profile) {
+		return CMTFailure;
+	}
+    if (!profileDir) {
+        return CMTFailure;
+    }
+    
+	/* Create the hello message */
+    eventHandler = CMT_GetEventHandler(control, SSM_UI_EVENT, 0);
+    doesUI = (eventHandler == NULL) ? CM_FALSE : CM_TRUE;
+
+    /* Setup the request struct */
+    request.version = version;
+    request.policy = 0; /* no more policy */
+    request.doesUI = doesUI;
+    request.profile = profile;
+    request.profileDir = profileDir;
+
+    message.type = SSM_REQUEST_MESSAGE | SSM_HELLO_MESSAGE;
+
+    if (CMT_EncodeMessage(HelloRequestTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+	/* Send the message and get the response */
+	if (CMT_SendMessage(control, &message) != CMTSuccess) {
+        goto loser;
+	}
+
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_HELLO_MESSAGE)) {
+        goto loser;
+    }
+
+    /* Decode the message */
+    if (CMT_DecodeMessage(HelloReplyTemplate, &reply, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+	/* Successful response */
+	if (reply.result == 0) {
+            /* Save the nonce value */
+            control->sessionID = reply.sessionID;
+            control->protocolVersion = reply.version;
+            control->port = reply.httpPort;
+            control->nonce = reply.nonce;
+            control->policy = reply.policy;
+            control->serverStringVersion = reply.stringVersion;
+
+            /* XXX Free the messages */
+            return CMTSuccess;
+	}
+loser:
+	/* XXX Free the messages */
+	return CMTFailure;
+}
+
+CMTStatus CMT_PassAllPrefs(PCMT_CONTROL control, int num,
+                           CMTSetPrefElement* list)
+{
+    SetPrefListMessage request;
+    SingleNumMessage reply;
+    CMTItem message;
+
+    if ((control == NULL) || (list == NULL)) {
+        return CMTFailure;
+    }
+
+    /* pack the request */
+    request.length = num;
+    request.list = (SetPrefElement*)list;
+
+    if (CMT_EncodeMessage(SetPrefListMessageTemplate, &message, &request) !=
+        CMTSuccess) {
+        goto loser;
+    }
+    message.type = SSM_REQUEST_MESSAGE | SSM_PREF_ACTION;
+
+    /* send the message */
+    if (CMT_SendMessage(control, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_PREF_ACTION)) {
+        goto loser;
+    }
+
+    if (CMT_DecodeMessage(SingleNumMessageTemplate, &reply, &message) !=
+        CMTSuccess) {
+        goto loser;
+    }
+
+    /* don't really need to check the return value */
+    return CMTSuccess;
+loser:
+    return CMTFailure;
+}
+
+char* CMT_GetServerStringVersion(PCMT_CONTROL control)
+{
+    if (control == NULL) {
+        return NULL;
+    }
+    return control->serverStringVersion;
+}

mozilla/security/psm/lib/client/cmtjs.c

@@ -0,0 +1,556 @@
+/* 
+ * 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 security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1994-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.
+ */
+#include "cmtutils.h"
+#include "cmtjs.h"
+#include "messages.h"
+
+CMTStatus
+CMT_GenerateKeyPair(PCMT_CONTROL control, CMUint32 keyGenContext, 
+		    CMUint32 mechType, CMTItem *param, CMUint32 keySize, 
+		    CMUint32 *keyPairId)
+{
+    CMTItem message;
+    CMTStatus rv;
+    KeyPairGenRequest request = {0, 0, 0, {0, NULL, 0}};
+    SingleNumMessage reply;
+
+    if (!control) {
+        return CMTFailure;
+    }
+
+    request.keyGenCtxtID = keyGenContext;
+    request.genMechanism = mechType;
+    if (param) {
+        request.params = *param;
+    }
+    request.keySize = keySize;
+
+    /* Encode the message */
+    if (CMT_EncodeMessage(KeyPairGenRequestTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    message.type = SSM_REQUEST_MESSAGE | SSM_PKCS11_ACTION | SSM_CREATE_KEY_PAIR;
+
+    /* Send the message and get the response */
+    rv = CMT_SendMessage(control, &message); 
+    if (rv != CMTSuccess) {
+        goto loser;
+    }
+
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_PKCS11_ACTION | SSM_CREATE_KEY_PAIR)) {
+        goto loser;
+    }
+
+    /* Decode the message */
+    if (CMT_DecodeMessage(SingleNumMessageTemplate, &reply, &message) != CMTSuccess) {
+        goto loser;
+    }
+    *keyPairId = reply.value;
+    return CMTSuccess;
+    
+loser:
+    *keyPairId = 0;
+    return CMTFailure;
+}
+
+
+CMTStatus
+CMT_CreateNewCRMFRequest(PCMT_CONTROL control, CMUint32 keyPairID, 
+			 SSMKeyGenType keyGenType, CMUint32 *reqID)
+{
+    CMTItem message;
+    CMTStatus rv;
+    SingleNumMessage request;
+    SingleNumMessage reply;
+    
+    if (!control) {
+        return CMTFailure;
+    }
+
+    request.value = keyPairID;
+    if (CMT_EncodeMessage(SingleNumMessageTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    message.type = SSM_REQUEST_MESSAGE | SSM_CRMF_ACTION | 
+                    SSM_CREATE_CRMF_REQ;
+    rv = CMT_SendMessage(control, &message);
+    if (rv != CMTSuccess) {
+        goto loser;
+    }
+  
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_CRMF_ACTION | SSM_CREATE_CRMF_REQ)) {
+        goto loser;
+    }
+
+    if (CMT_DecodeMessage(SingleNumMessageTemplate, &reply, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+    *reqID = reply.value;
+
+    rv = CMT_SetNumericAttribute(control, *reqID, SSM_FID_CRMFREQ_KEY_TYPE,
+				 keyGenType);
+    if (rv != CMTSuccess) {
+        goto loser;
+    }
+    return CMTSuccess;
+ loser:
+    return CMTFailure;
+}
+
+CMTStatus
+CMT_EncodeCRMFRequest(PCMT_CONTROL control, CMUint32 *crmfReqID, 
+		      CMUint32 numRequests, char ** der)
+{
+    CMTItem   message;
+    CMTStatus  rv;
+    EncodeCRMFReqRequest request;
+    SingleItemMessage reply;
+
+    if (!control) {
+        return CMTFailure;
+    }
+
+    request.numRequests = numRequests;
+    request.reqIDs = (long *) crmfReqID;
+
+    /* Encode the request */
+    if (CMT_EncodeMessage(EncodeCRMFReqRequestTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    message.type = SSM_REQUEST_MESSAGE | SSM_CRMF_ACTION | SSM_DER_ENCODE_REQ;
+
+    rv = CMT_SendMessage(control, &message);
+    if (rv != CMTSuccess) {
+        goto loser;
+    }
+
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_CRMF_ACTION | SSM_DER_ENCODE_REQ)) {
+        goto loser;
+    }
+
+    /* XXX Should this be a string? Decode the message */
+    if (CMT_DecodeMessage(SingleItemMessageTemplate, &reply, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+    *der = (char *) reply.item.data;
+    return CMTSuccess;
+loser:
+    return CMTFailure;
+}
+
+CMTStatus
+CMT_ProcessCMMFResponse(PCMT_CONTROL control, char *nickname,
+			char *certRepString, CMBool doBackup,
+			void *clientContext)
+{
+    CMTItem   message;
+    CMTStatus  rv;
+    CMMFCertResponseRequest request;
+
+    if(!control) {
+        return CMTFailure;
+    }
+
+    request.nickname = nickname;
+    request.base64Der = certRepString;
+    request.doBackup = doBackup;
+    request.clientContext = CMT_CopyPtrToItem(clientContext);
+
+    /* Encode the request */
+    if (CMT_EncodeMessage(CMMFCertResponseRequestTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    message.type =  SSM_REQUEST_MESSAGE | SSM_CRMF_ACTION | SSM_PROCESS_CMMF_RESP;
+
+    rv = CMT_SendMessage(control, &message);
+    if (rv != CMTSuccess) {
+        goto loser;
+    }
+
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_CRMF_ACTION | SSM_PROCESS_CMMF_RESP)) {
+        goto loser;
+    }
+
+    return CMTSuccess;
+loser:
+    return CMTFailure;
+}
+
+CMTStatus
+CMT_CreateResource(PCMT_CONTROL control, SSMResourceType resType,
+		   CMTItem *params, CMUint32 *rsrcId, CMUint32 *errorCode)
+{
+    CMTItem message;
+    CMTStatus rv;
+    CreateResourceRequest request = {0, {0, NULL, 0}};
+    CreateResourceReply reply;
+
+    request.type = resType;
+    if (params) {
+        request.params = *params;
+    } 
+
+    /* Encode the request */
+    if (CMT_EncodeMessage(CreateResourceRequestTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    message.type = SSM_REQUEST_MESSAGE | SSM_RESOURCE_ACTION | SSM_CREATE_RESOURCE;
+    
+    rv = CMT_SendMessage(control, &message);
+    if (rv != CMTSuccess) {
+        goto loser;
+    }
+
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_RESOURCE_ACTION | SSM_CREATE_RESOURCE)) {
+        goto loser;
+    }
+
+    /* Decode the message */
+    if (CMT_DecodeMessage(CreateResourceReplyTemplate, &reply, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+    *rsrcId = reply.resID;
+    *errorCode = reply.result;
+    return CMTSuccess;
+loser:
+    return CMTFailure;
+}
+
+CMTStatus CMT_SignText(PCMT_CONTROL control, CMUint32 resID, char* stringToSign, char* hostName, char* caOption, CMInt32 numCAs, char** caNames)
+{
+    CMTItem message;
+    SignTextRequest request;
+
+    
+    /* So some basic parameter checking */
+    if (!control || !stringToSign) {
+        goto loser;
+    }
+
+    /* Set up the request */
+    request.resID = resID;
+    request.stringToSign = stringToSign;
+    request.hostName = hostName;
+    request.caOption = caOption;
+    request.numCAs = numCAs;
+    request.caNames = caNames;
+
+    /* Encode the message */
+    if (CMT_EncodeMessage(SignTextRequestTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_FORMSIGN_ACTION | SSM_SIGN_TEXT;
+
+    /* Send the message and get the response */
+    if (CMT_SendMessage(control, &message) == CMTFailure) {
+        goto loser;
+    }
+
+    /* Validate the message reply type */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_FORMSIGN_ACTION | SSM_SIGN_TEXT)) {
+        goto loser;
+    }
+
+    return CMTSuccess;
+loser:
+    return CMTFailure;
+}
+
+CMTStatus
+CMT_ProcessChallengeResponse(PCMT_CONTROL control, char *challengeString,
+			     char **responseString)
+{
+    CMTItem   message;
+    CMTStatus  rv;
+    SingleStringMessage request;
+    SingleStringMessage reply;
+
+    /* Set the request */
+    request.string = challengeString;
+
+    /* Encode the request */
+    if (CMT_EncodeMessage(SingleStringMessageTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_CRMF_ACTION | SSM_CHALLENGE;
+
+    /* Send the message */
+    rv = CMT_SendMessage(control, &message);
+    if (rv != CMTSuccess) {
+        goto loser;
+    }
+    
+    /* Validate the message reply type */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_CRMF_ACTION | SSM_CHALLENGE)) {
+        goto loser;
+    }
+
+    /* Decode the reply */
+    if (CMT_DecodeMessage(SingleStringMessageTemplate, &reply, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+    *responseString = reply.string;
+    return CMTSuccess;
+ loser:
+    return CMTFailure;
+}
+
+CMTStatus
+CMT_FinishGeneratingKeys(PCMT_CONTROL control, CMUint32 keyGenContext)
+{
+    CMTItem message;
+    CMTStatus rv;
+    SingleNumMessage request;
+
+    /* Set up the request */
+    request.value = keyGenContext;
+
+    /* Encode the request */
+    if (CMT_EncodeMessage(SingleNumMessageTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_PKCS11_ACTION | SSM_FINISH_KEY_GEN;
+
+    /* Send the message */
+    rv = CMT_SendMessage(control, &message);
+    if (rv != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Validate the reply */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_PKCS11_ACTION | SSM_FINISH_KEY_GEN)) {
+        goto loser;
+    }
+    return CMTSuccess;
+ loser:
+    return CMTFailure;
+}
+
+CMTStatus
+CMT_GetLocalizedString(PCMT_CONTROL        control,
+                       SSMLocalizedString  whichString,
+                       char              **localizedString)
+{
+    CMTItem message;
+    CMTStatus rv;
+    SingleNumMessage request;
+    GetLocalizedTextReply reply;
+
+    /* Set up the request */
+    request.value = whichString;
+
+    /* Encode the request */
+    if (CMT_EncodeMessage(SingleNumMessageTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_LOCALIZED_TEXT;
+
+    /* Send the message */
+    rv = CMT_SendMessage(control, &message);
+    if (rv != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Validate the message reply type */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_LOCALIZED_TEXT)) {
+        goto loser;
+    }
+
+    /* Decode the reply */
+    if (CMT_DecodeMessage(GetLocalizedTextReplyTemplate, &reply, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+    if (reply.whichString != whichString) {
+        goto loser;
+    }
+    *localizedString = reply.localizedString;
+    return CMTSuccess;
+ loser:
+    *localizedString = NULL;
+    return rv; 
+}
+
+CMTStatus
+CMT_AddNewModule(PCMT_CONTROL  control,
+                 char         *moduleName,
+                 char         *libraryPath,
+                 unsigned long pubMechFlags,
+                 unsigned long pubCipherFlags)
+{
+    CMTItem message;
+    CMTStatus rv;
+    AddNewSecurityModuleRequest request;
+    SingleNumMessage reply;
+
+    /* Set up the request */
+    request.moduleName = moduleName;
+    request.libraryPath = libraryPath;
+    request.pubMechFlags = pubMechFlags;
+    request.pubCipherFlags = pubCipherFlags;
+
+    /* Encode the request */
+    if (CMT_EncodeMessage(AddNewSecurityModuleRequestTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_PKCS11_ACTION | SSM_ADD_NEW_MODULE;
+
+    /* Send the message */
+    rv = CMT_SendMessage(control, &message);
+    if (rv != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Validate the message reply type */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_PKCS11_ACTION | SSM_ADD_NEW_MODULE)) {
+        goto loser;
+    }
+
+    /* Decode the response */
+    if (CMT_DecodeMessage(SingleNumMessageTemplate, &reply, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+    return (CMTStatus) reply.value;
+ loser:
+    return CMTFailure;
+}
+
+CMTStatus
+CMT_DeleteModule(PCMT_CONTROL  control,
+                 char         *moduleName,
+                 int          *moduleType)
+{
+    CMTItem message;
+    CMTStatus rv;
+    SingleStringMessage request;
+    SingleNumMessage reply;
+
+    /* Set up the request */
+    request.string = moduleName;
+
+    /* Encode the request */
+    if (CMT_EncodeMessage(SingleStringMessageTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_PKCS11_ACTION | SSM_DEL_MODULE;
+
+    /* Send the message */
+    rv = CMT_SendMessage(control, &message);
+    if (rv != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Validate the message reply type */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_PKCS11_ACTION | SSM_DEL_MODULE)) {
+        goto loser;
+    }
+
+    /* Decode the reply */
+    if (CMT_DecodeMessage(SingleNumMessageTemplate, &reply, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+    *moduleType = reply.value;
+    return CMTSuccess;
+ loser:
+    return CMTFailure;
+}
+
+CMTStatus CMT_LogoutAllTokens(PCMT_CONTROL control)
+{
+  CMTItem message;
+  CMTStatus rv;
+
+  message.type = SSM_REQUEST_MESSAGE | SSM_PKCS11_ACTION | SSM_LOGOUT_ALL;
+  message.data = NULL;
+  message.len  = 0;
+
+  rv = CMT_SendMessage(control, &message);
+  if (rv != CMTSuccess) {
+    return rv;
+  }
+  if (message.type !=  (SSM_REPLY_OK_MESSAGE | SSM_PKCS11_ACTION | 
+			SSM_LOGOUT_ALL)) {
+    return CMTFailure;
+  }
+  return CMTSuccess;
+}
+
+CMTStatus CMT_GetSSLCapabilities(PCMT_CONTROL control, CMInt32 *capabilites)
+{
+    SingleNumMessage reply;
+    CMTItem message;
+    CMTStatus rv;
+
+    message.type = (SSM_REQUEST_MESSAGE | SSM_PKCS11_ACTION | 
+                    SSM_ENABLED_CIPHERS);
+    message.data = NULL;
+    message.len  = 0;
+
+    rv = CMT_SendMessage(control, &message);
+
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_PKCS11_ACTION |
+			 SSM_ENABLED_CIPHERS)) {
+        goto loser;
+    }
+    if (CMT_DecodeMessage(SingleNumMessageTemplate, &reply, 
+                          &message) != CMTSuccess) {
+        goto loser;
+    }
+    *capabilites = reply.value;
+    return CMTSuccess;
+ loser:
+    return CMTFailure;
+}

mozilla/security/psm/lib/client/cmtjs.h

@@ -0,0 +1,555 @@
+/* 
+ * 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 security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1994-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.
+ */
+#ifndef _CMTJS_H_
+#define _CMTJS_H_
+#include "cmtcmn.h"
+#include "ssmdefs.h"
+#include "rsrcids.h"
+/*
+ * Define some constants.
+ */
+
+/*
+ * These defines are used in conjuction with the function
+ * CMT_AddNewModule.
+ */
+#define PUBLIC_MECH_RSA_FLAG         0x00000001ul
+#define PUBLIC_MECH_DSA_FLAG         0x00000002ul
+#define PUBLIC_MECH_RC2_FLAG         0x00000004ul
+#define PUBLIC_MECH_RC4_FLAG         0x00000008ul
+#define PUBLIC_MECH_DES_FLAG         0x00000010ul
+#define PUBLIC_MECH_DH_FLAG          0x00000020ul
+#define PUBLIC_MECH_FORTEZZA_FLAG    0x00000040ul
+#define PUBLIC_MECH_RC5_FLAG         0x00000080ul
+#define PUBLIC_MECH_SHA1_FLAG        0x00000100ul
+#define PUBLIC_MECH_MD5_FLAG         0x00000200ul
+#define PUBLIC_MECH_MD2_FLAG         0x00000400ul
+ 
+#define PUBLIC_MECH_RANDOM_FLAG      0x08000000ul
+#define PUBLIC_MECH_FRIENDLY_FLAG    0x10000000ul
+#define PUBLIC_OWN_PW_DEFAULTS       0X20000000ul
+#define PUBLIC_DISABLE_FLAG          0x40000000ul
+
+
+/*
+ * This is the lone supported constant for the Cipher flag
+ * for CMT_AddNewModule
+ */
+#define PUBLIC_CIPHER_FORTEZZA_FLAG  0x00000001ul
+
+CMT_BEGIN_EXTERN_C
+
+/*
+ * FUNCTION: CMT_GenerateKeyPair
+ * -----------------------------
+ * INPUTS:
+ *    control
+ *        The Control Connection that has already established a connection
+ *        with the psm server.
+ *    keyGenContext
+ *        The Resource ID of a key gen context to use for creating the
+ *        key pair.
+ *    mechType
+ *        A PKCS11 mechanism used to generate the key pair. Valid values are:
+ *          CKM_RSA_PKCS_KEY_PAIR_GEN    0x00000000
+ *          CKM_DSA_KEY_PAIR_GEN         0x00000010
+ *        The definition of these values can be found at 
+ *        http://www.rsa.com/rsalabs/pubs/pkcs11.html
+ *        The psm module currently supports v2.01 of PKCS11
+ *    params
+ *        This parameter will be used to pass parameters to the Key Pair
+ *        generation process.  Currently this feature is not supported, so 
+ *        pass in NULL for this parameter.
+ *    keySize
+ *        The size (in bits) of the key to generate.
+ *    keyPairId
+ *        A pointer to pre-allocated memory where the function can place
+ *        the value of the resource ID of the key pair that gets created.
+ *
+ * NOTES:
+ * This function will send a message to the psm server requesting that 
+ * a public/private key pair be generated. The key gen context will queue
+ * the request. You can send as many key gen requests as you want with a
+ * given key gen context. After sending all the key gen requests, the user
+ * must call CMT_FinishGeneratingKeys so that the key gen context actually
+ * generates the keys.
+ *
+ * RETURN:
+ * A return value of CMTSuccess indicates the request for key generation
+ * was queued successfully and the corresponding resource ID can be found
+ * at *keyPairId.  Any other return value indicates an error and the value
+ * at *keyPairId should be ignored.
+ */
+CMTStatus
+CMT_GenerateKeyPair(PCMT_CONTROL control, CMUint32 keyGenContext, 
+		    CMUint32 mechType, CMTItem *params, CMUint32 keySize, 
+		    CMUint32 *keyPairId);
+
+/*
+ * FUNCTION: CMT_FinishGeneratingKeys
+ * ----------------------------------
+ * INPUTS
+ *    control
+ *        The Control Connection that has already established a connection
+ *        with the psm server.
+ *    keyGenContext
+ *        The resource ID of the key gen context which should finish 
+ *        generating its key pairs.
+ * NOTES
+ * This function will send a message to the psm server notifying the key 
+ * gen context with the resource ID of keyGenContext to finish generating
+ * all of the key gen requests it has queued up. After each key gen has 
+ * finished, the psm server will send a SSM_TASK_COMPLETED_EVENT. So in order
+ * to detect when all of the key gens are done, the user should register 
+ * an event handler.  See comments for CMT_RegisterEventHandler for information
+ * on how to successfully register event handler callbacks. You must register
+ * the event handler with keyGenContext as the target resource ID for this
+ * to work correctly.
+ *
+ * RETURN:
+ * A return value of CMTSuccess indicates the key gen context has started to
+ * generate the key pairs in its queue. Any other return value indicates an
+ * error and the key pairs will not be generated.
+ */
+CMTStatus
+CMT_FinishGeneratingKeys(PCMT_CONTROL control, CMUint32 keyGenContext);
+
+/*
+ * FUNCTION: CMT_CreateNewCRMFRequest
+ * ----------------------------------
+ * INPUTS:
+ *    control
+ *        The Control Connection that has already established a connection
+ *        with the psm server.
+ *    keyPairID
+ *        The resource ID of the key pair that should be associated with
+ *        the CRMF request created. At the time this function is called,
+ *        key pair should have already been created. 
+ *    keyGenType
+ *        An enumeration that explains how the key pair will be used.
+ *        Look at the definition of SSMKeyGenType in ssmdefs.h for valid
+ *        values and their affects on the request.
+ *    reqID
+ *        A pointer to a pre-allocatd chunk of memory where the library 
+ *        can place the resource ID of the new CRMF request.
+ * NOTES:
+ * This function sends a message to the psm server requesting that a new 
+ * CRMF resource object be created. Each CRMF request must be associated with 
+ * a public/private key pair, that is why the keyPairID parameter exists.
+ * The keyGenType parameter is used to initialize the request, eg set the
+ * correct keyUsage extension.
+ * 
+ * Before encoding a CRMF request, the user will want to set the appropriate
+ * attributes to build up the request. The supported attributes are:
+ *
+ * Attribute Enumeration          Attribute Type       What value means
+ * ---------------------          --------------       ----------------
+ * SSM_FID_CRMFREQ_REGTOKEN       String               The value to encode as 
+ *                                                     the registration token
+ *                                                     value for the request.
+ *
+ * SSM_FID_CRMFREQ_AUTHENTICATOR String                The value to encode as
+ *                                                     authenticator control
+ *                                                     in the request.
+ * 
+ * SSM_FID_DN                    String                The RFC1485 formatted
+ *                                                     DN to include in the
+ *                                                     CRMF request.
+ *
+ * For information on how to properly set the attribute of a resource, refer
+ * to the comments for the functions CMT_SetNumericAttribute and 
+ * CMT_SetStringAttribute.
+ *
+ * RETURN:
+ * A return value of CMTSuccess indicates a new CRMF resource was created by
+ * the psm server and has the resource ID placed at *reqID. Any other return
+ * value indicates an error and the value at *reqID should be ignored.
+ */
+CMTStatus
+CMT_CreateNewCRMFRequest(PCMT_CONTROL control, CMUint32 keyPairID, 
+			 SSMKeyGenType keyGenType, CMUint32 *reqID);
+
+/*
+ * FUNCTION: CMT_EncodeCRMFRequest
+ * ------------------------------
+ * INPUTS:
+ *    control
+ *        The Control Connection that has already established a connection
+ *        with the psm server.
+ *    crmfReqID
+ *        An array of resource ID's for CRMF objects to be encoded.
+ *    numRequests
+ *        The length of the array crmfReqID that is passed in.
+ *    der
+ *        A pointer to a pre-allocated pointer for a char* where the library
+ *        can place the final DER-encoding of the requests.
+ * NOTES
+ * This function will send a message to the psm server requesting that 
+ * a number of CRMF requests be encoded into their appropriate DER 
+ * representation. The DER that is sent back will be of the type 
+ * CertReqMessages as define in the internet draft for CRMF. To look at the
+ * draft, visit the following URL: 
+ * http://search.ietf.org/internet-drafts/internet-draft-ietf-pkix-crmf-01.txt
+ *
+ * RETURN:
+ * A return value of CMTSuccess indicates psm successfully encoded the requests
+ * and placed the base64 DER encoded request at *der. Any other return value
+ * indicates an error and the value at *der should be ignored.
+ */
+CMTStatus
+CMT_EncodeCRMFRequest(PCMT_CONTROL control, CMUint32 *crmfReqID, 
+		      CMUint32 numRequests, char ** der);
+
+/*
+ * FUNCTION: CMT_ProcessCMMFResponse
+ * ---------------------------------
+ * INPUTS:
+ *    control
+ *        The Control Connection that has already established a connection
+ *        with the psm server.
+ *    nickname
+ *        The nickname that should be associated with the certificate 
+ *        contained in the CMMF Response.
+ *    certRepString
+ *        This is the base 64 encoded CertRepContent that issues a certificate.
+ *        The psm server will decode the base 64 data and then parse the
+ *        CertRepContent.
+ *    doBackup
+ *        A boolean value indicating whether or not psm should initiate the
+ *        process of backing up the newly issued certificate into a PKCS-12
+ *        file.
+ *    clientContext
+ *         Client supplied data pointer that is returned to the client during
+ *         a UI event.
+ * NOTES:
+ * This function takes a CertRepContent as defined in the CMMF internet draft
+ * (http://search.ietf.org/internet-drafts/draft-ietf-pkix-cmmf-02.txt) and
+ * imports the certificate into the user's database. The certificate will have
+ * the string value of nickanme as it's nickname when added to the database
+ * unless another certificate with that same Distinguished Name (DN) already
+ * exists in the database, in which case the nickname of the certificate that
+ * already exists will be used. If the value passed in for doBackup is 
+ * non-zero, then the psm server will initiate the process of backing up the
+ * certificate(s) that were just imported.
+ *
+ * RETURN:
+ * A return value of CMTSuccess indicates the certificate(s) were successfully
+ * added to the database. Any other return value means the certificate(s) could
+ * not be successfully added to the database.
+ */
+CMTStatus
+CMT_ProcessCMMFResponse(PCMT_CONTROL control, char *nickname, 
+			char *certRepString, CMBool doBackup,
+			void *clientContext);
+
+/*
+ * FUNCTION: CMT_CreateResource
+ * ----------------------------
+ * INPUTS:
+ *    control
+ *        The Control Connection that has already established a connection
+ *        with the psm server.
+ *    resType
+ *        The enumeration representing the resource type to create.
+ *    params
+ *        A resource dependent binary string that will be sent to the psm 
+ *        server. Each resource will expect a binary string it defines.
+ *    rsrcId
+ *        A pointer to a pre-allocated chunk of memory where the library
+ *        can place the resource ID of the newly created resource.
+ *    errorCode
+ *        A pointer to a pre-allocated chunk of memory where the library
+ *        can place the errorCode returned by the psm server after creating
+ *        the resource.
+ * NOTES:
+ * This function sends a message to the psm server requesting that a new 
+ * resource be created.  The params parameter depends on the type of resource
+ * being created.  Below is a table detailing the format of the params for 
+ * a given resource type. Only the resource types listed below can be created
+ * by calling this function.
+ *
+ * Resource Type constant                  Value for params
+ * ------------------------------          ----------------
+ * SSM_RESTYPE_KEYGEN_CONTEXT              NULL
+ * SSM_RESTYPE_SECADVISOR_CONTEXT          NULL
+ * SSM_RESTYPE_SIGNTEXT                    NULL
+ *
+ * RETURN
+ * A return value of CMTSuccess means the psm server received the request and
+ * processed the create resource create. If the value at *errorCode is zero,
+ * then the value at *rsrcId is the resource ID of the newly created resource.
+ * Otherwise, creating the new resource failed and *errorCode contains the
+ * error code returned by the psm server. ???What are the return values and
+ * what do they mean. Any other return value indicates there was an error 
+ * in the communication with the psm server and the values at *rsrcId and 
+ * *errorCode should be ignored.
+ */
+CMTStatus
+CMT_CreateResource(PCMT_CONTROL control, SSMResourceType resType,
+		   CMTItem *params, CMUint32 *rsrcId, CMUint32 *errorCode);
+
+/*
+ * FUNCTION: CMT_SignText
+ * ----------------------
+ * INPUTS:
+ *    control
+ *        The Control Connection that has already established a connection
+ *        with the psm server.
+ *    resID
+ *        The resource ID of an SSMSignTextResource.
+ *    stringToSign
+ *        The string that the psm server should sign.
+ *    hostName
+ *        The host name of the site that is requesting a string to be
+ *        signed.  This is used for displaying the UI that tells the user
+ *        a web site has requested the use sign some text.
+ *    caOption
+ *        If the value is "auto" then psm will select the certificate
+ *        to use for signing automatically.
+ *        If the value is "ask" then psm will display a list of 
+ *        certificates for signing.
+ *    numCAs
+ *        The number of CA names included in the array caNames passed in as
+ *        the last parameter to this function.
+ *    caNames
+ *        An array of CA Names to use for filtering the user certs to use
+ *        for signing the text.
+ * NOTES
+ * This function will sign the text passed via the parameter stringToSign.
+ * The function will also cause the psm server to send some UI notifying the
+ * user that a site has requested the user sign some text.  The hostName 
+ * parameter is used in the UI to inform the user which site is requesting
+ * the signed text.  The caOption is used to determine if the psm server 
+ * should automatically select which personal cert to use in signing the
+ * text.  The caNames array is ussed to narrow down the field of personal
+ * certs to use when signing the text. In other words, only personal certs 
+ * trusted by the CA's passed in will be used.
+ *
+ * RETURN
+ * If the function returns CMTSuccess, that indicates the psm server 
+ * successfully signed the text.  The signed text can be retrieved by 
+ * calling CMT_GetStringResource and passing in SSM_FID_SIGNTEXT_RESULT
+ * as the field ID. Any other return value indicates an error meaning the
+ * string was not signed successfully.
+ */
+CMTStatus
+CMT_SignText(PCMT_CONTROL control, CMUint32 resID, char* stringToSign,
+             char* hostName, char *caOption, CMInt32 numCAs, char** caNames);
+
+/*
+ * FUNCTION: CMT_ProcessChallengeResponse
+ * --------------------------------------
+ * INPUTS:
+ *    control
+ *        The Control Connection that has already established a connection
+ *        with the psm server.
+ *    challengeString
+ *        The base64 encoded Challenge string received as the 
+ *        Proof-Of-Possession Challenge in response to CRMF request that
+ *        specified Challenge-Reponse as the method for Proof-Of-Possession.
+ *    responseString
+ *        A pointer to pre-allocated char* where the library can place a
+ *        copy of the bas64 encoded response to the challenge presented.
+ * NOTES
+ * This function takes the a challenge--that is encrypted with the public key
+ * of a certificate we created--and decrypts it with the private key we 
+ * generated.  The format of the challenge is as follows:
+ *
+ * Challenge ::= SEQUENCE { 
+ *      owf                 AlgorithmIdentifier  OPTIONAL, 
+ *      -- MUST be present in the first Challenge; MAY be omitted in any 
+ *      -- subsequent Challenge in POPODecKeyChallContent (if omitted, 
+ *      -- then the owf used in the immediately preceding Challenge is 
+ *      -- to be used). 
+ *      witness             OCTET STRING, 
+ *      -- the result of applying the one-way function (owf) to a 
+ *      -- randomly-generated INTEGER, A.  [Note that a different 
+ *      -- INTEGER MUST be used for each Challenge.] 
+ *      sender              GeneralName, 
+ *      -- the name of the sender. 
+ *      key                 OCTET STRING, 
+ *      -- the public key used to encrypt the challenge.  This will allow 
+ *      -- the client to find the appropriate key to do the decryption. 
+ *      challenge           OCTET STRING 
+ *      -- the encryption (under the public key for which the cert. 
+ *      -- request is being made) of Rand, where Rand is specified as 
+ *      --   Rand ::= SEQUENCE { 
+ *      --      int      INTEGER, 
+ *      --       - the randomly-generated INTEGER A (above) 
+ *      --      senderHash  OCTET STRING 
+ *      --       - the result of applying the one-way function (owf) to 
+ *      --       - the sender's general name 
+ *      --   } 
+ *      -- the size of "int" must be small enough such that "Rand" can be 
+ *      -- contained within a single PKCS #1 encryption block. 
+ *  } 
+ * This challenge is based on the Challenge initially defined in the CMMF
+ * internet draft, but differs in that this structure includes the sender
+ * as part of the challenge along with the public key and includes a has
+ * of the sender in the encrypted Rand structure.  The reason for including
+ * the key is to facilitate looking up the key that should be used to 
+ * decipher the challenge.  Including the hash of the sender in the encrypted
+ * Rand structure makes the challenge smaller and allows it to fit in 
+ * one RSA block. 
+ *
+ * The response is of the type POPODecKeyRespContent as defined in the CMMF
+ * internet draft.
+ *
+ * RETURN
+ * A return value of CMTSuccess indicates psm successfully parsed and processed
+ * the challenge and created a response.  The base64 encoded response to the
+ * challenge is placed at *responseString.  Any other return value indicates
+ * an error and the value at *responseString should be ignored.
+ */
+CMTStatus
+CMT_ProcessChallengeResponse(PCMT_CONTROL control, char *challengeString,
+			     char **responseString);
+
+/*
+ * FUNCTION: CMT_GetLocalizedString
+ * --------------------------------
+ * INPUTS:
+ *    control
+ *        The Control Connection that has already established a connection
+ *        with the psm server.
+ *    whichString
+ *        The enumerated value corresponding to the localized string to 
+ *        retrieve from the psm server
+ *    localizedString
+ *        A pointer to a pre-allocated char* where the library can place 
+ *        copy of the localized string retrieved from the psm server.
+ * NOTES
+ * This function retrieves a localized string from the psm server.  These 
+ * strings are useful for strings that aren't localized in the client 
+ * making use of the psm server, but need to be displayed by the user. Look
+ * in protocol.h for the enumerations of the localized strings that can 
+ * be fetched from psm via this method.
+ *
+ * RETURN
+ * A return value of CMTSuccess indicates the localized string was retrieved
+ * successfully and the localized value is located at *localizedString.  Any
+ * other return value indicates an error and the value at *localizedString
+ * should be ignored.
+ */
+CMTStatus 
+CMT_GetLocalizedString(PCMT_CONTROL        control, 
+                       SSMLocalizedString  whichString,
+                       char              **localizedString); 
+
+/*
+ * FUNCTION: CMT_DeleteModule
+ * --------------------------
+ * INPUTS:
+ *    control
+ *        The Control Connection that has already established a connection
+ *        with the psm server.
+ *    moduleName
+ *        The name of the PKCS11 module to delete.
+ *    moduleType
+ *        A pointer to a pre-allocated integer where the library can place
+ *        a value that tells what the type of module was deleted.
+ * NOTES
+ * This function will send a message to the psm server requesting the server 
+ * delete a PKCS-11 module stored in psm's security module database. moduleName
+ * is the value passed in as moduleName when the module was added to the 
+ * security module database of psm.
+ * The values that may be returned by psm for moduleType are:
+ *
+ *    0      The module was an external module developped by a third party
+ *           that was added to the psm security module.
+ *
+ *    1      The module deleted was the internal PKCS-11 module that comes
+ *           built in with the psm server.
+ *
+ *    2      The module that was deleted was the FIPS  internal module.
+ *
+ * RETURN
+ * A return value of CMTSuccess indicates the security module was successfully
+ * delete from the psm security module database and the value at *moduleType
+ * will tell what type of module was deleted.
+ * Any other return value indicates an error and the value at *moduleType 
+ * should be ignored.
+ */
+CMTStatus
+CMT_DeleteModule(PCMT_CONTROL  control,
+                 char         *moduleName,
+                 int          *moduleType);
+
+
+/*
+ * FUNCTION: CMT_AddNewModule
+ * --------------------------
+ * INPUTS:
+ *    control
+ *        The Control Connection that has already established a connection
+ *        with the psm server.
+ *    moduleName
+ *        The name to be associated with the module once it is added to 
+ *        the psm security module database.
+ *    libraryPath
+ *        The path to the library to be  loaded.  The library should be 
+ *        loadable at run-time.
+ *    pubMechFlags
+ *        A bit vector indicating all cryptographic mechanisms that should
+ *        be turned on by default.  This module will become the default 
+ *        handler for the mechanisms that are set by this bit vector.
+ *    pubCipherFlags
+ *        A bit vector indicating all SSL or S/MIME cipher functions
+ *        supported by the module. Most modules will pas in 0x0 for this
+ *        parameter.
+ * NOTES:
+ * This function sends a message to the psm server and requests the .so
+ * file on UNIX or .dll file on Windows be loaded as a PKCS11 module and 
+ * be stored in the psm security module database.  The module will be stored
+ * with the name moduleName that is passed in and will always expect the 
+ * library to live at the path passed in via the parameter libraryPath.
+ * The pubMechFlags tell the psm server how this module should be used.
+ * Valid values are the #define constants defined at the beginning of
+ * this file.
+ * 
+ * RETURN
+ * A return value of CMTSuccess indicates the module was successfully loaded
+ * and placed in the security module database of psm.  Any other return value
+ * indicates an error and means the module was not loaded successfully and
+ * not stored in the psm server's security module database.
+ */
+CMTStatus
+CMT_AddNewModule(PCMT_CONTROL  control,
+                 char         *moduleName,
+                 char         *libraryPath,
+                 unsigned long pubMechFlags,
+                 unsigned long pubCipherFlags);
+
+CMT_END_EXTERN_C
+
+#endif /*_CMTJS_H_*/

mozilla/security/psm/lib/client/cmtmac.c

@@ -0,0 +1,75 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* 
+ * 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 security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1994-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.
+ */
+
+#include "cmtmac.h"
+#include "macsocket.h"
+#include "stdlib.h"
+
+#ifndef XP_MAC
+#error Link with the builtin strdup() on your platform.
+#endif
+
+
+static void 
+my_strcpy(char *dest, const char *source)
+{
+	char *i = dest;
+	const char *j = source;
+	while(*j)
+		*i++ = *j++;
+	*i = '\0';
+}
+
+static int
+my_strlen(const char *str)
+{
+	const char *c = str;
+	int i = 0;
+	
+	while(*c++ != '\0')
+		i++;
+	return i;
+}
+
+char * strdup(const char *oldstr)
+{
+	/* used to keep the mac client library from referring to strdup elsewhere */
+	char *newstr;
+	
+	newstr = (char *) malloc(my_strlen(oldstr)+1);
+	if (newstr)
+		my_strcpy(newstr, oldstr);
+	return newstr;
+}
+

mozilla/security/psm/lib/client/cmtmac.h

@@ -0,0 +1,40 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* 
+ * 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 security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1994-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.
+ */
+
+#ifndef __CMTMAC_H__
+#define __CMTMAC_H__
+
+char * strdup(const char *str);
+
+#endif

mozilla/security/psm/lib/client/cmtpasswd.c

@@ -0,0 +1,119 @@
+/* 
+ * 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 security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1994-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.
+ */
+/************************************************************************
+ * Code to handle password requests from the the PSM module.
+ * 
+ ************************************************************************
+ */
+
+#include "cmtcmn.h"
+#include "cmtutils.h"
+#include "messages.h"
+
+void CMT_SetAppFreeCallback(PCMT_CONTROL control, 
+			    applicationFreeCallback_fn f)
+{
+  control->userFuncs.userFree = f;
+}
+    
+void CMT_ServicePasswordRequest(PCMT_CONTROL cm_control, CMTItem * requestData)
+{ 
+  CMTItem response = {0, NULL, 0};
+  PasswordRequest request;
+  PasswordReply reply;
+  void * clientContext;
+
+  /********************************************
+   *  What we trying to do here: 
+   *  1) Throw up a dialog box and request a password.
+   *  2) Create a message and send it to the PSM module.
+   ********************************************
+   */
+  
+  /* Decode the request */
+  if (CMT_DecodeMessage(PasswordRequestTemplate, &request, requestData) != CMTSuccess) {
+      goto loser;
+  }
+
+  /* Copy the client context to a pointer */
+  clientContext = CMT_CopyItemToPtr(request.clientContext);
+
+  if (cm_control->userFuncs.promptCallback == NULL) {
+      goto loser;
+  }
+  reply.passwd = 
+    cm_control->userFuncs.promptCallback(cm_control->userFuncs.promptArg, 
+					 request.prompt, clientContext, 1);
+  reply.tokenID = request.tokenKey;
+  if (!reply.passwd) {
+      /* the user cancelled the prompt or other errors occurred */
+      reply.result = -1;
+  }
+  else {
+      /* note that this includes an empty string (zero length password) */
+      reply.result = 0;
+  }
+
+  /* Encode the reply */
+  if (CMT_EncodeMessage(PasswordReplyTemplate, &response, &reply) != CMTSuccess) {
+      goto loser;
+  }
+
+  /* Set the message response type */
+  response.type = SSM_EVENT_MESSAGE | SSM_AUTH_EVENT;
+  CMT_TransmitMessage(cm_control, &response);
+  goto done;
+loser:
+  /* something has gone wrong */
+
+done:
+  /*clean up anyway */
+  /* We can't just free up memory allocated by the host
+     application because the versions of free may not match up.
+     When you run the plug-in with an optimized older browser,
+     you'll see tons of Asserts (why they still have asserts in an
+     optimized build is a different question, but without them 
+     I wouldn't have figured out this problem) about a pointer not
+     being a valid heap pointer and eventually crash.  This was 
+     the offending free line.
+     So we need to call a function within the browser that 
+     calls the free linked in with it.  js_free is
+     such a function.  But this is extremely ugly.
+   */
+  if (reply.passwd) 
+    cm_control->userFuncs.userFree(reply.passwd);
+  if (request.prompt) 
+    free(request.prompt);
+  return;
+}
+

mozilla/security/psm/lib/client/cmtpkcs7.c

@@ -0,0 +1,664 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* 
+ * 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 security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1994-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.
+ */
+#if defined(XP_UNIX) || defined(XP_BEOS) || defined(XP_OS2)
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <sys/time.h>
+#else
+#ifdef XP_MAC
+#include "macsocket.h"
+#else /* Windows */
+#include <windows.h>
+#include <winsock.h>
+#endif
+#endif
+#include <errno.h>
+#include "cmtcmn.h"
+#include "cmtutils.h"
+#include "messages.h"
+#include "rsrcids.h"
+
+typedef struct _CMTP7Private {
+    CMTPrivate priv;
+    CMTP7ContentCallback cb;
+    void *cb_arg;
+} CMTP7Private;
+
+CMTStatus CMT_PKCS7DecoderStart(PCMT_CONTROL control, void* clientContext, CMUint32 * connectionID, CMInt32 * result,
+                                CMTP7ContentCallback cb, void *cb_arg)
+{
+    CMTItem message;
+    CMTStatus rv;
+    CMTP7Private *priv=NULL;
+    SingleItemMessage request;
+    DataConnectionReply reply;
+
+    /* Check passed in parameters */
+    if (!control) {
+        goto loser;
+    }
+
+    request.item = CMT_CopyPtrToItem(clientContext);
+
+    /* Encode message */
+    if (CMT_EncodeMessage(SingleItemMessageTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_DATA_CONNECTION | SSM_PKCS7DECODE_STREAM;
+
+    /* Send the message. */
+    if (CMT_SendMessage(control, &message) == CMTFailure) {
+        goto loser;
+    }
+
+    /* Validate the message reply type */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_DATA_CONNECTION | SSM_PKCS7DECODE_STREAM)) {
+        goto loser;
+    }
+
+    /* Decode the reply */
+    if (CMT_DecodeMessage(DataConnectionReplyTemplate, &reply, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Success */
+    if (reply.result == 0) {
+        CMTSocket sock;
+
+        priv = (CMTP7Private *)malloc(sizeof(CMTP7Private));
+        if (priv == NULL)
+            goto loser;
+        priv->priv.dest = (CMTReclaimFunc) free;
+        priv->cb = cb;
+        priv->cb_arg = cb_arg;
+        sock = control->sockFuncs.socket(0);
+        if (sock == NULL) {
+            goto loser;
+        }
+ 
+       if (control->sockFuncs.connect(sock, (short)reply.port, 
+                                      NULL) != CMTSuccess) {
+            goto loser;
+        }
+ 
+        if (control->sockFuncs.send(sock, control->nonce.data, 
+                                    control->nonce.len) != control->nonce.len){
+            goto loser;
+        }
+
+        /* Save connection info */
+        if (CMT_AddDataConnection(control, sock, reply.connID)
+            != CMTSuccess) {
+            goto loser;
+        }
+        *connectionID = reply.connID;
+
+        rv = CMT_SetPrivate(control, reply.connID, &priv->priv);
+        if (rv != CMTSuccess)
+            goto loser;
+
+        return CMTSuccess;
+    } 
+
+loser:
+    if (priv) {
+        free(priv);
+    }
+
+	*result = reply.result;
+    return CMTFailure;
+}
+
+CMTStatus CMT_PKCS7DecoderUpdate(PCMT_CONTROL control, CMUint32 connectionID, const char * buf, CMUint32 len)
+{
+    CMUint32 sent;
+    CMTP7Private *priv;
+    unsigned long nbytes;
+    char read_buf[128];
+    CMTSocket sock, ctrlsock, selSock, sockArr[2];
+
+    /* Do some parameter checking */
+    if (!control || !buf) {
+        goto loser;
+    }
+
+    /* Get the data socket */
+    if (CMT_GetDataSocket(control, connectionID, &sock) == CMTFailure) {
+        goto loser;
+    }
+
+    priv = (CMTP7Private *)CMT_GetPrivate(control, connectionID);
+    if (priv == NULL)
+        goto loser;
+
+    /* Write the data to the socket */
+    sent = CMT_WriteThisMany(control, sock, (void*)buf, len);
+    if (sent != len) {
+        goto loser;
+    }
+
+	ctrlsock = control->sock;
+	sockArr[0] = ctrlsock;
+	sockArr[1] = sock;
+    while ((selSock = control->sockFuncs.select(sockArr,2,1))) 
+    {
+		if (selSock == ctrlsock) {
+			CMT_ProcessEvent(control);
+		} else {
+	        nbytes = control->sockFuncs.recv(sock, read_buf, sizeof(read_buf));
+		    if (nbytes == -1) {
+			    goto loser;
+			}
+			if (nbytes == 0) {
+	            break;
+		    }
+			priv->cb(priv->cb_arg, read_buf, nbytes);
+		}
+    }
+
+    return CMTSuccess;
+loser:
+    return CMTFailure;
+}
+                                                                                
+CMTStatus CMT_PKCS7DecoderFinish(PCMT_CONTROL control, CMUint32 connectionID, 
+                                 CMUint32 * resourceID)
+{
+    CMTP7Private *priv;
+    long nbytes;
+    char buf[128];
+    CMTSocket sock, ctrlsock, selSock, sockArr[2];
+#ifndef XP_MAC
+    int numTries = 0;
+#endif
+
+    /* Do some parameter checking */
+    if (!control) {
+        goto loser;
+    }
+
+    priv = (CMTP7Private *)CMT_GetPrivate(control, connectionID);
+    if (priv == NULL)
+        goto loser;
+
+    if (CMT_GetDataSocket(control, connectionID, &sock) == CMTFailure) {
+        goto loser;
+    }
+
+    ctrlsock = control->sock;
+    /* drain socket before we close it */
+    control->sockFuncs.shutdown(sock);
+    sockArr[0] = sock;
+    sockArr[1] = ctrlsock;
+    /* Let's see if doing a poll first gets rid of a weird bug where we
+     * lock up the client.
+     * There are some cases where the server doesn't put up data fast 
+     * enough, so we should loop on this poll instead of just trying it
+     * once.
+     */
+#ifndef XP_MAC
+ poll_sockets:
+    if (control->sockFuncs.select(sockArr,2,1) != NULL)
+#endif
+	{
+        while (1) {
+            selSock = control->sockFuncs.select(sockArr,2,0);
+            if (selSock == ctrlsock) {
+                CMT_ProcessEvent(control);
+            } else if (selSock == sock) {
+                nbytes = control->sockFuncs.recv(sock, buf, sizeof(buf));
+                if (nbytes < 0) {
+                    goto loser;
+                } else if (nbytes == 0) {
+                    break;
+                }
+                if (priv->cb)
+                    priv->cb(priv->cb_arg, buf, nbytes);
+            }
+        }
+    }
+#ifndef XP_MAC
+    else {
+#ifdef WIN32
+        if (numTries < 20) {
+            Sleep(100);
+            numTries++;
+            goto poll_sockets;
+        }
+#endif
+#ifdef XP_UNIX
+	if (numTries < 25) {
+	  numTries += sleep(1);
+	  goto poll_sockets;
+	}
+#endif
+    }
+#endif
+    
+    if (CMT_CloseDataConnection(control, connectionID) == CMTFailure) {
+        goto loser;
+    }
+
+    /* Get the PKCS7 content info */
+    if (CMT_GetRIDAttribute(control, connectionID, SSM_FID_P7CONN_CONTENT_INFO,
+                            resourceID) == CMTFailure) {
+        goto loser;
+    }
+
+    return CMTSuccess;
+
+loser:
+    if (control) {
+        CMT_CloseDataConnection(control, connectionID);
+    }
+    
+    return CMTFailure;
+}
+
+CMTStatus CMT_PKCS7DestroyContentInfo(PCMT_CONTROL control, CMUint32 resourceID)
+{
+    if (!control) {
+        goto loser;
+    }
+
+    /* Delete the resource */
+    if (CMT_DestroyResource(control, resourceID, SSM_FID_P7CONN_CONTENT_INFO) == CMTFailure) {
+        goto loser;
+    }
+    return CMTSuccess;
+
+loser:
+    return CMTFailure;
+}
+
+CMTStatus CMT_PKCS7VerifyDetachedSignature(PCMT_CONTROL control, CMUint32 resourceID, CMUint32 certUsage, CMUint32 hashAlgID, CMUint32 keepCerts, CMTItem* digest, CMInt32 * result)
+{
+    CMTItem message;
+    VerifyDetachedSigRequest request;
+    SingleNumMessage reply;
+
+    /* Do some parameter checking */
+    if (!control || !digest || !result) {
+        goto loser;
+    }
+
+    /* Set the request */
+    request.pkcs7ContentID = resourceID;
+    request.certUsage = certUsage;
+    request.hashAlgID = hashAlgID;
+    request.keepCert = (CMBool) keepCerts;
+    request.hash = *digest;
+
+    /* Encode the request */
+    if (CMT_EncodeMessage(VerifyDetachedSigRequestTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_OBJECT_SIGNING | SSM_VERIFY_DETACHED_SIG;
+
+    /* Send the message */
+    if (CMT_SendMessage(control, &message) == CMTFailure) {
+        goto loser;
+    }
+
+    /* Validate the message reply type */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_OBJECT_SIGNING |SSM_VERIFY_DETACHED_SIG)) {
+        goto loser;
+    }
+
+    /* Decode the reply */
+    if (CMT_DecodeMessage(SingleNumMessageTemplate, &reply, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+    *result = reply.value;
+    return CMTSuccess;
+loser:
+	*result = reply.value;
+	return CMTFailure;
+}
+
+CMTStatus CMT_PKCS7VerifySignature(PCMT_CONTROL control, CMUint32 pubKeyAlgID,
+                                   CMTItem *pubKeyParams, CMTItem *signerPubKey,
+                                   CMTItem *computedHash, CMTItem *signature,
+                                   CMInt32 *result)
+{
+	return CMTFailure;
+}
+
+CMTStatus CMT_CreateSigned(PCMT_CONTROL control, CMUint32 scertRID,
+                           CMUint32 ecertRID, CMUint32 dig_alg,
+                           CMTItem *digest, CMUint32 *ciRID, CMInt32 *errCode)
+{
+    CMTItem message;
+    CreateSignedRequest request;
+    CreateContentInfoReply reply;
+    char checkMessageForError = 0;
+
+    /* Do some parameter checking */
+    if (!control || !scertRID || !digest || !ciRID) {
+        goto loser;
+    }
+
+    /* Set the request */
+    request.scertRID = scertRID;
+    request.ecertRID = ecertRID;
+    request.dig_alg = dig_alg;
+    request.digest = *digest;
+
+    /* Encode the request */
+    if (CMT_EncodeMessage(CreateSignedRequestTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_OBJECT_SIGNING | SSM_CREATE_SIGNED;
+
+    /* Send the message */
+    if (CMT_SendMessage(control, &message) == CMTFailure) {
+        goto loser;
+    }
+    checkMessageForError = 1;
+    /* Validate the message reply type */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_OBJECT_SIGNING | SSM_CREATE_SIGNED)) {
+        goto loser;
+    }
+
+    /* Decode the reply */
+    if (CMT_DecodeMessage(CreateContentInfoReplyTemplate, &reply, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+    *ciRID = reply.ciRID;
+    if (reply.result == 0) {
+		return CMTSuccess;
+	} 
+
+loser:
+    if (checkMessageForError && 
+	CMT_DecodeMessage(SingleNumMessageTemplate, 
+			  &reply, &message) == CMTSuccess) {
+        *errCode = reply.errorCode;
+    } else {
+        *errCode = 0;
+    }
+	return CMTFailure;
+}
+
+CMTStatus CMT_CreateEncrypted(PCMT_CONTROL control, CMUint32 scertRID,
+                              CMUint32 *rcertRIDs, CMUint32 *ciRID)
+{
+    CMTItem message;
+    CMInt32 nrcerts;
+    CreateEncryptedRequest request;
+    CreateContentInfoReply reply;
+
+    /* Do some parameter checking */
+    if (!control || !scertRID || !rcertRIDs || !ciRID) {
+        goto loser;
+    }
+
+    /* Calculate the number of certs */
+    for (nrcerts =0; rcertRIDs[nrcerts] != 0; nrcerts++) {
+        /* Nothing */
+        ;
+    }
+
+    /* Set up the request */
+    request.scertRID = scertRID;
+    request.nrcerts = nrcerts;
+    request.rcertRIDs = (long *) rcertRIDs;
+
+    /* Encode the request */
+    if (CMT_EncodeMessage(CreateEncryptedRequestTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_OBJECT_SIGNING | SSM_CREATE_ENCRYPTED;
+
+    /* Send the message */
+    if (CMT_SendMessage(control, &message) == CMTFailure) {
+        goto loser;
+    }
+
+    /* Validate the message response type */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_OBJECT_SIGNING | SSM_CREATE_ENCRYPTED)) {
+        goto loser;
+    }
+
+    /* Decode the reply */
+    if (CMT_DecodeMessage(CreateContentInfoReplyTemplate, &reply, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+    *ciRID = reply.ciRID;
+    if (reply.result == 0) {
+		return CMTSuccess;
+	} 
+loser:
+	return CMTFailure;
+}
+
+CMTStatus CMT_PKCS7EncoderStart(PCMT_CONTROL control, CMUint32 ciRID,
+                                CMUint32 *connectionID, CMTP7ContentCallback cb,
+                                void *cb_arg)
+{
+    CMTItem message;
+    CMTStatus rv;
+    CMTP7Private *priv;
+    PKCS7DataConnectionRequest request;
+    DataConnectionReply reply;
+
+    /* Check passed in parameters */
+    if (!control || !ciRID) {
+        goto loser;
+    }
+
+    /* Set up the request */
+    request.resID = ciRID;
+    request.clientContext.len = 0;
+    request.clientContext.data = NULL;
+
+    /* Encode the request */
+    if (CMT_EncodeMessage(PKCS7DataConnectionRequestTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_DATA_CONNECTION | SSM_PKCS7ENCODE_STREAM;
+
+    /* Send the message */
+    if (CMT_SendMessage(control, &message) == CMTFailure) {
+        goto loser;
+    }
+
+    /* Validate the message reply type */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_DATA_CONNECTION | SSM_PKCS7ENCODE_STREAM)) {
+        goto loser;
+    }
+
+    /* Decode the reply */
+    if (CMT_DecodeMessage(DataConnectionReplyTemplate, &reply, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Success */
+    if (reply.result == 0) {
+        CMTSocket sock;
+
+        priv = (CMTP7Private *)malloc(sizeof(CMTP7Private));
+        if (priv == NULL)
+            goto loser;
+        priv->priv.dest = (CMTReclaimFunc) free;
+        priv->cb = cb;
+        priv->cb_arg = cb_arg;
+
+        sock = control->sockFuncs.socket(0);
+        if (sock == NULL) {
+            goto loser;
+        }
+        if (control->sockFuncs.connect(sock, (short)reply.port, 
+                                       NULL) != CMTSuccess) {
+            goto loser;
+        }
+        if (control->sockFuncs.send(sock, control->nonce.data, 
+                                   control->nonce.len) != control->nonce.len) {
+            goto loser;
+        }
+        /* Save connection info */
+        if (CMT_AddDataConnection(control, sock, reply.connID)
+            != CMTSuccess) {
+            goto loser;
+        }
+        *connectionID = reply.connID;
+
+        rv = CMT_SetPrivate(control, reply.connID, &priv->priv);
+        if (rv != CMTSuccess)
+            goto loser;
+        return CMTSuccess;
+    } 
+loser:
+    return CMTFailure;
+}
+
+CMTStatus CMT_PKCS7EncoderUpdate(PCMT_CONTROL control, CMUint32 connectionID,
+                                 const char *buf, CMUint32 len)
+{
+    CMUint32 sent;
+    CMTP7Private *priv;
+    unsigned long nbytes;
+    char read_buf[128];
+    CMTSocket sock, ctrlsock, sockArr[2], selSock;
+
+    /* Do some parameter checking */
+    if (!control || !connectionID || !buf) {
+        goto loser;
+    }
+
+    /* Get the data socket */
+    if (CMT_GetDataSocket(control, connectionID, &sock) == CMTFailure) {
+        goto loser;
+    }
+
+    priv = (CMTP7Private *)CMT_GetPrivate(control, connectionID);
+    if (priv == NULL)
+        goto loser;
+
+    /* Write the data to the socket */
+    sent = CMT_WriteThisMany(control, sock, (void*)buf, len);
+    if (sent != len) {
+        goto loser;
+    }
+	ctrlsock = control->sock;
+	sockArr[0] = ctrlsock;
+	sockArr[1] = sock;
+    while ((selSock = control->sockFuncs.select(sockArr, 2, 1)) != NULL) 
+    {
+		if (selSock == ctrlsock) {
+			CMT_ProcessEvent(control);
+		} else {
+	        nbytes = control->sockFuncs.recv(sock, read_buf, sizeof(read_buf));
+		    if (nbytes == -1) {
+			    goto loser;
+			} else if (nbytes == 0) {
+	            break;
+		    } else {
+			    priv->cb(priv->cb_arg, read_buf, nbytes);
+			}
+		}
+    }
+    return CMTSuccess;
+
+loser:
+
+    return CMTFailure;
+}
+
+CMTStatus CMT_PKCS7EncoderFinish(PCMT_CONTROL control, CMUint32 connectionID)
+{
+    CMTP7Private *priv;
+    CMInt32 nbytes;
+    char buf[128];
+    CMTSocket sock, ctrlsock, sockArr[2], selSock;
+
+    /* Do some parameter checking */
+    if (!control) {
+        goto loser;
+    }
+
+    priv = (CMTP7Private *)CMT_GetPrivate(control, connectionID);
+    if (priv == NULL)
+        goto loser;
+
+    if (CMT_GetDataSocket(control, connectionID, &sock) == CMTFailure) {
+        goto loser;
+    }
+
+    ctrlsock = control->sock;
+    sockArr[0] = ctrlsock;
+    sockArr[1] = sock;
+    control->sockFuncs.shutdown(sock);
+    while (1) {
+        selSock = control->sockFuncs.select(sockArr, 2, 0);
+        if (selSock == ctrlsock) {
+            CMT_ProcessEvent(control);
+        } else if (selSock == sock) {
+            nbytes = control->sockFuncs.recv(sock, buf, sizeof(buf));
+            if (nbytes < 0) {
+                goto loser;
+            } else if (nbytes == 0) {
+                break;
+            } else {
+                priv->cb(priv->cb_arg, buf, nbytes);
+            }
+        }
+    }
+    if (CMT_CloseDataConnection(control, connectionID) == CMTFailure) {
+        goto loser;
+    }
+
+    return CMTSuccess;
+
+loser:
+    if (control) {
+        CMT_CloseDataConnection(control, connectionID);
+    }
+    
+    return CMTFailure;
+}

mozilla/security/psm/lib/client/cmtres.c

@@ -0,0 +1,479 @@
+/* -*- mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* 
+ * 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 security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1994-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.
+ */
+#if defined(XP_UNIX) || defined(XP_BEOS) || defined(XP_OS2)
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#else
+#ifdef XP_MAC
+#include "macsocket.h"
+#else
+#include <windows.h>
+#include <winsock.h>
+#endif
+#endif
+#include <errno.h>
+#include "cmtcmn.h"
+#include "cmtutils.h"
+#include "messages.h"
+#include <string.h>
+
+CMTStatus CMT_GetNumericAttribute(PCMT_CONTROL control, CMUint32 resourceID, CMUint32 fieldID, CMInt32 *value)
+{
+    CMTItem message;
+    GetAttribRequest request;
+    GetAttribReply reply;
+
+    /* Do some parameter checking */
+    if (!control) {
+        goto loser;
+    }
+
+    /* Set up the request */
+    request.resID = resourceID;
+    request.fieldID = fieldID;
+
+    /* Encode the request */
+    if (CMT_EncodeMessage(GetAttribRequestTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_RESOURCE_ACTION | SSM_GET_ATTRIBUTE | SSM_NUMERIC_ATTRIBUTE;
+
+    /* Send the mesage and get the response */
+    if (CMT_SendMessage(control, &message) == CMTFailure) {
+        goto loser;
+    }
+
+    /* Validate the message reply type */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_RESOURCE_ACTION | SSM_GET_ATTRIBUTE | SSM_NUMERIC_ATTRIBUTE)) {
+        goto loser;
+    }
+
+    /* Decode the reply */
+    if (CMT_DecodeMessage(GetAttribReplyTemplate, &reply, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+    *value = reply.value.u.numeric;
+
+    /* Success */
+    if (reply.result == 0) {
+        return CMTSuccess;
+    } 
+
+loser:
+    return CMTFailure;
+}
+
+CMTStatus CMT_SetNumericAttribute(PCMT_CONTROL control, CMUint32 resourceID,
+				  CMUint32 fieldID, CMInt32 value)
+{
+    CMTItem message;
+    SetAttribRequest request;
+
+    if (!control) {
+        goto loser;
+    }
+
+    /* Set the request */
+    request.resID = resourceID;
+    request.fieldID = fieldID;
+    request.value.type = SSM_NUMERIC_ATTRIBUTE;
+    request.value.u.numeric = value;
+
+    /* Encode the message */
+    if (CMT_EncodeMessage(SetAttribRequestTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_RESOURCE_ACTION | 
+                   SSM_SET_ATTRIBUTE | SSM_NUMERIC_ATTRIBUTE;
+
+    if (CMT_SendMessage(control, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Validate the message reply type */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_RESOURCE_ACTION | 
+                              SSM_SET_ATTRIBUTE    | SSM_NUMERIC_ATTRIBUTE)) {
+        goto loser;
+    }
+
+    return CMTSuccess;
+ loser:
+    return CMTFailure;
+}
+
+CMTStatus
+CMT_PadStringValue(CMTItem *dest, CMTItem src)
+{
+    dest->data = NewArray(unsigned char, src.len+1);
+    if (dest->data == NULL) {
+        return CMTFailure;
+    }
+    memcpy(dest->data, src.data, src.len);
+    dest->data[src.len] = '\0';
+    dest->len = src.len;
+    free(src.data);
+    return CMTSuccess;
+}
+
+CMTStatus CMT_GetStringAttribute(PCMT_CONTROL control, CMUint32 resourceID, CMUint32 fieldID, CMTItem *value)
+{
+    CMTItem message;
+    GetAttribRequest request;
+    GetAttribReply reply;
+
+    /* Do some parameter checking */
+    if (!control) {
+        goto loser;
+    }
+
+    /* Set up the request */
+    request.resID = resourceID;
+    request.fieldID = fieldID;
+
+    /* Encode the request */
+    if (CMT_EncodeMessage(GetAttribRequestTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_RESOURCE_ACTION | SSM_GET_ATTRIBUTE | SSM_STRING_ATTRIBUTE;
+    
+    /* Send the mesage and get the response */
+    if (CMT_SendMessage(control, &message) == CMTFailure) {
+        goto loser;
+    }
+
+    /* Validate the message reply type */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_RESOURCE_ACTION | SSM_GET_ATTRIBUTE | SSM_STRING_ATTRIBUTE)) {
+        goto loser;
+    }
+
+    /* Decode the response */
+    if (CMT_DecodeMessage(GetAttribReplyTemplate, &reply, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Success */
+    if (reply.result == 0) {
+        return CMT_PadStringValue(value, reply.value.u.string);
+    } 
+loser:
+    return CMTFailure;
+}
+
+CMTStatus
+CMT_SetStringAttribute(PCMT_CONTROL control, CMUint32 resourceID,
+		       CMUint32 fieldID, CMTItem *value)
+{
+    CMTItem message;
+    SetAttribRequest request;
+    
+    if (!control) {
+        goto loser;
+    }
+
+    /* Set up the request */
+    request.resID = resourceID;
+    request.fieldID = fieldID;
+    request.value.type = SSM_STRING_ATTRIBUTE;
+    request.value.u.string = *value;
+
+    /* Encode the request */
+    if (CMT_EncodeMessage(SetAttribRequestTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_RESOURCE_ACTION | 
+                   SSM_SET_ATTRIBUTE | SSM_STRING_ATTRIBUTE;
+
+    /* Send the message */
+    if (CMT_SendMessage(control, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Validate the message request type */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_RESOURCE_ACTION | 
+                         SSM_SET_ATTRIBUTE    | SSM_STRING_ATTRIBUTE)) {
+        goto loser;
+    }
+    return CMTSuccess;
+loser:
+    return CMTFailure;
+}
+
+CMTStatus CMT_DuplicateResource(PCMT_CONTROL control, CMUint32 resourceID,
+				CMUint32 *newResID)
+{
+    CMTItem message;
+    SingleNumMessage request;
+    DupResourceReply reply;
+
+    /* Do some parameter checking */
+    if (!control) {
+        goto loser;
+    }
+
+    /* Set up the request */
+    request.value = resourceID;
+
+    /* Encode the request */
+    if (CMT_EncodeMessage(SingleNumMessageTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_RESOURCE_ACTION | SSM_DUPLICATE_RESOURCE;
+
+    /* Send the mesage */
+    if (CMT_SendMessage(control, &message) == CMTFailure) {
+        goto loser;
+    }
+
+    /* Validate the message reply type */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_RESOURCE_ACTION | SSM_DUPLICATE_RESOURCE)) {
+        goto loser;
+    }
+
+    /* Decode the reply */
+    if (CMT_DecodeMessage(DupResourceReplyTemplate, &reply, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Success */
+    if (reply.result == 0) {
+        *newResID = reply.resID;
+        return CMTSuccess;
+    } 
+
+loser:
+    *newResID = 0;
+    return CMTFailure;
+}
+
+CMTStatus CMT_DestroyResource(PCMT_CONTROL control, CMUint32 resourceID, CMUint32 resourceType)
+{
+    CMTItem message;
+    DestroyResourceRequest request;
+    SingleNumMessage reply;
+
+    /* Do some parameter checking */
+    if (!control) {
+        goto loser;
+    }
+
+    /* Set up the request */
+    request.resID = resourceID;
+    request.resType = resourceType;
+
+    /* Encode the message */
+    if (CMT_EncodeMessage(DestroyResourceRequestTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_RESOURCE_ACTION | SSM_DESTROY_RESOURCE;
+
+    /* Send the message */
+    if (CMT_SendMessage(control, &message) == CMTFailure) {
+        goto loser;
+    }
+
+    /* Validate the message reply type */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_RESOURCE_ACTION | SSM_DESTROY_RESOURCE)) {
+        goto loser;
+    }
+
+    /* Decode the reply */
+    if (CMT_DecodeMessage(SingleNumMessageTemplate, &reply, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Success */
+    if (reply.value == 0) {
+        return CMTSuccess;
+    }
+loser:
+    return CMTFailure;
+}
+
+CMTStatus CMT_PickleResource(PCMT_CONTROL control, CMUint32 resourceID, CMTItem * pickledResource)
+{
+    CMTItem message;
+    SingleNumMessage request;
+    PickleResourceReply reply;
+
+    /* Do some parameter checking */
+    if (!control) {
+        goto loser;
+    }
+
+    /* Set up the request */
+    request.value = resourceID;
+
+    /* Encode the request */
+    if (CMT_EncodeMessage(SingleNumMessageTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_RESOURCE_ACTION | SSM_CONSERVE_RESOURCE | SSM_PICKLE_RESOURCE;
+
+    /* Send the mesage and get the response */
+    if (CMT_SendMessage(control, &message) == CMTFailure) {
+        goto loser;
+    }
+
+    /* Validate the message reply type */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_RESOURCE_ACTION | SSM_CONSERVE_RESOURCE | SSM_PICKLE_RESOURCE)) {
+        goto loser;
+    }
+
+    /* Decode the reply */
+    if (CMT_DecodeMessage(PickleResourceReplyTemplate, &reply,&message) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Success */
+    if (reply.result == 0) {
+        *pickledResource = reply.blob;
+        return CMTSuccess;
+    } 
+
+loser:
+    return CMTFailure;
+}
+
+CMTStatus CMT_UnpickleResource(PCMT_CONTROL control, CMUint32 resourceType, CMTItem pickledResource, CMUint32 * resourceID)
+{
+    CMTItem message;
+    UnpickleResourceRequest request;
+    UnpickleResourceReply reply;
+
+    /* Do some parameter checking */
+    if (!control) {
+        goto loser;
+    }
+
+    /* Set up the request */
+    request.resourceType = resourceType;
+    request.resourceData = pickledResource;
+
+    /* Encode the request */
+    if (CMT_EncodeMessage(UnpickleResourceRequestTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_RESOURCE_ACTION | SSM_CONSERVE_RESOURCE | SSM_UNPICKLE_RESOURCE;
+    
+    /* Send the mesage and get the response */
+    if (CMT_SendMessage(control, &message) == CMTFailure) {
+        goto loser;
+    }
+
+    /* Validate the message reply type */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_RESOURCE_ACTION | SSM_CONSERVE_RESOURCE | SSM_UNPICKLE_RESOURCE)) {
+        goto loser;
+    }
+
+    /* Decode the reply */
+    if (CMT_DecodeMessage(UnpickleResourceReplyTemplate, &reply, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Success */
+    if (reply.result == 0) {
+        *resourceID = reply.resID;
+        return CMTSuccess;
+    } 
+
+loser:
+    *resourceID = 0;
+    return CMTFailure;
+}
+
+CMTStatus CMT_GetRIDAttribute(PCMT_CONTROL control, CMUint32 resourceID, CMUint32 fieldID, CMUint32 *value)
+{
+    CMTItem message;
+    GetAttribRequest request;
+    GetAttribReply reply;
+
+    /* Do some parameter checking */
+    if (!control) {
+        goto loser;
+    }
+
+    /* Set the request */
+    request.resID = resourceID;
+    request.fieldID = fieldID;
+
+    /* Encode the message */
+    if (CMT_EncodeMessage(GetAttribRequestTemplate, &message, &request) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_RESOURCE_ACTION | SSM_GET_ATTRIBUTE | SSM_RID_ATTRIBUTE;
+
+    /* Send the mesage and get the response */
+    if (CMT_SendMessage(control, &message) == CMTFailure) {
+        goto loser;
+    }
+
+    /* Validate the message response type */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_RESOURCE_ACTION | SSM_GET_ATTRIBUTE | SSM_RID_ATTRIBUTE)) {
+        goto loser;
+    }
+
+    /* Decode the reply */
+    if (CMT_DecodeMessage(GetAttribReplyTemplate, &reply, &message) != CMTSuccess) {
+        goto loser;
+    }
+
+    /* Success */
+    if (reply.result == 0) {
+        *value = reply.value.u.rid;
+        return CMTSuccess;
+    } 
+loser:
+    return CMTFailure;
+}
+ 

mozilla/security/psm/lib/client/cmtrng.c

@@ -0,0 +1,270 @@
+/* 
+ * 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 security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1994-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.
+ */
+/*
+  cmtrng.c -- Support for PSM random number generator and the seeding
+              thereof with data from the client.
+
+  Created by mwelch 1999 Oct 21
+ */
+#include "cmtcmn.h"
+#include "cmtutils.h"
+#include "messages.h"
+#include "rsrcids.h"
+#include <string.h>
+
+CMTStatus
+CMT_EnsureInitializedRNGBuf(PCMT_CONTROL control)
+{
+    if (control->rng.outBuf == NULL)
+    {
+        control->rng.outBuf = (char *) calloc(RNG_OUT_BUFFER_LEN, sizeof(char));
+        if (control->rng.outBuf == NULL)
+            goto loser;
+
+        control->rng.validOutBytes = 0;
+        control->rng.out_cur = control->rng.outBuf;
+        control->rng.out_end = control->rng.out_cur + RNG_OUT_BUFFER_LEN;
+        
+        control->rng.inBuf = (char *) calloc(RNG_IN_BUFFER_LEN, sizeof(char));
+        if (control->rng.outBuf == NULL)
+            goto loser;
+    }
+
+    return CMTSuccess;
+
+ loser:
+    if (control->rng.outBuf != NULL)
+    {
+        free(control->rng.outBuf);
+        control->rng.outBuf = NULL;
+    }
+    if (control->rng.inBuf != NULL)
+    {
+        free(control->rng.inBuf);
+        control->rng.inBuf = NULL;
+    }
+
+    return CMTFailure;
+}
+
+
+size_t 
+CMT_RequestPSMRandomData(PCMT_CONTROL control, 
+                         void *buf, CMUint32 maxbytes)
+{
+    SingleNumMessage req;
+    SingleItemMessage reply;
+    CMTItem message;
+    size_t rv = 0;
+    
+    /* Parameter checking */
+    if (!control || !buf || (maxbytes == 0))
+        goto loser;
+
+    /* Initialization. */
+    memset(&reply, 0, sizeof(SingleItemMessage));
+
+    /* Ask PSM for the data. */
+    req.value = maxbytes;
+    if (CMT_EncodeMessage(SingleNumMessageTemplate, &message, &req) != CMTSuccess)
+        goto loser;
+
+    /* Set the message request type */
+    message.type = SSM_REQUEST_MESSAGE | SSM_MISC_ACTION | SSM_MISC_GET_RNG_DATA;
+    
+    /* Send the message and get the response */
+    if (CMT_SendMessage(control, &message) == CMTFailure)
+        goto loser;
+
+    /* Validate the message reply type */
+    if (message.type != (SSM_REPLY_OK_MESSAGE | SSM_MISC_ACTION | SSM_MISC_GET_RNG_DATA))
+        goto loser;
+
+    /* Decode message */
+    if (CMT_DecodeMessage(SingleItemMessageTemplate, &reply, &message) != CMTSuccess)
+        goto loser;
+
+    /* Success - fill the return buf with what we got */
+    if (reply.item.len > maxbytes)
+        reply.item.len = maxbytes;
+
+    memcpy(buf, reply.item.data, reply.item.len);
+    rv = reply.item.len;
+
+ loser:
+    if (reply.item.data)
+        free(reply.item.data);
+    if (message.data)
+        free(message.data);
+
+    return rv;
+}
+
+size_t 
+CMT_GenerateRandomBytes(PCMT_CONTROL control, 
+                        void *buf, CMUint32 maxbytes)
+{
+    CMUint32 remaining = maxbytes;
+    CMT_RNGState *rng = &(control->rng);
+    char *walk = (char *) buf;
+
+    /* Is there already enough in the incoming cache? */
+    while(remaining > rng->validInBytes)
+    {
+        /* Get what we have on hand. */
+        memcpy(walk, rng->in_cur, rng->validInBytes);
+        walk += rng->validInBytes;
+        remaining -= rng->validInBytes;
+
+        /* Request a buffer from PSM. */
+        rng->validInBytes = CMT_RequestPSMRandomData(control, 
+                                                     rng->inBuf, 
+                                                     RNG_IN_BUFFER_LEN);
+        if (rng->validInBytes == 0)
+            return (maxbytes - remaining); /* call failed */
+        rng->in_cur = rng->inBuf;
+    }
+    if (remaining > 0)
+    {
+        memcpy(walk, rng->in_cur, remaining);
+        rng->in_cur += remaining;
+        rng->validInBytes -= remaining;
+    }
+    return maxbytes;
+}
+
+void
+cmt_rng_xor(void *dstBuf, void *srcBuf, int len)
+{
+    unsigned char *s = (unsigned char*) srcBuf;
+    unsigned char *d = (unsigned char*) dstBuf;
+    unsigned char tmp;
+    int i;
+
+    for(i=0; i<len; i++, s++, d++)
+    {
+        tmp = *d;
+        /* I wish C had circular shift operators. So do others on the team. */
+        tmp = ((tmp << 1) | (tmp >> 7));
+        *d = tmp ^ *s;
+    }
+}
+
+CMTStatus 
+CMT_RandomUpdate(PCMT_CONTROL control, void *data, size_t numbytes)
+{
+    size_t dataLeft = numbytes, cacheLeft;
+    char *walk = (char *) data;
+
+    if (CMT_EnsureInitializedRNGBuf(control) != CMTSuccess)
+        goto loser;
+
+    /* If we have more than what the buffer can handle, wrap around. */
+    cacheLeft = (control->rng.out_end - control->rng.out_cur);
+    while (dataLeft >= cacheLeft)
+    {
+        cmt_rng_xor(control->rng.out_cur, walk, cacheLeft);
+        walk += cacheLeft;
+        dataLeft -= cacheLeft;
+
+        control->rng.out_cur = control->rng.outBuf;
+
+        /* Max out used space */
+        control->rng.validOutBytes = cacheLeft = RNG_OUT_BUFFER_LEN;
+    }
+
+    /* 
+       We now have less seed data available than we do space in the buf.
+       Write what we have and update validOutBytes if we're not looping already.
+     */
+    cmt_rng_xor(control->rng.out_cur, walk, dataLeft);
+    control->rng.out_cur += dataLeft;
+    if (control->rng.validOutBytes < RNG_OUT_BUFFER_LEN)
+        control->rng.validOutBytes += dataLeft;
+
+    return CMTSuccess;
+ loser:
+    return CMTFailure;
+}
+
+size_t
+CMT_GetNoise(PCMT_CONTROL control, void *buf, CMUint32 maxbytes)
+{
+    /* ### mwelch - GetNoise and GenerateRandomBytes can be the 
+       same function now, because presumably the RNG is being 
+       seeded with environmental noise on the PSM end before we 
+       make any of these requests */
+    return CMT_GenerateRandomBytes(control, buf, maxbytes);
+}
+
+CMTStatus 
+CMT_FlushPendingRandomData(PCMT_CONTROL control)
+{
+    CMTItem message;
+
+    memset(&message, 0, sizeof(CMTItem));
+
+    if (CMT_EnsureInitializedRNGBuf(control) != CMTSuccess)
+        return CMTFailure; /* couldn't initialize RNG buffer */
+
+    if (control->rng.validOutBytes == 0)
+        return CMTSuccess; /* no random data available == we're flushed */
+
+    /* We have random data available. Send this to PSM.
+       We're sending an event, so no reply is needed. */
+    message.type = SSM_EVENT_MESSAGE 
+        | SSM_MISC_ACTION 
+        | SSM_MISC_PUT_RNG_DATA;
+    message.len = control->rng.validOutBytes;
+    message.data = (unsigned char *) calloc(message.len, sizeof(char));
+    if (!message.data)
+        goto loser;
+    memcpy(message.data, control->rng.outBuf, message.len);
+
+    if (CMT_TransmitMessage(control, &message) == CMTFailure)
+        goto loser;
+
+    /* Clear the RNG ring buffer, we've used that data */
+    control->rng.out_cur = control->rng.outBuf;
+    control->rng.validOutBytes = 0;
+    /* zero the buffer, because we XOR in new data */
+    memset(control->rng.outBuf, 0, RNG_OUT_BUFFER_LEN);
+
+    goto done;
+ loser:
+    if (message.data)
+        free(message.data);
+    return CMTFailure;
+ done:
+    return CMTSuccess;
+}