merge from head

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

mozilla/mailnews/mapi/makefile.win

@@ -1,28 +0,0 @@
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is mozilla.org code.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 2001 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s): 
-# Srilatha Moturi <srilatha@netscape.com>
-# Krishna Mohan Khandrika <kkhandrika@netscape.com>
-#
-
-DEPTH=..\..
-
-DIRS=mapihook resources mapiDll
-
-include <$(DEPTH)\config\rules.mak>

mozilla/mailnews/mapi/mapiDll/Mapi32.DEF

@@ -1,54 +0,0 @@
-; ***** BEGIN LICENSE BLOCK *****
-; Version: MPL 1.1/GPL 2.0/LGPL 2.1
-;
-; The contents of this file are subject to the Mozilla Public License Version
-; 1.1 (the "License"); you may not use this file except in compliance with
-; the License. You may obtain a copy of the License at
-; http://www.mozilla.org/MPL/
-;
-; Software distributed under the License is distributed on an "AS IS" basis,
-; WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-; for the specific language governing rights and limitations under the
-; License.
-;
-; The Original Code is Mozilla.
-;
-; The Initial Developer of the Original Code is
-; Netscape Communications Corp.
-; Portions created by the Initial Developer are Copyright (C) 2001
-; the Initial Developer. All Rights Reserved.
-;
-; Contributor(s):  Krishna Mohan Khandrika (kkhandrika@netscape.com)
-;
-; Alternatively, the contents of this file may be used under the terms of
-; either the GNU General Public License Version 2 or later (the "GPL"), or
-; the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-; in which case the provisions of the GPL or the LGPL are applicable instead
-; of those above. If you wish to allow use of your version of this file only
-; under the terms of either the GPL or the LGPL, and not to allow others to
-; use your version of this file under the terms of the MPL, indicate your
-; decision by deleting the provisions above and replace them with the notice
-; and other provisions required by the GPL or the LGPL. If you do not delete
-; the provisions above, a recipient may use your version of this file under
-; the terms of any one of the MPL, the GPL or the LGPL.
-;
-; ***** END LICENSE BLOCK ***** 
-
-LIBRARY         mozMapi32.dll
-DESCRIPTION     'Mozilla Simple MAPI Support'
-
-EXPORTS
-        MAPILogon
-        MAPILogoff
-	MAPISendMail
-	MAPISendDocuments
-        MAPIFindNext
-        MAPIReadMail
-        MAPISaveMail
-        MAPIDeleteMail
-        MAPIAddress
-        MAPIDetails
-        MAPIResolveName
-        MAPIFreeBuffer
-        GetMapiDllVersion
-

mozilla/mailnews/mapi/mapiDll/MapiDll.cpp

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

mozilla/mailnews/mapi/mapiDll/makefile.win

@@ -1,61 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is Mozilla.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corp.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK ***** 
-
-DEPTH=..\..\..
-
-MODULE          = mozMapi32
-EXPORT_LIBRARY  = $(MODULE)
-LIBRARY_NAME    = $(MODULE)
-DEFFILE         = Mapi32.def
-
-REQUIRES	= MapiProxy \
-                  msgMapi \
-		  xpcom \
-		  string \
-		  $(NULL)
-
-include <$(DEPTH)\config\config.mak>
-###############################################################
-
-LCFLAGS=-DUNICODE -D_UNICODE
-
-
-OBJS= .\$(OBJDIR)\MapiDll.obj
-
-WIN_LIBS= ole32.lib
-
-include <$(DEPTH)\config\rules.mak>
-

mozilla/mailnews/mapi/mapihook/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/Makefile.win

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

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

@@ -1,173 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is 
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-//
-//  smem.cpp - This deals with all shared memory functions needed for 
-//  the MAPI component of Communicator
-//  Written by: Rich Pizzarro (rhp@netscape.com)
-//  November 1997
-//
-#include <windows.h>
-#include <windowsx.h>
-
-#include "mapismem.h"
-
-
-#ifndef ZeroMemory
-#include <memory.h>
-#define ZeroMemory(PTR, SIZE) memset(PTR, 0, SIZE)
-#endif // ZeroMemory
-
-// 
-// *create new* shared memory chunk 
-// once this is created, use the pointer
-// to the segment to to store data 
-// e.g.: 
-//     lpString = "string for communicator"; 
-//     lstrcpy((LPSTR)pData->m_buf[0], lpString); 
-//  
-CSharedMem *
-NSCreateSharedMemory(DWORD memSize, LPCTSTR memName, HANDLE *hSharedMemory)
-{
-#ifdef WIN32
-
-  BOOL bExistedBefore;
-  CSharedMem *pData;
-
-  LPCTSTR szObjectName = memName; 
-  DWORD dwSize = sizeof(CSharedMem) + memSize; 
-  *hSharedMemory = CreateFileMapping( 
-    (HANDLE)0xFFFFFFFF,0,PAGE_READWRITE,0,dwSize,szObjectName); 
-  if(*hSharedMemory == 0) 
-  { 
-    return NULL; 
-  } 
-  bExistedBefore = (GetLastError() == ERROR_ALREADY_EXISTS); 
-  if(bExistedBefore) 
-  { 
-  	return NULL;
-  } 
-
-  pData = (CSharedMem *)MapViewOfFile( 
-            *hSharedMemory, FILE_MAP_ALL_ACCESS, 0, 0, 0); 
-  if(pData == NULL) 
-  { 
-    return NULL; 
-  } 
-
-  ZeroMemory(pData, dwSize); 
-  pData->m_dwSize = memSize; 
-
-  return pData;
-#else
-  CSharedMem 	*sMemChunk = NULL;
-  DWORD dwSize = memSize = (sizeof(CSharedMem) + memSize); 
-
-  if (sMemChunk != NULL)
-	  return(sMemChunk);
-
-  sMemChunk = (CSharedMem *) GlobalAllocPtr(GMEM_MOVEABLE, dwSize);
-  ZeroMemory(sMemChunk, (size_t) dwSize);
-  sMemChunk->m_dwSize = dwSize;   // Missing in Communicator code!
-  return(sMemChunk);
-
-#endif // WIN32
-}
-
-// 
-// *open existing* shared memory chunk 
-// once you have the pointer to the new segment 
-// use this pointer to access data, e.g.: 
-// 
-CSharedMem *
-NSOpenExistingSharedMemory(LPCTSTR memName, HANDLE *hSharedMemory)
-{
-#ifdef WIN32
-  CSharedMem *pData;
-  DWORD dwSize;
-
-  LPCTSTR szObjectName = memName; 
-  *hSharedMemory = OpenFileMapping( 
-    FILE_MAP_WRITE,FALSE,szObjectName); 
-  if(*hSharedMemory == 0) 
-  { 
-    return NULL; 
-  } 
-
-  pData = (CSharedMem *)MapViewOfFile( 
-              *hSharedMemory,FILE_MAP_ALL_ACCESS,0,0,0); 
-  if(pData == NULL) 
-  { 
-    return NULL; 
-  } 
-  
-  dwSize = pData->m_dwSize; 
-  return pData;
-#else
-
-  return(NULL);   // In Win16, this is really meaningless...
-
-#endif
-}  
-
-// 
-// to close shared memory segment
-// 
-void
-NSCloseSharedMemory(CSharedMem *pData, HANDLE hSharedMemory)
-{
-#ifdef WIN32
-  if(pData != 0) 
-  { 
-    UnmapViewOfFile(pData); 
-    pData = 0; 
-  } 
-
-  if(hSharedMemory != 0) 
-  { 
-    CloseHandle(hSharedMemory); 
-    hSharedMemory = 0; 
-  } 
-#else
-
-	if (pData != NULL)
-	{
-		GlobalFreePtr(pData);
-		pData = NULL;
-	}
-
-#endif // WIN32
-}

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

@@ -1,116 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is 
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-#ifndef __SMEM_HPP__
-#define __SMEM_HPP__
-
-//
-// Need this for Win16 since it is an undocumented message
-//
-#ifndef WIN32
-
-#define WM_COPYDATA                     0x004A
-
-/*
- * lParam of WM_COPYDATA message points to...
- */
-typedef struct tagCOPYDATASTRUCT {
-    DWORD         dwData;
-    DWORD         cbData;
-    LPVOID        lpData;
-} COPYDATASTRUCT, *PCOPYDATASTRUCT;
-
-# ifndef LPCTSTR
-#   define LPCTSTR LPCSTR
-# endif
-
-
-#endif // ifndef WIN32
-
-// The following structure will be stored in the shared memory 
-// and will be used to pass data back and forth 
-
-#pragma pack(4) 
-
-typedef struct  
-{ 
-  DWORD m_dwSize;       // size of the shared memory block 
-  BYTE  m_buf[1];       // this is the buffer of memory to be used
-} CSharedMem; 
-
-#pragma pack(4) 
-
-// ******************************************************
-// Public routines...
-// ******************************************************
-// 
-// 
-// *create new* shared memory chunk 
-// once this is created, use the pointer
-// to the segment to to store data 
-// e.g.: 
-//     lpString = "string for communicator"; 
-//     lstrcpy((LPSTR)pData->m_buf[0], lpString); 
-//     pData->m_dwBytesUsed = lstrlen(lpString) + 1; // count '\0' 
-//  
-CSharedMem *
-NSCreateSharedMemory(DWORD memSize, LPCTSTR memName, HANDLE *hSharedMemory);
-
-// 
-// *open existing* shared memory chunk 
-// once you have the pointer to the new segment 
-// use this pointer to access data, e.g.: 
-//
-// This will return the pointer to the memory chunk as well as
-// fill out the hSharedMemory argument that is needed for subsequent
-// operations.
-// 
-//  if(pData->m_dwBytesUsed > 0) 
-//  { 
-//    // use pData->m_buf here 
-//  } 
-//
-CSharedMem *
-NSOpenExistingSharedMemory(LPCTSTR memName, HANDLE *hSharedMemory);
-
-//
-// You must pass in the pointer to the memory chunk as well as
-// the hSharedMemory HANDLE to close shared memory segment
-// 
-void
-NSCloseSharedMemory(CSharedMem *pData, HANDLE hSharedMemory);
-
-#endif  // __SMEM_HPP__

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

@@ -1,230 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is 
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-//
-//  This is a string sequence handling routine to take complex
-//  structures and merge them into a chunk of memory.
-//
-//  Written by: Rich Pizzarro (rhp@netscape.com)
-//  November 1997
-//
-#include <string.h>
-#include <stdlib.h>
-#include <windows.h>
-#include <windowsx.h>
-
-#include "nsstrseq.h"
-
-#ifndef NULL
-#define NULL '\0'
-#endif
-
-#define MARKER '\377'
-
-//
-// Delete an existing string sequence
-//
-void NSStrSeqDelete(NSstringSeq seq)
-{
-  if (seq != NULL)
-    free(seq);
-  
-  seq = NULL;
-}
-
-//
-// Allocate a new sequence, copying the given strings into it. 
-//
-NSstringSeq NSStrSeqNew(LPSTR strings[])
-{
-  int size;
-  if (!strings)
-  {
-    return NULL;
-  }
-  
-  {
-    int i;
-    for (i=0,size=0; strings[i]; i++)
-    {
-      size+=strlen(strings[i])+1;
-      switch (strings[i][0])
-      {
-        // Need to pad "" or anything starting with 255 
-        // to allow for multiple blank strings in a row
-      case 0:
-      case MARKER:
-        size++;
-        break;
-        
-      default:
-        break;
-      }
-    }
-  }
-  
-  {
-    NSstringSeq s=(NSstringSeq)malloc(size+1);
-    if (!s)
-    {	return NULL;}
-    
-    {
-      int i,offset;
-      for (i=0,offset=0; strings[i]; i++)
-      {
-        switch (strings[i][0])
-        {
-          // Need to pad "" or anything starting with 255
-        case 0:
-        case MARKER:
-          s[offset++]=MARKER;
-          break;
-          
-        default:
-          break;
-        }
-        strcpy(s+offset,strings[i]);
-        offset+=strlen(strings[i])+1;
-      }
-      s[offset]=0;
-    }
-    
-    return s;
-  }
-}
-
-//
-// Get the # of bytes required for the sequence 
-//
-LONG NSStrSeqSize(NSstringSeq seq)
-{
-  const char* s;
-  if (!seq)
-    {
-      return -1;
-    }
-
-  for (s=seq+1; ((*s) || (*(s-1))); s++)
-    ;
-
-  // At this point, s points to the second 0 
-  // of the double 0 at the end 
-  return (s-seq)+1;
-}
-
-//
-// Get the # of strings in the sequence 
-//
-LONG NSStrSeqNumStrs(NSstringSeq seq)
-{
-  const char* s;
-  int N;
-  if (!seq)
-  {
-    return -1;
-  }
-  
-  for (s=seq+1,N=0; ((*s) || (*(s-1))); s++)
-  {
-    if (!(*s))
-      N++;
-  }
-  
-  return N;
-}
-
-static LPSTR correct(LPSTR s)
-{
-  if (s[0]==MARKER)
-    return s+1;
-  else  // Anup , 4/96
-    return s;
-}
-
-//
-// Extract the index'th string in the sequence
-//
-LPSTR NSStrSeqGet(NSstringSeq seq, LONG index)
-{
-  char* s;
-  int N;
-
-  if (!seq)
-  {
-    return NULL;
-  }
-  
-  if (index<0)
-  {
-    return NULL;
-  }
-  
-  if (!index)
-    return correct(seq);
-  
-  for (s=seq+1,N=0; ((*s) || (*(s-1))) && (N<index); s++)
-  {
-    if (!(*s))
-      N++;
-  }
-  
-  if (N==index)
-    return correct(s);
-  
-  return NULL;
-}
-
-LPSTR * NSStrSeqGetAll(NSstringSeq seq)
-{
-  LONG N=NSStrSeqNumStrs(seq);
-  if (N<0)
-    return NULL;
-  
-  {
-    char** res=(char**)malloc( (size_t) ((N+1)*sizeof(char*)) );
-    int i;
-    
-    if (!res)
-    {
-      return NULL;
-    }
-    for (i=0; i<N; i++)
-      res[i]=NSStrSeqGet(seq,i);
-    res[N]=NULL;
-    
-    return res;
-  }
-}

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

@@ -1,68 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is 
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-#ifndef __SEQUENCES_OF_STRINGS_H_
-#define __SEQUENCES_OF_STRINGS_H	
-
-
-typedef LPSTR NSstringSeq;
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-void NSStrSeqDelete(NSstringSeq seq);
-NSstringSeq NSStrSeqNew(LPSTR strings[]);
-
-// Get the # of bytes required for the sequence 
-LONG NSStrSeqSize(NSstringSeq seq);
-
-// Get the # of strings in the sequence
-LONG NSStrSeqNumStrs(NSstringSeq seq);
-
-// Extract the index'th string in the sequence
-LPSTR NSStrSeqGet(NSstringSeq seq, LONG index);
-
-// Build an array of all the strings in the sequence
-LPSTR *NSStrSeqGetAll(NSstringSeq seq);
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif // __sequences_of_strings_h_

mozilla/mailnews/mapi/old/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/makefile.win

@@ -1,27 +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=mapitest
-
-include <$(DEPTH)\config\rules.mak>

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

@@ -1,239 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is 
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-//
-#include <windows.h>
-#include <windowsx.h>
-#include <string.h>
-#include <stdlib.h>
-#ifndef MAPI_OLE	// Because MSFT doesn't do this for us :-(
-#include <mapi.h>
-#endif
-
-#include "port.h"
-#include "resource.h"
-
-#ifndef WM_PAINTICON
-#define WM_PAINTICON              0x26
-#endif // WM_PAINTICON
-
-/* 
- * Forward Declarations...
- */
-BOOL      InitInstance(HINSTANCE hInstance, int nCmdShow);
-BOOL CALLBACK LOADDS MyDlgProc(HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam);
-extern void ProcessCommand(HWND hWnd, int id, HWND hCtl, UINT codeNotify);
-BOOL      OpenMAPI(void);
-void      CloseMAPI(void);
-
-/*  
- * Global variables
- */
-HINSTANCE   hInst;
-HWND      hWnd;    
-
-#ifdef WIN16
-HICON	hIconApp;
-#endif
-
-char NEAR szAppName[] = "Netscape QA Helper";
-char NEAR szShortAppName[] = "QAHelper";
-char szClassName[] = "Netscape_QAHelper_Class_Name";
-
-void
-AppCleanup(void)
-{
-  extern void    DoMAPILogoff(HWND hWnd);
-  static BOOL isDone = FALSE;
-
-  if (isDone)
-    return;
-
-  extern LHANDLE    mapiSession;
-
-  if (mapiSession != 0)
-  {
-    DoMAPILogoff(hWnd);
-  }
-
-  CloseMAPI();
-  isDone = TRUE;
-}
-
-BOOL 
-InitInstance(HINSTANCE hInstance, int nCmdShow)
-{
-  /* Create a main window for this application instance.  */
-  hWnd = CreateDialog((HINSTANCE) hInstance, 
-            MAKEINTRESOURCE(ID_DIALOG),
-            (HWND) NULL, (DLGPROC) MyDlgProc);
-  
-  if (!hWnd)
-    return FALSE;
-  else
-    return TRUE;
-}
-
-BOOL InitApp(void)
-{
-#ifndef WIN16
-  WNDCLASS wc;
-  wc.style         = 0; 
-  wc.lpfnWndProc   = DefDlgProc; 
-  wc.cbClsExtra    = 0; 
-  wc.cbWndExtra    = DLGWINDOWEXTRA; 
-  wc.hInstance     = hInst; 
-  wc.hIcon         = LoadIcon(hInst, MAKEINTRESOURCE(ID_ICON_APP)); 
-  wc.hCursor       = LoadCursor(0, IDC_ARROW); 
-  wc.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1);
-  wc.lpszMenuName  = NULL; 
-  wc.lpszClassName = szClassName;
-  
-  if(!RegisterClass(&wc))
-    return FALSE;
-
-#else                
-  hIconApp = LoadIcon(hInst, MAKEINTRESOURCE(ID_ICON_APP));
-#endif
-  
-  return TRUE;
-} // end InitApp
-
-// Win Main 
-int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
-{
-  MSG     msg;
-  
-  hInst = hInstance;
-  
-  if (!InitApp()) 
-  { 
-    return FALSE;
-  }
-  
-  if (!InitInstance(hInstance, nCmdShow)) 
-  {    
-    return FALSE;
-  }
-
-  if (!OpenMAPI()) 
-  {    
-    return FALSE;
-  }
-
-  ShowWindow(hWnd, SW_SHOW);
-  
-  // Start the application
-  while ((GetMessage(&msg, (HWND) NULL, (UINT) NULL, (UINT) NULL)))
-  {
-    if(IsDialogMessage(hWnd, &msg))
-      continue;
-    
-    TranslateMessage(&msg);
-    DispatchMessage(&msg);
-  }
-
-  return(msg.wParam);
-}
-
-BOOL CALLBACK LOADDS 
-MyDlgProc(HWND hWndMain, UINT wMsg, WPARAM wParam, LPARAM lParam) 
-{
-  switch (wMsg) 
-  {
-  case WM_INITDIALOG: 
-    {
-      hWnd = hWndMain;
-	    SetDlgItemText(hWnd, ID_EDIT_ROW, "0");
-    }
-    break;
-    
-  case WM_CLOSE:
-    {
-      DestroyWindow(hWnd);
-      break;
-    }
-
-  case WM_DESTROY:
-    {
-      AppCleanup();
-
-#ifndef WIN16
-      UnregisterClass(szClassName, hInst);
-#else              
-      // Destroy the 16 bit windows icon
-      if(hIconApp != 0)
-        DestroyIcon(hIconApp);
-#endif
-      
-      PostQuitMessage(0);
-      break;
-    }
-  case WM_COMMAND:
-    HANDLE_WM_COMMAND(hWnd, wParam, lParam, ProcessCommand);
-    break;
-    
-  case WM_QUERYDRAGICON:     
-#ifdef WIN16
-    return (BOOL)hIconApp;
-#endif
-    
-  case WM_PAINTICON:
-#ifdef WIN16    
-    SetClassWord(hWnd, GCW_HICON, 0);
-    
-    // fall trough
-  case WM_PAINT: 
-    {
-      if(!IsIconic(hWnd))
-        return FALSE;
-      PAINTSTRUCT ps;
-      HDC hDC = BeginPaint(hWnd, &ps);
-      SetMapMode(hDC, MM_TEXT);
-      DrawIcon(hDC, 2, 2, hIconApp);
-      EndPaint(hWnd, &ps);
-      break;
-    } 
-#endif //WIN16
-    break;    // RICHIE - if this is not here NT 3.51 Pukes!!!!  
-
-  default:
-    return FALSE;
-  }
-  
-  //~~av  return (DefWindowProc(hWnd, wMsg, wParam, lParam));
-  return TRUE;
-}

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

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

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

@@ -1,772 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is 
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-//
-#include <windows.h>
-#include <windowsx.h>   
-#include <string.h>
-#include <mapi.h>         
-#include <stdlib.h>
-
-#include "port.h"
-#include "resource.h"
-
-//
-// Variables...
-// 
-extern HINSTANCE   m_hInstMapi;
-extern LHANDLE     mapiSession;
-
-// 
-// Forward declarations...
-//
-void          DoMAPIFreeBuffer(HWND hWnd, LPVOID buf, BOOL alert);
-extern void   ShowMessage(HWND hWnd, LPSTR msg);
-void          DoMAPISendMail(HWND hWnd);
-void          DoMAPISendDocuments(HWND hWnd);
-void          DoMAPISaveMail(HWND hWnd);
-void          DoMAPIAddress(HWND hWnd);
-extern void   SetFooter(LPSTR msg);
-extern LPSTR  GetMAPIError(LONG errorCode);
-
-void 
-ProcessMailCommand(HWND hWnd, int id, HWND hCtl, UINT codeNotify) 
-{ 
-  switch (id) 
-  {
-  case IDCANCEL:
-    EndDialog(hWnd, 0);
-    break;
-
-  case ID_BUTTON_MAPISENDMAIL:
-    DoMAPISendMail(hWnd);
-    break;
-
-  case ID_BUTTON_MAPISENDDOCUMENTS:
-    DoMAPISendDocuments(hWnd);
-    break;
-
-  case ID_BUTTON_MAPISAVEMAIL:
-    DoMAPISaveMail(hWnd);
-    break;
-
-  case ID_BUTTON_MAPIADDRESS:
-    DoMAPIAddress(hWnd);
-    break;
-
-  default:
-    break;
-  }
-}
-
-BOOL CALLBACK LOADDS 
-MailDlgProc(HWND hWndMain, UINT wMsg, WPARAM wParam, LPARAM lParam) 
-{
-  switch (wMsg) 
-  {
-  case WM_INITDIALOG: 
-    break;
-
-  case WM_COMMAND:
-    HANDLE_WM_COMMAND(hWndMain, wParam, lParam, ProcessMailCommand);
-    break;
-
-  default:
-    return FALSE;
-  }
-  
-  return TRUE;
-}
-
-static LPSTR lpszDelimChar = ";";
-
-void
-TackItOn(LPSTR fileBuf, LPSTR nameBuf, LPSTR addOn)
-{
-  if (addOn[0] != '\0')
-  {
-    lstrcat(fileBuf, addOn);
-    lstrcat(fileBuf, lpszDelimChar);
-
-    lstrcat(nameBuf, "NAMEOF.FILE");
-    lstrcat(nameBuf, lpszDelimChar);
-  }
-}
-
-void
-DoMAPISendDocuments(HWND hWnd)
-{
-  ULONG (FAR PASCAL *lpfnMAPISendDocuments) (ULONG ulUIParam, 
-          LPTSTR lpszDelimChar, LPTSTR lpszFullPaths, 
-          LPTSTR lpszFileNames, ULONG ulReserved);
-
-#ifdef WIN16		
-  (FARPROC&) lpfnMAPISendDocuments = GetProcAddress(m_hInstMapi, "MAPISENDDOCUMENTS"); 
-#else
-  (FARPROC&) lpfnMAPISendDocuments = GetProcAddress(m_hInstMapi, "MAPISendDocuments"); 
-#endif
-  
-  if (!lpfnMAPISendDocuments)
-  {
-    ShowMessage(hWnd, "Unable to locate MAPI function.");
-    return;
-  }
-
-  char  msg[1024];
-  char  tempFileName[_MAX_PATH] = "";
-  char  lpszFullPaths[(_MAX_PATH + 1) * 4] = "";
-  char  lpszFileNames[(_MAX_PATH + 1) * 4] = "";
-
-  // Now get the names of the files to attach...
-  GetDlgItemText(hWnd, ID_EDIT_ATTACH1, tempFileName, sizeof(tempFileName));
-  TackItOn(lpszFullPaths, lpszFileNames, tempFileName); 
-
-  GetDlgItemText(hWnd, ID_EDIT_ATTACH2, tempFileName, sizeof(tempFileName));
-  TackItOn(lpszFullPaths, lpszFileNames, tempFileName); 
-
-  GetDlgItemText(hWnd, ID_EDIT_ATTACH3, tempFileName, sizeof(tempFileName));
-  TackItOn(lpszFullPaths, lpszFileNames, tempFileName); 
-
-  GetDlgItemText(hWnd, ID_EDIT_ATTACH4, tempFileName, sizeof(tempFileName));
-  TackItOn(lpszFullPaths, lpszFileNames, tempFileName); 
-
-  LONG  rc = (*lpfnMAPISendDocuments)
-        ( (ULONG) hWnd,        
-          lpszDelimChar, 
-          lpszFullPaths, 
-          lpszFileNames, 
-          0);
-
-  if (rc == SUCCESS_SUCCESS)
-  {
-    ShowMessage(hWnd, "Success with MAPISendDocuments");
-    SetFooter("MAPISendDocuments success");
-  }
-  else
-  {
-    wsprintf(msg, "FAILURE: Return code %d from MAPISendDocuments\nError=[%s]", 
-                      rc, GetMAPIError(rc));
-    ShowMessage(hWnd, msg);
-    SetFooter("MAPISendDocuments failed");
-  }
-}
-
-void
-FreeMAPIFile(lpMapiFileDesc pv)
-{
-  if (!pv)
-    return;
-
-  if (pv->lpszPathName != NULL)   
-    free(pv->lpszPathName);
-
-  if (pv->lpszFileName != NULL)   
-    free(pv->lpszFileName);
-}
-
-void
-FreeMAPIRecipient(lpMapiRecipDesc pv)
-{
-  if (!pv)
-    return;
-
-  if (pv->lpszName != NULL)   
-    free(pv->lpszName);
-
-  if (pv->lpszAddress != NULL)
-    free(pv->lpszAddress);
-
-  if (pv->lpEntryID != NULL)
-    free(pv->lpEntryID);  
-}
-
-void
-FreeMAPIMessage(lpMapiMessage pv)
-{
-  ULONG i;
-
-  if (!pv)
-    return;
-
-  if (pv->lpszSubject != NULL)
-    free(pv->lpszSubject);
-
-  if (pv->lpszNoteText)
-      free(pv->lpszNoteText);
-  
-  if (pv->lpszMessageType)
-    free(pv->lpszMessageType);
-  
-  if (pv->lpszDateReceived)
-    free(pv->lpszDateReceived);
-  
-  if (pv->lpszConversationID)
-    free(pv->lpszConversationID);
-  
-  if (pv->lpOriginator)
-    FreeMAPIRecipient(pv->lpOriginator);
-  
-  for (i=0; i<pv->nRecipCount; i++)
-  {
-    if (&(pv->lpRecips[i]) != NULL)
-    {
-      FreeMAPIRecipient(&(pv->lpRecips[i]));
-    }
-  }
-
-  if (pv->lpRecips != NULL)
-  {
-    free(pv->lpRecips);
-  }
-
-  for (i=0; i<pv->nFileCount; i++)
-  {
-    if (&(pv->lpFiles[i]) != NULL)
-    {
-      FreeMAPIFile(&(pv->lpFiles[i]));
-    }
-  }
-
-  if (pv->lpFiles != NULL)
-  {
-    free(pv->lpFiles);
-  }
-  
-  free(pv);
-  pv = NULL;
-}
-
-void
-DoMAPISendMail(HWND hWnd)
-{
-  ULONG (FAR PASCAL *lpfnMAPISendMail) (LHANDLE lhSession, ULONG ulUIParam, 
-                  lpMapiMessage lpMessage, FLAGS flFlags, ULONG ulReserved);
-
-#ifdef WIN16		
-  (FARPROC&) lpfnMAPISendMail = GetProcAddress(m_hInstMapi, "MAPISENDMAIL"); 
-#else
-  (FARPROC&) lpfnMAPISendMail = GetProcAddress(m_hInstMapi, "MAPISendMail"); 
-#endif
-  
-  if (!lpfnMAPISendMail)
-  {
-    ShowMessage(hWnd, "Unable to locate MAPI function.");
-    return;
-  }          
-
-  FLAGS   flFlags = 0;
-  char    msg[512];
-  char    file1[_MAX_PATH] = "";
-  char    file2[_MAX_PATH] = "";
-  char    file3[_MAX_PATH] = "";
-  char    file4[_MAX_PATH] = "";
-  char    toAddr[128];
-  char    ccAddr[128];
-  char    bccAddr[128];
-  char    subject[128];
-  char    noteText[4096];
-  char    dateReceived[128] = "N/A";
-  char    threadID[128] = "N/A";;
-  char    origName[128] = "N/A";;
-  char    origAddress[128] = "N/A";;
-
-  GetDlgItemText(hWnd, ID_EDIT_TOADDRESS, toAddr, sizeof(toAddr));
-  GetDlgItemText(hWnd, ID_EDIT_CCADDRESS, ccAddr, sizeof(ccAddr));
-  GetDlgItemText(hWnd, ID_EDIT_BCCADDRESS, bccAddr, sizeof(bccAddr));
-  GetDlgItemText(hWnd, ID_EDIT_SUBJECT, subject, sizeof(subject));
-  GetDlgItemText(hWnd, ID_EDIT_NOTETEXT, noteText, sizeof(noteText));
-
-  // Do the one flag we support for this call...
-  if (BST_CHECKED == Button_GetCheck(GetDlgItem(hWnd, ID_CHECK_SHOWDIALOG)))
-  {
-    flFlags |= MAPI_DIALOG;
-  }
-
-  // Build the message to send off...
-  lpMapiMessage  msgPtr = (MapiMessage *)malloc(sizeof(MapiMessage));
-  if (msgPtr == NULL)
-  {
-    return;
-  }
-  
-  memset(msgPtr, 0, sizeof(MapiMessage)); 
-
-  //
-  // At this point, we need to populate the structure of information
-  // we are passing in via the *lppMessage
-  //
-
-  // Set all of the general information first!
-  msgPtr->lpszSubject = strdup(subject);
-  msgPtr->lpszNoteText = strdup(noteText);
-  msgPtr->lpszDateReceived = strdup(dateReceived);
-  msgPtr->lpszConversationID = strdup(threadID);
-  msgPtr->flFlags = flFlags;
-
-  // Now deal with the recipients of this message
-  DWORD       realRecips = 0;
-  if (toAddr[0] != '\0')    ++realRecips;
-  if (ccAddr[0] != '\0')    ++realRecips;
-  if (bccAddr[0] != '\0')   ++realRecips;
-
-  msgPtr->lpRecips = (lpMapiRecipDesc) malloc((size_t) (sizeof(MapiRecipDesc) * realRecips));
-  if (!msgPtr->lpRecips)
-  {
-    FreeMAPIMessage(msgPtr);
-    return;
-  }
-
-  msgPtr->nRecipCount = realRecips;
-  memset(msgPtr->lpRecips, 0, (size_t) (sizeof(MapiRecipDesc) * msgPtr->nRecipCount));
-
-  DWORD       rCount = 0;
-  if (toAddr[0] != '\0')
-  {
-    msgPtr->lpRecips[rCount].lpszName = strdup(toAddr);
-    msgPtr->lpRecips[rCount].lpszAddress = strdup(toAddr);
-    msgPtr->lpRecips[rCount].ulRecipClass = MAPI_TO;
-    rCount++;
-  }
-
-  if (ccAddr[0] != '\0')
-  {
-    msgPtr->lpRecips[rCount].lpszName = strdup(ccAddr);
-    msgPtr->lpRecips[rCount].lpszAddress = strdup(ccAddr);
-    msgPtr->lpRecips[rCount].ulRecipClass = MAPI_CC;    
-    rCount++;
-  }
-
-  if (bccAddr[0] != '\0')
-  {
-    msgPtr->lpRecips[rCount].lpszName = strdup(bccAddr);
-    msgPtr->lpRecips[rCount].lpszAddress = strdup(bccAddr);
-    msgPtr->lpRecips[rCount].ulRecipClass = MAPI_BCC;
-    rCount++;
-  }
-
-  // Now get the names of the files to attach...
-  GetDlgItemText(hWnd, ID_EDIT_ATTACH1, file1, sizeof(file1));
-  GetDlgItemText(hWnd, ID_EDIT_ATTACH2, file2, sizeof(file2));
-  GetDlgItemText(hWnd, ID_EDIT_ATTACH3, file3, sizeof(file3));
-  GetDlgItemText(hWnd, ID_EDIT_ATTACH4, file4, sizeof(file4));
-
-  DWORD       realFiles = 0;
-  if (file1[0] != '\0')    ++realFiles;
-  if (file2[0] != '\0')    ++realFiles;
-  if (file3[0] != '\0')    ++realFiles;
-  if (file4[0] != '\0')    ++realFiles;
-
-  // Now deal with the list of attachments! Since the nFileCount should be set
-  // correctly, this loop will automagically be correct
-  //
-  msgPtr->nFileCount = realFiles;
-  if (realFiles > 0)
-  {
-    msgPtr->lpFiles = (lpMapiFileDesc) malloc((size_t) (sizeof(MapiFileDesc) * realFiles));
-    if (!msgPtr->lpFiles)
-    {
-      FreeMAPIMessage(msgPtr);
-      return;
-    }
-
-    memset(msgPtr->lpFiles, 0, (size_t) (sizeof(MapiFileDesc) * msgPtr->nFileCount));
-  }
-
-  rCount = 0;
-  if (file1[0] != '\0')
-  {
-    msgPtr->lpFiles[rCount].lpszPathName = strdup((LPSTR)file1);
-    msgPtr->lpFiles[rCount].lpszFileName = strdup((LPSTR)file1);
-    ++rCount;
-  }
-
-  if (file2[0] != '\0')
-  {
-    msgPtr->lpFiles[rCount].lpszPathName = strdup((LPSTR)file2);
-    msgPtr->lpFiles[rCount].lpszFileName = strdup((LPSTR)file2);
-    ++rCount;
-  }
-
-  if (file3[0] != '\0')
-  {
-    msgPtr->lpFiles[rCount].lpszPathName = strdup((LPSTR)file3);
-    msgPtr->lpFiles[rCount].lpszFileName = strdup((LPSTR)file3);
-    ++rCount;
-  }
-
-  if (file4[0] != '\0')
-  {
-    msgPtr->lpFiles[rCount].lpszPathName = strdup((LPSTR)file4);
-    msgPtr->lpFiles[rCount].lpszFileName = strdup((LPSTR)file4);
-    ++rCount;
-  }
-
-  // Finally, make the call...
-  LONG  rc = (*lpfnMAPISendMail)
-           (mapiSession, 
-           (ULONG) hWnd, 
-           msgPtr, 
-           flFlags, 
-           0);
-
-  if (rc == SUCCESS_SUCCESS)
-  {
-    ShowMessage(hWnd, "Success with MAPISendMail");
-    SetFooter("MAPISendMail success");
-  }
-  else
-  {
-    wsprintf(msg, "FAILURE: Return code %d from MAPISendMail\nError=[%s]", 
-                      rc, GetMAPIError(rc));
-    ShowMessage(hWnd, msg);
-    SetFooter("MAPISendMail failed");
-  }
-
-  // Now cleanup and move on...
-  FreeMAPIMessage(msgPtr);
-}
-
-void
-DoMAPISaveMail(HWND hWnd)
-{
-  ULONG (FAR PASCAL *lpfnMAPISaveMail) (LHANDLE lhSession, ULONG ulUIParam, 
-                  lpMapiMessage lpMessage, FLAGS flFlags, ULONG ulReserved,
-                  LPTSTR lpszMessageID);
-
-#ifdef WIN16		
-  (FARPROC&) lpfnMAPISaveMail = GetProcAddress(m_hInstMapi, "MAPISAVEMAIL"); 
-#else
-  (FARPROC&) lpfnMAPISaveMail = GetProcAddress(m_hInstMapi, "MAPISaveMail"); 
-#endif
-  
-  if (!lpfnMAPISaveMail)
-  {
-    ShowMessage(hWnd, "Unable to locate MAPI function.");
-    return;
-  }          
-
-  FLAGS   flFlags = 0;
-  char    msg[512];
-  char    file1[_MAX_PATH] = "";
-  char    file2[_MAX_PATH] = "";
-  char    file3[_MAX_PATH] = "";
-  char    file4[_MAX_PATH] = "";
-  char    toAddr[128];
-  char    ccAddr[128];
-  char    bccAddr[128];
-  char    subject[128];
-  char    noteText[4096];
-  char    dateReceived[128] = "N/A";
-  char    threadID[128] = "N/A";;
-  char    origName[128] = "N/A";;
-  char    origAddress[128] = "N/A";;
-
-  GetDlgItemText(hWnd, ID_EDIT_TOADDRESS, toAddr, sizeof(toAddr));
-  GetDlgItemText(hWnd, ID_EDIT_CCADDRESS, ccAddr, sizeof(ccAddr));
-  GetDlgItemText(hWnd, ID_EDIT_BCCADDRESS, bccAddr, sizeof(bccAddr));
-  GetDlgItemText(hWnd, ID_EDIT_SUBJECT, subject, sizeof(subject));
-  GetDlgItemText(hWnd, ID_EDIT_NOTETEXT, noteText, sizeof(noteText));
-
-  // Build the message to send off...
-  lpMapiMessage  msgPtr = (MapiMessage *)malloc(sizeof(MapiMessage));
-  if (msgPtr == NULL)
-  {
-    return;
-  }
-  
-  memset(msgPtr, 0, sizeof(MapiMessage)); 
-
-  //
-  // At this point, we need to populate the structure of information
-  // we are passing in via the *lppMessage
-  //
-
-  // Set all of the general information first!
-  msgPtr->lpszSubject = strdup(subject);
-  msgPtr->lpszNoteText = strdup(noteText);
-  msgPtr->lpszDateReceived = strdup(dateReceived);
-  msgPtr->lpszConversationID = strdup(threadID);
-  msgPtr->flFlags = flFlags;
-
-  // Now deal with the recipients of this message
-  DWORD       realRecips = 0;
-  if (toAddr[0] != '\0')    ++realRecips;
-  if (ccAddr[0] != '\0')    ++realRecips;
-  if (bccAddr[0] != '\0')   ++realRecips;
-
-  msgPtr->lpRecips = (lpMapiRecipDesc) malloc((size_t) (sizeof(MapiRecipDesc) * realRecips));
-  if (!msgPtr->lpRecips)
-  {
-    FreeMAPIMessage(msgPtr);
-    return;
-  }
-
-  msgPtr->nRecipCount = realRecips;
-  memset(msgPtr->lpRecips, 0, (size_t) (sizeof(MapiRecipDesc) * msgPtr->nRecipCount));
-
-  DWORD       rCount = 0;
-  if (toAddr[0] != '\0')
-  {
-    msgPtr->lpRecips[rCount].lpszName = strdup(toAddr);
-    msgPtr->lpRecips[rCount].lpszAddress = strdup(toAddr);
-    msgPtr->lpRecips[rCount].ulRecipClass = MAPI_TO;
-    rCount++;
-  }
-
-  if (ccAddr[0] != '\0')
-  {
-    msgPtr->lpRecips[rCount].lpszName = strdup(ccAddr);
-    msgPtr->lpRecips[rCount].lpszAddress = strdup(ccAddr);
-    msgPtr->lpRecips[rCount].ulRecipClass = MAPI_CC;    
-    rCount++;
-  }
-
-  if (bccAddr[0] != '\0')
-  {
-    msgPtr->lpRecips[rCount].lpszName = strdup(bccAddr);
-    msgPtr->lpRecips[rCount].lpszAddress = strdup(bccAddr);
-    msgPtr->lpRecips[rCount].ulRecipClass = MAPI_BCC;
-    rCount++;
-  }
-
-  // Now get the names of the files to attach...
-  GetDlgItemText(hWnd, ID_EDIT_ATTACH1, file1, sizeof(file1));
-  GetDlgItemText(hWnd, ID_EDIT_ATTACH2, file2, sizeof(file2));
-  GetDlgItemText(hWnd, ID_EDIT_ATTACH3, file3, sizeof(file3));
-  GetDlgItemText(hWnd, ID_EDIT_ATTACH4, file4, sizeof(file4));
-
-  DWORD       realFiles = 0;
-  if (file1[0] != '\0')    ++realFiles;
-  if (file2[0] != '\0')    ++realFiles;
-  if (file3[0] != '\0')    ++realFiles;
-  if (file4[0] != '\0')    ++realFiles;
-
-  // Now deal with the list of attachments! Since the nFileCount should be set
-  // correctly, this loop will automagically be correct
-  //
-  msgPtr->nFileCount = realFiles;
-  if (realFiles > 0)
-  {
-    msgPtr->lpFiles = (lpMapiFileDesc) malloc((size_t) (sizeof(MapiFileDesc) * realFiles));
-    if (!msgPtr->lpFiles)
-    {
-      FreeMAPIMessage(msgPtr);
-      return;
-    }
-
-    memset(msgPtr->lpFiles, 0, (size_t) (sizeof(MapiFileDesc) * msgPtr->nFileCount));
-  }
-
-  rCount = 0;
-  if (file1[0] != '\0')
-  {
-    msgPtr->lpFiles[rCount].lpszPathName = strdup((LPSTR)file1);
-    msgPtr->lpFiles[rCount].lpszFileName = strdup((LPSTR)file1);
-    ++rCount;
-  }
-
-  if (file2[0] != '\0')
-  {
-    msgPtr->lpFiles[rCount].lpszPathName = strdup((LPSTR)file2);
-    msgPtr->lpFiles[rCount].lpszFileName = strdup((LPSTR)file2);
-    ++rCount;
-  }
-
-  if (file3[0] != '\0')
-  {
-    msgPtr->lpFiles[rCount].lpszPathName = strdup((LPSTR)file3);
-    msgPtr->lpFiles[rCount].lpszFileName = strdup((LPSTR)file3);
-    ++rCount;
-  }
-
-  if (file4[0] != '\0')
-  {
-    msgPtr->lpFiles[rCount].lpszPathName = strdup((LPSTR)file4);
-    msgPtr->lpFiles[rCount].lpszFileName = strdup((LPSTR)file4);
-    ++rCount;
-  }
-
-  // Finally, make the call...
-  LONG  rc = (*lpfnMAPISaveMail)
-           (mapiSession, 
-           (ULONG) hWnd, 
-           msgPtr, 
-           flFlags, 
-           0, NULL);
-
-  if (rc == SUCCESS_SUCCESS)
-  {
-    ShowMessage(hWnd, "Success with MAPISaveMail");
-    SetFooter("MAPISaveMail success");
-  }
-  else
-  {
-    wsprintf(msg, "FAILURE: Return code %d from MAPISaveMail\nError=[%s]", 
-                      rc, GetMAPIError(rc));
-    ShowMessage(hWnd, msg);
-    SetFooter("MAPISaveMail failed");
-  }
-
-  // Now cleanup and move on...
-  FreeMAPIMessage(msgPtr);
-}
-
-void          
-DoMAPIAddress(HWND hWnd)
-{
-  ULONG (FAR PASCAL *lpfnMAPIAddress) 
-                            (LHANDLE lhSession,
-                            ULONG ulUIParam,
-                            LPSTR lpszCaption,
-                            ULONG nEditFields,
-                            LPSTR lpszLabels,
-                            ULONG nRecips,
-                            lpMapiRecipDesc lpRecips,
-                            FLAGS flFlags,
-                            ULONG ulReserved,
-                            LPULONG lpnNewRecips,
-                            lpMapiRecipDesc FAR *lppNewRecips);
-
-
-#ifdef WIN16		
-  (FARPROC&) lpfnMAPIAddress = GetProcAddress(m_hInstMapi, "MAPIADDRESS"); 
-#else
-  (FARPROC&) lpfnMAPIAddress = GetProcAddress(m_hInstMapi, "MAPIAddress"); 
-#endif
-  
-  if (!lpfnMAPIAddress)
-  {
-    ShowMessage(hWnd, "Unable to locate MAPI function.");
-    return;
-  }          
-
-  DWORD   i;
-  FLAGS   flFlags = 0;
-  DWORD   addrCount = 0;
-  char    msg[512];
-  char    toAddr[128];
-  char    ccAddr[128];
-  char    bccAddr[128];
-
-  GetDlgItemText(hWnd, ID_EDIT_TOADDRESS, toAddr, sizeof(toAddr));
-  GetDlgItemText(hWnd, ID_EDIT_CCADDRESS, ccAddr, sizeof(ccAddr));
-  GetDlgItemText(hWnd, ID_EDIT_BCCADDRESS, bccAddr, sizeof(bccAddr));
-
-  if (toAddr[0]) ++addrCount;
-  if (ccAddr[0]) ++addrCount;
-  if (bccAddr[0]) ++addrCount;
-
-  lpMapiRecipDesc lpRecips = (lpMapiRecipDesc) malloc((size_t) (sizeof(MapiRecipDesc) * addrCount));
-  if (!lpRecips)
-  {
-    return;
-  }
-
-  memset(lpRecips, 0, (size_t) (sizeof(MapiRecipDesc) * addrCount));
-
-  DWORD       rCount = 0;
-  if (toAddr[0] != '\0')
-  {
-    lpRecips[rCount].lpszName = strdup("To Address Name");
-    lpRecips[rCount].lpszAddress = strdup(toAddr);
-    lpRecips[rCount].ulRecipClass = MAPI_TO;
-    rCount++;
-  }
-
-  if (ccAddr[0] != '\0')
-  {
-    lpRecips[rCount].lpszName = strdup("CC Address Name");
-    lpRecips[rCount].lpszAddress = strdup(ccAddr);
-    lpRecips[rCount].ulRecipClass = MAPI_CC;    
-    rCount++;
-  }
-
-  if (bccAddr[0] != '\0')
-  {
-    lpRecips[rCount].lpszName = strdup("BCC Address Name");
-    lpRecips[rCount].lpszAddress = strdup(bccAddr);
-    lpRecips[rCount].ulRecipClass = MAPI_BCC;
-    rCount++;
-  }
-  
-  ULONG             newRecips;
-  lpMapiRecipDesc   lpNewRecips;
-
-  // Finally, make the call...
-  LONG  rc = (*lpfnMAPIAddress)
-                     (mapiSession,
-                      0,
-                      "MAPI Test Address Picker",
-                      0,
-                      NULL,
-                      rCount,
-                      lpRecips,
-                      0,
-                      0,
-                      &newRecips,
-                      &lpNewRecips);
-  if (rc == SUCCESS_SUCCESS)
-  {
-    for (i=0; i<newRecips; i++)
-    {
-      char  tMsg[512];
-
-      wsprintf(tMsg, "User %d\nName=[%s]\nEmail=[%s]\nType=[%d]", 
-            i, 
-            lpNewRecips[i].lpszName, 
-            lpNewRecips[i].lpszAddress, 
-            lpNewRecips[i].ulRecipClass);
-      ShowMessage(hWnd, tMsg);
-    }
-
-    SetFooter("MAPIAddress success");
-
-    DoMAPIFreeBuffer(hWnd, lpNewRecips, TRUE);
-  }
-  else
-  {
-    wsprintf(msg, "FAILURE: Return code %d from MAPIAddress\nError=[%s]", 
-                      rc, GetMAPIError(rc));
-    ShowMessage(hWnd, msg);
-    SetFooter("MAPIAddress failed");
-  }
-
-  // Now cleanup and move on...
-  for (i=0; i<rCount; i++)
-  {
-    FreeMAPIRecipient(&(lpRecips[i]));
-  }
-}

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,303 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is 
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-//
-
-#ifndef PORT_H
-#define PORT_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*****************************************************************\
- *                                                               *
- *  PORT.H                                                       *
- *                                                               *
- *  Win16/Win32 portability stuff                                *
- *                                                               *
- *  A.Sokolsky                                                   *
- *      3.10.94 distilled into this header                       *
- *                                                               *
-\*****************************************************************/
-
-/*
- * calling conventions
- */
-#include <assert.h>
-                                                      
-                                                      
-#ifndef CDECL
-#define CDECL __cdecl
-#endif  // CDECL
-
-#ifndef PASCAL
-#define PASCAL __pascal
-#endif  // PASCAL
-
-#ifdef FASTCALL
-#error FASTCALL defined
-#endif // FASTCALL
-
-
-#ifdef NDEBUG
-#define FASTCALL __fastcall
-#else
-#define FASTCALL PASCAL
-#endif // NDEBUG   
-
-
-
-#ifndef HWND2DWORD
-#  ifdef WIN32
-#    define HWND2DWORD(X_hWnd) ( (DWORD)(X_hWnd) )
-#  else // WIN16
-#    define HWND2DWORD(X_hWnd) ( (DWORD)MAKELONG(((WORD)(X_hWnd)), 0) )
-#  endif
-#endif // HWND2DWORD
-
-
-/*
- * WIN16 - WIN32 compatibility stuff
- */
-
-#ifdef WIN32
-
-# define DLLEXPORT    __declspec( dllexport )
-# define EXPORT
-# define LOADDS
-# define HUGE
-# ifndef FAR
-#  define FAR
-# endif // FAR
-# ifndef NEAR
-#  define NEAR
-# endif // NEAR 
-# ifdef UNICODE
-#  define SIZEOF(x)   (sizeof(x)/sizeof(WCHAR))
-# else
-#  define SIZEOF(x)   sizeof(x)
-# endif
-
-#else  // !WIN32 == WIN16
-
-# define DLLEXPORT    
-# define EXPORT       __export
-# define LOADDS       __loadds
-# define HUGE         __huge
-# ifndef FAR
-#   define FAR        __far
-#   define NEAR       __near
-# endif  // FAR
-# define CONST const
-# define SIZEOF(x)    sizeof(x)
-# define CHAR char
-# define TCHAR char
-# define WCHAR char
-# ifndef LPTSTR
-#   define LPTSTR LPSTR
-# endif
-# ifndef LPCTSTR 
-#   define LPCTSTR LPCSTR
-# endif
-# define UNREFERENCED_PARAMETER(x) x;
-# ifndef TEXT
-#   define TEXT(x) x
-# endif
-# define GetWindowTextW GetWindowText
-# define lstrcpyW lstrcpy   
-
-# define BN_DBLCLK BN_DOUBLECLICKED // ~~MRJ needed for custom control.
-// ~~MRJ begin Win95 backward compat section
-# define LPWSTR LPSTR
-# define LPCWSTR LPCSTR
-
-// button check state for WIN16
-#ifndef BST_UNCHECKED
-#define BST_UNCHECKED      0x0000
-#endif
-
-#ifndef BST_CHECKED
-#define BST_CHECKED        0x0001
-#endif
-
-
-#ifndef WIN95_COMPAT
-#  define WIN95_COMPAT
-#endif
-
-// ~~MRJ end Win95 compat section.
-
-// critical section API stubs
-typedef DWORD CRITICAL_SECTION;
-typedef CRITICAL_SECTION FAR * LPCRITICAL_SECTION; 
-#ifdef __cplusplus
-inline void InitializeCriticalSection(LPCRITICAL_SECTION lpSection) {}
-inline void DeleteCriticalSection(LPCRITICAL_SECTION lpSection) {}
-inline void EnterCriticalSection(LPCRITICAL_SECTION lpSection) {}
-inline void LeaveCriticalSection(LPCRITICAL_SECTION lpSection) {} 
-#endif // __cplusplus 
-
-// Added for nssock16 ---Neeti
-#ifndef ZeroMemory
-#include <memory.h>
-#define ZeroMemory(PTR, SIZE) memset(PTR, 0, SIZE)
-#endif // ZeroMemory
-
-#endif // WIN16
-
-/*
- * unix - windows compatibility stuff
- */
-typedef DWORD u_int32;
-typedef WORD  u_int16;
-typedef BYTE  u_int8;
-#ifdef WIN32
-typedef short int Bool16;
-#else  // WIN16
-typedef BOOL  Bool16;
-#endif // WIN16
-
-/*
- * Cross Platform Compatibility
- */
-#ifndef UNALIGNED
-# ifdef _M_ALPHA
-#  define UNALIGNED __unaligned
-# else  // !_M_ALPHA
-#  define UNALIGNED
-# endif // !_M_ALPHA
-#endif  // UNALIGNED
-
-//
-// RICHIE - for the Alpha port
-//
-#ifdef _M_ALPHA
-# undef pascal
-# undef PASCAL
-# if (_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED)
-#  define pascal __stdcall
-#  define PASCAL __stdcall
-# else
-#  define PASCAL
-# endif
-#endif
-
-
-/*
- * Useful Types
- */
-typedef char HUGE *HPSTR;
-typedef const char HUGE *HPCSTR;
-typedef unsigned char HUGE *HPBYTE;
-typedef WORD HUGE *HPWORD;
-typedef UINT FAR *LPUINT;
-typedef BOOL (CALLBACK *USERABORTPROC)();
-typedef BOOL (CALLBACK *PROGRESSPROC)(UINT uPos, UINT uRange);
-typedef int INT;   // ~~MRJ a function needed this defined.
-typedef MINMAXINFO FAR *LPMINMAXINFO; // ~~MRJ 
-
-//
-// stuff missing from windows.h
-//
-#ifndef MAKEWORD
-#define MAKEWORD(low, high)    ((WORD)(((BYTE)(low)) | (((WORD)((BYTE)(high))) << 8)))
-#endif // MAKEWORD
-
-#ifdef WIN32
-# ifndef hmemcpy
-#  define hmemcpy memcpy
-# endif // !defined(hmemcpy)
-# define _fmemset memset
-
-# include <malloc.h>
-
-#ifdef __cplusplus
-
-inline BOOL IsGDIObject(HGDIOBJ hObj) { return (hObj != 0); }
-inline void *_halloc(long num, unsigned int size) { return malloc(num * size); }
-inline void _hfree( void *memblock ) { free(memblock); } 
-/*
-inline BOOL IsInstance(HINSTANCE hInst) {
-# ifdef WIN32
-    return (hInst != 0);
-# else // WIN16
-    return (hInst > HINSTANCE_ERROR);
-# endif  
-}  
-*/
-
-#endif // __cplusplus
-
-  WINUSERAPI HANDLE WINAPI LoadImageA(HINSTANCE, LPCSTR, UINT, int, int, UINT);
-
-#endif // WIN32
-
-#ifdef __cplusplus 
-inline BOOL IsInstance(HINSTANCE hInst) {
-# ifdef WIN32
-    return (hInst != 0);
-# else // WIN16
-    return (hInst > HINSTANCE_ERROR);
-# endif  
-} 
-inline void SetWindowSmallIcon(HINSTANCE hInst, HWND hWnd, UINT uIconResourceId) {
-#ifdef WIN32
-# ifndef WM_SETICON
-#   define WM_SETICON 0x0080
-# endif  // WM_SETICON
-# ifndef IMAGE_ICON
-#   define IMAGE_ICON 1
-# endif
-  assert(IsWindow(hWnd));
-  HICON hIcon = (HICON)LoadImageA(hInst, MAKEINTRESOURCE(uIconResourceId), IMAGE_ICON,
-    16, 16, 0);
-  if(NULL != hIcon) {
-    SendMessage(hWnd, WM_SETICON, FALSE, (LPARAM)hIcon);
-  } else {
-    HICON hIcon = LoadIcon(hInst, MAKEINTRESOURCE(uIconResourceId));
-    assert(hIcon != 0);
-    SendMessage(hWnd, WM_SETICON, FALSE, (LPARAM)hIcon);
-  }
-#endif // WIN32
-}
-#endif // __cplusplus
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* PORT_H */

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

@@ -1,137 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is 
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-//
-#include <windows.h>
-#include <windowsx.h>
-
-#ifndef MAPI_OLE	// Because MSFT doesn't do this for us :-(
-#include <mapi.h>
-#endif
-
-#include "port.h"
-#include "resource.h"
-
-//
-// Variables...
-// 
-extern HINSTANCE   hInst;
-extern HINSTANCE   m_hInstMapi;
-extern LHANDLE     mapiSession;
-
-// 
-// Forward declarations...
-//
-extern void   ShowMessage(HWND hWnd, LPSTR msg);
-extern void   SetFooter(LPSTR msg);
-extern LPSTR  GetMAPIError(LONG errorCode);
-lpMapiMessage mailPtr = NULL;
-
-void 
-ProcessReadMailCommand(HWND hWnd, int id, HWND hCtl, UINT codeNotify) 
-{ 
-  switch (id) 
-  {
-  case ID_OK:
-  case IDCANCEL:
-    EndDialog(hWnd, 0);
-    break;
-
-  default:
-    break;
-  }
-}
-
-BOOL CALLBACK LOADDS 
-ReadMailDlgProc(HWND hWndMail, UINT wMsg, WPARAM wParam, LPARAM lParam) 
-{
-  switch (wMsg) 
-  {
-  case WM_INITDIALOG: 
-    {
-      DWORD i;
-      // Do everything we need to display the message pointed to by
-      // mailPtr
-      if (!mailPtr)
-        break;
-
-      // Start with the basics...
-      SetDlgItemText(hWndMail, IDC_EDIT_SUBJECT, mailPtr->lpszSubject);
-      SetDlgItemText(hWndMail, IDC_EDIT_DATETIME, mailPtr->lpszDateReceived);
-      SetDlgItemText(hWndMail, IDC_EDIT_THREAD, mailPtr->lpszConversationID);
-      SetDlgItemText(hWndMail, IDC_EDIT_BODYTEXT, mailPtr->lpszNoteText);
-
-      char    buf[1024];
-      wsprintf(buf, "%s (%s)", mailPtr->lpOriginator->lpszName, 
-                              mailPtr->lpOriginator->lpszAddress);
-      SetDlgItemText(hWndMail, IDC_EDIT_FROM, buf);
-
-      for (i=0; i<mailPtr->nRecipCount; i++)
-      {
-          wsprintf(buf, "%s (%s)", mailPtr->lpRecips[i].lpszName, 
-                                   mailPtr->lpRecips[i].lpszAddress);
-          ListBox_InsertString(GetDlgItem(hWndMail, IDC_LIST_RECIPIENTS), 
-                  ListBox_GetCount(GetDlgItem(hWndMail, IDC_LIST_RECIPIENTS)), 
-                  buf);
-      }
-
-      for (i=0; i<mailPtr->nFileCount; i++)
-      {
-          ListBox_InsertString(GetDlgItem(hWndMail, IDC_LIST_ATTACHMENTS), 
-                ListBox_GetCount(GetDlgItem(hWndMail, IDC_LIST_ATTACHMENTS)), 
-                mailPtr->lpFiles[i].lpszPathName);
-      }
-    }
-    break;
-
-  case WM_COMMAND:
-    HANDLE_WM_COMMAND(hWndMail, wParam, lParam, ProcessReadMailCommand);
-    break;
-
-  default:
-    return FALSE;
-  }
-  
-  return TRUE;
-}
-
-void
-DisplayMAPIReadMail(HWND hWnd, lpMapiMessage msgPtr)
-{
-  mailPtr = msgPtr;
-  DialogBox(hInst, MAKEINTRESOURCE(ID_DIALOG_READMAIL), hWnd, 
-                (DLGPROC)ReadMailDlgProc);
-}

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

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

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

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

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

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

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

@@ -1,26 +0,0 @@
-#!nmake
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is mozilla.org code.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 2001 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s): 
-# Srilatha Moturi <srilatha@netscape.com>
-#
-
-DEPTH=..\..\..\..
-
-include <$(DEPTH)\config\rules.mak>

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

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

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

@@ -1,104 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is mozilla.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 2001 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s): 
- * Srilatha Moturi <srilatha@netscape.com>
- */
-
-function mailnewsOverlayStartup() {
-    mailnewsOverlayInit();
-    parent.hPrefWindow.registerOKCallbackFunc(onOK);
-    if (!("mapiPref" in parent)) {
-        parent.mapiPref = new Object;
-        parent.mapiPref.isDefaultMailClient = 
-               document.getElementById("mailnewsEnableMapi").checked;
-    }
-    else { 
-        // when we switch between different panes
-        // set the checkbox based on the saved state
-        var mailnewsEnableMapi = document.getElementById("mailnewsEnableMapi");
-        if (parent.mapiPref.isDefaultMailClient)
-            mailnewsEnableMapi.setAttribute("checked", "true");
-        else
-            mailnewsEnableMapi.setAttribute("checked", "false");
-    }
-}
-
-function mailnewsOverlayInit() {
-    try {
-        var mapiRegistry = Components.classes[ "@mozilla.org/mapiregistry;1" ].
-                   getService( Components.interfaces.nsIMapiRegistry );
-    }
-    catch(ex){
-        mapiRegistry = null;
-    }
-
-    const prefbase = "system.windows.lock_ui.";
-    var mailnewsEnableMapi = document.getElementById("mailnewsEnableMapi");
-    if (mapiRegistry) {
-    // initialise preference component.
-    // While the data is coming from the system registry, we use a set
-    // of parallel preferences to indicate if the ui should be locked.
-        try { 
-            var prefService = Components.classes["@mozilla.org/preferences-service;1"]
-                          .getService()
-                          .QueryInterface(Components.interfaces.nsIPrefService);
-            var prefBranch = prefService.getBranch(prefbase);
-            if (prefBranch && prefBranch.prefIsLocked("default_mail_client")) {
-                if (prefBranch.getBoolPref("default_mail_client"))
-                    mapiRegistry.setDefaultMailClient();
-                else
-                    mapiRegistry.unsetDefaultMailClient();
-                mailnewsEnableMapi.setAttribute("disabled", "true");
-           }
-        }
-        catch(ex) {}
-        if (mapiRegistry.isDefaultMailClient)
-            mailnewsEnableMapi.setAttribute("checked", "true");
-        else
-            mailnewsEnableMapi.setAttribute("checked", "false");
-    }
-    else
-        mailnewsEnableMapi.setAttribute("disabled", "true");
-}
-
-function onEnableMapi() {
-    // save the state of the checkbox
-    if ("mapiPref" in parent)
-        parent.mapiPref.isDefaultMailClient = 
-               document.getElementById("mailnewsEnableMapi").checked;
-}
-
-function onOK()
-{
-    try {
-        var mapiRegistry = Components.classes[ "@mozilla.org/mapiregistry;1" ].
-                   getService( Components.interfaces.nsIMapiRegistry );
-    }
-    catch(ex){
-        mapiRegistry = null;
-    }
-    if (mapiRegistry &&
-        ("mapiPref" in parent) && 
-        (mapiRegistry.isDefaultMailClient != parent.mapiPref.isDefaultMailClient)) { 
-        if (parent.mapiPref.isDefaultMailClient)
-            mapiRegistry.setDefaultMailClient();
-        else
-            mapiRegistry.unsetDefaultMailClient();
-    }
-}

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

@@ -1,44 +0,0 @@
-<?xml version="1.0"?>
-<!-- 
-The contents of this file are subject to the Mozilla Public
-License Version 1.1 (the "License"); you may not use this file
-except in compliance with the License. You may obtain a copy of
-the License at http://www.mozilla.org/MPL/
-
-oftware distributed under the License is distributed on an "AS
-IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-implied. See the License for the specific language governing
-rights and limitations under the License.
-
-The Original Code is mozilla.org code.
-The Initial Developer of the Original Code is Netscape
-Communications Corporation.  Portions created by Netscape are 
-Copyright (C) 2001 Netscape Communications Corporation.  All
-Rights Reserved.
- 
-Contributor(s): 
-  Srilatha Moturi <srilatha@netscape.com>
--->
-
-<!DOCTYPE window [
-<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
-%brandDTD;
-<!ENTITY % prefMailnewsOverlayDTD SYSTEM "chrome://messenger/locale/pref-mailnewsOverlay.dtd" >
-%prefMailnewsOverlayDTD;
-]>
-<overlay id="prefMailnewsOverlay"
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-<script type="application/x-javascript">
-  <![CDATA[
-      _elementIDs.push("mailnewsEnableMapi");
-  ]]>
-</script>         
-<script type="application/x-javascript" src="chrome://messenger/content/pref-mailnewsOverlay.js"/>
-<hbox autostretch="never" id="mapi">
-  <checkbox id="mailnewsEnableMapi" label="&enableMapi.label;"
-            accesskey="&enableMapi.accesskey;"
-            oncommand="onEnableMapi();"
-            startFunc="mailnewsOverlayStartup();"/>
-</hbox>
-</overlay> 

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

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

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

@@ -1,26 +0,0 @@
-#!nmake
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is mozilla.org code.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 2001 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s): 
-# Srilatha Moturi <srilatha@netscape.com>
-# 
-
-DEPTH=..\..\..\..\..
-
-include <$(DEPTH)\config\rules.mak>

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

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

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

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

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

@@ -1,28 +0,0 @@
-#!nmake
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is mozilla.org code.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 2001 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s): 
-# Srilatha Moturi <srilatha@netscape.com>
-#
-
-DEPTH=..\..\..\..
-
-DIRS=en-US
-
-include <$(DEPTH)\config\rules.mak>

mozilla/mailnews/mapi/resources/makefile.win

@@ -1,27 +0,0 @@
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is mozilla.org code.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 2001 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s): 
-# Srilatha Moturi <srilatha@netscape.com>
-#
-
-DEPTH=..\..\..
-
-DIRS=content locale
-
-include <$(DEPTH)\config\rules.mak>

mozilla/webshell/tests/viewer/Makefile.in

@@ -0,0 +1,197 @@
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DEPTH			= ../../..
+topsrcdir		= @top_srcdir@
+srcdir			= @srcdir@
+VPATH			= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS			= public
+
+PROGRAM			= viewer
+
+CPPSRCS			= \
+			$(TOOLKIT_CPPSRCS) \
+			nsBaseDialog.cpp \
+			nsFindDialog.cpp \
+			nsXPBaseWindow.cpp \
+			nsTableInspectorDialog.cpp \
+			nsImageInspectorDialog.cpp \
+			nsPrintSetupDialog.cpp \
+			nsBrowserWindow.cpp \
+			nsEditorMode.cpp \
+			nsSetupRegistry.cpp \
+			nsThrobber.cpp \
+			nsViewerApp.cpp \
+			nsWebCrawler.cpp \
+			$(NULL)
+
+EXPORT_RESOURCE_SAMPLES	:= \
+			$(wildcard $(srcdir)/samples/test*.html) \
+			$(wildcard $(srcdir)/samples/toolbarTest*.xul) \
+			$(wildcard $(srcdir)/samples/treeTest*.xul) \
+			$(wildcard $(srcdir)/samples/treeTest*.css) \
+			$(wildcard $(srcdir)/samples/slider*.xul) \
+			$(wildcard $(srcdir)/samples/scrollbar*.xul) \
+			$(srcdir)/resources/find.html \
+			$(srcdir)/resources/printsetup.html \
+			$(srcdir)/resources/image_props.html \
+			$(srcdir)/samples/aform.css \
+			$(srcdir)/samples/bform.css \
+			$(srcdir)/samples/cform.css \
+			$(srcdir)/samples/demoform.css \
+			$(srcdir)/samples/mozform.css \
+			$(srcdir)/samples/xulTest.css \
+			$(srcdir)/samples/Anieyes.gif \
+			$(srcdir)/samples/gear1.gif \
+			$(srcdir)/samples/rock_gra.gif \
+			$(srcdir)/samples/beeptest.html \
+			$(srcdir)/samples/soundtest.html \
+			$(srcdir)/samples/bg.jpg \
+			$(srcdir)/samples/raptor.jpg \
+			$(srcdir)/samples/test.wav \
+			$(srcdir)/samples/checkboxTest.xul \
+			$(NULL)
+
+EXPORT_RESOURCE_THROBBER := $(wildcard $(srcdir)/throbber/anim*.gif)
+
+ifeq (,$(filter beos os2 rhapsody photon,$(MOZ_WIDGET_TOOLKIT)))
+DIRS			+= unix
+UNIX_VIEWER_TK_LIBS	= $(DIST)/lib/libviewer_$(MOZ_WIDGET_TOOLKIT)_s.a
+else
+ifeq ($(MOZ_WIDGET_TOOLKIT),beos)
+BEOS_PROGRAM_RESOURCE	= $(srcdir)/viewer-beos.rsrc
+TOOLKIT_CPPSRCS		= nsBeOSMain.cpp
+endif
+ifeq ($(MOZ_WIDGET_TOOLKIT),photon)
+TOOLKIT_CPPSRCS		= nsPhMain.cpp nsPhMenu.cpp
+endif
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),gtk)
+GTK_GLUE		= -lgtksuperwin
+endif
+
+ifdef MOZ_OJI
+JSJ_LIB			= -ljsj
+endif
+
+XP_DIST_LIBS		= \
+			-lraptorgfx \
+			-lmozjs \
+			-lxpcom \
+			$(JSJ_LIB) \
+			$(NULL)
+
+XP_NS_UNDERBAR_CRAP	= \
+			$(MOZ_NECKO_UTIL_LIBS) \
+			$(MOZ_TIMER_LIBS) \
+			$(MOZ_WIDGET_SUPPORT_LIBS) \
+			$(NULL)
+
+XP_LIBS			= \
+			$(XP_NS_UNDERBAR_CRAP) \
+			$(XP_DIST_LIBS) \
+			$(NSPR_LIBS) \
+			$(NULL)
+
+ifdef MOZ_FULLCIRCLE
+XP_LIBS			+= $(FULLCIRCLE_LIBS)
+endif
+
+LIBS			= \
+			$(UNIX_VIEWER_TK_LIBS) \
+			$(GTK_GLUE) \
+			$(XP_LIBS) \
+			$(TK_LIBS) \
+			$(NULL)
+
+MOTIF_LIBS		= -lviewer_motif_s $(XP_LIBS) $(MOZ_MOTIF_LDFLAGS)
+QT_LIBS			= -lviewer_qt_s $(XP_LIBS) $(MOZ_QT_LDFLAGS)
+XLIB_LIBS		= -lviewer_xlib_s $(XP_LIBS) $(MOZ_XLIB_LDFLAGS)
+GTK_LIBS		= -lviewer_gtk_s -lgtksuperwin $(XP_LIBS) $(MOZ_GTK_LDFLAGS)
+
+EXTRA_DEPS		= \
+			$(addprefix $(DIST)/,$(patsubst -l%,bin/lib%.$(DLL_SUFFIX),$(XP_DIST_LIBS:-l%_s=lib/lib%_s.a))) \
+			$(UNIX_VIEWER_TK_LIBS) \
+			$(XP_NS_UNDERBAR_CRAP) \
+			$(NULL)
+
+include $(topsrcdir)/config/rules.mk
+
+CXXFLAGS		+= $(MOZ_TOOLKIT_REGISTRY_CFLAGS)
+
+install:: $(PROGRAM) $(srcdir)/mozilla-viewer.sh
+	$(INSTALL) $(EXPORT_RESOURCE_SAMPLES) $(DIST)/bin/res/samples
+	$(INSTALL) $(EXPORT_RESOURCE_THROBBER) $(DIST)/bin/res/throbber
+	$(INSTALL) $(srcdir)/resources/viewer.properties $(DIST)/bin/res
+	$(INSTALL) $(srcdir)/mozilla-viewer.sh $(DIST)/bin
+
+$(PROGRAM)_gtk: $(PROGOBJS) $(EXTRA_DEPS) Makefile Makefile.in $(DIST)/lib/libviewer_gtk_s.a
+	$(CCC) -o $@ $(PROGOBJS) $(LDFLAGS) $(LIBS_DIR) $(GTK_LIBS) $(OS_LIBS)
+	$(MOZ_POST_PROGRAM_COMMAND) $@
+
+$(PROGRAM)_motif: $(PROGOBJS) $(EXTRA_DEPS) Makefile Makefile.in $(DIST)/lib/libviewer_motif_s.a
+	$(CCC) -o $@ $(PROGOBJS) $(LDFLAGS) $(LIBS_DIR) $(MOTIF_LIBS) $(OS_LIBS)
+	$(MOZ_POST_PROGRAM_COMMAND) $@
+
+$(PROGRAM)_qt: $(PROGOBJS) $(EXTRA_DEPS) Makefile Makefile.in $(DIST)/lib/libviewer_qt_s.a
+	$(CCC) -o $@ $(PROGOBJS) $(LDFLAGS) $(LIBS_DIR) $(QT_LIBS) $(OS_LIBS)
+	$(MOZ_POST_PROGRAM_COMMAND) $@
+
+$(PROGRAM)_xlib: $(PROGOBJS) $(EXTRA_DEPS) Makefile Makefile.in $(DIST)/lib/libviewer_xlib_s.a
+	$(CCC) -o $@ $(PROGOBJS) $(LDFLAGS) $(LIBS_DIR) $(XLIB_LIBS) $(OS_LIBS)
+	$(MOZ_POST_PROGRAM_COMMAND) $@
+
+ifdef MOZ_ENABLE_GTK
+install:: $(PROGRAM)_gtk
+	$(INSTALL) -m 555 $< $(DIST)/bin
+
+clobber::
+	rm -f $(PROGRAM)_gtk
+endif
+
+ifdef MOZ_ENABLE_MOTIF
+install:: $(PROGRAM)_motif
+	$(INSTALL) -m 555 $< $(DIST)/bin
+
+clobber::
+	rm -f $(PROGRAM)_motif
+endif
+
+ifdef MOZ_ENABLE_QT
+install:: $(PROGRAM)_qt
+	$(INSTALL) -m 555 $< $(DIST)/bin
+
+clobber::
+	rm -f $(PROGRAM)_qt
+endif
+
+ifdef MOZ_ENABLE_XLIB
+install:: $(PROGRAM)_xlib
+	$(INSTALL) -m 555 $< $(DIST)/bin
+
+clobber::
+	rm -f $(PROGRAM)_xlib
+endif
+

mozilla/webshell/tests/viewer/unix/gtk/nsGtkMenu.cpp

@@ -0,0 +1,179 @@
+/* -*- Mode: C++; tab-width: 2; 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): 
+ */
+
+#include <gtk/gtk.h>
+
+#include "gdksuperwin.h"
+#include "gtkmozbox.h"
+
+#include "nsBrowserWindow.h"
+#include "resources.h"
+#include "nscore.h"
+
+#include "stdio.h"
+
+typedef GtkItemFactoryCallback GIFC;
+
+void gtk_ifactory_cb (nsBrowserWindow *nbw,
+                      guint callback_action, 
+                      GtkWidget *widget)
+{
+  nbw->DispatchMenuItem(callback_action);
+}
+
+GtkItemFactoryEntry menu_items[] =
+{
+  { "/_File",				nsnull,	nsnull,			0,			"<Branch>" },
+  { "/File/_New Window",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_WINDOW_OPEN,	nsnull },
+  { "/File/_Open...",			nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_FILE_OPEN,	nsnull },
+  { "/File/_View Source",		nsnull, (GIFC)gtk_ifactory_cb,	VIEW_SOURCE,		nsnull },
+  { "/File/_Samples",			nsnull,	nsnull,			0,			"<Branch>" },
+  { "/File/Samples/demo #0",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO0,		nsnull },
+  { "/File/Samples/demo #1",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO1,		nsnull },
+  { "/File/Samples/demo #2",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO2,		nsnull },
+  { "/File/Samples/demo #3",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO3,		nsnull },
+  { "/File/Samples/demo #4",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO4,		nsnull },
+  { "/File/Samples/demo #5",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO5,		nsnull },
+  { "/File/Samples/demo #6",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO6,		nsnull },
+  { "/File/Samples/demo #7",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO7,		nsnull },
+  { "/File/Samples/demo #8",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO8,		nsnull },
+  { "/File/Samples/demo #9",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO9,		nsnull },
+  { "/File/Samples/demo #10",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO10,		nsnull },
+  { "/File/Samples/demo #11",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO11,		nsnull },
+  { "/File/Samples/demo #12",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO12,		nsnull },
+  { "/File/Samples/demo #13",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO13,		nsnull },
+  { "/File/Samples/demo #14",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO14,		nsnull },
+  { "/File/Samples/demo #15",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO15,		nsnull },
+  { "/File/Samples/demo #16",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO16,		nsnull },
+  { "/File/Samples/demo #17",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO17,		nsnull },
+  { "/File/_Test Sites",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_TOP100,		nsnull },
+  { "/File/XPToolkit Tests",		nsnull,	nsnull,			0,			"<Branch>" },
+  { "/File/XPToolkit Tests/Toolbar Test 1",       nsnull, (GIFC)gtk_ifactory_cb,  VIEWER_XPTOOLKITTOOLBAR1,     nsnull },
+  { "/File/XPToolkit Tests/Tree Test 1",       nsnull, (GIFC)gtk_ifactory_cb,  VIEWER_XPTOOLKITTREE1,     nsnull },
+  { "/File/sep1",			nsnull,	nsnull,			0,			"<Separator>" },
+  { "/File/Print Preview",	nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_ONE_COLUMN,	nsnull },
+  { "/File/Print",			nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_PRINT,		nsnull },
+  { "/File/Print Setup",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_PRINT_SETUP,	nsnull },
+  { "/File/sep2",			nsnull,	nsnull,			0,			"<Separator>" },
+  { "/File/_Exit",			nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_EXIT,		nsnull },
+
+  { "/_Edit",				nsnull,	nsnull,			0,			"<Branch>" },
+  { "/Edit/Cu_t",			nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_EDIT_CUT,	nsnull },
+  { "/Edit/_Copy",			nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_EDIT_COPY,	nsnull },
+  { "/Edit/_Paste",			nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_EDIT_PASTE,	nsnull },
+  { "/Edit/sep1",			nsnull,	nsnull,			0,			"<Separator>" },
+  { "/Edit/Select All",			nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_EDIT_SELECTALL,	nsnull },
+  { "/Edit/sep1",			nsnull,	nsnull,			0,			"<Separator>" },
+  { "/Edit/Find in Page",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_EDIT_FINDINPAGE,	nsnull },
+
+//#ifdef DEBUG // turning off for now
+  { "/_Debug",				nsnull,	nsnull,			0,			"<Branch>"	},
+  { "/Debug/_Visual Debugging",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_VISUAL_DEBUGGING,nsnull },
+  { "/Debug/sep1",			nsnull,	nsnull,			0,			"<Separator>" },
+  { "/Debug/Event Debugging/Toggle Paint Flashing",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_TOGGLE_PAINT_FLASHING,nsnull },
+  { "/Debug/Event Debugging/Toggle Paint Dumping",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_TOGGLE_PAINT_DUMPING,nsnull },
+  { "/Debug/Event Debugging/Toggle Invalidate Dumping",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_TOGGLE_INVALIDATE_DUMPING,nsnull },
+  { "/Debug/Event Debugging/Toggle Event Dumping",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_TOGGLE_EVENT_DUMPING,nsnull },
+  { "/Debug/Event Debugging/sep1", nsnull,	nsnull,			0,			"<Separator>" },
+  { "/Debug/Event Debugging/Toggle Motion Event Dumping",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_TOGGLE_MOTION_EVENT_DUMPING,nsnull },
+  { "/Debug/Event Debugging/Toggle Crossing Event Dumping",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_TOGGLE_CROSSING_EVENT_DUMPING,nsnull },
+  { "/Debug/sep1",			nsnull,	nsnull,			0,			"<Separator>" },
+  { "/Debug/_Reflow Test",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_REFLOW_TEST,	nsnull },
+  { "/Debug/sep1",			nsnull,	nsnull,			0,			"<Separator>" },
+  { "/Debug/Dump _Content",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DUMP_CONTENT,	nsnull },
+  { "/Debug/Dump _Frames",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DUMP_FRAMES,	nsnull },
+  { "/Debug/Dump _Views",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DUMP_VIEWS,	nsnull },
+  { "/Debug/sep1",			nsnull,	nsnull,			0,			"<Separator>" },
+  { "/Debug/Dump _Style Sheets",	nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DUMP_STYLE_SHEETS,	nsnull },
+  { "/Debug/Dump _Style Contexts",	nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DUMP_STYLE_CONTEXTS,	nsnull},
+  { "/Debug/sep1",			nsnull,	nsnull,			0,			"<Separator>" },
+  { "/Debug/Show Content Size",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_SHOW_CONTENT_SIZE,nsnull },
+  { "/Debug/Show Frame Size",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_SHOW_FRAME_SIZE,	nsnull },
+  { "/Debug/Show Style Size",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_SHOW_STYLE_SIZE,	nsnull },
+  { "/Debug/sep1",			nsnull,	nsnull,			0,			"<Separator>" },
+  { "/Debug/Debug Save",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEBUGSAVE,	nsnull },
+  { "/Debug/Debug Output Text",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DISPLAYTEXT,	nsnull },
+  { "/Debug/Debug Output HTML",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DISPLAYHTML,	nsnull },
+  { "/Debug/Debug Toggle Selection",	nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_TOGGLE_SELECTION,nsnull },
+  { "/Debug/sep1",			nsnull,	nsnull,			0,			"<Separator>" },
+  { "/Debug/Debug Robot",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEBUGROBOT,	nsnull },
+  { "/Debug/sep1",			nsnull,	nsnull,			0,			"<Separator>" },
+  { "/Debug/Show Content Quality",	nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_SHOW_CONTENT_QUALITY,	nsnull },
+  { "/_Style",				nsnull,	nsnull,			0,			"<Branch>"	},
+  { "/Style/Select _Style Sheet",	       nsnull, nsnull,        0,        "<Branch>" },
+  { "/Style/Select Style Sheet/List Available Sheets", nsnull, (GIFC)gtk_ifactory_cb, VIEWER_SELECT_STYLE_LIST, nsnull },
+  { "/Style/Select Style Sheet/sep1", nsnull, nsnull,        0,        "<Separator>" },
+  { "/Style/Select Style Sheet/Select Default", nsnull, (GIFC)gtk_ifactory_cb, VIEWER_SELECT_STYLE_DEFAULT, nsnull },
+  { "/Style/Select Style Sheet/sep1", nsnull, nsnull,        0,        "<Separator>" },
+  { "/Style/Select Style Sheet/Select Alternative 1", nsnull, (GIFC)gtk_ifactory_cb, VIEWER_SELECT_STYLE_ONE, nsnull },
+  { "/Style/Select Style Sheet/Select Alternative 2", nsnull, (GIFC)gtk_ifactory_cb, VIEWER_SELECT_STYLE_TWO, nsnull },
+  { "/Style/Select Style Sheet/Select Alternative 3", nsnull, (GIFC)gtk_ifactory_cb, VIEWER_SELECT_STYLE_THREE, nsnull },
+  { "/Style/Select Style Sheet/Select Alternative 4", nsnull, (GIFC)gtk_ifactory_cb, VIEWER_SELECT_STYLE_FOUR, nsnull },
+  { "/Style/_Compatibility Mode",		nsnull,	nsnull,			0,			"<Branch>" },
+  { "/Style/Compatibility Mode/Nav Quirks",	nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_NAV_QUIRKS_MODE,	nsnull },
+  { "/Style/Compatibility Mode/Standard",	nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_STANDARD_MODE,	nsnull },
+
+  { "/Style/_Widget Render Mode",		nsnull,	nsnull,			0,			"<Branch>" },
+  { "/Style/Widget Render Mode/Native",	nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_NATIVE_WIDGET_MODE,	nsnull },
+  { "/Style/Widget Render Mode/Gfx",	nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_GFX_WIDGET_MODE,	nsnull },
+//#endif
+
+  { "/_Tools",                                nsnull, nsnull,                 0,              "<Branch>" },
+  { "/Tools/_JavaScript Console",	nsnull,	(GIFC)gtk_ifactory_cb,	JS_CONSOLE,	nsnull },
+  { "/Tools/_Editor Mode",		nsnull,	(GIFC)gtk_ifactory_cb,	EDITOR_MODE,	nsnull }
+};
+
+void CreateViewerMenus(nsIWidget *   aParent, 
+                       gpointer      data,
+                       GtkWidget **  aMenuBarOut) 
+{
+  NS_ASSERTION(nsnull != aParent,"null parent.");
+  NS_ASSERTION(nsnull != aMenuBarOut,"null out param.");
+
+  GtkItemFactory *item_factory;
+  GtkWidget *menubar;
+
+  GdkSuperWin *gdkSuperWin;
+  GtkWidget   *mozBox;
+
+  gdkSuperWin = (GdkSuperWin*)aParent->GetNativeData(NS_NATIVE_WIDGET);
+  
+  int nmenu_items = sizeof (menu_items) / sizeof (menu_items[0]);
+  item_factory = gtk_item_factory_new (GTK_TYPE_MENU_BAR, "<main>", nsnull);
+
+  gtk_item_factory_create_items (item_factory, nmenu_items, menu_items, data);
+
+  menubar = gtk_item_factory_get_widget (item_factory, "<main>");
+
+  gtk_menu_bar_set_shadow_type (GTK_MENU_BAR(menubar), GTK_SHADOW_NONE);
+
+  NS_ASSERTION(GDK_IS_SUPERWIN(gdkSuperWin), "code assumes a gdksuperwin.");
+  mozBox = gtk_mozbox_new(gdkSuperWin->bin_window);
+  NS_ASSERTION((mozBox != NULL), "failed to create mozBox.");
+
+  gtk_container_add(GTK_CONTAINER(mozBox), menubar);
+  gtk_mozbox_set_position(GTK_MOZBOX(mozBox), 0, 0 );
+  gtk_widget_show(mozBox);
+  gtk_widget_show(menubar);
+
+  *aMenuBarOut = menubar;
+}

mozilla/widget/src/Makefile.in

@@ -0,0 +1,67 @@
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DEPTH		= ../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS		= xpwidgets support
+
+#
+# Dont build the DSO under the 'build' directory as windows does.
+#
+# The DSOs get built in the toolkit dir itself.  Do this so that 
+# multiple implementations of widget can be built on the same
+# source tree.
+#
+ifndef MOZ_MONOLITHIC_TOOLKIT
+
+ifdef MOZ_ENABLE_GTK
+DIRS		+= gtksuperwin
+DIRS		+= gtk
+endif
+
+ifdef MOZ_ENABLE_MOTIF
+DIRS		+= motif
+endif
+
+ifdef MOZ_ENABLE_XLIB
+DIRS		+= xlib
+endif
+
+ifdef MOZ_ENABLE_QT
+DIRS		+= qt
+endif
+
+else
+DIRS		+= $(MOZ_WIDGET_TOOLKIT)
+endif
+
+# unix_services are only useful in unix, duh...
+ifeq (,$(filter beos os2 rhapsody photon,$(MOZ_WIDGET_TOOLKIT)))
+DIRS		+= unix_services
+endif
+
+include $(topsrcdir)/config/rules.mk
+

mozilla/widget/src/gtk/Makefile.in

@@ -0,0 +1,100 @@
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+LIBRARY_NAME	= widget_gtk
+
+REQUIRES	= util img xpcom raptor netlib
+
+CPPSRCS		= \
+		nsAppShell.cpp \
+		nsButton.cpp \
+		nsCheckButton.cpp \
+		nsClipboard.cpp \
+		nsComboBox.cpp \
+		nsContextMenu.cpp \
+		nsDragService.cpp \
+		nsFilePicker.cpp \
+		nsFileWidget.cpp \
+		nsFontRetrieverService.cpp \
+		nsFontSizeIterator.cpp \
+		nsGtkEventHandler.cpp \
+		nsGtkUtils.cpp \
+		nsLabel.cpp \
+		nsListBox.cpp \
+		nsLookAndFeel.cpp \
+		nsMenu.cpp \
+		nsMenuBar.cpp \
+		nsMenuItem.cpp \
+		nsPopUpMenu.cpp \
+		nsRadioButton.cpp \
+		nsScrollbar.cpp \
+		nsSound.cpp \
+		nsTextAreaWidget.cpp \
+		nsTextHelper.cpp \
+		nsTextWidget.cpp \
+		nsToolkit.cpp \
+		nsWidget.cpp \
+		nsWidgetFactory.cpp \
+		nsWindow.cpp \
+		$(NULL)
+
+SHARED_LIBRARY_LIBS = $(DIST)/lib/libraptorbasewidget_s.a
+
+EXTRA_DSO_LDOPTS = \
+		$(MKSHLIB_FORCE_ALL) \
+		$(SHARED_LIBRARY_LIBS) \
+		$(MKSHLIB_UNFORCE_ALL) \
+		$(MOZ_COMPONENT_LIBS) \
+		-lraptorgfx \
+		$(NULL)
+
+ifndef MOZ_MONOLITHIC_TOOLKIT
+EXTRA_DSO_LDOPTS +=  -L$(DIST)/lib -lgtksuperwin $(MOZ_GTK_LDFLAGS)
+else
+EXTRA_DSO_LDOPTS += $(TK_LIBS)
+endif
+
+include $(topsrcdir)/config/rules.mk
+
+ifndef MOZ_MONOLITHIC_TOOLKIT
+CXXFLAGS	+= $(MOZ_GTK_CFLAGS)
+CFLAGS		+= $(MOZ_GTK_CFLAGS)
+else
+CXXFLAGS	+= $(TK_CFLAGS)
+CFLAGS		+= $(TK_CFLAGS)
+endif
+
+DEFINES		+= -D_IMPL_NS_WIDGET -DUSE_XIM
+
+ifeq ($(OS_ARCH), Linux)
+DEFINES		+= -D_BSD_SOURCE
+endif
+
+INCLUDES	+= \
+		-I$(srcdir)/../xpwidgets \
+		-I$(srcdir) \
+		$(NULL)
+
+$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
+

mozilla/widget/src/gtk/mozicon.xpm

@@ -0,0 +1,292 @@
+/* XPM */
+static char * mozilla_icon_xpm[] = {
+"32 32 257 2",
+"  	c None",
+". 	c #AA7303",
+"+ 	c #A67003",
+"@ 	c #B77C03",
+"# 	c #8D6003",
+"$ 	c #8D6004",
+"% 	c #6C4A04",
+"& 	c #3A2804",
+"* 	c #6B4802",
+"= 	c #9B6903",
+"- 	c #5A2C04",
+"; 	c #411B04",
+"> 	c #9D6A03",
+", 	c #7A5203",
+"' 	c #510D04",
+") 	c #6B1104",
+"! 	c #7D5503",
+"~ 	c #674604",
+"{ 	c #C21E04",
+"] 	c #C21D04",
+"^ 	c #523804",
+"/ 	c #513702",
+"( 	c #552904",
+"_ 	c #DD2204",
+": 	c #DF2204",
+"< 	c #582904",
+"[ 	c #5F3F02",
+"} 	c #6B2504",
+"| 	c #FE2604",
+"1 	c #AB7303",
+"2 	c #9B6904",
+"3 	c #C31F04",
+"4 	c #FE2704",
+"5 	c #A81904",
+"6 	c #926304",
+"7 	c #4D3302",
+"8 	c #483104",
+"9 	c #C61E04",
+"0 	c #B11B04",
+"a 	c #891604",
+"b 	c #761204",
+"c 	c #614304",
+"d 	c #775102",
+"e 	c #795102",
+"f 	c #785102",
+"g 	c #C58603",
+"h 	c #642404",
+"i 	c #B21A04",
+"j 	c #1F0604",
+"k 	c #550E04",
+"l 	c #631004",
+"m 	c #402404",
+"n 	c #AF7703",
+"o 	c #3D2902",
+"p 	c #7F5602",
+"q 	c #805604",
+"r 	c #0C0904",
+"s 	c #080604",
+"t 	c #080706",
+"u 	c #090604",
+"v 	c #060404",
+"w 	c #620F04",
+"x 	c #7A1304",
+"y 	c #030204",
+"z 	c #570E04",
+"A 	c #721204",
+"B 	c #270704",
+"C 	c #080504",
+"D 	c #0A0604",
+"E 	c #533804",
+"F 	c #A56F02",
+"G 	c #B87C03",
+"H 	c #3B2804",
+"I 	c #A51904",
+"J 	c #FC2704",
+"K 	c #D62004",
+"L 	c #691004",
+"M 	c #C01E04",
+"N 	c #6D1004",
+"O 	c #9C1804",
+"P 	c #B31C04",
+"Q 	c #150404",
+"R 	c #801404",
+"S 	c #DD2304",
+"T 	c #120404",
+"U 	c #130404",
+"V 	c #500C04",
+"W 	c #CC1E04",
+"X 	c #AA1A04",
+"Y 	c #100904",
+"Z 	c #B47A03",
+"` 	c #A77103",
+" .	c #513704",
+"..	c #891704",
+"+.	c #F62604",
+"@.	c #BA1D04",
+"#.	c #3C0A04",
+"$.	c #EB2304",
+"%.	c #DE2304",
+"&.	c #560E04",
+"*.	c #E82304",
+"=.	c #FE2804",
+"-.	c #BE1D04",
+";.	c #F12404",
+">.	c #661004",
+",.	c #020204",
+"'.	c #5E0F04",
+").	c #A61A04",
+"!.	c #4A3204",
+"~.	c #BC7E03",
+"{.	c #8E6002",
+"].	c #684604",
+"^.	c #390D04",
+"/.	c #EE2404",
+"(.	c #FE2904",
+"_.	c #7D1304",
+":.	c #8C1504",
+"<.	c #200604",
+"[.	c #A81A04",
+"}.	c #E72204",
+"|.	c #DA2004",
+"1.	c #070204",
+"2.	c #280704",
+"3.	c #543904",
+"4.	c #9F6C02",
+"5.	c #674602",
+"6.	c #B47B04",
+"7.	c #311004",
+"8.	c #B11C04",
+"9.	c #AA1B04",
+"0.	c #6A1104",
+"a.	c #801504",
+"b.	c #2B0704",
+"c.	c #09090A",
+"d.	c #450B04",
+"e.	c #360904",
+"f.	c #DC2204",
+"g.	c #EE2504",
+"h.	c #C11D04",
+"i.	c #6F1104",
+"j.	c #704B04",
+"k.	c #9C6902",
+"l.	c #A56F03",
+"m.	c #5F4004",
+"n.	c #8D1604",
+"o.	c #440A04",
+"p.	c #1A0504",
+"q.	c #931604",
+"r.	c #621004",
+"s.	c #7F1404",
+"t.	c #921704",
+"u.	c #F82504",
+"v.	c #F52504",
+"w.	c #981804",
+"x.	c #241804",
+"y.	c #5B3E04",
+"z.	c #D82204",
+"A.	c #D02004",
+"B.	c #DA2104",
+"C.	c #D52104",
+"D.	c #2A1A04",
+"E.	c #AC7403",
+"F.	c #2B1C04",
+"G.	c #D04004",
+"H.	c #FC3C04",
+"I.	c #F94E04",
+"J.	c #881504",
+"K.	c #FC2604",
+"L.	c #792804",
+"M.	c #AC7503",
+"N.	c #9A6803",
+"O.	c #782804",
+"P.	c #F66504",
+"Q.	c #F94B04",
+"R.	c #F46804",
+"S.	c #F46604",
+"T.	c #F76504",
+"U.	c #FB4204",
+"V.	c #C13D04",
+"W.	c #5D0E04",
+"X.	c #DA2204",
+"Y.	c #741604",
+"Z.	c #8C5E03",
+"`.	c #885B03",
+" +	c #8B1904",
+".+	c #DE2204",
+"++	c #D22D04",
+"@+	c #C42D04",
+"#+	c #580E04",
+"$+	c #9F1804",
+"%+	c #895D04",
+"&+	c #D62204",
+"*+	c #371904",
+"=+	c #2C1A04",
+"-+	c #4A0C04",
+";+	c #140404",
+">+	c #AB1A04",
+",+	c #DA2304",
+"'+	c #6A4702",
+")+	c #754F02",
+"!+	c #821404",
+"~+	c #462B04",
+"{+	c #B37A03",
+"]+	c #B17803",
+"^+	c #714C04",
+"/+	c #580F04",
+"(+	c #E32204",
+"_+	c #DD2104",
+":+	c #611D04",
+"<+	c #BA7F03",
+"[+	c #B27803",
+"}+	c #6F1D04",
+"|+	c #FD2704",
+"1+	c #F22504",
+"2+	c #634304",
+"3+	c #875B03",
+"4+	c #734F02",
+"5+	c #805704",
+"6+	c #1D0504",
+"7+	c #DB2204",
+"8+	c #EA2404",
+"9+	c #2E0804",
+"0+	c #815803",
+"a+	c #941704",
+"b+	c #C11E04",
+"c+	c #391B04",
+"d+	c #A77104",
+"e+	c #B67C04",
+"f+	c #371D04",
+"g+	c #360A04",
+"h+	c #573A04",
+"i+	c #372604",
+"j+	c #3E2104",
+"k+	c #B57A03",
+"l+	c #B57B03",
+"m+	c #603F04",
+"n+	c #430A04",
+"o+	c #351904",
+"p+	c #A36E03",
+"q+	c #BE8103",
+"r+	c #1D1404",
+"s+	c #483004",
+"t+	c #A26E03",
+"u+	c #6D4B02",
+"v+	c #825804",
+"w+	c #0B0804",
+"x+	c #976603",
+"y+	c #815703",
+"z+	c #926404",
+"A+	c #895D03",
+"B+	c #614202",
+"C+	c #9A6804",
+"D+	c #C88704",
+"E+	c #C18303",
+"F+	c #654302",
+"G+	c #744F02",
+"H+	c #704B02",
+"                                                                ",
+"                                .                               ",
+"                              + @                               ",
+"                              # $                               ",
+"                              % & *                             ",
+"                            = - ; >                             ",
+"                            , ' ) !                             ",
+"                            ~ { ] ^                             ",
+"                          / ( _ : < [                           ",
+"                          . } | | } 1                           ",
+"                          2 3 | 4 5 6                           ",
+"                        7 8 9 0 a b c                           ",
+"  d e f f f d d d d d d g h i j k l m n d d d d d d d d d d d o ",
+"  p q r s s s s t s s u v w x y z A B C D D D D D s s s s E F   ",
+"      G H I J 4 | 4 | K L L M N O P Q R | S T U V W X Y Z       ",
+"        `  ...+.| 4 @.#.$.4 | %.&.*.4 =.-.;.>.,.'.).!.~.        ",
+"          {.].^./.(.X _.;.| :.T <.[.| }.z | |.1.2.3.4.          ",
+"            5.6.7.8.9.0.a.b.c.d.e.f.g.h.&.| i.u j.k.            ",
+"                l.m.n.o.p.q._.r.a.s.t.u.v.w.x.Z                 ",
+"                  {.y.P z.R A.v.x j B.| C.D.E.                  ",
+"                    F.G.H.I.4 | 4 t.J.f.K.L.M.                  ",
+"                  N.O.P.Q.R.S.T.U.V.W.X.4 Y.Z.                  ",
+"                  `. +4 =.| | .+++@+#+$+| K %+                  ",
+"                  %+&+| | | I *+=+-+;+>+,+&+x.'+                ",
+"                )+=+X.=.| !+~+{+]+^+,./+(+_+:+<+                ",
+"                [+}+|+1+) 2+3+    4+5+6+7+8+9+0+                ",
+"                $ a+b+c+d+            e+f+0.g+h+                ",
+"                i+A j+k+                l+m+n+o+p+              ",
+"              q+r+s+t+                    u+v+w+x+              ",
+"              y+z+A+                        B+C+2               ",
+"              D+                                E+F+            ",
+"            G+                                    H+            "};

mozilla/widget/src/gtk/mozicon50.xpm

@@ -0,0 +1,63 @@
+/* XPM */
+static char * mozicon50_xpm[] = {
+"50 51 9 1",
+" 	c None",
+".	c #000000",
+"+	c #FF0000",
+"@	c #808000",
+"#	c #800000",
+"$	c #FF6633",
+"%	c #990066",
+"&	c #FF00FF",
+"*	c #222222",
+"                                                  ",
+"                         @                        ",
+"                        $@                        ",
+"                        @@                        ",
+"                        @@$                       ",
+"                       $@*@                       ",
+"                       @@.@                       ",
+"                       @..@                       ",
+"                      $@..@@                      ",
+"                      $@##*@                      ",
+"                      @*#+.@                      ",
+"                      @.++.@$                     ",
+"                     $@.++.@$                     ",
+"                     @*#++#*@                     ",
+"                     @.++++.@                     ",
+"                    $@.++++.@$                    ",
+"                    @*#++++**@                    ",
+"                    @.#++++#.@                    ",
+"                   $@.++####.@                    ",
+"                   @@*+#*##*.@@                   ",
+"*@@@@@@@@@@@@@@@@@@@.#+..*##*#@@@@@@@@@@@@@@@@@@@*",
+" *@@*................+#..*###.................@@* ",
+"  %@@@.#++++++++++++#**#*#++.###++*...#+++#.*@@*  ",
+"    *@@.#+++++++++#.##++#+#+*.#+++#..##++#.@@@%   ",
+"      $@..+++++++.#++++++##++++#++#...++*.@@$     ",
+"       @@*.#+++++.#+++++*.#++++##++#.*...@@       ",
+"        $@@.#+++#*++++#....#+++*#+++...*@$        ",
+"         *@@..++#*++#**.*.*+++#.#++*..@@$         ",
+"           $@*.++******#+++++#+#+++..@@           ",
+"            $@@.##..*$#**#+#*#++++..@@            ",
+"             $@@.#+#***##...#++++.*@@             ",
+"              %@@*++++++++#.#++++.@@              ",
+"               @.#+++++++++.##+++.@$              ",
+"               @.+$$$$$+$$$#*#+++*@@              ",
+"              $@*+$$$$$$$+$#.#+++#.@              ",
+"              @*#+++++++++++.#++++.@              ",
+"              @.#+++++++#*++.##+++.@$             ",
+"             $@.+++++++....#..+#++*@@             ",
+"             @@*+++++#.*@@@...*+++#.@             ",
+"             @.#++++#.@@@ @@..#++++.@             ",
+"             @.++++*.@@$  %@@..+++#.@@            ",
+"            $@.+++..@@*     $@*.#+#**@            ",
+"            @@#+#.*@$%       $@@.##..@            ",
+"            @.##.@@            @@..#.@$           ",
+"           $@.*.@@$             @@**.@$           ",
+"           $@.*@@               %$@@.*@           ",
+"           @.@@$                  *@@.@           ",
+"           @@@$                    %@@@$          ",
+"          $@@%                      %@@@          ",
+"          @@                          $@          ",
+"          $                            *          "};

mozilla/widget/src/gtk/nsAppShell.cpp

@@ -0,0 +1,459 @@
+/* -*- Mode: c++; tab-width: 2; indent-tabs-mode: nil; -*- */
+/*
+ * 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): 
+ */
+
+#include "prmon.h"
+#include "nsCOMPtr.h"
+#include "nsAppShell.h"
+#include "nsIAppShell.h"
+#include "nsIServiceManager.h"
+#include "nsIEventQueueService.h"
+#include "nsICmdLineService.h"
+#include "nsGtkEventHandler.h"
+#include <stdlib.h>
+
+#ifdef MOZ_GLE
+#include <gle/gle.h>
+#endif
+
+#include "nsIWidget.h"
+#include "nsIPref.h"
+
+
+#include "glib.h"
+
+struct OurGdkIOClosure {
+  GdkInputFunction  function;
+  gpointer          data;
+};
+
+static gboolean
+our_gdk_io_invoke(GIOChannel* source, GIOCondition condition, gpointer data)
+{
+  OurGdkIOClosure* ioc = (OurGdkIOClosure*) data;
+  if (ioc) {
+    (*ioc->function)(ioc->data, g_io_channel_unix_get_fd(source),
+                     GDK_INPUT_READ);
+  }
+  return TRUE;
+}
+
+static void
+our_gdk_io_destroy(gpointer data)
+{
+  OurGdkIOClosure* ioc = (OurGdkIOClosure*) data;
+  if (ioc) {
+    g_free(ioc);
+  }
+}
+
+static gint
+our_gdk_input_add (gint              source,
+                   GdkInputFunction  function,
+                   gpointer          data,
+                   gint              priority)
+{
+  guint result;
+  OurGdkIOClosure *closure = g_new (OurGdkIOClosure, 1);
+  GIOChannel *channel;
+
+  closure->function = function;
+  closure->data = data;
+
+  channel = g_io_channel_unix_new (source);
+  result = g_io_add_watch_full (channel, priority, G_IO_IN,
+                                our_gdk_io_invoke,
+                                closure, our_gdk_io_destroy);
+  g_io_channel_unref (channel);
+
+  return result;
+}
+
+
+//-------------------------------------------------------------------------
+//
+// XPCOM CIDs
+//
+//-------------------------------------------------------------------------
+static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
+static NS_DEFINE_CID(kCmdLineServiceCID, NS_COMMANDLINE_SERVICE_CID);
+static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID);
+
+// a linked, ordered list of event queues and their tokens
+class EventQueueToken {
+public:
+  EventQueueToken(nsIEventQueue *aQueue, const gint aToken);
+  virtual ~EventQueueToken();  
+  nsIEventQueue   *mQueue;
+  gint mToken;
+  EventQueueToken *mNext;
+};
+
+EventQueueToken::EventQueueToken(nsIEventQueue *aQueue, const gint aToken) {
+  mQueue = aQueue;
+  NS_IF_ADDREF(mQueue);
+  mToken = aToken;
+  mNext = 0;
+}
+
+EventQueueToken::~EventQueueToken(){
+ NS_IF_RELEASE(mQueue);
+}
+
+class EventQueueTokenQueue {
+public:
+  EventQueueTokenQueue();
+  virtual ~EventQueueTokenQueue();
+  nsresult PushToken(nsIEventQueue *aQueue, gint aToken);
+  PRBool PopToken(nsIEventQueue *aQueue, gint *aToken);
+
+private:
+  EventQueueToken *mHead;
+};
+
+EventQueueTokenQueue::EventQueueTokenQueue() {
+  mHead = 0;
+}
+
+EventQueueTokenQueue::~EventQueueTokenQueue() {
+
+  // if we reach this point with an empty token queue, well, fab. however,
+  // we expect the first event queue to still be active. so we take
+  // special care to unhook that queue (not that failing to do so seems
+  // to hurt anything). more queues than that would be an error.
+//NS_ASSERTION(!mHead || !mHead->mNext, "event queue token list deleted when not empty");
+  // (and skip the assertion for now. we're leaking event queues because they
+  // are referenced by things that leak, so this assertion goes off a lot.)
+  if (mHead) {
+    gdk_input_remove(mHead->mToken);
+    delete mHead;
+    // and leak the rest. it's an error, anyway
+  }
+}
+
+nsresult EventQueueTokenQueue::PushToken(nsIEventQueue *aQueue, gint aToken) {
+  EventQueueToken *newToken = new EventQueueToken(aQueue, aToken);
+  NS_ASSERTION(newToken, "couldn't allocate token queue element");
+  if (!newToken)
+    return NS_ERROR_OUT_OF_MEMORY;
+
+  newToken->mNext = mHead;
+  mHead = newToken;
+  return NS_OK;
+}
+
+PRBool EventQueueTokenQueue::PopToken(nsIEventQueue *aQueue, gint *aToken) {
+  EventQueueToken *token, *lastToken;
+  PRBool          found = PR_FALSE;
+  NS_ASSERTION(mHead, "attempt to retrieve event queue token from empty queue");
+  if (mHead)
+    NS_ASSERTION(mHead->mQueue == aQueue, "retrieving event queue from past head of queue queue");
+
+  token = mHead;
+  lastToken = 0;
+  while (token && token->mQueue != aQueue) {
+    lastToken = token;
+    token = token->mNext;
+  }
+  if (token) {
+    if (lastToken)
+      lastToken->mNext = token->mNext;
+    else
+      mHead = token->mNext;
+    found = PR_TRUE;
+    *aToken = token->mToken;
+    delete token;
+  }
+  return found;
+}
+
+//-------------------------------------------------------------------------
+//
+// nsAppShell constructor
+//
+//-------------------------------------------------------------------------
+nsAppShell::nsAppShell()
+{
+  NS_INIT_REFCNT();
+  mDispatchListener = 0;
+  mEventQueueTokens = new EventQueueTokenQueue();
+  // throw on error would really be civilized here
+  NS_ASSERTION(mEventQueueTokens, "couldn't allocate event queue token queue");
+}
+
+//-------------------------------------------------------------------------
+//
+// nsAppShell destructor
+//
+//-------------------------------------------------------------------------
+nsAppShell::~nsAppShell()
+{
+  delete mEventQueueTokens;
+}
+
+//-------------------------------------------------------------------------
+//
+// nsISupports implementation macro
+//
+//-------------------------------------------------------------------------
+
+NS_IMPL_ISUPPORTS1(nsAppShell, nsIAppShell)
+
+//-------------------------------------------------------------------------
+NS_IMETHODIMP nsAppShell::SetDispatchListener(nsDispatchListener* aDispatchListener)
+{
+  mDispatchListener = aDispatchListener;
+  return NS_OK;
+}
+
+static void event_processor_callback(gpointer data,
+                                     gint source,
+                                     GdkInputCondition condition)
+{
+  nsIEventQueue *eventQueue = (nsIEventQueue*)data;
+  if (eventQueue)
+    eventQueue->ProcessPendingEvents();
+}
+
+#define PREF_NCOLS "browser.ncols"
+#define PREF_INSTALLCMAP "browser.installcmap"
+
+static void
+HandleColormapPrefs( void )
+{
+	PRInt32 ivalue = 0;
+        PRBool bvalue;
+	nsresult rv;
+
+	/* The default is to do nothing. INSTALLCMAP has precedence over
+	   NCOLS. Ignore the fact we can't do this if it fails, as it is
+	   not critical */
+ 
+	NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &rv);
+	if (NS_FAILED(rv) || (!prefs)) 
+		return;
+       
+	/* first check ncols */
+ 
+	rv = prefs->GetIntPref(PREF_NCOLS, &ivalue);
+	if (NS_SUCCEEDED(rv) && ivalue >= 0 && ivalue <= 255 ) {
+		gdk_rgb_set_min_colors( ivalue );
+		return;
+	}
+
+	/* next check installcmap */
+
+	rv = prefs->GetBoolPref(PREF_INSTALLCMAP, &bvalue);
+	if (NS_SUCCEEDED(rv)) {
+		if ( PR_TRUE == bvalue )
+			gdk_rgb_set_min_colors( 255 );	// force it
+		else
+			gdk_rgb_set_min_colors( 0 );
+	}
+}
+	
+//-------------------------------------------------------------------------
+//
+// Create the application shell
+//
+//-------------------------------------------------------------------------
+
+NS_IMETHODIMP nsAppShell::Create(int *bac, char **bav)
+{
+  gchar *home=nsnull;
+  gchar *path=nsnull;
+
+  int argc = bac ? *bac : 0;
+  char **argv = bav;
+#if 1
+  nsresult rv;
+
+  NS_WITH_SERVICE(nsICmdLineService, cmdLineArgs, kCmdLineServiceCID, &rv);
+  if (NS_SUCCEEDED(rv))
+  {
+    rv = cmdLineArgs->GetArgc(&argc);
+    if(NS_FAILED(rv))
+      argc = bac ? *bac : 0;
+
+    rv = cmdLineArgs->GetArgv(&argv);
+    if(NS_FAILED(rv))
+      argv = bav;
+  }
+#endif
+
+  gtk_set_locale ();
+
+  gtk_init (&argc, &argv);
+
+  // It is most convenient for us to intercept our events after
+  // they have been converted to GDK, but before GTK+ gets them
+  gdk_event_handler_set (handle_gdk_event, NULL, NULL);
+
+#ifdef MOZ_GLE
+  gle_init (&argc, &argv);
+#endif
+
+  // delete the cmdLineArgs thing?
+
+  HandleColormapPrefs();
+  gdk_rgb_init();
+
+  home = g_get_home_dir();
+  if ((char*)nsnull != home) {
+    path = g_strdup_printf("%s%c%s", home, G_DIR_SEPARATOR, ".gtkrc");
+    if ((char *)nsnull != path) {
+      gtk_rc_parse(path);
+      g_free(path);
+    }
+  }
+
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+//
+// Spinup - do any preparation necessary for running a message loop
+//
+//-------------------------------------------------------------------------
+NS_IMETHODIMP nsAppShell::Spinup()
+{
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+//
+// Spindown - do any cleanup necessary for finishing a message loop
+//
+//-------------------------------------------------------------------------
+NS_IMETHODIMP nsAppShell::Spindown()
+{
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+//
+// Run
+//
+//-------------------------------------------------------------------------
+NS_IMETHODIMP nsAppShell::Run()
+{
+  NS_ADDREF_THIS();
+  nsresult   rv = NS_OK;
+  nsIEventQueue * EQueue = nsnull;
+
+  // Get the event queue service 
+  NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv);
+  if (NS_FAILED(rv)) {
+    NS_ASSERTION("Could not obtain event queue service", PR_FALSE);
+    return rv;
+  }
+
+#ifdef DEBUG
+  printf("Got the event queue from the service\n");
+#endif /* DEBUG */
+
+  //Get the event queue for the thread.
+  rv = eventQService->GetThreadEventQueue(PR_GetCurrentThread(), &EQueue);
+
+  // If a queue already present use it.
+  if (EQueue)
+    goto done;
+
+  // Create the event queue for the thread
+  rv = eventQService->CreateThreadEventQueue();
+  if (NS_OK != rv) {
+    NS_ASSERTION("Could not create the thread event queue", PR_FALSE);
+    return rv;
+  }
+  //Get the event queue for the thread
+  rv = eventQService->GetThreadEventQueue(PR_GetCurrentThread(), &EQueue);
+  if (NS_OK != rv) {
+    NS_ASSERTION("Could not obtain the thread event queue", PR_FALSE);
+    return rv;
+  }    
+
+
+done:
+
+#ifdef DEBUG
+  printf("Calling gdk_input_add with event queue\n");
+#endif /* DEBUG */
+
+  // (has to be called explicitly for this, the primordial appshell, because
+  // of startup ordering problems.)
+  ListenToEventQueue(EQueue, PR_TRUE);
+
+  gtk_main();
+
+  NS_IF_RELEASE(EQueue);
+  Release();
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+//
+// Exit a message handler loop
+//
+//-------------------------------------------------------------------------
+
+NS_IMETHODIMP nsAppShell::Exit()
+{
+  gtk_main_quit ();
+
+  return NS_OK;
+}
+
+// does nothing. used by xp code with non-gtk expectations.
+// this method will be removed once xp eventloops are working.
+NS_IMETHODIMP nsAppShell::GetNativeEvent(PRBool &aRealEvent, void *& aEvent)
+{
+  aRealEvent = PR_FALSE;
+  aEvent = 0;
+  return NS_OK;
+}
+
+// simply executes one iteration of the event loop. used by xp code with
+// non-gtk expectations.
+// this method will be removed once xp eventloops are working.
+NS_IMETHODIMP nsAppShell::DispatchNativeEvent(PRBool aRealEvent, void *aEvent)
+{
+  g_main_iteration(PR_TRUE);
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsAppShell::ListenToEventQueue(nsIEventQueue *aQueue,
+                                             PRBool aListen)
+{
+  // tell gdk to listen to the event queue or not
+
+  gint queueToken;
+  if (aListen) {
+    queueToken = our_gdk_input_add(aQueue->GetEventQueueSelectFD(),
+                                   event_processor_callback,
+                                   aQueue, G_PRIORITY_DEFAULT_IDLE);
+    mEventQueueTokens->PushToken(aQueue, queueToken);
+  } else {
+    if (mEventQueueTokens->PopToken(aQueue, &queueToken))
+      gdk_input_remove(queueToken);
+  }
+  return NS_OK;
+}
+

mozilla/widget/src/gtk/nsAppShell.h

@@ -0,0 +1,50 @@
+/* -*- Mode: c++; tab-width: 2; indent-tabs-mode: nil; -*- */
+/*
+ * 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): 
+ */
+
+#ifndef nsAppShell_h__
+#define nsAppShell_h__
+
+#include "nsIAppShell.h"
+#include <gtk/gtk.h>
+
+/**
+ * Native GTK+ Application shell wrapper
+ */
+
+class  EventQueueTokenQueue;
+
+class nsAppShell : public nsIAppShell
+{
+public:
+  nsAppShell();
+  virtual ~nsAppShell();
+
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIAPPSHELL
+
+private:
+  nsDispatchListener   *mDispatchListener;
+  EventQueueTokenQueue *mEventQueueTokens;
+};
+
+#endif // nsAppShell_h__
+

mozilla/widget/src/gtk/nsButton.cpp

@@ -0,0 +1,156 @@
+/* -*- Mode: C++; tab-width: 2; 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): 
+ */
+
+#include <gtk/gtk.h>
+
+#include "nsGtkEventHandler.h"
+
+#include "nsButton.h"
+#include "nsString.h"
+
+NS_IMPL_ADDREF_INHERITED(nsButton, nsWidget)
+NS_IMPL_RELEASE_INHERITED(nsButton, nsWidget)
+NS_IMPL_QUERY_INTERFACE2(nsButton, nsIButton, nsIWidget)
+
+//-------------------------------------------------------------------------
+//
+// nsButton constructor
+//
+//-------------------------------------------------------------------------
+nsButton::nsButton() : nsWidget() , nsIButton()
+{
+}
+
+//-------------------------------------------------------------------------
+//
+// Create the native Button widget
+//
+//-------------------------------------------------------------------------
+NS_IMETHODIMP nsButton::CreateNative(GtkObject *parentWindow)
+{
+#ifdef USE_SUPERWIN
+    if (!GDK_IS_SUPERWIN(parentWindow)) {
+    g_print("Damn, brother.  That's not a superwin.\n");
+    return NS_ERROR_FAILURE;
+  }
+  
+  GdkSuperWin *superwin = GDK_SUPERWIN(parentWindow);
+
+  mMozBox = gtk_mozbox_new(superwin->bin_window);
+
+#endif
+
+  mWidget = gtk_button_new_with_label("");
+  gtk_widget_set_name(mWidget, "nsButton");
+
+#ifdef USE_SUPERWIN
+
+  // make sure that we put the scrollbar into the mozbox
+
+  gtk_container_add(GTK_CONTAINER(mMozBox), mWidget);
+
+#endif /* USE_SUPERWIN */
+
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+//
+// nsButton destructor
+//
+//-------------------------------------------------------------------------
+nsButton::~nsButton()
+{
+}
+
+void nsButton::InitCallbacks(char * aName)
+{
+  InstallButtonPressSignal(mWidget);
+  InstallButtonReleaseSignal(mWidget);
+
+  InstallEnterNotifySignal(mWidget);
+  InstallLeaveNotifySignal(mWidget);
+
+  // These are needed so that the events will go to us and not our parent.
+  AddToEventMask(mWidget,
+                 GDK_BUTTON_PRESS_MASK |
+                 GDK_BUTTON_RELEASE_MASK |
+                 GDK_ENTER_NOTIFY_MASK |
+                 GDK_EXPOSURE_MASK |
+                 GDK_FOCUS_CHANGE_MASK |
+                 GDK_KEY_PRESS_MASK |
+                 GDK_KEY_RELEASE_MASK |
+                 GDK_LEAVE_NOTIFY_MASK |
+                 GDK_POINTER_MOTION_MASK);
+}
+
+//-------------------------------------------------------------------------
+//
+// Set this button label
+//
+//-------------------------------------------------------------------------
+NS_IMETHODIMP nsButton::SetLabel(const nsString& aText)
+{
+  NS_ALLOC_STR_BUF(label, aText, 256);
+
+  gtk_label_set(GTK_LABEL(GTK_BIN (mWidget)->child), label);
+
+  NS_FREE_STR_BUF(label);
+  return (NS_OK);
+}
+
+//-------------------------------------------------------------------------
+//
+// Get this button label
+//
+//-------------------------------------------------------------------------
+NS_IMETHODIMP nsButton::GetLabel(nsString& aBuffer)
+{
+  char * text;
+
+  gtk_label_get(GTK_LABEL(GTK_BIN (mWidget)->child), &text);
+  aBuffer.SetLength(0);
+  aBuffer.Append(text);
+
+  return (NS_OK);
+
+}
+
+//-------------------------------------------------------------------------
+//
+// set font for button
+//
+//-------------------------------------------------------------------------
+/* virtual */
+void nsButton::SetFontNative(GdkFont *aFont)
+{
+  GtkStyle *style = gtk_style_copy(GTK_BIN (mWidget)->child->style);
+  // gtk_style_copy ups the ref count of the font
+  gdk_font_unref (style->font);
+  
+  style->font = aFont;
+  gdk_font_ref(style->font);
+  
+  gtk_widget_set_style(GTK_BIN (mWidget)->child, style);
+  
+  gtk_style_unref(style);
+}

mozilla/widget/src/gtk/nsButton.h

@@ -0,0 +1,53 @@
+/* -*- Mode: C++; tab-width: 2; 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): 
+ */
+
+#ifndef nsButton_h__
+#define nsButton_h__
+
+#include "nsWidget.h"
+#include "nsIButton.h"
+
+/**
+ * Native GTK+ button wrapper
+ */
+class nsButton : public nsWidget,
+                 public nsIButton
+{
+
+public:
+  nsButton();
+  virtual ~nsButton();
+
+  NS_DECL_ISUPPORTS_INHERITED
+
+  // nsIButton part
+  NS_IMETHOD     SetLabel(const nsString& aText);
+  NS_IMETHOD     GetLabel(nsString& aBuffer);
+
+  virtual void SetFontNative(GdkFont *aFont);
+
+protected:
+  NS_METHOD CreateNative(GtkObject *parentWindow);
+  virtual void InitCallbacks(char * aName = nsnull);
+};
+
+#endif // nsButton_h__

mozilla/widget/src/gtk/nsCheckButton.cpp

@@ -0,0 +1,250 @@
+/* -*- Mode: C++; tab-width: 2; 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): 
+ */
+
+#include "nsCheckButton.h"
+#include "nsString.h"
+
+NS_IMPL_ADDREF_INHERITED(nsCheckButton, nsWidget)
+NS_IMPL_RELEASE_INHERITED(nsCheckButton, nsWidget)
+NS_IMPL_QUERY_INTERFACE2(nsCheckButton, nsICheckButton, nsIWidget)
+
+//-------------------------------------------------------------------------
+//
+// nsCheckButton constructor
+//
+//-------------------------------------------------------------------------
+nsCheckButton::nsCheckButton() : nsWidget() , nsICheckButton()
+{
+  NS_INIT_REFCNT();
+  mLabel = nsnull;
+  mCheckButton = nsnull;
+  mState = PR_FALSE;
+}
+
+//-------------------------------------------------------------------------
+//
+// nsCheckButton destructor
+//
+//-------------------------------------------------------------------------
+nsCheckButton::~nsCheckButton()
+{
+}
+
+void
+nsCheckButton::OnDestroySignal(GtkWidget* aGtkWidget)
+{
+  if (aGtkWidget == mCheckButton) {
+    mCheckButton = nsnull;
+  }
+  else if (aGtkWidget == mLabel) {
+    mLabel = nsnull;
+  }
+  else {
+    nsWidget::OnDestroySignal(aGtkWidget);
+  }
+}
+
+//-------------------------------------------------------------------------
+//
+// Create the native CheckButton widget
+//
+//-------------------------------------------------------------------------
+NS_METHOD  nsCheckButton::CreateNative(GtkObject *parentWindow)
+{
+  mWidget = gtk_event_box_new();
+  mCheckButton = gtk_check_button_new();
+
+  gtk_container_add(GTK_CONTAINER(mWidget), mCheckButton);
+
+  gtk_widget_show(mCheckButton);
+
+  gtk_widget_set_name(mWidget, "nsCheckButton");
+
+  return NS_OK;
+}
+
+void nsCheckButton::InitCallbacks(char * aName)
+{
+  InstallButtonPressSignal(mCheckButton);
+  InstallButtonReleaseSignal(mCheckButton);
+
+  InstallEnterNotifySignal(mWidget);
+  InstallLeaveNotifySignal(mWidget);
+
+  // These are needed so that the events will go to us and not our parent.
+  AddToEventMask(mWidget,
+                 GDK_BUTTON_PRESS_MASK |
+                 GDK_BUTTON_RELEASE_MASK |
+                 GDK_ENTER_NOTIFY_MASK |
+                 GDK_EXPOSURE_MASK |
+                 GDK_FOCUS_CHANGE_MASK |
+                 GDK_KEY_PRESS_MASK |
+                 GDK_KEY_RELEASE_MASK |
+                 GDK_LEAVE_NOTIFY_MASK |
+                 GDK_POINTER_MOTION_MASK);
+
+  // Add in destroy callback
+  gtk_signal_connect(GTK_OBJECT(mCheckButton),
+                     "destroy",
+                     GTK_SIGNAL_FUNC(DestroySignal),
+                     this);
+
+  InstallSignal((GtkWidget *)mCheckButton,
+                (gchar *)"toggled",
+                GTK_SIGNAL_FUNC(nsCheckButton::ToggledSignal));
+}
+
+//-------------------------------------------------------------------------
+//
+// Set this button label
+//
+//-------------------------------------------------------------------------
+NS_METHOD nsCheckButton::SetState(const PRBool aState)
+{
+  mState = aState;
+
+  if (mWidget && mCheckButton) 
+  {
+    GtkToggleButton * item = GTK_TOGGLE_BUTTON(mCheckButton);
+
+    item->active = (gboolean) mState;
+
+    gtk_widget_queue_draw(GTK_WIDGET(item));
+  }
+
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+//
+// Set this button label
+//
+//-------------------------------------------------------------------------
+NS_METHOD nsCheckButton::GetState(PRBool& aState)
+{
+  aState = mState;
+    
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+//
+// Set this Checkbox label
+//
+//-------------------------------------------------------------------------
+NS_METHOD nsCheckButton::SetLabel(const nsString& aText)
+{
+  if (mWidget) {
+    NS_ALLOC_STR_BUF(label, aText, 256);
+    if (mLabel) {
+      gtk_label_set(GTK_LABEL(mLabel), label);
+    } else {
+      mLabel = gtk_label_new(label);
+      gtk_misc_set_alignment (GTK_MISC (mLabel), 0.0, 0.5);
+      gtk_container_add(GTK_CONTAINER(mCheckButton), mLabel);
+      gtk_widget_show(mLabel);
+      gtk_signal_connect(GTK_OBJECT(mLabel),
+                         "destroy",
+                         GTK_SIGNAL_FUNC(DestroySignal),
+                         this);
+    }
+    NS_FREE_STR_BUF(label);
+  }
+  return NS_OK;
+}
+
+
+//-------------------------------------------------------------------------
+//
+// Get this button label
+//
+//-------------------------------------------------------------------------
+NS_METHOD nsCheckButton::GetLabel(nsString& aBuffer)
+{
+  aBuffer.SetLength(0);
+  if (mWidget) {
+    char * text;
+    if (mLabel) {
+      gtk_label_get(GTK_LABEL(mLabel), &text);
+      aBuffer.Append(text);
+    }
+  }
+  return NS_OK;
+}
+
+/* virtual */ void
+nsCheckButton::OnToggledSignal(const gboolean aState)
+{
+  // Untoggle the sonofabitch
+  if (mWidget && mCheckButton) 
+  {
+    GtkToggleButton * item = GTK_TOGGLE_BUTTON(mCheckButton);
+
+    item->active = !item->active;
+
+    gtk_widget_queue_draw(GTK_WIDGET(item));
+  }
+}
+//////////////////////////////////////////////////////////////////////
+
+/* static */ gint 
+nsCheckButton::ToggledSignal(GtkWidget *      aWidget, 
+                             gpointer         aData)
+{
+  NS_ASSERTION( nsnull != aWidget, "widget is null");
+
+  nsCheckButton * button = (nsCheckButton *) aData;
+
+  NS_ASSERTION( nsnull != button, "instance pointer is null");
+
+  button->OnToggledSignal(GTK_TOGGLE_BUTTON(aWidget)->active);
+
+  return PR_TRUE;
+}
+
+//////////////////////////////////////////////////////////////////////
+// SetBackgroundColor for CheckButton
+/*virtual*/
+void nsCheckButton::SetBackgroundColorNative(GdkColor *aColorNor,
+                                        GdkColor *aColorBri,
+                                        GdkColor *aColorDark)
+{
+  // use same style copy as SetFont
+  GtkStyle *style = gtk_style_copy(GTK_WIDGET (g_list_nth_data(gtk_container_children(GTK_CONTAINER (mWidget)),0))->style);
+  
+  style->bg[GTK_STATE_NORMAL]=*aColorNor;
+  
+  // Mouse over button
+  style->bg[GTK_STATE_PRELIGHT]=*aColorBri;
+
+  // Button is down
+  style->bg[GTK_STATE_ACTIVE]=*aColorDark;
+
+  // other states too? (GTK_STATE_ACTIVE, GTK_STATE_PRELIGHT,
+  //               GTK_STATE_SELECTED, GTK_STATE_INSENSITIVE)
+  gtk_widget_set_style(GTK_WIDGET (g_list_nth_data(gtk_container_children(GTK_CONTAINER (mWidget)),0)), style);
+  // set style for eventbox too
+  gtk_widget_set_style(mWidget, style);
+
+  gtk_style_unref(style);
+}
+

mozilla/widget/src/gtk/nsCheckButton.h

@@ -0,0 +1,75 @@
+/* -*- Mode: C++; tab-width: 2; 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): 
+ */
+
+#ifndef nsCheckButton_h__
+#define nsCheckButton_h__
+
+#include "nsWidget.h"
+#include "nsICheckButton.h"
+
+/**
+ * Native GTK+ Checkbox wrapper
+ */
+
+
+class nsCheckButton : public nsWidget,
+                      public nsICheckButton
+{
+
+public:
+  nsCheckButton();
+  virtual                 ~nsCheckButton();
+
+  NS_DECL_ISUPPORTS_INHERITED
+
+  // nsICheckButton part
+  NS_IMETHOD SetLabel(const nsString &aText);
+  NS_IMETHOD GetLabel(nsString &aBuffer);
+  NS_IMETHOD SetState(const PRBool aState);
+  NS_IMETHOD GetState(PRBool& aState);
+
+  virtual void OnToggledSignal(const gboolean aState);
+
+protected:
+  NS_IMETHOD CreateNative(GtkObject *parentWindow);
+  virtual void InitCallbacks(char * aName = nsnull);
+  virtual void OnDestroySignal(GtkWidget* aGtkWidget);
+
+  // Sets background for checkbutton
+  virtual void SetBackgroundColorNative(GdkColor *aColorNor,
+                                        GdkColor *aColorBri,
+                                        GdkColor *aColorDark);
+
+  GtkWidget *mLabel;
+  GtkWidget *mCheckButton;
+
+  // We need to maintain our own state to be in sync with the
+  // gecko check controlling frame.
+  PRBool     mState;
+
+private:
+
+  static gint ToggledSignal(GtkWidget *      aWidget, 
+                            gpointer         aData);
+};
+
+#endif // nsCheckButton_h__

mozilla/widget/src/gtk/nsClipboard.cpp

@@ -0,0 +1,872 @@
+/* -*- Mode: C++; tab-width: 2; 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): 
+ */
+
+#include "nsClipboard.h"
+
+#include "nsCOMPtr.h"
+
+#include "nsISupportsArray.h"
+#include "nsIClipboardOwner.h"
+#include "nsITransferable.h"   // kTextMime
+#include "nsISupportsPrimitives.h"
+
+#include "nsIWidget.h"
+#include "nsIComponentManager.h"
+#include "nsIServiceManager.h"
+#include "nsWidgetsCID.h"
+#include "nsXPIDLString.h"
+#include "nsPrimitiveHelpers.h"
+
+#include "nsVoidArray.h"
+
+
+// The class statics:
+GtkWidget* nsClipboard::sWidget = 0;
+
+
+#if defined(DEBUG_mcafee) || defined(DEBUG_pavlov)
+#define DEBUG_CLIPBOARD
+#endif
+ 
+enum {
+  TARGET_NONE,
+  TARGET_TEXT_PLAIN,
+  TARGET_TEXT_XIF,
+  TARGET_TEXT_UNICODE,
+  TARGET_TEXT_HTML,
+  TARGET_AOLMAIL,
+  TARGET_IMAGE_PNG,
+  TARGET_IMAGE_JPEG,
+  TARGET_IMAGE_GIF,
+  // compatibility types
+  TARGET_UTF8,
+  TARGET_UNKNOWN,
+  TARGET_LAST
+};
+
+static GdkAtom sSelTypes[TARGET_LAST];
+
+
+//-------------------------------------------------------------------------
+//
+// nsClipboard constructor
+//
+//-------------------------------------------------------------------------
+nsClipboard::nsClipboard() : nsBaseClipboard()
+{
+#ifdef DEBUG_CLIPBOARD
+  g_print("nsClipboard::nsClipboard()\n");
+#endif /* DEBUG_CLIPBOARD */
+
+  //NS_INIT_REFCNT();
+  mIgnoreEmptyNotification = PR_FALSE;
+  mClipboardOwner = nsnull;
+  mTransferable   = nsnull;
+  mSelectionData.data = nsnull;
+  mSelectionData.length = 0;
+
+  // initialize the widget, etc we're binding to
+  Init();
+}
+
+// XXX if GTK's internal code changes this isn't going to work
+// copied from gtk code because it is a static function we can't get to it.
+// need to bug owen taylor about getting this code public.
+
+typedef struct _GtkSelectionTargetList GtkSelectionTargetList;
+
+struct _GtkSelectionTargetList {
+  GdkAtom selection;
+  GtkTargetList *list;
+};
+
+static const char *gtk_selection_handler_key = "gtk-selection-handlers";
+
+void __gtk_selection_target_list_remove (GtkWidget *widget)
+{
+  GtkSelectionTargetList *sellist;
+  GList *tmp_list;
+  GList *lists;
+  lists = (GList*)gtk_object_get_data (GTK_OBJECT (widget), gtk_selection_handler_key);
+  tmp_list = lists;
+  while (tmp_list)
+    {
+      sellist = (GtkSelectionTargetList*)tmp_list->data;
+      gtk_target_list_unref (sellist->list);
+      g_free (sellist);
+      tmp_list = tmp_list->next;
+    }
+  g_list_free (lists);
+  gtk_object_set_data (GTK_OBJECT (widget), gtk_selection_handler_key, NULL);
+}
+
+//-------------------------------------------------------------------------
+//
+// nsClipboard destructor
+//
+//-------------------------------------------------------------------------
+nsClipboard::~nsClipboard()
+{
+#ifdef DEBUG_CLIPBOARD
+  printf("nsClipboard::~nsClipboard()\n");  
+#endif /* DEBUG_CLIPBOARD */
+
+  // Remove all our event handlers:
+  if (sWidget &&
+      (gdk_selection_owner_get(GDK_SELECTION_PRIMARY) == sWidget->window))
+    gtk_selection_remove_all(sWidget);
+
+  // free the selection data, if any
+  if (mSelectionData.data != nsnull)
+    g_free(mSelectionData.data);
+
+  nsClipboard *cb = (nsClipboard*)gtk_object_get_data(GTK_OBJECT(sWidget), "cb");
+  if (cb != nsnull)
+  {
+    NS_RELEASE(cb);
+    gtk_object_remove_data(GTK_OBJECT(sWidget), "cb");
+  }
+
+  if (sWidget)
+  {
+    gtk_widget_destroy(sWidget);
+    sWidget = nsnull;
+  }
+}
+
+
+// 
+// GTK Weirdness!
+// This is here in the hope of being able to call
+//  gtk_selection_add_targets(w, GDK_SELECTION_PRIMARY,
+//                            targets,
+//                            1);
+// instead of
+//   gtk_selection_add_target(sWidget, 
+//                            GDK_SELECTION_PRIMARY,
+//                            GDK_SELECTION_TYPE_STRING,
+//                            GDK_SELECTION_TYPE_STRING);
+// but it turns out that this changes the whole gtk selection model;
+// when calling add_targets copy uses selection_clear_event and the
+// data structure needs to be filled in in a way that we haven't
+// figured out; when using add_target copy uses selection_get and
+// the data structure is already filled in as much as it needs to be.
+// Some gtk internals wizard will need to solve this mystery before
+// we can use add_targets().
+//static GtkTargetEntry targets[] = {
+//  { "strings n stuff", GDK_SELECTION_TYPE_STRING, GDK_SELECTION_TYPE_STRING }
+//};
+//
+
+//-------------------------------------------------------------------------
+void nsClipboard::Init(void)
+{
+#ifdef DEBUG_CLIPBOARD
+  g_print("nsClipboard::Init\n");
+#endif
+
+  sSelTypes[TARGET_NONE]          = GDK_NONE;
+  sSelTypes[TARGET_TEXT_PLAIN]    = gdk_atom_intern(kTextMime, FALSE);
+  sSelTypes[TARGET_TEXT_XIF]      = gdk_atom_intern(kXIFMime, FALSE);
+  sSelTypes[TARGET_TEXT_UNICODE]  = gdk_atom_intern(kUnicodeMime, FALSE);
+  sSelTypes[TARGET_UTF8]          = gdk_atom_intern("UTF8", FALSE);
+  sSelTypes[TARGET_TEXT_HTML]     = gdk_atom_intern(kHTMLMime, FALSE);
+  sSelTypes[TARGET_AOLMAIL]       = gdk_atom_intern(kAOLMailMime, FALSE);
+  sSelTypes[TARGET_IMAGE_PNG]     = gdk_atom_intern(kPNGImageMime, FALSE);
+  sSelTypes[TARGET_IMAGE_JPEG]    = gdk_atom_intern(kJPEGImageMime, FALSE);
+  sSelTypes[TARGET_IMAGE_GIF]     = gdk_atom_intern(kGIFImageMime, FALSE);
+  // compatibility with other apps
+
+
+  // create invisible widget to use for the clipboard
+  sWidget = gtk_invisible_new();
+
+  // add the clipboard pointer to the widget so we can get it.
+  gtk_object_set_data(GTK_OBJECT(sWidget), "cb", this);
+
+  NS_ADDREF_THIS();
+
+  // Handle selection requests if we called gtk_selection_add_target:
+  gtk_signal_connect(GTK_OBJECT(sWidget), "selection_get",
+                     GTK_SIGNAL_FUNC(nsClipboard::SelectionGetCB),
+                     nsnull);
+
+  // When someone else takes the selection away:
+  gtk_signal_connect(GTK_OBJECT(sWidget), "selection_clear_event",
+                     GTK_SIGNAL_FUNC(nsClipboard::SelectionClearCB),
+                     nsnull);
+
+  // Set up the paste handler:
+  gtk_signal_connect(GTK_OBJECT(sWidget), "selection_received",
+                     GTK_SIGNAL_FUNC(nsClipboard::SelectionReceivedCB),
+                     nsnull);
+}
+
+
+//-------------------------------------------------------------------------
+NS_IMETHODIMP nsClipboard::SetNativeClipboardData()
+{
+  mIgnoreEmptyNotification = PR_TRUE;
+
+#ifdef DEBUG_CLIPBOARD
+  printf("  nsClipboard::SetNativeClipboardData()\n");
+#endif /* DEBUG_CLIPBOARD */
+
+  // make sure we have a good transferable
+  if (nsnull == mTransferable) {
+    printf("nsClipboard::SetNativeClipboardData(): no transferable!\n");
+    return NS_ERROR_FAILURE;
+  }
+
+  // are we already the owner?
+  if (gdk_selection_owner_get(GDK_SELECTION_PRIMARY) == sWidget->window)
+  {
+    // if so, clear all the targets
+    __gtk_selection_target_list_remove(sWidget);
+    //    gtk_selection_remove_all(sWidget);
+  }
+
+  // we arn't already the owner, so we will become it
+  gint have_selection = gtk_selection_owner_set(sWidget,
+                                                GDK_SELECTION_PRIMARY,
+                                                GDK_CURRENT_TIME);
+  if (have_selection == 0)
+    return NS_ERROR_FAILURE;
+
+  // get flavor list that includes all flavors that can be written (including ones 
+  // obtained through conversion)
+  nsCOMPtr<nsISupportsArray> flavorList;
+  nsresult errCode = mTransferable->FlavorsTransferableCanExport ( getter_AddRefs(flavorList) );
+  if ( NS_FAILED(errCode) )
+    return NS_ERROR_FAILURE;
+
+  PRUint32 cnt;
+  flavorList->Count(&cnt);
+  for ( PRUint32 i=0; i<cnt; ++i )
+  {
+    nsCOMPtr<nsISupports> genericFlavor;
+    flavorList->GetElementAt ( i, getter_AddRefs(genericFlavor) );
+    nsCOMPtr<nsISupportsString> currentFlavor ( do_QueryInterface(genericFlavor) );
+    if ( currentFlavor ) {
+      nsXPIDLCString flavorStr;
+      currentFlavor->ToString(getter_Copies(flavorStr));
+      gint format = GetFormat(flavorStr);
+
+      // add these types as selection targets
+      RegisterFormat(format);
+    }
+  }
+
+  mIgnoreEmptyNotification = PR_FALSE;
+
+  return NS_OK;
+}
+
+void nsClipboard::AddTarget(GdkAtom aAtom)
+{
+  gtk_selection_add_target(sWidget,
+                           GDK_SELECTION_PRIMARY,
+                           aAtom, aAtom);
+}
+
+gint nsClipboard::GetFormat(const char* aMimeStr)
+{
+  gint type = TARGET_NONE;
+  nsCAutoString mimeStr ( CBufDescriptor(NS_CONST_CAST(char*,aMimeStr), PR_TRUE, PL_strlen(aMimeStr)+1) );
+#ifdef DEBUG_CLIPBOARD
+  g_print("  nsClipboard::GetFormat(%s)\n", aMimeStr);
+#endif
+  if (mimeStr.Equals(kTextMime)) {
+    type = TARGET_TEXT_PLAIN;
+  } else if (mimeStr.Equals("STRING")) {
+    type = TARGET_TEXT_PLAIN;
+  } else if (mimeStr.Equals(kXIFMime)) {
+    type = TARGET_TEXT_XIF;
+  } else if (mimeStr.Equals(kUnicodeMime)) {
+    type = TARGET_TEXT_UNICODE;
+  } else if (mimeStr.Equals(kHTMLMime)) {
+    type = TARGET_TEXT_HTML;
+  } else if (mimeStr.Equals(kAOLMailMime)) {
+    type = TARGET_AOLMAIL;
+  } else if (mimeStr.Equals(kPNGImageMime)) {
+    type = TARGET_IMAGE_PNG;
+  } else if (mimeStr.Equals(kJPEGImageMime)) {
+    type = TARGET_IMAGE_JPEG;
+  } else if (mimeStr.Equals(kGIFImageMime)) {
+    type = TARGET_IMAGE_GIF;
+  }
+
+#ifdef WE_DO_DND
+  else if (mimeStr.Equals(kDropFilesMime)) {
+    format = CF_HDROP;
+  } else {
+    format = ::RegisterClipboardFormat(aMimeStr);
+  }
+#endif
+  return type;
+}
+
+void nsClipboard::RegisterFormat(gint format)
+{
+#ifdef DEBUG_CLIPBOARD
+  g_print("  nsClipboard::RegisterFormat(%s)\n", gdk_atom_name(sSelTypes[format]));
+#endif
+
+  /* when doing the selection_add_target, each case should have the same last parameter
+     which matches the case match */
+  switch(format)
+  {
+  case TARGET_TEXT_PLAIN:
+    // text/plain (default)
+    AddTarget(sSelTypes[format]);
+
+    // STRING (what X uses)
+    AddTarget(GDK_SELECTION_TYPE_STRING);
+    break;
+
+
+  case TARGET_TEXT_XIF:
+    // text/xif (default)
+    AddTarget(sSelTypes[format]);
+    break;
+
+
+  case TARGET_TEXT_UNICODE:
+    // text/unicode (default)
+    AddTarget(sSelTypes[format]);
+
+    // UTF8 (what X uses)
+    AddTarget(sSelTypes[TARGET_UTF8]);
+    break;
+
+
+  case TARGET_TEXT_HTML:
+    // text/html (default)
+    AddTarget(sSelTypes[format]);
+    break;
+
+
+  case TARGET_AOLMAIL:
+    // text/aolmail (default)
+    AddTarget(sSelTypes[format]);
+    break;
+
+
+  case TARGET_IMAGE_PNG:
+    // image/png (default)
+    AddTarget(sSelTypes[format]);
+    break;
+
+
+  case TARGET_IMAGE_JPEG:
+    // image/jpeg (default)
+    AddTarget(sSelTypes[format]);
+    break;
+
+
+  case TARGET_IMAGE_GIF:
+    // image/gif (default)
+    AddTarget(sSelTypes[format]);
+    break;
+
+
+  default:
+    // if we don't match something above, then just add it like its something we know about...
+    AddTarget(sSelTypes[format]);
+  }
+}
+
+PRBool nsClipboard::DoRealConvert(GdkAtom type)
+{
+#ifdef DEBUG_CLIPBOARD
+  g_print("    nsClipboard::DoRealConvert(%li)\n    {\n", type);
+#endif
+  int e = 0;
+  // Set a flag saying that we're blocking waiting for the callback:
+  mBlocking = PR_TRUE;
+
+  //
+  // ask X what kind of data we can get
+  //
+#ifdef DEBUG_CLIPBOARD
+  g_print("     Doing real conversion of atom type '%s'\n", gdk_atom_name(type));
+#endif
+  gtk_selection_convert(sWidget,
+                        GDK_SELECTION_PRIMARY,
+                        type,
+                        GDK_CURRENT_TIME);
+
+  // Now we need to wait until the callback comes in ...
+  // i is in case we get a runaway (yuck).
+#ifdef DEBUG_CLIPBOARD
+  printf("      Waiting for the callback... mBlocking = %d\n", mBlocking);
+#endif /* DEBUG_CLIPBOARD */
+  for (e=0; mBlocking == PR_TRUE && e < 1000; ++e)
+  {
+    gtk_main_iteration_do(PR_TRUE);
+  }
+
+#ifdef DEBUG_CLIPBOARD
+  g_print("    }\n");
+#endif
+
+  if (mSelectionData.length > 0)
+    return PR_TRUE;
+
+  return PR_FALSE;
+}
+
+/* return PR_TRUE if we have converted or PR_FALSE if we havn't and need to keep being called */
+PRBool nsClipboard::DoConvert(gint format)
+{
+#ifdef DEBUG_CLIPBOARD
+  g_print("  nsClipboard::DoConvert(%s)\n", gdk_atom_name(sSelTypes[format]));
+#endif
+
+  /* when doing the selection_add_target, each case should have the same last parameter
+     which matches the case match */
+  PRBool r = PR_FALSE;
+
+  switch(format)
+  {
+  case TARGET_TEXT_PLAIN:
+    r = DoRealConvert(sSelTypes[format]);
+    if (r) return r;
+    r = DoRealConvert(GDK_SELECTION_TYPE_STRING);
+    if (r) return r;
+    break;
+
+  case TARGET_TEXT_XIF:
+    r = DoRealConvert(sSelTypes[format]);
+    if (r) return r;
+    break;
+
+  case TARGET_TEXT_UNICODE:
+    r = DoRealConvert(sSelTypes[format]);
+    if (r) return r;
+    r = DoRealConvert(sSelTypes[TARGET_UTF8]);
+    if (r) return r;
+    break;
+
+  case TARGET_TEXT_HTML:
+    r = DoRealConvert(sSelTypes[format]);
+    if (r) return r;
+    break;
+
+  case TARGET_AOLMAIL:
+    r = DoRealConvert(sSelTypes[format]);
+    if (r) return r;
+    break;
+
+  case TARGET_IMAGE_PNG:
+    r = DoRealConvert(sSelTypes[format]);
+    if (r) return r;
+    break;
+
+  case TARGET_IMAGE_JPEG:
+    r = DoRealConvert(sSelTypes[format]);
+    if (r) return r;
+    break;
+
+  case TARGET_IMAGE_GIF:
+    r = DoRealConvert(sSelTypes[format]);
+    if (r) return r;
+    break;
+
+  default:
+    g_print("DoConvert called with bogus format\n");
+  }
+  return r;
+}
+
+//-------------------------------------------------------------------------
+//
+// The blocking Paste routine
+//
+//-------------------------------------------------------------------------
+NS_IMETHODIMP
+nsClipboard::GetNativeClipboardData(nsITransferable * aTransferable)
+{
+
+#ifdef DEBUG_CLIPBOARD
+  printf("nsClipboard::GetNativeClipboardData()\n");
+#endif /* DEBUG_CLIPBOARD */
+
+  // make sure we have a good transferable
+  if (nsnull == aTransferable) {
+    printf("  GetNativeClipboardData: Transferable is null!\n");
+    return NS_ERROR_FAILURE;
+  }
+
+  // get flavor list that includes all acceptable flavors (including ones obtained through
+  // conversion)
+  nsCOMPtr<nsISupportsArray> flavorList;
+  nsresult errCode = aTransferable->FlavorsTransferableCanImport ( getter_AddRefs(flavorList) );
+  if ( NS_FAILED(errCode) )
+    return NS_ERROR_FAILURE;
+
+  // Walk through flavors and see which flavor matches the one being pasted:
+  PRUint32 cnt;
+  flavorList->Count(&cnt);
+  nsCAutoString foundFlavor;
+  for ( PRUint32 i = 0; i < cnt; ++i ) {
+    nsCOMPtr<nsISupports> genericFlavor;
+    flavorList->GetElementAt ( i, getter_AddRefs(genericFlavor) );
+    nsCOMPtr<nsISupportsString> currentFlavor ( do_QueryInterface(genericFlavor) );
+    if ( currentFlavor ) {
+      nsXPIDLCString flavorStr;
+      currentFlavor->ToString ( getter_Copies(flavorStr) );
+      gint format = GetFormat(flavorStr);
+      if (DoConvert(format)) {
+        foundFlavor = flavorStr;
+        break;
+      }
+    }
+  }
+
+#ifdef DEBUG_CLIPBOARD
+  printf("  Got the callback: '%s', %d\n",
+         mSelectionData.data, mSelectionData.length);
+#endif /* DEBUG_CLIPBOARD */
+
+  // We're back from the callback, no longer blocking:
+  mBlocking = PR_FALSE;
+
+  // 
+  // Now we have data in mSelectionData.data.
+  // We just have to copy it to the transferable.
+  // 
+
+#if 0  
+// pinkerton - we have the flavor already from above, so we don't need
+// to re-derrive it.
+  nsString *name = new nsString((const char*)gdk_atom_name(mSelectionData.type));
+  int format = GetFormat(*name);
+  df->SetString((const char*)gdk_atom_name(sSelTypes[format]));
+#endif
+
+  nsCOMPtr<nsISupports> genericDataWrapper;
+  nsPrimitiveHelpers::CreatePrimitiveForData ( foundFlavor, mSelectionData.data, mSelectionData.length, getter_AddRefs(genericDataWrapper) );
+  aTransferable->SetTransferData(foundFlavor,
+                                 genericDataWrapper,
+                                 mSelectionData.length);
+
+//delete name;
+  
+  // transferable is now copying the data, so we can free it.
+  //  g_free(mSelectionData.data);
+  mSelectionData.data = nsnull;
+  mSelectionData.length = 0;
+
+  return NS_OK;
+}
+
+/**
+ * Called when the data from a paste comes in (recieved from gdk_selection_convert)
+ *
+ * @param  aWidget the widget
+ * @param  aSelectionData gtk selection stuff
+ * @param  aTime time the selection was requested
+ */
+void
+nsClipboard::SelectionReceivedCB (GtkWidget        *aWidget,
+                                  GtkSelectionData *aSelectionData,
+                                  guint             aTime)
+{
+#ifdef DEBUG_CLIPBOARD
+  printf("      nsClipboard::SelectionReceivedCB\n      {\n");
+#endif /* DEBUG_CLIPBOARD */
+  nsClipboard *cb =(nsClipboard *)gtk_object_get_data(GTK_OBJECT(aWidget),
+                                                      "cb");
+  if (!cb)
+  {
+    g_print("no clipboard found.. this is bad.\n");
+    return;
+  }
+  cb->SelectionReceiver(aWidget, aSelectionData);
+#ifdef DEBUG_CLIPBOARD
+  g_print("      }\n");
+#endif
+}
+
+
+/**
+ * local method (called from nsClipboard::SelectionReceivedCB)
+ *
+ * @param  aWidget the widget
+ * @param  aSelectionData gtk selection stuff
+ */
+void
+nsClipboard::SelectionReceiver (GtkWidget *aWidget,
+                                GtkSelectionData *aSD)
+{
+  gint type;
+
+  mBlocking = PR_FALSE;
+
+  if (aSD->length < 0)
+  {
+    printf("        Error retrieving selection: length was %d\n",
+           aSD->length);
+    return;
+  }
+
+  type = TARGET_NONE;
+  for (int i=0; i < TARGET_LAST; i++)
+  {
+    if (sSelTypes[i] == aSD->type)
+    {
+      type = i;
+      break;
+    }
+  }
+
+  switch (type)
+  {
+  case GDK_TARGET_STRING:
+  case TARGET_UTF8:
+  case TARGET_TEXT_PLAIN:
+  case TARGET_TEXT_XIF:
+  case TARGET_TEXT_UNICODE:
+  case TARGET_TEXT_HTML:
+#ifdef DEBUG_CLIPBOARD
+    g_print("        Copying mSelectionData pointer -- ");
+#endif
+    mSelectionData = *aSD;
+    mSelectionData.data = g_new(guchar, aSD->length + 1);
+#ifdef DEBUG_CLIPBOARD
+    g_print("        Data = %s\n    Length = %i\n", aSD->data, aSD->length);
+#endif
+    memcpy(mSelectionData.data,
+           aSD->data,
+           aSD->length);
+    // Null terminate in case anyone cares,
+    // and so we can print the string for debugging:
+    mSelectionData.data[aSD->length] = '\0';
+    mSelectionData.length = aSD->length;
+    return;
+
+  default:
+    mSelectionData = *aSD;
+    mSelectionData.data = g_new(guchar, aSD->length + 1);
+    memcpy(mSelectionData.data,
+           aSD->data,
+           aSD->length);
+    mSelectionData.length = aSD->length;
+    return;
+  }
+}
+
+
+
+/**
+ * Some platforms support deferred notification for putting data on the clipboard
+ * This method forces the data onto the clipboard in its various formats
+ * This may be used if the application going away.
+ *
+ * @result NS_OK if successful.
+ */
+NS_IMETHODIMP nsClipboard::ForceDataToClipboard()
+{
+#ifdef DEBUG_CLIPBOARD
+  printf("  nsClipboard::ForceDataToClipboard()\n");
+#endif /* DEBUG_CLIPBOARD */
+
+  // make sure we have a good transferable
+  if (nsnull == mTransferable) {
+    return NS_ERROR_FAILURE;
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsClipboard::HasDataMatchingFlavors(nsISupportsArray* aFlavorList, PRBool * outResult)
+{
+  *outResult = PR_TRUE;  // say we always do.
+  return NS_OK;
+}
+
+
+/**
+ * This is the callback which is called when another app
+ * requests the selection.
+ *
+ * @param  widget The widget
+ * @param  aSelectionData Selection data
+ * @param  info Value passed in from the callback init
+ * @param  time Time when the selection request came in
+ */
+void nsClipboard::SelectionGetCB(GtkWidget        *widget,
+                                 GtkSelectionData *aSelectionData,
+                                 guint            aInfo,
+                                 guint            aTime)
+{ 
+#ifdef DEBUG_CLIPBOARD
+  printf("nsClipboard::SelectionGetCB\n"); 
+#endif /* DEBUG_CLIPBOARD */
+
+  nsClipboard *cb = (nsClipboard *)gtk_object_get_data(GTK_OBJECT(widget),
+                                                       "cb");
+
+  void     *clipboardData;
+  PRUint32 dataLength;
+  nsresult rv;
+
+  // Make sure we have a transferable:
+  if (!cb->mTransferable) {
+    printf("Clipboard has no transferable!\n");
+    return;
+  }
+
+#ifdef DEBUG_CLIPBOARD
+  g_print("  aInfo == %d -", aInfo);
+#endif
+
+  char* dataFlavor = nsnull;
+
+  // switch aInfo (atom) to our enum
+  int type = (int)aInfo;
+  for (int i=0; i < TARGET_LAST; i++)
+  {
+    if (sSelTypes[i] == aInfo)
+    {
+      type = i;
+      break;
+    }
+  }
+
+  switch(type)
+    {
+    case GDK_TARGET_STRING:
+    case TARGET_TEXT_PLAIN:
+      dataFlavor = kTextMime;
+      break;
+    case TARGET_TEXT_XIF:
+      dataFlavor = kXIFMime;
+      break;
+    case TARGET_TEXT_UNICODE:
+    case TARGET_UTF8:
+      dataFlavor = kUnicodeMime;
+      break;
+    case TARGET_TEXT_HTML:
+      dataFlavor = kHTMLMime;
+      break;
+    case TARGET_AOLMAIL:
+      dataFlavor = kAOLMailMime;
+      break;
+    case TARGET_IMAGE_PNG:
+      dataFlavor = kPNGImageMime;
+      break;
+    case TARGET_IMAGE_JPEG:
+      dataFlavor = kJPEGImageMime;
+      break;
+    case TARGET_IMAGE_GIF:
+      dataFlavor = kGIFImageMime;
+      break;
+    default:
+      {
+        /* handle outside things */
+      }
+    }
+#ifdef DEBUG_CLIPBOARD
+  g_print("- aInfo is for %s\n", gdk_atom_name(aInfo));
+#endif
+
+  // Get data out of transferable.
+  nsCOMPtr<nsISupports> genericDataWrapper;
+  rv = cb->mTransferable->GetTransferData(dataFlavor, 
+                                          getter_AddRefs(genericDataWrapper),
+                                          &dataLength);
+  nsPrimitiveHelpers::CreateDataFromPrimitive ( dataFlavor, genericDataWrapper, &clipboardData, dataLength );
+  if (NS_SUCCEEDED(rv) && clipboardData && dataLength > 0) {
+    size_t size = 1;
+    // find the number of bytes in the data for the below thing
+    //    size_t size = sizeof((void*)((unsigned char)clipboardData[0]));
+    //    g_print("************  *****************      ******************* %i\n", size);
+
+    gtk_selection_data_set(aSelectionData,
+                           aInfo, size*8,
+                           (unsigned char *)clipboardData,
+                           dataLength);
+    nsCRT::free ( NS_REINTERPRET_CAST(char*, clipboardData) );
+  }
+  else
+    printf("Transferable didn't support the data flavor\n");
+}
+
+
+/**
+ * Called when another app requests selection ownership
+ *
+ * @param  aWidget the widget
+ * @param  aEvent the GdkEvent for the selection
+ * @param  aData value passed in from the callback init
+ */
+void nsClipboard::SelectionClearCB(GtkWidget *aWidget,
+                                   GdkEventSelection *aEvent,
+                                   gpointer aData)
+{
+#ifdef DEBUG_CLIPBOARD
+  printf("  nsClipboard::SelectionClearCB\n");
+#endif /* DEBUG_CLIPBOARD */
+
+  nsClipboard *cb = (nsClipboard *)gtk_object_get_data(GTK_OBJECT(aWidget),
+                                                       "cb");
+
+  cb->EmptyClipboard();
+}
+
+
+/**
+ * The routine called when another app asks for the content of the selection
+ *
+ * @param  aWidget the widget
+ * @param  aSelectionData gtk selection stuff
+ * @param  aData value passed in from the callback init
+ */
+void
+nsClipboard::SelectionRequestCB (GtkWidget *aWidget,
+                                 GtkSelectionData *aSelectionData,
+                                 gpointer aData)
+{
+#ifdef DEBUG_CLIPBOARD
+  printf("  nsClipboard::SelectionRequestCB\n");
+#endif /* DEBUG_CLIPBOARD */
+}
+
+/**
+ * ...
+ *
+ * @param  aWidget the widget
+ * @param  aSelectionData gtk selection stuff
+ * @param  aData value passed in from the callback init
+ */
+void
+nsClipboard::SelectionNotifyCB (GtkWidget *aWidget,
+                                GtkSelectionData *aSelectionData,
+                                gpointer aData)
+{
+#ifdef DEBUG_CLIPBOARD
+  printf("  nsClipboard::SelectionNotifyCB\n");
+#endif /* DEBUG_CLIPBOARD */
+}

mozilla/widget/src/gtk/nsClipboard.h

@@ -0,0 +1,132 @@
+/* -*- Mode: C++; tab-width: 2; 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): 
+ */
+
+#ifndef nsClipboard_h__
+#define nsClipboard_h__
+
+#include "nsBaseClipboard.h"
+#include <gtk/gtk.h>
+#include <gtk/gtkinvisible.h>
+
+class nsITransferable;
+class nsIClipboardOwner;
+class nsIWidget;
+
+/**
+ * Native Gtk Clipboard wrapper
+ */
+
+class nsClipboard : public nsBaseClipboard
+{
+
+public:
+  nsClipboard();
+  virtual ~nsClipboard();
+
+  // nsIClipboard  
+  NS_IMETHOD ForceDataToClipboard();
+  NS_IMETHOD HasDataMatchingFlavors(nsISupportsArray* aFlavorList, PRBool * outResult);
+
+  // invisible widget.  also used by dragndrop
+  static GtkWidget *sWidget;
+
+protected:
+  NS_IMETHOD SetNativeClipboardData();
+  NS_IMETHOD GetNativeClipboardData(nsITransferable * aTransferable);
+
+  PRBool  mIgnoreEmptyNotification;
+
+  void AddTarget(GdkAtom aAtom);
+
+  gint GetFormat(const char* aMimeStr);
+  void RegisterFormat(gint format);
+
+
+  PRBool DoRealConvert(GdkAtom type);
+  PRBool DoConvert(gint format);
+
+  void Init(void);
+
+  // Used for communicating pasted data
+  // from the asynchronous X routines back to a blocking paste:
+  GtkSelectionData mSelectionData;
+  PRBool mBlocking;
+
+  void SelectionReceiver(GtkWidget *aWidget,
+                         GtkSelectionData *aSD);
+
+  /**
+   * This is the callback which is called when another app
+   * requests the selection.
+   *
+   * @param  widget The widget
+   * @param  aSelectionData Selection data
+   * @param  info Value passed in from the callback init
+   * @param  time Time when the selection request came in
+   */
+  static void SelectionGetCB(GtkWidget *aWidget, 
+                             GtkSelectionData *aSelectionData,
+                             guint      /*info*/,
+                             guint      /*time*/);
+
+  /**
+   * Called when another app requests selection ownership
+   *
+   * @param  aWidget the widget
+   * @param  aEvent the GdkEvent for the selection
+   * @param  aData value passed in from the callback init
+   */
+  static void SelectionClearCB(GtkWidget *aWidget, 
+                               GdkEventSelection *aEvent,
+                               gpointer aData);
+
+  /**
+   * The routine called when another app asks for the content of the selection
+   *
+   * @param  aWidget the widget
+   * @param  aSelectionData gtk selection stuff
+   * @param  aData value passed in from the callback init
+   */
+  static void SelectionRequestCB(GtkWidget *aWidget,
+                                 GtkSelectionData *aSelectionData,
+                                 gpointer data);
+  
+  /**
+   * Called when the data from a paste comes in
+   *
+   * @param  aWidget the widget
+   * @param  aSelectionData gtk selection stuff
+   * @param  aTime time the selection was requested
+   */
+  static void SelectionReceivedCB(GtkWidget *aWidget,
+                                  GtkSelectionData *aSelectionData,
+                                  guint aTime);
+
+
+  static void SelectionNotifyCB(GtkWidget *aWidget,
+                                GtkSelectionData *aSelectionData,
+                                gpointer aData);
+  
+
+};
+
+#endif // nsClipboard_h__

mozilla/widget/src/gtk/nsComboBox.cpp

@@ -0,0 +1,357 @@
+/* -*- Mode: C++; tab-width: 2; 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): 
+ */
+
+#include <gtk/gtk.h>
+
+#include "nsComboBox.h"
+#include "nsGUIEvent.h"
+#include "nsString.h"
+
+#define DBG 0
+
+#define INITIAL_MAX_ITEMS 128
+#define ITEMS_GROWSIZE    128
+
+NS_IMPL_ADDREF_INHERITED(nsComboBox, nsWidget)
+NS_IMPL_RELEASE_INHERITED(nsComboBox, nsWidget)
+NS_IMPL_QUERY_INTERFACE3(nsComboBox, nsIComboBox, nsIListWidget, nsIWidget)
+
+//-------------------------------------------------------------------------
+//
+// nsComboBox constructor
+//
+//-------------------------------------------------------------------------
+nsComboBox::nsComboBox() : nsWidget(), nsIListWidget(), nsIComboBox()
+{
+  NS_INIT_REFCNT();
+  mMultiSelect = PR_FALSE;
+  mItems = nsnull;
+  mNumItems = 0;
+}
+
+//-------------------------------------------------------------------------
+//
+// nsComboBox:: destructor
+//
+//-------------------------------------------------------------------------
+nsComboBox::~nsComboBox()
+{
+  if (mItems) {
+    for (GList *items = mItems; items; items = (GList*) g_list_next(items)){
+      g_free(items->data);
+    }
+    g_list_free(mItems);
+  }
+  gtk_widget_destroy(mCombo);
+}
+
+void nsComboBox::InitCallbacks(char * aName)
+{
+  InstallButtonPressSignal(mWidget);
+  InstallButtonReleaseSignal(mWidget);
+
+  InstallEnterNotifySignal(mWidget);
+  InstallLeaveNotifySignal(mWidget);
+   
+  // These are needed so that the events will go to us and not our parent.
+  AddToEventMask(mWidget,
+                 GDK_BUTTON_PRESS_MASK |
+                 GDK_BUTTON_RELEASE_MASK |
+                 GDK_ENTER_NOTIFY_MASK |
+                 GDK_EXPOSURE_MASK |
+                 GDK_FOCUS_CHANGE_MASK |
+                 GDK_KEY_PRESS_MASK |
+                 GDK_KEY_RELEASE_MASK |
+                 GDK_LEAVE_NOTIFY_MASK |  
+                 GDK_POINTER_MOTION_MASK);
+}
+
+
+//-------------------------------------------------------------------------
+//
+//  initializer
+//
+//-------------------------------------------------------------------------
+
+NS_METHOD nsComboBox::SetMultipleSelection(PRBool aMultipleSelections)
+{
+  mMultiSelect = aMultipleSelections;
+  return NS_OK;
+}
+
+
+//-------------------------------------------------------------------------
+//
+//  AddItemAt
+//
+//-------------------------------------------------------------------------
+
+NS_METHOD nsComboBox::AddItemAt(nsString &aItem, PRInt32 aPosition)
+{
+  NS_ALLOC_STR_BUF(val, aItem, 256);
+  mItems = g_list_insert( mItems, g_strdup(val), aPosition );
+  mNumItems++;
+  if (mCombo) {
+    gtk_combo_set_popdown_strings( GTK_COMBO( mCombo ), mItems );
+  }
+  NS_FREE_STR_BUF(val);
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+//
+//  Finds an item at a postion
+//
+//-------------------------------------------------------------------------
+PRInt32  nsComboBox::FindItem(nsString &aItem, PRInt32 aStartPos)
+{
+  NS_ALLOC_STR_BUF(val, aItem, 256);
+  int i;
+  PRInt32 inx = -1;
+  GList *items = g_list_nth(mItems, aStartPos);
+  for(i=0; items != NULL; items = (GList *) g_list_next(items), i++ )
+    {
+      if(!strcmp(val, (gchar *) items->data))
+        {
+          inx = i;
+          break;
+        }
+    }
+  NS_FREE_STR_BUF(val);
+  return inx;
+}
+
+//-------------------------------------------------------------------------
+//
+//  CountItems - Get Item Count
+//
+//-------------------------------------------------------------------------
+PRInt32  nsComboBox::GetItemCount()
+{
+  return (PRInt32)mNumItems;
+}
+
+//-------------------------------------------------------------------------
+//
+//  Removes an Item at a specified location
+//
+//-------------------------------------------------------------------------
+PRBool  nsComboBox::RemoveItemAt(PRInt32 aPosition)
+{ 
+  if (aPosition >= 0 && aPosition < mNumItems) {
+
+    g_free(g_list_nth(mItems, aPosition)->data);
+    mItems = g_list_remove_link(mItems, g_list_nth(mItems, aPosition));
+    mNumItems--;
+    if (mCombo) {
+      gtk_combo_set_popdown_strings(GTK_COMBO( mCombo ), mItems);
+    }
+    return PR_TRUE;
+  }
+  else
+    return PR_FALSE;
+}
+
+//-------------------------------------------------------------------------
+//
+//  Removes an Item at a specified location
+//
+//-------------------------------------------------------------------------
+PRBool nsComboBox::GetItemAt(nsString& anItem, PRInt32 aPosition)
+{
+  if (aPosition >= 0 && aPosition < mNumItems) {
+    anItem = (gchar *) g_list_nth(mItems, aPosition)->data;
+    return PR_TRUE;
+  }
+  return PR_FALSE;
+}
+
+//-------------------------------------------------------------------------
+//
+//  Gets the selected of selected item
+//
+//-------------------------------------------------------------------------
+NS_METHOD nsComboBox::GetSelectedItem(nsString& aItem)
+{
+  aItem.Truncate();
+  if (mCombo) {
+    aItem = gtk_entry_get_text (GTK_ENTRY (GTK_COMBO(mCombo)->entry));
+  }
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+//
+//  Gets the list of selected otems
+//
+//-------------------------------------------------------------------------
+PRInt32 nsComboBox::GetSelectedIndex()
+{
+  nsString nsstring;
+  GetSelectedItem(nsstring);
+  return FindItem(nsstring, 0);
+}
+
+//-------------------------------------------------------------------------
+//
+//  SelectItem
+//
+//-------------------------------------------------------------------------
+NS_METHOD nsComboBox::SelectItem(PRInt32 aPosition)
+{
+  GList *pos;
+  if (!mItems)
+    return NS_ERROR_FAILURE;
+
+  pos = g_list_nth(mItems, aPosition);
+  if (!pos)
+    return NS_ERROR_FAILURE;
+
+  if (mCombo) {
+    gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(mCombo)->entry),
+                       (gchar *) pos->data);
+  }
+
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+//
+//  GetSelectedCount
+//
+//-------------------------------------------------------------------------
+PRInt32 nsComboBox::GetSelectedCount()
+{
+  if (!mMultiSelect) {
+    PRInt32 inx = GetSelectedIndex();
+    return (inx == -1? 0 : 1);
+  } else {
+    return 0;
+  }
+}
+
+//-------------------------------------------------------------------------
+//
+//  GetSelectedIndices
+//
+//-------------------------------------------------------------------------
+NS_METHOD nsComboBox::GetSelectedIndices(PRInt32 aIndices[], PRInt32 aSize)
+{
+  // this is an error
+  return NS_ERROR_FAILURE;
+}
+
+//-------------------------------------------------------------------------
+//
+//  Deselect
+//
+//-------------------------------------------------------------------------
+NS_METHOD nsComboBox::Deselect()
+{
+  if (mMultiSelect) {
+    return NS_ERROR_FAILURE;
+  }
+
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+//
+// Create the native GtkCombo widget
+//
+//-------------------------------------------------------------------------
+NS_METHOD  nsComboBox::CreateNative(GtkObject *parentWindow)
+{
+  mWidget = ::gtk_event_box_new();
+
+  ::gtk_widget_set_name(mWidget, "nsComboBox");
+  mCombo = ::gtk_combo_new();
+  gtk_widget_show(mCombo);
+
+  /* make the stuff uneditable */
+  gtk_entry_set_editable(GTK_ENTRY(GTK_COMBO(mCombo)->entry), PR_FALSE);
+
+  gtk_signal_connect(GTK_OBJECT(mCombo),
+                     "destroy",
+                     GTK_SIGNAL_FUNC(DestroySignal),
+                     this);
+  gtk_signal_connect(GTK_OBJECT(GTK_COMBO(mCombo)->popwin),
+                     "unmap",
+                     GTK_SIGNAL_FUNC(UnmapSignal),
+                     this);
+
+  gtk_container_add(GTK_CONTAINER(mWidget), mCombo);
+
+  return NS_OK;
+}
+
+void
+nsComboBox::OnDestroySignal(GtkWidget* aGtkWidget)
+{
+  if (aGtkWidget == mCombo) {
+    mCombo = nsnull;
+  }
+  else {
+    nsWidget::OnDestroySignal(aGtkWidget);
+  }
+}
+
+gint
+nsComboBox::UnmapSignal(GtkWidget* aGtkWidget, nsComboBox* aCombo)
+{
+  if (!aCombo) return PR_FALSE;
+  aCombo->OnUnmapSignal(aGtkWidget);
+  return PR_TRUE;
+}
+
+void
+nsComboBox::OnUnmapSignal(GtkWidget * aWidget)
+{
+  if (!aWidget) return;
+
+  // Generate a NS_CONTROL_CHANGE event and send it to the frame
+  nsGUIEvent event;
+  event.eventStructType = NS_GUI_EVENT;
+  nsPoint point(0,0);
+  InitEvent(event, NS_CONTROL_CHANGE, &point);
+  DispatchWindowEvent(&event);
+}
+
+//-------------------------------------------------------------------------
+//
+// Get handle for style
+//
+//-------------------------------------------------------------------------
+/*virtual*/
+void nsComboBox::SetFontNative(GdkFont *aFont)
+{
+  GtkStyle *style = gtk_style_copy(GTK_WIDGET (g_list_nth_data(gtk_container_children(GTK_CONTAINER (mWidget)),0))->style);
+  // gtk_style_copy ups the ref count of the font
+  gdk_font_unref (style->font);
+  
+  style->font = aFont;
+  gdk_font_ref(style->font);
+  
+  gtk_widget_set_style(GTK_BIN (mWidget)->child, style);
+  
+  gtk_style_unref(style);
+}

mozilla/widget/src/gtk/nsComboBox.h

@@ -0,0 +1,75 @@
+/* -*- Mode: C++; tab-width: 2; 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): 
+ */
+
+#ifndef nsComboBox_h__
+#define nsComboBox_h__
+
+#include "nsWidget.h"
+#include "nsIComboBox.h"
+
+/**
+ * Native GTK+ Listbox wrapper
+ */
+
+class nsComboBox : public nsWidget,
+                   public nsIListWidget,
+                   public nsIComboBox
+{
+
+public:
+  nsComboBox();
+  virtual ~nsComboBox();
+
+  NS_DECL_ISUPPORTS_INHERITED
+
+  // nsIComboBox interface
+  NS_IMETHOD      AddItemAt(nsString &aItem, PRInt32 aPosition);
+  virtual PRInt32 FindItem(nsString &aItem, PRInt32 aStartPos);
+  virtual PRInt32 GetItemCount();
+  virtual PRBool  RemoveItemAt(PRInt32 aPosition);
+  virtual PRBool  GetItemAt(nsString& anItem, PRInt32 aPosition);
+  NS_IMETHOD      GetSelectedItem(nsString& aItem);
+  virtual PRInt32 GetSelectedIndex();
+  NS_IMETHOD      SelectItem(PRInt32 aPosition);
+  NS_IMETHOD      Deselect() ;
+
+  // nsIComboBox interface
+  NS_IMETHOD      SetMultipleSelection(PRBool aMultipleSelections);
+  PRInt32         GetSelectedCount();
+  NS_IMETHOD      GetSelectedIndices(PRInt32 aIndices[], PRInt32 aSize);
+
+  virtual void SetFontNative(GdkFont *aFont);
+
+protected:
+  NS_IMETHOD  CreateNative(GtkObject *parentWindow);
+  virtual void InitCallbacks(char * aName = nsnull);
+  virtual void OnDestroySignal(GtkWidget* aGtkWidget);
+  virtual void OnUnmapSignal(GtkWidget* aWidget);
+  static gint UnmapSignal(GtkWidget* aGtkWidget, nsComboBox* aCombo);
+
+  GtkWidget  *mCombo;  /* workaround for gtkcombo bug */
+  GList *mItems;
+  PRBool  mMultiSelect;
+  int     mNumItems;
+};
+
+#endif // nsComboBox_h__

mozilla/widget/src/gtk/nsContextMenu.cpp

@@ -0,0 +1,744 @@
+/* -*- Mode: C++; tab-width: 2; 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): 
+ */
+
+#include <gtk/gtk.h>
+
+#include "nsContextMenu.h"
+#include "nsIComponentManager.h"
+#include "nsIDOMElement.h"
+#include "nsIDOMNode.h"
+#include "nsIMenuBar.h"
+#include "nsIMenuItem.h"
+#include "nsIMenuListener.h"
+#include "nsString.h"
+#include "nsGtkEventHandler.h"
+#include "nsCOMPtr.h"
+#include "nsWidgetsCID.h"
+
+static NS_DEFINE_CID(kMenuCID,             NS_MENU_CID);
+static NS_DEFINE_CID(kMenuItemCID,         NS_MENUITEM_CID);
+
+static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
+
+//-------------------------------------------------------------------------
+nsresult nsContextMenu::QueryInterface(REFNSIID aIID, void** aInstancePtr)
+{
+  if (NULL == aInstancePtr) {
+    return NS_ERROR_NULL_POINTER;
+  }
+
+  *aInstancePtr = NULL;
+
+  if (aIID.Equals(nsIMenu::GetIID())) {
+    *aInstancePtr = (void*)(nsIMenu*) this;
+    NS_ADDREF_THIS();
+    return NS_OK;
+  }
+  if (aIID.Equals(kISupportsIID)) {
+    *aInstancePtr = (void*)(nsISupports*)(nsIMenu*)this;
+    NS_ADDREF_THIS();
+    return NS_OK;
+  }
+  if (aIID.Equals(nsIMenuListener::GetIID())) {
+    *aInstancePtr = (void*)(nsIMenuListener*)this;
+    NS_ADDREF_THIS();
+    return NS_OK;
+  }
+  return NS_NOINTERFACE;
+}
+
+//-------------------------------------------------------------------------
+NS_IMPL_ADDREF(nsContextMenu)
+NS_IMPL_RELEASE(nsContextMenu)
+
+//-------------------------------------------------------------------------
+//
+// nsContextMenu constructor
+//
+//-------------------------------------------------------------------------
+nsContextMenu::nsContextMenu()
+{
+  NS_INIT_REFCNT();
+  mNumMenuItems  = 0;
+  mMenu          = nsnull;
+  mParent        = nsnull;
+  mListener      = nsnull;
+  mConstructCalled = PR_FALSE;
+  
+  mDOMNode       = nsnull;
+  mWebShell      = nsnull;
+  mDOMElement    = nsnull;
+
+  mAlignment      = "topleft";
+  mAnchorAlignment = "none";
+}
+
+//-------------------------------------------------------------------------
+//
+// nsContextMenu destructor
+//
+//-------------------------------------------------------------------------
+nsContextMenu::~nsContextMenu()
+{
+
+}
+
+
+//-------------------------------------------------------------------------
+//
+// Create the proper widget
+//
+//-------------------------------------------------------------------------
+NS_METHOD nsContextMenu::Create(nsISupports *aParent,
+                                const nsString& anAlignment,
+                                const nsString& anAnchorAlignment)
+{
+  if(aParent)
+  {
+    nsIWidget *parent = nsnull;
+    aParent->QueryInterface(nsIWidget::GetIID(), (void**) &parent);
+    if(parent)
+    {
+      mParent = parent;
+      NS_RELEASE(parent);
+    }
+  }
+
+  mAlignment       = anAlignment;
+  mAnchorAlignment = anAnchorAlignment;
+
+  mMenu = gtk_menu_new();
+
+  gtk_signal_connect (GTK_OBJECT (mMenu), "map",
+                      GTK_SIGNAL_FUNC(menu_map_handler),
+                      this);
+  gtk_signal_connect (GTK_OBJECT (mMenu), "unmap",
+                      GTK_SIGNAL_FUNC(menu_unmap_handler),
+                      this);
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsContextMenu::GetParent(nsISupports*& aParent)
+{
+  aParent = nsnull;
+  if (nsnull != mParent) {
+    return mParent->QueryInterface(kISupportsIID,
+                                   (void**)&aParent);
+  }
+
+  return NS_ERROR_FAILURE;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsContextMenu::AddItem(nsISupports * aItem)
+{
+  if(aItem)
+  {
+    nsIMenuItem * menuitem = nsnull;
+    aItem->QueryInterface(nsIMenuItem::GetIID(),
+                          (void**)&menuitem);
+    if(menuitem)
+    {
+      AddMenuItem(menuitem); // nsMenu now owns this
+      NS_RELEASE(menuitem);
+    }
+    else
+    {
+      nsIMenu * menu = nsnull;
+      aItem->QueryInterface(nsIMenu::GetIID(),
+                            (void**)&menu);
+      if(menu)
+      {
+        AddMenu(menu); // nsMenu now owns this
+        NS_RELEASE(menu);
+      }
+    }
+  }
+
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsContextMenu::AddMenuItem(nsIMenuItem * aMenuItem)
+{
+  GtkWidget *widget;
+  void      *voidData;
+  
+  aMenuItem->GetNativeData(voidData);
+  widget = GTK_WIDGET(voidData);
+
+  gtk_menu_shell_append (GTK_MENU_SHELL (mMenu), widget);
+
+  // XXX add aMenuItem to internal data structor list
+  // Need to be adding an nsISupports *, not nsIMenuItem *
+  nsISupports * supports = nsnull;
+  aMenuItem->QueryInterface(kISupportsIID,
+                            (void**)&supports);
+  {
+    mMenuItemVoidArray.AppendElement(supports);
+    mNumMenuItems++;
+  }
+  
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsContextMenu::AddMenu(nsIMenu * aMenu)
+{
+  nsString Label;
+  GtkWidget *newmenu=nsnull;
+  char *labelStr;
+  void *voidData=NULL;
+  
+  aMenu->GetLabel(Label);
+  labelStr = Label.ToNewCString();
+
+  // Create nsMenuItem
+  nsIMenuItem * pnsMenuItem = nsnull;
+  nsresult rv = nsComponentManager::CreateInstance(kMenuItemCID,
+                                                   nsnull,
+                                                   nsIMenuItem::GetIID(),
+                                                   (void**)&pnsMenuItem);
+  if (NS_OK == rv) {
+    nsISupports * supports = nsnull;
+    QueryInterface(kISupportsIID, (void**) &supports);
+    pnsMenuItem->Create(supports, labelStr, PR_FALSE); //PR_TRUE); 
+    NS_RELEASE(supports);               
+    
+    pnsMenuItem->QueryInterface(kISupportsIID, (void**) &supports);
+    AddItem(supports); // Parent should now own menu item
+    NS_RELEASE(supports);
+          
+    void * menuitem = nsnull;
+    pnsMenuItem->GetNativeData(menuitem);
+  
+    voidData = NULL;
+    aMenu->GetNativeData(&voidData);
+    newmenu = GTK_WIDGET(voidData);
+
+    gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), newmenu);
+  
+    NS_RELEASE(pnsMenuItem);
+  } 
+
+  nsCRT::free(labelStr);
+
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsContextMenu::AddSeparator() 
+{
+  // Create nsMenuItem
+  nsIMenuItem * pnsMenuItem = nsnull;
+  nsresult rv = nsComponentManager::CreateInstance(
+    kMenuItemCID, nsnull, nsIMenuItem::GetIID(), (void**)&pnsMenuItem);
+  if (NS_OK == rv) {
+    nsString tmp = "separator";
+    nsISupports * supports = nsnull;
+    QueryInterface(kISupportsIID, (void**) &supports);
+    pnsMenuItem->Create(supports, tmp, PR_TRUE);  
+    NS_RELEASE(supports);
+    
+    pnsMenuItem->QueryInterface(kISupportsIID, (void**) &supports);
+    AddItem(supports); // Parent should now own menu item
+    NS_RELEASE(supports); 
+          
+    NS_RELEASE(pnsMenuItem);
+  } 
+  
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsContextMenu::GetItemCount(PRUint32 &aCount)
+{
+  // this should be right.. does it need to be +1 ?
+  aCount = g_list_length(GTK_MENU_SHELL(mMenu)->children);
+  //g_print("nsMenu::GetItemCount = %i\n", aCount);
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsContextMenu::GetItemAt(const PRUint32 aCount, nsISupports *& aMenuItem)
+{
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsContextMenu::InsertItemAt(const PRUint32 aCount, nsISupports * aMenuItem)
+{
+  return NS_OK;
+}
+
+
+//-------------------------------------------------------------------------
+NS_METHOD nsContextMenu::InsertSeparator(const PRUint32 aCount)
+{
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsContextMenu::RemoveItem(const PRUint32 aCount)
+{
+#if 0
+  // this may work here better than Removeall(), but i'm not sure how to test this one
+  nsISupports *item = mMenuItemVoidArray[aPos];
+  delete item;
+  mMenuItemVoidArray.RemoveElementAt(aPos);
+#endif
+  /*
+  gtk_menu_shell_remove (GTK_MENU_SHELL (mMenu), item);
+
+  nsCRT::free(labelStr);
+
+  voidData = NULL;
+
+  aMenu->GetNativeData(&voidData);
+  newmenu = GTK_WIDGET(voidData);
+
+  gtk_menu_item_remove_submenu (GTK_MENU_ITEM (item));
+  */
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsContextMenu::RemoveAll()
+{
+  //g_print("nsMenu::RemoveAll()\n");
+#undef DEBUG_pavlov
+#ifdef DEBUG_pavlov
+  // this doesn't work quite right, but this is about all that should really be needed
+  int i=0;
+  nsIMenu *menu = nsnull;
+  nsIMenuItem *menuitem = nsnull;
+  nsISupports *item = nsnull;
+
+  for (i=mMenuItemVoidArray.Count(); i>0; i--)
+  {
+    item = (nsISupports*)mMenuItemVoidArray[i-1];
+
+    if(nsnull != item)
+    {
+      if (NS_OK == item->QueryInterface(nsIMenuItem::GetIID(), (void**)&menuitem))
+      {
+        // we do this twice because we have to do it once for QueryInterface,
+        // then we want to get rid of it.
+        // g_print("remove nsMenuItem\n");
+        NS_RELEASE(menuitem);
+        NS_RELEASE(item);
+        menuitem = nsnull;
+      } else if (NS_OK == item->QueryInterface(nsIMenu::GetIID(), (void**)&menu)) {
+#ifdef NOISY_MENUS
+        g_print("remove nsMenu\n");
+#endif
+        NS_RELEASE(menu);
+        NS_RELEASE(item);
+        menu = nsnull;
+      }
+      // mMenuItemVoidArray.RemoveElementAt(i-1);
+    }
+  }
+  mMenuItemVoidArray.Clear();
+
+  return NS_OK;
+#else
+  for (int i = mMenuItemVoidArray.Count(); i > 0; i--) {
+    if(nsnull != mMenuItemVoidArray[i-1]) {
+      nsIMenuItem * menuitem = nsnull;
+      ((nsISupports*)mMenuItemVoidArray[i-1])->QueryInterface(nsIMenuItem::GetIID(),
+                                                              (void**)&menuitem);
+      if(menuitem) {
+        void *gtkmenuitem = nsnull;
+        menuitem->GetNativeData(gtkmenuitem);
+        if (gtkmenuitem) {
+          gtk_widget_ref(GTK_WIDGET(gtkmenuitem));
+          //gtk_widget_destroy(GTK_WIDGET(gtkmenuitem));
+          g_print("%p, %p\n",
+                  GTK_WIDGET(GTK_CONTAINER(GTK_MENU_SHELL(GTK_MENU(mMenu)))),
+                  GTK_WIDGET(GTK_WIDGET(gtkmenuitem)->parent));
+          gtk_container_remove(GTK_CONTAINER(GTK_MENU_SHELL(GTK_MENU(mMenu))),
+                               GTK_WIDGET(gtkmenuitem));
+        }
+ 
+      } else {
+ 
+        nsIMenu * menu= nsnull;
+        ((nsISupports*)mMenuItemVoidArray[i-1])->QueryInterface(nsIMenu::GetIID(),
+                                                                (void**)&menu);
+        if(menu)
+          {
+            void * gtkmenu = nsnull;
+            menu->GetNativeData(&gtkmenu);
+ 
+            if(gtkmenu){
+              g_print("nsMenu::RemoveAll() trying to remove nsMenu");
+ 
+              //gtk_menu_item_remove_submenu (GTK_MENU_ITEM (item));
+            }
+          }
+ 
+      }
+    }
+  }
+//g_print("end RemoveAll\n");
+  return NS_OK;
+#endif
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsContextMenu::GetNativeData(void ** aData)
+{
+  *aData = (void *)mMenu;
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsContextMenu::AddMenuListener(nsIMenuListener * aMenuListener)
+{
+  mListener = aMenuListener;
+  NS_ADDREF(mListener);
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsContextMenu::RemoveMenuListener(nsIMenuListener * aMenuListener)
+{
+  if (aMenuListener == mListener) {
+    NS_IF_RELEASE(mListener);
+  }
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+// nsIMenuListener interface
+//-------------------------------------------------------------------------
+nsEventStatus nsContextMenu::MenuItemSelected(const nsMenuEvent & aMenuEvent)
+{
+  if (nsnull != mListener) {
+    mListener->MenuSelected(aMenuEvent);
+  }
+  return nsEventStatus_eIgnore;
+}
+
+void menu_popup_position(GtkMenu *menu,
+                         gint *x,
+                         gint *y,
+                         gpointer data)
+{
+  nsContextMenu *cm = (nsContextMenu*)data;
+  *x = cm->GetX();
+  *y = cm->GetY();
+}
+
+nsEventStatus nsContextMenu::MenuSelected(const nsMenuEvent & aMenuEvent)
+{
+  MenuConstruct(aMenuEvent,
+                mParent,
+                mDOMNode,
+                mWebShell);
+
+  //GtkWidget *parent = GTK_WIDGET(mParent->GetNativeData(NS_NATIVE_WIDGET));
+  gtk_menu_popup (GTK_MENU(mMenu),
+                  (GtkWidget*)nsnull, (GtkWidget*)nsnull,
+                  menu_popup_position,
+                  this, 1, GDK_CURRENT_TIME);
+  /*
+  if (nsnull != mListener) {
+    mListener->MenuSelected(aMenuEvent);
+  }
+  */
+  return nsEventStatus_eIgnore;
+}
+
+//-------------------------------------------------------------------------
+nsIMenuItem * nsContextMenu::FindMenuItem(nsIContextMenu * aMenu, PRUint32 aId)
+{
+  return nsnull;
+}
+
+//-------------------------------------------------------------------------
+nsEventStatus nsContextMenu::MenuDeselected(const nsMenuEvent & aMenuEvent)
+{
+  if (nsnull != mListener) {
+    mListener->MenuDeselected(aMenuEvent);
+  }
+  return nsEventStatus_eIgnore;
+}
+
+//-------------------------------------------------------------------------
+nsEventStatus nsContextMenu::MenuConstruct(const nsMenuEvent &aMenuEvent,
+                                           nsIWidget         *aParentWindow, 
+                                           void              *menuNode,
+                                           void              *aWebShell)
+{
+  //g_print("nsMenu::MenuConstruct called \n");
+  if(menuNode){
+    SetDOMNode((nsIDOMNode*)menuNode);
+  }
+  
+  if(!aWebShell){
+    aWebShell = mWebShell;
+  }
+
+  // First open the menu.
+  nsCOMPtr<nsIDOMElement> domElement = do_QueryInterface(mDOMNode);
+  if (domElement)
+    domElement->SetAttribute("open", "true");
+
+   // Begin menuitem inner loop
+    nsCOMPtr<nsIDOMNode> menuitemNode;
+    ((nsIDOMNode*)mDOMNode)->GetFirstChild(getter_AddRefs(menuitemNode));
+ 
+    unsigned short menuIndex = 0;
+
+    while (menuitemNode) {
+      nsCOMPtr<nsIDOMElement> menuitemElement(do_QueryInterface(menuitemNode));
+      if (menuitemElement) {
+        nsString menuitemNodeType;
+        nsString menuitemName;
+        menuitemElement->GetNodeName(menuitemNodeType);
+        if (menuitemNodeType.Equals("menuitem")) {
+          // LoadMenuItem
+          LoadMenuItem(this,
+                       menuitemElement,
+                       menuitemNode,
+                       menuIndex,
+                       (nsIWebShell*)aWebShell);
+        } else if (menuitemNodeType.Equals("separator")) {
+          AddSeparator();
+        } else if (menuitemNodeType.Equals("menu")) {
+          // Load a submenu
+          LoadSubMenu(this, menuitemElement, menuitemNode);
+        }
+      }
+      
+      ++menuIndex;
+      
+      nsCOMPtr<nsIDOMNode> oldmenuitemNode(menuitemNode);
+      oldmenuitemNode->GetNextSibling(getter_AddRefs(menuitemNode));
+    } // end menu item innner loop
+  return nsEventStatus_eIgnore;
+}
+
+//-------------------------------------------------------------------------
+nsEventStatus nsContextMenu::MenuDestruct(const nsMenuEvent & aMenuEvent)
+{
+  // Close the node.
+  nsCOMPtr<nsIDOMElement> domElement = do_QueryInterface(mDOMNode);
+  if (domElement)
+    domElement->RemoveAttribute("open");
+
+  //g_print("nsMenu::MenuDestruct called \n");
+  mConstructCalled = PR_FALSE;
+  RemoveAll();
+  return nsEventStatus_eIgnore;
+}
+
+//----------------------------------------
+void nsContextMenu::LoadMenuItem(nsIMenu        *pParentMenu,
+                                 nsIDOMElement  *menuitemElement,
+                                 nsIDOMNode     *menuitemNode,
+                                 unsigned short  menuitemIndex,
+                                 nsIWebShell    *aWebShell)
+{
+  static const char* NS_STRING_TRUE = "true";
+  nsString disabled;
+  nsString menuitemName;
+  nsString menuitemCmd;
+
+  menuitemElement->GetAttribute(nsAutoString("disabled"), disabled);
+  menuitemElement->GetAttribute(nsAutoString("name"), menuitemName);
+  menuitemElement->GetAttribute(nsAutoString("cmd"), menuitemCmd);
+      
+  // Create nsMenuItem
+  nsIMenuItem * pnsMenuItem = nsnull;
+  nsresult rv = nsComponentManager::CreateInstance(kMenuItemCID,
+                                                   nsnull, 
+                                                   nsIMenuItem::GetIID(), 
+                                                   (void**)&pnsMenuItem);
+  if (NS_OK == rv) {
+    pnsMenuItem->Create(pParentMenu, menuitemName, PR_FALSE);
+                     
+    nsISupports * supports = nsnull;
+    pnsMenuItem->QueryInterface(kISupportsIID, (void**) &supports);
+    pParentMenu->AddItem(supports); // Parent should now own menu item
+    NS_RELEASE(supports);
+            
+    if(disabled == NS_STRING_TRUE) {
+      pnsMenuItem->SetEnabled(PR_FALSE);
+    }
+  
+    // Create MenuDelegate - this is the intermediator inbetween 
+    // the DOM node and the nsIMenuItem
+    // The nsWebShellWindow wacthes for Document changes and then notifies the 
+    // the appropriate nsMenuDelegate object
+    nsCOMPtr<nsIDOMElement> domElement(do_QueryInterface(menuitemNode));
+    if (!domElement) {
+      //return NS_ERROR_FAILURE;
+		return;
+    }
+    
+    nsAutoString cmdAtom("onclick");
+    nsString cmdName;
+
+    domElement->GetAttribute(cmdAtom, cmdName);
+
+    pnsMenuItem->SetCommand(cmdName);
+   // DO NOT use passed in webshell because of messed up windows dynamic loading
+      // code. 
+    pnsMenuItem->SetWebShell(mWebShell);
+    pnsMenuItem->SetDOMElement(domElement);
+
+    NS_RELEASE(pnsMenuItem);
+    
+  } 
+  return;
+}
+
+//----------------------------------------
+void nsContextMenu::LoadSubMenu(nsIMenu         *pParentMenu,
+                                nsIDOMElement   *menuElement,
+                                nsIDOMNode      *menuNode)
+{
+  nsString menuName;
+  menuElement->GetAttribute(nsAutoString("name"), menuName);
+  //printf("Creating Menu [%s] \n", menuName.ToNewCString()); // this leaks
+
+  // Create nsMenu
+  nsIMenu * pnsMenu = nsnull;
+  nsresult rv = nsComponentManager::CreateInstance(kMenuCID,
+                                                   nsnull,
+                                                   nsIMenu::GetIID(),
+                                                   (void**)&pnsMenu);
+  if (NS_OK == rv) {
+    // Call Create
+    nsISupports * supports = nsnull;
+    pParentMenu->QueryInterface(kISupportsIID, (void**) &supports);
+    pnsMenu->Create(supports, menuName);
+    NS_RELEASE(supports); // Balance QI
+
+    // Set nsMenu Name
+    pnsMenu->SetLabel(menuName); 
+
+    supports = nsnull;
+    pnsMenu->QueryInterface(kISupportsIID, (void**) &supports);
+    pParentMenu->AddItem(supports); // parent takes ownership
+    NS_RELEASE(supports);
+
+    pnsMenu->SetWebShell(mWebShell);
+    pnsMenu->SetDOMNode(menuNode);
+
+    /*
+    // Begin menuitem inner loop
+    unsigned short menuIndex = 0;
+
+    nsCOMPtr<nsIDOMNode> menuitemNode;
+    menuNode->GetFirstChild(getter_AddRefs(menuitemNode));
+    while (menuitemNode) {
+      nsCOMPtr<nsIDOMElement> menuitemElement(do_QueryInterface(menuitemNode));
+      if (menuitemElement) {
+        nsString menuitemNodeType;
+        menuitemElement->GetNodeName(menuitemNodeType);
+
+#ifdef DEBUG_saari
+        printf("Type [%s] %d\n", menuitemNodeType.ToNewCString(), menuitemNodeType.Equals("separator"));
+#endif
+
+        if (menuitemNodeType.Equals("menuitem")) {
+          // Load a menuitem
+          LoadMenuItem(pnsMenu, menuitemElement, menuitemNode, menuIndex, mWebShell);
+        } else if (menuitemNodeType.Equals("separator")) {
+          pnsMenu->AddSeparator();
+        } else if (menuitemNodeType.Equals("menu")) {
+          // Add a submenu
+          LoadSubMenu(pnsMenu, menuitemElement, menuitemNode);
+        }
+      }
+	  ++menuIndex;
+      nsCOMPtr<nsIDOMNode> oldmenuitemNode(menuitemNode);
+      oldmenuitemNode->GetNextSibling(getter_AddRefs(menuitemNode));
+    } // end menu item innner loop
+    */
+  }     
+}
+
+//----------------------------------------
+void nsContextMenu::LoadMenuItem(nsIContextMenu *pParentMenu,
+                                 nsIDOMElement  *menuitemElement,
+                                 nsIDOMNode     *menuitemNode,
+                                 unsigned short  menuitemIndex,
+                                 nsIWebShell    *aWebShell)
+{
+
+}
+
+//----------------------------------------
+void nsContextMenu::LoadSubMenu(nsIContextMenu  *pParentMenu,
+                                nsIDOMElement   *menuElement,
+                                nsIDOMNode      *menuNode)
+{
+
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsContextMenu::SetLocation(PRInt32 aX, PRInt32 aY)
+{
+  mX = aX;
+  mY = aY;
+  return NS_OK;
+}
+
+
+// local methods
+gint nsContextMenu::GetX(void)
+{
+  return mX;
+}
+
+gint nsContextMenu::GetY(void)
+{
+  return mY;
+}
+// end silly local methods
+
+//-------------------------------------------------------------------------
+NS_METHOD nsContextMenu::SetDOMNode(nsIDOMNode *aMenuNode)
+{
+  mDOMNode = aMenuNode;
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsContextMenu::SetDOMElement(nsIDOMElement *aMenuElement)
+{
+  mDOMElement = aMenuElement;
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsContextMenu::SetWebShell(nsIWebShell *aWebShell)
+{
+  mWebShell = aWebShell;
+  return NS_OK;
+}

mozilla/widget/src/gtk/nsContextMenu.h

@@ -0,0 +1,139 @@
+/* -*- Mode: C++; tab-width: 2; 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): 
+ */
+
+#ifndef nsContextMenu_h__
+#define nsContextMenu_h__
+
+#include "nsIContextMenu.h"
+#include "nsISupportsArray.h"
+#include "nsVoidArray.h"
+
+#include "nsIDOMElement.h"
+#include "nsIWebShell.h"
+
+class nsIMenuListener;
+
+/**
+ * Native Win32 button wrapper
+ */
+
+class nsContextMenu : public nsIContextMenu, public nsIMenuListener
+{
+
+public:
+  nsContextMenu();
+  virtual ~nsContextMenu();
+
+  NS_DECL_ISUPPORTS
+  
+  //nsIMenuListener interface
+  nsEventStatus MenuItemSelected(const nsMenuEvent & aMenuEvent);
+  nsEventStatus MenuSelected(const nsMenuEvent & aMenuEvent);
+  nsEventStatus MenuDeselected(const nsMenuEvent & aMenuEvent);
+  nsEventStatus MenuConstruct(const nsMenuEvent & aMenuEvent,
+                              nsIWidget         * aParentWindow, 
+                              void              * menubarNode,
+                              void              * aWebShell);
+  nsEventStatus MenuDestruct(const nsMenuEvent & aMenuEvent);
+
+  // nsIMenu Methods
+  NS_IMETHOD Create(nsISupports * aParent,
+                    const nsString& anAlignment,
+                    const nsString& aAnchorAlign);
+  NS_IMETHOD GetParent(nsISupports *&aParent);
+
+  NS_IMETHOD AddItem(nsISupports * aItem);
+
+  NS_IMETHOD AddSeparator();
+  NS_IMETHOD GetItemCount(PRUint32 &aCount);
+  NS_IMETHOD GetItemAt(const PRUint32 aPos, nsISupports *& aMenuItem);
+  NS_IMETHOD InsertItemAt(const PRUint32 aPos, nsISupports * aMenuItem);
+  NS_IMETHOD RemoveItem(const PRUint32 aPos);
+  NS_IMETHOD RemoveAll();
+  NS_IMETHOD GetNativeData(void** aData);
+
+  NS_IMETHOD AddMenuListener(nsIMenuListener * aMenuListener);
+  NS_IMETHOD RemoveMenuListener(nsIMenuListener * aMenuListener);
+
+  //
+  NS_IMETHOD AddMenuItem(nsIMenuItem * aMenuItem);
+  NS_IMETHOD AddMenu(nsIMenu * aMenu);
+  NS_IMETHOD InsertSeparator(const PRUint32 aCount);
+
+  NS_IMETHOD SetDOMNode(nsIDOMNode * menuNode);
+  NS_IMETHOD SetDOMElement(nsIDOMElement * menuElement);
+  NS_IMETHOD SetWebShell(nsIWebShell * aWebShell);
+  NS_IMETHOD SetLocation(PRInt32 aX, PRInt32 aY);
+
+  gint GetX(void);
+  gint GetY(void);
+
+
+protected:
+  nsIMenuBar * GetMenuBar(nsIMenu * aMenu);
+  nsIWidget *  GetParentWidget();
+  char* GetACPString(nsString& aStr);
+
+  void LoadMenuItem(nsIMenu       * pParentMenu,
+                    nsIDOMElement * menuitemElement,
+                    nsIDOMNode    * menuitemNode,
+                    unsigned short  menuitemIndex,
+                    nsIWebShell   * aWebShell);
+  
+  void LoadSubMenu(nsIMenu       * pParentMenu,
+                   nsIDOMElement * menuElement,
+                   nsIDOMNode    * menuNode);
+
+  void LoadMenuItem(nsIContextMenu * pParentMenu,
+                    nsIDOMElement  * menuitemElement,
+                    nsIDOMNode     * menuitemNode,
+                    unsigned short   menuitemIndex,
+                    nsIWebShell    * aWebShell);
+  
+  void LoadSubMenu(nsIContextMenu * pParentMenu,
+                   nsIDOMElement  * menuElement,
+                   nsIDOMNode     * menuNode);
+
+  nsIMenuItem * FindMenuItem(nsIContextMenu * aMenu, PRUint32 aId);
+
+  nsString   mLabel;
+  PRUint32   mNumMenuItems;
+  GtkWidget  *mMenu;
+  
+  nsVoidArray mMenuItemVoidArray;
+
+  nsIWidget  *mParent;
+  nsIMenuListener * mListener;
+  
+  PRBool mConstructCalled;
+  nsIDOMNode    * mDOMNode;
+  nsIWebShell   * mWebShell;
+  nsIDOMElement * mDOMElement;
+
+  nsString        mAlignment;
+  nsString        mAnchorAlignment;
+
+  PRInt32         mX;
+  PRInt32         mY;
+};
+
+#endif // nsContextMenu_h__

mozilla/widget/src/gtk/nsDragService.cpp

@@ -0,0 +1,592 @@
+/* -*- Mode: C++; tab-width: 2; 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): 
+ */
+
+#include "nsDragService.h"
+
+#include "nsITransferable.h"
+#include "nsString.h"
+#include "nsClipboard.h"
+#include "nsIRegion.h"
+#include "nsVoidArray.h"
+#include "nsISupportsPrimitives.h"
+#include "nsPrimitiveHelpers.h"
+#include "nsCOMPtr.h"
+#include "nsXPIDLString.h"
+
+#include "nsWidgetsCID.h"
+
+NS_IMPL_ADDREF_INHERITED(nsDragService, nsBaseDragService)
+NS_IMPL_RELEASE_INHERITED(nsDragService, nsBaseDragService)
+NS_IMPL_QUERY_INTERFACE2(nsDragService, nsIDragService, nsIDragSession)
+
+#define DEBUG_DRAG 1
+
+//-------------------------------------------------------------------------
+//
+// DragService constructor
+//
+//-------------------------------------------------------------------------
+nsDragService::nsDragService()
+{
+  NS_INIT_REFCNT();
+  mWidget = nsnull;
+  mNumFlavors = 0;
+}
+
+//-------------------------------------------------------------------------
+//
+// DragService destructor
+//
+//-------------------------------------------------------------------------
+nsDragService::~nsDragService()
+{
+}
+
+enum {
+  TARGET_STRING,
+  TARGET_ROOTWIN
+};
+
+static GtkTargetEntry target_table[] = {
+  { "STRING",     0, TARGET_STRING },
+  { "text/plain", 0, TARGET_STRING },
+  { "application/x-rootwin-drop", 0, TARGET_ROOTWIN }
+};
+
+static guint n_targets = sizeof(target_table) / sizeof(target_table[0]);
+
+
+NS_IMETHODIMP nsDragService::StartDragSession()
+{
+  printf("nsDragService::StartDragSession()\n");
+  nsBaseDragService::StartDragSession();
+  
+  /*
+  gtk_drag_source_set(mWidget,
+                      GDK_MODIFIER_MASK,
+                      targetlist,
+                      mNumFlavors,
+                      action);
+  */
+  gtk_drag_source_set(mWidget,
+                      GDK_MODIFIER_MASK,
+                      target_table,
+                      n_targets,
+                      mActionType);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDragService::EndDragSession()
+{
+  printf("nsDragService::EndDragSession()\n");
+  nsBaseDragService::EndDragSession();
+  
+  gtk_drag_source_unset(mWidget);
+
+  return NS_OK;
+}
+
+
+//-------------------------------------------------------------------------
+NS_IMETHODIMP nsDragService::InvokeDragSession (nsISupportsArray *aTransferableArray,
+                                                nsIScriptableRegion *aRegion,
+                                                PRUint32 aActionType)
+{
+  mWidget = gtk_get_event_widget(gtk_get_current_event());
+
+  // add the flavors from the transferables. Cache this array for the send data proc
+  GtkTargetList *targetlist = RegisterDragItemsAndFlavors(aTransferableArray);
+
+  switch (aActionType)
+  {
+    case DRAGDROP_ACTION_NONE:
+      mActionType = GDK_ACTION_DEFAULT;
+      break;
+    case DRAGDROP_ACTION_COPY:
+      mActionType = GDK_ACTION_COPY;
+      break;
+    case DRAGDROP_ACTION_MOVE:
+      mActionType = GDK_ACTION_MOVE;
+      break;
+    case DRAGDROP_ACTION_LINK:
+      mActionType = GDK_ACTION_LINK;
+      break;
+  }
+
+  StartDragSession();
+
+  // XXX 3rd param ???    &                last param should be a real event...
+  gtk_drag_begin(mWidget, targetlist, mActionType, 1, gtk_get_current_event());
+
+
+
+
+#if 0  
+  // we have to synthesize the native event because we may be called from JavaScript
+  // through XPConnect. In that case, we only have a DOM event and no way to
+  // get to the native event. As a consequence, we just always fake it.
+  Point globalMouseLoc;
+  ::GetMouse(&globalMouseLoc);
+  ::LocalToGlobal(&globalMouseLoc);
+  WindowPtr theWindow = nsnull;
+  if ( ::FindWindow(globalMouseLoc, &theWindow) != inContent ) {
+    // debugging sanity check
+    #ifdef NS_DEBUG
+    DebugStr("\pAbout to start drag, but FindWindow() != inContent; g");
+    #endif
+  }  
+  EventRecord theEvent;
+  theEvent.what = mouseDown;
+  theEvent.message = reinterpret_cast<UInt32>(theWindow);
+  theEvent.when = 0;
+  theEvent.where = globalMouseLoc;
+  theEvent.modifiers = 0;
+  
+  RgnHandle theDragRgn = ::NewRgn();
+  BuildDragRegion ( aDragRgn, globalMouseLoc, theDragRgn );
+
+  // register drag send proc which will call us back when asked for the actual
+  // flavor data (instead of placing it all into the drag manager)
+  ::SetDragSendProc ( theDragRef, sDragSendDataUPP, this );
+
+  // start the drag. Be careful, mDragRef will be invalid AFTER this call (it is
+  // reset by the dragTrackingHandler).
+  ::TrackDrag ( theDragRef, &theEvent, theDragRgn );
+
+  // clean up after ourselves 
+  ::DisposeRgn ( theDragRgn );
+  result = ::DisposeDrag ( theDragRef );
+  NS_ASSERTION ( result == noErr, "Error disposing drag" );
+  mDragRef = 0L;
+  mDataItems = nsnull;
+
+  return NS_OK; 
+
+#endif
+
+
+
+
+  return NS_OK;
+}
+
+
+
+
+GtkTargetList *
+nsDragService::RegisterDragItemsAndFlavors(nsISupportsArray *inArray)
+{
+  unsigned int numDragItems = 0;
+  inArray->Count(&numDragItems);
+
+  GtkTargetList *targetlist;
+  targetlist = gtk_target_list_new(nsnull, numDragItems);
+
+  for (unsigned int i = 0; i < numDragItems; ++i)
+  {
+    nsCOMPtr<nsISupports> genericItem;
+    inArray->GetElementAt (i, getter_AddRefs(genericItem));
+    nsCOMPtr<nsITransferable> currItem (do_QueryInterface(genericItem));
+    if (currItem)
+    {
+      nsCOMPtr<nsISupportsArray> flavorList;
+      if (NS_SUCCEEDED(currItem->FlavorsTransferableCanExport(getter_AddRefs(flavorList))))
+      {
+        flavorList->Count (&mNumFlavors);
+        for (PRUint32 flavorIndex = 0; flavorIndex < mNumFlavors; ++flavorIndex)
+        {
+          nsCOMPtr<nsISupports> genericWrapper;
+          flavorList->GetElementAt ( flavorIndex, getter_AddRefs(genericWrapper) );
+          nsCOMPtr<nsISupportsString> currentFlavor ( do_QueryInterface(genericWrapper) );
+          if ( currentFlavor )
+          {
+            nsXPIDLCString flavorStr;
+            currentFlavor->ToString ( getter_Copies(flavorStr) );
+
+            // register native flavors
+            GdkAtom atom = gdk_atom_intern(flavorStr, PR_TRUE);
+            gtk_target_list_add(targetlist, atom, 1, atom);
+          }
+
+        } // foreach flavor in item              
+      } // if valid flavor list
+    } // if item is a transferable
+  } // foreach drag item
+
+  return targetlist;
+}
+
+
+/* return PR_TRUE if we have converted or PR_FALSE if we havn't and need to keep being called */
+PRBool nsDragService::DoConvert(GdkAtom type)
+{
+#ifdef DEBUG_DRAG
+  g_print("    nsDragService::DoRealConvert(%li)\n    {\n", type);
+#endif
+  int e = 0;
+  // Set a flag saying that we're blocking waiting for the callback:
+  mBlocking = PR_TRUE;
+
+  //
+  // ask X what kind of data we can get
+  //
+#ifdef DEBUG_DRAG
+  g_print("     Doing real conversion of atom type '%s'\n", gdk_atom_name(type));
+#endif
+  gtk_selection_convert(mWidget,
+                        GDK_SELECTION_PRIMARY,
+                        type,
+                        GDK_CURRENT_TIME);
+
+  // Now we need to wait until the callback comes in ...
+  // i is in case we get a runaway (yuck).
+#ifdef DEBUG_DRAG
+  printf("      Waiting for the callback... mBlocking = %d\n", mBlocking);
+#endif /* DEBUG_CLIPBOARD */
+  for (e=0; mBlocking == PR_TRUE && e < 1000; ++e)
+  {
+    gtk_main_iteration_do(PR_TRUE);
+  }
+
+#ifdef DEBUG_DRAG
+  g_print("    }\n");
+#endif
+
+  if (mSelectionData.length > 0)
+    return PR_TRUE;
+
+  return PR_FALSE;
+}
+
+#if 0
+
+/**
+ * Called when the data from a drag comes in (recieved from gdk_selection_convert)
+ *
+ * @param  aWidget the widget
+ * @param  aSelectionData gtk selection stuff
+ * @param  aTime time the selection was requested
+ */
+void
+nsDragService::SelectionReceivedCB (GtkWidget        *aWidget,
+                                    GdkDragContext   *aContext,
+                                    gint              aX,
+                                    gint              aY,
+                                    GtkSelectionData *aSelectionData,
+                                    guint             aInfo,
+                                    guint             aTime)
+{
+#ifdef DEBUG_DRAG
+  printf("      nsDragService::SelectionReceivedCB\n      {\n");
+#endif
+  nsDragService *ds =(nsDragSession *)gtk_object_get_data(GTK_OBJECT(aWidget),
+                                                        "ds");
+  if (!cb)
+  {
+    g_print("no dragservice found.. this is bad.\n");
+    return;
+  }
+
+
+  ds->SelectionReceiver(aWidget, aSelectionData);
+#ifdef DEBUG_DRAG
+  g_print("      }\n");
+#endif
+}
+
+
+/**
+ * local method (called from nsClipboard::SelectionReceivedCB)
+ *
+ * @param  aWidget the widget
+ * @param  aSelectionData gtk selection stuff
+ */
+void
+nsDragService::SelectionReceiver (GtkWidget *aWidget,
+                                GtkSelectionData *aSD)
+{
+  gint type;
+
+  mBlocking = PR_FALSE;
+
+  if (aSD->length < 0)
+  {
+    printf("        Error retrieving selection: length was %d\n",
+           aSD->length);
+    return;
+  }
+
+
+  switch (type)
+  {
+  case GDK_TARGET_STRING:
+  case TARGET_COMPOUND_TEXT:
+  case TARGET_TEXT_PLAIN:
+  case TARGET_TEXT_XIF:
+  case TARGET_TEXT_UNICODE:
+  case TARGET_TEXT_HTML:
+#ifdef DEBUG_CLIPBOARD
+    g_print("        Copying mSelectionData pointer -- ");
+#endif
+    mSelectionData = *aSD;
+    mSelectionData.data = g_new(guchar, aSD->length + 1);
+#ifdef DEBUG_CLIPBOARD
+    g_print("        Data = %s\n    Length = %i\n", aSD->data, aSD->length);
+#endif
+    memcpy(mSelectionData.data,
+           aSD->data,
+           aSD->length);
+    // Null terminate in case anyone cares,
+    // and so we can print the string for debugging:
+    mSelectionData.data[aSD->length] = '\0';
+    mSelectionData.length = aSD->length;
+    return;
+
+  default:
+    mSelectionData = *aSD;
+    mSelectionData.data = g_new(guchar, aSD->length + 1);
+    memcpy(mSelectionData.data,
+           aSD->data,
+           aSD->length);
+    mSelectionData.length = aSD->length;
+    return;
+  }
+}
+
+#endif
+
+//-------------------------------------------------------------------------
+NS_IMETHODIMP nsDragService::GetNumDropItems (PRUint32 * aNumItems)
+{
+  *aNumItems = 0;
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_IMETHODIMP nsDragService::GetData (nsITransferable * aTransferable, PRUint32 anItem)
+{
+
+#ifdef DEBUG_DRAG
+  printf("nsClipboard::GetNativeClipboardData()\n");
+#endif /* DEBUG_CLIPBOARD */
+
+  // make sure we have a good transferable
+  if (!aTransferable) {
+    printf("  GetData: Transferable is null!\n");
+    return NS_ERROR_FAILURE;
+  }
+
+  // get flavor list that includes all acceptable flavors (including ones obtained through
+  // conversion)
+  nsCOMPtr<nsISupportsArray> flavorList;
+  nsresult errCode = aTransferable->FlavorsTransferableCanImport ( getter_AddRefs(flavorList) );
+  if ( NS_FAILED(errCode) )
+    return NS_ERROR_FAILURE;
+
+  // Walk through flavors and see which flavor matches the one being pasted:
+  PRUint32 cnt;
+  flavorList->Count(&cnt);
+  nsCAutoString foundFlavor;
+  for ( PRUint32 i = 0; i < cnt; ++i ) {
+    nsCOMPtr<nsISupports> genericFlavor;
+    flavorList->GetElementAt ( i, getter_AddRefs(genericFlavor) );
+    nsCOMPtr<nsISupportsString> currentFlavor (do_QueryInterface(genericFlavor));
+    if ( currentFlavor ) {
+      nsXPIDLCString flavorStr;
+      currentFlavor->ToString(getter_Copies(flavorStr));
+      if (DoConvert(gdk_atom_intern(flavorStr, 1))) {
+        foundFlavor = flavorStr;
+        break;
+      }
+    }
+  }
+
+#ifdef DEBUG_CLIPBOARD
+  printf("  Got the callback: '%s', %d\n",
+         mSelectionData.data, mSelectionData.length);
+#endif /* DEBUG_CLIPBOARD */
+
+  // We're back from the callback, no longer blocking:
+  mBlocking = PR_FALSE;
+
+  // 
+  // Now we have data in mSelectionData.data.
+  // We just have to copy it to the transferable.
+  // 
+
+#if 0  
+// pinkerton - we have the flavor already from above, so we don't need
+// to re-derrive it.
+  nsString *name = new nsString((const char*)gdk_atom_name(mSelectionData.type));
+  int format = GetFormat(*name);
+  df->SetString((const char*)gdk_atom_name(sSelTypes[format]));
+#endif
+
+  nsCOMPtr<nsISupports> genericDataWrapper;
+  nsPrimitiveHelpers::CreatePrimitiveForData ( foundFlavor, mSelectionData.data, mSelectionData.length, getter_AddRefs(genericDataWrapper) );
+  aTransferable->SetTransferData(foundFlavor,
+                                 genericDataWrapper,
+                                 mSelectionData.length);
+
+  //delete name;
+  
+  // transferable is now copying the data, so we can free it.
+  //  g_free(mSelectionData.data);
+  mSelectionData.data = nsnull;
+  mSelectionData.length = 0;
+
+  gtk_drag_source_unset(mWidget);
+
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_IMETHODIMP nsDragService::IsDataFlavorSupported(const char *aDataFlavor, PRBool *_retval)
+{
+  return NS_ERROR_FAILURE;
+}
+
+//-------------------------------------------------------------------------
+NS_IMETHODIMP nsDragService::GetCurrentSession (nsIDragSession **aSession)
+{
+  return NS_ERROR_FAILURE;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+//-------------------------------------------------------------------------
+void  
+nsDragService::DragLeave (GtkWidget	       *widget,
+			                    GdkDragContext   *context,
+			                    guint             time)
+{
+  g_print("leave\n");
+  //gHaveDrag = PR_FALSE;
+}
+
+//-------------------------------------------------------------------------
+PRBool
+nsDragService::DragMotion(GtkWidget	       *widget,
+			                    GdkDragContext   *context,
+			                    gint              x,
+			                    gint              y,
+			                    guint             time)
+{
+  g_print("drag motion\n");
+  GtkWidget *source_widget;
+
+#if 0
+  if (!gHaveDrag) {
+      gHaveDrag = PR_TRUE;
+  }
+#endif
+
+  source_widget = gtk_drag_get_source_widget (context);
+  g_print("motion, source %s\n", source_widget ?
+	          gtk_type_name (GTK_OBJECT (source_widget)->klass->type) :
+	          "unknown");
+
+  gdk_drag_status (context, context->suggested_action, time);
+  
+  return PR_TRUE;
+}
+
+//-------------------------------------------------------------------------
+PRBool
+nsDragService::DragDrop(GtkWidget	       *widget,
+			                  GdkDragContext   *context,
+			                  gint              x,
+			                  gint              y,
+			                  guint             time)
+{
+  g_print("drop\n");
+  //gHaveDrag = PR_FALSE;
+
+  if (context->targets){
+    gtk_drag_get_data (widget, context, 
+			                 GPOINTER_TO_INT (context->targets->data), 
+			                 time);
+    return PR_TRUE;
+  }
+  
+  return PR_FALSE;
+}
+
+//-------------------------------------------------------------------------
+void  
+nsDragService::DragDataReceived  (GtkWidget          *widget,
+			                            GdkDragContext     *context,
+			                            gint                x,
+			                            gint                y,
+			                            GtkSelectionData   *data,
+			                            guint               info,
+			                            guint               time)
+{
+  if ((data->length >= 0) && (data->format == 8)) {
+    g_print ("Received \"%s\"\n", (gchar *)data->data);
+    gtk_drag_finish (context, PR_TRUE, PR_FALSE, time);
+    return;
+  }
+  
+  gtk_drag_finish (context, PR_FALSE, PR_FALSE, time);
+}
+  
+//-------------------------------------------------------------------------
+void  
+nsDragService::DragDataGet(GtkWidget          *widget,
+		                       GdkDragContext     *context,
+		                       GtkSelectionData   *selection_data,
+		                       guint               info,
+		                       guint               time,
+		                       gpointer            data)
+{
+  gtk_selection_data_set (selection_data,
+                          selection_data->target,
+                          8, (guchar *)"I'm Data!", 9);
+}
+
+//-------------------------------------------------------------------------
+void  
+nsDragService::DragDataDelete(GtkWidget          *widget,
+			                        GdkDragContext     *context,
+			                        gpointer            data)
+{
+  g_print ("Delete the data!\n");
+}

mozilla/widget/src/gtk/nsDragService.h

@@ -0,0 +1,109 @@
+/* -*- Mode: C++; tab-width: 2; 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): 
+ */
+
+#ifndef nsDragService_h__
+#define nsDragService_h__
+
+#include "nsBaseDragService.h"
+#include <gtk/gtk.h>
+
+
+/**
+ * Native GTK DragService wrapper
+ */
+
+class nsDragService : public nsBaseDragService
+{
+
+public:
+  nsDragService();
+  virtual ~nsDragService();
+  
+  NS_DECL_ISUPPORTS_INHERITED
+
+  // nsIDragService
+  NS_IMETHOD InvokeDragSession (nsISupportsArray * anArrayTransferables,
+                                nsIScriptableRegion * aRegion, PRUint32 aActionType);
+  NS_IMETHOD GetCurrentSession (nsIDragSession ** aSession);
+
+  // nsIDragSession
+  NS_IMETHOD GetData (nsITransferable * aTransferable, PRUint32 anItem);
+  NS_IMETHOD GetNumDropItems (PRUint32 * aNumItems);
+  NS_IMETHOD IsDataFlavorSupported(const char *aDataFlavor, PRBool *_retval);
+
+  NS_IMETHOD StartDragSession();
+  NS_IMETHOD EndDragSession();
+    
+
+  GtkTargetList *RegisterDragItemsAndFlavors(nsISupportsArray *inArray);
+
+protected:
+
+  PRBool DoConvert(GdkAtom type);
+
+  static PRBool gHaveDrag;
+
+  static void DragLeave(GtkWidget      *widget,
+                        GdkDragContext *context,
+                        guint           time);
+
+  static PRBool DragMotion(GtkWidget      *widget,
+                           GdkDragContext *context,
+                           gint            x,
+                           gint            y,
+                           guint           time);
+
+  static PRBool DragDrop(GtkWidget   *widget,
+                         GdkDragContext *context,
+                         gint            x,
+                         gint            y,
+                         guint            time);
+
+  static void DragDataReceived(GtkWidget        *widget,
+			                         GdkDragContext   *context,
+			                         gint              x,
+			                         gint              y,
+			                         GtkSelectionData *data,
+			                         guint             info,
+			                         guint             time);
+
+  static void DragDataGet(GtkWidget          *widget,
+		                      GdkDragContext     *context,
+		                      GtkSelectionData   *selection_data,
+		                      guint               info,
+		                      guint               time,
+		                      gpointer            data);
+
+  static void  DragDataDelete(GtkWidget          *widget,
+			                        GdkDragContext     *context,
+			                        gpointer            data);
+
+private:
+  GdkDragAction mActionType;
+  PRUint32 mNumFlavors;
+  GtkWidget *mWidget;
+  GdkDragContext *mDragContext;
+  GtkSelectionData mSelectionData;
+  PRBool mBlocking;
+};
+
+#endif // nsDragService_h__

mozilla/widget/src/gtk/nsFilePicker.cpp

@@ -0,0 +1,304 @@
+/* -*- 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 the Mozilla browser.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ * 
+ * Contributor(s): 
+ *   Stuart Parmenter <pavlov@netscape.com>
+ */
+
+#include "nsCOMPtr.h"
+#include "nsIComponentManager.h"
+#include "nsFilePicker.h"
+
+NS_IMPL_ISUPPORTS1(nsFilePicker, nsIFilePicker)
+
+//-------------------------------------------------------------------------
+//
+// nsFilePicker constructor
+//
+//-------------------------------------------------------------------------
+nsFilePicker::nsFilePicker()
+{
+  NS_INIT_REFCNT();
+  mWidget = nsnull;
+  mDisplayDirectory = nsnull;
+  mFilterMenu = nsnull;
+  mOptionMenu = nsnull;
+  mNumberOfFilters = 0;
+}
+
+//-------------------------------------------------------------------------
+//
+// nsFilePicker destructor
+//
+//-------------------------------------------------------------------------
+nsFilePicker::~nsFilePicker()
+{
+  if (mFilterMenu)
+  {
+    GtkWidget *menu_item;
+    GList *list = g_list_first(GTK_MENU_SHELL(mFilterMenu)->children);
+
+    for (;list; list = list->next)
+    {
+      menu_item = GTK_WIDGET(list->data);
+      gchar *data = (gchar*)gtk_object_get_data(GTK_OBJECT(menu_item), "filters");
+      
+      if (data)
+        nsCRT::free(data);
+    }
+  }
+
+  gtk_widget_destroy(mWidget);
+}
+
+
+static void file_ok_clicked(GtkWidget *w, PRBool *ret)
+{
+  g_print("user hit ok\n");
+  *ret = PR_TRUE;
+  gtk_main_quit();
+}
+
+static void file_cancel_clicked(GtkWidget *w, PRBool *ret)
+{
+  g_print("user hit cancel\n");
+  *ret = PR_FALSE;
+  gtk_main_quit();
+}
+
+static void filter_item_activated(GtkWidget *w, gpointer data)
+{
+  //  nsFilePicker *f = (nsFilePicker*)data;
+  gchar *foo = (gchar*)gtk_object_get_data(GTK_OBJECT(w), "filters");
+  g_print("filter_item_activated(): %s\n", foo);
+}
+
+//-------------------------------------------------------------------------
+//
+// Show - Display the file dialog
+//
+//-------------------------------------------------------------------------
+NS_IMETHODIMP nsFilePicker::Show(PRInt16 *retval)
+{
+  NS_ENSURE_ARG_POINTER(retval);
+
+  PRBool ret;
+  if (mWidget) {
+    // make things shorter
+    GtkFileSelection *fs = GTK_FILE_SELECTION(mWidget);
+
+    if (mNumberOfFilters != 0)
+    {
+      gtk_option_menu_set_menu(GTK_OPTION_MENU(mOptionMenu), mFilterMenu);
+    }
+    else
+      gtk_widget_hide(mOptionMenu);
+
+#if 0
+    if (mDisplayDirectory)
+      gtk_file_selection_complete(fs, "/");
+#endif
+
+    //    gtk_window_set_modal(GTK_WINDOW(mWidget), PR_TRUE);
+    gtk_widget_show(mWidget);
+
+    // handle close, destroy, etc on the dialog
+    gtk_signal_connect(GTK_OBJECT(fs->ok_button), "clicked",
+                       GTK_SIGNAL_FUNC(file_ok_clicked),
+                       &ret);
+    gtk_signal_connect(GTK_OBJECT(fs->cancel_button), "clicked",
+                       GTK_SIGNAL_FUNC(file_cancel_clicked),
+                       &ret);
+    // start new loop.   ret is set in the above callbacks.
+    gtk_main();
+  }
+  else {
+    ret = PR_FALSE;
+  }
+
+  if (ret)
+    *retval = returnOK;
+  else
+    *retval = returnCancel;
+
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+//
+// Set the list of filters
+//
+//-------------------------------------------------------------------------
+
+NS_IMETHODIMP nsFilePicker::SetFilterList(PRInt32 aNumberOfFilters,
+                                          const PRUnichar **aTitles,
+                                          const PRUnichar **filters)
+{
+#if 0
+  GtkWidget *menu_item;
+
+  mNumberOfFilters  = aNumberOfFilters;
+  mTitles           = aTitles;
+  mFilters          = aFilters;
+
+  mFilterMenu = gtk_menu_new();
+
+  for(unsigned int i=0; i < aNumberOfFilters; i++)
+  {
+    // we need *.{htm, html, xul, etc}
+    char *foo = aTitles[i].ToNewCString();
+    char *filters = aFilters[i].ToNewCString();
+    printf("%20s %s\n", foo, filters);
+
+    menu_item = gtk_menu_item_new_with_label(nsAutoCString(aTitles[i]));
+
+    gtk_object_set_data(GTK_OBJECT(menu_item), "filters", filters);
+
+    gtk_signal_connect(GTK_OBJECT(menu_item),
+                       "activate",
+                       GTK_SIGNAL_FUNC(filter_item_activated),
+                       this);
+
+    gtk_menu_append(GTK_MENU(mFilterMenu), menu_item);
+    gtk_widget_show(menu_item);
+
+    nsCRT::free(foo);
+  }
+#endif
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsFilePicker::GetFile(nsIFileSpec **aFile)
+{
+  NS_ENSURE_ARG_POINTER(*aFile);
+  if (mWidget) {
+    gchar *fn = gtk_file_selection_get_filename(GTK_FILE_SELECTION(mWidget));
+
+    nsCOMPtr<nsIFileSpec> fileSpec(do_CreateInstance("component://netscape/filespec"));
+    
+    NS_ENSURE_TRUE(fileSpec, NS_ERROR_FAILURE);
+
+    fileSpec->SetNativePath(fn);
+
+    *aFile = fileSpec;
+    NS_ADDREF(*aFile);
+  }
+  return NS_OK;
+}
+
+
+//-------------------------------------------------------------------------
+//-------------------------------------------------------------------------
+NS_IMETHODIMP nsFilePicker::GetSelectedFilter(PRInt32 *aType)
+{
+  NS_ENSURE_ARG_POINTER(aType);
+  *aType = mSelectedType;
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+//
+// Get the file + path
+//
+//-------------------------------------------------------------------------
+NS_IMETHODIMP nsFilePicker::SetDefaultString(const PRUnichar *aString)
+{
+  if (mWidget) {
+    gtk_file_selection_set_filename(GTK_FILE_SELECTION(mWidget),
+                                    (const gchar*)nsAutoCString(aString));
+  }
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsFilePicker::GetDefaultString(PRUnichar **aString)
+{
+  return NS_ERROR_FAILURE;
+}
+
+//-------------------------------------------------------------------------
+//
+// Set the display directory
+//
+//-------------------------------------------------------------------------
+NS_IMETHODIMP nsFilePicker::SetDisplayDirectory(nsIFileSpec *aDirectory)
+{
+  mDisplayDirectory = aDirectory;
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+//
+// Get the display directory
+//
+//-------------------------------------------------------------------------
+NS_IMETHODIMP nsFilePicker::GetDisplayDirectory(nsIFileSpec **aDirectory)
+{
+  *aDirectory = mDisplayDirectory;
+  NS_IF_ADDREF(*aDirectory);
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsFilePicker::Create(nsIDOMWindow *aParent,
+                                   const PRUnichar *aTitle,
+                                   PRInt16 aMode)
+{
+  return nsBaseFilePicker::Create(aParent, aTitle, aMode);
+}
+
+//-------------------------------------------------------------------------
+NS_IMETHODIMP nsFilePicker::CreateNative(nsIWidget *aParent,
+                                         const PRUnichar *aTitle,
+                                         PRInt16 aMode)
+{
+  mWidget = gtk_file_selection_new((const gchar *)nsAutoCString(aTitle));
+  gtk_signal_connect(GTK_OBJECT(mWidget),
+                     "destroy",
+                     GTK_SIGNAL_FUNC(DestroySignal),
+                     this);
+
+  gtk_button_box_set_layout(GTK_BUTTON_BOX(GTK_FILE_SELECTION(mWidget)->button_area), GTK_BUTTONBOX_SPREAD);
+
+  mOptionMenu = gtk_option_menu_new();
+
+  gtk_box_pack_start(GTK_BOX(GTK_FILE_SELECTION(mWidget)->main_vbox), mOptionMenu, PR_FALSE, PR_FALSE, 0);
+  gtk_widget_show(mOptionMenu);
+
+  // Hide the file column for the folder case.
+  if (aMode == nsIFilePicker::modeGetFolder) {
+    gtk_widget_hide((GTK_FILE_SELECTION(mWidget)->file_list)->parent);
+  }
+
+  return NS_OK;
+}
+
+gint
+nsFilePicker::DestroySignal(GtkWidget *  aGtkWidget,
+                            nsFilePicker* aWidget)
+{
+  aWidget->OnDestroySignal(aGtkWidget);
+  return TRUE;
+}
+
+void
+nsFilePicker::OnDestroySignal(GtkWidget* aGtkWidget)
+{
+  if (aGtkWidget == mWidget) {
+    mWidget = nsnull;
+  }
+}

mozilla/widget/src/gtk/nsFilePicker.h

@@ -0,0 +1,68 @@
+/* -*- 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 the Mozilla browser.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ * 
+ * Contributor(s): 
+ *   Stuart Parmenter <pavlov@netscape.com>
+ */
+
+#ifndef nsFilePicker_h__
+#define nsFilePicker_h__
+
+#include "nsBaseFilePicker.h"
+
+#include <gtk/gtk.h>
+
+/**
+ * Native GTK FileSelector wrapper
+ */
+
+class nsFilePicker : public nsBaseFilePicker
+{
+public:
+  nsFilePicker(); 
+  virtual ~nsFilePicker();
+
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIFILEPICKER
+
+protected:
+  /* method from nsBaseFilePicker */
+  NS_IMETHOD CreateNative(nsIWidget *aParent,
+                          const PRUnichar *aTitle,
+                          PRInt16 aMode);
+
+  static gint DestroySignal(GtkWidget *  aGtkWidget,
+                            nsFilePicker* aWidget);
+
+  virtual void OnDestroySignal(GtkWidget* aGtkWidget);
+
+  GtkWidget		*mWidget;
+  GtkWidget   *mOptionMenu;
+  GtkWidget   *mFilterMenu;
+
+
+  PRUint32		    mNumberOfFilters;  
+  const nsString*	mTitles;
+  const nsString*	mFilters;
+  nsString		  mDefault;
+  nsIFileSpec  *mDisplayDirectory;
+  PRInt16       mSelectedType;
+};
+
+#endif // nsFilePicker_h__

mozilla/widget/src/gtk/nsFileWidget.cpp

@@ -0,0 +1,322 @@
+/* -*- Mode: c++; tab-width: 2; indent-tabs-mode: nil; -*- */
+/*
+ * 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): 
+ */
+
+#include "nsFileWidget.h"
+#include "nsIToolkit.h"
+
+NS_IMPL_ISUPPORTS1(nsFileWidget, nsIFileWidget)
+
+//-------------------------------------------------------------------------
+//
+// nsFileWidget constructor
+//
+//-------------------------------------------------------------------------
+nsFileWidget::nsFileWidget() : nsIFileWidget()
+{
+  NS_INIT_REFCNT();
+  mWidget = nsnull;
+  mDisplayDirectory = nsnull;
+  mFilterMenu = nsnull;
+  mOptionMenu = nsnull;
+  mNumberOfFilters = 0;
+}
+
+//-------------------------------------------------------------------------
+//
+// nsFileWidget destructor
+//
+//-------------------------------------------------------------------------
+nsFileWidget::~nsFileWidget()
+{
+  if (mFilterMenu)
+  {
+    GtkWidget *menu_item;
+    GList *list = g_list_first(GTK_MENU_SHELL(mFilterMenu)->children);
+
+    for (;list; list = list->next)
+    {
+      menu_item = GTK_WIDGET(list->data);
+      gchar *data = (gchar*)gtk_object_get_data(GTK_OBJECT(menu_item), "filters");
+      
+      if (data)
+        nsCRT::free(data);
+    }
+  }
+
+  gtk_widget_destroy(mWidget);
+}
+
+
+static void file_ok_clicked(GtkWidget *w, PRBool *ret)
+{
+  g_print("user hit ok\n");
+  *ret = PR_TRUE;
+  gtk_main_quit();
+}
+
+static void file_cancel_clicked(GtkWidget *w, PRBool *ret)
+{
+  g_print("user hit cancel\n");
+  *ret = PR_FALSE;
+  gtk_main_quit();
+}
+
+static void filter_item_activated(GtkWidget *w, gpointer data)
+{
+  //  nsFileWidget *f = (nsFileWidget*)data;
+  gchar *foo = (gchar*)gtk_object_get_data(GTK_OBJECT(w), "filters");
+  g_print("filter_item_activated(): %s\n", foo);
+}
+
+//-------------------------------------------------------------------------
+//
+// Show - Display the file dialog
+//
+//-------------------------------------------------------------------------
+PRBool nsFileWidget::Show()
+{
+  PRBool ret;
+  if (mWidget) {
+    // make things shorter
+    GtkFileSelection *fs = GTK_FILE_SELECTION(mWidget);
+
+    if (mNumberOfFilters != 0)
+    {
+      gtk_option_menu_set_menu(GTK_OPTION_MENU(mOptionMenu), mFilterMenu);
+    }
+    else
+      gtk_widget_hide(mOptionMenu);
+
+#if 0
+    if (mDisplayDirectory)
+      gtk_file_selection_complete(fs, "/");
+#endif
+
+    //    gtk_window_set_modal(GTK_WINDOW(mWidget), PR_TRUE);
+    gtk_widget_show(mWidget);
+
+    // handle close, destroy, etc on the dialog
+    gtk_signal_connect(GTK_OBJECT(fs->ok_button), "clicked",
+                       GTK_SIGNAL_FUNC(file_ok_clicked),
+                       &ret);
+    gtk_signal_connect(GTK_OBJECT(fs->cancel_button), "clicked",
+                       GTK_SIGNAL_FUNC(file_cancel_clicked),
+                       &ret);
+    // start new loop.   ret is set in the above callbacks.
+    gtk_main();
+  }
+  else {
+    ret = PR_FALSE;
+  }
+  return ret;
+}
+
+//-------------------------------------------------------------------------
+//
+// Set the list of filters
+//
+//-------------------------------------------------------------------------
+
+NS_IMETHODIMP nsFileWidget::SetFilterList(PRUint32 aNumberOfFilters,
+                                          const nsString aTitles[],
+                                          const nsString aFilters[])
+{
+  GtkWidget *menu_item;
+
+  mNumberOfFilters  = aNumberOfFilters;
+  mTitles           = aTitles;
+  mFilters          = aFilters;
+
+  mFilterMenu = gtk_menu_new();
+
+  for(unsigned int i=0; i < aNumberOfFilters; i++)
+  {
+    // we need *.{htm, html, xul, etc}
+    char *foo = aTitles[i].ToNewCString();
+    char *filters = aFilters[i].ToNewCString();
+    printf("%20s %s\n", foo, filters);
+
+    menu_item = gtk_menu_item_new_with_label(nsAutoCString(aTitles[i]));
+
+    gtk_object_set_data(GTK_OBJECT(menu_item), "filters", filters);
+
+    gtk_signal_connect(GTK_OBJECT(menu_item),
+                       "activate",
+                       GTK_SIGNAL_FUNC(filter_item_activated),
+                       this);
+
+    gtk_menu_append(GTK_MENU(mFilterMenu), menu_item);
+    gtk_widget_show(menu_item);
+
+    nsCRT::free(foo);
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP  nsFileWidget::GetFile(nsFileSpec& aFile)
+{
+  if (mWidget) {
+    gchar *fn = gtk_file_selection_get_filename(GTK_FILE_SELECTION(mWidget));
+    aFile = fn; // Put the filename into the nsFileSpec instance.
+  }
+  return NS_OK;
+}
+
+
+//-------------------------------------------------------------------------
+//-------------------------------------------------------------------------
+NS_IMETHODIMP  nsFileWidget::GetSelectedType(PRInt16& theType)
+{
+  theType = mSelectedType;
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+//
+// Get the file + path
+//
+//-------------------------------------------------------------------------
+NS_IMETHODIMP  nsFileWidget::SetDefaultString(const nsString& aString)
+{
+  if (mWidget) {
+    gtk_file_selection_set_filename(GTK_FILE_SELECTION(mWidget),
+                                    (const gchar*)nsAutoCString(aString));
+  }
+  return NS_OK;
+}
+
+
+//-------------------------------------------------------------------------
+//
+// Set the display directory
+//
+//-------------------------------------------------------------------------
+NS_IMETHODIMP  nsFileWidget::SetDisplayDirectory(const nsFileSpec& aDirectory)
+{
+  mDisplayDirectory = aDirectory;
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+//
+// Get the display directory
+//
+//-------------------------------------------------------------------------
+NS_IMETHODIMP  nsFileWidget::GetDisplayDirectory(nsFileSpec& aDirectory)
+{
+  aDirectory = mDisplayDirectory;
+  return NS_OK;
+}
+
+
+//-------------------------------------------------------------------------
+NS_IMETHODIMP nsFileWidget::Create(nsIWidget *aParent,
+                                   const nsString& aTitle,
+                                   nsFileDlgMode aMode,
+                                   nsIDeviceContext *aContext,
+                                   nsIAppShell *aAppShell,
+                                   nsIToolkit *aToolkit,
+                                   void *aInitData)
+{
+  mMode = aMode;
+  mTitle.SetLength(0);
+  mTitle.Append(aTitle);
+
+  mWidget = gtk_file_selection_new((const gchar *)nsAutoCString(aTitle));
+  gtk_signal_connect(GTK_OBJECT(mWidget),
+                     "destroy",
+                     GTK_SIGNAL_FUNC(DestroySignal),
+                     this);
+
+  gtk_button_box_set_layout(GTK_BUTTON_BOX(GTK_FILE_SELECTION(mWidget)->button_area), GTK_BUTTONBOX_SPREAD);
+
+  mOptionMenu = gtk_option_menu_new();
+
+  gtk_box_pack_start(GTK_BOX(GTK_FILE_SELECTION(mWidget)->main_vbox), mOptionMenu, PR_FALSE, PR_FALSE, 0);
+  gtk_widget_show(mOptionMenu);
+
+
+  // Hide the file column for the folder case.
+  if (aMode == eMode_getfolder) {
+    gtk_widget_hide((GTK_FILE_SELECTION(mWidget)->file_list)->parent);
+  }
+
+  return NS_OK;
+}
+
+gint
+nsFileWidget::DestroySignal(GtkWidget *  aGtkWidget,
+                            nsFileWidget* aWidget)
+{
+  aWidget->OnDestroySignal(aGtkWidget);
+  return TRUE;
+}
+
+void
+nsFileWidget::OnDestroySignal(GtkWidget* aGtkWidget)
+{
+  if (aGtkWidget == mWidget) {
+    mWidget = nsnull;
+  }
+}
+
+nsFileDlgResults nsFileWidget::GetFile(nsIWidget *aParent,
+                                       const nsString &promptString,
+                                       nsFileSpec &theFileSpec)
+{
+	Create(aParent, promptString, eMode_load, nsnull, nsnull);
+	if (Show() == PR_TRUE)
+	{
+		GetFile(theFileSpec);
+		return nsFileDlgResults_OK;
+	}
+
+  return nsFileDlgResults_Cancel;
+}
+
+nsFileDlgResults nsFileWidget::GetFolder(nsIWidget *aParent,
+                                         const nsString &promptString,
+                                         nsFileSpec &theFileSpec)
+{
+	Create(aParent, promptString, eMode_getfolder, nsnull, nsnull);
+	if (Show() == PR_TRUE)
+	{
+		GetFile(theFileSpec);
+		return nsFileDlgResults_OK;
+	}
+
+  return nsFileDlgResults_Cancel;
+}
+
+nsFileDlgResults nsFileWidget::PutFile(nsIWidget *aParent,
+                                       const nsString &promptString,
+                                       nsFileSpec &theFileSpec)
+{ 
+	Create(aParent, promptString, eMode_save, nsnull, nsnull);
+	if (Show() == PR_TRUE)
+	{
+		GetFile(theFileSpec);
+		return nsFileDlgResults_OK;
+	}
+  return nsFileDlgResults_Cancel; 
+}

mozilla/widget/src/gtk/nsFileWidget.h

@@ -0,0 +1,102 @@
+/* -*- Mode: c++; tab-width: 2; indent-tabs-mode: nil; -*- */
+/*
+ * 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): 
+ */
+
+#ifndef nsFileWidget_h__
+#define nsFileWidget_h__
+
+#include "nsIWidget.h"
+#include "nsIFileWidget.h"
+
+#include <gtk/gtk.h>
+
+class nsIToolkit;
+
+/**
+ * Native GTK FileSelector wrapper
+ */
+
+class nsFileWidget : public nsIFileWidget 
+{
+public:
+  nsFileWidget(); 
+  virtual ~nsFileWidget();
+
+  NS_DECL_ISUPPORTS
+
+  // nsIWidget interface
+  
+  NS_IMETHOD		Create(nsIWidget *aParent,
+                       const nsString& aTitle,
+                       nsFileDlgMode aMode,
+                       nsIDeviceContext *aContext = nsnull,
+                       nsIAppShell *aAppShell = nsnull,
+                       nsIToolkit *aToolkit = nsnull,
+                       void *aInitData = nsnull);
+
+  // nsIFileWidget part
+  virtual PRBool	Show();
+  NS_IMETHOD GetFile(nsFileSpec& aFile);
+  NS_IMETHOD SetDefaultString(const nsString& aFile);
+  NS_IMETHOD SetFilterList(PRUint32 aNumberOfFilters,
+                           const nsString aTitles[],
+                           const nsString aFilters[]);
+
+  NS_IMETHOD GetDisplayDirectory(nsFileSpec& aDirectory);
+  NS_IMETHOD SetDisplayDirectory(const nsFileSpec& aDirectory);
+  
+  virtual nsFileDlgResults GetFile(nsIWidget *aParent,
+                                   const nsString &promptString,
+                                   nsFileSpec &theFileSpec);
+  
+  virtual nsFileDlgResults GetFolder(nsIWidget *aParent,
+                                     const nsString &promptString,
+                                     nsFileSpec &theFileSpec);
+
+  virtual nsFileDlgResults PutFile(nsIWidget *aParent,
+                                   const nsString &promptString,
+                                   nsFileSpec &theFileSpec);
+
+
+  NS_IMETHOD            GetSelectedType(PRInt16& theType);
+
+protected:
+  static gint DestroySignal(GtkWidget *  aGtkWidget,
+                            nsFileWidget* aWidget);
+
+  virtual void OnDestroySignal(GtkWidget* aGtkWidget);
+
+  GtkWidget		*mWidget;
+  nsString		mTitle;
+  GtkWidget   *mOptionMenu;
+  GtkWidget   *mFilterMenu;
+
+
+  nsFileDlgMode   mMode;
+  PRUint32		    mNumberOfFilters;  
+  const nsString*	mTitles;
+  const nsString*	mFilters;
+  nsString		mDefault;
+  nsFileSpec    mDisplayDirectory;
+  PRInt16       mSelectedType;
+};
+
+#endif // nsFileWidget_h__

mozilla/widget/src/gtk/nsFontRetrieverService.cpp

@@ -0,0 +1,395 @@
+/* -*- Mode: C++; tab-width: 2; 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): 
+ */
+
+#include "nsFontRetrieverService.h"
+#include "nsIWidget.h"
+#include <ctype.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkx.h>
+#include "X11/Xlib.h"
+#include "X11/Xutil.h"
+ 
+#include "nsFont.h"
+#include "nsVoidArray.h"
+#include "nsFontSizeIterator.h"
+ 
+NS_IMPL_ISUPPORTS2(nsFontRetrieverService, nsIFontRetrieverService, nsIFontNameIterator)
+
+//----------------------------------------------------------
+nsFontRetrieverService::nsFontRetrieverService()
+{
+  NS_INIT_REFCNT();
+
+  mFontList     = nsnull;
+  mSizeIter     = nsnull;
+  mNameIterInx  = 0;
+
+}
+
+//----------------------------------------------------------
+nsFontRetrieverService::~nsFontRetrieverService()
+{
+  if (nsnull != mFontList) {
+    for (PRInt32 i=0;i<mFontList->Count();i++) {
+      FontInfo * font = (FontInfo *)mFontList->ElementAt(i);
+      if (font->mSizes) {
+        delete font->mSizes;
+      }
+      delete font;
+    }
+    delete mFontList;
+  }
+  NS_IF_RELEASE(mSizeIter);
+}
+
+
+
+//----------------------------------------------------------
+//-- nsIFontRetrieverService
+//----------------------------------------------------------
+NS_IMETHODIMP nsFontRetrieverService::CreateFontNameIterator( nsIFontNameIterator** aIterator )
+{
+  if (nsnull == aIterator) {
+    return NS_ERROR_FAILURE;
+  }
+
+  if (nsnull == mFontList) {
+    LoadFontList();
+  }
+  *aIterator = this;
+  NS_ADDREF_THIS();
+  return NS_OK;
+}
+
+//----------------------------------------------------------
+NS_IMETHODIMP nsFontRetrieverService::CreateFontSizeIterator( const nsString & aFontName, 
+                                                              nsIFontSizeIterator** aIterator )
+{
+  // save value in case someone externally is using it
+  PRInt32 saveIterInx = mNameIterInx;
+
+  PRBool found = PR_FALSE;
+  Reset();
+  do {
+    nsAutoString name;
+    Get(&name);
+    if (name.Equals(aFontName)) {
+      found = PR_TRUE;
+      break;
+    }
+  } while (Advance() == NS_OK);
+
+  if (found) {
+    if (nsnull == mSizeIter) {
+      mSizeIter = new nsFontSizeIterator();
+    }
+    NS_ASSERTION( nsnull != mSizeIter, "nsFontSizeIterator instance pointer is null");
+
+    *aIterator = (nsIFontSizeIterator *)mSizeIter;
+    NS_ADDREF(mSizeIter);
+
+    FontInfo * fontInfo = (FontInfo *)mFontList->ElementAt(mNameIterInx);
+    mSizeIter->SetFontInfo(fontInfo);
+    mNameIterInx = saveIterInx;
+    return NS_OK;
+  }
+  mNameIterInx = saveIterInx;
+  return NS_ERROR_FAILURE;
+}
+
+//----------------------------------------------------------
+//-- nsIFontNameIterator
+//----------------------------------------------------------
+NS_IMETHODIMP nsFontRetrieverService::Reset()
+{
+  mNameIterInx = 0;
+  return NS_OK;
+}
+
+//----------------------------------------------------------
+NS_IMETHODIMP nsFontRetrieverService::Get( nsString* aFontName )
+{
+  if (mNameIterInx < mFontList->Count()) {
+    FontInfo * fontInfo = (FontInfo *)mFontList->ElementAt(mNameIterInx);
+    *aFontName = fontInfo->mName;
+    return NS_OK;
+  }
+  return NS_ERROR_FAILURE;
+}
+
+//----------------------------------------------------------
+NS_IMETHODIMP nsFontRetrieverService::Advance()
+{
+  if (mNameIterInx < mFontList->Count()-1) {
+    mNameIterInx++;
+    return NS_OK;
+  }
+  return NS_ERROR_FAILURE;
+}
+
+//------------------------------
+static FontInfo * GetFontInfo(nsVoidArray * aFontList, char * aName)
+{
+  nsAutoString name(aName);
+  PRInt32 i;
+  PRInt32 cnt = aFontList->Count();
+  for (i=0;i<cnt;i++) {
+    FontInfo * fontInfo = (FontInfo *)aFontList->ElementAt(i);
+    if (fontInfo->mName.Equals(name)) {
+      return fontInfo;
+    }
+  }
+
+  FontInfo * fontInfo   = new FontInfo();
+  fontInfo->mName       = aName;
+  //printf("Adding [%s]\n", aName);fflush(stdout); 
+  fontInfo->mIsScalable = PR_FALSE; // X fonts aren't scalable right??
+  fontInfo->mSizes      = nsnull;
+  aFontList->AppendElement(fontInfo);
+  return fontInfo;
+}
+
+//------------------------------
+static void AddSizeToFontInfo(FontInfo * aFontInfo, PRInt32 aSize)
+{
+  nsVoidArray * sizes;
+  if (nsnull == aFontInfo->mSizes) {
+    sizes = new nsVoidArray();
+    aFontInfo->mSizes = sizes;
+  } else {
+    sizes = aFontInfo->mSizes;
+  }
+  PRInt32 i;
+  PRInt32 cnt = sizes->Count();
+  for (i=0;i<cnt;i++) {
+    PRInt32 size = (int)sizes->ElementAt(i);
+    if (size == aSize) {
+      return;
+    }
+  }
+  sizes->AppendElement((void *)aSize);
+}
+
+//---------------------------------------------------
+// XXX - Hack - Parts of this will need to be reworked
+//
+// This method does brute force parcing for 4 different formats:
+//
+// 1) The format -*-*-*-*-*-* etc.
+//    -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-8
+//
+// 2) Name-size format 
+//    lucidasans-10
+//
+// 3) Name-style-size
+//    lucidasans-bold-10
+//
+// 4) Name only (implicit size)
+//    6x13
+//
+//--------------------------------------------------
+NS_IMETHODIMP nsFontRetrieverService::LoadFontList()
+{
+  char    * pattern = "*";
+  int nnames = 1024;
+
+  int available = nnames+1;
+  int i;
+  char **fonts;
+  XFontStruct *info;
+
+  if (nsnull == mFontList) { 
+    mFontList = new nsVoidArray(); 
+    if (nsnull == mFontList) { 
+      return NS_ERROR_FAILURE; 
+    } 
+  } 
+
+  /* Get list of fonts matching pattern */
+  for (;;) {
+    // the following line is VERY slow to return
+    fonts = XListFontsWithInfo(GDK_DISPLAY(), pattern, nnames, 
+                               &available, &info);
+    if (fonts == NULL || available < nnames)
+      break;
+
+    XFreeFontInfo(fonts, info, available);
+    nnames = available * 2;
+  }
+
+  if (fonts == NULL) {
+    fprintf(stderr, "pattern \"%s\" unmatched\n", pattern);
+    return NS_ERROR_FAILURE;
+  }
+
+#if 0 // debug
+  // print out all the retrieved fonts
+  printf("-----------------------------\n");
+  for (i=0; i<available; i++) {
+    printf("[%s]i\n", fonts[i]);
+  }
+  printf("-----------------------------\n");
+#endif
+
+  // this code assumes all like fonts are grouped together
+  // currentName is the current name of the font we are gathering
+  // sizes for, when the name changes we create a new FontInfo object
+  // but it also takes into account fonts of similar names when it 
+  // goes to add then and disregards duplicates
+  char buffer[1024];
+  char currentName[1024];
+  FontInfo * font = nsnull;
+
+  currentName[0]  = 0;
+  for (i=0; i<available; i++) {
+
+    // This is kind of lame, but it will have to do for now
+    strcpy(buffer, fonts[i]);
+
+    // Start by checking to see if the name begins with a dash
+    char * ptr  = buffer;
+    if (buffer[0] == '-') { //Format #1
+      
+      PRInt32 cnt = 0;
+      // skip first two '-'
+      do {
+        if (*ptr == '-') cnt++;
+        ptr++;
+      } while (cnt < 2);
+      
+      // find the dash at the end of the name
+      char * end = strchr(ptr, '-');
+      if (end) {
+        *end = 0;
+        
+        // Check to see if we need to create a new FontInfo obj
+        // and set the currentName var to this guys font name
+        if (strcmp(currentName, ptr) || NULL == font) {
+          font = GetFontInfo(mFontList, ptr);
+          strcpy(currentName, ptr);
+        }
+        if (nsnull == font->mSizes) {
+          font->mSizes = new nsVoidArray();
+        }
+        ptr = end+1; // skip past the dash that was set to zero
+        
+        cnt = 0;
+        // now skip ahead 4 dashes
+        do {
+          if (*ptr == '-') cnt++;
+          ptr++;
+        } while (cnt < 4);
+        
+        // find the dash after the size
+        end = strchr(ptr, '-');
+        
+        if (end) {
+	  *end = 0;
+          PRInt32 size;
+          sscanf(ptr, "%d", &size);
+	  AddSizeToFontInfo(font, size);
+        }
+      }
+    } else { // formats 2,3,4
+      
+      // no leading dash means the start of the 
+      // buffer is the start of the name
+      // this checks for a dash at the end of the font name
+      // which means there is a size at the end
+      char * end = strchr(buffer, '-');
+      if (end) { // Format 2,3
+        *end = 0;
+        // Check to see if we need to create a new FontInfo obj
+        // and set the currentName var to this guys font name
+        if (strcmp(currentName, buffer) || NULL == font) { 
+          font = GetFontInfo(mFontList, buffer);
+          strcpy(currentName, buffer);
+        }
+        end++; // advance past the dash
+	// check to see if we have a number
+	ptr = end;
+	if (isalpha(*ptr)) {  // Format 3
+	  // skip until next dash
+	  end = strchr(ptr, '-');
+	  if (end) {
+            *end = 0;
+	    ptr = end+1;
+	  }
+	}
+        PRInt32 size;
+        // yes, it has a dash at the end so it must have the size
+        // check to see if the size is terminated by a dash
+        // it shouldn't be
+        char * end2 = strchr(ptr, '-');
+        if (end2) *end2 = 0; // put terminator at the dash
+        sscanf(end, "%d", &size);
+	AddSizeToFontInfo(font, size);
+
+      } else { // Format #4
+        // The font has an implicit size, 
+        // so there is nothing to parse for size
+        // so we can't really do much here
+        // Check to see if we need to create a new FontInfo obj
+        // and set the currentName var to this guys font name
+        if (strcmp(currentName, buffer) || NULL == font) {
+          font = GetFontInfo(mFontList, buffer);
+          strcpy(currentName, buffer);
+        }
+      } 
+    }
+
+  }
+
+  XFreeFontInfo(fonts, info, available);
+
+  return NS_OK;
+}
+
+
+//---------------------------------------------------------- 
+NS_IMETHODIMP nsFontRetrieverService::IsFontScalable(const nsString & aFontName,
+                                                     PRBool* aResult ) 
+{ 
+  // save value in case someone externally is using it
+  PRInt32 saveIterInx = mNameIterInx;
+   
+  PRBool found = PR_FALSE; 
+  Reset(); 
+  do { 
+    nsAutoString name; 
+    Get(&name); 
+    if (name.Equals(aFontName)) { 
+      found = PR_TRUE; 
+      break; 
+    } 
+  } while (Advance() == NS_OK); 
+
+  if (found) { 
+    FontInfo * fontInfo = (FontInfo *)mFontList->ElementAt(mNameIterInx); 
+    *aResult = fontInfo->mIsScalable; 
+    mNameIterInx = saveIterInx;
+    return NS_OK; 
+  } 
+
+  mNameIterInx = saveIterInx;
+  return NS_ERROR_FAILURE; 
+} 

mozilla/widget/src/gtk/nsFontRetrieverService.h

@@ -0,0 +1,65 @@
+/* -*- Mode: C++; tab-width: 2; 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): 
+ */
+
+#ifndef __nsFontRetrieverService
+#define __nsFontRetrieverService
+
+#include "nsIFontRetrieverService.h"
+#include "nsIFontNameIterator.h"
+
+class nsVoidArray;
+class nsFontSizeIterator;
+
+class nsFontRetrieverService: public nsIFontRetrieverService, 
+                              public nsIFontNameIterator
+{
+public:
+  nsFontRetrieverService();
+  virtual ~nsFontRetrieverService();
+
+  NS_DECL_ISUPPORTS
+
+  // nsIFontRetrieverService
+  NS_IMETHOD CreateFontNameIterator( nsIFontNameIterator** aIterator );
+
+  NS_IMETHOD CreateFontSizeIterator( const nsString & aFontName, nsIFontSizeIterator** aIterator );
+  NS_IMETHOD IsFontScalable( const nsString & aFontName, PRBool* aResult );
+
+  // nsIFontNameIterator
+
+  NS_IMETHOD Reset();
+  NS_IMETHOD Get( nsString* aFontName );
+  NS_IMETHOD Advance();
+
+
+
+protected:
+  NS_IMETHOD LoadFontList();
+
+  nsVoidArray * mFontList;
+
+  PRInt32 mNameIterInx;
+
+  nsFontSizeIterator * mSizeIter;
+};
+
+#endif

mozilla/widget/src/gtk/nsFontSizeIterator.cpp

@@ -0,0 +1,88 @@
+/* -*- 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): 
+ */
+
+#include "nsFontSizeIterator.h"
+
+#include "nsFont.h"
+#include "nsVoidArray.h"
+ 
+
+NS_IMPL_ADDREF(nsFontSizeIterator)
+NS_IMPL_RELEASE(nsFontSizeIterator)
+NS_IMPL_QUERY_INTERFACE(nsFontSizeIterator, nsIFontSizeIterator::GetIID())
+
+//----------------------------------------------------------
+nsFontSizeIterator::nsFontSizeIterator() 
+{
+  NS_INIT_REFCNT();
+  mFontInfo     = nsnull;
+  mSizeIterInx  = 0;
+
+}
+
+//----------------------------------------------------------
+nsFontSizeIterator::~nsFontSizeIterator()
+{
+}
+
+///----------------------------------------------------------
+//-- nsIFontNameIterator
+//----------------------------------------------------------
+NS_IMETHODIMP nsFontSizeIterator::Reset()
+{
+  mSizeIterInx = 0;
+  return NS_OK;
+}
+
+//----------------------------------------------------------
+NS_IMETHODIMP nsFontSizeIterator::Get( double* aFontSize  )
+{
+  if (nsnull != mFontInfo->mSizes && 
+      mFontInfo->mSizes->Count() > 0 && 
+      mSizeIterInx < mFontInfo->mSizes->Count()) {
+    PRUint32 size = (PRUint32)mFontInfo->mSizes->ElementAt(mSizeIterInx);
+    *aFontSize = (double)size;
+    return NS_OK;
+  }
+  return NS_ERROR_FAILURE;
+}
+
+
+//----------------------------------------------------------
+NS_IMETHODIMP nsFontSizeIterator::Advance()
+{
+  if (nsnull != mFontInfo->mSizes && 
+      mFontInfo->mSizes->Count() > 0 &&
+      mSizeIterInx < mFontInfo->mSizes->Count()-2) {
+    mSizeIterInx++;
+    return NS_OK;
+  }
+
+  return NS_ERROR_FAILURE;
+}
+
+//----------------------------------------------------------
+NS_IMETHODIMP nsFontSizeIterator::SetFontInfo( FontInfo * aFontInfo )
+{
+  mFontInfo = aFontInfo;
+  return NS_OK;
+}

mozilla/widget/src/gtk/nsFontSizeIterator.h

@@ -0,0 +1,59 @@
+/* -*- 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): 
+ */
+
+#ifndef __nsFontSizeIterator
+#define __nsFontSizeIterator
+
+#include "nsIFontSizeIterator.h"
+#include "nsString.h"
+
+class nsVoidArray;
+
+typedef struct {
+  nsString      mName;
+  PRBool        mIsScalable;
+  nsVoidArray * mSizes;
+} FontInfo;
+
+
+class nsFontSizeIterator: public nsIFontSizeIterator {
+public:
+  nsFontSizeIterator();
+  virtual ~nsFontSizeIterator();
+
+  NS_DECL_ISUPPORTS
+
+  // nsIFontSizeIterator
+	NS_IMETHOD Reset();
+	NS_IMETHOD Get( double* aFontSize );
+	NS_IMETHOD Advance();
+
+  // Native impl
+	NS_IMETHOD SetFontInfo( FontInfo * aFontInfo );
+
+protected:
+
+  FontInfo * mFontInfo;      
+  PRInt32  mSizeIterInx;   // current index of iter
+};
+
+#endif

mozilla/widget/src/gtk/nsGtkEventHandler.cpp

@@ -0,0 +1,967 @@
+/* -*- Mode: C++; tab-width: 2; 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): 
+ */
+
+#include "nsWidget.h"
+#include "nsWindow.h"
+
+#include "nsScrollbar.h"
+#include "nsIFileWidget.h"
+#include "nsGUIEvent.h"
+#include "nsIMenu.h"
+#include "nsIMenuItem.h"
+#include "nsIMenuListener.h"
+
+#include "nsTextWidget.h"
+
+#include "nsICharsetConverterManager.h"
+#include "nsIPlatformCharset.h"
+#include "nsIServiceManager.h"
+static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID);
+
+#include "stdio.h"
+#include "ctype.h"
+
+#include "gtk/gtk.h"
+#include "nsGtkEventHandler.h"
+
+#include <gdk/gdkkeysyms.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+
+#ifdef DEBUG_pavlov
+//#define DEBUG_EVENTS 1
+#endif
+
+struct EventInfo {
+  nsWidget *widget;  // the widget
+  nsRect   *rect;    // the rect
+};
+
+//==============================================================
+void InitAllocationEvent(GtkAllocation *aAlloc,
+                         gpointer   p,
+                         nsSizeEvent &anEvent,
+                         PRUint32   aEventType)
+{
+  anEvent.message = aEventType;
+  anEvent.widget  = (nsWidget *) p;
+
+  anEvent.eventStructType = NS_SIZE_EVENT;
+
+  if (aAlloc != nsnull) {
+    // HACK
+    //    nsRect *foo = new nsRect(aAlloc->x, aAlloc->y, aAlloc->width, aAlloc->height);
+    nsRect *foo = new nsRect(0, 0, aAlloc->width, aAlloc->height);
+    anEvent.windowSize = foo;
+    //    anEvent.point.x = aAlloc->x;
+    //    anEvent.point.y = aAlloc->y;
+    // HACK
+    anEvent.point.x = 0;
+    anEvent.point.y = 0;
+    anEvent.mWinWidth = aAlloc->width;
+    anEvent.mWinHeight = aAlloc->height;
+  }
+
+  anEvent.time = PR_IntervalNow();
+}
+
+//==============================================================
+void InitConfigureEvent(GdkEventConfigure *aConf,
+                            gpointer   p,
+                            nsSizeEvent &anEvent,
+                            PRUint32   aEventType)
+{
+  anEvent.message = aEventType;
+  anEvent.widget  = (nsWidget *) p;
+
+  anEvent.eventStructType = NS_SIZE_EVENT;
+
+  if (aConf != nsnull) {
+  /* do we accually need to alloc a new rect, or can we just set the
+     current one */
+    nsRect *foo = new nsRect(aConf->x, aConf->y, aConf->width, aConf->height);
+    anEvent.windowSize = foo;
+    anEvent.point.x = aConf->x;
+    anEvent.point.y = aConf->y;
+    anEvent.mWinWidth = aConf->width;
+    anEvent.mWinHeight = aConf->height;
+  }
+// this usually returns 0
+  anEvent.time = 0;
+}
+
+//==============================================================
+void InitExposeEvent(GdkEventExpose *aGEE,
+                     gpointer   p,
+                     nsPaintEvent &anEvent,
+                     PRUint32   aEventType)
+{
+  anEvent.message = aEventType;
+  anEvent.widget  = (nsWidget *) p;
+
+  anEvent.eventStructType = NS_PAINT_EVENT;
+
+  if (aGEE != nsnull)
+  {
+#ifdef DEBUG_EVENTS
+    g_print("expose event: x = %i , y = %i , w = %i , h = %i\n",
+            aGEE->area.x, aGEE->area.y,
+            aGEE->area.width, aGEE->area.height);
+#endif
+    anEvent.point.x = aGEE->area.x;
+    anEvent.point.y = aGEE->area.y;
+
+    nsRect *rect = new nsRect(aGEE->area.x, aGEE->area.y,
+                              aGEE->area.width, aGEE->area.height);
+    anEvent.rect = rect;
+    anEvent.time = gdk_event_get_time((GdkEvent*)aGEE);
+  }
+}
+
+//=============================================================
+void UninitExposeEvent(GdkEventExpose *aGEE,
+                       gpointer   p,
+                       nsPaintEvent &anEvent,
+                       PRUint32   aEventType)
+{
+  if (aGEE != nsnull) {
+    delete anEvent.rect;
+  }
+}
+
+struct nsKeyConverter {
+  int vkCode; // Platform independent key code
+  int keysym; // GDK keysym key code
+};
+
+//
+// Netscape keycodes are defined in widget/public/nsGUIEvent.h
+// GTK keycodes are defined in <gdk/gdkkeysyms.h>
+//
+struct nsKeyConverter nsKeycodes[] = {
+  { NS_VK_CANCEL,     GDK_Cancel },
+  { NS_VK_BACK,       GDK_BackSpace },
+  { NS_VK_TAB,        GDK_Tab },
+  { NS_VK_TAB,        GDK_ISO_Left_Tab },
+  { NS_VK_CLEAR,      GDK_Clear },
+  { NS_VK_RETURN,     GDK_Return },
+  { NS_VK_SHIFT,      GDK_Shift_L },
+  { NS_VK_SHIFT,      GDK_Shift_R },
+  { NS_VK_CONTROL,    GDK_Control_L },
+  { NS_VK_CONTROL,    GDK_Control_R },
+  { NS_VK_ALT,        GDK_Alt_L },
+  { NS_VK_ALT,        GDK_Alt_R },
+  { NS_VK_PAUSE,      GDK_Pause },
+  { NS_VK_CAPS_LOCK,  GDK_Caps_Lock },
+  { NS_VK_ESCAPE,     GDK_Escape },
+  { NS_VK_SPACE,      GDK_space },
+  { NS_VK_PAGE_UP,    GDK_Page_Up },
+  { NS_VK_PAGE_DOWN,  GDK_Page_Down },
+  { NS_VK_END,        GDK_End },
+  { NS_VK_HOME,       GDK_Home },
+  { NS_VK_LEFT,       GDK_Left },
+  { NS_VK_UP,         GDK_Up },
+  { NS_VK_RIGHT,      GDK_Right },
+  { NS_VK_DOWN,       GDK_Down },
+  { NS_VK_PRINTSCREEN, GDK_Print },
+  { NS_VK_INSERT,     GDK_Insert },
+  { NS_VK_DELETE,     GDK_Delete },
+
+  { NS_VK_MULTIPLY,   GDK_KP_Multiply },
+  { NS_VK_ADD,        GDK_KP_Add },
+  { NS_VK_SEPARATOR,  GDK_KP_Separator },
+  { NS_VK_SUBTRACT,   GDK_KP_Subtract },
+  { NS_VK_DECIMAL,    GDK_KP_Decimal },
+  { NS_VK_DIVIDE,     GDK_KP_Divide },
+  { NS_VK_RETURN,     GDK_KP_Enter },
+
+  // NS doesn't have dash or equals distinct from the numeric keypad ones,
+  // so we'll use those for now.  See bug 17008:
+  { NS_VK_SUBTRACT, GDK_minus },
+  { NS_VK_EQUALS, GDK_equal },
+  // and we don't have a single-quote symbol either:
+  { NS_VK_QUOTE, GDK_apostrophe },
+
+  { NS_VK_COMMA,      GDK_comma },
+  { NS_VK_PERIOD,     GDK_period },
+  { NS_VK_SLASH,      GDK_slash },
+  { NS_VK_BACK_SLASH, GDK_backslash },
+  { NS_VK_BACK_QUOTE, GDK_grave },
+  { NS_VK_OPEN_BRACKET, GDK_bracketleft },
+  { NS_VK_CLOSE_BRACKET, GDK_bracketright },
+  { NS_VK_QUOTE, GDK_quotedbl },
+
+  // Some shifted keys, see bug 15463.
+  // These should be subject to different keyboard mappings;
+  // how do we do that in gtk?
+  { NS_VK_SEMICOLON, GDK_colon },
+  { NS_VK_BACK_QUOTE, GDK_asciitilde },
+  { NS_VK_COMMA, GDK_less },
+  { NS_VK_PERIOD, GDK_greater },
+  { NS_VK_SLASH,      GDK_question },
+  { NS_VK_1, GDK_exclam },
+  { NS_VK_2, GDK_at },
+  { NS_VK_3, GDK_numbersign },
+  { NS_VK_4, GDK_dollar },
+  { NS_VK_5, GDK_percent },
+  { NS_VK_6, GDK_asciicircum },
+  { NS_VK_7, GDK_ampersand },
+  { NS_VK_8, GDK_asterisk },
+  { NS_VK_9, GDK_parenleft },
+  { NS_VK_0, GDK_parenright },
+  { NS_VK_SUBTRACT, GDK_underscore },
+  { NS_VK_EQUALS, GDK_plus }
+};
+
+void nsGtkWidget_InitNSKeyEvent(int aEventType, nsKeyEvent& aKeyEvent,
+                                GtkWidget *w, gpointer p, GdkEventKey * event);
+
+//==============================================================
+
+// Input keysym is in gtk format; output is in NS_VK format
+int nsPlatformToDOMKeyCode(GdkEventKey *aGEK)
+{
+  int i;
+  int length = sizeof(nsKeycodes) / sizeof(struct nsKeyConverter);
+
+  int keysym = aGEK->keyval;
+
+  // First, try to handle alphanumeric input, not listed in nsKeycodes:
+  // most likely, more letters will be getting typed in than things in
+  // the key list, so we will look through these first.
+
+  // since X has different key symbols for upper and lowercase letters and
+  // mozilla does not, convert gdk's to mozilla's
+  if (keysym >= GDK_a && keysym <= GDK_z)
+    return keysym - GDK_a + NS_VK_A;
+  if (keysym >= GDK_A && keysym <= GDK_Z)
+    return keysym - GDK_A + NS_VK_A;
+
+  // numbers
+  if (keysym >= GDK_0 && keysym <= GDK_9)
+    return keysym - GDK_0 + NS_VK_0;
+
+  // keypad numbers
+  if (keysym >= GDK_KP_0 && keysym <= GDK_KP_9)
+    return keysym - GDK_KP_0 + NS_VK_NUMPAD0;
+
+  // misc other things
+  for (i = 0; i < length; i++) {
+    if (nsKeycodes[i].keysym == keysym)
+      return(nsKeycodes[i].vkCode);
+  }
+
+  // function keys
+  if (keysym >= GDK_F1 && keysym <= GDK_F24)
+    return keysym - GDK_F1 + NS_VK_F1;
+
+#if defined(DEBUG_akkana) || defined(DEBUG_ftang)
+  printf("No match in nsPlatformToDOMKeyCode: keysym is 0x%x, string is %s\n", keysym, aGEK->string);
+#endif
+
+  return((int)0);
+}
+
+//==============================================================
+
+PRUint32 nsConvertCharCodeToUnicode(GdkEventKey* aGEK)
+{
+  // For control chars, GDK sets string to be the actual ascii value.
+  // Map that to what nsKeyEvent wants, which currently --
+  // TEMPORARILY (the spec has changed and will be switched over
+  // when the tree opens for M11) --
+  // is the ascii for the actual event (e.g. 1 for control-a).
+  // This is only true for control chars; for alt chars, send the
+  // ascii for the key, i.e. a for alt-a.
+  if (aGEK->state & GDK_CONTROL_MASK)
+  {
+    if (aGEK->state & GDK_SHIFT_MASK)
+      return aGEK->string[0] + 'A' - 1;
+    else
+      return aGEK->string[0] + 'a' - 1;
+  }
+
+  // For now (obviously this will need to change for IME),
+  // only set a char code if the result is printable:
+  if (!isprint(aGEK->string[0]))
+    return 0;
+
+  // ALT keys in gdk give the upper case character in string,
+  // but we want the lower case char in char code
+  // unless shift was also pressed.
+  if (((aGEK->state & GDK_MOD1_MASK))
+      && !(aGEK->state & GDK_SHIFT_MASK)
+      && isupper(aGEK->string[0]))
+    return tolower(aGEK->string[0]);
+
+  //
+  // placeholder for something a little more interesting and correct
+  //
+  return aGEK->string[0];
+}
+
+//==============================================================
+void InitKeyEvent(GdkEventKey *aGEK,
+                            gpointer   p,
+                            nsKeyEvent &anEvent,
+                            PRUint32   aEventType)
+{
+  anEvent.message = aEventType;
+  anEvent.widget  = (nsWidget *) p;
+
+  anEvent.eventStructType = NS_KEY_EVENT;
+
+  if (aGEK != nsnull) {
+    anEvent.keyCode = nsPlatformToDOMKeyCode(aGEK);
+    anEvent.charCode = 0;
+    anEvent.time = aGEK->time;
+    anEvent.isShift = (aGEK->state & GDK_SHIFT_MASK) ? PR_TRUE : PR_FALSE;
+    anEvent.isControl = (aGEK->state & GDK_CONTROL_MASK) ? PR_TRUE : PR_FALSE;
+    anEvent.isAlt = (aGEK->state & GDK_MOD1_MASK) ? PR_TRUE : PR_FALSE;
+    // XXX
+    anEvent.isMeta = PR_FALSE; //(aGEK->state & GDK_MOD2_MASK) ? PR_TRUE : PR_FALSE;
+    anEvent.point.x = 0;
+    anEvent.point.y = 0;
+  }
+}
+
+void InitKeyPressEvent(GdkEventKey *aGEK,
+                       gpointer p,
+                       nsKeyEvent &anEvent)
+{
+  //
+  // init the basic event fields
+  //
+  anEvent.eventStructType = NS_KEY_EVENT;
+  anEvent.message = NS_KEY_PRESS;
+  anEvent.widget = (nsWidget*)p;
+
+  if (aGEK!=nsnull)
+  {
+    anEvent.isShift = (aGEK->state & GDK_SHIFT_MASK) ? PR_TRUE : PR_FALSE;
+    anEvent.isControl = (aGEK->state & GDK_CONTROL_MASK) ? PR_TRUE : PR_FALSE;
+    anEvent.isAlt = (aGEK->state & GDK_MOD1_MASK) ? PR_TRUE : PR_FALSE;
+    // XXX
+    anEvent.isMeta = PR_FALSE; //(aGEK->state & GDK_MOD2_MASK) ? PR_TRUE : PR_FALSE;
+
+    if(aGEK->length)
+       anEvent.charCode = nsConvertCharCodeToUnicode(aGEK);
+    else 
+       anEvent.charCode = 0;
+
+    if (anEvent.charCode) {
+      anEvent.keyCode = 0;
+      anEvent.isShift = PR_FALSE;
+    } else
+      anEvent.keyCode = nsPlatformToDOMKeyCode(aGEK);
+
+#if defined(DEBUG_akkana) || defined(DEBUG_pavlov) || defined (DEBUG_ftang)
+    printf("Key Press event: keyCode = 0x%x, char code = '%c'",
+           anEvent.keyCode, anEvent.charCode);
+    if (anEvent.isShift)
+      printf(" [shift]");
+    if (anEvent.isControl)
+      printf(" [ctrl]");
+    if (anEvent.isAlt)
+      printf(" [alt]");
+    if (anEvent.isMeta)
+      printf(" [meta]");
+    printf("\n");
+#endif
+
+    anEvent.time = aGEK->time;
+    anEvent.point.x = 0;
+    anEvent.point.y = 0;
+  }
+}
+
+//=============================================================
+void UninitKeyEvent(GdkEventKey *aGEK,
+                              gpointer   p,
+                              nsKeyEvent &anEvent,
+                              PRUint32   aEventType)
+{
+}
+
+/*==============================================================
+  ==============================================================
+  =============================================================
+  ==============================================================*/
+
+void handle_size_allocate(GtkWidget *w, GtkAllocation *alloc, gpointer p)
+{
+  nsWindow *widget = (nsWindow *)p;
+  nsSizeEvent event;
+
+  InitAllocationEvent(alloc, p, event, NS_SIZE);
+  NS_ADDREF(widget);
+  widget->OnResize(event);
+  NS_RELEASE(widget);
+
+  delete event.windowSize;
+}
+
+gint handle_expose_event(GtkWidget *w, GdkEventExpose *event, gpointer p)
+{
+  if (event->type == GDK_NO_EXPOSE)
+    return PR_FALSE;
+
+  nsPaintEvent pevent;
+  InitExposeEvent(event, p, pevent, NS_PAINT);
+
+  nsWindow *win = (nsWindow *)p;
+  win->AddRef();
+  win->OnExpose(pevent);
+  win->Release();
+
+  UninitExposeEvent(event, p, pevent, NS_PAINT);
+
+  return PR_TRUE;
+}
+
+//==============================================================
+void menu_item_activate_handler(GtkWidget *w, gpointer p)
+{
+  // g_print("menu_item_activate_handler\n");
+
+  nsIMenuListener *menuListener = nsnull;
+  nsIMenuItem *menuItem = (nsIMenuItem *)p;
+  if (menuItem != nsnull) {
+    nsMenuEvent mevent;
+    mevent.message = NS_MENU_SELECTED;
+    mevent.eventStructType = NS_MENU_EVENT;
+    mevent.point.x = 0;
+    mevent.point.y = 0;
+    // mevent.widget = menuItem;
+    mevent.widget = nsnull;
+    menuItem->GetCommand(mevent.mCommand);
+
+    mevent.mMenuItem = menuItem;
+    mevent.time = PR_IntervalNow();
+
+    // FIXME - THIS SHOULD WORK.  FIX EVENTS FOR XP CODE!!!!! (pav)
+    //    nsEventStatus status;
+    //    mevent.widget->DispatchEvent((nsGUIEvent *)&mevent, status);
+
+    menuItem->QueryInterface(nsIMenuListener::GetIID(), (void**)&menuListener);
+    if(menuListener) {
+      menuListener->MenuItemSelected(mevent);
+      NS_IF_RELEASE(menuListener);
+    }
+  }
+}
+
+//==============================================================
+void menu_map_handler(GtkWidget *w, gpointer p)
+{ 
+  nsIMenuListener *menuListener = nsnull;
+  nsIMenu *menu = (nsIMenu *)p;
+  if (menu != nsnull) {
+    nsMenuEvent mevent;
+    mevent.message = NS_MENU_SELECTED;
+    mevent.eventStructType = NS_MENU_EVENT;
+    mevent.point.x = 0;
+    mevent.point.y = 0;
+    mevent.widget = nsnull;
+
+    mevent.time = PR_IntervalNow();
+
+    menu->QueryInterface(nsIMenuListener::GetIID(), (void**)&menuListener);
+
+    if(menuListener) {
+      menuListener->MenuConstruct(
+        mevent,
+      	nsnull,   //parent window
+        nsnull,   //menuNode
+        nsnull ); // webshell
+      NS_IF_RELEASE(menuListener);
+    }
+  }
+}
+
+//==============================================================
+void menu_unmap_handler(GtkWidget *w, gpointer p)
+{
+  nsIMenuListener *menuListener = nsnull;
+  nsIMenu *menu = (nsIMenu *)p;
+  if (menu != nsnull) {
+    nsMenuEvent mevent;
+    mevent.message = NS_MENU_SELECTED;
+    mevent.eventStructType = NS_MENU_EVENT;
+    mevent.point.x = 0;
+    mevent.point.y = 0;
+    mevent.widget = nsnull;
+
+    mevent.time = PR_IntervalNow();
+
+    menu->QueryInterface(nsIMenuListener::GetIID(), (void**)&menuListener);
+    if(menuListener) {
+      menuListener->MenuDestruct(mevent);
+      NS_IF_RELEASE(menuListener);
+    }
+  }
+}
+
+
+//==============================================================
+void handle_scrollbar_value_changed(GtkAdjustment *adj, gpointer p)
+{
+  nsScrollbar *widget = (nsScrollbar*) p;
+  nsScrollbarEvent sevent;
+
+  sevent.message = NS_SCROLLBAR_POS;
+  sevent.widget  = (nsWidget *) p;
+  sevent.eventStructType = NS_SCROLLBAR_EVENT;
+
+  GdkWindow *win = (GdkWindow *)widget->GetNativeData(NS_NATIVE_WINDOW);
+  gdk_window_get_pointer(win, &sevent.point.x, &sevent.point.y, nsnull);
+
+  widget->AddRef();
+  widget->OnScroll(sevent, adj->value);
+  widget->Release();
+
+/* FIXME we need to set point.* from the event stuff. */
+#if 0
+  nsWindow * widgetWindow = (nsWindow *) p ;
+  XmScrollBarCallbackStruct * cbs = (XmScrollBarCallbackStruct*) call_data;
+  sevent.widget  = (nsWindow *) p;
+  if (cbs->event != nsnull) {
+    sevent.point.x = cbs->event->xbutton.x;
+    sevent.point.y = cbs->event->xbutton.y;
+  } else {
+    sevent.point.x = 0;
+    sevent.point.y = 0;
+  }
+  sevent.time    = 0; //XXX Implement this
+
+  switch (cbs->reason) {
+
+    case XmCR_INCREMENT:
+      sevent.message = NS_SCROLLBAR_LINE_NEXT;
+      break;
+
+    case XmCR_DECREMENT:
+      sevent.message = NS_SCROLLBAR_LINE_PREV;
+      break;
+
+    case XmCR_PAGE_INCREMENT:
+      sevent.message = NS_SCROLLBAR_PAGE_NEXT;
+      break;
+
+    case XmCR_PAGE_DECREMENT:
+      sevent.message = NS_SCROLLBAR_PAGE_PREV;
+      break;
+
+    case XmCR_DRAG:
+      sevent.message = NS_SCROLLBAR_POS;
+      break;
+
+    case XmCR_VALUE_CHANGED:
+      sevent.message = NS_SCROLLBAR_POS;
+      break;
+
+    default:
+      break;
+  }
+#endif
+}
+
+static gint composition_start(GdkEventKey *aEvent, nsWindow *aWin,
+                              nsEventStatus *aStatus) {
+  nsCompositionEvent compEvent;
+
+  compEvent.widget = (nsWidget*)aWin;
+  compEvent.point.x = 0;
+  compEvent.point.y = 0;
+  compEvent.time = aEvent->time;
+  compEvent.message = NS_COMPOSITION_START;
+  compEvent.eventStructType = NS_COMPOSITION_START;
+  compEvent.compositionMessage = NS_COMPOSITION_START;
+  aWin->DispatchEvent(&compEvent, *aStatus);
+
+  // set SpotLocation
+  aWin->SetXICSpotLocation(compEvent.theReply.mCursorPosition);
+
+  return PR_TRUE;
+}
+
+static gint composition_draw(GdkEventKey *aEvent, nsWindow *aWin,
+                             nsIUnicodeDecoder *aDecoder,
+                             nsEventStatus *aStatus) {
+  if (!aWin->mIMECompositionUniString) {
+    aWin->mIMECompositionUniStringSize = 128;
+    aWin->mIMECompositionUniString =
+      new PRUnichar[aWin->mIMECompositionUniStringSize];
+  }
+  PRUnichar *uniChar;
+  PRInt32 uniCharSize;
+  PRInt32 srcLen = aEvent->length;
+  for (;;) {
+    uniChar = aWin->mIMECompositionUniString;
+    uniCharSize = aWin->mIMECompositionUniStringSize - 1;
+    aDecoder->Convert((char*)aEvent->string, &srcLen, uniChar, &uniCharSize);
+    if (srcLen == aEvent->length &&
+        uniCharSize < aWin->mIMECompositionUniStringSize - 1) {
+      break;
+    }
+    aWin->mIMECompositionUniStringSize += 32;
+    aWin->mIMECompositionUniString =
+      new PRUnichar[aWin->mIMECompositionUniStringSize];
+  }
+  aWin->mIMECompositionUniString[uniCharSize] = 0;
+
+  nsTextEvent textEvent;
+  textEvent.message = NS_TEXT_EVENT;
+  textEvent.widget = (nsWidget*)aWin;
+  textEvent.time = aEvent->time;
+  textEvent.point.x = 0;
+  textEvent.point.y = 0;
+  textEvent.theText = aWin->mIMECompositionUniString;
+  textEvent.rangeCount = 0;
+  textEvent.rangeArray = nsnull;
+  textEvent.isShift = (aEvent->state & GDK_SHIFT_MASK) ? PR_TRUE : PR_FALSE;
+  textEvent.isControl = (aEvent->state & GDK_CONTROL_MASK) ? PR_TRUE : PR_FALSE;
+  textEvent.isAlt = (aEvent->state & GDK_MOD1_MASK) ? PR_TRUE : PR_FALSE;
+  // XXX
+  textEvent.isMeta = PR_FALSE; //(aEvent->state & GDK_MOD2_MASK) ? PR_TRUE : PR_FALSE;
+  textEvent.eventStructType = NS_TEXT_EVENT;
+  aWin->DispatchEvent(&textEvent, *aStatus);
+
+  aWin->SetXICSpotLocation(textEvent.theReply.mCursorPosition);
+  return True;
+}
+
+static gint composition_end(GdkEventKey *aEvent, nsWindow *aWin,
+                            nsEventStatus *aStatus) {
+  nsCompositionEvent compEvent;
+
+  compEvent.widget = (nsWidget*)aWin;
+  compEvent.point.x = 0;
+  compEvent.point.y = 0;
+  compEvent.time = aEvent->time;
+  compEvent.message = NS_COMPOSITION_END;
+  compEvent.eventStructType = NS_COMPOSITION_END;
+  compEvent.compositionMessage = NS_COMPOSITION_END;
+  aWin->DispatchEvent(&compEvent, *aStatus);
+
+  return PR_TRUE;
+}
+
+static nsIUnicodeDecoder*
+open_unicode_decoder(void) {
+  nsresult result = NS_ERROR_FAILURE;
+  nsIUnicodeDecoder *decoder = nsnull;
+  NS_WITH_SERVICE(nsIPlatformCharset, platform, NS_PLATFORMCHARSET_PROGID,
+                  &result);
+  if (platform && NS_SUCCEEDED(result)) {
+    nsAutoString charset("");
+    result = platform->GetCharset(kPlatformCharsetSel_Menu, charset);
+    if (NS_FAILED(result) || (charset.Length() == 0)) {
+      charset = "ISO-8859-1";   // default
+    }
+    nsICharsetConverterManager* manager = nsnull;
+    nsresult res = nsServiceManager::
+      GetService(kCharsetConverterManagerCID,
+                 nsCOMTypeInfo<nsICharsetConverterManager>::GetIID(),
+                 (nsISupports**)&manager);
+    if (manager && NS_SUCCEEDED(res)) {
+      manager->GetUnicodeDecoder(&charset, &decoder);
+      nsServiceManager::ReleaseService(kCharsetConverterManagerCID, manager);
+    }
+  }
+  return decoder;
+}
+
+// GTK's text widget already does XIM, so we don't want to do this again
+gint handle_key_press_event_for_text(GtkObject *w, GdkEventKey* event,
+                                     gpointer p)
+{
+  nsKeyEvent kevent;
+  nsTextWidget* win = (nsTextWidget*)p;
+
+  // work around for annoying things.
+  if (event->keyval == GDK_Tab)
+    if (event->state & GDK_CONTROL_MASK)
+      if (event->state & GDK_MOD1_MASK)
+        return PR_FALSE;
+
+  // Don't pass shift, control and alt as key press events
+  if (event->keyval == GDK_Shift_L
+      || event->keyval == GDK_Shift_R
+      || event->keyval == GDK_Control_L
+      || event->keyval == GDK_Control_R)
+    return PR_TRUE;
+
+  win->AddRef();
+  InitKeyEvent(event, p, kevent, NS_KEY_DOWN);
+  win->OnKey(kevent);
+
+  //
+  // Second, dispatch the Key event as a key press event w/ a Unicode
+  //  character code.  Note we have to check for modifier keys, since
+  // gtk returns a character value for them
+  //
+  InitKeyPressEvent(event,p, kevent);
+  win->OnKey(kevent);
+
+  win->Release();
+  if (w)
+  {
+    gtk_signal_emit_stop_by_name (GTK_OBJECT(w), "key_press_event");
+  }
+
+  return PR_TRUE;
+}
+
+// GTK's text widget already does XIM, so we don't want to do this again
+gint handle_key_release_event_for_text(GtkObject *w, GdkEventKey* event,
+                                       gpointer p)
+{
+  nsKeyEvent kevent;
+  nsTextWidget* win = (nsTextWidget*)p;
+
+  // Don't pass shift, control and alt as key release events
+  if (event->keyval == GDK_Shift_L
+      || event->keyval == GDK_Shift_R
+      || event->keyval == GDK_Control_L
+      || event->keyval == GDK_Control_R)
+    return PR_TRUE;
+
+  InitKeyEvent(event, p, kevent, NS_KEY_UP);
+  win->AddRef();
+  win->OnKey(kevent);
+  win->Release();
+  
+  if (w)
+  {
+    gtk_signal_emit_stop_by_name (GTK_OBJECT(w), "key_release_event");
+  }
+
+  return PR_TRUE;
+}
+
+
+//==============================================================
+gint handle_key_press_event(GtkObject *w, GdkEventKey* event, gpointer p)
+{
+  nsKeyEvent kevent;
+  nsWindow* win = (nsWindow*)p;
+
+  // work around for annoying things.
+  if (event->keyval == GDK_Tab)
+    if (event->state & GDK_CONTROL_MASK)
+      if (event->state & GDK_MOD1_MASK)
+        return PR_FALSE;
+
+  // Don't pass shift, control and alt as key press events
+  if (event->keyval == GDK_Shift_L
+      || event->keyval == GDK_Shift_R
+      || event->keyval == GDK_Control_L
+      || event->keyval == GDK_Control_R)
+    return PR_TRUE;
+
+  win->AddRef();
+  //
+  // First, dispatch the Key event as a virtual key down event
+  //
+  InitKeyEvent(event, p, kevent, NS_KEY_DOWN);
+  win->OnKey(kevent);
+ 
+
+
+  //
+  // Second, dispatch the Key event as a key press event w/ a Unicode
+  //  character code.  Note we have to check for modifier keys, since
+  // gtk returns a character value for them
+  //
+  if (event->length) {
+    static nsIUnicodeDecoder *decoder = nsnull;
+    if (!decoder) {
+      decoder = open_unicode_decoder();
+    }
+    if (decoder && (!kevent.keyCode)) {
+      nsEventStatus status;
+      composition_start(event, win, &status);
+      composition_draw(event, win, decoder, &status);
+      composition_end(event, win, &status);
+    } else {
+      InitKeyPressEvent(event,p, kevent);
+      win->OnKey(kevent);
+      nsEventStatus status;
+      composition_start(event, win, &status);
+      composition_end(event, win, &status);
+    }
+  } else { // for Home/End/Up/Down/Left/Right/PageUp/PageDown key
+    InitKeyPressEvent(event,p, kevent);
+    win->OnKey(kevent);
+  }
+
+  win->Release();
+  if (w)
+  {
+    gtk_signal_emit_stop_by_name (GTK_OBJECT(w), "key_press_event");
+  }
+
+  return PR_TRUE;
+}
+
+//==============================================================
+gint handle_key_release_event(GtkObject *w, GdkEventKey* event, gpointer p)
+{
+  // Don't pass shift, control and alt as key release events
+  if (event->keyval == GDK_Shift_L
+      || event->keyval == GDK_Shift_R
+      || event->keyval == GDK_Control_L
+      || event->keyval == GDK_Control_R)
+    return PR_TRUE;
+
+  nsKeyEvent kevent;
+  InitKeyEvent(event, p, kevent, NS_KEY_UP);
+
+  nsWindow * win = (nsWindow *) p;
+  win->AddRef();
+  win->OnKey(kevent);
+  win->Release();
+
+  if (w)
+  {
+    gtk_signal_emit_stop_by_name (GTK_OBJECT(w), "key_release_event");
+  }
+
+  return PR_TRUE;
+}
+
+//==============================================================
+void 
+handle_gdk_event (GdkEvent *event, gpointer data)
+{
+  GtkObject *object = nsnull;
+
+  if (event->any.window)
+    gdk_window_get_user_data (event->any.window, (void **)&object);
+
+  if (object != nsnull &&
+      GDK_IS_SUPERWIN (object))
+    {
+      // It was an event on one of our superwindows
+
+      nsWindow *window = (nsWindow *)gtk_object_get_data (object, "nsWindow");
+      
+      if (gtk_grab_get_current () != nsnull)
+        {
+          // A GTK+ grab is in effect. Rewrite the event to point to
+          // our toplevel, and pass it through.
+          // XXX: We should actually translate the coordinates
+
+          gdk_window_unref (event->any.window);
+          event->any.window = GTK_WIDGET (window->GetMozArea())->window;
+          gdk_window_ref (event->any.window);
+        }
+      else
+        {
+          // Handle it ourselves.
+
+          switch (event->type)
+            {
+            case GDK_KEY_PRESS:
+              handle_key_press_event (NULL, &event->key, window);
+              break;
+            case GDK_KEY_RELEASE:
+              handle_key_release_event (NULL, &event->key, window);
+              break;
+            default:
+              window->HandleEvent (event);
+            }
+          return;
+        }
+    }
+
+  gtk_main_do_event (event);
+}
+
+//==============================================================
+void
+handle_xlib_shell_event(GdkSuperWin *superwin, XEvent *event, gpointer p)
+{
+  nsWindow *window = (nsWindow *)p;
+  switch(event->xany.type) {
+  case ConfigureNotify:
+    window->HandleXlibConfigureNotifyEvent(event);
+    break;
+  default:
+    break;
+  }
+}
+
+//==============================================================
+void
+handle_xlib_bin_event(GdkSuperWin *superwin, XEvent *event, gpointer p)
+{
+  nsWindow *window = (nsWindow *)p;
+
+  switch(event->xany.type) {
+  case Expose:
+    window->HandleXlibExposeEvent(event);
+    break;
+  case ButtonPress:
+  case ButtonRelease:
+    window->HandleXlibButtonEvent((XButtonEvent *)event);
+    break;
+  case MotionNotify:
+    window->HandleXlibMotionNotifyEvent((XMotionEvent *) event);
+    break;
+  case EnterNotify:
+  case LeaveNotify:
+    window->HandleXlibCrossingEvent((XCrossingEvent *) event);
+    break;
+  default:
+    break;
+  }
+}
+
+//==============================================================
+gint nsGtkWidget_FSBCancel_Callback(GtkWidget *w, gpointer p)
+{
+#if 0
+  nsWindow *widgetWindow = (nsWindow*)gtk_object_get_user_data(GTK_OBJECT(w));
+  nsFileWidget * widgetWindow = (nsFileWidget *) p ;
+  if (p != nsnull) {
+    widgetWindow->OnCancel();
+  }
+#endif
+
+  return PR_FALSE;
+}
+
+//==============================================================
+gint nsGtkWidget_FSBOk_Callback(GtkWidget *w, gpointer p)
+{
+#if 0
+  nsWindow *widgetWindow = (nsWindow*)gtk_object_get_user_data(GTK_OBJECT(w));
+  nsFileWidget * widgetWindow = (nsFileWidget *) p;
+  if (p != nsnull) {
+    widgetWindow->OnOk();
+  }
+#endif
+
+  return PR_FALSE;
+}

mozilla/widget/src/gtk/nsGtkEventHandler.h

@@ -0,0 +1,72 @@
+/* -*- Mode: C++; tab-width: 2; 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): 
+ */
+
+#ifndef __nsGtkEventHandler_h
+#define __nsGtkEventHandler_h
+
+#include <gtk/gtk.h>
+#include <gdk/gdkx.h>
+#include "gdksuperwin.h"
+
+class nsIWidget;
+class nsIMenuItem;
+class nsIMenu;
+
+gint handle_configure_event(GtkWidget *w, GdkEventConfigure *conf, gpointer p);
+void handle_size_allocate(GtkWidget *w, GtkAllocation *alloc, gpointer p);
+gint handle_expose_event(GtkWidget *w, GdkEventExpose *event, gpointer p);
+
+
+gint handle_key_release_event_for_text(GtkObject *w, GdkEventKey* event, gpointer p);
+gint handle_key_press_event_for_text(GtkObject *w, GdkEventKey* event, gpointer p);
+
+gint handle_key_release_event(GtkObject *w, GdkEventKey* event, gpointer p);
+gint handle_key_press_event(GtkObject *w, GdkEventKey* event, gpointer p);
+
+void handle_scrollbar_value_changed(GtkAdjustment *adjustment, gpointer p);
+
+void menu_item_activate_handler(GtkWidget *w, gpointer p);
+
+void menu_map_handler(GtkWidget *w, gpointer p);
+void menu_unmap_handler(GtkWidget *w, gpointer p);
+
+//----------------------------------------------------
+
+gint nsGtkWidget_FSBCancel_Callback(GtkWidget *w, gpointer p);
+gint nsGtkWidget_FSBOk_Callback(GtkWidget *w, gpointer p);
+
+//----------------------------------------------------
+gint CheckButton_Toggle_Callback(GtkWidget *w, gpointer p);
+
+gint nsGtkWidget_RadioButton_ArmCallback(GtkWidget *w, gpointer p);
+gint nsGtkWidget_RadioButton_DisArmCallback(GtkWidget *w, gpointer p);
+
+gint nsGtkWidget_Text_Callback(GtkWidget *w, GdkEventKey* event, gpointer p);
+gint nsGtkWidget_Expose_Callback(GtkWidget *w, gpointer p);
+
+gint nsGtkWidget_Refresh_Callback(gpointer call_data);
+
+void handle_xlib_shell_event(GdkSuperWin *superwin, XEvent *event, gpointer p);
+void handle_xlib_bin_event(GdkSuperWin *superwin, XEvent *event, gpointer p);
+void handle_gdk_event (GdkEvent *event, gpointer data);
+
+#endif  // __nsGtkEventHandler.h

mozilla/widget/src/gtk/nsGtkUtils.cpp

@@ -0,0 +1,213 @@
+/* -*- Mode: C++; tab-width: 2; 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): 
+ */
+
+#include <unistd.h>
+#include <string.h>
+
+#include "nsGtkUtils.h"
+
+#include <gdk/gdkx.h>
+#include <gdk/gdkprivate.h>
+
+#if defined(__osf__) && !defined(_XOPEN_SOURCE_EXTENDED)
+/*
+** DEC's compiler requires _XOPEN_SOURCE_EXTENDED to be defined in
+** order for it to see the prototype for usleep in unistd.h, but if
+** we define that the build breaks long before getting here.  So
+** put the prototype here explicitly.
+*/
+int usleep(useconds_t);
+#endif
+#if defined(__QNX__)
+#define usleep(s)	sleep(s)
+#endif
+
+//////////////////////////////////////////////////////////////////
+#if 0
+/* staitc */ gint
+nsGtkUtils::gdk_query_pointer(GdkWindow * window,
+							  gint *      x_out,
+							  gint *      y_out)
+{
+  g_return_val_if_fail(NULL != window, FALSE);
+  g_return_val_if_fail(NULL != x_out, FALSE);
+  g_return_val_if_fail(NULL != y_out, FALSE);
+
+  Window root;
+  Window child;
+  int rootx, rooty;
+  int winx = 0;
+  int winy = 0;
+  unsigned int xmask = 0;
+  gint result = FALSE;
+  
+  *x_out = -1;
+  *y_out = -1;
+  
+  result = XQueryPointer(GDK_WINDOW_XDISPLAY(window),
+                         GDK_WINDOW_XWINDOW(window),
+                         &root, 
+                         &child,
+                         &rootx,
+                         &rooty,
+                         &winx,
+                         &winy,
+                         &xmask);
+  
+  if (result)
+  {
+    *x_out = rootx;
+    *y_out = rooty;
+  }
+
+  return result;
+}
+#endif
+//////////////////////////////////////////////////////////////////
+/* static */ void 
+nsGtkUtils::gtk_widget_set_color(GtkWidget *  widget,
+								 GtkRcFlags   flags,
+								 GtkStateType state,
+								 GdkColor *   color)
+{
+  GtkRcStyle * rc_style;
+
+  g_return_if_fail (widget != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+  g_return_if_fail (color != NULL);
+  g_return_if_fail (flags == 0);
+
+  rc_style = (GtkRcStyle *) gtk_object_get_data (GTK_OBJECT (widget), 
+												 "modify-style");
+
+  if (!rc_style)
+  {
+	rc_style = gtk_rc_style_new ();
+
+	gtk_widget_modify_style (widget, rc_style);
+
+	gtk_object_set_data (GTK_OBJECT (widget), "modify-style", rc_style);
+  }
+
+  if (flags & GTK_RC_FG)
+  {
+    rc_style->color_flags[state] = GtkRcFlags(rc_style->color_flags[state] | GTK_RC_FG);
+    rc_style->fg[state] = *color;
+  }
+
+  if (flags & GTK_RC_BG)
+  {
+    rc_style->color_flags[state] = GtkRcFlags(rc_style->color_flags[state] | GTK_RC_BG);
+    rc_style->bg[state] = *color;
+  }
+
+  if (flags & GTK_RC_TEXT)
+  {
+    rc_style->color_flags[state] = GtkRcFlags(rc_style->color_flags[state] | GTK_RC_TEXT);
+    rc_style->text[state] = *color;
+  }
+
+  if (flags & GTK_RC_BASE)
+  {
+    rc_style->color_flags[state] = GtkRcFlags(rc_style->color_flags[state] | GTK_RC_BASE);
+    rc_style->base[state] = *color;
+  }
+}
+//////////////////////////////////////////////////////////////////
+/* static */ GdkModifierType
+nsGtkUtils::gdk_keyboard_get_modifiers()
+{
+  GdkModifierType m = (GdkModifierType) 0;
+
+  gdk_window_get_pointer(NULL,NULL,NULL,&m);
+
+  return m;
+}
+//////////////////////////////////////////////////////////////////
+/* static */ void
+nsGtkUtils::gdk_window_flash(GdkWindow *    aGdkWindow,
+                             unsigned int   aTimes,
+                             unsigned long  aInterval,
+                             GdkRectangle * aArea)
+{
+  gint         x;
+  gint         y;
+  gint         width;
+  gint         height;
+  guint        i;
+  GdkGC *      gc = 0;
+  GdkColor     white;
+
+  gdk_window_get_geometry(aGdkWindow,
+                          NULL,
+                          NULL,
+                          &width,
+                          &height,
+                          NULL);
+
+  gdk_window_get_origin (aGdkWindow,
+                         &x,
+                         &y);
+
+  gc = gdk_gc_new(GDK_ROOT_PARENT());
+
+  white.pixel = WhitePixel(gdk_display,DefaultScreen(gdk_display));
+
+  gdk_gc_set_foreground(gc,&white);
+  gdk_gc_set_function(gc,GDK_XOR);
+  gdk_gc_set_subwindow(gc,GDK_INCLUDE_INFERIORS);
+  
+  /* 
+   * If an area is given, use that.  Notice how out of whack coordinates
+   * and dimentsions are not checked!!!
+   */
+  if (aArea)
+  {
+    x += aArea->x;
+    y += aArea->y;
+    
+    width = aArea->width;
+    height = aArea->height;
+  }
+
+  /*
+   * Need to do this twice so that the XOR effect can replace 
+   * the original window contents.
+   */
+  for (i = 0; i < aTimes * 2; i++)
+  {
+    gdk_draw_rectangle(GDK_ROOT_PARENT(),
+                       gc,
+                       TRUE,
+                       x,
+                       y,
+                       width,
+                       height);
+
+    gdk_flush();
+    
+    usleep(aInterval);
+  }
+
+  gdk_gc_destroy(gc);
+}
+//////////////////////////////////////////////////////////////////

mozilla/widget/src/gtk/nsGtkUtils.h

@@ -0,0 +1,85 @@
+/* -*- Mode: C++; tab-width: 2; 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): 
+ */
+
+#ifndef __nsGtkUtils_h
+#define __nsGtkUtils_h
+
+#include <gtk/gtk.h>
+
+struct nsGtkUtils
+{
+  //
+  // Wrapper for XQueryPointer
+  //
+#if 0
+  static gint gdk_query_pointer(GdkWindow * window,
+                                gint *      x_out,
+                                gint *      y_out);
+#endif
+
+  //
+  // Change a widget's background
+  //
+  // flags isa bit mask of the following bits:
+  //
+  //   GTK_RC_FG
+  //   GTK_RC_BG
+  //   GTK_RC_TEXT
+  //   GTK_RC_BASE
+  //
+  // state is an enum:
+  //
+  //   GTK_STATE_NORMAL,
+  //   GTK_STATE_ACTIVE,
+  //   GTK_STATE_PRELIGHT,
+  //   GTK_STATE_SELECTED,
+  //   GTK_STATE_INSENSITIVE
+  //
+  static void gtk_widget_set_color(GtkWidget *  widget,
+                                   GtkRcFlags   flags,
+                                   GtkStateType state,
+                                   GdkColor *   color);
+
+  /**
+   * Return the current keyboard modifier state.
+   *
+   * @return the current keyboard modifier state.
+   *
+   */
+  static GdkModifierType gdk_keyboard_get_modifiers();
+
+  /**
+   * Flash an area within a GDK window (or the whole window)
+   *
+   * @param aGdkWindow   The GDK window to flash.
+   * @param aTimes       Number of times to flash the area.
+   * @param aInterval    Interval between flashes in milliseconds.
+   * @param aArea        The area to flash.  The whole window if NULL.
+   *
+   */
+  static void gdk_window_flash(GdkWindow *     aGdkWindow,
+                               unsigned int    aTimes,
+                               unsigned long   aInterval,
+                               GdkRectangle *  aArea);
+};
+
+#endif  // __nsGtkEventHandler.h

mozilla/widget/src/gtk/nsLabel.cpp

@@ -0,0 +1,141 @@
+/* -*- Mode: C++; tab-width: 2; 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): 
+ */
+
+#include <gtk/gtk.h>
+
+#include "nsLabel.h"
+#include "nsString.h"
+
+NS_IMPL_ADDREF_INHERITED(nsLabel, nsWidget)
+NS_IMPL_RELEASE_INHERITED(nsLabel, nsWidget)
+NS_IMPL_QUERY_INTERFACE2(nsLabel, nsILabel, nsIWidget)
+
+//-------------------------------------------------------------------------
+//
+// nsLabel constructor
+//
+//-------------------------------------------------------------------------
+nsLabel::nsLabel() : nsWidget(), nsILabel()
+{
+  NS_INIT_REFCNT();
+  mAlignment = eAlign_Left;
+}
+
+//-------------------------------------------------------------------------
+//
+// nsLabel destructor
+//
+//-------------------------------------------------------------------------
+nsLabel::~nsLabel()
+{
+}
+
+
+//-------------------------------------------------------------------------
+//
+// Create the nativeLabel widget
+//
+//-------------------------------------------------------------------------
+NS_IMETHODIMP  nsLabel::CreateNative(GtkObject *parentWindow)
+{
+  unsigned char alignment = GetNativeAlignment();
+
+  mWidget = gtk_label_new("");
+  gtk_widget_set_name(mWidget, "nsLabel");
+  gtk_misc_set_alignment(GTK_MISC(mWidget), 0.0, alignment);
+
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+//
+//
+//-------------------------------------------------------------------------
+NS_IMETHODIMP nsLabel::PreCreateWidget(nsWidgetInitData *aInitData)
+{
+  if (nsnull != aInitData) {
+    nsLabelInitData* data = (nsLabelInitData *) aInitData;
+    mAlignment = data->mAlignment;
+  }
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+//
+// Set alignment
+//
+//-------------------------------------------------------------------------
+NS_IMETHODIMP nsLabel::SetAlignment(nsLabelAlignment aAlignment)
+{
+  GtkJustification align;
+
+  mAlignment = aAlignment;
+
+  align = GetNativeAlignment();
+  gtk_misc_set_alignment(GTK_MISC(mWidget), 0.0, align);
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+//
+//
+//
+//-------------------------------------------------------------------------
+GtkJustification nsLabel::GetNativeAlignment()
+{
+  switch (mAlignment) {
+    case eAlign_Right : return GTK_JUSTIFY_RIGHT;
+    case eAlign_Left  : return GTK_JUSTIFY_LEFT;
+    case eAlign_Center: return GTK_JUSTIFY_CENTER;
+    default :
+      return GTK_JUSTIFY_LEFT;
+  }
+  return GTK_JUSTIFY_LEFT;
+}
+
+//-------------------------------------------------------------------------
+//
+// Set this button label
+//
+//-------------------------------------------------------------------------
+NS_METHOD nsLabel::SetLabel(const nsString& aText)
+{
+  NS_ALLOC_STR_BUF(label, aText, 256);
+  gtk_label_set(GTK_LABEL(mWidget), label);
+  NS_FREE_STR_BUF(label);
+  return NS_OK;
+
+}
+
+//-------------------------------------------------------------------------
+//
+// Get this button label
+//
+//-------------------------------------------------------------------------
+NS_METHOD nsLabel::GetLabel(nsString& aBuffer)
+{
+  char * text;
+  gtk_label_get(GTK_LABEL(mWidget), &text);
+  aBuffer.SetLength(0);
+  aBuffer.Append(text);
+  return NS_OK;
+}