Synchronizing with MOZILLA_0_9_4_BRANCH

git-svn-id: svn://10.0.0.236/branches/MAPI_SUPP_BRANCH@106605 18797224-902f-48f8-a5cc-f745e15eee43
Fix for Bug #102392 . Refined COM code detect whether mozilla is running or
2001-10-30 00:24:45 +00:00 · 2001-10-10 22:37:02 +00:00 · 2001-10-09 00:24:46 +00:00 · 2001-10-05 21:57:28 +00:00 · 2001-10-05 01:05:16 +00:00 · 2001-10-04 00:20:04 +00:00
97 changed files with 8123 additions and 12439 deletions
--- a/mozilla/mailnews/base/public/nsIMapiRegistry.idl
+++ b/mozilla/mailnews/base/public/nsIMapiRegistry.idl
@@ -0,0 +1,78 @@
+/* ***** 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):
+ * Srilatha Moturi <srilatha@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"
+
+interface nsIDOMWindow;
+
+/**
+ * This interface provides support for registering Mozilla as the default
+ * Mail Client. This interface can also be used to get/set the user preference
+ * for the default Mail Client.
+ * 
+ */
+[scriptable, uuid(c5be14ba-4e0a-4eec-a1b8-04363761d63c)]
+interface nsIMapiRegistry: nsISupports {
+
+   /** This is set to TRUE if Mozilla is the default Application
+    */
+   readonly attribute boolean isDefaultMailClient;
+
+   /** This is set TRUE only once per session.
+    */
+   readonly attribute boolean showDialog;
+
+   /** This will update the registry keys to set Mozilla as default Mail Client.
+    */
+   void setDefaultMailClient();
+
+   /** This will reset the registry keys for the default Mail Client.
+    */
+   void unsetDefaultMailClient();
+
+   /** This will bring the dialog asking the user if he/she wants to set
+    * Mozilla as default Mail Client.
+    * Call this only if Mozilla is not the default Mail client
+    */
+   void showMailIntegrationDialog(in nsIDOMWindow parentWindow);
+   
+};
+
+%{C++
+#define NS_IMAPIWINHOOK_CONTRACTID    "@mozilla.org/mapiregistry;1"
+#define NS_IMAPIWINHOOK_CLASSNAME "Mozilla MAPI Registry"
+%}
--- a/mozilla/mailnews/mapi/MapiSuppReadMe.htm
+++ b/mozilla/mailnews/mapi/MapiSuppReadMe.htm
@@ -0,0 +1,57 @@
+<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<html>
+<head>
+   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+   <meta name="Generator" content="Microsoft Word 97">
+   <meta name="GENERATOR" content="Mozilla/4.7 [en] (WinNT; U) [Netscape]">
+</head>
+<body>
+
+<blockquote><b><u><font face="Arial"><font size=+0>Instruction for using
+the ‘MAPI_SUPP_BRANCH’ for the Mapi Support feature</font></font></u></b></blockquote>
+
+<ol>
+<li>
+<font face="Arial"><font size=+0>Get the latest 0.94 branch or the the
+trunk and build it</font></font></li>
+</ol>
+
+<ol>
+<li>
+<font face="Arial"><font size=+0>Now go to the dir where u have mozilla
+and get the branch from Mapi, do :</font></font></li>
+</ol>
+<font face="Arial"><font size=+0>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+"cvs co -rMAPI_SUPP_BRANCH mozilla/mailnews/mapi".</font></font>
+<p><font face="Arial"><font size=+0>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+This will get the latest branch for mapi support. The branch MAPI_SUPP_BRANCH
+for mapi support is NOT the full tree,</font></font>
+<br><i><font face="Arial"><font size=+0>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+it is just the mapi&nbsp; dir within mozilla/mailnews.</font></font></i>
+<ol>
+<li>
+<font face="Arial"><font size=+0>Go to mozilla/mailnews/mapi, build the
+mapi dir : 'nmake -f makefile.win'.&nbsp; This completes the building part.</font></font></li>
+</ol>
+
+<ol>
+<li>
+<font face="Arial"><font size=+0>Now run mozilla from your build. Go to
+menuitem Edit/Preferences, this will&nbsp; bring up the Preferences dialog.
+Go to category Mail &amp; NewsGroups. In the General setting section u
+will see the checkbox 'Use Mozilla Mail as the default mail application.'
+Check the checkbox to enable the MAPI support in Mozilla and close the
+Prefs dialog.</font></font></li>
+</ol>
+
+<ol>
+<li>
+<font face="Arial"><font size=+0>You are now ready to test the mozilla's
+MAPI support. Run Word, WordPad, Powerpoint, or Excel. Open a document
+in the app and do File/Send from the app. You should see the Mozilla mailnews
+compose window come up with your document attached to the opened mail.
+Type in the recipients (To, Cc, etc) and send the mail.</font></font></li>
+</ol>
+
+</body>
+</html>
--- a/mozilla/mailnews/mapi/build/MapiProxy.def
+++ b/mozilla/mailnews/mapi/build/MapiProxy.def
@@ -0,0 +1,47 @@
+; ***** 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         MapiProxy.dll
+DESCRIPTION     'Proxy/Stub DLL'
+
+EXPORTS
+                DllGetClassObject   @1  PRIVATE
+                DllCanUnloadNow     @2  PRIVATE
+                GetProxyDllInfo     @3  PRIVATE
+                DllRegisterServer   @4  PRIVATE
+                DllUnregisterServer @5  PRIVATE
+
+
--- a/mozilla/mailnews/mapi/build/makefile.win
+++ b/mozilla/mailnews/mapi/build/makefile.win
@@ -0,0 +1,68 @@
+# ***** 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           = MapiProxy
+EXPORT_LIBRARY   = $(MODULE)
+LIBRARY_NAME     = $(MODULE)
+DEFFILE          = MapiProxy.def
+
+include <$(DEPTH)\config\config.mak>
+
+##################################################################
+
+LCFLAGS=-DREGISTER_PROXY_DLL -DUNICODE -D_UNICODE
+
+OBJS= .\$(OBJDIR)\dlldata.obj   \
+    .\$(OBJDIR)\msgMapi_p.obj     \
+    .\$(OBJDIR)\msgMapi_i.obj   \
+    $(NULL)
+
+WIN_LIBS= rpcrt4.lib
+
+EXPORTS= msgMapi.h  \
+     $(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+msgMapi.h msgMapi_p.c msgMapi_i.c dlldata.c : msgMapi.idl
+    midl $(UNICODE_FLAGS) msgMapi.idl
+
+clobber::
+	rm -f dlldata.c msgMapi_i.c msgMapi_p.c msgMapi.h
+
+
--- a/mozilla/mailnews/mapi/build/msgMapi.idl
+++ b/mozilla/mailnews/mapi/build/msgMapi.idl
@@ -0,0 +1,114 @@
+/* ***** 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 ***** */
+
+// This idl will be compiled by MIDL.  MS-COM is used 
+// as brdige between MAPI clients and the Mozilla.
+
+import "unknwn.idl";
+
+typedef wchar_t LOGIN_PW_TYPE[256];
+
+typedef struct
+{
+    unsigned long     ulReserved;            
+    unsigned long     flFlags;               /* Flags */
+    unsigned long     nPosition_NotUsed;     /* character in text to be replaced by attachment */
+    LPTSTR            lpszPathName;          /* Full path name including file name */
+    LPTSTR            lpszFileName;          /* Real (original) file name */
+    unsigned char *   lpFileType_NotUsed ;
+} nsMapiFileDesc, * lpnsMapiFileDesc;
+
+
+typedef struct
+{
+    unsigned long      ulReserved;           
+    unsigned long      ulRecipClass;  /* MAPI_TO, MAPI_CC, MAPI_BCC, MAPI_ORIG    */
+    LPTSTR             lpszName;      /* Recipient name to display */
+    LPTSTR             lpszAddress;   /* Recipient email address */
+    unsigned long      ulEIDSize_NotUsed;     
+    unsigned char  *   lpEntryID_NotUsed ;
+} nsMapiRecipDesc, * lpnsMapiRecipDesc;
+
+typedef struct
+{
+    unsigned long    ulReserved;					
+    LPTSTR           lpszSubject;  /* Message Subject */
+    LPTSTR           lpszNoteText; /* Message Text */
+    LPTSTR           lpszMessageType_NotUsed;		
+    LPTSTR           lpszDateReceived_notUsed;	 /* in YYYY/MM/DD HH:MM format */
+    LPTSTR           lpszConversationID_NotUsed; /* conversation thread ID */
+    unsigned long    flFlags; /* unread,return receipt */
+    lpnsMapiRecipDesc  lpOriginator;  /* Originator descriptor  */
+    unsigned long      nRecipCount;   /* Number of recipients   */
+    lpnsMapiRecipDesc  lpRecips;      /* Recipient descriptors  */
+    unsigned long      nFileCount;    /* # of file attachments  */
+    lpnsMapiFileDesc   lpFiles;       /* Attachment descriptors */
+} nsMapiMessage, * lpnsMapiMessage;
+
+
+[
+    object,
+    uuid(6EDCD38E-8861-11d5-A3DD-00B0D0F3BAA7),
+    helpstring("nsIMapi Inteface"),
+    pointer_default(unique)
+]
+
+interface nsIMapi : IUnknown
+{
+    HRESULT Login(unsigned long aUIArg, LOGIN_PW_TYPE aLogin,
+                  LOGIN_PW_TYPE aPassWord, unsigned long aFlags,
+                  [out] unsigned long *aSessionId);
+
+    HRESULT Initialize();
+    HRESULT IsValid();
+    HRESULT IsValidSession([in] unsigned long aSession);
+
+    HRESULT SendMail([in] unsigned long aSession, [in] lpnsMapiMessage aMessage,
+                  [in] short aRecipCount, [in, size_is(aRecipCount)] lpnsMapiRecipDesc aRecips, 
+                  [in] short aFileCount, [in, size_is(aFileCount)] lpnsMapiFileDesc aFiles, 
+                  [in] unsigned long aFlags, [in] unsigned long aReserved) ;
+
+    HRESULT SendDocuments( [in] unsigned long aSession, 
+                  [in] LPTSTR aDelimChar, [in] LPTSTR aFilePaths,
+                  [in] LPTSTR aFileNames, [in] ULONG aFlags ) ;
+
+    HRESULT Logoff (unsigned long aSession);
+    HRESULT CleanUp();
+};
+
+
+
--- a/mozilla/mailnews/mapi/makefile.win
+++ b/mozilla/mailnews/mapi/makefile.win
@@ -1,4 +1,4 @@
-# 
+# !nmake
 # The contents of this file are subject to the Mozilla Public
 # License Version 1.1 (the "License"); you may not use this file
 # except in compliance with the License. You may obtain a copy of
@@ -17,12 +17,11 @@
 # Rights Reserved.
 # 
 # Contributor(s): 
-# Srilatha Moturi <srilatha@netscape.com>
 # Krishna Mohan Khandrika <kkhandrika@netscape.com>
 #

 DEPTH=..\..

-DIRS=mapihook resources mapiDll
+DIRS=build mapiDll mapihook resources registry

 include <$(DEPTH)\config\rules.mak>
--- a/mozilla/mailnews/mapi/mapiDll/makefile.win
+++ b/mozilla/mailnews/mapi/mapiDll/makefile.win
@@ -41,18 +41,11 @@ 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
--- a/mozilla/mailnews/mapi/mapihook/build/MapiProxy.def
+++ b/mozilla/mailnews/mapi/mapihook/build/MapiProxy.def
@@ -0,0 +1,47 @@
+; ***** 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         MapiProxy.dll
+DESCRIPTION     'Proxy/Stub DLL'
+
+EXPORTS
+                DllGetClassObject   @1  PRIVATE
+                DllCanUnloadNow     @2  PRIVATE
+                GetProxyDllInfo     @3  PRIVATE
+                DllRegisterServer   @4  PRIVATE
+                DllUnregisterServer @5  PRIVATE
+
+
--- a/mozilla/mailnews/mapi/mapihook/build/makefile.win
+++ b/mozilla/mailnews/mapi/mapihook/build/makefile.win
@@ -0,0 +1,68 @@
+# ***** 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           = MapiProxy
+EXPORT_LIBRARY   = $(MODULE)
+LIBRARY_NAME     = $(MODULE)
+DEFFILE          = MapiProxy.def
+
+include <$(DEPTH)\config\config.mak>
+
+##################################################################
+
+LCFLAGS=-DREGISTER_PROXY_DLL -DUNICODE -D_UNICODE
+
+OBJS= .\$(OBJDIR)\dlldata.obj   \
+    .\$(OBJDIR)\msgMapi_p.obj     \
+    .\$(OBJDIR)\msgMapi_i.obj   \
+    $(NULL)
+
+WIN_LIBS= rpcrt4.lib
+
+EXPORTS= msgMapi.h  \
+     $(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+msgMapi.h msgMapi_p.c msgMapi_i.c dlldata.c : msgMapi.idl
+    midl $(UNICODE_FLAGS) msgMapi.idl
+
+clobber::
+	rm -f dlldata.c msgMapi_i.c msgMapi_p.c msgMapi.h
+
+
--- a/mozilla/mailnews/mapi/mapihook/build/msgMapi.idl
+++ b/mozilla/mailnews/mapi/mapihook/build/msgMapi.idl
@@ -0,0 +1,114 @@
+/* ***** 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 ***** */
+
+// This idl will be compiled by MIDL.  MS-COM is used 
+// as brdige between MAPI clients and the Mozilla.
+
+import "unknwn.idl";
+
+typedef wchar_t LOGIN_PW_TYPE[256];
+
+typedef struct
+{
+    unsigned long     ulReserved;            
+    unsigned long     flFlags;               /* Flags */
+    unsigned long     nPosition_NotUsed;     /* character in text to be replaced by attachment */
+    LPTSTR            lpszPathName;          /* Full path name including file name */
+    LPTSTR            lpszFileName;          /* Real (original) file name */
+    unsigned char *   lpFileType_NotUsed ;
+} nsMapiFileDesc, * lpnsMapiFileDesc;
+
+
+typedef struct
+{
+    unsigned long      ulReserved;           
+    unsigned long      ulRecipClass;  /* MAPI_TO, MAPI_CC, MAPI_BCC, MAPI_ORIG    */
+    LPTSTR             lpszName;      /* Recipient name to display */
+    LPTSTR             lpszAddress;   /* Recipient email address */
+    unsigned long      ulEIDSize_NotUsed;     
+    unsigned char  *   lpEntryID_NotUsed ;
+} nsMapiRecipDesc, * lpnsMapiRecipDesc;
+
+typedef struct
+{
+    unsigned long    ulReserved;					
+    LPTSTR           lpszSubject;  /* Message Subject */
+    LPTSTR           lpszNoteText; /* Message Text */
+    LPTSTR           lpszMessageType_NotUsed;		
+    LPTSTR           lpszDateReceived_notUsed;	 /* in YYYY/MM/DD HH:MM format */
+    LPTSTR           lpszConversationID_NotUsed; /* conversation thread ID */
+    unsigned long    flFlags; /* unread,return receipt */
+    lpnsMapiRecipDesc  lpOriginator;  /* Originator descriptor  */
+    unsigned long      nRecipCount;   /* Number of recipients   */
+    lpnsMapiRecipDesc  lpRecips;      /* Recipient descriptors  */
+    unsigned long      nFileCount;    /* # of file attachments  */
+    lpnsMapiFileDesc   lpFiles;       /* Attachment descriptors */
+} nsMapiMessage, * lpnsMapiMessage;
+
+
+[
+    object,
+    uuid(6EDCD38E-8861-11d5-A3DD-00B0D0F3BAA7),
+    helpstring("nsIMapi Inteface"),
+    pointer_default(unique)
+]
+
+interface nsIMapi : IUnknown
+{
+    HRESULT Login(unsigned long aUIArg, LOGIN_PW_TYPE aLogin,
+                  LOGIN_PW_TYPE aPassWord, unsigned long aFlags,
+                  [out] unsigned long *aSessionId);
+
+    HRESULT Initialize();
+    HRESULT IsValid();
+    HRESULT IsValidSession([in] unsigned long aSession);
+
+    HRESULT SendMail([in] unsigned long aSession, [in] lpnsMapiMessage aMessage,
+                  [in] short aRecipCount, [in, size_is(aRecipCount)] lpnsMapiRecipDesc aRecips, 
+                  [in] short aFileCount, [in, size_is(aFileCount)] lpnsMapiFileDesc aFiles, 
+                  [in] unsigned long aFlags, [in] unsigned long aReserved) ;
+
+    HRESULT SendDocuments( [in] unsigned long aSession, 
+                  [in] LPTSTR aDelimChar, [in] LPTSTR aFilePaths,
+                  [in] LPTSTR aFileNames, [in] ULONG aFlags ) ;
+
+    HRESULT Logoff (unsigned long aSession);
+    HRESULT CleanUp();
+};
+
+
+
--- a/mozilla/mailnews/mapi/mapihook/makefile.win
+++ b/mozilla/mailnews/mapi/mapihook/makefile.win
@@ -1,26 +1,77 @@
-#!nmake
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 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/
+# 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.
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
 #
-# The Original Code is mozilla.org code.
+# The Original Code is Mozilla.
 #
-# 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.
+# 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):  kkhandrika@netscape.com
+# Contributor(s):  Srilatha Moturi (srilatha@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=..\..\..

-DIRS= build public src
+MODULE          = msgMapi
+EXPORT_LIBRARY  = $(MODULE)
+LIBRARY_NAME    = $(MODULE)
+
+include <$(DEPTH)\config\config.mak>
+############################################################################
+
+REQUIRES        = xpcom \
+                  string \
+                  $(NULL)
+
+LCFLAGS=-DUNICODE -D_UNICODE
+
+OBJS=   \
+    ..\build\$(OBJDIR)\msgMapi_i.obj    \
+    .\$(OBJDIR)\msgMapiFactory.obj  \
+    .\$(OBJDIR)\msgMapiHook.obj \
+    .\$(OBJDIR)\msgMapiImp.obj  \
+    .\$(OBJDIR)\msgMapiMain.obj \
+    .\$(OBJDIR)\msgMapiSupport.obj  \
+    $(NULL)
+
+LLIBS=                               \
+ $(DIST)\lib\xpcom.lib               \
+ $(DIST)\lib\msgbsutl.lib            \
+ $(LIBNSPR)                          \
+ $(NULL)
+
+WIN_LIBS= ole32.lib
+
+EXPORTS=    \
+    msgMapiFactory.h    \
+    msgMapiHook.h   \
+    msgMapiImp.h    \
+    msgMapiMain.h   \
+    msgMapiSupport.h    \
+    $(NULL)

 include <$(DEPTH)\config\rules.mak>
--- a/mozilla/mailnews/mapi/mapihook/msgMapiFactory.cpp
+++ b/mozilla/mailnews/mapi/mapihook/msgMapiFactory.cpp
@@ -0,0 +1,121 @@
+/* ***** 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 ***** */
+
+#undef UNICODE
+#undef _UNICODE
+
+#include "msgMapiFactory.h"
+#include "msgMapiImp.h"
+#include "msgMapi.h"
+
+const CLSID CLSID_nsMapiImp = {0x29f458be, 0x8866, 0x11d5, {0xa3, 0xdd, 0x0, 0xb0, 0xd0, 0xf3, 0xba, 0xa7}};
+
+
+nsMapiFactory::nsMapiFactory()
+: m_cRef(1)
+{
+}
+
+nsMapiFactory::~nsMapiFactory()
+{
+}
+
+STDMETHODIMP nsMapiFactory::QueryInterface(const IID& aIid, void** aPpv)
+{    
+    if ((aIid == IID_IUnknown) || (aIid == IID_IClassFactory))
+    {
+        *aPpv = static_cast<IClassFactory*>(this); 
+    }
+    else
+    {
+        *aPpv = nsnull;
+        return E_NOINTERFACE;
+    }
+    reinterpret_cast<IUnknown*>(*aPpv)->AddRef();
+    return S_OK;
+}
+
+STDMETHODIMP_(ULONG) nsMapiFactory::AddRef()
+{
+    return (PR_AtomicIncrement(&m_cRef));
+}
+
+STDMETHODIMP_(ULONG) nsMapiFactory::Release() 
+{
+    PRInt32 temp;
+    temp = PR_AtomicDecrement(&m_cRef);
+    if (m_cRef == 0)
+    {
+        delete this;
+        return 0;
+    }
+
+    return temp;
+}
+
+STDMETHODIMP nsMapiFactory::CreateInstance(IUnknown* aUnknownOuter,
+                                           const IID& aIid,
+                                           void** aPpv) 
+{
+    // Cannot aggregate.
+
+    if (aUnknownOuter != nsnull)
+    {
+        return CLASS_E_NOAGGREGATION ;
+    }
+
+    // Create component.
+
+    nsMapiImp* pImp = new nsMapiImp();
+    if (pImp == nsnull)
+    {
+        return E_OUTOFMEMORY ;
+    }
+
+    // Get the requested interface.
+    HRESULT hr = pImp->QueryInterface(aIid, aPpv);
+
+    // Release the IUnknown pointer.
+    // (If QueryInterface failed, component will delete itself.)
+
+    pImp->Release();
+    return hr;
+}
+
+STDMETHODIMP nsMapiFactory::LockServer(PRBool aLock) 
+{
+    return S_OK ;
+}
--- a/mozilla/mailnews/mapi/mapihook/msgMapiFactory.h
+++ b/mozilla/mailnews/mapi/mapihook/msgMapiFactory.h
@@ -0,0 +1,69 @@
+/* ***** 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 MSG_MAPI_FACTORY_H
+#define MSG_MAPI_FACTORY_H
+
+#include <windows.h>
+#include <objbase.h>
+#include "nspr.h"
+
+
+class nsMapiFactory : public IClassFactory
+{
+public :
+
+    // IUnknown
+
+    STDMETHODIMP            QueryInterface (REFIID aIid, void** aPpv);
+    STDMETHODIMP_(ULONG)    AddRef(void);
+    STDMETHODIMP_(ULONG)    Release(void);
+
+    // IClassFactory
+
+    STDMETHODIMP        CreateInstance (LPUNKNOWN aUnkOuter, REFIID aIid, void **aPpv);
+    STDMETHODIMP        LockServer (BOOL aLock);
+
+    nsMapiFactory();
+    ~nsMapiFactory();
+
+private :
+
+    PRInt32 m_cRef;
+};
+
+#endif  // MSG_MAPI_FACTORY_H
+
--- a/mozilla/mailnews/mapi/mapihook/msgMapiHook.cpp
+++ b/mozilla/mailnews/mapi/mapihook/msgMapiHook.cpp
@@ -0,0 +1,842 @@
+/* ***** 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): Srilatha Moturi (srilatha@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 ***** */
+
+#define MAPI_STARTUP_ARG       "/MAPIStartUp"
+
+#define MAPI_STARTUP_ARG       "/MAPIStartUp"
+
+#include <mapidefs.h>
+#include <mapi.h>
+
+#include "nsCOMPtr.h"
+#include "nsIComponentManager.h"
+#include "nsIServiceManager.h"
+#include "nsISupports.h"
+#include "nsIPromptService.h"
+#include "nsAppShellCIDs.h"
+#include "nsIDOMWindowInternal.h"
+#include "nsIAppShellService.h"
+#include "nsINativeAppSupport.h"
+#include "nsICmdLineService.h"
+#include "nsIProfileInternal.h"
+#include "nsIMsgAccountManager.h"
+#include "nsIDOMWindowInternal.h"
+#include "nsXPIDLString.h"
+#include "nsReadableUtils.h"
+#include "nsMsgBaseCID.h"
+#include "nsIStringBundle.h"
+#include "nsIPref.h"
+#include "nsString.h"
+
+#include "nsIMsgCompFields.h"
+#include "nsIMsgComposeParams.h"
+#include "nsIMsgCompose.h"
+#include "nsMsgCompCID.h"
+#include "nsIMsgSend.h"
+#include "nsIProxyObjectManager.h"
+#include "nsIMsgComposeService.h"
+#include "nsProxiedService.h"
+#include "nsSpecialSystemDirectory.h"
+#include "nsMsgI18N.h"
+
+#include "msgMapi.h"
+#include "msgMapiHook.h"
+#include "msgMapiSupport.h"
+#include "msgMapiMain.h"
+
+static NS_DEFINE_CID(kCmdLineServiceCID, NS_COMMANDLINE_SERVICE_CID);
+
+#define MAPI_PROPERTIES_CHROME  "chrome://messenger/locale/mapi.properties"
+#define PREF_MAPI_WARN_PRIOR_TO_BLIND_SEND "mapi.blind-send.warn"
+#define PREF_MAPI_BLIND_SEND_ENABLED       "mapi.blind-send.enabled"
+
+class nsMAPISendListener : public nsIMsgSendListener
+{
+public:
+
+    virtual ~nsMAPISendListener() { }
+
+    // nsISupports interface
+    NS_DECL_ISUPPORTS
+
+    /* void OnStartSending (in string aMsgID, in PRUint32 aMsgSize); */
+    NS_IMETHOD OnStartSending(const char *aMsgID, PRUint32 aMsgSize) { return NS_OK; }
+
+    /* void OnProgress (in string aMsgID, in PRUint32 aProgress, in PRUint32 aProgressMax); */
+    NS_IMETHOD OnProgress(const char *aMsgID, PRUint32 aProgress, PRUint32 aProgressMax) { return NS_OK;}
+
+    /* void OnStatus (in string aMsgID, in wstring aMsg); */
+    NS_IMETHOD OnStatus(const char *aMsgID, const PRUnichar *aMsg) { return NS_OK;}
+
+    /* void OnStopSending (in string aMsgID, in nsresult aStatus, in wstring aMsg, in nsIFileSpec returnFileSpec); */
+    NS_IMETHOD OnStopSending(const char *aMsgID, nsresult aStatus, const PRUnichar *aMsg, 
+                           nsIFileSpec *returnFileSpec) {
+#ifdef RAJIV_DEBUG 
+        printf("Sending Done - OnStopSending \n");
+#endif
+        m_done = PR_TRUE;
+        return NS_OK ;
+    }
+
+    /* void OnGetDraftFolderURI (); */
+    NS_IMETHOD OnGetDraftFolderURI(const char *aFolderURI) {return NS_OK;}
+
+    static nsresult CreateMAPISendListener( nsIMsgSendListener **ppListener);
+
+    PRBool IsDone() { return m_done ; }
+
+protected :
+    nsMAPISendListener() {
+        NS_INIT_REFCNT(); 
+        m_done = PR_FALSE;
+    }
+
+    PRBool          m_done;
+};
+
+
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsMAPISendListener, nsIMsgSendListener)
+
+nsresult nsMAPISendListener::CreateMAPISendListener( nsIMsgSendListener **ppListener)
+{
+    NS_ENSURE_ARG_POINTER(ppListener) ;
+
+    *ppListener = new nsMAPISendListener();
+    if (! *ppListener)
+        return NS_ERROR_OUT_OF_MEMORY;
+
+    NS_ADDREF(*ppListener);
+    return NS_OK;
+}
+
+PRBool nsMapiHook::isMapiService = PR_FALSE;
+
+PRBool nsMapiHook::Initialize()
+{
+    nsresult rv;
+    nsCOMPtr<nsINativeAppSupport> native;
+
+    nsCOMPtr<nsICmdLineService> cmdLineArgs(do_GetService(kCmdLineServiceCID, &rv));
+    if (NS_FAILED(rv)) return PR_FALSE;
+
+    nsCOMPtr<nsIAppShellService> appShell (do_GetService( "@mozilla.org/appshell/appShellService;1", &rv));
+    if (NS_FAILED(rv)) return PR_FALSE;
+
+    rv = appShell->GetNativeAppSupport( getter_AddRefs( native ));
+    if (NS_FAILED(rv)) return PR_FALSE;
+
+    rv = native->EnsureProfile(cmdLineArgs);
+    if (NS_FAILED(rv)) return PR_FALSE;
+
+    return PR_TRUE;
+}
+
+void nsMapiHook::CleanUp()
+{
+    // This routine will be fully implemented in future
+    // to cleanup mapi related stuff inside mozilla code.
+}
+
+PRBool nsMapiHook::DisplayLoginDialog(PRBool aLogin, PRUnichar **aUsername, \
+                      PRUnichar **aPassword)
+{
+    nsresult rv;
+    PRBool btnResult = PR_FALSE;
+
+    nsCOMPtr<nsIAppShellService> appShell(do_GetService( "@mozilla.org/appshell/appShellService;1", &rv));
+    if (NS_FAILED(rv) || !appShell) return PR_FALSE;
+   
+    nsCOMPtr<nsIPromptService> dlgService(do_GetService("@mozilla.org/embedcomp/prompt-service;1", &rv));
+    if (NS_SUCCEEDED(rv) && dlgService)
+    {
+        nsCOMPtr<nsIStringBundleService> bundleService(do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv));
+        if (NS_FAILED(rv) || !bundleService) return PR_FALSE;
+
+        nsCOMPtr<nsIStringBundle> bundle;
+        rv = bundleService->CreateBundle(MAPI_PROPERTIES_CHROME, getter_AddRefs(bundle));
+        if (NS_FAILED(rv) || !bundle) return PR_FALSE;
+
+        nsCOMPtr<nsIStringBundle> brandBundle;
+        rv = bundleService->CreateBundle(
+                        "chrome://global/locale/brand.properties",
+                        getter_AddRefs(brandBundle));
+        if (NS_FAILED(rv)) return PR_FALSE;
+
+        nsXPIDLString brandName;
+        rv = brandBundle->GetStringFromName(
+                           NS_LITERAL_STRING("brandShortName").get(),
+                           getter_Copies(brandName));
+        if (NS_FAILED(rv)) return PR_FALSE;
+        
+        nsXPIDLString loginTitle;
+        const PRUnichar *brandStrings[] = { brandName.get() };
+        NS_NAMED_LITERAL_STRING(loginTitlePropertyTag, "loginTitle");
+        const PRUnichar *dTitlePropertyTag = loginTitlePropertyTag.get();
+        rv = bundle->FormatStringFromName(dTitlePropertyTag, brandStrings, 1,
+                                          getter_Copies(loginTitle));
+        if (NS_FAILED(rv)) return PR_FALSE;
+        
+        if (aLogin)
+        {
+            nsXPIDLString loginText;
+            rv = bundle->GetStringFromName(NS_LITERAL_STRING("loginTextwithName").get(),
+                                           getter_Copies(loginText));
+            if (NS_FAILED(rv) || !loginText) return PR_FALSE;
+
+
+
+            rv = dlgService->PromptUsernameAndPassword(nsnull, loginTitle,
+                                                       loginText, aUsername, aPassword,
+                                                       nsnull, PR_FALSE, &btnResult);
+        }
+        else
+        {
+            //nsString loginString; 
+            nsXPIDLString loginText;
+            const PRUnichar *userNameStrings[] = { *aUsername };
+
+            NS_NAMED_LITERAL_STRING(loginTextPropertyTag, "loginText");
+            const PRUnichar *dpropertyTag = loginTextPropertyTag.get();
+            rv = bundle->FormatStringFromName(dpropertyTag, userNameStrings, 1,
+                                              getter_Copies(loginText));
+            if (NS_FAILED(rv)) return PR_FALSE;
+
+            rv = dlgService->PromptPassword(nsnull, loginTitle, loginText,
+                                            aPassword, nsnull, PR_FALSE, &btnResult);
+        }
+    }            
+
+    return btnResult;
+}
+
+PRBool nsMapiHook::VerifyUserName(const PRUnichar *aUsername, char **aIdKey)
+{
+    nsresult rv;
+
+    if (aUsername == nsnull)
+        return PR_FALSE;
+
+    nsCOMPtr<nsIMsgAccountManager> accountManager(do_GetService(NS_MSGACCOUNTMANAGER_CONTRACTID, &rv));
+    if (NS_FAILED(rv)) return PR_FALSE;
+    nsCOMPtr<nsISupportsArray> identities;
+    rv = accountManager->GetAllIdentities(getter_AddRefs(identities));
+    if (NS_FAILED(rv)) return PR_FALSE;
+    PRUint32 numIndentities;
+    identities->Count(&numIndentities);
+
+    for (PRUint32 i = 0; i < numIndentities; i++)
+    {
+        // convert supports->Identity
+        nsCOMPtr<nsISupports> thisSupports;
+        rv = identities->GetElementAt(i, getter_AddRefs(thisSupports));
+        if (NS_FAILED(rv)) continue;
+        nsCOMPtr<nsIMsgIdentity> thisIdentity(do_QueryInterface(thisSupports, &rv));
+        if (NS_SUCCEEDED(rv) && thisIdentity)
+        {
+            nsXPIDLCString email;
+            rv = thisIdentity->GetEmail(getter_Copies(email));
+            if (NS_FAILED(rv)) continue;
+
+            // get the username from the email and compare with the username
+            nsCAutoString aEmail(email.get());
+            PRInt32 index = aEmail.FindChar('@');
+            if (index != -1)
+                aEmail.Truncate(index);
+
+if (nsDependentString(aUsername) == NS_ConvertASCIItoUCS2(aEmail))  // == overloaded
+                return NS_SUCCEEDED(thisIdentity->GetKey(aIdKey));
+        }
+    }
+
+    return PR_FALSE;
+}
+
+PRBool 
+nsMapiHook::IsBlindSendAllowed()
+{
+    PRBool enabled = PR_FALSE;
+    PRBool warn = PR_TRUE;
+    nsCOMPtr<nsIPref> prefs = do_GetService(NS_PREF_CONTRACTID);
+    if (prefs) {
+	    prefs->GetBoolPref(PREF_MAPI_WARN_PRIOR_TO_BLIND_SEND,&warn);
+            prefs->GetBoolPref(PREF_MAPI_BLIND_SEND_ENABLED,&enabled);
+    } 
+    if (!enabled)
+        return PR_FALSE;
+
+    if (!warn)
+        return PR_TRUE; // Everything is okay.  
+
+    nsresult rv;
+    nsCOMPtr<nsIStringBundleService> bundleService(do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv));
+    if (NS_FAILED(rv) || !bundleService) return PR_FALSE;
+
+    nsCOMPtr<nsIStringBundle> bundle;
+    rv = bundleService->CreateBundle(MAPI_PROPERTIES_CHROME, getter_AddRefs(bundle));
+    if (NS_FAILED(rv) || !bundle) return PR_FALSE;
+
+    nsXPIDLString warningMsg;
+    rv = bundle->GetStringFromName(NS_LITERAL_STRING("mapiBlindSendWarning").get(),
+                                        getter_Copies(warningMsg));
+    if (NS_FAILED(rv)) return PR_FALSE;
+    
+   nsXPIDLString dontShowAgainMessage;
+    rv = bundle->GetStringFromName(NS_LITERAL_STRING("mapiBlindSendDontShowAgain").get(),
+                                        getter_Copies(dontShowAgainMessage));
+    if (NS_FAILED(rv)) return PR_FALSE;
+
+    nsCOMPtr<nsIPromptService> dlgService(do_GetService("@mozilla.org/embedcomp/prompt-service;1", &rv));
+    if (NS_FAILED(rv) || !dlgService) return PR_FALSE;
+    
+    PRBool continueToWarn = PR_TRUE;
+    PRBool okayToContinue = PR_FALSE;
+    dlgService->ConfirmCheck(nsnull, nsnull, warningMsg, dontShowAgainMessage, &continueToWarn, &okayToContinue);
+        
+    if (!continueToWarn && okayToContinue && prefs)
+        prefs->SetBoolPref(PREF_MAPI_WARN_PRIOR_TO_BLIND_SEND,PR_FALSE);
+    
+    return okayToContinue;
+        
+}
+
+// this is used for Send without UI
+nsresult nsMapiHook::BlindSendMail (unsigned long aSession, nsIMsgCompFields * aCompFields) 
+{
+    nsresult rv = NS_OK ;
+
+    if (!IsBlindSendAllowed())
+        return NS_ERROR_FAILURE;
+
+    /** create nsIMsgComposeParams obj and other fields to populate it **/    
+
+    // get parent window
+    nsCOMPtr<nsIAppShellService> appService = do_GetService( "@mozilla.org/appshell/appShellService;1", &rv);
+    if (NS_FAILED(rv)|| (!appService) ) return rv ;
+
+    nsCOMPtr<nsIDOMWindowInternal>  hiddenWindow;
+    rv = appService->GetHiddenDOMWindow(getter_AddRefs(hiddenWindow));
+
+    if ( NS_FAILED(rv) ) return rv ;
+
+    // smtp password and Logged in used IdKey from MapiConfig (session obj)
+    nsMAPIConfiguration * pMapiConfig = nsMAPIConfiguration::GetMAPIConfiguration() ;
+    if (!pMapiConfig) return NS_ERROR_FAILURE ;  // get the singelton obj
+    PRUnichar * password = pMapiConfig->GetPassWord(aSession) ;
+    // password
+    nsCAutoString smtpPassword ;
+    smtpPassword.AssignWithConversion (password) ;
+    // Id key
+    char * MsgIdKey = pMapiConfig->GetIdKey(aSession) ;
+
+    // get the MsgIdentity for the above key using AccountManager
+    nsCOMPtr <nsIMsgAccountManager> accountManager = do_GetService (NS_MSGACCOUNTMANAGER_CONTRACTID) ;
+    if (NS_FAILED(rv) || (!accountManager) ) return rv ;
+
+    nsCOMPtr <nsIMsgIdentity> pMsgId ;
+    rv = accountManager->GetIdentity (MsgIdKey, getter_AddRefs(pMsgId)) ;
+    if (NS_FAILED(rv) ) return rv ;
+
+    // create a send listener to get back the send status
+    nsCOMPtr <nsIMsgSendListener> sendListener ;
+    rv = nsMAPISendListener::CreateMAPISendListener(getter_AddRefs(sendListener)) ; 
+    if (NS_FAILED(rv) || (!sendListener) ) return rv;
+
+    // create the compose params object 
+    nsCOMPtr<nsIMsgComposeParams> pMsgComposeParams (do_CreateInstance(NS_MSGCOMPOSEPARAMS_CONTRACTID, &rv));
+    if (NS_FAILED(rv) || (!pMsgComposeParams) ) return rv ;
+
+    // populate the compose params
+    pMsgComposeParams->SetType(nsIMsgCompType::New);
+    pMsgComposeParams->SetFormat(nsIMsgCompFormat::Default);
+    pMsgComposeParams->SetIdentity(pMsgId);
+    pMsgComposeParams->SetComposeFields(aCompFields); 
+    pMsgComposeParams->SetSendListener(sendListener) ;
+    pMsgComposeParams->SetSmtpPassword(smtpPassword);
+
+    // create the nsIMsgCompose object to send the object
+    nsCOMPtr<nsIMsgCompose> pMsgCompose (do_CreateInstance(NS_MSGCOMPOSE_CONTRACTID, &rv));
+    if (NS_FAILED(rv) || (!pMsgCompose) ) return rv ;
+
+    /** initialize nsIMsgCompose, Send the message, wait for send completion response **/
+
+    rv = pMsgCompose->Initialize(hiddenWindow, pMsgComposeParams) ;
+    if (NS_FAILED(rv)) return rv ;
+
+    pMsgCompose->SendMsg(nsIMsgSend::nsMsgDeliverNow, pMsgId, nsnull) ;
+    if (NS_FAILED(rv)) return rv ;
+
+    // assign to interface pointer from nsCOMPtr to facilitate typecast below
+    nsIMsgSendListener * pSendListener = sendListener ;  
+
+    // we need to wait here to make sure that we return only after send is completed
+    // so we will have a event loop here which will process the events till the Send IsDone.
+    nsCOMPtr<nsIEventQueueService> pEventQService = do_GetService(NS_EVENTQUEUESERVICE_CONTRACTID, &rv);
+    nsCOMPtr<nsIEventQueue> eventQueue;
+    pEventQService->GetThreadEventQueue(NS_CURRENT_THREAD,getter_AddRefs(eventQueue));
+    while ( !((nsMAPISendListener *) pSendListener)->IsDone() )
+        eventQueue->ProcessPendingEvents();
+
+    return rv ;
+}
+
+// this is used to populate comp fields with Unicode data
+nsresult nsMapiHook::PopulateCompFields(lpnsMapiMessage aMessage, 
+                                    nsIMsgCompFields * aCompFields)
+{
+    nsresult rv = NS_OK ;
+
+    if (aMessage->lpOriginator)
+    {
+        PRUnichar * From = aMessage->lpOriginator->lpszAddress ;
+        aCompFields->SetFrom (From) ;
+    }
+
+    nsAutoString To ;
+    nsAutoString Cc ; 
+    nsAutoString Bcc ;
+
+    nsAutoString Comma ;
+    Comma.AssignWithConversion(",");
+
+    if (aMessage->lpRecips)
+    {
+        for (int i=0 ; i < (int) aMessage->nRecipCount ; i++)
+        {
+            if (aMessage->lpRecips[i].lpszAddress)
+            {
+                switch (aMessage->lpRecips[i].ulRecipClass)
+                {
+                case MAPI_TO :
+                    if (To.Length() > 0)
+                        To += Comma ;
+                    To += (PRUnichar *) aMessage->lpRecips[i].lpszAddress ;
+                    break ;
+
+                case MAPI_CC :
+                    if (Cc.Length() > 0)
+                        Cc += Comma ;
+                    Cc += (PRUnichar *) aMessage->lpRecips[i].lpszAddress ; 
+                    break ;
+
+                case MAPI_BCC :
+                    if (Bcc.Length() > 0)
+                        Bcc += Comma ;
+                    Bcc += (PRUnichar *) aMessage->lpRecips[i].lpszAddress ; 
+                    break ;
+                }
+            }
+        }
+    }
+
+    // set To, Cc, Bcc
+    aCompFields->SetTo (To.get()) ;
+    aCompFields->SetCc (Cc.get()) ;
+    aCompFields->SetBcc (Bcc.get()) ;
+
+    // set subject
+    if (aMessage->lpszSubject)
+    {
+        PRUnichar * Subject = aMessage->lpszSubject ;
+        aCompFields->SetSubject(Subject) ;
+    }
+
+    // handle attachments as File URL
+    rv = HandleAttachments (aCompFields, aMessage->nFileCount, aMessage->lpFiles, PR_TRUE) ;
+    if (NS_FAILED(rv)) return rv ;    
+
+    // set body
+    if (aMessage->lpszNoteText)
+    {
+        PRUnichar * Body = aMessage->lpszNoteText ;
+        rv = aCompFields->SetBody(Body) ;
+    }
+
+#ifdef RAJIV_DEBUG
+    // testing what all was set in CompFields
+    printf ("To : %S \n", To.get()) ;
+    printf ("CC : %S \n", Cc.get() ) ;
+    printf ("BCC : %S \n", Bcc.get() ) ;
+#endif
+
+    return rv ;
+
+}
+
+nsresult nsMapiHook::HandleAttachments (nsIMsgCompFields * aCompFields, PRInt32 aFileCount, 
+                                        lpnsMapiFileDesc aFiles, BOOL aIsUnicode)
+{
+    nsresult rv = NS_OK ;
+
+    nsCAutoString Attachments ;
+    nsCAutoString TempFiles ;
+
+    nsCOMPtr <nsILocalFile> pFile = do_CreateInstance (NS_LOCAL_FILE_CONTRACTID, &rv) ;
+    if (NS_FAILED(rv) || (!pFile) ) return rv ;        
+    nsCOMPtr <nsILocalFile> pTempDir = do_CreateInstance (NS_LOCAL_FILE_CONTRACTID, &rv) ;
+    if (NS_FAILED(rv) || (!pTempDir) ) return rv ;        
+
+    for (int i=0 ; i < aFileCount ; i++)
+    {
+        PRBool bTempFile = PR_FALSE ;
+        if (aFiles[i].lpszPathName)
+        {
+            if (aIsUnicode)
+                pFile->InitWithUnicodePath (aFiles[i].lpszPathName) ; 
+            else
+                pFile->InitWithPath ((char *) aFiles[i].lpszPathName) ; 
+            PRBool bExist ;
+            rv = pFile->Exists(&bExist) ;
+            if (NS_FAILED(rv) || (!bExist) ) return NS_ERROR_FILE_TARGET_DOES_NOT_EXIST ;
+
+            // we do this since MS Office apps create a temp file when sending  
+            // the currently open document in that app
+            if (aFiles[i].lpszFileName)
+            {
+                // Win temp Path
+                nsAutoString tempPath ;
+                nsSpecialSystemDirectory tmpDir(nsSpecialSystemDirectory::OS_TemporaryDirectory);
+                ((nsFileSpec*)&tmpDir)->GetNativePathString(tempPath);
+                tempPath.ToLowerCase() ;
+
+                // filename of the file attachment
+                nsXPIDLString pLeafName ;
+                pFile->GetUnicodeLeafName (getter_Copies(pLeafName)) ;
+
+                // dir path of the file attachment
+                nsXPIDLString pPath ;
+                pFile->GetUnicodePath (getter_Copies(pPath)) ;
+                nsAutoString Path ;
+                Path.Assign(pPath.get()) ;
+
+                nsAutoString LeafName ;
+                LeafName.Assign (pLeafName.get());
+                PRInt32 offset = Path.RFind (LeafName) ;
+                Path.SetLength(offset) ;
+                Path.ToLowerCase() ;
+
+                if (tempPath == Path)
+                {
+                    // create another temp dir for mapi within Win temp dir
+                    nsAutoString strTempDir ;
+                    strTempDir += tempPath.get() ; 
+                    strTempDir.AppendWithConversion("moz_mapi") ; 
+                    pTempDir->InitWithUnicodePath (strTempDir.get()) ;
+                    pTempDir->Exists (&bExist) ;
+                    if (!bExist)
+                    {
+                        rv = pTempDir->Create(nsIFile::DIRECTORY_TYPE, 777) ;
+                        if (NS_FAILED(rv)) return rv ;
+                    }
+                    // filename passed for the file attachment
+                    if (aIsUnicode)
+                    {
+                        nsAutoString RealFileName ;
+                        RealFileName.Assign (aFiles[i].lpszFileName) ;
+                        // copy to our mapi temp dir with real name
+                        rv = pFile->CopyToUnicode(pTempDir, RealFileName.get()) ;
+                        if (NS_FAILED(rv)) return rv ;
+                        pFile->InitWithUnicodePath(strTempDir.get()) ;
+                        pFile->AppendUnicode (RealFileName.get()) ;
+                    }
+                    else
+                    {
+                        nsCAutoString asciiRealFileName ;
+                        asciiRealFileName.Assign((char *) aFiles[i].lpszFileName) ;
+                        nsCAutoString asciiLeafName ;
+                        asciiLeafName.AssignWithConversion (pLeafName.get());
+                        // copy to our mapi temp dir with real name
+                        rv = pFile->CopyTo(pTempDir, asciiRealFileName.get()) ;
+                        if (NS_FAILED(rv)) return rv ;
+                        pFile->InitWithUnicodePath(strTempDir.get()) ;
+                        pFile->Append (asciiRealFileName.get()) ;
+                    }
+                    // this one is a temp file
+                    bTempFile = PR_TRUE ;
+                }
+            }
+            // get url 
+            nsXPIDLCString pURL ;
+            pFile->GetURL (getter_Copies(pURL)) ;
+            if (pURL)
+            {
+                if (Attachments.Length() > 0)
+                    Attachments.Append(",") ;
+                Attachments.Append(pURL) ;
+                if (bTempFile)
+                {
+                    if (TempFiles.Length() > 0)
+                        TempFiles.Append(",") ;
+                    TempFiles.Append(pURL) ;
+                }
+            }
+        }
+    }
+    // set attachment
+    if (Attachments.Length() > 0)
+        rv = aCompFields->SetAttachments (Attachments.get());
+    // set temp file
+    if (TempFiles.Length() > 0)
+        rv = aCompFields->SetTemporaryFiles(TempFiles.get());
+
+#ifdef RAJIV_DEBUG
+    printf ("Attachments : %s \n", Attachments.get()) ;
+    printf ("TempFiles : %s \n", TempFiles.get()) ;
+#endif
+
+    return rv ;
+}
+
+
+// this is used to convert non Unicode data and then populate comp fields
+nsresult nsMapiHook::PopulateCompFieldsWithConversion(lpnsMapiMessage aMessage, 
+                                    nsIMsgCompFields * aCompFields)
+{
+    nsresult rv = NS_OK ;
+
+    if (aMessage->lpOriginator)
+    {
+        nsAutoString From ;
+        From.AssignWithConversion((char *) aMessage->lpOriginator->lpszAddress);
+        aCompFields->SetFrom (From.get()) ;
+    }
+
+    nsAutoString To ;
+    nsAutoString Cc ; 
+    nsAutoString Bcc ;
+
+    nsAutoString Comma ;
+    Comma.AssignWithConversion(",");
+
+    if (aMessage->lpRecips)
+    {
+        for (int i=0 ; i < (int) aMessage->nRecipCount ; i++)
+        {
+            if (aMessage->lpRecips[i].lpszAddress)
+            {
+                switch (aMessage->lpRecips[i].ulRecipClass)
+                {
+                case MAPI_TO :
+                    if (To.Length() > 0)
+                        To += Comma ;
+                    To.AppendWithConversion ((char *) aMessage->lpRecips[i].lpszAddress);
+                    break ;
+
+                case MAPI_CC :
+                    if (Cc.Length() > 0)
+                        Cc += Comma ;
+                    Cc.AppendWithConversion ((char *) aMessage->lpRecips[i].lpszAddress); 
+                    break ;
+
+                case MAPI_BCC :
+                    if (Bcc.Length() > 0)
+                        Bcc += Comma ;
+                    Bcc.AppendWithConversion ((char *) aMessage->lpRecips[i].lpszAddress) ; 
+                    break ;
+                }
+            }
+        }
+    }
+    
+    // set To, Cc, Bcc
+    aCompFields->SetTo (To.get()) ;
+    aCompFields->SetCc (Cc.get()) ;
+    aCompFields->SetBcc (Bcc.get()) ;
+
+    nsAutoString platformCharSet;
+    // set subject
+    if (aMessage->lpszSubject)
+    {
+        nsAutoString Subject ;
+        if (platformCharSet.IsEmpty())
+            platformCharSet.Assign(nsMsgI18NFileSystemCharset());
+        rv = ConvertToUnicode(platformCharSet, (char *) aMessage->lpszSubject, Subject);
+        if (NS_FAILED(rv)) return rv ;         
+        aCompFields->SetSubject(Subject.get()) ;
+    }
+
+    // handle attachments as File URL
+    rv = HandleAttachments (aCompFields, aMessage->nFileCount, aMessage->lpFiles, PR_FALSE) ;
+    if (NS_FAILED(rv)) return rv ;    
+
+    // set body
+    if (aMessage->lpszNoteText)
+    {
+        nsAutoString Body ;
+        if (platformCharSet.IsEmpty())
+            platformCharSet.Assign(nsMsgI18NFileSystemCharset());
+        rv = ConvertToUnicode(platformCharSet, (char *) aMessage->lpszNoteText, Body);
+        if (NS_FAILED(rv)) return rv ;
+        rv = aCompFields->SetBody(Body.get()) ;
+    }
+
+#ifdef RAJIV_DEBUG
+    // testing what all was set in CompFields
+    printf ("To : %S \n", To.get()) ;
+    printf ("CC : %S \n", Cc.get() ) ;
+    printf ("BCC : %S \n", Bcc.get() ) ;
+#endif
+
+    return rv ;
+}
+
+// this is used to populate the docs as attachments in the Comp fields for Send Documents
+nsresult nsMapiHook::PopulateCompFieldsForSendDocs(nsIMsgCompFields * aCompFields, ULONG aFlags, 
+                            PRUnichar * aDelimChar, PRUnichar * aFilePaths)
+{
+    nsAutoString strDelimChars ;
+    nsString strFilePaths;
+    nsresult rv = NS_OK ;
+
+    if (aFlags & MAPI_UNICODE)
+    {
+        if (aDelimChar)
+            strDelimChars.Assign (aDelimChar) ;
+        if (aFilePaths)
+            strFilePaths.Assign (aFilePaths) ;
+    }
+	else
+    {
+        if (aDelimChar)
+            strDelimChars.AssignWithConversion ((char*) aDelimChar) ;
+        if (aFilePaths)
+            strFilePaths.AssignWithConversion ((char *) aFilePaths) ;
+    }
+
+    // check for comma in filename 
+    if (strDelimChars.Find (",") == kNotFound)  // if comma is not in the delimiter specified by user
+    {
+        if (strFilePaths.Find(",") != kNotFound) // if comma found in filenames return error
+            return NS_ERROR_FILE_INVALID_PATH ;
+    }
+
+    nsCString Attachments ;
+
+    // only 1 file is to be sent, no delim specified
+    if ((!strDelimChars.Length()) && (strFilePaths.Length()>0))
+    {
+        nsCOMPtr <nsILocalFile> pFile = do_CreateInstance (NS_LOCAL_FILE_CONTRACTID, &rv) ;
+        if (NS_FAILED(rv) || (!pFile) ) return rv ;        
+        pFile->InitWithUnicodePath (strFilePaths.get()) ;
+
+        PRBool bExist ;
+        rv = pFile->Exists(&bExist) ;
+        if (NS_FAILED(rv) || (!bExist) ) return NS_ERROR_FILE_TARGET_DOES_NOT_EXIST ;
+
+        nsXPIDLCString pURL ;
+        pFile->GetURL (getter_Copies(pURL)) ;
+        if (pURL)
+            Attachments.Assign(pURL) ;
+
+        // set attachments for comp field and return
+        rv = aCompFields->SetAttachments (Attachments.get());
+        return rv ;
+    }
+
+    // multiple files to be sent, delim specified
+    nsCOMPtr <nsILocalFile> pFile = do_CreateInstance (NS_LOCAL_FILE_CONTRACTID, &rv) ;
+    if (NS_FAILED(rv) || (!pFile) ) return rv ;        
+    PRInt32 offset = 0 ;
+    PRInt32 FilePathsLen = strFilePaths.Length() ;
+    if (FilePathsLen)
+    {
+        PRUnichar * newFilePaths = (PRUnichar *) strFilePaths.get() ;
+        while (offset != kNotFound)
+        {
+            nsString RemainingPaths ;
+            RemainingPaths.Assign(newFilePaths) ;
+            offset = RemainingPaths.Find (strDelimChars) ;
+            if (offset != kNotFound)
+            {
+                RemainingPaths.SetLength (offset) ;
+                if ((offset + strDelimChars.Length()) < FilePathsLen)
+                    newFilePaths += offset + strDelimChars.Length() ;
+            }
+
+            pFile->InitWithUnicodePath (RemainingPaths.get()) ;
+
+    #ifdef RAJIV_DEBUG
+            printf ("File : %S \n", RemainingPaths.get()) ; 
+    #endif 
+            PRBool bExist ;
+            rv = pFile->Exists(&bExist) ;
+            if (NS_FAILED(rv) || (!bExist) ) return NS_ERROR_FILE_TARGET_DOES_NOT_EXIST ;
+
+            nsXPIDLCString pURL ;
+            pFile->GetURL (getter_Copies(pURL)) ;
+            if (pURL)
+            {
+				if (Attachments.Length() > 0)
+					Attachments.Append(",") ;
+                Attachments.Append(pURL) ;
+            }
+        }
+        rv = aCompFields->SetAttachments (Attachments.get());
+    }
+
+    return rv ;
+}
+
+// this used for Send with UI
+nsresult nsMapiHook::ShowComposerWindow (unsigned long aSession, nsIMsgCompFields * aCompFields) 
+{
+    nsresult rv = NS_OK ;
+
+    // create a send listener to get back the send status
+    nsCOMPtr <nsIMsgSendListener> sendListener ;
+    rv = nsMAPISendListener::CreateMAPISendListener(getter_AddRefs(sendListener)) ; 
+    if (NS_FAILED(rv) || (!sendListener) ) return rv ;
+
+    // create the compose params object 
+    nsCOMPtr<nsIMsgComposeParams> pMsgComposeParams (do_CreateInstance(NS_MSGCOMPOSEPARAMS_CONTRACTID, &rv));
+    if (NS_FAILED(rv) || (!pMsgComposeParams) ) return rv ;
+
+    // populate the compose params
+    pMsgComposeParams->SetType(nsIMsgCompType::New);
+    pMsgComposeParams->SetFormat(nsIMsgCompFormat::Default);
+    pMsgComposeParams->SetComposeFields(aCompFields); 
+    pMsgComposeParams->SetSendListener(sendListener) ;
+
+    /** get the nsIMsgComposeService object to open the compose window **/
+    nsCOMPtr <nsIMsgComposeService> compService = do_GetService (NS_MSGCOMPOSESERVICE_CONTRACTID) ;
+    if (NS_FAILED(rv)|| (!compService) ) return rv ;
+
+    rv = compService->OpenComposeWindowWithParams(nsnull, pMsgComposeParams) ;
+    if (NS_FAILED(rv)) return rv ;
+
+    return rv ;
+}
--- a/mozilla/mailnews/mapi/mapihook/msgMapiHook.h
+++ b/mozilla/mailnews/mapi/mapihook/msgMapiHook.h
@@ -0,0 +1,66 @@
+/* ***** 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 MSG_MAPI_HOOK_H_
+#define MSG_MAPI_HOOK_H_
+
+#include "prtypes.h"
+
+class nsMapiHook
+{
+    public :
+
+        static PRBool Initialize();
+        static PRBool DisplayLoginDialog(PRBool aLogin, PRUnichar **aUsername, 
+                        PRUnichar **aPassword);
+        static PRBool VerifyUserName(const PRUnichar *aUsername, char **aIdKey);
+
+        static PRBool IsBlindSendAllowed () ;
+        static nsresult BlindSendMail (unsigned long aSession, nsIMsgCompFields * aCompFields) ;
+        static nsresult ShowComposerWindow (unsigned long aSession, nsIMsgCompFields * aCompFields) ;
+        static nsresult PopulateCompFields(lpnsMapiMessage aMessage, nsIMsgCompFields * aCompFields) ;
+        static nsresult PopulateCompFieldsWithConversion(lpnsMapiMessage aMessage, 
+                                        nsIMsgCompFields * aCompFields) ;
+        static nsresult PopulateCompFieldsForSendDocs(nsIMsgCompFields * aCompFields, 
+                                        ULONG aFlags, LPTSTR aDelimChar, LPTSTR aFilePaths) ;
+        static nsresult HandleAttachments (nsIMsgCompFields * aCompFields, PRInt32 aFileCount, 
+                                        lpnsMapiFileDesc aFiles, BOOL aIsUnicode) ;
+        static void CleanUp();
+
+        static PRBool isMapiService;
+};
+
+#endif  // MSG_MAPI_HOOK_H_
--- a/mozilla/mailnews/mapi/mapihook/msgMapiImp.cpp
+++ b/mozilla/mailnews/mapi/mapihook/msgMapiImp.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 <mapidefs.h>
+#include <mapi.h>
+#include "msgMapi.h"
+#include "msgMapiImp.h"
+#include "msgMapiFactory.h"
+#include "msgMapiMain.h"
+
+#include "nsMsgCompFields.h"
+#include "msgMapiHook.h"
+#include "nsString.h"
+#include "nsCOMPtr.h"
+#include "nsISupports.h"
+#include "nsMsgCompCID.h"
+#include "nsMsgComposeStringBundle.h"
+
+
+const CLSID CLSID_nsMapiImp = {0x29f458be, 0x8866, 0x11d5, {0xa3, 0xdd, 0x0, 0xb0, 0xd0, 0xf3, 0xba, 0xa7}};
+
+nsMapiImp::nsMapiImp()
+: m_cRef(1)
+{
+    m_Lock = PR_NewLock();
+}
+
+nsMapiImp::~nsMapiImp() 
+{ 
+    if (m_Lock)
+        PR_DestroyLock(m_Lock);
+}
+
+STDMETHODIMP nsMapiImp::QueryInterface(const IID& aIid, void** aPpv)
+{    
+    if (aIid == IID_IUnknown)
+    {
+        *aPpv = static_cast<nsIMapi*>(this); 
+    }
+    else if (aIid == IID_nsIMapi)
+    {
+        *aPpv = static_cast<nsIMapi*>(this);
+    }
+    else
+    {
+        *aPpv = nsnull;
+        return E_NOINTERFACE;
+    }
+
+    reinterpret_cast<IUnknown*>(*aPpv)->AddRef();
+    return S_OK;
+}
+
+STDMETHODIMP_(ULONG) nsMapiImp::AddRef()
+{
+    return PR_AtomicIncrement(&m_cRef);
+}
+
+STDMETHODIMP_(ULONG) nsMapiImp::Release() 
+{
+    PRInt32 temp;
+    temp = PR_AtomicDecrement(&m_cRef);
+    if (m_cRef == 0)
+    {
+        delete this;
+        return 0;
+    }
+
+    return temp;
+}
+
+STDMETHODIMP nsMapiImp::IsValid()
+{
+    return S_OK;
+}
+
+STDMETHODIMP nsMapiImp::IsValidSession(unsigned long aSession)
+{
+    nsMAPIConfiguration *pConfig = nsMAPIConfiguration::GetMAPIConfiguration();
+    if (pConfig && pConfig->IsSessionValid(aSession))
+        return S_OK;
+
+    return E_FAIL;
+}
+
+STDMETHODIMP nsMapiImp::Initialize()
+{
+    HRESULT hr = E_FAIL;
+
+    if (!m_Lock)
+        return E_FAIL;
+
+    PR_Lock(m_Lock);
+
+    // Initialize MAPI Configuration
+
+    nsMAPIConfiguration *pConfig = nsMAPIConfiguration::GetMAPIConfiguration();
+    if (pConfig != nsnull)
+        if (nsMapiHook::Initialize())
+            hr = S_OK;
+
+    PR_Unlock(m_Lock);
+
+    return hr;
+}
+
+STDMETHODIMP nsMapiImp::Login(unsigned long aUIArg, LOGIN_PW_TYPE aLogin, LOGIN_PW_TYPE aPassWord,
+                unsigned long aFlags, unsigned long *aSessionId)
+{
+    HRESULT hr = E_FAIL;
+    PRBool bNewSession = PR_FALSE;
+    char *id_key = nsnull;
+
+    if (aFlags & MAPI_NEW_SESSION)
+        bNewSession = PR_TRUE;
+
+    // Check For Profile Name
+
+    if (aLogin != nsnull && aLogin[0] != '\0')
+    {
+        if (nsMapiHook::VerifyUserName(aLogin, &id_key) == PR_FALSE)
+    {
+        *aSessionId = MAPI_E_LOGIN_FAILURE;
+        return hr;
+    }
+    }
+
+    // finally register(create) the session.
+
+    PRUint32 nSession_Id;
+    PRInt16 nResult = 0;
+
+    nsMAPIConfiguration *pConfig = nsMAPIConfiguration::GetMAPIConfiguration();
+    if (pConfig != nsnull)
+        nResult = pConfig->RegisterSession(aUIArg, aLogin, aPassWord,
+                                           (aFlags & MAPI_FORCE_DOWNLOAD), bNewSession,
+                                           &nSession_Id, id_key);
+
+    switch (nResult)
+    {
+        case -1 :
+        {
+            *aSessionId = MAPI_E_TOO_MANY_SESSIONS;
+            return hr;
+        }
+        case 0 :
+        {
+            *aSessionId = MAPI_E_INSUFFICIENT_MEMORY;
+            return hr;
+        }
+        default :
+        {
+            *aSessionId = nSession_Id;
+            break;
+        }
+    }
+
+    return S_OK;
+}
+
+STDMETHODIMP nsMapiImp::SendMail( unsigned long aSession, lpnsMapiMessage aMessage,
+     short aRecipCount, lpnsMapiRecipDesc aRecips , short aFileCount, lpnsMapiFileDesc aFiles , 
+     unsigned long aFlags, unsigned long aReserved)
+{
+    HRESULT hr = SUCCESS_SUCCESS ;
+
+    // Assign the pointers in the aMessage struct to the array of Recips and Files
+    // recieved here from MS COM. These are used in BlindSendMail and ShowCompWin fns 
+    aMessage->lpRecips = aRecips ;
+    aMessage->lpFiles = aFiles ;
+
+    nsresult rv ;
+
+    /** create nsIMsgCompFields obj and populate it **/
+    nsCOMPtr<nsIMsgCompFields> pCompFields = do_CreateInstance(NS_MSGCOMPFIELDS_CONTRACTID, &rv) ;
+    if (NS_FAILED(rv) || (!pCompFields) ) return MAPI_E_INSUFFICIENT_MEMORY ;
+
+    if (aFlags & MAPI_UNICODE)
+        rv = nsMapiHook::PopulateCompFields(aMessage, pCompFields) ;
+    else
+        rv = nsMapiHook::PopulateCompFieldsWithConversion(aMessage, pCompFields) ;
+    
+    if (NS_SUCCEEDED (rv))
+    {
+        // see flag to see if UI needs to be brought up
+        if (!(aFlags & MAPI_DIALOG))
+        {
+            rv = nsMapiHook::BlindSendMail(aSession, pCompFields);
+        }
+        else
+        {
+            rv = nsMapiHook::ShowComposerWindow(aSession, pCompFields);
+        }
+    }
+
+    // return success
+    if (NS_SUCCEEDED (rv)) return hr ;
+    // if failure return the related MAPI failure code
+    switch (rv)
+    {
+        case NS_MSG_NO_RECIPIENTS :
+            hr = MAPI_E_BAD_RECIPTYPE ;
+            break ;
+        case NS_ERROR_COULD_NOT_GET_USERS_MAIL_ADDRESS :
+            hr = MAPI_E_INVALID_RECIPS ; 
+            break ;
+        case NS_ERROR_COULD_NOT_LOGIN_TO_SMTP_SERVER :
+            hr = MAPI_E_LOGIN_FAILURE ;
+            break ;
+        case NS_MSG_UNABLE_TO_OPEN_FILE :                 
+        case NS_MSG_UNABLE_TO_OPEN_TMP_FILE :
+        case NS_MSG_COULDNT_OPEN_FCC_FOLDER :
+        case NS_ERROR_FILE_INVALID_PATH :
+            hr = MAPI_E_ATTACHMENT_OPEN_FAILURE ;
+            break ;
+        case NS_ERROR_FILE_TARGET_DOES_NOT_EXIST :
+            hr = MAPI_E_ATTACHMENT_NOT_FOUND ;
+            break ;
+        case NS_MSG_CANCELLING :
+            hr = MAPI_E_USER_ABORT ;
+            break ;
+        case NS_MSG_ERROR_WRITING_FILE :
+        case NS_MSG_UNABLE_TO_SAVE_TEMPLATE :
+        case NS_MSG_UNABLE_TO_SAVE_DRAFT :
+            hr = MAPI_E_ATTACHMENT_WRITE_FAILURE ;
+            break ;
+        default :
+            hr = MAPI_E_FAILURE ;
+            break ;
+    }
+    
+    return hr ;
+}
+
+
+STDMETHODIMP nsMapiImp::SendDocuments( unsigned long aSession, LPTSTR aDelimChar,
+                            LPTSTR aFilePaths, LPTSTR aFileNames, ULONG aFlags)
+{
+    HRESULT hr = SUCCESS_SUCCESS ;
+    nsresult rv = NS_OK ;
+
+    /** create nsIMsgCompFields obj and populate it **/
+    nsCOMPtr<nsIMsgCompFields> pCompFields = do_CreateInstance(NS_MSGCOMPFIELDS_CONTRACTID, &rv) ;
+    if (NS_FAILED(rv) || (!pCompFields) ) return MAPI_E_INSUFFICIENT_MEMORY ;
+
+    if (aFilePaths)
+    {
+        rv = nsMapiHook::PopulateCompFieldsForSendDocs(pCompFields, aFlags, aDelimChar, aFilePaths) ;
+    }
+
+    if (NS_SUCCEEDED (rv)) 
+        rv = nsMapiHook::ShowComposerWindow(aSession, pCompFields);
+
+    // return success
+    if (NS_SUCCEEDED (rv)) return hr ;
+    // if failure return the related MAPI failure code
+    switch (rv)
+    {
+        case NS_ERROR_COULD_NOT_LOGIN_TO_SMTP_SERVER :
+            hr = MAPI_E_LOGIN_FAILURE ;
+            break ;
+        case NS_MSG_UNABLE_TO_OPEN_FILE :                 
+        case NS_MSG_UNABLE_TO_OPEN_TMP_FILE :
+        case NS_MSG_COULDNT_OPEN_FCC_FOLDER :
+        case NS_ERROR_FILE_INVALID_PATH :
+            hr = MAPI_E_ATTACHMENT_OPEN_FAILURE ;
+            break ;
+        case NS_ERROR_FILE_TARGET_DOES_NOT_EXIST :
+            hr = MAPI_E_ATTACHMENT_NOT_FOUND ;
+            break ;
+        case NS_MSG_CANCELLING :
+            hr = MAPI_E_USER_ABORT ;
+            break ;
+        case NS_MSG_ERROR_WRITING_FILE :
+        case NS_MSG_UNABLE_TO_SAVE_TEMPLATE :
+        case NS_MSG_UNABLE_TO_SAVE_DRAFT :
+            hr = MAPI_E_ATTACHMENT_WRITE_FAILURE ;
+            break ;
+        default :
+            hr = MAPI_E_FAILURE ;
+            break ;
+    }
+
+    return hr ;
+}
+
+STDMETHODIMP nsMapiImp::Logoff (unsigned long aSession)
+{
+    nsMAPIConfiguration *pConfig = nsMAPIConfiguration::GetMAPIConfiguration();
+
+    if (pConfig->UnRegisterSession((PRUint32)aSession))
+        return S_OK;
+
+    return E_FAIL;
+}
+
+STDMETHODIMP nsMapiImp::CleanUp()
+{
+    nsMapiHook::CleanUp();
+    return S_OK;
+}
--- a/mozilla/mailnews/mapi/mapihook/msgMapiImp.h
+++ b/mozilla/mailnews/mapi/mapihook/msgMapiImp.h
@@ -0,0 +1,87 @@
+/* ***** 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 MSG_MAPI_IMP_H
+#define MSG_MAPI_IMP_H
+
+#include <windows.h>
+#include <mapi.h>
+#include "msgMapi.h"
+#include "nsXPIDLString.h"
+#include "nspr.h"
+
+class nsMapiImp : public nsIMapi
+{
+
+public :
+
+    // IUnknown
+
+    STDMETHODIMP            QueryInterface(const IID& aIid, void** aPpv);
+    STDMETHODIMP_(ULONG)    AddRef();
+    STDMETHODIMP_(ULONG)    Release();
+
+    // Interface INsMapi
+
+    STDMETHODIMP Login(unsigned long aUIArg, LOGIN_PW_TYPE aLogin, 
+                       LOGIN_PW_TYPE aPassWord, unsigned long aFlags,
+                       unsigned long *aSessionId);
+
+    STDMETHODIMP SendMail( unsigned long aSession, lpnsMapiMessage aMessage,
+         short aRecipCount, lpnsMapiRecipDesc aRecips , 
+         short aFileCount, lpnsMapiFileDesc aFiles , 
+         unsigned long aFlags, unsigned long aReserved) ;
+
+    STDMETHODIMP SendDocuments( unsigned long aSession, LPTSTR aDelimChar,
+                                LPTSTR aFilePaths, LPTSTR aFileNames, ULONG aFlags);
+
+    STDMETHODIMP Initialize();
+    STDMETHODIMP IsValid();
+    STDMETHODIMP IsValidSession(unsigned long aSession);
+
+    STDMETHODIMP Logoff (unsigned long aSession);
+    STDMETHODIMP CleanUp();
+
+    nsMapiImp();
+    ~nsMapiImp();
+
+private :
+
+    PRLock *m_Lock;
+    PRInt32 m_cRef;
+};
+
+#endif // MSG_MAPI_IMP_H
--- a/mozilla/mailnews/mapi/mapihook/msgMapiMain.cpp
+++ b/mozilla/mailnews/mapi/mapihook/msgMapiMain.cpp
@@ -0,0 +1,340 @@
+/* ***** 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 "msgMapiMain.h"
+#include "nsIServiceManager.h"
+#include "nsCOMPtr.h"
+
+// move to xpcom bug 81956.
+class nsPRUintKey : public nsHashKey {
+protected:
+    PRUint32 mKey;
+public:
+    nsPRUintKey(PRUint32 key) : mKey(key) {}
+
+    PRUint32 HashCode(void) const {
+        return mKey;
+    }
+
+    PRBool Equals(const nsHashKey *aKey) const {
+        return mKey == ((const nsPRUintKey *) aKey)->mKey;
+    }
+    nsHashKey *Clone() const {
+        return new nsPRUintKey(mKey);
+    }
+    PRUint32 GetValue() { return mKey; }
+};
+//
+
+
+nsMAPIConfiguration *nsMAPIConfiguration::m_pSelfRef = nsnull;
+PRUint32 nsMAPIConfiguration::session_generator = 0;
+PRUint32 nsMAPIConfiguration::sessionCount = 0;
+
+nsMAPIConfiguration *nsMAPIConfiguration::GetMAPIConfiguration()
+{
+    if (m_pSelfRef == nsnull)
+        m_pSelfRef = new nsMAPIConfiguration();
+
+    return m_pSelfRef;
+}
+
+nsMAPIConfiguration::nsMAPIConfiguration()
+: m_nMaxSessions(MAX_SESSIONS),
+  m_ProfileMap(nsnull),
+  m_SessionMap(nsnull)
+{
+    m_Lock = PR_NewLock();
+    m_ProfileMap = new nsHashtable();
+    m_SessionMap = new nsHashtable();
+    NS_ASSERTION(m_SessionMap && m_ProfileMap, "hashtables not created");
+}
+
+static PRBool
+FreeSessionMapEntries(nsHashKey *aKey, void *aData, void* aClosure)
+{
+    nsMAPISession *pTemp = (nsMAPISession*) aData;
+    delete pTemp;
+    pTemp = nsnull;
+    return PR_TRUE;
+}
+
+static PRBool
+FreeProfileMapEntries(nsHashKey *aKey, void *aData, void* aClosure)
+{
+    return PR_TRUE;
+}
+
+nsMAPIConfiguration::~nsMAPIConfiguration()
+{
+    if (m_Lock)
+        PR_DestroyLock(m_Lock);
+
+    if (m_SessionMap)
+    {
+        m_SessionMap->Reset(FreeSessionMapEntries);
+        delete m_SessionMap;
+        m_SessionMap = nsnull;
+    }
+
+    if (m_ProfileMap)
+    {
+        m_ProfileMap->Reset(FreeProfileMapEntries);
+        delete m_ProfileMap;
+        m_ProfileMap = nsnull;
+    }
+}
+
+void nsMAPIConfiguration::OpenConfiguration()
+{
+    // No. of max. sessions is set to MAX_SESSIONS.  In future
+    // if it is decided to have configuration (registry)
+    // parameter, this function can be used to set the
+    // max sessions;
+
+    return;
+}
+
+PRInt16 nsMAPIConfiguration::RegisterSession(PRUint32 aHwnd,
+                const PRUnichar *aUserName, const PRUnichar *aPassword,
+                PRBool aForceDownLoad, PRBool aNewSession,
+                PRUint32 *aSession, char *aIdKey)
+{
+    PRInt16 nResult = 0;
+    PRUint32 n_SessionId = 0;
+
+    PR_Lock(m_Lock);
+
+    // Check whether max sessions is exceeded
+
+    if (sessionCount >= m_nMaxSessions)
+    {
+        PR_Unlock(m_Lock);
+        return -1;
+    }
+
+    if (aUserName != nsnull && aUserName[0] != '\0')
+    {
+    nsStringKey usernameKey(aUserName);
+    n_SessionId = (PRUint32) m_ProfileMap->Get(&usernameKey);
+    }
+
+    // try to share a session; if not create a session
+
+    if (n_SessionId > 0)
+    {
+        nsPRUintKey sessionKey(n_SessionId);
+        nsMAPISession *pTemp = (nsMAPISession *)m_SessionMap->Get(&sessionKey);
+        if (pTemp != nsnull)
+        {
+            pTemp->IncrementSession();
+            *aSession = n_SessionId;
+            nResult = 1;
+        }
+    }
+    else if (aNewSession || n_SessionId == 0) // checking for n_SessionId is a concession
+    {
+        // create a new session ; if new session is specified OR there is no session
+        nsMAPISession *pTemp = nsnull;
+        pTemp = new nsMAPISession(aHwnd, aUserName,
+                               aPassword, aForceDownLoad, aIdKey);
+
+        if (pTemp != nsnull)
+        {
+            session_generator++;
+
+            // I don't think there will be (2 power 32) sessions alive
+            // in a cycle.  This is an assumption
+
+            if (session_generator == 0)
+                session_generator++;
+
+            nsPRUintKey sessionKey(session_generator);
+            m_SessionMap->Put(&sessionKey, pTemp);
+            if (aUserName != nsnull && aUserName[0] != '\0')
+            {
+                nsStringKey usernameKey(aUserName);
+            m_ProfileMap->Put(&usernameKey, (void*)session_generator);
+            }
+
+            *aSession = session_generator;
+            sessionCount++;
+            nResult = 1;
+        }
+    }
+
+    PR_Unlock(m_Lock);
+    return nResult;
+}
+
+PRBool nsMAPIConfiguration::UnRegisterSession(PRUint32 aSessionID)
+{
+    PRBool bResult = PR_FALSE;
+
+    PR_Lock(m_Lock);
+
+    if (aSessionID != 0)
+    {
+        nsPRUintKey sessionKey(aSessionID);
+        nsMAPISession *pTemp = (nsMAPISession *)m_SessionMap->Get(&sessionKey);
+
+        if (pTemp != nsnull)
+        {
+            if (pTemp->DecrementSession() == 0)
+            {
+                if (pTemp->m_pProfileName.get() != nsnull)
+                {
+                nsStringKey stringKey(pTemp->m_pProfileName.get());
+                m_ProfileMap->Remove(&stringKey);
+                }
+                m_SessionMap->Remove(&sessionKey);
+                sessionCount--;
+                bResult = PR_TRUE;
+            }
+        }
+    }
+
+    PR_Unlock(m_Lock);
+    return bResult;
+}
+
+PRBool nsMAPIConfiguration::IsSessionValid(PRUint32 aSessionID)
+{
+    if (aSessionID == 0)
+        return PR_FALSE;
+
+    PRBool retValue = PR_FALSE;
+    nsPRUintKey sessionKey(aSessionID);
+
+    PR_Lock(m_Lock);
+
+    retValue = m_SessionMap->Exists(&sessionKey);
+        
+    PR_Unlock(m_Lock);
+
+    return retValue;
+}
+
+
+PRUnichar *nsMAPIConfiguration::GetPassWord(PRUint32 aSessionID)
+{
+    PRUnichar *pResult = nsnull;
+
+    PR_Lock(m_Lock);
+
+    if (aSessionID != 0)
+    {
+        nsPRUintKey sessionKey(aSessionID);
+        nsMAPISession *pTemp = (nsMAPISession *)m_SessionMap->Get(&sessionKey);
+
+        if (pTemp)
+        {
+            pResult = pTemp->GetPassWord();
+        }
+    }
+
+    PR_Unlock(m_Lock);
+
+    return pResult;
+}
+
+char *nsMAPIConfiguration::GetIdKey(PRUint32 aSessionID)
+{
+    char *pResult = nsnull;
+
+    PR_Lock(m_Lock);
+
+    if (aSessionID != 0)
+    {
+        nsPRUintKey sessionKey(aSessionID);
+        nsMAPISession *pTemp = (nsMAPISession *)m_SessionMap->Get(&sessionKey);
+        if (pTemp)
+        {
+           pResult = pTemp->GetIdKey();
+        }
+    }
+
+    PR_Unlock(m_Lock);
+    return pResult;
+}
+
+
+
+nsMAPISession::nsMAPISession(PRUint32 aHwnd, const PRUnichar *aUserName,\
+                             const PRUnichar *aPassword, \
+                             PRBool aForceDownLoad, char *aKey)
+: m_bIsForcedDownLoad(aForceDownLoad),
+  m_hAppHandle(aHwnd),
+  m_nShared(1),
+  m_pIdKey(aKey)
+{
+    m_pProfileName.Assign(aUserName);
+    m_pPassword.Assign(aPassword);
+}
+
+nsMAPISession::~nsMAPISession()
+{
+    if (m_pIdKey != nsnull)
+    {
+        delete [] m_pIdKey;
+        m_pIdKey = nsnull;
+    }
+}
+
+PRUint32 nsMAPISession::IncrementSession()
+{
+    return ++m_nShared;
+}
+
+PRUint32 nsMAPISession::DecrementSession()
+{
+    return --m_nShared;
+}
+
+PRUint32 nsMAPISession::GetSessionCount()
+{
+    return m_nShared;
+}
+
+PRUnichar *nsMAPISession::GetPassWord()
+{
+    return (PRUnichar *)m_pPassword.get();
+}
+
+char *nsMAPISession::GetIdKey()
+{
+    return m_pIdKey;
+}
--- a/mozilla/mailnews/mapi/mapihook/msgMapiMain.h
+++ b/mozilla/mailnews/mapi/mapihook/msgMapiMain.h
@@ -0,0 +1,104 @@
+/* ***** 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 MSG_MAPI_MAIN_H_
+#define NSG_MAPI_MAIN_H_
+
+#define        MAX_NAME_LEN    256
+#define        MAX_PW_LEN      256
+#define        MAX_SESSIONS    50
+
+#include "nsXPIDLString.h"
+#include "nspr.h"
+#include "nsString.h"
+#include "nsHashtable.h"
+
+class nsMAPIConfiguration
+{
+private :
+
+    static PRUint32 session_generator;
+    static PRUint32 sessionCount;
+    static nsMAPIConfiguration *m_pSelfRef;
+    PRLock *m_Lock;
+    PRUint32  m_nMaxSessions;
+
+
+    nsHashtable *m_ProfileMap;
+    nsHashtable *m_SessionMap;
+    nsMAPIConfiguration();
+
+public :
+    static nsMAPIConfiguration *GetMAPIConfiguration();
+    void OpenConfiguration();
+    PRInt16 RegisterSession(PRUint32 aHwnd, const PRUnichar *aUserName, \
+                            const PRUnichar *aPassword, PRBool aForceDownLoad, \
+                            PRBool aNewSession, PRUint32 *aSession, char *aIdKey);
+    PRBool IsSessionValid(PRUint32 aSessionID);
+    PRBool UnRegisterSession(PRUint32 aSessionID);
+    PRUnichar *GetPassWord(PRUint32 aSessionID);
+    char *GetIdKey(PRUint32 aSessionID);
+    ~nsMAPIConfiguration();
+};
+
+class nsMAPISession
+{
+    friend class nsMAPIConfiguration;
+
+    private :
+
+        PRBool   m_bIsForcedDownLoad;
+        PRBool   m_bApp_or_Service;
+        PRUint32 m_hAppHandle;
+        PRUint32 m_nShared;
+        char     *m_pIdKey;
+        nsString m_pProfileName;
+        nsString m_pPassword;
+
+    public :
+
+        nsMAPISession(PRUint32 aHwnd, const PRUnichar *aUserName, \
+                      const PRUnichar *aPassword, \
+                      PRBool aForceDownLoad, char *aKey);
+        PRUint32 IncrementSession();
+        PRUint32 DecrementSession();
+        PRUint32 GetSessionCount();
+        PRUnichar *nsMAPISession::GetPassWord();
+        char *nsMAPISession::GetIdKey();
+        ~nsMAPISession();
+};
+
+#endif    // MSG_MAPI_MAIN_H_
--- a/mozilla/mailnews/mapi/mapihook/src/nsMapiSupport.cpp
+++ b/mozilla/mailnews/mapi/mapihook/src/nsMapiSupport.cpp
@@ -34,77 +34,67 @@
 *
 * ***** END LICENSE BLOCK ***** */

-#include "nsComPtr.h"
-#include "nsMapiSupport.h"
+#include "msgMapiSupport.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)
+PRBool WINAPI DllMain(HINSTANCE aInstance, DWORD aReason, LPVOID aReserved)
 {
-  nsresult rv;
+    switch (aReason)
+    {
+        case DLL_PROCESS_ATTACH :
+        {
+            // Initialize MAPI Support

-  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);
+            nsMapiSupport *pTemp = nsMapiSupport::GetNsMapiSupport();
+            break;
+        }
+        case DLL_PROCESS_DETACH :
+        {
+            nsMapiSupport *pTemp = nsMapiSupport::GetNsMapiSupport();
+            pTemp->UnInitMSCom();
+            delete pTemp;
+            pTemp = nsnull;
+        }
+    }

-  return rv;
+    return PR_TRUE;
 }

-NS_IMETHODIMP
-nsMapiSupport::Observe(nsISupports *aSubject, const char *aTopic, const PRUnichar *aData)
+extern "C"
 {
-    if (!nsCRT::strcmp(aTopic, "profile-after-change"))
-        return InitializeMAPISupport();
+    void __declspec(dllexport) Init()
+    {
+        nsMapiSupport *pTemp = nsMapiSupport::GetNsMapiSupport();
+        if (pTemp != nsnull)
+            pTemp->InitMSCom();
+    }
+}

-    if (!nsCRT::strcmp(aTopic, NS_XPCOM_SHUTDOWN_OBSERVER_ID))
-        return ShutdownMAPISupport();
+nsMapiSupport* nsMapiSupport::m_pSelfRef = nsnull;

-    nsresult rv;
+nsMapiSupport *nsMapiSupport::GetNsMapiSupport()
+{
+    if (m_pSelfRef == nsnull)
+        m_pSelfRef = new nsMapiSupport();

-    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;
+    return m_pSelfRef;
 }

 nsMapiSupport::nsMapiSupport()
 : m_dwRegister(0),
  m_nsMapiFactory(nsnull)
 {
-    NS_INIT_ISUPPORTS();
 }

 nsMapiSupport::~nsMapiSupport()
 {
 }

-NS_IMETHODIMP
-nsMapiSupport::InitializeMAPISupport()
+PRBool nsMapiSupport::RegsiterComponents()
 {
-    ::CoInitialize(nsnull);
    if (m_nsMapiFactory == nsnull)    // No Registering if already done.  Sanity Check!!
    {
        m_nsMapiFactory = new nsMapiFactory();
@@ -121,16 +111,15 @@ nsMapiSupport::InitializeMAPISupport()
            {
                m_nsMapiFactory->Release() ;
                m_nsMapiFactory = nsnull;
-                return NS_ERROR_FAILURE;
+                return PR_FALSE;
            }
        }
    }

-    return NS_OK;
+    return PR_TRUE;
 }

-NS_IMETHODIMP
-nsMapiSupport::ShutdownMAPISupport()
+PRBool nsMapiSupport::UnRegisterComponents()
 {
    if (m_dwRegister != 0)
        ::CoRevokeClassObject(m_dwRegister);
@@ -141,34 +130,17 @@ nsMapiSupport::ShutdownMAPISupport()
        m_nsMapiFactory = nsnull;
    }

-    ::CoUninitialize();
-
-    return NS_OK;
+    return PR_TRUE;
 }

-
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMapiRegistry);
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMapiSupport);
-
-// The list of components we register
-static nsModuleComponentInfo components[] = 
+void nsMapiSupport::InitMSCom()
 {
-  {
-    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);
+    ::CoInitialize(nsnull);
+    RegsiterComponents();
+}

+void nsMapiSupport::UnInitMSCom()
+{
+    UnRegisterComponents();
+    ::CoUninitialize();
+}
--- a/mozilla/mailnews/mapi/mapihook/src/nsMapiSupport.h
+++ b/mozilla/mailnews/mapi/mapihook/src/nsMapiSupport.h
@@ -34,34 +34,31 @@
 *
 * ***** END LICENSE BLOCK ***** */

-#ifndef NS_MAPI_SUPPORT_H_
-#define NS_MAPI_SUPPORT_H_
+#ifndef MSG_MAPI_SUPPORT_H_
+#define MSG_MAPI_SUPPORT_H_

-#include <nsIObserver.h>
-#include <nsIMapiSupport.h>
 #include "msgMapiFactory.h"
+#include "prtypes.h"

-
-#define NS_IMAPISUPPORT_CID \
-  {0x8967fed2, 0xc8bb, 0x11d5, \
-    { 0xa3, 0xe9, 0x00, 0xb0, 0xd0, 0xf3, 0xba, 0xa7 }}
-
-class nsMapiSupport : public nsIMapiSupport, public nsIObserver
+class __declspec(dllexport) nsMapiSupport
 {
-    public :
-
-        nsMapiSupport();
-        ~nsMapiSupport();
-
-        // Declare all interface methods we must implement.
-        NS_DECL_ISUPPORTS
-        NS_DECL_NSIOBSERVER
-        NS_DECL_NSIMAPISUPPORT
-
    private :

        DWORD   m_dwRegister;
+        static nsMapiSupport *m_pSelfRef;
        nsMapiFactory *m_nsMapiFactory;
+
+        nsMapiSupport();
+
+    public :
+
+        static nsMapiSupport *GetNsMapiSupport();
+        ~nsMapiSupport();
+
+        PRBool RegsiterComponents();
+        void UnInitMSCom();
+        void InitMSCom();
+        PRBool UnRegisterComponents();
 };

-#endif  // NS_MAPI_SUPPORT_H_
+#endif  // MSG_MAPI_SUPPORT_H_
--- a/mozilla/mailnews/mapi/mapihook/public/makefile.win
+++ b/mozilla/mailnews/mapi/mapihook/public/makefile.win
@@ -0,0 +1,48 @@
+# ***** 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):
+# Srilatha Moturi <srilatha@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=nsMapiRegistry
+XPIDL_MODULE=mapiregistry
+
+XPIDLSRCS =	\
+           .\nsIMapiRegistry.idl \
+            $(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
--- a/mozilla/mailnews/mapi/mapihook/public/nsIMapiRegistry.idl
+++ b/mozilla/mailnews/mapi/mapihook/public/nsIMapiRegistry.idl
@@ -0,0 +1,78 @@
+/* ***** 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):
+ * Srilatha Moturi <srilatha@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"
+
+interface nsIDOMWindow;
+
+/**
+ * This interface provides support for registering Mozilla as the default
+ * Mail Client. This interface can also be used to get/set the user preference
+ * for the default Mail Client.
+ * 
+ */
+[scriptable, uuid(c5be14ba-4e0a-4eec-a1b8-04363761d63c)]
+interface nsIMapiRegistry: nsISupports {
+
+   /** This is set to TRUE if Mozilla is the default Application
+    */
+   readonly attribute boolean isDefaultMailClient;
+
+   /** This is set TRUE only once per session.
+    */
+   readonly attribute boolean showDialog;
+
+   /** This will update the registry keys to set Mozilla as default Mail Client.
+    */
+   void setDefaultMailClient();
+
+   /** This will reset the registry keys for the default Mail Client.
+    */
+   void unsetDefaultMailClient();
+
+   /** This will bring the dialog asking the user if he/she wants to set
+    * Mozilla as default Mail Client.
+    * Call this only if Mozilla is not the default Mail client
+    */
+   void showMailIntegrationDialog(in nsIDOMWindow parentWindow);
+   
+};
+
+%{C++
+#define NS_IMAPIWINHOOK_CONTRACTID    "@mozilla.org/mapiregistry;1"
+#define NS_IMAPIWINHOOK_CLASSNAME "Mozilla MAPI Registry"
+%}
--- a/mozilla/mailnews/mapi/mapihook/src/Registry.cpp
+++ b/mozilla/mailnews/mapi/mapihook/src/Registry.cpp
@@ -0,0 +1,321 @@
+/* ***** 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 <objbase.h>
+#include <assert.h>
+#include "nsString.h"
+#include "Registry.h"
+
+#define MAPI_PROXY_DLL_NAME   "MapiProxy.dll"
+#define MAPI_STARTUP_ARG      " /MAPIStartUp"
+#define MAX_SIZE              2048
+
+// Size of a CLSID as a string
+const int CLSID_STRING_SIZE = 39;
+
+// Proxy/Stub Dll Routines
+
+typedef HRESULT (__stdcall ProxyServer)();
+
+
+// Convert a CLSID to a char string.
+
+BOOL CLSIDtochar(const CLSID& clsid, char* szCLSID,
+                 int length)
+{
+    LPOLESTR wszCLSID = NULL;
+
+    // Get CLSID
+    HRESULT hr = StringFromCLSID(clsid, &wszCLSID);
+    if (FAILED(hr))
+        return FALSE;
+
+    // Covert from wide characters to non-wide.
+    wcstombs(szCLSID, wszCLSID, length);
+
+    // Free memory.
+    CoTaskMemFree(wszCLSID);
+
+    return TRUE;
+}
+
+// Create a key and set its value.
+
+BOOL setKeyAndValue(nsCAutoString keyName, const char* subKey,
+                    const char* theValue)
+{
+    HKEY hKey;
+    BOOL retValue = TRUE;
+
+    nsCAutoString theKey(keyName);
+    if (subKey != NULL)
+    {
+        theKey += "\\";
+        theKey += subKey;
+    }
+
+    // Create and open key and subkey.
+    long lResult = RegCreateKeyEx(HKEY_CLASSES_ROOT, theKey.get(), 
+                                  0, NULL, REG_OPTION_NON_VOLATILE,
+                                  KEY_ALL_ACCESS, NULL, &hKey, NULL);
+    if (lResult != ERROR_SUCCESS)
+        return FALSE ;
+
+    // Set the Value.
+    if (theValue != NULL)
+    {
+       lResult = RegSetValueEx(hKey, NULL, 0, REG_SZ, (BYTE *)theValue, 
+                      strlen(theValue)+1);
+       if (lResult != ERROR_SUCCESS)
+           retValue = FALSE;
+    }
+
+    RegCloseKey(hKey);
+    return TRUE;
+}
+
+// Delete a key and all of its descendents.
+
+LONG recursiveDeleteKey(HKEY hKeyParent,           // Parent of key to delete
+                        const char* lpszKeyChild)  // Key to delete
+{
+    // Open the child.
+    HKEY hKeyChild ;
+    LONG lRes = RegOpenKeyEx(hKeyParent, lpszKeyChild, 0,
+                             KEY_ALL_ACCESS, &hKeyChild) ;
+    if (lRes != ERROR_SUCCESS)
+    {
+        return lRes ;
+    }
+
+    // Enumerate all of the decendents of this child.
+    FILETIME time ;
+    char szBuffer[MAX_SIZE] ;
+    DWORD dwSize = MAX_SIZE ;
+    while (RegEnumKeyEx(hKeyChild, 0, szBuffer, &dwSize, NULL,
+                        NULL, NULL, &time) == S_OK)
+    {
+        // Delete the decendents of this child.
+        lRes = recursiveDeleteKey(hKeyChild, szBuffer) ;
+        if (lRes != ERROR_SUCCESS)
+        {
+            // Cleanup before exiting.
+            RegCloseKey(hKeyChild) ;
+            return lRes;
+        }
+        dwSize = MAX_SIZE;
+    }
+
+    // Close the child.
+    RegCloseKey(hKeyChild) ;
+
+    // Delete this child.
+    return RegDeleteKey(hKeyParent, lpszKeyChild) ;
+}
+
+void RegisterProxy()
+{
+    HINSTANCE h = NULL;
+    ProxyServer *RegisterFunc = NULL;
+
+    char szModule[MAX_SIZE];
+    char *pTemp = NULL;
+
+    HMODULE hModule = GetModuleHandle(NULL);
+    DWORD dwResult  = ::GetModuleFileName(hModule, szModule,
+                                          sizeof(szModule)/sizeof(char));
+    if (dwResult == 0)
+        return;
+
+    pTemp = strrchr(szModule, '\\');
+    if (pTemp == NULL)
+        return;
+
+    *pTemp = '\0';
+    nsCAutoString proxyPath(szModule);
+
+    proxyPath += "\\";
+    proxyPath += MAPI_PROXY_DLL_NAME;
+
+    h = LoadLibrary(proxyPath.get());
+    if (h == NULL)
+        return;
+
+    RegisterFunc = (ProxyServer *) GetProcAddress(h, "DllRegisterServer");
+    if (RegisterFunc)
+        RegisterFunc();
+
+    FreeLibrary(h);
+}
+
+void UnRegisterProxy()
+{
+    HINSTANCE h = NULL;
+    ProxyServer *UnRegisterFunc = NULL;
+
+    char szModule[MAX_SIZE];
+    char *pTemp = NULL;
+
+    HMODULE hModule = GetModuleHandle(NULL);
+    DWORD dwResult  = ::GetModuleFileName(hModule, szModule,
+                                          sizeof(szModule)/sizeof(char));
+    if (dwResult == 0)
+        return;
+
+    pTemp = strrchr(szModule, '\\');
+    if (pTemp == NULL)
+        return;
+
+    *pTemp = '\0';
+    nsCAutoString proxyPath(szModule);
+
+    proxyPath += "\\";
+    proxyPath += MAPI_PROXY_DLL_NAME;
+
+    h = LoadLibrary(proxyPath.get());
+    if (h == NULL)
+        return;
+
+    UnRegisterFunc = (ProxyServer *) GetProcAddress(h, "DllUnregisterServer");
+    if (UnRegisterFunc)
+        UnRegisterFunc();
+
+    FreeLibrary(h);
+}
+
+// Register the component in the registry.
+
+HRESULT RegisterServer(const CLSID& clsid,         // Class ID
+                       const char* szFriendlyName, // Friendly Name
+                       const char* szVerIndProgID, // Programmatic
+                       const char* szProgID)       //   IDs
+{
+    HMODULE hModule = GetModuleHandle(NULL);
+    char szModuleName[MAX_SIZE];
+    char szCLSID[CLSID_STRING_SIZE];
+
+    nsCAutoString independentProgId(szVerIndProgID);
+    nsCAutoString progId(szProgID);
+
+    DWORD dwResult = ::GetModuleFileName(hModule, szModuleName,
+                              sizeof(szModuleName)/sizeof(char));
+
+    if (dwResult == 0)
+        return S_FALSE;
+
+    nsCAutoString moduleName(szModuleName);
+    nsCAutoString registryKey("CLSID\\");
+
+    moduleName += MAPI_STARTUP_ARG;
+
+    // Convert the CLSID into a char.
+
+    if (!CLSIDtochar(clsid, szCLSID, sizeof(szCLSID)))
+        return S_FALSE;
+    registryKey += szCLSID;
+
+    // Add the CLSID to the registry.
+    if (!setKeyAndValue(registryKey, NULL, szFriendlyName))
+        return S_FALSE;
+
+    if (!setKeyAndValue(registryKey, "LocalServer32", moduleName.get()))
+        return S_FALSE;
+
+    // Add the ProgID subkey under the CLSID key.
+    if (!setKeyAndValue(registryKey, "ProgID", szProgID))
+        return S_FALSE;
+
+    // Add the version-independent ProgID subkey under CLSID key.
+    if (!setKeyAndValue(registryKey, "VersionIndependentProgID", szVerIndProgID))
+        return S_FALSE;
+
+    // Add the version-independent ProgID subkey under HKEY_CLASSES_ROOT.
+    if (!setKeyAndValue(independentProgId, NULL, szFriendlyName))
+        return S_FALSE; 
+    if (!setKeyAndValue(independentProgId, "CLSID", szCLSID))
+        return S_FALSE;
+    if (!setKeyAndValue(independentProgId, "CurVer", szProgID))
+        return S_FALSE;
+
+    // Add the versioned ProgID subkey under HKEY_CLASSES_ROOT.
+    if (!setKeyAndValue(progId, NULL, szFriendlyName))
+        return S_FALSE; 
+    if (!setKeyAndValue(progId, "CLSID", szCLSID))
+        return S_FALSE;
+
+    RegisterProxy();
+
+    return S_OK;
+}
+
+LONG UnregisterServer(const CLSID& clsid,         // Class ID
+                      const char* szVerIndProgID, // Programmatic
+                      const char* szProgID)       //   IDs
+{
+    LONG lResult = S_OK;
+
+    // Convert the CLSID into a char.
+
+    char szCLSID[CLSID_STRING_SIZE];
+    if (!CLSIDtochar(clsid, szCLSID, sizeof(szCLSID)))
+        return S_FALSE;
+
+    UnRegisterProxy();
+
+    nsCAutoString registryKey("CLSID\\");
+    registryKey += szCLSID;
+
+    lResult = recursiveDeleteKey(HKEY_CLASSES_ROOT, registryKey.get());
+    if (lResult == ERROR_SUCCESS || lResult == ERROR_FILE_NOT_FOUND)
+        return lResult;
+
+    registryKey += "\\LocalServer32";
+
+    // Delete only the path for this server.
+
+    lResult = recursiveDeleteKey(HKEY_CLASSES_ROOT, registryKey.get());
+    if (lResult != ERROR_SUCCESS && lResult != ERROR_FILE_NOT_FOUND)
+        return lResult;
+
+    // Delete the version-independent ProgID Key.
+    lResult = recursiveDeleteKey(HKEY_CLASSES_ROOT, szVerIndProgID);
+    if (lResult != ERROR_SUCCESS && lResult != ERROR_FILE_NOT_FOUND)
+        return lResult;
+
+    lResult = recursiveDeleteKey(HKEY_CLASSES_ROOT, szProgID);
+
+    return lResult;
+}
--- a/mozilla/mailnews/mapi/mapihook/public/nsIMapiSupport.idl
+++ b/mozilla/mailnews/mapi/mapihook/public/nsIMapiSupport.idl
@@ -35,30 +35,23 @@
 *
 * ***** END LICENSE BLOCK ***** */

-#include "nsISupports.idl"
+#ifndef _REGISTRY_H_
+#define _REGISTRY_H_

-/**
- * This interface provides support for registering Mozilla as a COM component
- * for extending the use of Mail/News through Simple MAPI.
- * 
- */
+#include <objbase.h>
+#include <assert.h>

-[noscript, uuid(8967fed2-c8bb-11d5-a3e9-00b0d0f3baa7)]
-interface nsIMapiSupport : nsISupports {
+// This function will register a component in the Registry.

-   /** Initiates MAPI support
-    */
+HRESULT RegisterServer(const CLSID& clsid, 
+                       const char* szFriendlyName,
+                       const char* szVerIndProgID,
+                       const char* szProgID) ;

-   void initializeMAPISupport();
+// This function will unregister a component.

-   /**  Shuts down the MAPI support
-    */
-
-   void shutdownMAPISupport();
-};
-
-%{C++
-#define NS_IMAPISUPPORT_CONTRACTID    "@mozilla.org/mapisupport;1"
-#define NS_IMAPISUPPORT_CLASSNAME "Mozilla MAPI Support"
-%}
+HRESULT UnregisterServer(const CLSID& clsid,
+                         const char* szVerIndProgID,
+                         const char* szProgID) ;

+#endif
--- a/mozilla/mailnews/mapi/mapihook/src/makefile.win
+++ b/mozilla/mailnews/mapi/mapihook/src/makefile.win
@@ -0,0 +1,72 @@
+# ***** 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):
+# Srilatha Moturi <srilatha@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=nsMapiRegistry
+MAKE_OBJ_TYPE = DLL
+LIBRARY_NAME=$(MODULE)
+MODULE_NAME=nsMapiRegistry
+
+
+CPPSRCS= \
+	nsMapiRegistry.cpp	\
+	Registry.cpp        \
+	nsMapiRegistryUtils.cpp  \
+	$(NULL)
+
+CPP_OBJS=	\
+	.\$(OBJDIR)\nsMapiRegistry.obj	\
+	.\$(OBJDIR)\Registry.obj        \
+	.\$(OBJDIR)\nsMapiRegistryUtils.obj \
+	$(NULL)
+
+LLIBS=                               \
+ $(DIST)\lib\xpcom.lib               \
+ $(LIBNSPR)                          \
+ $(NULL)
+
+WIN_LIBS=       \
+	ole32.lib   \
+    $(NULL)
+EXPORTS=	\
+	nsMapiRegistry.h		\
+	Registry.h              \
+	nsMapiRegistryUtils.h   \
+	$(NULL)
+
+include <$(DEPTH)\config\rules.mak>
--- a/mozilla/mailnews/mapi/mapihook/src/msgMapiFactory.cpp
+++ b/mozilla/mailnews/mapi/mapihook/src/msgMapiFactory.cpp
@@ -0,0 +1,121 @@
+/* ***** 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 ***** */
+
+#undef UNICODE
+#undef _UNICODE
+
+#include "msgMapiFactory.h"
+#include "msgMapiImp.h"
+#include "msgMapi.h"
+
+const CLSID CLSID_nsMapiImp = {0x29f458be, 0x8866, 0x11d5, {0xa3, 0xdd, 0x0, 0xb0, 0xd0, 0xf3, 0xba, 0xa7}};
+
+
+nsMapiFactory::nsMapiFactory()
+: m_cRef(1)
+{
+}
+
+nsMapiFactory::~nsMapiFactory()
+{
+}
+
+STDMETHODIMP nsMapiFactory::QueryInterface(const IID& aIid, void** aPpv)
+{    
+    if ((aIid == IID_IUnknown) || (aIid == IID_IClassFactory))
+    {
+        *aPpv = static_cast<IClassFactory*>(this); 
+    }
+    else
+    {
+        *aPpv = nsnull;
+        return E_NOINTERFACE;
+    }
+    reinterpret_cast<IUnknown*>(*aPpv)->AddRef();
+    return S_OK;
+}
+
+STDMETHODIMP_(ULONG) nsMapiFactory::AddRef()
+{
+    return (PR_AtomicIncrement(&m_cRef));
+}
+
+STDMETHODIMP_(ULONG) nsMapiFactory::Release() 
+{
+    PRInt32 temp;
+    temp = PR_AtomicDecrement(&m_cRef);
+    if (m_cRef == 0)
+    {
+        delete this;
+        return 0;
+    }
+
+    return temp;
+}
+
+STDMETHODIMP nsMapiFactory::CreateInstance(IUnknown* aUnknownOuter,
+                                           const IID& aIid,
+                                           void** aPpv) 
+{
+    // Cannot aggregate.
+
+    if (aUnknownOuter != nsnull)
+    {
+        return CLASS_E_NOAGGREGATION ;
+    }
+
+    // Create component.
+
+    nsMapiImp* pImp = new nsMapiImp();
+    if (pImp == nsnull)
+    {
+        return E_OUTOFMEMORY ;
+    }
+
+    // Get the requested interface.
+    HRESULT hr = pImp->QueryInterface(aIid, aPpv);
+
+    // Release the IUnknown pointer.
+    // (If QueryInterface failed, component will delete itself.)
+
+    pImp->Release();
+    return hr;
+}
+
+STDMETHODIMP nsMapiFactory::LockServer(PRBool aLock) 
+{
+    return S_OK ;
+}
--- a/mozilla/mailnews/mapi/mapihook/src/msgMapiFactory.h
+++ b/mozilla/mailnews/mapi/mapihook/src/msgMapiFactory.h
@@ -0,0 +1,69 @@
+/* ***** 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 MSG_MAPI_FACTORY_H
+#define MSG_MAPI_FACTORY_H
+
+#include <windows.h>
+#include <objbase.h>
+#include "nspr.h"
+
+
+class nsMapiFactory : public IClassFactory
+{
+public :
+
+    // IUnknown
+
+    STDMETHODIMP            QueryInterface (REFIID aIid, void** aPpv);
+    STDMETHODIMP_(ULONG)    AddRef(void);
+    STDMETHODIMP_(ULONG)    Release(void);
+
+    // IClassFactory
+
+    STDMETHODIMP        CreateInstance (LPUNKNOWN aUnkOuter, REFIID aIid, void **aPpv);
+    STDMETHODIMP        LockServer (BOOL aLock);
+
+    nsMapiFactory();
+    ~nsMapiFactory();
+
+private :
+
+    PRInt32 m_cRef;
+};
+
+#endif  // MSG_MAPI_FACTORY_H
+
--- a/mozilla/mailnews/mapi/mapihook/src/msgMapiHook.cpp
+++ b/mozilla/mailnews/mapi/mapihook/src/msgMapiHook.cpp
@@ -0,0 +1,842 @@
+/* ***** 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): Srilatha Moturi (srilatha@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 ***** */
+
+#define MAPI_STARTUP_ARG       "/MAPIStartUp"
+
+#define MAPI_STARTUP_ARG       "/MAPIStartUp"
+
+#include <mapidefs.h>
+#include <mapi.h>
+
+#include "nsCOMPtr.h"
+#include "nsIComponentManager.h"
+#include "nsIServiceManager.h"
+#include "nsISupports.h"
+#include "nsIPromptService.h"
+#include "nsAppShellCIDs.h"
+#include "nsIDOMWindowInternal.h"
+#include "nsIAppShellService.h"
+#include "nsINativeAppSupport.h"
+#include "nsICmdLineService.h"
+#include "nsIProfileInternal.h"
+#include "nsIMsgAccountManager.h"
+#include "nsIDOMWindowInternal.h"
+#include "nsXPIDLString.h"
+#include "nsReadableUtils.h"
+#include "nsMsgBaseCID.h"
+#include "nsIStringBundle.h"
+#include "nsIPref.h"
+#include "nsString.h"
+
+#include "nsIMsgCompFields.h"
+#include "nsIMsgComposeParams.h"
+#include "nsIMsgCompose.h"
+#include "nsMsgCompCID.h"
+#include "nsIMsgSend.h"
+#include "nsIProxyObjectManager.h"
+#include "nsIMsgComposeService.h"
+#include "nsProxiedService.h"
+#include "nsSpecialSystemDirectory.h"
+#include "nsMsgI18N.h"
+
+#include "msgMapi.h"
+#include "msgMapiHook.h"
+#include "msgMapiSupport.h"
+#include "msgMapiMain.h"
+
+static NS_DEFINE_CID(kCmdLineServiceCID, NS_COMMANDLINE_SERVICE_CID);
+
+#define MAPI_PROPERTIES_CHROME  "chrome://messenger/locale/mapi.properties"
+#define PREF_MAPI_WARN_PRIOR_TO_BLIND_SEND "mapi.blind-send.warn"
+#define PREF_MAPI_BLIND_SEND_ENABLED       "mapi.blind-send.enabled"
+
+class nsMAPISendListener : public nsIMsgSendListener
+{
+public:
+
+    virtual ~nsMAPISendListener() { }
+
+    // nsISupports interface
+    NS_DECL_ISUPPORTS
+
+    /* void OnStartSending (in string aMsgID, in PRUint32 aMsgSize); */
+    NS_IMETHOD OnStartSending(const char *aMsgID, PRUint32 aMsgSize) { return NS_OK; }
+
+    /* void OnProgress (in string aMsgID, in PRUint32 aProgress, in PRUint32 aProgressMax); */
+    NS_IMETHOD OnProgress(const char *aMsgID, PRUint32 aProgress, PRUint32 aProgressMax) { return NS_OK;}
+
+    /* void OnStatus (in string aMsgID, in wstring aMsg); */
+    NS_IMETHOD OnStatus(const char *aMsgID, const PRUnichar *aMsg) { return NS_OK;}
+
+    /* void OnStopSending (in string aMsgID, in nsresult aStatus, in wstring aMsg, in nsIFileSpec returnFileSpec); */
+    NS_IMETHOD OnStopSending(const char *aMsgID, nsresult aStatus, const PRUnichar *aMsg, 
+                           nsIFileSpec *returnFileSpec) {
+#ifdef RAJIV_DEBUG 
+        printf("Sending Done - OnStopSending \n");
+#endif
+        m_done = PR_TRUE;
+        return NS_OK ;
+    }
+
+    /* void OnGetDraftFolderURI (); */
+    NS_IMETHOD OnGetDraftFolderURI(const char *aFolderURI) {return NS_OK;}
+
+    static nsresult CreateMAPISendListener( nsIMsgSendListener **ppListener);
+
+    PRBool IsDone() { return m_done ; }
+
+protected :
+    nsMAPISendListener() {
+        NS_INIT_REFCNT(); 
+        m_done = PR_FALSE;
+    }
+
+    PRBool          m_done;
+};
+
+
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsMAPISendListener, nsIMsgSendListener)
+
+nsresult nsMAPISendListener::CreateMAPISendListener( nsIMsgSendListener **ppListener)
+{
+    NS_ENSURE_ARG_POINTER(ppListener) ;
+
+    *ppListener = new nsMAPISendListener();
+    if (! *ppListener)
+        return NS_ERROR_OUT_OF_MEMORY;
+
+    NS_ADDREF(*ppListener);
+    return NS_OK;
+}
+
+PRBool nsMapiHook::isMapiService = PR_FALSE;
+
+PRBool nsMapiHook::Initialize()
+{
+    nsresult rv;
+    nsCOMPtr<nsINativeAppSupport> native;
+
+    nsCOMPtr<nsICmdLineService> cmdLineArgs(do_GetService(kCmdLineServiceCID, &rv));
+    if (NS_FAILED(rv)) return PR_FALSE;
+
+    nsCOMPtr<nsIAppShellService> appShell (do_GetService( "@mozilla.org/appshell/appShellService;1", &rv));
+    if (NS_FAILED(rv)) return PR_FALSE;
+
+    rv = appShell->GetNativeAppSupport( getter_AddRefs( native ));
+    if (NS_FAILED(rv)) return PR_FALSE;
+
+    rv = native->EnsureProfile(cmdLineArgs);
+    if (NS_FAILED(rv)) return PR_FALSE;
+
+    return PR_TRUE;
+}
+
+void nsMapiHook::CleanUp()
+{
+    // This routine will be fully implemented in future
+    // to cleanup mapi related stuff inside mozilla code.
+}
+
+PRBool nsMapiHook::DisplayLoginDialog(PRBool aLogin, PRUnichar **aUsername, \
+                      PRUnichar **aPassword)
+{
+    nsresult rv;
+    PRBool btnResult = PR_FALSE;
+
+    nsCOMPtr<nsIAppShellService> appShell(do_GetService( "@mozilla.org/appshell/appShellService;1", &rv));
+    if (NS_FAILED(rv) || !appShell) return PR_FALSE;
+   
+    nsCOMPtr<nsIPromptService> dlgService(do_GetService("@mozilla.org/embedcomp/prompt-service;1", &rv));
+    if (NS_SUCCEEDED(rv) && dlgService)
+    {
+        nsCOMPtr<nsIStringBundleService> bundleService(do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv));
+        if (NS_FAILED(rv) || !bundleService) return PR_FALSE;
+
+        nsCOMPtr<nsIStringBundle> bundle;
+        rv = bundleService->CreateBundle(MAPI_PROPERTIES_CHROME, getter_AddRefs(bundle));
+        if (NS_FAILED(rv) || !bundle) return PR_FALSE;
+
+        nsCOMPtr<nsIStringBundle> brandBundle;
+        rv = bundleService->CreateBundle(
+                        "chrome://global/locale/brand.properties",
+                        getter_AddRefs(brandBundle));
+        if (NS_FAILED(rv)) return PR_FALSE;
+
+        nsXPIDLString brandName;
+        rv = brandBundle->GetStringFromName(
+                           NS_LITERAL_STRING("brandShortName").get(),
+                           getter_Copies(brandName));
+        if (NS_FAILED(rv)) return PR_FALSE;
+        
+        nsXPIDLString loginTitle;
+        const PRUnichar *brandStrings[] = { brandName.get() };
+        NS_NAMED_LITERAL_STRING(loginTitlePropertyTag, "loginTitle");
+        const PRUnichar *dTitlePropertyTag = loginTitlePropertyTag.get();
+        rv = bundle->FormatStringFromName(dTitlePropertyTag, brandStrings, 1,
+                                          getter_Copies(loginTitle));
+        if (NS_FAILED(rv)) return PR_FALSE;
+        
+        if (aLogin)
+        {
+            nsXPIDLString loginText;
+            rv = bundle->GetStringFromName(NS_LITERAL_STRING("loginTextwithName").get(),
+                                           getter_Copies(loginText));
+            if (NS_FAILED(rv) || !loginText) return PR_FALSE;
+
+
+
+            rv = dlgService->PromptUsernameAndPassword(nsnull, loginTitle,
+                                                       loginText, aUsername, aPassword,
+                                                       nsnull, PR_FALSE, &btnResult);
+        }
+        else
+        {
+            //nsString loginString; 
+            nsXPIDLString loginText;
+            const PRUnichar *userNameStrings[] = { *aUsername };
+
+            NS_NAMED_LITERAL_STRING(loginTextPropertyTag, "loginText");
+            const PRUnichar *dpropertyTag = loginTextPropertyTag.get();
+            rv = bundle->FormatStringFromName(dpropertyTag, userNameStrings, 1,
+                                              getter_Copies(loginText));
+            if (NS_FAILED(rv)) return PR_FALSE;
+
+            rv = dlgService->PromptPassword(nsnull, loginTitle, loginText,
+                                            aPassword, nsnull, PR_FALSE, &btnResult);
+        }
+    }            
+
+    return btnResult;
+}
+
+PRBool nsMapiHook::VerifyUserName(const PRUnichar *aUsername, char **aIdKey)
+{
+    nsresult rv;
+
+    if (aUsername == nsnull)
+        return PR_FALSE;
+
+    nsCOMPtr<nsIMsgAccountManager> accountManager(do_GetService(NS_MSGACCOUNTMANAGER_CONTRACTID, &rv));
+    if (NS_FAILED(rv)) return PR_FALSE;
+    nsCOMPtr<nsISupportsArray> identities;
+    rv = accountManager->GetAllIdentities(getter_AddRefs(identities));
+    if (NS_FAILED(rv)) return PR_FALSE;
+    PRUint32 numIndentities;
+    identities->Count(&numIndentities);
+
+    for (PRUint32 i = 0; i < numIndentities; i++)
+    {
+        // convert supports->Identity
+        nsCOMPtr<nsISupports> thisSupports;
+        rv = identities->GetElementAt(i, getter_AddRefs(thisSupports));
+        if (NS_FAILED(rv)) continue;
+        nsCOMPtr<nsIMsgIdentity> thisIdentity(do_QueryInterface(thisSupports, &rv));
+        if (NS_SUCCEEDED(rv) && thisIdentity)
+        {
+            nsXPIDLCString email;
+            rv = thisIdentity->GetEmail(getter_Copies(email));
+            if (NS_FAILED(rv)) continue;
+
+            // get the username from the email and compare with the username
+            nsCAutoString aEmail(email.get());
+            PRInt32 index = aEmail.FindChar('@');
+            if (index != -1)
+                aEmail.Truncate(index);
+
+if (nsDependentString(aUsername) == NS_ConvertASCIItoUCS2(aEmail))  // == overloaded
+                return NS_SUCCEEDED(thisIdentity->GetKey(aIdKey));
+        }
+    }
+
+    return PR_FALSE;
+}
+
+PRBool 
+nsMapiHook::IsBlindSendAllowed()
+{
+    PRBool enabled = PR_FALSE;
+    PRBool warn = PR_TRUE;
+    nsCOMPtr<nsIPref> prefs = do_GetService(NS_PREF_CONTRACTID);
+    if (prefs) {
+	    prefs->GetBoolPref(PREF_MAPI_WARN_PRIOR_TO_BLIND_SEND,&warn);
+            prefs->GetBoolPref(PREF_MAPI_BLIND_SEND_ENABLED,&enabled);
+    } 
+    if (!enabled)
+        return PR_FALSE;
+
+    if (!warn)
+        return PR_TRUE; // Everything is okay.  
+
+    nsresult rv;
+    nsCOMPtr<nsIStringBundleService> bundleService(do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv));
+    if (NS_FAILED(rv) || !bundleService) return PR_FALSE;
+
+    nsCOMPtr<nsIStringBundle> bundle;
+    rv = bundleService->CreateBundle(MAPI_PROPERTIES_CHROME, getter_AddRefs(bundle));
+    if (NS_FAILED(rv) || !bundle) return PR_FALSE;
+
+    nsXPIDLString warningMsg;
+    rv = bundle->GetStringFromName(NS_LITERAL_STRING("mapiBlindSendWarning").get(),
+                                        getter_Copies(warningMsg));
+    if (NS_FAILED(rv)) return PR_FALSE;
+    
+   nsXPIDLString dontShowAgainMessage;
+    rv = bundle->GetStringFromName(NS_LITERAL_STRING("mapiBlindSendDontShowAgain").get(),
+                                        getter_Copies(dontShowAgainMessage));
+    if (NS_FAILED(rv)) return PR_FALSE;
+
+    nsCOMPtr<nsIPromptService> dlgService(do_GetService("@mozilla.org/embedcomp/prompt-service;1", &rv));
+    if (NS_FAILED(rv) || !dlgService) return PR_FALSE;
+    
+    PRBool continueToWarn = PR_TRUE;
+    PRBool okayToContinue = PR_FALSE;
+    dlgService->ConfirmCheck(nsnull, nsnull, warningMsg, dontShowAgainMessage, &continueToWarn, &okayToContinue);
+        
+    if (!continueToWarn && okayToContinue && prefs)
+        prefs->SetBoolPref(PREF_MAPI_WARN_PRIOR_TO_BLIND_SEND,PR_FALSE);
+    
+    return okayToContinue;
+        
+}
+
+// this is used for Send without UI
+nsresult nsMapiHook::BlindSendMail (unsigned long aSession, nsIMsgCompFields * aCompFields) 
+{
+    nsresult rv = NS_OK ;
+
+    if (!IsBlindSendAllowed())
+        return NS_ERROR_FAILURE;
+
+    /** create nsIMsgComposeParams obj and other fields to populate it **/    
+
+    // get parent window
+    nsCOMPtr<nsIAppShellService> appService = do_GetService( "@mozilla.org/appshell/appShellService;1", &rv);
+    if (NS_FAILED(rv)|| (!appService) ) return rv ;
+
+    nsCOMPtr<nsIDOMWindowInternal>  hiddenWindow;
+    rv = appService->GetHiddenDOMWindow(getter_AddRefs(hiddenWindow));
+
+    if ( NS_FAILED(rv) ) return rv ;
+
+    // smtp password and Logged in used IdKey from MapiConfig (session obj)
+    nsMAPIConfiguration * pMapiConfig = nsMAPIConfiguration::GetMAPIConfiguration() ;
+    if (!pMapiConfig) return NS_ERROR_FAILURE ;  // get the singelton obj
+    PRUnichar * password = pMapiConfig->GetPassWord(aSession) ;
+    // password
+    nsCAutoString smtpPassword ;
+    smtpPassword.AssignWithConversion (password) ;
+    // Id key
+    char * MsgIdKey = pMapiConfig->GetIdKey(aSession) ;
+
+    // get the MsgIdentity for the above key using AccountManager
+    nsCOMPtr <nsIMsgAccountManager> accountManager = do_GetService (NS_MSGACCOUNTMANAGER_CONTRACTID) ;
+    if (NS_FAILED(rv) || (!accountManager) ) return rv ;
+
+    nsCOMPtr <nsIMsgIdentity> pMsgId ;
+    rv = accountManager->GetIdentity (MsgIdKey, getter_AddRefs(pMsgId)) ;
+    if (NS_FAILED(rv) ) return rv ;
+
+    // create a send listener to get back the send status
+    nsCOMPtr <nsIMsgSendListener> sendListener ;
+    rv = nsMAPISendListener::CreateMAPISendListener(getter_AddRefs(sendListener)) ; 
+    if (NS_FAILED(rv) || (!sendListener) ) return rv;
+
+    // create the compose params object 
+    nsCOMPtr<nsIMsgComposeParams> pMsgComposeParams (do_CreateInstance(NS_MSGCOMPOSEPARAMS_CONTRACTID, &rv));
+    if (NS_FAILED(rv) || (!pMsgComposeParams) ) return rv ;
+
+    // populate the compose params
+    pMsgComposeParams->SetType(nsIMsgCompType::New);
+    pMsgComposeParams->SetFormat(nsIMsgCompFormat::Default);
+    pMsgComposeParams->SetIdentity(pMsgId);
+    pMsgComposeParams->SetComposeFields(aCompFields); 
+    pMsgComposeParams->SetSendListener(sendListener) ;
+    pMsgComposeParams->SetSmtpPassword(smtpPassword);
+
+    // create the nsIMsgCompose object to send the object
+    nsCOMPtr<nsIMsgCompose> pMsgCompose (do_CreateInstance(NS_MSGCOMPOSE_CONTRACTID, &rv));
+    if (NS_FAILED(rv) || (!pMsgCompose) ) return rv ;
+
+    /** initialize nsIMsgCompose, Send the message, wait for send completion response **/
+
+    rv = pMsgCompose->Initialize(hiddenWindow, pMsgComposeParams) ;
+    if (NS_FAILED(rv)) return rv ;
+
+    pMsgCompose->SendMsg(nsIMsgSend::nsMsgDeliverNow, pMsgId, nsnull) ;
+    if (NS_FAILED(rv)) return rv ;
+
+    // assign to interface pointer from nsCOMPtr to facilitate typecast below
+    nsIMsgSendListener * pSendListener = sendListener ;  
+
+    // we need to wait here to make sure that we return only after send is completed
+    // so we will have a event loop here which will process the events till the Send IsDone.
+    nsCOMPtr<nsIEventQueueService> pEventQService = do_GetService(NS_EVENTQUEUESERVICE_CONTRACTID, &rv);
+    nsCOMPtr<nsIEventQueue> eventQueue;
+    pEventQService->GetThreadEventQueue(NS_CURRENT_THREAD,getter_AddRefs(eventQueue));
+    while ( !((nsMAPISendListener *) pSendListener)->IsDone() )
+        eventQueue->ProcessPendingEvents();
+
+    return rv ;
+}
+
+// this is used to populate comp fields with Unicode data
+nsresult nsMapiHook::PopulateCompFields(lpnsMapiMessage aMessage, 
+                                    nsIMsgCompFields * aCompFields)
+{
+    nsresult rv = NS_OK ;
+
+    if (aMessage->lpOriginator)
+    {
+        PRUnichar * From = aMessage->lpOriginator->lpszAddress ;
+        aCompFields->SetFrom (From) ;
+    }
+
+    nsAutoString To ;
+    nsAutoString Cc ; 
+    nsAutoString Bcc ;
+
+    nsAutoString Comma ;
+    Comma.AssignWithConversion(",");
+
+    if (aMessage->lpRecips)
+    {
+        for (int i=0 ; i < (int) aMessage->nRecipCount ; i++)
+        {
+            if (aMessage->lpRecips[i].lpszAddress)
+            {
+                switch (aMessage->lpRecips[i].ulRecipClass)
+                {
+                case MAPI_TO :
+                    if (To.Length() > 0)
+                        To += Comma ;
+                    To += (PRUnichar *) aMessage->lpRecips[i].lpszAddress ;
+                    break ;
+
+                case MAPI_CC :
+                    if (Cc.Length() > 0)
+                        Cc += Comma ;
+                    Cc += (PRUnichar *) aMessage->lpRecips[i].lpszAddress ; 
+                    break ;
+
+                case MAPI_BCC :
+                    if (Bcc.Length() > 0)
+                        Bcc += Comma ;
+                    Bcc += (PRUnichar *) aMessage->lpRecips[i].lpszAddress ; 
+                    break ;
+                }
+            }
+        }
+    }
+
+    // set To, Cc, Bcc
+    aCompFields->SetTo (To.get()) ;
+    aCompFields->SetCc (Cc.get()) ;
+    aCompFields->SetBcc (Bcc.get()) ;
+
+    // set subject
+    if (aMessage->lpszSubject)
+    {
+        PRUnichar * Subject = aMessage->lpszSubject ;
+        aCompFields->SetSubject(Subject) ;
+    }
+
+    // handle attachments as File URL
+    rv = HandleAttachments (aCompFields, aMessage->nFileCount, aMessage->lpFiles, PR_TRUE) ;
+    if (NS_FAILED(rv)) return rv ;    
+
+    // set body
+    if (aMessage->lpszNoteText)
+    {
+        PRUnichar * Body = aMessage->lpszNoteText ;
+        rv = aCompFields->SetBody(Body) ;
+    }
+
+#ifdef RAJIV_DEBUG
+    // testing what all was set in CompFields
+    printf ("To : %S \n", To.get()) ;
+    printf ("CC : %S \n", Cc.get() ) ;
+    printf ("BCC : %S \n", Bcc.get() ) ;
+#endif
+
+    return rv ;
+
+}
+
+nsresult nsMapiHook::HandleAttachments (nsIMsgCompFields * aCompFields, PRInt32 aFileCount, 
+                                        lpnsMapiFileDesc aFiles, BOOL aIsUnicode)
+{
+    nsresult rv = NS_OK ;
+
+    nsCAutoString Attachments ;
+    nsCAutoString TempFiles ;
+
+    nsCOMPtr <nsILocalFile> pFile = do_CreateInstance (NS_LOCAL_FILE_CONTRACTID, &rv) ;
+    if (NS_FAILED(rv) || (!pFile) ) return rv ;        
+    nsCOMPtr <nsILocalFile> pTempDir = do_CreateInstance (NS_LOCAL_FILE_CONTRACTID, &rv) ;
+    if (NS_FAILED(rv) || (!pTempDir) ) return rv ;        
+
+    for (int i=0 ; i < aFileCount ; i++)
+    {
+        PRBool bTempFile = PR_FALSE ;
+        if (aFiles[i].lpszPathName)
+        {
+            if (aIsUnicode)
+                pFile->InitWithUnicodePath (aFiles[i].lpszPathName) ; 
+            else
+                pFile->InitWithPath ((char *) aFiles[i].lpszPathName) ; 
+            PRBool bExist ;
+            rv = pFile->Exists(&bExist) ;
+            if (NS_FAILED(rv) || (!bExist) ) return NS_ERROR_FILE_TARGET_DOES_NOT_EXIST ;
+
+            // we do this since MS Office apps create a temp file when sending  
+            // the currently open document in that app
+            if (aFiles[i].lpszFileName)
+            {
+                // Win temp Path
+                nsAutoString tempPath ;
+                nsSpecialSystemDirectory tmpDir(nsSpecialSystemDirectory::OS_TemporaryDirectory);
+                ((nsFileSpec*)&tmpDir)->GetNativePathString(tempPath);
+                tempPath.ToLowerCase() ;
+
+                // filename of the file attachment
+                nsXPIDLString pLeafName ;
+                pFile->GetUnicodeLeafName (getter_Copies(pLeafName)) ;
+
+                // dir path of the file attachment
+                nsXPIDLString pPath ;
+                pFile->GetUnicodePath (getter_Copies(pPath)) ;
+                nsAutoString Path ;
+                Path.Assign(pPath.get()) ;
+
+                nsAutoString LeafName ;
+                LeafName.Assign (pLeafName.get());
+                PRInt32 offset = Path.RFind (LeafName) ;
+                Path.SetLength(offset) ;
+                Path.ToLowerCase() ;
+
+                if (tempPath == Path)
+                {
+                    // create another temp dir for mapi within Win temp dir
+                    nsAutoString strTempDir ;
+                    strTempDir += tempPath.get() ; 
+                    strTempDir.AppendWithConversion("moz_mapi") ; 
+                    pTempDir->InitWithUnicodePath (strTempDir.get()) ;
+                    pTempDir->Exists (&bExist) ;
+                    if (!bExist)
+                    {
+                        rv = pTempDir->Create(nsIFile::DIRECTORY_TYPE, 777) ;
+                        if (NS_FAILED(rv)) return rv ;
+                    }
+                    // filename passed for the file attachment
+                    if (aIsUnicode)
+                    {
+                        nsAutoString RealFileName ;
+                        RealFileName.Assign (aFiles[i].lpszFileName) ;
+                        // copy to our mapi temp dir with real name
+                        rv = pFile->CopyToUnicode(pTempDir, RealFileName.get()) ;
+                        if (NS_FAILED(rv)) return rv ;
+                        pFile->InitWithUnicodePath(strTempDir.get()) ;
+                        pFile->AppendUnicode (RealFileName.get()) ;
+                    }
+                    else
+                    {
+                        nsCAutoString asciiRealFileName ;
+                        asciiRealFileName.Assign((char *) aFiles[i].lpszFileName) ;
+                        nsCAutoString asciiLeafName ;
+                        asciiLeafName.AssignWithConversion (pLeafName.get());
+                        // copy to our mapi temp dir with real name
+                        rv = pFile->CopyTo(pTempDir, asciiRealFileName.get()) ;
+                        if (NS_FAILED(rv)) return rv ;
+                        pFile->InitWithUnicodePath(strTempDir.get()) ;
+                        pFile->Append (asciiRealFileName.get()) ;
+                    }
+                    // this one is a temp file
+                    bTempFile = PR_TRUE ;
+                }
+            }
+            // get url 
+            nsXPIDLCString pURL ;
+            pFile->GetURL (getter_Copies(pURL)) ;
+            if (pURL)
+            {
+                if (Attachments.Length() > 0)
+                    Attachments.Append(",") ;
+                Attachments.Append(pURL) ;
+                if (bTempFile)
+                {
+                    if (TempFiles.Length() > 0)
+                        TempFiles.Append(",") ;
+                    TempFiles.Append(pURL) ;
+                }
+            }
+        }
+    }
+    // set attachment
+    if (Attachments.Length() > 0)
+        rv = aCompFields->SetAttachments (Attachments.get());
+    // set temp file
+    if (TempFiles.Length() > 0)
+        rv = aCompFields->SetTemporaryFiles(TempFiles.get());
+
+#ifdef RAJIV_DEBUG
+    printf ("Attachments : %s \n", Attachments.get()) ;
+    printf ("TempFiles : %s \n", TempFiles.get()) ;
+#endif
+
+    return rv ;
+}
+
+
+// this is used to convert non Unicode data and then populate comp fields
+nsresult nsMapiHook::PopulateCompFieldsWithConversion(lpnsMapiMessage aMessage, 
+                                    nsIMsgCompFields * aCompFields)
+{
+    nsresult rv = NS_OK ;
+
+    if (aMessage->lpOriginator)
+    {
+        nsAutoString From ;
+        From.AssignWithConversion((char *) aMessage->lpOriginator->lpszAddress);
+        aCompFields->SetFrom (From.get()) ;
+    }
+
+    nsAutoString To ;
+    nsAutoString Cc ; 
+    nsAutoString Bcc ;
+
+    nsAutoString Comma ;
+    Comma.AssignWithConversion(",");
+
+    if (aMessage->lpRecips)
+    {
+        for (int i=0 ; i < (int) aMessage->nRecipCount ; i++)
+        {
+            if (aMessage->lpRecips[i].lpszAddress)
+            {
+                switch (aMessage->lpRecips[i].ulRecipClass)
+                {
+                case MAPI_TO :
+                    if (To.Length() > 0)
+                        To += Comma ;
+                    To.AppendWithConversion ((char *) aMessage->lpRecips[i].lpszAddress);
+                    break ;
+
+                case MAPI_CC :
+                    if (Cc.Length() > 0)
+                        Cc += Comma ;
+                    Cc.AppendWithConversion ((char *) aMessage->lpRecips[i].lpszAddress); 
+                    break ;
+
+                case MAPI_BCC :
+                    if (Bcc.Length() > 0)
+                        Bcc += Comma ;
+                    Bcc.AppendWithConversion ((char *) aMessage->lpRecips[i].lpszAddress) ; 
+                    break ;
+                }
+            }
+        }
+    }
+    
+    // set To, Cc, Bcc
+    aCompFields->SetTo (To.get()) ;
+    aCompFields->SetCc (Cc.get()) ;
+    aCompFields->SetBcc (Bcc.get()) ;
+
+    nsAutoString platformCharSet;
+    // set subject
+    if (aMessage->lpszSubject)
+    {
+        nsAutoString Subject ;
+        if (platformCharSet.IsEmpty())
+            platformCharSet.Assign(nsMsgI18NFileSystemCharset());
+        rv = ConvertToUnicode(platformCharSet, (char *) aMessage->lpszSubject, Subject);
+        if (NS_FAILED(rv)) return rv ;         
+        aCompFields->SetSubject(Subject.get()) ;
+    }
+
+    // handle attachments as File URL
+    rv = HandleAttachments (aCompFields, aMessage->nFileCount, aMessage->lpFiles, PR_FALSE) ;
+    if (NS_FAILED(rv)) return rv ;    
+
+    // set body
+    if (aMessage->lpszNoteText)
+    {
+        nsAutoString Body ;
+        if (platformCharSet.IsEmpty())
+            platformCharSet.Assign(nsMsgI18NFileSystemCharset());
+        rv = ConvertToUnicode(platformCharSet, (char *) aMessage->lpszNoteText, Body);
+        if (NS_FAILED(rv)) return rv ;
+        rv = aCompFields->SetBody(Body.get()) ;
+    }
+
+#ifdef RAJIV_DEBUG
+    // testing what all was set in CompFields
+    printf ("To : %S \n", To.get()) ;
+    printf ("CC : %S \n", Cc.get() ) ;
+    printf ("BCC : %S \n", Bcc.get() ) ;
+#endif
+
+    return rv ;
+}
+
+// this is used to populate the docs as attachments in the Comp fields for Send Documents
+nsresult nsMapiHook::PopulateCompFieldsForSendDocs(nsIMsgCompFields * aCompFields, ULONG aFlags, 
+                            PRUnichar * aDelimChar, PRUnichar * aFilePaths)
+{
+    nsAutoString strDelimChars ;
+    nsString strFilePaths;
+    nsresult rv = NS_OK ;
+
+    if (aFlags & MAPI_UNICODE)
+    {
+        if (aDelimChar)
+            strDelimChars.Assign (aDelimChar) ;
+        if (aFilePaths)
+            strFilePaths.Assign (aFilePaths) ;
+    }
+	else
+    {
+        if (aDelimChar)
+            strDelimChars.AssignWithConversion ((char*) aDelimChar) ;
+        if (aFilePaths)
+            strFilePaths.AssignWithConversion ((char *) aFilePaths) ;
+    }
+
+    // check for comma in filename 
+    if (strDelimChars.Find (",") == kNotFound)  // if comma is not in the delimiter specified by user
+    {
+        if (strFilePaths.Find(",") != kNotFound) // if comma found in filenames return error
+            return NS_ERROR_FILE_INVALID_PATH ;
+    }
+
+    nsCString Attachments ;
+
+    // only 1 file is to be sent, no delim specified
+    if ((!strDelimChars.Length()) && (strFilePaths.Length()>0))
+    {
+        nsCOMPtr <nsILocalFile> pFile = do_CreateInstance (NS_LOCAL_FILE_CONTRACTID, &rv) ;
+        if (NS_FAILED(rv) || (!pFile) ) return rv ;        
+        pFile->InitWithUnicodePath (strFilePaths.get()) ;
+
+        PRBool bExist ;
+        rv = pFile->Exists(&bExist) ;
+        if (NS_FAILED(rv) || (!bExist) ) return NS_ERROR_FILE_TARGET_DOES_NOT_EXIST ;
+
+        nsXPIDLCString pURL ;
+        pFile->GetURL (getter_Copies(pURL)) ;
+        if (pURL)
+            Attachments.Assign(pURL) ;
+
+        // set attachments for comp field and return
+        rv = aCompFields->SetAttachments (Attachments.get());
+        return rv ;
+    }
+
+    // multiple files to be sent, delim specified
+    nsCOMPtr <nsILocalFile> pFile = do_CreateInstance (NS_LOCAL_FILE_CONTRACTID, &rv) ;
+    if (NS_FAILED(rv) || (!pFile) ) return rv ;        
+    PRInt32 offset = 0 ;
+    PRInt32 FilePathsLen = strFilePaths.Length() ;
+    if (FilePathsLen)
+    {
+        PRUnichar * newFilePaths = (PRUnichar *) strFilePaths.get() ;
+        while (offset != kNotFound)
+        {
+            nsString RemainingPaths ;
+            RemainingPaths.Assign(newFilePaths) ;
+            offset = RemainingPaths.Find (strDelimChars) ;
+            if (offset != kNotFound)
+            {
+                RemainingPaths.SetLength (offset) ;
+                if ((offset + strDelimChars.Length()) < FilePathsLen)
+                    newFilePaths += offset + strDelimChars.Length() ;
+            }
+
+            pFile->InitWithUnicodePath (RemainingPaths.get()) ;
+
+    #ifdef RAJIV_DEBUG
+            printf ("File : %S \n", RemainingPaths.get()) ; 
+    #endif 
+            PRBool bExist ;
+            rv = pFile->Exists(&bExist) ;
+            if (NS_FAILED(rv) || (!bExist) ) return NS_ERROR_FILE_TARGET_DOES_NOT_EXIST ;
+
+            nsXPIDLCString pURL ;
+            pFile->GetURL (getter_Copies(pURL)) ;
+            if (pURL)
+            {
+				if (Attachments.Length() > 0)
+					Attachments.Append(",") ;
+                Attachments.Append(pURL) ;
+            }
+        }
+        rv = aCompFields->SetAttachments (Attachments.get());
+    }
+
+    return rv ;
+}
+
+// this used for Send with UI
+nsresult nsMapiHook::ShowComposerWindow (unsigned long aSession, nsIMsgCompFields * aCompFields) 
+{
+    nsresult rv = NS_OK ;
+
+    // create a send listener to get back the send status
+    nsCOMPtr <nsIMsgSendListener> sendListener ;
+    rv = nsMAPISendListener::CreateMAPISendListener(getter_AddRefs(sendListener)) ; 
+    if (NS_FAILED(rv) || (!sendListener) ) return rv ;
+
+    // create the compose params object 
+    nsCOMPtr<nsIMsgComposeParams> pMsgComposeParams (do_CreateInstance(NS_MSGCOMPOSEPARAMS_CONTRACTID, &rv));
+    if (NS_FAILED(rv) || (!pMsgComposeParams) ) return rv ;
+
+    // populate the compose params
+    pMsgComposeParams->SetType(nsIMsgCompType::New);
+    pMsgComposeParams->SetFormat(nsIMsgCompFormat::Default);
+    pMsgComposeParams->SetComposeFields(aCompFields); 
+    pMsgComposeParams->SetSendListener(sendListener) ;
+
+    /** get the nsIMsgComposeService object to open the compose window **/
+    nsCOMPtr <nsIMsgComposeService> compService = do_GetService (NS_MSGCOMPOSESERVICE_CONTRACTID) ;
+    if (NS_FAILED(rv)|| (!compService) ) return rv ;
+
+    rv = compService->OpenComposeWindowWithParams(nsnull, pMsgComposeParams) ;
+    if (NS_FAILED(rv)) return rv ;
+
+    return rv ;
+}
--- a/mozilla/mailnews/mapi/mapihook/src/msgMapiHook.h
+++ b/mozilla/mailnews/mapi/mapihook/src/msgMapiHook.h
@@ -0,0 +1,66 @@
+/* ***** 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 MSG_MAPI_HOOK_H_
+#define MSG_MAPI_HOOK_H_
+
+#include "prtypes.h"
+
+class nsMapiHook
+{
+    public :
+
+        static PRBool Initialize();
+        static PRBool DisplayLoginDialog(PRBool aLogin, PRUnichar **aUsername, 
+                        PRUnichar **aPassword);
+        static PRBool VerifyUserName(const PRUnichar *aUsername, char **aIdKey);
+
+        static PRBool IsBlindSendAllowed () ;
+        static nsresult BlindSendMail (unsigned long aSession, nsIMsgCompFields * aCompFields) ;
+        static nsresult ShowComposerWindow (unsigned long aSession, nsIMsgCompFields * aCompFields) ;
+        static nsresult PopulateCompFields(lpnsMapiMessage aMessage, nsIMsgCompFields * aCompFields) ;
+        static nsresult PopulateCompFieldsWithConversion(lpnsMapiMessage aMessage, 
+                                        nsIMsgCompFields * aCompFields) ;
+        static nsresult PopulateCompFieldsForSendDocs(nsIMsgCompFields * aCompFields, 
+                                        ULONG aFlags, LPTSTR aDelimChar, LPTSTR aFilePaths) ;
+        static nsresult HandleAttachments (nsIMsgCompFields * aCompFields, PRInt32 aFileCount, 
+                                        lpnsMapiFileDesc aFiles, BOOL aIsUnicode) ;
+        static void CleanUp();
+
+        static PRBool isMapiService;
+};
+
+#endif  // MSG_MAPI_HOOK_H_
--- a/mozilla/mailnews/mapi/mapihook/src/msgMapiImp.cpp
+++ b/mozilla/mailnews/mapi/mapihook/src/msgMapiImp.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 <mapidefs.h>
+#include <mapi.h>
+#include "msgMapi.h"
+#include "msgMapiImp.h"
+#include "msgMapiFactory.h"
+#include "msgMapiMain.h"
+
+#include "nsMsgCompFields.h"
+#include "msgMapiHook.h"
+#include "nsString.h"
+#include "nsCOMPtr.h"
+#include "nsISupports.h"
+#include "nsMsgCompCID.h"
+#include "nsMsgComposeStringBundle.h"
+
+
+const CLSID CLSID_nsMapiImp = {0x29f458be, 0x8866, 0x11d5, {0xa3, 0xdd, 0x0, 0xb0, 0xd0, 0xf3, 0xba, 0xa7}};
+
+nsMapiImp::nsMapiImp()
+: m_cRef(1)
+{
+    m_Lock = PR_NewLock();
+}
+
+nsMapiImp::~nsMapiImp() 
+{ 
+    if (m_Lock)
+        PR_DestroyLock(m_Lock);
+}
+
+STDMETHODIMP nsMapiImp::QueryInterface(const IID& aIid, void** aPpv)
+{    
+    if (aIid == IID_IUnknown)
+    {
+        *aPpv = static_cast<nsIMapi*>(this); 
+    }
+    else if (aIid == IID_nsIMapi)
+    {
+        *aPpv = static_cast<nsIMapi*>(this);
+    }
+    else
+    {
+        *aPpv = nsnull;
+        return E_NOINTERFACE;
+    }
+
+    reinterpret_cast<IUnknown*>(*aPpv)->AddRef();
+    return S_OK;
+}
+
+STDMETHODIMP_(ULONG) nsMapiImp::AddRef()
+{
+    return PR_AtomicIncrement(&m_cRef);
+}
+
+STDMETHODIMP_(ULONG) nsMapiImp::Release() 
+{
+    PRInt32 temp;
+    temp = PR_AtomicDecrement(&m_cRef);
+    if (m_cRef == 0)
+    {
+        delete this;
+        return 0;
+    }
+
+    return temp;
+}
+
+STDMETHODIMP nsMapiImp::IsValid()
+{
+    return S_OK;
+}
+
+STDMETHODIMP nsMapiImp::IsValidSession(unsigned long aSession)
+{
+    nsMAPIConfiguration *pConfig = nsMAPIConfiguration::GetMAPIConfiguration();
+    if (pConfig && pConfig->IsSessionValid(aSession))
+        return S_OK;
+
+    return E_FAIL;
+}
+
+STDMETHODIMP nsMapiImp::Initialize()
+{
+    HRESULT hr = E_FAIL;
+
+    if (!m_Lock)
+        return E_FAIL;
+
+    PR_Lock(m_Lock);
+
+    // Initialize MAPI Configuration
+
+    nsMAPIConfiguration *pConfig = nsMAPIConfiguration::GetMAPIConfiguration();
+    if (pConfig != nsnull)
+        if (nsMapiHook::Initialize())
+            hr = S_OK;
+
+    PR_Unlock(m_Lock);
+
+    return hr;
+}
+
+STDMETHODIMP nsMapiImp::Login(unsigned long aUIArg, LOGIN_PW_TYPE aLogin, LOGIN_PW_TYPE aPassWord,
+                unsigned long aFlags, unsigned long *aSessionId)
+{
+    HRESULT hr = E_FAIL;
+    PRBool bNewSession = PR_FALSE;
+    char *id_key = nsnull;
+
+    if (aFlags & MAPI_NEW_SESSION)
+        bNewSession = PR_TRUE;
+
+    // Check For Profile Name
+
+    if (aLogin != nsnull && aLogin[0] != '\0')
+    {
+        if (nsMapiHook::VerifyUserName(aLogin, &id_key) == PR_FALSE)
+    {
+        *aSessionId = MAPI_E_LOGIN_FAILURE;
+        return hr;
+    }
+    }
+
+    // finally register(create) the session.
+
+    PRUint32 nSession_Id;
+    PRInt16 nResult = 0;
+
+    nsMAPIConfiguration *pConfig = nsMAPIConfiguration::GetMAPIConfiguration();
+    if (pConfig != nsnull)
+        nResult = pConfig->RegisterSession(aUIArg, aLogin, aPassWord,
+                                           (aFlags & MAPI_FORCE_DOWNLOAD), bNewSession,
+                                           &nSession_Id, id_key);
+
+    switch (nResult)
+    {
+        case -1 :
+        {
+            *aSessionId = MAPI_E_TOO_MANY_SESSIONS;
+            return hr;
+        }
+        case 0 :
+        {
+            *aSessionId = MAPI_E_INSUFFICIENT_MEMORY;
+            return hr;
+        }
+        default :
+        {
+            *aSessionId = nSession_Id;
+            break;
+        }
+    }
+
+    return S_OK;
+}
+
+STDMETHODIMP nsMapiImp::SendMail( unsigned long aSession, lpnsMapiMessage aMessage,
+     short aRecipCount, lpnsMapiRecipDesc aRecips , short aFileCount, lpnsMapiFileDesc aFiles , 
+     unsigned long aFlags, unsigned long aReserved)
+{
+    HRESULT hr = SUCCESS_SUCCESS ;
+
+    // Assign the pointers in the aMessage struct to the array of Recips and Files
+    // recieved here from MS COM. These are used in BlindSendMail and ShowCompWin fns 
+    aMessage->lpRecips = aRecips ;
+    aMessage->lpFiles = aFiles ;
+
+    nsresult rv ;
+
+    /** create nsIMsgCompFields obj and populate it **/
+    nsCOMPtr<nsIMsgCompFields> pCompFields = do_CreateInstance(NS_MSGCOMPFIELDS_CONTRACTID, &rv) ;
+    if (NS_FAILED(rv) || (!pCompFields) ) return MAPI_E_INSUFFICIENT_MEMORY ;
+
+    if (aFlags & MAPI_UNICODE)
+        rv = nsMapiHook::PopulateCompFields(aMessage, pCompFields) ;
+    else
+        rv = nsMapiHook::PopulateCompFieldsWithConversion(aMessage, pCompFields) ;
+    
+    if (NS_SUCCEEDED (rv))
+    {
+        // see flag to see if UI needs to be brought up
+        if (!(aFlags & MAPI_DIALOG))
+        {
+            rv = nsMapiHook::BlindSendMail(aSession, pCompFields);
+        }
+        else
+        {
+            rv = nsMapiHook::ShowComposerWindow(aSession, pCompFields);
+        }
+    }
+
+    // return success
+    if (NS_SUCCEEDED (rv)) return hr ;
+    // if failure return the related MAPI failure code
+    switch (rv)
+    {
+        case NS_MSG_NO_RECIPIENTS :
+            hr = MAPI_E_BAD_RECIPTYPE ;
+            break ;
+        case NS_ERROR_COULD_NOT_GET_USERS_MAIL_ADDRESS :
+            hr = MAPI_E_INVALID_RECIPS ; 
+            break ;
+        case NS_ERROR_COULD_NOT_LOGIN_TO_SMTP_SERVER :
+            hr = MAPI_E_LOGIN_FAILURE ;
+            break ;
+        case NS_MSG_UNABLE_TO_OPEN_FILE :                 
+        case NS_MSG_UNABLE_TO_OPEN_TMP_FILE :
+        case NS_MSG_COULDNT_OPEN_FCC_FOLDER :
+        case NS_ERROR_FILE_INVALID_PATH :
+            hr = MAPI_E_ATTACHMENT_OPEN_FAILURE ;
+            break ;
+        case NS_ERROR_FILE_TARGET_DOES_NOT_EXIST :
+            hr = MAPI_E_ATTACHMENT_NOT_FOUND ;
+            break ;
+        case NS_MSG_CANCELLING :
+            hr = MAPI_E_USER_ABORT ;
+            break ;
+        case NS_MSG_ERROR_WRITING_FILE :
+        case NS_MSG_UNABLE_TO_SAVE_TEMPLATE :
+        case NS_MSG_UNABLE_TO_SAVE_DRAFT :
+            hr = MAPI_E_ATTACHMENT_WRITE_FAILURE ;
+            break ;
+        default :
+            hr = MAPI_E_FAILURE ;
+            break ;
+    }
+    
+    return hr ;
+}
+
+
+STDMETHODIMP nsMapiImp::SendDocuments( unsigned long aSession, LPTSTR aDelimChar,
+                            LPTSTR aFilePaths, LPTSTR aFileNames, ULONG aFlags)
+{
+    HRESULT hr = SUCCESS_SUCCESS ;
+    nsresult rv = NS_OK ;
+
+    /** create nsIMsgCompFields obj and populate it **/
+    nsCOMPtr<nsIMsgCompFields> pCompFields = do_CreateInstance(NS_MSGCOMPFIELDS_CONTRACTID, &rv) ;
+    if (NS_FAILED(rv) || (!pCompFields) ) return MAPI_E_INSUFFICIENT_MEMORY ;
+
+    if (aFilePaths)
+    {
+        rv = nsMapiHook::PopulateCompFieldsForSendDocs(pCompFields, aFlags, aDelimChar, aFilePaths) ;
+    }
+
+    if (NS_SUCCEEDED (rv)) 
+        rv = nsMapiHook::ShowComposerWindow(aSession, pCompFields);
+
+    // return success
+    if (NS_SUCCEEDED (rv)) return hr ;
+    // if failure return the related MAPI failure code
+    switch (rv)
+    {
+        case NS_ERROR_COULD_NOT_LOGIN_TO_SMTP_SERVER :
+            hr = MAPI_E_LOGIN_FAILURE ;
+            break ;
+        case NS_MSG_UNABLE_TO_OPEN_FILE :                 
+        case NS_MSG_UNABLE_TO_OPEN_TMP_FILE :
+        case NS_MSG_COULDNT_OPEN_FCC_FOLDER :
+        case NS_ERROR_FILE_INVALID_PATH :
+            hr = MAPI_E_ATTACHMENT_OPEN_FAILURE ;
+            break ;
+        case NS_ERROR_FILE_TARGET_DOES_NOT_EXIST :
+            hr = MAPI_E_ATTACHMENT_NOT_FOUND ;
+            break ;
+        case NS_MSG_CANCELLING :
+            hr = MAPI_E_USER_ABORT ;
+            break ;
+        case NS_MSG_ERROR_WRITING_FILE :
+        case NS_MSG_UNABLE_TO_SAVE_TEMPLATE :
+        case NS_MSG_UNABLE_TO_SAVE_DRAFT :
+            hr = MAPI_E_ATTACHMENT_WRITE_FAILURE ;
+            break ;
+        default :
+            hr = MAPI_E_FAILURE ;
+            break ;
+    }
+
+    return hr ;
+}
+
+STDMETHODIMP nsMapiImp::Logoff (unsigned long aSession)
+{
+    nsMAPIConfiguration *pConfig = nsMAPIConfiguration::GetMAPIConfiguration();
+
+    if (pConfig->UnRegisterSession((PRUint32)aSession))
+        return S_OK;
+
+    return E_FAIL;
+}
+
+STDMETHODIMP nsMapiImp::CleanUp()
+{
+    nsMapiHook::CleanUp();
+    return S_OK;
+}
--- a/mozilla/mailnews/mapi/mapihook/src/msgMapiImp.h
+++ b/mozilla/mailnews/mapi/mapihook/src/msgMapiImp.h
@@ -0,0 +1,87 @@
+/* ***** 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 MSG_MAPI_IMP_H
+#define MSG_MAPI_IMP_H
+
+#include <windows.h>
+#include <mapi.h>
+#include "msgMapi.h"
+#include "nsXPIDLString.h"
+#include "nspr.h"
+
+class nsMapiImp : public nsIMapi
+{
+
+public :
+
+    // IUnknown
+
+    STDMETHODIMP            QueryInterface(const IID& aIid, void** aPpv);
+    STDMETHODIMP_(ULONG)    AddRef();
+    STDMETHODIMP_(ULONG)    Release();
+
+    // Interface INsMapi
+
+    STDMETHODIMP Login(unsigned long aUIArg, LOGIN_PW_TYPE aLogin, 
+                       LOGIN_PW_TYPE aPassWord, unsigned long aFlags,
+                       unsigned long *aSessionId);
+
+    STDMETHODIMP SendMail( unsigned long aSession, lpnsMapiMessage aMessage,
+         short aRecipCount, lpnsMapiRecipDesc aRecips , 
+         short aFileCount, lpnsMapiFileDesc aFiles , 
+         unsigned long aFlags, unsigned long aReserved) ;
+
+    STDMETHODIMP SendDocuments( unsigned long aSession, LPTSTR aDelimChar,
+                                LPTSTR aFilePaths, LPTSTR aFileNames, ULONG aFlags);
+
+    STDMETHODIMP Initialize();
+    STDMETHODIMP IsValid();
+    STDMETHODIMP IsValidSession(unsigned long aSession);
+
+    STDMETHODIMP Logoff (unsigned long aSession);
+    STDMETHODIMP CleanUp();
+
+    nsMapiImp();
+    ~nsMapiImp();
+
+private :
+
+    PRLock *m_Lock;
+    PRInt32 m_cRef;
+};
+
+#endif // MSG_MAPI_IMP_H
--- a/mozilla/mailnews/mapi/mapihook/src/msgMapiMain.cpp
+++ b/mozilla/mailnews/mapi/mapihook/src/msgMapiMain.cpp
@@ -0,0 +1,340 @@
+/* ***** 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 "msgMapiMain.h"
+#include "nsIServiceManager.h"
+#include "nsCOMPtr.h"
+
+// move to xpcom bug 81956.
+class nsPRUintKey : public nsHashKey {
+protected:
+    PRUint32 mKey;
+public:
+    nsPRUintKey(PRUint32 key) : mKey(key) {}
+
+    PRUint32 HashCode(void) const {
+        return mKey;
+    }
+
+    PRBool Equals(const nsHashKey *aKey) const {
+        return mKey == ((const nsPRUintKey *) aKey)->mKey;
+    }
+    nsHashKey *Clone() const {
+        return new nsPRUintKey(mKey);
+    }
+    PRUint32 GetValue() { return mKey; }
+};
+//
+
+
+nsMAPIConfiguration *nsMAPIConfiguration::m_pSelfRef = nsnull;
+PRUint32 nsMAPIConfiguration::session_generator = 0;
+PRUint32 nsMAPIConfiguration::sessionCount = 0;
+
+nsMAPIConfiguration *nsMAPIConfiguration::GetMAPIConfiguration()
+{
+    if (m_pSelfRef == nsnull)
+        m_pSelfRef = new nsMAPIConfiguration();
+
+    return m_pSelfRef;
+}
+
+nsMAPIConfiguration::nsMAPIConfiguration()
+: m_nMaxSessions(MAX_SESSIONS),
+  m_ProfileMap(nsnull),
+  m_SessionMap(nsnull)
+{
+    m_Lock = PR_NewLock();
+    m_ProfileMap = new nsHashtable();
+    m_SessionMap = new nsHashtable();
+    NS_ASSERTION(m_SessionMap && m_ProfileMap, "hashtables not created");
+}
+
+static PRBool
+FreeSessionMapEntries(nsHashKey *aKey, void *aData, void* aClosure)
+{
+    nsMAPISession *pTemp = (nsMAPISession*) aData;
+    delete pTemp;
+    pTemp = nsnull;
+    return PR_TRUE;
+}
+
+static PRBool
+FreeProfileMapEntries(nsHashKey *aKey, void *aData, void* aClosure)
+{
+    return PR_TRUE;
+}
+
+nsMAPIConfiguration::~nsMAPIConfiguration()
+{
+    if (m_Lock)
+        PR_DestroyLock(m_Lock);
+
+    if (m_SessionMap)
+    {
+        m_SessionMap->Reset(FreeSessionMapEntries);
+        delete m_SessionMap;
+        m_SessionMap = nsnull;
+    }
+
+    if (m_ProfileMap)
+    {
+        m_ProfileMap->Reset(FreeProfileMapEntries);
+        delete m_ProfileMap;
+        m_ProfileMap = nsnull;
+    }
+}
+
+void nsMAPIConfiguration::OpenConfiguration()
+{
+    // No. of max. sessions is set to MAX_SESSIONS.  In future
+    // if it is decided to have configuration (registry)
+    // parameter, this function can be used to set the
+    // max sessions;
+
+    return;
+}
+
+PRInt16 nsMAPIConfiguration::RegisterSession(PRUint32 aHwnd,
+                const PRUnichar *aUserName, const PRUnichar *aPassword,
+                PRBool aForceDownLoad, PRBool aNewSession,
+                PRUint32 *aSession, char *aIdKey)
+{
+    PRInt16 nResult = 0;
+    PRUint32 n_SessionId = 0;
+
+    PR_Lock(m_Lock);
+
+    // Check whether max sessions is exceeded
+
+    if (sessionCount >= m_nMaxSessions)
+    {
+        PR_Unlock(m_Lock);
+        return -1;
+    }
+
+    if (aUserName != nsnull && aUserName[0] != '\0')
+    {
+    nsStringKey usernameKey(aUserName);
+    n_SessionId = (PRUint32) m_ProfileMap->Get(&usernameKey);
+    }
+
+    // try to share a session; if not create a session
+
+    if (n_SessionId > 0)
+    {
+        nsPRUintKey sessionKey(n_SessionId);
+        nsMAPISession *pTemp = (nsMAPISession *)m_SessionMap->Get(&sessionKey);
+        if (pTemp != nsnull)
+        {
+            pTemp->IncrementSession();
+            *aSession = n_SessionId;
+            nResult = 1;
+        }
+    }
+    else if (aNewSession || n_SessionId == 0) // checking for n_SessionId is a concession
+    {
+        // create a new session ; if new session is specified OR there is no session
+        nsMAPISession *pTemp = nsnull;
+        pTemp = new nsMAPISession(aHwnd, aUserName,
+                               aPassword, aForceDownLoad, aIdKey);
+
+        if (pTemp != nsnull)
+        {
+            session_generator++;
+
+            // I don't think there will be (2 power 32) sessions alive
+            // in a cycle.  This is an assumption
+
+            if (session_generator == 0)
+                session_generator++;
+
+            nsPRUintKey sessionKey(session_generator);
+            m_SessionMap->Put(&sessionKey, pTemp);
+            if (aUserName != nsnull && aUserName[0] != '\0')
+            {
+                nsStringKey usernameKey(aUserName);
+            m_ProfileMap->Put(&usernameKey, (void*)session_generator);
+            }
+
+            *aSession = session_generator;
+            sessionCount++;
+            nResult = 1;
+        }
+    }
+
+    PR_Unlock(m_Lock);
+    return nResult;
+}
+
+PRBool nsMAPIConfiguration::UnRegisterSession(PRUint32 aSessionID)
+{
+    PRBool bResult = PR_FALSE;
+
+    PR_Lock(m_Lock);
+
+    if (aSessionID != 0)
+    {
+        nsPRUintKey sessionKey(aSessionID);
+        nsMAPISession *pTemp = (nsMAPISession *)m_SessionMap->Get(&sessionKey);
+
+        if (pTemp != nsnull)
+        {
+            if (pTemp->DecrementSession() == 0)
+            {
+                if (pTemp->m_pProfileName.get() != nsnull)
+                {
+                nsStringKey stringKey(pTemp->m_pProfileName.get());
+                m_ProfileMap->Remove(&stringKey);
+                }
+                m_SessionMap->Remove(&sessionKey);
+                sessionCount--;
+                bResult = PR_TRUE;
+            }
+        }
+    }
+
+    PR_Unlock(m_Lock);
+    return bResult;
+}
+
+PRBool nsMAPIConfiguration::IsSessionValid(PRUint32 aSessionID)
+{
+    if (aSessionID == 0)
+        return PR_FALSE;
+
+    PRBool retValue = PR_FALSE;
+    nsPRUintKey sessionKey(aSessionID);
+
+    PR_Lock(m_Lock);
+
+    retValue = m_SessionMap->Exists(&sessionKey);
+        
+    PR_Unlock(m_Lock);
+
+    return retValue;
+}
+
+
+PRUnichar *nsMAPIConfiguration::GetPassWord(PRUint32 aSessionID)
+{
+    PRUnichar *pResult = nsnull;
+
+    PR_Lock(m_Lock);
+
+    if (aSessionID != 0)
+    {
+        nsPRUintKey sessionKey(aSessionID);
+        nsMAPISession *pTemp = (nsMAPISession *)m_SessionMap->Get(&sessionKey);
+
+        if (pTemp)
+        {
+            pResult = pTemp->GetPassWord();
+        }
+    }
+
+    PR_Unlock(m_Lock);
+
+    return pResult;
+}
+
+char *nsMAPIConfiguration::GetIdKey(PRUint32 aSessionID)
+{
+    char *pResult = nsnull;
+
+    PR_Lock(m_Lock);
+
+    if (aSessionID != 0)
+    {
+        nsPRUintKey sessionKey(aSessionID);
+        nsMAPISession *pTemp = (nsMAPISession *)m_SessionMap->Get(&sessionKey);
+        if (pTemp)
+        {
+           pResult = pTemp->GetIdKey();
+        }
+    }
+
+    PR_Unlock(m_Lock);
+    return pResult;
+}
+
+
+
+nsMAPISession::nsMAPISession(PRUint32 aHwnd, const PRUnichar *aUserName,\
+                             const PRUnichar *aPassword, \
+                             PRBool aForceDownLoad, char *aKey)
+: m_bIsForcedDownLoad(aForceDownLoad),
+  m_hAppHandle(aHwnd),
+  m_nShared(1),
+  m_pIdKey(aKey)
+{
+    m_pProfileName.Assign(aUserName);
+    m_pPassword.Assign(aPassword);
+}
+
+nsMAPISession::~nsMAPISession()
+{
+    if (m_pIdKey != nsnull)
+    {
+        delete [] m_pIdKey;
+        m_pIdKey = nsnull;
+    }
+}
+
+PRUint32 nsMAPISession::IncrementSession()
+{
+    return ++m_nShared;
+}
+
+PRUint32 nsMAPISession::DecrementSession()
+{
+    return --m_nShared;
+}
+
+PRUint32 nsMAPISession::GetSessionCount()
+{
+    return m_nShared;
+}
+
+PRUnichar *nsMAPISession::GetPassWord()
+{
+    return (PRUnichar *)m_pPassword.get();
+}
+
+char *nsMAPISession::GetIdKey()
+{
+    return m_pIdKey;
+}
--- a/mozilla/mailnews/mapi/mapihook/src/msgMapiMain.h
+++ b/mozilla/mailnews/mapi/mapihook/src/msgMapiMain.h
@@ -0,0 +1,104 @@
+/* ***** 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 MSG_MAPI_MAIN_H_
+#define NSG_MAPI_MAIN_H_
+
+#define        MAX_NAME_LEN    256
+#define        MAX_PW_LEN      256
+#define        MAX_SESSIONS    50
+
+#include "nsXPIDLString.h"
+#include "nspr.h"
+#include "nsString.h"
+#include "nsHashtable.h"
+
+class nsMAPIConfiguration
+{
+private :
+
+    static PRUint32 session_generator;
+    static PRUint32 sessionCount;
+    static nsMAPIConfiguration *m_pSelfRef;
+    PRLock *m_Lock;
+    PRUint32  m_nMaxSessions;
+
+
+    nsHashtable *m_ProfileMap;
+    nsHashtable *m_SessionMap;
+    nsMAPIConfiguration();
+
+public :
+    static nsMAPIConfiguration *GetMAPIConfiguration();
+    void OpenConfiguration();
+    PRInt16 RegisterSession(PRUint32 aHwnd, const PRUnichar *aUserName, \
+                            const PRUnichar *aPassword, PRBool aForceDownLoad, \
+                            PRBool aNewSession, PRUint32 *aSession, char *aIdKey);
+    PRBool IsSessionValid(PRUint32 aSessionID);
+    PRBool UnRegisterSession(PRUint32 aSessionID);
+    PRUnichar *GetPassWord(PRUint32 aSessionID);
+    char *GetIdKey(PRUint32 aSessionID);
+    ~nsMAPIConfiguration();
+};
+
+class nsMAPISession
+{
+    friend class nsMAPIConfiguration;
+
+    private :
+
+        PRBool   m_bIsForcedDownLoad;
+        PRBool   m_bApp_or_Service;
+        PRUint32 m_hAppHandle;
+        PRUint32 m_nShared;
+        char     *m_pIdKey;
+        nsString m_pProfileName;
+        nsString m_pPassword;
+
+    public :
+
+        nsMAPISession(PRUint32 aHwnd, const PRUnichar *aUserName, \
+                      const PRUnichar *aPassword, \
+                      PRBool aForceDownLoad, char *aKey);
+        PRUint32 IncrementSession();
+        PRUint32 DecrementSession();
+        PRUint32 GetSessionCount();
+        PRUnichar *nsMAPISession::GetPassWord();
+        char *nsMAPISession::GetIdKey();
+        ~nsMAPISession();
+};
+
+#endif    // MSG_MAPI_MAIN_H_
--- a/mozilla/mailnews/mapi/mapihook/src/msgMapiSupport.cpp
+++ b/mozilla/mailnews/mapi/mapihook/src/msgMapiSupport.cpp
@@ -0,0 +1,146 @@
+/* ***** 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 "msgMapiSupport.h"
+#include "nsISupports.h"
+
+const CLSID CLSID_nsMapiImp = {0x29f458be, 0x8866, 0x11d5, \
+                              {0xa3, 0xdd, 0x0, 0xb0, 0xd0, 0xf3, 0xba, 0xa7}};
+
+PRBool WINAPI DllMain(HINSTANCE aInstance, DWORD aReason, LPVOID aReserved)
+{
+    switch (aReason)
+    {
+        case DLL_PROCESS_ATTACH :
+        {
+            // Initialize MAPI Support
+
+            nsMapiSupport *pTemp = nsMapiSupport::GetNsMapiSupport();
+            break;
+        }
+        case DLL_PROCESS_DETACH :
+        {
+            nsMapiSupport *pTemp = nsMapiSupport::GetNsMapiSupport();
+            pTemp->UnInitMSCom();
+            delete pTemp;
+            pTemp = nsnull;
+        }
+    }
+
+    return PR_TRUE;
+}
+
+extern "C"
+{
+    void __declspec(dllexport) Init()
+    {
+        nsMapiSupport *pTemp = nsMapiSupport::GetNsMapiSupport();
+        if (pTemp != nsnull)
+            pTemp->InitMSCom();
+    }
+}
+
+nsMapiSupport* nsMapiSupport::m_pSelfRef = nsnull;
+
+nsMapiSupport *nsMapiSupport::GetNsMapiSupport()
+{
+    if (m_pSelfRef == nsnull)
+        m_pSelfRef = new nsMapiSupport();
+
+    return m_pSelfRef;
+}
+
+nsMapiSupport::nsMapiSupport()
+: m_dwRegister(0),
+  m_nsMapiFactory(nsnull)
+{
+}
+
+nsMapiSupport::~nsMapiSupport()
+{
+}
+
+PRBool nsMapiSupport::RegsiterComponents()
+{
+    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 PR_FALSE;
+            }
+        }
+    }
+
+    return PR_TRUE;
+}
+
+PRBool nsMapiSupport::UnRegisterComponents()
+{
+    if (m_dwRegister != 0)
+        ::CoRevokeClassObject(m_dwRegister);
+
+    if (m_nsMapiFactory != nsnull)
+    {
+        m_nsMapiFactory->Release();
+        m_nsMapiFactory = nsnull;
+    }
+
+    return PR_TRUE;
+}
+
+void nsMapiSupport::InitMSCom()
+{
+    ::CoInitialize(nsnull);
+    RegsiterComponents();
+}
+
+void nsMapiSupport::UnInitMSCom()
+{
+    UnRegisterComponents();
+    ::CoUninitialize();
+}
--- a/mozilla/mailnews/mapi/mapihook/src/msgMapiSupport.h
+++ b/mozilla/mailnews/mapi/mapihook/src/msgMapiSupport.h
@@ -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
+ *
+ * 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 MSG_MAPI_SUPPORT_H_
+#define MSG_MAPI_SUPPORT_H_
+
+#include "msgMapiFactory.h"
+#include "prtypes.h"
+
+class __declspec(dllexport) nsMapiSupport
+{
+    private :
+
+        DWORD   m_dwRegister;
+        static nsMapiSupport *m_pSelfRef;
+        nsMapiFactory *m_nsMapiFactory;
+
+        nsMapiSupport();
+
+    public :
+
+        static nsMapiSupport *GetNsMapiSupport();
+        ~nsMapiSupport();
+
+        PRBool RegsiterComponents();
+        void UnInitMSCom();
+        void InitMSCom();
+        PRBool UnRegisterComponents();
+};
+
+#endif  // MSG_MAPI_SUPPORT_H_
--- a/mozilla/mailnews/mapi/mapihook/src/nsMapiRegistry.cpp
+++ b/mozilla/mailnews/mapi/mapihook/src/nsMapiRegistry.cpp
@@ -0,0 +1,252 @@
+/* ***** 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):
+ * Srilatha Moturi <srilatha@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 "nsIServiceManager.h"
+#include "nsMapiRegistry.h"
+#include "nsIGenericFactory.h"
+#include "nsXPIDLString.h"
+#include "nsIPromptService.h"
+#include "nsIStringBundle.h"
+#include "nsIProxyObjectManager.h"
+#include "nsProxiedService.h"
+
+#include "nsMapiRegistryUtils.h" 
+#include "nsString.h"
+
+static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID);
+
+nsresult ShowMapiErrorDialog();
+
+/** Implementation of the nsIMapiRegistry interface.
+ *  Use standard implementation of nsISupports stuff.
+ */
+NS_IMPL_ISUPPORTS1(nsMapiRegistry, nsIMapiRegistry);
+
+nsMapiRegistry::nsMapiRegistry() {
+    NS_INIT_ISUPPORTS();
+    m_ShowDialog = !verifyRestrictedAccess();
+    m_DefaultMailClient = IsDefaultMailClient();
+}
+
+nsMapiRegistry::~nsMapiRegistry() {
+}
+
+NS_IMETHODIMP
+nsMapiRegistry::GetIsDefaultMailClient(PRBool * retval) {
+    // we need to get the value from registry everytime
+    // because the registry settings can be changed from
+    // other mail applications.
+    *retval = IsDefaultMailClient();
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMapiRegistry::GetShowDialog(PRBool * retval) {
+    *retval = m_ShowDialog;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMapiRegistry::SetDefaultMailClient() {
+    nsresult rv = setDefaultMailClient();
+    if (NS_SUCCEEDED(rv))
+        m_DefaultMailClient = PR_TRUE;
+    else
+       rv = ShowMapiErrorDialog();
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMapiRegistry::UnsetDefaultMailClient() {
+    nsresult rv = unsetDefaultMailClient();
+    if (NS_SUCCEEDED(rv))
+        m_DefaultMailClient = PR_FALSE;
+    else
+        ShowMapiErrorDialog();
+    return NS_OK;
+}
+
+/** This will bring up the dialog box only once per session and 
+ * only if the current app is not default Mail Client.
+ * This also checks the registry if the registry key
+ * showMapiDialog is set
+ */
+NS_IMETHODIMP
+nsMapiRegistry::ShowMailIntegrationDialog(nsIDOMWindow *aParentWindow) {
+    nsresult rv;
+    if (!m_ShowDialog || !getShowDialog()) return NS_OK;
+    nsCOMPtr<nsIPromptService> promptService(do_GetService(
+                  "@mozilla.org/embedcomp/prompt-service;1", &rv));
+    if (NS_SUCCEEDED(rv) && promptService)
+    {
+        nsCOMPtr<nsIStringBundleService> bundleService(do_GetService(
+                                         kStringBundleServiceCID, &rv));
+        if (NS_FAILED(rv) || !bundleService) return NS_ERROR_FAILURE;
+
+        nsCOMPtr<nsIStringBundle> bundle;
+        rv = bundleService->CreateBundle(
+                        "chrome://messenger/locale/mapi.properties",
+                        getter_AddRefs(bundle));
+        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+
+        nsCOMPtr<nsIStringBundle> brandBundle;
+        rv = bundleService->CreateBundle(
+                        "chrome://global/locale/brand.properties",
+                        getter_AddRefs(brandBundle));
+        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+
+        nsXPIDLString brandName;
+        rv = brandBundle->GetStringFromName(
+                           NS_LITERAL_STRING("brandShortName").get(),
+                           getter_Copies(brandName));
+        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+
+        nsXPIDLString dialogTitle;
+        const PRUnichar *brandStrings[] = { brandName.get() };
+        NS_NAMED_LITERAL_STRING(dialogTitlePropertyTag, "dialogTitle");
+        const PRUnichar *dTitlepropertyTag = dialogTitlePropertyTag.get();
+        rv = bundle->FormatStringFromName(dTitlepropertyTag,
+                                          brandStrings, 1,
+                                          getter_Copies(dialogTitle));
+        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+        
+        nsXPIDLString dialogText;
+        NS_NAMED_LITERAL_STRING(dialogTextPropertyTag, "dialogText");
+        const PRUnichar *dpropertyTag = dialogTextPropertyTag.get();
+        rv = bundle->FormatStringFromName(dpropertyTag,
+                                          brandStrings, 1,
+                                          getter_Copies(dialogText));
+        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+
+        nsXPIDLString checkboxText;
+        rv = bundle->GetStringFromName(
+                           NS_LITERAL_STRING("checkboxText").get(),
+                           getter_Copies(checkboxText));
+        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+
+        PRBool checkValue = PR_FALSE;
+        PRInt32 buttonPressed = 0;
+        rv = promptService->ConfirmEx(aParentWindow,
+                                      dialogTitle,
+                                      dialogText.get(),
+                                      (nsIPromptService::BUTTON_TITLE_YES * 
+                                      nsIPromptService::BUTTON_POS_0) +
+                                      (nsIPromptService::BUTTON_TITLE_NO * 
+                                      nsIPromptService::BUTTON_POS_1),
+                                      nsnull,
+                                      nsnull,
+                                      nsnull,
+                                      checkboxText,
+                                      &checkValue,
+                                      &buttonPressed);
+        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+        rv = SetRegistryKey(HKEY_LOCAL_MACHINE, "Software\\Mozilla\\Desktop", 
+                                "showMapiDialog", (checkValue) ? "0" : "1");
+        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+
+        m_ShowDialog = PR_FALSE;
+        if (!buttonPressed)
+            rv = SetDefaultMailClient();
+    }
+    return rv;
+}
+
+nsresult ShowMapiErrorDialog() {
+    nsresult rv;
+    nsCOMPtr<nsIPromptService> promptService(do_GetService(
+                  "@mozilla.org/embedcomp/prompt-service;1", &rv));
+    if (NS_SUCCEEDED(rv) && promptService)
+    {
+        nsCOMPtr<nsIStringBundleService> bundleService(do_GetService(
+                                         kStringBundleServiceCID, &rv));
+        if (NS_FAILED(rv) || !bundleService) return NS_ERROR_FAILURE;
+
+        nsCOMPtr<nsIStringBundle> bundle;
+        rv = bundleService->CreateBundle(
+                        "chrome://messenger/locale/mapi.properties",
+                        getter_AddRefs(bundle));
+        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+
+        nsCOMPtr<nsIStringBundle> brandBundle;
+        rv = bundleService->CreateBundle(
+                        "chrome://global/locale/brand.properties",
+                        getter_AddRefs(brandBundle));
+        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+
+        nsXPIDLString brandName;
+        rv = brandBundle->GetStringFromName(
+                           NS_LITERAL_STRING("brandShortName").get(),
+                           getter_Copies(brandName));
+        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+
+        nsXPIDLString dialogTitle;
+        const PRUnichar *brandStrings[] = { brandName.get() };
+        NS_NAMED_LITERAL_STRING(dialogTitlePropertyTag, "errorMessageTitle");
+        const PRUnichar *dTitlepropertyTag = dialogTitlePropertyTag.get();
+        rv = bundle->FormatStringFromName(dTitlepropertyTag,
+                                          brandStrings, 1,
+                                          getter_Copies(dialogTitle));
+        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+        nsXPIDLString dialogText;
+        NS_NAMED_LITERAL_STRING(dialogTextPropertyTag, "errorMessage");
+        const PRUnichar *dpropertyTag = dialogTextPropertyTag.get();
+        rv = bundle->FormatStringFromName(dpropertyTag,
+                                          brandStrings, 1,
+                                          getter_Copies(dialogText));
+        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+        rv = promptService->Alert(nsnull, dialogTitle,
+                                  dialogText);
+    }
+    return rv;
+}
+
+
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsMapiRegistry);
+
+// The list of components we register
+static nsModuleComponentInfo components[] = 
+{
+  {
+    NS_IMAPIREGISTRY_CLASSNAME, 
+    NS_IMAPIREGISTRY_CID,
+    NS_IMAPIWINHOOK_CONTRACTID, 
+    nsMapiRegistryConstructor
+  }
+};
+
+NS_IMPL_NSGETMODULE(nsMapiRegistryModule, components);
+
--- a/mozilla/mailnews/mapi/mapihook/src/nsMapiRegistry.h
+++ b/mozilla/mailnews/mapi/mapihook/src/nsMapiRegistry.h
@@ -0,0 +1,73 @@
+/* ***** 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):
+ * Srilatha Moturi <srilatha@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 nsmapiregistry_h____
+#define nsmapiregistry_h____
+
+#include "nsIMapiRegistry.h"
+
+#ifndef MAX_BUF
+#define MAX_BUF 4096
+#endif
+
+/* c5be14ba-4e0a-4eec-a1b8-04363761d63c */
+#define NS_IMAPIREGISTRY_CID \
+ { 0xc5be14ba, 0x4e0a, 0x4eec, {0xa1, 0xb8, 0x04, 0x36, 0x37, 0x61, 0xd6, 0x3c} }
+#define NS_IMAPIREGISTRY_CONTRACTID    "@mozilla.org/mapiregistry;1"
+#define NS_IMAPIREGISTRY_CLASSNAME "Mozilla MAPI Registry"
+
+class nsMapiRegistry : public nsIMapiRegistry {
+public:
+    // ctor/dtor
+    nsMapiRegistry();
+    virtual ~nsMapiRegistry();
+
+    // Declare all interface methods we must implement.
+    NS_DECL_ISUPPORTS
+    NS_DECL_NSIMAPIREGISTRY
+
+protected:
+    
+    PRBool m_DefaultMailClient;
+    PRBool m_ShowDialog;
+
+private:
+    // Special member to handle initialization.
+    PRBool mHaveBeenSet;
+}; // nsMapiRegistry
+
+#endif // nsmapiregistry_h____
--- a/mozilla/mailnews/mapi/mapihook/src/nsMapiRegistryUtils.cpp
+++ b/mozilla/mailnews/mapi/mapihook/src/nsMapiRegistryUtils.cpp
@@ -0,0 +1,652 @@
+/* ***** 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):
+ * Srilatha Moturi <srilatha@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 ***** */
+
+#undef UNICODE
+#undef _UNICODE
+
+#include "nsIServiceManager.h"
+#include "nsMapiRegistryUtils.h"
+#include "nsString.h"
+#include "nsIStringBundle.h"
+#include "nsXPIDLString.h"
+#include "nsSpecialSystemDirectory.h"
+#include "nsDirectoryService.h"
+#include "nsDirectoryServiceDefs.h"
+#include "nsAppDirectoryServiceDefs.h"
+
+// returns TRUE if the Mapi32.dll is smart dll.
+static PRBool isSmartDll();
+
+// returns TRUE if the Mapi32.dll is a Mozilla dll.
+static PRBool isMozDll();
+
+static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID);
+const CLSID CLSID_nsMapiImp = {0x29f458be, 0x8866, 0x11d5, {0xa3, 0xdd, 0x0, 0xb0, 0xd0, 0xf3, 0xba, 0xa7}};
+
+// Returns the (fully-qualified) name of this executable.
+static nsCString thisApplication() {
+    static nsCAutoString result;
+
+    if (result.IsEmpty()) {
+        char buffer[MAX_PATH] = {0};
+        DWORD len = ::GetModuleFileName(NULL, buffer, sizeof buffer);
+        len = ::GetShortPathName(buffer, buffer, sizeof buffer);
+    
+        result = buffer;
+        result.ToUpperCase();
+    }
+
+    return result;
+}
+
+/** This returns the brand name for this application
+  */
+static nsCString brandName() {
+    static nsCAutoString brand;
+    nsresult rv;
+    if (brand.IsEmpty()) {
+        nsCOMPtr<nsIStringBundleService> bundleService(do_GetService(
+                                         kStringBundleServiceCID, &rv));
+        if (NS_SUCCEEDED(rv) && bundleService) {
+            nsCOMPtr<nsIStringBundle> brandBundle;
+            rv = bundleService->CreateBundle(
+                        "chrome://global/locale/brand.properties",
+                        getter_AddRefs(brandBundle));
+            if (NS_SUCCEEDED(rv)) {
+                nsXPIDLString brandName;
+                rv = brandBundle->GetStringFromName(
+                           NS_LITERAL_STRING("brandShortName").get(),
+                           getter_Copies(brandName));
+                if (NS_SUCCEEDED(rv)) {
+                    brand.AssignWithConversion(brandName.get());
+                }
+            }
+        }
+    }
+    return brand;
+}
+
+// verifyRestrictedAccess - Returns PR_TRUE if this user only has restricted access
+// to the registry keys we need to modify.
+PRBool verifyRestrictedAccess() {
+    char   subKey[] = "Software\\Mozilla - Test Key";
+    PRBool result = PR_FALSE;
+    DWORD  dwDisp = 0;
+    HKEY   key;
+    // Try to create/open a subkey under HKLM.
+    DWORD rc = ::RegCreateKeyEx(HKEY_LOCAL_MACHINE,
+                                subKey,
+                                0,
+                                NULL,
+                                REG_OPTION_NON_VOLATILE,
+                                KEY_WRITE,
+                                NULL,
+                                &key,
+                                &dwDisp);
+
+    if (rc == ERROR_SUCCESS) {
+        // Key was opened; first close it.
+        ::RegCloseKey(key);
+        // Delete it if we just created it.
+        switch(dwDisp) {
+            case REG_CREATED_NEW_KEY:
+                ::RegDeleteKey(HKEY_LOCAL_MACHINE, subKey);
+                break;
+            case REG_OPENED_EXISTING_KEY:
+                break;
+        }
+    } else {
+        // Can't create/open it; we don't have access.
+        result = PR_TRUE;
+    }
+    return result;
+}
+
+nsresult SetRegistryKey(HKEY baseKey, const char * keyName, 
+                        const char * valueName, char * value)
+{
+    nsresult result = NS_ERROR_FAILURE;
+    HKEY   key;
+    LONG   rc = ::RegCreateKey(baseKey, keyName, &key);
+  
+    if (rc == ERROR_SUCCESS) {
+        rc = ::RegSetValueEx(key, valueName, NULL, REG_SZ, 
+                                 (LPBYTE)(const char*)value, strlen(value));
+        if (rc == ERROR_SUCCESS) {
+            result = NS_OK;
+        }
+        ::RegCloseKey(key);
+    }
+    return result;
+}
+
+nsresult DeleteRegistryValue(HKEY baseKey, const char * keyName, 
+                        const char * valueName)
+{
+    nsresult result = NS_ERROR_FAILURE;
+    HKEY   key;
+    LONG   rc = ::RegOpenKey(baseKey, keyName, &key);
+  
+    if (rc == ERROR_SUCCESS) {
+        rc = ::RegDeleteValue(key, valueName);
+        if (rc == ERROR_SUCCESS)
+            result = NS_OK;
+        ::RegCloseKey(key);
+    }
+    return result;
+}
+
+nsCString GetRegistryKey(HKEY baseKey, const char * keyName, 
+                         const char * valueName)
+{
+    nsCAutoString value;
+    HKEY   key;
+    LONG   rc = ::RegOpenKey(baseKey, keyName, &key);
+    if (rc == ERROR_SUCCESS) {
+        char buffer[MAX_PATH] = {0};
+        DWORD len = sizeof buffer;
+        rc = ::RegQueryValueEx(key, valueName, NULL, NULL, 
+                               (LPBYTE)buffer, &len);
+        if (rc == ERROR_SUCCESS) {
+            if (len)
+                value = buffer;
+        }
+        ::RegCloseKey(key);
+     }
+     return value;
+}
+
+#define EXE_EXTENSION ".exe" 
+
+/** Returns TRUE if the current application is default mail client.
+ */
+PRBool IsDefaultMailClient()
+{
+    if (!isSmartDll() && !isMozDll()) 
+        return PR_FALSE;
+    nsCAutoString name(GetRegistryKey(HKEY_LOCAL_MACHINE, 
+                                      "Software\\Clients\\Mail", ""));
+    if (!name.IsEmpty()) {
+         nsCString keyName("Software\\Clients\\Mail\\");
+         keyName += name.get(); 
+         keyName += "\\protocols\\mailto\\shell\\open\\command";
+
+         nsCAutoString result(GetRegistryKey(HKEY_LOCAL_MACHINE, 
+                                             keyName.get(), ""));
+         if (!result.IsEmpty()) {
+             nsCAutoString strExtension;
+             strExtension.Assign(EXE_EXTENSION);
+             result.ToUpperCase();
+             strExtension.ToUpperCase();
+             PRInt32 index = result.RFind(strExtension.get());
+             if (index != kNotFound) {
+                 result.Truncate(index + strExtension.Length());
+             }
+             return (result == thisApplication());
+        }
+    }
+    return PR_FALSE;
+
+}
+
+/** Saves the current setting of the default Mail Client in 
+ * HKEY_LOCAL_MACHINE\\Software\\Mozilla\\Desktop
+ */
+nsresult saveDefaultMailClient()
+{
+    nsresult rv;
+    nsCAutoString name(GetRegistryKey(HKEY_LOCAL_MACHINE,
+                                    "Software\\Clients\\Mail", ""));
+    if (!name.IsEmpty()) {
+        rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                            "Software\\Mozilla\\Desktop", 
+                            "HKEY_LOCAL_MACHINE\\Software\\Clients\\Mail", 
+                            (char *)name.get());
+        if (NS_SUCCEEDED(rv)) {
+            nsCString keyName("Software\\Clients\\Mail\\");
+            keyName += name.get(); 
+            keyName += "\\protocols\\mailto\\shell\\open\\command";
+            nsCAutoString appPath(GetRegistryKey(HKEY_LOCAL_MACHINE, 
+                                               keyName.get(), ""));
+            if (!appPath.IsEmpty()) {
+                nsCString stringName("HKEY_LOCAL_MACHINE\\");
+                stringName += keyName.get();
+                rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                                  "Software\\Mozilla\\Desktop", 
+                                  stringName.get(), (char *)appPath.get());
+            }
+        }
+    }
+    else
+        rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                            "Software\\Mozilla\\Desktop", 
+                            "HKEY_LOCAL_MACHINE\\Software\\Clients\\Mail", 
+                            "");
+    return rv;
+} 
+
+/** Saves the current user setting of the default Mail Client in 
+ * HKEY_LOCAL_MACHINE\\Software\\Mozilla\\Desktop
+ */
+nsresult saveUserDefaultMailClient()
+{
+    nsresult rv;
+    nsCAutoString name(GetRegistryKey(HKEY_CURRENT_USER,
+                                    "Software\\Clients\\Mail", ""));
+    if (!name.IsEmpty()) {
+        rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                            "Software\\Mozilla\\Desktop", 
+                            "HKEY_CURRENT_USER\\Software\\Clients\\Mail", 
+                            (char *)name.get());
+    }
+    else {
+        rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                            "Software\\Mozilla\\Desktop", 
+                            "HKEY_CURRENT_USER\\Software\\Clients\\Mail", 
+                            "");
+   }
+   return rv;
+}
+
+/**
+ * Check whether it is a smart dll or not. Smart dll is the one installed by
+ * IE5 or Outlook Express which forwards the MAPI calls to the dll based on the 
+ * registry key setttings.
+ * Returns TRUE if is a smart dll.
+ */
+
+typedef HRESULT (FAR PASCAL GetOutlookVersionFunc)(); 
+static PRBool isSmartDll() 
+{ 
+    char buffer[MAX_PATH] = {0};
+    if (GetSystemDirectory(buffer, sizeof(buffer)) == 0) 
+        return PR_FALSE;
+    PL_strcatn(buffer, sizeof(buffer), "\\Mapi32.dll");
+    
+    HINSTANCE hInst; 
+    GetOutlookVersionFunc *doesExist = nsnull;
+    hInst = LoadLibrary(buffer); 
+    if (hInst == nsnull) 
+        return PR_FALSE;
+        
+    doesExist = (GetOutlookVersionFunc *) GetProcAddress (hInst, "GetOutlookVersion"); 
+    FreeLibrary(hInst); 
+
+    return (doesExist != nsnull); 
+} 
+
+typedef HRESULT (FAR PASCAL GetMapiDllVersion)(); 
+/**
+ * Checks whether mapi32.dll is installed by this app. 
+ * Returns TRUE if it is.
+ */
+static PRBool isMozDll() 
+{ 
+    char buffer[MAX_PATH] = {0};
+    if (GetSystemDirectory(buffer, sizeof(buffer)) == 0) 
+        return PR_FALSE;
+    PL_strcatn(buffer, sizeof(buffer), "\\Mapi32.dll"); 
+
+    HINSTANCE hInst; 
+    GetMapiDllVersion *doesExist = nsnull;
+    hInst = LoadLibrary(buffer); 
+    if (hInst == nsnull) 
+        return PR_FALSE;
+        
+    doesExist = (GetMapiDllVersion *) GetProcAddress (hInst, "GetMapiDllVersion"); 
+    FreeLibrary(hInst); 
+
+    return (doesExist != nsnull); 
+} 
+
+/** Renames Mapi32.dl in system directory to Mapi32_moz_bak.dll
+ *  copies the mozMapi32.dll from bin directory to the system directory
+ */
+nsresult CopyMozMapiToWinSysDir()
+{
+    nsresult rv;
+    char buffer[MAX_PATH] = {0};
+    if (GetSystemDirectory(buffer, sizeof(buffer)) == 0) 
+        return NS_ERROR_FAILURE;
+
+    nsCAutoString filePath(buffer);
+    filePath.Append("\\Mapi32_moz_bak.dll");
+
+    nsCOMPtr<nsILocalFile> pCurrentMapiFile = do_CreateInstance (NS_LOCAL_FILE_CONTRACTID, &rv);
+    if (NS_FAILED(rv) || !pCurrentMapiFile) return rv;        
+    pCurrentMapiFile->InitWithPath(filePath.get());
+
+    nsCOMPtr<nsIFile> pMozMapiFile;
+    nsCOMPtr<nsIProperties> directoryService =
+          do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv);
+    if (!directoryService) return NS_ERROR_FAILURE;
+    rv = directoryService->Get(NS_OS_CURRENT_PROCESS_DIR,
+                              NS_GET_IID(nsIFile),
+                              getter_AddRefs(pMozMapiFile));
+
+    if (NS_FAILED(rv)) return rv;
+    pMozMapiFile->Append("mozMapi32.dll");
+
+    PRBool bExist;
+    rv = pMozMapiFile->Exists(&bExist);
+    if (NS_FAILED(rv) || !bExist) return rv;
+
+    rv = pCurrentMapiFile->Exists(&bExist);
+    if (NS_SUCCEEDED(rv) && bExist)
+    {
+        rv = pCurrentMapiFile->Remove(PR_FALSE);
+    }
+    if (NS_FAILED(rv)) return rv;
+    filePath.Assign(buffer);
+    filePath.Append("\\Mapi32.dll");
+    pCurrentMapiFile->InitWithPath(filePath.get());
+    rv = pCurrentMapiFile->Exists(&bExist);
+    if (NS_SUCCEEDED(rv) && bExist)
+    {
+        rv = pCurrentMapiFile->MoveTo(nsnull, "Mapi32_moz_bak.dll");
+        if (NS_FAILED(rv)) return rv;
+        nsCAutoString fullFilePath(buffer);
+        fullFilePath.Append("\\Mapi32_moz_bak.dll");
+        rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                            "Software\\Mozilla\\Desktop", 
+                            "Mapi_backup_dll", 
+                            (char *)fullFilePath.get());
+        if (NS_FAILED(rv)) {
+             RestoreBackedUpMapiDll();
+             return rv;
+        }
+    }
+    
+    nsAutoString fileName;
+    fileName.AssignWithConversion("Mapi32.dll");
+    filePath.Assign(buffer);
+    pCurrentMapiFile->InitWithPath(filePath.get());
+    rv = pMozMapiFile->CopyToUnicode(pCurrentMapiFile, fileName.get());
+    if (NS_FAILED(rv))
+        RestoreBackedUpMapiDll();
+    return rv;
+}
+
+/** deletes the Mapi32.dll in system directory and renames Mapi32_moz_bak.dll
+ *  to Mapi32.dll
+ */
+nsresult RestoreBackedUpMapiDll()
+{
+    nsresult rv;
+    char buffer[MAX_PATH] = {0};
+    if (GetSystemDirectory(buffer, sizeof(buffer)) == 0) 
+        return NS_ERROR_FAILURE;
+
+    nsCAutoString filePath(buffer);
+    nsCAutoString previousFileName(buffer);
+    filePath.Append("\\Mapi32.dll");
+    previousFileName.Append("\\Mapi32_moz_bak.dll");
+
+    nsCOMPtr <nsILocalFile> pCurrentMapiFile = do_CreateInstance(NS_LOCAL_FILE_CONTRACTID, &rv);
+    if (NS_FAILED(rv) || !pCurrentMapiFile) return NS_ERROR_FAILURE;        
+    pCurrentMapiFile->InitWithPath(filePath);
+    
+    nsCOMPtr<nsILocalFile> pPreviousMapiFile = do_CreateInstance (NS_LOCAL_FILE_CONTRACTID, &rv);
+    if (NS_FAILED(rv) || !pPreviousMapiFile) return NS_ERROR_FAILURE;       
+    pPreviousMapiFile->InitWithPath(previousFileName);
+
+    PRBool bExist;
+    rv = pCurrentMapiFile->Exists(&bExist);
+    if (NS_SUCCEEDED(rv) && bExist) {
+        rv = pCurrentMapiFile->Remove(PR_FALSE);
+        if (NS_FAILED(rv)) return rv;
+    }
+
+    rv = pPreviousMapiFile->Exists(&bExist);
+    if (NS_SUCCEEDED(rv) && bExist)
+        rv = pPreviousMapiFile->MoveTo(nsnull, "Mapi32.dll");
+    if (NS_SUCCEEDED(rv))
+        DeleteRegistryValue(HKEY_LOCAL_MACHINE,
+                            "Software\\Mozilla\\Desktop", 
+                            "Mapi_backup_dll");
+    return rv;
+}
+
+/** Sets Mozilla as default Mail Client
+ */
+nsresult setDefaultMailClient()
+{
+    nsresult rv;
+    nsresult mailKeySet=NS_ERROR_FAILURE;
+    if (verifyRestrictedAccess()) return NS_ERROR_FAILURE;
+    if (!isSmartDll()) {
+        if (NS_FAILED(CopyMozMapiToWinSysDir())) return NS_ERROR_FAILURE;
+    }
+    rv = saveDefaultMailClient();
+    if (NS_FAILED(saveUserDefaultMailClient()) ||
+        NS_FAILED(rv)) return NS_ERROR_FAILURE;
+    nsCAutoString keyName("Software\\Clients\\Mail\\");
+
+    nsCAutoString appName(brandName());
+    if (!appName.IsEmpty()) {
+        keyName.Append(appName.get());
+        // hardcoding this for 0.9.4 branch
+        // need to change it before merging into the trunk
+        rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                        (char *)keyName.get(), 
+                        "", "Netscape 6.2 Mail"); 
+    }
+    else
+        rv = NS_ERROR_FAILURE;
+    if (NS_SUCCEEDED(rv)) {
+        nsCAutoString dllPath(thisApplication());
+        PRInt32 index = dllPath.RFind("\\");
+        if (index != kNotFound)
+            dllPath.Truncate(index + 1);
+        dllPath += "mozMapi32.dll";
+        rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                            (char *)keyName.get(), "DLLPath", 
+                            (char *)dllPath.get());
+        if (NS_SUCCEEDED(rv)) {
+            keyName.Append("\\protocols\\mailto");
+            rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                                (char *)keyName.get(), 
+                                "", "URL:MailTo Protocol");
+            if (NS_SUCCEEDED(rv)) {
+                nsCAutoString appPath(thisApplication());
+                appPath += " \"%1\"";
+                keyName.Append("\\shell\\open\\command");
+                rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                       (char *)keyName.get(), 
+                       "", (char *)appPath.get());
+                if (NS_SUCCEEDED(rv)) {
+                    rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                                        "Software\\Clients\\Mail", 
+                                        "", (char *)appName.get());
+                }
+                if (NS_SUCCEEDED(rv)) {
+                    nsCAutoString mailAppPath(thisApplication());
+                    mailAppPath += " -mail";
+                    nsCAutoString appKeyName ("Software\\Clients\\Mail\\");
+                    appKeyName.Append(appName.get());
+                    appKeyName.Append("\\shell\\open\\command");
+                    rv = SetRegistryKey(HKEY_LOCAL_MACHINE,
+                                        (char *)appKeyName.get(),
+                                        "", (char *)mailAppPath.get());
+                }
+                if (NS_SUCCEEDED(rv)) {
+                    nsCAutoString iconPath(thisApplication());
+                    iconPath += ",0";
+                    nsCAutoString iconKeyName ("Software\\Clients\\Mail\\");
+                    iconKeyName.Append(appName.get());
+                    iconKeyName.Append("\\DefaultIcon");
+                    mailKeySet = SetRegistryKey(HKEY_LOCAL_MACHINE,
+                                        (char *)iconKeyName.get(),
+                                        "", (char *)iconPath.get());
+                }
+            }            
+        }
+    }
+
+    if (NS_SUCCEEDED(mailKeySet)) {
+        nsresult desktopKeySet = SetRegistryKey(HKEY_CURRENT_USER, 
+                                                "Software\\Clients\\Mail",
+                                                "", (char *)appName.get());
+        if (NS_SUCCEEDED(desktopKeySet)) {
+            desktopKeySet = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                                           "Software\\Mozilla\\Desktop", 
+                                           "defaultMailHasBeenSet", "1");
+        }
+        ::SendMessage(HWND_BROADCAST, WM_SETTINGCHANGE, 0, 
+                     (LPARAM)"Software\\Clients\\Mail");
+        RegisterServer(CLSID_nsMapiImp, "Mozilla MAPI", "mozMapi", "mozMapi.1");
+        return desktopKeySet;
+    }
+    
+    return mailKeySet;
+}
+
+/** Removes Mozilla as the default Mail client and restores the previous setting
+ */
+nsresult unsetDefaultMailClient() {
+    nsresult result = NS_OK;
+    nsresult mailKeySet = NS_ERROR_FAILURE;
+    if (verifyRestrictedAccess()) return NS_ERROR_FAILURE;
+    if (!isSmartDll()) {
+        if (NS_FAILED(RestoreBackedUpMapiDll())) return NS_ERROR_FAILURE;
+    }
+    nsCAutoString name(GetRegistryKey(HKEY_LOCAL_MACHINE, 
+                                      "Software\\Mozilla\\Desktop", 
+                                      "HKEY_LOCAL_MACHINE\\Software\\Clients\\Mail"));
+    nsCAutoString appName(brandName());
+
+    if (!name.IsEmpty() && !appName.IsEmpty() && name.Equals(appName)) {
+        nsCAutoString keyName("HKEY_LOCAL_MACHINE\\Software\\Clients\\Mail\\");
+        keyName.Append(appName.get());
+        keyName.Append("\\protocols\\mailto\\shell\\open\\command");
+        nsCAutoString appPath(GetRegistryKey(HKEY_LOCAL_MACHINE, 
+                        "Software\\Mozilla\\Desktop", 
+                        (char *)keyName.get()));
+        if (!appPath.IsEmpty()) {
+            keyName.Assign("Software\\Clients\\Mail\\");
+            keyName.Append(appName.get());
+            keyName.Append("\\protocols\\mailto\\shell\\open\\command");
+            result = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                       (char *) keyName.get(), 
+                       "", (char *)appPath.get());
+            if (NS_SUCCEEDED(result)) {
+                PRInt32 index = appPath.RFind("\\");
+                if (index != kNotFound)
+                    appPath.Truncate(index + 1);
+                appPath += "mozMapi32.dll";
+                keyName.Assign("Software\\Clients\\Mail\\");
+                keyName.Append(appName.get());
+                result = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                                        (char *)keyName.get(), 
+                                        "DLLPath", (char *) appPath.get());
+            }
+        }
+    }
+    if (!name.IsEmpty()) {
+        if (NS_SUCCEEDED(result)) {
+            mailKeySet = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                                "Software\\Clients\\Mail", 
+                                "", (char *)name.get());
+        }
+    }
+    else
+        mailKeySet = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                                "Software\\Clients\\Mail", 
+                                "", "");
+
+    if (NS_SUCCEEDED(mailKeySet)) {
+        nsCAutoString userAppName(GetRegistryKey(HKEY_LOCAL_MACHINE, 
+                                  "Software\\Mozilla\\Desktop", 
+                                  "HKEY_CURRENT_USER\\Software\\Clients\\Mail"));
+        nsresult desktopKeySet = NS_OK;
+        if (!userAppName.IsEmpty()) {
+            desktopKeySet = SetRegistryKey(HKEY_CURRENT_USER, 
+                                           "Software\\Clients\\Mail", 
+                                           "", (char *)userAppName.get());
+        }
+        else {
+            DeleteRegistryValue(HKEY_CURRENT_USER, "Software\\Clients\\Mail", "");
+        }
+        if (NS_SUCCEEDED(desktopKeySet)) {
+            desktopKeySet = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                                           "Software\\Mozilla\\Desktop", 
+                                           "defaultMailHasBeenSet", "0");
+        }
+        ::SendMessage(HWND_BROADCAST, WM_SETTINGCHANGE, 0, 
+                     (LPARAM)"Software\\Clients\\Mail");
+        UnregisterServer(CLSID_nsMapiImp, "mozMapi", "mozMapi.1");
+        return desktopKeySet;
+    }
+    return mailKeySet;
+}
+
+/** Returns FALSE if showMapiDialog is set to 0.
+ *  Returns TRUE otherwise
+ *  Also returns TRUE if the Mozilla has been set as the default mail client
+ *  and some other application has changed that setting.
+ *  This function gets called only if the current app is not the default mail
+ *  client
+ */
+PRBool getShowDialog() {
+    PRBool rv = PR_FALSE;
+    nsCString showDialog(GetRegistryKey(HKEY_LOCAL_MACHINE, 
+                                        "Software\\Mozilla\\Desktop", 
+                                        "showMapiDialog"));
+    // if the user has not selected the checkbox, show dialog 
+    if (showDialog.IsEmpty() || showDialog.Equals("1"))
+            rv = PR_TRUE;
+
+    if (!rv) {
+        // even if the user has selected the checkbox
+        // show it if some other application has changed the 
+        // default setting.
+        nsCAutoString setMailDefault(GetRegistryKey(HKEY_LOCAL_MACHINE,
+                                       "Software\\Mozilla\\Desktop", 
+                                       "defaultMailHasBeenSet"));
+        if (setMailDefault.Equals("1")) {
+            // need to reset the defaultMailHasBeenSet to "0"
+            // so that after the dialog is displayed once,
+            // we do not keep displaying this dialog after the user has
+            // selected the checkbox
+            rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                                "Software\\Mozilla\\Desktop", 
+                                "defaultMailHasBeenSet", "0");
+            rv = PR_TRUE;
+        }
+    }
+    return rv;
+}
--- a/mozilla/mailnews/mapi/mapihook/src/nsMapiRegistryUtils.h
+++ b/mozilla/mailnews/mapi/mapihook/src/nsMapiRegistryUtils.h
@@ -0,0 +1,90 @@
+/* ***** 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):
+ * Srilatha Moturi <srilatha@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 nsmapiregistryutils_h____
+#define nsmapiregistryutils_h____
+
+#include <windows.h>
+#include <string.h>
+#include <winreg.h>
+
+#include "Registry.h"
+#include "nsString.h"
+
+//Sets the registry key for basekey/keyname valuename.
+nsresult SetRegistryKey(HKEY baseKey, const char * keyName, 
+                        const char * valueName, char * value);
+
+// Deletes the registry key for base/keyname/valuename
+nsresult DeleteRegistryValue(HKEY baseKey, const char * keyName, 
+                        const char * valueName);
+
+// Gets the current regiistry setting for the key.
+nsCString GetRegistryKey(HKEY baseKey, const char * keyName, 
+                         const char * valueName);
+// Returns PR_TRUE if this user only has restricted access
+// to the registry keys we need to modify.
+PRBool verifyRestrictedAccess();
+
+// Returns true if mozilla is the default mail client
+// by checking the registry.
+PRBool IsDefaultMailClient();
+
+// Save the current setting for the default mail client.
+nsresult saveDefaultMailClient();
+
+// Saves the current user setting for the default mail client.
+nsresult saveUserDefaultMailClient();
+
+// Renames Mapi32.dl in system directory to Mapi32_moz_bak.dll
+// copies the mozMapi32.dll from bin directory to the system directory
+nsresult CopyMozMapiToWinSysDir();
+
+// deletes the Mapi32.dll in system directory and renames Mapi32_moz_bak.dll
+//  to Mapi32.dll
+nsresult RestoreBackedUpMapiDll();
+
+// Sets mozilla as the default mail client	
+nsresult setDefaultMailClient();
+
+// unsets mozilla and resets the default mail client setting to previous one
+nsresult unsetDefaultMailClient();
+
+// returns true if we need to show the mail integration dialog.
+PRBool getShowDialog();
+
+#endif
--- a/mozilla/mailnews/mapi/old/hook/makefile.win
+++ b/mozilla/mailnews/mapi/old/hook/makefile.win
@@ -1,64 +0,0 @@
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-DEPTH=..\..\..
-MODULE=mapiguts
-
-################################################################################
-## exports
-
-#EXPORTS =
-
-
-################################################################################
-## library
-
-LIBNAME = .\$(OBJDIR)\mapiguts
-
-!ifdef MOZ_STATIC_COMPONENT_LIBS
-LIB = $(LIBNAME).lib
-!else
-DLL = $(LIBNAME).dll
-!endif
-
-DEFINES= -NS_DEBUG
-
-OBJS=										\
-    .\$(OBJDIR)\mapihook.obj  \
-    .\$(OBJDIR)\mapimail.obj  \
-		$(NULL)
-
-LLIBS=										\
-			$(LLIBS)						\
-			$(LIBNSPR)						\
-			$(DIST)\lib\xppref32.lib		\
-			$(DIST)\lib\xpcom.lib       	\
-			$(DIST)\lib\mapiutils_s.lib  \
-			$(NULL)
-
-include <$(DEPTH)\config\rules.mak>
-
-!ifdef MOZ_STATIC_COMPONENT_LIBS
-install:: $(LIb)
-	$(MAKE_INSTALL)  $(LIBNAME).$(LIB_SUFFIX) $(DIST)\bin\components
-!else
-install:: $(DLL)
-	$(MAKE_INSTALL)  $(LIBNAME).$(DLL_SUFFIX) $(DIST)\bin\components
-!endif
--- a/mozilla/mailnews/mapi/old/hook/mapihook.cpp
+++ b/mozilla/mailnews/mapi/old/hook/mapihook.cpp
--- a/mozilla/mailnews/mapi/old/hook/mapimail.cpp
+++ b/mozilla/mailnews/mapi/old/hook/mapimail.cpp
@@ -1,853 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is 
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-//
-//  More MAPI Hooks for Communicator
-//  Written by: Rich Pizzarro (rhp@netscape.com)
-//  November 1997
-//
-#include "windows.h"
-#include "template.h"
-#include "msgcom.h"
-#include "wfemsg.h"
-#include "compstd.h"
-#include "compbar.h"
-#include "compmisc.h"
-#include "compfrm.h"
-#include "prefapi.h"
-#include "intl_csi.h"
-#include "dlghtmrp.h"
-#include "dlghtmmq.h"
-
-// rhp - was breaking the optimized build!
-//#include "edt.h"
-//#include "edview.h"
-//#include "postal.h"
-//#include "apiaddr.h"
-//#include "mailmisc.h"
-
-extern "C" {
-#include "xpgetstr.h"
-extern int MK_MSG_MSG_COMPOSITION;
-};
-
-#include "mapimail.h"
-#include "nscpmapi.h"
-#include "mailpriv.h"
-#include "nsstrseq.h"
-
-MWContext             
-*GetUsableContext(void)
-{
-  CGenericFrame     *pFrame = (CGenericFrame * )FEU_GetLastActiveFrame();
-
-  ASSERT(pFrame != NULL);
-  if (pFrame == NULL)
-  {
-    return(NULL);
-  }
-
-  // Now return the context...
-  return((MWContext *) pFrame->GetMainContext());
-}
-
-//
-// This function will create a composition window and either do
-// a blind send or pop up the compose window for the user to 
-// complete the operation
-//
-// Return: appropriate MAPI return code...
-//
-// 
-extern "C" LONG
-DoFullMAPIMailOperation(MAPISendMailType      *sendMailPtr,
-											  const char            *pInitialText,
-                        BOOL                  winShowFlag)
-{   
-CGenericDoc             *pDocument;
-LPSTR                   subject;
-NSstringSeq             mailInfoSeq;
-DWORD                   stringCount = 6;
-DWORD                   i;
-CString                 csDefault;
-
-  // Get a context to use for this call...
-  MWContext *pOldContext = GetUsableContext();
-  if (!pOldContext)
-  {
-    return(MAPI_E_FAILURE);
-  }
-
-  // Don't allow a compose window to be created if the user hasn't 
-  // specified an email address
-  const char *real_addr = FE_UsersMailAddress();
-  if (MISC_ValidateReturnAddress(pOldContext, real_addr) < 0)
-  {
-    return(MAPI_E_FAILURE);
-  }
-
-  //
-  // Now, we must build the fields object...
-  //
-  mailInfoSeq = (NSstringSeq) &(sendMailPtr->dataBuf[0]);
-  subject = NSStrSeqGet(mailInfoSeq, 0);
-
-  // We should give it a subject to preven the prompt from coming
-  // up...
-  if ((!subject) || !(*subject))
-  {
-    csDefault.LoadString(IDS_COMPOSE_DEFAULTNOSUBJECT);
-    subject = csDefault.GetBuffer(2);
-  }
-
-  TRACE("MAPI: ProcessMAPISendMail() Subject   = [%s]\n", subject);
-  TRACE("MAPI: ProcessMAPISendMail() Text Size = [%d]\n", strlen((const char *)pInitialText));
-  TRACE("MAPI: ProcessMAPISendMail() # of Recipients  = [%d]\n", sendMailPtr->MSG_nRecipCount);
-
-
-  char  toString[1024] = "";
-  char  ccString[1024] = "";
-  char  bccString[1024] = "";
-
-  for (i=0; i<sendMailPtr->MSG_nRecipCount; i++)
-  {
-    LPSTR   ptr;
-    UCHAR   tempString[256];
-
-    ULONG addrType = atoi(NSStrSeqGet(mailInfoSeq, stringCount++));
-
-    // figure which type of address this is?
-    if (addrType == MAPI_CC)
-      ptr = ccString;
-    else if (addrType == MAPI_BCC)
-      ptr = bccString;
-    else
-      ptr = toString;
-      
-    LPSTR namePtr = (LPSTR) NSStrSeqGet(mailInfoSeq, stringCount++);
-    LPSTR emailPtr = (LPSTR) NSStrSeqGet(mailInfoSeq, stringCount++);
-    if ( (lstrlen(emailPtr) > 5) && (*(emailPtr + 4) == ':') )
-    {
-      emailPtr += 5;
-    }
-
-    // Now build the temp string to tack on in the format
-    // "Rich Pizzarro" <rhp@netscape.com>
-    wsprintf((LPSTR) tempString, "\"%s\" <%s>", namePtr, emailPtr);
-
-    // add a comma if not the first one
-    if (ptr[0] != '\0')
-      lstrcat(ptr, ",");
-
-    // tack on string!
-    lstrcat(ptr, (LPSTR) tempString);
-  }
-
-  BOOL    bEncrypt = FALSE;
-  BOOL    bSign    = FALSE;
-
-  PREF_GetBoolPref("mail.crypto_sign_outgoing_mail", &bSign);
-  PREF_GetBoolPref("mail.encrypt_outgoing_mail", &bEncrypt);
-  MSG_CompositionFields *fields =
-      MSG_CreateCompositionFields(real_addr, real_addr, 
-                  toString, 
-                  ccString, 
-                  bccString,
-									"", "", "",
-									"", subject, "",
-									"", "", "",
-									"", 
-                  bEncrypt,
-                  bSign);
-  if (!fields)
-  {
-    return(MAPI_E_FAILURE);
-  }
-
-  // RICHIE
-  // INTL_CharSetInfo csi = LO_GetDocumentCharacterSetInfo(pOldContext);
-  // int16 win_csid = INTL_GetCSIWinCSID(csi);
-  
-  pDocument = (CGenericDoc*)theApp.m_TextComposeTemplate->OpenDocumentFile(NULL, NULL, /*win_csid RICHIE*/ winShowFlag);
-  if ( !pDocument )
-  {
-    return(MAPI_E_FAILURE);
-  }
-  
-  CWinCX * pContext = (CWinCX*) pDocument->GetContext();
-  if ( !pContext ) 
-  {
-    return(MAPI_E_FAILURE);
-  }
-
-  MSG_CompositionPaneCallbacks Callbacks;
-  Callbacks.CreateRecipientsDialog = CreateRecipientsDialog;
-  Callbacks.CreateAskHTMLDialog = CreateAskHTMLDialog;
-
-  int16 doccsid;
-  MWContext *context = pContext->GetContext();
-  CComposeFrame *pCompose = (CComposeFrame *) pContext->GetFrame()->GetFrameWnd();
-
-  pCompose->SetComposeStuff(context, fields); // squirl away stuff for post-create
-
-  // This needs to be set TRUE if using the old non-HTML text frame
-  // to prevent dropping dragged URLs
-  pContext->m_bDragging = !pCompose->UseHtml();
-  if (!pCompose->UseHtml()) 
-  {
-    pCompose->SetMsgPane(
-      MSG_CreateCompositionPane(pContext->GetContext(), 
-                                context, 
-                                g_MsgPrefs.m_pMsgPrefs, 
-                                fields,
-                                WFE_MSGGetMaster())
-                        );
-  }
-
-  ASSERT(pCompose->GetMsgPane());
-  MSG_SetFEData(pCompose->GetMsgPane(),(void *)pCompose);  
-  pCompose->UpdateAttachmentInfo();
-
-  // Pass doccsid info to new context for MailToWin conversion
-  doccsid = INTL_GetCSIDocCSID(LO_GetDocumentCharacterSetInfo(context));
-  INTL_SetCSIDocCSID(LO_GetDocumentCharacterSetInfo(context), 
-    (doccsid ? doccsid : INTL_DefaultDocCharSetID(context)));
-
-  pCompose->DisplayHeaders(NULL);
-
-  CComposeBar * pBar = pCompose->GetComposeBar();
-  ASSERT(pBar);
-  LPADDRESSCONTROL pIAddressList = pBar->GetAddressWidgetInterface();
-
-  if (!pIAddressList->IsCreated()) 
-  {
-    pBar->CreateAddressingBlock();
-  }
-
-  // rhp - Deal with addressing the brute force way! This is a 
-  // "fix" for bad behavior when creating these windows and not
-  // showing them on the desktop.
-  if (!winShowFlag)      // Hack to fix the window not being mapped
-  {
-    pCompose->AppendAddress(MSG_TO_HEADER_MASK, "");
-    pCompose->AppendAddress(MSG_CC_HEADER_MASK, "");
-    pCompose->AppendAddress(MSG_BCC_HEADER_MASK, "");
-  }
-
-  // Always do plain text composition!
-  pCompose->CompleteComposeInitialization();
-
-  // Do this so we don't get popups on "empty" messages
-  if ( (!pInitialText) || (!(*pInitialText)) )
-    pInitialText = " ";
-
-  const char * pBody = pInitialText ? pInitialText : MSG_GetCompBody(pCompose->GetMsgPane());
-  if (pBody)
-  {
-    FE_InsertMessageCompositionText(context,pBody,TRUE);
-  }
-
-  // 
-  // Now set the message as being edited!    
-  //
-  pCompose->SetModified(TRUE);
-
-  //
-  // Finally deal with the attachments...
-  //
-  if (sendMailPtr->MSG_nFileCount > 0)
-  {
-    // Send this puppy when done with the attachments...
-    if (!winShowFlag)
-    {
-      pCompose->SetMAPISendMode(MAPI_SEND);
-    }
-
-    MSG_AttachmentData *pAttach = (MSG_AttachmentData *)
-                  XP_CALLOC((sendMailPtr->MSG_nFileCount + 1),
-                  sizeof(MSG_AttachmentData));
-    if (!pAttach)
-    {
-      return(MAPI_E_INSUFFICIENT_MEMORY);
-    }
-
-    memset(pAttach, 0, (sendMailPtr->MSG_nFileCount + 1) * 
-                                sizeof(MSG_AttachmentData));
-    for (i=0; i<sendMailPtr->MSG_nFileCount; i++)
-    {
-      CString cs;
-      // Create URL from filename...
-      WFE_ConvertFile2Url(cs, 
-          (const char *)NSStrSeqGet(mailInfoSeq, stringCount++));
-      pAttach[i].url = XP_STRDUP(cs);
-
-      // Now also include the "display" name...
-      StrAllocCopy(pAttach[i].real_name, NSStrSeqGet(mailInfoSeq, stringCount++));
-    }
-
-    // Set the list!
-    MSG_SetAttachmentList(pCompose->GetMsgPane(), pAttach);
-
-    // Now free everything...
-    for (i=0; i<sendMailPtr->MSG_nFileCount; i++)
-    {
-      if (pAttach[i].url)
-        XP_FREE(pAttach[i].url);
-
-      if (pAttach[i].real_name)
-        XP_FREE(pAttach[i].real_name);
-    }
-
-    XP_FREE(pAttach);
-  }
-
-  //
-  // Now, if we were supposed to do the blind send...do it, otherwise,
-  // just popup the window...
-  //
-  if (winShowFlag)      
-  {
-    // Post message to compose window to set the initial focus.
-    pCompose->PostMessage(WM_COMP_SET_INITIAL_FOCUS);
-  }
-  else if (sendMailPtr->MSG_nFileCount <= 0)  // Send NOW if no attachments!
-  {
-    pCompose->PostMessage(WM_COMMAND, IDM_SEND);
-  }
-
-  return(SUCCESS_SUCCESS);
-}
-
-//
-// This function will create a composition window and just attach
-// the attachments of interest and pop up the window...
-//
-// Return: appropriate MAPI return code...
-//
-//
-extern "C" LONG
-DoPartialMAPIMailOperation(MAPISendDocumentsType *sendDocPtr)
-{   
-CGenericDoc             *pDocument;
-
-  // Get a context to use for this call...
-  MWContext *pOldContext = GetUsableContext();
-  if (!pOldContext)
-  {
-    return(MAPI_E_FAILURE);
-  }
-
-  // Don't allow a compose window to be created if the user hasn't 
-  // specified an email address
-  const char *real_addr = FE_UsersMailAddress();
-  if (MISC_ValidateReturnAddress(pOldContext, real_addr) < 0)
-  {
-    return(MAPI_E_FAILURE);
-  }
-
-  //
-  // Now, build the fields object w/o much info...
-  //
-  BOOL    bEncrypt = FALSE;
-  BOOL    bSign    = FALSE;
-
-  PREF_GetBoolPref("mail.crypto_sign_outgoing_mail", &bSign);
-  PREF_GetBoolPref("mail.encrypt_outgoing_mail", &bEncrypt);
-
-  MSG_CompositionFields *fields =
-      MSG_CreateCompositionFields(real_addr, real_addr, NULL, 
-                  "", "",
-									"", "", "",
-									"", "", "",
-									"", "", "",
-									"", 
-                  bEncrypt,
-                  bSign);
-  if (!fields)
-  {
-    return(MAPI_E_FAILURE);
-  }
-
-  // RICHIE - INTL_CharSetInfo csi = LO_GetDocumentCharacterSetInfo(pOldContext);
-  // int16 win_csid = INTL_GetCSIWinCSID(csi);
-
-  pDocument = (CGenericDoc*)theApp.m_TextComposeTemplate->OpenDocumentFile(NULL, NULL, /*RICHIE win_csid,*/ TRUE);
-  if ( !pDocument )
-  {
-    // cleanup fields object
-    MSG_DestroyCompositionFields(fields);
-    return(MAPI_E_FAILURE);
-  }
-
-  CWinCX * pContext = (CWinCX*) pDocument->GetContext();
-  if ( !pContext ) 
-  {
-    return(MAPI_E_FAILURE);
-  }
-
-  MSG_CompositionPaneCallbacks Callbacks;
-  Callbacks.CreateRecipientsDialog = CreateRecipientsDialog;
-  Callbacks.CreateAskHTMLDialog = CreateAskHTMLDialog;
-
-  MWContext *context = pContext->GetContext();
-  CComposeFrame *pCompose = (CComposeFrame *) pContext->GetFrame()->GetFrameWnd();
-  pCompose->SetComposeStuff(context,fields); // squirl away stuff for post-create
-
-  // This needs to be set TRUE if using the old non-HTML text frame
-  // to prevent dropping dragged URLs
-  pContext->m_bDragging = !pCompose->UseHtml();
-  if (!pCompose->UseHtml()) 
-  {
-    pCompose->SetMsgPane(MSG_CreateCompositionPane(
-      pContext->GetContext(), 
-      context,
-      g_MsgPrefs.m_pMsgPrefs, fields,
-      WFE_MSGGetMaster()));
-  }
-
-  ASSERT(pCompose->GetMsgPane());
-  MSG_SetFEData(pCompose->GetMsgPane(),(void *)pCompose);
-
-  pCompose->UpdateAttachmentInfo();
-
-  // Pass doccsid info to new context for MailToWin conversion
-  /***
-  doccsid = INTL_GetCSIDocCSID(LO_GetDocumentCharacterSetInfo(pOldContext));
-
-  INTL_SetCSIDocCSID(LO_GetDocumentCharacterSetInfo(context), 
-    (doccsid ? doccsid : INTL_DefaultDocCharSetID(pOldContext)));
-  ****/
-
-  pCompose->DisplayHeaders(NULL);
-
-  CComposeBar * pBar = pCompose->GetComposeBar();
-  ASSERT(pBar);
-  LPADDRESSCONTROL pIAddressList = pBar->GetAddressWidgetInterface();
-
-  if (!pIAddressList->IsCreated()) 
-  {
-    pBar->CreateAddressingBlock();
-  }
-
-  // Always do plain text composition!
-  pCompose->CompleteComposeInitialization();
-
-  //
-  // Finally deal with the attachments...
-  //
-  NSstringSeq     mailInfoSeq = (NSstringSeq) &(sendDocPtr->dataBuf[0]);
-  DWORD           stringCount = 0;
-  DWORD           i;
-
-  TRACE("MAPI: ProcessMAPISendDocuments() # of Attachments = [%d]\n", sendDocPtr->nFileCount);
-
-  if (sendDocPtr->nFileCount > 0)
-  {
-      MSG_AttachmentData *pAttach = (MSG_AttachmentData *)
-                    XP_CALLOC((sendDocPtr->nFileCount + 1),
-                    sizeof(MSG_AttachmentData));
-      if (!pAttach)
-      {
-        return(MAPI_E_INSUFFICIENT_MEMORY);
-      }
-
-      memset(pAttach, 0, (sendDocPtr->nFileCount + 1) * 
-                                  sizeof(MSG_AttachmentData));
-      for (i=0; i<sendDocPtr->nFileCount; i++)
-      {
-        CString cs;
-        // Create URL from filename...
-        WFE_ConvertFile2Url(cs, 
-            (const char *)NSStrSeqGet(mailInfoSeq, stringCount++));
-        pAttach[i].url = XP_STRDUP(cs);
-
-        // Now also include the "display" name...
-        StrAllocCopy(pAttach[i].real_name, NSStrSeqGet(mailInfoSeq, stringCount++));
-      }
-
-      // Set the list!
-      MSG_SetAttachmentList(pCompose->GetMsgPane(), pAttach);
-
-      // Now free everything...
-      for (i=0; i<sendDocPtr->nFileCount; i++)
-      {
-        if (pAttach[i].url)
-          XP_FREE(pAttach[i].url);
-
-        if (pAttach[i].real_name)
-          XP_FREE(pAttach[i].real_name);
-      }
-
-      XP_FREE(pAttach);
-  }
-    
-  // 
-  // Now some checking for ... well I'm not sure...
-  //
-  if (MSG_GetAttachmentList(pCompose->GetMsgPane()))
-    pCompose->SetModified(TRUE);
-  else
-    pCompose->SetModified(FALSE);
-
-  // Post message to compose window to set the initial focus.
-  pCompose->PostMessage(WM_COMP_SET_INITIAL_FOCUS);
-
-  //
-  // Now, just popup the window...
-  //
-  pCompose->ShowWindow(TRUE);
-
-  // return pCompose->GetMsgPane(); rhp - used to return the MsgPane
-  return(SUCCESS_SUCCESS);
-}
-
-static void _GetMailCallback(HWND hwnd, MSG_Pane *pane, void *closure)
-{
-   if (pane != NULL)
-   {
-     ShowWindow(hwnd, SW_HIDE);
-     MSG_Command( pane, MSG_GetNewMail, NULL, 0 );
-   }
-}
-
-static void _GetMailDoneCallback(HWND hwnd, MSG_Pane *pane, void *closure)
-{
-	for(CGenericFrame * f = theApp.m_pFrameList; f; f = f->m_pNext)
-		f->PostMessage(WM_COMMAND, (WPARAM) ID_DONEGETTINGMAIL, (LPARAM) 0);
-}
-
-//
-// This will fire off a "get mail in background operation" in an
-// async. fashion.
-//
-extern "C" void
-MAPIGetNewMessagesInBackground(void)
-{
-CGenericFrame     *pFrame = (CGenericFrame * )FEU_GetLastActiveFrame();
-
-  // rhp - we should not hit the net if we are offline!
-  if (NET_IsOffline())
-    return;
-
-  if (!pFrame)
-    return;
-
-  MWContext *pOldContext = GetUsableContext();
-  if (!pOldContext)
-    return;
-
-  TRACE("MAPI: DOWNLOAD MAIL IN BACKGROUND\n");
-  new CProgressDialog(
-                pFrame->GetFrameWnd(), 
-                NULL, 
-                _GetMailCallback, NULL, NULL, 
-                _GetMailDoneCallback);
-}
-
-//
-// This function will save a message into the Communicator "Drafts"
-// folder with no UI showing.
-//
-// Return: appropriate MAPI return code...
-//
-//
-extern "C" LONG 
-DoMAPISaveMailOperation(MAPISendMailType      *sendMailPtr,
-											  const char            *pInitialText)
-{
-CGenericDoc             *pDocument;
-LPSTR                   subject;
-NSstringSeq             mailInfoSeq;
-DWORD                   stringCount = 6;
-DWORD                   i;
-BOOL                    winShowFlag = FALSE;
-
-  // Get a context to use for this call...
-  MWContext *pOldContext = GetUsableContext();
-  if (!pOldContext)
-  {
-    return(MAPI_E_FAILURE);
-  }
-
-  // Don't allow a compose window to be created if the user hasn't 
-  // specified an email address
-  const char *real_addr = FE_UsersMailAddress();
-  if (MISC_ValidateReturnAddress(pOldContext, real_addr) < 0)
-  {
-    return(MAPI_E_FAILURE);
-  }
-
-  //
-  // Now, we must build the fields object...
-  //
-  mailInfoSeq = (NSstringSeq) &(sendMailPtr->dataBuf[0]);
-  subject = NSStrSeqGet(mailInfoSeq, 0);
-
-  TRACE("MAPI: ProcessMAPISendMail() Subject   = [%s]\n", subject);
-  TRACE("MAPI: ProcessMAPISendMail() Text Size = [%d]\n", strlen((const char *)pInitialText));
-  TRACE("MAPI: ProcessMAPISendMail() # of Recipients  = [%d]\n", sendMailPtr->MSG_nRecipCount);
-
-
-  char  toString[1024] = "";
-  char  ccString[1024] = "";
-  char  bccString[1024] = "";
-
-  for (i=0; i<sendMailPtr->MSG_nRecipCount; i++)
-  {
-    LPSTR   ptr;
-    UCHAR   tempString[256];
-
-    ULONG addrType = atoi(NSStrSeqGet(mailInfoSeq, stringCount++));
-
-    // figure which type of address this is?
-    if (addrType == MAPI_CC)
-      ptr = ccString;
-    else if (addrType == MAPI_BCC)
-      ptr = bccString;
-    else
-      ptr = toString;
-
-    LPSTR namePtr = (LPSTR) NSStrSeqGet(mailInfoSeq, stringCount++);
-    LPSTR emailPtr = (LPSTR) NSStrSeqGet(mailInfoSeq, stringCount++);
-
-    if ( (!emailPtr) && (!namePtr))
-    {
-      return(MAPI_E_INVALID_RECIPS);
-    }
-
-    if (!emailPtr)
-      emailPtr = namePtr;
-
-    char *tptr = strchr(emailPtr, ':');
-    if (tptr != NULL)
-    {
-      if ( (*tptr != '\0') && (*(tptr+1) != '\0') )
-      {
-        emailPtr = (tptr + 1);
-      }
-    }
-/**
-    if ( (lstrlen(emailPtr) > 5) && (*(emailPtr + 4) == ':') )
-    {
-      emailPtr += 5;
-    }
-**/
-    // Now build the temp string to tack on in the format
-    // "Rich Pizzarro" <rhp@netscape.com>
-    wsprintf((LPSTR) tempString, "\"%s\" <%s>", namePtr, emailPtr);
-
-    // add a comma if not the first one
-    if (ptr[0] != '\0')
-      lstrcat(ptr, ",");
-
-    // tack on string!
-    lstrcat(ptr, (LPSTR) tempString);
-  }
-
-  BOOL    bEncrypt = FALSE;
-  BOOL    bSign    = FALSE;
-
-  PREF_GetBoolPref("mail.crypto_sign_outgoing_mail", &bSign);
-  PREF_GetBoolPref("mail.encrypt_outgoing_mail", &bEncrypt);
-  MSG_CompositionFields *fields =
-      MSG_CreateCompositionFields(real_addr, real_addr, 
-                  toString, 
-                  ccString, 
-                  bccString,
-									"", "", "",
-									"", subject, "",
-									"", "", "",
-									"", 
-                  bEncrypt,
-                  bSign);
-  if (!fields)
-  {
-    return(MAPI_E_FAILURE);
-  }
-
-  // RICHIE
-  // INTL_CharSetInfo csi = LO_GetDocumentCharacterSetInfo(pOldContext);
-  // int16 win_csid = INTL_GetCSIWinCSID(csi);
-  
-  pDocument = (CGenericDoc*)theApp.m_TextComposeTemplate->OpenDocumentFile(NULL, NULL, /*win_csid RICHIE*/ winShowFlag);
-  if ( !pDocument )
-  {
-    return(MAPI_E_FAILURE);
-  }
-  
-  CWinCX * pContext = (CWinCX*) pDocument->GetContext();
-  if ( !pContext ) 
-  {
-    return(MAPI_E_FAILURE);
-  }
-
-  MSG_CompositionPaneCallbacks Callbacks;
-  Callbacks.CreateRecipientsDialog = CreateRecipientsDialog;
-  Callbacks.CreateAskHTMLDialog = CreateAskHTMLDialog;
-
-  int16 doccsid;
-  MWContext *context = pContext->GetContext();
-  CComposeFrame *pCompose = (CComposeFrame *) pContext->GetFrame()->GetFrameWnd();
-
-  pCompose->SetComposeStuff(context, fields); // squirl away stuff for post-create
-
-  // This needs to be set TRUE if using the old non-HTML text frame
-  // to prevent dropping dragged URLs
-  pContext->m_bDragging = !pCompose->UseHtml();
-  if (!pCompose->UseHtml()) 
-  {
-    pCompose->SetMsgPane(
-      MSG_CreateCompositionPane(pContext->GetContext(), 
-                                context, 
-                                g_MsgPrefs.m_pMsgPrefs, 
-                                fields,
-                                WFE_MSGGetMaster())
-                        );
-  }
-
-  ASSERT(pCompose->GetMsgPane());
-  MSG_SetFEData(pCompose->GetMsgPane(),(void *)pCompose);  
-  pCompose->UpdateAttachmentInfo();
-
-  // Pass doccsid info to new context for MailToWin conversion
-  doccsid = INTL_GetCSIDocCSID(LO_GetDocumentCharacterSetInfo(context));
-  INTL_SetCSIDocCSID(LO_GetDocumentCharacterSetInfo(context), 
-    (doccsid ? doccsid : INTL_DefaultDocCharSetID(context)));
-
-  pCompose->DisplayHeaders(NULL);
-
-  CComposeBar * pBar = pCompose->GetComposeBar();
-  ASSERT(pBar);
-  LPADDRESSCONTROL pIAddressList = pBar->GetAddressWidgetInterface();
-
-  if (!pIAddressList->IsCreated()) 
-  {
-    pBar->CreateAddressingBlock();
-  }
-
-  // rhp - Deal with addressing the brute force way! This is a 
-  // "fix" for bad behavior when creating these windows and not
-  // showing them on the desktop.
-  if (!winShowFlag)      // Hack to fix the window not being mapped
-  {
-    pCompose->AppendAddress(MSG_TO_HEADER_MASK, "");
-    pCompose->AppendAddress(MSG_CC_HEADER_MASK, "");
-    pCompose->AppendAddress(MSG_BCC_HEADER_MASK, "");
-  }
-
-  // Always do plain text composition!
-  pCompose->CompleteComposeInitialization();
-
-  // Do this so we don't get popups on "empty" messages
-  if ( (!pInitialText) || (!(*pInitialText)) )
-    pInitialText = " ";
-
-  const char * pBody = pInitialText ? pInitialText : MSG_GetCompBody(pCompose->GetMsgPane());
-  if (pBody)
-  {
-    FE_InsertMessageCompositionText(context,pBody,TRUE);
-  }
-
-  // 
-  // Now set the message as being edited!    
-  //
-  pCompose->SetModified(TRUE);
-
-  //
-  // Finally deal with the attachments...
-  //
-  if (sendMailPtr->MSG_nFileCount > 0)
-  {
-    // Send this puppy when done with the attachments...
-    if (!winShowFlag)
-    {
-      pCompose->SetMAPISendMode(MAPI_SAVE);
-    }
-
-    MSG_AttachmentData *pAttach = (MSG_AttachmentData *)
-                  XP_CALLOC((sendMailPtr->MSG_nFileCount + 1),
-                  sizeof(MSG_AttachmentData));
-    if (!pAttach)
-    {
-      return(MAPI_E_INSUFFICIENT_MEMORY);
-    }
-
-    memset(pAttach, 0, (sendMailPtr->MSG_nFileCount + 1) * 
-                                sizeof(MSG_AttachmentData));
-    for (i=0; i<sendMailPtr->MSG_nFileCount; i++)
-    {
-      CString cs;
-      // Create URL from filename...
-      WFE_ConvertFile2Url(cs, 
-          (const char *)NSStrSeqGet(mailInfoSeq, stringCount++));
-      pAttach[i].url = XP_STRDUP(cs);
-
-      // Now also include the "display" name...
-      StrAllocCopy(pAttach[i].real_name, NSStrSeqGet(mailInfoSeq, stringCount++));
-    }
-
-    // Set the list!
-    MSG_SetAttachmentList(pCompose->GetMsgPane(), pAttach);
-
-    // Now free everything...
-    for (i=0; i<sendMailPtr->MSG_nFileCount; i++)
-    {
-      if (pAttach[i].url)
-        XP_FREE(pAttach[i].url);
-
-      if (pAttach[i].real_name)
-        XP_FREE(pAttach[i].real_name);
-    }
-
-    XP_FREE(pAttach);
-  }
-
-  //
-  // Now, if we were supposed to do the blind send...do it, otherwise,
-  // just popup the window...
-  //
-  if (winShowFlag)      
-  {
-    // Post message to compose window to set the initial focus.
-    pCompose->PostMessage(WM_COMP_SET_INITIAL_FOCUS);
-  }
-  else if (sendMailPtr->MSG_nFileCount <= 0)  // Send NOW if no attachments!
-  {
-    pCompose->PostMessage(WM_COMMAND, IDM_SAVEASDRAFT);
-  }
-
-  return(SUCCESS_SUCCESS);
-}
--- a/mozilla/mailnews/mapi/old/hook/mapimail.h
+++ b/mozilla/mailnews/mapi/old/hook/mapimail.h
@@ -1,89 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is 
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-#ifndef _MAPI_MAIL_H_
-#define _MAPI_MAIL_H_
-
-#include "nscpmapi.h"
-#include <structs.h>    // for MWContext
-
-//extern "C" {
-
-//
-// This function will create a composition window and either do
-// a blind send or pop up the compose window for the user to 
-// complete the operation
-//
-// Return: appropriate MAPI return code...
-//
-//
-extern "C" LONG
-DoFullMAPIMailOperation(MAPISendMailType      *sendMailPtr,
-											  const char            *pInitialText,
-                        BOOL                  winShowFlag);
-
-//
-// This function will create a composition window and just attach
-// the attachments of interest and pop up the window...
-//
-// Return: appropriate MAPI return code...
-//
-//
-extern "C" LONG
-DoPartialMAPIMailOperation(MAPISendDocumentsType *sendDocPtr);
-
-//
-// This function will save a message into the Communicator "Drafts"
-// folder with no UI showing.
-//
-// Return: appropriate MAPI return code...
-//
-//
-extern "C" LONG 
-DoMAPISaveMailOperation(MAPISendMailType      *sendMailPtr,
-											  const char            *pInitialText);
-
-//
-// This will fire off a "get mail in background operation" in an
-// async. fashion.
-//
-extern "C" void
-MAPIGetNewMessagesInBackground(void);
-
-
-// } // extern "C"
-
-#endif // _MAPI_MAIL_H_
--- a/mozilla/mailnews/mapi/old/lib/Makefile.win
+++ b/mozilla/mailnews/mapi/old/lib/Makefile.win
@@ -1,50 +0,0 @@
-#!nmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-DEPTH=..\..\..
-MODULE=mapiutils
-
-include <$(DEPTH)\config\config.mak>
-
-################################################################################
-## exports
-
-EXPORTS=	mapismem.h	\
-    		nsstrseq.h	\
-			$(NULL)
-
-################################################################################
-## library
-
-LIBRARY_NAME=mapiutils_s
-
-
-CPP_OBJS=   .\$(OBJDIR)\mapismem.obj		\
-			.\$(OBJDIR)\nsstrseq.obj		\
-			$(NULL)
-
-include <$(DEPTH)\config\rules.mak>
-
-install:: $(LIBRARY)
-	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
-
-clobber::
-	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
--- a/mozilla/mailnews/mapi/old/lib/mapismem.cpp
+++ b/mozilla/mailnews/mapi/old/lib/mapismem.cpp
@@ -1,173 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is 
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-//
-//  smem.cpp - This deals with all shared memory functions needed for 
-//  the MAPI component of Communicator
-//  Written by: Rich Pizzarro (rhp@netscape.com)
-//  November 1997
-//
-#include <windows.h>
-#include <windowsx.h>
-
-#include "mapismem.h"
-
-
-#ifndef ZeroMemory
-#include <memory.h>
-#define ZeroMemory(PTR, SIZE) memset(PTR, 0, SIZE)
-#endif // ZeroMemory
-
-// 
-// *create new* shared memory chunk 
-// once this is created, use the pointer
-// to the segment to to store data 
-// e.g.: 
-//     lpString = "string for communicator"; 
-//     lstrcpy((LPSTR)pData->m_buf[0], lpString); 
-//  
-CSharedMem *
-NSCreateSharedMemory(DWORD memSize, LPCTSTR memName, HANDLE *hSharedMemory)
-{
-#ifdef WIN32
-
-  BOOL bExistedBefore;
-  CSharedMem *pData;
-
-  LPCTSTR szObjectName = memName; 
-  DWORD dwSize = sizeof(CSharedMem) + memSize; 
-  *hSharedMemory = CreateFileMapping( 
-    (HANDLE)0xFFFFFFFF,0,PAGE_READWRITE,0,dwSize,szObjectName); 
-  if(*hSharedMemory == 0) 
-  { 
-    return NULL; 
-  } 
-  bExistedBefore = (GetLastError() == ERROR_ALREADY_EXISTS); 
-  if(bExistedBefore) 
-  { 
-  	return NULL;
-  } 
-
-  pData = (CSharedMem *)MapViewOfFile( 
-            *hSharedMemory, FILE_MAP_ALL_ACCESS, 0, 0, 0); 
-  if(pData == NULL) 
-  { 
-    return NULL; 
-  } 
-
-  ZeroMemory(pData, dwSize); 
-  pData->m_dwSize = memSize; 
-
-  return pData;
-#else
-  CSharedMem 	*sMemChunk = NULL;
-  DWORD dwSize = memSize = (sizeof(CSharedMem) + memSize); 
-
-  if (sMemChunk != NULL)
-	  return(sMemChunk);
-
-  sMemChunk = (CSharedMem *) GlobalAllocPtr(GMEM_MOVEABLE, dwSize);
-  ZeroMemory(sMemChunk, (size_t) dwSize);
-  sMemChunk->m_dwSize = dwSize;   // Missing in Communicator code!
-  return(sMemChunk);
-
-#endif // WIN32
-}
-
-// 
-// *open existing* shared memory chunk 
-// once you have the pointer to the new segment 
-// use this pointer to access data, e.g.: 
-// 
-CSharedMem *
-NSOpenExistingSharedMemory(LPCTSTR memName, HANDLE *hSharedMemory)
-{
-#ifdef WIN32
-  CSharedMem *pData;
-  DWORD dwSize;
-
-  LPCTSTR szObjectName = memName; 
-  *hSharedMemory = OpenFileMapping( 
-    FILE_MAP_WRITE,FALSE,szObjectName); 
-  if(*hSharedMemory == 0) 
-  { 
-    return NULL; 
-  } 
-
-  pData = (CSharedMem *)MapViewOfFile( 
-              *hSharedMemory,FILE_MAP_ALL_ACCESS,0,0,0); 
-  if(pData == NULL) 
-  { 
-    return NULL; 
-  } 
-  
-  dwSize = pData->m_dwSize; 
-  return pData;
-#else
-
-  return(NULL);   // In Win16, this is really meaningless...
-
-#endif
-}  
-
-// 
-// to close shared memory segment
-// 
-void
-NSCloseSharedMemory(CSharedMem *pData, HANDLE hSharedMemory)
-{
-#ifdef WIN32
-  if(pData != 0) 
-  { 
-    UnmapViewOfFile(pData); 
-    pData = 0; 
-  } 
-
-  if(hSharedMemory != 0) 
-  { 
-    CloseHandle(hSharedMemory); 
-    hSharedMemory = 0; 
-  } 
-#else
-
-	if (pData != NULL)
-	{
-		GlobalFreePtr(pData);
-		pData = NULL;
-	}
-
-#endif // WIN32
-}
--- a/mozilla/mailnews/mapi/old/lib/mapismem.h
+++ b/mozilla/mailnews/mapi/old/lib/mapismem.h
@@ -1,116 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is 
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-#ifndef __SMEM_HPP__
-#define __SMEM_HPP__
-
-//
-// Need this for Win16 since it is an undocumented message
-//
-#ifndef WIN32
-
-#define WM_COPYDATA                     0x004A
-
-/*
- * lParam of WM_COPYDATA message points to...
- */
-typedef struct tagCOPYDATASTRUCT {
-    DWORD         dwData;
-    DWORD         cbData;
-    LPVOID        lpData;
-} COPYDATASTRUCT, *PCOPYDATASTRUCT;
-
-# ifndef LPCTSTR
-#   define LPCTSTR LPCSTR
-# endif
-
-
-#endif // ifndef WIN32
-
-// The following structure will be stored in the shared memory 
-// and will be used to pass data back and forth 
-
-#pragma pack(4) 
-
-typedef struct  
-{ 
-  DWORD m_dwSize;       // size of the shared memory block 
-  BYTE  m_buf[1];       // this is the buffer of memory to be used
-} CSharedMem; 
-
-#pragma pack(4) 
-
-// ******************************************************
-// Public routines...
-// ******************************************************
-// 
-// 
-// *create new* shared memory chunk 
-// once this is created, use the pointer
-// to the segment to to store data 
-// e.g.: 
-//     lpString = "string for communicator"; 
-//     lstrcpy((LPSTR)pData->m_buf[0], lpString); 
-//     pData->m_dwBytesUsed = lstrlen(lpString) + 1; // count '\0' 
-//  
-CSharedMem *
-NSCreateSharedMemory(DWORD memSize, LPCTSTR memName, HANDLE *hSharedMemory);
-
-// 
-// *open existing* shared memory chunk 
-// once you have the pointer to the new segment 
-// use this pointer to access data, e.g.: 
-//
-// This will return the pointer to the memory chunk as well as
-// fill out the hSharedMemory argument that is needed for subsequent
-// operations.
-// 
-//  if(pData->m_dwBytesUsed > 0) 
-//  { 
-//    // use pData->m_buf here 
-//  } 
-//
-CSharedMem *
-NSOpenExistingSharedMemory(LPCTSTR memName, HANDLE *hSharedMemory);
-
-//
-// You must pass in the pointer to the memory chunk as well as
-// the hSharedMemory HANDLE to close shared memory segment
-// 
-void
-NSCloseSharedMemory(CSharedMem *pData, HANDLE hSharedMemory);
-
-#endif  // __SMEM_HPP__
--- a/mozilla/mailnews/mapi/old/lib/nsstrseq.cpp
+++ b/mozilla/mailnews/mapi/old/lib/nsstrseq.cpp
@@ -1,230 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is 
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-//
-//  This is a string sequence handling routine to take complex
-//  structures and merge them into a chunk of memory.
-//
-//  Written by: Rich Pizzarro (rhp@netscape.com)
-//  November 1997
-//
-#include <string.h>
-#include <stdlib.h>
-#include <windows.h>
-#include <windowsx.h>
-
-#include "nsstrseq.h"
-
-#ifndef NULL
-#define NULL '\0'
-#endif
-
-#define MARKER '\377'
-
-//
-// Delete an existing string sequence
-//
-void NSStrSeqDelete(NSstringSeq seq)
-{
-  if (seq != NULL)
-    free(seq);
-  
-  seq = NULL;
-}
-
-//
-// Allocate a new sequence, copying the given strings into it. 
-//
-NSstringSeq NSStrSeqNew(LPSTR strings[])
-{
-  int size;
-  if (!strings)
-  {
-    return NULL;
-  }
-  
-  {
-    int i;
-    for (i=0,size=0; strings[i]; i++)
-    {
-      size+=strlen(strings[i])+1;
-      switch (strings[i][0])
-      {
-        // Need to pad "" or anything starting with 255 
-        // to allow for multiple blank strings in a row
-      case 0:
-      case MARKER:
-        size++;
-        break;
-        
-      default:
-        break;
-      }
-    }
-  }
-  
-  {
-    NSstringSeq s=(NSstringSeq)malloc(size+1);
-    if (!s)
-    {	return NULL;}
-    
-    {
-      int i,offset;
-      for (i=0,offset=0; strings[i]; i++)
-      {
-        switch (strings[i][0])
-        {
-          // Need to pad "" or anything starting with 255
-        case 0:
-        case MARKER:
-          s[offset++]=MARKER;
-          break;
-          
-        default:
-          break;
-        }
-        strcpy(s+offset,strings[i]);
-        offset+=strlen(strings[i])+1;
-      }
-      s[offset]=0;
-    }
-    
-    return s;
-  }
-}
-
-//
-// Get the # of bytes required for the sequence 
-//
-LONG NSStrSeqSize(NSstringSeq seq)
-{
-  const char* s;
-  if (!seq)
-    {
-      return -1;
-    }
-
-  for (s=seq+1; ((*s) || (*(s-1))); s++)
-    ;
-
-  // At this point, s points to the second 0 
-  // of the double 0 at the end 
-  return (s-seq)+1;
-}
-
-//
-// Get the # of strings in the sequence 
-//
-LONG NSStrSeqNumStrs(NSstringSeq seq)
-{
-  const char* s;
-  int N;
-  if (!seq)
-  {
-    return -1;
-  }
-  
-  for (s=seq+1,N=0; ((*s) || (*(s-1))); s++)
-  {
-    if (!(*s))
-      N++;
-  }
-  
-  return N;
-}
-
-static LPSTR correct(LPSTR s)
-{
-  if (s[0]==MARKER)
-    return s+1;
-  else  // Anup , 4/96
-    return s;
-}
-
-//
-// Extract the index'th string in the sequence
-//
-LPSTR NSStrSeqGet(NSstringSeq seq, LONG index)
-{
-  char* s;
-  int N;
-
-  if (!seq)
-  {
-    return NULL;
-  }
-  
-  if (index<0)
-  {
-    return NULL;
-  }
-  
-  if (!index)
-    return correct(seq);
-  
-  for (s=seq+1,N=0; ((*s) || (*(s-1))) && (N<index); s++)
-  {
-    if (!(*s))
-      N++;
-  }
-  
-  if (N==index)
-    return correct(s);
-  
-  return NULL;
-}
-
-LPSTR * NSStrSeqGetAll(NSstringSeq seq)
-{
-  LONG N=NSStrSeqNumStrs(seq);
-  if (N<0)
-    return NULL;
-  
-  {
-    char** res=(char**)malloc( (size_t) ((N+1)*sizeof(char*)) );
-    int i;
-    
-    if (!res)
-    {
-      return NULL;
-    }
-    for (i=0; i<N; i++)
-      res[i]=NSStrSeqGet(seq,i);
-    res[N]=NULL;
-    
-    return res;
-  }
-}
--- a/mozilla/mailnews/mapi/old/lib/nsstrseq.h
+++ b/mozilla/mailnews/mapi/old/lib/nsstrseq.h
@@ -1,68 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is 
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-#ifndef __SEQUENCES_OF_STRINGS_H_
-#define __SEQUENCES_OF_STRINGS_H	
-
-
-typedef LPSTR NSstringSeq;
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-void NSStrSeqDelete(NSstringSeq seq);
-NSstringSeq NSStrSeqNew(LPSTR strings[]);
-
-// Get the # of bytes required for the sequence 
-LONG NSStrSeqSize(NSstringSeq seq);
-
-// Get the # of strings in the sequence
-LONG NSStrSeqNumStrs(NSstringSeq seq);
-
-// Extract the index'th string in the sequence
-LPSTR NSStrSeqGet(NSstringSeq seq, LONG index);
-
-// Build an array of all the strings in the sequence
-LPSTR *NSStrSeqGetAll(NSstringSeq seq);
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif // __sequences_of_strings_h_
--- a/mozilla/mailnews/mapi/old/makefile.win
+++ b/mozilla/mailnews/mapi/old/makefile.win
@@ -1,26 +0,0 @@
-#!nmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-DEPTH=..\..
-
-DIRS=public lib mapi32 tests hook
-
-include <$(DEPTH)\config\rules.mak>
--- a/mozilla/mailnews/mapi/old/mapi32/maindll.cpp
+++ b/mozilla/mailnews/mapi/old/mapi32/maindll.cpp
@@ -1,100 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is 
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-//
-//  DLLMain to get a handle on an hInstance 
-//  Written by: Rich Pizzarro (rhp@netscape.com)
-//  November 1997
-#include <windows.h>
-
-//  
-// global variables
-//
-HINSTANCE hInstance;
-
-//
-// DLL entry
-//  
-#ifdef WIN32
-/****************************************************************************
-   FUNCTION: DllMain(HANDLE, DWORD, LPVOID)
-
-   PURPOSE:  DllMain is called by Windows when
-             the DLL is initialized, Thread Attached, and other times.
-             Refer to SDK documentation, as to the different ways this
-             may be called.
-             
-             The DllMain function should perform additional initialization
-             tasks required by the DLL.  In this example, no initialization
-             tasks are required.  DllMain should return a value of 1 if
-             the initialization is successful.
-           
-*******************************************************************************/
-BOOL APIENTRY DllMain(HANDLE hInstLocal, DWORD ul_reason_being_called, LPVOID lpReserved) 
-{
-  hInstance = (HINSTANCE)hInstLocal;
-
-  if (hInstance != NULL) 
-	  return 1;
-  else  
-	  return 0;
-}
-
-#else  // WIN16
-
-
-//--------------------------------------------------------------------
-// LibMain( hInstance, wDataSegment, wHeapSize, lpszCmdLine ) : WORD
-//
-//    hInstance      library instance handle
-//    wDataSegment   library data segment
-//    wHeapSize      default heap size
-//    lpszCmdLine    command line arguments
-//
-//--------------------------------------------------------------------
-
-int CALLBACK LibMain(HINSTANCE hInstLocal, WORD wDataSegment, WORD wHeapSize, LPSTR lpszCmdLine) 
-{
-  hInstance = hInstLocal;
-  /* return result 1 = success; 0 = fail */
-  if (hInstance != NULL) 
-	  return 1;
-  else
-	  return 0;
-}
-
-#endif // WIN16
-
--- a/mozilla/mailnews/mapi/old/mapi32/makefile.win
+++ b/mozilla/mailnews/mapi/old/mapi32/makefile.win
@@ -1,70 +0,0 @@
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-DEPTH=..\..\..
-MODULE=mapi32
-
-################################################################################
-## exports
-
-#EXPORTS =
-
-
-################################################################################
-## library
-
-LIBNAME = .\$(OBJDIR)\mapi32
-DEFINES= -NS_DEBUG
-DEFFILE=MAPI32.def
-
-!ifdef MOZ_STATIC_COMPONENT_LIBS
-LIB = $(LIBNAME).lib
-!else
-DLL = $(LIBNAME).dll
-!endif
-
-OBJS=										\
-    .\$(OBJDIR)\maindll.obj  \
-    .\$(OBJDIR)\mapi32.obj  \
-    .\$(OBJDIR)\mapiipc.obj  \
-    .\$(OBJDIR)\mapimem.obj  \
-    .\$(OBJDIR)\mapiutl.obj  \
-    .\$(OBJDIR)\smem.obj  \
-    .\$(OBJDIR)\trace.obj  \
-    .\$(OBJDIR)\xpapi.obj  \
-		$(NULL)
-
-LLIBS=										\
-			$(LLIBS)						\
-			$(LIBNSPR)						\
-			$(DIST)\lib\xppref32.lib		\
-			$(DIST)\lib\xpcom.lib       	\
-			$(DIST)\lib\mapiutils_s.lib  \
-			$(NULL)
-
-include <$(DEPTH)\config\rules.mak>
-
-!ifdef MOZ_STATIC_COMPONENT_LIBS
-install:: $(LIB)
-	$(MAKE_INSTALL)  $(LIBNAME).$(LIB_SUFFIX) $(DIST)\bin\components
-!else
-install:: $(DLL)
-	$(MAKE_INSTALL)  $(LIBNAME).$(DLL_SUFFIX) $(DIST)\bin\components
-!endif
--- a/mozilla/mailnews/mapi/old/mapi32/mapi32.cpp
+++ b/mozilla/mailnews/mapi/old/mapi32/mapi32.cpp
--- a/mozilla/mailnews/mapi/old/mapi32/mapi32.def
+++ b/mozilla/mailnews/mapi/old/mapi32/mapi32.def
@@ -1,14 +0,0 @@
-EXPORTS
-	MAPILogon
-	MAPILogoff
-	MAPISendMail
-	MAPISendDocuments
-	MAPIFreeBuffer
-	MAPIFindNext
-	MAPIReadMail
-	MAPISaveMail
-	MAPIDeleteMail
-	MAPIAddress
-	MAPIDetails
-	MAPIResolveName
-  MAPIGetNetscapeVersion
--- a/mozilla/mailnews/mapi/old/mapi32/mapi32.rc
+++ b/mozilla/mailnews/mapi/old/mapi32/mapi32.rc
@@ -1,146 +0,0 @@
-// Insert copyright and license here 1997
-//Microsoft Developer Studio generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-ID_DIALOG_MAPI DIALOGEX 0, 0, 186, 111
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_TOOLWINDOW
-CAPTION "Netscape MAPI Support"
-FONT 8, "MS Sans Serif"
-BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,41,95,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,104,95,50,14
-    GROUPBOX        "Diagnostic Information",IDC_STATIC,2,2,182,91
-    CTEXT           "This window will contain MAPI relative\ninformation for Netscape Communicator",
-                    IDC_STATIC,11,14,159,30
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE 
-BEGIN
-    ID_DIALOG_MAPI, DIALOG
-    BEGIN
-        LEFTMARGIN, 2
-        RIGHTMARGIN, 184
-        TOPMARGIN, 2
-        BOTTOMMARGIN, 109
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,0,0,1
- PRODUCTVERSION 5,0,0,1
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments", "Simple MAPI DLL\0"
-            VALUE "CompanyName", "Netscape Communications Corporation\0"
-            VALUE "FileDescription", "mapi32\0"
-            VALUE "FileVersion", "5, 0, 0, 1\0"
-            VALUE "InternalName", "mapi32\0"
-            VALUE "LegalCopyright", "Copyright © 1997\0"
-            VALUE "LegalTrademarks", "Netscape and Netscape Navigator are registered trademarks of Netscape Communications Corporation.\0"
-            VALUE "OriginalFilename", "mapi32.dll\0"
-            VALUE "ProductName", "Netscape Communications Simple MAPI\0"
-            VALUE "ProductVersion", "5, 0, 0, 1\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
--- a/mozilla/mailnews/mapi/old/mapi32/mapiipc.cpp
+++ b/mozilla/mailnews/mapi/old/mapi32/mapiipc.cpp
@@ -1,249 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is 
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-//
-//  MAPI IPC Routines
-//  Written by: Rich Pizzarro (rhp@netscape.com)
-//  November 1997
-//
-#include <windows.h>
-#include <windowsx.h>
-#include <nscpmapi.h>   // Should live in Communicator
-
-#include "resource.h"
-#include "mapiipc.h"
-#include "mapismem.h"
-#include "trace.h"
-
-#ifndef WIN32
-#include <string.h>
-#endif 
-
-//
-// Necessary variables...
-//
-static LONG       instanceCount = 0;
-HWND				      hWndMAPI = NULL;
-char				      szClassName[] = "NetscapeMAPIClient";
-char              szWindowName[] = "NetscapeMAPI";
-
-//
-// External declares...
-//
-extern HINSTANCE  hInstance;
-
-void 
-ProcessCommand(HWND hWnd, int id, HWND hCtl, UINT codeNotify) 
-{ 
-	switch (id) 
-	{
-	case IDOK:   
-	case IDCANCEL:
-		{
-			ShowWindow(hWnd, SW_HIDE);
-		}
-		
-	default:
-		;
-	}
-}
-
-BOOL CALLBACK LOADDS 
-MyDlgProc(HWND hWndMain, UINT wMsg, WPARAM wParam, LPARAM lParam) 
-{
-  switch (wMsg) 
-  {
-  case WM_INITDIALOG: 
-    {
-      hWndMAPI = hWndMain;
-    }
-    break;
-    
-  case WM_CLOSE:
-//    DestroyWindow(hWndMain);
-    break;
-    
-  case WM_DESTROY:
-    hWndMain = NULL;
-    break;
-
-  case WM_COMMAND:
-	  HANDLE_WM_COMMAND(hWndMAPI, wParam, lParam, ProcessCommand);
-    break;
-
-  default:
-    return FALSE;
-  }
-
-  return TRUE;
-}
-
-BOOL 
-InitInstance(HINSTANCE hInstance)
-{
-  //
-  // Create a main window for this application instance.  
-  //
-  /* RICHIE - TRY SOME CHANGES!!!
-  hWndMAPI = CreateDialog((HINSTANCE) hInstance, 
-        MAKEINTRESOURCE(ID_DIALOG_QAHOOK),
-        (HWND) NULL, (DLGPROC) MyDlgProc);
-   ******/
-  hWndMAPI = CreateWindow(
-              szClassName,	// pointer to registered class name
-              szWindowName,	// pointer to window name
-              WS_CHILD,	    // window style
-              -10,          	// horizontal position of window
-              -10,	          // vertical position of window
-              1,	          // window width
-              1,	          // window height
-              GetDesktopWindow(),	// handle to parent or owner window
-              NULL,	        // handle to menu or child-window identifier
-              hInstance,	  // handle to application instance
-              NULL          // pointer to window-creation data
-              );
-  if (!hWndMAPI)
-    return FALSE;
-  else
-    return TRUE;
-}
-
-BOOL 
-InitApp(void)
-{
-#ifdef WIN32
-  WNDCLASS wc;
-  wc.style         = 0; 
-  wc.lpfnWndProc   = DefDlgProc; 
-  wc.cbClsExtra    = 0; 
-  wc.cbWndExtra    = DLGWINDOWEXTRA; 
-  wc.hInstance     = hInstance; 
-  wc.hIcon         = LoadIcon(hInstance, MAKEINTRESOURCE(ID_ICON_APP)); 
-  wc.hCursor       = LoadCursor(0, IDC_ARROW); 
-  wc.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1);
-  wc.lpszMenuName  = NULL; 
-  wc.lpszClassName = szClassName;
-  
-  if(!RegisterClass(&wc))
-    return FALSE;
-#endif
-  
-  return TRUE;
-} // end InitApp
-
-BOOL
-InitDLL(void)
-{
-  if (hWndMAPI != NULL)
-    return TRUE;
-
-  if (!InitApp()) 
-  { 
-    return FALSE;
-  }
-  
-  if (!InitInstance(hInstance)) 
-  {    
-    return FALSE;
-  }
-  
-//  ShowWindow(hWndMAPI, SW_SHOW);    Just for jollies
-  return(TRUE);
-}
-
-//*************************************************************
-//* Calls exposed for rest of DLL...
-//*************************************************************
-//
-// Purpose: Open the API
-// Return: 1 on success
-//         0 on failure
-//
-DWORD nsMAPI_OpenAPI(void)
-{
-  if (instanceCount > 0)
-  {
-    return(1);
-  }
-
-  ++instanceCount;
-  return(1);
-}
-
-//
-// Purpose: Close the API
-//
-void nsMAPI_CloseAPI(void)
-{
-  --instanceCount;
-  if (instanceCount <= 0)
-  {
-    instanceCount = 0;
-  }
-
-  return;
-}
-
-//
-// Send the actual request to Communicator
-//
-LRESULT
-SendMAPIRequest(HWND hWnd, 
-                DWORD mapiRequestID, 
-                MAPIIPCType *ipcInfo)
-{
-LRESULT         returnVal = 0;
-COPYDATASTRUCT  cds;
-
-  if (!InitDLL())
-  {
-    return 0;
-  }
-
-  cds.dwData = mapiRequestID;
-  cds.cbData = sizeof(MAPIIPCType);
-  cds.lpData = ipcInfo;
-
-  // Make the call into Communicator
-  returnVal = SendMessage(hWnd, WM_COPYDATA, (WPARAM) hWndMAPI, (LPARAM) &cds);
-
-  // Now kill the window...
-  DestroyWindow(hWndMAPI);
-  hWndMAPI = NULL;
-  UnregisterClass(szClassName, hInstance);
-  
-  return returnVal;
-}
--- a/mozilla/mailnews/mapi/old/mapi32/mapiipc.h
+++ b/mozilla/mailnews/mapi/old/mapi32/mapiipc.h
@@ -1,63 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is 
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-#ifndef __MAPIIPC_HPP__
-#define __MAPIIPC_HPP__
-
-#include "port.h"
-#include <nscpmapi.h>
-
-//********************************************************
-// Open and close functions for API
-//********************************************************
-// Open the API
-// Return: 1 on success, 0 on failure
-//
-DWORD nsMAPI_OpenAPI(void);
-
-//
-// Purpose: Close the API
-//
-void  nsMAPI_CloseAPI(void);
-
-//
-// Send the actual request to Communicator
-//
-LRESULT   SendMAPIRequest(HWND hWnd, 
-                DWORD mapiRequestID, 
-                MAPIIPCType *ipcInfo);
-
-#endif // __MAPIIPC_HPP__
--- a/mozilla/mailnews/mapi/old/mapi32/mapimem.cpp
+++ b/mozilla/mailnews/mapi/old/mapi32/mapimem.cpp
@@ -1,363 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is 
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-//
-//  mem.cpp
-//  Written by: Rich Pizzarro (rhp@netscape.com)
-//  November 1997
-//  This implements various memory management functions for use with
-//  MAPI features of Communicator
-//
-#include <windows.h>     
-#include <memory.h> 
-#include <malloc.h>
-#include "mapimem.h"
-#include <nscpmapi.h>   // lives in communicator winfe
-#include "nsstrseq.h"
-#include "trace.h"
-#include "mapiutl.h"
-#include "xpapi.h"
-
-LPSTR
-CheckNullString(LPSTR inStr)
-{
-  static UCHAR  str[1];
-
-  str[0] = '\0';
-  if (inStr == NULL)
-    return((LPSTR)str);
-  else
-    return(inStr);
-}
-
-void
-FreeMAPIFile(lpMapiFileDesc pv)
-{
-  if (!pv)
-    return;
-
-  if (pv->lpszPathName != NULL)   
-    free(pv->lpszPathName);
-
-  if (pv->lpszFileName != NULL)   
-    free(pv->lpszFileName);
-}
-
-void
-FreeMAPIMessage(lpMapiMessage pv)
-{
-  ULONG i;
-
-  if (!pv)
-    return;
-
-  if (pv->lpszSubject != NULL)
-    free(pv->lpszSubject);
-
-  if (pv->lpszNoteText)
-      free(pv->lpszNoteText);
-  
-  if (pv->lpszMessageType)
-    free(pv->lpszMessageType);
-  
-  if (pv->lpszDateReceived)
-    free(pv->lpszDateReceived);
-  
-  if (pv->lpszConversationID)
-    free(pv->lpszConversationID);
-  
-  if (pv->lpOriginator)
-    FreeMAPIRecipient(pv->lpOriginator);
-  
-  for (i=0; i<pv->nRecipCount; i++)
-  {
-    if (&(pv->lpRecips[i]) != NULL)
-    {
-      FreeMAPIRecipient(&(pv->lpRecips[i]));
-    }
-  }
-
-  if (pv->lpRecips != NULL)
-  {
-    free(pv->lpRecips);
-  }
-
-  for (i=0; i<pv->nFileCount; i++)
-  {
-    if (&(pv->lpFiles[i]) != NULL)
-    {
-      FreeMAPIFile(&(pv->lpFiles[i]));
-    }
-  }
-
-  if (pv->lpFiles != NULL)
-  {
-    free(pv->lpFiles);
-  }
-  
-  free(pv);
-  pv = NULL;
-}
-
-void
-FreeMAPIRecipient(lpMapiRecipDesc pv)
-{
-  if (!pv)
-    return;
-
-  if (pv->lpszName != NULL)   
-    free(pv->lpszName);
-
-  if (pv->lpszAddress != NULL)
-    free(pv->lpszAddress);
-
-  if (pv->lpEntryID != NULL)
-    free(pv->lpEntryID);  
-}
-
-//
-// This routine will take an lpMapiMessage structure and "flatten" it into
-// one contiguous chunk of memory that can be easily passed around. After this
-// is done, "extract" routines will be written to get complicated string routines
-// out of the chunk of memory at the end.
-// 
-LPVOID
-FlattenMAPIMessageStructure(lpMapiMessage msg, DWORD *totalSize)
-{
-  MAPISendMailType    *mailPtr;
-  LPSTR               *strArray;
-  DWORD               strCount = 0;
-  DWORD               currentString = 0;
-  DWORD               arrayBufSize = 0;
-  DWORD               i;
-
-  *totalSize = 0;
-  if (!msg)
-    return(NULL);
-
-  //
-  // Allocate the initial structure to hold all of the mail info.
-  //
-  *totalSize = sizeof(MAPISendMailType);
-  mailPtr = (MAPISendMailType *) malloc(sizeof(MAPISendMailType));
-  if (!mailPtr)
-    return(NULL);
-  memset(mailPtr, 0, sizeof(MAPISendMailType));
-
-  //
-  // First, assign all of the easy numeric values...
-  //
-  mailPtr->MSG_flFlags = msg->flFlags;          // unread,return receipt
-  mailPtr->MSG_nRecipCount = msg->nRecipCount;  // Number of recipients
-  mailPtr->MSG_nFileCount = msg->nFileCount;    // # of file attachments
-  if (msg->lpOriginator != NULL)
-  {
-    mailPtr->MSG_ORIG_ulRecipClass = msg->lpOriginator->ulRecipClass; //  Recipient class - MAPI_TO, MAPI_CC, MAPI_BCC, MAPI_ORIG
-  }
-
-  //
-  // Now, figure out how many string pointers we need...
-  //
-  strCount = 4;     // These are the 4 KNOWN strings up front for a message
-  strCount += 2;    // This is for the originator name and address
-
-  strCount += msg->nRecipCount * 3; // Name, address & class (cc, bcc) for each recipient
-  strCount += msg->nFileCount  * 2; // filename and display name for each attachment
-
-  // 
-  // Now allocate a new string sequence...add one entry for NULL at the end
-  //  
-  arrayBufSize = sizeof(LPSTR) * (strCount + 1);
-
-#ifdef WIN16    // Check for max mem allocation...
-  if ((sizeof(MAPISendMailType) + arrayBufSize) > 64000)
-  {
-    free(mailPtr);
-    return NULL;
-  }
-#endif
-
-  //
-  // Allocate a buffer for the string pointers and if this fails, 
-  // cleanup and return.
-  // 
-  strArray = (LPSTR *)malloc( (size_t) arrayBufSize);
-  if (!strArray)
-  {
-    free(mailPtr);
-    return NULL;
-  }
-
-  memset(strArray, 0, (size_t) arrayBufSize);  // Set the array to NULL
-  strArray[currentString++] = CheckNullString(msg->lpszSubject);        // Message Subject
-  strArray[currentString++] = CheckNullString(msg->lpszNoteText);       // Message Text  
-  strArray[currentString++] = CheckNullString(msg->lpszDateReceived);   // in YYYY/MM/DD HH:MM format
-  strArray[currentString++] = CheckNullString(msg->lpszConversationID); // conversation thread ID
-
-  if (msg->lpOriginator)
-  {
-    strArray[currentString++] = CheckNullString(msg->lpOriginator[0].lpszName);
-    strArray[currentString++] = CheckNullString(msg->lpOriginator[0].lpszAddress);
-  }
-  else
-  {
-    strArray[currentString++] = CheckNullString(NULL);
-    strArray[currentString++] = CheckNullString(NULL);
-  }
-
-  //
-  // Assign pointers for the Name and address of each recipient
-  //
-  LPSTR toString  = "1";
-  LPSTR ccString  = "2";
-  LPSTR bccString = "3";
-
-  for (i=0; i<msg->nRecipCount; i++)
-  {
-    // rhp - need message class
-    if (msg->lpRecips[i].ulRecipClass == MAPI_BCC)
-      strArray[currentString++] = CheckNullString(bccString);
-    else if (msg->lpRecips[i].ulRecipClass == MAPI_CC)
-      strArray[currentString++] = CheckNullString(ccString);
-    else
-      strArray[currentString++] = CheckNullString(toString);
-
-    strArray[currentString++] = CheckNullString(msg->lpRecips[i].lpszName);
-    strArray[currentString++] = CheckNullString(msg->lpRecips[i].lpszAddress);  
-  }
-
-  BYTE    szNewFileName[_MAX_PATH];
-
-  for (i=0; i<msg->nFileCount; i++)
-  {
-    char *namePtr;
-    // have to copy/create temp files here of office won't work...
-
-    if ( 
-          (msg->lpFiles[i].lpszFileName != NULL) &&
-          (*msg->lpFiles[i].lpszFileName != '\0') 
-       )
-    {
-      namePtr = (char *)msg->lpFiles[i].lpszFileName;
-    }
-    else
-    {
-      namePtr = (char *)msg->lpFiles[i].lpszPathName;
-    }
-
-    if (GetTempMailNameWithExtension((char *)szNewFileName, namePtr) == 0)
-    {
-      free(strArray);
-      free(mailPtr);
-      return NULL;
-    }
-    
-    if (!XP_CopyFile((char *)msg->lpFiles[i].lpszPathName, (char *)szNewFileName, TRUE))
-    {
-      free(strArray);
-      free(mailPtr);
-      return NULL;
-    }
-
-    strArray[currentString++] = CheckNullString((char *)szNewFileName);
-    strArray[currentString++] = CheckNullString(msg->lpFiles[i].lpszFileName);
-
-    AddTempFile((LPSTR) szNewFileName);
-//    strArray[currentString++] = CheckNullString(msg->lpFiles[i].lpszPathName);
-//    strArray[currentString++] = CheckNullString(msg->lpFiles[i].lpszFileName);
-  }
-
-  if (currentString != strCount)
-  {
-    TRACE("MAPI PROBLEM!!!!!! FlattenMAPIMessageStructure() currentString != strCount\n");
-  }
-
-  strArray[strCount] = NULL;    // terminate at the end
-  NSstringSeq strSeq = NSStrSeqNew(strArray);
-  if (!strSeq)
-  {
-    free(strArray);
-    free(mailPtr);
-    return NULL;
-  }
-  
-  //
-  // Now we need to copy the structure into a big, contiguous chunk of memory
-  //
-  LONG totalArraySize = NSStrSeqSize(strSeq);
-  LONG totalMemSize = sizeof(MAPISendMailType) + totalArraySize;
-
-#ifdef WIN16
-  if (totalMemSize > 64000)
-  {
-    free(strArray);
-    NSStrSeqDelete(strSeq);
-    free(mailPtr);
-    return NULL;
-  }
-#endif
-
-  MAPISendMailType *newMailPtr = (MAPISendMailType *)malloc((size_t)totalMemSize);
-  if (!newMailPtr)
-  {
-    free(strArray);
-    NSStrSeqDelete(strSeq);
-    free(mailPtr);
-    return NULL;
-  }
-
-  memset(newMailPtr, 0, (size_t) totalMemSize);
-  //
-  // Finally do the copy...
-  //
-  memcpy(newMailPtr, mailPtr, sizeof(MAPISendMailType));
-  memcpy(newMailPtr->dataBuf, strSeq, (size_t) totalArraySize);
-  *totalSize = totalMemSize;
-
-  //
-  // Cleanup and scram...
-  //
-  if (strArray)
-    free(strArray);
-
-  if (strSeq)
-    NSStrSeqDelete(strSeq);
-
-  if (mailPtr)
-    free(mailPtr);
-
-  return(newMailPtr);
-}
--- a/mozilla/mailnews/mapi/old/mapi32/mapimem.h
+++ b/mozilla/mailnews/mapi/old/mapi32/mapimem.h
@@ -1,76 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is 
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-#ifndef __MY_MEM_HPP__
-#define __MY_MEM_HPP__
-
-#ifndef MAPI_OLE	// Because MSFT doesn't do this for us :-(
-#include <mapi.h>                                                 
-#endif
-
-//
-// Needed for turning NULL's into ""'s for string sequence routines...
-//
-LPSTR     CheckNullString(LPSTR inStr);
-
-//
-// Memory allocation functions...
-//
-
-//
-// This will free an lpMapiMessage structure allocated by this DLL
-//
-void      FreeMAPIMessage(lpMapiMessage pv);
-
-//
-// This will free an lpMapiRecipDesc structure allocated by this DLL
-//
-void      FreeMAPIRecipient(lpMapiRecipDesc pv);
-
-//
-// Frees a mapi file object...
-//
-void      FreeMAPIFile(lpMapiFileDesc pv);
-
-//
-// This routine will take an lpMapiMessage structure and "flatten" it into
-// one contiguous chunk of memory that can be easily passed around. 
-// 
-LPVOID    FlattenMAPIMessageStructure(lpMapiMessage msg, DWORD *totalSize);
-
-
-
-#endif  // __MY_MEM_HPP__
--- a/mozilla/mailnews/mapi/old/mapi32/mapiutl.cpp
+++ b/mozilla/mailnews/mapi/old/mapi32/mapiutl.cpp
@@ -1,899 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is 
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-//
-//  Various utils needed for the MAPI functions
-//  Written by: Rich Pizzarro (rhp@netscape.com)
-//  November 1997
-//
-#include <windows.h> 
-#include <time.h> 
-#include <sys/stat.h>
-#include <io.h>
-#include "xpapi.h"
-#include "trace.h"
-#include "mapiipc.h"
-#include "mapiutl.h"
-
-//
-// Global variables
-//
-BOOL	  gLoggingEnabled = FALSE;
-
-void
-SetLoggingEnabled(BOOL val)
-{
-  gLoggingEnabled = val;
-}
-
-// Log File
-void 
-LogString(LPCSTR pStr1)
-{
-  // Off of the declaration line...
-  LPCSTR pStr2 = NULL;
-  BOOL useStr1 = TRUE;
-
-	if (gLoggingEnabled)
-	{
-		char tempPath[_MAX_PATH] = "";
-    if (getenv("TEMP"))
-    {
-      lstrcpy((LPSTR) tempPath, getenv("TEMP"));  // environmental variable
-    } 
-
-		int len = lstrlen(tempPath);
-		if ((len > 1) && tempPath[len - 1] != '\\')
-		{
-			lstrcat(tempPath, "\\");
-		}
-		lstrcat(tempPath, szMapiLog);
-		HFILE hFile = _lopen(tempPath, OF_WRITE);
-		if (hFile == HFILE_ERROR)
-		{
-			hFile = _lcreat(tempPath, 0);
-		}
-		if (hFile != HFILE_ERROR)
-		{
-			_llseek(hFile, 0, SEEK_END);		// seek to the end of the file
-			LPCSTR pTemp = useStr1 ? pStr1 : pStr2;
-			_lwrite(hFile, pTemp, lstrlen(pTemp));
-			_lclose(hFile);
-		}
-	}
-}
-
-//
-// Find Communicator and return an HWND, if not, start Communicator,
-// then find an HWND
-//
-HWND 
-GetCommunicatorIPCWindow(void)
-{
-  HWND  hWnd = NULL; 
-  DWORD timeCount = 0;
-  BOOL  launchTry = FALSE;
-
-  //
-  // This will wait for 10 seconds before giving up and failing
-  //
-  while ((hWnd == NULL) && (timeCount < 20))
-  {
-    if ((hWnd = FindWindow("AfxFrameOrView", NULL)) && !FindWindow("aHiddenFrameClass", NULL))
-      return(hWnd);
-    else if ((hWnd = FindWindow("aHiddenFrameClass", NULL)))
-      return(hWnd);
-
-    if (!launchTry)
-    {
-    char    szPath[_MAX_PATH] = "";
-		DWORD   nMAPIERROR; 
-
-      if ((nMAPIERROR = XP_GetInstallLocation(szPath, _MAX_PATH)) != SUCCESS_SUCCESS)
-      {
-        return(NULL); 
-      }
-		
-		  WORD nReturn = XP_CallProcess(szPath, " -MAPICLIENT");
-      launchTry = TRUE;
-    }
-
-    //
-    // Pause for 1/2 a second and try to connect again...
-    //
-#ifdef WIN32
-    Sleep(500);
-#else 
-    Yield();
-#endif        
-
-    timeCount++;
-  }
-
-	return(hWnd);
-}
-
-void
-BuildMemName(LPSTR name, ULONG winSeed)
-{
-  static DWORD    id = 0;
-
-  if (id == 0)
-  {
-    // Seed the random-number generator with current time so that
-    // the numbers will be different every time we run.
-    srand( (unsigned)time( NULL ) );
-    id = rand();
-  }
-
-  wsprintf(name, "MAPI_IPC_SMEM-%d", (winSeed + id++));
-  TRACE("Shared Memory Name = [%s]\n", name);
-}
-
-DWORD 
-ValidateFile(LPCSTR szFile) 
-{
-  	struct _stat buf;
-    int result;
-
-    result = _stat( szFile, &buf );
-    if (result != 0)
-      return(1);
-
-    if (!(buf.st_mode & S_IREAD))
-      return(2);
-
-    return(0);
-}
-
-//
-// return of zero is ok 
-// 1 = MAPI_E_ATTACHMENT_NOT_FOUND
-// 2 = MAPI_E_ATTACHMENT_OPEN_FAILURE
-//
-DWORD
-SanityCheckAttachmentFiles(lpMapiMessage lpMessage)
-{
-  ULONG i;
-  DWORD rc;
-
-  for (i=0; i<lpMessage->nFileCount; i++)
-  {
-    if ((rc = ValidateFile(lpMessage->lpFiles[i].lpszPathName)) != 0)
-    {
-      return(rc);
-    }
-  }
-
-  return(0);
-}
-
-DWORD 
-GetFileCount(LPSTR pFiles, LPSTR delimChar)
-{
-  DWORD   count = 1;
-	if ((!pFiles) || (!*pFiles))
-		return(0);
-
-  for (DWORD i=0; i<strlen(pFiles); i++)
-  {
-    if (pFiles[i] == delimChar[0])
-    {
-      ++count;
-    }
-  }
-
-  return(count);
-}
-
-//
-// Extract a filename from a string
-// Return TRUE if file found, else FALSE
-//
-BOOL
-ExtractFile(LPSTR pFiles, LPSTR delimChar, DWORD fIndex, LPSTR fName)
-{
-  LPSTR   ptr = pFiles;
-  DWORD   loc;
-  DWORD   count = 0;
-
-	if ((!pFiles) || (!*pFiles))
-		return(0);
-
-  // Get to the fIndex'th entry
-  for (loc=0; loc<strlen(pFiles); loc++)
-  {
-    if (count == fIndex)
-      break;
-    if (pFiles[loc] == delimChar[0])
-      count++;
-  }
-
-  if (loc >= strlen(pFiles))    // Got to the end of string!
-    return(FALSE);
-
-  lstrcpy(fName, (LPSTR)pFiles + loc);
-  //
-  // Truncate at 2nd delimiter
-  //
-  for (DWORD i=0; i<strlen(fName); i++)
-  {
-    if (fName[i] == delimChar[0])
-    {
-      fName[i] = '\0';
-      break;
-    }
-  }
-
-  return(TRUE);
-}
-
-ULONG
-GetFileSize(LPSTR fName)
-{
-  struct _stat buf;
-  int result;
-  
-  result = _stat( fName, &buf );
-  if (result != 0)
-    return(0);
-  
-  return(buf.st_size);
-}
- 
-LPVOID
-LoadBlobToMemory(LPSTR fName)
-{
-  UCHAR     *ptr = NULL;
-  ULONG     bufSize = GetFileSize(fName);
-
-  if (bufSize == 0)
-  {
-    _unlink(fName);
-    return(NULL);
-  }
-
-  ptr = (UCHAR *)malloc( (size_t) bufSize);
-  if (!ptr)
-  {
-    _unlink(fName);
-    return(NULL);
-  }
-
-  HFILE hFile = _lopen(fName, OF_READ);
-  if (hFile == HFILE_ERROR)
-  {
-    _unlink(fName);
-    free(ptr);
-    return(NULL);
-  }
-
-  UINT numRead = _lread(hFile, ptr, (size_t) bufSize);
-  _lclose(hFile);
-
-  if (numRead != bufSize)
-  {
-    _unlink(fName);
-    free(ptr);
-    return(NULL);
-  }
-
-  _unlink(fName);
-	return(ptr);	
-}
-
-LONG
-WriteMemoryBufferToDisk(LPSTR fName, LONG bufSize, LPSTR buf)
-{
-  if (!buf)
-  {
-    return(-1);
-  }
-
-  HFILE hFile = _lcreat(fName, 0);
-  if (hFile == HFILE_ERROR)
-  {
-    return(-1);
-  }
-
-  LONG writeCount = _lwrite(hFile, buf, (size_t) bufSize);
-  _lclose(hFile);
-
-  if (writeCount != bufSize)
-  {
-    _unlink(fName);
-    return(-1);
-  }
-
-  return(0);
-}
-
-LPSTR
-GetTheTempDirectoryOnTheSystem(void)
-{
- static UCHAR retPath[_MAX_PATH];
-  
-  if (getenv("TEMP"))
-  {
-    lstrcpy((LPSTR) retPath, getenv("TEMP"));  // environmental variable
-  } 
-  else if (getenv("TMP"))
-  {
-    lstrcpy((LPSTR) retPath, getenv("TMP"));  // How about this environmental variable?
-  }
-  else
-  {
-    GetWindowsDirectory((LPSTR) retPath, sizeof(retPath));
-  }
-
-  return((LPSTR) &(retPath[0]));
-}
-
-#ifdef WIN16
-int WINAPI EXPORT ISGetTempFileName(LPCSTR a_pDummyPath,  LPCSTR a_pPrefix, UINT a_uUnique, LPSTR a_pResultName)
-{
-#ifdef GetTempFileName	// we need the real thing comming up next...
-#undef GetTempFileName
-#endif
-	return GetTempFileName(0, a_pPrefix, a_uUnique, a_pResultName);
-}
-#endif
-
-LONG
-GetTempAttachmentName(LPSTR fName) 
-{
-  UINT        res;
-  static UINT uUnique = 1;
-
-  if (!fName)
-    return(-1);
-
-  LPSTR szTempPath = GetTheTempDirectoryOnTheSystem();
-
-TRYAGAIN:
-#ifdef WIN32
-  res = GetTempFileName(szTempPath, "MAPI", uUnique++, fName);
-#else
-  res = ISGetTempFileName(szTempPath, "MAPI", uUnique++, fName);
-#endif
-
-  if (ValidateFile(fName) != 1) 
-  {
-    if (uUnique < 32000)
-    {
-      goto TRYAGAIN;
-    }
-    else
-    {
-      return(-1);
-    }
-  }
-
-  return 0;
-}
-
-// RICHIE - strip all of the HTML stuff out of the message...
-int
-CheckForInlineHTML(char *noteBody, DWORD len, DWORD *curPos, char *newBody, DWORD *realLen)
-{
-  LPSTR   tags[] = {"&nbsp;", "&lt;", "&amp;", NULL};
-  UCHAR   tagsSubst[] = {' ', '<', '&', NULL};
-  int     x = 0;
-
-  while (tags[x])
-  {
-    // should we check for first tag
-    if ( (*curPos+strlen(tags[x])) < len)
-    {
-      if (strncmp(tags[x], noteBody, strlen(tags[x])) == 0)
-      {
-        *curPos += strlen(tags[x]) - 1;
-        newBody[*realLen] = tagsSubst[x];
-        *realLen += 1;
-        return(-1);
-      }
-    }
-
-    ++x;
-  }
-
-  return(0);
-}
-
-//
-// RICHIE - This is also temporary fix for now...
-//
-LPSTR
-StripSignedMessage(LPSTR noteText, DWORD totalCR) 
-{
-char    *newBuf;
-LPSTR   startTag = "<HTML>";
-LPSTR   endTag = "/HTML>";
-DWORD   i;
-DWORD   realLen = 0;
-DWORD   startPos = 0;
-DWORD   len = strlen(noteText);;
-
-  // create a new buffer...
-  newBuf = (char *) malloc((size_t)(len + totalCR));
-  if (!newBuf)
-    return(noteText);
-
-  newBuf[0] = '\0';
-
-  // First, find the start of the HTML for the message...
-  for (i=0; i<len; i++)
-  {
-    // should we check for first tag
-    if ( (i+strlen(startTag)) < len)
-    {
-      if (strncmp(startTag, (noteText + i), strlen(startTag)) == 0)
-      {
-        startPos = i + strlen(startTag);
-        break;
-      }
-    }
-  }
-
-  // Didn't find any HTML start tag
-  if (i == len)
-    return(noteText);
-
-  BOOL    inHTML = FALSE;
-  BOOL    firstChar = FALSE;
-
-  for (i=startPos; i<len; i++)
-  {
-    char  *ptr = (noteText + i);
-
-    if ( ((*ptr == 0x0D) || (*ptr == 0x20)) && (!firstChar) )
-      continue;
-    else
-      firstChar = TRUE;
-
-    // First, check for the end /HTML> tag
-    if ( (i+strlen(endTag)) < len)
-    {
-      if (strncmp(endTag, ptr, strlen(endTag)) == 0)
-      {
-        break;
-      }
-    }
-
-    // If we are in HTML, check for a ">"...
-    if (inHTML)
-    {
-      if (*ptr == '>')
-      {
-        inHTML = FALSE;
-      }
-      continue;
-    }
-
-    // Check for NEW HTML...
-    if (*ptr == '<')
-    {
-      inHTML = TRUE;
-      continue;
-    }
-
-    if (CheckForInlineHTML(ptr, len, &i, newBuf, &realLen))
-      continue;
-
-    newBuf[realLen++] = *ptr;
-    // Tack on a line feed if we hit a CR...
-    if ( *ptr == 0x0D )
-    {
-      newBuf[realLen++] = 0x0A;
-    }
-  }
-
-  // terminate the buffer - reallocate and move on...
-  newBuf[realLen++] = '\0';
-  newBuf = (LPSTR) realloc(newBuf, (size_t) realLen);
-
-  // check if the realloc worked and if so, free old memory and
-  // return...if not, just return the original buffer
-  if (!newBuf)
-  {
-    return(noteText);
-  }
-  else
-  {
-    free(noteText);
-    return(newBuf);
-  }
-}
-
-//
-// RICHIE - this is a temporary fix for now to get rid of
-// html stuff within the text of a message - if there was a
-// valid noteText buffer coming into this call, we need to 
-// free it on the way out.
-//
-LPSTR
-StripHTML(LPSTR noteText)
-{
-  char    *newBuf;
-  LPSTR   signTag = "This is a cryptographically signed message in MIME format.";
-  LPSTR   mimeTag = "This is a multi-part message in MIME format.";
-
-  DWORD   i;
-  DWORD   realLen = 0;
-  DWORD   totalCR = 0;
-
-  // do sanity checking...
-  if ((!noteText) || (!(*noteText)))
-    return(noteText);
-
-  // more sanity checking...
-  DWORD len = strlen(noteText) + 1;
-  if (len <= 0) 
-    return(noteText);
-
-  // Get the number of CR's in this message and add room for
-  // the LF's
-  for (i=0; i<len; i++)
-  {
-    if ( (*(noteText + i)) == 0x0D )
-      ++totalCR;
-  }
-
-  // This is a check for a signed message in the start of a message
-  // check for sign line...    
-  if ( strlen(signTag) < len)
-  {
-    if ( 
-        (strncmp(signTag, noteText, strlen(signTag)) == 0) ||
-        (strncmp(mimeTag, noteText, strlen(mimeTag)) == 0) 
-       )
-    {
-      return( StripSignedMessage(noteText, totalCR) );
-    }
-  }
-
-  // create a new buffer...
-  newBuf = (char *) malloc((size_t)(len + totalCR));
-  if (!newBuf)
-    return(noteText);
-
-  newBuf[0] = '\0';
-
-  BOOL    firstChar = FALSE;
-
-  // Now do the translation for the body of the note...
-  for (i=0; i<len; i++)
-  {
-    char  *ptr = (noteText + i);
-    
-    if ( ((*ptr == 0x0D) || (*ptr == 0x20)) && (!firstChar) )
-      continue;
-    else
-      firstChar = TRUE;
-
-    if (CheckForInlineHTML(ptr, len, &i, newBuf, &realLen))
-      continue;
-
-    newBuf[realLen++] = *ptr;
-    if ( *ptr == 0x0D )
-    {
-      newBuf[realLen++] = 0x0A;
-    }
-  }
-
-  // terminate the buffer - reallocate and move on...
-  newBuf[realLen++] = '\0';
-  newBuf = (LPSTR) realloc(newBuf, (size_t) realLen);
-
-  // check if the realloc worked and if so, free old memory and
-  // return...if not, just return the original buffer
-  if (!newBuf)
-  {
-    return(noteText);
-  }
-  else
-  {
-    free(noteText);
-    return(newBuf);
-  }
-}
-
-#ifdef WIN16
-
-void
-GetWin16TempName(LPSTR realFileName, LPSTR tempPath, 
-				 LPSTR szTempFileName, UINT uUnique)
-{
-  char	 *dotPtr = strrchr(realFileName, '.');
-  if (dotPtr != NULL)
-  {
-    *dotPtr = '\0';
-  }                
-  
-  int nameLen = lstrlen(realFileName); 
-  if (dotPtr != NULL)
-  {
-    *dotPtr = '.';
-  }
-  
-  if (nameLen <= 7)
-  {
- 	wsprintf(szTempFileName, "%s\\%d%s", tempPath, uUnique, realFileName);
-  }
-  else
-  {
-  	wsprintf(szTempFileName, "%s\\%d%s", tempPath, uUnique, (realFileName + 1));
-  }
-}
-
-#endif
-
-#define MAXTRY  9999  // How many times do we try..
-
-UINT
-GetTempMailNameWithExtension(LPSTR szTempFileName, 
-                             LPSTR origName)
-{
-  UINT        res = 1;
-  UINT        uUnique = 0;
-  char        *szTempPath = GetTheTempDirectoryOnTheSystem();
-  char        *tmpPtr;
-  char        *realFileName = NULL;
-
-  if ( (origName != NULL) && (*origName != '\0') )
-  {
-    tmpPtr = origName;
-  }
-  else
-  {
-    tmpPtr = szTempFileName;
-  }
-
-  realFileName = strrchr(tmpPtr, '\\');
-  if (!realFileName)
-    realFileName = tmpPtr;
-  else
-    realFileName++;
-
-TRYAGAIN:
-
-#ifdef WIN32
-  if (uUnique == 0)
-  {
-    wsprintf(szTempFileName, "%s\\%s", szTempPath, realFileName);
-  }
-  else
-  {
-    wsprintf(szTempFileName, "%s\\%d_%s", 
-                szTempPath, uUnique, realFileName);
-  }
-#else // WIN16
-  if ( (uUnique == 0) && (strlen(realFileName) <= 12) )
-  {
-    wsprintf(szTempFileName, "%s\\%s", szTempPath, realFileName);
-  }
-  else
-  {              
-    if (uUnique < 10)
-    {
-      GetWin16TempName(realFileName, szTempPath, szTempFileName, uUnique);
-    }
-    else 
-    { 
-      res = ISGetTempFileName(szTempPath, "ns", uUnique++, szTempFileName);    
-    }
-
-    // Now add the correct extension...
-    char *origExt = strrchr(realFileName, '.');
-    if (origExt != NULL)
-    {
-      char *tmpExt = strrchr(szTempFileName, '.');
-      if (tmpExt != NULL)
-      {
-        origExt++;
-        tmpExt++;
-
-        while ( ((tmpExt) && (origExt)) && (*origExt != '\0') )
-        {
-          *tmpExt = *origExt;
-          tmpExt++;
-          origExt++;
-        }
-
-        *tmpExt = '\0';
-      }
-    }
-  }
-#endif
-
-  if ( (ValidateFile(szTempFileName) != 1) && (uUnique < MAXTRY) )
-  {
-    uUnique++;
-    if (uUnique >= MAXTRY)
-      return(1);
-    goto TRYAGAIN;
-  }
-
-  return res;
-}
-
-#define kMaxTempFiles   10
-#define kMaxListLength  (10 * _MAX_PATH)
-
-void GetTempFiles(LPSTR pBuf, int lenBuf)
-{
-  if (!GetConfigInfoStr(szMapiSection, szTempFiles, pBuf, lenBuf, HKEY_ROOT))
-  {
-    *pBuf = 0;
-  }
-}
-
-void WriteTempFiles(LPSTR pBuf)
-{
-  SetConfigInfoStr(szMapiSection, szTempFiles, pBuf, HKEY_ROOT);
-}
-
-void  AddTempFile(LPCSTR pFileName)
-{
-  if ( (!pFileName) || (pFileName[0] == '\0') )
-    return;
-
-  char *files = (char *)malloc(kMaxListLength);
-
-  if (!files)
-    return;
-
-  GetTempFiles(files, kMaxListLength);
-  if ((lstrlen(files) + lstrlen(pFileName) + 2) >= kMaxListLength)
-  {
-    free(files);
-    return;
-  }
-
-  if (lstrlen(files) != 0)
-  {
-          lstrcat(files, ";");
-  }
-
-  lstrcat(files, pFileName);
-  WriteTempFiles(files);
-  free(files);
-}
-
-void DeleteFirstTempFile(LPSTR pFiles)
-{
-  if (!*pFiles)
-    return;
-  LPSTR pTemp = strchr(pFiles, ';');
-  if (pTemp)
-  {
-    *pTemp = 0;
-  }
- 
-//#ifndef _DEBUG  
-  _unlink(pFiles);
-//#endif
-
-  if (pTemp)
-  {
-    memmove(pFiles, pTemp + 1, lstrlen(pTemp + 1) + 1);
-  }
-  else
-  {
-    *pFiles = 0;
-  }
-}
-
-void 
-RemoveAllTempFiles(void)
-{
-  char *files = (char *)malloc(kMaxListLength);
-
-  if (!files)
-    return;
-
-  GetTempFiles(files, kMaxListLength);
-
-  while (*files)
-  {
-    DeleteFirstTempFile(files);
-  }
-
-  WriteTempFiles(files);
-  free(files);
-}
-
-void CheckAgeTempFiles(void)
-{
-  char *files = (char *)malloc(kMaxListLength);
-
-  if (!files)
-    return;
-
-  GetTempFiles(files, kMaxListLength);
-  int i = 0;
-  LPSTR pTemp = files;
-  while (TRUE)
-  {
-    pTemp = strchr(pTemp, ';');
-    if (!pTemp)
-      break;
-    ++pTemp;
-    ++i;
-  }
-
-  if (i >= 10)
-  {
-    DeleteFirstTempFile(files);
-    WriteTempFiles(files);
-  }
-
-  free(files);
-}
-
-void 
-CleanupMAPITempFiles(void)
-{
-  if (Is_16_OR_32_BIT_CommunitorRunning() == 0)
-  {
-    RemoveAllTempFiles();           // if Communicator not running, clean up all the temp files
-  }
-  else
-  {
-    CheckAgeTempFiles();
-  }
-}
-
-void *
-CleanMalloc(size_t mallocSize)
-{
-  void *ptr = malloc(mallocSize);
-  if (!ptr)
-    return(NULL);
-
-  memset(ptr, 0, mallocSize);
-  return(ptr);
-}
-
-void
-SafeFree(void *ptr)
-{
-  if (!ptr)
-    return;
-
-  free(ptr);
-  ptr = NULL;
-}
--- a/mozilla/mailnews/mapi/old/mapi32/mapiutl.h
+++ b/mozilla/mailnews/mapi/old/mapi32/mapiutl.h
@@ -1,89 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is 
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-#ifndef __UTILS_
-#define __UTILS_
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-#ifndef MAPI_OLE	// Because MSFT doesn't do this for us :-(
-#include <mapi.h>
-#endif
-
-//
-// Utility functions...
-//
-void    SetLoggingEnabled(BOOL val);    // Set a logging enabled flag
-void    LogString(LPCSTR pStr1);        // Log a string to a file...
-void    BuildMemName(LPSTR name, ULONG winSeed);  // Shared memory name
-HWND    GetCommunicatorIPCWindow(void);    // Get the IPC window we will use...
-DWORD   SanityCheckAttachmentFiles(lpMapiMessage lpMessage); // Check attachments
-DWORD   ValidateFile(LPCSTR szFile);       // Is this a valid file - 0=Yes 1 = NOT_FOUND 2 = OPEN_FAILURE
-
-DWORD   GetFileCount(LPSTR pFiles, LPSTR delimChar); // Get File count from string of file1;file2, etc..
-BOOL    ExtractFile(LPSTR pFiles, LPSTR delimChar, DWORD fIndex, LPSTR fName); // Extract a filename from a string
-
-LPVOID  LoadBlobToMemory(LPSTR fName);  // Load the blob into memory!
-LONG    GetTempAttachmentName(LPSTR fName); // Get a temp file name and put it in fName
-
-UINT    GetTempMailNameWithExtension(LPSTR szTempFileName, LPSTR origName);
-void    CleanupMAPITempFiles(void);
-void  AddTempFile(LPCSTR pFileName);
-
-void    *CleanMalloc(size_t mallocSize);
-void    SafeFree(void *ptr);
-
-//
-// RICHIE - this is a temporary fix for now to get rid of
-// html stuff within the text of a message - if there was a
-// valid noteText buffer coming into this call, we need to 
-// free it on the way out.
-//
-LPSTR   StripHTML(LPSTR noteText);
-
-//
-// Write a buffer to disk
-// Return 0 on success -1 on failure
-//
-LONG    WriteMemoryBufferToDisk(LPSTR fName, LONG bufSize, LPSTR buf); 
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // __UTILS_
--- a/mozilla/mailnews/mapi/old/mapi32/port.h
+++ b/mozilla/mailnews/mapi/old/mapi32/port.h
@@ -1,303 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is 
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-//
-
-#ifndef PORT_H
-#define PORT_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*****************************************************************\
- *                                                               *
- *  PORT.H                                                       *
- *                                                               *
- *  Win16/Win32 portability stuff                                *
- *                                                               *
- *  A.Sokolsky                                                   *
- *      3.10.94 distilled into this header                       *
- *                                                               *
-\*****************************************************************/
-
-/*
- * calling conventions
- */
-#include <assert.h>
-                                                      
-                                                      
-#ifndef CDECL
-#define CDECL __cdecl
-#endif  // CDECL
-
-#ifndef PASCAL
-#define PASCAL __pascal
-#endif  // PASCAL
-
-#ifdef FASTCALL
-#error FASTCALL defined
-#endif // FASTCALL
-
-
-#ifdef NDEBUG
-#define FASTCALL __fastcall
-#else
-#define FASTCALL PASCAL
-#endif // NDEBUG   
-
-
-
-#ifndef HWND2DWORD
-#  ifdef WIN32
-#    define HWND2DWORD(X_hWnd) ( (DWORD)(X_hWnd) )
-#  else // WIN16
-#    define HWND2DWORD(X_hWnd) ( (DWORD)MAKELONG(((WORD)(X_hWnd)), 0) )
-#  endif
-#endif // HWND2DWORD
-
-
-/*
- * WIN16 - WIN32 compatibility stuff
- */
-
-#ifdef WIN32
-
-# define DLLEXPORT    __declspec( dllexport )
-# define EXPORT
-# define LOADDS
-# define HUGE
-# ifndef FAR
-#  define FAR
-# endif // FAR
-# ifndef NEAR
-#  define NEAR
-# endif // NEAR 
-# ifdef UNICODE
-#  define SIZEOF(x)   (sizeof(x)/sizeof(WCHAR))
-# else
-#  define SIZEOF(x)   sizeof(x)
-# endif
-
-#else  // !WIN32 == WIN16
-
-# define DLLEXPORT    
-# define EXPORT       __export
-# define LOADDS       __loadds
-# define HUGE         __huge
-# ifndef FAR
-#   define FAR        __far
-#   define NEAR       __near
-# endif  // FAR
-# define CONST const
-# define SIZEOF(x)    sizeof(x)
-# define CHAR char
-# define TCHAR char
-# define WCHAR char
-# ifndef LPTSTR
-#   define LPTSTR LPSTR
-# endif
-# ifndef LPCTSTR 
-#   define LPCTSTR LPCSTR
-# endif
-# define UNREFERENCED_PARAMETER(x) x;
-# ifndef TEXT
-#   define TEXT(x) x
-# endif
-# define GetWindowTextW GetWindowText
-# define lstrcpyW lstrcpy   
-
-# define BN_DBLCLK BN_DOUBLECLICKED // ~~MRJ needed for custom control.
-// ~~MRJ begin Win95 backward compat section
-# define LPWSTR LPSTR
-# define LPCWSTR LPCSTR
-
-// button check state for WIN16
-#ifndef BST_UNCHECKED
-#define BST_UNCHECKED      0x0000
-#endif
-
-#ifndef BST_CHECKED
-#define BST_CHECKED        0x0001
-#endif
-
-
-#ifndef WIN95_COMPAT
-#  define WIN95_COMPAT
-#endif
-
-// ~~MRJ end Win95 compat section.
-
-// critical section API stubs
-typedef DWORD CRITICAL_SECTION;
-typedef CRITICAL_SECTION FAR * LPCRITICAL_SECTION; 
-#ifdef __cplusplus
-inline void InitializeCriticalSection(LPCRITICAL_SECTION lpSection) {}
-inline void DeleteCriticalSection(LPCRITICAL_SECTION lpSection) {}
-inline void EnterCriticalSection(LPCRITICAL_SECTION lpSection) {}
-inline void LeaveCriticalSection(LPCRITICAL_SECTION lpSection) {} 
-#endif // __cplusplus 
-
-// Added for nssock16 ---Neeti
-#ifndef ZeroMemory
-#include <memory.h>
-#define ZeroMemory(PTR, SIZE) memset(PTR, 0, SIZE)
-#endif // ZeroMemory
-
-#endif // WIN16
-
-/*
- * unix - windows compatibility stuff
- */
-typedef DWORD u_int32;
-typedef WORD  u_int16;
-typedef BYTE  u_int8;
-#ifdef WIN32
-typedef short int Bool16;
-#else  // WIN16
-typedef BOOL  Bool16;
-#endif // WIN16
-
-/*
- * Cross Platform Compatibility
- */
-#ifndef UNALIGNED
-# ifdef _M_ALPHA
-#  define UNALIGNED __unaligned
-# else  // !_M_ALPHA
-#  define UNALIGNED
-# endif // !_M_ALPHA
-#endif  // UNALIGNED
-
-//
-// RICHIE - for the Alpha port
-//
-#ifdef _M_ALPHA
-# undef pascal
-# undef PASCAL
-# if (_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED)
-#  define pascal __stdcall
-#  define PASCAL __stdcall
-# else
-#  define PASCAL
-# endif
-#endif
-
-
-/*
- * Useful Types
- */
-typedef char HUGE *HPSTR;
-typedef const char HUGE *HPCSTR;
-typedef unsigned char HUGE *HPBYTE;
-typedef WORD HUGE *HPWORD;
-typedef UINT FAR *LPUINT;
-typedef BOOL (CALLBACK *USERABORTPROC)();
-typedef BOOL (CALLBACK *PROGRESSPROC)(UINT uPos, UINT uRange);
-typedef int INT;   // ~~MRJ a function needed this defined.
-typedef MINMAXINFO FAR *LPMINMAXINFO; // ~~MRJ 
-
-//
-// stuff missing from windows.h
-//
-#ifndef MAKEWORD
-#define MAKEWORD(low, high)    ((WORD)(((BYTE)(low)) | (((WORD)((BYTE)(high))) << 8)))
-#endif // MAKEWORD
-
-#ifdef WIN32
-# ifndef hmemcpy
-#  define hmemcpy memcpy
-# endif // !defined(hmemcpy)
-# define _fmemset memset
-
-# include <malloc.h>
-
-#ifdef __cplusplus
-
-inline BOOL IsGDIObject(HGDIOBJ hObj) { return (hObj != 0); }
-inline void *_halloc(long num, unsigned int size) { return malloc(num * size); }
-inline void _hfree( void *memblock ) { free(memblock); } 
-/*
-inline BOOL IsInstance(HINSTANCE hInst) {
-# ifdef WIN32
-    return (hInst != 0);
-# else // WIN16
-    return (hInst > HINSTANCE_ERROR);
-# endif  
-}  
-*/
-
-#endif // __cplusplus
-
-  WINUSERAPI HANDLE WINAPI LoadImageA(HINSTANCE, LPCSTR, UINT, int, int, UINT);
-
-#endif // WIN32
-
-#ifdef __cplusplus 
-inline BOOL IsInstance(HINSTANCE hInst) {
-# ifdef WIN32
-    return (hInst != 0);
-# else // WIN16
-    return (hInst > HINSTANCE_ERROR);
-# endif  
-} 
-inline void SetWindowSmallIcon(HINSTANCE hInst, HWND hWnd, UINT uIconResourceId) {
-#ifdef WIN32
-# ifndef WM_SETICON
-#   define WM_SETICON 0x0080
-# endif  // WM_SETICON
-# ifndef IMAGE_ICON
-#   define IMAGE_ICON 1
-# endif
-  assert(IsWindow(hWnd));
-  HICON hIcon = (HICON)LoadImageA(hInst, MAKEINTRESOURCE(uIconResourceId), IMAGE_ICON,
-    16, 16, 0);
-  if(NULL != hIcon) {
-    SendMessage(hWnd, WM_SETICON, FALSE, (LPARAM)hIcon);
-  } else {
-    HICON hIcon = LoadIcon(hInst, MAKEINTRESOURCE(uIconResourceId));
-    assert(hIcon != 0);
-    SendMessage(hWnd, WM_SETICON, FALSE, (LPARAM)hIcon);
-  }
-#endif // WIN32
-}
-#endif // __cplusplus
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* PORT_H */
--- a/mozilla/mailnews/mapi/old/mapi32/resource.h
+++ b/mozilla/mailnews/mapi/old/mapi32/resource.h
@@ -1,54 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is 
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by mapi32.rc
-//
-#define ID_DIALOG_QAHOOK                101
-#define ID_DIALOG_MAPI                  101
-#define ID_ICON_APP                     102
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        103
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1000
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
--- a/mozilla/mailnews/mapi/old/mapi32/smem.cpp
+++ b/mozilla/mailnews/mapi/old/mapi32/smem.cpp
@@ -1,172 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is 
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-//
-//  smem.cpp - This deals with all shared memory functions needed for 
-//  the MAPI component of Communicator
-//  Written by: Rich Pizzarro (rhp@netscape.com)
-//  November 1997
-//
-#include <windows.h>
-#include <windowsx.h>
-
-#include "mapismem.h"
-
-#ifndef ZeroMemory
-#include <memory.h>
-#define ZeroMemory(PTR, SIZE) memset(PTR, 0, SIZE)
-#endif // ZeroMemory
-
-// 
-// *create new* shared memory chunk 
-// once this is created, use the pointer
-// to the segment to to store data 
-// e.g.: 
-//     lpString = "string for communicator"; 
-//     lstrcpy((LPSTR)pData->m_buf[0], lpString); 
-//  
-CSharedMem *
-NSCreateSharedMemory(DWORD memSize, LPCTSTR memName, HANDLE *hSharedMemory)
-{
-#ifdef WIN32
-
-  BOOL bExistedBefore;
-  CSharedMem *pData;
-
-  LPCTSTR szObjectName = memName; 
-  DWORD dwSize = sizeof(CSharedMem) + memSize; 
-  *hSharedMemory = CreateFileMapping( 
-    (HANDLE)0xFFFFFFFF,0,PAGE_READWRITE,0,dwSize,szObjectName); 
-  if(*hSharedMemory == 0) 
-  { 
-    return NULL; 
-  } 
-  bExistedBefore = (GetLastError() == ERROR_ALREADY_EXISTS); 
-  if(bExistedBefore) 
-  { 
-  	return NULL;
-  } 
-
-  pData = (CSharedMem *)MapViewOfFile( 
-            *hSharedMemory, FILE_MAP_ALL_ACCESS, 0, 0, 0); 
-  if(pData == NULL) 
-  { 
-    return NULL; 
-  } 
-
-  ZeroMemory(pData, dwSize); 
-  pData->m_dwSize = memSize; 
-
-  return pData;
-#else
-  CSharedMem 	*sMemChunk = NULL;
-  DWORD dwSize = memSize = (sizeof(CSharedMem) + memSize); 
-
-  if (sMemChunk != NULL)
-	  return(sMemChunk);
-
-  sMemChunk = (CSharedMem *) GlobalAllocPtr(GMEM_MOVEABLE, dwSize);
-  ZeroMemory(sMemChunk, (size_t) dwSize);
-  sMemChunk->m_dwSize = dwSize;   // Missing in Communicator code!
-  return(sMemChunk);
-
-#endif // WIN32
-}
-
-// 
-// *open existing* shared memory chunk 
-// once you have the pointer to the new segment 
-// use this pointer to access data, e.g.: 
-// 
-CSharedMem *
-NSOpenExistingSharedMemory(LPCTSTR memName, HANDLE *hSharedMemory)
-{
-#ifdef WIN32
-  CSharedMem *pData;
-  DWORD dwSize;
-
-  LPCTSTR szObjectName = memName; 
-  *hSharedMemory = OpenFileMapping( 
-    PAGE_READWRITE,FALSE,szObjectName); 
-  if(*hSharedMemory == 0) 
-  { 
-    return NULL; 
-  } 
-
-  pData = (CSharedMem *)MapViewOfFile( 
-              *hSharedMemory,FILE_MAP_ALL_ACCESS,0,0,0); 
-  if(pData == NULL) 
-  { 
-    return NULL; 
-  } 
-  
-  dwSize = pData->m_dwSize; 
-  return pData;
-#else
-
-  return(NULL);   // In Win16, this is really meaningless...
-
-#endif
-}  
-
-// 
-// to close shared memory segment
-// 
-void
-NSCloseSharedMemory(CSharedMem *pData, HANDLE hSharedMemory)
-{
-#ifdef WIN32
-  if(pData != 0) 
-  { 
-    UnmapViewOfFile(pData); 
-    pData = 0; 
-  } 
-
-  if(hSharedMemory != 0) 
-  { 
-    CloseHandle(hSharedMemory); 
-    hSharedMemory = 0; 
-  } 
-#else
-
-	if (pData != NULL)
-	{
-		GlobalFreePtr(pData);
-		pData = NULL;
-	}
-
-#endif // WIN32
-}
--- a/mozilla/mailnews/mapi/old/mapi32/trace.cpp
+++ b/mozilla/mailnews/mapi/old/mapi32/trace.cpp
@@ -1,68 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is 
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-#include <windows.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <tchar.h>
-#include "trace.h"
-
-#ifdef _DEBUG 
-
-#ifndef WIN16
-void CDECL AfxTrace(LPCTSTR lpszFormat, ...)
-#else                                       
-void CDECL AfxTrace(LPCSTR lpszFormat, ...)
-#endif
-{
-  va_list args;
-	va_start(args, lpszFormat);
-
-	int nBuf;
-	TCHAR szBuffer[512];
-
-	nBuf = _vstprintf(szBuffer, lpszFormat, args);
-	va_end(args);
-  OutputDebugString(szBuffer); 
-  return;
-}
-
-BOOL AfxAssertFailedLine(LPCSTR lpszFileName, int nLine)
-{    
-	return TRUE;
-}
-
-#endif
--- a/mozilla/mailnews/mapi/old/mapi32/trace.h
+++ b/mozilla/mailnews/mapi/old/mapi32/trace.h
@@ -1,81 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is 
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-#include <windows.h>
-
-#ifdef _DEBUG
-BOOL AfxAssertFailedLine(LPCSTR lpszFileName, int nLine);
-
-#ifndef WIN16
-void CDECL AfxTrace(LPCTSTR lpszFormat, ...);
-#else
-void CDECL AfxTrace(LPCSTR lpszFormat, ...);
-#endif
-
-#define TRACE              ::AfxTrace
-#define THIS_FILE          __FILE__
-#define ASSERT(f) \
-	do \
-	{ \
-	if (!(f) && AfxAssertFailedLine(THIS_FILE, __LINE__)) \
-		AfxDebugBreak(); \
-	} while (0) \
-
-#define VERIFY(f)          ASSERT(f)
-#define TRACE_FN(name) LogFn __logFn(name)
-class LogFn
-{
-public:
-	LogFn(LPCSTR pFnName) {m_pFnName = pFnName; TRACE("--%s: In--\n", pFnName);}
-	~LogFn() {TRACE("--%s: Out--\n", m_pFnName);}
-private:
-	LPCSTR m_pFnName;
-};
-#else
-// NDEBUG
-#define ASSERT(f)          ((void)0)
-#define VERIFY(f)          ((void)(f))
-#define ASSERT_VALID(pOb)  ((void)0)
-#define DEBUG_ONLY(f)      ((void)0)   
-#ifdef WIN32
-inline void CDECL AfxTrace(LPCTSTR, ...) { }
-#else
-inline void CDECL AfxTrace(LPCSTR, ...) { }
-#endif
-#define TRACE              1 ? (void)0 : ::AfxTrace
-#define TRACE_FN(name)
-#endif // _DEBUG
-
--- a/mozilla/mailnews/mapi/old/mapi32/xpapi.cpp
+++ b/mozilla/mailnews/mapi/old/mapi32/xpapi.cpp
@@ -1,347 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is 
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-//
-//  XPAPI.CPP
-//  API implementation file for mapi16.dll and mapi32.dll
-//  Written by: Rich Pizzarro (rhp@netscape.com)
-//  November 1997
-//
-#include <windows.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include "xpapi.h"
-#include "mapiutl.h"
-
-WORD LOAD_DS XP_CallProcess(LPCSTR pPath, LPCSTR pCmdLine)
-{            
-	WORD wReturn = 0;
-#ifndef WIN16
-	STARTUPINFO startupInfo;
-	PROCESS_INFORMATION processInfo;
-
-	memset(&startupInfo, 0, sizeof(startupInfo));
-	startupInfo.cb = sizeof(startupInfo);
-	if (wReturn = CreateProcess(pPath, (LPTSTR)pCmdLine, NULL, NULL, FALSE, CREATE_DEFAULT_ERROR_MODE | CREATE_NEW_PROCESS_GROUP, NULL, NULL, &startupInfo, &processInfo))
-	{
-		WaitForInputIdle(processInfo.hProcess, 120000);
-	}
-#else       
-	// char szMsg[80];	
-	char szExecute[512];
-	lstrcpy(szExecute, pPath);
-	lstrcat(szExecute, " ");
-	lstrcat(szExecute, pCmdLine);
-	wReturn = WinExec(szExecute,SW_SHOW);
-	
-	if (wReturn < 32) 
-	{
-	    wReturn = 0;
-	}
-#endif
-	return wReturn;
-}
-
-HKEY LOAD_DS RegOpenParent(LPCSTR pSection, HKEY hRootKey, REGSAM access)
-{
-	HKEY hKey;
-#ifndef WIN16
-	if (RegOpenKeyEx(hRootKey, pSection, 0, access, &hKey) != ERROR_SUCCESS)
-	{
-		return(NULL);
-	}        
-#else
-    if (RegOpenKey(hRootKey, pSection, &hKey) != ERROR_SUCCESS)
-    {
-    	return(NULL);
-    }
-#endif
-	return(hKey);
-}
-
-HKEY LOAD_DS RegCreateParent(LPCSTR pSection, HKEY hMasterKey)
-{
-	HKEY hKey;
-	if (RegCreateKey(hMasterKey, pSection, &hKey) != ERROR_SUCCESS)
-	{
-		return(NULL);
-	}        
-	return(hKey);
-}
-
-BOOL LOAD_DS GetConfigInfoStr(LPCSTR pSection, LPCSTR pKey, LPSTR pBuf, int lenBuf, HKEY hMasterKey)
-{
-	HKEY hKey;
-	hKey = RegOpenParent(pSection, hMasterKey, KEY_QUERY_VALUE);
-	if (!hKey)
-	{
-		return(FALSE);
-	}
-
-	DWORD len = (DWORD)lenBuf;
-#ifndef WIN16
-	BOOL retVal = (RegQueryValueEx(hKey, pKey, NULL, NULL, (LPBYTE)pBuf, &len) == ERROR_SUCCESS);
-#else
-	BOOL retVal = (RegQueryValue(hKey, pKey, pBuf, (long far*)&len) == ERROR_SUCCESS);
-#endif
-	RegCloseKey(hKey);
-	return(retVal);
-}
-
-BOOL LOAD_DS GetConfigInfoNum(LPCSTR pSection, LPCSTR pKey, DWORD* pVal, HKEY hMasterKey)
-{
-	HKEY hKey;
-	hKey = RegOpenParent(pSection, hMasterKey, KEY_QUERY_VALUE);
-	if (!hKey)
-	{
-		return(FALSE);
-	}
-
-	DWORD len = sizeof(DWORD);
-#ifndef WIN16
-	BOOL retVal = (RegQueryValueEx(hKey, pKey, NULL, NULL, (LPBYTE)pVal, &len) == ERROR_SUCCESS);
-#else
-	BOOL retVal = (RegQueryValue(hKey, pKey, (char far*)pVal, (long far*)&len) == ERROR_SUCCESS);
-#endif
-	RegCloseKey(hKey);
-	return(retVal);
-}
-
-BOOL LOAD_DS SetConfigInfoStr(LPCSTR pSection, LPCSTR pKey, LPSTR pStr, HKEY hMasterKey)
-{
-	HKEY hKey;
-	hKey = RegCreateParent(pSection, hMasterKey);
-	if (!hKey)
-	{
-		return(FALSE);
-	}
-#ifndef WIN16
-	BOOL retVal = (RegSetValueEx(hKey, pKey, 0, REG_SZ, (LPBYTE)pStr, lstrlen(pStr) + 1) == ERROR_SUCCESS);
-#else
-	BOOL retVal = (RegSetValue(hKey, pKey, REG_SZ, pStr, lstrlen(pStr) + 1) == ERROR_SUCCESS);
-#endif
-	RegCloseKey(hKey);
-	return(retVal);
-}
-
-
-BOOL LOAD_DS XP_GetInstallDirectory(LPCSTR pcurVersionSection, LPCSTR pInstallDirKey, LPSTR path, UINT nSize, HKEY hKey)
-{   
-#ifdef WIN32   
-	if (!GetConfigInfoStr(pcurVersionSection, pInstallDirKey, path, nSize, hKey))
-	{  
-		return FALSE;
-	}
-	else
-	{
-		return TRUE;
-	}       
-#else
-	if ( 0 < GetPrivateProfileString(pcurVersionSection, pInstallDirKey,"ERROR", path, nSize, szNetscapeINI))
-	{
-		return TRUE;
-	}
-	else
-	{
-		return FALSE;
-	}
-#endif
-}
-
-
-BOOL LOAD_DS XP_GetVersionInfoString(LPCSTR pNavigatorSection, LPCSTR pCurrentVersionKey, LPSTR pcurVersionStr, UINT nSize, HKEY hKey)
-{ 
-#ifdef WIN32
-	if (!GetConfigInfoStr(pNavigatorSection, pCurrentVersionKey, pcurVersionStr, nSize, HKEY_LOCAL_MACHINE))
-	{
-		return FALSE;
-	}               
-	else
-	{
-		return TRUE;
-	}
-#else 
-	if ( 0 < GetPrivateProfileString(pNavigatorSection, pCurrentVersionKey,"ERROR", pcurVersionStr, nSize, szNetscapeINI))
-	{
-		return TRUE;
-	}
-	else
-	{
-		return FALSE;
-	}
-#endif
-
-}   
-
-DWORD LOAD_DS XP_GetInstallLocation(LPSTR pPath, UINT nSize)
-{           
-char curVersionStr[256]; 
-char curVersionSection[256];
-
-  if (!pPath) 
-    return  MAPI_E_LOGON_FAILURE;
-  
-#ifdef WIN32
-  if (!XP_GetVersionInfoString(szNavigatorSection, szCurrentVersionKey, curVersionStr, 
-    sizeof(curVersionStr), HKEY_LOCAL_MACHINE))
-  {
-    return (MAPI_E_LOGON_FAILURE);
-  }
-  
-  wsprintf(curVersionSection, szNavigatorCurVersionSection, curVersionStr);
-		
-  if (!XP_GetInstallDirectory(curVersionSection, szInstallDirKey, pPath, 
-    nSize, HKEY_LOCAL_MACHINE))
-  {
-    return (MAPI_E_ACCESS_DENIED);
-    
-  }
-  
-  lstrcat(pPath, "\\");
-  lstrcat(pPath, "Program\\netscape.exe");
-  
-  return SUCCESS_SUCCESS;
-#else
-  if (32 == Is_16_OR_32_BIT_CommunitorRunning())
-  {   
-    if (!GetConfigInfoStr("snews\\shell\\open", "command", curVersionStr, sizeof(curVersionStr), HKEY_CLASSES_ROOT))
-    {
-      return (MAPI_E_ACCESS_DENIED);
-    }
-    else
-    {	
-      char *pFind = strstr(curVersionStr,"-h");
-      
-      if (pFind)
-      {
-        *pFind=0;
-        lstrcpy(pPath,curVersionStr);
-      }
-      else
-      {
-        return (MAPI_E_ACCESS_DENIED);
-      }
-    }
-    
-    return SUCCESS_SUCCESS;
-  }
-  else //setup up to start navstart since we are a sixteen bit DLL.
-  {
-    if (!XP_GetVersionInfoString(szNavigatorSection, szCurrentVersionKey, curVersionStr, sizeof(curVersionStr), HKEY_LOCAL_MACHINE))
-    {
-      return (MAPI_E_LOGON_FAILURE);
-    }
-    
-    wsprintf(curVersionSection, szNavigatorCurVersionSection, curVersionStr);
-    
-    if (!XP_GetInstallDirectory(curVersionSection, szInstallDirKey, pPath,nSize, HKEY_LOCAL_MACHINE))
-    {
-      return (MAPI_E_ACCESS_DENIED);		
-    }
-    
-    lstrcat(pPath, "\\");
-    lstrcat(pPath, "NAVSTART.EXE");
-    return SUCCESS_SUCCESS;	
-  }
-#endif
-}
-
-int LOAD_DS Is_16_OR_32_BIT_CommunitorRunning()
-{
-  if (FindWindow("AfxFrameOrView", NULL) && !FindWindow("aHiddenFrameClass", NULL))
-		return(16);
-	else if (FindWindow("aHiddenFrameClass", NULL))
-		return(32);
-	else 
-		return 0;
-}
-
-// size of buffer to use for copying files.
-#define COPYBUFSIZE 1024
-
-#ifdef WIN16
-     
-BOOL Win16CopyFile(LPCSTR a_Src, LPCSTR a_Dest, BOOL a_bOverwrite)
-{
-	OFSTRUCT ofSrc, ofDest;
-	HFILE hSrc, hDest;
-	BOOL bResult;
-	
-	ofDest.cBytes = ofSrc.cBytes = sizeof(OFSTRUCT);
-	hDest = OpenFile(a_Dest, &ofDest, OF_EXIST);
-	if (hDest != HFILE_ERROR && !a_bOverwrite)
-		bResult = FALSE;	// file exists but caller doesn't want file overwritten
-	else { // file either doesn't exist, or caller wants it overwritten.
-		hSrc = OpenFile(a_Src, &ofSrc, OF_READ);
-		hDest = OpenFile(a_Dest, &ofDest, OF_WRITE | OF_CREATE);
-		if (hSrc != HFILE_ERROR && hDest != HFILE_ERROR) {
-			unsigned char buf[COPYBUFSIZE];
-			UINT bufsize =  COPYBUFSIZE;
-			UINT bytesread;
-			
-			bResult = TRUE;			
-			while (0 != (bytesread = _lread(hSrc, (LPVOID)buf, bufsize))) {
-				if ((bytesread == HFILE_ERROR) || 	// check for read error...
-											// and write error
-					(bytesread != _lwrite(hDest, (LPVOID)buf, bytesread))) {
-					bResult = FALSE; // could be out of diskspace
-					break;
-				}
-			}
-		}
-		else
-			bResult = FALSE;
-
-		if (hSrc != HFILE_ERROR)
-			_lclose(hSrc);
-		if (hDest != HFILE_ERROR)
-			_lclose(hDest);
-	}
-			
-	return bResult;
-}
-
-#endif  // WIN16
-
-BOOL LOAD_DS 
-XP_CopyFile(LPCSTR lpExistingFile, LPCSTR lpNewFile, BOOL bFailifExist)
-{                                                  
-#ifdef WIN32
-  return	CopyFile(lpExistingFile, lpNewFile, bFailifExist);
-#else                                                             
-  return    Win16CopyFile(lpExistingFile, lpNewFile, TRUE);
-#endif
-}    
--- a/mozilla/mailnews/mapi/old/mapi32/xpapi.h
+++ b/mozilla/mailnews/mapi/old/mapi32/xpapi.h
@@ -1,138 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is 
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-//
-//  Various routines for MAPI functions.
-//  Written by: Rich Pizzarro (rhp@netscape.com)
-//  November 1997
-//
-#ifndef __XPAPI_H
-#define __XPAPI_H
-
-#ifdef WIN16
-
-#include <string.h>
-#include <direct.h>
-#include <shellapi.h>
-#include <stdlib.h>
-#else
-#include <winreg.h>
-#endif 
- 
-#ifdef WIN16
-extern "C" {
-#ifndef MAPI_OLE	// Because MSFT doesn't do this for us :-(
-#include <mapi.h>
-#endif 
-}           
-#else
-//#include <mapi.h>
-#endif
-
-
-#ifdef WIN32
-#define MAPI_IMPLEMENT(param) param PASCAL 
-#define LOAD_DS
-#else        
-#define LOAD_DS 	__loadds
-#define MAPI_IMPLEMENT(param) extern "C" param FAR PASCAL
- 
-#endif   
-
-#ifdef WIN16
-#define _MAX_PATH 				260  /* max. length of full pathname*/
-#define MAPI_E_LOGON_FAILURE  	3 
-#define MAPI_E_ACCESS_DENIED	6  
-#define INVALID_HANDLE_VALUE 	(HANDLE)-1  
-#define KEY_QUERY_VALUE 		0x0001  
-#define HKEY_LOCAL_MACHINE 		((HKEY)0x80000002)
-#define HKEY_ROOT				HKEY_CLASSES_ROOT
-#else 
-#define HKEY_ROOT				((HKEY)0x80000002)
-#endif
-
-//
-// registry keys
-//
-#ifdef WIN32
-static char szNavigatorSection[] = "Software\\Netscape\\Netscape Navigator";
-static char szNavigatorCurVersionSection[] = "Software\\Netscape\\Netscape Navigator\\%s\\Main";
-static char szCurrentVersionKey[] = "CurrentVersion";
-static char szInstallDirKey[] = "Install Directory";
-static char szMapiSection[] = "Software\\Netscape\\Netscape Navigator\\MAPI";
-static char szTempFiles[] = "TempFiles";  
-static char szMapiLog[] = "NSMAPI32.LOG";
-#else 
-//32 bit key strings for trying to read the 32bit registry
-static char szNavigatorSection32[] = "Software\\Netscape\\Netscape Navigator";
-static char szNavigatorCurVersionSection32[] = "Software\\Netscape\\Netscape Navigator\\%s\\Main";
-static char szMapiSection32[] = "Software\\Netscape\\Netscape Navigator\\MAPI";
-
-// ini section and key strings 
-static char szNetscapeINI[] = "nscp.ini";
-static char szNavigatorSection[] = "Netscape Navigator";
-static char szNavigatorCurVersionSection[] = "Netscape Navigator-%s";
-static char szCurrentVersionKey[] = "CurrentVersion";
-static char szInstallDirKey[] = "Install Directory";
-static char szMapiSection[] = "MAPI";
-static char szTempFiles[] = "TempFiles";
-static char szExeName[] = "NAVSTART.EXE";
-static char szMapiLog[] = "NSMAPI16.LOG";
-#endif                                   
-
-//Since REGSAM is just an ACCESS_MASK which is just a DWORD and it's not 
-//declared in win16 we'll make one hear for the purpose of keeping parameters
-//the same even though the access rights don't get used for win16.
-
-typedef DWORD REGSAM;
-
-
-// XP declarations
-
-int 	LOAD_DS Is_16_OR_32_BIT_CommunitorRunning();
-WORD 	LOAD_DS XP_CallProcess(LPCSTR pPath, LPCSTR pCmdLine);
-HKEY LOAD_DS RegOpenParent(LPCSTR pSection, HKEY hRootKey, REGSAM access);
-HKEY LOAD_DS RegCreateParent(LPCSTR pSection, HKEY hMasterKey);
-BOOL LOAD_DS GetConfigInfoStr(LPCSTR pSection, LPCSTR pKey, LPSTR pBuf, int lenBuf, HKEY hMasterKey);
-BOOL LOAD_DS GetConfigInfoNum(LPCSTR pSection, LPCSTR pKey, DWORD* pVal, HKEY hMasterKey);
-BOOL LOAD_DS SetConfigInfoStr(LPCSTR pSection, LPCSTR pKey, LPSTR pStr, HKEY hMasterKey); 
-
-BOOL  LOAD_DS XP_GetInstallDirectory(LPCSTR pcurVersionSection, LPCSTR pInstallDirKey, LPSTR path, UINT nSize, HKEY hKey); 
-BOOL  LOAD_DS XP_GetVersionInfoString(LPCSTR pNavigatorSection, LPCSTR pCurrentVersionKey, LPSTR pcurVersionStr, UINT nSize, HKEY hKey);
-DWORD LOAD_DS XP_GetInstallLocation(LPSTR pPath, UINT nSize);
-BOOL LOAD_DS  XP_CopyFile(LPCSTR lpExistingFile, LPCSTR lpNewFile, BOOL bFailifExist);
-
-#endif    // __XPAPI_H
--- a/mozilla/mailnews/mapi/old/public/makefile.win
+++ b/mozilla/mailnews/mapi/old/public/makefile.win
@@ -1,31 +0,0 @@
-#!nmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-DEPTH=..\..\..
-MODULE=mime
-
-EXPORTS =							\
-	nscpmapi.h		\
-    $(NULL)
-
-
-include <$(DEPTH)\config\rules.mak>
-
--- a/mozilla/mailnews/mapi/old/public/nscpmapi.h
+++ b/mozilla/mailnews/mapi/old/public/nscpmapi.h
@@ -1,351 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is 
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-//
-// This is a header file for the MAPI support within 
-// Communicator. 
-//
-// Written by: Rich Pizzarro (rhp@netscape.com)
-//
-#ifndef _NSCPMAPI
-#define _NSCPMAPI
-
-#ifndef MAPI_OLE	// Because MSFT doesn't do this for us :-(
-#include <mapi.h>     // for MAPI specific types...        
-#endif 
-
-#ifdef WIN16
-typedef unsigned char	UCHAR;
-#endif 
-
-
-#define           MAX_NAME_LEN    256
-#define           MAX_PW_LEN      256
-#define           MAX_MSGINFO_LEN 512
-#define           MAX_CON         4     // Maximum MAPI session supported
-#define           MAX_POINTERS    32
-
-//
-// The MAPI class that will act as the internal mechanism for 
-// Communicator to control multiple MAPI sessions.
-//
-class CMAPIConnection 
-{
-protected:
-  LONG        m_ID;
-  BOOL        m_defaultConnection;  
-  LONG        m_sessionCount;
-  LONG        m_messageIndex;
-  LPVOID      m_cookie;
-  UCHAR       m_messageFindInfo[MAX_MSGINFO_LEN];
-  UCHAR       m_profileName[MAX_NAME_LEN];
-  UCHAR       m_password[MAX_PW_LEN];
-
-  // Methods
-
-public:
-  CMAPIConnection  ( LONG, LPSTR, LPSTR );
-  ~CMAPIConnection ( );
-
-  // ID related methods
-  LONG   GetID( ) { return m_ID; } ;
-
-  // Dealing with the default session...
-  BOOL    IsDefault( ) { return m_defaultConnection; } ;
-  void    SetDefault( BOOL flag ) { m_defaultConnection = flag; } ;
-
-  // For handling multiple sessions on a profile name...
-  LONG    GetSessionCount( ) { return m_sessionCount; } ;
-  void    IncrementSessionCount() { ++m_sessionCount; } ;
-  void    DecrementSessionCount() { --m_sessionCount; } ;
-
-  // Information retrieval stuff...
-  LPSTR   GetProfileName( ) { return (LPSTR) m_profileName; };
-  LPSTR   GetPassword( ) { return (LPSTR) m_password; };
-
-  // Dealing with message information...
-  void    SetMessageIndex( LONG mIndex ) { m_messageIndex = mIndex; } ;
-  LONG    GetMessageIndex( ) { return m_messageIndex; };
-
-  void    SetMessageFindInfo( LPSTR info ) { lstrcpy((LPSTR)m_messageFindInfo, info); } ;
-  LPSTR   GetMessageFindInfo( ) { return (LPSTR) m_messageFindInfo; };
-
-  // For enumerating Messages...
-  void    SetMapiListContext( LPVOID cookie) { m_cookie = cookie; } ;
-  LPVOID  GetMapiListContext( ) { return m_cookie; };
-};
-
-//
-// Defines needed for requests being made with the WM_COPYDATA call...
-//
-typedef enum {
-    NSCP_MAPIStartRequestID = 0,
-    NSCP_MAPILogon,
-    NSCP_MAPILogoff,
-    NSCP_MAPIFree,
-    NSCP_MAPISendMail,
-    NSCP_MAPISendDocuments, 
-    NSCP_MAPIFindNext,
-    NSCP_MAPIReadMail,
-    NSCP_MAPISaveMail,
-    NSCP_MAPIDeleteMail,
-    NSCP_MAPIAddress,
-    NSCP_MAPIDetails,
-    NSCP_MAPIResolveName,
-    NSCP_MAPIEndRequestID       // Note: this is a marker for MAPI IPC requests
-} NSCP_IPC_REQUEST;
-
-//
-// This is to keep track of the pointers allocated in the MAPI DLL
-// and deal with them correctly.
-//
-#define   MAPI_MESSAGE_TYPE     0
-#define   MAPI_RECIPIENT_TYPE   1
- 
-typedef struct {
-  LPVOID    lpMem;
-  UCHAR     memType;
-} memTrackerType;
-
-//
-// This is the generic message that WM_COPYDATA will send to the
-// Communicator product to allow it to attach to shared memory.
-// NOTE: On Win16, this will simply reference a pointer.
-//
-typedef struct {
-  UCHAR   smemName[64]; // Name of shared memory
-  DWORD   smemSize;     // Size of shared memory
-  LPVOID  lpsmem;       // Will be really used in Win16 only
-} MAPIIPCType;
-
-//
-// These are message specific structures that will be used for 
-// the various MAPI operations.
-//
-typedef struct {
-  ULONG     ulUIParam;
-  FLAGS     flFlags;
-  LHANDLE   lhSession;
-  DWORD     ipcWorked;      // Necessary for IPC check with Communicator
-// LPSTR     strSequence,  // LPSTR lpszProfileName, LPSTR lpszPassword
-// This is here to document the fact there will be a string sequence at 
-// this location
-} MAPILogonType;
-
-typedef struct {
-  LHANDLE   lhSession;
-  ULONG     ulUIParam;
-  FLAGS     flFlags;
-  DWORD     ipcWorked;      // Necessary for IPC check with Communicator
-} MAPILogoffType;
-
-typedef struct {
-  LHANDLE   lhSession;
-  ULONG     ulUIParam;
-  FLAGS     flFlags;
-  DWORD     ipcWorked;      // Necessary for IPC check with Communicator
-  // The following is the "FLAT" representation of the (lpMapiMessage lpMessage) 
-  // argument of this structure 
-  FLAGS     MSG_flFlags;          // unread,return receipt                  
-  ULONG     MSG_nRecipCount;      // Number of recipients                   
-  ULONG     MSG_nFileCount;       // # of file attachments                  
-  ULONG     MSG_ORIG_ulRecipClass; //  Recipient class - MAPI_TO, MAPI_CC, MAPI_BCC, MAPI_ORIG
-  BYTE      dataBuf[1];           // For easy referencing
-  //
-  // This is where it gets CONFUSING...the following buffer of memory is a
-  // contiguous chunk of memory for various strings that are part of this
-  // multilevel structure. For any of the following structure, any numbers
-  // are represented by strings that will have to be converted back to numeric
-  // values with atoi() calls.
-
-  // String 0: LPSTR lpszSubject;            // Message Subject
-  // String 1: LPSTR lpszNoteText FILE NAME; // Message Text will be
-  //           stored into a temp file and this will be the pointer to that file.
-  // String 2: LPSTR lpszDateReceived;       // in YYYY/MM/DD HH:MM format
-  // String 3: LPSTR lpszConversationID;     // conversation thread ID
-  //
-  // The following are for the originator of the message. Only ONE of these.
-  //
-  // String 4: LPSTR lpszName;             // Originator name                           
-  // String 5: LPSTR lpszAddress;          // Originator address (optional)             
-  //
-  // The following strings are for the recipients for this message. There are
-  // MSG_nRecipCount of these in a row:
-  //
-  // for (i=0; i<MSG_nRecipCount; i++)
-  //      String x: LPSTR lpszRecipClass (ULONG) // Recipient class - MAPI_TO, MAPI_CC, MAPI_BCC, MAPI_ORIG        
-  //      String x: LPSTR lpszName;     // Recipient N name                           
-  //      String x: LPSTR lpszAddress;  // Recipient N address (optional)             
-  //
-  // Now, finally, add the attachments for this beast. There are MSG_nFileCount
-  // attachments so it would look like the following:
-  //
-  // for (i=0; i<MSG_nFileCount; i++)
-  //
-  //      String x: LPSTR lpszPathName // Fully qualified path of the attached file. 
-  //                                   // This path should include the disk drive letter and directory name.
-  //      String x: LPSTR lpszFileName // The display name for the attached file
-  //
-} MAPISendMailType;
-
-typedef struct {
-    ULONG     ulUIParam;
-    ULONG     nFileCount;
-    DWORD     ipcWorked;      // Necessary for IPC check with Communicator
-    BYTE      dataBuf[1];     // For easy referencing
-    //
-    // The sequence of strings to follow are groups of PathName/FileName couples.
-    // The strings will be parsed in MAPI[32].DLL and then put into this format:
-    //
-    // for (i=0; i<nFileCount; i++)
-    //
-    //      String x: LPSTR lpszPathName // Fully qualified path of the attached file. 
-    //                                   // This path should include the disk drive letter and directory name.
-    //      String x: LPSTR lpszFileName // The display name for the attached file
-} MAPISendDocumentsType;
-
-typedef struct {
-  LHANDLE     lhSession;
-  ULONG       ulUIParam;
-  FLAGS       flFlags;
-  DWORD       ipcWorked;      // Necessary for IPC check with Communicator
-  UCHAR       lpszSeedMessageID[MAX_MSGINFO_LEN];
-  UCHAR       lpszMessageID[MAX_MSGINFO_LEN];
-} MAPIFindNextType;
-
-typedef struct {
-  LHANDLE     lhSession;
-  ULONG       ulUIParam;
-  DWORD       ipcWorked;      // Necessary for IPC check with Communicator
-  UCHAR       lpszMessageID[MAX_MSGINFO_LEN];
-} MAPIDeleteMailType;
-
-typedef struct {
-  LHANDLE     lhSession;
-  ULONG       ulUIParam;
-  FLAGS       flFlags;
-  DWORD       ipcWorked;      // Necessary for IPC check with Communicator
-  UCHAR       lpszName[MAX_NAME_LEN];
-  // These are returned by Communicator
-  UCHAR       lpszABookID[MAX_NAME_LEN];         
-  UCHAR       lpszABookName[MAX_NAME_LEN];            
-  UCHAR       lpszABookAddress[MAX_NAME_LEN];         
-} MAPIResolveNameType;
-
-typedef struct {
-  LHANDLE     lhSession;
-  ULONG       ulUIParam;
-  FLAGS       flFlags;
-  DWORD       ipcWorked;      // Necessary for IPC check with Communicator
-  UCHAR       lpszABookID[MAX_NAME_LEN];
-} MAPIDetailsType;
-
-typedef struct {
-  LHANDLE     lhSession;
-  ULONG       ulUIParam;
-  FLAGS       flFlags;
-  DWORD       ipcWorked;      // Necessary for IPC check with Communicator
-  UCHAR       lpszMessageID[MAX_MSGINFO_LEN];
-  //
-  // The following is the "FLAT" representation of the (lpMapiMessage lpMessage) 
-  // argument of this structure 
-  //
-  FLAGS     MSG_flFlags;          // unread, return or receipt                  
-  ULONG     MSG_nRecipCount;      // Number of recipients                   
-  ULONG     MSG_nFileCount;       // # of file attachments                  
-  ULONG     MSG_ORIG_ulRecipClass; //  Recipient class - MAPI_TO, MAPI_CC, MAPI_BCC, MAPI_ORIG
-  //
-  // Output parameter for blob of information that will live on disk. 
-  //
-  UCHAR       lpszBlob[MAX_MSGINFO_LEN];    // file name on disk
-  //
-  // The format of this blob of information will be:
-  //
-  // String 0: LPSTR lpszSubject;            // Message Subject
-  // String 1: LPSTR lpszNoteText FILE NAME; // Message Text will be
-  //           stored into a temp file and this will be the pointer to that file.
-  // String 2: LPSTR lpszDateReceived;       // in YYYY/MM/DD HH:MM format
-  // String 3: LPSTR lpszConversationID;     // conversation thread ID
-  //
-  // The following are for the originator of the message. Only ONE of these.
-  //
-  // String 4: LPSTR lpszName;             // Originator name                           
-  // String 5: LPSTR lpszAddress;          // Originator address (optional)             
-  //
-  // The following strings are for the recipients for this message. There are
-  // MSG_nRecipCount of these in a row:
-  //
-  // for (i=0; i<MSG_nRecipCount; i++)
-  //      String x: LPSTR lpszName;             // Recipient N name                           
-  //      String x: LPSTR lpszAddress;          // Recipient N address (optional)             
-  //      String x: LPSTR lpszRecipClass        // recipient class - sprintf of ULONG
-  //
-  // Now, finally, add the attachments for this beast. There are MSG_nFileCount
-  // attachments so it would look like the following:
-  //
-  // for (i=0; i<MSG_nFileCount; i++)
-  //
-  //      String x: LPSTR lpszPathName // Fully qualified path of the attached file. 
-  //                                   // This path should include the disk drive letter and directory name.
-  //      String x: LPSTR lpszFileName // The display name for the attached file
-  //
-} MAPIReadMailType;
-
-typedef struct {
-  LHANDLE   lhSession;
-  ULONG     ulUIParam;
-  FLAGS     flFlags;
-  UCHAR     lpszCaption[MAX_MSGINFO_LEN];
-  DWORD     ipcWorked;      // Necessary for IPC check with Communicator
-  // The following is the "FLAT" representation of the (lpMapiRecipDesc lpRecips) 
-  // argument of this structure 
-  ULONG     nRecips;              // number of recips to start with...
-  ULONG     nNewRecips;           // number of recips returned...
-  UCHAR     lpszBlob[MAX_MSGINFO_LEN];    // file name for blob of information 
-                                          // that will live on disk. 
-  BYTE      dataBuf[1];           // For easy referencing
-  //
-  // The following contiguous chunk of memory is the buffer that holds 
-  // the recipients to load into the address picker...
-  //
-  // for (i=0; i<MSG_nRecipCount; i++)
-  //      String x: LPSTR lpszRecipClass (ULONG) // Recipient class - MAPI_TO, MAPI_CC, MAPI_BCC, MAPI_ORIG        
-  //      String x: LPSTR lpszName;     // Recipient N name                           
-  //      String x: LPSTR lpszAddress;  // Recipient N address (optional)             
-  //
-} MAPIAddressType;
-
-#endif    // _NSCPMAPI
--- a/mozilla/mailnews/mapi/old/tests/makefile.win
+++ b/mozilla/mailnews/mapi/old/tests/makefile.win
@@ -1,27 +0,0 @@
-#!nmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-DEPTH=..\..\..
-
-
-DIRS=mapitest
-
-include <$(DEPTH)\config\rules.mak>
--- a/mozilla/mailnews/mapi/old/tests/mapitest/main.cpp
+++ b/mozilla/mailnews/mapi/old/tests/mapitest/main.cpp
@@ -1,239 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is 
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-//
-#include <windows.h>
-#include <windowsx.h>
-#include <string.h>
-#include <stdlib.h>
-#ifndef MAPI_OLE	// Because MSFT doesn't do this for us :-(
-#include <mapi.h>
-#endif
-
-#include "port.h"
-#include "resource.h"
-
-#ifndef WM_PAINTICON
-#define WM_PAINTICON              0x26
-#endif // WM_PAINTICON
-
-/* 
- * Forward Declarations...
- */
-BOOL      InitInstance(HINSTANCE hInstance, int nCmdShow);
-BOOL CALLBACK LOADDS MyDlgProc(HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam);
-extern void ProcessCommand(HWND hWnd, int id, HWND hCtl, UINT codeNotify);
-BOOL      OpenMAPI(void);
-void      CloseMAPI(void);
-
-/*  
- * Global variables
- */
-HINSTANCE   hInst;
-HWND      hWnd;    
-
-#ifdef WIN16
-HICON	hIconApp;
-#endif
-
-char NEAR szAppName[] = "Netscape QA Helper";
-char NEAR szShortAppName[] = "QAHelper";
-char szClassName[] = "Netscape_QAHelper_Class_Name";
-
-void
-AppCleanup(void)
-{
-  extern void    DoMAPILogoff(HWND hWnd);
-  static BOOL isDone = FALSE;
-
-  if (isDone)
-    return;
-
-  extern LHANDLE    mapiSession;
-
-  if (mapiSession != 0)
-  {
-    DoMAPILogoff(hWnd);
-  }
-
-  CloseMAPI();
-  isDone = TRUE;
-}
-
-BOOL 
-InitInstance(HINSTANCE hInstance, int nCmdShow)
-{
-  /* Create a main window for this application instance.  */
-  hWnd = CreateDialog((HINSTANCE) hInstance, 
-            MAKEINTRESOURCE(ID_DIALOG),
-            (HWND) NULL, (DLGPROC) MyDlgProc);
-  
-  if (!hWnd)
-    return FALSE;
-  else
-    return TRUE;
-}
-
-BOOL InitApp(void)
-{
-#ifndef WIN16
-  WNDCLASS wc;
-  wc.style         = 0; 
-  wc.lpfnWndProc   = DefDlgProc; 
-  wc.cbClsExtra    = 0; 
-  wc.cbWndExtra    = DLGWINDOWEXTRA; 
-  wc.hInstance     = hInst; 
-  wc.hIcon         = LoadIcon(hInst, MAKEINTRESOURCE(ID_ICON_APP)); 
-  wc.hCursor       = LoadCursor(0, IDC_ARROW); 
-  wc.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1);
-  wc.lpszMenuName  = NULL; 
-  wc.lpszClassName = szClassName;
-  
-  if(!RegisterClass(&wc))
-    return FALSE;
-
-#else                
-  hIconApp = LoadIcon(hInst, MAKEINTRESOURCE(ID_ICON_APP));
-#endif
-  
-  return TRUE;
-} // end InitApp
-
-// Win Main 
-int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
-{
-  MSG     msg;
-  
-  hInst = hInstance;
-  
-  if (!InitApp()) 
-  { 
-    return FALSE;
-  }
-  
-  if (!InitInstance(hInstance, nCmdShow)) 
-  {    
-    return FALSE;
-  }
-
-  if (!OpenMAPI()) 
-  {    
-    return FALSE;
-  }
-
-  ShowWindow(hWnd, SW_SHOW);
-  
-  // Start the application
-  while ((GetMessage(&msg, (HWND) NULL, (UINT) NULL, (UINT) NULL)))
-  {
-    if(IsDialogMessage(hWnd, &msg))
-      continue;
-    
-    TranslateMessage(&msg);
-    DispatchMessage(&msg);
-  }
-
-  return(msg.wParam);
-}
-
-BOOL CALLBACK LOADDS 
-MyDlgProc(HWND hWndMain, UINT wMsg, WPARAM wParam, LPARAM lParam) 
-{
-  switch (wMsg) 
-  {
-  case WM_INITDIALOG: 
-    {
-      hWnd = hWndMain;
-	    SetDlgItemText(hWnd, ID_EDIT_ROW, "0");
-    }
-    break;
-    
-  case WM_CLOSE:
-    {
-      DestroyWindow(hWnd);
-      break;
-    }
-
-  case WM_DESTROY:
-    {
-      AppCleanup();
-
-#ifndef WIN16
-      UnregisterClass(szClassName, hInst);
-#else              
-      // Destroy the 16 bit windows icon
-      if(hIconApp != 0)
-        DestroyIcon(hIconApp);
-#endif
-      
-      PostQuitMessage(0);
-      break;
-    }
-  case WM_COMMAND:
-    HANDLE_WM_COMMAND(hWnd, wParam, lParam, ProcessCommand);
-    break;
-    
-  case WM_QUERYDRAGICON:     
-#ifdef WIN16
-    return (BOOL)hIconApp;
-#endif
-    
-  case WM_PAINTICON:
-#ifdef WIN16    
-    SetClassWord(hWnd, GCW_HICON, 0);
-    
-    // fall trough
-  case WM_PAINT: 
-    {
-      if(!IsIconic(hWnd))
-        return FALSE;
-      PAINTSTRUCT ps;
-      HDC hDC = BeginPaint(hWnd, &ps);
-      SetMapMode(hDC, MM_TEXT);
-      DrawIcon(hDC, 2, 2, hIconApp);
-      EndPaint(hWnd, &ps);
-      break;
-    } 
-#endif //WIN16
-    break;    // RICHIE - if this is not here NT 3.51 Pukes!!!!  
-
-  default:
-    return FALSE;
-  }
-  
-  //~~av  return (DefWindowProc(hWnd, wMsg, wParam, lParam));
-  return TRUE;
-}
--- a/mozilla/mailnews/mapi/old/tests/mapitest/makefile.win
+++ b/mozilla/mailnews/mapi/old/tests/mapitest/makefile.win
@@ -1,240 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on mapitest.dsp
-!IF "$(CFG)" == ""
-CFG=mapitest - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to mapitest - Win32 Debug.
-!ENDIF 
-
-!IF "$(CFG)" != "mapitest - Win32 Release" && "$(CFG)" != "mapitest - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "mapitest.mak" CFG="mapitest - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "mapitest - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "mapitest - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-!IF  "$(CFG)" == "mapitest - Win32 Release"
-
-OUTDIR=.\Release
-INTDIR=.\Release
-# Begin Custom Macros
-OutDir=.\Release
-# End Custom Macros
-
-ALL : "$(OUTDIR)\mapitest.exe"
-
-export :
-libs :
-install : 
-
-clobber_all : clobber
-
-clobber:
-	-@erase "$(INTDIR)\main.obj"
-	-@erase "$(INTDIR)\mapimail.obj"
-	-@erase "$(INTDIR)\mapiproc.obj"
-	-@erase "$(INTDIR)\mtest32.res"
-	-@erase "$(INTDIR)\readmail.obj"
-	-@erase "$(INTDIR)\vc60.idb"
-	-@erase "$(OUTDIR)\mapitest.exe"
-	-@erase "$(OUTDIR)\mapitest.pch"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /Fp"$(INTDIR)\mapitest.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\mtest32.res" /d "NDEBUG" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\mapitest.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /incremental:no /pdb:"$(OUTDIR)\mapitest.pdb" /machine:I386 /out:"$(OUTDIR)\mapitest.exe" 
-LINK32_OBJS= \
-	"$(INTDIR)\main.obj" \
-	"$(INTDIR)\mapimail.obj" \
-	"$(INTDIR)\mapiproc.obj" \
-	"$(INTDIR)\readmail.obj" \
-	"$(INTDIR)\mtest32.res"
-
-"$(OUTDIR)\mapitest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "mapitest - Win32 Debug"
-
-OUTDIR=.\Debug
-INTDIR=.\Debug
-# Begin Custom Macros
-OutDir=.\Debug
-# End Custom Macros
-
-ALL : "$(OUTDIR)\mapitest.exe"
-
-export :
-libs :
-install : 
-
-clobber_all : clobber
-
-clobber :
-	-@erase "$(INTDIR)\main.obj"
-	-@erase "$(INTDIR)\mapimail.obj"
-	-@erase "$(INTDIR)\mapiproc.obj"
-	-@erase "$(INTDIR)\mtest32.res"
-	-@erase "$(INTDIR)\readmail.obj"
-	-@erase "$(INTDIR)\vc60.idb"
-	-@erase "$(INTDIR)\vc60.pdb"
-	-@erase "$(OUTDIR)\mapitest.exe"
-	-@erase "$(OUTDIR)\mapitest.ilk"
-	-@erase "$(OUTDIR)\mapitest.pdb"
-	-@erase "$(OUTDIR)\mapitest.pch"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /Fp"$(INTDIR)\mapitest.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\mtest32.res" /d "_DEBUG" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\mapitest.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /incremental:yes /pdb:"$(OUTDIR)\mapitest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mapitest.exe" /pdbtype:sept 
-LINK32_OBJS= \
-	"$(INTDIR)\main.obj" \
-	"$(INTDIR)\mapimail.obj" \
-	"$(INTDIR)\mapiproc.obj" \
-	"$(INTDIR)\readmail.obj" \
-	"$(INTDIR)\mtest32.res"
-
-"$(OUTDIR)\mapitest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
-
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("mapitest.dep")
-!INCLUDE "mapitest.dep"
-!ELSE 
-!MESSAGE Warning: cannot find "mapitest.dep"
-!ENDIF 
-!ENDIF 
-
-
-!IF "$(CFG)" == "mapitest - Win32 Release" || "$(CFG)" == "mapitest - Win32 Debug"
-SOURCE=.\main.cpp
-
-"$(INTDIR)\main.obj" : $(SOURCE) "$(INTDIR)"
-
-
-SOURCE=.\mapimail.cpp
-
-"$(INTDIR)\mapimail.obj" : $(SOURCE) "$(INTDIR)"
-
-
-SOURCE=.\mapiproc.cpp
-
-"$(INTDIR)\mapiproc.obj" : $(SOURCE) "$(INTDIR)"
-
-
-SOURCE=.\mtest32.rc
-
-"$(INTDIR)\mtest32.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) $(RSC_PROJ) $(SOURCE)
-
-
-SOURCE=.\readmail.cpp
-
-"$(INTDIR)\readmail.obj" : $(SOURCE) "$(INTDIR)"
-
-
-
-!ENDIF 
-
--- a/mozilla/mailnews/mapi/old/tests/mapitest/mapimail.cpp
+++ b/mozilla/mailnews/mapi/old/tests/mapitest/mapimail.cpp
@@ -1,772 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is 
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-//
-#include <windows.h>
-#include <windowsx.h>   
-#include <string.h>
-#include <mapi.h>         
-#include <stdlib.h>
-
-#include "port.h"
-#include "resource.h"
-
-//
-// Variables...
-// 
-extern HINSTANCE   m_hInstMapi;
-extern LHANDLE     mapiSession;
-
-// 
-// Forward declarations...
-//
-void          DoMAPIFreeBuffer(HWND hWnd, LPVOID buf, BOOL alert);
-extern void   ShowMessage(HWND hWnd, LPSTR msg);
-void          DoMAPISendMail(HWND hWnd);
-void          DoMAPISendDocuments(HWND hWnd);
-void          DoMAPISaveMail(HWND hWnd);
-void          DoMAPIAddress(HWND hWnd);
-extern void   SetFooter(LPSTR msg);
-extern LPSTR  GetMAPIError(LONG errorCode);
-
-void 
-ProcessMailCommand(HWND hWnd, int id, HWND hCtl, UINT codeNotify) 
-{ 
-  switch (id) 
-  {
-  case IDCANCEL:
-    EndDialog(hWnd, 0);
-    break;
-
-  case ID_BUTTON_MAPISENDMAIL:
-    DoMAPISendMail(hWnd);
-    break;
-
-  case ID_BUTTON_MAPISENDDOCUMENTS:
-    DoMAPISendDocuments(hWnd);
-    break;
-
-  case ID_BUTTON_MAPISAVEMAIL:
-    DoMAPISaveMail(hWnd);
-    break;
-
-  case ID_BUTTON_MAPIADDRESS:
-    DoMAPIAddress(hWnd);
-    break;
-
-  default:
-    break;
-  }
-}
-
-BOOL CALLBACK LOADDS 
-MailDlgProc(HWND hWndMain, UINT wMsg, WPARAM wParam, LPARAM lParam) 
-{
-  switch (wMsg) 
-  {
-  case WM_INITDIALOG: 
-    break;
-
-  case WM_COMMAND:
-    HANDLE_WM_COMMAND(hWndMain, wParam, lParam, ProcessMailCommand);
-    break;
-
-  default:
-    return FALSE;
-  }
-  
-  return TRUE;
-}
-
-static LPSTR lpszDelimChar = ";";
-
-void
-TackItOn(LPSTR fileBuf, LPSTR nameBuf, LPSTR addOn)
-{
-  if (addOn[0] != '\0')
-  {
-    lstrcat(fileBuf, addOn);
-    lstrcat(fileBuf, lpszDelimChar);
-
-    lstrcat(nameBuf, "NAMEOF.FILE");
-    lstrcat(nameBuf, lpszDelimChar);
-  }
-}
-
-void
-DoMAPISendDocuments(HWND hWnd)
-{
-  ULONG (FAR PASCAL *lpfnMAPISendDocuments) (ULONG ulUIParam, 
-          LPTSTR lpszDelimChar, LPTSTR lpszFullPaths, 
-          LPTSTR lpszFileNames, ULONG ulReserved);
-
-#ifdef WIN16		
-  (FARPROC&) lpfnMAPISendDocuments = GetProcAddress(m_hInstMapi, "MAPISENDDOCUMENTS"); 
-#else
-  (FARPROC&) lpfnMAPISendDocuments = GetProcAddress(m_hInstMapi, "MAPISendDocuments"); 
-#endif
-  
-  if (!lpfnMAPISendDocuments)
-  {
-    ShowMessage(hWnd, "Unable to locate MAPI function.");
-    return;
-  }
-
-  char  msg[1024];
-  char  tempFileName[_MAX_PATH] = "";
-  char  lpszFullPaths[(_MAX_PATH + 1) * 4] = "";
-  char  lpszFileNames[(_MAX_PATH + 1) * 4] = "";
-
-  // Now get the names of the files to attach...
-  GetDlgItemText(hWnd, ID_EDIT_ATTACH1, tempFileName, sizeof(tempFileName));
-  TackItOn(lpszFullPaths, lpszFileNames, tempFileName); 
-
-  GetDlgItemText(hWnd, ID_EDIT_ATTACH2, tempFileName, sizeof(tempFileName));
-  TackItOn(lpszFullPaths, lpszFileNames, tempFileName); 
-
-  GetDlgItemText(hWnd, ID_EDIT_ATTACH3, tempFileName, sizeof(tempFileName));
-  TackItOn(lpszFullPaths, lpszFileNames, tempFileName); 
-
-  GetDlgItemText(hWnd, ID_EDIT_ATTACH4, tempFileName, sizeof(tempFileName));
-  TackItOn(lpszFullPaths, lpszFileNames, tempFileName); 
-
-  LONG  rc = (*lpfnMAPISendDocuments)
-        ( (ULONG) hWnd,        
-          lpszDelimChar, 
-          lpszFullPaths, 
-          lpszFileNames, 
-          0);
-
-  if (rc == SUCCESS_SUCCESS)
-  {
-    ShowMessage(hWnd, "Success with MAPISendDocuments");
-    SetFooter("MAPISendDocuments success");
-  }
-  else
-  {
-    wsprintf(msg, "FAILURE: Return code %d from MAPISendDocuments\nError=[%s]", 
-                      rc, GetMAPIError(rc));
-    ShowMessage(hWnd, msg);
-    SetFooter("MAPISendDocuments failed");
-  }
-}
-
-void
-FreeMAPIFile(lpMapiFileDesc pv)
-{
-  if (!pv)
-    return;
-
-  if (pv->lpszPathName != NULL)   
-    free(pv->lpszPathName);
-
-  if (pv->lpszFileName != NULL)   
-    free(pv->lpszFileName);
-}
-
-void
-FreeMAPIRecipient(lpMapiRecipDesc pv)
-{
-  if (!pv)
-    return;
-
-  if (pv->lpszName != NULL)   
-    free(pv->lpszName);
-
-  if (pv->lpszAddress != NULL)
-    free(pv->lpszAddress);
-
-  if (pv->lpEntryID != NULL)
-    free(pv->lpEntryID);  
-}
-
-void
-FreeMAPIMessage(lpMapiMessage pv)
-{
-  ULONG i;
-
-  if (!pv)
-    return;
-
-  if (pv->lpszSubject != NULL)
-    free(pv->lpszSubject);
-
-  if (pv->lpszNoteText)
-      free(pv->lpszNoteText);
-  
-  if (pv->lpszMessageType)
-    free(pv->lpszMessageType);
-  
-  if (pv->lpszDateReceived)
-    free(pv->lpszDateReceived);
-  
-  if (pv->lpszConversationID)
-    free(pv->lpszConversationID);
-  
-  if (pv->lpOriginator)
-    FreeMAPIRecipient(pv->lpOriginator);
-  
-  for (i=0; i<pv->nRecipCount; i++)
-  {
-    if (&(pv->lpRecips[i]) != NULL)
-    {
-      FreeMAPIRecipient(&(pv->lpRecips[i]));
-    }
-  }
-
-  if (pv->lpRecips != NULL)
-  {
-    free(pv->lpRecips);
-  }
-
-  for (i=0; i<pv->nFileCount; i++)
-  {
-    if (&(pv->lpFiles[i]) != NULL)
-    {
-      FreeMAPIFile(&(pv->lpFiles[i]));
-    }
-  }
-
-  if (pv->lpFiles != NULL)
-  {
-    free(pv->lpFiles);
-  }
-  
-  free(pv);
-  pv = NULL;
-}
-
-void
-DoMAPISendMail(HWND hWnd)
-{
-  ULONG (FAR PASCAL *lpfnMAPISendMail) (LHANDLE lhSession, ULONG ulUIParam, 
-                  lpMapiMessage lpMessage, FLAGS flFlags, ULONG ulReserved);
-
-#ifdef WIN16		
-  (FARPROC&) lpfnMAPISendMail = GetProcAddress(m_hInstMapi, "MAPISENDMAIL"); 
-#else
-  (FARPROC&) lpfnMAPISendMail = GetProcAddress(m_hInstMapi, "MAPISendMail"); 
-#endif
-  
-  if (!lpfnMAPISendMail)
-  {
-    ShowMessage(hWnd, "Unable to locate MAPI function.");
-    return;
-  }          
-
-  FLAGS   flFlags = 0;
-  char    msg[512];
-  char    file1[_MAX_PATH] = "";
-  char    file2[_MAX_PATH] = "";
-  char    file3[_MAX_PATH] = "";
-  char    file4[_MAX_PATH] = "";
-  char    toAddr[128];
-  char    ccAddr[128];
-  char    bccAddr[128];
-  char    subject[128];
-  char    noteText[4096];
-  char    dateReceived[128] = "N/A";
-  char    threadID[128] = "N/A";;
-  char    origName[128] = "N/A";;
-  char    origAddress[128] = "N/A";;
-
-  GetDlgItemText(hWnd, ID_EDIT_TOADDRESS, toAddr, sizeof(toAddr));
-  GetDlgItemText(hWnd, ID_EDIT_CCADDRESS, ccAddr, sizeof(ccAddr));
-  GetDlgItemText(hWnd, ID_EDIT_BCCADDRESS, bccAddr, sizeof(bccAddr));
-  GetDlgItemText(hWnd, ID_EDIT_SUBJECT, subject, sizeof(subject));
-  GetDlgItemText(hWnd, ID_EDIT_NOTETEXT, noteText, sizeof(noteText));
-
-  // Do the one flag we support for this call...
-  if (BST_CHECKED == Button_GetCheck(GetDlgItem(hWnd, ID_CHECK_SHOWDIALOG)))
-  {
-    flFlags |= MAPI_DIALOG;
-  }
-
-  // Build the message to send off...
-  lpMapiMessage  msgPtr = (MapiMessage *)malloc(sizeof(MapiMessage));
-  if (msgPtr == NULL)
-  {
-    return;
-  }
-  
-  memset(msgPtr, 0, sizeof(MapiMessage)); 
-
-  //
-  // At this point, we need to populate the structure of information
-  // we are passing in via the *lppMessage
-  //
-
-  // Set all of the general information first!
-  msgPtr->lpszSubject = strdup(subject);
-  msgPtr->lpszNoteText = strdup(noteText);
-  msgPtr->lpszDateReceived = strdup(dateReceived);
-  msgPtr->lpszConversationID = strdup(threadID);
-  msgPtr->flFlags = flFlags;
-
-  // Now deal with the recipients of this message
-  DWORD       realRecips = 0;
-  if (toAddr[0] != '\0')    ++realRecips;
-  if (ccAddr[0] != '\0')    ++realRecips;
-  if (bccAddr[0] != '\0')   ++realRecips;
-
-  msgPtr->lpRecips = (lpMapiRecipDesc) malloc((size_t) (sizeof(MapiRecipDesc) * realRecips));
-  if (!msgPtr->lpRecips)
-  {
-    FreeMAPIMessage(msgPtr);
-    return;
-  }
-
-  msgPtr->nRecipCount = realRecips;
-  memset(msgPtr->lpRecips, 0, (size_t) (sizeof(MapiRecipDesc) * msgPtr->nRecipCount));
-
-  DWORD       rCount = 0;
-  if (toAddr[0] != '\0')
-  {
-    msgPtr->lpRecips[rCount].lpszName = strdup(toAddr);
-    msgPtr->lpRecips[rCount].lpszAddress = strdup(toAddr);
-    msgPtr->lpRecips[rCount].ulRecipClass = MAPI_TO;
-    rCount++;
-  }
-
-  if (ccAddr[0] != '\0')
-  {
-    msgPtr->lpRecips[rCount].lpszName = strdup(ccAddr);
-    msgPtr->lpRecips[rCount].lpszAddress = strdup(ccAddr);
-    msgPtr->lpRecips[rCount].ulRecipClass = MAPI_CC;    
-    rCount++;
-  }
-
-  if (bccAddr[0] != '\0')
-  {
-    msgPtr->lpRecips[rCount].lpszName = strdup(bccAddr);
-    msgPtr->lpRecips[rCount].lpszAddress = strdup(bccAddr);
-    msgPtr->lpRecips[rCount].ulRecipClass = MAPI_BCC;
-    rCount++;
-  }
-
-  // Now get the names of the files to attach...
-  GetDlgItemText(hWnd, ID_EDIT_ATTACH1, file1, sizeof(file1));
-  GetDlgItemText(hWnd, ID_EDIT_ATTACH2, file2, sizeof(file2));
-  GetDlgItemText(hWnd, ID_EDIT_ATTACH3, file3, sizeof(file3));
-  GetDlgItemText(hWnd, ID_EDIT_ATTACH4, file4, sizeof(file4));
-
-  DWORD       realFiles = 0;
-  if (file1[0] != '\0')    ++realFiles;
-  if (file2[0] != '\0')    ++realFiles;
-  if (file3[0] != '\0')    ++realFiles;
-  if (file4[0] != '\0')    ++realFiles;
-
-  // Now deal with the list of attachments! Since the nFileCount should be set
-  // correctly, this loop will automagically be correct
-  //
-  msgPtr->nFileCount = realFiles;
-  if (realFiles > 0)
-  {
-    msgPtr->lpFiles = (lpMapiFileDesc) malloc((size_t) (sizeof(MapiFileDesc) * realFiles));
-    if (!msgPtr->lpFiles)
-    {
-      FreeMAPIMessage(msgPtr);
-      return;
-    }
-
-    memset(msgPtr->lpFiles, 0, (size_t) (sizeof(MapiFileDesc) * msgPtr->nFileCount));
-  }
-
-  rCount = 0;
-  if (file1[0] != '\0')
-  {
-    msgPtr->lpFiles[rCount].lpszPathName = strdup((LPSTR)file1);
-    msgPtr->lpFiles[rCount].lpszFileName = strdup((LPSTR)file1);
-    ++rCount;
-  }
-
-  if (file2[0] != '\0')
-  {
-    msgPtr->lpFiles[rCount].lpszPathName = strdup((LPSTR)file2);
-    msgPtr->lpFiles[rCount].lpszFileName = strdup((LPSTR)file2);
-    ++rCount;
-  }
-
-  if (file3[0] != '\0')
-  {
-    msgPtr->lpFiles[rCount].lpszPathName = strdup((LPSTR)file3);
-    msgPtr->lpFiles[rCount].lpszFileName = strdup((LPSTR)file3);
-    ++rCount;
-  }
-
-  if (file4[0] != '\0')
-  {
-    msgPtr->lpFiles[rCount].lpszPathName = strdup((LPSTR)file4);
-    msgPtr->lpFiles[rCount].lpszFileName = strdup((LPSTR)file4);
-    ++rCount;
-  }
-
-  // Finally, make the call...
-  LONG  rc = (*lpfnMAPISendMail)
-           (mapiSession, 
-           (ULONG) hWnd, 
-           msgPtr, 
-           flFlags, 
-           0);
-
-  if (rc == SUCCESS_SUCCESS)
-  {
-    ShowMessage(hWnd, "Success with MAPISendMail");
-    SetFooter("MAPISendMail success");
-  }
-  else
-  {
-    wsprintf(msg, "FAILURE: Return code %d from MAPISendMail\nError=[%s]", 
-                      rc, GetMAPIError(rc));
-    ShowMessage(hWnd, msg);
-    SetFooter("MAPISendMail failed");
-  }
-
-  // Now cleanup and move on...
-  FreeMAPIMessage(msgPtr);
-}
-
-void
-DoMAPISaveMail(HWND hWnd)
-{
-  ULONG (FAR PASCAL *lpfnMAPISaveMail) (LHANDLE lhSession, ULONG ulUIParam, 
-                  lpMapiMessage lpMessage, FLAGS flFlags, ULONG ulReserved,
-                  LPTSTR lpszMessageID);
-
-#ifdef WIN16		
-  (FARPROC&) lpfnMAPISaveMail = GetProcAddress(m_hInstMapi, "MAPISAVEMAIL"); 
-#else
-  (FARPROC&) lpfnMAPISaveMail = GetProcAddress(m_hInstMapi, "MAPISaveMail"); 
-#endif
-  
-  if (!lpfnMAPISaveMail)
-  {
-    ShowMessage(hWnd, "Unable to locate MAPI function.");
-    return;
-  }          
-
-  FLAGS   flFlags = 0;
-  char    msg[512];
-  char    file1[_MAX_PATH] = "";
-  char    file2[_MAX_PATH] = "";
-  char    file3[_MAX_PATH] = "";
-  char    file4[_MAX_PATH] = "";
-  char    toAddr[128];
-  char    ccAddr[128];
-  char    bccAddr[128];
-  char    subject[128];
-  char    noteText[4096];
-  char    dateReceived[128] = "N/A";
-  char    threadID[128] = "N/A";;
-  char    origName[128] = "N/A";;
-  char    origAddress[128] = "N/A";;
-
-  GetDlgItemText(hWnd, ID_EDIT_TOADDRESS, toAddr, sizeof(toAddr));
-  GetDlgItemText(hWnd, ID_EDIT_CCADDRESS, ccAddr, sizeof(ccAddr));
-  GetDlgItemText(hWnd, ID_EDIT_BCCADDRESS, bccAddr, sizeof(bccAddr));
-  GetDlgItemText(hWnd, ID_EDIT_SUBJECT, subject, sizeof(subject));
-  GetDlgItemText(hWnd, ID_EDIT_NOTETEXT, noteText, sizeof(noteText));
-
-  // Build the message to send off...
-  lpMapiMessage  msgPtr = (MapiMessage *)malloc(sizeof(MapiMessage));
-  if (msgPtr == NULL)
-  {
-    return;
-  }
-  
-  memset(msgPtr, 0, sizeof(MapiMessage)); 
-
-  //
-  // At this point, we need to populate the structure of information
-  // we are passing in via the *lppMessage
-  //
-
-  // Set all of the general information first!
-  msgPtr->lpszSubject = strdup(subject);
-  msgPtr->lpszNoteText = strdup(noteText);
-  msgPtr->lpszDateReceived = strdup(dateReceived);
-  msgPtr->lpszConversationID = strdup(threadID);
-  msgPtr->flFlags = flFlags;
-
-  // Now deal with the recipients of this message
-  DWORD       realRecips = 0;
-  if (toAddr[0] != '\0')    ++realRecips;
-  if (ccAddr[0] != '\0')    ++realRecips;
-  if (bccAddr[0] != '\0')   ++realRecips;
-
-  msgPtr->lpRecips = (lpMapiRecipDesc) malloc((size_t) (sizeof(MapiRecipDesc) * realRecips));
-  if (!msgPtr->lpRecips)
-  {
-    FreeMAPIMessage(msgPtr);
-    return;
-  }
-
-  msgPtr->nRecipCount = realRecips;
-  memset(msgPtr->lpRecips, 0, (size_t) (sizeof(MapiRecipDesc) * msgPtr->nRecipCount));
-
-  DWORD       rCount = 0;
-  if (toAddr[0] != '\0')
-  {
-    msgPtr->lpRecips[rCount].lpszName = strdup(toAddr);
-    msgPtr->lpRecips[rCount].lpszAddress = strdup(toAddr);
-    msgPtr->lpRecips[rCount].ulRecipClass = MAPI_TO;
-    rCount++;
-  }
-
-  if (ccAddr[0] != '\0')
-  {
-    msgPtr->lpRecips[rCount].lpszName = strdup(ccAddr);
-    msgPtr->lpRecips[rCount].lpszAddress = strdup(ccAddr);
-    msgPtr->lpRecips[rCount].ulRecipClass = MAPI_CC;    
-    rCount++;
-  }
-
-  if (bccAddr[0] != '\0')
-  {
-    msgPtr->lpRecips[rCount].lpszName = strdup(bccAddr);
-    msgPtr->lpRecips[rCount].lpszAddress = strdup(bccAddr);
-    msgPtr->lpRecips[rCount].ulRecipClass = MAPI_BCC;
-    rCount++;
-  }
-
-  // Now get the names of the files to attach...
-  GetDlgItemText(hWnd, ID_EDIT_ATTACH1, file1, sizeof(file1));
-  GetDlgItemText(hWnd, ID_EDIT_ATTACH2, file2, sizeof(file2));
-  GetDlgItemText(hWnd, ID_EDIT_ATTACH3, file3, sizeof(file3));
-  GetDlgItemText(hWnd, ID_EDIT_ATTACH4, file4, sizeof(file4));
-
-  DWORD       realFiles = 0;
-  if (file1[0] != '\0')    ++realFiles;
-  if (file2[0] != '\0')    ++realFiles;
-  if (file3[0] != '\0')    ++realFiles;
-  if (file4[0] != '\0')    ++realFiles;
-
-  // Now deal with the list of attachments! Since the nFileCount should be set
-  // correctly, this loop will automagically be correct
-  //
-  msgPtr->nFileCount = realFiles;
-  if (realFiles > 0)
-  {
-    msgPtr->lpFiles = (lpMapiFileDesc) malloc((size_t) (sizeof(MapiFileDesc) * realFiles));
-    if (!msgPtr->lpFiles)
-    {
-      FreeMAPIMessage(msgPtr);
-      return;
-    }
-
-    memset(msgPtr->lpFiles, 0, (size_t) (sizeof(MapiFileDesc) * msgPtr->nFileCount));
-  }
-
-  rCount = 0;
-  if (file1[0] != '\0')
-  {
-    msgPtr->lpFiles[rCount].lpszPathName = strdup((LPSTR)file1);
-    msgPtr->lpFiles[rCount].lpszFileName = strdup((LPSTR)file1);
-    ++rCount;
-  }
-
-  if (file2[0] != '\0')
-  {
-    msgPtr->lpFiles[rCount].lpszPathName = strdup((LPSTR)file2);
-    msgPtr->lpFiles[rCount].lpszFileName = strdup((LPSTR)file2);
-    ++rCount;
-  }
-
-  if (file3[0] != '\0')
-  {
-    msgPtr->lpFiles[rCount].lpszPathName = strdup((LPSTR)file3);
-    msgPtr->lpFiles[rCount].lpszFileName = strdup((LPSTR)file3);
-    ++rCount;
-  }
-
-  if (file4[0] != '\0')
-  {
-    msgPtr->lpFiles[rCount].lpszPathName = strdup((LPSTR)file4);
-    msgPtr->lpFiles[rCount].lpszFileName = strdup((LPSTR)file4);
-    ++rCount;
-  }
-
-  // Finally, make the call...
-  LONG  rc = (*lpfnMAPISaveMail)
-           (mapiSession, 
-           (ULONG) hWnd, 
-           msgPtr, 
-           flFlags, 
-           0, NULL);
-
-  if (rc == SUCCESS_SUCCESS)
-  {
-    ShowMessage(hWnd, "Success with MAPISaveMail");
-    SetFooter("MAPISaveMail success");
-  }
-  else
-  {
-    wsprintf(msg, "FAILURE: Return code %d from MAPISaveMail\nError=[%s]", 
-                      rc, GetMAPIError(rc));
-    ShowMessage(hWnd, msg);
-    SetFooter("MAPISaveMail failed");
-  }
-
-  // Now cleanup and move on...
-  FreeMAPIMessage(msgPtr);
-}
-
-void          
-DoMAPIAddress(HWND hWnd)
-{
-  ULONG (FAR PASCAL *lpfnMAPIAddress) 
-                            (LHANDLE lhSession,
-                            ULONG ulUIParam,
-                            LPSTR lpszCaption,
-                            ULONG nEditFields,
-                            LPSTR lpszLabels,
-                            ULONG nRecips,
-                            lpMapiRecipDesc lpRecips,
-                            FLAGS flFlags,
-                            ULONG ulReserved,
-                            LPULONG lpnNewRecips,
-                            lpMapiRecipDesc FAR *lppNewRecips);
-
-
-#ifdef WIN16		
-  (FARPROC&) lpfnMAPIAddress = GetProcAddress(m_hInstMapi, "MAPIADDRESS"); 
-#else
-  (FARPROC&) lpfnMAPIAddress = GetProcAddress(m_hInstMapi, "MAPIAddress"); 
-#endif
-  
-  if (!lpfnMAPIAddress)
-  {
-    ShowMessage(hWnd, "Unable to locate MAPI function.");
-    return;
-  }          
-
-  DWORD   i;
-  FLAGS   flFlags = 0;
-  DWORD   addrCount = 0;
-  char    msg[512];
-  char    toAddr[128];
-  char    ccAddr[128];
-  char    bccAddr[128];
-
-  GetDlgItemText(hWnd, ID_EDIT_TOADDRESS, toAddr, sizeof(toAddr));
-  GetDlgItemText(hWnd, ID_EDIT_CCADDRESS, ccAddr, sizeof(ccAddr));
-  GetDlgItemText(hWnd, ID_EDIT_BCCADDRESS, bccAddr, sizeof(bccAddr));
-
-  if (toAddr[0]) ++addrCount;
-  if (ccAddr[0]) ++addrCount;
-  if (bccAddr[0]) ++addrCount;
-
-  lpMapiRecipDesc lpRecips = (lpMapiRecipDesc) malloc((size_t) (sizeof(MapiRecipDesc) * addrCount));
-  if (!lpRecips)
-  {
-    return;
-  }
-
-  memset(lpRecips, 0, (size_t) (sizeof(MapiRecipDesc) * addrCount));
-
-  DWORD       rCount = 0;
-  if (toAddr[0] != '\0')
-  {
-    lpRecips[rCount].lpszName = strdup("To Address Name");
-    lpRecips[rCount].lpszAddress = strdup(toAddr);
-    lpRecips[rCount].ulRecipClass = MAPI_TO;
-    rCount++;
-  }
-
-  if (ccAddr[0] != '\0')
-  {
-    lpRecips[rCount].lpszName = strdup("CC Address Name");
-    lpRecips[rCount].lpszAddress = strdup(ccAddr);
-    lpRecips[rCount].ulRecipClass = MAPI_CC;    
-    rCount++;
-  }
-
-  if (bccAddr[0] != '\0')
-  {
-    lpRecips[rCount].lpszName = strdup("BCC Address Name");
-    lpRecips[rCount].lpszAddress = strdup(bccAddr);
-    lpRecips[rCount].ulRecipClass = MAPI_BCC;
-    rCount++;
-  }
-  
-  ULONG             newRecips;
-  lpMapiRecipDesc   lpNewRecips;
-
-  // Finally, make the call...
-  LONG  rc = (*lpfnMAPIAddress)
-                     (mapiSession,
-                      0,
-                      "MAPI Test Address Picker",
-                      0,
-                      NULL,
-                      rCount,
-                      lpRecips,
-                      0,
-                      0,
-                      &newRecips,
-                      &lpNewRecips);
-  if (rc == SUCCESS_SUCCESS)
-  {
-    for (i=0; i<newRecips; i++)
-    {
-      char  tMsg[512];
-
-      wsprintf(tMsg, "User %d\nName=[%s]\nEmail=[%s]\nType=[%d]", 
-            i, 
-            lpNewRecips[i].lpszName, 
-            lpNewRecips[i].lpszAddress, 
-            lpNewRecips[i].ulRecipClass);
-      ShowMessage(hWnd, tMsg);
-    }
-
-    SetFooter("MAPIAddress success");
-
-    DoMAPIFreeBuffer(hWnd, lpNewRecips, TRUE);
-  }
-  else
-  {
-    wsprintf(msg, "FAILURE: Return code %d from MAPIAddress\nError=[%s]", 
-                      rc, GetMAPIError(rc));
-    ShowMessage(hWnd, msg);
-    SetFooter("MAPIAddress failed");
-  }
-
-  // Now cleanup and move on...
-  for (i=0; i<rCount; i++)
-  {
-    FreeMAPIRecipient(&(lpRecips[i]));
-  }
-}
--- a/mozilla/mailnews/mapi/old/tests/mapitest/mapiproc.cpp
+++ b/mozilla/mailnews/mapi/old/tests/mapitest/mapiproc.cpp
@@ -1,832 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is 
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-//
-#include <windows.h>
-#include <windowsx.h>      
-#include <string.h>
-
-#ifndef MAPI_OLE	// Because MSFT doesn't do this for us :-(
-#include <mapi.h>
-#endif
-
-#include "port.h"
-#include "resource.h"
-
-//
-// Variables...
-// 
-extern HINSTANCE  hInst;
-HINSTANCE         m_hInstMapi;
-LHANDLE           mapiSession = 0;
-
-// 
-// Forward declarations...
-//
-void    LoadNSCPVersionFunc(HWND hWnd);
-void    DoMAPILogon(HWND hWnd);
-void    DoMAPILogoff(HWND hWnd);
-void    DoMAPIFreeBuffer(HWND hWnd, LPVOID buf, BOOL alert);
-void    DoMAPISendMail(HWND hWnd);
-void    DoMAPISendDocuments(HWND hWnd);
-void    DoMAPIFindNext(HWND hWnd);
-void    DoMAPIReadMail(HWND hWnd);
-void    DoMAPIDeleteMail(HWND hWnd);
-void    DoMAPIDetails(HWND hWnd);
-void    DoMAPIResolveName(HWND hWnd);
-void    DoMAPIResolveNameFreeBuffer(HWND hWnd);
-void    SetFooter(LPSTR msg);
-void    DoMAPI_NSCP_Sync(HWND hWnd);
-LPSTR   GetMAPIError(LONG errorCode);
-extern void DisplayMAPIReadMail(HWND hWnd, lpMapiMessage msgPtr);
-lpMapiMessage   GetMessage(HWND hWnd, LPSTR id);
-
-void
-SetFooter(LPSTR msg)
-{
-  extern HWND   hWnd;
-
-  SetDlgItemText(hWnd, ID_STATIC_RESULT, msg);
-}
-
-char FAR *
-GetMAPIError(LONG errorCode)
-{
-  static char FAR msg[128];
-
-  switch (errorCode) {                            
-  case MAPI_E_FAILURE:
-    lstrcpy(msg, "General MAPI Failure");
-    break;
-
-  case MAPI_E_INSUFFICIENT_MEMORY:
-    strcpy(msg, "Insufficient Memory");
-    break;
-
-  case MAPI_E_LOGIN_FAILURE:
-    strcpy(msg, "Login Failure");
-    break;
-
-  case MAPI_E_TOO_MANY_SESSIONS:
-    strcpy(msg, "Too many MAPI sessions");
-    break;
-
-  case MAPI_E_INVALID_SESSION:
-    strcpy(msg, "Invalid Session!");
-    break;
-
-  case MAPI_E_INVALID_MESSAGE:
-    strcpy(msg, "Message identifier was bad!");
-    break;
-
-  case MAPI_E_NO_MESSAGES:
-    strcpy(msg, "No messages were found!");
-    break;
-
-  case MAPI_E_ATTACHMENT_WRITE_FAILURE:
-    strcpy(msg, "Attachment write failure!");
-    break;
-
-  case MAPI_E_DISK_FULL:
-    strcpy(msg, "Attachment write failure! DISK FULL");
-    break;
-
-  case MAPI_E_AMBIGUOUS_RECIPIENT:
-    strcpy(msg, "Recipient requested is not a unique address list entry.");
-    break;
-
-  case MAPI_E_UNKNOWN_RECIPIENT:
-    strcpy(msg, "Recipient requested does not exist.");
-    break;
-
-  case MAPI_E_NOT_SUPPORTED:
-    strcpy(msg, "Not supported by messaging system");
-    break;
-
-  case SUCCESS_SUCCESS:
-    strcpy(msg, "Success on MAPI operation");
-    break;
-
-  case MAPI_E_INVALID_RECIPS:
-    strcpy(msg, "Recipient specified in the lpRecip parameter was\nunknown. No dialog box was displayed.");
-    break;
-
-  case MAPI_E_ATTACHMENT_OPEN_FAILURE:
-    strcpy(msg, "One or more files could not be located. No message was sent.");    
-    break;
-
-  case MAPI_E_ATTACHMENT_NOT_FOUND:
-    strcpy(msg, "The specified attachment was not found. No message was sent.");
-    break;
-
-  case MAPI_E_BAD_RECIPTYPE:
-    strcpy(msg, "The type of a recipient was not MAPI_TO, MAPI_CC, or MAPI_BCC. No message was sent.");
-    break;
-
-  default:
-    strcpy(msg, "Unknown MAPI Return Code");
-    break;
-  }
-
-  return((LPSTR) &(msg[0]));
-}
-
-void
-ShowMessage(HWND hWnd, LPSTR msg)
-{
-  MessageBox(hWnd, msg, "Info Message", MB_ICONINFORMATION);
-}
-
-BOOL
-OpenMAPI(void)
-{
-#ifdef WIN16
-	m_hInstMapi = LoadLibrary("Y:\\ns\\cmd\\winfe\\mapi\\MAPI.DLL");	
-#else
-  m_hInstMapi = LoadLibrary(".\\COMPONENTS\\MAPI32.DLL");
-#endif
-
-  if (!m_hInstMapi)
-  {
-    ShowMessage(NULL, "Error Loading the MAPI DLL...Probably not found!");
-    return(FALSE);
-  }
-
-  return(TRUE);
-}
-
-void
-CloseMAPI(void)
-{
-  if(m_hInstMapi)
-  {
-    FreeLibrary(m_hInstMapi);
-  }
-}
-
-void 
-ProcessCommand(HWND hWnd, int id, HWND hCtl, UINT codeNotify) 
-{ 
-  switch (id) 
-  {
-  case ID_BUTTON_SYNC:
-    DoMAPI_NSCP_Sync(hWnd);
-    break;
-
-  case ID_BUTTON_NSCPVERSION:
-    LoadNSCPVersionFunc(hWnd);
-    break;
-
-  case ID_BUTTON_LOGON:
-    DoMAPILogon(hWnd);
-    break;
-
-  case ID_BUTTON_LOGOFF:
-    DoMAPILogoff(hWnd);
-    break;
-
-  case ID_BUTTON_FINDNEXT:
-  case ID_MENU_MAPIFINDNEXT:
-    DoMAPIFindNext(hWnd);
-    break;
-
-  case ID_BUTTON_READMAIL:
-  case ID_MENU_MAPIREADMAIL:
-    DoMAPIReadMail(hWnd);
-    break;
-
-  case ID_BUTTON_MAIL:
-    {
-    extern CALLBACK LOADDS 
-           MailDlgProc(HWND hWndMain, UINT wMsg, WPARAM wParam, LPARAM lParam);
-
-    DialogBox(hInst, MAKEINTRESOURCE(ID_DIALOG_MAIL), hWnd, 
-      (DLGPROC)MailDlgProc);
-    }
-    break;
-
-  case ID_BUTTON_DELETEMAIL:
-  case ID_MENU_MAPIDELETEMAIL:
-    DoMAPIDeleteMail(hWnd);
-    break;
-
-  case ID_MENU_MYEXIT:
-	  DestroyWindow(hWnd);
-	  break;
-
-  case ID_BUTTON_CLEAR:
-  case ID_MENU_CLEARRESULTS:
-    ListBox_ResetContent(GetDlgItem(hWnd, ID_LIST_RESULT));      
-	  break;
-
-  case ID_BUTTON_FREEBUFFER:
-    DoMAPIResolveNameFreeBuffer(hWnd);
-    break;
-
-  case ID_BUTTON_RESOLVENAME:
-    DoMAPIResolveName(hWnd);
-    break;
-
-  case ID_BUTTON_DETAILS:
-    DoMAPIDetails(hWnd);
-    break;
-
-  case ID_MENU_MYABOUT:
-	  MessageBox(hWnd,	
-			  "Netscape MAPI Test Harness\nWritten by: Rich Pizzarro (rhp@netscape.com)",	
-			  "About",
-			  MB_ICONINFORMATION);
-	  break;
-  
-  default:
-    break;
-  }
-}
-
-void
-DoMAPILogon(HWND hWnd)
-{
-  char  msg[1024];
-  char  user[128] = "";
-  char  pw[128] = "";
-
-  // Get Address of MAPI function...
-  ULONG (FAR PASCAL *lpfnMAPILogon)(ULONG, LPSTR, LPSTR, FLAGS, ULONG, LPLHANDLE);   
-  
-#ifdef WIN16		
-  (FARPROC&) lpfnMAPILogon = GetProcAddress(m_hInstMapi, "MAPILOGON"); 
-#else
-  (FARPROC&) lpfnMAPILogon = GetProcAddress(m_hInstMapi, "MAPILogon"); 
-#endif
-  
-  if (!lpfnMAPILogon)
-  {
-    ShowMessage(hWnd, "Unable to locate MAPI function.");
-    return;
-  }
-
-  GetDlgItemText(hWnd, ID_EDIT_USERNAME, user, sizeof(user));
-  GetDlgItemText(hWnd, ID_EDIT_PW, pw, sizeof(pw));
-
-  LONG  rc = (*lpfnMAPILogon)((ULONG) hWnd, user, pw, 
-                  MAPI_FORCE_DOWNLOAD | MAPI_NEW_SESSION, 0, &mapiSession);
-  if (rc == SUCCESS_SUCCESS)
-  {
-    wsprintf(msg, "Success with session = %d", mapiSession);
-    ShowMessage(hWnd, msg);
-    SetFooter("Logon success");
-  }
-  else
-  {
-    wsprintf(msg, "FAILURE: Return code %d from Logon\nError=[%s]", 
-                      rc, GetMAPIError(rc));
-    ShowMessage(hWnd, msg);
-    SetFooter("Logon failed");
-  }
-}
-
-void
-DoMAPILogoff(HWND hWnd)
-{
-  ULONG (FAR PASCAL *lpfnMAPILogoff) ( LHANDLE lhSession, ULONG ulUIParam, 
-                                FLAGS flFlags, ULONG ulReserved);
-
-#ifdef WIN16		
-  (FARPROC&) lpfnMAPILogoff = GetProcAddress(m_hInstMapi, "MAPILOGOFF"); 
-#else
-  (FARPROC&) lpfnMAPILogoff = GetProcAddress(m_hInstMapi, "MAPILogoff"); 
-#endif
-  
-  if (!lpfnMAPILogoff)
-  {
-    ShowMessage(hWnd, "Unable to locate MAPI function.");
-    return;
-  }
-
-  char  msg[1024];
-  LONG  rc = (*lpfnMAPILogoff)(mapiSession, (ULONG) hWnd, 0, 0);
-  if (rc == SUCCESS_SUCCESS)
-  {
-    wsprintf(msg, "Successful logoff");
-    ShowMessage(hWnd, msg);
-    SetFooter(msg);
-  }
-  else
-  {
-    wsprintf(msg, "FAILURE: Return code %d from Logoff\nError=[%s]", 
-                      rc, GetMAPIError(rc));
-
-    ShowMessage(hWnd, msg);
-    SetFooter("Logoff failed");
-  }
-
-  mapiSession = 0;
-}
-
-void
-DoMAPIFreeBuffer(HWND hWnd, LPVOID buf, BOOL alert)
-{
-  ULONG (FAR PASCAL *lpfnMAPIFreeBuffer) (LPVOID lpBuffer);
-
-#ifdef WIN16		
-  (FARPROC&) lpfnMAPIFreeBuffer = GetProcAddress(m_hInstMapi, "MAPIFREEBUFFER"); 
-#else
-  (FARPROC&) lpfnMAPIFreeBuffer = GetProcAddress(m_hInstMapi, "MAPIFreeBuffer"); 
-#endif
-  
-  if (!lpfnMAPIFreeBuffer)
-  {
-    ShowMessage(hWnd, "Unable to locate MAPI function.");
-    return;
-  }
-
-  char  msg[1024];
-  LONG  rc = (*lpfnMAPIFreeBuffer)(buf);
-#ifdef WIN32
-  if (rc == S_OK)
-#else
-  if (rc == SUCCESS_SUCCESS)
-#endif
-  {
-    wsprintf(msg, "Successful Free Buffer Operation");
-    if (alert)
-      ShowMessage(hWnd, msg);
-  }
-  else
-  {
-    wsprintf(msg, "FAILURE: Return code %d from Logoff", rc);
-    ShowMessage(hWnd, msg);
-  }
-}
-
-void
-DoMAPIFindNext(HWND hWnd)
-{
-  ULONG (FAR PASCAL *lpfnMAPIFindNext) (LHANDLE lhSession, ULONG ulUIParam, 
-           LPTSTR lpszMessageType, LPTSTR lpszSeedMessageID, FLAGS flFlags, 
-           ULONG ulReserved, LPTSTR lpszMessageID);
-
-#ifdef WIN16		
-  (FARPROC&) lpfnMAPIFindNext = GetProcAddress(m_hInstMapi, "MAPIFINDNEXT"); 
-#else
-  (FARPROC&) lpfnMAPIFindNext = GetProcAddress(m_hInstMapi, "MAPIFindNext"); 
-#endif
-
-  if (!lpfnMAPIFindNext)
-  {
-    ShowMessage(hWnd, "Unable to locate MAPI function.");
-    return;
-  }
-
-  // Clear the list before we start...
-  ListBox_ResetContent(GetDlgItem(hWnd, ID_LIST_RESULT));
-
-  char  msg[1024];
-  char  messageID[512];
-  LONG  rc;                                                               
-#ifdef WIN32
-  FLAGS	flags = MAPI_GUARANTEE_FIFO | MAPI_LONG_MSGID | MAPI_UNREAD_ONLY;
-#else                                                                     	
-  FLAGS	flags = MAPI_GUARANTEE_FIFO | MAPI_UNREAD_ONLY;
-#endif
-  
-  while ( (rc = (*lpfnMAPIFindNext) (mapiSession, 
-           (ULONG) hWnd, 
-           NULL, 
-           NULL, 
-		   flags,
-           0,
-           messageID)) == SUCCESS_SUCCESS)
-  {
-      // 
-
-      lpMapiMessage mapiMsg = GetMessage(hWnd, messageID);
-      if (mapiMsg != NULL)
-      {
-        wsprintf(msg, "%s: \"%s\" Sender: %s", 
-                  messageID, 
-                  mapiMsg->lpszSubject, 
-                  mapiMsg->lpOriginator->lpszName);
-        DoMAPIFreeBuffer(hWnd, mapiMsg, FALSE);
-      }
-      else
-      {
-        lstrcpy(msg, messageID);
-      }
-
-      ListBox_InsertString(GetDlgItem(hWnd, ID_LIST_RESULT), 0, msg);
-  }
-
-  wsprintf(msg, "Enumeration ended: Return code %d from MAPIFindNext\nCondition=[%s]", 
-                    rc, GetMAPIError(rc));
-  ShowMessage(hWnd, msg);
-  SetFooter("Enumeration ended");
-}
-
-void
-DoMAPIReadMail(HWND hWnd)
-{
-  ULONG (FAR PASCAL *lpfnMAPIReadMail) (LHANDLE lhSession, ULONG ulUIParam, 
-           LPTSTR lpszMessageID, FLAGS flFlags, ULONG ulReserved, 
-           lpMapiMessage FAR * lppMessage);
-
-#ifdef WIN16		
-  (FARPROC&) lpfnMAPIReadMail = GetProcAddress(m_hInstMapi, "MAPIREADMAIL"); 
-#else
-  (FARPROC&) lpfnMAPIReadMail = GetProcAddress(m_hInstMapi, "MAPIReadMail"); 
-#endif
-  
-  if (!lpfnMAPIReadMail)
-  {
-    ShowMessage(hWnd, "Unable to locate MAPI function.");
-    return;
-  }
-
-  char            msg[1024];
-  char            lpszMessageID[512];
-  lpMapiMessage   lpMessage = NULL;
-  FLAGS           flFlags = 0;
-
-  DWORD selected = ListBox_GetCurSel(GetDlgItem(hWnd, ID_LIST_RESULT));
-  if (selected == LB_ERR)
-  {
-    ShowMessage(hWnd, "You need to select a valid message. Make sure\nyou have done a MAPIFindNext and selected\none of the resulting messages.");
-    return;
-  }
-
-  ListBox_GetText(GetDlgItem(hWnd, ID_LIST_RESULT), selected, lpszMessageID);
-
-  // Do the various flags for this call...
-  if (BST_CHECKED == Button_GetCheck(GetDlgItem(hWnd, IDC_CHECK_BODYASFILE)))
-  {
-    flFlags |= MAPI_BODY_AS_FILE;
-  }
-
-  if (BST_CHECKED == Button_GetCheck(GetDlgItem(hWnd, IDC_CHECK_ENVELOPEONLY)))
-  {
-    flFlags |= MAPI_ENVELOPE_ONLY;
-  }
-
-  if (BST_CHECKED == Button_GetCheck(GetDlgItem(hWnd, IDC_CHECK_PEEK)))
-  {
-    flFlags |= MAPI_PEEK;
-  }
-  
-  if (BST_CHECKED == Button_GetCheck(GetDlgItem(hWnd, IDC_CHECK_SUPPRESSATTACH)))
-  {
-    flFlags |= MAPI_SUPPRESS_ATTACH;
-  }
-
-  char *ptr = strchr( (const char *) lpszMessageID, ':');
-  if (ptr) *ptr = '\0';
-
-  LONG  rc = (*lpfnMAPIReadMail)
-          (mapiSession, 
-          (ULONG) hWnd, 
-          lpszMessageID,
-          flFlags,
-          0, 
-          &lpMessage);
-
-  // Deal with error up front and return if need be...
-  if (rc != SUCCESS_SUCCESS)
-  {
-    wsprintf(msg, "FAILURE: Return code %d from MAPIReadMail\nError=[%s]", 
-                      rc, GetMAPIError(rc));
-
-    ShowMessage(hWnd, msg);
-    SetFooter("ReadMail failed");
-    return;
-  }
-
-  // Now display the message and then return...
-  DisplayMAPIReadMail(hWnd, lpMessage);
-  DoMAPIFreeBuffer(hWnd, lpMessage, TRUE);
-}
-
-void
-DoMAPIDeleteMail(HWND hWnd)
-{
-  ULONG (FAR PASCAL *lpfnMAPIDeleteMail) (LHANDLE lhSession, ULONG ulUIParam, 
-            LPTSTR lpszMessageID, FLAGS flFlags, ULONG ulReserved);
-
-#ifdef WIN16		
-  (FARPROC&) lpfnMAPIDeleteMail = GetProcAddress(m_hInstMapi, "MAPIDELETEMAIL"); 
-#else
-  (FARPROC&) lpfnMAPIDeleteMail = GetProcAddress(m_hInstMapi, "MAPIDeleteMail"); 
-#endif
-  
-  if (!lpfnMAPIDeleteMail)
-  {
-    ShowMessage(hWnd, "Unable to locate MAPI function.");
-    return;
-  }
- 
-  char            msg[1024];
-  char            lpszMessageID[512];
-  lpMapiMessage   lpMessage = NULL;
-
-  DWORD selected = ListBox_GetCurSel(GetDlgItem(hWnd, ID_LIST_RESULT));
-  if (selected == LB_ERR)
-  {
-    ShowMessage(hWnd, "You need to select a valid message. Make sure\nyou have done a MAPIFindNext and selected\none of the resulting messages.");
-    return;
-  }
-
-  ListBox_GetText(GetDlgItem(hWnd, ID_LIST_RESULT), selected, lpszMessageID);
-
-  char *ptr = strchr( (const char *) lpszMessageID, ':');
-  if (ptr) *ptr = '\0';
-
-  LONG  rc = (*lpfnMAPIDeleteMail)
-          (mapiSession, 
-          (ULONG) hWnd,
-          lpszMessageID, 
-          0,
-          0);
-  
-  // Deal with the return code...
-  if (rc == SUCCESS_SUCCESS)
-  {
-    wsprintf(msg, "Successful deletion");
-    ShowMessage(hWnd, msg);
-    SetFooter(msg);  
-
-    // If it worked, refresh the list...
-    ShowMessage(hWnd, "The message list will now be refreshed\nsince one message was deleted.");
-    DoMAPIFindNext(hWnd);
-  }
-  else
-  {
-    wsprintf(msg, "FAILURE: Return code %d from MAPIDeleteMail\nError=[%s]", 
-                      rc, GetMAPIError(rc));
-
-    ShowMessage(hWnd, msg);
-    SetFooter("Logoff failed");
-  }
-}
-
-// This is for the name lookup stuff...
-lpMapiRecipDesc       lpRecip = NULL;
-
-void
-DoMAPIResolveName(HWND hWnd)
-{
-  ULONG (FAR PASCAL *lpfnMAPIResolveName) (LHANDLE lhSession, ULONG ulUIParam, 
-            LPTSTR lpszName, FLAGS flFlags, ULONG ulReserved, 
-            lpMapiRecipDesc FAR * lppRecip); 
-
-#ifdef WIN16		
-  (FARPROC&) lpfnMAPIResolveName = GetProcAddress(m_hInstMapi, "MAPIRESOLVENAME"); 
-#else
-  (FARPROC&) lpfnMAPIResolveName = GetProcAddress(m_hInstMapi, "MAPIResolveName"); 
-#endif
-  
-  if (!lpfnMAPIResolveName)
-  {
-    ShowMessage(hWnd, "Unable to locate MAPI function.");
-    return;
-  }
-
-  if (lpRecip != NULL)
-  {
-    ShowMessage(hWnd, "We need to free memory from a previous call...");
-    DoMAPIFreeBuffer(hWnd, lpRecip, TRUE);
-    lpRecip = NULL;
-  }
-
-  char        userName[512];
-  char        msg[1024];
-  FLAGS       flFlags = 0;    // We support none...
-
-  GetDlgItemText(hWnd, IDC_EDIT_RESOLVENAME, userName, sizeof(userName));
-  LONG  rc = (*lpfnMAPIResolveName)
-                      (mapiSession, 
-                       (ULONG) hWnd, 
-                       userName,
-                       flFlags, 
-                       0, 
-                       &lpRecip);
-
-  // Deal with error up front and return if need be...
-  if (rc != SUCCESS_SUCCESS)
-  {
-    wsprintf(msg, "FAILURE: Return code %d from DoMAPIResolveName\nError=[%s]", 
-                      rc, GetMAPIError(rc));
-
-    ShowMessage(hWnd, msg);
-    SetFooter("DoMAPIResolveName failed");
-    return;
-  }
-
-  // If we get here, we should probably show the information that we
-  // got back
-  wsprintf(msg, "Received information for %s\nName=[%s]\nAddress=[%s]\nID=[%s]",
-    userName, lpRecip->lpszName, lpRecip->lpszAddress, (LPSTR) lpRecip->lpEntryID);
-  ShowMessage(hWnd, msg);
-}
-
-void    
-DoMAPIResolveNameFreeBuffer(HWND hWnd)
-{
-  if (lpRecip == NULL)
-  {
-    ShowMessage(hWnd, "There is no memory allocated from MAPIResolveName()\nto be freed. Request ignored.");
-  }
-  else
-  {
-    DoMAPIFreeBuffer(hWnd, lpRecip, TRUE);
-    lpRecip = NULL;
-  }
-}
-
-void
-DoMAPIDetails(HWND hWnd)
-{
-  ULONG (FAR PASCAL *lpfnMAPIDetails) (LHANDLE lhSession, ULONG ulUIParam, 
-            lpMapiRecipDesc lpRecip, FLAGS flFlags, ULONG ulReserved);
-
-#ifdef WIN16		
-  (FARPROC&) lpfnMAPIDetails = GetProcAddress(m_hInstMapi, "MAPIDetails"); 
-#else
-  (FARPROC&) lpfnMAPIDetails = GetProcAddress(m_hInstMapi, "MAPIDetails"); 
-#endif
-  
-  if (!lpfnMAPIDetails)
-  {
-    ShowMessage(hWnd, "Unable to locate MAPI function.");
-    return;
-  }
-
-  char        msg[1024];
-  FLAGS       flFlags = 0;    // We really don't support these...
-
-  LONG  rc = (*lpfnMAPIDetails)
-              (mapiSession, 
-              (ULONG) hWnd,
-               lpRecip,
-               flFlags,
-               0);
-
-  if (rc == SUCCESS_SUCCESS)
-  {
-
-    wsprintf(msg, "MAPIDetails call succeeded");
-    ShowMessage(hWnd, msg);
-    SetFooter(msg);
-  }
-  else
-  {
-
-    wsprintf(msg, "FAILURE: Return code %d from MAPIDetails\nError=[%s]", 
-                      rc, GetMAPIError(rc));
-
-    if (lpRecip == NULL)
-    {
-      lstrcat(msg, "\nNOTE: There is no valid pointer from a MAPIResolveName()\ncall to show details about.");
-    }
-
-    ShowMessage(hWnd, msg);
-    SetFooter("MAPIDetails failed");
-  }
-}
-
-lpMapiMessage 
-GetMessage(HWND hWnd, LPSTR id)
-{
-  ULONG (FAR PASCAL *lpfnMAPIReadMail) (LHANDLE lhSession, ULONG ulUIParam, 
-           LPTSTR lpszMessageID, FLAGS flFlags, ULONG ulReserved, 
-           lpMapiMessage FAR * lppMessage);
-
-#ifdef WIN16		
-  (FARPROC&) lpfnMAPIReadMail = GetProcAddress(m_hInstMapi, "MAPIREADMAIL"); 
-#else
-  (FARPROC&) lpfnMAPIReadMail = GetProcAddress(m_hInstMapi, "MAPIReadMail"); 
-#endif
-  
-  if (!lpfnMAPIReadMail)
-  {
-    ShowMessage(hWnd, "Unable to locate MAPI function.");
-    return NULL;
-  }
-
-  char            msg[1024];
-  lpMapiMessage   lpMessage = NULL;
-  FLAGS           flFlags = 0;
-
-  flFlags |= MAPI_ENVELOPE_ONLY;
-  LONG  rc = (*lpfnMAPIReadMail)
-          (mapiSession, 
-          (ULONG) hWnd, 
-          id,
-          flFlags,
-          0, 
-          &lpMessage);
-
-  // Deal with error up front and return if need be...
-  if (rc != SUCCESS_SUCCESS)
-  {
-    wsprintf(msg, "FAILURE: Return code %d from MAPIReadMail\nError=[%s]", 
-                      rc, GetMAPIError(rc));
-
-    ShowMessage(hWnd, msg);
-    SetFooter("ReadMail failed");
-    return NULL;
-  }
-
-  return(lpMessage);
-}
-
-void    
-LoadNSCPVersionFunc(HWND hWnd)
-{
-  ULONG (FAR PASCAL *lpfnLoadNSCPVersion) ( void );
-
-#ifdef WIN16		
-  (FARPROC&) lpfnLoadNSCPVersion = GetProcAddress(m_hInstMapi, "MAPIGETNERSCAPEVERSION"); 
-#else
-  (FARPROC&) lpfnLoadNSCPVersion = GetProcAddress(m_hInstMapi, "MAPIGetNetscapeVersion"); 
-#endif
-  
-  if (!lpfnLoadNSCPVersion)
-  {
-    ShowMessage(hWnd, "Unable to locate MAPIGetNetscapeVersion() function.");
-  }
-  else
-  {
-    ShowMessage(hWnd, "MAPIGetNetscapeVersion() function was FOUND!");
-  }
-  return;
-}
-
-void    
-DoMAPI_NSCP_Sync(HWND hWnd)
-{
-ULONG (FAR PASCAL *lpfnNSCPSync) ( LHANDLE lhSession,
-                                          ULONG ulReserved );
-#ifdef WIN16		
-  (FARPROC&) lpfnNSCPSync = GetProcAddress(m_hInstMapi, "MAPI_NSCP_SYNCHRONIZECLIENT"); 
-#else
-  (FARPROC&) lpfnNSCPSync = GetProcAddress(m_hInstMapi, "MAPI_NSCP_SynchronizeClient"); 
-#endif
-
-  if (!lpfnNSCPSync)
-  {
-    ShowMessage(hWnd, "Unable to locate MAPI function.");
-    return;
-  }
-
-  LONG  rc = (*lpfnNSCPSync) (mapiSession, 0);
-
-  char    msg[256];
-
-  // Deal with error up front and return if need be...
-  if (rc != SUCCESS_SUCCESS)
-  {
-    wsprintf(msg, "FAILURE: Return code %d from MAPI_NSCP_SynchronizeClient\nError=[%s]", 
-                      rc, GetMAPIError(rc));
-
-    ShowMessage(hWnd, msg);
-    SetFooter("MAPI_NSCP_SynchronizeClient failed");
-    return;
-  }
-  else
-  {
-    wsprintf(msg, "Success for MAPI_NSCP_SynchronizeClient");    
-    ShowMessage(hWnd, msg);
-    SetFooter("MAPI_NSCP_SynchronizeClient success");
-  }
-}
--- a/mozilla/mailnews/mapi/old/tests/mapitest/mapitest.dep
+++ b/mozilla/mailnews/mapi/old/tests/mapitest/mapitest.dep
@@ -1,25 +0,0 @@
-# Microsoft Developer Studio Generated Dependency File, included by mapitest.mak
-
-.\main.cpp : \
-	".\port.h"\
-	"c:\program files\msdev\vc98\include\basetsd.h"\
-	
-
-.\mapimail.cpp : \
-	".\port.h"\
-	"c:\program files\msdev\vc98\include\basetsd.h"\
-	
-
-.\mapiproc.cpp : \
-	".\port.h"\
-	"c:\program files\msdev\vc98\include\basetsd.h"\
-	
-
-.\mtest32.rc : \
-	".\nscicon.ico"\
-	
-
-.\readmail.cpp : \
-	".\port.h"\
-	"c:\program files\msdev\vc98\include\basetsd.h"\
-	
--- a/mozilla/mailnews/mapi/old/tests/mapitest/mapitest.dsp
+++ b/mozilla/mailnews/mapi/old/tests/mapitest/mapitest.dsp
@@ -1,121 +0,0 @@
-# Microsoft Developer Studio Project File - Name="mapitest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=mapitest - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "mapitest.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "mapitest.mak" CFG="mapitest - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "mapitest - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "mapitest - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "mapitest - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-
-!ELSEIF  "$(CFG)" == "mapitest - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "mapitest - Win32 Release"
-# Name "mapitest - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\main.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\mapimail.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\mapiproc.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\mtest32.rc
-# End Source File
-# Begin Source File
-
-SOURCE=.\readmail.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
--- a/mozilla/mailnews/mapi/old/tests/mapitest/mapitest.dsw
+++ b/mozilla/mailnews/mapi/old/tests/mapitest/mapitest.dsw
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "mapitest"=.\mapitest.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
--- a/mozilla/mailnews/mapi/old/tests/mapitest/mapitest.ncb
+++ b/mozilla/mailnews/mapi/old/tests/mapitest/mapitest.ncb
--- a/mozilla/mailnews/mapi/old/tests/mapitest/mapitest.opt
+++ b/mozilla/mailnews/mapi/old/tests/mapitest/mapitest.opt
--- a/mozilla/mailnews/mapi/old/tests/mapitest/mapitest.plg
+++ b/mozilla/mailnews/mapi/old/tests/mapitest/mapitest.plg
@@ -1,44 +0,0 @@
-<html>
-<body>
-<pre>
-<h1>Build Log</h1>
-<h3>
--------------------Configuration: mapitest - Win32 Debug--------------------
-</h3>
-<h3>Command Lines</h3>
-Creating command line "rc.exe /l 0x409 /fo"Debug/mtest32.res" /d "_DEBUG" "Y:\mozilla\mailnews\mapi\tests\mapitest\mtest32.rc"" 
-Creating temporary file "C:\TEMP\RSP38A.tmp" with contents
-[
-/nologo /MLd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /Fp"Debug/mapitest.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c 
-"Y:\mozilla\mailnews\mapi\tests\mapitest\readmail.cpp"
-"Y:\mozilla\mailnews\mapi\tests\mapitest\mapimail.cpp"
-"Y:\mozilla\mailnews\mapi\tests\mapitest\mapiproc.cpp"
-"Y:\mozilla\mailnews\mapi\tests\mapitest\main.cpp"
-]
-Creating command line "cl.exe @C:\TEMP\RSP38A.tmp" 
-Creating temporary file "C:\TEMP\RSP38B.tmp" with contents
-[
-kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /incremental:yes /pdb:"Debug/mapitest.pdb" /debug /machine:I386 /out:"Debug/mapitest.exe" /pdbtype:sept 
-.\Debug\readmail.obj
-.\Debug\mapimail.obj
-.\Debug\mapiproc.obj
-.\Debug\mtest32.res
-.\Debug\main.obj
-]
-Creating command line "link.exe @C:\TEMP\RSP38B.tmp"
-<h3>Output Window</h3>
-Compiling resources...
-Compiling...
-readmail.cpp
-mapimail.cpp
-mapiproc.cpp
-main.cpp
-Linking...
-
-
-
-<h3>Results</h3>
-mapitest.exe - 0 error(s), 0 warning(s)
-</pre>
-</body>
-</html>
--- a/mozilla/mailnews/mapi/old/tests/mapitest/mtest32.rc
+++ b/mozilla/mailnews/mapi/old/tests/mapitest/mtest32.rc
@@ -1,245 +0,0 @@
-//Microsoft Developer Studio generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-ID_DIALOG DIALOG DISCARDABLE  0, 0, 344, 229
-STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Netscape MAPI Test Harness"
-MENU ID_MENU
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Open/Close",IDC_STATIC,4,4,336,27
-    LTEXT           "User:",IDC_STATIC,9,17,18,11
-    EDITTEXT        ID_EDIT_USERNAME,28,15,41,12,ES_AUTOHSCROLL
-    LTEXT           "Password:",IDC_STATIC,74,17,38,11
-    EDITTEXT        ID_EDIT_PW,112,15,41,12,ES_PASSWORD | ES_AUTOHSCROLL
-    PUSHBUTTON      "MAPILogon",ID_BUTTON_LOGON,157,13,46,14
-    PUSHBUTTON      "MAPILogoff",ID_BUTTON_LOGOFF,209,13,46,14
-    GROUPBOX        "Mail Operations",IDC_STATIC,4,36,336,142
-    PUSHBUTTON      "MAPIFindNext",ID_BUTTON_FINDNEXT,17,50,57,14
-    PUSHBUTTON      "MAPIDeleteMail",ID_BUTTON_DELETEMAIL,80,50,57,14
-    PUSHBUTTON      "Clear Results",ID_BUTTON_CLEAR,143,50,57,14
-    PUSHBUTTON      "Send Mail",ID_BUTTON_MAIL,206,50,57,14
-    LISTBOX         ID_LIST_RESULT,9,66,325,56,LBS_SORT | 
-                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | 
-                    WS_TABSTOP
-    GROUPBOX        "User Information",IDC_STATIC,4,181,336,28
-    PUSHBUTTON      "MAPIResolveName",ID_BUTTON_RESOLVENAME,9,192,68,14
-    EDITTEXT        IDC_EDIT_RESOLVENAME,82,192,130,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "MAPIDetails",ID_BUTTON_DETAILS,219,192,48,14
-    LTEXT           "",ID_STATIC_RESULT,4,214,336,13,SS_SUNKEN
-    PUSHBUTTON      "MAPIReadMail",ID_BUTTON_READMAIL,34,142,57,14
-    CONTROL         "MAPI_BODY_AS_FILE - Body as attachment",
-                    IDC_CHECK_BODYASFILE,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,121,125,188,9
-    CONTROL         "MAPI_ENVELOPE_ONLY - Header information only",
-                    IDC_CHECK_ENVELOPEONLY,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,121,138,188,9
-    CONTROL         "MAPI_PEEK - Don't mark message as read",IDC_CHECK_PEEK,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,121,151,188,9
-    CONTROL         "MAPI_SUPPRESS_ATTACH - Suppress attachments",
-                    IDC_CHECK_SUPPRESSATTACH,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,121,164,188,9
-    PUSHBUTTON      "<- MAPIFreeBuffer",ID_BUTTON_FREEBUFFER,272,192,63,14
-    PUSHBUTTON      "MAPIGetNSCPVersion",ID_BUTTON_NSCPVERSION,261,13,76,14
-    PUSHBUTTON      "Synchronize",ID_BUTTON_SYNC,269,50,57,14
-END
-
-ID_DIALOG_MAIL DIALOG DISCARDABLE  0, 0, 285, 246
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Composition"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Address Information",IDC_STATIC,4,4,275,55
-    LTEXT           "To:",IDC_STATIC,21,19,12,8
-    EDITTEXT        ID_EDIT_TOADDRESS,36,16,239,13,ES_AUTOHSCROLL
-    EDITTEXT        ID_EDIT_CCADDRESS,36,30,239,13,ES_AUTOHSCROLL
-    EDITTEXT        ID_EDIT_BCCADDRESS,36,44,239,13,ES_AUTOHSCROLL
-    LTEXT           "Subject:",IDC_STATIC,5,65,29,9
-    EDITTEXT        ID_EDIT_SUBJECT,36,63,239,13,ES_AUTOHSCROLL
-    EDITTEXT        ID_EDIT_NOTETEXT,4,78,271,72,ES_MULTILINE | 
-                    ES_AUTOHSCROLL
-    GROUPBOX        "Attachments",IDC_STATIC,4,153,275,39
-    EDITTEXT        ID_EDIT_ATTACH1,16,162,122,13,ES_AUTOHSCROLL
-    EDITTEXT        ID_EDIT_ATTACH2,16,176,122,13,ES_AUTOHSCROLL
-    EDITTEXT        ID_EDIT_ATTACH3,147,162,122,13,ES_AUTOHSCROLL
-    EDITTEXT        ID_EDIT_ATTACH4,147,175,122,13,ES_AUTOHSCROLL
-    PUSHBUTTON      "MAPISendMail",ID_BUTTON_MAPISENDMAIL,70,204,58,14
-    PUSHBUTTON      "Cancel",IDCANCEL,50,225,84,14
-    PUSHBUTTON      "MAPISendDocuments",ID_BUTTON_MAPISENDDOCUMENTS,132,204,
-                    79,14
-    CONTROL         "Show Dialog",ID_CHECK_SHOWDIALOG,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,8,207,55,9
-    LTEXT           "cc:",IDC_STATIC,22,32,12,8
-    LTEXT           "bcc:",IDC_STATIC,18,47,15,8
-    GROUPBOX        "Send Operations",IDC_STATIC,4,196,275,26
-    PUSHBUTTON      "MAPISaveMail",ID_BUTTON_MAPISAVEMAIL,215,204,57,14
-    PUSHBUTTON      "MAPIAddress",ID_BUTTON_MAPIADDRESS,150,225,84,14
-END
-
-ID_DIALOG_READMAIL DIALOG DISCARDABLE  0, 0, 269, 266
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Mail Message"
-FONT 8, "MS Sans Serif"
-BEGIN
-    LTEXT           "Subject:",IDC_STATIC,5,71,27,9
-    EDITTEXT        IDC_EDIT_SUBJECT,36,69,229,12,ES_AUTOHSCROLL | 
-                    ES_READONLY
-    LISTBOX         IDC_LIST_ATTACHMENTS,4,211,261,37,LBS_SORT | 
-                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
-    EDITTEXT        IDC_EDIT_BODYTEXT,4,113,261,85,ES_MULTILINE | 
-                    ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | 
-                    ES_WANTRETURN
-    LISTBOX         IDC_LIST_RECIPIENTS,4,29,261,36,LBS_SORT | 
-                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Recipients:",IDC_STATIC,4,19,43,9
-    LTEXT           "Attachments:",IDC_STATIC,4,202,43,9
-    EDITTEXT        IDC_EDIT_DATETIME,36,83,229,12,ES_AUTOHSCROLL | 
-                    ES_READONLY
-    LTEXT           "Date:",IDC_STATIC,13,84,19,9
-    PUSHBUTTON      "OK",ID_OK,114,249,42,13
-    EDITTEXT        IDC_EDIT_THREAD,36,97,229,12,ES_AUTOHSCROLL | 
-                    ES_READONLY
-    LTEXT           "Thread:",IDC_STATIC,6,99,25,9
-    LTEXT           "From:",IDC_STATIC,4,6,19,9
-    EDITTEXT        IDC_EDIT_FROM,27,4,238,12,ES_AUTOHSCROLL | ES_READONLY
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE 
-BEGIN
-    ID_DIALOG, DIALOG
-    BEGIN
-        LEFTMARGIN, 4
-        RIGHTMARGIN, 340
-        VERTGUIDE, 9
-        VERTGUIDE, 309
-        TOPMARGIN, 4
-        BOTTOMMARGIN, 227
-        HORZGUIDE, 206
-    END
-
-    ID_DIALOG_MAIL, DIALOG
-    BEGIN
-        LEFTMARGIN, 4
-        RIGHTMARGIN, 281
-        TOPMARGIN, 4
-        BOTTOMMARGIN, 239
-    END
-
-    ID_DIALOG_READMAIL, DIALOG
-    BEGIN
-        LEFTMARGIN, 4
-        RIGHTMARGIN, 265
-        TOPMARGIN, 4
-        BOTTOMMARGIN, 262
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-ID_ICON_APP             ICON    DISCARDABLE     "nscicon.ico"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-ID_MENU MENU DISCARDABLE 
-BEGIN
-    POPUP "&File"
-    BEGIN
-        MENUITEM "MAPI&FindNext",               ID_MENU_MAPIFINDNEXT
-        MENUITEM "MAPI&ReadMail",               ID_MENU_MAPIREADMAIL
-        MENUITEM SEPARATOR
-        MENUITEM "E&xit",                       ID_MENU_MYEXIT
-    END
-    POPUP "&Edit"
-    BEGIN
-        MENUITEM "MAPI&DeleteMail",             ID_MENU_MAPIDELETEMAIL
-        MENUITEM "&Clear Results",              ID_MENU_CLEARRESULTS
-    END
-    POPUP "&Help"
-    BEGIN
-        MENUITEM "&About...",                   ID_MENU_MYABOUT
-    END
-END
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
--- a/mozilla/mailnews/mapi/old/tests/mapitest/nscicon.ico
+++ b/mozilla/mailnews/mapi/old/tests/mapitest/nscicon.ico
--- a/mozilla/mailnews/mapi/old/tests/mapitest/port.h
+++ b/mozilla/mailnews/mapi/old/tests/mapitest/port.h
@@ -1,303 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is 
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-//
-
-#ifndef PORT_H
-#define PORT_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*****************************************************************\
- *                                                               *
- *  PORT.H                                                       *
- *                                                               *
- *  Win16/Win32 portability stuff                                *
- *                                                               *
- *  A.Sokolsky                                                   *
- *      3.10.94 distilled into this header                       *
- *                                                               *
-\*****************************************************************/
-
-/*
- * calling conventions
- */
-#include <assert.h>
-                                                      
-                                                      
-#ifndef CDECL
-#define CDECL __cdecl
-#endif  // CDECL
-
-#ifndef PASCAL
-#define PASCAL __pascal
-#endif  // PASCAL
-
-#ifdef FASTCALL
-#error FASTCALL defined
-#endif // FASTCALL
-
-
-#ifdef NDEBUG
-#define FASTCALL __fastcall
-#else
-#define FASTCALL PASCAL
-#endif // NDEBUG   
-
-
-
-#ifndef HWND2DWORD
-#  ifdef WIN32
-#    define HWND2DWORD(X_hWnd) ( (DWORD)(X_hWnd) )
-#  else // WIN16
-#    define HWND2DWORD(X_hWnd) ( (DWORD)MAKELONG(((WORD)(X_hWnd)), 0) )
-#  endif
-#endif // HWND2DWORD
-
-
-/*
- * WIN16 - WIN32 compatibility stuff
- */
-
-#ifdef WIN32
-
-# define DLLEXPORT    __declspec( dllexport )
-# define EXPORT
-# define LOADDS
-# define HUGE
-# ifndef FAR
-#  define FAR
-# endif // FAR
-# ifndef NEAR
-#  define NEAR
-# endif // NEAR 
-# ifdef UNICODE
-#  define SIZEOF(x)   (sizeof(x)/sizeof(WCHAR))
-# else
-#  define SIZEOF(x)   sizeof(x)
-# endif
-
-#else  // !WIN32 == WIN16
-
-# define DLLEXPORT    
-# define EXPORT       __export
-# define LOADDS       __loadds
-# define HUGE         __huge
-# ifndef FAR
-#   define FAR        __far
-#   define NEAR       __near
-# endif  // FAR
-# define CONST const
-# define SIZEOF(x)    sizeof(x)
-# define CHAR char
-# define TCHAR char
-# define WCHAR char
-# ifndef LPTSTR
-#   define LPTSTR LPSTR
-# endif
-# ifndef LPCTSTR 
-#   define LPCTSTR LPCSTR
-# endif
-# define UNREFERENCED_PARAMETER(x) x;
-# ifndef TEXT
-#   define TEXT(x) x
-# endif
-# define GetWindowTextW GetWindowText
-# define lstrcpyW lstrcpy   
-
-# define BN_DBLCLK BN_DOUBLECLICKED // ~~MRJ needed for custom control.
-// ~~MRJ begin Win95 backward compat section
-# define LPWSTR LPSTR
-# define LPCWSTR LPCSTR
-
-// button check state for WIN16
-#ifndef BST_UNCHECKED
-#define BST_UNCHECKED      0x0000
-#endif
-
-#ifndef BST_CHECKED
-#define BST_CHECKED        0x0001
-#endif
-
-
-#ifndef WIN95_COMPAT
-#  define WIN95_COMPAT
-#endif
-
-// ~~MRJ end Win95 compat section.
-
-// critical section API stubs
-typedef DWORD CRITICAL_SECTION;
-typedef CRITICAL_SECTION FAR * LPCRITICAL_SECTION; 
-#ifdef __cplusplus
-inline void InitializeCriticalSection(LPCRITICAL_SECTION lpSection) {}
-inline void DeleteCriticalSection(LPCRITICAL_SECTION lpSection) {}
-inline void EnterCriticalSection(LPCRITICAL_SECTION lpSection) {}
-inline void LeaveCriticalSection(LPCRITICAL_SECTION lpSection) {} 
-#endif // __cplusplus 
-
-// Added for nssock16 ---Neeti
-#ifndef ZeroMemory
-#include <memory.h>
-#define ZeroMemory(PTR, SIZE) memset(PTR, 0, SIZE)
-#endif // ZeroMemory
-
-#endif // WIN16
-
-/*
- * unix - windows compatibility stuff
- */
-typedef DWORD u_int32;
-typedef WORD  u_int16;
-typedef BYTE  u_int8;
-#ifdef WIN32
-typedef short int Bool16;
-#else  // WIN16
-typedef BOOL  Bool16;
-#endif // WIN16
-
-/*
- * Cross Platform Compatibility
- */
-#ifndef UNALIGNED
-# ifdef _M_ALPHA
-#  define UNALIGNED __unaligned
-# else  // !_M_ALPHA
-#  define UNALIGNED
-# endif // !_M_ALPHA
-#endif  // UNALIGNED
-
-//
-// RICHIE - for the Alpha port
-//
-#ifdef _M_ALPHA
-# undef pascal
-# undef PASCAL
-# if (_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED)
-#  define pascal __stdcall
-#  define PASCAL __stdcall
-# else
-#  define PASCAL
-# endif
-#endif
-
-
-/*
- * Useful Types
- */
-typedef char HUGE *HPSTR;
-typedef const char HUGE *HPCSTR;
-typedef unsigned char HUGE *HPBYTE;
-typedef WORD HUGE *HPWORD;
-typedef UINT FAR *LPUINT;
-typedef BOOL (CALLBACK *USERABORTPROC)();
-typedef BOOL (CALLBACK *PROGRESSPROC)(UINT uPos, UINT uRange);
-typedef int INT;   // ~~MRJ a function needed this defined.
-typedef MINMAXINFO FAR *LPMINMAXINFO; // ~~MRJ 
-
-//
-// stuff missing from windows.h
-//
-#ifndef MAKEWORD
-#define MAKEWORD(low, high)    ((WORD)(((BYTE)(low)) | (((WORD)((BYTE)(high))) << 8)))
-#endif // MAKEWORD
-
-#ifdef WIN32
-# ifndef hmemcpy
-#  define hmemcpy memcpy
-# endif // !defined(hmemcpy)
-# define _fmemset memset
-
-# include <malloc.h>
-
-#ifdef __cplusplus
-
-inline BOOL IsGDIObject(HGDIOBJ hObj) { return (hObj != 0); }
-inline void *_halloc(long num, unsigned int size) { return malloc(num * size); }
-inline void _hfree( void *memblock ) { free(memblock); } 
-/*
-inline BOOL IsInstance(HINSTANCE hInst) {
-# ifdef WIN32
-    return (hInst != 0);
-# else // WIN16
-    return (hInst > HINSTANCE_ERROR);
-# endif  
-}  
-*/
-
-#endif // __cplusplus
-
-  WINUSERAPI HANDLE WINAPI LoadImageA(HINSTANCE, LPCSTR, UINT, int, int, UINT);
-
-#endif // WIN32
-
-#ifdef __cplusplus 
-inline BOOL IsInstance(HINSTANCE hInst) {
-# ifdef WIN32
-    return (hInst != 0);
-# else // WIN16
-    return (hInst > HINSTANCE_ERROR);
-# endif  
-} 
-inline void SetWindowSmallIcon(HINSTANCE hInst, HWND hWnd, UINT uIconResourceId) {
-#ifdef WIN32
-# ifndef WM_SETICON
-#   define WM_SETICON 0x0080
-# endif  // WM_SETICON
-# ifndef IMAGE_ICON
-#   define IMAGE_ICON 1
-# endif
-  assert(IsWindow(hWnd));
-  HICON hIcon = (HICON)LoadImageA(hInst, MAKEINTRESOURCE(uIconResourceId), IMAGE_ICON,
-    16, 16, 0);
-  if(NULL != hIcon) {
-    SendMessage(hWnd, WM_SETICON, FALSE, (LPARAM)hIcon);
-  } else {
-    HICON hIcon = LoadIcon(hInst, MAKEINTRESOURCE(uIconResourceId));
-    assert(hIcon != 0);
-    SendMessage(hWnd, WM_SETICON, FALSE, (LPARAM)hIcon);
-  }
-#endif // WIN32
-}
-#endif // __cplusplus
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* PORT_H */
--- a/mozilla/mailnews/mapi/old/tests/mapitest/readmail.cpp
+++ b/mozilla/mailnews/mapi/old/tests/mapitest/readmail.cpp
@@ -1,137 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is 
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-//
-#include <windows.h>
-#include <windowsx.h>
-
-#ifndef MAPI_OLE	// Because MSFT doesn't do this for us :-(
-#include <mapi.h>
-#endif
-
-#include "port.h"
-#include "resource.h"
-
-//
-// Variables...
-// 
-extern HINSTANCE   hInst;
-extern HINSTANCE   m_hInstMapi;
-extern LHANDLE     mapiSession;
-
-// 
-// Forward declarations...
-//
-extern void   ShowMessage(HWND hWnd, LPSTR msg);
-extern void   SetFooter(LPSTR msg);
-extern LPSTR  GetMAPIError(LONG errorCode);
-lpMapiMessage mailPtr = NULL;
-
-void 
-ProcessReadMailCommand(HWND hWnd, int id, HWND hCtl, UINT codeNotify) 
-{ 
-  switch (id) 
-  {
-  case ID_OK:
-  case IDCANCEL:
-    EndDialog(hWnd, 0);
-    break;
-
-  default:
-    break;
-  }
-}
-
-BOOL CALLBACK LOADDS 
-ReadMailDlgProc(HWND hWndMail, UINT wMsg, WPARAM wParam, LPARAM lParam) 
-{
-  switch (wMsg) 
-  {
-  case WM_INITDIALOG: 
-    {
-      DWORD i;
-      // Do everything we need to display the message pointed to by
-      // mailPtr
-      if (!mailPtr)
-        break;
-
-      // Start with the basics...
-      SetDlgItemText(hWndMail, IDC_EDIT_SUBJECT, mailPtr->lpszSubject);
-      SetDlgItemText(hWndMail, IDC_EDIT_DATETIME, mailPtr->lpszDateReceived);
-      SetDlgItemText(hWndMail, IDC_EDIT_THREAD, mailPtr->lpszConversationID);
-      SetDlgItemText(hWndMail, IDC_EDIT_BODYTEXT, mailPtr->lpszNoteText);
-
-      char    buf[1024];
-      wsprintf(buf, "%s (%s)", mailPtr->lpOriginator->lpszName, 
-                              mailPtr->lpOriginator->lpszAddress);
-      SetDlgItemText(hWndMail, IDC_EDIT_FROM, buf);
-
-      for (i=0; i<mailPtr->nRecipCount; i++)
-      {
-          wsprintf(buf, "%s (%s)", mailPtr->lpRecips[i].lpszName, 
-                                   mailPtr->lpRecips[i].lpszAddress);
-          ListBox_InsertString(GetDlgItem(hWndMail, IDC_LIST_RECIPIENTS), 
-                  ListBox_GetCount(GetDlgItem(hWndMail, IDC_LIST_RECIPIENTS)), 
-                  buf);
-      }
-
-      for (i=0; i<mailPtr->nFileCount; i++)
-      {
-          ListBox_InsertString(GetDlgItem(hWndMail, IDC_LIST_ATTACHMENTS), 
-                ListBox_GetCount(GetDlgItem(hWndMail, IDC_LIST_ATTACHMENTS)), 
-                mailPtr->lpFiles[i].lpszPathName);
-      }
-    }
-    break;
-
-  case WM_COMMAND:
-    HANDLE_WM_COMMAND(hWndMail, wParam, lParam, ProcessReadMailCommand);
-    break;
-
-  default:
-    return FALSE;
-  }
-  
-  return TRUE;
-}
-
-void
-DisplayMAPIReadMail(HWND hWnd, lpMapiMessage msgPtr)
-{
-  mailPtr = msgPtr;
-  DialogBox(hInst, MAKEINTRESOURCE(ID_DIALOG_READMAIL), hWnd, 
-                (DLGPROC)ReadMailDlgProc);
-}
--- a/mozilla/mailnews/mapi/old/tests/mapitest/resource.h
+++ b/mozilla/mailnews/mapi/old/tests/mapitest/resource.h
@@ -1,108 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by mtest32.rc
-//
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-#define ID_GUI_MESSAGE1                 1
-#define ID_BUTTON_MAPIADDRESS           3
-#define ID_DIALOG                       101
-#define ID_ICON_APP                     102
-#define ID_MENU                         104
-#define ID_DIALOG_MAIL                  105
-#define ID_DIALOG_READMAIL              106
-#define ID_SETFROMEDIT                  1000
-#define ID_SETTEXT                      1001
-#define ID_GETROWS                      1001
-#define ID_EDIT                         1002
-#define ID_EDIT_HWND                    1002
-#define ID_RESOURCETEXT                 1003
-#define ID_GETTEXT                      1003
-#define ID_STATIC_RESULT                1004
-#define ID_GETVISROWS                   1005
-#define ID_GETWINID                     1006
-#define ID_SETROWFOCUS                  1007
-#define ID_GETROWFOCUS                  1008
-#define ID_EDIT_ROW                     1009
-#define ID_LIST_RESULT                  1010
-#define ID_GETCOLCOUNT                  1011
-#define ID_BUTTON_LOGON                 1011
-#define ID_SETROWINVIEW                 1012
-#define ID_BUTTON_LOGOFF                1012
-#define ID_GETNUMCHILDREN               1013
-#define ID_EDIT_USERNAME                1013
-#define ID_CLEARRESULTS                 1014
-#define ID_EDIT_PW                      1014
-#define ID_BUTTON_FINDNEXT              1015
-#define ID_BUTTON_CLEAR                 1016
-#define ID_BUTTON_READMAIL              1017
-#define ID_BUTTON_DELETEMAIL            1018
-#define IDC_EDIT_RESOLVENAME            1019
-#define ID_BUTTON_MAPISENDMAIL          1020
-#define ID_BUTTON_NSCPVERSION           1020
-#define ID_BUTTON_RESOLVENAME           1021
-#define ID_BUTTON_MAPISENDDOCUMENTS     1021
-#define ID_EDIT_TOADDRESS               1022
-#define ID_EDIT_CCADDRESS               1023
-#define ID_BUTTON_DETAILS               1024
-#define ID_EDIT_BCCADDRESS              1024
-#define ID_EDIT_SUBJECT                 1025
-#define ID_BUTTON_MAIL                  1025
-#define ID_BUTTON_FREEBUFFER            1026
-#define ID_EDIT_NOTETEXT                1026
-#define ID_EDIT_ATTACH1                 1027
-#define ID_BUTTON_SYNC                  1027
-#define ID_EDIT_ATTACH2                 1028
-#define IDC_CHECK_BODYASFILE            1028
-#define ID_EDIT_ATTACH3                 1029
-#define IDC_CHECK_ENVELOPEONLY          1029
-#define IDC_LIST_ATTACHMENTS            1029
-#define ID_EDIT_ATTACH4                 1030
-#define IDC_CHECK_PEEK                  1030
-#define IDC_EDIT_BODYTEXT               1030
-#define IDC_CHECK_SUPPRESSATTACH        1031
-#define IDC_LIST_RECIPIENTS             1031
-#define ID_BUTTON_MAPISAVEMAIL          1031
-#define IDC_EDIT_SUBJECT                1032
-#define IDC_EDIT_DATETIME               1033
-#define ID_OK                           1034
-#define IDC_EDIT_THREAD                 1035
-#define ID_CHECK_SHOWDIALOG             1035
-#define IDC_EDIT_FROM                   1036
-#define ID_MENU_MYEXIT                  30001
-#define ID_MENU_CLEAR                   30002
-#define ID_MENU_MYABOUT                 30003
-#define ID_MENU_CLEARRESULTS            30004
-#define ID_MENU_MAPIDELETEMAIL          30005
-#define ID_MENU_MAPIFINDNEXT            30006
-#define ID_MENU_MAPIREADMAIL            30007
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        107
-#define _APS_NEXT_COMMAND_VALUE         30008
-#define _APS_NEXT_CONTROL_VALUE         1036
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
--- a/mozilla/mailnews/mapi/registry/makefile.win
+++ b/mozilla/mailnews/mapi/registry/makefile.win
@@ -0,0 +1,42 @@
+# ***** 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):
+# Srilatha Moturi <srilatha@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=..\..\..
+
+DIRS=public src
+
+include <$(DEPTH)\config\rules.mak>
--- a/mozilla/mailnews/mapi/registry/public/makefile.win
+++ b/mozilla/mailnews/mapi/registry/public/makefile.win
@@ -0,0 +1,48 @@
+# ***** 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):
+# Srilatha Moturi <srilatha@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=nsMapiRegistry
+XPIDL_MODULE=mapiregistry
+
+XPIDLSRCS =	\
+           .\nsIMapiRegistry.idl \
+            $(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
--- a/mozilla/mailnews/mapi/registry/public/nsIMapiRegistry.idl
+++ b/mozilla/mailnews/mapi/registry/public/nsIMapiRegistry.idl
@@ -0,0 +1,78 @@
+/* ***** 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):
+ * Srilatha Moturi <srilatha@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"
+
+interface nsIDOMWindow;
+
+/**
+ * This interface provides support for registering Mozilla as the default
+ * Mail Client. This interface can also be used to get/set the user preference
+ * for the default Mail Client.
+ * 
+ */
+[scriptable, uuid(c5be14ba-4e0a-4eec-a1b8-04363761d63c)]
+interface nsIMapiRegistry: nsISupports {
+
+   /** This is set to TRUE if Mozilla is the default Application
+    */
+   readonly attribute boolean isDefaultMailClient;
+
+   /** This is set TRUE only once per session.
+    */
+   readonly attribute boolean showDialog;
+
+   /** This will update the registry keys to set Mozilla as default Mail Client.
+    */
+   void setDefaultMailClient();
+
+   /** This will reset the registry keys for the default Mail Client.
+    */
+   void unsetDefaultMailClient();
+
+   /** This will bring the dialog asking the user if he/she wants to set
+    * Mozilla as default Mail Client.
+    * Call this only if Mozilla is not the default Mail client
+    */
+   void showMailIntegrationDialog(in nsIDOMWindow parentWindow);
+   
+};
+
+%{C++
+#define NS_IMAPIWINHOOK_CONTRACTID    "@mozilla.org/mapiregistry;1"
+#define NS_IMAPIWINHOOK_CLASSNAME "Mozilla MAPI Registry"
+%}
--- a/mozilla/mailnews/mapi/registry/src/Registry.cpp
+++ b/mozilla/mailnews/mapi/registry/src/Registry.cpp
@@ -0,0 +1,321 @@
+/* ***** 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 <objbase.h>
+#include <assert.h>
+#include "nsString.h"
+#include "Registry.h"
+
+#define MAPI_PROXY_DLL_NAME   "MapiProxy.dll"
+#define MAPI_STARTUP_ARG      " /MAPIStartUp"
+#define MAX_SIZE              2048
+
+// Size of a CLSID as a string
+const int CLSID_STRING_SIZE = 39;
+
+// Proxy/Stub Dll Routines
+
+typedef HRESULT (__stdcall ProxyServer)();
+
+
+// Convert a CLSID to a char string.
+
+BOOL CLSIDtochar(const CLSID& clsid, char* szCLSID,
+                 int length)
+{
+    LPOLESTR wszCLSID = NULL;
+
+    // Get CLSID
+    HRESULT hr = StringFromCLSID(clsid, &wszCLSID);
+    if (FAILED(hr))
+        return FALSE;
+
+    // Covert from wide characters to non-wide.
+    wcstombs(szCLSID, wszCLSID, length);
+
+    // Free memory.
+    CoTaskMemFree(wszCLSID);
+
+    return TRUE;
+}
+
+// Create a key and set its value.
+
+BOOL setKeyAndValue(nsCAutoString keyName, const char* subKey,
+                    const char* theValue)
+{
+    HKEY hKey;
+    BOOL retValue = TRUE;
+
+    nsCAutoString theKey(keyName);
+    if (subKey != NULL)
+    {
+        theKey += "\\";
+        theKey += subKey;
+    }
+
+    // Create and open key and subkey.
+    long lResult = RegCreateKeyEx(HKEY_CLASSES_ROOT, theKey.get(), 
+                                  0, NULL, REG_OPTION_NON_VOLATILE,
+                                  KEY_ALL_ACCESS, NULL, &hKey, NULL);
+    if (lResult != ERROR_SUCCESS)
+        return FALSE ;
+
+    // Set the Value.
+    if (theValue != NULL)
+    {
+       lResult = RegSetValueEx(hKey, NULL, 0, REG_SZ, (BYTE *)theValue, 
+                      strlen(theValue)+1);
+       if (lResult != ERROR_SUCCESS)
+           retValue = FALSE;
+    }
+
+    RegCloseKey(hKey);
+    return TRUE;
+}
+
+// Delete a key and all of its descendents.
+
+LONG recursiveDeleteKey(HKEY hKeyParent,           // Parent of key to delete
+                        const char* lpszKeyChild)  // Key to delete
+{
+    // Open the child.
+    HKEY hKeyChild ;
+    LONG lRes = RegOpenKeyEx(hKeyParent, lpszKeyChild, 0,
+                             KEY_ALL_ACCESS, &hKeyChild) ;
+    if (lRes != ERROR_SUCCESS)
+    {
+        return lRes ;
+    }
+
+    // Enumerate all of the decendents of this child.
+    FILETIME time ;
+    char szBuffer[MAX_SIZE] ;
+    DWORD dwSize = MAX_SIZE ;
+    while (RegEnumKeyEx(hKeyChild, 0, szBuffer, &dwSize, NULL,
+                        NULL, NULL, &time) == S_OK)
+    {
+        // Delete the decendents of this child.
+        lRes = recursiveDeleteKey(hKeyChild, szBuffer) ;
+        if (lRes != ERROR_SUCCESS)
+        {
+            // Cleanup before exiting.
+            RegCloseKey(hKeyChild) ;
+            return lRes;
+        }
+        dwSize = MAX_SIZE;
+    }
+
+    // Close the child.
+    RegCloseKey(hKeyChild) ;
+
+    // Delete this child.
+    return RegDeleteKey(hKeyParent, lpszKeyChild) ;
+}
+
+void RegisterProxy()
+{
+    HINSTANCE h = NULL;
+    ProxyServer *RegisterFunc = NULL;
+
+    char szModule[MAX_SIZE];
+    char *pTemp = NULL;
+
+    HMODULE hModule = GetModuleHandle(NULL);
+    DWORD dwResult  = ::GetModuleFileName(hModule, szModule,
+                                          sizeof(szModule)/sizeof(char));
+    if (dwResult == 0)
+        return;
+
+    pTemp = strrchr(szModule, '\\');
+    if (pTemp == NULL)
+        return;
+
+    *pTemp = '\0';
+    nsCAutoString proxyPath(szModule);
+
+    proxyPath += "\\";
+    proxyPath += MAPI_PROXY_DLL_NAME;
+
+    h = LoadLibrary(proxyPath.get());
+    if (h == NULL)
+        return;
+
+    RegisterFunc = (ProxyServer *) GetProcAddress(h, "DllRegisterServer");
+    if (RegisterFunc)
+        RegisterFunc();
+
+    FreeLibrary(h);
+}
+
+void UnRegisterProxy()
+{
+    HINSTANCE h = NULL;
+    ProxyServer *UnRegisterFunc = NULL;
+
+    char szModule[MAX_SIZE];
+    char *pTemp = NULL;
+
+    HMODULE hModule = GetModuleHandle(NULL);
+    DWORD dwResult  = ::GetModuleFileName(hModule, szModule,
+                                          sizeof(szModule)/sizeof(char));
+    if (dwResult == 0)
+        return;
+
+    pTemp = strrchr(szModule, '\\');
+    if (pTemp == NULL)
+        return;
+
+    *pTemp = '\0';
+    nsCAutoString proxyPath(szModule);
+
+    proxyPath += "\\";
+    proxyPath += MAPI_PROXY_DLL_NAME;
+
+    h = LoadLibrary(proxyPath.get());
+    if (h == NULL)
+        return;
+
+    UnRegisterFunc = (ProxyServer *) GetProcAddress(h, "DllUnregisterServer");
+    if (UnRegisterFunc)
+        UnRegisterFunc();
+
+    FreeLibrary(h);
+}
+
+// Register the component in the registry.
+
+HRESULT RegisterServer(const CLSID& clsid,         // Class ID
+                       const char* szFriendlyName, // Friendly Name
+                       const char* szVerIndProgID, // Programmatic
+                       const char* szProgID)       //   IDs
+{
+    HMODULE hModule = GetModuleHandle(NULL);
+    char szModuleName[MAX_SIZE];
+    char szCLSID[CLSID_STRING_SIZE];
+
+    nsCAutoString independentProgId(szVerIndProgID);
+    nsCAutoString progId(szProgID);
+
+    DWORD dwResult = ::GetModuleFileName(hModule, szModuleName,
+                              sizeof(szModuleName)/sizeof(char));
+
+    if (dwResult == 0)
+        return S_FALSE;
+
+    nsCAutoString moduleName(szModuleName);
+    nsCAutoString registryKey("CLSID\\");
+
+    moduleName += MAPI_STARTUP_ARG;
+
+    // Convert the CLSID into a char.
+
+    if (!CLSIDtochar(clsid, szCLSID, sizeof(szCLSID)))
+        return S_FALSE;
+    registryKey += szCLSID;
+
+    // Add the CLSID to the registry.
+    if (!setKeyAndValue(registryKey, NULL, szFriendlyName))
+        return S_FALSE;
+
+    if (!setKeyAndValue(registryKey, "LocalServer32", moduleName.get()))
+        return S_FALSE;
+
+    // Add the ProgID subkey under the CLSID key.
+    if (!setKeyAndValue(registryKey, "ProgID", szProgID))
+        return S_FALSE;
+
+    // Add the version-independent ProgID subkey under CLSID key.
+    if (!setKeyAndValue(registryKey, "VersionIndependentProgID", szVerIndProgID))
+        return S_FALSE;
+
+    // Add the version-independent ProgID subkey under HKEY_CLASSES_ROOT.
+    if (!setKeyAndValue(independentProgId, NULL, szFriendlyName))
+        return S_FALSE; 
+    if (!setKeyAndValue(independentProgId, "CLSID", szCLSID))
+        return S_FALSE;
+    if (!setKeyAndValue(independentProgId, "CurVer", szProgID))
+        return S_FALSE;
+
+    // Add the versioned ProgID subkey under HKEY_CLASSES_ROOT.
+    if (!setKeyAndValue(progId, NULL, szFriendlyName))
+        return S_FALSE; 
+    if (!setKeyAndValue(progId, "CLSID", szCLSID))
+        return S_FALSE;
+
+    RegisterProxy();
+
+    return S_OK;
+}
+
+LONG UnregisterServer(const CLSID& clsid,         // Class ID
+                      const char* szVerIndProgID, // Programmatic
+                      const char* szProgID)       //   IDs
+{
+    LONG lResult = S_OK;
+
+    // Convert the CLSID into a char.
+
+    char szCLSID[CLSID_STRING_SIZE];
+    if (!CLSIDtochar(clsid, szCLSID, sizeof(szCLSID)))
+        return S_FALSE;
+
+    UnRegisterProxy();
+
+    nsCAutoString registryKey("CLSID\\");
+    registryKey += szCLSID;
+
+    lResult = recursiveDeleteKey(HKEY_CLASSES_ROOT, registryKey.get());
+    if (lResult == ERROR_SUCCESS || lResult == ERROR_FILE_NOT_FOUND)
+        return lResult;
+
+    registryKey += "\\LocalServer32";
+
+    // Delete only the path for this server.
+
+    lResult = recursiveDeleteKey(HKEY_CLASSES_ROOT, registryKey.get());
+    if (lResult != ERROR_SUCCESS && lResult != ERROR_FILE_NOT_FOUND)
+        return lResult;
+
+    // Delete the version-independent ProgID Key.
+    lResult = recursiveDeleteKey(HKEY_CLASSES_ROOT, szVerIndProgID);
+    if (lResult != ERROR_SUCCESS && lResult != ERROR_FILE_NOT_FOUND)
+        return lResult;
+
+    lResult = recursiveDeleteKey(HKEY_CLASSES_ROOT, szProgID);
+
+    return lResult;
+}
--- a/mozilla/mailnews/mapi/registry/src/Registry.h
+++ b/mozilla/mailnews/mapi/registry/src/Registry.h
@@ -1,11 +1,10 @@
-/* -*- 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
+ * Version: MPL 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/
+ * 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
@@ -14,35 +13,45 @@
 *
 * The Original Code is mozilla.org code.
 *
- * The Initial Developer of the Original Code is 
+ * The Initial Developer of the Original Code is
 * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
+ * 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 
+ * 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
+ * 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 NPL, the GPL or the LGPL.
+ * the terms of any one of the MPL, the GPL or the LGPL.
 *
 * ***** END LICENSE BLOCK ***** */
-#ifndef _MAPI_HOOK_H_
-#define _MAPI_HOOK_H_

-#include <structs.h>    // for MWContext
+#ifndef _REGISTRY_H_
+#define _REGISTRY_H_

-//
-// This is the entry point to the MAPI session manager that lives
-// inside of Communicator.
-// 
-LONG ProcessNetscapeMAPIHook(WPARAM wParam, LPARAM lParam);
+#include <objbase.h>
+#include <assert.h>

-#endif // _MAPI_HOOK_H_
+// This function will register a component in the Registry.
+
+HRESULT RegisterServer(const CLSID& clsid, 
+                       const char* szFriendlyName,
+                       const char* szVerIndProgID,
+                       const char* szProgID) ;
+
+// This function will unregister a component.
+
+HRESULT UnregisterServer(const CLSID& clsid,
+                         const char* szVerIndProgID,
+                         const char* szProgID) ;
+
+#endif
--- a/mozilla/mailnews/mapi/registry/src/makefile.win
+++ b/mozilla/mailnews/mapi/registry/src/makefile.win
@@ -0,0 +1,72 @@
+# ***** 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):
+# Srilatha Moturi <srilatha@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=nsMapiRegistry
+MAKE_OBJ_TYPE = DLL
+LIBRARY_NAME=$(MODULE)
+MODULE_NAME=nsMapiRegistry
+
+
+CPPSRCS= \
+	nsMapiRegistry.cpp	\
+	Registry.cpp        \
+	nsMapiRegistryUtils.cpp  \
+	$(NULL)
+
+CPP_OBJS=	\
+	.\$(OBJDIR)\nsMapiRegistry.obj	\
+	.\$(OBJDIR)\Registry.obj        \
+	.\$(OBJDIR)\nsMapiRegistryUtils.obj \
+	$(NULL)
+
+LLIBS=                               \
+ $(DIST)\lib\xpcom.lib               \
+ $(LIBNSPR)                          \
+ $(NULL)
+
+WIN_LIBS=       \
+	ole32.lib   \
+    $(NULL)
+EXPORTS=	\
+	nsMapiRegistry.h		\
+	Registry.h              \
+	nsMapiRegistryUtils.h   \
+	$(NULL)
+
+include <$(DEPTH)\config\rules.mak>
--- a/mozilla/mailnews/mapi/registry/src/nsMapiRegistry.cpp
+++ b/mozilla/mailnews/mapi/registry/src/nsMapiRegistry.cpp
@@ -0,0 +1,252 @@
+/* ***** 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):
+ * Srilatha Moturi <srilatha@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 "nsIServiceManager.h"
+#include "nsMapiRegistry.h"
+#include "nsIGenericFactory.h"
+#include "nsXPIDLString.h"
+#include "nsIPromptService.h"
+#include "nsIStringBundle.h"
+#include "nsIProxyObjectManager.h"
+#include "nsProxiedService.h"
+
+#include "nsMapiRegistryUtils.h" 
+#include "nsString.h"
+
+static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID);
+
+nsresult ShowMapiErrorDialog();
+
+/** Implementation of the nsIMapiRegistry interface.
+ *  Use standard implementation of nsISupports stuff.
+ */
+NS_IMPL_ISUPPORTS1(nsMapiRegistry, nsIMapiRegistry);
+
+nsMapiRegistry::nsMapiRegistry() {
+    NS_INIT_ISUPPORTS();
+    m_ShowDialog = !verifyRestrictedAccess();
+    m_DefaultMailClient = IsDefaultMailClient();
+}
+
+nsMapiRegistry::~nsMapiRegistry() {
+}
+
+NS_IMETHODIMP
+nsMapiRegistry::GetIsDefaultMailClient(PRBool * retval) {
+    // we need to get the value from registry everytime
+    // because the registry settings can be changed from
+    // other mail applications.
+    *retval = IsDefaultMailClient();
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMapiRegistry::GetShowDialog(PRBool * retval) {
+    *retval = m_ShowDialog;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMapiRegistry::SetDefaultMailClient() {
+    nsresult rv = setDefaultMailClient();
+    if (NS_SUCCEEDED(rv))
+        m_DefaultMailClient = PR_TRUE;
+    else
+       rv = ShowMapiErrorDialog();
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMapiRegistry::UnsetDefaultMailClient() {
+    nsresult rv = unsetDefaultMailClient();
+    if (NS_SUCCEEDED(rv))
+        m_DefaultMailClient = PR_FALSE;
+    else
+        ShowMapiErrorDialog();
+    return NS_OK;
+}
+
+/** This will bring up the dialog box only once per session and 
+ * only if the current app is not default Mail Client.
+ * This also checks the registry if the registry key
+ * showMapiDialog is set
+ */
+NS_IMETHODIMP
+nsMapiRegistry::ShowMailIntegrationDialog(nsIDOMWindow *aParentWindow) {
+    nsresult rv;
+    if (!m_ShowDialog || !getShowDialog()) return NS_OK;
+    nsCOMPtr<nsIPromptService> promptService(do_GetService(
+                  "@mozilla.org/embedcomp/prompt-service;1", &rv));
+    if (NS_SUCCEEDED(rv) && promptService)
+    {
+        nsCOMPtr<nsIStringBundleService> bundleService(do_GetService(
+                                         kStringBundleServiceCID, &rv));
+        if (NS_FAILED(rv) || !bundleService) return NS_ERROR_FAILURE;
+
+        nsCOMPtr<nsIStringBundle> bundle;
+        rv = bundleService->CreateBundle(
+                        "chrome://messenger/locale/mapi.properties",
+                        getter_AddRefs(bundle));
+        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+
+        nsCOMPtr<nsIStringBundle> brandBundle;
+        rv = bundleService->CreateBundle(
+                        "chrome://global/locale/brand.properties",
+                        getter_AddRefs(brandBundle));
+        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+
+        nsXPIDLString brandName;
+        rv = brandBundle->GetStringFromName(
+                           NS_LITERAL_STRING("brandShortName").get(),
+                           getter_Copies(brandName));
+        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+
+        nsXPIDLString dialogTitle;
+        const PRUnichar *brandStrings[] = { brandName.get() };
+        NS_NAMED_LITERAL_STRING(dialogTitlePropertyTag, "dialogTitle");
+        const PRUnichar *dTitlepropertyTag = dialogTitlePropertyTag.get();
+        rv = bundle->FormatStringFromName(dTitlepropertyTag,
+                                          brandStrings, 1,
+                                          getter_Copies(dialogTitle));
+        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+        
+        nsXPIDLString dialogText;
+        NS_NAMED_LITERAL_STRING(dialogTextPropertyTag, "dialogText");
+        const PRUnichar *dpropertyTag = dialogTextPropertyTag.get();
+        rv = bundle->FormatStringFromName(dpropertyTag,
+                                          brandStrings, 1,
+                                          getter_Copies(dialogText));
+        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+
+        nsXPIDLString checkboxText;
+        rv = bundle->GetStringFromName(
+                           NS_LITERAL_STRING("checkboxText").get(),
+                           getter_Copies(checkboxText));
+        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+
+        PRBool checkValue = PR_FALSE;
+        PRInt32 buttonPressed = 0;
+        rv = promptService->ConfirmEx(aParentWindow,
+                                      dialogTitle,
+                                      dialogText.get(),
+                                      (nsIPromptService::BUTTON_TITLE_YES * 
+                                      nsIPromptService::BUTTON_POS_0) +
+                                      (nsIPromptService::BUTTON_TITLE_NO * 
+                                      nsIPromptService::BUTTON_POS_1),
+                                      nsnull,
+                                      nsnull,
+                                      nsnull,
+                                      checkboxText,
+                                      &checkValue,
+                                      &buttonPressed);
+        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+        rv = SetRegistryKey(HKEY_LOCAL_MACHINE, "Software\\Mozilla\\Desktop", 
+                                "showMapiDialog", (checkValue) ? "0" : "1");
+        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+
+        m_ShowDialog = PR_FALSE;
+        if (!buttonPressed)
+            rv = SetDefaultMailClient();
+    }
+    return rv;
+}
+
+nsresult ShowMapiErrorDialog() {
+    nsresult rv;
+    nsCOMPtr<nsIPromptService> promptService(do_GetService(
+                  "@mozilla.org/embedcomp/prompt-service;1", &rv));
+    if (NS_SUCCEEDED(rv) && promptService)
+    {
+        nsCOMPtr<nsIStringBundleService> bundleService(do_GetService(
+                                         kStringBundleServiceCID, &rv));
+        if (NS_FAILED(rv) || !bundleService) return NS_ERROR_FAILURE;
+
+        nsCOMPtr<nsIStringBundle> bundle;
+        rv = bundleService->CreateBundle(
+                        "chrome://messenger/locale/mapi.properties",
+                        getter_AddRefs(bundle));
+        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+
+        nsCOMPtr<nsIStringBundle> brandBundle;
+        rv = bundleService->CreateBundle(
+                        "chrome://global/locale/brand.properties",
+                        getter_AddRefs(brandBundle));
+        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+
+        nsXPIDLString brandName;
+        rv = brandBundle->GetStringFromName(
+                           NS_LITERAL_STRING("brandShortName").get(),
+                           getter_Copies(brandName));
+        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+
+        nsXPIDLString dialogTitle;
+        const PRUnichar *brandStrings[] = { brandName.get() };
+        NS_NAMED_LITERAL_STRING(dialogTitlePropertyTag, "errorMessageTitle");
+        const PRUnichar *dTitlepropertyTag = dialogTitlePropertyTag.get();
+        rv = bundle->FormatStringFromName(dTitlepropertyTag,
+                                          brandStrings, 1,
+                                          getter_Copies(dialogTitle));
+        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+        nsXPIDLString dialogText;
+        NS_NAMED_LITERAL_STRING(dialogTextPropertyTag, "errorMessage");
+        const PRUnichar *dpropertyTag = dialogTextPropertyTag.get();
+        rv = bundle->FormatStringFromName(dpropertyTag,
+                                          brandStrings, 1,
+                                          getter_Copies(dialogText));
+        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+        rv = promptService->Alert(nsnull, dialogTitle,
+                                  dialogText);
+    }
+    return rv;
+}
+
+
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsMapiRegistry);
+
+// The list of components we register
+static nsModuleComponentInfo components[] = 
+{
+  {
+    NS_IMAPIREGISTRY_CLASSNAME, 
+    NS_IMAPIREGISTRY_CID,
+    NS_IMAPIWINHOOK_CONTRACTID, 
+    nsMapiRegistryConstructor
+  }
+};
+
+NS_IMPL_NSGETMODULE(nsMapiRegistryModule, components);
+
--- a/mozilla/mailnews/mapi/registry/src/nsMapiRegistry.h
+++ b/mozilla/mailnews/mapi/registry/src/nsMapiRegistry.h
@@ -0,0 +1,73 @@
+/* ***** 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):
+ * Srilatha Moturi <srilatha@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 nsmapiregistry_h____
+#define nsmapiregistry_h____
+
+#include "nsIMapiRegistry.h"
+
+#ifndef MAX_BUF
+#define MAX_BUF 4096
+#endif
+
+/* c5be14ba-4e0a-4eec-a1b8-04363761d63c */
+#define NS_IMAPIREGISTRY_CID \
+ { 0xc5be14ba, 0x4e0a, 0x4eec, {0xa1, 0xb8, 0x04, 0x36, 0x37, 0x61, 0xd6, 0x3c} }
+#define NS_IMAPIREGISTRY_CONTRACTID    "@mozilla.org/mapiregistry;1"
+#define NS_IMAPIREGISTRY_CLASSNAME "Mozilla MAPI Registry"
+
+class nsMapiRegistry : public nsIMapiRegistry {
+public:
+    // ctor/dtor
+    nsMapiRegistry();
+    virtual ~nsMapiRegistry();
+
+    // Declare all interface methods we must implement.
+    NS_DECL_ISUPPORTS
+    NS_DECL_NSIMAPIREGISTRY
+
+protected:
+    
+    PRBool m_DefaultMailClient;
+    PRBool m_ShowDialog;
+
+private:
+    // Special member to handle initialization.
+    PRBool mHaveBeenSet;
+}; // nsMapiRegistry
+
+#endif // nsmapiregistry_h____
--- a/mozilla/mailnews/mapi/registry/src/nsMapiRegistryUtils.cpp
+++ b/mozilla/mailnews/mapi/registry/src/nsMapiRegistryUtils.cpp
@@ -0,0 +1,652 @@
+/* ***** 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):
+ * Srilatha Moturi <srilatha@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 ***** */
+
+#undef UNICODE
+#undef _UNICODE
+
+#include "nsIServiceManager.h"
+#include "nsMapiRegistryUtils.h"
+#include "nsString.h"
+#include "nsIStringBundle.h"
+#include "nsXPIDLString.h"
+#include "nsSpecialSystemDirectory.h"
+#include "nsDirectoryService.h"
+#include "nsDirectoryServiceDefs.h"
+#include "nsAppDirectoryServiceDefs.h"
+
+// returns TRUE if the Mapi32.dll is smart dll.
+static PRBool isSmartDll();
+
+// returns TRUE if the Mapi32.dll is a Mozilla dll.
+static PRBool isMozDll();
+
+static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID);
+const CLSID CLSID_nsMapiImp = {0x29f458be, 0x8866, 0x11d5, {0xa3, 0xdd, 0x0, 0xb0, 0xd0, 0xf3, 0xba, 0xa7}};
+
+// Returns the (fully-qualified) name of this executable.
+static nsCString thisApplication() {
+    static nsCAutoString result;
+
+    if (result.IsEmpty()) {
+        char buffer[MAX_PATH] = {0};
+        DWORD len = ::GetModuleFileName(NULL, buffer, sizeof buffer);
+        len = ::GetShortPathName(buffer, buffer, sizeof buffer);
+    
+        result = buffer;
+        result.ToUpperCase();
+    }
+
+    return result;
+}
+
+/** This returns the brand name for this application
+  */
+static nsCString brandName() {
+    static nsCAutoString brand;
+    nsresult rv;
+    if (brand.IsEmpty()) {
+        nsCOMPtr<nsIStringBundleService> bundleService(do_GetService(
+                                         kStringBundleServiceCID, &rv));
+        if (NS_SUCCEEDED(rv) && bundleService) {
+            nsCOMPtr<nsIStringBundle> brandBundle;
+            rv = bundleService->CreateBundle(
+                        "chrome://global/locale/brand.properties",
+                        getter_AddRefs(brandBundle));
+            if (NS_SUCCEEDED(rv)) {
+                nsXPIDLString brandName;
+                rv = brandBundle->GetStringFromName(
+                           NS_LITERAL_STRING("brandShortName").get(),
+                           getter_Copies(brandName));
+                if (NS_SUCCEEDED(rv)) {
+                    brand.AssignWithConversion(brandName.get());
+                }
+            }
+        }
+    }
+    return brand;
+}
+
+// verifyRestrictedAccess - Returns PR_TRUE if this user only has restricted access
+// to the registry keys we need to modify.
+PRBool verifyRestrictedAccess() {
+    char   subKey[] = "Software\\Mozilla - Test Key";
+    PRBool result = PR_FALSE;
+    DWORD  dwDisp = 0;
+    HKEY   key;
+    // Try to create/open a subkey under HKLM.
+    DWORD rc = ::RegCreateKeyEx(HKEY_LOCAL_MACHINE,
+                                subKey,
+                                0,
+                                NULL,
+                                REG_OPTION_NON_VOLATILE,
+                                KEY_WRITE,
+                                NULL,
+                                &key,
+                                &dwDisp);
+
+    if (rc == ERROR_SUCCESS) {
+        // Key was opened; first close it.
+        ::RegCloseKey(key);
+        // Delete it if we just created it.
+        switch(dwDisp) {
+            case REG_CREATED_NEW_KEY:
+                ::RegDeleteKey(HKEY_LOCAL_MACHINE, subKey);
+                break;
+            case REG_OPENED_EXISTING_KEY:
+                break;
+        }
+    } else {
+        // Can't create/open it; we don't have access.
+        result = PR_TRUE;
+    }
+    return result;
+}
+
+nsresult SetRegistryKey(HKEY baseKey, const char * keyName, 
+                        const char * valueName, char * value)
+{
+    nsresult result = NS_ERROR_FAILURE;
+    HKEY   key;
+    LONG   rc = ::RegCreateKey(baseKey, keyName, &key);
+  
+    if (rc == ERROR_SUCCESS) {
+        rc = ::RegSetValueEx(key, valueName, NULL, REG_SZ, 
+                                 (LPBYTE)(const char*)value, strlen(value));
+        if (rc == ERROR_SUCCESS) {
+            result = NS_OK;
+        }
+        ::RegCloseKey(key);
+    }
+    return result;
+}
+
+nsresult DeleteRegistryValue(HKEY baseKey, const char * keyName, 
+                        const char * valueName)
+{
+    nsresult result = NS_ERROR_FAILURE;
+    HKEY   key;
+    LONG   rc = ::RegOpenKey(baseKey, keyName, &key);
+  
+    if (rc == ERROR_SUCCESS) {
+        rc = ::RegDeleteValue(key, valueName);
+        if (rc == ERROR_SUCCESS)
+            result = NS_OK;
+        ::RegCloseKey(key);
+    }
+    return result;
+}
+
+nsCString GetRegistryKey(HKEY baseKey, const char * keyName, 
+                         const char * valueName)
+{
+    nsCAutoString value;
+    HKEY   key;
+    LONG   rc = ::RegOpenKey(baseKey, keyName, &key);
+    if (rc == ERROR_SUCCESS) {
+        char buffer[MAX_PATH] = {0};
+        DWORD len = sizeof buffer;
+        rc = ::RegQueryValueEx(key, valueName, NULL, NULL, 
+                               (LPBYTE)buffer, &len);
+        if (rc == ERROR_SUCCESS) {
+            if (len)
+                value = buffer;
+        }
+        ::RegCloseKey(key);
+     }
+     return value;
+}
+
+#define EXE_EXTENSION ".exe" 
+
+/** Returns TRUE if the current application is default mail client.
+ */
+PRBool IsDefaultMailClient()
+{
+    if (!isSmartDll() && !isMozDll()) 
+        return PR_FALSE;
+    nsCAutoString name(GetRegistryKey(HKEY_LOCAL_MACHINE, 
+                                      "Software\\Clients\\Mail", ""));
+    if (!name.IsEmpty()) {
+         nsCString keyName("Software\\Clients\\Mail\\");
+         keyName += name.get(); 
+         keyName += "\\protocols\\mailto\\shell\\open\\command";
+
+         nsCAutoString result(GetRegistryKey(HKEY_LOCAL_MACHINE, 
+                                             keyName.get(), ""));
+         if (!result.IsEmpty()) {
+             nsCAutoString strExtension;
+             strExtension.Assign(EXE_EXTENSION);
+             result.ToUpperCase();
+             strExtension.ToUpperCase();
+             PRInt32 index = result.RFind(strExtension.get());
+             if (index != kNotFound) {
+                 result.Truncate(index + strExtension.Length());
+             }
+             return (result == thisApplication());
+        }
+    }
+    return PR_FALSE;
+
+}
+
+/** Saves the current setting of the default Mail Client in 
+ * HKEY_LOCAL_MACHINE\\Software\\Mozilla\\Desktop
+ */
+nsresult saveDefaultMailClient()
+{
+    nsresult rv;
+    nsCAutoString name(GetRegistryKey(HKEY_LOCAL_MACHINE,
+                                    "Software\\Clients\\Mail", ""));
+    if (!name.IsEmpty()) {
+        rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                            "Software\\Mozilla\\Desktop", 
+                            "HKEY_LOCAL_MACHINE\\Software\\Clients\\Mail", 
+                            (char *)name.get());
+        if (NS_SUCCEEDED(rv)) {
+            nsCString keyName("Software\\Clients\\Mail\\");
+            keyName += name.get(); 
+            keyName += "\\protocols\\mailto\\shell\\open\\command";
+            nsCAutoString appPath(GetRegistryKey(HKEY_LOCAL_MACHINE, 
+                                               keyName.get(), ""));
+            if (!appPath.IsEmpty()) {
+                nsCString stringName("HKEY_LOCAL_MACHINE\\");
+                stringName += keyName.get();
+                rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                                  "Software\\Mozilla\\Desktop", 
+                                  stringName.get(), (char *)appPath.get());
+            }
+        }
+    }
+    else
+        rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                            "Software\\Mozilla\\Desktop", 
+                            "HKEY_LOCAL_MACHINE\\Software\\Clients\\Mail", 
+                            "");
+    return rv;
+} 
+
+/** Saves the current user setting of the default Mail Client in 
+ * HKEY_LOCAL_MACHINE\\Software\\Mozilla\\Desktop
+ */
+nsresult saveUserDefaultMailClient()
+{
+    nsresult rv;
+    nsCAutoString name(GetRegistryKey(HKEY_CURRENT_USER,
+                                    "Software\\Clients\\Mail", ""));
+    if (!name.IsEmpty()) {
+        rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                            "Software\\Mozilla\\Desktop", 
+                            "HKEY_CURRENT_USER\\Software\\Clients\\Mail", 
+                            (char *)name.get());
+    }
+    else {
+        rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                            "Software\\Mozilla\\Desktop", 
+                            "HKEY_CURRENT_USER\\Software\\Clients\\Mail", 
+                            "");
+   }
+   return rv;
+}
+
+/**
+ * Check whether it is a smart dll or not. Smart dll is the one installed by
+ * IE5 or Outlook Express which forwards the MAPI calls to the dll based on the 
+ * registry key setttings.
+ * Returns TRUE if is a smart dll.
+ */
+
+typedef HRESULT (FAR PASCAL GetOutlookVersionFunc)(); 
+static PRBool isSmartDll() 
+{ 
+    char buffer[MAX_PATH] = {0};
+    if (GetSystemDirectory(buffer, sizeof(buffer)) == 0) 
+        return PR_FALSE;
+    PL_strcatn(buffer, sizeof(buffer), "\\Mapi32.dll");
+    
+    HINSTANCE hInst; 
+    GetOutlookVersionFunc *doesExist = nsnull;
+    hInst = LoadLibrary(buffer); 
+    if (hInst == nsnull) 
+        return PR_FALSE;
+        
+    doesExist = (GetOutlookVersionFunc *) GetProcAddress (hInst, "GetOutlookVersion"); 
+    FreeLibrary(hInst); 
+
+    return (doesExist != nsnull); 
+} 
+
+typedef HRESULT (FAR PASCAL GetMapiDllVersion)(); 
+/**
+ * Checks whether mapi32.dll is installed by this app. 
+ * Returns TRUE if it is.
+ */
+static PRBool isMozDll() 
+{ 
+    char buffer[MAX_PATH] = {0};
+    if (GetSystemDirectory(buffer, sizeof(buffer)) == 0) 
+        return PR_FALSE;
+    PL_strcatn(buffer, sizeof(buffer), "\\Mapi32.dll"); 
+
+    HINSTANCE hInst; 
+    GetMapiDllVersion *doesExist = nsnull;
+    hInst = LoadLibrary(buffer); 
+    if (hInst == nsnull) 
+        return PR_FALSE;
+        
+    doesExist = (GetMapiDllVersion *) GetProcAddress (hInst, "GetMapiDllVersion"); 
+    FreeLibrary(hInst); 
+
+    return (doesExist != nsnull); 
+} 
+
+/** Renames Mapi32.dl in system directory to Mapi32_moz_bak.dll
+ *  copies the mozMapi32.dll from bin directory to the system directory
+ */
+nsresult CopyMozMapiToWinSysDir()
+{
+    nsresult rv;
+    char buffer[MAX_PATH] = {0};
+    if (GetSystemDirectory(buffer, sizeof(buffer)) == 0) 
+        return NS_ERROR_FAILURE;
+
+    nsCAutoString filePath(buffer);
+    filePath.Append("\\Mapi32_moz_bak.dll");
+
+    nsCOMPtr<nsILocalFile> pCurrentMapiFile = do_CreateInstance (NS_LOCAL_FILE_CONTRACTID, &rv);
+    if (NS_FAILED(rv) || !pCurrentMapiFile) return rv;        
+    pCurrentMapiFile->InitWithPath(filePath.get());
+
+    nsCOMPtr<nsIFile> pMozMapiFile;
+    nsCOMPtr<nsIProperties> directoryService =
+          do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv);
+    if (!directoryService) return NS_ERROR_FAILURE;
+    rv = directoryService->Get(NS_OS_CURRENT_PROCESS_DIR,
+                              NS_GET_IID(nsIFile),
+                              getter_AddRefs(pMozMapiFile));
+
+    if (NS_FAILED(rv)) return rv;
+    pMozMapiFile->Append("mozMapi32.dll");
+
+    PRBool bExist;
+    rv = pMozMapiFile->Exists(&bExist);
+    if (NS_FAILED(rv) || !bExist) return rv;
+
+    rv = pCurrentMapiFile->Exists(&bExist);
+    if (NS_SUCCEEDED(rv) && bExist)
+    {
+        rv = pCurrentMapiFile->Remove(PR_FALSE);
+    }
+    if (NS_FAILED(rv)) return rv;
+    filePath.Assign(buffer);
+    filePath.Append("\\Mapi32.dll");
+    pCurrentMapiFile->InitWithPath(filePath.get());
+    rv = pCurrentMapiFile->Exists(&bExist);
+    if (NS_SUCCEEDED(rv) && bExist)
+    {
+        rv = pCurrentMapiFile->MoveTo(nsnull, "Mapi32_moz_bak.dll");
+        if (NS_FAILED(rv)) return rv;
+        nsCAutoString fullFilePath(buffer);
+        fullFilePath.Append("\\Mapi32_moz_bak.dll");
+        rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                            "Software\\Mozilla\\Desktop", 
+                            "Mapi_backup_dll", 
+                            (char *)fullFilePath.get());
+        if (NS_FAILED(rv)) {
+             RestoreBackedUpMapiDll();
+             return rv;
+        }
+    }
+    
+    nsAutoString fileName;
+    fileName.AssignWithConversion("Mapi32.dll");
+    filePath.Assign(buffer);
+    pCurrentMapiFile->InitWithPath(filePath.get());
+    rv = pMozMapiFile->CopyToUnicode(pCurrentMapiFile, fileName.get());
+    if (NS_FAILED(rv))
+        RestoreBackedUpMapiDll();
+    return rv;
+}
+
+/** deletes the Mapi32.dll in system directory and renames Mapi32_moz_bak.dll
+ *  to Mapi32.dll
+ */
+nsresult RestoreBackedUpMapiDll()
+{
+    nsresult rv;
+    char buffer[MAX_PATH] = {0};
+    if (GetSystemDirectory(buffer, sizeof(buffer)) == 0) 
+        return NS_ERROR_FAILURE;
+
+    nsCAutoString filePath(buffer);
+    nsCAutoString previousFileName(buffer);
+    filePath.Append("\\Mapi32.dll");
+    previousFileName.Append("\\Mapi32_moz_bak.dll");
+
+    nsCOMPtr <nsILocalFile> pCurrentMapiFile = do_CreateInstance(NS_LOCAL_FILE_CONTRACTID, &rv);
+    if (NS_FAILED(rv) || !pCurrentMapiFile) return NS_ERROR_FAILURE;        
+    pCurrentMapiFile->InitWithPath(filePath);
+    
+    nsCOMPtr<nsILocalFile> pPreviousMapiFile = do_CreateInstance (NS_LOCAL_FILE_CONTRACTID, &rv);
+    if (NS_FAILED(rv) || !pPreviousMapiFile) return NS_ERROR_FAILURE;       
+    pPreviousMapiFile->InitWithPath(previousFileName);
+
+    PRBool bExist;
+    rv = pCurrentMapiFile->Exists(&bExist);
+    if (NS_SUCCEEDED(rv) && bExist) {
+        rv = pCurrentMapiFile->Remove(PR_FALSE);
+        if (NS_FAILED(rv)) return rv;
+    }
+
+    rv = pPreviousMapiFile->Exists(&bExist);
+    if (NS_SUCCEEDED(rv) && bExist)
+        rv = pPreviousMapiFile->MoveTo(nsnull, "Mapi32.dll");
+    if (NS_SUCCEEDED(rv))
+        DeleteRegistryValue(HKEY_LOCAL_MACHINE,
+                            "Software\\Mozilla\\Desktop", 
+                            "Mapi_backup_dll");
+    return rv;
+}
+
+/** Sets Mozilla as default Mail Client
+ */
+nsresult setDefaultMailClient()
+{
+    nsresult rv;
+    nsresult mailKeySet=NS_ERROR_FAILURE;
+    if (verifyRestrictedAccess()) return NS_ERROR_FAILURE;
+    if (!isSmartDll()) {
+        if (NS_FAILED(CopyMozMapiToWinSysDir())) return NS_ERROR_FAILURE;
+    }
+    rv = saveDefaultMailClient();
+    if (NS_FAILED(saveUserDefaultMailClient()) ||
+        NS_FAILED(rv)) return NS_ERROR_FAILURE;
+    nsCAutoString keyName("Software\\Clients\\Mail\\");
+
+    nsCAutoString appName(brandName());
+    if (!appName.IsEmpty()) {
+        keyName.Append(appName.get());
+        // hardcoding this for 0.9.4 branch
+        // need to change it before merging into the trunk
+        rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                        (char *)keyName.get(), 
+                        "", "Netscape 6.2 Mail"); 
+    }
+    else
+        rv = NS_ERROR_FAILURE;
+    if (NS_SUCCEEDED(rv)) {
+        nsCAutoString dllPath(thisApplication());
+        PRInt32 index = dllPath.RFind("\\");
+        if (index != kNotFound)
+            dllPath.Truncate(index + 1);
+        dllPath += "mozMapi32.dll";
+        rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                            (char *)keyName.get(), "DLLPath", 
+                            (char *)dllPath.get());
+        if (NS_SUCCEEDED(rv)) {
+            keyName.Append("\\protocols\\mailto");
+            rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                                (char *)keyName.get(), 
+                                "", "URL:MailTo Protocol");
+            if (NS_SUCCEEDED(rv)) {
+                nsCAutoString appPath(thisApplication());
+                appPath += " \"%1\"";
+                keyName.Append("\\shell\\open\\command");
+                rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                       (char *)keyName.get(), 
+                       "", (char *)appPath.get());
+                if (NS_SUCCEEDED(rv)) {
+                    rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                                        "Software\\Clients\\Mail", 
+                                        "", (char *)appName.get());
+                }
+                if (NS_SUCCEEDED(rv)) {
+                    nsCAutoString mailAppPath(thisApplication());
+                    mailAppPath += " -mail";
+                    nsCAutoString appKeyName ("Software\\Clients\\Mail\\");
+                    appKeyName.Append(appName.get());
+                    appKeyName.Append("\\shell\\open\\command");
+                    rv = SetRegistryKey(HKEY_LOCAL_MACHINE,
+                                        (char *)appKeyName.get(),
+                                        "", (char *)mailAppPath.get());
+                }
+                if (NS_SUCCEEDED(rv)) {
+                    nsCAutoString iconPath(thisApplication());
+                    iconPath += ",0";
+                    nsCAutoString iconKeyName ("Software\\Clients\\Mail\\");
+                    iconKeyName.Append(appName.get());
+                    iconKeyName.Append("\\DefaultIcon");
+                    mailKeySet = SetRegistryKey(HKEY_LOCAL_MACHINE,
+                                        (char *)iconKeyName.get(),
+                                        "", (char *)iconPath.get());
+                }
+            }            
+        }
+    }
+
+    if (NS_SUCCEEDED(mailKeySet)) {
+        nsresult desktopKeySet = SetRegistryKey(HKEY_CURRENT_USER, 
+                                                "Software\\Clients\\Mail",
+                                                "", (char *)appName.get());
+        if (NS_SUCCEEDED(desktopKeySet)) {
+            desktopKeySet = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                                           "Software\\Mozilla\\Desktop", 
+                                           "defaultMailHasBeenSet", "1");
+        }
+        ::SendMessage(HWND_BROADCAST, WM_SETTINGCHANGE, 0, 
+                     (LPARAM)"Software\\Clients\\Mail");
+        RegisterServer(CLSID_nsMapiImp, "Mozilla MAPI", "mozMapi", "mozMapi.1");
+        return desktopKeySet;
+    }
+    
+    return mailKeySet;
+}
+
+/** Removes Mozilla as the default Mail client and restores the previous setting
+ */
+nsresult unsetDefaultMailClient() {
+    nsresult result = NS_OK;
+    nsresult mailKeySet = NS_ERROR_FAILURE;
+    if (verifyRestrictedAccess()) return NS_ERROR_FAILURE;
+    if (!isSmartDll()) {
+        if (NS_FAILED(RestoreBackedUpMapiDll())) return NS_ERROR_FAILURE;
+    }
+    nsCAutoString name(GetRegistryKey(HKEY_LOCAL_MACHINE, 
+                                      "Software\\Mozilla\\Desktop", 
+                                      "HKEY_LOCAL_MACHINE\\Software\\Clients\\Mail"));
+    nsCAutoString appName(brandName());
+
+    if (!name.IsEmpty() && !appName.IsEmpty() && name.Equals(appName)) {
+        nsCAutoString keyName("HKEY_LOCAL_MACHINE\\Software\\Clients\\Mail\\");
+        keyName.Append(appName.get());
+        keyName.Append("\\protocols\\mailto\\shell\\open\\command");
+        nsCAutoString appPath(GetRegistryKey(HKEY_LOCAL_MACHINE, 
+                        "Software\\Mozilla\\Desktop", 
+                        (char *)keyName.get()));
+        if (!appPath.IsEmpty()) {
+            keyName.Assign("Software\\Clients\\Mail\\");
+            keyName.Append(appName.get());
+            keyName.Append("\\protocols\\mailto\\shell\\open\\command");
+            result = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                       (char *) keyName.get(), 
+                       "", (char *)appPath.get());
+            if (NS_SUCCEEDED(result)) {
+                PRInt32 index = appPath.RFind("\\");
+                if (index != kNotFound)
+                    appPath.Truncate(index + 1);
+                appPath += "mozMapi32.dll";
+                keyName.Assign("Software\\Clients\\Mail\\");
+                keyName.Append(appName.get());
+                result = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                                        (char *)keyName.get(), 
+                                        "DLLPath", (char *) appPath.get());
+            }
+        }
+    }
+    if (!name.IsEmpty()) {
+        if (NS_SUCCEEDED(result)) {
+            mailKeySet = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                                "Software\\Clients\\Mail", 
+                                "", (char *)name.get());
+        }
+    }
+    else
+        mailKeySet = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                                "Software\\Clients\\Mail", 
+                                "", "");
+
+    if (NS_SUCCEEDED(mailKeySet)) {
+        nsCAutoString userAppName(GetRegistryKey(HKEY_LOCAL_MACHINE, 
+                                  "Software\\Mozilla\\Desktop", 
+                                  "HKEY_CURRENT_USER\\Software\\Clients\\Mail"));
+        nsresult desktopKeySet = NS_OK;
+        if (!userAppName.IsEmpty()) {
+            desktopKeySet = SetRegistryKey(HKEY_CURRENT_USER, 
+                                           "Software\\Clients\\Mail", 
+                                           "", (char *)userAppName.get());
+        }
+        else {
+            DeleteRegistryValue(HKEY_CURRENT_USER, "Software\\Clients\\Mail", "");
+        }
+        if (NS_SUCCEEDED(desktopKeySet)) {
+            desktopKeySet = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                                           "Software\\Mozilla\\Desktop", 
+                                           "defaultMailHasBeenSet", "0");
+        }
+        ::SendMessage(HWND_BROADCAST, WM_SETTINGCHANGE, 0, 
+                     (LPARAM)"Software\\Clients\\Mail");
+        UnregisterServer(CLSID_nsMapiImp, "mozMapi", "mozMapi.1");
+        return desktopKeySet;
+    }
+    return mailKeySet;
+}
+
+/** Returns FALSE if showMapiDialog is set to 0.
+ *  Returns TRUE otherwise
+ *  Also returns TRUE if the Mozilla has been set as the default mail client
+ *  and some other application has changed that setting.
+ *  This function gets called only if the current app is not the default mail
+ *  client
+ */
+PRBool getShowDialog() {
+    PRBool rv = PR_FALSE;
+    nsCString showDialog(GetRegistryKey(HKEY_LOCAL_MACHINE, 
+                                        "Software\\Mozilla\\Desktop", 
+                                        "showMapiDialog"));
+    // if the user has not selected the checkbox, show dialog 
+    if (showDialog.IsEmpty() || showDialog.Equals("1"))
+            rv = PR_TRUE;
+
+    if (!rv) {
+        // even if the user has selected the checkbox
+        // show it if some other application has changed the 
+        // default setting.
+        nsCAutoString setMailDefault(GetRegistryKey(HKEY_LOCAL_MACHINE,
+                                       "Software\\Mozilla\\Desktop", 
+                                       "defaultMailHasBeenSet"));
+        if (setMailDefault.Equals("1")) {
+            // need to reset the defaultMailHasBeenSet to "0"
+            // so that after the dialog is displayed once,
+            // we do not keep displaying this dialog after the user has
+            // selected the checkbox
+            rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
+                                "Software\\Mozilla\\Desktop", 
+                                "defaultMailHasBeenSet", "0");
+            rv = PR_TRUE;
+        }
+    }
+    return rv;
+}
--- a/mozilla/mailnews/mapi/registry/src/nsMapiRegistryUtils.h
+++ b/mozilla/mailnews/mapi/registry/src/nsMapiRegistryUtils.h
@@ -0,0 +1,90 @@
+/* ***** 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):
+ * Srilatha Moturi <srilatha@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 nsmapiregistryutils_h____
+#define nsmapiregistryutils_h____
+
+#include <windows.h>
+#include <string.h>
+#include <winreg.h>
+
+#include "Registry.h"
+#include "nsString.h"
+
+//Sets the registry key for basekey/keyname valuename.
+nsresult SetRegistryKey(HKEY baseKey, const char * keyName, 
+                        const char * valueName, char * value);
+
+// Deletes the registry key for base/keyname/valuename
+nsresult DeleteRegistryValue(HKEY baseKey, const char * keyName, 
+                        const char * valueName);
+
+// Gets the current regiistry setting for the key.
+nsCString GetRegistryKey(HKEY baseKey, const char * keyName, 
+                         const char * valueName);
+// Returns PR_TRUE if this user only has restricted access
+// to the registry keys we need to modify.
+PRBool verifyRestrictedAccess();
+
+// Returns true if mozilla is the default mail client
+// by checking the registry.
+PRBool IsDefaultMailClient();
+
+// Save the current setting for the default mail client.
+nsresult saveDefaultMailClient();
+
+// Saves the current user setting for the default mail client.
+nsresult saveUserDefaultMailClient();
+
+// Renames Mapi32.dl in system directory to Mapi32_moz_bak.dll
+// copies the mozMapi32.dll from bin directory to the system directory
+nsresult CopyMozMapiToWinSysDir();
+
+// deletes the Mapi32.dll in system directory and renames Mapi32_moz_bak.dll
+//  to Mapi32.dll
+nsresult RestoreBackedUpMapiDll();
+
+// Sets mozilla as the default mail client	
+nsresult setDefaultMailClient();
+
+// unsets mozilla and resets the default mail client setting to previous one
+nsresult unsetDefaultMailClient();
+
+// returns true if we need to show the mail integration dialog.
+PRBool getShowDialog();
+
+#endif
--- a/mozilla/mailnews/mapi/resources/content/pref-mailnewsOverlay.js
+++ b/mozilla/mailnews/mapi/resources/content/pref-mailnewsOverlay.js
@@ -100,5 +100,5 @@ function onOK()
            mapiRegistry.setDefaultMailClient();
        else
            mapiRegistry.unsetDefaultMailClient();
-    }
+    }  
 }