new shit

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

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/makefile.win

@@ -1,26 +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):  kkhandrika@netscape.com
-
-DEPTH=..\..\..
-
-DIRS= build public src
-
-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/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/makefile.win

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

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/makefile.win

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

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/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/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/modules/libpr0n/Makefile.in

@@ -1,5 +1,4 @@
-#!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
@@ -10,19 +9,25 @@
 # implied. See the License for the specific language governing
 # rights and limitations under the License.
 # 
-# The Original Code is mozilla.org code.
+# 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>
+# Contributor(s):
 #
 
-DEPTH=..\..\..\..
+DEPTH		= ../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS		= public src decoders
+
+include $(topsrcdir)/config/rules.mk
 
-DIRS=en-US
 
-include <$(DEPTH)\config\rules.mak>

mozilla/modules/libpr0n/decoders/Makefile.in

@@ -1,4 +1,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
@@ -9,20 +9,24 @@
 # implied. See the License for the specific language governing
 # rights and limitations under the License.
 # 
-# The Original Code is mozilla.org code.
+# 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>
+# Contributor(s):
 #
 
-DEPTH=..\..
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
 
-DIRS=mapihook resources mapiDll
+include $(DEPTH)/config/autoconf.mk
+
+DIRS		= ppm png gif jpeg
+
+include $(topsrcdir)/config/rules.mk
 
-include <$(DEPTH)\config\rules.mak>

mozilla/modules/libpr0n/decoders/gif/GIF2.h

@@ -0,0 +1,323 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is Mozilla Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+#ifndef _GIF_H_
+#define _GIF_H_
+
+/* gif2.h  
+   The interface for the GIF87/89a decoder. 
+*/
+// List of possible parsing states
+typedef enum {
+    gif_gather,
+    gif_init,                   //1
+    gif_type,
+    gif_version,
+    gif_global_header,
+    gif_global_colormap,
+    gif_image_start,            //6
+    gif_image_header,
+    gif_image_colormap,
+    gif_image_body,
+    gif_lzw_start,
+    gif_lzw,                    //11
+    gif_sub_block,
+    gif_extension,
+    gif_control_extension,
+    gif_consume_block,
+    gif_skip_block,
+    gif_done,                   //17
+    gif_oom,
+    gif_error,
+    gif_comment_extension,
+    gif_application_extension,
+    gif_netscape_extension_block,
+    gif_consume_netscape_extension,
+    gif_consume_comment,
+    gif_delay,
+    gif_wait_for_buffer_full,
+    gif_stop_animating   //added for animation stop 
+} gstate;
+
+/* "Disposal" method indicates how the image should be handled in the
+   framebuffer before the subsequent image is displayed. */
+typedef enum 
+{
+    DISPOSE_NOT_SPECIFIED      = 0,
+    DISPOSE_KEEP               = 1, /* Leave it in the framebuffer */
+    DISPOSE_OVERWRITE_BGCOLOR  = 2, /* Overwrite with background color */
+    DISPOSE_OVERWRITE_PREVIOUS = 4  /* Save-under */
+} gdispose;
+
+/* A RGB triplet representing a single pixel in the image's colormap
+   (if present.) */
+typedef struct _GIF_RGB
+{
+  PRUint8 red, green, blue, pad; /* Windows requires the fourth byte &
+                                    many compilers pad it anyway. */
+                    
+  /* XXX: hist_count appears to be unused */                                  
+  //PRUint16 hist_count;           /* Histogram frequency count. */
+} GIF_RGB;
+    
+/* Colormap information. */
+typedef struct _GIF_ColorMap {
+    int32 num_colors;           /* Number of colors in the colormap.
+                                   A negative value can be used to denote a
+                                   possibly non-unique set. */
+    GIF_RGB *map;                /* Colormap colors. */
+    PRUint8 *index;             /* NULL, if map is in index order.  Otherwise
+                                   specifies the indices of the map entries. */
+    void *table;                /* Lookup table for this colormap.  Private to
+                                   the Image Library. */
+} GIF_ColorMap;
+    
+/* An indexed RGB triplet. */
+typedef struct _GIF_IRGB {
+    PRUint8 index;
+    PRUint8 red, green, blue;
+} GIF_IRGB;
+
+/* A GIF decoder's state */
+typedef struct gif_struct {
+    void* clientptr;
+    /* Callbacks for this decoder instance*/
+    int (PR_CALLBACK *GIFCallback_NewPixmap)();
+    int (PR_CALLBACK *GIFCallback_BeginGIF)(
+      void*    aClientData,
+      PRUint32 aLogicalScreenWidth, 
+      PRUint32 aLogicalScreenHeight,
+      PRUint8  aLogicalScreenBackgroundRGBIndex);
+      
+    int (PR_CALLBACK* GIFCallback_EndGIF)(
+      void*    aClientData,
+      int      aAnimationLoopCount);
+      
+    int (PR_CALLBACK* GIFCallback_BeginImageFrame)(
+      void*    aClientData,
+      PRUint32 aFrameNumber,   /* Frame number, 1-n */
+      PRUint32 aFrameXOffset,  /* X offset in logical screen */
+      PRUint32 aFrameYOffset,  /* Y offset in logical screen */
+      PRUint32 aFrameWidth,    
+      PRUint32 aFrameHeight,   
+      GIF_RGB* aTransparencyChromaKey);
+    int (PR_CALLBACK* GIFCallback_EndImageFrame)(
+      void* aClientData,
+      PRUint32 aFrameNumber,
+      PRUint32 aDelayTimeout);
+    int (PR_CALLBACK* GIFCallback_SetupColorspaceConverter)();
+    int (PR_CALLBACK* GIFCallback_ResetPalette)(); 
+    int (PR_CALLBACK* GIFCallback_InitTransparentPixel)();
+    int (PR_CALLBACK* GIFCallback_DestroyTransparentPixel)();
+    int (PR_CALLBACK* GIFCallback_HaveDecodedRow)(
+      void* aClientData,
+      PRUint8* aRowBufPtr,   /* Pointer to single scanline temporary buffer */
+      PRUint8* aRGBrowBufPtr,/* Pointer to temporary storage for dithering/mapping */
+      int aXOffset,          /* With respect to GIF logical screen origin */
+      int aLength,           /* Length of the row? */
+      int aRow,              /* Row number? */
+      int aDuplicateCount,   /* Number of times to duplicate the row? */
+      PRUint8 aDrawMode,     /* il_draw_mode */
+      int aInterlacePass);
+    int (PR_CALLBACK *GIFCallback_HaveImageAll)(
+      void* aClientData);
+        
+    /* Parsing state machine */
+    gstate state;               /* Curent decoder master state */
+    PRUint8 *hold;                /* Accumulation buffer */
+    int32 hold_size;            /* Capacity, in bytes, of accumulation buffer */
+    PRUint8 *gather_head;         /* Next byte to read in accumulation buffer */
+    int32 gather_request_size;  /* Number of bytes to accumulate */
+    int32 gathered;             /* bytes accumulated so far*/
+    gstate post_gather_state;   /* State after requested bytes accumulated */
+    int32 requested_buffer_fullness; /* For netscape application extension */
+
+    /* LZW decoder state machine */
+    PRUint8 *stack;               /* Base of decoder stack */
+    PRUint8 *stackp;              /* Current stack pointer */
+    PRUint16 *prefix;
+    PRUint8 *suffix;
+    int datasize;
+    int codesize;
+    int codemask;
+    int clear_code;             /* Codeword used to trigger dictionary reset */
+    int avail;                  /* Index of next available slot in dictionary */
+    int oldcode;
+    PRUint8 firstchar;
+    int count;                  /* Remaining # bytes in sub-block */
+    int bits;                   /* Number of unread bits in "datum" */
+    int32 datum;                /* 32-bit input buffer */
+
+    /* Output state machine */
+    int ipass;                  /* Interlace pass; Ranges 1-4 if interlaced. */
+    PRUintn rows_remaining;        /* Rows remaining to be output */
+    PRUintn irow;                  /* Current output row, starting at zero */
+    PRUint8 *rgbrow;              /* Temporary storage for dithering/mapping */
+    PRUint8 *rowbuf;              /* Single scanline temporary buffer */
+    PRUint8 *rowend;              /* Pointer to end of rowbuf */
+    PRUint8 *rowp;                /* Current output pointer */
+
+    /* Parameters for image frame currently being decoded*/
+    PRUintn x_offset, y_offset;    /* With respect to "screen" origin */
+    PRUintn height, width;
+    PRUintn last_x_offset, last_y_offset; /* With respect to "screen" origin */
+    PRUintn last_height, last_width;
+    int interlaced;             /* TRUE, if scanlines arrive interlaced order */
+    int tpixel;                 /* Index of transparent pixel */
+    GIF_IRGB* transparent_pixel;
+    int is_transparent;         /* TRUE, if tpixel is valid */
+    int control_extension;      /* TRUE, if image control extension present */
+    int is_local_colormap_defined;
+    gdispose disposal_method;   /* Restore to background, leave in place, etc.*/
+    gdispose last_disposal_method;
+    GIF_RGB *local_colormap;     /* Per-image colormap */
+    int local_colormap_size;    /* Size of local colormap array. */
+    PRUint32 delay_time;        /* Display time, in milliseconds,
+                                   for this image in a multi-image GIF */
+
+    /* Global (multi-image) state */
+    int screen_bgcolor;         /* Logical screen background color */
+    int version;                /* Either 89 for GIF89 or 87 for GIF87 */
+    PRUintn screen_width;       /* Logical screen width & height */
+    PRUintn screen_height;
+    GIF_RGB *global_colormap;    /* Default colormap if local not supplied  */
+    int global_colormap_size;   /* Size of global colormap array. */
+    int images_decoded;         /* Counts images for multi-part GIFs */
+    int destroy_pending;        /* Stream has ended */
+    int progressive_display;    /* If TRUE, do Haeberli interlace hack */
+    int loop_count;             /* Netscape specific extension block to control
+                                   the number of animation loops a GIF renders. */
+} gif_struct;
+
+
+/* Create a new gif_struct */
+extern PRBool gif_create(gif_struct **gs);
+
+/* These are the APIs that the client calls to intialize,
+push data to, and shut down the GIF decoder. */
+PRBool GIFInit(
+  gif_struct* gs,
+
+  void* aClientData,
+  
+  int (*PR_CALLBACK GIFCallback_NewPixmap)(),
+  
+  int (*PR_CALLBACK GIFCallback_BeginGIF)(
+    void* aClientData,
+    PRUint32 aLogicalScreenWidth, 
+    PRUint32 aLogicalScreenHeight,
+    PRUint8  aBackgroundRGBIndex),
+    
+  int (*PR_CALLBACK GIFCallback_EndGIF)(
+    void*    aClientData,
+    int      aAnimationLoopCount),
+  
+  int (*PR_CALLBACK GIFCallback_BeginImageFrame)(
+    void*    aClientData,
+    PRUint32 aFrameNumber,   /* Frame number, 1-n */
+    PRUint32 aFrameXOffset,  /* X offset in logical screen */
+    PRUint32 aFrameYOffset,  /* Y offset in logical screen */
+    PRUint32 aFrameWidth,    
+    PRUint32 aFrameHeight,   
+    GIF_RGB* aTransparencyChromaKey),
+  
+  int (*PR_CALLBACK GIFCallback_EndImageFrame)(
+    void* aClientData,
+    PRUint32 aFrameNumber,
+    PRUint32 aDelayTimeout),
+  
+  int (*PR_CALLBACK GIFCallback_SetupColorspaceConverter)(),
+  
+  int (*PR_CALLBACK GIFCallback_ResetPalette)(),
+  
+  int (*PR_CALLBACK GIFCallback_InitTransparentPixel)(),
+  
+  int (*PR_CALLBACK GIFCallback_DestroyTransparentPixel)(),
+  
+  int (*PR_CALLBACK GIFCallback_HaveDecodedRow)(
+    void* aClientData,
+    PRUint8* aRowBufPtr,   /* Pointer to single scanline temporary buffer */
+    PRUint8* aRGBrowBufPtr,/* Pointer to temporary storage for dithering/mapping */
+    int aXOffset,          /* With respect to GIF logical screen origin */
+    int aLength,           /* Length of the row? */
+    int aRow,              /* Row number? */
+    int aDuplicateCount,   /* Number of times to duplicate the row? */
+    PRUint8 aDrawMode,     /* il_draw_mode */
+    int aInterlacePass),
+    
+  int (*PR_CALLBACK GIFCallback_HaveImageAll)(
+    void* aClientData)
+  );
+
+extern void gif_destroy(gif_struct* aGIFStruct);
+
+int gif_write(gif_struct* aGIFStruct, const PRUint8 * buf, PRUint32 numbytes);
+
+PRUint8 gif_write_ready(gif_struct* aGIFStruct);
+
+extern void gif_complete(gif_struct** aGIFStruct);
+extern void gif_delay_time_callback(/* void *closure */);
+
+
+/* Callback functions that the client must implement and pass in 
+pointers for during the GIFInit call. These will be called back
+when the decoder has a decoded rows, frame size information, etc.*/
+
+/* GIFCallback_LogicalScreenSize is called only once to notify the client
+of the logical screen size, which will be the size of the total image. */
+typedef int (*PR_CALLBACK BEGINGIF_CALLBACK)(
+  void*    aClientData,
+  PRUint32 aLogicalScreenWidth, 
+  PRUint32 aLogicalScreenHeight,
+  PRUint8  aLogicalScreenBackgroundRGBIndex);
+                            
+typedef int (PR_CALLBACK *GIFCallback_EndGIF)(
+  void*    aClientData,
+  int      aAnimationLoopCount);
+
+/* GIFCallback_BeginImageFrame is called at the beginning of each frame of
+a GIF.*/
+typedef int (PR_CALLBACK *GIFCallback_BeginImageFrame)(
+  void*    aClientData,
+  PRUint32 aFrameNumber,   /* Frame number, 1-n */
+  PRUint32 aFrameXOffset,  /* X offset in logical screen */
+  PRUint32 aFraqeYOffset,  /* Y offset in logical screen */
+  PRUint32 aFrameWidth,    
+  PRUint32 aFrameHeight); 
+
+extern int GIFCallback_EndImageFrame(
+  void*    aClientData,
+  PRUint32 aFrameNumber,
+  PRUint32 aDelayTimeout); /* Time in milliseconds this frame should be displayed before the next frame.
+                              This information appears in a sub control block, so we don't
+                              transmit it back to the client until we're done with the frame. */
+
+/*
+extern int GIFCallback_SetupColorspaceConverter();
+extern int GIFCallback_ResetPalette(); 
+extern int GIFCallback_InitTransparentPixel();
+extern int GIFCallback_DestroyTransparentPixel();
+*/
+extern int GIFCallback_HaveDecodedRow();
+extern int GIFCallback_HaveImageAll();
+
+#endif
+

mozilla/modules/libpr0n/decoders/gif/Makefile.in

@@ -0,0 +1,42 @@
+#
+# 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):
+#
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= imggif
+LIBRARY_NAME	= imggif
+IS_COMPONENT	= 1
+
+REQUIRES	= xpcom necko layout gfx2 imglib2
+
+CPPSRCS		= GIF2.cpp nsGIFDecoder2.cpp nsGIFModule.cpp
+
+EXTRA_DSO_LDOPTS = $(GIF_LIBS) $(ZLIB_LIBS) \
+		$(MOZ_COMPONENT_LIBS) \
+		$(NULL)
+
+include $(topsrcdir)/config/rules.mk
+

mozilla/modules/libpr0n/decoders/gif/makefile.win

@@ -0,0 +1,52 @@
+#!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):
+#    Stuart Parmenter <pavlov@netscape.com>
+#
+
+DEPTH=..\..\..\..
+include <$(DEPTH)/config/config.mak>
+
+MODULE			= imggif
+LIBRARY_NAME	= imggif
+DLL			= $(OBJDIR)\$(LIBRARY_NAME).dll
+MAKE_OBJ_TYPE	= DLL
+
+OBJS	= \
+		.\$(OBJDIR)\nsGIFDecoder2.obj \
+		.\$(OBJDIR)\GIF2.obj \
+		.\$(OBJDIR)\nsGIFModule.obj \
+		$(NULL)
+
+LLIBS=\
+	$(LIBNSPR) \
+	$(DIST)\lib\xpcom.lib \
+	$(DIST)\lib\gkgfxwin.lib \
+	$(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+install:: $(DLL)
+	$(MAKE_INSTALL) .\$(OBJDIR)\$(LIBRARY_NAME).dll $(DIST)\bin\components
+	$(MAKE_INSTALL) .\$(OBJDIR)\$(LIBRARY_NAME).lib $(DIST)\lib
+
+clobber::
+	rm -f $(DIST)\bin\components\$(LIBRARY_NAME).dll
+	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib

mozilla/modules/libpr0n/decoders/gif/nsGIFDecoder2.cpp

@@ -0,0 +1,506 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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): 
+ *  Chris Saari <saari@netscape.com>
+ */
+
+#include "nsGIFDecoder2.h"
+#include "nsIInputStream.h"
+#include "nsIComponentManager.h"
+#include "nsIImage.h"
+#include "nsMemory.h"
+
+#include "imgIContainerObserver.h"
+
+#include "nsRect.h"
+
+//////////////////////////////////////////////////////////////////////
+// GIF Decoder Implementation
+// This is an adaptor between GIF2 and imgIDecoder
+
+NS_IMPL_ISUPPORTS2(nsGIFDecoder2, imgIDecoder, nsIOutputStream);
+
+nsGIFDecoder2::nsGIFDecoder2()
+{
+  NS_INIT_ISUPPORTS();
+  mImageFrame = nsnull;
+  
+  mGIFStruct = nsnull;
+
+  mAlphaLine = nsnull;
+}
+
+nsGIFDecoder2::~nsGIFDecoder2(void)
+{
+  if (mAlphaLine)
+    nsMemory::Free(mAlphaLine);
+
+  if (mGIFStruct) {
+    gif_destroy(mGIFStruct);
+    mGIFStruct = nsnull;
+  }
+}
+
+//******************************************************************************
+/** imgIDecoder methods **/
+//******************************************************************************
+
+//******************************************************************************
+/* void init (in imgIRequest aRequest); */
+NS_IMETHODIMP nsGIFDecoder2::Init(imgIRequest *aRequest)
+{
+  mImageRequest = aRequest;
+  mObserver = do_QueryInterface(aRequest);  // we're holding 2 strong refs to the request.
+
+  aRequest->GetImage(getter_AddRefs(mImageContainer));
+
+  /* do gif init stuff */
+  /* Always decode to 24 bit pixdepth */
+  
+  PRBool created = gif_create(&mGIFStruct);
+
+  NS_ASSERTION(created, "gif_create failed");
+
+  // Call GIF decoder init routine
+  GIFInit(
+    mGIFStruct,
+    this,
+    NewPixmap,
+    BeginGIF,
+    EndGIF,
+    BeginImageFrame,
+    EndImageFrame,
+    SetupColorspaceConverter,
+    ResetPalette,
+    InitTransparentPixel,
+    DestroyTransparentPixel,
+    HaveDecodedRow,
+    HaveImageAll);
+
+  return NS_OK;
+}
+
+//******************************************************************************
+/* readonly attribute imgIRequest request; */
+NS_IMETHODIMP nsGIFDecoder2::GetRequest(imgIRequest * *aRequest)
+{
+  *aRequest = mImageRequest;
+  NS_IF_ADDREF(*aRequest);
+      
+  return NS_OK;
+}
+
+
+//******************************************************************************
+/** nsIOutputStream methods **/
+//******************************************************************************
+
+//******************************************************************************
+/* void close (); */
+NS_IMETHODIMP nsGIFDecoder2::Close()
+{
+  if (mGIFStruct) {
+    gif_destroy(mGIFStruct);
+    mGIFStruct = nsnull;
+  }
+
+  return NS_OK;
+}
+
+//******************************************************************************
+/* void flush (); */
+NS_IMETHODIMP nsGIFDecoder2::Flush()
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+//******************************************************************************
+/* unsigned long write (in string buf, in unsigned long count); */
+NS_IMETHODIMP nsGIFDecoder2::Write(const char *buf, PRUint32 count, PRUint32 *_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+//******************************************************************************
+/* static callback from nsIInputStream::ReadSegments */
+static NS_METHOD ReadDataOut(nsIInputStream* in,
+                             void* closure,
+                             const char* fromRawSegment,
+                             PRUint32 toOffset,
+                             PRUint32 count,
+                             PRUint32 *writeCount)
+{
+  nsGIFDecoder2 *decoder = NS_STATIC_CAST(nsGIFDecoder2*, closure);
+  *writeCount = decoder->ProcessData((unsigned char*)fromRawSegment, count);
+  return NS_OK;
+}
+
+//******************************************************************************
+PRUint32 nsGIFDecoder2::ProcessData(unsigned char *data, PRUint32 count)
+{
+  // Push the data to the GIF decoder
+  
+  // First we ask if the gif decoder is ready for more data, and if so, push it.
+  // In the new decoder, we should always be able to process more data since
+  // we don't wait to decode each frame in an animation now.
+  if(gif_write_ready(mGIFStruct)) {
+    gif_write(mGIFStruct, data, count);
+  }
+    
+
+  return count; // we always consume all the data
+}
+
+//******************************************************************************
+/* unsigned long writeFrom (in nsIInputStream inStr, in unsigned long count); */
+NS_IMETHODIMP nsGIFDecoder2::WriteFrom(nsIInputStream *inStr, PRUint32 count, PRUint32 *_retval)
+{
+  inStr->ReadSegments(
+    ReadDataOut, // Callback
+    this,     
+    count, 
+    _retval);
+
+    // if error
+    //mRequest->Cancel(NS_BINDING_ABORTED); // XXX is this the correct error ?
+  return NS_OK;
+}
+
+//******************************************************************************
+/* [noscript] unsigned long writeSegments (in nsReadSegmentFun reader, in voidPtr closure, in unsigned long count); */
+NS_IMETHODIMP nsGIFDecoder2::WriteSegments(nsReadSegmentFun reader, void * closure, PRUint32 count, PRUint32 *_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+//******************************************************************************
+/* attribute boolean nonBlocking; */
+NS_IMETHODIMP nsGIFDecoder2::GetNonBlocking(PRBool *aNonBlocking)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+//******************************************************************************
+NS_IMETHODIMP nsGIFDecoder2::SetNonBlocking(PRBool aNonBlocking)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+//******************************************************************************
+/* attribute nsIOutputStreamObserver observer; */
+NS_IMETHODIMP nsGIFDecoder2::GetObserver(nsIOutputStreamObserver * *aObserver)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+//******************************************************************************
+NS_IMETHODIMP nsGIFDecoder2::SetObserver(nsIOutputStreamObserver * aObserver)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+
+
+//******************************************************************************
+// GIF decoder callback methods. Part of pulic API for GIF2
+//******************************************************************************
+
+//******************************************************************************
+int BeginGIF(
+  void*    aClientData,
+  PRUint32 aLogicalScreenWidth, 
+  PRUint32 aLogicalScreenHeight,
+  PRUint8  aBackgroundRGBIndex)
+{
+  // copy GIF info into imagelib structs
+  nsGIFDecoder2 *decoder = NS_STATIC_CAST(nsGIFDecoder2*, aClientData);
+
+  if (decoder->mObserver)
+    decoder->mObserver->OnStartDecode(nsnull, nsnull);
+
+  decoder->mImageContainer->Init(aLogicalScreenWidth, aLogicalScreenHeight, decoder->mObserver);
+
+  if (decoder->mObserver)
+    decoder->mObserver->OnStartContainer(nsnull, nsnull, decoder->mImageContainer);
+
+  return 0;
+}
+
+//******************************************************************************
+int EndGIF(
+    void*    aClientData,
+    int      aAnimationLoopCount)
+{
+  nsGIFDecoder2 *decoder = NS_STATIC_CAST(nsGIFDecoder2*, aClientData);
+  if (decoder->mObserver) {
+    decoder->mObserver->OnStopContainer(nsnull, nsnull, decoder->mImageContainer);
+    decoder->mObserver->OnStopDecode(nsnull, nsnull, NS_OK, nsnull);
+  }
+  
+  decoder->mImageContainer->SetLoopCount(aAnimationLoopCount);
+  decoder->mImageContainer->DecodingComplete();
+  return 0;
+}
+
+//******************************************************************************
+int BeginImageFrame(
+  void*    aClientData,
+  PRUint32 aFrameNumber,   /* Frame number, 1-n */
+  PRUint32 aFrameXOffset,  /* X offset in logical screen */
+  PRUint32 aFrameYOffset,  /* Y offset in logical screen */
+  PRUint32 aFrameWidth,    
+  PRUint32 aFrameHeight,   
+  GIF_RGB* aTransparencyChromaKey) /* don't have this info yet */
+{
+  nsGIFDecoder2* decoder = NS_STATIC_CAST(nsGIFDecoder2*, aClientData);
+  
+  decoder->mImageFrame = nsnull; // clear out our current frame reference
+  decoder->mGIFStruct->x_offset = aFrameXOffset;
+  decoder->mGIFStruct->y_offset = aFrameYOffset;
+  decoder->mGIFStruct->width = aFrameWidth;
+  decoder->mGIFStruct->height = aFrameHeight;
+
+  return 0;
+}
+
+//******************************************************************************
+int EndImageFrame(
+  void*    aClientData, 
+  PRUint32 aFrameNumber,
+  PRUint32 aDelayTimeout)  /* Time this frame should be displayed before the next frame 
+                              we can't have this in the image frame init because it doesn't
+                              show up in the GIF frame header, it shows up in a sub control
+                              block.*/
+{
+  nsGIFDecoder2* decoder = NS_STATIC_CAST(nsGIFDecoder2*, aClientData);
+  
+  // We actually have the timeout information before we get the lzw encoded image
+  // data, at least according to the spec, but we delay in setting the timeout for
+  // the image until here to help ensure that we have the whole image frame decoded before
+  // we go off and try to display another frame.
+
+// XXXXXXXX
+  // decoder->mImageFrame->SetTimeout(aDelayTimeout);
+  decoder->mImageContainer->EndFrameDecode(aFrameNumber, aDelayTimeout);
+
+  if (decoder->mObserver)
+    decoder->mObserver->OnStopFrame(nsnull, nsnull, decoder->mImageFrame);
+
+  decoder->mImageFrame = nsnull;
+  return 0;
+}
+  
+
+
+//******************************************************************************
+// GIF decoder callback
+int HaveImageAll(
+  void* aClientData)
+{
+  return 0;
+}
+
+//******************************************************************************
+// GIF decoder callback notification that it has decoded a row
+int HaveDecodedRow(
+  void* aClientData,
+  PRUint8* aRowBufPtr,   // Pointer to single scanline temporary buffer
+  PRUint8* aRGBrowBufPtr,// Pointer to temporary storage for dithering/mapping
+  int aXOffset,          // With respect to GIF logical screen origin
+  int aLength,           // Length of the row?
+  int aRowNumber,        // Row number?
+  int aDuplicateCount,   // Number of times to duplicate the row?
+  PRUint8 aDrawMode,     // il_draw_mode
+  int aInterlacePass)    // interlace pass (1-4)
+{
+  nsGIFDecoder2* decoder = NS_STATIC_CAST(nsGIFDecoder2*, aClientData);
+  PRUint32 bpr, abpr;
+  // We have to delay allocation of the image frame until now because
+  // we won't have control block info (transparency) until now. The conrol
+  // block of a GIF stream shows up after the image header since transparency
+  // is added in GIF89a and control blocks are how the extensions are done.
+  // How annoying.
+  if(! decoder->mImageFrame) {
+    gfx_format format = gfxIFormats::RGB;
+    if (decoder->mGIFStruct->is_transparent)
+      format = gfxIFormats::RGB_A1;
+
+#ifdef XP_PC
+    // XXX this works...
+    format += 1; // RGB to BGR
+#endif
+
+    // initalize the frame and append it to the container
+    decoder->mImageFrame = do_CreateInstance("@mozilla.org/gfx/image/frame;2");
+    decoder->mImageFrame->Init(
+      decoder->mGIFStruct->x_offset, decoder->mGIFStruct->y_offset, 
+      decoder->mGIFStruct->width, decoder->mGIFStruct->height, format);
+      
+    decoder->mImageContainer->AppendFrame(decoder->mImageFrame);
+
+    if (decoder->mObserver)
+      decoder->mObserver->OnStartFrame(nsnull, nsnull, decoder->mImageFrame);
+
+    decoder->mImageFrame->GetImageBytesPerRow(&bpr);
+    decoder->mImageFrame->GetAlphaBytesPerRow(&abpr);
+
+    if (format == gfxIFormats::RGB_A1 || format == gfxIFormats::BGR_A1) {
+      if (decoder->mAlphaLine)
+        nsMemory::Free(decoder->mAlphaLine);
+      decoder->mAlphaLine = (PRUint8 *)nsMemory::Alloc(abpr);
+    }
+  } else {
+    decoder->mImageFrame->GetImageBytesPerRow(&bpr);
+    decoder->mImageFrame->GetAlphaBytesPerRow(&abpr);
+  }
+  
+  if (aRowBufPtr) {
+    nscoord width;
+
+    decoder->mImageFrame->GetWidth(&width);
+    PRUint32 iwidth = width;
+
+    gfx_format format;
+    decoder->mImageFrame->GetFormat(&format);
+
+    // XXX map the data into colors
+    int cmapsize;
+    GIF_RGB* cmap;
+    if(decoder->mGIFStruct->local_colormap) {
+      cmapsize = decoder->mGIFStruct->local_colormap_size;
+      cmap = decoder->mGIFStruct->local_colormap;
+    } else {
+      cmapsize = decoder->mGIFStruct->global_colormap_size;
+      cmap = decoder->mGIFStruct->global_colormap;
+    }
+
+    PRUint8* rgbRowIndex = aRGBrowBufPtr;
+    PRUint8* rowBufIndex = aRowBufPtr;
+        
+    switch (format) {
+    case gfxIFormats::RGB:
+      {
+        while(rowBufIndex != decoder->mGIFStruct->rowend) {
+#ifdef XP_MAC
+          *rgbRowIndex++ = 0; // Mac is always 32bits per pixel, this is pad
+#endif
+          *rgbRowIndex++ = cmap[PRUint8(*rowBufIndex)].red;
+          *rgbRowIndex++ = cmap[PRUint8(*rowBufIndex)].green;
+          *rgbRowIndex++ = cmap[PRUint8(*rowBufIndex)].blue;
+          ++rowBufIndex;
+        }
+
+        decoder->mImageFrame->SetImageData((PRUint8*)aRGBrowBufPtr, bpr, aRowNumber*bpr);
+      }
+      break;
+    case gfxIFormats::BGR:
+      {
+        while(rowBufIndex != decoder->mGIFStruct->rowend) {
+          *rgbRowIndex++ = cmap[PRUint8(*rowBufIndex)].blue;
+          *rgbRowIndex++ = cmap[PRUint8(*rowBufIndex)].green;
+          *rgbRowIndex++ = cmap[PRUint8(*rowBufIndex)].red;
+          ++rowBufIndex;
+        }
+
+        decoder->mImageFrame->SetImageData((PRUint8*)aRGBrowBufPtr, bpr, aRowNumber*bpr);
+      }
+      break;
+    case gfxIFormats::RGB_A1:
+    case gfxIFormats::BGR_A1:
+      {
+        memset(aRGBrowBufPtr, 0, bpr);
+        memset(decoder->mAlphaLine, 0, abpr);
+        PRUint32 iwidth = (PRUint32)width;
+        for (PRUint32 x=0; x<iwidth; x++) {
+          if (*rowBufIndex != decoder->mGIFStruct->tpixel) {
+#ifdef XP_PC
+            *rgbRowIndex++ = cmap[PRUint8(*rowBufIndex)].blue;
+            *rgbRowIndex++ = cmap[PRUint8(*rowBufIndex)].green;
+            *rgbRowIndex++ = cmap[PRUint8(*rowBufIndex)].red;
+#else
+#ifdef XP_MAC
+          *rgbRowIndex++ = 0; // Mac is always 32bits per pixel, this is pad
+#endif
+            *rgbRowIndex++ = cmap[PRUint8(*rowBufIndex)].red;
+            *rgbRowIndex++ = cmap[PRUint8(*rowBufIndex)].green;
+            *rgbRowIndex++ = cmap[PRUint8(*rowBufIndex)].blue;
+#endif
+            decoder->mAlphaLine[x>>3] |= 1<<(7-x&0x7);
+          } else {
+#ifdef XP_MAC
+            rgbRowIndex+=4;
+#else
+            rgbRowIndex+=3;
+#endif
+          }
+
+          ++rowBufIndex;
+        }
+        decoder->mImageFrame->SetImageData((PRUint8*)aRGBrowBufPtr, bpr, aRowNumber*bpr);
+        decoder->mImageFrame->SetAlphaData(decoder->mAlphaLine, abpr, aRowNumber*abpr);
+      }
+      break;
+    default:
+      break;
+
+    }
+
+    nsRect r(0, aRowNumber, width, 1);
+
+    decoder->mObserver->OnDataAvailable(nsnull, nsnull, decoder->mImageFrame, &r);
+  }
+
+  return 0;
+}
+
+//******************************************************************************
+int ResetPalette()
+{
+  return 0;
+}
+
+//******************************************************************************
+int SetupColorspaceConverter()
+{
+  return 0;
+}
+
+//******************************************************************************
+int EndImageFrame()
+{
+  return 0;
+}
+
+//******************************************************************************
+int NewPixmap()
+{
+  return 0;
+}
+
+//******************************************************************************
+int InitTransparentPixel()
+{
+  return 0;
+}
+
+//******************************************************************************
+int DestroyTransparentPixel()
+{
+  return 0;
+}

mozilla/modules/libpr0n/decoders/gif/nsGIFDecoder2.h

@@ -0,0 +1,114 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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): 
+ *  Chris Saari <saari@netscape.com>
+ */
+
+#ifndef _nsGIFDecoder2_h
+#define _nsGIFDecoder2_h
+
+#include "nsCOMPtr.h"
+#include "imgIDecoder.h"
+#include "imgIContainer.h"
+#include "imgIDecoderObserver.h"
+#include "gfxIImageFrame.h"
+#include "imgIRequest.h"
+
+#include "GIF2.h"
+
+#define NS_GIFDECODER2_CID \
+{ /* 797bec5a-1dd2-11b2-a7f8-ca397e0179c4 */         \
+     0x797bec5a,                                     \
+     0x1dd2,                                         \
+     0x11b2,                                         \
+    {0xa7, 0xf8, 0xca, 0x39, 0x7e, 0x01, 0x79, 0xc4} \
+}
+
+//////////////////////////////////////////////////////////////////////
+// nsGIFDecoder2 Definition
+
+class nsGIFDecoder2 : public imgIDecoder   
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_IMGIDECODER
+  NS_DECL_NSIOUTPUTSTREAM
+
+  nsGIFDecoder2();
+  virtual ~nsGIFDecoder2();
+
+  static NS_METHOD Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
+  
+  NS_METHOD ProcessData(unsigned char *data, PRUint32 count);
+  
+  nsCOMPtr<imgIContainer> mImageContainer;
+  nsCOMPtr<gfxIImageFrame> mImageFrame;
+  nsCOMPtr<imgIRequest> mImageRequest;
+  nsCOMPtr<imgIDecoderObserver> mObserver; // this is just qi'd from mRequest for speed
+  
+  gif_struct *mGIFStruct;
+  
+  PRUint8 *mAlphaLine;
+};
+
+// static callbacks for the GIF decoder
+static int PR_CALLBACK BeginGIF(
+  void*    aClientData,
+  PRUint32 aLogicalScreenWidth, 
+  PRUint32 aLogicalScreenHeight,
+  PRUint8  aBackgroundRGBIndex);
+  
+static int PR_CALLBACK HaveDecodedRow(
+  void* aClientData,
+  PRUint8* aRowBufPtr,   // Pointer to single scanline temporary buffer
+  PRUint8* aRGBrowBufPtr,// Pointer to temporary storage for dithering/mapping
+  int aXOffset,          // With respect to GIF logical screen origin
+  int aLength,           // Length of the row?
+  int aRow,              // Row number?
+  int aDuplicateCount,   // Number of times to duplicate the row?
+  PRUint8 aDrawMode,     // il_draw_mode
+  int aInterlacePass);
+    
+static int PR_CALLBACK NewPixmap();
+
+static int PR_CALLBACK EndGIF(
+  void*    aClientData,
+  int      aAnimationLoopCount);
+  
+static int PR_CALLBACK BeginImageFrame(
+  void*    aClientData,
+  PRUint32 aFrameNumber,   /* Frame number, 1-n */
+  PRUint32 aFrameXOffset,  /* X offset in logical screen */
+  PRUint32 aFrameYOffset,  /* Y offset in logical screen */
+  PRUint32 aFrameWidth,    
+  PRUint32 aFrameHeight,   
+  GIF_RGB* aTransparencyChromaKey);
+static int PR_CALLBACK EndImageFrame(
+  void*    aClientData, 
+  PRUint32 aFrameNumber,
+  PRUint32 aDelayTimeout);
+static int PR_CALLBACK SetupColorspaceConverter();
+static int PR_CALLBACK ResetPalette();
+static int PR_CALLBACK InitTransparentPixel();
+static int PR_CALLBACK DestroyTransparentPixel();
+
+static int PR_CALLBACK HaveImageAll(
+  void* aClientData);
+#endif

mozilla/modules/libpr0n/decoders/gif/nsGIFModule.cpp

@@ -0,0 +1,41 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you 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): 
+ *   Chris Saari <saari@netscape.com>
+ */
+
+#include "nsGIFDecoder2.h"
+#include "nsIComponentManager.h"
+#include "nsIGenericFactory.h"
+#include "nsISupports.h"
+#include "nsCOMPtr.h"
+
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsGIFDecoder2)
+
+static nsModuleComponentInfo components[] =
+{
+  { "GIF Decoder",
+     NS_GIFDECODER2_CID,
+     "@mozilla.org/image/decoder;2?type=image/gif",
+     nsGIFDecoder2Constructor, },
+};
+
+NS_IMPL_NSGETMODULE("nsGIFModule2", components)
+

mozilla/modules/libpr0n/decoders/gif/win32.order

@@ -0,0 +1,18 @@
+?AddRef@nsGIFDecoder2@@UAGKXZ ; 2550
+?Release@nsGIFDecoder2@@UAGKXZ ; 2550
+?gif_write_ready@@YAEPAUgif_struct@@@Z ; 1624
+?ProcessData@nsGIFDecoder2@@QAGIPAEI@Z ; 1624
+?gif_write@@YAHPAUgif_struct@@PBEI@Z ; 1624
+?WriteFrom@nsGIFDecoder2@@UAGIPAVnsIInputStream@@IPAI@Z ; 1309
+?Close@nsGIFDecoder2@@UAGIXZ ; 1275
+??_GnsGIFDecoder2@@UAEPAXI@Z ; 1275
+??0nsGIFDecoder2@@QAE@XZ ; 1275
+??1nsGIFDecoder2@@UAE@XZ ; 1275
+?QueryInterface@nsGIFDecoder2@@UAGIABUnsID@@PAPAX@Z ; 1275
+?GIFInit@@YAHPAUgif_struct@@PAXP6AHXZP6AH1IIE@ZP6AH1H@ZP6AH1IIIIIPAU_GIF_RGB@@@ZP6AH1II@Z2222P6AH1PAE8HHHHEH@ZP6AH1@Z@Z ; 1275
+?Init@nsGIFDecoder2@@UAGIPAVimgIRequest@@@Z ; 1275
+?Flush@nsGIFDecoder2@@UAGIXZ ; 1275
+?gif_destroy@@YAXPAUgif_struct@@@Z ; 1275
+?gif_create@@YAHPAPAUgif_struct@@@Z ; 1275
+?il_BACat@@YAPADPAPADIPBDI@Z ; 698
+_NSGetModule ; 1

mozilla/modules/libpr0n/decoders/icon/mac/nsIconChannel.cpp

@@ -0,0 +1,378 @@
+/* -*- Mode: C++; tab-width: 2; 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 mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Brian Ryner.
+ * Portions created by Brian Ryner are Copyright (C) 2000 Brian Ryner.
+ * All Rights Reserved.
+ *
+ * Contributor(s): 
+ *   Scott MacGregor <mscott@netscape.com>
+ */
+
+
+#include "nsIconChannel.h"
+#include "nsIServiceManager.h"
+#include "nsIInterfaceRequestor.h"
+#include "nsXPIDLString.h"
+#include "nsMimeTypes.h"
+#include "nsMemory.h"
+#include "nsIStringStream.h"
+#include "nsIURL.h"
+#include "nsNetUtil.h"
+#include "nsIMimeService.h"
+#include "nsCExternalHandlerService.h"
+#include "plstr.h"
+
+#include <Files.h>
+#include <QuickDraw.h>
+
+// nsIconChannel methods
+nsIconChannel::nsIconChannel()
+{
+  NS_INIT_REFCNT();
+  mStatus = NS_OK;
+}
+
+nsIconChannel::~nsIconChannel() 
+{}
+
+NS_IMPL_THREADSAFE_ISUPPORTS2(nsIconChannel, 
+                              nsIChannel, 
+                              nsIRequest)
+
+nsresult nsIconChannel::Init(nsIURI* uri)
+{
+  nsresult rv;
+  NS_ASSERTION(uri, "no uri");
+  mUrl = uri;
+  return NS_OK;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// nsIRequest methods:
+
+NS_IMETHODIMP nsIconChannel::GetName(PRUnichar* *result)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsIconChannel::IsPending(PRBool *result)
+{
+  NS_NOTREACHED("nsIconChannel::IsPending");
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsIconChannel::GetStatus(nsresult *status)
+{
+  *status = mStatus;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconChannel::Cancel(nsresult status)
+{
+  NS_ASSERTION(NS_FAILED(status), "shouldn't cancel with a success code");
+  nsresult rv = NS_ERROR_FAILURE;
+
+  mStatus = status;
+  return rv;
+}
+
+NS_IMETHODIMP nsIconChannel::Suspend(void)
+{
+  NS_NOTREACHED("nsIconChannel::Suspend");
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsIconChannel::Resume(void)
+{
+  NS_NOTREACHED("nsIconChannel::Resume");
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// nsIChannel methods:
+
+NS_IMETHODIMP nsIconChannel::GetOriginalURI(nsIURI* *aURI)
+{
+  *aURI = mOriginalURI ? mOriginalURI : mUrl;
+  NS_ADDREF(*aURI);
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconChannel::SetOriginalURI(nsIURI* aURI)
+{
+  mOriginalURI = aURI;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconChannel::GetURI(nsIURI* *aURI)
+{
+  *aURI = mUrl;
+  NS_IF_ADDREF(*aURI);
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconChannel::SetURI(nsIURI* aURI)
+{
+  mUrl = aURI;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsIconChannel::Open(nsIInputStream **_retval)
+{
+  return NS_ERROR_FAILURE;
+}
+
+
+NS_IMETHODIMP nsIconChannel::AsyncOpen(nsIStreamListener *aListener, nsISupports *ctxt)
+{
+  // get the file name from the url
+  nsXPIDLCString fileName; // will contain a dummy file we'll use to figure out the type of icon desired.
+  nsXPIDLCString filePath; // will contain an optional parameter for small vs. large icon. default is small
+  mUrl->GetHost(getter_Copies(fileName));
+  nsCOMPtr<nsIURL> url (do_QueryInterface(mUrl));
+  if (url)
+    url->GetFileBaseName(getter_Copies(filePath));
+  nsresult rv = NS_OK;  
+  nsCOMPtr<nsIMIMEService> mimeService (do_GetService(NS_MIMESERVICE_CONTRACTID, &rv));
+  NS_ENSURE_SUCCESS(rv, rv);
+  
+  // extract the extension out of the dummy file so we can look it up in the mime service.
+  char * chFileName = fileName.get(); // get the underlying buffer
+  char * fileExtension = PL_strrchr(chFileName, '.');
+  if (!fileExtension) return NS_ERROR_FAILURE; // no file extension to work from.
+  
+  // look the file extension up in the registry.
+  nsCOMPtr<nsIMIMEInfo> mimeInfo;
+  mimeService->GetFromExtension(fileExtension, getter_AddRefs(mimeInfo));
+  NS_ENSURE_TRUE(mimeInfo, NS_ERROR_FAILURE);
+  
+  // get the mac creator and file type for this mime object
+  PRUint32 macType;
+  PRUint32 macCreator;
+  
+  mimeInfo->GetMacType(&macType);
+  mimeInfo->GetMacCreator(&macCreator);
+  
+  // get a refernce to the desktop database  
+  DTPBRec 	pb;
+  OSErr err = noErr;
+  
+  memset(&pb, 0, sizeof(DTPBRec));
+  pb.ioCompletion = nil;
+  pb.ioVRefNum = 0; // default desktop volume
+  pb.ioNamePtr = nil;
+  err = PBDTGetPath(&pb);
+  if (err != noErr) return NS_ERROR_FAILURE;
+  
+  pb.ioFileCreator = macCreator;
+  pb.ioFileType = macType;
+  pb.ioCompletion = nil;
+  pb.ioTagInfo = 0;
+  
+  PRUint32 numPixelsInRow = 0;
+  if (filePath && !nsCRT::strcmp(filePath, "large"))
+  {
+    pb.ioDTReqCount = kLarge8BitIconSize;
+    pb.ioIconType = kLarge8BitIcon;
+    numPixelsInRow = 32;
+  }
+  else
+  {
+    pb.ioDTReqCount = kSmall8BitIconSize;
+    pb.ioIconType = kSmall8BitIcon;  
+    numPixelsInRow = 16;
+  }
+  
+  // allocate a buffer large enough to handle the icon
+  PRUint8 * bitmapData = (PRUint8 *) nsMemory::Alloc (pb.ioDTReqCount);
+  pb.ioDTBuffer = (Ptr) bitmapData;
+  
+  err = PBDTGetIcon(&pb, false);
+  if (err != noErr) return NS_ERROR_FAILURE; // unable to fetch the icon....
+  
+  nsCString iconBuffer;
+  iconBuffer.Assign((char) numPixelsInRow);
+  iconBuffer.Append((char) numPixelsInRow);
+  CTabHandle cTabHandle = GetCTable(72);
+  if (!cTabHandle) return NS_ERROR_FAILURE;
+  
+  HLock((Handle) cTabHandle);
+  CTabPtr colTable = *cTabHandle;
+  RGBColor rgbCol;
+  PRUint8 redValue, greenValue, blueValue;
+  
+  for (PRUint32 index = 0; index < pb.ioDTReqCount; index ++)
+  {
+
+  	// each byte in bitmapData needs to be converted from an 8 bit system color into 
+    // 24 bit RGB data which our special icon image decoder can understand.
+    ColorSpec colSpec =  colTable->ctTable[ bitmapData[index]];
+    rgbCol = colSpec.rgb;
+    
+    redValue = rgbCol.red & 0xff;
+    greenValue = rgbCol.green & 0xff;
+    blueValue = rgbCol.blue & 0xff;
+    
+    // for some reason the image code on the mac expects each RGB pixel value to be padded with a preceding byte.
+    // so add the padding here....
+    iconBuffer.Append((char) 0);
+    iconBuffer.Append((char) redValue);
+    iconBuffer.Append((char) greenValue);
+    iconBuffer.Append((char) blueValue);
+  }
+  
+  
+  HUnlock((Handle) cTabHandle);
+  DisposeCTable(cTabHandle);
+  nsMemory::Free(bitmapData);
+  
+  // now that the color bitmask is taken care of, we need to do the same thing again for the transparency
+  // bit mask....
+  if (filePath && !nsCRT::strcmp(filePath, "large"))
+  {
+    pb.ioDTReqCount = kLargeIconSize;
+    pb.ioIconType = kLargeIcon;
+  }
+  else
+  {
+    pb.ioDTReqCount = kSmallIconSize;
+    pb.ioIconType = kSmallIcon; 
+  }
+  
+  // allocate a buffer large enough to handle the icon
+  bitmapData = (PRUint8 *) nsMemory::Alloc (pb.ioDTReqCount);
+  pb.ioDTBuffer = (Ptr) bitmapData;
+  err = PBDTGetIcon(&pb, false);
+  PRUint32 index = pb.ioDTReqCount/2;
+  while (index < pb.ioDTReqCount)
+  {
+   iconBuffer.Append((char) bitmapData[index]);
+   iconBuffer.Append((char) bitmapData[index + 1]);
+   if (numPixelsInRow == 32)
+   {
+     iconBuffer.Append((char) bitmapData[index + 2]);
+     iconBuffer.Append((char) bitmapData[index + 3]);
+     index += 4;
+   }
+   else
+   {
+    iconBuffer.Append((char) 255); // 2 bytes of padding
+    iconBuffer.Append((char) 255);
+    index += 2;
+   }
+  }
+  
+  nsMemory::Free(bitmapData);
+  
+  // turn our nsString into a stream looking object...
+  aListener->OnStartRequest(this, ctxt);
+
+ // turn our string into a stream...
+ nsCOMPtr<nsISupports> streamSupports;
+ NS_NewByteInputStream(getter_AddRefs(streamSupports), iconBuffer.get(), iconBuffer.Length());
+
+ nsCOMPtr<nsIInputStream> inputStr (do_QueryInterface(streamSupports));
+ aListener->OnDataAvailable(this, ctxt, inputStr, 0, iconBuffer.Length());
+ aListener->OnStopRequest(this, ctxt, NS_OK, nsnull);
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconChannel::GetLoadAttributes(PRUint32 *aLoadAttributes)
+{
+  *aLoadAttributes = mLoadAttributes;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconChannel::SetLoadAttributes(PRUint32 aLoadAttributes)
+{
+  mLoadAttributes = aLoadAttributes;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconChannel::GetContentType(char* *aContentType) 
+{
+  if (!aContentType) return NS_ERROR_NULL_POINTER;
+
+  *aContentType = nsCRT::strdup("image/icon");
+  if (!*aContentType) return NS_ERROR_OUT_OF_MEMORY;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsIconChannel::SetContentType(const char *aContentType)
+{
+  //It doesn't make sense to set the content-type on this type
+  // of channel...
+  return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsIconChannel::GetContentLength(PRInt32 *aContentLength)
+{
+  *aContentLength = mContentLength;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconChannel::SetContentLength(PRInt32 aContentLength)
+{
+  NS_NOTREACHED("nsIconChannel::SetContentLength");
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsIconChannel::GetLoadGroup(nsILoadGroup* *aLoadGroup)
+{
+  *aLoadGroup = mLoadGroup;
+  NS_IF_ADDREF(*aLoadGroup);
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconChannel::SetLoadGroup(nsILoadGroup* aLoadGroup)
+{
+  mLoadGroup = aLoadGroup;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconChannel::GetOwner(nsISupports* *aOwner)
+{
+  *aOwner = mOwner.get();
+  NS_IF_ADDREF(*aOwner);
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconChannel::SetOwner(nsISupports* aOwner)
+{
+  mOwner = aOwner;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconChannel::GetNotificationCallbacks(nsIInterfaceRequestor* *aNotificationCallbacks)
+{
+  *aNotificationCallbacks = mCallbacks.get();
+  NS_IF_ADDREF(*aNotificationCallbacks);
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconChannel::SetNotificationCallbacks(nsIInterfaceRequestor* aNotificationCallbacks)
+{
+  mCallbacks = aNotificationCallbacks;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconChannel::GetSecurityInfo(nsISupports * *aSecurityInfo)
+{
+  *aSecurityInfo = nsnull;
+  return NS_OK;
+}
+

mozilla/modules/libpr0n/decoders/icon/mac/nsIconChannel.h

@@ -0,0 +1,56 @@
+/* -*- Mode: C++; tab-width: 2; 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 mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Brian Ryner.
+ * Portions created by Brian Ryner are Copyright (C) 2000 Brian Ryner.
+ * All Rights Reserved.
+ *
+ * Contributor(s): 
+ *  Scott MacGregor <mscott@netscape.com>
+ */
+
+#ifndef nsIconChannel_h___
+#define nsIconChannel_h___
+
+#include "nsCOMPtr.h"
+#include "nsXPIDLString.h"
+#include "nsIChannel.h"
+#include "nsILoadGroup.h"
+#include "nsIInterfaceRequestor.h"
+#include "nsIURI.h"
+
+class nsIconChannel : public nsIChannel
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIREQUEST
+  NS_DECL_NSICHANNEL
+
+  nsIconChannel();
+  virtual ~nsIconChannel();
+
+  nsresult Init(nsIURI* uri);
+
+protected:
+  nsCOMPtr<nsIURI> mUrl;
+  nsCOMPtr<nsIURI> mOriginalURI;
+  PRUint32         mLoadAttributes;
+  PRInt32          mContentLength;
+  nsCOMPtr<nsILoadGroup> mLoadGroup;
+  nsCOMPtr<nsIInterfaceRequestor> mCallbacks;
+  nsCOMPtr<nsISupports>  mOwner; 
+  nsresult mStatus;
+};
+
+#endif /* nsIconChannel_h___ */

mozilla/modules/libpr0n/decoders/icon/makefile.win

@@ -0,0 +1,62 @@
+#!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):
+#   Scott MacGregor <mscott@netscape.com>
+#
+
+DEPTH=..\..\..\..
+include <$(DEPTH)/config/config.mak>
+
+DIR=win
+
+MODULE			= imgicon
+LIBRARY_NAME	= imgicon
+DLL			= $(OBJDIR)\$(LIBRARY_NAME).dll
+MAKE_OBJ_TYPE	= DLL
+
+OBJS	= \
+		.\$(OBJDIR)\nsIconDecoder.obj \
+		.\$(OBJDIR)\nsIconModule.obj  \
+    .\$(OBJDIR)\nsIconProtocolHandler.obj \
+		$(NULL)
+
+LLIBS=\
+	$(LIBNSPR)               \
+	$(DIST)\lib\xpcom.lib    \
+	$(DIST)\lib\gkgfxwin.lib \
+  $(DIST)\lib\imgiconwin_s.lib \
+	$(NULL)
+
+WIN_LIBS= shell32.lib
+
+INCS = $(INCS)                                         \
+        -I$(DEPTH)\dist\include                        \
+        -I$(DEPTH)\modules\libpr0n\decoders\icon\win   \
+        $(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+install:: $(DLL)
+	$(MAKE_INSTALL) .\$(OBJDIR)\$(LIBRARY_NAME).dll $(DIST)\bin\components
+	$(MAKE_INSTALL) .\$(OBJDIR)\$(LIBRARY_NAME).lib $(DIST)\lib
+
+clobber::
+	rm -f $(DIST)\bin\components\$(LIBRARY_NAME).dll
+	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib

mozilla/modules/libpr0n/decoders/icon/nsIconDecoder.cpp

@@ -0,0 +1,195 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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):
+ *   Scott MacGregor <mscott@netscape.com>
+ *
+ */
+
+#include "nsIconDecoder.h"
+#include "nsIInputStream.h"
+#include "imgIContainer.h"
+#include "imgIContainerObserver.h"
+#include "nspr.h"
+#include "nsIComponentManager.h"
+#include "nsRect.h"
+
+NS_IMPL_THREADSAFE_ADDREF(nsIconDecoder);
+NS_IMPL_THREADSAFE_RELEASE(nsIconDecoder);
+
+NS_INTERFACE_MAP_BEGIN(nsIconDecoder)
+   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIOutputStream)
+   NS_INTERFACE_MAP_ENTRY(nsIOutputStream)
+   NS_INTERFACE_MAP_ENTRY(imgIDecoder)
+NS_INTERFACE_MAP_END_THREADSAFE
+
+nsIconDecoder::nsIconDecoder()
+{
+  NS_INIT_ISUPPORTS();
+}
+
+nsIconDecoder::~nsIconDecoder()
+{ }
+
+
+/** imgIDecoder methods **/
+
+NS_IMETHODIMP nsIconDecoder::Init(imgIRequest *aRequest)
+{
+  mRequest = aRequest;
+
+  mObserver = do_QueryInterface(aRequest);  // we're holding 2 strong refs to the request.
+
+  aRequest->GetImage(getter_AddRefs(mImage));
+
+  mFrame = do_CreateInstance("@mozilla.org/gfx/image/frame;2");
+  if (!mFrame) return NS_ERROR_FAILURE;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconDecoder::GetRequest(imgIRequest * *aRequest)
+{
+  *aRequest = mRequest;
+  NS_ADDREF(*aRequest);
+  return NS_OK;
+}
+
+/** nsIOutputStream methods **/
+
+NS_IMETHODIMP nsIconDecoder::Close()
+{
+  if (mObserver) 
+  {
+    mObserver->OnStopFrame(nsnull, nsnull, mFrame);
+    mObserver->OnStopContainer(nsnull, nsnull, mImage);
+    mObserver->OnStopDecode(nsnull, nsnull, NS_OK, nsnull);
+  }
+  
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconDecoder::Flush()
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsIconDecoder::Write(const char *buf, PRUint32 count, PRUint32 *_retval)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsIconDecoder::WriteFrom(nsIInputStream *inStr, PRUint32 count, PRUint32 *_retval)
+{
+  nsresult rv;
+
+  char *buf = (char *)PR_Malloc(count);
+  if (!buf) return NS_ERROR_OUT_OF_MEMORY; /* we couldn't allocate the object */
+ 
+  // read the data from the input stram...
+  PRUint32 readLen;
+  rv = inStr->Read(buf, count, &readLen);
+
+  char *data = buf;
+
+  if (NS_FAILED(rv)) return rv;
+
+  // since WriteFrom is only called once, go ahead and fire the on start notifications..
+
+  mObserver->OnStartDecode(nsnull, nsnull);
+  PRUint32 i = 0;
+  // Read size
+  PRInt32 w, h;
+  w = data[0];
+  h = data[1];
+
+  data += 2;
+
+  readLen -= i + 2;
+
+  mImage->Init(w, h, mObserver);
+  if (mObserver)
+    mObserver->OnStartContainer(nsnull, nsnull, mImage);
+
+  mFrame->Init(0, 0, w, h, gfxIFormats::RGB_A1);
+  mImage->AppendFrame(mFrame);
+  if (mObserver)
+    mObserver->OnStartFrame(nsnull, nsnull, mFrame);
+  
+  PRUint32 bpr, abpr;
+  nscoord width, height;
+  mFrame->GetImageBytesPerRow(&bpr);
+  mFrame->GetAlphaBytesPerRow(&abpr);
+  mFrame->GetWidth(&width);
+  mFrame->GetHeight(&height);
+  
+  i = 0;
+  PRInt32 rownum = 0;  // XXX this better not have a decimal
+  
+  PRInt32 wroteLen = 0;
+
+  do 
+  {
+    PRUint8 *line = (PRUint8*)data + i*bpr;
+    mFrame->SetImageData(line, bpr, (rownum++)*bpr);
+
+    nsRect r(0, rownum, width, 1);
+    mObserver->OnDataAvailable(nsnull, nsnull, mFrame, &r);
+
+    wroteLen += bpr ;
+    i++;
+  } while(rownum < height);
+
+
+ // now we want to send in the alpha data...
+ for (rownum = 0; rownum < height; rownum ++)
+ {
+  PRUint8 * line = (PRUint8*) data + abpr * rownum + height*bpr;
+  mFrame->SetAlphaData(line, abpr, (rownum)*abpr);   
+ } 
+
+  PR_FREEIF(buf);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconDecoder::WriteSegments(nsReadSegmentFun reader, void * closure, PRUint32 count, PRUint32 *_retval)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsIconDecoder::GetNonBlocking(PRBool *aNonBlocking)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsIconDecoder::SetNonBlocking(PRBool aNonBlocking)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsIconDecoder::GetObserver(nsIOutputStreamObserver * *aObserver)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsIconDecoder::SetObserver(nsIOutputStreamObserver * aObserver)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}

mozilla/modules/libpr0n/decoders/icon/nsIconDecoder.h

@@ -0,0 +1,79 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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):
+ *   Scott MacGregor <mscott@netscape.com>
+ */
+
+#ifndef nsIconDecoder_h__
+#define nsIconDecoder_h__
+
+#include "imgIDecoder.h"
+
+#include "nsCOMPtr.h"
+
+#include "imgIContainer.h"
+#include "imgIDecoderObserver.h"
+#include "gfxIImageFrame.h"
+#include "imgIRequest.h"
+
+#define NS_ICONDECODER_CID                           \
+{ /* FFC08380-256C-11d5-9905-001083010E9B */         \
+     0xffc08380,                                     \
+     0x256c,                                         \
+     0x11d5,                                         \
+    { 0x99, 0x5, 0x0, 0x10, 0x83, 0x1, 0xe, 0x9b }   \
+}
+
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+// The icon decoder is a decoder specifically tailored for loading icons 
+// from the OS. We've defined our own little format to represent these icons
+// and this decoder takes that format and converts it into 24-bit RGB with alpha channel
+// support. It was modeled a bit off the PPM decoder.
+//
+// Assumptions about the decoder:
+// (1) We receive ALL of the data from the icon channel in one OnDataAvailable call. We don't
+//     support multiple ODA calls yet.
+// (2) the format of the incoming data is as follows:
+//     The first two bytes contain the width and the height of the icon. 
+//     Followed by 3 bytes per pixel for the color bitmap row after row. (for heigh * width * 3 bytes)
+//     Followed by bit mask data (used for transparency on the alpha channel). 
+//
+//
+//////////////////////////////////////////////////////////////////////////////////////////////
+
+class nsIconDecoder : public imgIDecoder
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_IMGIDECODER
+  NS_DECL_NSIOUTPUTSTREAM
+
+  nsIconDecoder();
+  virtual ~nsIconDecoder();
+
+private:
+  nsCOMPtr<imgIContainer> mImage;
+  nsCOMPtr<gfxIImageFrame> mFrame;
+  nsCOMPtr<imgIRequest> mRequest;
+  nsCOMPtr<imgIDecoderObserver> mObserver; // this is just qi'd from mRequest for speed
+};
+
+#endif // nsIconDecoder_h__

mozilla/modules/libpr0n/decoders/icon/nsIconModule.cpp

@@ -0,0 +1,54 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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): 
+ *   Scott MacGregor <mscott@netscape.com>
+ */
+
+#include "nsIGenericFactory.h"
+#include "nsIModule.h"
+
+#include "nsIconDecoder.h"
+#include "nsIconProtocolHandler.h"
+
+// objects that just require generic constructors
+/******************************************************************************
+ * Protocol CIDs
+ */
+#define NS_ICONPROTOCOL_CID   { 0xd0f9db12, 0x249c, 0x11d5, { 0x99, 0x5, 0x0, 0x10, 0x83, 0x1, 0xe, 0x9b } } 
+
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsIconDecoder)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsIconProtocolHandler)
+
+static nsModuleComponentInfo components[] =
+{
+  { "icon decoder",
+    NS_ICONDECODER_CID,
+    "@mozilla.org/image/decoder;2?type=image/icon",
+    nsIconDecoderConstructor, },
+
+   { "Icon Protocol Handler",      
+      NS_ICONPROTOCOL_CID,
+      NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "icon",
+      nsIconProtocolHandlerConstructor
+    }
+};
+
+NS_IMPL_NSGETMODULE("nsIconDecoderModule", components)
+

mozilla/modules/libpr0n/decoders/icon/nsIconProtocolHandler.cpp

@@ -0,0 +1,90 @@
+/* -*- Mode: C++; tab-width: 2; 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 mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Brian Ryner.
+ * Portions created by Brian Ryner are Copyright (C) 2000 Brian Ryner.
+ * All Rights Reserved.
+ *
+ * Contributor(s): 
+ *  Scott MacGregor <mscott@netscape.com>
+ */
+
+#include "nsIconChannel.h"
+#include "nsIconProtocolHandler.h"
+#include "nsIURL.h"
+#include "nsCRT.h"
+#include "nsCOMPtr.h"
+#include "nsIComponentManager.h"
+#include "nsIServiceManager.h"
+
+static NS_DEFINE_CID(kStandardURICID, NS_STANDARDURL_CID);
+
+////////////////////////////////////////////////////////////////////////////////
+
+nsIconProtocolHandler::nsIconProtocolHandler() 
+{
+  NS_INIT_REFCNT();
+}
+
+nsIconProtocolHandler::~nsIconProtocolHandler() 
+{}
+
+NS_IMPL_ISUPPORTS2(nsIconProtocolHandler, nsIProtocolHandler, nsISupportsWeakReference)
+
+    
+////////////////////////////////////////////////////////////////////////////////
+// nsIProtocolHandler methods:
+
+NS_IMETHODIMP nsIconProtocolHandler::GetScheme(char* *result) 
+{
+  *result = nsCRT::strdup("icon");
+  if (!*result) return NS_ERROR_OUT_OF_MEMORY;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconProtocolHandler::GetDefaultPort(PRInt32 *result) 
+{
+  *result = 0;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconProtocolHandler::NewURI(const char *aSpec, nsIURI *aBaseURI, nsIURI **result) 
+{
+  nsresult rv;
+
+  // no concept of a relative icon url
+  NS_ASSERTION(!aBaseURI, "base url passed into icon protocol handler");
+  nsCOMPtr<nsIURI> url = do_CreateInstance(kStandardURICID, &rv);
+  if (NS_FAILED(rv)) return rv;
+  rv = url->SetSpec((char*)aSpec);
+  *result = url;
+  NS_IF_ADDREF(*result);
+  return rv;
+}
+
+NS_IMETHODIMP nsIconProtocolHandler::NewChannel(nsIURI* url, nsIChannel* *result)
+{
+  nsCOMPtr<nsIChannel> channel;
+  NS_NEWXPCOM(channel, nsIconChannel);
+
+  if (channel)
+    NS_STATIC_CAST(nsIconChannel*,NS_STATIC_CAST(nsIChannel*, channel))->Init(url);
+
+  *result = channel;
+  NS_IF_ADDREF(*result);
+
+  return NS_OK;
+}
+
+////////////////////////////////////////////////////////////////////////////////

mozilla/modules/libpr0n/decoders/icon/nsIconProtocolHandler.h

@@ -0,0 +1,43 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * 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): 
+ *   Scott MacGregor <mscott@netscape.com>
+ */
+
+#ifndef nsIconProtocolHandler_h___
+#define nsIconProtocolHandler_h___
+
+#include "nsWeakReference.h"
+#include "nsIProtocolHandler.h"
+
+class nsIconProtocolHandler : public nsIProtocolHandler, public nsSupportsWeakReference
+{
+public:
+    NS_DECL_ISUPPORTS
+    NS_DECL_NSIPROTOCOLHANDLER
+
+    // nsIconProtocolHandler methods:
+    nsIconProtocolHandler();
+    virtual ~nsIconProtocolHandler();
+
+protected:
+};
+
+#endif /* nsIconProtocolHandler_h___ */

mozilla/modules/libpr0n/decoders/icon/win/makefile.win

@@ -1,4 +1,4 @@
-#!nmake
+#!gmake
 #
 # The contents of this file are subject to the Netscape Public
 # License Version 1.1 (the "License"); you may not use this file
@@ -18,33 +18,29 @@
 # Rights Reserved.
 #
 # Contributor(s): 
+#  Scott MacGregor <mscott@netscape.com>
 
-DEPTH=..\..\..
-MODULE=mapiutils
+DEPTH=..\..\..\..\..
+MODULE=imgicon
 
-include <$(DEPTH)\config\config.mak>
+LIBRARY_NAME=imgiconwin_s
 
-################################################################################
-## exports
+CPP_OBJS=\
+        .\$(OBJDIR)\nsIconChannel.obj  	\
+         $(NULL)
 
-EXPORTS=	mapismem.h	\
-    		nsstrseq.h	\
-			$(NULL)
+INCS = $(INCS)                  \
+        -I$(DEPTH)\dist\include \
+        -I..\       	         	\
+		$(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
+        $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
+         
 
 clobber::
 	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
+

mozilla/modules/libpr0n/decoders/icon/win/nsIconChannel.cpp

@@ -0,0 +1,377 @@
+/* -*- Mode: C++; tab-width: 2; 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 mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Brian Ryner.
+ * Portions created by Brian Ryner are Copyright (C) 2000 Brian Ryner.
+ * All Rights Reserved.
+ *
+ * Contributor(s): 
+ *   Scott MacGregor <mscott@netscape.com>
+ */
+
+
+#include "nsIconChannel.h"
+#include "nsIServiceManager.h"
+#include "nsIInterfaceRequestor.h"
+#include "nsXPIDLString.h"
+#include "nsMimeTypes.h"
+#include "nsMemory.h"
+#include "nsIStringStream.h"
+#include "nsIURL.h"
+#include "nsNetUtil.h"
+
+// we need windows.h to read out registry information...
+#include <windows.h>
+#include <shellapi.h>
+
+// nsIconChannel methods
+nsIconChannel::nsIconChannel()
+{
+  NS_INIT_REFCNT();
+  mStatus = NS_OK;
+}
+
+nsIconChannel::~nsIconChannel() 
+{}
+
+NS_IMPL_THREADSAFE_ISUPPORTS2(nsIconChannel, 
+                              nsIChannel, 
+                              nsIRequest)
+
+nsresult nsIconChannel::Init(nsIURI* uri)
+{
+  nsresult rv;
+  NS_ASSERTION(uri, "no uri");
+  mUrl = uri;
+  return NS_OK;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// nsIRequest methods:
+
+NS_IMETHODIMP nsIconChannel::GetName(PRUnichar* *result)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsIconChannel::IsPending(PRBool *result)
+{
+  NS_NOTREACHED("nsIconChannel::IsPending");
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsIconChannel::GetStatus(nsresult *status)
+{
+  *status = mStatus;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconChannel::Cancel(nsresult status)
+{
+  NS_ASSERTION(NS_FAILED(status), "shouldn't cancel with a success code");
+  nsresult rv = NS_ERROR_FAILURE;
+
+  mStatus = status;
+  return rv;
+}
+
+NS_IMETHODIMP nsIconChannel::Suspend(void)
+{
+  NS_NOTREACHED("nsIconChannel::Suspend");
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsIconChannel::Resume(void)
+{
+  NS_NOTREACHED("nsIconChannel::Resume");
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// nsIChannel methods:
+
+NS_IMETHODIMP nsIconChannel::GetOriginalURI(nsIURI* *aURI)
+{
+  *aURI = mOriginalURI ? mOriginalURI : mUrl;
+  NS_ADDREF(*aURI);
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconChannel::SetOriginalURI(nsIURI* aURI)
+{
+  mOriginalURI = aURI;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconChannel::GetURI(nsIURI* *aURI)
+{
+  *aURI = mUrl;
+  NS_IF_ADDREF(*aURI);
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconChannel::SetURI(nsIURI* aURI)
+{
+  mUrl = aURI;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsIconChannel::Open(nsIInputStream **_retval)
+{
+  return NS_ERROR_FAILURE;
+}
+
+void InvertRows(unsigned char * aInitialBuffer, PRUint32 sizeOfBuffer, PRUint32 numBytesPerRow)
+{
+  PRUint32 numRows = sizeOfBuffer / numBytesPerRow;
+  void * temporaryRowHolder = (void *) nsMemory::Alloc(numBytesPerRow);
+
+  PRUint32 currentRow = 0;
+  PRUint32 lastRow = (numRows - 1) * numBytesPerRow;
+  while (currentRow < lastRow)
+  {
+    // store the current row into a temporary buffer
+    nsCRT::memcpy(temporaryRowHolder, (void *) &aInitialBuffer[currentRow], numBytesPerRow);
+    nsCRT::memcpy((void *) &aInitialBuffer[currentRow], (void *)&aInitialBuffer[lastRow], numBytesPerRow);
+    nsCRT::memcpy((void *) &aInitialBuffer[lastRow], temporaryRowHolder, numBytesPerRow);
+    lastRow -= numBytesPerRow;
+    currentRow += numBytesPerRow;
+  }
+}
+
+NS_IMETHODIMP nsIconChannel::AsyncOpen(nsIStreamListener *aListener, nsISupports *ctxt)
+{
+  // get the file name from the url
+  nsXPIDLCString fileName; // will contain a dummy file we'll use to figure out the type of icon desired.
+  nsXPIDLCString filePath; // will contain an optional parameter for small vs. large icon. default is small
+  mUrl->GetHost(getter_Copies(fileName));
+  nsCOMPtr<nsIURL> url (do_QueryInterface(mUrl));
+  if (url)
+    url->GetFileBaseName(getter_Copies(filePath));
+
+  
+  // 1) get a hIcon for the file.
+  SHFILEINFO      sfi;
+  UINT infoFlags = SHGFI_USEFILEATTRIBUTES | SHGFI_ICON;
+  if (filePath && !nsCRT::strcmp(filePath, "large"))
+    infoFlags |= SHGFI_LARGEICON;
+  else // default to small
+    infoFlags |= SHGFI_SMALLICON;
+
+  LONG result= SHGetFileInfo(fileName, FILE_ATTRIBUTE_ARCHIVE, &sfi, sizeof(sfi), infoFlags);
+  if (result > 0 && sfi.hIcon)
+  {
+    // we got a handle to an icon. Now we want to get a bitmap for the icon using GetIconInfo....
+    ICONINFO pIconInfo;
+    result = GetIconInfo(sfi.hIcon, &pIconInfo);
+    if (result > 0)
+    {
+      // now we have the bit map we need to get info about the bitmap
+      BITMAPINFO pBitMapInfo;
+      BITMAPINFOHEADER pBitMapInfoHeader;
+      pBitMapInfo.bmiHeader.biBitCount = 0;
+      pBitMapInfo.bmiHeader.biSize = sizeof(pBitMapInfoHeader);
+
+      HDC pDC = CreateCompatibleDC(NULL); // get a device context for the screen.
+      result = GetDIBits(pDC, pIconInfo.hbmColor, 0, 0, NULL, &pBitMapInfo, DIB_RGB_COLORS);
+      if (result > 0 && pBitMapInfo.bmiHeader.biSizeImage > 0)
+      {
+        // allocate a buffer to hold the bit map....this should be a buffer that's biSizeImage...
+        unsigned char * buffer = (PRUint8 *) nsMemory::Alloc(pBitMapInfo.bmiHeader.biSizeImage);
+        result = GetDIBits(pDC, pIconInfo.hbmColor, 0, pBitMapInfo.bmiHeader.biHeight, (void *) buffer, &pBitMapInfo, DIB_RGB_COLORS);
+        if (result > 0)
+        {
+          PRUint32 bytesPerPixel = pBitMapInfo.bmiHeader.biBitCount / 8;
+          InvertRows(buffer, pBitMapInfo.bmiHeader.biSizeImage, pBitMapInfo.bmiHeader.biWidth * bytesPerPixel);
+          // Convert our little icon buffer which is padded to 4 bytes per pixel into a nice 3 byte per pixel
+          // description.
+          nsCString iconBuffer;
+          iconBuffer.Assign((char) pBitMapInfo.bmiHeader.biWidth);
+          iconBuffer.Append((char) pBitMapInfo.bmiHeader.biHeight);
+          
+          PRInt32 index = 0;
+          if (pBitMapInfo.bmiHeader.biBitCount == 16)
+          {
+            PRUint8 redValue, greenValue, blueValue, partialGreen;
+            while (index < pBitMapInfo.bmiHeader.biSizeImage)
+            {                            
+              DWORD dst=(DWORD) buffer[index];
+              PRUint16 num = 0;
+              num = (PRUint8) buffer[index];
+              num <<= 8;
+              num |= (PRUint8) buffer[index+1];
+
+              //blueValue = (PRUint8)((*dst)&(0x1F));
+              //greenValue = (PRUint8)(((*dst)>>5)&(0x1F));
+              //redValue = (PRUint8)(((*dst)>>10)&(0x1F));
+
+              redValue = ((PRUint32) (((float)(num & 0x7c00) / 0x7c00) * 0xFF0000) & 0xFF0000)>> 16;
+              greenValue =  ((PRUint32)(((float)(num & 0x03E0) / 0x03E0) * 0x00FF00) & 0x00FF00)>> 8;
+              blueValue =  ((PRUint32)(((float)(num & 0x001F) / 0x001F) * 0x0000FF) & 0x0000FF);
+
+              // now we have the right RGB values...
+              iconBuffer.Append((char) redValue);
+              iconBuffer.Append((char) greenValue);
+              iconBuffer.Append((char) blueValue);
+              index += bytesPerPixel;
+            }
+          }
+          else
+          {
+            while (index <pBitMapInfo.bmiHeader.biSizeImage)
+            {
+              iconBuffer.Append((char) buffer[index]);
+              iconBuffer.Append((char) buffer[index+1]);
+              iconBuffer.Append((char) buffer[index+2]);
+              index += bytesPerPixel;
+            }
+          }
+
+          // now we need to tack on the alpha data...which is hbmMask
+          pBitMapInfo.bmiHeader.biBitCount = 0;
+          pBitMapInfo.bmiHeader.biSize = sizeof(pBitMapInfoHeader);
+          result = GetDIBits(pDC, pIconInfo.hbmMask, 0, 0, NULL, &pBitMapInfo, DIB_RGB_COLORS);
+          if (result > 0 && pBitMapInfo.bmiHeader.biSizeImage > 0)
+          {
+            // allocate a buffer to hold the bit map....this should be a buffer that's biSizeImage...
+            unsigned char * maskBuffer = (PRUint8 *) nsMemory::Alloc(pBitMapInfo.bmiHeader.biSizeImage);
+            result = GetDIBits(pDC, pIconInfo.hbmMask, 0, pBitMapInfo.bmiHeader.biHeight, (void *) maskBuffer, &pBitMapInfo, DIB_RGB_COLORS);
+            if (result > 0)
+            {
+              InvertRows(maskBuffer, pBitMapInfo.bmiHeader.biSizeImage, 4);
+              index = 0;
+              // for some reason the bit mask on windows are flipped from the values we really want for transparency. 
+              // So complement each byte in the bit mask.
+              while (index < pBitMapInfo.bmiHeader.biSizeImage)
+              {
+                maskBuffer[index]^=255;
+                index += 1;
+              }
+              iconBuffer.Append((char *) maskBuffer, pBitMapInfo.bmiHeader.biSizeImage);
+            }
+
+            nsMemory::Free(maskBuffer);
+          } // if we have a mask buffer to apply
+
+          // turn our nsString into a stream looking object...
+          aListener->OnStartRequest(this, ctxt);
+
+          // turn our string into a stream...
+          nsCOMPtr<nsISupports> streamSupports;
+          NS_NewByteInputStream(getter_AddRefs(streamSupports), iconBuffer.get(), iconBuffer.Length());
+
+          nsCOMPtr<nsIInputStream> inputStr (do_QueryInterface(streamSupports));
+          aListener->OnDataAvailable(this, ctxt, inputStr, 0, iconBuffer.Length());
+          aListener->OnStopRequest(this, ctxt, NS_OK, nsnull);
+
+        } // if we got valid bits for the main bitmap mask
+        
+        nsMemory::Free(buffer);
+
+      }
+
+      DeleteDC(pDC);
+    }
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconChannel::GetLoadAttributes(PRUint32 *aLoadAttributes)
+{
+  *aLoadAttributes = mLoadAttributes;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconChannel::SetLoadAttributes(PRUint32 aLoadAttributes)
+{
+  mLoadAttributes = aLoadAttributes;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconChannel::GetContentType(char* *aContentType) 
+{
+  if (!aContentType) return NS_ERROR_NULL_POINTER;
+
+  *aContentType = nsCRT::strdup("image/icon");
+  if (!*aContentType) return NS_ERROR_OUT_OF_MEMORY;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsIconChannel::SetContentType(const char *aContentType)
+{
+  //It doesn't make sense to set the content-type on this type
+  // of channel...
+  return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsIconChannel::GetContentLength(PRInt32 *aContentLength)
+{
+  *aContentLength = mContentLength;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconChannel::SetContentLength(PRInt32 aContentLength)
+{
+  NS_NOTREACHED("nsIconChannel::SetContentLength");
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsIconChannel::GetLoadGroup(nsILoadGroup* *aLoadGroup)
+{
+  *aLoadGroup = mLoadGroup;
+  NS_IF_ADDREF(*aLoadGroup);
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconChannel::SetLoadGroup(nsILoadGroup* aLoadGroup)
+{
+  mLoadGroup = aLoadGroup;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconChannel::GetOwner(nsISupports* *aOwner)
+{
+  *aOwner = mOwner.get();
+  NS_IF_ADDREF(*aOwner);
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconChannel::SetOwner(nsISupports* aOwner)
+{
+  mOwner = aOwner;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconChannel::GetNotificationCallbacks(nsIInterfaceRequestor* *aNotificationCallbacks)
+{
+  *aNotificationCallbacks = mCallbacks.get();
+  NS_IF_ADDREF(*aNotificationCallbacks);
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconChannel::SetNotificationCallbacks(nsIInterfaceRequestor* aNotificationCallbacks)
+{
+  mCallbacks = aNotificationCallbacks;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsIconChannel::GetSecurityInfo(nsISupports * *aSecurityInfo)
+{
+  *aSecurityInfo = nsnull;
+  return NS_OK;
+}
+

mozilla/modules/libpr0n/decoders/icon/win/nsIconChannel.h

@@ -0,0 +1,56 @@
+/* -*- Mode: C++; tab-width: 2; 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 mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Brian Ryner.
+ * Portions created by Brian Ryner are Copyright (C) 2000 Brian Ryner.
+ * All Rights Reserved.
+ *
+ * Contributor(s): 
+ *  Scott MacGregor <mscott@netscape.com>
+ */
+
+#ifndef nsIconChannel_h___
+#define nsIconChannel_h___
+
+#include "nsCOMPtr.h"
+#include "nsXPIDLString.h"
+#include "nsIChannel.h"
+#include "nsILoadGroup.h"
+#include "nsIInterfaceRequestor.h"
+#include "nsIURI.h"
+
+class nsIconChannel : public nsIChannel
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIREQUEST
+  NS_DECL_NSICHANNEL
+
+  nsIconChannel();
+  virtual ~nsIconChannel();
+
+  nsresult Init(nsIURI* uri);
+
+protected:
+  nsCOMPtr<nsIURI> mUrl;
+  nsCOMPtr<nsIURI> mOriginalURI;
+  PRUint32         mLoadAttributes;
+  PRInt32          mContentLength;
+  nsCOMPtr<nsILoadGroup> mLoadGroup;
+  nsCOMPtr<nsIInterfaceRequestor> mCallbacks;
+  nsCOMPtr<nsISupports>  mOwner; 
+  nsresult mStatus;
+};
+
+#endif /* nsIconChannel_h___ */

mozilla/modules/libpr0n/decoders/jpeg/Makefile.in

@@ -0,0 +1,42 @@
+#
+# 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):
+#
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= imgjpeg
+LIBRARY_NAME	= imgjpeg
+IS_COMPONENT	= 1
+
+REQUIRES	= xpcom string necko layout jpeg gfx2 imglib2
+
+CPPSRCS		= nsJPEGDecoder.cpp nsJPEGFactory.cpp
+
+EXTRA_DSO_LDOPTS = $(JPEG_LIBS) $(ZLIB_LIBS) \
+		$(MOZ_COMPONENT_LIBS) \
+		$(NULL)
+
+include $(topsrcdir)/config/rules.mk
+

mozilla/modules/libpr0n/decoders/jpeg/makefile.win

@@ -0,0 +1,52 @@
+#!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):
+#    Stuart Parmenter <pavlov@netscape.com>
+#
+
+DEPTH=..\..\..\..
+include <$(DEPTH)/config/config.mak>
+
+MODULE			= imgjpeg
+LIBRARY_NAME	= imgjpeg
+DLL			= $(OBJDIR)\$(LIBRARY_NAME).dll
+MAKE_OBJ_TYPE	= DLL
+
+OBJS	= \
+		.\$(OBJDIR)\nsJPEGDecoder.obj \
+		.\$(OBJDIR)\nsJPEGFactory.obj \
+		$(NULL)
+
+LLIBS=\
+	$(LIBNSPR) \
+	$(DIST)\lib\jpeg3250.lib \
+	$(DIST)\lib\xpcom.lib \
+	$(DIST)\lib\gkgfxwin.lib \
+	$(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+install:: $(DLL)
+	$(MAKE_INSTALL) .\$(OBJDIR)\$(LIBRARY_NAME).dll $(DIST)\bin\components
+	$(MAKE_INSTALL) .\$(OBJDIR)\$(LIBRARY_NAME).lib $(DIST)\lib
+
+clobber::
+	rm -f $(DIST)\bin\components\$(LIBRARY_NAME).dll
+	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib

mozilla/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp

@@ -0,0 +1,829 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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):
+ *   Stuart Parmenter <pavlov@netscape.com>
+ *
+ */
+
+#include "nsJPEGDecoder.h"
+
+#include "nsIInputStream.h"
+
+#include "nspr.h"
+
+#include "nsCRT.h"
+
+#include "nsIComponentManager.h"
+
+#include "imgIContainerObserver.h"
+
+
+#include "ImageLogging.h"
+
+
+NS_IMPL_ISUPPORTS2(nsJPEGDecoder, imgIDecoder, nsIOutputStream)
+
+
+#if defined(PR_LOGGING)
+PRLogModuleInfo *gJPEGlog = PR_NewLogModule("JPEGDecoder");
+#else
+#define gJPEGlog
+#endif
+
+
+
+void PR_CALLBACK init_source (j_decompress_ptr jd);
+boolean PR_CALLBACK fill_input_buffer (j_decompress_ptr jd);
+void PR_CALLBACK skip_input_data (j_decompress_ptr jd, long num_bytes);
+void PR_CALLBACK term_source (j_decompress_ptr jd);
+void PR_CALLBACK my_error_exit (j_common_ptr cinfo);
+
+/* Normal JFIF markers can't have more bytes than this. */
+#define MAX_JPEG_MARKER_LENGTH  (((PRUint32)1 << 16) - 1)
+
+
+/* Possible states for JPEG source manager */
+enum data_source_state {
+    READING_BACK = 0, /* Must be zero for init purposes */
+    READING_NEW
+};
+
+/*
+ *  Implementation of a JPEG src object that understands our state machine
+ */
+typedef struct {
+  /* public fields; must be first in this struct! */
+  struct jpeg_source_mgr pub;
+
+  nsJPEGDecoder *decoder;
+
+} decoder_source_mgr;
+
+
+nsJPEGDecoder::nsJPEGDecoder()
+{
+  NS_INIT_ISUPPORTS();
+
+  mState = JPEG_HEADER;
+  mFillState = READING_BACK;
+
+  mSamples = nsnull;
+  mSamples3 = nsnull;
+  mRGBPadRow = nsnull;
+  mRGBPadRowLength = 0;
+
+  mBytesToSkip = 0;
+  
+  memset(&mInfo, 0, sizeof(jpeg_decompress_struct));
+
+  mCompletedPasses = 0;
+
+  mBuffer = nsnull;
+  mBufferLen = mBufferSize = 0;
+
+  mBackBuffer = nsnull;
+  mBackBufferLen = mBackBufferSize = mBackBufferUnreadLen = 0;
+
+}
+
+nsJPEGDecoder::~nsJPEGDecoder()
+{
+  if (mBuffer)
+    PR_Free(mBuffer);
+  if (mBackBuffer)
+    PR_Free(mBackBuffer);
+  if (mRGBPadRow)
+    PR_Free(mRGBPadRow);
+}
+
+
+/** imgIDecoder methods **/
+
+/* void init (in imgIRequest aRequest); */
+NS_IMETHODIMP nsJPEGDecoder::Init(imgIRequest *aRequest)
+{
+  mRequest = aRequest;
+  mObserver = do_QueryInterface(mRequest);
+
+  aRequest->GetImage(getter_AddRefs(mImage));
+
+  /* We set up the normal JPEG error routines, then override error_exit. */
+  mInfo.err = jpeg_std_error(&mErr.pub);
+  /*   mInfo.err = jpeg_std_error(&mErr.pub); */
+  mErr.pub.error_exit = my_error_exit;
+  /* Establish the setjmp return context for my_error_exit to use. */
+  if (setjmp(mErr.setjmp_buffer)) {
+    /* If we get here, the JPEG code has signaled an error.
+     * We need to clean up the JPEG object, close the input file, and return.
+     */
+    return NS_ERROR_FAILURE;
+  }
+
+  /* Step 1: allocate and initialize JPEG decompression object */
+  jpeg_create_decompress(&mInfo);
+  
+  decoder_source_mgr *src;
+  if (mInfo.src == NULL) {
+    //mInfo.src = PR_NEWZAP(decoder_source_mgr);
+    src = PR_NEWZAP(decoder_source_mgr);
+    if (!src) {
+      return PR_FALSE;
+    }
+    mInfo.src = (struct jpeg_source_mgr *) src;
+  }
+
+  /* Step 2: specify data source (eg, a file) */
+
+  /* Setup callback functions. */
+  src->pub.init_source = init_source;
+  src->pub.fill_input_buffer = fill_input_buffer;
+  src->pub.skip_input_data = skip_input_data;
+  src->pub.resync_to_restart = jpeg_resync_to_restart;
+  src->pub.term_source = term_source;
+
+  src->decoder = this;
+
+
+
+  return NS_OK;
+}
+
+/* readonly attribute imgIRequest request; */
+NS_IMETHODIMP nsJPEGDecoder::GetRequest(imgIRequest * *aRequest)
+{
+  *aRequest = mRequest;
+  NS_ADDREF(*aRequest);
+  return NS_OK;
+}
+
+
+
+
+
+
+/** nsIOutputStream methods **/
+
+/* void close (); */
+NS_IMETHODIMP nsJPEGDecoder::Close()
+{
+  PR_LOG(gJPEGlog, PR_LOG_DEBUG,
+         ("[this=%p] nsJPEGDecoder::Close\n", this));
+
+  if (mState != JPEG_DONE && mState != JPEG_SINK_NON_JPEG_TRAILER)
+    NS_WARNING("Never finished decoding the JPEG.");
+
+  /* Step 8: Release JPEG decompression object */
+
+  /* This is an important step since it will release a good deal of memory. */
+  jpeg_destroy_decompress(&mInfo);
+
+  return NS_OK;
+}
+
+/* void flush (); */
+NS_IMETHODIMP nsJPEGDecoder::Flush()
+{
+  LOG_SCOPE(gJPEGlog, "nsJPEGDecoder::Flush");
+
+  PRUint32 ret;
+  if (mState != JPEG_DONE && mState != JPEG_SINK_NON_JPEG_TRAILER)
+    return this->WriteFrom(nsnull, 0, &ret);
+
+  return NS_OK;
+}
+
+/* unsigned long write (in string buf, in unsigned long count); */
+NS_IMETHODIMP nsJPEGDecoder::Write(const char *buf, PRUint32 count, PRUint32 *_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* unsigned long writeFrom (in nsIInputStream inStr, in unsigned long count); */
+NS_IMETHODIMP nsJPEGDecoder::WriteFrom(nsIInputStream *inStr, PRUint32 count, PRUint32 *_retval)
+{
+  LOG_SCOPE_WITH_PARAM(gJPEGlog, "nsJPEGDecoder::WriteFrom", "count", count);
+
+  /* We use our private extension JPEG error handler.
+   * Note that this struct must live as long as the main JPEG parameter
+   * struct, to avoid dangling-pointer problems.
+   */
+  // XXX above what is this?
+
+
+  if (inStr) {
+    if (!mBuffer) {
+      mBuffer = (JOCTET *)PR_Malloc(count);
+      mBufferSize = count;
+    } else if (count > mBufferSize) {
+      mBuffer = (JOCTET *)PR_Realloc(mBuffer, count);
+      mBufferSize = count;
+    }
+
+    nsresult rv = inStr->Read((char*)mBuffer, count, &mBufferLen);
+    *_retval = mBufferLen;
+
+    //nsresult rv = mOutStream->WriteFrom(inStr, count, _retval);
+
+    NS_ASSERTION(NS_SUCCEEDED(rv), "nsJPEGDecoder::WriteFrom -- mOutStream->WriteFrom failed");
+  }
+  // else no input stream.. Flush() ?
+
+
+  nsresult error_code = NS_ERROR_FAILURE;
+  /* Return here if there is a fatal error. */
+  if ((error_code = setjmp(mErr.setjmp_buffer)) != 0) {
+    return error_code;
+  }
+
+
+  PR_LOG(gJPEGlog, PR_LOG_DEBUG,
+         ("[this=%p] nsJPEGDecoder::WriteFrom -- processing JPEG data\n", this));
+
+  decoder_source_mgr *src = NS_REINTERPRET_CAST(decoder_source_mgr *, mInfo.src);
+
+  switch (mState) {
+  case JPEG_HEADER:
+  {
+    LOG_SCOPE(gJPEGlog, "nsJPEGDecoder::WriteFrom -- entering JPEG_HEADER case");
+
+    /* Step 3: read file parameters with jpeg_read_header() */
+    if (jpeg_read_header(&mInfo, TRUE) == JPEG_SUSPENDED)
+      return NS_OK; /* I/O suspension */
+
+    /*
+     * Don't allocate a giant and superfluous memory buffer
+     * when the image is a sequential JPEG.
+     */
+    mInfo.buffered_image = jpeg_has_multiple_scans(&mInfo);
+
+    /* Used to set up image size so arrays can be allocated */
+    jpeg_calc_output_dimensions(&mInfo);
+
+    mObserver->OnStartDecode(nsnull, nsnull);
+
+    mImage->Init(mInfo.image_width, mInfo.image_height, mObserver);
+    mObserver->OnStartContainer(nsnull, nsnull, mImage);
+
+    mFrame = do_CreateInstance("@mozilla.org/gfx/image/frame;2");
+    gfx_format format;
+#ifdef XP_PC
+    format = gfxIFormats::BGR;
+#else
+    format = gfxIFormats::RGB;
+#endif
+    mFrame->Init(0, 0, mInfo.image_width, mInfo.image_height, format);
+    mImage->AppendFrame(mFrame);
+    mObserver->OnStartFrame(nsnull, nsnull, mFrame);
+
+
+    /*
+     * Make a one-row-high sample array that will go away
+     * when done with image. Always make it big enough to
+     * hold an RGB row.  Since this uses the IJG memory
+     * manager, it must be allocated before the call to
+     * jpeg_start_compress().
+     */
+    int row_stride;
+
+    if(mInfo.output_components == 1)
+      row_stride = mInfo.output_width;
+    else
+      row_stride = mInfo.output_width * 4; // use 4 instead of mInfo.output_components
+                                           // so we don't have to fuss with byte alignment.
+                                           // Mac wants 4 anyways.
+
+    mSamples = (*mInfo.mem->alloc_sarray)((j_common_ptr) &mInfo,
+                                           JPOOL_IMAGE,
+                                           row_stride, 1);
+
+#if defined(XP_PC) || defined(XP_MAC)
+    // allocate buffer to do byte flipping if needed
+    if (mInfo.output_components == 3) {
+      mRGBPadRow = (PRUint8*) PR_MALLOC(row_stride);
+      mRGBPadRowLength = row_stride;
+      memset(mRGBPadRow, 0, mRGBPadRowLength);
+    }
+#endif
+
+    /* Allocate RGB buffer for conversion from greyscale. */
+    if (mInfo.output_components != 3) {
+      row_stride = mInfo.output_width * 4;
+      mSamples3 = (*mInfo.mem->alloc_sarray)((j_common_ptr) &mInfo,
+                                              JPOOL_IMAGE,
+                                              row_stride, 1);
+    }
+
+    mState = JPEG_START_DECOMPRESS;
+  }
+  case JPEG_START_DECOMPRESS:
+  {
+    LOG_SCOPE(gJPEGlog, "nsJPEGDecoder::WriteFrom -- entering JPEG_START_DECOMPRESS case");
+    /* Step 4: set parameters for decompression */
+
+    /* FIXME -- Should reset dct_method and dither mode
+     * for final pass of progressive JPEG
+     */
+    mInfo.dct_method = JDCT_FASTEST;
+    mInfo.dither_mode = JDITHER_ORDERED;
+    mInfo.do_fancy_upsampling = FALSE;
+    mInfo.enable_2pass_quant = FALSE;
+    mInfo.do_block_smoothing = TRUE;
+
+    /* Step 5: Start decompressor */
+    if (jpeg_start_decompress(&mInfo) == FALSE)
+      return NS_OK; /* I/O suspension */
+
+    /* If this is a progressive JPEG ... */
+    if (mInfo.buffered_image) {
+      mState = JPEG_DECOMPRESS_PROGRESSIVE;
+    } else {
+      mState = JPEG_DECOMPRESS_SEQUENTIAL;
+    }
+
+  }
+
+  case JPEG_DECOMPRESS_SEQUENTIAL:
+  {
+    if (mState == JPEG_DECOMPRESS_SEQUENTIAL)
+    {
+      LOG_SCOPE(gJPEGlog, "nsJPEGDecoder::WriteFrom -- JPEG_DECOMPRESS_SEQUENTIAL case");
+
+      if (OutputScanlines(-1) == PR_FALSE)
+        return NS_OK; /* I/O suspension */
+
+      /* If we've completed image output ... */
+      NS_ASSERTION(mInfo.output_scanline == mInfo.output_height, "We didn't process all of the data!");
+      mState = JPEG_DONE;    
+    }
+  }
+
+
+  case JPEG_DECOMPRESS_PROGRESSIVE:
+  {
+    if (mState == JPEG_DECOMPRESS_PROGRESSIVE)
+    {
+      LOG_SCOPE(gJPEGlog, "nsJPEGDecoder::WriteFrom -- JPEG_DECOMPRESS_PROGRESSIVE case");
+
+      int status;
+      do {
+        status = jpeg_consume_input(&mInfo);
+      } while (!((status == JPEG_SUSPENDED) ||
+                 (status == JPEG_REACHED_EOI)));
+
+      switch (status) {
+        case JPEG_REACHED_EOI:
+          // End of image
+          mState = JPEG_FINAL_PROGRESSIVE_SCAN_OUTPUT;
+          break;
+        case JPEG_SUSPENDED:
+          PR_LOG(gJPEGlog, PR_LOG_DEBUG,
+                 ("[this=%p] nsJPEGDecoder::WriteFrom -- suspending\n", this));
+
+          return NS_OK; /* I/O suspension */
+        default:
+          printf("got someo other state!?\n");
+      }
+    }
+  }
+
+  case JPEG_FINAL_PROGRESSIVE_SCAN_OUTPUT:
+  {
+    if (mState == JPEG_FINAL_PROGRESSIVE_SCAN_OUTPUT)
+    {
+      LOG_SCOPE(gJPEGlog, "nsJPEGDecoder::WriteFrom -- entering JPEG_FINAL_PROGRESSIVE_SCAN_OUTPUT case");
+
+      // XXX progressive? ;)
+      // not really progressive according to the state machine... -saari
+      jpeg_start_output(&mInfo, mInfo.input_scan_number);
+      if (OutputScanlines(-1) == PR_FALSE)
+        return NS_OK; /* I/O suspension */
+      jpeg_finish_output(&mInfo);
+      mState = JPEG_DONE;
+    }
+  }
+
+  case JPEG_DONE:
+  {
+    LOG_SCOPE(gJPEGlog, "nsJPEGDecoder::WriteFrom -- entering JPEG_DONE case");
+
+    /* Step 7: Finish decompression */
+
+    if (jpeg_finish_decompress(&mInfo) == FALSE)
+      return NS_OK; /* I/O suspension */
+
+    mState = JPEG_SINK_NON_JPEG_TRAILER;
+
+    /* we're done dude */
+    break;
+  }
+  case JPEG_SINK_NON_JPEG_TRAILER:
+    PR_LOG(gJPEGlog, PR_LOG_DEBUG,
+           ("[this=%p] nsJPEGDecoder::WriteFrom -- entering JPEG_SINK_NON_JPEG_TRAILER case\n", this));
+
+    break;
+  }
+
+  return NS_OK;
+}
+
+
+int
+nsJPEGDecoder::OutputScanlines(int num_scanlines)
+{
+  int pass = 0;
+  
+  if (mState == JPEG_FINAL_PROGRESSIVE_SCAN_OUTPUT)
+      pass = -1;
+  else
+      pass = mCompletedPasses + 1;
+
+  while ((mInfo.output_scanline < mInfo.output_height) && num_scanlines--) {
+      JSAMPROW samples;
+      
+      /* Request one scanline.  Returns 0 or 1 scanlines. */
+      int ns = jpeg_read_scanlines(&mInfo, mSamples, 1);
+      
+      if (ns != 1) {
+        return PR_FALSE; /* suspend */
+      }
+
+      /* If grayscale image ... */
+      if (mInfo.output_components == 1) {
+        JSAMPLE j;
+        JSAMPLE *j1 = mSamples[0];
+        const JSAMPLE *j1end = j1 + mInfo.output_width;
+        JSAMPLE *j3 = mSamples3[0];
+
+        /* Convert from grayscale to RGB. */
+        while (j1 < j1end) {
+#ifdef XP_MAC
+          j = *j1++;
+          j3[0] = 0;
+          j3[1] = j;
+          j3[2] = j;
+          j3[3] = j;
+          j3 += 4;
+#else
+          j = *j1++;
+          j3[0] = j;
+          j3[1] = j;
+          j3[2] = j;
+          j3 += 3;
+#endif
+        }
+        samples = mSamples3[0];
+      } else {
+        /* 24-bit color image */
+#ifdef XP_PC
+        memset(mRGBPadRow, 0, mInfo.output_width * 4);
+        PRUint8 *ptrOutputBuf = mRGBPadRow;
+
+        JSAMPLE *j1 = mSamples[0];
+        for (PRUint32 i=0;i<mInfo.output_width;++i) {
+          ptrOutputBuf[2] = *j1++;
+          ptrOutputBuf[1] = *j1++;
+          ptrOutputBuf[0] = *j1++;
+          ptrOutputBuf += 3;
+        }
+
+        samples = mRGBPadRow;
+#else
+#ifdef XP_MAC
+        memset(mRGBPadRow, 0, mInfo.output_width * 4);
+        PRUint8 *ptrOutputBuf = mRGBPadRow;
+
+        JSAMPLE *j1 = mSamples[0];
+        for (PRUint32 i=0;i<mInfo.output_width;++i) {
+          ptrOutputBuf[0] = 0;
+          ptrOutputBuf[1] = *j1++;
+          ptrOutputBuf[2] = *j1++;
+          ptrOutputBuf[3] = *j1++;
+          ptrOutputBuf += 4;
+        }
+
+        samples = mRGBPadRow;
+#else
+        samples = mSamples[0];
+#endif
+#endif
+      }
+
+      PRUint32 bpr;
+      mFrame->GetImageBytesPerRow(&bpr);
+      mFrame->SetImageData(
+        samples,             // data
+        bpr,                 // length
+        (mInfo.output_scanline-1) * bpr); // offset
+
+      nsRect r(0, mInfo.output_scanline, mInfo.output_width, 1);
+      mObserver->OnDataAvailable(nsnull, nsnull, mFrame, &r);
+
+  }
+
+  return PR_TRUE;
+}
+
+
+/* [noscript] unsigned long writeSegments (in nsReadSegmentFun reader, in voidPtr closure, in unsigned long count); */
+NS_IMETHODIMP nsJPEGDecoder::WriteSegments(nsReadSegmentFun reader, void * closure, PRUint32 count, PRUint32 *_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* attribute boolean nonBlocking; */
+NS_IMETHODIMP nsJPEGDecoder::GetNonBlocking(PRBool *aNonBlocking)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+NS_IMETHODIMP nsJPEGDecoder::SetNonBlocking(PRBool aNonBlocking)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* attribute nsIOutputStreamObserver observer; */
+NS_IMETHODIMP nsJPEGDecoder::GetObserver(nsIOutputStreamObserver * *aObserver)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+NS_IMETHODIMP nsJPEGDecoder::SetObserver(nsIOutputStreamObserver * aObserver)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+
+
+
+
+/* Override the standard error method in the IJG JPEG decoder code. */
+void PR_CALLBACK
+my_error_exit (j_common_ptr cinfo)
+{
+  nsresult error_code = NS_ERROR_FAILURE;
+  decoder_error_mgr *err = (decoder_error_mgr *) cinfo->err;
+
+#if 0
+#ifdef DEBUG
+/*ptn fix later */
+  if (il_debug >= 1) {
+      char buffer[JMSG_LENGTH_MAX];
+
+      /* Create the message */
+      (*cinfo->err->format_message) (cinfo, buffer);
+
+      ILTRACE(1,("%s\n", buffer));
+  }
+#endif
+
+
+  /* Convert error to a browser error code */
+  if (cinfo->err->msg_code == JERR_OUT_OF_MEMORY)
+      error_code = MK_OUT_OF_MEMORY;
+  else
+      error_code = MK_IMAGE_LOSSAGE;
+#endif
+
+  char buffer[JMSG_LENGTH_MAX];
+
+  /* Create the message */
+  (*cinfo->err->format_message) (cinfo, buffer);
+
+  fprintf(stderr, "my_error_exit()\n%s\n", buffer);
+
+  /* Return control to the setjmp point. */
+  longjmp(err->setjmp_buffer, error_code);
+}
+
+/******************************************************************************/
+/*-----------------------------------------------------------------------------
+ * This is the callback routine from the IJG JPEG library used to supply new
+ * data to the decompressor when its input buffer is exhausted.  It juggles
+ * multiple buffers in an attempt to avoid unnecessary copying of input data.
+ *
+ * (A simpler scheme is possible: It's much easier to use only a single
+ * buffer; when fill_input_buffer() is called, move any unconsumed data
+ * (beyond the current pointer/count) down to the beginning of this buffer and
+ * then load new data into the remaining buffer space.  This approach requires
+ * a little more data copying but is far easier to get right.)
+ *
+ * At any one time, the JPEG decompressor is either reading from the necko
+ * input buffer, which is volatile across top-level calls to the IJG library,
+ * or the "backtrack" buffer.  The backtrack buffer contains the remaining
+ * unconsumed data from the necko buffer after parsing was suspended due
+ * to insufficient data in some previous call to the IJG library.
+ *
+ * When suspending, the decompressor will back up to a convenient restart
+ * point (typically the start of the current MCU). The variables
+ * next_input_byte & bytes_in_buffer indicate where the restart point will be
+ * if the current call returns FALSE.  Data beyond this point must be
+ * rescanned after resumption, so it must be preserved in case the decompressor
+ * decides to backtrack.
+ *
+ * Returns:
+ *  TRUE if additional data is available, FALSE if no data present and
+ *   the JPEG library should therefore suspend processing of input stream
+ *---------------------------------------------------------------------------*/
+
+/******************************************************************************/
+/* data source manager method 
+/******************************************************************************/
+
+
+/******************************************************************************/
+/* data source manager method 
+	Initialize source.  This is called by jpeg_read_header() before any
+	data is actually read.  May leave
+	bytes_in_buffer set to 0 (in which case a fill_input_buffer() call
+	will occur immediately).
+*/
+void PR_CALLBACK
+init_source (j_decompress_ptr jd)
+{
+}
+
+/******************************************************************************/
+/* data source manager method
+	Skip num_bytes worth of data.  The buffer pointer and count should
+	be advanced over num_bytes input bytes, refilling the buffer as
+	needed.  This is used to skip over a potentially large amount of
+	uninteresting data (such as an APPn marker).  In some applications
+	it may be possible to optimize away the reading of the skipped data,
+	but it's not clear that being smart is worth much trouble; large
+	skips are uncommon.  bytes_in_buffer may be zero on return.
+	A zero or negative skip count should be treated as a no-op.
+*/
+void PR_CALLBACK
+skip_input_data (j_decompress_ptr jd, long num_bytes)
+{
+  decoder_source_mgr *src = (decoder_source_mgr *)jd->src;
+
+  if (num_bytes > (long)src->pub.bytes_in_buffer) {
+    /*
+     * Can't skip it all right now until we get more data from
+     * network stream. Set things up so that fill_input_buffer
+     * will skip remaining amount.
+     */
+    src->decoder->mBytesToSkip = (size_t)num_bytes - src->pub.bytes_in_buffer;
+    src->pub.next_input_byte += src->pub.bytes_in_buffer;
+    src->pub.bytes_in_buffer = 0;
+
+  } else {
+    /* Simple case. Just advance buffer pointer */
+
+    src->pub.bytes_in_buffer -= (size_t)num_bytes;
+    src->pub.next_input_byte += num_bytes;
+  }
+}
+
+
+/******************************************************************************/
+/* data source manager method
+	This is called whenever bytes_in_buffer has reached zero and more
+	data is wanted.  In typical applications, it should read fresh data
+	into the buffer (ignoring the current state of next_input_byte and
+	bytes_in_buffer), reset the pointer & count to the start of the
+	buffer, and return TRUE indicating that the buffer has been reloaded.
+	It is not necessary to fill the buffer entirely, only to obtain at
+	least one more byte.  bytes_in_buffer MUST be set to a positive value
+	if TRUE is returned.  A FALSE return should only be used when I/O
+	suspension is desired.
+*/
+boolean PR_CALLBACK
+fill_input_buffer (j_decompress_ptr jd)
+{
+  decoder_source_mgr *src = (decoder_source_mgr *)jd->src;
+
+  unsigned char *new_buffer = (unsigned char *)src->decoder->mBuffer;
+  PRUint32 new_buflen = src->decoder->mBufferLen;
+  PRUint32 bytesToSkip = src->decoder->mBytesToSkip;
+
+  switch(src->decoder->mFillState) {
+  case READING_BACK:
+    {
+      if (!new_buffer || new_buflen == 0)
+        return PR_FALSE; /* suspend */
+
+      src->decoder->mBufferLen = 0;
+
+      if (bytesToSkip != 0) {
+        if (bytesToSkip < new_buflen) {
+          /* All done skipping bytes; Return what's left. */
+          new_buffer += bytesToSkip;
+          new_buflen -= bytesToSkip;
+          src->decoder->mBytesToSkip = 0;
+        } else {
+          /* Still need to skip some more data in the future */
+          src->decoder->mBytesToSkip -= (size_t)new_buflen;
+          return PR_FALSE; /* suspend */
+        }
+      }
+
+      src->decoder->mBackBufferUnreadLen = src->pub.bytes_in_buffer;
+
+      src->pub.next_input_byte = new_buffer;
+      src->pub.bytes_in_buffer = (size_t)new_buflen;
+      src->decoder->mFillState = READING_NEW;
+
+      return PR_TRUE;
+    }
+    break;
+
+  case READING_NEW:
+    {
+      if (src->pub.next_input_byte != src->decoder->mBuffer) {
+        /* Backtrack data has been permanently consumed. */
+        src->decoder->mBackBufferUnreadLen = 0;
+        src->decoder->mBackBufferLen = 0;
+      }
+
+      /* Save remainder of netlib buffer in backtrack buffer */
+      PRUint32 new_backtrack_buflen = src->pub.bytes_in_buffer + src->decoder->mBackBufferLen;
+
+
+      /* Make sure backtrack buffer is big enough to hold new data. */
+      if (src->decoder->mBackBufferSize < new_backtrack_buflen) {
+
+        /* Round up to multiple of 16 bytes. */
+        PRUint32 roundup_buflen = ((new_backtrack_buflen + 15) >> 4) << 4;
+        if (src->decoder->mBackBufferSize) {
+            src->decoder->mBackBuffer =
+          (JOCTET *)PR_REALLOC(src->decoder->mBackBuffer, roundup_buflen);
+        } else {
+          src->decoder->mBackBuffer = (JOCTET*)PR_MALLOC(roundup_buflen);
+        }
+
+        /* Check for OOM */
+        if (!src->decoder->mBackBuffer) {
+#if 0
+          j_common_ptr cinfo = (j_common_ptr)(&src->js->jd);
+          cinfo->err->msg_code = JERR_OUT_OF_MEMORY;
+          my_error_exit(cinfo);
+#endif
+        }
+          
+        src->decoder->mBackBufferSize = (size_t)roundup_buflen;
+
+        /* Check for malformed MARKER segment lengths. */
+        if (new_backtrack_buflen > MAX_JPEG_MARKER_LENGTH) {
+          my_error_exit((j_common_ptr)(&src->decoder->mInfo));
+        }
+      }
+
+
+      /* Copy remainder of netlib buffer into backtrack buffer. */
+      nsCRT::memmove(src->decoder->mBackBuffer + src->decoder->mBackBufferLen,
+                     src->pub.next_input_byte,
+                     src->pub.bytes_in_buffer);
+
+
+      /* Point to start of data to be rescanned. */
+      src->pub.next_input_byte = src->decoder->mBackBuffer + src->decoder->mBackBufferLen - src->decoder->mBackBufferUnreadLen;
+      src->pub.bytes_in_buffer += src->decoder->mBackBufferUnreadLen;
+      src->decoder->mBackBufferLen = (size_t)new_backtrack_buflen;
+    
+      src->decoder->mFillState = READING_BACK;
+
+      return PR_FALSE;
+    }
+    break;
+  }
+
+  return PR_FALSE;
+}
+
+/******************************************************************************/
+/* data source manager method */
+/*
+ * Terminate source --- called by jpeg_finish_decompress() after all
+ * data has been read to clean up JPEG source manager. NOT called by 
+ * jpeg_abort() or jpeg_destroy().
+ */
+void PR_CALLBACK
+term_source (j_decompress_ptr jd)
+{
+  decoder_source_mgr *src = (decoder_source_mgr *)jd->src;
+
+  if (src->decoder->mObserver) {
+    src->decoder->mObserver->OnStopFrame(nsnull, nsnull, src->decoder->mFrame);
+    src->decoder->mObserver->OnStopContainer(nsnull, nsnull, src->decoder->mImage);
+    src->decoder->mObserver->OnStopDecode(nsnull, nsnull, NS_OK, nsnull);
+  }
+
+    /* No work necessary here */
+}

mozilla/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.h

@@ -0,0 +1,121 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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):
+ *   Stuart Parmenter <pavlov@netscape.com>
+ */
+
+#ifndef nsJPEGDecoder_h__
+#define nsJPEGDecoder_h__
+
+#include "imgIDecoder.h"
+
+#include "nsCOMPtr.h"
+
+#include "imgIContainer.h"
+#include "gfxIImageFrame.h"
+#include "imgIDecoderObserver.h"
+#include "imgIRequest.h"
+#include "nsIInputStream.h"
+#include "nsIPipe.h"
+
+extern "C" {
+#include "jpeglib.h"
+}
+
+#include <setjmp.h>
+
+#define NS_JPEGDECODER_CID \
+{ /* 5871a422-1dd2-11b2-ab3f-e2e56be5da9c */         \
+     0x5871a422,                                     \
+     0x1dd2,                                         \
+     0x11b2,                                         \
+    {0xab, 0x3f, 0xe2, 0xe5, 0x6b, 0xe5, 0xda, 0x9c} \
+}
+
+typedef struct {
+    struct jpeg_error_mgr pub;  /* "public" fields for IJG library*/
+    jmp_buf setjmp_buffer;      /* For handling catastropic errors */
+} decoder_error_mgr;
+
+
+typedef enum {
+    JPEG_HEADER,                          /* Reading JFIF headers */
+    JPEG_START_DECOMPRESS,
+    JPEG_DECOMPRESS_PROGRESSIVE,          /* Output progressive pixels */
+    JPEG_DECOMPRESS_SEQUENTIAL,           /* Output sequential pixels */
+    JPEG_FINAL_PROGRESSIVE_SCAN_OUTPUT,
+    JPEG_DONE,
+    JPEG_SINK_NON_JPEG_TRAILER,          /* Some image files have a */
+                                         /* non-JPEG trailer */
+    JPEG_ERROR    
+} jstate;
+
+class nsJPEGDecoder : public imgIDecoder
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_IMGIDECODER
+  NS_DECL_NSIOUTPUTSTREAM
+
+  nsJPEGDecoder();
+  virtual ~nsJPEGDecoder();
+
+  PRBool FillInput(j_decompress_ptr jd);
+
+  PRUint32 mBytesToSkip;
+
+protected:
+  int OutputScanlines(int num_scanlines);
+
+public:
+  nsCOMPtr<imgIContainer> mImage;
+  nsCOMPtr<gfxIImageFrame> mFrame;
+  nsCOMPtr<imgIRequest> mRequest;
+
+  nsCOMPtr<imgIDecoderObserver> mObserver;
+
+  struct jpeg_decompress_struct mInfo;
+  decoder_error_mgr mErr;
+  jstate mState;
+
+  JSAMPARRAY mSamples;
+  JSAMPARRAY mSamples3;
+  PRUint8*   mRGBPadRow;
+  PRUint32   mRGBPadRowLength;
+
+  PRInt32 mCompletedPasses;
+  PRInt32 mPasses;
+
+  int mFillState;
+
+  JOCTET *mBuffer;
+  PRUint32 mBufferLen;  // amount of data currently in mBuffer
+  PRUint32 mBufferSize; // size in bytes what mBuffer was created with
+
+  JOCTET *mBackBuffer;
+  PRUint32 mBackBufferLen; // Offset of end of active backtrack data
+  PRUint32 mBackBufferSize; // size in bytes what mBackBuffer was created with
+  PRUint32 mBackBufferUnreadLen; // amount of data currently in mBackBuffer
+
+
+
+};
+
+#endif // nsJPEGDecoder_h__

mozilla/modules/libpr0n/decoders/jpeg/nsJPEGFactory.cpp

@@ -0,0 +1,42 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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): 
+ *   Stuart Parmenter <pavlov@netscape.com>
+ */
+
+#include "nsIGenericFactory.h"
+#include "nsIModule.h"
+
+#include "nsJPEGDecoder.h"
+
+// objects that just require generic constructors
+
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsJPEGDecoder)
+
+static nsModuleComponentInfo components[] =
+{
+  { "ppm decoder",
+    NS_JPEGDECODER_CID,
+    "@mozilla.org/image/decoder;2?type=image/jpeg",
+    nsJPEGDecoderConstructor, },
+};
+
+NS_IMPL_NSGETMODULE("nsJPEGDecoderModule", components)
+

mozilla/modules/libpr0n/decoders/jpeg/win32.order

@@ -0,0 +1,16 @@
+?Release@nsJPEGDecoder@@UAGKXZ ; 172
+?AddRef@nsJPEGDecoder@@UAGKXZ ; 172
+?fill_input_buffer@@YAEPAUjpeg_decompress_struct@@@Z ; 126
+?skip_input_data@@YAXPAUjpeg_decompress_struct@@J@Z ; 109
+?WriteFrom@nsJPEGDecoder@@UAGIPAVnsIInputStream@@IPAI@Z ; 106
+?OutputScanlines@nsJPEGDecoder@@IAEHH@Z ; 93
+?init_source@@YAXPAUjpeg_decompress_struct@@@Z ; 86
+??1nsJPEGDecoder@@UAE@XZ ; 86
+?Close@nsJPEGDecoder@@UAGIXZ ; 86
+?term_source@@YAXPAUjpeg_decompress_struct@@@Z ; 86
+?Init@nsJPEGDecoder@@UAGIPAVimgIRequest@@@Z ; 86
+??0nsJPEGDecoder@@QAE@XZ ; 86
+?Flush@nsJPEGDecoder@@UAGIXZ ; 86
+?QueryInterface@nsJPEGDecoder@@UAGIABUnsID@@PAPAX@Z ; 86
+??_EnsJPEGDecoder@@UAEPAXI@Z ; 86
+_NSGetModule ; 1

mozilla/modules/libpr0n/decoders/makefile.win

@@ -1,4 +1,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
@@ -9,19 +9,18 @@
 # implied. See the License for the specific language governing
 # rights and limitations under the License.
 # 
-# The Original Code is mozilla.org code.
+# 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>
+# Contributor(s):
 #
 
 DEPTH=..\..\..
 
-DIRS=content locale
+DIRS = ppm gif png jpeg
 
-include <$(DEPTH)\config\rules.mak>
+!include $(DEPTH)\config\rules.mak

mozilla/modules/libpr0n/decoders/png/Makefile.in

@@ -0,0 +1,42 @@
+#
+# 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):
+#
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= imgpng
+LIBRARY_NAME	= imgpng
+IS_COMPONENT	= 1
+
+REQUIRES	= xpcom necko layout png gfx2 imglib2
+
+CPPSRCS		= nsPNGDecoder.cpp nsPNGFactory.cpp
+
+EXTRA_DSO_LDOPTS = $(PNG_LIBS) $(ZLIB_LIBS) \
+		$(MOZ_COMPONENT_LIBS) \
+		$(NULL)
+
+include $(topsrcdir)/config/rules.mk
+

mozilla/modules/libpr0n/decoders/png/makefile.win

@@ -0,0 +1,53 @@
+#!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):
+#    Stuart Parmenter <pavlov@netscape.com>
+#
+
+DEPTH=..\..\..\..
+include <$(DEPTH)/config/config.mak>
+
+MODULE			= imgpng
+LIBRARY_NAME	= imgpng
+DLL			= $(OBJDIR)\$(LIBRARY_NAME).dll
+MAKE_OBJ_TYPE	= DLL
+
+OBJS	= \
+		.\$(OBJDIR)\nsPNGDecoder.obj \
+		.\$(OBJDIR)\nsPNGFactory.obj \
+		$(NULL)
+
+LLIBS=\
+	$(LIBNSPR) \
+	$(DIST)\lib\xpcom.lib \
+	$(DIST)\lib\png.lib \
+	$(DIST)\lib\zlib.lib \
+	$(DIST)\lib\gkgfxwin.lib \
+	$(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+install:: $(DLL)
+	$(MAKE_INSTALL) .\$(OBJDIR)\$(LIBRARY_NAME).dll $(DIST)\bin\components
+	$(MAKE_INSTALL) .\$(OBJDIR)\$(LIBRARY_NAME).lib $(DIST)\lib
+
+clobber::
+	rm -f $(DIST)\bin\components\$(LIBRARY_NAME).dll
+	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib

mozilla/modules/libpr0n/decoders/png/nsPNGDecoder.cpp

@@ -0,0 +1,553 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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):
+ *   Stuart Parmenter <pavlov@netscape.com>
+ *
+ */
+
+#include "nsPNGDecoder.h"
+
+#include "nsIInputStream.h"
+
+#include "nspr.h"
+
+#include "nsIComponentManager.h"
+
+#include "png.h"
+
+#include "nsIStreamObserver.h"
+
+#include "nsRect.h"
+
+#include "nsMemory.h"
+
+#include "imgIContainerObserver.h"
+
+// XXX we need to be sure to fire onStopDecode messages to mObserver in error cases.
+
+
+NS_IMPL_ISUPPORTS2(nsPNGDecoder, imgIDecoder, nsIOutputStream)
+
+
+nsPNGDecoder::nsPNGDecoder()
+{
+  NS_INIT_ISUPPORTS();
+
+  mPNG = nsnull;
+  mInfo = nsnull;
+  colorLine = 0;
+  alphaLine = 0;
+  interlacebuf = 0;
+}
+
+nsPNGDecoder::~nsPNGDecoder()
+{
+  if (colorLine)
+    nsMemory::Free(colorLine);
+  if (alphaLine)
+    nsMemory::Free(alphaLine);
+  if (interlacebuf)
+    nsMemory::Free(interlacebuf);
+}
+
+
+/** imgIDecoder methods **/
+
+/* void init (in imgIRequest aRequest); */
+NS_IMETHODIMP nsPNGDecoder::Init(imgIRequest *aRequest)
+{
+  mRequest = aRequest;
+  mObserver = do_QueryInterface(aRequest);  // we're holding 2 strong refs to the request.
+
+  aRequest->GetImage(getter_AddRefs(mImage));
+
+  /* do png init stuff */
+
+  /* Initialize the container's source image header. */
+  /* Always decode to 24 bit pixdepth */
+
+
+  mPNG = png_create_read_struct(PNG_LIBPNG_VER_STRING, 
+                                NULL, NULL, 
+                                NULL);
+  if (!mPNG) {
+    return NS_ERROR_FAILURE;
+  }
+
+  mInfo = png_create_info_struct(mPNG);
+  if (!mInfo) {
+    png_destroy_read_struct(&mPNG, NULL, NULL);
+    return NS_ERROR_FAILURE;
+  }
+
+  /* use ic as libpng "progressive pointer" (retrieve in callbacks) */
+  png_set_progressive_read_fn(mPNG, NS_STATIC_CAST(png_voidp, this), nsPNGDecoder::info_callback, nsPNGDecoder::row_callback, nsPNGDecoder::end_callback);
+
+  return NS_OK;
+}
+
+
+/* readonly attribute imgIRequest request; */
+NS_IMETHODIMP nsPNGDecoder::GetRequest(imgIRequest * *aRequest)
+{
+  *aRequest = mRequest;
+  NS_ADDREF(*aRequest);
+  return NS_OK;
+}
+
+
+
+
+
+
+/** nsIOutputStream methods **/
+
+/* void close (); */
+NS_IMETHODIMP nsPNGDecoder::Close()
+{
+  if (mPNG)
+    png_destroy_read_struct(&mPNG, mInfo ? &mInfo : NULL, NULL);
+
+  return NS_OK;
+}
+
+/* void flush (); */
+NS_IMETHODIMP nsPNGDecoder::Flush()
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* unsigned long write (in string buf, in unsigned long count); */
+NS_IMETHODIMP nsPNGDecoder::Write(const char *buf, PRUint32 count, PRUint32 *_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+
+static NS_METHOD ReadDataOut(nsIInputStream* in,
+                             void* closure,
+                             const char* fromRawSegment,
+                             PRUint32 toOffset,
+                             PRUint32 count,
+                             PRUint32 *writeCount)
+{
+  nsPNGDecoder *decoder = NS_STATIC_CAST(nsPNGDecoder*, closure);
+
+  // we need to do the setjmp here otherwise bad things will happen
+  if (setjmp(decoder->mPNG->jmpbuf)) {
+    png_destroy_read_struct(&decoder->mPNG, &decoder->mInfo, NULL);
+    // is this NS_ERROR_FAILURE enough?
+
+    decoder->mRequest->Cancel(NS_BINDING_ABORTED); // XXX is this the correct error ?
+
+    return NS_ERROR_FAILURE;
+  }
+
+  *writeCount = decoder->ProcessData((unsigned char*)fromRawSegment, count);
+  return NS_OK;
+}
+
+PRUint32 nsPNGDecoder::ProcessData(unsigned char *data, PRUint32 count)
+{
+  png_process_data(mPNG, mInfo, data, count);
+
+  return count; // we always consume all the data
+}
+
+/* unsigned long writeFrom (in nsIInputStream inStr, in unsigned long count); */
+NS_IMETHODIMP nsPNGDecoder::WriteFrom(nsIInputStream *inStr, PRUint32 count, PRUint32 *_retval)
+{
+//  PRUint32 sourceOffset = *_retval;
+
+  inStr->ReadSegments(ReadDataOut, this, count, _retval);
+
+  return NS_OK;
+}
+
+/* [noscript] unsigned long writeSegments (in nsReadSegmentFun reader, in voidPtr closure, in unsigned long count); */
+NS_IMETHODIMP nsPNGDecoder::WriteSegments(nsReadSegmentFun reader, void * closure, PRUint32 count, PRUint32 *_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* attribute boolean nonBlocking; */
+NS_IMETHODIMP nsPNGDecoder::GetNonBlocking(PRBool *aNonBlocking)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+NS_IMETHODIMP nsPNGDecoder::SetNonBlocking(PRBool aNonBlocking)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* attribute nsIOutputStreamObserver observer; */
+NS_IMETHODIMP nsPNGDecoder::GetObserver(nsIOutputStreamObserver * *aObserver)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+NS_IMETHODIMP nsPNGDecoder::SetObserver(nsIOutputStreamObserver * aObserver)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+
+
+
+
+
+
+
+
+
+
+void
+nsPNGDecoder::info_callback(png_structp png_ptr, png_infop info_ptr)
+{
+/*  int number_passes;   NOT USED  */
+  png_uint_32 width, height;
+  int bit_depth, color_type, interlace_type, compression_type, filter_type;
+  int channels;
+  double LUT_exponent, CRT_exponent = 2.2, display_exponent, aGamma;
+
+  png_bytep trans=NULL;
+  int num_trans =0;
+
+  /* always decode to 24-bit RGB or 32-bit RGBA  */
+  png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
+               &interlace_type, &compression_type, &filter_type);
+
+  if (color_type == PNG_COLOR_TYPE_PALETTE)
+    png_set_expand(png_ptr);
+
+  if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
+    png_set_expand(png_ptr);
+
+  if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) {
+    png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans, NULL);
+    png_set_expand(png_ptr);
+  }
+
+  if (bit_depth == 16)
+    png_set_strip_16(png_ptr);
+
+  if (color_type == PNG_COLOR_TYPE_GRAY ||
+      color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+      png_set_gray_to_rgb(png_ptr);
+
+
+#ifdef XP_PC
+  // windows likes BGR
+  png_set_bgr(png_ptr);
+#endif
+
+  /* set up gamma correction for Mac, Unix and (Win32 and everything else)
+   * using educated guesses for display-system exponents; do preferences
+   * later */
+
+#if defined(XP_MAC)
+  LUT_exponent = 1.8 / 2.61;
+#elif defined(XP_UNIX)
+# if defined(__sgi)
+  LUT_exponent = 1.0 / 1.7;   /* typical default for SGI console */
+# elif defined(NeXT)
+  LUT_exponent = 1.0 / 2.2;   /* typical default for NeXT cube */
+# else
+  LUT_exponent = 1.0;         /* default for most other Unix workstations */
+# endif
+#else
+  LUT_exponent = 1.0;         /* virtually all PCs and most other systems */
+#endif
+
+  /* (alternatively, could check for SCREEN_GAMMA environment variable) */
+  display_exponent = LUT_exponent * CRT_exponent;
+
+  if (png_get_gAMA(png_ptr, info_ptr, &aGamma))
+      png_set_gamma(png_ptr, display_exponent, aGamma);
+  else
+      png_set_gamma(png_ptr, display_exponent, 0.45455);
+
+  /* let libpng expand interlaced images */
+  if (interlace_type == PNG_INTERLACE_ADAM7) {
+      /* number_passes = */
+      png_set_interlace_handling(png_ptr);
+  }
+
+  /* now all of those things we set above are used to update various struct
+   * members and whatnot, after which we can get channels, rowbytes, etc. */
+  png_read_update_info(png_ptr, info_ptr);
+  channels = png_get_channels(png_ptr, info_ptr);
+  PR_ASSERT(channels == 3 || channels == 4);
+
+  /*---------------------------------------------------------------*/
+  /* copy PNG info into imagelib structs (formerly png_set_dims()) */
+  /*---------------------------------------------------------------*/
+
+  PRInt32 alpha_bits = 1;
+
+  if (channels > 3) {
+    /* check if alpha is coming from a tRNS chunk and is binary */
+    if (num_trans) {
+      /* if it's not a indexed color image, tRNS means binary */
+      if (color_type == PNG_COLOR_TYPE_PALETTE) {
+        for (int i=0; i<num_trans; i++) {
+          if ((trans[i] != 0) && (trans[i] != 255)) {
+            alpha_bits = 8;
+            break;
+          }
+        }
+      }
+    } else {
+      alpha_bits = 8;
+    }
+  }
+
+  nsPNGDecoder *decoder = NS_STATIC_CAST(nsPNGDecoder*, png_get_progressive_ptr(png_ptr));
+
+  if (decoder->mObserver)
+    decoder->mObserver->OnStartDecode(nsnull, nsnull);
+
+  // since the png is only 1 frame, initalize the container to the width and height of the frame
+  decoder->mImage->Init(width, height, decoder->mObserver);
+
+  if (decoder->mObserver)
+    decoder->mObserver->OnStartContainer(nsnull, nsnull, decoder->mImage);
+
+  decoder->mFrame = do_CreateInstance("@mozilla.org/gfx/image/frame;2");
+#if 0
+  // XXX should we longjmp to png_ptr->jumpbuf here if we failed?
+  if (!decoder->mFrame)
+    return NS_ERROR_FAILURE;
+#endif
+
+  gfx_format format;
+
+  if (channels == 3) {
+    format = gfxIFormats::RGB;
+  } else if (channels > 3) {
+    if (alpha_bits == 8) {
+      decoder->mImage->GetPreferredAlphaChannelFormat(&format);
+    } else if (alpha_bits == 1) {
+      format = gfxIFormats::RGB_A1;
+    }
+  }
+
+#ifdef XP_PC
+  // XXX this works...
+  format += 1; // RGB to BGR
+#endif
+
+  // then initalize the frame and append it to the container
+  decoder->mFrame->Init(0, 0, width, height, format);
+
+  decoder->mImage->AppendFrame(decoder->mFrame);
+
+  if (decoder->mObserver)
+    decoder->mObserver->OnStartFrame(nsnull, nsnull, decoder->mFrame);
+
+  PRUint32 bpr, abpr;
+  decoder->mFrame->GetImageBytesPerRow(&bpr);
+  decoder->mFrame->GetAlphaBytesPerRow(&abpr);
+  decoder->colorLine = (PRUint8 *)nsMemory::Alloc(bpr);
+  if (channels > 3)
+    decoder->alphaLine = (PRUint8 *)nsMemory::Alloc(abpr);
+
+  if (interlace_type == PNG_INTERLACE_ADAM7) {
+    decoder->interlacebuf = (PRUint8 *)nsMemory::Alloc(channels*width*height);
+    decoder->ibpr = channels*width;
+    if (!decoder->interlacebuf) {
+//      return NS_ERROR_FAILURE;
+    }            
+  }
+
+  return;
+}
+
+
+
+
+
+void
+nsPNGDecoder::row_callback(png_structp png_ptr, png_bytep new_row,
+                           png_uint_32 row_num, int pass)
+{
+  /* libpng comments:
+   *
+   * this function is called for every row in the image.  If the
+   * image is interlacing, and you turned on the interlace handler,
+   * this function will be called for every row in every pass.
+   * Some of these rows will not be changed from the previous pass.
+   * When the row is not changed, the new_row variable will be NULL.
+   * The rows and passes are called in order, so you don't really
+   * need the row_num and pass, but I'm supplying them because it
+   * may make your life easier.
+   *
+   * For the non-NULL rows of interlaced images, you must call
+   * png_progressive_combine_row() passing in the row and the
+   * old row.  You can call this function for NULL rows (it will
+   * just return) and for non-interlaced images (it just does the
+   * memcpy for you) if it will make the code easier.  Thus, you
+   * can just do this for all cases:
+   *
+   *    png_progressive_combine_row(png_ptr, old_row, new_row);
+   *
+   * where old_row is what was displayed for previous rows.  Note
+   * that the first pass (pass == 0 really) will completely cover
+   * the old row, so the rows do not have to be initialized.  After
+   * the first pass (and only for interlaced images), you will have
+   * to pass the current row, and the function will combine the
+   * old row and the new row.
+   */
+  nsPNGDecoder *decoder = NS_STATIC_CAST(nsPNGDecoder*, png_get_progressive_ptr(png_ptr));
+
+  PRUint32 bpr, abpr;
+  decoder->mFrame->GetImageBytesPerRow(&bpr);
+  decoder->mFrame->GetAlphaBytesPerRow(&abpr);
+
+  png_bytep line;
+  if (decoder->interlacebuf) {
+    line = decoder->interlacebuf+(row_num*decoder->ibpr);
+    png_progressive_combine_row(png_ptr, line, new_row);
+  }
+  else
+    line = new_row;
+
+  if (new_row) {
+    nscoord width;
+    decoder->mFrame->GetWidth(&width);
+    PRUint32 iwidth = width;
+
+    gfx_format format;
+    decoder->mFrame->GetFormat(&format);
+    PRUint8 *aptr, *cptr;
+
+// The mac specific ifdefs in the code below are there to make sure we
+// always fill in 4 byte pixels right now, which is what the mac always
+// allocates for its pixel buffers in true color mode. This will change
+// when we start storing images with color palettes when they don't need
+// true color support (GIFs).
+    switch (format) {
+    case gfxIFormats::RGB:
+    case gfxIFormats::BGR:
+#ifdef XP_MAC
+        cptr = decoder->colorLine;
+        for (PRUint32 x=0; x<iwidth; x++) {
+          *cptr++ = 0;
+          *cptr++ = *line++;
+          *cptr++ = *line++;
+          *cptr++ = *line++;
+        }
+        decoder->mFrame->SetImageData(decoder->colorLine, bpr, row_num*bpr);
+#else
+        decoder->mFrame->SetImageData((PRUint8*)line, bpr, row_num*bpr);
+#endif
+      break;
+    case gfxIFormats::RGB_A1:
+    case gfxIFormats::BGR_A1:
+      {
+        cptr = decoder->colorLine;
+        aptr = decoder->alphaLine;
+        memset(aptr, 0, abpr);
+        for (PRUint32 x=0; x<iwidth; x++) {
+#ifdef XP_MAC
+          *cptr++ = 0;
+#endif
+          *cptr++ = *line++;
+          *cptr++ = *line++;
+          *cptr++ = *line++;
+          if (*line++) {
+            aptr[x>>3] |= 1<<(7-x&0x7);
+          }
+        }
+        decoder->mFrame->SetImageData(decoder->colorLine, bpr, row_num*bpr);
+        decoder->mFrame->SetAlphaData(decoder->alphaLine, abpr, row_num*abpr);
+      }
+      break;
+    case gfxIFormats::RGB_A8:
+    case gfxIFormats::BGR_A8:
+      {
+        cptr = decoder->colorLine;
+        aptr = decoder->alphaLine;
+        for (PRUint32 x=0; x<iwidth; x++) {
+#ifdef XP_MAC
+          *cptr++ = 0;
+#endif
+          *cptr++ = *line++;
+          *cptr++ = *line++;
+          *cptr++ = *line++;
+          *aptr++ = *line++;
+        }
+        decoder->mFrame->SetImageData(decoder->colorLine, bpr, row_num*bpr);
+        decoder->mFrame->SetAlphaData(decoder->alphaLine, abpr, row_num*abpr);
+      }
+      break;
+    case gfxIFormats::RGBA:
+    case gfxIFormats::BGRA:
+#ifdef XP_MAC
+      {
+        cptr = decoder->colorLine;
+        aptr = decoder->alphaLine;
+        for (PRUint32 x=0; x<iwidth; x++) {
+          *cptr++ = 0;
+          *cptr++ = *line++;
+          *cptr++ = *line++;
+          *cptr++ = *line++;
+          *aptr++ = *line++;
+        }
+        decoder->mFrame->SetImageData(decoder->colorLine, bpr, row_num*bpr);
+        decoder->mFrame->SetAlphaData(decoder->alphaLine, abpr, row_num*abpr);
+      }
+#else
+      decoder->mFrame->SetImageData(line, bpr, row_num*bpr);
+#endif
+      break;
+    }
+
+    nsRect r(0, row_num, width, 1);
+    decoder->mObserver->OnDataAvailable(nsnull, nsnull, decoder->mFrame, &r);
+  }
+}
+
+
+
+void
+nsPNGDecoder::end_callback(png_structp png_ptr, png_infop info_ptr)
+{
+  /* libpng comments:
+   *
+   * this function is called when the whole image has been read,
+   * including any chunks after the image (up to and including
+   * the IEND).  You will usually have the same info chunk as you
+   * had in the header, although some data may have been added
+   * to the comments and time fields.
+   *
+   * Most people won't do much here, perhaps setting a flag that
+   * marks the image as finished.
+   */
+
+  nsPNGDecoder *decoder = NS_STATIC_CAST(nsPNGDecoder*, png_get_progressive_ptr(png_ptr));
+
+  if (decoder->mObserver) {
+    decoder->mObserver->OnStopFrame(nsnull, nsnull, decoder->mFrame);
+    decoder->mObserver->OnStopContainer(nsnull, nsnull, decoder->mImage);
+    decoder->mObserver->OnStopDecode(nsnull, nsnull, NS_OK, nsnull);
+  }
+
+}
+

mozilla/modules/libpr0n/decoders/png/nsPNGDecoder.h

@@ -0,0 +1,82 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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):
+ *   Stuart Parmenter <pavlov@netscape.com>
+ */
+
+#ifndef nsPNGDecoder_h__
+#define nsPNGDecoder_h__
+
+#include "imgIDecoder.h"
+
+#include "imgIContainer.h"
+#include "imgIDecoderObserver.h"
+#include "gfxIImageFrame.h"
+#include "imgIRequest.h"
+
+
+#include "nsCOMPtr.h"
+
+#include "png.h"
+
+#define NS_PNGDECODER_CID \
+{ /* 36fa00c2-1dd2-11b2-be07-d16eeb4c50ed */         \
+     0x36fa00c2,                                     \
+     0x1dd2,                                         \
+     0x11b2,                                         \
+    {0xbe, 0x07, 0xd1, 0x6e, 0xeb, 0x4c, 0x50, 0xed} \
+}
+
+class nsPNGDecoder : public imgIDecoder
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_IMGIDECODER
+  NS_DECL_NSIOUTPUTSTREAM
+
+  nsPNGDecoder();
+  virtual ~nsPNGDecoder();
+
+PR_STATIC_CALLBACK(void)
+info_callback(png_structp png_ptr, png_infop info_ptr);
+PR_STATIC_CALLBACK(void)
+row_callback(png_structp png_ptr, png_bytep new_row,
+             png_uint_32 row_num, int pass);
+
+PR_STATIC_CALLBACK(void)
+end_callback(png_structp png_ptr, png_infop info_ptr);
+
+  inline PRUint32 ProcessData(unsigned char *data, PRUint32 count);
+
+
+public:
+  nsCOMPtr<imgIContainer> mImage;
+  nsCOMPtr<gfxIImageFrame> mFrame;
+  nsCOMPtr<imgIRequest> mRequest;
+  nsCOMPtr<imgIDecoderObserver> mObserver; // this is just qi'd from mRequest for speed
+
+  png_structp mPNG;
+  png_infop mInfo;
+  PRUint8 *colorLine, *alphaLine;
+  PRUint8 *interlacebuf;
+  PRUint32 ibpr;
+};
+
+#endif // nsPNGDecoder_h__

mozilla/modules/libpr0n/decoders/png/nsPNGFactory.cpp

@@ -0,0 +1,46 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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): 
+ *   Stuart Parmenter <pavlov@netscape.com>
+ */
+
+#include "nsIGenericFactory.h"
+#include "nsIModule.h"
+
+#include "nsPNGDecoder.h"
+
+// objects that just require generic constructors
+
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsPNGDecoder)
+
+static nsModuleComponentInfo components[] =
+{
+  { "PNG decoder",
+    NS_PNGDECODER_CID,
+    "@mozilla.org/image/decoder;2?type=image/png",
+    nsPNGDecoderConstructor, },
+  { "PNG decoder",
+    NS_PNGDECODER_CID,
+    "@mozilla.org/image/decoder;2?type=image/x-png",
+    nsPNGDecoderConstructor, },
+};
+
+NS_IMPL_NSGETMODULE("nsPNGDecoderModule", components)
+

mozilla/modules/libpr0n/decoders/ppm/Makefile.in

@@ -0,0 +1,42 @@
+#
+# 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):
+#
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= imgppm
+LIBRARY_NAME	= imgppm
+IS_COMPONENT	= 1
+
+REQUIRES	= xpcom layout necko gfx2 imglib2
+
+CPPSRCS		= nsPPMDecoder.cpp nsPPMFactory.cpp
+
+EXTRA_DSO_LDOPTS = \
+		$(MOZ_COMPONENT_LIBS) \
+		$(NULL)
+
+include $(topsrcdir)/config/rules.mk
+

mozilla/modules/libpr0n/decoders/ppm/makefile.win

@@ -10,17 +10,42 @@
 # implied. See the License for the specific language governing
 # rights and limitations under the License.
 # 
-# The Original Code is mozilla.org code.
+# 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>
-# 
+# Contributor(s):
+#    Stuart Parmenter <pavlov@netscape.com>
+#
 
-DEPTH=..\..\..\..\..
+DEPTH=..\..\..\..
+include <$(DEPTH)/config/config.mak>
+
+MODULE			= imgppm
+LIBRARY_NAME	= imgppm
+DLL			= $(OBJDIR)\$(LIBRARY_NAME).dll
+MAKE_OBJ_TYPE	= DLL
+
+OBJS	= \
+		.\$(OBJDIR)\nsPPMDecoder.obj \
+		.\$(OBJDIR)\nsPPMFactory.obj \
+		$(NULL)
+
+LLIBS=\
+	$(LIBNSPR) \
+	$(DIST)\lib\xpcom.lib \
+	$(DIST)\lib\gkgfxwin.lib \
+	$(NULL)
 
 include <$(DEPTH)\config\rules.mak>
+
+install:: $(DLL)
+	$(MAKE_INSTALL) .\$(OBJDIR)\$(LIBRARY_NAME).dll $(DIST)\bin\components
+	$(MAKE_INSTALL) .\$(OBJDIR)\$(LIBRARY_NAME).lib $(DIST)\lib
+
+clobber::
+	rm -f $(DIST)\bin\components\$(LIBRARY_NAME).dll
+	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib

mozilla/modules/libpr0n/decoders/ppm/nsPPMDecoder.cpp

@@ -0,0 +1,305 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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):
+ *   Stuart Parmenter <pavlov@netscape.com>
+ *
+ */
+
+#include "nsPPMDecoder.h"
+
+#include "nsIInputStream.h"
+#include "imgIContainer.h"
+#include "imgIContainerObserver.h"
+
+#include "nspr.h"
+
+#include "nsIComponentManager.h"
+
+#include "nsRect.h"
+
+NS_IMPL_ISUPPORTS2(nsPPMDecoder, imgIDecoder, nsIOutputStream)
+
+
+nsPPMDecoder::nsPPMDecoder()
+{
+  NS_INIT_ISUPPORTS();
+  mDataReceived = 0;
+  mDataWritten = 0;
+
+  mDataLeft = 0;
+  mPrevData = nsnull;
+}
+
+nsPPMDecoder::~nsPPMDecoder()
+{
+
+}
+
+
+/** imgIDecoder methods **/
+
+/* void init (in imgIRequest aRequest); */
+NS_IMETHODIMP nsPPMDecoder::Init(imgIRequest *aRequest)
+{
+  mRequest = aRequest;
+
+  mObserver = do_QueryInterface(aRequest);  // we're holding 2 strong refs to the request.
+
+  aRequest->GetImage(getter_AddRefs(mImage));
+
+  mFrame = do_CreateInstance("@mozilla.org/gfx/image/frame;2");
+  if (!mFrame)
+    return NS_ERROR_FAILURE;
+
+  return NS_OK;
+}
+
+/* readonly attribute imgIRequest request; */
+NS_IMETHODIMP nsPPMDecoder::GetRequest(imgIRequest * *aRequest)
+{
+  *aRequest = mRequest;
+  NS_ADDREF(*aRequest);
+  return NS_OK;
+}
+
+
+
+
+
+
+/** nsIOutputStream methods **/
+
+/* void close (); */
+NS_IMETHODIMP nsPPMDecoder::Close()
+{
+  if (mObserver) {
+    mObserver->OnStopFrame(nsnull, nsnull, mFrame);
+    mObserver->OnStopContainer(nsnull, nsnull, mImage);
+    mObserver->OnStopDecode(nsnull, nsnull, NS_OK, nsnull);
+  }
+  
+  return NS_OK;
+}
+
+/* void flush (); */
+NS_IMETHODIMP nsPPMDecoder::Flush()
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* unsigned long write (in string buf, in unsigned long count); */
+NS_IMETHODIMP nsPPMDecoder::Write(const char *buf, PRUint32 count, PRUint32 *_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+static char *__itoa(int n)
+{
+	char *s;
+	int i, j, sign, tmp;
+	
+	/* check sign and convert to positive to stringify numbers */
+	if ( (sign = n) < 0)
+		n = -n;
+	i = 0;
+	s = (char*) malloc(sizeof(char));
+	
+	/* grow string as needed to add numbers from powers of 10 
+     * down till none left 
+     */
+	do
+	{
+		s = (char*) realloc(s, (i+1)*sizeof(char));
+		s[i++] = n % 10 + '0';  /* '0' or 30 is where ASCII numbers start */
+		s[i] = '\0';
+	}
+	while( (n /= 10) > 0);	
+	
+	/* tack on minus sign if we found earlier that this was negative */
+	if (sign < 0)
+	{
+		s = (char*) realloc(s, (i+1)*sizeof(char));
+		s[i++] = '-';
+	}
+	s[i] = '\0';
+	
+	/* pop numbers (and sign) off of string to push back into right direction */
+	for (i = 0, j = strlen(s) - 1; i < j; i++, j--)
+	{
+		tmp = s[i];
+		s[i] = s[j];
+		s[j] = tmp;
+	}
+	
+	return s;
+}
+
+
+/* unsigned long writeFrom (in nsIInputStream inStr, in unsigned long count); */
+NS_IMETHODIMP nsPPMDecoder::WriteFrom(nsIInputStream *inStr, PRUint32 count, PRUint32 *_retval)
+{
+  nsresult rv;
+
+  char *buf = (char *)PR_Malloc(count + mDataLeft);
+  if (!buf)
+    return NS_ERROR_OUT_OF_MEMORY; /* we couldn't allocate the object */
+
+  
+  // read the data from the input stram...
+  PRUint32 readLen;
+  rv = inStr->Read(buf+mDataLeft, count, &readLen);
+
+  PRUint32 dataLen = readLen + mDataLeft;
+
+  if (mPrevData) {
+    strncpy(buf, mPrevData, mDataLeft);
+    PR_Free(mPrevData);
+    mPrevData = nsnull;
+    mDataLeft = 0;
+  }
+
+  char *data = buf;
+
+  if (NS_FAILED(rv)) return rv;
+
+  if (mDataReceived == 0) {
+
+    mObserver->OnStartDecode(nsnull, nsnull);
+
+    // Check the magic number
+    char type;
+    if ((sscanf(data, "P%c\n", &type) !=1) || (type != '6')) {
+      return NS_ERROR_FAILURE;
+    }
+    int i = 3;
+    data += i;
+
+#if 0
+    // XXX
+    // Ignore comments
+    while ((input = fgetc(f)) == '#')
+      fgets(junk, 512, f);
+    ungetc(input, f);
+#endif
+
+    // Read size
+    int w, h, mcv;
+
+    if (sscanf(data, "%d %d\n%d\n", &w, &h, &mcv) != 3) {
+      return NS_ERROR_FAILURE;
+    }
+    char *ws = __itoa(w), *hs = __itoa(h), *mcvs = __itoa(mcv);
+    int j = strlen(ws) + strlen(hs) + strlen(mcvs) + 3;
+    data += j;
+//    free(ws);
+//    free(hs);
+//    free(mcvs);
+
+    readLen -= i + j;
+    dataLen = readLen; // since this is the first pass, we don't have any data waiting that we need to keep track of
+
+    mImage->Init(w, h, mObserver);
+    if (mObserver)
+      mObserver->OnStartContainer(nsnull, nsnull, mImage);
+
+    mFrame->Init(0, 0, w, h, gfxIFormats::RGB);
+    mImage->AppendFrame(mFrame);
+    if (mObserver)
+      mObserver->OnStartFrame(nsnull, nsnull, mFrame);
+  }
+
+  PRUint32 bpr;
+  nscoord width;
+  mFrame->GetImageBytesPerRow(&bpr);
+  mFrame->GetWidth(&width);
+
+  // XXX ceil?
+  PRUint32 real_bpr = width * 3;
+  
+  PRUint32 i = 0;
+  PRUint32 rownum = mDataWritten / real_bpr;  // XXX this better not have a decimal
+  
+  PRUint32 wroteLen = 0;
+
+  if (readLen > real_bpr) {
+
+    do {
+      PRUint8 *line = (PRUint8*)data + i*real_bpr;
+      mFrame->SetImageData(line, real_bpr, (rownum++)*bpr);
+
+      nsRect r(0, rownum, width, 1);
+      mObserver->OnDataAvailable(nsnull, nsnull, mFrame, &r);
+
+
+      wroteLen += real_bpr ;
+      i++;
+    } while(dataLen >= real_bpr * (i+1));
+
+  }
+  
+  mDataReceived += readLen;  // don't double count previous data that is in 'dataLen'
+  mDataWritten += wroteLen;
+
+  PRUint32 dataLeft = dataLen - wroteLen;
+
+  if (dataLeft > 0) {
+    if (mPrevData) {
+      mPrevData = (char *)PR_Realloc(mPrevData, mDataLeft + dataLeft);
+      strncpy(mPrevData + mDataLeft, data+wroteLen, dataLeft);
+      mDataLeft += dataLeft;
+
+    } else {
+      mDataLeft = dataLeft;
+      mPrevData = (char *)PR_Malloc(mDataLeft);
+      strncpy(mPrevData, data+wroteLen, mDataLeft);
+    }
+  }
+
+  PR_FREEIF(buf);
+
+  return NS_OK;
+}
+
+/* [noscript] unsigned long writeSegments (in nsReadSegmentFun reader, in voidPtr closure, in unsigned long count); */
+NS_IMETHODIMP nsPPMDecoder::WriteSegments(nsReadSegmentFun reader, void * closure, PRUint32 count, PRUint32 *_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* attribute boolean nonBlocking; */
+NS_IMETHODIMP nsPPMDecoder::GetNonBlocking(PRBool *aNonBlocking)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+NS_IMETHODIMP nsPPMDecoder::SetNonBlocking(PRBool aNonBlocking)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* attribute nsIOutputStreamObserver observer; */
+NS_IMETHODIMP nsPPMDecoder::GetObserver(nsIOutputStreamObserver * *aObserver)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+NS_IMETHODIMP nsPPMDecoder::SetObserver(nsIOutputStreamObserver * aObserver)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+

mozilla/modules/libpr0n/decoders/ppm/nsPPMDecoder.h

@@ -0,0 +1,67 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the 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):
+ *   Stuart Parmenter <pavlov@netscape.com>
+ */
+
+#ifndef nsPPMDecoder_h__
+#define nsPPMDecoder_h__
+
+#include "imgIDecoder.h"
+
+#include "nsCOMPtr.h"
+
+#include "imgIContainer.h"
+#include "imgIDecoderObserver.h"
+#include "gfxIImageFrame.h"
+#include "imgIRequest.h"
+
+#define NS_PPMDECODER_CID \
+{ /* e90bfa06-1dd1-11b2-8217-f38fe5d431a2 */         \
+     0xe90bfa06,                                     \
+     0x1dd1,                                         \
+     0x11b2,                                         \
+    {0x82, 0x17, 0xf3, 0x8f, 0xe5, 0xd4, 0x31, 0xa2} \
+}
+
+class nsPPMDecoder : public imgIDecoder
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_IMGIDECODER
+  NS_DECL_NSIOUTPUTSTREAM
+
+  nsPPMDecoder();
+  virtual ~nsPPMDecoder();
+
+private:
+  nsCOMPtr<imgIContainer> mImage;
+  nsCOMPtr<gfxIImageFrame> mFrame;
+  nsCOMPtr<imgIRequest> mRequest;
+  nsCOMPtr<imgIDecoderObserver> mObserver; // this is just qi'd from mRequest for speed
+
+  PRUint32 mDataReceived;
+  PRUint32 mDataWritten;
+
+  PRUint32 mDataLeft;
+  char *mPrevData;
+};
+
+#endif // nsPPMDecoder_h__

mozilla/modules/libpr0n/decoders/ppm/nsPPMFactory.cpp

@@ -0,0 +1,42 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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): 
+ *   Stuart Parmenter <pavlov@netscape.com>
+ */
+
+#include "nsIGenericFactory.h"
+#include "nsIModule.h"
+
+#include "nsPPMDecoder.h"
+
+// objects that just require generic constructors
+
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsPPMDecoder)
+
+static nsModuleComponentInfo components[] =
+{
+  { "ppm decoder",
+    NS_PPMDECODER_CID,
+    "@mozilla.org/image/decoder;2?type=image/x-portable-pixmap",
+    nsPPMDecoderConstructor, },
+};
+
+NS_IMPL_NSGETMODULE("nsPPMDecoderModule", components)
+