Removed mapi dependency from xpfe/bootstarp

Checking in for kkhandrika@netscape.com


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

mozilla/mailnews/mapi/makefile.win

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

mozilla/mailnews/mapi/mapiDll/Mapi32.DEF

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

mozilla/mailnews/mapi/mapiDll/MapiDll.cpp

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

mozilla/mailnews/mapi/mapiDll/makefile.win

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

mozilla/mailnews/mapi/mapihook/makefile.win

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

mozilla/mailnews/mapi/mapihook/public/nsIMapiSupport.idl

@@ -0,0 +1,64 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Krishna Mohan Khandrika <kkhandrika@netscape.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsISupports.idl"
+
+/**
+ * This interface provides support for registering Mozilla as a COM component
+ * for extending the use of Mail/News through Simple MAPI.
+ * 
+ */
+
+[noscript, uuid(8967fed2-c8bb-11d5-a3e9-00b0d0f3baa7)]
+interface nsIMapiSupport : nsISupports {
+
+   /** Initiates MAPI support
+    */
+
+   void initializeMAPISupport();
+
+   /**  Shuts down the MAPI support
+    */
+
+   void shutdownMAPISupport();
+};
+
+%{C++
+#define NS_IMAPISUPPORT_CONTRACTID    "@mozilla.org/mapisupport;1"
+#define NS_IMAPISUPPORT_CLASSNAME "Mozilla MAPI Support"
+%}
+

mozilla/mailnews/mapi/mapihook/src/nsMapiSupport.cpp

@@ -0,0 +1,174 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corp.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsComPtr.h"
+#include "nsMapiSupport.h"
+#include "nsISupports.h"
+#include "nsMapiRegistry.h"
+#include "nsIGenericFactory.h"
+#include "nsIObserverService.h"
+#include "nsIAppStartupNotifier.h"
+#include "nsIServiceManager.h"
+#include "nsIComponentManager.h"
+#include "nsICategoryManager.h"
+
+const CLSID CLSID_nsMapiImp = {0x29f458be, 0x8866, 0x11d5, \
+                              {0xa3, 0xdd, 0x0, 0xb0, 0xd0, 0xf3, 0xba, 0xa7}};
+
+/** Implementation of the nsIMapiSupport interface.
+ *  Use standard implementation of nsISupports stuff.
+ */
+
+NS_IMPL_THREADSAFE_ISUPPORTS2(nsMapiSupport, nsIMapiSupport, nsIObserver);
+
+static NS_METHOD nsMapiRegistrationProc(nsIComponentManager *aCompMgr,
+                   nsIFile *aPath, const char *registryLocation, const char *componentType,
+                   const nsModuleComponentInfo *info)
+{
+  nsresult rv;
+
+  nsCOMPtr<nsICategoryManager> categoryManager(do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv));
+  if (NS_SUCCEEDED(rv)) 
+      rv = categoryManager->AddCategoryEntry(APPSTARTUP_CATEGORY, "Mapi Support", 
+                  "service," NS_IMAPISUPPORT_CONTRACTID, PR_TRUE, PR_TRUE, nsnull);
+
+  return rv;
+}
+
+NS_IMETHODIMP
+nsMapiSupport::Observe(nsISupports *aSubject, const char *aTopic, const PRUnichar *aData)
+{
+    if (!nsCRT::strcmp(aTopic, "profile-after-change"))
+        return InitializeMAPISupport();
+
+    if (!nsCRT::strcmp(aTopic, NS_XPCOM_SHUTDOWN_OBSERVER_ID))
+        return ShutdownMAPISupport();
+
+    nsresult rv;
+
+    nsCOMPtr<nsIObserverService> observerService(do_GetService("@mozilla.org/observer-service;1", &rv));
+    if (NS_FAILED(rv)) return rv;
+
+    rv = observerService->AddObserver(this,"profile-after-change", PR_FALSE);
+    if (NS_FAILED(rv)) return rv;
+
+    rv = observerService->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, PR_FALSE);
+           
+    return rv;
+}
+
+nsMapiSupport::nsMapiSupport()
+: m_dwRegister(0),
+  m_nsMapiFactory(nsnull)
+{
+    NS_INIT_ISUPPORTS();
+}
+
+nsMapiSupport::~nsMapiSupport()
+{
+}
+
+NS_IMETHODIMP
+nsMapiSupport::InitializeMAPISupport()
+{
+    ::CoInitialize(nsnull);
+    if (m_nsMapiFactory == nsnull)    // No Registering if already done.  Sanity Check!!
+    {
+        m_nsMapiFactory = new nsMapiFactory();
+
+        if (m_nsMapiFactory != nsnull)
+        {
+            HRESULT hr = ::CoRegisterClassObject(CLSID_nsMapiImp, \
+                                                 m_nsMapiFactory, \
+                                                 CLSCTX_LOCAL_SERVER, \
+                                                 REGCLS_MULTIPLEUSE, \
+                                                 &m_dwRegister);
+
+            if (FAILED(hr))
+            {
+                m_nsMapiFactory->Release() ;
+                m_nsMapiFactory = nsnull;
+                return NS_ERROR_FAILURE;
+            }
+        }
+    }
+
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMapiSupport::ShutdownMAPISupport()
+{
+    if (m_dwRegister != 0)
+        ::CoRevokeClassObject(m_dwRegister);
+
+    if (m_nsMapiFactory != nsnull)
+    {
+        m_nsMapiFactory->Release();
+        m_nsMapiFactory = nsnull;
+    }
+
+    ::CoUninitialize();
+
+    return NS_OK;
+}
+
+
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsMapiRegistry);
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsMapiSupport);
+
+// The list of components we register
+static nsModuleComponentInfo components[] = 
+{
+  {
+    NS_IMAPIREGISTRY_CLASSNAME, 
+    NS_IMAPIREGISTRY_CID,
+    NS_IMAPIREGISTRY_CONTRACTID, 
+    nsMapiRegistryConstructor
+  },
+
+  {
+    NS_IMAPISUPPORT_CLASSNAME,
+    NS_IMAPISUPPORT_CID,
+    NS_IMAPISUPPORT_CONTRACTID,
+    nsMapiSupportConstructor,
+    nsMapiRegistrationProc,
+    nsnull
+  }
+};
+
+NS_IMPL_NSGETMODULE(msgMapiModule, components);
+

mozilla/mailnews/mapi/mapihook/src/nsMapiSupport.h

@@ -0,0 +1,67 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla
+ *
+ * The Initial Developer of the Original Code is 
+ # Netscape Communications Corp.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef NS_MAPI_SUPPORT_H_
+#define NS_MAPI_SUPPORT_H_
+
+#include <nsIObserver.h>
+#include <nsIMapiSupport.h>
+#include "msgMapiFactory.h"
+
+
+#define NS_IMAPISUPPORT_CID \
+  {0x8967fed2, 0xc8bb, 0x11d5, \
+    { 0xa3, 0xe9, 0x00, 0xb0, 0xd0, 0xf3, 0xba, 0xa7 }}
+
+class nsMapiSupport : public nsIMapiSupport, public nsIObserver
+{
+    public :
+
+        nsMapiSupport();
+        ~nsMapiSupport();
+
+        // Declare all interface methods we must implement.
+        NS_DECL_ISUPPORTS
+        NS_DECL_NSIOBSERVER
+        NS_DECL_NSIMAPISUPPORT
+
+    private :
+
+        DWORD   m_dwRegister;
+        nsMapiFactory *m_nsMapiFactory;
+};
+
+#endif  // NS_MAPI_SUPPORT_H_

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

@@ -0,0 +1,64 @@
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DEPTH=..\..\..
+MODULE=mapiguts
+
+################################################################################
+## exports
+
+#EXPORTS =
+
+
+################################################################################
+## library
+
+LIBNAME = .\$(OBJDIR)\mapiguts
+
+!ifdef MOZ_STATIC_COMPONENT_LIBS
+LIB = $(LIBNAME).lib
+!else
+DLL = $(LIBNAME).dll
+!endif
+
+DEFINES= -NS_DEBUG
+
+OBJS=										\
+    .\$(OBJDIR)\mapihook.obj  \
+    .\$(OBJDIR)\mapimail.obj  \
+		$(NULL)
+
+LLIBS=										\
+			$(LLIBS)						\
+			$(LIBNSPR)						\
+			$(DIST)\lib\xppref32.lib		\
+			$(DIST)\lib\xpcom.lib       	\
+			$(DIST)\lib\mapiutils_s.lib  \
+			$(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+!ifdef MOZ_STATIC_COMPONENT_LIBS
+install:: $(LIb)
+	$(MAKE_INSTALL)  $(LIBNAME).$(LIB_SUFFIX) $(DIST)\bin\components
+!else
+install:: $(DLL)
+	$(MAKE_INSTALL)  $(LIBNAME).$(DLL_SUFFIX) $(DIST)\bin\components
+!endif

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

@@ -0,0 +1,48 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+#ifndef _MAPI_HOOK_H_
+#define _MAPI_HOOK_H_
+
+#include <structs.h>    // for MWContext
+
+//
+// This is the entry point to the MAPI session manager that lives
+// inside of Communicator.
+// 
+LONG ProcessNetscapeMAPIHook(WPARAM wParam, LPARAM lParam);
+
+#endif // _MAPI_HOOK_H_

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

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

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

@@ -0,0 +1,89 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+#ifndef _MAPI_MAIL_H_
+#define _MAPI_MAIL_H_
+
+#include "nscpmapi.h"
+#include <structs.h>    // for MWContext
+
+//extern "C" {
+
+//
+// This function will create a composition window and either do
+// a blind send or pop up the compose window for the user to 
+// complete the operation
+//
+// Return: appropriate MAPI return code...
+//
+//
+extern "C" LONG
+DoFullMAPIMailOperation(MAPISendMailType      *sendMailPtr,
+											  const char            *pInitialText,
+                        BOOL                  winShowFlag);
+
+//
+// This function will create a composition window and just attach
+// the attachments of interest and pop up the window...
+//
+// Return: appropriate MAPI return code...
+//
+//
+extern "C" LONG
+DoPartialMAPIMailOperation(MAPISendDocumentsType *sendDocPtr);
+
+//
+// This function will save a message into the Communicator "Drafts"
+// folder with no UI showing.
+//
+// Return: appropriate MAPI return code...
+//
+//
+extern "C" LONG 
+DoMAPISaveMailOperation(MAPISendMailType      *sendMailPtr,
+											  const char            *pInitialText);
+
+//
+// This will fire off a "get mail in background operation" in an
+// async. fashion.
+//
+extern "C" void
+MAPIGetNewMessagesInBackground(void);
+
+
+// } // extern "C"
+
+#endif // _MAPI_MAIL_H_

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

@@ -19,40 +19,32 @@
 #
 # Contributor(s): 
 
-DEPTH=..\..\..\..
-MODULE=bookmarks
-REQUIRES	= xpcom \
-		  string \
-		  rdf \
-		  appshell \
-		  widget \
-		  necko \
-		  nkcache \
-		  uconv \
-		  pref \
-		  dom \
-		  intl \
-		  webshell \
-		  windowwatcher \
-		  unicharutil \
-		  $(NULL)
+DEPTH=..\..\..
+MODULE=mapiutils
 
-CPP_OBJS=                               \
- .\$(OBJDIR)\nsBookmarksService.obj     \
- $(NULL)
+include <$(DEPTH)\config\config.mak>
 
-LIBRARY_NAME=bookmarks_s
+################################################################################
+## exports
 
-LCFLAGS = \
-        $(LCFLAGS) \
-        $(DEFINES) \
-        $(NULL)
+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>
 
-libs:: $(LIBRARY)
+install:: $(LIBRARY)
 	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
 
 clobber::
-        rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
-
+	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib

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

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

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

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

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

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

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

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

mozilla/mailnews/mapi/old/makefile.win

@@ -19,9 +19,8 @@
 #
 # Contributor(s): 
 
-DEPTH=..\..\..\..
+DEPTH=..\..
 
-DIRS= locale
+DIRS=public lib mapi32 tests hook
 
 include <$(DEPTH)\config\rules.mak>
-

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

@@ -0,0 +1,100 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+//
+//  DLLMain to get a handle on an hInstance 
+//  Written by: Rich Pizzarro (rhp@netscape.com)
+//  November 1997
+#include <windows.h>
+
+//  
+// global variables
+//
+HINSTANCE hInstance;
+
+//
+// DLL entry
+//  
+#ifdef WIN32
+/****************************************************************************
+   FUNCTION: DllMain(HANDLE, DWORD, LPVOID)
+
+   PURPOSE:  DllMain is called by Windows when
+             the DLL is initialized, Thread Attached, and other times.
+             Refer to SDK documentation, as to the different ways this
+             may be called.
+             
+             The DllMain function should perform additional initialization
+             tasks required by the DLL.  In this example, no initialization
+             tasks are required.  DllMain should return a value of 1 if
+             the initialization is successful.
+           
+*******************************************************************************/
+BOOL APIENTRY DllMain(HANDLE hInstLocal, DWORD ul_reason_being_called, LPVOID lpReserved) 
+{
+  hInstance = (HINSTANCE)hInstLocal;
+
+  if (hInstance != NULL) 
+	  return 1;
+  else  
+	  return 0;
+}
+
+#else  // WIN16
+
+
+//--------------------------------------------------------------------
+// LibMain( hInstance, wDataSegment, wHeapSize, lpszCmdLine ) : WORD
+//
+//    hInstance      library instance handle
+//    wDataSegment   library data segment
+//    wHeapSize      default heap size
+//    lpszCmdLine    command line arguments
+//
+//--------------------------------------------------------------------
+
+int CALLBACK LibMain(HINSTANCE hInstLocal, WORD wDataSegment, WORD wHeapSize, LPSTR lpszCmdLine) 
+{
+  hInstance = hInstLocal;
+  /* return result 1 = success; 0 = fail */
+  if (hInstance != NULL) 
+	  return 1;
+  else
+	  return 0;
+}
+
+#endif // WIN16
+

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

@@ -0,0 +1,70 @@
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DEPTH=..\..\..
+MODULE=mapi32
+
+################################################################################
+## exports
+
+#EXPORTS =
+
+
+################################################################################
+## library
+
+LIBNAME = .\$(OBJDIR)\mapi32
+DEFINES= -NS_DEBUG
+DEFFILE=MAPI32.def
+
+!ifdef MOZ_STATIC_COMPONENT_LIBS
+LIB = $(LIBNAME).lib
+!else
+DLL = $(LIBNAME).dll
+!endif
+
+OBJS=										\
+    .\$(OBJDIR)\maindll.obj  \
+    .\$(OBJDIR)\mapi32.obj  \
+    .\$(OBJDIR)\mapiipc.obj  \
+    .\$(OBJDIR)\mapimem.obj  \
+    .\$(OBJDIR)\mapiutl.obj  \
+    .\$(OBJDIR)\smem.obj  \
+    .\$(OBJDIR)\trace.obj  \
+    .\$(OBJDIR)\xpapi.obj  \
+		$(NULL)
+
+LLIBS=										\
+			$(LLIBS)						\
+			$(LIBNSPR)						\
+			$(DIST)\lib\xppref32.lib		\
+			$(DIST)\lib\xpcom.lib       	\
+			$(DIST)\lib\mapiutils_s.lib  \
+			$(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+!ifdef MOZ_STATIC_COMPONENT_LIBS
+install:: $(LIB)
+	$(MAKE_INSTALL)  $(LIBNAME).$(LIB_SUFFIX) $(DIST)\bin\components
+!else
+install:: $(DLL)
+	$(MAKE_INSTALL)  $(LIBNAME).$(DLL_SUFFIX) $(DIST)\bin\components
+!endif

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

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

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

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

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

@@ -0,0 +1,249 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+//
+//  MAPI IPC Routines
+//  Written by: Rich Pizzarro (rhp@netscape.com)
+//  November 1997
+//
+#include <windows.h>
+#include <windowsx.h>
+#include <nscpmapi.h>   // Should live in Communicator
+
+#include "resource.h"
+#include "mapiipc.h"
+#include "mapismem.h"
+#include "trace.h"
+
+#ifndef WIN32
+#include <string.h>
+#endif 
+
+//
+// Necessary variables...
+//
+static LONG       instanceCount = 0;
+HWND				      hWndMAPI = NULL;
+char				      szClassName[] = "NetscapeMAPIClient";
+char              szWindowName[] = "NetscapeMAPI";
+
+//
+// External declares...
+//
+extern HINSTANCE  hInstance;
+
+void 
+ProcessCommand(HWND hWnd, int id, HWND hCtl, UINT codeNotify) 
+{ 
+	switch (id) 
+	{
+	case IDOK:   
+	case IDCANCEL:
+		{
+			ShowWindow(hWnd, SW_HIDE);
+		}
+		
+	default:
+		;
+	}
+}
+
+BOOL CALLBACK LOADDS 
+MyDlgProc(HWND hWndMain, UINT wMsg, WPARAM wParam, LPARAM lParam) 
+{
+  switch (wMsg) 
+  {
+  case WM_INITDIALOG: 
+    {
+      hWndMAPI = hWndMain;
+    }
+    break;
+    
+  case WM_CLOSE:
+//    DestroyWindow(hWndMain);
+    break;
+    
+  case WM_DESTROY:
+    hWndMain = NULL;
+    break;
+
+  case WM_COMMAND:
+	  HANDLE_WM_COMMAND(hWndMAPI, wParam, lParam, ProcessCommand);
+    break;
+
+  default:
+    return FALSE;
+  }
+
+  return TRUE;
+}
+
+BOOL 
+InitInstance(HINSTANCE hInstance)
+{
+  //
+  // Create a main window for this application instance.  
+  //
+  /* RICHIE - TRY SOME CHANGES!!!
+  hWndMAPI = CreateDialog((HINSTANCE) hInstance, 
+        MAKEINTRESOURCE(ID_DIALOG_QAHOOK),
+        (HWND) NULL, (DLGPROC) MyDlgProc);
+   ******/
+  hWndMAPI = CreateWindow(
+              szClassName,	// pointer to registered class name
+              szWindowName,	// pointer to window name
+              WS_CHILD,	    // window style
+              -10,          	// horizontal position of window
+              -10,	          // vertical position of window
+              1,	          // window width
+              1,	          // window height
+              GetDesktopWindow(),	// handle to parent or owner window
+              NULL,	        // handle to menu or child-window identifier
+              hInstance,	  // handle to application instance
+              NULL          // pointer to window-creation data
+              );
+  if (!hWndMAPI)
+    return FALSE;
+  else
+    return TRUE;
+}
+
+BOOL 
+InitApp(void)
+{
+#ifdef WIN32
+  WNDCLASS wc;
+  wc.style         = 0; 
+  wc.lpfnWndProc   = DefDlgProc; 
+  wc.cbClsExtra    = 0; 
+  wc.cbWndExtra    = DLGWINDOWEXTRA; 
+  wc.hInstance     = hInstance; 
+  wc.hIcon         = LoadIcon(hInstance, MAKEINTRESOURCE(ID_ICON_APP)); 
+  wc.hCursor       = LoadCursor(0, IDC_ARROW); 
+  wc.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1);
+  wc.lpszMenuName  = NULL; 
+  wc.lpszClassName = szClassName;
+  
+  if(!RegisterClass(&wc))
+    return FALSE;
+#endif
+  
+  return TRUE;
+} // end InitApp
+
+BOOL
+InitDLL(void)
+{
+  if (hWndMAPI != NULL)
+    return TRUE;
+
+  if (!InitApp()) 
+  { 
+    return FALSE;
+  }
+  
+  if (!InitInstance(hInstance)) 
+  {    
+    return FALSE;
+  }
+  
+//  ShowWindow(hWndMAPI, SW_SHOW);    Just for jollies
+  return(TRUE);
+}
+
+//*************************************************************
+//* Calls exposed for rest of DLL...
+//*************************************************************
+//
+// Purpose: Open the API
+// Return: 1 on success
+//         0 on failure
+//
+DWORD nsMAPI_OpenAPI(void)
+{
+  if (instanceCount > 0)
+  {
+    return(1);
+  }
+
+  ++instanceCount;
+  return(1);
+}
+
+//
+// Purpose: Close the API
+//
+void nsMAPI_CloseAPI(void)
+{
+  --instanceCount;
+  if (instanceCount <= 0)
+  {
+    instanceCount = 0;
+  }
+
+  return;
+}
+
+//
+// Send the actual request to Communicator
+//
+LRESULT
+SendMAPIRequest(HWND hWnd, 
+                DWORD mapiRequestID, 
+                MAPIIPCType *ipcInfo)
+{
+LRESULT         returnVal = 0;
+COPYDATASTRUCT  cds;
+
+  if (!InitDLL())
+  {
+    return 0;
+  }
+
+  cds.dwData = mapiRequestID;
+  cds.cbData = sizeof(MAPIIPCType);
+  cds.lpData = ipcInfo;
+
+  // Make the call into Communicator
+  returnVal = SendMessage(hWnd, WM_COPYDATA, (WPARAM) hWndMAPI, (LPARAM) &cds);
+
+  // Now kill the window...
+  DestroyWindow(hWndMAPI);
+  hWndMAPI = NULL;
+  UnregisterClass(szClassName, hInstance);
+  
+  return returnVal;
+}

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

@@ -0,0 +1,63 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+#ifndef __MAPIIPC_HPP__
+#define __MAPIIPC_HPP__
+
+#include "port.h"
+#include <nscpmapi.h>
+
+//********************************************************
+// Open and close functions for API
+//********************************************************
+// Open the API
+// Return: 1 on success, 0 on failure
+//
+DWORD nsMAPI_OpenAPI(void);
+
+//
+// Purpose: Close the API
+//
+void  nsMAPI_CloseAPI(void);
+
+//
+// Send the actual request to Communicator
+//
+LRESULT   SendMAPIRequest(HWND hWnd, 
+                DWORD mapiRequestID, 
+                MAPIIPCType *ipcInfo);
+
+#endif // __MAPIIPC_HPP__

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

@@ -0,0 +1,363 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+//
+//  mem.cpp
+//  Written by: Rich Pizzarro (rhp@netscape.com)
+//  November 1997
+//  This implements various memory management functions for use with
+//  MAPI features of Communicator
+//
+#include <windows.h>     
+#include <memory.h> 
+#include <malloc.h>
+#include "mapimem.h"
+#include <nscpmapi.h>   // lives in communicator winfe
+#include "nsstrseq.h"
+#include "trace.h"
+#include "mapiutl.h"
+#include "xpapi.h"
+
+LPSTR
+CheckNullString(LPSTR inStr)
+{
+  static UCHAR  str[1];
+
+  str[0] = '\0';
+  if (inStr == NULL)
+    return((LPSTR)str);
+  else
+    return(inStr);
+}
+
+void
+FreeMAPIFile(lpMapiFileDesc pv)
+{
+  if (!pv)
+    return;
+
+  if (pv->lpszPathName != NULL)   
+    free(pv->lpszPathName);
+
+  if (pv->lpszFileName != NULL)   
+    free(pv->lpszFileName);
+}
+
+void
+FreeMAPIMessage(lpMapiMessage pv)
+{
+  ULONG i;
+
+  if (!pv)
+    return;
+
+  if (pv->lpszSubject != NULL)
+    free(pv->lpszSubject);
+
+  if (pv->lpszNoteText)
+      free(pv->lpszNoteText);
+  
+  if (pv->lpszMessageType)
+    free(pv->lpszMessageType);
+  
+  if (pv->lpszDateReceived)
+    free(pv->lpszDateReceived);
+  
+  if (pv->lpszConversationID)
+    free(pv->lpszConversationID);
+  
+  if (pv->lpOriginator)
+    FreeMAPIRecipient(pv->lpOriginator);
+  
+  for (i=0; i<pv->nRecipCount; i++)
+  {
+    if (&(pv->lpRecips[i]) != NULL)
+    {
+      FreeMAPIRecipient(&(pv->lpRecips[i]));
+    }
+  }
+
+  if (pv->lpRecips != NULL)
+  {
+    free(pv->lpRecips);
+  }
+
+  for (i=0; i<pv->nFileCount; i++)
+  {
+    if (&(pv->lpFiles[i]) != NULL)
+    {
+      FreeMAPIFile(&(pv->lpFiles[i]));
+    }
+  }
+
+  if (pv->lpFiles != NULL)
+  {
+    free(pv->lpFiles);
+  }
+  
+  free(pv);
+  pv = NULL;
+}
+
+void
+FreeMAPIRecipient(lpMapiRecipDesc pv)
+{
+  if (!pv)
+    return;
+
+  if (pv->lpszName != NULL)   
+    free(pv->lpszName);
+
+  if (pv->lpszAddress != NULL)
+    free(pv->lpszAddress);
+
+  if (pv->lpEntryID != NULL)
+    free(pv->lpEntryID);  
+}
+
+//
+// This routine will take an lpMapiMessage structure and "flatten" it into
+// one contiguous chunk of memory that can be easily passed around. After this
+// is done, "extract" routines will be written to get complicated string routines
+// out of the chunk of memory at the end.
+// 
+LPVOID
+FlattenMAPIMessageStructure(lpMapiMessage msg, DWORD *totalSize)
+{
+  MAPISendMailType    *mailPtr;
+  LPSTR               *strArray;
+  DWORD               strCount = 0;
+  DWORD               currentString = 0;
+  DWORD               arrayBufSize = 0;
+  DWORD               i;
+
+  *totalSize = 0;
+  if (!msg)
+    return(NULL);
+
+  //
+  // Allocate the initial structure to hold all of the mail info.
+  //
+  *totalSize = sizeof(MAPISendMailType);
+  mailPtr = (MAPISendMailType *) malloc(sizeof(MAPISendMailType));
+  if (!mailPtr)
+    return(NULL);
+  memset(mailPtr, 0, sizeof(MAPISendMailType));
+
+  //
+  // First, assign all of the easy numeric values...
+  //
+  mailPtr->MSG_flFlags = msg->flFlags;          // unread,return receipt
+  mailPtr->MSG_nRecipCount = msg->nRecipCount;  // Number of recipients
+  mailPtr->MSG_nFileCount = msg->nFileCount;    // # of file attachments
+  if (msg->lpOriginator != NULL)
+  {
+    mailPtr->MSG_ORIG_ulRecipClass = msg->lpOriginator->ulRecipClass; //  Recipient class - MAPI_TO, MAPI_CC, MAPI_BCC, MAPI_ORIG
+  }
+
+  //
+  // Now, figure out how many string pointers we need...
+  //
+  strCount = 4;     // These are the 4 KNOWN strings up front for a message
+  strCount += 2;    // This is for the originator name and address
+
+  strCount += msg->nRecipCount * 3; // Name, address & class (cc, bcc) for each recipient
+  strCount += msg->nFileCount  * 2; // filename and display name for each attachment
+
+  // 
+  // Now allocate a new string sequence...add one entry for NULL at the end
+  //  
+  arrayBufSize = sizeof(LPSTR) * (strCount + 1);
+
+#ifdef WIN16    // Check for max mem allocation...
+  if ((sizeof(MAPISendMailType) + arrayBufSize) > 64000)
+  {
+    free(mailPtr);
+    return NULL;
+  }
+#endif
+
+  //
+  // Allocate a buffer for the string pointers and if this fails, 
+  // cleanup and return.
+  // 
+  strArray = (LPSTR *)malloc( (size_t) arrayBufSize);
+  if (!strArray)
+  {
+    free(mailPtr);
+    return NULL;
+  }
+
+  memset(strArray, 0, (size_t) arrayBufSize);  // Set the array to NULL
+  strArray[currentString++] = CheckNullString(msg->lpszSubject);        // Message Subject
+  strArray[currentString++] = CheckNullString(msg->lpszNoteText);       // Message Text  
+  strArray[currentString++] = CheckNullString(msg->lpszDateReceived);   // in YYYY/MM/DD HH:MM format
+  strArray[currentString++] = CheckNullString(msg->lpszConversationID); // conversation thread ID
+
+  if (msg->lpOriginator)
+  {
+    strArray[currentString++] = CheckNullString(msg->lpOriginator[0].lpszName);
+    strArray[currentString++] = CheckNullString(msg->lpOriginator[0].lpszAddress);
+  }
+  else
+  {
+    strArray[currentString++] = CheckNullString(NULL);
+    strArray[currentString++] = CheckNullString(NULL);
+  }
+
+  //
+  // Assign pointers for the Name and address of each recipient
+  //
+  LPSTR toString  = "1";
+  LPSTR ccString  = "2";
+  LPSTR bccString = "3";
+
+  for (i=0; i<msg->nRecipCount; i++)
+  {
+    // rhp - need message class
+    if (msg->lpRecips[i].ulRecipClass == MAPI_BCC)
+      strArray[currentString++] = CheckNullString(bccString);
+    else if (msg->lpRecips[i].ulRecipClass == MAPI_CC)
+      strArray[currentString++] = CheckNullString(ccString);
+    else
+      strArray[currentString++] = CheckNullString(toString);
+
+    strArray[currentString++] = CheckNullString(msg->lpRecips[i].lpszName);
+    strArray[currentString++] = CheckNullString(msg->lpRecips[i].lpszAddress);  
+  }
+
+  BYTE    szNewFileName[_MAX_PATH];
+
+  for (i=0; i<msg->nFileCount; i++)
+  {
+    char *namePtr;
+    // have to copy/create temp files here of office won't work...
+
+    if ( 
+          (msg->lpFiles[i].lpszFileName != NULL) &&
+          (*msg->lpFiles[i].lpszFileName != '\0') 
+       )
+    {
+      namePtr = (char *)msg->lpFiles[i].lpszFileName;
+    }
+    else
+    {
+      namePtr = (char *)msg->lpFiles[i].lpszPathName;
+    }
+
+    if (GetTempMailNameWithExtension((char *)szNewFileName, namePtr) == 0)
+    {
+      free(strArray);
+      free(mailPtr);
+      return NULL;
+    }
+    
+    if (!XP_CopyFile((char *)msg->lpFiles[i].lpszPathName, (char *)szNewFileName, TRUE))
+    {
+      free(strArray);
+      free(mailPtr);
+      return NULL;
+    }
+
+    strArray[currentString++] = CheckNullString((char *)szNewFileName);
+    strArray[currentString++] = CheckNullString(msg->lpFiles[i].lpszFileName);
+
+    AddTempFile((LPSTR) szNewFileName);
+//    strArray[currentString++] = CheckNullString(msg->lpFiles[i].lpszPathName);
+//    strArray[currentString++] = CheckNullString(msg->lpFiles[i].lpszFileName);
+  }
+
+  if (currentString != strCount)
+  {
+    TRACE("MAPI PROBLEM!!!!!! FlattenMAPIMessageStructure() currentString != strCount\n");
+  }
+
+  strArray[strCount] = NULL;    // terminate at the end
+  NSstringSeq strSeq = NSStrSeqNew(strArray);
+  if (!strSeq)
+  {
+    free(strArray);
+    free(mailPtr);
+    return NULL;
+  }
+  
+  //
+  // Now we need to copy the structure into a big, contiguous chunk of memory
+  //
+  LONG totalArraySize = NSStrSeqSize(strSeq);
+  LONG totalMemSize = sizeof(MAPISendMailType) + totalArraySize;
+
+#ifdef WIN16
+  if (totalMemSize > 64000)
+  {
+    free(strArray);
+    NSStrSeqDelete(strSeq);
+    free(mailPtr);
+    return NULL;
+  }
+#endif
+
+  MAPISendMailType *newMailPtr = (MAPISendMailType *)malloc((size_t)totalMemSize);
+  if (!newMailPtr)
+  {
+    free(strArray);
+    NSStrSeqDelete(strSeq);
+    free(mailPtr);
+    return NULL;
+  }
+
+  memset(newMailPtr, 0, (size_t) totalMemSize);
+  //
+  // Finally do the copy...
+  //
+  memcpy(newMailPtr, mailPtr, sizeof(MAPISendMailType));
+  memcpy(newMailPtr->dataBuf, strSeq, (size_t) totalArraySize);
+  *totalSize = totalMemSize;
+
+  //
+  // Cleanup and scram...
+  //
+  if (strArray)
+    free(strArray);
+
+  if (strSeq)
+    NSStrSeqDelete(strSeq);
+
+  if (mailPtr)
+    free(mailPtr);
+
+  return(newMailPtr);
+}

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

@@ -0,0 +1,76 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+#ifndef __MY_MEM_HPP__
+#define __MY_MEM_HPP__
+
+#ifndef MAPI_OLE	// Because MSFT doesn't do this for us :-(
+#include <mapi.h>                                                 
+#endif
+
+//
+// Needed for turning NULL's into ""'s for string sequence routines...
+//
+LPSTR     CheckNullString(LPSTR inStr);
+
+//
+// Memory allocation functions...
+//
+
+//
+// This will free an lpMapiMessage structure allocated by this DLL
+//
+void      FreeMAPIMessage(lpMapiMessage pv);
+
+//
+// This will free an lpMapiRecipDesc structure allocated by this DLL
+//
+void      FreeMAPIRecipient(lpMapiRecipDesc pv);
+
+//
+// Frees a mapi file object...
+//
+void      FreeMAPIFile(lpMapiFileDesc pv);
+
+//
+// This routine will take an lpMapiMessage structure and "flatten" it into
+// one contiguous chunk of memory that can be easily passed around. 
+// 
+LPVOID    FlattenMAPIMessageStructure(lpMapiMessage msg, DWORD *totalSize);
+
+
+
+#endif  // __MY_MEM_HPP__

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

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

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

@@ -0,0 +1,89 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+#ifndef __UTILS_
+#define __UTILS_
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#ifndef MAPI_OLE	// Because MSFT doesn't do this for us :-(
+#include <mapi.h>
+#endif
+
+//
+// Utility functions...
+//
+void    SetLoggingEnabled(BOOL val);    // Set a logging enabled flag
+void    LogString(LPCSTR pStr1);        // Log a string to a file...
+void    BuildMemName(LPSTR name, ULONG winSeed);  // Shared memory name
+HWND    GetCommunicatorIPCWindow(void);    // Get the IPC window we will use...
+DWORD   SanityCheckAttachmentFiles(lpMapiMessage lpMessage); // Check attachments
+DWORD   ValidateFile(LPCSTR szFile);       // Is this a valid file - 0=Yes 1 = NOT_FOUND 2 = OPEN_FAILURE
+
+DWORD   GetFileCount(LPSTR pFiles, LPSTR delimChar); // Get File count from string of file1;file2, etc..
+BOOL    ExtractFile(LPSTR pFiles, LPSTR delimChar, DWORD fIndex, LPSTR fName); // Extract a filename from a string
+
+LPVOID  LoadBlobToMemory(LPSTR fName);  // Load the blob into memory!
+LONG    GetTempAttachmentName(LPSTR fName); // Get a temp file name and put it in fName
+
+UINT    GetTempMailNameWithExtension(LPSTR szTempFileName, LPSTR origName);
+void    CleanupMAPITempFiles(void);
+void  AddTempFile(LPCSTR pFileName);
+
+void    *CleanMalloc(size_t mallocSize);
+void    SafeFree(void *ptr);
+
+//
+// RICHIE - this is a temporary fix for now to get rid of
+// html stuff within the text of a message - if there was a
+// valid noteText buffer coming into this call, we need to 
+// free it on the way out.
+//
+LPSTR   StripHTML(LPSTR noteText);
+
+//
+// Write a buffer to disk
+// Return 0 on success -1 on failure
+//
+LONG    WriteMemoryBufferToDisk(LPSTR fName, LONG bufSize, LPSTR buf); 
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // __UTILS_

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

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

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

@@ -0,0 +1,54 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+//{{NO_DEPENDENCIES}}
+// Microsoft Developer Studio generated include file.
+// Used by mapi32.rc
+//
+#define ID_DIALOG_QAHOOK                101
+#define ID_DIALOG_MAPI                  101
+#define ID_ICON_APP                     102
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        103
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1000
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif

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

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

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

@@ -1,4 +1,4 @@
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- 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
  *
@@ -20,7 +20,6 @@
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
- *   Ben Goodger <ben@netscape.com> (Original Author)
  *
  * 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 
@@ -35,30 +34,35 @@
  * 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 
 
-////////////////////////////////////////////////////////////////////////////////
-// Get the two bookmarks utility libraries running, attach controllers, focus
-// tree widget, etc. 
-function Startup() 
+#ifndef WIN16
+void CDECL AfxTrace(LPCTSTR lpszFormat, ...)
+#else                                       
+void CDECL AfxTrace(LPCSTR lpszFormat, ...)
+#endif
 {
-  var bookmarksView = document.getElementById("bookmarks-view");  
-  bookmarksView.treeBoxObject.selection.select(0);
+  va_list args;
+	va_start(args, lpszFormat);
+
+	int nBuf;
+	TCHAR szBuffer[512];
+
+	nBuf = _vstprintf(szBuffer, lpszFormat, args);
+	va_end(args);
+  OutputDebugString(szBuffer); 
+  return;
 }
 
-function manageBookmarks() {
-  openDialog("chrome://communicator/content/bookmarks/bookmarks.xul", "", "chrome,dialog=no,resizable=yes");
+BOOL AfxAssertFailedLine(LPCSTR lpszFileName, int nLine)
+{    
+	return TRUE;
 }
 
-function addBookmark() {
-  var contentArea = top.document.getElementById('content');                   
-  if (contentArea) {
-    const browsers = contentArea.browsers;
-    if (browsers.length > 1)
-      BookmarksUtils.addBookmarkForTabBrowser(contentArea);
-    else
-      BookmarksUtils.addBookmarkForBrowser(contentArea.webNavigation, true);    
-  }
-  else
-    BookmarksUtils.addBookmark(null, null, undefined, true);
-}
+#endif

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

@@ -0,0 +1,81 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+#include <windows.h>
+
+#ifdef _DEBUG
+BOOL AfxAssertFailedLine(LPCSTR lpszFileName, int nLine);
+
+#ifndef WIN16
+void CDECL AfxTrace(LPCTSTR lpszFormat, ...);
+#else
+void CDECL AfxTrace(LPCSTR lpszFormat, ...);
+#endif
+
+#define TRACE              ::AfxTrace
+#define THIS_FILE          __FILE__
+#define ASSERT(f) \
+	do \
+	{ \
+	if (!(f) && AfxAssertFailedLine(THIS_FILE, __LINE__)) \
+		AfxDebugBreak(); \
+	} while (0) \
+
+#define VERIFY(f)          ASSERT(f)
+#define TRACE_FN(name) LogFn __logFn(name)
+class LogFn
+{
+public:
+	LogFn(LPCSTR pFnName) {m_pFnName = pFnName; TRACE("--%s: In--\n", pFnName);}
+	~LogFn() {TRACE("--%s: Out--\n", m_pFnName);}
+private:
+	LPCSTR m_pFnName;
+};
+#else
+// NDEBUG
+#define ASSERT(f)          ((void)0)
+#define VERIFY(f)          ((void)(f))
+#define ASSERT_VALID(pOb)  ((void)0)
+#define DEBUG_ONLY(f)      ((void)0)   
+#ifdef WIN32
+inline void CDECL AfxTrace(LPCTSTR, ...) { }
+#else
+inline void CDECL AfxTrace(LPCSTR, ...) { }
+#endif
+#define TRACE              1 ? (void)0 : ::AfxTrace
+#define TRACE_FN(name)
+#endif // _DEBUG
+

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

@@ -0,0 +1,347 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+//
+//  XPAPI.CPP
+//  API implementation file for mapi16.dll and mapi32.dll
+//  Written by: Rich Pizzarro (rhp@netscape.com)
+//  November 1997
+//
+#include <windows.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include "xpapi.h"
+#include "mapiutl.h"
+
+WORD LOAD_DS XP_CallProcess(LPCSTR pPath, LPCSTR pCmdLine)
+{            
+	WORD wReturn = 0;
+#ifndef WIN16
+	STARTUPINFO startupInfo;
+	PROCESS_INFORMATION processInfo;
+
+	memset(&startupInfo, 0, sizeof(startupInfo));
+	startupInfo.cb = sizeof(startupInfo);
+	if (wReturn = CreateProcess(pPath, (LPTSTR)pCmdLine, NULL, NULL, FALSE, CREATE_DEFAULT_ERROR_MODE | CREATE_NEW_PROCESS_GROUP, NULL, NULL, &startupInfo, &processInfo))
+	{
+		WaitForInputIdle(processInfo.hProcess, 120000);
+	}
+#else       
+	// char szMsg[80];	
+	char szExecute[512];
+	lstrcpy(szExecute, pPath);
+	lstrcat(szExecute, " ");
+	lstrcat(szExecute, pCmdLine);
+	wReturn = WinExec(szExecute,SW_SHOW);
+	
+	if (wReturn < 32) 
+	{
+	    wReturn = 0;
+	}
+#endif
+	return wReturn;
+}
+
+HKEY LOAD_DS RegOpenParent(LPCSTR pSection, HKEY hRootKey, REGSAM access)
+{
+	HKEY hKey;
+#ifndef WIN16
+	if (RegOpenKeyEx(hRootKey, pSection, 0, access, &hKey) != ERROR_SUCCESS)
+	{
+		return(NULL);
+	}        
+#else
+    if (RegOpenKey(hRootKey, pSection, &hKey) != ERROR_SUCCESS)
+    {
+    	return(NULL);
+    }
+#endif
+	return(hKey);
+}
+
+HKEY LOAD_DS RegCreateParent(LPCSTR pSection, HKEY hMasterKey)
+{
+	HKEY hKey;
+	if (RegCreateKey(hMasterKey, pSection, &hKey) != ERROR_SUCCESS)
+	{
+		return(NULL);
+	}        
+	return(hKey);
+}
+
+BOOL LOAD_DS GetConfigInfoStr(LPCSTR pSection, LPCSTR pKey, LPSTR pBuf, int lenBuf, HKEY hMasterKey)
+{
+	HKEY hKey;
+	hKey = RegOpenParent(pSection, hMasterKey, KEY_QUERY_VALUE);
+	if (!hKey)
+	{
+		return(FALSE);
+	}
+
+	DWORD len = (DWORD)lenBuf;
+#ifndef WIN16
+	BOOL retVal = (RegQueryValueEx(hKey, pKey, NULL, NULL, (LPBYTE)pBuf, &len) == ERROR_SUCCESS);
+#else
+	BOOL retVal = (RegQueryValue(hKey, pKey, pBuf, (long far*)&len) == ERROR_SUCCESS);
+#endif
+	RegCloseKey(hKey);
+	return(retVal);
+}
+
+BOOL LOAD_DS GetConfigInfoNum(LPCSTR pSection, LPCSTR pKey, DWORD* pVal, HKEY hMasterKey)
+{
+	HKEY hKey;
+	hKey = RegOpenParent(pSection, hMasterKey, KEY_QUERY_VALUE);
+	if (!hKey)
+	{
+		return(FALSE);
+	}
+
+	DWORD len = sizeof(DWORD);
+#ifndef WIN16
+	BOOL retVal = (RegQueryValueEx(hKey, pKey, NULL, NULL, (LPBYTE)pVal, &len) == ERROR_SUCCESS);
+#else
+	BOOL retVal = (RegQueryValue(hKey, pKey, (char far*)pVal, (long far*)&len) == ERROR_SUCCESS);
+#endif
+	RegCloseKey(hKey);
+	return(retVal);
+}
+
+BOOL LOAD_DS SetConfigInfoStr(LPCSTR pSection, LPCSTR pKey, LPSTR pStr, HKEY hMasterKey)
+{
+	HKEY hKey;
+	hKey = RegCreateParent(pSection, hMasterKey);
+	if (!hKey)
+	{
+		return(FALSE);
+	}
+#ifndef WIN16
+	BOOL retVal = (RegSetValueEx(hKey, pKey, 0, REG_SZ, (LPBYTE)pStr, lstrlen(pStr) + 1) == ERROR_SUCCESS);
+#else
+	BOOL retVal = (RegSetValue(hKey, pKey, REG_SZ, pStr, lstrlen(pStr) + 1) == ERROR_SUCCESS);
+#endif
+	RegCloseKey(hKey);
+	return(retVal);
+}
+
+
+BOOL LOAD_DS XP_GetInstallDirectory(LPCSTR pcurVersionSection, LPCSTR pInstallDirKey, LPSTR path, UINT nSize, HKEY hKey)
+{   
+#ifdef WIN32   
+	if (!GetConfigInfoStr(pcurVersionSection, pInstallDirKey, path, nSize, hKey))
+	{  
+		return FALSE;
+	}
+	else
+	{
+		return TRUE;
+	}       
+#else
+	if ( 0 < GetPrivateProfileString(pcurVersionSection, pInstallDirKey,"ERROR", path, nSize, szNetscapeINI))
+	{
+		return TRUE;
+	}
+	else
+	{
+		return FALSE;
+	}
+#endif
+}
+
+
+BOOL LOAD_DS XP_GetVersionInfoString(LPCSTR pNavigatorSection, LPCSTR pCurrentVersionKey, LPSTR pcurVersionStr, UINT nSize, HKEY hKey)
+{ 
+#ifdef WIN32
+	if (!GetConfigInfoStr(pNavigatorSection, pCurrentVersionKey, pcurVersionStr, nSize, HKEY_LOCAL_MACHINE))
+	{
+		return FALSE;
+	}               
+	else
+	{
+		return TRUE;
+	}
+#else 
+	if ( 0 < GetPrivateProfileString(pNavigatorSection, pCurrentVersionKey,"ERROR", pcurVersionStr, nSize, szNetscapeINI))
+	{
+		return TRUE;
+	}
+	else
+	{
+		return FALSE;
+	}
+#endif
+
+}   
+
+DWORD LOAD_DS XP_GetInstallLocation(LPSTR pPath, UINT nSize)
+{           
+char curVersionStr[256]; 
+char curVersionSection[256];
+
+  if (!pPath) 
+    return  MAPI_E_LOGON_FAILURE;
+  
+#ifdef WIN32
+  if (!XP_GetVersionInfoString(szNavigatorSection, szCurrentVersionKey, curVersionStr, 
+    sizeof(curVersionStr), HKEY_LOCAL_MACHINE))
+  {
+    return (MAPI_E_LOGON_FAILURE);
+  }
+  
+  wsprintf(curVersionSection, szNavigatorCurVersionSection, curVersionStr);
+		
+  if (!XP_GetInstallDirectory(curVersionSection, szInstallDirKey, pPath, 
+    nSize, HKEY_LOCAL_MACHINE))
+  {
+    return (MAPI_E_ACCESS_DENIED);
+    
+  }
+  
+  lstrcat(pPath, "\\");
+  lstrcat(pPath, "Program\\netscape.exe");
+  
+  return SUCCESS_SUCCESS;
+#else
+  if (32 == Is_16_OR_32_BIT_CommunitorRunning())
+  {   
+    if (!GetConfigInfoStr("snews\\shell\\open", "command", curVersionStr, sizeof(curVersionStr), HKEY_CLASSES_ROOT))
+    {
+      return (MAPI_E_ACCESS_DENIED);
+    }
+    else
+    {	
+      char *pFind = strstr(curVersionStr,"-h");
+      
+      if (pFind)
+      {
+        *pFind=0;
+        lstrcpy(pPath,curVersionStr);
+      }
+      else
+      {
+        return (MAPI_E_ACCESS_DENIED);
+      }
+    }
+    
+    return SUCCESS_SUCCESS;
+  }
+  else //setup up to start navstart since we are a sixteen bit DLL.
+  {
+    if (!XP_GetVersionInfoString(szNavigatorSection, szCurrentVersionKey, curVersionStr, sizeof(curVersionStr), HKEY_LOCAL_MACHINE))
+    {
+      return (MAPI_E_LOGON_FAILURE);
+    }
+    
+    wsprintf(curVersionSection, szNavigatorCurVersionSection, curVersionStr);
+    
+    if (!XP_GetInstallDirectory(curVersionSection, szInstallDirKey, pPath,nSize, HKEY_LOCAL_MACHINE))
+    {
+      return (MAPI_E_ACCESS_DENIED);		
+    }
+    
+    lstrcat(pPath, "\\");
+    lstrcat(pPath, "NAVSTART.EXE");
+    return SUCCESS_SUCCESS;	
+  }
+#endif
+}
+
+int LOAD_DS Is_16_OR_32_BIT_CommunitorRunning()
+{
+  if (FindWindow("AfxFrameOrView", NULL) && !FindWindow("aHiddenFrameClass", NULL))
+		return(16);
+	else if (FindWindow("aHiddenFrameClass", NULL))
+		return(32);
+	else 
+		return 0;
+}
+
+// size of buffer to use for copying files.
+#define COPYBUFSIZE 1024
+
+#ifdef WIN16
+     
+BOOL Win16CopyFile(LPCSTR a_Src, LPCSTR a_Dest, BOOL a_bOverwrite)
+{
+	OFSTRUCT ofSrc, ofDest;
+	HFILE hSrc, hDest;
+	BOOL bResult;
+	
+	ofDest.cBytes = ofSrc.cBytes = sizeof(OFSTRUCT);
+	hDest = OpenFile(a_Dest, &ofDest, OF_EXIST);
+	if (hDest != HFILE_ERROR && !a_bOverwrite)
+		bResult = FALSE;	// file exists but caller doesn't want file overwritten
+	else { // file either doesn't exist, or caller wants it overwritten.
+		hSrc = OpenFile(a_Src, &ofSrc, OF_READ);
+		hDest = OpenFile(a_Dest, &ofDest, OF_WRITE | OF_CREATE);
+		if (hSrc != HFILE_ERROR && hDest != HFILE_ERROR) {
+			unsigned char buf[COPYBUFSIZE];
+			UINT bufsize =  COPYBUFSIZE;
+			UINT bytesread;
+			
+			bResult = TRUE;			
+			while (0 != (bytesread = _lread(hSrc, (LPVOID)buf, bufsize))) {
+				if ((bytesread == HFILE_ERROR) || 	// check for read error...
+											// and write error
+					(bytesread != _lwrite(hDest, (LPVOID)buf, bytesread))) {
+					bResult = FALSE; // could be out of diskspace
+					break;
+				}
+			}
+		}
+		else
+			bResult = FALSE;
+
+		if (hSrc != HFILE_ERROR)
+			_lclose(hSrc);
+		if (hDest != HFILE_ERROR)
+			_lclose(hDest);
+	}
+			
+	return bResult;
+}
+
+#endif  // WIN16
+
+BOOL LOAD_DS 
+XP_CopyFile(LPCSTR lpExistingFile, LPCSTR lpNewFile, BOOL bFailifExist)
+{                                                  
+#ifdef WIN32
+  return	CopyFile(lpExistingFile, lpNewFile, bFailifExist);
+#else                                                             
+  return    Win16CopyFile(lpExistingFile, lpNewFile, TRUE);
+#endif
+}    

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

@@ -0,0 +1,138 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+//
+//  Various routines for MAPI functions.
+//  Written by: Rich Pizzarro (rhp@netscape.com)
+//  November 1997
+//
+#ifndef __XPAPI_H
+#define __XPAPI_H
+
+#ifdef WIN16
+
+#include <string.h>
+#include <direct.h>
+#include <shellapi.h>
+#include <stdlib.h>
+#else
+#include <winreg.h>
+#endif 
+ 
+#ifdef WIN16
+extern "C" {
+#ifndef MAPI_OLE	// Because MSFT doesn't do this for us :-(
+#include <mapi.h>
+#endif 
+}           
+#else
+//#include <mapi.h>
+#endif
+
+
+#ifdef WIN32
+#define MAPI_IMPLEMENT(param) param PASCAL 
+#define LOAD_DS
+#else        
+#define LOAD_DS 	__loadds
+#define MAPI_IMPLEMENT(param) extern "C" param FAR PASCAL
+ 
+#endif   
+
+#ifdef WIN16
+#define _MAX_PATH 				260  /* max. length of full pathname*/
+#define MAPI_E_LOGON_FAILURE  	3 
+#define MAPI_E_ACCESS_DENIED	6  
+#define INVALID_HANDLE_VALUE 	(HANDLE)-1  
+#define KEY_QUERY_VALUE 		0x0001  
+#define HKEY_LOCAL_MACHINE 		((HKEY)0x80000002)
+#define HKEY_ROOT				HKEY_CLASSES_ROOT
+#else 
+#define HKEY_ROOT				((HKEY)0x80000002)
+#endif
+
+//
+// registry keys
+//
+#ifdef WIN32
+static char szNavigatorSection[] = "Software\\Netscape\\Netscape Navigator";
+static char szNavigatorCurVersionSection[] = "Software\\Netscape\\Netscape Navigator\\%s\\Main";
+static char szCurrentVersionKey[] = "CurrentVersion";
+static char szInstallDirKey[] = "Install Directory";
+static char szMapiSection[] = "Software\\Netscape\\Netscape Navigator\\MAPI";
+static char szTempFiles[] = "TempFiles";  
+static char szMapiLog[] = "NSMAPI32.LOG";
+#else 
+//32 bit key strings for trying to read the 32bit registry
+static char szNavigatorSection32[] = "Software\\Netscape\\Netscape Navigator";
+static char szNavigatorCurVersionSection32[] = "Software\\Netscape\\Netscape Navigator\\%s\\Main";
+static char szMapiSection32[] = "Software\\Netscape\\Netscape Navigator\\MAPI";
+
+// ini section and key strings 
+static char szNetscapeINI[] = "nscp.ini";
+static char szNavigatorSection[] = "Netscape Navigator";
+static char szNavigatorCurVersionSection[] = "Netscape Navigator-%s";
+static char szCurrentVersionKey[] = "CurrentVersion";
+static char szInstallDirKey[] = "Install Directory";
+static char szMapiSection[] = "MAPI";
+static char szTempFiles[] = "TempFiles";
+static char szExeName[] = "NAVSTART.EXE";
+static char szMapiLog[] = "NSMAPI16.LOG";
+#endif                                   
+
+//Since REGSAM is just an ACCESS_MASK which is just a DWORD and it's not 
+//declared in win16 we'll make one hear for the purpose of keeping parameters
+//the same even though the access rights don't get used for win16.
+
+typedef DWORD REGSAM;
+
+
+// XP declarations
+
+int 	LOAD_DS Is_16_OR_32_BIT_CommunitorRunning();
+WORD 	LOAD_DS XP_CallProcess(LPCSTR pPath, LPCSTR pCmdLine);
+HKEY LOAD_DS RegOpenParent(LPCSTR pSection, HKEY hRootKey, REGSAM access);
+HKEY LOAD_DS RegCreateParent(LPCSTR pSection, HKEY hMasterKey);
+BOOL LOAD_DS GetConfigInfoStr(LPCSTR pSection, LPCSTR pKey, LPSTR pBuf, int lenBuf, HKEY hMasterKey);
+BOOL LOAD_DS GetConfigInfoNum(LPCSTR pSection, LPCSTR pKey, DWORD* pVal, HKEY hMasterKey);
+BOOL LOAD_DS SetConfigInfoStr(LPCSTR pSection, LPCSTR pKey, LPSTR pStr, HKEY hMasterKey); 
+
+BOOL  LOAD_DS XP_GetInstallDirectory(LPCSTR pcurVersionSection, LPCSTR pInstallDirKey, LPSTR path, UINT nSize, HKEY hKey); 
+BOOL  LOAD_DS XP_GetVersionInfoString(LPCSTR pNavigatorSection, LPCSTR pCurrentVersionKey, LPSTR pcurVersionStr, UINT nSize, HKEY hKey);
+DWORD LOAD_DS XP_GetInstallLocation(LPSTR pPath, UINT nSize);
+BOOL LOAD_DS  XP_CopyFile(LPCSTR lpExistingFile, LPCSTR lpNewFile, BOOL bFailifExist);
+
+#endif    // __XPAPI_H

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

@@ -19,13 +19,13 @@
 #
 # Contributor(s): 
 
-DEPTH=..\..\..\..
+DEPTH=..\..\..
+MODULE=mime
 
-MODULE=bookmarks
-
-XPIDLSRCS =                   \
-    .\nsIBookmarksService.idl \
+EXPORTS =							\
+	nscpmapi.h		\
     $(NULL)
 
+
 include <$(DEPTH)\config\rules.mak>
 

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

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

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

@@ -21,6 +21,7 @@
 
 DEPTH=..\..\..
 
-DIRS=public src resources
+
+DIRS=mapitest
 
 include <$(DEPTH)\config\rules.mak>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

mozilla/mailnews/mapi/resources/makefile.win

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

mozilla/xpfe/components/bookmarks/Makefile.in

@@ -1,32 +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		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DIRS		= public src resources
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/xpfe/components/bookmarks/macbuild/BookmarksPrefix.h

@@ -1,26 +0,0 @@
-/* -*- 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): 
- */
-
-/* Defining the following causes NS_APPSHELL to be defined as NS_EXPORT. */
-#define _IMPL_NS_APPSHELL
-
-#include "MacSharedPrefix.h"

mozilla/xpfe/components/bookmarks/macbuild/BookmarksPrefix_debug.h

@@ -1,26 +0,0 @@
-/* -*- 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): 
- */
-
-/* Defining the following causes NS_APPSHELL to be defined as NS_EXPORT. */
-#define _IMPL_NS_APPSHELL
-
-#include "MacSharedPrefix_debug.h"

mozilla/xpfe/components/bookmarks/public/MANIFEST_IDL

@@ -1 +0,0 @@
-nsIBookmarksService.idl

mozilla/xpfe/components/bookmarks/public/Makefile.in

@@ -1,35 +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		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= appcomps
-XPIDL_MODULE	= bookmarks
-
-XPIDLSRCS	= nsIBookmarksService.idl
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/xpfe/components/bookmarks/public/nsIBookmarksService.idl

@@ -1,95 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** 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):
- *   Ben Goodger              <ben@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 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 ***** */
-
-/**
- * The Browser Bookmarks service
- */
-
-#include "nsISupports.idl"
-
-interface nsIRDFResource;
-
-[scriptable, uuid(a82e9300-e4af-11d2-8fdf-0008c70adc7b)]
-interface nsIBookmarksService : nsISupports
-{
-    const unsigned long BOOKMARK_DEFAULT_TYPE   = 0;
-    const unsigned long BOOKMARK_SEARCH_TYPE    = 1;
-    const unsigned long BOOKMARK_FIND_TYPE      = 2;
-
-    boolean ReadBookmarks();
-    boolean IsBookmarked(in string aURI);
-
-    void addBookmarkImmediately(in string aURI, in wstring aTitle, in long bmType, in wstring docCharset);
-        
-    nsIRDFResource createFolder(in wstring aName, in nsIRDFResource aParentFolder);
-    nsIRDFResource createFolderWithDetails(in wstring aName, in nsIRDFResource aParentFolder, 
-                                           in long aIndex);
-
-    nsIRDFResource createGroup(in wstring aName, in nsIRDFResource aParentFolder);
-    nsIRDFResource createGroupWithDetails(in wstring aName, in nsIRDFResource aParentFolder, 
-                                          in long aIndex);
-
-    nsIRDFResource createBookmark(in wstring aName, in string aURL, in nsIRDFResource aParentFolder);
-    nsIRDFResource createBookmarkWithDetails(in wstring aName, in string aURI, in wstring docCharSet, 
-                                             in nsIRDFResource aFolder, in long aIndex);
-
-    void updateBookmarkIcon(in string aURL, in wstring iconURL);
-    void removeBookmarkIcon(in string aURL, in wstring iconURL);
-
-    void updateLastVisitedDate(in string aURL, in wstring docCharset);
-    
-    string resolveKeyword(in wstring aName);
-    
-    wstring getLastCharset(in string aURI);
-
-    void importSystemBookmarks(in nsIRDFResource aParentFolder);
-};
-
-%{C++
-
-// {E638D760-8687-11d2-B530-000000000000}
-#define NS_BOOKMARKS_SERVICE_CID \
-{ 0xe638d760, 0x8687, 0x11d2, { 0xb5, 0x30, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 } }
-
-#define NS_BOOKMARKS_SERVICE_CONTRACTID \
-    "@mozilla.org/browser/bookmarks-service;1"
-
-#define NS_BOOKMARKS_DATASOURCE_CONTRACTID \
-    "@mozilla.org/rdf/datasource;1?name=bookmarks"
-
-%}

mozilla/xpfe/components/bookmarks/resources/MANIFEST-content

@@ -1,9 +0,0 @@
-bm-find.js
-bm-find.xul
-bm-panel.js
-bm-panel.xul
-bm-props.js
-bm-props.xul
-bookmarks.js
-bookmarksDD.js
-bookmarks.xul

mozilla/xpfe/components/bookmarks/resources/addBookmark.js

@@ -1,348 +0,0 @@
-/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** 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):
- *   Ben Goodger <ben@netscape.com> (Original Author)
- *
- * 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 ***** */
-
-/**
- * Add Bookmark Dialog. 
- * ====================
- * 
- * This is a generic bookmark dialog that allows for bookmark addition
- * and folder selection. It can be opened with various parameters that 
- * result in appearance/purpose differences and initial state. 
- * 
- * Use: Open with 'openDialog', with the flags 
- *        'centerscreen,chrome,dialog=no,resizable=yes'
- * 
- * Parameters: 
- *   Apart from the standard openDialog parameters, this dialog can 
- *   be passed additional information, which gets mapped to the 
- *   window.arguments array:
- * 
- *   window.arguments[0]: Bookmark Name. The value to be prefilled
- *                        into the "Name: " field (if visible).
- *   window.arguments[1]: Bookmark URL: The location of the bookmark.
- *                        The value to be filled in the "Location: "
- *                        field (if visible).
- *   window.arguments[2]: Bookmark Folder. The RDF Resource URI of the
- *                        folder that this bookmark should be created in.
- *   window.arguments[3]: Bookmark Charset. The charset that should be
- *                        used when adding a bookmark to the specified
- *                        URL. (Usually the charset of the current 
- *                        document when launching this window). 
- *   window.arguments[4]: The mode of operation. See notes for details.
- *   window.arguments[5]: If the mode is "addGroup", this is an array
- *                        of objects with name, URL and charset
- *                        properties, one for each group member.
- *
- * Mode of Operation Notes:
- * ------------------------
- * This dialog can be opened in four different ways by using a parameter
- * passed through the call to openDialog. The 'mode' of operation
- * of the window is expressed in window.arguments[4]. The valid modes are:
- *
- * 1) <default> (no fifth open parameter).
- *      Opens this dialog with the bookmark Name, URL and folder selection
- *      components visible. 
- * 2) "newBookmark" (fifth open parameter = String("newBookmark"))
- *      Opens the dialog as in (1) above except the folder selection tree
- *      is hidden. This type of mode is useful when the creation folder 
- *      is pre-determined.
- * 3) "selectFolder" (fifth open parameter = String("selectFolder"))
- *      Opens the dialog as in (1) above except the Name/Location section
- *      is hidden, and the dialog takes on the utility of a Folder chooser.
- *      Used when the user must select a Folder for some purpose. 
- * 4) "addGroup" (fifth open parameter = String("addGroup"))
- *      Opens the dialog like <default>, with a checkbox to select between
- *      filing a single bookmark or a group. For the single bookmark the
- *      values are taken from the name, URL and charset arguments.
- *      For the group, the values are taken from the sixth argument.
- *      This parameter can also be String("addGroup,group") where "group"
- *      specifies that the dialog starts in filing as a group.
- */
-
-var gFld_Name   = null;
-var gFld_URL    = null; 
-var gFolderTree = null;
-var gCB_AddGroup = null;
-
-var gBookmarkCharset = null;
-
-const kRDFSContractID = "@mozilla.org/rdf/rdf-service;1";
-const kRDFSIID = Components.interfaces.nsIRDFService;
-const kRDF = Components.classes[kRDFSContractID].getService(kRDFSIID);
-
-var gSelectItemObserver = null;
-
-var gCreateInFolder = "NC:NewBookmarkFolder";
-
-function Startup()
-{
-  gFld_Name = document.getElementById("name");
-  gFld_URL = document.getElementById("url");
-  gCB_AddGroup = document.getElementById("addgroup");
-  var bookmarkView = document.getElementById("bookmarks-view");
-
-  var shouldSetOKButton = true;
-  var dialogElement = document.documentElement;
-  if ("arguments" in window) {
-    var ind;
-    var folderItem = null;
-    var arg;
-    if (window.arguments.length < 5)
-      arg = null;
-    else
-      arg = window.arguments[4];
-    switch (arg) {
-    case "selectFolder":
-      // If we're being opened as a folder selection window
-      document.getElementById("bookmarknamegrid").setAttribute("hidden", "true");
-      document.getElementById("createinseparator").setAttribute("hidden", "true");
-      document.getElementById("nameseparator").setAttribute("hidden", "true");
-      sizeToContent();
-      dialogElement.setAttribute("title", dialogElement.getAttribute("title-selectFolder"));
-      shouldSetOKButton = false;
-      if (window.arguments[2])
-        folderItem = bookmarkView.rdf.GetResource(window.arguments[2]);
-      if (folderItem) {
-        ind = bookmarkView.treeBuilder.getIndexOfResource(folderItem);
-        bookmarkView.treeBoxObject.selection.select(ind);
-      }
-      break;
-    case "newBookmark":
-      setupFields();
-      if (window.arguments[2])
-        gCreateInFolder = window.arguments[2];
-      document.getElementById("folderbox").setAttribute("hidden", "true");
-      sizeToFit();
-      break;
-    case "addGroup":
-      document.getElementById("showaddgroup").setAttribute("hidden", "false");
-      setupFields();
-      sizeToFit();
-      break;
-    case "addGroup,group":
-      document.getElementById("showaddgroup").setAttribute("hidden", "false");
-      gCB_AddGroup.setAttribute("checked", "true");
-      setupFields();
-      toggleGroup();
-      sizeToFit();
-      break;
-    default:
-      // Regular Add Bookmark
-      setupFields();
-      if (window.arguments[2]) {
-        gCreateInFolder = window.arguments[2];
-        folderItem = bookmarkView.rdf.GetResource(gCreateInFolder);
-        if (folderItem) {
-          ind = bookmarkView.treeBuilder.getIndexOfResource(folderItem);
-          bookmarkView.treeBoxObject.selection.select(ind);
-        }
-      }
-    }
-  }
-  
-  if (shouldSetOKButton)
-    onFieldInput();
-  if (document.getElementById("bookmarknamegrid").hasAttribute("hidden")) {
-    bookmarkView.tree.focus();
-    if (bookmarkView.currentIndex == -1)
-      bookmarkView.treeBoxObject.selection.select(0);
-  }
-  else {
-    gFld_Name.select();
-    gFld_Name.focus();
-  }
-} 
-
-function sizeToFit()
-{
-  var dialogElement = document.documentElement;
-  dialogElement.removeAttribute("persist");
-  dialogElement.removeAttribute("height");
-  dialogElement.removeAttribute("width");
-  dialogElement.setAttribute("style", dialogElement.getAttribute("style"));
-  sizeToContent();
-}
-
-function setupFields()
-{
-  // New bookmark in predetermined folder. 
-  gFld_Name.value = window.arguments[0] || "";
-  gFld_URL.value = window.arguments[1] || "";
-  onFieldInput();
-  gFld_Name.select();
-  gFld_Name.focus();
-  gBookmarkCharset = window.arguments[3] || null;
-}
-
-function onFieldInput()
-{
-  const ok = document.documentElement.getButton("accept");
-  ok.disabled = gFld_URL.value == "" && !addingGroup() ||
-                gFld_Name.value == "";
-}    
-
-function onOK()
-{
-  if (!document.getElementById("folderbox").hasAttribute("hidden")) {
-    var bookmarkView = document.getElementById("bookmarks-view");
-    var currentIndex = bookmarkView.currentIndex;
-    if (currentIndex != -1)
-      gCreateInFolder = bookmarkView.treeBuilder.getResourceAtIndex(currentIndex).Value;
-  }
-  // In Select Folder Mode, do nothing but tell our caller what
-  // folder was selected. 
-  if (window.arguments.length > 4 && window.arguments[4] == "selectFolder")
-    window.arguments[5].selectedFolder = gCreateInFolder;
-  else {
-    // Otherwise add a bookmark to the selected folder. 
-
-    const kBMDS = kRDF.GetDataSource("rdf:bookmarks");
-    const kBMSContractID = "@mozilla.org/browser/bookmarks-service;1";
-    const kBMSIID = Components.interfaces.nsIBookmarksService;
-    const kBMS = Components.classes[kBMSContractID].getService(kBMSIID);
-    var rFolder = kRDF.GetResource(gCreateInFolder, true);
-    const kRDFCContractID = "@mozilla.org/rdf/container;1";
-    const kRDFIID = Components.interfaces.nsIRDFContainer;
-    const kRDFC = Components.classes[kRDFCContractID].getService(kRDFIID);
-    try {
-      kRDFC.Init(kBMDS, rFolder);
-    }
-    catch (e) {
-      // No "NC:NewBookmarkFolder" exists, just append to the root.
-      rFolder = kRDF.GetResource("NC:BookmarksRoot", true);
-      kRDFC.Init(kBMDS, rFolder);
-    }
-
-    // if no URL was provided and we're not filing as a group, do nothing
-    if (!gFld_URL.value && !addingGroup())
-      return;
-
-    var url;
-    if (addingGroup()) {
-      const group = kBMS.createGroup(gFld_Name.value, rFolder);
-      const groups = window.arguments[5];
-      for (var i = 0; i < groups.length; ++i) {
-        url = getNormalizedURL(groups[i].url);
-        kBMS.createBookmarkWithDetails(groups[i].name, url,
-                                       groups[i].charset, group, -1);
-      }
-    } else {
-      url = getNormalizedURL(gFld_URL.value);
-      var newBookmark = kBMS.createBookmarkWithDetails(gFld_Name.value, url, gBookmarkCharset, rFolder, -1);
-      if (window.arguments.length > 4 && window.arguments[4] == "newBookmark") {
-        window.arguments[5].newBookmark = newBookmark;
-      }
-    }
-  }
-}
-
-function getNormalizedURL(url)
-{
-  // Check to see if the item is a local directory path, and if so, convert
-  // to a file URL so that aggregation with rdf:files works
-  try {
-    const kLF = Components.classes["@mozilla.org/file/local;1"]
-                          .createInstance(Components.interfaces.nsILocalFile);
-    kLF.initWithPath(url);
-    if (kLF.exists()) {
-      var ioService = Components.classes["@mozilla.org/network/io-service;1"]
-                                .getService(Components.classes.nsIIOService);
-
-      url = ioService.getURLSpecFromFile(kLF);
-    }
-  }
-  catch (e) {
-  }
-
-  return url;
-}
-
-var gBookmarksShell = null;
-function createNewFolder ()
-{
-  var bookmarksView = document.getElementById("bookmarks-view");
-  bookmarksView.createNewFolder();
-}
-
-function useDefaultFolder ()
-{
-  const kBMDS = kRDF.GetDataSource("rdf:bookmarks");
-  var bookmarkView = document.getElementById("bookmarks-view");
-  var sources = kBMDS.GetSources(bookmarkView.rdf.GetResource(NC_NS + "FolderType"), bookmarkView.rdf.GetResource("NC:NewBookmarkFolder"), true);
-  var folder = null;
-  if (sources.hasMoreElements()) {
-    folder = sources.getNext().QueryInterface(Components.interfaces.nsIRDFResource);
-  }
-  var ind = bookmarkView.treeBuilder.getIndexOfResource(folder);
-  if (ind != -1) {
-    bookmarkView.tree.focus();
-    bookmarkView.treeBoxObject.selection.select(ind);
-    gCreateInFolder = folder.Value;
-  }
-  else {
-    bookmarkView.treeBoxObject.selection.clearSelection();
-    gCreateInFolder = "NC:BookmarksRoot";
-  }
-}
-
-var gOldNameValue = "";
-var gOldURLValue = "";
-
-function toggleGroup()
-{
-  // swap between single bookmark and group name
-  var temp = gOldNameValue;
-  gOldNameValue = gFld_Name.value;
-  gFld_Name.value = temp;
-
-  // swap between single bookmark and group url
-  temp = gOldURLValue;
-  gOldURLValue = gFld_URL.value;
-  gFld_URL.value = temp;
-  gFld_URL.disabled = gCB_AddGroup.getAttribute("checked") == "true";
-
-  gFld_Name.select();
-  gFld_Name.focus();
-  onFieldInput();
-}
-
-function addingGroup()
-{
-  const showAddGroup = document.getElementById("showaddgroup");
-  return showAddGroup.getAttribute("hidden") != "true" && gCB_AddGroup.getAttribute("checked") == "true";
-}

mozilla/xpfe/components/bookmarks/resources/addBookmark.xul

@@ -1,118 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- -*- Mode: HTML; 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): 
-    Ben Goodger <ben@netscape.com> (Original Author)
-
--->
-
-<?xml-stylesheet href="chrome://communicator/skin/"?>
-<?xml-stylesheet href="chrome://communicator/skin/bookmarks/bookmarks.css"?>
-<?xml-stylesheet href="chrome://communicator/content/bookmarks/bookmarks.css" type="text/css"?>
-
-<!DOCTYPE window [
-<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
-%brandDTD;
-<!ENTITY % addBookmarkDTD SYSTEM "chrome://communicator/locale/bookmarks/addBookmark.dtd">
-%addBookmarkDTD;
-]>
-
-<dialog id="newBookmarkDialog" style="width: 36em;"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        ondialogaccept="return onOK(event)"
-        title="&newBookmark.title;" title-selectFolder="&selectFolder.label;"
-        onload="Startup();"
-        persist="screenX screenY width height"
-        screenX="24" screenY="24">
-   
-  
-  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarksOverlay.js"/>
-  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarksTree.js"/>
-  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/addBookmark.js"/>
-
-  <stringbundle id="bookmarksbundle"
-                src="chrome://communicator/locale/bookmarks/bookmark.properties"/>
-
-  <broadcaster id="showaddgroup" hidden="true"/>
-
-  <separator id="nameseparator" class="thin"/>
-  
-  <grid id="bookmarknamegrid">
-    <columns>
-      <column/>
-      <column flex="5"/>
-      <column flex="1"/>
-    </columns>
-    <rows>
-      <row align="center">
-        <label value="&name.label;" accesskey="&name.accesskey;" control="name"/>
-        <textbox id="name" oninput="onFieldInput();"/>
-        <spacer/>
-      </row>
-      <row>
-        <separator class="thin"/>
-        <separator class="thin"/>
-        <spacer/>
-      </row>
-      <row align="center">
-        <label value="&url.label;" accesskey="&url.accesskey;" control="url"/>
-        <textbox id="url" oninput="onFieldInput();"/>
-        <spacer/>
-      </row>
-      <row observes="showaddgroup">
-        <separator class="thin"/>
-        <separator class="thin"/>
-        <spacer/>
-      </row>
-      <row observes="showaddgroup">
-        <spacer/>
-        <hbox pack="start">
-          <checkbox id="addgroup" label="&addGroup.label;"
-                    accesskey="&addGroup.accesskey;" oncommand="toggleGroup();"/>
-        </hbox>
-        <spacer/>
-      </row>
-    </rows>
-  </grid>
-
-  <separator id="createinseparator"/>
-
-  <vbox id="folderbox" flex="1">
-    <separator/>
-    <hbox flex="1">
-      <label id="createinlabel" value="&createin.label;"/>
-      <hbox flex="1">
-        <bookmarks-tree id="bookmarks-view" flex="1" type="folders"/>
-        <vbox>
-          <button label="&button.newfolder.label;" accesskey="&button.newfolder.accesskey;"
-                  oncommand="createNewFolder();"/>
-          <button label="&button.defaultfolder.label;" 
-                  accesskey="&button.defaultfolder.accesskey;"
-                  oncommand="useDefaultFolder();"/>
-        </vbox>
-      </hbox>
-    </hbox>
-  </vbox>
-
-  <separator/>
-
-</dialog>

mozilla/xpfe/components/bookmarks/resources/bm-panel.xul

@@ -1,87 +0,0 @@
-<?xml version="1.0"?> <!-- -*- Mode: SGML; 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): 
-    Ben Goodger <ben@netscape.com> (Original Author, v2.0)
-
--->
-
-<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/skin/sidebar/sidebarListView.css" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/skin/bookmarks/bookmarksWindow.css" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/content/bookmarks/bookmarks.css" type="text/css"?>
-
-<?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
-<?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
-<?xul-overlay href="chrome://communicator/content/bookmarks/bookmarksOverlay.xul"?>
-<?xul-overlay href="chrome://communicator/content/tasksOverlay.xul"?>
-<?xul-overlay href="chrome://communicator/content/communicatorOverlay.xul"?>
-
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/bookmarks/bookmarks.dtd">
-
-<page id="bookmarksPanel"
-        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        onload="Startup();" elementtofocus="bookmarks-view">
-
-  <!-- XXX - would like to cut this dependency out -->
-  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
-
-  <!-- Bookmarks Shell -->
-  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarksOverlay.js"/>
-  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarksPanel.js"/>
-
-  <!-- Drag and Drop -->
-  <script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/nsTransferable.js"/>
-  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarksDD.js"/>
-
-
-  <!-- context menu, tooltips, etc -->
-  <popupset id="bookmarksPopupset"/>
-  
-  <!-- bookmarks string bundle -->
-  <stringbundleset id="stringbundleset"/>
-  
-  <!-- bookmarks & edit commands -->
-  <commands id="commands">
-    <commandset id="CommandUpdate_Bookmarks"
-                commandupdater="true"
-                events="click,focus"
-                oncommandupdate="document.getElementById('bookmarks-view').onCommandUpdate();">
-    </commandset>                
-    <commandset id="bookmarksItems"/>
-  </commands>
-  
-  <hbox id="panel-bar" class="toolbar">
-    <toolbarbutton id="btnAddBookmark" label="&command.addBookmark.label;"
-            oncommand="addBookmark();"/>
-    <toolbarbutton id="btnManageBookmarks" label="&command.manageBookmarks.label;"
-            oncommand="manageBookmarks();"/>
-    <spacer flex="1"/>
-    <toolbarseparator/>
-    <toolbarbutton id="btnFindBookmarks" label="&command.findBookmarks.label;"
-            oncommand="document.getElementById('bookmarks-view').openFindDialog();"/>
-  </hbox>
-  
-  <bookmarks-tree id="bookmarks-view" class="sidebar" type="single-column" flex="1"/>
-
-</page>

mozilla/xpfe/components/bookmarks/resources/bm-props.js

@@ -1,387 +0,0 @@
-/* -*- Mode: Java; tab-width: 2; 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 ***** */
-
-var NC_NAMESPACE_URI = "http://home.netscape.com/NC-rdf#";
-
-// XXX MAKE SURE that the "url" field is LAST!
-// This is important for what happens if/when the URL itself is changed.
-// Ask rjc@netscape.com if you want to know why exactly this is.
-
-// This is the set of fields that are visible in the window.
-var gFields     = ["name", "shortcut", "description", "url"];
-
-// ...and this is a parallel array that contains the RDF properties
-// that they are associated with.
-var gProperties = [NC_NAMESPACE_URI + "Name",
-                   NC_NAMESPACE_URI + "ShortcutURL",
-                   NC_NAMESPACE_URI + "Description",
-                   NC_NAMESPACE_URI + "URL"];
-
-var RDF = Components.classes["@mozilla.org/rdf/rdf-service;1"]
-                    .getService(Components.interfaces.nsIRDFService);
-
-var RDFC = Components.classes["@mozilla.org/rdf/container-utils;1"]
-                     .getService(Components.interfaces.nsIRDFContainerUtils);
-
-var Bookmarks = RDF.GetDataSource("rdf:bookmarks");
-
-var gBookmarkURL = "";
-
-function Init()
-{
-  var x;
-  gBookmarkURL = window.arguments[0];
-
-  // Initialize the properties panel by copying the values from the
-  // RDF graph into the fields on screen.
-
-  for (var i = 0; i < gFields.length; ++i) {
-    var field = document.getElementById(gFields[i]);
-
-    var value = Bookmarks.GetTarget(RDF.GetResource(gBookmarkURL),
-                                    RDF.GetResource(gProperties[i]),
-                                    true);
-
-    if (value)
-      value = value.QueryInterface(Components.interfaces.nsIRDFLiteral).Value;
-
-    if (value) //make sure were aren't stuffing null into any fields
-      field.value = value;
-  }
-
-  var propsWindow = document.getElementById("bmPropsWindow");
-  var nameNode = document.getElementById("name");
-  var title = propsWindow.getAttribute("title");
-  title = title.replace(/\*\*bm_title\*\*/gi, nameNode.value);
-  propsWindow.setAttribute("title", title);
-
-  // check bookmark schedule
-  value = Bookmarks.GetTarget(RDF.GetResource(gBookmarkURL),
-                              RDF.GetResource("http://home.netscape.com/WEB-rdf#Schedule"),
-                              true);
-
-  if (value) {
-    value = value.QueryInterface(Components.interfaces.nsIRDFLiteral).Value;
-
-    if (value) {
-      var values = value.split("|");
-      if (values.length == 4) {
-        // get day range
-        var days = values[0];
-        var dayNode = document.getElementById("dayRange");
-        var dayItems = dayNode.childNodes[0].childNodes;
-        for (x=0; x < dayItems.length; ++x) {
-          if (dayItems[x].getAttribute("value") == days) {
-            dayNode.selectedItem = dayItems[x];
-            break;
-          }
-        }
-
-        // get hour range
-        var hours = values[1].split("-");
-        var startHour = "";
-        var endHour = "";
-
-        if (hours.length == 2) {
-          startHour = hours[0];
-          endHour = hours[1];
-        }
-
-        // set start hour
-        var startHourNode = document.getElementById("startHourRange");
-        var startHourItems = startHourNode.childNodes[0].childNodes;
-        for (x=0; x < startHourItems.length; ++x) {
-          if (startHourItems[x].getAttribute("value") == startHour) {
-            startHourNode.selectedItem = startHourItems[x];
-            break;
-          }
-        }
-
-        // set end hour
-        var endHourNode = document.getElementById("endHourRange");
-        var endHourItems = endHourNode.childNodes[0].childNodes;
-        for (x=0; x < endHourItems.length; ++x) {
-          if (endHourItems[x].getAttribute("value") == endHour) {
-            endHourNode.selectedItem = endHourItems[x];
-            break;
-          }
-        }
-
-        // get duration
-        var duration = values[2];
-        var durationNode = document.getElementById("duration");
-        durationNode.value = duration;
-
-        // get notification method
-        var method = values[3];
-        if (method.indexOf("icon") >= 0)
-          document.getElementById("bookmarkIcon").checked = true;
-
-        if (method.indexOf("sound") >= 0)
-          document.getElementById("playSound").checked = true;
-
-        if (method.indexOf("alert") >= 0)
-          document.getElementById("showAlert").checked = true;
-
-        if (method.indexOf("open") >= 0)
-          document.getElementById("openWindow").checked = true;
-      }
-    }
-  }
-
-  // if its a container, disable some things
-  var isContainerFlag = RDFC.IsContainer(Bookmarks, RDF.GetResource(gBookmarkURL));
-  if (!isContainerFlag) {
-    // XXX To do: the "RDFC.IsContainer" call above only works for RDF sequences;
-    //            if its not a RDF sequence, we should to more checking to see if
-    //            the item in question is really a container of not.  A good example
-    //            of this is the "File System" container.
-  }
-
-  if (isContainerFlag) {
-    // If it is a folder, it has no URL or Keyword
-    document.getElementById("locationrow").setAttribute("hidden", "true");
-    document.getElementById("shortcutrow").setAttribute("hidden", "true");
-  }
-
-  if (gBookmarkURL.substr(0, 7).toLowerCase() != "http://" &&
-      gBookmarkURL.substr(0, 8).toLowerCase() != "https://") {
-    // only allow scheduling of http/https URLs
-    document.getElementById("ScheduleTab").setAttribute("hidden", "true");
-    document.getElementById("NotifyTab").setAttribute("hidden", "true");
-  }
-
-  sizeToContent();
-  
-  // Set up the enabled of controls on the scheduling panels
-  dayRangeChange(document.getElementById("dayRange"));
-
-  // set initial focus
-  var name = document.getElementById("name");
-  name.focus();
-  name.select();
-}
-
-
-
-function Commit()
-{
-  var changed = false;
-
-  // Grovel through the fields to see if any of the values have
-  // changed. If so, update the RDF graph and force them to be saved
-  // to disk.
-  for (var i = 0; i < gFields.length; ++i) {
-    var field = document.getElementById(gFields[i]);
-
-    if (field) {
-      // Get the new value as a literal, using 'null' if the value is empty.
-      var newvalue = field.value;
-
-      var oldvalue = Bookmarks.GetTarget(RDF.GetResource(gBookmarkURL),
-                                         RDF.GetResource(gProperties[i]),
-                                         true);
-
-      if (oldvalue)
-        oldvalue = oldvalue.QueryInterface(Components.interfaces.nsIRDFLiteral);
-
-      if (newvalue && gProperties[i] == (NC_NAMESPACE_URI + "ShortcutURL")) {
-        // shortcuts are always lowercased internally
-        newvalue = newvalue.toLowerCase();
-      }
-      else if (newvalue && gProperties[i] == (NC_NAMESPACE_URI + "URL")) {
-        // we're dealing with the URL attribute;
-        // if a scheme isn't specified, use "http://"
-        if (newvalue.indexOf(":") < 0)
-          newvalue = "http://" + newvalue;
-      }
-
-      if (newvalue)
-        newvalue = RDF.GetLiteral(newvalue);
-
-      if (updateAttribute(gProperties[i], oldvalue, newvalue)) {
-        // Update gBookmarkURL if the url changed
-        if (newvalue && gProperties[i] == NC_NAMESPACE_URI + "URL")
-          gBookmarkURL = newvalue.Value;
-
-        changed = true;
-      }
-    }
-  }
-
-  // Update bookmark schedule if necessary;
-  // if the tab was removed, just skip it
-  var scheduleTab = document.getElementById("ScheduleTab");
-  if (scheduleTab) {
-    var scheduleRes = "http://home.netscape.com/WEB-rdf#Schedule";
-    oldvalue = Bookmarks.GetTarget(RDF.GetResource(gBookmarkURL),
-                                   RDF.GetResource(scheduleRes), true);
-    newvalue = "";
-    var dayRangeNode = document.getElementById("dayRange");
-    var dayRange = dayRangeNode.selectedItem.getAttribute("value");
-
-    if (dayRange) {
-      var startHourRangeNode = document.getElementById("startHourRange");
-      var startHourRange = startHourRangeNode.selectedItem.getAttribute("value");
-
-      var endHourRangeNode = document.getElementById("endHourRange");
-      var endHourRange = endHourRangeNode.selectedItem.getAttribute("value");
-
-      if (parseInt(startHourRange) > parseInt(endHourRange)) {
-        var temp = startHourRange;
-        startHourRange = endHourRange;
-        endHourRange = temp;
-      }
-
-      var bookmarkBundle;
-      var duration = document.getElementById("duration").value;
-      if (!duration) {
-        bookmarkBundle = document.getElementById("bundle_bookmark");
-        alert (bookmarkBundle.getString("pleaseEnterADuration"));
-        return false;
-      }
-
-      var methods = [];
-      if (document.getElementById("bookmarkIcon").checked)
-        methods.push("icon");
-      if (document.getElementById("playSound").checked)
-        methods.push("sound");
-      if (document.getElementById("showAlert").checked)
-        methods.push("alert");
-      if (document.getElementById("openWindow").checked)
-        methods.push("open");
-
-      if (methods.length == 0) {
-        bookmarkBundle = document.getElementById("bundle_bookmark");
-        alert (bookmarkBundle.getString("pleaseSelectANotification"));
-        return false;
-      }
-
-      var method = methods.join(); // join string in array with ","
-
-      newvalue = dayRange + "|" + startHourRange + "-" + endHourRange + "|" + duration + "|" + method;
-    }
-
-    if (newvalue)
-      newvalue = RDF.GetLiteral(newvalue);
-
-    if (updateAttribute(scheduleRes, oldvalue, newvalue))
-      changed = true;
-  }
-
-  if (changed) {
-    var remote = Bookmarks.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
-    if (remote)
-      remote.Flush();
-  }
-
-  window.close();
-  return true;
-}
-
-function updateAttribute(prop, oldvalue, newvalue)
-{
-  var changed = false;
-
-  if (prop && (oldvalue || newvalue) && oldvalue != newvalue) {
-
-    if (oldvalue && !newvalue) {
-      Bookmarks.Unassert(RDF.GetResource(gBookmarkURL),
-                         RDF.GetResource(prop),
-                         oldvalue);
-    }
-    else if (!oldvalue && newvalue) {
-      Bookmarks.Assert(RDF.GetResource(gBookmarkURL),
-                       RDF.GetResource(prop),
-                       newvalue,
-                       true);
-    }
-    else /* if (oldvalue && newvalue) */ {
-      Bookmarks.Change(RDF.GetResource(gBookmarkURL),
-                       RDF.GetResource(prop),
-                       oldvalue,
-                       newvalue);
-    }
-
-    changed = true;
-  }
-
-  return changed;
-}
-
-function setEndHourRange()
-{
-  // Get the values of the start-time and end-time as ints
-  var startHourRangeNode = document.getElementById("startHourRange");
-  var startHourRange = startHourRangeNode.selectedItem.getAttribute("value");
-  var startHourRangeInt = parseInt(startHourRange);
-
-  var endHourRangeNode = document.getElementById("endHourRange");
-  var endHourRange = endHourRangeNode.selectedItem.getAttribute("value");
-  var endHourRangeInt = parseInt(endHourRange);
-
-  var endHourItemNode = endHourRangeNode.firstChild.firstChild;
-
-  var index = 0;
-
-  // disable all those end-times before the start-time
-  for (; index < startHourRangeInt; ++index) {
-    endHourItemNode.setAttribute("disabled", "true");
-    endHourItemNode = endHourItemNode.nextSibling;
-  }
-
-  // update the selected value if it's out of the allowed range
-  if (startHourRangeInt >= endHourRangeInt)
-    endHourRangeNode.selectedItem = endHourItemNode;
-
-  // make sure all the end-times after the start-time are enabled
-  for (; index < 24; ++index) {
-    endHourItemNode.removeAttribute("disabled");
-    endHourItemNode = endHourItemNode.nextSibling;
-  }
-}
-
-function dayRangeChange (aMenuList)
-{
-  var controls = ["startHourRange", "endHourRange", "duration", "bookmarkIcon", 
-                  "showAlert", "openWindow", "playSound", "durationSubLabel", 
-                  "durationLabel", "startHourRangeLabel", "endHourRangeLabel"];
-  for (var i = 0; i < controls.length; ++i)
-    document.getElementById(controls[i]).disabled = !aMenuList.value;
-}
-
-

mozilla/xpfe/components/bookmarks/resources/bm-props.xul

@@ -1,235 +0,0 @@
-<?xml version="1.0"?> <!-- -*- Mode: SGML; 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): 
-
--->
-
-<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/skin/bookmarks/bookmarks.css" type="text/css"?>
-
-<!DOCTYPE window [
-<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
-%brandDTD;
-<!ENTITY % bmpropsDTD SYSTEM "chrome://communicator/locale/bookmarks/bm-props.dtd">
-%bmpropsDTD;
-]>
-
-<dialog id="bmPropsWindow" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        title="&bookmarks.windowtitle.label;"
-        onload="Init()" style="width: 30em;"
-        ondialogaccept="return Commit();">
- 
-  <stringbundle id="bundle_bookmark" src="chrome://communicator/locale/bookmarks/bookmark.properties"/>
-  <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bm-props.js"/>
- 
-  <keyset id="keyset"/>  
-    
-  <tabbox>
-    <tabs>
-      <tab label="&generalInfo.label;" accesskey="&generalInfo.accesskey;"/>
-      <tab id="ScheduleTab" label="&schedule.label;" accesskey="&schedule.accesskey;"/>
-      <tab id="NotifyTab" label="&notification.label;" accesskey="&notification.accesskey;"/>
-    </tabs>
-    <tabpanels>
-      <vbox>
-        <separator class="thin"/>
-        <hbox align="start">
-          <image class="message-icon"/>
-          <separator class="thin" orient="vertical"/>
-          <description flex="1">&generaldesc.label;</description>
-        </hbox>
-   
-        <separator class="thin"/>
-        
-        <vbox class="box-padded">    
-          <grid>
-            <columns>
-              <column />
-              <column flex="1"/>
-            </columns>
-            <rows>
-              <row align="center">
-                <label value="&bookmarks.name.label;" control="name"/>
-                <textbox id="name"/>
-              </row>
-              <row id="locationrow" align="center">
-                <label value="&bookmarks.location.label;" control="url"/>
-          			<textbox id="url" />
-              </row>
-              <row id="shortcutrow" align="center">
-                <label value="&bookmarks.shortcut.label;" control="shortcut"/>
-    		      	<textbox id="shortcut" />
-              </row>
-              <row>
-                <label value="&bookmarks.description.label;" control="description"/>
-                <textbox multiline="true" wrap="virtual" id="description" flex="1"/>
-              </row>
-            </rows>
-          </grid>
-          <separator/>
-        </vbox>
-      </vbox>
-      
-      <vbox>
-        <separator class="thin"/>
-        <hbox align="center">
-          <image id="schedule-icon"/>
-          <separator class="thin" orient="vertical"/>
-          <description flex="1">&schedule.description;</description>
-        </hbox>
-        <separator class="thin"/>
-        <hbox class="box-padded">
-          <spacer flex="1"/>
-          <groupbox>
-            <caption label="&checkforupdates.legend.label;"/>
-            <grid flex="1">
-              <columns>
-                <column/>
-                <column flex="1"/>
-              </columns>
-              <rows>
-                <row align="center">
-                  <label value="&when.label;" control="dayRange"/>
-                  <hbox>
-                    <menulist id="dayRange" oncommand="dayRangeChange(this);">
-                      <menupopup>
-                        <menuitem value="" label="&checknever.label;"/>
-                        <menuseparator />
-                        <menuitem value="0123456" label="&checkeveryday.label;"/>
-                        <menuitem value="12345" label="&checkweekdays.label;"/>
-                        <menuitem value="06" label="&checkweekends.label;"/>
-                        <menuitem value="1" label="&checkmondays.label;"/>
-                        <menuitem value="2" label="&checktuesdays.label;"/>
-                        <menuitem value="3" label="&checkwednesdays.label;"/>
-                        <menuitem value="4" label="&checkthursdays.label;"/>
-                        <menuitem value="5" label="&checkfridays.label;"/>
-                        <menuitem value="6" label="&checksaturdays.label;"/>
-                        <menuitem value="0" label="&checksundays.label;"/>
-                      </menupopup>
-                    </menulist>
-                  </hbox>
-                </row>
-                <row align="center">
-                  <label id="startHourRangeLabel" 
-                        value="&from.label;" control="startHourRange"/>
-                  <hbox align="center">
-                    <menulist id="startHourRange" oncommand="setEndHourRange()">
-                      <menupopup>
-                        <menuitem value="0" label="&midnight.label;"/>
-                        <menuitem value="1" label="&AMone.label;"/>
-                        <menuitem value="2" label="&AMtwo.label;"/>
-                        <menuitem value="3" label="&AMthree.label;"/>
-                        <menuitem value="4" label="&AMfour.label;"/>
-                        <menuitem value="5" label="&AMfive.label;"/>
-                        <menuitem value="6" label="&AMsix.label;"/>
-                        <menuitem value="7" label="&AMseven.label;"/>
-                        <menuitem value="8" label="&AMeight.label;"/>
-                        <menuitem value="9" label="&AMnine.label;"/>
-                        <menuitem value="10" label="&AMten.label;"/>
-                        <menuitem value="11" label="&AMeleven.label;"/>
-                        <menuitem value="12" label="&noon.label;"/>
-                        <menuitem value="13" label="&PMone.label;"/>
-                        <menuitem value="14" label="&PMtwo.label;"/>
-                        <menuitem value="15" label="&PMthree.label;"/>
-                        <menuitem value="16" label="&PMfour.label;"/>
-                        <menuitem value="17" label="&PMfive.label;"/>
-                        <menuitem value="18" label="&PMsix.label;"/>
-                        <menuitem value="19" label="&PMseven.label;"/>
-                        <menuitem value="20" label="&PMeight.label;"/>
-                        <menuitem value="21" label="&PMnine.label;"/>
-                        <menuitem value="22" label="&PMten.label;"/>
-                        <menuitem value="23" label="&PMeleven.label;"/>
-                      </menupopup>
-                    </menulist>
-                    <label id="endHourRangeLabel" 
-                          value="&to.label;" control="endHourRange"/>
-                    <menulist id="endHourRange">
-                      <menupopup onpopupshowing="setEndHourRange()">
-                        <menuitem value="1" label="&AMone.label;"/>
-                        <menuitem value="2" label="&AMtwo.label;"/>
-                        <menuitem value="3" label="&AMthree.label;"/>
-                        <menuitem value="4" label="&AMfour.label;"/>
-                        <menuitem value="5" label="&AMfive.label;"/>
-                        <menuitem value="6" label="&AMsix.label;"/>
-                        <menuitem value="7" label="&AMseven.label;"/>
-                        <menuitem value="8" label="&AMeight.label;"/>
-                        <menuitem value="9" label="&AMnine.label;"/>
-                        <menuitem value="10" label="&AMten.label;"/>
-                        <menuitem value="11" label="&AMeleven.label;"/>
-                        <menuitem value="12" label="&noon.label;"/>
-                        <menuitem value="13" label="&PMone.label;"/>
-                        <menuitem value="14" label="&PMtwo.label;"/>
-                        <menuitem value="15" label="&PMthree.label;"/>
-                        <menuitem value="16" label="&PMfour.label;"/>
-                        <menuitem value="17" label="&PMfive.label;"/>
-                        <menuitem value="18" label="&PMsix.label;"/>
-                        <menuitem value="19" label="&PMseven.label;"/>
-                        <menuitem value="20" label="&PMeight.label;"/>
-                        <menuitem value="21" label="&PMnine.label;"/>
-                        <menuitem value="22" label="&PMten.label;"/>
-                        <menuitem value="23" label="&PMeleven.label;"/>
-                        <menuitem value="24" label="&midnight.label;"/>
-                      </menupopup>
-                    </menulist>
-                  </hbox>
-                </row>
-                <row align="center">
-                  <label id="durationLabel" 
-                        value="&every.label;" control="duration"/>
-                  <hbox align="center">
-              	    <textbox id="duration" size="4" value="60" />
-                    <label id="durationSubLabel" value="&minutes.label;" />
-                  </hbox>
-                </row>
-              </rows>
-            </grid>
-            <separator class="thin"/>
-          </groupbox>
-          <spacer flex="1"/>
-        </hbox>
-      </vbox>
-          
-      <vbox>
-        <separator class="thin"/>
-        <hbox align="start">
-          <image id="notification-icon"/>
-          <separator class="thin" orient="vertical"/>
-          <description flex="1">&notification.description;</description>
-        </hbox>
-        <separator class="thin"/>
-        <hbox class="box-padded">
-          <spacer flex="1"/>
-          <groupbox>
-            <caption label="&notifications.legend.label;" />
-            <vbox align="start">
-              <checkbox id="bookmarkIcon" label="&notification.icon.label;" />
-              <checkbox id="showAlert" label="&notification.alert.label;" />
-              <checkbox id="openWindow" label="&notification.window.label;" />
-              <checkbox id="playSound" label="&notification.sound.label;" />
-            </vbox>
-          </groupbox>
-          <spacer flex="1"/>
-        </hbox>
-      </vbox>
-    </tabpanels>
-  </tabbox> 
-</dialog>

mozilla/xpfe/components/bookmarks/resources/bookmarks-temp.js

@@ -1,854 +0,0 @@
-/* -*- Mode: Java; tab-width: 2; 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 the old bookmarks code, included here for the sake of the bookmarks sidebar panel,
-  which will be fixed to use my new code in .9. In the mean time, this file provides a
-  life line to various functionality.
- */
-
-
-
-var NC_NS  = "http://home.netscape.com/NC-rdf#";
-var RDF_NS = "http://www.w3.org/1999/02/22-rdf-syntax-ns#";
-
-function Init() {
-    var tree = document.getElementById("bookmarksTree");
-    tree.controllers.appendController(BookmarksController);
-    var children = document.getElementById('treechildren-bookmarks');
-    tree.selectItem(children.firstChild);
-    tree.focus();
-
-    RefreshSort();
-}
-
-var BookmarksController = {
-    supportsCommand: function(command)
-    {
-        switch(command)
-        {
-            case "cmd_undo":
-            case "cmd_redo":
-                return false;
-            case "cmd_cut":
-            case "cmd_copy":
-            case "cmd_paste":
-            case "cmd_delete":
-            case "cmd_selectAll":
-                return true;
-            default:
-                return false;
-        }
-    },
-    isCommandEnabled: function(command)
-    {
-        switch(command)
-        {
-            case "cmd_undo":
-            case "cmd_redo":
-                return false;
-            case "cmd_cut":
-            case "cmd_copy":
-            case "cmd_paste":
-            case "cmd_delete":
-            case "cmd_selectAll":
-                return true;
-            default:
-                return false;
-        }
-    },
-    doCommand: function(command)
-    {
-        switch(command)
-        {
-            case "cmd_undo":
-            case "cmd_redo":
-                break;
-            case "cmd_cut":
-                doCut();
-                break;
-            case "cmd_copy":
-                doCopy();
-                break;
-            case "cmd_paste":
-                doPaste();
-                break;
-            case "cmd_delete":
-                doDelete();
-                break;
-            case "cmd_selectAll":
-                doSelectAll();
-                break;
-        }
-    },
-    onEvent: function(event)
-    {
-        // On blur events set the menu item texts back to the normal values
-        /*if (event == 'blur' )
-          {
-          goSetMenuValue('cmd_undo', 'valueDefault');
-          goSetMenuValue('cmd_redo', 'valueDefault');
-          }*/
-    }
-};
-
-function CommandUpdate_Bookmarks()
-{
-    //goUpdateCommand('button_delete');
-    // get selection info from dir pane
-    /*
-    var oneAddressBookSelected = false;
-    if ( dirTree && dirTree.selectedItems && (dirTree.selectedItems.length == 1) )
-        oneAddressBookSelected = true;
-
-    // get selection info from results pane
-    var selectedCards = GetSelectedAddresses();
-    var oneOrMoreCardsSelected = false;
-    if ( selectedCards )
-        oneOrMoreCardsSelected = true;
-    */
-    // set commands to enabled / disabled
-    //goSetCommandEnabled('cmd_PrintCard', oneAddressBookSelected);
-    goSetCommandEnabled('bm_cmd_find', true/*oneAddressBookSelected*/);
-}
-
-function copySelectionToClipboard()
-{
-    var treeNode = document.getElementById("bookmarksTree");
-    if (!treeNode) return false;
-    var select_list = treeNode.selectedItems;
-    if (!select_list) return false;
-    if (select_list.length < 1) return false;
-
-    var rdf_uri = "@mozilla.org/rdf/rdf-service;1"
-    var RDF = Components.classes[rdf_uri].getService();
-    RDF = RDF.QueryInterface(Components.interfaces.nsIRDFService);
-    if (!RDF) return false;
-
-    var Bookmarks = RDF.GetDataSource("rdf:bookmarks");
-    if (!Bookmarks) return false;
-
-    var nameRes = RDF.GetResource(NC_NS + "Name");
-    if (!nameRes) return false;
-
-    // Build a url that encodes all the select nodes
-    // as well as their parent nodes
-    var url = "";
-    var text = "";
-    var html = "";
-
-    for (var nodeIndex = 0; nodeIndex < select_list.length; nodeIndex++)
-    {
-        var node = select_list[nodeIndex];
-        if (!node) continue;
-
-        var ID = getAbsoluteID("bookmarksTree", node);
-        if (!ID) continue;
-
-        var IDRes = RDF.GetResource(ID);
-        if (!IDRes) continue;
-        var nameNode = Bookmarks.GetTarget(IDRes, nameRes, true);
-        var theName = "";
-        if (nameNode)
-            nameNode =
-                nameNode.QueryInterface(Components.interfaces.nsIRDFLiteral);
-        if (nameNode) theName = nameNode.Value;
-
-        url += "ID:{" + ID + "};";
-        url += "NAME:{" + theName + "};";
-
-        if (node.getAttribute("container") == "true")
-        {
-            var type = node.getAttribute("type");
-            if (type == NC_NS + "BookmarkSeparator")
-            {
-                // Note: can't encode separators in text, just html
-                html += "<hr><p>";
-            }
-            else
-            {
-                text += ID + "\r";
-
-                html += "<a href='" + ID + "'>";
-                if (theName != "")
-                {
-                    html += theName;
-                }
-                html += "</a><p>";
-            }
-        }
-    }
-
-    if (url == "") return false;
-
-    // get some useful components
-    var trans_uri = "@mozilla.org/widget/transferable;1";
-    var trans = Components.classes[trans_uri].createInstance();
-    if (trans) trans = trans.QueryInterface(Components.interfaces.nsITransferable);
-    if (!trans) return false;
-
-    var clip_uri = "@mozilla.org/widget/clipboard;1";
-    var clip = Components.classes[clip_uri].getService();
-    if (clip) clip = clip.QueryInterface(Components.interfaces.nsIClipboard);
-    if (!clip) return false;
-    clip.emptyClipboard(Components.interfaces.nsIClipboard.kGlobalClipboard);
-
-    // save bookmark's ID
-    trans.addDataFlavor("moz/bookmarkclipboarditem");
-    var data_uri = "@mozilla.org/supports-wstring;1";
-    var data = Components.classes[data_uri].createInstance();
-    if (data) {
-        data = data.QueryInterface(Components.interfaces.nsISupportsWString);
-    }
-    if (!data) return false;
-    data.data = url;
-    // double byte data
-    trans.setTransferData("moz/bookmarkclipboarditem", data, url.length*2);
-
-    if (text != "")
-    {
-        trans.addDataFlavor("text/unicode");
-
-        var textData_uri = "@mozilla.org/supports-wstring;1";
-        var textData = Components.classes[textData_uri].createInstance();
-        if (textData) textData = textData.QueryInterface(Components.interfaces.nsISupportsWString);
-        if (!textData) return false;
-        textData.data = text;
-        // double byte data
-        trans.setTransferData("text/unicode", textData, text.length*2);
-    }
-    if (html != "")
-    {
-        trans.addDataFlavor("text/html");
-
-        var wstring_uri = "@mozilla.org/supports-wstring;1";
-        var htmlData = Components.classes[wstring_uri].createInstance();
-        if (htmlData) {
-            var wstring_interface = Components.interfaces.nsISupportsWString;
-            htmlData = htmlData.QueryInterface(wstring_interface);
-        }
-        if (!htmlData) return false;
-        htmlData.data = html;
-        // double byte data
-        trans.setTransferData("text/html", htmlData, html.length*2);
-    }
-    clip.setData(trans, null,
-                 Components.interfaces.nsIClipboard.kGlobalClipboard);
-    return true;
-}
-
-function doCut()
-{
-    if (copySelectionToClipboard() == true) {
-        doDelete(false);
-    }
-    return true;
-}
-
-function doCopy()
-{
-    copySelectionToClipboard();
-    return true;
-}
-
-function doPaste()
-{
-    var treeNode = document.getElementById("bookmarksTree");
-    if (!treeNode) return false;
-    var select_list = treeNode.selectedItems;
-    if (!select_list) return false;
-    if (select_list.length != 1) return false;
-
-    var pasteNodeID = select_list[0].getAttribute("id");
-    var isContainerFlag = (select_list[0].getAttribute("container") == "true");
-
-    var clip_uri = "@mozilla.org/widget/clipboard;1";
-    var clip = Components.classes[clip_uri].getService();
-    if (clip) clip = clip.QueryInterface(Components.interfaces.nsIClipboard);
-    if (!clip) return false;
-
-    var trans_uri = "@mozilla.org/widget/transferable;1";
-    var trans = Components.classes[trans_uri].createInstance();
-    if (trans) {
-        trans = trans.QueryInterface(Components.interfaces.nsITransferable);
-    }
-    if (!trans) return false;
-    trans.addDataFlavor("moz/bookmarkclipboarditem");
-
-    clip.getData(trans, Components.interfaces.nsIClipboard.kGlobalClipboard);
-    var data = new Object();
-    var dataLen = new Object();
-    trans.getTransferData("moz/bookmarkclipboarditem", data, dataLen);
-    if (data) {
-        var data_interface = Components.interfaces.nsISupportsWString
-        data = data.value.QueryInterface(data_interface);
-    }
-    var url = null;
-   // double byte data
-    if (data) url = data.data.substring(0, dataLen.value / 2);
-    if (!url) return false;
-
-    var strings = url.split(";");
-    if (!strings) return false;
-
-    var rdf_uri = "@mozilla.org/rdf/rdf-service;1";
-    var RDF = Components.classes[rdf_uri].getService();
-    RDF = RDF.QueryInterface(Components.interfaces.nsIRDFService);
-    if (!RDF) return false;
-    var rdfc_uri = "@mozilla.org/rdf/container;1";
-    var RDFC = Components.classes[rdfc_uri].getService();
-    RDFC = RDFC.QueryInterface(Components.interfaces.nsIRDFContainer);
-    if (!RDFC) return false;
-    var Bookmarks = RDF.GetDataSource("rdf:bookmarks");
-    if (!Bookmarks) return false;
-
-    var nameRes = RDF.GetResource(NC_NS + "Name");
-    if (!nameRes) return false;
-
-    pasteNodeRes = RDF.GetResource(pasteNodeID);
-    if (!pasteNodeRes) return false;
-    var pasteContainerRes = null;
-    var pasteNodeIndex = -1;
-    if (isContainerFlag == true)
-    {
-        pasteContainerRes = pasteNodeRes;
-    }
-    else
-    {
-        var parID = select_list[0].parentNode.parentNode.getAttribute("ref");
-        if (!parID) {
-            parID = select_list[0].parentNode.parentNode.getAttribute("id");
-        }
-        if (!parID) return false;
-        pasteContainerRes = RDF.GetResource(parID);
-        if (!pasteContainerRes) return false;
-    }
-    RDFC.Init(Bookmarks, pasteContainerRes);
-
-    if (isContainerFlag == false)
-    {
-        pasteNodeIndex = RDFC.IndexOf(pasteNodeRes);
-        if (pasteNodeIndex < 0) return false; // how did that happen?
-    }
-
-    var typeRes = RDF.GetResource(RDF_NS + "type");
-    if (!typeRes) return false;
-    var bmTypeRes = RDF.GetResource(NC_NS + "Bookmark");
-    if (!bmTypeRes) return false;
-
-    var dirty = false;
-    for (var x=0; x<strings.length; x=x+2)
-    {
-        var theID = strings[x];
-        var theName = strings[x+1];
-        if ((theID.indexOf("ID:{") == 0) && (theName.indexOf("NAME:{") == 0))
-        {
-            theID = theID.substr(4, theID.length-5);
-            theName = theName.substr(6, theName.length-7);
-
-            var IDRes = RDF.GetResource(theID);
-            if (!IDRes) continue;
-
-            if (RDFC.IndexOf(IDRes) > 0)
-                continue;
-
-            if (theName != "")
-            {
-                var NameLiteral = RDF.GetLiteral(theName);
-                if (NameLiteral)
-                {
-                    Bookmarks.Assert(IDRes, nameRes, NameLiteral, true);
-                    dirty = true;
-                }
-            }
-            if (isContainerFlag == true)
-              RDFC.AppendElement(IDRes);
-            else
-              RDFC.InsertElementAt(IDRes, pasteNodeIndex++, true);
-            dirty = true;
-
-            // make sure appropriate bookmark type is set
-            var bmTypeNode = Bookmarks.GetTarget( IDRes, typeRes, true );
-            if (!bmTypeNode)
-            {
-                // set default bookmark type
-                Bookmarks.Assert(IDRes, typeRes, bmTypeRes, true);
-            }
-        }
-    }
-    if (dirty == true)
-    {
-        var rdf_ds_interface = Components.interfaces.nsIRDFRemoteDataSource;
-        var remote = Bookmarks.QueryInterface(rdf_ds_interface);
-        if (remote)
-          remote.Flush();
-    }
-    return true;
-}
-
-function doDelete(promptFlag)
-{
-    var treeNode = document.getElementById("bookmarksTree");
-    if (!treeNode) return false;
-    var select_list = treeNode.selectedItems;
-    if (!select_list) return false;
-    if (select_list.length < 1) return false;
-
-    if (promptFlag == true)
-    {
-        var deleteStr = '';
-        if (select_list.length == 1) {
-            deleteStr = get_localized_string("DeleteItem");
-        } else {
-            deleteStr = get_localized_string("DeleteItems");
-        }
-        var ok = confirm(deleteStr);
-        if (!ok) return false;
-    }
-
-    var RDF_uri = "@mozilla.org/rdf/rdf-service;1";
-    var RDF = Components.classes[RDF_uri].getService();
-    RDF = RDF.QueryInterface(Components.interfaces.nsIRDFService);
-    if (!RDF) return false;
-
-    var RDFC_uri = "@mozilla.org/rdf/container;1";
-    var RDFC = Components.classes[RDFC_uri].getService();
-    RDFC = RDFC.QueryInterface(Components.interfaces.nsIRDFContainer);
-    if (!RDFC) return false;
-
-    var Bookmarks = RDF.GetDataSource("rdf:bookmarks");
-    if (!Bookmarks) return false;
-
-    var dirty = false;
-
-    // note: backwards delete so that we handle odd deletion cases such as
-    //       deleting a child of a folder as well as the folder itself
-    for (var nodeIndex=select_list.length-1; nodeIndex>=0; nodeIndex--)
-    {
-        var node = select_list[nodeIndex];
-        if (!node) continue;
-        var ID = node.getAttribute("id");
-        if (!ID) continue;
-
-        // don't allow deletion of various "special" folders
-        if ((ID == "NC:BookmarksRoot") || (ID == "NC:IEFavoritesRoot"))
-        {
-            continue;
-        }
-
-        var parentID = node.parentNode.parentNode.getAttribute("ref");
-        if (!parentID) parentID = node.parentNode.parentNode.getAttribute("id");
-        if (!parentID) continue;
-
-        var IDRes = RDF.GetResource(ID);
-        if (!IDRes) continue;
-        var parentIDRes = RDF.GetResource(parentID);
-        if (!parentIDRes) continue;
-
-        RDFC.Init(Bookmarks, parentIDRes);
-        RDFC.RemoveElement(IDRes, true);
-        dirty = true;
-    }
-
-    if (dirty == true)
-    {
-        var remote = Bookmarks.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
-        if (remote)
-          remote.Flush();
-    }
-
-    return true;
-}
-
-function doSelectAll()
-{
-    var treeNode = document.getElementById("bookmarksTree");
-    if (!treeNode) return false;
-    treeNode.selectAll();
-    return true;
-}
-
-function doUnload()
-{
-    // Get the current window position/size.
-    var x = window.screenX;
-    var y = window.screenY;
-    var h = window.outerHeight;
-    var w = window.outerWidth;
-
-    // Store these into the window attributes (for persistence).
-    var win = document.getElementById("bookmark-window");
-    win.setAttribute("x", x);
-    win.setAttribute("y", y);
-    win.setAttribute("height", h);
-    win.setAttribute("width", w);
-}
-
-function BookmarkProperties()
-{
-    var treeNode = document.getElementById('bookmarksTree');
-    var select_list = treeNode.selectedItems;
-
-    if (select_list.length >= 1) {
-        // don't bother showing properties on bookmark separators
-        var type = select_list[0].getAttribute('type');
-        if (type != NC_NS + "BookmarkSeparator") {
-            window.openDialog("chrome://communicator/content/bookmarks/bm-props.xul",
-                              "_blank", "centerscreen,chrome,menubar",
-                              select_list[0].getAttribute("id"));
-        }
-    }
-    return true;
-}
-
-
-
-function OpenBookmarksFind()
-{
-    window.openDialog("chrome://communicator/content/bookmarks/bm-find.xul",
-                      "FindBookmarksWindow",
-                      "dialog=no,close,chrome,resizable", "bookmarks");
-    return true;
-}
-
-
-
-function getAbsoluteID(root, node)
-{
-    var url = node.getAttribute("ref");
-    if ((url == null) || (url == ""))
-    {
-        url = node.getAttribute("id");
-    }
-    try
-    {
-        var rootNode = document.getElementById(root);
-        var ds = null;
-        if (rootNode)
-        {
-            ds = rootNode.database;
-        }
-
-        // add support for anonymous resources such as Internet Search results,
-        // IE favorites under Win32, and NetPositive URLs under BeOS
-        var rdf_uri = "@mozilla.org/rdf/rdf-service;1";
-        var rdf = Components.classes[rdf_uri].getService();
-        if (rdf) rdf = rdf.QueryInterface(Components.interfaces.nsIRDFService);
-        if (rdf && ds)
-        {
-            var src = rdf.GetResource(url, true);
-            var prop = rdf.GetResource(NC_NS + "URL",
-                                       true);
-            var target = ds.GetTarget(src, prop, true);
-            if (target) target = target.QueryInterface(Components.interfaces.nsIRDFLiteral);
-            if (target) target = target.Value;
-            if (target) url = target;
-        }
-    }
-    catch(ex)
-    {
-    }
-    return url;
-}
-
-function OpenURL(event, node, root)
-{
-    if ((event.button != 0) || (event.detail != 2)
-        || (node.nodeName != "treeitem"))
-        return false;
-
-    if (node.getAttribute("container") == "true")
-        return false;
-
-    var url = getAbsoluteID(root, node);
-
-    // Ignore "NC:" urls.
-    if (url.substring(0, 3) == "NC:")
-        return false;
-
-    if (event.altKey)
-    {
-        BookmarkProperties();
-    }
-    else
-    {
-        // get right sized window
-        window.openDialog(getBrowserURL(), "_blank", "chrome,all,dialog=no", url);
-    }
-    return true;
-}
-
-const nsIFilePicker = Components.interfaces.nsIFilePicker;
-
-function doContextCmd(cmdName)
-{
-    // Do some prompting/confirmation for various bookmark
-    // commands that we know about.
-    // If we have values to pass it, they are added to the arguments array
-
-    var nameVal = "";
-    var urlVal = "";
-    var promptStr;
-
-    var picker_uri;
-    var filePicker;
-
-    if (cmdName == NC_NS + "command?cmd=newbookmark")
-    {
-        while (true)
-        {
-            promptStr = get_localized_string("NewBookmarkURLPrompt");
-            urlVal = prompt(promptStr, "");
-            if (!urlVal || urlVal=="") return false;
-
-            // ensure we get a fully qualified URL (protocol colon address)
-            var colonOffset = urlVal.indexOf(":");
-            if (colonOffset > 0) break;
-            alert(get_localized_string("NeedValidURL"));
-        }
-
-        promptStr = get_localized_string("NewBookmarkNamePrompt");
-        nameVal = prompt(promptStr, "");
-        if (!nameVal || nameVal=="") return false;
-    }
-    else if (cmdName == NC_NS + "command?cmd=newfolder")
-    {
-        promptStr = get_localized_string("NewFolderNamePrompt");
-        nameVal = prompt(promptStr, "");
-        if (!nameVal || nameVal=="") return false;
-    }
-    else if ((cmdName == NC_NS + "command?cmd=deletebookmark") ||
-         (cmdName == NC_NS + "command?cmd=deletebookmarkfolder") ||
-         (cmdName == NC_NS + "command?cmd=deletebookmarkseparator"))
-    {
-        return doDelete(true);
-        //var promptStr = get_localized_string("DeleteItems");
-        //if (!confirm(promptStr)) return false;
-    }
-    else if (cmdName == NC_NS + "command?cmd=import")
-    {
-        try
-        {
-            picker_uri = "@mozilla.org/filepicker;1";
-            filePicker = Components.classes[picker_uri].createInstance(nsIFilePicker);
-            if (!filePicker) return false;
-
-            promptStr = get_localized_string("SelectImport");
-            filePicker.init(window, promptStr, nsIFilePicker.modeOpen);
-            filePicker.appendFilters(nsIFilePicker.filterHTML | nsIFilePicker.filterAll);
-            if (filePicker.show() != nsIFilePicker.returnCancel)
-              var filename = filePicker.fileURL.spec;
-            if ((!filename) || (filename == "")) return false;
-
-            urlVal = filename;
-        }
-        catch(ex)
-        {
-            return false;
-        }
-    }
-    else if (cmdName == NC_NS + "command?cmd=export")
-    {
-        try
-        {
-            picker_uri = "@mozilla.org/filepicker;1";
-            filePicker = Components.classes[picker_uri].createInstance(nsIFilePicker);
-            if (!filePicker) return false;
-
-            promptStr = get_localized_string("EnterExport");
-            filePicker.init(window, promptStr, nsIFilePicker.modeSave);
-            filePicker.defaultString = "bookmarks.html";
-            filePicker.appendFilters(nsIFilePicker.filterHTML | nsIFilePicker.filterAll);
-            if (filePicker.show() != nsIFilePicker.returnCancel &&
-                filePicker.fileURL.spec &&
-                filePicker.fileURL.spec.length > 0) {
-              urlVal = filePicker.fileURL.spec;
-            } else {
-              return false;
-            }
-        }
-        catch(ex)
-        {
-            return false;
-        }
-    }
-
-    var treeNode = document.getElementById("bookmarksTree");
-    if (!treeNode) return false;
-    var db = treeNode.database;
-    if (!db) return false;
-
-    var compositeDB = db.QueryInterface(Components.interfaces.nsIRDFDataSource);
-    if (!compositeDB) return false;
-
-    var isupports_uri = "@mozilla.org/rdf/rdf-service;1";
-    var isupports = Components.classes[isupports_uri].getService();
-    if (!isupports) return false;
-    var rdf = isupports.QueryInterface(Components.interfaces.nsIRDFService);
-    if (!rdf) return false;
-
-    // need a resource for the command
-    var cmdResource = rdf.GetResource(cmdName);
-    if (!cmdResource) return false;
-    cmdResource = cmdResource.QueryInterface(Components.interfaces.nsIRDFResource);
-    if (!cmdResource) return false;
-
-    // set up selection nsISupportsArray
-    var selection_uri = "@mozilla.org/supports-array;1";
-    var selectionInstance = Components.classes[selection_uri].createInstance();
-    var selectionArray = selectionInstance.QueryInterface(Components.interfaces.nsISupportsArray);
-
-    // set up arguments nsISupportsArray
-    var arguments_uri = "@mozilla.org/supports-array;1";
-    var argumentsInstance = Components.classes[arguments_uri].createInstance();
-    var argumentsArray = argumentsInstance.QueryInterface(Components.interfaces.nsISupportsArray);
-
-    // get various arguments (parent, name)
-    var parentArc = rdf.GetResource(NC_NS + "parent");
-    if (!parentArc) return false;
-    var nameArc = rdf.GetResource(NC_NS + "Name");
-    if (!nameArc) return false;
-    var urlArc = rdf.GetResource(NC_NS + "URL");
-    if (!urlArc) return false;
-
-    var select_list = treeNode.selectedItems;
-
-    var uri;
-    var rdfNode;
-
-    if (select_list.length < 1)
-    {
-        // if nothing is selected, default to using the "ref"
-        // on the root of the tree
-        uri = treeNode.getAttribute("ref");
-        if (!uri || uri=="") return false;
-        rdfNode = rdf.GetResource(uri);
-        // add node into selection array
-        if (rdfNode)
-        {
-            selectionArray.AppendElement(rdfNode);
-        }
-
-        // add singular arguments into arguments array
-        if ((nameVal) && (nameVal != ""))
-        {
-            var nameLiteral = rdf.GetLiteral(nameVal);
-            if (!nameLiteral) return false;
-            argumentsArray.AppendElement(nameArc);
-            argumentsArray.AppendElement(nameLiteral);
-        }
-        if ((urlVal) && (urlVal != ""))
-        {
-            var urlLiteral = rdf.GetLiteral(urlVal);
-            if (!urlLiteral) return false;
-            argumentsArray.AppendElement(urlArc);
-            argumentsArray.AppendElement(urlLiteral);
-        }
-    }
-    else for (var nodeIndex=0; nodeIndex<select_list.length; nodeIndex++)
-    {
-        var node = select_list[nodeIndex];
-        if (!node) break;
-        uri = node.getAttribute("ref");
-        if ((uri) || (uri == ""))
-        {
-            uri = node.getAttribute("id");
-        }
-        if (!uri) return false;
-
-        rdfNode = rdf.GetResource(uri);
-        if (!rdfNode) break;
-
-        // add node into selection array
-        selectionArray.AppendElement(rdfNode);
-
-        // get the parent's URI
-        var parentURI = "";
-        var theParent = node.parentNode.parentNode;
-        parentURI = theParent.getAttribute("ref");
-        if ((!parentURI) || (parentURI == ""))
-        {
-                parentURI = theParent.getAttribute("id");
-        }
-        if (parentURI == "") return false;
-
-        var parentNode = rdf.GetResource(parentURI, true);
-        if (!parentNode) return false;
-
-        // add multiple arguments into arguments array
-        argumentsArray.AppendElement(parentArc);
-        argumentsArray.AppendElement(parentNode);
-
-        if ((nameVal) && (nameVal != ""))
-        {
-            var nameLiteral2 = rdf.GetLiteral(nameVal);
-            if (!nameLiteral2) return false;
-            argumentsArray.AppendElement(nameArc);
-            argumentsArray.AppendElement(nameLiteral2);
-        }
-        if ((urlVal) && (urlVal != ""))
-        {
-            var urlLiteral2 = rdf.GetLiteral(urlVal);
-            if (!urlLiteral2) return false;
-            argumentsArray.AppendElement(urlArc);
-            argumentsArray.AppendElement(urlLiteral2);
-        }
-    }
-
-    // do the command
-    compositeDB.DoCommand(selectionArray, cmdResource, argumentsArray);
-    return true;
-}
-
-function bookmarkSelect()
-{
-    var tree = document.getElementById("bookmarksTree");
-    var status = document.getElementById("statusbar-text");
-    var val = "";
-    if (tree.selectedItems.length == 1)
-    {
-        val = getAbsoluteID("bookmarksTree", tree.selectedItems[0]);
-
-        // Ignore "NC:" urls.
-        if (val.substring(0, 3) == "NC:")
-        {
-            val = "";
-        }
-    }
-    status.label = val;
-    return true;
-}

mozilla/xpfe/components/bookmarks/resources/bookmarks.css

@@ -1,14 +0,0 @@
-bookmarks-tree, bookmarks-tree[type="multi-column"]
-  {
-    -moz-binding          : url("chrome://communicator/content/bookmarks/bookmarks.xml#bookmarks-tree-full");
-  }
-  
-bookmarks-tree[type="single-column"]
-  {
-    -moz-binding          : url("chrome://communicator/content/bookmarks/bookmarks.xml#bookmarks-tree-name");
-  }
-
-bookmarks-tree[type="folders"]
-  {
-    -moz-binding          : url("chrome://communicator/content/bookmarks/bookmarks.xml#bookmarks-tree-folders");
-  }

mozilla/xpfe/components/bookmarks/resources/bookmarks.js

@@ -1,219 +0,0 @@
-/* -*- Mode: Java; 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):
- *   Ben Goodger <ben@netscape.com> (Original Author, v3.0)
- */
-
-////////////////////////////////////////////////////////////////////////////////
-// Initialize the command controllers, set focus, tree root, 
-// window title state, etc. 
-function Startup()
-{
-  const windowNode = document.getElementById("bookmark-window");
-  const bookmarksView = document.getElementById("bookmarks-view");
-  var titleString;
-
-  // If we've been opened with a parameter, root the tree on it.
-  if ("arguments" in window && window.arguments[0]) {
-    var title;
-    var uri = window.arguments[0];
-    bookmarksView.tree.setAttribute("ref", uri);
-    if (uri.substring(0,5) == "find:") {
-      title = bookmarksView._bundle.GetStringFromName("search_results_title");
-      // Update the windowtype so that future searches are directed 
-      // there and the window is not re-used for bookmarks. 
-      windowNode.setAttribute("windowtype", "bookmarks:searchresults");
-    }
-    else {
-      const krNameArc = bookmarksView.rdf.GetResource(NC_NS + "Name");
-      const krRoot = bookmarksView.rdf.GetResource(window.arguments[0]);
-      var rName = bookmarksView.db.GetTarget(krRoot, krNameArc, true);
-      title = rName.QueryInterface(Components.interfaces.nsIRDFLiteral).Value;
-    }
-    titleString = bookmarksView._bundle.GetStringFromName("window_title");
-    titleString = titleString.replace(/%folder_name%/gi, title);
-    windowNode.setAttribute("title", titleString);
-  }
-  else {
-    const kProfileContractID = "@mozilla.org/profile/manager;1";
-    const kProfileIID = Components.interfaces.nsIProfile;
-    const kProfile = Components.classes[kProfileContractID].getService(kProfileIID);
-    var length = {value:0};
-    var profileList = kProfile.getProfileList(length);
-    // unset the default BM title if the user has more than one profile
-    // or if he/she has changed the name of the default one.
-    // the profile "default" is not localizable.
-    if (length.value > 1 || kProfile.currentProfile.toLowerCase() != "default") {
-      titleString = bookmarksView._bundle.GetStringFromName("bookmarks_root");
-      titleString = titleString.replace(/%user_name%/, kProfile.currentProfile);
-      windowNode.setAttribute("title", titleString);
-    }
-  }
- 
-  bookmarksView.treeBoxObject.selection.select(0);
-  bookmarksView.tree.focus();
-}
-
-function Shutdown ()
-{
-  // Store current window position and size in window attributes (for persistence).
-  var win = document.getElementById("bookmark-window");
-  win.setAttribute("x", screenX);
-  win.setAttribute("y", screenY);
-  win.setAttribute("height", outerHeight);
-  win.setAttribute("width", outerWidth);
-
-  var bookmarksView = document.getElementById("bookmarks-view");
-  bookmarksView.flushBMDatasource();
-}
-
-var gConstructedViewMenuSortItems = false;
-function fillViewMenu(aEvent)
-{
-  var adjacentElement = document.getElementById("fill-before-this-node");
-  var popupElement = aEvent.target;
-  
-  var bookmarksView = document.getElementById("bookmarks-view");
-  var columns = bookmarksView.columns;
-
-  if (!gConstructedViewMenuSortItems) {
-    for (var i = 0; i < columns.length; ++i) {
-      var name = columns[i].name;
-      var accesskey = columns[i].accesskey;
-      
-      var menuitem = document.createElement("menuitem");
-      var nameTemplate = bookmarksView._bundle.GetStringFromName("SortMenuItem");
-      name = nameTemplate.replace(/%NAME%/g, columns[i].label);
-      menuitem.setAttribute("label", name);
-      menuitem.setAttribute("accesskey", columns[i].accesskey);
-      menuitem.setAttribute("resource", columns[i].resource);
-      menuitem.setAttribute("id", "sortMenuItem:" + columns[i].resource);
-      menuitem.setAttribute("checked", columns[i].sortActive);
-      menuitem.setAttribute("name", "sortSet");
-      menuitem.setAttribute("type", "radio");
-      
-      popupElement.insertBefore(menuitem, adjacentElement);
-    }
-    
-    gConstructedViewMenuSortItems = true;
-  }  
-
-  const kPrefSvcContractID = "@mozilla.org/preferences;1";
-  const kPrefSvcIID = Components.interfaces.nsIPrefService;
-  var prefSvc = Components.classes[kPrefSvcContractID].getService(kPrefSvcIID);
-  var bookmarksSortPrefs = prefSvc.getBranch("browser.bookmarks.sort.");
-
-  if (gConstructedViewMenuSortItems) {
-    var resource = bookmarksSortPrefs.getCharPref("resource");
-    var element = document.getElementById("sortMenuItem:" + resource);
-    if (element)
-      element.setAttribute("checked", "true");
-  }  
-
-  var sortAscendingMenu = document.getElementById("ascending");
-  var sortDescendingMenu = document.getElementById("descending");
-  var noSortMenu = document.getElementById("natural");
-  
-  sortAscendingMenu.setAttribute("checked", "false");
-  sortDescendingMenu.setAttribute("checked", "false");
-  noSortMenu.setAttribute("checked", "false");
-  var direction = bookmarksSortPrefs.getCharPref("direction");
-  if (direction == "natural")
-    sortAscendingMenu.setAttribute("checked", "true");
-  else if (direction == "ascending") 
-    sortDescendingMenu.setAttribute("checked", "true");
-  else
-    noSortMenu.setAttribute("checked", "true");
-}
-
-function onViewMenuSortItemSelected(aEvent)
-{
-  var resource = aEvent.target.getAttribute("resource");
-  
-  const kPrefSvcContractID = "@mozilla.org/preferences;1";
-  const kPrefSvcIID = Components.interfaces.nsIPrefService;
-  var prefSvc = Components.classes[kPrefSvcContractID].getService(kPrefSvcIID);
-  var bookmarksSortPrefs = prefSvc.getBranch("browser.bookmarks.sort.");
-
-  switch (resource) {
-  case "":
-    break;
-  case "direction":
-    var dirn = bookmarksSortPrefs.getCharPref("direction");
-    if (aEvent.target.id == "ascending")
-      bookmarksSortPrefs.setCharPref("direction", "natural");
-    else if (aEvent.target.id == "descending")
-      bookmarksSortPrefs.setCharPref("direction", "ascending");
-    else
-      bookmarksSortPrefs.setCharPref("direction", "descending");
-    break;
-  default:
-    bookmarksSortPrefs.setCharPref("resource", resource);
-    var direction = bookmarksSortPrefs.getCharPref("direction");
-    if (direction == "descending")
-      bookmarksSortPrefs.setCharPref("direction", "natural");
-    break;
-  }
-
-  aEvent.preventCapture();
-}  
-
-var gConstructedColumnsMenuItems = false;
-function fillColumnsMenu(aEvent) 
-{
-  var bookmarksView = document.getElementById("bookmarks-view");
-  var columns = bookmarksView.columns;
-  var i;
-
-  if (!gConstructedColumnsMenuItems) {
-    for (i = 0; i < columns.length; ++i) {
-      var menuitem = document.createElement("menuitem");
-      menuitem.setAttribute("label", columns[i].label);
-      menuitem.setAttribute("resource", columns[i].resource);
-      menuitem.setAttribute("id", "columnMenuItem:" + columns[i].resource);
-      menuitem.setAttribute("type", "checkbox");
-      menuitem.setAttribute("checked", columns[i].hidden != "true");
-      aEvent.target.appendChild(menuitem);
-    }
-
-    gConstructedColumnsMenuItems = true;
-  }
-  else {
-    for (i = 0; i < columns.length; ++i) {
-      var element = document.getElementById("columnMenuItem:" + columns[i].resource);
-      if (element && columns[i].hidden != "true")
-        element.setAttribute("checked", "true");
-    }
-  }
-  
-  aEvent.preventBubble();
-}
-
-function onViewMenuColumnItemSelected(aEvent)
-{
-  var resource = aEvent.target.getAttribute("resource");
-  if (resource != "") {
-    var bookmarksView = document.getElementById("bookmarks-view");
-    bookmarksView.toggleColumnVisibility(resource);
-  }  
-
-  aEvent.preventBubble();
-}
-

mozilla/xpfe/components/bookmarks/resources/bookmarks.xul

@@ -1,252 +0,0 @@
-<?xml version="1.0"?>  
-
-<!-- -*- Mode: HTML; 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): 
-    Ben Goodger <ben@netscape.com>
-    Blake Ross <blakeross@telocity.com>
-    Dean Tessman <dean_tessman@hotmail.com>
-
--->
-
-<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/skin/bookmarks/bookmarksWindow.css" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/content/bookmarks/bookmarks.css" type="text/css"?>
-<?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
-<?xul-overlay href="chrome://communicator/content/bookmarks/bookmarksOverlay.xul"?>
-<?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
-<?xul-overlay href="chrome://communicator/content/tasksOverlay.xul"?>
-<?xul-overlay href="chrome://communicator/content/communicatorOverlay.xul"?>
-
-<!DOCTYPE window [
-<!ENTITY % utilDTD SYSTEM "chrome://communicator/locale/utilityOverlay.dtd" >
-%utilDTD;
-<!ENTITY % bmDTD SYSTEM "chrome://communicator/locale/bookmarks/bookmarks.dtd">
-%bmDTD;
-]>
-
-<window id="bookmark-window" windowtype="bookmarks:manager"
-        title="&bookmarksWindowTitle.label;" 
-        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-        xmlns:web="http://home.netscape.com/WEB-rdf#"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        width="630" height="400" screenX="20" screenY="20"
-        persist="width height screenX screenY sizemode"
-        onload="Startup();" onunload="Shutdown();">
-
-  <!-- The order of loading of these script files is IMPORTANT -->
-
-  <!-- Shared Libraries -->
-  <script type="application/x-javascript" src="chrome://global/content/strres.js"></script>
-
-  <!-- XXX - This should SO become an XBL widget -->
-  <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"></script>
-  
-  <!-- Shared Bookmarks Utility Library -->
-  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarksOverlay.js"/>
-  <!-- Tree-based Bookmarks UI Utility Library -->
-  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarksTree.js"/>
-  <!-- Bookmarks Window -->
-  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarks.js"/>
-
-  <!-- Bookmarks Window Drag & Drop -->
-  <script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/nsTransferable.js"/>
-  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarksDD.js"/>
-
-  <popupset id="bookmarksPopupset"/>
-
-  <commands id="commands">
-    <commandset id="CommandUpdate_Bookmarks"
-                commandupdater="true"
-                events="focus,tree-select"
-                oncommandupdate="document.getElementById('bookmarks-view').onCommandUpdate();">
-    </commandset>                
-
-    <commandset id="tasksCommands"/> 
-
-    <!-- File Menu -->
-    <command id="cmd_close" oncommand="close()"/>
-    <command id="cmd_quit"/>
-    <!-- Edit Menu -->
-    <command id="cmd_undo"/>
-  </commands>
-
-  <stringbundleset id="stringbundleset"/>
-
-  <keyset id="tasksKeys">
-    <!-- File Menu -->
-    <key id="key_close"/>
-    <key id="key_quit"/>
-    <!-- Edit Menu -->
-    <key id="key_undo"/>
-
-    <!-- These keybindings do not have a command specified in the overlay, 
-         which is good, but we need to specify it ourselves here -->
-    <key id="key_cut" command="cmd_bm_cut"/>
-    <key id="key_copy" command="cmd_bm_copy"/>
-    <key id="key_paste" command="cmd_bm_paste"/>
-    <key id="key_selectAll" command="cmd_bm_selectAll"/>
-
-    <!-- We need to provide our own delete key binding because the key_delete
-         handler in platformGlobalOverlay.xul maps command to "cmd_delete" which
-         is NOT what we want! -->
-    <key id="key_bm_delete" keycode="VK_DELETE" command="cmd_bm_delete"/>
-
-    <key id="bm_key_find"  
-         key="&edit.find.keybinding;"  
-         command="cmd_bm_find" modifiers="accel"/>
-    <key id="bm_key_properties" 
-         key="&edit.properties.keybinding;"  
-         command="cmd_bm_properties" modifiers="accel"/>
-  </keyset>
-  
-  <toolbox id="bookmarks-toolbox">
-    <menubar id="main-menubar" grippytooltiptext="&menuBar.tooltip;">
-      <menu id="menu_File">
-        <menupopup id="menu_FilePopup">
-          <menu id="menu_New">
-            <menupopup>
-              <menuitem label="&menuitem.newBookmark.label;" 
-                        accesskey="&command.newBookmark.accesskey;"
-                        observes="cmd_bm_newbookmark"/>
-              <menuitem label="&menuitem.newFolder.label;" 
-                        accesskey="&command.newFolder.accesskey;"
-                        observes="cmd_bm_newfolder"/>
-              <menuitem label="&menuitem.newSeparator.label;"
-                        accesskey="&command.newSeparator.accesskey;"
-                        observes="cmd_bm_newseparator"/>
-            </menupopup>
-          </menu>
-          <menuitem id="menu_close"/>
-        </menupopup>
-      </menu>
-      <menu id="menu_Edit">
-        <menupopup>
-          <menuitem id="menu_undo" disabled="true"/>
-          <menuseparator/>
-          <menuitem id="menu_bm_cut"    
-                    label="&cutCmd.label;" accesskey="&cutCmd.accesskey;" 
-          key="key_cut" command="cmd_bm_cut"/>
-          <menuitem id="menu_bm_copy"
-                    label="&copyCmd.label;" accesskey="&copyCmd.accesskey;"
-                    key="key_copy" command="cmd_bm_copy"/>
-          <menuitem id="menu_bm_paste"  
-                    label="&pasteCmd.label;" accesskey="&pasteCmd.accesskey;"     
-                    key="key_paste" command="cmd_bm_paste"/>
-          <menuitem id="menu_bm_delete" 
-                    label="&deleteCmd.label;" accesskey="&deleteCmd.label;"     
-                    key="key_bm_delete" command="cmd_bm_delete"/>
-          <menuseparator/>
-          <menuitem id="menu_bm_selectAll" 
-                label="&selectAllCmd.label;" accesskey="&selectAllCmd.accesskey;"
-                    key="key_selectAll" command="cmd_bm_selectAll"/>
-          <menuseparator/>
-          <menuitem label="&command.fileBookmark.label;"
-                    accesskey="&command.fileBookmark.accesskey;"
-                    command="cmd_bm_fileBookmark"/>
-          <menuseparator/>
-            <menuitem observes="cmd_bm_properties" key="bm_key_properties" 
-                      label="&command.properties.label;" 
-                      accesskey="&command.properties.accesskey;" />
-        </menupopup>
-      </menu>
-  
-      <menu id="menu_View">
-        <menupopup onpopupshowing="fillViewMenu(event)"
-                   oncommand="onViewMenuSortItemSelected(event);">
-          <menuitem id="viewCommandToolbar" type="checkbox" class="menuitem-iconic"
-                    label="&menuitem.view.command.toolbar.label;"
-                    accesskey="&menuitem.view.command.toolbar.accesskey;"
-                    oncommand="goToggleToolbar('command-toolbar', 'viewCommandToolbar'); event.preventBubble();"
-                    persist="checked"/>
-          <menuseparator id="fill-after-this-node"/>
-          <menuitem id="natural" label="&menuitem.view.unsorted.label;"
-                    accesskey="&menuitem.view.unsorted.accesskey;"
-                    type="radio"
-                    resource="direction" name="sortSet"/>
-          <menuseparator id="fill-before-this-node"/>
-          <menuitem id="ascending" label="&menuitem.view.ascending.label;"
-                    accesskey="&menuitem.view.ascending.accesskey;"
-                    type="radio"
-                    resource="direction" name="sortDirectionSet"/>
-          <menuitem id="descending" label="&menuitem.view.descending.label;"
-                    accesskey="&menuitem.view.descending.accesskey;"
-                    type="radio"
-                    resource="direction" name="sortDirectionSet"/>
-          <menuseparator/>
-          <menu id="descending" label="&menuitem.view.show_columns.label;"
-                accesskey="&menuitem.view.show_columns.accesskey;">
-            <menupopup id="columnsPopup" onpopupshowing="fillColumnsMenu(event);"
-                       oncommand="onViewMenuColumnItemSelected(event);"/>
-          </menu>
-          <menuseparator/>
-          <menuitem label="&menuitem.newbookmarkfolder.label;" 
-                    command="cmd_bm_setnewbookmarkfolder"
-                    accesskey="&menuitem.newbookmarkfolder.accesskey;"/>
-          <menuitem label="&menuitem.newinternetsearchfolder.label;"
-                    command="cmd_bm_setnewsearchfolder"
-                    accesskey="&menuitem.newinternetsearchfolder.accesskey;"/>
-          <menuitem label="&menuitem.personaltoolbarfolder.label;"    
-                    command="cmd_bm_setpersonaltoolbarfolder"
-                    accesskey="&menuitem.personaltoolbarfolder.accesskey;"/>
-        </menupopup>
-      </menu>
-      <menu id="tasksMenu">
-        <menupopup id="taskPopup">
-          <menuitem command="cmd_bm_find" key="bm_key_find"
-                    label="&menuitem.find.label;" 
-                    accesskey="&menuitem.find.accesskey;"/>
-          <menuitem label="&menuitem.import.label;"
-                    accesskey="&menuitem.import.accesskey;"
-                    observes="cmd_bm_import"/>
-          <menuitem label="&menuitem.export.label;"
-                    accesskey="&menuitem.export.accesskey;"
-                    observes="cmd_bm_export"/>
-          <menuseparator/>
-        </menupopup>
-      </menu>
-      <menu id="windowMenu"/>
-      <menu id="menu_Help"/>
-    </menubar>
-
-    <toolbar id="command-toolbar" tbalign="stretch" grippytooltiptext="&bookmarkToolbar.tooltip;">
-      <toolbarbutton id="newfolder" label="&button.newFolder.label;" 
-                     command="cmd_bm_newfolder"/>
-      <toolbarbutton id="newseparator" label="&button.newSeparator.label;" 
-                     command="cmd_bm_newseparator"/>
-      <toolbarseparator/>
-      <toolbarbutton id="fileBookmark" label="&command.fileBookmark.label;"
-                     command="cmd_bm_fileBookmark"/>
-      <toolbarseparator/>
-      <toolbarbutton id="properties" label="&command.properties.label;"
-                     command="cmd_bm_properties"/>
-      <toolbarbutton id="rename" label="&command.rename.label;"
-                     command="cmd_bm_rename"/>
-      <toolbarbutton id="delete" label="&command.delete.label;"
-                     command="cmd_bm_delete"/>
-    </toolbar>
-  </toolbox>
-  
-  <bookmarks-tree id="bookmarks-view" flex="1"/>
-
-</window>
-

mozilla/xpfe/components/bookmarks/resources/bookmarksDD-temp.js

@@ -1,508 +0,0 @@
-/* -*- Mode: Java; tab-width: 2; 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 the old bookmarks code, included here for the sake of the bookmarks sidebar panel,
-  which will be fixed to use my new code in .9. In the mean time, this file provides a 
-  life line to various functionality. 
- */ 
- 
- 
-var NC_NS  = "http://home.netscape.com/NC-rdf#";
-var RDF_NS = "http://www.w3.org/1999/02/22-rdf-syntax-ns#";
-
-
-
-function TopLevelDrag ( event )
-{
-  return(true);
-}
-
-
-function BeginDragTree ( event )
-{
-  //XXX we rely on a capturer to already have determined which item the mouse was over
-  //XXX and have set an attribute.
-    
-  // if the click is on the tree proper, ignore it. We only care about clicks on items.
-
-  var tree = document.getElementById("bookmarksTree");
-  if ( event.target == tree || event.target.localName == "treechildren" )
-    return(true);         // continue propagating the event
-    
-  var childWithDatabase = tree;
-  if ( ! childWithDatabase )
-    return(false);
-    
-  var dragStarted = false;
-
-  var trans = 
-    Components.classes["@mozilla.org/widget/transferable;1"].createInstance(Components.interfaces.nsITransferable);
-  if ( !trans ) return(false);
-
-  var genData = 
-    Components.classes["@mozilla.org/supports-wstring;1"].createInstance(Components.interfaces.nsISupportsWString);
-  if (!genData) return(false);
-
-  var genDataURL = 
-    Components.classes["@mozilla.org/supports-wstring;1"].createInstance(Components.interfaces.nsISupportsWString);
-  if (!genDataURL) return(false);
-
-  trans.addDataFlavor("text/unicode");
-  trans.addDataFlavor("moz/rdfitem");
-        
-  // ref/id (url) is on the <treeitem> which is two levels above the <treecell> which is
-  // the target of the event.
-  var id = event.target.parentNode.parentNode.getAttribute("ref");
-  if (!id || id=="")
-  {
-	id = event.target.parentNode.parentNode.getAttribute("id");
-  }
-
-  var parentID = event.target.parentNode.parentNode.parentNode.parentNode.getAttribute("ref");
-  if (!parentID || parentID == "")
-  {
-	parentID = event.target.parentNode.parentNode.parentNode.parentNode.getAttribute("id");
-  }
-
-  var trueID = id;
-  if (parentID != null)
-  {
-  	trueID += "\n" + parentID;
-  }
-  genData.data = trueID;
-  genDataURL.data = id;
-
-  var database = childWithDatabase.database;
-  var rdf = 
-    Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
-  if ((!rdf) || (!database))  { dump("CAN'T GET DATABASE\n"); return(false); }
-
-  // make sure its a bookmark, bookmark separator, or bookmark folder
-  var src = rdf.GetResource(id, true);
-  var prop = rdf.GetResource(RDF_NS + "type", true);
-  var target = database.GetTarget(src, prop, true);
-
-  if (target) target = target.QueryInterface(Components.interfaces.nsIRDFResource);
-  if (target) target = target.Value;
-  if ((!target) || (target == "")) {dump("BAD\n"); return(false);}
-
-  if ((target != NC_NS + "BookmarkSeparator") &&
-    (target != NC_NS + "Bookmark") &&
-    (target != NC_NS + "Folder")) return(false);
-
-  trans.setTransferData ( "moz/rdfitem", genData, genData.data.length * 2);  // double byte data
-  trans.setTransferData ( "text/unicode", genDataURL, genDataURL.data.length * 2);  // double byte data
-
-  var transArray = 
-    Components.classes["@mozilla.org/supports-array;1"].createInstance(Components.interfaces.nsISupportsArray);
-  if ( !transArray )  return(false);
-
-  // put it into the transferable as an |nsISupports|
-  var genTrans = trans.QueryInterface(Components.interfaces.nsISupports);
-  transArray.AppendElement(genTrans);
-  
-  var dragService = 
-    Components.classes["@mozilla.org/widget/dragservice;1"].getService(Components.interfaces.nsIDragService);
-  if ( !dragService ) return(false);
-
-  var nsIDragService = Components.interfaces.nsIDragService;
-  dragService.invokeDragSession ( event.target, transArray, null, nsIDragService.DRAGDROP_ACTION_COPY + 
-                                     nsIDragService.DRAGDROP_ACTION_MOVE );
-  dragStarted = true;
-
-  return(!dragStarted);
-}
-
-
-
-function DragOverTree ( event )
-{
-  var validFlavor = false;
-  var dragSession = null;
-  var retVal = true;
-
-  var dragService = 
-    Components.classes["@mozilla.org/widget/dragservice;1"].getService(Components.interfaces.nsIDragService);
-  if ( !dragService ) return(false);
-
-  dragSession = dragService.getCurrentSession();
-  if ( !dragSession ) return(false);
-
-  if ( dragSession.isDataFlavorSupported("moz/rdfitem") ) validFlavor = true;
-  else if ( dragSession.isDataFlavorSupported("text/unicode") ) validFlavor = true;
-  //XXX other flavors here...
-
-  // touch the attribute on the rowgroup to trigger the repaint with the drop feedback.
-  if ( validFlavor )
-  {
-    var treeRoot = document.getElementById("bookmarksTree");
-    if (!treeRoot)  return(false);
-    var treeDatabase = treeRoot.database;
-    if (!treeDatabase)  return(false);
-
-    //XXX this is really slow and likes to refresh N times per second.
-    var rowGroup = event.target.parentNode.parentNode;
-    var sortActive = treeRoot.getAttribute("sortActive");
-    if (sortActive == "true")
-      rowGroup.setAttribute ( "dd-triggerrepaintsorted", 0 );
-    else
-      rowGroup.setAttribute ( "dd-triggerrepaint", 0 );
-
-    dragSession.canDrop = true;
-    // necessary??
-    retVal = false;
-  }
-  return(retVal);
-}
-
-
-
-function DropOnTree ( event )
-{
-  var treeRoot = document.getElementById("bookmarksTree");
-  if (!treeRoot)  return(false);
-  var treeDatabase = treeRoot.database;
-  if (!treeDatabase)  return(false);
-
-  // for beta1, don't allow D&D if sorting is active
-  var sortActive = treeRoot.getAttribute("sortActive");
-  if (sortActive == "true")
-  {
-  	dump("Sorry, drag&drop is currently disabled when sorting is active.\n");
-  	return(false);
-  }
-
-  var RDF = 
-    Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
-  if (!RDF) return(false);
-  var RDFC =
-    Components.classes["@mozilla.org/rdf/container;1"].getService(Components.interfaces.nsIRDFContainer);
-  if (!RDFC)  return(false);
-
-  var Bookmarks = RDF.GetDataSource("rdf:bookmarks");
-  if (!Bookmarks) return(false);
-
-  // target is the <treecell>, and "ref/id" is on the <treeitem> two levels above
-  var treeItem = event.target.parentNode.parentNode;
-  if (!treeItem)  return(false);
-
-  // get drop hint attributes
-  var dropBefore = treeItem.getAttribute("dd-droplocation");
-  var dropOn = treeItem.getAttribute("dd-dropon");
-
-  // calculate drop action
-  var dropAction;
-  if (dropBefore == "true") dropAction = "before";
-  else if (dropOn == "true")  dropAction = "on";
-  else        dropAction = "after";
-
-  // calculate parent container node
-  var containerItem = treeItem;
-  if (dropAction != "on")
-  {
-    containerItem = treeItem.parentNode.parentNode;
-  }
-
-	// magical fix for bug # 33546: handle dropping after open container
-	if (treeItem.getAttribute("container") == "true")
-	{
-		if (treeItem.getAttribute("open") == "true")
-		{
-			if (dropAction == "after")
-			{
-				dropAction = "before";
-				containerItem = treeItem;
-
-				// find <treechildren>, drop before first child
-				var treeChildren = treeItem;
-				treeItem = null;
-				for (var x = 0; x < treeChildren.childNodes.length; x++)
-				{
-					if (treeChildren.childNodes[x].tagName == "treechildren")
-					{
-						treeItem = treeChildren.childNodes[x].childNodes[0];
-						break;
-					}
-				}
-
-				if (!treeItem)
-				{
-					dropAction = "on";
-					containerItem = treeItem.parentNode.parentNode;
-				}
-			}
-		}
-	}
-
-  var targetID = getAbsoluteID("bookmarksTree", treeItem);
-  if (!targetID)  return(false);
-  var targetNode = RDF.GetResource(targetID, true);
-  if (!targetNode)  return(false);
-
-  var containerID = getAbsoluteID("bookmarksTree", containerItem);
-  if (!containerID) return(false);
-  var containerNode = RDF.GetResource(containerID);
-  if (!containerNode) return(false);
-
-  var dragService = 
-    Components.classes["@mozilla.org/widget/dragservice;1"].getService(Components.interfaces.nsIDragService);
-  if ( !dragService ) return(false);
-  
-  var dragSession = dragService.getCurrentSession();
-  if ( !dragSession ) return(false);
-
-  var trans = 
-    Components.classes["@mozilla.org/widget/transferable;1"].createInstance(Components.interfaces.nsITransferable);
-  if ( !trans )   return(false);
-  trans.addDataFlavor("moz/rdfitem");
-  trans.addDataFlavor("text/x-moz-url");
-  trans.addDataFlavor("text/unicode");
-
-    var typeRes = RDF.GetResource(RDF_NS + "type");
-    if (!typeRes) return false;
-    var bmTypeRes = RDF.GetResource(NC_NS + "Bookmark");
-    if (!bmTypeRes) return false;
-
-  var dirty = false;
-
-  for ( var i = 0; i < dragSession.numDropItems; ++i )
-  {
-    dragSession.getData ( trans, i );
-    var dataObj = new Object();
-    var bestFlavor = new Object();
-    var len = new Object();
-    trans.getAnyTransferData ( bestFlavor, dataObj, len );
-    if ( dataObj )  dataObj = dataObj.value.QueryInterface(Components.interfaces.nsISupportsWString);
-    if ( !dataObj ) continue;
-
-    var sourceID = null;
-    var parentID = null;
-    var checkNameHack = false;
-    var name=null;
-
-    if (bestFlavor.value == "moz/rdfitem")
-    {
-	    // pull the URL out of the data object
-	    var data = dataObj.data.substring(0, len.value / 2);
-
-        // moz/rdfitem allows parent ID specified on next line; check for it
-	    var cr = data.indexOf("\n");
-	    if (cr >= 0)
-	    {
-	    	sourceID = data.substr(0, cr);
-	    	parentID = data.substr(cr+1);
-	    }
-	    else
-	    {
-	        sourceID = data;
-	    }
-    }
-    else if (bestFlavor.value == "text/x-moz-url")
-    {
-	    // pull the URL out of the data object
-	    data = dataObj.data.substring(0, len.value / 2);
-	    sourceID = data;
-
-    	// we may need to synthesize a name (just use the URL)
-    	checkNameHack = true;
-    }
-    else if (bestFlavor.value == "text/unicode")
-    {
-    	sourceID = dataObj.data;
-
-    	// we may need to synthesize a name (just use the URL)
-    	checkNameHack = true;
-    }
-    else
-    {
-        // unknown flavor, skip
-        continue;
-    }
-
-    // pull the (optional) name out of the URL
-    var separator = sourceID.indexOf("\n");
-    if (separator >= 0)
-    {
-        name = sourceID.substr(separator+1);
-        sourceID = sourceID.substr(0, separator);
-    }
-
-    var sourceNode = RDF.GetResource(sourceID, true);
-    if (!sourceNode)  continue;
-
-    var parentNode = null;
-    if (parentID != null)
-    {
-    	parentNode = RDF.GetResource(parentID, true);
-    }
-    
-    // Prevent dropping of a node before, after, or on itself
-    if (sourceNode == targetNode) continue;
-    // Prevent dropping of a node onto its parent container
-    if ((dropAction == "on") && (containerID) && (containerID == parentID))	continue;
-
-    RDFC.Init(Bookmarks, containerNode);
-
-    // make sure appropriate bookmark type is set
-    var bmTypeNode = Bookmarks.GetTarget( sourceNode, typeRes, true );
-    if (!bmTypeNode)
-    {
-        // set default bookmark type
-        Bookmarks.Assert(sourceNode, typeRes, bmTypeRes, true);
-    }
-
-    if ((dropAction == "before") || (dropAction == "after"))
-    {
-      // drop before or after
-      var nodeIndex;
-
-      nodeIndex = RDFC.IndexOf(sourceNode);
-
-      if (nodeIndex >= 1)
-      {
-        // moving a node around inside of the container
-        // so remove, then re-add the node
-        RDFC.RemoveElementAt(nodeIndex, true, sourceNode);
-      }
-      
-      nodeIndex = RDFC.IndexOf(targetNode);
-
-      if (nodeIndex < 1)  return(false);
-      if (dropAction == "after")  ++nodeIndex;
-
-      RDFC.InsertElementAt(sourceNode, nodeIndex, true);
-
-	// select the newly added node
-	if (parentID)
-	{
-	      selectDroppedItems(treeRoot, containerID, sourceID);
-	}	     
-
-      dirty = true;
-    }
-    else
-    {
-      // drop on
-      RDFC.AppendElement(sourceNode);
-
-	// select the newly added node
-	if (parentID)
-	{
-	      selectDroppedItems(treeRoot, containerID, sourceID);
-	}	     
-
-      dirty = true;
-    }
-
-    if ((checkNameHack == true) || (name != null))
-    {
-    	var srcArc = RDF.GetResource(sourceID, true);
-    	var propArc = RDF.GetResource(NC_NS + "Name", true);
-    	if (srcArc && propArc && Bookmarks)
-    	{
-    		var targetArc = Bookmarks.GetTarget(srcArc, propArc, true);
-    		if (!targetArc)
-    		{
-    		    // if no name, fallback to using the URL as the name
-    			var defaultNameArc = RDF.GetLiteral((name != null && name != "") ? name : sourceID);
-    			if (defaultNameArc)
-    			{
-    				Bookmarks.Assert(srcArc, propArc, defaultNameArc, true); 
-    			}
-    		}
-    	}
-    }
-  }
-
-	// should we move the node? (i.e. take it out of the source container?)
-	if ((parentNode != null) && (containerNode != parentNode))
-	{
-	    try
-	    {
-    		RDFC.Init(Bookmarks, parentNode);
-    		nodeIndex = RDFC.IndexOf(sourceNode);
-
-    		if (nodeIndex >= 1)
-    		{
-    			RDFC.RemoveElementAt(nodeIndex, true, sourceNode);
-    		}
-        }
-        catch(ex)
-        {
-        }
-	}
-
-  if (dirty == true)
-  {
-    var remote = Bookmarks.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
-    if (remote)
-    {
-      remote.Flush();
-    }
-  }
-
-  return(false);
-}
-
-
-
-function selectDroppedItems(treeRoot, containerID, targetID)
-{
-	var select_list = treeRoot.getElementsByAttribute("id", targetID);
-	for (var x=0; x<select_list.length; x++)
-	{
-		var node = select_list[x];
-		if (!node)	continue;
-
-		var parent = node.parentNode.parentNode;
-		if (!parent)	continue;
-
-		var id = parent.getAttribute("ref");
-		if (!id || id=="")
-		{
-			id = parent.getAttribute("id");
-		}
-		if (!id || id=="")	continue;
-
-		if (id == containerID)
-		{
-			treeRoot.selectItem(node);
-			break;
-		}
-	}
-}

mozilla/xpfe/components/bookmarks/resources/bookmarksDD.js

@@ -1,397 +0,0 @@
-/* -*- Mode: Java; tab-width: 2; 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):
- *   Ben Goodger <ben@netscape.com> (Original Author, v2.0)
- *
- * 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 ***** */
-
-var NC_NS  = "http://home.netscape.com/NC-rdf#";
-var RDF_NS = "http://www.w3.org/1999/02/22-rdf-syntax-ns#";
-
-var gSpringLoadTracker = {
-  timeout: 0,
-  element: null,
-  
-  open: function (aRDFNode) 
-  {
-    if (this.element)
-      this.element.setAttribute("open", "true");
-    clearTimeout(this.timeout);
-  }
-};
-
-var bookmarksDNDObserver = {
-  _RDF: null,
-  get RDF ()
-  {
-    if (!this._RDF) {
-      const kRDFContractID = "@mozilla.org/rdf/rdf-service;1";
-      const kRDFIID = Components.interfaces.nsIRDFService;
-      this._RDF = Components.classes[kRDFContractID].getService(kRDFIID);
-    }
-    return this._RDF;
-  },
-
-  // XXX I belong somewhere shared. 
-  getResource: function(aString)
-  {
-    return this.RDF.GetResource(aString, true);
-  },
-  
-  getTarget: function(aDS, aSourceID, aPropertyID)
-  {
-    var source = this.getResource(aSourceID);
-    var property = this.getResource(aPropertyID);
-    return aDS.GetTarget(source, property, true);
-  },
-  
-  onDragStart: function (aEvent, aXferData, aDragAction)
-  {
-    var bookmarksTree = document.getElementById("bookmarksTree");
-    if (aEvent.target == bookmarksTree || aEvent.target.localName == "treechildren" || 
-        aEvent.target.localName == "splitter" || aEvent.target.localName == "menu")
-      throw Components.results.NS_OK; // not a draggable item.
-    if (aEvent.target.parentNode && aEvent.target.parentNode.parentNode &&
-        aEvent.target.parentNode.parentNode.localName == "treehead")
-      throw Components.results.NS_OK; // don't drag treehead cells.
-    if (bookmarksTree.getAttribute("sortActive") == "true")
-      throw Components.results.NS_OK; 
-          
-    var selItems = null;
-    if (bookmarksTree.selectedItems.length <= 0)
-      selItems = [aEvent.target.parentNode.parentNode];
-    else 
-      selItems = bookmarksTree.selectedItems;
-    aXferData.data = new TransferDataSet();
-    for (var i = 0; i < selItems.length; ++i) {
-      var currItem = selItems[i];
-      var currURI = NODE_ID(currItem);
-    
-      var parentItem = currItem.parentNode.parentNode;
-      var parentURI = NODE_ID(parentItem);
-    
-      var type = this.getTarget(bookmarksTree.database, currURI, RDF_NS + "type");
-      type = type.QueryInterface(Components.interfaces.nsIRDFResource).Value;
-      if (!type || (type != (NC_NS + "BookmarkSeparator") && 
-                    type != (NC_NS + "Bookmark") && 
-                    type != (NC_NS + "Folder"))) 
-        throw Components.results.NS_OK;
-      var name = this.getTarget(bookmarksTree.database, currURI, NC_NS + "Name");        
-      var data = new TransferData();
-      if (name) {
-        name = name.QueryInterface(Components.interfaces.nsIRDFLiteral).Value;
-        data.addDataForFlavour("text/x-moz-url", currURI + "\n" + name);
-      }
-      else {
-        data.addDataForFlavour("text/x-moz-url", currURI);
-      }
-      data.addDataForFlavour("moz/rdfitem", currURI + "\n" + parentURI);
-
-      data.addDataForFlavour("text/unicode", currURI);
-      aXferData.data.push(data);
-    }
-
-    if (aEvent.ctrlKey) {
-      const kDSIID = Components.interfaces.nsIDragService;
-      aDragAction.action = kDSIID.DRAGDROP_ACTION_COPY + kDSIID.DRAGDROP_ACTION_LINK;
-    }
-  },
-  
-  onDragOver: function (aEvent, aFlavour, aDragSession)
-  {
-    var bookmarksTree = document.getElementById("bookmarksTree");
-    var rowGroup = aEvent.target.parentNode.parentNode;
-    if (rowGroup)
-      rowGroup.setAttribute("dd-triggerrepaint" + 
-                            (bookmarksTree.getAttribute("sortActive") == "true" ? "sorted" : ""), 0);
-    
-    var rdfNode = gBookmarksShell.findRDFNode(aEvent.target, true);
-    var rdfParent = rdfNode.parentNode.parentNode;
-    var isContainer = false;
-    if (rdfParent && rdfParent.getAttribute("container") == "true") {
-      var rDragOverContainer = this.RDF.GetResource(NODE_ID(rdfParent));
-
-      const kBMDS = this.RDF.GetDataSource("rdf:bookmarks");
-      const kRDFCUtilsContractID = "@mozilla.org/rdf/container-utils;1";
-      const kRDFCUtilsIID = Components.interfaces.nsIRDFContainerUtils;
-      const kRDFCUtils = Components.classes[kRDFCUtilsContractID].getService(kRDFCUtilsIID);
-      isContainer = kRDFCUtils.IsContainer(kBMDS, rDragOverContainer);
-    }     
-    
-    if (!isContainer || rowGroup.id == "headRow") {
-      // Not a container, or dropping onto something that isn't designed to take drops 
-      // (e.g. the tree header) 
-      aDragSession.canDrop = false;
-      return;
-    }        
-    
-    // Springloaded folders.
-    /* XXX - not yet. 
-    if (rdfNode && rdfNode.getAttribute("container") == "true" &&
-        rdfNode.getAttribute("open") != "true") {
-      if (!gSpringLoadTracker.element || gSpringLoadTracker.element.id != rdfNode.id) {
-        // XXX - this is not good enough. We need to keep track of nesting and close up
-        // folders after the user has dragged out of them otherwise we end up with 
-        // everything open and a big mess!
-        if (gSpringLoadTracker.timeout)
-          clearTimeout(gSpringLoadTracker.timeout);
-        gSpringLoadTracker.element = rdfNode;
-        gSpringLoadTracker.timeout = setTimeout("gSpringLoadTracker.open()", 100);
-      }
-    }
-    */
-  },  
-  
-  _flavourSet: null,
-  getSupportedFlavours: function ()
-  {
-    if (!this._flavourSet) {
-      this._flavourSet = new FlavourSet();
-      this._flavourSet.appendFlavour("moz/rdfitem");
-      this._flavourSet.appendFlavour("text/x-moz-url");
-      this._flavourSet.appendFlavour("text/unicode");
-    }
-    return this._flavourSet;
-  },
-  
-  canHandleMultipleItems: true,
-  
-  onDrop: function (aEvent, aXferData, aDragSession)
-  {
-    var bookmarksTree = document.getElementById("bookmarksTree");
-    // XXX lame
-    if (bookmarksTree.getAttribute("sortActive") == "true") return;
-
-    const kRDFCContractID = "@mozilla.org/rdf/container;1";
-    const kRDFIID = Components.interfaces.nsIRDFContainer;
-    var RDFC = Components.classes[kRDFCContractID].getService(kRDFIID);
-    
-    const kBMDS = this.RDF.GetDataSource("rdf:bookmarks");
-    
-    var dropItem = aEvent.target.parentNode.parentNode;
-    if (aEvent.target.localName == "treechildren") 
-      dropItem = aEvent.target.parentNode; // handle drop on blank space. 
-
-    // In the default view, the root node is the NC root, and we don't want to append
-    // to that. Adjust accordingly...
-    if (NODE_ID(dropItem) == "NC:NavCenter")
-      dropItem = document.getElementById("treechildren-bookmarks").firstChild;
-    
-    // Don't allow drops on the header row & prevent catastrophe
-    if (dropItem.id == "headRow" || !dropItem) return;
-      
-    // XXX we could probably compute this ourselves, but let the tree do this 
-    //     automagically for now.
-    var dropBefore = dropItem.getAttribute("dd-droplocation");
-    var dropOn = dropItem.getAttribute("dd-dropon");
-
-    var dropAction = dropBefore == "true" ? "before" : dropOn == "true" ? "on" : "after";
-    if (aEvent.target.localName == "treechildren")  
-      dropAction = "on"; // handle drop on blank space. 
-    var containerItem = dropAction == "on" ? dropItem : dropItem.parentNode.parentNode;
-
-  	// XXX magical fix for bug # 33546: handle dropping after open container
-    if (dropItem.getAttribute("container") && dropItem.getAttribute("open") &&
-        dropAction == "after") {    
-      dropAction = "before";
-      containerItem = dropItem;
-
-      dropItem = null;
-      for (var i = 0; i < containerItem.childNodes.length; ++i) {
-        if (containerItem.childNodes[i].localName == "treechildren") {
-          dropItem = containerItem.childNodes[i].firstChild;
-          break;
-        }
-      }
-      if (!dropItem) {
-        dropAction = "on";
-        dropItem = containerItem.parentNode.parentNode;
-      }
-    }
-    
-    var rTarget = this.getResource(NODE_ID(dropItem));
-    var rContainer = this.getResource(NODE_ID(containerItem));    
-
-    const kRDFCUtilsContractID = "@mozilla.org/rdf/container-utils;1";
-    const kRDFCUtilsIID = Components.interfaces.nsIRDFContainerUtils;
-    const kRDFCUtils = Components.classes[kRDFCUtilsContractID].getService(kRDFCUtilsIID);
-    var isContainer = kRDFCUtils.IsContainer(kBMDS, rContainer);
-
-    // XXX
-    var rType = this.getResource(RDF_NS + "type");
-    var rBookmark = this.getResource(NC_NS + "Bookmark");
-    
-    var dirty = false;
-    var additiveFlag = false;
-    var numObjects = aXferData.dataList.length;
-    /*
-    if (numObjects > 1) {
-      var bo = bookmarksTree.boxObject.QueryInterface(Components.interfaces.nsITreeBoxObject);
-      bo.beginBatch();
-    }
-    */
-
-    var sourceID = [], parentID = [], nameRequired = [], name = [];
-    var flavourData;
-    for (i = 0; i < numObjects; ++i) {
-      flavourData = aXferData.dataList[i].first;
-      nameRequired[i] = false;
-      name[i] = null;
-      var data = flavourData.data;
-      switch (flavourData.flavour.contentType) {
-      case "moz/rdfitem":
-        var ix = data.indexOf("\n");
-        sourceID[i] = ix >= 0 ? (parentID[i] = data.substr(ix+1), data.substr(0, ix)) : data;
-        break;
-      case "text/x-moz-url":
-        ix = data.indexOf("\n");
-        sourceID[i] = ix >= 0 ? (name[i] = data.substr(ix+1), data.substr(0, ix)) : data;
-        break;
-      case "text/unicode":
-        sourceID[i] = data;
-        nameRequired[i] = true;
-        break;
-      default: 
-        continue;
-      }
-      
-      var rSource = this.getResource(sourceID[i]);
-      var rParent = parentID[i] ? this.getResource(parentID[i]) : null;
-
-      // Prevent dropping node on itself, before or after itself, on its parent 
-      // container, or a weird situation when an open container is dropped into
-      // itself (which results in data loss!).
-      // Also prevent dropping into a folder that isn't actually a container 
-      // (and is thus probably a pseudo-container from an aggregated datasource,
-      //  see bug 68656 fir details).
-      if (rSource == rTarget || (dropAction == "on" && rContainer == rParent) ||
-          rContainer == rSource || !isContainer)
-        return;
-
-      // Prevent dropping node into one of its own subfolders
-      var dropItem2 = dropItem;
-      do {
-        var targetAncestor = NODE_ID(dropItem2);
-        dropItem2 = dropItem2.parentNode;
-      } while (targetAncestor != "NC:BookmarksRoot" && targetAncestor != sourceID[i]);
-      if (targetAncestor == sourceID[i]) {
-        return;
-      }
-    }
-
-    for (i = 0; i < numObjects; ++i) {
-      flavourData = aXferData.dataList[i].first;
-      rSource = this.getResource(sourceID[i]);
-      rParent = parentID[i] ? this.getResource(parentID[i]) : null;
-
-      // XXX if any of the following fails, the nodes are gone for good!
-      const kDSIID = Components.interfaces.nsIDragService;
-      const kCopyAction = kDSIID.DRAGDROP_ACTION_COPY + kDSIID.DRAGDROP_ACTION_LINK;
-      if (rParent) {
-        if (!(aDragSession.dragAction & kCopyAction)) {
-          try {
-            RDFC.Init(kBMDS, rParent);
-            ix = RDFC.IndexOf(rSource);
-            if (ix >= 1) 
-              RDFC.RemoveElementAt(ix, true);
-          }
-          catch (ex) { }
-        }
-      }
-
-      RDFC.Init(kBMDS, rContainer);
-      
-      // If this item already exists in this container, don't paste, as 
-      // this will result in the creation of multiple copies in the datasource
-      // but will not result in an update of the UI. (In Short: we don't
-      // handle multiple bookmarks well)
-      ix = RDFC.IndexOf(rSource);
-      if (ix != -1)
-        continue;
-      
-      var bmType = this.getTarget(bookmarksTree.database, sourceID[i], RDF_NS + "type");
-      if (!bmType) 
-        kBMDS.Assert(rSource, rType, rBookmark, true);
-      if (bmType == NC_NS + "Folder") {
-        // If we're going to copy a folder type, we need to clone the folder 
-        // rather than just asserting the new node as a child of the drop folder.
-        if (aDragSession.dragAction & kCopyAction)
-          rSource = BookmarksUtils.cloneFolder(rSource, rContainer, rTarget);
-      }
-      
-      if (dropAction == "before" || dropAction == "after") {
-        var dropIx = RDFC.IndexOf(rTarget);
-        RDFC.InsertElementAt(rSource, dropAction == "after" ? ++dropIx : dropIx, true);
-      }
-      else
-        RDFC.AppendElement(rSource); // drop on
-
-      dirty = true;
-
-      if (rParent) {
-        gBookmarksShell.selectFolderItem(rContainer.Value, sourceID[i], additiveFlag);
-        if (!additiveFlag) additiveFlag = true;
-      }
-
-      // If a name is supplied, we want to assert this information into the 
-      // graph. E.g. user drags an internet shortcut to the app, we want to 
-      // preserve not only the URL but the name of the shortcut. The other case
-      // where we need to assert a name is when the node does not already exist
-      // in the graph, in this case we'll just use the URL as the name.
-      if (name[i] || nameRequired[i]) {
-        var currentName = this.getTarget(bookmarksTree.database, sourceID[i], NC_NS + "Name");
-        if (!currentName) {
-          var rDefaultName = this.RDF.GetLiteral(name[i] || sourceID[i]);
-          if (rDefaultName) {
-            var rName = this.RDF.GetResource(NC_NS + "Name");
-            kBMDS.Assert(rSource, rName, rDefaultName, true);
-          }
-        }
-      }
-    }
-
-    /*
-    if (numObjects > 1) {
-      var bo = bookmarksTree.boxObject.QueryInterface(Components.interfaces.nsITreeBoxObject);
-      bo.endBatch();
-    }
-    */
-    
-    if (dirty) {
-      var remoteDS = kBMDS.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
-      remoteDS.Flush();
-    }    
-  }
-}
-

mozilla/xpfe/components/bookmarks/resources/bookmarksOverlay.js

@@ -1,954 +0,0 @@
-/* -*- Mode: Java; tab-width: 2; 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):
- *   Ben Goodger <ben@netscape.com> (Original Author)
- *
- * 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 ***** */
-
-var NC_NS  = "http://home.netscape.com/NC-rdf#";
-var RDF_NS = "http://www.w3.org/1999/02/22-rdf-syntax-ns#";
-const NC_NS_CMD = NC_NS + "command?cmd=";
-
-/**
- * XXX - 04/16/01
- *  ACK! massive command name collision problems are causing big issues
- *  in getting this stuff to work in the Navigator window. For sanity's 
- *  sake, we need to rename all the commands to be of the form cmd_bm_*
- *  otherwise there'll continue to be problems. For now, we're just 
- *  renaming those that affect the personal toolbar (edit operations,
- *  which were clashing with the textfield controller)
- *
- * There are also several places that need to be updated if you need
- * to change a command name. 
- *   1) the controller in ALL clients (bookmarksTree.js, personalToolbar.js)
- *   2) the command nodes in the overlay
- *   3) the command human-readable name key in bookmark.properties
- *   4) the function 'getAllCmds' in bookmarksOverlay.js
- *   5) the function 'execCommand' in bookmarksOverlay.js
- * Yes, this blows crusty dead goats through straws, and I should probably
- * create some constants somewhere to bring this number down to 3. 
- * However, if you fail to do one of these, you WILL break something
- * and I WILL come after you with a knife. 
- */
-
-function LITERAL (aDB, aElement, aPropertyID)
-{
-  var RDF = BookmarksUIElement.prototype.RDF;
-  var rSource = RDF.GetResource(aElement.id);
-  var rProperty = RDF.GetResource(aPropertyID);
-  var node = aDB.GetTarget(rSource, rProperty, true);
-  return node ? node.QueryInterface(Components.interfaces.nsIRDFLiteral).Value : "";
-}
-
-function BookmarksUIElement () { }
-BookmarksUIElement.prototype = {
-  _rdf: null,
-  get RDF ()
-  {
-    if (!this._rdf) {
-      const kRDFContractID = "@mozilla.org/rdf/rdf-service;1";
-      const kRDFIID = Components.interfaces.nsIRDFService;
-      this._rdf = Components.classes[kRDFContractID].getService(kRDFIID);
-    }
-    return this._rdf;
-  },
-
-  propertySet: function (sourceID, propertyID, newValue)
-  {
-    if (!newValue) return;
-    const kRDFContractID = "@mozilla.org/rdf/rdf-service;1";
-    const kRDFIID = Components.interfaces.nsIRDFService;
-    const kRDF = Components.classes[kRDFContractID].getService(kRDFIID);
-    // need to shuffle this into an API. 
-    const kBMDS = kRDF.GetDataSource("rdf:bookmarks");
-    const krProperty = kRDF.GetResource(propertyID);
-    const krItem = kRDF.GetResource(sourceID);
-    var rCurrValue = kBMDS.GetTarget(krItem, krProperty, true);
-    const krNewValue = kRDF.GetLiteral(newValue);
-    if (!rCurrValue)
-      kBMDS.Assert(krItem, krProperty, krNewValue, true);
-    else {
-      rCurrValue = rCurrValue.QueryInterface(Components.interfaces.nsIRDFLiteral);
-      if (rCurrValue.Value != newValue) 
-        kBMDS.Change(krItem, krProperty, rCurrValue, krNewValue);
-    }
-  },
-
-  /////////////////////////////////////////////////////////////////////////////
-  // Fill a context menu popup with menuitems that are appropriate for the current
-  // selection.
-  createContextMenu: function (aEvent)
-  {
-    var popup = aEvent.target;
-    // clear out the old context menu contents (if any)
-    while (popup.hasChildNodes()) 
-      popup.removeChild(popup.firstChild);
-    
-    var popupNode = document.popupNode;
-    
-    if (!("findRDFNode" in this))
-      throw "Clients must implement findRDFNode!";
-    var itemNode = this.findRDFNode(popupNode, true);
-    if (!itemNode || !itemNode.getAttributeNS(RDF_NS, "type") || itemNode.getAttribute("mode") == "edit") {
-      aEvent.preventDefault();
-      return;
-    }
-    if (!("getContextSelection" in this)) 
-      throw "Clients must implement getContextSelection!";
-    var selection = this.getContextSelection (itemNode);
-    var commonCommands = [];
-    for (var i = 0; i < selection.length; ++i) {
-      var commands = this.getAllCmds(selection[i].id);
-      if (!commands) {
-        aEvent.preventDefault();
-        return;
-      }
-      commands = this.flattenEnumerator(commands);
-      if (!commonCommands.length) commonCommands = commands;
-      commonCommands = this.findCommonNodes(commands, commonCommands);
-    }
-
-    if (!commonCommands.length) {
-      aEvent.preventDefault();
-      return;
-    }
-    
-    // Now that we should have generated a list of commands that is valid
-    // for the entire selection, build a context menu.
-    for (i = 0; i < commonCommands.length; ++i) {
-      const kXULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
-      var currCommand = commonCommands[i].QueryInterface(Components.interfaces.nsIRDFResource).Value;
-      var element = null;
-      if (currCommand != NC_NS_CMD + "bm_separator") {
-        var commandName = this.getCommandName(currCommand);
-        element = this.createMenuItem(commandName, currCommand, itemNode);
-      }
-      else if (i != 0 && i < commonCommands.length-1) {
-        // Never append a separator as the first or last element in a context
-        // menu.
-        element = document.createElementNS(kXULNS, "menuseparator");
-      }
-      
-      if (element) 
-        popup.appendChild(element);
-    }
-    return;
-  },
-  
-  /////////////////////////////////////////////////////////////////////////////
-  // Given two unique arrays, return an array that contains only the elements
-  // common to both. 
-  findCommonNodes: function (aNewArray, aOldArray)
-  {
-    var common = [];
-    for (var i = 0; i < aNewArray.length; ++i) {
-      for (var j = 0; j < aOldArray.length; ++j) {
-        if (common.length > 0 && common[common.length-1] == aNewArray[i])
-          continue;
-        if (aNewArray[i] == aOldArray[j])
-          common.push(aNewArray[i]);
-      }
-    }
-    return common;
-  },
-
-  flattenEnumerator: function (aEnumerator)
-  {
-    if ("_index" in aEnumerator)
-      return aEnumerator._inner;
-    
-    var temp = [];
-    while (aEnumerator.hasMoreElements()) 
-      temp.push(aEnumerator.getNext());
-    return temp;
-  },
-  
-  /////////////////////////////////////////////////////////////////////////////
-  // For a given URI (a unique identifier of a resource in the graph) return 
-  // an enumeration of applicable commands for that URI. 
-  getAllCmds: function (aNodeID)
-  {
-    var type = this.resolveType(aNodeID);
-    if (!type) {
-      if (aNodeID == "NC:PersonalToolbarFolder" || aNodeID == "NC:BookmarksRoot")
-        type = "http://home.netscape.com/NC-rdf#Folder";
-      else
-        return null;
-    }
-    var commands = [];
-    // menu order:
-    // 
-    // bm_open
-    // bm_openfolder
-    // bm_openinnewwindow
-    // /* bm_openinnewtab not yet supported */
-    // ---------------------
-    // /* bm_find removed */
-    // bm_newfolder
-    // ---------------------
-    // bm_cut
-    // bm_copy
-    // bm_paste
-    // bm_fileBookmark
-    // ---------------------
-    // bm_delete
-    // bm_rename
-    // ---------------------
-    // bm_properties
-    switch (type) {
-    case "http://home.netscape.com/NC-rdf#BookmarkSeparator":
-      commands = ["bm_newfolder", "bm_separator", 
-                  "bm_cut", "bm_copy", "bm_paste", "bm_separator",
-                  "bm_delete"];
-      break;
-    case "http://home.netscape.com/NC-rdf#Bookmark":
-      commands = ["bm_open", "bm_openinnewwindow", /* "bm_openinnewtab", */ "bm_separator",
-                  "bm_newfolder", "bm_separator",
-                  "bm_cut", "bm_copy", "bm_paste", "bm_fileBookmark", "bm_separator",
-                  "bm_delete", "bm_rename", "bm_separator",
-                  "bm_properties"];
-      break;
-    case "http://home.netscape.com/NC-rdf#Folder":
-      commands = ["bm_openfolder", "bm_openinnewwindow", "bm_separator", 
-                  "bm_newfolder", "bm_separator",
-                  "bm_cut", "bm_copy", "bm_paste", "bm_fileBookmark", "bm_separator",
-                  "bm_delete", "bm_rename", "bm_separator",
-                  "bm_properties"];
-      break;
-    case "http://home.netscape.com/NC-rdf#IEFavoriteFolder":
-      commands = ["bm_openfolder", "bm_separator",
-                  "bm_delete"];
-      break;
-    case "http://home.netscape.com/NC-rdf#IEFavorite":
-      commands = ["bm_open", "bm_openinnewwindow", /* "bm_openinnewtab", */ "bm_separator",
-                  "bm_copy"];
-      break;
-    case "http://home.netscape.com/NC-rdf#FileSystemObject":
-      commands = ["bm_open", "bm_openinnewwindow", /* "bm_openinnewtab", */ "bm_separator",
-                  "bm_copy"];
-      break;
-    default: 
-      var source = this.RDF.GetResource(aNodeID);
-      return this.db.GetAllCmds(source);
-    }
-    return new CommandArrayEnumerator(commands);
-  },
-  
-  /////////////////////////////////////////////////////////////////////////////
-  // Retrieve the human-readable name for a particular command. Used when 
-  // manufacturing a UI to invoke commands.
-  getCommandName: function (aCommand) 
-  {
-    var cmdName = aCommand.substring(NC_NS_CMD.length);
-    try {
-      // Note: this will succeed only if there's a string in the bookmarks
-      //       string bundle for this command name. Otherwise, <xul:stringbundle/>
-      //       will throw, we'll catch & stifle the error, and look up the command
-      //       name in the datasource. 
-      return this.getLocaleString ("cmd_" + cmdName);
-    }
-    catch (e) {
-    }   
-    // XXX - WORK TO DO HERE! (rjc will cry if we don't fix this) 
-    // need to ask the ds for the commands for this node, however we don't
-    // have the right params. This is kind of a problem. 
-    dump("*** BAD! EVIL! WICKED! NO! ACK! ARGH! ORGH!\n");
-    const rName = this.RDF.GetResource(NC_NS + "Name");
-    const rSource = this.RDF.GetResource(aNodeID);
-    return this.db.GetTarget(rSource, rName, true).Value;
-  },
-  
-  /////////////////////////////////////////////////////////////////////////////
-  // Perform a command based on a UI event. XXX - work to do here. 
-  preExecCommand: function (aEvent)
-  {
-    var commandID = aEvent.target.getAttribute("cmd");
-    if (!commandID) return;
-    goDoCommand("cmd_" + commandID.substring(NC_NS_CMD.length));
-  },
-  
-  execCommand: function (aCommandID) 
-  {
-    var args = [];
-    var selection = this.getSelection ();
-    if (selection.length >= 1) 
-      var selectedItem = selection[0];
-    switch (aCommandID) {
-    case "bm_open":
-      this.open(null, selectedItem, false);
-      break;
-    case "bm_openfolder":
-      this.commands.openFolder(selectedItem);
-      break;
-    case "bm_openinnewwindow":
-      if (this.resolveType(selectedItem.id) == NC_NS + "Folder")
-        this.openFolderInNewWindow(selectedItem);
-      else
-        this.open(null, selectedItem, true);
-      break;
-    case "bm_rename":
-      // XXX - this is SO going to break if we ever do column re-ordering.
-      this.commands.editCell(selectedItem, 0);
-      break;
-    case "bm_editurl":
-      this.commands.editCell(selectedItem, 1);
-      break;
-    case "bm_setnewbookmarkfolder":
-    case "bm_setpersonaltoolbarfolder":
-    case "bm_setnewsearchfolder":
-      BookmarksUtils.doBookmarksCommand(selectedItem.id, NC_NS_CMD + aCommandID, args);
-      // XXX - The containing node seems to be closed here and the 
-      //       focus/selection is destroyed.
-      this.selectElement(selectedItem);
-      break;
-    case "bm_properties":
-      this.showPropertiesForNode(selectedItem);
-      break;
-    case "bm_find":
-      this.findInBookmarks();
-      break;
-    case "bm_cut":
-      this.copySelection(selection);
-      this.deleteSelection(selection);
-      break;
-    case "bm_copy":
-      this.copySelection(selection);
-      break;
-    case "bm_paste":
-      this.paste(selection);
-      break;
-    case "bm_delete":
-      this.deleteSelection(selection);
-      break;
-    case "bm_fileBookmark":
-      var rv = { selectedFolder: null };      
-      openDialog("chrome://communicator/content/bookmarks/addBookmark.xul", "", 
-                 "centerscreen,chrome,modal=yes,dialog=yes,resizable=yes", null, null, folder, null, "selectFolder", rv);
-      if (rv.selectedFolder) {
-        for (var k = 0; k < selection.length; ++k) {
-          if (selection[k].id == rv.selectedFolder)
-            return; // Selection contains the target folder. Just fail silently.
-        }
-        var additiveFlag = false;
-        var selectedItems = [].concat(this.getSelection())
-        for (var i = 0; i < selectedItems.length; ++i) {
-          var currItem = selectedItems[i];
-          var currURI = currItem.id;
-          var parent = gBookmarksShell.findRDFNode(currItem, false);
-          gBookmarksShell.moveBookmark(currURI, parent.id, rv.selectedFolder);
-          gBookmarksShell.selectFolderItem(rv.selectedFolder, currURI, additiveFlag);
-          if (!additiveFlag) additiveFlag = true;
-        }
-        gBookmarksShell.flushDataSource();
-      }
-      break;
-    case "bm_newfolder":
-      var nfseln = this.getBestItem();
-      this.commands.createBookmarkItem("folder", nfseln);
-      break;
-    case "bm_newbookmark":
-      var folder = this.getSelectedFolder();
-      openDialog("chrome://communicator/content/bookmarks/addBookmark.xul", "", 
-                 "centerscreen,chrome,modal=yes,dialog=yes,resizable=no", null, null, folder, null, "newBookmark");
-      break;
-    case "bm_newseparator":
-      nfseln = this.getBestItem();
-      var parentNode = this.findRDFNode(nfseln, false);
-      args = [{ property: NC_NS + "parent", 
-                resource: parentNode.id }];
-      BookmarksUtils.doBookmarksCommand(nfseln.id, NC_NS_CMD + "newseparator", args);
-      break;
-    case "bm_import":
-    case "bm_export":
-      const isImport = aCommandID == "bm_import";
-      try {
-        const kFilePickerContractID = "@mozilla.org/filepicker;1";
-        const kFilePickerIID = Components.interfaces.nsIFilePicker;
-        const kFilePicker = Components.classes[kFilePickerContractID].createInstance(kFilePickerIID);
-        
-        const kTitle = this.getLocaleString(isImport ? "SelectImport": "EnterExport");
-        kFilePicker.init(window, kTitle, kFilePickerIID[isImport ? "modeOpen" : "modeSave"]);
-        kFilePicker.appendFilters(kFilePickerIID.filterHTML | kFilePickerIID.filterAll);
-        if (!isImport) kFilePicker.defaultString = "bookmarks.html";
-        if (kFilePicker.show() != kFilePickerIID.returnCancel) {
-          var fileName = kFilePicker.fileURL.spec;
-          if (!fileName) break;
-        }
-        else break;
-      }
-      catch (e) {
-        break;
-      }
-      var seln = this.getBestItem();
-      args = [{ property: NC_NS + "URL", literal: fileName}];
-      BookmarksUtils.doBookmarksCommand(seln.id, NC_NS_CMD + aCommandID, args);
-      break;
-    }
-  },
-  
-  openFolderInNewWindow: function (aSelectedItem)
-  {
-    openDialog("chrome://communicator/content/bookmarks/bookmarks.xul", 
-               "", "chrome,all,dialog=no", aSelectedItem.id);
-  },
-  
-  copySelection: function (aSelection)
-  {
-    const kSuppArrayContractID = "@mozilla.org/supports-array;1";
-    const kSuppArrayIID = Components.interfaces.nsISupportsArray;
-    var itemArray = Components.classes[kSuppArrayContractID].createInstance(kSuppArrayIID);
-
-    const kSuppWStringContractID = "@mozilla.org/supports-wstring;1";
-    const kSuppWStringIID = Components.interfaces.nsISupportsWString;
-    var bmstring = Components.classes[kSuppWStringContractID].createInstance(kSuppWStringIID);
-    var unicodestring = Components.classes[kSuppWStringContractID].createInstance(kSuppWStringIID);
-    var htmlstring = Components.classes[kSuppWStringContractID].createInstance(kSuppWStringIID);
-  
-    var sBookmarkItem = ""; var sTextUnicode = ""; var sTextHTML = "";
-    for (var i = 0; i < aSelection.length; ++i) {
-      var url = LITERAL(this.db, aSelection[i], NC_NS + "URL");
-      var name = LITERAL(this.db, aSelection[i], NC_NS + "Name");
-      sBookmarkItem += aSelection[i].id + "\n";
-      sTextUnicode += url + "\n";
-      sTextHTML += "<A HREF=\"" + url + "\">" + name + "</A>";
-    }    
-    
-    const kXferableContractID = "@mozilla.org/widget/transferable;1";
-    const kXferableIID = Components.interfaces.nsITransferable;
-    var xferable = Components.classes[kXferableContractID].createInstance(kXferableIID);
-
-    xferable.addDataFlavor("moz/bookmarkclipboarditem");
-    bmstring.data = sBookmarkItem;
-    xferable.setTransferData("moz/bookmarkclipboarditem", bmstring, sBookmarkItem.length*2)
-    
-    xferable.addDataFlavor("text/html");
-    htmlstring.data = sTextHTML;
-    xferable.setTransferData("text/html", htmlstring, sTextHTML.length*2)
-    
-    xferable.addDataFlavor("text/unicode");
-    unicodestring.data = sTextUnicode;
-    xferable.setTransferData("text/unicode", unicodestring, sTextUnicode.length*2)
-    
-    const kClipboardContractID = "@mozilla.org/widget/clipboard;1";
-    const kClipboardIID = Components.interfaces.nsIClipboard;
-    var clipboard = Components.classes[kClipboardContractID].getService(kClipboardIID);
-    clipboard.setData(xferable, null, kClipboardIID.kGlobalClipboard);
-  },
-
-  paste: function (aSelection)
-  {
-    const kXferableContractID = "@mozilla.org/widget/transferable;1";
-    const kXferableIID = Components.interfaces.nsITransferable;
-    var xferable = Components.classes[kXferableContractID].createInstance(kXferableIID);
-    xferable.addDataFlavor("moz/bookmarkclipboarditem");
-    xferable.addDataFlavor("text/x-moz-url");
-    xferable.addDataFlavor("text/unicode");
-
-    const kClipboardContractID = "@mozilla.org/widget/clipboard;1";
-    const kClipboardIID = Components.interfaces.nsIClipboard;
-    var clipboard = Components.classes[kClipboardContractID].getService(kClipboardIID);
-    clipboard.getData(xferable, kClipboardIID.kGlobalClipboard);
-    
-    var flavour = { };
-    var data = { };
-    var length = { };
-    xferable.getAnyTransferData(flavour, data, length);
-    var nodes = []; var names = [];
-    data = data.value.QueryInterface(Components.interfaces.nsISupportsWString).data;
-    switch (flavour.value) {
-    case "moz/bookmarkclipboarditem":
-      nodes = data.split("\n");
-      break;
-    case "text/x-moz-url":
-      var ix = data.indexOf("\n");
-      nodes.push(data.substring(0, ix != -1 ? ix : data.length));
-      names.push(data.substring(ix));
-      break;
-    default: 
-      return;
-    }
-    
-    const lastSelected = aSelection[aSelection.length-1];  
-    const kParentNode = this.resolvePasteFolder(aSelection);
-    const krParent = this.RDF.GetResource(kParentNode.id);
-    const krSource = this.RDF.GetResource(lastSelected.id);
-    
-    const kRDFCContractID = "@mozilla.org/rdf/container;1";
-    const kRDFCIID = Components.interfaces.nsIRDFContainer;
-    const ksRDFC = Components.classes[kRDFCContractID].getService(kRDFCIID);
-    const kBMDS = this.RDF.GetDataSource("rdf:bookmarks");
-
-    var additiveFlag = false;
-    for (var i = 0; i < nodes.length; ++i) {
-      if (!nodes[i]) continue;
-      var rCurrent = this.RDF.GetResource(nodes[i]);
-      const krTypeProperty = this.RDF.GetResource(RDF_NS + "type");
-      var rType = this.db.GetTarget(rCurrent, krTypeProperty, true);
-      try {
-        rType = rType.QueryInterface(Components.interfaces.nsIRDFResource);
-      }
-      catch (e) {
-        try {
-          rType = rType.QueryInterface(Components.interfaces.nsIRDFLiteral);
-        }
-        catch (e) {
-          // OK, no type exists, so node does not exist in the graph. 
-          // (e.g. user pastes url as text)
-          // Do some housekeeping. 
-          const krName = this.RDF.GetResource(names[i]);
-          const krNameProperty = this.RDF.GetResource(NC_NS + "Name");
-          const krBookmark = this.RDF.GetResource(NC_NS + "Bookmark");
-          kBMDS.Assert(rCurrent, krNameProperty, krName, true);
-          kBMDS.Assert(rCurrent, krTypeProperty, krBookmark, true);
-        }
-      }
-
-      // If the node is a folder, then we need to create a new anonymous 
-      // resource and copy all the arcs over.
-      if (rType && rType.Value == NC_NS + "Folder")
-        rCurrent = BookmarksUtils.cloneFolder(rCurrent, krParent, krSource);
-
-      // If this item already exists in this container, don't paste, as 
-      // this will result in the creation of multiple copies in the datasource
-      // but will not result in an update of the UI. (In Short: we don't
-      // handle multiple bookmarks well)
-      ksRDFC.Init(kBMDS, krParent);
-      ix = ksRDFC.IndexOf(rCurrent);
-      if (ix != -1)
-        continue;
-
-      ix = ksRDFC.IndexOf(krSource);
-      if (ix != -1) 
-        ksRDFC.InsertElementAt(rCurrent, ix+1, true);
-      else
-        ksRDFC.AppendElement(rCurrent);
-      this.selectFolderItem(krSource.Value, rCurrent.Value, additiveFlag);
-      if (!additiveFlag) additiveFlag = true;
-
-      var rds = kBMDS.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
-      rds.Flush();
-    }
-  },
-  
-  /////////////////////////////////////////////////////////////////////////////
-  // For the given selection, determines the element that should form the 
-  // container to paste items into.
-  resolvePasteFolder: function (aSelection)
-  {
-    const lastSelected = aSelection[aSelection.length-1];  
-    if (lastSelected.getAttribute("container") == "true" &&
-        aSelection.length == 1)
-      return lastSelected;
-    return this.findRDFNode(lastSelected, false);
-  },
-  
-  canPaste: function ()
-  {
-    const kClipboardContractID = "@mozilla.org/widget/clipboard;1";
-    const kClipboardIID = Components.interfaces.nsIClipboard;
-    var clipboard = Components.classes[kClipboardContractID].getService(kClipboardIID);
-    const kSuppArrayContractID = "@mozilla.org/supports-array;1";
-    const kSuppArrayIID = Components.interfaces.nsISupportsArray;
-    var flavourArray = Components.classes[kSuppArrayContractID].createInstance(kSuppArrayIID);
-    const kSuppStringContractID = "@mozilla.org/supports-string;1";
-    const kSuppStringIID = Components.interfaces.nsISupportsString;
-    
-    var flavours = ["moz/bookmarkclipboarditem", "text/x-moz-url"];
-    for (var i = 0; i < flavours.length; ++i) {
-      const kSuppString = Components.classes[kSuppStringContractID].createInstance(kSuppStringIID);
-      kSuppString.data = flavours[i];
-      flavourArray.AppendElement(kSuppString);
-    }
-    var hasFlavours = clipboard.hasDataMatchingFlavors(flavourArray, kClipboardIID.kGlobalClipboard);
-    return hasFlavours;
-  },
-  
-  /////////////////////////////////////////////////////////////////////////////
-  // aSelection is a mutable array, not a NodeList. 
-  deleteSelection: function (aSelection)
-  {
-    const kRDFCContractID = "@mozilla.org/rdf/container;1";
-    const kRDFCIID = Components.interfaces.nsIRDFContainer;
-    const ksRDFC = Components.classes[kRDFCContractID].getService(kRDFCIID);
-
-    var nextElement;
-    var count = 0;
-
-    var selectionLength = aSelection.length;
-    while (aSelection.length && aSelection[count]) {
-      const currParent = this.findRDFNode(aSelection[count], false);
-      const kSelectionURI = aSelection[count].id;
-
-      // Disallow the removal of certain 'special' nodes
-      if (kSelectionURI == "NC:BookmarksRoot") {
-        aSelection.splice(count++,1);
-        continue;
-      }
-
-      // If the current bookmark is the IE Favorites folder, we have a little
-      // extra work to do - set the pref |browser.bookmarks.import_system_favorites|
-      // to ensure that we don't re-import next time. 
-      if (aSelection[count].getAttribute("type") == (NC_NS + "IEFavoriteFolder")) {
-        const kPrefSvcContractID = "@mozilla.org/preferences-service;1";
-        const kPrefSvcIID = Components.interfaces.nsIPrefBranch;
-        const kPrefSvc = Components.classes[kPrefSvcContractID].getService(kPrefSvcIID);
-        kPrefSvc.setBoolPref("browser.bookmarks.import_system_favorites", false);
-      }
-        
-      const krParent = this.RDF.GetResource(currParent.id);
-      const krBookmark = this.RDF.GetResource(kSelectionURI);
-      const kBMDS = this.RDF.GetDataSource("rdf:bookmarks");
-
-      ksRDFC.Init(kBMDS, krParent);
-      nextElement = this.getNextElement(aSelection[count]);
-      ksRDFC.RemoveElement(krBookmark, true);
-
-      try {
-        // XXX - UGH. Template builder is NOT removing the element from the
-        //       tree, and so selection remains non-zero in length and we go into
-        //       an infinite loop here. Tear the node out of the document. 
-        var parent = aSelection[count].parentNode;
-        parent.removeChild(aSelection[count]);
-      }
-      catch (e) {
-      }
-      // Manipulate the selection array ourselves. 
-      aSelection.splice(count,1);
-    }
-    this.selectElement(nextElement);
-  },
-
-  moveBookmark: function (aBookmarkURI, aFromFolderURI, aToFolderURI)
-  {
-    const kBMDS = this.RDF.GetDataSource("rdf:bookmarks");
-    const kRDFCContractID = "@mozilla.org/rdf/container;1";
-    const kRDFCIID = Components.interfaces.nsIRDFContainer;
-    const kRDFC = Components.classes[kRDFCContractID].getService(kRDFCIID);
-    const krSrc = this.RDF.GetResource(aBookmarkURI);
-    const krOldParent = this.RDF.GetResource(aFromFolderURI);
-    const krNewParent = this.RDF.GetResource(aToFolderURI);
-    kRDFC.Init(kBMDS, krNewParent);
-    kRDFC.AppendElement(krSrc);
-    kRDFC.Init(kBMDS, krOldParent);
-    kRDFC.RemoveElement(krSrc, true);
-  },
-  
-  open: function (aEvent, aRDFNode, aInNewWindow) 
-  { 
-    var urlValue = LITERAL(this.db, aRDFNode, NC_NS + "URL");
-    
-    // Ignore "NC:" and empty urls.
-    if (urlValue.substring(0,3) == "NC:" || !urlValue) return;
-    
-    if (aEvent && aEvent.altKey)   
-      this.showPropertiesForNode (aRDFNode);
-    else if (aInNewWindow)
-      openDialog (getBrowserURL(), "_blank", "chrome,all,dialog=no", urlValue);
-    else
-      openTopWin (urlValue);
-    if (aEvent) 
-      aEvent.preventBubble();
-  },
-
-  showPropertiesForNode: function (aBookmarkItem) 
-  {
-    if (aBookmarkItem.getAttribute("type") != NC_NS + "BookmarkSeparator") 
-      openDialog("chrome://communicator/content/bookmarks/bm-props.xul",
-                 "", "centerscreen,chrome,resizable=no", aBookmarkItem.id);
-  },
-
-  findInBookmarks: function ()
-  {
-    openDialog("chrome://communicator/content/bookmarks/findBookmark.xul",
-               "FindBookmarksWindow",
-               "centerscreen,resizable=no,chrome,dependent");
-  },
-
-  getLocaleString: function (aStringKey)
-  {
-    var bundle = document.getElementById("bookmarksbundle");
-    return bundle.getString (aStringKey);
-  },
-  
-  flushDataSource: function ()
-  {
-    const kBMDS = this.RDF.GetDataSource("rdf:bookmarks");
-    var remoteDS = kBMDS.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
-    remoteDS.Flush();
-  },
-  
-  /////////////////////////////////////////////////////////////////////////////
-  // Determine the rdf:type property for the given resource.
-  resolveType: function (aID)
-  {
-    const krType = this.RDF.GetResource(RDF_NS + "type");
-    const krElement = this.RDF.GetResource(aID);
-    const type = gBookmarksShell.db.GetTarget(krElement, krType, true);
-    try {
-      return type.QueryInterface(Components.interfaces.nsIRDFResource).Value;
-    }
-    catch (e) {
-      try { 
-        return type.QueryInterface(Components.interfaces.nsIRDFLiteral).Value;
-      }
-      catch (e) {
-        return null;
-      }
-    }    
-  },
-
-  /////////////////////////////////////////////////////////////////////////////
-  // takes a node and adds the appropriate adornments for a bookmark container. 
-  createBookmarkFolderDecorations: function (aNode)
-  {
-    aNode.setAttribute("type", "http://home.netscape.com/NC-rdf#Folder");
-    aNode.setAttribute("container", "true");
-    return aNode;
-  }
-};
-
-function CommandArrayEnumerator (aCommandArray)
-{
-  this._inner = [];
-  const kRDFContractID = "@mozilla.org/rdf/rdf-service;1";
-  const kRDFIID = Components.interfaces.nsIRDFService;
-  const RDF = Components.classes[kRDFContractID].getService(kRDFIID);
-  for (var i = 0; i < aCommandArray.length; ++i)
-    this._inner.push(RDF.GetResource(NC_NS_CMD + aCommandArray[i]));
-    
-  this._index = 0;
-}
-
-CommandArrayEnumerator.prototype = {
-  getNext: function () 
-  {
-    return this._inner[this._index];
-  },
-  
-  hasMoreElements: function ()
-  {
-    return this._index < this._inner.length;
-  }
-};
-
-var BookmarksUtils = {
-  _rdf: null,
-  get RDF ()
-  {
-    if (!this._rdf) {
-      const kRDFContractID = "@mozilla.org/rdf/rdf-service;1";
-      const kRDFIID = Components.interfaces.nsIRDFService;
-      this._rdf = Components.classes[kRDFContractID].getService(kRDFIID);
-    }
-    return this._rdf;
-  },
-
-  ///////////////////////////////////////////////////////////////////////////
-  // Execute a command with the given source and arguments
-  doBookmarksCommand: function (aSourceURI, aCommand, aArgumentsArray)
-  {
-    var rCommand = this.RDF.GetResource(aCommand);
-  
-    var kSuppArrayContractID = "@mozilla.org/supports-array;1";
-    var kSuppArrayIID = Components.interfaces.nsISupportsArray;
-    var sourcesArray = Components.classes[kSuppArrayContractID].createInstance(kSuppArrayIID);
-    if (aSourceURI) {
-      var rSource = this.RDF.GetResource(aSourceURI);
-      sourcesArray.AppendElement (rSource);
-    }
-  
-    var argsArray = Components.classes[kSuppArrayContractID].createInstance(kSuppArrayIID);
-    for (var i = 0; i < aArgumentsArray.length; ++i) {
-      var rArc = this.RDF.GetResource(aArgumentsArray[i].property);
-      argsArray.AppendElement(rArc);
-      var rValue = null;
-      if ("resource" in aArgumentsArray[i]) { 
-        rValue = this.RDF.GetResource(aArgumentsArray[i].resource);
-      }
-      else
-        rValue = this.RDF.GetLiteral(aArgumentsArray[i].literal);
-      argsArray.AppendElement(rValue);
-    }
-
-    // Exec the command in the Bookmarks datasource. 
-    const kBMDS = this.RDF.GetDataSource("rdf:bookmarks");
-    kBMDS.DoCommand(sourcesArray, rCommand, argsArray);
-  },
-
-  cloneFolder: function (aFolder, aParent, aRelativeItem) 
-  {
-    var BMDS = this.RDF.GetDataSource("rdf:bookmarks");
-    
-    var nameArc = this.RDF.GetResource(NC_NS + "Name");
-    var rName = BMDS.GetTarget(aFolder, nameArc, true);
-    rName = rName.QueryInterface(Components.interfaces.nsIRDFLiteral);
-    
-    var newFolder = this.createFolderWithID(rName.Value, aRelativeItem, aParent);
-    
-    // Now need to append kiddies. 
-    try {
-      const kRDFCContractID = "@mozilla.org/rdf/container;1";
-      const kRDFCIID = Components.interfaces.nsIRDFContainer;
-      var RDFC = Components.classes[kRDFCContractID].getService(kRDFCIID);
-      const kRDFCUContractID = "@mozilla.org/rdf/container-utils;1";
-      const kRDFCUIID = Components.interfaces.nsIRDFContainerUtils;
-      var RDFCU = Components.classes[kRDFCUContractID].getService(kRDFCUIID);
-
-      RDFC.Init(BMDS, aFolder);
-      var elts = RDFC.GetElements();
-      RDFC.Init(BMDS, newFolder);
-
-      while (elts.hasMoreElements()) {
-        var curr = elts.getNext().QueryInterface(Components.interfaces.nsIRDFResource);
-        if (RDFCU.IsContainer(BMDS, curr))
-          BookmarksUtils.cloneFolder(curr, newFolder);
-        else
-          RDFC.AppendElement(curr);
-      }
-    }
-    catch (e) {
-    }
-    return newFolder;
-  },
-  
-  createFolderWithID: function (aTitle, aRelativeItem, aParentFolder)
-  {
-    const kRDFCContractID = "@mozilla.org/rdf/container;1";
-    const kRDFCIID = Components.interfaces.nsIRDFContainer;
-    var RDFC = Components.classes[kRDFCContractID].createInstance(kRDFCIID);
-    var BMDS = this.RDF.GetDataSource("rdf:bookmarks");
-    try {
-      RDFC.Init(BMDS, aParentFolder);
-    }
-    catch (e) {
-      return null;
-    }
-
-    var ix = RDFC.IndexOf(aRelativeItem);
-    var BMSvc = BMDS.QueryInterface(Components.interfaces.nsIBookmarksService);
-    return BMSvc.createFolderWithDetails(aTitle, aParentFolder, ix);
-  },
-
-
-  addBookmarkForTabBrowser: function( aTabBrowser, aSelect )
-  {
-    var tabsInfo = [];
-    var currentTabInfo = { name: "", url: "", charset: null };
-
-    const activeBrowser = aTabBrowser.selectedBrowser;
-    const browsers = aTabBrowser.browsers;
-    for (var i = 0; i < browsers.length; ++i) {
-      var webNav = browsers[i].webNavigation;
-      var url = webNav.currentURI.spec;
-      var name = "";
-      var charset;
-      try {
-        var doc = webNav.document;
-        name = doc.title || url;
-        charset = doc.characterSet;
-      } catch (e) {
-        name = url;
-      }
-
-      tabsInfo[i] = { name: name, url: url, charset: charset };
-
-      if (browsers[i] == activeBrowser)
-        currentTabInfo = tabsInfo[i];
-    }
-
-    openDialog("chrome://communicator/content/bookmarks/addBookmark.xul", "",
-               "centerscreen,chrome,dialog=yes,resizable,dependent",
-               currentTabInfo.name, currentTabInfo.url, null,
-               currentTabInfo.charset, "addGroup" + (aSelect ? ",group" : ""), tabsInfo);
-  },
-
-  addBookmarkForBrowser: function (aDocShell, aShowDialog)
-  {
-    // Bug 52536: We obtain the URL and title from the nsIWebNavigation 
-    //            associated with a <browser/> rather than from a DOMWindow.
-    //            This is because when a full page plugin is loaded, there is
-    //            no DOMWindow (?) but information about the loaded document
-    //            may still be obtained from the webNavigation. 
-    var url = aDocShell.currentURI.spec;
-    var title, docCharset = null;
-    try {
-      title = aDocShell.document.title || url;
-      docCharset = aDocShell.document.characterSet;
-    }
-    catch (e) {
-      title = url;
-    }
-
-    this.addBookmark(url, title, docCharset, aShowDialog);
-  },
-  
-  addBookmark: function (aURL, aTitle, aCharset, aShowDialog)
-  {
-    if (aCharset === undefined) {
-      var fw = document.commandDispatcher.focusedWindow;
-      aCharset = fw.document.characterSet;
-    }
-
-    if (aShowDialog)
-      openDialog("chrome://communicator/content/bookmarks/addBookmark.xul", "", 
-                 "centerscreen,chrome,dialog=yes,resizable,dependent", aTitle, aURL, null, aCharset);
-    else {
-      // User has elected to override the file dialog and always file bookmarks
-      // into the default bookmark folder. 
-      const kBMSvcContractID = "@mozilla.org/browser/bookmarks-service;1";
-      const kBMSvcIID = Components.interfaces.nsIBookmarksService;
-      const kBMSvc = Components.classes[kBMSvcContractID].getService(kBMSvcIID);
-      kBMSvc.addBookmarkImmediately(aURL, aTitle, kBMSvcIID.BOOKMARK_DEFAULT_TYPE, aCharset);
-    }
-  }
-};
-
-var ContentUtils = {
-  childByLocalName: function (aSelectedItem, aLocalName)
-  {
-    var temp = aSelectedItem.firstChild;
-    while (temp) {
-      if (temp.localName == aLocalName)
-        return temp;
-      temp = temp.nextSibling;
-    }
-    return null;
-  }
-};
-
-
-
-
-
-

mozilla/xpfe/components/bookmarks/resources/bookmarksOverlay.xul

@@ -1,70 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- -*- Mode: HTML; 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): 
-    Ben Goodger <ben@netscape.com> (Original Author) 
--->
-
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/bookmarks/bookmarksOverlay.dtd">
-
-<overlay id="bookmarksOverlay"
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <stringbundleset id="stringbundleset">
-    <stringbundle id="bookmarksbundle"
-                  src="chrome://communicator/locale/bookmarks/bookmark.properties"/>
-  </stringbundleset>
-         
-  <popupset id="bookmarksPopupset">
-    <popup id="bmContext" 
-           onpopupshowing="gBookmarksShell.createContextMenu(event);"/>
-  </popupset>
-
-  <commands id="commands">
-    <commandset id="bookmarksItems">
-      <command id="cmd_bm_open"                      oncommand="goDoCommand('cmd_bm_open');"/>
-      <command id="cmd_bm_openfolder"                oncommand="goDoCommand('cmd_bm_openfolder');"/>
-      <command id="cmd_bm_newfolder"                 oncommand="goDoCommand('cmd_bm_newfolder');"/>
-      <command id="cmd_bm_newbookmark"               oncommand="goDoCommand('cmd_bm_newbookmark');"/>
-      <command id="cmd_bm_newseparator"              oncommand="goDoCommand('cmd_bm_newseparator');"/>
-      <command id="cmd_bm_find"                      oncommand="goDoCommand('cmd_bm_find');"/>
-      <command id="cmd_bm_setnewbookmarkfolder"      oncommand="goDoCommand('cmd_bm_setnewbookmarkfolder');"/>
-      <command id="cmd_bm_setpersonaltoolbarfolder"  oncommand="goDoCommand('cmd_bm_setpersonaltoolbarfolder');"/>
-      <command id="cmd_bm_setnewsearchfolder"        oncommand="goDoCommand('cmd_bm_setnewsearchfolder');"/>
-      <command id="cmd_bm_properties"                oncommand="goDoCommand('cmd_bm_properties');"/>
-      <command id="cmd_bm_rename"                    oncommand="goDoCommand('cmd_bm_rename');"/>
-      <command id="cmd_bm_openinnewwindow"           oncommand="goDoCommand('cmd_bm_openinnewwindow');"/>
-      <command id="cmd_bm_import"                    oncommand="goDoCommand('cmd_bm_import');"/>
-      <command id="cmd_bm_export"                    oncommand="goDoCommand('cmd_bm_export');"/>
-      <command id="cmd_bm_fileBookmark"           oncommand="goDoCommand('cmd_bm_fileBookmark');"/>
-
-      <command id="cmd_bm_cut"                    oncommand="goDoCommand('cmd_bm_cut');"/>
-      <command id="cmd_bm_copy"                   oncommand="goDoCommand('cmd_bm_copy');"/>
-      <command id="cmd_bm_paste"                  oncommand="goDoCommand('cmd_bm_paste');"/>
-      <command id="cmd_bm_delete"                 oncommand="goDoCommand('cmd_bm_delete');"/>
-      <command id="cmd_bm_selectAll"              oncommand="goDoCommand('cmd_bm_selectAll');"/>
-    </commandset>
-    <commandset id="selectEditMenuItems"/>
-    <commandset id="globalEditMenuItems"/>
-  </commands>
-
-</overlay>

mozilla/xpfe/components/bookmarks/resources/bookmarksTree.js

@@ -1,759 +0,0 @@
-/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** 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):
- *   Ben Goodger <ben@netscape.com> (Original Author)
- *
- * 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 ***** */
-
-var gBookmarksShell = null;
-
-///////////////////////////////////////////////////////////////////////////////
-// Tracks the selected item, the cell last clicked on, and the number of clicks
-// given to it. Used to activate inline edit mode.
-var gSelectionTracker = { currentItem: null, currentCell: null, clickCount: 0 };
-
-///////////////////////////////////////////////////////////////////////////////
-// Class which defines methods for a bookmarks UI implementation based around
-// a treeview. Subclasses BookmarksBase in bookmarksOverlay.js. Some methods
-// are required by the base class, others are for event handling. Window specific
-// glue code should go into the BookmarksWindow class in bookmarks.js
-function BookmarksTree (aID)
-{
-  this.id = aID;
-}
-
-BookmarksTree.prototype = {
-  __proto__: BookmarksUIElement.prototype,
-
-  // XXX - change this to .element and move into base. 
-  get tree ()
-  {
-    return document.getElementById(this.id);
-  },
-
-  /////////////////////////////////////////////////////////////////////////////
-  // This method constructs a menuitem for a context menu for the given command.
-  // This is implemented by the client so that it can intercept menuitem naming
-  // as appropriate.
-  createMenuItem: function (aDisplayName, aCommandName, aItemNode)
-  {
-    const kXULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
-    var xulElement = document.createElementNS(kXULNS, "menuitem");
-    xulElement.setAttribute("cmd", aCommandName);
-    xulElement.setAttribute("command", "cmd_" + aCommandName.substring(NC_NS_CMD.length));
-
-    switch (aCommandName) {
-    case NC_NS_CMD + "open":
-      xulElement.setAttribute("label", aDisplayName);
-      xulElement.setAttribute("default", "true");
-      break;
-    case NC_NS_CMD + "openfolder":
-      aDisplayName = aItemNode.getAttribute("open") == "true" ? this.getLocaleString("cmd_openfolder2") : aDisplayName;
-      xulElement.setAttribute("label", aDisplayName);
-      xulElement.setAttribute("default", "true");
-      break;
-    case NC_NS_CMD + "renamebookmark":
-      if (!document.popupNode.hasAttribute("type")) {
-        xulElement.setAttribute("label", this.getLocaleString("cmd_renamebookmark2"));
-        xulElement.setAttribute("cmd", (NC_NS_CMD + "editurl"));
-      }
-      else
-        xulElement.setAttribute("label", aDisplayName);
-      break;
-    default:
-      xulElement.setAttribute("label", aDisplayName);
-      break;
-    }
-    return xulElement;
-  },
-
-  // XXX - ideally this would be in the base. this.tree needs to change to 
-  // this.element and then we can do just that. 
-  setRoot: function (aRoot)
-  {
-    this.tree.setAttribute("ref", aRoot);
-  },
-
-  // Command implementation
-  commands: {
-    openFolder: function (aSelectedItem)
-    {
-      if (aSelectedItem.getAttribute("open") == "true")
-        aSelectedItem.removeAttribute("open");
-      else
-        aSelectedItem.setAttribute("open", "true");
-    },
-
-    // Things Needed to Satisfy Mac Weenies:
-    // 1) need to implement timed single click edit. This could be Hard.
-    // 2) need to implement some other method of key access apart from F2.
-    //    mpt claims that 'Cmd+U' is the excel equivalent.
-    editCell: function (aSelectedItem, aCell)
-    {
-      // XXX throw up properties dialog with name selected so user can rename
-      //     that way, until tree conversion allows us to use IL again. 
-      goDoCommand("cmd_properties");
-      return; // Disable inline edit for now.
-
-      var editCell = aSelectedItem.firstChild.childNodes[aCell];
-      if (editCell.getAttribute("editable") != "true")
-        return;
-      
-      // Cause the inline edit cell binding to be used.
-      editCell.setAttribute("class", "treecell-indent treecell-editable");
-      var editColGroup = document.getElementById("theColumns");
-      var count = 0;
-      var property = "";
-      for (var i = 0; i < editColGroup.childNodes.length; ++i) {
-        var currCol = editColGroup.childNodes[i];
-        if (currCol.getAttribute("hidden") == "true")
-          return;
-        if (count == aCell) {
-          property = currCol.getAttribute("resource");
-          break;
-        }
-        ++count;
-
-        // Deal with interleaved column resizer splitters
-        if (currCol.nextSibling.localName == "splitter") ++i;
-      }
-
-      if (property) {
-        editCell.setMode("edit");
-        editCell.addObserver(this.postModifyCallback, "accept",
-                             [editCell, aSelectedItem, property]);
-      }
-    },
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Called after an inline-edit cell has left inline-edit mode, and data
-    // needs to be modified in the datasource.
-    postModifyCallback: function (aParams)
-    {
-      var selItemURI = NODE_ID(aParams[1]);
-      gBookmarksShell.propertySet(selItemURI, aParams[2], aParams[3]);
-      gBookmarksShell.selectFolderItem(NODE_ID(gBookmarksShell.findRDFNode(aParams[1], false)),
-                                       selItemURI, false);
-      gBookmarksShell.tree.focus();
-      gSelectionTracker.clickCount = 0;
-      
-      // Set the cell back to use the standard treecell binding.
-      var editCell = aParams[0];
-      editCell.setAttribute("class", "treecell-indent");
-    },
-
-    ///////////////////////////////////////////////////////////////////////////
-    // New Folder Creation
-    // Strategy: create a dummy row with edit fields to harvest information
-    //           from the user, then destroy these rows and create an item
-    //           in its place.
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Edit folder name & update the datasource if name is valid
-    onEditFolderName: function (aParams, aTopic)
-    {
-      var name = aParams[3];
-      var shell = gBookmarksShell.commands; // suck
-      var dummyItem = aParams[2];
-      var relativeNode = aParams[1];
-      var parentNode = relativeNode ? gBookmarksShell.findRDFNode(relativeNode, false) : gBookmarksShell.tree;
-
-      dummyItem.parentNode.removeChild(dummyItem);
-
-      if (!shell.validateNameAndTopic(name, aTopic, relativeNode, dummyItem)) {
-        gBookmarksShell.tree.selectItem(relativeNode);
-        gBookmarksShell.tree.focus();
-        return;
-      }
-
-      if (relativeNode) {
-        // If we're attempting to create a folder as a subfolder of an open folder,
-        // we need to set the parentFolder to be relativeNode, which will be the
-        // parent of the new folder, rather than the parent of the relativeNode,
-        // which will result in the folder being created in an incorrect position
-        // (adjacent to the relativeNode).
-        var selKids = ContentUtils.childByLocalName(relativeNode, "treechildren");
-        if (selKids && selKids.hasChildNodes() && selKids.lastChild == dummyItem)
-          parentNode = relativeNode;
-      }
-
-      var args = [{ property: NC_NS + "parent",
-                    resource: NODE_ID(parentNode) },
-                  { property: NC_NS + "Name",
-                    literal:  name }];
-
-      const kBMDS = gBookmarksShell.RDF.GetDataSource("rdf:bookmarks");
-      kBMDS.AddObserver(newFolderRDFObserver);
-      var relId = relativeNode ? NODE_ID(relativeNode) : "NC:BookmarksRoot";
-      BookmarksUtils.doBookmarksCommand(relId, NC_NS_CMD + "newfolder", args);
-      kBMDS.RemoveObserver(newFolderRDFObserver);
-      var newFolderItem = document.getElementById(newFolderRDFObserver._newFolderURI);
-      gBookmarksShell.tree.focus();
-      gBookmarksShell.tree.selectItem(newFolderItem);
-      // Can't use newFolderItem because it may not have been created yet. Hack, huh?
-      var index = gBookmarksShell.tree.getIndexOfItem(relativeNode);
-      gBookmarksShell.tree.ensureIndexIsVisible(index+1);
-      gSelectionTracker.clickCount = 0;
-    },
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Performs simple validation on what the user has entered:
-    //  1) prevents entering an empty string
-    //  2) in the case of a canceled operation, remove the dummy item and
-    //     restore selection.
-    validateNameAndTopic: function (aName, aTopic, aOldSelectedItem, aDummyItem)
-    {
-      // Don't allow user to enter an empty string "";
-      if (!aName) return false;
-
-      // If the user hit escape, go no further.
-      if (aTopic == "reject") {
-        if (aOldSelectedItem)
-          gBookmarksShell.tree.selectItem(aOldSelectedItem);
-        return false;
-      }
-      return true;
-    },
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Creates a dummy item that can be placed in edit mode to retrieve data
-    // to create new bookmarks/folders.
-    createBookmarkItem: function (aMode, aSelectedItem)
-    {
-      /////////////////////////////////////////////////////////////////////////
-      // HACK HACK HACK HACK HACK         
-      // Disable Inline-Edit for now and just use a dialog. 
-      
-      // XXX - most of this is just copy-pasted from the other two folder
-      //       creation functions. Yes it's ugly, but it'll do the trick for 
-      //       now as this is in no way intended to be a long-term solution.
-
-      const kPromptSvcContractID = "@mozilla.org/embedcomp/prompt-service;1";
-      const kPromptSvcIID = Components.interfaces.nsIPromptService;
-      const kPromptSvc = Components.classes[kPromptSvcContractID].getService(kPromptSvcIID);
-      
-      var defaultValue  = gBookmarksShell.getLocaleString("ile_newfolder");
-      var dialogTitle   = gBookmarksShell.getLocaleString("newfolder_dialog_title");
-      var dialogMsg     = gBookmarksShell.getLocaleString("newfolder_dialog_msg");
-      var stringValue   = { value: defaultValue };
-      if (kPromptSvc.prompt(window, dialogTitle, dialogMsg, stringValue, null, { value: 0 })) {
-        var relativeNode = gBookmarksShell.tree;
-        var parentNode;
-        if (aSelectedItem && aSelectedItem.localName != "tree") {
-          // By default, create adjacent to the selected item
-          relativeNode = aSelectedItem;
-          if (relativeNode.getAttribute("container") == "true" && 
-              relativeNode.getAttribute("open") == "true") {
-            // But if it's an open container, the relative node should be the last child. 
-            var treechildren = ContentUtils.childByLocalName(relativeNode, "treechildren");
-            if (treechildren && treechildren.hasChildNodes())
-              relativeNode = treechildren.lastChild; // folder non-empty, set relativeNode
-            parentNode = aSelectedItem; // no matter what, folder is open, so make it parent
-          } else {
-            parentNode = relativeNode ? gBookmarksShell.findRDFNode(relativeNode, false) : gBookmarksShell.tree;
-          }
-        }
-
-        var args = [{ property: NC_NS + "parent",
-                      resource: NODE_ID(parentNode) },
-                    { property: NC_NS + "Name",
-                      literal:  stringValue.value }];
-        
-        const kBMDS = gBookmarksShell.RDF.GetDataSource("rdf:bookmarks");
-        kBMDS.AddObserver(newFolderRDFObserver);
-        var relId = relativeNode ? NODE_ID(relativeNode) : "NC:BookmarksRoot";
-        BookmarksUtils.doBookmarksCommand(relId, NC_NS_CMD + "newfolder", args);
-        kBMDS.RemoveObserver(newFolderRDFObserver);
-        var newFolderItem = document.getElementById(newFolderRDFObserver._newFolderURI);
-        gBookmarksShell.tree.focus();
-        gBookmarksShell.tree.selectItem(newFolderItem);
-        // Can't use newFolderItem because it may not have been created yet. Hack, huh?
-        var index = gBookmarksShell.tree.getIndexOfItem(relativeNode);
-        gBookmarksShell.tree.ensureIndexIsVisible(index+1);
-      }
-      
-      return; 
-      
-      // HACK HACK HACK HACK HACK         
-      /////////////////////////////////////////////////////////////////////////
-
-      /* Disable inline edit for now
-      const kXULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
-      var dummyItem = document.createElementNS(kXULNS, "treeitem");
-      dummyItem = gBookmarksShell.createBookmarkFolderDecorations(dummyItem);
-      dummyItem.setAttribute("class", "bookmark-item");
-
-      var dummyRow    = document.createElementNS(kXULNS, "treerow");
-      var dummyCell   = document.createElementNS(kXULNS, "treecell");
-      var dummyCell2  = document.createElementNS(kXULNS, "treecell");
-      dummyCell.setAttribute("label", gBookmarksShell.getLocaleString("ile_newfolder") + "  ");
-      dummyCell.setAttribute("type", NC_NS + "Folder");
-      dummyCell.setAttribute("editable", "true");
-      dummyCell.setAttribute("class", "treecell-indent treecell-editable");
-      dummyRow.appendChild(dummyCell);
-      dummyItem.appendChild(dummyRow);
-      
-      var relativeNode = null;
-
-      // If there are selected items, try to create the dummy item relative to the 
-      // best item, and position the bookmark there when created. Otherwise just
-      // append to the root. 
-      if (aSelectedItem && aSelectedItem.localName != "tree") {
-        // By default, create adjacent to the selected item
-        relativeNode = aSelectedItem;
-        if (relativeNode.getAttribute("container") == "true" && 
-            relativeNode.getAttribute("open") == "true") {
-          // But if it's an open container, the relative node should be the last child. 
-          var treechildren = ContentUtils.childByLocalName(relativeNode, "treechildren");
-          if (treechildren && treechildren.hasChildNodes()) 
-            relativeNode = treechildren.lastChild;
-        }
-
-        if (aSelectedItem.getAttribute("container") == "true") {
-          if (aSelectedItem.getAttribute("open") == "true") {
-            var treechildren = ContentUtils.childByLocalName(aSelectedItem, "treechildren");
-            if (!treechildren) {
-              treechildren = document.createElementNS(kXULNS, "treechildren");
-              aSelectedItem.appendChild(treechildren);
-            }
-            // Insert new item after last item.
-            treechildren.appendChild(dummyItem);
-          }
-          else {
-            if (aSelectedItem.nextSibling)
-              aSelectedItem.parentNode.insertBefore(dummyItem, aSelectedItem.nextSibling);
-            else
-              aSelectedItem.parentNode.appendChild(dummyItem);
-          }
-          var index = gBookmarksShell.tree.getIndexOfItem(dummyItem);
-          gBookmarksShell.tree.ensureIndexIsVisible(index);
-        }
-        else {
-          if (aSelectedItem.nextSibling)
-            aSelectedItem.parentNode.insertBefore(dummyItem, aSelectedItem.nextSibling);
-          else
-            aSelectedItem.parentNode.appendChild(dummyItem);
-        }
-      }
-      else {
-        // No items in the tree. Append to the root. 
-        var rootKids = document.getElementById("treechildren-bookmarks");
-        rootKids.appendChild(dummyItem);
-      }
-
-      dummyCell.setMode("edit");
-      dummyCell.addObserver(this.onEditFolderName, "accept", [dummyCell, relativeNode, dummyItem]);
-      dummyCell.addObserver(this.onEditFolderName, "reject", [dummyCell, relativeNode, dummyItem]);
-      */
-    }
-  },
-
-  /////////////////////////////////////////////////////////////////////////////
-  // Evaluates an event to determine whether or not it affords opening a tree
-  // item. Typically, this is when the left mouse button is used, and provided
-  // the click-rate matches that specified by our owning tree class. For example,
-  // some trees open an item when double clicked (bookmarks/history windows) and
-  // others on a single click (sidebar panels).
-  isValidOpenEvent: function (aEvent)
-  {
-    return !(aEvent.type == "click" && 
-             (aEvent.button != 0 || aEvent.detail != this.openClickCount))
-  },
-
-  /////////////////////////////////////////////////////////////////////////////
-  // For the given selection, selects the best adjacent element. This method is
-  // useful when an action such as a cut or a deletion is performed on a
-  // selection, and focus/selection needs to be restored after the operation
-  // is performed.
-  getNextElement: function (aElement)
-  {
-    if (aElement.nextSibling)
-      return aElement.nextSibling;
-    else if (aElement.previousSibling)
-      return aElement.previousSibling;
-    else
-      return aElement.parentNode.parentNode;
-  },
-
-  selectElement: function (aElement)
-  {
-    this.tree.selectItem(aElement);
-  },
-
-  //////////////////////////////////////////////////////////////////////////////
-  // Add the treeitem element specified by aURI to the tree's current selection.
-  addItemToSelection: function (aURI)
-  {
-    var item = document.getElementById(aURI) // XXX flawed for multiple ids
-    this.tree.addItemToSelection(item);
-  },
-
-  /////////////////////////////////////////////////////////////////////////////
-  // Return a set of DOM nodes that represent the selection in the tree widget.
-  // This method is takes a node parameter which is the popupNode for the
-  // document. If the popupNode is not contained by the selection, the
-  // popupNode is selected and the new selection returned.
-  getSelection: function ()
-  {
-    // Note that we don't just the selectedItems NodeList here because that
-    // is a reference to a LIVE DOM NODE LIST. We want to maintain control
-    // over what is in the selection array ourselves.
-    return [].concat(this.tree.selectedItems);
-  },
-
-  getBestItem: function ()
-  {
-    var seln = this.getSelection ();
-    if (seln.length < 1) {
-      var kids = ContentUtils.childByLocalName(this.tree, "treechildren");
-      return kids.lastChild || this.tree;
-    }
-    else
-      return seln[0];
-    return this.tree;
-  },
-
-  /////////////////////////////////////////////////////////////////////////////
-  // Return a set of DOM nodes that represent the selection in the tree widget.
-  // This method is takes a node parameter which is the popupNode for the
-  // document. If the popupNode is not contained by the selection, the
-  // popupNode is selected and the new selection returned.
-  getContextSelection: function (aItemNode)
-  {
-    // How a context-click works:
-    // if the popup node is contained by the selection, the context menu is
-    // built for that selection. However, if the popup node is invoked on a
-    // non-selected node, unless modifiers are pressed**, the previous
-    // selection is discarded and that node selected.
-    var selectedItems = this.tree.selectedItems;
-    for (var i = 0; i < selectedItems.length; ++i) {
-      if (selectedItems[i] == aItemNode)
-        return selectedItems;
-    }
-    if (aItemNode.localName == "treeitem")
-      this.tree.selectItem(aItemNode);
-    return this.tree.selectedItems.length ? this.tree.selectedItems : [this.tree];
-  },
-
-  getSelectedFolder: function ()
-  {
-    var selectedItem = this.getBestItem();
-    if (!selectedItem) return "NC:BookmarksRoot";
-    while (selectedItem && selectedItem.nodeType == Node.ELEMENT_NODE) {
-      if (selectedItem.getAttribute("container") == "true" && 
-          selectedItem.getAttribute("open") == "true")
-        return NODE_ID(selectedItem);
-      selectedItem = selectedItem.parentNode.parentNode;
-    }
-    return "NC:BookmarksRoot";
-  },
-
-  /////////////////////////////////////////////////////////////////////////////
-  // For a given start DOM element, find the enclosing DOM element that contains
-  // the template builder RDF resource decorations (id, ref, etc).
-  findRDFNode: function (aStartNode, aIncludeStartNodeFlag)
-  {
-    var temp = aIncludeStartNodeFlag ? aStartNode : aStartNode.parentNode;
-    while (temp && temp.localName != "treeitem")
-      temp = temp.parentNode;
-    return temp || this.tree;
-  },
-
-  /////////////////////////////////////////////////////////////////////////////
-  // Tree click events. This handles when to go into inline-edit mode for
-  // editable cells.
-  treeClicked: function (aEvent)
-  {
-    // We are disabling Inline Edit for now. It's too buggy in the old XUL tree widget.
-    // A more solid implementation will follow the conversion to tree
-/*
-    if (this.tree.selectedItems.length > 1 || aEvent.detail > 1 || aEvent.button != 0) {
-      gSelectionTracker.clickCount = 0;
-      return;
-    }
-    if (gSelectionTracker.currentItem == this.tree.currentItem &&
-        gSelectionTracker.currentCell == aEvent.target)
-      ++gSelectionTracker.clickCount;
-    else
-      gSelectionTracker.clickCount = 0;
-
-    if (!this.tree.currentItem)
-      return;
-
-    gSelectionTracker.currentItem = this.tree.currentItem;
-    gSelectionTracker.currentCell = aEvent.target;
-
-    if (gSelectionTracker.currentItem.getAttribute("type") != NC_NS + "Bookmark" &&
-        gSelectionTracker.currentItem.getAttribute("type") != NC_NS + "Folder")
-      return;
-
-    var row = gSelectionTracker.currentItem.firstChild;
-    if (row) {
-      for (var i = 0; i < row.childNodes.length; ++i) {
-        if (row.childNodes[i] == gSelectionTracker.currentCell) {
-          // Don't allow inline-edit of cells other than name for folders.
-          // XXX - so so skeezy. Change this to look for NC:Name or some such.
-          if (gSelectionTracker.currentItem.getAttribute("type") != NC_NS + "Bookmark" && i)
-            return;
-          // Don't allow editing of the root folder name
-          if (gSelectionTracker.currentItem.id == "NC:BookmarksRoot")
-            return;
-          if (gSelectionTracker.clickCount == 1 && this.openClickCount > 1)
-            gBookmarksShell.commands.editCell(this.tree.currentItem, i);
-          break;
-        }
-      }
-    }
-*/
-  },
-
-  treeOpen: function (aEvent)
-  {
-    if (this.isValidOpenEvent(aEvent)) {
-      var rdfNode = this.findRDFNode(aEvent.target, true);
-      if (rdfNode.getAttribute("container") != "true")
-        this.open(aEvent, rdfNode);
-    }
-  },
-
-  /////////////////////////////////////////////////////////////////////////////
-  // Tree key events. This handles when to go into inline-edit mode for editable
-  // cells, when to load a URL, etc.
-  treeKeyPress: function (aEvent)
-  {
-    if (this.tree.selectedItems.length > 1) return;
-
- /* Disabling Inline Edit
-    if (aEvent.keyCode == 113 && aEvent.shiftKey) {
-      const kNodeId = NODE_ID(this.tree.currentItem);
-      if (this.resolveType(kNodeId) == NC_NS + "Bookmark")
-        gBookmarksShell.commands.editCell (this.tree.currentItem, 1);
-    }
-    else */
-    if (aEvent.keyCode == 113)
-      goDoCommand("cmd_rename");
-    else if (aEvent.keyCode == 13) // && this.tree.currentItem.firstChild.getAttribute("inline-edit") != "true")
-      goDoCommand(aEvent.altKey ? "cmd_properties" : "cmd_open");
-  },
-
-  selectFolderItem: function (aFolderURI, aItemURI, aAdditiveFlag)
-  {
-    var folder = document.getElementById(aFolderURI);
-    var kids = ContentUtils.childByLocalName(folder, "treechildren");
-    if (!kids) return;
-
-    var item = kids.firstChild;
-    while (item) {
-      if (item.id == aItemURI) break;
-      item = item.nextSibling;
-    }
-    if (!item) return;
-
-    this.tree[aAdditiveFlag ? "addItemToSelection" : "selectItem"](item);
-  },
-
-  /////////////////////////////////////////////////////////////////////////////
-  // Command handling & Updating.
-  controller: {
-    supportsCommand: function (aCommand)
-    {
-      switch(aCommand) {
-      case "cmd_undo":
-      case "cmd_redo":
-        return false;
-      case "cmd_bm_cut":
-      case "cmd_bm_copy":
-      case "cmd_bm_paste":
-      case "cmd_bm_delete":
-      case "cmd_bm_selectAll":
-        return true;
-      case "cmd_open":
-      case "cmd_openfolder":
-      case "cmd_openfolderinnewwindow":
-      case "cmd_newbookmark":
-      case "cmd_newfolder":
-      case "cmd_newseparator":
-      case "cmd_find":
-      case "cmd_properties":
-      case "cmd_rename":
-      case "cmd_setnewbookmarkfolder":
-      case "cmd_setpersonaltoolbarfolder":
-      case "cmd_setnewsearchfolder":
-      case "cmd_import":
-      case "cmd_export":
-      case "cmd_bm_fileBookmark":
-        return true;
-      default:
-        return false;
-      }
-    },
-
-    isCommandEnabled: function (aCommand)
-    {
-      var numSelectedItems = gBookmarksShell.tree.selectedItems.length;
-      var seln, firstSelected, folderType, bItemCountCorrect;
-      switch(aCommand) {
-      case "cmd_undo":
-      case "cmd_redo":
-        return false;
-      case "cmd_bm_paste":
-        return gBookmarksShell.canPaste();
-      case "cmd_bm_cut":
-      case "cmd_bm_copy":
-      case "cmd_bm_delete":
-        return numSelectedItems >= 1;
-      case "cmd_bm_selectAll":
-        return true;
-      case "cmd_open":
-         seln = gBookmarksShell.tree.selectedItems;
-        return numSelectedItems == 1 && seln[0].getAttribute("type") == NC_NS + "Bookmark";
-      case "cmd_openfolder":
-      case "cmd_openfolderinnewwindow":
-        seln = gBookmarksShell.tree.selectedItems;
-        return numSelectedItems == 1 && seln[0].getAttribute("type") == NC_NS + "Folder";
-      case "cmd_find":
-      case "cmd_newbookmark":
-      case "cmd_newfolder":
-      case "cmd_newseparator":
-      case "cmd_import":
-      case "cmd_export":
-        return true;
-      case "cmd_properties":
-      case "cmd_rename":
-        seln = gBookmarksShell.tree.selectedItems;
-        return numSelectedItems == 1 && seln[0].getAttribute("type") != NC_NS + "BookmarkSeparator";
-      case "cmd_setnewbookmarkfolder":
-        seln = gBookmarksShell.tree.selectedItems;
-        firstSelected = seln.length ? seln[0] : gBookmarksShell.tree;
-        folderType = firstSelected.getAttribute("type") == (NC_NS + "Folder");
-        bItemCountCorrect = seln.length ? numSelectedItems == 1 : true;
-        return bItemCountCorrect && !(NODE_ID(firstSelected) == "NC:NewBookmarkFolder") && folderType;
-      case "cmd_setpersonaltoolbarfolder":
-        seln = gBookmarksShell.tree.selectedItems;
-        firstSelected = seln.length ? seln[0] : gBookmarksShell.tree;
-        folderType = firstSelected.getAttribute("type") == (NC_NS + "Folder");
-        bItemCountCorrect = seln.length ? numSelectedItems == 1 : true;
-        return bItemCountCorrect && !(NODE_ID(firstSelected) == "NC:PersonalToolbarFolder") && folderType;
-      case "cmd_setnewsearchfolder":
-        seln = gBookmarksShell.tree.selectedItems;
-        firstSelected = seln.length ? seln[0] : gBookmarksShell.tree;
-        folderType = firstSelected.getAttribute("type") == (NC_NS + "Folder");
-        bItemCountCorrect = seln.length ? numSelectedItems == 1 : true;
-        return bItemCountCorrect == 1 && !(NODE_ID(firstSelected) == "NC:NewSearchFolder") && folderType;
-      case "cmd_bm_fileBookmark":
-        seln = gBookmarksShell.tree.selectedItems;
-        return seln.length > 0;
-      default:
-        return false;
-      }
-    },
-
-    doCommand: function (aCommand)
-    {
-      switch(aCommand) {
-      case "cmd_undo":
-      case "cmd_redo":
-        break;
-      case "cmd_bm_paste":
-      case "cmd_bm_copy":
-      case "cmd_bm_cut":
-      case "cmd_bm_delete":
-      case "cmd_newbookmark":
-      case "cmd_newfolder":
-      case "cmd_newseparator":
-      case "cmd_properties":
-      case "cmd_rename":
-      case "cmd_open":
-      case "cmd_openfolder":
-      case "cmd_openfolderinnewwindow":
-      case "cmd_setnewbookmarkfolder":
-      case "cmd_setpersonaltoolbarfolder":
-      case "cmd_setnewsearchfolder":
-      case "cmd_find":
-      case "cmd_import":
-      case "cmd_export":
-      case "cmd_bm_fileBookmark":
-        gBookmarksShell.execCommand(aCommand.substring("cmd_".length));
-        break;
-      case "cmd_bm_selectAll":
-        gBookmarksShell.tree.selectAll();
-        break;
-      }
-    },
-
-    onEvent: function (aEvent)
-    {
-      switch (aEvent) {
-      case "tree-select":
-        this.onCommandUpdate();
-        break;
-      }
-    },
-
-    onCommandUpdate: function ()
-    {
-      var commands = ["cmd_properties", "cmd_rename", "cmd_bm_copy",
-                      "cmd_bm_paste", "cmd_bm_cut", "cmd_bm_delete",
-                      "cmd_setpersonaltoolbarfolder", 
-                      "cmd_setnewbookmarkfolder",
-                      "cmd_setnewsearchfolder", "cmd_bm_fileBookmark", 
-                      "cmd_openfolderinnewwindow", "cmd_openfolder"];
-      for (var i = 0; i < commands.length; ++i)
-        goUpdateCommand(commands[i]);
-    }
-  }
-};
-
-var newFolderRDFObserver = {
-  _newFolderURI: null,
-  onAssert: function (aDS, aSource, aProperty, aValue)
-  {
-    try {
-      var value = aValue.QueryInterface(Components.interfaces.nsIRDFResource);
-      if (aDS.URI == "rdf:bookmarks" && aProperty.Value == RDF_NS + "type" &&
-          value.Value == NC_NS + "Folder")
-        this._newFolderURI = aSource.Value;
-    }
-    catch (e) {
-      // Failures are OK, the value could be a literal instead of a resource.
-    }
-  },
-
-  onUnassert: function (aDS, aSource, aProperty, aTarget) { },
-  onChange: function (aDS, aSource, aProperty, aOldTarget, aNewTarget) { },
-  onMove: function (aDS, aOldSource, aNewSource, aProperty, aTarget) { },
-  beginUpdateBatch: function (aDS) { },
-  endUpdateBatch: function (aDS) { }
-};
-

mozilla/xpfe/components/bookmarks/resources/findBookmark.js

@@ -1,97 +0,0 @@
-/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** 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):
- *   Ben Goodger <ben@netscape.com> (Original Author)
- *
- * 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 ***** */
-
-const BMARKS_CONTRACTID        = "@mozilla.org/browser/bookmarks-service;1";
-const nsIBookmarksService      = Components.interfaces.nsIBookmarksService;
-
-var gOKButton;
-var gSearchField;
-function Startup()
-{
-  var bundle = document.getElementById("bookmarksBundle");
-  gOKButton = document.documentElement.getButton("accept");
-  gOKButton.label = bundle.getString("search_button_label");
-  gOKButton.disabled = true;
-  gSearchField = document.getElementById("searchField");
-  gSearchField.focus();
-}
-var gCreatingNewWindow = false;
-function find()
-{
-  // Build up a find URI from the search fields and open a new window
-  // rooted on the URI. 
-  var match = document.getElementById("matchList");
-  var method = document.getElementById("methodList");
-  var searchURI = "find:datasource=rdf:bookmarks"
-  searchURI += "&match=" + match.selectedItem.value;
-  searchURI += "&method=" + method.selectedItem.value;
-  searchURI += "&text=" + escape(gSearchField.value);
-  var bmWindow = findMostRecentWindow("bookmarks:searchresults", "chrome://communicator/content/bookmarks/bookmarks.xul", searchURI);
-  
-  // Update the root of the tree if we're using an existing search window. 
-  if (!gCreatingNewWindow) 
-    bmWindow.document.getElementById("bookmarks-view").tree.setAttribute("ref", searchURI);
- 
-  bmWindow.focus();
-
-  if (document.getElementById("saveQuery").checked == true)
-  {
-    var bundle = document.getElementById("bookmarksBundle");
-    var findTitle = bundle.stringBundle.formatStringFromName(
-                      "ShortFindTitle", [gSearchField.value], 1);
-    var bmks = Components.classes[BMARKS_CONTRACTID].getService(nsIBookmarksService);
-    bmks.addBookmarkImmediately(searchURI, findTitle, bmks.BOOKMARK_FIND_TYPE, null);
-  }
-
-  return true;
-}
-
-function findMostRecentWindow(aType, aURI, aParam)
-{
-  var WM = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService();
-  WM = WM.QueryInterface(Components.interfaces.nsIWindowMediator);
-  var topWindow = WM.getMostRecentWindow(aType);
-  if (!topWindow) gCreatingNewWindow = true;
-  return topWindow || openDialog("chrome://communicator/content/bookmarks/bookmarks.xul", 
-                                 "", "chrome,all,dialog=no", aParam);
-}
-
-function doEnabling()
-{
-  gOKButton.disabled = !gSearchField.value;
-}

mozilla/xpfe/components/bookmarks/resources/findBookmark.xul

@@ -1,69 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- -*- Mode: HTML; 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): 
-    Ben Goodger <ben@netscape.com> (Original Author)
--->
-
-<!--
-    "Find Bookmarks" window
-  -->
-
-<?xml-stylesheet href="chrome://communicator/skin/"?>
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/bookmarks/findBookmark.dtd">
-
-<dialog id="findBookmarkWindow" style="width: 36em;"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        title="&findBookmark.title;" 
-        onload="Startup();"
-        ondialogaccept="return find();">
-
-  <stringbundle id="bookmarksBundle" src="chrome://communicator/locale/bookmarks/bookmark.properties"/>
-  
-  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarksOverlay.js"/>
-  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/findBookmark.js"/>
-
-  <label value="&search.for.label;"/>
-  <hbox align="center">
-    <menulist id="matchList" class="menulist-toolbar">
-      <menupopup>
-        <menuitem value="http://home.netscape.com/NC-rdf#Name" label="&search.name.label;"/>
-        <menuitem value="http://home.netscape.com/NC-rdf#URL" label="&search.url.label;"/>
-        <menuitem value="http://home.netscape.com/NC-rdf#Description" label="&search.description.label;"/>
-        <menuitem value="http://home.netscape.com/NC-rdf#ShortcutURL" label="&search.shortcut.label;"/>
-      </menupopup>
-    </menulist>
-    <menulist id="methodList" class="menulist-toolbar">
-      <menupopup>
-        <menuitem value="contains" label="&search.contains.label;"/>
-        <menuitem value="startswith" label="&search.startswith.label;"/>
-        <menuitem value="endswith" label="&search.endswith.label;"/>
-        <menuitem value="is" label="&search.is.label;"/>
-        <menuitem value="isnot" label="&search.isnot.label;"/>
-        <menuitem value="doesntcontain" label="&search.doesntcontain.label;"/>
-      </menupopup>
-    </menulist>
-    <textbox id="searchField" flex="1" oninput="doEnabling();"/>
-  </hbox>
-  <checkbox id="saveQuery" label="&save.query.label;" />
-</dialog>
-

mozilla/xpfe/components/bookmarks/resources/jar.mn

@@ -1,47 +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): 
-
-comm.jar:
-	content/communicator/bookmarks/addBookmark.xul
-	content/communicator/bookmarks/addBookmark.js
-	content/communicator/bookmarks/bm-props.js
-	content/communicator/bookmarks/bm-props.xul
-	content/communicator/bookmarks/bookmarksDD.js
-	content/communicator/bookmarks/bookmarks.xul
-	content/communicator/bookmarks/bookmarks.js
-	content/communicator/bookmarks/bookmarks.css
-	content/communicator/bookmarks/bookmarks.xml
-	content/communicator/bookmarks/bookmarksTree.js
-	content/communicator/bookmarks/bookmarksOverlay.xul
-	content/communicator/bookmarks/bookmarksOverlay.js
-	content/communicator/bookmarks/bm-panel.xul
-	content/communicator/bookmarks/bookmarksPanel.js
-	content/communicator/bookmarks/findBookmark.js
-	content/communicator/bookmarks/findBookmark.xul
-	content/communicator/bookmarks/pref-bookmarks.xul
-	content/communicator/bookmarks/oTest.xul
-
-en-US.jar:
-	locale/en-US/communicator/bookmarks/addBookmark.dtd         (locale/en-US/addBookmark.dtd)
-	locale/en-US/communicator/bookmarks/bm-props.dtd            (locale/en-US/bm-props.dtd)
-	locale/en-US/communicator/bookmarks/bookmarks.dtd           (locale/en-US/bookmarks.dtd)
-	locale/en-US/communicator/bookmarks/bookmark.properties     (locale/en-US/bookmark.properties)
-	locale/en-US/communicator/bookmarks/bookmarksOverlay.dtd    (locale/en-US/bookmarksOverlay.dtd)
-	locale/en-US/communicator/bookmarks/findBookmark.dtd	    (locale/en-US/findBookmark.dtd)
-	locale/en-US/communicator/bookmarks/pref-bookmarks.dtd	    (locale/en-US/pref-bookmarks.dtd)

mozilla/xpfe/components/bookmarks/resources/locale/MANIFEST

@@ -1,4 +0,0 @@
-en-US:bm-find.dtd
-en-US:bm-props.dtd
-en-US:bookmarks.dtd
-en-US:bookmark.properties

mozilla/xpfe/components/bookmarks/resources/locale/en-US/MANIFEST

@@ -1,4 +0,0 @@
-bm-find.dtd
-bm-props.dtd
-bookmark.properties
-bookmarks.dtd

mozilla/xpfe/components/bookmarks/resources/locale/en-US/addBookmark.dtd

@@ -1,46 +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 Communicator.
-   - 
-   - The Initial Developer of the Original Code is Netscape
-   - Communications Corp. Portions created by Netscape Communications
-   - Corp. are Copyright (C) 1999 Netscape Communications Corp. All
-   - Rights Reserved.
-   - 
-   - Contributor(s):
-   -   Ben Goodger <ben@netscape.com> (Original Author)
-  --> 
-  
-<!ENTITY newBookmark.title          "Add Bookmark">
-<!ENTITY newbookmark.label          "&brandShortName; will add a bookmark to this page.">
-<!ENTITY name.label                 "Name:">
-<!ENTITY name.accesskey             "n">
-<!ENTITY url.label                  "Location:">
-<!ENTITY url.accesskey              "l">
-<!ENTITY button.createin.label      "Create In &gt;&gt;">
-<!ENTITY button.createin.accesskey  "c">
-<!ENTITY button.createin2.label     "Create In &lt;&lt;">
-<!ENTITY createin.label             "Create in:">
-<!ENTITY createin.accesskey         "i">
-<!ENTITY button.newfolder.label     "New Folder...">
-<!ENTITY button.newfolder.accesskey "w">
-<!ENTITY alwayscreateinfolder.label "Don't show this dialog again">
-<!ENTITY alwayscreateinfolder.accesskey "a">
-<!ENTITY dontshowmessage.tooltip    "When this option is selected, new Bookmarks will be added using the title provided by the page.">
-<!ENTITY button.defaultfolder.label "Use Default">
-<!ENTITY button.defaultfolder.accesskey "d">
-<!ENTITY selectFolder.label         "Choose Folder">
-<!ENTITY addGroup.label             "Bookmark this group of tabs">
-<!ENTITY addGroup.accesskey         "B">
-
-
-

mozilla/xpfe/components/bookmarks/resources/locale/en-US/bm-props.dtd

@@ -1,92 +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 Communicator.
-   - 
-   - The Initial Developer of the Original Code is Netscape
-   - Communications Corp. Portions created by Netscape Communications
-   - Corp. are Copyright (C) 1999 Netscape Communications Corp. All
-   - Rights Reserved.
-   - 
-   - Contributor(s): Stephen Lamm          <slamm@netscape.com>
-   -                 Robert John Churchill <rjc@netscape.com>
-   -                 Ben Goodger           <ben@netscape.com>
-  --> 
-
-<!ENTITY bookmarks.windowtitle.label  "Properties for &quot;**bm_title**&quot;">
-
-<!ENTITY generalInfo.label            "Info">
-<!ENTITY generalInfo.accesskey        "i">
-<!ENTITY generaldesc.label            "&brandShortName; can remember the locations of sites on the Internet for you. Enter the site's name and location in the fields below, then select the site from the Bookmarks menu or your Bookmarks Sidebar tab to visit the site.">
-
-<!ENTITY schedule.label               "Schedule">
-<!ENTITY schedule.accesskey           "s">
-<!ENTITY schedule.description         "&brandShortName; can check this site for updates and notify you when one occurs. Use these settings to customize the schedule for this Bookmark.">
-<!ENTITY notification.label           "Notify">
-<!ENTITY notification.accesskey       "n">
-<!-- ICK. fix me -->
-<!ENTITY notification.description     "&brandShortName; will notify you when this site changes. Use these settings to customize notification.">
-
-<!ENTITY bookmarks.information.label  "Information:">
-<!ENTITY bookmarks.name.label         "Name:">
-<!ENTITY bookmarks.location.label     "Location:">
-<!ENTITY bookmarks.shortcut.label     "Keyword:">
-<!ENTITY bookmarks.description.label  "Description:">
-
-<!ENTITY checkforupdates.legend.label "Check this location for updates:">
-<!ENTITY when.label                   "When:">
-<!ENTITY from.label                   "from:">
-<!ENTITY to.label                     "to: ">
-<!ENTITY every.label                  "every">
-<!ENTITY minutes.label                "minute(s)">
-<!ENTITY notifications.legend.label   "Notification:">
-
-<!ENTITY checknever.label             "Never">
-<!ENTITY checkeveryday.label          "Every day">
-<!ENTITY checkweekdays.label          "Weekdays">
-<!ENTITY checkweekends.label          "Weekends">
-<!ENTITY checkmondays.label           "Mondays">
-<!ENTITY checktuesdays.label          "Tuesdays">
-<!ENTITY checkwednesdays.label        "Wednesdays">
-<!ENTITY checkthursdays.label         "Thursdays">
-<!ENTITY checkfridays.label           "Fridays">
-<!ENTITY checksaturdays.label         "Saturdays">
-<!ENTITY checksundays.label           "Sundays">
-
-<!ENTITY midnight.label               "Midnight">
-<!ENTITY AMone.label                  "1 AM">
-<!ENTITY AMtwo.label                  "2 AM">
-<!ENTITY AMthree.label                "3 AM">
-<!ENTITY AMfour.label                 "4 AM">
-<!ENTITY AMfive.label                 "5 AM">
-<!ENTITY AMsix.label                  "6 AM">
-<!ENTITY AMseven.label                "7 AM">
-<!ENTITY AMeight.label                "8 AM">
-<!ENTITY AMnine.label                 "9 AM">
-<!ENTITY AMten.label                  "10 AM">
-<!ENTITY AMeleven.label               "11 AM">
-<!ENTITY noon.label                   "Noon">
-<!ENTITY PMone.label                  "1 PM">
-<!ENTITY PMtwo.label                  "2 PM">
-<!ENTITY PMthree.label                "3 PM">
-<!ENTITY PMfour.label                 "4 PM">
-<!ENTITY PMfive.label                 "5 PM">
-<!ENTITY PMsix.label                  "6 PM">
-<!ENTITY PMseven.label                "7 PM">
-<!ENTITY PMeight.label                "8 PM">
-<!ENTITY PMnine.label                 "9 PM">
-<!ENTITY PMten.label                  "10 PM">
-<!ENTITY PMeleven.label               "11 PM">
-
-<!ENTITY notification.icon.label      "Change the bookmark's icon">
-<!ENTITY notification.sound.label     "Play a sound">
-<!ENTITY notification.alert.label     "Display an alert">
-<!ENTITY notification.window.label    "Open web page in a new window">

mozilla/xpfe/components/bookmarks/resources/locale/en-US/bookmark.properties

@@ -1,80 +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): 
-#
-
-cmd_bm_open = Open
-cmd_bm_openfolder = Expand
-cmd_bm_openfolder2 = Collapse
-cmd_bm_find = Find a Bookmark...
-cmd_bm_cut = Cut
-cmd_bm_copy = Copy
-cmd_bm_paste = Paste
-cmd_bm_delete = Delete
-cmd_bm_selectAll = Select All
-cmd_bm_rename = Rename...
-cmd_bm_renamebookmark2 = Change Location...
-cmd_bm_properties = Properties
-cmd_bm_fileBookmark = File Bookmark(s)...
-
-cmd_bm_openinnewwindow = Open in New Window
-cmd_bm_newfolder = New Folder...
-cmd_bm_newbookmark = New Bookmark...
-cmd_bm_newseparator = New Separator
-cmd_bm_setnewbookmarkfolder = Set as New Bookmark folder
-cmd_bm_setpersonaltoolbarfolder = Set as Personal Toolbar folder
-cmd_bm_setnewsearchfolder = Set as Saved Search Results folder
-
-ile_newfolder = New Folder
-ile_newbookmark = New Bookmark
-newfolder_dialog_title = Create New Folder
-newfolder_dialog_msg = Create a New Folder named:
-
-window_title = %folder_name% - Bookmarks
-search_results_title = Search Results
-
-file_in = File in "%folder_name%"
-
-bookmarks_root = Bookmarks for %user_name%
-status_foldercount = %num_items% object(s)
-
-WebPageUpdated = The following web page has been updated:
-WebPageTitle = Title:
-WebPageURL = URL:
-WebPageAskDisplay = Would you like to display it?
-WebPageAskStopOption = Stop checking for updates on this web page
-
-pleaseEnterALocation = Please enter a location
-pleaseEnterADuration = Please enter a duration.
-pleaseSelectANotification = Please enter at least one notification method.
-
-SortMenuItem = Sorted by %NAME%
-
-ShortFindTitle = Find: '%S'
-FindTitle = Find: %S %S '%S' in %S
-
-ImportedIEFavorites = Imported IE Favorites                                     
-ImportedIEStaticFavorites = Imported IE Favorites
-ImportedNetPositiveBookmarks = Imported NetPositive Bookmarks                   
-DefaultPersonalToolbarFolder = Personal Toolbar Folder                          
-
-SelectImport = Import bookmark file:                                            
-EnterExport = Export bookmark file:                                             
-
-search_button_label = Find
-

mozilla/xpfe/components/bookmarks/resources/locale/en-US/bookmarks.dtd

@@ -1,87 +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 Communicator.
-   - 
-   - The Initial Developer of the Original Code is Netscape
-   - Communications Corp. Portions created by Netscape Communications
-   - Corp. are Copyright (C) 1999 Netscape Communications Corp. All
-   - Rights Reserved.
-   - 
-   - Contributor(s):
-   -   Stephen Lamm <slamm@netscape.com>
-   -   Blake Ross <blakeross@telocity.com>
-  --> 
-
-<!-- extracted from ./bookmarks.xul -->
-<!ENTITY menuBar.tooltip               "Menu Bar">
-<!ENTITY bookmarkToolbar.tooltip       "Bookmark Toolbar">
-<!ENTITY menuitem.newBookmark.label    "Bookmark">
-<!ENTITY command.newBookmark.accesskey "B">
-<!ENTITY menuitem.newFolder.label      "Folder">
-<!ENTITY button.newFolder.label        "New Folder">
-<!ENTITY command.newFolder.accesskey   "F">
-<!ENTITY menuitem.newSeparator.label   "Separator">
-<!ENTITY button.newSeparator.label     "New Separator">
-<!ENTITY command.newSeparator.accesskey "S">
-<!ENTITY menuitem.import.label         "Import...">
-<!ENTITY menuitem.import.accesskey     "i">
-<!ENTITY menuitem.export.label         "Export...">
-<!ENTITY menuitem.export.accesskey     "e">
-<!ENTITY menuitem.find.label           "Search Bookmarks...">
-<!ENTITY command.findBookmarks.label   "Search...">
-<!ENTITY menuitem.find.accesskey       "S">
-<!ENTITY edit.find.keybinding          "f">
-<!ENTITY command.properties.label      "Properties...">
-<!ENTITY command.properties.accesskey  "r">
-<!ENTITY edit.properties.keybinding    "i">
-<!ENTITY command.rename.label          "Rename...">
-<!ENTITY command.delete.label          "Delete">
-<!ENTITY command.fileBookmark.label    "File Bookmark(s)...">
-<!ENTITY command.fileBookmark.accesskey "l">
-<!ENTITY command.addBookmark.label     "Add...">
-<!ENTITY command.manageBookmarks.label "Manage">
-
-
-<!ENTITY menuitem.view.command.toolbar.label        "Toolbar">
-<!ENTITY menuitem.view.command.toolbar.accesskey    "t">
-<!ENTITY menuitem.view.unsorted.label               "Unsorted">
-<!ENTITY menuitem.view.unsorted.accesskey           "u">
-<!ENTITY menuitem.view.ascending.label              "A > Z Sort Order">
-<!ENTITY menuitem.view.ascending.accesskey          "a">
-<!ENTITY menuitem.view.descending.label             "Z > A Sort Order">
-<!ENTITY menuitem.view.descending.accesskey         "z">
-<!ENTITY menuitem.view.show_columns.label           "Show columns">
-<!ENTITY menuitem.view.show_columns.accesskey       "S">
-<!ENTITY menuitem.newbookmarkfolder.label           "Set as New Bookmark Folder">
-<!ENTITY menuitem.newbookmarkfolder.accesskey       "b">
-<!ENTITY menuitem.newinternetsearchfolder.label     "Set as New Internet Search Folder">
-<!ENTITY menuitem.newinternetsearchfolder.accesskey "i">
-<!ENTITY menuitem.personaltoolbarfolder.label       "Set as Personal Toolbar Folder">
-<!ENTITY menuitem.personaltoolbarfolder.accesskey   "p">
-
-<!ENTITY treecol.name.label             "Name">
-<!ENTITY treecol.name.accesskey         "n">
-<!ENTITY treecol.url.label              "Location">
-<!ENTITY treecol.url.accesskey          "l">
-<!ENTITY treecol.shortcut.label         "Keyword">
-<!ENTITY treecol.shortcut.accesskey     "k">
-<!ENTITY treecol.addedon.label          "Added">
-<!ENTITY treecol.addedon.accesskey      "a">
-<!ENTITY treecol.lastmod.label          "Last Modified">
-<!ENTITY treecol.lastmod.accesskey      "m">
-<!ENTITY treecol.lastvisit.label        "Last Visited">
-<!ENTITY treecol.lastvisit.accesskey    "b">
-<!ENTITY treecol.description.label      "Description">
-<!ENTITY treecol.description.accesskey  "d">
-
-<!ENTITY bookmarksWindowTitle.label     "Bookmark Manager">
-

mozilla/xpfe/components/bookmarks/resources/locale/en-US/bookmarksOverlay.dtd

@@ -1,22 +0,0 @@
-
-<!ENTITY  findABookmark.label               "Find a Bookmark...">
-<!ENTITY  findABookmark.accesskey           "f">
-<!ENTITY  newBookmark.label                 "New Bookmark...">
-<!ENTITY  newBookmark.accesskey             "n">
-<!ENTITY  newFolder.label                   "New Folder...">
-<!ENTITY  newFolder.accesskey               "e">
-<!ENTITY  newSeparator.label                "New Separator">
-<!ENTITY  newSeparator.accesskey            "s">
-<!ENTITY  setAsNewBookmarkFolder.label      "Set as new Bookmark folder">
-<!ENTITY  setAsNewBookmarkFolder.accesskey  "b">
-<!ENTITY  setAsNewSearchFolder.label        "Set as new Search Results folder">
-<!ENTITY  setAsNewSearchFolder.accesskey    "r">
-<!ENTITY  setAsNewToolbarFolder.label       "Set as new Personal Toolbar folder">
-<!ENTITY  setAsNewToolbarFolder.accesskey   "p">
-<!ENTITY  exportBookmarks.label             "Export...">
-<!ENTITY  exportBookmarks.accesskey         "x">
-<!ENTITY  importBookmarks.label             "Import...">
-<!ENTITY  importBookmarks.accesskey         "i">
-
-
-